All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 00/16] common: Drop remaining includes in common.h
@ 2020-08-02 22:59 Simon Glass
  2020-08-02 22:59 ` [PATCH 01/16] common: Drop asm/global_data.h from common header Simon Glass
                   ` (16 more replies)
  0 siblings, 17 replies; 35+ messages in thread
From: Simon Glass @ 2020-08-02 22:59 UTC (permalink / raw)
  To: u-boot

This series completes the removal of include files in the common.h header,
leaving just one: config.h

It will eventually be possible to remove that as well, along with common.h
itself, but it easiest to wait for the Kconfig migration to complete.


Simon Glass (16):
  common: Drop asm/global_data.h from common header
  common: Drop display_options.h from common header
  common: Drop linux/printk.h from common header
  Fix code style for time functions
  common: Drop time.h from common header
  common: Drop linux/string.h from common header
  common: Drop asm/u-boot.h from common header
  common: Drop stdio.h from common header
  common: Drop stdarg.h from common header
  common: Drop vsprintf.h from common header
  common: Drop errno.h from common header
  common: Drop linux/kernel.h from common header
  common: Drop linux/types.h from common header
  common: Move the build-system includes to a separate file
  common: Add a comment about the current state of common.h
  Makefile: Drop linux/kconfig.h from config.h

 api/api.c                                     |  5 ++++
 api/api_display.c                             |  1 +
 api/api_net.c                                 |  2 ++
 api/api_private.h                             |  1 +
 api/api_storage.c                             |  2 ++
 arch/arc/include/asm/sections.h               |  1 +
 arch/arc/include/asm/u-boot-arc.h             |  1 +
 arch/arc/lib/bootm.c                          |  5 ++++
 arch/arc/lib/cache.c                          |  3 ++
 arch/arc/lib/cpu.c                            |  5 ++++
 arch/arc/lib/interrupts.c                     |  3 ++
 arch/arc/lib/relocate.c                       |  3 ++
 arch/arc/lib/reset.c                          |  3 ++
 arch/arm/cpu/arm1136/mx31/generic.c           |  3 ++
 arch/arm/cpu/arm1136/mx35/generic.c           |  5 ++++
 arch/arm/cpu/arm720t/cpu.c                    |  2 ++
 arch/arm/cpu/arm720t/interrupts.c             |  1 +
 arch/arm/cpu/arm920t/ep93xx/cpu.c             |  1 +
 arch/arm/cpu/arm920t/ep93xx/led.c             |  1 +
 arch/arm/cpu/arm920t/ep93xx/speed.c           |  1 +
 arch/arm/cpu/arm920t/imx/timer.c              |  2 +-
 arch/arm/cpu/arm926ejs/armada100/cpu.c        |  3 ++
 arch/arm/cpu/arm926ejs/armada100/dram.c       |  4 +++
 arch/arm/cpu/arm926ejs/armada100/timer.c      |  2 ++
 arch/arm/cpu/arm926ejs/cache.c                |  1 +
 arch/arm/cpu/arm926ejs/mx25/generic.c         |  6 ++++
 arch/arm/cpu/arm926ejs/mx25/reset.c           |  1 +
 arch/arm/cpu/arm926ejs/mx27/generic.c         |  4 +++
 arch/arm/cpu/arm926ejs/mx27/reset.c           |  1 +
 arch/arm/cpu/arm926ejs/mx27/timer.c           |  2 ++
 arch/arm/cpu/arm926ejs/mxs/clock.c            |  1 +
 arch/arm/cpu/arm926ejs/mxs/iomux.c            |  1 +
 arch/arm/cpu/arm926ejs/mxs/mxs.c              |  6 ++++
 arch/arm/cpu/arm926ejs/mxs/mxs_init.h         |  1 +
 arch/arm/cpu/arm926ejs/mxs/spl_boot.c         |  5 ++++
 arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c     |  3 ++
 arch/arm/cpu/arm926ejs/mxs/spl_power_init.c   |  3 ++
 arch/arm/cpu/arm926ejs/mxs/timer.c            |  2 ++
 arch/arm/cpu/arm926ejs/spear/cpu.c            |  4 +++
 arch/arm/cpu/arm926ejs/spear/reset.c          |  2 ++
 arch/arm/cpu/arm926ejs/spear/spear600.c       |  2 ++
 arch/arm/cpu/arm926ejs/spear/spl.c            |  3 ++
 .../spear/spr600_mt47h128m8_3_266_cl5_async.c |  1 +
 .../spear/spr600_mt47h32m16_333_cl5_psync.c   |  1 +
 .../spr600_mt47h32m16_37e_166_cl4_sync.c      |  1 +
 .../spear/spr600_mt47h64m16_3_333_cl5_psync.c |  1 +
 arch/arm/cpu/arm926ejs/spear/spr_misc.c       |  6 ++++
 arch/arm/cpu/arm926ejs/spear/timer.c          |  2 ++
 arch/arm/cpu/arm946es/cpu.c                   |  1 +
 arch/arm/cpu/armv7/arch_timer.c               |  2 ++
 arch/arm/cpu/armv7/bcm235xx/clk-bcm235xx.c    |  2 ++
 arch/arm/cpu/armv7/bcm235xx/clk-bsc.c         |  2 ++
 arch/arm/cpu/armv7/bcm235xx/clk-core.c        |  5 ++++
 arch/arm/cpu/armv7/bcm235xx/clk-core.h        |  3 ++
 arch/arm/cpu/armv7/bcm235xx/clk-eth.c         |  1 +
 arch/arm/cpu/armv7/bcm235xx/clk-sdio.c        |  2 ++
 arch/arm/cpu/armv7/bcm235xx/clk-usb-otg.c     |  2 ++
 arch/arm/cpu/armv7/bcm281xx/clk-bcm281xx.c    |  2 ++
 arch/arm/cpu/armv7/bcm281xx/clk-bsc.c         |  2 ++
 arch/arm/cpu/armv7/bcm281xx/clk-core.c        |  5 ++++
 arch/arm/cpu/armv7/bcm281xx/clk-core.h        |  3 ++
 arch/arm/cpu/armv7/bcm281xx/clk-eth.c         |  1 +
 arch/arm/cpu/armv7/bcm281xx/clk-sdio.c        |  2 ++
 arch/arm/cpu/armv7/bcm281xx/clk-usb-otg.c     |  2 ++
 arch/arm/cpu/armv7/bcm281xx/reset.c           |  1 +
 arch/arm/cpu/armv7/bcmcygnus/reset.c          |  1 +
 arch/arm/cpu/armv7/bcmnsp/reset.c             |  1 +
 arch/arm/cpu/armv7/cache_v7.c                 |  1 +
 arch/arm/cpu/armv7/cp15.c                     |  2 ++
 arch/arm/cpu/armv7/cpu.c                      |  2 ++
 arch/arm/cpu/armv7/exception_level.c          |  2 ++
 arch/arm/cpu/armv7/iproc-common/armpll.c      |  2 ++
 arch/arm/cpu/armv7/iproc-common/timer.c       |  1 +
 arch/arm/cpu/armv7/kona-common/clk-stubs.c    |  2 ++
 arch/arm/cpu/armv7/kona-common/s_init.c       |  1 +
 arch/arm/cpu/armv7/ls102xa/clock.c            |  5 ++++
 arch/arm/cpu/armv7/ls102xa/cpu.c              |  6 ++++
 arch/arm/cpu/armv7/ls102xa/fdt.c              |  8 ++++++
 arch/arm/cpu/armv7/ls102xa/fsl_epu.c          |  1 +
 arch/arm/cpu/armv7/ls102xa/fsl_ls1_serdes.c   |  3 ++
 arch/arm/cpu/armv7/ls102xa/fsl_ls1_serdes.h   |  1 +
 arch/arm/cpu/armv7/ls102xa/ls102xa_psci.c     |  2 ++
 arch/arm/cpu/armv7/ls102xa/ls102xa_serdes.c   |  2 ++
 arch/arm/cpu/armv7/ls102xa/soc.c              |  4 +++
 arch/arm/cpu/armv7/ls102xa/spl.c              |  1 +
 arch/arm/cpu/armv7/ls102xa/timer.c            |  2 ++
 arch/arm/cpu/armv7/mpu_v7r.c                  |  1 +
 arch/arm/cpu/armv7/psci-common.c              |  1 +
 arch/arm/cpu/armv7/s5p-common/cpu_info.c      |  5 ++++
 arch/arm/cpu/armv7/s5p-common/pwm.c           |  2 ++
 arch/arm/cpu/armv7/s5p-common/sromc.c         |  1 +
 arch/arm/cpu/armv7/s5p-common/timer.c         |  3 ++
 arch/arm/cpu/armv7/s5p4418/cpu.c              |  2 ++
 arch/arm/cpu/armv7/stv0991/reset.c            |  2 ++
 arch/arm/cpu/armv7/stv0991/timer.c            |  2 ++
 arch/arm/cpu/armv7/sunxi/psci.c               |  2 ++
 arch/arm/cpu/armv7/sunxi/timer.c              |  2 ++
 arch/arm/cpu/armv7/syslib.c                   |  1 +
 arch/arm/cpu/armv7/vf610/generic.c            |  7 +++++
 arch/arm/cpu/armv7/vf610/timer.c              |  2 ++
 arch/arm/cpu/armv7/virt-dt.c                  |  1 +
 arch/arm/cpu/armv7/virt-v7.c                  |  5 ++++
 arch/arm/cpu/armv7m/cache.c                   |  3 ++
 arch/arm/cpu/armv7m/cpu.c                     |  2 ++
 arch/arm/cpu/armv7m/mpu.c                     |  1 +
 arch/arm/cpu/armv7m/systick-timer.c           |  2 ++
 arch/arm/cpu/armv8/cache_v8.c                 |  8 ++++++
 arch/arm/cpu/armv8/cpu.c                      |  4 +++
 arch/arm/cpu/armv8/exception_level.c          |  1 +
 arch/arm/cpu/armv8/fsl-layerscape/cpu.c       |  7 +++++
 arch/arm/cpu/armv8/fsl-layerscape/cpu.h       |  1 +
 arch/arm/cpu/armv8/fsl-layerscape/fdt.c       |  5 ++++
 .../armv8/fsl-layerscape/fsl_lsch2_serdes.c   |  4 +++
 .../armv8/fsl-layerscape/fsl_lsch2_speed.c    |  5 ++++
 .../armv8/fsl-layerscape/fsl_lsch3_serdes.c   |  6 ++++
 .../armv8/fsl-layerscape/fsl_lsch3_speed.c    |  5 ++++
 arch/arm/cpu/armv8/fsl-layerscape/icid.c      |  3 ++
 .../cpu/armv8/fsl-layerscape/ls1012a_serdes.c |  2 ++
 .../arm/cpu/armv8/fsl-layerscape/ls1028_ids.c |  3 ++
 .../cpu/armv8/fsl-layerscape/ls1028a_serdes.c |  2 ++
 .../arm/cpu/armv8/fsl-layerscape/ls1043_ids.c |  1 +
 .../cpu/armv8/fsl-layerscape/ls1043a_serdes.c |  2 ++
 .../arm/cpu/armv8/fsl-layerscape/ls1046_ids.c |  1 +
 .../cpu/armv8/fsl-layerscape/ls1046a_serdes.c |  2 ++
 .../arm/cpu/armv8/fsl-layerscape/ls1088_ids.c |  1 +
 .../cpu/armv8/fsl-layerscape/ls1088a_serdes.c |  4 +++
 .../cpu/armv8/fsl-layerscape/ls2080a_serdes.c |  2 ++
 .../arm/cpu/armv8/fsl-layerscape/ls2088_ids.c |  1 +
 .../arm/cpu/armv8/fsl-layerscape/lx2160_ids.c |  1 +
 .../cpu/armv8/fsl-layerscape/lx2160a_serdes.c |  2 ++
 arch/arm/cpu/armv8/fsl-layerscape/mp.c        |  8 ++++++
 arch/arm/cpu/armv8/fsl-layerscape/ppa.c       |  6 ++++
 arch/arm/cpu/armv8/fsl-layerscape/soc.c       |  7 +++++
 arch/arm/cpu/armv8/fsl-layerscape/spl.c       |  5 ++++
 arch/arm/cpu/armv8/fwcall.c                   |  2 ++
 arch/arm/cpu/armv8/generic_timer.c            |  2 ++
 arch/arm/cpu/armv8/hisilicon/pinmux.c         |  1 +
 arch/arm/cpu/armv8/s32v234/cpu.c              |  3 ++
 arch/arm/cpu/armv8/s32v234/cpu.h              |  1 +
 arch/arm/cpu/armv8/s32v234/generic.c          |  5 ++++
 arch/arm/cpu/armv8/sec_firmware.c             |  7 +++++
 arch/arm/cpu/armv8/spin_table.c               |  3 ++
 arch/arm/cpu/armv8/spl_data.c                 |  2 ++
 arch/arm/cpu/pxa/cache.c                      |  1 +
 arch/arm/cpu/pxa/cpuinfo.c                    |  3 ++
 arch/arm/cpu/pxa/pxa2xx.c                     |  2 ++
 arch/arm/cpu/sa1100/cpu.c                     |  1 +
 arch/arm/cpu/sa1100/timer.c                   |  3 +-
 .../include/asm/arch-am33xx/clk_synthesizer.h |  1 +
 arch/arm/include/asm/arch-am33xx/clock.h      |  1 +
 arch/arm/include/asm/arch-am33xx/ddr_defs.h   |  1 +
 arch/arm/include/asm/arch-am33xx/sys_proto.h  |  1 +
 arch/arm/include/asm/arch-armada100/cpu.h     |  1 +
 arch/arm/include/asm/arch-armada100/spi.h     |  1 +
 .../asm/arch-armada100/utmi-armada100.h       |  1 +
 arch/arm/include/asm/arch-armv7/globaltimer.h |  1 +
 arch/arm/include/asm/arch-armv7/sysctrl.h     |  1 +
 arch/arm/include/asm/arch-armv7/systimer.h    |  1 +
 arch/arm/include/asm/arch-armv7/wdt.h         |  1 +
 .../arm/include/asm/arch-aspeed/scu_ast2500.h |  1 +
 .../include/asm/arch-aspeed/sdram_ast2500.h   |  1 +
 arch/arm/include/asm/arch-aspeed/timer.h      |  1 +
 arch/arm/include/asm/arch-aspeed/wdt.h        |  1 +
 arch/arm/include/asm/arch-ep93xx/ep93xx.h     |  1 +
 .../include/asm/arch-fsl-layerscape/clock.h   |  2 ++
 .../arm/include/asm/arch-fsl-layerscape/cpu.h |  1 +
 .../asm/arch-fsl-layerscape/fsl_icid.h        |  1 +
 .../asm/arch-fsl-layerscape/fsl_portals.h     |  1 +
 .../asm/arch-fsl-layerscape/fsl_serdes.h      |  1 +
 .../include/asm/arch-fsl-layerscape/gpio.h    |  1 +
 .../asm/arch-fsl-layerscape/immap_lsch2.h     |  2 ++
 .../asm/arch-fsl-layerscape/immap_lsch3.h     |  1 +
 arch/arm/include/asm/arch-fsl-layerscape/mp.h |  1 +
 .../arm/include/asm/arch-fsl-layerscape/soc.h |  1 +
 .../include/asm/arch-fsl-layerscape/speed.h   |  1 +
 arch/arm/include/asm/arch-hi6220/dwmmc.h      |  1 +
 arch/arm/include/asm/arch-hi6220/gpio.h       |  1 +
 .../asm/arch-hi6220/hi6220_regs_alwayson.h    |  1 +
 arch/arm/include/asm/arch-hi6220/pinmux.h     |  1 +
 arch/arm/include/asm/arch-imx/cpu.h           |  1 +
 arch/arm/include/asm/arch-imx8/clock.h        |  1 +
 arch/arm/include/asm/arch-imx8/gpio.h         |  1 +
 arch/arm/include/asm/arch-imx8/image.h        |  1 +
 arch/arm/include/asm/arch-imx8/iomux.h        |  1 +
 arch/arm/include/asm/arch-imx8/sci/rpc.h      |  1 +
 arch/arm/include/asm/arch-imx8/sci/sci.h      |  1 +
 .../include/asm/arch-imx8/sci/svc/misc/api.h  |  1 +
 .../include/asm/arch-imx8/sci/svc/pm/api.h    |  1 +
 .../include/asm/arch-imx8/sci/svc/rm/api.h    |  1 +
 .../include/asm/arch-imx8/sci/svc/seco/api.h  |  1 +
 arch/arm/include/asm/arch-imx8/sys_proto.h    |  1 +
 arch/arm/include/asm/arch-imx8m/clock.h       |  2 ++
 .../arm/include/asm/arch-imx8m/clock_imx8mm.h |  1 +
 arch/arm/include/asm/arch-imx8m/ddr.h         |  1 +
 arch/arm/include/asm/arch-imxrt/gpio.h        |  1 +
 arch/arm/include/asm/arch-lpc32xx/dma.h       |  1 +
 arch/arm/include/asm/arch-lpc32xx/gpio.h      |  1 +
 arch/arm/include/asm/arch-lpc32xx/i2c.h       |  1 +
 arch/arm/include/asm/arch-lpc32xx/mux.h       |  1 +
 arch/arm/include/asm/arch-ls102xa/clock.h     |  2 ++
 .../arm/include/asm/arch-ls102xa/fsl_serdes.h |  1 +
 .../include/asm/arch-ls102xa/immap_ls102xa.h  |  2 ++
 .../asm/arch-ls102xa/ls102xa_stream_id.h      |  1 +
 arch/arm/include/asm/arch-mediatek/reset.h    |  1 +
 arch/arm/include/asm/arch-meson/clock-gx.h    |  1 +
 arch/arm/include/asm/arch-meson/sm.h          |  1 +
 arch/arm/include/asm/arch-mvebu/spi.h         |  1 +
 arch/arm/include/asm/arch-mx25/clock.h        |  1 +
 arch/arm/include/asm/arch-mx27/gpio.h         |  1 +
 arch/arm/include/asm/arch-mx27/imx-regs.h     |  1 +
 arch/arm/include/asm/arch-mx27/mxcmmc.h       |  1 +
 arch/arm/include/asm/arch-mx27/regs-rtc.h     |  1 +
 arch/arm/include/asm/arch-mx31/clock.h        |  1 +
 arch/arm/include/asm/arch-mx31/sys_proto.h    |  2 ++
 arch/arm/include/asm/arch-mx35/clock.h        |  1 +
 arch/arm/include/asm/arch-mx35/sys_proto.h    |  1 +
 arch/arm/include/asm/arch-mx5/clock.h         |  2 ++
 arch/arm/include/asm/arch-mx5/crm_regs.h      |  1 +
 arch/arm/include/asm/arch-mx6/clock.h         |  1 +
 arch/arm/include/asm/arch-mx6/crm_regs.h      |  1 +
 arch/arm/include/asm/arch-mx6/litesom.h       |  1 +
 arch/arm/include/asm/arch-mx6/mx6-ddr.h       |  1 +
 arch/arm/include/asm/arch-mx6/mxc_hdmi.h      |  1 +
 arch/arm/include/asm/arch-mx6/sys_proto.h     |  1 +
 arch/arm/include/asm/arch-mx7/clock.h         |  1 +
 arch/arm/include/asm/arch-mx7/clock_slice.h   |  2 ++
 arch/arm/include/asm/arch-mx7/crm_regs.h      |  1 +
 arch/arm/include/asm/arch-mx7/imx-regs.h      |  1 +
 arch/arm/include/asm/arch-mx7/mx7-ddr.h       |  1 +
 arch/arm/include/asm/arch-mx7ulp/clock.h      |  1 +
 arch/arm/include/asm/arch-mx7ulp/gpio.h       |  1 +
 arch/arm/include/asm/arch-mx7ulp/pcc.h        |  2 ++
 arch/arm/include/asm/arch-mx7ulp/scg.h        |  4 +++
 arch/arm/include/asm/arch-mxs/clock.h         |  1 +
 .../include/asm/arch-mxs/regs-clkctrl-mx23.h  |  1 +
 .../include/asm/arch-mxs/regs-clkctrl-mx28.h  |  1 +
 arch/arm/include/asm/arch-mxs/regs-digctl.h   |  1 +
 arch/arm/include/asm/arch-mxs/regs-pinctrl.h  |  1 +
 .../include/asm/arch-mxs/regs-power-mx23.h    |  1 +
 .../include/asm/arch-mxs/regs-power-mx28.h    |  1 +
 arch/arm/include/asm/arch-mxs/regs-ssp.h      |  1 +
 arch/arm/include/asm/arch-mxs/regs-usb.h      |  1 +
 arch/arm/include/asm/arch-mxs/sys_proto.h     |  2 ++
 arch/arm/include/asm/arch-omap3/dma.h         |  1 +
 arch/arm/include/asm/arch-omap3/dss.h         |  1 +
 arch/arm/include/asm/arch-omap3/mem.h         |  1 +
 arch/arm/include/asm/arch-omap3/musb.h        |  1 +
 arch/arm/include/asm/arch-omap3/sys_proto.h   |  1 +
 arch/arm/include/asm/arch-omap4/clock.h       |  1 +
 arch/arm/include/asm/arch-omap4/sys_proto.h   |  1 +
 .../include/asm/arch-omap5/dra7xx_iodelay.h   |  1 +
 arch/arm/include/asm/arch-omap5/sys_proto.h   |  1 +
 arch/arm/include/asm/arch-pxa/pxa.h           |  1 +
 arch/arm/include/asm/arch-pxa/regs-mmc.h      |  1 +
 arch/arm/include/asm/arch-pxa/regs-uart.h     |  1 +
 arch/arm/include/asm/arch-pxa/regs-usb.h      |  1 +
 arch/arm/include/asm/arch-rk3308/cru_rk3308.h |  2 ++
 arch/arm/include/asm/arch-rk3308/grf_rk3308.h |  1 +
 arch/arm/include/asm/arch-rockchip/bootrom.h  |  1 +
 arch/arm/include/asm/arch-rockchip/clock.h    |  6 ++++
 .../include/asm/arch-rockchip/cpu_rk3288.h    |  2 ++
 arch/arm/include/asm/arch-rockchip/cru_px30.h |  2 ++
 .../include/asm/arch-rockchip/cru_rk3036.h    |  2 ++
 .../include/asm/arch-rockchip/cru_rk3128.h    |  2 ++
 .../include/asm/arch-rockchip/cru_rk3188.h    |  3 ++
 .../include/asm/arch-rockchip/cru_rk322x.h    |  2 ++
 .../include/asm/arch-rockchip/cru_rk3288.h    |  2 ++
 .../include/asm/arch-rockchip/cru_rk3328.h    |  2 ++
 .../include/asm/arch-rockchip/cru_rk3368.h    |  1 +
 .../include/asm/arch-rockchip/cru_rk3399.h    |  2 ++
 .../include/asm/arch-rockchip/cru_rv1108.h    |  2 ++
 .../include/asm/arch-rockchip/ddr_rk3188.h    |  2 ++
 .../include/asm/arch-rockchip/ddr_rk3288.h    |  2 ++
 .../include/asm/arch-rockchip/ddr_rk3368.h    |  2 ++
 .../include/asm/arch-rockchip/edp_rk3288.h    |  2 ++
 .../arm/include/asm/arch-rockchip/f_rockusb.h |  1 +
 arch/arm/include/asm/arch-rockchip/gpio.h     |  2 ++
 arch/arm/include/asm/arch-rockchip/grf_px30.h |  1 +
 .../include/asm/arch-rockchip/grf_rk3036.h    |  1 +
 .../include/asm/arch-rockchip/grf_rk3128.h    |  1 +
 .../include/asm/arch-rockchip/grf_rk3188.h    |  2 ++
 .../include/asm/arch-rockchip/grf_rk322x.h    |  1 +
 .../include/asm/arch-rockchip/grf_rk3288.h    |  1 +
 .../include/asm/arch-rockchip/grf_rk3328.h    |  2 ++
 .../include/asm/arch-rockchip/grf_rk3368.h    |  2 ++
 .../include/asm/arch-rockchip/grf_rk3399.h    |  2 ++
 .../include/asm/arch-rockchip/grf_rv1108.h    |  2 ++
 arch/arm/include/asm/arch-rockchip/i2c.h      |  1 +
 arch/arm/include/asm/arch-rockchip/misc.h     |  1 +
 .../include/asm/arch-rockchip/pmu_rk3188.h    |  2 ++
 .../include/asm/arch-rockchip/pmu_rk3288.h    |  2 ++
 .../include/asm/arch-rockchip/pmu_rk3399.h    |  2 ++
 arch/arm/include/asm/arch-rockchip/sdram.h    |  1 +
 .../include/asm/arch-rockchip/sdram_common.h  |  1 +
 .../include/asm/arch-rockchip/sdram_msch.h    |  1 +
 .../asm/arch-rockchip/sdram_pctl_px30.h       |  2 ++
 .../asm/arch-rockchip/sdram_phy_px30.h        |  2 ++
 .../include/asm/arch-rockchip/sdram_px30.h    |  1 +
 .../include/asm/arch-rockchip/sdram_rk3036.h  |  2 ++
 .../include/asm/arch-rockchip/sdram_rk322x.h  |  2 ++
 .../include/asm/arch-rockchip/sdram_rk3288.h  |  2 ++
 .../include/asm/arch-rockchip/sdram_rk3328.h  |  1 +
 .../include/asm/arch-rockchip/sdram_rk3399.h  |  1 +
 arch/arm/include/asm/arch-rockchip/timer.h    |  1 +
 .../include/asm/arch-rockchip/vop_rk3288.h    |  2 ++
 arch/arm/include/asm/arch-s32v234/lpddr2.h    |  1 +
 arch/arm/include/asm/arch-spear/gpio.h        |  1 +
 arch/arm/include/asm/arch-spear/spr_defs.h    |  1 +
 arch/arm/include/asm/arch-spear/spr_emi.h     |  1 +
 arch/arm/include/asm/arch-spear/spr_gpt.h     |  1 +
 arch/arm/include/asm/arch-spear/spr_misc.h    |  1 +
 arch/arm/include/asm/arch-spear/spr_ssp.h     |  1 +
 arch/arm/include/asm/arch-spear/spr_syscntl.h |  1 +
 arch/arm/include/asm/arch-stm32/gpio.h        |  1 +
 arch/arm/include/asm/arch-stm32f4/stm32.h     |  1 +
 arch/arm/include/asm/arch-stm32f4/stm32_pwr.h |  1 +
 arch/arm/include/asm/arch-stm32f7/stm32.h     |  1 +
 arch/arm/include/asm/arch-stm32f7/stm32_pwr.h |  1 +
 arch/arm/include/asm/arch-stm32f7/syscfg.h    |  1 +
 arch/arm/include/asm/arch-stv0991/gpio.h      |  1 +
 .../include/asm/arch-stv0991/stv0991_cgu.h    |  1 +
 .../include/asm/arch-stv0991/stv0991_creg.h   |  1 +
 .../include/asm/arch-stv0991/stv0991_gpt.h    |  1 +
 .../include/asm/arch-stv0991/stv0991_wdru.h   |  1 +
 arch/arm/include/asm/arch-sunxi/ccu.h         |  1 +
 arch/arm/include/asm/arch-sunxi/clock_sun4i.h |  1 +
 .../include/asm/arch-sunxi/clock_sun50i_h6.h  |  1 +
 arch/arm/include/asm/arch-sunxi/clock_sun6i.h |  2 ++
 .../include/asm/arch-sunxi/clock_sun8i_a83t.h |  1 +
 arch/arm/include/asm/arch-sunxi/clock_sun9i.h |  1 +
 arch/arm/include/asm/arch-sunxi/cpucfg.h      |  1 +
 arch/arm/include/asm/arch-sunxi/display.h     |  1 +
 arch/arm/include/asm/arch-sunxi/display2.h    |  1 +
 arch/arm/include/asm/arch-sunxi/dma_sun4i.h   |  1 +
 arch/arm/include/asm/arch-sunxi/dram.h        |  1 +
 arch/arm/include/asm/arch-sunxi/dram_sun4i.h  |  1 +
 .../include/asm/arch-sunxi/dram_sun50i_h6.h   |  2 ++
 arch/arm/include/asm/arch-sunxi/dram_sun6i.h  |  1 +
 .../include/asm/arch-sunxi/dram_sun8i_a23.h   |  1 +
 .../include/asm/arch-sunxi/dram_sun8i_a33.h   |  1 +
 .../include/asm/arch-sunxi/dram_sun8i_a83t.h  |  1 +
 arch/arm/include/asm/arch-sunxi/dram_sun9i.h  |  1 +
 .../include/asm/arch-sunxi/dram_sunxi_dw.h    |  2 ++
 arch/arm/include/asm/arch-sunxi/lcdc.h        |  2 ++
 arch/arm/include/asm/arch-sunxi/prcm.h        |  1 +
 arch/arm/include/asm/arch-sunxi/pwm.h         |  1 +
 arch/arm/include/asm/arch-sunxi/rsb.h         |  1 +
 arch/arm/include/asm/arch-sunxi/spl.h         |  1 +
 arch/arm/include/asm/arch-sunxi/tve.h         |  1 +
 arch/arm/include/asm/arch-sunxi/tzpc.h        |  1 +
 arch/arm/include/asm/arch-sunxi/watchdog.h    |  1 +
 arch/arm/include/asm/arch-tegra/ap.h          |  1 +
 arch/arm/include/asm/arch-tegra/apb_misc.h    |  1 +
 arch/arm/include/asm/arch-tegra/bpmp_abi.h    |  1 +
 arch/arm/include/asm/arch-tegra/cboot.h       |  2 ++
 arch/arm/include/asm/arch-tegra/clk_rst.h     |  1 +
 arch/arm/include/asm/arch-tegra/clock.h       |  4 +++
 arch/arm/include/asm/arch-tegra/dc.h          |  1 +
 arch/arm/include/asm/arch-tegra/fuse.h        |  1 +
 arch/arm/include/asm/arch-tegra/gpio.h        |  1 +
 arch/arm/include/asm/arch-tegra/ivc.h         |  1 +
 arch/arm/include/asm/arch-tegra/pmc.h         |  1 +
 arch/arm/include/asm/arch-tegra/pwm.h         |  1 +
 arch/arm/include/asm/arch-tegra/scu.h         |  1 +
 arch/arm/include/asm/arch-tegra/tegra_ahub.h  |  1 +
 arch/arm/include/asm/arch-tegra/tegra_i2c.h   |  2 ++
 arch/arm/include/asm/arch-tegra/tegra_i2s.h   |  1 +
 arch/arm/include/asm/arch-tegra/uart.h        |  1 +
 arch/arm/include/asm/arch-tegra/usb.h         |  1 +
 arch/arm/include/asm/arch-tegra/warmboot.h    |  1 +
 arch/arm/include/asm/arch-tegra114/flow.h     |  1 +
 .../include/asm/arch-tegra114/gp_padctrl.h    |  1 +
 arch/arm/include/asm/arch-tegra114/mc.h       |  1 +
 arch/arm/include/asm/arch-tegra114/sysctr.h   |  1 +
 arch/arm/include/asm/arch-tegra124/ahb.h      |  1 +
 arch/arm/include/asm/arch-tegra124/clock.h    |  1 +
 arch/arm/include/asm/arch-tegra124/flow.h     |  1 +
 .../include/asm/arch-tegra124/gp_padctrl.h    |  1 +
 arch/arm/include/asm/arch-tegra124/gpio.h     |  1 +
 arch/arm/include/asm/arch-tegra124/mc.h       |  1 +
 arch/arm/include/asm/arch-tegra124/sysctr.h   |  1 +
 arch/arm/include/asm/arch-tegra20/display.h   |  1 +
 arch/arm/include/asm/arch-tegra20/flow.h      |  1 +
 .../arm/include/asm/arch-tegra20/gp_padctrl.h |  1 +
 arch/arm/include/asm/arch-tegra20/gpio.h      |  1 +
 arch/arm/include/asm/arch-tegra20/mc.h        |  1 +
 .../include/asm/arch-tegra20/sdram_param.h    |  1 +
 arch/arm/include/asm/arch-tegra210/ahb.h      |  1 +
 arch/arm/include/asm/arch-tegra210/flow.h     |  1 +
 .../include/asm/arch-tegra210/gp_padctrl.h    |  1 +
 arch/arm/include/asm/arch-tegra210/gpio.h     |  1 +
 arch/arm/include/asm/arch-tegra210/mc.h       |  1 +
 arch/arm/include/asm/arch-tegra210/sysctr.h   |  1 +
 arch/arm/include/asm/arch-tegra30/flow.h      |  1 +
 .../arm/include/asm/arch-tegra30/gp_padctrl.h |  1 +
 arch/arm/include/asm/arch-tegra30/gpio.h      |  1 +
 arch/arm/include/asm/arch-tegra30/mc.h        |  1 +
 arch/arm/include/asm/arch-vf610/clock.h       |  1 +
 arch/arm/include/asm/arch-vf610/ddrmc-vf610.h |  1 +
 arch/arm/include/asm/arch-vf610/gpio.h        |  1 +
 arch/arm/include/asm/armv7.h                  |  1 +
 arch/arm/include/asm/armv7_mpu.h              |  1 +
 arch/arm/include/asm/armv7m.h                 |  1 +
 arch/arm/include/asm/armv8/mmu.h              |  2 ++
 arch/arm/include/asm/armv8/sec_firmware.h     |  3 ++
 arch/arm/include/asm/bootm.h                  |  1 +
 arch/arm/include/asm/ehci-omap.h              |  1 +
 arch/arm/include/asm/global_data.h            |  3 ++
 arch/arm/include/asm/handoff.h                |  1 +
 arch/arm/include/asm/io.h                     |  2 ++
 .../include/asm/iproc-common/iproc_sdhci.h    |  1 +
 arch/arm/include/asm/kona-common/kona_sdhci.h |  1 +
 arch/arm/include/asm/mach-imx/dma.h           |  1 +
 arch/arm/include/asm/mach-imx/gpio.h          |  1 +
 arch/arm/include/asm/mach-imx/hab.h           |  2 ++
 arch/arm/include/asm/mach-imx/imx-nandbcb.h   |  1 +
 arch/arm/include/asm/mach-imx/iomux-v3.h      |  1 +
 arch/arm/include/asm/mach-imx/module_fuse.h   |  1 +
 arch/arm/include/asm/mach-imx/mxc_i2c.h       |  1 +
 arch/arm/include/asm/mach-imx/rdc-sema.h      |  1 +
 arch/arm/include/asm/mach-imx/regs-apbh.h     |  1 +
 arch/arm/include/asm/mach-imx/regs-bch.h      |  1 +
 arch/arm/include/asm/mach-imx/regs-gpmi.h     |  1 +
 arch/arm/include/asm/mach-imx/regs-lcdif.h    |  1 +
 arch/arm/include/asm/mach-imx/sys_proto.h     |  2 ++
 arch/arm/include/asm/mach-imx/syscounter.h    |  1 +
 arch/arm/include/asm/mach-imx/video.h         |  5 ++--
 arch/arm/include/asm/omap_common.h            |  1 +
 arch/arm/include/asm/omap_gpio.h              |  1 +
 arch/arm/include/asm/omap_i2c.h               |  1 +
 arch/arm/include/asm/omap_mmc.h               |  1 +
 arch/arm/include/asm/omap_musb.h              |  1 +
 arch/arm/include/asm/omap_sec_common.h        |  1 +
 arch/arm/include/asm/secure.h                 |  2 ++
 arch/arm/include/asm/setjmp.h                 |  1 +
 arch/arm/include/asm/setup.h                  |  1 +
 arch/arm/include/asm/string.h                 |  2 --
 arch/arm/include/asm/system.h                 |  1 +
 arch/arm/include/asm/ti-common/davinci_nand.h |  1 +
 arch/arm/include/asm/ti-common/keystone_nav.h |  1 +
 arch/arm/include/asm/ti-common/keystone_net.h |  1 +
 .../include/asm/ti-common/keystone_serdes.h   |  1 +
 arch/arm/include/asm/ti-common/sys_proto.h    |  3 ++
 arch/arm/include/asm/ti-common/ti-edma3.h     |  2 ++
 arch/arm/include/asm/u-boot-arm.h             |  1 +
 arch/arm/include/asm/utils.h                  |  1 +
 arch/arm/lib/bdinfo.c                         |  3 ++
 arch/arm/lib/bootm-fdt.c                      |  3 ++
 arch/arm/lib/bootm.c                          |  8 ++++++
 arch/arm/lib/cache-cp15.c                     |  6 ++++
 arch/arm/lib/cache-pl310.c                    |  1 +
 arch/arm/lib/cache.c                          |  5 ++++
 arch/arm/lib/cmd_boot.c                       |  1 +
 arch/arm/lib/eabi_compat.c                    |  3 ++
 arch/arm/lib/gic-v3-its.c                     |  4 +++
 arch/arm/lib/image.c                          |  6 ++++
 arch/arm/lib/interrupts.c                     |  3 ++
 arch/arm/lib/interrupts_64.c                  |  6 ++++
 arch/arm/lib/interrupts_m.c                   |  3 ++
 arch/arm/lib/psci-dt.c                        |  2 ++
 arch/arm/lib/reloc_aarch64_efi.c              |  1 +
 arch/arm/lib/reloc_arm_efi.c                  |  1 +
 arch/arm/lib/reset.c                          |  2 ++
 arch/arm/lib/semihosting.c                    |  4 +++
 arch/arm/lib/spl.c                            |  4 +++
 arch/arm/lib/stack.c                          |  1 +
 arch/arm/lib/zimage.c                         |  3 ++
 arch/arm/mach-aspeed/ast2500-board.c          |  2 ++
 arch/arm/mach-aspeed/ast2500/sdram_ast2500.c  |  3 ++
 arch/arm/mach-aspeed/ast_wdt.c                |  1 +
 arch/arm/mach-at91/arm920t/clock.c            |  4 +++
 arch/arm/mach-at91/arm920t/cpu.c              |  1 +
 arch/arm/mach-at91/arm920t/reset.c            |  1 +
 arch/arm/mach-at91/arm920t/timer.c            |  2 ++
 arch/arm/mach-at91/arm926ejs/clock.c          |  4 +++
 arch/arm/mach-at91/arm926ejs/cpu.c            |  3 ++
 arch/arm/mach-at91/arm926ejs/eflash.c         |  3 ++
 arch/arm/mach-at91/arm926ejs/reset.c          |  1 +
 arch/arm/mach-at91/arm926ejs/timer.c          |  2 ++
 arch/arm/mach-at91/armv7/clock.c              |  3 ++
 arch/arm/mach-at91/armv7/cpu.c                |  3 ++
 arch/arm/mach-at91/armv7/reset.c              |  1 +
 arch/arm/mach-at91/armv7/timer.c              |  2 ++
 arch/arm/mach-at91/atmel_sfr.c                |  2 ++
 arch/arm/mach-at91/clock.c                    |  3 ++
 arch/arm/mach-at91/include/mach/at91_common.h |  2 ++
 arch/arm/mach-at91/include/mach/at91_dbu.h    |  1 +
 arch/arm/mach-at91/include/mach/at91_eefc.h   |  1 +
 arch/arm/mach-at91/include/mach/at91_emac.h   |  1 +
 arch/arm/mach-at91/include/mach/at91_gpbr.h   |  1 +
 arch/arm/mach-at91/include/mach/at91_matrix.h |  1 +
 arch/arm/mach-at91/include/mach/at91_mc.h     |  1 +
 arch/arm/mach-at91/include/mach/at91_pdc.h    |  1 +
 arch/arm/mach-at91/include/mach/at91_pio.h    |  1 +
 arch/arm/mach-at91/include/mach/at91_pit.h    |  1 +
 arch/arm/mach-at91/include/mach/at91_rstc.h   |  1 +
 arch/arm/mach-at91/include/mach/at91_rtt.h    |  1 +
 arch/arm/mach-at91/include/mach/at91_sfr.h    |  1 +
 arch/arm/mach-at91/include/mach/at91_spi.h    |  1 +
 arch/arm/mach-at91/include/mach/at91_st.h     |  1 +
 arch/arm/mach-at91/include/mach/at91_tc.h     |  1 +
 arch/arm/mach-at91/include/mach/at91_wdt.h    |  2 ++
 .../include/mach/at91sam9260_matrix.h         |  1 +
 .../include/mach/at91sam9261_matrix.h         |  1 +
 .../include/mach/at91sam9263_matrix.h         |  1 +
 .../mach-at91/include/mach/at91sam9_sdramc.h  |  1 +
 .../arm/mach-at91/include/mach/at91sam9_smc.h |  1 +
 .../include/mach/at91sam9g45_matrix.h         |  1 +
 .../include/mach/at91sam9rl_matrix.h          |  1 +
 .../include/mach/at91sam9x5_matrix.h          |  1 +
 .../arm/mach-at91/include/mach/atmel_mpddrc.h |  1 +
 arch/arm/mach-at91/include/mach/atmel_pio4.h  |  1 +
 arch/arm/mach-at91/include/mach/atmel_sdhci.h |  1 +
 .../arm/mach-at91/include/mach/atmel_serial.h |  1 +
 .../mach-at91/include/mach/atmel_usba_udc.h   |  1 +
 arch/arm/mach-at91/include/mach/clk.h         |  1 +
 arch/arm/mach-at91/include/mach/gpio.h        |  1 +
 .../arm/mach-at91/include/mach/sama5_matrix.h |  1 +
 arch/arm/mach-at91/include/mach/sama5d2_smc.h |  1 +
 arch/arm/mach-at91/include/mach/sama5d3_smc.h |  1 +
 arch/arm/mach-at91/mpddrc.c                   |  1 +
 arch/arm/mach-at91/phy.c                      |  2 ++
 arch/arm/mach-at91/spl.c                      |  2 ++
 arch/arm/mach-at91/spl_at91.c                 |  3 ++
 arch/arm/mach-at91/spl_atmel.c                |  3 ++
 arch/arm/mach-bcm283x/include/mach/gpio.h     |  1 +
 arch/arm/mach-bcm283x/include/mach/mbox.h     |  5 +++-
 arch/arm/mach-bcm283x/include/mach/msg.h      |  1 +
 arch/arm/mach-bcm283x/include/mach/sdhci.h    |  1 +
 arch/arm/mach-bcm283x/include/mach/wdog.h     |  1 +
 arch/arm/mach-bcm283x/init.c                  |  3 ++
 arch/arm/mach-bcm283x/mbox.c                  |  4 +++
 arch/arm/mach-bcm283x/msg.c                   |  3 ++
 arch/arm/mach-bcm283x/reset.c                 |  1 +
 arch/arm/mach-bcmstb/include/mach/timer.h     |  1 +
 arch/arm/mach-davinci/cpu.c                   |  2 ++
 arch/arm/mach-davinci/da850_lowlevel.c        |  1 +
 .../mach-davinci/include/mach/davinci_misc.h  |  2 ++
 .../include/mach/dm365_lowlevel.h             |  1 +
 .../mach-davinci/include/mach/sdmmc_defs.h    |  2 ++
 .../mach-davinci/include/mach/timer_defs.h    |  1 +
 arch/arm/mach-davinci/misc.c                  |  4 +++
 arch/arm/mach-davinci/spl.c                   |  2 ++
 arch/arm/mach-davinci/timer.c                 |  2 ++
 arch/arm/mach-exynos/clock.c                  |  4 +++
 arch/arm/mach-exynos/clock_init.h             |  1 +
 arch/arm/mach-exynos/clock_init_exynos5.c     |  2 ++
 arch/arm/mach-exynos/common_setup.h           |  1 +
 arch/arm/mach-exynos/dmc_common.c             |  1 +
 arch/arm/mach-exynos/dmc_init_ddr3.c          |  3 ++
 arch/arm/mach-exynos/exynos5_setup.h          |  1 +
 arch/arm/mach-exynos/include/mach/mmc.h       |  1 +
 arch/arm/mach-exynos/include/mach/power.h     |  1 +
 arch/arm/mach-exynos/include/mach/spl.h       |  2 ++
 arch/arm/mach-exynos/include/mach/sromc.h     |  1 +
 arch/arm/mach-exynos/include/mach/sys_proto.h |  1 +
 arch/arm/mach-exynos/include/mach/tmu.h       |  1 +
 arch/arm/mach-exynos/lowlevel_init.c          |  2 ++
 arch/arm/mach-exynos/pinmux.c                 |  2 ++
 arch/arm/mach-exynos/power.c                  |  1 +
 arch/arm/mach-exynos/soc.c                    |  1 +
 arch/arm/mach-exynos/spl_boot.c               |  3 ++
 arch/arm/mach-imx/cache.c                     |  2 ++
 arch/arm/mach-imx/cmd_bmode.c                 |  2 ++
 arch/arm/mach-imx/cmd_dek.c                   |  2 ++
 arch/arm/mach-imx/cmd_nandbcb.c               |  7 +++++
 arch/arm/mach-imx/cpu.c                       |  5 +++-
 arch/arm/mach-imx/ddrmc-vf610-calibration.c   |  1 +
 arch/arm/mach-imx/ddrmc-vf610.c               |  1 +
 arch/arm/mach-imx/hab.c                       |  5 ++++
 arch/arm/mach-imx/i2c-mxv7.c                  |  5 ++++
 arch/arm/mach-imx/imx8/ahab.c                 |  9 ++++++
 arch/arm/mach-imx/imx8/clock.c                |  3 ++
 arch/arm/mach-imx/imx8/cpu.c                  |  8 ++++++
 arch/arm/mach-imx/imx8/fdt.c                  |  8 ++++++
 arch/arm/mach-imx/imx8/image.c                |  5 ++++
 arch/arm/mach-imx/imx8/iomux.c                |  3 ++
 arch/arm/mach-imx/imx8/misc.c                 |  2 ++
 arch/arm/mach-imx/imx8/parse-container.c      |  5 ++++
 arch/arm/mach-imx/imx8/snvs_security_sc.c     |  6 ++++
 arch/arm/mach-imx/imx8m/clock_imx8mm.c        |  6 ++++
 arch/arm/mach-imx/imx8m/clock_imx8mq.c        |  5 ++++
 arch/arm/mach-imx/imx8m/clock_slice.c         |  5 ++++
 arch/arm/mach-imx/imx8m/soc.c                 | 10 +++++++
 arch/arm/mach-imx/imx_bootaux.c               |  4 +++
 arch/arm/mach-imx/imxrt/soc.c                 |  2 ++
 arch/arm/mach-imx/init.c                      |  1 +
 arch/arm/mach-imx/iomux-v3.c                  |  1 +
 arch/arm/mach-imx/mac.c                       |  2 ++
 arch/arm/mach-imx/misc.c                      |  3 ++
 arch/arm/mach-imx/mmc_env.c                   |  2 ++
 arch/arm/mach-imx/mmdc_size.c                 |  1 +
 arch/arm/mach-imx/mx5/clock.c                 |  5 ++++
 arch/arm/mach-imx/mx5/mx53_dram.c             |  2 ++
 arch/arm/mach-imx/mx5/soc.c                   |  2 ++
 arch/arm/mach-imx/mx6/clock.c                 |  5 ++++
 arch/arm/mach-imx/mx6/ddr.c                   |  3 ++
 arch/arm/mach-imx/mx6/litesom.c               |  4 +++
 arch/arm/mach-imx/mx6/module_fuse.c           |  5 ++++
 arch/arm/mach-imx/mx6/mp.c                    |  3 ++
 arch/arm/mach-imx/mx6/opos6ul.c               |  4 +++
 arch/arm/mach-imx/mx6/soc.c                   |  4 +++
 arch/arm/mach-imx/mx7/clock.c                 |  4 +++
 arch/arm/mach-imx/mx7/clock_slice.c           |  4 +++
 arch/arm/mach-imx/mx7/psci-mx7.c              |  2 ++
 arch/arm/mach-imx/mx7/snvs.c                  |  1 +
 arch/arm/mach-imx/mx7/soc.c                   |  5 ++++
 arch/arm/mach-imx/mx7ulp/clock.c              |  4 +++
 arch/arm/mach-imx/mx7ulp/iomux.c              |  1 +
 arch/arm/mach-imx/mx7ulp/pcc.c                |  5 ++++
 arch/arm/mach-imx/mx7ulp/scg.c                |  4 +++
 arch/arm/mach-imx/mx7ulp/soc.c                |  6 ++++
 arch/arm/mach-imx/rdc-sema.c                  |  1 +
 arch/arm/mach-imx/speed.c                     |  1 +
 arch/arm/mach-imx/spl.c                       |  6 ++++
 arch/arm/mach-imx/spl_imx_romapi.c            |  5 ++++
 arch/arm/mach-imx/syscounter.c                |  2 ++
 arch/arm/mach-imx/timer.c                     |  1 +
 arch/arm/mach-imx/video.c                     |  2 ++
 arch/arm/mach-ipq40xx/clock-ipq4019.c         |  2 ++
 arch/arm/mach-ipq40xx/pinctrl-snapdragon.c    |  3 ++
 arch/arm/mach-k3/am6_init.c                   |  4 +++
 arch/arm/mach-k3/common.c                     |  8 ++++++
 arch/arm/mach-k3/common.h                     |  1 +
 arch/arm/mach-k3/include/mach/sys_proto.h     |  1 +
 arch/arm/mach-k3/j721e_init.c                 |  4 +++
 arch/arm/mach-k3/security.c                   |  3 ++
 arch/arm/mach-k3/sysfw-loader.c               |  5 ++++
 arch/arm/mach-keystone/clock.c                |  2 ++
 arch/arm/mach-keystone/cmd_clock.c            |  3 ++
 arch/arm/mach-keystone/cmd_mon.c              |  5 ++++
 arch/arm/mach-keystone/ddr3.c                 |  3 ++
 arch/arm/mach-keystone/ddr3_spd.c             |  3 ++
 .../mach-keystone/include/mach/clock_defs.h   |  1 +
 arch/arm/mach-keystone/include/mach/ddr3.h    |  1 +
 .../mach-keystone/include/mach/hardware-k2g.h |  1 +
 .../arm/mach-keystone/include/mach/hardware.h |  1 +
 arch/arm/mach-keystone/include/mach/mon.h     |  1 +
 arch/arm/mach-keystone/include/mach/msmc.h    |  1 +
 arch/arm/mach-keystone/include/mach/mux-k2g.h |  1 +
 .../arm/mach-keystone/include/mach/psc_defs.h |  2 ++
 arch/arm/mach-keystone/init.c                 |  3 ++
 arch/arm/mach-keystone/keystone.c             |  3 ++
 arch/arm/mach-keystone/mon.c                  |  3 ++
 arch/arm/mach-keystone/msmc.c                 |  1 +
 arch/arm/mach-keystone/psc.c                  |  3 ++
 arch/arm/mach-kirkwood/cache.c                |  1 +
 arch/arm/mach-kirkwood/cpu.c                  |  5 ++++
 arch/arm/mach-kirkwood/include/mach/cpu.h     |  1 +
 arch/arm/mach-kirkwood/mpp.c                  |  1 +
 arch/arm/mach-lpc32xx/clk.c                   |  1 +
 arch/arm/mach-lpc32xx/cpu.c                   |  3 ++
 arch/arm/mach-lpc32xx/devices.c               |  1 +
 arch/arm/mach-lpc32xx/dram.c                  |  1 +
 arch/arm/mach-lpc32xx/timer.c                 |  1 +
 arch/arm/mach-mediatek/cpu.c                  |  1 +
 arch/arm/mach-mediatek/mt7622/init.c          |  2 ++
 arch/arm/mach-mediatek/mt7623/init.c          |  5 ++++
 arch/arm/mach-mediatek/mt7623/preloader.h     |  1 +
 arch/arm/mach-mediatek/mt7629/init.c          |  5 ++++
 arch/arm/mach-mediatek/mt8512/init.c          |  3 ++
 arch/arm/mach-mediatek/mt8516/init.c          |  5 ++++
 arch/arm/mach-mediatek/mt8518/init.c          |  4 +++
 arch/arm/mach-mediatek/spl.c                  |  1 +
 arch/arm/mach-meson/board-axg.c               |  3 ++
 arch/arm/mach-meson/board-common.c            |  6 ++++
 arch/arm/mach-meson/board-g12a.c              |  5 ++++
 arch/arm/mach-meson/board-gx.c                |  5 ++++
 arch/arm/mach-meson/board-info.c              |  4 +++
 arch/arm/mach-meson/sm.c                      |  6 ++++
 arch/arm/mach-mvebu/arm64-common.c            |  5 ++++
 arch/arm/mach-mvebu/armada3700/cpu.c          |  6 ++++
 arch/arm/mach-mvebu/armada8k/cpu.c            |  1 +
 arch/arm/mach-mvebu/armada8k/dram.c           |  2 ++
 arch/arm/mach-mvebu/cpu.c                     |  5 ++++
 arch/arm/mach-mvebu/dram.c                    |  4 +++
 arch/arm/mach-mvebu/efuse.c                   |  2 ++
 arch/arm/mach-mvebu/gpio.c                    |  1 +
 arch/arm/mach-mvebu/include/mach/cpu.h        |  1 +
 arch/arm/mach-mvebu/include/mach/efuse.h      |  1 +
 arch/arm/mach-mvebu/mbus.c                    |  3 ++
 arch/arm/mach-mvebu/serdes/a38x/ctrl_pex.c    |  2 ++
 .../serdes/a38x/high_speed_env_spec-38x.c     |  2 ++
 .../serdes/a38x/high_speed_env_spec.c         |  2 ++
 arch/arm/mach-mvebu/serdes/a38x/seq_exec.c    |  2 ++
 arch/arm/mach-mvebu/serdes/a38x/seq_exec.h    |  1 +
 arch/arm/mach-mvebu/serdes/a38x/sys_env_lib.c |  2 ++
 .../serdes/axp/high_speed_env_lib.c           |  3 ++
 .../serdes/axp/high_speed_env_spec.c          |  1 +
 arch/arm/mach-mvebu/spl.c                     |  2 ++
 arch/arm/mach-nexell/clock.c                  |  5 ++++
 arch/arm/mach-nexell/cmd_boot_linux.c         |  1 +
 arch/arm/mach-nexell/include/mach/display.h   |  1 +
 .../mach-nexell/include/mach/display_dev.h    |  1 +
 .../mach-nexell/include/mach/mipi_display.h   |  1 +
 arch/arm/mach-nexell/include/mach/reset.h     |  1 +
 arch/arm/mach-nexell/include/mach/sec_reg.h   |  1 +
 arch/arm/mach-nexell/include/mach/tieoff.h    |  1 +
 arch/arm/mach-nexell/nx_gpio.c                |  1 +
 arch/arm/mach-nexell/nx_sec_reg.c             |  1 +
 arch/arm/mach-nexell/reset.c                  |  1 +
 arch/arm/mach-nexell/tieoff.c                 |  2 ++
 arch/arm/mach-nexell/timer.c                  |  3 ++
 arch/arm/mach-omap2/abb.c                     |  4 +++
 arch/arm/mach-omap2/am33xx/board.c            |  5 ++++
 arch/arm/mach-omap2/am33xx/chilisom.c         |  1 +
 arch/arm/mach-omap2/am33xx/clk_synthesizer.c  |  2 ++
 arch/arm/mach-omap2/am33xx/clock.c            |  3 ++
 arch/arm/mach-omap2/am33xx/clock_am33xx.c     |  3 ++
 arch/arm/mach-omap2/am33xx/clock_am43xx.c     |  1 +
 arch/arm/mach-omap2/am33xx/clock_ti814x.c     |  1 +
 arch/arm/mach-omap2/am33xx/clock_ti816x.c     |  1 +
 arch/arm/mach-omap2/am33xx/ddr.c              |  2 ++
 arch/arm/mach-omap2/am33xx/emif4.c            |  1 +
 arch/arm/mach-omap2/am33xx/fdt.c              |  2 ++
 arch/arm/mach-omap2/am33xx/mux.c              |  1 +
 arch/arm/mach-omap2/am33xx/sys_info.c         |  3 ++
 arch/arm/mach-omap2/boot-common.c             |  4 +++
 arch/arm/mach-omap2/clocks-common.c           |  3 ++
 arch/arm/mach-omap2/emif-common.c             |  6 ++++
 arch/arm/mach-omap2/fdt-common.c              |  3 ++
 arch/arm/mach-omap2/hwinit-common.c           |  5 ++++
 arch/arm/mach-omap2/mem-common.c              |  1 +
 arch/arm/mach-omap2/omap-cache.c              |  3 ++
 arch/arm/mach-omap2/omap3/am35x_musb.c        |  4 +++
 arch/arm/mach-omap2/omap3/board.c             |  5 ++++
 arch/arm/mach-omap2/omap3/boot.c              |  1 +
 arch/arm/mach-omap2/omap3/clock.c             |  1 +
 arch/arm/mach-omap2/omap3/emac.c              |  2 ++
 arch/arm/mach-omap2/omap3/emif4.c             |  3 ++
 arch/arm/mach-omap2/omap3/sdrc.c              |  3 ++
 arch/arm/mach-omap2/omap3/sys_info.c          |  3 ++
 arch/arm/mach-omap2/omap4/boot.c              |  1 +
 arch/arm/mach-omap2/omap4/emif.c              |  1 +
 arch/arm/mach-omap2/omap4/hw_data.c           |  2 ++
 arch/arm/mach-omap2/omap4/hwinit.c            |  1 +
 arch/arm/mach-omap2/omap4/sdram_elpida.c      |  2 ++
 arch/arm/mach-omap2/omap5/abb.c               |  1 +
 arch/arm/mach-omap2/omap5/boot.c              |  1 +
 arch/arm/mach-omap2/omap5/dra7xx_iodelay.c    |  2 ++
 arch/arm/mach-omap2/omap5/emif.c              |  1 +
 arch/arm/mach-omap2/omap5/fdt.c               |  4 +++
 arch/arm/mach-omap2/omap5/hw_data.c           |  3 ++
 arch/arm/mach-omap2/omap5/hwinit.c            |  2 ++
 arch/arm/mach-omap2/omap5/prcm-regs.c         |  1 +
 arch/arm/mach-omap2/omap5/sdram.c             |  4 +++
 arch/arm/mach-omap2/pipe3-phy.c               |  3 ++
 arch/arm/mach-omap2/pipe3-phy.h               |  2 ++
 arch/arm/mach-omap2/reset.c                   |  2 ++
 arch/arm/mach-omap2/sata.c                    |  2 ++
 arch/arm/mach-omap2/sec-common.c              |  6 ++++
 arch/arm/mach-omap2/sysinfo-common.c          |  1 +
 arch/arm/mach-omap2/timer.c                   |  2 ++
 arch/arm/mach-omap2/utils.c                   |  5 ++++
 arch/arm/mach-omap2/vc.c                      |  2 ++
 arch/arm/mach-orion5x/cpu.c                   |  4 +++
 arch/arm/mach-orion5x/dram.c                  |  3 ++
 arch/arm/mach-orion5x/include/mach/cpu.h      |  1 +
 arch/arm/mach-orion5x/timer.c                 |  2 ++
 arch/arm/mach-owl/soc.c                       |  4 +++
 arch/arm/mach-rmobile/board.c                 |  1 +
 arch/arm/mach-rmobile/cpu_info-r8a7740.c      |  1 +
 arch/arm/mach-rmobile/cpu_info-rcar.c         |  1 +
 arch/arm/mach-rmobile/cpu_info-sh73a0.c       |  1 +
 arch/arm/mach-rmobile/cpu_info.c              |  4 +++
 arch/arm/mach-rmobile/emac.c                  |  1 +
 .../mach-rmobile/include/mach/ehci-rmobile.h  |  1 +
 .../arm/mach-rmobile/include/mach/rcar-mstp.h |  1 +
 arch/arm/mach-rmobile/include/mach/rmobile.h  |  1 +
 arch/arm/mach-rmobile/memmap-gen3.c           |  2 ++
 arch/arm/mach-rmobile/pfc-r8a7740.c           |  1 +
 arch/arm/mach-rmobile/pfc-sh73a0.c            |  1 +
 arch/arm/mach-rmobile/timer.c                 |  1 +
 arch/arm/mach-rockchip/board.c                |  8 ++++++
 arch/arm/mach-rockchip/boot_mode.c            |  6 ++++
 arch/arm/mach-rockchip/bootrom.c              |  3 ++
 arch/arm/mach-rockchip/cpu-info.c             |  1 +
 arch/arm/mach-rockchip/misc.c                 |  4 +++
 arch/arm/mach-rockchip/px30-board-tpl.c       |  1 +
 arch/arm/mach-rockchip/px30/px30.c            |  2 ++
 arch/arm/mach-rockchip/px30/syscon_px30.c     |  1 +
 arch/arm/mach-rockchip/rk3036-board-spl.c     |  2 ++
 arch/arm/mach-rockchip/rk3036/rk3036.c        |  1 +
 arch/arm/mach-rockchip/rk3036/sdram_rk3036.c  |  1 +
 arch/arm/mach-rockchip/rk3128/rk3128.c        |  2 ++
 arch/arm/mach-rockchip/rk3188/rk3188.c        |  4 +++
 arch/arm/mach-rockchip/rk3188/syscon_rk3188.c |  1 +
 arch/arm/mach-rockchip/rk322x/rk322x.c        |  1 +
 arch/arm/mach-rockchip/rk3288/rk3288.c        |  6 ++++
 arch/arm/mach-rockchip/rk3288/syscon_rk3288.c |  1 +
 arch/arm/mach-rockchip/rk3308/rk3308.c        |  5 ++++
 arch/arm/mach-rockchip/rk3328/rk3328.c        |  2 ++
 arch/arm/mach-rockchip/rk3368/rk3368.c        |  3 ++
 arch/arm/mach-rockchip/rk3368/syscon_rk3368.c |  1 +
 arch/arm/mach-rockchip/rk3399/rk3399.c        |  6 ++++
 arch/arm/mach-rockchip/rk3399/syscon_rk3399.c |  1 +
 arch/arm/mach-rockchip/sdram.c                |  4 +++
 arch/arm/mach-rockchip/spl-boot-order.c       |  5 ++++
 arch/arm/mach-rockchip/spl.c                  |  6 ++++
 arch/arm/mach-rockchip/tpl.c                  |  3 ++
 arch/arm/mach-s5pc1xx/clock.c                 |  2 ++
 arch/arm/mach-s5pc1xx/include/mach/gpio.h     |  1 +
 arch/arm/mach-s5pc1xx/include/mach/mmc.h      |  1 +
 arch/arm/mach-s5pc1xx/include/mach/sromc.h    |  1 +
 .../arm/mach-s5pc1xx/include/mach/sys_proto.h |  1 +
 arch/arm/mach-snapdragon/clock-apq8016.c      |  1 +
 arch/arm/mach-snapdragon/clock-apq8096.c      |  1 +
 arch/arm/mach-snapdragon/clock-snapdragon.c   |  2 ++
 arch/arm/mach-snapdragon/clock-snapdragon.h   |  1 +
 arch/arm/mach-snapdragon/dram.c               |  4 +++
 arch/arm/mach-snapdragon/include/mach/misc.h  |  1 +
 arch/arm/mach-snapdragon/misc.c               |  2 ++
 arch/arm/mach-snapdragon/pinctrl-apq8016.c    |  4 ++-
 arch/arm/mach-snapdragon/pinctrl-apq8096.c    |  4 ++-
 arch/arm/mach-snapdragon/pinctrl-snapdragon.c |  3 ++
 arch/arm/mach-snapdragon/pinctrl-snapdragon.h |  2 +-
 arch/arm/mach-socfpga/board.c                 |  4 +++
 arch/arm/mach-socfpga/clock_manager.c         |  3 ++
 arch/arm/mach-socfpga/clock_manager_agilex.c  |  4 +++
 arch/arm/mach-socfpga/clock_manager_arria10.c |  5 ++++
 arch/arm/mach-socfpga/clock_manager_gen5.c    |  2 ++
 arch/arm/mach-socfpga/clock_manager_s10.c     |  3 ++
 arch/arm/mach-socfpga/firewall.c              |  2 ++
 arch/arm/mach-socfpga/freeze_controller.c     |  2 ++
 .../mach-socfpga/include/mach/clock_manager.h |  4 +--
 .../include/mach/clock_manager_gen5.h         |  1 +
 .../include/mach/clock_manager_s10.h          |  1 +
 arch/arm/mach-socfpga/include/mach/firewall.h |  1 +
 .../mach-socfpga/include/mach/fpga_manager.h  |  1 +
 .../include/mach/fpga_manager_arria10.h       |  1 +
 .../include/mach/fpga_manager_gen5.h          |  1 +
 .../include/mach/freeze_controller.h          |  1 +
 .../mach-socfpga/include/mach/mailbox_s10.h   |  1 +
 arch/arm/mach-socfpga/include/mach/misc.h     |  2 ++
 arch/arm/mach-socfpga/include/mach/nic301.h   |  1 +
 .../mach-socfpga/include/mach/reset_manager.h |  1 +
 .../include/mach/reset_manager_gen5.h         |  1 +
 .../mach-socfpga/include/mach/scan_manager.h  |  1 +
 arch/arm/mach-socfpga/include/mach/scu.h      |  1 +
 .../mach-socfpga/include/mach/sdram_arria10.h |  1 +
 .../mach-socfpga/include/mach/sdram_gen5.h    |  1 +
 .../include/mach/system_manager.h             |  1 +
 .../include/mach/system_manager_gen5.h        |  1 +
 .../include/mach/system_manager_soc64.h       |  1 +
 arch/arm/mach-socfpga/include/mach/timer.h    |  1 +
 arch/arm/mach-socfpga/mailbox_s10.c           |  4 +++
 arch/arm/mach-socfpga/misc.c                  |  6 ++++
 arch/arm/mach-socfpga/misc_arria10.c          |  3 ++
 arch/arm/mach-socfpga/misc_gen5.c             |  7 +++++
 arch/arm/mach-socfpga/misc_s10.c              |  8 ++++++
 arch/arm/mach-socfpga/mmu-arm64_s10.c         |  1 +
 arch/arm/mach-socfpga/pinmux_arria10.c        |  3 ++
 arch/arm/mach-socfpga/reset_manager_arria10.c |  3 ++
 arch/arm/mach-socfpga/reset_manager_gen5.c    |  3 ++
 arch/arm/mach-socfpga/reset_manager_s10.c     |  2 ++
 arch/arm/mach-socfpga/scan_manager.c          |  2 ++
 arch/arm/mach-socfpga/spl_a10.c               |  3 ++
 arch/arm/mach-socfpga/spl_agilex.c            |  2 ++
 arch/arm/mach-socfpga/spl_gen5.c              |  3 ++
 arch/arm/mach-socfpga/spl_s10.c               |  2 ++
 arch/arm/mach-socfpga/system_manager_gen5.c   |  1 +
 arch/arm/mach-socfpga/system_manager_s10.c    |  2 ++
 arch/arm/mach-socfpga/wrap_iocsr_config.c     |  1 +
 arch/arm/mach-socfpga/wrap_pinmux_config.c    |  2 ++
 .../arm/mach-socfpga/wrap_pinmux_config_s10.c |  2 ++
 arch/arm/mach-socfpga/wrap_pll_config_s10.c   |  1 +
 arch/arm/mach-socfpga/wrap_sdram_config.c     |  2 ++
 arch/arm/mach-stm32/soc.c                     |  2 ++
 arch/arm/mach-stm32mp/boot_params.c           |  1 +
 arch/arm/mach-stm32mp/bsec.c                  |  4 +++
 arch/arm/mach-stm32mp/cmd_stm32key.c          |  6 ++++
 .../cmd_stm32prog/cmd_stm32prog.c             |  6 ++++
 .../mach-stm32mp/cmd_stm32prog/stm32prog.c    | 10 +++++++
 .../mach-stm32mp/cmd_stm32prog/stm32prog.h    |  5 ++++
 .../cmd_stm32prog/stm32prog_serial.c          |  8 ++++++
 .../cmd_stm32prog/stm32prog_usb.c             |  7 +++++
 arch/arm/mach-stm32mp/cpu.c                   |  9 ++++++
 arch/arm/mach-stm32mp/dram_init.c             |  4 +++
 arch/arm/mach-stm32mp/fdt.c                   |  7 +++++
 arch/arm/mach-stm32mp/include/mach/bsec.h     |  1 +
 arch/arm/mach-stm32mp/include/mach/gpio.h     |  1 +
 .../mach-stm32mp/include/mach/stm32mp1_smc.h  |  3 ++
 .../arm/mach-stm32mp/include/mach/stm32prog.h |  1 +
 .../arm/mach-stm32mp/include/mach/sys_proto.h |  1 +
 arch/arm/mach-stm32mp/psci.c                  |  1 +
 arch/arm/mach-stm32mp/pwr_regulator.c         |  4 +++
 arch/arm/mach-stm32mp/spl.c                   |  6 ++++
 arch/arm/mach-sunxi/board.c                   |  3 ++
 arch/arm/mach-sunxi/clock.c                   |  2 ++
 arch/arm/mach-sunxi/clock_sun4i.c             |  3 ++
 arch/arm/mach-sunxi/clock_sun50i_h6.c         |  1 +
 arch/arm/mach-sunxi/clock_sun6i.c             |  2 ++
 arch/arm/mach-sunxi/clock_sun8i_a83t.c        |  1 +
 arch/arm/mach-sunxi/clock_sun9i.c             |  1 +
 arch/arm/mach-sunxi/cpu_info.c                |  3 ++
 arch/arm/mach-sunxi/dram_helpers.c            |  3 ++
 arch/arm/mach-sunxi/dram_sun4i.c              |  4 +++
 arch/arm/mach-sunxi/dram_sun50i_h6.c          |  3 ++
 arch/arm/mach-sunxi/dram_sun6i.c              |  3 ++
 arch/arm/mach-sunxi/dram_sun8i_a23.c          |  1 +
 arch/arm/mach-sunxi/dram_sun8i_a33.c          |  3 ++
 arch/arm/mach-sunxi/dram_sun8i_a83t.c         |  3 ++
 arch/arm/mach-sunxi/dram_sun9i.c              |  2 ++
 arch/arm/mach-sunxi/dram_sunxi_dw.c           |  4 +++
 arch/arm/mach-sunxi/dram_timings/ddr2_v3s.c   |  2 ++
 arch/arm/mach-sunxi/dram_timings/ddr3_1333.c  |  2 ++
 .../mach-sunxi/dram_timings/h6_ddr3_1333.c    |  2 ++
 arch/arm/mach-sunxi/dram_timings/h6_lpddr3.c  |  2 ++
 .../mach-sunxi/dram_timings/lpddr3_stock.c    |  2 ++
 arch/arm/mach-sunxi/p2wi.c                    |  2 ++
 arch/arm/mach-sunxi/pinmux.c                  |  1 +
 arch/arm/mach-sunxi/pmic_bus.c                |  1 +
 arch/arm/mach-sunxi/prcm.c                    |  1 +
 arch/arm/mach-sunxi/rsb.c                     |  2 ++
 arch/arm/mach-sunxi/spl_spi_sunxi.c           |  2 ++
 arch/arm/mach-tegra/ap.c                      |  3 ++
 arch/arm/mach-tegra/board.c                   |  4 +++
 arch/arm/mach-tegra/board2.c                  |  5 ++++
 arch/arm/mach-tegra/cache.c                   |  1 +
 arch/arm/mach-tegra/cboot.c                   |  9 ++++++
 arch/arm/mach-tegra/clock.c                   |  6 ++++
 arch/arm/mach-tegra/cmd_enterrcm.c            |  1 +
 arch/arm/mach-tegra/cpu.c                     |  2 ++
 arch/arm/mach-tegra/dt-setup.c                |  2 ++
 arch/arm/mach-tegra/emc.c                     |  1 +
 arch/arm/mach-tegra/gpu.c                     |  1 +
 arch/arm/mach-tegra/ivc.c                     |  3 ++
 arch/arm/mach-tegra/pinmux-common.c           |  2 ++
 arch/arm/mach-tegra/pmc.c                     |  4 +++
 arch/arm/mach-tegra/powergate.c               |  3 ++
 arch/arm/mach-tegra/spl.c                     |  1 +
 arch/arm/mach-tegra/sys_info.c                |  1 +
 arch/arm/mach-tegra/tegra114/clock.c          |  2 ++
 arch/arm/mach-tegra/tegra114/cpu.c            |  2 ++
 arch/arm/mach-tegra/tegra124/clock.c          |  3 ++
 arch/arm/mach-tegra/tegra124/cpu.c            |  2 ++
 arch/arm/mach-tegra/tegra124/psci.c           |  1 +
 arch/arm/mach-tegra/tegra124/xusb-padctl.c    |  6 ++++
 arch/arm/mach-tegra/tegra20/clock.c           |  4 +++
 arch/arm/mach-tegra/tegra20/cpu.c             |  1 +
 arch/arm/mach-tegra/tegra20/crypto.c          |  1 +
 arch/arm/mach-tegra/tegra20/crypto.h          |  1 +
 arch/arm/mach-tegra/tegra20/emc.c             |  2 ++
 arch/arm/mach-tegra/tegra20/funcmux.c         |  1 +
 arch/arm/mach-tegra/tegra20/warmboot.c        |  5 ++++
 arch/arm/mach-tegra/tegra20/warmboot_avp.c    |  1 +
 arch/arm/mach-tegra/tegra210/clock.c          |  4 +++
 arch/arm/mach-tegra/tegra210/xusb-padctl.c    |  6 ++++
 arch/arm/mach-tegra/tegra30/clock.c           |  4 +++
 arch/arm/mach-tegra/tegra30/cpu.c             |  1 +
 arch/arm/mach-tegra/xusb-padctl-common.c      |  4 +++
 arch/arm/mach-tegra/xusb-padctl-common.h      |  1 +
 arch/arm/mach-tegra/xusb-padctl-dummy.c       |  2 ++
 arch/arm/mach-u8500/cpuinfo.c                 |  2 ++
 arch/arm/mach-uniphier/arm32/cache-uniphier.c |  2 ++
 arch/arm/mach-uniphier/arm32/psci.c           |  1 +
 arch/arm/mach-uniphier/base-address.c         |  2 ++
 arch/arm/mach-uniphier/bcu/bcu-ld4.c          |  1 +
 arch/arm/mach-uniphier/board_init.c           |  2 ++
 arch/arm/mach-uniphier/board_late_init.c      |  3 ++
 .../boot-device/boot-device-ld11.c            |  1 +
 .../boot-device/boot-device-pxs2.c            |  1 +
 .../boot-device/boot-device-pxs3.c            |  1 +
 .../mach-uniphier/boot-device/boot-device.c   |  3 ++
 .../mach-uniphier/boot-device/boot-device.h   |  1 +
 arch/arm/mach-uniphier/clk/clk-dram-ld4.c     |  1 +
 arch/arm/mach-uniphier/clk/clk-dram-pro5.c    |  1 +
 arch/arm/mach-uniphier/clk/clk-dram-pxs2.c    |  1 +
 arch/arm/mach-uniphier/clk/clk-early-ld4.c    |  1 +
 arch/arm/mach-uniphier/clk/clk-ld11.c         |  1 +
 arch/arm/mach-uniphier/clk/clk-ld20.c         |  1 +
 arch/arm/mach-uniphier/clk/clk-pro4.c         |  1 +
 arch/arm/mach-uniphier/clk/clk-pro5.c         |  1 +
 arch/arm/mach-uniphier/clk/clk-pxs2.c         |  1 +
 arch/arm/mach-uniphier/clk/clk-pxs3.c         |  1 +
 arch/arm/mach-uniphier/clk/dpll-ld4.c         |  3 ++
 arch/arm/mach-uniphier/clk/dpll-pro4.c        |  3 ++
 arch/arm/mach-uniphier/clk/dpll-sld8.c        |  1 +
 arch/arm/mach-uniphier/clk/dpll-tail.c        |  1 +
 arch/arm/mach-uniphier/clk/pll-base-ld20.c    |  2 ++
 arch/arm/mach-uniphier/clk/pll-ld4.c          |  1 +
 arch/arm/mach-uniphier/clk/pll-pro4.c         |  1 +
 .../debug-uart/debug-uart-ld6b.c              |  1 +
 .../debug-uart/debug-uart-pro4.c              |  1 +
 .../debug-uart/debug-uart-pro5.c              |  1 +
 .../debug-uart/debug-uart-pxs2.c              |  1 +
 .../arm/mach-uniphier/debug-uart/debug-uart.c |  2 ++
 arch/arm/mach-uniphier/debug.h                |  1 +
 arch/arm/mach-uniphier/dram/cmd_ddrmphy.c     |  3 ++
 arch/arm/mach-uniphier/dram/cmd_ddrphy.c      |  3 ++
 arch/arm/mach-uniphier/dram/ddrphy-init.h     |  1 +
 arch/arm/mach-uniphier/dram/ddrphy-ld4.c      |  3 ++
 arch/arm/mach-uniphier/dram/ddrphy-training.c |  2 ++
 arch/arm/mach-uniphier/dram/umc-ld4.c         |  5 ++++
 arch/arm/mach-uniphier/dram/umc-pro4.c        |  5 ++++
 arch/arm/mach-uniphier/dram/umc-pxs2.c        |  4 +++
 arch/arm/mach-uniphier/dram/umc-sld8.c        |  5 ++++
 arch/arm/mach-uniphier/dram_init.c            |  2 ++
 arch/arm/mach-uniphier/fdt-fixup.c            |  1 +
 arch/arm/mach-uniphier/memconf.c              |  3 ++
 arch/arm/mach-uniphier/micro-support-card.c   |  4 +++
 arch/arm/mach-uniphier/mmc-boot-mode.c        |  1 +
 arch/arm/mach-uniphier/mmc-first-dev.c        |  1 +
 arch/arm/mach-uniphier/pinctrl-glue.c         |  1 +
 arch/arm/mach-uniphier/reset.c                |  1 +
 arch/arm/mach-uniphier/sc-regs.h              |  1 +
 arch/arm/mach-uniphier/sc64-regs.h            |  1 +
 arch/arm/mach-uniphier/sg-regs.h              |  1 +
 arch/arm/mach-uniphier/spl_board_init.c       |  1 +
 arch/arm/mach-versal/clk.c                    |  2 ++
 arch/arm/mach-versal/cpu.c                    |  3 ++
 arch/arm/mach-versal/include/mach/hardware.h  |  1 +
 arch/arm/mach-versal/include/mach/sys_proto.h |  1 +
 arch/arm/mach-versal/mp.c                     |  5 ++++
 arch/arm/mach-versatile/timer.c               |  1 +
 arch/arm/mach-zynq/clk.c                      |  5 ++++
 arch/arm/mach-zynq/cpu.c                      |  4 +++
 arch/arm/mach-zynq/ddrc.c                     |  3 ++
 arch/arm/mach-zynq/include/mach/hardware.h    |  1 +
 arch/arm/mach-zynq/include/mach/sys_proto.h   |  1 +
 arch/arm/mach-zynq/ps7_spl_init.c             |  1 +
 arch/arm/mach-zynq/slcr.c                     |  3 ++
 arch/arm/mach-zynq/spl.c                      |  4 +++
 arch/arm/mach-zynq/timer.c                    |  2 ++
 arch/arm/mach-zynqmp-r5/cpu.c                 |  3 ++
 arch/arm/mach-zynqmp/clk.c                    |  3 ++
 arch/arm/mach-zynqmp/cpu.c                    |  6 ++++
 arch/arm/mach-zynqmp/handoff.c                |  1 +
 arch/arm/mach-zynqmp/include/mach/hardware.h  |  1 +
 arch/arm/mach-zynqmp/include/mach/sys_proto.h |  2 ++
 arch/arm/mach-zynqmp/mp.c                     |  5 ++++
 arch/arm/mach-zynqmp/psu_spl_init.c           |  2 ++
 arch/arm/mach-zynqmp/spl.c                    |  3 ++
 arch/m68k/cpu/mcf5227x/cpu.c                  |  3 ++
 arch/m68k/cpu/mcf5227x/cpu_init.c             |  1 +
 arch/m68k/cpu/mcf5227x/speed.c                |  2 ++
 arch/m68k/cpu/mcf523x/cpu.c                   |  4 +++
 arch/m68k/cpu/mcf523x/cpu_init.c              |  1 +
 arch/m68k/cpu/mcf523x/speed.c                 |  1 +
 arch/m68k/cpu/mcf52x2/cpu.c                   |  4 +++
 arch/m68k/cpu/mcf52x2/cpu.h                   |  1 +
 arch/m68k/cpu/mcf52x2/cpu_init.c              |  2 ++
 arch/m68k/cpu/mcf52x2/speed.c                 |  1 +
 arch/m68k/cpu/mcf530x/cpu.c                   |  1 +
 arch/m68k/cpu/mcf530x/cpu_init.c              |  1 +
 arch/m68k/cpu/mcf530x/speed.c                 |  1 +
 arch/m68k/cpu/mcf532x/cpu.c                   |  4 +++
 arch/m68k/cpu/mcf532x/cpu_init.c              |  2 ++
 arch/m68k/cpu/mcf532x/speed.c                 |  2 ++
 arch/m68k/cpu/mcf5445x/cpu.c                  |  4 +++
 arch/m68k/cpu/mcf5445x/cpu_init.c             |  2 ++
 arch/m68k/cpu/mcf5445x/pci.c                  |  1 +
 arch/m68k/cpu/mcf5445x/speed.c                |  2 ++
 arch/m68k/cpu/mcf547x_8x/cpu.c                |  4 +++
 arch/m68k/cpu/mcf547x_8x/cpu_init.c           |  2 ++
 arch/m68k/cpu/mcf547x_8x/pci.c                |  1 +
 arch/m68k/cpu/mcf547x_8x/slicetimer.c         |  3 ++
 arch/m68k/cpu/mcf547x_8x/speed.c              |  1 +
 arch/m68k/include/asm/coldfire/ata.h          |  1 +
 arch/m68k/include/asm/coldfire/crossbar.h     |  1 +
 arch/m68k/include/asm/coldfire/dspi.h         |  1 +
 arch/m68k/include/asm/coldfire/edma.h         |  1 +
 arch/m68k/include/asm/coldfire/eport.h        |  1 +
 arch/m68k/include/asm/coldfire/flexbus.h      |  1 +
 arch/m68k/include/asm/coldfire/flexcan.h      |  1 +
 arch/m68k/include/asm/coldfire/intctrl.h      |  1 +
 arch/m68k/include/asm/coldfire/lcd.h          |  1 +
 arch/m68k/include/asm/coldfire/mdha.h         |  1 +
 arch/m68k/include/asm/coldfire/pwm.h          |  1 +
 arch/m68k/include/asm/coldfire/qspi.h         |  1 +
 arch/m68k/include/asm/coldfire/rng.h          |  1 +
 arch/m68k/include/asm/coldfire/skha.h         |  1 +
 arch/m68k/include/asm/coldfire/ssi.h          |  1 +
 arch/m68k/include/asm/fec.h                   |  1 +
 arch/m68k/include/asm/fsl_mcdmafec.h          |  1 +
 arch/m68k/include/asm/immap.h                 |  1 +
 arch/m68k/include/asm/immap_520x.h            |  1 +
 arch/m68k/include/asm/immap_5227x.h           |  1 +
 arch/m68k/include/asm/immap_5235.h            |  1 +
 arch/m68k/include/asm/immap_5272.h            |  1 +
 arch/m68k/include/asm/immap_5275.h            |  1 +
 arch/m68k/include/asm/immap_5282.h            |  1 +
 arch/m68k/include/asm/immap_5301x.h           |  1 +
 arch/m68k/include/asm/immap_5307.h            |  1 +
 arch/m68k/include/asm/immap_5329.h            |  1 +
 arch/m68k/include/asm/immap_5441x.h           |  1 +
 arch/m68k/include/asm/immap_5445x.h           |  1 +
 arch/m68k/include/asm/immap_547x_8x.h         |  1 +
 arch/m68k/include/asm/io.h                    |  1 +
 arch/m68k/include/asm/m5282.h                 |  1 +
 arch/m68k/include/asm/ptrace.h                |  1 +
 arch/m68k/include/asm/rtc.h                   |  1 +
 arch/m68k/include/asm/timer.h                 |  1 +
 arch/m68k/include/asm/uart.h                  |  1 +
 arch/m68k/lib/bdinfo.c                        |  3 ++
 arch/m68k/lib/bootm.c                         |  4 +++
 arch/m68k/lib/cache.c                         |  3 ++
 arch/m68k/lib/fec.c                           |  4 +++
 arch/m68k/lib/interrupts.c                    |  1 +
 arch/m68k/lib/time.c                          |  2 ++
 arch/m68k/lib/traps.c                         |  3 ++
 arch/microblaze/cpu/cache.c                   |  1 +
 arch/microblaze/cpu/exception.c               |  1 +
 arch/microblaze/cpu/interrupts.c              |  3 ++
 arch/microblaze/cpu/spl.c                     |  2 ++
 arch/microblaze/cpu/timer.c                   |  6 +++-
 arch/microblaze/include/asm/io.h              |  1 +
 arch/microblaze/include/asm/processor.h       |  1 +
 arch/microblaze/lib/bootm.c                   |  4 +++
 arch/mips/cpu/cpu.c                           |  1 +
 arch/mips/cpu/time.c                          |  2 ++
 arch/mips/include/asm/cacheops.h              |  1 +
 arch/mips/include/asm/io.h                    |  3 ++
 arch/mips/include/asm/mach-generic/ioremap.h  |  1 +
 arch/mips/include/asm/mipsregs.h              |  1 +
 arch/mips/include/asm/pgtable-bits.h          |  1 +
 arch/mips/include/asm/sections.h              |  1 +
 arch/mips/lib/boot.c                          |  3 ++
 arch/mips/lib/bootm.c                         |  5 ++++
 arch/mips/lib/cache.c                         |  6 ++++
 arch/mips/lib/reloc.c                         |  4 +++
 arch/mips/lib/stack.c                         |  1 +
 arch/mips/lib/traps.c                         |  5 ++++
 arch/mips/mach-ath79/ar933x/clk.c             |  4 +++
 arch/mips/mach-ath79/ar933x/ddr.c             |  1 +
 arch/mips/mach-ath79/ar934x/clk.c             |  6 ++++
 arch/mips/mach-ath79/ar934x/ddr.c             |  2 ++
 arch/mips/mach-ath79/cpu.c                    |  4 +++
 arch/mips/mach-ath79/dram.c                   |  1 +
 arch/mips/mach-ath79/include/mach/ath79.h     |  1 +
 arch/mips/mach-ath79/qca953x/clk.c            |  4 +++
 arch/mips/mach-ath79/qca953x/ddr.c            |  1 +
 arch/mips/mach-ath79/qca956x/clk.c            |  4 +++
 arch/mips/mach-ath79/qca956x/ddr.c            |  2 ++
 arch/mips/mach-ath79/reset.c                  |  2 ++
 arch/mips/mach-bmips/dram.c                   |  1 +
 arch/mips/mach-bmips/include/ioremap.h        |  1 +
 arch/mips/mach-jz47xx/include/mach/jz4780.h   |  2 ++
 .../mach-jz47xx/include/mach/jz4780_dram.h    |  1 +
 arch/mips/mach-jz47xx/jz4780/gpio.c           |  1 +
 arch/mips/mach-jz47xx/jz4780/jz4780.c         |  5 ++++
 arch/mips/mach-jz47xx/jz4780/pll.c            |  4 +++
 arch/mips/mach-jz47xx/jz4780/reset.c          |  1 +
 arch/mips/mach-jz47xx/jz4780/sdram.c          |  2 ++
 arch/mips/mach-jz47xx/jz4780/timer.c          |  2 ++
 arch/mips/mach-mscc/cpu.c                     |  1 +
 arch/mips/mach-mscc/dram.c                    |  2 ++
 arch/mips/mach-mscc/gpio.c                    |  1 +
 arch/mips/mach-mscc/include/ioremap.h         |  1 +
 arch/mips/mach-mscc/include/mach/common.h     |  1 +
 arch/mips/mach-mscc/include/mach/ddr.h        |  3 ++
 arch/mips/mach-mscc/include/mach/jr2/jr2.h    |  1 +
 .../mips/mach-mscc/include/mach/luton/luton.h |  1 +
 .../mach-mscc/include/mach/ocelot/ocelot.h    |  1 +
 .../mach-mscc/include/mach/serval/serval.h    |  1 +
 .../mach-mscc/include/mach/servalt/servalt.h  |  1 +
 arch/mips/mach-mscc/include/mach/tlb.h        |  1 +
 arch/mips/mach-mscc/phy.c                     |  1 +
 arch/mips/mach-mscc/reset.c                   |  1 +
 arch/mips/mach-mtmips/cpu.c                   |  3 ++
 arch/mips/mach-mtmips/ddr_cal.c               |  5 ++++
 arch/mips/mach-mtmips/ddr_init.c              |  2 ++
 arch/mips/mach-mtmips/include/mach/ddr.h      |  1 +
 arch/mips/mach-mtmips/mt7628/ddr.c            |  3 ++
 arch/mips/mach-mtmips/mt7628/init.c           |  5 ++++
 arch/mips/mach-mtmips/mt7628/serial.c         |  1 +
 arch/mips/mach-mtmips/spl.c                   |  3 +-
 arch/mips/mach-octeon/cache.c                 |  1 +
 arch/mips/mach-octeon/clock.c                 |  3 ++
 arch/mips/mach-octeon/cpu.c                   |  2 ++
 arch/mips/mach-octeon/dram.c                  |  2 ++
 arch/mips/mach-octeon/include/ioremap.h       |  1 +
 arch/mips/mach-pic32/cpu.c                    |  4 +++
 arch/mips/mach-pic32/include/mach/ddr.h       |  1 +
 arch/mips/mach-pic32/include/mach/pic32.h     |  2 ++
 arch/mips/mach-pic32/reset.c                  |  1 +
 arch/nds32/cpu/n1213/ae3xx/cpu.c              |  2 ++
 arch/nds32/cpu/n1213/ag101/cpu.c              |  1 +
 arch/nds32/cpu/n1213/ag101/timer.c            |  3 ++
 arch/nds32/include/asm/bootm.h                |  1 +
 arch/nds32/include/asm/io.h                   |  1 +
 arch/nds32/include/asm/setup.h                |  1 +
 arch/nds32/lib/asm-offsets.c                  |  1 +
 arch/nds32/lib/boot.c                         |  2 ++
 arch/nds32/lib/bootm.c                        |  6 ++++
 arch/nds32/lib/interrupts.c                   |  3 ++
 arch/nios2/cpu/cpu.c                          |  4 +++
 arch/nios2/cpu/interrupts.c                   |  1 +
 arch/nios2/cpu/traps.c                        |  1 +
 arch/nios2/include/asm/dma-mapping.h          |  1 +
 arch/nios2/include/asm/global_data.h          |  1 +
 arch/nios2/include/asm/io.h                   |  5 ++++
 arch/nios2/lib/bootm.c                        |  2 ++
 arch/nios2/lib/cache.c                        |  1 +
 arch/powerpc/cpu/mpc83xx/arbiter/arbiter.h    |  1 +
 arch/powerpc/cpu/mpc83xx/cpu.c                |  5 ++++
 arch/powerpc/cpu/mpc83xx/cpu_init.c           |  4 +++
 arch/powerpc/cpu/mpc83xx/ecc.c                |  6 ++++
 arch/powerpc/cpu/mpc83xx/fdt.c                |  3 ++
 arch/powerpc/cpu/mpc83xx/initreg/initreg.h    |  1 +
 arch/powerpc/cpu/mpc83xx/interrupts.c         |  3 ++
 arch/powerpc/cpu/mpc83xx/law.c                |  2 ++
 arch/powerpc/cpu/mpc83xx/pci.c                |  4 +++
 arch/powerpc/cpu/mpc83xx/pcie.c               |  5 ++++
 arch/powerpc/cpu/mpc83xx/qe_io.c              |  1 +
 arch/powerpc/cpu/mpc83xx/spd_sdram.c          |  4 +++
 arch/powerpc/cpu/mpc83xx/speed.c              |  5 ++++
 arch/powerpc/cpu/mpc83xx/spl_minimal.c        |  4 +++
 arch/powerpc/cpu/mpc83xx/traps.c              |  5 ++++
 arch/powerpc/cpu/mpc85xx/b4860_ids.c          |  1 +
 arch/powerpc/cpu/mpc85xx/b4860_serdes.c       |  2 ++
 arch/powerpc/cpu/mpc85xx/bsc9132_serdes.c     |  3 ++
 arch/powerpc/cpu/mpc85xx/c29x_serdes.c        |  3 ++
 arch/powerpc/cpu/mpc85xx/cmd_errata.c         |  5 ++++
 arch/powerpc/cpu/mpc85xx/commproc.c           |  4 +++
 arch/powerpc/cpu/mpc85xx/cpu.c                |  7 +++++
 arch/powerpc/cpu/mpc85xx/cpu_init.c           |  8 ++++++
 arch/powerpc/cpu/mpc85xx/cpu_init_early.c     |  2 ++
 arch/powerpc/cpu/mpc85xx/ether_fcc.c          |  7 +++++
 arch/powerpc/cpu/mpc85xx/fdt.c                |  7 +++++
 .../powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c |  5 ++++
 .../powerpc/cpu/mpc85xx/fsl_corenet2_serdes.h |  1 +
 arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c |  5 ++++
 arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.h |  1 +
 arch/powerpc/cpu/mpc85xx/interrupts.c         |  3 ++
 arch/powerpc/cpu/mpc85xx/liodn.c              |  5 ++++
 arch/powerpc/cpu/mpc85xx/mp.c                 |  6 ++++
 arch/powerpc/cpu/mpc85xx/mp.h                 |  1 +
 arch/powerpc/cpu/mpc85xx/mpc8536_serdes.c     |  4 +++
 arch/powerpc/cpu/mpc85xx/mpc8544_serdes.c     |  4 +++
 arch/powerpc/cpu/mpc85xx/mpc8548_serdes.c     |  4 +++
 arch/powerpc/cpu/mpc85xx/mpc8568_serdes.c     |  4 +++
 arch/powerpc/cpu/mpc85xx/mpc8569_serdes.c     |  4 +++
 arch/powerpc/cpu/mpc85xx/mpc8572_serdes.c     |  4 +++
 arch/powerpc/cpu/mpc85xx/p1010_serdes.c       |  4 +++
 arch/powerpc/cpu/mpc85xx/p1021_serdes.c       |  4 +++
 arch/powerpc/cpu/mpc85xx/p1022_serdes.c       |  4 +++
 arch/powerpc/cpu/mpc85xx/p1023_serdes.c       |  4 +++
 arch/powerpc/cpu/mpc85xx/p2020_serdes.c       |  4 +++
 arch/powerpc/cpu/mpc85xx/p2041_ids.c          |  1 +
 arch/powerpc/cpu/mpc85xx/p2041_serdes.c       |  3 ++
 arch/powerpc/cpu/mpc85xx/p3041_ids.c          |  1 +
 arch/powerpc/cpu/mpc85xx/p3041_serdes.c       |  3 ++
 arch/powerpc/cpu/mpc85xx/p4080_ids.c          |  1 +
 arch/powerpc/cpu/mpc85xx/p4080_serdes.c       |  3 ++
 arch/powerpc/cpu/mpc85xx/p5020_ids.c          |  1 +
 arch/powerpc/cpu/mpc85xx/p5020_serdes.c       |  3 ++
 arch/powerpc/cpu/mpc85xx/p5040_ids.c          |  1 +
 arch/powerpc/cpu/mpc85xx/p5040_serdes.c       |  3 ++
 arch/powerpc/cpu/mpc85xx/pci.c                |  3 ++
 arch/powerpc/cpu/mpc85xx/portals.c            |  4 +++
 arch/powerpc/cpu/mpc85xx/qe_io.c              |  2 ++
 arch/powerpc/cpu/mpc85xx/serial_scc.c         |  3 ++
 arch/powerpc/cpu/mpc85xx/speed.c              |  4 +++
 arch/powerpc/cpu/mpc85xx/spl_minimal.c        |  2 ++
 arch/powerpc/cpu/mpc85xx/t1024_ids.c          |  1 +
 arch/powerpc/cpu/mpc85xx/t1024_serdes.c       |  4 ++-
 arch/powerpc/cpu/mpc85xx/t1040_ids.c          |  1 +
 arch/powerpc/cpu/mpc85xx/t1040_serdes.c       |  3 ++
 arch/powerpc/cpu/mpc85xx/t2080_ids.c          |  1 +
 arch/powerpc/cpu/mpc85xx/t2080_serdes.c       |  3 ++
 arch/powerpc/cpu/mpc85xx/t4240_ids.c          |  1 +
 arch/powerpc/cpu/mpc85xx/t4240_serdes.c       |  3 ++
 arch/powerpc/cpu/mpc85xx/tlb.c                |  7 +++++
 arch/powerpc/cpu/mpc85xx/traps.c              |  5 ++++
 arch/powerpc/cpu/mpc86xx/cpu.c                |  6 ++++
 arch/powerpc/cpu/mpc86xx/cpu_init.c           |  2 ++
 arch/powerpc/cpu/mpc86xx/fdt.c                |  3 ++
 arch/powerpc/cpu/mpc86xx/interrupts.c         |  3 ++
 arch/powerpc/cpu/mpc86xx/mp.c                 |  4 +++
 arch/powerpc/cpu/mpc86xx/mpc8610_serdes.c     |  3 ++
 arch/powerpc/cpu/mpc86xx/mpc8641_serdes.c     |  3 ++
 arch/powerpc/cpu/mpc86xx/speed.c              |  3 ++
 arch/powerpc/cpu/mpc86xx/traps.c              |  5 ++++
 arch/powerpc/cpu/mpc8xx/cpu.c                 |  6 ++++
 arch/powerpc/cpu/mpc8xx/cpu_init.c            |  3 ++
 arch/powerpc/cpu/mpc8xx/fdt.c                 |  2 ++
 arch/powerpc/cpu/mpc8xx/immap.c               |  6 ++++
 arch/powerpc/cpu/mpc8xx/interrupts.c          |  4 +++
 arch/powerpc/cpu/mpc8xx/speed.c               |  3 ++
 arch/powerpc/cpu/mpc8xx/traps.c               |  4 +++
 arch/powerpc/cpu/mpc8xxx/cpu.c                |  5 ++++
 arch/powerpc/cpu/mpc8xxx/fdt.c                |  3 ++
 arch/powerpc/cpu/mpc8xxx/fsl_lbc.c            |  3 ++
 arch/powerpc/cpu/mpc8xxx/fsl_pamu.c           |  4 +++
 arch/powerpc/cpu/mpc8xxx/law.c                |  6 ++++
 arch/powerpc/cpu/mpc8xxx/pamu_table.c         |  3 ++
 arch/powerpc/cpu/mpc8xxx/srio.c               |  3 ++
 arch/powerpc/include/asm/arch-mpc83xx/gpio.h  |  1 +
 arch/powerpc/include/asm/arch-mpc83xx/soc.h   |  1 +
 arch/powerpc/include/asm/arch-mpc85xx/gpio.h  |  1 +
 arch/powerpc/include/asm/cache.h              |  1 +
 arch/powerpc/include/asm/cpm_85xx.h           |  1 +
 arch/powerpc/include/asm/cpm_8xx.h            |  1 +
 arch/powerpc/include/asm/fsl_dma.h            |  1 +
 arch/powerpc/include/asm/fsl_i2c.h            |  2 ++
 arch/powerpc/include/asm/fsl_law.h            |  1 +
 arch/powerpc/include/asm/fsl_lbc.h            |  1 +
 arch/powerpc/include/asm/fsl_liodn.h          |  1 +
 arch/powerpc/include/asm/fsl_mpc83xx_serdes.h |  1 +
 arch/powerpc/include/asm/fsl_pamu.h           |  1 +
 arch/powerpc/include/asm/fsl_pci.h            |  1 +
 arch/powerpc/include/asm/fsl_portals.h        |  1 +
 arch/powerpc/include/asm/fsl_serdes.h         |  1 +
 arch/powerpc/include/asm/global_data.h        |  2 +-
 arch/powerpc/include/asm/immap_86xx.h         |  1 +
 arch/powerpc/include/asm/immap_8xx.h          |  1 +
 arch/powerpc/include/asm/io.h                 |  3 ++
 arch/powerpc/include/asm/iopin_8xx.h          |  1 +
 arch/powerpc/include/asm/mmu.h                |  1 +
 arch/powerpc/include/asm/mp.h                 |  1 +
 arch/powerpc/include/asm/ppc.h                |  2 ++
 arch/powerpc/lib/bat_rw.c                     |  2 ++
 arch/powerpc/lib/bdinfo.c                     |  5 ++++
 arch/powerpc/lib/bootm.c                      |  5 ++++
 arch/powerpc/lib/cache.c                      |  1 +
 arch/powerpc/lib/extable.c                    |  1 +
 arch/powerpc/lib/interrupts.c                 | 11 +++++---
 arch/powerpc/lib/kgdb.c                       |  1 +
 arch/powerpc/lib/spl.c                        |  1 +
 arch/powerpc/lib/stack.c                      |  2 ++
 arch/powerpc/lib/time.c                       |  6 ++--
 arch/riscv/cpu/ax25/cpu.c                     |  1 +
 arch/riscv/cpu/cpu.c                          |  4 +++
 arch/riscv/cpu/fu540/cache.c                  |  2 ++
 arch/riscv/cpu/fu540/cpu.c                    |  1 +
 arch/riscv/cpu/fu540/dram.c                   |  3 ++
 arch/riscv/cpu/generic/cpu.c                  |  1 +
 arch/riscv/cpu/generic/dram.c                 |  3 ++
 arch/riscv/include/asm/global_data.h          |  1 +
 arch/riscv/include/asm/io.h                   |  1 +
 arch/riscv/include/asm/ptrace.h               |  1 +
 arch/riscv/include/asm/smp.h                  |  1 +
 arch/riscv/lib/andes_plic.c                   |  5 ++++
 arch/riscv/lib/andes_plmt.c                   |  3 ++
 arch/riscv/lib/asm-offsets.c                  |  1 +
 arch/riscv/lib/boot.c                         |  2 ++
 arch/riscv/lib/bootm.c                        |  5 ++++
 arch/riscv/lib/cache.c                        |  1 +
 arch/riscv/lib/fdt_fixup.c                    |  6 ++++
 arch/riscv/lib/image.c                        |  5 ++++
 arch/riscv/lib/interrupts.c                   |  3 ++
 arch/riscv/lib/rdtime.c                       |  2 ++
 arch/riscv/lib/reloc_riscv_efi.c              |  1 +
 arch/riscv/lib/reset.c                        |  1 +
 arch/riscv/lib/sbi.c                          |  2 ++
 arch/riscv/lib/sbi_ipi.c                      |  1 +
 arch/riscv/lib/sifive_clint.c                 |  3 ++
 arch/riscv/lib/smp.c                          |  4 +++
 arch/riscv/lib/spl.c                          |  4 +++
 arch/sandbox/cpu/cpu.c                        |  6 ++++
 arch/sandbox/cpu/eth-raw-os.c                 |  2 ++
 arch/sandbox/cpu/os.c                         |  4 +++
 arch/sandbox/cpu/sdl.c                        |  4 +++
 arch/sandbox/cpu/spl.c                        |  5 ++++
 arch/sandbox/cpu/start.c                      |  8 ++++++
 arch/sandbox/cpu/state.c                      |  5 ++++
 arch/sandbox/include/asm/axi.h                |  1 +
 arch/sandbox/include/asm/clk.h                |  1 +
 arch/sandbox/include/asm/eth.h                |  2 ++
 arch/sandbox/include/asm/global_data.h        |  1 +
 arch/sandbox/include/asm/gpio.h               |  1 +
 arch/sandbox/include/asm/handoff.h            |  1 +
 arch/sandbox/include/asm/io.h                 |  1 +
 arch/sandbox/include/asm/mbox.h               |  1 +
 arch/sandbox/include/asm/sdl.h                |  3 ++
 arch/sandbox/include/asm/sections.h           |  1 +
 arch/sandbox/include/asm/setjmp.h             |  1 +
 arch/sandbox/include/asm/state.h              |  1 +
 arch/sandbox/include/asm/test.h               |  2 ++
 arch/sandbox/include/asm/u-boot-sandbox.h     |  1 +
 arch/sandbox/lib/bootm.c                      |  4 +++
 arch/sandbox/lib/pci_io.c                     |  3 ++
 arch/sh/cpu/sh4/cache.c                       |  1 +
 arch/sh/cpu/sh4/cpu.c                         |  2 ++
 arch/sh/include/asm/pci.h                     |  1 +
 arch/sh/include/asm/string.h                  |  1 +
 arch/sh/lib/board.c                           |  3 ++
 arch/sh/lib/bootm.c                           |  3 ++
 arch/sh/lib/time_sh2.c                        |  1 +
 arch/sh/lib/zimageboot.c                      |  3 ++
 arch/x86/cpu/acpi_gpe.c                       |  4 +++
 arch/x86/cpu/apollolake/cpu_spl.c             |  4 +++
 arch/x86/cpu/apollolake/fsp_bindings.c        |  4 +++
 arch/x86/cpu/apollolake/fsp_m.c               |  1 +
 arch/x86/cpu/apollolake/fsp_s.c               |  5 ++++
 arch/x86/cpu/apollolake/hostbridge.c          |  2 ++
 arch/x86/cpu/apollolake/lpc.c                 |  3 ++
 arch/x86/cpu/apollolake/pch.c                 |  1 +
 arch/x86/cpu/apollolake/pmc.c                 |  4 +++
 arch/x86/cpu/apollolake/punit.c               |  3 ++
 arch/x86/cpu/apollolake/spl.c                 |  4 +++
 arch/x86/cpu/apollolake/uart.c                |  2 ++
 arch/x86/cpu/baytrail/acpi.c                  |  2 ++
 arch/x86/cpu/baytrail/cpu.c                   |  1 +
 arch/x86/cpu/baytrail/early_uart.c            |  2 ++
 arch/x86/cpu/baytrail/fsp_configs.c           |  2 ++
 arch/x86/cpu/baytrail/valleyview.c            |  1 +
 arch/x86/cpu/braswell/braswell.c              |  1 +
 arch/x86/cpu/braswell/early_uart.c            |  2 ++
 arch/x86/cpu/braswell/fsp_configs.c           |  2 ++
 arch/x86/cpu/broadwell/adsp.c                 |  3 ++
 arch/x86/cpu/broadwell/cpu.c                  |  4 +++
 arch/x86/cpu/broadwell/cpu_from_spl.c         |  2 ++
 arch/x86/cpu/broadwell/cpu_full.c             |  6 ++++
 arch/x86/cpu/broadwell/iobp.c                 |  4 +++
 arch/x86/cpu/broadwell/lpc.c                  |  2 ++
 arch/x86/cpu/broadwell/me.c                   |  3 ++
 arch/x86/cpu/broadwell/northbridge.c          |  5 ++++
 arch/x86/cpu/broadwell/pch.c                  |  5 ++++
 arch/x86/cpu/broadwell/pinctrl_broadwell.c    |  6 ++++
 arch/x86/cpu/broadwell/refcode.c              |  6 ++++
 arch/x86/cpu/broadwell/sata.c                 |  2 ++
 arch/x86/cpu/broadwell/sdram.c                |  6 ++++
 arch/x86/cpu/coreboot/coreboot.c              |  4 +++
 arch/x86/cpu/coreboot/sdram.c                 |  6 ++++
 arch/x86/cpu/coreboot/tables.c                |  4 +++
 arch/x86/cpu/coreboot/timestamp.c             |  3 ++
 arch/x86/cpu/cpu.c                            |  7 +++++
 arch/x86/cpu/cpu_x86.c                        |  3 ++
 arch/x86/cpu/efi/app.c                        |  1 +
 arch/x86/cpu/efi/payload.c                    |  7 +++++
 arch/x86/cpu/efi/sdram.c                      |  3 ++
 arch/x86/cpu/i386/cpu.c                       |  9 ++++++
 arch/x86/cpu/i386/interrupt.c                 |  6 ++++
 arch/x86/cpu/intel_common/cpu.c               |  5 ++++
 arch/x86/cpu/intel_common/cpu_from_spl.c      |  2 ++
 arch/x86/cpu/intel_common/fast_spi.c          |  1 +
 arch/x86/cpu/intel_common/itss.c              |  6 ++++
 arch/x86/cpu/intel_common/lpc.c               |  5 ++++
 arch/x86/cpu/intel_common/me_status.c         |  1 +
 arch/x86/cpu/intel_common/microcode.c         |  4 +++
 arch/x86/cpu/intel_common/mrc.c               |  9 ++++++
 arch/x86/cpu/intel_common/p2sb.c              |  4 +++
 arch/x86/cpu/intel_common/pch.c               |  1 +
 arch/x86/cpu/intel_common/report_platform.c   |  3 ++
 arch/x86/cpu/ioapic.c                         |  1 +
 arch/x86/cpu/irq.c                            |  5 ++++
 arch/x86/cpu/ivybridge/bd82x6x.c              |  5 ++++
 arch/x86/cpu/ivybridge/cpu.c                  |  5 ++++
 arch/x86/cpu/ivybridge/early_me.c             |  3 ++
 arch/x86/cpu/ivybridge/fsp_configs.c          |  1 +
 arch/x86/cpu/ivybridge/ivybridge.c            |  1 +
 arch/x86/cpu/ivybridge/lpc.c                  |  5 ++++
 arch/x86/cpu/ivybridge/model_206ax.c          |  5 ++++
 arch/x86/cpu/ivybridge/northbridge.c          |  2 ++
 arch/x86/cpu/ivybridge/sata.c                 |  3 ++
 arch/x86/cpu/ivybridge/sdram.c                |  5 ++++
 arch/x86/cpu/ivybridge/sdram_nop.c            |  2 ++
 arch/x86/cpu/mp_init.c                        |  8 ++++++
 arch/x86/cpu/mtrr.c                           |  4 +++
 arch/x86/cpu/pci.c                            |  1 +
 arch/x86/cpu/qemu/cpu.c                       |  1 +
 arch/x86/cpu/qemu/dram.c                      |  3 ++
 arch/x86/cpu/qemu/e820.c                      |  1 +
 arch/x86/cpu/qemu/qemu.c                      |  3 ++
 arch/x86/cpu/qfw_cpu.c                        |  4 +++
 arch/x86/cpu/quark/acpi.c                     |  3 ++
 arch/x86/cpu/quark/dram.c                     |  5 ++++
 arch/x86/cpu/quark/hte.c                      |  1 +
 arch/x86/cpu/quark/hte.h                      |  1 +
 arch/x86/cpu/quark/mrc.c                      |  3 ++
 arch/x86/cpu/quark/mrc_util.c                 |  3 ++
 arch/x86/cpu/quark/mrc_util.h                 |  2 ++
 arch/x86/cpu/quark/msg_port.c                 |  1 +
 arch/x86/cpu/quark/quark.c                    |  2 ++
 arch/x86/cpu/quark/smc.c                      |  4 +++
 arch/x86/cpu/quark/smc.h                      |  1 +
 arch/x86/cpu/queensbay/tnc.c                  |  2 ++
 arch/x86/cpu/slimbootloader/sdram.c           |  5 ++++
 arch/x86/cpu/slimbootloader/serial.c          |  3 ++
 arch/x86/cpu/slimbootloader/slimbootloader.c  |  3 ++
 arch/x86/cpu/tangier/acpi.c                   |  3 ++
 arch/x86/cpu/tangier/pinmux.c                 |  6 ++++
 arch/x86/cpu/tangier/sdram.c                  |  5 ++++
 arch/x86/cpu/tangier/sysreset.c               |  1 +
 arch/x86/cpu/tangier/tangier.c                |  1 +
 arch/x86/cpu/turbo.c                          |  1 +
 arch/x86/cpu/x86_64/cpu.c                     |  2 ++
 arch/x86/include/asm/acpi_nhlt.h              |  1 +
 arch/x86/include/asm/acpi_table.h             |  1 +
 .../asm/arch-apollolake/fsp/fsp_m_upd.h       |  2 ++
 .../asm/arch-apollolake/fsp/fsp_s_upd.h       |  2 ++
 .../asm/arch-apollolake/fsp_bindings.h        |  2 ++
 .../include/asm/arch-apollolake/global_nvs.h  |  2 ++
 arch/x86/include/asm/arch-apollolake/lpc.h    |  1 +
 arch/x86/include/asm/arch-apollolake/uart.h   |  1 +
 .../include/asm/arch-baytrail/fsp/fsp_vpd.h   |  2 ++
 .../include/asm/arch-baytrail/global_nvs.h    |  2 ++
 .../include/asm/arch-braswell/fsp/fsp_vpd.h   |  2 ++
 arch/x86/include/asm/arch-broadwell/gpio.h    |  2 ++
 arch/x86/include/asm/arch-broadwell/me.h      |  2 ++
 arch/x86/include/asm/arch-broadwell/pch.h     |  3 ++
 .../x86/include/asm/arch-broadwell/pei_data.h |  2 ++
 arch/x86/include/asm/arch-broadwell/pm.h      |  1 +
 arch/x86/include/asm/arch-coreboot/sysinfo.h  |  1 +
 .../x86/include/asm/arch-coreboot/timestamp.h |  1 +
 .../asm/arch-ivybridge/fsp/fsp_configs.h      |  1 +
 arch/x86/include/asm/arch-ivybridge/me.h      |  2 ++
 .../include/asm/arch-ivybridge/model_206ax.h  |  2 ++
 arch/x86/include/asm/arch-ivybridge/pch.h     |  1 +
 .../x86/include/asm/arch-ivybridge/pei_data.h |  2 ++
 arch/x86/include/asm/arch-qemu/qemu.h         |  1 +
 arch/x86/include/asm/arch-quark/global_nvs.h  |  2 ++
 arch/x86/include/asm/arch-quark/mrc.h         |  1 +
 arch/x86/include/asm/arch-quark/msg_port.h    |  1 +
 arch/x86/include/asm/arch-quark/quark.h       |  1 +
 .../include/asm/arch-queensbay/fsp/fsp_vpd.h  |  2 ++
 arch/x86/include/asm/arch-queensbay/tnc.h     |  1 +
 .../asm/arch-slimbootloader/slimbootloader.h  |  1 +
 .../x86/include/asm/arch-tangier/global_nvs.h |  2 ++
 arch/x86/include/asm/bootm.h                  |  2 ++
 arch/x86/include/asm/coreboot_tables.h        |  2 ++
 arch/x86/include/asm/cpu.h                    |  1 +
 arch/x86/include/asm/cpu_common.h             |  4 +++
 arch/x86/include/asm/early_cmos.h             |  1 +
 arch/x86/include/asm/fast_spi.h               |  6 +++-
 arch/x86/include/asm/fsp/fsp_api.h            |  1 +
 arch/x86/include/asm/fsp/fsp_azalia.h         |  2 ++
 arch/x86/include/asm/fsp/fsp_fv.h             |  1 +
 arch/x86/include/asm/fsp/fsp_hob.h            |  2 ++
 arch/x86/include/asm/fsp/fsp_infoheader.h     |  2 ++
 arch/x86/include/asm/fsp/fsp_support.h        |  1 +
 arch/x86/include/asm/fsp1/fsp_api.h           |  1 +
 arch/x86/include/asm/fsp1/fsp_ffs.h           |  2 ++
 arch/x86/include/asm/fsp1/fsp_support.h       |  1 +
 arch/x86/include/asm/fsp2/fsp_api.h           |  3 ++
 arch/x86/include/asm/fsp2/fsp_internal.h      |  2 ++
 arch/x86/include/asm/global_data.h            |  3 ++
 arch/x86/include/asm/gpio.h                   |  1 +
 arch/x86/include/asm/handoff.h                |  2 ++
 arch/x86/include/asm/hob.h                    |  2 ++
 arch/x86/include/asm/intel_pinctrl.h          |  2 ++
 arch/x86/include/asm/interrupt.h              |  1 +
 arch/x86/include/asm/io.h                     |  4 ++-
 arch/x86/include/asm/ioapic.h                 |  1 +
 arch/x86/include/asm/irq.h                    |  2 ++
 arch/x86/include/asm/itss.h                   |  1 +
 arch/x86/include/asm/lpc_common.h             |  1 +
 arch/x86/include/asm/me_common.h              |  2 ++
 arch/x86/include/asm/microcode.h              |  1 +
 arch/x86/include/asm/mp.h                     |  3 ++
 arch/x86/include/asm/mpspec.h                 |  1 +
 arch/x86/include/asm/mrc_common.h             |  2 ++
 arch/x86/include/asm/mrccache.h               |  3 ++
 arch/x86/include/asm/mtrr.h                   |  3 ++
 arch/x86/include/asm/pch_common.h             |  1 +
 arch/x86/include/asm/pci.h                    |  1 +
 arch/x86/include/asm/pirq_routing.h           |  3 ++
 arch/x86/include/asm/pmu.h                    |  1 +
 arch/x86/include/asm/pnp_def.h                |  1 +
 arch/x86/include/asm/processor.h              |  1 +
 arch/x86/include/asm/scu.h                    |  1 +
 arch/x86/include/asm/sfi.h                    |  1 +
 arch/x86/include/asm/sipi.h                   |  2 ++
 arch/x86/include/asm/speedstep.h              |  1 +
 arch/x86/include/asm/spl.h                    |  1 +
 arch/x86/include/asm/tables.h                 |  1 +
 arch/x86/include/asm/u-boot-x86.h             |  1 +
 arch/x86/include/asm/zimage.h                 |  1 +
 arch/x86/lib/acpi.c                           |  2 ++
 arch/x86/lib/acpi_nhlt.c                      |  4 +++
 arch/x86/lib/acpi_s3.c                        |  3 ++
 arch/x86/lib/acpi_table.c                     |  7 +++++
 arch/x86/lib/asm-offsets.c                    |  1 +
 arch/x86/lib/bios.c                           |  3 ++
 arch/x86/lib/bios.h                           |  3 ++
 arch/x86/lib/bios_interrupts.c                |  2 ++
 arch/x86/lib/bootm.c                          |  6 ++++
 arch/x86/lib/cmd_boot.c                       |  3 ++
 arch/x86/lib/coreboot_table.c                 |  4 +++
 arch/x86/lib/div64.c                          |  2 ++
 arch/x86/lib/e820.c                           |  3 ++
 arch/x86/lib/early_cmos.c                     |  1 +
 arch/x86/lib/fsp/fsp_common.c                 |  4 +++
 arch/x86/lib/fsp/fsp_dram.c                   |  4 +++
 arch/x86/lib/fsp/fsp_graphics.c               |  4 +++
 arch/x86/lib/fsp/fsp_support.c                |  1 +
 arch/x86/lib/fsp1/fsp_common.c                |  2 ++
 arch/x86/lib/fsp1/fsp_dram.c                  |  3 ++
 arch/x86/lib/fsp1/fsp_support.c               |  4 +++
 arch/x86/lib/fsp2/fsp_dram.c                  |  5 ++++
 arch/x86/lib/fsp2/fsp_init.c                  |  3 ++
 arch/x86/lib/fsp2/fsp_meminit.c               |  7 +++++
 arch/x86/lib/fsp2/fsp_silicon_init.c          |  5 ++++
 arch/x86/lib/fsp2/fsp_support.c               |  6 ++++
 arch/x86/lib/hob.c                            |  1 +
 arch/x86/lib/i8254.c                          |  3 ++
 arch/x86/lib/i8259.c                          |  2 ++
 arch/x86/lib/init_helpers.c                   |  3 ++
 arch/x86/lib/interrupts.c                     |  3 ++
 arch/x86/lib/mpspec.c                         |  7 +++++
 arch/x86/lib/mrccache.c                       |  6 ++++
 arch/x86/lib/physmem.c                        |  4 +++
 arch/x86/lib/pinctrl_ich6.c                   |  4 +++
 arch/x86/lib/pirq_routing.c                   |  6 ++++
 arch/x86/lib/pmu.c                            |  3 ++
 arch/x86/lib/ramtest.c                        |  3 ++
 arch/x86/lib/relocate.c                       |  5 ++++
 arch/x86/lib/scu.c                            |  3 ++
 arch/x86/lib/sfi.c                            |  4 +++
 arch/x86/lib/spl.c                            |  7 +++++
 arch/x86/lib/string.c                         |  1 +
 arch/x86/lib/tables.c                         |  5 ++++
 arch/x86/lib/tpl.c                            |  7 +++++
 arch/x86/lib/zimage.c                         |  6 ++++
 arch/xtensa/cpu/cpu.c                         |  3 ++
 arch/xtensa/cpu/exceptions.c                  |  2 ++
 arch/xtensa/include/asm/io.h                  |  1 +
 arch/xtensa/include/asm/ldscript.h            |  1 +
 arch/xtensa/lib/bootm.c                       |  5 ++++
 arch/xtensa/lib/cache.c                       |  1 +
 arch/xtensa/lib/relocate.c                    |  2 ++
 arch/xtensa/lib/time.c                        |  1 +
 board/AndesTech/adp-ae3xx/adp-ae3xx.c         |  4 +++
 board/AndesTech/adp-ag101p/adp-ag101p.c       |  4 +++
 board/AndesTech/ax25-ae350/ax25-ae350.c       |  5 ++++
 board/Arcturus/ucp1020/cmd_arc.c              |  3 ++
 board/Arcturus/ucp1020/ddr.c                  |  4 +++
 board/Arcturus/ucp1020/law.c                  |  2 ++
 board/Arcturus/ucp1020/spl.c                  |  5 ++++
 board/Arcturus/ucp1020/spl_minimal.c          |  2 ++
 board/Arcturus/ucp1020/tlb.c                  |  2 ++
 board/Arcturus/ucp1020/ucp1020.c              |  5 ++++
 board/BuR/brppt1/board.c                      |  4 +++
 board/BuR/brppt2/board.c                      |  4 +++
 board/BuR/brsmarc1/board.c                    |  4 +++
 board/BuR/brxre1/board.c                      |  5 ++++
 board/BuR/common/br_resetc.c                  |  3 ++
 board/BuR/common/br_resetc.h                  |  1 +
 board/BuR/common/bur_common.h                 |  2 ++
 board/BuR/common/common.c                     |  6 ++++
 board/BuS/eb_cpu5282/eb_cpu5282.c             |  5 ++++
 board/CZ.NIC/turris_mox/mox_sp.c              |  3 ++
 board/CZ.NIC/turris_mox/mox_sp.h              |  1 +
 board/CZ.NIC/turris_mox/turris_mox.c          |  8 ++++++
 board/CZ.NIC/turris_omnia/turris_omnia.c      |  8 ++++++
 board/CarMediaLab/flea3/flea3.c               |  4 +++
 board/LaCie/common/common.c                   |  2 ++
 board/LaCie/common/common.h                   |  1 +
 board/LaCie/edminiv2/edminiv2.c               |  3 ++
 board/LaCie/net2big_v2/net2big_v2.c           |  5 ++++
 board/LaCie/netspace_v2/netspace_v2.c         |  3 ++
 board/Marvell/aspenite/aspenite.c             |  3 ++
 board/Marvell/db-88f6281-bp/db-88f6281-bp.c   |  3 ++
 board/Marvell/db-88f6720/db-88f6720.c         |  3 ++
 board/Marvell/db-88f6820-amc/db-88f6820-amc.c |  5 ++++
 board/Marvell/db-88f6820-gp/db-88f6820-gp.c   |  5 ++++
 board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c   |  4 +++
 board/Marvell/db-xc3-24g4xg/db-xc3-24g4xg.c   |  3 ++
 board/Marvell/dreamplug/dreamplug.c           |  4 +++
 board/Marvell/gplugd/gplugd.c                 |  4 +++
 board/Marvell/guruplug/guruplug.c             |  4 +++
 board/Marvell/mvebu_armada-37xx/board.c       |  5 ++++
 board/Marvell/mvebu_armada-8k/board.c         |  5 ++++
 board/Marvell/openrd/openrd.c                 |  4 +++
 board/Marvell/sheevaplug/sheevaplug.c         |  4 +++
 board/Seagate/dockstar/dockstar.c             |  4 +++
 board/Seagate/goflexhome/goflexhome.c         |  4 +++
 board/Seagate/nas220/nas220.c                 |  4 +++
 board/Synology/ds109/ds109.c                  |  5 ++++
 board/Synology/ds109/ds109.h                  |  1 +
 board/Synology/ds414/cmd_syno.c               |  4 +++
 board/Synology/ds414/ds414.c                  |  5 ++++
 board/abilis/tb100/tb100.c                    |  2 ++
 board/advantech/dms-ba16/dms-ba16.c           |  5 ++++
 .../imx8qm_rom7720_a1/imx8qm_rom7720_a1.c     |  5 ++++
 board/advantech/imx8qm_rom7720_a1/spl.c       |  6 ++++
 .../som-db5800-som-6867/som-db5800-som-6867.c |  2 ++
 board/alliedtelesis/SBx81LIFKW/sbx81lifkw.c   |  3 ++
 .../alliedtelesis/SBx81LIFXCAT/sbx81lifxcat.c |  3 ++
 board/alliedtelesis/common/gpio_hog.c         |  2 ++
 board/alliedtelesis/x530/x530.c               |  6 ++++
 board/altera/arria5-socdk/qts/pinmux_config.h |  1 +
 board/altera/arria5-socdk/qts/sdram_config.h  |  1 +
 .../altera/cyclone5-socdk/qts/pinmux_config.h |  1 +
 .../altera/cyclone5-socdk/qts/sdram_config.h  |  1 +
 board/amazon/kc1/kc1.c                        |  3 ++
 board/amlogic/odroid-n2/odroid-n2.c           |  2 ++
 board/amlogic/p200/p200.c                     |  1 +
 board/amlogic/p201/p201.c                     |  1 +
 board/amlogic/p212/p212.c                     |  1 +
 board/amlogic/q200/q200.c                     |  1 +
 board/aries/mcvevk/qts/pinmux_config.h        |  1 +
 board/aries/mcvevk/qts/sdram_config.h         |  1 +
 board/aristainetos/aristainetos.c             |  7 +++++
 board/armadeus/apf27/apf27.c                  |  5 ++++
 board/armadeus/opos6uldev/board.c             |  1 +
 board/armltd/integrator/integrator.c          |  4 +++
 board/armltd/integrator/pci.c                 |  1 +
 board/armltd/integrator/timer.c               |  3 +-
 board/armltd/vexpress/vexpress_common.c       |  6 ++++
 board/armltd/vexpress/vexpress_tc2.c          |  4 +++
 board/armltd/vexpress64/pcie.c                |  2 ++
 board/armltd/vexpress64/vexpress64.c          |  6 ++++
 board/astro/mcf5373l/fpga.c                   |  2 ++
 board/astro/mcf5373l/mcf5373l.c               |  4 +++
 .../armadillo-800eva/armadillo-800eva.c       |  3 ++
 board/atmel/at91rm9200ek/at91rm9200ek.c       |  3 ++
 board/atmel/at91sam9260ek/at91sam9260ek.c     |  2 ++
 board/atmel/at91sam9261ek/at91sam9261ek.c     |  3 ++
 board/atmel/at91sam9263ek/at91sam9263ek.c     |  3 ++
 .../atmel/at91sam9m10g45ek/at91sam9m10g45ek.c |  3 ++
 board/atmel/at91sam9n12ek/at91sam9n12ek.c     |  3 ++
 board/atmel/at91sam9rlek/at91sam9rlek.c       |  3 ++
 board/atmel/at91sam9x5ek/at91sam9x5ek.c       |  2 ++
 board/atmel/common/board.c                    |  3 ++
 board/atmel/common/mac-spi-nor.c              |  3 ++
 board/atmel/common/video_display.c            |  4 +++
 board/atmel/sam9x60ek/sam9x60ek.c             |  2 ++
 .../atmel/sama5d27_som1_ek/sama5d27_som1_ek.c |  3 ++
 .../sama5d27_wlsom1_ek/sama5d27_wlsom1_ek.c   |  3 ++
 board/atmel/sama5d2_icp/sama5d2_icp.c         |  3 ++
 board/atmel/sama5d2_ptc_ek/sama5d2_ptc_ek.c   |  2 ++
 .../atmel/sama5d2_xplained/sama5d2_xplained.c |  3 ++
 .../atmel/sama5d3_xplained/sama5d3_xplained.c |  3 ++
 board/atmel/sama5d3xek/sama5d3xek.c           |  4 +++
 .../atmel/sama5d4_xplained/sama5d4_xplained.c |  3 ++
 board/atmel/sama5d4ek/sama5d4ek.c             |  3 ++
 board/avionic-design/common/tamonten-ng.c     |  2 ++
 board/bachmann/ot1200/ot1200.c                |  6 ++++
 board/bachmann/ot1200/ot1200_spl.c            |  2 ++
 board/barco/platinum/platinum.c               |  4 +++
 board/barco/platinum/platinum_picon.c         |  1 +
 board/barco/platinum/platinum_titanium.c      |  1 +
 board/barco/platinum/spl_picon.c              |  3 ++
 board/barco/platinum/spl_titanium.c           |  3 ++
 board/barco/titanium/titanium.c               |  4 +++
 board/beacon/beacon-rzg2m/beacon-rzg2m.c      |  4 +++
 board/beacon/imx8mm/imx8mm_beacon.c           |  2 ++
 board/beacon/imx8mm/spl.c                     |  7 +++++
 board/beckhoff/mx53cx9020/mx53cx9020.c        |  5 ++++
 board/beckhoff/mx53cx9020/mx53cx9020_video.c  |  2 ++
 board/bluegiga/apx4devkit/apx4devkit.c        |  6 ++++
 board/bluegiga/apx4devkit/spl_boot.c          |  2 ++
 board/bluewater/gurnard/gurnard.c             |  6 ++++
 board/bluewater/snapper9260/snapper9260.c     |  2 ++
 board/bosch/guardian/board.c                  |  4 +++
 board/bosch/shc/board.c                       |  5 ++++
 board/bosch/shc/board.h                       |  1 +
 board/bosch/shc/mux.c                         |  1 +
 board/boundary/nitrogen6x/nitrogen6x.c        |  7 +++++
 board/broadcom/bcm23550_w1d/bcm23550_w1d.c    |  3 ++
 board/broadcom/bcm28155_ap/bcm28155_ap.c      |  3 ++
 board/broadcom/bcm963158/bcm963158.c          |  2 ++
 board/broadcom/bcm968360bg/bcm968360bg.c      |  2 ++
 board/broadcom/bcm968580xref/bcm968580xref.c  |  2 ++
 board/broadcom/bcm_ep/board.c                 |  4 +++
 board/broadcom/bcmns2/northstar2.c            |  3 ++
 board/broadcom/bcmns3/ns3.c                   |  3 ++
 board/broadcom/bcmstb/bcmstb.c                |  3 ++
 board/bticino/mamoj/mamoj.c                   |  2 ++
 board/bticino/mamoj/spl.c                     |  3 ++
 board/buffalo/lsxl/lsxl.c                     |  4 +++
 board/cadence/xtfpga/xtfpga.c                 |  4 +++
 board/calao/usb_a9263/usb_a9263.c             |  2 ++
 board/cavium/thunderx/atf.c                   |  4 +++
 board/cavium/thunderx/thunderx.c              |  4 +++
 board/ccv/xpress/spl.c                        |  2 ++
 board/ccv/xpress/xpress.c                     |  6 ++++
 board/cei/cei-tk1-som/cei-tk1-som.c           |  1 +
 board/cirrus/edb93xx/edb93xx.c                |  4 +++
 board/cloudengines/pogo_e02/pogo_e02.c        |  4 +++
 board/cobra5272/cobra5272.c                   |  1 +
 board/cobra5272/flash.c                       |  8 ++++--
 board/compulab/cl-som-imx7/cl-som-imx7.c      |  5 ++++
 board/compulab/cl-som-imx7/mux.c              |  1 +
 board/compulab/cl-som-imx7/spl.c              |  4 +++
 board/compulab/cm_fx6/cm_fx6.c                |  7 +++++
 board/compulab/cm_fx6/spl.c                   |  4 +++
 board/compulab/cm_t335/cm_t335.c              |  4 +++
 board/compulab/cm_t335/spl.c                  |  1 +
 board/compulab/cm_t43/cm_t43.c                |  4 +++
 board/compulab/cm_t43/spl.c                   |  2 ++
 board/compulab/common/common.c                |  3 ++
 board/compulab/common/common.h                |  1 +
 board/compulab/common/eeprom.c                |  5 ++++
 board/compulab/common/eeprom.h                |  2 ++
 board/compulab/common/omap3_display.c         |  5 ++++
 board/compulab/common/omap3_smc911x.c         |  2 ++
 board/congatec/cgtqmx6eval/cgtqmx6eval.c      |  8 ++++++
 .../conga-qeval20-qa3.c                       |  3 ++
 board/corscience/tricorder/led.c              |  1 +
 board/corscience/tricorder/tricorder-eeprom.c |  7 +++++
 board/corscience/tricorder/tricorder-eeprom.h |  2 ++
 board/corscience/tricorder/tricorder.c        |  6 ++++
 board/cortina/presidio-asic/presidio.c        |  4 +++
 board/creative/xfi3/spl_boot.c                |  3 ++
 board/creative/xfi3/xfi3.c                    |  5 ++++
 board/cssi/MCR3000/MCR3000.c                  |  6 ++++
 board/cssi/MCR3000/nand.c                     |  1 +
 board/d-link/dns325/dns325.c                  |  4 +++
 board/davinci/da8xxevm/da850evm.c             |  7 +++++
 board/davinci/da8xxevm/omapl138_lcdk.c        |  7 +++++
 board/devboards/dbm-soc1/qts/pinmux_config.h  |  1 +
 board/devboards/dbm-soc1/qts/sdram_config.h   |  1 +
 board/dfi/dfi-bt700/dfi-bt700.c               |  1 +
 board/dhelectronics/dh_imx6/dh_imx6.c         |  7 +++++
 board/dhelectronics/dh_imx6/dh_imx6_spl.c     |  4 +++
 board/dhelectronics/dh_stm32mp1/board.c       | 10 +++++++
 board/ea/mx7ulp_com/mx7ulp_com.c              |  3 ++
 board/ebv/socrates/qts/pinmux_config.h        |  1 +
 board/ebv/socrates/qts/sdram_config.h         |  1 +
 board/eets/pdu001/board.c                     |  4 +++
 board/eets/pdu001/board.h                     |  1 +
 board/eets/pdu001/mux.c                       |  1 +
 board/egnite/ethernut5/ethernut5.c            |  2 ++
 board/egnite/ethernut5/ethernut5_pwrman.c     |  4 +++
 board/el/el6x/el6x.c                          |  6 ++++
 board/elgin/elgin_rv1108/elgin_rv1108.c       |  2 ++
 board/embest/mx6boards/mx6boards.c            |  5 ++++
 board/emulation/qemu-arm/qemu-arm.c           |  3 ++
 board/emulation/qemu-riscv/qemu-riscv.c       |  2 ++
 board/engicam/common/board.c                  |  6 ++++
 board/engicam/common/spl.c                    |  4 +++
 board/engicam/imx6q/imx6q.c                   |  2 ++
 board/esd/meesc/meesc.c                       |  5 ++++
 board/esd/vme8349/caddy.c                     |  4 +++
 board/esd/vme8349/caddy.h                     |  1 +
 board/esd/vme8349/pci.c                       |  2 ++
 board/esd/vme8349/vme8349.c                   |  6 ++++
 board/firefly/firefly-rk3288/firefly-rk3288.c |  1 +
 board/firefly/firefly-rk3308/roc_cc_rk3308.c  |  1 +
 board/firefly/roc-pc-rk3399/roc-pc-rk3399.c   |  2 ++
 board/freescale/common/arm_sleep.c            |  4 +++
 board/freescale/common/cadmus.c               |  1 +
 board/freescale/common/cds_pci_ft.c           |  2 ++
 board/freescale/common/cmd_esbc_validate.c    |  3 ++
 board/freescale/common/dcu_sii9022a.c         |  2 ++
 board/freescale/common/diu_ch7301.c           |  2 ++
 board/freescale/common/emc2305.c              |  3 ++
 board/freescale/common/emc2305.h              |  1 +
 board/freescale/common/fman.c                 |  1 +
 board/freescale/common/fman.h                 |  1 +
 board/freescale/common/fsl_chain_of_trust.c   |  3 ++
 board/freescale/common/fsl_validate.c         |  6 ++++
 board/freescale/common/ics307_clk.c           |  2 ++
 .../common/idt8t49n222a_serdes_clk.h          |  1 +
 board/freescale/common/ls102xa_stream_id.c    |  1 +
 board/freescale/common/mc34vr500.c            |  3 ++
 board/freescale/common/mpc85xx_sleep.c        |  4 +++
 board/freescale/common/ngpixis.c              |  4 +++
 board/freescale/common/ngpixis.h              |  1 +
 board/freescale/common/ns_access.c            |  2 ++
 board/freescale/common/p_corenet/law.c        |  2 ++
 board/freescale/common/p_corenet/pci.c        |  1 +
 board/freescale/common/p_corenet/tlb.c        |  2 ++
 board/freescale/common/pfuze.c                |  3 ++
 board/freescale/common/pfuze.h                |  1 +
 board/freescale/common/pixis.c                |  4 +++
 board/freescale/common/pixis.h                |  1 +
 board/freescale/common/pq-mds-pib.c           |  2 ++
 board/freescale/common/qixis.c                |  5 ++++
 board/freescale/common/qixis.h                |  1 +
 board/freescale/common/sdhc_boot.c            |  1 +
 board/freescale/common/sgmii_riser.c          |  3 ++
 board/freescale/common/sleep.h                |  1 +
 board/freescale/common/spl.h                  |  1 +
 board/freescale/common/sys_eeprom.c           |  6 ++++
 board/freescale/common/vid.c                  |  6 ++++
 board/freescale/common/vid.h                  |  1 +
 board/freescale/corenet_ds/corenet_ds.c       |  4 +++
 board/freescale/corenet_ds/corenet_ds.h       |  1 +
 board/freescale/corenet_ds/ddr.c              |  5 ++++
 board/freescale/corenet_ds/eth_hydra.c        |  5 ++++
 board/freescale/corenet_ds/eth_p4080.c        |  4 +++
 board/freescale/corenet_ds/eth_superhydra.c   |  5 ++++
 board/freescale/imx8mm_evk/imx8mm_evk.c       |  2 ++
 board/freescale/imx8mm_evk/spl.c              |  7 +++++
 board/freescale/imx8mn_evk/imx8mn_evk.c       |  2 ++
 board/freescale/imx8mn_evk/spl.c              |  6 ++++
 board/freescale/imx8mp_evk/imx8mp_evk.c       |  3 ++
 board/freescale/imx8mp_evk/spl.c              |  4 +++
 board/freescale/imx8mq_evk/imx8mq_evk.c       |  3 ++
 board/freescale/imx8mq_evk/spl.c              |  7 +++++
 board/freescale/imx8qm_mek/imx8qm_mek.c       |  7 +++++
 board/freescale/imx8qm_mek/spl.c              |  5 ++++
 board/freescale/imx8qxp_mek/imx8qxp_mek.c     |  7 +++++
 board/freescale/imx8qxp_mek/spl.c             |  6 ++++
 board/freescale/imxrt1020-evk/imxrt1020-evk.c |  3 ++
 board/freescale/imxrt1050-evk/imxrt1050-evk.c |  3 ++
 board/freescale/ls1012afrdm/eth.c             |  1 +
 board/freescale/ls1012afrdm/ls1012afrdm.c     |  4 +++
 board/freescale/ls1012aqds/eth.c              |  3 ++
 board/freescale/ls1012aqds/ls1012aqds.c       |  6 ++++
 board/freescale/ls1012ardb/eth.c              |  2 ++
 board/freescale/ls1012ardb/ls1012ardb.c       |  7 +++++
 board/freescale/ls1021aiot/dcu.c              |  3 ++
 board/freescale/ls1021aiot/ls1021aiot.c       |  6 ++++
 board/freescale/ls1021aqds/dcu.c              |  4 +++
 board/freescale/ls1021aqds/ddr.c              |  7 +++++
 board/freescale/ls1021aqds/ddr.h              |  1 +
 board/freescale/ls1021aqds/eth.c              |  4 +++
 board/freescale/ls1021aqds/ls1021aqds.c       |  6 ++++
 board/freescale/ls1021atsn/ls1021atsn.c       |  5 ++++
 board/freescale/ls1021atwr/dcu.c              |  3 ++
 board/freescale/ls1021atwr/ls1021atwr.c       |  7 +++++
 board/freescale/ls1028a/ddr.c                 |  1 +
 board/freescale/ls1028a/ls1028a.c             |  6 ++++
 board/freescale/ls1043aqds/ddr.c              |  5 ++++
 board/freescale/ls1043aqds/ddr.h              |  1 +
 board/freescale/ls1043aqds/eth.c              |  4 +++
 board/freescale/ls1043aqds/ls1043aqds.c       |  6 ++++
 board/freescale/ls1043ardb/cpld.c             |  3 ++
 board/freescale/ls1043ardb/cpld.h             |  1 +
 board/freescale/ls1043ardb/ddr.c              |  5 ++++
 board/freescale/ls1043ardb/ddr.h              |  1 +
 board/freescale/ls1043ardb/eth.c              |  3 ++
 board/freescale/ls1043ardb/ls1043ardb.c       |  4 +++
 board/freescale/ls1046afrwy/ddr.c             |  1 +
 board/freescale/ls1046afrwy/eth.c             |  4 +++
 board/freescale/ls1046afrwy/ls1046afrwy.c     |  4 +++
 board/freescale/ls1046aqds/ddr.c              |  5 ++++
 board/freescale/ls1046aqds/ddr.h              |  1 +
 board/freescale/ls1046aqds/eth.c              |  4 +++
 board/freescale/ls1046aqds/ls1046aqds.c       |  6 ++++
 board/freescale/ls1046ardb/cpld.c             |  4 +++
 board/freescale/ls1046ardb/cpld.h             |  2 ++
 board/freescale/ls1046ardb/ddr.c              |  5 ++++
 board/freescale/ls1046ardb/ddr.h              |  1 +
 board/freescale/ls1046ardb/eth.c              |  4 +++
 board/freescale/ls1046ardb/ls1046ardb.c       |  5 ++++
 board/freescale/ls1088a/ddr.c                 |  5 ++++
 board/freescale/ls1088a/ddr.h                 |  1 +
 board/freescale/ls1088a/eth_ls1088aqds.c      |  8 ++++++
 board/freescale/ls1088a/eth_ls1088ardb.c      |  3 ++
 board/freescale/ls1088a/ls1088a.c             |  9 ++++++
 board/freescale/ls2080a/ddr.c                 |  6 ++++
 board/freescale/ls2080a/ddr.h                 |  1 +
 board/freescale/ls2080a/ls2080a.c             |  5 ++++
 board/freescale/ls2080aqds/ddr.c              |  5 ++++
 board/freescale/ls2080aqds/ddr.h              |  1 +
 board/freescale/ls2080aqds/eth.c              |  8 ++++++
 board/freescale/ls2080aqds/ls2080aqds.c       |  8 ++++++
 board/freescale/ls2080ardb/ddr.c              |  5 ++++
 board/freescale/ls2080ardb/ddr.h              |  1 +
 board/freescale/ls2080ardb/eth_ls2080rdb.c    |  4 +++
 board/freescale/ls2080ardb/ls2080ardb.c       |  7 +++++
 board/freescale/lx2160a/ddr.c                 |  1 +
 board/freescale/lx2160a/eth_lx2160aqds.c      |  8 ++++++
 board/freescale/lx2160a/eth_lx2160ardb.c      |  5 ++++
 board/freescale/lx2160a/lx2160a.c             |  8 ++++++
 board/freescale/m5208evbe/m5208evbe.c         |  3 ++
 board/freescale/m52277evb/m52277evb.c         |  3 ++
 board/freescale/m5235evb/m5235evb.c           |  3 ++
 board/freescale/m5249evb/m5249evb.c           |  3 ++
 board/freescale/m5253demo/flash.c             |  3 ++
 board/freescale/m5253demo/m5253demo.c         |  4 +++
 board/freescale/m5272c3/m5272c3.c             |  1 +
 board/freescale/m5275evb/m5275evb.c           |  2 ++
 board/freescale/m5282evb/m5282evb.c           |  2 ++
 board/freescale/m53017evb/m53017evb.c         |  3 ++
 board/freescale/m5329evb/m5329evb.c           |  3 ++
 board/freescale/m5329evb/nand.c               |  1 +
 board/freescale/m5373evb/m5373evb.c           |  3 ++
 board/freescale/m5373evb/nand.c               |  1 +
 board/freescale/m54418twr/m54418twr.c         |  3 ++
 board/freescale/m54451evb/m54451evb.c         |  3 ++
 board/freescale/m54455evb/m54455evb.c         |  3 ++
 board/freescale/m547xevb/m547xevb.c           |  3 ++
 board/freescale/m548xevb/m548xevb.c           |  3 ++
 board/freescale/mpc8308rdb/mpc8308rdb.c       |  3 ++
 board/freescale/mpc8308rdb/sdram.c            |  3 ++
 board/freescale/mpc8313erdb/mpc8313erdb.c     |  4 +++
 board/freescale/mpc8313erdb/sdram.c           |  4 +++
 board/freescale/mpc8315erdb/mpc8315erdb.c     |  4 +++
 board/freescale/mpc8315erdb/sdram.c           |  4 +++
 board/freescale/mpc8323erdb/mpc8323erdb.c     |  7 +++++
 board/freescale/mpc832xemds/mpc832xemds.c     |  5 ++++
 board/freescale/mpc832xemds/pci.c             |  1 +
 board/freescale/mpc8349emds/ddr.c             |  4 +++
 board/freescale/mpc8349emds/mpc8349emds.c     |  5 ++++
 board/freescale/mpc8349emds/pci.c             |  2 ++
 board/freescale/mpc8349itx/mpc8349itx.c       |  6 ++++
 board/freescale/mpc8349itx/pci.c              |  1 +
 board/freescale/mpc837xemds/mpc837xemds.c     |  7 +++++
 board/freescale/mpc837xemds/pci.c             |  3 ++
 board/freescale/mpc837xemds/pci.h             |  1 +
 board/freescale/mpc837xerdb/mpc837xerdb.c     |  6 ++++
 board/freescale/mpc837xerdb/pci.c             |  1 +
 board/freescale/mpc8541cds/law.c              |  2 ++
 board/freescale/mpc8541cds/mpc8541cds.c       |  4 +++
 board/freescale/mpc8541cds/tlb.c              |  2 ++
 board/freescale/mpc8544ds/law.c               |  2 ++
 board/freescale/mpc8544ds/mpc8544ds.c         |  3 ++
 board/freescale/mpc8544ds/tlb.c               |  2 ++
 board/freescale/mpc8548cds/law.c              |  2 ++
 board/freescale/mpc8548cds/mpc8548cds.c       |  4 +++
 board/freescale/mpc8548cds/tlb.c              |  2 ++
 board/freescale/mpc8555cds/law.c              |  2 ++
 board/freescale/mpc8555cds/mpc8555cds.c       |  4 +++
 board/freescale/mpc8555cds/tlb.c              |  2 ++
 board/freescale/mpc8568mds/bcsr.c             |  1 +
 board/freescale/mpc8568mds/law.c              |  2 ++
 board/freescale/mpc8568mds/mpc8568mds.c       |  4 +++
 board/freescale/mpc8568mds/tlb.c              |  2 ++
 board/freescale/mpc8569mds/bcsr.c             |  1 +
 board/freescale/mpc8569mds/law.c              |  2 ++
 board/freescale/mpc8569mds/mpc8569mds.c       |  5 ++++
 board/freescale/mpc8569mds/tlb.c              |  2 ++
 board/freescale/mpc8572ds/ddr.c               |  4 +++
 board/freescale/mpc8572ds/law.c               |  2 ++
 board/freescale/mpc8572ds/mpc8572ds.c         |  4 +++
 board/freescale/mpc8572ds/tlb.c               |  2 ++
 board/freescale/mpc8610hpcd/law.c             |  2 ++
 board/freescale/mpc8610hpcd/mpc8610hpcd.c     |  5 ++++
 board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c |  4 +++
 board/freescale/mpc8641hpcn/ddr.c             |  4 +++
 board/freescale/mpc8641hpcn/law.c             |  2 ++
 board/freescale/mpc8641hpcn/mpc8641hpcn.c     |  5 ++++
 board/freescale/mx23evk/mx23evk.c             |  3 ++
 board/freescale/mx23evk/spl_boot.c            |  2 ++
 board/freescale/mx25pdk/mx25pdk.c             |  5 ++++
 board/freescale/mx28evk/iomux.c               |  2 ++
 board/freescale/mx28evk/mx28evk.c             |  4 +++
 board/freescale/mx35pdk/mx35pdk.c             |  4 +++
 board/freescale/mx51evk/mx51evk.c             |  5 ++++
 board/freescale/mx51evk/mx51evk_video.c       |  2 ++
 board/freescale/mx53ard/mx53ard.c             |  5 ++++
 board/freescale/mx53evk/mx53evk.c             |  5 ++++
 board/freescale/mx53loco/mx53loco.c           |  5 ++++
 board/freescale/mx53loco/mx53loco_video.c     |  3 ++
 board/freescale/mx53smd/mx53smd.c             |  5 ++++
 board/freescale/mx6memcal/mx6memcal.c         |  3 ++
 board/freescale/mx6memcal/spl.c               |  5 ++++
 board/freescale/mx6qarm2/mx6qarm2.c           |  5 ++++
 board/freescale/mx6sabreauto/mx6sabreauto.c   |  6 ++++
 board/freescale/mx6sabresd/mx6sabresd.c       |  6 ++++
 board/freescale/mx6slevk/mx6slevk.c           |  7 +++++
 board/freescale/mx6sllevk/mx6sllevk.c         |  6 ++++
 .../freescale/mx6sxsabreauto/mx6sxsabreauto.c |  6 ++++
 board/freescale/mx6sxsabresd/mx6sxsabresd.c   |  6 ++++
 .../mx6ul_14x14_evk/mx6ul_14x14_evk.c         |  7 +++++
 board/freescale/mx6ullevk/mx6ullevk.c         |  4 +++
 board/freescale/mx7dsabresd/mx7dsabresd.c     |  5 ++++
 board/freescale/mx7ulp_evk/mx7ulp_evk.c       |  4 +++
 board/freescale/p1010rdb/ddr.c                |  5 ++++
 board/freescale/p1010rdb/law.c                |  2 ++
 board/freescale/p1010rdb/p1010rdb.c           |  6 ++++
 board/freescale/p1010rdb/spl.c                |  5 ++++
 board/freescale/p1010rdb/spl_minimal.c        |  2 ++
 board/freescale/p1010rdb/tlb.c                |  2 ++
 board/freescale/p1023rdb/ddr.c                |  1 +
 board/freescale/p1023rdb/law.c                |  2 ++
 board/freescale/p1023rdb/p1023rdb.c           |  4 +++
 board/freescale/p1023rdb/tlb.c                |  2 ++
 board/freescale/p1_p2_rdb_pc/ddr.c            |  4 +++
 board/freescale/p1_p2_rdb_pc/law.c            |  2 ++
 board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c   |  5 ++++
 board/freescale/p1_p2_rdb_pc/spl.c            |  5 ++++
 board/freescale/p1_p2_rdb_pc/spl_minimal.c    |  2 ++
 board/freescale/p1_p2_rdb_pc/tlb.c            |  2 ++
 board/freescale/p2041rdb/cpld.c               |  4 +++
 board/freescale/p2041rdb/cpld.h               |  1 +
 board/freescale/p2041rdb/ddr.c                |  6 ++++
 board/freescale/p2041rdb/eth.c                |  4 +++
 board/freescale/p2041rdb/p2041rdb.c           |  4 +++
 board/freescale/qemu-ppce500/qemu-ppce500.c   |  7 +++++
 board/freescale/s32v234evb/clock.c            |  1 +
 board/freescale/s32v234evb/lpddr2.c           |  1 +
 board/freescale/s32v234evb/s32v234evb.c       |  3 ++
 board/freescale/t102xrdb/cpld.c               |  3 ++
 board/freescale/t102xrdb/cpld.h               |  1 +
 board/freescale/t102xrdb/ddr.c                |  7 +++++
 board/freescale/t102xrdb/eth_t102xrdb.c       |  3 ++
 board/freescale/t102xrdb/law.c                |  2 ++
 board/freescale/t102xrdb/pci.c                |  1 +
 board/freescale/t102xrdb/spl.c                |  6 ++++
 board/freescale/t102xrdb/t102xrdb.c           |  6 ++++
 board/freescale/t102xrdb/t102xrdb.h           |  2 ++
 board/freescale/t102xrdb/tlb.c                |  2 ++
 board/freescale/t104xrdb/cpld.c               |  3 ++
 board/freescale/t104xrdb/cpld.h               |  1 +
 board/freescale/t104xrdb/ddr.c                |  6 ++++
 board/freescale/t104xrdb/ddr.h                |  1 +
 board/freescale/t104xrdb/diu.c                |  3 ++
 board/freescale/t104xrdb/eth.c                |  2 ++
 board/freescale/t104xrdb/law.c                |  2 ++
 board/freescale/t104xrdb/pci.c                |  1 +
 board/freescale/t104xrdb/spl.c                |  5 ++++
 board/freescale/t104xrdb/t104xrdb.c           |  5 ++++
 board/freescale/t104xrdb/t104xrdb.h           |  1 +
 board/freescale/t104xrdb/tlb.c                |  2 ++
 board/freescale/t208xqds/ddr.c                |  5 ++++
 board/freescale/t208xqds/ddr.h                |  1 +
 board/freescale/t208xqds/eth_t208xqds.c       |  5 ++++
 board/freescale/t208xqds/law.c                |  2 ++
 board/freescale/t208xqds/pci.c                |  1 +
 board/freescale/t208xqds/spl.c                |  5 ++++
 board/freescale/t208xqds/t208xqds.c           |  4 +++
 board/freescale/t208xqds/t208xqds.h           |  1 +
 board/freescale/t208xqds/tlb.c                |  2 ++
 board/freescale/t208xrdb/cpld.c               |  3 ++
 board/freescale/t208xrdb/cpld.h               |  1 +
 board/freescale/t208xrdb/ddr.c                |  5 ++++
 board/freescale/t208xrdb/ddr.h                |  1 +
 board/freescale/t208xrdb/eth_t208xrdb.c       |  3 ++
 board/freescale/t208xrdb/law.c                |  2 ++
 board/freescale/t208xrdb/pci.c                |  1 +
 board/freescale/t208xrdb/spl.c                |  5 ++++
 board/freescale/t208xrdb/t208xrdb.c           |  4 +++
 board/freescale/t208xrdb/t208xrdb.h           |  1 +
 board/freescale/t208xrdb/tlb.c                |  2 ++
 board/freescale/t4rdb/cpld.c                  |  3 ++
 board/freescale/t4rdb/cpld.h                  |  1 +
 board/freescale/t4rdb/ddr.c                   |  5 ++++
 board/freescale/t4rdb/ddr.h                   |  1 +
 board/freescale/t4rdb/eth.c                   |  3 ++
 board/freescale/t4rdb/law.c                   |  2 ++
 board/freescale/t4rdb/pci.c                   |  1 +
 board/freescale/t4rdb/spl.c                   |  5 ++++
 board/freescale/t4rdb/t4240rdb.c              |  4 +++
 board/freescale/t4rdb/t4rdb.h                 |  1 +
 board/freescale/t4rdb/tlb.c                   |  2 ++
 board/freescale/vf610twr/vf610twr.c           |  4 +++
 board/friendlyarm/nanopi2/board.c             |  3 ++
 board/friendlyarm/nanopi2/hwrev.c             |  1 +
 board/friendlyarm/nanopi2/hwrev.h             |  1 +
 board/friendlyarm/nanopi2/lcds.c              |  1 +
 board/friendlyarm/nanopi2/onewire.c           |  1 +
 board/gardena/smart-gateway-at91sam/board.c   |  2 ++
 board/gardena/smart-gateway-mt7688/board.c    |  6 ++++
 board/gateworks/gw_ventana/common.c           |  5 ++++
 board/gateworks/gw_ventana/eeprom.c           |  4 +++
 board/gateworks/gw_ventana/gsc.c              |  4 +++
 board/gateworks/gw_ventana/gsc.h              |  1 +
 board/gateworks/gw_ventana/gw_ventana.c       |  8 ++++++
 board/gateworks/gw_ventana/gw_ventana_spl.c   |  3 ++
 board/gateworks/gw_ventana/ventana_eeprom.h   |  1 +
 board/gdsys/a38x/controlcenterdc.c            |  6 ++++
 board/gdsys/a38x/dt_helpers.c                 |  2 ++
 board/gdsys/a38x/dt_helpers.h                 |  2 ++
 board/gdsys/a38x/hre.c                        |  5 ++++
 board/gdsys/a38x/hre.h                        |  2 ++
 board/gdsys/a38x/hydra.c                      |  4 +++
 board/gdsys/a38x/hydra.h                      |  1 +
 board/gdsys/a38x/ihs_phys.c                   |  7 +++++
 board/gdsys/a38x/ihs_phys.h                   |  1 +
 board/gdsys/a38x/keyprogram.c                 |  3 ++
 board/gdsys/a38x/spl.c                        |  2 ++
 board/gdsys/common/ch7301.h                   |  1 +
 board/gdsys/common/cmd_ioloop.c               |  5 ++++
 board/gdsys/common/dp501.c                    |  3 ++
 board/gdsys/common/dp501.h                    |  2 ++
 board/gdsys/common/fanctrl.h                  |  1 +
 board/gdsys/common/ihs_mdio.c                 |  3 ++
 board/gdsys/common/ihs_mdio.h                 |  1 +
 board/gdsys/common/ioep-fpga.c                |  7 +++--
 board/gdsys/common/ioep-fpga.h                |  1 +
 board/gdsys/common/mclink.h                   |  1 +
 board/gdsys/common/osd.c                      |  6 ++++
 board/gdsys/common/osd.h                      |  1 +
 board/gdsys/common/osd_cmd.c                  |  4 +++
 board/gdsys/common/phy.c                      |  4 +++
 board/gdsys/mpc8308/gazerbeam.c               |  4 +++
 board/gdsys/mpc8308/hrcon.c                   |  7 +++++
 board/gdsys/mpc8308/mpc8308.c                 |  1 +
 board/gdsys/mpc8308/mpc8308.h                 |  1 +
 board/gdsys/mpc8308/sdram.c                   |  2 ++
 board/gdsys/mpc8308/strider.c                 |  7 +++++
 board/gdsys/p1022/controlcenterd-id.c         |  6 ++++
 board/gdsys/p1022/controlcenterd.c            |  3 ++
 board/gdsys/p1022/ddr.c                       |  3 ++
 board/gdsys/p1022/diu.c                       |  3 ++
 board/gdsys/p1022/law.c                       |  2 ++
 board/gdsys/p1022/sdhc_boot.c                 |  1 +
 board/gdsys/p1022/tlb.c                       |  2 ++
 board/ge/bx50v3/bx50v3.c                      |  8 ++++++
 board/ge/common/ge_common.c                   |  2 ++
 board/ge/common/vpd_reader.c                  | 14 ++++++----
 board/ge/common/vpd_reader.h                  |  3 +-
 board/ge/mx53ppd/mx53ppd.c                    |  6 ++++
 board/ge/mx53ppd/mx53ppd_video.c              |  3 ++
 board/google/chromebook_coral/coral.c         |  2 ++
 .../google/imx8mq_phanbell/imx8mq_phanbell.c  |  3 ++
 board/google/imx8mq_phanbell/spl.c            |  7 +++++
 board/google/veyron/veyron.c                  |  1 +
 board/grinn/chiliboard/board.c                |  4 +++
 board/grinn/liteboard/board.c                 |  7 +++++
 board/highbank/ahci.c                         |  1 +
 board/highbank/highbank.c                     |  5 ++++
 board/hisilicon/hikey/hikey.c                 |  4 +++
 board/hisilicon/hikey960/hikey960.c           |  4 +++
 board/hisilicon/poplar/poplar.c               |  5 ++++
 board/ids/ids8313/ids8313.c                   |  5 ++++
 board/imgtec/boston/checkboard.c              |  2 ++
 board/imgtec/boston/ddr.c                     |  4 +++
 board/imgtec/boston/dt.c                      |  3 ++
 board/imgtec/ci20/ci20.c                      |  5 ++++
 board/imgtec/malta/malta.c                    |  8 ++++++
 board/imgtec/malta/superio.c                  |  2 ++
 board/imgtec/xilfpga/xilfpga.c                |  1 +
 board/intel/cougarcanyon2/cougarcanyon2.c     |  1 +
 board/intel/edison/edison.c                   |  4 +++
 board/intel/galileo/galileo.c                 |  1 +
 board/inversepath/usbarmory/usbarmory.c       |  5 ++++
 board/iomega/iconnect/iconnect.c              |  3 ++
 board/is1/qts/pinmux_config.h                 |  1 +
 board/is1/qts/sdram_config.h                  |  1 +
 board/isee/igep003x/board.c                   |  5 ++++
 board/isee/igep00x0/common.c                  |  2 ++
 board/isee/igep00x0/igep00x0.c                |  5 ++++
 board/k+p/kp_imx53/kp_id_rev.c                |  4 +++
 board/k+p/kp_imx53/kp_id_rev.h                |  2 ++
 board/k+p/kp_imx53/kp_imx53.c                 |  4 +++
 board/k+p/kp_imx6q_tpc/kp_imx6q_tpc.c         |  3 ++
 board/k+p/kp_imx6q_tpc/kp_imx6q_tpc_spl.c     |  5 ++++
 board/keymile/common/common.c                 |  6 ++++
 board/keymile/common/common.h                 |  1 +
 board/keymile/common/ivm.c                    |  4 +++
 board/keymile/common/qrio.c                   |  4 +++
 board/keymile/common/qrio.h                   |  2 ++
 board/keymile/km83xx/km83xx.c                 |  6 ++++
 board/keymile/km83xx/km83xx_i2c.c             |  3 ++
 board/keymile/km_arm/fpga_config.c            |  2 ++
 board/keymile/km_arm/km_arm.c                 |  6 ++++
 board/keymile/kmp204x/ddr.c                   |  2 ++
 board/keymile/kmp204x/eth.c                   |  2 ++
 board/keymile/kmp204x/kmp204x.c               |  5 ++++
 board/keymile/kmp204x/kmp204x.h               |  1 +
 board/keymile/kmp204x/law.c                   |  2 ++
 board/keymile/kmp204x/pci.c                   |  4 +++
 board/keymile/kmp204x/tlb.c                   |  2 ++
 board/keymile/secu1/qts/pinmux_config.h       |  1 +
 board/keymile/secu1/qts/sdram_config.h        |  1 +
 board/keymile/secu1/socfpga.c                 |  2 ++
 board/kmc/kzm9g/kzm9g.c                       |  3 ++
 board/kobol/helios4/helios4.c                 |  5 ++++
 board/kosagi/novena/novena.c                  |  6 ++++
 board/kosagi/novena/novena_spl.c              |  3 ++
 board/kosagi/novena/video.c                   |  3 ++
 board/l+g/vinco/vinco.c                       |  2 ++
 board/laird/wb45n/wb45n.c                     |  2 ++
 board/laird/wb50n/wb50n.c                     |  4 +++
 board/lego/ev3/legoev3.c                      |  5 ++++
 board/lg/sniper/sniper.c                      |  3 ++
 board/liebherr/display5/display5.c            |  7 +++++
 board/liebherr/display5/spl.c                 |  6 ++++
 board/liebherr/mccmon6/mccmon6.c              |  3 ++
 board/liebherr/mccmon6/spl.c                  |  5 ++++
 board/liebherr/xea/spl_xea.c                  |  2 ++
 board/liebherr/xea/xea.c                      |  4 +++
 board/logicpd/am3517evm/am3517evm.c           |  3 ++
 board/logicpd/imx6/imx6logic.c                |  4 +++
 board/logicpd/omap3som/omap3logic.c           |  3 ++
 board/maxbcm/maxbcm.c                         |  3 ++
 board/mediatek/mt7622/mt7622_rfb.c            |  2 ++
 board/mediatek/mt7623/mt7623_rfb.c            |  4 +++
 board/mediatek/mt7629/mt7629_rfb.c            |  2 ++
 board/mediatek/mt8512/mt8512.c                |  2 ++
 board/mediatek/mt8518/mt8518_ap1.c            |  3 ++
 board/mediatek/pumpkin/pumpkin.c              |  1 +
 board/menlo/m53menlo/m53menlo.c               |  7 +++++
 board/microchip/mpfs_icicle/mpfs_icicle.c     |  1 +
 board/microchip/pic32mzda/pic32mzda.c         |  2 ++
 .../crs3xx-98dx3236/crs3xx-98dx3236.c         |  3 ++
 board/mini-box/picosam9g45/picosam9g45.c      |  3 ++
 board/mpc8308_p1m/mpc8308_p1m.c               |  2 ++
 board/mpc8308_p1m/sdram.c                     |  2 ++
 board/mscc/common/spi.c                       |  2 ++
 board/mscc/jr2/jr2.c                          |  5 ++++
 board/mscc/luton/luton.c                      |  4 +++
 board/mscc/ocelot/ocelot.c                    |  5 ++++
 board/mscc/serval/serval.c                    |  4 +++
 board/mscc/servalt/servalt.c                  |  3 ++
 board/netgear/dgnd3700v2/dgnd3700v2.c         |  1 +
 board/nokia/rx51/rx51.c                       |  6 ++++
 board/nokia/rx51/rx51.h                       |  1 +
 board/nokia/rx51/tag_omap.h                   |  1 +
 board/novtech/meerkat96/meerkat96.c           |  4 +++
 board/nvidia/cardhu/cardhu.c                  |  2 ++
 board/nvidia/dalmore/dalmore.c                |  3 ++
 board/nvidia/e2220-1170/e2220-1170.c          |  2 ++
 board/nvidia/jetson-tk1/jetson-tk1.c          |  3 ++
 board/nvidia/nyan-big/nyan-big.c              |  1 +
 board/nvidia/p2371-0000/p2371-0000.c          |  2 ++
 board/nvidia/p2371-2180/p2371-2180.c          |  5 ++++
 board/nvidia/p2571/p2571.c                    |  2 ++
 board/nvidia/p2771-0000/p2771-0000.c          |  5 ++++
 board/nvidia/p3450-0000/p3450-0000.c          |  5 ++++
 board/nvidia/venice2/as3722_init.c            |  1 +
 board/nvidia/venice2/venice2.c                |  1 +
 board/olimex/mx23_olinuxino/mx23_olinuxino.c  |  2 ++
 board/olimex/mx23_olinuxino/spl_boot.c        |  2 ++
 board/phytec/pcl063/pcl063.c                  |  5 ++++
 board/phytec/pcl063/spl.c                     |  3 ++
 board/phytec/pcm052/pcm052.c                  |  4 +++
 board/phytec/pcm058/pcm058.c                  |  5 ++++
 board/phytec/pfla02/pfla02.c                  |  6 ++++
 board/phytec/phycore_am335x_r2/board.c        |  3 ++
 board/phytec/phycore_rk3288/phycore-rk3288.c  |  3 ++
 board/phytec/phycore_rk3288/som.h             |  1 +
 board/phytium/durian/durian.c                 |  4 +++
 .../pinebook-pro-rk3399/pinebook-pro-rk3399.c |  2 ++
 .../rockpro64_rk3399/rockpro64-rk3399.c       |  1 +
 board/ppcag/bg0900/bg0900.c                   |  4 +++
 board/ppcag/bg0900/spl_boot.c                 |  2 ++
 board/qca/ap121/ap121.c                       |  1 +
 board/qca/ap143/ap143.c                       |  1 +
 board/qca/ap152/ap152.c                       |  1 +
 board/qemu-mips/qemu-mips.c                   |  4 +++
 .../dragonboard410c/dragonboard410c.c         |  6 ++++
 .../dragonboard820c/dragonboard820c.c         |  5 ++++
 board/raidsonic/ib62x0/ib62x0.c               |  3 ++
 board/raspberrypi/rpi/rpi.c                   |  6 ++++
 board/renesas/MigoR/migo_r.c                  |  2 ++
 board/renesas/alt/alt.c                       |  3 ++
 board/renesas/alt/alt_spl.c                   |  3 ++
 board/renesas/alt/qos.c                       |  1 +
 board/renesas/blanche/blanche.c               |  5 ++++
 board/renesas/blanche/qos.c                   |  1 +
 board/renesas/condor/condor.c                 |  3 ++
 board/renesas/draak/draak.c                   |  3 ++
 board/renesas/eagle/eagle.c                   |  3 ++
 board/renesas/ebisu/ebisu.c                   |  3 ++
 board/renesas/gose/gose.c                     |  3 ++
 board/renesas/gose/gose_spl.c                 |  3 ++
 board/renesas/gose/qos.c                      |  1 +
 board/renesas/grpeach/grpeach.c               |  4 +++
 board/renesas/koelsch/koelsch.c               |  3 ++
 board/renesas/koelsch/koelsch_spl.c           |  3 ++
 board/renesas/koelsch/qos.c                   |  1 +
 board/renesas/lager/lager.c                   |  3 ++
 board/renesas/lager/lager_spl.c               |  3 ++
 board/renesas/lager/qos.c                     |  1 +
 board/renesas/porter/porter.c                 |  3 ++
 board/renesas/porter/porter_spl.c             |  3 ++
 board/renesas/porter/qos.c                    |  1 +
 board/renesas/r2dplus/r2dplus.c               |  2 ++
 board/renesas/r7780mp/r7780mp.c               |  2 ++
 board/renesas/rcar-common/common.c            |  3 ++
 board/renesas/rcar-common/gen3-spl.c          |  2 ++
 board/renesas/salvator-x/salvator-x.c         |  4 +++
 board/renesas/sh7752evb/sh7752evb.c           |  4 +++
 board/renesas/sh7753evb/sh7753evb.c           |  4 +++
 board/renesas/sh7757lcr/sh7757lcr.c           |  5 ++++
 board/renesas/sh7763rdp/sh7763rdp.c           |  3 ++
 board/renesas/silk/qos.c                      |  1 +
 board/renesas/silk/silk.c                     |  3 ++
 board/renesas/silk/silk_spl.c                 |  3 ++
 board/renesas/stout/cpld.c                    |  4 +++
 board/renesas/stout/qos.c                     |  1 +
 board/renesas/stout/stout.c                   |  3 ++
 board/renesas/stout/stout_spl.c               |  3 ++
 board/renesas/ulcb/cpld.c                     |  5 ++++
 board/renesas/ulcb/ulcb.c                     |  4 +++
 board/rockchip/evb_rk3308/evb_rk3308.c        |  3 ++
 board/rockchip/evb_rv1108/evb_rv1108.c        |  1 +
 board/rockchip/kylin_rk3036/kylin_rk3036.c    |  1 +
 board/rockchip/tinker_rk3288/tinker-rk3288.c  |  1 +
 board/ronetix/pm9261/pm9261.c                 |  2 ++
 board/ronetix/pm9263/pm9263.c                 |  3 ++
 board/ronetix/pm9g45/pm9g45.c                 |  2 ++
 board/samsung/arndale/arndale.c               |  4 +++
 board/samsung/common/board.c                  |  7 +++++
 board/samsung/common/exynos5-dt-types.c       |  4 +++
 board/samsung/common/exynos5-dt.c             |  5 ++++
 board/samsung/common/gadget.c                 |  1 +
 board/samsung/common/misc.c                   |  6 ++++
 board/samsung/goni/goni.c                     |  6 ++++
 board/samsung/odroid/odroid.c                 |  3 ++
 board/samsung/origen/origen.c                 |  1 +
 board/samsung/origen/tools/mkorigenspl.c      |  1 +
 board/samsung/smdkc100/smdkc100.c             |  4 +++
 board/samsung/smdkv310/smdkv310.c             |  4 +++
 board/samsung/smdkv310/tools/mksmdkv310spl.c  |  1 +
 board/samsung/trats/trats.c                   |  4 +++
 board/samsung/trats2/trats2.c                 |  4 +++
 board/samsung/universal_c210/universal.c      |  5 ++++
 board/sandbox/sandbox.c                       |  7 +++++
 board/sandisk/sansa_fuze_plus/sfp.c           |  5 ++++
 board/sandisk/sansa_fuze_plus/spl_boot.c      |  3 ++
 board/sbc8349/sbc8349.c                       |  4 +++
 board/sbc8548/ddr.c                           |  4 +++
 board/sbc8548/law.c                           |  2 ++
 board/sbc8548/sbc8548.c                       |  4 +++
 board/sbc8548/tlb.c                           |  2 ++
 board/sbc8641d/law.c                          |  2 ++
 board/sbc8641d/sbc8641d.c                     |  3 ++
 board/schulercontrol/sc_sps_1/sc_sps_1.c      |  3 ++
 board/schulercontrol/sc_sps_1/spl_boot.c      |  2 ++
 board/seco/common/mx6.c                       |  2 ++
 board/seco/mx6quq7/mx6quq7.c                  |  4 +++
 board/seeed/linkit-smart-7688/board.c         |  1 +
 board/siemens/capricorn/board.c               |  7 +++++
 board/siemens/capricorn/spl.c                 |  4 +++
 board/siemens/common/board.c                  |  5 ++++
 board/siemens/common/factoryset.c             |  4 +++
 board/siemens/common/factoryset.h             |  1 +
 board/siemens/corvus/board.c                  |  3 ++
 board/siemens/draco/board.c                   |  4 +++
 board/siemens/draco/board.h                   |  1 +
 board/siemens/pxm2/board.c                    |  5 ++++
 board/siemens/rut/board.c                     |  7 +++++
 board/siemens/smartweb/smartweb.c             |  2 ++
 board/siemens/taurus/taurus.c                 |  5 ++++
 board/sifive/fu540/fu540.c                    |  4 +++
 board/sifive/fu540/spl.c                      |  2 ++
 board/sipeed/maix/maix.c                      |  3 ++
 board/sks-kinkel/sksimx6/sksimx6.c            |  5 ++++
 board/socrates/law.c                          |  2 ++
 board/socrates/nand.c                         |  2 ++
 board/socrates/sdram.c                        |  2 ++
 board/socrates/socrates.c                     |  4 +++
 board/socrates/tlb.c                          |  2 ++
 board/softing/vining_2000/vining_2000.c       |  8 ++++++
 board/softing/vining_fpga/qts/pinmux_config.h |  1 +
 board/softing/vining_fpga/qts/sdram_config.h  |  1 +
 board/softing/vining_fpga/socfpga.c           |  6 ++++
 board/solidrun/clearfog/clearfog.c            |  7 +++++
 board/solidrun/common/tlv_data.c              |  5 ++++
 board/solidrun/common/tlv_data.h              |  1 +
 board/solidrun/mx6cuboxi/mx6cuboxi.c          |  8 ++++++
 board/somlabs/visionsom-6ull/visionsom-6ull.c |  4 +++
 board/spear/spear300/spear300.c               |  2 ++
 board/spear/spear310/spear310.c               |  2 ++
 board/spear/spear320/spear320.c               |  2 ++
 board/spear/spear600/spear600.c               |  2 ++
 board/spear/x600/fpga.c                       |  1 +
 board/spear/x600/x600.c                       |  2 ++
 board/sr1500/qts/pinmux_config.h              |  1 +
 board/sr1500/qts/sdram_config.h               |  1 +
 board/st/common/stm32mp_dfu.c                 |  8 ++++++
 board/st/common/stm32mp_mtdparts.c            |  4 +++
 board/st/common/stpmic1.c                     |  3 ++
 board/st/common/stpmic1.h                     |  1 +
 board/st/stih410-b2260/board.c                |  2 ++
 .../stm32f429-discovery/stm32f429-discovery.c |  5 ++++
 .../stm32f429-evaluation.c                    |  5 ++++
 .../stm32f469-discovery/stm32f469-discovery.c |  5 ++++
 board/st/stm32f746-disco/stm32f746-disco.c    |  4 +++
 board/st/stm32h743-disco/stm32h743-disco.c    |  4 +++
 board/st/stm32h743-eval/stm32h743-eval.c      |  4 +++
 board/st/stm32mp1/spl.c                       |  1 +
 board/st/stm32mp1/stm32mp1.c                  | 10 +++++++
 board/st/stv0991/stv0991.c                    |  4 +++
 board/ste/stemmy/stemmy.c                     |  2 ++
 board/sunxi/board.c                           |  8 ++++++
 board/synopsys/axs10x/axs10x.c                |  4 +++
 board/synopsys/emsdp/emsdp.c                  |  5 ++++
 board/synopsys/hsdk/clk-lib.c                 |  4 +++
 board/synopsys/hsdk/clk-lib.h                 |  1 +
 board/synopsys/hsdk/env-lib.c                 |  3 ++
 board/synopsys/hsdk/env-lib.h                 |  2 ++
 board/synopsys/hsdk/hsdk.c                    |  8 ++++++
 board/synopsys/iot_devkit/iot_devkit.c        |  4 +++
 board/synopsys/nsim/nsim.c                    |  1 +
 board/sysam/amcore/amcore.c                   |  3 ++
 board/sysam/stmark2/stmark2.c                 |  3 ++
 board/syteco/zmx25/zmx25.c                    |  4 +++
 board/tbs/tbs2910/tbs2910.c                   |  6 ++++
 board/tcl/sl50/board.c                        |  4 +++
 board/technexion/pico-imx6/pico-imx6.c        |  7 ++++-
 board/technexion/pico-imx6/spl.c              |  3 ++
 board/technexion/pico-imx6ul/pico-imx6ul.c    |  6 ++++
 board/technexion/pico-imx6ul/spl.c            |  5 ++++
 board/technexion/pico-imx7d/pico-imx7d.c      |  5 ++++
 board/technexion/pico-imx7d/spl.c             |  5 ++++
 board/technexion/pico-imx8mq/pico-imx8mq.c    |  4 +++
 board/technexion/pico-imx8mq/spl.c            |  6 ++++
 board/technexion/tao3530/tao3530.c            |  3 ++
 board/technologic/ts4600/iomux.c              |  2 ++
 board/technologic/ts4600/ts4600.c             |  3 ++
 board/technologic/ts4800/ts4800.c             |  5 ++++
 board/technologic/ts4800/ts4800.h             |  1 +
 .../terasic/de0-nano-soc/qts/pinmux_config.h  |  1 +
 board/terasic/de0-nano-soc/qts/sdram_config.h |  1 +
 board/terasic/de1-soc/qts/pinmux_config.h     |  1 +
 board/terasic/de1-soc/qts/sdram_config.h      |  1 +
 board/terasic/de1-soc/socfpga.c               |  1 +
 board/terasic/de10-nano/qts/pinmux_config.h   |  1 +
 board/terasic/de10-nano/qts/sdram_config.h    |  1 +
 board/terasic/sockit/qts/pinmux_config.h      |  1 +
 board/terasic/sockit/qts/sdram_config.h       |  1 +
 board/theadorable/fpga.c                      |  5 ++++
 board/theadorable/theadorable.c               |  6 ++++
 .../puma_rk3399/puma-rk3399.c                 |  3 ++
 board/ti/am335x/board.c                       |  8 ++++++
 board/ti/am335x/board.h                       |  1 +
 board/ti/am335x/mux.c                         |  1 +
 board/ti/am3517crane/am3517crane.c            |  2 ++
 board/ti/am43xx/board.c                       |  7 +++++
 board/ti/am43xx/board.h                       |  1 +
 board/ti/am43xx/mux.c                         |  1 +
 board/ti/am57xx/board.c                       |  9 ++++++
 board/ti/am65x/evm.c                          |  8 ++++++
 board/ti/beagle/beagle.c                      |  6 ++++
 board/ti/common/board_detect.c                |  9 ++++++
 board/ti/common/board_detect.h                |  3 ++
 board/ti/dra7xx/evm.c                         |  6 ++++
 board/ti/evm/evm.c                            |  4 +++
 board/ti/evm/evm.h                            |  1 +
 board/ti/j721e/evm.c                          | 10 +++++++
 board/ti/ks2_evm/board.c                      |  8 ++++++
 board/ti/ks2_evm/board_k2e.c                  |  2 ++
 board/ti/ks2_evm/board_k2g.c                  |  5 ++++
 board/ti/ks2_evm/board_k2hk.c                 |  2 ++
 board/ti/ks2_evm/board_k2l.c                  |  2 ++
 board/ti/ks2_evm/ddr3_k2e.c                   |  2 ++
 board/ti/ks2_evm/ddr3_k2g.c                   |  1 +
 board/ti/ks2_evm/ddr3_k2hk.c                  |  2 ++
 board/ti/ks2_evm/ddr3_k2l.c                   |  2 ++
 board/ti/ks2_evm/mux-k2g.h                    |  1 +
 board/ti/omap5_uevm/evm.c                     |  5 ++++
 board/ti/panda/panda.c                        |  3 ++
 board/ti/sdp4430/cmd_bat.c                    |  1 +
 board/ti/sdp4430/sdp.c                        |  3 ++
 board/ti/ti816x/evm.c                         |  4 +++
 board/timll/devkit3250/devkit3250.c           |  2 ++
 board/timll/devkit3250/devkit3250_spl.c       |  1 +
 board/timll/devkit8000/devkit8000.c           |  4 +++
 board/toradex/apalis-imx8/apalis-imx8.c       |  5 ++++
 board/toradex/apalis-tk1/apalis-tk1.c         |  7 +++++
 board/toradex/apalis-tk1/as3722_init.c        |  1 +
 board/toradex/apalis_imx6/apalis_imx6.c       |  7 +++++
 board/toradex/apalis_imx6/pf0100.c            |  3 ++
 board/toradex/apalis_t30/apalis_t30.c         |  5 ++++
 .../toradex/colibri-imx6ull/colibri-imx6ull.c |  4 +++
 board/toradex/colibri-imx8x/colibri-imx8x.c   |  5 ++++
 board/toradex/colibri_imx6/colibri_imx6.c     |  7 +++++
 board/toradex/colibri_imx6/pf0100.c           |  3 ++
 board/toradex/colibri_imx7/colibri_imx7.c     |  6 ++++
 board/toradex/colibri_pxa270/colibri_pxa270.c |  3 ++
 board/toradex/colibri_t20/colibri_t20.c       |  4 +++
 board/toradex/colibri_t30/colibri_t30.c       |  3 ++
 board/toradex/colibri_vf/colibri_vf.c         |  5 ++++
 board/toradex/common/tdx-cfg-block.c          |  8 ++++++
 board/toradex/common/tdx-common.c             |  5 ++++
 board/toradex/common/tdx-common.h             |  1 +
 board/toradex/verdin-imx8mm/spl.c             |  7 +++++
 board/toradex/verdin-imx8mm/verdin-imx8mm.c   |  2 ++
 board/tplink/wdr4300/wdr4300.c                |  1 +
 board/tqc/tqm834x/pci.c                       |  1 +
 board/tqc/tqm834x/tqm834x.c                   |  4 +++
 board/tqc/tqma6/tqma6.c                       |  7 +++++
 board/tqc/tqma6/tqma6_bb.h                    |  1 +
 board/tqc/tqma6/tqma6_mba6.c                  |  2 ++
 board/tqc/tqma6/tqma6_wru4.c                  |  3 ++
 board/udoo/neo/neo.c                          |  7 +++++
 board/udoo/udoo.c                             |  4 +++
 board/udoo/udoo_spl.c                         |  2 ++
 board/variscite/dart_6ul/dart_6ul.c           |  4 +++
 board/variscite/dart_6ul/spl.c                |  5 ++++
 board/varisys/common/sys_eeprom.c             |  6 ++++
 board/varisys/cyrus/cyrus.c                   |  3 ++
 board/varisys/cyrus/cyrus.h                   |  1 +
 board/varisys/cyrus/ddr.c                     |  5 ++++
 board/varisys/cyrus/eth.c                     |  2 ++
 board/varisys/cyrus/law.c                     |  2 ++
 board/varisys/cyrus/pci.c                     |  1 +
 board/varisys/cyrus/tlb.c                     |  2 ++
 board/ve8313/ve8313.c                         |  4 +++
 board/vscom/baltos/board.c                    |  7 +++++
 board/vscom/baltos/board.h                    |  1 +
 board/wandboard/spl.c                         |  3 ++
 board/wandboard/wandboard.c                   |  8 ++++++
 board/warp/warp.c                             |  5 ++++
 board/warp7/warp7.c                           |  6 ++++
 board/work-microwave/work_92105/work_92105.c  |  2 ++
 .../work_92105/work_92105_display.c           |  3 ++
 .../work_92105/work_92105_spl.c               |  1 +
 board/xes/common/actl_nand.c                  |  1 +
 board/xes/common/board.c                      |  2 ++
 board/xes/common/fsl_8xxx_clk.c               |  2 ++
 board/xes/common/fsl_8xxx_misc.c              |  2 ++
 board/xes/common/fsl_8xxx_misc.h              |  1 +
 board/xes/common/fsl_8xxx_pci.c               |  3 ++
 board/xes/xpedite517x/ddr.c                   |  3 ++
 board/xes/xpedite517x/law.c                   |  2 ++
 board/xes/xpedite517x/xpedite517x.c           |  3 ++
 board/xes/xpedite520x/ddr.c                   |  1 +
 board/xes/xpedite520x/law.c                   |  2 ++
 board/xes/xpedite520x/tlb.c                   |  2 ++
 board/xes/xpedite520x/xpedite520x.c           |  2 ++
 board/xes/xpedite537x/ddr.c                   |  3 ++
 board/xes/xpedite537x/law.c                   |  2 ++
 board/xes/xpedite537x/tlb.c                   |  2 ++
 board/xes/xpedite537x/xpedite537x.c           |  2 ++
 board/xes/xpedite550x/ddr.c                   |  3 ++
 board/xes/xpedite550x/law.c                   |  2 ++
 board/xes/xpedite550x/tlb.c                   |  2 ++
 board/xes/xpedite550x/xpedite550x.c           |  2 ++
 board/xilinx/common/board.c                   |  4 +++
 .../microblaze-generic/microblaze-generic.c   |  5 ++++
 board/xilinx/versal/board.c                   |  7 +++++
 board/xilinx/zynq/board.c                     |  5 ++++
 board/xilinx/zynq/bootimg.c                   |  4 +++
 board/xilinx/zynq/cmds.c                      |  8 ++++++
 board/xilinx/zynqmp/cmds.c                    |  5 ++++
 board/xilinx/zynqmp/pm_cfg_obj.h              |  1 +
 board/xilinx/zynqmp/tap_delays.c              |  1 +
 board/xilinx/zynqmp/zynqmp.c                  |  9 ++++++
 board/xilinx/zynqmp_r5/board.c                |  2 ++
 board/zyxel/nsa310s/nsa310s.c                 |  4 +++
 cmd/ab_select.c                               |  1 +
 cmd/abootimg.c                                |  5 ++++
 cmd/acpi.c                                    |  8 ++++++
 cmd/adc.c                                     |  3 ++
 cmd/adtimg.c                                  |  5 ++++
 cmd/aes.c                                     |  4 +++
 cmd/armflash.c                                |  4 +++
 cmd/avb.c                                     |  6 ++++
 cmd/axi.c                                     |  6 ++++
 cmd/bcb.c                                     |  7 +++++
 cmd/bdinfo.c                                  |  6 ++++
 cmd/bedbug.c                                  |  3 ++
 cmd/bind.c                                    |  4 +++
 cmd/binop.c                                   |  4 +++
 cmd/blk_common.c                              |  4 +++
 cmd/blkcache.c                                |  3 ++
 cmd/blob.c                                    |  4 +++
 cmd/bmp.c                                     |  6 ++++
 cmd/boot.c                                    |  2 ++
 cmd/bootcount.c                               |  2 ++
 cmd/bootefi.c                                 |  5 ++++
 cmd/booti.c                                   |  6 ++++
 cmd/bootm.c                                   |  8 ++++++
 cmd/bootmenu.c                                |  2 ++
 cmd/bootstage.c                               |  5 ++++
 cmd/bootz.c                                   |  5 ++++
 cmd/button.c                                  |  1 +
 cmd/cache.c                                   |  3 ++
 cmd/cbfs.c                                    |  3 ++
 cmd/clk.c                                     |  4 +++
 cmd/config.c                                  |  1 +
 cmd/conitrace.c                               |  2 ++
 cmd/cpu.c                                     |  5 ++++
 cmd/cramfs.c                                  |  3 ++
 cmd/cros_ec.c                                 |  5 ++++
 cmd/date.c                                    |  3 ++
 cmd/demo.c                                    |  4 +++
 cmd/dfu.c                                     |  2 ++
 cmd/disk.c                                    |  3 ++
 cmd/dm.c                                      |  1 +
 cmd/echo.c                                    |  2 ++
 cmd/eeprom.c                                  |  6 ++++
 cmd/efi.c                                     |  7 +++++
 cmd/efidebug.c                                |  5 ++++
 cmd/elf.c                                     |  6 ++++
 cmd/ethsw.c                                   |  5 ++++
 cmd/exit.c                                    |  1 +
 cmd/fastboot.c                                |  5 ++++
 cmd/fat.c                                     |  3 ++
 cmd/fdt.c                                     |  4 +++
 cmd/flash.c                                   |  4 +++
 cmd/fpga.c                                    |  5 ++++
 cmd/fpgad.c                                   |  3 ++
 cmd/fuse.c                                    |  4 +++
 cmd/gettime.c                                 |  2 ++
 cmd/gpio.c                                    |  6 ++++
 cmd/gpt.c                                     |  6 ++++
 cmd/hash.c                                    |  1 +
 cmd/host.c                                    |  3 ++
 cmd/i2c.c                                     |  7 +++++
 cmd/ide.c                                     |  2 ++
 cmd/ini.c                                     |  4 +++
 cmd/io.c                                      |  4 +++
 cmd/iotrace.c                                 |  3 ++
 cmd/irq.c                                     |  1 +
 cmd/itest.c                                   |  5 ++++
 cmd/jffs2.c                                   |  4 +++
 cmd/led.c                                     |  4 +++
 cmd/legacy-mtd-utils.c                        |  3 ++
 cmd/legacy-mtd-utils.h                        |  1 +
 cmd/legacy_led.c                              |  3 ++
 cmd/license.c                                 |  1 +
 cmd/load.c                                    |  6 ++++
 cmd/log.c                                     |  6 ++++
 cmd/lsblk.c                                   |  1 +
 cmd/lzmadec.c                                 |  3 ++
 cmd/md5sum.c                                  |  4 +++
 cmd/mdio.c                                    |  4 +++
 cmd/mem.c                                     |  9 ++++++
 cmd/mii.c                                     |  6 ++++
 cmd/misc.c                                    |  5 ++++
 cmd/mmc.c                                     |  8 ++++++
 cmd/mp.c                                      |  3 ++
 cmd/mtd.c                                     |  7 +++++
 cmd/mtdparts.c                                |  5 ++++
 cmd/mvebu/bubt.c                              |  5 ++++
 cmd/nand.c                                    |  6 ++++
 cmd/net.c                                     |  4 +++
 cmd/nvedit.c                                  |  9 ++++++
 cmd/nvedit_efi.c                              |  5 ++++
 cmd/nvme.c                                    |  1 +
 cmd/onenand.c                                 |  6 ++++
 cmd/osd.c                                     |  6 ++++
 cmd/panic.c                                   |  1 +
 cmd/part.c                                    |  3 ++
 cmd/pcap.c                                    |  2 ++
 cmd/pci.c                                     |  7 +++++
 cmd/pinmux.c                                  |  4 +++
 cmd/pmc.c                                     |  2 ++
 cmd/pmic.c                                    |  5 ++++
 cmd/pxe.c                                     |  4 +++
 cmd/pxe_utils.c                               |  6 ++++
 cmd/pxe_utils.h                               |  4 +++
 cmd/qfw.c                                     |  4 +++
 cmd/read.c                                    |  3 ++
 cmd/reginfo.c                                 |  1 +
 cmd/regulator.c                               |  7 +++++
 cmd/reiser.c                                  |  2 ++
 cmd/remoteproc.c                              |  5 ++++
 cmd/rng.c                                     |  3 ++
 cmd/rockusb.c                                 |  2 ++
 cmd/rtc.c                                     |  6 ++++
 cmd/sata.c                                    |  3 ++
 cmd/sb.c                                      |  3 ++
 cmd/scsi.c                                    |  2 ++
 cmd/setexpr.c                                 |  4 +++
 cmd/sf.c                                      |  8 ++++++
 cmd/sha1sum.c                                 |  1 +
 cmd/smccc.c                                   |  3 ++
 cmd/sound.c                                   |  4 +++
 cmd/source.c                                  |  3 ++
 cmd/spi.c                                     |  5 ++++
 cmd/spl.c                                     |  4 +++
 cmd/strings.c                                 |  3 ++
 cmd/sysboot.c                                 |  4 +++
 cmd/terminal.c                                |  1 +
 cmd/test.c                                    |  3 ++
 cmd/thordown.c                                |  3 ++
 cmd/ti/ddr3.c                                 |  5 ++++
 cmd/time.c                                    |  2 ++
 cmd/tlv_eeprom.c                              |  8 ++++++
 cmd/tpm-common.c                              |  3 ++
 cmd/tpm-user-utils.h                          |  1 +
 cmd/tpm-v1.c                                  |  5 ++++
 cmd/tpm-v2.c                                  |  6 ++++
 cmd/tpm_test.c                                |  5 ++++
 cmd/trace.c                                   |  4 +++
 cmd/tsi148.c                                  |  4 +++
 cmd/ubi.c                                     |  6 ++++
 cmd/ubifs.c                                   |  3 ++
 cmd/ufs.c                                     |  2 ++
 cmd/universe.c                                |  4 +++
 cmd/unlz4.c                                   |  3 ++
 cmd/unzip.c                                   |  2 ++
 cmd/usb.c                                     |  4 +++
 cmd/usb_gadget_sdp.c                          |  2 ++
 cmd/usb_mass_storage.c                        |  6 ++++
 cmd/version.c                                 |  3 ++
 cmd/virtio.c                                  |  1 +
 cmd/w1.c                                      |  4 +++
 cmd/wdt.c                                     |  4 +++
 cmd/wol.c                                     |  2 ++
 cmd/x86/fsp.c                                 |  4 +++
 cmd/x86/hob.c                                 |  4 +++
 cmd/x86/mtrr.c                                |  5 ++++
 cmd/ximg.c                                    |  5 ++++
 cmd/yaffs2.c                                  |  4 +++
 cmd/zfs.c                                     |  4 +++
 cmd/zip.c                                     |  2 ++
 common/android_ab.c                           |  5 ++++
 common/autoboot.c                             |  6 ++++
 common/avb_verify.c                           |  6 ++++
 common/bloblist.c                             |  6 ++++
 common/board_f.c                              |  9 ++++++
 common/board_info.c                           |  3 ++
 common/board_r.c                              |  9 ++++++
 common/boot_fit.c                             |  1 +
 common/bootm.c                                | 10 +++++++
 common/bootm_os.c                             |  9 ++++++
 common/bootretry.c                            |  4 +++
 common/bootstage.c                            |  7 +++++
 common/bouncebuf.c                            |  4 +++
 common/cli.c                                  |  5 ++++
 common/cli_hush.c                             |  6 ++++
 common/cli_readline.c                         |  4 +++
 common/cli_simple.c                           |  2 ++
 common/command.c                              |  5 ++++
 common/common_fit.c                           |  4 +++
 common/console.c                              |  7 +++++
 common/ddr_spd.c                              |  2 ++
 common/dfu.c                                  |  3 ++
 common/dlmalloc.c                             |  6 ++++
 common/edid.c                                 |  5 ++++
 common/eeprom/eeprom_field.c                  |  3 ++
 common/eeprom/eeprom_layout.c                 |  3 ++
 common/exports.c                              |  1 +
 common/fdt_region.c                           |  2 ++
 common/fdt_support.c                          |  5 ++++
 common/flash.c                                |  3 ++
 common/hash.c                                 |  7 +++++
 common/hwconfig.c                             |  2 ++
 common/image-android-dt.c                     |  3 ++
 common/image-android.c                        |  7 +++++
 common/image-cipher.c                         |  6 ++++
 common/image-fdt.c                            |  7 +++++
 common/image-fit-sig.c                        |  7 +++++
 common/image-fit.c                            |  7 +++++
 common/image-sig.c                            |  4 +++
 common/image.c                                |  9 ++++++
 common/init/board_init.c                      |  5 ++++
 common/init/handoff.c                         |  2 ++
 common/iomux.c                                |  2 ++
 common/iotrace.c                              |  3 ++
 common/kallsyms.c                             |  2 ++
 common/kgdb.c                                 |  3 ++
 common/kgdb_stubs.c                           |  1 +
 common/lcd.c                                  |  6 ++++
 common/lcd_console.c                          |  6 ++++
 common/lcd_console_rotation.c                 |  2 ++
 common/lcd_simplefb.c                         |  3 ++
 common/log.c                                  |  7 +++++
 common/log_console.c                          |  2 ++
 common/log_syslog.c                           |  5 ++++
 common/main.c                                 |  1 +
 common/malloc_simple.c                        |  4 +++
 common/memsize.c                              |  2 ++
 common/menu.c                                 |  3 ++
 common/miiphyutil.c                           |  3 ++
 common/s_record.c                             |  1 +
 common/spl/spl.c                              |  9 ++++++
 common/spl/spl_atf.c                          |  3 ++
 common/spl/spl_bootrom.c                      |  1 +
 common/spl/spl_dfu.c                          |  2 ++
 common/spl/spl_ext.c                          |  3 ++
 common/spl/spl_fat.c                          |  3 ++
 common/spl/spl_fit.c                          |  8 ++++++
 common/spl/spl_legacy.c                       |  3 ++
 common/spl/spl_mmc.c                          |  4 +++
 common/spl/spl_nand.c                         |  3 ++
 common/spl/spl_net.c                          |  4 +++
 common/spl/spl_nor.c                          |  4 +++
 common/spl/spl_opensbi.c                      |  4 +++
 common/spl/spl_ram.c                          |  2 ++
 common/spl/spl_sata.c                         |  4 +++
 common/spl/spl_sdp.c                          |  2 ++
 common/spl/spl_spi.c                          |  6 ++++
 common/spl/spl_ubi.c                          |  2 ++
 common/spl/spl_usb.c                          |  2 ++
 common/spl/spl_ymodem.c                       |  4 +++
 common/splash.c                               |  8 ++++++
 common/splash_source.c                        |  8 ++++++
 common/stdio.c                                |  6 ++++
 common/update.c                               |  7 +++++
 common/usb.c                                  |  6 ++++
 common/usb_hub.c                              |  9 ++++++
 common/usb_kbd.c                              |  6 ++++
 common/usb_storage.c                          |  5 ++++
 common/xyzModem.c                             |  4 +++
 disk/part.c                                   |  5 ++++
 disk/part_amiga.c                             |  4 +++
 disk/part_amiga.h                             |  1 +
 disk/part_dos.c                               |  5 ++++
 disk/part_efi.c                               |  8 ++++++
 disk/part_iso.c                               |  3 ++
 disk/part_mac.c                               |  2 ++
 disk/part_mac.h                               |  1 +
 drivers/adc/adc-uclass.c                      |  4 +++
 drivers/adc/exynos-adc.c                      |  2 ++
 drivers/adc/meson-saradc.c                    |  6 ++++
 drivers/adc/rockchip-saradc.c                 |  3 ++
 drivers/adc/sandbox.c                         |  2 ++
 drivers/adc/stm32-adc-core.c                  |  3 ++
 drivers/adc/stm32-adc-core.h                  |  1 +
 drivers/adc/stm32-adc.c                       |  4 +++
 drivers/ata/ahci.c                            |  6 ++++
 drivers/ata/ahci_mvebu.c                      |  2 ++
 drivers/ata/ahci_sunxi.c                      |  3 ++
 drivers/ata/dwc_ahci.c                        |  2 ++
 drivers/ata/dwc_ahsata.c                      |  4 +++
 drivers/ata/fsl_sata.c                        |  8 ++++++
 drivers/ata/fsl_sata.h                        |  1 +
 drivers/ata/libata.c                          |  5 ++++
 drivers/ata/mvsata_ide.c                      |  1 +
 drivers/ata/sata.c                            |  4 +++
 drivers/ata/sata_ceva.c                       |  2 ++
 drivers/ata/sata_mv.c                         |  7 +++++
 drivers/ata/sata_sandbox.c                    |  1 +
 drivers/ata/sata_sil.c                        |  5 ++++
 drivers/ata/sata_sil.h                        |  1 +
 drivers/ata/sata_sil3114.c                    |  1 +
 drivers/axi/axi-emul-uclass.c                 |  3 ++
 drivers/axi/axi-uclass.c                      |  2 ++
 drivers/axi/axi_sandbox.c                     |  2 ++
 drivers/axi/ihs_axi.c                         |  2 ++
 drivers/axi/sandbox_store.c                   |  3 ++
 drivers/bios_emulator/atibios.c               |  6 ++++
 drivers/bios_emulator/besys.c                 |  2 ++
 drivers/bios_emulator/bios.c                  |  2 ++
 drivers/bios_emulator/biosemu.c               |  3 ++
 drivers/bios_emulator/include/biosemu.h       |  1 +
 drivers/bios_emulator/include/x86emu.h        |  1 +
 drivers/bios_emulator/include/x86emu/debug.h  |  4 +++
 drivers/bios_emulator/include/x86emu/decode.h |  1 +
 drivers/bios_emulator/include/x86emu/ops.h    |  1 +
 .../bios_emulator/include/x86emu/prim_ops.h   |  1 +
 drivers/bios_emulator/include/x86emu/regs.h   |  2 ++
 drivers/bios_emulator/x86emu/debug.c          |  4 +++
 drivers/bios_emulator/x86emu/decode.c         |  2 ++
 drivers/bios_emulator/x86emu/ops.c            |  3 ++
 drivers/bios_emulator/x86emu/ops2.c           |  2 ++
 drivers/bios_emulator/x86emu/prim_ops.c       |  2 ++
 drivers/bios_emulator/x86emu/sys.c            |  2 ++
 drivers/block/blk-uclass.c                    |  6 ++++
 drivers/block/blk_legacy.c                    |  5 ++++
 drivers/block/blkcache.c                      |  1 +
 drivers/block/ide.c                           |  5 ++++
 drivers/block/sandbox.c                       |  5 ++++
 drivers/board/board-uclass.c                  |  3 ++
 drivers/board/gazerbeam.c                     |  2 ++
 drivers/board/sandbox.c                       |  5 ++++
 drivers/bootcount/bootcount-uclass.c          |  3 ++
 drivers/bootcount/bootcount.c                 |  5 ++++
 drivers/bootcount/bootcount_at91.c            |  1 +
 drivers/bootcount/bootcount_davinci.c         |  1 +
 drivers/bootcount/bootcount_env.c             |  1 +
 drivers/bootcount/bootcount_ext.c             |  2 ++
 drivers/bootcount/bootcount_i2c.c             |  2 ++
 drivers/bootcount/bootcount_ram.c             |  3 ++
 drivers/bootcount/i2c-eeprom.c                |  2 ++
 drivers/bootcount/rtc.c                       |  2 ++
 drivers/bus/uniphier-system-bus.c             |  1 +
 drivers/button/button-gpio.c                  |  1 +
 drivers/button/button-uclass.c                |  1 +
 drivers/cache/cache-l2x0.c                    |  1 +
 drivers/cache/cache-ncore.c                   |  4 +++
 drivers/cache/cache-uclass.c                  |  1 +
 drivers/cache/cache-v5l2.c                    |  5 ++++
 drivers/cache/sandbox_cache.c                 |  1 +
 drivers/clk/altera/clk-agilex.c               |  5 ++++
 drivers/clk/altera/clk-agilex.h               |  1 +
 drivers/clk/altera/clk-arria10.c              |  6 ++++
 drivers/clk/analogbits/wrpll-cln28hpc.c       |  4 +++
 drivers/clk/aspeed/clk_ast2500.c              |  5 ++++
 drivers/clk/at91/clk-generated.c              |  3 ++
 drivers/clk/at91/clk-h32mx.c                  |  2 ++
 drivers/clk/at91/clk-main.c                   |  3 ++
 drivers/clk/at91/clk-master.c                 |  2 ++
 drivers/clk/at91/clk-peripheral.c             |  1 +
 drivers/clk/at91/clk-plla.c                   |  3 ++
 drivers/clk/at91/clk-plladiv.c                |  2 ++
 drivers/clk/at91/clk-slow.c                   |  1 +
 drivers/clk/at91/clk-system.c                 |  2 ++
 drivers/clk/at91/clk-usb.c                    |  3 ++
 drivers/clk/at91/clk-utmi.c                   |  3 ++
 drivers/clk/at91/pmc.c                        |  3 ++
 drivers/clk/clk-cdce9xx.c                     |  2 ++
 drivers/clk/clk-composite.c                   |  2 ++
 drivers/clk/clk-divider.c                     |  6 ++++
 drivers/clk/clk-fixed-factor.c                |  2 ++
 drivers/clk/clk-gate.c                        |  4 +++
 drivers/clk/clk-hsdk-cgu.c                    |  6 ++++
 drivers/clk/clk-mux.c                         |  6 ++++
 drivers/clk/clk-ti-sci.c                      |  3 ++
 drivers/clk/clk-uclass.c                      |  5 ++++
 drivers/clk/clk.c                             |  4 +++
 drivers/clk/clk_bcm6345.c                     |  2 ++
 drivers/clk/clk_boston.c                      |  3 ++
 drivers/clk/clk_fixed_factor.c                |  1 +
 drivers/clk/clk_fixed_rate.c                  |  1 +
 drivers/clk/clk_pic32.c                       |  6 ++++
 drivers/clk/clk_sandbox.c                     |  3 ++
 drivers/clk/clk_sandbox_ccf.c                 |  5 ++++
 drivers/clk/clk_sandbox_test.c                |  2 ++
 drivers/clk/clk_stm32f.c                      |  6 ++++
 drivers/clk/clk_stm32h7.c                     |  3 ++
 drivers/clk/clk_stm32mp1.c                    |  8 ++++++
 drivers/clk/clk_versal.c                      |  5 ++++
 drivers/clk/clk_vexpress_osc.c                |  2 ++
 drivers/clk/clk_zynq.c                        |  6 ++++
 drivers/clk/clk_zynqmp.c                      |  5 ++++
 drivers/clk/exynos/clk-exynos7420.c           |  2 ++
 drivers/clk/exynos/clk-pll.c                  |  1 +
 drivers/clk/ics8n3qv01.c                      |  3 ++
 drivers/clk/imx/clk-composite-8m.c            |  4 +++
 drivers/clk/imx/clk-gate2.c                   |  4 +++
 drivers/clk/imx/clk-imx6q.c                   |  5 ++++
 drivers/clk/imx/clk-imx8.c                    |  5 ++++
 drivers/clk/imx/clk-imx8.h                    |  2 ++
 drivers/clk/imx/clk-imx8mm.c                  |  5 ++++
 drivers/clk/imx/clk-imx8mn.c                  |  5 ++++
 drivers/clk/imx/clk-imx8mp.c                  |  5 ++++
 drivers/clk/imx/clk-imx8qm.c                  |  5 ++++
 drivers/clk/imx/clk-imx8qxp.c                 |  5 ++++
 drivers/clk/imx/clk-imxrt1020.c               |  4 +++
 drivers/clk/imx/clk-imxrt1050.c               |  4 +++
 drivers/clk/imx/clk-pfd.c                     |  4 +++
 drivers/clk/imx/clk-pll14xx.c                 |  6 ++++
 drivers/clk/imx/clk-pllv3.c                   |  5 ++++
 drivers/clk/imx/clk.h                         |  3 ++
 drivers/clk/intel/clk_intel.c                 |  2 ++
 drivers/clk/kendryte/bypass.c                 |  2 ++
 drivers/clk/kendryte/clk.c                    |  4 +++
 drivers/clk/kendryte/pll.c                    |  5 ++++
 drivers/clk/mediatek/clk-mt7622.c             |  2 ++
 drivers/clk/mediatek/clk-mt7623.c             |  2 ++
 drivers/clk/mediatek/clk-mt7629.c             |  2 ++
 drivers/clk/mediatek/clk-mtk.c                |  3 ++
 drivers/clk/mediatek/clk-mtk.h                |  3 ++
 drivers/clk/meson/axg.c                       |  4 +++
 drivers/clk/meson/clk_meson.h                 |  1 +
 drivers/clk/meson/g12a.c                      |  3 ++
 drivers/clk/meson/gxbb.c                      |  4 +++
 drivers/clk/mpc83xx_clk.c                     |  6 ++++
 drivers/clk/mpc83xx_clk.h                     |  2 ++
 drivers/clk/mtmips/clk-mt7628.c               |  4 +++
 drivers/clk/mvebu/armada-37xx-periph.c        |  7 +++++
 drivers/clk/mvebu/armada-37xx-tbg.c           |  4 +++
 drivers/clk/owl/clk_owl.c                     |  2 ++
 drivers/clk/owl/clk_owl.h                     |  1 +
 drivers/clk/renesas/clk-rcar-gen2.c           |  5 ++++
 drivers/clk/renesas/clk-rcar-gen3.c           |  5 ++++
 drivers/clk/renesas/r8a774a1-cpg-mssr.c       |  2 ++
 drivers/clk/renesas/r8a7790-cpg-mssr.c        |  2 ++
 drivers/clk/renesas/r8a7791-cpg-mssr.c        |  2 ++
 drivers/clk/renesas/r8a7792-cpg-mssr.c        |  2 ++
 drivers/clk/renesas/r8a7794-cpg-mssr.c        |  2 ++
 drivers/clk/renesas/r8a7795-cpg-mssr.c        |  2 ++
 drivers/clk/renesas/r8a7796-cpg-mssr.c        |  2 ++
 drivers/clk/renesas/r8a77965-cpg-mssr.c       |  2 ++
 drivers/clk/renesas/r8a77970-cpg-mssr.c       |  2 ++
 drivers/clk/renesas/r8a77980-cpg-mssr.c       |  2 ++
 drivers/clk/renesas/r8a77990-cpg-mssr.c       |  2 ++
 drivers/clk/renesas/r8a77995-cpg-mssr.c       |  2 ++
 drivers/clk/renesas/rcar-gen2-cpg.h           |  1 +
 drivers/clk/renesas/rcar-gen3-cpg.h           |  3 ++
 drivers/clk/renesas/renesas-cpg-mssr.c        |  4 +++
 drivers/clk/renesas/renesas-cpg-mssr.h        |  3 ++
 drivers/clk/rockchip/clk_pll.c                |  4 +++
 drivers/clk/rockchip/clk_px30.c               |  5 ++++
 drivers/clk/rockchip/clk_rk3036.c             |  3 ++
 drivers/clk/rockchip/clk_rk3128.c             |  4 +++
 drivers/clk/rockchip/clk_rk3188.c             |  4 +++
 drivers/clk/rockchip/clk_rk322x.c             |  4 +++
 drivers/clk/rockchip/clk_rk3288.c             |  7 +++++
 drivers/clk/rockchip/clk_rk3308.c             |  5 ++++
 drivers/clk/rockchip/clk_rk3328.c             |  5 ++++
 drivers/clk/rockchip/clk_rk3368.c             |  5 ++++
 drivers/clk/rockchip/clk_rk3399.c             |  6 ++++
 drivers/clk/rockchip/clk_rv1108.c             |  5 ++++
 drivers/clk/sifive/fu540-prci.c               |  5 ++++
 drivers/clk/sunxi/clk_a10.c                   |  2 ++
 drivers/clk/sunxi/clk_a10s.c                  |  2 ++
 drivers/clk/sunxi/clk_a23.c                   |  2 ++
 drivers/clk/sunxi/clk_a31.c                   |  2 ++
 drivers/clk/sunxi/clk_a64.c                   |  2 ++
 drivers/clk/sunxi/clk_a80.c                   |  2 ++
 drivers/clk/sunxi/clk_a83t.c                  |  2 ++
 drivers/clk/sunxi/clk_h3.c                    |  2 ++
 drivers/clk/sunxi/clk_h6.c                    |  2 ++
 drivers/clk/sunxi/clk_r40.c                   |  2 ++
 drivers/clk/sunxi/clk_sunxi.c                 |  4 +++
 drivers/clk/sunxi/clk_v3s.c                   |  2 ++
 drivers/clk/tegra/tegra-car-clk.c             |  2 ++
 drivers/clk/tegra/tegra186-clk.c              |  1 +
 drivers/clk/uniphier/clk-uniphier-core.c      |  4 +++
 drivers/core/acpi.c                           |  5 ++++
 drivers/core/device-remove.c                  |  4 +++
 drivers/core/device.c                         |  7 +++++
 drivers/core/devres.c                         |  4 +++
 drivers/core/dump.c                           |  2 ++
 drivers/core/fdtaddr.c                        |  2 ++
 drivers/core/lists.c                          |  3 ++
 drivers/core/of_access.c                      |  7 +++++
 drivers/core/of_addr.c                        |  5 ++++
 drivers/core/of_extra.c                       |  4 +++
 drivers/core/ofnode.c                         |  6 ++++
 drivers/core/read.c                           |  4 +++
 drivers/core/regmap.c                         |  3 ++
 drivers/core/root.c                           |  7 +++++
 drivers/core/simple-bus.c                     |  2 ++
 drivers/core/simple-pm-bus.c                  |  1 +
 drivers/core/syscon-uclass.c                  |  3 ++
 drivers/core/uclass.c                         |  5 ++++
 drivers/core/util.c                           |  3 ++
 drivers/cpu/bmips_cpu.c                       |  6 ++++
 drivers/cpu/cpu-uclass.c                      |  2 ++
 drivers/cpu/cpu_sandbox.c                     |  2 ++
 drivers/cpu/imx8_cpu.c                        |  6 ++++
 drivers/cpu/mpc83xx_cpu.c                     |  4 +++
 drivers/cpu/riscv_cpu.c                       |  4 +++
 drivers/crypto/ace_sha.c                      |  1 +
 drivers/crypto/ace_sha.h                      |  1 +
 drivers/crypto/fsl/desc.h                     |  2 ++
 drivers/crypto/fsl/desc_constr.h              |  4 +++
 drivers/crypto/fsl/error.c                    |  4 +++
 drivers/crypto/fsl/fsl_blob.c                 |  3 ++
 drivers/crypto/fsl/fsl_hash.c                 |  4 +++
 drivers/crypto/fsl/fsl_hash.h                 |  1 +
 drivers/crypto/fsl/fsl_rsa.c                  |  2 ++
 drivers/crypto/fsl/jobdesc.c                  |  4 +++
 drivers/crypto/fsl/jobdesc.h                  |  1 +
 drivers/crypto/fsl/jr.c                       |  5 ++++
 drivers/crypto/fsl/jr.h                       |  2 ++
 drivers/crypto/fsl/rng.c                      |  3 ++
 drivers/crypto/fsl/rsa_caam.h                 |  1 +
 drivers/crypto/fsl/sec.c                      |  5 ++++
 drivers/crypto/rsa_mod_exp/mod_exp_sw.c       |  1 +
 drivers/crypto/rsa_mod_exp/mod_exp_uclass.c   |  4 +++
 drivers/ddr/altera/sdram_agilex.c             |  5 ++++
 drivers/ddr/altera/sdram_arria10.c            |  6 ++++
 drivers/ddr/altera/sdram_gen5.c               |  5 ++++
 drivers/ddr/altera/sdram_s10.c                |  5 ++++
 drivers/ddr/altera/sdram_soc64.c              |  9 ++++++
 drivers/ddr/altera/sdram_soc64.h              |  2 ++
 drivers/ddr/altera/sequencer.c                |  5 ++++
 drivers/ddr/altera/sequencer.h                |  2 ++
 drivers/ddr/fsl/arm_ddr_gen3.c                |  4 +++
 drivers/ddr/fsl/ctrl_regs.c                   |  7 +++++
 drivers/ddr/fsl/ddr1_dimm_params.c            |  3 ++
 drivers/ddr/fsl/ddr2_dimm_params.c            |  3 ++
 drivers/ddr/fsl/ddr3_dimm_params.c            |  3 ++
 drivers/ddr/fsl/ddr4_dimm_params.c            |  4 +++
 drivers/ddr/fsl/fsl_ddr_gen4.c                |  4 +++
 drivers/ddr/fsl/fsl_mmdc.c                    |  2 ++
 drivers/ddr/fsl/interactive.c                 |  5 ++++
 drivers/ddr/fsl/lc_common_dimm_params.c       |  2 ++
 drivers/ddr/fsl/main.c                        |  8 ++++++
 drivers/ddr/fsl/mpc85xx_ddr_gen1.c            |  3 ++
 drivers/ddr/fsl/mpc85xx_ddr_gen2.c            |  4 +++
 drivers/ddr/fsl/mpc85xx_ddr_gen3.c            |  4 +++
 drivers/ddr/fsl/mpc86xx_ddr.c                 |  2 ++
 drivers/ddr/fsl/options.c                     |  5 ++++
 drivers/ddr/fsl/util.c                        |  5 ++++
 drivers/ddr/imx/imx8m/ddr_init.c              |  1 +
 drivers/ddr/imx/imx8m/ddrphy_csr.c            |  1 +
 drivers/ddr/imx/imx8m/ddrphy_utils.c          |  1 +
 drivers/ddr/imx/imx8m/helper.c                |  4 +++
 drivers/ddr/marvell/a38x/ddr3_logging_def.h   |  1 +
 .../ddr/marvell/a38x/ddr3_patterns_64bit.h    |  1 +
 .../ddr/marvell/a38x/ddr3_training_hw_algo.h  |  1 +
 .../a38x/ddr3_training_ip_centralization.h    |  1 +
 .../ddr/marvell/a38x/ddr3_training_ip_db.h    |  1 +
 .../ddr/marvell/a38x/ddr3_training_ip_pbs.h   |  1 +
 .../ddr/marvell/a38x/ddr3_training_leveling.h |  1 +
 drivers/ddr/marvell/a38x/ddr_ml_wrapper.h     |  2 ++
 drivers/ddr/marvell/a38x/mv_ddr_common.h      |  1 +
 drivers/ddr/marvell/a38x/seq_exec.h           |  1 +
 drivers/ddr/marvell/a38x/xor.h                |  1 +
 drivers/ddr/marvell/axp/ddr3_dfs.c            |  2 ++
 drivers/ddr/marvell/axp/ddr3_dqs.c            |  2 ++
 drivers/ddr/marvell/axp/ddr3_hw_training.c    |  3 ++
 drivers/ddr/marvell/axp/ddr3_init.c           |  3 ++
 drivers/ddr/marvell/axp/ddr3_patterns_64bit.h |  1 +
 drivers/ddr/marvell/axp/ddr3_pbs.c            |  3 ++
 drivers/ddr/marvell/axp/ddr3_read_leveling.c  |  2 ++
 drivers/ddr/marvell/axp/ddr3_sdram.c          |  1 +
 drivers/ddr/marvell/axp/ddr3_spd.c            |  4 +++
 drivers/ddr/marvell/axp/ddr3_write_leveling.c |  3 ++
 drivers/ddr/marvell/axp/xor.c                 |  1 +
 drivers/ddr/microchip/ddr2.c                  |  3 ++
 drivers/ddr/microchip/ddr2_regs.h             |  1 +
 drivers/demo/demo-shape.c                     |  5 ++++
 drivers/demo/demo-simple.c                    |  2 ++
 drivers/demo/demo-uclass.c                    |  2 ++
 drivers/dfu/dfu.c                             |  9 ++++++
 drivers/dfu/dfu_mmc.c                         |  7 +++++
 drivers/dfu/dfu_mtd.c                         |  7 +++++
 drivers/dfu/dfu_nand.c                        |  4 +++
 drivers/dfu/dfu_ram.c                         |  5 ++++
 drivers/dfu/dfu_sf.c                          |  5 ++++
 drivers/dfu/dfu_tftp.c                        |  4 +++
 drivers/dfu/dfu_virt.c                        |  3 ++
 drivers/dma/MCD_dmaApi.c                      |  2 ++
 drivers/dma/MCD_tasks.c                       |  1 +
 drivers/dma/MCD_tasksInit.c                   |  1 +
 drivers/dma/apbh_dma.c                        |  4 +++
 drivers/dma/bcm6348-iudma.c                   |  5 ++++
 drivers/dma/dma-uclass.c                      |  4 +++
 drivers/dma/fsl_dma.c                         |  3 ++
 drivers/dma/keystone_nav.c                    |  2 ++
 drivers/dma/keystone_nav_cfg.c                |  1 +
 drivers/dma/lpc32xx_dma.c                     |  4 +++
 drivers/dma/sandbox-dma-test.c                |  6 ++++
 drivers/dma/ti-edma3.c                        |  3 ++
 drivers/dma/ti/k3-psil.c                      |  2 ++
 drivers/dma/ti/k3-udma.c                      |  9 ++++++
 drivers/fastboot/fb_command.c                 |  5 ++++
 drivers/fastboot/fb_common.c                  |  7 +++++
 drivers/fastboot/fb_getvar.c                  |  6 ++++
 drivers/fastboot/fb_mmc.c                     |  6 ++++
 drivers/fastboot/fb_nand.c                    |  6 ++++
 drivers/firmware/firmware-zynqmp.c            |  5 ++++
 drivers/firmware/psci.c                       |  3 ++
 drivers/firmware/ti_sci.c                     |  5 ++++
 drivers/firmware/ti_sci.h                     |  2 ++
 drivers/fpga/ACEX1K.c                         |  6 ++--
 drivers/fpga/altera.c                         |  4 +++
 drivers/fpga/cyclon2.c                        |  4 +++
 drivers/fpga/fpga.c                           |  4 +++
 drivers/fpga/ivm_core.c                       |  2 ++
 drivers/fpga/lattice.c                        |  2 ++
 drivers/fpga/socfpga.c                        |  2 ++
 drivers/fpga/socfpga_arria10.c                |  7 +++++
 drivers/fpga/socfpga_gen5.c                   |  2 ++
 drivers/fpga/spartan2.c                       | 26 +++++++++--------
 drivers/fpga/spartan3.c                       | 28 +++++++++++--------
 drivers/fpga/stratix10.c                      |  6 ++++
 drivers/fpga/stratixII.c                      |  1 +
 drivers/fpga/stratixv.c                       |  2 ++
 drivers/fpga/versalpl.c                       |  4 +++
 drivers/fpga/virtex2.c                        |  3 ++
 drivers/fpga/xilinx.c                         |  3 ++
 drivers/fpga/zynqmppl.c                       |  5 ++++
 drivers/fpga/zynqpl.c                         |  4 +++
 drivers/gpio/74x164_gpio.c                    |  5 ++++
 drivers/gpio/adi_gpio2.c                      |  3 ++
 drivers/gpio/altera_pio.c                     |  2 ++
 drivers/gpio/at91_gpio.c                      |  3 ++
 drivers/gpio/atmel_pio4.c                     |  4 +++
 drivers/gpio/axp_gpio.c                       |  3 ++
 drivers/gpio/bcm2835_gpio.c                   |  2 ++
 drivers/gpio/bcm6345_gpio.c                   |  3 ++
 drivers/gpio/cortina_gpio.c                   |  2 ++
 drivers/gpio/da8xx_gpio.c                     |  4 +++
 drivers/gpio/da8xx_gpio.h                     |  1 +
 drivers/gpio/db8500_gpio.c                    |  3 ++
 drivers/gpio/dwapb_gpio.c                     |  2 ++
 drivers/gpio/gpio-rcar.c                      |  4 +++
 drivers/gpio/gpio-rza1.c                      |  4 +++
 drivers/gpio/gpio-uclass.c                    |  9 ++++++
 drivers/gpio/gpio-uniphier.c                  |  2 ++
 drivers/gpio/hi6220_gpio.c                    |  4 +++
 drivers/gpio/hsdk-creg-gpio.c                 |  2 ++
 drivers/gpio/imx_rgpio2p.c                    |  4 +++
 drivers/gpio/intel_broadwell_gpio.c           |  3 ++
 drivers/gpio/intel_gpio.c                     |  3 ++
 drivers/gpio/intel_ich6_gpio.c                |  4 +++
 drivers/gpio/iproc_gpio.c                     |  4 +++
 drivers/gpio/kona_gpio.c                      |  2 ++
 drivers/gpio/kw_gpio.c                        |  2 ++
 drivers/gpio/lpc32xx_gpio.c                   |  1 +
 drivers/gpio/mpc83xx_gpio.c                   |  1 +
 drivers/gpio/mpc83xx_spisel_boot.c            |  5 ++++
 drivers/gpio/mpc8xxx_gpio.c                   |  5 ++++
 drivers/gpio/mscc_sgpio.c                     |  4 +++
 drivers/gpio/msm_gpio.c                       |  3 ++
 drivers/gpio/mt7621_gpio.c                    |  3 ++
 drivers/gpio/mvebu_gpio.c                     |  1 +
 drivers/gpio/mvgpio.c                         |  2 ++
 drivers/gpio/mvgpio.h                         |  1 +
 drivers/gpio/mvmfp.c                          |  1 +
 drivers/gpio/mxc_gpio.c                       |  5 ++++
 drivers/gpio/mxs_gpio.c                       |  6 ++++
 drivers/gpio/nx_gpio.c                        |  1 +
 drivers/gpio/omap_gpio.c                      |  5 ++++
 drivers/gpio/pca953x.c                        |  4 +++
 drivers/gpio/pca953x_gpio.c                   |  5 ++++
 drivers/gpio/pca9698.c                        |  1 +
 drivers/gpio/pcf8575_gpio.c                   |  3 ++
 drivers/gpio/pic32_gpio.c                     |  4 +++
 drivers/gpio/pm8916_gpio.c                    |  3 ++
 drivers/gpio/rk_gpio.c                        |  4 +++
 drivers/gpio/s5p_gpio.c                       |  3 ++
 drivers/gpio/sandbox.c                        |  4 +++
 drivers/gpio/sh_pfc.c                         |  2 ++
 drivers/gpio/sifive-gpio.c                    |  6 ++++
 drivers/gpio/spear_gpio.c                     |  2 ++
 drivers/gpio/stm32_gpio.c                     |  1 +
 drivers/gpio/sunxi_gpio.c                     |  4 +++
 drivers/gpio/tca642x.c                        |  4 +++
 drivers/gpio/tegra186_gpio.c                  |  4 +++
 drivers/gpio/tegra_gpio.c                     |  2 ++
 drivers/gpio/vybrid_gpio.c                    |  3 ++
 drivers/gpio/xilinx_gpio.c                    |  4 +++
 drivers/gpio/zynq_gpio.c                      |  3 ++
 drivers/hwspinlock/hwspinlock-uclass.c        |  4 +++
 drivers/hwspinlock/stm32_hwspinlock.c         |  2 ++
 drivers/i2c/ast_i2c.c                         |  3 ++
 drivers/i2c/ast_i2c.h                         |  1 +
 drivers/i2c/at91_i2c.c                        |  6 ++++
 drivers/i2c/at91_i2c.h                        |  1 +
 drivers/i2c/cros_ec_ldo.c                     |  3 ++
 drivers/i2c/cros_ec_tunnel.c                  |  1 +
 drivers/i2c/davinci_i2c.c                     |  3 ++
 drivers/i2c/davinci_i2c.h                     |  1 +
 drivers/i2c/designware_i2c.c                  |  6 ++++
 drivers/i2c/designware_i2c.h                  |  2 ++
 drivers/i2c/designware_i2c_pci.c              |  5 ++++
 drivers/i2c/exynos_hs_i2c.c                   |  4 +++
 drivers/i2c/fsl_i2c.c                         |  6 ++++
 drivers/i2c/i2c-cdns.c                        |  4 +++
 drivers/i2c/i2c-cortina.c                     |  4 +++
 drivers/i2c/i2c-cortina.h                     |  1 +
 drivers/i2c/i2c-gpio.c                        |  6 ++++
 drivers/i2c/i2c-uclass.c                      |  6 ++++
 drivers/i2c/i2c-uniphier-f.c                  |  2 ++
 drivers/i2c/i2c-uniphier.c                    |  2 ++
 drivers/i2c/i2c-versatile.c                   |  2 ++
 drivers/i2c/i2c_core.c                        |  4 +++
 drivers/i2c/ihs_i2c.c                         |  6 ++++
 drivers/i2c/imx_lpi2c.c                       |  6 ++++
 drivers/i2c/intel_i2c.c                       |  6 ++++
 drivers/i2c/iproc_i2c.c                       |  5 ++++
 drivers/i2c/kona_i2c.c                        |  2 ++
 drivers/i2c/lpc32xx_i2c.c                     |  2 ++
 drivers/i2c/meson_i2c.c                       |  5 ++++
 drivers/i2c/muxes/i2c-arb-gpio-challenge.c    |  5 ++++
 drivers/i2c/muxes/i2c-mux-gpio.c              |  2 ++
 drivers/i2c/muxes/i2c-mux-uclass.c            |  3 ++
 drivers/i2c/muxes/pca954x.c                   |  3 ++
 drivers/i2c/mv_i2c.c                          |  5 ++++
 drivers/i2c/mvtwsi.c                          |  4 +++
 drivers/i2c/mxc_i2c.c                         |  6 ++++
 drivers/i2c/nx_i2c.c                          |  4 +++
 drivers/i2c/octeon_i2c.c                      |  4 +++
 drivers/i2c/omap24xx_i2c.c                    |  5 ++++
 drivers/i2c/rcar_i2c.c                        |  3 ++
 drivers/i2c/rcar_iic.c                        |  4 +++
 drivers/i2c/rk_i2c.c                          |  5 ++++
 drivers/i2c/s3c24x0_i2c.c                     |  5 ++++
 drivers/i2c/s3c24x0_i2c.h                     |  2 ++
 drivers/i2c/sandbox_i2c.c                     |  2 ++
 drivers/i2c/sh_i2c.c                          |  2 ++
 drivers/i2c/soft_i2c.c                        |  2 ++
 drivers/i2c/stm32f7_i2c.c                     |  7 +++++
 drivers/i2c/tegra186_bpmp_i2c.c               |  5 ++++
 drivers/i2c/tegra_i2c.c                       |  6 ++++
 drivers/i2c/xilinx_xiic.c                     |  3 ++
 drivers/input/cros_ec_keyb.c                  |  3 ++
 drivers/input/i8042.c                         |  5 ++++
 drivers/input/input.c                         |  5 ++++
 drivers/input/key_matrix.c                    |  2 ++
 drivers/input/keyboard-uclass.c               |  3 ++
 drivers/input/tegra-kbc.c                     |  4 +++
 drivers/input/twl4030.c                       |  1 +
 drivers/input/twl6030.c                       |  1 +
 drivers/led/led-uclass.c                      |  2 ++
 drivers/led/led_bcm6328.c                     |  4 +++
 drivers/led/led_bcm6358.c                     |  4 +++
 drivers/led/led_bcm6858.c                     |  4 +++
 drivers/led/led_gpio.c                        |  1 +
 drivers/mailbox/k3-sec-proxy.c                |  5 ++++
 drivers/mailbox/mailbox-uclass.c              |  2 ++
 drivers/mailbox/sandbox-mbox-test.c           |  1 +
 drivers/mailbox/sandbox-mbox.c                |  3 ++
 drivers/mailbox/stm32-ipcc.c                  |  3 ++
 drivers/mailbox/tegra-hsp.c                   |  2 ++
 drivers/mailbox/zynqmp-ipi.c                  |  3 ++
 drivers/memory/ti-aemif.c                     |  1 +
 drivers/misc/ali512x.c                        |  1 +
 drivers/misc/altera_sysid.c                   |  2 ++
 drivers/misc/atsha204a-i2c.c                  |  5 ++++
 drivers/misc/cbmem_console.c                  |  3 ++
 drivers/misc/cros_ec.c                        |  6 ++++
 drivers/misc/cros_ec_i2c.c                    |  6 ++++
 drivers/misc/cros_ec_lpc.c                    |  4 +++
 drivers/misc/cros_ec_sandbox.c                |  7 +++++
 drivers/misc/cros_ec_spi.c                    |  6 ++++
 drivers/misc/ds4510.c                         |  5 ++++
 drivers/misc/fs_loader.c                      |  3 ++
 drivers/misc/fsl_devdis.c                     |  2 ++
 drivers/misc/fsl_ifc.c                        |  4 +++
 drivers/misc/fsl_iim.c                        |  3 ++
 drivers/misc/fsl_portals.c                    |  6 ++++
 drivers/misc/fsl_sec_mon.c                    |  3 ++
 drivers/misc/gdsys_ioep.c                     |  4 +++
 drivers/misc/gdsys_ioep.h                     |  2 ++
 drivers/misc/gdsys_rxaui_ctrl.c               |  2 ++
 drivers/misc/gdsys_soc.c                      |  1 +
 drivers/misc/gpio_led.c                       |  2 ++
 drivers/misc/i2c_eeprom.c                     |  2 ++
 drivers/misc/i2c_eeprom_emul.c                |  4 +++
 drivers/misc/ihs_fpga.c                       |  5 ++++
 drivers/misc/ihs_fpga.h                       |  1 +
 drivers/misc/imx8/fuse.c                      |  4 +++
 drivers/misc/imx8/scu.c                       |  4 +++
 drivers/misc/imx8/scu_api.c                   |  3 ++
 drivers/misc/irq-uclass.c                     |  3 ++
 drivers/misc/irq_sandbox.c                    |  3 ++
 drivers/misc/jz4780_efuse.c                   |  2 ++
 drivers/misc/k3_avs.c                         |  4 +++
 drivers/misc/k3_esm.c                         |  3 ++
 drivers/misc/mc9sdz60.c                       |  1 +
 drivers/misc/microchip_flexcom.c              |  2 ++
 drivers/misc/misc-uclass.c                    |  2 ++
 drivers/misc/misc_sandbox.c                   |  4 +++
 drivers/misc/mpc83xx_serdes.c                 |  4 +++
 drivers/misc/mpc83xx_serdes.h                 |  1 +
 drivers/misc/mxc_ocotp.c                      |  4 +++
 drivers/misc/mxs_ocotp.c                      |  3 ++
 drivers/misc/p2sb-uclass.c                    |  4 +++
 drivers/misc/p2sb_emul.c                      |  3 ++
 drivers/misc/p2sb_sandbox.c                   |  1 +
 drivers/misc/pca9551_led.c                    |  2 ++
 drivers/misc/pwrseq-uclass.c                  |  2 ++
 drivers/misc/qfw.c                            |  6 ++++
 drivers/misc/rockchip-efuse.c                 |  5 ++++
 drivers/misc/rockchip-otp.c                   |  5 ++++
 drivers/misc/sandbox_adder.c                  |  1 +
 drivers/misc/sifive-otp.c                     |  6 ++++
 drivers/misc/smsc_lpc47m.c                    |  1 +
 drivers/misc/smsc_sio1007.c                   |  2 ++
 drivers/misc/spltest_sandbox.c                |  3 ++
 drivers/misc/status_led.c                     |  1 +
 drivers/misc/stm32_rcc.c                      |  2 ++
 drivers/misc/stm32mp_fuse.c                   |  3 ++
 drivers/misc/swap_case.c                      |  3 ++
 drivers/misc/tegra186_bpmp.c                  |  6 ++++
 drivers/misc/vexpress_config.c                |  4 +++
 drivers/misc/winbond_w83627.c                 |  1 +
 drivers/mmc/am654_sdhci.c                     |  4 +++
 drivers/mmc/arm_pl180_mmci.h                  |  1 +
 drivers/mmc/aspeed_sdhci.c                    |  1 +
 drivers/mmc/atmel_sdhci.c                     |  4 +++
 drivers/mmc/bcm2835_sdhci.c                   |  2 ++
 drivers/mmc/bcm2835_sdhost.c                  |  7 +++++
 drivers/mmc/bcmstb_sdhci.c                    |  1 +
 drivers/mmc/ca_dw_mmc.c                       |  5 ++++
 drivers/mmc/davinci_mmc.c                     |  5 ++++
 drivers/mmc/dw_mmc.c                          |  5 ++++
 drivers/mmc/exynos_dw_mmc.c                   |  6 ++++
 drivers/mmc/fsl_esdhc.c                       | 10 +++++++
 drivers/mmc/fsl_esdhc_imx.c                   | 10 +++++++
 drivers/mmc/fsl_esdhc_spl.c                   |  4 +++
 drivers/mmc/ftsdc010_mci.c                    |  7 +++++
 drivers/mmc/ftsdc010_mci.h                    |  3 ++
 drivers/mmc/gen_atmel_mci.c                   |  4 +++
 drivers/mmc/hi6220_dw_mmc.c                   |  3 ++
 drivers/mmc/iproc_sdhci.c                     |  5 ++++
 drivers/mmc/jz_mmc.c                          |  5 ++++
 drivers/mmc/kona_sdhci.c                      |  2 ++
 drivers/mmc/meson_gx_mmc.c                    |  6 ++++
 drivers/mmc/mmc-uclass.c                      |  5 ++++
 drivers/mmc/mmc.c                             | 11 ++++++++
 drivers/mmc/mmc_boot.c                        |  1 +
 drivers/mmc/mmc_legacy.c                      |  2 ++
 drivers/mmc/mmc_private.h                     |  1 +
 drivers/mmc/mmc_spi.c                         |  5 ++++
 drivers/mmc/mmc_write.c                       |  3 ++
 drivers/mmc/msm_sdhci.c                       |  5 ++++
 drivers/mmc/mtk-sd.c                          |  5 ++++
 drivers/mmc/mv_sdhci.c                        |  6 ++++
 drivers/mmc/mvebu_mmc.c                       |  6 ++++
 drivers/mmc/mxcmmc.c                          |  4 +++
 drivers/mmc/mxsmmc.c                          |  5 ++++
 drivers/mmc/nexell_dw_mmc.c                   |  3 ++
 drivers/mmc/omap_hsmmc.c                      |  9 ++++++
 drivers/mmc/pci_mmc.c                         |  1 +
 drivers/mmc/pic32_sdhci.c                     |  3 ++
 drivers/mmc/pxa_mmc_gen.c                     |  4 +++
 drivers/mmc/renesas-sdhi.c                    |  5 ++++
 drivers/mmc/rockchip_dw_mmc.c                 |  3 ++
 drivers/mmc/rockchip_sdhci.c                  |  1 +
 drivers/mmc/rpmb.c                            |  4 +++
 drivers/mmc/s5p_sdhci.c                       |  4 +++
 drivers/mmc/sandbox_mmc.c                     |  3 ++
 drivers/mmc/sdhci-cadence.c                   |  5 ++++
 drivers/mmc/sdhci.c                           |  8 ++++++
 drivers/mmc/sh_mmcif.c                        |  5 ++++
 drivers/mmc/sh_mmcif.h                        |  1 +
 drivers/mmc/sh_sdhi.c                         |  4 +++
 drivers/mmc/snps_dw_mmc.c                     |  4 +++
 drivers/mmc/socfpga_dw_mmc.c                  |  4 +++
 drivers/mmc/sti_sdhci.c                       |  4 +++
 drivers/mmc/stm32_sdmmc2.c                    |  6 ++++
 drivers/mmc/sunxi_mmc.c                       |  6 ++++
 drivers/mmc/tangier_sdhci.c                   |  2 ++
 drivers/mmc/tegra_mmc.c                       |  4 +++
 drivers/mmc/tmio-common.c                     |  5 ++++
 drivers/mmc/tmio-common.h                     |  3 ++
 drivers/mmc/uniphier-sd.c                     |  2 ++
 drivers/mmc/xenon_sdhci.c                     |  7 +++++
 drivers/mmc/zynq_sdhci.c                      |  3 ++
 drivers/mtd/altera_qspi.c                     |  6 ++++
 drivers/mtd/cfi_flash.c                       | 10 +++++++
 drivers/mtd/cfi_mtd.c                         |  3 ++
 drivers/mtd/hbmc-am654.c                      |  4 +++
 drivers/mtd/jedec_flash.c                     |  3 ++
 drivers/mtd/mtd_uboot.c                       |  5 ++++
 drivers/mtd/mtdconcat.c                       |  2 ++
 drivers/mtd/mtdcore.c                         |  5 ++++
 drivers/mtd/mtdpart.c                         |  5 ++++
 drivers/mtd/mw_eeprom.c                       |  2 ++
 drivers/mtd/nand/bbt.c                        |  3 ++
 drivers/mtd/nand/core.c                       |  3 ++
 drivers/mtd/nand/raw/am335x_spl_bch.c         |  2 ++
 drivers/mtd/nand/raw/arasan_nfc.c             |  6 ++++
 drivers/mtd/nand/raw/atmel_nand.c             |  5 ++++
 drivers/mtd/nand/raw/atmel_nand_ecc.h         |  1 +
 drivers/mtd/nand/raw/brcmnand/bcm63158_nand.c |  5 ++++
 drivers/mtd/nand/raw/brcmnand/bcm6368_nand.c  |  5 ++++
 drivers/mtd/nand/raw/brcmnand/bcm68360_nand.c |  5 ++++
 drivers/mtd/nand/raw/brcmnand/bcm6838_nand.c  |  5 ++++
 drivers/mtd/nand/raw/brcmnand/bcm6858_nand.c  |  5 ++++
 drivers/mtd/nand/raw/brcmnand/brcmnand.c      |  7 +++++
 drivers/mtd/nand/raw/brcmnand/brcmnand.h      |  2 ++
 .../mtd/nand/raw/brcmnand/brcmnand_compat.c   |  3 ++
 .../mtd/nand/raw/brcmnand/brcmnand_compat.h   |  1 +
 drivers/mtd/nand/raw/davinci_nand.c           |  5 ++++
 drivers/mtd/nand/raw/denali.c                 |  3 ++
 drivers/mtd/nand/raw/denali.h                 |  1 +
 drivers/mtd/nand/raw/denali_dt.c              |  1 +
 drivers/mtd/nand/raw/denali_spl.c             |  5 ++++
 drivers/mtd/nand/raw/fsl_elbc_nand.c          |  5 ++++
 drivers/mtd/nand/raw/fsl_elbc_spl.c           |  2 ++
 drivers/mtd/nand/raw/fsl_ifc_nand.c           |  5 ++++
 drivers/mtd/nand/raw/fsl_ifc_spl.c            |  2 ++
 drivers/mtd/nand/raw/fsl_upm.c                |  2 ++
 drivers/mtd/nand/raw/fsmc_nand.c              |  7 +++++
 drivers/mtd/nand/raw/kb9202_nand.c            |  1 +
 drivers/mtd/nand/raw/kirkwood_nand.c          |  1 +
 drivers/mtd/nand/raw/kmeter1_nand.c           |  1 +
 drivers/mtd/nand/raw/lpc32xx_nand_mlc.c       |  5 ++++
 drivers/mtd/nand/raw/lpc32xx_nand_slc.c       |  4 +++
 drivers/mtd/nand/raw/mxc_nand.c               |  5 ++++
 drivers/mtd/nand/raw/mxc_nand.h               |  1 +
 drivers/mtd/nand/raw/mxc_nand_spl.c           |  3 ++
 drivers/mtd/nand/raw/mxs_nand.c               |  4 +++
 drivers/mtd/nand/raw/mxs_nand_dt.c            |  1 +
 drivers/mtd/nand/raw/mxs_nand_spl.c           |  5 ++++
 drivers/mtd/nand/raw/nand.c                   |  4 +++
 drivers/mtd/nand/raw/nand_base.c              |  7 +++++
 drivers/mtd/nand/raw/nand_bbt.c               |  5 ++++
 drivers/mtd/nand/raw/nand_bch.c               |  4 +++
 drivers/mtd/nand/raw/nand_ecc.c               |  1 +
 drivers/mtd/nand/raw/nand_spl_loaders.c       |  3 ++
 drivers/mtd/nand/raw/nand_spl_simple.c        |  2 ++
 drivers/mtd/nand/raw/nand_timings.c           |  1 +
 drivers/mtd/nand/raw/nand_util.c              |  4 +++
 drivers/mtd/nand/raw/omap_elm.c               |  2 ++
 drivers/mtd/nand/raw/omap_gpmc.c              |  4 +++
 drivers/mtd/nand/raw/pxa3xx_nand.c            |  6 ++++
 drivers/mtd/nand/raw/pxa3xx_nand.h            |  2 ++
 drivers/mtd/nand/raw/stm32_fmc2_nand.c        |  6 ++++
 drivers/mtd/nand/raw/sunxi_nand.c             |  8 ++++++
 drivers/mtd/nand/raw/sunxi_nand_spl.c         |  6 ++++
 drivers/mtd/nand/raw/tegra_nand.c             |  5 ++++
 drivers/mtd/nand/raw/tegra_nand.h             |  1 +
 drivers/mtd/nand/raw/vf610_nfc.c              |  8 ++++++
 drivers/mtd/nand/raw/zynq_nand.c              |  6 ++++
 drivers/mtd/nand/spi/core.c                   |  7 +++++
 drivers/mtd/nand/spi/gigadevice.c             |  2 ++
 drivers/mtd/nand/spi/macronix.c               |  2 ++
 drivers/mtd/nand/spi/micron.c                 |  2 ++
 drivers/mtd/nand/spi/toshiba.c                |  2 ++
 drivers/mtd/nand/spi/winbond.c                |  2 ++
 drivers/mtd/onenand/onenand_base.c            |  7 +++++
 drivers/mtd/onenand/onenand_bbt.c             |  4 +++
 drivers/mtd/onenand/onenand_spl.c             |  3 ++
 drivers/mtd/onenand/onenand_uboot.c           |  3 ++
 drivers/mtd/onenand/samsung.c                 |  5 ++++
 drivers/mtd/pic32_flash.c                     |  6 ++++
 drivers/mtd/renesas_rpc_hf.c                  |  7 +++++
 drivers/mtd/spi/fsl_espi_spl.c                |  3 ++
 drivers/mtd/spi/sandbox.c                     |  5 ++++
 drivers/mtd/spi/sf-uclass.c                   |  4 +++
 drivers/mtd/spi/sf_dataflash.c                |  7 +++++
 drivers/mtd/spi/sf_mtd.c                      |  5 ++++
 drivers/mtd/spi/sf_probe.c                    |  4 +++
 drivers/mtd/spi/spi-nor-core.c                |  8 ++++++
 drivers/mtd/spi/spi-nor-tiny.c                |  7 +++++
 drivers/mtd/st_smi.c                          |  5 ++++
 drivers/mtd/stm32_flash.c                     |  2 ++
 drivers/mtd/stm32_flash.h                     |  1 +
 drivers/mtd/ubi/attach.c                      |  4 +++
 drivers/mtd/ubi/build.c                       |  6 ++++
 drivers/mtd/ubi/crc32table.h                  |  1 +
 drivers/mtd/ubi/debug.c                       |  7 +++++
 drivers/mtd/ubi/debug.h                       |  1 +
 drivers/mtd/ubi/eba.c                         |  4 +++
 drivers/mtd/ubi/fastmap-wl.c                  |  3 ++
 drivers/mtd/ubi/fastmap.c                     |  4 +++
 drivers/mtd/ubi/io.c                          |  4 +++
 drivers/mtd/ubi/kapi.c                        |  2 ++
 drivers/mtd/ubi/misc.c                        |  3 ++
 drivers/mtd/ubi/ubi-media.h                   |  2 ++
 drivers/mtd/ubi/ubi.h                         |  3 ++
 drivers/mtd/ubi/upd.c                         |  4 +++
 drivers/mtd/ubi/vmt.c                         |  5 ++++
 drivers/mtd/ubi/vtbl.c                        |  4 +++
 drivers/mtd/ubi/wl.c                          |  2 ++
 drivers/mtd/ubispl/ubispl.c                   |  4 +++
 drivers/net/ag7xxx.c                          |  9 ++++++
 drivers/net/altera_tse.c                      |  7 +++++
 drivers/net/altera_tse.h                      |  2 ++
 drivers/net/armada100_fec.c                   |  4 +++
 drivers/net/armada100_fec.h                   |  2 ++
 drivers/net/at91_emac.c                       |  5 ++++
 drivers/net/ax88180.c                         |  4 +++
 drivers/net/ax88796.c                         |  1 +
 drivers/net/ax88796.h                         |  1 +
 drivers/net/bcm-sf2-eth-gmac.c                |  6 ++++
 drivers/net/bcm-sf2-eth-gmac.h                |  1 +
 drivers/net/bcm-sf2-eth.c                     |  7 +++++
 drivers/net/bcm-sf2-eth.h                     |  2 ++
 drivers/net/bcm6348-eth.c                     |  6 ++++
 drivers/net/bcm6368-eth.c                     |  7 +++++
 drivers/net/bcmgenet.c                        |  5 ++++
 drivers/net/calxedaxgmac.c                    |  6 ++++
 drivers/net/cs8900.c                          |  2 ++
 drivers/net/cs8900.h                          |  1 +
 drivers/net/dc2114x.c                         |  8 ++++++
 drivers/net/designware.c                      |  8 ++++++
 drivers/net/designware.h                      |  1 +
 drivers/net/dm9000x.c                         |  5 ++++
 drivers/net/dnet.c                            |  6 ++++
 drivers/net/dnet.h                            |  1 +
 drivers/net/dwc_eth_qos.c                     |  8 ++++++
 drivers/net/dwmac_s700.c                      |  1 +
 drivers/net/dwmac_socfpga.c                   |  2 ++
 drivers/net/e1000.c                           |  8 ++++++
 drivers/net/e1000.h                           |  3 ++
 drivers/net/e1000_spi.c                       |  6 ++++
 drivers/net/eepro100.c                        |  8 ++++++
 drivers/net/ep93xx_eth.c                      |  6 ++++
 drivers/net/ep93xx_eth.h                      |  1 +
 drivers/net/eth-phy-uclass.c                  |  2 ++
 drivers/net/ethoc.c                           |  8 ++++++
 drivers/net/fec_mxc.c                         |  9 ++++++
 drivers/net/fec_mxc.h                         |  2 ++
 drivers/net/fm/b4860.c                        |  1 +
 drivers/net/fm/eth.c                          |  8 ++++++
 drivers/net/fm/fdt.c                          |  3 ++
 drivers/net/fm/fm.c                           |  3 ++
 drivers/net/fm/fm.h                           |  1 +
 drivers/net/fm/init.c                         |  5 ++++
 drivers/net/fm/ls1043.c                       |  1 +
 drivers/net/fm/ls1046.c                       |  1 +
 drivers/net/fm/memac_phy.c                    |  5 ++++
 drivers/net/fm/p1023.c                        |  1 +
 drivers/net/fm/p4080.c                        |  1 +
 drivers/net/fm/p5020.c                        |  1 +
 drivers/net/fm/p5040.c                        |  1 +
 drivers/net/fm/t1024.c                        |  2 ++
 drivers/net/fm/t1040.c                        |  1 +
 drivers/net/fm/t2080.c                        |  2 ++
 drivers/net/fm/t4240.c                        |  2 ++
 drivers/net/fm/tgec_phy.c                     |  4 +++
 drivers/net/fsl-mc/dpbp.c                     |  1 +
 drivers/net/fsl-mc/dpio/dpio.c                |  1 +
 drivers/net/fsl-mc/dpio/qbman_portal.c        |  4 +++
 drivers/net/fsl-mc/dpio/qbman_private.h       |  3 ++
 drivers/net/fsl-mc/dpio/qbman_sys.h           |  5 ++++
 drivers/net/fsl-mc/dpmac.c                    |  1 +
 drivers/net/fsl-mc/dpmng.c                    |  1 +
 drivers/net/fsl-mc/dpni.c                     |  1 +
 drivers/net/fsl-mc/dprc.c                     |  1 +
 drivers/net/fsl-mc/dpsparser.c                |  1 +
 drivers/net/fsl-mc/fsl_dpmng_cmd.h            |  1 +
 drivers/net/fsl-mc/mc.c                       | 10 +++++++
 drivers/net/fsl-mc/mc_sys.c                   |  3 ++
 drivers/net/fsl_enetc.c                       |  6 ++++
 drivers/net/fsl_enetc.h                       |  1 +
 drivers/net/fsl_enetc_mdio.c                  |  4 +++
 drivers/net/fsl_ls_mdio.c                     |  1 +
 drivers/net/fsl_mcdmafec.c                    |  6 ++++
 drivers/net/fsl_mdio.c                        |  5 ++++
 drivers/net/ftgmac100.c                       |  5 ++++
 drivers/net/ftmac100.c                        |  8 ++++++
 drivers/net/ftmac110.c                        |  8 ++++++
 drivers/net/ftmac110.h                        |  1 +
 drivers/net/gmac_rockchip.c                   |  5 ++++
 drivers/net/higmacv300.c                      |  4 +++
 drivers/net/ks8851_mll.c                      |  6 ++++
 drivers/net/lan91c96.c                        | 11 ++++++--
 drivers/net/ldpaa_eth/ldpaa_eth.c             |  9 ++++++
 drivers/net/ldpaa_eth/ldpaa_eth.h             |  3 ++
 drivers/net/ldpaa_eth/ldpaa_wriop.c           |  2 ++
 drivers/net/ldpaa_eth/ls1088a.c               |  2 ++
 drivers/net/ldpaa_eth/ls2080a.c               |  2 ++
 drivers/net/ldpaa_eth/lx2160a.c               |  3 ++
 drivers/net/lpc32xx_eth.c                     |  5 ++++
 drivers/net/macb.c                            |  9 ++++++
 drivers/net/mcffec.c                          |  6 ++++
 drivers/net/mcfmii.c                          |  5 ++++
 drivers/net/mdio_mux_i2creg.c                 |  1 +
 drivers/net/mdio_mux_sandbox.c                |  2 ++
 drivers/net/mdio_sandbox.c                    |  2 ++
 drivers/net/mpc8xx_fec.c                      |  9 ++++++
 drivers/net/mscc_eswitch/jr2_switch.c         |  7 +++++
 drivers/net/mscc_eswitch/luton_switch.c       |  6 ++++
 drivers/net/mscc_eswitch/mscc_mac_table.c     |  3 ++
 drivers/net/mscc_eswitch/mscc_mac_table.h     |  1 +
 drivers/net/mscc_eswitch/mscc_miim.c          |  3 ++
 drivers/net/mscc_eswitch/mscc_miim.h          |  2 ++
 drivers/net/mscc_eswitch/mscc_xfer.c          |  4 +++
 drivers/net/mscc_eswitch/mscc_xfer.h          |  3 ++
 drivers/net/mscc_eswitch/ocelot_switch.c      |  6 ++++
 drivers/net/mscc_eswitch/serval_switch.c      |  6 ++++
 drivers/net/mscc_eswitch/servalt_switch.c     |  7 +++++
 drivers/net/mt7628-eth.c                      |  8 ++++++
 drivers/net/mtk_eth.c                         |  9 ++++++
 drivers/net/mvgbe.c                           |  7 +++++
 drivers/net/mvgbe.h                           |  2 ++
 drivers/net/mvmdio.c                          |  3 ++
 drivers/net/mvneta.c                          |  7 +++++
 drivers/net/mvpp2.c                           |  8 ++++++
 drivers/net/natsemi.c                         |  5 ++++
 drivers/net/ne2000.c                          |  3 ++
 drivers/net/ne2000.h                          |  1 +
 drivers/net/ne2000_base.c                     | 10 +++++--
 drivers/net/ne2000_base.h                     |  3 ++
 drivers/net/netconsole.c                      |  4 +++
 drivers/net/ns8382x.c                         |  5 ++++
 drivers/net/pch_gbe.c                         |  5 ++++
 drivers/net/pch_gbe.h                         |  2 ++
 drivers/net/pcnet.c                           |  7 +++++
 drivers/net/pfe_eth/pfe_cmd.c                 |  4 +++
 drivers/net/pfe_eth/pfe_driver.c              |  5 ++++
 drivers/net/pfe_eth/pfe_eth.c                 |  4 +++
 drivers/net/pfe_eth/pfe_firmware.c            |  4 +++
 drivers/net/pfe_eth/pfe_hw.c                  |  3 ++
 drivers/net/pfe_eth/pfe_mdio.c                |  5 ++++
 drivers/net/phy/aquantia.c                    |  6 ++++
 drivers/net/phy/atheros.c                     |  4 +++
 drivers/net/phy/b53.c                         |  5 ++++
 drivers/net/phy/broadcom.c                    |  2 ++
 drivers/net/phy/cortina.c                     |  4 +++
 drivers/net/phy/dp83867.c                     |  4 +++
 drivers/net/phy/fixed.c                       |  5 ++++
 drivers/net/phy/generic_10g.c                 |  1 +
 drivers/net/phy/marvell.c                     |  3 ++
 drivers/net/phy/meson-gxl.c                   |  2 ++
 drivers/net/phy/micrel_ksz90x1.c              |  3 ++
 drivers/net/phy/miiphybb.c                    |  4 +++
 drivers/net/phy/mscc.c                        |  6 ++++
 drivers/net/phy/mv88e61xx.c                   |  6 ++++
 drivers/net/phy/mv88e6352.c                   |  4 +++
 drivers/net/phy/ncsi.c                        |  6 ++++
 drivers/net/phy/phy.c                         |  7 +++++
 drivers/net/phy/realtek.c                     |  2 ++
 drivers/net/phy/teranetics.c                  |  2 ++
 drivers/net/phy/vitesse.c                     |  2 ++
 drivers/net/phy/xilinx_gmii2rgmii.c           |  7 +++--
 drivers/net/phy/xilinx_phy.c                  |  2 ++
 drivers/net/pic32_eth.c                       |  5 ++++
 drivers/net/pic32_eth.h                       |  1 +
 drivers/net/pic32_mdio.c                      |  4 +++
 drivers/net/ravb.c                            |  8 ++++++
 drivers/net/rtl8139.c                         |  6 ++++
 drivers/net/rtl8169.c                         |  8 ++++++
 drivers/net/sandbox-raw-bus.c                 |  3 ++
 drivers/net/sandbox-raw.c                     |  4 +++
 drivers/net/sandbox.c                         |  7 +++++
 drivers/net/sh_eth.c                          |  8 ++++++
 drivers/net/sh_eth.h                          |  2 ++
 drivers/net/smc91111.c                        | 10 +++++--
 drivers/net/smc911x.c                         |  7 +++++
 drivers/net/sni_ave.c                         |  8 ++++++
 drivers/net/sun8i_emac.c                      |  9 ++++++
 drivers/net/sunxi_emac.c                      |  4 +++
 drivers/net/ti/am65-cpsw-nuss.c               |  6 ++++
 drivers/net/ti/cpsw-common.c                  |  5 ++++
 drivers/net/ti/cpsw.c                         |  7 +++++
 drivers/net/ti/cpsw_mdio.c                    |  3 ++
 drivers/net/ti/cpsw_mdio.h                    |  1 +
 drivers/net/ti/davinci_emac.c                 |  6 ++++
 drivers/net/ti/davinci_emac.h                 |  2 ++
 drivers/net/ti/keystone_net.c                 |  7 +++++
 drivers/net/tsec.c                            |  7 +++++
 drivers/net/uli526x.c                         |  5 ++++
 drivers/net/vsc7385.c                         |  2 ++
 drivers/net/vsc9953.c                         |  5 ++++
 drivers/net/xilinx_axi_emac.c                 |  6 ++++
 drivers/net/xilinx_emaclite.c                 |  5 ++++
 drivers/net/zynq_gem.c                        |  6 ++++
 drivers/nvme/nvme-uclass.c                    |  1 +
 drivers/nvme/nvme.c                           |  8 ++++++
 drivers/nvme/nvme.h                           |  3 ++
 drivers/nvme/nvme_show.c                      |  3 ++
 drivers/pch/pch-uclass.c                      |  3 ++
 drivers/pch/pch7.c                            |  3 ++
 drivers/pch/pch9.c                            |  2 ++
 drivers/pch/sandbox_pch.c                     |  3 ++
 drivers/pci/fsl_pci_init.c                    |  6 ++++
 drivers/pci/pci-aardvark.c                    |  4 +++
 drivers/pci/pci-emul-uclass.c                 |  3 ++
 drivers/pci/pci-rcar-gen2.c                   |  2 ++
 drivers/pci/pci-rcar-gen3.c                   |  3 ++
 drivers/pci/pci-uclass.c                      | 10 +++++++
 drivers/pci/pci.c                             |  6 ++++
 drivers/pci/pci_auto.c                        |  3 ++
 drivers/pci/pci_auto_common.c                 |  2 ++
 drivers/pci/pci_auto_old.c                    |  2 ++
 drivers/pci/pci_common.c                      |  4 +++
 drivers/pci/pci_compat.c                      |  1 +
 drivers/pci/pci_ftpci100.c                    |  2 ++
 drivers/pci/pci_gt64120.c                     |  2 ++
 drivers/pci/pci_indirect.c                    |  1 +
 drivers/pci/pci_mpc85xx.c                     |  4 +++
 drivers/pci/pci_msc01.c                       |  2 ++
 drivers/pci/pci_mvebu.c                       |  8 ++++++
 drivers/pci/pci_rom.c                         |  9 ++++++
 drivers/pci/pci_sandbox.c                     |  2 ++
 drivers/pci/pci_sh4.c                         |  1 +
 drivers/pci/pci_sh7751.c                      |  3 ++
 drivers/pci/pci_sh7780.c                      |  2 ++
 drivers/pci/pci_tegra.c                       |  7 +++++
 drivers/pci/pci_x86.c                         |  1 +
 drivers/pci/pcie_brcmstb.c                    |  6 ++++
 drivers/pci/pcie_dw_mvebu.c                   |  6 ++++
 drivers/pci/pcie_dw_ti.c                      |  8 ++++++
 drivers/pci/pcie_ecam_generic.c               |  5 ++++
 drivers/pci/pcie_fsl.c                        |  7 +++++
 drivers/pci/pcie_fsl.h                        |  3 ++
 drivers/pci/pcie_imx.c                        |  7 +++++
 drivers/pci/pcie_intel_fpga.c                 |  5 ++++
 drivers/pci/pcie_layerscape.c                 |  3 ++
 drivers/pci/pcie_layerscape.h                 |  3 ++
 drivers/pci/pcie_layerscape_ep.c              |  7 +++++
 drivers/pci/pcie_layerscape_fixup.c           |  3 ++
 drivers/pci/pcie_layerscape_fixup_common.c    |  6 ++++
 drivers/pci/pcie_layerscape_fixup_common.h    |  1 +
 drivers/pci/pcie_layerscape_gen4.c            |  6 ++++
 drivers/pci/pcie_layerscape_gen4.h            |  3 ++
 drivers/pci/pcie_layerscape_gen4_fixup.c      |  3 ++
 drivers/pci/pcie_layerscape_rc.c              |  5 ++++
 drivers/pci/pcie_mediatek.c                   |  5 ++++
 drivers/pci/pcie_phytium.c                    |  4 +++
 drivers/pci/pcie_rockchip.c                   |  3 ++
 drivers/pci/pcie_xilinx.c                     |  5 ++++
 drivers/pci_endpoint/pci_ep-uclass.c          |  4 +++
 drivers/pci_endpoint/pcie-cadence-ep.c        |  5 ++++
 drivers/pci_endpoint/pcie-cadence.h           |  2 ++
 drivers/pci_endpoint/sandbox-pci_ep.c         |  3 ++
 drivers/phy/allwinner/phy-sun4i-usb.c         |  6 ++++
 drivers/phy/bcm6318-usbh-phy.c                |  2 ++
 drivers/phy/bcm6348-usbh-phy.c                |  2 ++
 drivers/phy/bcm6358-usbh-phy.c                |  2 ++
 drivers/phy/bcm6368-usbh-phy.c                |  3 ++
 drivers/phy/keystone-usb-phy.c                |  4 +++
 drivers/phy/marvell/comphy_a3700.c            |  4 +++
 drivers/phy/marvell/comphy_core.c             |  4 +++
 drivers/phy/marvell/comphy_core.h             |  3 ++
 drivers/phy/marvell/comphy_cp110.c            |  6 ++++
 drivers/phy/marvell/comphy_mux.c              |  2 ++
 drivers/phy/meson-g12a-usb2.c                 |  2 ++
 drivers/phy/meson-g12a-usb3-pcie.c            |  3 ++
 drivers/phy/meson-gxbb-usb2.c                 |  3 ++
 drivers/phy/meson-gxl-usb2.c                  |  3 ++
 drivers/phy/meson-gxl-usb3.c                  |  3 ++
 drivers/phy/msm8916-usbh-phy.c                |  3 ++
 drivers/phy/mt76x8-usb-phy.c                  |  3 ++
 drivers/phy/omap-usb2-phy.c                   |  5 ++++
 drivers/phy/phy-da8xx-usb.c                   |  2 ++
 drivers/phy/phy-mtk-tphy.c                    |  3 ++
 drivers/phy/phy-rcar-gen2.c                   |  2 ++
 drivers/phy/phy-rcar-gen3.c                   |  2 ++
 drivers/phy/phy-stm32-usbphyc.c               |  4 +++
 drivers/phy/phy-ti-am654.c                    |  2 ++
 drivers/phy/phy-uclass.c                      |  2 ++
 drivers/phy/rockchip/phy-rockchip-inno-usb2.c |  5 ++++
 drivers/phy/rockchip/phy-rockchip-pcie.c      |  3 ++
 drivers/phy/rockchip/phy-rockchip-typec.c     |  7 +++++
 drivers/phy/sandbox-phy.c                     |  2 ++
 drivers/phy/sti_usb_phy.c                     |  6 ++++
 drivers/phy/ti-pipe3-phy.c                    |  6 ++++
 drivers/pinctrl/aspeed/pinctrl_ast2500.c      |  3 ++
 drivers/pinctrl/ath79/pinctrl_ar933x.c        |  5 ++++
 drivers/pinctrl/ath79/pinctrl_qca953x.c       |  5 ++++
 drivers/pinctrl/broadcom/pinctrl-bcm283x.c    |  3 ++
 drivers/pinctrl/broadcom/pinctrl-bcm6838.c    |  3 ++
 drivers/pinctrl/exynos/pinctrl-exynos.c       |  4 +++
 drivers/pinctrl/exynos/pinctrl-exynos7420.c   |  3 ++
 drivers/pinctrl/intel/pinctrl.c               |  3 ++
 drivers/pinctrl/intel/pinctrl_apl.c           |  1 +
 drivers/pinctrl/mediatek/pinctrl-mt7622.c     |  1 +
 drivers/pinctrl/mediatek/pinctrl-mt7623.c     |  1 +
 drivers/pinctrl/mediatek/pinctrl-mt7629.c     |  1 +
 drivers/pinctrl/mediatek/pinctrl-mt8512.c     |  1 +
 drivers/pinctrl/mediatek/pinctrl-mt8516.c     |  1 +
 drivers/pinctrl/mediatek/pinctrl-mt8518.c     |  1 +
 drivers/pinctrl/mediatek/pinctrl-mtk-common.c |  3 ++
 drivers/pinctrl/mediatek/pinctrl-mtk-common.h |  3 ++
 drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c |  3 ++
 drivers/pinctrl/meson/pinctrl-meson-axg.c     |  2 ++
 drivers/pinctrl/meson/pinctrl-meson-g12a.c    |  2 ++
 drivers/pinctrl/meson/pinctrl-meson-gx-pmx.c  |  4 +++
 drivers/pinctrl/meson/pinctrl-meson-gxbb.c    |  2 ++
 drivers/pinctrl/meson/pinctrl-meson-gxl.c     |  2 ++
 drivers/pinctrl/meson/pinctrl-meson.c         |  5 ++++
 drivers/pinctrl/meson/pinctrl-meson.h         |  2 ++
 drivers/pinctrl/mscc/mscc-common.c            |  2 ++
 drivers/pinctrl/mscc/mscc-common.h            |  1 +
 drivers/pinctrl/mscc/pinctrl-jr2.c            |  1 +
 drivers/pinctrl/mscc/pinctrl-luton.c          |  1 +
 drivers/pinctrl/mscc/pinctrl-ocelot.c         |  1 +
 drivers/pinctrl/mscc/pinctrl-serval.c         |  1 +
 drivers/pinctrl/mscc/pinctrl-servalt.c        |  1 +
 drivers/pinctrl/mtmips/pinctrl-mt7628.c       |  5 ++++
 .../pinctrl/mtmips/pinctrl-mtmips-common.c    |  3 ++
 .../pinctrl/mtmips/pinctrl-mtmips-common.h    |  3 ++
 drivers/pinctrl/mvebu/pinctrl-armada-37xx.c   |  9 ++++++
 drivers/pinctrl/mvebu/pinctrl-mvebu.c         |  3 ++
 drivers/pinctrl/mvebu/pinctrl-mvebu.h         |  1 +
 drivers/pinctrl/nexell/pinctrl-nexell.c       |  2 ++
 drivers/pinctrl/nexell/pinctrl-nexell.h       |  1 +
 drivers/pinctrl/nexell/pinctrl-s5pxx18.c      |  4 +++
 drivers/pinctrl/nxp/pinctrl-imx.c             |  3 ++
 drivers/pinctrl/nxp/pinctrl-imx.h             |  2 ++
 drivers/pinctrl/nxp/pinctrl-imx5.c            |  1 +
 drivers/pinctrl/nxp/pinctrl-imx6.c            |  1 +
 drivers/pinctrl/nxp/pinctrl-imx7.c            |  1 +
 drivers/pinctrl/nxp/pinctrl-imx7ulp.c         |  1 +
 drivers/pinctrl/nxp/pinctrl-imx8.c            |  2 ++
 drivers/pinctrl/nxp/pinctrl-imx8m.c           |  1 +
 drivers/pinctrl/nxp/pinctrl-imxrt.c           |  1 +
 drivers/pinctrl/nxp/pinctrl-mxs.c             |  4 +++
 drivers/pinctrl/nxp/pinctrl-mxs.h             |  2 ++
 drivers/pinctrl/nxp/pinctrl-scu.c             |  3 ++
 drivers/pinctrl/nxp/pinctrl-vf610.c           |  1 +
 drivers/pinctrl/pinctrl-at91-pio4.c           |  5 ++++
 drivers/pinctrl/pinctrl-at91.c                |  5 ++++
 drivers/pinctrl/pinctrl-generic.c             |  4 +++
 drivers/pinctrl/pinctrl-sandbox.c             |  3 ++
 drivers/pinctrl/pinctrl-single.c              |  3 ++
 drivers/pinctrl/pinctrl-sti.c                 |  6 ++++
 drivers/pinctrl/pinctrl-stmfx.c               |  5 ++++
 drivers/pinctrl/pinctrl-uclass.c              |  5 ++++
 drivers/pinctrl/pinctrl_pic32.c               |  6 ++++
 drivers/pinctrl/pinctrl_stm32.c               |  6 ++++
 drivers/pinctrl/renesas/pfc-r7s72100.c        |  6 ++++
 drivers/pinctrl/renesas/pfc-r8a7790.c         |  2 ++
 drivers/pinctrl/renesas/pfc-r8a7791.c         |  2 ++
 drivers/pinctrl/renesas/pfc-r8a7792.c         |  1 +
 drivers/pinctrl/renesas/pfc-r8a7794.c         |  2 ++
 drivers/pinctrl/renesas/pfc-r8a7795.c         |  1 +
 drivers/pinctrl/renesas/pfc-r8a7796.c         |  1 +
 drivers/pinctrl/renesas/pfc-r8a77965.c        |  1 +
 drivers/pinctrl/renesas/pfc-r8a77970.c        |  2 ++
 drivers/pinctrl/renesas/pfc-r8a77980.c        |  2 ++
 drivers/pinctrl/renesas/pfc-r8a77990.c        |  2 ++
 drivers/pinctrl/renesas/pfc-r8a77995.c        |  1 +
 drivers/pinctrl/renesas/pfc.c                 |  6 ++++
 drivers/pinctrl/renesas/sh_pfc.h              |  3 ++
 drivers/pinctrl/rockchip/pinctrl-px30.c       |  3 ++
 drivers/pinctrl/rockchip/pinctrl-rk3036.c     |  3 ++
 drivers/pinctrl/rockchip/pinctrl-rk3128.c     |  3 ++
 drivers/pinctrl/rockchip/pinctrl-rk3188.c     |  3 ++
 drivers/pinctrl/rockchip/pinctrl-rk322x.c     |  3 ++
 drivers/pinctrl/rockchip/pinctrl-rk3288.c     |  3 ++
 drivers/pinctrl/rockchip/pinctrl-rk3308.c     |  3 ++
 drivers/pinctrl/rockchip/pinctrl-rk3328.c     |  3 ++
 drivers/pinctrl/rockchip/pinctrl-rk3368.c     |  3 ++
 drivers/pinctrl/rockchip/pinctrl-rk3399.c     |  3 ++
 .../pinctrl/rockchip/pinctrl-rockchip-core.c  |  6 ++++
 drivers/pinctrl/rockchip/pinctrl-rockchip.h   |  1 +
 drivers/pinctrl/rockchip/pinctrl-rv1108.c     |  3 ++
 .../pinctrl/uniphier/pinctrl-uniphier-core.c  |  3 ++
 .../pinctrl/uniphier/pinctrl-uniphier-ld11.c  |  1 +
 .../pinctrl/uniphier/pinctrl-uniphier-ld20.c  |  1 +
 .../pinctrl/uniphier/pinctrl-uniphier-ld4.c   |  1 +
 .../pinctrl/uniphier/pinctrl-uniphier-ld6b.c  |  1 +
 .../pinctrl/uniphier/pinctrl-uniphier-pro4.c  |  1 +
 .../pinctrl/uniphier/pinctrl-uniphier-pro5.c  |  1 +
 .../pinctrl/uniphier/pinctrl-uniphier-pxs2.c  |  1 +
 .../pinctrl/uniphier/pinctrl-uniphier-pxs3.c  |  1 +
 .../pinctrl/uniphier/pinctrl-uniphier-sld8.c  |  1 +
 drivers/pinctrl/uniphier/pinctrl-uniphier.h   |  1 +
 drivers/power/acpi_pmc/acpi-pmc-uclass.c      |  4 +++
 drivers/power/acpi_pmc/pmc_emul.c             |  3 ++
 drivers/power/acpi_pmc/sandbox.c              |  2 ++
 drivers/power/axp152.c                        |  2 ++
 drivers/power/axp209.c                        |  2 ++
 drivers/power/axp221.c                        |  2 ++
 drivers/power/axp809.c                        |  3 ++
 drivers/power/axp818.c                        |  3 ++
 drivers/power/battery/bat_trats.c             |  2 ++
 drivers/power/battery/bat_trats2.c            |  2 ++
 drivers/power/domain/bcm6328-power-domain.c   |  2 ++
 .../power/domain/imx8-power-domain-legacy.c   |  5 ++++
 drivers/power/domain/imx8-power-domain.c      |  2 ++
 drivers/power/domain/imx8m-power-domain.c     |  3 ++
 drivers/power/domain/meson-ee-pwrc.c          |  4 +++
 drivers/power/domain/meson-gx-pwrc-vpu.c      |  2 ++
 drivers/power/domain/mtk-power-domain.c       |  3 ++
 drivers/power/domain/power-domain-uclass.c    |  2 ++
 drivers/power/domain/sandbox-power-domain.c   |  2 ++
 drivers/power/domain/tegra186-power-domain.c  |  1 +
 drivers/power/domain/ti-sci-power-domain.c    |  2 ++
 drivers/power/exynos-tmu.c                    |  3 ++
 drivers/power/fuel_gauge/fg_max17042.c        |  4 +++
 drivers/power/mfd/fg_max77693.c               |  3 ++
 drivers/power/mfd/muic_max77693.c             |  2 ++
 drivers/power/mfd/pmic_max77693.c             |  2 ++
 drivers/power/mt6323.c                        |  2 ++
 drivers/power/palmas.c                        |  3 ++
 drivers/power/pmic/act8846.c                  |  2 ++
 drivers/power/pmic/as3722.c                   |  3 ++
 drivers/power/pmic/as3722_gpio.c              |  3 ++
 drivers/power/pmic/bd71837.c                  |  4 +++
 drivers/power/pmic/da9063.c                   |  5 ++++
 drivers/power/pmic/fan53555.c                 |  3 ++
 drivers/power/pmic/i2c_pmic_emul.c            |  5 ++++
 drivers/power/pmic/lp873x.c                   |  4 +++
 drivers/power/pmic/lp87565.c                  |  4 +++
 drivers/power/pmic/max77686.c                 |  3 ++
 drivers/power/pmic/max8997.c                  |  2 ++
 drivers/power/pmic/max8998.c                  |  2 ++
 drivers/power/pmic/mc34708.c                  |  4 +++
 drivers/power/pmic/muic_max8997.c             |  2 ++
 drivers/power/pmic/palmas.c                   |  4 +++
 drivers/power/pmic/pca9450.c                  |  4 +++
 drivers/power/pmic/pfuze100.c                 |  3 ++
 drivers/power/pmic/pm8916.c                   |  2 ++
 drivers/power/pmic/pmic-uclass.c              |  3 ++
 drivers/power/pmic/pmic_hi6553.c              |  3 ++
 drivers/power/pmic/pmic_ltc3676.c             |  2 ++
 drivers/power/pmic/pmic_max77696.c            |  2 ++
 drivers/power/pmic/pmic_max8997.c             |  3 ++
 drivers/power/pmic/pmic_max8998.c             |  2 ++
 drivers/power/pmic/pmic_mc34vr500.c           |  2 ++
 drivers/power/pmic/pmic_pca9450.c             |  2 ++
 drivers/power/pmic/pmic_pfuze100.c            |  2 ++
 drivers/power/pmic/pmic_pfuze3000.c           |  2 ++
 drivers/power/pmic/pmic_tps62362.c            |  1 +
 drivers/power/pmic/pmic_tps65217.c            |  1 +
 drivers/power/pmic/pmic_tps65218.c            |  2 ++
 drivers/power/pmic/pmic_tps65910.c            |  1 +
 drivers/power/pmic/pmic_tps65910_dm.c         |  3 ++
 drivers/power/pmic/rk8xx.c                    |  4 +++
 drivers/power/pmic/rn5t567.c                  |  1 +
 drivers/power/pmic/s2mps11.c                  |  3 ++
 drivers/power/pmic/s5m8767.c                  |  3 ++
 drivers/power/pmic/sandbox.c                  |  3 ++
 drivers/power/pmic/stpmic1.c                  |  2 ++
 drivers/power/pmic/tps65090.c                 |  3 ++
 drivers/power/pmic/tps65941.c                 |  4 +++
 drivers/power/power_core.c                    |  4 +++
 drivers/power/power_dialog.c                  |  2 ++
 drivers/power/power_fsl.c                     |  3 ++
 drivers/power/power_i2c.c                     |  3 ++
 drivers/power/power_spi.c                     |  1 +
 drivers/power/regulator/act8846.c             |  3 ++
 drivers/power/regulator/as3722_regulator.c    |  3 ++
 drivers/power/regulator/bd71837.c             |  6 ++++
 drivers/power/regulator/da9063.c              |  5 ++++
 drivers/power/regulator/fan53555.c            |  5 ++++
 drivers/power/regulator/fixed.c               |  5 +++-
 drivers/power/regulator/gpio-regulator.c      |  6 +++-
 drivers/power/regulator/lp873x_regulator.c    |  3 ++
 drivers/power/regulator/lp87565_regulator.c   |  3 ++
 drivers/power/regulator/max77686.c            |  4 +++
 drivers/power/regulator/palmas_regulator.c    |  5 ++++
 drivers/power/regulator/pbias_regulator.c     |  4 +++
 drivers/power/regulator/pfuze100.c            |  4 +++
 drivers/power/regulator/pwm_regulator.c       |  4 +++
 drivers/power/regulator/regulator-uclass.c    |  5 ++++
 drivers/power/regulator/regulator_common.c    |  6 +++-
 drivers/power/regulator/regulator_common.h    |  4 +--
 drivers/power/regulator/rk8xx.c               |  4 +++
 drivers/power/regulator/s2mps11_regulator.c   |  5 ++++
 drivers/power/regulator/s5m8767.c             |  2 ++
 drivers/power/regulator/sandbox.c             |  5 ++++
 drivers/power/regulator/stm32-vrefbuf.c       |  4 +++
 drivers/power/regulator/stpmic1.c             |  4 +++
 drivers/power/regulator/tps62360_regulator.c  |  3 ++
 drivers/power/regulator/tps65090_regulator.c  |  4 +++
 drivers/power/regulator/tps65910_regulator.c  |  5 ++++
 drivers/power/regulator/tps65941_regulator.c  |  3 ++
 drivers/power/sy8106a.c                       |  1 +
 drivers/power/tps6586x.c                      |  3 ++
 drivers/power/twl4030.c                       |  3 ++
 drivers/power/twl6030.c                       |  3 ++
 drivers/pwm/exynos_pwm.c                      |  3 ++
 drivers/pwm/pwm-imx-util.c                    |  1 +
 drivers/pwm/pwm-imx.c                         |  2 ++
 drivers/pwm/pwm-mtk.c                         |  7 +++++
 drivers/pwm/pwm-sifive.c                      |  6 ++++
 drivers/pwm/pwm-uclass.c                      |  3 ++
 drivers/pwm/rk_pwm.c                          |  4 +++
 drivers/pwm/sandbox_pwm.c                     |  3 ++
 drivers/pwm/sunxi_pwm.c                       |  4 +++
 drivers/pwm/tegra_pwm.c                       |  3 ++
 drivers/qe/fdt.c                              |  1 +
 drivers/qe/qe.c                               |  6 ++++
 drivers/qe/uccf.c                             |  3 ++
 drivers/qe/uec.c                              |  6 ++++
 drivers/qe/uec_phy.c                          |  4 +++
 drivers/qe/uec_phy.h                          |  1 +
 drivers/ram/bmips_ram.c                       |  3 ++
 drivers/ram/imxrt_sdram.c                     |  5 ++++
 drivers/ram/k3-am654-ddrss.c                  |  4 +++
 drivers/ram/k3-am654-ddrss.h                  |  1 +
 drivers/ram/k3-j721e/cps_drv_lpddr4.h         |  1 +
 drivers/ram/k3-j721e/k3-j721e-ddrss.c         |  4 +++
 drivers/ram/k3-j721e/lpddr4_if.h              |  1 +
 drivers/ram/k3-j721e/lpddr4_private.h         |  1 +
 drivers/ram/k3-j721e/lpddr4_sanity.h          |  2 ++
 drivers/ram/k3-j721e/lpddr4_structs_if.h      |  1 +
 drivers/ram/mediatek/ddr3-mt7629.c            |  2 ++
 drivers/ram/mpc83xx_sdram.c                   |  3 ++
 drivers/ram/ram-uclass.c                      |  1 +
 drivers/ram/rockchip/dmc-rk3368.c             |  7 +++++
 drivers/ram/rockchip/sdram_common.c           |  3 ++
 drivers/ram/rockchip/sdram_pctl_px30.c        |  2 ++
 drivers/ram/rockchip/sdram_phy_px30.c         |  2 ++
 drivers/ram/rockchip/sdram_px30.c             |  3 ++
 drivers/ram/rockchip/sdram_rk3128.c           |  1 +
 drivers/ram/rockchip/sdram_rk3188.c           |  6 ++++
 drivers/ram/rockchip/sdram_rk322x.c           |  5 ++++
 drivers/ram/rockchip/sdram_rk3288.c           |  6 ++++
 drivers/ram/rockchip/sdram_rk3308.c           |  1 +
 drivers/ram/rockchip/sdram_rk3328.c           |  5 ++++
 drivers/ram/rockchip/sdram_rk3399.c           |  6 ++++
 drivers/ram/sandbox_ram.c                     |  1 +
 drivers/ram/sifive/fu540_ddr.c                |  4 +++
 drivers/ram/stm32_sdram.c                     |  5 ++++
 drivers/ram/stm32mp1/stm32mp1_ddr.c           |  9 ++++++
 drivers/ram/stm32mp1/stm32mp1_ddr.h           |  2 ++
 drivers/ram/stm32mp1/stm32mp1_ddr_regs.h      |  1 +
 drivers/ram/stm32mp1/stm32mp1_interactive.c   |  8 ++++++
 drivers/ram/stm32mp1/stm32mp1_ram.c           |  8 ++++++
 drivers/ram/stm32mp1/stm32mp1_tests.c         |  7 +++++
 drivers/ram/stm32mp1/stm32mp1_tuning.c        |  7 +++++
 drivers/remoteproc/k3_system_controller.c     |  4 +++
 drivers/remoteproc/rproc-elf-loader.c         |  6 ++++
 drivers/remoteproc/rproc-uclass.c             |  6 ++++
 drivers/remoteproc/sandbox_testproc.c         |  3 ++
 drivers/remoteproc/stm32_copro.c              |  4 +++
 drivers/remoteproc/ti_k3_arm64_rproc.c        |  2 ++
 drivers/remoteproc/ti_k3_dsp_rproc.c          |  6 ++++
 drivers/remoteproc/ti_k3_r5f_rproc.c          |  6 ++++
 drivers/remoteproc/ti_power_proc.c            |  5 ++++
 drivers/remoteproc/ti_sci_proc.h              |  2 ++
 drivers/reset/ast2500-reset.c                 |  2 ++
 drivers/reset/reset-bcm6345.c                 |  2 ++
 drivers/reset/reset-hisilicon.c               |  3 ++
 drivers/reset/reset-hsdk.c                    |  4 +++
 drivers/reset/reset-imx7.c                    |  3 ++
 drivers/reset/reset-mediatek.c                |  2 ++
 drivers/reset/reset-meson.c                   |  3 ++
 drivers/reset/reset-mtmips.c                  |  2 ++
 drivers/reset/reset-raspberrypi.c             |  1 +
 drivers/reset/reset-rockchip.c                |  3 ++
 drivers/reset/reset-socfpga.c                 |  5 ++++
 drivers/reset/reset-sunxi.c                   |  4 +++
 drivers/reset/reset-syscon.c                  |  3 ++
 drivers/reset/reset-ti-sci.c                  |  3 ++
 drivers/reset/reset-uclass.c                  |  1 +
 drivers/reset/reset-uniphier.c                |  3 ++
 drivers/reset/sandbox-reset.c                 |  2 ++
 drivers/reset/sti-reset.c                     |  7 +++++
 drivers/reset/stm32-reset.c                   |  1 +
 drivers/reset/tegra-car-reset.c               |  1 +
 drivers/rng/meson-rng.c                       |  3 ++
 drivers/rng/rng-uclass.c                      |  2 ++
 drivers/rng/rockchip_rng.c                    |  3 ++
 drivers/rng/sandbox_rng.c                     |  2 ++
 drivers/rng/stm32mp1_rng.c                    |  4 +++
 drivers/rtc/at91sam9_rtt.c                    |  1 +
 drivers/rtc/davinci.c                         |  1 +
 drivers/rtc/ds1302.c                          |  2 ++
 drivers/rtc/ds1306.c                          |  1 +
 drivers/rtc/ds1307.c                          |  2 ++
 drivers/rtc/ds1337.c                          |  2 ++
 drivers/rtc/ds1374.c                          |  3 ++
 drivers/rtc/ds1556.c                          |  2 ++
 drivers/rtc/ds164x.c                          |  2 ++
 drivers/rtc/ds174x.c                          |  3 ++
 drivers/rtc/ds3231.c                          |  3 ++
 drivers/rtc/ds3232.c                          |  2 ++
 drivers/rtc/i2c_rtc_emul.c                    |  3 ++
 drivers/rtc/imxdi.c                           |  3 ++
 drivers/rtc/isl1208.c                         |  2 ++
 drivers/rtc/m41t11.c                          |  2 ++
 drivers/rtc/m41t60.c                          |  3 ++
 drivers/rtc/m41t62.c                          |  2 ++
 drivers/rtc/m41t94.c                          |  1 +
 drivers/rtc/m48t35ax.c                        |  1 +
 drivers/rtc/max6900.c                         |  1 +
 drivers/rtc/mc13xxx-rtc.c                     |  1 +
 drivers/rtc/mc146818.c                        |  3 ++
 drivers/rtc/mcfrtc.c                          |  1 +
 drivers/rtc/mk48t59.c                         |  2 ++
 drivers/rtc/mvrtc.c                           |  2 ++
 drivers/rtc/mvrtc.h                           |  1 +
 drivers/rtc/mx27rtc.c                         |  1 +
 drivers/rtc/mxsrtc.c                          |  2 ++
 drivers/rtc/pcf2127.c                         |  2 ++
 drivers/rtc/pcf8563.c                         |  2 ++
 drivers/rtc/pl031.c                           |  1 +
 drivers/rtc/pt7c4338.c                        |  2 ++
 drivers/rtc/rs5c372.c                         |  2 ++
 drivers/rtc/rtc-uclass.c                      |  2 ++
 drivers/rtc/rv3029.c                          |  5 ++++
 drivers/rtc/rv8803.c                          |  2 ++
 drivers/rtc/rx8010sj.c                        |  3 ++
 drivers/rtc/rx8025.c                          |  3 ++
 drivers/rtc/s35392a.c                         |  3 ++
 drivers/rtc/s3c24x0_rtc.c                     |  2 ++
 drivers/rtc/sandbox_rtc.c                     |  1 +
 drivers/rtc/stm32_rtc.c                       |  2 ++
 drivers/rtc/x1205.c                           |  1 +
 drivers/scsi/scsi-uclass.c                    |  1 +
 drivers/scsi/scsi.c                           |  7 +++++
 drivers/serial/altera_jtag_uart.c             |  3 ++
 drivers/serial/altera_uart.c                  |  3 ++
 drivers/serial/arm_dcc.c                      |  2 ++
 drivers/serial/atmel_usart.c                  |  5 ++++
 drivers/serial/atmel_usart.h                  |  1 +
 drivers/serial/lpc32xx_hsuart.c               |  3 ++
 drivers/serial/ns16550.c                      |  4 +++
 drivers/serial/sandbox.c                      |  6 ++++
 drivers/serial/serial-uclass.c                |  7 +++++
 drivers/serial/serial.c                       |  7 +++++
 drivers/serial/serial_ar933x.c                |  4 +++
 drivers/serial/serial_arc.c                   |  3 ++
 drivers/serial/serial_bcm283x_mu.c            |  3 ++
 drivers/serial/serial_bcm283x_pl011.c         |  2 ++
 drivers/serial/serial_bcm6345.c               |  4 +++
 drivers/serial/serial_cortina.c               |  4 +++
 drivers/serial/serial_efi.c                   |  3 ++
 drivers/serial/serial_linflexuart.c           |  4 +++
 drivers/serial/serial_lpuart.c                |  5 ++++
 drivers/serial/serial_mcf.c                   |  4 +++
 drivers/serial/serial_meson.c                 |  3 ++
 drivers/serial/serial_mpc8xx.c                |  4 +++
 drivers/serial/serial_msm.c                   |  4 +++
 drivers/serial/serial_mtk.c                   |  6 ++++
 drivers/serial/serial_mvebu_a3700.c           |  2 ++
 drivers/serial/serial_mxc.c                   |  5 ++++
 drivers/serial/serial_ns16550.c               |  2 ++
 drivers/serial/serial_nulldev.c               |  2 ++
 drivers/serial/serial_omap.c                  |  2 ++
 drivers/serial/serial_owl.c                   |  2 ++
 drivers/serial/serial_pic32.c                 |  6 ++++
 drivers/serial/serial_pl01x.c                 |  4 +++
 drivers/serial/serial_pl01x_internal.h        |  2 ++
 drivers/serial/serial_pxa.c                   |  6 ++++
 drivers/serial/serial_s5p.c                   |  4 +++
 drivers/serial/serial_sh.c                    |  4 +++
 drivers/serial/serial_sifive.c                |  4 +++
 drivers/serial/serial_sti_asc.c               |  4 +++
 drivers/serial/serial_stm32.c                 |  4 +++
 drivers/serial/serial_stm32.h                 |  2 ++
 drivers/serial/serial_uniphier.c              |  4 +++
 drivers/serial/serial_xuartlite.c             |  2 ++
 drivers/serial/serial_zynq.c                  |  3 ++
 drivers/serial/usbtty.c                       |  3 ++
 drivers/smem/msm_smem.c                       |  6 ++++
 drivers/smem/sandbox_smem.c                   |  1 +
 drivers/smem/smem-uclass.c                    |  2 ++
 drivers/soc/soc-uclass.c                      |  3 ++
 drivers/soc/soc_sandbox.c                     |  1 +
 drivers/soc/soc_ti_k3.c                       |  3 ++
 drivers/soc/ti/k3-navss-ringacc.c             |  7 +++++
 drivers/soc/ti/keystone_serdes.c              |  4 +++
 drivers/sound/broadwell_i2s.c                 |  2 ++
 drivers/sound/broadwell_i2s.h                 |  1 +
 drivers/sound/broadwell_sound.c               |  2 ++
 drivers/sound/codec-uclass.c                  |  2 ++
 drivers/sound/da7219.c                        |  3 ++
 drivers/sound/hda_codec.c                     |  3 ++
 drivers/sound/i2s-uclass.c                    |  2 ++
 drivers/sound/ivybridge_sound.c               |  2 ++
 drivers/sound/max98088.c                      |  3 ++
 drivers/sound/max98090.c                      |  2 ++
 drivers/sound/max98095.c                      |  3 ++
 drivers/sound/max98357a.c                     |  3 ++
 drivers/sound/rockchip_i2s.c                  |  3 ++
 drivers/sound/rockchip_sound.c                |  2 ++
 drivers/sound/rt5677.c                        |  3 ++
 drivers/sound/samsung-i2s.c                   |  3 ++
 drivers/sound/samsung_sound.c                 |  2 ++
 drivers/sound/sandbox.c                       |  3 ++
 drivers/sound/sound-uclass.c                  |  2 ++
 drivers/sound/sound.c                         |  1 +
 drivers/sound/tegra_ahub.c                    |  4 +++
 drivers/sound/tegra_i2s.c                     |  2 ++
 drivers/sound/tegra_i2s_priv.h                |  1 +
 drivers/sound/tegra_sound.c                   |  2 ++
 drivers/sound/wm8994.c                        |  3 ++
 drivers/spi/altera_spi.c                      |  2 ++
 drivers/spi/atcspi200_spi.c                   |  6 ++++
 drivers/spi/ath79_spi.c                       |  1 +
 drivers/spi/atmel-quadspi.c                   |  6 ++++
 drivers/spi/atmel_spi.c                       |  4 +++
 drivers/spi/bcm63xx_hsspi.c                   |  5 ++++
 drivers/spi/bcm63xx_spi.c                     |  4 +++
 drivers/spi/bcmstb_spi.c                      |  6 ++++
 drivers/spi/cadence_qspi.c                    |  2 ++
 drivers/spi/cadence_qspi.h                    |  2 ++
 drivers/spi/cadence_qspi_apb.c                |  5 ++++
 drivers/spi/cf_spi.c                          |  5 ++++
 drivers/spi/davinci_spi.c                     |  5 ++++
 drivers/spi/designware_spi.c                  |  6 ++++
 drivers/spi/exynos_spi.c                      |  4 +++
 drivers/spi/fsl_dspi.c                        |  6 ++++
 drivers/spi/fsl_espi.c                        |  6 ++++
 drivers/spi/fsl_qspi.c                        |  7 +++++
 drivers/spi/ich.c                             |  6 ++++
 drivers/spi/ich.h                             |  2 ++
 drivers/spi/kirkwood_spi.c                    |  3 ++
 drivers/spi/meson_spifc.c                     |  5 ++++
 drivers/spi/mpc8xx_spi.c                      |  4 +++
 drivers/spi/mpc8xxx_spi.c                     |  6 ++++
 drivers/spi/mscc_bb_spi.c                     |  3 ++
 drivers/spi/mt7621_spi.c                      |  6 ++++
 drivers/spi/mtk_snfi_spi.c                    |  5 ++++
 drivers/spi/mvebu_a3700_spi.c                 |  3 ++
 drivers/spi/mxc_spi.c                         |  8 ++++++
 drivers/spi/mxs_spi.c                         |  4 +++
 drivers/spi/nxp_fspi.c                        |  5 ++++
 drivers/spi/omap3_spi.c                       |  4 +++
 drivers/spi/pic32_spi.c                       |  6 ++++
 drivers/spi/pl022_spi.c                       |  6 ++++
 drivers/spi/renesas_rpc_spi.c                 |  6 ++++
 drivers/spi/rk_spi.c                          |  3 ++
 drivers/spi/rk_spi.h                          |  1 +
 drivers/spi/sandbox_spi.c                     |  4 +++
 drivers/spi/sh_qspi.c                         |  3 ++
 drivers/spi/soft_spi.c                        |  3 ++
 drivers/spi/spi-mem-nodm.c                    |  4 +++
 drivers/spi/spi-mem.c                         |  5 ++++
 drivers/spi/spi-sifive.c                      |  5 ++++
 drivers/spi/spi-sunxi.c                       |  6 ++++
 drivers/spi/spi-uclass.c                      |  6 ++++
 drivers/spi/spi.c                             |  3 ++
 drivers/spi/stm32_qspi.c                      |  6 ++++
 drivers/spi/stm32_spi.c                       |  6 ++++
 drivers/spi/tegra114_spi.c                    |  2 ++
 drivers/spi/tegra20_sflash.c                  |  4 +++
 drivers/spi/tegra20_slink.c                   |  3 ++
 drivers/spi/tegra210_qspi.c                   |  4 +++
 drivers/spi/tegra_spi.h                       |  1 +
 drivers/spi/ti_qspi.c                         |  5 ++++
 drivers/spi/uniphier_spi.c                    |  6 ++++
 drivers/spi/xilinx_spi.c                      |  2 ++
 drivers/spi/zynq_qspi.c                       |  6 ++++
 drivers/spi/zynq_spi.c                        |  3 ++
 drivers/spi/zynqmp_gqspi.c                    |  6 ++++
 drivers/spmi/spmi-msm.c                       |  5 ++++
 drivers/spmi/spmi-sandbox.c                   |  3 ++
 drivers/spmi/spmi-uclass.c                    |  2 ++
 drivers/sysreset/sysreset-ti-sci.c            |  1 +
 drivers/sysreset/sysreset-uclass.c            |  4 +++
 drivers/sysreset/sysreset_ast.c               |  2 ++
 drivers/sysreset/sysreset_microblaze.c        |  2 ++
 drivers/sysreset/sysreset_mpc83xx.c           |  7 +++++
 drivers/sysreset/sysreset_octeon.c            |  2 ++
 drivers/sysreset/sysreset_rockchip.c          |  1 +
 drivers/sysreset/sysreset_sandbox.c           |  3 ++
 drivers/sysreset/sysreset_socfpga.c           |  2 ++
 drivers/sysreset/sysreset_socfpga_s10.c       |  2 ++
 drivers/sysreset/sysreset_sti.c               |  5 ++++
 drivers/sysreset/sysreset_syscon.c            |  3 ++
 drivers/sysreset/sysreset_watchdog.c          |  2 ++
 drivers/sysreset/sysreset_x86.c               |  2 ++
 drivers/sysreset/sysreset_xtfpga.c            |  1 +
 drivers/tee/broadcom/chimp_optee.c            |  4 +++
 drivers/tee/optee/core.c                      |  5 ++++
 drivers/tee/optee/optee_private.h             |  1 +
 drivers/tee/optee/optee_smc.h                 |  2 ++
 drivers/tee/optee/rpmb.c                      |  2 ++
 drivers/tee/optee/supplicant.c                |  1 +
 drivers/tee/sandbox.c                         |  5 ++++
 drivers/tee/tee-uclass.c                      |  4 +++
 drivers/thermal/imx_scu_thermal.c             |  6 ++++
 drivers/thermal/imx_thermal.c                 |  3 ++
 drivers/thermal/imx_tmu.c                     |  7 +++++
 drivers/thermal/thermal-uclass.c              |  1 +
 drivers/thermal/ti-bandgap.c                  |  1 +
 drivers/timer/ag101p_timer.c                  |  1 +
 drivers/timer/altera_timer.c                  |  1 +
 drivers/timer/arc_timer.c                     |  3 ++
 drivers/timer/atcpit100_timer.c               |  1 +
 drivers/timer/atmel_pit_timer.c               |  2 ++
 drivers/timer/cadence-ttc.c                   |  2 ++
 drivers/timer/mpc83xx_timer.c                 |  4 +++
 drivers/timer/mtk_timer.c                     |  3 ++
 drivers/timer/nomadik-mtu-timer.c             |  2 ++
 drivers/timer/ostm_timer.c                    |  1 +
 drivers/timer/rockchip_timer.c                |  3 ++
 drivers/timer/sandbox_timer.c                 |  2 ++
 drivers/timer/sti-timer.c                     |  2 ++
 drivers/timer/stm32_timer.c                   |  2 ++
 drivers/timer/timer-uclass.c                  |  4 +++
 drivers/timer/tsc_timer.c                     |  7 +++++
 drivers/tpm/cr50_i2c.c                        |  8 ++++++
 drivers/tpm/tpm-uclass.c                      |  4 +++
 drivers/tpm/tpm2_ftpm_tee.c                   |  4 +++
 drivers/tpm/tpm2_ftpm_tee.h                   |  1 +
 drivers/tpm/tpm2_tis_sandbox.c                |  6 ++++
 drivers/tpm/tpm2_tis_spi.c                    |  6 ++++
 drivers/tpm/tpm_atmel_twi.c                   |  5 ++++
 drivers/tpm/tpm_internal.h                    |  1 +
 drivers/tpm/tpm_tis.h                         |  1 +
 drivers/tpm/tpm_tis_infineon.c                |  4 +++
 drivers/tpm/tpm_tis_lpc.c                     |  6 ++++
 drivers/tpm/tpm_tis_sandbox.c                 |  8 ++++++
 drivers/tpm/tpm_tis_st33zp24_i2c.c            |  5 ++++
 drivers/tpm/tpm_tis_st33zp24_spi.c            |  5 ++++
 drivers/ufs/cdns-platform.c                   |  1 +
 drivers/ufs/ti-j721e-ufs.c                    |  2 ++
 drivers/ufs/ufs.c                             |  7 +++++
 drivers/ufs/ufs.h                             |  3 ++
 drivers/usb/cdns3/cdns3-ti.c                  |  4 +++
 drivers/usb/cdns3/core.c                      |  2 ++
 drivers/usb/cdns3/core.h                      |  2 ++
 drivers/usb/cdns3/drd.c                       |  3 ++
 drivers/usb/cdns3/ep0.c                       |  6 ++++
 drivers/usb/cdns3/gadget-export.h             |  1 +
 drivers/usb/cdns3/gadget.c                    |  8 ++++++
 drivers/usb/cdns3/gadget.h                    |  3 ++
 drivers/usb/cdns3/host-export.h               |  1 +
 drivers/usb/cdns3/host.c                      |  1 +
 drivers/usb/common/common.c                   |  4 +++
 drivers/usb/common/fsl-dt-fixup.c             |  7 +++++
 drivers/usb/common/fsl-errata.c               |  3 ++
 drivers/usb/dwc3/core.c                       |  3 ++
 drivers/usb/dwc3/core.h                       |  2 ++
 drivers/usb/dwc3/dwc3-generic.c               |  3 ++
 drivers/usb/dwc3/dwc3-meson-g12a.c            |  2 ++
 drivers/usb/dwc3/dwc3-omap.c                  |  3 ++
 drivers/usb/dwc3/dwc3-uniphier.c              |  2 ++
 drivers/usb/dwc3/ep0.c                        |  4 +++
 drivers/usb/dwc3/gadget.c                     |  7 +++++
 drivers/usb/dwc3/gadget.h                     |  2 ++
 drivers/usb/dwc3/io.h                         |  3 ++
 drivers/usb/dwc3/linux-compat.h               |  2 ++
 drivers/usb/dwc3/samsung_usb_phy.c            |  1 +
 drivers/usb/dwc3/ti_usb_phy.c                 |  3 ++
 drivers/usb/emul/sandbox_flash.c              |  5 ++++
 drivers/usb/emul/sandbox_hub.c                |  1 +
 drivers/usb/emul/sandbox_keyb.c               |  4 +++
 drivers/usb/emul/usb-emul-uclass.c            |  5 ++++
 drivers/usb/eth/asix.c                        |  6 ++++
 drivers/usb/eth/asix88179.c                   |  6 ++++
 drivers/usb/eth/lan75xx.c                     |  2 ++
 drivers/usb/eth/lan78xx.c                     |  3 ++
 drivers/usb/eth/lan7x.c                       |  6 ++++
 drivers/usb/eth/lan7x.h                       |  3 ++
 drivers/usb/eth/mcs7830.c                     |  8 ++++++
 drivers/usb/eth/r8152.c                       |  8 ++++++
 drivers/usb/eth/r8152.h                       |  3 ++
 drivers/usb/eth/r8152_fw.c                    |  3 ++
 drivers/usb/eth/smsc95xx.c                    |  8 ++++++
 drivers/usb/eth/usb_ether.c                   |  5 ++++
 drivers/usb/gadget/at91_udc.c                 |  6 ++++
 drivers/usb/gadget/at91_udc.h                 |  3 ++
 drivers/usb/gadget/atmel_usba_udc.c           |  5 ++++
 drivers/usb/gadget/atmel_usba_udc.h           |  2 ++
 drivers/usb/gadget/bcm_udc_otg.h              |  1 +
 drivers/usb/gadget/ci_udc.c                   |  5 ++++
 drivers/usb/gadget/ci_udc.h                   |  2 ++
 drivers/usb/gadget/composite.c                |  5 ++++
 drivers/usb/gadget/config.c                   |  1 +
 drivers/usb/gadget/core.c                     |  1 +
 drivers/usb/gadget/designware_udc.c           |  3 ++
 drivers/usb/gadget/dwc2_udc_otg.c             |  7 +++++
 drivers/usb/gadget/dwc2_udc_otg_phy.c         |  1 +
 drivers/usb/gadget/dwc2_udc_otg_priv.h        |  1 +
 drivers/usb/gadget/dwc2_udc_otg_regs.h        |  1 +
 drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c    |  5 ++++
 drivers/usb/gadget/ep0.c                      |  1 +
 drivers/usb/gadget/epautoconf.c               |  3 ++
 drivers/usb/gadget/ether.c                    |  8 ++++++
 drivers/usb/gadget/f_dfu.c                    |  5 ++++
 drivers/usb/gadget/f_dfu.h                    |  2 ++
 drivers/usb/gadget/f_fastboot.c               |  5 ++++
 drivers/usb/gadget/f_mass_storage.c           |  6 ++++
 drivers/usb/gadget/f_rockusb.c                |  6 ++++
 drivers/usb/gadget/f_sdp.c                    |  8 ++++++
 drivers/usb/gadget/f_thor.c                   |  7 +++++
 drivers/usb/gadget/f_thor.h                   |  1 +
 drivers/usb/gadget/fotg210.c                  |  5 ++++
 drivers/usb/gadget/g_dnl.c                    |  5 ++++
 drivers/usb/gadget/gadget_chips.h             |  3 ++
 drivers/usb/gadget/ndis.h                     |  1 +
 drivers/usb/gadget/pxa25x_udc.c               |  6 ++++
 drivers/usb/gadget/pxa27x_udc.c               |  3 ++
 drivers/usb/gadget/rndis.c                    |  2 ++
 drivers/usb/gadget/storage_common.c           |  1 +
 drivers/usb/gadget/udc/udc-core.c             |  3 ++
 drivers/usb/gadget/udc/udc-uclass.c           |  3 ++
 drivers/usb/gadget/usbstring.c                |  3 ++
 drivers/usb/host/dwc2.c                       |  7 +++++
 drivers/usb/host/dwc2.h                       |  1 +
 drivers/usb/host/dwc3-of-simple.c             |  1 +
 drivers/usb/host/dwc3-sti-glue.c              |  5 ++++
 drivers/usb/host/ehci-armada100.c             |  1 +
 drivers/usb/host/ehci-atmel.c                 |  2 ++
 drivers/usb/host/ehci-exynos.c                |  2 ++
 drivers/usb/host/ehci-faraday.c               |  4 +++
 drivers/usb/host/ehci-fsl.c                   |  7 +++++
 drivers/usb/host/ehci-generic.c               |  2 ++
 drivers/usb/host/ehci-hcd.c                   |  7 +++++
 drivers/usb/host/ehci-marvell.c               |  4 +++
 drivers/usb/host/ehci-msm.c                   |  4 +++
 drivers/usb/host/ehci-mx5.c                   |  6 ++++
 drivers/usb/host/ehci-mx6.c                   |  6 ++++
 drivers/usb/host/ehci-mxc.c                   |  2 ++
 drivers/usb/host/ehci-mxs.c                   |  5 ++++
 drivers/usb/host/ehci-omap.c                  |  6 ++++
 drivers/usb/host/ehci-pci.c                   |  2 ++
 drivers/usb/host/ehci-rmobile.c               |  3 ++
 drivers/usb/host/ehci-spear.c                 |  2 ++
 drivers/usb/host/ehci-tegra.c                 |  4 +++
 drivers/usb/host/ehci-vct.c                   |  1 +
 drivers/usb/host/ehci-vf.c                    |  6 ++++
 drivers/usb/host/ehci-zynq.c                  |  3 ++
 drivers/usb/host/ehci.h                       |  1 +
 drivers/usb/host/ohci-da8xx.c                 |  2 ++
 drivers/usb/host/ohci-generic.c               |  1 +
 drivers/usb/host/ohci-hcd.c                   |  6 ++++
 drivers/usb/host/ohci-lpc32xx.c               |  1 +
 drivers/usb/host/ohci.h                       |  1 +
 drivers/usb/host/r8a66597-hcd.c               |  5 ++++
 drivers/usb/host/r8a66597.h                   |  2 ++
 drivers/usb/host/sl811-hcd.c                  |  6 ++++
 drivers/usb/host/sl811.h                      |  1 +
 drivers/usb/host/usb-sandbox.c                |  2 ++
 drivers/usb/host/usb-uclass.c                 |  6 ++++
 drivers/usb/host/xhci-brcm.c                  |  2 ++
 drivers/usb/host/xhci-dwc3.c                  |  4 +++
 drivers/usb/host/xhci-exynos5.c               |  3 ++
 drivers/usb/host/xhci-fsl.c                   |  3 ++
 drivers/usb/host/xhci-mem.c                   |  5 ++++
 drivers/usb/host/xhci-mtk.c                   |  2 ++
 drivers/usb/host/xhci-mvebu.c                 |  4 +++
 drivers/usb/host/xhci-omap.c                  |  2 ++
 drivers/usb/host/xhci-pci.c                   |  1 +
 drivers/usb/host/xhci-rcar-r8a779x_usb3_v3.h  |  1 +
 drivers/usb/host/xhci-rcar.c                  |  4 +++
 drivers/usb/host/xhci-ring.c                  |  5 ++++
 drivers/usb/host/xhci.c                       |  5 ++++
 drivers/usb/musb-new/am35x.c                  |  5 ++++
 drivers/usb/musb-new/da8xx.c                  |  4 +++
 drivers/usb/musb-new/mt85xx.c                 |  7 +++++
 drivers/usb/musb-new/musb_core.c              |  6 ++++
 drivers/usb/musb-new/musb_core.h              |  4 +++
 drivers/usb/musb-new/musb_debug.h             |  1 +
 drivers/usb/musb-new/musb_dma.h               |  3 ++
 drivers/usb/musb-new/musb_dsps.c              |  6 ++++
 drivers/usb/musb-new/musb_gadget.c            |  6 ++++
 drivers/usb/musb-new/musb_gadget.h            |  2 ++
 drivers/usb/musb-new/musb_gadget_ep0.c        |  4 +++
 drivers/usb/musb-new/musb_host.c              |  3 ++
 drivers/usb/musb-new/musb_io.h                |  2 ++
 drivers/usb/musb-new/musb_regs.h              |  2 ++
 drivers/usb/musb-new/musb_uboot.c             |  5 ++++
 drivers/usb/musb-new/omap2430.c               |  5 ++++
 drivers/usb/musb-new/pic32.c                  |  7 +++++
 drivers/usb/musb-new/sunxi.c                  |  8 ++++++
 drivers/usb/musb-new/ti-musb.c                |  6 ++++
 drivers/usb/musb-new/usb-compat.h             |  1 +
 drivers/usb/musb/am35x.c                      |  2 ++
 drivers/usb/musb/am35x.h                      |  1 +
 drivers/usb/musb/musb_core.c                  |  1 +
 drivers/usb/musb/musb_core.h                  |  1 +
 drivers/usb/musb/musb_hcd.c                   |  4 +++
 drivers/usb/musb/musb_udc.c                   |  2 ++
 drivers/usb/musb/omap3.c                      |  1 +
 drivers/usb/musb/omap3.h                      |  1 +
 drivers/usb/phy/omap_usb_phy.c                |  1 +
 drivers/usb/phy/rockchip_usb2_phy.c           |  3 ++
 drivers/usb/phy/twl4030.c                     |  2 ++
 drivers/usb/ulpi/omap-ulpi-viewport.c         |  1 +
 drivers/usb/ulpi/ulpi-viewport.c              |  2 ++
 drivers/usb/ulpi/ulpi.c                       |  2 ++
 drivers/video/am335x-fb.c                     |  8 ++++++
 drivers/video/anx9804.c                       |  2 ++
 drivers/video/anx9804.h                       |  1 +
 drivers/video/ati_radeon_fb.c                 |  5 ++++
 drivers/video/ati_radeon_fb.h                 |  2 ++
 drivers/video/atmel_hlcdfb.c                  |  5 ++++
 drivers/video/atmel_lcdfb.c                   |  4 +++
 drivers/video/backlight-uclass.c              |  1 +
 drivers/video/backlight_gpio.c                |  1 +
 drivers/video/bcm2835.c                       |  3 ++
 drivers/video/bridge/anx6345.c                |  3 ++
 drivers/video/bridge/ps862x.c                 |  3 ++
 drivers/video/bridge/video-bridge-uclass.c    |  3 ++
 drivers/video/broadwell_igd.c                 |  7 +++++
 drivers/video/bus_vcxk.c                      |  2 ++
 drivers/video/cfb_console.c                   |  8 ++++++
 drivers/video/console_normal.c                |  2 ++
 drivers/video/console_rotate.c                |  2 ++
 drivers/video/console_truetype.c              |  4 +++
 drivers/video/coreboot.c                      |  2 ++
 drivers/video/da8xx-fb.c                      |  5 ++++
 drivers/video/display-uclass.c                |  3 ++
 drivers/video/dsi-host-uclass.c               |  1 +
 drivers/video/dw_hdmi.c                       |  5 ++++
 drivers/video/dw_mipi_dsi.c                   |  6 ++++
 drivers/video/efi.c                           |  3 ++
 drivers/video/exynos/exynos_dp.c              |  5 ++++
 drivers/video/exynos/exynos_dp_lowlevel.c     |  3 ++
 drivers/video/exynos/exynos_dp_lowlevel.h     |  1 +
 drivers/video/exynos/exynos_fb.c              |  4 +++
 drivers/video/exynos/exynos_mipi_dsi.c        |  4 +++
 drivers/video/exynos/exynos_mipi_dsi_common.c |  3 ++
 .../video/exynos/exynos_mipi_dsi_lowlevel.c   |  2 ++
 drivers/video/formike.c                       |  2 ++
 drivers/video/fsl_dcu_fb.c                    |  7 +++++
 drivers/video/fsl_diu_fb.c                    |  6 ++++
 drivers/video/hitachi_tx18d42vm_lcd.c         |  4 +++
 drivers/video/ihs_video_out.c                 |  4 +++
 drivers/video/imx/ipu.h                       |  1 +
 drivers/video/imx/ipu_common.c                |  3 ++
 drivers/video/imx/ipu_disp.c                  |  1 +
 drivers/video/imx/ipu_regs.h                  |  2 ++
 drivers/video/imx/mxc_ipuv3_fb.c              |  3 ++
 drivers/video/ivybridge_igd.c                 |  5 ++++
 drivers/video/ld9040.c                        |  1 +
 drivers/video/lg4573.c                        |  5 ++++
 drivers/video/logicore_dp_tx.c                |  5 ++++
 drivers/video/logicore_dp_tx.h                |  2 ++
 drivers/video/logicore_dp_tx_regif.h          |  1 +
 drivers/video/mali_dp.c                       |  6 ++++
 drivers/video/mb862xx.c                       |  2 ++
 drivers/video/meson/meson_canvas.c            |  1 +
 drivers/video/meson/meson_dw_hdmi.c           |  6 ++++
 drivers/video/meson/meson_plane.c             |  2 ++
 drivers/video/meson/meson_registers.h         |  1 +
 drivers/video/meson/meson_vclk.c              |  5 ++++
 drivers/video/meson/meson_venc.c              |  3 ++
 drivers/video/meson/meson_vpu.c               |  5 ++++
 drivers/video/meson/meson_vpu.h               |  3 ++
 drivers/video/meson/meson_vpu_init.c          |  2 ++
 drivers/video/mipi_dsi.c                      |  4 +++
 drivers/video/mvebu_lcd.c                     |  3 ++
 drivers/video/mx3fb.c                         |  4 +++
 drivers/video/mxsfb.c                         |  7 +++++
 drivers/video/nexell/s5pxx18_dp.c             |  2 ++
 drivers/video/nexell/s5pxx18_dp_hdmi.c        |  2 ++
 drivers/video/nexell/s5pxx18_dp_lvds.c        |  4 +++
 drivers/video/nexell/s5pxx18_dp_mipi.c        |  4 +++
 drivers/video/nexell/s5pxx18_dp_rgb.c         |  2 ++
 .../nexell/soc/s5pxx18_soc_disptop_clk.c      |  1 +
 drivers/video/nexell/soc/s5pxx18_soc_lvds.c   |  1 +
 drivers/video/nexell/soc/s5pxx18_soc_lvds.h   |  1 +
 drivers/video/nexell/soc/s5pxx18_soc_mipi.h   |  1 +
 drivers/video/nexell_display.c                |  3 ++
 drivers/video/omap3_dss.c                     |  1 +
 drivers/video/orisetech_otm8009a.c            |  4 +++
 drivers/video/panel-uclass.c                  |  1 +
 drivers/video/pwm_backlight.c                 |  3 ++
 drivers/video/pxa_lcd.c                       |  2 ++
 drivers/video/raydium-rm68200.c               |  4 +++
 drivers/video/rockchip/rk3288_hdmi.c          |  1 +
 drivers/video/rockchip/rk3288_mipi.c          |  1 +
 drivers/video/rockchip/rk3288_vop.c           |  3 ++
 drivers/video/rockchip/rk3399_hdmi.c          |  1 +
 drivers/video/rockchip/rk3399_mipi.c          |  1 +
 drivers/video/rockchip/rk3399_vop.c           |  3 ++
 drivers/video/rockchip/rk_edp.c               |  7 +++++
 drivers/video/rockchip/rk_hdmi.c              |  1 +
 drivers/video/rockchip/rk_hdmi.h              |  1 +
 drivers/video/rockchip/rk_lvds.c              |  4 +++
 drivers/video/rockchip/rk_mipi.c              |  3 ++
 drivers/video/rockchip/rk_mipi.h              |  1 +
 drivers/video/rockchip/rk_vop.c               |  3 ++
 drivers/video/rockchip/rk_vop.h               |  1 +
 drivers/video/s6e8ax0.c                       |  1 +
 drivers/video/sandbox_osd.c                   |  3 ++
 drivers/video/sandbox_sdl.c                   |  2 ++
 drivers/video/scf0403_lcd.c                   |  3 ++
 drivers/video/simple_panel.c                  |  1 +
 drivers/video/simplefb.c                      |  4 +++
 drivers/video/ssd2828.c                       |  3 ++
 drivers/video/stb_truetype.h                  |  3 ++
 drivers/video/stm32/stm32_dsi.c               |  6 ++++
 drivers/video/stm32/stm32_ltdc.c              |  6 ++++
 drivers/video/sunxi/lcdc.c                    |  2 ++
 drivers/video/sunxi/sunxi_de2.c               |  5 ++++
 drivers/video/sunxi/sunxi_display.c           |  7 +++++
 drivers/video/sunxi/sunxi_dw_hdmi.c           |  3 ++
 drivers/video/sunxi/sunxi_lcd.c               |  4 +++
 drivers/video/tda19988.c                      |  3 ++
 drivers/video/tegra.c                         |  5 ++++
 drivers/video/tegra124/display.c              |  5 ++++
 drivers/video/tegra124/displayport.h          |  1 +
 drivers/video/tegra124/dp.c                   |  7 +++++
 drivers/video/tegra124/sor.c                  |  6 ++++
 drivers/video/tegra124/sor.h                  |  1 +
 drivers/video/vesa.c                          |  1 +
 drivers/video/vidconsole-uclass.c             |  5 ++++
 drivers/video/video-uclass.c                  |  9 ++++++
 drivers/video/video_bmp.c                     |  6 ++++
 drivers/video/video_osd-uclass.c              |  1 +
 drivers/video/videomodes.c                    |  5 ++++
 drivers/virtio/virtio-uclass.c                |  4 +++
 drivers/virtio/virtio_blk.c                   |  3 ++
 drivers/virtio/virtio_blk.h                   |  1 +
 drivers/virtio/virtio_mmio.c                  |  4 +++
 drivers/virtio/virtio_mmio.h                  |  2 ++
 drivers/virtio/virtio_net.c                   |  5 ++++
 drivers/virtio/virtio_net.h                   |  1 +
 drivers/virtio/virtio_pci.h                   |  1 +
 drivers/virtio/virtio_pci_legacy.c            |  5 ++++
 drivers/virtio/virtio_pci_modern.c            |  6 ++++
 drivers/virtio/virtio_ring.c                  |  5 ++++
 drivers/virtio/virtio_rng.c                   |  3 ++
 drivers/virtio/virtio_sandbox.c               |  3 ++
 drivers/w1-eeprom/ds24xxx.c                   |  1 +
 drivers/w1-eeprom/ds2502.c                    |  3 ++
 drivers/w1-eeprom/eep_sandbox.c               |  2 ++
 drivers/w1-eeprom/w1-eeprom-uclass.c          |  3 ++
 drivers/w1/mxc_w1.c                           |  3 ++
 drivers/w1/w1-gpio.c                          |  3 ++
 drivers/w1/w1-uclass.c                        |  4 +++
 drivers/watchdog/armada-37xx-wdt.c            |  4 +++
 drivers/watchdog/ast_wdt.c                    |  2 ++
 drivers/watchdog/at91sam9_wdt.c               |  5 ++++
 drivers/watchdog/bcm6345_wdt.c                |  3 ++
 drivers/watchdog/cdns_wdt.c                   |  3 ++
 drivers/watchdog/cortina_wdt.c                |  3 ++
 drivers/watchdog/designware_wdt.c             |  4 +++
 drivers/watchdog/ftwdt010_wdt.c               |  1 +
 drivers/watchdog/imx_watchdog.c               |  5 ++++
 drivers/watchdog/mpc8xx_wdt.c                 |  4 +++
 drivers/watchdog/mt7621_wdt.c                 |  4 +++
 drivers/watchdog/mtk_wdt.c                    |  3 ++
 drivers/watchdog/omap_wdt.c                   |  2 ++
 drivers/watchdog/orion_wdt.c                  |  5 ++++
 drivers/watchdog/sandbox_wdt.c                |  1 +
 drivers/watchdog/sbsa_gwdt.c                  |  4 +++
 drivers/watchdog/sp805_wdt.c                  |  3 ++
 drivers/watchdog/stm32mp_wdt.c                |  3 ++
 drivers/watchdog/tangier_wdt.c                |  2 ++
 drivers/watchdog/ulp_wdog.c                   |  1 +
 drivers/watchdog/wdt-uclass.c                 |  4 +++
 drivers/watchdog/xilinx_tb_wdt.c              |  3 ++
 drivers/watchdog/xilinx_wwdt.c                |  3 ++
 env/attr.c                                    |  3 +-
 env/callback.c                                |  2 ++
 env/common.c                                  |  7 +++++
 env/eeprom.c                                  |  2 ++
 env/env.c                                     |  7 +++++
 env/ext4.c                                    |  6 ++++
 env/fat.c                                     |  5 ++++
 env/flags.c                                   |  2 ++
 env/flash.c                                   |  4 +++
 env/mmc.c                                     |  8 ++++++
 env/nand.c                                    |  5 ++++
 env/nowhere.c                                 |  2 ++
 env/nvram.c                                   |  3 ++
 env/onenand.c                                 |  3 ++
 env/remote.c                                  |  4 +++
 env/sata.c                                    |  5 ++++
 env/sf.c                                      |  6 ++++
 env/ubi.c                                     |  4 +++
 examples/api/demo.c                           |  2 ++
 examples/api/glue.c                           |  2 ++
 examples/api/glue.h                           |  1 +
 examples/api/libgenwrap.c                     |  1 +
 examples/standalone/atmel_df_pow2.c           |  4 +++
 examples/standalone/hello_world.c             |  1 +
 examples/standalone/sched.c                   |  2 ++
 examples/standalone/stubs.c                   |  1 +
 fs/btrfs/btrfs.c                              |  2 ++
 fs/btrfs/btrfs.h                              |  1 +
 fs/btrfs/btrfs_tree.h                         |  1 +
 fs/btrfs/ctree.h                              |  1 +
 fs/btrfs/dir-item.c                           |  1 +
 fs/btrfs/inode.c                              |  2 ++
 fs/btrfs/root.c                               |  1 +
 fs/btrfs/subvolume.c                          |  2 ++
 fs/btrfs/super.c                              |  4 +++
 fs/cbfs/cbfs.c                                |  4 +++
 fs/cramfs/cramfs.c                            |  3 ++
 fs/cramfs/uncompress.c                        |  1 +
 fs/ext4/dev.c                                 |  1 +
 fs/ext4/ext4_common.c                         |  5 ++++
 fs/ext4/ext4_common.h                         |  2 ++
 fs/ext4/ext4_journal.c                        |  5 ++++
 fs/ext4/ext4_journal.h                        |  2 ++
 fs/ext4/ext4_write.c                          |  6 ++++
 fs/ext4/ext4fs.c                              |  6 +++-
 fs/fat/fat.c                                  |  5 ++++
 fs/fat/fat_write.c                            |  5 ++++
 fs/fs.c                                       | 10 +++++++
 fs/fs_internal.c                              |  4 +++
 fs/jffs2/compr_lzo.c                          |  2 ++
 fs/jffs2/compr_rtime.c                        |  1 +
 fs/jffs2/compr_rubin.c                        |  1 +
 fs/jffs2/compr_zlib.c                         |  1 +
 fs/jffs2/jffs2_1pass.c                        |  4 +++
 fs/jffs2/jffs2_private.h                      |  1 +
 fs/jffs2/mini_inflate.c                       |  1 +
 fs/jffs2/summary.h                            |  1 +
 fs/reiserfs/mode_string.c                     |  1 +
 fs/reiserfs/reiserfs.c                        |  3 ++
 fs/reiserfs/reiserfs_private.h                |  3 ++
 fs/sandbox/sandboxfs.c                        |  2 ++
 fs/ubifs/debug.c                              |  7 +++++
 fs/ubifs/debug.h                              |  2 ++
 fs/ubifs/io.c                                 |  4 +++
 fs/ubifs/key.h                                |  3 ++
 fs/ubifs/log.c                                |  3 ++
 fs/ubifs/lprops.c                             |  4 +++
 fs/ubifs/lpt_commit.c                         |  5 ++++
 fs/ubifs/misc.h                               |  2 ++
 fs/ubifs/orphan.c                             |  3 ++
 fs/ubifs/recovery.c                           |  4 +++
 fs/ubifs/replay.c                             |  4 +++
 fs/ubifs/scan.c                               |  3 ++
 fs/ubifs/super.c                              |  7 +++++
 fs/ubifs/tnc.c                                |  4 +++
 fs/ubifs/tnc_misc.c                           |  2 ++
 fs/ubifs/ubifs-media.h                        |  2 ++
 fs/ubifs/ubifs.c                              |  6 ++++
 fs/ubifs/ubifs.h                              |  3 ++
 fs/yaffs2/yaffs_mtdif2.c                      |  1 +
 fs/yaffs2/yaffs_uboot_glue.c                  |  6 ++++
 fs/yaffs2/yaffsfs.c                           |  4 +++
 fs/yaffs2/ydirectenv.h                        |  3 ++
 fs/yaffs2/yportenv.h                          |  1 +
 fs/zfs/zfs.c                                  |  4 +++
 fs/zfs/zfs_fletcher.c                         |  1 +
 fs/zfs/zfs_lzjb.c                             |  2 ++
 fs/zfs/zfs_sha256.c                           |  1 +
 include/ACEX1K.h                              |  1 +
 include/MCD_dma.h                             |  3 ++
 include/acpi/acpi_device.h                    |  2 ++
 include/acpi/acpi_s3.h                        |  2 ++
 include/acpi/acpi_table.h                     |  2 ++
 include/acpi/acpigen.h                        |  1 +
 include/adc.h                                 |  2 ++
 include/ahci.h                                |  2 ++
 include/ali512x.h                             |  1 +
 include/altera.h                              |  1 +
 include/android_bootloader_message.h          |  1 +
 include/api_public.h                          |  1 +
 include/asm-generic/global_data.h             |  2 ++
 include/asm-generic/gpio.h                    |  2 ++
 include/asm-generic/int-ll64.h                |  1 +
 include/asm-generic/io.h                      |  1 +
 include/asm-generic/u-boot.h                  |  1 +
 include/ata.h                                 |  1 +
 include/atf_common.h                          |  1 +
 include/atmel_hlcdc.h                         |  1 +
 include/atmel_lcd.h                           |  3 ++
 include/atmel_mci.h                           |  1 +
 include/atsha204a-i2c.h                       |  2 ++
 include/audio_codec.h                         |  3 ++
 include/autoboot.h                            |  2 ++
 include/avb_verify.h                          |  2 ++
 include/axi.h                                 |  3 ++
 include/backlight.h                           |  2 ++
 include/binman.h                              |  1 +
 include/blk.h                                 |  1 +
 include/bloblist.h                            |  1 +
 include/bmp_layout.h                          |  2 ++
 include/board.h                               |  6 ++++
 include/bootcount.h                           |  3 ++
 include/bootm.h                               |  1 +
 include/bootstage.h                           |  3 ++
 include/broadcom/chimp.h                      |  1 +
 include/btrfs.h                               |  1 +
 include/bus_vcxk.h                            |  1 +
 include/button.h                              |  2 ++
 include/cache.h                               |  4 +++
 include/capitalization.h                      |  1 +
 include/cavium/atf.h                          |  1 +
 include/cbfs.h                                |  1 +
 include/cli.h                                 |  4 +++
 include/clk-uclass.h                          |  1 +
 include/clk.h                                 |  1 +
 include/clock_legacy.h                        |  1 +
 include/command.h                             |  3 ++
 include/common.h                              | 25 +++--------------
 include/cpsw.h                                |  2 ++
 include/cpu.h                                 |  3 ++
 include/cramfs/cramfs_fs.h                    |  1 +
 include/cros_ec.h                             |  2 ++
 include/crypto/pkcs7.h                        |  1 +
 include/crypto/pkcs7_parser.h                 |  3 ++
 include/crypto/public_key.h                   |  1 +
 include/crypto/x509_parser.h                  |  2 ++
 include/ddr_spd.h                             |  1 +
 include/deps_internal.h                       | 18 ++++++++++++
 include/dfu.h                                 |  4 +++
 include/display.h                             |  3 ++
 include/display_options.h                     |  4 +++
 include/div64.h                               |  1 +
 include/dm/device-internal.h                  |  3 ++
 include/dm/device.h                           |  2 ++
 include/dm/device_compat.h                    |  1 +
 include/dm/devres.h                           |  2 ++
 include/dm/lists.h                            |  1 +
 include/dm/of.h                               |  3 ++
 include/dm/of_access.h                        |  2 ++
 include/dm/of_addr.h                          |  1 +
 include/dm/of_extra.h                         |  1 +
 include/dm/ofnode.h                           |  2 ++
 include/dm/pci.h                              |  1 +
 include/dm/pinctrl.h                          |  2 ++
 include/dm/platdata.h                         |  1 +
 include/dm/platform_data/fsl_espi.h           |  1 +
 include/dm/platform_data/net_ethoc.h          |  1 +
 include/dm/platform_data/serial_bcm283x_mu.h  |  1 +
 include/dm/platform_data/serial_mxc.h         |  1 +
 include/dm/platform_data/serial_pl01x.h       |  1 +
 include/dm/platform_data/spi_coldfire.h       |  1 +
 include/dm/platform_data/spi_davinci.h        |  1 +
 include/dm/read.h                             |  2 ++
 include/dm/root.h                             |  2 ++
 include/dm/test.h                             |  1 +
 include/dm/uclass-internal.h                  |  1 +
 include/dm/uclass.h                           |  1 +
 include/dm9000.h                              |  1 +
 include/dma-uclass.h                          |  1 +
 include/dma.h                                 |  2 ++
 include/dw_hdmi.h                             |  2 ++
 include/dwc3-uboot.h                          |  2 ++
 include/dwmmc.h                               |  2 ++
 include/ec_commands.h                         |  2 ++
 include/edid.h                                |  2 ++
 include/eeprom.h                              |  3 ++
 include/eeprom_layout.h                       |  1 +
 include/efi.h                                 |  3 ++
 include/efi_api.h                             |  3 ++
 include/efi_loader.h                          |  2 ++
 include/efi_selftest.h                        |  2 ++
 include/efi_variable.h                        |  2 ++
 include/env_default.h                         |  1 +
 include/env_internal.h                        |  1 +
 include/ethsw.h                               |  1 +
 include/exception.h                           |  2 ++
 include/exports.h                             |  7 +++++
 include/ext4fs.h                              |  1 +
 include/ext_common.h                          |  3 ++
 include/exynos_lcd.h                          |  1 +
 include/fastboot-internal.h                   |  1 +
 include/fastboot.h                            |  1 +
 include/fat.h                                 |  1 +
 include/fb_mmc.h                              |  1 +
 include/fb_nand.h                             |  1 +
 include/fdt_support.h                         |  2 ++
 include/fdtdec.h                              |  3 ++
 include/fis.h                                 |  1 +
 include/flash.h                               |  1 +
 include/fm_eth.h                              |  1 +
 include/fs.h                                  |  1 +
 include/fs_loader.h                           |  1 +
 include/fsl-mc/fsl_dpaa_fd.h                  |  2 ++
 include/fsl-mc/fsl_dpbp.h                     |  1 +
 include/fsl-mc/fsl_dpio.h                     |  1 +
 include/fsl-mc/fsl_dpmac.h                    |  1 +
 include/fsl-mc/fsl_dpmng.h                    |  1 +
 include/fsl-mc/fsl_dpni.h                     |  1 +
 include/fsl-mc/fsl_dprc.h                     |  1 +
 include/fsl-mc/fsl_dpsparser.h                |  1 +
 include/fsl-mc/fsl_mc.h                       |  3 ++
 include/fsl-mc/fsl_mc_cmd.h                   |  2 ++
 include/fsl-mc/fsl_mc_sys.h                   |  1 +
 include/fsl-mc/fsl_qbman_base.h               |  1 +
 include/fsl-mc/fsl_qbman_portal.h             |  1 +
 include/fsl-mc/ldpaa_wriop.h                  |  1 +
 include/fsl_csu.h                             |  1 +
 include/fsl_ddr.h                             |  1 +
 include/fsl_ddr_sdram.h                       |  3 ++
 include/fsl_devdis.h                          |  1 +
 include/fsl_diu_fb.h                          |  1 +
 include/fsl_dspi.h                            |  1 +
 include/fsl_errata.h                          |  3 ++
 include/fsl_esdhc.h                           |  2 ++
 include/fsl_esdhc_imx.h                       |  2 ++
 include/fsl_ifc.h                             |  1 +
 include/fsl_immap.h                           |  1 +
 include/fsl_lpuart.h                          |  1 +
 include/fsl_mdio.h                            |  3 ++
 include/fsl_memac.h                           |  1 +
 include/fsl_mmdc.h                            |  1 +
 include/fsl_qbman.h                           |  2 ++
 include/fsl_sec.h                             |  1 +
 include/fsl_sec_mon.h                         |  1 +
 include/fsl_sfp.h                             |  1 +
 include/fsl_tgec.h                            |  1 +
 include/fsl_usb.h                             |  2 ++
 include/fsl_wdog.h                            |  1 +
 include/fuse.h                                |  1 +
 include/g_dnl.h                               |  1 +
 include/gdsys_fpga.h                          |  1 +
 include/generic-phy.h                         |  1 +
 include/gzip.h                                |  1 +
 include/hash.h                                |  1 +
 include/hda_codec.h                           |  1 +
 include/hexdump.h                             |  1 +
 include/hw_sha.h                              |  1 +
 include/hwspinlock.h                          |  1 +
 include/i2c.h                                 |  3 ++
 include/i2c_eeprom.h                          |  1 +
 include/i2s.h                                 |  1 +
 include/ide.h                                 |  1 +
 include/image-android-dt.h                    |  1 +
 include/image-sparse.h                        |  2 ++
 include/imx8image.h                           |  3 ++
 include/imx_lpi2c.h                           |  1 +
 include/imximage.h                            |  1 +
 include/init.h                                |  7 ++---
 include/initcall.h                            |  1 +
 include/input.h                               |  2 ++
 include/ioports.h                             |  1 +
 include/ipu_pixfmt.h                          |  1 +
 include/irq.h                                 |  2 ++
 include/jffs2/jffs2_1pass.h                   |  1 +
 include/jffs2/load_kernel.h                   |  1 +
 include/k3-avs.h                              |  2 ++
 include/kendryte/bypass.h                     |  2 ++
 include/kendryte/clk.h                        |  1 +
 include/kendryte/pll.h                        |  3 ++
 include/key_matrix.h                          |  1 +
 include/keys/asymmetric-type.h                |  2 ++
 include/lattice.h                             |  1 +
 include/lcd.h                                 |  2 ++
 include/lcd_console.h                         |  1 +
 include/lcdvideo.h                            |  1 +
 include/led.h                                 |  2 ++
 include/libata.h                              |  3 +-
 include/linux/err.h                           |  2 +-
 include/linux/list.h                          |  1 +
 include/linux/log2.h                          |  1 +
 include/linux/mtd/omap_gpmc.h                 |  2 ++
 include/linux/soc/ti/cppi5.h                  |  5 ++++
 include/linux/soc/ti/k3-navss-ringacc.h       |  1 +
 include/linux/soc/ti/k3-sec-proxy.h           |  1 +
 include/linux/soc/ti/ti-udma.h                |  1 +
 include/linux/soc/ti/ti_sci_protocol.h        |  4 +++
 include/linux/types.h                         |  1 -
 include/lmb.h                                 |  1 +
 include/log.h                                 |  1 +
 include/lynxkdi.h                             |  1 +
 include/lz4.h                                 |  1 +
 include/mailbox.h                             |  1 +
 include/malloc.h                              |  3 +-
 include/mapmem.h                              |  1 +
 include/mc9sdz60.h                            |  1 +
 include/memalign.h                            |  2 ++
 include/membuff.h                             |  2 ++
 include/miiphy.h                              |  1 +
 include/mipi_dsi.h                            |  3 ++
 include/misc.h                                |  3 ++
 include/mm_communication.h                    |  1 +
 include/mmc.h                                 |  3 ++
 include/mpc86xx.h                             |  1 +
 include/mtd/cfi_flash.h                       |  1 +
 include/mtd/ubi-user.h                        |  1 +
 include/mv88e6352.h                           |  1 +
 include/mvebu/comphy.h                        |  2 ++
 include/mvebu_mmc.h                           |  2 ++
 include/mvmfp.h                               |  1 +
 include/mxs_nand.h                            |  2 ++
 include/nand.h                                |  1 +
 include/net.h                                 |  3 ++
 include/net/ncsi-pkt.h                        |  1 +
 include/net/ncsi.h                            |  1 +
 include/net/pcap.h                            |  2 ++
 include/net/pfe_eth/pfe/cbus/bmu.h            |  1 +
 include/net/pfe_eth/pfe/cbus/class_csr.h      |  1 +
 include/net/pfe_eth/pfe/cbus/gpi.h            |  1 +
 include/net/pfe_eth/pfe/cbus/tmu_csr.h        |  1 +
 include/net/pfe_eth/pfe/pfe_hw.h              |  1 +
 include/net/pfe_eth/pfe_driver.h              |  2 ++
 include/net/pfe_eth/pfe_eth.h                 |  1 +
 include/net/tftp.h                            |  1 +
 include/netdev.h                              |  4 +++
 include/nvme.h                                |  1 +
 include/opensbi.h                             |  1 +
 include/os.h                                  |  1 +
 include/p2sb.h                                |  2 ++
 include/palmas.h                              |  1 +
 include/part.h                                |  1 +
 include/part_efi.h                            |  2 ++
 include/pca953x.h                             |  1 +
 include/pca9698.h                             |  1 +
 include/pch.h                                 |  2 ++
 include/pci.h                                 |  5 ++--
 include/pci_ep.h                              |  1 +
 include/pci_rom.h                             |  1 +
 include/pe.h                                  |  1 +
 include/phy-sun4i-usb.h                       |  1 +
 include/phy.h                                 |  2 ++
 include/phy_interface.h                       |  3 ++
 include/physmem.h                             |  1 +
 include/post.h                                |  4 +++
 include/power-domain.h                        |  1 +
 include/power/acpi_pmc.h                      |  2 ++
 include/power/as3722.h                        |  3 ++
 include/power/battery.h                       |  1 +
 include/power/fg_battery_cell_params.h        |  1 +
 include/power/hi6553_pmic.h                   |  1 +
 include/power/max77686_pmic.h                 |  1 +
 include/power/mc34vr500_pmic.h                |  1 +
 include/power/pmic.h                          |  1 +
 include/power/regulator.h                     |  4 +++
 include/power/rk8xx_pmic.h                    |  1 +
 include/power/s5m8767.h                       |  1 +
 include/power/sandbox_pmic.h                  |  1 +
 include/power/tps65217.h                      |  1 +
 include/power/tps65218.h                      |  1 +
 include/power/tps65910_pmic.h                 |  1 +
 include/pwm.h                                 |  4 +++
 include/pwrseq.h                              |  1 +
 include/pxa_lcd.h                             |  1 +
 include/qfw.h                                 |  3 ++
 include/ram.h                                 |  3 ++
 include/regmap.h                              |  3 ++
 include/remoteproc.h                          |  3 ++
 include/reset.h                               |  1 +
 include/rng.h                                 |  2 ++
 include/rtc.h                                 |  2 ++
 include/s_record.h                            |  1 +
 include/samsung/exynos5-dt-types.h            |  1 +
 include/samsung/misc.h                        |  1 +
 include/sandbox-clk.h                         |  2 ++
 include/sandboxfs.h                           |  1 +
 include/sandboxtee.h                          |  1 +
 include/sata.h                                |  1 +
 include/scsi.h                                |  3 ++
 include/sdhci.h                               |  2 ++
 include/search.h                              |  1 +
 include/serial.h                              |  2 ++
 include/sja1000.h                             |  1 +
 include/smbios.h                              |  2 ++
 include/smem.h                                |  1 +
 include/smsc_lpc47m.h                         |  1 +
 include/soc.h                                 |  3 ++
 include/sort.h                                |  1 +
 include/sound.h                               |  1 +
 include/spi-mem.h                             |  3 ++
 include/spi.h                                 |  1 +
 include/spi_flash.h                           |  4 +++
 include/spl.h                                 |  2 ++
 include/spl_gpio.h                            |  1 +
 include/splash.h                              |  2 ++
 include/spmi/spmi.h                           |  1 +
 include/stm32_rcc.h                           |  2 ++
 include/stratixII.h                           |  1 +
 include/syscon.h                              |  1 +
 include/sysreset.h                            |  3 ++
 include/tables_csum.h                         |  1 +
 include/tca642x.h                             |  1 +
 include/tee.h                                 |  4 +++
 include/tee/optee.h                           |  1 +
 include/tegra-kbc.h                           |  1 +
 include/test/ut.h                             |  3 ++
 include/timer.h                               |  1 +
 include/tlv_eeprom.h                          |  6 ++++
 include/tpm-common.h                          |  3 ++
 include/tpm-v1.h                              |  4 +++
 include/tpm-v2.h                              |  3 ++
 include/tps6586x.h                            |  2 ++
 include/trace.h                               |  1 +
 include/tsec.h                                |  3 ++
 include/twl4030.h                             |  1 +
 include/twl6030.h                             |  1 +
 include/u-boot/aes.h                          |  2 ++
 include/u-boot/crc.h                          |  1 +
 include/u-boot/rsa-checksum.h                 |  1 +
 include/u-boot/rsa-mod-exp.h                  |  1 +
 include/u-boot/rsa.h                          |  2 ++
 include/u-boot/sha1.h                         |  1 +
 include/u-boot/sha256.h                       |  1 +
 include/u-boot/sha512.h                       |  1 +
 include/u-boot/zlib.h                         |  1 +
 include/ubifs_uboot.h                         |  1 +
 include/ubispl.h                              |  1 +
 include/uboot_aes.h                           |  1 +
 include/ufs.h                                 |  3 ++
 include/usb.h                                 |  2 ++
 include/usb/designware_udc.h                  |  1 +
 include/usb/dwc2_udc.h                        |  2 ++
 include/usb/ehci-ci.h                         |  1 +
 include/usb/fotg210.h                         |  1 +
 include/usb/fusbh200.h                        |  1 +
 include/usb/ulpi.h                            |  1 +
 include/usb/xhci.h                            |  3 ++
 include/usb_defs.h                            |  1 +
 include/usb_ether.h                           |  1 +
 include/usb_mass_storage.h                    |  1 +
 include/usbdevice.h                           |  1 +
 include/uuid.h                                |  1 +
 include/vbe.h                                 |  3 ++
 include/video.h                               |  2 ++
 include/video_bridge.h                        |  2 ++
 include/video_console.h                       |  2 ++
 include/video_osd.h                           |  1 +
 include/virtio.h                              |  4 +++
 include/virtio_ring.h                         |  2 ++
 include/vsc9953.h                             |  1 +
 include/vsprintf.h                            |  1 +
 include/vxworks.h                             |  1 +
 include/w1-eeprom.h                           |  1 +
 include/w1.h                                  |  2 ++
 include/wait_bit.h                            |  3 ++
 include/wdt.h                                 |  1 +
 include/winbond_w83627.h                      |  1 +
 include/xilinx.h                              |  1 +
 include/xyzModem.h                            |  1 +
 include/zfs/dmu_objset.h                      |  1 +
 include/zfs/dnode.h                           |  1 +
 include/zfs/dsl_dataset.h                     |  1 +
 include/zfs/dsl_dir.h                         |  1 +
 include/zfs/sa_impl.h                         |  1 +
 include/zfs/spa.h                             |  1 +
 include/zfs/uberblock_impl.h                  |  1 +
 include/zfs/vdev_impl.h                       |  1 +
 include/zfs/zap_impl.h                        |  1 +
 include/zfs/zap_leaf.h                        |  1 +
 include/zfs/zfs.h                             |  1 +
 include/zfs/zfs_acl.h                         |  1 +
 include/zfs/zfs_znode.h                       |  1 +
 include/zfs/zil.h                             |  1 +
 include/zfs/zio.h                             |  1 +
 include/zfs/zio_checksum.h                    |  1 +
 include/zfs_common.h                          |  1 +
 include/zynq_bootimg.h                        |  1 +
 include/zynqmp_firmware.h                     |  1 +
 include/zynqmp_tap_delay.h                    |  1 +
 include/zynqpl.h                              |  1 +
 lib/acpi/acpi_device.c                        |  6 ++++
 lib/acpi/acpi_dp.c                            |  3 ++
 lib/acpi/acpi_table.c                         |  5 ++++
 lib/acpi/acpigen.c                            |  4 +++
 lib/addr_map.c                                |  1 +
 lib/aes.c                                     |  4 +++
 lib/aes/aes-decrypt.c                         |  5 ++++
 lib/asm-offsets.c                             |  2 ++
 lib/asn1_decoder.c                            |  2 ++
 lib/at91/at91.c                               |  1 +
 lib/bch.c                                     |  5 ++++
 lib/binman.c                                  |  1 +
 lib/bzip2/bzlib.c                             |  2 ++
 lib/charset.c                                 |  3 ++
 lib/crc16.c                                   |  2 ++
 lib/crc32.c                                   |  2 ++
 lib/crc32c.c                                  |  1 +
 lib/crypto/asymmetric_type.c                  |  5 ++++
 lib/crypto/pkcs7_parser.c                     |  4 +++
 lib/crypto/pkcs7_verify.c                     |  4 +++
 lib/crypto/public_key.c                       |  5 ++++
 lib/crypto/rsa_helper.c                       |  3 ++
 lib/crypto/x509_cert_parser.c                 |  3 ++
 lib/crypto/x509_public_key.c                  |  4 +++
 lib/dhry/cmd_dhry.c                           |  4 +++
 lib/dhry/dhry_1.c                             |  2 ++
 lib/dhry/dhry_2.c                             |  1 +
 lib/display_options.c                         |  6 ++++
 lib/div64.c                                   |  1 +
 lib/efi/efi_app.c                             |  4 +++
 lib/efi/efi_info.c                            |  3 ++
 lib/efi/efi_stub.c                            |  6 ++++
 lib/efi_driver/efi_block_device.c             |  3 ++
 lib/efi_driver/efi_uclass.c                   |  2 ++
 lib/efi_loader/efi_acpi.c                     |  2 ++
 lib/efi_loader/efi_bootmgr.c                  |  2 ++
 lib/efi_loader/efi_boottime.c                 |  8 ++++++
 lib/efi_loader/efi_console.c                  |  4 +++
 lib/efi_loader/efi_device_path.c              |  5 ++++
 lib/efi_loader/efi_device_path_to_text.c      |  4 +++
 lib/efi_loader/efi_device_path_utilities.c    |  2 ++
 lib/efi_loader/efi_disk.c                     |  5 ++++
 lib/efi_loader/efi_file.c                     |  4 +++
 lib/efi_loader/efi_freestanding.c             |  2 ++
 lib/efi_loader/efi_gop.c                      |  5 ++++
 lib/efi_loader/efi_hii.c                      |  3 ++
 lib/efi_loader/efi_hii_config.c               |  1 +
 lib/efi_loader/efi_image_loader.c             |  6 ++++
 lib/efi_loader/efi_load_initrd.c              |  3 ++
 lib/efi_loader/efi_memory.c                   |  7 +++++
 lib/efi_loader/efi_net.c                      |  5 ++++
 lib/efi_loader/efi_rng.c                      |  3 ++
 lib/efi_loader/efi_root_node.c                |  1 +
 lib/efi_loader/efi_runtime.c                  |  7 +++++
 lib/efi_loader/efi_setup.c                    |  3 ++
 lib/efi_loader/efi_signature.c                |  3 ++
 lib/efi_loader/efi_smbios.c                   |  2 ++
 lib/efi_loader/efi_unicode_collation.c        |  3 ++
 lib/efi_loader/efi_var_common.c               |  4 +++
 lib/efi_loader/efi_var_file.c                 |  4 +++
 lib/efi_loader/efi_var_mem.c                  |  4 +++
 lib/efi_loader/efi_variable.c                 |  3 ++
 lib/efi_loader/efi_variable_tee.c             |  4 +++
 lib/efi_loader/efi_watchdog.c                 |  1 +
 lib/efi_loader/helloworld.c                   |  2 ++
 lib/efi_selftest/efi_selftest.c               |  1 +
 lib/efi_selftest/efi_selftest_bitblt.c        |  1 +
 lib/efi_selftest/efi_selftest_block_device.c  |  2 ++
 lib/efi_selftest/efi_selftest_config_table.c  |  2 ++
 lib/efi_selftest/efi_selftest_console.c       |  2 ++
 lib/efi_selftest/efi_selftest_controllers.c   |  1 +
 lib/efi_selftest/efi_selftest_crc32.c         |  1 +
 lib/efi_selftest/efi_selftest_devicepath.c    |  2 ++
 .../efi_selftest_devicepath_util.c            |  1 +
 lib/efi_selftest/efi_selftest_event_groups.c  |  1 +
 lib/efi_selftest/efi_selftest_exception.c     |  1 +
 lib/efi_selftest/efi_selftest_fdt.c           |  2 ++
 lib/efi_selftest/efi_selftest_gop.c           |  1 +
 lib/efi_selftest/efi_selftest_hii.c           |  1 +
 lib/efi_selftest/efi_selftest_hii_data.c      |  1 +
 lib/efi_selftest/efi_selftest_load_initrd.c   |  2 ++
 lib/efi_selftest/efi_selftest_loaded_image.c  |  2 ++
 lib/efi_selftest/efi_selftest_loadimage.c     |  3 ++
 .../efi_selftest_manageprotocols.c            |  3 ++
 lib/efi_selftest/efi_selftest_mem.c           |  2 ++
 lib/efi_selftest/efi_selftest_memory.c        |  3 ++
 lib/efi_selftest/efi_selftest_miniapp_exit.c  |  1 +
 lib/efi_selftest/efi_selftest_rng.c           |  2 ++
 .../efi_selftest_set_virtual_address_map.c    |  3 ++
 lib/efi_selftest/efi_selftest_snp.c           |  3 ++
 .../efi_selftest_startimage_exit.c            |  2 ++
 .../efi_selftest_startimage_return.c          |  1 +
 lib/efi_selftest/efi_selftest_textinputex.c   |  2 ++
 lib/efi_selftest/efi_selftest_textoutput.c    |  1 +
 lib/efi_selftest/efi_selftest_unaligned.c     |  1 +
 .../efi_selftest_unicode_collation.c          |  2 ++
 lib/efi_selftest/efi_selftest_util.c          |  1 +
 lib/efi_selftest/efi_selftest_variables.c     |  2 ++
 .../efi_selftest_variables_runtime.c          |  2 ++
 lib/efi_selftest/efi_selftest_watchdog.c      |  2 ++
 lib/elf.c                                     |  4 +++
 lib/errno_str.c                               |  2 ++
 lib/fdtdec.c                                  | 11 ++++++++
 lib/fdtdec_test.c                             |  5 ++++
 lib/gunzip.c                                  |  4 +++
 lib/gzip.c                                    |  1 +
 lib/hang.c                                    |  1 +
 lib/hashtable.c                               |  4 +++
 lib/hexdump.c                                 |  5 ++++
 lib/image-sparse.c                            |  3 ++
 lib/libavb/avb_sysdeps.h                      |  2 ++
 lib/libavb/avb_sysdeps_posix.c                |  4 +++
 lib/linux_compat.c                            |  2 ++
 lib/linux_string.c                            |  1 +
 lib/list_sort.c                               |  3 ++
 lib/lmb.c                                     |  5 ++++
 lib/lz4.c                                     |  2 ++
 lib/lz4_wrapper.c                             |  2 ++
 lib/lzma/LzmaDec.c                            |  1 +
 lib/lzma/LzmaTools.c                          |  2 ++
 lib/lzma/Types.h                              |  1 +
 lib/lzo/lzo1x_decompress.c                    |  4 +++
 lib/lzo/lzodefs.h                             |  1 +
 lib/membuff.c                                 |  5 ++++
 lib/net_utils.c                               |  2 ++
 lib/of_live.c                                 |  5 ++++
 lib/oid_registry.c                            |  2 ++
 lib/optee/optee.c                             |  5 ++++
 lib/panic.c                                   |  3 ++
 lib/physmem.c                                 |  3 ++
 lib/qsort.c                                   |  1 +
 lib/rsa/rsa-checksum.c                        |  1 +
 lib/rsa/rsa-keyprop.c                         |  3 ++
 lib/rsa/rsa-mod-exp.c                         |  2 ++
 lib/rsa/rsa-verify.c                          |  4 +++
 lib/sha1.c                                    |  1 +
 lib/sha256.c                                  |  1 +
 lib/sha512.c                                  |  1 +
 lib/slre.c                                    |  1 +
 lib/smbios.c                                  |  4 +++
 lib/strto.c                                   |  4 +++
 lib/tables_csum.c                             |  1 +
 lib/time.c                                    |  3 ++
 lib/tiny-printf.c                             |  4 +++
 lib/tizen/tizen.c                             |  1 +
 lib/tpm-common.c                              |  4 +++
 lib/tpm-utils.h                               |  1 +
 lib/tpm-v1.c                                  |  3 ++
 lib/tpm-v2.c                                  |  3 ++
 lib/trace.c                                   |  7 +++++
 lib/uuid.c                                    |  6 ++++
 lib/vsprintf.c                                |  4 +++
 lib/xxhash.c                                  |  1 +
 lib/zlib/zlib.c                               |  1 +
 lib/zstd/zstd_opt.h                           |  2 ++
 net/arp.c                                     |  6 ++++
 net/arp.h                                     |  1 +
 net/bootp.c                                   |  7 +++++
 net/bootp.h                                   |  1 +
 net/cdp.c                                     |  4 +++
 net/cdp.h                                     |  1 +
 net/dns.c                                     |  4 +++
 net/dns.h                                     |  1 +
 net/eth-uclass.c                              |  7 +++++
 net/eth_common.c                              |  3 ++
 net/eth_internal.h                            |  1 +
 net/eth_legacy.c                              |  7 +++++
 net/fastboot.c                                |  8 ++++++
 net/link_local.c                              |  3 ++
 net/mdio-mux-uclass.c                         |  3 ++
 net/mdio-uclass.c                             |  3 ++
 net/net.c                                     |  7 +++++
 net/net_rand.h                                |  1 +
 net/nfs.c                                     |  5 ++++
 net/nfs.h                                     |  1 +
 net/pcap.c                                    |  5 ++++
 net/rarp.c                                    |  3 ++
 net/sntp.c                                    |  4 +++
 net/sntp.h                                    |  1 +
 net/tftp.c                                    |  9 ++++++
 net/wol.c                                     |  2 ++
 net/wol.h                                     |  1 +
 post/cpu/mpc83xx/ecc.c                        |  3 ++
 post/drivers/flash.c                          |  3 ++
 post/drivers/memory.c                         |  4 +++
 post/drivers/rtc.c                            |  6 ++--
 post/lib_powerpc/andi.c                       |  2 ++
 post/lib_powerpc/b.c                          |  1 +
 post/lib_powerpc/cmp.c                        |  2 ++
 post/lib_powerpc/cmpi.c                       |  2 ++
 post/lib_powerpc/cpu.c                        |  1 +
 post/lib_powerpc/cr.c                         |  2 ++
 post/lib_powerpc/fpu/mul-subnormal-single-1.c |  1 +
 post/lib_powerpc/load.c                       |  2 ++
 post/lib_powerpc/multi.c                      |  3 ++
 post/lib_powerpc/rlwimi.c                     |  2 ++
 post/lib_powerpc/rlwinm.c                     |  2 ++
 post/lib_powerpc/rlwnm.c                      |  2 ++
 post/lib_powerpc/srawi.c                      |  2 ++
 post/lib_powerpc/store.c                      |  2 ++
 post/lib_powerpc/string.c                     |  2 ++
 post/lib_powerpc/three.c                      |  2 ++
 post/lib_powerpc/threei.c                     |  2 ++
 post/lib_powerpc/threex.c                     |  2 ++
 post/lib_powerpc/two.c                        |  2 ++
 post/lib_powerpc/twox.c                       |  2 ++
 post/post.c                                   |  8 ++++++
 post/tests.c                                  |  1 +
 scripts/Makefile.autoconf                     | 25 ++++++++++++++---
 test/bloblist.c                               |  4 +++
 test/cmd/mem_search.c                         |  1 +
 test/cmd_ut.c                                 |  2 ++
 test/command_ut.c                             |  1 +
 test/compression.c                            |  2 ++
 test/dm/acpi.c                                |  5 ++++
 test/dm/acpi.h                                |  1 +
 test/dm/acpi_dp.c                             |  3 ++
 test/dm/acpigen.c                             |  3 ++
 test/dm/adc.c                                 |  1 +
 test/dm/audio.c                               |  1 +
 test/dm/axi.c                                 |  2 ++
 test/dm/blk.c                                 |  3 ++
 test/dm/board.c                               |  1 +
 test/dm/bootcount.c                           |  1 +
 test/dm/bus.c                                 |  2 ++
 test/dm/button.c                              |  1 +
 test/dm/clk.c                                 |  1 +
 test/dm/core.c                                |  5 ++++
 test/dm/devres.c                              |  1 +
 test/dm/dma.c                                 |  1 +
 test/dm/dsi_host.c                            |  1 +
 test/dm/eth.c                                 |  1 +
 test/dm/fdtdec.c                              |  2 ++
 test/dm/gpio.c                                |  3 ++
 test/dm/i2c.c                                 |  2 ++
 test/dm/i2s.c                                 |  2 ++
 test/dm/irq.c                                 |  1 +
 test/dm/k210_pll.c                            |  3 ++
 test/dm/led.c                                 |  1 +
 test/dm/mailbox.c                             |  2 ++
 test/dm/mdio.c                                |  1 +
 test/dm/mdio_mux.c                            |  1 +
 test/dm/misc.c                                |  2 ++
 test/dm/nop.c                                 |  1 +
 test/dm/ofnode.c                              |  1 +
 test/dm/osd.c                                 |  2 ++
 test/dm/panel.c                               |  2 ++
 test/dm/pch.c                                 |  2 ++
 test/dm/pci.c                                 |  2 ++
 test/dm/phy.c                                 |  1 +
 test/dm/pmic.c                                |  1 +
 test/dm/power-domain.c                        |  1 +
 test/dm/pwm.c                                 |  1 +
 test/dm/ram.c                                 |  1 +
 test/dm/regmap.c                              |  3 ++
 test/dm/regulator.c                           |  3 ++
 test/dm/remoteproc.c                          |  3 ++
 test/dm/reset.c                               |  1 +
 test/dm/rtc.c                                 |  4 +++
 test/dm/serial.c                              |  2 ++
 test/dm/sf.c                                  |  1 +
 test/dm/smem.c                                |  1 +
 test/dm/sound.c                               |  1 +
 test/dm/spi.c                                 |  1 +
 test/dm/syscon-reset.c                        |  2 ++
 test/dm/syscon.c                              |  1 +
 test/dm/sysreset.c                            |  1 +
 test/dm/tee.c                                 |  2 ++
 test/dm/test-driver.c                         |  1 +
 test/dm/test-fdt.c                            |  4 +++
 test/dm/test-main.c                           |  3 ++
 test/dm/test-uclass.c                         |  1 +
 test/dm/usb.c                                 |  2 ++
 test/dm/video.c                               |  2 ++
 test/dm/virtio.c                              |  2 ++
 test/dm/wdt.c                                 |  1 +
 test/env/attr.c                               |  1 +
 test/env/hashtable.c                          |  2 ++
 test/lib/hexdump.c                            |  1 +
 test/lib/lmb.c                                |  1 +
 test/lib/string.c                             |  1 +
 test/lib/test_aes.c                           |  3 ++
 test/lib/test_errno_str.c                     |  1 +
 test/log/log_test.c                           |  2 ++
 test/log/nolog_test.c                         |  1 +
 test/log/syslog_test.c                        |  1 +
 test/optee/cmd_ut_optee.c                     |  3 ++
 test/overlay/cmd_ut_overlay.c                 |  2 ++
 test/print_ut.c                               |  3 ++
 test/stdint/int-types.c                       |  2 ++
 test/str_ut.c                                 |  3 ++
 test/time_ut.c                                |  4 +++
 test/unicode_ut.c                             |  3 ++
 test/ut.c                                     |  5 ++++
 tools/atmel_pmecc_params.c                    |  1 +
 5493 files changed, 16151 insertions(+), 120 deletions(-)
 create mode 100644 include/deps_internal.h

-- 
2.28.0.163.g6104cc2f0b6-goog

^ permalink raw reply	[flat|nested] 35+ messages in thread

* [PATCH 01/16] common: Drop asm/global_data.h from common header
  2020-08-02 22:59 [PATCH 00/16] common: Drop remaining includes in common.h Simon Glass
@ 2020-08-02 22:59 ` Simon Glass
  2020-08-02 22:59 ` [PATCH 02/16] common: Drop display_options.h " Simon Glass
                   ` (15 subsequent siblings)
  16 siblings, 0 replies; 35+ messages in thread
From: Simon Glass @ 2020-08-02 22:59 UTC (permalink / raw)
  To: u-boot

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

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

 arch/arc/lib/bootm.c                                    | 1 +
 arch/arc/lib/cache.c                                    | 1 +
 arch/arc/lib/cpu.c                                      | 1 +
 arch/arc/lib/relocate.c                                 | 1 +
 arch/arm/cpu/arm1136/mx35/generic.c                     | 1 +
 arch/arm/cpu/arm926ejs/armada100/dram.c                 | 1 +
 arch/arm/cpu/arm926ejs/armada100/timer.c                | 1 +
 arch/arm/cpu/arm926ejs/mx25/generic.c                   | 1 +
 arch/arm/cpu/arm926ejs/mx27/timer.c                     | 1 +
 arch/arm/cpu/arm926ejs/mxs/mxs.c                        | 1 +
 arch/arm/cpu/arm926ejs/mxs/spl_boot.c                   | 1 +
 arch/arm/cpu/arm926ejs/mxs/timer.c                      | 1 +
 arch/arm/cpu/arm926ejs/spear/spr_misc.c                 | 1 +
 arch/arm/cpu/arm926ejs/spear/timer.c                    | 1 +
 arch/arm/cpu/armv7/arch_timer.c                         | 1 +
 arch/arm/cpu/armv7/ls102xa/clock.c                      | 1 +
 arch/arm/cpu/armv7/ls102xa/cpu.c                        | 1 +
 arch/arm/cpu/armv7/ls102xa/fdt.c                        | 1 +
 arch/arm/cpu/armv7/ls102xa/timer.c                      | 1 +
 arch/arm/cpu/armv7/s5p-common/cpu_info.c                | 1 +
 arch/arm/cpu/armv7/s5p-common/timer.c                   | 1 +
 arch/arm/cpu/armv7/s5p4418/cpu.c                        | 1 +
 arch/arm/cpu/armv7/stv0991/timer.c                      | 1 +
 arch/arm/cpu/armv7/sunxi/timer.c                        | 1 +
 arch/arm/cpu/armv7/vf610/generic.c                      | 1 +
 arch/arm/cpu/armv7/vf610/timer.c                        | 1 +
 arch/arm/cpu/armv7m/systick-timer.c                     | 1 +
 arch/arm/cpu/armv8/cache_v8.c                           | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/cpu.c                 | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c     | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c     | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/mp.c                  | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/ppa.c                 | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/spl.c                 | 1 +
 arch/arm/cpu/armv8/generic_timer.c                      | 1 +
 arch/arm/cpu/armv8/s32v234/generic.c                    | 1 +
 arch/arm/cpu/armv8/sec_firmware.c                       | 1 +
 arch/arm/include/asm/arch-rockchip/clock.h              | 2 ++
 arch/arm/include/asm/arch-tegra/clock.h                 | 2 ++
 arch/arm/include/asm/arch-tegra/tegra_i2c.h             | 2 ++
 arch/arm/include/asm/global_data.h                      | 3 +++
 arch/arm/include/asm/mach-imx/video.h                   | 4 +---
 arch/arm/include/asm/secure.h                           | 1 +
 arch/arm/include/asm/string.h                           | 2 --
 arch/arm/include/asm/ti-common/sys_proto.h              | 2 ++
 arch/arm/lib/bdinfo.c                                   | 1 +
 arch/arm/lib/bootm-fdt.c                                | 1 +
 arch/arm/lib/bootm.c                                    | 1 +
 arch/arm/lib/cache-cp15.c                               | 1 +
 arch/arm/lib/cache.c                                    | 1 +
 arch/arm/lib/image.c                                    | 1 +
 arch/arm/lib/interrupts.c                               | 1 +
 arch/arm/lib/interrupts_64.c                            | 1 +
 arch/arm/lib/spl.c                                      | 1 +
 arch/arm/lib/stack.c                                    | 1 +
 arch/arm/mach-aspeed/ast2500-board.c                    | 1 +
 arch/arm/mach-aspeed/ast2500/sdram_ast2500.c            | 1 +
 arch/arm/mach-at91/arm920t/clock.c                      | 1 +
 arch/arm/mach-at91/arm920t/timer.c                      | 1 +
 arch/arm/mach-at91/arm926ejs/clock.c                    | 1 +
 arch/arm/mach-at91/arm926ejs/timer.c                    | 1 +
 arch/arm/mach-at91/armv7/clock.c                        | 1 +
 arch/arm/mach-at91/armv7/timer.c                        | 1 +
 arch/arm/mach-at91/spl_at91.c                           | 1 +
 arch/arm/mach-bcm283x/init.c                            | 1 +
 arch/arm/mach-davinci/cpu.c                             | 1 +
 arch/arm/mach-davinci/misc.c                            | 1 +
 arch/arm/mach-davinci/timer.c                           | 1 +
 arch/arm/mach-exynos/spl_boot.c                         | 1 +
 arch/arm/mach-imx/cpu.c                                 | 2 +-
 arch/arm/mach-imx/imx8/ahab.c                           | 1 +
 arch/arm/mach-imx/imx8/clock.c                          | 1 +
 arch/arm/mach-imx/imx8/cpu.c                            | 1 +
 arch/arm/mach-imx/imx8/fdt.c                            | 1 +
 arch/arm/mach-imx/imx8/iomux.c                          | 1 +
 arch/arm/mach-imx/imx8/snvs_security_sc.c               | 1 +
 arch/arm/mach-imx/imx8m/clock_imx8mm.c                  | 1 +
 arch/arm/mach-imx/imx8m/soc.c                           | 1 +
 arch/arm/mach-imx/misc.c                                | 1 +
 arch/arm/mach-imx/mx5/mx53_dram.c                       | 1 +
 arch/arm/mach-imx/mx6/litesom.c                         | 1 +
 arch/arm/mach-imx/mx6/opos6ul.c                         | 1 +
 arch/arm/mach-imx/mx7/clock.c                           | 1 +
 arch/arm/mach-imx/mx7ulp/clock.c                        | 1 +
 arch/arm/mach-imx/speed.c                               | 1 +
 arch/arm/mach-imx/spl.c                                 | 1 +
 arch/arm/mach-imx/spl_imx_romapi.c                      | 1 +
 arch/arm/mach-imx/syscounter.c                          | 1 +
 arch/arm/mach-k3/common.c                               | 1 +
 arch/arm/mach-k3/sysfw-loader.c                         | 1 +
 arch/arm/mach-mediatek/mt7623/init.c                    | 1 +
 arch/arm/mach-mediatek/mt7629/init.c                    | 1 +
 arch/arm/mach-mediatek/mt8512/init.c                    | 1 +
 arch/arm/mach-mediatek/mt8516/init.c                    | 1 +
 arch/arm/mach-mediatek/mt8518/init.c                    | 1 +
 arch/arm/mach-meson/board-axg.c                         | 1 +
 arch/arm/mach-meson/board-common.c                      | 1 +
 arch/arm/mach-meson/board-g12a.c                        | 1 +
 arch/arm/mach-meson/board-gx.c                          | 1 +
 arch/arm/mach-meson/board-info.c                        | 1 +
 arch/arm/mach-meson/sm.c                                | 1 +
 arch/arm/mach-mvebu/arm64-common.c                      | 1 +
 arch/arm/mach-mvebu/armada3700/cpu.c                    | 1 +
 arch/arm/mach-mvebu/armada8k/dram.c                     | 1 +
 arch/arm/mach-mvebu/dram.c                              | 1 +
 arch/arm/mach-mvebu/spl.c                               | 1 +
 arch/arm/mach-omap2/am33xx/board.c                      | 1 +
 arch/arm/mach-omap2/boot-common.c                       | 1 +
 arch/arm/mach-omap2/hwinit-common.c                     | 1 +
 arch/arm/mach-omap2/omap-cache.c                        | 1 +
 arch/arm/mach-omap2/omap3/am35x_musb.c                  | 1 +
 arch/arm/mach-omap2/omap3/emif4.c                       | 1 +
 arch/arm/mach-omap2/omap3/sdrc.c                        | 1 +
 arch/arm/mach-omap2/timer.c                             | 1 +
 arch/arm/mach-orion5x/dram.c                            | 1 +
 arch/arm/mach-orion5x/timer.c                           | 1 +
 arch/arm/mach-owl/soc.c                                 | 1 +
 arch/arm/mach-rmobile/memmap-gen3.c                     | 1 +
 arch/arm/mach-rockchip/board.c                          | 1 +
 arch/arm/mach-rockchip/rk3036-board-spl.c               | 1 +
 arch/arm/mach-rockchip/rk3036/rk3036.c                  | 1 +
 arch/arm/mach-rockchip/rk3128/rk3128.c                  | 1 +
 arch/arm/mach-rockchip/rk3188/rk3188.c                  | 1 +
 arch/arm/mach-rockchip/rk3288/rk3288.c                  | 1 +
 arch/arm/mach-rockchip/rk3308/rk3308.c                  | 1 +
 arch/arm/mach-rockchip/rk3328/rk3328.c                  | 1 +
 arch/arm/mach-rockchip/rk3368/rk3368.c                  | 1 +
 arch/arm/mach-rockchip/rk3399/rk3399.c                  | 1 +
 arch/arm/mach-rockchip/sdram.c                          | 1 +
 arch/arm/mach-rockchip/spl-boot-order.c                 | 1 +
 arch/arm/mach-rockchip/spl.c                            | 1 +
 arch/arm/mach-snapdragon/pinctrl-snapdragon.h           | 2 +-
 arch/arm/mach-socfpga/board.c                           | 1 +
 arch/arm/mach-socfpga/clock_manager.c                   | 1 +
 arch/arm/mach-socfpga/clock_manager_agilex.c            | 1 +
 arch/arm/mach-socfpga/clock_manager_s10.c               | 1 +
 arch/arm/mach-socfpga/mailbox_s10.c                     | 1 +
 arch/arm/mach-socfpga/misc.c                            | 1 +
 arch/arm/mach-socfpga/misc_gen5.c                       | 1 +
 arch/arm/mach-socfpga/misc_s10.c                        | 1 +
 arch/arm/mach-socfpga/mmu-arm64_s10.c                   | 1 +
 arch/arm/mach-socfpga/reset_manager_arria10.c           | 1 +
 arch/arm/mach-socfpga/reset_manager_s10.c               | 1 +
 arch/arm/mach-socfpga/spl_a10.c                         | 1 +
 arch/arm/mach-socfpga/spl_agilex.c                      | 1 +
 arch/arm/mach-socfpga/spl_gen5.c                        | 1 +
 arch/arm/mach-socfpga/spl_s10.c                         | 1 +
 arch/arm/mach-socfpga/system_manager_s10.c              | 1 +
 arch/arm/mach-stm32mp/boot_params.c                     | 1 +
 arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c         | 1 +
 arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_serial.c  | 1 +
 arch/arm/mach-stm32mp/cpu.c                             | 1 +
 arch/arm/mach-stm32mp/dram_init.c                       | 1 +
 arch/arm/mach-stm32mp/fdt.c                             | 1 +
 arch/arm/mach-stm32mp/spl.c                             | 1 +
 arch/arm/mach-tegra/board.c                             | 1 +
 arch/arm/mach-tegra/board2.c                            | 1 +
 arch/arm/mach-tegra/cboot.c                             | 1 +
 arch/arm/mach-tegra/emc.c                               | 1 +
 arch/arm/mach-tegra/pmc.c                               | 1 +
 arch/arm/mach-tegra/tegra124/xusb-padctl.c              | 1 +
 arch/arm/mach-tegra/tegra20/warmboot.c                  | 1 +
 arch/arm/mach-tegra/tegra210/xusb-padctl.c              | 1 +
 arch/arm/mach-uniphier/board_late_init.c                | 1 +
 arch/arm/mach-versal/clk.c                              | 1 +
 arch/arm/mach-versal/cpu.c                              | 1 +
 arch/arm/mach-versal/mp.c                               | 1 +
 arch/arm/mach-zynq/clk.c                                | 1 +
 arch/arm/mach-zynq/timer.c                              | 1 +
 arch/arm/mach-zynqmp-r5/cpu.c                           | 1 +
 arch/arm/mach-zynqmp/clk.c                              | 1 +
 arch/arm/mach-zynqmp/cpu.c                              | 1 +
 arch/m68k/cpu/mcf5227x/cpu.c                            | 1 +
 arch/m68k/cpu/mcf5227x/speed.c                          | 1 +
 arch/m68k/cpu/mcf523x/cpu.c                             | 1 +
 arch/m68k/cpu/mcf523x/speed.c                           | 1 +
 arch/m68k/cpu/mcf52x2/cpu.c                             | 1 +
 arch/m68k/cpu/mcf52x2/speed.c                           | 1 +
 arch/m68k/cpu/mcf530x/speed.c                           | 1 +
 arch/m68k/cpu/mcf532x/cpu.c                             | 1 +
 arch/m68k/cpu/mcf532x/speed.c                           | 1 +
 arch/m68k/cpu/mcf5445x/cpu.c                            | 1 +
 arch/m68k/cpu/mcf5445x/speed.c                          | 1 +
 arch/m68k/cpu/mcf547x_8x/cpu.c                          | 1 +
 arch/m68k/cpu/mcf547x_8x/slicetimer.c                   | 1 +
 arch/m68k/cpu/mcf547x_8x/speed.c                        | 1 +
 arch/m68k/include/asm/immap.h                           | 1 +
 arch/m68k/lib/bdinfo.c                                  | 1 +
 arch/m68k/lib/bootm.c                                   | 1 +
 arch/m68k/lib/fec.c                                     | 1 +
 arch/m68k/lib/time.c                                    | 1 +
 arch/microblaze/cpu/interrupts.c                        | 1 +
 arch/microblaze/cpu/timer.c                             | 1 +
 arch/microblaze/lib/bootm.c                             | 1 +
 arch/mips/include/asm/io.h                              | 1 +
 arch/mips/lib/boot.c                                    | 1 +
 arch/mips/lib/bootm.c                                   | 1 +
 arch/mips/lib/cache.c                                   | 1 +
 arch/mips/lib/reloc.c                                   | 1 +
 arch/mips/lib/stack.c                                   | 1 +
 arch/mips/lib/traps.c                                   | 1 +
 arch/mips/mach-ath79/ar933x/clk.c                       | 1 +
 arch/mips/mach-ath79/ar934x/clk.c                       | 1 +
 arch/mips/mach-ath79/ar934x/ddr.c                       | 1 +
 arch/mips/mach-ath79/cpu.c                              | 1 +
 arch/mips/mach-ath79/dram.c                             | 1 +
 arch/mips/mach-ath79/include/mach/ath79.h               | 1 +
 arch/mips/mach-ath79/qca953x/clk.c                      | 1 +
 arch/mips/mach-ath79/qca956x/clk.c                      | 1 +
 arch/mips/mach-ath79/qca956x/ddr.c                      | 1 +
 arch/mips/mach-bmips/dram.c                             | 1 +
 arch/mips/mach-jz47xx/jz4780/jz4780.c                   | 1 +
 arch/mips/mach-mscc/cpu.c                               | 1 +
 arch/mips/mach-mscc/dram.c                              | 1 +
 arch/mips/mach-mtmips/cpu.c                             | 1 +
 arch/mips/mach-mtmips/ddr_cal.c                         | 1 +
 arch/mips/mach-mtmips/mt7628/ddr.c                      | 1 +
 arch/mips/mach-mtmips/mt7628/init.c                     | 1 +
 arch/mips/mach-mtmips/spl.c                             | 2 +-
 arch/mips/mach-pic32/cpu.c                              | 1 +
 arch/nds32/lib/bootm.c                                  | 1 +
 arch/nios2/cpu/cpu.c                                    | 1 +
 arch/nios2/include/asm/io.h                             | 3 +++
 arch/nios2/lib/cache.c                                  | 1 +
 arch/powerpc/cpu/mpc83xx/cpu.c                          | 1 +
 arch/powerpc/cpu/mpc83xx/cpu_init.c                     | 1 +
 arch/powerpc/cpu/mpc83xx/fdt.c                          | 1 +
 arch/powerpc/cpu/mpc83xx/interrupts.c                   | 1 +
 arch/powerpc/cpu/mpc83xx/pci.c                          | 1 +
 arch/powerpc/cpu/mpc83xx/pcie.c                         | 1 +
 arch/powerpc/cpu/mpc83xx/spd_sdram.c                    | 1 +
 arch/powerpc/cpu/mpc83xx/speed.c                        | 1 +
 arch/powerpc/cpu/mpc83xx/spl_minimal.c                  | 1 +
 arch/powerpc/cpu/mpc83xx/traps.c                        | 1 +
 arch/powerpc/cpu/mpc85xx/commproc.c                     | 1 +
 arch/powerpc/cpu/mpc85xx/cpu.c                          | 1 +
 arch/powerpc/cpu/mpc85xx/cpu_init_early.c               | 1 +
 arch/powerpc/cpu/mpc85xx/fdt.c                          | 1 +
 arch/powerpc/cpu/mpc85xx/mp.c                           | 1 +
 arch/powerpc/cpu/mpc85xx/serial_scc.c                   | 1 +
 arch/powerpc/cpu/mpc85xx/speed.c                        | 1 +
 arch/powerpc/cpu/mpc85xx/tlb.c                          | 1 +
 arch/powerpc/cpu/mpc85xx/traps.c                        | 1 +
 arch/powerpc/cpu/mpc86xx/cpu.c                          | 1 +
 arch/powerpc/cpu/mpc86xx/cpu_init.c                     | 1 +
 arch/powerpc/cpu/mpc86xx/mp.c                           | 1 +
 arch/powerpc/cpu/mpc86xx/speed.c                        | 1 +
 arch/powerpc/cpu/mpc86xx/traps.c                        | 1 +
 arch/powerpc/cpu/mpc8xx/cpu.c                           | 1 +
 arch/powerpc/cpu/mpc8xx/fdt.c                           | 1 +
 arch/powerpc/cpu/mpc8xx/immap.c                         | 1 +
 arch/powerpc/cpu/mpc8xx/speed.c                         | 1 +
 arch/powerpc/cpu/mpc8xxx/cpu.c                          | 1 +
 arch/powerpc/cpu/mpc8xxx/law.c                          | 1 +
 arch/powerpc/cpu/mpc8xxx/pamu_table.c                   | 1 +
 arch/powerpc/lib/bat_rw.c                               | 1 +
 arch/powerpc/lib/bdinfo.c                               | 1 +
 arch/powerpc/lib/bootm.c                                | 1 +
 arch/powerpc/lib/stack.c                                | 1 +
 arch/riscv/cpu/fu540/cache.c                            | 1 +
 arch/riscv/cpu/fu540/dram.c                             | 1 +
 arch/riscv/cpu/generic/dram.c                           | 1 +
 arch/riscv/lib/andes_plic.c                             | 1 +
 arch/riscv/lib/andes_plmt.c                             | 1 +
 arch/riscv/lib/asm-offsets.c                            | 1 +
 arch/riscv/lib/bootm.c                                  | 1 +
 arch/riscv/lib/fdt_fixup.c                              | 1 +
 arch/riscv/lib/image.c                                  | 1 +
 arch/riscv/lib/sifive_clint.c                           | 1 +
 arch/riscv/lib/smp.c                                    | 1 +
 arch/riscv/lib/spl.c                                    | 1 +
 arch/sandbox/cpu/cpu.c                                  | 1 +
 arch/sandbox/cpu/spl.c                                  | 1 +
 arch/sandbox/cpu/start.c                                | 1 +
 arch/sh/lib/board.c                                     | 1 +
 arch/x86/cpu/apollolake/cpu_spl.c                       | 1 +
 arch/x86/cpu/apollolake/fsp_s.c                         | 1 +
 arch/x86/cpu/baytrail/fsp_configs.c                     | 1 +
 arch/x86/cpu/braswell/fsp_configs.c                     | 1 +
 arch/x86/cpu/broadwell/cpu.c                            | 1 +
 arch/x86/cpu/broadwell/cpu_from_spl.c                   | 1 +
 arch/x86/cpu/broadwell/cpu_full.c                       | 1 +
 arch/x86/cpu/broadwell/lpc.c                            | 1 +
 arch/x86/cpu/broadwell/northbridge.c                    | 1 +
 arch/x86/cpu/broadwell/pch.c                            | 1 +
 arch/x86/cpu/broadwell/pinctrl_broadwell.c              | 1 +
 arch/x86/cpu/broadwell/sata.c                           | 1 +
 arch/x86/cpu/broadwell/sdram.c                          | 1 +
 arch/x86/cpu/coreboot/coreboot.c                        | 1 +
 arch/x86/cpu/coreboot/sdram.c                           | 1 +
 arch/x86/cpu/coreboot/tables.c                          | 1 +
 arch/x86/cpu/cpu.c                                      | 1 +
 arch/x86/cpu/cpu_x86.c                                  | 1 +
 arch/x86/cpu/efi/payload.c                              | 1 +
 arch/x86/cpu/efi/sdram.c                                | 1 +
 arch/x86/cpu/i386/cpu.c                                 | 1 +
 arch/x86/cpu/i386/interrupt.c                           | 1 +
 arch/x86/cpu/intel_common/cpu.c                         | 1 +
 arch/x86/cpu/intel_common/cpu_from_spl.c                | 1 +
 arch/x86/cpu/intel_common/itss.c                        | 1 +
 arch/x86/cpu/intel_common/lpc.c                         | 1 +
 arch/x86/cpu/intel_common/microcode.c                   | 1 +
 arch/x86/cpu/intel_common/mrc.c                         | 1 +
 arch/x86/cpu/irq.c                                      | 1 +
 arch/x86/cpu/ivybridge/bd82x6x.c                        | 1 +
 arch/x86/cpu/ivybridge/cpu.c                            | 1 +
 arch/x86/cpu/ivybridge/fsp_configs.c                    | 1 +
 arch/x86/cpu/ivybridge/lpc.c                            | 1 +
 arch/x86/cpu/ivybridge/model_206ax.c                    | 1 +
 arch/x86/cpu/ivybridge/northbridge.c                    | 1 +
 arch/x86/cpu/ivybridge/sata.c                           | 1 +
 arch/x86/cpu/ivybridge/sdram_nop.c                      | 1 +
 arch/x86/cpu/mp_init.c                                  | 1 +
 arch/x86/cpu/mtrr.c                                     | 1 +
 arch/x86/cpu/qemu/dram.c                                | 1 +
 arch/x86/cpu/qemu/e820.c                                | 1 +
 arch/x86/cpu/quark/acpi.c                               | 1 +
 arch/x86/cpu/quark/dram.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/turbo.c                                    | 1 +
 arch/x86/cpu/x86_64/cpu.c                               | 1 +
 arch/x86/include/asm/cpu_common.h                       | 1 +
 arch/x86/include/asm/fast_spi.h                         | 4 +++-
 arch/x86/include/asm/io.h                               | 2 +-
 arch/x86/include/asm/mp.h                               | 2 ++
 arch/x86/lib/acpi_s3.c                                  | 1 +
 arch/x86/lib/acpi_table.c                               | 1 +
 arch/x86/lib/asm-offsets.c                              | 1 +
 arch/x86/lib/bios.c                                     | 1 +
 arch/x86/lib/bootm.c                                    | 1 +
 arch/x86/lib/cmd_boot.c                                 | 1 +
 arch/x86/lib/coreboot_table.c                           | 1 +
 arch/x86/lib/e820.c                                     | 1 +
 arch/x86/lib/fsp/fsp_common.c                           | 1 +
 arch/x86/lib/fsp/fsp_dram.c                             | 1 +
 arch/x86/lib/fsp/fsp_graphics.c                         | 1 +
 arch/x86/lib/fsp1/fsp_common.c                          | 1 +
 arch/x86/lib/fsp1/fsp_dram.c                            | 1 +
 arch/x86/lib/fsp2/fsp_dram.c                            | 1 +
 arch/x86/lib/fsp2/fsp_meminit.c                         | 1 +
 arch/x86/lib/fsp2/fsp_silicon_init.c                    | 1 +
 arch/x86/lib/fsp2/fsp_support.c                         | 1 +
 arch/x86/lib/init_helpers.c                             | 1 +
 arch/x86/lib/mpspec.c                                   | 1 +
 arch/x86/lib/mrccache.c                                 | 1 +
 arch/x86/lib/physmem.c                                  | 1 +
 arch/x86/lib/pinctrl_ich6.c                             | 1 +
 arch/x86/lib/pirq_routing.c                             | 1 +
 arch/x86/lib/relocate.c                                 | 1 +
 arch/x86/lib/spl.c                                      | 1 +
 arch/x86/lib/tables.c                                   | 1 +
 arch/x86/lib/tpl.c                                      | 1 +
 arch/xtensa/lib/bootm.c                                 | 1 +
 board/AndesTech/adp-ae3xx/adp-ae3xx.c                   | 1 +
 board/AndesTech/adp-ag101p/adp-ag101p.c                 | 1 +
 board/AndesTech/ax25-ae350/ax25-ae350.c                 | 1 +
 board/Arcturus/ucp1020/spl.c                            | 1 +
 board/BuR/brppt1/board.c                                | 1 +
 board/BuR/brppt2/board.c                                | 1 +
 board/BuR/brsmarc1/board.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/turris_mox.c                    | 1 +
 board/CZ.NIC/turris_omnia/turris_omnia.c                | 1 +
 board/CarMediaLab/flea3/flea3.c                         | 1 +
 board/LaCie/edminiv2/edminiv2.c                         | 1 +
 board/LaCie/net2big_v2/net2big_v2.c                     | 1 +
 board/LaCie/netspace_v2/netspace_v2.c                   | 1 +
 board/Marvell/aspenite/aspenite.c                       | 1 +
 board/Marvell/db-88f6281-bp/db-88f6281-bp.c             | 1 +
 board/Marvell/db-88f6720/db-88f6720.c                   | 1 +
 board/Marvell/db-88f6820-amc/db-88f6820-amc.c           | 1 +
 board/Marvell/db-88f6820-gp/db-88f6820-gp.c             | 1 +
 board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c             | 1 +
 board/Marvell/db-xc3-24g4xg/db-xc3-24g4xg.c             | 1 +
 board/Marvell/dreamplug/dreamplug.c                     | 1 +
 board/Marvell/gplugd/gplugd.c                           | 1 +
 board/Marvell/guruplug/guruplug.c                       | 1 +
 board/Marvell/mvebu_armada-37xx/board.c                 | 1 +
 board/Marvell/mvebu_armada-8k/board.c                   | 1 +
 board/Marvell/openrd/openrd.c                           | 1 +
 board/Marvell/sheevaplug/sheevaplug.c                   | 1 +
 board/Seagate/dockstar/dockstar.c                       | 1 +
 board/Seagate/goflexhome/goflexhome.c                   | 1 +
 board/Seagate/nas220/nas220.c                           | 1 +
 board/Synology/ds109/ds109.c                            | 1 +
 board/Synology/ds414/ds414.c                            | 1 +
 board/advantech/dms-ba16/dms-ba16.c                     | 1 +
 board/advantech/imx8qm_rom7720_a1/imx8qm_rom7720_a1.c   | 1 +
 board/advantech/imx8qm_rom7720_a1/spl.c                 | 1 +
 board/alliedtelesis/SBx81LIFKW/sbx81lifkw.c             | 1 +
 board/alliedtelesis/SBx81LIFXCAT/sbx81lifxcat.c         | 1 +
 board/alliedtelesis/common/gpio_hog.c                   | 1 +
 board/alliedtelesis/x530/x530.c                         | 1 +
 board/amazon/kc1/kc1.c                                  | 1 +
 board/aristainetos/aristainetos.c                       | 1 +
 board/armadeus/apf27/apf27.c                            | 1 +
 board/armltd/integrator/integrator.c                    | 1 +
 board/armltd/vexpress/vexpress_common.c                 | 1 +
 board/armltd/vexpress64/vexpress64.c                    | 1 +
 board/astro/mcf5373l/mcf5373l.c                         | 1 +
 board/atmark-techno/armadillo-800eva/armadillo-800eva.c | 1 +
 board/atmel/at91rm9200ek/at91rm9200ek.c                 | 1 +
 board/atmel/at91sam9260ek/at91sam9260ek.c               | 1 +
 board/atmel/at91sam9261ek/at91sam9261ek.c               | 1 +
 board/atmel/at91sam9263ek/at91sam9263ek.c               | 1 +
 board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c         | 1 +
 board/atmel/at91sam9n12ek/at91sam9n12ek.c               | 1 +
 board/atmel/at91sam9rlek/at91sam9rlek.c                 | 1 +
 board/atmel/at91sam9x5ek/at91sam9x5ek.c                 | 1 +
 board/atmel/common/video_display.c                      | 1 +
 board/atmel/sam9x60ek/sam9x60ek.c                       | 1 +
 board/atmel/sama5d27_som1_ek/sama5d27_som1_ek.c         | 1 +
 board/atmel/sama5d27_wlsom1_ek/sama5d27_wlsom1_ek.c     | 1 +
 board/atmel/sama5d2_icp/sama5d2_icp.c                   | 1 +
 board/atmel/sama5d2_ptc_ek/sama5d2_ptc_ek.c             | 1 +
 board/atmel/sama5d2_xplained/sama5d2_xplained.c         | 1 +
 board/atmel/sama5d3_xplained/sama5d3_xplained.c         | 1 +
 board/atmel/sama5d3xek/sama5d3xek.c                     | 1 +
 board/atmel/sama5d4_xplained/sama5d4_xplained.c         | 1 +
 board/atmel/sama5d4ek/sama5d4ek.c                       | 1 +
 board/bachmann/ot1200/ot1200.c                          | 1 +
 board/barco/platinum/platinum.c                         | 1 +
 board/barco/titanium/titanium.c                         | 1 +
 board/beacon/beacon-rzg2m/beacon-rzg2m.c                | 1 +
 board/beacon/imx8mm/imx8mm_beacon.c                     | 1 +
 board/beacon/imx8mm/spl.c                               | 1 +
 board/beckhoff/mx53cx9020/mx53cx9020.c                  | 1 +
 board/bluegiga/apx4devkit/apx4devkit.c                  | 1 +
 board/bluewater/gurnard/gurnard.c                       | 1 +
 board/bluewater/snapper9260/snapper9260.c               | 1 +
 board/bosch/guardian/board.c                            | 1 +
 board/bosch/shc/board.c                                 | 1 +
 board/boundary/nitrogen6x/nitrogen6x.c                  | 1 +
 board/broadcom/bcm23550_w1d/bcm23550_w1d.c              | 1 +
 board/broadcom/bcm28155_ap/bcm28155_ap.c                | 1 +
 board/broadcom/bcm_ep/board.c                           | 1 +
 board/broadcom/bcmns2/northstar2.c                      | 1 +
 board/broadcom/bcmns3/ns3.c                             | 1 +
 board/broadcom/bcmstb/bcmstb.c                          | 1 +
 board/bticino/mamoj/mamoj.c                             | 1 +
 board/bticino/mamoj/spl.c                               | 1 +
 board/buffalo/lsxl/lsxl.c                               | 1 +
 board/calao/usb_a9263/usb_a9263.c                       | 1 +
 board/cavium/thunderx/thunderx.c                        | 1 +
 board/ccv/xpress/xpress.c                               | 1 +
 board/cirrus/edb93xx/edb93xx.c                          | 1 +
 board/cloudengines/pogo_e02/pogo_e02.c                  | 1 +
 board/cobra5272/cobra5272.c                             | 1 +
 board/compulab/cl-som-imx7/cl-som-imx7.c                | 1 +
 board/compulab/cm_fx6/cm_fx6.c                          | 1 +
 board/compulab/cm_t335/cm_t335.c                        | 1 +
 board/compulab/cm_t43/cm_t43.c                          | 1 +
 board/congatec/cgtqmx6eval/cgtqmx6eval.c                | 1 +
 board/corscience/tricorder/tricorder.c                  | 1 +
 board/cortina/presidio-asic/presidio.c                  | 1 +
 board/creative/xfi3/xfi3.c                              | 1 +
 board/cssi/MCR3000/MCR3000.c                            | 1 +
 board/d-link/dns325/dns325.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/ea/mx7ulp_com/mx7ulp_com.c                        | 1 +
 board/eets/pdu001/board.c                               | 1 +
 board/egnite/ethernut5/ethernut5.c                      | 1 +
 board/el/el6x/el6x.c                                    | 1 +
 board/elgin/elgin_rv1108/elgin_rv1108.c                 | 1 +
 board/embest/mx6boards/mx6boards.c                      | 1 +
 board/engicam/common/board.c                            | 1 +
 board/esd/meesc/meesc.c                                 | 1 +
 board/esd/vme8349/vme8349.c                             | 1 +
 board/firefly/firefly-rk3288/firefly-rk3288.c           | 1 +
 board/freescale/common/arm_sleep.c                      | 1 +
 board/freescale/common/emc2305.c                        | 1 +
 board/freescale/common/mpc85xx_sleep.c                  | 1 +
 board/freescale/corenet_ds/corenet_ds.c                 | 1 +
 board/freescale/corenet_ds/ddr.c                        | 1 +
 board/freescale/imx8mm_evk/imx8mm_evk.c                 | 1 +
 board/freescale/imx8mm_evk/spl.c                        | 1 +
 board/freescale/imx8mn_evk/imx8mn_evk.c                 | 1 +
 board/freescale/imx8mn_evk/spl.c                        | 1 +
 board/freescale/imx8mp_evk/imx8mp_evk.c                 | 1 +
 board/freescale/imx8mp_evk/spl.c                        | 1 +
 board/freescale/imx8mq_evk/imx8mq_evk.c                 | 1 +
 board/freescale/imx8mq_evk/spl.c                        | 1 +
 board/freescale/imx8qm_mek/imx8qm_mek.c                 | 1 +
 board/freescale/imx8qm_mek/spl.c                        | 1 +
 board/freescale/imx8qxp_mek/imx8qxp_mek.c               | 1 +
 board/freescale/imx8qxp_mek/spl.c                       | 1 +
 board/freescale/imxrt1020-evk/imxrt1020-evk.c           | 1 +
 board/freescale/imxrt1050-evk/imxrt1050-evk.c           | 1 +
 board/freescale/ls1012afrdm/ls1012afrdm.c               | 1 +
 board/freescale/ls1012aqds/ls1012aqds.c                 | 1 +
 board/freescale/ls1012ardb/ls1012ardb.c                 | 1 +
 board/freescale/ls1021aiot/dcu.c                        | 1 +
 board/freescale/ls1021aiot/ls1021aiot.c                 | 1 +
 board/freescale/ls1021aqds/dcu.c                        | 1 +
 board/freescale/ls1021aqds/ddr.c                        | 1 +
 board/freescale/ls1021atsn/ls1021atsn.c                 | 1 +
 board/freescale/ls1021atwr/dcu.c                        | 1 +
 board/freescale/ls1021atwr/ls1021atwr.c                 | 1 +
 board/freescale/ls1028a/ddr.c                           | 1 +
 board/freescale/ls1028a/ls1028a.c                       | 1 +
 board/freescale/ls1043aqds/ddr.c                        | 1 +
 board/freescale/ls1043aqds/ls1043aqds.c                 | 1 +
 board/freescale/ls1043ardb/ddr.c                        | 1 +
 board/freescale/ls1043ardb/ls1043ardb.c                 | 1 +
 board/freescale/ls1046afrwy/ddr.c                       | 1 +
 board/freescale/ls1046afrwy/ls1046afrwy.c               | 1 +
 board/freescale/ls1046aqds/ddr.c                        | 1 +
 board/freescale/ls1046aqds/ls1046aqds.c                 | 1 +
 board/freescale/ls1046ardb/ddr.c                        | 1 +
 board/freescale/ls1046ardb/ls1046ardb.c                 | 1 +
 board/freescale/ls1088a/ddr.c                           | 1 +
 board/freescale/ls1088a/ls1088a.c                       | 1 +
 board/freescale/ls2080a/ddr.c                           | 1 +
 board/freescale/ls2080a/ls2080a.c                       | 1 +
 board/freescale/ls2080aqds/ddr.c                        | 1 +
 board/freescale/ls2080aqds/ls2080aqds.c                 | 1 +
 board/freescale/ls2080ardb/ddr.c                        | 1 +
 board/freescale/ls2080ardb/eth_ls2080rdb.c              | 1 +
 board/freescale/ls2080ardb/ls2080ardb.c                 | 1 +
 board/freescale/lx2160a/ddr.c                           | 1 +
 board/freescale/lx2160a/eth_lx2160aqds.c                | 1 +
 board/freescale/lx2160a/eth_lx2160ardb.c                | 1 +
 board/freescale/lx2160a/lx2160a.c                       | 1 +
 board/freescale/m5208evbe/m5208evbe.c                   | 1 +
 board/freescale/m52277evb/m52277evb.c                   | 1 +
 board/freescale/m5235evb/m5235evb.c                     | 1 +
 board/freescale/m5249evb/m5249evb.c                     | 1 +
 board/freescale/m5253demo/m5253demo.c                   | 1 +
 board/freescale/m5272c3/m5272c3.c                       | 1 +
 board/freescale/m5275evb/m5275evb.c                     | 1 +
 board/freescale/m5282evb/m5282evb.c                     | 1 +
 board/freescale/m53017evb/m53017evb.c                   | 1 +
 board/freescale/m5329evb/m5329evb.c                     | 1 +
 board/freescale/m5373evb/m5373evb.c                     | 1 +
 board/freescale/m54418twr/m54418twr.c                   | 1 +
 board/freescale/m54451evb/m54451evb.c                   | 1 +
 board/freescale/m54455evb/m54455evb.c                   | 1 +
 board/freescale/m547xevb/m547xevb.c                     | 1 +
 board/freescale/m548xevb/m548xevb.c                     | 1 +
 board/freescale/mpc8308rdb/sdram.c                      | 1 +
 board/freescale/mpc8313erdb/mpc8313erdb.c               | 1 +
 board/freescale/mpc8313erdb/sdram.c                     | 1 +
 board/freescale/mpc8315erdb/mpc8315erdb.c               | 1 +
 board/freescale/mpc8315erdb/sdram.c                     | 1 +
 board/freescale/mpc8323erdb/mpc8323erdb.c               | 1 +
 board/freescale/mpc832xemds/mpc832xemds.c               | 1 +
 board/freescale/mpc8349emds/mpc8349emds.c               | 1 +
 board/freescale/mpc8349itx/mpc8349itx.c                 | 1 +
 board/freescale/mpc837xemds/mpc837xemds.c               | 1 +
 board/freescale/mpc837xerdb/mpc837xerdb.c               | 1 +
 board/freescale/mpc8610hpcd/mpc8610hpcd.c               | 1 +
 board/freescale/mpc8641hpcn/mpc8641hpcn.c               | 1 +
 board/freescale/mx23evk/mx23evk.c                       | 1 +
 board/freescale/mx25pdk/mx25pdk.c                       | 1 +
 board/freescale/mx28evk/mx28evk.c                       | 1 +
 board/freescale/mx35pdk/mx35pdk.c                       | 1 +
 board/freescale/mx51evk/mx51evk.c                       | 1 +
 board/freescale/mx53ard/mx53ard.c                       | 1 +
 board/freescale/mx53evk/mx53evk.c                       | 1 +
 board/freescale/mx53loco/mx53loco.c                     | 1 +
 board/freescale/mx53smd/mx53smd.c                       | 1 +
 board/freescale/mx6memcal/mx6memcal.c                   | 1 +
 board/freescale/mx6memcal/spl.c                         | 1 +
 board/freescale/mx6qarm2/mx6qarm2.c                     | 1 +
 board/freescale/mx6sabreauto/mx6sabreauto.c             | 1 +
 board/freescale/mx6sabresd/mx6sabresd.c                 | 1 +
 board/freescale/mx6slevk/mx6slevk.c                     | 1 +
 board/freescale/mx6sllevk/mx6sllevk.c                   | 1 +
 board/freescale/mx6sxsabreauto/mx6sxsabreauto.c         | 1 +
 board/freescale/mx6sxsabresd/mx6sxsabresd.c             | 1 +
 board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c       | 1 +
 board/freescale/mx6ullevk/mx6ullevk.c                   | 1 +
 board/freescale/mx7dsabresd/mx7dsabresd.c               | 1 +
 board/freescale/mx7ulp_evk/mx7ulp_evk.c                 | 1 +
 board/freescale/p1010rdb/ddr.c                          | 1 +
 board/freescale/p1010rdb/p1010rdb.c                     | 1 +
 board/freescale/p1010rdb/spl.c                          | 1 +
 board/freescale/p1023rdb/p1023rdb.c                     | 1 +
 board/freescale/p1_p2_rdb_pc/spl.c                      | 1 +
 board/freescale/p2041rdb/ddr.c                          | 1 +
 board/freescale/p2041rdb/p2041rdb.c                     | 1 +
 board/freescale/qemu-ppce500/qemu-ppce500.c             | 1 +
 board/freescale/s32v234evb/s32v234evb.c                 | 1 +
 board/freescale/t102xrdb/ddr.c                          | 1 +
 board/freescale/t102xrdb/spl.c                          | 1 +
 board/freescale/t102xrdb/t102xrdb.c                     | 1 +
 board/freescale/t104xrdb/ddr.c                          | 1 +
 board/freescale/t104xrdb/spl.c                          | 1 +
 board/freescale/t104xrdb/t104xrdb.c                     | 1 +
 board/freescale/t208xqds/ddr.c                          | 1 +
 board/freescale/t208xqds/spl.c                          | 1 +
 board/freescale/t208xqds/t208xqds.c                     | 1 +
 board/freescale/t208xrdb/ddr.c                          | 1 +
 board/freescale/t208xrdb/spl.c                          | 1 +
 board/freescale/t208xrdb/t208xrdb.c                     | 1 +
 board/freescale/t4rdb/ddr.c                             | 1 +
 board/freescale/t4rdb/spl.c                             | 1 +
 board/freescale/t4rdb/t4240rdb.c                        | 1 +
 board/freescale/vf610twr/vf610twr.c                     | 1 +
 board/friendlyarm/nanopi2/board.c                       | 1 +
 board/gardena/smart-gateway-at91sam/board.c             | 1 +
 board/gateworks/gw_ventana/gw_ventana.c                 | 1 +
 board/gdsys/a38x/controlcenterdc.c                      | 1 +
 board/gdsys/a38x/hydra.c                                | 1 +
 board/gdsys/mpc8308/gazerbeam.c                         | 1 +
 board/gdsys/mpc8308/sdram.c                             | 1 +
 board/ge/bx50v3/bx50v3.c                                | 1 +
 board/ge/mx53ppd/mx53ppd.c                              | 1 +
 board/google/imx8mq_phanbell/imx8mq_phanbell.c          | 1 +
 board/google/imx8mq_phanbell/spl.c                      | 1 +
 board/google/veyron/veyron.c                            | 1 +
 board/grinn/chiliboard/board.c                          | 1 +
 board/grinn/liteboard/board.c                           | 1 +
 board/highbank/highbank.c                               | 1 +
 board/hisilicon/hikey/hikey.c                           | 1 +
 board/hisilicon/hikey960/hikey960.c                     | 1 +
 board/hisilicon/poplar/poplar.c                         | 1 +
 board/ids/ids8313/ids8313.c                             | 1 +
 board/imgtec/boston/ddr.c                               | 1 +
 board/imgtec/boston/dt.c                                | 1 +
 board/imgtec/ci20/ci20.c                                | 1 +
 board/imgtec/malta/malta.c                              | 1 +
 board/imgtec/xilfpga/xilfpga.c                          | 1 +
 board/inversepath/usbarmory/usbarmory.c                 | 1 +
 board/iomega/iconnect/iconnect.c                        | 1 +
 board/isee/igep003x/board.c                             | 1 +
 board/isee/igep00x0/common.c                            | 1 +
 board/k+p/kp_imx53/kp_imx53.c                           | 1 +
 board/k+p/kp_imx6q_tpc/kp_imx6q_tpc.c                   | 1 +
 board/k+p/kp_imx6q_tpc/kp_imx6q_tpc_spl.c               | 1 +
 board/keymile/common/common.c                           | 1 +
 board/keymile/km83xx/km83xx.c                           | 1 +
 board/keymile/km_arm/km_arm.c                           | 1 +
 board/keymile/kmp204x/ddr.c                             | 1 +
 board/kmc/kzm9g/kzm9g.c                                 | 1 +
 board/kobol/helios4/helios4.c                           | 1 +
 board/kosagi/novena/novena.c                            | 1 +
 board/l+g/vinco/vinco.c                                 | 1 +
 board/laird/wb45n/wb45n.c                               | 1 +
 board/laird/wb50n/wb50n.c                               | 1 +
 board/lego/ev3/legoev3.c                                | 1 +
 board/lg/sniper/sniper.c                                | 1 +
 board/liebherr/display5/display5.c                      | 1 +
 board/liebherr/display5/spl.c                           | 1 +
 board/liebherr/mccmon6/mccmon6.c                        | 1 +
 board/liebherr/xea/xea.c                                | 1 +
 board/logicpd/am3517evm/am3517evm.c                     | 1 +
 board/logicpd/imx6/imx6logic.c                          | 1 +
 board/logicpd/omap3som/omap3logic.c                     | 1 +
 board/maxbcm/maxbcm.c                                   | 1 +
 board/mediatek/mt7622/mt7622_rfb.c                      | 1 +
 board/mediatek/mt7623/mt7623_rfb.c                      | 1 +
 board/mediatek/mt7629/mt7629_rfb.c                      | 1 +
 board/mediatek/mt8512/mt8512.c                          | 1 +
 board/mediatek/mt8518/mt8518_ap1.c                      | 1 +
 board/menlo/m53menlo/m53menlo.c                         | 1 +
 board/mikrotik/crs3xx-98dx3236/crs3xx-98dx3236.c        | 1 +
 board/mini-box/picosam9g45/picosam9g45.c                | 1 +
 board/mpc8308_p1m/sdram.c                               | 1 +
 board/mscc/jr2/jr2.c                                    | 1 +
 board/mscc/luton/luton.c                                | 1 +
 board/mscc/ocelot/ocelot.c                              | 1 +
 board/mscc/serval/serval.c                              | 1 +
 board/mscc/servalt/servalt.c                            | 1 +
 board/nokia/rx51/rx51.c                                 | 1 +
 board/novtech/meerkat96/meerkat96.c                     | 1 +
 board/olimex/mx23_olinuxino/mx23_olinuxino.c            | 1 +
 board/phytec/pcl063/pcl063.c                            | 1 +
 board/phytec/pcm052/pcm052.c                            | 1 +
 board/phytec/pcm058/pcm058.c                            | 1 +
 board/phytec/pfla02/pfla02.c                            | 1 +
 board/phytec/phycore_am335x_r2/board.c                  | 1 +
 board/phytec/phycore_rk3288/phycore-rk3288.c            | 1 +
 board/phytium/durian/durian.c                           | 1 +
 board/ppcag/bg0900/bg0900.c                             | 1 +
 board/qemu-mips/qemu-mips.c                             | 1 +
 board/qualcomm/dragonboard410c/dragonboard410c.c        | 1 +
 board/qualcomm/dragonboard820c/dragonboard820c.c        | 1 +
 board/raidsonic/ib62x0/ib62x0.c                         | 1 +
 board/renesas/alt/alt.c                                 | 1 +
 board/renesas/blanche/blanche.c                         | 1 +
 board/renesas/condor/condor.c                           | 1 +
 board/renesas/draak/draak.c                             | 1 +
 board/renesas/eagle/eagle.c                             | 1 +
 board/renesas/ebisu/ebisu.c                             | 1 +
 board/renesas/gose/gose.c                               | 1 +
 board/renesas/grpeach/grpeach.c                         | 1 +
 board/renesas/koelsch/koelsch.c                         | 1 +
 board/renesas/lager/lager.c                             | 1 +
 board/renesas/porter/porter.c                           | 1 +
 board/renesas/rcar-common/common.c                      | 1 +
 board/renesas/salvator-x/salvator-x.c                   | 1 +
 board/renesas/silk/silk.c                               | 1 +
 board/renesas/stout/stout.c                             | 1 +
 board/renesas/ulcb/ulcb.c                               | 1 +
 board/rockchip/evb_rk3308/evb_rk3308.c                  | 1 +
 board/rockchip/evb_rv1108/evb_rv1108.c                  | 1 +
 board/ronetix/pm9261/pm9261.c                           | 1 +
 board/ronetix/pm9263/pm9263.c                           | 1 +
 board/ronetix/pm9g45/pm9g45.c                           | 1 +
 board/samsung/arndale/arndale.c                         | 1 +
 board/samsung/common/board.c                            | 1 +
 board/samsung/common/exynos5-dt-types.c                 | 1 +
 board/samsung/common/exynos5-dt.c                       | 1 +
 board/samsung/common/misc.c                             | 1 +
 board/samsung/goni/goni.c                               | 1 +
 board/samsung/odroid/odroid.c                           | 1 +
 board/samsung/smdkc100/smdkc100.c                       | 1 +
 board/samsung/smdkv310/smdkv310.c                       | 1 +
 board/samsung/universal_c210/universal.c                | 1 +
 board/sandbox/sandbox.c                                 | 1 +
 board/sandisk/sansa_fuze_plus/sfp.c                     | 1 +
 board/sbc8349/sbc8349.c                                 | 1 +
 board/sbc8641d/sbc8641d.c                               | 1 +
 board/schulercontrol/sc_sps_1/sc_sps_1.c                | 1 +
 board/seco/mx6quq7/mx6quq7.c                            | 1 +
 board/siemens/capricorn/spl.c                           | 1 +
 board/siemens/common/board.c                            | 1 +
 board/siemens/corvus/board.c                            | 1 +
 board/siemens/smartweb/smartweb.c                       | 1 +
 board/siemens/taurus/taurus.c                           | 1 +
 board/sks-kinkel/sksimx6/sksimx6.c                      | 1 +
 board/socrates/socrates.c                               | 1 +
 board/softing/vining_2000/vining_2000.c                 | 1 +
 board/softing/vining_fpga/socfpga.c                     | 1 +
 board/solidrun/clearfog/clearfog.c                      | 1 +
 board/solidrun/common/tlv_data.c                        | 1 +
 board/solidrun/mx6cuboxi/mx6cuboxi.c                    | 1 +
 board/somlabs/visionsom-6ull/visionsom-6ull.c           | 1 +
 board/st/common/stm32mp_mtdparts.c                      | 1 +
 board/st/stih410-b2260/board.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/stm32f746-disco/stm32f746-disco.c              | 1 +
 board/st/stm32h743-disco/stm32h743-disco.c              | 1 +
 board/st/stm32h743-eval/stm32h743-eval.c                | 1 +
 board/st/stm32mp1/stm32mp1.c                            | 1 +
 board/st/stv0991/stv0991.c                              | 1 +
 board/ste/stemmy/stemmy.c                               | 1 +
 board/sunxi/board.c                                     | 1 +
 board/synopsys/axs10x/axs10x.c                          | 1 +
 board/synopsys/emsdp/emsdp.c                            | 1 +
 board/synopsys/hsdk/hsdk.c                              | 1 +
 board/synopsys/iot_devkit/iot_devkit.c                  | 1 +
 board/sysam/amcore/amcore.c                             | 1 +
 board/sysam/stmark2/stmark2.c                           | 1 +
 board/syteco/zmx25/zmx25.c                              | 1 +
 board/tbs/tbs2910/tbs2910.c                             | 2 ++
 board/tcl/sl50/board.c                                  | 1 +
 board/technexion/pico-imx6/pico-imx6.c                  | 3 ++-
 board/technexion/pico-imx6ul/pico-imx6ul.c              | 1 +
 board/technexion/pico-imx7d/pico-imx7d.c                | 1 +
 board/technexion/pico-imx8mq/pico-imx8mq.c              | 1 +
 board/technexion/pico-imx8mq/spl.c                      | 1 +
 board/technexion/tao3530/tao3530.c                      | 1 +
 board/technologic/ts4600/ts4600.c                       | 1 +
 board/technologic/ts4800/ts4800.c                       | 1 +
 board/theadorable/theadorable.c                         | 1 +
 board/ti/am335x/board.c                                 | 1 +
 board/ti/am3517crane/am3517crane.c                      | 1 +
 board/ti/am43xx/board.c                                 | 1 +
 board/ti/am57xx/board.c                                 | 1 +
 board/ti/am65x/evm.c                                    | 1 +
 board/ti/beagle/beagle.c                                | 1 +
 board/ti/dra7xx/evm.c                                   | 1 +
 board/ti/evm/evm.c                                      | 1 +
 board/ti/j721e/evm.c                                    | 1 +
 board/ti/ks2_evm/board.c                                | 1 +
 board/ti/omap5_uevm/evm.c                               | 1 +
 board/ti/panda/panda.c                                  | 1 +
 board/ti/sdp4430/sdp.c                                  | 1 +
 board/ti/ti816x/evm.c                                   | 1 +
 board/timll/devkit3250/devkit3250.c                     | 1 +
 board/timll/devkit8000/devkit8000.c                     | 1 +
 board/toradex/apalis-imx8/apalis-imx8.c                 | 1 +
 board/toradex/apalis_imx6/apalis_imx6.c                 | 1 +
 board/toradex/apalis_t30/apalis_t30.c                   | 1 +
 board/toradex/colibri-imx6ull/colibri-imx6ull.c         | 1 +
 board/toradex/colibri-imx8x/colibri-imx8x.c             | 1 +
 board/toradex/colibri_imx6/colibri_imx6.c               | 1 +
 board/toradex/colibri_imx7/colibri_imx7.c               | 1 +
 board/toradex/colibri_pxa270/colibri_pxa270.c           | 1 +
 board/toradex/colibri_t20/colibri_t20.c                 | 1 +
 board/toradex/colibri_vf/colibri_vf.c                   | 1 +
 board/toradex/common/tdx-cfg-block.c                    | 1 +
 board/toradex/verdin-imx8mm/spl.c                       | 1 +
 board/toradex/verdin-imx8mm/verdin-imx8mm.c             | 1 +
 board/tqc/tqm834x/tqm834x.c                             | 1 +
 board/tqc/tqma6/tqma6.c                                 | 1 +
 board/udoo/neo/neo.c                                    | 1 +
 board/udoo/udoo.c                                       | 1 +
 board/variscite/dart_6ul/dart_6ul.c                     | 1 +
 board/varisys/cyrus/ddr.c                               | 1 +
 board/ve8313/ve8313.c                                   | 1 +
 board/vscom/baltos/board.c                              | 1 +
 board/wandboard/wandboard.c                             | 1 +
 board/warp/warp.c                                       | 1 +
 board/warp7/warp7.c                                     | 1 +
 board/work-microwave/work_92105/work_92105.c            | 1 +
 board/xes/xpedite517x/xpedite517x.c                     | 1 +
 board/xilinx/common/board.c                             | 1 +
 board/xilinx/microblaze-generic/microblaze-generic.c    | 1 +
 board/xilinx/versal/board.c                             | 1 +
 board/xilinx/zynq/board.c                               | 1 +
 board/xilinx/zynq/bootimg.c                             | 1 +
 board/xilinx/zynq/cmds.c                                | 1 +
 board/xilinx/zynqmp/zynqmp.c                            | 1 +
 board/zyxel/nsa310s/nsa310s.c                           | 1 +
 cmd/acpi.c                                              | 1 +
 cmd/bdinfo.c                                            | 1 +
 cmd/bedbug.c                                            | 1 +
 cmd/bootefi.c                                           | 1 +
 cmd/booti.c                                             | 1 +
 cmd/bootm.c                                             | 1 +
 cmd/date.c                                              | 1 +
 cmd/efi.c                                               | 1 +
 cmd/load.c                                              | 1 +
 cmd/log.c                                               | 1 +
 cmd/mem.c                                               | 1 +
 cmd/mtdparts.c                                          | 1 +
 cmd/nvedit.c                                            | 1 +
 cmd/pxe_utils.h                                         | 2 ++
 cmd/sb.c                                                | 1 +
 cmd/sound.c                                             | 1 +
 cmd/spl.c                                               | 1 +
 cmd/ti/ddr3.c                                           | 1 +
 cmd/tlv_eeprom.c                                        | 1 +
 cmd/x86/fsp.c                                           | 1 +
 cmd/x86/hob.c                                           | 1 +
 common/autoboot.c                                       | 1 +
 common/bloblist.c                                       | 1 +
 common/board_f.c                                        | 1 +
 common/board_info.c                                     | 1 +
 common/board_r.c                                        | 1 +
 common/bootm.c                                          | 1 +
 common/bootm_os.c                                       | 1 +
 common/bootstage.c                                      | 1 +
 common/cli.c                                            | 1 +
 common/cli_hush.c                                       | 1 +
 common/cli_readline.c                                   | 1 +
 common/command.c                                        | 1 +
 common/console.c                                        | 1 +
 common/dlmalloc.c                                       | 1 +
 common/exports.c                                        | 1 +
 common/hash.c                                           | 1 +
 common/hwconfig.c                                       | 1 +
 common/image-android.c                                  | 1 +
 common/image-cipher.c                                   | 1 +
 common/image-fdt.c                                      | 1 +
 common/image-fit-sig.c                                  | 1 +
 common/image-fit.c                                      | 1 +
 common/image-sig.c                                      | 1 +
 common/image.c                                          | 1 +
 common/init/board_init.c                                | 1 +
 common/init/handoff.c                                   | 1 +
 common/iotrace.c                                        | 1 +
 common/lcd.c                                            | 1 +
 common/lcd_simplefb.c                                   | 1 +
 common/log.c                                            | 1 +
 common/log_console.c                                    | 1 +
 common/log_syslog.c                                     | 1 +
 common/malloc_simple.c                                  | 1 +
 common/memsize.c                                        | 1 +
 common/spl/spl.c                                        | 1 +
 common/spl/spl_fit.c                                    | 1 +
 common/spl/spl_opensbi.c                                | 1 +
 common/spl/spl_spi.c                                    | 1 +
 common/splash_source.c                                  | 1 +
 common/stdio.c                                          | 1 +
 disk/part_efi.c                                         | 1 +
 drivers/ata/libata.c                                    | 2 ++
 drivers/ata/sata_mv.c                                   | 1 +
 drivers/bios_emulator/atibios.c                         | 1 +
 drivers/block/sandbox.c                                 | 1 +
 drivers/bootcount/bootcount_ram.c                       | 1 +
 drivers/cache/cache-v5l2.c                              | 1 +
 drivers/cache/sandbox_cache.c                           | 1 +
 drivers/clk/altera/clk-agilex.c                         | 1 +
 drivers/clk/altera/clk-arria10.c                        | 1 +
 drivers/clk/aspeed/clk_ast2500.c                        | 1 +
 drivers/clk/at91/clk-generated.c                        | 1 +
 drivers/clk/at91/clk-h32mx.c                            | 1 +
 drivers/clk/at91/clk-main.c                             | 1 +
 drivers/clk/at91/clk-master.c                           | 1 +
 drivers/clk/at91/clk-plla.c                             | 1 +
 drivers/clk/at91/clk-usb.c                              | 1 +
 drivers/clk/at91/pmc.c                                  | 1 +
 drivers/clk/clk-uclass.c                                | 1 +
 drivers/clk/clk_pic32.c                                 | 1 +
 drivers/clk/clk_stm32mp1.c                              | 1 +
 drivers/clk/clk_zynq.c                                  | 1 +
 drivers/clk/mpc83xx_clk.c                               | 1 +
 drivers/clk/renesas/clk-rcar-gen2.c                     | 1 +
 drivers/clk/renesas/clk-rcar-gen3.c                     | 1 +
 drivers/clk/rockchip/clk_px30.c                         | 1 +
 drivers/clk/rockchip/clk_rk3288.c                       | 1 +
 drivers/clk/rockchip/clk_rk3308.c                       | 1 +
 drivers/clk/rockchip/clk_rv1108.c                       | 1 +
 drivers/core/device-remove.c                            | 1 +
 drivers/core/device.c                                   | 1 +
 drivers/core/fdtaddr.c                                  | 1 +
 drivers/core/of_access.c                                | 1 +
 drivers/core/ofnode.c                                   | 1 +
 drivers/core/read.c                                     | 1 +
 drivers/core/regmap.c                                   | 1 +
 drivers/core/root.c                                     | 1 +
 drivers/core/uclass.c                                   | 1 +
 drivers/cpu/imx8_cpu.c                                  | 1 +
 drivers/cpu/riscv_cpu.c                                 | 1 +
 drivers/crypto/rsa_mod_exp/mod_exp_uclass.c             | 1 +
 drivers/ddr/altera/sdram_agilex.c                       | 1 +
 drivers/ddr/altera/sdram_arria10.c                      | 1 +
 drivers/ddr/altera/sdram_s10.c                          | 1 +
 drivers/ddr/altera/sdram_soc64.c                        | 1 +
 drivers/ddr/imx/imx8m/helper.c                          | 1 +
 drivers/demo/demo-shape.c                               | 1 +
 drivers/demo/demo-uclass.c                              | 1 +
 drivers/fpga/socfpga_arria10.c                          | 1 +
 drivers/fpga/zynqmppl.c                                 | 1 +
 drivers/gpio/74x164_gpio.c                              | 1 +
 drivers/gpio/altera_pio.c                               | 1 +
 drivers/gpio/atmel_pio4.c                               | 1 +
 drivers/gpio/da8xx_gpio.c                               | 1 +
 drivers/gpio/gpio-rcar.c                                | 1 +
 drivers/gpio/gpio-rza1.c                                | 1 +
 drivers/gpio/gpio-uclass.c                              | 1 +
 drivers/gpio/intel_broadwell_gpio.c                     | 1 +
 drivers/gpio/intel_ich6_gpio.c                          | 1 +
 drivers/gpio/msm_gpio.c                                 | 1 +
 drivers/gpio/mxs_gpio.c                                 | 1 +
 drivers/gpio/omap_gpio.c                                | 1 +
 drivers/gpio/pcf8575_gpio.c                             | 1 +
 drivers/gpio/pic32_gpio.c                               | 1 +
 drivers/gpio/s5p_gpio.c                                 | 1 +
 drivers/gpio/vybrid_gpio.c                              | 1 +
 drivers/hwspinlock/hwspinlock-uclass.c                  | 1 +
 drivers/i2c/at91_i2c.c                                  | 1 +
 drivers/i2c/cros_ec_tunnel.c                            | 1 +
 drivers/i2c/exynos_hs_i2c.c                             | 1 +
 drivers/i2c/fsl_i2c.c                                   | 1 +
 drivers/i2c/i2c-gpio.c                                  | 1 +
 drivers/i2c/i2c_core.c                                  | 1 +
 drivers/i2c/ihs_i2c.c                                   | 1 +
 drivers/i2c/iproc_i2c.c                                 | 1 +
 drivers/i2c/muxes/i2c-arb-gpio-challenge.c              | 1 +
 drivers/i2c/muxes/i2c-mux-gpio.c                        | 1 +
 drivers/i2c/muxes/pca954x.c                             | 1 +
 drivers/i2c/mvtwsi.c                                    | 1 +
 drivers/i2c/mxc_i2c.c                                   | 1 +
 drivers/i2c/s3c24x0_i2c.c                               | 1 +
 drivers/i2c/sh_i2c.c                                    | 1 +
 drivers/i2c/soft_i2c.c                                  | 1 +
 drivers/i2c/tegra186_bpmp_i2c.c                         | 1 +
 drivers/input/i8042.c                                   | 1 +
 drivers/mailbox/k3-sec-proxy.c                          | 1 +
 drivers/misc/atsha204a-i2c.c                            | 1 +
 drivers/misc/fs_loader.c                                | 1 +
 drivers/misc/imx8/fuse.c                                | 1 +
 drivers/misc/imx8/scu.c                                 | 1 +
 drivers/misc/imx8/scu_api.c                             | 1 +
 drivers/misc/tegra186_bpmp.c                            | 1 +
 drivers/mmc/atmel_sdhci.c                               | 1 +
 drivers/mmc/ca_dw_mmc.c                                 | 1 +
 drivers/mmc/exynos_dw_mmc.c                             | 1 +
 drivers/mmc/fsl_esdhc.c                                 | 1 +
 drivers/mmc/fsl_esdhc_imx.c                             | 1 +
 drivers/mmc/ftsdc010_mci.c                              | 1 +
 drivers/mmc/hi6220_dw_mmc.c                             | 1 +
 drivers/mmc/iproc_sdhci.c                               | 1 +
 drivers/mmc/jz_mmc.c                                    | 1 +
 drivers/mmc/msm_sdhci.c                                 | 1 +
 drivers/mmc/mv_sdhci.c                                  | 1 +
 drivers/mmc/mvebu_mmc.c                                 | 1 +
 drivers/mmc/omap_hsmmc.c                                | 1 +
 drivers/mmc/pic32_sdhci.c                               | 1 +
 drivers/mmc/renesas-sdhi.c                              | 1 +
 drivers/mmc/s5p_sdhci.c                                 | 1 +
 drivers/mmc/sdhci-cadence.c                             | 1 +
 drivers/mmc/sh_mmcif.c                                  | 1 +
 drivers/mmc/sh_sdhi.c                                   | 1 +
 drivers/mmc/socfpga_dw_mmc.c                            | 1 +
 drivers/mmc/sti_sdhci.c                                 | 1 +
 drivers/mmc/tmio-common.c                               | 1 +
 drivers/mmc/xenon_sdhci.c                               | 1 +
 drivers/mtd/altera_qspi.c                               | 1 +
 drivers/mtd/cfi_flash.c                                 | 1 +
 drivers/mtd/mtd_uboot.c                                 | 1 +
 drivers/mtd/nand/raw/nand_base.c                        | 1 +
 drivers/mtd/nand/raw/pxa3xx_nand.c                      | 1 +
 drivers/mtd/nand/raw/sunxi_nand.c                       | 1 +
 drivers/mtd/nand/raw/tegra_nand.c                       | 1 +
 drivers/mtd/pic32_flash.c                               | 1 +
 drivers/mtd/renesas_rpc_hf.c                            | 1 +
 drivers/mtd/spi/sf-uclass.c                             | 1 +
 drivers/net/ag7xxx.c                                    | 1 +
 drivers/net/altera_tse.c                                | 1 +
 drivers/net/dwc_eth_qos.c                               | 1 +
 drivers/net/dwmac_s700.c                                | 1 +
 drivers/net/fec_mxc.c                                   | 1 +
 drivers/net/fsl-mc/mc.c                                 | 1 +
 drivers/net/fsl_mcdmafec.c                              | 1 +
 drivers/net/ftmac100.c                                  | 1 +
 drivers/net/gmac_rockchip.c                             | 1 +
 drivers/net/ldpaa_eth/ldpaa_eth.c                       | 1 +
 drivers/net/macb.c                                      | 1 +
 drivers/net/mcffec.c                                    | 1 +
 drivers/net/mcfmii.c                                    | 1 +
 drivers/net/mpc8xx_fec.c                                | 1 +
 drivers/net/mvgbe.c                                     | 1 +
 drivers/net/mvneta.c                                    | 1 +
 drivers/net/mvpp2.c                                     | 1 +
 drivers/net/phy/fixed.c                                 | 1 +
 drivers/net/phy/miiphybb.c                              | 1 +
 drivers/net/phy/phy.c                                   | 1 +
 drivers/net/phy/xilinx_gmii2rgmii.c                     | 4 ++--
 drivers/net/pic32_eth.c                                 | 1 +
 drivers/net/ravb.c                                      | 1 +
 drivers/net/sandbox-raw.c                               | 1 +
 drivers/net/sandbox.c                                   | 1 +
 drivers/net/sh_eth.c                                    | 1 +
 drivers/net/sni_ave.c                                   | 1 +
 drivers/net/sun8i_emac.c                                | 1 +
 drivers/net/ti/cpsw-common.c                            | 1 +
 drivers/net/ti/keystone_net.c                           | 1 +
 drivers/net/xilinx_axi_emac.c                           | 1 +
 drivers/net/xilinx_emaclite.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/pci_rom.c                                   | 1 +
 drivers/pci/pcie_dw_mvebu.c                             | 1 +
 drivers/pci/pcie_dw_ti.c                                | 1 +
 drivers/pci/pcie_ecam_generic.c                         | 1 +
 drivers/pci/pcie_fsl.c                                  | 1 +
 drivers/pci/pcie_intel_fpga.c                           | 1 +
 drivers/pci/pcie_layerscape.c                           | 1 +
 drivers/pci/pcie_layerscape_ep.c                        | 1 +
 drivers/pci/pcie_layerscape_fixup_common.c              | 1 +
 drivers/pci/pcie_layerscape_gen4.c                      | 1 +
 drivers/pci/pcie_layerscape_rc.c                        | 1 +
 drivers/pci/pcie_phytium.c                              | 1 +
 drivers/pci/pcie_rockchip.c                             | 1 +
 drivers/pci/pcie_xilinx.c                               | 1 +
 drivers/pci_endpoint/pci_ep-uclass.c                    | 1 +
 drivers/pci_endpoint/pcie-cadence-ep.c                  | 1 +
 drivers/phy/marvell/comphy_a3700.c                      | 1 +
 drivers/phy/marvell/comphy_core.c                       | 1 +
 drivers/phy/marvell/comphy_cp110.c                      | 1 +
 drivers/phy/omap-usb2-phy.c                             | 1 +
 drivers/phy/rockchip/phy-rockchip-inno-usb2.c           | 1 +
 drivers/phy/rockchip/phy-rockchip-pcie.c                | 1 +
 drivers/phy/rockchip/phy-rockchip-typec.c               | 1 +
 drivers/phy/sti_usb_phy.c                               | 1 +
 drivers/phy/ti-pipe3-phy.c                              | 1 +
 drivers/pinctrl/ath79/pinctrl_ar933x.c                  | 1 +
 drivers/pinctrl/ath79/pinctrl_qca953x.c                 | 1 +
 drivers/pinctrl/exynos/pinctrl-exynos.c                 | 1 +
 drivers/pinctrl/meson/pinctrl-meson.c                   | 1 +
 drivers/pinctrl/mtmips/pinctrl-mt7628.c                 | 1 +
 drivers/pinctrl/mvebu/pinctrl-armada-37xx.c             | 1 +
 drivers/pinctrl/mvebu/pinctrl-mvebu.c                   | 1 +
 drivers/pinctrl/nxp/pinctrl-imx.c                       | 1 +
 drivers/pinctrl/nxp/pinctrl-imx8.c                      | 1 +
 drivers/pinctrl/nxp/pinctrl-mxs.c                       | 1 +
 drivers/pinctrl/pinctrl-at91-pio4.c                     | 1 +
 drivers/pinctrl/pinctrl-at91.c                          | 1 +
 drivers/pinctrl/pinctrl-sti.c                           | 1 +
 drivers/pinctrl/pinctrl-uclass.c                        | 1 +
 drivers/pinctrl/pinctrl_pic32.c                         | 1 +
 drivers/pinctrl/pinctrl_stm32.c                         | 1 +
 drivers/pinctrl/renesas/pfc-r7s72100.c                  | 1 +
 drivers/pinctrl/rockchip/pinctrl-rockchip-core.c        | 1 +
 drivers/power/domain/imx8-power-domain-legacy.c         | 1 +
 drivers/power/domain/imx8m-power-domain.c               | 1 +
 drivers/power/pmic/bd71837.c                            | 1 +
 drivers/power/pmic/mc34708.c                            | 1 +
 drivers/power/pmic/pca9450.c                            | 1 +
 drivers/power/regulator/pwm_regulator.c                 | 1 +
 drivers/pwm/pwm-sifive.c                                | 1 +
 drivers/pwm/rk_pwm.c                                    | 1 +
 drivers/pwm/sunxi_pwm.c                                 | 1 +
 drivers/qe/fdt.c                                        | 1 +
 drivers/qe/qe.c                                         | 1 +
 drivers/ram/mpc83xx_sdram.c                             | 1 +
 drivers/ram/rockchip/sdram_rk322x.c                     | 1 +
 drivers/ram/sandbox_ram.c                               | 1 +
 drivers/ram/sifive/fu540_ddr.c                          | 1 +
 drivers/ram/stm32mp1/stm32mp1_interactive.c             | 1 +
 drivers/ram/stm32mp1/stm32mp1_tests.c                   | 1 +
 drivers/remoteproc/rproc-uclass.c                       | 1 +
 drivers/remoteproc/ti_power_proc.c                      | 1 +
 drivers/reset/sti-reset.c                               | 1 +
 drivers/serial/atmel_usart.c                            | 1 +
 drivers/serial/ns16550.c                                | 1 +
 drivers/serial/sandbox.c                                | 1 +
 drivers/serial/serial-uclass.c                          | 1 +
 drivers/serial/serial.c                                 | 1 +
 drivers/serial/serial_arc.c                             | 1 +
 drivers/serial/serial_linflexuart.c                     | 1 +
 drivers/serial/serial_lpuart.c                          | 1 +
 drivers/serial/serial_mcf.c                             | 1 +
 drivers/serial/serial_mpc8xx.c                          | 1 +
 drivers/serial/serial_msm.c                             | 1 +
 drivers/serial/serial_mtk.c                             | 1 +
 drivers/serial/serial_mxc.c                             | 1 +
 drivers/serial/serial_ns16550.c                         | 1 +
 drivers/serial/serial_pic32.c                           | 1 +
 drivers/serial/serial_pl01x.c                           | 1 +
 drivers/serial/serial_pxa.c                             | 1 +
 drivers/serial/serial_s5p.c                             | 1 +
 drivers/serial/serial_sh.c                              | 1 +
 drivers/serial/serial_sifive.c                          | 1 +
 drivers/serial/serial_sti_asc.c                         | 1 +
 drivers/smem/msm_smem.c                                 | 1 +
 drivers/sound/ivybridge_sound.c                         | 1 +
 drivers/spi/atcspi200_spi.c                             | 1 +
 drivers/spi/bcmstb_spi.c                                | 1 +
 drivers/spi/cf_spi.c                                    | 1 +
 drivers/spi/davinci_spi.c                               | 1 +
 drivers/spi/exynos_spi.c                                | 1 +
 drivers/spi/fsl_dspi.c                                  | 1 +
 drivers/spi/fsl_espi.c                                  | 1 +
 drivers/spi/fsl_qspi.c                                  | 1 +
 drivers/spi/mvebu_a3700_spi.c                           | 1 +
 drivers/spi/mxc_spi.c                                   | 1 +
 drivers/spi/omap3_spi.c                                 | 1 +
 drivers/spi/pic32_spi.c                                 | 1 +
 drivers/spi/pl022_spi.c                                 | 1 +
 drivers/spi/renesas_rpc_spi.c                           | 1 +
 drivers/spi/soft_spi.c                                  | 1 +
 drivers/spi/spi-sunxi.c                                 | 1 +
 drivers/spi/spi-uclass.c                                | 1 +
 drivers/spi/tegra20_sflash.c                            | 1 +
 drivers/spi/tegra20_slink.c                             | 1 +
 drivers/spi/tegra210_qspi.c                             | 1 +
 drivers/spi/ti_qspi.c                                   | 1 +
 drivers/spi/uniphier_spi.c                              | 1 +
 drivers/spi/zynq_qspi.c                                 | 1 +
 drivers/spi/zynq_spi.c                                  | 1 +
 drivers/spi/zynqmp_gqspi.c                              | 1 +
 drivers/spmi/spmi-msm.c                                 | 1 +
 drivers/sysreset/sysreset-uclass.c                      | 1 +
 drivers/sysreset/sysreset_mpc83xx.c                     | 1 +
 drivers/sysreset/sysreset_sti.c                         | 1 +
 drivers/thermal/imx_scu_thermal.c                       | 1 +
 drivers/thermal/imx_tmu.c                               | 1 +
 drivers/timer/arc_timer.c                               | 1 +
 drivers/timer/cadence-ttc.c                             | 1 +
 drivers/timer/mpc83xx_timer.c                           | 1 +
 drivers/timer/ostm_timer.c                              | 1 +
 drivers/timer/rockchip_timer.c                          | 1 +
 drivers/timer/timer-uclass.c                            | 1 +
 drivers/timer/tsc_timer.c                               | 1 +
 drivers/tpm/tpm2_tis_spi.c                              | 1 +
 drivers/usb/common/common.c                             | 1 +
 drivers/usb/host/dwc3-sti-glue.c                        | 1 +
 drivers/usb/host/ehci-exynos.c                          | 1 +
 drivers/usb/host/ehci-fsl.c                             | 1 +
 drivers/usb/host/ehci-marvell.c                         | 1 +
 drivers/usb/host/ehci-mx5.c                             | 1 +
 drivers/usb/host/ehci-mx6.c                             | 1 +
 drivers/usb/host/ehci-vf.c                              | 1 +
 drivers/usb/host/xhci-exynos5.c                         | 1 +
 drivers/usb/musb-new/da8xx.c                            | 1 +
 drivers/usb/musb-new/omap2430.c                         | 1 +
 drivers/usb/musb-new/pic32.c                            | 1 +
 drivers/usb/musb-new/ti-musb.c                          | 1 +
 drivers/usb/phy/rockchip_usb2_phy.c                     | 1 +
 drivers/video/am335x-fb.c                               | 1 +
 drivers/video/atmel_hlcdfb.c                            | 1 +
 drivers/video/atmel_lcdfb.c                             | 1 +
 drivers/video/bridge/ps862x.c                           | 1 +
 drivers/video/broadwell_igd.c                           | 1 +
 drivers/video/cfb_console.c                             | 1 +
 drivers/video/da8xx-fb.c                                | 1 +
 drivers/video/exynos/exynos_dp.c                        | 1 +
 drivers/video/exynos/exynos_fb.c                        | 1 +
 drivers/video/exynos/exynos_mipi_dsi.c                  | 1 +
 drivers/video/fsl_dcu_fb.c                              | 1 +
 drivers/video/ivybridge_igd.c                           | 1 +
 drivers/video/mali_dp.c                                 | 1 +
 drivers/video/meson/meson_vpu.c                         | 1 +
 drivers/video/mxsfb.c                                   | 1 +
 drivers/video/rockchip/rk3288_vop.c                     | 1 +
 drivers/video/rockchip/rk3399_vop.c                     | 1 +
 drivers/video/rockchip/rk_lvds.c                        | 1 +
 drivers/video/rockchip/rk_mipi.c                        | 1 +
 drivers/video/rockchip/rk_vop.c                         | 1 +
 drivers/video/sandbox_sdl.c                             | 1 +
 drivers/video/simplefb.c                                | 1 +
 drivers/video/stm32/stm32_dsi.c                         | 1 +
 drivers/video/stm32/stm32_ltdc.c                        | 1 +
 drivers/video/sunxi/sunxi_lcd.c                         | 1 +
 drivers/video/tegra.c                                   | 1 +
 drivers/video/video-uclass.c                            | 1 +
 drivers/video/videomodes.c                              | 1 +
 drivers/watchdog/armada-37xx-wdt.c                      | 1 +
 drivers/watchdog/at91sam9_wdt.c                         | 1 +
 drivers/watchdog/mt7621_wdt.c                           | 1 +
 drivers/watchdog/orion_wdt.c                            | 1 +
 drivers/watchdog/sbsa_gwdt.c                            | 1 +
 drivers/watchdog/sp805_wdt.c                            | 1 +
 drivers/watchdog/wdt-uclass.c                           | 1 +
 env/callback.c                                          | 1 +
 env/common.c                                            | 1 +
 env/eeprom.c                                            | 1 +
 env/env.c                                               | 1 +
 env/ext4.c                                              | 1 +
 env/flash.c                                             | 1 +
 env/mmc.c                                               | 1 +
 env/nand.c                                              | 1 +
 env/nowhere.c                                           | 1 +
 env/nvram.c                                             | 1 +
 env/onenand.c                                           | 1 +
 env/remote.c                                            | 1 +
 env/sf.c                                                | 1 +
 env/ubi.c                                               | 1 +
 examples/standalone/stubs.c                             | 1 +
 fs/ext4/ext4_journal.c                                  | 1 +
 fs/ext4/ext4_journal.h                                  | 1 +
 fs/ext4/ext4fs.c                                        | 2 +-
 fs/fs.c                                                 | 1 +
 fs/reiserfs/reiserfs_private.h                          | 2 ++
 fs/ubifs/ubifs.c                                        | 1 +
 include/audio_codec.h                                   | 2 ++
 include/axi.h                                           | 2 ++
 include/backlight.h                                     | 2 ++
 include/board.h                                         | 3 +++
 include/bootcount.h                                     | 1 +
 include/cache.h                                         | 2 ++
 include/common.h                                        | 1 -
 include/cpu.h                                           | 2 ++
 include/dm/device-internal.h                            | 1 +
 include/dma.h                                           | 2 ++
 include/exports.h                                       | 1 +
 include/ext_common.h                                    | 2 ++
 include/image-sparse.h                                  | 1 +
 include/init.h                                          | 7 +++----
 include/led.h                                           | 2 ++
 include/libata.h                                        | 2 --
 include/misc.h                                          | 2 ++
 include/netdev.h                                        | 2 ++
 include/pci.h                                           | 2 --
 include/power/as3722.h                                  | 2 ++
 include/power/regulator.h                               | 2 ++
 include/pwm.h                                           | 2 ++
 include/ram.h                                           | 2 ++
 include/scsi.h                                          | 2 ++
 include/soc.h                                           | 2 ++
 include/sysreset.h                                      | 2 ++
 include/tee.h                                           | 2 ++
 include/tlv_eeprom.h                                    | 2 ++
 include/tpm-common.h                                    | 2 ++
 include/tpm-v1.h                                        | 2 ++
 include/tpm-v2.h                                        | 2 ++
 include/tps6586x.h                                      | 2 ++
 include/ufs.h                                           | 3 +++
 lib/acpi/acpi_table.c                                   | 1 +
 lib/asm-offsets.c                                       | 1 +
 lib/efi/efi_app.c                                       | 1 +
 lib/efi/efi_info.c                                      | 1 +
 lib/efi_loader/efi_boottime.c                           | 1 +
 lib/efi_loader/efi_gop.c                                | 1 +
 lib/efi_loader/efi_memory.c                             | 1 +
 lib/efi_loader/efi_rng.c                                | 1 +
 lib/efi_loader/efi_runtime.c                            | 1 +
 lib/fdtdec.c                                            | 1 +
 lib/optee/optee.c                                       | 1 +
 lib/time.c                                              | 1 +
 lib/trace.c                                             | 1 +
 lib/zlib/zlib.c                                         | 1 +
 net/eth-uclass.c                                        | 1 +
 net/eth_legacy.c                                        | 1 +
 net/tftp.c                                              | 1 +
 post/drivers/memory.c                                   | 1 +
 post/post.c                                             | 1 +
 test/bloblist.c                                         | 1 +
 test/dm/acpi.c                                          | 1 +
 test/dm/blk.c                                           | 1 +
 test/dm/bus.c                                           | 1 +
 test/dm/core.c                                          | 1 +
 test/dm/fdtdec.c                                        | 1 +
 test/dm/ram.c                                           | 1 +
 test/dm/test-fdt.c                                      | 1 +
 test/dm/test-main.c                                     | 1 +
 test/log/nolog_test.c                                   | 1 +
 test/log/syslog_test.c                                  | 1 +
 test/ut.c                                               | 1 +
 1297 files changed, 1339 insertions(+), 23 deletions(-)

diff --git a/arch/arc/lib/bootm.c b/arch/arc/lib/bootm.c
index 63d6207c047..8a8d394a5f0 100644
--- a/arch/arc/lib/bootm.c
+++ b/arch/arc/lib/bootm.c
@@ -11,6 +11,7 @@
 #include <lmb.h>
 #include <log.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arc/lib/cache.c b/arch/arc/lib/cache.c
index 85651b219cf..f807cd83d6b 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 <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/compiler.h>
 #include <linux/kernel.h>
diff --git a/arch/arc/lib/cpu.c b/arch/arc/lib/cpu.c
index 27b5832a0c9..8b83822fac8 100644
--- a/arch/arc/lib/cpu.c
+++ b/arch/arc/lib/cpu.c
@@ -9,6 +9,7 @@
 #include <vsprintf.h>
 #include <asm/arcregs.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <linux/bitops.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arc/lib/relocate.c b/arch/arc/lib/relocate.c
index 6882ebec6d8..7f531c95eec 100644
--- a/arch/arc/lib/relocate.c
+++ b/arch/arc/lib/relocate.c
@@ -7,6 +7,7 @@
 #include <elf.h>
 #include <log.h>
 #include <asm-generic/sections.h>
+#include <asm/global_data.h>
 
 extern ulong __image_copy_start;
 extern ulong __ivt_start;
diff --git a/arch/arm/cpu/arm1136/mx35/generic.c b/arch/arm/cpu/arm1136/mx35/generic.c
index 10f9ce42708..cbf76ab4fee 100644
--- a/arch/arm/cpu/arm1136/mx35/generic.c
+++ b/arch/arm/cpu/arm1136/mx35/generic.c
@@ -12,6 +12,7 @@
 #include <div64.h>
 #include <init.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <asm/arch/imx-regs.h>
diff --git a/arch/arm/cpu/arm926ejs/armada100/dram.c b/arch/arm/cpu/arm926ejs/armada100/dram.c
index da0615faf15..c97b5b1940a 100644
--- a/arch/arm/cpu/arm926ejs/armada100/dram.c
+++ b/arch/arm/cpu/arm926ejs/armada100/dram.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/armada100.h>
 
diff --git a/arch/arm/cpu/arm926ejs/armada100/timer.c b/arch/arm/cpu/arm926ejs/armada100/timer.c
index 0f1e68c8355..ec73393d0fc 100644
--- a/arch/arm/cpu/arm926ejs/armada100/timer.c
+++ b/arch/arm/cpu/arm926ejs/armada100/timer.c
@@ -12,6 +12,7 @@
 #include <time.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/armada100.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 
 /*
diff --git a/arch/arm/cpu/arm926ejs/mx25/generic.c b/arch/arm/cpu/arm926ejs/mx25/generic.c
index a4528cbaf52..9cd60abcccb 100644
--- a/arch/arm/cpu/arm926ejs/mx25/generic.c
+++ b/arch/arm/cpu/arm926ejs/mx25/generic.c
@@ -15,6 +15,7 @@
 #include <net.h>
 #include <netdev.h>
 #include <vsprintf.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch-imx/cpu.h>
 #include <asm/arch/imx-regs.h>
diff --git a/arch/arm/cpu/arm926ejs/mx27/timer.c b/arch/arm/cpu/arm926ejs/mx27/timer.c
index 408e88aa129..4fd6a805968 100644
--- a/arch/arm/cpu/arm926ejs/mx27/timer.c
+++ b/arch/arm/cpu/arm926ejs/mx27/timer.c
@@ -19,6 +19,7 @@
 #include <div64.h>
 #include <init.h>
 #include <time.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/ptrace.h>
diff --git a/arch/arm/cpu/arm926ejs/mxs/mxs.c b/arch/arm/cpu/arm926ejs/mxs/mxs.c
index 8243aeb2c0f..c9362136fbf 100644
--- a/arch/arm/cpu/arm926ejs/mxs/mxs.c
+++ b/arch/arm/cpu/arm926ejs/mxs/mxs.c
@@ -15,6 +15,7 @@
 #include <hang.h>
 #include <init.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/io.h>
diff --git a/arch/arm/cpu/arm926ejs/mxs/spl_boot.c b/arch/arm/cpu/arm926ejs/mxs/spl_boot.c
index 1501d7df0dc..a16a15e79d8 100644
--- a/arch/arm/cpu/arm926ejs/mxs/spl_boot.c
+++ b/arch/arm/cpu/arm926ejs/mxs/spl_boot.c
@@ -11,6 +11,7 @@
 #include <init.h>
 #include <log.h>
 #include <serial.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
diff --git a/arch/arm/cpu/arm926ejs/mxs/timer.c b/arch/arm/cpu/arm926ejs/mxs/timer.c
index 5ab4ed0c5a3..3dff3d768d1 100644
--- a/arch/arm/cpu/arm926ejs/mxs/timer.c
+++ b/arch/arm/cpu/arm926ejs/mxs/timer.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <init.h>
 #include <time.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
diff --git a/arch/arm/cpu/arm926ejs/spear/spr_misc.c b/arch/arm/cpu/arm926ejs/spear/spr_misc.c
index 998423b6525..044052b32f9 100644
--- a/arch/arm/cpu/arm926ejs/spear/spr_misc.c
+++ b/arch/arm/cpu/arm926ejs/spear/spr_misc.c
@@ -11,6 +11,7 @@
 #include <i2c.h>
 #include <init.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <linux/mtd/st_smi.h>
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
diff --git a/arch/arm/cpu/arm926ejs/spear/timer.c b/arch/arm/cpu/arm926ejs/spear/timer.c
index dd0f15c0cee..b42baa71506 100644
--- a/arch/arm/cpu/arm926ejs/spear/timer.c
+++ b/arch/arm/cpu/arm926ejs/spear/timer.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <init.h>
 #include <time.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/spr_gpt.h>
diff --git a/arch/arm/cpu/armv7/arch_timer.c b/arch/arm/cpu/armv7/arch_timer.c
index 871629c2333..d96406f7626 100644
--- a/arch/arm/cpu/armv7/arch_timer.c
+++ b/arch/arm/cpu/armv7/arch_timer.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <init.h>
 #include <time.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <div64.h>
 #include <bootstage.h>
diff --git a/arch/arm/cpu/armv7/ls102xa/clock.c b/arch/arm/cpu/armv7/ls102xa/clock.c
index f3bdb14c072..940995ef5af 100644
--- a/arch/arm/cpu/armv7/ls102xa/clock.c
+++ b/arch/arm/cpu/armv7/ls102xa/clock.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <clock_legacy.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/immap_ls102xa.h>
 #include <asm/arch/clock.h>
diff --git a/arch/arm/cpu/armv7/ls102xa/cpu.c b/arch/arm/cpu/armv7/ls102xa/cpu.c
index ce472aa9bd5..cbc8254b42a 100644
--- a/arch/arm/cpu/armv7/ls102xa/cpu.c
+++ b/arch/arm/cpu/armv7/ls102xa/cpu.c
@@ -9,6 +9,7 @@
 #include <net.h>
 #include <vsprintf.h>
 #include <asm/arch/clock.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/immap_ls102xa.h>
 #include <asm/cache.h>
diff --git a/arch/arm/cpu/armv7/ls102xa/fdt.c b/arch/arm/cpu/armv7/ls102xa/fdt.c
index d8cb78ecc67..d1d09f93650 100644
--- a/arch/arm/cpu/armv7/ls102xa/fdt.c
+++ b/arch/arm/cpu/armv7/ls102xa/fdt.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <clock_legacy.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <asm/io.h>
diff --git a/arch/arm/cpu/armv7/ls102xa/timer.c b/arch/arm/cpu/armv7/ls102xa/timer.c
index 2a32b30999f..d79bf105f13 100644
--- a/arch/arm/cpu/armv7/ls102xa/timer.c
+++ b/arch/arm/cpu/armv7/ls102xa/timer.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <init.h>
 #include <time.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <div64.h>
 #include <asm/arch/immap_ls102xa.h>
diff --git a/arch/arm/cpu/armv7/s5p-common/cpu_info.c b/arch/arm/cpu/armv7/s5p-common/cpu_info.c
index 7790f087a09..d910282e2b2 100644
--- a/arch/arm/cpu/armv7/s5p-common/cpu_info.c
+++ b/arch/arm/cpu/armv7/s5p-common/cpu_info.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <fdtdec.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clk.h>
 
diff --git a/arch/arm/cpu/armv7/s5p-common/timer.c b/arch/arm/cpu/armv7/s5p-common/timer.c
index 3064fd25d4d..8141f40d5c0 100644
--- a/arch/arm/cpu/armv7/s5p-common/timer.c
+++ b/arch/arm/cpu/armv7/s5p-common/timer.c
@@ -10,6 +10,7 @@
 #include <div64.h>
 #include <init.h>
 #include <time.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/pwm.h>
 #include <asm/arch/clk.h>
diff --git a/arch/arm/cpu/armv7/s5p4418/cpu.c b/arch/arm/cpu/armv7/s5p4418/cpu.c
index 8add9474ad2..3c71a37a74b 100644
--- a/arch/arm/cpu/armv7/s5p4418/cpu.c
+++ b/arch/arm/cpu/armv7/s5p4418/cpu.c
@@ -8,6 +8,7 @@
 #include <command.h>
 #include <asm/system.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/sections.h>
 #include <asm/io.h>
 #include <asm/arch/nexell.h>
diff --git a/arch/arm/cpu/armv7/stv0991/timer.c b/arch/arm/cpu/armv7/stv0991/timer.c
index 919529aa1b0..07033acb5c1 100644
--- a/arch/arm/cpu/armv7/stv0991/timer.c
+++ b/arch/arm/cpu/armv7/stv0991/timer.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <init.h>
 #include <time.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch-stv0991/hardware.h>
 #include <asm/arch-stv0991/stv0991_cgu.h>
diff --git a/arch/arm/cpu/armv7/sunxi/timer.c b/arch/arm/cpu/armv7/sunxi/timer.c
index 65b64b5ac75..b7585996369 100644
--- a/arch/arm/cpu/armv7/sunxi/timer.c
+++ b/arch/arm/cpu/armv7/sunxi/timer.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <init.h>
 #include <time.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/timer.h>
 #include <linux/delay.h>
diff --git a/arch/arm/cpu/armv7/vf610/generic.c b/arch/arm/cpu/armv7/vf610/generic.c
index 743bfced643..c23ddc12b45 100644
--- a/arch/arm/cpu/armv7/vf610/generic.c
+++ b/arch/arm/cpu/armv7/vf610/generic.c
@@ -10,6 +10,7 @@
 #include <init.h>
 #include <net.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/clock.h>
diff --git a/arch/arm/cpu/armv7/vf610/timer.c b/arch/arm/cpu/armv7/vf610/timer.c
index fa8f8fae10a..a9c1a8fcebc 100644
--- a/arch/arm/cpu/armv7/vf610/timer.c
+++ b/arch/arm/cpu/armv7/vf610/timer.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <init.h>
 #include <time.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <div64.h>
 #include <asm/arch/imx-regs.h>
diff --git a/arch/arm/cpu/armv7m/systick-timer.c b/arch/arm/cpu/armv7m/systick-timer.c
index d2672fd40cd..556eaf8c74a 100644
--- a/arch/arm/cpu/armv7m/systick-timer.c
+++ b/arch/arm/cpu/armv7m/systick-timer.c
@@ -24,6 +24,7 @@
 #include <common.h>
 #include <init.h>
 #include <time.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
 
diff --git a/arch/arm/cpu/armv8/cache_v8.c b/arch/arm/cpu/armv8/cache_v8.c
index 7c31d98a6f0..15cecb5e0b3 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 <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/system.h>
 #include <asm/armv8/mmu.h>
 
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
index 8a2f4048ecb..3654cbf3b49 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
@@ -14,6 +14,7 @@
 #include <net.h>
 #include <vsprintf.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/ptrace.h>
 #include <linux/errno.h>
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c
index c56689086de..63d34e1ec03 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <clock_legacy.h>
 #include <cpu_func.h>
+#include <asm/global_data.h>
 #include <linux/compiler.h>
 #include <asm/io.h>
 #include <asm/processor.h>
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c
index 7f8178f72eb..767359fa5bd 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <clock_legacy.h>
 #include <cpu_func.h>
+#include <asm/global_data.h>
 #include <linux/compiler.h>
 #include <fsl_ifc.h>
 #include <asm/processor.h>
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/mp.c b/arch/arm/cpu/armv8/fsl-layerscape/mp.c
index bd85351705a..5ac545f9df8 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 <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/system.h>
 #include <asm/arch/mp.h>
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ppa.c b/arch/arm/cpu/armv8/fsl-layerscape/ppa.c
index 1ddb267093c..f26be5a25b0 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/ppa.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/ppa.c
@@ -8,6 +8,7 @@
 #include <config.h>
 #include <errno.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/system.h>
 #include <asm/types.h>
 #include <asm/arch/soc.h>
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/spl.c b/arch/arm/cpu/armv8/fsl-layerscape/spl.c
index 77724336d62..7d594a9f749 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/spl.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/spl.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <spl.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <fsl_ifc.h>
 #include <i2c.h>
diff --git a/arch/arm/cpu/armv8/generic_timer.c b/arch/arm/cpu/armv8/generic_timer.c
index e23629ab0bc..f27a74b9d09 100644
--- a/arch/arm/cpu/armv8/generic_timer.c
+++ b/arch/arm/cpu/armv8/generic_timer.c
@@ -8,6 +8,7 @@
 #include <bootstage.h>
 #include <command.h>
 #include <time.h>
+#include <asm/global_data.h>
 #include <asm/system.h>
 #include <linux/bitops.h>
 
diff --git a/arch/arm/cpu/armv8/s32v234/generic.c b/arch/arm/cpu/armv8/s32v234/generic.c
index de5a098adb8..0fc98852228 100644
--- a/arch/arm/cpu/armv8/s32v234/generic.c
+++ b/arch/arm/cpu/armv8/s32v234/generic.c
@@ -8,6 +8,7 @@
 #include <cpu_func.h>
 #include <init.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/clock.h>
diff --git a/arch/arm/cpu/armv8/sec_firmware.c b/arch/arm/cpu/armv8/sec_firmware.c
index bfc0fac3eff..c6c4fcc7e07 100644
--- a/arch/arm/cpu/armv8/sec_firmware.c
+++ b/arch/arm/cpu/armv8/sec_firmware.c
@@ -10,6 +10,7 @@
 #include <image.h>
 #include <log.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/ptrace.h>
 #include <linux/kernel.h>
 #include <asm/io.h>
diff --git a/arch/arm/include/asm/arch-rockchip/clock.h b/arch/arm/include/asm/arch-rockchip/clock.h
index 22de0aef8dc..5108180ea77 100644
--- a/arch/arm/include/asm/arch-rockchip/clock.h
+++ b/arch/arm/include/asm/arch-rockchip/clock.h
@@ -6,6 +6,8 @@
 #ifndef _ASM_ARCH_CLOCK_H
 #define _ASM_ARCH_CLOCK_H
 
+struct udevice;
+
 /* define pll mode */
 #define RKCLK_PLL_MODE_SLOW		0
 #define RKCLK_PLL_MODE_NORMAL		1
diff --git a/arch/arm/include/asm/arch-tegra/clock.h b/arch/arm/include/asm/arch-tegra/clock.h
index 8aa90d5c0c5..1d80d9e9461 100644
--- a/arch/arm/include/asm/arch-tegra/clock.h
+++ b/arch/arm/include/asm/arch-tegra/clock.h
@@ -8,6 +8,8 @@
 #ifndef _TEGRA_CLOCK_H_
 #define _TEGRA_CLOCK_H_
 
+struct udevice;
+
 /* Set of oscillator frequencies supported in the internal API. */
 enum clock_osc_freq {
 	/* All in MHz, so 13_0 is 13.0MHz */
diff --git a/arch/arm/include/asm/arch-tegra/tegra_i2c.h b/arch/arm/include/asm/arch-tegra/tegra_i2c.h
index 5316bc47e4b..e57b9ef9c47 100644
--- a/arch/arm/include/asm/arch-tegra/tegra_i2c.h
+++ b/arch/arm/include/asm/arch-tegra/tegra_i2c.h
@@ -10,6 +10,8 @@
 
 #include <asm/types.h>
 
+struct udevice;
+
 enum {
 	I2C_TIMEOUT_USEC = 10000,	/* Wait time for completion */
 	I2C_FIFO_DEPTH = 8,		/* I2C fifo depth */
diff --git a/arch/arm/include/asm/global_data.h b/arch/arm/include/asm/global_data.h
index 2aafc6d2062..5a935d34e20 100644
--- a/arch/arm/include/asm/global_data.h
+++ b/arch/arm/include/asm/global_data.h
@@ -7,6 +7,9 @@
 #ifndef	__ASM_GBL_DATA_H
 #define __ASM_GBL_DATA_H
 
+#include <asm/types.h>
+#include <linux/types.h>
+
 /* Architecture-specific global data */
 struct arch_global_data {
 #if defined(CONFIG_FSL_ESDHC) || defined(CONFIG_FSL_ESDHC_IMX)
diff --git a/arch/arm/include/asm/mach-imx/video.h b/arch/arm/include/asm/mach-imx/video.h
index d1a14ad7d34..1fdc2de662a 100644
--- a/arch/arm/include/asm/mach-imx/video.h
+++ b/arch/arm/include/asm/mach-imx/video.h
@@ -16,9 +16,7 @@ struct display_info_t {
 	struct	fb_videomode mode;
 };
 
-#ifdef CONFIG_IMX_HDMI
-extern int detect_hdmi(struct display_info_t const *dev);
-#endif
+int detect_hdmi(struct display_info_t const *dev);
 
 #ifdef CONFIG_IMX_VIDEO_SKIP
 extern struct display_info_t const displays[];
diff --git a/arch/arm/include/asm/secure.h b/arch/arm/include/asm/secure.h
index 50582c972b7..64e5582c1f2 100644
--- a/arch/arm/include/asm/secure.h
+++ b/arch/arm/include/asm/secure.h
@@ -2,6 +2,7 @@
 #define __ASM_SECURE_H
 
 #include <config.h>
+#include <asm/global_data.h>
 
 #define __secure __attribute__ ((section ("._secure.text")))
 #define __secure_data __attribute__ ((section ("._secure.data")))
diff --git a/arch/arm/include/asm/string.h b/arch/arm/include/asm/string.h
index 11eaa34fab8..cefeddd73f1 100644
--- a/arch/arm/include/asm/string.h
+++ b/arch/arm/include/asm/string.h
@@ -1,8 +1,6 @@
 #ifndef __ASM_ARM_STRING_H
 #define __ASM_ARM_STRING_H
 
-#include <config.h>
-
 /*
  * We don't do inline string functions, since the
  * optimised inline asm versions are not small.
diff --git a/arch/arm/include/asm/ti-common/sys_proto.h b/arch/arm/include/asm/ti-common/sys_proto.h
index db042a1aef2..a96a8382fb6 100644
--- a/arch/arm/include/asm/ti-common/sys_proto.h
+++ b/arch/arm/include/asm/ti-common/sys_proto.h
@@ -6,6 +6,8 @@
 #ifndef _TI_COMMON_SYS_PROTO_H_
 #define _TI_COMMON_SYS_PROTO_H_
 
+#include <asm/global_data.h>
+
 DECLARE_GLOBAL_DATA_PTR;
 
 #ifdef CONFIG_ARCH_OMAP2PLUS
diff --git a/arch/arm/lib/bdinfo.c b/arch/arm/lib/bdinfo.c
index 25bc6e80f47..572f7fb2429 100644
--- a/arch/arm/lib/bdinfo.c
+++ b/arch/arm/lib/bdinfo.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/lib/bootm-fdt.c b/arch/arm/lib/bootm-fdt.c
index 02a49a8e10f..e1970ea9f14 100644
--- a/arch/arm/lib/bootm-fdt.c
+++ b/arch/arm/lib/bootm-fdt.c
@@ -19,6 +19,7 @@
 #ifdef CONFIG_ARMV7_NONSEC
 #include <asm/armv7.h>
 #endif
+#include <asm/global_data.h>
 #include <asm/psci.h>
 #include <asm/spin_table.h>
 
diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c
index 1206e306db6..70c181e45b7 100644
--- a/arch/arm/lib/bootm.c
+++ b/arch/arm/lib/bootm.c
@@ -19,6 +19,7 @@
 #include <hang.h>
 #include <lmb.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <dm/root.h>
 #include <env.h>
 #include <image.h>
diff --git a/arch/arm/lib/cache-cp15.c b/arch/arm/lib/cache-cp15.c
index abd81d21c73..24050e5bdd3 100644
--- a/arch/arm/lib/cache-cp15.c
+++ b/arch/arm/lib/cache-cp15.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/system.h>
 #include <asm/cache.h>
 #include <linux/compiler.h>
diff --git a/arch/arm/lib/cache.c b/arch/arm/lib/cache.c
index ee7d14b2d31..b494611d6e8 100644
--- a/arch/arm/lib/cache.c
+++ b/arch/arm/lib/cache.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/lib/image.c b/arch/arm/lib/image.c
index 94590d3049a..e394c1ad909 100644
--- a/arch/arm/lib/image.c
+++ b/arch/arm/lib/image.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <image.h>
 #include <mapmem.h>
+#include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/sizes.h>
 
diff --git a/arch/arm/lib/interrupts.c b/arch/arm/lib/interrupts.c
index 703be5a3209..05bb1a38b35 100644
--- a/arch/arm/lib/interrupts.c
+++ b/arch/arm/lib/interrupts.c
@@ -22,6 +22,7 @@
 #include <cpu_func.h>
 #include <efi_loader.h>
 #include <irq_func.h>
+#include <asm/global_data.h>
 #include <asm/proc-armv/ptrace.h>
 #include <asm/ptrace.h>
 #include <asm/u-boot-arm.h>
diff --git a/arch/arm/lib/interrupts_64.c b/arch/arm/lib/interrupts_64.c
index 52994890137..c653e67db28 100644
--- a/arch/arm/lib/interrupts_64.c
+++ b/arch/arm/lib/interrupts_64.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <asm/global_data.h>
 #include <asm/ptrace.h>
 #include <irq_func.h>
 #include <linux/compiler.h>
diff --git a/arch/arm/lib/spl.c b/arch/arm/lib/spl.c
index af0c9ad6bd6..b2b54f28fc4 100644
--- a/arch/arm/lib/spl.c
+++ b/arch/arm/lib/spl.c
@@ -14,6 +14,7 @@
 #include <spl.h>
 #include <image.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <linux/compiler.h>
 #include <asm/mach-types.h>
 
diff --git a/arch/arm/lib/stack.c b/arch/arm/lib/stack.c
index 96a248c0a90..b03e1cfc80c 100644
--- a/arch/arm/lib/stack.c
+++ b/arch/arm/lib/stack.c
@@ -12,6 +12,7 @@
  */
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-aspeed/ast2500-board.c b/arch/arm/mach-aspeed/ast2500-board.c
index f74dcbbb624..2d1d27bfa2e 100644
--- a/arch/arm/mach-aspeed/ast2500-board.c
+++ b/arch/arm/mach-aspeed/ast2500-board.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <ram.h>
 #include <timer.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/timer.h>
 #include <asm/arch/wdt.h>
diff --git a/arch/arm/mach-aspeed/ast2500/sdram_ast2500.c b/arch/arm/mach-aspeed/ast2500/sdram_ast2500.c
index a3adaa8a999..cfb0374d60c 100644
--- a/arch/arm/mach-aspeed/ast2500/sdram_ast2500.c
+++ b/arch/arm/mach-aspeed/ast2500/sdram_ast2500.c
@@ -13,6 +13,7 @@
 #include <ram.h>
 #include <regmap.h>
 #include <reset.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/scu_ast2500.h>
 #include <asm/arch/sdram_ast2500.h>
diff --git a/arch/arm/mach-at91/arm920t/clock.c b/arch/arm/mach-at91/arm920t/clock.c
index 9a57dd40891..c7440278d8f 100644
--- a/arch/arm/mach-at91/arm920t/clock.c
+++ b/arch/arm/mach-at91/arm920t/clock.c
@@ -8,6 +8,7 @@
  * Copyright (C) 2009 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
  */
 #include <common.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/at91_pmc.h>
diff --git a/arch/arm/mach-at91/arm920t/timer.c b/arch/arm/mach-at91/arm920t/timer.c
index dca2d2c70c7..c400e878135 100644
--- a/arch/arm/mach-at91/arm920t/timer.c
+++ b/arch/arm/mach-at91/arm920t/timer.c
@@ -16,6 +16,7 @@
 #include <common.h>
 #include <init.h>
 #include <time.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 
 #include <asm/io.h>
diff --git a/arch/arm/mach-at91/arm926ejs/clock.c b/arch/arm/mach-at91/arm926ejs/clock.c
index 7156185a46f..c68e0c0c3c4 100644
--- a/arch/arm/mach-at91/arm926ejs/clock.c
+++ b/arch/arm/mach-at91/arm926ejs/clock.c
@@ -8,6 +8,7 @@
  */
 
 #include <common.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/at91_pmc.h>
diff --git a/arch/arm/mach-at91/arm926ejs/timer.c b/arch/arm/mach-at91/arm926ejs/timer.c
index 42ef349966b..a8cf0e4bd79 100644
--- a/arch/arm/mach-at91/arm926ejs/timer.c
+++ b/arch/arm/mach-at91/arm926ejs/timer.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <init.h>
 #include <time.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/at91_pit.h>
diff --git a/arch/arm/mach-at91/armv7/clock.c b/arch/arm/mach-at91/armv7/clock.c
index 39268969580..aa6bb6bf31e 100644
--- a/arch/arm/mach-at91/armv7/clock.c
+++ b/arch/arm/mach-at91/armv7/clock.c
@@ -10,6 +10,7 @@
  */
 
 #include <common.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/io.h>
diff --git a/arch/arm/mach-at91/armv7/timer.c b/arch/arm/mach-at91/armv7/timer.c
index a6346c01b28..1f54c5dcad9 100644
--- a/arch/arm/mach-at91/armv7/timer.c
+++ b/arch/arm/mach-at91/armv7/timer.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <init.h>
 #include <time.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/at91_pit.h>
diff --git a/arch/arm/mach-at91/spl_at91.c b/arch/arm/mach-at91/spl_at91.c
index 35a3d5185d3..d0c73253924 100644
--- a/arch/arm/mach-at91/spl_at91.c
+++ b/arch/arm/mach-at91/spl_at91.c
@@ -12,6 +12,7 @@
 #include <hang.h>
 #include <init.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/at91_common.h>
 #include <asm/arch/at91sam9_matrix.h>
diff --git a/arch/arm/mach-bcm283x/init.c b/arch/arm/mach-bcm283x/init.c
index f2a54116237..b2708e4876e 100644
--- a/arch/arm/mach-bcm283x/init.c
+++ b/arch/arm/mach-bcm283x/init.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <dm/device.h>
 #include <fdt_support.h>
 
diff --git a/arch/arm/mach-davinci/cpu.c b/arch/arm/mach-davinci/cpu.c
index 40dd44af67e..aefd21dc458 100644
--- a/arch/arm/mach-davinci/cpu.c
+++ b/arch/arm/mach-davinci/cpu.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <init.h>
 #include <asm/arch/hardware.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-davinci/misc.c b/arch/arm/mach-davinci/misc.c
index 5bfc47dae45..90b38b7e020 100644
--- a/arch/arm/mach-davinci/misc.c
+++ b/arch/arm/mach-davinci/misc.c
@@ -15,6 +15,7 @@
 #include <log.h>
 #include <net.h>
 #include <asm/arch/hardware.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/davinci_misc.h>
 
diff --git a/arch/arm/mach-davinci/timer.c b/arch/arm/mach-davinci/timer.c
index a6681821f6d..43e0574901e 100644
--- a/arch/arm/mach-davinci/timer.c
+++ b/arch/arm/mach-davinci/timer.c
@@ -23,6 +23,7 @@
 #include <common.h>
 #include <init.h>
 #include <time.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/timer_defs.h>
 #include <div64.h>
diff --git a/arch/arm/mach-exynos/spl_boot.c b/arch/arm/mach-exynos/spl_boot.c
index 9c7ca49519b..27f0dac182d 100644
--- a/arch/arm/mach-exynos/spl_boot.c
+++ b/arch/arm/mach-exynos/spl_boot.c
@@ -7,6 +7,7 @@
 #include <config.h>
 #include <init.h>
 #include <log.h>
+#include <asm/global_data.h>
 
 #include <asm/cache.h>
 #include <asm/arch/clock.h>
diff --git a/arch/arm/mach-imx/cpu.c b/arch/arm/mach-imx/cpu.c
index 694c26d35fe..dc182eb12d2 100644
--- a/arch/arm/mach-imx/cpu.c
+++ b/arch/arm/mach-imx/cpu.c
@@ -6,8 +6,8 @@
  * (C) Copyright 2009 Freescale Semiconductor, Inc.
  */
 
-#include <bootm.h>
 #include <common.h>
+#include <bootm.h>
 #include <init.h>
 #include <log.h>
 #include <net.h>
diff --git a/arch/arm/mach-imx/imx8/ahab.c b/arch/arm/mach-imx/imx8/ahab.c
index 5dbe1d56e02..bbcefc8e9b6 100644
--- a/arch/arm/mach-imx/imx8/ahab.c
+++ b/arch/arm/mach-imx/imx8/ahab.c
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <errno.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/sci/sci.h>
 #include <asm/mach-imx/sys_proto.h>
diff --git a/arch/arm/mach-imx/imx8/clock.c b/arch/arm/mach-imx/imx8/clock.c
index d747e1332f0..9941b57b4be 100644
--- a/arch/arm/mach-imx/imx8/clock.c
+++ b/arch/arm/mach-imx/imx8/clock.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <asm/global_data.h>
 #include <linux/errno.h>
 #include <asm/arch/clock.h>
 
diff --git a/arch/arm/mach-imx/imx8/cpu.c b/arch/arm/mach-imx/imx8/cpu.c
index 38b2c0926f5..293c931b2ff 100644
--- a/arch/arm/mach-imx/imx8/cpu.c
+++ b/arch/arm/mach-imx/imx8/cpu.c
@@ -11,6 +11,7 @@
 #include <init.h>
 #include <log.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <dm/device-internal.h>
 #include <dm/lists.h>
 #include <dm/uclass.h>
diff --git a/arch/arm/mach-imx/imx8/fdt.c b/arch/arm/mach-imx/imx8/fdt.c
index 3e05b972a45..a132ce2e6a3 100644
--- a/arch/arm/mach-imx/imx8/fdt.c
+++ b/arch/arm/mach-imx/imx8/fdt.c
@@ -7,6 +7,7 @@
 #include <log.h>
 #include <asm/arch/sci/sci.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 #include <dm/ofnode.h>
 #include <fdt_support.h>
 #include <linux/libfdt.h>
diff --git a/arch/arm/mach-imx/imx8/iomux.c b/arch/arm/mach-imx/imx8/iomux.c
index b8e6f48a5f7..9c3cfbf0068 100644
--- a/arch/arm/mach-imx/imx8/iomux.c
+++ b/arch/arm/mach-imx/imx8/iomux.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/iomux.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 564d1bfdfb2..6f9b1c99fcd 100644
--- a/arch/arm/mach-imx/imx8/snvs_security_sc.c
+++ b/arch/arm/mach-imx/imx8/snvs_security_sc.c
@@ -18,6 +18,7 @@
 #include <asm/arch/sci/sci.h>
 #include <asm/arch-imx8/imx8-pins.h>
 #include <asm/arch-imx8/snvs_security_sc.h>
+#include <asm/global_data.h>
 
 /* Access to gd */
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-imx/imx8m/clock_imx8mm.c b/arch/arm/mach-imx/imx8m/clock_imx8mm.c
index 3610f5b2fca..7f99c5c4b91 100644
--- a/arch/arm/mach-imx/imx8m/clock_imx8mm.c
+++ b/arch/arm/mach-imx/imx8m/clock_imx8mm.c
@@ -9,6 +9,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <div64.h>
 #include <errno.h>
diff --git a/arch/arm/mach-imx/imx8m/soc.c b/arch/arm/mach-imx/imx8m/soc.c
index 8ee024ff1af..e5d7815658b 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 <asm/arch/imx-regs.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/sys_proto.h>
diff --git a/arch/arm/mach-imx/misc.c b/arch/arm/mach-imx/misc.c
index 818f38e17dd..d82efa7f8f0 100644
--- a/arch/arm/mach-imx/misc.c
+++ b/arch/arm/mach-imx/misc.c
@@ -7,6 +7,7 @@
 #include <lmb.h>
 #include <log.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/io.h>
diff --git a/arch/arm/mach-imx/mx5/mx53_dram.c b/arch/arm/mach-imx/mx5/mx53_dram.c
index a7f033f3f44..f7441441947 100644
--- a/arch/arm/mach-imx/mx5/mx53_dram.c
+++ b/arch/arm/mach-imx/mx5/mx53_dram.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-imx/mx6/litesom.c b/arch/arm/mach-imx/mx6/litesom.c
index 92176dc8615..699a3dc317f 100644
--- a/arch/arm/mach-imx/mx6/litesom.c
+++ b/arch/arm/mach-imx/mx6/litesom.c
@@ -12,6 +12,7 @@
 #include <asm/arch/mx6ul_pins.h>
 #include <asm/arch/mx6-pins.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/mach-imx/boot_mode.h>
diff --git a/arch/arm/mach-imx/mx6/opos6ul.c b/arch/arm/mach-imx/mx6/opos6ul.c
index 4b3c59f7eef..e9d78740a15 100644
--- a/arch/arm/mach-imx/mx6/opos6ul.c
+++ b/arch/arm/mach-imx/mx6/opos6ul.c
@@ -8,6 +8,7 @@
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <common.h>
 #include <env.h>
diff --git a/arch/arm/mach-imx/mx7/clock.c b/arch/arm/mach-imx/mx7/clock.c
index aba9461d920..b1d7290704a 100644
--- a/arch/arm/mach-imx/mx7/clock.c
+++ b/arch/arm/mach-imx/mx7/clock.c
@@ -11,6 +11,7 @@
 #include <command.h>
 #include <div64.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <asm/arch/imx-regs.h>
diff --git a/arch/arm/mach-imx/mx7ulp/clock.c b/arch/arm/mach-imx/mx7ulp/clock.c
index a987ff22dfd..467832074af 100644
--- a/arch/arm/mach-imx/mx7ulp/clock.c
+++ b/arch/arm/mach-imx/mx7ulp/clock.c
@@ -7,6 +7,7 @@
 #include <clock_legacy.h>
 #include <command.h>
 #include <div64.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <errno.h>
 #include <asm/arch/clock.h>
diff --git a/arch/arm/mach-imx/speed.c b/arch/arm/mach-imx/speed.c
index e78b1fd71b6..b729187ec81 100644
--- a/arch/arm/mach-imx/speed.c
+++ b/arch/arm/mach-imx/speed.c
@@ -11,6 +11,7 @@
 #include <clock_legacy.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/clock.h>
+#include <asm/global_data.h>
 
 #ifdef CONFIG_FSL_ESDHC_IMX
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-imx/spl.c b/arch/arm/mach-imx/spl.c
index 1a231c67f5a..578b510e780 100644
--- a/arch/arm/mach-imx/spl.c
+++ b/arch/arm/mach-imx/spl.c
@@ -10,6 +10,7 @@
 #include <hang.h>
 #include <init.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
diff --git a/arch/arm/mach-imx/spl_imx_romapi.c b/arch/arm/mach-imx/spl_imx_romapi.c
index f588a5f5216..9f4d95982e5 100644
--- a/arch/arm/mach-imx/spl_imx_romapi.c
+++ b/arch/arm/mach-imx/spl_imx_romapi.c
@@ -7,6 +7,7 @@
 #include <errno.h>
 #include <image.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <linux/libfdt.h>
 #include <spl.h>
 
diff --git a/arch/arm/mach-imx/syscounter.c b/arch/arm/mach-imx/syscounter.c
index 7da43c32e0d..6dfed365d29 100644
--- a/arch/arm/mach-imx/syscounter.c
+++ b/arch/arm/mach-imx/syscounter.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <init.h>
 #include <time.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <div64.h>
 #include <asm/arch/imx-regs.h>
diff --git a/arch/arm/mach-k3/common.c b/arch/arm/mach-k3/common.c
index 4335f2877b8..b545561c4e6 100644
--- a/arch/arm/mach-k3/common.c
+++ b/arch/arm/mach-k3/common.c
@@ -12,6 +12,7 @@
 #include <init.h>
 #include <log.h>
 #include <spl.h>
+#include <asm/global_data.h>
 #include "common.h"
 #include <dm.h>
 #include <remoteproc.h>
diff --git a/arch/arm/mach-k3/sysfw-loader.c b/arch/arm/mach-k3/sysfw-loader.c
index 513be09c687..eaa7984b0f6 100644
--- a/arch/arm/mach-k3/sysfw-loader.c
+++ b/arch/arm/mach-k3/sysfw-loader.c
@@ -13,6 +13,7 @@
 #include <malloc.h>
 #include <remoteproc.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <linux/soc/ti/ti_sci_protocol.h>
 #include <g_dnl.h>
 #include <usb.h>
diff --git a/arch/arm/mach-mediatek/mt7623/init.c b/arch/arm/mach-mediatek/mt7623/init.c
index 2778e260e02..5d837e05971 100644
--- a/arch/arm/mach-mediatek/mt7623/init.c
+++ b/arch/arm/mach-mediatek/mt7623/init.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <linux/io.h>
 #include <linux/sizes.h>
 #include <asm/arch/misc.h>
diff --git a/arch/arm/mach-mediatek/mt7629/init.c b/arch/arm/mach-mediatek/mt7629/init.c
index c260413a57a..617a77e9800 100644
--- a/arch/arm/mach-mediatek/mt7629/init.c
+++ b/arch/arm/mach-mediatek/mt7629/init.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <ram.h>
 #include <asm/arch/misc.h>
+#include <asm/global_data.h>
 #include <asm/sections.h>
 #include <dm/uclass.h>
 #include <linux/bitops.h>
diff --git a/arch/arm/mach-mediatek/mt8512/init.c b/arch/arm/mach-mediatek/mt8512/init.c
index aa779f43766..c14e7d22e6f 100644
--- a/arch/arm/mach-mediatek/mt8512/init.c
+++ b/arch/arm/mach-mediatek/mt8512/init.c
@@ -17,6 +17,7 @@
 #include <asm/arch/misc.h>
 #include <asm/armv8/mmu.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/sections.h>
 #include <dm/uclass.h>
 #include <dt-bindings/clock/mt8512-clk.h>
diff --git a/arch/arm/mach-mediatek/mt8516/init.c b/arch/arm/mach-mediatek/mt8516/init.c
index 13be3912211..0eb65aa76b5 100644
--- a/arch/arm/mach-mediatek/mt8516/init.c
+++ b/arch/arm/mach-mediatek/mt8516/init.c
@@ -15,6 +15,7 @@
 #include <asm/arch/misc.h>
 #include <asm/armv8/mmu.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/sections.h>
 #include <dm/uclass.h>
 #include <dt-bindings/clock/mt8516-clk.h>
diff --git a/arch/arm/mach-mediatek/mt8518/init.c b/arch/arm/mach-mediatek/mt8518/init.c
index 531a403da1b..28b00c3dec8 100644
--- a/arch/arm/mach-mediatek/mt8518/init.c
+++ b/arch/arm/mach-mediatek/mt8518/init.c
@@ -16,6 +16,7 @@
 #include <asm/arch/misc.h>
 #include <asm/armv8/mmu.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/sections.h>
 #include <dm/uclass.h>
 #include <dt-bindings/clock/mt8518-clk.h>
diff --git a/arch/arm/mach-meson/board-axg.c b/arch/arm/mach-meson/board-axg.c
index 5e0b3f6cb5e..9ec63141ab1 100644
--- a/arch/arm/mach-meson/board-axg.c
+++ b/arch/arm/mach-meson/board-axg.c
@@ -11,6 +11,7 @@
 #include <asm/arch/eth.h>
 #include <asm/arch/axg.h>
 #include <asm/arch/mem.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/armv8/mmu.h>
 #include <linux/sizes.h>
diff --git a/arch/arm/mach-meson/board-common.c b/arch/arm/mach-meson/board-common.c
index 0f21ec8e537..2e1dcf0e010 100644
--- a/arch/arm/mach-meson/board-common.c
+++ b/arch/arm/mach-meson/board-common.c
@@ -10,6 +10,7 @@
 #include <asm/arch/boot.h>
 #include <env.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/ptrace.h>
 #include <linux/libfdt.h>
 #include <linux/err.h>
diff --git a/arch/arm/mach-meson/board-g12a.c b/arch/arm/mach-meson/board-g12a.c
index 14127ca737c..bb75d4f8ad3 100644
--- a/arch/arm/mach-meson/board-g12a.c
+++ b/arch/arm/mach-meson/board-g12a.c
@@ -13,6 +13,7 @@
 #include <asm/arch/g12a.h>
 #include <asm/arch/mem.h>
 #include <asm/arch/meson-vpu.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/armv8/mmu.h>
 #include <linux/sizes.h>
diff --git a/arch/arm/mach-meson/board-gx.c b/arch/arm/mach-meson/board-gx.c
index c4cc11f1de3..6824b846d4d 100644
--- a/arch/arm/mach-meson/board-gx.c
+++ b/arch/arm/mach-meson/board-gx.c
@@ -12,6 +12,7 @@
 #include <asm/arch/gx.h>
 #include <asm/arch/mem.h>
 #include <asm/arch/meson-vpu.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/armv8/mmu.h>
 #include <linux/sizes.h>
diff --git a/arch/arm/mach-meson/board-info.c b/arch/arm/mach-meson/board-info.c
index 3abb27e03b4..28385488995 100644
--- a/arch/arm/mach-meson/board-info.c
+++ b/arch/arm/mach-meson/board-info.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm.h>
 #include <linux/bitfield.h>
diff --git a/arch/arm/mach-meson/sm.c b/arch/arm/mach-meson/sm.c
index ebbb880b71e..1a8f23cb1fa 100644
--- a/arch/arm/mach-meson/sm.c
+++ b/arch/arm/mach-meson/sm.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <asm/arch/sm.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/ptrace.h>
 #include <linux/bitops.h>
 #include <linux/err.h>
diff --git a/arch/arm/mach-mvebu/arm64-common.c b/arch/arm/mach-mvebu/arm64-common.c
index c8c065e93c3..fa687d8abbb 100644
--- a/arch/arm/mach-mvebu/arm64-common.c
+++ b/arch/arm/mach-mvebu/arm64-common.c
@@ -8,6 +8,7 @@
 #include <fdtdec.h>
 #include <init.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/ptrace.h>
 #include <linux/libfdt.h>
 #include <linux/sizes.h>
diff --git a/arch/arm/mach-mvebu/armada3700/cpu.c b/arch/arm/mach-mvebu/armada3700/cpu.c
index e438b4922e1..70f76c7d707 100644
--- a/arch/arm/mach-mvebu/armada3700/cpu.c
+++ b/arch/arm/mach-mvebu/armada3700/cpu.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <fdtdec.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/libfdt.h>
 #include <asm/io.h>
diff --git a/arch/arm/mach-mvebu/armada8k/dram.c b/arch/arm/mach-mvebu/armada8k/dram.c
index 3da9fa589d2..bab375e18ac 100644
--- a/arch/arm/mach-mvebu/armada8k/dram.c
+++ b/arch/arm/mach-mvebu/armada8k/dram.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <asm/global_data.h>
 #include <asm/ptrace.h>
 #include <asm/system.h>
 #include <linux/sizes.h>
diff --git a/arch/arm/mach-mvebu/dram.c b/arch/arm/mach-mvebu/dram.c
index 6c6f8d8c5c5..349e0cc4c18 100644
--- a/arch/arm/mach-mvebu/dram.c
+++ b/arch/arm/mach-mvebu/dram.c
@@ -8,6 +8,7 @@
 #include <config.h>
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
diff --git a/arch/arm/mach-mvebu/spl.c b/arch/arm/mach-mvebu/spl.c
index f645befb2c0..16ebb7a59e5 100644
--- a/arch/arm/mach-mvebu/spl.c
+++ b/arch/arm/mach-mvebu/spl.c
@@ -11,6 +11,7 @@
 #include <init.h>
 #include <log.h>
 #include <spl.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
diff --git a/arch/arm/mach-omap2/am33xx/board.c b/arch/arm/mach-omap2/am33xx/board.c
index a7b56b6bb3d..3b17446cd5d 100644
--- a/arch/arm/mach-omap2/am33xx/board.c
+++ b/arch/arm/mach-omap2/am33xx/board.c
@@ -25,6 +25,7 @@
 #include <asm/arch/mem.h>
 #include <asm/arch/mmc_host_def.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/emif.h>
 #include <asm/gpio.h>
diff --git a/arch/arm/mach-omap2/boot-common.c b/arch/arm/mach-omap2/boot-common.c
index cb9d7fdb156..05efe04dc35 100644
--- a/arch/arm/mach-omap2/boot-common.c
+++ b/arch/arm/mach-omap2/boot-common.c
@@ -11,6 +11,7 @@
 #include <ahci.h>
 #include <log.h>
 #include <spl.h>
+#include <asm/global_data.h>
 #include <asm/omap_common.h>
 #include <asm/arch/omap.h>
 #include <asm/arch/mmc_host_def.h>
diff --git a/arch/arm/mach-omap2/hwinit-common.c b/arch/arm/mach-omap2/hwinit-common.c
index 7a7086776ee..3da50f974dc 100644
--- a/arch/arm/mach-omap2/hwinit-common.c
+++ b/arch/arm/mach-omap2/hwinit-common.c
@@ -16,6 +16,7 @@
 #include <init.h>
 #include <spl.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 #include <linux/sizes.h>
 #include <asm/emif.h>
 #include <asm/omap_common.h>
diff --git a/arch/arm/mach-omap2/omap-cache.c b/arch/arm/mach-omap2/omap-cache.c
index 502ea6987ab..1b246f844a8 100644
--- a/arch/arm/mach-omap2/omap-cache.c
+++ b/arch/arm/mach-omap2/omap-cache.c
@@ -15,6 +15,7 @@
 #include <cpu_func.h>
 #include <log.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-omap2/omap3/am35x_musb.c b/arch/arm/mach-omap2/omap3/am35x_musb.c
index 026e5d2d130..95e15c1a51b 100644
--- a/arch/arm/mach-omap2/omap3/am35x_musb.c
+++ b/arch/arm/mach-omap2/omap3/am35x_musb.c
@@ -9,6 +9,7 @@
  */
 
 #include <common.h>
+#include <dm.h>
 #include <log.h>
 #include <asm/io.h>
 #include <asm/arch/am35x_def.h>
diff --git a/arch/arm/mach-omap2/omap3/emif4.c b/arch/arm/mach-omap2/omap3/emif4.c
index 4cfa1323881..df6e9ce1d6c 100644
--- a/arch/arm/mach-omap2/omap3/emif4.c
+++ b/arch/arm/mach-omap2/omap3/emif4.c
@@ -11,6 +11,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/mem.h>
 #include <asm/arch/sys_proto.h>
diff --git a/arch/arm/mach-omap2/omap3/sdrc.c b/arch/arm/mach-omap2/omap3/sdrc.c
index 1d65ed62270..4d85b1dee99 100644
--- a/arch/arm/mach-omap2/omap3/sdrc.c
+++ b/arch/arm/mach-omap2/omap3/sdrc.c
@@ -23,6 +23,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/mem.h>
 #include <asm/arch/sys_proto.h>
diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c
index bcfba16a08e..82b10f6b248 100644
--- a/arch/arm/mach-omap2/timer.c
+++ b/arch/arm/mach-omap2/timer.c
@@ -18,6 +18,7 @@
 #include <common.h>
 #include <init.h>
 #include <time.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/clock.h>
diff --git a/arch/arm/mach-orion5x/dram.c b/arch/arm/mach-orion5x/dram.c
index 33f65db48ea..c9a3750e48d 100644
--- a/arch/arm/mach-orion5x/dram.c
+++ b/arch/arm/mach-orion5x/dram.c
@@ -12,6 +12,7 @@
 #include <config.h>
 #include <init.h>
 #include <asm/arch/cpu.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-orion5x/timer.c b/arch/arm/mach-orion5x/timer.c
index 4926bb77796..0adf3dcc648 100644
--- a/arch/arm/mach-orion5x/timer.c
+++ b/arch/arm/mach-orion5x/timer.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <init.h>
 #include <time.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/delay.h>
 
diff --git a/arch/arm/mach-owl/soc.c b/arch/arm/mach-owl/soc.c
index fd6ee7c1c0f..4d2b9d0b0eb 100644
--- a/arch/arm/mach-owl/soc.c
+++ b/arch/arm/mach-owl/soc.c
@@ -8,6 +8,7 @@
 #include <cpu_func.h>
 #include <init.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <linux/arm-smccc.h>
 #include <linux/psci.h>
 #include <common.h>
diff --git a/arch/arm/mach-rmobile/memmap-gen3.c b/arch/arm/mach-rmobile/memmap-gen3.c
index 578cb9bfd3f..a68eb806b35 100644
--- a/arch/arm/mach-rmobile/memmap-gen3.c
+++ b/arch/arm/mach-rmobile/memmap-gen3.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <asm/armv8/mmu.h>
+#include <asm/global_data.h>
 
 #define GEN3_NR_REGIONS 16
 
diff --git a/arch/arm/mach-rockchip/board.c b/arch/arm/mach-rockchip/board.c
index 430c0cbf41e..eed8f589d23 100644
--- a/arch/arm/mach-rockchip/board.c
+++ b/arch/arm/mach-rockchip/board.c
@@ -11,6 +11,7 @@
 #include <ram.h>
 #include <syscon.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch-rockchip/boot_mode.h>
 #include <asm/arch-rockchip/clock.h>
diff --git a/arch/arm/mach-rockchip/rk3036-board-spl.c b/arch/arm/mach-rockchip/rk3036-board-spl.c
index 6eb89e15b81..964e981b863 100644
--- a/arch/arm/mach-rockchip/rk3036-board-spl.c
+++ b/arch/arm/mach-rockchip/rk3036-board-spl.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <debug_uart.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch-rockchip/bootrom.h>
 #include <asm/arch-rockchip/sdram_rk3036.h>
diff --git a/arch/arm/mach-rockchip/rk3036/rk3036.c b/arch/arm/mach-rockchip/rk3036/rk3036.c
index e9e020ff3f5..0a072cf03a8 100644
--- a/arch/arm/mach-rockchip/rk3036/rk3036.c
+++ b/arch/arm/mach-rockchip/rk3036/rk3036.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch-rockchip/grf_rk3036.h>
 #include <asm/arch-rockchip/hardware.h>
diff --git a/arch/arm/mach-rockchip/rk3128/rk3128.c b/arch/arm/mach-rockchip/rk3128/rk3128.c
index 740bd2ba077..01dbfa75cb2 100644
--- a/arch/arm/mach-rockchip/rk3128/rk3128.c
+++ b/arch/arm/mach-rockchip/rk3128/rk3128.c
@@ -4,6 +4,7 @@
  */
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-rockchip/rk3188/rk3188.c b/arch/arm/mach-rockchip/rk3188/rk3188.c
index 1b2f4a47571..85dcce90330 100644
--- a/arch/arm/mach-rockchip/rk3188/rk3188.c
+++ b/arch/arm/mach-rockchip/rk3188/rk3188.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <log.h>
 #include <syscon.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch-rockchip/bootrom.h>
 #include <asm/arch-rockchip/clock.h>
diff --git a/arch/arm/mach-rockchip/rk3288/rk3288.c b/arch/arm/mach-rockchip/rk3288/rk3288.c
index 1a4ecdf6254..bc20bc5ab90 100644
--- a/arch/arm/mach-rockchip/rk3288/rk3288.c
+++ b/arch/arm/mach-rockchip/rk3288/rk3288.c
@@ -10,6 +10,7 @@
 #include <init.h>
 #include <malloc.h>
 #include <asm/armv7.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch-rockchip/bootrom.h>
 #include <asm/arch-rockchip/clock.h>
diff --git a/arch/arm/mach-rockchip/rk3308/rk3308.c b/arch/arm/mach-rockchip/rk3308/rk3308.c
index 8e8214cf7ec..70fe0d0ac35 100644
--- a/arch/arm/mach-rockchip/rk3308/rk3308.c
+++ b/arch/arm/mach-rockchip/rk3308/rk3308.c
@@ -5,6 +5,7 @@
 #include <common.h>
 #include <init.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/grf_rk3308.h>
 #include <asm/arch-rockchip/hardware.h>
diff --git a/arch/arm/mach-rockchip/rk3328/rk3328.c b/arch/arm/mach-rockchip/rk3328/rk3328.c
index 7c85b2663c8..ec3336cb49a 100644
--- a/arch/arm/mach-rockchip/rk3328/rk3328.c
+++ b/arch/arm/mach-rockchip/rk3328/rk3328.c
@@ -10,6 +10,7 @@
 #include <asm/arch-rockchip/grf_rk3328.h>
 #include <asm/arch-rockchip/uart.h>
 #include <asm/armv8/mmu.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-rockchip/rk3368/rk3368.c b/arch/arm/mach-rockchip/rk3368/rk3368.c
index 1c6d65a5887..9b7132d471c 100644
--- a/arch/arm/mach-rockchip/rk3368/rk3368.c
+++ b/arch/arm/mach-rockchip/rk3368/rk3368.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <syscon.h>
 #include <asm/armv8/mmu.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch-rockchip/bootrom.h>
 #include <asm/arch-rockchip/clock.h>
diff --git a/arch/arm/mach-rockchip/rk3399/rk3399.c b/arch/arm/mach-rockchip/rk3399/rk3399.c
index c6434839719..869d2159bea 100644
--- a/arch/arm/mach-rockchip/rk3399/rk3399.c
+++ b/arch/arm/mach-rockchip/rk3399/rk3399.c
@@ -11,6 +11,7 @@
 #include <spl_gpio.h>
 #include <syscon.h>
 #include <asm/armv8/mmu.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch-rockchip/bootrom.h>
 #include <asm/arch-rockchip/clock.h>
diff --git a/arch/arm/mach-rockchip/sdram.c b/arch/arm/mach-rockchip/sdram.c
index 4c637b77673..ed07ece15a4 100644
--- a/arch/arm/mach-rockchip/sdram.c
+++ b/arch/arm/mach-rockchip/sdram.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <log.h>
 #include <ram.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch-rockchip/sdram.h>
 #include <dm/uclass-internal.h>
diff --git a/arch/arm/mach-rockchip/spl-boot-order.c b/arch/arm/mach-rockchip/spl-boot-order.c
index 94673f34c9b..e05c12e0cd3 100644
--- a/arch/arm/mach-rockchip/spl-boot-order.c
+++ b/arch/arm/mach-rockchip/spl-boot-order.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <mmc.h>
 #include <spl.h>
+#include <asm/global_data.h>
 
 #if CONFIG_IS_ENABLED(OF_LIBFDT)
 /**
diff --git a/arch/arm/mach-rockchip/spl.c b/arch/arm/mach-rockchip/spl.c
index f148d48b6a3..4b5c22dc138 100644
--- a/arch/arm/mach-rockchip/spl.c
+++ b/arch/arm/mach-rockchip/spl.c
@@ -13,6 +13,7 @@
 #include <ram.h>
 #include <spl.h>
 #include <asm/arch-rockchip/bootrom.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
 
diff --git a/arch/arm/mach-snapdragon/pinctrl-snapdragon.h b/arch/arm/mach-snapdragon/pinctrl-snapdragon.h
index 24f8863f59b..61d466f4d84 100644
--- a/arch/arm/mach-snapdragon/pinctrl-snapdragon.h
+++ b/arch/arm/mach-snapdragon/pinctrl-snapdragon.h
@@ -8,7 +8,7 @@
 #ifndef _PINCTRL_SNAPDRAGON_H
 #define _PINCTRL_SNAPDRAGON_H
 
-#include <common.h>
+struct udevice;
 
 struct msm_pinctrl_data {
 	int pin_count;
diff --git a/arch/arm/mach-socfpga/board.c b/arch/arm/mach-socfpga/board.c
index 340abf9305c..bdd5b863c45 100644
--- a/arch/arm/mach-socfpga/board.c
+++ b/arch/arm/mach-socfpga/board.c
@@ -12,6 +12,7 @@
 #include <asm/arch/reset_manager.h>
 #include <asm/arch/clock_manager.h>
 #include <asm/arch/misc.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 
 #include <usb.h>
diff --git a/arch/arm/mach-socfpga/clock_manager.c b/arch/arm/mach-socfpga/clock_manager.c
index a4a97b6a0fc..f0b15f770cc 100644
--- a/arch/arm/mach-socfpga/clock_manager.c
+++ b/arch/arm/mach-socfpga/clock_manager.c
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <init.h>
 #include <wait_bit.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock_manager.h>
 
diff --git a/arch/arm/mach-socfpga/clock_manager_agilex.c b/arch/arm/mach-socfpga/clock_manager_agilex.c
index 6188a8c3d2d..4bf01f3c8ae 100644
--- a/arch/arm/mach-socfpga/clock_manager_agilex.c
+++ b/arch/arm/mach-socfpga/clock_manager_agilex.c
@@ -11,6 +11,7 @@
 #include <malloc.h>
 #include <asm/arch/clock_manager.h>
 #include <asm/arch/system_manager.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <dt-bindings/clock/agilex-clock.h>
 
diff --git a/arch/arm/mach-socfpga/clock_manager_s10.c b/arch/arm/mach-socfpga/clock_manager_s10.c
index 05e42127b57..642dcbb0ac0 100644
--- a/arch/arm/mach-socfpga/clock_manager_s10.c
+++ b/arch/arm/mach-socfpga/clock_manager_s10.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock_manager.h>
 #include <asm/arch/handoff_s10.h>
diff --git a/arch/arm/mach-socfpga/mailbox_s10.c b/arch/arm/mach-socfpga/mailbox_s10.c
index f30e7f80a29..82dfcd124ca 100644
--- a/arch/arm/mach-socfpga/mailbox_s10.c
+++ b/arch/arm/mach-socfpga/mailbox_s10.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <hang.h>
 #include <wait_bit.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/mailbox_s10.h>
 #include <asm/arch/system_manager.h>
diff --git a/arch/arm/mach-socfpga/misc.c b/arch/arm/mach-socfpga/misc.c
index ac2b891fade..64a7c9d652c 100644
--- a/arch/arm/mach-socfpga/misc.c
+++ b/arch/arm/mach-socfpga/misc.c
@@ -9,6 +9,7 @@
 #include <hang.h>
 #include <asm/cache.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <errno.h>
 #include <fdtdec.h>
diff --git a/arch/arm/mach-socfpga/misc_gen5.c b/arch/arm/mach-socfpga/misc_gen5.c
index 7209e8d6db7..4edf4f9b5c1 100644
--- a/arch/arm/mach-socfpga/misc_gen5.c
+++ b/arch/arm/mach-socfpga/misc_gen5.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <env.h>
 #include <errno.h>
diff --git a/arch/arm/mach-socfpga/misc_s10.c b/arch/arm/mach-socfpga/misc_s10.c
index 670bfa1a31f..733856c33c1 100644
--- a/arch/arm/mach-socfpga/misc_s10.c
+++ b/arch/arm/mach-socfpga/misc_s10.c
@@ -13,6 +13,7 @@
 #include <log.h>
 #include <miiphy.h>
 #include <netdev.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/reset_manager.h>
 #include <asm/arch/system_manager.h>
diff --git a/arch/arm/mach-socfpga/mmu-arm64_s10.c b/arch/arm/mach-socfpga/mmu-arm64_s10.c
index 670ceb92ae3..a55b7b7cf3b 100644
--- a/arch/arm/mach-socfpga/mmu-arm64_s10.c
+++ b/arch/arm/mach-socfpga/mmu-arm64_s10.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <asm/armv8/mmu.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-socfpga/reset_manager_arria10.c b/arch/arm/mach-socfpga/reset_manager_arria10.c
index aa5299415a7..27c03080113 100644
--- a/arch/arm/mach-socfpga/reset_manager_arria10.c
+++ b/arch/arm/mach-socfpga/reset_manager_arria10.c
@@ -3,6 +3,7 @@
  * Copyright (C) 2016-2017 Intel Corporation
  */
 
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/fpga_manager.h>
 #include <asm/arch/misc.h>
diff --git a/arch/arm/mach-socfpga/reset_manager_s10.c b/arch/arm/mach-socfpga/reset_manager_s10.c
index c7430777b28..81e4c67fba6 100644
--- a/arch/arm/mach-socfpga/reset_manager_s10.c
+++ b/arch/arm/mach-socfpga/reset_manager_s10.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/reset_manager.h>
 #include <asm/arch/system_manager.h>
diff --git a/arch/arm/mach-socfpga/spl_a10.c b/arch/arm/mach-socfpga/spl_a10.c
index 45aea4ab6cc..92231b5ba3c 100644
--- a/arch/arm/mach-socfpga/spl_a10.c
+++ b/arch/arm/mach-socfpga/spl_a10.c
@@ -7,6 +7,7 @@
 #include <cpu_func.h>
 #include <hang.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/pl310.h>
 #include <asm/u-boot.h>
diff --git a/arch/arm/mach-socfpga/spl_agilex.c b/arch/arm/mach-socfpga/spl_agilex.c
index bd971ecbd1d..9871d1b6c8b 100644
--- a/arch/arm/mach-socfpga/spl_agilex.c
+++ b/arch/arm/mach-socfpga/spl_agilex.c
@@ -6,6 +6,7 @@
 
 #include <init.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/u-boot.h>
 #include <asm/utils.h>
diff --git a/arch/arm/mach-socfpga/spl_gen5.c b/arch/arm/mach-socfpga/spl_gen5.c
index 5a7c5ef76d5..7c716117685 100644
--- a/arch/arm/mach-socfpga/spl_gen5.c
+++ b/arch/arm/mach-socfpga/spl_gen5.c
@@ -7,6 +7,7 @@
 #include <hang.h>
 #include <init.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/u-boot.h>
 #include <asm/utils.h>
diff --git a/arch/arm/mach-socfpga/spl_s10.c b/arch/arm/mach-socfpga/spl_s10.c
index b3c6f6afc44..cbffa669936 100644
--- a/arch/arm/mach-socfpga/spl_s10.c
+++ b/arch/arm/mach-socfpga/spl_s10.c
@@ -7,6 +7,7 @@
 #include <hang.h>
 #include <init.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/u-boot.h>
 #include <asm/utils.h>
diff --git a/arch/arm/mach-socfpga/system_manager_s10.c b/arch/arm/mach-socfpga/system_manager_s10.c
index cdda881efd7..c123cc96445 100644
--- a/arch/arm/mach-socfpga/system_manager_s10.c
+++ b/arch/arm/mach-socfpga/system_manager_s10.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/system_manager.h>
 
diff --git a/arch/arm/mach-stm32mp/boot_params.c b/arch/arm/mach-stm32mp/boot_params.c
index 37ee9e1612c..c4fba9e33af 100644
--- a/arch/arm/mach-stm32mp/boot_params.c
+++ b/arch/arm/mach-stm32mp/boot_params.c
@@ -7,6 +7,7 @@
 #include <log.h>
 #include <asm/sections.h>
 #include <asm/system.h>
+#include <linux/libfdt.h>
 
 /*
  * Force data-section, as .bss will not be valid
diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c
index e4199dbaa59..0824bbf91a2 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 <asm/arch/stm32mp1_smc.h>
+#include <asm/global_data.h>
 #include <dm/uclass.h>
 #include <jffs2/load_kernel.h>
 #include <linux/list.h>
diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_serial.c b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_serial.c
index 70940f01f32..c94bbd82979 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 <watchdog.h>
+#include <asm/global_data.h>
 #include <dm/lists.h>
 #include <dm/device-internal.h>
 #include <linux/delay.h>
diff --git a/arch/arm/mach-stm32mp/cpu.c b/arch/arm/mach-stm32mp/cpu.c
index b7fcee2b367..469c5b704e4 100644
--- a/arch/arm/mach-stm32mp/cpu.c
+++ b/arch/arm/mach-stm32mp/cpu.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <misc.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/bsec.h>
 #include <asm/arch/stm32.h>
diff --git a/arch/arm/mach-stm32mp/dram_init.c b/arch/arm/mach-stm32mp/dram_init.c
index 0e8ce63f4a2..611e0ff0eb7 100644
--- a/arch/arm/mach-stm32mp/dram_init.c
+++ b/arch/arm/mach-stm32mp/dram_init.c
@@ -10,6 +10,7 @@
 #include <lmb.h>
 #include <log.h>
 #include <ram.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-stm32mp/fdt.c b/arch/arm/mach-stm32mp/fdt.c
index 0de1d822912..9dbc595cc4f 100644
--- a/arch/arm/mach-stm32mp/fdt.c
+++ b/arch/arm/mach-stm32mp/fdt.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <fdtdec.h>
 #include <fdt_support.h>
 #include <log.h>
 #include <tee.h>
diff --git a/arch/arm/mach-stm32mp/spl.c b/arch/arm/mach-stm32mp/spl.c
index e84bdad7bfc..ab467de231a 100644
--- a/arch/arm/mach-stm32mp/spl.c
+++ b/arch/arm/mach-stm32mp/spl.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <spl.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
 #include <linux/libfdt.h>
diff --git a/arch/arm/mach-tegra/board.c b/arch/arm/mach-tegra/board.c
index 03faacbd577..ecdfcdde921 100644
--- a/arch/arm/mach-tegra/board.c
+++ b/arch/arm/mach-tegra/board.c
@@ -12,6 +12,7 @@
 #include <ns16550.h>
 #include <spl.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #if IS_ENABLED(CONFIG_TEGRA_CLKRST)
 #include <asm/arch/clock.h>
diff --git a/arch/arm/mach-tegra/board2.c b/arch/arm/mach-tegra/board2.c
index 48c4f32d6f9..66376dd39a2 100644
--- a/arch/arm/mach-tegra/board2.c
+++ b/arch/arm/mach-tegra/board2.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <ns16550.h>
 #include <usb.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch-tegra/ap.h>
 #include <asm/arch-tegra/board.h>
diff --git a/arch/arm/mach-tegra/cboot.c b/arch/arm/mach-tegra/cboot.c
index 16c4cf306ec..bb46fb23ff7 100644
--- a/arch/arm/mach-tegra/cboot.c
+++ b/arch/arm/mach-tegra/cboot.c
@@ -14,6 +14,7 @@
 #include <net.h>
 #include <stdlib.h>
 #include <string.h>
+#include <asm/global_data.h>
 
 #include <linux/ctype.h>
 #include <linux/sizes.h>
diff --git a/arch/arm/mach-tegra/emc.c b/arch/arm/mach-tegra/emc.c
index 66628933b65..2eea14b5a74 100644
--- a/arch/arm/mach-tegra/emc.c
+++ b/arch/arm/mach-tegra/emc.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <asm/global_data.h>
 #include "emc.h"
 #include <asm/io.h>
 #include <asm/arch/clock.h>
diff --git a/arch/arm/mach-tegra/pmc.c b/arch/arm/mach-tegra/pmc.c
index cdc8493efd8..93db63e104a 100644
--- a/arch/arm/mach-tegra/pmc.c
+++ b/arch/arm/mach-tegra/pmc.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <log.h>
+#include <asm/global_data.h>
 
 #include <linux/arm-smccc.h>
 
diff --git a/arch/arm/mach-tegra/tegra124/xusb-padctl.c b/arch/arm/mach-tegra/tegra124/xusb-padctl.c
index 38afc3cbe6d..c95ca048d5e 100644
--- a/arch/arm/mach-tegra/tegra124/xusb-padctl.c
+++ b/arch/arm/mach-tegra/tegra124/xusb-padctl.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <errno.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <dm/of_access.h>
 #include <dm/ofnode.h>
 #include <linux/delay.h>
diff --git a/arch/arm/mach-tegra/tegra20/warmboot.c b/arch/arm/mach-tegra/tegra20/warmboot.c
index ddde4a66772..3d3758f6e6f 100644
--- a/arch/arm/mach-tegra/tegra20/warmboot.c
+++ b/arch/arm/mach-tegra/tegra20/warmboot.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <asm/arch/clock.h>
diff --git a/arch/arm/mach-tegra/tegra210/xusb-padctl.c b/arch/arm/mach-tegra/tegra210/xusb-padctl.c
index d160ce4c999..c414dfd3b86 100644
--- a/arch/arm/mach-tegra/tegra210/xusb-padctl.c
+++ b/arch/arm/mach-tegra/tegra210/xusb-padctl.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <errno.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <dm/of_access.h>
 #include <dm/ofnode.h>
 #include <linux/delay.h>
diff --git a/arch/arm/mach-uniphier/board_late_init.c b/arch/arm/mach-uniphier/board_late_init.c
index b800e8b8c6b..d7d6643961c 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 <asm/global_data.h>
 #include <linux/libfdt.h>
 #include <nand.h>
 #include <stdio.h>
diff --git a/arch/arm/mach-versal/clk.c b/arch/arm/mach-versal/clk.c
index b1e34796d0d..249e050cc8d 100644
--- a/arch/arm/mach-versal/clk.c
+++ b/arch/arm/mach-versal/clk.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <init.h>
 #include <time.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-versal/cpu.c b/arch/arm/mach-versal/cpu.c
index 61c0b663fcf..a35aac2c02c 100644
--- a/arch/arm/mach-versal/cpu.c
+++ b/arch/arm/mach-versal/cpu.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <asm/armv8/mmu.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/sys_proto.h>
diff --git a/arch/arm/mach-versal/mp.c b/arch/arm/mach-versal/mp.c
index 4b434b0ac3f..c97c311d313 100644
--- a/arch/arm/mach-versal/mp.c
+++ b/arch/arm/mach-versal/mp.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/sys_proto.h>
diff --git a/arch/arm/mach-zynq/clk.c b/arch/arm/mach-zynq/clk.c
index 1ace117fc8e..9bab393e211 100644
--- a/arch/arm/mach-zynq/clk.c
+++ b/arch/arm/mach-zynq/clk.c
@@ -9,6 +9,7 @@
 #include <init.h>
 #include <malloc.h>
 #include <asm/arch/clk.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-zynq/timer.c b/arch/arm/mach-zynq/timer.c
index cc0e24cbfed..08cb4406cc3 100644
--- a/arch/arm/mach-zynq/timer.c
+++ b/arch/arm/mach-zynq/timer.c
@@ -34,6 +34,7 @@
 #include <init.h>
 #include <time.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/clk.h>
diff --git a/arch/arm/mach-zynqmp-r5/cpu.c b/arch/arm/mach-zynqmp-r5/cpu.c
index b3402d71895..b9574997859 100644
--- a/arch/arm/mach-zynqmp-r5/cpu.c
+++ b/arch/arm/mach-zynqmp-r5/cpu.c
@@ -7,6 +7,7 @@
 #include <cpu_func.h>
 #include <init.h>
 #include <asm/armv7_mpu.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-zynqmp/clk.c b/arch/arm/mach-zynqmp/clk.c
index 5067b339c21..1e6e726e879 100644
--- a/arch/arm/mach-zynqmp/clk.c
+++ b/arch/arm/mach-zynqmp/clk.c
@@ -10,6 +10,7 @@
 #include <asm/arch/clk.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-zynqmp/cpu.c b/arch/arm/mach-zynqmp/cpu.c
index 3eb8e8f4487..29743cae5aa 100644
--- a/arch/arm/mach-zynqmp/cpu.c
+++ b/arch/arm/mach-zynqmp/cpu.c
@@ -11,6 +11,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/armv8/mmu.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <zynqmp_firmware.h>
 #include <asm/cache.h>
diff --git a/arch/m68k/cpu/mcf5227x/cpu.c b/arch/m68k/cpu/mcf5227x/cpu.c
index 5ea6158c809..a7adf64f0de 100644
--- a/arch/m68k/cpu/mcf5227x/cpu.c
+++ b/arch/m68k/cpu/mcf5227x/cpu.c
@@ -13,6 +13,7 @@
 #include <vsprintf.h>
 #include <watchdog.h>
 #include <command.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 
 #include <asm/immap.h>
diff --git a/arch/m68k/cpu/mcf5227x/speed.c b/arch/m68k/cpu/mcf5227x/speed.c
index 207f4534807..fa9d5cb7887 100644
--- a/arch/m68k/cpu/mcf5227x/speed.c
+++ b/arch/m68k/cpu/mcf5227x/speed.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <clock_legacy.h>
+#include <asm/global_data.h>
 #include <asm/processor.h>
 
 #include <asm/immap.h>
diff --git a/arch/m68k/cpu/mcf523x/cpu.c b/arch/m68k/cpu/mcf523x/cpu.c
index 8664231b5a1..8d3ab6f3fb2 100644
--- a/arch/m68k/cpu/mcf523x/cpu.c
+++ b/arch/m68k/cpu/mcf523x/cpu.c
@@ -15,6 +15,7 @@
 #include <watchdog.h>
 #include <command.h>
 #include <netdev.h>
+#include <asm/global_data.h>
 
 #include <asm/immap.h>
 #include <asm/io.h>
diff --git a/arch/m68k/cpu/mcf523x/speed.c b/arch/m68k/cpu/mcf523x/speed.c
index 2f65ac23182..f41f977d7f5 100644
--- a/arch/m68k/cpu/mcf523x/speed.c
+++ b/arch/m68k/cpu/mcf523x/speed.c
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <clock_legacy.h>
+#include <asm/global_data.h>
 #include <asm/processor.h>
 
 #include <asm/immap.h>
diff --git a/arch/m68k/cpu/mcf52x2/cpu.c b/arch/m68k/cpu/mcf52x2/cpu.c
index 8898a7562ad..0676e391410 100644
--- a/arch/m68k/cpu/mcf52x2/cpu.c
+++ b/arch/m68k/cpu/mcf52x2/cpu.c
@@ -19,6 +19,7 @@
 #include <vsprintf.h>
 #include <watchdog.h>
 #include <command.h>
+#include <asm/global_data.h>
 #include <asm/immap.h>
 #include <asm/io.h>
 #include <netdev.h>
diff --git a/arch/m68k/cpu/mcf52x2/speed.c b/arch/m68k/cpu/mcf52x2/speed.c
index 751c83a4fc0..045908a13d4 100644
--- a/arch/m68k/cpu/mcf52x2/speed.c
+++ b/arch/m68k/cpu/mcf52x2/speed.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <clock_legacy.h>
+#include <asm/global_data.h>
 #include <asm/processor.h>
 #include <asm/immap.h>
 #include <asm/io.h>
diff --git a/arch/m68k/cpu/mcf530x/speed.c b/arch/m68k/cpu/mcf530x/speed.c
index cf53dfeb150..03d9abeb182 100644
--- a/arch/m68k/cpu/mcf530x/speed.c
+++ b/arch/m68k/cpu/mcf530x/speed.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <clock_legacy.h>
+#include <asm/global_data.h>
 #include <asm/processor.h>
 #include <asm/immap.h>
 
diff --git a/arch/m68k/cpu/mcf532x/cpu.c b/arch/m68k/cpu/mcf532x/cpu.c
index f1e6f734eb4..d37dd3defb7 100644
--- a/arch/m68k/cpu/mcf532x/cpu.c
+++ b/arch/m68k/cpu/mcf532x/cpu.c
@@ -15,6 +15,7 @@
 #include <watchdog.h>
 #include <command.h>
 #include <netdev.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 
 #include <asm/immap.h>
diff --git a/arch/m68k/cpu/mcf532x/speed.c b/arch/m68k/cpu/mcf532x/speed.c
index 0f54ea4b6a8..e2985792d96 100644
--- a/arch/m68k/cpu/mcf532x/speed.c
+++ b/arch/m68k/cpu/mcf532x/speed.c
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <clock_legacy.h>
+#include <asm/global_data.h>
 #include <asm/processor.h>
 
 #include <asm/immap.h>
diff --git a/arch/m68k/cpu/mcf5445x/cpu.c b/arch/m68k/cpu/mcf5445x/cpu.c
index ebe15ca518c..ac1e5916816 100644
--- a/arch/m68k/cpu/mcf5445x/cpu.c
+++ b/arch/m68k/cpu/mcf5445x/cpu.c
@@ -15,6 +15,7 @@
 #include <watchdog.h>
 #include <command.h>
 #include <netdev.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 
 #include <asm/immap.h>
diff --git a/arch/m68k/cpu/mcf5445x/speed.c b/arch/m68k/cpu/mcf5445x/speed.c
index eaa3b39bec6..a0b9af8866b 100644
--- a/arch/m68k/cpu/mcf5445x/speed.c
+++ b/arch/m68k/cpu/mcf5445x/speed.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <clock_legacy.h>
+#include <asm/global_data.h>
 #include <asm/processor.h>
 
 #include <asm/immap.h>
diff --git a/arch/m68k/cpu/mcf547x_8x/cpu.c b/arch/m68k/cpu/mcf547x_8x/cpu.c
index e53adeb46b5..c1361e70579 100644
--- a/arch/m68k/cpu/mcf547x_8x/cpu.c
+++ b/arch/m68k/cpu/mcf547x_8x/cpu.c
@@ -15,6 +15,7 @@
 #include <watchdog.h>
 #include <command.h>
 #include <netdev.h>
+#include <asm/global_data.h>
 
 #include <asm/immap.h>
 #include <asm/io.h>
diff --git a/arch/m68k/cpu/mcf547x_8x/slicetimer.c b/arch/m68k/cpu/mcf547x_8x/slicetimer.c
index 33b4cff4ec7..dc076fc6e81 100644
--- a/arch/m68k/cpu/mcf547x_8x/slicetimer.c
+++ b/arch/m68k/cpu/mcf547x_8x/slicetimer.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <init.h>
 #include <irq_func.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 
 #include <asm/timer.h>
diff --git a/arch/m68k/cpu/mcf547x_8x/speed.c b/arch/m68k/cpu/mcf547x_8x/speed.c
index bc22560ed2c..bbcf601f38f 100644
--- a/arch/m68k/cpu/mcf547x_8x/speed.c
+++ b/arch/m68k/cpu/mcf547x_8x/speed.c
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <clock_legacy.h>
+#include <asm/global_data.h>
 #include <asm/processor.h>
 
 #include <asm/immap.h>
diff --git a/arch/m68k/include/asm/immap.h b/arch/m68k/include/asm/immap.h
index 9e84fb9d260..9551e047d02 100644
--- a/arch/m68k/include/asm/immap.h
+++ b/arch/m68k/include/asm/immap.h
@@ -30,6 +30,7 @@
 
 #define CONFIG_SYS_INTR_BASE		(MMAP_INTC0)
 #define CONFIG_SYS_NUM_IRQS		(128)
+#include <asm/global_data.h>
 #endif				/* CONFIG_M520x */
 
 #ifdef CONFIG_M52277
diff --git a/arch/m68k/lib/bdinfo.c b/arch/m68k/lib/bdinfo.c
index fb4d1a52fd4..c88e4fea407 100644
--- a/arch/m68k/lib/bdinfo.c
+++ b/arch/m68k/lib/bdinfo.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/m68k/lib/bootm.c b/arch/m68k/lib/bootm.c
index 320451144fd..51a6f938586 100644
--- a/arch/m68k/lib/bootm.c
+++ b/arch/m68k/lib/bootm.c
@@ -11,6 +11,7 @@
 #include <image.h>
 #include <lmb.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <u-boot/zlib.h>
 #include <bzlib.h>
 #include <watchdog.h>
diff --git a/arch/m68k/lib/fec.c b/arch/m68k/lib/fec.c
index dde353ad17f..eecea7a0235 100644
--- a/arch/m68k/lib/fec.c
+++ b/arch/m68k/lib/fec.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <asm/global_data.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 
diff --git a/arch/m68k/lib/time.c b/arch/m68k/lib/time.c
index a3eb6db54be..cbe29e72a86 100644
--- a/arch/m68k/lib/time.c
+++ b/arch/m68k/lib/time.c
@@ -10,6 +10,7 @@
 #include <init.h>
 #include <irq_func.h>
 #include <time.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 
 #include <asm/timer.h>
diff --git a/arch/microblaze/cpu/interrupts.c b/arch/microblaze/cpu/interrupts.c
index 829ae26ad27..fe65f3728fd 100644
--- a/arch/microblaze/cpu/interrupts.c
+++ b/arch/microblaze/cpu/interrupts.c
@@ -13,6 +13,7 @@
 #include <irq_func.h>
 #include <log.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <asm/microblaze_intc.h>
 #include <asm/asm.h>
 
diff --git a/arch/microblaze/cpu/timer.c b/arch/microblaze/cpu/timer.c
index 1b4617311c5..647bdcd5ba5 100644
--- a/arch/microblaze/cpu/timer.c
+++ b/arch/microblaze/cpu/timer.c
@@ -10,6 +10,7 @@
 #include <init.h>
 #include <log.h>
 #include <time.h>
+#include <asm/global_data.h>
 #include <asm/microblaze_timer.h>
 #include <asm/microblaze_intc.h>
 #include <linux/delay.h>
diff --git a/arch/microblaze/lib/bootm.c b/arch/microblaze/lib/bootm.c
index d2ea1453be0..6695ac63c77 100644
--- a/arch/microblaze/lib/bootm.c
+++ b/arch/microblaze/lib/bootm.c
@@ -18,6 +18,7 @@
 #include <lmb.h>
 #include <log.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <u-boot/zlib.h>
 #include <asm/byteorder.h>
 
diff --git a/arch/mips/include/asm/io.h b/arch/mips/include/asm/io.h
index 7c40e415c74..d3ad6693013 100644
--- a/arch/mips/include/asm/io.h
+++ b/arch/mips/include/asm/io.h
@@ -16,6 +16,7 @@
 #include <asm/addrspace.h>
 #include <asm/byteorder.h>
 #include <asm/cpu-features.h>
+#include <asm/global_data.h>
 #include <asm/pgtable-bits.h>
 #include <asm/processor.h>
 #include <asm/string.h>
diff --git a/arch/mips/lib/boot.c b/arch/mips/lib/boot.c
index db862f63792..d5a139ef5ec 100644
--- a/arch/mips/lib/boot.c
+++ b/arch/mips/lib/boot.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <command.h>
 #include <cpu_func.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/mips/lib/bootm.c b/arch/mips/lib/bootm.c
index 0a13f6edb75..c28bca1bbb8 100644
--- a/arch/mips/lib/bootm.c
+++ b/arch/mips/lib/bootm.c
@@ -12,6 +12,7 @@
 #include <lmb.h>
 #include <log.h>
 #include <asm/addrspace.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/mips/lib/cache.c b/arch/mips/lib/cache.c
index cf29994a7ae..51a8f433475 100644
--- a/arch/mips/lib/cache.c
+++ b/arch/mips/lib/cache.c
@@ -9,6 +9,7 @@
 #include <asm/cache.h>
 #include <asm/cacheops.h>
 #include <asm/cm.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/mipsregs.h>
 #include <asm/system.h>
diff --git a/arch/mips/lib/reloc.c b/arch/mips/lib/reloc.c
index 67c8af2f35a..c1c04bc08e8 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 <asm/global_data.h>
 #include <asm/relocs.h>
 #include <asm/sections.h>
 #include <linux/bitops.h>
diff --git a/arch/mips/lib/stack.c b/arch/mips/lib/stack.c
index 8f523fd6fb7..930d21856d9 100644
--- a/arch/mips/lib/stack.c
+++ b/arch/mips/lib/stack.c
@@ -3,6 +3,7 @@
 #include <common.h>
 #include <init.h>
 #include <log.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/mips/lib/traps.c b/arch/mips/lib/traps.c
index df8b63f383b..7c2fdf4a1a9 100644
--- a/arch/mips/lib/traps.c
+++ b/arch/mips/lib/traps.c
@@ -11,6 +11,7 @@
  */
 
 #include <common.h>
+#include <asm/global_data.h>
 #include <asm/ptrace.h>
 #include <cpu_func.h>
 #include <hang.h>
diff --git a/arch/mips/mach-ath79/ar933x/clk.c b/arch/mips/mach-ath79/ar933x/clk.c
index 3feb25ce71d..68d48939d7d 100644
--- a/arch/mips/mach-ath79/ar933x/clk.c
+++ b/arch/mips/mach-ath79/ar933x/clk.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <clock_legacy.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/addrspace.h>
 #include <asm/types.h>
diff --git a/arch/mips/mach-ath79/ar934x/clk.c b/arch/mips/mach-ath79/ar934x/clk.c
index 9fa2225ed2b..6ed4057353a 100644
--- a/arch/mips/mach-ath79/ar934x/clk.c
+++ b/arch/mips/mach-ath79/ar934x/clk.c
@@ -7,6 +7,7 @@
 #include <clock_legacy.h>
 #include <command.h>
 #include <hang.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/addrspace.h>
 #include <asm/types.h>
diff --git a/arch/mips/mach-ath79/ar934x/ddr.c b/arch/mips/mach-ath79/ar934x/ddr.c
index 218f60a96cc..9df48b97ef4 100644
--- a/arch/mips/mach-ath79/ar934x/ddr.c
+++ b/arch/mips/mach-ath79/ar934x/ddr.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/addrspace.h>
 #include <asm/types.h>
diff --git a/arch/mips/mach-ath79/cpu.c b/arch/mips/mach-ath79/cpu.c
index 31e87d62060..ed190e8f9b0 100644
--- a/arch/mips/mach-ath79/cpu.c
+++ b/arch/mips/mach-ath79/cpu.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/addrspace.h>
 #include <asm/types.h>
diff --git a/arch/mips/mach-ath79/dram.c b/arch/mips/mach-ath79/dram.c
index 1abe2a49e66..545b1199e10 100644
--- a/arch/mips/mach-ath79/dram.c
+++ b/arch/mips/mach-ath79/dram.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <linux/sizes.h>
 #include <asm/addrspace.h>
 #include <mach/ddr.h>
diff --git a/arch/mips/mach-ath79/include/mach/ath79.h b/arch/mips/mach-ath79/include/mach/ath79.h
index 0fde5079b16..2eda38885e3 100644
--- a/arch/mips/mach-ath79/include/mach/ath79.h
+++ b/arch/mips/mach-ath79/include/mach/ath79.h
@@ -11,6 +11,7 @@
 #ifndef __ASM_MACH_ATH79_H
 #define __ASM_MACH_ATH79_H
 
+#include <asm/global_data.h>
 #include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/mips/mach-ath79/qca953x/clk.c b/arch/mips/mach-ath79/qca953x/clk.c
index d450ad86523..f5438ef1c8d 100644
--- a/arch/mips/mach-ath79/qca953x/clk.c
+++ b/arch/mips/mach-ath79/qca953x/clk.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <clock_legacy.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/addrspace.h>
 #include <asm/types.h>
diff --git a/arch/mips/mach-ath79/qca956x/clk.c b/arch/mips/mach-ath79/qca956x/clk.c
index 5adf6cd8159..6a58dba91f3 100644
--- a/arch/mips/mach-ath79/qca956x/clk.c
+++ b/arch/mips/mach-ath79/qca956x/clk.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <clock_legacy.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/addrspace.h>
 #include <asm/types.h>
diff --git a/arch/mips/mach-ath79/qca956x/ddr.c b/arch/mips/mach-ath79/qca956x/ddr.c
index e61a368141b..f9cf8daa224 100644
--- a/arch/mips/mach-ath79/qca956x/ddr.c
+++ b/arch/mips/mach-ath79/qca956x/ddr.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/addrspace.h>
 #include <asm/types.h>
diff --git a/arch/mips/mach-bmips/dram.c b/arch/mips/mach-bmips/dram.c
index a772a655d92..bba6cd6f4aa 100644
--- a/arch/mips/mach-bmips/dram.c
+++ b/arch/mips/mach-bmips/dram.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <ram.h>
 #include <dm.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/mips/mach-jz47xx/jz4780/jz4780.c b/arch/mips/mach-jz47xx/jz4780/jz4780.c
index 26fcfc842c2..43f5651f832 100644
--- a/arch/mips/mach-jz47xx/jz4780/jz4780.c
+++ b/arch/mips/mach-jz47xx/jz4780/jz4780.c
@@ -12,6 +12,7 @@
 #include <hang.h>
 #include <image.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/sections.h>
 #include <mach/jz4780.h>
diff --git a/arch/mips/mach-mscc/cpu.c b/arch/mips/mach-mscc/cpu.c
index b4ffd44ea44..5bc31006aa1 100644
--- a/arch/mips/mach-mscc/cpu.c
+++ b/arch/mips/mach-mscc/cpu.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <linux/bitops.h>
 
 #include <asm/io.h>
diff --git a/arch/mips/mach-mscc/dram.c b/arch/mips/mach-mscc/dram.c
index b12bac63c27..c53a4202e0d 100644
--- a/arch/mips/mach-mscc/dram.c
+++ b/arch/mips/mach-mscc/dram.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 
 #include <asm/io.h>
 #include <asm/types.h>
diff --git a/arch/mips/mach-mtmips/cpu.c b/arch/mips/mach-mtmips/cpu.c
index 2ddf8cb0967..76ad4f63205 100644
--- a/arch/mips/mach-mtmips/cpu.c
+++ b/arch/mips/mach-mtmips/cpu.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <init.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/io.h>
 #include <linux/sizes.h>
diff --git a/arch/mips/mach-mtmips/ddr_cal.c b/arch/mips/mach-mtmips/ddr_cal.c
index 71a53c3c9cb..762619a960f 100644
--- a/arch/mips/mach-mtmips/ddr_cal.c
+++ b/arch/mips/mach-mtmips/ddr_cal.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <asm/addrspace.h>
 #include <asm/cacheops.h>
+#include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/io.h>
 #include <mach/mc.h>
diff --git a/arch/mips/mach-mtmips/mt7628/ddr.c b/arch/mips/mach-mtmips/mt7628/ddr.c
index 3df85cd144a..b091f2ecffc 100644
--- a/arch/mips/mach-mtmips/mt7628/ddr.c
+++ b/arch/mips/mach-mtmips/mt7628/ddr.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <asm/addrspace.h>
+#include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/sizes.h>
diff --git a/arch/mips/mach-mtmips/mt7628/init.c b/arch/mips/mach-mtmips/mt7628/init.c
index 77d1f2ea0dc..27241050aaf 100644
--- a/arch/mips/mach-mtmips/mt7628/init.c
+++ b/arch/mips/mach-mtmips/mt7628/init.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <clk.h>
 #include <dm.h>
+#include <asm/global_data.h>
 #include <dm/uclass.h>
 #include <dt-bindings/clock/mt7628-clk.h>
 #include <linux/io.h>
diff --git a/arch/mips/mach-mtmips/spl.c b/arch/mips/mach-mtmips/spl.c
index 38d9e9160d2..95201b8d7ab 100644
--- a/arch/mips/mach-mtmips/spl.c
+++ b/arch/mips/mach-mtmips/spl.c
@@ -6,10 +6,10 @@
  */
 
 #include <common.h>
-#include <fdt.h>
 #include <init.h>
 #include <spl.h>
 #include <asm/sections.h>
+#include <linux/libfdt.h>
 #include <linux/sizes.h>
 #include <mach/serial.h>
 
diff --git a/arch/mips/mach-pic32/cpu.c b/arch/mips/mach-pic32/cpu.c
index 1d8c3971441..eac2fe5f8c9 100644
--- a/arch/mips/mach-pic32/cpu.c
+++ b/arch/mips/mach-pic32/cpu.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <init.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <mach/pic32.h>
 #include <mach/ddr.h>
 #include <dt-bindings/clock/microchip,clock.h>
diff --git a/arch/nds32/lib/bootm.c b/arch/nds32/lib/bootm.c
index e552a342300..b3b8bc29037 100644
--- a/arch/nds32/lib/bootm.c
+++ b/arch/nds32/lib/bootm.c
@@ -12,6 +12,7 @@
 #include <hang.h>
 #include <image.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <u-boot/zlib.h>
 #include <asm/byteorder.h>
 #include <asm/bootm.h>
diff --git a/arch/nios2/cpu/cpu.c b/arch/nios2/cpu/cpu.c
index e7ca9882fc5..b55c8fbc584 100644
--- a/arch/nios2/cpu/cpu.c
+++ b/arch/nios2/cpu/cpu.c
@@ -13,6 +13,7 @@
 #include <init.h>
 #include <irq_func.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/system.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/nios2/include/asm/io.h b/arch/nios2/include/asm/io.h
index 41e6bd4ee10..817cd72e00b 100644
--- a/arch/nios2/include/asm/io.h
+++ b/arch/nios2/include/asm/io.h
@@ -7,6 +7,8 @@
 #ifndef __ASM_NIOS2_IO_H_
 #define __ASM_NIOS2_IO_H_
 
+#include <asm/global_data.h>
+
 static inline void sync(void)
 {
 	__asm__ __volatile__ ("sync" : : : "memory");
@@ -170,5 +172,6 @@ static inline void outsl (unsigned long port, const void *src, unsigned long cou
 #define memcpy_toio(a, b, c)		memcpy((void *)(a), (b), (c))
 
 #include <asm-generic/io.h>
+#include <asm/global_data.h>
 
 #endif /* __ASM_NIOS2_IO_H_ */
diff --git a/arch/nios2/lib/cache.c b/arch/nios2/lib/cache.c
index 0b961ac6762..5864d8f0f47 100644
--- a/arch/nios2/lib/cache.c
+++ b/arch/nios2/lib/cache.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/powerpc/cpu/mpc83xx/cpu.c b/arch/powerpc/cpu/mpc83xx/cpu.c
index 843f2df649e..8d531898bd8 100644
--- a/arch/powerpc/cpu/mpc83xx/cpu.c
+++ b/arch/powerpc/cpu/mpc83xx/cpu.c
@@ -18,6 +18,7 @@
 #include <watchdog.h>
 #include <command.h>
 #include <mpc83xx.h>
+#include <asm/global_data.h>
 #include <asm/processor.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
diff --git a/arch/powerpc/cpu/mpc83xx/cpu_init.c b/arch/powerpc/cpu/mpc83xx/cpu_init.c
index 438b14b162e..8793639e20e 100644
--- a/arch/powerpc/cpu/mpc83xx/cpu_init.c
+++ b/arch/powerpc/cpu/mpc83xx/cpu_init.c
@@ -7,6 +7,7 @@
 #include <asm-offsets.h>
 #include <mpc83xx.h>
 #include <ioports.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/processor.h>
 #ifdef CONFIG_USB_EHCI_FSL
diff --git a/arch/powerpc/cpu/mpc83xx/fdt.c b/arch/powerpc/cpu/mpc83xx/fdt.c
index ebdedb28889..707838ac9ab 100644
--- a/arch/powerpc/cpu/mpc83xx/fdt.c
+++ b/arch/powerpc/cpu/mpc83xx/fdt.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <clock_legacy.h>
+#include <asm/global_data.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <asm/processor.h>
diff --git a/arch/powerpc/cpu/mpc83xx/interrupts.c b/arch/powerpc/cpu/mpc83xx/interrupts.c
index 05380674dc7..f9486678af3 100644
--- a/arch/powerpc/cpu/mpc83xx/interrupts.c
+++ b/arch/powerpc/cpu/mpc83xx/interrupts.c
@@ -10,6 +10,7 @@
 #include <command.h>
 #include <irq_func.h>
 #include <mpc83xx.h>
+#include <asm/global_data.h>
 #include <asm/processor.h>
 #include <asm/ptrace.h>
 
diff --git a/arch/powerpc/cpu/mpc83xx/pci.c b/arch/powerpc/cpu/mpc83xx/pci.c
index d057cd6351c..5c289d00226 100644
--- a/arch/powerpc/cpu/mpc83xx/pci.c
+++ b/arch/powerpc/cpu/mpc83xx/pci.c
@@ -10,6 +10,7 @@
 #include <init.h>
 #include <pci.h>
 #include <asm/bitops.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 
 #if defined(CONFIG_OF_LIBFDT)
diff --git a/arch/powerpc/cpu/mpc83xx/pcie.c b/arch/powerpc/cpu/mpc83xx/pcie.c
index 785d4805a46..84797c871c9 100644
--- a/arch/powerpc/cpu/mpc83xx/pcie.c
+++ b/arch/powerpc/cpu/mpc83xx/pcie.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <pci.h>
 #include <mpc83xx.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/delay.h>
 
diff --git a/arch/powerpc/cpu/mpc83xx/spd_sdram.c b/arch/powerpc/cpu/mpc83xx/spd_sdram.c
index aeff007fb06..a861e8dd2dd 100644
--- a/arch/powerpc/cpu/mpc83xx/spd_sdram.c
+++ b/arch/powerpc/cpu/mpc83xx/spd_sdram.c
@@ -24,6 +24,7 @@
 #include <asm/mmu.h>
 #include <spd_sdram.h>
 #include <asm/bitops.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/powerpc/cpu/mpc83xx/speed.c b/arch/powerpc/cpu/mpc83xx/speed.c
index 5c14aa1f32e..58e197f1208 100644
--- a/arch/powerpc/cpu/mpc83xx/speed.c
+++ b/arch/powerpc/cpu/mpc83xx/speed.c
@@ -13,6 +13,7 @@
 #include <mpc83xx.h>
 #include <command.h>
 #include <vsprintf.h>
+#include <asm/global_data.h>
 #include <asm/processor.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/powerpc/cpu/mpc83xx/spl_minimal.c b/arch/powerpc/cpu/mpc83xx/spl_minimal.c
index 2c61f2b81db..00cb2bd044e 100644
--- a/arch/powerpc/cpu/mpc83xx/spl_minimal.c
+++ b/arch/powerpc/cpu/mpc83xx/spl_minimal.c
@@ -8,6 +8,7 @@
 #include <clock_legacy.h>
 #include <mpc83xx.h>
 #include <time.h>
+#include <asm/global_data.h>
 
 #include "lblaw/lblaw.h"
 #include "elbc/elbc.h"
diff --git a/arch/powerpc/cpu/mpc83xx/traps.c b/arch/powerpc/cpu/mpc83xx/traps.c
index c3cc119d654..74781126e94 100644
--- a/arch/powerpc/cpu/mpc83xx/traps.c
+++ b/arch/powerpc/cpu/mpc83xx/traps.c
@@ -12,6 +12,7 @@
  */
 
 #include <common.h>
+#include <asm/global_data.h>
 #include <asm/ptrace.h>
 #include <command.h>
 #include <kgdb.h>
diff --git a/arch/powerpc/cpu/mpc85xx/commproc.c b/arch/powerpc/cpu/mpc85xx/commproc.c
index 95215a0b829..8e8427a08bb 100644
--- a/arch/powerpc/cpu/mpc85xx/commproc.c
+++ b/arch/powerpc/cpu/mpc85xx/commproc.c
@@ -24,6 +24,7 @@
 #include <common.h>
 #include <asm-offsets.h>
 #include <asm/cpm_85xx.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/powerpc/cpu/mpc85xx/cpu.c b/arch/powerpc/cpu/mpc85xx/cpu.c
index 3ff1ef45658..5170610f041 100644
--- a/arch/powerpc/cpu/mpc85xx/cpu.c
+++ b/arch/powerpc/cpu/mpc85xx/cpu.c
@@ -20,6 +20,7 @@
 #include <command.h>
 #include <fsl_esdhc.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/mmu.h>
 #include <fsl_ifc.h>
diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init_early.c b/arch/powerpc/cpu/mpc85xx/cpu_init_early.c
index c519e8bd4b0..4195ecc5c98 100644
--- a/arch/powerpc/cpu/mpc85xx/cpu_init_early.c
+++ b/arch/powerpc/cpu/mpc85xx/cpu_init_early.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <asm-offsets.h>
+#include <asm/global_data.h>
 #include <asm/processor.h>
 #include <asm/mmu.h>
 #include <asm/fsl_law.h>
diff --git a/arch/powerpc/cpu/mpc85xx/fdt.c b/arch/powerpc/cpu/mpc85xx/fdt.c
index 9569c1a64b8..08331f4c649 100644
--- a/arch/powerpc/cpu/mpc85xx/fdt.c
+++ b/arch/powerpc/cpu/mpc85xx/fdt.c
@@ -11,6 +11,7 @@
 #include <env.h>
 #include <log.h>
 #include <time.h>
+#include <asm/global_data.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <asm/processor.h>
diff --git a/arch/powerpc/cpu/mpc85xx/mp.c b/arch/powerpc/cpu/mpc85xx/mp.c
index 8822cf29fef..653efe09f93 100644
--- a/arch/powerpc/cpu/mpc85xx/mp.c
+++ b/arch/powerpc/cpu/mpc85xx/mp.c
@@ -7,6 +7,7 @@
 #include <cpu_func.h>
 #include <env.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/processor.h>
 #include <env.h>
 #include <ioports.h>
diff --git a/arch/powerpc/cpu/mpc85xx/serial_scc.c b/arch/powerpc/cpu/mpc85xx/serial_scc.c
index a5c418570fa..a2505d1ffc1 100644
--- a/arch/powerpc/cpu/mpc85xx/serial_scc.c
+++ b/arch/powerpc/cpu/mpc85xx/serial_scc.c
@@ -18,6 +18,7 @@
 #include <common.h>
 #include <asm/cpm_85xx.h>
 #include <serial.h>
+#include <asm/global_data.h>
 #include <linux/compiler.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/powerpc/cpu/mpc85xx/speed.c b/arch/powerpc/cpu/mpc85xx/speed.c
index 773ae08dd3b..09653c70125 100644
--- a/arch/powerpc/cpu/mpc85xx/speed.c
+++ b/arch/powerpc/cpu/mpc85xx/speed.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <ppc_asm.tmpl>
+#include <asm/global_data.h>
 #include <linux/compiler.h>
 #include <asm/processor.h>
 #include <asm/io.h>
diff --git a/arch/powerpc/cpu/mpc85xx/tlb.c b/arch/powerpc/cpu/mpc85xx/tlb.c
index 4465ae7565a..973b6fbe4b7 100644
--- a/arch/powerpc/cpu/mpc85xx/tlb.c
+++ b/arch/powerpc/cpu/mpc85xx/tlb.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <asm/bitops.h>
+#include <asm/global_data.h>
 #include <asm/processor.h>
 #include <asm/mmu.h>
 #ifdef CONFIG_ADDR_MAP
diff --git a/arch/powerpc/cpu/mpc85xx/traps.c b/arch/powerpc/cpu/mpc85xx/traps.c
index f37a45e2694..080451ec567 100644
--- a/arch/powerpc/cpu/mpc85xx/traps.c
+++ b/arch/powerpc/cpu/mpc85xx/traps.c
@@ -20,6 +20,7 @@
  */
 
 #include <common.h>
+#include <asm/global_data.h>
 #include <asm/ptrace.h>
 #include <command.h>
 #include <init.h>
diff --git a/arch/powerpc/cpu/mpc86xx/cpu.c b/arch/powerpc/cpu/mpc86xx/cpu.c
index 9f5bce3992b..98b42bff7a3 100644
--- a/arch/powerpc/cpu/mpc86xx/cpu.c
+++ b/arch/powerpc/cpu/mpc86xx/cpu.c
@@ -13,6 +13,7 @@
 #include <watchdog.h>
 #include <command.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/mmu.h>
 #include <mpc86xx.h>
 #include <asm/fsl_law.h>
diff --git a/arch/powerpc/cpu/mpc86xx/cpu_init.c b/arch/powerpc/cpu/mpc86xx/cpu_init.c
index a17091d2ff8..73779f862c2 100644
--- a/arch/powerpc/cpu/mpc86xx/cpu_init.c
+++ b/arch/powerpc/cpu/mpc86xx/cpu_init.c
@@ -14,6 +14,7 @@
 #include <common.h>
 #include <init.h>
 #include <mpc86xx.h>
+#include <asm/global_data.h>
 #include <asm/mmu.h>
 #include <asm/fsl_law.h>
 #include <asm/fsl_serdes.h>
diff --git a/arch/powerpc/cpu/mpc86xx/mp.c b/arch/powerpc/cpu/mpc86xx/mp.c
index 08d11ad4f2e..e6795e06c98 100644
--- a/arch/powerpc/cpu/mpc86xx/mp.c
+++ b/arch/powerpc/cpu/mpc86xx/mp.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <cpu_func.h>
+#include <asm/global_data.h>
 #include <asm/processor.h>
 #include <asm/mmu.h>
 #include <ioports.h>
diff --git a/arch/powerpc/cpu/mpc86xx/speed.c b/arch/powerpc/cpu/mpc86xx/speed.c
index 50014458622..86c1709c4ca 100644
--- a/arch/powerpc/cpu/mpc86xx/speed.c
+++ b/arch/powerpc/cpu/mpc86xx/speed.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <clock_legacy.h>
 #include <mpc86xx.h>
+#include <asm/global_data.h>
 #include <asm/processor.h>
 #include <asm/io.h>
 
diff --git a/arch/powerpc/cpu/mpc86xx/traps.c b/arch/powerpc/cpu/mpc86xx/traps.c
index c0161e3379c..0d258b3a97f 100644
--- a/arch/powerpc/cpu/mpc86xx/traps.c
+++ b/arch/powerpc/cpu/mpc86xx/traps.c
@@ -14,6 +14,7 @@
  */
 
 #include <common.h>
+#include <asm/global_data.h>
 #include <asm/ptrace.h>
 #include <command.h>
 #include <init.h>
diff --git a/arch/powerpc/cpu/mpc8xx/cpu.c b/arch/powerpc/cpu/mpc8xx/cpu.c
index 7c93e35003f..893aecef21c 100644
--- a/arch/powerpc/cpu/mpc8xx/cpu.c
+++ b/arch/powerpc/cpu/mpc8xx/cpu.c
@@ -27,6 +27,7 @@
 #include <netdev.h>
 #include <asm/cache.h>
 #include <asm/cpm_8xx.h>
+#include <asm/global_data.h>
 #include <linux/compiler.h>
 #include <asm/io.h>
 
diff --git a/arch/powerpc/cpu/mpc8xx/fdt.c b/arch/powerpc/cpu/mpc8xx/fdt.c
index 4d952a3882f..75aef758f06 100644
--- a/arch/powerpc/cpu/mpc8xx/fdt.c
+++ b/arch/powerpc/cpu/mpc8xx/fdt.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <time.h>
+#include <asm/global_data.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 
diff --git a/arch/powerpc/cpu/mpc8xx/immap.c b/arch/powerpc/cpu/mpc8xx/immap.c
index e5b62e9f4ac..40793c26e12 100644
--- a/arch/powerpc/cpu/mpc8xx/immap.c
+++ b/arch/powerpc/cpu/mpc8xx/immap.c
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <asm/global_data.h>
 
 #include <asm/immap_8xx.h>
 #include <asm/cpm_8xx.h>
diff --git a/arch/powerpc/cpu/mpc8xx/speed.c b/arch/powerpc/cpu/mpc8xx/speed.c
index 77d4f8e47f7..ad3d3f9101c 100644
--- a/arch/powerpc/cpu/mpc8xx/speed.c
+++ b/arch/powerpc/cpu/mpc8xx/speed.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <clock_legacy.h>
 #include <mpc8xx.h>
+#include <asm/global_data.h>
 #include <asm/processor.h>
 #include <asm/io.h>
 
diff --git a/arch/powerpc/cpu/mpc8xxx/cpu.c b/arch/powerpc/cpu/mpc8xxx/cpu.c
index 2b24e755faa..560488be22e 100644
--- a/arch/powerpc/cpu/mpc8xxx/cpu.c
+++ b/arch/powerpc/cpu/mpc8xxx/cpu.c
@@ -17,6 +17,7 @@
 #include <fm_eth.h>
 #include <netdev.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <vsc9953.h>
 
diff --git a/arch/powerpc/cpu/mpc8xxx/law.c b/arch/powerpc/cpu/mpc8xxx/law.c
index e388386ad42..cf03f410190 100644
--- a/arch/powerpc/cpu/mpc8xxx/law.c
+++ b/arch/powerpc/cpu/mpc8xxx/law.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <asm/bitops.h>
+#include <asm/global_data.h>
 #include <linux/compiler.h>
 #include <asm/fsl_law.h>
 #include <asm/io.h>
diff --git a/arch/powerpc/cpu/mpc8xxx/pamu_table.c b/arch/powerpc/cpu/mpc8xxx/pamu_table.c
index 7dd71d2e0c4..d917e9dfb62 100644
--- a/arch/powerpc/cpu/mpc8xxx/pamu_table.c
+++ b/arch/powerpc/cpu/mpc8xxx/pamu_table.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <log.h>
 #include <asm/fsl_pamu.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/powerpc/lib/bat_rw.c b/arch/powerpc/lib/bat_rw.c
index ac56e3aeddb..24dd30615bd 100644
--- a/arch/powerpc/lib/bat_rw.c
+++ b/arch/powerpc/lib/bat_rw.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <asm/global_data.h>
 #include <asm/processor.h>
 #include <asm/mmu.h>
 #include <asm/io.h>
diff --git a/arch/powerpc/lib/bdinfo.c b/arch/powerpc/lib/bdinfo.c
index 75611e25920..231790ff854 100644
--- a/arch/powerpc/lib/bdinfo.c
+++ b/arch/powerpc/lib/bdinfo.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/powerpc/lib/bootm.c b/arch/powerpc/lib/bootm.c
index 8c8ed99cd34..cf3e3fd8409 100644
--- a/arch/powerpc/lib/bootm.c
+++ b/arch/powerpc/lib/bootm.c
@@ -18,6 +18,7 @@
 #include <command.h>
 #include <image.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <u-boot/zlib.h>
 #include <bzlib.h>
 #include <asm/byteorder.h>
diff --git a/arch/powerpc/lib/stack.c b/arch/powerpc/lib/stack.c
index 5840fe63490..f2a4652e081 100644
--- a/arch/powerpc/lib/stack.c
+++ b/arch/powerpc/lib/stack.c
@@ -12,6 +12,7 @@
  */
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/riscv/cpu/fu540/cache.c b/arch/riscv/cpu/fu540/cache.c
index 9ee364b5095..6d602158dd2 100644
--- a/arch/riscv/cpu/fu540/cache.c
+++ b/arch/riscv/cpu/fu540/cache.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
 
diff --git a/arch/riscv/cpu/fu540/dram.c b/arch/riscv/cpu/fu540/dram.c
index 1dc77efeca5..cec130ec8dc 100644
--- a/arch/riscv/cpu/fu540/dram.c
+++ b/arch/riscv/cpu/fu540/dram.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <fdtdec.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <linux/sizes.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/riscv/cpu/generic/dram.c b/arch/riscv/cpu/generic/dram.c
index 1dc77efeca5..cec130ec8dc 100644
--- a/arch/riscv/cpu/generic/dram.c
+++ b/arch/riscv/cpu/generic/dram.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <fdtdec.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <linux/sizes.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/riscv/lib/andes_plic.c b/arch/riscv/lib/andes_plic.c
index 5cf29df670c..1707beeea73 100644
--- a/arch/riscv/lib/andes_plic.c
+++ b/arch/riscv/lib/andes_plic.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <asm/global_data.h>
 #include <dm/device-internal.h>
 #include <dm/lists.h>
 #include <dm/uclass-internal.h>
diff --git a/arch/riscv/lib/andes_plmt.c b/arch/riscv/lib/andes_plmt.c
index a7e90ca992c..c453d9042c8 100644
--- a/arch/riscv/lib/andes_plmt.c
+++ b/arch/riscv/lib/andes_plmt.c
@@ -11,6 +11,7 @@
 #include <dm.h>
 #include <regmap.h>
 #include <syscon.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/syscon.h>
 #include <linux/err.h>
diff --git a/arch/riscv/lib/asm-offsets.c b/arch/riscv/lib/asm-offsets.c
index 7301c1b98e2..f1fe089b3d8 100644
--- a/arch/riscv/lib/asm-offsets.c
+++ b/arch/riscv/lib/asm-offsets.c
@@ -9,6 +9,7 @@
  */
 
 #include <common.h>
+#include <asm/global_data.h>
 #include <linux/kbuild.h>
 
 int main(void)
diff --git a/arch/riscv/lib/bootm.c b/arch/riscv/lib/bootm.c
index c4137ded834..8dd18205403 100644
--- a/arch/riscv/lib/bootm.c
+++ b/arch/riscv/lib/bootm.c
@@ -13,6 +13,7 @@
 #include <fdt_support.h>
 #include <hang.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <dm/root.h>
 #include <image.h>
 #include <asm/byteorder.h>
diff --git a/arch/riscv/lib/fdt_fixup.c b/arch/riscv/lib/fdt_fixup.c
index 5b2420243fc..8c11b8a99e3 100644
--- a/arch/riscv/lib/fdt_fixup.c
+++ b/arch/riscv/lib/fdt_fixup.c
@@ -10,6 +10,7 @@
 #include <fdt_support.h>
 #include <log.h>
 #include <mapmem.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/riscv/lib/image.c b/arch/riscv/lib/image.c
index 91b7f1624e9..47f2edcf7fc 100644
--- a/arch/riscv/lib/image.c
+++ b/arch/riscv/lib/image.c
@@ -10,6 +10,7 @@
 #include <image.h>
 #include <mapmem.h>
 #include <errno.h>
+#include <asm/global_data.h>
 #include <linux/sizes.h>
 #include <linux/stddef.h>
 
diff --git a/arch/riscv/lib/sifive_clint.c b/arch/riscv/lib/sifive_clint.c
index b9a2c649cc4..97b7169a02c 100644
--- a/arch/riscv/lib/sifive_clint.c
+++ b/arch/riscv/lib/sifive_clint.c
@@ -11,6 +11,7 @@
 #include <dm.h>
 #include <regmap.h>
 #include <syscon.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/syscon.h>
 #include <linux/err.h>
diff --git a/arch/riscv/lib/smp.c b/arch/riscv/lib/smp.c
index ac22136314f..c79d2a28d04 100644
--- a/arch/riscv/lib/smp.c
+++ b/arch/riscv/lib/smp.c
@@ -8,6 +8,7 @@
 #include <cpu_func.h>
 #include <dm.h>
 #include <asm/barrier.h>
+#include <asm/global_data.h>
 #include <asm/smp.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/riscv/lib/spl.c b/arch/riscv/lib/spl.c
index c47dcd46cea..e0b17590d56 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 <asm/global_data.h>
 #include <asm/smp.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/sandbox/cpu/cpu.c b/arch/sandbox/cpu/cpu.c
index fb857e53d59..edd48e2c1b7 100644
--- a/arch/sandbox/cpu/cpu.c
+++ b/arch/sandbox/cpu/cpu.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 #include <os.h>
diff --git a/arch/sandbox/cpu/spl.c b/arch/sandbox/cpu/spl.c
index 7ab8919eb90..17a3507406c 100644
--- a/arch/sandbox/cpu/spl.c
+++ b/arch/sandbox/cpu/spl.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <os.h>
 #include <spl.h>
+#include <asm/global_data.h>
 #include <asm/spl.h>
 #include <asm/state.h>
 
diff --git a/arch/sandbox/cpu/start.c b/arch/sandbox/cpu/start.c
index c6a2bbe4689..c50d14eaf22 100644
--- a/arch/sandbox/cpu/start.c
+++ b/arch/sandbox/cpu/start.c
@@ -11,6 +11,7 @@
 #include <cli.h>
 #include <sort.h>
 #include <asm/getopt.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/malloc.h>
 #include <asm/sections.h>
diff --git a/arch/sh/lib/board.c b/arch/sh/lib/board.c
index a6a8f07e6f2..3fa093a02ea 100644
--- a/arch/sh/lib/board.c
+++ b/arch/sh/lib/board.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/apollolake/cpu_spl.c b/arch/x86/cpu/apollolake/cpu_spl.c
index 9f32f2e27e1..a52bc288617 100644
--- a/arch/x86/cpu/apollolake/cpu_spl.c
+++ b/arch/x86/cpu/apollolake/cpu_spl.c
@@ -18,6 +18,7 @@
 #include <asm/cpu_common.h>
 #include <asm/cpu_x86.h>
 #include <asm/fast_spi.h>
+#include <asm/global_data.h>
 #include <asm/intel_pinctrl.h>
 #include <asm/intel_regs.h>
 #include <asm/io.h>
diff --git a/arch/x86/cpu/apollolake/fsp_s.c b/arch/x86/cpu/apollolake/fsp_s.c
index e54b0ac1047..a4e1c511614 100644
--- a/arch/x86/cpu/apollolake/fsp_s.c
+++ b/arch/x86/cpu/apollolake/fsp_s.c
@@ -14,6 +14,7 @@
 #include <malloc.h>
 #include <p2sb.h>
 #include <acpi/acpi_s3.h>
+#include <asm/global_data.h>
 #include <asm/intel_pinctrl.h>
 #include <asm/io.h>
 #include <asm/intel_regs.h>
diff --git a/arch/x86/cpu/baytrail/fsp_configs.c b/arch/x86/cpu/baytrail/fsp_configs.c
index 21816ce5b88..fb3f946c45f 100644
--- a/arch/x86/cpu/baytrail/fsp_configs.c
+++ b/arch/x86/cpu/baytrail/fsp_configs.c
@@ -9,6 +9,7 @@
 #include <fdtdec.h>
 #include <log.h>
 #include <asm/fsp1/fsp_support.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/braswell/fsp_configs.c b/arch/x86/cpu/braswell/fsp_configs.c
index 9e710a940ca..243298fd571 100644
--- a/arch/x86/cpu/braswell/fsp_configs.c
+++ b/arch/x86/cpu/braswell/fsp_configs.c
@@ -7,6 +7,7 @@
 #include <fdtdec.h>
 #include <log.h>
 #include <asm/fsp1/fsp_support.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/broadwell/cpu.c b/arch/x86/cpu/broadwell/cpu.c
index b77301118cd..3832a97f2c7 100644
--- a/arch/x86/cpu/broadwell/cpu.c
+++ b/arch/x86/cpu/broadwell/cpu.c
@@ -13,6 +13,7 @@
 #include <asm/cpu.h>
 #include <asm/cpu_x86.h>
 #include <asm/cpu_common.h>
+#include <asm/global_data.h>
 #include <asm/intel_regs.h>
 #include <asm/lpc_common.h>
 #include <asm/msr.h>
diff --git a/arch/x86/cpu/broadwell/cpu_from_spl.c b/arch/x86/cpu/broadwell/cpu_from_spl.c
index 6567d506533..6cede74a829 100644
--- a/arch/x86/cpu/broadwell/cpu_from_spl.c
+++ b/arch/x86/cpu/broadwell/cpu_from_spl.c
@@ -11,6 +11,7 @@
 #include <handoff.h>
 #include <init.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/mtrr.h>
 
 int misc_init_r(void)
diff --git a/arch/x86/cpu/broadwell/cpu_full.c b/arch/x86/cpu/broadwell/cpu_full.c
index 706f68f63d6..4debddce8ad 100644
--- a/arch/x86/cpu/broadwell/cpu_full.c
+++ b/arch/x86/cpu/broadwell/cpu_full.c
@@ -13,6 +13,7 @@
 #include <asm/cpu.h>
 #include <asm/cpu_x86.h>
 #include <asm/cpu_common.h>
+#include <asm/global_data.h>
 #include <asm/intel_regs.h>
 #include <asm/msr.h>
 #include <asm/post.h>
diff --git a/arch/x86/cpu/broadwell/lpc.c b/arch/x86/cpu/broadwell/lpc.c
index 5669a028cf3..d2638a4e7a6 100644
--- a/arch/x86/cpu/broadwell/lpc.c
+++ b/arch/x86/cpu/broadwell/lpc.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <log.h>
 #include <pch.h>
+#include <asm/global_data.h>
 #include <asm/intel_regs.h>
 #include <asm/io.h>
 #include <asm/lpc_common.h>
diff --git a/arch/x86/cpu/broadwell/northbridge.c b/arch/x86/cpu/broadwell/northbridge.c
index 4bcab785560..141babc51c3 100644
--- a/arch/x86/cpu/broadwell/northbridge.c
+++ b/arch/x86/cpu/broadwell/northbridge.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/mrc_common.h>
 #include <asm/arch/iomap.h>
diff --git a/arch/x86/cpu/broadwell/pch.c b/arch/x86/cpu/broadwell/pch.c
index 9bcf211af99..f012db9debe 100644
--- a/arch/x86/cpu/broadwell/pch.c
+++ b/arch/x86/cpu/broadwell/pch.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <pch.h>
 #include <asm/cpu.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/i8259.h>
 #include <asm/intel_regs.h>
diff --git a/arch/x86/cpu/broadwell/pinctrl_broadwell.c b/arch/x86/cpu/broadwell/pinctrl_broadwell.c
index 0ead13af62a..85bd37101ba 100644
--- a/arch/x86/cpu/broadwell/pinctrl_broadwell.c
+++ b/arch/x86/cpu/broadwell/pinctrl_broadwell.c
@@ -11,6 +11,7 @@
 #include <pch.h>
 #include <pci.h>
 #include <asm/cpu.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <asm/pci.h>
diff --git a/arch/x86/cpu/broadwell/sata.c b/arch/x86/cpu/broadwell/sata.c
index 641da515c8f..27d6bf706e2 100644
--- a/arch/x86/cpu/broadwell/sata.c
+++ b/arch/x86/cpu/broadwell/sata.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <asm/intel_regs.h>
diff --git a/arch/x86/cpu/broadwell/sdram.c b/arch/x86/cpu/broadwell/sdram.c
index 72f59a0a573..c104a849a54 100644
--- a/arch/x86/cpu/broadwell/sdram.c
+++ b/arch/x86/cpu/broadwell/sdram.c
@@ -12,6 +12,7 @@
 #include <pci.h>
 #include <syscon.h>
 #include <asm/cpu.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/lpc_common.h>
 #include <asm/mrccache.h>
diff --git a/arch/x86/cpu/coreboot/coreboot.c b/arch/x86/cpu/coreboot/coreboot.c
index 22a93254a93..15c3ad879a0 100644
--- a/arch/x86/cpu/coreboot/coreboot.c
+++ b/arch/x86/cpu/coreboot/coreboot.c
@@ -10,6 +10,7 @@
 #include <fdtdec.h>
 #include <init.h>
 #include <usb.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/msr.h>
 #include <asm/mtrr.h>
diff --git a/arch/x86/cpu/coreboot/sdram.c b/arch/x86/cpu/coreboot/sdram.c
index 27e859885e8..a2e47d196a2 100644
--- a/arch/x86/cpu/coreboot/sdram.c
+++ b/arch/x86/cpu/coreboot/sdram.c
@@ -9,6 +9,7 @@
 #include <init.h>
 #include <asm/e820.h>
 #include <asm/arch/sysinfo.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/coreboot/tables.c b/arch/x86/cpu/coreboot/tables.c
index 1594b4a8b2a..c52741ac9da 100644
--- a/arch/x86/cpu/coreboot/tables.c
+++ b/arch/x86/cpu/coreboot/tables.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <net.h>
 #include <asm/arch/sysinfo.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/cpu.c b/arch/x86/cpu/cpu.c
index 69c14189d1f..078607a435c 100644
--- a/arch/x86/cpu/cpu.c
+++ b/arch/x86/cpu/cpu.c
@@ -35,6 +35,7 @@
 #include <asm/control_regs.h>
 #include <asm/coreboot_tables.h>
 #include <asm/cpu.h>
+#include <asm/global_data.h>
 #include <asm/lapic.h>
 #include <asm/microcode.h>
 #include <asm/mp.h>
diff --git a/arch/x86/cpu/cpu_x86.c b/arch/x86/cpu/cpu_x86.c
index 7e83051646c..dc7c8116d04 100644
--- a/arch/x86/cpu/cpu_x86.c
+++ b/arch/x86/cpu/cpu_x86.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <asm/cpu.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/efi/payload.c b/arch/x86/cpu/efi/payload.c
index 71619f6f01b..9a73b768e9b 100644
--- a/arch/x86/cpu/efi/payload.c
+++ b/arch/x86/cpu/efi/payload.c
@@ -13,6 +13,7 @@
 #include <usb.h>
 #include <asm/bootparam.h>
 #include <asm/e820.h>
+#include <asm/global_data.h>
 #include <asm/post.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/x86/cpu/efi/sdram.c b/arch/x86/cpu/efi/sdram.c
index 3143c079adb..af65982fd0c 100644
--- a/arch/x86/cpu/efi/sdram.c
+++ b/arch/x86/cpu/efi/sdram.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <efi.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/u-boot-x86.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/x86/cpu/i386/cpu.c b/arch/x86/cpu/i386/cpu.c
index 8f342dd06e2..7f6b1a93e1b 100644
--- a/arch/x86/cpu/i386/cpu.c
+++ b/arch/x86/cpu/i386/cpu.c
@@ -27,6 +27,7 @@
 #include <asm/control_regs.h>
 #include <asm/coreboot_tables.h>
 #include <asm/cpu.h>
+#include <asm/global_data.h>
 #include <asm/mp.h>
 #include <asm/msr.h>
 #include <asm/mtrr.h>
diff --git a/arch/x86/cpu/i386/interrupt.c b/arch/x86/cpu/i386/interrupt.c
index c0c4bc95fd9..67a72146de8 100644
--- a/arch/x86/cpu/i386/interrupt.c
+++ b/arch/x86/cpu/i386/interrupt.c
@@ -18,6 +18,7 @@
 #include <irq.h>
 #include <irq_func.h>
 #include <asm/control_regs.h>
+#include <asm/global_data.h>
 #include <asm/i8259.h>
 #include <asm/interrupt.h>
 #include <asm/io.h>
diff --git a/arch/x86/cpu/intel_common/cpu.c b/arch/x86/cpu/intel_common/cpu.c
index 509730aea96..3a4fd35cff1 100644
--- a/arch/x86/cpu/intel_common/cpu.c
+++ b/arch/x86/cpu/intel_common/cpu.c
@@ -14,6 +14,7 @@
 #include <log.h>
 #include <asm/cpu.h>
 #include <asm/cpu_common.h>
+#include <asm/global_data.h>
 #include <asm/intel_regs.h>
 #include <asm/lapic.h>
 #include <asm/lpc_common.h>
diff --git a/arch/x86/cpu/intel_common/cpu_from_spl.c b/arch/x86/cpu/intel_common/cpu_from_spl.c
index e4157c5734c..1c0dcedb582 100644
--- a/arch/x86/cpu/intel_common/cpu_from_spl.c
+++ b/arch/x86/cpu/intel_common/cpu_from_spl.c
@@ -9,6 +9,7 @@
 #include <handoff.h>
 #include <init.h>
 #include <asm/cpu_common.h>
+#include <asm/global_data.h>
 #include <asm/intel_regs.h>
 #include <asm/lapic.h>
 #include <asm/lpc_common.h>
diff --git a/arch/x86/cpu/intel_common/itss.c b/arch/x86/cpu/intel_common/itss.c
index fe84ebe29f7..2f47bfe20e7 100644
--- a/arch/x86/cpu/intel_common/itss.c
+++ b/arch/x86/cpu/intel_common/itss.c
@@ -17,6 +17,7 @@
 #include <malloc.h>
 #include <p2sb.h>
 #include <spl.h>
+#include <asm/global_data.h>
 #include <asm/itss.h>
 
 struct itss_platdata {
diff --git a/arch/x86/cpu/intel_common/lpc.c b/arch/x86/cpu/intel_common/lpc.c
index 3420f03ccaa..23befbef15f 100644
--- a/arch/x86/cpu/intel_common/lpc.c
+++ b/arch/x86/cpu/intel_common/lpc.c
@@ -9,6 +9,7 @@
 #include <fdtdec.h>
 #include <pch.h>
 #include <pci.h>
+#include <asm/global_data.h>
 #include <asm/intel_regs.h>
 #include <asm/io.h>
 #include <asm/lpc_common.h>
diff --git a/arch/x86/cpu/intel_common/microcode.c b/arch/x86/cpu/intel_common/microcode.c
index 0355d3c1da6..4d8e1d21083 100644
--- a/arch/x86/cpu/intel_common/microcode.c
+++ b/arch/x86/cpu/intel_common/microcode.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <fdtdec.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <linux/libfdt.h>
 #include <asm/cpu.h>
 #include <asm/microcode.h>
diff --git a/arch/x86/cpu/intel_common/mrc.c b/arch/x86/cpu/intel_common/mrc.c
index 73bfd123321..a97b0b7ceb4 100644
--- a/arch/x86/cpu/intel_common/mrc.c
+++ b/arch/x86/cpu/intel_common/mrc.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <syscon.h>
 #include <asm/cpu.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/intel_regs.h>
 #include <asm/mrc_common.h>
diff --git a/arch/x86/cpu/irq.c b/arch/x86/cpu/irq.c
index 836a0e8b86e..001c8913fad 100644
--- a/arch/x86/cpu/irq.c
+++ b/arch/x86/cpu/irq.c
@@ -10,6 +10,7 @@
 #include <irq.h>
 #include <log.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/pci.h>
diff --git a/arch/x86/cpu/ivybridge/bd82x6x.c b/arch/x86/cpu/ivybridge/bd82x6x.c
index 5448f064fcb..0540b021618 100644
--- a/arch/x86/cpu/ivybridge/bd82x6x.c
+++ b/arch/x86/cpu/ivybridge/bd82x6x.c
@@ -10,6 +10,7 @@
 #include <malloc.h>
 #include <pch.h>
 #include <asm/cpu.h>
+#include <asm/global_data.h>
 #include <asm/intel_regs.h>
 #include <asm/io.h>
 #include <asm/lapic.h>
diff --git a/arch/x86/cpu/ivybridge/cpu.c b/arch/x86/cpu/ivybridge/cpu.c
index cb6eded9c98..bddba3eddec 100644
--- a/arch/x86/cpu/ivybridge/cpu.c
+++ b/arch/x86/cpu/ivybridge/cpu.c
@@ -20,6 +20,7 @@
 #include <pch.h>
 #include <asm/cpu.h>
 #include <asm/cpu_common.h>
+#include <asm/global_data.h>
 #include <asm/intel_regs.h>
 #include <asm/io.h>
 #include <asm/lapic.h>
diff --git a/arch/x86/cpu/ivybridge/fsp_configs.c b/arch/x86/cpu/ivybridge/fsp_configs.c
index 41d7d2a2b42..3c4ea6c267f 100644
--- a/arch/x86/cpu/ivybridge/fsp_configs.c
+++ b/arch/x86/cpu/ivybridge/fsp_configs.c
@@ -7,6 +7,7 @@
 #include <fdtdec.h>
 #include <log.h>
 #include <asm/fsp1/fsp_support.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/ivybridge/lpc.c b/arch/x86/cpu/ivybridge/lpc.c
index 85fd2a965ab..f931d2be1b5 100644
--- a/arch/x86/cpu/ivybridge/lpc.c
+++ b/arch/x86/cpu/ivybridge/lpc.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <rtc.h>
 #include <pci.h>
+#include <asm/global_data.h>
 #include <asm/intel_regs.h>
 #include <asm/interrupt.h>
 #include <asm/io.h>
diff --git a/arch/x86/cpu/ivybridge/model_206ax.c b/arch/x86/cpu/ivybridge/model_206ax.c
index 55f7cc2b2ec..788e589b26d 100644
--- a/arch/x86/cpu/ivybridge/model_206ax.c
+++ b/arch/x86/cpu/ivybridge/model_206ax.c
@@ -15,6 +15,7 @@
 #include <asm/cpu.h>
 #include <asm/cpu_common.h>
 #include <asm/cpu_x86.h>
+#include <asm/global_data.h>
 #include <asm/msr.h>
 #include <asm/msr-index.h>
 #include <asm/mtrr.h>
diff --git a/arch/x86/cpu/ivybridge/northbridge.c b/arch/x86/cpu/ivybridge/northbridge.c
index b713fcb1cfe..994f8a4ff6a 100644
--- a/arch/x86/cpu/ivybridge/northbridge.c
+++ b/arch/x86/cpu/ivybridge/northbridge.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/msr.h>
 #include <asm/cpu.h>
 #include <asm/intel_regs.h>
diff --git a/arch/x86/cpu/ivybridge/sata.c b/arch/x86/cpu/ivybridge/sata.c
index 025b20be31b..f47ecdffae7 100644
--- a/arch/x86/cpu/ivybridge/sata.c
+++ b/arch/x86/cpu/ivybridge/sata.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <fdtdec.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/pch_common.h>
 #include <asm/pci.h>
diff --git a/arch/x86/cpu/ivybridge/sdram_nop.c b/arch/x86/cpu/ivybridge/sdram_nop.c
index 54e6acf2621..51dfe23f94d 100644
--- a/arch/x86/cpu/ivybridge/sdram_nop.c
+++ b/arch/x86/cpu/ivybridge/sdram_nop.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/mp_init.c b/arch/x86/cpu/mp_init.c
index d2f1ee38cf0..03bd71c261a 100644
--- a/arch/x86/cpu/mp_init.c
+++ b/arch/x86/cpu/mp_init.c
@@ -14,6 +14,7 @@
 #include <qfw.h>
 #include <asm/atomic.h>
 #include <asm/cpu.h>
+#include <asm/global_data.h>
 #include <asm/interrupt.h>
 #include <asm/io.h>
 #include <asm/lapic.h>
diff --git a/arch/x86/cpu/mtrr.c b/arch/x86/cpu/mtrr.c
index 2468d88a80a..44a6f5c8124 100644
--- a/arch/x86/cpu/mtrr.c
+++ b/arch/x86/cpu/mtrr.c
@@ -20,6 +20,7 @@
 #include <cpu_func.h>
 #include <log.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/mp.h>
 #include <asm/msr.h>
diff --git a/arch/x86/cpu/qemu/dram.c b/arch/x86/cpu/qemu/dram.c
index 19d92f27d80..c1745501294 100644
--- a/arch/x86/cpu/qemu/dram.c
+++ b/arch/x86/cpu/qemu/dram.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/post.h>
 #include <asm/arch/qemu.h>
 
diff --git a/arch/x86/cpu/qemu/e820.c b/arch/x86/cpu/qemu/e820.c
index 0da36bddeae..19e54c5202a 100644
--- a/arch/x86/cpu/qemu/e820.c
+++ b/arch/x86/cpu/qemu/e820.c
@@ -11,6 +11,7 @@
 #include <malloc.h>
 #include <asm/e820.h>
 #include <asm/arch/qemu.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/quark/acpi.c b/arch/x86/cpu/quark/acpi.c
index b0406a04e92..82b776ff65f 100644
--- a/arch/x86/cpu/quark/acpi.c
+++ b/arch/x86/cpu/quark/acpi.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <acpi/acpi_table.h>
+#include <asm/processor.h>
 #include <asm/tables.h>
 #include <asm/arch/global_nvs.h>
 #include <asm/arch/iomap.h>
diff --git a/arch/x86/cpu/quark/dram.c b/arch/x86/cpu/quark/dram.c
index 72937139ed7..2287dce12b5 100644
--- a/arch/x86/cpu/quark/dram.c
+++ b/arch/x86/cpu/quark/dram.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/mrccache.h>
 #include <asm/mtrr.h>
 #include <asm/post.h>
diff --git a/arch/x86/cpu/slimbootloader/sdram.c b/arch/x86/cpu/slimbootloader/sdram.c
index 33e91fb6366..36d0d4da553 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 <asm/global_data.h>
 #include <linux/sizes.h>
 #include <asm/e820.h>
 #include <asm/arch/slimbootloader.h>
diff --git a/arch/x86/cpu/slimbootloader/serial.c b/arch/x86/cpu/slimbootloader/serial.c
index 9813f7977b5..8b84565ce62 100644
--- a/arch/x86/cpu/slimbootloader/serial.c
+++ b/arch/x86/cpu/slimbootloader/serial.c
@@ -9,6 +9,7 @@
 #include <ns16550.h>
 #include <serial.h>
 #include <asm/arch/slimbootloader.h>
+#include <asm/global_data.h>
 
 /**
  * The serial port info hob is generated by Slim Bootloader, so eligible for
diff --git a/arch/x86/cpu/slimbootloader/slimbootloader.c b/arch/x86/cpu/slimbootloader/slimbootloader.c
index f61fe814e94..ec5b87cfd63 100644
--- a/arch/x86/cpu/slimbootloader/slimbootloader.c
+++ b/arch/x86/cpu/slimbootloader/slimbootloader.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <log.h>
 #include <asm/arch/slimbootloader.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/turbo.c b/arch/x86/cpu/turbo.c
index f8d85d5a339..cbb10a00320 100644
--- a/arch/x86/cpu/turbo.c
+++ b/arch/x86/cpu/turbo.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <log.h>
 #include <asm/cpu.h>
+#include <asm/global_data.h>
 #include <asm/msr.h>
 #include <asm/processor.h>
 #include <asm/turbo.h>
diff --git a/arch/x86/cpu/x86_64/cpu.c b/arch/x86/cpu/x86_64/cpu.c
index 1b4d3971b04..740851f24f3 100644
--- a/arch/x86/cpu/x86_64/cpu.c
+++ b/arch/x86/cpu/x86_64/cpu.c
@@ -8,6 +8,7 @@
 #include <cpu_func.h>
 #include <debug_uart.h>
 #include <init.h>
+#include <asm/global_data.h>
 
 /*
  * Global declaration of gd.
diff --git a/arch/x86/include/asm/cpu_common.h b/arch/x86/include/asm/cpu_common.h
index cdd99a90b76..4a782a22956 100644
--- a/arch/x86/include/asm/cpu_common.h
+++ b/arch/x86/include/asm/cpu_common.h
@@ -14,6 +14,7 @@ enum {
 };
 
 struct cpu_info;
+struct udevice;
 
 /**
  * cpu_common_init() - Set up common CPU init
diff --git a/arch/x86/include/asm/fast_spi.h b/arch/x86/include/asm/fast_spi.h
index 7a81d4f05c6..82e3d8f63ef 100644
--- a/arch/x86/include/asm/fast_spi.h
+++ b/arch/x86/include/asm/fast_spi.h
@@ -6,8 +6,10 @@
 #ifndef ASM_FAST_SPI_H
 #define ASM_FAST_SPI_H
 
-/* Register offsets from the MMIO region base (PCI_BASE_ADDRESS_0) */
+#include <pci.h>
 #include <linux/bitops.h>
+
+/* Register offsets from the MMIO region base (PCI_BASE_ADDRESS_0) */
 struct fast_spi_regs {
 	u32 bfp;
 	u32 hsfsts_ctl;
diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h
index cf6c33cbe3a..83dc09757e0 100644
--- a/arch/x86/include/asm/io.h
+++ b/arch/x86/include/asm/io.h
@@ -7,7 +7,7 @@
 #ifndef _ASM_IO_H
 #define _ASM_IO_H
 
-#include <linux/compiler.h>
+#include <compiler.h>
 
 /*
  * This file contains the definitions for the x86 IO instructions
diff --git a/arch/x86/include/asm/mp.h b/arch/x86/include/asm/mp.h
index 5f9b8c65643..25edabbdd39 100644
--- a/arch/x86/include/asm/mp.h
+++ b/arch/x86/include/asm/mp.h
@@ -11,6 +11,8 @@
 #include <asm/atomic.h>
 #include <asm/cache.h>
 
+struct udevice;
+
 enum {
 	/* Indicates that the function should run on all CPUs */
 	MP_SELECT_ALL	= -1,
diff --git a/arch/x86/lib/acpi_s3.c b/arch/x86/lib/acpi_s3.c
index 52410a515df..2c70acbe7b0 100644
--- a/arch/x86/lib/acpi_s3.c
+++ b/arch/x86/lib/acpi_s3.c
@@ -7,6 +7,7 @@
 #include <acpi/acpi_s3.h>
 #include <acpi/acpi_table.h>
 #include <asm/acpi.h>
+#include <asm/global_data.h>
 #include <asm/post.h>
 #include <linux/linkage.h>
 
diff --git a/arch/x86/lib/acpi_table.c b/arch/x86/lib/acpi_table.c
index 3a93fedfc3e..c574f0c6230 100644
--- a/arch/x86/lib/acpi_table.c
+++ b/arch/x86/lib/acpi_table.c
@@ -10,6 +10,7 @@
 #include <cpu.h>
 #include <dm.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <dm/uclass-internal.h>
 #include <mapmem.h>
 #include <serial.h>
diff --git a/arch/x86/lib/asm-offsets.c b/arch/x86/lib/asm-offsets.c
index 47b38cd9e78..8df67db65c3 100644
--- a/arch/x86/lib/asm-offsets.c
+++ b/arch/x86/lib/asm-offsets.c
@@ -12,6 +12,7 @@
  */
 
 #include <common.h>
+#include <asm/global_data.h>
 #include <linux/kbuild.h>
 
 int main(void)
diff --git a/arch/x86/lib/bios.c b/arch/x86/lib/bios.c
index 3ab432e2623..fbdc3b04e36 100644
--- a/arch/x86/lib/bios.c
+++ b/arch/x86/lib/bios.c
@@ -6,6 +6,7 @@
  * Copyright (C) 2009-2010 coresystems GmbH
  */
 #include <common.h>
+#include <compiler.h>
 #include <bios_emul.h>
 #include <irq_func.h>
 #include <log.h>
diff --git a/arch/x86/lib/bootm.c b/arch/x86/lib/bootm.c
index 1198a52ecac..b255144318c 100644
--- a/arch/x86/lib/bootm.c
+++ b/arch/x86/lib/bootm.c
@@ -12,6 +12,7 @@
 #include <command.h>
 #include <hang.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <dm/device.h>
 #include <dm/root.h>
 #include <errno.h>
diff --git a/arch/x86/lib/cmd_boot.c b/arch/x86/lib/cmd_boot.c
index baaf3d13ad4..4facbe5f32f 100644
--- a/arch/x86/lib/cmd_boot.c
+++ b/arch/x86/lib/cmd_boot.c
@@ -17,6 +17,7 @@
 #include <common.h>
 #include <command.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <asm/u-boot-x86.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/x86/lib/coreboot_table.c b/arch/x86/lib/coreboot_table.c
index 6cd32443012..6eab0452fda 100644
--- a/arch/x86/lib/coreboot_table.c
+++ b/arch/x86/lib/coreboot_table.c
@@ -10,6 +10,7 @@
 #include <acpi/acpi_s3.h>
 #include <asm/coreboot_tables.h>
 #include <asm/e820.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/lib/e820.c b/arch/x86/lib/e820.c
index 1f20c5c8c6b..12fcff12380 100644
--- a/arch/x86/lib/e820.c
+++ b/arch/x86/lib/e820.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <efi_loader.h>
 #include <asm/e820.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/lib/fsp/fsp_common.c b/arch/x86/lib/fsp/fsp_common.c
index ea529547254..82f7d3ab5f0 100644
--- a/arch/x86/lib/fsp/fsp_common.c
+++ b/arch/x86/lib/fsp/fsp_common.c
@@ -13,6 +13,7 @@
 #include <acpi/acpi_s3.h>
 #include <asm/cmos_layout.h>
 #include <asm/early_cmos.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/mrccache.h>
 #include <asm/post.h>
diff --git a/arch/x86/lib/fsp/fsp_dram.c b/arch/x86/lib/fsp/fsp_dram.c
index 01d498c21ed..32680033736 100644
--- a/arch/x86/lib/fsp/fsp_dram.c
+++ b/arch/x86/lib/fsp/fsp_dram.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <asm/fsp/fsp_support.h>
 #include <asm/e820.h>
+#include <asm/global_data.h>
 #include <asm/mrccache.h>
 #include <asm/mtrr.h>
 #include <asm/post.h>
diff --git a/arch/x86/lib/fsp/fsp_graphics.c b/arch/x86/lib/fsp/fsp_graphics.c
index e8c1e07af1c..32995e2df60 100644
--- a/arch/x86/lib/fsp/fsp_graphics.c
+++ b/arch/x86/lib/fsp/fsp_graphics.c
@@ -10,6 +10,7 @@
 #include <vbe.h>
 #include <video.h>
 #include <asm/fsp/fsp_support.h>
+#include <asm/global_data.h>
 #include <asm/mtrr.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/x86/lib/fsp1/fsp_common.c b/arch/x86/lib/fsp1/fsp_common.c
index da351cf097c..20926171822 100644
--- a/arch/x86/lib/fsp1/fsp_common.c
+++ b/arch/x86/lib/fsp1/fsp_common.c
@@ -13,6 +13,7 @@
 #include <acpi/acpi_s3.h>
 #include <asm/cmos_layout.h>
 #include <asm/early_cmos.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/mrccache.h>
 #include <asm/post.h>
diff --git a/arch/x86/lib/fsp1/fsp_dram.c b/arch/x86/lib/fsp1/fsp_dram.c
index e3f9e30f6a6..cfd9b9f48c3 100644
--- a/arch/x86/lib/fsp1/fsp_dram.c
+++ b/arch/x86/lib/fsp1/fsp_dram.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <init.h>
 #include <asm/fsp/fsp_support.h>
+#include <asm/global_data.h>
 
 int dram_init(void)
 {
diff --git a/arch/x86/lib/fsp2/fsp_dram.c b/arch/x86/lib/fsp2/fsp_dram.c
index c9f6402e6a4..c31e2a11b7a 100644
--- a/arch/x86/lib/fsp2/fsp_dram.c
+++ b/arch/x86/lib/fsp2/fsp_dram.c
@@ -14,6 +14,7 @@
 #include <asm/fsp/fsp_support.h>
 #include <asm/fsp2/fsp_api.h>
 #include <asm/fsp2/fsp_internal.h>
+#include <asm/global_data.h>
 #include <linux/sizes.h>
 
 int dram_init(void)
diff --git a/arch/x86/lib/fsp2/fsp_meminit.c b/arch/x86/lib/fsp2/fsp_meminit.c
index ce0b0aff76b..022e2cb64e5 100644
--- a/arch/x86/lib/fsp2/fsp_meminit.c
+++ b/arch/x86/lib/fsp2/fsp_meminit.c
@@ -11,6 +11,7 @@
 #include <bootstage.h>
 #include <dm.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/mrccache.h>
 #include <asm/fsp/fsp_infoheader.h>
 #include <asm/fsp2/fsp_api.h>
diff --git a/arch/x86/lib/fsp2/fsp_silicon_init.c b/arch/x86/lib/fsp2/fsp_silicon_init.c
index 0f221a864fb..f86dbfa6c63 100644
--- a/arch/x86/lib/fsp2/fsp_silicon_init.c
+++ b/arch/x86/lib/fsp2/fsp_silicon_init.c
@@ -17,6 +17,7 @@
 #include <asm/arch/fsp/fsp_s_upd.h>
 #include <asm/fsp/fsp_infoheader.h>
 #include <asm/fsp2/fsp_internal.h>
+#include <asm/global_data.h>
 
 int fsp_silicon_init(bool s3wake, bool use_spi_flash)
 {
diff --git a/arch/x86/lib/fsp2/fsp_support.c b/arch/x86/lib/fsp2/fsp_support.c
index 3f2ca840dc9..bcdf429f06a 100644
--- a/arch/x86/lib/fsp2/fsp_support.c
+++ b/arch/x86/lib/fsp2/fsp_support.c
@@ -10,6 +10,7 @@
 #include <spi_flash.h>
 #include <asm/fsp/fsp_support.h>
 #include <asm/fsp2/fsp_internal.h>
+#include <asm/global_data.h>
 
 /* The amount of the FSP header to probe to obtain what we need */
 #define PROBE_BUF_SIZE 0x180
diff --git a/arch/x86/lib/init_helpers.c b/arch/x86/lib/init_helpers.c
index d906b528b35..066dc404a2d 100644
--- a/arch/x86/lib/init_helpers.c
+++ b/arch/x86/lib/init_helpers.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <linux/errno.h>
 #include <asm/mtrr.h>
 
diff --git a/arch/x86/lib/mpspec.c b/arch/x86/lib/mpspec.c
index 1c49c41b310..8021d8f75a4 100644
--- a/arch/x86/lib/mpspec.c
+++ b/arch/x86/lib/mpspec.c
@@ -12,6 +12,7 @@
 #include <fdtdec.h>
 #include <log.h>
 #include <asm/cpu.h>
+#include <asm/global_data.h>
 #include <asm/irq.h>
 #include <asm/ioapic.h>
 #include <asm/lapic.h>
diff --git a/arch/x86/lib/mrccache.c b/arch/x86/lib/mrccache.c
index f181e8100cb..b5269156801 100644
--- a/arch/x86/lib/mrccache.c
+++ b/arch/x86/lib/mrccache.c
@@ -15,6 +15,7 @@
 #include <net.h>
 #include <spi.h>
 #include <spi_flash.h>
+#include <asm/global_data.h>
 #include <asm/mrccache.h>
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
diff --git a/arch/x86/lib/physmem.c b/arch/x86/lib/physmem.c
index 4578046169a..c11101b44ec 100644
--- a/arch/x86/lib/physmem.c
+++ b/arch/x86/lib/physmem.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <physmem.h>
 #include <asm/cpu.h>
+#include <asm/global_data.h>
 #include <linux/compiler.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/x86/lib/pinctrl_ich6.c b/arch/x86/lib/pinctrl_ich6.c
index 482599478b8..fd5e311b291 100644
--- a/arch/x86/lib/pinctrl_ich6.c
+++ b/arch/x86/lib/pinctrl_ich6.c
@@ -11,6 +11,7 @@
 #include <pch.h>
 #include <pci.h>
 #include <asm/cpu.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <asm/pci.h>
diff --git a/arch/x86/lib/pirq_routing.c b/arch/x86/lib/pirq_routing.c
index eb6a7d96de1..caeaec9287f 100644
--- a/arch/x86/lib/pirq_routing.c
+++ b/arch/x86/lib/pirq_routing.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <log.h>
 #include <pci.h>
+#include <asm/global_data.h>
 #include <asm/pci.h>
 #include <asm/pirq_routing.h>
 
diff --git a/arch/x86/lib/relocate.c b/arch/x86/lib/relocate.c
index ecbd0927e07..6fe51516477 100644
--- a/arch/x86/lib/relocate.c
+++ b/arch/x86/lib/relocate.c
@@ -17,6 +17,7 @@
 #include <common.h>
 #include <log.h>
 #include <relocate.h>
+#include <asm/global_data.h>
 #include <asm/u-boot-x86.h>
 #include <asm/sections.h>
 #include <elf.h>
diff --git a/arch/x86/lib/spl.c b/arch/x86/lib/spl.c
index cf22fa2d7b5..a220c71b576 100644
--- a/arch/x86/lib/spl.c
+++ b/arch/x86/lib/spl.c
@@ -17,6 +17,7 @@
 #include <syscon.h>
 #include <asm/cpu.h>
 #include <asm/cpu_common.h>
+#include <asm/global_data.h>
 #include <asm/mrccache.h>
 #include <asm/mtrr.h>
 #include <asm/pci.h>
diff --git a/arch/x86/lib/tables.c b/arch/x86/lib/tables.c
index 7bad5dd3032..730552a0ea5 100644
--- a/arch/x86/lib/tables.c
+++ b/arch/x86/lib/tables.c
@@ -8,6 +8,7 @@
 #include <malloc.h>
 #include <smbios.h>
 #include <acpi/acpi_table.h>
+#include <asm/global_data.h>
 #include <asm/sfi.h>
 #include <asm/mpspec.h>
 #include <asm/tables.h>
diff --git a/arch/x86/lib/tpl.c b/arch/x86/lib/tpl.c
index 6f7eb43a172..789472bc9a2 100644
--- a/arch/x86/lib/tpl.c
+++ b/arch/x86/lib/tpl.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <spl.h>
 #include <asm/cpu.h>
+#include <asm/global_data.h>
 #include <asm/mtrr.h>
 #include <asm/processor.h>
 #include <asm-generic/sections.h>
diff --git a/arch/xtensa/lib/bootm.c b/arch/xtensa/lib/bootm.c
index 458eaf95c04..b51d329c670 100644
--- a/arch/xtensa/lib/bootm.c
+++ b/arch/xtensa/lib/bootm.c
@@ -9,6 +9,7 @@
 #include <command.h>
 #include <cpu_func.h>
 #include <env.h>
+#include <asm/global_data.h>
 #include <u-boot/zlib.h>
 #include <asm/byteorder.h>
 #include <asm/addrspace.h>
diff --git a/board/AndesTech/adp-ae3xx/adp-ae3xx.c b/board/AndesTech/adp-ae3xx/adp-ae3xx.c
index b52cbd4d861..3c4a27d63f6 100644
--- a/board/AndesTech/adp-ae3xx/adp-ae3xx.c
+++ b/board/AndesTech/adp-ae3xx/adp-ae3xx.c
@@ -7,6 +7,7 @@
 
 #include <init.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <asm/mach-types.h>
 #include <common.h>
 #include <flash.h>
diff --git a/board/AndesTech/adp-ag101p/adp-ag101p.c b/board/AndesTech/adp-ag101p/adp-ag101p.c
index 3dd880f3d6c..8848b7f9738 100644
--- a/board/AndesTech/adp-ag101p/adp-ag101p.c
+++ b/board/AndesTech/adp-ag101p/adp-ag101p.c
@@ -12,6 +12,7 @@
 #if defined(CONFIG_FTMAC100) && !defined(CONFIG_DM_ETH)
 #include <netdev.h>
 #endif
+#include <asm/global_data.h>
 #include <linux/io.h>
 #include <asm/io.h>
 #include <asm/mach-types.h>
diff --git a/board/AndesTech/ax25-ae350/ax25-ae350.c b/board/AndesTech/ax25-ae350/ax25-ae350.c
index 59a43e4dcc4..d781038de28 100644
--- a/board/AndesTech/ax25-ae350/ax25-ae350.c
+++ b/board/AndesTech/ax25-ae350/ax25-ae350.c
@@ -12,6 +12,7 @@
 #if defined(CONFIG_FTMAC100) && !defined(CONFIG_DM_ETH)
 #include <netdev.h>
 #endif
+#include <asm/global_data.h>
 #include <linux/io.h>
 #include <faraday/ftsmc020.h>
 #include <fdtdec.h>
diff --git a/board/Arcturus/ucp1020/spl.c b/board/Arcturus/ucp1020/spl.c
index 5416a5b663c..34660e59f44 100644
--- a/board/Arcturus/ucp1020/spl.c
+++ b/board/Arcturus/ucp1020/spl.c
@@ -20,6 +20,7 @@
 #include <i2c.h>
 #include <fsl_esdhc.h>
 #include <spi_flash.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/BuR/brppt1/board.c b/board/BuR/brppt1/board.c
index 8aa03eac283..7df37e4e66a 100644
--- a/board/BuR/brppt1/board.c
+++ b/board/BuR/brppt1/board.c
@@ -23,6 +23,7 @@
 #include <asm/arch/gpio.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/mem.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/emif.h>
 #include <asm/gpio.h>
diff --git a/board/BuR/brppt2/board.c b/board/BuR/brppt2/board.c
index f156b552a76..e6eb403fc3d 100644
--- a/board/BuR/brppt2/board.c
+++ b/board/BuR/brppt2/board.c
@@ -21,6 +21,7 @@
 # include <asm/arch/mx6-ddr.h>
 #endif
 #include <asm/arch/clock.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
 
diff --git a/board/BuR/brsmarc1/board.c b/board/BuR/brsmarc1/board.c
index 5b9108a89f9..738a5d2ff94 100644
--- a/board/BuR/brsmarc1/board.c
+++ b/board/BuR/brsmarc1/board.c
@@ -19,6 +19,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/mem.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
 #include <asm/emif.h>
diff --git a/board/BuR/brxre1/board.c b/board/BuR/brxre1/board.c
index 5d57e19fde0..ef692b006d5 100644
--- a/board/BuR/brxre1/board.c
+++ b/board/BuR/brxre1/board.c
@@ -21,6 +21,7 @@
 #include <asm/arch/gpio.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/mem.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/emif.h>
 #include <asm/gpio.h>
diff --git a/board/BuR/common/common.c b/board/BuR/common/common.c
index 0a5104a48f9..d2d4ea5835b 100644
--- a/board/BuR/common/common.c
+++ b/board/BuR/common/common.c
@@ -15,6 +15,7 @@
 #include <fdtdec.h>
 #include <i2c.h>
 #include <lcd.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 #include "bur_common.h"
 
diff --git a/board/BuS/eb_cpu5282/eb_cpu5282.c b/board/BuS/eb_cpu5282/eb_cpu5282.c
index 1d05e40c209..03a02ffd29c 100644
--- a/board/BuS/eb_cpu5282/eb_cpu5282.c
+++ b/board/BuS/eb_cpu5282/eb_cpu5282.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <asm/global_data.h>
 #include "asm/m5282.h"
 #include <bmp_layout.h>
 #include <env.h>
diff --git a/board/CZ.NIC/turris_mox/turris_mox.c b/board/CZ.NIC/turris_mox/turris_mox.c
index 679f3eb7014..486680a49e8 100644
--- a/board/CZ.NIC/turris_mox/turris_mox.c
+++ b/board/CZ.NIC/turris_mox/turris_mox.c
@@ -7,6 +7,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
 #include <clk.h>
diff --git a/board/CZ.NIC/turris_omnia/turris_omnia.c b/board/CZ.NIC/turris_omnia/turris_omnia.c
index 2da878d3648..0353d58a361 100644
--- a/board/CZ.NIC/turris_omnia/turris_omnia.c
+++ b/board/CZ.NIC/turris_omnia/turris_omnia.c
@@ -15,6 +15,7 @@
 #include <miiphy.h>
 #include <net.h>
 #include <netdev.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
diff --git a/board/CarMediaLab/flea3/flea3.c b/board/CarMediaLab/flea3/flea3.c
index 11fcecb94e5..12c5ac331f9 100644
--- a/board/CarMediaLab/flea3/flea3.c
+++ b/board/CarMediaLab/flea3/flea3.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <env.h>
 #include <linux/delay.h>
diff --git a/board/LaCie/edminiv2/edminiv2.c b/board/LaCie/edminiv2/edminiv2.c
index b5ffe8162f3..9c066a283c9 100644
--- a/board/LaCie/edminiv2/edminiv2.c
+++ b/board/LaCie/edminiv2/edminiv2.c
@@ -11,6 +11,7 @@
 #include <miiphy.h>
 #include <net.h>
 #include <asm/arch/orion5x.h>
+#include <asm/global_data.h>
 #include "../common/common.h"
 #include <spl.h>
 #include <ns16550.h>
diff --git a/board/LaCie/net2big_v2/net2big_v2.c b/board/LaCie/net2big_v2/net2big_v2.c
index e94c9a6dce9..695d6f6ed47 100644
--- a/board/LaCie/net2big_v2/net2big_v2.c
+++ b/board/LaCie/net2big_v2/net2big_v2.c
@@ -14,6 +14,7 @@
 #include <i2c.h>
 #include <init.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <asm/mach-types.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
diff --git a/board/LaCie/netspace_v2/netspace_v2.c b/board/LaCie/netspace_v2/netspace_v2.c
index 33246b20152..730eab7e703 100644
--- a/board/LaCie/netspace_v2/netspace_v2.c
+++ b/board/LaCie/netspace_v2/netspace_v2.c
@@ -13,6 +13,7 @@
 #include <env.h>
 #include <init.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <asm/mach-types.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
diff --git a/board/Marvell/aspenite/aspenite.c b/board/Marvell/aspenite/aspenite.c
index c1406d7489c..1f9389c0a7a 100644
--- a/board/Marvell/aspenite/aspenite.c
+++ b/board/Marvell/aspenite/aspenite.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <init.h>
 #include <mvmfp.h>
+#include <asm/global_data.h>
 #include <asm/mach-types.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/mfp.h>
diff --git a/board/Marvell/db-88f6281-bp/db-88f6281-bp.c b/board/Marvell/db-88f6281-bp/db-88f6281-bp.c
index 62027bd6385..08f79d4b532 100644
--- a/board/Marvell/db-88f6281-bp/db-88f6281-bp.c
+++ b/board/Marvell/db-88f6281-bp/db-88f6281-bp.c
@@ -3,6 +3,7 @@
 #include <common.h>
 #include <init.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/io.h>
 #include <miiphy.h>
diff --git a/board/Marvell/db-88f6720/db-88f6720.c b/board/Marvell/db-88f6720/db-88f6720.c
index 271535b7637..26c30647fbb 100644
--- a/board/Marvell/db-88f6720/db-88f6720.c
+++ b/board/Marvell/db-88f6720/db-88f6720.c
@@ -8,6 +8,7 @@
 #include <miiphy.h>
 #include <net.h>
 #include <netdev.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
diff --git a/board/Marvell/db-88f6820-amc/db-88f6820-amc.c b/board/Marvell/db-88f6820-amc/db-88f6820-amc.c
index 9cd9ea2c068..163a1b3de9d 100644
--- a/board/Marvell/db-88f6820-amc/db-88f6820-amc.c
+++ b/board/Marvell/db-88f6820-amc/db-88f6820-amc.c
@@ -9,6 +9,7 @@
 #include <miiphy.h>
 #include <net.h>
 #include <netdev.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
diff --git a/board/Marvell/db-88f6820-gp/db-88f6820-gp.c b/board/Marvell/db-88f6820-gp/db-88f6820-gp.c
index 2bdd55329d0..06307e582ce 100644
--- a/board/Marvell/db-88f6820-gp/db-88f6820-gp.c
+++ b/board/Marvell/db-88f6820-gp/db-88f6820-gp.c
@@ -9,6 +9,7 @@
 #include <miiphy.h>
 #include <net.h>
 #include <netdev.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
diff --git a/board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c b/board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c
index 8d1dbebdb7a..9e1fdecfca4 100644
--- a/board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c
+++ b/board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c
@@ -8,6 +8,7 @@
 #include <miiphy.h>
 #include <net.h>
 #include <netdev.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
diff --git a/board/Marvell/db-xc3-24g4xg/db-xc3-24g4xg.c b/board/Marvell/db-xc3-24g4xg/db-xc3-24g4xg.c
index 5f12a27002f..0abdca1cd21 100644
--- a/board/Marvell/db-xc3-24g4xg/db-xc3-24g4xg.c
+++ b/board/Marvell/db-xc3-24g4xg/db-xc3-24g4xg.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <i2c.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <linux/bitops.h>
 #include <linux/mbus.h>
diff --git a/board/Marvell/dreamplug/dreamplug.c b/board/Marvell/dreamplug/dreamplug.c
index 7d188c32795..e1c64b52246 100644
--- a/board/Marvell/dreamplug/dreamplug.c
+++ b/board/Marvell/dreamplug/dreamplug.c
@@ -15,6 +15,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
 #include <asm/arch/mpp.h>
+#include <asm/global_data.h>
 #include "dreamplug.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/Marvell/gplugd/gplugd.c b/board/Marvell/gplugd/gplugd.c
index 58e433fd347..c6376cdf6a9 100644
--- a/board/Marvell/gplugd/gplugd.c
+++ b/board/Marvell/gplugd/gplugd.c
@@ -18,6 +18,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/mfp.h>
 #include <asm/arch/armada100.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <miiphy.h>
 #include <asm/mach-types.h>
diff --git a/board/Marvell/guruplug/guruplug.c b/board/Marvell/guruplug/guruplug.c
index f3981c66d20..8e7dbb3f3f6 100644
--- a/board/Marvell/guruplug/guruplug.c
+++ b/board/Marvell/guruplug/guruplug.c
@@ -9,6 +9,7 @@
 #include <init.h>
 #include <miiphy.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <asm/mach-types.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
diff --git a/board/Marvell/mvebu_armada-37xx/board.c b/board/Marvell/mvebu_armada-37xx/board.c
index 9bea1986d4d..73e2c3723a3 100644
--- a/board/Marvell/mvebu_armada-37xx/board.c
+++ b/board/Marvell/mvebu_armada-37xx/board.c
@@ -8,6 +8,7 @@
 #include <i2c.h>
 #include <init.h>
 #include <phy.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
diff --git a/board/Marvell/mvebu_armada-8k/board.c b/board/Marvell/mvebu_armada-8k/board.c
index 60b00246307..fa27a352142 100644
--- a/board/Marvell/mvebu_armada-8k/board.c
+++ b/board/Marvell/mvebu_armada-8k/board.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
diff --git a/board/Marvell/openrd/openrd.c b/board/Marvell/openrd/openrd.c
index d9b5b213fea..f44ac3315eb 100644
--- a/board/Marvell/openrd/openrd.c
+++ b/board/Marvell/openrd/openrd.c
@@ -14,6 +14,7 @@
 #include <init.h>
 #include <miiphy.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <asm/mach-types.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
diff --git a/board/Marvell/sheevaplug/sheevaplug.c b/board/Marvell/sheevaplug/sheevaplug.c
index 6311ed3b2e5..0cc7f2b3924 100644
--- a/board/Marvell/sheevaplug/sheevaplug.c
+++ b/board/Marvell/sheevaplug/sheevaplug.c
@@ -9,6 +9,7 @@
 #include <init.h>
 #include <miiphy.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <asm/mach-types.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
diff --git a/board/Seagate/dockstar/dockstar.c b/board/Seagate/dockstar/dockstar.c
index 85dd10e55a2..380e37be550 100644
--- a/board/Seagate/dockstar/dockstar.c
+++ b/board/Seagate/dockstar/dockstar.c
@@ -16,6 +16,7 @@
 #include <asm/arch/soc.h>
 #include <asm/arch/mpp.h>
 #include <asm/arch/cpu.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/mach-types.h>
 #include "dockstar.h"
diff --git a/board/Seagate/goflexhome/goflexhome.c b/board/Seagate/goflexhome/goflexhome.c
index de1ec544667..4c19fa7195e 100644
--- a/board/Seagate/goflexhome/goflexhome.c
+++ b/board/Seagate/goflexhome/goflexhome.c
@@ -16,6 +16,7 @@
 #include <init.h>
 #include <miiphy.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <asm/mach-types.h>
 #include <asm/arch/soc.h>
 #include <asm/arch/mpp.h>
diff --git a/board/Seagate/nas220/nas220.c b/board/Seagate/nas220/nas220.c
index 3a027d083a7..cd2bbdad1cd 100644
--- a/board/Seagate/nas220/nas220.c
+++ b/board/Seagate/nas220/nas220.c
@@ -12,6 +12,7 @@
 #include <init.h>
 #include <miiphy.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <asm/mach-types.h>
 #include <asm/arch/soc.h>
 #include <asm/arch/mpp.h>
diff --git a/board/Synology/ds109/ds109.c b/board/Synology/ds109/ds109.c
index aa2987d924f..bf57ffff438 100644
--- a/board/Synology/ds109/ds109.c
+++ b/board/Synology/ds109/ds109.c
@@ -9,6 +9,7 @@
 #include <init.h>
 #include <miiphy.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <asm/setup.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
diff --git a/board/Synology/ds414/ds414.c b/board/Synology/ds414/ds414.c
index 632205164eb..9c4ce670ddf 100644
--- a/board/Synology/ds414/ds414.c
+++ b/board/Synology/ds414/ds414.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <init.h>
 #include <miiphy.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
diff --git a/board/advantech/dms-ba16/dms-ba16.c b/board/advantech/dms-ba16/dms-ba16.c
index 20820fdf076..07a47e9fbb0 100644
--- a/board/advantech/dms-ba16/dms-ba16.c
+++ b/board/advantech/dms-ba16/dms-ba16.c
@@ -11,6 +11,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/mx6-pins.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
diff --git a/board/advantech/imx8qm_rom7720_a1/imx8qm_rom7720_a1.c b/board/advantech/imx8qm_rom7720_a1/imx8qm_rom7720_a1.c
index ea057d27cf3..8492e7603b4 100644
--- a/board/advantech/imx8qm_rom7720_a1/imx8qm_rom7720_a1.c
+++ b/board/advantech/imx8qm_rom7720_a1/imx8qm_rom7720_a1.c
@@ -9,6 +9,7 @@
 #include <env.h>
 #include <errno.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 #include <asm/io.h>
diff --git a/board/advantech/imx8qm_rom7720_a1/spl.c b/board/advantech/imx8qm_rom7720_a1/spl.c
index a2386c9ef00..8493bb01588 100644
--- a/board/advantech/imx8qm_rom7720_a1/spl.c
+++ b/board/advantech/imx8qm_rom7720_a1/spl.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <spl.h>
 #include <fsl_esdhc.h>
+#include <asm/global_data.h>
 
 #include <asm/io.h>
 #include <asm/gpio.h>
diff --git a/board/alliedtelesis/SBx81LIFKW/sbx81lifkw.c b/board/alliedtelesis/SBx81LIFKW/sbx81lifkw.c
index 668484b71b6..d8b9fdfe356 100644
--- a/board/alliedtelesis/SBx81LIFKW/sbx81lifkw.c
+++ b/board/alliedtelesis/SBx81LIFKW/sbx81lifkw.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <init.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/io.h>
diff --git a/board/alliedtelesis/SBx81LIFXCAT/sbx81lifxcat.c b/board/alliedtelesis/SBx81LIFXCAT/sbx81lifxcat.c
index e4bf507cc3f..52b8eba92fc 100644
--- a/board/alliedtelesis/SBx81LIFXCAT/sbx81lifxcat.c
+++ b/board/alliedtelesis/SBx81LIFXCAT/sbx81lifxcat.c
@@ -10,6 +10,7 @@
 #include <net.h>
 #include <netdev.h>
 #include <led.h>
+#include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/io.h>
 #include <asm/arch/cpu.h>
diff --git a/board/alliedtelesis/common/gpio_hog.c b/board/alliedtelesis/common/gpio_hog.c
index 1f87b3ac1b7..4aecf7e2cef 100644
--- a/board/alliedtelesis/common/gpio_hog.c
+++ b/board/alliedtelesis/common/gpio_hog.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/alliedtelesis/x530/x530.c b/board/alliedtelesis/x530/x530.c
index c7438aeaf14..d602092d732 100644
--- a/board/alliedtelesis/x530/x530.c
+++ b/board/alliedtelesis/x530/x530.c
@@ -10,6 +10,7 @@
 #include <i2c.h>
 #include <init.h>
 #include <wdt.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <linux/bitops.h>
 #include <linux/mbus.h>
diff --git a/board/amazon/kc1/kc1.c b/board/amazon/kc1/kc1.c
index 7d62a1d5a86..94e39613440 100644
--- a/board/amazon/kc1/kc1.c
+++ b/board/amazon/kc1/kc1.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <env.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <linux/ctype.h>
 #include <linux/usb/musb.h>
 #include <asm/omap_musb.h>
diff --git a/board/aristainetos/aristainetos.c b/board/aristainetos/aristainetos.c
index 14931120f6f..a28f67a0b13 100644
--- a/board/aristainetos/aristainetos.c
+++ b/board/aristainetos/aristainetos.c
@@ -16,6 +16,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/mx6-pins.h>
+#include <asm/global_data.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
 #include <asm/mach-imx/iomux-v3.h>
diff --git a/board/armadeus/apf27/apf27.c b/board/armadeus/apf27/apf27.c
index 29e0bf388d0..5e3fdd36fa2 100644
--- a/board/armadeus/apf27/apf27.c
+++ b/board/armadeus/apf27/apf27.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <hang.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <jffs2/jffs2.h>
 #include <nand.h>
 #include <netdev.h>
diff --git a/board/armltd/integrator/integrator.c b/board/armltd/integrator/integrator.c
index 19871bee146..a730f15c7a3 100644
--- a/board/armltd/integrator/integrator.c
+++ b/board/armltd/integrator/integrator.c
@@ -24,6 +24,7 @@
 #include <init.h>
 #include <net.h>
 #include <netdev.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm/platform_data/serial_pl01x.h>
 #include "arm-ebi.h"
diff --git a/board/armltd/vexpress/vexpress_common.c b/board/armltd/vexpress/vexpress_common.c
index 70f6cd80d5a..d34c03bf9dd 100644
--- a/board/armltd/vexpress/vexpress_common.c
+++ b/board/armltd/vexpress/vexpress_common.c
@@ -23,6 +23,7 @@
 #include <errno.h>
 #include <net.h>
 #include <netdev.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/mach-types.h>
 #include <asm/arch/systimer.h>
diff --git a/board/armltd/vexpress64/vexpress64.c b/board/armltd/vexpress64/vexpress64.c
index 52ada0f6bce..6bf2ed23190 100644
--- a/board/armltd/vexpress64/vexpress64.c
+++ b/board/armltd/vexpress64/vexpress64.c
@@ -12,6 +12,7 @@
 #include <errno.h>
 #include <net.h>
 #include <netdev.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/compiler.h>
 #include <dm/platform_data/serial_pl01x.h>
diff --git a/board/astro/mcf5373l/mcf5373l.c b/board/astro/mcf5373l/mcf5373l.c
index e7c2b909300..3e2f79a1cf4 100644
--- a/board/astro/mcf5373l/mcf5373l.c
+++ b/board/astro/mcf5373l/mcf5373l.c
@@ -10,6 +10,7 @@
 #include <serial.h>
 #include <watchdog.h>
 #include <command.h>
+#include <asm/global_data.h>
 #include <asm/m5329.h>
 #include <asm/immap_5329.h>
 #include <asm/io.h>
diff --git a/board/atmark-techno/armadillo-800eva/armadillo-800eva.c b/board/atmark-techno/armadillo-800eva/armadillo-800eva.c
index a18fb275d9f..1bae2832522 100644
--- a/board/atmark-techno/armadillo-800eva/armadillo-800eva.c
+++ b/board/atmark-techno/armadillo-800eva/armadillo-800eva.c
@@ -24,6 +24,7 @@
 #include <cpu_func.h>
 #include <init.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <asm/processor.h>
 #include <asm/mach-types.h>
 #include <asm/io.h>
diff --git a/board/atmel/at91rm9200ek/at91rm9200ek.c b/board/atmel/at91rm9200ek/at91rm9200ek.c
index 8844bc75419..a314ced5e4a 100644
--- a/board/atmel/at91rm9200ek/at91rm9200ek.c
+++ b/board/atmel/at91rm9200ek/at91rm9200ek.c
@@ -13,6 +13,7 @@
 #include <init.h>
 #include <net.h>
 #include <netdev.h>
+#include <asm/global_data.h>
 #include <asm/mach-types.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/at91_pio.h>
diff --git a/board/atmel/at91sam9260ek/at91sam9260ek.c b/board/atmel/at91sam9260ek/at91sam9260ek.c
index 42fa7627724..38f97bce204 100644
--- a/board/atmel/at91sam9260ek/at91sam9260ek.c
+++ b/board/atmel/at91sam9260ek/at91sam9260ek.c
@@ -9,6 +9,7 @@
 #include <debug_uart.h>
 #include <init.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/at91sam9260_matrix.h>
 #include <asm/arch/at91sam9_smc.h>
diff --git a/board/atmel/at91sam9261ek/at91sam9261ek.c b/board/atmel/at91sam9261ek/at91sam9261ek.c
index f467a4f566c..0318eeaa94e 100644
--- a/board/atmel/at91sam9261ek/at91sam9261ek.c
+++ b/board/atmel/at91sam9261ek/at91sam9261ek.c
@@ -9,6 +9,7 @@
 #include <debug_uart.h>
 #include <init.h>
 #include <vsprintf.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/at91sam9261.h>
 #include <asm/arch/at91sam9261_matrix.h>
diff --git a/board/atmel/at91sam9263ek/at91sam9263ek.c b/board/atmel/at91sam9263ek/at91sam9263ek.c
index be132bc185f..3218e14e860 100644
--- a/board/atmel/at91sam9263ek/at91sam9263ek.c
+++ b/board/atmel/at91sam9263ek/at91sam9263ek.c
@@ -11,6 +11,7 @@
 #include <init.h>
 #include <net.h>
 #include <vsprintf.h>
+#include <asm/global_data.h>
 #include <linux/sizes.h>
 #include <asm/arch/at91sam9263.h>
 #include <asm/arch/at91sam9_smc.h>
diff --git a/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c b/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c
index 8aabc559519..8cb2808e058 100644
--- a/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c
+++ b/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c
@@ -10,6 +10,7 @@
 #include <init.h>
 #include <net.h>
 #include <vsprintf.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clk.h>
 #include <asm/arch/at91sam9g45_matrix.h>
diff --git a/board/atmel/at91sam9n12ek/at91sam9n12ek.c b/board/atmel/at91sam9n12ek/at91sam9n12ek.c
index d7ff2e13352..a3fc55bbc34 100644
--- a/board/atmel/at91sam9n12ek/at91sam9n12ek.c
+++ b/board/atmel/at91sam9n12ek/at91sam9n12ek.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <net.h>
 #include <vsprintf.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/at91sam9x5_matrix.h>
 #include <asm/arch/at91sam9_smc.h>
diff --git a/board/atmel/at91sam9rlek/at91sam9rlek.c b/board/atmel/at91sam9rlek/at91sam9rlek.c
index f81dccc9ccc..f427ee658bf 100644
--- a/board/atmel/at91sam9rlek/at91sam9rlek.c
+++ b/board/atmel/at91sam9rlek/at91sam9rlek.c
@@ -9,6 +9,7 @@
 #include <debug_uart.h>
 #include <init.h>
 #include <vsprintf.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/mach-types.h>
 #include <asm/arch/at91sam9rl.h>
diff --git a/board/atmel/at91sam9x5ek/at91sam9x5ek.c b/board/atmel/at91sam9x5ek/at91sam9x5ek.c
index 2c071075bac..e0abe4aeb08 100644
--- a/board/atmel/at91sam9x5ek/at91sam9x5ek.c
+++ b/board/atmel/at91sam9x5ek/at91sam9x5ek.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/at91sam9x5_matrix.h>
 #include <asm/arch/at91sam9_smc.h>
diff --git a/board/atmel/common/video_display.c b/board/atmel/common/video_display.c
index 2666b0b3cd5..a5049f4aad4 100644
--- a/board/atmel/common/video_display.c
+++ b/board/atmel/common/video_display.c
@@ -13,6 +13,7 @@
 #include <video.h>
 #include <video_console.h>
 #include <vsprintf.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clk.h>
 
diff --git a/board/atmel/sam9x60ek/sam9x60ek.c b/board/atmel/sam9x60ek/sam9x60ek.c
index fbd05c78a94..32e5a2bf23a 100644
--- a/board/atmel/sam9x60ek/sam9x60ek.c
+++ b/board/atmel/sam9x60ek/sam9x60ek.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/at91sam9_smc.h>
 #include <asm/arch/at91_common.h>
diff --git a/board/atmel/sama5d27_som1_ek/sama5d27_som1_ek.c b/board/atmel/sama5d27_som1_ek/sama5d27_som1_ek.c
index 376562cd0e7..1b7d946b50c 100644
--- a/board/atmel/sama5d27_som1_ek/sama5d27_som1_ek.c
+++ b/board/atmel/sama5d27_som1_ek/sama5d27_som1_ek.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <debug_uart.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/at91_common.h>
 #include <asm/arch/atmel_pio4.h>
diff --git a/board/atmel/sama5d27_wlsom1_ek/sama5d27_wlsom1_ek.c b/board/atmel/sama5d27_wlsom1_ek/sama5d27_wlsom1_ek.c
index c8c2e958167..32d51bba7d9 100644
--- a/board/atmel/sama5d27_wlsom1_ek/sama5d27_wlsom1_ek.c
+++ b/board/atmel/sama5d27_wlsom1_ek/sama5d27_wlsom1_ek.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <debug_uart.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/at91_common.h>
 #include <asm/arch/atmel_pio4.h>
diff --git a/board/atmel/sama5d2_icp/sama5d2_icp.c b/board/atmel/sama5d2_icp/sama5d2_icp.c
index 7c34df48b87..3f33fcfc466 100644
--- a/board/atmel/sama5d2_icp/sama5d2_icp.c
+++ b/board/atmel/sama5d2_icp/sama5d2_icp.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <debug_uart.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/at91_common.h>
 #include <asm/arch/atmel_pio4.h>
diff --git a/board/atmel/sama5d2_ptc_ek/sama5d2_ptc_ek.c b/board/atmel/sama5d2_ptc_ek/sama5d2_ptc_ek.c
index b0a23b02db2..a6937e7d524 100644
--- a/board/atmel/sama5d2_ptc_ek/sama5d2_ptc_ek.c
+++ b/board/atmel/sama5d2_ptc_ek/sama5d2_ptc_ek.c
@@ -11,6 +11,7 @@
 #include <init.h>
 #include <nand.h>
 #include <version.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/at91_common.h>
 #include <asm/arch/atmel_pio4.h>
diff --git a/board/atmel/sama5d2_xplained/sama5d2_xplained.c b/board/atmel/sama5d2_xplained/sama5d2_xplained.c
index 01636fb73d0..5110ec89697 100644
--- a/board/atmel/sama5d2_xplained/sama5d2_xplained.c
+++ b/board/atmel/sama5d2_xplained/sama5d2_xplained.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <debug_uart.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/at91_common.h>
 #include <asm/arch/atmel_pio4.h>
diff --git a/board/atmel/sama5d3_xplained/sama5d3_xplained.c b/board/atmel/sama5d3_xplained/sama5d3_xplained.c
index 84c561be6fc..db9603f5847 100644
--- a/board/atmel/sama5d3_xplained/sama5d3_xplained.c
+++ b/board/atmel/sama5d3_xplained/sama5d3_xplained.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/sama5d3_smc.h>
 #include <asm/arch/at91_common.h>
diff --git a/board/atmel/sama5d3xek/sama5d3xek.c b/board/atmel/sama5d3xek/sama5d3xek.c
index 7f6a3198592..b6f8dcd91dc 100644
--- a/board/atmel/sama5d3xek/sama5d3xek.c
+++ b/board/atmel/sama5d3xek/sama5d3xek.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/sama5d3_smc.h>
 #include <asm/arch/at91_common.h>
diff --git a/board/atmel/sama5d4_xplained/sama5d4_xplained.c b/board/atmel/sama5d4_xplained/sama5d4_xplained.c
index 93cc183a5b4..2088b48b7ee 100644
--- a/board/atmel/sama5d4_xplained/sama5d4_xplained.c
+++ b/board/atmel/sama5d4_xplained/sama5d4_xplained.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/at91_common.h>
 #include <asm/arch/at91_rstc.h>
diff --git a/board/atmel/sama5d4ek/sama5d4ek.c b/board/atmel/sama5d4ek/sama5d4ek.c
index 4b3883e20f8..46ec1eb3246 100644
--- a/board/atmel/sama5d4ek/sama5d4ek.c
+++ b/board/atmel/sama5d4ek/sama5d4ek.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/at91_common.h>
 #include <asm/arch/at91_rstc.h>
diff --git a/board/bachmann/ot1200/ot1200.c b/board/bachmann/ot1200/ot1200.c
index d3af634e3ab..69d1b106b07 100644
--- a/board/bachmann/ot1200/ot1200.c
+++ b/board/bachmann/ot1200/ot1200.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <init.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/barco/platinum/platinum.c b/board/barco/platinum/platinum.c
index f96106cb75e..ec8d5528887 100644
--- a/board/barco/platinum/platinum.c
+++ b/board/barco/platinum/platinum.c
@@ -11,6 +11,7 @@
 #include <miiphy.h>
 #include <net.h>
 #include <netdev.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/barco/titanium/titanium.c b/board/barco/titanium/titanium.c
index 7a52e94c7ee..efd1dc35ef4 100644
--- a/board/barco/titanium/titanium.c
+++ b/board/barco/titanium/titanium.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <init.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/beacon/beacon-rzg2m/beacon-rzg2m.c b/board/beacon/beacon-rzg2m/beacon-rzg2m.c
index 86a24dd0658..c343de51023 100644
--- a/board/beacon/beacon-rzg2m/beacon-rzg2m.c
+++ b/board/beacon/beacon-rzg2m/beacon-rzg2m.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/rcar-mstp.h>
 
diff --git a/board/beacon/imx8mm/imx8mm_beacon.c b/board/beacon/imx8mm/imx8mm_beacon.c
index c61d25fbead..87ffebb5713 100644
--- a/board/beacon/imx8mm/imx8mm_beacon.c
+++ b/board/beacon/imx8mm/imx8mm_beacon.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <miiphy.h>
 #include <netdev.h>
+#include <asm/global_data.h>
 
 #include <asm/arch/clock.h>
 #include <asm/arch/sys_proto.h>
diff --git a/board/beacon/imx8mm/spl.c b/board/beacon/imx8mm/spl.c
index 4ee10cf8555..12266b22a42 100644
--- a/board/beacon/imx8mm/spl.c
+++ b/board/beacon/imx8mm/spl.c
@@ -6,6 +6,7 @@
 #include <init.h>
 #include <log.h>
 #include <spl.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/arch/clock.h>
diff --git a/board/beckhoff/mx53cx9020/mx53cx9020.c b/board/beckhoff/mx53cx9020/mx53cx9020.c
index 617b545232a..a3657db8266 100644
--- a/board/beckhoff/mx53cx9020/mx53cx9020.c
+++ b/board/beckhoff/mx53cx9020/mx53cx9020.c
@@ -13,6 +13,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/iomux-mx53.h>
+#include <asm/global_data.h>
 #include <asm/mach-imx/mx5_video.h>
 #include <ACEX1K.h>
 #include <asm/gpio.h>
diff --git a/board/bluegiga/apx4devkit/apx4devkit.c b/board/bluegiga/apx4devkit/apx4devkit.c
index 739f71f5c4d..ed0885f724c 100644
--- a/board/bluegiga/apx4devkit/apx4devkit.c
+++ b/board/bluegiga/apx4devkit/apx4devkit.c
@@ -16,6 +16,7 @@
 #include <common.h>
 #include <init.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <asm/setup.h>
diff --git a/board/bluewater/gurnard/gurnard.c b/board/bluewater/gurnard/gurnard.c
index dc9871d4469..c5c8bcc598e 100644
--- a/board/bluewater/gurnard/gurnard.c
+++ b/board/bluewater/gurnard/gurnard.c
@@ -19,6 +19,7 @@
 #ifndef CONFIG_DM_ETH
 #include <netdev.h>
 #endif
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <asm/mach-types.h>
diff --git a/board/bluewater/snapper9260/snapper9260.c b/board/bluewater/snapper9260/snapper9260.c
index 9b0a75ac5df..87fb967ea05 100644
--- a/board/bluewater/snapper9260/snapper9260.c
+++ b/board/bluewater/snapper9260/snapper9260.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <dm.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
 #include <asm/mach-types.h>
diff --git a/board/bosch/guardian/board.c b/board/bosch/guardian/board.c
index 1d8fa781545..113838f8b72 100644
--- a/board/bosch/guardian/board.c
+++ b/board/bosch/guardian/board.c
@@ -19,6 +19,7 @@
 #include <led.h>
 #include <miiphy.h>
 #include <panel.h>
+#include <asm/global_data.h>
 #include <power/tps65217.h>
 #include <power/tps65910.h>
 #include <spl.h>
diff --git a/board/bosch/shc/board.c b/board/bosch/shc/board.c
index b8f1b56502e..bfce291691a 100644
--- a/board/bosch/shc/board.c
+++ b/board/bosch/shc/board.c
@@ -29,6 +29,7 @@
 #include <asm/arch/mmc_host_def.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/mem.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/emif.h>
 #include <asm/gpio.h>
diff --git a/board/boundary/nitrogen6x/nitrogen6x.c b/board/boundary/nitrogen6x/nitrogen6x.c
index 5b2d675a557..84e14d1124f 100644
--- a/board/boundary/nitrogen6x/nitrogen6x.c
+++ b/board/boundary/nitrogen6x/nitrogen6x.c
@@ -9,6 +9,7 @@
 #include <env.h>
 #include <init.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/broadcom/bcm23550_w1d/bcm23550_w1d.c b/board/broadcom/bcm23550_w1d/bcm23550_w1d.c
index a1e3b25c2e0..90685c072a3 100644
--- a/board/broadcom/bcm23550_w1d/bcm23550_w1d.c
+++ b/board/broadcom/bcm23550_w1d/bcm23550_w1d.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <init.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/mach-types.h>
 #include <env.h>
diff --git a/board/broadcom/bcm28155_ap/bcm28155_ap.c b/board/broadcom/bcm28155_ap/bcm28155_ap.c
index 79ce54993dd..43726f79bde 100644
--- a/board/broadcom/bcm28155_ap/bcm28155_ap.c
+++ b/board/broadcom/bcm28155_ap/bcm28155_ap.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <init.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/mach-types.h>
 #include <env.h>
diff --git a/board/broadcom/bcm_ep/board.c b/board/broadcom/bcm_ep/board.c
index ad9af92b559..6064eb43db1 100644
--- a/board/broadcom/bcm_ep/board.c
+++ b/board/broadcom/bcm_ep/board.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <net.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <config.h>
 #include <netdev.h>
diff --git a/board/broadcom/bcmns2/northstar2.c b/board/broadcom/bcmns2/northstar2.c
index 91f489aad3f..494e457ff65 100644
--- a/board/broadcom/bcmns2/northstar2.c
+++ b/board/broadcom/bcmns2/northstar2.c
@@ -6,6 +6,7 @@
 #include <cpu_func.h>
 #include <init.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/system.h>
 #include <asm/armv8/mmu.h>
 
diff --git a/board/broadcom/bcmns3/ns3.c b/board/broadcom/bcmns3/ns3.c
index 0357cd0e327..40eda6d465d 100644
--- a/board/broadcom/bcmns3/ns3.c
+++ b/board/broadcom/bcmns3/ns3.c
@@ -8,6 +8,7 @@
 #include <fdt_support.h>
 #include <asm/io.h>
 #include <asm/gic-v3.h>
+#include <asm/global_data.h>
 #include <asm/system.h>
 #include <asm/armv8/mmu.h>
 #include <asm/arch-bcmns3/bl33_info.h>
diff --git a/board/broadcom/bcmstb/bcmstb.c b/board/broadcom/bcmstb/bcmstb.c
index add4285db31..f6bdf1f5f40 100644
--- a/board/broadcom/bcmstb/bcmstb.c
+++ b/board/broadcom/bcmstb/bcmstb.c
@@ -10,6 +10,7 @@
 #include <init.h>
 #include <log.h>
 #include <time.h>
+#include <asm/global_data.h>
 #include <linux/types.h>
 #include <common.h>
 #include <env.h>
diff --git a/board/bticino/mamoj/mamoj.c b/board/bticino/mamoj/mamoj.c
index b7d37b70044..c9da42b43bf 100644
--- a/board/bticino/mamoj/mamoj.c
+++ b/board/bticino/mamoj/mamoj.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <init.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/bticino/mamoj/spl.c b/board/bticino/mamoj/spl.c
index a9bb2a55e5d..883b7f4133b 100644
--- a/board/bticino/mamoj/spl.c
+++ b/board/bticino/mamoj/spl.c
@@ -9,6 +9,7 @@
 #include <init.h>
 #include <serial.h>
 #include <spl.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 
 #include <asm/io.h>
diff --git a/board/buffalo/lsxl/lsxl.c b/board/buffalo/lsxl/lsxl.c
index 64daa456b3c..34be601fdde 100644
--- a/board/buffalo/lsxl/lsxl.c
+++ b/board/buffalo/lsxl/lsxl.c
@@ -24,6 +24,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/mpp.h>
 #include <asm/arch/gpio.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 
 #include "lsxl.h"
diff --git a/board/calao/usb_a9263/usb_a9263.c b/board/calao/usb_a9263/usb_a9263.c
index 1fcaff60455..c0a5c518ca8 100644
--- a/board/calao/usb_a9263/usb_a9263.c
+++ b/board/calao/usb_a9263/usb_a9263.c
@@ -15,6 +15,7 @@
 #include <asm/arch/clk.h>
 #include <asm/arch/gpio.h>
 #include <asm-generic/gpio.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <net.h>
 #include <netdev.h>
diff --git a/board/cavium/thunderx/thunderx.c b/board/cavium/thunderx/thunderx.c
index f8c2913eace..ccb6b26c91b 100644
--- a/board/cavium/thunderx/thunderx.c
+++ b/board/cavium/thunderx/thunderx.c
@@ -10,6 +10,7 @@
 #include <malloc.h>
 #include <errno.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <linux/compiler.h>
 
 #include <cavium/atf.h>
diff --git a/board/ccv/xpress/xpress.c b/board/ccv/xpress/xpress.c
index 27beaeb101a..9f5e78ce680 100644
--- a/board/ccv/xpress/xpress.c
+++ b/board/ccv/xpress/xpress.c
@@ -12,6 +12,7 @@
 #include <asm/arch/mx6ul_pins.h>
 #include <asm/arch/mx6-pins.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/mach-imx/boot_mode.h>
diff --git a/board/cirrus/edb93xx/edb93xx.c b/board/cirrus/edb93xx/edb93xx.c
index cbed98b0e36..7a7f62fe88e 100644
--- a/board/cirrus/edb93xx/edb93xx.c
+++ b/board/cirrus/edb93xx/edb93xx.c
@@ -21,6 +21,7 @@
 #include <net.h>
 #include <netdev.h>
 #include <status_led.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/mach-types.h>
 #include <asm/arch/ep93xx.h>
diff --git a/board/cloudengines/pogo_e02/pogo_e02.c b/board/cloudengines/pogo_e02/pogo_e02.c
index 8df039168c9..039fd6e3dd6 100644
--- a/board/cloudengines/pogo_e02/pogo_e02.c
+++ b/board/cloudengines/pogo_e02/pogo_e02.c
@@ -17,6 +17,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
 #include <asm/arch/mpp.h>
+#include <asm/global_data.h>
 #include "pogo_e02.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/cobra5272/cobra5272.c b/board/cobra5272/cobra5272.c
index a79884cb506..3e2418866c7 100644
--- a/board/cobra5272/cobra5272.c
+++ b/board/cobra5272/cobra5272.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/immap.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/compulab/cl-som-imx7/cl-som-imx7.c b/board/compulab/cl-som-imx7/cl-som-imx7.c
index 1eef1d55076..454c93a572f 100644
--- a/board/compulab/cl-som-imx7/cl-som-imx7.c
+++ b/board/compulab/cl-som-imx7/cl-som-imx7.c
@@ -15,6 +15,7 @@
 #include <phy.h>
 #include <netdev.h>
 #include <fsl_esdhc_imx.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 #include <power/pmic.h>
 #include <power/pfuze3000_pmic.h>
diff --git a/board/compulab/cm_fx6/cm_fx6.c b/board/compulab/cm_fx6/cm_fx6.c
index e2712680f95..2b11b7ee189 100644
--- a/board/compulab/cm_fx6/cm_fx6.c
+++ b/board/compulab/cm_fx6/cm_fx6.c
@@ -27,6 +27,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/mxc_hdmi.h>
+#include <asm/global_data.h>
 #include <asm/mach-imx/mxc_i2c.h>
 #include <asm/mach-imx/sata.h>
 #include <asm/mach-imx/video.h>
diff --git a/board/compulab/cm_t335/cm_t335.c b/board/compulab/cm_t335/cm_t335.c
index a9ba2b7e002..1d4a3aceef5 100644
--- a/board/compulab/cm_t335/cm_t335.c
+++ b/board/compulab/cm_t335/cm_t335.c
@@ -14,6 +14,7 @@
 #include <net.h>
 #include <status_led.h>
 #include <cpsw.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 
 #include <asm/arch/sys_proto.h>
diff --git a/board/compulab/cm_t43/cm_t43.c b/board/compulab/cm_t43/cm_t43.c
index 4b097c8f8f7..efdade155b5 100644
--- a/board/compulab/cm_t43/cm_t43.c
+++ b/board/compulab/cm_t43/cm_t43.c
@@ -8,6 +8,7 @@
 #include <miiphy.h>
 #include <cpsw.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/emif.h>
diff --git a/board/congatec/cgtqmx6eval/cgtqmx6eval.c b/board/congatec/cgtqmx6eval/cgtqmx6eval.c
index 9316b2c3772..6ae4a1af892 100644
--- a/board/congatec/cgtqmx6eval/cgtqmx6eval.c
+++ b/board/congatec/cgtqmx6eval/cgtqmx6eval.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <init.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/corscience/tricorder/tricorder.c b/board/corscience/tricorder/tricorder.c
index 41675677de2..3f4a40fd659 100644
--- a/board/corscience/tricorder/tricorder.c
+++ b/board/corscience/tricorder/tricorder.c
@@ -14,6 +14,7 @@
 #include <malloc.h>
 #include <twl4030.h>
 #include <status_led.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
 #include <asm/arch/mmc_host_def.h>
diff --git a/board/cortina/presidio-asic/presidio.c b/board/cortina/presidio-asic/presidio.c
index 3c132f12717..5c735222637 100644
--- a/board/cortina/presidio-asic/presidio.c
+++ b/board/cortina/presidio-asic/presidio.c
@@ -8,6 +8,7 @@
 #include <malloc.h>
 #include <errno.h>
 #include <netdev.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/compiler.h>
diff --git a/board/creative/xfi3/xfi3.c b/board/creative/xfi3/xfi3.c
index b5f0d313074..2aa2435e49c 100644
--- a/board/creative/xfi3/xfi3.c
+++ b/board/creative/xfi3/xfi3.c
@@ -13,6 +13,7 @@
 #include <errno.h>
 #include <init.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <asm/arch/iomux-mx23.h>
diff --git a/board/cssi/MCR3000/MCR3000.c b/board/cssi/MCR3000/MCR3000.c
index 55e955c36bb..c20e8714949 100644
--- a/board/cssi/MCR3000/MCR3000.c
+++ b/board/cssi/MCR3000/MCR3000.c
@@ -14,6 +14,7 @@
 #include <mpc8xx.h>
 #include <fdt_support.h>
 #include <serial.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm/uclass.h>
 #include <wdt.h>
diff --git a/board/d-link/dns325/dns325.c b/board/d-link/dns325/dns325.c
index 0ae2e7d88c1..055783f63ad 100644
--- a/board/d-link/dns325/dns325.c
+++ b/board/d-link/dns325/dns325.c
@@ -19,6 +19,7 @@
 #include <asm/arch/soc.h>
 #include <asm/arch/mpp.h>
 #include <asm/arch/gpio.h>
+#include <asm/global_data.h>
 #include "dns325.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/davinci/da8xxevm/da850evm.c b/board/davinci/da8xxevm/da850evm.c
index 683e8b452ad..383a8617384 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 <asm/arch/hardware.h>
+#include <asm/global_data.h>
 #include <asm/ti-common/davinci_nand.h>
 #include <asm/arch/emac_defs.h>
 #include <asm/arch/pinmux_defs.h>
diff --git a/board/davinci/da8xxevm/omapl138_lcdk.c b/board/davinci/da8xxevm/omapl138_lcdk.c
index 6bab7b18d44..7607e313b75 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 <asm/arch/hardware.h>
+#include <asm/global_data.h>
 #include <asm/ti-common/davinci_nand.h>
 #include <asm/io.h>
 #include <ns16550.h>
diff --git a/board/dhelectronics/dh_imx6/dh_imx6.c b/board/dhelectronics/dh_imx6/dh_imx6.c
index 9937d6b0106..2969e90a707 100644
--- a/board/dhelectronics/dh_imx6/dh_imx6.c
+++ b/board/dhelectronics/dh_imx6/dh_imx6.c
@@ -11,6 +11,7 @@
 #include <image.h>
 #include <init.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <dm/device-internal.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/crm_regs.h>
diff --git a/board/dhelectronics/dh_stm32mp1/board.c b/board/dhelectronics/dh_stm32mp1/board.c
index 17dbf20d76a..8abee14d3e2 100644
--- a/board/dhelectronics/dh_stm32mp1/board.c
+++ b/board/dhelectronics/dh_stm32mp1/board.c
@@ -9,6 +9,7 @@
 #include <net.h>
 #include <asm/arch/stm32.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <bootm.h>
diff --git a/board/ea/mx7ulp_com/mx7ulp_com.c b/board/ea/mx7ulp_com/mx7ulp_com.c
index a9b8a321082..5b2d444366c 100644
--- a/board/ea/mx7ulp_com/mx7ulp_com.c
+++ b/board/ea/mx7ulp_com/mx7ulp_com.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/mx7ulp-pins.h>
diff --git a/board/eets/pdu001/board.c b/board/eets/pdu001/board.c
index a602b623adb..f806d1e7672 100644
--- a/board/eets/pdu001/board.c
+++ b/board/eets/pdu001/board.c
@@ -18,6 +18,7 @@
 #include <i2c.h>
 #include <watchdog.h>
 #include <debug_uart.h>
+#include <asm/global_data.h>
 #include <dm/ofnode.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/board/egnite/ethernut5/ethernut5.c b/board/egnite/ethernut5/ethernut5.c
index 0674b300109..559fdd2f646 100644
--- a/board/egnite/ethernut5/ethernut5.c
+++ b/board/egnite/ethernut5/ethernut5.c
@@ -60,6 +60,7 @@
 #include <i2c.h>
 #include <mmc.h>
 #include <atmel_mci.h>
+#include <asm/global_data.h>
 
 #include <asm/arch/at91sam9260.h>
 #include <asm/arch/at91sam9260_matrix.h>
diff --git a/board/el/el6x/el6x.c b/board/el/el6x/el6x.c
index bdc0558eda2..ddac58f73d2 100644
--- a/board/el/el6x/el6x.c
+++ b/board/el/el6x/el6x.c
@@ -13,6 +13,7 @@
 #include <asm/arch/iomux.h>
 #include <asm/arch/mx6-pins.h>
 #include <env.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
diff --git a/board/elgin/elgin_rv1108/elgin_rv1108.c b/board/elgin/elgin_rv1108/elgin_rv1108.c
index 5d8f62244b0..e0057ce1e6e 100644
--- a/board/elgin/elgin_rv1108/elgin_rv1108.c
+++ b/board/elgin/elgin_rv1108/elgin_rv1108.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <init.h>
 #include <syscon.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch-rockchip/clock.h>
 #include <asm/arch-rockchip/grf_rv1108.h>
diff --git a/board/embest/mx6boards/mx6boards.c b/board/embest/mx6boards/mx6boards.c
index 752242bd54c..65b3942e399 100644
--- a/board/embest/mx6boards/mx6boards.c
+++ b/board/embest/mx6boards/mx6boards.c
@@ -20,6 +20,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/mx6-pins.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
diff --git a/board/engicam/common/board.c b/board/engicam/common/board.c
index 5a2003d5098..df9149e0d6d 100644
--- a/board/engicam/common/board.c
+++ b/board/engicam/common/board.c
@@ -16,6 +16,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
 #include <watchdog.h>
+#include <asm/global_data.h>
 
 #include "board.h"
 
diff --git a/board/esd/meesc/meesc.c b/board/esd/meesc/meesc.c
index deed3a9b84e..eaa525eb004 100644
--- a/board/esd/meesc/meesc.c
+++ b/board/esd/meesc/meesc.c
@@ -15,6 +15,7 @@
 #include <net.h>
 #include <serial.h>
 #include <vsprintf.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
 #include <asm/mach-types.h>
diff --git a/board/esd/vme8349/vme8349.c b/board/esd/vme8349/vme8349.c
index 8d3d26e3c70..d388fc6d490 100644
--- a/board/esd/vme8349/vme8349.c
+++ b/board/esd/vme8349/vme8349.c
@@ -17,6 +17,7 @@
 #include <ioports.h>
 #include <mpc83xx.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <asm/mpc8349_pci.h>
 #if defined(CONFIG_OF_LIBFDT)
 #include <linux/libfdt.h>
diff --git a/board/firefly/firefly-rk3288/firefly-rk3288.c b/board/firefly/firefly-rk3288/firefly-rk3288.c
index 1965985a0f4..410a3f9d9e3 100644
--- a/board/firefly/firefly-rk3288/firefly-rk3288.c
+++ b/board/firefly/firefly-rk3288/firefly-rk3288.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <hang.h>
 #include <log.h>
+#include <asm/global_data.h>
 
 #ifdef CONFIG_SPL_BUILD
 static int setup_led(void)
diff --git a/board/freescale/common/arm_sleep.c b/board/freescale/common/arm_sleep.c
index bb1ef997927..733940860f5 100644
--- a/board/freescale/common/arm_sleep.c
+++ b/board/freescale/common/arm_sleep.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #ifndef CONFIG_ARMV7_NONSEC
 #error " Deep sleep needs non-secure mode support. "
diff --git a/board/freescale/common/emc2305.c b/board/freescale/common/emc2305.c
index b1ca051db23..07b2ec06bbc 100644
--- a/board/freescale/common/emc2305.c
+++ b/board/freescale/common/emc2305.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <command.h>
 #include <i2c.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 
 #include "emc2305.h"
diff --git a/board/freescale/common/mpc85xx_sleep.c b/board/freescale/common/mpc85xx_sleep.c
index 6f6f4d40fcb..d2bb173c183 100644
--- a/board/freescale/common/mpc85xx_sleep.c
+++ b/board/freescale/common/mpc85xx_sleep.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/immap_85xx.h>
 #include "sleep.h"
 #ifdef CONFIG_U_QE
diff --git a/board/freescale/corenet_ds/corenet_ds.c b/board/freescale/corenet_ds/corenet_ds.c
index 15d11ed81ab..3a83e65f2fe 100644
--- a/board/freescale/corenet_ds/corenet_ds.c
+++ b/board/freescale/corenet_ds/corenet_ds.c
@@ -10,6 +10,7 @@
 #include <image.h>
 #include <init.h>
 #include <netdev.h>
+#include <asm/global_data.h>
 #include <linux/compiler.h>
 #include <asm/mmu.h>
 #include <asm/processor.h>
diff --git a/board/freescale/corenet_ds/ddr.c b/board/freescale/corenet_ds/ddr.c
index 19f6e8700d5..2c440673e7c 100644
--- a/board/freescale/corenet_ds/ddr.c
+++ b/board/freescale/corenet_ds/ddr.c
@@ -9,6 +9,7 @@
 #include <init.h>
 #include <log.h>
 #include <vsprintf.h>
+#include <asm/global_data.h>
 #include <asm/mmu.h>
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
diff --git a/board/freescale/imx8mm_evk/imx8mm_evk.c b/board/freescale/imx8mm_evk/imx8mm_evk.c
index 6af71006966..ab55135a972 100644
--- a/board/freescale/imx8mm_evk/imx8mm_evk.c
+++ b/board/freescale/imx8mm_evk/imx8mm_evk.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <miiphy.h>
 #include <netdev.h>
+#include <asm/global_data.h>
 
 #include <asm/arch/clock.h>
 #include <asm/arch/sys_proto.h>
diff --git a/board/freescale/imx8mm_evk/spl.c b/board/freescale/imx8mm_evk/spl.c
index 19c8a5aa235..64bc60651d3 100644
--- a/board/freescale/imx8mm_evk/spl.c
+++ b/board/freescale/imx8mm_evk/spl.c
@@ -11,6 +11,7 @@
 #include <init.h>
 #include <log.h>
 #include <spl.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/arch/clock.h>
diff --git a/board/freescale/imx8mn_evk/imx8mn_evk.c b/board/freescale/imx8mn_evk/imx8mn_evk.c
index e5ca54f9ae7..9a0a0488bf4 100644
--- a/board/freescale/imx8mn_evk/imx8mn_evk.c
+++ b/board/freescale/imx8mn_evk/imx8mn_evk.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <env.h>
 #include <init.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/imx8mn_evk/spl.c b/board/freescale/imx8mn_evk/spl.c
index dd38c1015cf..6d5c7a5b467 100644
--- a/board/freescale/imx8mn_evk/spl.c
+++ b/board/freescale/imx8mn_evk/spl.c
@@ -12,6 +12,7 @@
 #include <init.h>
 #include <log.h>
 #include <spl.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/arch/clock.h>
diff --git a/board/freescale/imx8mp_evk/imx8mp_evk.c b/board/freescale/imx8mp_evk/imx8mp_evk.c
index 034a349236e..56da4d4c6a3 100644
--- a/board/freescale/imx8mp_evk/imx8mp_evk.c
+++ b/board/freescale/imx8mp_evk/imx8mp_evk.c
@@ -7,6 +7,7 @@
 #include <env.h>
 #include <errno.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm-generic/gpio.h>
 #include <asm/arch/imx8mp_pins.h>
diff --git a/board/freescale/imx8mp_evk/spl.c b/board/freescale/imx8mp_evk/spl.c
index 3214718e62b..ebfd94dc1fa 100644
--- a/board/freescale/imx8mp_evk/spl.c
+++ b/board/freescale/imx8mp_evk/spl.c
@@ -12,6 +12,7 @@
 #include <init.h>
 #include <log.h>
 #include <spl.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <errno.h>
 #include <asm/io.h>
diff --git a/board/freescale/imx8mq_evk/imx8mq_evk.c b/board/freescale/imx8mq_evk/imx8mq_evk.c
index 1ad670b8ccf..93da67d7798 100644
--- a/board/freescale/imx8mq_evk/imx8mq_evk.c
+++ b/board/freescale/imx8mq_evk/imx8mq_evk.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <malloc.h>
 #include <errno.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <miiphy.h>
 #include <netdev.h>
diff --git a/board/freescale/imx8mq_evk/spl.c b/board/freescale/imx8mq_evk/spl.c
index 42183ed5aa0..82753585f2f 100644
--- a/board/freescale/imx8mq_evk/spl.c
+++ b/board/freescale/imx8mq_evk/spl.c
@@ -10,6 +10,7 @@
 #include <image.h>
 #include <init.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <errno.h>
 #include <asm/io.h>
diff --git a/board/freescale/imx8qm_mek/imx8qm_mek.c b/board/freescale/imx8qm_mek/imx8qm_mek.c
index fba3baa1267..c6772206244 100644
--- a/board/freescale/imx8qm_mek/imx8qm_mek.c
+++ b/board/freescale/imx8qm_mek/imx8qm_mek.c
@@ -8,6 +8,7 @@
 #include <env.h>
 #include <errno.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <asm/io.h>
diff --git a/board/freescale/imx8qm_mek/spl.c b/board/freescale/imx8qm_mek/spl.c
index 9dee12a2c6a..944ba745c09 100644
--- a/board/freescale/imx8qm_mek/spl.c
+++ b/board/freescale/imx8qm_mek/spl.c
@@ -10,6 +10,7 @@
 #include <init.h>
 #include <log.h>
 #include <spl.h>
+#include <asm/global_data.h>
 #include <dm/uclass.h>
 #include <dm/device.h>
 #include <dm/uclass-internal.h>
diff --git a/board/freescale/imx8qxp_mek/imx8qxp_mek.c b/board/freescale/imx8qxp_mek/imx8qxp_mek.c
index da55933e21b..7179823a223 100644
--- a/board/freescale/imx8qxp_mek/imx8qxp_mek.c
+++ b/board/freescale/imx8qxp_mek/imx8qxp_mek.c
@@ -8,6 +8,7 @@
 #include <env.h>
 #include <errno.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 #include <fsl_esdhc_imx.h>
diff --git a/board/freescale/imx8qxp_mek/spl.c b/board/freescale/imx8qxp_mek/spl.c
index 881d297cf17..ae6b64ff6ea 100644
--- a/board/freescale/imx8qxp_mek/spl.c
+++ b/board/freescale/imx8qxp_mek/spl.c
@@ -10,6 +10,7 @@
 #include <init.h>
 #include <log.h>
 #include <spl.h>
+#include <asm/global_data.h>
 #include <dm/uclass.h>
 #include <dm/device.h>
 #include <dm/uclass-internal.h>
diff --git a/board/freescale/imxrt1020-evk/imxrt1020-evk.c b/board/freescale/imxrt1020-evk/imxrt1020-evk.c
index 0cef6071feb..35241acd224 100644
--- a/board/freescale/imxrt1020-evk/imxrt1020-evk.c
+++ b/board/freescale/imxrt1020-evk/imxrt1020-evk.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <ram.h>
 #include <spl.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/armv7m.h>
 
diff --git a/board/freescale/imxrt1050-evk/imxrt1050-evk.c b/board/freescale/imxrt1050-evk/imxrt1050-evk.c
index edc7fb176bb..b8d852f097b 100644
--- a/board/freescale/imxrt1050-evk/imxrt1050-evk.c
+++ b/board/freescale/imxrt1050-evk/imxrt1050-evk.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <ram.h>
 #include <spl.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/armv7m.h>
 
diff --git a/board/freescale/ls1012afrdm/ls1012afrdm.c b/board/freescale/ls1012afrdm/ls1012afrdm.c
index 4770eadabd7..2cd651b943f 100644
--- a/board/freescale/ls1012afrdm/ls1012afrdm.c
+++ b/board/freescale/ls1012afrdm/ls1012afrdm.c
@@ -8,6 +8,7 @@
 #include <i2c.h>
 #include <asm/cache.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/fsl_serdes.h>
diff --git a/board/freescale/ls1012aqds/ls1012aqds.c b/board/freescale/ls1012aqds/ls1012aqds.c
index 7bea45c8ae5..b77808ea57b 100644
--- a/board/freescale/ls1012aqds/ls1012aqds.c
+++ b/board/freescale/ls1012aqds/ls1012aqds.c
@@ -8,6 +8,7 @@
 #include <fdt_support.h>
 #include <asm/cache.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/fsl_serdes.h>
diff --git a/board/freescale/ls1012ardb/ls1012ardb.c b/board/freescale/ls1012ardb/ls1012ardb.c
index 30b43ea135a..ed6dc9ff712 100644
--- a/board/freescale/ls1012ardb/ls1012ardb.c
+++ b/board/freescale/ls1012ardb/ls1012ardb.c
@@ -10,6 +10,7 @@
 #include <i2c.h>
 #include <asm/cache.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/fsl_serdes.h>
diff --git a/board/freescale/ls1021aiot/dcu.c b/board/freescale/ls1021aiot/dcu.c
index 77732a6ab15..e4fbcbcaad3 100644
--- a/board/freescale/ls1021aiot/dcu.c
+++ b/board/freescale/ls1021aiot/dcu.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <fsl_dcu_fb.h>
+#include <asm/global_data.h>
 #include "div64.h"
 #include "../common/dcu_sii9022a.h"
 
diff --git a/board/freescale/ls1021aiot/ls1021aiot.c b/board/freescale/ls1021aiot/ls1021aiot.c
index 2e5cc590666..bfe61376042 100644
--- a/board/freescale/ls1021aiot/ls1021aiot.c
+++ b/board/freescale/ls1021aiot/ls1021aiot.c
@@ -12,6 +12,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/fsl_serdes.h>
 #include <asm/arch/ls102xa_stream_id.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 
 #include <asm/arch/ls102xa_devdis.h>
diff --git a/board/freescale/ls1021aqds/dcu.c b/board/freescale/ls1021aqds/dcu.c
index b648a7872bc..f66961ca590 100644
--- a/board/freescale/ls1021aqds/dcu.c
+++ b/board/freescale/ls1021aqds/dcu.c
@@ -6,6 +6,7 @@
  * FSL DCU Framebuffer driver
  */
 
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <common.h>
 #include <fsl_dcu_fb.h>
diff --git a/board/freescale/ls1021aqds/ddr.c b/board/freescale/ls1021aqds/ddr.c
index f84bce95a84..66fe1519cc6 100644
--- a/board/freescale/ls1021aqds/ddr.c
+++ b/board/freescale/ls1021aqds/ddr.c
@@ -8,6 +8,7 @@
 #include <fsl_ddr_dimm_params.h>
 #include <init.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <linux/delay.h>
diff --git a/board/freescale/ls1021atsn/ls1021atsn.c b/board/freescale/ls1021atsn/ls1021atsn.c
index 878306b2d0f..c1acd3040c4 100644
--- a/board/freescale/ls1021atsn/ls1021atsn.c
+++ b/board/freescale/ls1021atsn/ls1021atsn.c
@@ -11,6 +11,7 @@
 #include <asm/arch/immap_ls102xa.h>
 #include <asm/arch/ls102xa_soc.h>
 #include <asm/arch/fsl_serdes.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 #include "../common/sleep.h"
 #include <fsl_validate.h>
diff --git a/board/freescale/ls1021atwr/dcu.c b/board/freescale/ls1021atwr/dcu.c
index bdf7f7645c2..7bf283e3d66 100644
--- a/board/freescale/ls1021atwr/dcu.c
+++ b/board/freescale/ls1021atwr/dcu.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <fsl_dcu_fb.h>
+#include <asm/global_data.h>
 #include "div64.h"
 #include "../common/dcu_sii9022a.h"
 
diff --git a/board/freescale/ls1021atwr/ls1021atwr.c b/board/freescale/ls1021atwr/ls1021atwr.c
index 2889bd8dedd..0cd38a14b83 100644
--- a/board/freescale/ls1021atwr/ls1021atwr.c
+++ b/board/freescale/ls1021atwr/ls1021atwr.c
@@ -11,6 +11,7 @@
 #include <i2c.h>
 #include <init.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/immap_ls102xa.h>
 #include <asm/arch/clock.h>
diff --git a/board/freescale/ls1028a/ddr.c b/board/freescale/ls1028a/ddr.c
index 74d3af5c359..3e976da6b30 100644
--- a/board/freescale/ls1028a/ddr.c
+++ b/board/freescale/ls1028a/ddr.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/ls1028a/ls1028a.c b/board/freescale/ls1028a/ls1028a.c
index e37e3a3c16d..f3c1d958b72 100644
--- a/board/freescale/ls1028a/ls1028a.c
+++ b/board/freescale/ls1028a/ls1028a.c
@@ -9,6 +9,7 @@
 #include <errno.h>
 #include <fsl_ddr.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <hwconfig.h>
 #include <fdt_support.h>
diff --git a/board/freescale/ls1043aqds/ddr.c b/board/freescale/ls1043aqds/ddr.c
index c0fc9aadf04..23947bdb84c 100644
--- a/board/freescale/ls1043aqds/ddr.c
+++ b/board/freescale/ls1043aqds/ddr.c
@@ -11,6 +11,7 @@
 #endif
 #include <log.h>
 #include <asm/arch/clock.h>
+#include <asm/global_data.h>
 #include "ddr.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/ls1043aqds/ls1043aqds.c b/board/freescale/ls1043aqds/ls1043aqds.c
index ef0f2e61224..44e4c61eab2 100644
--- a/board/freescale/ls1043aqds/ls1043aqds.c
+++ b/board/freescale/ls1043aqds/ls1043aqds.c
@@ -10,6 +10,7 @@
 #include <fsl_ddr_sdram.h>
 #include <init.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/fsl_serdes.h>
diff --git a/board/freescale/ls1043ardb/ddr.c b/board/freescale/ls1043ardb/ddr.c
index f16e036d0e8..08b43ff5e4c 100644
--- a/board/freescale/ls1043ardb/ddr.c
+++ b/board/freescale/ls1043ardb/ddr.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
+#include <asm/global_data.h>
 #include "ddr.h"
 #include <log.h>
 #include <vsprintf.h>
diff --git a/board/freescale/ls1043ardb/ls1043ardb.c b/board/freescale/ls1043ardb/ls1043ardb.c
index dc32c030eca..beef26b084b 100644
--- a/board/freescale/ls1043ardb/ls1043ardb.c
+++ b/board/freescale/ls1043ardb/ls1043ardb.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <i2c.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/fsl_serdes.h>
diff --git a/board/freescale/ls1046afrwy/ddr.c b/board/freescale/ls1046afrwy/ddr.c
index daf17e01693..256397b52b6 100644
--- a/board/freescale/ls1046afrwy/ddr.c
+++ b/board/freescale/ls1046afrwy/ddr.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <fsl_ddr_sdram.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/ls1046afrwy/ls1046afrwy.c b/board/freescale/ls1046afrwy/ls1046afrwy.c
index 4ebf77b1ad1..9813a36ca07 100644
--- a/board/freescale/ls1046afrwy/ls1046afrwy.c
+++ b/board/freescale/ls1046afrwy/ls1046afrwy.c
@@ -7,6 +7,7 @@
 #include <i2c.h>
 #include <fdt_support.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/fsl_serdes.h>
diff --git a/board/freescale/ls1046aqds/ddr.c b/board/freescale/ls1046aqds/ddr.c
index f3cfbc4c39b..9a96de27178 100644
--- a/board/freescale/ls1046aqds/ddr.c
+++ b/board/freescale/ls1046aqds/ddr.c
@@ -11,6 +11,7 @@
 #endif
 #include <log.h>
 #include <asm/arch/clock.h>
+#include <asm/global_data.h>
 #include "ddr.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/ls1046aqds/ls1046aqds.c b/board/freescale/ls1046aqds/ls1046aqds.c
index 33b10277af7..3c96c900c32 100644
--- a/board/freescale/ls1046aqds/ls1046aqds.c
+++ b/board/freescale/ls1046aqds/ls1046aqds.c
@@ -9,6 +9,7 @@
 #include <fdt_support.h>
 #include <fsl_ddr_sdram.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/fsl_serdes.h>
diff --git a/board/freescale/ls1046ardb/ddr.c b/board/freescale/ls1046ardb/ddr.c
index 0e07df52119..befb556bd30 100644
--- a/board/freescale/ls1046ardb/ddr.c
+++ b/board/freescale/ls1046ardb/ddr.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
+#include <asm/global_data.h>
 #include "ddr.h"
 #ifdef CONFIG_FSL_DEEP_SLEEP
 #include <fsl_sleep.h>
diff --git a/board/freescale/ls1046ardb/ls1046ardb.c b/board/freescale/ls1046ardb/ls1046ardb.c
index e107c8471b3..93ef903f299 100644
--- a/board/freescale/ls1046ardb/ls1046ardb.c
+++ b/board/freescale/ls1046ardb/ls1046ardb.c
@@ -7,6 +7,7 @@
 #include <i2c.h>
 #include <fdt_support.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/fsl_serdes.h>
diff --git a/board/freescale/ls1088a/ddr.c b/board/freescale/ls1088a/ddr.c
index fd9549bfbc8..995c4296017 100644
--- a/board/freescale/ls1088a/ddr.c
+++ b/board/freescale/ls1088a/ddr.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <asm/arch/soc.h>
 #include <asm/arch/clock.h>
+#include <asm/global_data.h>
 #include "ddr.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/ls1088a/ls1088a.c b/board/freescale/ls1088a/ls1088a.c
index 5d19702a05c..2ba6a3990d9 100644
--- a/board/freescale/ls1088a/ls1088a.c
+++ b/board/freescale/ls1088a/ls1088a.c
@@ -13,6 +13,7 @@
 #include <fsl_ifc.h>
 #include <fsl_ddr.h>
 #include <fsl_sec.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <fdt_support.h>
 #include <linux/delay.h>
diff --git a/board/freescale/ls2080a/ddr.c b/board/freescale/ls2080a/ddr.c
index 229fc9cc30e..29d7bd1c5ee 100644
--- a/board/freescale/ls2080a/ddr.c
+++ b/board/freescale/ls2080a/ddr.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <asm/arch/soc.h>
 #include <asm/arch/clock.h>
+#include <asm/global_data.h>
 #include "ddr.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/ls2080a/ls2080a.c b/board/freescale/ls2080a/ls2080a.c
index 62da2a7af11..48437a52e40 100644
--- a/board/freescale/ls2080a/ls2080a.c
+++ b/board/freescale/ls2080a/ls2080a.c
@@ -10,6 +10,7 @@
 #include <netdev.h>
 #include <fsl_ifc.h>
 #include <fsl_ddr.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <fdt_support.h>
 #include <linux/libfdt.h>
diff --git a/board/freescale/ls2080aqds/ddr.c b/board/freescale/ls2080aqds/ddr.c
index 3fb2c4448c2..2767d058cc9 100644
--- a/board/freescale/ls2080aqds/ddr.c
+++ b/board/freescale/ls2080aqds/ddr.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <asm/arch/soc.h>
 #include <asm/arch/clock.h>
+#include <asm/global_data.h>
 #include "ddr.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/ls2080aqds/ls2080aqds.c b/board/freescale/ls2080aqds/ls2080aqds.c
index 3eb40f5e2a2..a6f6897eb09 100644
--- a/board/freescale/ls2080aqds/ls2080aqds.c
+++ b/board/freescale/ls2080aqds/ls2080aqds.c
@@ -10,6 +10,7 @@
 #include <netdev.h>
 #include <fsl_ifc.h>
 #include <fsl_ddr.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <fdt_support.h>
 #include <linux/libfdt.h>
diff --git a/board/freescale/ls2080ardb/ddr.c b/board/freescale/ls2080ardb/ddr.c
index 4571a228c59..07fa8473332 100644
--- a/board/freescale/ls2080ardb/ddr.c
+++ b/board/freescale/ls2080ardb/ddr.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <asm/arch/soc.h>
 #include <asm/arch/clock.h>
+#include <asm/global_data.h>
 #include "ddr.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/ls2080ardb/eth_ls2080rdb.c b/board/freescale/ls2080ardb/eth_ls2080rdb.c
index 018d1dc6720..21b4c16ff27 100644
--- a/board/freescale/ls2080ardb/eth_ls2080rdb.c
+++ b/board/freescale/ls2080ardb/eth_ls2080rdb.c
@@ -13,6 +13,7 @@
 #include <miiphy.h>
 #include <phy.h>
 #include <fm_eth.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <exports.h>
 #include <asm/arch/fsl_serdes.h>
diff --git a/board/freescale/ls2080ardb/ls2080ardb.c b/board/freescale/ls2080ardb/ls2080ardb.c
index c7e9c1dacf4..26ce5a80edf 100644
--- a/board/freescale/ls2080ardb/ls2080ardb.c
+++ b/board/freescale/ls2080ardb/ls2080ardb.c
@@ -11,6 +11,7 @@
 #include <netdev.h>
 #include <fsl_ifc.h>
 #include <fsl_ddr.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <hwconfig.h>
 #include <fdt_support.h>
diff --git a/board/freescale/lx2160a/ddr.c b/board/freescale/lx2160a/ddr.c
index cd422bf2bc5..7ab7a9e6ca8 100644
--- a/board/freescale/lx2160a/ddr.c
+++ b/board/freescale/lx2160a/ddr.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/lx2160a/eth_lx2160aqds.c b/board/freescale/lx2160a/eth_lx2160aqds.c
index fcace029360..437f0bc4cf6 100644
--- a/board/freescale/lx2160a/eth_lx2160aqds.c
+++ b/board/freescale/lx2160a/eth_lx2160aqds.c
@@ -17,6 +17,7 @@
 #include <miiphy.h>
 #include <phy.h>
 #include <fm_eth.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <exports.h>
 #include <asm/arch/fsl_serdes.h>
diff --git a/board/freescale/lx2160a/eth_lx2160ardb.c b/board/freescale/lx2160a/eth_lx2160ardb.c
index b448883ee14..02f36f4f5f5 100644
--- a/board/freescale/lx2160a/eth_lx2160ardb.c
+++ b/board/freescale/lx2160a/eth_lx2160ardb.c
@@ -14,6 +14,7 @@
 #include <miiphy.h>
 #include <phy.h>
 #include <fm_eth.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <exports.h>
 #include <asm/arch/fsl_serdes.h>
diff --git a/board/freescale/lx2160a/lx2160a.c b/board/freescale/lx2160a/lx2160a.c
index ace2a1927df..efd2a5c40e1 100644
--- a/board/freescale/lx2160a/lx2160a.c
+++ b/board/freescale/lx2160a/lx2160a.c
@@ -7,6 +7,7 @@
 #include <clock_legacy.h>
 #include <dm.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <dm/platform_data/serial_pl01x.h>
 #include <i2c.h>
 #include <malloc.h>
diff --git a/board/freescale/m5208evbe/m5208evbe.c b/board/freescale/m5208evbe/m5208evbe.c
index a950030eb39..7bfb4557dd5 100644
--- a/board/freescale/m5208evbe/m5208evbe.c
+++ b/board/freescale/m5208evbe/m5208evbe.c
@@ -10,6 +10,7 @@
 #include <config.h>
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/immap.h>
 #include <asm/io.h>
 #include <linux/delay.h>
diff --git a/board/freescale/m52277evb/m52277evb.c b/board/freescale/m52277evb/m52277evb.c
index 144e490479e..510af33e4c3 100644
--- a/board/freescale/m52277evb/m52277evb.c
+++ b/board/freescale/m52277evb/m52277evb.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/immap.h>
 #include <asm/io.h>
 #include <linux/delay.h>
diff --git a/board/freescale/m5235evb/m5235evb.c b/board/freescale/m5235evb/m5235evb.c
index 5d403937553..e7c7a94036b 100644
--- a/board/freescale/m5235evb/m5235evb.c
+++ b/board/freescale/m5235evb/m5235evb.c
@@ -10,6 +10,7 @@
 #include <config.h>
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/immap.h>
 #include <asm/io.h>
 
diff --git a/board/freescale/m5249evb/m5249evb.c b/board/freescale/m5249evb/m5249evb.c
index a89d5100586..48c00791114 100644
--- a/board/freescale/m5249evb/m5249evb.c
+++ b/board/freescale/m5249evb/m5249evb.c
@@ -8,6 +8,7 @@
 #include <command.h>
 #include <init.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <asm/immap.h>
 #include <linux/delay.h>
 
diff --git a/board/freescale/m5253demo/m5253demo.c b/board/freescale/m5253demo/m5253demo.c
index 9a157db6014..2a4703579da 100644
--- a/board/freescale/m5253demo/m5253demo.c
+++ b/board/freescale/m5253demo/m5253demo.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <init.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <asm/immap.h>
 #include <netdev.h>
 #include <asm/io.h>
diff --git a/board/freescale/m5272c3/m5272c3.c b/board/freescale/m5272c3/m5272c3.c
index 1017ef0c2a5..9580cf2a039 100644
--- a/board/freescale/m5272c3/m5272c3.c
+++ b/board/freescale/m5272c3/m5272c3.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/immap.h>
 #include <asm/io.h>
 
diff --git a/board/freescale/m5275evb/m5275evb.c b/board/freescale/m5275evb/m5275evb.c
index e65e6d0af58..1c4fb7232af 100644
--- a/board/freescale/m5275evb/m5275evb.c
+++ b/board/freescale/m5275evb/m5275evb.c
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/immap.h>
 #include <asm/io.h>
 
diff --git a/board/freescale/m5282evb/m5282evb.c b/board/freescale/m5282evb/m5282evb.c
index 251be667d46..e1ea9b3a58f 100644
--- a/board/freescale/m5282evb/m5282evb.c
+++ b/board/freescale/m5282evb/m5282evb.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/immap.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/m53017evb/m53017evb.c b/board/freescale/m53017evb/m53017evb.c
index f13b6931ea2..c9f89353ce4 100644
--- a/board/freescale/m53017evb/m53017evb.c
+++ b/board/freescale/m53017evb/m53017evb.c
@@ -10,6 +10,7 @@
 #include <config.h>
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/immap.h>
 #include <asm/io.h>
 #include <linux/delay.h>
diff --git a/board/freescale/m5329evb/m5329evb.c b/board/freescale/m5329evb/m5329evb.c
index 531894f6516..7a75b04dd0d 100644
--- a/board/freescale/m5329evb/m5329evb.c
+++ b/board/freescale/m5329evb/m5329evb.c
@@ -10,6 +10,7 @@
 #include <config.h>
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/immap.h>
 #include <asm/io.h>
 #include <linux/delay.h>
diff --git a/board/freescale/m5373evb/m5373evb.c b/board/freescale/m5373evb/m5373evb.c
index 29ff55f1596..cfa5ca4a477 100644
--- a/board/freescale/m5373evb/m5373evb.c
+++ b/board/freescale/m5373evb/m5373evb.c
@@ -10,6 +10,7 @@
 #include <config.h>
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/immap.h>
 #include <asm/io.h>
 #include <linux/delay.h>
diff --git a/board/freescale/m54418twr/m54418twr.c b/board/freescale/m54418twr/m54418twr.c
index a418fba1401..ca8993197e3 100644
--- a/board/freescale/m54418twr/m54418twr.c
+++ b/board/freescale/m54418twr/m54418twr.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <init.h>
 #include <spi.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/immap.h>
 #include <mmc.h>
diff --git a/board/freescale/m54451evb/m54451evb.c b/board/freescale/m54451evb/m54451evb.c
index 1298bd324e9..a4ddc69166b 100644
--- a/board/freescale/m54451evb/m54451evb.c
+++ b/board/freescale/m54451evb/m54451evb.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <init.h>
 #include <spi.h>
+#include <asm/global_data.h>
 #include <asm/immap.h>
 #include <asm/io.h>
 #include <linux/delay.h>
diff --git a/board/freescale/m54455evb/m54455evb.c b/board/freescale/m54455evb/m54455evb.c
index 286300645b4..c749ee407e7 100644
--- a/board/freescale/m54455evb/m54455evb.c
+++ b/board/freescale/m54455evb/m54455evb.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <init.h>
 #include <pci.h>
+#include <asm/global_data.h>
 #include <asm/immap.h>
 #include <asm/io.h>
 #include <linux/delay.h>
diff --git a/board/freescale/m547xevb/m547xevb.c b/board/freescale/m547xevb/m547xevb.c
index 908a500f4b9..1568f455e92 100644
--- a/board/freescale/m547xevb/m547xevb.c
+++ b/board/freescale/m547xevb/m547xevb.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <init.h>
 #include <pci.h>
+#include <asm/global_data.h>
 #include <asm/immap.h>
 #include <asm/io.h>
 #include <linux/delay.h>
diff --git a/board/freescale/m548xevb/m548xevb.c b/board/freescale/m548xevb/m548xevb.c
index 796b808e6f9..b62355a7ae7 100644
--- a/board/freescale/m548xevb/m548xevb.c
+++ b/board/freescale/m548xevb/m548xevb.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <init.h>
 #include <pci.h>
+#include <asm/global_data.h>
 #include <asm/immap.h>
 #include <asm/io.h>
 #include <linux/delay.h>
diff --git a/board/freescale/mpc8308rdb/sdram.c b/board/freescale/mpc8308rdb/sdram.c
index 6e0922cd53c..6340fd16ea9 100644
--- a/board/freescale/mpc8308rdb/sdram.c
+++ b/board/freescale/mpc8308rdb/sdram.c
@@ -14,6 +14,7 @@
 #include <common.h>
 #include <init.h>
 #include <mpc83xx.h>
+#include <asm/global_data.h>
 
 #include <asm/bitops.h>
 #include <asm/io.h>
diff --git a/board/freescale/mpc8313erdb/mpc8313erdb.c b/board/freescale/mpc8313erdb/mpc8313erdb.c
index 65a10c345ae..f309961dca8 100644
--- a/board/freescale/mpc8313erdb/mpc8313erdb.c
+++ b/board/freescale/mpc8313erdb/mpc8313erdb.c
@@ -20,6 +20,7 @@
 #if defined(CONFIG_MPC83XX_GPIO) && !defined(CONFIG_SPL_BUILD)
 #include <asm/gpio.h>
 #endif
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/mpc8313erdb/sdram.c b/board/freescale/mpc8313erdb/sdram.c
index 99f6bcd5a93..f146ae5d43c 100644
--- a/board/freescale/mpc8313erdb/sdram.c
+++ b/board/freescale/mpc8313erdb/sdram.c
@@ -11,6 +11,7 @@
 #include <init.h>
 #include <mpc83xx.h>
 #include <spd_sdram.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 
 #include <asm/bitops.h>
diff --git a/board/freescale/mpc8315erdb/mpc8315erdb.c b/board/freescale/mpc8315erdb/mpc8315erdb.c
index f8e4599f13f..795162b3c0c 100644
--- a/board/freescale/mpc8315erdb/mpc8315erdb.c
+++ b/board/freescale/mpc8315erdb/mpc8315erdb.c
@@ -11,6 +11,7 @@
 #include <i2c.h>
 #include <init.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
diff --git a/board/freescale/mpc8315erdb/sdram.c b/board/freescale/mpc8315erdb/sdram.c
index 8a828207f93..ffbb79aaec1 100644
--- a/board/freescale/mpc8315erdb/sdram.c
+++ b/board/freescale/mpc8315erdb/sdram.c
@@ -11,6 +11,7 @@
 #include <init.h>
 #include <mpc83xx.h>
 #include <spd_sdram.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 
 #include <asm/bitops.h>
diff --git a/board/freescale/mpc8323erdb/mpc8323erdb.c b/board/freescale/mpc8323erdb/mpc8323erdb.c
index 3cde715e96b..cef3216a6fe 100644
--- a/board/freescale/mpc8323erdb/mpc8323erdb.c
+++ b/board/freescale/mpc8323erdb/mpc8323erdb.c
@@ -19,6 +19,7 @@
 #include <i2c.h>
 #include <miiphy.h>
 #include <command.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 #include <u-boot/crc.h>
diff --git a/board/freescale/mpc832xemds/mpc832xemds.c b/board/freescale/mpc832xemds/mpc832xemds.c
index 6139cbd0409..f34758a9470 100644
--- a/board/freescale/mpc832xemds/mpc832xemds.c
+++ b/board/freescale/mpc832xemds/mpc832xemds.c
@@ -16,6 +16,7 @@
 #if defined(CONFIG_PCI)
 #include <pci.h>
 #endif
+#include <asm/global_data.h>
 #include <asm/mmu.h>
 #if defined(CONFIG_OF_LIBFDT)
 #include <linux/libfdt.h>
diff --git a/board/freescale/mpc8349emds/mpc8349emds.c b/board/freescale/mpc8349emds/mpc8349emds.c
index 46be5ccd92c..5f38639afd4 100644
--- a/board/freescale/mpc8349emds/mpc8349emds.c
+++ b/board/freescale/mpc8349emds/mpc8349emds.c
@@ -10,6 +10,7 @@
 #include <ioports.h>
 #include <mpc83xx.h>
 #include <asm/bitops.h>
+#include <asm/global_data.h>
 #include <asm/mpc8349_pci.h>
 #include <i2c.h>
 #include <spi.h>
diff --git a/board/freescale/mpc8349itx/mpc8349itx.c b/board/freescale/mpc8349itx/mpc8349itx.c
index a265a8380fe..5b4c290df14 100644
--- a/board/freescale/mpc8349itx/mpc8349itx.c
+++ b/board/freescale/mpc8349itx/mpc8349itx.c
@@ -18,6 +18,7 @@
 #endif
 #include <spd_sdram.h>
 #include <asm/bitops.h>
+#include <asm/global_data.h>
 #include <asm/mmu.h>
 #if defined(CONFIG_OF_LIBFDT)
 #include <linux/libfdt.h>
diff --git a/board/freescale/mpc837xemds/mpc837xemds.c b/board/freescale/mpc837xemds/mpc837xemds.c
index f515299bc9a..71875cf8f8e 100644
--- a/board/freescale/mpc837xemds/mpc837xemds.c
+++ b/board/freescale/mpc837xemds/mpc837xemds.c
@@ -10,6 +10,7 @@
 #include <init.h>
 #include <net.h>
 #include <asm/bitops.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/fsl_mpc83xx_serdes.h>
 #include <spd_sdram.h>
diff --git a/board/freescale/mpc837xerdb/mpc837xerdb.c b/board/freescale/mpc837xerdb/mpc837xerdb.c
index 39673ad076a..81d31f19c4c 100644
--- a/board/freescale/mpc837xerdb/mpc837xerdb.c
+++ b/board/freescale/mpc837xerdb/mpc837xerdb.c
@@ -11,6 +11,7 @@
 #include <i2c.h>
 #include <init.h>
 #include <asm/bitops.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/fsl_mpc83xx_serdes.h>
 #include <fdt_support.h>
diff --git a/board/freescale/mpc8610hpcd/mpc8610hpcd.c b/board/freescale/mpc8610hpcd/mpc8610hpcd.c
index 52bf4da98ea..74b0e45b4f8 100644
--- a/board/freescale/mpc8610hpcd/mpc8610hpcd.c
+++ b/board/freescale/mpc8610hpcd/mpc8610hpcd.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <net.h>
 #include <pci.h>
+#include <asm/global_data.h>
 #include <asm/processor.h>
 #include <asm/immap_86xx.h>
 #include <asm/fsl_pci.h>
diff --git a/board/freescale/mpc8641hpcn/mpc8641hpcn.c b/board/freescale/mpc8641hpcn/mpc8641hpcn.c
index 0f9aea469b1..b30b86364d5 100644
--- a/board/freescale/mpc8641hpcn/mpc8641hpcn.c
+++ b/board/freescale/mpc8641hpcn/mpc8641hpcn.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <net.h>
 #include <pci.h>
+#include <asm/global_data.h>
 #include <asm/processor.h>
 #include <asm/immap_86xx.h>
 #include <asm/fsl_pci.h>
diff --git a/board/freescale/mx23evk/mx23evk.c b/board/freescale/mx23evk/mx23evk.c
index 3fbac6b5cc3..605cdec218a 100644
--- a/board/freescale/mx23evk/mx23evk.c
+++ b/board/freescale/mx23evk/mx23evk.c
@@ -13,6 +13,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/clock.h>
diff --git a/board/freescale/mx25pdk/mx25pdk.c b/board/freescale/mx25pdk/mx25pdk.c
index 1cffdd93317..3b445a46dd7 100644
--- a/board/freescale/mx25pdk/mx25pdk.c
+++ b/board/freescale/mx25pdk/mx25pdk.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/freescale/mx28evk/mx28evk.c b/board/freescale/mx28evk/mx28evk.c
index a6b66d99ccb..21c9cb11283 100644
--- a/board/freescale/mx28evk/mx28evk.c
+++ b/board/freescale/mx28evk/mx28evk.c
@@ -14,6 +14,7 @@
 #include <common.h>
 #include <init.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/freescale/mx35pdk/mx35pdk.c b/board/freescale/mx35pdk/mx35pdk.c
index fc024c47dbd..4039d9f049a 100644
--- a/board/freescale/mx35pdk/mx35pdk.c
+++ b/board/freescale/mx35pdk/mx35pdk.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <init.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/board/freescale/mx51evk/mx51evk.c b/board/freescale/mx51evk/mx51evk.c
index 4250efddde7..ac48e7668c0 100644
--- a/board/freescale/mx51evk/mx51evk.c
+++ b/board/freescale/mx51evk/mx51evk.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/freescale/mx53ard/mx53ard.c b/board/freescale/mx53ard/mx53ard.c
index d265d3adaa6..f9ec5ca6ef3 100644
--- a/board/freescale/mx53ard/mx53ard.c
+++ b/board/freescale/mx53ard/mx53ard.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <init.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
diff --git a/board/freescale/mx53evk/mx53evk.c b/board/freescale/mx53evk/mx53evk.c
index ef6c6ec1ed6..b006638e2c1 100644
--- a/board/freescale/mx53evk/mx53evk.c
+++ b/board/freescale/mx53evk/mx53evk.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
diff --git a/board/freescale/mx53loco/mx53loco.c b/board/freescale/mx53loco/mx53loco.c
index 1da263bb5d5..ee54a61d874 100644
--- a/board/freescale/mx53loco/mx53loco.c
+++ b/board/freescale/mx53loco/mx53loco.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <init.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
diff --git a/board/freescale/mx53smd/mx53smd.c b/board/freescale/mx53smd/mx53smd.c
index 7c0f98a1321..2f91a0525c4 100644
--- a/board/freescale/mx53smd/mx53smd.c
+++ b/board/freescale/mx53smd/mx53smd.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
diff --git a/board/freescale/mx6memcal/mx6memcal.c b/board/freescale/mx6memcal/mx6memcal.c
index ea7a56369d6..1cc744fa9ba 100644
--- a/board/freescale/mx6memcal/mx6memcal.c
+++ b/board/freescale/mx6memcal/mx6memcal.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <init.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/mx6memcal/spl.c b/board/freescale/mx6memcal/spl.c
index c11eee51b61..c82b532f6d5 100644
--- a/board/freescale/mx6memcal/spl.c
+++ b/board/freescale/mx6memcal/spl.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/clock.h>
diff --git a/board/freescale/mx6qarm2/mx6qarm2.c b/board/freescale/mx6qarm2/mx6qarm2.c
index ddde245869a..c06fd643677 100644
--- a/board/freescale/mx6qarm2/mx6qarm2.c
+++ b/board/freescale/mx6qarm2/mx6qarm2.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <init.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/mx6-pins.h>
diff --git a/board/freescale/mx6sabreauto/mx6sabreauto.c b/board/freescale/mx6sabreauto/mx6sabreauto.c
index c031cf8538e..e92ef26d0ad 100644
--- a/board/freescale/mx6sabreauto/mx6sabreauto.c
+++ b/board/freescale/mx6sabreauto/mx6sabreauto.c
@@ -9,6 +9,7 @@
 #include <image.h>
 #include <init.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/freescale/mx6sabresd/mx6sabresd.c b/board/freescale/mx6sabresd/mx6sabresd.c
index 0d343da519f..bc28173668e 100644
--- a/board/freescale/mx6sabresd/mx6sabresd.c
+++ b/board/freescale/mx6sabresd/mx6sabresd.c
@@ -12,6 +12,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/mx6-pins.h>
+#include <asm/global_data.h>
 #include <asm/mach-imx/spi.h>
 #include <env.h>
 #include <linux/errno.h>
diff --git a/board/freescale/mx6slevk/mx6slevk.c b/board/freescale/mx6slevk/mx6slevk.c
index 5d2f815d234..2c90a35e2c9 100644
--- a/board/freescale/mx6slevk/mx6slevk.c
+++ b/board/freescale/mx6slevk/mx6slevk.c
@@ -14,6 +14,7 @@
 #include <asm/arch/mx6-ddr.h>
 #include <asm/arch/mx6-pins.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/mach-imx/mxc_i2c.h>
diff --git a/board/freescale/mx6sllevk/mx6sllevk.c b/board/freescale/mx6sllevk/mx6sllevk.c
index 0a36b46e9e8..b4fddafe640 100644
--- a/board/freescale/mx6sllevk/mx6sllevk.c
+++ b/board/freescale/mx6sllevk/mx6sllevk.c
@@ -10,6 +10,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/mx6-pins.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/mach-imx/boot_mode.h>
diff --git a/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c b/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c
index 1640f465bad..7340a344023 100644
--- a/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c
+++ b/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c
@@ -13,6 +13,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/mx6-pins.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/mach-imx/boot_mode.h>
diff --git a/board/freescale/mx6sxsabresd/mx6sxsabresd.c b/board/freescale/mx6sxsabresd/mx6sxsabresd.c
index 7fb8de177bc..57fab238641 100644
--- a/board/freescale/mx6sxsabresd/mx6sxsabresd.c
+++ b/board/freescale/mx6sxsabresd/mx6sxsabresd.c
@@ -13,6 +13,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/mx6-pins.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/io.h>
diff --git a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
index 9cb17594013..b916ea01029 100644
--- a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
+++ b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
@@ -12,6 +12,7 @@
 #include <asm/arch/mx6ul_pins.h>
 #include <asm/arch/mx6-pins.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/mach-imx/boot_mode.h>
diff --git a/board/freescale/mx6ullevk/mx6ullevk.c b/board/freescale/mx6ullevk/mx6ullevk.c
index 3f1ecce10f8..86c11c7bd3a 100644
--- a/board/freescale/mx6ullevk/mx6ullevk.c
+++ b/board/freescale/mx6ullevk/mx6ullevk.c
@@ -10,6 +10,7 @@
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/mx6-pins.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/mach-imx/boot_mode.h>
diff --git a/board/freescale/mx7dsabresd/mx7dsabresd.c b/board/freescale/mx7dsabresd/mx7dsabresd.c
index f12e9d4cfef..2777ae13bce 100644
--- a/board/freescale/mx7dsabresd/mx7dsabresd.c
+++ b/board/freescale/mx7dsabresd/mx7dsabresd.c
@@ -9,6 +9,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/mx7-pins.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/io.h>
diff --git a/board/freescale/mx7ulp_evk/mx7ulp_evk.c b/board/freescale/mx7ulp_evk/mx7ulp_evk.c
index fd21591ad6f..01e32136532 100644
--- a/board/freescale/mx7ulp_evk/mx7ulp_evk.c
+++ b/board/freescale/mx7ulp_evk/mx7ulp_evk.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <fdt_support.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/mx7ulp-pins.h>
diff --git a/board/freescale/p1010rdb/ddr.c b/board/freescale/p1010rdb/ddr.c
index 71f6259b60e..2625195f81b 100644
--- a/board/freescale/p1010rdb/ddr.c
+++ b/board/freescale/p1010rdb/ddr.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <vsprintf.h>
+#include <asm/global_data.h>
 #include <asm/mmu.h>
 #include <asm/immap_85xx.h>
 #include <asm/processor.h>
diff --git a/board/freescale/p1010rdb/p1010rdb.c b/board/freescale/p1010rdb/p1010rdb.c
index accf2f24e51..4f87f03965c 100644
--- a/board/freescale/p1010rdb/p1010rdb.c
+++ b/board/freescale/p1010rdb/p1010rdb.c
@@ -9,6 +9,7 @@
 #include <image.h>
 #include <init.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <asm/processor.h>
 #include <asm/mmu.h>
 #include <asm/cache.h>
diff --git a/board/freescale/p1010rdb/spl.c b/board/freescale/p1010rdb/spl.c
index 4ee4573d2b5..91be63c2cf4 100644
--- a/board/freescale/p1010rdb/spl.c
+++ b/board/freescale/p1010rdb/spl.c
@@ -15,6 +15,7 @@
 #include <i2c.h>
 #include <fsl_esdhc.h>
 #include <spi_flash.h>
+#include <asm/global_data.h>
 #include "../common/spl.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/p1023rdb/p1023rdb.c b/board/freescale/p1023rdb/p1023rdb.c
index b70ff6899a2..bb4a39a3fa6 100644
--- a/board/freescale/p1023rdb/p1023rdb.c
+++ b/board/freescale/p1023rdb/p1023rdb.c
@@ -13,6 +13,7 @@
 #include <init.h>
 #include <net.h>
 #include <pci.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/cache.h>
 #include <asm/processor.h>
diff --git a/board/freescale/p1_p2_rdb_pc/spl.c b/board/freescale/p1_p2_rdb_pc/spl.c
index e76c3e82c3a..101c748838e 100644
--- a/board/freescale/p1_p2_rdb_pc/spl.c
+++ b/board/freescale/p1_p2_rdb_pc/spl.c
@@ -16,6 +16,7 @@
 #include <i2c.h>
 #include <fsl_esdhc.h>
 #include <spi_flash.h>
+#include <asm/global_data.h>
 #include "../common/spl.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/p2041rdb/ddr.c b/board/freescale/p2041rdb/ddr.c
index 7a06c7af3dc..910058cefe1 100644
--- a/board/freescale/p2041rdb/ddr.c
+++ b/board/freescale/p2041rdb/ddr.c
@@ -8,6 +8,7 @@
 #include <hwconfig.h>
 #include <init.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/mmu.h>
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
diff --git a/board/freescale/p2041rdb/p2041rdb.c b/board/freescale/p2041rdb/p2041rdb.c
index 720d304fe42..4ece1e6ea0a 100644
--- a/board/freescale/p2041rdb/p2041rdb.c
+++ b/board/freescale/p2041rdb/p2041rdb.c
@@ -10,6 +10,7 @@
 #include <image.h>
 #include <init.h>
 #include <netdev.h>
+#include <asm/global_data.h>
 #include <linux/compiler.h>
 #include <asm/mmu.h>
 #include <asm/processor.h>
diff --git a/board/freescale/qemu-ppce500/qemu-ppce500.c b/board/freescale/qemu-ppce500/qemu-ppce500.c
index 3395377b4fe..aa5774fd797 100644
--- a/board/freescale/qemu-ppce500/qemu-ppce500.c
+++ b/board/freescale/qemu-ppce500/qemu-ppce500.c
@@ -12,6 +12,7 @@
 #include <net.h>
 #include <pci.h>
 #include <time.h>
+#include <asm/global_data.h>
 #include <asm/processor.h>
 #include <asm/mmu.h>
 #include <asm/fsl_pci.h>
diff --git a/board/freescale/s32v234evb/s32v234evb.c b/board/freescale/s32v234evb/s32v234evb.c
index f381cfc2ad0..304f5acf3be 100644
--- a/board/freescale/s32v234evb/s32v234evb.c
+++ b/board/freescale/s32v234evb/s32v234evb.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/siul.h>
diff --git a/board/freescale/t102xrdb/ddr.c b/board/freescale/t102xrdb/ddr.c
index 3640a479574..818c20cf1b5 100644
--- a/board/freescale/t102xrdb/ddr.c
+++ b/board/freescale/t102xrdb/ddr.c
@@ -8,6 +8,7 @@
 #include <hwconfig.h>
 #include <init.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/mmu.h>
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
diff --git a/board/freescale/t102xrdb/spl.c b/board/freescale/t102xrdb/spl.c
index da442fcc180..7ed42ed246f 100644
--- a/board/freescale/t102xrdb/spl.c
+++ b/board/freescale/t102xrdb/spl.c
@@ -14,6 +14,7 @@
 #include <mmc.h>
 #include <fsl_esdhc.h>
 #include <spi_flash.h>
+#include <asm/global_data.h>
 #include "../common/sleep.h"
 #include "../common/spl.h"
 
diff --git a/board/freescale/t102xrdb/t102xrdb.c b/board/freescale/t102xrdb/t102xrdb.c
index bb775eb2d32..2770e104ee6 100644
--- a/board/freescale/t102xrdb/t102xrdb.c
+++ b/board/freescale/t102xrdb/t102xrdb.c
@@ -12,6 +12,7 @@
 #include <image.h>
 #include <init.h>
 #include <netdev.h>
+#include <asm/global_data.h>
 #include <linux/compiler.h>
 #include <asm/mmu.h>
 #include <asm/processor.h>
diff --git a/board/freescale/t104xrdb/ddr.c b/board/freescale/t104xrdb/ddr.c
index e313bf99cf2..8351f7ce9db 100644
--- a/board/freescale/t104xrdb/ddr.c
+++ b/board/freescale/t104xrdb/ddr.c
@@ -8,6 +8,7 @@
 #include <hwconfig.h>
 #include <init.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/mmu.h>
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
diff --git a/board/freescale/t104xrdb/spl.c b/board/freescale/t104xrdb/spl.c
index f83d69ba152..033a1054ff3 100644
--- a/board/freescale/t104xrdb/spl.c
+++ b/board/freescale/t104xrdb/spl.c
@@ -14,6 +14,7 @@
 #include <mmc.h>
 #include <fsl_esdhc.h>
 #include <spi_flash.h>
+#include <asm/global_data.h>
 #include "../common/sleep.h"
 #include "../common/spl.h"
 
diff --git a/board/freescale/t104xrdb/t104xrdb.c b/board/freescale/t104xrdb/t104xrdb.c
index c7290e5a342..780043483df 100644
--- a/board/freescale/t104xrdb/t104xrdb.c
+++ b/board/freescale/t104xrdb/t104xrdb.c
@@ -12,6 +12,7 @@
 #include <init.h>
 #include <log.h>
 #include <netdev.h>
+#include <asm/global_data.h>
 #include <linux/compiler.h>
 #include <asm/mmu.h>
 #include <asm/processor.h>
diff --git a/board/freescale/t208xqds/ddr.c b/board/freescale/t208xqds/ddr.c
index 3317f99c81f..56471b3988b 100644
--- a/board/freescale/t208xqds/ddr.c
+++ b/board/freescale/t208xqds/ddr.c
@@ -8,6 +8,7 @@
 #include <hwconfig.h>
 #include <init.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/mmu.h>
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
diff --git a/board/freescale/t208xqds/spl.c b/board/freescale/t208xqds/spl.c
index c197884421b..6863243b3dd 100644
--- a/board/freescale/t208xqds/spl.c
+++ b/board/freescale/t208xqds/spl.c
@@ -14,6 +14,7 @@
 #include <mmc.h>
 #include <fsl_esdhc.h>
 #include <spi_flash.h>
+#include <asm/global_data.h>
 #include "../common/qixis.h"
 #include "t208xqds_qixis.h"
 #include "../common/spl.h"
diff --git a/board/freescale/t208xqds/t208xqds.c b/board/freescale/t208xqds/t208xqds.c
index f3af8d52925..dedf722c695 100644
--- a/board/freescale/t208xqds/t208xqds.c
+++ b/board/freescale/t208xqds/t208xqds.c
@@ -13,6 +13,7 @@
 #include <init.h>
 #include <log.h>
 #include <netdev.h>
+#include <asm/global_data.h>
 #include <linux/compiler.h>
 #include <asm/mmu.h>
 #include <asm/processor.h>
diff --git a/board/freescale/t208xrdb/ddr.c b/board/freescale/t208xrdb/ddr.c
index 6a09d1cd221..1fbab36e1a2 100644
--- a/board/freescale/t208xrdb/ddr.c
+++ b/board/freescale/t208xrdb/ddr.c
@@ -8,6 +8,7 @@
 #include <hwconfig.h>
 #include <init.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/mmu.h>
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
diff --git a/board/freescale/t208xrdb/spl.c b/board/freescale/t208xrdb/spl.c
index 07aab6349cf..cfa6789d2df 100644
--- a/board/freescale/t208xrdb/spl.c
+++ b/board/freescale/t208xrdb/spl.c
@@ -14,6 +14,7 @@
 #include <mmc.h>
 #include <fsl_esdhc.h>
 #include <spi_flash.h>
+#include <asm/global_data.h>
 #include "../common/spl.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/t208xrdb/t208xrdb.c b/board/freescale/t208xrdb/t208xrdb.c
index d37abb7ef3b..a18459841c6 100644
--- a/board/freescale/t208xrdb/t208xrdb.c
+++ b/board/freescale/t208xrdb/t208xrdb.c
@@ -11,6 +11,7 @@
 #include <image.h>
 #include <init.h>
 #include <netdev.h>
+#include <asm/global_data.h>
 #include <linux/compiler.h>
 #include <asm/mmu.h>
 #include <asm/processor.h>
diff --git a/board/freescale/t4rdb/ddr.c b/board/freescale/t4rdb/ddr.c
index 5b7d10c9798..57cbde154f0 100644
--- a/board/freescale/t4rdb/ddr.c
+++ b/board/freescale/t4rdb/ddr.c
@@ -8,6 +8,7 @@
 #include <hwconfig.h>
 #include <init.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/mmu.h>
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
diff --git a/board/freescale/t4rdb/spl.c b/board/freescale/t4rdb/spl.c
index 64d2753da81..42db384a15d 100644
--- a/board/freescale/t4rdb/spl.c
+++ b/board/freescale/t4rdb/spl.c
@@ -10,6 +10,7 @@
 #include <console.h>
 #include <env_internal.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/spl.h>
 #include <malloc.h>
 #include <ns16550.h>
diff --git a/board/freescale/t4rdb/t4240rdb.c b/board/freescale/t4rdb/t4240rdb.c
index 5c2a75b905e..6ab35ca9185 100644
--- a/board/freescale/t4rdb/t4240rdb.c
+++ b/board/freescale/t4rdb/t4240rdb.c
@@ -11,6 +11,7 @@
 #include <image.h>
 #include <init.h>
 #include <netdev.h>
+#include <asm/global_data.h>
 #include <linux/compiler.h>
 #include <asm/mmu.h>
 #include <asm/processor.h>
diff --git a/board/freescale/vf610twr/vf610twr.c b/board/freescale/vf610twr/vf610twr.c
index bd125bc17e0..98cb0140ad0 100644
--- a/board/freescale/vf610twr/vf610twr.c
+++ b/board/freescale/vf610twr/vf610twr.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux-vf610.h>
diff --git a/board/friendlyarm/nanopi2/board.c b/board/friendlyarm/nanopi2/board.c
index 68980536abe..c0fe2d546f6 100644
--- a/board/friendlyarm/nanopi2/board.c
+++ b/board/friendlyarm/nanopi2/board.c
@@ -12,6 +12,7 @@
 #ifdef CONFIG_PWM_NX
 #include <pwm.h>
 #endif
+#include <asm/global_data.h>
 #include <asm/io.h>
 
 #include <asm/arch/nexell.h>
diff --git a/board/gardena/smart-gateway-at91sam/board.c b/board/gardena/smart-gateway-at91sam/board.c
index 45c947fcbb4..3f402cfeee8 100644
--- a/board/gardena/smart-gateway-at91sam/board.c
+++ b/board/gardena/smart-gateway-at91sam/board.c
@@ -11,6 +11,7 @@
 #include <led.h>
 #include <asm/arch/at91_common.h>
 #include <asm/arch/clk.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/gateworks/gw_ventana/gw_ventana.c b/board/gateworks/gw_ventana/gw_ventana.c
index 9f043d815ab..bf4d6913067 100644
--- a/board/gateworks/gw_ventana/gw_ventana.c
+++ b/board/gateworks/gw_ventana/gw_ventana.c
@@ -15,6 +15,7 @@
 #include <asm/arch/mx6-pins.h>
 #include <asm/arch/mxc_hdmi.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/mach-imx/boot_mode.h>
 #include <asm/mach-imx/sata.h>
diff --git a/board/gdsys/a38x/controlcenterdc.c b/board/gdsys/a38x/controlcenterdc.c
index a2287f9deb1..ba57a272187 100644
--- a/board/gdsys/a38x/controlcenterdc.c
+++ b/board/gdsys/a38x/controlcenterdc.c
@@ -11,6 +11,7 @@
 #include <miiphy.h>
 #include <net.h>
 #include <tpm-v1.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm-generic/gpio.h>
diff --git a/board/gdsys/a38x/hydra.c b/board/gdsys/a38x/hydra.c
index daade6da0af..495a9769188 100644
--- a/board/gdsys/a38x/hydra.c
+++ b/board/gdsys/a38x/hydra.c
@@ -1,6 +1,7 @@
 #include <common.h>
 #include <command.h>
 #include <console.h> /* ctrlc */
+#include <pci.h>
 #include <asm/io.h>
 
 #include "hydra.h"
diff --git a/board/gdsys/mpc8308/gazerbeam.c b/board/gdsys/mpc8308/gazerbeam.c
index c317260251e..68a9595511c 100644
--- a/board/gdsys/mpc8308/gazerbeam.c
+++ b/board/gdsys/mpc8308/gazerbeam.c
@@ -17,6 +17,7 @@
 #include <misc.h>
 #include <tpm-v1.h>
 #include <video_osd.h>
+#include <asm/global_data.h>
 
 #include "../common/ihs_mdio.h"
 #include "../../../drivers/board/gazerbeam.h"
diff --git a/board/gdsys/mpc8308/sdram.c b/board/gdsys/mpc8308/sdram.c
index 9695fb0a10d..bfd55f54e4e 100644
--- a/board/gdsys/mpc8308/sdram.c
+++ b/board/gdsys/mpc8308/sdram.c
@@ -19,6 +19,7 @@
 #include <spd_sdram.h>
 
 #include <asm/bitops.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 
 #include <asm/processor.h>
diff --git a/board/ge/bx50v3/bx50v3.c b/board/ge/bx50v3/bx50v3.c
index cf76cf7a338..be5fb0e49cc 100644
--- a/board/ge/bx50v3/bx50v3.c
+++ b/board/ge/bx50v3/bx50v3.c
@@ -12,6 +12,7 @@
 #include <asm/arch/iomux.h>
 #include <asm/arch/mx6-pins.h>
 #include <env.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/libfdt.h>
diff --git a/board/ge/mx53ppd/mx53ppd.c b/board/ge/mx53ppd/mx53ppd.c
index 7627e9c370f..4de82cd5cd2 100644
--- a/board/ge/mx53ppd/mx53ppd.c
+++ b/board/ge/mx53ppd/mx53ppd.c
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
diff --git a/board/google/imx8mq_phanbell/imx8mq_phanbell.c b/board/google/imx8mq_phanbell/imx8mq_phanbell.c
index 746071b4150..d0a740dd3f4 100644
--- a/board/google/imx8mq_phanbell/imx8mq_phanbell.c
+++ b/board/google/imx8mq_phanbell/imx8mq_phanbell.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <malloc.h>
 #include <errno.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <miiphy.h>
 #include <netdev.h>
diff --git a/board/google/imx8mq_phanbell/spl.c b/board/google/imx8mq_phanbell/spl.c
index 06a3f4c1aa8..eec3f3d931b 100644
--- a/board/google/imx8mq_phanbell/spl.c
+++ b/board/google/imx8mq_phanbell/spl.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <hang.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <errno.h>
 #include <init.h>
diff --git a/board/google/veyron/veyron.c b/board/google/veyron/veyron.c
index 391d973c0b6..32dbcdc4d10 100644
--- a/board/google/veyron/veyron.c
+++ b/board/google/veyron/veyron.c
@@ -9,6 +9,7 @@
 #include <init.h>
 #include <log.h>
 #include <asm/arch-rockchip/clock.h>
+#include <asm/global_data.h>
 #include <dt-bindings/clock/rk3288-cru.h>
 #include <linux/delay.h>
 #include <linux/err.h>
diff --git a/board/grinn/chiliboard/board.c b/board/grinn/chiliboard/board.c
index 8cc9278287b..12480f5729d 100644
--- a/board/grinn/chiliboard/board.c
+++ b/board/grinn/chiliboard/board.c
@@ -16,6 +16,7 @@
 #include <asm/arch/mux.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/emif.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <cpsw.h>
 #include <env.h>
diff --git a/board/grinn/liteboard/board.c b/board/grinn/liteboard/board.c
index 578d75aed3d..48392c48e5c 100644
--- a/board/grinn/liteboard/board.c
+++ b/board/grinn/liteboard/board.c
@@ -15,6 +15,7 @@
 #include <asm/arch/mx6ul_pins.h>
 #include <asm/arch/mx6-pins.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/mach-imx/boot_mode.h>
diff --git a/board/highbank/highbank.c b/board/highbank/highbank.c
index e07295c7b5c..a790d453da0 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 <asm/global_data.h>
 
 #include <linux/sizes.h>
 #include <asm/io.h>
diff --git a/board/hisilicon/hikey/hikey.c b/board/hisilicon/hikey/hikey.c
index e89ff1a43de..5a858dec64e 100644
--- a/board/hisilicon/hikey/hikey.c
+++ b/board/hisilicon/hikey/hikey.c
@@ -9,6 +9,7 @@
 #include <fdt_support.h>
 #include <init.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <dm/platform_data/serial_pl01x.h>
 #include <errno.h>
 #include <malloc.h>
diff --git a/board/hisilicon/hikey960/hikey960.c b/board/hisilicon/hikey960/hikey960.c
index db485db10a9..a14b9e44fa5 100644
--- a/board/hisilicon/hikey960/hikey960.c
+++ b/board/hisilicon/hikey960/hikey960.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <asm/cache.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/hi3660.h>
 #include <asm/armv8/mmu.h>
diff --git a/board/hisilicon/poplar/poplar.c b/board/hisilicon/poplar/poplar.c
index 371c3c33fc8..486e37f90a6 100644
--- a/board/hisilicon/poplar/poplar.c
+++ b/board/hisilicon/poplar/poplar.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <init.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm/platform_data/serial_pl01x.h>
 #include <asm/arch/hi3798cv200.h>
diff --git a/board/ids/ids8313/ids8313.c b/board/ids/ids8313/ids8313.c
index ac35b5b0d0c..45c77a249a9 100644
--- a/board/ids/ids8313/ids8313.c
+++ b/board/ids/ids8313/ids8313.c
@@ -17,6 +17,7 @@
 #include <mpc83xx.h>
 #include <spi.h>
 #include <asm/bitops.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 
diff --git a/board/imgtec/boston/ddr.c b/board/imgtec/boston/ddr.c
index 241b3846687..182f79b9182 100644
--- a/board/imgtec/boston/ddr.c
+++ b/board/imgtec/boston/ddr.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 
 #include <asm/io.h>
 
diff --git a/board/imgtec/boston/dt.c b/board/imgtec/boston/dt.c
index 44b56416ff9..bf772ff5dec 100644
--- a/board/imgtec/boston/dt.c
+++ b/board/imgtec/boston/dt.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <fdt_support.h>
+#include <asm/global_data.h>
 
 int ft_board_setup(void *blob, struct bd_info *bd)
 {
diff --git a/board/imgtec/ci20/ci20.c b/board/imgtec/ci20/ci20.c
index 038dbdd74f0..7ee175d40a5 100644
--- a/board/imgtec/ci20/ci20.c
+++ b/board/imgtec/ci20/ci20.c
@@ -11,6 +11,7 @@
 #include <init.h>
 #include <net.h>
 #include <netdev.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
 #include <linux/bitops.h>
diff --git a/board/imgtec/malta/malta.c b/board/imgtec/malta/malta.c
index 252cc813c6e..c04f727961d 100644
--- a/board/imgtec/malta/malta.c
+++ b/board/imgtec/malta/malta.c
@@ -13,6 +13,7 @@
 #include <pci_gt64120.h>
 #include <pci_msc01.h>
 #include <rtc.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 
 #include <asm/addrspace.h>
diff --git a/board/imgtec/xilfpga/xilfpga.c b/board/imgtec/xilfpga/xilfpga.c
index 0b68bbde50f..6a836370e36 100644
--- a/board/imgtec/xilfpga/xilfpga.c
+++ b/board/imgtec/xilfpga/xilfpga.c
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/inversepath/usbarmory/usbarmory.c b/board/inversepath/usbarmory/usbarmory.c
index 56a2a7c4a6e..086d0522c78 100644
--- a/board/inversepath/usbarmory/usbarmory.c
+++ b/board/inversepath/usbarmory/usbarmory.c
@@ -11,6 +11,7 @@
 #include <command.h>
 #include <fs.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
diff --git a/board/iomega/iconnect/iconnect.c b/board/iomega/iconnect/iconnect.c
index 79c794bfc89..fe4be28b13c 100644
--- a/board/iomega/iconnect/iconnect.c
+++ b/board/iomega/iconnect/iconnect.c
@@ -11,6 +11,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
 #include <asm/arch/mpp.h>
+#include <asm/global_data.h>
 #include "iconnect.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/isee/igep003x/board.c b/board/isee/igep003x/board.c
index 9b4cb91b341..02ae7df04db 100644
--- a/board/isee/igep003x/board.c
+++ b/board/isee/igep003x/board.c
@@ -21,6 +21,7 @@
 #include <asm/arch/gpio.h>
 #include <asm/arch/mmc_host_def.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/emif.h>
 #include <asm/gpio.h>
diff --git a/board/isee/igep00x0/common.c b/board/isee/igep00x0/common.c
index 58c713f0f32..3fdf83e845c 100644
--- a/board/isee/igep00x0/common.c
+++ b/board/isee/igep00x0/common.c
@@ -2,6 +2,7 @@
 
 #include <common.h>
 #include <twl4030.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/omap_mmc.h>
 #include <asm/arch/mux.h>
diff --git a/board/k+p/kp_imx53/kp_imx53.c b/board/k+p/kp_imx53/kp_imx53.c
index eb5b67d1e62..a5ee4a8a519 100644
--- a/board/k+p/kp_imx53/kp_imx53.c
+++ b/board/k+p/kp_imx53/kp_imx53.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
diff --git a/board/k+p/kp_imx6q_tpc/kp_imx6q_tpc.c b/board/k+p/kp_imx6q_tpc/kp_imx6q_tpc.c
index e60d556b303..110496d9950 100644
--- a/board/k+p/kp_imx6q_tpc/kp_imx6q_tpc.c
+++ b/board/k+p/kp_imx6q_tpc/kp_imx6q_tpc.c
@@ -12,6 +12,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/mx6-pins.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 #include <asm/mach-imx/boot_mode.h>
 #include <env.h>
 #include <errno.h>
diff --git a/board/k+p/kp_imx6q_tpc/kp_imx6q_tpc_spl.c b/board/k+p/kp_imx6q_tpc/kp_imx6q_tpc_spl.c
index 75fb6acfb3c..103c4531a64 100644
--- a/board/k+p/kp_imx6q_tpc/kp_imx6q_tpc_spl.c
+++ b/board/k+p/kp_imx6q_tpc/kp_imx6q_tpc_spl.c
@@ -13,6 +13,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/mx6-ddr.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <errno.h>
 #include <spl.h>
diff --git a/board/keymile/common/common.c b/board/keymile/common/common.c
index 03c7ce9da7d..d85a5eac165 100644
--- a/board/keymile/common/common.c
+++ b/board/keymile/common/common.c
@@ -15,6 +15,7 @@
 #include <cli_hush.h>
 #include <net.h>
 #include <netdev.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/ctype.h>
 #include <linux/delay.h>
diff --git a/board/keymile/km83xx/km83xx.c b/board/keymile/km83xx/km83xx.c
index 0aad452dde6..1e5c33b5fd5 100644
--- a/board/keymile/km83xx/km83xx.c
+++ b/board/keymile/km83xx/km83xx.c
@@ -22,6 +22,7 @@
 #include <mpc83xx.h>
 #include <i2c.h>
 #include <miiphy.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/mmu.h>
 #include <asm/processor.h>
diff --git a/board/keymile/km_arm/km_arm.c b/board/keymile/km_arm/km_arm.c
index 7d191ab860b..f4235b377fc 100644
--- a/board/keymile/km_arm/km_arm.c
+++ b/board/keymile/km_arm/km_arm.c
@@ -20,6 +20,7 @@
 #include <netdev.h>
 #include <miiphy.h>
 #include <spi.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
diff --git a/board/keymile/kmp204x/ddr.c b/board/keymile/kmp204x/ddr.c
index d9c9ddf2bac..77a00c55c95 100644
--- a/board/keymile/kmp204x/ddr.c
+++ b/board/keymile/kmp204x/ddr.c
@@ -11,6 +11,7 @@
 #include <hwconfig.h>
 #include <init.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/mmu.h>
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
diff --git a/board/kmc/kzm9g/kzm9g.c b/board/kmc/kzm9g/kzm9g.c
index 4b406042180..02c87a031c3 100644
--- a/board/kmc/kzm9g/kzm9g.c
+++ b/board/kmc/kzm9g/kzm9g.c
@@ -8,6 +8,7 @@
 #include <cpu_func.h>
 #include <init.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/gpio.h>
diff --git a/board/kobol/helios4/helios4.c b/board/kobol/helios4/helios4.c
index 17d2489415d..adb091ce4fd 100644
--- a/board/kobol/helios4/helios4.c
+++ b/board/kobol/helios4/helios4.c
@@ -10,6 +10,7 @@
 #include <miiphy.h>
 #include <net.h>
 #include <netdev.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
diff --git a/board/kosagi/novena/novena.c b/board/kosagi/novena/novena.c
index b1939f8a56e..0e1b4a0a46c 100644
--- a/board/kosagi/novena/novena.c
+++ b/board/kosagi/novena/novena.c
@@ -10,6 +10,7 @@
 #include <eeprom.h>
 #include <init.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <dm/device-internal.h>
 #include <ahci.h>
 #include <env.h>
diff --git a/board/l+g/vinco/vinco.c b/board/l+g/vinco/vinco.c
index b1593bab5eb..f221f05261a 100644
--- a/board/l+g/vinco/vinco.c
+++ b/board/l+g/vinco/vinco.c
@@ -11,6 +11,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/at91_common.h>
 #include <asm/arch/at91_pmc.h>
diff --git a/board/laird/wb45n/wb45n.c b/board/laird/wb45n/wb45n.c
index df6eeb62434..5e1ef8a49ac 100644
--- a/board/laird/wb45n/wb45n.c
+++ b/board/laird/wb45n/wb45n.c
@@ -4,6 +4,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/at91sam9x5_matrix.h>
 #include <asm/arch/at91sam9_smc.h>
diff --git a/board/laird/wb50n/wb50n.c b/board/laird/wb50n/wb50n.c
index 9cc21b2abd3..8fa989a2a4f 100644
--- a/board/laird/wb50n/wb50n.c
+++ b/board/laird/wb50n/wb50n.c
@@ -4,6 +4,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/at91_sfr.h>
 #include <asm/arch/sama5d3_smc.h>
diff --git a/board/lego/ev3/legoev3.c b/board/lego/ev3/legoev3.c
index 51b669a891b..5e5c8c1198f 100644
--- a/board/lego/ev3/legoev3.c
+++ b/board/lego/ev3/legoev3.c
@@ -19,6 +19,7 @@
 #include <spi_flash.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/pinmux_defs.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/davinci_misc.h>
 #include <linux/errno.h>
diff --git a/board/lg/sniper/sniper.c b/board/lg/sniper/sniper.c
index b08a267c52c..15c088d7348 100644
--- a/board/lg/sniper/sniper.c
+++ b/board/lg/sniper/sniper.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <env.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <linux/ctype.h>
 #include <linux/usb/musb.h>
 #include <asm/omap_musb.h>
diff --git a/board/liebherr/display5/display5.c b/board/liebherr/display5/display5.c
index ada7cf5eb70..1c8660f773a 100644
--- a/board/liebherr/display5/display5.c
+++ b/board/liebherr/display5/display5.c
@@ -9,6 +9,7 @@
 #include <fdt_support.h>
 #include <init.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/liebherr/display5/spl.c b/board/liebherr/display5/spl.c
index 23959c25573..b8658c8d617 100644
--- a/board/liebherr/display5/spl.c
+++ b/board/liebherr/display5/spl.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <serial.h>
 #include <spl.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 #include <asm/io.h>
diff --git a/board/liebherr/mccmon6/mccmon6.c b/board/liebherr/mccmon6/mccmon6.c
index 71f75d877d2..1b49526fba4 100644
--- a/board/liebherr/mccmon6/mccmon6.c
+++ b/board/liebherr/mccmon6/mccmon6.c
@@ -12,6 +12,7 @@
 #include <asm/arch/iomux.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/liebherr/xea/xea.c b/board/liebherr/xea/xea.c
index 9286f4c755b..cd11b0ada77 100644
--- a/board/liebherr/xea/xea.c
+++ b/board/liebherr/xea/xea.c
@@ -18,6 +18,7 @@
 #include <init.h>
 #include <log.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/logicpd/am3517evm/am3517evm.c b/board/logicpd/am3517evm/am3517evm.c
index cba51f54d41..f0141659282 100644
--- a/board/logicpd/am3517evm/am3517evm.c
+++ b/board/logicpd/am3517evm/am3517evm.c
@@ -16,6 +16,7 @@
 #include <net.h>
 #include <ns16550.h>
 #include <serial.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/omap_musb.h>
 #include <asm/arch/am35x_def.h>
diff --git a/board/logicpd/imx6/imx6logic.c b/board/logicpd/imx6/imx6logic.c
index ba69c966869..0d53548dcb4 100644
--- a/board/logicpd/imx6/imx6logic.c
+++ b/board/logicpd/imx6/imx6logic.c
@@ -16,6 +16,7 @@
 #include <mmc.h>
 #include <fsl_esdhc_imx.h>
 #include <serial.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
 #include <linux/sizes.h>
diff --git a/board/logicpd/omap3som/omap3logic.c b/board/logicpd/omap3som/omap3logic.c
index 496886fea25..2379b521904 100644
--- a/board/logicpd/omap3som/omap3logic.c
+++ b/board/logicpd/omap3som/omap3logic.c
@@ -20,6 +20,7 @@
 #include <i2c.h>
 #include <serial.h>
 #include <twl4030.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/mmc_host_def.h>
 #include <asm/arch/mux.h>
diff --git a/board/maxbcm/maxbcm.c b/board/maxbcm/maxbcm.c
index 3c6422214f7..e92132ad19a 100644
--- a/board/maxbcm/maxbcm.c
+++ b/board/maxbcm/maxbcm.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <init.h>
 #include <miiphy.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
diff --git a/board/mediatek/mt7622/mt7622_rfb.c b/board/mediatek/mt7622/mt7622_rfb.c
index 6a5f936635c..0504d6177fd 100644
--- a/board/mediatek/mt7622/mt7622_rfb.c
+++ b/board/mediatek/mt7622/mt7622_rfb.c
@@ -8,6 +8,7 @@
 #include <config.h>
 #include <env.h>
 #include <init.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/mediatek/mt7623/mt7623_rfb.c b/board/mediatek/mt7623/mt7623_rfb.c
index 984e75ccaf2..755e879085c 100644
--- a/board/mediatek/mt7623/mt7623_rfb.c
+++ b/board/mediatek/mt7623/mt7623_rfb.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <mmc.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/mediatek/mt7629/mt7629_rfb.c b/board/mediatek/mt7629/mt7629_rfb.c
index 08468b50ea2..d1bca6d62ef 100644
--- a/board/mediatek/mt7629/mt7629_rfb.c
+++ b/board/mediatek/mt7629/mt7629_rfb.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/mediatek/mt8512/mt8512.c b/board/mediatek/mt8512/mt8512.c
index 4ad62b73a6c..ac3adb80122 100644
--- a/board/mediatek/mt8512/mt8512.c
+++ b/board/mediatek/mt8512/mt8512.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <log.h>
 #include <wdt.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/mediatek/mt8518/mt8518_ap1.c b/board/mediatek/mt8518/mt8518_ap1.c
index c9acfcb1a56..fce5de6767c 100644
--- a/board/mediatek/mt8518/mt8518_ap1.c
+++ b/board/mediatek/mt8518/mt8518_ap1.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <init.h>
 #include <log.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/menlo/m53menlo/m53menlo.c b/board/menlo/m53menlo/m53menlo.c
index 893f6255999..c34baca602c 100644
--- a/board/menlo/m53menlo/m53menlo.c
+++ b/board/menlo/m53menlo/m53menlo.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <init.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
diff --git a/board/mikrotik/crs3xx-98dx3236/crs3xx-98dx3236.c b/board/mikrotik/crs3xx-98dx3236/crs3xx-98dx3236.c
index 8b419ef6f7e..315169ba661 100644
--- a/board/mikrotik/crs3xx-98dx3236/crs3xx-98dx3236.c
+++ b/board/mikrotik/crs3xx-98dx3236/crs3xx-98dx3236.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <i2c.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <linux/bitops.h>
 #include <linux/mbus.h>
diff --git a/board/mini-box/picosam9g45/picosam9g45.c b/board/mini-box/picosam9g45/picosam9g45.c
index e8e1ac3eb19..5d6cb24966d 100644
--- a/board/mini-box/picosam9g45/picosam9g45.c
+++ b/board/mini-box/picosam9g45/picosam9g45.c
@@ -13,6 +13,7 @@
 #include <common.h>
 #include <init.h>
 #include <vsprintf.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clk.h>
 #include <asm/arch/at91sam9g45_matrix.h>
diff --git a/board/mpc8308_p1m/sdram.c b/board/mpc8308_p1m/sdram.c
index cbf8781746e..62a2d8a53af 100644
--- a/board/mpc8308_p1m/sdram.c
+++ b/board/mpc8308_p1m/sdram.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <init.h>
 #include <mpc83xx.h>
+#include <asm/global_data.h>
 
 #include <asm/bitops.h>
 #include <asm/io.h>
diff --git a/board/mscc/jr2/jr2.c b/board/mscc/jr2/jr2.c
index 51700f4acff..1cd720c7d84 100644
--- a/board/mscc/jr2/jr2.c
+++ b/board/mscc/jr2/jr2.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <image.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <led.h>
 #include <miiphy.h>
diff --git a/board/mscc/luton/luton.c b/board/mscc/luton/luton.c
index acc26157c77..038902d08a9 100644
--- a/board/mscc/luton/luton.c
+++ b/board/mscc/luton/luton.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <image.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <led.h>
 #include <miiphy.h>
diff --git a/board/mscc/ocelot/ocelot.c b/board/mscc/ocelot/ocelot.c
index 74e8bfc4314..c462890bb85 100644
--- a/board/mscc/ocelot/ocelot.c
+++ b/board/mscc/ocelot/ocelot.c
@@ -7,6 +7,7 @@
 #include <image.h>
 #include <init.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/addrspace.h>
 #include <asm/types.h>
diff --git a/board/mscc/serval/serval.c b/board/mscc/serval/serval.c
index ed1aea55cc2..94c1c42b79b 100644
--- a/board/mscc/serval/serval.c
+++ b/board/mscc/serval/serval.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <image.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <led.h>
 #include <miiphy.h>
diff --git a/board/mscc/servalt/servalt.c b/board/mscc/servalt/servalt.c
index d0e6016b9af..2fb48b74e8f 100644
--- a/board/mscc/servalt/servalt.c
+++ b/board/mscc/servalt/servalt.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <image.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <led.h>
 
diff --git a/board/nokia/rx51/rx51.c b/board/nokia/rx51/rx51.c
index f624dbfbebc..65be1719c2c 100644
--- a/board/nokia/rx51/rx51.c
+++ b/board/nokia/rx51/rx51.c
@@ -29,6 +29,7 @@
 #include <twl4030.h>
 #include <i2c.h>
 #include <video_fb.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/setup.h>
 #include <asm/bitops.h>
diff --git a/board/novtech/meerkat96/meerkat96.c b/board/novtech/meerkat96/meerkat96.c
index b13e7ce3b18..1edebe5db9b 100644
--- a/board/novtech/meerkat96/meerkat96.c
+++ b/board/novtech/meerkat96/meerkat96.c
@@ -9,6 +9,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/mx7-pins.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/io.h>
 #include <common.h>
diff --git a/board/olimex/mx23_olinuxino/mx23_olinuxino.c b/board/olimex/mx23_olinuxino/mx23_olinuxino.c
index f13fdb8d47e..d1e189cbb6e 100644
--- a/board/olimex/mx23_olinuxino/mx23_olinuxino.c
+++ b/board/olimex/mx23_olinuxino/mx23_olinuxino.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <asm/arch/iomux-mx23.h>
diff --git a/board/phytec/pcl063/pcl063.c b/board/phytec/pcl063/pcl063.c
index 9e6940f9c76..b2e435f6908 100644
--- a/board/phytec/pcl063/pcl063.c
+++ b/board/phytec/pcl063/pcl063.c
@@ -11,6 +11,7 @@
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/mx6-pins.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/mach-imx/mxc_i2c.h>
 #include <fsl_esdhc_imx.h>
diff --git a/board/phytec/pcm052/pcm052.c b/board/phytec/pcm052/pcm052.c
index b0c56a29f1f..f9cf4abd474 100644
--- a/board/phytec/pcm052/pcm052.c
+++ b/board/phytec/pcm052/pcm052.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux-vf610.h>
diff --git a/board/phytec/pcm058/pcm058.c b/board/phytec/pcm058/pcm058.c
index 79c666588f4..5e5b129ef1f 100644
--- a/board/phytec/pcm058/pcm058.c
+++ b/board/phytec/pcm058/pcm058.c
@@ -14,6 +14,7 @@
 #include <net.h>
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/mx6-ddr.h>
+#include <asm/global_data.h>
 #include <asm/mach-imx/boot_mode.h>
 #include <asm/arch/sys_proto.h>
 #include <dm.h>
diff --git a/board/phytec/pfla02/pfla02.c b/board/phytec/pfla02/pfla02.c
index 3b10cc0f9f1..076ce6711ef 100644
--- a/board/phytec/pfla02/pfla02.c
+++ b/board/phytec/pfla02/pfla02.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <log.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/phytec/phycore_am335x_r2/board.c b/board/phytec/phycore_am335x_r2/board.c
index fb589068471..5ca94152049 100644
--- a/board/phytec/phycore_am335x_r2/board.c
+++ b/board/phytec/phycore_am335x_r2/board.c
@@ -17,6 +17,7 @@
 #include <asm/arch/ddr_defs.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 #include <power/tps65910.h>
 #include <jffs2/load_kernel.h>
 #include <mtd_node.h>
diff --git a/board/phytec/phycore_rk3288/phycore-rk3288.c b/board/phytec/phycore_rk3288/phycore-rk3288.c
index ecc73227a02..f588fc3b0c7 100644
--- a/board/phytec/phycore_rk3288/phycore-rk3288.c
+++ b/board/phytec/phycore_rk3288/phycore-rk3288.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <log.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <common.h>
 #include <dm.h>
diff --git a/board/phytium/durian/durian.c b/board/phytium/durian/durian.c
index b80688ae864..8a82a4591ac 100644
--- a/board/phytium/durian/durian.c
+++ b/board/phytium/durian/durian.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <asm/armv8/mmu.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/system.h>
 #include <asm/io.h>
 #include <linux/arm-smccc.h>
diff --git a/board/ppcag/bg0900/bg0900.c b/board/ppcag/bg0900/bg0900.c
index e8168e34682..578f5c73b6c 100644
--- a/board/ppcag/bg0900/bg0900.c
+++ b/board/ppcag/bg0900/bg0900.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <init.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/qemu-mips/qemu-mips.c b/board/qemu-mips/qemu-mips.c
index 7553d0b00de..f57091739ec 100644
--- a/board/qemu-mips/qemu-mips.c
+++ b/board/qemu-mips/qemu-mips.c
@@ -8,6 +8,7 @@
 #include <command.h>
 #include <init.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <asm/mipsregs.h>
 #include <asm/io.h>
 #include <netdev.h>
diff --git a/board/qualcomm/dragonboard410c/dragonboard410c.c b/board/qualcomm/dragonboard410c/dragonboard410c.c
index 4d1dbd696dc..646013cfc93 100644
--- a/board/qualcomm/dragonboard410c/dragonboard410c.c
+++ b/board/qualcomm/dragonboard410c/dragonboard410c.c
@@ -13,6 +13,7 @@
 #include <net.h>
 #include <usb.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <fdt_support.h>
 #include <asm/arch/dram.h>
diff --git a/board/qualcomm/dragonboard820c/dragonboard820c.c b/board/qualcomm/dragonboard820c/dragonboard820c.c
index c1ade5ce43a..877e34c2101 100644
--- a/board/qualcomm/dragonboard820c/dragonboard820c.c
+++ b/board/qualcomm/dragonboard820c/dragonboard820c.c
@@ -10,6 +10,7 @@
 #include <asm/arch/sysmap-apq8096.h>
 #include <env.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <linux/arm-smccc.h>
 #include <linux/psci.h>
 #include <common.h>
diff --git a/board/raidsonic/ib62x0/ib62x0.c b/board/raidsonic/ib62x0/ib62x0.c
index db1b0adc382..f9bc07649e0 100644
--- a/board/raidsonic/ib62x0/ib62x0.c
+++ b/board/raidsonic/ib62x0/ib62x0.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <init.h>
 #include <miiphy.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
diff --git a/board/renesas/alt/alt.c b/board/renesas/alt/alt.c
index 279ed487216..854c47636d3 100644
--- a/board/renesas/alt/alt.c
+++ b/board/renesas/alt/alt.c
@@ -12,6 +12,7 @@
 #include <init.h>
 #include <malloc.h>
 #include <dm.h>
+#include <asm/global_data.h>
 #include <dm/platform_data/serial_sh.h>
 #include <env_internal.h>
 #include <asm/processor.h>
diff --git a/board/renesas/blanche/blanche.c b/board/renesas/blanche/blanche.c
index 2450fca7a58..9671382f2a3 100644
--- a/board/renesas/blanche/blanche.c
+++ b/board/renesas/blanche/blanche.c
@@ -15,6 +15,7 @@
 #include <asm/arch/rmobile.h>
 #include <asm/arch/sh_sdhi.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <asm/mach-types.h>
diff --git a/board/renesas/condor/condor.c b/board/renesas/condor/condor.c
index 91afcdd85a8..99e7dd6e1e1 100644
--- a/board/renesas/condor/condor.c
+++ b/board/renesas/condor/condor.c
@@ -10,6 +10,7 @@
 #include <cpu_func.h>
 #include <hang.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/processor.h>
 #include <asm/mach-types.h>
 #include <asm/io.h>
diff --git a/board/renesas/draak/draak.c b/board/renesas/draak/draak.c
index c8f4b214a2d..bc4ce95a727 100644
--- a/board/renesas/draak/draak.c
+++ b/board/renesas/draak/draak.c
@@ -13,6 +13,7 @@
 #include <malloc.h>
 #include <netdev.h>
 #include <dm.h>
+#include <asm/global_data.h>
 #include <dm/platform_data/serial_sh.h>
 #include <asm/processor.h>
 #include <asm/mach-types.h>
diff --git a/board/renesas/eagle/eagle.c b/board/renesas/eagle/eagle.c
index 6228f22e010..f9e553feaa7 100644
--- a/board/renesas/eagle/eagle.c
+++ b/board/renesas/eagle/eagle.c
@@ -13,6 +13,7 @@
 #include <malloc.h>
 #include <netdev.h>
 #include <dm.h>
+#include <asm/global_data.h>
 #include <dm/platform_data/serial_sh.h>
 #include <asm/processor.h>
 #include <asm/mach-types.h>
diff --git a/board/renesas/ebisu/ebisu.c b/board/renesas/ebisu/ebisu.c
index d164a36361f..620d250284a 100644
--- a/board/renesas/ebisu/ebisu.c
+++ b/board/renesas/ebisu/ebisu.c
@@ -13,6 +13,7 @@
 #include <malloc.h>
 #include <netdev.h>
 #include <dm.h>
+#include <asm/global_data.h>
 #include <dm/platform_data/serial_sh.h>
 #include <asm/processor.h>
 #include <asm/mach-types.h>
diff --git a/board/renesas/gose/gose.c b/board/renesas/gose/gose.c
index c6a93c25e6d..56cdc73b1a7 100644
--- a/board/renesas/gose/gose.c
+++ b/board/renesas/gose/gose.c
@@ -12,6 +12,7 @@
 #include <init.h>
 #include <malloc.h>
 #include <dm.h>
+#include <asm/global_data.h>
 #include <dm/platform_data/serial_sh.h>
 #include <env_internal.h>
 #include <asm/processor.h>
diff --git a/board/renesas/grpeach/grpeach.c b/board/renesas/grpeach/grpeach.c
index b92e01ca984..ac989eb29c2 100644
--- a/board/renesas/grpeach/grpeach.c
+++ b/board/renesas/grpeach/grpeach.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
 
diff --git a/board/renesas/koelsch/koelsch.c b/board/renesas/koelsch/koelsch.c
index 1b3acc8fd1f..b0a66ea2669 100644
--- a/board/renesas/koelsch/koelsch.c
+++ b/board/renesas/koelsch/koelsch.c
@@ -13,6 +13,7 @@
 #include <init.h>
 #include <malloc.h>
 #include <dm.h>
+#include <asm/global_data.h>
 #include <dm/platform_data/serial_sh.h>
 #include <env_internal.h>
 #include <asm/processor.h>
diff --git a/board/renesas/lager/lager.c b/board/renesas/lager/lager.c
index 36a35a9a9cf..add4eef3d53 100644
--- a/board/renesas/lager/lager.c
+++ b/board/renesas/lager/lager.c
@@ -16,6 +16,7 @@
 #include <malloc.h>
 #include <netdev.h>
 #include <dm.h>
+#include <asm/global_data.h>
 #include <dm/platform_data/serial_sh.h>
 #include <asm/processor.h>
 #include <asm/mach-types.h>
diff --git a/board/renesas/porter/porter.c b/board/renesas/porter/porter.c
index 793e02cb440..b3e4c08d74d 100644
--- a/board/renesas/porter/porter.c
+++ b/board/renesas/porter/porter.c
@@ -13,6 +13,7 @@
 #include <init.h>
 #include <malloc.h>
 #include <dm.h>
+#include <asm/global_data.h>
 #include <dm/platform_data/serial_sh.h>
 #include <env_internal.h>
 #include <asm/processor.h>
diff --git a/board/renesas/rcar-common/common.c b/board/renesas/rcar-common/common.c
index 83dd2888470..1d645a82aaf 100644
--- a/board/renesas/rcar-common/common.c
+++ b/board/renesas/rcar-common/common.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <dm.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <dm/uclass-internal.h>
 #include <asm/arch/rmobile.h>
 #include <linux/libfdt.h>
diff --git a/board/renesas/salvator-x/salvator-x.c b/board/renesas/salvator-x/salvator-x.c
index 947bdaefa80..1d0cab8914f 100644
--- a/board/renesas/salvator-x/salvator-x.c
+++ b/board/renesas/salvator-x/salvator-x.c
@@ -14,6 +14,7 @@
 #include <malloc.h>
 #include <netdev.h>
 #include <dm.h>
+#include <asm/global_data.h>
 #include <dm/platform_data/serial_sh.h>
 #include <asm/processor.h>
 #include <asm/mach-types.h>
diff --git a/board/renesas/silk/silk.c b/board/renesas/silk/silk.c
index 171d06f3175..05af5f4d68b 100644
--- a/board/renesas/silk/silk.c
+++ b/board/renesas/silk/silk.c
@@ -13,6 +13,7 @@
 #include <init.h>
 #include <malloc.h>
 #include <dm.h>
+#include <asm/global_data.h>
 #include <dm/platform_data/serial_sh.h>
 #include <env_internal.h>
 #include <asm/processor.h>
diff --git a/board/renesas/stout/stout.c b/board/renesas/stout/stout.c
index babcce9aa1c..3fdf936ddca 100644
--- a/board/renesas/stout/stout.c
+++ b/board/renesas/stout/stout.c
@@ -14,6 +14,7 @@
 #include <malloc.h>
 #include <netdev.h>
 #include <dm.h>
+#include <asm/global_data.h>
 #include <dm/platform_data/serial_sh.h>
 #include <env_internal.h>
 #include <asm/processor.h>
diff --git a/board/renesas/ulcb/ulcb.c b/board/renesas/ulcb/ulcb.c
index 07bc1ec7199..66aff8e1108 100644
--- a/board/renesas/ulcb/ulcb.c
+++ b/board/renesas/ulcb/ulcb.c
@@ -12,6 +12,7 @@
 #include <malloc.h>
 #include <netdev.h>
 #include <dm.h>
+#include <asm/global_data.h>
 #include <dm/platform_data/serial_sh.h>
 #include <asm/processor.h>
 #include <asm/mach-types.h>
diff --git a/board/rockchip/evb_rk3308/evb_rk3308.c b/board/rockchip/evb_rk3308/evb_rk3308.c
index 180f1fe4f00..e0c96fd70a2 100644
--- a/board/rockchip/evb_rk3308/evb_rk3308.c
+++ b/board/rockchip/evb_rk3308/evb_rk3308.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <adc.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/rockchip/evb_rv1108/evb_rv1108.c b/board/rockchip/evb_rv1108/evb_rv1108.c
index c57913828d7..719a6416287 100644
--- a/board/rockchip/evb_rv1108/evb_rv1108.c
+++ b/board/rockchip/evb_rv1108/evb_rv1108.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <init.h>
 #include <syscon.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch-rockchip/clock.h>
 #include <asm/arch-rockchip/grf_rv1108.h>
diff --git a/board/ronetix/pm9261/pm9261.c b/board/ronetix/pm9261/pm9261.c
index 0ce6a6e44e9..5be2c5e192b 100644
--- a/board/ronetix/pm9261/pm9261.c
+++ b/board/ronetix/pm9261/pm9261.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <init.h>
 #include <vsprintf.h>
+#include <asm/global_data.h>
 #include <linux/sizes.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
diff --git a/board/ronetix/pm9263/pm9263.c b/board/ronetix/pm9263/pm9263.c
index 62dfe6e33d7..95c0dec4db5 100644
--- a/board/ronetix/pm9263/pm9263.c
+++ b/board/ronetix/pm9263/pm9263.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <linux/sizes.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
diff --git a/board/ronetix/pm9g45/pm9g45.c b/board/ronetix/pm9g45/pm9g45.c
index c7d22db0aba..8d5825c7f13 100644
--- a/board/ronetix/pm9g45/pm9g45.c
+++ b/board/ronetix/pm9g45/pm9g45.c
@@ -12,6 +12,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <linux/sizes.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
diff --git a/board/samsung/arndale/arndale.c b/board/samsung/arndale/arndale.c
index 91813763cec..2742a7f32b2 100644
--- a/board/samsung/arndale/arndale.c
+++ b/board/samsung/arndale/arndale.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <log.h>
 #include <usb.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/arch/pinmux.h>
 #include <asm/arch/dwmmc.h>
diff --git a/board/samsung/common/board.c b/board/samsung/common/board.c
index 752d84ec05c..9eea11f755b 100644
--- a/board/samsung/common/board.c
+++ b/board/samsung/common/board.c
@@ -16,6 +16,7 @@
 #include <spi.h>
 #include <tmu.h>
 #include <netdev.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
 #include <asm/arch/board.h>
diff --git a/board/samsung/common/exynos5-dt-types.c b/board/samsung/common/exynos5-dt-types.c
index f1ecb7d2c39..e2d5a7c9ba7 100644
--- a/board/samsung/common/exynos5-dt-types.c
+++ b/board/samsung/common/exynos5-dt-types.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <fdtdec.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/board/samsung/common/exynos5-dt.c b/board/samsung/common/exynos5-dt.c
index 69aa2120e12..4463cdcb87b 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 <asm/global_data.h>
 #include <asm/io.h>
 #include <errno.h>
 #include <i2c.h>
diff --git a/board/samsung/common/misc.c b/board/samsung/common/misc.c
index 837463ba78f..7d3b9846e39 100644
--- a/board/samsung/common/misc.c
+++ b/board/samsung/common/misc.c
@@ -9,6 +9,7 @@
 #include <env.h>
 #include <lcd.h>
 #include <libtizen.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 #include <samsung/misc.h>
 #include <errno.h>
diff --git a/board/samsung/goni/goni.c b/board/samsung/goni/goni.c
index 2f0ef22c417..b32b82fc2da 100644
--- a/board/samsung/goni/goni.c
+++ b/board/samsung/goni/goni.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <init.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/arch/mmc.h>
 #include <dm.h>
diff --git a/board/samsung/odroid/odroid.c b/board/samsung/odroid/odroid.c
index 7d7e722892e..90aab62d33b 100644
--- a/board/samsung/odroid/odroid.c
+++ b/board/samsung/odroid/odroid.c
@@ -10,6 +10,7 @@
 #include <asm/arch/power.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/gpio.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/arch/cpu.h>
 #include <dm.h>
diff --git a/board/samsung/smdkc100/smdkc100.c b/board/samsung/smdkc100/smdkc100.c
index d034f53d68b..69ed715403f 100644
--- a/board/samsung/smdkc100/smdkc100.c
+++ b/board/samsung/smdkc100/smdkc100.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <init.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <asm/arch/sromc.h>
diff --git a/board/samsung/smdkv310/smdkv310.c b/board/samsung/smdkv310/smdkv310.c
index 24273f1214b..8811cbb9ad0 100644
--- a/board/samsung/smdkv310/smdkv310.c
+++ b/board/samsung/smdkv310/smdkv310.c
@@ -7,6 +7,7 @@
 #include <init.h>
 #include <log.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <netdev.h>
diff --git a/board/samsung/universal_c210/universal.c b/board/samsung/universal_c210/universal.c
index f50da6be724..9ef11b8471c 100644
--- a/board/samsung/universal_c210/universal.c
+++ b/board/samsung/universal_c210/universal.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <spi.h>
 #include <lcd.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
 #include <asm/arch/adc.h>
diff --git a/board/sandbox/sandbox.c b/board/sandbox/sandbox.c
index 937ce284111..c78e90accbc 100644
--- a/board/sandbox/sandbox.c
+++ b/board/sandbox/sandbox.c
@@ -11,6 +11,7 @@
 #include <init.h>
 #include <led.h>
 #include <os.h>
+#include <asm/global_data.h>
 #include <asm/test.h>
 #include <asm/u-boot-sandbox.h>
 
diff --git a/board/sandisk/sansa_fuze_plus/sfp.c b/board/sandisk/sansa_fuze_plus/sfp.c
index 42004098b37..f46b02e38e5 100644
--- a/board/sandisk/sansa_fuze_plus/sfp.c
+++ b/board/sandisk/sansa_fuze_plus/sfp.c
@@ -13,6 +13,7 @@
 #include <errno.h>
 #include <init.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <asm/arch/iomux-mx23.h>
diff --git a/board/sbc8349/sbc8349.c b/board/sbc8349/sbc8349.c
index 824479c099b..b440a0b17e9 100644
--- a/board/sbc8349/sbc8349.c
+++ b/board/sbc8349/sbc8349.c
@@ -13,6 +13,7 @@
 #include <ioports.h>
 #include <mpc83xx.h>
 #include <asm/bitops.h>
+#include <asm/global_data.h>
 #include <asm/mpc8349_pci.h>
 #include <i2c.h>
 #include <spd_sdram.h>
diff --git a/board/sbc8641d/sbc8641d.c b/board/sbc8641d/sbc8641d.c
index 34e46d4ea4c..a67092daf47 100644
--- a/board/sbc8641d/sbc8641d.c
+++ b/board/sbc8641d/sbc8641d.c
@@ -16,6 +16,7 @@
 #include <init.h>
 #include <log.h>
 #include <pci.h>
+#include <asm/global_data.h>
 #include <asm/processor.h>
 #include <asm/immap_86xx.h>
 #include <asm/fsl_pci.h>
diff --git a/board/schulercontrol/sc_sps_1/sc_sps_1.c b/board/schulercontrol/sc_sps_1/sc_sps_1.c
index 8011871fc8f..3a04b1a634c 100644
--- a/board/schulercontrol/sc_sps_1/sc_sps_1.c
+++ b/board/schulercontrol/sc_sps_1/sc_sps_1.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <init.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/seco/mx6quq7/mx6quq7.c b/board/seco/mx6quq7/mx6quq7.c
index c7e3d425eac..a061d7d8afb 100644
--- a/board/seco/mx6quq7/mx6quq7.c
+++ b/board/seco/mx6quq7/mx6quq7.c
@@ -13,6 +13,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/mx6-pins.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
diff --git a/board/siemens/capricorn/spl.c b/board/siemens/capricorn/spl.c
index 8435bd3863b..8e077d73aef 100644
--- a/board/siemens/capricorn/spl.c
+++ b/board/siemens/capricorn/spl.c
@@ -9,6 +9,7 @@
 #include <init.h>
 #include <spl.h>
 #include <dm.h>
+#include <asm/global_data.h>
 #include <dm/uclass.h>
 #include <dm/device.h>
 #include <dm/uclass-internal.h>
diff --git a/board/siemens/common/board.c b/board/siemens/common/board.c
index e0bd8590bc9..1bdf404ac3e 100644
--- a/board/siemens/common/board.c
+++ b/board/siemens/common/board.c
@@ -25,6 +25,7 @@
 #include <asm/arch/gpio.h>
 #include <asm/arch/mmc_host_def.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/emif.h>
 #include <asm/gpio.h>
diff --git a/board/siemens/corvus/board.c b/board/siemens/corvus/board.c
index eed055aedb3..2acd3226cf2 100644
--- a/board/siemens/corvus/board.c
+++ b/board/siemens/corvus/board.c
@@ -14,6 +14,7 @@
 #include <dm.h>
 #include <init.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/at91sam9g45_matrix.h>
 #include <asm/arch/at91sam9_smc.h>
diff --git a/board/siemens/smartweb/smartweb.c b/board/siemens/smartweb/smartweb.c
index c6bdd970837..d500a6214d5 100644
--- a/board/siemens/smartweb/smartweb.c
+++ b/board/siemens/smartweb/smartweb.c
@@ -19,6 +19,7 @@
 #include <dm.h>
 #include <init.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/at91sam9_sdramc.h>
 #include <asm/arch/at91sam9260_matrix.h>
diff --git a/board/siemens/taurus/taurus.c b/board/siemens/taurus/taurus.c
index 91e29f06f60..cad16f90656 100644
--- a/board/siemens/taurus/taurus.c
+++ b/board/siemens/taurus/taurus.c
@@ -17,6 +17,7 @@
 #include <env.h>
 #include <flash.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/at91sam9260_matrix.h>
 #include <asm/arch/at91sam9_smc.h>
diff --git a/board/sks-kinkel/sksimx6/sksimx6.c b/board/sks-kinkel/sksimx6/sksimx6.c
index 9fdbeac82fd..cec3ade96cf 100644
--- a/board/sks-kinkel/sksimx6/sksimx6.c
+++ b/board/sks-kinkel/sksimx6/sksimx6.c
@@ -11,6 +11,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/mx6-pins.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
diff --git a/board/socrates/socrates.c b/board/socrates/socrates.c
index 25bc664328a..0c9262d3540 100644
--- a/board/socrates/socrates.c
+++ b/board/socrates/socrates.c
@@ -16,6 +16,7 @@
 #include <init.h>
 #include <pci.h>
 #include <uuid.h>
+#include <asm/global_data.h>
 #include <asm/processor.h>
 #include <asm/immap_85xx.h>
 #include <ioports.h>
diff --git a/board/softing/vining_2000/vining_2000.c b/board/softing/vining_2000/vining_2000.c
index 4e9d351582f..aaeeee361e5 100644
--- a/board/softing/vining_2000/vining_2000.c
+++ b/board/softing/vining_2000/vining_2000.c
@@ -14,6 +14,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/mx6-pins.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/io.h>
diff --git a/board/softing/vining_fpga/socfpga.c b/board/softing/vining_fpga/socfpga.c
index 7e311b7a1c3..aaedf034504 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 <asm/arch/reset_manager.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
 #include <i2c.h>
diff --git a/board/solidrun/clearfog/clearfog.c b/board/solidrun/clearfog/clearfog.c
index d5535ebebec..3a2f8b81788 100644
--- a/board/solidrun/clearfog/clearfog.c
+++ b/board/solidrun/clearfog/clearfog.c
@@ -10,6 +10,7 @@
 #include <miiphy.h>
 #include <net.h>
 #include <netdev.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
diff --git a/board/solidrun/common/tlv_data.c b/board/solidrun/common/tlv_data.c
index f08ac8975a6..11d6e4a1380 100644
--- a/board/solidrun/common/tlv_data.c
+++ b/board/solidrun/common/tlv_data.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <tlv_eeprom.h>
 #include "tlv_data.h"
 
diff --git a/board/solidrun/mx6cuboxi/mx6cuboxi.c b/board/solidrun/mx6cuboxi/mx6cuboxi.c
index ae1c04df87d..3eadc38f6fd 100644
--- a/board/solidrun/mx6cuboxi/mx6cuboxi.c
+++ b/board/solidrun/mx6cuboxi/mx6cuboxi.c
@@ -23,6 +23,7 @@
 #include <asm/arch/mx6-pins.h>
 #include <asm/arch/mxc_hdmi.h>
 #include <env.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
diff --git a/board/somlabs/visionsom-6ull/visionsom-6ull.c b/board/somlabs/visionsom-6ull/visionsom-6ull.c
index bc7257be405..076c641d8a9 100644
--- a/board/somlabs/visionsom-6ull/visionsom-6ull.c
+++ b/board/somlabs/visionsom-6ull/visionsom-6ull.c
@@ -11,6 +11,7 @@
 #include <asm/arch/iomux.h>
 #include <asm/arch/mx6-pins.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/mach-imx/boot_mode.h>
 #include <asm/mach-imx/iomux-v3.h>
diff --git a/board/st/common/stm32mp_mtdparts.c b/board/st/common/stm32mp_mtdparts.c
index 9f5897f8c86..ef32df04fef 100644
--- a/board/st/common/stm32mp_mtdparts.c
+++ b/board/st/common/stm32mp_mtdparts.c
@@ -13,6 +13,7 @@
 #include <tee.h>
 #include <asm/arch/stm32prog.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 
 #define MTDPARTS_LEN		256
 #define MTDIDS_LEN		128
diff --git a/board/st/stih410-b2260/board.c b/board/st/stih410-b2260/board.c
index b1147f2e1a7..b87468cca21 100644
--- a/board/st/stih410-b2260/board.c
+++ b/board/st/stih410-b2260/board.c
@@ -8,6 +8,7 @@
 #include <cpu_func.h>
 #include <init.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <linux/usb/otg.h>
 #include <dwc3-sti-glue.h>
 #include <dwc3-uboot.h>
diff --git a/board/st/stm32f429-discovery/stm32f429-discovery.c b/board/st/stm32f429-discovery/stm32f429-discovery.c
index ee6a90c9fdd..9d8fc9f5a2e 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 <asm/global_data.h>
 
 #include <asm/io.h>
 #include <asm/arch/stm32.h>
diff --git a/board/st/stm32f429-evaluation/stm32f429-evaluation.c b/board/st/stm32f429-evaluation/stm32f429-evaluation.c
index 92e3d40a1b6..35e71380b89 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 <asm/global_data.h>
 
 #include <asm/io.h>
 #include <asm/arch/stm32.h>
diff --git a/board/st/stm32f469-discovery/stm32f469-discovery.c b/board/st/stm32f469-discovery/stm32f469-discovery.c
index 85988acb241..fcc34e7955a 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 <asm/global_data.h>
 
 #include <asm/io.h>
 #include <asm/arch/stm32.h>
diff --git a/board/st/stm32f746-disco/stm32f746-disco.c b/board/st/stm32f746-disco/stm32f746-disco.c
index 0f728fd9f9e..40450ca914b 100644
--- a/board/st/stm32f746-disco/stm32f746-disco.c
+++ b/board/st/stm32f746-disco/stm32f746-disco.c
@@ -17,6 +17,7 @@
 #include <splash.h>
 #include <st_logo_data.h>
 #include <video.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/armv7m.h>
 #include <asm/arch/stm32.h>
diff --git a/board/st/stm32h743-disco/stm32h743-disco.c b/board/st/stm32h743-disco/stm32h743-disco.c
index 0484c3c2504..53bf0922197 100644
--- a/board/st/stm32h743-disco/stm32h743-disco.c
+++ b/board/st/stm32h743-disco/stm32h743-disco.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <init.h>
 #include <log.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/st/stm32h743-eval/stm32h743-eval.c b/board/st/stm32h743-eval/stm32h743-eval.c
index 0484c3c2504..53bf0922197 100644
--- a/board/st/stm32h743-eval/stm32h743-eval.c
+++ b/board/st/stm32h743-eval/stm32h743-eval.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <init.h>
 #include <log.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/st/stm32mp1/stm32mp1.c b/board/st/stm32mp1/stm32mp1.c
index 1d274c3157f..a73157f0fc6 100644
--- a/board/st/stm32mp1/stm32mp1.c
+++ b/board/st/stm32mp1/stm32mp1.c
@@ -29,6 +29,7 @@
 #include <syscon.h>
 #include <usb.h>
 #include <watchdog.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
 #include <asm/arch/stm32.h>
diff --git a/board/st/stv0991/stv0991.c b/board/st/stv0991/stv0991.c
index 8c827adc2ed..72399cf5f65 100644
--- a/board/st/stv0991/stv0991.c
+++ b/board/st/stv0991/stv0991.c
@@ -15,6 +15,7 @@
 #include <asm/arch/hardware.h>
 #include <asm/arch/gpio.h>
 #include <netdev.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm/platform_data/serial_pl01x.h>
 
diff --git a/board/ste/stemmy/stemmy.c b/board/ste/stemmy/stemmy.c
index f7834c08fc2..b9b2a6fddc2 100644
--- a/board/ste/stemmy/stemmy.c
+++ b/board/ste/stemmy/stemmy.c
@@ -4,6 +4,7 @@
  */
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/sunxi/board.c b/board/sunxi/board.c
index 71e2b758a3e..87c231f38f9 100644
--- a/board/sunxi/board.c
+++ b/board/sunxi/board.c
@@ -28,6 +28,7 @@
 #include <asm/arch/gpio.h>
 #include <asm/arch/mmc.h>
 #include <asm/arch/spl.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 #include <u-boot/crc.h>
 #ifndef CONFIG_ARM64
diff --git a/board/synopsys/axs10x/axs10x.c b/board/synopsys/axs10x/axs10x.c
index b4a1d4c5dff..75e4d037623 100644
--- a/board/synopsys/axs10x/axs10x.c
+++ b/board/synopsys/axs10x/axs10x.c
@@ -9,6 +9,7 @@
 #include <init.h>
 #include <malloc.h>
 #include <asm/arcregs.h>
+#include <asm/global_data.h>
 #include "axs10x.h"
 #include <asm/cache.h>
 
diff --git a/board/synopsys/emsdp/emsdp.c b/board/synopsys/emsdp/emsdp.c
index 91fa94a638e..997120ec5e1 100644
--- a/board/synopsys/emsdp/emsdp.c
+++ b/board/synopsys/emsdp/emsdp.c
@@ -9,6 +9,7 @@
 #include <dwmmc.h>
 #include <init.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <linux/bitops.h>
 
 #include <asm/arcregs.h>
diff --git a/board/synopsys/hsdk/hsdk.c b/board/synopsys/hsdk/hsdk.c
index cd11f9dac06..892b94bb083 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 <asm/cache.h>
+#include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/printk.h>
diff --git a/board/synopsys/iot_devkit/iot_devkit.c b/board/synopsys/iot_devkit/iot_devkit.c
index 497ea186d3a..c6051363c1f 100644
--- a/board/synopsys/iot_devkit/iot_devkit.c
+++ b/board/synopsys/iot_devkit/iot_devkit.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <malloc.h>
 #include <dwmmc.h>
+#include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/libfdt.h>
 #include <fdtdec.h>
diff --git a/board/sysam/amcore/amcore.c b/board/sysam/amcore/amcore.c
index 4502005941f..9e1b8022705 100644
--- a/board/sysam/amcore/amcore.c
+++ b/board/sysam/amcore/amcore.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/immap.h>
 #include <asm/io.h>
 #include <dm.h>
diff --git a/board/sysam/stmark2/stmark2.c b/board/sysam/stmark2/stmark2.c
index ce8b541ccdf..d48da48b69d 100644
--- a/board/sysam/stmark2/stmark2.c
+++ b/board/sysam/stmark2/stmark2.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <init.h>
 #include <spi.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/immap.h>
 #include <mmc.h>
diff --git a/board/syteco/zmx25/zmx25.c b/board/syteco/zmx25/zmx25.c
index d5393d70597..2d4c5cce892 100644
--- a/board/syteco/zmx25/zmx25.c
+++ b/board/syteco/zmx25/zmx25.c
@@ -17,6 +17,7 @@
 #include <cpu_func.h>
 #include <env.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/tbs/tbs2910/tbs2910.c b/board/tbs/tbs2910/tbs2910.c
index d32517f998a..ac1b8231281 100644
--- a/board/tbs/tbs2910/tbs2910.c
+++ b/board/tbs/tbs2910/tbs2910.c
@@ -3,11 +3,13 @@
  * Copyright (C) 2014 Soeren Moch <smoch@web.de>
  */
 
+#include <common.h>
 #include <init.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/mx6-pins.h>
+#include <asm/global_data.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
 #include <asm/mach-imx/iomux-v3.h>
diff --git a/board/tcl/sl50/board.c b/board/tcl/sl50/board.c
index 230481be0de..4821925c026 100644
--- a/board/tcl/sl50/board.c
+++ b/board/tcl/sl50/board.c
@@ -23,6 +23,7 @@
 #include <asm/arch/mmc_host_def.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/mem.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/emif.h>
 #include <asm/gpio.h>
diff --git a/board/technexion/pico-imx6/pico-imx6.c b/board/technexion/pico-imx6/pico-imx6.c
index da82244b397..6b9c4f4373c 100644
--- a/board/technexion/pico-imx6/pico-imx6.c
+++ b/board/technexion/pico-imx6/pico-imx6.c
@@ -6,6 +6,7 @@
  * Author: Fabio Estevam <festevam@gmail.com>
  */
 
+#include <common.h>
 #include <env.h>
 #include <init.h>
 #include <net.h>
@@ -15,6 +16,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/mx6-pins.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/arch/mxc_hdmi.h>
 #include <asm/mach-imx/video.h>
@@ -22,7 +24,6 @@
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <linux/sizes.h>
-#include <common.h>
 #include <miiphy.h>
 #include <netdev.h>
 #include <phy.h>
diff --git a/board/technexion/pico-imx6ul/pico-imx6ul.c b/board/technexion/pico-imx6ul/pico-imx6ul.c
index 5d6be26faa1..c9f553bdfd5 100644
--- a/board/technexion/pico-imx6ul/pico-imx6ul.c
+++ b/board/technexion/pico-imx6ul/pico-imx6ul.c
@@ -13,6 +13,7 @@
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/mx6-pins.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/io.h>
diff --git a/board/technexion/pico-imx7d/pico-imx7d.c b/board/technexion/pico-imx7d/pico-imx7d.c
index a6fd49d729c..2d749dac19a 100644
--- a/board/technexion/pico-imx7d/pico-imx7d.c
+++ b/board/technexion/pico-imx7d/pico-imx7d.c
@@ -10,6 +10,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/mx7-pins.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/mach-imx/mxc_i2c.h>
diff --git a/board/technexion/pico-imx8mq/pico-imx8mq.c b/board/technexion/pico-imx8mq/pico-imx8mq.c
index 330de7137c3..951e3e1985b 100644
--- a/board/technexion/pico-imx8mq/pico-imx8mq.c
+++ b/board/technexion/pico-imx8mq/pico-imx8mq.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <malloc.h>
 #include <errno.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <miiphy.h>
 #include <netdev.h>
diff --git a/board/technexion/pico-imx8mq/spl.c b/board/technexion/pico-imx8mq/spl.c
index b181f797a77..8b853a914e8 100644
--- a/board/technexion/pico-imx8mq/spl.c
+++ b/board/technexion/pico-imx8mq/spl.c
@@ -11,6 +11,7 @@
 #include <asm/arch/ddr.h>
 #include <asm/arch/imx8mq_pins.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/mach-imx/gpio.h>
 #include <asm/mach-imx/iomux-v3.h>
diff --git a/board/technexion/tao3530/tao3530.c b/board/technexion/tao3530/tao3530.c
index 84db131de2b..0c9dca31e67 100644
--- a/board/technexion/tao3530/tao3530.c
+++ b/board/technexion/tao3530/tao3530.c
@@ -9,6 +9,7 @@
 #include <malloc.h>
 #include <netdev.h>
 #include <twl4030.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/mmc_host_def.h>
 #include <asm/arch/mem.h>
diff --git a/board/technologic/ts4600/ts4600.c b/board/technologic/ts4600/ts4600.c
index 0ef306d58a2..b9cce821d96 100644
--- a/board/technologic/ts4600/ts4600.c
+++ b/board/technologic/ts4600/ts4600.c
@@ -15,6 +15,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/technologic/ts4800/ts4800.c b/board/technologic/ts4800/ts4800.c
index fe36fb7ffab..a309e58b27f 100644
--- a/board/technologic/ts4800/ts4800.c
+++ b/board/technologic/ts4800/ts4800.c
@@ -10,6 +10,7 @@
 #include <init.h>
 #include <log.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/theadorable/theadorable.c b/board/theadorable/theadorable.c
index 67bc00b65b0..3c4133083f5 100644
--- a/board/theadorable/theadorable.c
+++ b/board/theadorable/theadorable.c
@@ -13,6 +13,7 @@
 #if !defined(CONFIG_SPL_BUILD)
 #include <bootcount.h>
 #endif
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
diff --git a/board/ti/am335x/board.c b/board/ti/am335x/board.c
index 984cc5e3ba5..211a9bf7446 100644
--- a/board/ti/am335x/board.c
+++ b/board/ti/am335x/board.c
@@ -27,6 +27,7 @@
 #include <asm/arch/mmc_host_def.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/mem.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/emif.h>
 #include <asm/gpio.h>
diff --git a/board/ti/am3517crane/am3517crane.c b/board/ti/am3517crane/am3517crane.c
index f32d1757db7..b1017d6c9b7 100644
--- a/board/ti/am3517crane/am3517crane.c
+++ b/board/ti/am3517crane/am3517crane.c
@@ -11,6 +11,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/mmc_host_def.h>
 #include <asm/arch/mem.h>
diff --git a/board/ti/am43xx/board.c b/board/ti/am43xx/board.c
index de495900315..8f5bf3581f4 100644
--- a/board/ti/am43xx/board.c
+++ b/board/ti/am43xx/board.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <eeprom.h>
 #include <image.h>
+#include <asm/global_data.h>
 #include <dm/uclass.h>
 #include <env.h>
 #include <fdt_support.h>
diff --git a/board/ti/am57xx/board.c b/board/ti/am57xx/board.c
index 69dce70a601..be09d719cbe 100644
--- a/board/ti/am57xx/board.c
+++ b/board/ti/am57xx/board.c
@@ -19,6 +19,7 @@
 #include <serial.h>
 #include <usb.h>
 #include <errno.h>
+#include <asm/global_data.h>
 #include <asm/omap_common.h>
 #include <asm/omap_sec_common.h>
 #include <asm/emif.h>
diff --git a/board/ti/am65x/evm.c b/board/ti/am65x/evm.c
index 2eb8235c698..3387f4df093 100644
--- a/board/ti/am65x/evm.c
+++ b/board/ti/am65x/evm.c
@@ -15,6 +15,7 @@
 #include <net.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/hardware.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <asm/omap_common.h>
diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c
index 6bd59eb10c2..888a9584919 100644
--- a/board/ti/beagle/beagle.c
+++ b/board/ti/beagle/beagle.c
@@ -24,6 +24,7 @@
 #include <status_led.h>
 #endif
 #include <twl4030.h>
+#include <asm/global_data.h>
 #include <linux/mtd/rawnand.h>
 #include <asm/io.h>
 #include <asm/arch/mmc_host_def.h>
diff --git a/board/ti/dra7xx/evm.c b/board/ti/dra7xx/evm.c
index 5ae179f69b9..851471cd130 100644
--- a/board/ti/dra7xx/evm.c
+++ b/board/ti/dra7xx/evm.c
@@ -19,6 +19,7 @@
 #include <palmas.h>
 #include <sata.h>
 #include <serial.h>
+#include <asm/global_data.h>
 #include <linux/string.h>
 #include <asm/gpio.h>
 #include <usb.h>
diff --git a/board/ti/evm/evm.c b/board/ti/evm/evm.c
index 193b3eb576c..573b75e076b 100644
--- a/board/ti/evm/evm.c
+++ b/board/ti/evm/evm.c
@@ -18,6 +18,7 @@
 #include <ns16550.h>
 #include <netdev.h>
 #include <serial.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/mem.h>
 #include <asm/arch/mux.h>
diff --git a/board/ti/j721e/evm.c b/board/ti/j721e/evm.c
index a1e8fe59c4d..656dde3e303 100644
--- a/board/ti/j721e/evm.c
+++ b/board/ti/j721e/evm.c
@@ -16,6 +16,7 @@
 #include <net.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/hardware.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <spl.h>
diff --git a/board/ti/ks2_evm/board.c b/board/ti/ks2_evm/board.c
index c7be5400289..9e5f08e3372 100644
--- a/board/ti/ks2_evm/board.c
+++ b/board/ti/ks2_evm/board.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <asm/global_data.h>
 #include "board.h"
 #include <env.h>
 #include <hang.h>
diff --git a/board/ti/omap5_uevm/evm.c b/board/ti/omap5_uevm/evm.c
index 88f56edc54e..4777622156b 100644
--- a/board/ti/omap5_uevm/evm.c
+++ b/board/ti/omap5_uevm/evm.c
@@ -15,6 +15,7 @@
 #include <serial.h>
 #include <tca642x.h>
 #include <usb.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/usb/gadget.h>
 #include <dwc3-uboot.h>
diff --git a/board/ti/panda/panda.c b/board/ti/panda/panda.c
index f718e69e85d..fda8d5f3c83 100644
--- a/board/ti/panda/panda.c
+++ b/board/ti/panda/panda.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <net.h>
 #include <serial.h>
+#include <asm/global_data.h>
 #include <asm/mach-types.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/mmc_host_def.h>
diff --git a/board/ti/sdp4430/sdp.c b/board/ti/sdp4430/sdp.c
index 3fd973049a8..4895bfafd80 100644
--- a/board/ti/sdp4430/sdp.c
+++ b/board/ti/sdp4430/sdp.c
@@ -12,6 +12,7 @@
 #include <serial.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/mmc_host_def.h>
+#include <asm/global_data.h>
 
 #include "sdp4430_mux_data.h"
 
diff --git a/board/ti/ti816x/evm.c b/board/ti/ti816x/evm.c
index becece1c205..2d42af6b809 100644
--- a/board/ti/ti816x/evm.c
+++ b/board/ti/ti816x/evm.c
@@ -12,6 +12,7 @@
 #include <net.h>
 #include <spl.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/cpu.h>
diff --git a/board/timll/devkit3250/devkit3250.c b/board/timll/devkit3250/devkit3250.c
index f4eaf15970b..3c744b943f4 100644
--- a/board/timll/devkit3250/devkit3250.c
+++ b/board/timll/devkit3250/devkit3250.c
@@ -12,6 +12,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/emc.h>
 #include <asm/arch/wdt.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/delay.h>
 
diff --git a/board/timll/devkit8000/devkit8000.c b/board/timll/devkit8000/devkit8000.c
index 2420c28974c..5af88318062 100644
--- a/board/timll/devkit8000/devkit8000.c
+++ b/board/timll/devkit8000/devkit8000.c
@@ -22,6 +22,7 @@
 #include <malloc.h>
 #include <ns16550.h>
 #include <twl4030.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/mmc_host_def.h>
 #include <asm/arch/mux.h>
diff --git a/board/toradex/apalis-imx8/apalis-imx8.c b/board/toradex/apalis-imx8/apalis-imx8.c
index 9263b0f51fa..6e8594a6472 100644
--- a/board/toradex/apalis-imx8/apalis-imx8.c
+++ b/board/toradex/apalis-imx8/apalis-imx8.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <init.h>
+#include <asm/global_data.h>
 
 #include <asm/arch/clock.h>
 #include <asm/arch/imx8-pins.h>
diff --git a/board/toradex/apalis_imx6/apalis_imx6.c b/board/toradex/apalis_imx6/apalis_imx6.c
index 3961c4df9e2..17f6094687b 100644
--- a/board/toradex/apalis_imx6/apalis_imx6.c
+++ b/board/toradex/apalis_imx6/apalis_imx6.c
@@ -12,6 +12,7 @@
 #include <image.h>
 #include <init.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 
diff --git a/board/toradex/apalis_t30/apalis_t30.c b/board/toradex/apalis_t30/apalis_t30.c
index f718dc855d4..0396eea56b5 100644
--- a/board/toradex/apalis_t30/apalis_t30.c
+++ b/board/toradex/apalis_t30/apalis_t30.c
@@ -11,6 +11,7 @@
 #include <asm/arch/pinmux.h>
 #include <asm/arch-tegra/ap.h>
 #include <asm/arch-tegra/tegra.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <dm.h>
diff --git a/board/toradex/colibri-imx6ull/colibri-imx6ull.c b/board/toradex/colibri-imx6ull/colibri-imx6ull.c
index 55e2b5f05da..8e9b74f6479 100644
--- a/board/toradex/colibri-imx6ull/colibri-imx6ull.c
+++ b/board/toradex/colibri-imx6ull/colibri-imx6ull.c
@@ -4,6 +4,7 @@
  */
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 
 #include <asm/arch/clock.h>
diff --git a/board/toradex/colibri-imx8x/colibri-imx8x.c b/board/toradex/colibri-imx8x/colibri-imx8x.c
index f981c11a37c..9531ec64a5d 100644
--- a/board/toradex/colibri-imx8x/colibri-imx8x.c
+++ b/board/toradex/colibri-imx8x/colibri-imx8x.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <init.h>
+#include <asm/global_data.h>
 
 #include <asm/arch/clock.h>
 #include <asm/arch/imx8-pins.h>
diff --git a/board/toradex/colibri_imx6/colibri_imx6.c b/board/toradex/colibri_imx6/colibri_imx6.c
index a416b5e54b3..64a8406ec77 100644
--- a/board/toradex/colibri_imx6/colibri_imx6.c
+++ b/board/toradex/colibri_imx6/colibri_imx6.c
@@ -12,6 +12,7 @@
 #include <env.h>
 #include <init.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 
diff --git a/board/toradex/colibri_imx7/colibri_imx7.c b/board/toradex/colibri_imx7/colibri_imx7.c
index 26c285d88c6..11560ee0677 100644
--- a/board/toradex/colibri_imx7/colibri_imx7.c
+++ b/board/toradex/colibri_imx7/colibri_imx7.c
@@ -12,6 +12,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/mx7-pins.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/io.h>
diff --git a/board/toradex/colibri_pxa270/colibri_pxa270.c b/board/toradex/colibri_pxa270/colibri_pxa270.c
index 273a17f608d..bc7a79f0b34 100644
--- a/board/toradex/colibri_pxa270/colibri_pxa270.c
+++ b/board/toradex/colibri_pxa270/colibri_pxa270.c
@@ -15,6 +15,7 @@
 #include <asm/arch/pxa.h>
 #include <asm/arch/regs-mmc.h>
 #include <asm/arch/regs-uart.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm/platdata.h>
 #include <dm/platform_data/pxa_mmc_gen.h>
diff --git a/board/toradex/colibri_t20/colibri_t20.c b/board/toradex/colibri_t20/colibri_t20.c
index f44ca90ce96..73ef4d2db32 100644
--- a/board/toradex/colibri_t20/colibri_t20.c
+++ b/board/toradex/colibri_t20/colibri_t20.c
@@ -12,6 +12,7 @@
 #include <asm/arch-tegra/ap.h>
 #include <asm/arch-tegra/board.h>
 #include <asm/arch-tegra/tegra.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <i2c.h>
diff --git a/board/toradex/colibri_vf/colibri_vf.c b/board/toradex/colibri_vf/colibri_vf.c
index 7194ede01cb..e9c5bc06322 100644
--- a/board/toradex/colibri_vf/colibri_vf.c
+++ b/board/toradex/colibri_vf/colibri_vf.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 
 #include <asm/arch/clock.h>
 #include <asm/arch/crm_regs.h>
diff --git a/board/toradex/common/tdx-cfg-block.c b/board/toradex/common/tdx-cfg-block.c
index 75216ecf6d3..ad0a4307a26 100644
--- a/board/toradex/common/tdx-cfg-block.c
+++ b/board/toradex/common/tdx-cfg-block.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <asm/global_data.h>
 #include "tdx-cfg-block.h"
 #include <command.h>
 #include <asm/cache.h>
diff --git a/board/toradex/verdin-imx8mm/spl.c b/board/toradex/verdin-imx8mm/spl.c
index cc78c5666bb..588da0aeba6 100644
--- a/board/toradex/verdin-imx8mm/spl.c
+++ b/board/toradex/verdin-imx8mm/spl.c
@@ -12,6 +12,7 @@
 #include <asm/arch/ddr.h>
 #include <asm/arch/imx8mm_pins.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/mach-imx/boot_mode.h>
 #include <asm/mach-imx/iomux-v3.h>
diff --git a/board/toradex/verdin-imx8mm/verdin-imx8mm.c b/board/toradex/verdin-imx8mm/verdin-imx8mm.c
index 66950ed218b..1161b5c31d9 100644
--- a/board/toradex/verdin-imx8mm/verdin-imx8mm.c
+++ b/board/toradex/verdin-imx8mm/verdin-imx8mm.c
@@ -7,6 +7,7 @@
 #include <init.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <miiphy.h>
 #include <netdev.h>
diff --git a/board/tqc/tqm834x/tqm834x.c b/board/tqc/tqm834x/tqm834x.c
index c16784324c9..17b4662c167 100644
--- a/board/tqc/tqm834x/tqm834x.c
+++ b/board/tqc/tqm834x/tqm834x.c
@@ -10,6 +10,7 @@
 #include <ioports.h>
 #include <log.h>
 #include <mpc83xx.h>
+#include <asm/global_data.h>
 #include <asm/mpc8349_pci.h>
 #include <i2c.h>
 #include <miiphy.h>
diff --git a/board/tqc/tqma6/tqma6.c b/board/tqc/tqma6/tqma6.c
index 2df901a584c..26d557cece9 100644
--- a/board/tqc/tqma6/tqma6.c
+++ b/board/tqc/tqma6/tqma6.c
@@ -15,6 +15,7 @@
 #include <asm/arch/sys_proto.h>
 #include <env.h>
 #include <fdt_support.h>
+#include <asm/global_data.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
diff --git a/board/udoo/neo/neo.c b/board/udoo/neo/neo.c
index c6edc724405..653ca1ca5a6 100644
--- a/board/udoo/neo/neo.c
+++ b/board/udoo/neo/neo.c
@@ -15,6 +15,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/mx6-pins.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/mach-imx/iomux-v3.h>
 #include <env.h>
diff --git a/board/udoo/udoo.c b/board/udoo/udoo.c
index 62b32ae7595..d83f23dd358 100644
--- a/board/udoo/udoo.c
+++ b/board/udoo/udoo.c
@@ -13,6 +13,7 @@
 #include <env.h>
 #include <malloc.h>
 #include <asm/arch/mx6-pins.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
diff --git a/board/variscite/dart_6ul/dart_6ul.c b/board/variscite/dart_6ul/dart_6ul.c
index d8e383d323e..1c52cfd882e 100644
--- a/board/variscite/dart_6ul/dart_6ul.c
+++ b/board/variscite/dart_6ul/dart_6ul.c
@@ -10,6 +10,7 @@
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/mx6-pins.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/mach-imx/mxc_i2c.h>
 #include <fsl_esdhc_imx.h>
diff --git a/board/varisys/cyrus/ddr.c b/board/varisys/cyrus/ddr.c
index 7949eb88c07..184948094db 100644
--- a/board/varisys/cyrus/ddr.c
+++ b/board/varisys/cyrus/ddr.c
@@ -8,6 +8,7 @@
 #include <hwconfig.h>
 #include <init.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/mmu.h>
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
diff --git a/board/ve8313/ve8313.c b/board/ve8313/ve8313.c
index 6cdb1104716..78d401e955e 100644
--- a/board/ve8313/ve8313.c
+++ b/board/ve8313/ve8313.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <fdt_support.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 #include <pci.h>
diff --git a/board/vscom/baltos/board.c b/board/vscom/baltos/board.c
index afe12466df3..4175d414694 100644
--- a/board/vscom/baltos/board.c
+++ b/board/vscom/baltos/board.c
@@ -13,6 +13,7 @@
 #include <init.h>
 #include <net.h>
 #include <serial.h>
+#include <asm/global_data.h>
 #include <linux/libfdt.h>
 #include <spl.h>
 #include <asm/arch/cpu.h>
diff --git a/board/wandboard/wandboard.c b/board/wandboard/wandboard.c
index e0e01b1a4a4..53299c87010 100644
--- a/board/wandboard/wandboard.c
+++ b/board/wandboard/wandboard.c
@@ -17,6 +17,7 @@
 #include <asm/arch/mx6-pins.h>
 #include <asm/arch/mxc_hdmi.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/mach-imx/mxc_i2c.h>
diff --git a/board/warp/warp.c b/board/warp/warp.c
index 85da9c1bd43..0f1d038fabd 100644
--- a/board/warp/warp.c
+++ b/board/warp/warp.c
@@ -13,6 +13,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/mx6-pins.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/mach-imx/mxc_i2c.h>
diff --git a/board/warp7/warp7.c b/board/warp7/warp7.c
index aaa7006d3b2..0f202241dd7 100644
--- a/board/warp7/warp7.c
+++ b/board/warp7/warp7.c
@@ -10,6 +10,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/mx7-pins.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/mach-imx/hab.h>
 #include <asm/mach-imx/iomux-v3.h>
diff --git a/board/work-microwave/work_92105/work_92105.c b/board/work-microwave/work_92105/work_92105.c
index 2e0def5b64f..bdcecff7308 100644
--- a/board/work-microwave/work_92105/work_92105.c
+++ b/board/work-microwave/work_92105/work_92105.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/cpu.h>
diff --git a/board/xes/xpedite517x/xpedite517x.c b/board/xes/xpedite517x/xpedite517x.c
index 2c9499ab20b..8a5b52c4952 100644
--- a/board/xes/xpedite517x/xpedite517x.c
+++ b/board/xes/xpedite517x/xpedite517x.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/processor.h>
 #include <fsl_ddr_sdram.h>
 #include <asm/mmu.h>
diff --git a/board/xilinx/common/board.c b/board/xilinx/common/board.c
index 0469e2e7ac9..458eef45adf 100644
--- a/board/xilinx/common/board.c
+++ b/board/xilinx/common/board.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <env.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/sections.h>
 #include <dm/uclass.h>
 #include <i2c.h>
diff --git a/board/xilinx/microblaze-generic/microblaze-generic.c b/board/xilinx/microblaze-generic/microblaze-generic.c
index 4e569e910d9..7729ce915ea 100644
--- a/board/xilinx/microblaze-generic/microblaze-generic.c
+++ b/board/xilinx/microblaze-generic/microblaze-generic.c
@@ -15,6 +15,7 @@
 #include <env.h>
 #include <init.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <dm/lists.h>
 #include <fdtdec.h>
 #include <linux/sizes.h>
diff --git a/board/xilinx/versal/board.c b/board/xilinx/versal/board.c
index 45cf1d2d0ca..55da0df75c4 100644
--- a/board/xilinx/versal/board.c
+++ b/board/xilinx/versal/board.c
@@ -13,6 +13,7 @@
 #include <malloc.h>
 #include <time.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/sys_proto.h>
diff --git a/board/xilinx/zynq/board.c b/board/xilinx/zynq/board.c
index 2164eac8d51..09e4184e172 100644
--- a/board/xilinx/zynq/board.c
+++ b/board/xilinx/zynq/board.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <dm/uclass.h>
 #include <env.h>
 #include <fdtdec.h>
diff --git a/board/xilinx/zynq/bootimg.c b/board/xilinx/zynq/bootimg.c
index 481f012c282..2f55078dd76 100644
--- a/board/xilinx/zynq/bootimg.c
+++ b/board/xilinx/zynq/bootimg.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <log.h>
 #include <part.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/sys_proto.h>
diff --git a/board/xilinx/zynq/cmds.c b/board/xilinx/zynq/cmds.c
index 73e2b0eac7e..6c697caa625 100644
--- a/board/xilinx/zynq/cmds.c
+++ b/board/xilinx/zynq/cmds.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <command.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.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 ebb71729081..a64174a915c 100644
--- a/board/xilinx/zynqmp/zynqmp.c
+++ b/board/xilinx/zynqmp/zynqmp.c
@@ -22,6 +22,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/psu_init_gpl.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/ptrace.h>
 #include <dm/device.h>
diff --git a/board/zyxel/nsa310s/nsa310s.c b/board/zyxel/nsa310s/nsa310s.c
index 3f71e3da446..cd4a7723b12 100644
--- a/board/zyxel/nsa310s/nsa310s.c
+++ b/board/zyxel/nsa310s/nsa310s.c
@@ -12,6 +12,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
 #include <asm/arch/mpp.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include "nsa310s.h"
 
diff --git a/cmd/acpi.c b/cmd/acpi.c
index 085a3a650d1..126d6d3bc99 100644
--- a/cmd/acpi.c
+++ b/cmd/acpi.c
@@ -8,6 +8,7 @@
 #include <mapmem.h>
 #include <acpi/acpi_table.h>
 #include <asm/acpi_table.h>
+#include <asm/global_data.h>
 #include <dm/acpi.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/cmd/bdinfo.c b/cmd/bdinfo.c
index 8b2c105e777..b5cc0a59c14 100644
--- a/cmd/bdinfo.c
+++ b/cmd/bdinfo.c
@@ -12,6 +12,7 @@
 #include <net.h>
 #include <vsprintf.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/cmd/bedbug.c b/cmd/bedbug.c
index 81ce2564805..6dc3bab74da 100644
--- a/cmd/bedbug.c
+++ b/cmd/bedbug.c
@@ -6,6 +6,7 @@
 #include <cli.h>
 #include <command.h>
 #include <console.h>
+#include <asm/global_data.h>
 #include <asm/ptrace.h>
 #include <linux/ctype.h>
 #include <net.h>
diff --git a/cmd/bootefi.c b/cmd/bootefi.c
index 8154efde52a..1236cbd7a53 100644
--- a/cmd/bootefi.c
+++ b/cmd/bootefi.c
@@ -18,6 +18,7 @@
 #include <image.h>
 #include <log.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <linux/libfdt.h>
 #include <linux/libfdt_env.h>
 #include <mapmem.h>
diff --git a/cmd/booti.c b/cmd/booti.c
index 76d1255ec58..3df70ea9caa 100644
--- a/cmd/booti.c
+++ b/cmd/booti.c
@@ -12,6 +12,7 @@
 #include <lmb.h>
 #include <log.h>
 #include <mapmem.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 e6b0e04413c..7732b97f635 100644
--- a/cmd/bootm.c
+++ b/cmd/bootm.c
@@ -16,6 +16,7 @@
 #include <malloc.h>
 #include <nand.h>
 #include <asm/byteorder.h>
+#include <asm/global_data.h>
 #include <linux/ctype.h>
 #include <linux/err.h>
 #include <u-boot/zlib.h>
diff --git a/cmd/date.c b/cmd/date.c
index 75a032cd277..0e118947531 100644
--- a/cmd/date.c
+++ b/cmd/date.c
@@ -12,6 +12,7 @@
 #include <dm.h>
 #include <rtc.h>
 #include <i2c.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/cmd/efi.c b/cmd/efi.c
index b3a3bf82821..1c0e62e4a33 100644
--- a/cmd/efi.c
+++ b/cmd/efi.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <sort.h>
+#include <asm/global_data.h>
 
 static const char *const type_name[] = {
 	"reserved",
diff --git a/cmd/load.c b/cmd/load.c
index 63a94145430..4bd463c3a7c 100644
--- a/cmd/load.c
+++ b/cmd/load.c
@@ -20,6 +20,7 @@
 #include <serial.h>
 #include <xyzModem.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/cmd/log.c b/cmd/log.c
index 6afe6ead251..ccefb0cbb8c 100644
--- a/cmd/log.c
+++ b/cmd/log.c
@@ -8,6 +8,7 @@
 #include <command.h>
 #include <dm.h>
 #include <log.h>
+#include <asm/global_data.h>
 
 static char log_fmt_chars[LOGF_COUNT] = "clFLfm";
 
diff --git a/cmd/mem.c b/cmd/mem.c
index 575893c18df..ad7b9bf702f 100644
--- a/cmd/mem.c
+++ b/cmd/mem.c
@@ -22,6 +22,7 @@
 #include <mapmem.h>
 #include <rand.h>
 #include <watchdog.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/compiler.h>
diff --git a/cmd/mtdparts.c b/cmd/mtdparts.c
index 5220142b9ab..ed373a8c4da 100644
--- a/cmd/mtdparts.c
+++ b/cmd/mtdparts.c
@@ -75,6 +75,7 @@
 #include <env.h>
 #include <log.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <jffs2/load_kernel.h>
 #include <linux/list.h>
 #include <linux/ctype.h>
diff --git a/cmd/nvedit.c b/cmd/nvedit.c
index d188c6aa6b7..91fa73fa322 100644
--- a/cmd/nvedit.c
+++ b/cmd/nvedit.c
@@ -35,6 +35,7 @@
 #include <errno.h>
 #include <malloc.h>
 #include <mapmem.h>
+#include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <u-boot/crc.h>
 #include <watchdog.h>
diff --git a/cmd/pxe_utils.h b/cmd/pxe_utils.h
index 77d25888758..b5a7d278011 100644
--- a/cmd/pxe_utils.h
+++ b/cmd/pxe_utils.h
@@ -3,6 +3,8 @@
 #ifndef __PXE_UTILS_H
 #define __PXE_UTILS_H
 
+#include <linux/list.h>
+
 /*
  * A note on the pxe file parser.
  *
diff --git a/cmd/sb.c b/cmd/sb.c
index f7eb921f43e..0d55818e3c6 100644
--- a/cmd/sb.c
+++ b/cmd/sb.c
@@ -8,6 +8,7 @@
 #include <command.h>
 #include <dm.h>
 #include <spl.h>
+#include <asm/global_data.h>
 #include <asm/state.h>
 
 static int do_sb_handoff(struct cmd_tbl *cmdtp, int flag, int argc,
diff --git a/cmd/sound.c b/cmd/sound.c
index 7fc19678ea8..fdcde365339 100644
--- a/cmd/sound.c
+++ b/cmd/sound.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <fdtdec.h>
 #include <sound.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/cmd/spl.c b/cmd/spl.c
index 28b40dd31e1..472703f8fe1 100644
--- a/cmd/spl.c
+++ b/cmd/spl.c
@@ -10,6 +10,7 @@
 #include <env.h>
 #include <image.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <linux/libfdt.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/cmd/ti/ddr3.c b/cmd/ti/ddr3.c
index 623b63b0f94..6b43a738683 100644
--- a/cmd/ti/ddr3.c
+++ b/cmd/ti/ddr3.c
@@ -14,6 +14,7 @@
 #include <asm/emif.h>
 #include <common.h>
 #include <command.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/cmd/tlv_eeprom.c b/cmd/tlv_eeprom.c
index eab0531c96b..5099cbdd95e 100644
--- a/cmd/tlv_eeprom.c
+++ b/cmd/tlv_eeprom.c
@@ -17,6 +17,7 @@
 #include <env.h>
 #include <init.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <linux/ctype.h>
 #include <u-boot/crc.h>
 
diff --git a/cmd/x86/fsp.c b/cmd/x86/fsp.c
index 8017eda387c..82e4415b16e 100644
--- a/cmd/x86/fsp.c
+++ b/cmd/x86/fsp.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <command.h>
 #include <asm/fsp/fsp_support.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/cmd/x86/hob.c b/cmd/x86/hob.c
index 6b1f7bda5b8..1b8dfa99f7b 100644
--- a/cmd/x86/hob.c
+++ b/cmd/x86/hob.c
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <efi.h>
 #include <uuid.h>
+#include <asm/global_data.h>
 #include <asm/hob.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/common/autoboot.c b/common/autoboot.c
index 6d78716a266..4341f5f0bb0 100644
--- a/common/autoboot.c
+++ b/common/autoboot.c
@@ -19,6 +19,7 @@
 #include <menu.h>
 #include <post.h>
 #include <time.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 #include <u-boot/sha256.h>
 #include <bootcount.h>
diff --git a/common/bloblist.c b/common/bloblist.c
index 99501951e0c..e3c2b5fa898 100644
--- a/common/bloblist.c
+++ b/common/bloblist.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <mapmem.h>
 #include <spl.h>
+#include <asm/global_data.h>
 #include <u-boot/crc.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/common/board_f.c b/common/board_f.c
index 88ff0424a7b..9d9cfab80f0 100644
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -49,6 +49,7 @@
 #if defined(CONFIG_MP) && defined(CONFIG_PPC)
 #include <asm/mp.h>
 #endif
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/sections.h>
 #include <dm/root.h>
diff --git a/common/board_info.c b/common/board_info.c
index a6db087f960..b54aa30a944 100644
--- a/common/board_info.c
+++ b/common/board_info.c
@@ -2,6 +2,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <linux/libfdt.h>
 #include <linux/compiler.h>
 
diff --git a/common/board_r.c b/common/board_r.c
index d9307f02e06..3ac5d15728c 100644
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -21,6 +21,7 @@
 #include <log.h>
 #include <net.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <u-boot/crc.h>
 /* TODO: can we just include all these headers whether needed or not? */
 #if defined(CONFIG_CMD_BEDBUG)
diff --git a/common/bootm.c b/common/bootm.c
index 247b600d9c6..157b0cbc7e8 100644
--- a/common/bootm.c
+++ b/common/bootm.c
@@ -18,6 +18,7 @@
 #include <mapmem.h>
 #include <net.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #if defined(CONFIG_CMD_USB)
 #include <usb.h>
diff --git a/common/bootm_os.c b/common/bootm_os.c
index e9aaddf3e61..0b6325db660 100644
--- a/common/bootm_os.c
+++ b/common/bootm_os.c
@@ -14,6 +14,7 @@
 #include <image.h>
 #include <lmb.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <linux/libfdt.h>
 #include <malloc.h>
 #include <mapmem.h>
diff --git a/common/bootstage.c b/common/bootstage.c
index 5f87358fd85..d5b78b9f487 100644
--- a/common/bootstage.c
+++ b/common/bootstage.c
@@ -16,6 +16,7 @@
 #include <malloc.h>
 #include <sort.h>
 #include <spl.h>
+#include <asm/global_data.h>
 #include <linux/compiler.h>
 #include <linux/libfdt.h>
 
diff --git a/common/cli.c b/common/cli.c
index 6635ab2bcf8..048eacb9ef9 100644
--- a/common/cli.c
+++ b/common/cli.c
@@ -18,6 +18,7 @@
 #include <fdtdec.h>
 #include <hang.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/common/cli_hush.c b/common/cli_hush.c
index 5b1f1190743..3fbe918ebad 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 <asm/global_data.h>
 #endif
 #ifndef __U_BOOT__
 #include <ctype.h>     /* isalpha, isdigit */
diff --git a/common/cli_readline.c b/common/cli_readline.c
index 1f1e28c6d85..c89bb136b86 100644
--- a/common/cli_readline.c
+++ b/common/cli_readline.c
@@ -14,6 +14,7 @@
 #include <command.h>
 #include <time.h>
 #include <watchdog.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/common/command.c b/common/command.c
index 2c491e20a74..6a87bb54abf 100644
--- a/common/command.c
+++ b/common/command.c
@@ -14,6 +14,7 @@
 #include <console.h>
 #include <env.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <linux/ctype.h>
 
 /*
diff --git a/common/console.c b/common/console.c
index 07c483f820e..f0014b756e7 100644
--- a/common/console.c
+++ b/common/console.c
@@ -19,6 +19,7 @@
 #include <exports.h>
 #include <env_internal.h>
 #include <watchdog.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/common/dlmalloc.c b/common/dlmalloc.c
index b29a7cfd93d..cf0270a9c11 100644
--- a/common/dlmalloc.c
+++ b/common/dlmalloc.c
@@ -1,5 +1,6 @@
 #include <common.h>
 #include <log.h>
+#include <asm/global_data.h>
 
 #if CONFIG_IS_ENABLED(UNIT_TEST)
 #define DEBUG
diff --git a/common/exports.c b/common/exports.c
index 6253b55694b..eea47ededd4 100644
--- a/common/exports.c
+++ b/common/exports.c
@@ -4,6 +4,7 @@
 #include <malloc.h>
 #include <spi.h>
 #include <i2c.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/common/hash.c b/common/hash.c
index 05238a8ba91..fc64002f736 100644
--- a/common/hash.c
+++ b/common/hash.c
@@ -18,6 +18,7 @@
 #include <mapmem.h>
 #include <hw_sha.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <u-boot/crc.h>
diff --git a/common/hwconfig.c b/common/hwconfig.c
index daf3eea5f96..26a561c365b 100644
--- a/common/hwconfig.c
+++ b/common/hwconfig.c
@@ -15,6 +15,7 @@
 #include <exports.h>
 #include <hwconfig.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <linux/types.h>
 #include <linux/string.h>
 #else
diff --git a/common/image-android.c b/common/image-android.c
index 18f7c8db03b..d07b0e0f09b 100644
--- a/common/image-android.c
+++ b/common/image-android.c
@@ -12,6 +12,7 @@
 #include <errno.h>
 #include <asm/unaligned.h>
 #include <mapmem.h>
+#include <linux/libfdt.h>
 
 #define ANDROID_IMAGE_DEFAULT_KERNEL_ADDR	0x10008000
 
diff --git a/common/image-cipher.c b/common/image-cipher.c
index 09869f78464..09d8512f8e5 100644
--- a/common/image-cipher.c
+++ b/common/image-cipher.c
@@ -9,6 +9,7 @@
 #else
 #include <common.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 DECLARE_GLOBAL_DATA_PTR;
 #endif /* !USE_HOSdTCC*/
 #include <image.h>
diff --git a/common/image-fdt.c b/common/image-fdt.c
index f13eefb061e..cb7b7c3ef2c 100644
--- a/common/image-fdt.c
+++ b/common/image-fdt.c
@@ -17,6 +17,7 @@
 #include <lmb.h>
 #include <log.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <linux/libfdt.h>
 #include <mapmem.h>
 #include <asm/io.h>
diff --git a/common/image-fit-sig.c b/common/image-fit-sig.c
index cc1967109ea..11fbdb0fb4f 100644
--- a/common/image-fit-sig.c
+++ b/common/image-fit-sig.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <log.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 DECLARE_GLOBAL_DATA_PTR;
 #endif /* !USE_HOSTCC*/
 #include <fdt_region.h>
diff --git a/common/image-fit.c b/common/image-fit.c
index d54eff9033c..973a37969f6 100644
--- a/common/image-fit.c
+++ b/common/image-fit.c
@@ -22,6 +22,7 @@
 #include <mapmem.h>
 #include <asm/io.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 DECLARE_GLOBAL_DATA_PTR;
 #endif /* !USE_HOSTCC*/
 
diff --git a/common/image-sig.c b/common/image-sig.c
index f3c209ae8b7..4abd3c080f7 100644
--- a/common/image-sig.c
+++ b/common/image-sig.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <log.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 DECLARE_GLOBAL_DATA_PTR;
 #endif /* !USE_HOSTCC*/
 #include <image.h>
diff --git a/common/image.c b/common/image.c
index 9d7d5c17d12..24dd06bf553 100644
--- a/common/image.c
+++ b/common/image.c
@@ -36,6 +36,7 @@
 #include <xilinx.h>
 #endif
 
+#include <asm/global_data.h>
 #include <u-boot/md5.h>
 #include <u-boot/sha1.h>
 #include <linux/errno.h>
diff --git a/common/init/board_init.c b/common/init/board_init.c
index 8c8a5eac057..3f183ee1132 100644
--- a/common/init/board_init.c
+++ b/common/init/board_init.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <bootstage.h>
 #include <init.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/common/init/handoff.c b/common/init/handoff.c
index e00b43e6a7b..0e7470ad78e 100644
--- a/common/init/handoff.c
+++ b/common/init/handoff.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <handoff.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/common/iotrace.c b/common/iotrace.c
index 7225ee44041..63d0cca3a00 100644
--- a/common/iotrace.c
+++ b/common/iotrace.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <mapmem.h>
 #include <time.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/bug.h>
 #include <u-boot/crc.h>
diff --git a/common/lcd.c b/common/lcd.c
index 02f2db3a99e..ab5614ad0e3 100644
--- a/common/lcd.c
+++ b/common/lcd.c
@@ -15,6 +15,7 @@
 #include <log.h>
 #include <asm/cache.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <linux/types.h>
 #include <stdio_dev.h>
 #include <lcd.h>
diff --git a/common/lcd_simplefb.c b/common/lcd_simplefb.c
index fca600691e9..6dd7972f709 100644
--- a/common/lcd_simplefb.c
+++ b/common/lcd_simplefb.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <lcd.h>
 #include <fdt_support.h>
+#include <asm/global_data.h>
 #include <linux/libfdt.h>
 #include <video.h>
 
diff --git a/common/log.c b/common/log.c
index 734d26de4af..f40513dc532 100644
--- a/common/log.c
+++ b/common/log.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <log.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <dm/uclass.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/common/log_console.c b/common/log_console.c
index bb3f8464b98..357dff29168 100644
--- a/common/log_console.c
+++ b/common/log_console.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/common/log_syslog.c b/common/log_syslog.c
index 149ff5af310..2477a6995d3 100644
--- a/common/log_syslog.c
+++ b/common/log_syslog.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <log.h>
 #include <net.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/common/malloc_simple.c b/common/malloc_simple.c
index 34f0b490938..0267fb6bec8 100644
--- a/common/malloc_simple.c
+++ b/common/malloc_simple.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <mapmem.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/common/memsize.c b/common/memsize.c
index e95c68265ab..d5d13d51bf1 100644
--- a/common/memsize.c
+++ b/common/memsize.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/common/spl/spl.c b/common/spl/spl.c
index 4840d1d3670..fd050cc6310 100644
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -18,6 +18,7 @@
 #include <log.h>
 #include <serial.h>
 #include <spl.h>
+#include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <nand.h>
 #include <fat.h>
diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c
index 365104fe028..6a9f6f57e8a 100644
--- a/common/spl/spl_fit.c
+++ b/common/spl/spl_fit.c
@@ -14,6 +14,7 @@
 #include <malloc.h>
 #include <spl.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <linux/libfdt.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/common/spl/spl_opensbi.c b/common/spl/spl_opensbi.c
index 14f335f75f0..90c4a5f9704 100644
--- a/common/spl/spl_opensbi.c
+++ b/common/spl/spl_opensbi.c
@@ -11,6 +11,7 @@
 #include <hang.h>
 #include <image.h>
 #include <spl.h>
+#include <asm/global_data.h>
 #include <asm/smp.h>
 #include <opensbi.h>
 #include <linux/libfdt.h>
diff --git a/common/spl/spl_spi.c b/common/spl/spl_spi.c
index 2744fb5d520..6a4e0332870 100644
--- a/common/spl/spl_spi.c
+++ b/common/spl/spl_spi.c
@@ -15,6 +15,7 @@
 #include <spi_flash.h>
 #include <errno.h>
 #include <spl.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/common/splash_source.c b/common/splash_source.c
index f51ca5ddf37..2737fc6e7ff 100644
--- a/common/splash_source.c
+++ b/common/splash_source.c
@@ -20,6 +20,7 @@
 #include <spi_flash.h>
 #include <splash.h>
 #include <usb.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/common/stdio.c b/common/stdio.c
index 2119204b982..1c6ad686106 100644
--- a/common/stdio.c
+++ b/common/stdio.c
@@ -18,6 +18,7 @@
 #include <stdio_dev.h>
 #include <serial.h>
 #include <splash.h>
+#include <asm/global_data.h>
 
 #if defined(CONFIG_SYS_I2C)
 #include <i2c.h>
diff --git a/disk/part_efi.c b/disk/part_efi.c
index de3491821f0..933df460c7b 100644
--- a/disk/part_efi.c
+++ b/disk/part_efi.c
@@ -15,6 +15,7 @@
 #include <part.h>
 #include <uuid.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/unaligned.h>
 #include <command.h>
 #include <fdtdec.h>
diff --git a/drivers/ata/libata.c b/drivers/ata/libata.c
index d41200f6c26..47e2c5c1cc4 100644
--- a/drivers/ata/libata.c
+++ b/drivers/ata/libata.c
@@ -5,6 +5,8 @@
  *		port from the libata of linux kernel
  */
 
+#include <common.h>
+#include <compiler.h>
 #include <libata.h>
 
 u64 ata_id_n_sectors(u16 *id)
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index b2b5c699ad1..9021a00cdb6 100644
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -38,6 +38,7 @@
 #include <dm.h>
 #include <log.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <dm/device-internal.h>
 #include <dm/lists.h>
 #include <fis.h>
diff --git a/drivers/bios_emulator/atibios.c b/drivers/bios_emulator/atibios.c
index 9c7f14e98f4..6c7cc24cbd9 100644
--- a/drivers/bios_emulator/atibios.c
+++ b/drivers/bios_emulator/atibios.c
@@ -46,6 +46,7 @@
 *		BIOS in u-boot.
 ****************************************************************************/
 #include <common.h>
+#include <compiler.h>
 #include <bios_emul.h>
 #include <errno.h>
 #include <log.h>
diff --git a/drivers/block/sandbox.c b/drivers/block/sandbox.c
index cca2237136a..11ebdd52d77 100644
--- a/drivers/block/sandbox.c
+++ b/drivers/block/sandbox.c
@@ -11,6 +11,7 @@
 #include <os.h>
 #include <malloc.h>
 #include <sandboxblockdev.h>
+#include <asm/global_data.h>
 #include <dm/device_compat.h>
 #include <linux/errno.h>
 #include <dm/device-internal.h>
diff --git a/drivers/bootcount/bootcount_ram.c b/drivers/bootcount/bootcount_ram.c
index 078c84d5eca..8cc30cf40ef 100644
--- a/drivers/bootcount/bootcount_ram.c
+++ b/drivers/bootcount/bootcount_ram.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/cache/cache-v5l2.c b/drivers/cache/cache-v5l2.c
index 51c074bfe23..305a737d3b3 100644
--- a/drivers/cache/cache-v5l2.c
+++ b/drivers/cache/cache-v5l2.c
@@ -9,6 +9,7 @@
 #include <cache.h>
 #include <dm.h>
 #include <hang.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm/ofnode.h>
 #include <linux/bitops.h>
diff --git a/drivers/cache/sandbox_cache.c b/drivers/cache/sandbox_cache.c
index 9050c4cf340..0fb767e4339 100644
--- a/drivers/cache/sandbox_cache.c
+++ b/drivers/cache/sandbox_cache.c
@@ -7,6 +7,7 @@
 #include <cache.h>
 #include <dm.h>
 #include <errno.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/clk/altera/clk-agilex.c b/drivers/clk/altera/clk-agilex.c
index 9927ada201f..8254ce68e4d 100644
--- a/drivers/clk/altera/clk-agilex.c
+++ b/drivers/clk/altera/clk-agilex.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <clk-uclass.h>
 #include <dm.h>
diff --git a/drivers/clk/altera/clk-arria10.c b/drivers/clk/altera/clk-arria10.c
index 732ed4d79b9..a2f105a415f 100644
--- a/drivers/clk/altera/clk-arria10.c
+++ b/drivers/clk/altera/clk-arria10.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <clk-uclass.h>
 #include <dm.h>
diff --git a/drivers/clk/aspeed/clk_ast2500.c b/drivers/clk/aspeed/clk_ast2500.c
index ccfeded30c5..d83e6590d6c 100644
--- a/drivers/clk/aspeed/clk_ast2500.c
+++ b/drivers/clk/aspeed/clk_ast2500.c
@@ -7,6 +7,7 @@
 #include <clk-uclass.h>
 #include <dm.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/scu_ast2500.h>
 #include <dm/lists.h>
diff --git a/drivers/clk/at91/clk-generated.c b/drivers/clk/at91/clk-generated.c
index c0610940c3b..a65cadee372 100644
--- a/drivers/clk/at91/clk-generated.c
+++ b/drivers/clk/at91/clk-generated.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <log.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <linux/err.h>
 #include <linux/io.h>
 #include <mach/at91_pmc.h>
diff --git a/drivers/clk/at91/clk-h32mx.c b/drivers/clk/at91/clk-h32mx.c
index 86bb71f6128..b27aeacc7e9 100644
--- a/drivers/clk/at91/clk-h32mx.c
+++ b/drivers/clk/at91/clk-h32mx.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <clk-uclass.h>
 #include <dm.h>
+#include <asm/global_data.h>
 #include <dm/device_compat.h>
 #include <dm/util.h>
 #include <linux/io.h>
diff --git a/drivers/clk/at91/clk-main.c b/drivers/clk/at91/clk-main.c
index b31a1cb6828..c1ca09c2109 100644
--- a/drivers/clk/at91/clk-main.c
+++ b/drivers/clk/at91/clk-main.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <clk-uclass.h>
 #include <dm.h>
+#include <asm/global_data.h>
 #include <linux/io.h>
 #include <mach/at91_pmc.h>
 #include "pmc.h"
diff --git a/drivers/clk/at91/clk-master.c b/drivers/clk/at91/clk-master.c
index e078fab7b41..87a7d1ea8f2 100644
--- a/drivers/clk/at91/clk-master.c
+++ b/drivers/clk/at91/clk-master.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <clk-uclass.h>
 #include <dm.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/clk/at91/clk-plla.c b/drivers/clk/at91/clk-plla.c
index 79d725819fc..4f246afa18a 100644
--- a/drivers/clk/at91/clk-plla.c
+++ b/drivers/clk/at91/clk-plla.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <clk-uclass.h>
 #include <dm.h>
+#include <asm/global_data.h>
 #include <linux/io.h>
 #include <mach/at91_pmc.h>
 #include "pmc.h"
diff --git a/drivers/clk/at91/clk-usb.c b/drivers/clk/at91/clk-usb.c
index af9d7243693..416a5007f68 100644
--- a/drivers/clk/at91/clk-usb.c
+++ b/drivers/clk/at91/clk-usb.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <clk-uclass.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <dm/device.h>
 #include <linux/err.h>
 #include <linux/io.h>
diff --git a/drivers/clk/at91/pmc.c b/drivers/clk/at91/pmc.c
index 54ae0d281d0..11859db3265 100644
--- a/drivers/clk/at91/pmc.c
+++ b/drivers/clk/at91/pmc.c
@@ -8,6 +8,7 @@
 #include <clk-uclass.h>
 #include <dm.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <dm/lists.h>
 #include <dm/util.h>
 #include "pmc.h"
diff --git a/drivers/clk/clk-uclass.c b/drivers/clk/clk-uclass.c
index 15656f5973d..e6f20c43e81 100644
--- a/drivers/clk/clk-uclass.c
+++ b/drivers/clk/clk-uclass.c
@@ -14,6 +14,7 @@
 #include <errno.h>
 #include <log.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <dm/devres.h>
 #include <dm/read.h>
 #include <linux/bug.h>
diff --git a/drivers/clk/clk_pic32.c b/drivers/clk/clk_pic32.c
index dc46de2a7cf..78daf2cbad3 100644
--- a/drivers/clk/clk_pic32.c
+++ b/drivers/clk/clk_pic32.c
@@ -10,6 +10,7 @@
 #include <div64.h>
 #include <time.h>
 #include <wait_bit.h>
+#include <asm/global_data.h>
 #include <dm/lists.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
diff --git a/drivers/clk/clk_stm32mp1.c b/drivers/clk/clk_stm32mp1.c
index c8840b9e5f1..65ffd32d08e 100644
--- a/drivers/clk/clk_stm32mp1.c
+++ b/drivers/clk/clk_stm32mp1.c
@@ -14,6 +14,7 @@
 #include <syscon.h>
 #include <time.h>
 #include <vsprintf.h>
+#include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/io.h>
 #include <linux/iopoll.h>
diff --git a/drivers/clk/clk_zynq.c b/drivers/clk/clk_zynq.c
index a699a3664c3..b00fe1d13b0 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 <asm/global_data.h>
 #include <dm/device_compat.h>
 #include <dm/lists.h>
 #include <errno.h>
diff --git a/drivers/clk/mpc83xx_clk.c b/drivers/clk/mpc83xx_clk.c
index 8d96ec767ac..9ec41d7705a 100644
--- a/drivers/clk/mpc83xx_clk.c
+++ b/drivers/clk/mpc83xx_clk.c
@@ -11,6 +11,7 @@
 #include <dm.h>
 #include <log.h>
 #include <vsprintf.h>
+#include <asm/global_data.h>
 #include <dm/lists.h>
 #include <dt-bindings/clk/mpc83xx-clk.h>
 #include <asm/arch/soc.h>
diff --git a/drivers/clk/renesas/clk-rcar-gen2.c b/drivers/clk/renesas/clk-rcar-gen2.c
index 16da10c8dd8..b423c9414b2 100644
--- a/drivers/clk/renesas/clk-rcar-gen2.c
+++ b/drivers/clk/renesas/clk-rcar-gen2.c
@@ -15,6 +15,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 
 #include <dt-bindings/clock/renesas-cpg-mssr.h>
diff --git a/drivers/clk/renesas/clk-rcar-gen3.c b/drivers/clk/renesas/clk-rcar-gen3.c
index 30a101fe862..3223becd753 100644
--- a/drivers/clk/renesas/clk-rcar-gen3.c
+++ b/drivers/clk/renesas/clk-rcar-gen3.c
@@ -16,6 +16,7 @@
 #include <errno.h>
 #include <log.h>
 #include <wait_bit.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
 
diff --git a/drivers/clk/rockchip/clk_px30.c b/drivers/clk/rockchip/clk_px30.c
index 71916dbf3b1..0ef449159d9 100644
--- a/drivers/clk/rockchip/clk_px30.c
+++ b/drivers/clk/rockchip/clk_px30.c
@@ -14,6 +14,7 @@
 #include <asm/arch-rockchip/clock.h>
 #include <asm/arch-rockchip/cru_px30.h>
 #include <asm/arch-rockchip/hardware.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm/lists.h>
 #include <dt-bindings/clock/px30-cru.h>
diff --git a/drivers/clk/rockchip/clk_rk3288.c b/drivers/clk/rockchip/clk_rk3288.c
index a1dd642eefe..be1f646c070 100644
--- a/drivers/clk/rockchip/clk_rk3288.c
+++ b/drivers/clk/rockchip/clk_rk3288.c
@@ -14,6 +14,7 @@
 #include <malloc.h>
 #include <mapmem.h>
 #include <syscon.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch-rockchip/clock.h>
 #include <asm/arch-rockchip/cru.h>
diff --git a/drivers/clk/rockchip/clk_rk3308.c b/drivers/clk/rockchip/clk_rk3308.c
index d3633b69795..4a72fe29375 100644
--- a/drivers/clk/rockchip/clk_rk3308.c
+++ b/drivers/clk/rockchip/clk_rk3308.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <syscon.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/cru_rk3308.h>
 #include <asm/arch-rockchip/clock.h>
diff --git a/drivers/clk/rockchip/clk_rv1108.c b/drivers/clk/rockchip/clk_rv1108.c
index aa1d98ca2a2..9e6bb9cd88d 100644
--- a/drivers/clk/rockchip/clk_rv1108.c
+++ b/drivers/clk/rockchip/clk_rv1108.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <syscon.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch-rockchip/clock.h>
 #include <asm/arch-rockchip/cru_rv1108.h>
diff --git a/drivers/core/device-remove.c b/drivers/core/device-remove.c
index efdb0f29058..360cfa72bc1 100644
--- a/drivers/core/device-remove.c
+++ b/drivers/core/device-remove.c
@@ -12,6 +12,7 @@
 #include <errno.h>
 #include <log.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <dm/device.h>
 #include <dm/device-internal.h>
 #include <dm/uclass.h>
diff --git a/drivers/core/device.c b/drivers/core/device.c
index 355dbd147a9..c473789edfa 100644
--- a/drivers/core/device.c
+++ b/drivers/core/device.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <clk.h>
 #include <fdtdec.h>
diff --git a/drivers/core/fdtaddr.c b/drivers/core/fdtaddr.c
index dfcb868f650..0cb78d64c5e 100644
--- a/drivers/core/fdtaddr.c
+++ b/drivers/core/fdtaddr.c
@@ -12,6 +12,7 @@
 #include <dm.h>
 #include <fdt_support.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm/device-internal.h>
 
diff --git a/drivers/core/of_access.c b/drivers/core/of_access.c
index 922e78f99b8..c23763726bb 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 <asm/global_data.h>
 #include <linux/bug.h>
 #include <linux/libfdt.h>
 #include <dm/of_access.h>
diff --git a/drivers/core/ofnode.c b/drivers/core/ofnode.c
index c37afa1fe6f..a49a54c60f9 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 <asm/global_data.h>
 #include <linux/libfdt.h>
 #include <dm/of_access.h>
 #include <dm/of_addr.h>
diff --git a/drivers/core/read.c b/drivers/core/read.c
index 8bb456bc3f0..8a31dc67c9b 100644
--- a/drivers/core/read.c
+++ b/drivers/core/read.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <asm/global_data.h>
 #include <dm/of_access.h>
 #include <mapmem.h>
 #include <asm/types.h>
diff --git a/drivers/core/regmap.c b/drivers/core/regmap.c
index a67a237b88f..e3f2affd1cf 100644
--- a/drivers/core/regmap.c
+++ b/drivers/core/regmap.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <linux/libfdt.h>
 #include <malloc.h>
 #include <mapmem.h>
diff --git a/drivers/core/root.c b/drivers/core/root.c
index 0726be6b795..b5446b1db02 100644
--- a/drivers/core/root.c
+++ b/drivers/core/root.c
@@ -11,6 +11,7 @@
 #include <fdtdec.h>
 #include <log.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <linux/libfdt.h>
 #include <dm/acpi.h>
 #include <dm/device.h>
diff --git a/drivers/core/uclass.c b/drivers/core/uclass.c
index c3f1b73cd6b..95c37db5ad0 100644
--- a/drivers/core/uclass.c
+++ b/drivers/core/uclass.c
@@ -13,6 +13,7 @@
 #include <errno.h>
 #include <log.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <dm/device.h>
 #include <dm/device-internal.h>
 #include <dm/lists.h>
diff --git a/drivers/cpu/imx8_cpu.c b/drivers/cpu/imx8_cpu.c
index 502c8ebb433..aca14157ad5 100644
--- a/drivers/cpu/imx8_cpu.c
+++ b/drivers/cpu/imx8_cpu.c
@@ -7,6 +7,7 @@
 #include <cpu.h>
 #include <dm.h>
 #include <thermal.h>
+#include <asm/global_data.h>
 #include <asm/system.h>
 #include <asm/arch/sci/sci.h>
 #include <asm/arch/sys_proto.h>
diff --git a/drivers/cpu/riscv_cpu.c b/drivers/cpu/riscv_cpu.c
index 93ce708f652..3c7395a9f20 100644
--- a/drivers/cpu/riscv_cpu.c
+++ b/drivers/cpu/riscv_cpu.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <dm/device-internal.h>
 #include <dm/lists.h>
 #include <linux/bitops.h>
diff --git a/drivers/crypto/rsa_mod_exp/mod_exp_uclass.c b/drivers/crypto/rsa_mod_exp/mod_exp_uclass.c
index e91fe644580..f5ae35e1325 100644
--- a/drivers/crypto/rsa_mod_exp/mod_exp_uclass.c
+++ b/drivers/crypto/rsa_mod_exp/mod_exp_uclass.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <asm/global_data.h>
 #include <u-boot/rsa-mod-exp.h>
 #include <errno.h>
 #include <fdtdec.h>
diff --git a/drivers/ddr/altera/sdram_agilex.c b/drivers/ddr/altera/sdram_agilex.c
index d6e7a175d0d..d554df87eba 100644
--- a/drivers/ddr/altera/sdram_agilex.c
+++ b/drivers/ddr/altera/sdram_agilex.c
@@ -13,6 +13,7 @@
 #include <log.h>
 #include <ram.h>
 #include <reset.h>
+#include <asm/global_data.h>
 #include "sdram_soc64.h"
 #include <wait_bit.h>
 #include <asm/arch/firewall.h>
diff --git a/drivers/ddr/altera/sdram_arria10.c b/drivers/ddr/altera/sdram_arria10.c
index 3c58f59f3ab..4a8f8dea1c4 100644
--- a/drivers/ddr/altera/sdram_arria10.c
+++ b/drivers/ddr/altera/sdram_arria10.c
@@ -13,6 +13,7 @@
 #include <wait_bit.h>
 #include <watchdog.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/fpga_manager.h>
 #include <asm/arch/misc.h>
diff --git a/drivers/ddr/altera/sdram_s10.c b/drivers/ddr/altera/sdram_s10.c
index 2945f1e1df5..6235bd959fe 100644
--- a/drivers/ddr/altera/sdram_s10.c
+++ b/drivers/ddr/altera/sdram_s10.c
@@ -15,6 +15,7 @@
 #include <log.h>
 #include <ram.h>
 #include <reset.h>
+#include <asm/global_data.h>
 #include "sdram_s10.h"
 #include <wait_bit.h>
 #include <asm/arch/firewall.h>
diff --git a/drivers/ddr/altera/sdram_soc64.c b/drivers/ddr/altera/sdram_soc64.c
index 8cb75fe02a2..40fcc8d2e0f 100644
--- a/drivers/ddr/altera/sdram_soc64.c
+++ b/drivers/ddr/altera/sdram_soc64.c
@@ -15,6 +15,7 @@
 #include <log.h>
 #include <ram.h>
 #include <reset.h>
+#include <asm/global_data.h>
 #include "sdram_soc64.h"
 #include <wait_bit.h>
 #include <asm/arch/firewall.h>
diff --git a/drivers/ddr/imx/imx8m/helper.c b/drivers/ddr/imx/imx8m/helper.c
index 5ebf54f5f4a..f23904bf712 100644
--- a/drivers/ddr/imx/imx8m/helper.c
+++ b/drivers/ddr/imx/imx8m/helper.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <log.h>
 #include <spl.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <errno.h>
 #include <asm/io.h>
diff --git a/drivers/demo/demo-shape.c b/drivers/demo/demo-shape.c
index 8686c998457..d0c0c736551 100644
--- a/drivers/demo/demo-shape.c
+++ b/drivers/demo/demo-shape.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <dm-demo.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
 
diff --git a/drivers/demo/demo-uclass.c b/drivers/demo/demo-uclass.c
index 6c36f03254f..5856a9891e8 100644
--- a/drivers/demo/demo-uclass.c
+++ b/drivers/demo/demo-uclass.c
@@ -13,6 +13,7 @@
 #include <fdtdec.h>
 #include <log.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/list.h>
 
diff --git a/drivers/fpga/socfpga_arria10.c b/drivers/fpga/socfpga_arria10.c
index dfd3cbb4610..92e6bd1c34f 100644
--- a/drivers/fpga/socfpga_arria10.c
+++ b/drivers/fpga/socfpga_arria10.c
@@ -4,6 +4,7 @@
  */
 #include <image.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/fpga_manager.h>
 #include <asm/arch/reset_manager.h>
diff --git a/drivers/fpga/zynqmppl.c b/drivers/fpga/zynqmppl.c
index 5b103cfeaf1..328e275cd37 100644
--- a/drivers/fpga/zynqmppl.c
+++ b/drivers/fpga/zynqmppl.c
@@ -7,6 +7,7 @@
 
 #include <console.h>
 #include <common.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <log.h>
 #include <zynqmppl.h>
diff --git a/drivers/gpio/74x164_gpio.c b/drivers/gpio/74x164_gpio.c
index 64717a6780e..045685fcd9c 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 <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <dm/device_compat.h>
diff --git a/drivers/gpio/altera_pio.c b/drivers/gpio/altera_pio.c
index 75800d9f31c..e52124dbd50 100644
--- a/drivers/gpio/altera_pio.c
+++ b/drivers/gpio/altera_pio.c
@@ -9,6 +9,7 @@
 #include <errno.h>
 #include <malloc.h>
 #include <fdtdec.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
 
diff --git a/drivers/gpio/atmel_pio4.c b/drivers/gpio/atmel_pio4.c
index 18f365fa411..3256469ddc1 100644
--- a/drivers/gpio/atmel_pio4.c
+++ b/drivers/gpio/atmel_pio4.c
@@ -11,6 +11,7 @@
 #include <fdtdec.h>
 #include <malloc.h>
 #include <asm/arch/hardware.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <linux/bitops.h>
 #include <mach/gpio.h>
diff --git a/drivers/gpio/da8xx_gpio.c b/drivers/gpio/da8xx_gpio.c
index f8758885101..614c489e45d 100644
--- a/drivers/gpio/da8xx_gpio.c
+++ b/drivers/gpio/da8xx_gpio.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <fdtdec.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
 #include <dt-bindings/gpio/gpio.h>
diff --git a/drivers/gpio/gpio-rcar.c b/drivers/gpio/gpio-rcar.c
index a993fd4d700..2e80196905d 100644
--- a/drivers/gpio/gpio-rcar.c
+++ b/drivers/gpio/gpio-rcar.c
@@ -7,6 +7,7 @@
 #include <clk.h>
 #include <dm.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <dm/device_compat.h>
 #include <dm/pinctrl.h>
 #include <errno.h>
diff --git a/drivers/gpio/gpio-rza1.c b/drivers/gpio/gpio-rza1.c
index 86804ac2f5f..aa600e483a6 100644
--- a/drivers/gpio/gpio-rza1.c
+++ b/drivers/gpio/gpio-rza1.c
@@ -7,6 +7,7 @@
 #include <clk.h>
 #include <dm.h>
 #include <errno.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
diff --git a/drivers/gpio/gpio-uclass.c b/drivers/gpio/gpio-uclass.c
index 9c53299b6a3..36de7bc7cc6 100644
--- a/drivers/gpio/gpio-uclass.c
+++ b/drivers/gpio/gpio-uclass.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <dm/device-internal.h>
 #include <dm/lists.h>
 #include <dm/uclass-internal.h>
diff --git a/drivers/gpio/intel_broadwell_gpio.c b/drivers/gpio/intel_broadwell_gpio.c
index 95f8b2ba6cd..4323f0ba760 100644
--- a/drivers/gpio/intel_broadwell_gpio.c
+++ b/drivers/gpio/intel_broadwell_gpio.c
@@ -12,6 +12,7 @@
 #include <pci.h>
 #include <syscon.h>
 #include <asm/cpu.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <asm/pci.h>
diff --git a/drivers/gpio/intel_ich6_gpio.c b/drivers/gpio/intel_ich6_gpio.c
index 73d98fde554..4a2757d1ac6 100644
--- a/drivers/gpio/intel_ich6_gpio.c
+++ b/drivers/gpio/intel_ich6_gpio.c
@@ -34,6 +34,7 @@
 #include <pch.h>
 #include <pci.h>
 #include <asm/cpu.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <asm/pci.h>
diff --git a/drivers/gpio/msm_gpio.c b/drivers/gpio/msm_gpio.c
index 416fb56a98d..710994b4e12 100644
--- a/drivers/gpio/msm_gpio.c
+++ b/drivers/gpio/msm_gpio.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 
diff --git a/drivers/gpio/mxs_gpio.c b/drivers/gpio/mxs_gpio.c
index aaabb0216be..0340786712e 100644
--- a/drivers/gpio/mxs_gpio.c
+++ b/drivers/gpio/mxs_gpio.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <log.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <asm/io.h>
diff --git a/drivers/gpio/omap_gpio.c b/drivers/gpio/omap_gpio.c
index 6eaa0a08a26..4200afba121 100644
--- a/drivers/gpio/omap_gpio.c
+++ b/drivers/gpio/omap_gpio.c
@@ -20,6 +20,7 @@
 #include <common.h>
 #include <dm.h>
 #include <fdtdec.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <linux/errno.h>
diff --git a/drivers/gpio/pcf8575_gpio.c b/drivers/gpio/pcf8575_gpio.c
index 1b9a18fe5dc..8a9214dec3e 100644
--- a/drivers/gpio/pcf8575_gpio.c
+++ b/drivers/gpio/pcf8575_gpio.c
@@ -28,6 +28,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <asm-generic/gpio.h>
+#include <asm/global_data.h>
 #include <linux/bitops.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/gpio/pic32_gpio.c b/drivers/gpio/pic32_gpio.c
index bb1ad256fac..50c5376e00d 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 <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
 #include <linux/bitops.h>
diff --git a/drivers/gpio/s5p_gpio.c b/drivers/gpio/s5p_gpio.c
index c78227f4da3..14f262739d2 100644
--- a/drivers/gpio/s5p_gpio.c
+++ b/drivers/gpio/s5p_gpio.c
@@ -10,6 +10,7 @@
 #include <fdtdec.h>
 #include <log.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
 #include <dm/device-internal.h>
diff --git a/drivers/gpio/vybrid_gpio.c b/drivers/gpio/vybrid_gpio.c
index 4efff5c3643..82ae6d88941 100644
--- a/drivers/gpio/vybrid_gpio.c
+++ b/drivers/gpio/vybrid_gpio.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <fdtdec.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/io.h>
diff --git a/drivers/hwspinlock/hwspinlock-uclass.c b/drivers/hwspinlock/hwspinlock-uclass.c
index 9da79455ed3..fdc90c3f0e0 100644
--- a/drivers/hwspinlock/hwspinlock-uclass.c
+++ b/drivers/hwspinlock/hwspinlock-uclass.c
@@ -8,6 +8,7 @@
 #include <errno.h>
 #include <hwspinlock.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <dm/device-internal.h>
 #include <dm/device_compat.h>
 #include <linux/compat.h>
diff --git a/drivers/i2c/at91_i2c.c b/drivers/i2c/at91_i2c.c
index 9d6c6d80e2a..ee5dc1db96c 100644
--- a/drivers/i2c/at91_i2c.c
+++ b/drivers/i2c/at91_i2c.c
@@ -6,6 +6,7 @@
  */
 
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <common.h>
 #include <clk.h>
diff --git a/drivers/i2c/cros_ec_tunnel.c b/drivers/i2c/cros_ec_tunnel.c
index a630817352e..2853a984fbe 100644
--- a/drivers/i2c/cros_ec_tunnel.c
+++ b/drivers/i2c/cros_ec_tunnel.c
@@ -9,6 +9,7 @@
 #include <cros_ec.h>
 #include <errno.h>
 #include <i2c.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/i2c/exynos_hs_i2c.c b/drivers/i2c/exynos_hs_i2c.c
index 5785adedb6d..34d10abde06 100644
--- a/drivers/i2c/exynos_hs_i2c.c
+++ b/drivers/i2c/exynos_hs_i2c.c
@@ -13,6 +13,7 @@
 #include <asm/arch/clk.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/pinmux.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 #include "s3c24x0_i2c.h"
 
diff --git a/drivers/i2c/fsl_i2c.c b/drivers/i2c/fsl_i2c.c
index da933452f51..e7a8dcc8212 100644
--- a/drivers/i2c/fsl_i2c.c
+++ b/drivers/i2c/fsl_i2c.c
@@ -11,6 +11,7 @@
 #include <i2c.h>		/* Functional interface */
 #include <log.h>
 #include <time.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/fsl_i2c.h>	/* HW definitions */
 #include <clk.h>
diff --git a/drivers/i2c/i2c-gpio.c b/drivers/i2c/i2c-gpio.c
index cfdeadc752c..6dc89a4e202 100644
--- a/drivers/i2c/i2c-gpio.c
+++ b/drivers/i2c/i2c-gpio.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <linux/delay.h>
 
diff --git a/drivers/i2c/i2c_core.c b/drivers/i2c/i2c_core.c
index da50d86cc8b..85cf75ecd92 100644
--- a/drivers/i2c/i2c_core.c
+++ b/drivers/i2c/i2c_core.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <i2c.h>
 #include <linker_lists.h>
+#include <asm/global_data.h>
 
 struct i2c_adapter *i2c_get_adapter(int index)
 {
diff --git a/drivers/i2c/ihs_i2c.c b/drivers/i2c/ihs_i2c.c
index cec38538da4..1c39b8c9dfc 100644
--- a/drivers/i2c/ihs_i2c.c
+++ b/drivers/i2c/ihs_i2c.c
@@ -13,6 +13,7 @@
 #include <gdsys_fpga.h>
 #endif
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/unaligned.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/drivers/i2c/iproc_i2c.c b/drivers/i2c/iproc_i2c.c
index b7e9ced8983..b90c0ddba7c 100644
--- a/drivers/i2c/iproc_i2c.c
+++ b/drivers/i2c/iproc_i2c.c
@@ -4,6 +4,7 @@
  *
  */
 
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <common.h>
 #include <config.h>
diff --git a/drivers/i2c/muxes/i2c-arb-gpio-challenge.c b/drivers/i2c/muxes/i2c-arb-gpio-challenge.c
index 584d0a4fef1..4be32a1b38c 100644
--- a/drivers/i2c/muxes/i2c-arb-gpio-challenge.c
+++ b/drivers/i2c/muxes/i2c-arb-gpio-challenge.c
@@ -10,6 +10,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <linux/delay.h>
 
diff --git a/drivers/i2c/muxes/i2c-mux-gpio.c b/drivers/i2c/muxes/i2c-mux-gpio.c
index 83dcb402133..52da26ab182 100644
--- a/drivers/i2c/muxes/i2c-mux-gpio.c
+++ b/drivers/i2c/muxes/i2c-mux-gpio.c
@@ -7,6 +7,7 @@
  * Peng Fan <peng.fan@nxp.com>
  */
 
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm-generic/gpio.h>
 #include <common.h>
diff --git a/drivers/i2c/muxes/pca954x.c b/drivers/i2c/muxes/pca954x.c
index 7360e162eeb..87e9f9cb21d 100644
--- a/drivers/i2c/muxes/pca954x.c
+++ b/drivers/i2c/muxes/pca954x.c
@@ -11,6 +11,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 
 #include <asm-generic/gpio.h>
 
diff --git a/drivers/i2c/mvtwsi.c b/drivers/i2c/mvtwsi.c
index d3cc9b9d838..21383ecf132 100644
--- a/drivers/i2c/mvtwsi.c
+++ b/drivers/i2c/mvtwsi.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <i2c.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/io.h>
diff --git a/drivers/i2c/mxc_i2c.c b/drivers/i2c/mxc_i2c.c
index e3d980a9dfb..c1204815c20 100644
--- a/drivers/i2c/mxc_i2c.c
+++ b/drivers/i2c/mxc_i2c.c
@@ -18,6 +18,7 @@
 #include <log.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
+#include <asm/global_data.h>
 #include <dm/device_compat.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/i2c/s3c24x0_i2c.c b/drivers/i2c/s3c24x0_i2c.c
index cb45d3c100f..43699fc2410 100644
--- a/drivers/i2c/s3c24x0_i2c.c
+++ b/drivers/i2c/s3c24x0_i2c.c
@@ -16,6 +16,7 @@
 #else
 #include <asm/arch/s3c24x0_cpu.h>
 #endif
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <i2c.h>
 #include "s3c24x0_i2c.h"
diff --git a/drivers/i2c/sh_i2c.c b/drivers/i2c/sh_i2c.c
index f857307e6a4..26a87006698 100644
--- a/drivers/i2c/sh_i2c.c
+++ b/drivers/i2c/sh_i2c.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <i2c.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/delay.h>
 
diff --git a/drivers/i2c/soft_i2c.c b/drivers/i2c/soft_i2c.c
index 1031066b8c4..db69c18cb6d 100644
--- a/drivers/i2c/soft_i2c.c
+++ b/drivers/i2c/soft_i2c.c
@@ -25,6 +25,7 @@
 #endif
 #endif
 #include <i2c.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 
 #if defined(CONFIG_SOFT_I2C_GPIO_SCL)
diff --git a/drivers/i2c/tegra186_bpmp_i2c.c b/drivers/i2c/tegra186_bpmp_i2c.c
index 37204718ca1..0a507079a2d 100644
--- a/drivers/i2c/tegra186_bpmp_i2c.c
+++ b/drivers/i2c/tegra186_bpmp_i2c.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <misc.h>
 #include <asm/arch-tegra/bpmp_abi.h>
+#include <asm/global_data.h>
 #include <linux/bitops.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/input/i8042.c b/drivers/input/i8042.c
index 7beaccca2c8..ca2978e79d5 100644
--- a/drivers/input/i8042.c
+++ b/drivers/input/i8042.c
@@ -14,6 +14,7 @@
 #include <input.h>
 #include <keyboard.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/delay.h>
 
diff --git a/drivers/mailbox/k3-sec-proxy.c b/drivers/mailbox/k3-sec-proxy.c
index 3f9afaed328..b9337f2db5c 100644
--- a/drivers/mailbox/k3-sec-proxy.c
+++ b/drivers/mailbox/k3-sec-proxy.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <log.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm/device_compat.h>
 #include <linux/types.h>
diff --git a/drivers/misc/atsha204a-i2c.c b/drivers/misc/atsha204a-i2c.c
index 422ea6f3e5a..c79c260783e 100644
--- a/drivers/misc/atsha204a-i2c.c
+++ b/drivers/misc/atsha204a-i2c.c
@@ -16,6 +16,7 @@
 #include <errno.h>
 #include <atsha204a-i2c.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 #include <u-boot/crc.h>
 
diff --git a/drivers/misc/fs_loader.c b/drivers/misc/fs_loader.c
index 56406aa1dd2..f6383a02398 100644
--- a/drivers/misc/fs_loader.c
+++ b/drivers/misc/fs_loader.c
@@ -11,6 +11,7 @@
 #include <fs.h>
 #include <fs_loader.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <linux/string.h>
 #include <mapmem.h>
 #include <malloc.h>
diff --git a/drivers/misc/imx8/fuse.c b/drivers/misc/imx8/fuse.c
index be181229370..38111c52548 100644
--- a/drivers/misc/imx8/fuse.c
+++ b/drivers/misc/imx8/fuse.c
@@ -9,6 +9,7 @@
 #include <fuse.h>
 #include <asm/arch/sci/sci.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 #include <linux/arm-smccc.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/misc/imx8/scu.c b/drivers/misc/imx8/scu.c
index 223aac8518a..fc9320fa993 100644
--- a/drivers/misc/imx8/scu.c
+++ b/drivers/misc/imx8/scu.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm.h>
 #include <dm/lists.h>
diff --git a/drivers/misc/imx8/scu_api.c b/drivers/misc/imx8/scu_api.c
index 20b74fbb18d..27ecce710fc 100644
--- a/drivers/misc/imx8/scu_api.c
+++ b/drivers/misc/imx8/scu_api.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <hang.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm.h>
 #include <asm/arch/sci/sci.h>
diff --git a/drivers/misc/tegra186_bpmp.c b/drivers/misc/tegra186_bpmp.c
index 18da138507c..1f4437226e7 100644
--- a/drivers/misc/tegra186_bpmp.c
+++ b/drivers/misc/tegra186_bpmp.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <time.h>
+#include <asm/global_data.h>
 #include <dm/lists.h>
 #include <dm/root.h>
 #include <mailbox.h>
diff --git a/drivers/mmc/atmel_sdhci.c b/drivers/mmc/atmel_sdhci.c
index 0c53caf448c..96cbb2a2c51 100644
--- a/drivers/mmc/atmel_sdhci.c
+++ b/drivers/mmc/atmel_sdhci.c
@@ -10,6 +10,7 @@
 #include <malloc.h>
 #include <sdhci.h>
 #include <asm/arch/clk.h>
+#include <asm/global_data.h>
 
 #define ATMEL_SDHC_MIN_FREQ	400000
 #define ATMEL_SDHC_GCK_RATE	240000000
diff --git a/drivers/mmc/ca_dw_mmc.c b/drivers/mmc/ca_dw_mmc.c
index 198c41f451f..562dcb8ee35 100644
--- a/drivers/mmc/ca_dw_mmc.c
+++ b/drivers/mmc/ca_dw_mmc.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dwmmc.h>
 #include <fdtdec.h>
+#include <asm/global_data.h>
 #include <linux/libfdt.h>
 #include <malloc.h>
 #include <errno.h>
diff --git a/drivers/mmc/exynos_dw_mmc.c b/drivers/mmc/exynos_dw_mmc.c
index 435ccac5942..94af116d10c 100644
--- a/drivers/mmc/exynos_dw_mmc.c
+++ b/drivers/mmc/exynos_dw_mmc.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dwmmc.h>
 #include <fdtdec.h>
+#include <asm/global_data.h>
 #include <linux/libfdt.h>
 #include <malloc.h>
 #include <errno.h>
diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c
index de9fe01bc5c..0f9109a2c69 100644
--- a/drivers/mmc/fsl_esdhc.c
+++ b/drivers/mmc/fsl_esdhc.c
@@ -21,6 +21,7 @@
 #include <fsl_esdhc.h>
 #include <fdt_support.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm.h>
 #include <dm/device_compat.h>
diff --git a/drivers/mmc/fsl_esdhc_imx.c b/drivers/mmc/fsl_esdhc_imx.c
index 644f4651fb8..81940bdf201 100644
--- a/drivers/mmc/fsl_esdhc_imx.c
+++ b/drivers/mmc/fsl_esdhc_imx.c
@@ -21,6 +21,7 @@
 #include <mmc.h>
 #include <part.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/drivers/mmc/ftsdc010_mci.c b/drivers/mmc/ftsdc010_mci.c
index bc0d5ffed51..71818f964d3 100644
--- a/drivers/mmc/ftsdc010_mci.c
+++ b/drivers/mmc/ftsdc010_mci.c
@@ -15,6 +15,7 @@
 #include <malloc.h>
 #include <part.h>
 #include <mmc.h>
+#include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/io.h>
 #include <linux/errno.h>
diff --git a/drivers/mmc/hi6220_dw_mmc.c b/drivers/mmc/hi6220_dw_mmc.c
index 67d6a05b3b5..61c209cb0a7 100644
--- a/drivers/mmc/hi6220_dw_mmc.c
+++ b/drivers/mmc/hi6220_dw_mmc.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <fdtdec.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/mmc/iproc_sdhci.c b/drivers/mmc/iproc_sdhci.c
index 9f530638e31..7eda1d606fd 100644
--- a/drivers/mmc/iproc_sdhci.c
+++ b/drivers/mmc/iproc_sdhci.c
@@ -9,6 +9,7 @@
 #include <errno.h>
 #include <malloc.h>
 #include <sdhci.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/mmc/jz_mmc.c b/drivers/mmc/jz_mmc.c
index b33f0850738..eec432a0df6 100644
--- a/drivers/mmc/jz_mmc.c
+++ b/drivers/mmc/jz_mmc.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <malloc.h>
 #include <mmc.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/unaligned.h>
 #include <errno.h>
diff --git a/drivers/mmc/msm_sdhci.c b/drivers/mmc/msm_sdhci.c
index 56c3e35c9e9..525c1dc9027 100644
--- a/drivers/mmc/msm_sdhci.c
+++ b/drivers/mmc/msm_sdhci.c
@@ -13,6 +13,7 @@
 #include <malloc.h>
 #include <sdhci.h>
 #include <wait_bit.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
 
diff --git a/drivers/mmc/mv_sdhci.c b/drivers/mmc/mv_sdhci.c
index 9b3dfa13e61..fa7c12837d1 100644
--- a/drivers/mmc/mv_sdhci.c
+++ b/drivers/mmc/mv_sdhci.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <malloc.h>
 #include <sdhci.h>
+#include <asm/global_data.h>
 #include <linux/mbus.h>
 
 #define MVSDH_NAME "mv_sdh"
diff --git a/drivers/mmc/mvebu_mmc.c b/drivers/mmc/mvebu_mmc.c
index 03d5150b207..8ec1f57a1b7 100644
--- a/drivers/mmc/mvebu_mmc.c
+++ b/drivers/mmc/mvebu_mmc.c
@@ -13,6 +13,7 @@
 #include <malloc.h>
 #include <part.h>
 #include <mmc.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
diff --git a/drivers/mmc/omap_hsmmc.c b/drivers/mmc/omap_hsmmc.c
index 715eee0e3e0..c5e57528660 100644
--- a/drivers/mmc/omap_hsmmc.c
+++ b/drivers/mmc/omap_hsmmc.c
@@ -35,6 +35,7 @@
 #include <palmas.h>
 #endif
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/mmc_host_def.h>
 #ifdef CONFIG_OMAP54XX
diff --git a/drivers/mmc/pic32_sdhci.c b/drivers/mmc/pic32_sdhci.c
index 029e0fbc2bb..963809fb2ae 100644
--- a/drivers/mmc/pic32_sdhci.c
+++ b/drivers/mmc/pic32_sdhci.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <dm.h>
 #include <sdhci.h>
+#include <asm/global_data.h>
 #include <linux/errno.h>
 #include <mach/pic32.h>
 
diff --git a/drivers/mmc/renesas-sdhi.c b/drivers/mmc/renesas-sdhi.c
index d80b3fc28f3..83153c5c4c4 100644
--- a/drivers/mmc/renesas-sdhi.c
+++ b/drivers/mmc/renesas-sdhi.c
@@ -11,6 +11,7 @@
 #include <malloc.h>
 #include <mmc.h>
 #include <dm.h>
+#include <asm/global_data.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/compat.h>
diff --git a/drivers/mmc/s5p_sdhci.c b/drivers/mmc/s5p_sdhci.c
index 24f599e868a..240db8a7569 100644
--- a/drivers/mmc/s5p_sdhci.c
+++ b/drivers/mmc/s5p_sdhci.c
@@ -10,6 +10,7 @@
 #include <malloc.h>
 #include <sdhci.h>
 #include <fdtdec.h>
+#include <asm/global_data.h>
 #include <linux/libfdt.h>
 #include <asm/gpio.h>
 #include <asm/arch/mmc.h>
diff --git a/drivers/mmc/sdhci-cadence.c b/drivers/mmc/sdhci-cadence.c
index cc99bebc305..b1e53e8d425 100644
--- a/drivers/mmc/sdhci-cadence.c
+++ b/drivers/mmc/sdhci-cadence.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <asm/global_data.h>
 #include <dm/device_compat.h>
 #include <linux/bitfield.h>
 #include <linux/bitops.h>
diff --git a/drivers/mmc/sh_mmcif.c b/drivers/mmc/sh_mmcif.c
index ad386909e90..f7dd2aadc3e 100644
--- a/drivers/mmc/sh_mmcif.c
+++ b/drivers/mmc/sh_mmcif.c
@@ -14,6 +14,7 @@
 #include <clk.h>
 #include <dm.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/drivers/mmc/sh_sdhi.c b/drivers/mmc/sh_sdhi.c
index 315f95cce82..a279bc69aaf 100644
--- a/drivers/mmc/sh_sdhi.c
+++ b/drivers/mmc/sh_sdhi.c
@@ -15,6 +15,7 @@
 #include <mmc.h>
 #include <dm.h>
 #include <part.h>
+#include <asm/global_data.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/drivers/mmc/socfpga_dw_mmc.c b/drivers/mmc/socfpga_dw_mmc.c
index 0022f943bd7..16a6e3056dc 100644
--- a/drivers/mmc/socfpga_dw_mmc.c
+++ b/drivers/mmc/socfpga_dw_mmc.c
@@ -12,6 +12,7 @@
 #include <dwmmc.h>
 #include <errno.h>
 #include <fdtdec.h>
+#include <asm/global_data.h>
 #include <dm/device_compat.h>
 #include <linux/libfdt.h>
 #include <linux/err.h>
diff --git a/drivers/mmc/sti_sdhci.c b/drivers/mmc/sti_sdhci.c
index 5578feebef7..db0b566a8b7 100644
--- a/drivers/mmc/sti_sdhci.c
+++ b/drivers/mmc/sti_sdhci.c
@@ -11,6 +11,7 @@
 #include <reset-uclass.h>
 #include <sdhci.h>
 #include <asm/arch/sdhci.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/mmc/tmio-common.c b/drivers/mmc/tmio-common.c
index c6539736766..b56f650f8a7 100644
--- a/drivers/mmc/tmio-common.c
+++ b/drivers/mmc/tmio-common.c
@@ -10,6 +10,7 @@
 #include <fdtdec.h>
 #include <mmc.h>
 #include <dm.h>
+#include <asm/global_data.h>
 #include <dm/device_compat.h>
 #include <dm/pinctrl.h>
 #include <linux/compat.h>
diff --git a/drivers/mmc/xenon_sdhci.c b/drivers/mmc/xenon_sdhci.c
index 356dd9846d6..c3ea9d7f532 100644
--- a/drivers/mmc/xenon_sdhci.c
+++ b/drivers/mmc/xenon_sdhci.c
@@ -17,6 +17,7 @@
 #include <common.h>
 #include <dm.h>
 #include <fdtdec.h>
+#include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
diff --git a/drivers/mtd/altera_qspi.c b/drivers/mtd/altera_qspi.c
index cd4d32959a0..346244e1110 100644
--- a/drivers/mtd/altera_qspi.c
+++ b/drivers/mtd/altera_qspi.c
@@ -11,6 +11,7 @@
 #include <flash.h>
 #include <log.h>
 #include <mtd.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
 
diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c
index b7289ba5394..feb46d8cf28 100644
--- a/drivers/mtd/cfi_flash.c
+++ b/drivers/mtd/cfi_flash.c
@@ -26,6 +26,7 @@
 #include <init.h>
 #include <irq_func.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/processor.h>
 #include <asm/io.h>
 #include <asm/byteorder.h>
diff --git a/drivers/mtd/mtd_uboot.c b/drivers/mtd/mtd_uboot.c
index 9360d4ed172..2499cb52d8c 100644
--- a/drivers/mtd/mtd_uboot.c
+++ b/drivers/mtd/mtd_uboot.c
@@ -7,6 +7,7 @@
 #include <env.h>
 #include <log.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <dm/device.h>
 #include <dm/uclass-internal.h>
 #include <linux/err.h>
diff --git a/drivers/mtd/nand/raw/nand_base.c b/drivers/mtd/nand/raw/nand_base.c
index 698968bc116..ebb40f93325 100644
--- a/drivers/mtd/nand/raw/nand_base.c
+++ b/drivers/mtd/nand/raw/nand_base.c
@@ -35,6 +35,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <watchdog.h>
+#include <asm/global_data.h>
 #include <dm/devres.h>
 #include <linux/bitops.h>
 #include <linux/bug.h>
diff --git a/drivers/mtd/nand/raw/pxa3xx_nand.c b/drivers/mtd/nand/raw/pxa3xx_nand.c
index a30e82166b9..701bfead773 100644
--- a/drivers/mtd/nand/raw/pxa3xx_nand.c
+++ b/drivers/mtd/nand/raw/pxa3xx_nand.c
@@ -10,6 +10,7 @@
 #include <malloc.h>
 #include <fdtdec.h>
 #include <nand.h>
+#include <asm/global_data.h>
 #include <dm/device_compat.h>
 #include <dm/devres.h>
 #include <linux/bitops.h>
diff --git a/drivers/mtd/nand/raw/sunxi_nand.c b/drivers/mtd/nand/raw/sunxi_nand.c
index 004b6f17a51..6d02d56aeb6 100644
--- a/drivers/mtd/nand/raw/sunxi_nand.c
+++ b/drivers/mtd/nand/raw/sunxi_nand.c
@@ -29,6 +29,7 @@
 #include <malloc.h>
 #include <memalign.h>
 #include <nand.h>
+#include <asm/global_data.h>
 #include <dm/device_compat.h>
 #include <dm/devres.h>
 #include <linux/bitops.h>
diff --git a/drivers/mtd/nand/raw/tegra_nand.c b/drivers/mtd/nand/raw/tegra_nand.c
index b9f5bdd9535..dd14c34738a 100644
--- a/drivers/mtd/nand/raw/tegra_nand.c
+++ b/drivers/mtd/nand/raw/tegra_nand.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <memalign.h>
 #include <nand.h>
diff --git a/drivers/mtd/pic32_flash.c b/drivers/mtd/pic32_flash.c
index a58a2c4b6c3..ea0dbe9eeee 100644
--- a/drivers/mtd/pic32_flash.c
+++ b/drivers/mtd/pic32_flash.c
@@ -12,6 +12,7 @@
 #include <flash.h>
 #include <init.h>
 #include <irq_func.h>
+#include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <mach/pic32.h>
 #include <wait_bit.h>
diff --git a/drivers/mtd/renesas_rpc_hf.c b/drivers/mtd/renesas_rpc_hf.c
index 65320c7ed98..f15228741ff 100644
--- a/drivers/mtd/renesas_rpc_hf.c
+++ b/drivers/mtd/renesas_rpc_hf.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <clk.h>
 #include <dm.h>
diff --git a/drivers/mtd/spi/sf-uclass.c b/drivers/mtd/spi/sf-uclass.c
index 09c11439b08..121804e3269 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 <asm/global_data.h>
 #include <dm/device-internal.h>
 #include "sf_internal.h"
 
diff --git a/drivers/net/ag7xxx.c b/drivers/net/ag7xxx.c
index ccba3947ac5..c7ea60f5acc 100644
--- a/drivers/net/ag7xxx.c
+++ b/drivers/net/ag7xxx.c
@@ -16,6 +16,7 @@
 #include <malloc.h>
 #include <net.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/compiler.h>
 #include <linux/delay.h>
diff --git a/drivers/net/altera_tse.c b/drivers/net/altera_tse.c
index 93b26da3926..2097718057b 100644
--- a/drivers/net/altera_tse.c
+++ b/drivers/net/altera_tse.c
@@ -18,6 +18,7 @@
 #include <miiphy.h>
 #include <net.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <linux/dma-mapping.h>
 #include <asm/io.h>
 #include "altera_tse.h"
diff --git a/drivers/net/dwc_eth_qos.c b/drivers/net/dwc_eth_qos.c
index 1d9eefbb3e8..906ccb10c43 100644
--- a/drivers/net/dwc_eth_qos.c
+++ b/drivers/net/dwc_eth_qos.c
@@ -41,6 +41,7 @@
 #include <reset.h>
 #include <wait_bit.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <eth_phy.h>
diff --git a/drivers/net/dwmac_s700.c b/drivers/net/dwmac_s700.c
index 9d3f3ac5d93..2cf36f40494 100644
--- a/drivers/net/dwmac_s700.c
+++ b/drivers/net/dwmac_s700.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm.h>
 #include <clk.h>
diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c
index bb55be9a267..468be69886c 100644
--- a/drivers/net/fec_mxc.c
+++ b/drivers/net/fec_mxc.c
@@ -18,6 +18,7 @@
 #include <net.h>
 #include <netdev.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 #include <power/regulator.h>
 
diff --git a/drivers/net/fsl-mc/mc.c b/drivers/net/fsl-mc/mc.c
index 84db6be624a..26e9523288e 100644
--- a/drivers/net/fsl-mc/mc.c
+++ b/drivers/net/fsl-mc/mc.c
@@ -11,6 +11,7 @@
 #include <image.h>
 #include <log.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <linux/bug.h>
 #include <asm/io.h>
 #include <linux/delay.h>
diff --git a/drivers/net/fsl_mcdmafec.c b/drivers/net/fsl_mcdmafec.c
index e27f7e5321a..f3eea57fb9a 100644
--- a/drivers/net/fsl_mcdmafec.c
+++ b/drivers/net/fsl_mcdmafec.c
@@ -18,6 +18,7 @@
 #include <config.h>
 #include <net.h>
 #include <miiphy.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/mii.h>
 #include <asm/immap.h>
diff --git a/drivers/net/ftmac100.c b/drivers/net/ftmac100.c
index 292690de961..d45f17eb8dd 100644
--- a/drivers/net/ftmac100.c
+++ b/drivers/net/ftmac100.c
@@ -12,6 +12,7 @@
 #include <env.h>
 #include <malloc.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/io.h>
 
diff --git a/drivers/net/gmac_rockchip.c b/drivers/net/gmac_rockchip.c
index 8d95ee15ffd..98d7c39f9fe 100644
--- a/drivers/net/gmac_rockchip.c
+++ b/drivers/net/gmac_rockchip.c
@@ -12,6 +12,7 @@
 #include <net.h>
 #include <phy.h>
 #include <syscon.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch-rockchip/periph.h>
 #include <asm/arch-rockchip/clock.h>
diff --git a/drivers/net/ldpaa_eth/ldpaa_eth.c b/drivers/net/ldpaa_eth/ldpaa_eth.c
index 67da549fdbf..b340c576108 100644
--- a/drivers/net/ldpaa_eth/ldpaa_eth.c
+++ b/drivers/net/ldpaa_eth/ldpaa_eth.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/types.h>
 #include <malloc.h>
diff --git a/drivers/net/macb.c b/drivers/net/macb.c
index b80a259ff75..cda9b16cc24 100644
--- a/drivers/net/macb.c
+++ b/drivers/net/macb.c
@@ -7,6 +7,7 @@
 #include <cpu_func.h>
 #include <dm.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 
 /*
diff --git a/drivers/net/mcffec.c b/drivers/net/mcffec.c
index f94a2d8123c..d881c5eb871 100644
--- a/drivers/net/mcffec.c
+++ b/drivers/net/mcffec.c
@@ -18,6 +18,7 @@
 #include <net.h>
 #include <miiphy.h>
 #include <asm/fec.h>
+#include <asm/global_data.h>
 #include <asm/immap.h>
 #include <linux/delay.h>
 #include <linux/mii.h>
diff --git a/drivers/net/mcfmii.c b/drivers/net/mcfmii.c
index 393605512d9..da5075172fa 100644
--- a/drivers/net/mcfmii.c
+++ b/drivers/net/mcfmii.c
@@ -8,6 +8,7 @@
 #include <config.h>
 #include <net.h>
 #include <netdev.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 
 #ifdef CONFIG_MCF547x_8x
diff --git a/drivers/net/mpc8xx_fec.c b/drivers/net/mpc8xx_fec.c
index 12be584638f..282c2599d3c 100644
--- a/drivers/net/mpc8xx_fec.c
+++ b/drivers/net/mpc8xx_fec.c
@@ -11,6 +11,7 @@
 #include <net.h>
 #include <netdev.h>
 #include <asm/cpm_8xx.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/delay.h>
 
diff --git a/drivers/net/mvgbe.c b/drivers/net/mvgbe.c
index 2f9464b961a..bf5f6f4b672 100644
--- a/drivers/net/mvgbe.c
+++ b/drivers/net/mvgbe.c
@@ -18,6 +18,7 @@
 #include <malloc.h>
 #include <miiphy.h>
 #include <wait_bit.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/net/mvneta.c b/drivers/net/mvneta.c
index 4c7d06ca40e..5fd668b5e42 100644
--- a/drivers/net/mvneta.c
+++ b/drivers/net/mvneta.c
@@ -21,6 +21,7 @@
 #include <config.h>
 #include <malloc.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm/device_compat.h>
 #include <dm/devres.h>
diff --git a/drivers/net/mvpp2.c b/drivers/net/mvpp2.c
index a5747a25abe..37a8a7849f4 100644
--- a/drivers/net/mvpp2.c
+++ b/drivers/net/mvpp2.c
@@ -17,6 +17,7 @@
 #include <cpu_func.h>
 #include <dm.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <dm/device-internal.h>
 #include <dm/device_compat.h>
 #include <dm/devres.h>
diff --git a/drivers/net/phy/fixed.c b/drivers/net/phy/fixed.c
index 9d9f746e1db..3228672fc4a 100644
--- a/drivers/net/phy/fixed.c
+++ b/drivers/net/phy/fixed.c
@@ -11,6 +11,7 @@
 #include <phy.h>
 #include <dm.h>
 #include <fdt_support.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/net/phy/miiphybb.c b/drivers/net/phy/miiphybb.c
index ba97a54c067..bb5aa3513b6 100644
--- a/drivers/net/phy/miiphybb.c
+++ b/drivers/net/phy/miiphybb.c
@@ -16,6 +16,7 @@
 #include <ioports.h>
 #include <ppc_asm.tmpl>
 #include <miiphy.h>
+#include <asm/global_data.h>
 
 #define BB_MII_RELOCATE(v,off) (v += (v?off:0))
 
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 67789897c25..f8254759386 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -17,6 +17,7 @@
 #include <miiphy.h>
 #include <phy.h>
 #include <errno.h>
+#include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/err.h>
diff --git a/drivers/net/phy/xilinx_gmii2rgmii.c b/drivers/net/phy/xilinx_gmii2rgmii.c
index e2feb17048c..74105c0b7d6 100644
--- a/drivers/net/phy/xilinx_gmii2rgmii.c
+++ b/drivers/net/phy/xilinx_gmii2rgmii.c
@@ -5,11 +5,11 @@
  * Copyright (C) 2018 Xilinx, Inc.
  */
 
+#include <common.h>
 #include <dm.h>
 #include <log.h>
 #include <phy.h>
-#include <config.h>
-#include <common.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/net/pic32_eth.c b/drivers/net/pic32_eth.c
index 6a2084947b0..bbc305f81db 100644
--- a/drivers/net/pic32_eth.c
+++ b/drivers/net/pic32_eth.c
@@ -14,6 +14,7 @@
 #include <console.h>
 #include <time.h>
 #include <wait_bit.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <linux/delay.h>
 #include <linux/mii.h>
diff --git a/drivers/net/ravb.c b/drivers/net/ravb.c
index 886f53ee827..23d5c88a88d 100644
--- a/drivers/net/ravb.c
+++ b/drivers/net/ravb.c
@@ -17,6 +17,7 @@
 #include <miiphy.h>
 #include <malloc.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/mii.h>
diff --git a/drivers/net/sandbox-raw.c b/drivers/net/sandbox-raw.c
index 4bd94c31031..6dddae911b0 100644
--- a/drivers/net/sandbox-raw.c
+++ b/drivers/net/sandbox-raw.c
@@ -13,6 +13,7 @@
 #include <env.h>
 #include <malloc.h>
 #include <net.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/net/sandbox.c b/drivers/net/sandbox.c
index 4f7e3d42438..51d80f54967 100644
--- a/drivers/net/sandbox.c
+++ b/drivers/net/sandbox.c
@@ -12,6 +12,7 @@
 #include <malloc.h>
 #include <net.h>
 #include <asm/eth.h>
+#include <asm/global_data.h>
 #include <asm/test.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c
index 4cbffb14c51..49b4a91875a 100644
--- a/drivers/net/sh_eth.c
+++ b/drivers/net/sh_eth.c
@@ -18,6 +18,7 @@
 #include <netdev.h>
 #include <miiphy.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/io.h>
diff --git a/drivers/net/sni_ave.c b/drivers/net/sni_ave.c
index 0f7ada8c3e2..c11a1c443ee 100644
--- a/drivers/net/sni_ave.c
+++ b/drivers/net/sni_ave.c
@@ -16,6 +16,7 @@
 #include <reset.h>
 #include <syscon.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/drivers/net/sun8i_emac.c b/drivers/net/sun8i_emac.c
index 546cc6ccb6e..a65700020d5 100644
--- a/drivers/net/sun8i_emac.c
+++ b/drivers/net/sun8i_emac.c
@@ -13,6 +13,7 @@
 #include <cpu_func.h>
 #include <log.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/gpio.h>
diff --git a/drivers/net/ti/cpsw-common.c b/drivers/net/ti/cpsw-common.c
index ca93edb70e3..3140f2515fb 100644
--- a/drivers/net/ti/cpsw-common.c
+++ b/drivers/net/ti/cpsw-common.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <dm.h>
 #include <fdt_support.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <cpsw.h>
 #include <dm/device_compat.h>
diff --git a/drivers/net/ti/keystone_net.c b/drivers/net/ti/keystone_net.c
index 50f0d33a83b..c25902a7032 100644
--- a/drivers/net/ti/keystone_net.c
+++ b/drivers/net/ti/keystone_net.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <command.h>
 #include <console.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 
 #include <dm.h>
diff --git a/drivers/net/xilinx_axi_emac.c b/drivers/net/xilinx_axi_emac.c
index 99d4d85c527..65abc7d1834 100644
--- a/drivers/net/xilinx_axi_emac.c
+++ b/drivers/net/xilinx_axi_emac.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <net.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <phy.h>
 #include <miiphy.h>
diff --git a/drivers/net/xilinx_emaclite.c b/drivers/net/xilinx_emaclite.c
index 64c18bae74b..9f2327b92cd 100644
--- a/drivers/net/xilinx_emaclite.c
+++ b/drivers/net/xilinx_emaclite.c
@@ -13,6 +13,7 @@
 #include <dm.h>
 #include <console.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <phy.h>
 #include <miiphy.h>
diff --git a/drivers/pci/fsl_pci_init.c b/drivers/pci/fsl_pci_init.c
index 1d09c5ac4f6..e72a60c1318 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 <asm/fsl_serdes.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/pci/pci-uclass.c b/drivers/pci/pci-uclass.c
index 834526c5a47..380726297c5 100644
--- a/drivers/pci/pci-uclass.c
+++ b/drivers/pci/pci-uclass.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <pci.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm/device-internal.h>
 #include <dm/lists.h>
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 664e8379eb5..25a755627c0 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -17,6 +17,7 @@
 #include <common.h>
 #include <init.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 
 #include <command.h>
diff --git a/drivers/pci/pci_mvebu.c b/drivers/pci/pci_mvebu.c
index c9afe751501..167fe026e8b 100644
--- a/drivers/pci/pci_mvebu.c
+++ b/drivers/pci/pci_mvebu.c
@@ -13,6 +13,7 @@
 #include <dm.h>
 #include <log.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <dm/device-internal.h>
 #include <dm/lists.h>
 #include <dm/of_access.h>
diff --git a/drivers/pci/pci_rom.c b/drivers/pci/pci_rom.c
index fa29d69e859..39284badf20 100644
--- a/drivers/pci/pci_rom.c
+++ b/drivers/pci/pci_rom.c
@@ -38,6 +38,7 @@
 #include <video.h>
 #include <video_fb.h>
 #include <acpi/acpi_s3.h>
+#include <asm/global_data.h>
 #include <linux/screen_info.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/pci/pcie_dw_mvebu.c b/drivers/pci/pcie_dw_mvebu.c
index c773f8d28d2..33ecd25f848 100644
--- a/drivers/pci/pcie_dw_mvebu.c
+++ b/drivers/pci/pcie_dw_mvebu.c
@@ -14,6 +14,7 @@
 #include <dm.h>
 #include <log.h>
 #include <pci.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm-generic/gpio.h>
 #include <linux/delay.h>
diff --git a/drivers/pci/pcie_dw_ti.c b/drivers/pci/pcie_dw_ti.c
index 742dd93633e..16b2a2da7e7 100644
--- a/drivers/pci/pcie_dw_ti.c
+++ b/drivers/pci/pcie_dw_ti.c
@@ -11,6 +11,7 @@
 #include <power-domain.h>
 #include <regmap.h>
 #include <syscon.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm-generic/gpio.h>
 #include <dm/device_compat.h>
diff --git a/drivers/pci/pcie_ecam_generic.c b/drivers/pci/pcie_ecam_generic.c
index 890b6a8fb69..354a1454a9f 100644
--- a/drivers/pci/pcie_ecam_generic.c
+++ b/drivers/pci/pcie_ecam_generic.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <dm.h>
 #include <pci.h>
+#include <asm/global_data.h>
 
 #include <asm/io.h>
 
diff --git a/drivers/pci/pcie_fsl.c b/drivers/pci/pcie_fsl.c
index ab33459e28e..e431ef211ed 100644
--- a/drivers/pci/pcie_fsl.c
+++ b/drivers/pci/pcie_fsl.c
@@ -13,6 +13,7 @@
 #include <pci.h>
 #include <asm/fsl_pci.h>
 #include <asm/fsl_serdes.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/delay.h>
 #include "pcie_fsl.h"
diff --git a/drivers/pci/pcie_intel_fpga.c b/drivers/pci/pcie_intel_fpga.c
index 9f102c64c60..2aedbdd0e56 100644
--- a/drivers/pci/pcie_intel_fpga.c
+++ b/drivers/pci/pcie_intel_fpga.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <dm.h>
 #include <pci.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
diff --git a/drivers/pci/pcie_layerscape.c b/drivers/pci/pcie_layerscape.c
index 25b5272d4ed..3c7c4ca18e8 100644
--- a/drivers/pci/pcie_layerscape.c
+++ b/drivers/pci/pcie_layerscape.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <errno.h>
 #include <malloc.h>
diff --git a/drivers/pci/pcie_layerscape_ep.c b/drivers/pci/pcie_layerscape_ep.c
index eba230e3a5f..6de93fac997 100644
--- a/drivers/pci/pcie_layerscape_ep.c
+++ b/drivers/pci/pcie_layerscape_ep.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <asm/global_data.h>
 #include <dm/devres.h>
 #include <errno.h>
 #include <pci_ep.h>
diff --git a/drivers/pci/pcie_layerscape_fixup_common.c b/drivers/pci/pcie_layerscape_fixup_common.c
index fef0a75f115..814650f1e15 100644
--- a/drivers/pci/pcie_layerscape_fixup_common.c
+++ b/drivers/pci/pcie_layerscape_fixup_common.c
@@ -11,6 +11,7 @@
 #include <init.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/soc.h>
+#include <linux/libfdt.h>
 #include "pcie_layerscape_fixup_common.h"
 
 void ft_pci_setup(void *blob, struct bd_info *bd)
diff --git a/drivers/pci/pcie_layerscape_gen4.c b/drivers/pci/pcie_layerscape_gen4.c
index 428bfcab09f..96c6527f806 100644
--- a/drivers/pci/pcie_layerscape_gen4.c
+++ b/drivers/pci/pcie_layerscape_gen4.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <asm/arch/fsl_serdes.h>
 #include <pci.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <errno.h>
 #include <malloc.h>
diff --git a/drivers/pci/pcie_layerscape_rc.c b/drivers/pci/pcie_layerscape_rc.c
index 25c6ddebce0..7ae5b48bb92 100644
--- a/drivers/pci/pcie_layerscape_rc.c
+++ b/drivers/pci/pcie_layerscape_rc.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <asm/arch/fsl_serdes.h>
 #include <pci.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <errno.h>
 #include <malloc.h>
diff --git a/drivers/pci/pcie_phytium.c b/drivers/pci/pcie_phytium.c
index 51b2171f9fa..35ca104300b 100644
--- a/drivers/pci/pcie_phytium.c
+++ b/drivers/pci/pcie_phytium.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <dm.h>
 #include <pci.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 
 /**
diff --git a/drivers/pci/pcie_rockchip.c b/drivers/pci/pcie_rockchip.c
index 04609f12962..7d84be36be9 100644
--- a/drivers/pci/pcie_rockchip.c
+++ b/drivers/pci/pcie_rockchip.c
@@ -14,6 +14,7 @@
 #include <common.h>
 #include <clk.h>
 #include <dm.h>
+#include <asm/global_data.h>
 #include <dm/device_compat.h>
 #include <generic-phy.h>
 #include <pci.h>
diff --git a/drivers/pci/pcie_xilinx.c b/drivers/pci/pcie_xilinx.c
index 713ad49d045..88660a9957a 100644
--- a/drivers/pci/pcie_xilinx.c
+++ b/drivers/pci/pcie_xilinx.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <dm.h>
 #include <pci.h>
+#include <asm/global_data.h>
 #include <linux/bitops.h>
 
 #include <asm/io.h>
diff --git a/drivers/pci_endpoint/pci_ep-uclass.c b/drivers/pci_endpoint/pci_ep-uclass.c
index 38a5f083769..71b6bfa6382 100644
--- a/drivers/pci_endpoint/pci_ep-uclass.c
+++ b/drivers/pci_endpoint/pci_ep-uclass.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
+#include <asm/global_data.h>
 #include <linux/log2.h>
 #include <pci_ep.h>
 
diff --git a/drivers/pci_endpoint/pcie-cadence-ep.c b/drivers/pci_endpoint/pcie-cadence-ep.c
index 74dfdde154e..e392fae338a 100644
--- a/drivers/pci_endpoint/pcie-cadence-ep.c
+++ b/drivers/pci_endpoint/pcie-cadence-ep.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <pci_ep.h>
+#include <asm/global_data.h>
 #include <linux/sizes.h>
 #include <linux/log2.h>
 #include "pcie-cadence.h"
diff --git a/drivers/phy/marvell/comphy_a3700.c b/drivers/phy/marvell/comphy_a3700.c
index dc188c44e0d..e9ba4cfec22 100644
--- a/drivers/phy/marvell/comphy_a3700.c
+++ b/drivers/phy/marvell/comphy_a3700.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <fdtdec.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
diff --git a/drivers/phy/marvell/comphy_core.c b/drivers/phy/marvell/comphy_core.c
index 27bff27ff7e..5ef6129f349 100644
--- a/drivers/phy/marvell/comphy_core.c
+++ b/drivers/phy/marvell/comphy_core.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <dm.h>
 #include <fdtdec.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm/device_compat.h>
 #include <linux/err.h>
diff --git a/drivers/phy/marvell/comphy_cp110.c b/drivers/phy/marvell/comphy_cp110.c
index 15e80049def..484b28745e0 100644
--- a/drivers/phy/marvell/comphy_cp110.c
+++ b/drivers/phy/marvell/comphy_cp110.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <fdtdec.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
diff --git a/drivers/phy/omap-usb2-phy.c b/drivers/phy/omap-usb2-phy.c
index adc454ddd48..ae0968ab5b2 100644
--- a/drivers/phy/omap-usb2-phy.c
+++ b/drivers/phy/omap-usb2-phy.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm.h>
 #include <errno.h>
diff --git a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
index c5ea6ca31f1..29749b4c3fa 100644
--- a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
+++ b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <clk.h>
 #include <dm.h>
+#include <asm/global_data.h>
 #include <dm/device_compat.h>
 #include <dm/lists.h>
 #include <generic-phy.h>
diff --git a/drivers/phy/rockchip/phy-rockchip-pcie.c b/drivers/phy/rockchip/phy-rockchip-pcie.c
index 83928cffe06..c3bec8263f8 100644
--- a/drivers/phy/rockchip/phy-rockchip-pcie.c
+++ b/drivers/phy/rockchip/phy-rockchip-pcie.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <clk.h>
 #include <dm.h>
+#include <asm/global_data.h>
 #include <dm/device_compat.h>
 #include <generic-phy.h>
 #include <reset.h>
diff --git a/drivers/phy/rockchip/phy-rockchip-typec.c b/drivers/phy/rockchip/phy-rockchip-typec.c
index c9c8e1c5428..6a5dc7ee44f 100644
--- a/drivers/phy/rockchip/phy-rockchip-typec.c
+++ b/drivers/phy/rockchip/phy-rockchip-typec.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <clk.h>
 #include <dm.h>
+#include <asm/global_data.h>
 #include <dm/device_compat.h>
 #include <dm/lists.h>
 #include <generic-phy.h>
diff --git a/drivers/phy/sti_usb_phy.c b/drivers/phy/sti_usb_phy.c
index 2a20f7601c0..c6b1dc297ab 100644
--- a/drivers/phy/sti_usb_phy.c
+++ b/drivers/phy/sti_usb_phy.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <bitfield.h>
 #include <dm.h>
diff --git a/drivers/phy/ti-pipe3-phy.c b/drivers/phy/ti-pipe3-phy.c
index 3f49851bcab..41cee0eb740 100644
--- a/drivers/phy/ti-pipe3-phy.c
+++ b/drivers/phy/ti-pipe3-phy.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <asm/global_data.h>
 #include <dm/device.h>
 #include <generic-phy.h>
 #include <asm/io.h>
diff --git a/drivers/pinctrl/ath79/pinctrl_ar933x.c b/drivers/pinctrl/ath79/pinctrl_ar933x.c
index 61e80818743..b3f9f6a01fd 100644
--- a/drivers/pinctrl/ath79/pinctrl_ar933x.c
+++ b/drivers/pinctrl/ath79/pinctrl_ar933x.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm/pinctrl.h>
 #include <mach/ar71xx_regs.h>
diff --git a/drivers/pinctrl/ath79/pinctrl_qca953x.c b/drivers/pinctrl/ath79/pinctrl_qca953x.c
index 2d5a4a3ab23..d27848c1ddd 100644
--- a/drivers/pinctrl/ath79/pinctrl_qca953x.c
+++ b/drivers/pinctrl/ath79/pinctrl_qca953x.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm/pinctrl.h>
 #include <mach/ar71xx_regs.h>
diff --git a/drivers/pinctrl/exynos/pinctrl-exynos.c b/drivers/pinctrl/exynos/pinctrl-exynos.c
index 4cdc071d559..cc7ef799895 100644
--- a/drivers/pinctrl/exynos/pinctrl-exynos.c
+++ b/drivers/pinctrl/exynos/pinctrl-exynos.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include "pinctrl-exynos.h"
 
diff --git a/drivers/pinctrl/meson/pinctrl-meson.c b/drivers/pinctrl/meson/pinctrl-meson.c
index d4539b02d88..664af76d584 100644
--- a/drivers/pinctrl/meson/pinctrl-meson.c
+++ b/drivers/pinctrl/meson/pinctrl-meson.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <log.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <dm/device-internal.h>
 #include <dm/device_compat.h>
 #include <dm/lists.h>
diff --git a/drivers/pinctrl/mtmips/pinctrl-mt7628.c b/drivers/pinctrl/mtmips/pinctrl-mt7628.c
index fc9d8b5ad10..1b51c229271 100644
--- a/drivers/pinctrl/mtmips/pinctrl-mt7628.c
+++ b/drivers/pinctrl/mtmips/pinctrl-mt7628.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <asm/global_data.h>
 #include <dm/pinctrl.h>
 #include <linux/bitops.h>
 #include <linux/io.h>
diff --git a/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c b/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c
index fb497803b93..1f61a84c29d 100644
--- a/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c
+++ b/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c
@@ -20,6 +20,7 @@
 #include <config.h>
 #include <dm.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <dm/device-internal.h>
 #include <dm/device_compat.h>
 #include <dm/devres.h>
diff --git a/drivers/pinctrl/mvebu/pinctrl-mvebu.c b/drivers/pinctrl/mvebu/pinctrl-mvebu.c
index 2206e958ec7..c2b9c80586b 100644
--- a/drivers/pinctrl/mvebu/pinctrl-mvebu.c
+++ b/drivers/pinctrl/mvebu/pinctrl-mvebu.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <dm.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <dm/pinctrl.h>
 #include <dm/root.h>
 #include <asm/system.h>
diff --git a/drivers/pinctrl/nxp/pinctrl-imx.c b/drivers/pinctrl/nxp/pinctrl-imx.c
index 48c7bde3752..1596dcc4747 100644
--- a/drivers/pinctrl/nxp/pinctrl-imx.c
+++ b/drivers/pinctrl/nxp/pinctrl-imx.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <malloc.h>
 #include <mapmem.h>
+#include <asm/global_data.h>
 #include <dm/device_compat.h>
 #include <dm/devres.h>
 #include <linux/bitops.h>
diff --git a/drivers/pinctrl/nxp/pinctrl-imx8.c b/drivers/pinctrl/nxp/pinctrl-imx8.c
index c1b0ca438aa..7af9506d504 100644
--- a/drivers/pinctrl/nxp/pinctrl-imx8.c
+++ b/drivers/pinctrl/nxp/pinctrl-imx8.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <asm/global_data.h>
 #include <dm/device.h>
 #include <dm/pinctrl.h>
 
diff --git a/drivers/pinctrl/nxp/pinctrl-mxs.c b/drivers/pinctrl/nxp/pinctrl-mxs.c
index db463fc04b9..1067654e07e 100644
--- a/drivers/pinctrl/nxp/pinctrl-mxs.c
+++ b/drivers/pinctrl/nxp/pinctrl-mxs.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <dm/device_compat.h>
 #include <dm/devres.h>
 #include <linux/io.h>
diff --git a/drivers/pinctrl/pinctrl-at91-pio4.c b/drivers/pinctrl/pinctrl-at91-pio4.c
index fdb7920b558..d325422f854 100644
--- a/drivers/pinctrl/pinctrl-at91-pio4.c
+++ b/drivers/pinctrl/pinctrl-at91-pio4.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <asm/global_data.h>
 #include <dm/pinctrl.h>
 #include <linux/bitops.h>
 #include <linux/io.h>
diff --git a/drivers/pinctrl/pinctrl-at91.c b/drivers/pinctrl/pinctrl-at91.c
index cd7b32ce346..30f2bebbc78 100644
--- a/drivers/pinctrl/pinctrl-at91.c
+++ b/drivers/pinctrl/pinctrl-at91.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <dm/pinctrl.h>
 #include <asm/hardware.h>
 #include <linux/bitops.h>
diff --git a/drivers/pinctrl/pinctrl-sti.c b/drivers/pinctrl/pinctrl-sti.c
index 8e942a82802..7d6bdc1d2bd 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 <asm/global_data.h>
 #include <asm/io.h>
 #include <dm/pinctrl.h>
 #include <linux/bug.h>
diff --git a/drivers/pinctrl/pinctrl-uclass.c b/drivers/pinctrl/pinctrl-uclass.c
index aba88104747..79a52333053 100644
--- a/drivers/pinctrl/pinctrl-uclass.c
+++ b/drivers/pinctrl/pinctrl-uclass.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <dm/device_compat.h>
 #include <linux/libfdt.h>
 #include <linux/err.h>
diff --git a/drivers/pinctrl/pinctrl_pic32.c b/drivers/pinctrl/pinctrl_pic32.c
index 911af1297b8..79c95034985 100644
--- a/drivers/pinctrl/pinctrl_pic32.c
+++ b/drivers/pinctrl/pinctrl_pic32.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm/pinctrl.h>
 #include <linux/bitops.h>
diff --git a/drivers/pinctrl/pinctrl_stm32.c b/drivers/pinctrl/pinctrl_stm32.c
index 71fa29a3891..fedab6605e9 100644
--- a/drivers/pinctrl/pinctrl_stm32.c
+++ b/drivers/pinctrl/pinctrl_stm32.c
@@ -4,6 +4,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <asm/arch/gpio.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <dm/device_compat.h>
diff --git a/drivers/pinctrl/renesas/pfc-r7s72100.c b/drivers/pinctrl/renesas/pfc-r7s72100.c
index 9d7814a5f25..b368336c887 100644
--- a/drivers/pinctrl/renesas/pfc-r7s72100.c
+++ b/drivers/pinctrl/renesas/pfc-r7s72100.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <asm/global_data.h>
 #include <dm/lists.h>
 #include <dm/pinctrl.h>
 #include <linux/bitops.h>
diff --git a/drivers/pinctrl/rockchip/pinctrl-rockchip-core.c b/drivers/pinctrl/rockchip/pinctrl-rockchip-core.c
index ec1cb9b652f..8abad950431 100644
--- a/drivers/pinctrl/rockchip/pinctrl-rockchip-core.c
+++ b/drivers/pinctrl/rockchip/pinctrl-rockchip-core.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <dm/pinctrl.h>
 #include <regmap.h>
 #include <syscon.h>
diff --git a/drivers/power/domain/imx8-power-domain-legacy.c b/drivers/power/domain/imx8-power-domain-legacy.c
index 889b65a47ff..961382f33e1 100644
--- a/drivers/power/domain/imx8-power-domain-legacy.c
+++ b/drivers/power/domain/imx8-power-domain-legacy.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <power-domain-uclass.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/power-domain.h>
 #include <dm/device-internal.h>
diff --git a/drivers/power/domain/imx8m-power-domain.c b/drivers/power/domain/imx8m-power-domain.c
index 0ef460df8c2..f6681c7b0b5 100644
--- a/drivers/power/domain/imx8m-power-domain.c
+++ b/drivers/power/domain/imx8m-power-domain.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <malloc.h>
 #include <power-domain-uclass.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/power-domain.h>
 #include <asm/mach-imx/sys_proto.h>
diff --git a/drivers/power/pmic/bd71837.c b/drivers/power/pmic/bd71837.c
index 31c9139c646..cb9238972f2 100644
--- a/drivers/power/pmic/bd71837.c
+++ b/drivers/power/pmic/bd71837.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/bd71837.h>
diff --git a/drivers/power/pmic/mc34708.c b/drivers/power/pmic/mc34708.c
index 66253a4a43b..40d732224b6 100644
--- a/drivers/power/pmic/mc34708.c
+++ b/drivers/power/pmic/mc34708.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <fsl_pmic.h>
 #include <i2c.h>
+#include <asm/global_data.h>
 #include <power/pmic.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/power/pmic/pca9450.c b/drivers/power/pmic/pca9450.c
index 0c9d9a366e8..786baa5e259 100644
--- a/drivers/power/pmic/pca9450.c
+++ b/drivers/power/pmic/pca9450.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/pca9450.h>
diff --git a/drivers/power/regulator/pwm_regulator.c b/drivers/power/regulator/pwm_regulator.c
index f8706227058..185e38e32a4 100644
--- a/drivers/power/regulator/pwm_regulator.c
+++ b/drivers/power/regulator/pwm_regulator.c
@@ -12,6 +12,7 @@
 #include <errno.h>
 #include <log.h>
 #include <pwm.h>
+#include <asm/global_data.h>
 #include <dm/device_compat.h>
 #include <power/regulator.h>
 
diff --git a/drivers/pwm/pwm-sifive.c b/drivers/pwm/pwm-sifive.c
index 77bc659fefe..0b819cfbf78 100644
--- a/drivers/pwm/pwm-sifive.c
+++ b/drivers/pwm/pwm-sifive.c
@@ -18,6 +18,7 @@
 #include <dm.h>
 #include <pwm.h>
 #include <regmap.h>
+#include <asm/global_data.h>
 #include <linux/io.h>
 #include <linux/log2.h>
 #include <linux/bitfield.h>
diff --git a/drivers/pwm/rk_pwm.c b/drivers/pwm/rk_pwm.c
index 911da1d4261..0fb894804b5 100644
--- a/drivers/pwm/rk_pwm.c
+++ b/drivers/pwm/rk_pwm.c
@@ -12,6 +12,7 @@
 #include <pwm.h>
 #include <regmap.h>
 #include <syscon.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch-rockchip/pwm.h>
 #include <linux/bitops.h>
diff --git a/drivers/pwm/sunxi_pwm.c b/drivers/pwm/sunxi_pwm.c
index e2ae1a80091..ffcf60c5584 100644
--- a/drivers/pwm/sunxi_pwm.c
+++ b/drivers/pwm/sunxi_pwm.c
@@ -10,6 +10,7 @@
 #include <pwm.h>
 #include <regmap.h>
 #include <syscon.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/pwm.h>
 #include <asm/arch/gpio.h>
diff --git a/drivers/qe/fdt.c b/drivers/qe/fdt.c
index fd7f14955ad..6195c7c4442 100644
--- a/drivers/qe/fdt.c
+++ b/drivers/qe/fdt.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <asm/global_data.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <fsl_qe.h>
diff --git a/drivers/qe/qe.c b/drivers/qe/qe.c
index 61ca4760c85..79dcbf049a0 100644
--- a/drivers/qe/qe.c
+++ b/drivers/qe/qe.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <malloc.h>
 #include <command.h>
+#include <asm/global_data.h>
 #include <linux/errno.h>
 #include <asm/io.h>
 #include <linux/immap_qe.h>
diff --git a/drivers/ram/mpc83xx_sdram.c b/drivers/ram/mpc83xx_sdram.c
index a226bac2cc3..2a78291deb5 100644
--- a/drivers/ram/mpc83xx_sdram.c
+++ b/drivers/ram/mpc83xx_sdram.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <ram.h>
 #include <asm/bitops.h>
+#include <asm/global_data.h>
 #include <dt-bindings/memory/mpc83xx-sdram.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/ram/rockchip/sdram_rk322x.c b/drivers/ram/rockchip/sdram_rk322x.c
index 094693ce247..4a24854a3df 100644
--- a/drivers/ram/rockchip/sdram_rk322x.c
+++ b/drivers/ram/rockchip/sdram_rk322x.c
@@ -11,6 +11,7 @@
 #include <ram.h>
 #include <regmap.h>
 #include <syscon.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch-rockchip/clock.h>
 #include <asm/arch-rockchip/cru_rk322x.h>
diff --git a/drivers/ram/sandbox_ram.c b/drivers/ram/sandbox_ram.c
index be4abed0c02..910dce623e9 100644
--- a/drivers/ram/sandbox_ram.c
+++ b/drivers/ram/sandbox_ram.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <ram.h>
+#include <asm/global_data.h>
 #include <asm/test.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/ram/sifive/fu540_ddr.c b/drivers/ram/sifive/fu540_ddr.c
index 2eef1e75658..7208d350f41 100644
--- a/drivers/ram/sifive/fu540_ddr.c
+++ b/drivers/ram/sifive/fu540_ddr.c
@@ -13,6 +13,7 @@
 #include <ram.h>
 #include <regmap.h>
 #include <syscon.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <clk.h>
 #include <wait_bit.h>
diff --git a/drivers/ram/stm32mp1/stm32mp1_interactive.c b/drivers/ram/stm32mp1/stm32mp1_interactive.c
index 38390c0d552..7b29c368126 100644
--- a/drivers/ram/stm32mp1/stm32mp1_interactive.c
+++ b/drivers/ram/stm32mp1/stm32mp1_interactive.c
@@ -12,6 +12,7 @@
 #include <malloc.h>
 #include <ram.h>
 #include <reset.h>
+#include <asm/global_data.h>
 #include "stm32mp1_ddr.h"
 #include "stm32mp1_tests.h"
 
diff --git a/drivers/ram/stm32mp1/stm32mp1_tests.c b/drivers/ram/stm32mp1/stm32mp1_tests.c
index 952006aa149..b0c510ad5e9 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 <watchdog.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/log2.h>
 #include "stm32mp1_tests.h"
diff --git a/drivers/remoteproc/rproc-uclass.c b/drivers/remoteproc/rproc-uclass.c
index 9640a81e534..22779d0cb0d 100644
--- a/drivers/remoteproc/rproc-uclass.c
+++ b/drivers/remoteproc/rproc-uclass.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <remoteproc.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm/device-internal.h>
 #include <dm.h>
diff --git a/drivers/remoteproc/ti_power_proc.c b/drivers/remoteproc/ti_power_proc.c
index 350450d1fb4..1a5dddbe0d2 100644
--- a/drivers/remoteproc/ti_power_proc.c
+++ b/drivers/remoteproc/ti_power_proc.c
@@ -10,6 +10,7 @@
 #include <fdtdec.h>
 #include <log.h>
 #include <remoteproc.h>
+#include <asm/global_data.h>
 #include <mach/psc_defs.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/reset/sti-reset.c b/drivers/reset/sti-reset.c
index ac3a99f9bff..2fdc069ce16 100644
--- a/drivers/reset/sti-reset.c
+++ b/drivers/reset/sti-reset.c
@@ -13,6 +13,7 @@
 #include <reset-uclass.h>
 #include <regmap.h>
 #include <syscon.h>
+#include <asm/global_data.h>
 #include <dt-bindings/reset/stih407-resets.h>
 #include <linux/bitops.h>
 
diff --git a/drivers/serial/atmel_usart.c b/drivers/serial/atmel_usart.c
index f759ea8893d..f2065935886 100644
--- a/drivers/serial/atmel_usart.c
+++ b/drivers/serial/atmel_usart.c
@@ -13,6 +13,7 @@
 #include <watchdog.h>
 #include <serial.h>
 #include <debug_uart.h>
+#include <asm/global_data.h>
 #include <linux/compiler.h>
 #include <linux/delay.h>
 
diff --git a/drivers/serial/ns16550.c b/drivers/serial/ns16550.c
index 702109b23b6..840d89f16fa 100644
--- a/drivers/serial/ns16550.c
+++ b/drivers/serial/ns16550.c
@@ -14,6 +14,7 @@
 #include <reset.h>
 #include <serial.h>
 #include <watchdog.h>
+#include <asm/global_data.h>
 #include <linux/err.h>
 #include <linux/types.h>
 #include <asm/io.h>
diff --git a/drivers/serial/sandbox.c b/drivers/serial/sandbox.c
index f09d291e043..8a7f171e041 100644
--- a/drivers/serial/sandbox.c
+++ b/drivers/serial/sandbox.c
@@ -17,6 +17,7 @@
 #include <os.h>
 #include <serial.h>
 #include <video.h>
+#include <asm/global_data.h>
 #include <linux/compiler.h>
 #include <asm/state.h>
 
diff --git a/drivers/serial/serial-uclass.c b/drivers/serial/serial-uclass.c
index a0af0e6bfde..c1df29c530b 100644
--- a/drivers/serial/serial-uclass.c
+++ b/drivers/serial/serial-uclass.c
@@ -12,6 +12,7 @@
 #include <serial.h>
 #include <stdio_dev.h>
 #include <watchdog.h>
+#include <asm/global_data.h>
 #include <dm/lists.h>
 #include <dm/device-internal.h>
 #include <dm/of_access.h>
diff --git a/drivers/serial/serial.c b/drivers/serial/serial.c
index da017dc5b3e..839c3972b6d 100644
--- a/drivers/serial/serial.c
+++ b/drivers/serial/serial.c
@@ -10,6 +10,7 @@
 #include <serial.h>
 #include <stdio_dev.h>
 #include <post.h>
+#include <asm/global_data.h>
 #include <linux/compiler.h>
 #include <errno.h>
 #include <linux/delay.h>
diff --git a/drivers/serial/serial_arc.c b/drivers/serial/serial_arc.c
index 04063fbe399..c1be34960ec 100644
--- a/drivers/serial/serial_arc.c
+++ b/drivers/serial/serial_arc.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <dm.h>
 #include <serial.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/serial/serial_linflexuart.c b/drivers/serial/serial_linflexuart.c
index 83dc96c449c..d8482ba7047 100644
--- a/drivers/serial/serial_linflexuart.c
+++ b/drivers/serial/serial_linflexuart.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <watchdog.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <serial.h>
 #include <linux/compiler.h>
diff --git a/drivers/serial/serial_lpuart.c b/drivers/serial/serial_lpuart.c
index 95cbe63b3d1..8631d790e6f 100644
--- a/drivers/serial/serial_lpuart.c
+++ b/drivers/serial/serial_lpuart.c
@@ -10,6 +10,7 @@
 #include <fsl_lpuart.h>
 #include <log.h>
 #include <watchdog.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <serial.h>
 #include <dm/device_compat.h>
diff --git a/drivers/serial/serial_mcf.c b/drivers/serial/serial_mcf.c
index 402fd5343c1..6b907fe1920 100644
--- a/drivers/serial/serial_mcf.c
+++ b/drivers/serial/serial_mcf.c
@@ -17,6 +17,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <asm/global_data.h>
 #include <dm/platform_data/serial_coldfire.h>
 #include <serial.h>
 #include <linux/compiler.h>
diff --git a/drivers/serial/serial_mpc8xx.c b/drivers/serial/serial_mpc8xx.c
index 50d6e70f177..0978930dcd4 100644
--- a/drivers/serial/serial_mpc8xx.c
+++ b/drivers/serial/serial_mpc8xx.c
@@ -10,6 +10,7 @@
 #include <serial.h>
 #include <watchdog.h>
 #include <asm/cpm_8xx.h>
+#include <asm/global_data.h>
 #include <linux/compiler.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/serial/serial_msm.c b/drivers/serial/serial_msm.c
index c8946c3aae8..13c7f9d809e 100644
--- a/drivers/serial/serial_msm.c
+++ b/drivers/serial/serial_msm.c
@@ -15,6 +15,7 @@
 #include <malloc.h>
 #include <serial.h>
 #include <watchdog.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/compiler.h>
 #include <dm/pinctrl.h>
diff --git a/drivers/serial/serial_mtk.c b/drivers/serial/serial_mtk.c
index 778a04d87e0..9715f372ecf 100644
--- a/drivers/serial/serial_mtk.c
+++ b/drivers/serial/serial_mtk.c
@@ -14,6 +14,7 @@
 #include <log.h>
 #include <serial.h>
 #include <watchdog.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/types.h>
 #include <linux/err.h>
diff --git a/drivers/serial/serial_mxc.c b/drivers/serial/serial_mxc.c
index de6cefcd3ac..1f8eeb2cbfe 100644
--- a/drivers/serial/serial_mxc.c
+++ b/drivers/serial/serial_mxc.c
@@ -9,6 +9,7 @@
 #include <watchdog.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/clock.h>
+#include <asm/global_data.h>
 #include <dm/platform_data/serial_mxc.h>
 #include <serial.h>
 #include <linux/compiler.h>
diff --git a/drivers/serial/serial_ns16550.c b/drivers/serial/serial_ns16550.c
index ef394b72350..1353e2f7ccb 100644
--- a/drivers/serial/serial_ns16550.c
+++ b/drivers/serial/serial_ns16550.c
@@ -8,6 +8,7 @@
 #include <clock_legacy.h>
 #include <ns16550.h>
 #include <serial.h>
+#include <asm/global_data.h>
 #include <linux/compiler.h>
 
 #ifndef CONFIG_NS16550_MIN_FUNCTIONS
diff --git a/drivers/serial/serial_pic32.c b/drivers/serial/serial_pic32.c
index a492063e39c..ce6c5db762f 100644
--- a/drivers/serial/serial_pic32.c
+++ b/drivers/serial/serial_pic32.c
@@ -9,6 +9,7 @@
 #include <malloc.h>
 #include <serial.h>
 #include <wait_bit.h>
+#include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <mach/pic32.h>
 #include <dt-bindings/clock/microchip,clock.h>
diff --git a/drivers/serial/serial_pl01x.c b/drivers/serial/serial_pl01x.c
index 2772c25f1d2..1ae5bac249a 100644
--- a/drivers/serial/serial_pl01x.c
+++ b/drivers/serial/serial_pl01x.c
@@ -11,6 +11,7 @@
 /* Simple U-Boot driver for the PrimeCell PL010/PL011 UARTs */
 
 #include <common.h>
+#include <asm/global_data.h>
 /* For get_bus_freq() */
 #include <clock_legacy.h>
 #include <dm.h>
diff --git a/drivers/serial/serial_pxa.c b/drivers/serial/serial_pxa.c
index 6f8f7e1198a..6fc126f404b 100644
--- a/drivers/serial/serial_pxa.c
+++ b/drivers/serial/serial_pxa.c
@@ -23,6 +23,7 @@
 #include <hang.h>
 #include <asm/arch/pxa-regs.h>
 #include <asm/arch/regs-uart.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm.h>
 #include <dm/platform_data/serial_pxa.h>
diff --git a/drivers/serial/serial_s5p.c b/drivers/serial/serial_s5p.c
index 9bb2be21e7b..986c5ca8107 100644
--- a/drivers/serial/serial_s5p.c
+++ b/drivers/serial/serial_s5p.c
@@ -11,6 +11,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <fdtdec.h>
+#include <asm/global_data.h>
 #include <linux/compiler.h>
 #include <asm/io.h>
 #include <asm/arch/clk.h>
diff --git a/drivers/serial/serial_sh.c b/drivers/serial/serial_sh.c
index 13b179f03de..d697d62d910 100644
--- a/drivers/serial/serial_sh.c
+++ b/drivers/serial/serial_sh.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <clk.h>
 #include <dm.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/processor.h>
 #include <serial.h>
diff --git a/drivers/serial/serial_sifive.c b/drivers/serial/serial_sifive.c
index fcc47fb348f..c3f0a3cb65d 100644
--- a/drivers/serial/serial_sifive.c
+++ b/drivers/serial/serial_sifive.c
@@ -11,6 +11,7 @@
 #include <fdtdec.h>
 #include <log.h>
 #include <watchdog.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/compiler.h>
 #include <serial.h>
diff --git a/drivers/serial/serial_sti_asc.c b/drivers/serial/serial_sti_asc.c
index 33ff396bff7..aa3c9efc8a0 100644
--- a/drivers/serial/serial_sti_asc.c
+++ b/drivers/serial/serial_sti_asc.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <log.h>
 #include <serial.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
 
diff --git a/drivers/smem/msm_smem.c b/drivers/smem/msm_smem.c
index 2557269bc54..bf1696e85e0 100644
--- a/drivers/smem/msm_smem.c
+++ b/drivers/smem/msm_smem.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <errno.h>
 #include <dm.h>
+#include <asm/global_data.h>
 #include <dm/device_compat.h>
 #include <dm/devres.h>
 #include <dm/of_access.h>
diff --git a/drivers/sound/ivybridge_sound.c b/drivers/sound/ivybridge_sound.c
index bc3c1e85f8c..a7423d46c18 100644
--- a/drivers/sound/ivybridge_sound.c
+++ b/drivers/sound/ivybridge_sound.c
@@ -18,6 +18,7 @@
 #include <log.h>
 #include <pch.h>
 #include <sound.h>
+#include <asm/global_data.h>
 #include <linux/bitops.h>
 
 static int bd82x6x_azalia_probe(struct udevice *dev)
diff --git a/drivers/spi/atcspi200_spi.c b/drivers/spi/atcspi200_spi.c
index 39c6e226ba7..9e7d40d0a81 100644
--- a/drivers/spi/atcspi200_spi.c
+++ b/drivers/spi/atcspi200_spi.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <spi.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm.h>
 
diff --git a/drivers/spi/bcmstb_spi.c b/drivers/spi/bcmstb_spi.c
index fb1dc46b704..f400a0f5732 100644
--- a/drivers/spi/bcmstb_spi.c
+++ b/drivers/spi/bcmstb_spi.c
@@ -5,6 +5,7 @@
  * Author: Thomas Fitzsimmons <fitzsim@fitzsim.org>
  */
 
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <command.h>
 #include <config.h>
diff --git a/drivers/spi/cf_spi.c b/drivers/spi/cf_spi.c
index 8fa6d351075..242dc9d8909 100644
--- a/drivers/spi/cf_spi.c
+++ b/drivers/spi/cf_spi.c
@@ -16,6 +16,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <dm/platform_data/spi_coldfire.h>
 #include <spi.h>
 #include <malloc.h>
diff --git a/drivers/spi/davinci_spi.c b/drivers/spi/davinci_spi.c
index a11433db1e9..c1b21a8cd35 100644
--- a/drivers/spi/davinci_spi.c
+++ b/drivers/spi/davinci_spi.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <spi.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
 #include <dm.h>
diff --git a/drivers/spi/exynos_spi.c b/drivers/spi/exynos_spi.c
index d338ff5a0bd..03c03ab4874 100644
--- a/drivers/spi/exynos_spi.c
+++ b/drivers/spi/exynos_spi.c
@@ -18,6 +18,7 @@
 #include <asm/arch/gpio.h>
 #include <asm/arch/pinmux.h>
 #include <asm/arch/spi.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/delay.h>
 
diff --git a/drivers/spi/fsl_dspi.c b/drivers/spi/fsl_dspi.c
index b22c9b3a09d..1912d676a68 100644
--- a/drivers/spi/fsl_dspi.c
+++ b/drivers/spi/fsl_dspi.c
@@ -9,6 +9,7 @@
  * Haikun Wang (B53464 at freescale.com)
  */
 
+#include <asm/global_data.h>
 #include <linux/math64.h>
 #include <common.h>
 #include <dm.h>
diff --git a/drivers/spi/fsl_espi.c b/drivers/spi/fsl_espi.c
index 5c76fd962e9..3dd98aadbaa 100644
--- a/drivers/spi/fsl_espi.c
+++ b/drivers/spi/fsl_espi.c
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 
diff --git a/drivers/spi/fsl_qspi.c b/drivers/spi/fsl_qspi.c
index eec968e5ec1..84b4714c050 100644
--- a/drivers/spi/fsl_qspi.c
+++ b/drivers/spi/fsl_qspi.c
@@ -25,6 +25,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/drivers/spi/mvebu_a3700_spi.c b/drivers/spi/mvebu_a3700_spi.c
index e860b9ec64b..502f5153cc4 100644
--- a/drivers/spi/mvebu_a3700_spi.c
+++ b/drivers/spi/mvebu_a3700_spi.c
@@ -12,6 +12,7 @@
 #include <spi.h>
 #include <clk.h>
 #include <wait_bit.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
diff --git a/drivers/spi/mxc_spi.c b/drivers/spi/mxc_spi.c
index e90a06a66de..466355b0178 100644
--- a/drivers/spi/mxc_spi.c
+++ b/drivers/spi/mxc_spi.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <spi.h>
+#include <asm/global_data.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/drivers/spi/omap3_spi.c b/drivers/spi/omap3_spi.c
index fbf9575851a..afe80e53d2b 100644
--- a/drivers/spi/omap3_spi.c
+++ b/drivers/spi/omap3_spi.c
@@ -20,6 +20,7 @@
 #include <dm.h>
 #include <spi.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
 
diff --git a/drivers/spi/pic32_spi.c b/drivers/spi/pic32_spi.c
index 52e9eff743c..ffba2d84f1f 100644
--- a/drivers/spi/pic32_spi.c
+++ b/drivers/spi/pic32_spi.c
@@ -10,6 +10,7 @@
 #include <clk.h>
 #include <dm.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/compat.h>
 #include <malloc.h>
diff --git a/drivers/spi/pl022_spi.c b/drivers/spi/pl022_spi.c
index 32bb8c8d212..01ffaea4c34 100644
--- a/drivers/spi/pl022_spi.c
+++ b/drivers/spi/pl022_spi.c
@@ -12,6 +12,7 @@
 #include <clk.h>
 #include <common.h>
 #include <dm.h>
+#include <asm/global_data.h>
 #include <dm/platform_data/spi_pl022.h>
 #include <linux/io.h>
 #include <spi.h>
diff --git a/drivers/spi/renesas_rpc_spi.c b/drivers/spi/renesas_rpc_spi.c
index 3ea59b8fb82..72a9e464776 100644
--- a/drivers/spi/renesas_rpc_spi.c
+++ b/drivers/spi/renesas_rpc_spi.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <clk.h>
 #include <dm.h>
diff --git a/drivers/spi/soft_spi.c b/drivers/spi/soft_spi.c
index 153bbf8b255..87e1e2417ce 100644
--- a/drivers/spi/soft_spi.c
+++ b/drivers/spi/soft_spi.c
@@ -16,6 +16,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <spi.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/drivers/spi/spi-sunxi.c b/drivers/spi/spi-sunxi.c
index cd2e17bfd1a..be6ef1757a0 100644
--- a/drivers/spi/spi-sunxi.c
+++ b/drivers/spi/spi-sunxi.c
@@ -27,6 +27,7 @@
 #include <fdt_support.h>
 #include <reset.h>
 #include <wait_bit.h>
+#include <asm/global_data.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 
diff --git a/drivers/spi/spi-uclass.c b/drivers/spi/spi-uclass.c
index cffd9cf0b0e..46b5249f509 100644
--- a/drivers/spi/spi-uclass.c
+++ b/drivers/spi/spi-uclass.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <spi.h>
+#include <asm/global_data.h>
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
 #include <dm/lists.h>
diff --git a/drivers/spi/tegra20_sflash.c b/drivers/spi/tegra20_sflash.c
index 771744dfe43..5066f43ba61 100644
--- a/drivers/spi/tegra20_sflash.c
+++ b/drivers/spi/tegra20_sflash.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <log.h>
 #include <time.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
 #include <asm/arch/clock.h>
diff --git a/drivers/spi/tegra20_slink.c b/drivers/spi/tegra20_slink.c
index f9846ee3665..d725a957485 100644
--- a/drivers/spi/tegra20_slink.c
+++ b/drivers/spi/tegra20_slink.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <log.h>
 #include <time.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch-tegra/clk_rst.h>
diff --git a/drivers/spi/tegra210_qspi.c b/drivers/spi/tegra210_qspi.c
index ae16b45dcb4..293b16c6fe9 100644
--- a/drivers/spi/tegra210_qspi.c
+++ b/drivers/spi/tegra210_qspi.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <log.h>
 #include <time.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch-tegra/clk_rst.h>
diff --git a/drivers/spi/ti_qspi.c b/drivers/spi/ti_qspi.c
index 5fdbb494420..26cd83be76a 100644
--- a/drivers/spi/ti_qspi.c
+++ b/drivers/spi/ti_qspi.c
@@ -9,6 +9,7 @@
 #include <cpu_func.h>
 #include <log.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/omap.h>
 #include <malloc.h>
diff --git a/drivers/spi/uniphier_spi.c b/drivers/spi/uniphier_spi.c
index 114bd8abd7a..2753d0cd2d8 100644
--- a/drivers/spi/uniphier_spi.c
+++ b/drivers/spi/uniphier_spi.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <log.h>
 #include <time.h>
+#include <asm/global_data.h>
 #include <dm/device_compat.h>
 #include <linux/bitfield.h>
 #include <linux/bitops.h>
diff --git a/drivers/spi/zynq_qspi.c b/drivers/spi/zynq_qspi.c
index 3f39ef05f2d..1358bd10355 100644
--- a/drivers/spi/zynq_qspi.c
+++ b/drivers/spi/zynq_qspi.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <spi.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
 
diff --git a/drivers/spi/zynq_spi.c b/drivers/spi/zynq_spi.c
index 9923931e36e..b4604a4b202 100644
--- a/drivers/spi/zynq_spi.c
+++ b/drivers/spi/zynq_spi.c
@@ -12,6 +12,7 @@
 #include <malloc.h>
 #include <spi.h>
 #include <time.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/drivers/spi/zynqmp_gqspi.c b/drivers/spi/zynqmp_gqspi.c
index a72986be907..cd2c7d40b86 100644
--- a/drivers/spi/zynqmp_gqspi.c
+++ b/drivers/spi/zynqmp_gqspi.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <clk.h>
 #include <dm.h>
diff --git a/drivers/spmi/spmi-msm.c b/drivers/spmi/spmi-msm.c
index 2f430aed9cb..6b12a96ee3c 100644
--- a/drivers/spmi/spmi-msm.c
+++ b/drivers/spmi/spmi-msm.c
@@ -11,6 +11,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <fdtdec.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm/device_compat.h>
 #include <spmi/spmi.h>
diff --git a/drivers/sysreset/sysreset-uclass.c b/drivers/sysreset/sysreset-uclass.c
index 995240f0cbc..c39711e21b7 100644
--- a/drivers/sysreset/sysreset-uclass.c
+++ b/drivers/sysreset/sysreset-uclass.c
@@ -15,6 +15,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <regmap.h>
+#include <asm/global_data.h>
 #include <dm/device-internal.h>
 #include <dm/lists.h>
 #include <dm/root.h>
diff --git a/drivers/sysreset/sysreset_mpc83xx.c b/drivers/sysreset/sysreset_mpc83xx.c
index 456f006bc12..ddd7e26d696 100644
--- a/drivers/sysreset/sysreset_mpc83xx.c
+++ b/drivers/sysreset/sysreset_mpc83xx.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <sysreset.h>
 #include <wait_bit.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 
 #include "sysreset_mpc83xx.h"
diff --git a/drivers/sysreset/sysreset_sti.c b/drivers/sysreset/sysreset_sti.c
index 3482d2a0787..8465a62e185 100644
--- a/drivers/sysreset/sysreset_sti.c
+++ b/drivers/sysreset/sysreset_sti.c
@@ -9,6 +9,7 @@
 #include <regmap.h>
 #include <syscon.h>
 #include <sysreset.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
 
diff --git a/drivers/thermal/imx_scu_thermal.c b/drivers/thermal/imx_scu_thermal.c
index 83ec753802a..dc92e6b603e 100644
--- a/drivers/thermal/imx_scu_thermal.c
+++ b/drivers/thermal/imx_scu_thermal.c
@@ -9,6 +9,7 @@
 #include <errno.h>
 #include <log.h>
 #include <thermal.h>
+#include <asm/global_data.h>
 #include <dm/device-internal.h>
 #include <dm/device.h>
 #include <asm/arch/sci/sci.h>
diff --git a/drivers/thermal/imx_tmu.c b/drivers/thermal/imx_tmu.c
index 4ca22089b8b..d8acfef4925 100644
--- a/drivers/thermal/imx_tmu.c
+++ b/drivers/thermal/imx_tmu.c
@@ -6,6 +6,7 @@
 
 #include <config.h>
 #include <common.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/sys_proto.h>
diff --git a/drivers/timer/arc_timer.c b/drivers/timer/arc_timer.c
index 8c574ec5af1..c6771d15966 100644
--- a/drivers/timer/arc_timer.c
+++ b/drivers/timer/arc_timer.c
@@ -8,6 +8,7 @@
 #include <errno.h>
 #include <timer.h>
 #include <asm/arcregs.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/timer/cadence-ttc.c b/drivers/timer/cadence-ttc.c
index e6b6dfe3765..1ad3b5db8fe 100644
--- a/drivers/timer/cadence-ttc.c
+++ b/drivers/timer/cadence-ttc.c
@@ -9,6 +9,7 @@
 #include <errno.h>
 #include <init.h>
 #include <timer.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/err.h>
diff --git a/drivers/timer/mpc83xx_timer.c b/drivers/timer/mpc83xx_timer.c
index ad8bb28e8b3..51ad79aa6eb 100644
--- a/drivers/timer/mpc83xx_timer.c
+++ b/drivers/timer/mpc83xx_timer.c
@@ -14,6 +14,7 @@
 #include <time.h>
 #include <timer.h>
 #include <watchdog.h>
+#include <asm/global_data.h>
 #include <asm/ptrace.h>
 #include <linux/bitops.h>
 
diff --git a/drivers/timer/ostm_timer.c b/drivers/timer/ostm_timer.c
index bea97159ebe..cd62d869022 100644
--- a/drivers/timer/ostm_timer.c
+++ b/drivers/timer/ostm_timer.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm.h>
 #include <clk.h>
diff --git a/drivers/timer/rockchip_timer.c b/drivers/timer/rockchip_timer.c
index 7a5a4842527..7e7612f154e 100644
--- a/drivers/timer/rockchip_timer.c
+++ b/drivers/timer/rockchip_timer.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <init.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <dm/ofnode.h>
 #include <mapmem.h>
 #include <asm/arch-rockchip/timer.h>
diff --git a/drivers/timer/timer-uclass.c b/drivers/timer/timer-uclass.c
index 14dde950a18..d90755a7e74 100644
--- a/drivers/timer/timer-uclass.c
+++ b/drivers/timer/timer-uclass.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <dm.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <dm/lists.h>
 #include <dm/device-internal.h>
 #include <dm/root.h>
diff --git a/drivers/timer/tsc_timer.c b/drivers/timer/tsc_timer.c
index 93c959ff444..b4c40fe1c2d 100644
--- a/drivers/timer/tsc_timer.c
+++ b/drivers/timer/tsc_timer.c
@@ -14,6 +14,7 @@
 #include <time.h>
 #include <timer.h>
 #include <asm/cpu.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/i8254.h>
 #include <asm/ibmpc.h>
diff --git a/drivers/tpm/tpm2_tis_spi.c b/drivers/tpm/tpm2_tis_spi.c
index 9a8145e6ba1..8ff6c461f19 100644
--- a/drivers/tpm/tpm2_tis_spi.c
+++ b/drivers/tpm/tpm2_tis_spi.c
@@ -19,6 +19,7 @@
 #include <log.h>
 #include <spi.h>
 #include <tpm-v2.h>
+#include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/usb/common/common.c b/drivers/usb/common/common.c
index d4ae18693c6..400bdf72ad7 100644
--- a/drivers/usb/common/common.c
+++ b/drivers/usb/common/common.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <asm/global_data.h>
 #include <linux/usb/otg.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/phy.h>
diff --git a/drivers/usb/host/dwc3-sti-glue.c b/drivers/usb/host/dwc3-sti-glue.c
index a72ab201687..511a2ebe50e 100644
--- a/drivers/usb/host/dwc3-sti-glue.c
+++ b/drivers/usb/host/dwc3-sti-glue.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm.h>
 #include <errno.h>
diff --git a/drivers/usb/host/ehci-exynos.c b/drivers/usb/host/ehci-exynos.c
index 6a37c5d982a..9f1ec7ea926 100644
--- a/drivers/usb/host/ehci-exynos.c
+++ b/drivers/usb/host/ehci-exynos.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <fdtdec.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 #include <malloc.h>
diff --git a/drivers/usb/host/ehci-fsl.c b/drivers/usb/host/ehci-fsl.c
index 5423d10abe7..eed67e77dc6 100644
--- a/drivers/usb/host/ehci-fsl.c
+++ b/drivers/usb/host/ehci-fsl.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <pci.h>
 #include <usb.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <usb/ehci-ci.h>
diff --git a/drivers/usb/host/ehci-marvell.c b/drivers/usb/host/ehci-marvell.c
index 62414bb1102..9f6b8a2ae5f 100644
--- a/drivers/usb/host/ehci-marvell.c
+++ b/drivers/usb/host/ehci-marvell.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <usb.h>
 #include <linux/delay.h>
diff --git a/drivers/usb/host/ehci-mx5.c b/drivers/usb/host/ehci-mx5.c
index caafa688993..516d6495359 100644
--- a/drivers/usb/host/ehci-mx5.c
+++ b/drivers/usb/host/ehci-mx5.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <usb.h>
 #include <errno.h>
+#include <asm/global_data.h>
 #include <linux/compiler.h>
 #include <linux/delay.h>
 #include <usb/ehci-ci.h>
diff --git a/drivers/usb/host/ehci-mx6.c b/drivers/usb/host/ehci-mx6.c
index 37b59758bb3..f9e72ba0d96 100644
--- a/drivers/usb/host/ehci-mx6.c
+++ b/drivers/usb/host/ehci-mx6.c
@@ -9,6 +9,7 @@
 #include <usb.h>
 #include <errno.h>
 #include <wait_bit.h>
+#include <asm/global_data.h>
 #include <linux/compiler.h>
 #include <linux/delay.h>
 #include <usb/ehci-ci.h>
diff --git a/drivers/usb/host/ehci-vf.c b/drivers/usb/host/ehci-vf.c
index 2768d409749..86eac41ea66 100644
--- a/drivers/usb/host/ehci-vf.c
+++ b/drivers/usb/host/ehci-vf.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <usb.h>
 #include <errno.h>
+#include <asm/global_data.h>
 #include <linux/compiler.h>
 #include <asm/io.h>
 #include <asm-generic/gpio.h>
diff --git a/drivers/usb/host/xhci-exynos5.c b/drivers/usb/host/xhci-exynos5.c
index 6fb7a7f6e09..77c2534da44 100644
--- a/drivers/usb/host/xhci-exynos5.c
+++ b/drivers/usb/host/xhci-exynos5.c
@@ -16,6 +16,7 @@
 #include <dm.h>
 #include <fdtdec.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 #include <malloc.h>
diff --git a/drivers/usb/musb-new/da8xx.c b/drivers/usb/musb-new/da8xx.c
index 67488ddb504..e13a6810b8d 100644
--- a/drivers/usb/musb-new/da8xx.c
+++ b/drivers/usb/musb-new/da8xx.c
@@ -16,6 +16,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <dm/device-internal.h>
 #include <dm/device_compat.h>
 #include <dm/lists.h>
diff --git a/drivers/usb/musb-new/omap2430.c b/drivers/usb/musb-new/omap2430.c
index da63cc2c224..fbd5f98f368 100644
--- a/drivers/usb/musb-new/omap2430.c
+++ b/drivers/usb/musb-new/omap2430.c
@@ -12,6 +12,7 @@
 #include <dm.h>
 #include <log.h>
 #include <serial.h>
+#include <asm/global_data.h>
 #include <dm/device-internal.h>
 #include <dm/device_compat.h>
 #include <dm/lists.h>
diff --git a/drivers/usb/musb-new/pic32.c b/drivers/usb/musb-new/pic32.c
index 74a841af460..9d1aa971c27 100644
--- a/drivers/usb/musb-new/pic32.c
+++ b/drivers/usb/musb-new/pic32.c
@@ -10,6 +10,7 @@
  */
 
 #include <common.h>
+#include <asm/global_data.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/drivers/usb/musb-new/ti-musb.c b/drivers/usb/musb-new/ti-musb.c
index f4f26d86b3f..bf58f13480b 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 <asm/global_data.h>
 #include <linux/usb/otg.h>
 #include <dm/device-internal.h>
 #include <dm/lists.h>
diff --git a/drivers/usb/phy/rockchip_usb2_phy.c b/drivers/usb/phy/rockchip_usb2_phy.c
index f1cf9160d56..93caa821a1d 100644
--- a/drivers/usb/phy/rockchip_usb2_phy.c
+++ b/drivers/usb/phy/rockchip_usb2_phy.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <hang.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/drivers/video/am335x-fb.c b/drivers/video/am335x-fb.c
index 2707ff59c7d..2bf4d85d021 100644
--- a/drivers/video/am335x-fb.c
+++ b/drivers/video/am335x-fb.c
@@ -20,6 +20,7 @@
 #include <asm/arch/hardware.h>
 #include <asm/arch/omap.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/utils.h>
 #include <linux/delay.h>
diff --git a/drivers/video/atmel_hlcdfb.c b/drivers/video/atmel_hlcdfb.c
index 38def2816b2..bfe76349fda 100644
--- a/drivers/video/atmel_hlcdfb.c
+++ b/drivers/video/atmel_hlcdfb.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <part.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/gpio.h>
 #include <asm/arch/clk.h>
diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c
index ae8ec26468f..e5e0aeec350 100644
--- a/drivers/video/atmel_lcdfb.c
+++ b/drivers/video/atmel_lcdfb.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <part.h>
 #include <video.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/gpio.h>
 #include <asm/arch/clk.h>
diff --git a/drivers/video/bridge/ps862x.c b/drivers/video/bridge/ps862x.c
index 8399c6f74cf..7e9c6da4545 100644
--- a/drivers/video/bridge/ps862x.c
+++ b/drivers/video/bridge/ps862x.c
@@ -10,6 +10,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <video_bridge.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 #include <power/regulator.h>
 
diff --git a/drivers/video/broadwell_igd.c b/drivers/video/broadwell_igd.c
index df6a761d2db..416a1c07b13 100644
--- a/drivers/video/broadwell_igd.c
+++ b/drivers/video/broadwell_igd.c
@@ -14,6 +14,7 @@
 #include <vbe.h>
 #include <video.h>
 #include <asm/cpu.h>
+#include <asm/global_data.h>
 #include <asm/intel_regs.h>
 #include <asm/io.h>
 #include <asm/mtrr.h>
diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c
index badade353ec..3a51ad4a9d4 100644
--- a/drivers/video/cfb_console.c
+++ b/drivers/video/cfb_console.c
@@ -74,6 +74,7 @@
 #include <version.h>
 #include <malloc.h>
 #include <video.h>
+#include <asm/global_data.h>
 #include <linux/compiler.h>
 
 #if defined(CONFIG_VIDEO_MXS)
diff --git a/drivers/video/da8xx-fb.c b/drivers/video/da8xx-fb.c
index 4984dda8477..462c318126d 100644
--- a/drivers/video/da8xx-fb.c
+++ b/drivers/video/da8xx-fb.c
@@ -17,6 +17,7 @@
 #include <malloc.h>
 #include <memalign.h>
 #include <video_fb.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/list.h>
 #include <linux/fb.h>
diff --git a/drivers/video/exynos/exynos_dp.c b/drivers/video/exynos/exynos_dp.c
index 999ee1c14af..36595556f13 100644
--- a/drivers/video/exynos/exynos_dp.c
+++ b/drivers/video/exynos/exynos_dp.c
@@ -11,6 +11,7 @@
 #include <display.h>
 #include <fdtdec.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 #include <malloc.h>
diff --git a/drivers/video/exynos/exynos_fb.c b/drivers/video/exynos/exynos_fb.c
index 979b9091827..26068ab056f 100644
--- a/drivers/video/exynos/exynos_fb.c
+++ b/drivers/video/exynos/exynos_fb.c
@@ -13,6 +13,7 @@
 #include <dm.h>
 #include <fdtdec.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <linux/libfdt.h>
 #include <panel.h>
 #include <video.h>
diff --git a/drivers/video/exynos/exynos_mipi_dsi.c b/drivers/video/exynos/exynos_mipi_dsi.c
index 042aa9a5b9e..c56eadc8237 100644
--- a/drivers/video/exynos/exynos_mipi_dsi.c
+++ b/drivers/video/exynos/exynos_mipi_dsi.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <fdtdec.h>
+#include <asm/global_data.h>
 #include <dm/devres.h>
 #include <linux/libfdt.h>
 #include <linux/compat.h>
diff --git a/drivers/video/fsl_dcu_fb.c b/drivers/video/fsl_dcu_fb.c
index e9d05c93946..60b97e40633 100644
--- a/drivers/video/fsl_dcu_fb.c
+++ b/drivers/video/fsl_dcu_fb.c
@@ -8,6 +8,7 @@
 
 #include <init.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <common.h>
 #include <dm.h>
diff --git a/drivers/video/ivybridge_igd.c b/drivers/video/ivybridge_igd.c
index 2587f53ac1d..cd742b2273c 100644
--- a/drivers/video/ivybridge_igd.c
+++ b/drivers/video/ivybridge_igd.c
@@ -12,6 +12,7 @@
 #include <pci_rom.h>
 #include <vbe.h>
 #include <video.h>
+#include <asm/global_data.h>
 #include <asm/intel_regs.h>
 #include <asm/io.h>
 #include <asm/mtrr.h>
diff --git a/drivers/video/mali_dp.c b/drivers/video/mali_dp.c
index 1e6da0e1e25..7f9443828b2 100644
--- a/drivers/video/mali_dp.c
+++ b/drivers/video/mali_dp.c
@@ -13,6 +13,7 @@
 #include <display.h>
 #endif
 #include <fdtdec.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <os.h>
 #include <fdt_support.h>
diff --git a/drivers/video/meson/meson_vpu.c b/drivers/video/meson/meson_vpu.c
index 4868839ff7d..2d095c6a28e 100644
--- a/drivers/video/meson/meson_vpu.c
+++ b/drivers/video/meson/meson_vpu.c
@@ -13,6 +13,7 @@
 #include <fdt_support.h>
 #include <log.h>
 #include <part.h>
+#include <asm/global_data.h>
 #include <linux/sizes.h>
 #include <asm/arch/mem.h>
 #include <dm/device-internal.h>
diff --git a/drivers/video/mxsfb.c b/drivers/video/mxsfb.c
index 6589a2a09d2..d84adb004bc 100644
--- a/drivers/video/mxsfb.c
+++ b/drivers/video/mxsfb.c
@@ -10,6 +10,7 @@
 #include <env.h>
 #include <log.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <dm/device_compat.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/video/rockchip/rk3288_vop.c b/drivers/video/rockchip/rk3288_vop.c
index 68d1507cda4..d1bf82c5b27 100644
--- a/drivers/video/rockchip/rk3288_vop.c
+++ b/drivers/video/rockchip/rk3288_vop.c
@@ -11,6 +11,7 @@
 #include <regmap.h>
 #include <syscon.h>
 #include <video.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch-rockchip/clock.h>
 #include <asm/arch-rockchip/grf_rk3288.h>
diff --git a/drivers/video/rockchip/rk3399_vop.c b/drivers/video/rockchip/rk3399_vop.c
index d5a7aa8ac1b..fe424d51f73 100644
--- a/drivers/video/rockchip/rk3399_vop.c
+++ b/drivers/video/rockchip/rk3399_vop.c
@@ -12,6 +12,7 @@
 #include <regmap.h>
 #include <video.h>
 #include <asm/arch-rockchip/hardware.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include "rk_vop.h"
 
diff --git a/drivers/video/rockchip/rk_lvds.c b/drivers/video/rockchip/rk_lvds.c
index 04f795a213c..24f3caabb01 100644
--- a/drivers/video/rockchip/rk_lvds.c
+++ b/drivers/video/rockchip/rk_lvds.c
@@ -11,6 +11,7 @@
 #include <panel.h>
 #include <regmap.h>
 #include <syscon.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <asm/arch-rockchip/clock.h>
diff --git a/drivers/video/rockchip/rk_mipi.c b/drivers/video/rockchip/rk_mipi.c
index f811913ce5e..2e235cb6c2c 100644
--- a/drivers/video/rockchip/rk_mipi.c
+++ b/drivers/video/rockchip/rk_mipi.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <panel.h>
 #include <regmap.h>
+#include <asm/global_data.h>
 #include "rk_mipi.h"
 #include <syscon.h>
 #include <asm/gpio.h>
diff --git a/drivers/video/rockchip/rk_vop.c b/drivers/video/rockchip/rk_vop.c
index 9032eb430e7..7e864698697 100644
--- a/drivers/video/rockchip/rk_vop.c
+++ b/drivers/video/rockchip/rk_vop.c
@@ -13,6 +13,7 @@
 #include <regmap.h>
 #include <syscon.h>
 #include <video.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <asm/arch-rockchip/clock.h>
diff --git a/drivers/video/sandbox_sdl.c b/drivers/video/sandbox_sdl.c
index d806f35debb..48470e6f556 100644
--- a/drivers/video/sandbox_sdl.c
+++ b/drivers/video/sandbox_sdl.c
@@ -8,6 +8,7 @@
 #include <fdtdec.h>
 #include <log.h>
 #include <video.h>
+#include <asm/global_data.h>
 #include <asm/sdl.h>
 #include <asm/state.h>
 #include <asm/u-boot-sandbox.h>
diff --git a/drivers/video/simplefb.c b/drivers/video/simplefb.c
index 0c5b40c30b8..e7c2e184ba5 100644
--- a/drivers/video/simplefb.c
+++ b/drivers/video/simplefb.c
@@ -9,6 +9,7 @@
 #include <fdt_support.h>
 #include <log.h>
 #include <video.h>
+#include <asm/global_data.h>
 
 static int simple_video_probe(struct udevice *dev)
 {
diff --git a/drivers/video/stm32/stm32_dsi.c b/drivers/video/stm32/stm32_dsi.c
index 283151398bb..b09ecb73365 100644
--- a/drivers/video/stm32/stm32_dsi.c
+++ b/drivers/video/stm32/stm32_dsi.c
@@ -18,6 +18,7 @@
 #include <reset.h>
 #include <video.h>
 #include <video_bridge.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/gpio.h>
 #include <dm/device-internal.h>
diff --git a/drivers/video/stm32/stm32_ltdc.c b/drivers/video/stm32/stm32_ltdc.c
index 2f3427a32ee..ac031dc6c94 100644
--- a/drivers/video/stm32/stm32_ltdc.c
+++ b/drivers/video/stm32/stm32_ltdc.c
@@ -14,6 +14,7 @@
 #include <reset.h>
 #include <video.h>
 #include <video_bridge.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/gpio.h>
 #include <dm/device-internal.h>
diff --git a/drivers/video/sunxi/sunxi_lcd.c b/drivers/video/sunxi/sunxi_lcd.c
index 49bf083a8d1..10f7e2ac234 100644
--- a/drivers/video/sunxi/sunxi_lcd.c
+++ b/drivers/video/sunxi/sunxi_lcd.c
@@ -12,6 +12,7 @@
 #include <backlight.h>
 #include <dm.h>
 #include <edid.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/lcdc.h>
diff --git a/drivers/video/tegra.c b/drivers/video/tegra.c
index 827ea13d13a..a32478ea627 100644
--- a/drivers/video/tegra.c
+++ b/drivers/video/tegra.c
@@ -12,6 +12,7 @@
 #include <pwm.h>
 #include <video.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/system.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
diff --git a/drivers/video/video-uclass.c b/drivers/video/video-uclass.c
index 650891e49dd..1654d02860b 100644
--- a/drivers/video/video-uclass.c
+++ b/drivers/video/video-uclass.c
@@ -14,6 +14,7 @@
 #include <video.h>
 #include <video_console.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <dm/lists.h>
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
diff --git a/drivers/video/videomodes.c b/drivers/video/videomodes.c
index 89003eea727..ed7373eac84 100644
--- a/drivers/video/videomodes.c
+++ b/drivers/video/videomodes.c
@@ -60,6 +60,7 @@
 #include <edid.h>
 #include <env.h>
 #include <errno.h>
+#include <fdtdec.h>
 #include <linux/ctype.h>
 
 #include "videomodes.h"
diff --git a/drivers/watchdog/armada-37xx-wdt.c b/drivers/watchdog/armada-37xx-wdt.c
index 5da8e56505f..7af680a5c25 100644
--- a/drivers/watchdog/armada-37xx-wdt.c
+++ b/drivers/watchdog/armada-37xx-wdt.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <dm.h>
 #include <wdt.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
diff --git a/drivers/watchdog/at91sam9_wdt.c b/drivers/watchdog/at91sam9_wdt.c
index 33f5c351d5b..e64831132dc 100644
--- a/drivers/watchdog/at91sam9_wdt.c
+++ b/drivers/watchdog/at91sam9_wdt.c
@@ -15,6 +15,7 @@
  */
 
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/at91_wdt.h>
 #include <common.h>
diff --git a/drivers/watchdog/mt7621_wdt.c b/drivers/watchdog/mt7621_wdt.c
index 1cd8866ef8d..ff5c3243ce7 100644
--- a/drivers/watchdog/mt7621_wdt.c
+++ b/drivers/watchdog/mt7621_wdt.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <dm.h>
 #include <wdt.h>
+#include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/io.h>
 
diff --git a/drivers/watchdog/orion_wdt.c b/drivers/watchdog/orion_wdt.c
index d33e2ac3dc1..3284321299d 100644
--- a/drivers/watchdog/orion_wdt.c
+++ b/drivers/watchdog/orion_wdt.c
@@ -17,6 +17,7 @@
 #include <clk.h>
 #include <log.h>
 #include <wdt.h>
+#include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/kernel.h>
 #include <asm/io.h>
diff --git a/drivers/watchdog/sbsa_gwdt.c b/drivers/watchdog/sbsa_gwdt.c
index 2eae431ba6c..b837b045fa5 100644
--- a/drivers/watchdog/sbsa_gwdt.c
+++ b/drivers/watchdog/sbsa_gwdt.c
@@ -5,6 +5,7 @@
  * Copyright 2020 NXP
  */
 
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <common.h>
 #include <dm/device.h>
diff --git a/drivers/watchdog/sp805_wdt.c b/drivers/watchdog/sp805_wdt.c
index 23fef2147f8..0eea0ab388e 100644
--- a/drivers/watchdog/sp805_wdt.c
+++ b/drivers/watchdog/sp805_wdt.c
@@ -6,6 +6,7 @@
  */
 
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <common.h>
 #include <clk.h>
diff --git a/drivers/watchdog/wdt-uclass.c b/drivers/watchdog/wdt-uclass.c
index e632f077f34..28f7918c467 100644
--- a/drivers/watchdog/wdt-uclass.c
+++ b/drivers/watchdog/wdt-uclass.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <time.h>
 #include <wdt.h>
+#include <asm/global_data.h>
 #include <dm/device-internal.h>
 #include <dm/lists.h>
 
diff --git a/env/callback.c b/env/callback.c
index 4054b9ef58b..638a02b28f7 100644
--- a/env/callback.c
+++ b/env/callback.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <env.h>
 #include <env_internal.h>
+#include <asm/global_data.h>
 
 #if defined(CONFIG_NEEDS_MANUAL_RELOC)
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/env/common.c b/env/common.c
index ed18378000f..d6d1fa3a1f7 100644
--- a/env/common.c
+++ b/env/common.c
@@ -14,6 +14,7 @@
 #include <env_internal.h>
 #include <log.h>
 #include <sort.h>
+#include <asm/global_data.h>
 #include <linux/stddef.h>
 #include <search.h>
 #include <errno.h>
diff --git a/env/eeprom.c b/env/eeprom.c
index e300470ad0f..ba168014e24 100644
--- a/env/eeprom.c
+++ b/env/eeprom.c
@@ -12,6 +12,7 @@
 #include <eeprom.h>
 #include <env.h>
 #include <env_internal.h>
+#include <asm/global_data.h>
 #include <linux/stddef.h>
 #include <u-boot/crc.h>
 #if defined(CONFIG_I2C_ENV_EEPROM_BUS)
diff --git a/env/env.c b/env/env.c
index 42c7d8155e1..51f55ec3fe8 100644
--- a/env/env.c
+++ b/env/env.c
@@ -8,6 +8,7 @@
 #include <env.h>
 #include <env_internal.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/bug.h>
 
diff --git a/env/ext4.c b/env/ext4.c
index f823b694099..d4869a1a457 100644
--- a/env/ext4.c
+++ b/env/ext4.c
@@ -31,6 +31,7 @@
 #include <errno.h>
 #include <ext4fs.h>
 #include <mmc.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/env/flash.c b/env/flash.c
index 722d5adf8b6..ebee9069e4e 100644
--- a/env/flash.c
+++ b/env/flash.c
@@ -15,6 +15,7 @@
 #include <env_internal.h>
 #include <flash.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <linux/stddef.h>
 #include <malloc.h>
 #include <search.h>
diff --git a/env/mmc.c b/env/mmc.c
index af7e5fbac3a..66a94631e38 100644
--- a/env/mmc.c
+++ b/env/mmc.c
@@ -6,6 +6,7 @@
 /* #define DEBUG */
 
 #include <common.h>
+#include <asm/global_data.h>
 
 #include <command.h>
 #include <env.h>
diff --git a/env/nand.c b/env/nand.c
index 0d7ee19bc23..be82e97d69c 100644
--- a/env/nand.c
+++ b/env/nand.c
@@ -17,6 +17,7 @@
 #include <command.h>
 #include <env.h>
 #include <env_internal.h>
+#include <asm/global_data.h>
 #include <linux/stddef.h>
 #include <malloc.h>
 #include <memalign.h>
diff --git a/env/nowhere.c b/env/nowhere.c
index d33fdf27d0c..23028661084 100644
--- a/env/nowhere.c
+++ b/env/nowhere.c
@@ -11,6 +11,7 @@
 #include <command.h>
 #include <env.h>
 #include <env_internal.h>
+#include <asm/global_data.h>
 #include <linux/stddef.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/env/nvram.c b/env/nvram.c
index 7c8ea26f968..f4126858b5b 100644
--- a/env/nvram.c
+++ b/env/nvram.c
@@ -27,6 +27,7 @@
 #include <command.h>
 #include <env.h>
 #include <env_internal.h>
+#include <asm/global_data.h>
 #include <linux/stddef.h>
 #include <search.h>
 #include <errno.h>
diff --git a/env/onenand.c b/env/onenand.c
index a2477cef9be..c8da3ff8114 100644
--- a/env/onenand.c
+++ b/env/onenand.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <command.h>
 #include <env_internal.h>
+#include <asm/global_data.h>
 #include <linux/stddef.h>
 #include <malloc.h>
 #include <search.h>
diff --git a/env/remote.c b/env/remote.c
index d93a137376e..166bebf52b5 100644
--- a/env/remote.c
+++ b/env/remote.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <command.h>
 #include <env_internal.h>
+#include <asm/global_data.h>
 #include <linux/stddef.h>
 #include <u-boot/crc.h>
 
diff --git a/env/sf.c b/env/sf.c
index 937778aa37d..f01d1dbcb21 100644
--- a/env/sf.c
+++ b/env/sf.c
@@ -20,6 +20,7 @@
 #include <errno.h>
 #include <uuid.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <dm/device-internal.h>
 #include <u-boot/crc.h>
 
diff --git a/env/ubi.c b/env/ubi.c
index 5502efe28b6..eb21c4f38b4 100644
--- a/env/ubi.c
+++ b/env/ubi.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <asm/global_data.h>
 
 #include <command.h>
 #include <env.h>
diff --git a/examples/standalone/stubs.c b/examples/standalone/stubs.c
index 5fb460454f2..3e326fc6405 100644
--- a/examples/standalone/stubs.c
+++ b/examples/standalone/stubs.c
@@ -1,5 +1,6 @@
 #include <common.h>
 #include <exports.h>
+#include <asm/global_data.h>
 #include <linux/compiler.h>
 
 struct cmd_tbl;
diff --git a/fs/ext4/ext4_journal.c b/fs/ext4/ext4_journal.c
index 1a340b4764c..361baa35c92 100644
--- a/fs/ext4/ext4_journal.c
+++ b/fs/ext4/ext4_journal.c
@@ -19,6 +19,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <ext_common.h>
+#include <asm/global_data.h>
 #include "ext4_common.h"
 
 static struct revoke_blk_list *revk_blk_list;
diff --git a/fs/ext4/ext4_journal.h b/fs/ext4/ext4_journal.h
index 43fb8e76641..8c974cff609 100644
--- a/fs/ext4/ext4_journal.h
+++ b/fs/ext4/ext4_journal.h
@@ -17,6 +17,7 @@
 #ifndef __EXT4_JRNL__
 #define __EXT4_JRNL__
 
+#include <asm/global_data.h>
 #define EXT4_FEATURE_COMPAT_HAS_JOURNAL		0x0004
 
 #define EXT2_JOURNAL_INO		8	/* Journal inode */
diff --git a/fs/ext4/ext4fs.c b/fs/ext4/ext4fs.c
index 4c89152ce4a..691d7e29b6d 100644
--- a/fs/ext4/ext4fs.c
+++ b/fs/ext4/ext4fs.c
@@ -24,11 +24,11 @@
 #include <blk.h>
 #include <ext_common.h>
 #include <ext4fs.h>
-#include "ext4_common.h"
 #include <div64.h>
 #include <malloc.h>
 #include <part.h>
 #include <uuid.h>
+#include "ext4_common.h"
 
 int ext4fs_symlinknest;
 struct ext_filesystem ext_fs;
diff --git a/fs/fs.c b/fs/fs.c
index edd8adc21b9..fc21e69c3d2 100644
--- a/fs/fs.c
+++ b/fs/fs.c
@@ -18,6 +18,7 @@
 #include <sandboxfs.h>
 #include <ubifs_uboot.h>
 #include <btrfs.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <div64.h>
 #include <linux/math64.h>
diff --git a/fs/reiserfs/reiserfs_private.h b/fs/reiserfs/reiserfs_private.h
index c8867e24fef..5936f214005 100644
--- a/fs/reiserfs/reiserfs_private.h
+++ b/fs/reiserfs/reiserfs_private.h
@@ -15,6 +15,8 @@
  * from the original reiser fs code, as found in the linux kernel.
  */
 
+#include <compiler.h>
+
 #ifndef __BYTE_ORDER
 #if defined(__LITTLE_ENDIAN) && !defined(__BIG_ENDIAN)
 #define __BYTE_ORDER __LITTLE_ENDIAN
diff --git a/fs/ubifs/ubifs.c b/fs/ubifs/ubifs.c
index 70beb848e1b..d6be5c947d7 100644
--- a/fs/ubifs/ubifs.c
+++ b/fs/ubifs/ubifs.c
@@ -17,6 +17,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <memalign.h>
+#include <asm/global_data.h>
 #include "ubifs.h"
 #include <part.h>
 #include <dm/devres.h>
diff --git a/include/audio_codec.h b/include/audio_codec.h
index 25870995469..2ea4ff096e6 100644
--- a/include/audio_codec.h
+++ b/include/audio_codec.h
@@ -7,6 +7,8 @@
 #ifndef __AUDIO_CODEC_H__
 #define __AUDIO_CODEC_H__
 
+struct udevice;
+
 /*
  * An audio codec turns digital data into sound with various parameters to
  * control its operation.
diff --git a/include/axi.h b/include/axi.h
index 3e40692cdfd..59fb0b2e458 100644
--- a/include/axi.h
+++ b/include/axi.h
@@ -7,6 +7,8 @@
 #ifndef _AXI_H_
 #define _AXI_H_
 
+struct udevice;
+
 /**
  * enum axi_size_t - Determine size of AXI transfer
  * @AXI_SIZE_8:  AXI sransfer is 8-bit wide
diff --git a/include/backlight.h b/include/backlight.h
index ac59eb293b4..b44da50bc30 100644
--- a/include/backlight.h
+++ b/include/backlight.h
@@ -7,6 +7,8 @@
 #ifndef _BACKLIGHT_H
 #define _BACKLIGHT_H
 
+struct udevice;
+
 enum {
 	BACKLIGHT_MAX		= 100,
 	BACKLIGHT_MIN		= 0,
diff --git a/include/board.h b/include/board.h
index 678b652b0aa..a43f35a021b 100644
--- a/include/board.h
+++ b/include/board.h
@@ -4,6 +4,8 @@
  * Mario Six,  Guntermann & Drunck GmbH, mario.six at gdsys.cc
  */
 
+struct udevice;
+
 /*
  * This uclass encapsulates hardware methods to gather information about a
  * board or a specific device such as hard-wired GPIOs on GPIO expanders,
@@ -32,6 +34,7 @@
  */
 
 #if CONFIG_IS_ENABLED(BOARD)
+
 struct board_ops {
 	/**
 	 * detect() - Run the hardware info detection procedure for this
diff --git a/include/bootcount.h b/include/bootcount.h
index cd304039849..bb235407e30 100644
--- a/include/bootcount.h
+++ b/include/bootcount.h
@@ -7,6 +7,7 @@
 #define _BOOTCOUNT_H__
 
 #include <common.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/byteorder.h>
 #include <env.h>
diff --git a/include/cache.h b/include/cache.h
index 32f59fd8f71..ecb7956efd5 100644
--- a/include/cache.h
+++ b/include/cache.h
@@ -6,6 +6,8 @@
 #ifndef __CACHE_H
 #define __CACHE_H
 
+struct udevice;
+
 /*
  * Structure for the cache controller
  */
diff --git a/include/common.h b/include/common.h
index f0679ac7054..71df59bca0e 100644
--- a/include/common.h
+++ b/include/common.h
@@ -23,7 +23,6 @@
 #include <stdio.h>
 #include <linux/kernel.h>
 #include <asm/u-boot.h> /* boot information for Linux kernel */
-#include <asm/global_data.h>	/* global data used for startup functions */
 #include <display_options.h>
 #include <vsprintf.h>
 #endif	/* __ASSEMBLY__ */
diff --git a/include/cpu.h b/include/cpu.h
index 78e88b9ed09..089e74c262b 100644
--- a/include/cpu.h
+++ b/include/cpu.h
@@ -7,6 +7,8 @@
 #ifndef __CPU_H
 #define __CPU_H
 
+struct udevice;
+
 /**
  * struct cpu_platdata - platform data for a CPU
  * @cpu_id:	   Platform-specific way of identifying the CPU.
diff --git a/include/dm/device-internal.h b/include/dm/device-internal.h
index 5145fb4e145..c29134976aa 100644
--- a/include/dm/device-internal.h
+++ b/include/dm/device-internal.h
@@ -10,6 +10,7 @@
 #ifndef _DM_DEVICE_INTERNAL_H
 #define _DM_DEVICE_INTERNAL_H
 
+#include <asm/global_data.h>
 #include <dm/ofnode.h>
 
 struct device_node;
diff --git a/include/dma.h b/include/dma.h
index 6ff591977b1..a64580a61ff 100644
--- a/include/dma.h
+++ b/include/dma.h
@@ -13,6 +13,8 @@
 #include <linux/errno.h>
 #include <linux/types.h>
 
+struct udevice;
+
 /*
  * enum dma_direction - dma transfer direction indicator
  * @DMA_MEM_TO_MEM: Memcpy mode
diff --git a/include/exports.h b/include/exports.h
index b3005540916..e89cc333e52 100644
--- a/include/exports.h
+++ b/include/exports.h
@@ -2,6 +2,7 @@
 #define __EXPORTS_H__
 
 #include <irq_func.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 
 #ifndef __ASSEMBLY__
diff --git a/include/ext_common.h b/include/ext_common.h
index bc3324172a0..30a0c248414 100644
--- a/include/ext_common.h
+++ b/include/ext_common.h
@@ -20,6 +20,8 @@
 #ifndef __EXT_COMMON__
 #define __EXT_COMMON__
 
+#include <compiler.h>
+
 struct cmd_tbl;
 
 #define SECTOR_SIZE		0x200
diff --git a/include/image-sparse.h b/include/image-sparse.h
index 234c237b845..0572dbd0a28 100644
--- a/include/image-sparse.h
+++ b/include/image-sparse.h
@@ -3,6 +3,7 @@
  * Copyright 2014 Broadcom Corporation.
  */
 
+#include <compiler.h>
 #include <part.h>
 #include <sparse_format.h>
 
diff --git a/include/init.h b/include/init.h
index de408baf892..1878727ebf7 100644
--- a/include/init.h
+++ b/include/init.h
@@ -10,16 +10,15 @@
 #ifndef __INIT_H_
 #define __INIT_H_	1
 
-#include <linux/types.h>
-
-struct global_data;
-
 #ifndef __ASSEMBLY__		/* put C only stuff in this section */
 
+#include <linux/types.h>
+
 /* Avoid using CONFIG_EFI_STUB directly as we may boot from other loaders */
 #ifdef CONFIG_EFI_STUB
 #define ll_boot_init()	false
 #else
+#include <asm/global_data.h>
 #define ll_boot_init()	(!(gd->flags & GD_FLG_SKIP_LL_INIT))
 #endif
 
diff --git a/include/led.h b/include/led.h
index 7bfdddfd6fa..02766fa56fb 100644
--- a/include/led.h
+++ b/include/led.h
@@ -7,6 +7,8 @@
 #ifndef __LED_H
 #define __LED_H
 
+struct udevice;
+
 /**
  * struct led_uc_plat - Platform data the uclass stores about each device
  *
diff --git a/include/libata.h b/include/libata.h
index b03b29960df..10e6057ef4a 100644
--- a/include/libata.h
+++ b/include/libata.h
@@ -10,8 +10,6 @@
 #ifndef __LIBATA_H__
 #define __LIBATA_H__
 
-#include <common.h>
-
 enum {
 	/* various global constants */
 	ATA_MAX_DEVICES		= 2,	/* per bus/port */
diff --git a/include/misc.h b/include/misc.h
index 12d1325ee26..82ec2ce7936 100644
--- a/include/misc.h
+++ b/include/misc.h
@@ -6,6 +6,8 @@
 #ifndef _MISC_H_
 #define _MISC_H_
 
+struct udevice;
+
 /**
  * misc_read() - Read the device to buffer, optional.
  * @dev: the device
diff --git a/include/netdev.h b/include/netdev.h
index b1eb5fc1046..0ad9f8dc3a5 100644
--- a/include/netdev.h
+++ b/include/netdev.h
@@ -12,6 +12,8 @@
 #define _NETDEV_H_
 #include <phy_interface.h>
 
+struct udevice;
+
 /*
  * Board and CPU-specific initialization functions
  * board_eth_init() has highest priority.  cpu_eth_init() only
diff --git a/include/pci.h b/include/pci.h
index 281f3539168..3686137d97a 100644
--- a/include/pci.h
+++ b/include/pci.h
@@ -825,9 +825,7 @@ int pci_last_busno(void);
 extern void pci_mpc85xx_init (struct pci_controller *hose);
 #endif
 
-#ifdef CONFIG_PCIE_IMX
 extern void imx_pcie_remove(void);
-#endif
 
 #if !defined(CONFIG_DM_PCI) || defined(CONFIG_DM_PCI_COMPAT)
 /**
diff --git a/include/power/as3722.h b/include/power/as3722.h
index 27828570559..f5398123f2a 100644
--- a/include/power/as3722.h
+++ b/include/power/as3722.h
@@ -6,6 +6,8 @@
 #ifndef __POWER_AS3722_H__
 #define __POWER_AS3722_H__
 
+struct udevice;
+
 #define AS3722_GPIO_OUTPUT_VDDH (1 << 0)
 #define AS3722_GPIO_INVERT (1 << 1)
 
diff --git a/include/power/regulator.h b/include/power/regulator.h
index 74938dd61e4..d9eb9cae2b7 100644
--- a/include/power/regulator.h
+++ b/include/power/regulator.h
@@ -7,6 +7,8 @@
 #ifndef _INCLUDE_REGULATOR_H_
 #define _INCLUDE_REGULATOR_H_
 
+struct udevice;
+
 /**
  * U-Boot Voltage/Current Regulator
  * ================================
diff --git a/include/pwm.h b/include/pwm.h
index 54ae3e64c31..f9959706ceb 100644
--- a/include/pwm.h
+++ b/include/pwm.h
@@ -10,6 +10,8 @@
 #ifndef _pwm_h_
 #define _pwm_h_
 
+struct udevice;
+
 /* struct pwm_ops: Operations for the PWM uclass */
 struct pwm_ops {
 	/**
diff --git a/include/ram.h b/include/ram.h
index 67e22d76c93..273d4153940 100644
--- a/include/ram.h
+++ b/include/ram.h
@@ -7,6 +7,8 @@
 #ifndef __RAM_H
 #define __RAM_H
 
+struct udevice;
+
 struct ram_info {
 	phys_addr_t base;
 	size_t size;
diff --git a/include/scsi.h b/include/scsi.h
index 96cb7266762..61619e89a7f 100644
--- a/include/scsi.h
+++ b/include/scsi.h
@@ -9,6 +9,8 @@
 #include <asm/cache.h>
 #include <linux/dma-direction.h>
 
+struct udevice;
+
 struct scsi_cmd {
 	unsigned char		cmd[16];					/* command				   */
 	/* for request sense */
diff --git a/include/soc.h b/include/soc.h
index a55eb1b5724..a52a300a84a 100644
--- a/include/soc.h
+++ b/include/soc.h
@@ -9,6 +9,8 @@
 
 #define SOC_MAX_STR_SIZE	128
 
+struct udevice;
+
 /**
  * struct soc_attr - Contains SoC identify information to be used in
  *		     SoC matching. An array of these structs
diff --git a/include/sysreset.h b/include/sysreset.h
index 61295e3fcbb..8bb094d463b 100644
--- a/include/sysreset.h
+++ b/include/sysreset.h
@@ -7,6 +7,8 @@
 #ifndef __SYSRESET_H
 #define __SYSRESET_H
 
+struct udevice;
+
 enum sysreset_t {
 	SYSRESET_WARM,	/* Reset CPU, keep GPIOs active */
 	SYSRESET_COLD,	/* Reset CPU and GPIOs */
diff --git a/include/tee.h b/include/tee.h
index 8207d0c02af..99367b258e2 100644
--- a/include/tee.h
+++ b/include/tee.h
@@ -7,6 +7,8 @@
 #define __TEE_H
 
 #include <linux/bitops.h>
+#include <linux/list.h>
+
 #define TEE_UUID_LEN		16
 
 #define TEE_GEN_CAP_GP          BIT(0)	/* GlobalPlatform compliant TEE */
diff --git a/include/tlv_eeprom.h b/include/tlv_eeprom.h
index 1de2fe2337c..9f4a109dca9 100644
--- a/include/tlv_eeprom.h
+++ b/include/tlv_eeprom.h
@@ -7,6 +7,8 @@
 #ifndef __TLV_EEPROM_H_
 #define __TLV_EEPROM_H_
 
+#include <compiler.h>
+
 /*
  *  The Definition of the TlvInfo EEPROM format can be found at onie.org or
  *  github.com/onie
diff --git a/include/tpm-common.h b/include/tpm-common.h
index e29b10b1766..c1309a2735d 100644
--- a/include/tpm-common.h
+++ b/include/tpm-common.h
@@ -9,6 +9,8 @@
 
 #include <command.h>
 
+struct udevice;
+
 enum tpm_duration {
 	TPM_SHORT = 0,
 	TPM_MEDIUM = 1,
diff --git a/include/tpm-v1.h b/include/tpm-v1.h
index 59ad4aecf42..8f6cc28a9ea 100644
--- a/include/tpm-v1.h
+++ b/include/tpm-v1.h
@@ -10,6 +10,8 @@
 #include <tpm-common.h>
 #include <linux/bitops.h>
 
+struct udevice;
+
 /* Useful constants */
 enum {
 	TPM_REQUEST_HEADER_LENGTH	= 10,
diff --git a/include/tpm-v2.h b/include/tpm-v2.h
index f6c045d3548..3b2fe449007 100644
--- a/include/tpm-v2.h
+++ b/include/tpm-v2.h
@@ -11,6 +11,8 @@
 
 #define TPM2_DIGEST_LEN		32
 
+struct udevice;
+
 /**
  * TPM2 Structure Tags for command/response buffers.
  *
diff --git a/include/tps6586x.h b/include/tps6586x.h
index 785eb39229d..aa4270c65e3 100644
--- a/include/tps6586x.h
+++ b/include/tps6586x.h
@@ -7,6 +7,8 @@
 #ifndef _TPS6586X_H_
 #define _TPS6586X_H_
 
+struct udevice;
+
 enum {
 	/* SM0-2 PWM/PFM Mode Selection */
 	TPS6586X_PWM_SM0	= 1 << 0,
diff --git a/include/ufs.h b/include/ufs.h
index 0592a763dd9..bda135cf184 100644
--- a/include/ufs.h
+++ b/include/ufs.h
@@ -1,6 +1,9 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
 #ifndef _UFS_H
 #define _UFS_H
+
+struct udevice;
+
 /**
  * ufs_probe() - initialize all devices in the UFS uclass
  *
diff --git a/lib/acpi/acpi_table.c b/lib/acpi/acpi_table.c
index acc55e7fad6..a3b0fb3bce0 100644
--- a/lib/acpi/acpi_table.c
+++ b/lib/acpi/acpi_table.c
@@ -13,6 +13,7 @@
 #include <tables_csum.h>
 #include <version.h>
 #include <acpi/acpi_table.h>
+#include <asm/global_data.h>
 #include <dm/acpi.h>
 
 int acpi_create_dmar(struct acpi_dmar *dmar, enum dmar_flags flags)
diff --git a/lib/asm-offsets.c b/lib/asm-offsets.c
index b17651ed63d..ee592cfda1c 100644
--- a/lib/asm-offsets.c
+++ b/lib/asm-offsets.c
@@ -13,6 +13,7 @@
 
 #include <common.h>
 #include <asm-offsets.h>
+#include <asm/global_data.h>
 
 #include <linux/kbuild.h>
 
diff --git a/lib/efi/efi_app.c b/lib/efi/efi_app.c
index b7e19c34750..907bacd716a 100644
--- a/lib/efi/efi_app.c
+++ b/lib/efi/efi_app.c
@@ -15,6 +15,7 @@
 #include <errno.h>
 #include <init.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <linux/err.h>
 #include <linux/types.h>
 #include <efi.h>
diff --git a/lib/efi/efi_info.c b/lib/efi/efi_info.c
index 35a8a9325f8..4d78923c4d4 100644
--- a/lib/efi/efi_info.c
+++ b/lib/efi/efi_info.c
@@ -9,6 +9,7 @@
 #include <efi.h>
 #include <errno.h>
 #include <mapmem.h>
+#include <asm/global_data.h>
 
 int efi_info_get(enum efi_entry_t type, void **datap, int *sizep)
 {
diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c
index d49145fc76b..d07e36caa3f 100644
--- a/lib/efi_loader/efi_boottime.c
+++ b/lib/efi_loader/efi_boottime.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <time.h>
+#include <asm/global_data.h>
 #include <linux/libfdt_env.h>
 #include <u-boot/crc.h>
 #include <bootm.h>
diff --git a/lib/efi_loader/efi_gop.c b/lib/efi_loader/efi_gop.c
index 53f6d970f73..1206b2d7a2c 100644
--- a/lib/efi_loader/efi_gop.c
+++ b/lib/efi_loader/efi_gop.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <video.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c
index 44b8a2e09f0..9e0e08bc7a9 100644
--- a/lib/efi_loader/efi_memory.c
+++ b/lib/efi_loader/efi_memory.c
@@ -12,6 +12,7 @@
 #include <mapmem.h>
 #include <watchdog.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <linux/list_sort.h>
 #include <linux/sizes.h>
 
diff --git a/lib/efi_loader/efi_rng.c b/lib/efi_loader/efi_rng.c
index caef4085b07..974a3ed7281 100644
--- a/lib/efi_loader/efi_rng.c
+++ b/lib/efi_loader/efi_rng.c
@@ -9,6 +9,7 @@
 #include <efi_rng.h>
 #include <log.h>
 #include <rng.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/lib/efi_loader/efi_runtime.c b/lib/efi_loader/efi_runtime.c
index 78fd8014d90..d0235c46e18 100644
--- a/lib/efi_loader/efi_runtime.c
+++ b/lib/efi_loader/efi_runtime.c
@@ -14,6 +14,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <rtc.h>
+#include <asm/global_data.h>
 #include <u-boot/crc.h>
 
 /* For manual relocation support */
diff --git a/lib/fdtdec.c b/lib/fdtdec.c
index 78576b530fd..8fccb9e602a 100644
--- a/lib/fdtdec.c
+++ b/lib/fdtdec.c
@@ -21,6 +21,7 @@
 #include <mapmem.h>
 #include <linux/libfdt.h>
 #include <serial.h>
+#include <asm/global_data.h>
 #include <asm/sections.h>
 #include <linux/ctype.h>
 #include <linux/lzo.h>
diff --git a/lib/optee/optee.c b/lib/optee/optee.c
index 457d4cca8a0..ed973168023 100644
--- a/lib/optee/optee.c
+++ b/lib/optee/optee.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <fdtdec.h>
 #include <image.h>
 #include <log.h>
 #include <malloc.h>
diff --git a/lib/time.c b/lib/time.c
index 47f8c84327d..1a2a1166cf8 100644
--- a/lib/time.c
+++ b/lib/time.c
@@ -13,6 +13,7 @@
 #include <timer.h>
 #include <watchdog.h>
 #include <div64.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/delay.h>
 
diff --git a/lib/trace.c b/lib/trace.c
index 831283c283d..854e495ed71 100644
--- a/lib/trace.c
+++ b/lib/trace.c
@@ -7,6 +7,7 @@
 #include <mapmem.h>
 #include <time.h>
 #include <trace.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/sections.h>
 
diff --git a/lib/zlib/zlib.c b/lib/zlib/zlib.c
index 7e1570292c3..573ecb27f11 100644
--- a/lib/zlib/zlib.c
+++ b/lib/zlib/zlib.c
@@ -13,6 +13,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 
 #ifdef CONFIG_GZIP_COMPRESSED
 #define NO_DUMMY_DECL
diff --git a/net/eth-uclass.c b/net/eth-uclass.c
index 0d9b75a9a20..9b5c3c04ecc 100644
--- a/net/eth-uclass.c
+++ b/net/eth-uclass.c
@@ -11,6 +11,7 @@
 #include <env.h>
 #include <log.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
 #include <net/pcap.h>
diff --git a/net/eth_legacy.c b/net/eth_legacy.c
index 340469ba3aa..9397113a632 100644
--- a/net/eth_legacy.c
+++ b/net/eth_legacy.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <net.h>
 #include <phy.h>
+#include <asm/global_data.h>
 #include <linux/bug.h>
 #include <linux/errno.h>
 #include <net/pcap.h>
diff --git a/net/tftp.c b/net/tftp.c
index c05b7b5532b..664802f55a7 100644
--- a/net/tftp.c
+++ b/net/tftp.c
@@ -15,6 +15,7 @@
 #include <log.h>
 #include <mapmem.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <net/tftp.h>
 #include "bootp.h"
 #ifdef CONFIG_SYS_DIRECT_FLASH_TFTP
diff --git a/post/drivers/memory.c b/post/drivers/memory.c
index e90ada3ce85..281989da6fa 100644
--- a/post/drivers/memory.c
+++ b/post/drivers/memory.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <asm/global_data.h>
 
 /* Memory test
  *
diff --git a/post/post.c b/post/post.c
index 6687e0b75ca..c344ec5810f 100644
--- a/post/post.c
+++ b/post/post.c
@@ -14,6 +14,7 @@
 #include <watchdog.h>
 #include <div64.h>
 #include <post.h>
+#include <asm/global_data.h>
 
 #ifdef CONFIG_SYS_POST_HOTKEYS_GPIO
 #include <asm/gpio.h>
diff --git a/test/bloblist.c b/test/bloblist.c
index 4e537ee1b9c..b93e2713dfd 100644
--- a/test/bloblist.c
+++ b/test/bloblist.c
@@ -7,6 +7,7 @@
 #include <bloblist.h>
 #include <log.h>
 #include <mapmem.h>
+#include <asm/global_data.h>
 #include <test/suites.h>
 #include <test/test.h>
 #include <test/ut.h>
diff --git a/test/dm/acpi.c b/test/dm/acpi.c
index bb8550ffb1a..b6988f26739 100644
--- a/test/dm/acpi.c
+++ b/test/dm/acpi.c
@@ -17,6 +17,7 @@
 #include <acpi/acpigen.h>
 #include <acpi/acpi_device.h>
 #include <acpi/acpi_table.h>
+#include <asm/global_data.h>
 #include <dm/acpi.h>
 #include <dm/test.h>
 #include <test/ut.h>
diff --git a/test/dm/blk.c b/test/dm/blk.c
index 94b2855b8e9..84ee0b6df26 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 <asm/global_data.h>
 #include <asm/state.h>
 #include <dm/test.h>
 #include <test/ut.h>
diff --git a/test/dm/bus.c b/test/dm/bus.c
index 73eb3aede3d..24c2b09d81c 100644
--- a/test/dm/bus.c
+++ b/test/dm/bus.c
@@ -9,6 +9,7 @@
 #include <os.h>
 #endif
 #include <dm.h>
+#include <asm/global_data.h>
 #include <dm/device.h>
 #include <dm/device-internal.h>
 #include <dm/test.h>
diff --git a/test/dm/core.c b/test/dm/core.c
index d20c48443f6..621ce61f40a 100644
--- a/test/dm/core.c
+++ b/test/dm/core.c
@@ -11,6 +11,7 @@
 #include <fdtdec.h>
 #include <log.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <dm/device-internal.h>
 #include <dm/root.h>
 #include <dm/util.h>
diff --git a/test/dm/fdtdec.c b/test/dm/fdtdec.c
index 56f6f4f6cc6..f835240de76 100644
--- a/test/dm/fdtdec.c
+++ b/test/dm/fdtdec.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <asm/global_data.h>
 #include <dm/of_extra.h>
 #include <dm/test.h>
 #include <test/ut.h>
diff --git a/test/dm/ram.c b/test/dm/ram.c
index 3efdb6b80b2..21c6c4d25b4 100644
--- a/test/dm/ram.c
+++ b/test/dm/ram.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <dm.h>
 #include <ram.h>
+#include <asm/global_data.h>
 #include <dm/test.h>
 #include <test/ut.h>
 
diff --git a/test/dm/test-fdt.c b/test/dm/test-fdt.c
index 8ef7c7a88e8..495883caaaf 100644
--- a/test/dm/test-fdt.c
+++ b/test/dm/test-fdt.c
@@ -9,6 +9,7 @@
 #include <fdtdec.h>
 #include <log.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm/test.h>
 #include <dm/root.h>
diff --git a/test/dm/test-main.c b/test/dm/test-main.c
index 53e5ca321fe..32ae3b1d296 100644
--- a/test/dm/test-main.c
+++ b/test/dm/test-main.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <log.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <asm/state.h>
 #include <dm/test.h>
 #include <dm/root.h>
diff --git a/test/log/nolog_test.c b/test/log/nolog_test.c
index c418ed07c9a..cb4fb3db9a2 100644
--- a/test/log/nolog_test.c
+++ b/test/log/nolog_test.c
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <console.h>
+#include <asm/global_data.h>
 #include <test/log.h>
 #include <test/test.h>
 #include <test/suites.h>
diff --git a/test/log/syslog_test.c b/test/log/syslog_test.c
index 120a8b2537b..ac2df3fb7c0 100644
--- a/test/log/syslog_test.c
+++ b/test/log/syslog_test.c
@@ -11,6 +11,7 @@
 #define LOG_DEBUG
 
 #include <common.h>
+#include <asm/global_data.h>
 #include <dm/device.h>
 #include <hexdump.h>
 #include <test/log.h>
diff --git a/test/ut.c b/test/ut.c
index c64f0b554d5..9a11af4ad54 100644
--- a/test/ut.c
+++ b/test/ut.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <console.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <test/test.h>
 #include <test/ut.h>
 
-- 
2.28.0.163.g6104cc2f0b6-goog

^ permalink raw reply related	[flat|nested] 35+ messages in thread

* [PATCH 02/16] common: Drop display_options.h from common header
  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 ` Simon Glass
  2020-08-02 22:59 ` [PATCH 03/16] common: Drop linux/printk.h " Simon Glass
                   ` (14 subsequent siblings)
  16 siblings, 0 replies; 35+ messages in thread
From: Simon Glass @ 2020-08-02 22:59 UTC (permalink / raw)
  To: u-boot

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

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

 arch/arm/cpu/armv7/s5p-common/cpu_info.c      | 1 +
 arch/arm/mach-at91/arm926ejs/eflash.c         | 1 +
 arch/arm/mach-imx/hab.c                       | 1 +
 arch/powerpc/cpu/mpc85xx/cpu.c                | 1 +
 arch/powerpc/cpu/mpc85xx/cpu_init.c           | 1 +
 arch/powerpc/cpu/mpc85xx/tlb.c                | 1 +
 arch/powerpc/cpu/mpc86xx/cpu.c                | 1 +
 arch/powerpc/cpu/mpc8xx/cpu.c                 | 1 +
 arch/powerpc/cpu/mpc8xxx/law.c                | 1 +
 arch/x86/cpu/broadwell/refcode.c              | 1 +
 board/corscience/tricorder/tricorder-eeprom.c | 1 +
 board/freescale/ls1028a/ls1028a.c             | 1 +
 board/freescale/ls1088a/ls1088a.c             | 1 +
 board/freescale/ls2080a/ls2080a.c             | 1 +
 board/freescale/ls2080aqds/ls2080aqds.c       | 1 +
 board/freescale/ls2080ardb/ls2080ardb.c       | 1 +
 board/freescale/lx2160a/lx2160a.c             | 1 +
 board/freescale/mpc8541cds/mpc8541cds.c       | 1 +
 board/freescale/mpc8548cds/mpc8548cds.c       | 1 +
 board/freescale/mpc8555cds/mpc8555cds.c       | 1 +
 board/freescale/mpc8568mds/mpc8568mds.c       | 1 +
 board/gdsys/p1022/controlcenterd-id.c         | 1 +
 board/kosagi/novena/novena.c                  | 1 +
 board/sbc8548/sbc8548.c                       | 1 +
 cmd/acpi.c                                    | 1 +
 cmd/axi.c                                     | 1 +
 cmd/bcb.c                                     | 1 +
 cmd/cpu.c                                     | 1 +
 cmd/fpgad.c                                   | 1 +
 cmd/io.c                                      | 1 +
 cmd/mem.c                                     | 1 +
 cmd/mmc.c                                     | 1 +
 cmd/rtc.c                                     | 1 +
 cmd/sf.c                                      | 1 +
 cmd/version.c                                 | 1 +
 common/board_f.c                              | 1 +
 common/board_r.c                              | 1 +
 common/console.c                              | 1 +
 common/image.c                                | 1 +
 common/splash.c                               | 1 +
 drivers/core/acpi.c                           | 1 +
 drivers/cpu/bmips_cpu.c                       | 1 +
 drivers/ddr/fsl/main.c                        | 1 +
 drivers/mmc/gen_atmel_mci.c                   | 1 +
 drivers/mtd/onenand/onenand_uboot.c           | 1 +
 drivers/mtd/spi/sf_dataflash.c                | 1 +
 drivers/mtd/spi/spi-nor-core.c                | 1 +
 drivers/net/xilinx_axi_emac.c                 | 1 +
 drivers/tpm/tpm_atmel_twi.c                   | 1 +
 drivers/tpm/tpm_tis_sandbox.c                 | 1 +
 drivers/usb/gadget/pxa27x_udc.c               | 1 +
 fs/fs.c                                       | 1 +
 include/common.h                              | 1 -
 include/display_options.h                     | 1 +
 lib/aes.c                                     | 1 +
 lib/display_options.c                         | 1 +
 lib/fdtdec.c                                  | 1 +
 net/nfs.c                                     | 1 +
 net/tftp.c                                    | 1 +
 59 files changed, 58 insertions(+), 1 deletion(-)

diff --git a/arch/arm/cpu/armv7/s5p-common/cpu_info.c b/arch/arm/cpu/armv7/s5p-common/cpu_info.c
index d910282e2b2..fb2920950d4 100644
--- a/arch/arm/cpu/armv7/s5p-common/cpu_info.c
+++ b/arch/arm/cpu/armv7/s5p-common/cpu_info.c
@@ -4,6 +4,7 @@
  * Minkyu Kang <mk7.kang@samsung.com>
  */
 #include <common.h>
+#include <display_options.h>
 #include <fdtdec.h>
 #include <init.h>
 #include <asm/global_data.h>
diff --git a/arch/arm/mach-at91/arm926ejs/eflash.c b/arch/arm/mach-at91/arm926ejs/eflash.c
index 23c24936edf..ef579e6089c 100644
--- a/arch/arm/mach-at91/arm926ejs/eflash.c
+++ b/arch/arm/mach-at91/arm926ejs/eflash.c
@@ -43,6 +43,7 @@
  * do a read-modify-write for partially programmed pages
  */
 #include <common.h>
+#include <display_options.h>
 #include <flash.h>
 #include <log.h>
 #include <asm/io.h>
diff --git a/arch/arm/mach-imx/hab.c b/arch/arm/mach-imx/hab.c
index d0757d8b66a..7510735bf46 100644
--- a/arch/arm/mach-imx/hab.c
+++ b/arch/arm/mach-imx/hab.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <command.h>
 #include <config.h>
+#include <display_options.h>
 #include <fuse.h>
 #include <mapmem.h>
 #include <image.h>
diff --git a/arch/powerpc/cpu/mpc85xx/cpu.c b/arch/powerpc/cpu/mpc85xx/cpu.c
index 5170610f041..d35c9780172 100644
--- a/arch/powerpc/cpu/mpc85xx/cpu.c
+++ b/arch/powerpc/cpu/mpc85xx/cpu.c
@@ -11,6 +11,7 @@
 #include <config.h>
 #include <common.h>
 #include <cpu_func.h>
+#include <display_options.h>
 #include <init.h>
 #include <irq_func.h>
 #include <log.h>
diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init.c b/arch/powerpc/cpu/mpc85xx/cpu_init.c
index e0f0f7ecda6..fcc2c7be31a 100644
--- a/arch/powerpc/cpu/mpc85xx/cpu_init.c
+++ b/arch/powerpc/cpu/mpc85xx/cpu_init.c
@@ -10,6 +10,7 @@
  */
 
 #include <common.h>
+#include <display_options.h>
 #include <env.h>
 #include <init.h>
 #include <net.h>
diff --git a/arch/powerpc/cpu/mpc85xx/tlb.c b/arch/powerpc/cpu/mpc85xx/tlb.c
index 973b6fbe4b7..927df4e5b66 100644
--- a/arch/powerpc/cpu/mpc85xx/tlb.c
+++ b/arch/powerpc/cpu/mpc85xx/tlb.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <display_options.h>
 #include <asm/bitops.h>
 #include <asm/global_data.h>
 #include <asm/processor.h>
diff --git a/arch/powerpc/cpu/mpc86xx/cpu.c b/arch/powerpc/cpu/mpc86xx/cpu.c
index 98b42bff7a3..05160778566 100644
--- a/arch/powerpc/cpu/mpc86xx/cpu.c
+++ b/arch/powerpc/cpu/mpc86xx/cpu.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <cpu_func.h>
+#include <display_options.h>
 #include <log.h>
 #include <time.h>
 #include <vsprintf.h>
diff --git a/arch/powerpc/cpu/mpc8xx/cpu.c b/arch/powerpc/cpu/mpc8xx/cpu.c
index 893aecef21c..f79a06d19a2 100644
--- a/arch/powerpc/cpu/mpc8xx/cpu.c
+++ b/arch/powerpc/cpu/mpc8xx/cpu.c
@@ -18,6 +18,7 @@
 
 #include <common.h>
 #include <cpu_func.h>
+#include <display_options.h>
 #include <net.h>
 #include <time.h>
 #include <vsprintf.h>
diff --git a/arch/powerpc/cpu/mpc8xxx/law.c b/arch/powerpc/cpu/mpc8xxx/law.c
index cf03f410190..ff4b878aa9c 100644
--- a/arch/powerpc/cpu/mpc8xxx/law.c
+++ b/arch/powerpc/cpu/mpc8xxx/law.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <display_options.h>
 #include <asm/bitops.h>
 #include <asm/global_data.h>
 #include <linux/compiler.h>
diff --git a/arch/x86/cpu/broadwell/refcode.c b/arch/x86/cpu/broadwell/refcode.c
index 6c04dde992d..1e0a34de0c8 100644
--- a/arch/x86/cpu/broadwell/refcode.c
+++ b/arch/x86/cpu/broadwell/refcode.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <display_options.h>
 #include <errno.h>
 #include <init.h>
 #include <log.h>
diff --git a/board/corscience/tricorder/tricorder-eeprom.c b/board/corscience/tricorder/tricorder-eeprom.c
index 192af304d9f..d0b91864c27 100644
--- a/board/corscience/tricorder/tricorder-eeprom.c
+++ b/board/corscience/tricorder/tricorder-eeprom.c
@@ -6,6 +6,7 @@
  */
 #include <common.h>
 #include <command.h>
+#include <display_options.h>
 #include <eeprom.h>
 #include <i2c.h>
 #include <u-boot/crc.h>
diff --git a/board/freescale/ls1028a/ls1028a.c b/board/freescale/ls1028a/ls1028a.c
index f3c1d958b72..984883bb00f 100644
--- a/board/freescale/ls1028a/ls1028a.c
+++ b/board/freescale/ls1028a/ls1028a.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <display_options.h>
 #include <init.h>
 #include <malloc.h>
 #include <errno.h>
diff --git a/board/freescale/ls1088a/ls1088a.c b/board/freescale/ls1088a/ls1088a.c
index 2ba6a3990d9..41453709eac 100644
--- a/board/freescale/ls1088a/ls1088a.c
+++ b/board/freescale/ls1088a/ls1088a.c
@@ -3,6 +3,7 @@
  * Copyright 2017-2018 NXP
  */
 #include <common.h>
+#include <display_options.h>
 #include <env.h>
 #include <i2c.h>
 #include <init.h>
diff --git a/board/freescale/ls2080a/ls2080a.c b/board/freescale/ls2080a/ls2080a.c
index 48437a52e40..020e7bfcb5c 100644
--- a/board/freescale/ls2080a/ls2080a.c
+++ b/board/freescale/ls2080a/ls2080a.c
@@ -3,6 +3,7 @@
  * Copyright 2014 Freescale Semiconductor
  */
 #include <common.h>
+#include <display_options.h>
 #include <init.h>
 #include <malloc.h>
 #include <errno.h>
diff --git a/board/freescale/ls2080aqds/ls2080aqds.c b/board/freescale/ls2080aqds/ls2080aqds.c
index a6f6897eb09..3ab93388724 100644
--- a/board/freescale/ls2080aqds/ls2080aqds.c
+++ b/board/freescale/ls2080aqds/ls2080aqds.c
@@ -3,6 +3,7 @@
  * Copyright 2015 Freescale Semiconductor
  */
 #include <common.h>
+#include <display_options.h>
 #include <env.h>
 #include <init.h>
 #include <malloc.h>
diff --git a/board/freescale/ls2080ardb/ls2080ardb.c b/board/freescale/ls2080ardb/ls2080ardb.c
index 26ce5a80edf..a6ece49c01e 100644
--- a/board/freescale/ls2080ardb/ls2080ardb.c
+++ b/board/freescale/ls2080ardb/ls2080ardb.c
@@ -4,6 +4,7 @@
  * Copyright 2017 NXP
  */
 #include <common.h>
+#include <display_options.h>
 #include <env.h>
 #include <init.h>
 #include <malloc.h>
diff --git a/board/freescale/lx2160a/lx2160a.c b/board/freescale/lx2160a/lx2160a.c
index efd2a5c40e1..1d781841c40 100644
--- a/board/freescale/lx2160a/lx2160a.c
+++ b/board/freescale/lx2160a/lx2160a.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <clock_legacy.h>
+#include <display_options.h>
 #include <dm.h>
 #include <init.h>
 #include <asm/global_data.h>
diff --git a/board/freescale/mpc8541cds/mpc8541cds.c b/board/freescale/mpc8541cds/mpc8541cds.c
index 5b4fbd5e304..3986d81c62d 100644
--- a/board/freescale/mpc8541cds/mpc8541cds.c
+++ b/board/freescale/mpc8541cds/mpc8541cds.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <display_options.h>
 #include <init.h>
 #include <pci.h>
 #include <vsprintf.h>
diff --git a/board/freescale/mpc8548cds/mpc8548cds.c b/board/freescale/mpc8548cds/mpc8548cds.c
index a1a9742bfa4..fd51c0e8018 100644
--- a/board/freescale/mpc8548cds/mpc8548cds.c
+++ b/board/freescale/mpc8548cds/mpc8548cds.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <display_options.h>
 #include <init.h>
 #include <net.h>
 #include <pci.h>
diff --git a/board/freescale/mpc8555cds/mpc8555cds.c b/board/freescale/mpc8555cds/mpc8555cds.c
index 3bb8e769c80..d91763ae800 100644
--- a/board/freescale/mpc8555cds/mpc8555cds.c
+++ b/board/freescale/mpc8555cds/mpc8555cds.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <display_options.h>
 #include <init.h>
 #include <pci.h>
 #include <vsprintf.h>
diff --git a/board/freescale/mpc8568mds/mpc8568mds.c b/board/freescale/mpc8568mds/mpc8568mds.c
index 7b379464cd5..1acdf93e4d7 100644
--- a/board/freescale/mpc8568mds/mpc8568mds.c
+++ b/board/freescale/mpc8568mds/mpc8568mds.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <display_options.h>
 #include <flash.h>
 #include <init.h>
 #include <log.h>
diff --git a/board/gdsys/p1022/controlcenterd-id.c b/board/gdsys/p1022/controlcenterd-id.c
index 1b5aa9042f5..495ef8e1f83 100644
--- a/board/gdsys/p1022/controlcenterd-id.c
+++ b/board/gdsys/p1022/controlcenterd-id.c
@@ -13,6 +13,7 @@
 #include <common.h>
 #include <bootstage.h>
 #include <command.h>
+#include <display_options.h>
 #include <dm.h>
 #include <env.h>
 #include <hang.h>
diff --git a/board/kosagi/novena/novena.c b/board/kosagi/novena/novena.c
index 0e1b4a0a46c..815ecf55c4d 100644
--- a/board/kosagi/novena/novena.c
+++ b/board/kosagi/novena/novena.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <display_options.h>
 #include <dm.h>
 #include <eeprom.h>
 #include <init.h>
diff --git a/board/sbc8548/sbc8548.c b/board/sbc8548/sbc8548.c
index bd4b528d03f..13a66507ffc 100644
--- a/board/sbc8548/sbc8548.c
+++ b/board/sbc8548/sbc8548.c
@@ -10,6 +10,7 @@
  */
 
 #include <common.h>
+#include <display_options.h>
 #include <init.h>
 #include <log.h>
 #include <net.h>
diff --git a/cmd/acpi.c b/cmd/acpi.c
index 126d6d3bc99..6fa61c5fb89 100644
--- a/cmd/acpi.c
+++ b/cmd/acpi.c
@@ -5,6 +5,7 @@
  */
 #include <common.h>
 #include <command.h>
+#include <display_options.h>
 #include <mapmem.h>
 #include <acpi/acpi_table.h>
 #include <asm/acpi_table.h>
diff --git a/cmd/axi.c b/cmd/axi.c
index c9d53c049e8..36508223c34 100644
--- a/cmd/axi.c
+++ b/cmd/axi.c
@@ -13,6 +13,7 @@
 #include <axi.h>
 #include <command.h>
 #include <console.h>
+#include <display_options.h>
 #include <dm.h>
 #include <log.h>
 
diff --git a/cmd/bcb.c b/cmd/bcb.c
index e03218066bf..81e099fbb1b 100644
--- a/cmd/bcb.c
+++ b/cmd/bcb.c
@@ -8,6 +8,7 @@
 #include <android_bootloader_message.h>
 #include <command.h>
 #include <common.h>
+#include <display_options.h>
 #include <log.h>
 #include <part.h>
 
diff --git a/cmd/cpu.c b/cmd/cpu.c
index ff553c16c4e..b3dd7e57449 100644
--- a/cmd/cpu.c
+++ b/cmd/cpu.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <command.h>
 #include <cpu.h>
+#include <display_options.h>
 #include <dm.h>
 #include <errno.h>
 
diff --git a/cmd/fpgad.c b/cmd/fpgad.c
index fb2fe63e78a..89b34f86425 100644
--- a/cmd/fpgad.c
+++ b/cmd/fpgad.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <command.h>
 #include <console.h>
+#include <display_options.h>
 
 #include <gdsys_fpga.h>
 
diff --git a/cmd/io.c b/cmd/io.c
index c7e964153b8..dd770a20ce1 100644
--- a/cmd/io.c
+++ b/cmd/io.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <display_options.h>
 #include <asm/io.h>
 
 /* Display values from last command */
diff --git a/cmd/mem.c b/cmd/mem.c
index ad7b9bf702f..a9360860d2c 100644
--- a/cmd/mem.c
+++ b/cmd/mem.c
@@ -16,6 +16,7 @@
 #include <cli.h>
 #include <command.h>
 #include <console.h>
+#include <display_options.h>
 #include <flash.h>
 #include <hash.h>
 #include <log.h>
diff --git a/cmd/mmc.c b/cmd/mmc.c
index 1529a3e05dd..e3e75d0fc0e 100644
--- a/cmd/mmc.c
+++ b/cmd/mmc.c
@@ -8,6 +8,7 @@
 #include <blk.h>
 #include <command.h>
 #include <console.h>
+#include <display_options.h>
 #include <memalign.h>
 #include <mmc.h>
 #include <part.h>
diff --git a/cmd/rtc.c b/cmd/rtc.c
index b4f61b2e835..4ac49d228cb 100644
--- a/cmd/rtc.c
+++ b/cmd/rtc.c
@@ -2,6 +2,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <display_options.h>
 #include <dm.h>
 #include <hexdump.h>
 #include <i2c.h>
diff --git a/cmd/sf.c b/cmd/sf.c
index c0d6a8f8a06..b3ff4b5773c 100644
--- a/cmd/sf.c
+++ b/cmd/sf.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <display_options.h>
 #include <div64.h>
 #include <dm.h>
 #include <flash.h>
diff --git a/cmd/version.c b/cmd/version.c
index 3686b873324..2c321a92f9b 100644
--- a/cmd/version.c
+++ b/cmd/version.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <display_options.h>
 #include <version.h>
 #include <linux/compiler.h>
 #ifdef CONFIG_SYS_COREBOOT
diff --git a/common/board_f.c b/common/board_f.c
index 9d9cfab80f0..f032549fb5f 100644
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -16,6 +16,7 @@
 #include <console.h>
 #include <cpu.h>
 #include <cpu_func.h>
+#include <display_options.h>
 #include <dm.h>
 #include <env.h>
 #include <env_internal.h>
diff --git a/common/board_r.c b/common/board_r.c
index 3ac5d15728c..714a9137aba 100644
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -13,6 +13,7 @@
 #include <api.h>
 #include <bootstage.h>
 #include <cpu_func.h>
+#include <display_options.h>
 #include <exports.h>
 #include <flash.h>
 #include <hang.h>
diff --git a/common/console.c b/common/console.c
index f0014b756e7..e18c0ee0d95 100644
--- a/common/console.c
+++ b/common/console.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <console.h>
 #include <debug_uart.h>
+#include <display_options.h>
 #include <dm.h>
 #include <env.h>
 #include <stdarg.h>
diff --git a/common/image.c b/common/image.c
index 24dd06bf553..d8db73c82ba 100644
--- a/common/image.c
+++ b/common/image.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <bootstage.h>
 #include <cpu_func.h>
+#include <display_options.h>
 #include <env.h>
 #include <lmb.h>
 #include <log.h>
diff --git a/common/splash.c b/common/splash.c
index 2b9313e03f1..e26b366cb23 100644
--- a/common/splash.c
+++ b/common/splash.c
@@ -21,6 +21,7 @@
  */
 
 #include <common.h>
+#include <display_options.h>
 #include <env.h>
 #include <splash.h>
 #include <lcd.h>
diff --git a/drivers/core/acpi.c b/drivers/core/acpi.c
index 7fe93992b5f..99c0da500eb 100644
--- a/drivers/core/acpi.c
+++ b/drivers/core/acpi.c
@@ -9,6 +9,7 @@
 #define LOG_CATEOGRY	LOGC_ACPI
 
 #include <common.h>
+#include <display_options.h>
 #include <dm.h>
 #include <log.h>
 #include <malloc.h>
diff --git a/drivers/cpu/bmips_cpu.c b/drivers/cpu/bmips_cpu.c
index 421cc7a9a4c..8419adb3cc3 100644
--- a/drivers/cpu/bmips_cpu.c
+++ b/drivers/cpu/bmips_cpu.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <cpu.h>
+#include <display_options.h>
 #include <dm.h>
 #include <errno.h>
 #include <init.h>
diff --git a/drivers/ddr/fsl/main.c b/drivers/ddr/fsl/main.c
index 84139b85c33..f5299fe3111 100644
--- a/drivers/ddr/fsl/main.c
+++ b/drivers/ddr/fsl/main.c
@@ -10,6 +10,7 @@
  */
 
 #include <common.h>
+#include <display_options.h>
 #include <dm.h>
 #include <i2c.h>
 #include <fsl_ddr_sdram.h>
diff --git a/drivers/mmc/gen_atmel_mci.c b/drivers/mmc/gen_atmel_mci.c
index 9d20e283839..44c9f1288b3 100644
--- a/drivers/mmc/gen_atmel_mci.c
+++ b/drivers/mmc/gen_atmel_mci.c
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <clk.h>
+#include <display_options.h>
 #include <dm.h>
 #include <log.h>
 #include <mmc.h>
diff --git a/drivers/mtd/onenand/onenand_uboot.c b/drivers/mtd/onenand/onenand_uboot.c
index 6893394e089..3a8c7b867eb 100644
--- a/drivers/mtd/onenand/onenand_uboot.c
+++ b/drivers/mtd/onenand/onenand_uboot.c
@@ -14,6 +14,7 @@
  */
 
 #include <common.h>
+#include <display_options.h>
 #include <linux/compat.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/onenand.h>
diff --git a/drivers/mtd/spi/sf_dataflash.c b/drivers/mtd/spi/sf_dataflash.c
index 27d847d4218..b1034ac2086 100644
--- a/drivers/mtd/spi/sf_dataflash.c
+++ b/drivers/mtd/spi/sf_dataflash.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <display_options.h>
 #include <dm.h>
 #include <errno.h>
 #include <fdtdec.h>
diff --git a/drivers/mtd/spi/spi-nor-core.c b/drivers/mtd/spi/spi-nor-core.c
index fdcd830ce41..36478a61fd9 100644
--- a/drivers/mtd/spi/spi-nor-core.c
+++ b/drivers/mtd/spi/spi-nor-core.c
@@ -10,6 +10,7 @@
  */
 
 #include <common.h>
+#include <display_options.h>
 #include <log.h>
 #include <dm/device_compat.h>
 #include <dm/devres.h>
diff --git a/drivers/net/xilinx_axi_emac.c b/drivers/net/xilinx_axi_emac.c
index 65abc7d1834..2a2e0585a34 100644
--- a/drivers/net/xilinx_axi_emac.c
+++ b/drivers/net/xilinx_axi_emac.c
@@ -8,6 +8,7 @@
 #include <config.h>
 #include <common.h>
 #include <cpu_func.h>
+#include <display_options.h>
 #include <dm.h>
 #include <log.h>
 #include <net.h>
diff --git a/drivers/tpm/tpm_atmel_twi.c b/drivers/tpm/tpm_atmel_twi.c
index d9e4877c5c2..5489e728b6e 100644
--- a/drivers/tpm/tpm_atmel_twi.c
+++ b/drivers/tpm/tpm_atmel_twi.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <display_options.h>
 #include <dm.h>
 #include <tpm-v1.h>
 #include <i2c.h>
diff --git a/drivers/tpm/tpm_tis_sandbox.c b/drivers/tpm/tpm_tis_sandbox.c
index e167d0a2fe3..f35d6920442 100644
--- a/drivers/tpm/tpm_tis_sandbox.c
+++ b/drivers/tpm/tpm_tis_sandbox.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <display_options.h>
 #include <dm.h>
 #include <tpm-v1.h>
 #include <asm/state.h>
diff --git a/drivers/usb/gadget/pxa27x_udc.c b/drivers/usb/gadget/pxa27x_udc.c
index ba362b8f258..7c67c2e3b3e 100644
--- a/drivers/usb/gadget/pxa27x_udc.c
+++ b/drivers/usb/gadget/pxa27x_udc.c
@@ -9,6 +9,7 @@
 
 
 #include <common.h>
+#include <display_options.h>
 #include <asm/arch/hardware.h>
 #include <asm/byteorder.h>
 #include <asm/io.h>
diff --git a/fs/fs.c b/fs/fs.c
index fc21e69c3d2..16c54520251 100644
--- a/fs/fs.c
+++ b/fs/fs.c
@@ -5,6 +5,7 @@
 
 #include <command.h>
 #include <config.h>
+#include <display_options.h>
 #include <errno.h>
 #include <common.h>
 #include <env.h>
diff --git a/include/common.h b/include/common.h
index 71df59bca0e..25c317f4439 100644
--- a/include/common.h
+++ b/include/common.h
@@ -23,7 +23,6 @@
 #include <stdio.h>
 #include <linux/kernel.h>
 #include <asm/u-boot.h> /* boot information for Linux kernel */
-#include <display_options.h>
 #include <vsprintf.h>
 #endif	/* __ASSEMBLY__ */
 
diff --git a/include/display_options.h b/include/display_options.h
index a0dabca2b8a..990ea844ec2 100644
--- a/include/display_options.h
+++ b/include/display_options.h
@@ -19,6 +19,7 @@
  * @size:	Size to print
  * @suffix	String to print after the size
  */
+#include <display_options.h>
 void print_size(uint64_t size, const char *suffix);
 
 /**
diff --git a/lib/aes.c b/lib/aes.c
index c998aecb3c7..bc6d4dfd4e0 100644
--- a/lib/aes.c
+++ b/lib/aes.c
@@ -23,6 +23,7 @@
 
 #ifndef USE_HOSTCC
 #include <common.h>
+#include <display_options.h>
 #include <log.h>
 #else
 #include <string.h>
diff --git a/lib/display_options.c b/lib/display_options.c
index ea9977cc180..90e8ce54783 100644
--- a/lib/display_options.c
+++ b/lib/display_options.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <compiler.h>
 #include <console.h>
+#include <display_options.h>
 #include <div64.h>
 #include <version.h>
 #include <linux/ctype.h>
diff --git a/lib/fdtdec.c b/lib/fdtdec.c
index 8fccb9e602a..c3724790a6e 100644
--- a/lib/fdtdec.c
+++ b/lib/fdtdec.c
@@ -6,6 +6,7 @@
 #ifndef USE_HOSTCC
 #include <common.h>
 #include <boot_fit.h>
+#include <display_options.h>
 #include <dm.h>
 #include <hang.h>
 #include <init.h>
diff --git a/net/nfs.c b/net/nfs.c
index 70d0e08bde9..8a3b04adcdc 100644
--- a/net/nfs.c
+++ b/net/nfs.c
@@ -28,6 +28,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <display_options.h>
 #include <flash.h>
 #include <image.h>
 #include <log.h>
diff --git a/net/tftp.c b/net/tftp.c
index 664802f55a7..bffadd04ebd 100644
--- a/net/tftp.c
+++ b/net/tftp.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <display_options.h>
 #include <efi_loader.h>
 #include <env.h>
 #include <image.h>
-- 
2.28.0.163.g6104cc2f0b6-goog

^ permalink raw reply related	[flat|nested] 35+ messages in thread

* [PATCH 03/16] common: Drop linux/printk.h from common header
  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 ` Simon Glass
  2020-08-02 22:59 ` [PATCH 04/16] Fix code style for time functions Simon Glass
                   ` (13 subsequent siblings)
  16 siblings, 0 replies; 35+ messages in thread
From: Simon Glass @ 2020-08-02 22:59 UTC (permalink / raw)
  To: u-boot

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

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

 arch/arm/lib/gic-v3-its.c                              | 1 +
 arch/arm/mach-imx/imx8/fdt.c                           | 1 +
 arch/arm/mach-k3/common.c                              | 1 +
 arch/arm/mach-meson/board-gx.c                         | 1 +
 arch/arm/mach-omap2/am33xx/board.c                     | 1 +
 arch/arm/mach-omap2/utils.c                            | 1 +
 arch/arm/mach-rockchip/boot_mode.c                     | 1 +
 arch/arm/mach-rockchip/rk3188/rk3188.c                 | 1 +
 arch/arm/mach-rockchip/rk3399/rk3399.c                 | 1 +
 arch/arm/mach-socfpga/misc.c                           | 1 +
 arch/arm/mach-stm32mp/bsec.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        | 2 ++
 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-stm32mp/include/mach/stm32mp1_smc.h      | 1 +
 arch/arm/mach-tegra/cboot.c                            | 1 +
 arch/arm/mach-tegra/ivc.c                              | 1 +
 arch/arm/mach-tegra/tegra124/xusb-padctl.c             | 1 +
 arch/arm/mach-tegra/tegra20/clock.c                    | 1 +
 arch/arm/mach-tegra/tegra210/xusb-padctl.c             | 1 +
 arch/arm/mach-tegra/tegra30/clock.c                    | 1 +
 arch/arm/mach-tegra/xusb-padctl-common.c               | 1 +
 arch/arm/mach-uniphier/boot-device/boot-device.c       | 1 +
 arch/arm/mach-uniphier/clk/dpll-ld4.c                  | 1 +
 arch/arm/mach-uniphier/clk/dpll-pro4.c                 | 1 +
 arch/arm/mach-uniphier/dram/umc-ld4.c                  | 1 +
 arch/arm/mach-uniphier/dram/umc-pro4.c                 | 1 +
 arch/arm/mach-uniphier/dram/umc-sld8.c                 | 1 +
 arch/arm/mach-uniphier/memconf.c                       | 1 +
 arch/arm/mach-uniphier/spl_board_init.c                | 1 +
 arch/riscv/lib/smp.c                                   | 1 +
 arch/x86/cpu/tangier/pinmux.c                          | 1 +
 arch/x86/cpu/tangier/sdram.c                           | 1 +
 board/dhelectronics/dh_stm32mp1/board.c                | 1 +
 board/mediatek/mt8518/mt8518_ap1.c                     | 1 +
 board/mscc/ocelot/ocelot.c                             | 1 +
 board/nvidia/jetson-tk1/jetson-tk1.c                   | 1 +
 board/pine64/pinebook-pro-rk3399/pinebook-pro-rk3399.c | 1 +
 board/samsung/common/exynos5-dt.c                      | 1 +
 board/samsung/common/misc.c                            | 1 +
 board/samsung/goni/goni.c                              | 1 +
 board/samsung/odroid/odroid.c                          | 1 +
 board/st/common/stm32mp_dfu.c                          | 1 +
 board/st/common/stm32mp_mtdparts.c                     | 1 +
 board/st/stm32mp1/stm32mp1.c                           | 1 +
 board/sunxi/board.c                                    | 1 +
 board/synopsys/hsdk/clk-lib.c                          | 1 +
 board/synopsys/hsdk/env-lib.c                          | 1 +
 board/ti/am65x/evm.c                                   | 1 +
 board/ti/common/board_detect.c                         | 1 +
 board/ti/j721e/evm.c                                   | 1 +
 board/toradex/apalis-tk1/apalis-tk1.c                  | 1 +
 cmd/adc.c                                              | 1 +
 cmd/fastboot.c                                         | 1 +
 cmd/nvedit.c                                           | 1 +
 cmd/onenand.c                                          | 1 +
 cmd/regulator.c                                        | 1 +
 cmd/thordown.c                                         | 1 +
 cmd/tpm_test.c                                         | 1 +
 cmd/usb_gadget_sdp.c                                   | 1 +
 cmd/usb_mass_storage.c                                 | 1 +
 common/dfu.c                                           | 1 +
 common/spl/spl_dfu.c                                   | 1 +
 common/spl/spl_fit.c                                   | 1 +
 common/spl/spl_opensbi.c                               | 1 +
 common/spl/spl_sdp.c                                   | 1 +
 common/update.c                                        | 1 +
 disk/part_efi.c                                        | 1 +
 drivers/adc/adc-uclass.c                               | 1 +
 drivers/adc/exynos-adc.c                               | 1 +
 drivers/adc/meson-saradc.c                             | 1 +
 drivers/adc/rockchip-saradc.c                          | 1 +
 drivers/adc/sandbox.c                                  | 1 +
 drivers/ata/dwc_ahci.c                                 | 1 +
 drivers/bios_emulator/include/x86emu/debug.h           | 1 +
 drivers/bios_emulator/include/x86emu/regs.h            | 1 +
 drivers/bios_emulator/x86emu/debug.c                   | 1 +
 drivers/bios_emulator/x86emu/decode.c                  | 1 +
 drivers/bios_emulator/x86emu/ops.c                     | 1 +
 drivers/bios_emulator/x86emu/ops2.c                    | 1 +
 drivers/bios_emulator/x86emu/sys.c                     | 1 +
 drivers/bootcount/bootcount-uclass.c                   | 1 +
 drivers/clk/analogbits/wrpll-cln28hpc.c                | 1 +
 drivers/clk/clk-divider.c                              | 1 +
 drivers/clk/clk-gate.c                                 | 1 +
 drivers/clk/clk-hsdk-cgu.c                             | 1 +
 drivers/clk/clk-mux.c                                  | 1 +
 drivers/clk/clk_boston.c                               | 1 +
 drivers/clk/clk_stm32f.c                               | 1 +
 drivers/clk/clk_stm32h7.c                              | 1 +
 drivers/clk/clk_stm32mp1.c                             | 1 +
 drivers/clk/imx/clk-pll14xx.c                          | 1 +
 drivers/clk/rockchip/clk_rk3368.c                      | 1 +
 drivers/clk/rockchip/clk_rk3399.c                      | 1 +
 drivers/core/device.c                                  | 1 +
 drivers/core/of_addr.c                                 | 1 +
 drivers/core/root.c                                    | 1 +
 drivers/dfu/dfu.c                                      | 1 +
 drivers/dfu/dfu_mmc.c                                  | 1 +
 drivers/dfu/dfu_ram.c                                  | 1 +
 drivers/dfu/dfu_tftp.c                                 | 1 +
 drivers/dma/bcm6348-iudma.c                            | 1 +
 drivers/dma/dma-uclass.c                               | 1 +
 drivers/dma/lpc32xx_dma.c                              | 1 +
 drivers/dma/sandbox-dma-test.c                         | 1 +
 drivers/dma/ti-edma3.c                                 | 1 +
 drivers/dma/ti/k3-udma.c                               | 1 +
 drivers/fastboot/fb_command.c                          | 1 +
 drivers/fastboot/fb_getvar.c                           | 1 +
 drivers/fastboot/fb_mmc.c                              | 1 +
 drivers/fastboot/fb_nand.c                             | 1 +
 drivers/i2c/i2c-gpio.c                                 | 1 +
 drivers/i2c/iproc_i2c.c                                | 1 +
 drivers/i2c/omap24xx_i2c.c                             | 1 +
 drivers/i2c/stm32f7_i2c.c                              | 1 +
 drivers/i2c/tegra_i2c.c                                | 1 +
 drivers/misc/sifive-otp.c                              | 1 +
 drivers/misc/tegra186_bpmp.c                           | 1 +
 drivers/mmc/exynos_dw_mmc.c                            | 1 +
 drivers/mmc/fsl_esdhc_imx.c                            | 1 +
 drivers/mmc/mmc.c                                      | 1 +
 drivers/mmc/mtk-sd.c                                   | 1 +
 drivers/mmc/sdhci.c                                    | 1 +
 drivers/mmc/sti_sdhci.c                                | 1 +
 drivers/mmc/stm32_sdmmc2.c                             | 1 +
 drivers/mmc/xenon_sdhci.c                              | 1 +
 drivers/mtd/mtdconcat.c                                | 1 +
 drivers/mtd/mtdcore.c                                  | 1 +
 drivers/mtd/mtdpart.c                                  | 1 +
 drivers/mtd/nand/bbt.c                                 | 1 +
 drivers/mtd/nand/core.c                                | 1 +
 drivers/mtd/nand/raw/arasan_nfc.c                      | 1 +
 drivers/mtd/nand/raw/atmel_nand.c                      | 1 +
 drivers/mtd/nand/raw/brcmnand/bcm63158_nand.c          | 1 +
 drivers/mtd/nand/raw/brcmnand/bcm6368_nand.c           | 1 +
 drivers/mtd/nand/raw/brcmnand/bcm68360_nand.c          | 1 +
 drivers/mtd/nand/raw/brcmnand/bcm6838_nand.c           | 1 +
 drivers/mtd/nand/raw/brcmnand/bcm6858_nand.c           | 1 +
 drivers/mtd/nand/raw/davinci_nand.c                    | 1 +
 drivers/mtd/nand/raw/lpc32xx_nand_mlc.c                | 1 +
 drivers/mtd/nand/raw/lpc32xx_nand_slc.c                | 1 +
 drivers/mtd/nand/raw/mxc_nand.c                        | 1 +
 drivers/mtd/nand/raw/nand_base.c                       | 1 +
 drivers/mtd/nand/raw/nand_bbt.c                        | 1 +
 drivers/mtd/nand/raw/nand_bch.c                        | 1 +
 drivers/mtd/nand/raw/pxa3xx_nand.c                     | 1 +
 drivers/mtd/nand/raw/stm32_fmc2_nand.c                 | 1 +
 drivers/mtd/nand/raw/sunxi_nand.c                      | 1 +
 drivers/mtd/nand/raw/tegra_nand.c                      | 1 +
 drivers/mtd/nand/raw/vf610_nfc.c                       | 1 +
 drivers/mtd/nand/raw/zynq_nand.c                       | 1 +
 drivers/mtd/nand/spi/core.c                            | 1 +
 drivers/mtd/onenand/onenand_base.c                     | 1 +
 drivers/mtd/onenand/onenand_bbt.c                      | 1 +
 drivers/mtd/onenand/samsung.c                          | 1 +
 drivers/mtd/spi/spi-nor-core.c                         | 1 +
 drivers/mtd/spi/spi-nor-tiny.c                         | 1 +
 drivers/mtd/ubi/attach.c                               | 1 +
 drivers/mtd/ubi/build.c                                | 1 +
 drivers/mtd/ubi/debug.c                                | 1 +
 drivers/mtd/ubi/debug.h                                | 1 +
 drivers/mtd/ubi/ubi.h                                  | 1 +
 drivers/net/bcm-sf2-eth-gmac.c                         | 1 +
 drivers/net/bcm-sf2-eth.c                              | 1 +
 drivers/net/bcm6348-eth.c                              | 1 +
 drivers/net/bcm6368-eth.c                              | 1 +
 drivers/net/designware.c                               | 1 +
 drivers/net/dwc_eth_qos.c                              | 1 +
 drivers/net/ep93xx_eth.c                               | 1 +
 drivers/net/fsl-mc/dpio/qbman_sys.h                    | 1 +
 drivers/net/ftgmac100.c                                | 1 +
 drivers/net/mscc_eswitch/jr2_switch.c                  | 1 +
 drivers/net/mscc_eswitch/ocelot_switch.c               | 1 +
 drivers/net/mscc_eswitch/serval_switch.c               | 1 +
 drivers/net/mscc_eswitch/servalt_switch.c              | 1 +
 drivers/net/mt7628-eth.c                               | 1 +
 drivers/net/mtk_eth.c                                  | 1 +
 drivers/net/mvmdio.c                                   | 1 +
 drivers/net/phy/dp83867.c                              | 1 +
 drivers/net/phy/mscc.c                                 | 1 +
 drivers/net/rtl8169.c                                  | 1 +
 drivers/net/sni_ave.c                                  | 1 +
 drivers/net/ti/am65-cpsw-nuss.c                        | 1 +
 drivers/net/ti/cpsw-common.c                           | 1 +
 drivers/net/ti/cpsw.c                                  | 1 +
 drivers/net/ti/keystone_net.c                          | 1 +
 drivers/pci/pci-uclass.c                               | 1 +
 drivers/pci/pci_mvebu.c                                | 1 +
 drivers/pci/pci_tegra.c                                | 1 +
 drivers/pci/pcie_ecam_generic.c                        | 1 +
 drivers/pci/pcie_fsl.c                                 | 1 +
 drivers/pci/pcie_mediatek.c                            | 1 +
 drivers/pci/pcie_phytium.c                             | 1 +
 drivers/pci/pcie_xilinx.c                              | 1 +
 drivers/phy/keystone-usb-phy.c                         | 1 +
 drivers/phy/marvell/comphy_cp110.c                     | 1 +
 drivers/phy/meson-g12a-usb2.c                          | 1 +
 drivers/phy/meson-g12a-usb3-pcie.c                     | 1 +
 drivers/phy/meson-gxbb-usb2.c                          | 1 +
 drivers/phy/meson-gxl-usb2.c                           | 1 +
 drivers/phy/meson-gxl-usb3.c                           | 1 +
 drivers/phy/phy-rcar-gen3.c                            | 1 +
 drivers/phy/phy-stm32-usbphyc.c                        | 1 +
 drivers/phy/phy-uclass.c                               | 1 +
 drivers/phy/sti_usb_phy.c                              | 1 +
 drivers/phy/ti-pipe3-phy.c                             | 1 +
 drivers/pinctrl/mvebu/pinctrl-armada-37xx.c            | 1 +
 drivers/pinctrl/pinctrl-sti.c                          | 1 +
 drivers/pinctrl/pinctrl_stm32.c                        | 1 +
 drivers/power/palmas.c                                 | 1 +
 drivers/power/pmic/as3722.c                            | 1 +
 drivers/power/pmic/as3722_gpio.c                       | 1 +
 drivers/power/pmic/bd71837.c                           | 1 +
 drivers/power/pmic/da9063.c                            | 1 +
 drivers/power/pmic/fan53555.c                          | 1 +
 drivers/power/pmic/i2c_pmic_emul.c                     | 1 +
 drivers/power/pmic/lp873x.c                            | 1 +
 drivers/power/pmic/lp87565.c                           | 1 +
 drivers/power/pmic/max77686.c                          | 1 +
 drivers/power/pmic/max8997.c                           | 1 +
 drivers/power/pmic/max8998.c                           | 1 +
 drivers/power/pmic/palmas.c                            | 1 +
 drivers/power/pmic/pca9450.c                           | 1 +
 drivers/power/pmic/pfuze100.c                          | 1 +
 drivers/power/pmic/pmic_tps65910_dm.c                  | 1 +
 drivers/power/pmic/s2mps11.c                           | 1 +
 drivers/power/pmic/s5m8767.c                           | 1 +
 drivers/power/pmic/sandbox.c                           | 1 +
 drivers/power/pmic/tps65090.c                          | 1 +
 drivers/power/pmic/tps65941.c                          | 1 +
 drivers/power/regulator/bd71837.c                      | 1 +
 drivers/power/regulator/fan53555.c                     | 1 +
 drivers/power/regulator/fixed.c                        | 3 ++-
 drivers/power/regulator/gpio-regulator.c               | 3 ++-
 drivers/power/regulator/max77686.c                     | 1 +
 drivers/power/regulator/pbias_regulator.c              | 1 +
 drivers/power/regulator/regulator_common.c             | 4 +++-
 drivers/power/regulator/regulator_common.h             | 4 ----
 drivers/power/regulator/s2mps11_regulator.c            | 1 +
 drivers/power/regulator/sandbox.c                      | 1 +
 drivers/power/regulator/tps65910_regulator.c           | 1 +
 drivers/power/twl4030.c                                | 1 +
 drivers/power/twl6030.c                                | 1 +
 drivers/ram/imxrt_sdram.c                              | 1 +
 drivers/ram/rockchip/dmc-rk3368.c                      | 1 +
 drivers/ram/stm32_sdram.c                              | 1 +
 drivers/ram/stm32mp1/stm32mp1_ddr.c                    | 1 +
 drivers/ram/stm32mp1/stm32mp1_ram.c                    | 1 +
 drivers/ram/stm32mp1/stm32mp1_tuning.c                 | 1 +
 drivers/remoteproc/rproc-elf-loader.c                  | 1 +
 drivers/remoteproc/rproc-uclass.c                      | 1 +
 drivers/remoteproc/sandbox_testproc.c                  | 1 +
 drivers/remoteproc/stm32_copro.c                       | 1 +
 drivers/remoteproc/ti_power_proc.c                     | 1 +
 drivers/remoteproc/ti_sci_proc.h                       | 1 +
 drivers/reset/sti-reset.c                              | 1 +
 drivers/serial/serial_mtk.c                            | 1 +
 drivers/soc/ti/k3-navss-ringacc.c                      | 1 +
 drivers/spi/atmel_spi.c                                | 1 +
 drivers/spi/fsl_dspi.c                                 | 1 +
 drivers/spi/mt7621_spi.c                               | 1 +
 drivers/spi/mxc_spi.c                                  | 1 +
 drivers/spi/pl022_spi.c                                | 1 +
 drivers/spi/stm32_qspi.c                               | 1 +
 drivers/spi/stm32_spi.c                                | 1 +
 drivers/spi/uniphier_spi.c                             | 1 +
 drivers/sysreset/sysreset_sti.c                        | 1 +
 drivers/sysreset/sysreset_syscon.c                     | 1 +
 drivers/sysreset/sysreset_watchdog.c                   | 1 +
 drivers/tpm/tpm_tis_infineon.c                         | 1 +
 drivers/usb/cdns3/gadget.c                             | 1 +
 drivers/usb/common/common.c                            | 1 +
 drivers/usb/dwc3/dwc3-generic.c                        | 1 +
 drivers/usb/dwc3/dwc3-meson-g12a.c                     | 1 +
 drivers/usb/dwc3/gadget.c                              | 1 +
 drivers/usb/eth/mcs7830.c                              | 1 +
 drivers/usb/gadget/at91_udc.c                          | 1 +
 drivers/usb/gadget/atmel_usba_udc.c                    | 1 +
 drivers/usb/gadget/dwc2_udc_otg.c                      | 1 +
 drivers/usb/gadget/ether.c                             | 1 +
 drivers/usb/gadget/f_fastboot.c                        | 1 +
 drivers/usb/gadget/f_sdp.c                             | 1 +
 drivers/usb/gadget/f_thor.c                            | 1 +
 drivers/usb/gadget/udc/udc-uclass.c                    | 1 +
 drivers/usb/host/dwc3-sti-glue.c                       | 1 +
 drivers/usb/musb-new/mt85xx.c                          | 1 +
 drivers/usb/musb-new/musb_core.c                       | 1 +
 drivers/usb/musb-new/musb_debug.h                      | 1 +
 drivers/usb/musb-new/musb_dsps.c                       | 1 +
 drivers/usb/musb-new/musb_gadget.c                     | 1 +
 drivers/usb/musb-new/musb_gadget_ep0.c                 | 1 +
 drivers/usb/musb-new/omap2430.c                        | 1 +
 drivers/usb/musb-new/sunxi.c                           | 1 +
 drivers/usb/musb-new/ti-musb.c                         | 1 +
 drivers/video/am335x-fb.c                              | 1 +
 drivers/video/meson/meson_dw_hdmi.c                    | 1 +
 drivers/video/meson/meson_vclk.c                       | 1 +
 drivers/video/stm32/stm32_dsi.c                        | 1 +
 drivers/video/stm32/stm32_ltdc.c                       | 1 +
 drivers/video/tegra124/sor.c                           | 1 +
 drivers/watchdog/stm32mp_wdt.c                         | 1 +
 env/common.c                                           | 1 +
 fs/ubifs/debug.c                                       | 1 +
 fs/ubifs/debug.h                                       | 1 +
 fs/ubifs/lpt_commit.c                                  | 1 +
 fs/ubifs/super.c                                       | 1 +
 fs/ubifs/ubifs.h                                       | 1 +
 fs/yaffs2/yaffs_uboot_glue.c                           | 1 +
 include/common.h                                       | 1 -
 include/crypto/pkcs7_parser.h                          | 1 +
 include/dm/device_compat.h                             | 1 +
 include/linux/soc/ti/cppi5.h                           | 1 +
 lib/asn1_decoder.c                                     | 1 +
 lib/bch.c                                              | 1 +
 lib/crypto/asymmetric_type.c                           | 1 +
 lib/crypto/pkcs7_parser.c                              | 1 +
 lib/crypto/pkcs7_verify.c                              | 1 +
 lib/crypto/public_key.c                                | 1 +
 lib/crypto/rsa_helper.c                                | 1 +
 lib/crypto/x509_cert_parser.c                          | 1 +
 lib/crypto/x509_public_key.c                           | 1 +
 lib/list_sort.c                                        | 1 +
 net/fastboot.c                                         | 1 +
 327 files changed, 330 insertions(+), 8 deletions(-)

diff --git a/arch/arm/lib/gic-v3-its.c b/arch/arm/lib/gic-v3-its.c
index a1657e38536..6cdcd1ed60c 100644
--- a/arch/arm/lib/gic-v3-its.c
+++ b/arch/arm/lib/gic-v3-its.c
@@ -10,6 +10,7 @@
 #include <asm/gic-v3.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
+#include <linux/printk.h>
 #include <linux/sizes.h>
 
 static u32 lpi_id_bits;
diff --git a/arch/arm/mach-imx/imx8/fdt.c b/arch/arm/mach-imx/imx8/fdt.c
index a132ce2e6a3..776d2b24345 100644
--- a/arch/arm/mach-imx/imx8/fdt.c
+++ b/arch/arm/mach-imx/imx8/fdt.c
@@ -11,6 +11,7 @@
 #include <dm/ofnode.h>
 #include <fdt_support.h>
 #include <linux/libfdt.h>
+#include <linux/printk.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-k3/common.c b/arch/arm/mach-k3/common.c
index b545561c4e6..f8985b099f7 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 <asm/global_data.h>
+#include <linux/printk.h>
 #include "common.h"
 #include <dm.h>
 #include <remoteproc.h>
diff --git a/arch/arm/mach-meson/board-gx.c b/arch/arm/mach-meson/board-gx.c
index 6824b846d4d..53756cc6875 100644
--- a/arch/arm/mach-meson/board-gx.c
+++ b/arch/arm/mach-meson/board-gx.c
@@ -15,6 +15,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/armv8/mmu.h>
+#include <linux/printk.h>
 #include <linux/sizes.h>
 #include <usb.h>
 #include <linux/usb/otg.h>
diff --git a/arch/arm/mach-omap2/am33xx/board.c b/arch/arm/mach-omap2/am33xx/board.c
index 3b17446cd5d..cff8c205734 100644
--- a/arch/arm/mach-omap2/am33xx/board.c
+++ b/arch/arm/mach-omap2/am33xx/board.c
@@ -36,6 +36,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/compiler.h>
+#include <linux/printk.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
 #include <linux/usb/musb.h>
diff --git a/arch/arm/mach-omap2/utils.c b/arch/arm/mach-omap2/utils.c
index 6e6791fc659..095b5d3c36f 100644
--- a/arch/arm/mach-omap2/utils.c
+++ b/arch/arm/mach-omap2/utils.c
@@ -9,6 +9,7 @@
 #include <asm/setup.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/omap_common.h>
+#include <linux/printk.h>
 
 static void do_cancel_out(u32 *num, u32 *den, u32 factor)
 {
diff --git a/arch/arm/mach-rockchip/boot_mode.c b/arch/arm/mach-rockchip/boot_mode.c
index 2158934159a..c6d19541ac7 100644
--- a/arch/arm/mach-rockchip/boot_mode.c
+++ b/arch/arm/mach-rockchip/boot_mode.c
@@ -12,6 +12,7 @@
 #include <asm/arch-rockchip/boot_mode.h>
 #include <dm/device.h>
 #include <dm/uclass.h>
+#include <linux/printk.h>
 
 #if (CONFIG_ROCKCHIP_BOOT_MODE_REG == 0)
 
diff --git a/arch/arm/mach-rockchip/rk3188/rk3188.c b/arch/arm/mach-rockchip/rk3188/rk3188.c
index 85dcce90330..1338979febb 100644
--- a/arch/arm/mach-rockchip/rk3188/rk3188.c
+++ b/arch/arm/mach-rockchip/rk3188/rk3188.c
@@ -15,6 +15,7 @@
 #include <asm/arch-rockchip/grf_rk3188.h>
 #include <asm/arch-rockchip/hardware.h>
 #include <linux/err.h>
+#include <linux/printk.h>
 
 #define GRF_BASE	0x20008000
 
diff --git a/arch/arm/mach-rockchip/rk3399/rk3399.c b/arch/arm/mach-rockchip/rk3399/rk3399.c
index 869d2159bea..f8f6799a7fd 100644
--- a/arch/arm/mach-rockchip/rk3399/rk3399.c
+++ b/arch/arm/mach-rockchip/rk3399/rk3399.c
@@ -19,6 +19,7 @@
 #include <asm/arch-rockchip/grf_rk3399.h>
 #include <asm/arch-rockchip/hardware.h>
 #include <linux/bitops.h>
+#include <linux/printk.h>
 #include <power/regulator.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-socfpga/misc.c b/arch/arm/mach-socfpga/misc.c
index 64a7c9d652c..6813279e6ae 100644
--- a/arch/arm/mach-socfpga/misc.c
+++ b/arch/arm/mach-socfpga/misc.c
@@ -25,6 +25,7 @@
 #include <asm/arch/nic301.h>
 #include <asm/arch/scu.h>
 #include <asm/pl310.h>
+#include <linux/printk.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-stm32mp/bsec.c b/arch/arm/mach-stm32mp/bsec.c
index 0c56b440f56..7bd9c06de57 100644
--- a/arch/arm/mach-stm32mp/bsec.c
+++ b/arch/arm/mach-stm32mp/bsec.c
@@ -12,6 +12,7 @@
 #include <asm/arch/stm32mp1_smc.h>
 #include <linux/arm-smccc.h>
 #include <linux/iopoll.h>
+#include <linux/printk.h>
 
 #define BSEC_OTP_MAX_VALUE		95
 #define BSEC_TIMEOUT_US			10000
diff --git a/arch/arm/mach-stm32mp/cmd_stm32key.c b/arch/arm/mach-stm32mp/cmd_stm32key.c
index f191085a12d..eb3d74bc836 100644
--- a/arch/arm/mach-stm32mp/cmd_stm32key.c
+++ b/arch/arm/mach-stm32mp/cmd_stm32key.c
@@ -9,6 +9,7 @@
 #include <misc.h>
 #include <dm/device.h>
 #include <dm/uclass.h>
+#include <linux/printk.h>
 
 #define STM32_OTP_HASH_KEY_START 24
 #define STM32_OTP_HASH_KEY_SIZE 8
diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c b/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c
index cbf0120adcb..6dd680d739c 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 <asm/arch/stm32prog.h>
+#include <linux/printk.h>
 #include "stm32prog.h"
 
 struct stm32prog_data *stm32prog_data;
diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c
index 0824bbf91a2..35181a6b756 100644
--- a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c
+++ b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c
@@ -17,6 +17,7 @@
 #include <linux/list.h>
 #include <linux/list_sort.h>
 #include <linux/mtd/mtd.h>
+#include <linux/printk.h>
 #include <linux/sizes.h>
 
 #include "stm32prog.h"
diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.h b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.h
index bae4e91c01d..002b4d39be6 100644
--- a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.h
+++ b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.h
@@ -6,6 +6,8 @@
 #ifndef _STM32PROG_H_
 #define _STM32PROG_H_
 
+#include <linux/printk.h>
+
 /* - phase defines ------------------------------------------------*/
 #define PHASE_FLASHLAYOUT	0x00
 #define PHASE_FIRST_USER	0x10
diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_serial.c b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_serial.c
index c94bbd82979..9d94959cfee 100644
--- a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_serial.c
+++ b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_serial.c
@@ -13,6 +13,7 @@
 #include <dm/lists.h>
 #include <dm/device-internal.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 #include "stm32prog.h"
 
 /* - configuration part -----------------------------*/
diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_usb.c b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_usb.c
index 30547f94c94..134c3b117f5 100644
--- a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_usb.c
+++ b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_usb.c
@@ -9,6 +9,7 @@
 #include <usb.h>
 #include <asm/arch/stm32prog.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/printk.h>
 #include "stm32prog.h"
 
 static int stm32prog_set_phase(struct stm32prog_data *data, u8 phase,
diff --git a/arch/arm/mach-stm32mp/cpu.c b/arch/arm/mach-stm32mp/cpu.c
index 469c5b704e4..cd27a774d44 100644
--- a/arch/arm/mach-stm32mp/cpu.c
+++ b/arch/arm/mach-stm32mp/cpu.c
@@ -19,6 +19,7 @@
 #include <dm/device.h>
 #include <dm/uclass.h>
 #include <linux/bitops.h>
+#include <linux/printk.h>
 
 /* RCC register */
 #define RCC_TZCR		(STM32_RCC_BASE + 0x00)
diff --git a/arch/arm/mach-stm32mp/include/mach/stm32mp1_smc.h b/arch/arm/mach-stm32mp/include/mach/stm32mp1_smc.h
index 4ad14f963b4..1b2bba3d34c 100644
--- a/arch/arm/mach-stm32mp/include/mach/stm32mp1_smc.h
+++ b/arch/arm/mach-stm32mp/include/mach/stm32mp1_smc.h
@@ -7,6 +7,7 @@
 #define __STM32MP1_SMC_H__
 
 #include <linux/arm-smccc.h>
+#include <linux/printk.h>
 
 /*
  * SMC function IDs for STM32 Service queries
diff --git a/arch/arm/mach-tegra/cboot.c b/arch/arm/mach-tegra/cboot.c
index bb46fb23ff7..6a47c104b72 100644
--- a/arch/arm/mach-tegra/cboot.c
+++ b/arch/arm/mach-tegra/cboot.c
@@ -15,6 +15,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <asm/global_data.h>
+#include <linux/printk.h>
 
 #include <linux/ctype.h>
 #include <linux/sizes.h>
diff --git a/arch/arm/mach-tegra/ivc.c b/arch/arm/mach-tegra/ivc.c
index b69a458fdf0..66c1276f4b8 100644
--- a/arch/arm/mach-tegra/ivc.c
+++ b/arch/arm/mach-tegra/ivc.c
@@ -8,6 +8,7 @@
 #include <asm/io.h>
 #include <asm/arch-tegra/ivc.h>
 #include <linux/bug.h>
+#include <linux/printk.h>
 
 #define TEGRA_IVC_ALIGN 64
 
diff --git a/arch/arm/mach-tegra/tegra124/xusb-padctl.c b/arch/arm/mach-tegra/tegra124/xusb-padctl.c
index c95ca048d5e..5b88d6e5e7b 100644
--- a/arch/arm/mach-tegra/tegra124/xusb-padctl.c
+++ b/arch/arm/mach-tegra/tegra124/xusb-padctl.c
@@ -12,6 +12,7 @@
 #include <dm/of_access.h>
 #include <dm/ofnode.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 
 #include "../xusb-padctl-common.h"
 
diff --git a/arch/arm/mach-tegra/tegra20/clock.c b/arch/arm/mach-tegra/tegra20/clock.c
index 24e8a13b1f9..b1e2c87e629 100644
--- a/arch/arm/mach-tegra/tegra20/clock.c
+++ b/arch/arm/mach-tegra/tegra20/clock.c
@@ -19,6 +19,7 @@
 #include <div64.h>
 #include <fdtdec.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 
 /*
  * Clock types that we can use as a source. The Tegra20 has muxes for the
diff --git a/arch/arm/mach-tegra/tegra210/xusb-padctl.c b/arch/arm/mach-tegra/tegra210/xusb-padctl.c
index c414dfd3b86..30d0395bb0e 100644
--- a/arch/arm/mach-tegra/tegra210/xusb-padctl.c
+++ b/arch/arm/mach-tegra/tegra210/xusb-padctl.c
@@ -12,6 +12,7 @@
 #include <dm/of_access.h>
 #include <dm/ofnode.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 
 #include "../xusb-padctl-common.h"
 
diff --git a/arch/arm/mach-tegra/tegra30/clock.c b/arch/arm/mach-tegra/tegra30/clock.c
index b0641c6a41a..d516ac5f4cb 100644
--- a/arch/arm/mach-tegra/tegra30/clock.c
+++ b/arch/arm/mach-tegra/tegra30/clock.c
@@ -18,6 +18,7 @@
 #include <div64.h>
 #include <fdtdec.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 
 /*
  * Clock types that we can use as a source. The Tegra30 has muxes for the
diff --git a/arch/arm/mach-tegra/xusb-padctl-common.c b/arch/arm/mach-tegra/xusb-padctl-common.c
index e56e27c8b6e..5de403c30e4 100644
--- a/arch/arm/mach-tegra/xusb-padctl-common.c
+++ b/arch/arm/mach-tegra/xusb-padctl-common.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <errno.h>
 #include <log.h>
+#include <linux/printk.h>
 
 #include "xusb-padctl-common.h"
 
diff --git a/arch/arm/mach-uniphier/boot-device/boot-device.c b/arch/arm/mach-uniphier/boot-device/boot-device.c
index 98ff34cfa71..1e6bc8433f7 100644
--- a/arch/arm/mach-uniphier/boot-device/boot-device.c
+++ b/arch/arm/mach-uniphier/boot-device/boot-device.c
@@ -12,6 +12,7 @@
 #include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/log2.h>
+#include <linux/printk.h>
 
 #include "../init.h"
 #include "../sg-regs.h"
diff --git a/arch/arm/mach-uniphier/clk/dpll-ld4.c b/arch/arm/mach-uniphier/clk/dpll-ld4.c
index 3ccaf02242c..f24a0eb0b82 100644
--- a/arch/arm/mach-uniphier/clk/dpll-ld4.c
+++ b/arch/arm/mach-uniphier/clk/dpll-ld4.c
@@ -7,6 +7,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/io.h>
+#include <linux/printk.h>
 
 #include "../init.h"
 #include "../sc-regs.h"
diff --git a/arch/arm/mach-uniphier/clk/dpll-pro4.c b/arch/arm/mach-uniphier/clk/dpll-pro4.c
index 44006ae6dc4..204aee1a62c 100644
--- a/arch/arm/mach-uniphier/clk/dpll-pro4.c
+++ b/arch/arm/mach-uniphier/clk/dpll-pro4.c
@@ -7,6 +7,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/io.h>
+#include <linux/printk.h>
 
 #include "../init.h"
 #include "../sc-regs.h"
diff --git a/arch/arm/mach-uniphier/dram/umc-ld4.c b/arch/arm/mach-uniphier/dram/umc-ld4.c
index 96acca2562f..1eb15b611fd 100644
--- a/arch/arm/mach-uniphier/dram/umc-ld4.c
+++ b/arch/arm/mach-uniphier/dram/umc-ld4.c
@@ -7,6 +7,7 @@
 
 #include <linux/errno.h>
 #include <linux/io.h>
+#include <linux/printk.h>
 #include <linux/sizes.h>
 #include <asm/processor.h>
 
diff --git a/arch/arm/mach-uniphier/dram/umc-pro4.c b/arch/arm/mach-uniphier/dram/umc-pro4.c
index cde39b499bf..0114df782b4 100644
--- a/arch/arm/mach-uniphier/dram/umc-pro4.c
+++ b/arch/arm/mach-uniphier/dram/umc-pro4.c
@@ -7,6 +7,7 @@
 
 #include <linux/errno.h>
 #include <linux/io.h>
+#include <linux/printk.h>
 #include <linux/sizes.h>
 #include <asm/processor.h>
 
diff --git a/arch/arm/mach-uniphier/dram/umc-sld8.c b/arch/arm/mach-uniphier/dram/umc-sld8.c
index a11586952d8..583a1bad8b7 100644
--- a/arch/arm/mach-uniphier/dram/umc-sld8.c
+++ b/arch/arm/mach-uniphier/dram/umc-sld8.c
@@ -7,6 +7,7 @@
 
 #include <linux/errno.h>
 #include <linux/io.h>
+#include <linux/printk.h>
 #include <linux/sizes.h>
 #include <asm/processor.h>
 
diff --git a/arch/arm/mach-uniphier/memconf.c b/arch/arm/mach-uniphier/memconf.c
index 57192f0154a..ab0d187a1fa 100644
--- a/arch/arm/mach-uniphier/memconf.c
+++ b/arch/arm/mach-uniphier/memconf.c
@@ -7,6 +7,7 @@
 
 #include <linux/errno.h>
 #include <linux/io.h>
+#include <linux/printk.h>
 #include <linux/sizes.h>
 
 #include "sg-regs.h"
diff --git a/arch/arm/mach-uniphier/spl_board_init.c b/arch/arm/mach-uniphier/spl_board_init.c
index a93b8cdc04d..0f2e3504c81 100644
--- a/arch/arm/mach-uniphier/spl_board_init.c
+++ b/arch/arm/mach-uniphier/spl_board_init.c
@@ -7,6 +7,7 @@
 #include <debug_uart.h>
 #include <hang.h>
 #include <spl.h>
+#include <linux/printk.h>
 
 #include "init.h"
 #include "micro-support-card.h"
diff --git a/arch/riscv/lib/smp.c b/arch/riscv/lib/smp.c
index c79d2a28d04..879b7ab9a78 100644
--- a/arch/riscv/lib/smp.c
+++ b/arch/riscv/lib/smp.c
@@ -10,6 +10,7 @@
 #include <asm/barrier.h>
 #include <asm/global_data.h>
 #include <asm/smp.h>
+#include <linux/printk.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/tangier/pinmux.c b/arch/x86/cpu/tangier/pinmux.c
index 5b0e106011a..596c2c177ce 100644
--- a/arch/x86/cpu/tangier/pinmux.c
+++ b/arch/x86/cpu/tangier/pinmux.c
@@ -13,6 +13,7 @@
 #include <asm/cpu.h>
 #include <asm/scu.h>
 #include <linux/io.h>
+#include <linux/printk.h>
 
 #define BUFCFG_OFFSET				0x100
 
diff --git a/arch/x86/cpu/tangier/sdram.c b/arch/x86/cpu/tangier/sdram.c
index df3b9e4ec97..0f0ab4102be 100644
--- a/arch/x86/cpu/tangier/sdram.c
+++ b/arch/x86/cpu/tangier/sdram.c
@@ -9,6 +9,7 @@
 #include <asm/e820.h>
 #include <asm/global_data.h>
 #include <asm/sfi.h>
+#include <linux/printk.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/dhelectronics/dh_stm32mp1/board.c b/board/dhelectronics/dh_stm32mp1/board.c
index 8abee14d3e2..f4694e4b883 100644
--- a/board/dhelectronics/dh_stm32mp1/board.c
+++ b/board/dhelectronics/dh_stm32mp1/board.c
@@ -35,6 +35,7 @@
 #include <phy.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 #include <power/regulator.h>
 #include <remoteproc.h>
 #include <reset.h>
diff --git a/board/mediatek/mt8518/mt8518_ap1.c b/board/mediatek/mt8518/mt8518_ap1.c
index fce5de6767c..5a300821c9b 100644
--- a/board/mediatek/mt8518/mt8518_ap1.c
+++ b/board/mediatek/mt8518/mt8518_ap1.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <log.h>
 #include <asm/global_data.h>
+#include <linux/printk.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/mscc/ocelot/ocelot.c b/board/mscc/ocelot/ocelot.c
index c462890bb85..51e1aeccf57 100644
--- a/board/mscc/ocelot/ocelot.c
+++ b/board/mscc/ocelot/ocelot.c
@@ -16,6 +16,7 @@
 #include <wait_bit.h>
 #include <miiphy.h>
 #include <linux/bitops.h>
+#include <linux/printk.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/nvidia/jetson-tk1/jetson-tk1.c b/board/nvidia/jetson-tk1/jetson-tk1.c
index 9eccdc4a832..ae1c76b133d 100644
--- a/board/nvidia/jetson-tk1/jetson-tk1.c
+++ b/board/nvidia/jetson-tk1/jetson-tk1.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <linux/printk.h>
 #include <power/as3722.h>
 #include <power/pmic.h>
 
diff --git a/board/pine64/pinebook-pro-rk3399/pinebook-pro-rk3399.c b/board/pine64/pinebook-pro-rk3399/pinebook-pro-rk3399.c
index 516292aaa59..4ad780767ea 100644
--- a/board/pine64/pinebook-pro-rk3399/pinebook-pro-rk3399.c
+++ b/board/pine64/pinebook-pro-rk3399/pinebook-pro-rk3399.c
@@ -12,6 +12,7 @@
 #include <asm/arch-rockchip/grf_rk3399.h>
 #include <asm/arch-rockchip/hardware.h>
 #include <asm/arch-rockchip/misc.h>
+#include <linux/printk.h>
 #include <power/regulator.h>
 
 #define GRF_IO_VSEL_BT565_SHIFT 0
diff --git a/board/samsung/common/exynos5-dt.c b/board/samsung/common/exynos5-dt.c
index 4463cdcb87b..97f4097cbcd 100644
--- a/board/samsung/common/exynos5-dt.c
+++ b/board/samsung/common/exynos5-dt.c
@@ -26,6 +26,7 @@
 #include <asm/arch/pinmux.h>
 #include <asm/arch/power.h>
 #include <asm/arch/sromc.h>
+#include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/max77686_pmic.h>
 #include <power/regulator.h>
diff --git a/board/samsung/common/misc.c b/board/samsung/common/misc.c
index 7d3b9846e39..0243d8971c8 100644
--- a/board/samsung/common/misc.c
+++ b/board/samsung/common/misc.c
@@ -11,6 +11,7 @@
 #include <libtizen.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 #include <samsung/misc.h>
 #include <errno.h>
 #include <version.h>
diff --git a/board/samsung/goni/goni.c b/board/samsung/goni/goni.c
index b32b82fc2da..5fb01bba055 100644
--- a/board/samsung/goni/goni.c
+++ b/board/samsung/goni/goni.c
@@ -13,6 +13,7 @@
 #include <asm/arch/mmc.h>
 #include <dm.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 #include <power/pmic.h>
 #include <usb/dwc2_udc.h>
 #include <asm/arch/cpu.h>
diff --git a/board/samsung/odroid/odroid.c b/board/samsung/odroid/odroid.c
index 90aab62d33b..19e5bccbdb5 100644
--- a/board/samsung/odroid/odroid.c
+++ b/board/samsung/odroid/odroid.c
@@ -15,6 +15,7 @@
 #include <asm/arch/cpu.h>
 #include <dm.h>
 #include <env.h>
+#include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/max77686_pmic.h>
diff --git a/board/st/common/stm32mp_dfu.c b/board/st/common/stm32mp_dfu.c
index 0cda9196f93..8e74030d280 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 <asm/arch/stm32prog.h>
+#include <linux/printk.h>
 
 #define DFU_ALT_BUF_LEN SZ_1K
 
diff --git a/board/st/common/stm32mp_mtdparts.c b/board/st/common/stm32mp_mtdparts.c
index ef32df04fef..7151cad6d0f 100644
--- a/board/st/common/stm32mp_mtdparts.c
+++ b/board/st/common/stm32mp_mtdparts.c
@@ -14,6 +14,7 @@
 #include <asm/arch/stm32prog.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/global_data.h>
+#include <linux/printk.h>
 
 #define MTDPARTS_LEN		256
 #define MTDIDS_LEN		128
diff --git a/board/st/stm32mp1/stm32mp1.c b/board/st/stm32mp1/stm32mp1.c
index a73157f0fc6..ed3b35195ec 100644
--- a/board/st/stm32mp1/stm32mp1.c
+++ b/board/st/stm32mp1/stm32mp1.c
@@ -39,6 +39,7 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/iopoll.h>
+#include <linux/printk.h>
 #include <power/regulator.h>
 #include <usb/dwc2_udc.h>
 
diff --git a/board/sunxi/board.c b/board/sunxi/board.c
index 87c231f38f9..7812860042f 100644
--- a/board/sunxi/board.c
+++ b/board/sunxi/board.c
@@ -30,6 +30,7 @@
 #include <asm/arch/spl.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 #include <u-boot/crc.h>
 #ifndef CONFIG_ARM64
 #include <asm/armv7.h>
diff --git a/board/synopsys/hsdk/clk-lib.c b/board/synopsys/hsdk/clk-lib.c
index 1c74bfb93a3..eed0fa15b19 100644
--- a/board/synopsys/hsdk/clk-lib.c
+++ b/board/synopsys/hsdk/clk-lib.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <dm/device.h>
+#include <linux/printk.h>
 
 #include "clk-lib.h"
 
diff --git a/board/synopsys/hsdk/env-lib.c b/board/synopsys/hsdk/env-lib.c
index 235f29565f9..dbec12c8a7b 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 <linux/printk.h>
 
 #define MAX_CMD_LEN	25
 
diff --git a/board/ti/am65x/evm.c b/board/ti/am65x/evm.c
index 3387f4df093..8c29e6ae882 100644
--- a/board/ti/am65x/evm.c
+++ b/board/ti/am65x/evm.c
@@ -22,6 +22,7 @@
 #include <env.h>
 #include <spl.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/printk.h>
 
 #include "../common/board_detect.h"
 
diff --git a/board/ti/common/board_detect.c b/board/ti/common/board_detect.c
index e09ecda4d7e..9d1bee1c255 100644
--- a/board/ti/common/board_detect.c
+++ b/board/ti/common/board_detect.c
@@ -19,6 +19,7 @@
 #include <mmc.h>
 #include <errno.h>
 #include <malloc.h>
+#include <linux/printk.h>
 
 #include "board_detect.h"
 
diff --git a/board/ti/j721e/evm.c b/board/ti/j721e/evm.c
index 656dde3e303..220c2e5cfb8 100644
--- a/board/ti/j721e/evm.c
+++ b/board/ti/j721e/evm.c
@@ -23,6 +23,7 @@
 #include <asm/arch/sys_proto.h>
 #include <dm.h>
 #include <dm/uclass-internal.h>
+#include <linux/printk.h>
 
 #include "../common/board_detect.h"
 
diff --git a/board/toradex/apalis-tk1/apalis-tk1.c b/board/toradex/apalis-tk1/apalis-tk1.c
index e7a2186c2c4..349b3119370 100644
--- a/board/toradex/apalis-tk1/apalis-tk1.c
+++ b/board/toradex/apalis-tk1/apalis-tk1.c
@@ -16,6 +16,7 @@
 #include <env_internal.h>
 #include <pci_tegra.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 #include <power/as3722.h>
 #include <power/pmic.h>
 
diff --git a/cmd/adc.c b/cmd/adc.c
index 16f914a030e..557a2c1f5d0 100644
--- a/cmd/adc.c
+++ b/cmd/adc.c
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <dm.h>
 #include <adc.h>
+#include <linux/printk.h>
 
 static int do_adc_list(struct cmd_tbl *cmdtp, int flag, int argc,
 		       char *const argv[])
diff --git a/cmd/fastboot.c b/cmd/fastboot.c
index ad5c0649118..48b891b28fc 100644
--- a/cmd/fastboot.c
+++ b/cmd/fastboot.c
@@ -14,6 +14,7 @@
 #include <net.h>
 #include <usb.h>
 #include <watchdog.h>
+#include <linux/printk.h>
 #include <linux/stringify.h>
 
 static int do_fastboot_udp(int argc, char *const argv[],
diff --git a/cmd/nvedit.c b/cmd/nvedit.c
index 91fa73fa322..554596b27d7 100644
--- a/cmd/nvedit.c
+++ b/cmd/nvedit.c
@@ -37,6 +37,7 @@
 #include <mapmem.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
+#include <linux/printk.h>
 #include <u-boot/crc.h>
 #include <watchdog.h>
 #include <linux/stddef.h>
diff --git a/cmd/onenand.c b/cmd/onenand.c
index 216458bb474..fa403369faa 100644
--- a/cmd/onenand.c
+++ b/cmd/onenand.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <command.h>
 #include <malloc.h>
+#include <linux/printk.h>
 
 #include <linux/compat.h>
 #include <linux/mtd/mtd.h>
diff --git a/cmd/regulator.c b/cmd/regulator.c
index aa06c9a9fc8..0d97334a901 100644
--- a/cmd/regulator.c
+++ b/cmd/regulator.c
@@ -8,6 +8,7 @@
 #include <errno.h>
 #include <dm.h>
 #include <dm/uclass-internal.h>
+#include <linux/printk.h>
 #include <power/regulator.h>
 
 #define LIMIT_DEVNAME	20
diff --git a/cmd/thordown.c b/cmd/thordown.c
index ae20dddfddb..f36fb20e26e 100644
--- a/cmd/thordown.c
+++ b/cmd/thordown.c
@@ -12,6 +12,7 @@
 #include <dfu.h>
 #include <g_dnl.h>
 #include <usb.h>
+#include <linux/printk.h>
 
 int do_thor_down(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 {
diff --git a/cmd/tpm_test.c b/cmd/tpm_test.c
index ebfb25cab0a..d7044336ff2 100644
--- a/cmd/tpm_test.c
+++ b/cmd/tpm_test.c
@@ -8,6 +8,7 @@
 #include <cpu_func.h>
 #include <log.h>
 #include <tpm-v1.h>
+#include <linux/printk.h>
 #include "tpm-user-utils.h"
 
 /* Prints error and returns on failure */
diff --git a/cmd/usb_gadget_sdp.c b/cmd/usb_gadget_sdp.c
index 1af82e11366..651a3ebcb5d 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 <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 d565635c6c4..5996c852e8e 100644
--- a/cmd/usb_mass_storage.c
+++ b/cmd/usb_mass_storage.c
@@ -18,6 +18,7 @@
 #include <usb_mass_storage.h>
 #include <watchdog.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 
 static int ums_read_sector(struct ums *ums_dev,
 			   ulong start, lbaint_t blkcnt, void *buf)
diff --git a/common/dfu.c b/common/dfu.c
index d23cf67f194..c879e8d6a8f 100644
--- a/common/dfu.c
+++ b/common/dfu.c
@@ -19,6 +19,7 @@
 #include <g_dnl.h>
 #include <usb.h>
 #include <net.h>
+#include <linux/printk.h>
 
 int run_usb_dnl_gadget(int usbctrl_index, char *usb_dnl_gadget)
 {
diff --git a/common/spl/spl_dfu.c b/common/spl/spl_dfu.c
index 5728d43ad3f..8a779da8fa1 100644
--- a/common/spl/spl_dfu.c
+++ b/common/spl/spl_dfu.c
@@ -15,6 +15,7 @@
 #include <g_dnl.h>
 #include <usb.h>
 #include <dfu.h>
+#include <linux/printk.h>
 
 static int run_dfu(int usb_index, char *interface, char *devstring)
 {
diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c
index 6a9f6f57e8a..da6e021e1bf 100644
--- a/common/spl/spl_fit.c
+++ b/common/spl/spl_fit.c
@@ -16,6 +16,7 @@
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <linux/libfdt.h>
+#include <linux/printk.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/common/spl/spl_opensbi.c b/common/spl/spl_opensbi.c
index 90c4a5f9704..4bde3bb4687 100644
--- a/common/spl/spl_opensbi.c
+++ b/common/spl/spl_opensbi.c
@@ -15,6 +15,7 @@
 #include <asm/smp.h>
 #include <opensbi.h>
 #include <linux/libfdt.h>
+#include <linux/printk.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/common/spl/spl_sdp.c b/common/spl/spl_sdp.c
index e7f7b684116..78ecc962551 100644
--- a/common/spl/spl_sdp.c
+++ b/common/spl/spl_sdp.c
@@ -10,6 +10,7 @@
 #include <usb.h>
 #include <g_dnl.h>
 #include <sdp.h>
+#include <linux/printk.h>
 
 static int spl_sdp_load_image(struct spl_image_info *spl_image,
 			      struct spl_boot_device *bootdev)
diff --git a/common/update.c b/common/update.c
index c8dd346a095..5875524d59b 100644
--- a/common/update.c
+++ b/common/update.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <image.h>
+#include <linux/printk.h>
 
 #if !(defined(CONFIG_FIT) && defined(CONFIG_OF_LIBFDT))
 #error "CONFIG_FIT and CONFIG_OF_LIBFDT are required for auto-update feature"
diff --git a/disk/part_efi.c b/disk/part_efi.c
index 933df460c7b..c0def902fec 100644
--- a/disk/part_efi.c
+++ b/disk/part_efi.c
@@ -25,6 +25,7 @@
 #include <part_efi.h>
 #include <linux/compiler.h>
 #include <linux/ctype.h>
+#include <linux/printk.h>
 #include <u-boot/crc.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/adc/adc-uclass.c b/drivers/adc/adc-uclass.c
index d4356672581..7c033a6855b 100644
--- a/drivers/adc/adc-uclass.c
+++ b/drivers/adc/adc-uclass.c
@@ -13,6 +13,7 @@
 #include <dm/uclass-internal.h>
 #include <adc.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 #include <power/regulator.h>
 
 #define ADC_UCLASS_PLATDATA_SIZE	sizeof(struct adc_uclass_platdata)
diff --git a/drivers/adc/exynos-adc.c b/drivers/adc/exynos-adc.c
index b459b570507..973533d261a 100644
--- a/drivers/adc/exynos-adc.c
+++ b/drivers/adc/exynos-adc.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <adc.h>
 #include <asm/arch/adc.h>
+#include <linux/printk.h>
 
 struct exynos_adc_priv {
 	int active_channel;
diff --git a/drivers/adc/meson-saradc.c b/drivers/adc/meson-saradc.c
index 72b0cc4e5bd..d4abb6b943d 100644
--- a/drivers/adc/meson-saradc.c
+++ b/drivers/adc/meson-saradc.c
@@ -18,6 +18,7 @@
 #include <linux/delay.h>
 #include <linux/math64.h>
 #include <linux/bitfield.h>
+#include <linux/printk.h>
 
 #define MESON_SAR_ADC_REG0					0x00
 	#define MESON_SAR_ADC_REG0_PANEL_DETECT			BIT(31)
diff --git a/drivers/adc/rockchip-saradc.c b/drivers/adc/rockchip-saradc.c
index 561740f63b5..61e3f2cef90 100644
--- a/drivers/adc/rockchip-saradc.c
+++ b/drivers/adc/rockchip-saradc.c
@@ -13,6 +13,7 @@
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/err.h>
+#include <linux/printk.h>
 
 #define SARADC_CTRL_CHN_MASK		GENMASK(2, 0)
 #define SARADC_CTRL_POWER_CTRL		BIT(3)
diff --git a/drivers/adc/sandbox.c b/drivers/adc/sandbox.c
index 1f32289f603..fa1174bbaa3 100644
--- a/drivers/adc/sandbox.c
+++ b/drivers/adc/sandbox.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <adc.h>
 #include <sandbox-adc.h>
+#include <linux/printk.h>
 
 /**
  * struct sandbox_adc_priv - sandbox ADC device's operation status and data
diff --git a/drivers/ata/dwc_ahci.c b/drivers/ata/dwc_ahci.c
index 825fe57f852..5f37fc92784 100644
--- a/drivers/ata/dwc_ahci.c
+++ b/drivers/ata/dwc_ahci.c
@@ -16,6 +16,7 @@
 #include <asm/arch/sata.h>
 #include <asm/io.h>
 #include <generic-phy.h>
+#include <linux/printk.h>
 
 struct dwc_ahci_priv {
 	void *base;
diff --git a/drivers/bios_emulator/include/x86emu/debug.h b/drivers/bios_emulator/include/x86emu/debug.h
index 4962a2acaf1..859b54d8600 100644
--- a/drivers/bios_emulator/include/x86emu/debug.h
+++ b/drivers/bios_emulator/include/x86emu/debug.h
@@ -43,6 +43,7 @@
 
 /* checks to be enabled for "runtime" */
 
+#include <linux/printk.h>
 #define CHECK_IP_FETCH_F		0x1
 #define CHECK_SP_ACCESS_F		0x2
 #define CHECK_MEM_ACCESS_F		0x4	/*using regular linear pointer */
diff --git a/drivers/bios_emulator/include/x86emu/regs.h b/drivers/bios_emulator/include/x86emu/regs.h
index 29341297d96..4b4c5908923 100644
--- a/drivers/bios_emulator/include/x86emu/regs.h
+++ b/drivers/bios_emulator/include/x86emu/regs.h
@@ -41,6 +41,7 @@
 
 /*---------------------- Macros and type definitions ----------------------*/
 
+#include <linux/printk.h>
 #pragma pack(1)
 
 /*
diff --git a/drivers/bios_emulator/x86emu/debug.c b/drivers/bios_emulator/x86emu/debug.c
index 27e90e441aa..95f3cc09aad 100644
--- a/drivers/bios_emulator/x86emu/debug.c
+++ b/drivers/bios_emulator/x86emu/debug.c
@@ -40,6 +40,7 @@
 #include <stdarg.h>
 #include <common.h>
 #include <linux/ctype.h>
+#include <linux/printk.h>
 #include "x86emu/x86emui.h"
 
 /*----------------------------- Implementation ----------------------------*/
diff --git a/drivers/bios_emulator/x86emu/decode.c b/drivers/bios_emulator/x86emu/decode.c
index a9a01b52d6c..e2028eaf083 100644
--- a/drivers/bios_emulator/x86emu/decode.c
+++ b/drivers/bios_emulator/x86emu/decode.c
@@ -37,6 +37,7 @@
 *
 ****************************************************************************/
 #include <common.h>
+#include <linux/printk.h>
 #include "x86emu/x86emui.h"
 
 /*----------------------------- Implementation ----------------------------*/
diff --git a/drivers/bios_emulator/x86emu/ops.c b/drivers/bios_emulator/x86emu/ops.c
index ba18135fe13..8c1a146165c 100644
--- a/drivers/bios_emulator/x86emu/ops.c
+++ b/drivers/bios_emulator/x86emu/ops.c
@@ -73,6 +73,7 @@
 ****************************************************************************/
 
 #include <common.h>
+#include <linux/printk.h>
 #include "x86emu/x86emui.h"
 
 /*----------------------------- Implementation ----------------------------*/
diff --git a/drivers/bios_emulator/x86emu/ops2.c b/drivers/bios_emulator/x86emu/ops2.c
index be4ef364432..6cd1ac39825 100644
--- a/drivers/bios_emulator/x86emu/ops2.c
+++ b/drivers/bios_emulator/x86emu/ops2.c
@@ -43,6 +43,7 @@
 
 #include <common.h>
 #include <linux/compiler.h>
+#include <linux/printk.h>
 #include "x86emu/x86emui.h"
 
 /*----------------------------- Implementation ----------------------------*/
diff --git a/drivers/bios_emulator/x86emu/sys.c b/drivers/bios_emulator/x86emu/sys.c
index c2db1213fe6..53891960c0c 100644
--- a/drivers/bios_emulator/x86emu/sys.c
+++ b/drivers/bios_emulator/x86emu/sys.c
@@ -40,6 +40,7 @@
 ****************************************************************************/
 
 #include <common.h>
+#include <linux/printk.h>
 #include "x86emu/x86emui.h"
 
 /*------------------------- Global Variables ------------------------------*/
diff --git a/drivers/bootcount/bootcount-uclass.c b/drivers/bootcount/bootcount-uclass.c
index 34ac08d59a6..2a492c87ebd 100644
--- a/drivers/bootcount/bootcount-uclass.c
+++ b/drivers/bootcount/bootcount-uclass.c
@@ -8,6 +8,7 @@
 #include <errno.h>
 #include <bootcount.h>
 #include <log.h>
+#include <linux/printk.h>
 
 int dm_bootcount_get(struct udevice *dev, u32 *bootcount)
 {
diff --git a/drivers/clk/analogbits/wrpll-cln28hpc.c b/drivers/clk/analogbits/wrpll-cln28hpc.c
index 776ead319ae..a3cb109d357 100644
--- a/drivers/clk/analogbits/wrpll-cln28hpc.c
+++ b/drivers/clk/analogbits/wrpll-cln28hpc.c
@@ -26,6 +26,7 @@
 #include <linux/log2.h>
 #include <linux/math64.h>
 #include <linux/clk/analogbits-wrpll-cln28hpc.h>
+#include <linux/printk.h>
 
 /* MIN_INPUT_FREQ: minimum input clock frequency, in Hz (Fref_min) */
 #define MIN_INPUT_FREQ			7000000
diff --git a/drivers/clk/clk-divider.c b/drivers/clk/clk-divider.c
index 34658536c48..0e0c2d48b74 100644
--- a/drivers/clk/clk-divider.c
+++ b/drivers/clk/clk-divider.c
@@ -24,6 +24,7 @@
 #include <linux/log2.h>
 #include <div64.h>
 #include <clk.h>
+#include <linux/printk.h>
 #include "clk.h"
 
 #define UBOOT_DM_CLK_CCF_DIVIDER "ccf_clk_divider"
diff --git a/drivers/clk/clk-gate.c b/drivers/clk/clk-gate.c
index 98e4b80b32f..cdca3e38d0d 100644
--- a/drivers/clk/clk-gate.c
+++ b/drivers/clk/clk-gate.c
@@ -16,6 +16,7 @@
 #include <linux/bitops.h>
 #include <linux/clk-provider.h>
 #include <clk.h>
+#include <linux/printk.h>
 #include "clk.h"
 #include <linux/err.h>
 
diff --git a/drivers/clk/clk-hsdk-cgu.c b/drivers/clk/clk-hsdk-cgu.c
index 3eb93a55fc4..2067316e672 100644
--- a/drivers/clk/clk-hsdk-cgu.c
+++ b/drivers/clk/clk-hsdk-cgu.c
@@ -19,6 +19,7 @@
 #include <linux/delay.h>
 #include <linux/io.h>
 #include <asm/arcregs.h>
+#include <linux/printk.h>
 
 #include <dt-bindings/clock/snps,hsdk-cgu.h>
 
diff --git a/drivers/clk/clk-mux.c b/drivers/clk/clk-mux.c
index 26991a5bc8f..8df2a2d01ac 100644
--- a/drivers/clk/clk-mux.c
+++ b/drivers/clk/clk-mux.c
@@ -30,6 +30,7 @@
 #include <linux/bitops.h>
 #include <linux/clk-provider.h>
 #include <clk.h>
+#include <linux/printk.h>
 #include "clk.h"
 #include <linux/err.h>
 
diff --git a/drivers/clk/clk_boston.c b/drivers/clk/clk_boston.c
index 2318dcf6a45..47424d8f533 100644
--- a/drivers/clk/clk_boston.c
+++ b/drivers/clk/clk_boston.c
@@ -10,6 +10,7 @@
 #include <regmap.h>
 #include <syscon.h>
 #include <linux/bitops.h>
+#include <linux/printk.h>
 
 struct clk_boston {
 	struct regmap *regmap;
diff --git a/drivers/clk/clk_stm32f.c b/drivers/clk/clk_stm32f.c
index 93722f74ae4..cc48905df54 100644
--- a/drivers/clk/clk_stm32f.c
+++ b/drivers/clk/clk_stm32f.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <stm32_rcc.h>
 #include <linux/bitops.h>
+#include <linux/printk.h>
 
 #include <asm/io.h>
 #include <asm/arch/stm32.h>
diff --git a/drivers/clk/clk_stm32h7.c b/drivers/clk/clk_stm32h7.c
index 5e6abca56fa..c1856d8678b 100644
--- a/drivers/clk/clk_stm32h7.c
+++ b/drivers/clk/clk_stm32h7.c
@@ -13,6 +13,7 @@
 #include <asm/io.h>
 #include <dm/root.h>
 #include <linux/bitops.h>
+#include <linux/printk.h>
 
 #include <dt-bindings/clock/stm32h7-clks.h>
 
diff --git a/drivers/clk/clk_stm32mp1.c b/drivers/clk/clk_stm32mp1.c
index 65ffd32d08e..8244b7c99fc 100644
--- a/drivers/clk/clk_stm32mp1.c
+++ b/drivers/clk/clk_stm32mp1.c
@@ -21,6 +21,7 @@
 #include <asm/arch/sys_proto.h>
 #include <dt-bindings/clock/stm32mp1-clks.h>
 #include <dt-bindings/clock/stm32mp1-clksrc.h>
+#include <linux/printk.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/clk/imx/clk-pll14xx.c b/drivers/clk/imx/clk-pll14xx.c
index b0ccb6c8eda..ac2461948d2 100644
--- a/drivers/clk/imx/clk-pll14xx.c
+++ b/drivers/clk/imx/clk-pll14xx.c
@@ -18,6 +18,7 @@
 #include <linux/iopoll.h>
 #include <clk.h>
 #include <div64.h>
+#include <linux/printk.h>
 
 #include "clk.h"
 
diff --git a/drivers/clk/rockchip/clk_rk3368.c b/drivers/clk/rockchip/clk_rk3368.c
index d1804c6e168..b87be9a0341 100644
--- a/drivers/clk/rockchip/clk_rk3368.c
+++ b/drivers/clk/rockchip/clk_rk3368.c
@@ -22,6 +22,7 @@
 #include <dm/lists.h>
 #include <dt-bindings/clock/rk3368-cru.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 #include <linux/stringify.h>
 
 #if CONFIG_IS_ENABLED(OF_PLATDATA)
diff --git a/drivers/clk/rockchip/clk_rk3399.c b/drivers/clk/rockchip/clk_rk3399.c
index 22c373a623c..e3d1438d54f 100644
--- a/drivers/clk/rockchip/clk_rk3399.c
+++ b/drivers/clk/rockchip/clk_rk3399.c
@@ -22,6 +22,7 @@
 #include <dt-bindings/clock/rk3399-cru.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 
 #if CONFIG_IS_ENABLED(OF_PLATDATA)
 struct rk3399_clk_plat {
diff --git a/drivers/core/device.c b/drivers/core/device.c
index c473789edfa..dd0874e762d 100644
--- a/drivers/core/device.c
+++ b/drivers/core/device.c
@@ -31,6 +31,7 @@
 #include <linux/err.h>
 #include <linux/list.h>
 #include <power-domain.h>
+#include <linux/printk.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/core/of_addr.c b/drivers/core/of_addr.c
index ca34d84922b..3a67d9bc760 100644
--- a/drivers/core/of_addr.c
+++ b/drivers/core/of_addr.c
@@ -14,6 +14,7 @@
 #include <dm/of_addr.h>
 #include <linux/err.h>
 #include <linux/ioport.h>
+#include <linux/printk.h>
 
 /* Max address size we deal with */
 #define OF_MAX_ADDR_CELLS	4
diff --git a/drivers/core/root.c b/drivers/core/root.c
index b5446b1db02..1e9d580c494 100644
--- a/drivers/core/root.c
+++ b/drivers/core/root.c
@@ -25,6 +25,7 @@
 #include <dm/uclass.h>
 #include <dm/util.h>
 #include <linux/list.h>
+#include <linux/printk.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/dfu/dfu.c b/drivers/dfu/dfu.c
index a298c2c4399..3d5de92ecae 100644
--- a/drivers/dfu/dfu.c
+++ b/drivers/dfu/dfu.c
@@ -17,6 +17,7 @@
 #include <hash.h>
 #include <linux/list.h>
 #include <linux/compiler.h>
+#include <linux/printk.h>
 
 static LIST_HEAD(dfu_list);
 static int dfu_alt_num;
diff --git a/drivers/dfu/dfu_mmc.c b/drivers/dfu/dfu_mmc.c
index 691d01c7ebd..ac5ea2c7d79 100644
--- a/drivers/dfu/dfu_mmc.c
+++ b/drivers/dfu/dfu_mmc.c
@@ -16,6 +16,7 @@
 #include <fat.h>
 #include <mmc.h>
 #include <part.h>
+#include <linux/printk.h>
 
 static unsigned char *dfu_file_buf;
 static u64 dfu_file_buf_len;
diff --git a/drivers/dfu/dfu_ram.c b/drivers/dfu/dfu_ram.c
index cc98668e7a4..9b3b71975a1 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 <linux/printk.h>
 
 static int dfu_transfer_medium_ram(enum dfu_op op, struct dfu_entity *dfu,
 				   u64 offset, void *buf, long *len)
diff --git a/drivers/dfu/dfu_tftp.c b/drivers/dfu/dfu_tftp.c
index ffae4bb54f8..0f2c114668e 100644
--- a/drivers/dfu/dfu_tftp.c
+++ b/drivers/dfu/dfu_tftp.c
@@ -9,6 +9,7 @@
 #include <malloc.h>
 #include <errno.h>
 #include <dfu.h>
+#include <linux/printk.h>
 
 int dfu_tftp_write(char *dfu_entity_name, unsigned int addr, unsigned int len,
 		   char *interface, char *devstring)
diff --git a/drivers/dma/bcm6348-iudma.c b/drivers/dma/bcm6348-iudma.c
index 91172d483c7..ceb8de9b8af 100644
--- a/drivers/dma/bcm6348-iudma.c
+++ b/drivers/dma/bcm6348-iudma.c
@@ -28,6 +28,7 @@
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 
 #define DMA_RX_DESC	6
 #define DMA_TX_DESC	1
diff --git a/drivers/dma/dma-uclass.c b/drivers/dma/dma-uclass.c
index 8cbb3640427..79fbfa87d12 100644
--- a/drivers/dma/dma-uclass.c
+++ b/drivers/dma/dma-uclass.c
@@ -19,6 +19,7 @@
 #include <dma-uclass.h>
 #include <dt-structs.h>
 #include <errno.h>
+#include <linux/printk.h>
 
 #ifdef CONFIG_DMA_CHANNELS
 static inline struct dma_ops *dma_dev_ops(struct udevice *dev)
diff --git a/drivers/dma/lpc32xx_dma.c b/drivers/dma/lpc32xx_dma.c
index ab58e97bfe2..0efdfd028cf 100644
--- a/drivers/dma/lpc32xx_dma.c
+++ b/drivers/dma/lpc32xx_dma.c
@@ -17,6 +17,7 @@
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 
 /* DMA controller channel register structure */
 struct dmac_chan_reg {
diff --git a/drivers/dma/sandbox-dma-test.c b/drivers/dma/sandbox-dma-test.c
index 838596b24b6..18e8fe3806c 100644
--- a/drivers/dma/sandbox-dma-test.c
+++ b/drivers/dma/sandbox-dma-test.c
@@ -15,6 +15,7 @@
 #include <dma-uclass.h>
 #include <dt-structs.h>
 #include <errno.h>
+#include <linux/printk.h>
 
 #define SANDBOX_DMA_CH_CNT 3
 #define SANDBOX_DMA_BUF_SIZE 1024
diff --git a/drivers/dma/ti-edma3.c b/drivers/dma/ti-edma3.c
index 13ab9670890..c73ab579cf6 100644
--- a/drivers/dma/ti-edma3.c
+++ b/drivers/dma/ti-edma3.c
@@ -15,6 +15,7 @@
 #include <dma-uclass.h>
 #include <asm/omap_common.h>
 #include <asm/ti-common/ti-edma3.h>
+#include <linux/printk.h>
 
 #define EDMA3_SL_BASE(slot)			(0x4000 + ((slot) << 5))
 #define EDMA3_SL_MAX_NUM			512
diff --git a/drivers/dma/ti/k3-udma.c b/drivers/dma/ti/k3-udma.c
index 57d9fbfabbf..9de0258ed1d 100644
--- a/drivers/dma/ti/k3-udma.c
+++ b/drivers/dma/ti/k3-udma.c
@@ -24,6 +24,7 @@
 #include <linux/delay.h>
 #include <linux/bitmap.h>
 #include <linux/err.h>
+#include <linux/printk.h>
 #include <linux/soc/ti/k3-navss-ringacc.h>
 #include <linux/soc/ti/cppi5.h>
 #include <linux/soc/ti/ti-udma.h>
diff --git a/drivers/fastboot/fb_command.c b/drivers/fastboot/fb_command.c
index 49f6a61c374..42c8fb83433 100644
--- a/drivers/fastboot/fb_command.c
+++ b/drivers/fastboot/fb_command.c
@@ -13,6 +13,7 @@
 #include <flash.h>
 #include <part.h>
 #include <stdlib.h>
+#include <linux/printk.h>
 
 /**
  * image_size - final fastboot image size
diff --git a/drivers/fastboot/fb_getvar.c b/drivers/fastboot/fb_getvar.c
index 52da34b1e37..faa785481ad 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 <linux/printk.h>
 
 static void getvar_version(char *var_parameter, char *response);
 static void getvar_version_bootloader(char *var_parameter, char *response);
diff --git a/drivers/fastboot/fb_mmc.c b/drivers/fastboot/fb_mmc.c
index b2f8932e1c7..d285d0f14fd 100644
--- a/drivers/fastboot/fb_mmc.c
+++ b/drivers/fastboot/fb_mmc.c
@@ -19,6 +19,7 @@
 #include <div64.h>
 #include <linux/compat.h>
 #include <android_image.h>
+#include <linux/printk.h>
 
 #define FASTBOOT_MAX_BLK_WRITE 16384
 
diff --git a/drivers/fastboot/fb_nand.c b/drivers/fastboot/fb_nand.c
index eb8a36f2922..1bf7ccb960b 100644
--- a/drivers/fastboot/fb_nand.c
+++ b/drivers/fastboot/fb_nand.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <blk.h>
 #include <flash.h>
+#include <linux/printk.h>
 
 #include <fastboot.h>
 #include <image-sparse.h>
diff --git a/drivers/i2c/i2c-gpio.c b/drivers/i2c/i2c-gpio.c
index 6dc89a4e202..fe90abd24a6 100644
--- a/drivers/i2c/i2c-gpio.c
+++ b/drivers/i2c/i2c-gpio.c
@@ -13,6 +13,7 @@
 #include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 
 #define DEFAULT_UDELAY	5
 #define RETRIES		0
diff --git a/drivers/i2c/iproc_i2c.c b/drivers/i2c/iproc_i2c.c
index b90c0ddba7c..4231c0c617f 100644
--- a/drivers/i2c/iproc_i2c.c
+++ b/drivers/i2c/iproc_i2c.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <config.h>
 #include <dm.h>
+#include <linux/printk.h>
 #include "errno.h"
 #include <i2c.h>
 #include "iproc_i2c.h"
diff --git a/drivers/i2c/omap24xx_i2c.c b/drivers/i2c/omap24xx_i2c.c
index 0af4e333c41..aaf2d10f6fd 100644
--- a/drivers/i2c/omap24xx_i2c.c
+++ b/drivers/i2c/omap24xx_i2c.c
@@ -43,6 +43,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 
 #include <asm/io.h>
 #include <asm/omap_i2c.h>
diff --git a/drivers/i2c/stm32f7_i2c.c b/drivers/i2c/stm32f7_i2c.c
index 2f609115494..6c2fff1c52b 100644
--- a/drivers/i2c/stm32f7_i2c.c
+++ b/drivers/i2c/stm32f7_i2c.c
@@ -13,6 +13,7 @@
 #include <syscon.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 
 #include <dm/device.h>
 #include <linux/err.h>
diff --git a/drivers/i2c/tegra_i2c.c b/drivers/i2c/tegra_i2c.c
index 65b3734348b..96a436a8dc1 100644
--- a/drivers/i2c/tegra_i2c.c
+++ b/drivers/i2c/tegra_i2c.c
@@ -21,6 +21,7 @@
 #include <asm/arch-tegra/tegra_i2c.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/printk.h>
 
 enum i2c_type {
 	TYPE_114,
diff --git a/drivers/misc/sifive-otp.c b/drivers/misc/sifive-otp.c
index 92f08dde011..0a4fa67f335 100644
--- a/drivers/misc/sifive-otp.c
+++ b/drivers/misc/sifive-otp.c
@@ -24,6 +24,7 @@
 #include <linux/delay.h>
 #include <linux/io.h>
 #include <misc.h>
+#include <linux/printk.h>
 
 #define BYTES_PER_FUSE		4
 
diff --git a/drivers/misc/tegra186_bpmp.c b/drivers/misc/tegra186_bpmp.c
index 1f4437226e7..73cc2666e49 100644
--- a/drivers/misc/tegra186_bpmp.c
+++ b/drivers/misc/tegra186_bpmp.c
@@ -17,6 +17,7 @@
 #include <asm/arch-tegra/ivc.h>
 #include <linux/bitops.h>
 #include <linux/err.h>
+#include <linux/printk.h>
 
 #define BPMP_IVC_FRAME_COUNT 1
 #define BPMP_IVC_FRAME_SIZE 128
diff --git a/drivers/mmc/exynos_dw_mmc.c b/drivers/mmc/exynos_dw_mmc.c
index 94af116d10c..499fafe8f5e 100644
--- a/drivers/mmc/exynos_dw_mmc.c
+++ b/drivers/mmc/exynos_dw_mmc.c
@@ -16,6 +16,7 @@
 #include <asm/arch/pinmux.h>
 #include <asm/arch/power.h>
 #include <asm/gpio.h>
+#include <linux/printk.h>
 
 #define	DWMMC_MAX_CH_NUM		4
 #define	DWMMC_MAX_FREQ			52000000
diff --git a/drivers/mmc/fsl_esdhc_imx.c b/drivers/mmc/fsl_esdhc_imx.c
index 81940bdf201..a2102449bb8 100644
--- a/drivers/mmc/fsl_esdhc_imx.c
+++ b/drivers/mmc/fsl_esdhc_imx.c
@@ -26,6 +26,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/printk.h>
 #include <power/regulator.h>
 #include <malloc.h>
 #include <fsl_esdhc_imx.h>
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index d79cdef62ed..2899986fcf1 100644
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@ -19,6 +19,7 @@
 #include <part.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 #include <power/regulator.h>
 #include <malloc.h>
 #include <memalign.h>
diff --git a/drivers/mmc/mtk-sd.c b/drivers/mmc/mtk-sd.c
index bd1fb09d1c9..2fe33e07c18 100644
--- a/drivers/mmc/mtk-sd.c
+++ b/drivers/mmc/mtk-sd.c
@@ -20,6 +20,7 @@
 #include <linux/bitops.h>
 #include <linux/io.h>
 #include <linux/iopoll.h>
+#include <linux/printk.h>
 
 /* MSDC_CFG */
 #define MSDC_CFG_HS400_CK_MODE_EXT	BIT(22)
diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c
index f4eb655f6ec..210087c0af9 100644
--- a/drivers/mmc/sdhci.c
+++ b/drivers/mmc/sdhci.c
@@ -21,6 +21,7 @@
 #include <linux/delay.h>
 #include <linux/dma-mapping.h>
 #include <phys2bus.h>
+#include <linux/printk.h>
 
 static void sdhci_reset(struct sdhci_host *host, u8 mask)
 {
diff --git a/drivers/mmc/sti_sdhci.c b/drivers/mmc/sti_sdhci.c
index db0b566a8b7..11ae392734c 100644
--- a/drivers/mmc/sti_sdhci.c
+++ b/drivers/mmc/sti_sdhci.c
@@ -12,6 +12,7 @@
 #include <sdhci.h>
 #include <asm/arch/sdhci.h>
 #include <asm/global_data.h>
+#include <linux/printk.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/mmc/stm32_sdmmc2.c b/drivers/mmc/stm32_sdmmc2.c
index 6d503562171..4736cae7689 100644
--- a/drivers/mmc/stm32_sdmmc2.c
+++ b/drivers/mmc/stm32_sdmmc2.c
@@ -22,6 +22,7 @@
 #include <asm/gpio.h>
 #include <linux/iopoll.h>
 #include <watchdog.h>
+#include <linux/printk.h>
 
 struct stm32_sdmmc2_plat {
 	struct mmc_config cfg;
diff --git a/drivers/mmc/xenon_sdhci.c b/drivers/mmc/xenon_sdhci.c
index c3ea9d7f532..50c5b194cad 100644
--- a/drivers/mmc/xenon_sdhci.c
+++ b/drivers/mmc/xenon_sdhci.c
@@ -23,6 +23,7 @@
 #include <linux/libfdt.h>
 #include <malloc.h>
 #include <sdhci.h>
+#include <linux/printk.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/mtd/mtdconcat.c b/drivers/mtd/mtdconcat.c
index 684bc949985..1baaa6e9475 100644
--- a/drivers/mtd/mtdconcat.c
+++ b/drivers/mtd/mtdconcat.c
@@ -23,6 +23,7 @@
 #include <div64.h>
 #include <linux/bug.h>
 #include <linux/compat.h>
+#include <linux/printk.h>
 #endif
 
 #include <linux/mtd/mtd.h>
diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c
index 1a4dec34d93..6b0ea195312 100644
--- a/drivers/mtd/mtdcore.c
+++ b/drivers/mtd/mtdcore.c
@@ -32,6 +32,7 @@
 #include <linux/bug.h>
 #include <linux/err.h>
 #include <ubi_uboot.h>
+#include <linux/printk.h>
 #endif
 
 #include <linux/log2.h>
diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c
index d064ac30480..cad11805690 100644
--- a/drivers/mtd/mtdpart.c
+++ b/drivers/mtd/mtdpart.c
@@ -25,6 +25,7 @@
 #include <linux/errno.h>
 #include <linux/compat.h>
 #include <ubi_uboot.h>
+#include <linux/printk.h>
 
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
diff --git a/drivers/mtd/nand/bbt.c b/drivers/mtd/nand/bbt.c
index 84d60b86521..809ccf644d8 100644
--- a/drivers/mtd/nand/bbt.c
+++ b/drivers/mtd/nand/bbt.c
@@ -16,6 +16,7 @@
 #ifndef __UBOOT__
 #include <linux/slab.h>
 #endif
+#include <linux/printk.h>
 
 /**
  * nanddev_bbt_init() - Initialize the BBT (Bad Block Table)
diff --git a/drivers/mtd/nand/core.c b/drivers/mtd/nand/core.c
index 6fbd24ba749..45d827f686c 100644
--- a/drivers/mtd/nand/core.c
+++ b/drivers/mtd/nand/core.c
@@ -16,6 +16,7 @@
 #endif
 #include <linux/bitops.h>
 #include <linux/mtd/nand.h>
+#include <linux/printk.h>
 
 /**
  * nanddev_isbad() - Check if a block is bad
diff --git a/drivers/mtd/nand/raw/arasan_nfc.c b/drivers/mtd/nand/raw/arasan_nfc.c
index 6c1d64054c6..9733e666676 100644
--- a/drivers/mtd/nand/raw/arasan_nfc.c
+++ b/drivers/mtd/nand/raw/arasan_nfc.c
@@ -18,6 +18,7 @@
 #include <asm/arch/sys_proto.h>
 #include <dm.h>
 #include <nand.h>
+#include <linux/printk.h>
 
 struct nand_config {
 	u32 page;
diff --git a/drivers/mtd/nand/raw/atmel_nand.c b/drivers/mtd/nand/raw/atmel_nand.c
index 5e95901e275..599bdfc0d6d 100644
--- a/drivers/mtd/nand/raw/atmel_nand.c
+++ b/drivers/mtd/nand/raw/atmel_nand.c
@@ -19,6 +19,7 @@
 #include <linux/bitops.h>
 #include <linux/bug.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 
 #include <malloc.h>
 #include <nand.h>
diff --git a/drivers/mtd/nand/raw/brcmnand/bcm63158_nand.c b/drivers/mtd/nand/raw/brcmnand/bcm63158_nand.c
index 6313403cd65..89c981096ba 100644
--- a/drivers/mtd/nand/raw/brcmnand/bcm63158_nand.c
+++ b/drivers/mtd/nand/raw/brcmnand/bcm63158_nand.c
@@ -10,6 +10,7 @@
 #include <linux/io.h>
 #include <linux/ioport.h>
 #include <dm.h>
+#include <linux/printk.h>
 
 #include "brcmnand.h"
 
diff --git a/drivers/mtd/nand/raw/brcmnand/bcm6368_nand.c b/drivers/mtd/nand/raw/brcmnand/bcm6368_nand.c
index cd4b24a51a1..3223d9aacff 100644
--- a/drivers/mtd/nand/raw/brcmnand/bcm6368_nand.c
+++ b/drivers/mtd/nand/raw/brcmnand/bcm6368_nand.c
@@ -9,6 +9,7 @@
 #include <linux/io.h>
 #include <linux/ioport.h>
 #include <dm.h>
+#include <linux/printk.h>
 
 #include "brcmnand.h"
 
diff --git a/drivers/mtd/nand/raw/brcmnand/bcm68360_nand.c b/drivers/mtd/nand/raw/brcmnand/bcm68360_nand.c
index aa042bef158..b8e7b6b2921 100644
--- a/drivers/mtd/nand/raw/brcmnand/bcm68360_nand.c
+++ b/drivers/mtd/nand/raw/brcmnand/bcm68360_nand.c
@@ -9,6 +9,7 @@
 #include <linux/io.h>
 #include <linux/ioport.h>
 #include <dm.h>
+#include <linux/printk.h>
 
 #include "brcmnand.h"
 
diff --git a/drivers/mtd/nand/raw/brcmnand/bcm6838_nand.c b/drivers/mtd/nand/raw/brcmnand/bcm6838_nand.c
index 07884550906..071b16c217a 100644
--- a/drivers/mtd/nand/raw/brcmnand/bcm6838_nand.c
+++ b/drivers/mtd/nand/raw/brcmnand/bcm6838_nand.c
@@ -10,6 +10,7 @@
 #include <linux/io.h>
 #include <linux/ioport.h>
 #include <dm.h>
+#include <linux/printk.h>
 
 #include "brcmnand.h"
 
diff --git a/drivers/mtd/nand/raw/brcmnand/bcm6858_nand.c b/drivers/mtd/nand/raw/brcmnand/bcm6858_nand.c
index 818eae8a7c6..e9d23377d47 100644
--- a/drivers/mtd/nand/raw/brcmnand/bcm6858_nand.c
+++ b/drivers/mtd/nand/raw/brcmnand/bcm6858_nand.c
@@ -10,6 +10,7 @@
 #include <linux/io.h>
 #include <linux/ioport.h>
 #include <dm.h>
+#include <linux/printk.h>
 
 #include "brcmnand.h"
 
diff --git a/drivers/mtd/nand/raw/davinci_nand.c b/drivers/mtd/nand/raw/davinci_nand.c
index 4416b8fa1e6..f64de80bf2b 100644
--- a/drivers/mtd/nand/raw/davinci_nand.c
+++ b/drivers/mtd/nand/raw/davinci_nand.c
@@ -34,6 +34,7 @@
 #include <nand.h>
 #include <dm/uclass.h>
 #include <asm/ti-common/davinci_nand.h>
+#include <linux/printk.h>
 
 /* Definitions for 4-bit hardware ECC */
 #define NAND_TIMEOUT			10240
diff --git a/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c b/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c
index b3232ed59d5..588fb010ee8 100644
--- a/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c
+++ b/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c
@@ -27,6 +27,7 @@
 #include <nand.h>
 #include <asm/arch/clk.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/printk.h>
 
 /*
  * MLC NAND controller registers.
diff --git a/drivers/mtd/nand/raw/lpc32xx_nand_slc.c b/drivers/mtd/nand/raw/lpc32xx_nand_slc.c
index 9cca3c55cc0..5e8e76c3e5f 100644
--- a/drivers/mtd/nand/raw/lpc32xx_nand_slc.c
+++ b/drivers/mtd/nand/raw/lpc32xx_nand_slc.c
@@ -22,6 +22,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/dma.h>
 #include <asm/arch/cpu.h>
+#include <linux/printk.h>
 
 struct lpc32xx_nand_slc_regs {
 	u32 data;
diff --git a/drivers/mtd/nand/raw/mxc_nand.c b/drivers/mtd/nand/raw/mxc_nand.c
index 59cef205754..c5e56c05873 100644
--- a/drivers/mtd/nand/raw/mxc_nand.c
+++ b/drivers/mtd/nand/raw/mxc_nand.c
@@ -15,6 +15,7 @@
 	defined(CONFIG_MX51) || defined(CONFIG_MX53)
 #include <asm/arch/imx-regs.h>
 #endif
+#include <linux/printk.h>
 #include "mxc_nand.h"
 
 #define DRIVER_NAME "mxc_nand"
diff --git a/drivers/mtd/nand/raw/nand_base.c b/drivers/mtd/nand/raw/nand_base.c
index ebb40f93325..7cd1e133c22 100644
--- a/drivers/mtd/nand/raw/nand_base.c
+++ b/drivers/mtd/nand/raw/nand_base.c
@@ -51,6 +51,7 @@
 #endif
 #include <asm/io.h>
 #include <linux/errno.h>
+#include <linux/printk.h>
 
 /* Define default oob placement schemes for large and small page devices */
 #ifndef CONFIG_SYS_NAND_DRIVER_ECC_LAYOUT
diff --git a/drivers/mtd/nand/raw/nand_bbt.c b/drivers/mtd/nand/raw/nand_bbt.c
index 911472e91e1..4f3c3223ca7 100644
--- a/drivers/mtd/nand/raw/nand_bbt.c
+++ b/drivers/mtd/nand/raw/nand_bbt.c
@@ -67,6 +67,7 @@
 #include <linux/mtd/bbm.h>
 #include <linux/mtd/rawnand.h>
 #include <linux/bitops.h>
+#include <linux/printk.h>
 #include <linux/string.h>
 
 #define BBT_BLOCK_GOOD		0x00
diff --git a/drivers/mtd/nand/raw/nand_bch.c b/drivers/mtd/nand/raw/nand_bch.c
index 734d1c6204e..bb48ebbb96c 100644
--- a/drivers/mtd/nand/raw/nand_bch.c
+++ b/drivers/mtd/nand/raw/nand_bch.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <log.h>
 #include <dm/devres.h>
+#include <linux/printk.h>
 /*#include <asm/io.h>*/
 #include <linux/types.h>
 
diff --git a/drivers/mtd/nand/raw/pxa3xx_nand.c b/drivers/mtd/nand/raw/pxa3xx_nand.c
index 701bfead773..224db72087b 100644
--- a/drivers/mtd/nand/raw/pxa3xx_nand.c
+++ b/drivers/mtd/nand/raw/pxa3xx_nand.c
@@ -22,6 +22,7 @@
 #include <asm/arch/cpu.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/rawnand.h>
+#include <linux/printk.h>
 #include <linux/types.h>
 
 #include "pxa3xx_nand.h"
diff --git a/drivers/mtd/nand/raw/stm32_fmc2_nand.c b/drivers/mtd/nand/raw/stm32_fmc2_nand.c
index 3306bd8ac94..422367a2650 100644
--- a/drivers/mtd/nand/raw/stm32_fmc2_nand.c
+++ b/drivers/mtd/nand/raw/stm32_fmc2_nand.c
@@ -15,6 +15,7 @@
 #include <linux/err.h>
 #include <linux/iopoll.h>
 #include <linux/ioport.h>
+#include <linux/printk.h>
 
 /* Bad block marker length */
 #define FMC2_BBM_LEN			2
diff --git a/drivers/mtd/nand/raw/sunxi_nand.c b/drivers/mtd/nand/raw/sunxi_nand.c
index 6d02d56aeb6..2946f94b6df 100644
--- a/drivers/mtd/nand/raw/sunxi_nand.c
+++ b/drivers/mtd/nand/raw/sunxi_nand.c
@@ -35,6 +35,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/printk.h>
 
 #include <linux/kernel.h>
 #include <linux/mtd/mtd.h>
diff --git a/drivers/mtd/nand/raw/tegra_nand.c b/drivers/mtd/nand/raw/tegra_nand.c
index dd14c34738a..a28f830e8cd 100644
--- a/drivers/mtd/nand/raw/tegra_nand.c
+++ b/drivers/mtd/nand/raw/tegra_nand.c
@@ -23,6 +23,7 @@
 #include <fdtdec.h>
 #include <bouncebuf.h>
 #include <dm.h>
+#include <linux/printk.h>
 #include "tegra_nand.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/mtd/nand/raw/vf610_nfc.c b/drivers/mtd/nand/raw/vf610_nfc.c
index 52c8a94778c..bee273b1a64 100644
--- a/drivers/mtd/nand/raw/vf610_nfc.c
+++ b/drivers/mtd/nand/raw/vf610_nfc.c
@@ -24,6 +24,7 @@
 #include <common.h>
 #include <malloc.h>
 #include <dm/device_compat.h>
+#include <linux/printk.h>
 
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/rawnand.h>
diff --git a/drivers/mtd/nand/raw/zynq_nand.c b/drivers/mtd/nand/raw/zynq_nand.c
index fa594552109..37a6835060c 100644
--- a/drivers/mtd/nand/raw/zynq_nand.c
+++ b/drivers/mtd/nand/raw/zynq_nand.c
@@ -21,6 +21,7 @@
 #include <asm/arch/hardware.h>
 #include <asm/arch/sys_proto.h>
 #include <dm.h>
+#include <linux/printk.h>
 
 /* The NAND flash driver defines */
 #define ZYNQ_NAND_CMD_PHASE		1
diff --git a/drivers/mtd/nand/spi/core.c b/drivers/mtd/nand/spi/core.c
index 93371fdde07..63248f648a1 100644
--- a/drivers/mtd/nand/spi/core.c
+++ b/drivers/mtd/nand/spi/core.c
@@ -29,6 +29,7 @@
 #include <linux/bitops.h>
 #include <linux/bug.h>
 #include <linux/mtd/spinand.h>
+#include <linux/printk.h>
 #endif
 
 /* SPI NAND index visible in MTD names */
diff --git a/drivers/mtd/onenand/onenand_base.c b/drivers/mtd/onenand/onenand_base.c
index 36daef01aec..ad9b61f396f 100644
--- a/drivers/mtd/onenand/onenand_base.c
+++ b/drivers/mtd/onenand/onenand_base.c
@@ -26,6 +26,7 @@
 #include <linux/bitops.h>
 #include <linux/compat.h>
 #include <linux/mtd/mtd.h>
+#include <linux/printk.h>
 #include "linux/mtd/flashchip.h"
 #include <linux/mtd/onenand.h>
 
diff --git a/drivers/mtd/onenand/onenand_bbt.c b/drivers/mtd/onenand/onenand_bbt.c
index eca9edff603..cc1e449f4a7 100644
--- a/drivers/mtd/onenand/onenand_bbt.c
+++ b/drivers/mtd/onenand/onenand_bbt.c
@@ -20,6 +20,7 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/onenand.h>
 #include <malloc.h>
+#include <linux/printk.h>
 
 #include <linux/errno.h>
 
diff --git a/drivers/mtd/onenand/samsung.c b/drivers/mtd/onenand/samsung.c
index 657abaab8f4..c415e5149a0 100644
--- a/drivers/mtd/onenand/samsung.c
+++ b/drivers/mtd/onenand/samsung.c
@@ -16,6 +16,7 @@
 #include <linux/mtd/onenand.h>
 #include <linux/mtd/flashchip.h>
 #include <linux/mtd/samsung_onenand.h>
+#include <linux/printk.h>
 
 #include <asm/io.h>
 #include <linux/errno.h>
diff --git a/drivers/mtd/spi/spi-nor-core.c b/drivers/mtd/spi/spi-nor-core.c
index 36478a61fd9..da2777f777e 100644
--- a/drivers/mtd/spi/spi-nor-core.c
+++ b/drivers/mtd/spi/spi-nor-core.c
@@ -19,6 +19,7 @@
 #include <linux/errno.h>
 #include <linux/log2.h>
 #include <linux/math64.h>
+#include <linux/printk.h>
 #include <linux/sizes.h>
 
 #include <linux/mtd/mtd.h>
diff --git a/drivers/mtd/spi/spi-nor-tiny.c b/drivers/mtd/spi/spi-nor-tiny.c
index 9f676c649d8..a2c8c30ed7b 100644
--- a/drivers/mtd/spi/spi-nor-tiny.c
+++ b/drivers/mtd/spi/spi-nor-tiny.c
@@ -16,6 +16,7 @@
 #include <linux/errno.h>
 #include <linux/log2.h>
 #include <linux/math64.h>
+#include <linux/printk.h>
 #include <linux/sizes.h>
 
 #include <linux/mtd/mtd.h>
diff --git a/drivers/mtd/ubi/attach.c b/drivers/mtd/ubi/attach.c
index e488caa5547..2ef8fde3d32 100644
--- a/drivers/mtd/ubi/attach.c
+++ b/drivers/mtd/ubi/attach.c
@@ -81,6 +81,7 @@
 #include <div64.h>
 #include <linux/bug.h>
 #include <linux/err.h>
+#include <linux/printk.h>
 #endif
 
 #include <linux/math64.h>
diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c
index 61e38ba1ab7..f4e72ae7e56 100644
--- a/drivers/mtd/ubi/build.c
+++ b/drivers/mtd/ubi/build.c
@@ -33,6 +33,7 @@
 #else
 #include <linux/bug.h>
 #include <linux/log2.h>
+#include <linux/printk.h>
 #endif
 #include <linux/err.h>
 #include <ubi_uboot.h>
diff --git a/drivers/mtd/ubi/debug.c b/drivers/mtd/ubi/debug.c
index d2b7ca5e33f..b119cb6e9c0 100644
--- a/drivers/mtd/ubi/debug.c
+++ b/drivers/mtd/ubi/debug.c
@@ -8,6 +8,7 @@
 #include <hexdump.h>
 #include <malloc.h>
 #include <ubi_uboot.h>
+#include <linux/printk.h>
 #include "ubi.h"
 #ifndef __UBOOT__
 #include <linux/debugfs.h>
diff --git a/drivers/mtd/ubi/debug.h b/drivers/mtd/ubi/debug.h
index 2c2faaf1b4d..c27d0ead427 100644
--- a/drivers/mtd/ubi/debug.h
+++ b/drivers/mtd/ubi/debug.h
@@ -17,6 +17,7 @@ void ubi_dump_vid_hdr(const struct ubi_vid_hdr *vid_hdr);
 #endif
 
 #include <hexdump.h>
+#include <linux/printk.h>
 
 #ifndef __UBOOT__
 #define ubi_assert(expr)  do {                                               \
diff --git a/drivers/mtd/ubi/ubi.h b/drivers/mtd/ubi/ubi.h
index f44960186bb..175988899c3 100644
--- a/drivers/mtd/ubi/ubi.h
+++ b/drivers/mtd/ubi/ubi.h
@@ -28,6 +28,7 @@
 #include <asm/pgtable.h>
 #else
 #include <ubi_uboot.h>
+#include <linux/printk.h>
 #endif
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/ubi.h>
diff --git a/drivers/net/bcm-sf2-eth-gmac.c b/drivers/net/bcm-sf2-eth-gmac.c
index 3caf0f33109..cbe1e85222f 100644
--- a/drivers/net/bcm-sf2-eth-gmac.c
+++ b/drivers/net/bcm-sf2-eth-gmac.c
@@ -6,6 +6,7 @@
 #ifdef BCM_GMAC_DEBUG
 #ifndef DEBUG
 #define DEBUG
+#include <linux/printk.h>
 #endif
 #endif
 
diff --git a/drivers/net/bcm-sf2-eth.c b/drivers/net/bcm-sf2-eth.c
index c862c141461..040b72e6db0 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 <linux/delay.h>
+#include <linux/printk.h>
 
 #include <phy.h>
 #include <miiphy.h>
diff --git a/drivers/net/bcm6348-eth.c b/drivers/net/bcm6348-eth.c
index 9ddc0f938f2..8849195f248 100644
--- a/drivers/net/bcm6348-eth.c
+++ b/drivers/net/bcm6348-eth.c
@@ -18,6 +18,7 @@
 #include <reset.h>
 #include <wait_bit.h>
 #include <asm/io.h>
+#include <linux/printk.h>
 
 #define ETH_RX_DESC			PKTBUFSRX
 #define ETH_MAX_MTU_SIZE		1518
diff --git a/drivers/net/bcm6368-eth.c b/drivers/net/bcm6368-eth.c
index 648fafd3e09..f626412ef00 100644
--- a/drivers/net/bcm6368-eth.c
+++ b/drivers/net/bcm6368-eth.c
@@ -19,6 +19,7 @@
 #include <asm/io.h>
 #include <dm/device_compat.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 
 #define ETH_PORT_STR			"brcm,enetsw-port"
 
diff --git a/drivers/net/designware.c b/drivers/net/designware.c
index 1c0e8294078..0ab1a12d762 100644
--- a/drivers/net/designware.c
+++ b/drivers/net/designware.c
@@ -27,6 +27,7 @@
 #include <linux/err.h>
 #include <linux/kernel.h>
 #include <asm/io.h>
+#include <linux/printk.h>
 #include <power/regulator.h>
 #include "designware.h"
 
diff --git a/drivers/net/dwc_eth_qos.c b/drivers/net/dwc_eth_qos.c
index 906ccb10c43..299d1ad5eb2 100644
--- a/drivers/net/dwc_eth_qos.c
+++ b/drivers/net/dwc_eth_qos.c
@@ -51,6 +51,7 @@
 #endif
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 
 /* Core registers */
 
diff --git a/drivers/net/ep93xx_eth.c b/drivers/net/ep93xx_eth.c
index 0218349b045..d1d881d6bd9 100644
--- a/drivers/net/ep93xx_eth.c
+++ b/drivers/net/ep93xx_eth.c
@@ -25,6 +25,7 @@
 #include <malloc.h>
 #include <miiphy.h>
 #include <linux/bug.h>
+#include <linux/printk.h>
 #include <linux/types.h>
 #include "ep93xx_eth.h"
 
diff --git a/drivers/net/fsl-mc/dpio/qbman_sys.h b/drivers/net/fsl-mc/dpio/qbman_sys.h
index 8be38e11a84..fb760b94f85 100644
--- a/drivers/net/fsl-mc/dpio/qbman_sys.h
+++ b/drivers/net/fsl-mc/dpio/qbman_sys.h
@@ -21,6 +21,7 @@
 /* Trace the 3 different classes of read/write access to QBMan. #undef as
  * required. */
 #include <linux/bug.h>
+#include <linux/printk.h>
 #undef QBMAN_CCSR_TRACE
 #undef QBMAN_CINH_TRACE
 #undef QBMAN_CENA_TRACE
diff --git a/drivers/net/ftgmac100.c b/drivers/net/ftgmac100.c
index 5676a5b3ba9..74fea1e45fd 100644
--- a/drivers/net/ftgmac100.c
+++ b/drivers/net/ftgmac100.c
@@ -25,6 +25,7 @@
 #include <linux/bitops.h>
 #include <linux/io.h>
 #include <linux/iopoll.h>
+#include <linux/printk.h>
 
 #include "ftgmac100.h"
 
diff --git a/drivers/net/mscc_eswitch/jr2_switch.c b/drivers/net/mscc_eswitch/jr2_switch.c
index 1c9a401de81..97b2b081efb 100644
--- a/drivers/net/mscc_eswitch/jr2_switch.c
+++ b/drivers/net/mscc_eswitch/jr2_switch.c
@@ -17,6 +17,7 @@
 #include <miiphy.h>
 #include <net.h>
 #include <wait_bit.h>
+#include <linux/printk.h>
 
 #include <dt-bindings/mscc/jr2_data.h>
 #include "mscc_xfer.h"
diff --git a/drivers/net/mscc_eswitch/ocelot_switch.c b/drivers/net/mscc_eswitch/ocelot_switch.c
index 2a48dc6a190..bdadaa13c72 100644
--- a/drivers/net/mscc_eswitch/ocelot_switch.c
+++ b/drivers/net/mscc_eswitch/ocelot_switch.c
@@ -17,6 +17,7 @@
 #include <miiphy.h>
 #include <net.h>
 #include <wait_bit.h>
+#include <linux/printk.h>
 
 #include "mscc_xfer.h"
 #include "mscc_mac_table.h"
diff --git a/drivers/net/mscc_eswitch/serval_switch.c b/drivers/net/mscc_eswitch/serval_switch.c
index d8ee1a76989..bbced95f7e4 100644
--- a/drivers/net/mscc_eswitch/serval_switch.c
+++ b/drivers/net/mscc_eswitch/serval_switch.c
@@ -17,6 +17,7 @@
 #include <miiphy.h>
 #include <net.h>
 #include <wait_bit.h>
+#include <linux/printk.h>
 
 #include "mscc_xfer.h"
 #include "mscc_mac_table.h"
diff --git a/drivers/net/mscc_eswitch/servalt_switch.c b/drivers/net/mscc_eswitch/servalt_switch.c
index 1cf2273142b..c8aaf7d4897 100644
--- a/drivers/net/mscc_eswitch/servalt_switch.c
+++ b/drivers/net/mscc_eswitch/servalt_switch.c
@@ -16,6 +16,7 @@
 #include <miiphy.h>
 #include <net.h>
 #include <wait_bit.h>
+#include <linux/printk.h>
 
 #include "mscc_xfer.h"
 #include "mscc_miim.h"
diff --git a/drivers/net/mt7628-eth.c b/drivers/net/mt7628-eth.c
index 64f1c8c828d..8b278c62ba7 100644
--- a/drivers/net/mt7628-eth.c
+++ b/drivers/net/mt7628-eth.c
@@ -28,6 +28,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/printk.h>
 
 /* Ethernet frame engine register */
 #define PDMA_RELATED		0x0800
diff --git a/drivers/net/mtk_eth.c b/drivers/net/mtk_eth.c
index 5183c08e14c..24a18ce9687 100644
--- a/drivers/net/mtk_eth.c
+++ b/drivers/net/mtk_eth.c
@@ -26,6 +26,7 @@
 #include <linux/ioport.h>
 #include <linux/mdio.h>
 #include <linux/mii.h>
+#include <linux/printk.h>
 
 #include "mtk_eth.h"
 
diff --git a/drivers/net/mvmdio.c b/drivers/net/mvmdio.c
index a8e93e80fc0..deaba8aee4f 100644
--- a/drivers/net/mvmdio.c
+++ b/drivers/net/mvmdio.c
@@ -13,6 +13,7 @@
 #include <asm/io.h>
 #include <wait_bit.h>
 #include <linux/bitops.h>
+#include <linux/printk.h>
 
 #define MVMDIO_SMI_DATA_SHIFT		0
 #define MVMDIO_SMI_PHY_ADDR_SHIFT	16
diff --git a/drivers/net/phy/dp83867.c b/drivers/net/phy/dp83867.c
index eada4541c9c..e4081244f21 100644
--- a/drivers/net/phy/dp83867.c
+++ b/drivers/net/phy/dp83867.c
@@ -10,6 +10,7 @@
 #include <linux/bitops.h>
 #include <linux/compat.h>
 #include <malloc.h>
+#include <linux/printk.h>
 
 #include <dm.h>
 #include <dt-bindings/net/ti-dp83867.h>
diff --git a/drivers/net/phy/mscc.c b/drivers/net/phy/mscc.c
index 709979f48c9..264afcd1a57 100644
--- a/drivers/net/phy/mscc.c
+++ b/drivers/net/phy/mscc.c
@@ -15,6 +15,7 @@
 #include <time.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 
 /* Microsemi PHY ID's */
 #define PHY_ID_VSC8530                  0x00070560
diff --git a/drivers/net/rtl8169.c b/drivers/net/rtl8169.c
index 2e1304e44d1..3f6805791f4 100644
--- a/drivers/net/rtl8169.c
+++ b/drivers/net/rtl8169.c
@@ -54,6 +54,7 @@
 #include <asm/io.h>
 #include <pci.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 
 #undef DEBUG_RTL8169
 #undef DEBUG_RTL8169_TX
diff --git a/drivers/net/sni_ave.c b/drivers/net/sni_ave.c
index c11a1c443ee..6e228da2984 100644
--- a/drivers/net/sni_ave.c
+++ b/drivers/net/sni_ave.c
@@ -23,6 +23,7 @@
 #include <linux/err.h>
 #include <linux/io.h>
 #include <linux/iopoll.h>
+#include <linux/printk.h>
 
 #define AVE_GRST_DELAY_MSEC	40
 #define AVE_MIN_XMITSIZE	60
diff --git a/drivers/net/ti/am65-cpsw-nuss.c b/drivers/net/ti/am65-cpsw-nuss.c
index 971bdcdfda9..08cd26b3c4b 100644
--- a/drivers/net/ti/am65-cpsw-nuss.c
+++ b/drivers/net/ti/am65-cpsw-nuss.c
@@ -22,6 +22,7 @@
 #include <phy.h>
 #include <power-domain.h>
 #include <linux/bitops.h>
+#include <linux/printk.h>
 #include <linux/soc/ti/ti-udma.h>
 
 #include "cpsw_mdio.h"
diff --git a/drivers/net/ti/cpsw-common.c b/drivers/net/ti/cpsw-common.c
index 3140f2515fb..d5428274d19 100644
--- a/drivers/net/ti/cpsw-common.c
+++ b/drivers/net/ti/cpsw-common.c
@@ -12,6 +12,7 @@
 #include <asm/io.h>
 #include <cpsw.h>
 #include <dm/device_compat.h>
+#include <linux/printk.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/net/ti/cpsw.c b/drivers/net/ti/cpsw.c
index d6fefe53068..7521deaaa97 100644
--- a/drivers/net/ti/cpsw.c
+++ b/drivers/net/ti/cpsw.c
@@ -24,6 +24,7 @@
 #include <phy.h>
 #include <asm/arch/cpu.h>
 #include <dm.h>
+#include <linux/printk.h>
 
 #include "cpsw_mdio.h"
 
diff --git a/drivers/net/ti/keystone_net.c b/drivers/net/ti/keystone_net.c
index c25902a7032..5e44215e223 100644
--- a/drivers/net/ti/keystone_net.c
+++ b/drivers/net/ti/keystone_net.c
@@ -10,6 +10,7 @@
 #include <console.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 
 #include <dm.h>
 #include <dm/lists.h>
diff --git a/drivers/pci/pci-uclass.c b/drivers/pci/pci-uclass.c
index 380726297c5..b2f9e0638bd 100644
--- a/drivers/pci/pci-uclass.c
+++ b/drivers/pci/pci-uclass.c
@@ -19,6 +19,7 @@
 #include <asm/fsp/fsp_support.h>
 #endif
 #include <linux/delay.h>
+#include <linux/printk.h>
 #include "pci_internal.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/pci/pci_mvebu.c b/drivers/pci/pci_mvebu.c
index 167fe026e8b..95ed1730358 100644
--- a/drivers/pci/pci_mvebu.c
+++ b/drivers/pci/pci_mvebu.c
@@ -25,6 +25,7 @@
 #include <linux/errno.h>
 #include <linux/ioport.h>
 #include <linux/mbus.h>
+#include <linux/printk.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/pci/pci_tegra.c b/drivers/pci/pci_tegra.c
index 82f5c59d917..d15fabd9226 100644
--- a/drivers/pci/pci_tegra.c
+++ b/drivers/pci/pci_tegra.c
@@ -22,6 +22,7 @@
 #include <power-domain.h>
 #include <reset.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 
 #include <asm/io.h>
 #include <asm/gpio.h>
diff --git a/drivers/pci/pcie_ecam_generic.c b/drivers/pci/pcie_ecam_generic.c
index 354a1454a9f..6e18d5ba552 100644
--- a/drivers/pci/pcie_ecam_generic.c
+++ b/drivers/pci/pcie_ecam_generic.c
@@ -11,6 +11,7 @@
 #include <dm.h>
 #include <pci.h>
 #include <asm/global_data.h>
+#include <linux/printk.h>
 
 #include <asm/io.h>
 
diff --git a/drivers/pci/pcie_fsl.c b/drivers/pci/pcie_fsl.c
index e431ef211ed..3ba7d5b7a01 100644
--- a/drivers/pci/pcie_fsl.c
+++ b/drivers/pci/pcie_fsl.c
@@ -16,6 +16,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 #include "pcie_fsl.h"
 #include <dm/device_compat.h>
 
diff --git a/drivers/pci/pcie_mediatek.c b/drivers/pci/pcie_mediatek.c
index 6e6375cec09..a94ab8310c6 100644
--- a/drivers/pci/pcie_mediatek.c
+++ b/drivers/pci/pcie_mediatek.c
@@ -20,6 +20,7 @@
 #include <linux/bitops.h>
 #include <linux/iopoll.h>
 #include <linux/list.h>
+#include <linux/printk.h>
 
 /* PCIe shared registers */
 #define PCIE_SYS_CFG		0x00
diff --git a/drivers/pci/pcie_phytium.c b/drivers/pci/pcie_phytium.c
index 35ca104300b..926e7b33a86 100644
--- a/drivers/pci/pcie_phytium.c
+++ b/drivers/pci/pcie_phytium.c
@@ -12,6 +12,7 @@
 #include <pci.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <linux/printk.h>
 
 /**
  * struct phytium_pcie - phytium PCIe controller state
diff --git a/drivers/pci/pcie_xilinx.c b/drivers/pci/pcie_xilinx.c
index 88660a9957a..600c69e20cf 100644
--- a/drivers/pci/pcie_xilinx.c
+++ b/drivers/pci/pcie_xilinx.c
@@ -10,6 +10,7 @@
 #include <pci.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
+#include <linux/printk.h>
 
 #include <asm/io.h>
 
diff --git a/drivers/phy/keystone-usb-phy.c b/drivers/phy/keystone-usb-phy.c
index 9faf5010033..27e1d35fc12 100644
--- a/drivers/phy/keystone-usb-phy.c
+++ b/drivers/phy/keystone-usb-phy.c
@@ -13,6 +13,7 @@
 #include <asm/arch/psc_defs.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 
 /* USB PHY control register offsets */
 #define USB_PHY_CTL_UTMI		0x0000
diff --git a/drivers/phy/marvell/comphy_cp110.c b/drivers/phy/marvell/comphy_cp110.c
index 484b28745e0..35da55c4fee 100644
--- a/drivers/phy/marvell/comphy_cp110.c
+++ b/drivers/phy/marvell/comphy_cp110.c
@@ -11,6 +11,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 
 #include "comphy_core.h"
 #include "comphy_hpipe.h"
diff --git a/drivers/phy/meson-g12a-usb2.c b/drivers/phy/meson-g12a-usb2.c
index a1e62197586..734c79b78aa 100644
--- a/drivers/phy/meson-g12a-usb2.c
+++ b/drivers/phy/meson-g12a-usb2.c
@@ -17,6 +17,7 @@
 #include <generic-phy.h>
 #include <regmap.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 #include <power/regulator.h>
 #include <reset.h>
 #include <clk.h>
diff --git a/drivers/phy/meson-g12a-usb3-pcie.c b/drivers/phy/meson-g12a-usb3-pcie.c
index 4e9696fd590..dc5dd62381f 100644
--- a/drivers/phy/meson-g12a-usb3-pcie.c
+++ b/drivers/phy/meson-g12a-usb3-pcie.c
@@ -18,6 +18,7 @@
 #include <bitfield.h>
 #include <generic-phy.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 
 #include <linux/bitops.h>
 #include <linux/compat.h>
diff --git a/drivers/phy/meson-gxbb-usb2.c b/drivers/phy/meson-gxbb-usb2.c
index d1beebee43e..6ae06364a57 100644
--- a/drivers/phy/meson-gxbb-usb2.c
+++ b/drivers/phy/meson-gxbb-usb2.c
@@ -12,6 +12,7 @@
 #include <clk.h>
 #include <dm.h>
 #include <generic-phy.h>
+#include <linux/printk.h>
 #include <power/regulator.h>
 #include <regmap.h>
 #include <reset.h>
diff --git a/drivers/phy/meson-gxl-usb2.c b/drivers/phy/meson-gxl-usb2.c
index 2267bd08c2c..4bddd0eed9e 100644
--- a/drivers/phy/meson-gxl-usb2.c
+++ b/drivers/phy/meson-gxl-usb2.c
@@ -16,6 +16,7 @@
 #include <generic-phy.h>
 #include <regmap.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 #include <power/regulator.h>
 #include <clk.h>
 #include <linux/usb/otg.h>
diff --git a/drivers/phy/meson-gxl-usb3.c b/drivers/phy/meson-gxl-usb3.c
index 9de55bb5df0..875fe6b44a6 100644
--- a/drivers/phy/meson-gxl-usb3.c
+++ b/drivers/phy/meson-gxl-usb3.c
@@ -16,6 +16,7 @@
 #include <generic-phy.h>
 #include <regmap.h>
 #include <clk.h>
+#include <linux/printk.h>
 #include <linux/usb/otg.h>
 
 #include <asm/arch/usb-gx.h>
diff --git a/drivers/phy/phy-rcar-gen3.c b/drivers/phy/phy-rcar-gen3.c
index ce39cd8f9e2..4afdb791505 100644
--- a/drivers/phy/phy-rcar-gen3.c
+++ b/drivers/phy/phy-rcar-gen3.c
@@ -17,6 +17,7 @@
 #include <usb.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
+#include <linux/printk.h>
 #include <power/regulator.h>
 
 /* USB2.0 Host registers (original offset is +0x200) */
diff --git a/drivers/phy/phy-stm32-usbphyc.c b/drivers/phy/phy-stm32-usbphyc.c
index c6d30486025..d61a33422bc 100644
--- a/drivers/phy/phy-stm32-usbphyc.c
+++ b/drivers/phy/phy-stm32-usbphyc.c
@@ -17,6 +17,7 @@
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 #include <power/regulator.h>
 
 /* USBPHYC registers */
diff --git a/drivers/phy/phy-uclass.c b/drivers/phy/phy-uclass.c
index db7f39cd0b4..af5c2c6497a 100644
--- a/drivers/phy/phy-uclass.c
+++ b/drivers/phy/phy-uclass.c
@@ -9,6 +9,7 @@
 #include <dm/devres.h>
 #include <generic-phy.h>
 #include <log.h>
+#include <linux/printk.h>
 
 static inline struct phy_ops *phy_dev_ops(struct udevice *dev)
 {
diff --git a/drivers/phy/sti_usb_phy.c b/drivers/phy/sti_usb_phy.c
index c6b1dc297ab..cfc24e76b24 100644
--- a/drivers/phy/sti_usb_phy.c
+++ b/drivers/phy/sti_usb_phy.c
@@ -18,6 +18,7 @@
 #include <reset-uclass.h>
 #include <syscon.h>
 #include <wait_bit.h>
+#include <linux/printk.h>
 
 #include <linux/bitops.h>
 #include <linux/compat.h>
diff --git a/drivers/phy/ti-pipe3-phy.c b/drivers/phy/ti-pipe3-phy.c
index 41cee0eb740..5953d118bae 100644
--- a/drivers/phy/ti-pipe3-phy.c
+++ b/drivers/phy/ti-pipe3-phy.c
@@ -16,6 +16,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/printk.h>
 
 /* PLLCTRL Registers */
 #define PLL_STATUS              0x00000004
diff --git a/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c b/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c
index 1f61a84c29d..b64ad9a21c6 100644
--- a/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c
+++ b/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c
@@ -35,6 +35,7 @@
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/libfdt.h>
+#include <linux/printk.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/pinctrl/pinctrl-sti.c b/drivers/pinctrl/pinctrl-sti.c
index 7d6bdc1d2bd..09414f6627f 100644
--- a/drivers/pinctrl/pinctrl-sti.c
+++ b/drivers/pinctrl/pinctrl-sti.c
@@ -17,6 +17,7 @@
 #include <dm/pinctrl.h>
 #include <linux/bug.h>
 #include <linux/libfdt.h>
+#include <linux/printk.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/pinctrl/pinctrl_stm32.c b/drivers/pinctrl/pinctrl_stm32.c
index fedab6605e9..98232fad398 100644
--- a/drivers/pinctrl/pinctrl_stm32.c
+++ b/drivers/pinctrl/pinctrl_stm32.c
@@ -13,6 +13,7 @@
 #include <linux/bitops.h>
 #include <linux/err.h>
 #include <linux/libfdt.h>
+#include <linux/printk.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/power/palmas.c b/drivers/power/palmas.c
index 2584bea38d0..d2083a51ac9 100644
--- a/drivers/power/palmas.c
+++ b/drivers/power/palmas.c
@@ -5,6 +5,7 @@
  */
 #include <config.h>
 #include <palmas.h>
+#include <linux/printk.h>
 
 void palmas_init_settings(void)
 {
diff --git a/drivers/power/pmic/as3722.c b/drivers/power/pmic/as3722.c
index 3aa3cce945e..c7dd9705d18 100644
--- a/drivers/power/pmic/as3722.c
+++ b/drivers/power/pmic/as3722.c
@@ -12,6 +12,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <dm/lists.h>
+#include <linux/printk.h>
 #include <power/as3722.h>
 #include <power/pmic.h>
 
diff --git a/drivers/power/pmic/as3722_gpio.c b/drivers/power/pmic/as3722_gpio.c
index 96943bc1ad5..987fbdf9bc0 100644
--- a/drivers/power/pmic/as3722_gpio.c
+++ b/drivers/power/pmic/as3722_gpio.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <dm.h>
 #include <asm/gpio.h>
+#include <linux/printk.h>
 #include <power/as3722.h>
 #include <power/pmic.h>
 
diff --git a/drivers/power/pmic/bd71837.c b/drivers/power/pmic/bd71837.c
index cb9238972f2..da9aa541979 100644
--- a/drivers/power/pmic/bd71837.c
+++ b/drivers/power/pmic/bd71837.c
@@ -9,6 +9,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <asm/global_data.h>
+#include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/bd71837.h>
diff --git a/drivers/power/pmic/da9063.c b/drivers/power/pmic/da9063.c
index 25101d18f74..ca95b82e6d0 100644
--- a/drivers/power/pmic/da9063.c
+++ b/drivers/power/pmic/da9063.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <log.h>
+#include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/da9063_pmic.h>
diff --git a/drivers/power/pmic/fan53555.c b/drivers/power/pmic/fan53555.c
index 4d1e686d274..c9b15d5b68f 100644
--- a/drivers/power/pmic/fan53555.c
+++ b/drivers/power/pmic/fan53555.c
@@ -10,6 +10,7 @@
 #include <dm/device_compat.h>
 #include <dm/lists.h>
 #include <i2c.h>
+#include <linux/printk.h>
 #include <power/fan53555.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/pmic/i2c_pmic_emul.c b/drivers/power/pmic/i2c_pmic_emul.c
index 404fe008fe6..83d3c292044 100644
--- a/drivers/power/pmic/i2c_pmic_emul.c
+++ b/drivers/power/pmic/i2c_pmic_emul.c
@@ -10,6 +10,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <malloc.h>
+#include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/sandbox_pmic.h>
 
diff --git a/drivers/power/pmic/lp873x.c b/drivers/power/pmic/lp873x.c
index 2b1260ec6b1..fda5bc15164 100644
--- a/drivers/power/pmic/lp873x.c
+++ b/drivers/power/pmic/lp873x.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <log.h>
+#include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/lp873x.h>
diff --git a/drivers/power/pmic/lp87565.c b/drivers/power/pmic/lp87565.c
index f4a4bd03d70..904e02c4d81 100644
--- a/drivers/power/pmic/lp87565.c
+++ b/drivers/power/pmic/lp87565.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <log.h>
+#include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/lp87565.h>
diff --git a/drivers/power/pmic/max77686.c b/drivers/power/pmic/max77686.c
index 9f02c0b6f6f..7e6f7d1966f 100644
--- a/drivers/power/pmic/max77686.c
+++ b/drivers/power/pmic/max77686.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <log.h>
+#include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/max77686_pmic.h>
diff --git a/drivers/power/pmic/max8997.c b/drivers/power/pmic/max8997.c
index dbae155fb34..504a63bf743 100644
--- a/drivers/power/pmic/max8997.c
+++ b/drivers/power/pmic/max8997.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <i2c.h>
+#include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/max8997_pmic.h>
 #include <errno.h>
diff --git a/drivers/power/pmic/max8998.c b/drivers/power/pmic/max8998.c
index f58d9f2d74c..d155474447f 100644
--- a/drivers/power/pmic/max8998.c
+++ b/drivers/power/pmic/max8998.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <i2c.h>
+#include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/max8998_pmic.h>
 
diff --git a/drivers/power/pmic/palmas.c b/drivers/power/pmic/palmas.c
index 6080cbff0be..eb83c88d564 100644
--- a/drivers/power/pmic/palmas.c
+++ b/drivers/power/pmic/palmas.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <log.h>
+#include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/palmas.h>
diff --git a/drivers/power/pmic/pca9450.c b/drivers/power/pmic/pca9450.c
index 786baa5e259..b61dac193f2 100644
--- a/drivers/power/pmic/pca9450.c
+++ b/drivers/power/pmic/pca9450.c
@@ -10,6 +10,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <asm/global_data.h>
+#include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/pca9450.h>
diff --git a/drivers/power/pmic/pfuze100.c b/drivers/power/pmic/pfuze100.c
index 65c4456977c..15420acb472 100644
--- a/drivers/power/pmic/pfuze100.c
+++ b/drivers/power/pmic/pfuze100.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <log.h>
+#include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/pfuze100_pmic.h>
diff --git a/drivers/power/pmic/pmic_tps65910_dm.c b/drivers/power/pmic/pmic_tps65910_dm.c
index e03ddc98d73..8ead1db802a 100644
--- a/drivers/power/pmic/pmic_tps65910_dm.c
+++ b/drivers/power/pmic/pmic_tps65910_dm.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <log.h>
+#include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/tps65910_pmic.h>
diff --git a/drivers/power/pmic/s2mps11.c b/drivers/power/pmic/s2mps11.c
index 1ba1640a8df..5ff4f205211 100644
--- a/drivers/power/pmic/s2mps11.c
+++ b/drivers/power/pmic/s2mps11.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <log.h>
+#include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/s2mps11.h>
 
diff --git a/drivers/power/pmic/s5m8767.c b/drivers/power/pmic/s5m8767.c
index db6d0357ee4..eea072ae824 100644
--- a/drivers/power/pmic/s5m8767.c
+++ b/drivers/power/pmic/s5m8767.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <log.h>
+#include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/s5m8767.h>
diff --git a/drivers/power/pmic/sandbox.c b/drivers/power/pmic/sandbox.c
index d7870915de8..398b72341bd 100644
--- a/drivers/power/pmic/sandbox.c
+++ b/drivers/power/pmic/sandbox.c
@@ -9,6 +9,7 @@
 #include <errno.h>
 #include <dm.h>
 #include <i2c.h>
+#include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/sandbox_pmic.h>
diff --git a/drivers/power/pmic/tps65090.c b/drivers/power/pmic/tps65090.c
index b81df0dff1a..2a04d5948a5 100644
--- a/drivers/power/pmic/tps65090.c
+++ b/drivers/power/pmic/tps65090.c
@@ -10,6 +10,7 @@
 #include <fdtdec.h>
 #include <i2c.h>
 #include <log.h>
+#include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/tps65090.h>
 
diff --git a/drivers/power/pmic/tps65941.c b/drivers/power/pmic/tps65941.c
index 3dfc1918d5b..e464d2984e4 100644
--- a/drivers/power/pmic/tps65941.c
+++ b/drivers/power/pmic/tps65941.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <log.h>
+#include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/tps65941.h>
diff --git a/drivers/power/regulator/bd71837.c b/drivers/power/regulator/bd71837.c
index 931d753e344..3499bd2c56b 100644
--- a/drivers/power/regulator/bd71837.c
+++ b/drivers/power/regulator/bd71837.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <log.h>
 #include <linux/bitops.h>
+#include <linux/printk.h>
 #include <power/bd71837.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/regulator/fan53555.c b/drivers/power/regulator/fan53555.c
index b407f555fe3..a7fa01f787b 100644
--- a/drivers/power/regulator/fan53555.c
+++ b/drivers/power/regulator/fan53555.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <asm/gpio.h>
 #include <linux/bitops.h>
+#include <linux/printk.h>
 #include <power/fan53555.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/regulator/fixed.c b/drivers/power/regulator/fixed.c
index b5f7aec3530..0303c6c5224 100644
--- a/drivers/power/regulator/fixed.c
+++ b/drivers/power/regulator/fixed.c
@@ -5,13 +5,14 @@
  *  Przemyslaw Marczak <p.marczak@samsung.com>
  */
 
-#include "regulator_common.h"
 #include <common.h>
 #include <errno.h>
 #include <dm.h>
 #include <log.h>
+#include <asm/gpio.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
+#include "regulator_common.h"
 
 static int fixed_regulator_ofdata_to_platdata(struct udevice *dev)
 {
diff --git a/drivers/power/regulator/gpio-regulator.c b/drivers/power/regulator/gpio-regulator.c
index cf3fbae79de..8b93a1da72e 100644
--- a/drivers/power/regulator/gpio-regulator.c
+++ b/drivers/power/regulator/gpio-regulator.c
@@ -4,7 +4,6 @@
  * Keerthy <j-keerthy@ti.com>
  */
 
-#include "regulator_common.h"
 #include <common.h>
 #include <fdtdec.h>
 #include <errno.h>
@@ -12,8 +11,10 @@
 #include <i2c.h>
 #include <log.h>
 #include <asm/gpio.h>
+#include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
+#include "regulator_common.h"
 
 #define GPIO_REGULATOR_MAX_STATES	2
 
diff --git a/drivers/power/regulator/max77686.c b/drivers/power/regulator/max77686.c
index 752dc88c401..4d3ac980fc8 100644
--- a/drivers/power/regulator/max77686.c
+++ b/drivers/power/regulator/max77686.c
@@ -11,6 +11,7 @@
 #include <errno.h>
 #include <dm.h>
 #include <i2c.h>
+#include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/max77686_pmic.h>
diff --git a/drivers/power/regulator/pbias_regulator.c b/drivers/power/regulator/pbias_regulator.c
index 28a9a1470b1..0bc8562b317 100644
--- a/drivers/power/regulator/pbias_regulator.c
+++ b/drivers/power/regulator/pbias_regulator.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <regmap.h>
diff --git a/drivers/power/regulator/regulator_common.c b/drivers/power/regulator/regulator_common.c
index 4cfcc31298e..aae110a6655 100644
--- a/drivers/power/regulator/regulator_common.c
+++ b/drivers/power/regulator/regulator_common.c
@@ -4,11 +4,13 @@
  * Sven Schwermer <sven.svenschwermer@disruptive-technologies.com>
  */
 
-#include "regulator_common.h"
 #include <common.h>
+#include <dm.h>
 #include <log.h>
+#include <asm/gpio.h>
 #include <linux/delay.h>
 #include <power/regulator.h>
+#include "regulator_common.h"
 
 int regulator_common_ofdata_to_platdata(struct udevice *dev,
 	struct regulator_common_platdata *dev_pdata, const char *enable_gpio_name)
diff --git a/drivers/power/regulator/regulator_common.h b/drivers/power/regulator/regulator_common.h
index 18a525880a3..946401f5e24 100644
--- a/drivers/power/regulator/regulator_common.h
+++ b/drivers/power/regulator/regulator_common.h
@@ -7,10 +7,6 @@
 #ifndef _REGULATOR_COMMON_H
 #define _REGULATOR_COMMON_H
 
-#include <common.h>
-#include <asm/gpio.h>
-#include <dm.h>
-
 struct regulator_common_platdata {
 	struct gpio_desc gpio; /* GPIO for regulator enable control */
 	unsigned int startup_delay_us;
diff --git a/drivers/power/regulator/s2mps11_regulator.c b/drivers/power/regulator/s2mps11_regulator.c
index a6b4f158ef7..295e1d2c62a 100644
--- a/drivers/power/regulator/s2mps11_regulator.c
+++ b/drivers/power/regulator/s2mps11_regulator.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/s2mps11.h>
diff --git a/drivers/power/regulator/sandbox.c b/drivers/power/regulator/sandbox.c
index 9893a6b5f3d..18596770b37 100644
--- a/drivers/power/regulator/sandbox.c
+++ b/drivers/power/regulator/sandbox.c
@@ -9,6 +9,7 @@
 #include <errno.h>
 #include <dm.h>
 #include <i2c.h>
+#include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/sandbox_pmic.h>
diff --git a/drivers/power/regulator/tps65910_regulator.c b/drivers/power/regulator/tps65910_regulator.c
index 171afd34a5f..2c0dd0604b3 100644
--- a/drivers/power/regulator/tps65910_regulator.c
+++ b/drivers/power/regulator/tps65910_regulator.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/tps65910_pmic.h>
diff --git a/drivers/power/twl4030.c b/drivers/power/twl4030.c
index b0d5cba2c49..34e7fa3d720 100644
--- a/drivers/power/twl4030.c
+++ b/drivers/power/twl4030.c
@@ -25,6 +25,7 @@
 #include <command.h>
 #include <twl4030.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 
 /*
  * Power Reset
diff --git a/drivers/power/twl6030.c b/drivers/power/twl6030.c
index 60a5aaaf19f..2c5e4960e54 100644
--- a/drivers/power/twl6030.c
+++ b/drivers/power/twl6030.c
@@ -5,6 +5,7 @@
  */
 #include <config.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 
 #include <twl6030.h>
 
diff --git a/drivers/ram/imxrt_sdram.c b/drivers/ram/imxrt_sdram.c
index 765a2141d13..8be15340b94 100644
--- a/drivers/ram/imxrt_sdram.c
+++ b/drivers/ram/imxrt_sdram.c
@@ -14,6 +14,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/printk.h>
 
 /* SDRAM Command Code */
 #define SD_CC_ARD		0x0     /* Master Bus (AXI) command - Read */
diff --git a/drivers/ram/rockchip/dmc-rk3368.c b/drivers/ram/rockchip/dmc-rk3368.c
index 4fa632152fd..41773893fd7 100644
--- a/drivers/ram/rockchip/dmc-rk3368.c
+++ b/drivers/ram/rockchip/dmc-rk3368.c
@@ -23,6 +23,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/printk.h>
 
 struct dram_info {
 	struct ram_info info;
diff --git a/drivers/ram/stm32_sdram.c b/drivers/ram/stm32_sdram.c
index 3fddf4df961..de5a9bc0569 100644
--- a/drivers/ram/stm32_sdram.c
+++ b/drivers/ram/stm32_sdram.c
@@ -14,6 +14,7 @@
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 
 #define MEM_MODE_MASK	GENMASK(2, 0)
 #define SWP_FMC_OFFSET 10
diff --git a/drivers/ram/stm32mp1/stm32mp1_ddr.c b/drivers/ram/stm32mp1/stm32mp1_ddr.c
index bf3a4c97a41..8b59903e6bf 100644
--- a/drivers/ram/stm32mp1/stm32mp1_ddr.c
+++ b/drivers/ram/stm32mp1/stm32mp1_ddr.c
@@ -14,6 +14,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/iopoll.h>
+#include <linux/printk.h>
 #include "stm32mp1_ddr.h"
 #include "stm32mp1_ddr_regs.h"
 
diff --git a/drivers/ram/stm32mp1/stm32mp1_ram.c b/drivers/ram/stm32mp1/stm32mp1_ram.c
index 9022679703b..63333a1b1b6 100644
--- a/drivers/ram/stm32mp1/stm32mp1_ram.c
+++ b/drivers/ram/stm32mp1/stm32mp1_ram.c
@@ -12,6 +12,7 @@
 #include <regmap.h>
 #include <syscon.h>
 #include <asm/io.h>
+#include <linux/printk.h>
 #include "stm32mp1_ddr.h"
 
 static const char *const clkname[] = {
diff --git a/drivers/ram/stm32mp1/stm32mp1_tuning.c b/drivers/ram/stm32mp1/stm32mp1_tuning.c
index a8d6892bb09..2fc8e32847c 100644
--- a/drivers/ram/stm32mp1/stm32mp1_tuning.c
+++ b/drivers/ram/stm32mp1/stm32mp1_tuning.c
@@ -13,6 +13,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/iopoll.h>
+#include <linux/printk.h>
 
 #include "stm32mp1_ddr_regs.h"
 #include "stm32mp1_ddr.h"
diff --git a/drivers/remoteproc/rproc-elf-loader.c b/drivers/remoteproc/rproc-elf-loader.c
index c464ecebb77..1e309c0f4f9 100644
--- a/drivers/remoteproc/rproc-elf-loader.c
+++ b/drivers/remoteproc/rproc-elf-loader.c
@@ -11,6 +11,7 @@
 #include <asm/cache.h>
 #include <dm/device_compat.h>
 #include <linux/compat.h>
+#include <linux/printk.h>
 
 /**
  * struct resource_table - firmware resource table header
diff --git a/drivers/remoteproc/rproc-uclass.c b/drivers/remoteproc/rproc-uclass.c
index 22779d0cb0d..0c2b601c472 100644
--- a/drivers/remoteproc/rproc-uclass.c
+++ b/drivers/remoteproc/rproc-uclass.c
@@ -16,6 +16,7 @@
 #include <dm.h>
 #include <dm/uclass.h>
 #include <dm/uclass-internal.h>
+#include <linux/printk.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/remoteproc/sandbox_testproc.c b/drivers/remoteproc/sandbox_testproc.c
index 2b58b27947c..4317af78d29 100644
--- a/drivers/remoteproc/sandbox_testproc.c
+++ b/drivers/remoteproc/sandbox_testproc.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <remoteproc.h>
 #include <asm/io.h>
+#include <linux/printk.h>
 
 /**
  * enum sandbox_state - different device states
diff --git a/drivers/remoteproc/stm32_copro.c b/drivers/remoteproc/stm32_copro.c
index 33b574b1bd3..e09d2b9a646 100644
--- a/drivers/remoteproc/stm32_copro.c
+++ b/drivers/remoteproc/stm32_copro.c
@@ -15,6 +15,7 @@
 #include <asm/io.h>
 #include <dm/device_compat.h>
 #include <linux/err.h>
+#include <linux/printk.h>
 
 #define RCC_GCR_HOLD_BOOT	0
 #define RCC_GCR_RELEASE_BOOT	1
diff --git a/drivers/remoteproc/ti_power_proc.c b/drivers/remoteproc/ti_power_proc.c
index 1a5dddbe0d2..86fa6457ede 100644
--- a/drivers/remoteproc/ti_power_proc.c
+++ b/drivers/remoteproc/ti_power_proc.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <remoteproc.h>
 #include <asm/global_data.h>
+#include <linux/printk.h>
 #include <mach/psc_defs.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/remoteproc/ti_sci_proc.h b/drivers/remoteproc/ti_sci_proc.h
index f8299d1aff9..36351da63fc 100644
--- a/drivers/remoteproc/ti_sci_proc.h
+++ b/drivers/remoteproc/ti_sci_proc.h
@@ -10,6 +10,7 @@
 #ifndef REMOTEPROC_TI_SCI_PROC_H
 #define REMOTEPROC_TI_SCI_PROC_H
 
+#include <linux/printk.h>
 #define TISCI_INVALID_HOST 0xff
 
 /**
diff --git a/drivers/reset/sti-reset.c b/drivers/reset/sti-reset.c
index 2fdc069ce16..12000d05cc8 100644
--- a/drivers/reset/sti-reset.c
+++ b/drivers/reset/sti-reset.c
@@ -16,6 +16,7 @@
 #include <asm/global_data.h>
 #include <dt-bindings/reset/stih407-resets.h>
 #include <linux/bitops.h>
+#include <linux/printk.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/serial/serial_mtk.c b/drivers/serial/serial_mtk.c
index 9715f372ecf..0d2a9dc7e3e 100644
--- a/drivers/serial/serial_mtk.c
+++ b/drivers/serial/serial_mtk.c
@@ -18,6 +18,7 @@
 #include <asm/io.h>
 #include <asm/types.h>
 #include <linux/err.h>
+#include <linux/printk.h>
 
 struct mtk_serial_regs {
 	u32 rbr;
diff --git a/drivers/soc/ti/k3-navss-ringacc.c b/drivers/soc/ti/k3-navss-ringacc.c
index c48e9befe4b..fb04da2717d 100644
--- a/drivers/soc/ti/k3-navss-ringacc.c
+++ b/drivers/soc/ti/k3-navss-ringacc.c
@@ -21,6 +21,7 @@
 #include <linux/compat.h>
 #include <linux/dma-mapping.h>
 #include <linux/err.h>
+#include <linux/printk.h>
 #include <linux/soc/ti/k3-navss-ringacc.h>
 #include <linux/soc/ti/ti_sci_protocol.h>
 
diff --git a/drivers/spi/atmel_spi.c b/drivers/spi/atmel_spi.c
index c65733c87ac..33bf382998e 100644
--- a/drivers/spi/atmel_spi.c
+++ b/drivers/spi/atmel_spi.c
@@ -17,6 +17,7 @@
 #include <asm/gpio.h>
 #endif
 #include <linux/bitops.h>
+#include <linux/printk.h>
 
 /*
  * Register definitions for the Atmel AT32/AT91 SPI Controller
diff --git a/drivers/spi/fsl_dspi.c b/drivers/spi/fsl_dspi.c
index 1912d676a68..eae6b379a9c 100644
--- a/drivers/spi/fsl_dspi.c
+++ b/drivers/spi/fsl_dspi.c
@@ -26,6 +26,7 @@
 #include <fsl_dspi.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 
 /* linux/include/time.h */
 #define NSEC_PER_SEC	1000000000L
diff --git a/drivers/spi/mt7621_spi.c b/drivers/spi/mt7621_spi.c
index 3a0738eb2b7..f13d21f5b2c 100644
--- a/drivers/spi/mt7621_spi.c
+++ b/drivers/spi/mt7621_spi.c
@@ -16,6 +16,7 @@
 #include <wait_bit.h>
 #include <linux/bitops.h>
 #include <linux/io.h>
+#include <linux/printk.h>
 
 #define MT7621_RX_FIFO_LEN	32
 #define MT7621_TX_FIFO_LEN	36
diff --git a/drivers/spi/mxc_spi.c b/drivers/spi/mxc_spi.c
index 466355b0178..14f68da2ee6 100644
--- a/drivers/spi/mxc_spi.c
+++ b/drivers/spi/mxc_spi.c
@@ -18,6 +18,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/clock.h>
 #include <asm/mach-imx/spi.h>
+#include <linux/printk.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/spi/pl022_spi.c b/drivers/spi/pl022_spi.c
index 01ffaea4c34..7cf19a1a661 100644
--- a/drivers/spi/pl022_spi.c
+++ b/drivers/spi/pl022_spi.c
@@ -16,6 +16,7 @@
 #include <dm/platform_data/spi_pl022.h>
 #include <linux/io.h>
 #include <spi.h>
+#include <linux/printk.h>
 
 #define SSP_CR0		0x000
 #define SSP_CR1		0x004
diff --git a/drivers/spi/stm32_qspi.c b/drivers/spi/stm32_qspi.c
index 001f0703e3c..9f6ea01f99f 100644
--- a/drivers/spi/stm32_qspi.c
+++ b/drivers/spi/stm32_qspi.c
@@ -17,6 +17,7 @@
 #include <linux/delay.h>
 #include <linux/iopoll.h>
 #include <linux/ioport.h>
+#include <linux/printk.h>
 #include <linux/sizes.h>
 
 struct stm32_qspi_regs {
diff --git a/drivers/spi/stm32_spi.c b/drivers/spi/stm32_spi.c
index 4a0833b6fa9..09711b0aabc 100644
--- a/drivers/spi/stm32_spi.c
+++ b/drivers/spi/stm32_spi.c
@@ -15,6 +15,7 @@
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 
 #include <asm/io.h>
 #include <asm/gpio.h>
diff --git a/drivers/spi/uniphier_spi.c b/drivers/spi/uniphier_spi.c
index 2753d0cd2d8..21fa7a77efb 100644
--- a/drivers/spi/uniphier_spi.c
+++ b/drivers/spi/uniphier_spi.c
@@ -17,6 +17,7 @@
 #include <linux/io.h>
 #include <spi.h>
 #include <wait_bit.h>
+#include <linux/printk.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/sysreset/sysreset_sti.c b/drivers/sysreset/sysreset_sti.c
index 8465a62e185..c1b22873ff4 100644
--- a/drivers/sysreset/sysreset_sti.c
+++ b/drivers/sysreset/sysreset_sti.c
@@ -12,6 +12,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
+#include <linux/printk.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/sysreset/sysreset_syscon.c b/drivers/sysreset/sysreset_syscon.c
index 1c474866145..0dfa91fc90e 100644
--- a/drivers/sysreset/sysreset_syscon.c
+++ b/drivers/sysreset/sysreset_syscon.c
@@ -14,6 +14,7 @@
 #include <sysreset.h>
 #include <syscon.h>
 #include <linux/err.h>
+#include <linux/printk.h>
 
 struct syscon_reboot_priv {
 	struct regmap *regmap;
diff --git a/drivers/sysreset/sysreset_watchdog.c b/drivers/sysreset/sysreset_watchdog.c
index d500d413261..3493c5e8e45 100644
--- a/drivers/sysreset/sysreset_watchdog.c
+++ b/drivers/sysreset/sysreset_watchdog.c
@@ -8,6 +8,7 @@
 #include <errno.h>
 #include <sysreset.h>
 #include <wdt.h>
+#include <linux/printk.h>
 
 struct wdt_reboot_priv {
 	struct udevice *wdt;
diff --git a/drivers/tpm/tpm_tis_infineon.c b/drivers/tpm/tpm_tis_infineon.c
index f47813e76d0..32c3a335420 100644
--- a/drivers/tpm/tpm_tis_infineon.c
+++ b/drivers/tpm/tpm_tis_infineon.c
@@ -28,6 +28,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/compiler.h>
+#include <linux/printk.h>
 #include <linux/types.h>
 #include <linux/unaligned/be_byteshift.h>
 
diff --git a/drivers/usb/cdns3/gadget.c b/drivers/usb/cdns3/gadget.c
index 8f81d17ec8e..de57029cf40 100644
--- a/drivers/usb/cdns3/gadget.c
+++ b/drivers/usb/cdns3/gadget.c
@@ -62,6 +62,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/printk.h>
 #include <linux/usb/gadget.h>
 #include <linux/compat.h>
 #include <linux/iopoll.h>
diff --git a/drivers/usb/common/common.c b/drivers/usb/common/common.c
index 400bdf72ad7..d27ab90d22d 100644
--- a/drivers/usb/common/common.c
+++ b/drivers/usb/common/common.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <dm.h>
 #include <asm/global_data.h>
+#include <linux/printk.h>
 #include <linux/usb/otg.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/phy.h>
diff --git a/drivers/usb/dwc3/dwc3-generic.c b/drivers/usb/dwc3/dwc3-generic.c
index 551f682024c..c78ac00521d 100644
--- a/drivers/usb/dwc3/dwc3-generic.c
+++ b/drivers/usb/dwc3/dwc3-generic.c
@@ -17,6 +17,7 @@
 #include <dwc3-uboot.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
 #include <malloc.h>
diff --git a/drivers/usb/dwc3/dwc3-meson-g12a.c b/drivers/usb/dwc3/dwc3-meson-g12a.c
index 6567502cdd1..6fdf686af8d 100644
--- a/drivers/usb/dwc3/dwc3-meson-g12a.c
+++ b/drivers/usb/dwc3/dwc3-meson-g12a.c
@@ -15,6 +15,7 @@
 #include <dwc3-uboot.h>
 #include <generic-phy.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
 #include <malloc.h>
diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
index 2aec874e1de..17d04b8b71f 100644
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@ -23,6 +23,7 @@
 #include <linux/delay.h>
 #include <linux/dma-mapping.h>
 #include <linux/list.h>
+#include <linux/printk.h>
 
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
diff --git a/drivers/usb/eth/mcs7830.c b/drivers/usb/eth/mcs7830.c
index c829a436a34..02eef9b269d 100644
--- a/drivers/usb/eth/mcs7830.c
+++ b/drivers/usb/eth/mcs7830.c
@@ -19,6 +19,7 @@
 #include <malloc.h>
 #include <memalign.h>
 #include <usb.h>
+#include <linux/printk.h>
 
 #include "usb_ether.h"
 
diff --git a/drivers/usb/gadget/at91_udc.c b/drivers/usb/gadget/at91_udc.c
index 1feed417d68..e198ef1d34d 100644
--- a/drivers/usb/gadget/at91_udc.c
+++ b/drivers/usb/gadget/at91_udc.c
@@ -21,6 +21,7 @@
 #include <asm/io.h>
 #include <asm/gpio.h>
 #include <asm/hardware.h>
+#include <linux/printk.h>
 #include <mach/at91_matrix.h>
 #include <linux/list.h>
 #include <linux/usb/ch9.h>
diff --git a/drivers/usb/gadget/atmel_usba_udc.c b/drivers/usb/gadget/atmel_usba_udc.c
index 7d51821497b..ed3b3c14e60 100644
--- a/drivers/usb/gadget/atmel_usba_udc.c
+++ b/drivers/usb/gadget/atmel_usba_udc.c
@@ -13,6 +13,7 @@
 #include <asm/gpio.h>
 #include <asm/hardware.h>
 #include <linux/list.h>
+#include <linux/printk.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
 #include <linux/usb/atmel_usba_udc.h>
diff --git a/drivers/usb/gadget/dwc2_udc_otg.c b/drivers/usb/gadget/dwc2_udc_otg.c
index eaa5dcb9b13..f548cbc9eb2 100644
--- a/drivers/usb/gadget/dwc2_udc_otg.c
+++ b/drivers/usb/gadget/dwc2_udc_otg.c
@@ -28,6 +28,7 @@
 #include <dm/devres.h>
 #include <linux/bug.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 
 #include <linux/errno.h>
 #include <linux/list.h>
diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c
index a939918e973..4a42592b53a 100644
--- a/drivers/usb/gadget/ether.c
+++ b/drivers/usb/gadget/ether.c
@@ -14,6 +14,7 @@
 #include <part.h>
 #include <linux/errno.h>
 #include <linux/netdevice.h>
+#include <linux/printk.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/cdc.h>
 #include <linux/usb/gadget.h>
diff --git a/drivers/usb/gadget/f_fastboot.c b/drivers/usb/gadget/f_fastboot.c
index 384c0f6f6e2..fce933dba5f 100644
--- a/drivers/usb/gadget/f_fastboot.c
+++ b/drivers/usb/gadget/f_fastboot.c
@@ -17,6 +17,7 @@
 #include <fastboot.h>
 #include <log.h>
 #include <malloc.h>
+#include <linux/printk.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
 #include <linux/usb/composite.h>
diff --git a/drivers/usb/gadget/f_sdp.c b/drivers/usb/gadget/f_sdp.c
index f2fe89d2a6c..4169763c094 100644
--- a/drivers/usb/gadget/f_sdp.c
+++ b/drivers/usb/gadget/f_sdp.c
@@ -22,6 +22,7 @@
 #include <env.h>
 #include <log.h>
 #include <malloc.h>
+#include <linux/printk.h>
 
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
diff --git a/drivers/usb/gadget/f_thor.c b/drivers/usb/gadget/f_thor.c
index 88fc87f2e90..3c47e6251b1 100644
--- a/drivers/usb/gadget/f_thor.c
+++ b/drivers/usb/gadget/f_thor.c
@@ -24,6 +24,7 @@
 #include <memalign.h>
 #include <version.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
 #include <linux/usb/composite.h>
diff --git a/drivers/usb/gadget/udc/udc-uclass.c b/drivers/usb/gadget/udc/udc-uclass.c
index 3053ccf7d97..384aa47a98f 100644
--- a/drivers/usb/gadget/udc/udc-uclass.c
+++ b/drivers/usb/gadget/udc/udc-uclass.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <dm/device-internal.h>
+#include <linux/printk.h>
 #include <linux/usb/gadget.h>
 
 #if CONFIG_IS_ENABLED(DM_USB_GADGET)
diff --git a/drivers/usb/host/dwc3-sti-glue.c b/drivers/usb/host/dwc3-sti-glue.c
index 511a2ebe50e..da232a6a829 100644
--- a/drivers/usb/host/dwc3-sti-glue.c
+++ b/drivers/usb/host/dwc3-sti-glue.c
@@ -17,6 +17,7 @@
 #include <reset-uclass.h>
 #include <syscon.h>
 #include <usb.h>
+#include <linux/printk.h>
 
 #include <linux/usb/dwc3.h>
 #include <linux/usb/otg.h>
diff --git a/drivers/usb/musb-new/mt85xx.c b/drivers/usb/musb-new/mt85xx.c
index c281c38a288..110b5b610f6 100644
--- a/drivers/usb/musb-new/mt85xx.c
+++ b/drivers/usb/musb-new/mt85xx.c
@@ -15,6 +15,7 @@
 #include <dm/lists.h>
 #include <dm/root.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 #include <linux/usb/musb.h>
 #include <usb.h>
 #include "linux-compat.h"
diff --git a/drivers/usb/musb-new/musb_core.c b/drivers/usb/musb-new/musb_core.c
index 961de99795e..f29131c69bb 100644
--- a/drivers/usb/musb-new/musb_core.c
+++ b/drivers/usb/musb-new/musb_core.c
@@ -84,6 +84,7 @@
 #include <linux/bitops.h>
 #include <linux/bug.h>
 #include <linux/errno.h>
+#include <linux/printk.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
 #include <linux/usb/musb.h>
diff --git a/drivers/usb/musb-new/musb_debug.h b/drivers/usb/musb-new/musb_debug.h
index c468bda9ff2..94375b72c70 100644
--- a/drivers/usb/musb-new/musb_debug.h
+++ b/drivers/usb/musb-new/musb_debug.h
@@ -10,6 +10,7 @@
 #ifndef __MUSB_LINUX_DEBUG_H__
 #define __MUSB_LINUX_DEBUG_H__
 
+#include <linux/printk.h>
 #define yprintk(facility, format, args...) \
 	do { printk(facility "%s %d: " format , \
 	__func__, __LINE__ , ## args); } while (0)
diff --git a/drivers/usb/musb-new/musb_dsps.c b/drivers/usb/musb-new/musb_dsps.c
index eb590885bc5..4d977aba34f 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 <asm/omap_musb.h>
+#include <linux/printk.h>
 #include "linux-compat.h"
 #endif
 
diff --git a/drivers/usb/musb-new/musb_gadget.c b/drivers/usb/musb-new/musb_gadget.c
index 8ba98d8c0e8..fb3b3e45ef0 100644
--- a/drivers/usb/musb-new/musb_gadget.c
+++ b/drivers/usb/musb-new/musb_gadget.c
@@ -24,6 +24,7 @@
 #else
 #include <common.h>
 #include <linux/bug.h>
+#include <linux/printk.h>
 #include <linux/usb/ch9.h>
 #include "linux-compat.h"
 #endif
diff --git a/drivers/usb/musb-new/musb_gadget_ep0.c b/drivers/usb/musb-new/musb_gadget_ep0.c
index 93f43ba4714..22de98559d9 100644
--- a/drivers/usb/musb-new/musb_gadget_ep0.c
+++ b/drivers/usb/musb-new/musb_gadget_ep0.c
@@ -19,6 +19,7 @@
 #include <linux/interrupt.h>
 #else
 #include <common.h>
+#include <linux/printk.h>
 #include "linux-compat.h"
 #include <asm/processor.h>
 #endif
diff --git a/drivers/usb/musb-new/omap2430.c b/drivers/usb/musb-new/omap2430.c
index fbd5f98f368..c41b9147fa5 100644
--- a/drivers/usb/musb-new/omap2430.c
+++ b/drivers/usb/musb-new/omap2430.c
@@ -17,6 +17,7 @@
 #include <dm/device_compat.h>
 #include <dm/lists.h>
 #include <linux/err.h>
+#include <linux/printk.h>
 #include <linux/usb/otg.h>
 #include <asm/omap_common.h>
 #include <asm/omap_musb.h>
diff --git a/drivers/usb/musb-new/sunxi.c b/drivers/usb/musb-new/sunxi.c
index 53c336fc3f5..9ae8a0e6b7a 100644
--- a/drivers/usb/musb-new/sunxi.c
+++ b/drivers/usb/musb-new/sunxi.c
@@ -32,6 +32,7 @@
 #include <dm/root.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 #include <linux/usb/musb.h>
 #include "linux-compat.h"
 #include "musb_core.h"
diff --git a/drivers/usb/musb-new/ti-musb.c b/drivers/usb/musb-new/ti-musb.c
index bf58f13480b..d447baf13bb 100644
--- a/drivers/usb/musb-new/ti-musb.c
+++ b/drivers/usb/musb-new/ti-musb.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <asm/global_data.h>
+#include <linux/printk.h>
 #include <linux/usb/otg.h>
 #include <dm/device-internal.h>
 #include <dm/lists.h>
diff --git a/drivers/video/am335x-fb.c b/drivers/video/am335x-fb.c
index 2bf4d85d021..4354c3efac1 100644
--- a/drivers/video/am335x-fb.c
+++ b/drivers/video/am335x-fb.c
@@ -25,6 +25,7 @@
 #include <asm/utils.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/printk.h>
 #include "am335x-fb.h"
 
 #define LCDC_FMAX				200000000
diff --git a/drivers/video/meson/meson_dw_hdmi.c b/drivers/video/meson/meson_dw_hdmi.c
index 7b2ff94eba5..ec550b57fda 100644
--- a/drivers/video/meson/meson_dw_hdmi.c
+++ b/drivers/video/meson/meson_dw_hdmi.c
@@ -14,6 +14,7 @@
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
 #include <linux/bitops.h>
+#include <linux/printk.h>
 #include <power/regulator.h>
 #include <clk.h>
 #include <linux/delay.h>
diff --git a/drivers/video/meson/meson_vclk.c b/drivers/video/meson/meson_vclk.c
index cd1e69040f7..e718a0074ed 100644
--- a/drivers/video/meson/meson_vclk.c
+++ b/drivers/video/meson/meson_vclk.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <edid.h>
 #include <linux/bitops.h>
+#include <linux/printk.h>
 #include "meson_vpu.h"
 #include <log.h>
 #include <linux/iopoll.h>
diff --git a/drivers/video/stm32/stm32_dsi.c b/drivers/video/stm32/stm32_dsi.c
index b09ecb73365..e77a0f478a6 100644
--- a/drivers/video/stm32/stm32_dsi.c
+++ b/drivers/video/stm32/stm32_dsi.c
@@ -26,6 +26,7 @@
 #include <dm/lists.h>
 #include <linux/bitops.h>
 #include <linux/iopoll.h>
+#include <linux/printk.h>
 #include <power/regulator.h>
 
 #define HWVER_130			0x31333000	/* IP version 1.30 */
diff --git a/drivers/video/stm32/stm32_ltdc.c b/drivers/video/stm32/stm32_ltdc.c
index ac031dc6c94..d2ac2e57c8a 100644
--- a/drivers/video/stm32/stm32_ltdc.c
+++ b/drivers/video/stm32/stm32_ltdc.c
@@ -20,6 +20,7 @@
 #include <dm/device-internal.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
+#include <linux/printk.h>
 
 struct stm32_ltdc_priv {
 	void __iomem *regs;
diff --git a/drivers/video/tegra124/sor.c b/drivers/video/tegra124/sor.c
index 49f33c15b5c..52ab1b52915 100644
--- a/drivers/video/tegra124/sor.c
+++ b/drivers/video/tegra124/sor.c
@@ -15,6 +15,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch-tegra/dc.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 #include "displayport.h"
 #include "sor.h"
 #include <linux/err.h>
diff --git a/drivers/watchdog/stm32mp_wdt.c b/drivers/watchdog/stm32mp_wdt.c
index f673fce327c..89ce5588a37 100644
--- a/drivers/watchdog/stm32mp_wdt.c
+++ b/drivers/watchdog/stm32mp_wdt.c
@@ -12,6 +12,7 @@
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/iopoll.h>
+#include <linux/printk.h>
 
 /* IWDG registers */
 #define IWDG_KR		0x00	/* Key register */
diff --git a/env/common.c b/env/common.c
index d6d1fa3a1f7..b6a1f45271c 100644
--- a/env/common.c
+++ b/env/common.c
@@ -15,6 +15,7 @@
 #include <log.h>
 #include <sort.h>
 #include <asm/global_data.h>
+#include <linux/printk.h>
 #include <linux/stddef.h>
 #include <search.h>
 #include <errno.h>
diff --git a/fs/ubifs/debug.c b/fs/ubifs/debug.c
index 2ff8f1a5f9b..4a8fd88cdd7 100644
--- a/fs/ubifs/debug.c
+++ b/fs/ubifs/debug.c
@@ -18,6 +18,7 @@
 #include <hexdump.h>
 #include <log.h>
 #include <dm/devres.h>
+#include <linux/printk.h>
 
 #ifndef __UBOOT__
 #include <linux/module.h>
diff --git a/fs/ubifs/debug.h b/fs/ubifs/debug.h
index 5f6e12702de..85f760e41a1 100644
--- a/fs/ubifs/debug.h
+++ b/fs/ubifs/debug.h
@@ -12,6 +12,7 @@
 #define __UBIFS_DEBUG_H__
 
 /* Checking helper functions */
+#include <linux/printk.h>
 typedef int (*dbg_leaf_callback)(struct ubifs_info *c,
 				 struct ubifs_zbranch *zbr, void *priv);
 typedef int (*dbg_znode_callback)(struct ubifs_info *c,
diff --git a/fs/ubifs/lpt_commit.c b/fs/ubifs/lpt_commit.c
index 897d0014306..3ca8d704aaf 100644
--- a/fs/ubifs/lpt_commit.c
+++ b/fs/ubifs/lpt_commit.c
@@ -23,6 +23,7 @@
 #include <linux/bitops.h>
 #include <linux/compat.h>
 #include <linux/err.h>
+#include <linux/printk.h>
 #include "crc16.h"
 #endif
 #include "ubifs.h"
diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c
index e3a4c0bca27..347f8365642 100644
--- a/fs/ubifs/super.c
+++ b/fs/ubifs/super.c
@@ -35,6 +35,7 @@
 #include <linux/bitops.h>
 #include <linux/bug.h>
 #include <linux/log2.h>
+#include <linux/printk.h>
 #include <linux/stat.h>
 #include <linux/err.h>
 #include "ubifs.h"
diff --git a/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h
index 512fdaa1444..efa7a69cb6d 100644
--- a/fs/ubifs/ubifs.h
+++ b/fs/ubifs/ubifs.h
@@ -35,6 +35,7 @@
 #include <asm-generic/atomic-long.h>
 #include <ubi_uboot.h>
 #include <ubifs_uboot.h>
+#include <linux/printk.h>
 
 #include <linux/ctype.h>
 #include <linux/time.h>
diff --git a/fs/yaffs2/yaffs_uboot_glue.c b/fs/yaffs2/yaffs_uboot_glue.c
index 7a15a02974d..913eb323f38 100644
--- a/fs/yaffs2/yaffs_uboot_glue.c
+++ b/fs/yaffs2/yaffs_uboot_glue.c
@@ -22,6 +22,7 @@
 #include <common.h>
 #include <div64.h>
 #include <malloc.h>
+#include <linux/printk.h>
 
 #include <config.h>
 #include "nand.h"
diff --git a/include/common.h b/include/common.h
index 25c317f4439..a79c2bb4993 100644
--- a/include/common.h
+++ b/include/common.h
@@ -17,7 +17,6 @@
 #include <errno.h>
 #include <time.h>
 #include <linux/types.h>
-#include <linux/printk.h>
 #include <linux/string.h>
 #include <stdarg.h>
 #include <stdio.h>
diff --git a/include/crypto/pkcs7_parser.h b/include/crypto/pkcs7_parser.h
index 906033a90eb..2c45cce5234 100644
--- a/include/crypto/pkcs7_parser.h
+++ b/include/crypto/pkcs7_parser.h
@@ -11,6 +11,7 @@
 #include <linux/oid_registry.h>
 #include <crypto/pkcs7.h>
 #include <crypto/x509_parser.h>
+#include <linux/printk.h>
 
 #define kenter(FMT, ...) \
 	pr_devel("==> %s("FMT")\n", __func__, ##__VA_ARGS__)
diff --git a/include/dm/device_compat.h b/include/dm/device_compat.h
index 3d8cd09f4c0..8cf11fa58af 100644
--- a/include/dm/device_compat.h
+++ b/include/dm/device_compat.h
@@ -11,6 +11,7 @@
 #define _DM_DEVICE_COMPAT_H
 
 #include <linux/compat.h>
+#include <linux/printk.h>
 
 /*
  * REVISIT:
diff --git a/include/linux/soc/ti/cppi5.h b/include/linux/soc/ti/cppi5.h
index cfdf7ea29fc..3a55c3ec46f 100644
--- a/include/linux/soc/ti/cppi5.h
+++ b/include/linux/soc/ti/cppi5.h
@@ -11,6 +11,7 @@
 #include <hexdump.h>
 #include <linux/bitops.h>
 #include <linux/bug.h>
+#include <linux/printk.h>
 
 /**
  * Descriptor header, present in all types of descriptors
diff --git a/lib/asn1_decoder.c b/lib/asn1_decoder.c
index bcb0390eb41..1191fc36487 100644
--- a/lib/asn1_decoder.c
+++ b/lib/asn1_decoder.c
@@ -8,6 +8,7 @@
 #ifdef __UBOOT__
 #include <log.h>
 #include <linux/compat.h>
+#include <linux/printk.h>
 #else
 #include <linux/export.h>
 #endif
diff --git a/lib/bch.c b/lib/bch.c
index de66b1acba5..72b4fdcc9c4 100644
--- a/lib/bch.c
+++ b/lib/bch.c
@@ -61,6 +61,7 @@
 #include <dm/devres.h>
 
 #include <linux/bitops.h>
+#include <linux/printk.h>
 #else
 #include <errno.h>
 #if defined(__FreeBSD__)
diff --git a/lib/crypto/asymmetric_type.c b/lib/crypto/asymmetric_type.c
index 1d0532d0f2e..24c2d15ef97 100644
--- a/lib/crypto/asymmetric_type.c
+++ b/lib/crypto/asymmetric_type.c
@@ -18,6 +18,7 @@
 #include <linux/compat.h>
 #include <linux/ctype.h>
 #include <linux/err.h>
+#include <linux/printk.h>
 #include <linux/string.h>
 #else
 #include <linux/seq_file.h>
diff --git a/lib/crypto/pkcs7_parser.c b/lib/crypto/pkcs7_parser.c
index 0b85fe8286c..d5efa828d6a 100644
--- a/lib/crypto/pkcs7_parser.c
+++ b/lib/crypto/pkcs7_parser.c
@@ -11,6 +11,7 @@
 #include <dm/devres.h>
 #include <linux/bitops.h>
 #include <linux/compat.h>
+#include <linux/printk.h>
 #endif
 #include <linux/kernel.h>
 #ifndef __UBOOT__
diff --git a/lib/crypto/pkcs7_verify.c b/lib/crypto/pkcs7_verify.c
index 320ba49f79d..db02f346f76 100644
--- a/lib/crypto/pkcs7_verify.c
+++ b/lib/crypto/pkcs7_verify.c
@@ -15,6 +15,7 @@
 #include <linux/bitops.h>
 #include <linux/compat.h>
 #include <linux/asn1.h>
+#include <linux/printk.h>
 #include <u-boot/rsa-checksum.h>
 #include <crypto/public_key.h>
 #include <crypto/pkcs7_parser.h>
diff --git a/lib/crypto/public_key.c b/lib/crypto/public_key.c
index a8f7fbed458..899908e1bbe 100644
--- a/lib/crypto/public_key.c
+++ b/lib/crypto/public_key.c
@@ -13,6 +13,7 @@
 #include <linux/bug.h>
 #include <linux/compat.h>
 #include <linux/err.h>
+#include <linux/printk.h>
 #else
 #include <linux/module.h>
 #include <linux/export.h>
diff --git a/lib/crypto/rsa_helper.c b/lib/crypto/rsa_helper.c
index cc0c0d6637b..c941d40fd7a 100644
--- a/lib/crypto/rsa_helper.c
+++ b/lib/crypto/rsa_helper.c
@@ -15,6 +15,7 @@
 #include <linux/fips.h>
 #endif
 #include <crypto/internal/rsa.h>
+#include <linux/printk.h>
 #include "rsapubkey.asn1.h"
 #ifndef __UBOOT__
 #include "rsaprivkey.asn1.h"
diff --git a/lib/crypto/x509_cert_parser.c b/lib/crypto/x509_cert_parser.c
index eb24349460c..a0f0689118f 100644
--- a/lib/crypto/x509_cert_parser.c
+++ b/lib/crypto/x509_cert_parser.c
@@ -16,6 +16,7 @@
 #include <linux/err.h>
 #include <linux/oid_registry.h>
 #ifdef __UBOOT__
+#include <linux/printk.h>
 #include <linux/string.h>
 #endif
 #include <crypto/public_key.h>
diff --git a/lib/crypto/x509_public_key.c b/lib/crypto/x509_public_key.c
index 91810a86404..518dc906731 100644
--- a/lib/crypto/x509_public_key.c
+++ b/lib/crypto/x509_public_key.c
@@ -13,6 +13,7 @@
 #include <linux/compat.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/printk.h>
 #else
 #include <linux/module.h>
 #endif
diff --git a/lib/list_sort.c b/lib/list_sort.c
index 58e1e1614a5..1c9e0617327 100644
--- a/lib/list_sort.c
+++ b/lib/list_sort.c
@@ -8,6 +8,7 @@
 #include <linux/compat.h>
 #include <common.h>
 #include <malloc.h>
+#include <linux/printk.h>
 #endif
 #include <linux/list.h>
 #include <linux/list_sort.h>
diff --git a/net/fastboot.c b/net/fastboot.c
index 0c57fb9947d..d01d3eba120 100644
--- a/net/fastboot.c
+++ b/net/fastboot.c
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <fastboot.h>
 #include <net.h>
+#include <linux/printk.h>
 #include <net/fastboot.h>
 
 /* Fastboot port # defined in spec */
-- 
2.28.0.163.g6104cc2f0b6-goog

^ permalink raw reply related	[flat|nested] 35+ messages in thread

* [PATCH 04/16] Fix code style for time functions
  2020-08-02 22:59 [PATCH 00/16] common: Drop remaining includes in common.h Simon Glass
                   ` (2 preceding siblings ...)
  2020-08-02 22:59 ` [PATCH 03/16] common: Drop linux/printk.h " Simon Glass
@ 2020-08-02 22:59 ` Simon Glass
  2020-08-02 22:59 ` [PATCH 05/16] common: Drop time.h from common header Simon Glass
                   ` (12 subsequent siblings)
  16 siblings, 0 replies; 35+ messages in thread
From: Simon Glass @ 2020-08-02 22:59 UTC (permalink / raw)
  To: u-boot

Fix the code style used for some time functions.

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

 arch/arm/cpu/arm920t/imx/timer.c |  2 +-
 arch/arm/cpu/sa1100/timer.c      |  2 +-
 arch/microblaze/cpu/timer.c      |  2 +-
 arch/powerpc/lib/interrupts.c    |  2 +-
 arch/powerpc/lib/time.c          |  5 +++--
 board/armltd/integrator/timer.c  |  2 +-
 drivers/fpga/ACEX1K.c            |  4 ++--
 drivers/fpga/spartan2.c          | 24 ++++++++++++------------
 drivers/fpga/spartan3.c          | 24 ++++++++++++------------
 drivers/net/lan91c96.c           |  4 ++--
 drivers/net/ne2000_base.c        |  4 ++--
 drivers/net/smc91111.c           |  4 ++--
 post/drivers/rtc.c               |  4 ++--
 13 files changed, 42 insertions(+), 41 deletions(-)

diff --git a/arch/arm/cpu/arm920t/imx/timer.c b/arch/arm/cpu/arm920t/imx/timer.c
index e9d55779214..b559db75f12 100644
--- a/arch/arm/cpu/arm920t/imx/timer.c
+++ b/arch/arm/cpu/arm920t/imx/timer.c
@@ -44,7 +44,7 @@ static ulong get_timer_masked (void)
 	return TCN1;
 }
 
-ulong get_timer (ulong base)
+ulong get_timer(ulong base)
 {
 	return get_timer_masked() - base;
 }
diff --git a/arch/arm/cpu/sa1100/timer.c b/arch/arm/cpu/sa1100/timer.c
index a5cdaf5a66c..5d597dd1ab4 100644
--- a/arch/arm/cpu/sa1100/timer.c
+++ b/arch/arm/cpu/sa1100/timer.c
@@ -19,7 +19,7 @@ static ulong get_timer_masked (void)
 	return OSCR;
 }
 
-ulong get_timer (ulong base)
+ulong get_timer(ulong base)
 {
 	return get_timer_masked ();
 }
diff --git a/arch/microblaze/cpu/timer.c b/arch/microblaze/cpu/timer.c
index 647bdcd5ba5..05ab0e1b157 100644
--- a/arch/microblaze/cpu/timer.c
+++ b/arch/microblaze/cpu/timer.c
@@ -20,7 +20,7 @@ DECLARE_GLOBAL_DATA_PTR;
 volatile int timestamp = 0;
 microblaze_timer_t *tmr;
 
-ulong get_timer (ulong base)
+ulong get_timer(ulong base)
 {
 	if (tmr)
 		return timestamp - base;
diff --git a/arch/powerpc/lib/interrupts.c b/arch/powerpc/lib/interrupts.c
index 73f270002cf..bda0999327d 100644
--- a/arch/powerpc/lib/interrupts.c
+++ b/arch/powerpc/lib/interrupts.c
@@ -89,7 +89,7 @@ void timer_interrupt(struct pt_regs *regs)
 #endif /* CONFIG_LED_STATUS */
 }
 
-ulong get_timer (ulong base)
+ulong get_timer(ulong base)
 {
 	return (timestamp - base);
 }
diff --git a/arch/powerpc/lib/time.c b/arch/powerpc/lib/time.c
index 8d6babfb83d..d27432c23af 100644
--- a/arch/powerpc/lib/time.c
+++ b/arch/powerpc/lib/time.c
@@ -39,8 +39,9 @@ unsigned long usec2ticks(unsigned long usec)
  */
 void __udelay(unsigned long usec)
 {
-	ulong ticks = usec2ticks (usec);
-	wait_ticks (ticks);
+	ulong ticks = usec2ticks(usec);
+
+	wait_ticks(ticks);
 }
 
 /* ------------------------------------------------------------------------- */
diff --git a/board/armltd/integrator/timer.c b/board/armltd/integrator/timer.c
index d220b877d66..53d1c0ec303 100644
--- a/board/armltd/integrator/timer.c
+++ b/board/armltd/integrator/timer.c
@@ -119,7 +119,7 @@ static ulong get_timer_masked (void)
 	return timestamp;
 }
 
-ulong get_timer (ulong base_ticks)
+ulong get_timer(ulong base_ticks)
 {
 	return get_timer_masked () - base_ticks;
 }
diff --git a/drivers/fpga/ACEX1K.c b/drivers/fpga/ACEX1K.c
index aca8049c56a..30a3727433e 100644
--- a/drivers/fpga/ACEX1K.c
+++ b/drivers/fpga/ACEX1K.c
@@ -140,10 +140,10 @@ static int ACEX1K_ps_load(Altera_desc *desc, const void *buf, size_t bsize)
 		udelay(2);		/* T_cf2st1 < 4us	*/
 
 		/* Wait for nSTATUS to be released (i.e. deasserted) */
-		ts = get_timer (0);		/* get current time */
+		ts = get_timer(0);		/* get current time */
 		do {
 			CONFIG_FPGA_DELAY ();
-			if (get_timer (ts) > CONFIG_SYS_FPGA_WAIT) {	/* check the time */
+			if (get_timer(ts) > CONFIG_SYS_FPGA_WAIT) {	/* check the time */
 				puts ("** Timeout waiting for STATUS to go high.\n");
 				(*fn->abort) (cookie);
 				return FPGA_FAIL;
diff --git a/drivers/fpga/spartan2.c b/drivers/fpga/spartan2.c
index 3435400e58b..fae94f9663a 100644
--- a/drivers/fpga/spartan2.c
+++ b/drivers/fpga/spartan2.c
@@ -151,11 +151,11 @@ static int spartan2_sp_load(xilinx_desc *desc, const void *buf, size_t bsize)
 		CONFIG_FPGA_DELAY ();
 		(*fn->pgm) (false, true, cookie);	/* Deassert the program, commit */
 
-		ts = get_timer (0);		/* get current time */
+		ts = get_timer(0);		/* get current time */
 		/* Now wait for INIT and BUSY to go high */
 		do {
 			CONFIG_FPGA_DELAY ();
-			if (get_timer (ts) > CONFIG_SYS_FPGA_WAIT) {	/* check the time */
+			if (get_timer(ts) > CONFIG_SYS_FPGA_WAIT) {	/* check the time */
 				puts ("** Timeout waiting for INIT to clear.\n");
 				(*fn->abort) (cookie);	/* abort the burn */
 				return FPGA_FAIL;
@@ -178,7 +178,7 @@ static int spartan2_sp_load(xilinx_desc *desc, const void *buf, size_t bsize)
 			(*fn->clk) (true, true, cookie);	/* Assert the clock pin */
 
 #ifdef CONFIG_SYS_FPGA_CHECK_BUSY
-			ts = get_timer (0);	/* get current time */
+			ts = get_timer(0);	/* get current time */
 			while ((*fn->busy) (cookie)) {
 				/* XXX - we should have a check in here somewhere to
 				 * make sure we aren't busy forever... */
@@ -188,7 +188,7 @@ static int spartan2_sp_load(xilinx_desc *desc, const void *buf, size_t bsize)
 				CONFIG_FPGA_DELAY ();
 				(*fn->clk) (true, true, cookie);	/* Assert the clock pin */
 
-				if (get_timer (ts) > CONFIG_SYS_FPGA_WAIT) {	/* check the time */
+				if (get_timer(ts) > CONFIG_SYS_FPGA_WAIT) {	/* check the time */
 					puts ("** Timeout waiting for BUSY to clear.\n");
 					(*fn->abort) (cookie);	/* abort the burn */
 					return FPGA_FAIL;
@@ -211,7 +211,7 @@ static int spartan2_sp_load(xilinx_desc *desc, const void *buf, size_t bsize)
 #endif
 
 		/* now check for done signal */
-		ts = get_timer (0);		/* get current time */
+		ts = get_timer(0);		/* get current time */
 		ret_val = FPGA_SUCCESS;
 		while ((*fn->done) (cookie) == FPGA_FAIL) {
 
@@ -220,7 +220,7 @@ static int spartan2_sp_load(xilinx_desc *desc, const void *buf, size_t bsize)
 			CONFIG_FPGA_DELAY ();
 			(*fn->clk) (true, true, cookie);	/* Assert the clock pin */
 
-			if (get_timer (ts) > CONFIG_SYS_FPGA_WAIT) {	/* check the time */
+			if (get_timer(ts) > CONFIG_SYS_FPGA_WAIT) {	/* check the time */
 				puts ("** Timeout waiting for DONE to clear.\n");
 				(*fn->abort) (cookie);	/* abort the burn */
 				ret_val = FPGA_FAIL;
@@ -337,10 +337,10 @@ static int spartan2_ss_load(xilinx_desc *desc, const void *buf, size_t bsize)
 		(*fn->pgm) (true, true, cookie);	/* Assert the program, commit */
 
 		/* Wait for INIT state (init low)                            */
-		ts = get_timer (0);		/* get current time */
+		ts = get_timer(0);		/* get current time */
 		do {
 			CONFIG_FPGA_DELAY ();
-			if (get_timer (ts) > CONFIG_SYS_FPGA_WAIT) {	/* check the time */
+			if (get_timer(ts) > CONFIG_SYS_FPGA_WAIT) {	/* check the time */
 				puts ("** Timeout waiting for INIT to start.\n");
 				return FPGA_FAIL;
 			}
@@ -350,11 +350,11 @@ static int spartan2_ss_load(xilinx_desc *desc, const void *buf, size_t bsize)
 		CONFIG_FPGA_DELAY ();
 		(*fn->pgm) (false, true, cookie);	/* Deassert the program, commit */
 
-		ts = get_timer (0);		/* get current time */
+		ts = get_timer(0);		/* get current time */
 		/* Now wait for INIT to go high */
 		do {
 			CONFIG_FPGA_DELAY ();
-			if (get_timer (ts) > CONFIG_SYS_FPGA_WAIT) {	/* check the time */
+			if (get_timer(ts) > CONFIG_SYS_FPGA_WAIT) {	/* check the time */
 				puts ("** Timeout waiting for INIT to clear.\n");
 				return FPGA_FAIL;
 			}
@@ -398,7 +398,7 @@ static int spartan2_ss_load(xilinx_desc *desc, const void *buf, size_t bsize)
 #endif
 
 		/* now check for done signal */
-		ts = get_timer (0);		/* get current time */
+		ts = get_timer(0);		/* get current time */
 		ret_val = FPGA_SUCCESS;
 		(*fn->wr) (true, true, cookie);
 
@@ -411,7 +411,7 @@ static int spartan2_ss_load(xilinx_desc *desc, const void *buf, size_t bsize)
 
 			putc ('*');
 
-			if (get_timer (ts) > CONFIG_SYS_FPGA_WAIT) {	/* check the time */
+			if (get_timer(ts) > CONFIG_SYS_FPGA_WAIT) {	/* check the time */
 				puts ("** Timeout waiting for DONE to clear.\n");
 				ret_val = FPGA_FAIL;
 				break;
diff --git a/drivers/fpga/spartan3.c b/drivers/fpga/spartan3.c
index 4850c99352d..e40e427a25f 100644
--- a/drivers/fpga/spartan3.c
+++ b/drivers/fpga/spartan3.c
@@ -155,11 +155,11 @@ static int spartan3_sp_load(xilinx_desc *desc, const void *buf, size_t bsize)
 		CONFIG_FPGA_DELAY ();
 		(*fn->pgm) (false, true, cookie);	/* Deassert the program, commit */
 
-		ts = get_timer (0);		/* get current time */
+		ts = get_timer(0);		/* get current time */
 		/* Now wait for INIT and BUSY to go high */
 		do {
 			CONFIG_FPGA_DELAY ();
-			if (get_timer (ts) > CONFIG_SYS_FPGA_WAIT) {	/* check the time */
+			if (get_timer(ts) > CONFIG_SYS_FPGA_WAIT) {	/* check the time */
 				puts ("** Timeout waiting for INIT to clear.\n");
 				(*fn->abort) (cookie);	/* abort the burn */
 				return FPGA_FAIL;
@@ -182,7 +182,7 @@ static int spartan3_sp_load(xilinx_desc *desc, const void *buf, size_t bsize)
 			(*fn->clk) (true, true, cookie);	/* Assert the clock pin */
 
 #ifdef CONFIG_SYS_FPGA_CHECK_BUSY
-			ts = get_timer (0);	/* get current time */
+			ts = get_timer(0);	/* get current time */
 			while ((*fn->busy) (cookie)) {
 				/* XXX - we should have a check in here somewhere to
 				 * make sure we aren't busy forever... */
@@ -192,7 +192,7 @@ static int spartan3_sp_load(xilinx_desc *desc, const void *buf, size_t bsize)
 				CONFIG_FPGA_DELAY ();
 				(*fn->clk) (true, true, cookie);	/* Assert the clock pin */
 
-				if (get_timer (ts) > CONFIG_SYS_FPGA_WAIT) {	/* check the time */
+				if (get_timer(ts) > CONFIG_SYS_FPGA_WAIT) {	/* check the time */
 					puts ("** Timeout waiting for BUSY to clear.\n");
 					(*fn->abort) (cookie);	/* abort the burn */
 					return FPGA_FAIL;
@@ -215,7 +215,7 @@ static int spartan3_sp_load(xilinx_desc *desc, const void *buf, size_t bsize)
 #endif
 
 		/* now check for done signal */
-		ts = get_timer (0);		/* get current time */
+		ts = get_timer(0);		/* get current time */
 		ret_val = FPGA_SUCCESS;
 		while ((*fn->done) (cookie) == FPGA_FAIL) {
 			/* XXX - we should have a check in here somewhere to
@@ -226,7 +226,7 @@ static int spartan3_sp_load(xilinx_desc *desc, const void *buf, size_t bsize)
 			CONFIG_FPGA_DELAY ();
 			(*fn->clk) (true, true, cookie);	/* Assert the clock pin */
 
-			if (get_timer (ts) > CONFIG_SYS_FPGA_WAIT) {	/* check the time */
+			if (get_timer(ts) > CONFIG_SYS_FPGA_WAIT) {	/* check the time */
 				puts ("** Timeout waiting for DONE to clear.\n");
 				(*fn->abort) (cookie);	/* abort the burn */
 				ret_val = FPGA_FAIL;
@@ -343,10 +343,10 @@ static int spartan3_ss_load(xilinx_desc *desc, const void *buf, size_t bsize)
 		(*fn->pgm) (true, true, cookie);	/* Assert the program, commit */
 
 		/* Wait for INIT state (init low)                            */
-		ts = get_timer (0);		/* get current time */
+		ts = get_timer(0);		/* get current time */
 		do {
 			CONFIG_FPGA_DELAY ();
-			if (get_timer (ts) > CONFIG_SYS_FPGA_WAIT) {	/* check the time */
+			if (get_timer(ts) > CONFIG_SYS_FPGA_WAIT) {	/* check the time */
 				puts ("** Timeout waiting for INIT to start.\n");
 				if (*fn->abort)
 					(*fn->abort) (cookie);
@@ -358,11 +358,11 @@ static int spartan3_ss_load(xilinx_desc *desc, const void *buf, size_t bsize)
 		CONFIG_FPGA_DELAY ();
 		(*fn->pgm) (false, true, cookie);	/* Deassert the program, commit */
 
-		ts = get_timer (0);		/* get current time */
+		ts = get_timer(0);		/* get current time */
 		/* Now wait for INIT to go high */
 		do {
 			CONFIG_FPGA_DELAY ();
-			if (get_timer (ts) > CONFIG_SYS_FPGA_WAIT) {	/* check the time */
+			if (get_timer(ts) > CONFIG_SYS_FPGA_WAIT) {	/* check the time */
 				puts ("** Timeout waiting for INIT to clear.\n");
 				if (*fn->abort)
 					(*fn->abort) (cookie);
@@ -414,7 +414,7 @@ static int spartan3_ss_load(xilinx_desc *desc, const void *buf, size_t bsize)
 #endif
 
 		/* now check for done signal */
-		ts = get_timer (0);		/* get current time */
+		ts = get_timer(0);		/* get current time */
 		ret_val = FPGA_SUCCESS;
 		(*fn->wr) (true, true, cookie);
 
@@ -429,7 +429,7 @@ static int spartan3_ss_load(xilinx_desc *desc, const void *buf, size_t bsize)
 
 			putc ('*');
 
-			if (get_timer (ts) > CONFIG_SYS_FPGA_WAIT) {	/* check the time */
+			if (get_timer(ts) > CONFIG_SYS_FPGA_WAIT) {	/* check the time */
 				puts ("** Timeout waiting for DONE to clear.\n");
 				ret_val = FPGA_FAIL;
 				break;
diff --git a/drivers/net/lan91c96.c b/drivers/net/lan91c96.c
index c2f611144db..470c68467cd 100644
--- a/drivers/net/lan91c96.c
+++ b/drivers/net/lan91c96.c
@@ -164,14 +164,14 @@ static void print_packet (byte *, int);
 
 static int poll4int (struct eth_device *dev, byte mask, int timeout)
 {
-	int tmo = get_timer (0) + timeout * CONFIG_SYS_HZ;
+	int tmo = get_timer(0) + timeout * CONFIG_SYS_HZ;
 	int is_timeout = 0;
 	word old_bank = SMC_inw(dev, LAN91C96_BANK_SELECT);
 
 	PRINTK2 ("Polling...\n");
 	SMC_SELECT_BANK(dev, 2);
 	while ((SMC_inw(dev, LAN91C96_INT_STATS) & mask) == 0) {
-		if (get_timer (0) >= tmo) {
+		if (get_timer(0) >= tmo) {
 			is_timeout = 1;
 			break;
 		}
diff --git a/drivers/net/ne2000_base.c b/drivers/net/ne2000_base.c
index f6673f5e4c6..09cc8398003 100644
--- a/drivers/net/ne2000_base.c
+++ b/drivers/net/ne2000_base.c
@@ -750,14 +750,14 @@ static int ne2k_send(struct eth_device *dev, void *packet, int length)
 	pkey = -1;
 
 	dp83902a_send((u8 *) packet, length, 666);
-	tmo = get_timer (0) + TOUT * CONFIG_SYS_HZ;
+	tmo = get_timer(0) + TOUT * CONFIG_SYS_HZ;
 	while(1) {
 		dp83902a_poll();
 		if (pkey != -1) {
 			PRINTK("Packet sucesfully sent\n");
 			return 0;
 		}
-		if (get_timer (0) >= tmo) {
+		if (get_timer(0) >= tmo) {
 			printf("transmission error (timoeut)\n");
 			return 0;
 		}
diff --git a/drivers/net/smc91111.c b/drivers/net/smc91111.c
index ec4e8e928cb..fea6ba8caaa 100644
--- a/drivers/net/smc91111.c
+++ b/drivers/net/smc91111.c
@@ -238,14 +238,14 @@ static void print_packet( byte *, int );
 
 static int poll4int (struct eth_device *dev, byte mask, int timeout)
 {
-	int tmo = get_timer (0) + timeout * CONFIG_SYS_HZ;
+	int tmo = get_timer(0) + timeout * CONFIG_SYS_HZ;
 	int is_timeout = 0;
 	word old_bank = SMC_inw (dev, BSR_REG);
 
 	PRINTK2 ("Polling...\n");
 	SMC_SELECT_BANK (dev, 2);
 	while ((SMC_inw (dev, SMC91111_INT_REG) & mask) == 0) {
-		if (get_timer (0) >= tmo) {
+		if (get_timer(0) >= tmo) {
 			is_timeout = 1;
 			break;
 		}
diff --git a/post/drivers/rtc.c b/post/drivers/rtc.c
index c603f0e6728..af701e464d3 100644
--- a/post/drivers/rtc.c
+++ b/post/drivers/rtc.c
@@ -36,11 +36,11 @@ static int rtc_post_skip (ulong * diff)
 	ulong start2;
 
 	rtc_get (&tm1);
-	start1 = get_timer (0);
+	start1 = get_timer(0);
 
 	while (1) {
 		rtc_get (&tm2);
-		start2 = get_timer (0);
+		start2 = get_timer(0);
 		if (tm1.tm_sec != tm2.tm_sec)
 			break;
 		if (start2 - start1 > 1500)
-- 
2.28.0.163.g6104cc2f0b6-goog

^ permalink raw reply related	[flat|nested] 35+ messages in thread

* [PATCH 05/16] common: Drop time.h from common header
  2020-08-02 22:59 [PATCH 00/16] common: Drop remaining includes in common.h Simon Glass
                   ` (3 preceding siblings ...)
  2020-08-02 22:59 ` [PATCH 04/16] Fix code style for time functions Simon Glass
@ 2020-08-02 22:59 ` Simon Glass
  2020-08-02 22:59 ` [PATCH 06/16] common: Drop linux/string.h " Simon Glass
                   ` (11 subsequent siblings)
  16 siblings, 0 replies; 35+ messages in thread
From: Simon Glass @ 2020-08-02 22:59 UTC (permalink / raw)
  To: u-boot

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/arm/mach-at91/arm920t/clock.c           | 1 +
 arch/arm/mach-at91/arm926ejs/clock.c         | 1 +
 arch/arm/mach-at91/clock.c                   | 1 +
 arch/arm/mach-at91/phy.c                     | 1 +
 arch/arm/mach-bcm283x/mbox.c                 | 1 +
 arch/arm/mach-exynos/clock.c                 | 1 +
 arch/arm/mach-imx/i2c-mxv7.c                 | 1 +
 arch/arm/mach-imx/mx6/clock.c                | 1 +
 arch/arm/mach-imx/mx7/clock.c                | 1 +
 arch/arm/mach-omap2/omap3/am35x_musb.c       | 1 +
 arch/arm/mach-stm32mp/pwr_regulator.c        | 1 +
 arch/arm/mach-tegra/powergate.c              | 1 +
 arch/arm/mach-tegra/tegra124/xusb-padctl.c   | 1 +
 arch/arm/mach-tegra/tegra210/clock.c         | 1 +
 arch/arm/mach-tegra/tegra210/xusb-padctl.c   | 1 +
 arch/m68k/cpu/mcf547x_8x/slicetimer.c        | 1 +
 arch/mips/mach-mtmips/mt7628/init.c          | 1 +
 arch/mips/mach-octeon/clock.c                | 1 +
 arch/powerpc/lib/interrupts.c                | 1 +
 arch/x86/cpu/acpi_gpe.c                      | 1 +
 arch/x86/cpu/apollolake/punit.c              | 1 +
 arch/x86/cpu/intel_common/mrc.c              | 1 +
 arch/x86/cpu/mp_init.c                       | 1 +
 board/astro/mcf5373l/mcf5373l.c              | 1 +
 board/cobra5272/flash.c                      | 1 +
 board/freescale/m5253demo/flash.c            | 1 +
 board/gdsys/common/phy.c                     | 1 +
 board/nokia/rx51/rx51.c                      | 1 +
 board/sandbox/sandbox.c                      | 1 +
 board/theadorable/fpga.c                     | 1 +
 board/theadorable/theadorable.c              | 1 +
 cmd/gettime.c                                | 1 +
 cmd/mem.c                                    | 1 +
 cmd/misc.c                                   | 1 +
 cmd/sf.c                                     | 1 +
 cmd/tpm_test.c                               | 1 +
 common/command.c                             | 1 +
 common/dfu.c                                 | 1 +
 common/usb_hub.c                             | 1 +
 common/usb_kbd.c                             | 1 +
 common/xyzModem.c                            | 1 +
 drivers/ata/ahci.c                           | 1 +
 drivers/ata/sata_mv.c                        | 1 +
 drivers/ddr/altera/sdram_soc64.c             | 1 +
 drivers/dma/lpc32xx_dma.c                    | 1 +
 drivers/fpga/ACEX1K.c                        | 1 +
 drivers/fpga/cyclon2.c                       | 1 +
 drivers/fpga/socfpga_arria10.c               | 1 +
 drivers/fpga/spartan2.c                      | 1 +
 drivers/fpga/spartan3.c                      | 1 +
 drivers/fpga/stratix10.c                     | 1 +
 drivers/fpga/virtex2.c                       | 1 +
 drivers/fpga/zynqpl.c                        | 1 +
 drivers/hwspinlock/hwspinlock-uclass.c       | 1 +
 drivers/i2c/at91_i2c.c                       | 1 +
 drivers/i2c/designware_i2c.c                 | 1 +
 drivers/i2c/i2c-cortina.c                    | 1 +
 drivers/i2c/imx_lpi2c.c                      | 1 +
 drivers/i2c/intel_i2c.c                      | 1 +
 drivers/i2c/meson_i2c.c                      | 1 +
 drivers/i2c/muxes/i2c-arb-gpio-challenge.c   | 1 +
 drivers/i2c/mxc_i2c.c                        | 1 +
 drivers/i2c/nx_i2c.c                         | 1 +
 drivers/i2c/octeon_i2c.c                     | 1 +
 drivers/i2c/rk_i2c.c                         | 1 +
 drivers/i2c/s3c24x0_i2c.c                    | 1 +
 drivers/i2c/stm32f7_i2c.c                    | 1 +
 drivers/input/input.c                        | 1 +
 drivers/input/tegra-kbc.c                    | 1 +
 drivers/misc/cros_ec.c                       | 1 +
 drivers/misc/cros_ec_lpc.c                   | 1 +
 drivers/misc/cros_ec_sandbox.c               | 1 +
 drivers/misc/cros_ec_spi.c                   | 1 +
 drivers/mmc/am654_sdhci.c                    | 1 +
 drivers/mmc/bcm2835_sdhost.c                 | 1 +
 drivers/mmc/dw_mmc.c                         | 1 +
 drivers/mmc/fsl_esdhc.c                      | 1 +
 drivers/mmc/fsl_esdhc_imx.c                  | 1 +
 drivers/mmc/ftsdc010_mci.c                   | 1 +
 drivers/mmc/meson_gx_mmc.c                   | 1 +
 drivers/mmc/mmc.c                            | 1 +
 drivers/mmc/mvebu_mmc.c                      | 1 +
 drivers/mmc/omap_hsmmc.c                     | 1 +
 drivers/mmc/sdhci.c                          | 1 +
 drivers/mmc/sunxi_mmc.c                      | 1 +
 drivers/mmc/tegra_mmc.c                      | 1 +
 drivers/mtd/cfi_flash.c                      | 1 +
 drivers/mtd/nand/raw/brcmnand/brcmnand.c     | 1 +
 drivers/mtd/nand/raw/fsl_elbc_nand.c         | 1 +
 drivers/mtd/nand/raw/fsl_ifc_nand.c          | 1 +
 drivers/mtd/nand/raw/fsmc_nand.c             | 1 +
 drivers/mtd/nand/raw/mxs_nand_spl.c          | 1 +
 drivers/mtd/nand/raw/nand_base.c             | 1 +
 drivers/mtd/nand/raw/pxa3xx_nand.c           | 1 +
 drivers/mtd/nand/raw/sunxi_nand.c            | 1 +
 drivers/mtd/nand/raw/vf610_nfc.c             | 1 +
 drivers/mtd/nand/spi/core.c                  | 1 +
 drivers/mtd/onenand/onenand_base.c           | 1 +
 drivers/mtd/spi/sf_dataflash.c               | 1 +
 drivers/mtd/spi/spi-nor-core.c               | 1 +
 drivers/mtd/spi/spi-nor-tiny.c               | 1 +
 drivers/mtd/st_smi.c                         | 1 +
 drivers/net/ag7xxx.c                         | 1 +
 drivers/net/altera_tse.c                     | 1 +
 drivers/net/cs8900.c                         | 1 +
 drivers/net/designware.c                     | 1 +
 drivers/net/dm9000x.c                        | 1 +
 drivers/net/ethoc.c                          | 1 +
 drivers/net/fec_mxc.c                        | 1 +
 drivers/net/ftmac100.c                       | 1 +
 drivers/net/ftmac110.c                       | 1 +
 drivers/net/lan91c96.c                       | 1 +
 drivers/net/ldpaa_eth/ldpaa_eth.c            | 1 +
 drivers/net/mtk_eth.c                        | 1 +
 drivers/net/ne2000_base.c                    | 1 +
 drivers/net/pch_gbe.c                        | 1 +
 drivers/net/ravb.c                           | 1 +
 drivers/net/rtl8169.c                        | 1 +
 drivers/net/sandbox.c                        | 1 +
 drivers/net/smc91111.c                       | 1 +
 drivers/net/sun8i_emac.c                     | 1 +
 drivers/net/xilinx_emaclite.c                | 1 +
 drivers/pci/pci_rom.c                        | 1 +
 drivers/pci/pci_tegra.c                      | 1 +
 drivers/pci/pcie_dw_mvebu.c                  | 1 +
 drivers/pci/pcie_dw_ti.c                     | 1 +
 drivers/phy/phy-da8xx-usb.c                  | 1 +
 drivers/power/exynos-tmu.c                   | 1 +
 drivers/power/regulator/tps65090_regulator.c | 1 +
 drivers/ram/rockchip/dmc-rk3368.c            | 1 +
 drivers/ram/stm32mp1/stm32mp1_interactive.c  | 1 +
 drivers/rng/sandbox_rng.c                    | 1 +
 drivers/rtc/rv3029.c                         | 1 +
 drivers/sound/samsung-i2s.c                  | 1 +
 drivers/sound/tegra_ahub.c                   | 1 +
 drivers/spi/altera_spi.c                     | 1 +
 drivers/spi/cadence_qspi_apb.c               | 1 +
 drivers/spi/ich.c                            | 1 +
 drivers/spi/mpc8xxx_spi.c                    | 1 +
 drivers/spi/mxc_spi.c                        | 1 +
 drivers/spi/omap3_spi.c                      | 1 +
 drivers/spi/pic32_spi.c                      | 1 +
 drivers/spi/zynq_qspi.c                      | 1 +
 drivers/timer/sandbox_timer.c                | 1 +
 drivers/tpm/cr50_i2c.c                       | 1 +
 drivers/tpm/tpm-uclass.c                     | 1 +
 drivers/tpm/tpm2_tis_spi.c                   | 1 +
 drivers/tpm/tpm_atmel_twi.c                  | 1 +
 drivers/tpm/tpm_tis_infineon.c               | 1 +
 drivers/tpm/tpm_tis_st33zp24_i2c.c           | 1 +
 drivers/tpm/tpm_tis_st33zp24_spi.c           | 1 +
 drivers/ufs/ufs.c                            | 1 +
 drivers/usb/eth/smsc95xx.c                   | 1 +
 drivers/usb/gadget/ether.c                   | 1 +
 drivers/usb/gadget/fotg210.c                 | 1 +
 drivers/usb/gadget/pxa25x_udc.c              | 1 +
 drivers/usb/host/dwc2.c                      | 1 +
 drivers/usb/host/ehci-hcd.c                  | 1 +
 drivers/usb/host/ehci-omap.c                 | 1 +
 drivers/usb/host/ohci-da8xx.c                | 1 +
 drivers/usb/host/sl811-hcd.c                 | 1 +
 drivers/usb/host/xhci-ring.c                 | 1 +
 drivers/usb/musb-new/am35x.c                 | 1 +
 drivers/usb/musb-new/musb_dsps.c             | 1 +
 drivers/usb/musb-new/musb_uboot.c            | 1 +
 drivers/usb/musb-new/omap2430.c              | 1 +
 drivers/video/broadwell_igd.c                | 1 +
 drivers/video/dw_hdmi.c                      | 1 +
 drivers/video/rockchip/rk_edp.c              | 1 +
 drivers/video/tegra124/display.c             | 1 +
 drivers/video/tegra124/dp.c                  | 1 +
 drivers/video/tegra124/sor.c                 | 1 +
 drivers/video/video-uclass.c                 | 1 +
 drivers/watchdog/sbsa_gwdt.c                 | 1 +
 fs/fs.c                                      | 1 +
 fs/ubifs/debug.c                             | 1 +
 include/cli.h                                | 2 ++
 include/common.h                             | 1 -
 include/exports.h                            | 1 +
 include/regmap.h                             | 1 +
 include/virtio.h                             | 2 ++
 lib/dhry/cmd_dhry.c                          | 1 +
 net/arp.c                                    | 1 +
 net/bootp.c                                  | 1 +
 net/dns.c                                    | 1 +
 net/fastboot.c                               | 1 +
 net/link_local.c                             | 1 +
 net/net.c                                    | 1 +
 net/sntp.c                                   | 1 +
 net/tftp.c                                   | 1 +
 post/drivers/rtc.c                           | 1 +
 test/dm/regmap.c                             | 1 +
 193 files changed, 194 insertions(+), 1 deletion(-)

diff --git a/api/api.c b/api/api.c
index c7f5db776af..2e955f7baf2 100644
--- a/api/api.c
+++ b/api/api.c
@@ -11,6 +11,7 @@
 #include <env.h>
 #include <malloc.h>
 #include <env_internal.h>
+#include <time.h>
 #include <linux/delay.h>
 #include <linux/types.h>
 #include <api_public.h>
diff --git a/arch/arm/mach-at91/arm920t/clock.c b/arch/arm/mach-at91/arm920t/clock.c
index c7440278d8f..2c8fbe6d284 100644
--- a/arch/arm/mach-at91/arm920t/clock.c
+++ b/arch/arm/mach-at91/arm920t/clock.c
@@ -8,6 +8,7 @@
  * Copyright (C) 2009 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
  */
 #include <common.h>
+#include <time.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
diff --git a/arch/arm/mach-at91/arm926ejs/clock.c b/arch/arm/mach-at91/arm926ejs/clock.c
index c68e0c0c3c4..9b97987fecb 100644
--- a/arch/arm/mach-at91/arm926ejs/clock.c
+++ b/arch/arm/mach-at91/arm926ejs/clock.c
@@ -8,6 +8,7 @@
  */
 
 #include <common.h>
+#include <time.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
diff --git a/arch/arm/mach-at91/clock.c b/arch/arm/mach-at91/clock.c
index 8344daeb39a..5b8ce52f5c1 100644
--- a/arch/arm/mach-at91/clock.c
+++ b/arch/arm/mach-at91/clock.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <time.h>
 #include <wdt.h>
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
diff --git a/arch/arm/mach-at91/phy.c b/arch/arm/mach-at91/phy.c
index 6101eee3589..b68e4bd355f 100644
--- a/arch/arm/mach-at91/phy.c
+++ b/arch/arm/mach-at91/phy.c
@@ -12,6 +12,7 @@
  */
 
 #include <common.h>
+#include <time.h>
 #include <asm/hardware.h>
 #include <asm/io.h>
 #include <linux/delay.h>
diff --git a/arch/arm/mach-bcm283x/mbox.c b/arch/arm/mach-bcm283x/mbox.c
index da9faafe1dd..940699337f1 100644
--- a/arch/arm/mach-bcm283x/mbox.c
+++ b/arch/arm/mach-bcm283x/mbox.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <log.h>
+#include <time.h>
 #include <asm/cache.h>
 #include <asm/io.h>
 #include <asm/arch/base.h>
diff --git a/arch/arm/mach-exynos/clock.c b/arch/arm/mach-exynos/clock.c
index ef48d35aa4c..6c21fd642cd 100644
--- a/arch/arm/mach-exynos/clock.c
+++ b/arch/arm/mach-exynos/clock.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <time.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/clk.h>
diff --git a/arch/arm/mach-imx/i2c-mxv7.c b/arch/arm/mach-imx/i2c-mxv7.c
index e6c74bf77e9..5e3d79b887f 100644
--- a/arch/arm/mach-imx/i2c-mxv7.c
+++ b/arch/arm/mach-imx/i2c-mxv7.c
@@ -4,6 +4,7 @@
  */
 #include <common.h>
 #include <malloc.h>
+#include <time.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <linux/delay.h>
diff --git a/arch/arm/mach-imx/mx6/clock.c b/arch/arm/mach-imx/mx6/clock.c
index fb5e5b6f05c..c40d8855125 100644
--- a/arch/arm/mach-imx/mx6/clock.c
+++ b/arch/arm/mach-imx/mx6/clock.c
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <div64.h>
 #include <log.h>
+#include <time.h>
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <asm/arch/imx-regs.h>
diff --git a/arch/arm/mach-imx/mx7/clock.c b/arch/arm/mach-imx/mx7/clock.c
index b1d7290704a..56e0cfa9887 100644
--- a/arch/arm/mach-imx/mx7/clock.c
+++ b/arch/arm/mach-imx/mx7/clock.c
@@ -11,6 +11,7 @@
 #include <command.h>
 #include <div64.h>
 #include <log.h>
+#include <time.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/errno.h>
diff --git a/arch/arm/mach-omap2/omap3/am35x_musb.c b/arch/arm/mach-omap2/omap3/am35x_musb.c
index 95e15c1a51b..ada70743a33 100644
--- a/arch/arm/mach-omap2/omap3/am35x_musb.c
+++ b/arch/arm/mach-omap2/omap3/am35x_musb.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <time.h>
 #include <asm/io.h>
 #include <asm/arch/am35x_def.h>
 
diff --git a/arch/arm/mach-stm32mp/pwr_regulator.c b/arch/arm/mach-stm32mp/pwr_regulator.c
index 900dee4c38a..eb024b85116 100644
--- a/arch/arm/mach-stm32mp/pwr_regulator.c
+++ b/arch/arm/mach-stm32mp/pwr_regulator.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <syscon.h>
+#include <time.h>
 #include <asm/io.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
diff --git a/arch/arm/mach-tegra/powergate.c b/arch/arm/mach-tegra/powergate.c
index 631bc04e950..c5ced7e3f38 100644
--- a/arch/arm/mach-tegra/powergate.c
+++ b/arch/arm/mach-tegra/powergate.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <errno.h>
+#include <time.h>
 #include <linux/delay.h>
 
 #include <asm/io.h>
diff --git a/arch/arm/mach-tegra/tegra124/xusb-padctl.c b/arch/arm/mach-tegra/tegra124/xusb-padctl.c
index 5b88d6e5e7b..a1136f1558b 100644
--- a/arch/arm/mach-tegra/tegra124/xusb-padctl.c
+++ b/arch/arm/mach-tegra/tegra124/xusb-padctl.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <errno.h>
 #include <log.h>
+#include <time.h>
 #include <asm/global_data.h>
 #include <dm/of_access.h>
 #include <dm/ofnode.h>
diff --git a/arch/arm/mach-tegra/tegra210/clock.c b/arch/arm/mach-tegra/tegra210/clock.c
index ccc64eb77b4..711d02c036f 100644
--- a/arch/arm/mach-tegra/tegra210/clock.c
+++ b/arch/arm/mach-tegra/tegra210/clock.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <init.h>
 #include <log.h>
+#include <time.h>
 #include <asm/cache.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
diff --git a/arch/arm/mach-tegra/tegra210/xusb-padctl.c b/arch/arm/mach-tegra/tegra210/xusb-padctl.c
index 30d0395bb0e..0af6e256ad1 100644
--- a/arch/arm/mach-tegra/tegra210/xusb-padctl.c
+++ b/arch/arm/mach-tegra/tegra210/xusb-padctl.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <errno.h>
 #include <log.h>
+#include <time.h>
 #include <asm/global_data.h>
 #include <dm/of_access.h>
 #include <dm/ofnode.h>
diff --git a/arch/m68k/cpu/mcf547x_8x/slicetimer.c b/arch/m68k/cpu/mcf547x_8x/slicetimer.c
index dc076fc6e81..49f246b62e1 100644
--- a/arch/m68k/cpu/mcf547x_8x/slicetimer.c
+++ b/arch/m68k/cpu/mcf547x_8x/slicetimer.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <init.h>
 #include <irq_func.h>
+#include <time.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
 
diff --git a/arch/mips/mach-mtmips/mt7628/init.c b/arch/mips/mach-mtmips/mt7628/init.c
index 27241050aaf..3fa0e139e75 100644
--- a/arch/mips/mach-mtmips/mt7628/init.c
+++ b/arch/mips/mach-mtmips/mt7628/init.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <clk.h>
 #include <dm.h>
+#include <time.h>
 #include <asm/global_data.h>
 #include <dm/uclass.h>
 #include <dt-bindings/clock/mt7628-clk.h>
diff --git a/arch/mips/mach-octeon/clock.c b/arch/mips/mach-octeon/clock.c
index 119b3ac50b4..8984bfd7445 100644
--- a/arch/mips/mach-octeon/clock.c
+++ b/arch/mips/mach-octeon/clock.c
@@ -3,6 +3,7 @@
  * Copyright (C) 2018, 2019 Marvell International Ltd.
  */
 
+#include <time.h>
 #include <asm/global_data.h>
 #include <mach/clock.h>
 
diff --git a/arch/powerpc/lib/interrupts.c b/arch/powerpc/lib/interrupts.c
index bda0999327d..14f32cbd937 100644
--- a/arch/powerpc/lib/interrupts.c
+++ b/arch/powerpc/lib/interrupts.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <irq_func.h>
+#include <time.h>
 #include <asm/processor.h>
 #include <watchdog.h>
 #ifdef CONFIG_LED_STATUS
diff --git a/arch/x86/cpu/acpi_gpe.c b/arch/x86/cpu/acpi_gpe.c
index 70badb15a3b..9baf4f65b36 100644
--- a/arch/x86/cpu/acpi_gpe.c
+++ b/arch/x86/cpu/acpi_gpe.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <irq.h>
 #include <log.h>
+#include <time.h>
 #include <acpi/acpi_device.h>
 #include <asm/io.h>
 #include <dt-bindings/interrupt-controller/irq.h>
diff --git a/arch/x86/cpu/apollolake/punit.c b/arch/x86/cpu/apollolake/punit.c
index e76f2805d7f..3514ba21591 100644
--- a/arch/x86/cpu/apollolake/punit.c
+++ b/arch/x86/cpu/apollolake/punit.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <log.h>
 #include <spl.h>
+#include <time.h>
 #include <asm/cpu.h>
 #include <asm/cpu_common.h>
 #include <asm/intel_regs.h>
diff --git a/arch/x86/cpu/intel_common/mrc.c b/arch/x86/cpu/intel_common/mrc.c
index a97b0b7ceb4..eb27f8f1883 100644
--- a/arch/x86/cpu/intel_common/mrc.c
+++ b/arch/x86/cpu/intel_common/mrc.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <log.h>
 #include <syscon.h>
+#include <time.h>
 #include <asm/cpu.h>
 #include <asm/global_data.h>
 #include <asm/gpio.h>
diff --git a/arch/x86/cpu/mp_init.c b/arch/x86/cpu/mp_init.c
index 03bd71c261a..bd656d09520 100644
--- a/arch/x86/cpu/mp_init.c
+++ b/arch/x86/cpu/mp_init.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <qfw.h>
+#include <time.h>
 #include <asm/atomic.h>
 #include <asm/cpu.h>
 #include <asm/global_data.h>
diff --git a/board/astro/mcf5373l/mcf5373l.c b/board/astro/mcf5373l/mcf5373l.c
index 3e2f79a1cf4..cb336fca046 100644
--- a/board/astro/mcf5373l/mcf5373l.c
+++ b/board/astro/mcf5373l/mcf5373l.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <init.h>
 #include <serial.h>
+#include <time.h>
 #include <watchdog.h>
 #include <command.h>
 #include <asm/global_data.h>
diff --git a/board/cobra5272/flash.c b/board/cobra5272/flash.c
index 4337f4879de..9aa8f118baf 100644
--- a/board/cobra5272/flash.c
+++ b/board/cobra5272/flash.c
@@ -9,6 +9,7 @@
 #include <cpu_func.h>
 #include <flash.h>
 #include <irq_func.h>
+#include <time.h>
 #include <uuid.h>
 #include <linux/delay.h>
 
diff --git a/board/freescale/m5253demo/flash.c b/board/freescale/m5253demo/flash.c
index 31974217816..d37ba362b6c 100644
--- a/board/freescale/m5253demo/flash.c
+++ b/board/freescale/m5253demo/flash.c
@@ -11,6 +11,7 @@
 #include <flash.h>
 #include <init.h>
 #include <irq_func.h>
+#include <time.h>
 
 #include <asm/immap.h>
 
diff --git a/board/gdsys/common/phy.c b/board/gdsys/common/phy.c
index 516f4e8edca..a4104a9d202 100644
--- a/board/gdsys/common/phy.c
+++ b/board/gdsys/common/phy.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <time.h>
 
 #include <miiphy.h>
 
diff --git a/board/nokia/rx51/rx51.c b/board/nokia/rx51/rx51.c
index 65be1719c2c..5cf6a54dc60 100644
--- a/board/nokia/rx51/rx51.c
+++ b/board/nokia/rx51/rx51.c
@@ -24,6 +24,7 @@
 #include <common.h>
 #include <env.h>
 #include <init.h>
+#include <time.h>
 #include <watchdog.h>
 #include <malloc.h>
 #include <twl4030.h>
diff --git a/board/sandbox/sandbox.c b/board/sandbox/sandbox.c
index c78e90accbc..b1bed64910c 100644
--- a/board/sandbox/sandbox.c
+++ b/board/sandbox/sandbox.c
@@ -11,6 +11,7 @@
 #include <init.h>
 #include <led.h>
 #include <os.h>
+#include <time.h>
 #include <asm/global_data.h>
 #include <asm/test.h>
 #include <asm/u-boot-sandbox.h>
diff --git a/board/theadorable/fpga.c b/board/theadorable/fpga.c
index bc8379cccf6..3a33e15eacc 100644
--- a/board/theadorable/fpga.c
+++ b/board/theadorable/fpga.c
@@ -7,6 +7,7 @@
 #include <altera.h>
 #include <errno.h>
 #include <log.h>
+#include <time.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
diff --git a/board/theadorable/theadorable.c b/board/theadorable/theadorable.c
index 3c4133083f5..fb3d1fc4260 100644
--- a/board/theadorable/theadorable.c
+++ b/board/theadorable/theadorable.c
@@ -13,6 +13,7 @@
 #if !defined(CONFIG_SPL_BUILD)
 #include <bootcount.h>
 #endif
+#include <time.h>
 #include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
diff --git a/cmd/gettime.c b/cmd/gettime.c
index 2e74e02b499..ebaa45812a6 100644
--- a/cmd/gettime.c
+++ b/cmd/gettime.c
@@ -13,6 +13,7 @@
  */
 #include <common.h>
 #include <command.h>
+#include <time.h>
 
 static int do_gettime(struct cmd_tbl *cmdtp, int flag, int argc,
 		      char *const argv[])
diff --git a/cmd/mem.c b/cmd/mem.c
index a9360860d2c..5578dea97ec 100644
--- a/cmd/mem.c
+++ b/cmd/mem.c
@@ -22,6 +22,7 @@
 #include <log.h>
 #include <mapmem.h>
 #include <rand.h>
+#include <time.h>
 #include <watchdog.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/cmd/misc.c b/cmd/misc.c
index 20ab943494e..36bca24fb20 100644
--- a/cmd/misc.c
+++ b/cmd/misc.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <command.h>
 #include <console.h>
+#include <time.h>
 #include <linux/delay.h>
 
 static int do_sleep(struct cmd_tbl *cmdtp, int flag, int argc,
diff --git a/cmd/sf.c b/cmd/sf.c
index b3ff4b5773c..249e2eee377 100644
--- a/cmd/sf.c
+++ b/cmd/sf.c
@@ -16,6 +16,7 @@
 #include <mapmem.h>
 #include <spi.h>
 #include <spi_flash.h>
+#include <time.h>
 #include <asm/cache.h>
 #include <jffs2/jffs2.h>
 #include <linux/mtd/mtd.h>
diff --git a/cmd/tpm_test.c b/cmd/tpm_test.c
index d7044336ff2..fbaa1de66ee 100644
--- a/cmd/tpm_test.c
+++ b/cmd/tpm_test.c
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <cpu_func.h>
 #include <log.h>
+#include <time.h>
 #include <tpm-v1.h>
 #include <linux/printk.h>
 #include "tpm-user-utils.h"
diff --git a/common/command.c b/common/command.c
index 6a87bb54abf..5cadf732e96 100644
--- a/common/command.c
+++ b/common/command.c
@@ -14,6 +14,7 @@
 #include <console.h>
 #include <env.h>
 #include <log.h>
+#include <time.h>
 #include <asm/global_data.h>
 #include <linux/ctype.h>
 
diff --git a/common/dfu.c b/common/dfu.c
index c879e8d6a8f..75fd3e088ef 100644
--- a/common/dfu.c
+++ b/common/dfu.c
@@ -13,6 +13,7 @@
 #include <common.h>
 #include <command.h>
 #include <log.h>
+#include <time.h>
 #include <watchdog.h>
 #include <dfu.h>
 #include <console.h>
diff --git a/common/usb_hub.c b/common/usb_hub.c
index e578f0be284..af088bd7289 100644
--- a/common/usb_hub.c
+++ b/common/usb_hub.c
@@ -29,6 +29,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <memalign.h>
+#include <time.h>
 #include <asm/processor.h>
 #include <asm/unaligned.h>
 #include <linux/ctype.h>
diff --git a/common/usb_kbd.c b/common/usb_kbd.c
index b316807844b..3a81a305995 100644
--- a/common/usb_kbd.c
+++ b/common/usb_kbd.c
@@ -15,6 +15,7 @@
 #include <malloc.h>
 #include <memalign.h>
 #include <stdio_dev.h>
+#include <time.h>
 #include <watchdog.h>
 #include <asm/byteorder.h>
 
diff --git a/common/xyzModem.c b/common/xyzModem.c
index 6bf2375671d..e8eb578f696 100644
--- a/common/xyzModem.c
+++ b/common/xyzModem.c
@@ -22,6 +22,7 @@
  *==========================================================================
  */
 #include <common.h>
+#include <time.h>
 #include <xyzModem.h>
 #include <stdarg.h>
 #include <u-boot/crc.h>
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index 47cdea1f586..f251ee1b74a 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -12,6 +12,7 @@
 #include <blk.h>
 #include <cpu_func.h>
 #include <log.h>
+#include <time.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index 9021a00cdb6..8071fe18a71 100644
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -37,6 +37,7 @@
 #include <cpu_func.h>
 #include <dm.h>
 #include <log.h>
+#include <time.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <dm/device-internal.h>
diff --git a/drivers/ddr/altera/sdram_soc64.c b/drivers/ddr/altera/sdram_soc64.c
index 40fcc8d2e0f..66dad034fa2 100644
--- a/drivers/ddr/altera/sdram_soc64.c
+++ b/drivers/ddr/altera/sdram_soc64.c
@@ -15,6 +15,7 @@
 #include <log.h>
 #include <ram.h>
 #include <reset.h>
+#include <time.h>
 #include <asm/global_data.h>
 #include "sdram_soc64.h"
 #include <wait_bit.h>
diff --git a/drivers/dma/lpc32xx_dma.c b/drivers/dma/lpc32xx_dma.c
index 0efdfd028cf..3fd56053fae 100644
--- a/drivers/dma/lpc32xx_dma.c
+++ b/drivers/dma/lpc32xx_dma.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <errno.h>
 #include <init.h>
+#include <time.h>
 #include <asm/arch/dma.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/clk.h>
diff --git a/drivers/fpga/ACEX1K.c b/drivers/fpga/ACEX1K.c
index 30a3727433e..6c5097d94c7 100644
--- a/drivers/fpga/ACEX1K.c
+++ b/drivers/fpga/ACEX1K.c
@@ -10,6 +10,7 @@
 #include <common.h>		/* core U-Boot definitions */
 #include <console.h>
 #include <ACEX1K.h>		/* ACEX device family */
+#include <time.h>
 #include <linux/delay.h>
 
 /* Define FPGA_DEBUG to get debug printf's */
diff --git a/drivers/fpga/cyclon2.c b/drivers/fpga/cyclon2.c
index 3b008facb8c..477379449ed 100644
--- a/drivers/fpga/cyclon2.c
+++ b/drivers/fpga/cyclon2.c
@@ -8,6 +8,7 @@
 #include <common.h>		/* core U-Boot definitions */
 #include <altera.h>
 #include <ACEX1K.h>		/* ACEX device family */
+#include <time.h>
 #include <linux/delay.h>
 
 /* Define FPGA_DEBUG to get debug printf's */
diff --git a/drivers/fpga/socfpga_arria10.c b/drivers/fpga/socfpga_arria10.c
index 92e6bd1c34f..46018ebe7c6 100644
--- a/drivers/fpga/socfpga_arria10.c
+++ b/drivers/fpga/socfpga_arria10.c
@@ -4,6 +4,7 @@
  */
 #include <image.h>
 #include <log.h>
+#include <time.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/fpga_manager.h>
diff --git a/drivers/fpga/spartan2.c b/drivers/fpga/spartan2.c
index fae94f9663a..355104f77d9 100644
--- a/drivers/fpga/spartan2.c
+++ b/drivers/fpga/spartan2.c
@@ -6,6 +6,7 @@
 
 #include <common.h>		/* core U-Boot definitions */
 #include <spartan2.h>		/* Spartan-II device family */
+#include <time.h>
 
 /* Define FPGA_DEBUG to get debug printf's */
 #ifdef	FPGA_DEBUG
diff --git a/drivers/fpga/spartan3.c b/drivers/fpga/spartan3.c
index e40e427a25f..95a361b0e86 100644
--- a/drivers/fpga/spartan3.c
+++ b/drivers/fpga/spartan3.c
@@ -11,6 +11,7 @@
 
 #include <common.h>		/* core U-Boot definitions */
 #include <spartan3.h>		/* Spartan-II device family */
+#include <time.h>
 
 /* Define FPGA_DEBUG to get debug printf's */
 #ifdef	FPGA_DEBUG
diff --git a/drivers/fpga/stratix10.c b/drivers/fpga/stratix10.c
index da8fa315e36..bae31c3db1e 100644
--- a/drivers/fpga/stratix10.c
+++ b/drivers/fpga/stratix10.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <altera.h>
 #include <log.h>
+#include <time.h>
 #include <asm/arch/mailbox_s10.h>
 #include <linux/delay.h>
 
diff --git a/drivers/fpga/virtex2.c b/drivers/fpga/virtex2.c
index b3e0537bab0..aae9250f198 100644
--- a/drivers/fpga/virtex2.c
+++ b/drivers/fpga/virtex2.c
@@ -14,6 +14,7 @@
 
 #include <common.h>
 #include <console.h>
+#include <time.h>
 #include <virtex2.h>
 #include <linux/delay.h>
 
diff --git a/drivers/fpga/zynqpl.c b/drivers/fpga/zynqpl.c
index a11e4855253..86df6fa32d4 100644
--- a/drivers/fpga/zynqpl.c
+++ b/drivers/fpga/zynqpl.c
@@ -10,6 +10,7 @@
 #include <console.h>
 #include <cpu_func.h>
 #include <log.h>
+#include <time.h>
 #include <asm/cache.h>
 #include <asm/io.h>
 #include <fs.h>
diff --git a/drivers/hwspinlock/hwspinlock-uclass.c b/drivers/hwspinlock/hwspinlock-uclass.c
index fdc90c3f0e0..6100fdfd0a5 100644
--- a/drivers/hwspinlock/hwspinlock-uclass.c
+++ b/drivers/hwspinlock/hwspinlock-uclass.c
@@ -8,6 +8,7 @@
 #include <errno.h>
 #include <hwspinlock.h>
 #include <log.h>
+#include <time.h>
 #include <asm/global_data.h>
 #include <dm/device-internal.h>
 #include <dm/device_compat.h>
diff --git a/drivers/i2c/at91_i2c.c b/drivers/i2c/at91_i2c.c
index ee5dc1db96c..57fbb0ce262 100644
--- a/drivers/i2c/at91_i2c.c
+++ b/drivers/i2c/at91_i2c.c
@@ -6,6 +6,7 @@
  */
 
 #include <malloc.h>
+#include <time.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <common.h>
diff --git a/drivers/i2c/designware_i2c.c b/drivers/i2c/designware_i2c.c
index cf892c69d9f..6cd5d517de7 100644
--- a/drivers/i2c/designware_i2c.c
+++ b/drivers/i2c/designware_i2c.c
@@ -12,6 +12,7 @@
 #include <malloc.h>
 #include <pci.h>
 #include <reset.h>
+#include <time.h>
 #include <asm/io.h>
 #include <linux/delay.h>
 #include "designware_i2c.h"
diff --git a/drivers/i2c/i2c-cortina.c b/drivers/i2c/i2c-cortina.c
index 036fc4282b5..4129d6a6888 100644
--- a/drivers/i2c/i2c-cortina.c
+++ b/drivers/i2c/i2c-cortina.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <i2c.h>
 #include <log.h>
+#include <time.h>
 #include <asm/io.h>
 #include <dm.h>
 #include <mapmem.h>
diff --git a/drivers/i2c/imx_lpi2c.c b/drivers/i2c/imx_lpi2c.c
index feeed1e9a2f..b02f3883b0d 100644
--- a/drivers/i2c/imx_lpi2c.c
+++ b/drivers/i2c/imx_lpi2c.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <errno.h>
 #include <log.h>
+#include <time.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
diff --git a/drivers/i2c/intel_i2c.c b/drivers/i2c/intel_i2c.c
index 3b79cb40cd3..a7ac09a27e5 100644
--- a/drivers/i2c/intel_i2c.c
+++ b/drivers/i2c/intel_i2c.c
@@ -12,6 +12,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <pci.h>
+#include <time.h>
 #include <asm/io.h>
 
 /* PCI Configuration Space (D31:F3): SMBus */
diff --git a/drivers/i2c/meson_i2c.c b/drivers/i2c/meson_i2c.c
index e070caf43f2..b133aa1175e 100644
--- a/drivers/i2c/meson_i2c.c
+++ b/drivers/i2c/meson_i2c.c
@@ -4,6 +4,7 @@
  */
 #include <common.h>
 #include <log.h>
+#include <time.h>
 #include <asm/io.h>
 #include <clk.h>
 #include <dm.h>
diff --git a/drivers/i2c/muxes/i2c-arb-gpio-challenge.c b/drivers/i2c/muxes/i2c-arb-gpio-challenge.c
index 4be32a1b38c..567660f9a74 100644
--- a/drivers/i2c/muxes/i2c-arb-gpio-challenge.c
+++ b/drivers/i2c/muxes/i2c-arb-gpio-challenge.c
@@ -10,6 +10,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <malloc.h>
+#include <time.h>
 #include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <linux/delay.h>
diff --git a/drivers/i2c/mxc_i2c.c b/drivers/i2c/mxc_i2c.c
index c1204815c20..e4e50436379 100644
--- a/drivers/i2c/mxc_i2c.c
+++ b/drivers/i2c/mxc_i2c.c
@@ -16,6 +16,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <time.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/global_data.h>
diff --git a/drivers/i2c/nx_i2c.c b/drivers/i2c/nx_i2c.c
index ca14a0ecac7..af58c2c76ef 100644
--- a/drivers/i2c/nx_i2c.c
+++ b/drivers/i2c/nx_i2c.c
@@ -3,6 +3,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <log.h>
+#include <time.h>
 #include <asm/arch/nexell.h>
 #include <asm/arch/reset.h>
 #include <asm/arch/clk.h>
diff --git a/drivers/i2c/octeon_i2c.c b/drivers/i2c/octeon_i2c.c
index c11d6ff93d1..ef04ae5698a 100644
--- a/drivers/i2c/octeon_i2c.c
+++ b/drivers/i2c/octeon_i2c.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <pci_ids.h>
+#include <time.h>
 #include <asm/io.h>
 #include <linux/bitfield.h>
 #include <linux/compat.h>
diff --git a/drivers/i2c/rk_i2c.c b/drivers/i2c/rk_i2c.c
index 659461088b7..81d8e1eb11d 100644
--- a/drivers/i2c/rk_i2c.c
+++ b/drivers/i2c/rk_i2c.c
@@ -12,6 +12,7 @@
 #include <errno.h>
 #include <i2c.h>
 #include <log.h>
+#include <time.h>
 #include <asm/io.h>
 #include <asm/arch-rockchip/clock.h>
 #include <asm/arch-rockchip/i2c.h>
diff --git a/drivers/i2c/s3c24x0_i2c.c b/drivers/i2c/s3c24x0_i2c.c
index 43699fc2410..0fe92fe2357 100644
--- a/drivers/i2c/s3c24x0_i2c.c
+++ b/drivers/i2c/s3c24x0_i2c.c
@@ -16,6 +16,7 @@
 #else
 #include <asm/arch/s3c24x0_cpu.h>
 #endif
+#include <time.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <i2c.h>
diff --git a/drivers/i2c/stm32f7_i2c.c b/drivers/i2c/stm32f7_i2c.c
index 6c2fff1c52b..fc60f5285ab 100644
--- a/drivers/i2c/stm32f7_i2c.c
+++ b/drivers/i2c/stm32f7_i2c.c
@@ -11,6 +11,7 @@
 #include <regmap.h>
 #include <reset.h>
 #include <syscon.h>
+#include <time.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/printk.h>
diff --git a/drivers/input/input.c b/drivers/input/input.c
index da264f4166e..24e76052b88 100644
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -17,6 +17,7 @@
 #ifdef CONFIG_DM_KEYBOARD
 #include <keyboard.h>
 #endif
+#include <time.h>
 #include <linux/input.h>
 
 enum {
diff --git a/drivers/input/tegra-kbc.c b/drivers/input/tegra-kbc.c
index f07a51dc307..74ece4762e3 100644
--- a/drivers/input/tegra-kbc.c
+++ b/drivers/input/tegra-kbc.c
@@ -13,6 +13,7 @@
 #include <log.h>
 #include <stdio_dev.h>
 #include <tegra-kbc.h>
+#include <time.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/funcmux.h>
diff --git a/drivers/misc/cros_ec.c b/drivers/misc/cros_ec.c
index a5534b16673..ccac7a60c12 100644
--- a/drivers/misc/cros_ec.c
+++ b/drivers/misc/cros_ec.c
@@ -25,6 +25,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <spi.h>
+#include <time.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/io.h>
diff --git a/drivers/misc/cros_ec_lpc.c b/drivers/misc/cros_ec_lpc.c
index 4ad6c8ca66d..0a4f45b2e89 100644
--- a/drivers/misc/cros_ec_lpc.c
+++ b/drivers/misc/cros_ec_lpc.c
@@ -17,6 +17,7 @@
 #include <command.h>
 #include <cros_ec.h>
 #include <log.h>
+#include <time.h>
 #include <asm/io.h>
 
 #ifdef DEBUG_TRACE
diff --git a/drivers/misc/cros_ec_sandbox.c b/drivers/misc/cros_ec_sandbox.c
index a191f061b89..8575e56a337 100644
--- a/drivers/misc/cros_ec_sandbox.c
+++ b/drivers/misc/cros_ec_sandbox.c
@@ -13,6 +13,7 @@
 #include <hash.h>
 #include <log.h>
 #include <os.h>
+#include <time.h>
 #include <u-boot/sha256.h>
 #include <spi.h>
 #include <asm/malloc.h>
diff --git a/drivers/misc/cros_ec_spi.c b/drivers/misc/cros_ec_spi.c
index 153f971bdeb..d8778eeb387 100644
--- a/drivers/misc/cros_ec_spi.c
+++ b/drivers/misc/cros_ec_spi.c
@@ -18,6 +18,7 @@
 #include <errno.h>
 #include <log.h>
 #include <spi.h>
+#include <time.h>
 
 int cros_ec_spi_packet(struct udevice *udev, int out_bytes, int in_bytes)
 {
diff --git a/drivers/mmc/am654_sdhci.c b/drivers/mmc/am654_sdhci.c
index cbc531dc535..8c6894921d2 100644
--- a/drivers/mmc/am654_sdhci.c
+++ b/drivers/mmc/am654_sdhci.c
@@ -12,6 +12,7 @@
 #include <power-domain.h>
 #include <regmap.h>
 #include <sdhci.h>
+#include <time.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/err.h>
diff --git a/drivers/mmc/bcm2835_sdhost.c b/drivers/mmc/bcm2835_sdhost.c
index b793028ab53..a138165855d 100644
--- a/drivers/mmc/bcm2835_sdhost.c
+++ b/drivers/mmc/bcm2835_sdhost.c
@@ -33,6 +33,7 @@
 #include <common.h>
 #include <dm.h>
 #include <mmc.h>
+#include <time.h>
 #include <asm/arch/msg.h>
 #include <asm/arch/mbox.h>
 #include <asm/unaligned.h>
diff --git a/drivers/mmc/dw_mmc.c b/drivers/mmc/dw_mmc.c
index 7702f4be3f8..ce7cfb5930e 100644
--- a/drivers/mmc/dw_mmc.c
+++ b/drivers/mmc/dw_mmc.c
@@ -14,6 +14,7 @@
 #include <memalign.h>
 #include <mmc.h>
 #include <dwmmc.h>
+#include <time.h>
 #include <wait_bit.h>
 #include <asm/cache.h>
 #include <linux/delay.h>
diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c
index 0f9109a2c69..058ba827940 100644
--- a/drivers/mmc/fsl_esdhc.c
+++ b/drivers/mmc/fsl_esdhc.c
@@ -20,6 +20,7 @@
 #include <malloc.h>
 #include <fsl_esdhc.h>
 #include <fdt_support.h>
+#include <time.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/mmc/fsl_esdhc_imx.c b/drivers/mmc/fsl_esdhc_imx.c
index a2102449bb8..5fdcffd5d2c 100644
--- a/drivers/mmc/fsl_esdhc_imx.c
+++ b/drivers/mmc/fsl_esdhc_imx.c
@@ -20,6 +20,7 @@
 #include <log.h>
 #include <mmc.h>
 #include <part.h>
+#include <time.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <dm/device_compat.h>
diff --git a/drivers/mmc/ftsdc010_mci.c b/drivers/mmc/ftsdc010_mci.c
index 71818f964d3..113ed2b7a71 100644
--- a/drivers/mmc/ftsdc010_mci.c
+++ b/drivers/mmc/ftsdc010_mci.c
@@ -15,6 +15,7 @@
 #include <malloc.h>
 #include <part.h>
 #include <mmc.h>
+#include <time.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/io.h>
diff --git a/drivers/mmc/meson_gx_mmc.c b/drivers/mmc/meson_gx_mmc.c
index 719dd1e5e57..f70ced37d31 100644
--- a/drivers/mmc/meson_gx_mmc.c
+++ b/drivers/mmc/meson_gx_mmc.c
@@ -11,6 +11,7 @@
 #include <malloc.h>
 #include <pwrseq.h>
 #include <mmc.h>
+#include <time.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
 #include <asm/arch/sd_emmc.h>
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index 2899986fcf1..544534a78a7 100644
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@ -13,6 +13,7 @@
 #include <command.h>
 #include <dm.h>
 #include <log.h>
+#include <time.h>
 #include <dm/device-internal.h>
 #include <errno.h>
 #include <mmc.h>
diff --git a/drivers/mmc/mvebu_mmc.c b/drivers/mmc/mvebu_mmc.c
index 8ec1f57a1b7..8101f6bcc27 100644
--- a/drivers/mmc/mvebu_mmc.c
+++ b/drivers/mmc/mvebu_mmc.c
@@ -13,6 +13,7 @@
 #include <malloc.h>
 #include <part.h>
 #include <mmc.h>
+#include <time.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
diff --git a/drivers/mmc/omap_hsmmc.c b/drivers/mmc/omap_hsmmc.c
index c5e57528660..c54edd9c8d1 100644
--- a/drivers/mmc/omap_hsmmc.c
+++ b/drivers/mmc/omap_hsmmc.c
@@ -34,6 +34,7 @@
 #if defined(CONFIG_OMAP54XX) || defined(CONFIG_OMAP44XX)
 #include <palmas.h>
 #endif
+#include <time.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c
index 210087c0af9..01dc9c3fd54 100644
--- a/drivers/mmc/sdhci.c
+++ b/drivers/mmc/sdhci.c
@@ -16,6 +16,7 @@
 #include <mmc.h>
 #include <sdhci.h>
 #include <dm.h>
+#include <time.h>
 #include <asm/cache.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/drivers/mmc/sunxi_mmc.c b/drivers/mmc/sunxi_mmc.c
index 0e03b07ce55..f9046305930 100644
--- a/drivers/mmc/sunxi_mmc.c
+++ b/drivers/mmc/sunxi_mmc.c
@@ -15,6 +15,7 @@
 #include <mmc.h>
 #include <clk.h>
 #include <reset.h>
+#include <time.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/cpu.h>
diff --git a/drivers/mmc/tegra_mmc.c b/drivers/mmc/tegra_mmc.c
index cc78a2f2f08..94e062c1246 100644
--- a/drivers/mmc/tegra_mmc.c
+++ b/drivers/mmc/tegra_mmc.c
@@ -12,6 +12,7 @@
 #include <errno.h>
 #include <log.h>
 #include <mmc.h>
+#include <time.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <asm/arch-tegra/tegra_mmc.h>
diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c
index feb46d8cf28..74cf47b7637 100644
--- a/drivers/mtd/cfi_flash.c
+++ b/drivers/mtd/cfi_flash.c
@@ -26,6 +26,7 @@
 #include <init.h>
 #include <irq_func.h>
 #include <log.h>
+#include <time.h>
 #include <asm/global_data.h>
 #include <asm/processor.h>
 #include <asm/io.h>
diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand.c b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
index 48c0ca69de5..a57013e72c4 100644
--- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c
+++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
@@ -13,6 +13,7 @@
  */
 
 #include <common.h>
+#include <time.h>
 #include <asm/io.h>
 #include <memalign.h>
 #include <nand.h>
diff --git a/drivers/mtd/nand/raw/fsl_elbc_nand.c b/drivers/mtd/nand/raw/fsl_elbc_nand.c
index 0c1bd7b4740..32ee212694a 100644
--- a/drivers/mtd/nand/raw/fsl_elbc_nand.c
+++ b/drivers/mtd/nand/raw/fsl_elbc_nand.c
@@ -11,6 +11,7 @@
 #include <command.h>
 #include <malloc.h>
 #include <nand.h>
+#include <time.h>
 #include <dm/devres.h>
 
 #include <linux/mtd/mtd.h>
diff --git a/drivers/mtd/nand/raw/fsl_ifc_nand.c b/drivers/mtd/nand/raw/fsl_ifc_nand.c
index cf20238782c..964a329023d 100644
--- a/drivers/mtd/nand/raw/fsl_ifc_nand.c
+++ b/drivers/mtd/nand/raw/fsl_ifc_nand.c
@@ -10,6 +10,7 @@
 #include <command.h>
 #include <malloc.h>
 #include <nand.h>
+#include <time.h>
 #include <dm/devres.h>
 
 #include <linux/mtd/mtd.h>
diff --git a/drivers/mtd/nand/raw/fsmc_nand.c b/drivers/mtd/nand/raw/fsmc_nand.c
index 1f4c74f0f63..ad34af30e81 100644
--- a/drivers/mtd/nand/raw/fsmc_nand.c
+++ b/drivers/mtd/nand/raw/fsmc_nand.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <nand.h>
+#include <time.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/err.h>
diff --git a/drivers/mtd/nand/raw/mxs_nand_spl.c b/drivers/mtd/nand/raw/mxs_nand_spl.c
index 46dc29df369..ee778e13aa1 100644
--- a/drivers/mtd/nand/raw/mxs_nand_spl.c
+++ b/drivers/mtd/nand/raw/mxs_nand_spl.c
@@ -9,6 +9,7 @@
 #include <nand.h>
 #include <malloc.h>
 #include <mxs_nand.h>
+#include <time.h>
 #include <asm/cache.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/drivers/mtd/nand/raw/nand_base.c b/drivers/mtd/nand/raw/nand_base.c
index 7cd1e133c22..693e088f19a 100644
--- a/drivers/mtd/nand/raw/nand_base.c
+++ b/drivers/mtd/nand/raw/nand_base.c
@@ -34,6 +34,7 @@
 #endif
 #include <log.h>
 #include <malloc.h>
+#include <time.h>
 #include <watchdog.h>
 #include <asm/global_data.h>
 #include <dm/devres.h>
diff --git a/drivers/mtd/nand/raw/pxa3xx_nand.c b/drivers/mtd/nand/raw/pxa3xx_nand.c
index 224db72087b..bccaa2d8212 100644
--- a/drivers/mtd/nand/raw/pxa3xx_nand.c
+++ b/drivers/mtd/nand/raw/pxa3xx_nand.c
@@ -10,6 +10,7 @@
 #include <malloc.h>
 #include <fdtdec.h>
 #include <nand.h>
+#include <time.h>
 #include <asm/global_data.h>
 #include <dm/device_compat.h>
 #include <dm/devres.h>
diff --git a/drivers/mtd/nand/raw/sunxi_nand.c b/drivers/mtd/nand/raw/sunxi_nand.c
index 2946f94b6df..606e606fe8b 100644
--- a/drivers/mtd/nand/raw/sunxi_nand.c
+++ b/drivers/mtd/nand/raw/sunxi_nand.c
@@ -29,6 +29,7 @@
 #include <malloc.h>
 #include <memalign.h>
 #include <nand.h>
+#include <time.h>
 #include <asm/global_data.h>
 #include <dm/device_compat.h>
 #include <dm/devres.h>
diff --git a/drivers/mtd/nand/raw/vf610_nfc.c b/drivers/mtd/nand/raw/vf610_nfc.c
index bee273b1a64..02ca385ed2d 100644
--- a/drivers/mtd/nand/raw/vf610_nfc.c
+++ b/drivers/mtd/nand/raw/vf610_nfc.c
@@ -23,6 +23,7 @@
 
 #include <common.h>
 #include <malloc.h>
+#include <time.h>
 #include <dm/device_compat.h>
 #include <linux/printk.h>
 
diff --git a/drivers/mtd/nand/spi/core.c b/drivers/mtd/nand/spi/core.c
index 63248f648a1..ae8932d377c 100644
--- a/drivers/mtd/nand/spi/core.c
+++ b/drivers/mtd/nand/spi/core.c
@@ -24,6 +24,7 @@
 #include <errno.h>
 #include <spi.h>
 #include <spi-mem.h>
+#include <time.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 ad9b61f396f..cfc137c6b95 100644
--- a/drivers/mtd/onenand/onenand_base.c
+++ b/drivers/mtd/onenand/onenand_base.c
@@ -21,6 +21,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <time.h>
 #include <watchdog.h>
 #include <dm/devres.h>
 #include <linux/bitops.h>
diff --git a/drivers/mtd/spi/sf_dataflash.c b/drivers/mtd/spi/sf_dataflash.c
index b1034ac2086..c292ddfb893 100644
--- a/drivers/mtd/spi/sf_dataflash.c
+++ b/drivers/mtd/spi/sf_dataflash.c
@@ -16,6 +16,7 @@
 #include <spi.h>
 #include <spi_flash.h>
 #include <div64.h>
+#include <time.h>
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/math64.h>
diff --git a/drivers/mtd/spi/spi-nor-core.c b/drivers/mtd/spi/spi-nor-core.c
index da2777f777e..3baac137aed 100644
--- a/drivers/mtd/spi/spi-nor-core.c
+++ b/drivers/mtd/spi/spi-nor-core.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <display_options.h>
 #include <log.h>
+#include <time.h>
 #include <dm/device_compat.h>
 #include <dm/devres.h>
 #include <linux/bitops.h>
diff --git a/drivers/mtd/spi/spi-nor-tiny.c b/drivers/mtd/spi/spi-nor-tiny.c
index a2c8c30ed7b..532e9a2c9e4 100644
--- a/drivers/mtd/spi/spi-nor-tiny.c
+++ b/drivers/mtd/spi/spi-nor-tiny.c
@@ -11,6 +11,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <time.h>
 #include <dm/device_compat.h>
 #include <linux/err.h>
 #include <linux/errno.h>
diff --git a/drivers/mtd/st_smi.c b/drivers/mtd/st_smi.c
index 7c652e6c535..970c6ee7043 100644
--- a/drivers/mtd/st_smi.c
+++ b/drivers/mtd/st_smi.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <flash.h>
+#include <time.h>
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/mtd/st_smi.h>
diff --git a/drivers/net/ag7xxx.c b/drivers/net/ag7xxx.c
index c7ea60f5acc..48cf45d9a8f 100644
--- a/drivers/net/ag7xxx.c
+++ b/drivers/net/ag7xxx.c
@@ -15,6 +15,7 @@
 #include <miiphy.h>
 #include <malloc.h>
 #include <net.h>
+#include <time.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
diff --git a/drivers/net/altera_tse.c b/drivers/net/altera_tse.c
index 2097718057b..8b4ab9627c3 100644
--- a/drivers/net/altera_tse.c
+++ b/drivers/net/altera_tse.c
@@ -17,6 +17,7 @@
 #include <memalign.h>
 #include <miiphy.h>
 #include <net.h>
+#include <time.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <linux/dma-mapping.h>
diff --git a/drivers/net/cs8900.c b/drivers/net/cs8900.c
index 9440a91882f..d58ae075830 100644
--- a/drivers/net/cs8900.c
+++ b/drivers/net/cs8900.c
@@ -26,6 +26,7 @@
 #include <common.h>
 #include <command.h>
 #include <log.h>
+#include <time.h>
 #include <asm/io.h>
 #include <net.h>
 #include <malloc.h>
diff --git a/drivers/net/designware.c b/drivers/net/designware.c
index 0ab1a12d762..c2f3a6483dd 100644
--- a/drivers/net/designware.c
+++ b/drivers/net/designware.c
@@ -19,6 +19,7 @@
 #include <net.h>
 #include <pci.h>
 #include <reset.h>
+#include <time.h>
 #include <asm/cache.h>
 #include <dm/device_compat.h>
 #include <dm/devres.h>
diff --git a/drivers/net/dm9000x.c b/drivers/net/dm9000x.c
index e46a269af90..3ff3824d52f 100644
--- a/drivers/net/dm9000x.c
+++ b/drivers/net/dm9000x.c
@@ -52,6 +52,7 @@ TODO: external MII is not functional, only internal at the moment.
 #include <common.h>
 #include <command.h>
 #include <net.h>
+#include <time.h>
 #include <asm/io.h>
 #include <dm9000.h>
 #include <linux/delay.h>
diff --git a/drivers/net/ethoc.c b/drivers/net/ethoc.c
index b9d80a5b08a..a93358af1a7 100644
--- a/drivers/net/ethoc.c
+++ b/drivers/net/ethoc.c
@@ -13,6 +13,7 @@
 #include <cpu_func.h>
 #include <dm.h>
 #include <log.h>
+#include <time.h>
 #include <dm/platform_data/net_ethoc.h>
 #include <linux/io.h>
 #include <malloc.h>
diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c
index 468be69886c..c0fc3133afb 100644
--- a/drivers/net/fec_mxc.c
+++ b/drivers/net/fec_mxc.c
@@ -17,6 +17,7 @@
 #include <miiphy.h>
 #include <net.h>
 #include <netdev.h>
+#include <time.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
diff --git a/drivers/net/ftmac100.c b/drivers/net/ftmac100.c
index d45f17eb8dd..4b94fd6405a 100644
--- a/drivers/net/ftmac100.c
+++ b/drivers/net/ftmac100.c
@@ -12,6 +12,7 @@
 #include <env.h>
 #include <malloc.h>
 #include <net.h>
+#include <time.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/io.h>
diff --git a/drivers/net/ftmac110.c b/drivers/net/ftmac110.c
index 265d813c4f8..d4a92a70e73 100644
--- a/drivers/net/ftmac110.c
+++ b/drivers/net/ftmac110.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <net.h>
+#include <time.h>
 #include <asm/cache.h>
 #include <linux/errno.h>
 #include <asm/io.h>
diff --git a/drivers/net/lan91c96.c b/drivers/net/lan91c96.c
index 470c68467cd..ce3c406ea6c 100644
--- a/drivers/net/lan91c96.c
+++ b/drivers/net/lan91c96.c
@@ -48,6 +48,7 @@
 #include <command.h>
 #include <env.h>
 #include <malloc.h>
+#include <time.h>
 #include <linux/delay.h>
 #include "lan91c96.h"
 #include <net.h>
diff --git a/drivers/net/ldpaa_eth/ldpaa_eth.c b/drivers/net/ldpaa_eth/ldpaa_eth.c
index b340c576108..bbd2aed0ab2 100644
--- a/drivers/net/ldpaa_eth/ldpaa_eth.c
+++ b/drivers/net/ldpaa_eth/ldpaa_eth.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <log.h>
+#include <time.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/types.h>
diff --git a/drivers/net/mtk_eth.c b/drivers/net/mtk_eth.c
index 24a18ce9687..774c1e3bb51 100644
--- a/drivers/net/mtk_eth.c
+++ b/drivers/net/mtk_eth.c
@@ -16,6 +16,7 @@
 #include <regmap.h>
 #include <reset.h>
 #include <syscon.h>
+#include <time.h>
 #include <wait_bit.h>
 #include <asm/cache.h>
 #include <asm/gpio.h>
diff --git a/drivers/net/ne2000_base.c b/drivers/net/ne2000_base.c
index 09cc8398003..25c258dd3f7 100644
--- a/drivers/net/ne2000_base.c
+++ b/drivers/net/ne2000_base.c
@@ -78,6 +78,7 @@ Add SNMP
 #include <log.h>
 #include <net.h>
 #include <malloc.h>
+#include <time.h>
 #include <linux/compiler.h>
 
 /* forward definition of function used for the uboot interface */
diff --git a/drivers/net/pch_gbe.c b/drivers/net/pch_gbe.c
index 1daafbe2b9b..20d757f5dff 100644
--- a/drivers/net/pch_gbe.c
+++ b/drivers/net/pch_gbe.c
@@ -11,6 +11,7 @@
 #include <errno.h>
 #include <log.h>
 #include <malloc.h>
+#include <time.h>
 #include <asm/io.h>
 #include <pci.h>
 #include <miiphy.h>
diff --git a/drivers/net/ravb.c b/drivers/net/ravb.c
index 23d5c88a88d..6ab56e6e653 100644
--- a/drivers/net/ravb.c
+++ b/drivers/net/ravb.c
@@ -16,6 +16,7 @@
 #include <log.h>
 #include <miiphy.h>
 #include <malloc.h>
+#include <time.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
diff --git a/drivers/net/rtl8169.c b/drivers/net/rtl8169.c
index 3f6805791f4..5ff99273a02 100644
--- a/drivers/net/rtl8169.c
+++ b/drivers/net/rtl8169.c
@@ -50,6 +50,7 @@
 #ifndef CONFIG_DM_ETH
 #include <netdev.h>
 #endif
+#include <time.h>
 #include <asm/cache.h>
 #include <asm/io.h>
 #include <pci.h>
diff --git a/drivers/net/sandbox.c b/drivers/net/sandbox.c
index 51d80f54967..555d9147d11 100644
--- a/drivers/net/sandbox.c
+++ b/drivers/net/sandbox.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <net.h>
+#include <time.h>
 #include <asm/eth.h>
 #include <asm/global_data.h>
 #include <asm/test.h>
diff --git a/drivers/net/smc91111.c b/drivers/net/smc91111.c
index fea6ba8caaa..3ae9f805a79 100644
--- a/drivers/net/smc91111.c
+++ b/drivers/net/smc91111.c
@@ -51,6 +51,7 @@
 #include <command.h>
 #include <config.h>
 #include <malloc.h>
+#include <time.h>
 #include <linux/delay.h>
 #include "smc91111.h"
 #include <net.h>
diff --git a/drivers/net/sun8i_emac.c b/drivers/net/sun8i_emac.c
index a65700020d5..e74cfa99324 100644
--- a/drivers/net/sun8i_emac.c
+++ b/drivers/net/sun8i_emac.c
@@ -12,6 +12,7 @@
 
 #include <cpu_func.h>
 #include <log.h>
+#include <time.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/net/xilinx_emaclite.c b/drivers/net/xilinx_emaclite.c
index 9f2327b92cd..321429090f6 100644
--- a/drivers/net/xilinx_emaclite.c
+++ b/drivers/net/xilinx_emaclite.c
@@ -13,6 +13,7 @@
 #include <dm.h>
 #include <console.h>
 #include <malloc.h>
+#include <time.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <phy.h>
diff --git a/drivers/pci/pci_rom.c b/drivers/pci/pci_rom.c
index 39284badf20..c69919faafe 100644
--- a/drivers/pci/pci_rom.c
+++ b/drivers/pci/pci_rom.c
@@ -34,6 +34,7 @@
 #include <malloc.h>
 #include <pci.h>
 #include <pci_rom.h>
+#include <time.h>
 #include <vbe.h>
 #include <video.h>
 #include <video_fb.h>
diff --git a/drivers/pci/pci_tegra.c b/drivers/pci/pci_tegra.c
index d15fabd9226..abd4e26543b 100644
--- a/drivers/pci/pci_tegra.c
+++ b/drivers/pci/pci_tegra.c
@@ -21,6 +21,7 @@
 #include <pci_tegra.h>
 #include <power-domain.h>
 #include <reset.h>
+#include <time.h>
 #include <linux/delay.h>
 #include <linux/printk.h>
 
diff --git a/drivers/pci/pcie_dw_mvebu.c b/drivers/pci/pcie_dw_mvebu.c
index 33ecd25f848..dbc8bb81a7c 100644
--- a/drivers/pci/pcie_dw_mvebu.c
+++ b/drivers/pci/pcie_dw_mvebu.c
@@ -14,6 +14,7 @@
 #include <dm.h>
 #include <log.h>
 #include <pci.h>
+#include <time.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm-generic/gpio.h>
diff --git a/drivers/pci/pcie_dw_ti.c b/drivers/pci/pcie_dw_ti.c
index 16b2a2da7e7..eed5e428972 100644
--- a/drivers/pci/pcie_dw_ti.c
+++ b/drivers/pci/pcie_dw_ti.c
@@ -11,6 +11,7 @@
 #include <power-domain.h>
 #include <regmap.h>
 #include <syscon.h>
+#include <time.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm-generic/gpio.h>
diff --git a/drivers/phy/phy-da8xx-usb.c b/drivers/phy/phy-da8xx-usb.c
index d025188eae9..ec87d3fea2d 100644
--- a/drivers/phy/phy-da8xx-usb.c
+++ b/drivers/phy/phy-da8xx-usb.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <time.h>
 #include <dm/device-internal.h>
 #include <dm/lists.h>
 #include <asm/arch/hardware.h>
diff --git a/drivers/power/exynos-tmu.c b/drivers/power/exynos-tmu.c
index 4fba7b527c6..bc872488215 100644
--- a/drivers/power/exynos-tmu.c
+++ b/drivers/power/exynos-tmu.c
@@ -21,6 +21,7 @@
 #include <errno.h>
 #include <fdtdec.h>
 #include <log.h>
+#include <time.h>
 #include <tmu.h>
 #include <asm/arch/tmu.h>
 #include <asm/arch/power.h>
diff --git a/drivers/power/regulator/tps65090_regulator.c b/drivers/power/regulator/tps65090_regulator.c
index 9e45627a742..74403a5a894 100644
--- a/drivers/power/regulator/tps65090_regulator.c
+++ b/drivers/power/regulator/tps65090_regulator.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
+#include <time.h>
 #include <linux/delay.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/ram/rockchip/dmc-rk3368.c b/drivers/ram/rockchip/dmc-rk3368.c
index 41773893fd7..faf291e5763 100644
--- a/drivers/ram/rockchip/dmc-rk3368.c
+++ b/drivers/ram/rockchip/dmc-rk3368.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <hang.h>
 #include <log.h>
+#include <time.h>
 #include <dt-bindings/memory/rk3368-dmc.h>
 #include <dt-structs.h>
 #include <ram.h>
diff --git a/drivers/ram/stm32mp1/stm32mp1_interactive.c b/drivers/ram/stm32mp1/stm32mp1_interactive.c
index 7b29c368126..d3b8b3b5afa 100644
--- a/drivers/ram/stm32mp1/stm32mp1_interactive.c
+++ b/drivers/ram/stm32mp1/stm32mp1_interactive.c
@@ -12,6 +12,7 @@
 #include <malloc.h>
 #include <ram.h>
 #include <reset.h>
+#include <time.h>
 #include <asm/global_data.h>
 #include "stm32mp1_ddr.h"
 #include "stm32mp1_tests.h"
diff --git a/drivers/rng/sandbox_rng.c b/drivers/rng/sandbox_rng.c
index cc5e1f6e25b..a55e552177a 100644
--- a/drivers/rng/sandbox_rng.c
+++ b/drivers/rng/sandbox_rng.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <rand.h>
 #include <rng.h>
+#include <time.h>
 
 #include <linux/string.h>
 
diff --git a/drivers/rtc/rv3029.c b/drivers/rtc/rv3029.c
index 3afe5b2fdd6..188560d3d45 100644
--- a/drivers/rtc/rv3029.c
+++ b/drivers/rtc/rv3029.c
@@ -14,6 +14,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <rtc.h>
+#include <time.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/drivers/sound/samsung-i2s.c b/drivers/sound/samsung-i2s.c
index aa1d6bb209b..24e124e8083 100644
--- a/drivers/sound/samsung-i2s.c
+++ b/drivers/sound/samsung-i2s.c
@@ -9,6 +9,7 @@
 #include <i2s.h>
 #include <log.h>
 #include <sound.h>
+#include <time.h>
 #include <asm/arch/clk.h>
 #include <asm/arch/pinmux.h>
 #include <asm/arch/i2s-regs.h>
diff --git a/drivers/sound/tegra_ahub.c b/drivers/sound/tegra_ahub.c
index 26d457255c9..2fead1aeffd 100644
--- a/drivers/sound/tegra_ahub.c
+++ b/drivers/sound/tegra_ahub.c
@@ -12,6 +12,7 @@
 #include <i2s.h>
 #include <log.h>
 #include <misc.h>
+#include <time.h>
 #include <asm/io.h>
 #include <asm/arch-tegra/tegra_ahub.h>
 #include <asm/arch-tegra/tegra_i2s.h>
diff --git a/drivers/spi/altera_spi.c b/drivers/spi/altera_spi.c
index 61372c52b05..c9ef5a69ea9 100644
--- a/drivers/spi/altera_spi.c
+++ b/drivers/spi/altera_spi.c
@@ -13,6 +13,7 @@
 #include <malloc.h>
 #include <fdtdec.h>
 #include <spi.h>
+#include <time.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
 
diff --git a/drivers/spi/cadence_qspi_apb.c b/drivers/spi/cadence_qspi_apb.c
index f9675f75a40..77ec7c6ecda 100644
--- a/drivers/spi/cadence_qspi_apb.c
+++ b/drivers/spi/cadence_qspi_apb.c
@@ -27,6 +27,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <time.h>
 #include <asm/io.h>
 #include <dma.h>
 #include <linux/bitops.h>
diff --git a/drivers/spi/ich.c b/drivers/spi/ich.c
index e1336b89c5a..224c2b07919 100644
--- a/drivers/spi/ich.c
+++ b/drivers/spi/ich.c
@@ -22,6 +22,7 @@
 #include <spi_flash.h>
 #include <spi-mem.h>
 #include <spl.h>
+#include <time.h>
 #include <asm/fast_spi.h>
 #include <asm/io.h>
 #include <dm/uclass-internal.h>
diff --git a/drivers/spi/mpc8xxx_spi.c b/drivers/spi/mpc8xxx_spi.c
index 811b5d44fb2..4f4b7ea22e0 100644
--- a/drivers/spi/mpc8xxx_spi.c
+++ b/drivers/spi/mpc8xxx_spi.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <spi.h>
+#include <time.h>
 #include <asm/mpc8xxx_spi.h>
 #include <asm-generic/gpio.h>
 #include <dm/device_compat.h>
diff --git a/drivers/spi/mxc_spi.c b/drivers/spi/mxc_spi.c
index 14f68da2ee6..cb1abf14416 100644
--- a/drivers/spi/mxc_spi.c
+++ b/drivers/spi/mxc_spi.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <spi.h>
+#include <time.h>
 #include <asm/global_data.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
diff --git a/drivers/spi/omap3_spi.c b/drivers/spi/omap3_spi.c
index afe80e53d2b..942db5ca5ba 100644
--- a/drivers/spi/omap3_spi.c
+++ b/drivers/spi/omap3_spi.c
@@ -20,6 +20,7 @@
 #include <dm.h>
 #include <spi.h>
 #include <malloc.h>
+#include <time.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
diff --git a/drivers/spi/pic32_spi.c b/drivers/spi/pic32_spi.c
index ffba2d84f1f..d08c26c8f4f 100644
--- a/drivers/spi/pic32_spi.c
+++ b/drivers/spi/pic32_spi.c
@@ -10,6 +10,7 @@
 #include <clk.h>
 #include <dm.h>
 #include <log.h>
+#include <time.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/compat.h>
diff --git a/drivers/spi/zynq_qspi.c b/drivers/spi/zynq_qspi.c
index 1358bd10355..af130d4418b 100644
--- a/drivers/spi/zynq_qspi.c
+++ b/drivers/spi/zynq_qspi.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <spi.h>
+#include <time.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
diff --git a/drivers/timer/sandbox_timer.c b/drivers/timer/sandbox_timer.c
index 5228486082c..2120b02d444 100644
--- a/drivers/timer/sandbox_timer.c
+++ b/drivers/timer/sandbox_timer.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
+#include <time.h>
 #include <timer.h>
 #include <os.h>
 
diff --git a/drivers/tpm/cr50_i2c.c b/drivers/tpm/cr50_i2c.c
index 1942c07c605..b0075d3bb48 100644
--- a/drivers/tpm/cr50_i2c.c
+++ b/drivers/tpm/cr50_i2c.c
@@ -13,6 +13,7 @@
 #include <irq.h>
 #include <log.h>
 #include <spl.h>
+#include <time.h>
 #include <tpm-v2.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
diff --git a/drivers/tpm/tpm-uclass.c b/drivers/tpm/tpm-uclass.c
index 6ea795bc0c9..01d7c2f47c1 100644
--- a/drivers/tpm/tpm-uclass.c
+++ b/drivers/tpm/tpm-uclass.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <time.h>
 #include <linux/delay.h>
 #include <linux/unaligned/be_byteshift.h>
 #include <tpm-v1.h>
diff --git a/drivers/tpm/tpm2_tis_spi.c b/drivers/tpm/tpm2_tis_spi.c
index 8ff6c461f19..195d8be8bf3 100644
--- a/drivers/tpm/tpm2_tis_spi.c
+++ b/drivers/tpm/tpm2_tis_spi.c
@@ -18,6 +18,7 @@
 #include <fdtdec.h>
 #include <log.h>
 #include <spi.h>
+#include <time.h>
 #include <tpm-v2.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
diff --git a/drivers/tpm/tpm_atmel_twi.c b/drivers/tpm/tpm_atmel_twi.c
index 5489e728b6e..9444c1b4813 100644
--- a/drivers/tpm/tpm_atmel_twi.c
+++ b/drivers/tpm/tpm_atmel_twi.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <display_options.h>
 #include <dm.h>
+#include <time.h>
 #include <tpm-v1.h>
 #include <i2c.h>
 #include <asm/unaligned.h>
diff --git a/drivers/tpm/tpm_tis_infineon.c b/drivers/tpm/tpm_tis_infineon.c
index 32c3a335420..fe832d41329 100644
--- a/drivers/tpm/tpm_tis_infineon.c
+++ b/drivers/tpm/tpm_tis_infineon.c
@@ -24,6 +24,7 @@
 #include <fdtdec.h>
 #include <i2c.h>
 #include <log.h>
+#include <time.h>
 #include <tpm-v1.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/tpm/tpm_tis_st33zp24_i2c.c b/drivers/tpm/tpm_tis_st33zp24_i2c.c
index a253ee15027..60af8385b5d 100644
--- a/drivers/tpm/tpm_tis_st33zp24_i2c.c
+++ b/drivers/tpm/tpm_tis_st33zp24_i2c.c
@@ -17,6 +17,7 @@
 #include <fdtdec.h>
 #include <i2c.h>
 #include <log.h>
+#include <time.h>
 #include <tpm-v1.h>
 #include <errno.h>
 #include <linux/delay.h>
diff --git a/drivers/tpm/tpm_tis_st33zp24_spi.c b/drivers/tpm/tpm_tis_st33zp24_spi.c
index ef54e3b7b29..edd7d7840b9 100644
--- a/drivers/tpm/tpm_tis_st33zp24_spi.c
+++ b/drivers/tpm/tpm_tis_st33zp24_spi.c
@@ -17,6 +17,7 @@
 #include <fdtdec.h>
 #include <log.h>
 #include <spi.h>
+#include <time.h>
 #include <tpm-v1.h>
 #include <errno.h>
 #include <linux/delay.h>
diff --git a/drivers/ufs/ufs.c b/drivers/ufs/ufs.c
index 87b4e5fc560..97fa80de068 100644
--- a/drivers/ufs/ufs.c
+++ b/drivers/ufs/ufs.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <time.h>
 #include <dm/device_compat.h>
 #include <dm/devres.h>
 #include <dm/lists.h>
diff --git a/drivers/usb/eth/smsc95xx.c b/drivers/usb/eth/smsc95xx.c
index b293a808a3d..dacf607ed83 100644
--- a/drivers/usb/eth/smsc95xx.c
+++ b/drivers/usb/eth/smsc95xx.c
@@ -13,6 +13,7 @@
 #include <malloc.h>
 #include <memalign.h>
 #include <net.h>
+#include <time.h>
 #include <usb.h>
 #include <asm/unaligned.h>
 #include <linux/delay.h>
diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c
index 4a42592b53a..f3885a376b8 100644
--- a/drivers/usb/gadget/ether.c
+++ b/drivers/usb/gadget/ether.c
@@ -12,6 +12,7 @@
 #include <env.h>
 #include <log.h>
 #include <part.h>
+#include <time.h>
 #include <linux/errno.h>
 #include <linux/netdevice.h>
 #include <linux/printk.h>
diff --git a/drivers/usb/gadget/fotg210.c b/drivers/usb/gadget/fotg210.c
index af43433d88d..c6eb22bdfd3 100644
--- a/drivers/usb/gadget/fotg210.c
+++ b/drivers/usb/gadget/fotg210.c
@@ -13,6 +13,7 @@
 #include <log.h>
 #include <net.h>
 #include <malloc.h>
+#include <time.h>
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/usb/gadget/pxa25x_udc.c b/drivers/usb/gadget/pxa25x_udc.c
index d19ac1d0353..2d9f2e4e33d 100644
--- a/drivers/usb/gadget/pxa25x_udc.c
+++ b/drivers/usb/gadget/pxa25x_udc.c
@@ -19,6 +19,7 @@
 #include <common.h>
 #include <errno.h>
 #include <log.h>
+#include <time.h>
 #include <asm/byteorder.h>
 #include <asm/system.h>
 #include <asm/mach-types.h>
diff --git a/drivers/usb/host/dwc2.c b/drivers/usb/host/dwc2.c
index cefe9d83b1d..ec0b799e149 100644
--- a/drivers/usb/host/dwc2.c
+++ b/drivers/usb/host/dwc2.c
@@ -14,6 +14,7 @@
 #include <malloc.h>
 #include <memalign.h>
 #include <phys2bus.h>
+#include <time.h>
 #include <usb.h>
 #include <usbroothubdes.h>
 #include <wait_bit.h>
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index f79f06320bf..26400cac08c 100644
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -11,6 +11,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
+#include <time.h>
 #include <asm/byteorder.h>
 #include <asm/cache.h>
 #include <asm/unaligned.h>
diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c
index 82b99eeef1e..90a02406836 100644
--- a/drivers/usb/host/ehci-omap.c
+++ b/drivers/usb/host/ehci-omap.c
@@ -12,6 +12,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <time.h>
 #include <usb.h>
 #include <linux/delay.h>
 #include <usb/ulpi.h>
diff --git a/drivers/usb/host/ohci-da8xx.c b/drivers/usb/host/ohci-da8xx.c
index 22e7b565b5b..e9f87cfb7b0 100644
--- a/drivers/usb/host/ohci-da8xx.c
+++ b/drivers/usb/host/ohci-da8xx.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <malloc.h>
+#include <time.h>
 #include <asm/io.h>
 #include <clk.h>
 #include <dm.h>
diff --git a/drivers/usb/host/sl811-hcd.c b/drivers/usb/host/sl811-hcd.c
index 7c823f241a8..39d5988b36a 100644
--- a/drivers/usb/host/sl811-hcd.c
+++ b/drivers/usb/host/sl811-hcd.c
@@ -20,6 +20,7 @@
 
 #include <common.h>
 #include <mpc8xx.h>
+#include <time.h>
 #include <usb.h>
 #include <linux/delay.h>
 #include "sl811.h"
diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
index 86aeaab412e..1811e4377da 100644
--- a/drivers/usb/host/xhci-ring.c
+++ b/drivers/usb/host/xhci-ring.c
@@ -16,6 +16,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <log.h>
+#include <time.h>
 #include <asm/byteorder.h>
 #include <usb.h>
 #include <asm/unaligned.h>
diff --git a/drivers/usb/musb-new/am35x.c b/drivers/usb/musb-new/am35x.c
index 0a52e09e19f..ea0a944a87b 100644
--- a/drivers/usb/musb-new/am35x.c
+++ b/drivers/usb/musb-new/am35x.c
@@ -25,6 +25,7 @@
 #include <plat/usb.h>
 #else
 #include <common.h>
+#include <time.h>
 #include <asm/omap_musb.h>
 #include <linux/bug.h>
 #include <linux/delay.h>
diff --git a/drivers/usb/musb-new/musb_dsps.c b/drivers/usb/musb-new/musb_dsps.c
index 4d977aba34f..20987b77ade 100644
--- a/drivers/usb/musb-new/musb_dsps.c
+++ b/drivers/usb/musb-new/musb_dsps.c
@@ -32,6 +32,7 @@
 #include <plat/usb.h>
 #else
 #include <common.h>
+#include <time.h>
 #include <asm/omap_musb.h>
 #include <linux/printk.h>
 #include "linux-compat.h"
diff --git a/drivers/usb/musb-new/musb_uboot.c b/drivers/usb/musb-new/musb_uboot.c
index 988071a61d1..6ec8f429951 100644
--- a/drivers/usb/musb-new/musb_uboot.c
+++ b/drivers/usb/musb-new/musb_uboot.c
@@ -1,6 +1,7 @@
 #include <common.h>
 #include <console.h>
 #include <malloc.h>
+#include <time.h>
 #include <watchdog.h>
 #include <linux/delay.h>
 #include <linux/err.h>
diff --git a/drivers/usb/musb-new/omap2430.c b/drivers/usb/musb-new/omap2430.c
index c41b9147fa5..e8bc3f33597 100644
--- a/drivers/usb/musb-new/omap2430.c
+++ b/drivers/usb/musb-new/omap2430.c
@@ -12,6 +12,7 @@
 #include <dm.h>
 #include <log.h>
 #include <serial.h>
+#include <time.h>
 #include <asm/global_data.h>
 #include <dm/device-internal.h>
 #include <dm/device_compat.h>
diff --git a/drivers/video/broadwell_igd.c b/drivers/video/broadwell_igd.c
index 416a1c07b13..84b31025f74 100644
--- a/drivers/video/broadwell_igd.c
+++ b/drivers/video/broadwell_igd.c
@@ -11,6 +11,7 @@
 #include <dm.h>
 #include <init.h>
 #include <log.h>
+#include <time.h>
 #include <vbe.h>
 #include <video.h>
 #include <asm/cpu.h>
diff --git a/drivers/video/dw_hdmi.c b/drivers/video/dw_hdmi.c
index c4fbb182944..16db3d38a2c 100644
--- a/drivers/video/dw_hdmi.c
+++ b/drivers/video/dw_hdmi.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <fdtdec.h>
 #include <log.h>
+#include <time.h>
 #include <asm/io.h>
 #include <i2c.h>
 #include <media_bus_format.h>
diff --git a/drivers/video/rockchip/rk_edp.c b/drivers/video/rockchip/rk_edp.c
index 000bd481408..36d17deea58 100644
--- a/drivers/video/rockchip/rk_edp.c
+++ b/drivers/video/rockchip/rk_edp.c
@@ -14,6 +14,7 @@
 #include <panel.h>
 #include <regmap.h>
 #include <syscon.h>
+#include <time.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <asm/arch-rockchip/clock.h>
diff --git a/drivers/video/tegra124/display.c b/drivers/video/tegra124/display.c
index 6c279322639..4f46b222b44 100644
--- a/drivers/video/tegra124/display.c
+++ b/drivers/video/tegra124/display.c
@@ -15,6 +15,7 @@
 #include <lcd.h>
 #include <log.h>
 #include <part.h>
+#include <time.h>
 #include <video.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
diff --git a/drivers/video/tegra124/dp.c b/drivers/video/tegra124/dp.c
index 59758eb9361..b09943897c1 100644
--- a/drivers/video/tegra124/dp.c
+++ b/drivers/video/tegra124/dp.c
@@ -10,6 +10,7 @@
 #include <div64.h>
 #include <errno.h>
 #include <log.h>
+#include <time.h>
 #include <video_bridge.h>
 #include <asm/io.h>
 #include <asm/arch-tegra/dc.h>
diff --git a/drivers/video/tegra124/sor.c b/drivers/video/tegra124/sor.c
index 52ab1b52915..119219e18bb 100644
--- a/drivers/video/tegra124/sor.c
+++ b/drivers/video/tegra124/sor.c
@@ -10,6 +10,7 @@
 #include <malloc.h>
 #include <panel.h>
 #include <syscon.h>
+#include <time.h>
 #include <video_bridge.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
diff --git a/drivers/video/video-uclass.c b/drivers/video/video-uclass.c
index 1654d02860b..eb234cc9bf4 100644
--- a/drivers/video/video-uclass.c
+++ b/drivers/video/video-uclass.c
@@ -11,6 +11,7 @@
 #include <malloc.h>
 #include <mapmem.h>
 #include <stdio_dev.h>
+#include <time.h>
 #include <video.h>
 #include <video_console.h>
 #include <asm/cache.h>
diff --git a/drivers/watchdog/sbsa_gwdt.c b/drivers/watchdog/sbsa_gwdt.c
index b837b045fa5..1e44df1da29 100644
--- a/drivers/watchdog/sbsa_gwdt.c
+++ b/drivers/watchdog/sbsa_gwdt.c
@@ -5,6 +5,7 @@
  * Copyright 2020 NXP
  */
 
+#include <time.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <common.h>
diff --git a/fs/fs.c b/fs/fs.c
index 16c54520251..15524c479c6 100644
--- a/fs/fs.c
+++ b/fs/fs.c
@@ -17,6 +17,7 @@
 #include <fat.h>
 #include <fs.h>
 #include <sandboxfs.h>
+#include <time.h>
 #include <ubifs_uboot.h>
 #include <btrfs.h>
 #include <asm/global_data.h>
diff --git a/fs/ubifs/debug.c b/fs/ubifs/debug.c
index 4a8fd88cdd7..4f0f680131f 100644
--- a/fs/ubifs/debug.c
+++ b/fs/ubifs/debug.c
@@ -17,6 +17,7 @@
 
 #include <hexdump.h>
 #include <log.h>
+#include <time.h>
 #include <dm/devres.h>
 #include <linux/printk.h>
 
diff --git a/include/cli.h b/include/cli.h
index 39b913743b5..06355767f6d 100644
--- a/include/cli.h
+++ b/include/cli.h
@@ -7,6 +7,8 @@
 #ifndef __CLI_H
 #define __CLI_H
 
+#include <time.h>
+
 /**
  * Go into the command loop
  *
diff --git a/include/common.h b/include/common.h
index a79c2bb4993..a904f41c366 100644
--- a/include/common.h
+++ b/include/common.h
@@ -15,7 +15,6 @@
 #ifndef __ASSEMBLY__		/* put C only stuff in this section */
 #include <config.h>
 #include <errno.h>
-#include <time.h>
 #include <linux/types.h>
 #include <linux/string.h>
 #include <stdarg.h>
diff --git a/include/exports.h b/include/exports.h
index e89cc333e52..4b9aa5ff405 100644
--- a/include/exports.h
+++ b/include/exports.h
@@ -2,6 +2,7 @@
 #define __EXPORTS_H__
 
 #include <irq_func.h>
+#include <time.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
 
diff --git a/include/regmap.h b/include/regmap.h
index 30183c5e711..bae96a6ef0b 100644
--- a/include/regmap.h
+++ b/include/regmap.h
@@ -7,6 +7,7 @@
 #ifndef __REGMAP_H
 #define __REGMAP_H
 
+#include <time.h>
 #include <linux/delay.h>
 
 /**
diff --git a/include/virtio.h b/include/virtio.h
index 10a9c073ba1..6a2932e391f 100644
--- a/include/virtio.h
+++ b/include/virtio.h
@@ -20,8 +20,10 @@
 #ifndef __VIRTIO_H__
 #define __VIRTIO_H__
 
+#include <compiler.h>
 #include <linux/bitops.h>
 #include <linux/bug.h>
+#include <linux/typecheck.h>
 #define VIRTIO_ID_NET		1 /* virtio net */
 #define VIRTIO_ID_BLOCK		2 /* virtio block */
 #define VIRTIO_ID_RNG		4 /* virtio rng */
diff --git a/lib/dhry/cmd_dhry.c b/lib/dhry/cmd_dhry.c
index d55ab54df97..bbb02d4ad9b 100644
--- a/lib/dhry/cmd_dhry.c
+++ b/lib/dhry/cmd_dhry.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <command.h>
 #include <div64.h>
+#include <time.h>
 #include "dhry.h"
 
 static int do_dhry(struct cmd_tbl *cmdtp, int flag, int argc,
diff --git a/net/arp.c b/net/arp.c
index 1d06ed25722..7913812b9a2 100644
--- a/net/arp.c
+++ b/net/arp.c
@@ -13,6 +13,7 @@
 #include <env.h>
 #include <log.h>
 #include <net.h>
+#include <time.h>
 #include <linux/delay.h>
 
 #include "arp.h"
diff --git a/net/bootp.c b/net/bootp.c
index de3dab4114d..23b5b8ad9b9 100644
--- a/net/bootp.c
+++ b/net/bootp.c
@@ -16,6 +16,7 @@
 #include <log.h>
 #include <net.h>
 #include <rand.h>
+#include <time.h>
 #include <uuid.h>
 #include <linux/delay.h>
 #include <net/tftp.h>
diff --git a/net/dns.c b/net/dns.c
index 5b1fe5b0103..677e39dd031 100644
--- a/net/dns.c
+++ b/net/dns.c
@@ -27,6 +27,7 @@
 #include <env.h>
 #include <log.h>
 #include <net.h>
+#include <time.h>
 #include <asm/unaligned.h>
 
 #include "dns.h"
diff --git a/net/fastboot.c b/net/fastboot.c
index d01d3eba120..c35953f3e33 100644
--- a/net/fastboot.c
+++ b/net/fastboot.c
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <fastboot.h>
 #include <net.h>
+#include <time.h>
 #include <linux/printk.h>
 #include <net/fastboot.h>
 
diff --git a/net/link_local.c b/net/link_local.c
index 8aec3c79969..16bc5c8b90a 100644
--- a/net/link_local.c
+++ b/net/link_local.c
@@ -16,6 +16,7 @@
 #include <log.h>
 #include <net.h>
 #include <rand.h>
+#include <time.h>
 #include "arp.h"
 #include "net_rand.h"
 
diff --git a/net/net.c b/net/net.c
index 1e7f633cb69..23d1988c181 100644
--- a/net/net.c
+++ b/net/net.c
@@ -97,6 +97,7 @@
 #include <image.h>
 #include <log.h>
 #include <net.h>
+#include <time.h>
 #include <net/fastboot.h>
 #include <net/tftp.h>
 #if defined(CONFIG_CMD_PCAP)
diff --git a/net/sntp.c b/net/sntp.c
index 39d7664a224..8ecc0117ca7 100644
--- a/net/sntp.c
+++ b/net/sntp.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <net.h>
 #include <rtc.h>
+#include <time.h>
 
 #include "sntp.h"
 
diff --git a/net/tftp.c b/net/tftp.c
index bffadd04ebd..e1e0042f157 100644
--- a/net/tftp.c
+++ b/net/tftp.c
@@ -16,6 +16,7 @@
 #include <log.h>
 #include <mapmem.h>
 #include <net.h>
+#include <time.h>
 #include <asm/global_data.h>
 #include <net/tftp.h>
 #include "bootp.h"
diff --git a/post/drivers/rtc.c b/post/drivers/rtc.c
index af701e464d3..7f14670317c 100644
--- a/post/drivers/rtc.c
+++ b/post/drivers/rtc.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <time.h>
 
 /*
  * RTC test
diff --git a/test/dm/regmap.c b/test/dm/regmap.c
index 809494d585e..4082778a56a 100644
--- a/test/dm/regmap.c
+++ b/test/dm/regmap.c
@@ -9,6 +9,7 @@
 #include <mapmem.h>
 #include <regmap.h>
 #include <syscon.h>
+#include <time.h>
 #include <asm/test.h>
 #include <dm/test.h>
 #include <linux/err.h>
-- 
2.28.0.163.g6104cc2f0b6-goog

^ permalink raw reply related	[flat|nested] 35+ messages in thread

* [PATCH 06/16] common: Drop linux/string.h from common header
  2020-08-02 22:59 [PATCH 00/16] common: Drop remaining includes in common.h Simon Glass
                   ` (4 preceding siblings ...)
  2020-08-02 22:59 ` [PATCH 05/16] common: Drop time.h from common header Simon Glass
@ 2020-08-02 22:59 ` Simon Glass
  2020-08-02 22:59 ` [PATCH 07/16] common: Drop asm/u-boot.h " Simon Glass
                   ` (10 subsequent siblings)
  16 siblings, 0 replies; 35+ messages in thread
From: Simon Glass @ 2020-08-02 22:59 UTC (permalink / raw)
  To: u-boot

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 +
 api/api_net.c                                           | 1 +
 arch/arc/lib/relocate.c                                 | 1 +
 arch/arm/cpu/arm1136/mx35/generic.c                     | 1 +
 arch/arm/cpu/arm926ejs/mxs/mxs.c                        | 1 +
 arch/arm/cpu/arm926ejs/mxs/spl_boot.c                   | 1 +
 arch/arm/cpu/arm926ejs/spear/cpu.c                      | 1 +
 arch/arm/cpu/arm926ejs/spear/spr_misc.c                 | 1 +
 arch/arm/cpu/armv7/bcm235xx/clk-bcm235xx.c              | 1 +
 arch/arm/cpu/armv7/bcm235xx/clk-core.c                  | 1 +
 arch/arm/cpu/armv7/bcm281xx/clk-bcm281xx.c              | 1 +
 arch/arm/cpu/armv7/bcm281xx/clk-core.c                  | 1 +
 arch/arm/cpu/armv7/ls102xa/fdt.c                        | 1 +
 arch/arm/cpu/armv7/vf610/generic.c                      | 1 +
 arch/arm/cpu/armv7/virt-v7.c                            | 1 +
 arch/arm/cpu/armv8/cache_v8.c                           | 1 +
 arch/arm/cpu/armv8/cpu.c                                | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/cpu.c                 | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/fdt.c                 | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_serdes.c    | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c    | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/ls1028_ids.c          | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/mp.c                  | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/spl.c                 | 1 +
 arch/arm/cpu/armv8/sec_firmware.c                       | 1 +
 arch/arm/cpu/armv8/spin_table.c                         | 1 +
 arch/arm/cpu/armv8/spl_data.c                           | 1 +
 arch/arm/include/asm/io.h                               | 1 +
 arch/arm/lib/bootm.c                                    | 1 +
 arch/arm/lib/eabi_compat.c                              | 1 +
 arch/arm/lib/psci-dt.c                                  | 1 +
 arch/arm/lib/semihosting.c                              | 1 +
 arch/arm/mach-bcm283x/include/mach/mbox.h               | 3 ++-
 arch/arm/mach-imx/cmd_bmode.c                           | 1 +
 arch/arm/mach-imx/cmd_nandbcb.c                         | 1 +
 arch/arm/mach-imx/imx8/ahab.c                           | 1 +
 arch/arm/mach-imx/imx8/fdt.c                            | 1 +
 arch/arm/mach-imx/imx8/image.c                          | 1 +
 arch/arm/mach-imx/imx8/parse-container.c                | 1 +
 arch/arm/mach-imx/imx8m/soc.c                           | 1 +
 arch/arm/mach-imx/mx5/clock.c                           | 1 +
 arch/arm/mach-imx/mx6/module_fuse.c                     | 1 +
 arch/arm/mach-imx/spl_imx_romapi.c                      | 1 +
 arch/arm/mach-imx/video.c                               | 1 +
 arch/arm/mach-k3/common.c                               | 1 +
 arch/arm/mach-keystone/cmd_clock.c                      | 1 +
 arch/arm/mach-keystone/cmd_mon.c                        | 1 +
 arch/arm/mach-keystone/ddr3_spd.c                       | 1 +
 arch/arm/mach-keystone/mon.c                            | 1 +
 arch/arm/mach-meson/sm.c                                | 1 +
 arch/arm/mach-mvebu/armada3700/cpu.c                    | 1 +
 arch/arm/mach-mvebu/serdes/axp/high_speed_env_lib.c     | 1 +
 arch/arm/mach-omap2/emif-common.c                       | 1 +
 arch/arm/mach-omap2/omap3/board.c                       | 1 +
 arch/arm/mach-omap2/sec-common.c                        | 1 +
 arch/arm/mach-rockchip/board.c                          | 1 +
 arch/arm/mach-rockchip/boot_mode.c                      | 1 +
 arch/arm/mach-rockchip/misc.c                           | 1 +
 arch/arm/mach-rockchip/spl-boot-order.c                 | 1 +
 arch/arm/mach-socfpga/clock_manager_arria10.c           | 1 +
 arch/arm/mach-socfpga/misc_s10.c                        | 1 +
 arch/arm/mach-socfpga/pinmux_arria10.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_serial.c  | 1 +
 arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_usb.c     | 1 +
 arch/arm/mach-stm32mp/fdt.c                             | 1 +
 arch/arm/mach-tegra/cboot.c                             | 1 +
 arch/arm/mach-tegra/tegra20/emc.c                       | 1 +
 arch/arm/mach-tegra/tegra20/warmboot.c                  | 1 +
 arch/arm/mach-tegra/xusb-padctl-common.c                | 1 +
 arch/arm/mach-uniphier/base-address.c                   | 1 +
 arch/arm/mach-uniphier/board_late_init.c                | 1 +
 arch/arm/mach-uniphier/dram/cmd_ddrmphy.c               | 1 +
 arch/arm/mach-uniphier/dram/cmd_ddrphy.c                | 1 +
 arch/arm/mach-uniphier/pinctrl-glue.c                   | 1 +
 arch/arm/mach-versal/mp.c                               | 1 +
 arch/arm/mach-zynq/ddrc.c                               | 1 +
 arch/arm/mach-zynq/slcr.c                               | 1 +
 arch/arm/mach-zynq/spl.c                                | 1 +
 arch/arm/mach-zynqmp/cpu.c                              | 1 +
 arch/arm/mach-zynqmp/mp.c                               | 1 +
 arch/microblaze/include/asm/io.h                        | 1 +
 arch/mips/include/asm/io.h                              | 1 +
 arch/mips/lib/bootm.c                                   | 1 +
 arch/mips/lib/reloc.c                                   | 1 +
 arch/mips/lib/traps.c                                   | 1 +
 arch/mips/mach-jz47xx/jz4780/jz4780.c                   | 1 +
 arch/mips/mach-mtmips/cpu.c                             | 1 +
 arch/nds32/lib/bootm.c                                  | 1 +
 arch/nios2/cpu/cpu.c                                    | 1 +
 arch/nios2/include/asm/io.h                             | 1 +
 arch/powerpc/cpu/mpc83xx/ecc.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_corenet2_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/mpc86xx/mp.c                           | 1 +
 arch/powerpc/cpu/mpc8xxx/fsl_pamu.c                     | 1 +
 arch/powerpc/include/asm/io.h                           | 1 +
 arch/riscv/cpu/cpu.c                                    | 1 +
 arch/riscv/lib/andes_plic.c                             | 1 +
 arch/riscv/lib/fdt_fixup.c                              | 1 +
 arch/sandbox/cpu/eth-raw-os.c                           | 1 +
 arch/sandbox/cpu/os.c                                   | 1 +
 arch/sandbox/cpu/sdl.c                                  | 1 +
 arch/sandbox/cpu/spl.c                                  | 1 +
 arch/sandbox/cpu/start.c                                | 1 +
 arch/sandbox/cpu/state.c                                | 1 +
 arch/sandbox/lib/bootm.c                                | 1 +
 arch/sh/lib/board.c                                     | 1 +
 arch/sh/lib/bootm.c                                     | 1 +
 arch/sh/lib/zimageboot.c                                | 1 +
 arch/x86/cpu/acpi_gpe.c                                 | 1 +
 arch/x86/cpu/apollolake/fsp_bindings.c                  | 1 +
 arch/x86/cpu/apollolake/pmc.c                           | 1 +
 arch/x86/cpu/apollolake/spl.c                           | 1 +
 arch/x86/cpu/baytrail/acpi.c                            | 1 +
 arch/x86/cpu/broadwell/me.c                             | 1 +
 arch/x86/cpu/broadwell/northbridge.c                    | 1 +
 arch/x86/cpu/broadwell/pinctrl_broadwell.c              | 1 +
 arch/x86/cpu/broadwell/refcode.c                        | 1 +
 arch/x86/cpu/broadwell/sdram.c                          | 1 +
 arch/x86/cpu/cpu_x86.c                                  | 1 +
 arch/x86/cpu/efi/payload.c                              | 1 +
 arch/x86/cpu/i386/cpu.c                                 | 1 +
 arch/x86/cpu/intel_common/itss.c                        | 1 +
 arch/x86/cpu/intel_common/report_platform.c             | 1 +
 arch/x86/cpu/ivybridge/sata.c                           | 1 +
 arch/x86/cpu/ivybridge/sdram.c                          | 1 +
 arch/x86/cpu/mp_init.c                                  | 1 +
 arch/x86/cpu/qfw_cpu.c                                  | 1 +
 arch/x86/cpu/quark/acpi.c                               | 1 +
 arch/x86/cpu/quark/dram.c                               | 1 +
 arch/x86/cpu/quark/smc.c                                | 1 +
 arch/x86/cpu/tangier/acpi.c                             | 1 +
 arch/x86/cpu/tangier/sdram.c                            | 1 +
 arch/x86/include/asm/io.h                               | 1 +
 arch/x86/include/asm/me_common.h                        | 1 +
 arch/x86/lib/acpi.c                                     | 1 +
 arch/x86/lib/acpi_nhlt.c                                | 1 +
 arch/x86/lib/acpi_s3.c                                  | 1 +
 arch/x86/lib/acpi_table.c                               | 1 +
 arch/x86/lib/bios.c                                     | 1 +
 arch/x86/lib/cmd_boot.c                                 | 1 +
 arch/x86/lib/coreboot_table.c                           | 1 +
 arch/x86/lib/fsp1/fsp_support.c                         | 1 +
 arch/x86/lib/fsp2/fsp_meminit.c                         | 1 +
 arch/x86/lib/fsp2/fsp_silicon_init.c                    | 1 +
 arch/x86/lib/fsp2/fsp_support.c                         | 1 +
 arch/x86/lib/mpspec.c                                   | 1 +
 arch/x86/lib/mrccache.c                                 | 1 +
 arch/x86/lib/physmem.c                                  | 1 +
 arch/x86/lib/pirq_routing.c                             | 1 +
 arch/x86/lib/relocate.c                                 | 1 +
 arch/x86/lib/scu.c                                      | 1 +
 arch/x86/lib/sfi.c                                      | 1 +
 arch/x86/lib/spl.c                                      | 1 +
 arch/x86/lib/string.c                                   | 1 +
 arch/x86/lib/tables.c                                   | 1 +
 arch/x86/lib/zimage.c                                   | 1 +
 arch/xtensa/include/asm/io.h                            | 1 +
 arch/xtensa/lib/bootm.c                                 | 1 +
 arch/xtensa/lib/relocate.c                              | 1 +
 board/Arcturus/ucp1020/cmd_arc.c                        | 1 +
 board/Arcturus/ucp1020/ddr.c                            | 1 +
 board/Arcturus/ucp1020/spl.c                            | 1 +
 board/Arcturus/ucp1020/ucp1020.c                        | 1 +
 board/BuR/common/common.c                               | 1 +
 board/BuS/eb_cpu5282/eb_cpu5282.c                       | 1 +
 board/CZ.NIC/turris_omnia/turris_omnia.c                | 1 +
 board/Synology/ds109/ds109.c                            | 1 +
 board/Synology/ds414/cmd_syno.c                         | 1 +
 board/advantech/imx8qm_rom7720_a1/spl.c                 | 1 +
 board/aristainetos/aristainetos.c                       | 1 +
 board/armltd/vexpress/vexpress_common.c                 | 1 +
 board/armltd/vexpress/vexpress_tc2.c                    | 1 +
 board/armltd/vexpress64/vexpress64.c                    | 1 +
 board/atmel/common/mac-spi-nor.c                        | 1 +
 board/atmel/common/video_display.c                      | 1 +
 board/atmel/sama5d3xek/sama5d3xek.c                     | 1 +
 board/barco/platinum/spl_picon.c                        | 1 +
 board/barco/platinum/spl_titanium.c                     | 1 +
 board/beacon/imx8mm/spl.c                               | 1 +
 board/beckhoff/mx53cx9020/mx53cx9020.c                  | 1 +
 board/bluewater/gurnard/gurnard.c                       | 1 +
 board/boundary/nitrogen6x/nitrogen6x.c                  | 1 +
 board/cavium/thunderx/atf.c                             | 1 +
 board/cobra5272/flash.c                                 | 3 ++-
 board/compulab/cl-som-imx7/spl.c                        | 1 +
 board/compulab/cm_fx6/cm_fx6.c                          | 1 +
 board/compulab/common/eeprom.c                          | 1 +
 board/compulab/common/omap3_display.c                   | 1 +
 board/congatec/cgtqmx6eval/cgtqmx6eval.c                | 1 +
 board/corscience/tricorder/tricorder-eeprom.c           | 1 +
 board/corscience/tricorder/tricorder.c                  | 1 +
 board/creative/xfi3/spl_boot.c                          | 1 +
 board/cssi/MCR3000/MCR3000.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_imx6/dh_imx6_spl.c               | 1 +
 board/dhelectronics/dh_stm32mp1/board.c                 | 1 +
 board/egnite/ethernut5/ethernut5_pwrman.c               | 1 +
 board/el/el6x/el6x.c                                    | 1 +
 board/engicam/common/board.c                            | 1 +
 board/engicam/common/spl.c                              | 1 +
 board/esd/meesc/meesc.c                                 | 1 +
 board/esd/vme8349/caddy.c                               | 1 +
 board/esd/vme8349/vme8349.c                             | 1 +
 board/firefly/roc-pc-rk3399/roc-pc-rk3399.c             | 1 +
 board/freescale/common/fsl_validate.c                   | 1 +
 board/freescale/common/ngpixis.c                        | 1 +
 board/freescale/common/pixis.c                          | 1 +
 board/freescale/common/qixis.c                          | 1 +
 board/freescale/common/sgmii_riser.c                    | 1 +
 board/freescale/common/sys_eeprom.c                     | 1 +
 board/freescale/corenet_ds/ddr.c                        | 1 +
 board/freescale/corenet_ds/eth_hydra.c                  | 1 +
 board/freescale/corenet_ds/eth_superhydra.c             | 1 +
 board/freescale/imx8mm_evk/spl.c                        | 1 +
 board/freescale/imx8mn_evk/spl.c                        | 1 +
 board/freescale/imx8mq_evk/spl.c                        | 1 +
 board/freescale/imx8qm_mek/imx8qm_mek.c                 | 1 +
 board/freescale/imx8qm_mek/spl.c                        | 1 +
 board/freescale/imx8qxp_mek/imx8qxp_mek.c               | 1 +
 board/freescale/imx8qxp_mek/spl.c                       | 1 +
 board/freescale/ls1012aqds/ls1012aqds.c                 | 1 +
 board/freescale/ls1012ardb/ls1012ardb.c                 | 1 +
 board/freescale/ls1021aiot/dcu.c                        | 1 +
 board/freescale/ls1021aiot/ls1021aiot.c                 | 1 +
 board/freescale/ls1021aqds/dcu.c                        | 1 +
 board/freescale/ls1021aqds/ddr.c                        | 1 +
 board/freescale/ls1021aqds/eth.c                        | 1 +
 board/freescale/ls1021aqds/ls1021aqds.c                 | 1 +
 board/freescale/ls1021atsn/ls1021atsn.c                 | 1 +
 board/freescale/ls1021atwr/dcu.c                        | 1 +
 board/freescale/ls1021atwr/ls1021atwr.c                 | 1 +
 board/freescale/ls1043aqds/eth.c                        | 1 +
 board/freescale/ls1043ardb/cpld.c                       | 1 +
 board/freescale/ls1043ardb/ddr.c                        | 1 +
 board/freescale/ls1046afrwy/eth.c                       | 1 +
 board/freescale/ls1046ardb/cpld.c                       | 1 +
 board/freescale/ls1046ardb/eth.c                        | 1 +
 board/freescale/ls1088a/eth_ls1088aqds.c                | 1 +
 board/freescale/ls1088a/ls1088a.c                       | 1 +
 board/freescale/ls2080a/ddr.c                           | 1 +
 board/freescale/ls2080aqds/eth.c                        | 1 +
 board/freescale/ls2080aqds/ls2080aqds.c                 | 1 +
 board/freescale/lx2160a/eth_lx2160aqds.c                | 1 +
 board/freescale/lx2160a/lx2160a.c                       | 1 +
 board/freescale/mpc8323erdb/mpc8323erdb.c               | 1 +
 board/freescale/mpc8349itx/mpc8349itx.c                 | 1 +
 board/freescale/mpc837xemds/mpc837xemds.c               | 1 +
 board/freescale/mpc837xemds/pci.c                       | 1 +
 board/freescale/mpc8569mds/mpc8569mds.c                 | 1 +
 board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c           | 1 +
 board/freescale/mx51evk/mx51evk_video.c                 | 1 +
 board/freescale/mx53loco/mx53loco_video.c               | 1 +
 board/freescale/mx6memcal/spl.c                         | 1 +
 board/freescale/mx6sabreauto/mx6sabreauto.c             | 1 +
 board/freescale/mx6sabresd/mx6sabresd.c                 | 1 +
 board/freescale/mx6slevk/mx6slevk.c                     | 1 +
 board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c       | 1 +
 board/freescale/p1010rdb/ddr.c                          | 1 +
 board/freescale/p1010rdb/p1010rdb.c                     | 1 +
 board/freescale/p1010rdb/spl.c                          | 1 +
 board/freescale/p1023rdb/ddr.c                          | 1 +
 board/freescale/p1_p2_rdb_pc/ddr.c                      | 1 +
 board/freescale/p1_p2_rdb_pc/spl.c                      | 1 +
 board/freescale/p2041rdb/cpld.c                         | 1 +
 board/freescale/qemu-ppce500/qemu-ppce500.c             | 1 +
 board/freescale/t102xrdb/cpld.c                         | 1 +
 board/freescale/t102xrdb/ddr.c                          | 1 +
 board/freescale/t102xrdb/spl.c                          | 1 +
 board/freescale/t102xrdb/t102xrdb.c                     | 1 +
 board/freescale/t104xrdb/cpld.c                         | 1 +
 board/freescale/t104xrdb/spl.c                          | 1 +
 board/freescale/t208xqds/eth_t208xqds.c                 | 1 +
 board/freescale/t208xqds/spl.c                          | 1 +
 board/freescale/t208xrdb/cpld.c                         | 1 +
 board/freescale/t208xrdb/spl.c                          | 1 +
 board/freescale/t4rdb/cpld.c                            | 1 +
 board/freescale/t4rdb/spl.c                             | 1 +
 board/gardena/smart-gateway-mt7688/board.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/hre.c                                  | 1 +
 board/gdsys/a38x/ihs_phys.c                             | 1 +
 board/gdsys/a38x/keyprogram.c                           | 1 +
 board/gdsys/common/cmd_ioloop.c                         | 1 +
 board/gdsys/common/ihs_mdio.c                           | 1 +
 board/gdsys/common/ioep-fpga.c                          | 1 +
 board/gdsys/common/osd.c                                | 1 +
 board/gdsys/common/osd_cmd.c                            | 1 +
 board/gdsys/mpc8308/hrcon.c                             | 1 +
 board/gdsys/mpc8308/strider.c                           | 1 +
 board/gdsys/p1022/controlcenterd-id.c                   | 1 +
 board/gdsys/p1022/ddr.c                                 | 1 +
 board/ge/bx50v3/bx50v3.c                                | 1 +
 board/ge/mx53ppd/mx53ppd.c                              | 1 +
 board/google/imx8mq_phanbell/spl.c                      | 1 +
 board/grinn/liteboard/board.c                           | 1 +
 board/imgtec/malta/malta.c                              | 1 +
 board/isee/igep00x0/igep00x0.c                          | 1 +
 board/k+p/kp_imx53/kp_id_rev.c                          | 1 +
 board/k+p/kp_imx6q_tpc/kp_imx6q_tpc_spl.c               | 1 +
 board/keymile/common/common.c                           | 1 +
 board/keymile/common/ivm.c                              | 1 +
 board/kosagi/novena/novena.c                            | 1 +
 board/laird/wb50n/wb50n.c                               | 1 +
 board/liebherr/display5/display5.c                      | 1 +
 board/liebherr/display5/spl.c                           | 1 +
 board/liebherr/mccmon6/spl.c                            | 1 +
 board/mediatek/mt7623/mt7623_rfb.c                      | 1 +
 board/menlo/m53menlo/m53menlo.c                         | 1 +
 board/mscc/jr2/jr2.c                                    | 1 +
 board/mscc/luton/luton.c                                | 1 +
 board/mscc/ocelot/ocelot.c                              | 1 +
 board/mscc/serval/serval.c                              | 1 +
 board/mscc/servalt/servalt.c                            | 1 +
 board/nokia/rx51/rx51.c                                 | 1 +
 board/nvidia/p2371-2180/p2371-2180.c                    | 1 +
 board/nvidia/p2771-0000/p2771-0000.c                    | 1 +
 board/nvidia/p3450-0000/p3450-0000.c                    | 1 +
 board/phytec/pcm058/pcm058.c                            | 1 +
 board/phytec/pfla02/pfla02.c                            | 1 +
 board/qualcomm/dragonboard410c/dragonboard410c.c        | 1 +
 board/renesas/salvator-x/salvator-x.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/renesas/ulcb/ulcb.c                               | 1 +
 board/samsung/common/gadget.c                           | 1 +
 board/samsung/origen/tools/mkorigenspl.c                | 1 +
 board/samsung/smdkv310/tools/mksmdkv310spl.c            | 1 +
 board/sandisk/sansa_fuze_plus/spl_boot.c                | 1 +
 board/sbc8548/ddr.c                                     | 1 +
 board/siemens/capricorn/board.c                         | 1 +
 board/siemens/capricorn/spl.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/sks-kinkel/sksimx6/sksimx6.c                      | 1 +
 board/softing/vining_2000/vining_2000.c                 | 1 +
 board/softing/vining_fpga/socfpga.c                     | 1 +
 board/solidrun/clearfog/clearfog.c                      | 1 +
 board/solidrun/common/tlv_data.c                        | 1 +
 board/solidrun/mx6cuboxi/mx6cuboxi.c                    | 1 +
 board/st/common/stm32mp_dfu.c                           | 1 +
 board/st/common/stm32mp_mtdparts.c                      | 1 +
 board/st/stm32mp1/stm32mp1.c                            | 1 +
 board/sunxi/board.c                                     | 1 +
 board/synopsys/emsdp/emsdp.c                            | 1 +
 board/synopsys/hsdk/hsdk.c                              | 1 +
 board/syteco/zmx25/zmx25.c                              | 1 +
 board/technexion/pico-imx6/spl.c                        | 1 +
 board/technexion/pico-imx6ul/spl.c                      | 1 +
 board/technexion/pico-imx7d/spl.c                       | 1 +
 board/technexion/pico-imx8mq/spl.c                      | 1 +
 board/theadorable/fpga.c                                | 1 +
 board/theobroma-systems/puma_rk3399/puma-rk3399.c       | 1 +
 board/ti/am335x/board.c                                 | 1 +
 board/ti/am335x/board.h                                 | 1 +
 board/ti/am43xx/board.c                                 | 1 +
 board/ti/am43xx/board.h                                 | 1 +
 board/ti/am57xx/board.c                                 | 1 +
 board/ti/am65x/evm.c                                    | 1 +
 board/ti/beagle/beagle.c                                | 1 +
 board/ti/common/board_detect.c                          | 1 +
 board/ti/j721e/evm.c                                    | 1 +
 board/ti/ks2_evm/board.c                                | 1 +
 board/ti/ks2_evm/board_k2e.c                            | 1 +
 board/ti/ks2_evm/board_k2g.c                            | 1 +
 board/ti/ks2_evm/board_k2hk.c                           | 1 +
 board/ti/ks2_evm/board_k2l.c                            | 1 +
 board/ti/sdp4430/cmd_bat.c                              | 1 +
 board/toradex/apalis-tk1/apalis-tk1.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/toradex/verdin-imx8mm/spl.c                       | 1 +
 board/udoo/neo/neo.c                                    | 1 +
 board/variscite/dart_6ul/spl.c                          | 1 +
 board/varisys/common/sys_eeprom.c                       | 1 +
 board/vscom/baltos/board.c                              | 1 +
 board/wandboard/wandboard.c                             | 1 +
 board/work-microwave/work_92105/work_92105_display.c    | 1 +
 board/xes/common/board.c                                | 1 +
 board/xilinx/versal/board.c                             | 1 +
 board/xilinx/zynq/board.c                               | 1 +
 board/xilinx/zynq/bootimg.c                             | 1 +
 board/xilinx/zynq/cmds.c                                | 1 +
 board/xilinx/zynqmp/zynqmp.c                            | 1 +
 cmd/abootimg.c                                          | 1 +
 cmd/acpi.c                                              | 1 +
 cmd/adtimg.c                                            | 1 +
 cmd/aes.c                                               | 1 +
 cmd/armflash.c                                          | 1 +
 cmd/avb.c                                               | 1 +
 cmd/bcb.c                                               | 1 +
 cmd/bdinfo.c                                            | 1 +
 cmd/binop.c                                             | 1 +
 cmd/blk_common.c                                        | 1 +
 cmd/blob.c                                              | 1 +
 cmd/bmp.c                                               | 1 +
 cmd/bootefi.c                                           | 1 +
 cmd/booti.c                                             | 1 +
 cmd/bootm.c                                             | 1 +
 cmd/bootstage.c                                         | 1 +
 cmd/cache.c                                             | 1 +
 cmd/cros_ec.c                                           | 1 +
 cmd/date.c                                              | 1 +
 cmd/dfu.c                                               | 1 +
 cmd/echo.c                                              | 1 +
 cmd/eeprom.c                                            | 1 +
 cmd/efi.c                                               | 1 +
 cmd/efidebug.c                                          | 1 +
 cmd/elf.c                                               | 1 +
 cmd/ethsw.c                                             | 1 +
 cmd/fastboot.c                                          | 1 +
 cmd/fdt.c                                               | 1 +
 cmd/flash.c                                             | 1 +
 cmd/fpga.c                                              | 1 +
 cmd/fuse.c                                              | 1 +
 cmd/gpio.c                                              | 1 +
 cmd/gpt.c                                               | 1 +
 cmd/hash.c                                              | 1 +
 cmd/i2c.c                                               | 1 +
 cmd/ide.c                                               | 1 +
 cmd/irq.c                                               | 1 +
 cmd/itest.c                                             | 1 +
 cmd/jffs2.c                                             | 1 +
 cmd/led.c                                               | 1 +
 cmd/legacy_led.c                                        | 1 +
 cmd/load.c                                              | 1 +
 cmd/log.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/mvebu/bubt.c                                        | 1 +
 cmd/nand.c                                              | 1 +
 cmd/net.c                                               | 1 +
 cmd/nvedit.c                                            | 1 +
 cmd/nvedit_efi.c                                        | 1 +
 cmd/nvme.c                                              | 1 +
 cmd/onenand.c                                           | 1 +
 cmd/osd.c                                               | 1 +
 cmd/part.c                                              | 1 +
 cmd/pci.c                                               | 1 +
 cmd/pinmux.c                                            | 1 +
 cmd/regulator.c                                         | 1 +
 cmd/remoteproc.c                                        | 1 +
 cmd/rtc.c                                               | 1 +
 cmd/sata.c                                              | 1 +
 cmd/scsi.c                                              | 1 +
 cmd/setexpr.c                                           | 1 +
 cmd/sf.c                                                | 1 +
 cmd/sha1sum.c                                           | 1 +
 cmd/smccc.c                                             | 1 +
 cmd/spi.c                                               | 1 +
 cmd/strings.c                                           | 1 +
 cmd/sysboot.c                                           | 1 +
 cmd/test.c                                              | 1 +
 cmd/ti/ddr3.c                                           | 1 +
 cmd/tlv_eeprom.c                                        | 1 +
 cmd/tpm-v1.c                                            | 1 +
 cmd/tpm-v2.c                                            | 1 +
 cmd/tsi148.c                                            | 1 +
 cmd/ubi.c                                               | 1 +
 cmd/ufs.c                                               | 1 +
 cmd/universe.c                                          | 1 +
 cmd/usb.c                                               | 1 +
 cmd/usb_mass_storage.c                                  | 1 +
 cmd/virtio.c                                            | 1 +
 cmd/w1.c                                                | 1 +
 cmd/x86/mtrr.c                                          | 1 +
 cmd/ximg.c                                              | 1 +
 cmd/yaffs2.c                                            | 1 +
 cmd/zfs.c                                               | 1 +
 common/android_ab.c                                     | 1 +
 common/autoboot.c                                       | 1 +
 common/avb_verify.c                                     | 1 +
 common/bloblist.c                                       | 1 +
 common/board_f.c                                        | 1 +
 common/bootm.c                                          | 1 +
 common/bootm_os.c                                       | 1 +
 common/bootstage.c                                      | 1 +
 common/bouncebuf.c                                      | 1 +
 common/cli.c                                            | 1 +
 common/cli_hush.c                                       | 1 +
 common/cli_readline.c                                   | 1 +
 common/cli_simple.c                                     | 1 +
 common/command.c                                        | 1 +
 common/common_fit.c                                     | 1 +
 common/console.c                                        | 1 +
 common/dlmalloc.c                                       | 1 +
 common/eeprom/eeprom_layout.c                           | 1 +
 common/fdt_region.c                                     | 1 +
 common/fdt_support.c                                    | 1 +
 common/flash.c                                          | 1 +
 common/hash.c                                           | 1 +
 common/image-android.c                                  | 1 +
 common/image-cipher.c                                   | 1 +
 common/image-fdt.c                                      | 1 +
 common/image-fit-sig.c                                  | 1 +
 common/image-fit.c                                      | 1 +
 common/image-sig.c                                      | 1 +
 common/image.c                                          | 1 +
 common/init/board_init.c                                | 1 +
 common/iomux.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/malloc_simple.c                                  | 1 +
 common/menu.c                                           | 1 +
 common/miiphyutil.c                                     | 1 +
 common/spl/spl.c                                        | 1 +
 common/spl/spl_atf.c                                    | 1 +
 common/spl/spl_fit.c                                    | 1 +
 common/spl/spl_net.c                                    | 1 +
 common/spl/spl_nor.c                                    | 1 +
 common/spl/spl_ram.c                                    | 1 +
 common/spl/spl_ubi.c                                    | 1 +
 common/spl/spl_ymodem.c                                 | 1 +
 common/splash.c                                         | 1 +
 common/splash_source.c                                  | 1 +
 common/stdio.c                                          | 1 +
 common/update.c                                         | 1 +
 common/usb.c                                            | 1 +
 common/usb_hub.c                                        | 1 +
 common/usb_kbd.c                                        | 1 +
 common/usb_storage.c                                    | 1 +
 disk/part.c                                             | 1 +
 disk/part_amiga.c                                       | 1 +
 disk/part_dos.c                                         | 1 +
 disk/part_efi.c                                         | 1 +
 disk/part_iso.c                                         | 1 +
 drivers/ata/ahci.c                                      | 1 +
 drivers/ata/dwc_ahsata.c                                | 1 +
 drivers/ata/fsl_sata.c                                  | 1 +
 drivers/ata/libata.c                                    | 1 +
 drivers/ata/sata.c                                      | 1 +
 drivers/ata/sata_mv.c                                   | 1 +
 drivers/ata/sata_sil.c                                  | 1 +
 drivers/bios_emulator/atibios.c                         | 1 +
 drivers/bios_emulator/biosemu.c                         | 1 +
 drivers/bios_emulator/x86emu/debug.c                    | 1 +
 drivers/block/blk-uclass.c                              | 1 +
 drivers/block/blk_legacy.c                              | 1 +
 drivers/block/blkcache.c                                | 1 +
 drivers/block/ide.c                                     | 1 +
 drivers/block/sandbox.c                                 | 1 +
 drivers/clk/altera/clk-arria10.c                        | 1 +
 drivers/clk/clk-mux.c                                   | 1 +
 drivers/clk/clk_stm32f.c                                | 1 +
 drivers/clk/clk_versal.c                                | 1 +
 drivers/clk/mvebu/armada-37xx-periph.c                  | 1 +
 drivers/clk/renesas/clk-rcar-gen2.c                     | 1 +
 drivers/clk/rockchip/clk_rk322x.c                       | 1 +
 drivers/clk/rockchip/clk_rk3288.c                       | 1 +
 drivers/clk/rockchip/clk_rk3328.c                       | 1 +
 drivers/clk/rockchip/clk_rk3368.c                       | 1 +
 drivers/clk/rockchip/clk_rk3399.c                       | 1 +
 drivers/clk/sifive/fu540-prci.c                         | 1 +
 drivers/core/acpi.c                                     | 1 +
 drivers/core/device.c                                   | 1 +
 drivers/core/lists.c                                    | 1 +
 drivers/core/of_access.c                                | 1 +
 drivers/core/of_addr.c                                  | 1 +
 drivers/core/of_extra.c                                 | 1 +
 drivers/core/ofnode.c                                   | 1 +
 drivers/core/uclass.c                                   | 1 +
 drivers/cpu/cpu-uclass.c                                | 1 +
 drivers/cpu/cpu_sandbox.c                               | 1 +
 drivers/cpu/imx8_cpu.c                                  | 1 +
 drivers/cpu/riscv_cpu.c                                 | 1 +
 drivers/crypto/ace_sha.c                                | 1 +
 drivers/crypto/fsl/desc_constr.h                        | 1 +
 drivers/crypto/fsl/error.c                              | 1 +
 drivers/crypto/fsl/fsl_hash.c                           | 1 +
 drivers/crypto/fsl/jobdesc.c                            | 1 +
 drivers/crypto/fsl/jr.c                                 | 1 +
 drivers/crypto/fsl/rng.c                                | 1 +
 drivers/ddr/altera/sdram_arria10.c                      | 1 +
 drivers/ddr/altera/sdram_gen5.c                         | 1 +
 drivers/ddr/altera/sdram_soc64.c                        | 1 +
 drivers/ddr/altera/sequencer.c                          | 1 +
 drivers/ddr/fsl/ctrl_regs.c                             | 1 +
 drivers/ddr/fsl/ddr1_dimm_params.c                      | 1 +
 drivers/ddr/fsl/ddr2_dimm_params.c                      | 1 +
 drivers/ddr/fsl/ddr3_dimm_params.c                      | 1 +
 drivers/ddr/fsl/ddr4_dimm_params.c                      | 1 +
 drivers/ddr/fsl/interactive.c                           | 1 +
 drivers/ddr/fsl/main.c                                  | 1 +
 drivers/ddr/marvell/axp/ddr3_hw_training.c              | 1 +
 drivers/ddr/marvell/axp/ddr3_pbs.c                      | 1 +
 drivers/ddr/marvell/axp/ddr3_spd.c                      | 1 +
 drivers/ddr/marvell/axp/ddr3_write_leveling.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_tftp.c                                  | 1 +
 drivers/dma/apbh_dma.c                                  | 1 +
 drivers/dma/keystone_nav.c                              | 1 +
 drivers/dma/sandbox-dma-test.c                          | 1 +
 drivers/dma/ti-edma3.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/fastboot/fb_mmc.c                               | 1 +
 drivers/fastboot/fb_nand.c                              | 1 +
 drivers/firmware/psci.c                                 | 1 +
 drivers/firmware/ti_sci.c                               | 1 +
 drivers/fpga/fpga.c                                     | 1 +
 drivers/fpga/socfpga_arria10.c                          | 1 +
 drivers/fpga/stratix10.c                                | 1 +
 drivers/fpga/versalpl.c                                 | 1 +
 drivers/fpga/xilinx.c                                   | 1 +
 drivers/gpio/74x164_gpio.c                              | 1 +
 drivers/gpio/adi_gpio2.c                                | 1 +
 drivers/gpio/axp_gpio.c                                 | 1 +
 drivers/gpio/da8xx_gpio.c                               | 1 +
 drivers/gpio/gpio-uclass.c                              | 1 +
 drivers/gpio/hi6220_gpio.c                              | 1 +
 drivers/gpio/imx_rgpio2p.c                              | 1 +
 drivers/gpio/intel_gpio.c                               | 1 +
 drivers/gpio/lpc32xx_gpio.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_gpio.c                             | 1 +
 drivers/gpio/pic32_gpio.c                               | 1 +
 drivers/gpio/rk_gpio.c                                  | 1 +
 drivers/gpio/sifive-gpio.c                              | 1 +
 drivers/gpio/sunxi_gpio.c                               | 1 +
 drivers/gpio/xilinx_gpio.c                              | 1 +
 drivers/gpio/zynq_gpio.c                                | 1 +
 drivers/i2c/fsl_i2c.c                                   | 1 +
 drivers/i2c/i2c-uclass.c                                | 1 +
 drivers/i2c/ihs_i2c.c                                   | 1 +
 drivers/i2c/intel_i2c.c                                 | 1 +
 drivers/i2c/lpc32xx_i2c.c                               | 1 +
 drivers/i2c/muxes/i2c-mux-uclass.c                      | 1 +
 drivers/i2c/mv_i2c.c                                    | 1 +
 drivers/i2c/mvtwsi.c                                    | 1 +
 drivers/i2c/stm32f7_i2c.c                               | 1 +
 drivers/i2c/tegra186_bpmp_i2c.c                         | 1 +
 drivers/i2c/tegra_i2c.c                                 | 1 +
 drivers/input/cros_ec_keyb.c                            | 1 +
 drivers/input/i8042.c                                   | 1 +
 drivers/input/input.c                                   | 1 +
 drivers/input/key_matrix.c                              | 1 +
 drivers/input/keyboard-uclass.c                         | 1 +
 drivers/input/tegra-kbc.c                               | 1 +
 drivers/led/led-uclass.c                                | 1 +
 drivers/misc/atsha204a-i2c.c                            | 1 +
 drivers/misc/cbmem_console.c                            | 1 +
 drivers/misc/cros_ec.c                                  | 1 +
 drivers/misc/cros_ec_i2c.c                              | 1 +
 drivers/misc/cros_ec_sandbox.c                          | 1 +
 drivers/misc/cros_ec_spi.c                              | 1 +
 drivers/misc/ds4510.c                                   | 1 +
 drivers/misc/fsl_portals.c                              | 1 +
 drivers/misc/gdsys_ioep.c                               | 1 +
 drivers/misc/i2c_eeprom_emul.c                          | 1 +
 drivers/misc/ihs_fpga.c                                 | 1 +
 drivers/misc/misc_sandbox.c                             | 1 +
 drivers/misc/mpc83xx_serdes.c                           | 1 +
 drivers/misc/qfw.c                                      | 1 +
 drivers/misc/rockchip-efuse.c                           | 1 +
 drivers/misc/sifive-otp.c                               | 1 +
 drivers/misc/tegra186_bpmp.c                            | 1 +
 drivers/misc/vexpress_config.c                          | 1 +
 drivers/mmc/ca_dw_mmc.c                                 | 1 +
 drivers/mmc/davinci_mmc.c                               | 1 +
 drivers/mmc/fsl_esdhc_imx.c                             | 1 +
 drivers/mmc/fsl_esdhc_spl.c                             | 1 +
 drivers/mmc/ftsdc010_mci.c                              | 1 +
 drivers/mmc/iproc_sdhci.c                               | 1 +
 drivers/mmc/meson_gx_mmc.c                              | 1 +
 drivers/mmc/mmc.c                                       | 1 +
 drivers/mmc/mmc_spi.c                                   | 1 +
 drivers/mmc/msm_sdhci.c                                 | 1 +
 drivers/mmc/mv_sdhci.c                                  | 1 +
 drivers/mmc/mxcmmc.c                                    | 1 +
 drivers/mmc/mxsmmc.c                                    | 1 +
 drivers/mmc/pxa_mmc_gen.c                               | 1 +
 drivers/mmc/rpmb.c                                      | 1 +
 drivers/mmc/sandbox_mmc.c                               | 1 +
 drivers/mmc/sdhci.c                                     | 1 +
 drivers/mmc/sh_mmcif.c                                  | 1 +
 drivers/mmc/snps_dw_mmc.c                               | 1 +
 drivers/mmc/sti_sdhci.c                                 | 1 +
 drivers/mmc/sunxi_mmc.c                                 | 1 +
 drivers/mmc/xenon_sdhci.c                               | 1 +
 drivers/mtd/altera_qspi.c                               | 1 +
 drivers/mtd/cfi_flash.c                                 | 1 +
 drivers/mtd/cfi_mtd.c                                   | 1 +
 drivers/mtd/mtd_uboot.c                                 | 1 +
 drivers/mtd/mtdpart.c                                   | 1 +
 drivers/mtd/nand/raw/atmel_nand.c                       | 1 +
 drivers/mtd/nand/raw/brcmnand/brcmnand.c                | 1 +
 drivers/mtd/nand/raw/denali.c                           | 1 +
 drivers/mtd/nand/raw/denali_spl.c                       | 1 +
 drivers/mtd/nand/raw/fsmc_nand.c                        | 1 +
 drivers/mtd/nand/raw/lpc32xx_nand_mlc.c                 | 1 +
 drivers/mtd/nand/raw/mxs_nand.c                         | 1 +
 drivers/mtd/nand/raw/mxs_nand_spl.c                     | 1 +
 drivers/mtd/nand/raw/nand_base.c                        | 1 +
 drivers/mtd/nand/raw/nand_bch.c                         | 1 +
 drivers/mtd/nand/raw/nand_spl_loaders.c                 | 1 +
 drivers/mtd/nand/raw/nand_util.c                        | 1 +
 drivers/mtd/nand/raw/omap_gpmc.c                        | 1 +
 drivers/mtd/nand/raw/pxa3xx_nand.c                      | 1 +
 drivers/mtd/nand/raw/sunxi_nand.c                       | 1 +
 drivers/mtd/nand/raw/sunxi_nand_spl.c                   | 1 +
 drivers/mtd/nand/raw/tegra_nand.c                       | 1 +
 drivers/mtd/nand/raw/vf610_nfc.c                        | 1 +
 drivers/mtd/nand/spi/core.c                             | 1 +
 drivers/mtd/onenand/onenand_base.c                      | 1 +
 drivers/mtd/onenand/onenand_bbt.c                       | 1 +
 drivers/mtd/onenand/onenand_spl.c                       | 1 +
 drivers/mtd/onenand/onenand_uboot.c                     | 1 +
 drivers/mtd/onenand/samsung.c                           | 1 +
 drivers/mtd/pic32_flash.c                               | 1 +
 drivers/mtd/spi/fsl_espi_spl.c                          | 1 +
 drivers/mtd/spi/sandbox.c                               | 1 +
 drivers/mtd/spi/sf-uclass.c                             | 1 +
 drivers/mtd/spi/sf_dataflash.c                          | 1 +
 drivers/mtd/spi/sf_mtd.c                                | 1 +
 drivers/mtd/spi/sf_probe.c                              | 1 +
 drivers/mtd/spi/spi-nor-core.c                          | 1 +
 drivers/mtd/spi/spi-nor-tiny.c                          | 1 +
 drivers/mtd/ubi/attach.c                                | 1 +
 drivers/mtd/ubi/build.c                                 | 1 +
 drivers/mtd/ubi/debug.c                                 | 1 +
 drivers/mtd/ubi/eba.c                                   | 1 +
 drivers/mtd/ubi/fastmap.c                               | 1 +
 drivers/mtd/ubi/io.c                                    | 1 +
 drivers/mtd/ubi/kapi.c                                  | 1 +
 drivers/mtd/ubi/upd.c                                   | 1 +
 drivers/mtd/ubi/vmt.c                                   | 1 +
 drivers/mtd/ubi/vtbl.c                                  | 1 +
 drivers/mtd/ubispl/ubispl.c                             | 1 +
 drivers/net/ag7xxx.c                                    | 1 +
 drivers/net/altera_tse.c                                | 1 +
 drivers/net/armada100_fec.c                             | 1 +
 drivers/net/at91_emac.c                                 | 1 +
 drivers/net/ax88180.c                                   | 1 +
 drivers/net/bcm-sf2-eth-gmac.c                          | 1 +
 drivers/net/bcm-sf2-eth.c                               | 1 +
 drivers/net/bcm6368-eth.c                               | 1 +
 drivers/net/calxedaxgmac.c                              | 1 +
 drivers/net/dc2114x.c                                   | 1 +
 drivers/net/designware.c                                | 1 +
 drivers/net/dm9000x.c                                   | 1 +
 drivers/net/dnet.c                                      | 1 +
 drivers/net/dwc_eth_qos.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/fm.c                                     | 1 +
 drivers/net/fm/init.c                                   | 1 +
 drivers/net/fm/memac_phy.c                              | 1 +
 drivers/net/fm/tgec_phy.c                               | 1 +
 drivers/net/fsl-mc/dpio/qbman_portal.c                  | 1 +
 drivers/net/fsl-mc/dpio/qbman_sys.h                     | 1 +
 drivers/net/fsl-mc/mc.c                                 | 1 +
 drivers/net/fsl_enetc.c                                 | 1 +
 drivers/net/fsl_mcdmafec.c                              | 1 +
 drivers/net/fsl_mdio.c                                  | 1 +
 drivers/net/ftmac100.c                                  | 1 +
 drivers/net/ftmac110.c                                  | 1 +
 drivers/net/gmac_rockchip.c                             | 1 +
 drivers/net/higmacv300.c                                | 1 +
 drivers/net/lan91c96.c                                  | 1 +
 drivers/net/ldpaa_eth/ldpaa_eth.c                       | 1 +
 drivers/net/lpc32xx_eth.c                               | 1 +
 drivers/net/macb.c                                      | 1 +
 drivers/net/mcffec.c                                    | 1 +
 drivers/net/mcfmii.c                                    | 1 +
 drivers/net/mpc8xx_fec.c                                | 1 +
 drivers/net/mscc_eswitch/jr2_switch.c                   | 1 +
 drivers/net/mscc_eswitch/luton_switch.c                 | 1 +
 drivers/net/mscc_eswitch/ocelot_switch.c                | 1 +
 drivers/net/mscc_eswitch/serval_switch.c                | 1 +
 drivers/net/mscc_eswitch/servalt_switch.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/ne2000_base.c                               | 1 +
 drivers/net/netconsole.c                                | 1 +
 drivers/net/ns8382x.c                                   | 1 +
 drivers/net/pch_gbe.c                                   | 1 +
 drivers/net/pcnet.c                                     | 1 +
 drivers/net/pfe_eth/pfe_cmd.c                           | 1 +
 drivers/net/pfe_eth/pfe_driver.c                        | 1 +
 drivers/net/pfe_eth/pfe_firmware.c                      | 1 +
 drivers/net/pfe_eth/pfe_hw.c                            | 1 +
 drivers/net/phy/aquantia.c                              | 1 +
 drivers/net/phy/atheros.c                               | 1 +
 drivers/net/phy/b53.c                                   | 1 +
 drivers/net/phy/fixed.c                                 | 1 +
 drivers/net/phy/miiphybb.c                              | 1 +
 drivers/net/phy/mv88e61xx.c                             | 1 +
 drivers/net/phy/mv88e6352.c                             | 1 +
 drivers/net/phy/ncsi.c                                  | 1 +
 drivers/net/phy/phy.c                                   | 1 +
 drivers/net/pic32_mdio.c                                | 1 +
 drivers/net/ravb.c                                      | 1 +
 drivers/net/rtl8139.c                                   | 1 +
 drivers/net/rtl8169.c                                   | 1 +
 drivers/net/sandbox-raw-bus.c                           | 1 +
 drivers/net/sandbox-raw.c                               | 1 +
 drivers/net/sandbox.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/sunxi_emac.c                                | 1 +
 drivers/net/ti/cpsw-common.c                            | 1 +
 drivers/net/ti/cpsw.c                                   | 1 +
 drivers/net/ti/davinci_emac.c                           | 1 +
 drivers/net/tsec.c                                      | 1 +
 drivers/net/uli526x.c                                   | 1 +
 drivers/net/xilinx_axi_emac.c                           | 1 +
 drivers/net/zynq_gem.c                                  | 1 +
 drivers/nvme/nvme.c                                     | 1 +
 drivers/pci/fsl_pci_init.c                              | 1 +
 drivers/pci/pci-uclass.c                                | 1 +
 drivers/pci/pci_ftpci100.c                              | 1 +
 drivers/pci/pci_rom.c                                   | 1 +
 drivers/pci/pci_tegra.c                                 | 1 +
 drivers/pci/pcie_imx.c                                  | 1 +
 drivers/pci/pcie_layerscape_fixup_common.c              | 1 +
 drivers/pci_endpoint/sandbox-pci_ep.c                   | 1 +
 drivers/phy/allwinner/phy-sun4i-usb.c                   | 1 +
 drivers/phy/rockchip/phy-rockchip-inno-usb2.c           | 1 +
 drivers/phy/rockchip/phy-rockchip-typec.c               | 1 +
 drivers/pinctrl/exynos/pinctrl-exynos.c                 | 1 +
 drivers/pinctrl/mtmips/pinctrl-mtmips-common.c          | 1 +
 drivers/pinctrl/mvebu/pinctrl-armada-37xx.c             | 1 +
 drivers/pinctrl/pinctrl-generic.c                       | 1 +
 drivers/pinctrl/pinctrl-sandbox.c                       | 1 +
 drivers/pinctrl/pinctrl-stmfx.c                         | 1 +
 drivers/pinctrl/rockchip/pinctrl-rockchip-core.c        | 1 +
 drivers/power/domain/imx8-power-domain-legacy.c         | 1 +
 drivers/power/pmic/i2c_pmic_emul.c                      | 1 +
 drivers/power/pmic/palmas.c                             | 1 +
 drivers/power/pmic/pmic-uclass.c                        | 1 +
 drivers/power/power_core.c                              | 1 +
 drivers/power/power_i2c.c                               | 1 +
 drivers/power/regulator/bd71837.c                       | 1 +
 drivers/power/regulator/da9063.c                        | 1 +
 drivers/power/regulator/palmas_regulator.c              | 1 +
 drivers/power/regulator/pfuze100.c                      | 1 +
 drivers/power/regulator/regulator-uclass.c              | 1 +
 drivers/qe/qe.c                                         | 1 +
 drivers/qe/uccf.c                                       | 1 +
 drivers/qe/uec.c                                        | 1 +
 drivers/qe/uec_phy.c                                    | 1 +
 drivers/ram/imxrt_sdram.c                               | 1 +
 drivers/ram/rockchip/sdram_rk3188.c                     | 1 +
 drivers/ram/rockchip/sdram_rk322x.c                     | 1 +
 drivers/ram/rockchip/sdram_rk3288.c                     | 1 +
 drivers/ram/rockchip/sdram_rk3328.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_ram.c                     | 1 +
 drivers/ram/stm32mp1/stm32mp1_tests.c                   | 1 +
 drivers/ram/stm32mp1/stm32mp1_tuning.c                  | 1 +
 drivers/remoteproc/k3_system_controller.c               | 1 +
 drivers/remoteproc/rproc-elf-loader.c                   | 1 +
 drivers/remoteproc/rproc-uclass.c                       | 1 +
 drivers/remoteproc/ti_k3_dsp_rproc.c                    | 1 +
 drivers/remoteproc/ti_k3_r5f_rproc.c                    | 1 +
 drivers/remoteproc/ti_power_proc.c                      | 1 +
 drivers/rng/meson-rng.c                                 | 1 +
 drivers/rng/stm32mp1_rng.c                              | 1 +
 drivers/rtc/ds1302.c                                    | 1 +
 drivers/rtc/i2c_rtc_emul.c                              | 1 +
 drivers/rtc/rs5c372.c                                   | 1 +
 drivers/scsi/scsi.c                                     | 1 +
 drivers/serial/sandbox.c                                | 1 +
 drivers/serial/serial-uclass.c                          | 1 +
 drivers/serial/serial.c                                 | 1 +
 drivers/serial/usbtty.c                                 | 1 +
 drivers/smem/msm_smem.c                                 | 1 +
 drivers/soc/soc-uclass.c                                | 1 +
 drivers/soc/ti/k3-navss-ringacc.c                       | 1 +
 drivers/spi/atcspi200_spi.c                             | 1 +
 drivers/spi/bcmstb_spi.c                                | 1 +
 drivers/spi/cadence_qspi_apb.c                          | 1 +
 drivers/spi/cf_spi.c                                    | 1 +
 drivers/spi/fsl_espi.c                                  | 1 +
 drivers/spi/fsl_qspi.c                                  | 1 +
 drivers/spi/ich.c                                       | 1 +
 drivers/spi/meson_spifc.c                               | 1 +
 drivers/spi/mtk_snfi_spi.c                              | 1 +
 drivers/spi/mxc_spi.c                                   | 1 +
 drivers/spi/mxs_spi.c                                   | 1 +
 drivers/spi/nxp_fspi.c                                  | 1 +
 drivers/spi/renesas_rpc_spi.c                           | 1 +
 drivers/spi/spi-mem-nodm.c                              | 1 +
 drivers/spi/spi-mem.c                                   | 1 +
 drivers/spi/spi-sifive.c                                | 1 +
 drivers/spi/spi.c                                       | 1 +
 drivers/spi/tegra210_qspi.c                             | 1 +
 drivers/spi/zynq_qspi.c                                 | 1 +
 drivers/spi/zynqmp_gqspi.c                              | 1 +
 drivers/sysreset/sysreset_sandbox.c                     | 1 +
 drivers/tee/broadcom/chimp_optee.c                      | 1 +
 drivers/tee/optee/core.c                                | 1 +
 drivers/tee/sandbox.c                                   | 1 +
 drivers/tee/tee-uclass.c                                | 1 +
 drivers/thermal/imx_scu_thermal.c                       | 1 +
 drivers/thermal/imx_tmu.c                               | 1 +
 drivers/tpm/cr50_i2c.c                                  | 1 +
 drivers/tpm/tpm-uclass.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_atmel_twi.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/ufs/ufs.c                                       | 1 +
 drivers/usb/cdns3/gadget.c                              | 1 +
 drivers/usb/common/common.c                             | 1 +
 drivers/usb/common/fsl-dt-fixup.c                       | 1 +
 drivers/usb/dwc3/ep0.c                                  | 1 +
 drivers/usb/dwc3/gadget.c                               | 1 +
 drivers/usb/dwc3/linux-compat.h                         | 1 +
 drivers/usb/emul/sandbox_flash.c                        | 1 +
 drivers/usb/emul/sandbox_keyb.c                         | 1 +
 drivers/usb/emul/usb-emul-uclass.c                      | 1 +
 drivers/usb/eth/asix.c                                  | 1 +
 drivers/usb/eth/asix88179.c                             | 1 +
 drivers/usb/eth/lan75xx.c                               | 1 +
 drivers/usb/eth/lan78xx.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/eth/usb_ether.c                             | 1 +
 drivers/usb/gadget/at91_udc.c                           | 1 +
 drivers/usb/gadget/atmel_usba_udc.c                     | 1 +
 drivers/usb/gadget/ci_udc.c                             | 1 +
 drivers/usb/gadget/composite.c                          | 1 +
 drivers/usb/gadget/designware_udc.c                     | 1 +
 drivers/usb/gadget/dwc2_udc_otg.c                       | 1 +
 drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c              | 1 +
 drivers/usb/gadget/epautoconf.c                         | 1 +
 drivers/usb/gadget/ether.c                              | 1 +
 drivers/usb/gadget/f_dfu.c                              | 1 +
 drivers/usb/gadget/f_fastboot.c                         | 1 +
 drivers/usb/gadget/f_mass_storage.c                     | 1 +
 drivers/usb/gadget/f_rockusb.c                          | 1 +
 drivers/usb/gadget/f_sdp.c                              | 1 +
 drivers/usb/gadget/f_thor.c                             | 1 +
 drivers/usb/gadget/fotg210.c                            | 1 +
 drivers/usb/gadget/g_dnl.c                              | 1 +
 drivers/usb/gadget/gadget_chips.h                       | 2 ++
 drivers/usb/gadget/pxa25x_udc.c                         | 1 +
 drivers/usb/gadget/rndis.c                              | 1 +
 drivers/usb/gadget/usbstring.c                          | 1 +
 drivers/usb/host/dwc2.c                                 | 1 +
 drivers/usb/host/ehci-fsl.c                             | 1 +
 drivers/usb/host/ehci-hcd.c                             | 1 +
 drivers/usb/host/ehci-mx5.c                             | 1 +
 drivers/usb/host/ehci-omap.c                            | 1 +
 drivers/usb/host/ehci-tegra.c                           | 1 +
 drivers/usb/host/ehci-vf.c                              | 1 +
 drivers/usb/host/ohci-hcd.c                             | 1 +
 drivers/usb/host/r8a66597-hcd.c                         | 1 +
 drivers/usb/host/r8a66597.h                             | 1 +
 drivers/usb/host/sl811-hcd.c                            | 1 +
 drivers/usb/host/usb-uclass.c                           | 1 +
 drivers/usb/host/xhci-dwc3.c                            | 1 +
 drivers/usb/host/xhci-mem.c                             | 1 +
 drivers/usb/host/xhci.c                                 | 1 +
 drivers/usb/musb-new/am35x.c                            | 1 +
 drivers/usb/musb-new/mt85xx.c                           | 1 +
 drivers/usb/musb-new/musb_core.c                        | 1 +
 drivers/usb/musb-new/musb_gadget.c                      | 1 +
 drivers/usb/musb-new/musb_uboot.c                       | 1 +
 drivers/usb/musb-new/pic32.c                            | 1 +
 drivers/usb/musb-new/sunxi.c                            | 1 +
 drivers/usb/musb-new/ti-musb.c                          | 1 +
 drivers/usb/musb/am35x.c                                | 1 +
 drivers/usb/musb/musb_hcd.c                             | 1 +
 drivers/video/am335x-fb.c                               | 1 +
 drivers/video/ati_radeon_fb.c                           | 1 +
 drivers/video/bridge/anx6345.c                          | 1 +
 drivers/video/cfb_console.c                             | 1 +
 drivers/video/console_truetype.c                        | 1 +
 drivers/video/da8xx-fb.c                                | 1 +
 drivers/video/dw_hdmi.c                                 | 1 +
 drivers/video/dw_mipi_dsi.c                             | 1 +
 drivers/video/exynos/exynos_dp.c                        | 1 +
 drivers/video/exynos/exynos_mipi_dsi.c                  | 1 +
 drivers/video/fsl_dcu_fb.c                              | 1 +
 drivers/video/fsl_diu_fb.c                              | 1 +
 drivers/video/ihs_video_out.c                           | 1 +
 drivers/video/imx/ipu_common.c                          | 1 +
 drivers/video/lg4573.c                                  | 1 +
 drivers/video/logicore_dp_tx.c                          | 1 +
 drivers/video/mali_dp.c                                 | 1 +
 drivers/video/meson/meson_venc.c                        | 1 +
 drivers/video/mipi_dsi.c                                | 1 +
 drivers/video/mx3fb.c                                   | 1 +
 drivers/video/mxsfb.c                                   | 1 +
 drivers/video/orisetech_otm8009a.c                      | 1 +
 drivers/video/raydium-rm68200.c                         | 1 +
 drivers/video/rockchip/rk_edp.c                         | 1 +
 drivers/video/sandbox_osd.c                             | 1 +
 drivers/video/simplefb.c                                | 1 +
 drivers/video/stb_truetype.h                            | 2 ++
 drivers/video/sunxi/sunxi_de2.c                         | 1 +
 drivers/video/sunxi/sunxi_display.c                     | 1 +
 drivers/video/sunxi/sunxi_lcd.c                         | 1 +
 drivers/video/tegra124/dp.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_mmio.c                            | 1 +
 drivers/virtio/virtio_net.c                             | 1 +
 drivers/virtio/virtio_pci_modern.c                      | 1 +
 drivers/virtio/virtio_ring.c                            | 1 +
 drivers/virtio/virtio_rng.c                             | 1 +
 drivers/w1-eeprom/ds2502.c                              | 1 +
 drivers/w1-eeprom/eep_sandbox.c                         | 1 +
 drivers/watchdog/mpc8xx_wdt.c                           | 1 +
 env/callback.c                                          | 1 +
 env/common.c                                            | 1 +
 env/ext4.c                                              | 1 +
 env/fat.c                                               | 1 +
 env/flash.c                                             | 1 +
 env/mmc.c                                               | 1 +
 env/nvram.c                                             | 1 +
 env/ubi.c                                               | 1 +
 examples/api/demo.c                                     | 1 +
 examples/api/glue.c                                     | 1 +
 examples/standalone/atmel_df_pow2.c                     | 1 +
 fs/btrfs/super.c                                        | 1 +
 fs/cbfs/cbfs.c                                          | 1 +
 fs/cramfs/cramfs.c                                      | 1 +
 fs/ext4/ext4_common.c                                   | 1 +
 fs/ext4/ext4_common.h                                   | 1 +
 fs/ext4/ext4_journal.c                                  | 1 +
 fs/ext4/ext4_write.c                                    | 1 +
 fs/ext4/ext4fs.c                                        | 1 +
 fs/fat/fat.c                                            | 1 +
 fs/fat/fat_write.c                                      | 1 +
 fs/fs.c                                                 | 1 +
 fs/fs_internal.c                                        | 1 +
 fs/jffs2/compr_zlib.c                                   | 1 +
 fs/jffs2/jffs2_1pass.c                                  | 1 +
 fs/jffs2/mini_inflate.c                                 | 1 +
 fs/reiserfs/reiserfs.c                                  | 1 +
 fs/ubifs/debug.c                                        | 1 +
 fs/ubifs/io.c                                           | 1 +
 fs/ubifs/key.h                                          | 1 +
 fs/ubifs/log.c                                          | 1 +
 fs/ubifs/lprops.c                                       | 1 +
 fs/ubifs/lpt_commit.c                                   | 1 +
 fs/ubifs/recovery.c                                     | 1 +
 fs/ubifs/replay.c                                       | 1 +
 fs/ubifs/super.c                                        | 1 +
 fs/ubifs/tnc.c                                          | 1 +
 fs/ubifs/ubifs.c                                        | 1 +
 fs/yaffs2/yaffs_mtdif2.c                                | 1 +
 fs/yaffs2/yaffs_uboot_glue.c                            | 1 +
 fs/yaffs2/yaffsfs.c                                     | 1 +
 fs/yaffs2/ydirectenv.h                                  | 1 +
 fs/zfs/zfs.c                                            | 1 +
 include/common.h                                        | 1 -
 include/dm/of.h                                         | 1 +
 include/exception.h                                     | 1 +
 include/exports.h                                       | 1 +
 include/fdt_support.h                                   | 1 +
 include/imx8image.h                                     | 1 +
 include/malloc.h                                        | 2 +-
 include/net.h                                           | 1 +
 include/phy_interface.h                                 | 1 +
 include/spi_flash.h                                     | 1 +
 include/test/ut.h                                       | 1 +
 include/tlv_eeprom.h                                    | 1 +
 include/video_console.h                                 | 1 +
 lib/acpi/acpi_device.c                                  | 1 +
 lib/acpi/acpi_dp.c                                      | 1 +
 lib/acpi/acpi_table.c                                   | 1 +
 lib/acpi/acpigen.c                                      | 1 +
 lib/aes.c                                               | 1 +
 lib/aes/aes-decrypt.c                                   | 1 +
 lib/bch.c                                               | 1 +
 lib/bzip2/bzlib.c                                       | 1 +
 lib/charset.c                                           | 1 +
 lib/crc16.c                                             | 1 +
 lib/crc32.c                                             | 1 +
 lib/crypto/pkcs7_verify.c                               | 1 +
 lib/crypto/public_key.c                                 | 1 +
 lib/crypto/x509_public_key.c                            | 1 +
 lib/dhry/dhry_1.c                                       | 1 +
 lib/dhry/dhry_2.c                                       | 1 +
 lib/efi/efi_app.c                                       | 1 +
 lib/efi/efi_stub.c                                      | 1 +
 lib/efi_loader/efi_bootmgr.c                            | 1 +
 lib/efi_loader/efi_boottime.c                           | 1 +
 lib/efi_loader/efi_console.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_file.c                               | 1 +
 lib/efi_loader/efi_freestanding.c                       | 1 +
 lib/efi_loader/efi_gop.c                                | 1 +
 lib/efi_loader/efi_hii.c                                | 1 +
 lib/efi_loader/efi_image_loader.c                       | 1 +
 lib/efi_loader/efi_load_initrd.c                        | 1 +
 lib/efi_loader/efi_net.c                                | 1 +
 lib/efi_loader/efi_runtime.c                            | 1 +
 lib/efi_loader/efi_setup.c                              | 1 +
 lib/efi_loader/efi_signature.c                          | 1 +
 lib/efi_loader/efi_unicode_collation.c                  | 1 +
 lib/efi_loader/efi_var_file.c                           | 1 +
 lib/efi_loader/efi_var_mem.c                            | 1 +
 lib/efi_loader/efi_variable.c                           | 1 +
 lib/efi_loader/efi_variable_tee.c                       | 1 +
 lib/efi_loader/helloworld.c                             | 1 +
 lib/efi_selftest/efi_selftest_block_device.c            | 1 +
 lib/efi_selftest/efi_selftest_config_table.c            | 1 +
 lib/efi_selftest/efi_selftest_load_initrd.c             | 1 +
 lib/efi_selftest/efi_selftest_loaded_image.c            | 1 +
 lib/efi_selftest/efi_selftest_loadimage.c               | 1 +
 lib/efi_selftest/efi_selftest_manageprotocols.c         | 1 +
 lib/efi_selftest/efi_selftest_mem.c                     | 1 +
 lib/efi_selftest/efi_selftest_memory.c                  | 1 +
 lib/efi_selftest/efi_selftest_rng.c                     | 1 +
 lib/efi_selftest/efi_selftest_set_virtual_address_map.c | 1 +
 lib/efi_selftest/efi_selftest_snp.c                     | 1 +
 lib/efi_selftest/efi_selftest_startimage_exit.c         | 1 +
 lib/efi_selftest/efi_selftest_variables.c               | 1 +
 lib/efi_selftest/efi_selftest_variables_runtime.c       | 1 +
 lib/elf.c                                               | 1 +
 lib/fdtdec.c                                            | 1 +
 lib/fdtdec_test.c                                       | 1 +
 lib/gunzip.c                                            | 1 +
 lib/hashtable.c                                         | 1 +
 lib/libavb/avb_sysdeps_posix.c                          | 1 +
 lib/linux_compat.c                                      | 1 +
 lib/list_sort.c                                         | 1 +
 lib/lz4.c                                               | 1 +
 lib/lz4_wrapper.c                                       | 1 +
 lib/lzo/lzo1x_decompress.c                              | 1 +
 lib/membuff.c                                           | 1 +
 lib/of_live.c                                           | 1 +
 lib/optee/optee.c                                       | 1 +
 lib/physmem.c                                           | 1 +
 lib/qsort.c                                             | 1 +
 lib/rsa/rsa-keyprop.c                                   | 1 +
 lib/rsa/rsa-mod-exp.c                                   | 1 +
 lib/rsa/rsa-verify.c                                    | 1 +
 lib/slre.c                                              | 1 +
 lib/smbios.c                                            | 1 +
 lib/strto.c                                             | 1 +
 lib/tpm-common.c                                        | 1 +
 lib/tpm-v1.c                                            | 1 +
 lib/tpm-v2.c                                            | 1 +
 lib/trace.c                                             | 1 +
 lib/uuid.c                                              | 1 +
 lib/zstd/zstd_opt.h                                     | 1 +
 net/arp.c                                               | 1 +
 net/bootp.c                                             | 1 +
 net/cdp.c                                               | 1 +
 net/dns.c                                               | 1 +
 net/eth-uclass.c                                        | 1 +
 net/eth_common.c                                        | 1 +
 net/eth_legacy.c                                        | 1 +
 net/fastboot.c                                          | 1 +
 net/link_local.c                                        | 1 +
 net/mdio-uclass.c                                       | 1 +
 net/net.c                                               | 1 +
 net/net_rand.h                                          | 1 +
 net/nfs.c                                               | 1 +
 net/pcap.c                                              | 1 +
 net/rarp.c                                              | 1 +
 net/sntp.c                                              | 1 +
 net/tftp.c                                              | 1 +
 net/wol.c                                               | 1 +
 post/drivers/flash.c                                    | 1 +
 post/lib_powerpc/multi.c                                | 1 +
 post/lib_powerpc/string.c                               | 1 +
 post/post.c                                             | 1 +
 1231 files changed, 1234 insertions(+), 4 deletions(-)

diff --git a/api/api.c b/api/api.c
index 2e955f7baf2..05f0203584d 100644
--- a/api/api.c
+++ b/api/api.c
@@ -13,6 +13,7 @@
 #include <env_internal.h>
 #include <time.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include <linux/types.h>
 #include <api_public.h>
 #include <u-boot/crc.h>
diff --git a/api/api_net.c b/api/api_net.c
index 7515c26e8b4..63ac3ee09c7 100644
--- a/api/api_net.c
+++ b/api/api_net.c
@@ -8,6 +8,7 @@
 #include <config.h>
 #include <common.h>
 #include <net.h>
+#include <linux/string.h>
 #include <linux/types.h>
 #include <api_public.h>
 
diff --git a/arch/arc/lib/relocate.c b/arch/arc/lib/relocate.c
index 7f531c95eec..a1663c1eb39 100644
--- a/arch/arc/lib/relocate.c
+++ b/arch/arc/lib/relocate.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <asm-generic/sections.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 
 extern ulong __image_copy_start;
 extern ulong __ivt_start;
diff --git a/arch/arm/cpu/arm1136/mx35/generic.c b/arch/arm/cpu/arm1136/mx35/generic.c
index cbf76ab4fee..99e7ec0744f 100644
--- a/arch/arm/cpu/arm1136/mx35/generic.c
+++ b/arch/arm/cpu/arm1136/mx35/generic.c
@@ -24,6 +24,7 @@
 #endif
 #include <netdev.h>
 #include <spl.h>
+#include <linux/string.h>
 
 #define CLK_CODE(arm, ahb, sel) (((arm) << 16) + ((ahb) << 8) + (sel))
 #define CLK_CODE_ARM(c)		(((c) >> 16) & 0xFF)
diff --git a/arch/arm/cpu/arm926ejs/mxs/mxs.c b/arch/arm/cpu/arm926ejs/mxs/mxs.c
index c9362136fbf..91ea4f02d02 100644
--- a/arch/arm/cpu/arm926ejs/mxs/mxs.c
+++ b/arch/arm/cpu/arm926ejs/mxs/mxs.c
@@ -26,6 +26,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
 #include <linux/compiler.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/cpu/arm926ejs/mxs/spl_boot.c b/arch/arm/cpu/arm926ejs/mxs/spl_boot.c
index a16a15e79d8..35f503f93b0 100644
--- a/arch/arm/cpu/arm926ejs/mxs/spl_boot.c
+++ b/arch/arm/cpu/arm926ejs/mxs/spl_boot.c
@@ -17,6 +17,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/gpio.h>
 #include <linux/compiler.h>
+#include <linux/string.h>
 
 #include "mxs_init.h"
 
diff --git a/arch/arm/cpu/arm926ejs/spear/cpu.c b/arch/arm/cpu/arm926ejs/spear/cpu.c
index 21065410746..93fd7a6d8df 100644
--- a/arch/arm/cpu/arm926ejs/spear/cpu.c
+++ b/arch/arm/cpu/arm926ejs/spear/cpu.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/spr_misc.h>
+#include <linux/string.h>
 
 int arch_cpu_init(void)
 {
diff --git a/arch/arm/cpu/arm926ejs/spear/spr_misc.c b/arch/arm/cpu/arm926ejs/spear/spr_misc.c
index 044052b32f9..a910b7134f3 100644
--- a/arch/arm/cpu/arm926ejs/spear/spr_misc.c
+++ b/arch/arm/cpu/arm926ejs/spear/spr_misc.c
@@ -17,6 +17,7 @@
 #include <asm/arch/hardware.h>
 #include <asm/arch/spr_emi.h>
 #include <asm/arch/spr_defs.h>
+#include <linux/string.h>
 
 #define CPU		0
 #define DDR		1
diff --git a/arch/arm/cpu/armv7/bcm235xx/clk-bcm235xx.c b/arch/arm/cpu/armv7/bcm235xx/clk-bcm235xx.c
index 39217c5b2bf..abdbcb068ee 100644
--- a/arch/arm/cpu/armv7/bcm235xx/clk-bcm235xx.c
+++ b/arch/arm/cpu/armv7/bcm235xx/clk-bcm235xx.c
@@ -14,6 +14,7 @@
 #include <linux/errno.h>
 #include <asm/arch/sysmap.h>
 #include <asm/kona-common/clk.h>
+#include <linux/string.h>
 #include "clk-core.h"
 
 #define CLOCK_1K		1000
diff --git a/arch/arm/cpu/armv7/bcm235xx/clk-core.c b/arch/arm/cpu/armv7/bcm235xx/clk-core.c
index d7edefee231..a6bd627e20e 100644
--- a/arch/arm/cpu/armv7/bcm235xx/clk-core.c
+++ b/arch/arm/cpu/armv7/bcm235xx/clk-core.c
@@ -17,6 +17,7 @@
 #include <bitfield.h>
 #include <asm/arch/sysmap.h>
 #include <asm/kona-common/clk.h>
+#include <linux/string.h>
 #include "clk-core.h"
 
 #define CLK_WR_ACCESS_PASSWORD	0x00a5a501
diff --git a/arch/arm/cpu/armv7/bcm281xx/clk-bcm281xx.c b/arch/arm/cpu/armv7/bcm281xx/clk-bcm281xx.c
index 8f6260e7857..ee0e7530480 100644
--- a/arch/arm/cpu/armv7/bcm281xx/clk-bcm281xx.c
+++ b/arch/arm/cpu/armv7/bcm281xx/clk-bcm281xx.c
@@ -14,6 +14,7 @@
 #include <linux/errno.h>
 #include <asm/arch/sysmap.h>
 #include <asm/kona-common/clk.h>
+#include <linux/string.h>
 #include "clk-core.h"
 
 #define CLOCK_1K		1000
diff --git a/arch/arm/cpu/armv7/bcm281xx/clk-core.c b/arch/arm/cpu/armv7/bcm281xx/clk-core.c
index 26b673a5405..a70979d0933 100644
--- a/arch/arm/cpu/armv7/bcm281xx/clk-core.c
+++ b/arch/arm/cpu/armv7/bcm281xx/clk-core.c
@@ -17,6 +17,7 @@
 #include <bitfield.h>
 #include <asm/arch/sysmap.h>
 #include <asm/kona-common/clk.h>
+#include <linux/string.h>
 #include "clk-core.h"
 
 #define CLK_WR_ACCESS_PASSWORD	0x00a5a501
diff --git a/arch/arm/cpu/armv7/ls102xa/fdt.c b/arch/arm/cpu/armv7/ls102xa/fdt.c
index d1d09f93650..b2e80751a98 100644
--- a/arch/arm/cpu/armv7/ls102xa/fdt.c
+++ b/arch/arm/cpu/armv7/ls102xa/fdt.c
@@ -20,6 +20,7 @@
 #include <asm/arch/immap_ls102xa.h>
 #include <fsl_sec.h>
 #include <dm.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/cpu/armv7/vf610/generic.c b/arch/arm/cpu/armv7/vf610/generic.c
index c23ddc12b45..3f266178c98 100644
--- a/arch/arm/cpu/armv7/vf610/generic.c
+++ b/arch/arm/cpu/armv7/vf610/generic.c
@@ -21,6 +21,7 @@
 #ifdef CONFIG_FSL_ESDHC_IMX
 #include <fsl_esdhc_imx.h>
 #endif
+#include <linux/string.h>
 
 #ifdef CONFIG_FSL_ESDHC_IMX
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/cpu/armv7/virt-v7.c b/arch/arm/cpu/armv7/virt-v7.c
index 5ffeca13d91..8731af9f687 100644
--- a/arch/arm/cpu/armv7/virt-v7.c
+++ b/arch/arm/cpu/armv7/virt-v7.c
@@ -15,6 +15,7 @@
 #include <asm/gic.h>
 #include <asm/io.h>
 #include <asm/secure.h>
+#include <linux/string.h>
 
 static unsigned int read_id_pfr1(void)
 {
diff --git a/arch/arm/cpu/armv8/cache_v8.c b/arch/arm/cpu/armv8/cache_v8.c
index 15cecb5e0b3..0930d206ccd 100644
--- a/arch/arm/cpu/armv8/cache_v8.c
+++ b/arch/arm/cpu/armv8/cache_v8.c
@@ -15,6 +15,7 @@
 #include <asm/global_data.h>
 #include <asm/system.h>
 #include <asm/armv8/mmu.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/cpu/armv8/cpu.c b/arch/arm/cpu/armv8/cpu.c
index ea40c55dd2c..21c10cf6c7c 100644
--- a/arch/arm/cpu/armv8/cpu.c
+++ b/arch/arm/cpu/armv8/cpu.c
@@ -18,6 +18,7 @@
 #include <asm/system.h>
 #include <asm/secure.h>
 #include <linux/compiler.h>
+#include <linux/string.h>
 
 /*
  * sdelay() - simple spin loop.
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
index 3654cbf3b49..5839f0b9c9e 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
@@ -40,6 +40,7 @@
 #include <asm/arch/clock.h>
 #include <hwconfig.h>
 #include <fsl_qbman.h>
+#include <linux/string.h>
 
 #ifdef CONFIG_TFABOOT
 #include <env_internal.h>
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/fdt.c b/arch/arm/cpu/armv8/fsl-layerscape/fdt.c
index 7400b2cf292..ab4f4a5eb1a 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/fdt.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/fdt.c
@@ -31,6 +31,7 @@
 #endif
 #include <asm/arch/speed.h>
 #include <fsl_qbman.h>
+#include <linux/string.h>
 
 int fdt_fixup_phy_connection(void *blob, int offset, phy_interface_t phyc)
 {
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_serdes.c b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_serdes.c
index 41c89b8904e..4a2f22d0366 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_serdes.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_serdes.c
@@ -10,6 +10,7 @@
 #include <linux/errno.h>
 #include <asm/arch/fsl_serdes.h>
 #include <asm/arch/soc.h>
+#include <linux/string.h>
 
 #ifdef CONFIG_SYS_FSL_SRDS_1
 static u8 serdes1_prtcl_map[SERDES_PRCTL_COUNT];
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 aa6fd6b28ce..f14636a0f5d 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c
@@ -14,6 +14,7 @@
 #include <asm/arch/fsl_serdes.h>
 #include <asm/arch/soc.h>
 #include <fsl-mc/ldpaa_wriop.h>
+#include <linux/string.h>
 
 #ifdef CONFIG_SYS_FSL_SRDS_1
 static u8 serdes1_prtcl_map[SERDES_PRCTL_COUNT];
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls1028_ids.c b/arch/arm/cpu/armv8/fsl-layerscape/ls1028_ids.c
index 49df8b37900..2d25c92c6ee 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/ls1028_ids.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/ls1028_ids.c
@@ -9,6 +9,7 @@
 #include <asm/arch-fsl-layerscape/immap_lsch3.h>
 #include <asm/arch-fsl-layerscape/fsl_icid.h>
 #include <asm/arch-fsl-layerscape/fsl_portals.h>
+#include <linux/string.h>
 
 struct icid_id_table icid_tbl[] = {
 	SET_USB_ICID(1, "snps,dwc3", FSL_USB1_STREAM_ID),
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/mp.c b/arch/arm/cpu/armv8/fsl-layerscape/mp.c
index 5ac545f9df8..8675007da51 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/mp.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/mp.c
@@ -14,6 +14,7 @@
 #include <asm/arch/mp.h>
 #include <asm/arch/soc.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include "cpu.h"
 #include <asm/arch-fsl-layerscape/soc.h>
 #include <efi_loader.h>
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/spl.c b/arch/arm/cpu/armv8/fsl-layerscape/spl.c
index 7d594a9f749..7c44dc7a95a 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/spl.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/spl.c
@@ -20,6 +20,7 @@
 #include <asm/arch/fdt.h>
 #include <asm/arch/ppa.h>
 #include <asm/arch/soc.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/cpu/armv8/sec_firmware.c b/arch/arm/cpu/armv8/sec_firmware.c
index c6c4fcc7e07..46d58d176c5 100644
--- a/arch/arm/cpu/armv8/sec_firmware.c
+++ b/arch/arm/cpu/armv8/sec_firmware.c
@@ -18,6 +18,7 @@
 #include <asm/types.h>
 #include <asm/macro.h>
 #include <asm/armv8/sec_firmware.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 extern void c_runtime_cpu_setup(void);
diff --git a/arch/arm/cpu/armv8/spin_table.c b/arch/arm/cpu/armv8/spin_table.c
index 42a0962fdcd..6aafb3b6ea3 100644
--- a/arch/arm/cpu/armv8/spin_table.c
+++ b/arch/arm/cpu/armv8/spin_table.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <linux/libfdt.h>
 #include <asm/spin_table.h>
+#include <linux/string.h>
 
 int spin_table_update_dt(void *fdt)
 {
diff --git a/arch/arm/cpu/armv8/spl_data.c b/arch/arm/cpu/armv8/spl_data.c
index 8fd986a67a2..f8f9fe2e026 100644
--- a/arch/arm/cpu/armv8/spl_data.c
+++ b/arch/arm/cpu/armv8/spl_data.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <spl.h>
+#include <linux/string.h>
 
 char __data_save_start[0] __section(.__data_save_start);
 char __data_save_end[0] __section(.__data_save_end);
diff --git a/arch/arm/include/asm/io.h b/arch/arm/include/asm/io.h
index 8959749ad65..c53224bb2b8 100644
--- a/arch/arm/include/asm/io.h
+++ b/arch/arm/include/asm/io.h
@@ -30,6 +30,7 @@
 #if 0	/* XXX###XXX */
 #include <asm/arch/hardware.h>
 #endif	/* XXX###XXX */
+#include <linux/string.h>
 
 static inline void sync(void)
 {
diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c
index 70c181e45b7..101f9d9b3ae 100644
--- a/arch/arm/lib/bootm.c
+++ b/arch/arm/lib/bootm.c
@@ -23,6 +23,7 @@
 #include <dm/root.h>
 #include <env.h>
 #include <image.h>
+#include <linux/string.h>
 #include <u-boot/zlib.h>
 #include <asm/byteorder.h>
 #include <linux/libfdt.h>
diff --git a/arch/arm/lib/eabi_compat.c b/arch/arm/lib/eabi_compat.c
index f7029918d4f..35ce83a6fac 100644
--- a/arch/arm/lib/eabi_compat.c
+++ b/arch/arm/lib/eabi_compat.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <linux/string.h>
 
 int raise (int signum)
 {
diff --git a/arch/arm/lib/psci-dt.c b/arch/arm/lib/psci-dt.c
index 0ed29a43f10..6acefab42c0 100644
--- a/arch/arm/lib/psci-dt.c
+++ b/arch/arm/lib/psci-dt.c
@@ -13,6 +13,7 @@
 #ifdef CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT
 #include <asm/armv8/sec_firmware.h>
 #endif
+#include <linux/string.h>
 
 int fdt_psci(void *fdt)
 {
diff --git a/arch/arm/lib/semihosting.c b/arch/arm/lib/semihosting.c
index 904fddd6c04..73c860dbb3d 100644
--- a/arch/arm/lib/semihosting.c
+++ b/arch/arm/lib/semihosting.c
@@ -15,6 +15,7 @@
 #include <command.h>
 #include <env.h>
 #include <log.h>
+#include <linux/string.h>
 
 #define SYSOPEN		0x01
 #define SYSCLOSE	0x02
diff --git a/arch/arm/mach-bcm283x/include/mach/mbox.h b/arch/arm/mach-bcm283x/include/mach/mbox.h
index 2ae2d3d97c3..70029eefded 100644
--- a/arch/arm/mach-bcm283x/include/mach/mbox.h
+++ b/arch/arm/mach-bcm283x/include/mach/mbox.h
@@ -6,8 +6,9 @@
 #ifndef _BCM2835_MBOX_H
 #define _BCM2835_MBOX_H
 
-#include <linux/compiler.h>
 #include <asm/arch/base.h>
+#include <linux/compiler.h>
+#include <linux/string.h>
 
 /*
  * The BCM2835 SoC contains (at least) two CPUs; the VideoCore (a/k/a "GPU")
diff --git a/arch/arm/mach-imx/cmd_bmode.c b/arch/arm/mach-imx/cmd_bmode.c
index 19bfd9f9a03..2ad9e6c5f2b 100644
--- a/arch/arm/mach-imx/cmd_bmode.c
+++ b/arch/arm/mach-imx/cmd_bmode.c
@@ -8,6 +8,7 @@
 #include <asm/mach-imx/boot_mode.h>
 #include <malloc.h>
 #include <command.h>
+#include <linux/string.h>
 
 static const struct boot_mode *modes[2];
 
diff --git a/arch/arm/mach-imx/cmd_nandbcb.c b/arch/arm/mach-imx/cmd_nandbcb.c
index 44fc37695db..21010d455ab 100644
--- a/arch/arm/mach-imx/cmd_nandbcb.c
+++ b/arch/arm/mach-imx/cmd_nandbcb.c
@@ -18,6 +18,7 @@
 #include <nand.h>
 #include <dm/devres.h>
 #include <linux/bug.h>
+#include <linux/string.h>
 
 #include <asm/io.h>
 #include <jffs2/jffs2.h>
diff --git a/arch/arm/mach-imx/imx8/ahab.c b/arch/arm/mach-imx/imx8/ahab.c
index bbcefc8e9b6..9eb38cac029 100644
--- a/arch/arm/mach-imx/imx8/ahab.c
+++ b/arch/arm/mach-imx/imx8/ahab.c
@@ -15,6 +15,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/image.h>
 #include <console.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-imx/imx8/fdt.c b/arch/arm/mach-imx/imx8/fdt.c
index 776d2b24345..94da4d0951d 100644
--- a/arch/arm/mach-imx/imx8/fdt.c
+++ b/arch/arm/mach-imx/imx8/fdt.c
@@ -12,6 +12,7 @@
 #include <fdt_support.h>
 #include <linux/libfdt.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-imx/imx8/image.c b/arch/arm/mach-imx/imx8/image.c
index 5abc0d3a39f..638aac2eafe 100644
--- a/arch/arm/mach-imx/imx8/image.c
+++ b/arch/arm/mach-imx/imx8/image.c
@@ -14,6 +14,7 @@
 #include <asm/arch/image.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/mach-imx/boot_mode.h>
+#include <linux/string.h>
 
 #define MMC_DEV		0
 #define QSPI_DEV	1
diff --git a/arch/arm/mach-imx/imx8/parse-container.c b/arch/arm/mach-imx/imx8/parse-container.c
index 375098902f8..ed69abc76d8 100644
--- a/arch/arm/mach-imx/imx8/parse-container.c
+++ b/arch/arm/mach-imx/imx8/parse-container.c
@@ -9,6 +9,7 @@
 #include <spl.h>
 #include <asm/arch/image.h>
 #include <asm/arch/sci/sci.h>
+#include <linux/string.h>
 
 #define SEC_SECURE_RAM_BASE		0x31800000UL
 #define SEC_SECURE_RAM_END_BASE		(SEC_SECURE_RAM_BASE + 0xFFFFUL)
diff --git a/arch/arm/mach-imx/imx8m/soc.c b/arch/arm/mach-imx/imx8m/soc.c
index e5d7815658b..5e714b2973c 100644
--- a/arch/arm/mach-imx/imx8m/soc.c
+++ b/arch/arm/mach-imx/imx8m/soc.c
@@ -29,6 +29,7 @@
 #include <imx_sip.h>
 #include <linux/arm-smccc.h>
 #include <linux/bitops.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-imx/mx5/clock.c b/arch/arm/mach-imx/mx5/clock.c
index bbaddd5a33f..cc93716c74e 100644
--- a/arch/arm/mach-imx/mx5/clock.c
+++ b/arch/arm/mach-imx/mx5/clock.c
@@ -16,6 +16,7 @@
 #include <asm/arch/clock.h>
 #include <div64.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/string.h>
 
 enum pll_clocks {
 	PLL1_CLOCK = 0,
diff --git a/arch/arm/mach-imx/mx6/module_fuse.c b/arch/arm/mach-imx/mx6/module_fuse.c
index 0f4565e3117..0305b2a7e02 100644
--- a/arch/arm/mach-imx/mx6/module_fuse.c
+++ b/arch/arm/mach-imx/mx6/module_fuse.c
@@ -10,6 +10,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/mach-imx/module_fuse.h>
 #include <linux/errno.h>
+#include <linux/string.h>
 
 static struct fuse_entry_desc mx6_fuse_descs[] = {
 #if defined(CONFIG_MX6ULL)
diff --git a/arch/arm/mach-imx/spl_imx_romapi.c b/arch/arm/mach-imx/spl_imx_romapi.c
index 9f4d95982e5..dc13a397ea8 100644
--- a/arch/arm/mach-imx/spl_imx_romapi.c
+++ b/arch/arm/mach-imx/spl_imx_romapi.c
@@ -10,6 +10,7 @@
 #include <asm/global_data.h>
 #include <linux/libfdt.h>
 #include <spl.h>
+#include <linux/string.h>
 
 #include <asm/arch/sys_proto.h>
 
diff --git a/arch/arm/mach-imx/video.c b/arch/arm/mach-imx/video.c
index 1bc9b7cc7e1..4d76ecc2969 100644
--- a/arch/arm/mach-imx/video.c
+++ b/arch/arm/mach-imx/video.c
@@ -4,6 +4,7 @@
 #include <env.h>
 #include <linux/errno.h>
 #include <asm/mach-imx/video.h>
+#include <linux/string.h>
 
 #ifdef CONFIG_IMX_HDMI
 #include <asm/arch/mxc_hdmi.h>
diff --git a/arch/arm/mach-k3/common.c b/arch/arm/mach-k3/common.c
index f8985b099f7..0d74dfc29d8 100644
--- a/arch/arm/mach-k3/common.c
+++ b/arch/arm/mach-k3/common.c
@@ -14,6 +14,7 @@
 #include <spl.h>
 #include <asm/global_data.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include "common.h"
 #include <dm.h>
 #include <remoteproc.h>
diff --git a/arch/arm/mach-keystone/cmd_clock.c b/arch/arm/mach-keystone/cmd_clock.c
index 7165d666e5e..15fa0ebddea 100644
--- a/arch/arm/mach-keystone/cmd_clock.c
+++ b/arch/arm/mach-keystone/cmd_clock.c
@@ -11,6 +11,7 @@
 #include <asm/arch/hardware.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/psc_defs.h>
+#include <linux/string.h>
 
 struct pll_init_data cmd_pll_data = {
 	.pll = MAIN_PLL,
diff --git a/arch/arm/mach-keystone/cmd_mon.c b/arch/arm/mach-keystone/cmd_mon.c
index 049d5734734..f9d5cda827f 100644
--- a/arch/arm/mach-keystone/cmd_mon.c
+++ b/arch/arm/mach-keystone/cmd_mon.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <command.h>
 #include <image.h>
+#include <linux/string.h>
 #include <mach/mon.h>
 asm(".arch_extension sec\n\t");
 
diff --git a/arch/arm/mach-keystone/ddr3_spd.c b/arch/arm/mach-keystone/ddr3_spd.c
index 3803449c2b0..e84f3253b39 100644
--- a/arch/arm/mach-keystone/ddr3_spd.c
+++ b/arch/arm/mach-keystone/ddr3_spd.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <linux/string.h>
 
 #include <i2c.h>
 #include <ddr_spd.h>
diff --git a/arch/arm/mach-keystone/mon.c b/arch/arm/mach-keystone/mon.c
index 58995d73ac8..bbae14c58f1 100644
--- a/arch/arm/mach-keystone/mon.c
+++ b/arch/arm/mach-keystone/mon.c
@@ -10,6 +10,7 @@
 #include <asm/unaligned.h>
 #include <common.h>
 #include <command.h>
+#include <linux/string.h>
 #include <mach/mon.h>
 #include <spl.h>
 asm(".arch_extension sec\n\t");
diff --git a/arch/arm/mach-meson/sm.c b/arch/arm/mach-meson/sm.c
index 1a8f23cb1fa..e8036b94a0a 100644
--- a/arch/arm/mach-meson/sm.c
+++ b/arch/arm/mach-meson/sm.c
@@ -20,6 +20,7 @@
 #include <linux/bitfield.h>
 #include <regmap.h>
 #include <syscon.h>
+#include <linux/string.h>
 
 #define FN_GET_SHARE_MEM_INPUT_BASE	0x82000020
 #define FN_GET_SHARE_MEM_OUTPUT_BASE	0x82000021
diff --git a/arch/arm/mach-mvebu/armada3700/cpu.c b/arch/arm/mach-mvebu/armada3700/cpu.c
index 70f76c7d707..7ab5c653f1e 100644
--- a/arch/arm/mach-mvebu/armada3700/cpu.c
+++ b/arch/arm/mach-mvebu/armada3700/cpu.c
@@ -18,6 +18,7 @@
 #include <asm/arch/soc.h>
 #include <asm/armv8/mmu.h>
 #include <sort.h>
+#include <linux/string.h>
 
 /* Armada 3700 */
 #define MVEBU_GPIO_NB_REG_BASE		(MVEBU_REGISTER(0x13800))
diff --git a/arch/arm/mach-mvebu/serdes/axp/high_speed_env_lib.c b/arch/arm/mach-mvebu/serdes/axp/high_speed_env_lib.c
index ea3b4c7d5b7..3ebda4ec684 100644
--- a/arch/arm/mach-mvebu/serdes/axp/high_speed_env_lib.c
+++ b/arch/arm/mach-mvebu/serdes/axp/high_speed_env_lib.c
@@ -10,6 +10,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include "high_speed_env_spec.h"
 #include "board_env_spec.h"
diff --git a/arch/arm/mach-omap2/emif-common.c b/arch/arm/mach-omap2/emif-common.c
index 312f868fbc7..8346d899e47 100644
--- a/arch/arm/mach-omap2/emif-common.c
+++ b/arch/arm/mach-omap2/emif-common.c
@@ -22,6 +22,7 @@
 #include <linux/compiler.h>
 #include <asm/ti-common/ti-edma3.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 static int emif1_enabled = -1, emif2_enabled = -1;
 
diff --git a/arch/arm/mach-omap2/omap3/board.c b/arch/arm/mach-omap2/omap3/board.c
index f08c8ab43a0..c741652f241 100644
--- a/arch/arm/mach-omap2/omap3/board.c
+++ b/arch/arm/mach-omap2/omap3/board.c
@@ -28,6 +28,7 @@
 #include <asm/gpio.h>
 #include <asm/omap_common.h>
 #include <linux/compiler.h>
+#include <linux/string.h>
 
 /* Declarations */
 extern omap3_sysinfo sysinfo;
diff --git a/arch/arm/mach-omap2/sec-common.c b/arch/arm/mach-omap2/sec-common.c
index 0551bc125e8..4fca91ffbd0 100644
--- a/arch/arm/mach-omap2/sec-common.c
+++ b/arch/arm/mach-omap2/sec-common.c
@@ -19,6 +19,7 @@
 #include <init.h>
 #include <log.h>
 #include <stdarg.h>
+#include <linux/string.h>
 
 #include <asm/arch/sys_proto.h>
 #include <asm/cache.h>
diff --git a/arch/arm/mach-rockchip/board.c b/arch/arm/mach-rockchip/board.c
index eed8f589d23..2c41e58f598 100644
--- a/arch/arm/mach-rockchip/board.c
+++ b/arch/arm/mach-rockchip/board.c
@@ -17,6 +17,7 @@
 #include <asm/arch-rockchip/clock.h>
 #include <asm/arch-rockchip/periph.h>
 #include <asm/arch-rockchip/misc.h>
+#include <linux/string.h>
 #include <power/regulator.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-rockchip/boot_mode.c b/arch/arm/mach-rockchip/boot_mode.c
index c6d19541ac7..10d8a1ac5e9 100644
--- a/arch/arm/mach-rockchip/boot_mode.c
+++ b/arch/arm/mach-rockchip/boot_mode.c
@@ -13,6 +13,7 @@
 #include <dm/device.h>
 #include <dm/uclass.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #if (CONFIG_ROCKCHIP_BOOT_MODE_REG == 0)
 
diff --git a/arch/arm/mach-rockchip/misc.c b/arch/arm/mach-rockchip/misc.c
index 28c7c7214cb..3cbb1794254 100644
--- a/arch/arm/mach-rockchip/misc.c
+++ b/arch/arm/mach-rockchip/misc.c
@@ -16,6 +16,7 @@
 #include <log.h>
 #include <dm/uclass-internal.h>
 #include <misc.h>
+#include <linux/string.h>
 #include <u-boot/crc.h>
 #include <u-boot/sha256.h>
 
diff --git a/arch/arm/mach-rockchip/spl-boot-order.c b/arch/arm/mach-rockchip/spl-boot-order.c
index e05c12e0cd3..ddc4081dbb4 100644
--- a/arch/arm/mach-rockchip/spl-boot-order.c
+++ b/arch/arm/mach-rockchip/spl-boot-order.c
@@ -9,6 +9,7 @@
 #include <mmc.h>
 #include <spl.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 
 #if CONFIG_IS_ENABLED(OF_LIBFDT)
 /**
diff --git a/arch/arm/mach-socfpga/clock_manager_arria10.c b/arch/arm/mach-socfpga/clock_manager_arria10.c
index 58d5d3fd8a5..9f46df6b2f9 100644
--- a/arch/arm/mach-socfpga/clock_manager_arria10.c
+++ b/arch/arm/mach-socfpga/clock_manager_arria10.c
@@ -12,6 +12,7 @@
 #include <dm/device-internal.h>
 #include <asm/arch/clock_manager.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #ifdef CONFIG_SPL_BUILD
 
diff --git a/arch/arm/mach-socfpga/misc_s10.c b/arch/arm/mach-socfpga/misc_s10.c
index 733856c33c1..1e9a3f62059 100644
--- a/arch/arm/mach-socfpga/misc_s10.c
+++ b/arch/arm/mach-socfpga/misc_s10.c
@@ -21,6 +21,7 @@
 #include <asm/pl310.h>
 #include <linux/libfdt.h>
 #include <asm/arch/mailbox_s10.h>
+#include <linux/string.h>
 
 #include <dt-bindings/reset/altr,rst-mgr-s10.h>
 
diff --git a/arch/arm/mach-socfpga/pinmux_arria10.c b/arch/arm/mach-socfpga/pinmux_arria10.c
index f378fce7f02..a38b19c395e 100644
--- a/arch/arm/mach-socfpga/pinmux_arria10.c
+++ b/arch/arm/mach-socfpga/pinmux_arria10.c
@@ -8,6 +8,7 @@
 #include <asm/io.h>
 #include <common.h>
 #include <fdtdec.h>
+#include <linux/string.h>
 
 static int do_pinctr_pin(const void *blob, int child, const char *node_name)
 {
diff --git a/arch/arm/mach-stm32mp/cmd_stm32key.c b/arch/arm/mach-stm32mp/cmd_stm32key.c
index eb3d74bc836..ad857e95c46 100644
--- a/arch/arm/mach-stm32mp/cmd_stm32key.c
+++ b/arch/arm/mach-stm32mp/cmd_stm32key.c
@@ -10,6 +10,7 @@
 #include <dm/device.h>
 #include <dm/uclass.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #define STM32_OTP_HASH_KEY_START 24
 #define STM32_OTP_HASH_KEY_SIZE 8
diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c b/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c
index 6dd680d739c..68cd9d1547d 100644
--- a/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c
+++ b/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c
@@ -9,6 +9,7 @@
 #include <image.h>
 #include <asm/arch/stm32prog.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include "stm32prog.h"
 
 struct stm32prog_data *stm32prog_data;
diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c
index 35181a6b756..02923c80802 100644
--- a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c
+++ b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c
@@ -19,6 +19,7 @@
 #include <linux/mtd/mtd.h>
 #include <linux/printk.h>
 #include <linux/sizes.h>
+#include <linux/string.h>
 
 #include "stm32prog.h"
 
diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_serial.c b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_serial.c
index 9d94959cfee..d48f0378a55 100644
--- a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_serial.c
+++ b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_serial.c
@@ -14,6 +14,7 @@
 #include <dm/device-internal.h>
 #include <linux/delay.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include "stm32prog.h"
 
 /* - configuration part -----------------------------*/
diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_usb.c b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_usb.c
index 134c3b117f5..33bf7a44b38 100644
--- a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_usb.c
+++ b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_usb.c
@@ -10,6 +10,7 @@
 #include <asm/arch/stm32prog.h>
 #include <asm/arch/sys_proto.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include "stm32prog.h"
 
 static int stm32prog_set_phase(struct stm32prog_data *data, u8 phase,
diff --git a/arch/arm/mach-stm32mp/fdt.c b/arch/arm/mach-stm32mp/fdt.c
index 9dbc595cc4f..5a7d761586c 100644
--- a/arch/arm/mach-stm32mp/fdt.c
+++ b/arch/arm/mach-stm32mp/fdt.c
@@ -11,6 +11,7 @@
 #include <asm/arch/sys_proto.h>
 #include <dt-bindings/pinctrl/stm32-pinfunc.h>
 #include <linux/io.h>
+#include <linux/string.h>
 
 #define ETZPC_DECPROT(n)	(STM32_ETZPC_BASE + 0x10 + 4 * (n))
 #define ETZPC_DECPROT_NB	6
diff --git a/arch/arm/mach-tegra/cboot.c b/arch/arm/mach-tegra/cboot.c
index 6a47c104b72..b89f7badb52 100644
--- a/arch/arm/mach-tegra/cboot.c
+++ b/arch/arm/mach-tegra/cboot.c
@@ -16,6 +16,7 @@
 #include <string.h>
 #include <asm/global_data.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #include <linux/ctype.h>
 #include <linux/sizes.h>
diff --git a/arch/arm/mach-tegra/tegra20/emc.c b/arch/arm/mach-tegra/tegra20/emc.c
index d55b09b4ac8..58abf790bd1 100644
--- a/arch/arm/mach-tegra/tegra20/emc.c
+++ b/arch/arm/mach-tegra/tegra20/emc.c
@@ -12,6 +12,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/emc.h>
 #include <asm/arch/tegra.h>
+#include <linux/string.h>
 
 /*
  * The EMC registers have shadow registers.  When the EMC clock is updated
diff --git a/arch/arm/mach-tegra/tegra20/warmboot.c b/arch/arm/mach-tegra/tegra20/warmboot.c
index 3d3758f6e6f..b36b2f652ba 100644
--- a/arch/arm/mach-tegra/tegra20/warmboot.c
+++ b/arch/arm/mach-tegra/tegra20/warmboot.c
@@ -20,6 +20,7 @@
 #include <asm/arch-tegra/pmc.h>
 #include <asm/arch-tegra/fuse.h>
 #include <asm/arch-tegra/warmboot.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-tegra/xusb-padctl-common.c b/arch/arm/mach-tegra/xusb-padctl-common.c
index 5de403c30e4..42d64cf2c75 100644
--- a/arch/arm/mach-tegra/xusb-padctl-common.c
+++ b/arch/arm/mach-tegra/xusb-padctl-common.c
@@ -9,6 +9,7 @@
 #include <errno.h>
 #include <log.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #include "xusb-padctl-common.h"
 
diff --git a/arch/arm/mach-uniphier/base-address.c b/arch/arm/mach-uniphier/base-address.c
index d7456f8df6f..1ba55eb7ebb 100644
--- a/arch/arm/mach-uniphier/base-address.c
+++ b/arch/arm/mach-uniphier/base-address.c
@@ -10,6 +10,7 @@
 #include <linux/libfdt.h>
 #include <linux/sizes.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 
 #include "base-address.h"
 #include "sc64-regs.h"
diff --git a/arch/arm/mach-uniphier/board_late_init.c b/arch/arm/mach-uniphier/board_late_init.c
index d7d6643961c..2bfcf861b63 100644
--- a/arch/arm/mach-uniphier/board_late_init.c
+++ b/arch/arm/mach-uniphier/board_late_init.c
@@ -14,6 +14,7 @@
 #include <stdio.h>
 #include <linux/io.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #include "init.h"
 
diff --git a/arch/arm/mach-uniphier/dram/cmd_ddrmphy.c b/arch/arm/mach-uniphier/dram/cmd_ddrmphy.c
index 629f8b90c9d..be4ce3265bb 100644
--- a/arch/arm/mach-uniphier/dram/cmd_ddrmphy.c
+++ b/arch/arm/mach-uniphier/dram/cmd_ddrmphy.c
@@ -9,6 +9,7 @@
 #include <linux/io.h>
 #include <linux/printk.h>
 #include <linux/sizes.h>
+#include <linux/string.h>
 
 #include "../soc-info.h"
 #include "ddrmphy-regs.h"
diff --git a/arch/arm/mach-uniphier/dram/cmd_ddrphy.c b/arch/arm/mach-uniphier/dram/cmd_ddrphy.c
index ca519d1c7e0..3ccafe20638 100644
--- a/arch/arm/mach-uniphier/dram/cmd_ddrphy.c
+++ b/arch/arm/mach-uniphier/dram/cmd_ddrphy.c
@@ -10,6 +10,7 @@
 #include <linux/io.h>
 #include <linux/printk.h>
 #include <linux/sizes.h>
+#include <linux/string.h>
 
 #include "../soc-info.h"
 #include "ddrphy-regs.h"
diff --git a/arch/arm/mach-uniphier/pinctrl-glue.c b/arch/arm/mach-uniphier/pinctrl-glue.c
index 2e072646959..e2a59c9b17d 100644
--- a/arch/arm/mach-uniphier/pinctrl-glue.c
+++ b/arch/arm/mach-uniphier/pinctrl-glue.c
@@ -7,6 +7,7 @@
 #include <linux/errno.h>
 #include <dm.h>
 #include <dm/pinctrl.h>
+#include <linux/string.h>
 
 #include "init.h"
 
diff --git a/arch/arm/mach-versal/mp.c b/arch/arm/mach-versal/mp.c
index c97c311d313..540c010f52c 100644
--- a/arch/arm/mach-versal/mp.c
+++ b/arch/arm/mach-versal/mp.c
@@ -9,6 +9,7 @@
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-zynq/ddrc.c b/arch/arm/mach-zynq/ddrc.c
index 28988ef95b5..65c255da209 100644
--- a/arch/arm/mach-zynq/ddrc.c
+++ b/arch/arm/mach-zynq/ddrc.c
@@ -8,6 +8,7 @@
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/hardware.h>
+#include <linux/string.h>
 
 #ifndef CONFIG_ZYNQ_DDRC_INIT
 void zynq_ddrc_init(void) {}
diff --git a/arch/arm/mach-zynq/slcr.c b/arch/arm/mach-zynq/slcr.c
index 5d9f4d23f34..d7c879dc82d 100644
--- a/arch/arm/mach-zynq/slcr.c
+++ b/arch/arm/mach-zynq/slcr.c
@@ -8,6 +8,7 @@
 #include <malloc.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/string.h>
 
 #define SLCR_LOCK_MAGIC		0x767B
 #define SLCR_UNLOCK_MAGIC	0xDF0D
diff --git a/arch/arm/mach-zynq/spl.c b/arch/arm/mach-zynq/spl.c
index 239ce3436a6..eceb6e114c0 100644
--- a/arch/arm/mach-zynq/spl.c
+++ b/arch/arm/mach-zynq/spl.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <spl.h>
 #include <generated/dt.h>
+#include <linux/string.h>
 
 #include <asm/io.h>
 #include <asm/spl.h>
diff --git a/arch/arm/mach-zynqmp/cpu.c b/arch/arm/mach-zynqmp/cpu.c
index 29743cae5aa..a03b29acb83 100644
--- a/arch/arm/mach-zynqmp/cpu.c
+++ b/arch/arm/mach-zynqmp/cpu.c
@@ -15,6 +15,7 @@
 #include <asm/io.h>
 #include <zynqmp_firmware.h>
 #include <asm/cache.h>
+#include <linux/string.h>
 
 #define ZYNQ_SILICON_VER_MASK	0xF000
 #define ZYNQ_SILICON_VER_SHIFT	12
diff --git a/arch/arm/mach-zynqmp/mp.c b/arch/arm/mach-zynqmp/mp.c
index 656678a1551..b699f36f1d3 100644
--- a/arch/arm/mach-zynqmp/mp.c
+++ b/arch/arm/mach-zynqmp/mp.c
@@ -11,6 +11,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/io.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #define LOCK		0
 #define SPLIT		1
diff --git a/arch/microblaze/include/asm/io.h b/arch/microblaze/include/asm/io.h
index 8e6be0ae267..fd77dcd0218 100644
--- a/arch/microblaze/include/asm/io.h
+++ b/arch/microblaze/include/asm/io.h
@@ -18,6 +18,7 @@
 #define __MICROBLAZE_IO_H__
 
 #include <asm/types.h>
+#include <linux/string.h>
 
 #define IO_SPACE_LIMIT 0xFFFFFFFF
 
diff --git a/arch/mips/include/asm/io.h b/arch/mips/include/asm/io.h
index d3ad6693013..836cd436872 100644
--- a/arch/mips/include/asm/io.h
+++ b/arch/mips/include/asm/io.h
@@ -11,6 +11,7 @@
 
 #include <linux/bug.h>
 #include <linux/compiler.h>
+#include <linux/string.h>
 #include <linux/types.h>
 
 #include <asm/addrspace.h>
diff --git a/arch/mips/lib/bootm.c b/arch/mips/lib/bootm.c
index c28bca1bbb8..ec165a32b0a 100644
--- a/arch/mips/lib/bootm.c
+++ b/arch/mips/lib/bootm.c
@@ -14,6 +14,7 @@
 #include <asm/addrspace.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/mips/lib/reloc.c b/arch/mips/lib/reloc.c
index c1c04bc08e8..a0c60c40c86 100644
--- a/arch/mips/lib/reloc.c
+++ b/arch/mips/lib/reloc.c
@@ -33,6 +33,7 @@
 #include <asm/relocs.h>
 #include <asm/sections.h>
 #include <linux/bitops.h>
+#include <linux/string.h>
 
 /**
  * read_uint() - Read an unsigned integer from the buffer
diff --git a/arch/mips/lib/traps.c b/arch/mips/lib/traps.c
index 7c2fdf4a1a9..510ef4c6c09 100644
--- a/arch/mips/lib/traps.c
+++ b/arch/mips/lib/traps.c
@@ -20,6 +20,7 @@
 #include <asm/mipsregs.h>
 #include <asm/addrspace.h>
 #include <asm/system.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/mips/mach-jz47xx/jz4780/jz4780.c b/arch/mips/mach-jz47xx/jz4780/jz4780.c
index 43f5651f832..de9bd05fcfd 100644
--- a/arch/mips/mach-jz47xx/jz4780/jz4780.c
+++ b/arch/mips/mach-jz47xx/jz4780/jz4780.c
@@ -15,6 +15,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/sections.h>
+#include <linux/string.h>
 #include <mach/jz4780.h>
 #include <mach/jz4780_dram.h>
 #include <mmc.h>
diff --git a/arch/mips/mach-mtmips/cpu.c b/arch/mips/mach-mtmips/cpu.c
index 76ad4f63205..f9cdce5ff8d 100644
--- a/arch/mips/mach-mtmips/cpu.c
+++ b/arch/mips/mach-mtmips/cpu.c
@@ -10,6 +10,7 @@
 #include <linux/bitops.h>
 #include <linux/io.h>
 #include <linux/sizes.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/nds32/lib/bootm.c b/arch/nds32/lib/bootm.c
index b3b8bc29037..4668ed9af8b 100644
--- a/arch/nds32/lib/bootm.c
+++ b/arch/nds32/lib/bootm.c
@@ -13,6 +13,7 @@
 #include <image.h>
 #include <log.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 #include <u-boot/zlib.h>
 #include <asm/byteorder.h>
 #include <asm/bootm.h>
diff --git a/arch/nios2/cpu/cpu.c b/arch/nios2/cpu/cpu.c
index b55c8fbc584..c670d51f1df 100644
--- a/arch/nios2/cpu/cpu.c
+++ b/arch/nios2/cpu/cpu.c
@@ -15,6 +15,7 @@
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <asm/system.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/nios2/include/asm/io.h b/arch/nios2/include/asm/io.h
index 817cd72e00b..b22134cf29c 100644
--- a/arch/nios2/include/asm/io.h
+++ b/arch/nios2/include/asm/io.h
@@ -8,6 +8,7 @@
 #define __ASM_NIOS2_IO_H_
 
 #include <asm/global_data.h>
+#include <linux/string.h>
 
 static inline void sync(void)
 {
diff --git a/arch/powerpc/cpu/mpc83xx/ecc.c b/arch/powerpc/cpu/mpc83xx/ecc.c
index 1343dd3d3a3..903983ded3e 100644
--- a/arch/powerpc/cpu/mpc83xx/ecc.c
+++ b/arch/powerpc/cpu/mpc83xx/ecc.c
@@ -10,6 +10,7 @@
 #include <irq_func.h>
 #include <mpc83xx.h>
 #include <command.h>
+#include <linux/string.h>
 
 #if defined(CONFIG_DDR_ECC) && defined(CONFIG_DDR_ECC_CMD)
 void ecc_print_status(void)
diff --git a/arch/powerpc/cpu/mpc85xx/commproc.c b/arch/powerpc/cpu/mpc85xx/commproc.c
index 8e8427a08bb..a63519bb5cd 100644
--- a/arch/powerpc/cpu/mpc85xx/commproc.c
+++ b/arch/powerpc/cpu/mpc85xx/commproc.c
@@ -25,6 +25,7 @@
 #include <asm-offsets.h>
 #include <asm/cpm_85xx.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init.c b/arch/powerpc/cpu/mpc85xx/cpu_init.c
index fcc2c7be31a..ad6e79396e7 100644
--- a/arch/powerpc/cpu/mpc85xx/cpu_init.c
+++ b/arch/powerpc/cpu/mpc85xx/cpu_init.c
@@ -35,6 +35,7 @@
 #include <hwconfig.h>
 #include <linux/compiler.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include "mp.h"
 #ifdef CONFIG_CHAIN_OF_TRUST
 #include <fsl_validate.h>
diff --git a/arch/powerpc/cpu/mpc85xx/ether_fcc.c b/arch/powerpc/cpu/mpc85xx/ether_fcc.c
index 3c4eb1a7eba..c6f89e0eba9 100644
--- a/arch/powerpc/cpu/mpc85xx/ether_fcc.c
+++ b/arch/powerpc/cpu/mpc85xx/ether_fcc.c
@@ -30,6 +30,7 @@
 #include <command.h>
 #include <config.h>
 #include <net.h>
+#include <linux/string.h>
 
 #if defined(CONFIG_MII) || defined(CONFIG_CMD_MII)
 #include <miiphy.h>
diff --git a/arch/powerpc/cpu/mpc85xx/fdt.c b/arch/powerpc/cpu/mpc85xx/fdt.c
index 08331f4c649..4eecbe667ec 100644
--- a/arch/powerpc/cpu/mpc85xx/fdt.c
+++ b/arch/powerpc/cpu/mpc85xx/fdt.c
@@ -27,6 +27,7 @@
 #ifdef CONFIG_SYS_DPAA_FMAN
 #include <fsl_fman.h>
 #endif
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c b/arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c
index ee5015ec8f3..29a64b309b2 100644
--- a/arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c
@@ -13,6 +13,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <fsl_errata.h>
+#include <linux/string.h>
 #include "fsl_corenet2_serdes.h"
 
 #ifdef CONFIG_SYS_FSL_SRDS_1
diff --git a/arch/powerpc/cpu/mpc85xx/liodn.c b/arch/powerpc/cpu/mpc85xx/liodn.c
index e552378e78b..a85c8117920 100644
--- a/arch/powerpc/cpu/mpc85xx/liodn.c
+++ b/arch/powerpc/cpu/mpc85xx/liodn.c
@@ -7,6 +7,7 @@
 #include <log.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
+#include <linux/string.h>
 
 #include <asm/immap_85xx.h>
 #include <asm/io.h>
diff --git a/arch/powerpc/cpu/mpc85xx/mp.c b/arch/powerpc/cpu/mpc85xx/mp.c
index 653efe09f93..c9854a82a96 100644
--- a/arch/powerpc/cpu/mpc85xx/mp.c
+++ b/arch/powerpc/cpu/mpc85xx/mp.c
@@ -17,6 +17,7 @@
 #include <asm/fsl_law.h>
 #include <fsl_ddr_sdram.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include "mp.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/powerpc/cpu/mpc85xx/portals.c b/arch/powerpc/cpu/mpc85xx/portals.c
index 52e2124fb97..c0f18d924b6 100644
--- a/arch/powerpc/cpu/mpc85xx/portals.c
+++ b/arch/powerpc/cpu/mpc85xx/portals.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
+#include <linux/string.h>
 
 #include <asm/processor.h>
 #include <asm/io.h>
diff --git a/arch/powerpc/cpu/mpc86xx/mp.c b/arch/powerpc/cpu/mpc86xx/mp.c
index e6795e06c98..2d23742a2bd 100644
--- a/arch/powerpc/cpu/mpc86xx/mp.c
+++ b/arch/powerpc/cpu/mpc86xx/mp.c
@@ -12,6 +12,7 @@
 #include <lmb.h>
 #include <asm/io.h>
 #include <asm/mp.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/powerpc/cpu/mpc8xxx/fsl_pamu.c b/arch/powerpc/cpu/mpc8xxx/fsl_pamu.c
index 2c378b76158..bc5958511d7 100644
--- a/arch/powerpc/cpu/mpc8xxx/fsl_pamu.c
+++ b/arch/powerpc/cpu/mpc8xxx/fsl_pamu.c
@@ -11,6 +11,7 @@
 #include <linux/log2.h>
 #include <malloc.h>
 #include <asm/fsl_pamu.h>
+#include <linux/string.h>
 
 struct paace *ppaact;
 struct paace *sec;
diff --git a/arch/powerpc/include/asm/io.h b/arch/powerpc/include/asm/io.h
index 6d76e3e99cc..ccc5e664cf4 100644
--- a/arch/powerpc/include/asm/io.h
+++ b/arch/powerpc/include/asm/io.h
@@ -8,6 +8,7 @@
 #define _PPC_IO_H
 
 #include <asm/byteorder.h>
+#include <linux/string.h>
 
 #ifdef CONFIG_ADDR_MAP
 #include <addr_map.h>
diff --git a/arch/riscv/cpu/cpu.c b/arch/riscv/cpu/cpu.c
index bfa2d4a4269..53fc9455f75 100644
--- a/arch/riscv/cpu/cpu.c
+++ b/arch/riscv/cpu/cpu.c
@@ -11,6 +11,7 @@
 #include <asm/encoding.h>
 #include <dm/uclass-internal.h>
 #include <linux/bitops.h>
+#include <linux/string.h>
 
 /*
  * The variables here must be stored in the data section since they are used
diff --git a/arch/riscv/lib/andes_plic.c b/arch/riscv/lib/andes_plic.c
index 1707beeea73..eb3463b49a8 100644
--- a/arch/riscv/lib/andes_plic.c
+++ b/arch/riscv/lib/andes_plic.c
@@ -19,6 +19,7 @@
 #include <asm/syscon.h>
 #include <cpu.h>
 #include <linux/err.h>
+#include <linux/string.h>
 
 /* pending register */
 #define PENDING_REG(base, hart)	((ulong)(base) + 0x1000 + ((hart) / 4) * 4)
diff --git a/arch/riscv/lib/fdt_fixup.c b/arch/riscv/lib/fdt_fixup.c
index 8c11b8a99e3..d0a33474497 100644
--- a/arch/riscv/lib/fdt_fixup.c
+++ b/arch/riscv/lib/fdt_fixup.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <mapmem.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/sandbox/cpu/eth-raw-os.c b/arch/sandbox/cpu/eth-raw-os.c
index da01d1addf9..8ef8f65ebaf 100644
--- a/arch/sandbox/cpu/eth-raw-os.c
+++ b/arch/sandbox/cpu/eth-raw-os.c
@@ -7,6 +7,7 @@
 #include <asm/eth-raw-os.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <linux/string.h>
 #include <net/if.h>
 #include <netinet/in.h>
 #include <netinet/ip.h>
diff --git a/arch/sandbox/cpu/os.c b/arch/sandbox/cpu/os.c
index e7ec892bdf0..e4192b07be5 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 <linux/string.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
 #include <sys/time.h>
diff --git a/arch/sandbox/cpu/sdl.c b/arch/sandbox/cpu/sdl.c
index 6416cab96c1..813fdcdac60 100644
--- a/arch/sandbox/cpu/sdl.c
+++ b/arch/sandbox/cpu/sdl.c
@@ -9,6 +9,7 @@
 #include <linux/input.h>
 #include <SDL2/SDL.h>
 #include <asm/state.h>
+#include <linux/string.h>
 
 /**
  * struct buf_info - a data buffer holding audio data
diff --git a/arch/sandbox/cpu/spl.c b/arch/sandbox/cpu/spl.c
index 17a3507406c..8998f92858e 100644
--- a/arch/sandbox/cpu/spl.c
+++ b/arch/sandbox/cpu/spl.c
@@ -13,6 +13,7 @@
 #include <asm/global_data.h>
 #include <asm/spl.h>
 #include <asm/state.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/sandbox/cpu/start.c b/arch/sandbox/cpu/start.c
index c50d14eaf22..9845d3e8fcb 100644
--- a/arch/sandbox/cpu/start.c
+++ b/arch/sandbox/cpu/start.c
@@ -17,6 +17,7 @@
 #include <asm/sections.h>
 #include <asm/state.h>
 #include <linux/ctype.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/sandbox/cpu/state.c b/arch/sandbox/cpu/state.c
index 34b6fff7e7a..ec432d06429 100644
--- a/arch/sandbox/cpu/state.c
+++ b/arch/sandbox/cpu/state.c
@@ -10,6 +10,7 @@
 #include <os.h>
 #include <asm/malloc.h>
 #include <asm/state.h>
+#include <linux/string.h>
 
 /* Main state record for the sandbox */
 static struct sandbox_state main_state;
diff --git a/arch/sandbox/lib/bootm.c b/arch/sandbox/lib/bootm.c
index d1d460b84a4..ab9f8a5f9c9 100644
--- a/arch/sandbox/lib/bootm.c
+++ b/arch/sandbox/lib/bootm.c
@@ -8,6 +8,7 @@
 #include <bootstage.h>
 #include <image.h>
 #include <asm/io.h>
+#include <linux/string.h>
 
 #define	LINUX_ARM_ZIMAGE_MAGIC	0x016f2818
 
diff --git a/arch/sh/lib/board.c b/arch/sh/lib/board.c
index 3fa093a02ea..f43213a50e9 100644
--- a/arch/sh/lib/board.c
+++ b/arch/sh/lib/board.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <init.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/sh/lib/bootm.c b/arch/sh/lib/bootm.c
index dc94f837856..71d964586c5 100644
--- a/arch/sh/lib/bootm.c
+++ b/arch/sh/lib/bootm.c
@@ -13,6 +13,7 @@
 #include <image.h>
 #include <asm/byteorder.h>
 #include <asm/zimage.h>
+#include <linux/string.h>
 
 #ifdef CONFIG_SYS_DEBUG
 static void hexdump(unsigned char *buf, int len)
diff --git a/arch/sh/lib/zimageboot.c b/arch/sh/lib/zimageboot.c
index c38f0933f89..d1067a60f1e 100644
--- a/arch/sh/lib/zimageboot.c
+++ b/arch/sh/lib/zimageboot.c
@@ -15,6 +15,7 @@
 #include <irq_func.h>
 #include <asm/io.h>
 #include <asm/zimage.h>
+#include <linux/string.h>
 
 int do_sh_zimageboot(struct cmd_tbl *cmdtp, int flag, int argc,
 		     char *const argv[])
diff --git a/arch/x86/cpu/acpi_gpe.c b/arch/x86/cpu/acpi_gpe.c
index 9baf4f65b36..47ee817eb7a 100644
--- a/arch/x86/cpu/acpi_gpe.c
+++ b/arch/x86/cpu/acpi_gpe.c
@@ -13,6 +13,7 @@
 #include <asm/io.h>
 #include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/interrupt-controller/x86-irq.h>
+#include <linux/string.h>
 
 /**
  * struct acpi_gpe_priv - private driver information
diff --git a/arch/x86/cpu/apollolake/fsp_bindings.c b/arch/x86/cpu/apollolake/fsp_bindings.c
index 9130af9ce0a..d1190075495 100644
--- a/arch/x86/cpu/apollolake/fsp_bindings.c
+++ b/arch/x86/cpu/apollolake/fsp_bindings.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <log.h>
 #include <asm/arch/fsp_bindings.h>
+#include <linux/string.h>
 
 /**
  * read_u8_prop() - Read an u8 property from devicetree (scalar or array)
diff --git a/arch/x86/cpu/apollolake/pmc.c b/arch/x86/cpu/apollolake/pmc.c
index 192dec7109a..83d165c0d9b 100644
--- a/arch/x86/cpu/apollolake/pmc.c
+++ b/arch/x86/cpu/apollolake/pmc.c
@@ -17,6 +17,7 @@
 #include <asm/io.h>
 #include <asm/pci.h>
 #include <linux/bitops.h>
+#include <linux/string.h>
 #include <power/acpi_pmc.h>
 
 #define GPIO_GPE_CFG		0x1050
diff --git a/arch/x86/cpu/apollolake/spl.c b/arch/x86/cpu/apollolake/spl.c
index 5a53831dc6a..a318bca5a62 100644
--- a/arch/x86/cpu/apollolake/spl.c
+++ b/arch/x86/cpu/apollolake/spl.c
@@ -19,6 +19,7 @@
 #include <asm/arch/iomap.h>
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
+#include <linux/string.h>
 
 /* This reads the next phase from mapped SPI flash */
 static int rom_load_image(struct spl_image_info *spl_image,
diff --git a/arch/x86/cpu/baytrail/acpi.c b/arch/x86/cpu/baytrail/acpi.c
index 07757b88a30..e6c721a16ba 100644
--- a/arch/x86/cpu/baytrail/acpi.c
+++ b/arch/x86/cpu/baytrail/acpi.c
@@ -14,6 +14,7 @@
 #include <asm/arch/global_nvs.h>
 #include <asm/arch/iomap.h>
 #include <dm/uclass-internal.h>
+#include <linux/string.h>
 
 void acpi_create_fadt(struct acpi_fadt *fadt, struct acpi_facs *facs,
 		      void *dsdt)
diff --git a/arch/x86/cpu/broadwell/me.c b/arch/x86/cpu/broadwell/me.c
index ae16ce26499..4ae084bf452 100644
--- a/arch/x86/cpu/broadwell/me.c
+++ b/arch/x86/cpu/broadwell/me.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <asm/arch/me.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 static inline void me_read_dword_ptr(struct udevice *dev, void *ptr, int offset)
 {
diff --git a/arch/x86/cpu/broadwell/northbridge.c b/arch/x86/cpu/broadwell/northbridge.c
index 141babc51c3..4f3ccf589e5 100644
--- a/arch/x86/cpu/broadwell/northbridge.c
+++ b/arch/x86/cpu/broadwell/northbridge.c
@@ -11,6 +11,7 @@
 #include <asm/arch/iomap.h>
 #include <asm/arch/pch.h>
 #include <asm/arch/pei_data.h>
+#include <linux/string.h>
 
 __weak asmlinkage void sdram_console_tx_byte(unsigned char byte)
 {
diff --git a/arch/x86/cpu/broadwell/pinctrl_broadwell.c b/arch/x86/cpu/broadwell/pinctrl_broadwell.c
index 85bd37101ba..2bc3ef97214 100644
--- a/arch/x86/cpu/broadwell/pinctrl_broadwell.c
+++ b/arch/x86/cpu/broadwell/pinctrl_broadwell.c
@@ -19,6 +19,7 @@
 #include <dt-bindings/gpio/x86-gpio.h>
 #include <dm/pinctrl.h>
 #include <dm/uclass-internal.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/broadwell/refcode.c b/arch/x86/cpu/broadwell/refcode.c
index 1e0a34de0c8..ee045a34833 100644
--- a/arch/x86/cpu/broadwell/refcode.c
+++ b/arch/x86/cpu/broadwell/refcode.c
@@ -12,6 +12,7 @@
 #include <init.h>
 #include <log.h>
 #include <asm/arch/pei_data.h>
+#include <linux/string.h>
 
 #define RMODULE_MAGIC		0xf8fe
 #define RMODULE_VERSION_1	1
diff --git a/arch/x86/cpu/broadwell/sdram.c b/arch/x86/cpu/broadwell/sdram.c
index c104a849a54..874b2034b9f 100644
--- a/arch/x86/cpu/broadwell/sdram.c
+++ b/arch/x86/cpu/broadwell/sdram.c
@@ -24,6 +24,7 @@
 #include <asm/arch/pch.h>
 #include <asm/arch/pei_data.h>
 #include <asm/arch/pm.h>
+#include <linux/string.h>
 
 ulong board_get_usable_ram_top(ulong total_size)
 {
diff --git a/arch/x86/cpu/cpu_x86.c b/arch/x86/cpu/cpu_x86.c
index dc7c8116d04..8b3a9e75d1d 100644
--- a/arch/x86/cpu/cpu_x86.c
+++ b/arch/x86/cpu/cpu_x86.c
@@ -9,6 +9,7 @@
 #include <errno.h>
 #include <asm/cpu.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/efi/payload.c b/arch/x86/cpu/efi/payload.c
index 9a73b768e9b..d9955bb4714 100644
--- a/arch/x86/cpu/efi/payload.c
+++ b/arch/x86/cpu/efi/payload.c
@@ -15,6 +15,7 @@
 #include <asm/e820.h>
 #include <asm/global_data.h>
 #include <asm/post.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/i386/cpu.c b/arch/x86/cpu/i386/cpu.c
index 7f6b1a93e1b..f0a01c2295f 100644
--- a/arch/x86/cpu/i386/cpu.c
+++ b/arch/x86/cpu/i386/cpu.c
@@ -32,6 +32,7 @@
 #include <asm/msr.h>
 #include <asm/mtrr.h>
 #include <asm/processor-flags.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/intel_common/itss.c b/arch/x86/cpu/intel_common/itss.c
index 2f47bfe20e7..d6bc051397b 100644
--- a/arch/x86/cpu/intel_common/itss.c
+++ b/arch/x86/cpu/intel_common/itss.c
@@ -19,6 +19,7 @@
 #include <spl.h>
 #include <asm/global_data.h>
 #include <asm/itss.h>
+#include <linux/string.h>
 
 struct itss_platdata {
 #if CONFIG_IS_ENABLED(OF_PLATDATA)
diff --git a/arch/x86/cpu/intel_common/report_platform.c b/arch/x86/cpu/intel_common/report_platform.c
index a3612817c45..2de29bbbe25 100644
--- a/arch/x86/cpu/intel_common/report_platform.c
+++ b/arch/x86/cpu/intel_common/report_platform.c
@@ -11,6 +11,7 @@
 #include <asm/pci.h>
 #include <asm/report_platform.h>
 #include <asm/arch/pch.h>
+#include <linux/string.h>
 
 static void report_cpu_info(void)
 {
diff --git a/arch/x86/cpu/ivybridge/sata.c b/arch/x86/cpu/ivybridge/sata.c
index f47ecdffae7..40cb0415868 100644
--- a/arch/x86/cpu/ivybridge/sata.c
+++ b/arch/x86/cpu/ivybridge/sata.c
@@ -14,6 +14,7 @@
 #include <asm/pch_common.h>
 #include <asm/pci.h>
 #include <asm/arch/pch.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/ivybridge/sdram.c b/arch/x86/cpu/ivybridge/sdram.c
index 99bc48021e6..a86ecd7ac40 100644
--- a/arch/x86/cpu/ivybridge/sdram.c
+++ b/arch/x86/cpu/ivybridge/sdram.c
@@ -36,6 +36,7 @@
 #include <asm/arch/pch.h>
 #include <asm/post.h>
 #include <asm/arch/sandybridge.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/mp_init.c b/arch/x86/cpu/mp_init.c
index bd656d09520..22cd1dbe52a 100644
--- a/arch/x86/cpu/mp_init.c
+++ b/arch/x86/cpu/mp_init.c
@@ -31,6 +31,7 @@
 #include <dm/root.h>
 #include <linux/delay.h>
 #include <linux/linkage.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/qfw_cpu.c b/arch/x86/cpu/qfw_cpu.c
index 349bab1583a..2747cb312c7 100644
--- a/arch/x86/cpu/qfw_cpu.c
+++ b/arch/x86/cpu/qfw_cpu.c
@@ -11,6 +11,7 @@
 #include <dm/lists.h>
 #include <dm/uclass-internal.h>
 #include <dm/root.h>
+#include <linux/string.h>
 
 int qemu_cpu_fixup(void)
 {
diff --git a/arch/x86/cpu/quark/acpi.c b/arch/x86/cpu/quark/acpi.c
index 82b776ff65f..655f2a1ce6a 100644
--- a/arch/x86/cpu/quark/acpi.c
+++ b/arch/x86/cpu/quark/acpi.c
@@ -9,6 +9,7 @@
 #include <asm/tables.h>
 #include <asm/arch/global_nvs.h>
 #include <asm/arch/iomap.h>
+#include <linux/string.h>
 
 void acpi_create_fadt(struct acpi_fadt *fadt, struct acpi_facs *facs,
 		      void *dsdt)
diff --git a/arch/x86/cpu/quark/dram.c b/arch/x86/cpu/quark/dram.c
index 2287dce12b5..d38c3d0809a 100644
--- a/arch/x86/cpu/quark/dram.c
+++ b/arch/x86/cpu/quark/dram.c
@@ -18,6 +18,7 @@
 #include <asm/arch/mrc.h>
 #include <asm/arch/msg_port.h>
 #include <asm/arch/quark.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/quark/smc.c b/arch/x86/cpu/quark/smc.c
index b4b3e1204bd..fa47e587a23 100644
--- a/arch/x86/cpu/quark/smc.c
+++ b/arch/x86/cpu/quark/smc.c
@@ -12,6 +12,7 @@
 #include <asm/arch/device.h>
 #include <asm/arch/mrc.h>
 #include <asm/arch/msg_port.h>
+#include <linux/string.h>
 #include "mrc_util.h"
 #include "hte.h"
 #include "smc.h"
diff --git a/arch/x86/cpu/tangier/acpi.c b/arch/x86/cpu/tangier/acpi.c
index 41bd177e095..7a0020c74fe 100644
--- a/arch/x86/cpu/tangier/acpi.c
+++ b/arch/x86/cpu/tangier/acpi.c
@@ -15,6 +15,7 @@
 #include <asm/arch/global_nvs.h>
 #include <asm/arch/iomap.h>
 #include <dm/uclass-internal.h>
+#include <linux/string.h>
 
 void acpi_create_fadt(struct acpi_fadt *fadt, struct acpi_facs *facs,
 		      void *dsdt)
diff --git a/arch/x86/cpu/tangier/sdram.c b/arch/x86/cpu/tangier/sdram.c
index 0f0ab4102be..e1531385fb8 100644
--- a/arch/x86/cpu/tangier/sdram.c
+++ b/arch/x86/cpu/tangier/sdram.c
@@ -10,6 +10,7 @@
 #include <asm/global_data.h>
 #include <asm/sfi.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h
index 83dc09757e0..f0119c47b85 100644
--- a/arch/x86/include/asm/io.h
+++ b/arch/x86/include/asm/io.h
@@ -8,6 +8,7 @@
 #define _ASM_IO_H
 
 #include <compiler.h>
+#include <linux/string.h>
 
 /*
  * This file contains the definitions for the x86 IO instructions
diff --git a/arch/x86/include/asm/me_common.h b/arch/x86/include/asm/me_common.h
index 49d88623edf..56e328846cf 100644
--- a/arch/x86/include/asm/me_common.h
+++ b/arch/x86/include/asm/me_common.h
@@ -13,6 +13,7 @@
 #define __ASM_ME_COMMON_H
 
 #include <linux/compiler.h>
+#include <linux/string.h>
 #include <linux/types.h>
 #include <pci.h>
 
diff --git a/arch/x86/lib/acpi.c b/arch/x86/lib/acpi.c
index 155fffabf08..ffdc9e8257e 100644
--- a/arch/x86/lib/acpi.c
+++ b/arch/x86/lib/acpi.c
@@ -8,6 +8,7 @@
 #include <acpi/acpi_table.h>
 #include <asm/io.h>
 #include <asm/tables.h>
+#include <linux/string.h>
 
 static struct acpi_rsdp *acpi_valid_rsdp(struct acpi_rsdp *rsdp)
 {
diff --git a/arch/x86/lib/acpi_nhlt.c b/arch/x86/lib/acpi_nhlt.c
index c64dd9c0081..8df5ddd4a7a 100644
--- a/arch/x86/lib/acpi_nhlt.c
+++ b/arch/x86/lib/acpi_nhlt.c
@@ -17,6 +17,7 @@
 #include <asm/acpi_nhlt.h>
 #include <asm/unaligned.h>
 #include <dm/acpi.h>
+#include <linux/string.h>
 
 #define NHLT_RID		1
 #define NHLT_SSID		1
diff --git a/arch/x86/lib/acpi_s3.c b/arch/x86/lib/acpi_s3.c
index 2c70acbe7b0..244764152b2 100644
--- a/arch/x86/lib/acpi_s3.c
+++ b/arch/x86/lib/acpi_s3.c
@@ -10,6 +10,7 @@
 #include <asm/global_data.h>
 #include <asm/post.h>
 #include <linux/linkage.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/lib/acpi_table.c b/arch/x86/lib/acpi_table.c
index c574f0c6230..c6500f62ad8 100644
--- a/arch/x86/lib/acpi_table.c
+++ b/arch/x86/lib/acpi_table.c
@@ -25,6 +25,7 @@
 #include <asm/arch/global_nvs.h>
 #include <dm/acpi.h>
 #include <linux/err.h>
+#include <linux/string.h>
 
 /*
  * IASL compiles the dsdt entries and writes the hex values
diff --git a/arch/x86/lib/bios.c b/arch/x86/lib/bios.c
index fbdc3b04e36..a4499972c32 100644
--- a/arch/x86/lib/bios.c
+++ b/arch/x86/lib/bios.c
@@ -17,6 +17,7 @@
 #include <asm/i8259.h>
 #include <asm/io.h>
 #include <asm/post.h>
+#include <linux/string.h>
 #include "bios.h"
 
 /* Interrupt handlers for each interrupt the ROM can call */
diff --git a/arch/x86/lib/cmd_boot.c b/arch/x86/lib/cmd_boot.c
index 4facbe5f32f..b128b43cebe 100644
--- a/arch/x86/lib/cmd_boot.c
+++ b/arch/x86/lib/cmd_boot.c
@@ -19,6 +19,7 @@
 #include <malloc.h>
 #include <asm/global_data.h>
 #include <asm/u-boot-x86.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/lib/coreboot_table.c b/arch/x86/lib/coreboot_table.c
index 6eab0452fda..b0377dcee17 100644
--- a/arch/x86/lib/coreboot_table.c
+++ b/arch/x86/lib/coreboot_table.c
@@ -11,6 +11,7 @@
 #include <asm/coreboot_tables.h>
 #include <asm/e820.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/lib/fsp1/fsp_support.c b/arch/x86/lib/fsp1/fsp_support.c
index d84c632f140..25aa71c6c20 100644
--- a/arch/x86/lib/fsp1/fsp_support.c
+++ b/arch/x86/lib/fsp1/fsp_support.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <asm/fsp1/fsp_support.h>
 #include <asm/post.h>
+#include <linux/string.h>
 
 struct fsp_header *__attribute__((optimize("O0"))) fsp_find_header(void)
 {
diff --git a/arch/x86/lib/fsp2/fsp_meminit.c b/arch/x86/lib/fsp2/fsp_meminit.c
index 022e2cb64e5..abbe1a011dd 100644
--- a/arch/x86/lib/fsp2/fsp_meminit.c
+++ b/arch/x86/lib/fsp2/fsp_meminit.c
@@ -18,6 +18,7 @@
 #include <asm/fsp2/fsp_internal.h>
 #include <asm/arch/fsp/fsp_configs.h>
 #include <asm/arch/fsp/fsp_m_upd.h>
+#include <linux/string.h>
 
 static int prepare_mrc_cache_type(enum mrc_type_t type,
 				  struct mrc_data_container **cachep)
diff --git a/arch/x86/lib/fsp2/fsp_silicon_init.c b/arch/x86/lib/fsp2/fsp_silicon_init.c
index f86dbfa6c63..ca064eaf716 100644
--- a/arch/x86/lib/fsp2/fsp_silicon_init.c
+++ b/arch/x86/lib/fsp2/fsp_silicon_init.c
@@ -18,6 +18,7 @@
 #include <asm/fsp/fsp_infoheader.h>
 #include <asm/fsp2/fsp_internal.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 
 int fsp_silicon_init(bool s3wake, bool use_spi_flash)
 {
diff --git a/arch/x86/lib/fsp2/fsp_support.c b/arch/x86/lib/fsp2/fsp_support.c
index bcdf429f06a..1f68479ec58 100644
--- a/arch/x86/lib/fsp2/fsp_support.c
+++ b/arch/x86/lib/fsp2/fsp_support.c
@@ -11,6 +11,7 @@
 #include <asm/fsp/fsp_support.h>
 #include <asm/fsp2/fsp_internal.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 
 /* The amount of the FSP header to probe to obtain what we need */
 #define PROBE_BUF_SIZE 0x180
diff --git a/arch/x86/lib/mpspec.c b/arch/x86/lib/mpspec.c
index 8021d8f75a4..78724564605 100644
--- a/arch/x86/lib/mpspec.c
+++ b/arch/x86/lib/mpspec.c
@@ -19,6 +19,7 @@
 #include <asm/mpspec.h>
 #include <asm/tables.h>
 #include <dm/uclass-internal.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/lib/mrccache.c b/arch/x86/lib/mrccache.c
index b5269156801..12c24e1e46f 100644
--- a/arch/x86/lib/mrccache.c
+++ b/arch/x86/lib/mrccache.c
@@ -19,6 +19,7 @@
 #include <asm/mrccache.h>
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/lib/physmem.c b/arch/x86/lib/physmem.c
index c11101b44ec..1589a887350 100644
--- a/arch/x86/lib/physmem.c
+++ b/arch/x86/lib/physmem.c
@@ -14,6 +14,7 @@
 #include <asm/cpu.h>
 #include <asm/global_data.h>
 #include <linux/compiler.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/lib/pirq_routing.c b/arch/x86/lib/pirq_routing.c
index caeaec9287f..8aeba8496a9 100644
--- a/arch/x86/lib/pirq_routing.c
+++ b/arch/x86/lib/pirq_routing.c
@@ -11,6 +11,7 @@
 #include <asm/global_data.h>
 #include <asm/pci.h>
 #include <asm/pirq_routing.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/lib/relocate.c b/arch/x86/lib/relocate.c
index 6fe51516477..ffccbf54dfc 100644
--- a/arch/x86/lib/relocate.c
+++ b/arch/x86/lib/relocate.c
@@ -21,6 +21,7 @@
 #include <asm/u-boot-x86.h>
 #include <asm/sections.h>
 #include <elf.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/lib/scu.c b/arch/x86/lib/scu.c
index d29d701631d..a9d06d82bb4 100644
--- a/arch/x86/lib/scu.c
+++ b/arch/x86/lib/scu.c
@@ -20,6 +20,7 @@
 #include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/kernel.h>
+#include <linux/string.h>
 
 /* SCU register map */
 struct ipc_regs {
diff --git a/arch/x86/lib/sfi.c b/arch/x86/lib/sfi.c
index b48bd5d8f36..2e68504d886 100644
--- a/arch/x86/lib/sfi.c
+++ b/arch/x86/lib/sfi.c
@@ -20,6 +20,7 @@
 #include <asm/sfi.h>
 #include <asm/tables.h>
 #include <dm/uclass-internal.h>
+#include <linux/string.h>
 
 struct table_info {
 	u32 base;
diff --git a/arch/x86/lib/spl.c b/arch/x86/lib/spl.c
index a220c71b576..96885c6cc55 100644
--- a/arch/x86/lib/spl.c
+++ b/arch/x86/lib/spl.c
@@ -24,6 +24,7 @@
 #include <asm/processor.h>
 #include <asm/spl.h>
 #include <asm-generic/sections.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/lib/string.c b/arch/x86/lib/string.c
index c6263cd2f5a..d85b77a9624 100644
--- a/arch/x86/lib/string.c
+++ b/arch/x86/lib/string.c
@@ -7,6 +7,7 @@
 
 /* From glibc-2.14, sysdeps/i386/memset.c */
 
+#include <linux/string.h>
 #include <linux/types.h>
 #include <linux/compiler.h>
 #include <asm/string.h>
diff --git a/arch/x86/lib/tables.c b/arch/x86/lib/tables.c
index 730552a0ea5..e4ed0f4aae1 100644
--- a/arch/x86/lib/tables.c
+++ b/arch/x86/lib/tables.c
@@ -13,6 +13,7 @@
 #include <asm/mpspec.h>
 #include <asm/tables.h>
 #include <asm/coreboot_tables.h>
+#include <linux/string.h>
 
 /**
  * Function prototype to write a specific configuration table
diff --git a/arch/x86/lib/zimage.c b/arch/x86/lib/zimage.c
index d2b6002008a..e7c0ff32120 100644
--- a/arch/x86/lib/zimage.c
+++ b/arch/x86/lib/zimage.c
@@ -29,6 +29,7 @@
 #endif
 #include <linux/compiler.h>
 #include <linux/libfdt.h>
+#include <linux/string.h>
 
 /*
  * Memory lay-out:
diff --git a/arch/xtensa/include/asm/io.h b/arch/xtensa/include/asm/io.h
index 76a646e8825..14e90619360 100644
--- a/arch/xtensa/include/asm/io.h
+++ b/arch/xtensa/include/asm/io.h
@@ -9,6 +9,7 @@
 #ifndef _XTENSA_IO_H
 #define _XTENSA_IO_H
 
+#include <linux/string.h>
 #include <linux/types.h>
 #include <asm/byteorder.h>
 
diff --git a/arch/xtensa/lib/bootm.c b/arch/xtensa/lib/bootm.c
index b51d329c670..c33bcf2f9ed 100644
--- a/arch/xtensa/lib/bootm.c
+++ b/arch/xtensa/lib/bootm.c
@@ -10,6 +10,7 @@
 #include <cpu_func.h>
 #include <env.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 #include <u-boot/zlib.h>
 #include <asm/byteorder.h>
 #include <asm/addrspace.h>
diff --git a/arch/xtensa/lib/relocate.c b/arch/xtensa/lib/relocate.c
index 91141f581e1..ffe39d4a03c 100644
--- a/arch/xtensa/lib/relocate.c
+++ b/arch/xtensa/lib/relocate.c
@@ -6,6 +6,7 @@
 #include <relocate.h>
 #include <asm/sections.h>
 #include <asm/string.h>
+#include <linux/string.h>
 
 int clear_bss(void)
 {
diff --git a/board/Arcturus/ucp1020/cmd_arc.c b/board/Arcturus/ucp1020/cmd_arc.c
index 4b30b66e208..99652dde928 100644
--- a/board/Arcturus/ucp1020/cmd_arc.c
+++ b/board/Arcturus/ucp1020/cmd_arc.c
@@ -19,6 +19,7 @@
 #include <mmc.h>
 #include <version.h>
 #include <asm/io.h>
+#include <linux/string.h>
 #include <linux/stringify.h>
 
 static ulong fwenv_addr[MAX_FWENV_ADDR];
diff --git a/board/Arcturus/ucp1020/ddr.c b/board/Arcturus/ucp1020/ddr.c
index a3285ebe5cd..712023faf7d 100644
--- a/board/Arcturus/ucp1020/ddr.c
+++ b/board/Arcturus/ucp1020/ddr.c
@@ -16,6 +16,7 @@
 #include <fsl_ddr_dimm_params.h>
 #include <asm/io.h>
 #include <asm/fsl_law.h>
+#include <linux/string.h>
 
 #ifdef CONFIG_SYS_DDR_RAW_TIMING
 #if defined(CONFIG_UCP1020) || defined(CONFIG_UCP1020T1)
diff --git a/board/Arcturus/ucp1020/spl.c b/board/Arcturus/ucp1020/spl.c
index 34660e59f44..b5db24da294 100644
--- a/board/Arcturus/ucp1020/spl.c
+++ b/board/Arcturus/ucp1020/spl.c
@@ -21,6 +21,7 @@
 #include <fsl_esdhc.h>
 #include <spi_flash.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/Arcturus/ucp1020/ucp1020.c b/board/Arcturus/ucp1020/ucp1020.c
index 24d1d57ec4b..0846bb0e9ef 100644
--- a/board/Arcturus/ucp1020/ucp1020.c
+++ b/board/Arcturus/ucp1020/ucp1020.c
@@ -40,6 +40,7 @@
 #include <asm/fsl_law.h>
 #include <asm/fsl_lbc.h>
 #include <asm/mp.h>
+#include <linux/string.h>
 #include "ucp1020.h"
 
 void spi_set_speed(struct spi_slave *slave, uint hz)
diff --git a/board/BuR/common/common.c b/board/BuR/common/common.c
index d2d4ea5835b..c42711d9733 100644
--- a/board/BuR/common/common.c
+++ b/board/BuR/common/common.c
@@ -17,6 +17,7 @@
 #include <lcd.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include "bur_common.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/BuS/eb_cpu5282/eb_cpu5282.c b/board/BuS/eb_cpu5282/eb_cpu5282.c
index 03a02ffd29c..fb612c70752 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 <asm/global_data.h>
+#include <linux/string.h>
 #include "asm/m5282.h"
 #include <bmp_layout.h>
 #include <env.h>
diff --git a/board/CZ.NIC/turris_omnia/turris_omnia.c b/board/CZ.NIC/turris_omnia/turris_omnia.c
index 0353d58a361..b84227a56e0 100644
--- a/board/CZ.NIC/turris_omnia/turris_omnia.c
+++ b/board/CZ.NIC/turris_omnia/turris_omnia.c
@@ -23,6 +23,7 @@
 #include <fdt_support.h>
 #include <time.h>
 #include <linux/bitops.h>
+#include <linux/string.h>
 #include <u-boot/crc.h>
 # include <atsha204a-i2c.h>
 
diff --git a/board/Synology/ds109/ds109.c b/board/Synology/ds109/ds109.c
index bf57ffff438..7159535ec45 100644
--- a/board/Synology/ds109/ds109.c
+++ b/board/Synology/ds109/ds109.c
@@ -15,6 +15,7 @@
 #include <asm/arch/soc.h>
 #include <asm/arch/mpp.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include "ds109.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/Synology/ds414/cmd_syno.c b/board/Synology/ds414/cmd_syno.c
index a120c3123ff..94a56368970 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 <linux/mtd/mtd.h>
+#include <linux/string.h>
 
 #include <asm/io.h>
 #include "../drivers/ddr/marvell/axp/ddr3_init.h"
diff --git a/board/advantech/imx8qm_rom7720_a1/spl.c b/board/advantech/imx8qm_rom7720_a1/spl.c
index 8493bb01588..5a9a0090535 100644
--- a/board/advantech/imx8qm_rom7720_a1/spl.c
+++ b/board/advantech/imx8qm_rom7720_a1/spl.c
@@ -10,6 +10,7 @@
 #include <spl.h>
 #include <fsl_esdhc.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 
 #include <asm/io.h>
 #include <asm/gpio.h>
diff --git a/board/aristainetos/aristainetos.c b/board/aristainetos/aristainetos.c
index a28f67a0b13..ab73a928d66 100644
--- a/board/aristainetos/aristainetos.c
+++ b/board/aristainetos/aristainetos.c
@@ -34,6 +34,7 @@
 #include <miiphy.h>
 #include <lcd.h>
 #include <led.h>
+#include <linux/string.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/da9063_pmic.h>
diff --git a/board/armltd/vexpress/vexpress_common.c b/board/armltd/vexpress/vexpress_common.c
index d34c03bf9dd..d359a36c774 100644
--- a/board/armltd/vexpress/vexpress_common.c
+++ b/board/armltd/vexpress/vexpress_common.c
@@ -29,6 +29,7 @@
 #include <asm/arch/systimer.h>
 #include <asm/arch/sysctrl.h>
 #include <asm/arch/wdt.h>
+#include <linux/string.h>
 #include "../drivers/mmc/arm_pl180_mmci.h"
 
 static struct systimer *systimer_base = (struct systimer *)V2M_TIMER01;
diff --git a/board/armltd/vexpress/vexpress_tc2.c b/board/armltd/vexpress/vexpress_tc2.c
index 8ee24bdde73..fe5389b4e44 100644
--- a/board/armltd/vexpress/vexpress_tc2.c
+++ b/board/armltd/vexpress/vexpress_tc2.c
@@ -11,6 +11,7 @@
 #include <asm/u-boot.h>
 #include <common.h>
 #include <linux/libfdt.h>
+#include <linux/string.h>
 
 #define SCC_BASE	0x7fff0000
 
diff --git a/board/armltd/vexpress64/vexpress64.c b/board/armltd/vexpress64/vexpress64.c
index 6bf2ed23190..cc118a02f11 100644
--- a/board/armltd/vexpress64/vexpress64.c
+++ b/board/armltd/vexpress64/vexpress64.c
@@ -16,6 +16,7 @@
 #include <asm/io.h>
 #include <linux/compiler.h>
 #include <dm/platform_data/serial_pl01x.h>
+#include <linux/string.h>
 #include "pcie.h"
 #include <asm/armv8/mmu.h>
 
diff --git a/board/atmel/common/mac-spi-nor.c b/board/atmel/common/mac-spi-nor.c
index ced27b65e63..3b150dac7d8 100644
--- a/board/atmel/common/mac-spi-nor.c
+++ b/board/atmel/common/mac-spi-nor.c
@@ -11,6 +11,7 @@
 #include <net.h>
 #include <linux/mtd/spi-nor.h>
 #include <netdev.h>
+#include <linux/string.h>
 
 #define ETH_ADDR_SIZE			6
 
diff --git a/board/atmel/common/video_display.c b/board/atmel/common/video_display.c
index a5049f4aad4..33725a01f50 100644
--- a/board/atmel/common/video_display.c
+++ b/board/atmel/common/video_display.c
@@ -16,6 +16,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clk.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/atmel/sama5d3xek/sama5d3xek.c b/board/atmel/sama5d3xek/sama5d3xek.c
index b6f8dcd91dc..4fe979bc8a5 100644
--- a/board/atmel/sama5d3xek/sama5d3xek.c
+++ b/board/atmel/sama5d3xek/sama5d3xek.c
@@ -19,6 +19,7 @@
 #include <spl.h>
 #include <asm/arch/atmel_mpddrc.h>
 #include <asm/arch/at91_wdt.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/barco/platinum/spl_picon.c b/board/barco/platinum/spl_picon.c
index 253a64d28eb..aa33d1feb32 100644
--- a/board/barco/platinum/spl_picon.c
+++ b/board/barco/platinum/spl_picon.c
@@ -18,6 +18,7 @@
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/mach-imx/mxc_i2c.h>
 #include <spl.h>
+#include <linux/string.h>
 
 #include "platinum.h"
 
diff --git a/board/barco/platinum/spl_titanium.c b/board/barco/platinum/spl_titanium.c
index 8c91b752ffe..ef1e2c419b4 100644
--- a/board/barco/platinum/spl_titanium.c
+++ b/board/barco/platinum/spl_titanium.c
@@ -18,6 +18,7 @@
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/mach-imx/mxc_i2c.h>
 #include <spl.h>
+#include <linux/string.h>
 
 #include "platinum.h"
 
diff --git a/board/beacon/imx8mm/spl.c b/board/beacon/imx8mm/spl.c
index 12266b22a42..572dc519123 100644
--- a/board/beacon/imx8mm/spl.c
+++ b/board/beacon/imx8mm/spl.c
@@ -14,6 +14,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/mach-imx/boot_mode.h>
 #include <asm/arch/ddr.h>
+#include <linux/string.h>
 
 #include <dm/uclass.h>
 #include <dm/device.h>
diff --git a/board/beckhoff/mx53cx9020/mx53cx9020.c b/board/beckhoff/mx53cx9020/mx53cx9020.c
index a3657db8266..e451ef9ef36 100644
--- a/board/beckhoff/mx53cx9020/mx53cx9020.c
+++ b/board/beckhoff/mx53cx9020/mx53cx9020.c
@@ -18,6 +18,7 @@
 #include <ACEX1K.h>
 #include <asm/gpio.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 enum LED_GPIOS {
 	GPIO_SD1_CD = IMX_GPIO_NR(1, 1),
diff --git a/board/bluewater/gurnard/gurnard.c b/board/bluewater/gurnard/gurnard.c
index c5c8bcc598e..2ac23674f9c 100644
--- a/board/bluewater/gurnard/gurnard.c
+++ b/board/bluewater/gurnard/gurnard.c
@@ -35,6 +35,7 @@
 #include <asm/arch/gpio.h>
 #include <dm/uclass-internal.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #ifdef CONFIG_GURNARD_SPLASH
 #include "splash_logo.h"
diff --git a/board/boundary/nitrogen6x/nitrogen6x.c b/board/boundary/nitrogen6x/nitrogen6x.c
index 84e14d1124f..3cc093ed530 100644
--- a/board/boundary/nitrogen6x/nitrogen6x.c
+++ b/board/boundary/nitrogen6x/nitrogen6x.c
@@ -35,6 +35,7 @@
 #include <i2c.h>
 #include <input.h>
 #include <netdev.h>
+#include <linux/string.h>
 #include <usb/ehci-ci.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/cavium/thunderx/atf.c b/board/cavium/thunderx/atf.c
index 64aa198765f..a60c944089d 100644
--- a/board/cavium/thunderx/atf.c
+++ b/board/cavium/thunderx/atf.c
@@ -8,6 +8,7 @@
 #include <asm/cache.h>
 #include <asm/io.h>
 #include <asm/ptrace.h>
+#include <linux/string.h>
 
 #include <asm/system.h>
 #include <cavium/thunderx_svc.h>
diff --git a/board/cobra5272/flash.c b/board/cobra5272/flash.c
index 9aa8f118baf..cefcc6634ff 100644
--- a/board/cobra5272/flash.c
+++ b/board/cobra5272/flash.c
@@ -12,6 +12,7 @@
 #include <time.h>
 #include <uuid.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #define PHYS_FLASH_1 CONFIG_SYS_FLASH_BASE
 #define FLASH_BANK_SIZE 0x200000
@@ -72,7 +73,7 @@ unsigned long flash_init(void)
 			(AMD_ID_PL160CB & FLASH_TYPEMASK);
 		flash_info[i].size = FLASH_BANK_SIZE;
 		flash_info[i].sector_count = CONFIG_SYS_MAX_FLASH_SECT;
-		memset (flash_info[i].protect, 0, CONFIG_SYS_MAX_FLASH_SECT);
+		memset(flash_info[i].protect, 0, CONFIG_SYS_MAX_FLASH_SECT);
 		if (i == 0)
 			flashbase = PHYS_FLASH_1;
 		else
diff --git a/board/compulab/cl-som-imx7/spl.c b/board/compulab/cl-som-imx7/spl.c
index 9c7332b43b5..0128b912801 100644
--- a/board/compulab/cl-som-imx7/spl.c
+++ b/board/compulab/cl-som-imx7/spl.c
@@ -16,6 +16,7 @@
 #include <asm/arch-mx7/mx7-pins.h>
 #include <asm/arch-mx7/clock.h>
 #include <asm/arch-mx7/mx7-ddr.h>
+#include <linux/string.h>
 #include "common.h"
 
 #ifdef CONFIG_FSL_ESDHC_IMX
diff --git a/board/compulab/cm_fx6/cm_fx6.c b/board/compulab/cm_fx6/cm_fx6.c
index 2b11b7ee189..46da479a45f 100644
--- a/board/compulab/cm_fx6/cm_fx6.c
+++ b/board/compulab/cm_fx6/cm_fx6.c
@@ -37,6 +37,7 @@
 #include <dm/device-internal.h>
 #include <jffs2/load_kernel.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include "common.h"
 #include "../common/eeprom.h"
 #include "../common/common.h"
diff --git a/board/compulab/common/eeprom.c b/board/compulab/common/eeprom.c
index 5206cf5c0ad..fa4ab7d6567 100644
--- a/board/compulab/common/eeprom.c
+++ b/board/compulab/common/eeprom.c
@@ -13,6 +13,7 @@
 #include <eeprom_field.h>
 #include <asm/setup.h>
 #include <linux/kernel.h>
+#include <linux/string.h>
 #include "eeprom.h"
 
 #ifndef CONFIG_SYS_I2C_EEPROM_ADDR
diff --git a/board/compulab/common/omap3_display.c b/board/compulab/common/omap3_display.c
index cb9ebae7f96..e1511e82ecc 100644
--- a/board/compulab/common/omap3_display.c
+++ b/board/compulab/common/omap3_display.c
@@ -16,6 +16,7 @@
 #include <lcd.h>
 #include <scf0403_lcd.h>
 #include <asm/arch-omap3/dss.h>
+#include <linux/string.h>
 
 enum display_type {
 	NONE,
diff --git a/board/congatec/cgtqmx6eval/cgtqmx6eval.c b/board/congatec/cgtqmx6eval/cgtqmx6eval.c
index 6ae4a1af892..3f74cd87890 100644
--- a/board/congatec/cgtqmx6eval/cgtqmx6eval.c
+++ b/board/congatec/cgtqmx6eval/cgtqmx6eval.c
@@ -29,6 +29,7 @@
 #include <i2c.h>
 #include <input.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include <power/pmic.h>
 #include <power/pfuze100_pmic.h>
 #include <linux/fb.h>
diff --git a/board/corscience/tricorder/tricorder-eeprom.c b/board/corscience/tricorder/tricorder-eeprom.c
index d0b91864c27..266f43a0058 100644
--- a/board/corscience/tricorder/tricorder-eeprom.c
+++ b/board/corscience/tricorder/tricorder-eeprom.c
@@ -9,6 +9,7 @@
 #include <display_options.h>
 #include <eeprom.h>
 #include <i2c.h>
+#include <linux/string.h>
 #include <u-boot/crc.h>
 
 #include "tricorder-eeprom.h"
diff --git a/board/corscience/tricorder/tricorder.c b/board/corscience/tricorder/tricorder.c
index 3f4a40fd659..a6fc7f67d02 100644
--- a/board/corscience/tricorder/tricorder.c
+++ b/board/corscience/tricorder/tricorder.c
@@ -21,6 +21,7 @@
 #include <asm/arch/mux.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/mem.h>
+#include <linux/string.h>
 #include "tricorder.h"
 #include "tricorder-eeprom.h"
 
diff --git a/board/creative/xfi3/spl_boot.c b/board/creative/xfi3/spl_boot.c
index 67c1e9801b9..64a13cef305 100644
--- a/board/creative/xfi3/spl_boot.c
+++ b/board/creative/xfi3/spl_boot.c
@@ -11,6 +11,7 @@
 #include <asm/arch/iomux-mx23.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/string.h>
 
 #define	MUX_CONFIG_EMI	(MXS_PAD_1V8 | MXS_PAD_12MA | MXS_PAD_PULLUP)
 #define	MUX_CONFIG_SSP	(MXS_PAD_3V3 | MXS_PAD_8MA | MXS_PAD_PULLUP)
diff --git a/board/cssi/MCR3000/MCR3000.c b/board/cssi/MCR3000/MCR3000.c
index c20e8714949..2603ad4c57d 100644
--- a/board/cssi/MCR3000/MCR3000.c
+++ b/board/cssi/MCR3000/MCR3000.c
@@ -19,6 +19,7 @@
 #include <dm/uclass.h>
 #include <wdt.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/davinci/da8xxevm/da850evm.c b/board/davinci/da8xxevm/da850evm.c
index 383a8617384..7b3f303f3a7 100644
--- a/board/davinci/da8xxevm/da850evm.c
+++ b/board/davinci/da8xxevm/da850evm.c
@@ -27,6 +27,7 @@
 #include <hwconfig.h>
 #include <asm/mach-types.h>
 #include <asm/gpio.h>
+#include <linux/string.h>
 
 #ifdef CONFIG_MMC_DAVINCI
 #include <mmc.h>
diff --git a/board/davinci/da8xxevm/omapl138_lcdk.c b/board/davinci/da8xxevm/omapl138_lcdk.c
index 7607e313b75..3f4bd39ec8f 100644
--- a/board/davinci/da8xxevm/omapl138_lcdk.c
+++ b/board/davinci/da8xxevm/omapl138_lcdk.c
@@ -26,6 +26,7 @@
 #include <mmc.h>
 #include <asm/arch/sdmmc_defs.h>
 #endif
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/dhelectronics/dh_imx6/dh_imx6.c b/board/dhelectronics/dh_imx6/dh_imx6.c
index 2969e90a707..c8c99a2aa47 100644
--- a/board/dhelectronics/dh_imx6/dh_imx6.c
+++ b/board/dhelectronics/dh_imx6/dh_imx6.c
@@ -34,6 +34,7 @@
 #include <mmc.h>
 #include <usb.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include <usb/ehci-ci.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/dhelectronics/dh_imx6/dh_imx6_spl.c b/board/dhelectronics/dh_imx6/dh_imx6_spl.c
index e49e97724a5..dd8f1625be3 100644
--- a/board/dhelectronics/dh_imx6/dh_imx6_spl.c
+++ b/board/dhelectronics/dh_imx6/dh_imx6_spl.c
@@ -26,6 +26,7 @@
 #include <mmc.h>
 #include <spl.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #define ENET_PAD_CTRL							\
 	(PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm |	\
diff --git a/board/dhelectronics/dh_stm32mp1/board.c b/board/dhelectronics/dh_stm32mp1/board.c
index f4694e4b883..851024f52b3 100644
--- a/board/dhelectronics/dh_stm32mp1/board.c
+++ b/board/dhelectronics/dh_stm32mp1/board.c
@@ -36,6 +36,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include <power/regulator.h>
 #include <remoteproc.h>
 #include <reset.h>
diff --git a/board/egnite/ethernut5/ethernut5_pwrman.c b/board/egnite/ethernut5/ethernut5_pwrman.c
index 81f1abf2fad..56c33bfade4 100644
--- a/board/egnite/ethernut5/ethernut5_pwrman.c
+++ b/board/egnite/ethernut5/ethernut5_pwrman.c
@@ -39,6 +39,7 @@
 #include <asm/io.h>
 #include <i2c.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include "ethernut5_pwrman.h"
 
diff --git a/board/el/el6x/el6x.c b/board/el/el6x/el6x.c
index ddac58f73d2..382a255d162 100644
--- a/board/el/el6x/el6x.c
+++ b/board/el/el6x/el6x.c
@@ -31,6 +31,7 @@
 #include <asm/arch/sys_proto.h>
 #include <i2c.h>
 #include <input.h>
+#include <linux/string.h>
 #include <power/pmic.h>
 #include <power/pfuze100_pmic.h>
 #include <asm/arch/mx6-ddr.h>
diff --git a/board/engicam/common/board.c b/board/engicam/common/board.c
index df9149e0d6d..28080d423b3 100644
--- a/board/engicam/common/board.c
+++ b/board/engicam/common/board.c
@@ -17,6 +17,7 @@
 #include <asm/arch/sys_proto.h>
 #include <watchdog.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 
 #include "board.h"
 
diff --git a/board/engicam/common/spl.c b/board/engicam/common/spl.c
index 6a0612481a8..d57419a78ef 100644
--- a/board/engicam/common/spl.c
+++ b/board/engicam/common/spl.c
@@ -11,6 +11,7 @@
 #include <serial.h>
 #include <spl.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include <asm/io.h>
 #include <asm/gpio.h>
diff --git a/board/esd/meesc/meesc.c b/board/esd/meesc/meesc.c
index eaa525eb004..81aa22bc831 100644
--- a/board/esd/meesc/meesc.c
+++ b/board/esd/meesc/meesc.c
@@ -28,6 +28,7 @@
 #include <asm/arch/at91_pio.h>
 #include <asm/arch/clk.h>
 #include <netdev.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/esd/vme8349/caddy.c b/board/esd/vme8349/caddy.c
index ba91f4b3c84..fc4855a5bea 100644
--- a/board/esd/vme8349/caddy.c
+++ b/board/esd/vme8349/caddy.c
@@ -15,6 +15,7 @@
 #include <pci.h>
 #include <asm/mmu.h>
 #include <asm/io.h>
+#include <linux/string.h>
 
 #include "caddy.h"
 
diff --git a/board/esd/vme8349/vme8349.c b/board/esd/vme8349/vme8349.c
index d388fc6d490..56dd2269cb8 100644
--- a/board/esd/vme8349/vme8349.c
+++ b/board/esd/vme8349/vme8349.c
@@ -28,6 +28,7 @@
 #include <spd_sdram.h>
 #include <i2c.h>
 #include <netdev.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/firefly/roc-pc-rk3399/roc-pc-rk3399.c b/board/firefly/roc-pc-rk3399/roc-pc-rk3399.c
index 93e7d776fb2..7029bf7bf86 100644
--- a/board/firefly/roc-pc-rk3399/roc-pc-rk3399.c
+++ b/board/firefly/roc-pc-rk3399/roc-pc-rk3399.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <spl_gpio.h>
 #include <asm/io.h>
+#include <linux/string.h>
 #include <power/regulator.h>
 
 #include <asm/arch-rockchip/cru.h>
diff --git a/board/freescale/common/fsl_validate.c b/board/freescale/common/fsl_validate.c
index 564a8b3b54f..213545e777f 100644
--- a/board/freescale/common/fsl_validate.c
+++ b/board/freescale/common/fsl_validate.c
@@ -13,6 +13,7 @@
 #include <command.h>
 #include <log.h>
 #include <malloc.h>
+#include <linux/string.h>
 #include <u-boot/rsa-mod-exp.h>
 #include <hash.h>
 #include <fsl_secboot_err.h>
diff --git a/board/freescale/common/ngpixis.c b/board/freescale/common/ngpixis.c
index 37a6f775a05..a89b07986bb 100644
--- a/board/freescale/common/ngpixis.c
+++ b/board/freescale/common/ngpixis.c
@@ -32,6 +32,7 @@
 #include <common.h>
 #include <command.h>
 #include <asm/io.h>
+#include <linux/string.h>
 
 #include "ngpixis.h"
 
diff --git a/board/freescale/common/pixis.c b/board/freescale/common/pixis.c
index 4127fbc1396..99e8069ad29 100644
--- a/board/freescale/common/pixis.c
+++ b/board/freescale/common/pixis.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <command.h>
 #include <asm/io.h>
+#include <linux/string.h>
 
 #define pixis_base (u8 *)PIXIS_BASE
 
diff --git a/board/freescale/common/qixis.c b/board/freescale/common/qixis.c
index 1696c24e27b..8592b0f0f0a 100644
--- a/board/freescale/common/qixis.c
+++ b/board/freescale/common/qixis.c
@@ -11,6 +11,7 @@
 #include <command.h>
 #include <asm/io.h>
 #include <linux/compiler.h>
+#include <linux/string.h>
 #include <linux/time.h>
 #include <i2c.h>
 #include "qixis.h"
diff --git a/board/freescale/common/sgmii_riser.c b/board/freescale/common/sgmii_riser.c
index 23157930101..e6481f69516 100644
--- a/board/freescale/common/sgmii_riser.c
+++ b/board/freescale/common/sgmii_riser.c
@@ -19,6 +19,7 @@
 #include <linux/libfdt.h>
 #include <tsec.h>
 #include <fdt_support.h>
+#include <linux/string.h>
 
 void fsl_sgmii_riser_init(struct tsec_info_struct *tsec_info, int num)
 {
diff --git a/board/freescale/common/sys_eeprom.c b/board/freescale/common/sys_eeprom.c
index 728245d81cd..566920d5feb 100644
--- a/board/freescale/common/sys_eeprom.c
+++ b/board/freescale/common/sys_eeprom.c
@@ -13,6 +13,7 @@
 #include <init.h>
 #include <linux/ctype.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include <u-boot/crc.h>
 
 #ifdef CONFIG_SYS_I2C_EEPROM_CCID
diff --git a/board/freescale/corenet_ds/ddr.c b/board/freescale/corenet_ds/ddr.c
index 2c440673e7c..a8e499869f5 100644
--- a/board/freescale/corenet_ds/ddr.c
+++ b/board/freescale/corenet_ds/ddr.c
@@ -14,6 +14,7 @@
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
 #include <asm/fsl_law.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/corenet_ds/eth_hydra.c b/board/freescale/corenet_ds/eth_hydra.c
index 8112c12568d..90ce999be0c 100644
--- a/board/freescale/corenet_ds/eth_hydra.c
+++ b/board/freescale/corenet_ds/eth_hydra.c
@@ -56,6 +56,7 @@
 #include <malloc.h>
 #include <fdt_support.h>
 #include <fsl_dtsec.h>
+#include <linux/string.h>
 
 #include "../common/ngpixis.h"
 #include "../common/fman.h"
diff --git a/board/freescale/corenet_ds/eth_superhydra.c b/board/freescale/corenet_ds/eth_superhydra.c
index 35daa1e80f3..296b2b10027 100644
--- a/board/freescale/corenet_ds/eth_superhydra.c
+++ b/board/freescale/corenet_ds/eth_superhydra.c
@@ -57,6 +57,7 @@
 #include <malloc.h>
 #include <fdt_support.h>
 #include <fsl_dtsec.h>
+#include <linux/string.h>
 
 #include "../common/ngpixis.h"
 #include "../common/fman.h"
diff --git a/board/freescale/imx8mm_evk/spl.c b/board/freescale/imx8mm_evk/spl.c
index 64bc60651d3..fbc13ad128a 100644
--- a/board/freescale/imx8mm_evk/spl.c
+++ b/board/freescale/imx8mm_evk/spl.c
@@ -19,6 +19,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/mach-imx/boot_mode.h>
 #include <asm/arch/ddr.h>
+#include <linux/string.h>
 
 #include <dm/uclass.h>
 #include <dm/device.h>
diff --git a/board/freescale/imx8mn_evk/spl.c b/board/freescale/imx8mn_evk/spl.c
index 6d5c7a5b467..9f3c5884128 100644
--- a/board/freescale/imx8mn_evk/spl.c
+++ b/board/freescale/imx8mn_evk/spl.c
@@ -20,6 +20,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/mach-imx/boot_mode.h>
 #include <asm/arch/ddr.h>
+#include <linux/string.h>
 
 #include <dm/uclass.h>
 #include <dm/device.h>
diff --git a/board/freescale/imx8mq_evk/spl.c b/board/freescale/imx8mq_evk/spl.c
index 82753585f2f..66a0be0b3df 100644
--- a/board/freescale/imx8mq_evk/spl.c
+++ b/board/freescale/imx8mq_evk/spl.c
@@ -24,6 +24,7 @@
 #include <fsl_esdhc_imx.h>
 #include <mmc.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include <power/pmic.h>
 #include <power/pfuze100_pmic.h>
 #include <spl.h>
diff --git a/board/freescale/imx8qm_mek/imx8qm_mek.c b/board/freescale/imx8qm_mek/imx8qm_mek.c
index c6772206244..7b280be8e94 100644
--- a/board/freescale/imx8qm_mek/imx8qm_mek.c
+++ b/board/freescale/imx8qm_mek/imx8qm_mek.c
@@ -18,6 +18,7 @@
 #include <asm/arch/imx8-pins.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/imx8qm_mek/spl.c b/board/freescale/imx8qm_mek/spl.c
index 944ba745c09..cdbff80e31b 100644
--- a/board/freescale/imx8qm_mek/spl.c
+++ b/board/freescale/imx8qm_mek/spl.c
@@ -17,6 +17,7 @@
 #include <dm/device-internal.h>
 #include <dm/lists.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/imx8qxp_mek/imx8qxp_mek.c b/board/freescale/imx8qxp_mek/imx8qxp_mek.c
index 7179823a223..645e9923548 100644
--- a/board/freescale/imx8qxp_mek/imx8qxp_mek.c
+++ b/board/freescale/imx8qxp_mek/imx8qxp_mek.c
@@ -21,6 +21,7 @@
 #include <asm/arch/snvs_security_sc.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/imx8qxp_mek/spl.c b/board/freescale/imx8qxp_mek/spl.c
index ae6b64ff6ea..9eb4268ce3f 100644
--- a/board/freescale/imx8qxp_mek/spl.c
+++ b/board/freescale/imx8qxp_mek/spl.c
@@ -22,6 +22,7 @@
 #include <asm/arch/imx8-pins.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/ls1012aqds/ls1012aqds.c b/board/freescale/ls1012aqds/ls1012aqds.c
index b77808ea57b..5c89385acca 100644
--- a/board/freescale/ls1012aqds/ls1012aqds.c
+++ b/board/freescale/ls1012aqds/ls1012aqds.c
@@ -29,6 +29,7 @@
 #include <spl.h>
 #include <netdev.h>
 #include <fsl_sec.h>
+#include <linux/string.h>
 #include "../common/qixis.h"
 #include "ls1012aqds_qixis.h"
 #include "ls1012aqds_pfe.h"
diff --git a/board/freescale/ls1012ardb/ls1012ardb.c b/board/freescale/ls1012ardb/ls1012ardb.c
index ed6dc9ff712..02f3ff6aa02 100644
--- a/board/freescale/ls1012ardb/ls1012ardb.c
+++ b/board/freescale/ls1012ardb/ls1012ardb.c
@@ -28,6 +28,7 @@
 #include <fsl_mmdc.h>
 #include <netdev.h>
 #include <fsl_sec.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/ls1021aiot/dcu.c b/board/freescale/ls1021aiot/dcu.c
index e4fbcbcaad3..55706549852 100644
--- a/board/freescale/ls1021aiot/dcu.c
+++ b/board/freescale/ls1021aiot/dcu.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <fsl_dcu_fb.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 #include "div64.h"
 #include "../common/dcu_sii9022a.h"
 
diff --git a/board/freescale/ls1021aiot/ls1021aiot.c b/board/freescale/ls1021aiot/ls1021aiot.c
index bfe61376042..d257f9723e3 100644
--- a/board/freescale/ls1021aiot/ls1021aiot.c
+++ b/board/freescale/ls1021aiot/ls1021aiot.c
@@ -14,6 +14,7 @@
 #include <asm/arch/ls102xa_stream_id.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include <asm/arch/ls102xa_devdis.h>
 #include <asm/arch/ls102xa_soc.h>
diff --git a/board/freescale/ls1021aqds/dcu.c b/board/freescale/ls1021aqds/dcu.c
index f66961ca590..1bfd94bb7a1 100644
--- a/board/freescale/ls1021aqds/dcu.c
+++ b/board/freescale/ls1021aqds/dcu.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <fsl_dcu_fb.h>
 #include <i2c.h>
+#include <linux/string.h>
 #include "div64.h"
 #include "../common/diu_ch7301.h"
 #include "ls1021aqds_qixis.h"
diff --git a/board/freescale/ls1021aqds/ddr.c b/board/freescale/ls1021aqds/ddr.c
index 66fe1519cc6..e63fe63e40c 100644
--- a/board/freescale/ls1021aqds/ddr.c
+++ b/board/freescale/ls1021aqds/ddr.c
@@ -12,6 +12,7 @@
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include "ddr.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/ls1021aqds/eth.c b/board/freescale/ls1021aqds/eth.c
index a9f162b974d..9cf797477b8 100644
--- a/board/freescale/ls1021aqds/eth.c
+++ b/board/freescale/ls1021aqds/eth.c
@@ -20,6 +20,7 @@
 #include <fsl_mdio.h>
 #include <tsec.h>
 #include <malloc.h>
+#include <linux/string.h>
 
 #include "../common/sgmii_riser.h"
 #include "../common/qixis.h"
diff --git a/board/freescale/ls1021aqds/ls1021aqds.c b/board/freescale/ls1021aqds/ls1021aqds.c
index 4169a0fc859..d3af462e68a 100644
--- a/board/freescale/ls1021aqds/ls1021aqds.c
+++ b/board/freescale/ls1021aqds/ls1021aqds.c
@@ -25,6 +25,7 @@
 #include <fsl_devdis.h>
 #include <fsl_validate.h>
 #include <fsl_ddr.h>
+#include <linux/string.h>
 #include "../common/sleep.h"
 #include "../common/qixis.h"
 #include "ls1021aqds_qixis.h"
diff --git a/board/freescale/ls1021atsn/ls1021atsn.c b/board/freescale/ls1021atsn/ls1021atsn.c
index c1acd3040c4..010d243754c 100644
--- a/board/freescale/ls1021atsn/ls1021atsn.c
+++ b/board/freescale/ls1021atsn/ls1021atsn.c
@@ -13,6 +13,7 @@
 #include <asm/arch/fsl_serdes.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include "../common/sleep.h"
 #include <fsl_validate.h>
 #include <fsl_immap.h>
diff --git a/board/freescale/ls1021atwr/dcu.c b/board/freescale/ls1021atwr/dcu.c
index 7bf283e3d66..b52d297bb96 100644
--- a/board/freescale/ls1021atwr/dcu.c
+++ b/board/freescale/ls1021atwr/dcu.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <fsl_dcu_fb.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 #include "div64.h"
 #include "../common/dcu_sii9022a.h"
 
diff --git a/board/freescale/ls1021atwr/ls1021atwr.c b/board/freescale/ls1021atwr/ls1021atwr.c
index 0cd38a14b83..72014b2173a 100644
--- a/board/freescale/ls1021atwr/ls1021atwr.c
+++ b/board/freescale/ls1021atwr/ls1021atwr.c
@@ -30,6 +30,7 @@
 #include <fsl_devdis.h>
 #include <spl.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include "../common/sleep.h"
 #ifdef CONFIG_U_QE
 #include <fsl_qe.h>
diff --git a/board/freescale/ls1043aqds/eth.c b/board/freescale/ls1043aqds/eth.c
index 95412df1d7b..fc4dc210f90 100644
--- a/board/freescale/ls1043aqds/eth.c
+++ b/board/freescale/ls1043aqds/eth.c
@@ -16,6 +16,7 @@
 #include <linux/libfdt.h>
 #include <malloc.h>
 #include <asm/arch/fsl_serdes.h>
+#include <linux/string.h>
 
 #include "../common/qixis.h"
 #include "../common/fman.h"
diff --git a/board/freescale/ls1043ardb/cpld.c b/board/freescale/ls1043ardb/cpld.c
index 5d2e8015a05..90faa0ba209 100644
--- a/board/freescale/ls1043ardb/cpld.c
+++ b/board/freescale/ls1043ardb/cpld.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <command.h>
 #include <asm/io.h>
+#include <linux/string.h>
 #include "cpld.h"
 
 u8 cpld_read(unsigned int reg)
diff --git a/board/freescale/ls1043ardb/ddr.c b/board/freescale/ls1043ardb/ddr.c
index 08b43ff5e4c..75346de3726 100644
--- a/board/freescale/ls1043ardb/ddr.c
+++ b/board/freescale/ls1043ardb/ddr.c
@@ -7,6 +7,7 @@
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 #include "ddr.h"
 #include <log.h>
 #include <vsprintf.h>
diff --git a/board/freescale/ls1046afrwy/eth.c b/board/freescale/ls1046afrwy/eth.c
index 06ccfe9e8ed..1b27d3e8538 100644
--- a/board/freescale/ls1046afrwy/eth.c
+++ b/board/freescale/ls1046afrwy/eth.c
@@ -11,6 +11,7 @@
 #include <fsl_dtsec.h>
 #include <fsl_mdio.h>
 #include <malloc.h>
+#include <linux/string.h>
 
 #include "../common/fman.h"
 
diff --git a/board/freescale/ls1046ardb/cpld.c b/board/freescale/ls1046ardb/cpld.c
index 548601a5ae1..252b5adaf5e 100644
--- a/board/freescale/ls1046ardb/cpld.c
+++ b/board/freescale/ls1046ardb/cpld.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <command.h>
 #include <asm/io.h>
+#include <linux/string.h>
 #include "cpld.h"
 
 u8 cpld_read(unsigned int reg)
diff --git a/board/freescale/ls1046ardb/eth.c b/board/freescale/ls1046ardb/eth.c
index 4905302d8cd..ddfee621793 100644
--- a/board/freescale/ls1046ardb/eth.c
+++ b/board/freescale/ls1046ardb/eth.c
@@ -11,6 +11,7 @@
 #include <fsl_dtsec.h>
 #include <fsl_mdio.h>
 #include <malloc.h>
+#include <linux/string.h>
 
 #include "../common/fman.h"
 
diff --git a/board/freescale/ls1088a/eth_ls1088aqds.c b/board/freescale/ls1088a/eth_ls1088aqds.c
index bf4f57e6f8a..f1cccf7d73f 100644
--- a/board/freescale/ls1088a/eth_ls1088aqds.c
+++ b/board/freescale/ls1088a/eth_ls1088aqds.c
@@ -21,6 +21,7 @@
 #include <fsl-mc/fsl_mc.h>
 #include <fsl-mc/ldpaa_wriop.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include "../common/qixis.h"
 
diff --git a/board/freescale/ls1088a/ls1088a.c b/board/freescale/ls1088a/ls1088a.c
index 41453709eac..8fcd8ef7cdd 100644
--- a/board/freescale/ls1088a/ls1088a.c
+++ b/board/freescale/ls1088a/ls1088a.c
@@ -27,6 +27,7 @@
 #include <asm/arch/fsl_serdes.h>
 #include <asm/arch/soc.h>
 #include <asm/arch-fsl-layerscape/fsl_icid.h>
+#include <linux/string.h>
 
 #include "../common/qixis.h"
 #include "ls1088a_qixis.h"
diff --git a/board/freescale/ls2080a/ddr.c b/board/freescale/ls2080a/ddr.c
index 29d7bd1c5ee..a647cc6a3f7 100644
--- a/board/freescale/ls2080a/ddr.c
+++ b/board/freescale/ls2080a/ddr.c
@@ -10,6 +10,7 @@
 #include <asm/arch/soc.h>
 #include <asm/arch/clock.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 #include "ddr.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/ls2080aqds/eth.c b/board/freescale/ls2080aqds/eth.c
index 4b7f85540dc..1b8235c9a09 100644
--- a/board/freescale/ls2080aqds/eth.c
+++ b/board/freescale/ls2080aqds/eth.c
@@ -19,6 +19,7 @@
 #include <fsl-mc/fsl_mc.h>
 #include <fsl-mc/ldpaa_wriop.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include "../common/qixis.h"
 
diff --git a/board/freescale/ls2080aqds/ls2080aqds.c b/board/freescale/ls2080aqds/ls2080aqds.c
index 3ab93388724..87d7e5312f4 100644
--- a/board/freescale/ls2080aqds/ls2080aqds.c
+++ b/board/freescale/ls2080aqds/ls2080aqds.c
@@ -24,6 +24,7 @@
 #include <fsl_sec.h>
 #include <asm/arch/ppa.h>
 #include <asm/arch-fsl-layerscape/fsl_icid.h>
+#include <linux/string.h>
 
 
 #include "../common/qixis.h"
diff --git a/board/freescale/lx2160a/eth_lx2160aqds.c b/board/freescale/lx2160a/eth_lx2160aqds.c
index 437f0bc4cf6..b069e4fb266 100644
--- a/board/freescale/lx2160a/eth_lx2160aqds.c
+++ b/board/freescale/lx2160a/eth_lx2160aqds.c
@@ -24,6 +24,7 @@
 #include <fsl-mc/fsl_mc.h>
 #include <fsl-mc/ldpaa_wriop.h>
 #include <linux/libfdt.h>
+#include <linux/string.h>
 
 #include "../common/qixis.h"
 
diff --git a/board/freescale/lx2160a/lx2160a.c b/board/freescale/lx2160a/lx2160a.c
index 1d781841c40..8d87b29cfde 100644
--- a/board/freescale/lx2160a/lx2160a.c
+++ b/board/freescale/lx2160a/lx2160a.c
@@ -30,6 +30,7 @@
 #include <asm/arch/config.h>
 #include <asm/arch/fsl_serdes.h>
 #include <asm/arch/soc.h>
+#include <linux/string.h>
 #include "../common/qixis.h"
 #include "../common/vid.h"
 #include <fsl_immap.h>
diff --git a/board/freescale/mpc8323erdb/mpc8323erdb.c b/board/freescale/mpc8323erdb/mpc8323erdb.c
index cef3216a6fe..977bd512059 100644
--- a/board/freescale/mpc8323erdb/mpc8323erdb.c
+++ b/board/freescale/mpc8323erdb/mpc8323erdb.c
@@ -22,6 +22,7 @@
 #include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
+#include <linux/string.h>
 #include <u-boot/crc.h>
 #if defined(CONFIG_PCI)
 #include <pci.h>
diff --git a/board/freescale/mpc8349itx/mpc8349itx.c b/board/freescale/mpc8349itx/mpc8349itx.c
index 5b4c290df14..356b0ea2daa 100644
--- a/board/freescale/mpc8349itx/mpc8349itx.c
+++ b/board/freescale/mpc8349itx/mpc8349itx.c
@@ -24,6 +24,7 @@
 #include <linux/libfdt.h>
 #endif
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include "../../../arch/powerpc/cpu/mpc83xx/hrcw/hrcw.h"
 #include "../../../arch/powerpc/cpu/mpc83xx/elbc/elbc.h"
diff --git a/board/freescale/mpc837xemds/mpc837xemds.c b/board/freescale/mpc837xemds/mpc837xemds.c
index 71875cf8f8e..c4233aad741 100644
--- a/board/freescale/mpc837xemds/mpc837xemds.c
+++ b/board/freescale/mpc837xemds/mpc837xemds.c
@@ -21,6 +21,7 @@
 #include <fsl_esdhc.h>
 #include <fsl_mdio.h>
 #include <phy.h>
+#include <linux/string.h>
 #include "pci.h"
 #include "../common/pq-mds-pib.h"
 
diff --git a/board/freescale/mpc837xemds/pci.c b/board/freescale/mpc837xemds/pci.c
index 188e60ac08c..3e5a64d14f0 100644
--- a/board/freescale/mpc837xemds/pci.c
+++ b/board/freescale/mpc837xemds/pci.c
@@ -15,6 +15,7 @@
 #include <asm/fsl_i2c.h>
 #include <asm/fsl_mpc83xx_serdes.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 static struct pci_region pci_regions[] = {
 	{
diff --git a/board/freescale/mpc8569mds/mpc8569mds.c b/board/freescale/mpc8569mds/mpc8569mds.c
index 1d2cffbacdf..b4b75f3642a 100644
--- a/board/freescale/mpc8569mds/mpc8569mds.c
+++ b/board/freescale/mpc8569mds/mpc8569mds.c
@@ -28,6 +28,7 @@
 #include <fdt_support.h>
 #include <fsl_esdhc.h>
 #include <phy.h>
+#include <linux/string.h>
 
 #include "bcsr.h"
 #if defined(CONFIG_PQ_MDS_PIB)
diff --git a/board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c b/board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c
index 9b96d0d33f2..3e45a3390a2 100644
--- a/board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c
+++ b/board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c
@@ -13,6 +13,7 @@
 #include <log.h>
 #include <asm/io.h>
 #include <fsl_diu_fb.h>
+#include <linux/string.h>
 #include "../common/pixis.h"
 
 #define PX_BRDCFG0_DLINK	0x10
diff --git a/board/freescale/mx51evk/mx51evk_video.c b/board/freescale/mx51evk/mx51evk_video.c
index 3715c5d738f..2aa456f1c5f 100644
--- a/board/freescale/mx51evk/mx51evk_video.c
+++ b/board/freescale/mx51evk/mx51evk_video.c
@@ -11,6 +11,7 @@
 #include <asm/arch/iomux-mx51.h>
 #include <linux/fb.h>
 #include <ipu_pixfmt.h>
+#include <linux/string.h>
 
 #define MX51EVK_LCD_3V3		IMX_GPIO_NR(4, 9)
 #define MX51EVK_LCD_5V		IMX_GPIO_NR(4, 10)
diff --git a/board/freescale/mx53loco/mx53loco_video.c b/board/freescale/mx53loco/mx53loco_video.c
index ff3fc8ce3e6..67c279adf18 100644
--- a/board/freescale/mx53loco/mx53loco_video.c
+++ b/board/freescale/mx53loco/mx53loco_video.c
@@ -11,6 +11,7 @@
 #include <asm/arch/iomux-mx53.h>
 #include <linux/fb.h>
 #include <ipu_pixfmt.h>
+#include <linux/string.h>
 
 #define MX53LOCO_LCD_POWER		IMX_GPIO_NR(3, 24)
 
diff --git a/board/freescale/mx6memcal/spl.c b/board/freescale/mx6memcal/spl.c
index c82b532f6d5..87020e3ffb1 100644
--- a/board/freescale/mx6memcal/spl.c
+++ b/board/freescale/mx6memcal/spl.c
@@ -16,6 +16,7 @@
 #include <asm/arch/mx6-pins.h>
 #include <asm/arch/sys_proto.h>
 #include <spl.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/mx6sabreauto/mx6sabreauto.c b/board/freescale/mx6sabreauto/mx6sabreauto.c
index e92ef26d0ad..f8612c82342 100644
--- a/board/freescale/mx6sabreauto/mx6sabreauto.c
+++ b/board/freescale/mx6sabreauto/mx6sabreauto.c
@@ -32,6 +32,7 @@
 #include <asm/mach-imx/video.h>
 #include <asm/arch/crm_regs.h>
 #include <pca953x.h>
+#include <linux/string.h>
 #include <power/pmic.h>
 #include <power/pfuze100_pmic.h>
 #include "../common/pfuze.h"
diff --git a/board/freescale/mx6sabresd/mx6sabresd.c b/board/freescale/mx6sabresd/mx6sabresd.c
index bc28173668e..15f5b654c1b 100644
--- a/board/freescale/mx6sabresd/mx6sabresd.c
+++ b/board/freescale/mx6sabresd/mx6sabresd.c
@@ -30,6 +30,7 @@
 #include <asm/arch/sys_proto.h>
 #include <i2c.h>
 #include <input.h>
+#include <linux/string.h>
 #include <power/pmic.h>
 #include <power/pfuze100_pmic.h>
 #include "../common/pfuze.h"
diff --git a/board/freescale/mx6slevk/mx6slevk.c b/board/freescale/mx6slevk/mx6slevk.c
index 2c90a35e2c9..24086a124f0 100644
--- a/board/freescale/mx6slevk/mx6slevk.c
+++ b/board/freescale/mx6slevk/mx6slevk.c
@@ -24,6 +24,7 @@
 #include <fsl_esdhc_imx.h>
 #include <i2c.h>
 #include <mmc.h>
+#include <linux/string.h>
 #include <power/pmic.h>
 #include <power/pfuze100_pmic.h>
 #include "../common/pfuze.h"
diff --git a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
index b916ea01029..ef2408715cf 100644
--- a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
+++ b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
@@ -27,6 +27,7 @@
 #include <linux/sizes.h>
 #include <mmc.h>
 #include <netdev.h>
+#include <linux/string.h>
 #include <power/pmic.h>
 #include <power/pfuze3000_pmic.h>
 #include "../common/pfuze.h"
diff --git a/board/freescale/p1010rdb/ddr.c b/board/freescale/p1010rdb/ddr.c
index 2625195f81b..9444a39b6e8 100644
--- a/board/freescale/p1010rdb/ddr.c
+++ b/board/freescale/p1010rdb/ddr.c
@@ -13,6 +13,7 @@
 #include <fsl_ddr_dimm_params.h>
 #include <asm/io.h>
 #include <asm/fsl_law.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/p1010rdb/p1010rdb.c b/board/freescale/p1010rdb/p1010rdb.c
index 4f87f03965c..3ffec6a02f1 100644
--- a/board/freescale/p1010rdb/p1010rdb.c
+++ b/board/freescale/p1010rdb/p1010rdb.c
@@ -29,6 +29,7 @@
 #include <asm/fsl_pci.h>
 #include <hwconfig.h>
 #include <i2c.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/p1010rdb/spl.c b/board/freescale/p1010rdb/spl.c
index 91be63c2cf4..059ce8e100f 100644
--- a/board/freescale/p1010rdb/spl.c
+++ b/board/freescale/p1010rdb/spl.c
@@ -16,6 +16,7 @@
 #include <fsl_esdhc.h>
 #include <spi_flash.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 #include "../common/spl.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/p1023rdb/ddr.c b/board/freescale/p1023rdb/ddr.c
index dc7a909e03b..9971ed544cd 100644
--- a/board/freescale/p1023rdb/ddr.c
+++ b/board/freescale/p1023rdb/ddr.c
@@ -11,6 +11,7 @@
 #include <fsl_ddr_dimm_params.h>
 #include <asm/io.h>
 #include <asm/fsl_law.h>
+#include <linux/string.h>
 
 /* CONFIG_SYS_DDR_RAW_TIMING */
 /*
diff --git a/board/freescale/p1_p2_rdb_pc/ddr.c b/board/freescale/p1_p2_rdb_pc/ddr.c
index 2346f6a0c27..2c7e5fe4c7b 100644
--- a/board/freescale/p1_p2_rdb_pc/ddr.c
+++ b/board/freescale/p1_p2_rdb_pc/ddr.c
@@ -12,6 +12,7 @@
 #include <fsl_ddr_dimm_params.h>
 #include <asm/io.h>
 #include <asm/fsl_law.h>
+#include <linux/string.h>
 
 #ifdef CONFIG_SYS_DDR_RAW_TIMING
 #if	defined(CONFIG_P1020RDB_PROTO) || \
diff --git a/board/freescale/p1_p2_rdb_pc/spl.c b/board/freescale/p1_p2_rdb_pc/spl.c
index 101c748838e..46c5d15ad18 100644
--- a/board/freescale/p1_p2_rdb_pc/spl.c
+++ b/board/freescale/p1_p2_rdb_pc/spl.c
@@ -17,6 +17,7 @@
 #include <fsl_esdhc.h>
 #include <spi_flash.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 #include "../common/spl.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/p2041rdb/cpld.c b/board/freescale/p2041rdb/cpld.c
index b042fe3bcbc..84f1b3c7710 100644
--- a/board/freescale/p2041rdb/cpld.c
+++ b/board/freescale/p2041rdb/cpld.c
@@ -14,6 +14,7 @@
 #include <common.h>
 #include <command.h>
 #include <asm/io.h>
+#include <linux/string.h>
 
 #include "cpld.h"
 
diff --git a/board/freescale/qemu-ppce500/qemu-ppce500.c b/board/freescale/qemu-ppce500/qemu-ppce500.c
index aa5774fd797..b38d03c07a3 100644
--- a/board/freescale/qemu-ppce500/qemu-ppce500.c
+++ b/board/freescale/qemu-ppce500/qemu-ppce500.c
@@ -23,6 +23,7 @@
 #include <fdtdec.h>
 #include <errno.h>
 #include <malloc.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/t102xrdb/cpld.c b/board/freescale/t102xrdb/cpld.c
index 47c3b1627e3..5dc3e54bbc3 100644
--- a/board/freescale/t102xrdb/cpld.c
+++ b/board/freescale/t102xrdb/cpld.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <command.h>
 #include <asm/io.h>
+#include <linux/string.h>
 #include "cpld.h"
 
 u8 cpld_read(unsigned int reg)
diff --git a/board/freescale/t102xrdb/ddr.c b/board/freescale/t102xrdb/ddr.c
index 818c20cf1b5..f4cdbf5b446 100644
--- a/board/freescale/t102xrdb/ddr.c
+++ b/board/freescale/t102xrdb/ddr.c
@@ -15,6 +15,7 @@
 #include <asm/fsl_law.h>
 #include <asm/mpc85xx_gpio.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/t102xrdb/spl.c b/board/freescale/t102xrdb/spl.c
index 7ed42ed246f..d8bfbd82791 100644
--- a/board/freescale/t102xrdb/spl.c
+++ b/board/freescale/t102xrdb/spl.c
@@ -15,6 +15,7 @@
 #include <fsl_esdhc.h>
 #include <spi_flash.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 #include "../common/sleep.h"
 #include "../common/spl.h"
 
diff --git a/board/freescale/t102xrdb/t102xrdb.c b/board/freescale/t102xrdb/t102xrdb.c
index 2770e104ee6..c51555a97e2 100644
--- a/board/freescale/t102xrdb/t102xrdb.c
+++ b/board/freescale/t102xrdb/t102xrdb.c
@@ -21,6 +21,7 @@
 #include <asm/fsl_serdes.h>
 #include <asm/fsl_liodn.h>
 #include <fm_eth.h>
+#include <linux/string.h>
 #include "t102xrdb.h"
 #ifdef CONFIG_TARGET_T1024RDB
 #include "cpld.h"
diff --git a/board/freescale/t104xrdb/cpld.c b/board/freescale/t104xrdb/cpld.c
index ac34095f3b6..6ab7bbdd332 100644
--- a/board/freescale/t104xrdb/cpld.c
+++ b/board/freescale/t104xrdb/cpld.c
@@ -13,6 +13,7 @@
 #include <common.h>
 #include <command.h>
 #include <asm/io.h>
+#include <linux/string.h>
 
 #include "cpld.h"
 
diff --git a/board/freescale/t104xrdb/spl.c b/board/freescale/t104xrdb/spl.c
index 033a1054ff3..2e29b3995d8 100644
--- a/board/freescale/t104xrdb/spl.c
+++ b/board/freescale/t104xrdb/spl.c
@@ -15,6 +15,7 @@
 #include <fsl_esdhc.h>
 #include <spi_flash.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 #include "../common/sleep.h"
 #include "../common/spl.h"
 
diff --git a/board/freescale/t208xqds/eth_t208xqds.c b/board/freescale/t208xqds/eth_t208xqds.c
index 5044b5695b6..e110f3babf1 100644
--- a/board/freescale/t208xqds/eth_t208xqds.c
+++ b/board/freescale/t208xqds/eth_t208xqds.c
@@ -27,6 +27,7 @@
 #include <fsl_dtsec.h>
 #include <asm/fsl_serdes.h>
 #include <hwconfig.h>
+#include <linux/string.h>
 #include "../common/qixis.h"
 #include "../common/fman.h"
 #include "t208xqds_qixis.h"
diff --git a/board/freescale/t208xqds/spl.c b/board/freescale/t208xqds/spl.c
index 6863243b3dd..4345c29c3b1 100644
--- a/board/freescale/t208xqds/spl.c
+++ b/board/freescale/t208xqds/spl.c
@@ -15,6 +15,7 @@
 #include <fsl_esdhc.h>
 #include <spi_flash.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 #include "../common/qixis.h"
 #include "t208xqds_qixis.h"
 #include "../common/spl.h"
diff --git a/board/freescale/t208xrdb/cpld.c b/board/freescale/t208xrdb/cpld.c
index b9ba62adffc..81e220ff114 100644
--- a/board/freescale/t208xrdb/cpld.c
+++ b/board/freescale/t208xrdb/cpld.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <linux/string.h>
 #include "cpld.h"
 
 u8 cpld_read(unsigned int reg)
diff --git a/board/freescale/t208xrdb/spl.c b/board/freescale/t208xrdb/spl.c
index cfa6789d2df..a9bf5fb6466 100644
--- a/board/freescale/t208xrdb/spl.c
+++ b/board/freescale/t208xrdb/spl.c
@@ -15,6 +15,7 @@
 #include <fsl_esdhc.h>
 #include <spi_flash.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 #include "../common/spl.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/t4rdb/cpld.c b/board/freescale/t4rdb/cpld.c
index d484509bc20..5bc149f4ab6 100644
--- a/board/freescale/t4rdb/cpld.c
+++ b/board/freescale/t4rdb/cpld.c
@@ -17,6 +17,7 @@
 #include <common.h>
 #include <command.h>
 #include <asm/io.h>
+#include <linux/string.h>
 
 #include "cpld.h"
 
diff --git a/board/freescale/t4rdb/spl.c b/board/freescale/t4rdb/spl.c
index 42db384a15d..79763119968 100644
--- a/board/freescale/t4rdb/spl.c
+++ b/board/freescale/t4rdb/spl.c
@@ -18,6 +18,7 @@
 #include <mmc.h>
 #include <fsl_esdhc.h>
 #include <i2c.h>
+#include <linux/string.h>
 
 #include "t4rdb.h"
 
diff --git a/board/gardena/smart-gateway-mt7688/board.c b/board/gardena/smart-gateway-mt7688/board.c
index 8a3a6e34825..0c36f53a5a7 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 <linux/delay.h>
+#include <linux/string.h>
 #include <linux/stringify.h>
 #include <u-boot/crc.h>
 #include <uuid.h>
diff --git a/board/gateworks/gw_ventana/eeprom.c b/board/gateworks/gw_ventana/eeprom.c
index a5a151d85b4..325527ceee1 100644
--- a/board/gateworks/gw_ventana/eeprom.c
+++ b/board/gateworks/gw_ventana/eeprom.c
@@ -13,6 +13,7 @@
 #include <malloc.h>
 #include <asm/bitops.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include "gsc.h"
 #include "ventana_eeprom.h"
diff --git a/board/gateworks/gw_ventana/gsc.c b/board/gateworks/gw_ventana/gsc.c
index bcb6bca3462..54ca5da4fa0 100644
--- a/board/gateworks/gw_ventana/gsc.c
+++ b/board/gateworks/gw_ventana/gsc.c
@@ -13,6 +13,7 @@
 #include <common.h>
 #include <i2c.h>
 #include <linux/ctype.h>
+#include <linux/string.h>
 
 #include "ventana_eeprom.h"
 #include "gsc.h"
diff --git a/board/gateworks/gw_ventana/gw_ventana.c b/board/gateworks/gw_ventana/gw_ventana.c
index bf4d6913067..b0cfd2e931a 100644
--- a/board/gateworks/gw_ventana/gw_ventana.c
+++ b/board/gateworks/gw_ventana/gw_ventana.c
@@ -38,6 +38,7 @@
 #include <pci.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
+#include <linux/string.h>
 #include <power/pmic.h>
 #include <power/ltc3676_pmic.h>
 #include <power/pfuze100_pmic.h>
diff --git a/board/gdsys/a38x/hre.c b/board/gdsys/a38x/hre.c
index 699241b3e62..615973894a1 100644
--- a/board/gdsys/a38x/hre.c
+++ b/board/gdsys/a38x/hre.c
@@ -11,6 +11,7 @@
 #include <i2c.h>
 #include <mmc.h>
 #include <tpm-v1.h>
+#include <linux/string.h>
 #include <u-boot/crc.h>
 #include <u-boot/sha1.h>
 #include <asm/byteorder.h>
diff --git a/board/gdsys/a38x/ihs_phys.c b/board/gdsys/a38x/ihs_phys.c
index c23d1509214..31a4aa26b50 100644
--- a/board/gdsys/a38x/ihs_phys.c
+++ b/board/gdsys/a38x/ihs_phys.c
@@ -4,6 +4,7 @@
 #include <asm-generic/gpio.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include "ihs_phys.h"
 #include "dt_helpers.h"
diff --git a/board/gdsys/a38x/keyprogram.c b/board/gdsys/a38x/keyprogram.c
index 853981aadbb..38e25e8fd24 100644
--- a/board/gdsys/a38x/keyprogram.c
+++ b/board/gdsys/a38x/keyprogram.c
@@ -11,6 +11,7 @@
 #include <malloc.h>
 #include <linux/ctype.h>
 #include <asm/unaligned.h>
+#include <linux/string.h>
 
 #include "hre.h"
 
diff --git a/board/gdsys/common/cmd_ioloop.c b/board/gdsys/common/cmd_ioloop.c
index 3ea2bec8ebd..88bf9b2aadd 100644
--- a/board/gdsys/common/cmd_ioloop.c
+++ b/board/gdsys/common/cmd_ioloop.c
@@ -9,6 +9,7 @@
 #include <console.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include <gdsys_fpga.h>
 
diff --git a/board/gdsys/common/ihs_mdio.c b/board/gdsys/common/ihs_mdio.c
index 5f1215e9e8a..3a51338d92a 100644
--- a/board/gdsys/common/ihs_mdio.c
+++ b/board/gdsys/common/ihs_mdio.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include <miiphy.h>
 #ifdef CONFIG_GDSYS_LEGACY_DRIVERS
diff --git a/board/gdsys/common/ioep-fpga.c b/board/gdsys/common/ioep-fpga.c
index 7292d7ab5a4..9c01661dc32 100644
--- a/board/gdsys/common/ioep-fpga.c
+++ b/board/gdsys/common/ioep-fpga.c
@@ -445,6 +445,7 @@ static int get_features(unsigned int fpga, struct fpga_features *features)
 }
 
 #include <linux/bitops.h>
+#include <linux/string.h>
 #endif
 
 bool ioep_fpga_has_osd(unsigned int fpga)
diff --git a/board/gdsys/common/osd.c b/board/gdsys/common/osd.c
index 679f8f30191..9fe95f02059 100644
--- a/board/gdsys/common/osd.c
+++ b/board/gdsys/common/osd.c
@@ -503,4 +503,5 @@ U_BOOT_CMD(
 	") size_y(max. " __stringify(MAX_Y_CHARS) ")\n"
 );
 
+#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 fe6249794e7..120e1efc81e 100644
--- a/board/gdsys/common/osd_cmd.c
+++ b/board/gdsys/common/osd_cmd.c
@@ -15,6 +15,7 @@
 #include <hexdump.h>
 #include <video_osd.h>
 #include <malloc.h>
+#include <linux/string.h>
 
 static int do_osd_write(struct cmd_tbl *cmdtp, int flag, int argc,
 			char *const argv[])
diff --git a/board/gdsys/mpc8308/hrcon.c b/board/gdsys/mpc8308/hrcon.c
index b5c681c2d1e..446a756fbbe 100644
--- a/board/gdsys/mpc8308/hrcon.c
+++ b/board/gdsys/mpc8308/hrcon.c
@@ -21,6 +21,7 @@
 #include <asm/io.h>
 #include <asm/fsl_serdes.h>
 #include <asm/fsl_mpc83xx_serdes.h>
+#include <linux/string.h>
 
 #include "mpc8308.h"
 
diff --git a/board/gdsys/mpc8308/strider.c b/board/gdsys/mpc8308/strider.c
index 91fec74fb03..983d2847614 100644
--- a/board/gdsys/mpc8308/strider.c
+++ b/board/gdsys/mpc8308/strider.c
@@ -21,6 +21,7 @@
 #include <asm/io.h>
 #include <asm/fsl_serdes.h>
 #include <asm/fsl_mpc83xx_serdes.h>
+#include <linux/string.h>
 
 #include "mpc8308.h"
 
diff --git a/board/gdsys/p1022/controlcenterd-id.c b/board/gdsys/p1022/controlcenterd-id.c
index 495ef8e1f83..6ec49996ab9 100644
--- a/board/gdsys/p1022/controlcenterd-id.c
+++ b/board/gdsys/p1022/controlcenterd-id.c
@@ -24,6 +24,7 @@
 #include <mmc.h>
 #include <tpm-v1.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include <u-boot/crc.h>
 #include <u-boot/sha1.h>
 #include <asm/byteorder.h>
diff --git a/board/gdsys/p1022/ddr.c b/board/gdsys/p1022/ddr.c
index eb06d224711..b2d44da4adc 100644
--- a/board/gdsys/p1022/ddr.c
+++ b/board/gdsys/p1022/ddr.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <i2c.h>
 #include <log.h>
+#include <linux/string.h>
 
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
diff --git a/board/ge/bx50v3/bx50v3.c b/board/ge/bx50v3/bx50v3.c
index be5fb0e49cc..3876b25420b 100644
--- a/board/ge/bx50v3/bx50v3.c
+++ b/board/ge/bx50v3/bx50v3.c
@@ -29,6 +29,7 @@
 #include <asm/arch/crm_regs.h>
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/string.h>
 #include <power/regulator.h>
 #include <power/da9063_pmic.h>
 #include <input.h>
diff --git a/board/ge/mx53ppd/mx53ppd.c b/board/ge/mx53ppd/mx53ppd.c
index 4de82cd5cd2..7018b29d5ac 100644
--- a/board/ge/mx53ppd/mx53ppd.c
+++ b/board/ge/mx53ppd/mx53ppd.c
@@ -28,6 +28,7 @@
 #include <mmc.h>
 #include <fsl_esdhc_imx.h>
 #include <asm/gpio.h>
+#include <linux/string.h>
 #include <power/pmic.h>
 #include <dialog_pmic.h>
 #include <fsl_pmic.h>
diff --git a/board/google/imx8mq_phanbell/spl.c b/board/google/imx8mq_phanbell/spl.c
index eec3f3d931b..fd5d745118c 100644
--- a/board/google/imx8mq_phanbell/spl.c
+++ b/board/google/imx8mq_phanbell/spl.c
@@ -24,6 +24,7 @@
 #include <fsl_esdhc_imx.h>
 #include <mmc.h>
 #include <spl.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/grinn/liteboard/board.c b/board/grinn/liteboard/board.c
index 48392c48e5c..46c7138b303 100644
--- a/board/grinn/liteboard/board.c
+++ b/board/grinn/liteboard/board.c
@@ -29,6 +29,7 @@
 #include <mmc.h>
 #include <netdev.h>
 #include <spl.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/imgtec/malta/malta.c b/board/imgtec/malta/malta.c
index c04f727961d..4a6fd785731 100644
--- a/board/imgtec/malta/malta.c
+++ b/board/imgtec/malta/malta.c
@@ -15,6 +15,7 @@
 #include <rtc.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include <asm/addrspace.h>
 #include <asm/io.h>
diff --git a/board/isee/igep00x0/igep00x0.c b/board/isee/igep00x0/igep00x0.c
index e0ca3c2588f..836a3f91957 100644
--- a/board/isee/igep00x0/igep00x0.c
+++ b/board/isee/igep00x0/igep00x0.c
@@ -27,6 +27,7 @@
 #include <jffs2/load_kernel.h>
 #include <mtd_node.h>
 #include <fdt_support.h>
+#include <linux/string.h>
 #include "igep00x0.h"
 
 static const struct ns16550_platdata igep_serial = {
diff --git a/board/k+p/kp_imx53/kp_id_rev.c b/board/k+p/kp_imx53/kp_id_rev.c
index 7103a3e0f2b..3e9315f5522 100644
--- a/board/k+p/kp_imx53/kp_id_rev.c
+++ b/board/k+p/kp_imx53/kp_id_rev.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <env.h>
 #include <i2c.h>
+#include <linux/string.h>
 #include "kp_id_rev.h"
 #include <net.h>
 
diff --git a/board/k+p/kp_imx6q_tpc/kp_imx6q_tpc_spl.c b/board/k+p/kp_imx6q_tpc/kp_imx6q_tpc_spl.c
index 103c4531a64..4bd2e8d0e87 100644
--- a/board/k+p/kp_imx6q_tpc/kp_imx6q_tpc_spl.c
+++ b/board/k+p/kp_imx6q_tpc/kp_imx6q_tpc_spl.c
@@ -18,6 +18,7 @@
 #include <errno.h>
 #include <spl.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/keymile/common/common.c b/board/keymile/common/common.c
index d85a5eac165..4f64a1805f7 100644
--- a/board/keymile/common/common.c
+++ b/board/keymile/common/common.c
@@ -19,6 +19,7 @@
 #include <asm/io.h>
 #include <linux/ctype.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #if defined(CONFIG_POST)
 #include "post.h"
diff --git a/board/keymile/common/ivm.c b/board/keymile/common/ivm.c
index 60b89fe348c..ef51e81996b 100644
--- a/board/keymile/common/ivm.c
+++ b/board/keymile/common/ivm.c
@@ -8,6 +8,7 @@
 #include <cli_hush.h>
 #include <env.h>
 #include <i2c.h>
+#include <linux/string.h>
 #include "common.h"
 
 #define MAC_STR_SZ	20
diff --git a/board/kosagi/novena/novena.c b/board/kosagi/novena/novena.c
index 815ecf55c4d..383d3705734 100644
--- a/board/kosagi/novena/novena.c
+++ b/board/kosagi/novena/novena.c
@@ -39,6 +39,7 @@
 #include <malloc.h>
 #include <mmc.h>
 #include <netdev.h>
+#include <linux/string.h>
 #include <power/pmic.h>
 #include <power/pfuze100_pmic.h>
 #include <stdio_dev.h>
diff --git a/board/laird/wb50n/wb50n.c b/board/laird/wb50n/wb50n.c
index 8fa989a2a4f..f1a7555ac9c 100644
--- a/board/laird/wb50n/wb50n.c
+++ b/board/laird/wb50n/wb50n.c
@@ -20,6 +20,7 @@
 #include <spl.h>
 #include <asm/arch/atmel_mpddrc.h>
 #include <asm/arch/at91_wdt.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/liebherr/display5/display5.c b/board/liebherr/display5/display5.c
index 1c8660f773a..c47f43a9164 100644
--- a/board/liebherr/display5/display5.c
+++ b/board/liebherr/display5/display5.c
@@ -27,6 +27,7 @@
 #include <netdev.h>
 #include <i2c.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include <dm.h>
 #include <dm/platform_data/serial_mxc.h>
diff --git a/board/liebherr/display5/spl.c b/board/liebherr/display5/spl.c
index b8658c8d617..a48eba58f9d 100644
--- a/board/liebherr/display5/spl.c
+++ b/board/liebherr/display5/spl.c
@@ -19,6 +19,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/mx6-ddr.h>
 #include <asm/arch/mx6-pins.h>
+#include <linux/string.h>
 #include "asm/arch/crm_regs.h"
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/liebherr/mccmon6/spl.c b/board/liebherr/mccmon6/spl.c
index 56eae3b4e9e..1153a7e19f8 100644
--- a/board/liebherr/mccmon6/spl.c
+++ b/board/liebherr/mccmon6/spl.c
@@ -23,6 +23,7 @@
 #include <serial.h>
 #include <spl.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include <asm/arch/mx6-ddr.h>
 /*
diff --git a/board/mediatek/mt7623/mt7623_rfb.c b/board/mediatek/mt7623/mt7623_rfb.c
index 755e879085c..090270b20d1 100644
--- a/board/mediatek/mt7623/mt7623_rfb.c
+++ b/board/mediatek/mt7623/mt7623_rfb.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <mmc.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/menlo/m53menlo/m53menlo.c b/board/menlo/m53menlo/m53menlo.c
index c34baca602c..eee12ccdc68 100644
--- a/board/menlo/m53menlo/m53menlo.c
+++ b/board/menlo/m53menlo/m53menlo.c
@@ -34,6 +34,7 @@
 #include <netdev.h>
 #include <spl.h>
 #include <splash.h>
+#include <linux/string.h>
 #include <usb/ehci-ci.h>
 #include <video_console.h>
 
diff --git a/board/mscc/jr2/jr2.c b/board/mscc/jr2/jr2.c
index 1cd720c7d84..2aca78ac794 100644
--- a/board/mscc/jr2/jr2.c
+++ b/board/mscc/jr2/jr2.c
@@ -12,6 +12,7 @@
 #include <miiphy.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 enum {
 	BOARD_TYPE_PCB110 = 0xAABBCE00,
diff --git a/board/mscc/luton/luton.c b/board/mscc/luton/luton.c
index 038902d08a9..ebb9060f3d7 100644
--- a/board/mscc/luton/luton.c
+++ b/board/mscc/luton/luton.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <led.h>
 #include <miiphy.h>
+#include <linux/string.h>
 
 enum {
 	BOARD_TYPE_PCB090 = 0xAABBCD00,
diff --git a/board/mscc/ocelot/ocelot.c b/board/mscc/ocelot/ocelot.c
index 51e1aeccf57..d26b93f12bd 100644
--- a/board/mscc/ocelot/ocelot.c
+++ b/board/mscc/ocelot/ocelot.c
@@ -17,6 +17,7 @@
 #include <miiphy.h>
 #include <linux/bitops.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/mscc/serval/serval.c b/board/mscc/serval/serval.c
index 94c1c42b79b..0da835828f8 100644
--- a/board/mscc/serval/serval.c
+++ b/board/mscc/serval/serval.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <led.h>
 #include <miiphy.h>
+#include <linux/string.h>
 
 enum {
 	BOARD_TYPE_PCB106 = 0xAABBCD00,
diff --git a/board/mscc/servalt/servalt.c b/board/mscc/servalt/servalt.c
index 2fb48b74e8f..818863a5df5 100644
--- a/board/mscc/servalt/servalt.c
+++ b/board/mscc/servalt/servalt.c
@@ -9,6 +9,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <led.h>
+#include <linux/string.h>
 
 enum {
 	BOARD_TYPE_PCB116 = 0xAABBCE00,
diff --git a/board/nokia/rx51/rx51.c b/board/nokia/rx51/rx51.c
index 5cf6a54dc60..20d82447b01 100644
--- a/board/nokia/rx51/rx51.c
+++ b/board/nokia/rx51/rx51.c
@@ -38,6 +38,7 @@
 #include <asm/arch/mux.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/mmc_host_def.h>
+#include <linux/string.h>
 
 #include "rx51.h"
 #include "tag_omap.h"
diff --git a/board/nvidia/p2371-2180/p2371-2180.c b/board/nvidia/p2371-2180/p2371-2180.c
index 7423a97ad0e..0f4796b559b 100644
--- a/board/nvidia/p2371-2180/p2371-2180.c
+++ b/board/nvidia/p2371-2180/p2371-2180.c
@@ -15,6 +15,7 @@
 #include <asm/arch/gpio.h>
 #include <asm/arch/pinmux.h>
 #include <asm/arch-tegra/cboot.h>
+#include <linux/string.h>
 #include "../p2571/max77620_init.h"
 
 void pin_mux_mmc(void)
diff --git a/board/nvidia/p2771-0000/p2771-0000.c b/board/nvidia/p2771-0000/p2771-0000.c
index 508c4d27b7f..e96edcc1c91 100644
--- a/board/nvidia/p2771-0000/p2771-0000.c
+++ b/board/nvidia/p2771-0000/p2771-0000.c
@@ -11,6 +11,7 @@
 #include <net.h>
 #include <linux/libfdt.h>
 #include <asm/arch-tegra/cboot.h>
+#include <linux/string.h>
 #include "../p2571/max77620_init.h"
 
 void pin_mux_mmc(void)
diff --git a/board/nvidia/p3450-0000/p3450-0000.c b/board/nvidia/p3450-0000/p3450-0000.c
index e6b66966c1b..2a16b1e3b46 100644
--- a/board/nvidia/p3450-0000/p3450-0000.c
+++ b/board/nvidia/p3450-0000/p3450-0000.c
@@ -14,6 +14,7 @@
 #include <asm/arch-tegra/cboot.h>
 #include <asm/arch/gpio.h>
 #include <asm/arch/pinmux.h>
+#include <linux/string.h>
 #include "../p2571/max77620_init.h"
 
 void pin_mux_mmc(void)
diff --git a/board/phytec/pcm058/pcm058.c b/board/phytec/pcm058/pcm058.c
index 5e5b129ef1f..a2304b764d6 100644
--- a/board/phytec/pcm058/pcm058.c
+++ b/board/phytec/pcm058/pcm058.c
@@ -18,6 +18,7 @@
 #include <asm/mach-imx/boot_mode.h>
 #include <asm/arch/sys_proto.h>
 #include <dm.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/phytec/pfla02/pfla02.c b/board/phytec/pfla02/pfla02.c
index 076ce6711ef..996fcedfa2c 100644
--- a/board/phytec/pfla02/pfla02.c
+++ b/board/phytec/pfla02/pfla02.c
@@ -32,6 +32,7 @@
 #include <netdev.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/sections.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/qualcomm/dragonboard410c/dragonboard410c.c b/board/qualcomm/dragonboard410c/dragonboard410c.c
index 646013cfc93..1aa67f96d3d 100644
--- a/board/qualcomm/dragonboard410c/dragonboard410c.c
+++ b/board/qualcomm/dragonboard410c/dragonboard410c.c
@@ -19,6 +19,7 @@
 #include <asm/arch/dram.h>
 #include <asm/arch/misc.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/renesas/salvator-x/salvator-x.c b/board/renesas/salvator-x/salvator-x.c
index 1d0cab8914f..30596822299 100644
--- a/board/renesas/salvator-x/salvator-x.c
+++ b/board/renesas/salvator-x/salvator-x.c
@@ -29,6 +29,7 @@
 #include <asm/arch/sh_sdhi.h>
 #include <i2c.h>
 #include <mmc.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/renesas/sh7752evb/sh7752evb.c b/board/renesas/sh7752evb/sh7752evb.c
index 522b4bd610d..07c51e7147e 100644
--- a/board/renesas/sh7752evb/sh7752evb.c
+++ b/board/renesas/sh7752evb/sh7752evb.c
@@ -16,6 +16,7 @@
 #include <spi.h>
 #include <spi_flash.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 int checkboard(void)
 {
diff --git a/board/renesas/sh7753evb/sh7753evb.c b/board/renesas/sh7753evb/sh7753evb.c
index f34dec1dfab..8f6f2eee904 100644
--- a/board/renesas/sh7753evb/sh7753evb.c
+++ b/board/renesas/sh7753evb/sh7753evb.c
@@ -16,6 +16,7 @@
 #include <spi.h>
 #include <spi_flash.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 int checkboard(void)
 {
diff --git a/board/renesas/sh7757lcr/sh7757lcr.c b/board/renesas/sh7757lcr/sh7757lcr.c
index e933e3e7306..a81bdbf9cdc 100644
--- a/board/renesas/sh7757lcr/sh7757lcr.c
+++ b/board/renesas/sh7757lcr/sh7757lcr.c
@@ -15,6 +15,7 @@
 #include <asm/mmc.h>
 #include <spi.h>
 #include <spi_flash.h>
+#include <linux/string.h>
 
 int checkboard(void)
 {
diff --git a/board/renesas/stout/cpld.c b/board/renesas/stout/cpld.c
index b56ed1703f5..e6e0a3a3e3d 100644
--- a/board/renesas/stout/cpld.c
+++ b/board/renesas/stout/cpld.c
@@ -12,6 +12,7 @@
 #include <cpu_func.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
+#include <linux/string.h>
 #include "cpld.h"
 
 #define SCLK			(92 + 24)
diff --git a/board/renesas/ulcb/cpld.c b/board/renesas/ulcb/cpld.c
index a20a34a92a8..c9579a9dd17 100644
--- a/board/renesas/ulcb/cpld.c
+++ b/board/renesas/ulcb/cpld.c
@@ -14,6 +14,7 @@
 #include <errno.h>
 #include <linux/err.h>
 #include <sysreset.h>
+#include <linux/string.h>
 
 #define CPLD_ADDR_MODE		0x00 /* RW */
 #define CPLD_ADDR_MUX		0x02 /* RW */
diff --git a/board/renesas/ulcb/ulcb.c b/board/renesas/ulcb/ulcb.c
index 66aff8e1108..09711559aef 100644
--- a/board/renesas/ulcb/ulcb.c
+++ b/board/renesas/ulcb/ulcb.c
@@ -27,6 +27,7 @@
 #include <asm/arch/sh_sdhi.h>
 #include <i2c.h>
 #include <mmc.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/samsung/common/gadget.c b/board/samsung/common/gadget.c
index 6d783e61e0d..da6fbb9b358 100644
--- a/board/samsung/common/gadget.c
+++ b/board/samsung/common/gadget.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <linux/string.h>
 #include <linux/usb/ch9.h>
 
 int g_dnl_bind_fixup(struct usb_device_descriptor *dev, const char *name)
diff --git a/board/samsung/origen/tools/mkorigenspl.c b/board/samsung/origen/tools/mkorigenspl.c
index f4be8672450..8f13d26db33 100644
--- a/board/samsung/origen/tools/mkorigenspl.c
+++ b/board/samsung/origen/tools/mkorigenspl.c
@@ -9,6 +9,7 @@
 #include <fcntl.h>
 #include <errno.h>
 #include <string.h>
+#include <linux/string.h>
 #include <sys/stat.h>
 
 #define BUFSIZE			(16*1024)
diff --git a/board/samsung/smdkv310/tools/mksmdkv310spl.c b/board/samsung/smdkv310/tools/mksmdkv310spl.c
index 378b85d7229..e76c9412f7b 100644
--- a/board/samsung/smdkv310/tools/mksmdkv310spl.c
+++ b/board/samsung/smdkv310/tools/mksmdkv310spl.c
@@ -9,6 +9,7 @@
 #include <fcntl.h>
 #include <errno.h>
 #include <string.h>
+#include <linux/string.h>
 #include <sys/stat.h>
 
 #define CHECKSUM_OFFSET		(14*1024-4)
diff --git a/board/sandisk/sansa_fuze_plus/spl_boot.c b/board/sandisk/sansa_fuze_plus/spl_boot.c
index 633c77408dd..37f866ccdc3 100644
--- a/board/sandisk/sansa_fuze_plus/spl_boot.c
+++ b/board/sandisk/sansa_fuze_plus/spl_boot.c
@@ -11,6 +11,7 @@
 #include <asm/arch/iomux-mx23.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/string.h>
 
 #define	MUX_CONFIG_EMI	(MXS_PAD_1V8 | MXS_PAD_12MA | MXS_PAD_PULLUP)
 #define	MUX_CONFIG_SSP	(MXS_PAD_3V3 | MXS_PAD_4MA | MXS_PAD_PULLUP)
diff --git a/board/sbc8548/ddr.c b/board/sbc8548/ddr.c
index 61bc77c418a..c3239fd1e1a 100644
--- a/board/sbc8548/ddr.c
+++ b/board/sbc8548/ddr.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <i2c.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
diff --git a/board/siemens/capricorn/board.c b/board/siemens/capricorn/board.c
index 56973a10908..6f34bd73f0d 100644
--- a/board/siemens/capricorn/board.c
+++ b/board/siemens/capricorn/board.c
@@ -28,6 +28,7 @@
 #include <asm/arch-imx8/clock.h>
 #endif
 #include <linux/delay.h>
+#include <linux/string.h>
 #include "../common/factoryset.h"
 
 #define GPIO_PAD_CTRL \
diff --git a/board/siemens/capricorn/spl.c b/board/siemens/capricorn/spl.c
index 8e077d73aef..da893629172 100644
--- a/board/siemens/capricorn/spl.c
+++ b/board/siemens/capricorn/spl.c
@@ -14,6 +14,7 @@
 #include <dm/device.h>
 #include <dm/uclass-internal.h>
 #include <dm/device-internal.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/siemens/common/board.c b/board/siemens/common/board.c
index 1bdf404ac3e..19f27f6805a 100644
--- a/board/siemens/common/board.c
+++ b/board/siemens/common/board.c
@@ -34,6 +34,7 @@
 #include <cpsw.h>
 #include <watchdog.h>
 #include <asm/mach-types.h>
+#include <linux/string.h>
 #include "../common/factoryset.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/siemens/common/factoryset.c b/board/siemens/common/factoryset.c
index 2e3ae1a54da..5ceb0871fa0 100644
--- a/board/siemens/common/factoryset.c
+++ b/board/siemens/common/factoryset.c
@@ -22,6 +22,7 @@
 #include <net.h>
 #include <errno.h>
 #include <g_dnl.h>
+#include <linux/string.h>
 #include "factoryset.h"
 
 #define EEPR_PG_SZ		0x80
diff --git a/board/siemens/pxm2/board.c b/board/siemens/pxm2/board.c
index b5e9b4242cd..7f36848b265 100644
--- a/board/siemens/pxm2/board.c
+++ b/board/siemens/pxm2/board.c
@@ -28,6 +28,7 @@
 #include <asm/arch/gpio.h>
 #include <asm/arch/mmc_host_def.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/string.h>
 #include "../../../drivers/video/da8xx-fb.h"
 #include <asm/io.h>
 #include <asm/emif.h>
diff --git a/board/siemens/rut/board.c b/board/siemens/rut/board.c
index e0f232d3b80..22d8c40a53b 100644
--- a/board/siemens/rut/board.c
+++ b/board/siemens/rut/board.c
@@ -35,6 +35,7 @@
 #include <video.h>
 #include <watchdog.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include "board.h"
 #include "../common/factoryset.h"
 #include "../../../drivers/video/da8xx-fb.h"
diff --git a/board/sks-kinkel/sksimx6/sksimx6.c b/board/sks-kinkel/sksimx6/sksimx6.c
index cec3ade96cf..bfe4634fdd7 100644
--- a/board/sks-kinkel/sksimx6/sksimx6.c
+++ b/board/sks-kinkel/sksimx6/sksimx6.c
@@ -26,6 +26,7 @@
 #include <netdev.h>
 #include <miiphy.h>
 #include <micrel.h>
+#include <linux/string.h>
 
 #include <common.h>
 #include <malloc.h>
diff --git a/board/softing/vining_2000/vining_2000.c b/board/softing/vining_2000/vining_2000.c
index aaeeee361e5..1c5863714c6 100644
--- a/board/softing/vining_2000/vining_2000.c
+++ b/board/softing/vining_2000/vining_2000.c
@@ -29,6 +29,7 @@
 #include <i2c.h>
 #include <miiphy.h>
 #include <netdev.h>
+#include <linux/string.h>
 #include <power/pmic.h>
 #include <power/pfuze100_pmic.h>
 #include <usb.h>
diff --git a/board/softing/vining_fpga/socfpga.c b/board/softing/vining_fpga/socfpga.c
index aaedf034504..34ce6a13003 100644
--- a/board/softing/vining_fpga/socfpga.c
+++ b/board/softing/vining_fpga/socfpga.c
@@ -15,6 +15,7 @@
 #include <asm/gpio.h>
 #include <i2c.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/solidrun/clearfog/clearfog.c b/board/solidrun/clearfog/clearfog.c
index 3a2f8b81788..a4d60e1540c 100644
--- a/board/solidrun/clearfog/clearfog.c
+++ b/board/solidrun/clearfog/clearfog.c
@@ -16,6 +16,7 @@
 #include <asm/arch/soc.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include "../common/tlv_data.h"
 
 #include "../drivers/ddr/marvell/a38x/ddr3_init.h"
diff --git a/board/solidrun/common/tlv_data.c b/board/solidrun/common/tlv_data.c
index 11d6e4a1380..1daf14812ef 100644
--- a/board/solidrun/common/tlv_data.c
+++ b/board/solidrun/common/tlv_data.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <compiler.h>
 #include <tlv_eeprom.h>
+#include <linux/string.h>
 #include "tlv_data.h"
 
 #define SR_TLV_CODE_RAM_SIZE	0x81
diff --git a/board/solidrun/mx6cuboxi/mx6cuboxi.c b/board/solidrun/mx6cuboxi/mx6cuboxi.c
index 3eadc38f6fd..e56e32e8c84 100644
--- a/board/solidrun/mx6cuboxi/mx6cuboxi.c
+++ b/board/solidrun/mx6cuboxi/mx6cuboxi.c
@@ -38,6 +38,7 @@
 #include <asm/arch/sys_proto.h>
 #include <spl.h>
 #include <usb.h>
+#include <linux/string.h>
 #include <usb/ehci-ci.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/st/common/stm32mp_dfu.c b/board/st/common/stm32mp_dfu.c
index 8e74030d280..95d63aaf54f 100644
--- a/board/st/common/stm32mp_dfu.c
+++ b/board/st/common/stm32mp_dfu.c
@@ -13,6 +13,7 @@
 #include <mtd_node.h>
 #include <asm/arch/stm32prog.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #define DFU_ALT_BUF_LEN SZ_1K
 
diff --git a/board/st/common/stm32mp_mtdparts.c b/board/st/common/stm32mp_mtdparts.c
index 7151cad6d0f..b7dfd4cb741 100644
--- a/board/st/common/stm32mp_mtdparts.c
+++ b/board/st/common/stm32mp_mtdparts.c
@@ -15,6 +15,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/global_data.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #define MTDPARTS_LEN		256
 #define MTDIDS_LEN		128
diff --git a/board/st/stm32mp1/stm32mp1.c b/board/st/stm32mp1/stm32mp1.c
index ed3b35195ec..68c3111f518 100644
--- a/board/st/stm32mp1/stm32mp1.c
+++ b/board/st/stm32mp1/stm32mp1.c
@@ -40,6 +40,7 @@
 #include <linux/err.h>
 #include <linux/iopoll.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include <power/regulator.h>
 #include <usb/dwc2_udc.h>
 
diff --git a/board/sunxi/board.c b/board/sunxi/board.c
index 7812860042f..193ec8cff57 100644
--- a/board/sunxi/board.c
+++ b/board/sunxi/board.c
@@ -31,6 +31,7 @@
 #include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include <u-boot/crc.h>
 #ifndef CONFIG_ARM64
 #include <asm/armv7.h>
diff --git a/board/synopsys/emsdp/emsdp.c b/board/synopsys/emsdp/emsdp.c
index 997120ec5e1..a2eaf36ef13 100644
--- a/board/synopsys/emsdp/emsdp.c
+++ b/board/synopsys/emsdp/emsdp.c
@@ -11,6 +11,7 @@
 #include <malloc.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
+#include <linux/string.h>
 
 #include <asm/arcregs.h>
 
diff --git a/board/synopsys/hsdk/hsdk.c b/board/synopsys/hsdk/hsdk.c
index 892b94bb083..8644a41fe0b 100644
--- a/board/synopsys/hsdk/hsdk.c
+++ b/board/synopsys/hsdk/hsdk.c
@@ -25,6 +25,7 @@
 #include <dwmmc.h>
 #include <malloc.h>
 #include <usb.h>
+#include <linux/string.h>
 
 #include "clk-lib.h"
 #include "env-lib.h"
diff --git a/board/syteco/zmx25/zmx25.c b/board/syteco/zmx25/zmx25.c
index 2d4c5cce892..a3e5efad7c6 100644
--- a/board/syteco/zmx25/zmx25.c
+++ b/board/syteco/zmx25/zmx25.c
@@ -23,6 +23,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux-mx25.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/technexion/pico-imx6/spl.c b/board/technexion/pico-imx6/spl.c
index 3b36bb8df13..7b6cdd6c3b1 100644
--- a/board/technexion/pico-imx6/spl.c
+++ b/board/technexion/pico-imx6/spl.c
@@ -24,6 +24,7 @@
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
 #include <spl.h>
+#include <linux/string.h>
 
 #if defined(CONFIG_SPL_BUILD)
 #include <asm/arch/mx6-ddr.h>
diff --git a/board/technexion/pico-imx6ul/spl.c b/board/technexion/pico-imx6ul/spl.c
index 38077795442..faee99e8d29 100644
--- a/board/technexion/pico-imx6ul/spl.c
+++ b/board/technexion/pico-imx6ul/spl.c
@@ -17,6 +17,7 @@
 #include <fsl_esdhc_imx.h>
 #include <linux/libfdt.h>
 #include <spl.h>
+#include <linux/string.h>
 
 #if defined(CONFIG_SPL_BUILD)
 
diff --git a/board/technexion/pico-imx7d/spl.c b/board/technexion/pico-imx7d/spl.c
index bed0f21f44d..ccb094f1884 100644
--- a/board/technexion/pico-imx7d/spl.c
+++ b/board/technexion/pico-imx7d/spl.c
@@ -18,6 +18,7 @@
 #include <asm/gpio.h>
 #include <fsl_esdhc_imx.h>
 #include <spl.h>
+#include <linux/string.h>
 
 #if defined(CONFIG_SPL_BUILD)
 
diff --git a/board/technexion/pico-imx8mq/spl.c b/board/technexion/pico-imx8mq/spl.c
index 8b853a914e8..b434e1e16f2 100644
--- a/board/technexion/pico-imx8mq/spl.c
+++ b/board/technexion/pico-imx8mq/spl.c
@@ -21,6 +21,7 @@
 #include <fsl_esdhc_imx.h>
 #include <mmc.h>
 #include <spl.h>
+#include <linux/string.h>
 
 #include "lpddr4_timing.h"
 
diff --git a/board/theadorable/fpga.c b/board/theadorable/fpga.c
index 3a33e15eacc..4cfc4bbf0ac 100644
--- a/board/theadorable/fpga.c
+++ b/board/theadorable/fpga.c
@@ -13,6 +13,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
 #include <asm/arch-mvebu/spi.h>
+#include <linux/string.h>
 #include "theadorable.h"
 
 /*
diff --git a/board/theobroma-systems/puma_rk3399/puma-rk3399.c b/board/theobroma-systems/puma_rk3399/puma-rk3399.c
index deeba3084a8..715dcbdc7bc 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 <linux/string.h>
 #include <u-boot/crc.h>
 #include <usb.h>
 #include <dm/pinctrl.h>
diff --git a/board/ti/am335x/board.c b/board/ti/am335x/board.c
index 211a9bf7446..be474a8472c 100644
--- a/board/ti/am335x/board.c
+++ b/board/ti/am335x/board.c
@@ -39,6 +39,7 @@
 #include <cpsw.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include <power/tps65217.h>
 #include <power/tps65910.h>
 #include <env_internal.h>
diff --git a/board/ti/am335x/board.h b/board/ti/am335x/board.h
index 48df914af96..b8ceddb20b1 100644
--- a/board/ti/am335x/board.h
+++ b/board/ti/am335x/board.h
@@ -20,6 +20,7 @@
  * REG_COS_COUNT_2 do not have any effect on current versions of
  * AM335x.
  */
+#include <linux/string.h>
 #define EMIF_OCP_CONFIG_BEAGLEBONE_BLACK       0x00141414
 #define EMIF_OCP_CONFIG_AM335X_EVM             0x003d3d3d
 
diff --git a/board/ti/am43xx/board.c b/board/ti/am43xx/board.c
index 8f5bf3581f4..ba479672c66 100644
--- a/board/ti/am43xx/board.c
+++ b/board/ti/am43xx/board.c
@@ -28,6 +28,7 @@
 #include <asm/arch/gpio.h>
 #include <asm/emif.h>
 #include <asm/omap_common.h>
+#include <linux/string.h>
 #include "../common/board_detect.h"
 #include "board.h"
 #include <power/pmic.h>
diff --git a/board/ti/am43xx/board.h b/board/ti/am43xx/board.h
index 06b737445d4..e28813f4bb8 100644
--- a/board/ti/am43xx/board.h
+++ b/board/ti/am43xx/board.h
@@ -12,6 +12,7 @@
 #define _BOARD_H_
 
 #include <asm/arch/omap.h>
+#include <linux/string.h>
 
 #define DEV_ATTR_MAX_OFFSET    5
 #define DEV_ATTR_MIN_OFFSET    0
diff --git a/board/ti/am57xx/board.c b/board/ti/am57xx/board.c
index be09d719cbe..d9b28dff52b 100644
--- a/board/ti/am57xx/board.c
+++ b/board/ti/am57xx/board.c
@@ -33,6 +33,7 @@
 #include <asm/arch/gpio.h>
 #include <asm/arch/omap.h>
 #include <usb.h>
+#include <linux/string.h>
 #include <linux/usb/gadget.h>
 #include <dwc3-uboot.h>
 #include <dwc3-omap-uboot.h>
diff --git a/board/ti/am65x/evm.c b/board/ti/am65x/evm.c
index 8c29e6ae882..655789d9b9b 100644
--- a/board/ti/am65x/evm.c
+++ b/board/ti/am65x/evm.c
@@ -23,6 +23,7 @@
 #include <spl.h>
 #include <asm/arch/sys_proto.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #include "../common/board_detect.h"
 
diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c
index 888a9584919..25297b0ae0c 100644
--- a/board/ti/beagle/beagle.c
+++ b/board/ti/beagle/beagle.c
@@ -35,6 +35,7 @@
 #include <asm/mach-types.h>
 #include <asm/omap_musb.h>
 #include <linux/errno.h>
+#include <linux/string.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
 #include <linux/usb/musb.h>
diff --git a/board/ti/common/board_detect.c b/board/ti/common/board_detect.c
index 9d1bee1c255..f51bacfbbcd 100644
--- a/board/ti/common/board_detect.c
+++ b/board/ti/common/board_detect.c
@@ -20,6 +20,7 @@
 #include <errno.h>
 #include <malloc.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #include "board_detect.h"
 
diff --git a/board/ti/j721e/evm.c b/board/ti/j721e/evm.c
index 220c2e5cfb8..58ecc188831 100644
--- a/board/ti/j721e/evm.c
+++ b/board/ti/j721e/evm.c
@@ -24,6 +24,7 @@
 #include <dm.h>
 #include <dm/uclass-internal.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #include "../common/board_detect.h"
 
diff --git a/board/ti/ks2_evm/board.c b/board/ti/ks2_evm/board.c
index 9e5f08e3372..078b89073fc 100644
--- a/board/ti/ks2_evm/board.c
+++ b/board/ti/ks2_evm/board.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 #include "board.h"
 #include <env.h>
 #include <hang.h>
diff --git a/board/ti/ks2_evm/board_k2e.c b/board/ti/ks2_evm/board_k2e.c
index 39abb24e156..b5258b66e10 100644
--- a/board/ti/ks2_evm/board_k2e.c
+++ b/board/ti/ks2_evm/board_k2e.c
@@ -12,6 +12,7 @@
 #include <asm/arch/ddr3.h>
 #include <asm/arch/hardware.h>
 #include <asm/ti-common/keystone_net.h>
+#include <linux/string.h>
 
 unsigned int get_external_clk(u32 clk)
 {
diff --git a/board/ti/ks2_evm/board_k2g.c b/board/ti/ks2_evm/board_k2g.c
index a71024bcbce..b6ef7164d9f 100644
--- a/board/ti/ks2_evm/board_k2g.c
+++ b/board/ti/ks2_evm/board_k2g.c
@@ -20,6 +20,7 @@
 #include <remoteproc.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include "mux-k2g.h"
 #include "../common/board_detect.h"
 
diff --git a/board/ti/ks2_evm/board_k2hk.c b/board/ti/ks2_evm/board_k2hk.c
index 12c4649c3c4..6a9935c7ef5 100644
--- a/board/ti/ks2_evm/board_k2hk.c
+++ b/board/ti/ks2_evm/board_k2hk.c
@@ -12,6 +12,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/hardware.h>
 #include <asm/ti-common/keystone_net.h>
+#include <linux/string.h>
 
 unsigned int external_clk[ext_clk_count] = {
 	[sys_clk]	=	122880000,
diff --git a/board/ti/ks2_evm/board_k2l.c b/board/ti/ks2_evm/board_k2l.c
index f759ee36466..459530ecb9d 100644
--- a/board/ti/ks2_evm/board_k2l.c
+++ b/board/ti/ks2_evm/board_k2l.c
@@ -12,6 +12,7 @@
 #include <asm/arch/ddr3.h>
 #include <asm/arch/hardware.h>
 #include <asm/ti-common/keystone_net.h>
+#include <linux/string.h>
 
 unsigned int get_external_clk(u32 clk)
 {
diff --git a/board/ti/sdp4430/cmd_bat.c b/board/ti/sdp4430/cmd_bat.c
index 6c1e6ca393c..2b8f4bc69de 100644
--- a/board/ti/sdp4430/cmd_bat.c
+++ b/board/ti/sdp4430/cmd_bat.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <linux/string.h>
 
 #ifdef CONFIG_CMD_BAT
 #include <twl6030.h>
diff --git a/board/toradex/apalis-tk1/apalis-tk1.c b/board/toradex/apalis-tk1/apalis-tk1.c
index 349b3119370..2883f1b98c5 100644
--- a/board/toradex/apalis-tk1/apalis-tk1.c
+++ b/board/toradex/apalis-tk1/apalis-tk1.c
@@ -17,6 +17,7 @@
 #include <pci_tegra.h>
 #include <linux/delay.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include <power/as3722.h>
 #include <power/pmic.h>
 
diff --git a/board/toradex/apalis_imx6/apalis_imx6.c b/board/toradex/apalis_imx6/apalis_imx6.c
index 17f6094687b..d17f90f86fd 100644
--- a/board/toradex/apalis_imx6/apalis_imx6.c
+++ b/board/toradex/apalis_imx6/apalis_imx6.c
@@ -15,6 +15,7 @@
 #include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include <ahci.h>
 #include <asm/arch/clock.h>
diff --git a/board/toradex/colibri_imx6/colibri_imx6.c b/board/toradex/colibri_imx6/colibri_imx6.c
index 64a8406ec77..1f18552b57c 100644
--- a/board/toradex/colibri_imx6/colibri_imx6.c
+++ b/board/toradex/colibri_imx6/colibri_imx6.c
@@ -15,6 +15,7 @@
 #include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include <asm/arch/clock.h>
 #include <asm/arch/crm_regs.h>
diff --git a/board/toradex/common/tdx-cfg-block.c b/board/toradex/common/tdx-cfg-block.c
index ad0a4307a26..5c88a984b7e 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 <asm/global_data.h>
+#include <linux/string.h>
 #include "tdx-cfg-block.h"
 #include <command.h>
 #include <asm/cache.h>
diff --git a/board/toradex/common/tdx-common.c b/board/toradex/common/tdx-common.c
index 3a3cfc8821e..e19be067ce3 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 <linux/libfdt.h>
+#include <linux/string.h>
 
 #include "tdx-cfg-block.h"
 #include <asm/setup.h>
diff --git a/board/toradex/verdin-imx8mm/spl.c b/board/toradex/verdin-imx8mm/spl.c
index 588da0aeba6..5ee86dd3f89 100644
--- a/board/toradex/verdin-imx8mm/spl.c
+++ b/board/toradex/verdin-imx8mm/spl.c
@@ -22,6 +22,7 @@
 #include <dm/uclass.h>
 #include <dm/uclass-internal.h>
 #include <hang.h>
+#include <linux/string.h>
 #include <power/bd71837.h>
 #include <power/pmic.h>
 #include <spl.h>
diff --git a/board/udoo/neo/neo.c b/board/udoo/neo/neo.c
index 653ca1ca5a6..aef82e2c2df 100644
--- a/board/udoo/neo/neo.c
+++ b/board/udoo/neo/neo.c
@@ -32,6 +32,7 @@
 #include <i2c.h>
 #include <miiphy.h>
 #include <netdev.h>
+#include <linux/string.h>
 #include <power/pmic.h>
 #include <power/pfuze3000_pmic.h>
 #include <malloc.h>
diff --git a/board/variscite/dart_6ul/spl.c b/board/variscite/dart_6ul/spl.c
index 071f049caf6..725600770b7 100644
--- a/board/variscite/dart_6ul/spl.c
+++ b/board/variscite/dart_6ul/spl.c
@@ -13,6 +13,7 @@
 #include <asm/arch/mx6-pins.h>
 #include <asm/arch/crm_regs.h>
 #include <fsl_esdhc_imx.h>
+#include <linux/string.h>
 
 #define UART_PAD_CTRL  (PAD_CTL_PKE | PAD_CTL_PUE |		\
 	PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED |		\
diff --git a/board/varisys/common/sys_eeprom.c b/board/varisys/common/sys_eeprom.c
index 251d9fd73e5..facda8e5419 100644
--- a/board/varisys/common/sys_eeprom.c
+++ b/board/varisys/common/sys_eeprom.c
@@ -16,6 +16,7 @@
 #include <i2c.h>
 #include <linux/ctype.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include <u-boot/crc.h>
 
 #include "eeprom.h"
diff --git a/board/vscom/baltos/board.c b/board/vscom/baltos/board.c
index 4175d414694..ed375c58cb9 100644
--- a/board/vscom/baltos/board.c
+++ b/board/vscom/baltos/board.c
@@ -32,6 +32,7 @@
 #include <i2c.h>
 #include <miiphy.h>
 #include <cpsw.h>
+#include <linux/string.h>
 #include <power/tps65910.h>
 #include <watchdog.h>
 #include "board.h"
diff --git a/board/wandboard/wandboard.c b/board/wandboard/wandboard.c
index 53299c87010..7d3da302395 100644
--- a/board/wandboard/wandboard.c
+++ b/board/wandboard/wandboard.c
@@ -33,6 +33,7 @@
 #include <netdev.h>
 #include <phy.h>
 #include <i2c.h>
+#include <linux/string.h>
 #include <power/pmic.h>
 #include <power/pfuze100_pmic.h>
 
diff --git a/board/work-microwave/work_92105/work_92105_display.c b/board/work-microwave/work_92105/work_92105_display.c
index fecbbbdb584..eefcb8545f5 100644
--- a/board/work-microwave/work_92105/work_92105_display.c
+++ b/board/work-microwave/work_92105/work_92105_display.c
@@ -23,6 +23,7 @@
 #include <version.h>
 #include <vsprintf.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 /*
  * GPO 15 in port 3 is gpio 3*32+15 = 111
diff --git a/board/xes/common/board.c b/board/xes/common/board.c
index 053b07a0b70..b6aeee3f2ca 100644
--- a/board/xes/common/board.c
+++ b/board/xes/common/board.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <env.h>
+#include <linux/string.h>
 #include "fsl_8xxx_misc.h"
 #include <init.h>
 
diff --git a/board/xilinx/versal/board.c b/board/xilinx/versal/board.c
index 55da0df75c4..025212b223c 100644
--- a/board/xilinx/versal/board.c
+++ b/board/xilinx/versal/board.c
@@ -20,6 +20,7 @@
 #include <dm/device.h>
 #include <dm/uclass.h>
 #include <versalpl.h>
+#include <linux/string.h>
 #include "../common/board.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/xilinx/zynq/board.c b/board/xilinx/zynq/board.c
index 09e4184e172..91446fb9c39 100644
--- a/board/xilinx/zynq/board.c
+++ b/board/xilinx/zynq/board.c
@@ -18,6 +18,7 @@
 #include <zynqpl.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/string.h>
 #include "../common/board.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/xilinx/zynq/bootimg.c b/board/xilinx/zynq/bootimg.c
index 2f55078dd76..1a9d3ed3ec5 100644
--- a/board/xilinx/zynq/bootimg.c
+++ b/board/xilinx/zynq/bootimg.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/string.h>
 #include <u-boot/md5.h>
 #include <zynq_bootimg.h>
 
diff --git a/board/xilinx/zynq/cmds.c b/board/xilinx/zynq/cmds.c
index 6c697caa625..c43727ab87a 100644
--- a/board/xilinx/zynq/cmds.c
+++ b/board/xilinx/zynq/cmds.c
@@ -12,6 +12,7 @@
 #include <asm/arch/sys_proto.h>
 #include <malloc.h>
 #include <linux/bitops.h>
+#include <linux/string.h>
 #include <u-boot/md5.h>
 #include <u-boot/rsa.h>
 #include <u-boot/rsa-mod-exp.h>
diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c
index a64174a915c..3bd39d5eb47 100644
--- a/board/xilinx/zynqmp/zynqmp.c
+++ b/board/xilinx/zynqmp/zynqmp.c
@@ -35,6 +35,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/sizes.h>
+#include <linux/string.h>
 #include "../common/board.h"
 
 #include "pm_cfg_obj.h"
diff --git a/cmd/abootimg.c b/cmd/abootimg.c
index 40e8978f152..f21b77dbf6f 100644
--- a/cmd/abootimg.c
+++ b/cmd/abootimg.c
@@ -9,6 +9,7 @@
 #include <command.h>
 #include <image.h>
 #include <mapmem.h>
+#include <linux/string.h>
 
 #define abootimg_addr() \
 	(_abootimg_addr == -1 ? image_load_addr : _abootimg_addr)
diff --git a/cmd/acpi.c b/cmd/acpi.c
index 6fa61c5fb89..b009368eace 100644
--- a/cmd/acpi.c
+++ b/cmd/acpi.c
@@ -11,6 +11,7 @@
 #include <asm/acpi_table.h>
 #include <asm/global_data.h>
 #include <dm/acpi.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/cmd/adtimg.c b/cmd/adtimg.c
index aa943007f35..2d43dd147d4 100644
--- a/cmd/adtimg.c
+++ b/cmd/adtimg.c
@@ -9,6 +9,7 @@
 #include <env.h>
 #include <image-android-dt.h>
 #include <common.h>
+#include <linux/string.h>
 
 #define OPT_INDEX	"--index"
 
diff --git a/cmd/aes.c b/cmd/aes.c
index 4c0dad99326..51bc922b937 100644
--- a/cmd/aes.c
+++ b/cmd/aes.c
@@ -12,6 +12,7 @@
 #include <asm/byteorder.h>
 #include <linux/compiler.h>
 #include <mapmem.h>
+#include <linux/string.h>
 
 u32 aes_get_key_len(char *command)
 {
diff --git a/cmd/armflash.c b/cmd/armflash.c
index 5e7315eb7cd..2365f16ce4c 100644
--- a/cmd/armflash.c
+++ b/cmd/armflash.c
@@ -10,6 +10,7 @@
 #include <console.h>
 #include <flash.h>
 #include <asm/io.h>
+#include <linux/string.h>
 
 #define MAX_REGIONS 4
 #define MAX_IMAGES 32
diff --git a/cmd/avb.c b/cmd/avb.c
index 88172a9ee67..5e9db6f2385 100644
--- a/cmd/avb.c
+++ b/cmd/avb.c
@@ -11,6 +11,7 @@
 #include <image.h>
 #include <malloc.h>
 #include <mmc.h>
+#include <linux/string.h>
 
 #define AVB_BOOTARGS	"avb_bootargs"
 static struct AvbOps *avb_ops;
diff --git a/cmd/bcb.c b/cmd/bcb.c
index 81e099fbb1b..2de6a08beb9 100644
--- a/cmd/bcb.c
+++ b/cmd/bcb.c
@@ -11,6 +11,7 @@
 #include <display_options.h>
 #include <log.h>
 #include <part.h>
+#include <linux/string.h>
 
 enum bcb_cmd {
 	BCB_CMD_LOAD,
diff --git a/cmd/bdinfo.c b/cmd/bdinfo.c
index b5cc0a59c14..40079608d1a 100644
--- a/cmd/bdinfo.c
+++ b/cmd/bdinfo.c
@@ -13,6 +13,7 @@
 #include <vsprintf.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/cmd/binop.c b/cmd/binop.c
index c85cb51568d..afeffadc44f 100644
--- a/cmd/binop.c
+++ b/cmd/binop.c
@@ -7,6 +7,7 @@
 #include <malloc.h>
 #include <mapmem.h>
 #include <linux/ctype.h>
+#include <linux/string.h>
 
 enum {
 	OP_ID_XOR,
diff --git a/cmd/blk_common.c b/cmd/blk_common.c
index 87f94b5abbf..14413da3f6d 100644
--- a/cmd/blk_common.c
+++ b/cmd/blk_common.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <blk.h>
 #include <command.h>
+#include <linux/string.h>
 
 int blk_common_cmd(int argc, char *const argv[], enum if_type if_type,
 		   int *cur_devnump)
diff --git a/cmd/blob.c b/cmd/blob.c
index c80e6977b4b..a3b4f7a3286 100644
--- a/cmd/blob.c
+++ b/cmd/blob.c
@@ -9,6 +9,7 @@
 #include <malloc.h>
 #include <asm/byteorder.h>
 #include <linux/compiler.h>
+#include <linux/string.h>
 
 /**
  * blob_decap() - Decapsulate the data as a blob
diff --git a/cmd/bmp.c b/cmd/bmp.c
index 6040fa5d95d..3ecf8db5e65 100644
--- a/cmd/bmp.c
+++ b/cmd/bmp.c
@@ -21,6 +21,7 @@
 #include <splash.h>
 #include <video.h>
 #include <asm/byteorder.h>
+#include <linux/string.h>
 
 static int bmp_info (ulong addr);
 
diff --git a/cmd/bootefi.c b/cmd/bootefi.c
index 1236cbd7a53..e9f2039cb78 100644
--- a/cmd/bootefi.c
+++ b/cmd/bootefi.c
@@ -25,6 +25,7 @@
 #include <memalign.h>
 #include <asm-generic/sections.h>
 #include <linux/linkage.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/cmd/booti.c b/cmd/booti.c
index 3df70ea9caa..7df747bc575 100644
--- a/cmd/booti.c
+++ b/cmd/booti.c
@@ -15,6 +15,7 @@
 #include <asm/global_data.h>
 #include <linux/kernel.h>
 #include <linux/sizes.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 /*
diff --git a/cmd/bootm.c b/cmd/bootm.c
index 7732b97f635..599251f7181 100644
--- a/cmd/bootm.c
+++ b/cmd/bootm.c
@@ -19,6 +19,7 @@
 #include <asm/global_data.h>
 #include <linux/ctype.h>
 #include <linux/err.h>
+#include <linux/string.h>
 #include <u-boot/zlib.h>
 #include <mapmem.h>
 
diff --git a/cmd/bootstage.c b/cmd/bootstage.c
index 0e623f216b1..37615c3ffec 100644
--- a/cmd/bootstage.c
+++ b/cmd/bootstage.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <bootstage.h>
 #include <command.h>
+#include <linux/string.h>
 
 static int do_bootstage_report(struct cmd_tbl *cmdtp, int flag, int argc,
 			       char *const argv[])
diff --git a/cmd/cache.c b/cmd/cache.c
index b68d45b98bf..0ea2c6c033a 100644
--- a/cmd/cache.c
+++ b/cmd/cache.c
@@ -11,6 +11,7 @@
 #include <command.h>
 #include <cpu_func.h>
 #include <linux/compiler.h>
+#include <linux/string.h>
 
 static int parse_argv(const char *);
 
diff --git a/cmd/cros_ec.c b/cmd/cros_ec.c
index ce1f59a740c..b4059f0e7dc 100644
--- a/cmd/cros_ec.c
+++ b/cmd/cros_ec.c
@@ -14,6 +14,7 @@
 #include <log.h>
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
+#include <linux/string.h>
 
 /* Note: depends on enum ec_current_image */
 static const char * const ec_current_image_name[] = {"unknown", "RO", "RW"};
diff --git a/cmd/date.c b/cmd/date.c
index 0e118947531..8e8f54ba405 100644
--- a/cmd/date.c
+++ b/cmd/date.c
@@ -13,6 +13,7 @@
 #include <rtc.h>
 #include <i2c.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/cmd/dfu.c b/cmd/dfu.c
index 7310595a027..b19b79c57eb 100644
--- a/cmd/dfu.c
+++ b/cmd/dfu.c
@@ -18,6 +18,7 @@
 #include <g_dnl.h>
 #include <usb.h>
 #include <net.h>
+#include <linux/string.h>
 
 static int do_dfu(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 {
diff --git a/cmd/echo.c b/cmd/echo.c
index d02a4cfd586..1d85e23c218 100644
--- a/cmd/echo.c
+++ b/cmd/echo.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <linux/string.h>
 
 static int do_echo(struct cmd_tbl *cmdtp, int flag, int argc,
 		   char *const argv[])
diff --git a/cmd/eeprom.c b/cmd/eeprom.c
index 7fa62bba8fc..654004e1430 100644
--- a/cmd/eeprom.c
+++ b/cmd/eeprom.c
@@ -26,6 +26,7 @@
 #include <i2c.h>
 #include <eeprom_layout.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #ifndef	CONFIG_SYS_I2C_SPEED
 #define	CONFIG_SYS_I2C_SPEED	50000
diff --git a/cmd/efi.c b/cmd/efi.c
index 1c0e62e4a33..11531cd1b4a 100644
--- a/cmd/efi.c
+++ b/cmd/efi.c
@@ -12,6 +12,7 @@
 #include <malloc.h>
 #include <sort.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 
 static const char *const type_name[] = {
 	"reserved",
diff --git a/cmd/efidebug.c b/cmd/efidebug.c
index 58018f700cd..585dc12a237 100644
--- a/cmd/efidebug.c
+++ b/cmd/efidebug.c
@@ -16,6 +16,7 @@
 #include <mapmem.h>
 #include <search.h>
 #include <linux/ctype.h>
+#include <linux/string.h>
 
 #define BS systab.boottime
 
diff --git a/cmd/elf.c b/cmd/elf.c
index d44b95d9033..a3cb6e274f4 100644
--- a/cmd/elf.c
+++ b/cmd/elf.c
@@ -19,6 +19,7 @@
 #include <asm/e820.h>
 #include <linux/linkage.h>
 #endif
+#include <linux/string.h>
 
 /* Allow ports to override the default behavior */
 static unsigned long do_bootelf_exec(ulong (*entry)(int, char * const[]),
diff --git a/cmd/ethsw.c b/cmd/ethsw.c
index f8b8a798bf6..8e2bd3dfa57 100644
--- a/cmd/ethsw.c
+++ b/cmd/ethsw.c
@@ -12,6 +12,7 @@
 #include <env_flags.h>
 #include <ethsw.h>
 #include <net.h>
+#include <linux/string.h>
 
 static const char *ethsw_name;
 
diff --git a/cmd/fastboot.c b/cmd/fastboot.c
index 48b891b28fc..90efc85360d 100644
--- a/cmd/fastboot.c
+++ b/cmd/fastboot.c
@@ -15,6 +15,7 @@
 #include <usb.h>
 #include <watchdog.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include <linux/stringify.h>
 
 static int do_fastboot_udp(int argc, char *const argv[],
diff --git a/cmd/fdt.c b/cmd/fdt.c
index 89ab572d8df..f5f1f6b0017 100644
--- a/cmd/fdt.c
+++ b/cmd/fdt.c
@@ -12,6 +12,7 @@
 #include <env.h>
 #include <image.h>
 #include <linux/ctype.h>
+#include <linux/string.h>
 #include <linux/types.h>
 #include <asm/global_data.h>
 #include <linux/libfdt.h>
diff --git a/cmd/flash.c b/cmd/flash.c
index 240871e8089..3e7b335109d 100644
--- a/cmd/flash.c
+++ b/cmd/flash.c
@@ -11,6 +11,7 @@
 #include <command.h>
 #include <log.h>
 #include <uuid.h>
+#include <linux/string.h>
 
 #if defined(CONFIG_CMD_MTDPARTS)
 #include <jffs2/jffs2.h>
diff --git a/cmd/fpga.c b/cmd/fpga.c
index 8ae1c936fbb..3151100aa14 100644
--- a/cmd/fpga.c
+++ b/cmd/fpga.c
@@ -16,6 +16,7 @@
 #include <image.h>
 #include <log.h>
 #include <malloc.h>
+#include <linux/string.h>
 
 static long do_fpga_get_device(char *arg)
 {
diff --git a/cmd/fuse.c b/cmd/fuse.c
index e001619d172..db504349af1 100644
--- a/cmd/fuse.c
+++ b/cmd/fuse.c
@@ -13,6 +13,7 @@
 #include <console.h>
 #include <fuse.h>
 #include <linux/errno.h>
+#include <linux/string.h>
 
 static int strtou32(const char *str, unsigned int base, u32 *result)
 {
diff --git a/cmd/gpio.c b/cmd/gpio.c
index 4fdb3135fc1..e256f83ea10 100644
--- a/cmd/gpio.c
+++ b/cmd/gpio.c
@@ -14,6 +14,7 @@
 #include <malloc.h>
 #include <asm/gpio.h>
 #include <linux/err.h>
+#include <linux/string.h>
 
 __weak int name_to_gpio(const char *name)
 {
diff --git a/cmd/gpt.c b/cmd/gpt.c
index df759416c88..db70ba887b4 100644
--- a/cmd/gpt.c
+++ b/cmd/gpt.c
@@ -27,6 +27,7 @@
 #include <linux/err.h>
 #include <linux/sizes.h>
 #include <stdlib.h>
+#include <linux/string.h>
 
 static LIST_HEAD(disk_partitions);
 
diff --git a/cmd/hash.c b/cmd/hash.c
index e163cd67742..5b0d75f8662 100644
--- a/cmd/hash.c
+++ b/cmd/hash.c
@@ -13,6 +13,7 @@
 #include <command.h>
 #include <hash.h>
 #include <linux/ctype.h>
+#include <linux/string.h>
 
 static int do_hash(struct cmd_tbl *cmdtp, int flag, int argc,
 		   char *const argv[])
diff --git a/cmd/i2c.c b/cmd/i2c.c
index cc01119b210..83e4cfaa255 100644
--- a/cmd/i2c.c
+++ b/cmd/i2c.c
@@ -78,6 +78,7 @@
 #include <asm/byteorder.h>
 #include <linux/compiler.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include <u-boot/crc.h>
 
 /* Display values from last command.
diff --git a/cmd/ide.c b/cmd/ide.c
index b78c38e1590..8fefaf3f815 100644
--- a/cmd/ide.c
+++ b/cmd/ide.c
@@ -16,6 +16,7 @@
 #include <image.h>
 #include <asm/byteorder.h>
 #include <asm/io.h>
+#include <linux/string.h>
 
 #include <ide.h>
 #include <ata.h>
diff --git a/cmd/irq.c b/cmd/irq.c
index 1d3e28cb3ce..614fd942bc2 100644
--- a/cmd/irq.c
+++ b/cmd/irq.c
@@ -7,6 +7,7 @@
 #include <config.h>
 #include <command.h>
 #include <irq_func.h>
+#include <linux/string.h>
 
 static int do_interrupts(struct cmd_tbl *cmdtp, int flag, int argc,
 			 char *const argv[])
diff --git a/cmd/itest.c b/cmd/itest.c
index a0cf4bee041..4ccc4cbb8a9 100644
--- a/cmd/itest.c
+++ b/cmd/itest.c
@@ -16,6 +16,7 @@
 #include <command.h>
 #include <env.h>
 #include <mapmem.h>
+#include <linux/string.h>
 
 #include <asm/io.h>
 
diff --git a/cmd/jffs2.c b/cmd/jffs2.c
index 9540988e33e..e06ab60a77f 100644
--- a/cmd/jffs2.c
+++ b/cmd/jffs2.c
@@ -81,6 +81,7 @@
 #include <linux/list.h>
 #include <linux/ctype.h>
 #include <cramfs/cramfs_fs.h>
+#include <linux/string.h>
 
 #if defined(CONFIG_CMD_NAND)
 #include <linux/mtd/rawnand.h>
diff --git a/cmd/led.c b/cmd/led.c
index 9433fa886c2..a2b2f1b5e56 100644
--- a/cmd/led.c
+++ b/cmd/led.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <led.h>
 #include <dm/uclass-internal.h>
+#include <linux/string.h>
 
 #define LED_TOGGLE LEDST_COUNT
 
diff --git a/cmd/legacy_led.c b/cmd/legacy_led.c
index 86cd969e407..4176f089dfc 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 <linux/string.h>
 
 struct led_tbl_s {
 	char		*string;	/* String for use in the command */
diff --git a/cmd/load.c b/cmd/load.c
index 4bd463c3a7c..a651478d920 100644
--- a/cmd/load.c
+++ b/cmd/load.c
@@ -22,6 +22,7 @@
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/cmd/log.c b/cmd/log.c
index ccefb0cbb8c..f47ff5d17e9 100644
--- a/cmd/log.c
+++ b/cmd/log.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <log.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 
 static char log_fmt_chars[LOGF_COUNT] = "clFLfm";
 
diff --git a/cmd/md5sum.c b/cmd/md5sum.c
index 5ae3ddf85f8..ae2d81470d7 100644
--- a/cmd/md5sum.c
+++ b/cmd/md5sum.c
@@ -12,6 +12,7 @@
 #include <env.h>
 #include <image.h>
 #include <mapmem.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 c48bb51237c..f9b2a1caaa9 100644
--- a/cmd/mdio.c
+++ b/cmd/mdio.c
@@ -12,6 +12,7 @@
 #include <command.h>
 #include <miiphy.h>
 #include <phy.h>
+#include <linux/string.h>
 
 static char last_op[2];
 static uint last_data;
diff --git a/cmd/mem.c b/cmd/mem.c
index 5578dea97ec..41ab1bbfbb4 100644
--- a/cmd/mem.c
+++ b/cmd/mem.c
@@ -30,6 +30,7 @@
 #include <linux/compiler.h>
 #include <linux/ctype.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/cmd/mii.c b/cmd/mii.c
index b52a55dc339..3a795dbad6f 100644
--- a/cmd/mii.c
+++ b/cmd/mii.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <command.h>
 #include <miiphy.h>
+#include <linux/string.h>
 
 typedef struct _MII_field_desc_t {
 	ushort hi;
diff --git a/cmd/misc.c b/cmd/misc.c
index 36bca24fb20..8743a34cff5 100644
--- a/cmd/misc.c
+++ b/cmd/misc.c
@@ -12,6 +12,7 @@
 #include <console.h>
 #include <time.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 static int do_sleep(struct cmd_tbl *cmdtp, int flag, int argc,
 		    char *const argv[])
diff --git a/cmd/mmc.c b/cmd/mmc.c
index e3e75d0fc0e..bc7e991c86e 100644
--- a/cmd/mmc.c
+++ b/cmd/mmc.c
@@ -14,6 +14,7 @@
 #include <part.h>
 #include <sparse_format.h>
 #include <image-sparse.h>
+#include <linux/string.h>
 
 static int curr_device = -1;
 
diff --git a/cmd/mp.c b/cmd/mp.c
index c2b5235a373..a14ebbd0b56 100644
--- a/cmd/mp.c
+++ b/cmd/mp.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <command.h>
 #include <cpu_func.h>
+#include <linux/string.h>
 
 static int cpu_status_all(void)
 {
diff --git a/cmd/mtd.c b/cmd/mtd.c
index 485a963bdd0..fe1e94f6cc4 100644
--- a/cmd/mtd.c
+++ b/cmd/mtd.c
@@ -16,6 +16,7 @@
 #include <mtd.h>
 #include <dm/devres.h>
 #include <linux/err.h>
+#include <linux/string.h>
 
 #include <linux/ctype.h>
 
diff --git a/cmd/mtdparts.c b/cmd/mtdparts.c
index ed373a8c4da..077793e8857 100644
--- a/cmd/mtdparts.c
+++ b/cmd/mtdparts.c
@@ -81,6 +81,7 @@
 #include <linux/ctype.h>
 #include <linux/err.h>
 #include <linux/mtd/mtd.h>
+#include <linux/string.h>
 
 #if defined(CONFIG_CMD_NAND)
 #include <linux/mtd/rawnand.h>
diff --git a/cmd/mvebu/bubt.c b/cmd/mvebu/bubt.c
index a27b0df8ae7..5f363da7597 100644
--- a/cmd/mvebu/bubt.c
+++ b/cmd/mvebu/bubt.c
@@ -14,6 +14,7 @@
 #include <vsprintf.h>
 #include <errno.h>
 #include <dm.h>
+#include <linux/string.h>
 
 #include <spi_flash.h>
 #include <spi.h>
diff --git a/cmd/nand.c b/cmd/nand.c
index 92d039af8f5..880ee53d837 100644
--- a/cmd/nand.c
+++ b/cmd/nand.c
@@ -32,6 +32,7 @@
 #include <asm/byteorder.h>
 #include <jffs2/jffs2.h>
 #include <nand.h>
+#include <linux/string.h>
 
 #include "legacy-mtd-utils.h"
 
diff --git a/cmd/net.c b/cmd/net.c
index 9bbcdbcfe07..c505656a949 100644
--- a/cmd/net.c
+++ b/cmd/net.c
@@ -13,6 +13,7 @@
 #include <env.h>
 #include <image.h>
 #include <net.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 554596b27d7..c73472ec226 100644
--- a/cmd/nvedit.c
+++ b/cmd/nvedit.c
@@ -38,6 +38,7 @@
 #include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include <u-boot/crc.h>
 #include <watchdog.h>
 #include <linux/stddef.h>
diff --git a/cmd/nvedit_efi.c b/cmd/nvedit_efi.c
index 8e31f43e1f9..4f0148b074c 100644
--- a/cmd/nvedit_efi.c
+++ b/cmd/nvedit_efi.c
@@ -18,6 +18,7 @@
 #include <rtc.h>
 #include <uuid.h>
 #include <linux/kernel.h>
+#include <linux/string.h>
 
 /*
  * From efi_variable.c,
diff --git a/cmd/nvme.c b/cmd/nvme.c
index e715c570a38..8c025980843 100644
--- a/cmd/nvme.c
+++ b/cmd/nvme.c
@@ -9,6 +9,7 @@
 #include <command.h>
 #include <dm.h>
 #include <nvme.h>
+#include <linux/string.h>
 
 static int nvme_curr_dev;
 
diff --git a/cmd/onenand.c b/cmd/onenand.c
index fa403369faa..fa12f0dec75 100644
--- a/cmd/onenand.c
+++ b/cmd/onenand.c
@@ -13,6 +13,7 @@
 #include <command.h>
 #include <malloc.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #include <linux/compat.h>
 #include <linux/mtd/mtd.h>
diff --git a/cmd/osd.c b/cmd/osd.c
index bdad5d8e963..c1ef7eb8cda 100644
--- a/cmd/osd.c
+++ b/cmd/osd.c
@@ -15,6 +15,7 @@
 #include <hexdump.h>
 #include <video_osd.h>
 #include <malloc.h>
+#include <linux/string.h>
 
 /* Container for selected OSD device */
 static struct udevice *osd_cur;
diff --git a/cmd/part.c b/cmd/part.c
index 3395c17b892..f53edac8357 100644
--- a/cmd/part.c
+++ b/cmd/part.c
@@ -21,6 +21,7 @@
 #include <env.h>
 #include <part.h>
 #include <vsprintf.h>
+#include <linux/string.h>
 
 enum cmd_part_info {
 	CMD_PART_INFO_START = 0,
diff --git a/cmd/pci.c b/cmd/pci.c
index f91a4eb8ed0..c2d4e5d4ed6 100644
--- a/cmd/pci.c
+++ b/cmd/pci.c
@@ -22,6 +22,7 @@
 #include <asm/processor.h>
 #include <asm/io.h>
 #include <pci.h>
+#include <linux/string.h>
 
 struct pci_reg_info {
 	const char *name;
diff --git a/cmd/pinmux.c b/cmd/pinmux.c
index 9942b154196..6f8a3fd9440 100644
--- a/cmd/pinmux.c
+++ b/cmd/pinmux.c
@@ -9,6 +9,7 @@
 #include <errno.h>
 #include <dm/pinctrl.h>
 #include <dm/uclass-internal.h>
+#include <linux/string.h>
 
 #define LIMIT_DEVNAME	30
 
diff --git a/cmd/regulator.c b/cmd/regulator.c
index 0d97334a901..6e91c177537 100644
--- a/cmd/regulator.c
+++ b/cmd/regulator.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <dm/uclass-internal.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include <power/regulator.h>
 
 #define LIMIT_DEVNAME	20
diff --git a/cmd/remoteproc.c b/cmd/remoteproc.c
index e8b9178e740..7adf4553400 100644
--- a/cmd/remoteproc.c
+++ b/cmd/remoteproc.c
@@ -9,6 +9,7 @@
 #include <errno.h>
 #include <malloc.h>
 #include <remoteproc.h>
+#include <linux/string.h>
 
 /**
  * print_remoteproc_list() - print all the remote processor devices
diff --git a/cmd/rtc.c b/cmd/rtc.c
index 4ac49d228cb..b3f46f13eb4 100644
--- a/cmd/rtc.c
+++ b/cmd/rtc.c
@@ -8,6 +8,7 @@
 #include <i2c.h>
 #include <mapmem.h>
 #include <rtc.h>
+#include <linux/string.h>
 
 #define MAX_RTC_BYTES 32
 
diff --git a/cmd/sata.c b/cmd/sata.c
index aa396c1bbdf..9b19ca49b18 100644
--- a/cmd/sata.c
+++ b/cmd/sata.c
@@ -18,6 +18,7 @@
 #include <sata.h>
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
+#include <linux/string.h>
 
 static int sata_curr_device = -1;
 
diff --git a/cmd/scsi.c b/cmd/scsi.c
index 5f710d28957..61437ef21eb 100644
--- a/cmd/scsi.c
+++ b/cmd/scsi.c
@@ -11,6 +11,7 @@
 #include <blk.h>
 #include <command.h>
 #include <scsi.h>
+#include <linux/string.h>
 
 static int scsi_curr_dev; /* current device */
 
diff --git a/cmd/setexpr.c b/cmd/setexpr.c
index 770dc24d2b7..1569d7ad72d 100644
--- a/cmd/setexpr.c
+++ b/cmd/setexpr.c
@@ -14,6 +14,7 @@
 #include <env.h>
 #include <log.h>
 #include <mapmem.h>
+#include <linux/string.h>
 
 static ulong get_arg(char *s, int w)
 {
diff --git a/cmd/sf.c b/cmd/sf.c
index 249e2eee377..c74651d23b6 100644
--- a/cmd/sf.c
+++ b/cmd/sf.c
@@ -20,6 +20,7 @@
 #include <asm/cache.h>
 #include <jffs2/jffs2.h>
 #include <linux/mtd/mtd.h>
+#include <linux/string.h>
 
 #include <asm/io.h>
 #include <dm/device-internal.h>
diff --git a/cmd/sha1sum.c b/cmd/sha1sum.c
index bcc665a5a6c..677f57b62d7 100644
--- a/cmd/sha1sum.c
+++ b/cmd/sha1sum.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <command.h>
 #include <hash.h>
+#include <linux/string.h>
 #include <u-boot/sha1.h>
 
 int do_sha1sum(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
diff --git a/cmd/smccc.c b/cmd/smccc.c
index 0b19f6c68c6..101959c848a 100644
--- a/cmd/smccc.c
+++ b/cmd/smccc.c
@@ -9,6 +9,7 @@
 #include <linux/arm-smccc.h>
 #include <linux/compiler.h>
 #include <linux/psci.h>
+#include <linux/string.h>
 
 static int do_call(struct cmd_tbl *cmdtp, int flag, int argc,
 		   char *const argv[])
diff --git a/cmd/spi.c b/cmd/spi.c
index 4aea1914129..df05e828fd1 100644
--- a/cmd/spi.c
+++ b/cmd/spi.c
@@ -13,6 +13,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <spi.h>
+#include <linux/string.h>
 
 /*-----------------------------------------------------------------------
  * Definitions
diff --git a/cmd/strings.c b/cmd/strings.c
index 85fdc34f08f..bf4efa4aa3a 100644
--- a/cmd/strings.c
+++ b/cmd/strings.c
@@ -9,6 +9,7 @@
 #include <config.h>
 #include <common.h>
 #include <command.h>
+#include <linux/string.h>
 
 static char *start_addr, *last_addr;
 
diff --git a/cmd/sysboot.c b/cmd/sysboot.c
index af6a2f1b7f1..38aa2a2cdb0 100644
--- a/cmd/sysboot.c
+++ b/cmd/sysboot.c
@@ -4,6 +4,7 @@
 #include <command.h>
 #include <env.h>
 #include <fs.h>
+#include <linux/string.h>
 #include "pxe_utils.h"
 
 static char *fs_argv[5];
diff --git a/cmd/test.c b/cmd/test.c
index fa7c48fb9f1..ad69e6dd7a6 100644
--- a/cmd/test.c
+++ b/cmd/test.c
@@ -8,6 +8,7 @@
 #include <command.h>
 #include <fs.h>
 #include <log.h>
+#include <linux/string.h>
 
 #define OP_INVALID	0
 #define OP_NOT		1
diff --git a/cmd/ti/ddr3.c b/cmd/ti/ddr3.c
index 6b43a738683..f3c3e7e9fbe 100644
--- a/cmd/ti/ddr3.c
+++ b/cmd/ti/ddr3.c
@@ -15,6 +15,7 @@
 #include <common.h>
 #include <command.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/cmd/tlv_eeprom.c b/cmd/tlv_eeprom.c
index 5099cbdd95e..663beeb9f73 100644
--- a/cmd/tlv_eeprom.c
+++ b/cmd/tlv_eeprom.c
@@ -19,6 +19,7 @@
 #include <net.h>
 #include <asm/global_data.h>
 #include <linux/ctype.h>
+#include <linux/string.h>
 #include <u-boot/crc.h>
 
 #include "tlv_eeprom.h"
diff --git a/cmd/tpm-v1.c b/cmd/tpm-v1.c
index 0e2168aea67..77cd5e3bd7c 100644
--- a/cmd/tpm-v1.c
+++ b/cmd/tpm-v1.c
@@ -10,6 +10,7 @@
 #include <asm/unaligned.h>
 #include <tpm-common.h>
 #include <tpm-v1.h>
+#include <linux/string.h>
 #include "tpm-user-utils.h"
 
 static int do_tpm_startup(struct cmd_tbl *cmdtp, int flag, int argc,
diff --git a/cmd/tpm-v2.c b/cmd/tpm-v2.c
index e6742656f57..392811f1279 100644
--- a/cmd/tpm-v2.c
+++ b/cmd/tpm-v2.c
@@ -11,6 +11,7 @@
 #include <mapmem.h>
 #include <tpm-common.h>
 #include <tpm-v2.h>
+#include <linux/string.h>
 #include "tpm-user-utils.h"
 
 static int do_tpm2_startup(struct cmd_tbl *cmdtp, int flag, int argc,
diff --git a/cmd/tsi148.c b/cmd/tsi148.c
index 2eae14f87f1..cbe898475ba 100644
--- a/cmd/tsi148.c
+++ b/cmd/tsi148.c
@@ -13,6 +13,7 @@
 #include <malloc.h>
 #include <asm/io.h>
 #include <pci.h>
+#include <linux/string.h>
 
 #include <tsi148.h>
 
diff --git a/cmd/ubi.c b/cmd/ubi.c
index 171377cc66b..afd45bab943 100644
--- a/cmd/ubi.c
+++ b/cmd/ubi.c
@@ -27,6 +27,7 @@
 #include <ubi_uboot.h>
 #include <linux/errno.h>
 #include <jffs2/load_kernel.h>
+#include <linux/string.h>
 
 #undef ubi_msg
 #define ubi_msg(fmt, ...) printf("UBI: " fmt "\n", ##__VA_ARGS__)
diff --git a/cmd/ufs.c b/cmd/ufs.c
index 858cd49b597..a04d15a2441 100644
--- a/cmd/ufs.c
+++ b/cmd/ufs.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <command.h>
 #include <ufs.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 5ff47dde4fb..37437a1cddd 100644
--- a/cmd/universe.c
+++ b/cmd/universe.c
@@ -8,6 +8,7 @@
 #include <malloc.h>
 #include <asm/io.h>
 #include <pci.h>
+#include <linux/string.h>
 
 #include <universe.h>
 
diff --git a/cmd/usb.c b/cmd/usb.c
index b9ec29a8457..04205a7a52e 100644
--- a/cmd/usb.c
+++ b/cmd/usb.c
@@ -22,6 +22,7 @@
 #include <asm/unaligned.h>
 #include <part.h>
 #include <usb.h>
+#include <linux/string.h>
 
 #ifdef CONFIG_USB_STORAGE
 static int usb_stor_curr_dev = -1; /* current device */
diff --git a/cmd/usb_mass_storage.c b/cmd/usb_mass_storage.c
index 5996c852e8e..43fdb097078 100644
--- a/cmd/usb_mass_storage.c
+++ b/cmd/usb_mass_storage.c
@@ -19,6 +19,7 @@
 #include <watchdog.h>
 #include <linux/delay.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 static int ums_read_sector(struct ums *ums_dev,
 			   ulong start, lbaint_t blkcnt, void *buf)
diff --git a/cmd/virtio.c b/cmd/virtio.c
index 3dace5344f7..8f64ffa8e14 100644
--- a/cmd/virtio.c
+++ b/cmd/virtio.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <virtio_types.h>
 #include <virtio.h>
+#include <linux/string.h>
 
 static int virtio_curr_dev;
 
diff --git a/cmd/w1.c b/cmd/w1.c
index 92be1f2531d..da1ede6a439 100644
--- a/cmd/w1.c
+++ b/cmd/w1.c
@@ -9,6 +9,7 @@
 #include <w1.h>
 #include <w1-eeprom.h>
 #include <dm/device-internal.h>
+#include <linux/string.h>
 
 static int w1_bus(void)
 {
diff --git a/cmd/x86/mtrr.c b/cmd/x86/mtrr.c
index e118bba5a2a..3e46a342a05 100644
--- a/cmd/x86/mtrr.c
+++ b/cmd/x86/mtrr.c
@@ -9,6 +9,7 @@
 #include <asm/msr.h>
 #include <asm/mp.h>
 #include <asm/mtrr.h>
+#include <linux/string.h>
 
 static const char *const mtrr_type_name[MTRR_TYPE_COUNT] = {
 	"Uncacheable",
diff --git a/cmd/ximg.c b/cmd/ximg.c
index 159ba516489..c9cf4009d0d 100644
--- a/cmd/ximg.c
+++ b/cmd/ximg.c
@@ -26,6 +26,7 @@
 #include <asm/byteorder.h>
 #include <asm/cache.h>
 #include <asm/io.h>
+#include <linux/string.h>
 
 #ifndef CONFIG_SYS_XIMG_LEN
 /* use 8MByte as default max gunzip size */
diff --git a/cmd/yaffs2.c b/cmd/yaffs2.c
index f29ebcc026e..1ecb5bea8e2 100644
--- a/cmd/yaffs2.c
+++ b/cmd/yaffs2.c
@@ -14,6 +14,7 @@
  */
 
 #include <common.h>
+#include <linux/string.h>
 
 #include <config.h>
 #include <command.h>
diff --git a/cmd/zfs.c b/cmd/zfs.c
index e429ac88d73..d01835573a4 100644
--- a/cmd/zfs.c
+++ b/cmd/zfs.c
@@ -19,6 +19,7 @@
 #include <zfs_common.h>
 #include <linux/stat.h>
 #include <malloc.h>
+#include <linux/string.h>
 
 #if defined(CONFIG_CMD_USB) && defined(CONFIG_USB_STORAGE)
 #include <usb.h>
diff --git a/common/android_ab.c b/common/android_ab.c
index 4943f26d53a..794df3fde7a 100644
--- a/common/android_ab.c
+++ b/common/android_ab.c
@@ -11,6 +11,7 @@
 #include <part.h>
 #include <memalign.h>
 #include <linux/err.h>
+#include <linux/string.h>
 #include <u-boot/crc.h>
 #include <u-boot/crc.h>
 
diff --git a/common/autoboot.c b/common/autoboot.c
index 4341f5f0bb0..6db00525977 100644
--- a/common/autoboot.c
+++ b/common/autoboot.c
@@ -21,6 +21,7 @@
 #include <time.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include <u-boot/sha256.h>
 #include <bootcount.h>
 
diff --git a/common/avb_verify.c b/common/avb_verify.c
index a2b739626b5..6894f6872e9 100644
--- a/common/avb_verify.c
+++ b/common/avb_verify.c
@@ -12,6 +12,7 @@
 #include <malloc.h>
 #include <part.h>
 #include <tee.h>
+#include <linux/string.h>
 #include <tee/optee_ta_avb.h>
 
 static const unsigned char avb_root_pub[1032] = {
diff --git a/common/bloblist.c b/common/bloblist.c
index e3c2b5fa898..9abd360db8d 100644
--- a/common/bloblist.c
+++ b/common/bloblist.c
@@ -10,6 +10,7 @@
 #include <mapmem.h>
 #include <spl.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 #include <u-boot/crc.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/common/board_f.c b/common/board_f.c
index f032549fb5f..949f8774c83 100644
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -55,6 +55,7 @@
 #include <asm/sections.h>
 #include <dm/root.h>
 #include <linux/errno.h>
+#include <linux/string.h>
 
 /*
  * Pointer to initial global data area
diff --git a/common/bootm.c b/common/bootm.c
index 157b0cbc7e8..f9ff1ce78ba 100644
--- a/common/bootm.c
+++ b/common/bootm.c
@@ -23,6 +23,7 @@
 #if defined(CONFIG_CMD_USB)
 #include <usb.h>
 #endif
+#include <linux/string.h>
 #else
 #include "mkimage.h"
 #endif
diff --git a/common/bootm_os.c b/common/bootm_os.c
index 0b6325db660..295c6b8c064 100644
--- a/common/bootm_os.c
+++ b/common/bootm_os.c
@@ -19,6 +19,7 @@
 #include <malloc.h>
 #include <mapmem.h>
 #include <vxworks.h>
+#include <linux/string.h>
 #include <tee/optee.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/common/bootstage.c b/common/bootstage.c
index d5b78b9f487..6eb83767949 100644
--- a/common/bootstage.c
+++ b/common/bootstage.c
@@ -19,6 +19,7 @@
 #include <asm/global_data.h>
 #include <linux/compiler.h>
 #include <linux/libfdt.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/common/bouncebuf.c b/common/bouncebuf.c
index 6d98920de66..bcca7838bcc 100644
--- a/common/bouncebuf.c
+++ b/common/bouncebuf.c
@@ -12,6 +12,7 @@
 #include <errno.h>
 #include <bouncebuf.h>
 #include <asm/cache.h>
+#include <linux/string.h>
 
 static int addr_aligned(struct bounce_buffer *state)
 {
diff --git a/common/cli.c b/common/cli.c
index 048eacb9ef9..4fc4c206e4d 100644
--- a/common/cli.c
+++ b/common/cli.c
@@ -19,6 +19,7 @@
 #include <hang.h>
 #include <malloc.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/common/cli_hush.c b/common/cli_hush.c
index 3fbe918ebad..f077707f9f7 100644
--- a/common/cli_hush.c
+++ b/common/cli_hush.c
@@ -88,6 +88,7 @@
 #define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #endif
 #include <asm/global_data.h>
+#include <linux/string.h>
 #endif
 #ifndef __U_BOOT__
 #include <ctype.h>     /* isalpha, isdigit */
diff --git a/common/cli_readline.c b/common/cli_readline.c
index c89bb136b86..927c5066a9e 100644
--- a/common/cli_readline.c
+++ b/common/cli_readline.c
@@ -15,6 +15,7 @@
 #include <time.h>
 #include <watchdog.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/common/cli_simple.c b/common/cli_simple.c
index 7d91316a0fb..b7f21bbbe75 100644
--- a/common/cli_simple.c
+++ b/common/cli_simple.c
@@ -16,6 +16,7 @@
 #include <env.h>
 #include <log.h>
 #include <linux/ctype.h>
+#include <linux/string.h>
 
 #define DEBUG_PARSER	0	/* set to 1 to debug */
 
diff --git a/common/command.c b/common/command.c
index 5cadf732e96..3bc2038f97f 100644
--- a/common/command.c
+++ b/common/command.c
@@ -17,6 +17,7 @@
 #include <time.h>
 #include <asm/global_data.h>
 #include <linux/ctype.h>
+#include <linux/string.h>
 
 /*
  * Use puts() instead of printf() to avoid printf buffer overflow
diff --git a/common/common_fit.c b/common/common_fit.c
index a9933081007..dfb2134fcf1 100644
--- a/common/common_fit.c
+++ b/common/common_fit.c
@@ -9,6 +9,7 @@
 #include <image.h>
 #include <log.h>
 #include <linux/libfdt.h>
+#include <linux/string.h>
 
 ulong fdt_getprop_u32(const void *fdt, int node, const char *prop)
 {
diff --git a/common/console.c b/common/console.c
index e18c0ee0d95..cc5d56b6d07 100644
--- a/common/console.c
+++ b/common/console.c
@@ -22,6 +22,7 @@
 #include <watchdog.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/common/dlmalloc.c b/common/dlmalloc.c
index cf0270a9c11..dc584f792b3 100644
--- a/common/dlmalloc.c
+++ b/common/dlmalloc.c
@@ -1,6 +1,7 @@
 #include <common.h>
 #include <log.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 
 #if CONFIG_IS_ENABLED(UNIT_TEST)
 #define DEBUG
diff --git a/common/eeprom/eeprom_layout.c b/common/eeprom/eeprom_layout.c
index 5a9be1da061..338185d58c3 100644
--- a/common/eeprom/eeprom_layout.c
+++ b/common/eeprom/eeprom_layout.c
@@ -10,6 +10,7 @@
 #include <linux/kernel.h>
 #include <eeprom_layout.h>
 #include <eeprom_field.h>
+#include <linux/string.h>
 
 #define NO_LAYOUT_FIELDS	"Unknown layout. Dumping raw data\n"
 
diff --git a/common/fdt_region.c b/common/fdt_region.c
index ff12c518e97..cb9bf08ce75 100644
--- a/common/fdt_region.c
+++ b/common/fdt_region.c
@@ -8,6 +8,7 @@
 #include <fdt_support.h>
 #include <linux/libfdt_env.h>
 #include <fdt_region.h>
+#include <linux/string.h>
 
 #ifndef USE_HOSTCC
 #include <fdt.h>
diff --git a/common/fdt_support.c b/common/fdt_support.c
index a565b470f81..9b685cc1736 100644
--- a/common/fdt_support.c
+++ b/common/fdt_support.c
@@ -13,6 +13,7 @@
 #include <net.h>
 #include <stdio_dev.h>
 #include <linux/ctype.h>
+#include <linux/string.h>
 #include <linux/types.h>
 #include <asm/global_data.h>
 #include <linux/libfdt.h>
diff --git a/common/flash.c b/common/flash.c
index bb82385c1f7..62f4c98749a 100644
--- a/common/flash.c
+++ b/common/flash.c
@@ -10,6 +10,7 @@
 #include <flash.h>
 #include <log.h>
 #include <uuid.h>
+#include <linux/string.h>
 
 #include <mtd/cfi_flash.h>
 
diff --git a/common/hash.c b/common/hash.c
index fc64002f736..e1be8dc05f9 100644
--- a/common/hash.c
+++ b/common/hash.c
@@ -21,6 +21,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/errno.h>
+#include <linux/string.h>
 #include <u-boot/crc.h>
 #else
 #include "mkimage.h"
diff --git a/common/image-android.c b/common/image-android.c
index d07b0e0f09b..7f76be86790 100644
--- a/common/image-android.c
+++ b/common/image-android.c
@@ -13,6 +13,7 @@
 #include <asm/unaligned.h>
 #include <mapmem.h>
 #include <linux/libfdt.h>
+#include <linux/string.h>
 
 #define ANDROID_IMAGE_DEFAULT_KERNEL_ADDR	0x10008000
 
diff --git a/common/image-cipher.c b/common/image-cipher.c
index 09d8512f8e5..c611eb52948 100644
--- a/common/image-cipher.c
+++ b/common/image-cipher.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <malloc.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 DECLARE_GLOBAL_DATA_PTR;
 #endif /* !USE_HOSdTCC*/
 #include <image.h>
diff --git a/common/image-fdt.c b/common/image-fdt.c
index cb7b7c3ef2c..41fce043f54 100644
--- a/common/image-fdt.c
+++ b/common/image-fdt.c
@@ -21,6 +21,7 @@
 #include <linux/libfdt.h>
 #include <mapmem.h>
 #include <asm/io.h>
+#include <linux/string.h>
 #include <tee/optee.h>
 
 #ifndef CONFIG_SYS_FDT_PAD
diff --git a/common/image-fit-sig.c b/common/image-fit-sig.c
index 11fbdb0fb4f..0c36649dce0 100644
--- a/common/image-fit-sig.c
+++ b/common/image-fit-sig.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 DECLARE_GLOBAL_DATA_PTR;
 #endif /* !USE_HOSTCC*/
 #include <fdt_region.h>
diff --git a/common/image-fit.c b/common/image-fit.c
index 973a37969f6..5d5dd7dc40a 100644
--- a/common/image-fit.c
+++ b/common/image-fit.c
@@ -23,6 +23,7 @@
 #include <asm/io.h>
 #include <malloc.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 DECLARE_GLOBAL_DATA_PTR;
 #endif /* !USE_HOSTCC*/
 
diff --git a/common/image-sig.c b/common/image-sig.c
index 4abd3c080f7..6cb5bedc8a9 100644
--- a/common/image-sig.c
+++ b/common/image-sig.c
@@ -13,6 +13,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 DECLARE_GLOBAL_DATA_PTR;
 #endif /* !USE_HOSTCC*/
 #include <image.h>
diff --git a/common/image.c b/common/image.c
index d8db73c82ba..ab0f0439bad 100644
--- a/common/image.c
+++ b/common/image.c
@@ -16,6 +16,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <asm/cache.h>
+#include <linux/string.h>
 #include <u-boot/crc.h>
 #include <watchdog.h>
 
diff --git a/common/init/board_init.c b/common/init/board_init.c
index 3f183ee1132..319d59b5164 100644
--- a/common/init/board_init.c
+++ b/common/init/board_init.c
@@ -10,6 +10,7 @@
 #include <bootstage.h>
 #include <init.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/common/iomux.c b/common/iomux.c
index 7cfd9f2e916..d552e0ee61a 100644
--- a/common/iomux.c
+++ b/common/iomux.c
@@ -8,6 +8,7 @@
 #include <console.h>
 #include <serial.h>
 #include <malloc.h>
+#include <linux/string.h>
 
 #if CONFIG_IS_ENABLED(CONSOLE_MUX)
 void iomux_printdevs(const int console)
diff --git a/common/kallsyms.c b/common/kallsyms.c
index ce42a932bb8..b8e64c5b633 100644
--- a/common/kallsyms.c
+++ b/common/kallsyms.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <linux/string.h>
 
 /* We need the weak marking as this symbol is provided specially */
 extern const char system_map[] __attribute__((weak));
diff --git a/common/kgdb.c b/common/kgdb.c
index 4493a159198..2f3bb7f6142 100644
--- a/common/kgdb.c
+++ b/common/kgdb.c
@@ -89,6 +89,7 @@
 
 #include <common.h>
 #include <asm/ptrace.h>
+#include <linux/string.h>
 
 #include <kgdb.h>
 #include <command.h>
diff --git a/common/lcd.c b/common/lcd.c
index ab5614ad0e3..04736d6c980 100644
--- a/common/lcd.c
+++ b/common/lcd.c
@@ -16,6 +16,7 @@
 #include <asm/cache.h>
 #include <init.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 #include <linux/types.h>
 #include <stdio_dev.h>
 #include <lcd.h>
diff --git a/common/lcd_console.c b/common/lcd_console.c
index 1a246c492ce..7a10a20d724 100644
--- a/common/lcd_console.c
+++ b/common/lcd_console.c
@@ -15,6 +15,7 @@
 #if defined(CONFIG_LCD_LOGO)
 #include <bmp_logo.h>
 #endif
+#include <linux/string.h>
 
 static struct console_t cons;
 
diff --git a/common/log.c b/common/log.c
index f40513dc532..0eeee6a66b0 100644
--- a/common/log.c
+++ b/common/log.c
@@ -11,6 +11,7 @@
 #include <malloc.h>
 #include <asm/global_data.h>
 #include <dm/uclass.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/common/log_syslog.c b/common/log_syslog.c
index 2477a6995d3..2f3c93bf839 100644
--- a/common/log_syslog.c
+++ b/common/log_syslog.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <net.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/common/malloc_simple.c b/common/malloc_simple.c
index 0267fb6bec8..805b044515f 100644
--- a/common/malloc_simple.c
+++ b/common/malloc_simple.c
@@ -13,6 +13,7 @@
 #include <mapmem.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/common/menu.c b/common/menu.c
index 5fb2ffbd065..0d08321e0e7 100644
--- a/common/menu.c
+++ b/common/menu.c
@@ -9,6 +9,7 @@
 #include <malloc.h>
 #include <errno.h>
 #include <linux/list.h>
+#include <linux/string.h>
 
 #include "menu.h"
 
diff --git a/common/miiphyutil.c b/common/miiphyutil.c
index 7d4d15ed918..fa273f1c201 100644
--- a/common/miiphyutil.c
+++ b/common/miiphyutil.c
@@ -15,6 +15,7 @@
 #include <miiphy.h>
 #include <phy.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include <asm/types.h>
 #include <linux/list.h>
diff --git a/common/spl/spl.c b/common/spl/spl.c
index fd050cc6310..bea542ed2e3 100644
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -22,6 +22,7 @@
 #include <asm/u-boot.h>
 #include <nand.h>
 #include <fat.h>
+#include <linux/string.h>
 #include <u-boot/crc.h>
 #include <version.h>
 #include <image.h>
diff --git a/common/spl/spl_atf.c b/common/spl/spl_atf.c
index b54b4f0d22e..6c3e839e855 100644
--- a/common/spl/spl_atf.c
+++ b/common/spl/spl_atf.c
@@ -17,6 +17,7 @@
 #include <log.h>
 #include <spl.h>
 #include <asm/cache.h>
+#include <linux/string.h>
 
 static struct bl2_to_bl31_params_mem bl31_params_mem;
 static struct bl31_params *bl2_to_bl31_params;
diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c
index da6e021e1bf..5da3fceb0de 100644
--- a/common/spl/spl_fit.c
+++ b/common/spl/spl_fit.c
@@ -17,6 +17,7 @@
 #include <asm/global_data.h>
 #include <linux/libfdt.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/common/spl/spl_net.c b/common/spl/spl_net.c
index e140a6306ff..6ac8b65eebd 100644
--- a/common/spl/spl_net.c
+++ b/common/spl/spl_net.c
@@ -14,6 +14,7 @@
 #include <spl.h>
 #include <net.h>
 #include <linux/libfdt.h>
+#include <linux/string.h>
 
 #if defined(CONFIG_SPL_ETH_SUPPORT) || defined(CONFIG_SPL_USB_ETHER)
 static ulong spl_net_load_read(struct spl_load_info *load, ulong sector,
diff --git a/common/spl/spl_nor.c b/common/spl/spl_nor.c
index 5270401db03..a1966cbad85 100644
--- a/common/spl/spl_nor.c
+++ b/common/spl/spl_nor.c
@@ -7,6 +7,7 @@
 #include <image.h>
 #include <log.h>
 #include <spl.h>
+#include <linux/string.h>
 
 static ulong spl_nor_load_read(struct spl_load_info *load, ulong sector,
 			       ulong count, void *buf)
diff --git a/common/spl/spl_ram.c b/common/spl/spl_ram.c
index df1d5b43d8b..7ea0a32b0d7 100644
--- a/common/spl/spl_ram.c
+++ b/common/spl/spl_ram.c
@@ -16,6 +16,7 @@
 #include <mapmem.h>
 #include <spl.h>
 #include <linux/libfdt.h>
+#include <linux/string.h>
 
 #ifndef CONFIG_SPL_LOAD_FIT_ADDRESS
 # define CONFIG_SPL_LOAD_FIT_ADDRESS	0
diff --git a/common/spl/spl_ubi.c b/common/spl/spl_ubi.c
index de6a63bd2d4..6a3679300d7 100644
--- a/common/spl/spl_ubi.c
+++ b/common/spl/spl_ubi.c
@@ -11,6 +11,7 @@
 #include <onenand_uboot.h>
 #include <ubispl.h>
 #include <spl.h>
+#include <linux/string.h>
 
 int spl_ubi_load_image(struct spl_image_info *spl_image,
 		       struct spl_boot_device *bootdev)
diff --git a/common/spl/spl_ymodem.c b/common/spl/spl_ymodem.c
index 284512478f1..c1958613299 100644
--- a/common/spl/spl_ymodem.c
+++ b/common/spl/spl_ymodem.c
@@ -16,6 +16,7 @@
 #include <xyzModem.h>
 #include <asm/u-boot.h>
 #include <linux/libfdt.h>
+#include <linux/string.h>
 
 #define BUF_SIZE 1024
 
diff --git a/common/splash.c b/common/splash.c
index e26b366cb23..31bbbc2f531 100644
--- a/common/splash.c
+++ b/common/splash.c
@@ -25,6 +25,7 @@
 #include <env.h>
 #include <splash.h>
 #include <lcd.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 2737fc6e7ff..12ea112a9d4 100644
--- a/common/splash_source.c
+++ b/common/splash_source.c
@@ -21,6 +21,7 @@
 #include <splash.h>
 #include <usb.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/common/stdio.c b/common/stdio.c
index 1c6ad686106..411796138f7 100644
--- a/common/stdio.c
+++ b/common/stdio.c
@@ -19,6 +19,7 @@
 #include <serial.h>
 #include <splash.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 
 #if defined(CONFIG_SYS_I2C)
 #include <i2c.h>
diff --git a/common/update.c b/common/update.c
index 5875524d59b..8851943b15c 100644
--- a/common/update.c
+++ b/common/update.c
@@ -10,6 +10,7 @@
 #include <cpu_func.h>
 #include <image.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #if !(defined(CONFIG_FIT) && defined(CONFIG_OF_LIBFDT))
 #error "CONFIG_FIT and CONFIG_OF_LIBFDT are required for auto-update feature"
diff --git a/common/usb.c b/common/usb.c
index aad13fd9c55..7dd34df3cd6 100644
--- a/common/usb.c
+++ b/common/usb.c
@@ -39,6 +39,7 @@
 #include <errno.h>
 #include <usb.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #define USB_BUFSIZ	512
 
diff --git a/common/usb_hub.c b/common/usb_hub.c
index af088bd7289..1eee9401dc3 100644
--- a/common/usb_hub.c
+++ b/common/usb_hub.c
@@ -40,6 +40,7 @@
 #include <asm/state.h>
 #endif
 #include <asm/unaligned.h>
+#include <linux/string.h>
 
 #include <usb.h>
 
diff --git a/common/usb_kbd.c b/common/usb_kbd.c
index 3a81a305995..0fb955c14b6 100644
--- a/common/usb_kbd.c
+++ b/common/usb_kbd.c
@@ -18,6 +18,7 @@
 #include <time.h>
 #include <watchdog.h>
 #include <asm/byteorder.h>
+#include <linux/string.h>
 
 #include <usb.h>
 
diff --git a/common/usb_storage.c b/common/usb_storage.c
index ff254419951..492a9374ad2 100644
--- a/common/usb_storage.c
+++ b/common/usb_storage.c
@@ -46,6 +46,7 @@
 #include <dm/device-internal.h>
 #include <dm/lists.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include <part.h>
 #include <usb.h>
diff --git a/disk/part.c b/disk/part.c
index f6a31025dc8..04aac1f5f5a 100644
--- a/disk/part.c
+++ b/disk/part.c
@@ -14,6 +14,7 @@
 #include <malloc.h>
 #include <part.h>
 #include <ubifs_uboot.h>
+#include <linux/string.h>
 
 #undef	PART_DEBUG
 
diff --git a/disk/part_amiga.c b/disk/part_amiga.c
index 7eea60b564d..17c595a0a7b 100644
--- a/disk/part_amiga.c
+++ b/disk/part_amiga.c
@@ -8,6 +8,7 @@
 #include <command.h>
 #include <env.h>
 #include <ide.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 04f53106f7c..8eaa85e6b29 100644
--- a/disk/part_dos.c
+++ b/disk/part_dos.c
@@ -18,6 +18,7 @@
 #include <command.h>
 #include <ide.h>
 #include <memalign.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 c0def902fec..b995efc732d 100644
--- a/disk/part_efi.c
+++ b/disk/part_efi.c
@@ -26,6 +26,7 @@
 #include <linux/compiler.h>
 #include <linux/ctype.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include <u-boot/crc.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/disk/part_iso.c b/disk/part_iso.c
index 822f2c4d9f4..a7d63d64e90 100644
--- a/disk/part_iso.c
+++ b/disk/part_iso.c
@@ -10,6 +10,7 @@
 #include <part.h>
 #include <asm/cache.h>
 #include <asm/unaligned.h>
+#include <linux/string.h>
 #include "part_iso.h"
 
 #ifdef CONFIG_HAVE_BLOCK_DEVICE
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index f251ee1b74a..271c2ddf4a8 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -15,6 +15,7 @@
 #include <time.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include <command.h>
 #include <dm.h>
diff --git a/drivers/ata/dwc_ahsata.c b/drivers/ata/dwc_ahsata.c
index 562e982e32a..1ecae1d1c95 100644
--- a/drivers/ata/dwc_ahsata.c
+++ b/drivers/ata/dwc_ahsata.c
@@ -26,6 +26,7 @@
 #include <linux/ctype.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/string.h>
 #include "dwc_ahsata_priv.h"
 
 struct sata_port_regs {
diff --git a/drivers/ata/fsl_sata.c b/drivers/ata/fsl_sata.c
index 8c6726a6214..d2f802aff86 100644
--- a/drivers/ata/fsl_sata.c
+++ b/drivers/ata/fsl_sata.c
@@ -19,6 +19,7 @@
 #include <fis.h>
 #include <sata.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include "fsl_sata.h"
 
 #if CONFIG_IS_ENABLED(BLK)
diff --git a/drivers/ata/libata.c b/drivers/ata/libata.c
index 47e2c5c1cc4..cdc83c75bb6 100644
--- a/drivers/ata/libata.c
+++ b/drivers/ata/libata.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <compiler.h>
 #include <libata.h>
+#include <linux/string.h>
 
 u64 ata_id_n_sectors(u16 *id)
 {
diff --git a/drivers/ata/sata.c b/drivers/ata/sata.c
index 6a38d500245..fa17ee3ab48 100644
--- a/drivers/ata/sata.c
+++ b/drivers/ata/sata.c
@@ -15,6 +15,7 @@
 #include <dm.h>
 #include <part.h>
 #include <sata.h>
+#include <linux/string.h>
 
 #ifndef CONFIG_AHCI
 struct blk_desc sata_dev_desc[CONFIG_SYS_SATA_MAX_DEVICE];
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index 8071fe18a71..9554aeb137d 100644
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -51,6 +51,7 @@
 #include <linux/errno.h>
 #include <asm/io.h>
 #include <linux/mbus.h>
+#include <linux/string.h>
 
 #include <asm/arch/soc.h>
 #if defined(CONFIG_ARCH_KIRKWOOD)
diff --git a/drivers/ata/sata_sil.c b/drivers/ata/sata_sil.c
index d5ba94c1725..c34af206669 100644
--- a/drivers/ata/sata_sil.c
+++ b/drivers/ata/sata_sil.c
@@ -18,6 +18,7 @@
 #include <libata.h>
 #include <sata.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #if CONFIG_IS_ENABLED(BLK)
 #include <dm.h>
diff --git a/drivers/bios_emulator/atibios.c b/drivers/bios_emulator/atibios.c
index 6c7cc24cbd9..3d1b22f1f54 100644
--- a/drivers/bios_emulator/atibios.c
+++ b/drivers/bios_emulator/atibios.c
@@ -53,6 +53,7 @@
 #include <malloc.h>
 #include <vbe.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include "biosemui.h"
 
 /* Length of the BIOS image */
diff --git a/drivers/bios_emulator/biosemu.c b/drivers/bios_emulator/biosemu.c
index 9d4f07c074d..e605238d439 100644
--- a/drivers/bios_emulator/biosemu.c
+++ b/drivers/bios_emulator/biosemu.c
@@ -47,6 +47,7 @@
 
 #include <malloc.h>
 #include <common.h>
+#include <linux/string.h>
 #include "biosemui.h"
 
 BE_sysEnv _BE_env = {{0}};
diff --git a/drivers/bios_emulator/x86emu/debug.c b/drivers/bios_emulator/x86emu/debug.c
index 95f3cc09aad..1e4b6ba0c6b 100644
--- a/drivers/bios_emulator/x86emu/debug.c
+++ b/drivers/bios_emulator/x86emu/debug.c
@@ -41,6 +41,7 @@
 #include <common.h>
 #include <linux/ctype.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include "x86emu/x86emui.h"
 
 /*----------------------------- Implementation ----------------------------*/
diff --git a/drivers/block/blk-uclass.c b/drivers/block/blk-uclass.c
index b19375cbc8d..777525530ee 100644
--- a/drivers/block/blk-uclass.c
+++ b/drivers/block/blk-uclass.c
@@ -14,6 +14,7 @@
 #include <dm/lists.h>
 #include <dm/uclass-internal.h>
 #include <linux/err.h>
+#include <linux/string.h>
 
 static const char *if_typename_str[IF_TYPE_COUNT] = {
 	[IF_TYPE_IDE]		= "ide",
diff --git a/drivers/block/blk_legacy.c b/drivers/block/blk_legacy.c
index e3ee778c29d..f812169a4f2 100644
--- a/drivers/block/blk_legacy.c
+++ b/drivers/block/blk_legacy.c
@@ -8,6 +8,7 @@
 #include <blk.h>
 #include <part.h>
 #include <linux/err.h>
+#include <linux/string.h>
 
 struct blk_driver *blk_driver_lookup_type(int if_type)
 {
diff --git a/drivers/block/blkcache.c b/drivers/block/blkcache.c
index b6fc72fe983..88bf3f6ce23 100644
--- a/drivers/block/blkcache.c
+++ b/drivers/block/blkcache.c
@@ -11,6 +11,7 @@
 #include <part.h>
 #include <linux/ctype.h>
 #include <linux/list.h>
+#include <linux/string.h>
 
 struct block_cache_node {
 	struct list_head lh;
diff --git a/drivers/block/ide.c b/drivers/block/ide.c
index a766b5cf036..01bf76d0023 100644
--- a/drivers/block/ide.c
+++ b/drivers/block/ide.c
@@ -14,6 +14,7 @@
 #include <watchdog.h>
 #include <asm/io.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #ifdef __PPC__
 # define EIEIO		__asm__ volatile ("eieio")
diff --git a/drivers/block/sandbox.c b/drivers/block/sandbox.c
index 11ebdd52d77..a3b2e77ef30 100644
--- a/drivers/block/sandbox.c
+++ b/drivers/block/sandbox.c
@@ -15,6 +15,7 @@
 #include <dm/device_compat.h>
 #include <linux/errno.h>
 #include <dm/device-internal.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/clk/altera/clk-arria10.c b/drivers/clk/altera/clk-arria10.c
index a2f105a415f..b05648e8a54 100644
--- a/drivers/clk/altera/clk-arria10.c
+++ b/drivers/clk/altera/clk-arria10.c
@@ -14,6 +14,7 @@
 #include <dm/lists.h>
 #include <dm/util.h>
 #include <linux/bitops.h>
+#include <linux/string.h>
 
 #include <asm/arch/clock_manager.h>
 
diff --git a/drivers/clk/clk-mux.c b/drivers/clk/clk-mux.c
index 8df2a2d01ac..075d4932a9c 100644
--- a/drivers/clk/clk-mux.c
+++ b/drivers/clk/clk-mux.c
@@ -31,6 +31,7 @@
 #include <linux/clk-provider.h>
 #include <clk.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include "clk.h"
 #include <linux/err.h>
 
diff --git a/drivers/clk/clk_stm32f.c b/drivers/clk/clk_stm32f.c
index cc48905df54..45f5f567f8d 100644
--- a/drivers/clk/clk_stm32f.c
+++ b/drivers/clk/clk_stm32f.c
@@ -11,6 +11,7 @@
 #include <stm32_rcc.h>
 #include <linux/bitops.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #include <asm/io.h>
 #include <asm/arch/stm32.h>
diff --git a/drivers/clk/clk_versal.c b/drivers/clk/clk_versal.c
index 6f82b60f04d..7a04d68f8dd 100644
--- a/drivers/clk/clk_versal.c
+++ b/drivers/clk/clk_versal.c
@@ -18,6 +18,7 @@
 #include <asm/arch/sys_proto.h>
 #include <zynqmp_firmware.h>
 #include <linux/err.h>
+#include <linux/string.h>
 
 #define MAX_PARENT			100
 #define MAX_NODES			6
diff --git a/drivers/clk/mvebu/armada-37xx-periph.c b/drivers/clk/mvebu/armada-37xx-periph.c
index 223da22c1b6..30710040ff9 100644
--- a/drivers/clk/mvebu/armada-37xx-periph.c
+++ b/drivers/clk/mvebu/armada-37xx-periph.c
@@ -17,6 +17,7 @@
 #include <asm/arch/cpu.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
+#include <linux/string.h>
 
 #define TBG_SEL		0x0
 #define DIV_SEL0	0x4
diff --git a/drivers/clk/renesas/clk-rcar-gen2.c b/drivers/clk/renesas/clk-rcar-gen2.c
index b423c9414b2..cbf2ffe6e85 100644
--- a/drivers/clk/renesas/clk-rcar-gen2.c
+++ b/drivers/clk/renesas/clk-rcar-gen2.c
@@ -17,6 +17,7 @@
 #include <log.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <linux/string.h>
 
 #include <dt-bindings/clock/renesas-cpg-mssr.h>
 
diff --git a/drivers/clk/rockchip/clk_rk322x.c b/drivers/clk/rockchip/clk_rk322x.c
index 054b2fd349b..b63fb9b3cca 100644
--- a/drivers/clk/rockchip/clk_rk322x.c
+++ b/drivers/clk/rockchip/clk_rk322x.c
@@ -19,6 +19,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/log2.h>
+#include <linux/string.h>
 #include <linux/stringify.h>
 
 enum {
diff --git a/drivers/clk/rockchip/clk_rk3288.c b/drivers/clk/rockchip/clk_rk3288.c
index be1f646c070..a3c5bbf1f6b 100644
--- a/drivers/clk/rockchip/clk_rk3288.c
+++ b/drivers/clk/rockchip/clk_rk3288.c
@@ -28,6 +28,7 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/log2.h>
+#include <linux/string.h>
 #include <linux/stringify.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/clk/rockchip/clk_rk3328.c b/drivers/clk/rockchip/clk_rk3328.c
index bf4f1069ea6..e04042f0bd9 100644
--- a/drivers/clk/rockchip/clk_rk3328.c
+++ b/drivers/clk/rockchip/clk_rk3328.c
@@ -20,6 +20,7 @@
 #include <dt-bindings/clock/rk3328-cru.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 struct pll_div {
 	u32 refdiv;
diff --git a/drivers/clk/rockchip/clk_rk3368.c b/drivers/clk/rockchip/clk_rk3368.c
index b87be9a0341..586639344d0 100644
--- a/drivers/clk/rockchip/clk_rk3368.c
+++ b/drivers/clk/rockchip/clk_rk3368.c
@@ -23,6 +23,7 @@
 #include <dt-bindings/clock/rk3368-cru.h>
 #include <linux/delay.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include <linux/stringify.h>
 
 #if CONFIG_IS_ENABLED(OF_PLATDATA)
diff --git a/drivers/clk/rockchip/clk_rk3399.c b/drivers/clk/rockchip/clk_rk3399.c
index e3d1438d54f..c2eaf67f58f 100644
--- a/drivers/clk/rockchip/clk_rk3399.c
+++ b/drivers/clk/rockchip/clk_rk3399.c
@@ -23,6 +23,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #if CONFIG_IS_ENABLED(OF_PLATDATA)
 struct rk3399_clk_plat {
diff --git a/drivers/clk/sifive/fu540-prci.c b/drivers/clk/sifive/fu540-prci.c
index fe6e0d4073f..6cb56d21acd 100644
--- a/drivers/clk/sifive/fu540-prci.c
+++ b/drivers/clk/sifive/fu540-prci.c
@@ -37,6 +37,7 @@
 #include <errno.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/string.h>
 
 #include <linux/math64.h>
 #include <linux/clk/analogbits-wrpll-cln28hpc.h>
diff --git a/drivers/core/acpi.c b/drivers/core/acpi.c
index 99c0da500eb..a28b56a7333 100644
--- a/drivers/core/acpi.c
+++ b/drivers/core/acpi.c
@@ -17,6 +17,7 @@
 #include <dm/acpi.h>
 #include <dm/device-internal.h>
 #include <dm/root.h>
+#include <linux/string.h>
 
 #define MAX_ACPI_ITEMS	100
 
diff --git a/drivers/core/device.c b/drivers/core/device.c
index dd0874e762d..29b71e24055 100644
--- a/drivers/core/device.c
+++ b/drivers/core/device.c
@@ -32,6 +32,7 @@
 #include <linux/list.h>
 #include <power-domain.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/core/lists.c b/drivers/core/lists.c
index 5beba9181cc..86a99abfaae 100644
--- a/drivers/core/lists.c
+++ b/drivers/core/lists.c
@@ -19,6 +19,7 @@
 #include <dm/util.h>
 #include <fdtdec.h>
 #include <linux/compiler.h>
+#include <linux/string.h>
 
 struct driver *lists_driver_lookup_name(const char *name)
 {
diff --git a/drivers/core/of_access.c b/drivers/core/of_access.c
index c23763726bb..26f240b022c 100644
--- a/drivers/core/of_access.c
+++ b/drivers/core/of_access.c
@@ -29,6 +29,7 @@
 #include <linux/ctype.h>
 #include <linux/err.h>
 #include <linux/ioport.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/core/of_addr.c b/drivers/core/of_addr.c
index 3a67d9bc760..6316b651534 100644
--- a/drivers/core/of_addr.c
+++ b/drivers/core/of_addr.c
@@ -15,6 +15,7 @@
 #include <linux/err.h>
 #include <linux/ioport.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 /* Max address size we deal with */
 #define OF_MAX_ADDR_CELLS	4
diff --git a/drivers/core/of_extra.c b/drivers/core/of_extra.c
index 6420e6ec448..f6597c27350 100644
--- a/drivers/core/of_extra.c
+++ b/drivers/core/of_extra.c
@@ -10,6 +10,7 @@
 #include <dm/of_access.h>
 #include <dm/of_extra.h>
 #include <dm/ofnode.h>
+#include <linux/string.h>
 
 int ofnode_read_fmap_entry(ofnode node, struct fmap_entry *entry)
 {
diff --git a/drivers/core/ofnode.c b/drivers/core/ofnode.c
index a49a54c60f9..31c1d67fe2c 100644
--- a/drivers/core/ofnode.c
+++ b/drivers/core/ofnode.c
@@ -17,6 +17,7 @@
 #include <dm/ofnode.h>
 #include <linux/err.h>
 #include <linux/ioport.h>
+#include <linux/string.h>
 
 int ofnode_read_u32(ofnode node, const char *propname, u32 *outp)
 {
diff --git a/drivers/core/uclass.c b/drivers/core/uclass.c
index 95c37db5ad0..98fdb014222 100644
--- a/drivers/core/uclass.c
+++ b/drivers/core/uclass.c
@@ -20,6 +20,7 @@
 #include <dm/uclass.h>
 #include <dm/uclass-internal.h>
 #include <dm/util.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/cpu/cpu-uclass.c b/drivers/cpu/cpu-uclass.c
index 37e3cf2d8ff..58c8f833c6f 100644
--- a/drivers/cpu/cpu-uclass.c
+++ b/drivers/cpu/cpu-uclass.c
@@ -12,6 +12,7 @@
 #include <dm/lists.h>
 #include <dm/root.h>
 #include <linux/err.h>
+#include <linux/string.h>
 
 int cpu_probe_all(void)
 {
diff --git a/drivers/cpu/cpu_sandbox.c b/drivers/cpu/cpu_sandbox.c
index caa26e50f28..7c5ccaa0d00 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 <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 aca14157ad5..21ccc1ce31d 100644
--- a/drivers/cpu/imx8_cpu.c
+++ b/drivers/cpu/imx8_cpu.c
@@ -14,6 +14,7 @@
 #include <asm/arch-imx/cpu.h>
 #include <asm/armv8/cpu.h>
 #include <linux/bitops.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/cpu/riscv_cpu.c b/drivers/cpu/riscv_cpu.c
index 3c7395a9f20..fcf487d73d0 100644
--- a/drivers/cpu/riscv_cpu.c
+++ b/drivers/cpu/riscv_cpu.c
@@ -15,6 +15,7 @@
 #include <dm/lists.h>
 #include <linux/bitops.h>
 #include <linux/err.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/crypto/ace_sha.c b/drivers/crypto/ace_sha.c
index 261d3efe84e..0b07ae5fd71 100644
--- a/drivers/crypto/ace_sha.c
+++ b/drivers/crypto/ace_sha.c
@@ -4,6 +4,7 @@
  * Copyright (c) 2012  Samsung Electronics
  */
 #include <common.h>
+#include <linux/string.h>
 #include "ace_sha.h"
 #include <log.h>
 #include <rand.h>
diff --git a/drivers/crypto/fsl/desc_constr.h b/drivers/crypto/fsl/desc_constr.h
index b82ba83e73a..ef4cd525e3a 100644
--- a/drivers/crypto/fsl/desc_constr.h
+++ b/drivers/crypto/fsl/desc_constr.h
@@ -8,6 +8,7 @@
  */
 
 #include <linux/compat.h>
+#include <linux/string.h>
 #include "desc.h"
 
 #define IMMEDIATE (1 << 23)
diff --git a/drivers/crypto/fsl/error.c b/drivers/crypto/fsl/error.c
index c76574919c7..d19685b0ec4 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 <linux/string.h>
 #include "desc.h"
 #include "jr.h"
 
diff --git a/drivers/crypto/fsl/fsl_hash.c b/drivers/crypto/fsl/fsl_hash.c
index 61f953e8a6d..5182f21acb2 100644
--- a/drivers/crypto/fsl/fsl_hash.c
+++ b/drivers/crypto/fsl/fsl_hash.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <memalign.h>
+#include <linux/string.h>
 #include "jobdesc.h"
 #include "desc.h"
 #include "jr.h"
diff --git a/drivers/crypto/fsl/jobdesc.c b/drivers/crypto/fsl/jobdesc.c
index fbc1aeddeeb..17777e5551d 100644
--- a/drivers/crypto/fsl/jobdesc.c
+++ b/drivers/crypto/fsl/jobdesc.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <fsl_sec.h>
+#include <linux/string.h>
 #include "desc_constr.h"
 #include "jobdesc.h"
 #include "rsa_caam.h"
diff --git a/drivers/crypto/fsl/jr.c b/drivers/crypto/fsl/jr.c
index 44273c345f9..afca79dfc0a 100644
--- a/drivers/crypto/fsl/jr.c
+++ b/drivers/crypto/fsl/jr.c
@@ -10,6 +10,7 @@
 #include <linux/kernel.h>
 #include <log.h>
 #include <malloc.h>
+#include <linux/string.h>
 #include "fsl_sec.h"
 #include "jr.h"
 #include "jobdesc.h"
diff --git a/drivers/crypto/fsl/rng.c b/drivers/crypto/fsl/rng.c
index 3c0c2b067f3..e4a952caeec 100644
--- a/drivers/crypto/fsl/rng.c
+++ b/drivers/crypto/fsl/rng.c
@@ -12,6 +12,7 @@
 #include <dm.h>
 #include <rng.h>
 #include <linux/kernel.h>
+#include <linux/string.h>
 #include "desc_constr.h"
 #include "jobdesc.h"
 #include "jr.h"
diff --git a/drivers/ddr/altera/sdram_arria10.c b/drivers/ddr/altera/sdram_arria10.c
index 4a8f8dea1c4..b2053bf412c 100644
--- a/drivers/ddr/altera/sdram_arria10.c
+++ b/drivers/ddr/altera/sdram_arria10.c
@@ -22,6 +22,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/ddr/altera/sdram_gen5.c b/drivers/ddr/altera/sdram_gen5.c
index 1360bd0a3b8..52cde7d409b 100644
--- a/drivers/ddr/altera/sdram_gen5.c
+++ b/drivers/ddr/altera/sdram_gen5.c
@@ -18,6 +18,7 @@
 #include <asm/bitops.h>
 #include <asm/io.h>
 #include <dm/device_compat.h>
+#include <linux/string.h>
 
 #include "sequencer.h"
 
diff --git a/drivers/ddr/altera/sdram_soc64.c b/drivers/ddr/altera/sdram_soc64.c
index 66dad034fa2..1312244ae52 100644
--- a/drivers/ddr/altera/sdram_soc64.c
+++ b/drivers/ddr/altera/sdram_soc64.c
@@ -17,6 +17,7 @@
 #include <reset.h>
 #include <time.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 #include "sdram_soc64.h"
 #include <wait_bit.h>
 #include <asm/arch/firewall.h>
diff --git a/drivers/ddr/altera/sequencer.c b/drivers/ddr/altera/sequencer.c
index 2dbde49a9c3..7c54f001825 100644
--- a/drivers/ddr/altera/sequencer.c
+++ b/drivers/ddr/altera/sequencer.c
@@ -9,6 +9,7 @@
 #include <asm/arch/sdram.h>
 #include <errno.h>
 #include <hang.h>
+#include <linux/string.h>
 #include "sequencer.h"
 
 static const struct socfpga_sdr_rw_load_manager *sdr_rw_load_mgr_regs =
diff --git a/drivers/ddr/fsl/ctrl_regs.c b/drivers/ddr/fsl/ctrl_regs.c
index c849ef3a4c7..247587c646b 100644
--- a/drivers/ddr/fsl/ctrl_regs.c
+++ b/drivers/ddr/fsl/ctrl_regs.c
@@ -22,6 +22,7 @@
 	defined(CONFIG_ARM)
 #include <asm/arch/clock.h>
 #endif
+#include <linux/string.h>
 
 /*
  * Determine Rtt value.
diff --git a/drivers/ddr/fsl/ddr1_dimm_params.c b/drivers/ddr/fsl/ddr1_dimm_params.c
index e5481eaa0dd..2ccf1e82f9a 100644
--- a/drivers/ddr/fsl/ddr1_dimm_params.c
+++ b/drivers/ddr/fsl/ddr1_dimm_params.c
@@ -7,6 +7,7 @@
 #include <fsl_ddr_sdram.h>
 #include <log.h>
 #include <asm/bitops.h>
+#include <linux/string.h>
 
 #include <fsl_ddr.h>
 
diff --git a/drivers/ddr/fsl/ddr2_dimm_params.c b/drivers/ddr/fsl/ddr2_dimm_params.c
index 3b78118a9d8..9ee2dfc2455 100644
--- a/drivers/ddr/fsl/ddr2_dimm_params.c
+++ b/drivers/ddr/fsl/ddr2_dimm_params.c
@@ -7,6 +7,7 @@
 #include <fsl_ddr_sdram.h>
 #include <log.h>
 #include <asm/bitops.h>
+#include <linux/string.h>
 
 #include <fsl_ddr.h>
 /*
diff --git a/drivers/ddr/fsl/ddr3_dimm_params.c b/drivers/ddr/fsl/ddr3_dimm_params.c
index 8464438c544..d0625ea0e1b 100644
--- a/drivers/ddr/fsl/ddr3_dimm_params.c
+++ b/drivers/ddr/fsl/ddr3_dimm_params.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <fsl_ddr_sdram.h>
 #include <log.h>
+#include <linux/string.h>
 
 #include <fsl_ddr.h>
 
diff --git a/drivers/ddr/fsl/ddr4_dimm_params.c b/drivers/ddr/fsl/ddr4_dimm_params.c
index e2bdc12ef2c..37e43dc8f17 100644
--- a/drivers/ddr/fsl/ddr4_dimm_params.c
+++ b/drivers/ddr/fsl/ddr4_dimm_params.c
@@ -14,6 +14,7 @@
 #include <fsl_ddr_sdram.h>
 #include <log.h>
 #include <linux/bug.h>
+#include <linux/string.h>
 
 #include <fsl_ddr.h>
 
diff --git a/drivers/ddr/fsl/interactive.c b/drivers/ddr/fsl/interactive.c
index 2f76beb2dbe..3736ea129a7 100644
--- a/drivers/ddr/fsl/interactive.c
+++ b/drivers/ddr/fsl/interactive.c
@@ -20,6 +20,7 @@
 #include <linux/ctype.h>
 #include <asm/types.h>
 #include <asm/io.h>
+#include <linux/string.h>
 
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr.h>
diff --git a/drivers/ddr/fsl/main.c b/drivers/ddr/fsl/main.c
index f5299fe3111..5b2ddc3893a 100644
--- a/drivers/ddr/fsl/main.c
+++ b/drivers/ddr/fsl/main.c
@@ -18,6 +18,7 @@
 #include <init.h>
 #include <log.h>
 #include <asm/bitops.h>
+#include <linux/string.h>
 
 /*
  * CONFIG_SYS_FSL_DDR_SDRAM_BASE_PHY is the physical address from the view
diff --git a/drivers/ddr/marvell/axp/ddr3_hw_training.c b/drivers/ddr/marvell/axp/ddr3_hw_training.c
index 35d98faf58f..c39f40095fc 100644
--- a/drivers/ddr/marvell/axp/ddr3_hw_training.c
+++ b/drivers/ddr/marvell/axp/ddr3_hw_training.c
@@ -11,6 +11,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include "ddr3_init.h"
 #include "ddr3_hw_training.h"
diff --git a/drivers/ddr/marvell/axp/ddr3_pbs.c b/drivers/ddr/marvell/axp/ddr3_pbs.c
index 069a42fbf5e..a963b3c55be 100644
--- a/drivers/ddr/marvell/axp/ddr3_pbs.c
+++ b/drivers/ddr/marvell/axp/ddr3_pbs.c
@@ -10,6 +10,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include "ddr3_hw_training.h"
 
diff --git a/drivers/ddr/marvell/axp/ddr3_spd.c b/drivers/ddr/marvell/axp/ddr3_spd.c
index e2305d88145..8927abe17ef 100644
--- a/drivers/ddr/marvell/axp/ddr3_spd.c
+++ b/drivers/ddr/marvell/axp/ddr3_spd.c
@@ -9,6 +9,7 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <linux/string.h>
 
 #include "ddr3_init.h"
 
diff --git a/drivers/ddr/marvell/axp/ddr3_write_leveling.c b/drivers/ddr/marvell/axp/ddr3_write_leveling.c
index d4add447774..de8dfc299f7 100644
--- a/drivers/ddr/marvell/axp/ddr3_write_leveling.c
+++ b/drivers/ddr/marvell/axp/ddr3_write_leveling.c
@@ -11,6 +11,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include "ddr3_hw_training.h"
 
diff --git a/drivers/dfu/dfu.c b/drivers/dfu/dfu.c
index 3d5de92ecae..5dc5f80854e 100644
--- a/drivers/dfu/dfu.c
+++ b/drivers/dfu/dfu.c
@@ -18,6 +18,7 @@
 #include <linux/list.h>
 #include <linux/compiler.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 static LIST_HEAD(dfu_list);
 static int dfu_alt_num;
diff --git a/drivers/dfu/dfu_mmc.c b/drivers/dfu/dfu_mmc.c
index ac5ea2c7d79..0fd69d0d1e4 100644
--- a/drivers/dfu/dfu_mmc.c
+++ b/drivers/dfu/dfu_mmc.c
@@ -17,6 +17,7 @@
 #include <mmc.h>
 #include <part.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 static unsigned char *dfu_file_buf;
 static u64 dfu_file_buf_len;
diff --git a/drivers/dfu/dfu_mtd.c b/drivers/dfu/dfu_mtd.c
index 36cd4e945b2..861a0b370e0 100644
--- a/drivers/dfu/dfu_mtd.c
+++ b/drivers/dfu/dfu_mtd.c
@@ -12,6 +12,7 @@
 #include <mtd.h>
 #include <jffs2/load_kernel.h>
 #include <linux/err.h>
+#include <linux/string.h>
 
 static bool mtd_is_aligned_with_block_size(struct mtd_info *mtd, u64 size)
 {
diff --git a/drivers/dfu/dfu_nand.c b/drivers/dfu/dfu_nand.c
index b8d24d203be..38f46b2f412 100644
--- a/drivers/dfu/dfu_nand.c
+++ b/drivers/dfu/dfu_nand.c
@@ -18,6 +18,7 @@
 #include <linux/mtd/mtd.h>
 #include <jffs2/load_kernel.h>
 #include <nand.h>
+#include <linux/string.h>
 
 static int nand_block_op(enum dfu_op op, struct dfu_entity *dfu,
 			u64 offset, void *buf, long *len)
diff --git a/drivers/dfu/dfu_ram.c b/drivers/dfu/dfu_ram.c
index 9b3b71975a1..b2a5b62d425 100644
--- a/drivers/dfu/dfu_ram.c
+++ b/drivers/dfu/dfu_ram.c
@@ -13,6 +13,7 @@
 #include <errno.h>
 #include <dfu.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 static int dfu_transfer_medium_ram(enum dfu_op op, struct dfu_entity *dfu,
 				   u64 offset, void *buf, long *len)
diff --git a/drivers/dfu/dfu_sf.c b/drivers/dfu/dfu_sf.c
index 318e43c179b..20e1c286902 100644
--- a/drivers/dfu/dfu_sf.c
+++ b/drivers/dfu/dfu_sf.c
@@ -13,6 +13,7 @@
 #include <spi_flash.h>
 #include <jffs2/load_kernel.h>
 #include <linux/mtd/mtd.h>
+#include <linux/string.h>
 
 static int dfu_get_medium_size_sf(struct dfu_entity *dfu, u64 *size)
 {
diff --git a/drivers/dfu/dfu_tftp.c b/drivers/dfu/dfu_tftp.c
index 0f2c114668e..efa25d86f22 100644
--- a/drivers/dfu/dfu_tftp.c
+++ b/drivers/dfu/dfu_tftp.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <dfu.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 int dfu_tftp_write(char *dfu_entity_name, unsigned int addr, unsigned int len,
 		   char *interface, char *devstring)
diff --git a/drivers/dma/apbh_dma.c b/drivers/dma/apbh_dma.c
index da988f6bb66..a2a76aba84a 100644
--- a/drivers/dma/apbh_dma.c
+++ b/drivers/dma/apbh_dma.c
@@ -14,6 +14,7 @@
 #include <cpu_func.h>
 #include <asm/cache.h>
 #include <linux/list.h>
+#include <linux/string.h>
 
 #include <common.h>
 #include <malloc.h>
diff --git a/drivers/dma/keystone_nav.c b/drivers/dma/keystone_nav.c
index 443e4b23669..72b0a7736fc 100644
--- a/drivers/dma/keystone_nav.c
+++ b/drivers/dma/keystone_nav.c
@@ -9,6 +9,7 @@
 #include <asm/io.h>
 #include <asm/ti-common/keystone_nav.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 struct qm_config qm_memmap = {
 	.stat_cfg	= CONFIG_KSNAV_QM_QUEUE_STATUS_BASE,
diff --git a/drivers/dma/sandbox-dma-test.c b/drivers/dma/sandbox-dma-test.c
index 18e8fe3806c..f479f2a79e3 100644
--- a/drivers/dma/sandbox-dma-test.c
+++ b/drivers/dma/sandbox-dma-test.c
@@ -16,6 +16,7 @@
 #include <dt-structs.h>
 #include <errno.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #define SANDBOX_DMA_CH_CNT 3
 #define SANDBOX_DMA_BUF_SIZE 1024
diff --git a/drivers/dma/ti-edma3.c b/drivers/dma/ti-edma3.c
index c73ab579cf6..aba4efc15c2 100644
--- a/drivers/dma/ti-edma3.c
+++ b/drivers/dma/ti-edma3.c
@@ -16,6 +16,7 @@
 #include <asm/omap_common.h>
 #include <asm/ti-common/ti-edma3.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #define EDMA3_SL_BASE(slot)			(0x4000 + ((slot) << 5))
 #define EDMA3_SL_MAX_NUM			512
diff --git a/drivers/dma/ti/k3-udma.c b/drivers/dma/ti/k3-udma.c
index 9de0258ed1d..aa835498d29 100644
--- a/drivers/dma/ti/k3-udma.c
+++ b/drivers/dma/ti/k3-udma.c
@@ -29,6 +29,7 @@
 #include <linux/soc/ti/cppi5.h>
 #include <linux/soc/ti/ti-udma.h>
 #include <linux/soc/ti/ti_sci_protocol.h>
+#include <linux/string.h>
 
 #include "k3-udma-hwdef.h"
 #include "k3-psil-priv.h"
diff --git a/drivers/fastboot/fb_command.c b/drivers/fastboot/fb_command.c
index 42c8fb83433..699fc52fc1c 100644
--- a/drivers/fastboot/fb_command.c
+++ b/drivers/fastboot/fb_command.c
@@ -14,6 +14,7 @@
 #include <part.h>
 #include <stdlib.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 /**
  * image_size - final fastboot image size
diff --git a/drivers/fastboot/fb_common.c b/drivers/fastboot/fb_common.c
index c3735a44af7..3c8338f7c68 100644
--- a/drivers/fastboot/fb_common.c
+++ b/drivers/fastboot/fb_common.c
@@ -14,6 +14,7 @@
 #include <command.h>
 #include <env.h>
 #include <fastboot.h>
+#include <linux/string.h>
 #include <net/fastboot.h>
 
 /**
diff --git a/drivers/fastboot/fb_getvar.c b/drivers/fastboot/fb_getvar.c
index faa785481ad..a7881cc7196 100644
--- a/drivers/fastboot/fb_getvar.c
+++ b/drivers/fastboot/fb_getvar.c
@@ -13,6 +13,7 @@
 #include <part.h>
 #include <version.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 static void getvar_version(char *var_parameter, char *response);
 static void getvar_version_bootloader(char *var_parameter, char *response);
diff --git a/drivers/fastboot/fb_mmc.c b/drivers/fastboot/fb_mmc.c
index d285d0f14fd..3512e2191f0 100644
--- a/drivers/fastboot/fb_mmc.c
+++ b/drivers/fastboot/fb_mmc.c
@@ -20,6 +20,7 @@
 #include <linux/compat.h>
 #include <android_image.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #define FASTBOOT_MAX_BLK_WRITE 16384
 
diff --git a/drivers/fastboot/fb_nand.c b/drivers/fastboot/fb_nand.c
index 1bf7ccb960b..c048600d44a 100644
--- a/drivers/fastboot/fb_nand.c
+++ b/drivers/fastboot/fb_nand.c
@@ -9,6 +9,7 @@
 #include <blk.h>
 #include <flash.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #include <fastboot.h>
 #include <image-sparse.h>
diff --git a/drivers/firmware/psci.c b/drivers/firmware/psci.c
index 23cf807591c..9f4a936ecb6 100644
--- a/drivers/firmware/psci.c
+++ b/drivers/firmware/psci.c
@@ -19,6 +19,7 @@
 #include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/psci.h>
+#include <linux/string.h>
 
 #define DRIVER_NAME "psci"
 
diff --git a/drivers/firmware/ti_sci.c b/drivers/firmware/ti_sci.c
index 15f5b0b14cc..1a38526d80a 100644
--- a/drivers/firmware/ti_sci.c
+++ b/drivers/firmware/ti_sci.c
@@ -21,6 +21,7 @@
 #include <linux/err.h>
 #include <linux/soc/ti/k3-sec-proxy.h>
 #include <linux/soc/ti/ti_sci_protocol.h>
+#include <linux/string.h>
 
 #include "ti_sci.h"
 
diff --git a/drivers/fpga/fpga.c b/drivers/fpga/fpga.c
index fe3dfa12335..4140c825452 100644
--- a/drivers/fpga/fpga.c
+++ b/drivers/fpga/fpga.c
@@ -12,6 +12,7 @@
 #include <altera.h>             /* altera specific definitions */
 #include <lattice.h>
 #include <dm/device_compat.h>
+#include <linux/string.h>
 
 /* Local definitions */
 #ifndef CONFIG_MAX_FPGA_DEVICES
diff --git a/drivers/fpga/socfpga_arria10.c b/drivers/fpga/socfpga_arria10.c
index 46018ebe7c6..89b338b6968 100644
--- a/drivers/fpga/socfpga_arria10.c
+++ b/drivers/fpga/socfpga_arria10.c
@@ -22,6 +22,7 @@
 #include <watchdog.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #define CFGWDTH_32	1
 #define MIN_BITSTREAM_SIZECHECK	230
diff --git a/drivers/fpga/stratix10.c b/drivers/fpga/stratix10.c
index bae31c3db1e..84f453f76e0 100644
--- a/drivers/fpga/stratix10.c
+++ b/drivers/fpga/stratix10.c
@@ -9,6 +9,7 @@
 #include <time.h>
 #include <asm/arch/mailbox_s10.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #define RECONFIG_STATUS_POLL_RESP_TIMEOUT_MS		60000
 #define RECONFIG_STATUS_INTERVAL_DELAY_US		1000000
diff --git a/drivers/fpga/versalpl.c b/drivers/fpga/versalpl.c
index 8e2ef4f0da9..5d67ce215ce 100644
--- a/drivers/fpga/versalpl.c
+++ b/drivers/fpga/versalpl.c
@@ -12,6 +12,7 @@
 #include <versalpl.h>
 #include <zynqmp_firmware.h>
 #include <asm/cache.h>
+#include <linux/string.h>
 
 static ulong versal_align_dma_buffer(ulong *buf, u32 len)
 {
diff --git a/drivers/fpga/xilinx.c b/drivers/fpga/xilinx.c
index cbebefb55fe..d9f3b82a40e 100644
--- a/drivers/fpga/xilinx.c
+++ b/drivers/fpga/xilinx.c
@@ -18,6 +18,7 @@
 #include <spartan2.h>
 #include <spartan3.h>
 #include <zynqpl.h>
+#include <linux/string.h>
 
 /* Local Static Functions */
 static int xilinx_validate(xilinx_desc *desc, char *fn);
diff --git a/drivers/gpio/74x164_gpio.c b/drivers/gpio/74x164_gpio.c
index 045685fcd9c..6d497613cc4 100644
--- a/drivers/gpio/74x164_gpio.c
+++ b/drivers/gpio/74x164_gpio.c
@@ -19,6 +19,7 @@
 #include <dm/device_compat.h>
 #include <dt-bindings/gpio/gpio.h>
 #include <spi.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/gpio/adi_gpio2.c b/drivers/gpio/adi_gpio2.c
index d0849c85c3b..8d4ee813985 100644
--- a/drivers/gpio/adi_gpio2.c
+++ b/drivers/gpio/adi_gpio2.c
@@ -12,6 +12,7 @@
 #include <linux/bug.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
+#include <linux/string.h>
 
 #define RESOURCE_LABEL_SIZE	16
 
diff --git a/drivers/gpio/axp_gpio.c b/drivers/gpio/axp_gpio.c
index 73058cf40b4..88993b643e2 100644
--- a/drivers/gpio/axp_gpio.c
+++ b/drivers/gpio/axp_gpio.c
@@ -15,6 +15,7 @@
 #include <dm/lists.h>
 #include <dm/root.h>
 #include <errno.h>
+#include <linux/string.h>
 
 static int axp_gpio_set_value(struct udevice *dev, unsigned pin, int val);
 
diff --git a/drivers/gpio/da8xx_gpio.c b/drivers/gpio/da8xx_gpio.c
index 614c489e45d..0f39972ceeb 100644
--- a/drivers/gpio/da8xx_gpio.c
+++ b/drivers/gpio/da8xx_gpio.c
@@ -14,6 +14,7 @@
 #include <asm/io.h>
 #include <asm/gpio.h>
 #include <dt-bindings/gpio/gpio.h>
+#include <linux/string.h>
 
 #include "da8xx_gpio.h"
 
diff --git a/drivers/gpio/gpio-uclass.c b/drivers/gpio/gpio-uclass.c
index 36de7bc7cc6..28f4a48900f 100644
--- a/drivers/gpio/gpio-uclass.c
+++ b/drivers/gpio/gpio-uclass.c
@@ -19,6 +19,7 @@
 #include <dm/device_compat.h>
 #include <linux/bug.h>
 #include <linux/ctype.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/gpio/hi6220_gpio.c b/drivers/gpio/hi6220_gpio.c
index 95de2ae3660..06151d21fba 100644
--- a/drivers/gpio/hi6220_gpio.c
+++ b/drivers/gpio/hi6220_gpio.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <errno.h>
 #include <linux/bitops.h>
+#include <linux/string.h>
 
 static int hi6220_gpio_direction_input(struct udevice *dev, unsigned int gpio)
 {
diff --git a/drivers/gpio/imx_rgpio2p.c b/drivers/gpio/imx_rgpio2p.c
index 1e876f69147..8ff37f2eccc 100644
--- a/drivers/gpio/imx_rgpio2p.c
+++ b/drivers/gpio/imx_rgpio2p.c
@@ -12,6 +12,7 @@
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <malloc.h>
+#include <linux/string.h>
 
 enum imx_rgpio2p_direction {
 	IMX_RGPIO2P_DIRECTION_IN,
diff --git a/drivers/gpio/intel_gpio.c b/drivers/gpio/intel_gpio.c
index 6a3a8c4cfaa..975293ff3ab 100644
--- a/drivers/gpio/intel_gpio.c
+++ b/drivers/gpio/intel_gpio.c
@@ -22,6 +22,7 @@
 #include <asm/arch/gpio.h>
 #include <dm/acpi.h>
 #include <dt-bindings/gpio/x86-gpio.h>
+#include <linux/string.h>
 
 static int intel_gpio_direction_input(struct udevice *dev, uint offset)
 {
diff --git a/drivers/gpio/lpc32xx_gpio.c b/drivers/gpio/lpc32xx_gpio.c
index 1265ee41a60..6ccc503e666 100644
--- a/drivers/gpio/lpc32xx_gpio.c
+++ b/drivers/gpio/lpc32xx_gpio.c
@@ -12,6 +12,7 @@
 #include <asm/arch-lpc32xx/gpio.h>
 #include <asm-generic/gpio.h>
 #include <dm.h>
+#include <linux/string.h>
 
 /**
  * LPC32xx GPIOs work in banks but are non-homogeneous:
diff --git a/drivers/gpio/mpc83xx_spisel_boot.c b/drivers/gpio/mpc83xx_spisel_boot.c
index c7b08404d93..eac0ff82ae6 100644
--- a/drivers/gpio/mpc83xx_spisel_boot.c
+++ b/drivers/gpio/mpc83xx_spisel_boot.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <mapmem.h>
 #include <asm/gpio.h>
+#include <linux/string.h>
 
 struct mpc83xx_spisel_boot {
 	u32 __iomem *spi_cs;
diff --git a/drivers/gpio/mpc8xxx_gpio.c b/drivers/gpio/mpc8xxx_gpio.c
index 1dfd22522c7..14ecfb42c58 100644
--- a/drivers/gpio/mpc8xxx_gpio.c
+++ b/drivers/gpio/mpc8xxx_gpio.c
@@ -12,6 +12,7 @@
 #include <dm.h>
 #include <mapmem.h>
 #include <asm/gpio.h>
+#include <linux/string.h>
 
 struct ccsr_gpio {
 	u32	gpdir;
diff --git a/drivers/gpio/mxc_gpio.c b/drivers/gpio/mxc_gpio.c
index a16f5719ede..5b57a7f0af6 100644
--- a/drivers/gpio/mxc_gpio.c
+++ b/drivers/gpio/mxc_gpio.c
@@ -13,6 +13,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
+#include <linux/string.h>
 
 enum mxc_gpio_direction {
 	MXC_GPIO_DIRECTION_IN,
diff --git a/drivers/gpio/mxs_gpio.c b/drivers/gpio/mxs_gpio.c
index 0340786712e..2a9f64d633c 100644
--- a/drivers/gpio/mxs_gpio.c
+++ b/drivers/gpio/mxs_gpio.c
@@ -15,6 +15,7 @@
 #include <asm/io.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/imx-regs.h>
+#include <linux/string.h>
 
 #if	defined(CONFIG_MX23)
 #define	PINCTRL_BANKS		3
diff --git a/drivers/gpio/omap_gpio.c b/drivers/gpio/omap_gpio.c
index 4200afba121..91d664e02ff 100644
--- a/drivers/gpio/omap_gpio.c
+++ b/drivers/gpio/omap_gpio.c
@@ -25,6 +25,7 @@
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <malloc.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/gpio/pca953x_gpio.c b/drivers/gpio/pca953x_gpio.c
index fd17d1a5910..4ffb3aa27f4 100644
--- a/drivers/gpio/pca953x_gpio.c
+++ b/drivers/gpio/pca953x_gpio.c
@@ -29,6 +29,7 @@
 #include <dm/device_compat.h>
 #include <dt-bindings/gpio/gpio.h>
 #include <linux/bitops.h>
+#include <linux/string.h>
 
 #define PCA953X_INPUT           0
 #define PCA953X_OUTPUT          1
diff --git a/drivers/gpio/pic32_gpio.c b/drivers/gpio/pic32_gpio.c
index 50c5376e00d..00f20c0979c 100644
--- a/drivers/gpio/pic32_gpio.c
+++ b/drivers/gpio/pic32_gpio.c
@@ -13,6 +13,7 @@
 #include <asm/gpio.h>
 #include <linux/bitops.h>
 #include <linux/compat.h>
+#include <linux/string.h>
 #include <mach/pic32.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/gpio/rk_gpio.c b/drivers/gpio/rk_gpio.c
index 8cc288581c9..3cabd11b5c5 100644
--- a/drivers/gpio/rk_gpio.c
+++ b/drivers/gpio/rk_gpio.c
@@ -16,6 +16,7 @@
 #include <asm/arch-rockchip/gpio.h>
 #include <dm/pinctrl.h>
 #include <dt-bindings/clock/rk3288-cru.h>
+#include <linux/string.h>
 
 enum {
 	ROCKCHIP_GPIOS_PER_BANK		= 32,
diff --git a/drivers/gpio/sifive-gpio.c b/drivers/gpio/sifive-gpio.c
index bf3537b76bd..eb8b8f65e98 100644
--- a/drivers/gpio/sifive-gpio.c
+++ b/drivers/gpio/sifive-gpio.c
@@ -12,6 +12,7 @@
 #include <errno.h>
 #include <asm/gpio.h>
 #include <linux/bitops.h>
+#include <linux/string.h>
 
 static int sifive_gpio_probe(struct udevice *dev)
 {
diff --git a/drivers/gpio/sunxi_gpio.c b/drivers/gpio/sunxi_gpio.c
index 3efccf496fc..973854ca613 100644
--- a/drivers/gpio/sunxi_gpio.c
+++ b/drivers/gpio/sunxi_gpio.c
@@ -19,6 +19,7 @@
 #include <asm/gpio.h>
 #include <dm/device-internal.h>
 #include <dt-bindings/gpio/gpio.h>
+#include <linux/string.h>
 
 #define SUNXI_GPIOS_PER_BANK	SUNXI_GPIO_A_NR
 
diff --git a/drivers/gpio/xilinx_gpio.c b/drivers/gpio/xilinx_gpio.c
index 014f120d609..23de1f44e9c 100644
--- a/drivers/gpio/xilinx_gpio.c
+++ b/drivers/gpio/xilinx_gpio.c
@@ -12,6 +12,7 @@
 #include <asm/gpio.h>
 #include <dm.h>
 #include <dt-bindings/gpio/gpio.h>
+#include <linux/string.h>
 
 #define XILINX_GPIO_MAX_BANK	2
 
diff --git a/drivers/gpio/zynq_gpio.c b/drivers/gpio/zynq_gpio.c
index d0e90b8d633..8888d2324c4 100644
--- a/drivers/gpio/zynq_gpio.c
+++ b/drivers/gpio/zynq_gpio.c
@@ -15,6 +15,7 @@
 #include <linux/errno.h>
 #include <dm.h>
 #include <fdtdec.h>
+#include <linux/string.h>
 
 /* Maximum banks */
 #define ZYNQ_GPIO_MAX_BANK	4
diff --git a/drivers/i2c/fsl_i2c.c b/drivers/i2c/fsl_i2c.c
index e7a8dcc8212..c2000104b51 100644
--- a/drivers/i2c/fsl_i2c.c
+++ b/drivers/i2c/fsl_i2c.c
@@ -18,6 +18,7 @@
 #include <dm.h>
 #include <mapmem.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 /* The maximum number of microseconds we will wait until another master has
  * released the bus.  If not defined in the board header file, then use a
diff --git a/drivers/i2c/i2c-uclass.c b/drivers/i2c/i2c-uclass.c
index 2373aa2ea4c..c16bda46978 100644
--- a/drivers/i2c/i2c-uclass.c
+++ b/drivers/i2c/i2c-uclass.c
@@ -16,6 +16,7 @@
 #include <asm/gpio.h>
 #endif
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #define I2C_MAX_OFFSET_LEN	4
 
diff --git a/drivers/i2c/ihs_i2c.c b/drivers/i2c/ihs_i2c.c
index 1c39b8c9dfc..f6cd1222b87 100644
--- a/drivers/i2c/ihs_i2c.c
+++ b/drivers/i2c/ihs_i2c.c
@@ -17,6 +17,7 @@
 #include <asm/unaligned.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #ifdef CONFIG_DM_I2C
 struct ihs_i2c_priv {
diff --git a/drivers/i2c/intel_i2c.c b/drivers/i2c/intel_i2c.c
index a7ac09a27e5..fa36f48df9a 100644
--- a/drivers/i2c/intel_i2c.c
+++ b/drivers/i2c/intel_i2c.c
@@ -14,6 +14,7 @@
 #include <pci.h>
 #include <time.h>
 #include <asm/io.h>
+#include <linux/string.h>
 
 /* PCI Configuration Space (D31:F3): SMBus */
 #define SMB_BASE		0x20
diff --git a/drivers/i2c/lpc32xx_i2c.c b/drivers/i2c/lpc32xx_i2c.c
index 6af2e975cf3..8aef939981f 100644
--- a/drivers/i2c/lpc32xx_i2c.c
+++ b/drivers/i2c/lpc32xx_i2c.c
@@ -15,6 +15,7 @@
 #include <asm/arch/i2c.h>
 #include <dm.h>
 #include <mapmem.h>
+#include <linux/string.h>
 
 /*
  * Provide default speed and slave if target did not
diff --git a/drivers/i2c/muxes/i2c-mux-uclass.c b/drivers/i2c/muxes/i2c-mux-uclass.c
index 26897554b0f..8f6d1547f16 100644
--- a/drivers/i2c/muxes/i2c-mux-uclass.c
+++ b/drivers/i2c/muxes/i2c-mux-uclass.c
@@ -12,6 +12,7 @@
 #include <malloc.h>
 #include <dm/lists.h>
 #include <dm/root.h>
+#include <linux/string.h>
 
 /**
  * struct i2c_mux: Information the uclass stores about an I2C mux
diff --git a/drivers/i2c/mv_i2c.c b/drivers/i2c/mv_i2c.c
index 59675d8d574..54fa069528b 100644
--- a/drivers/i2c/mv_i2c.c
+++ b/drivers/i2c/mv_i2c.c
@@ -22,6 +22,7 @@
 #include <log.h>
 #include <asm/io.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include "mv_i2c.h"
 
 /* All transfers are described by this data structure */
diff --git a/drivers/i2c/mvtwsi.c b/drivers/i2c/mvtwsi.c
index 21383ecf132..1cc9cfc2eb8 100644
--- a/drivers/i2c/mvtwsi.c
+++ b/drivers/i2c/mvtwsi.c
@@ -19,6 +19,7 @@
 #ifdef CONFIG_DM_I2C
 #include <dm.h>
 #endif
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/i2c/stm32f7_i2c.c b/drivers/i2c/stm32f7_i2c.c
index fc60f5285ab..0f5c8446365 100644
--- a/drivers/i2c/stm32f7_i2c.c
+++ b/drivers/i2c/stm32f7_i2c.c
@@ -15,6 +15,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #include <dm/device.h>
 #include <linux/err.h>
diff --git a/drivers/i2c/tegra186_bpmp_i2c.c b/drivers/i2c/tegra186_bpmp_i2c.c
index 0a507079a2d..897627a1236 100644
--- a/drivers/i2c/tegra186_bpmp_i2c.c
+++ b/drivers/i2c/tegra186_bpmp_i2c.c
@@ -11,6 +11,7 @@
 #include <asm/arch-tegra/bpmp_abi.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/i2c/tegra_i2c.c b/drivers/i2c/tegra_i2c.c
index 96a436a8dc1..2cb51473a6c 100644
--- a/drivers/i2c/tegra_i2c.c
+++ b/drivers/i2c/tegra_i2c.c
@@ -22,6 +22,7 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 enum i2c_type {
 	TYPE_114,
diff --git a/drivers/input/cros_ec_keyb.c b/drivers/input/cros_ec_keyb.c
index 00bf58f2b5d..c09a66376af 100644
--- a/drivers/input/cros_ec_keyb.c
+++ b/drivers/input/cros_ec_keyb.c
@@ -14,6 +14,7 @@
 #include <key_matrix.h>
 #include <log.h>
 #include <stdio_dev.h>
+#include <linux/string.h>
 
 enum {
 	KBC_MAX_KEYS		= 8,	/* Maximum keys held down at once */
diff --git a/drivers/input/i8042.c b/drivers/input/i8042.c
index ca2978e79d5..b484cebfb4e 100644
--- a/drivers/input/i8042.c
+++ b/drivers/input/i8042.c
@@ -17,6 +17,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/input/input.c b/drivers/input/input.c
index 24e76052b88..37dae11d97a 100644
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -19,6 +19,7 @@
 #endif
 #include <time.h>
 #include <linux/input.h>
+#include <linux/string.h>
 
 enum {
 	/* These correspond to the lights on the keyboard */
diff --git a/drivers/input/key_matrix.c b/drivers/input/key_matrix.c
index 4631728b8b5..4742d575984 100644
--- a/drivers/input/key_matrix.c
+++ b/drivers/input/key_matrix.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <linux/input.h>
+#include <linux/string.h>
 
 /**
  * Determine if the current keypress configuration can cause key ghosting
diff --git a/drivers/input/keyboard-uclass.c b/drivers/input/keyboard-uclass.c
index f19934e6bb6..a265c02efe7 100644
--- a/drivers/input/keyboard-uclass.c
+++ b/drivers/input/keyboard-uclass.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <keyboard.h>
 #include <log.h>
+#include <linux/string.h>
 
 static int keyboard_start(struct stdio_dev *sdev)
 {
diff --git a/drivers/input/tegra-kbc.c b/drivers/input/tegra-kbc.c
index 74ece4762e3..3654510858f 100644
--- a/drivers/input/tegra-kbc.c
+++ b/drivers/input/tegra-kbc.c
@@ -20,6 +20,7 @@
 #include <asm/arch-tegra/timer.h>
 #include <linux/delay.h>
 #include <linux/input.h>
+#include <linux/string.h>
 
 enum {
 	KBC_MAX_GPIO		= 24,
diff --git a/drivers/led/led-uclass.c b/drivers/led/led-uclass.c
index 2859475a6b8..ae9c3cbd7d3 100644
--- a/drivers/led/led-uclass.c
+++ b/drivers/led/led-uclass.c
@@ -11,6 +11,7 @@
 #include <dm/device-internal.h>
 #include <dm/root.h>
 #include <dm/uclass-internal.h>
+#include <linux/string.h>
 
 int led_get_by_label(const char *label, struct udevice **devp)
 {
diff --git a/drivers/misc/atsha204a-i2c.c b/drivers/misc/atsha204a-i2c.c
index c79c260783e..779e1a17607 100644
--- a/drivers/misc/atsha204a-i2c.c
+++ b/drivers/misc/atsha204a-i2c.c
@@ -18,6 +18,7 @@
 #include <log.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include <u-boot/crc.h>
 
 #define ATSHA204A_TWLO			60
diff --git a/drivers/misc/cbmem_console.c b/drivers/misc/cbmem_console.c
index 5ba0a542060..dfa99175d3d 100644
--- a/drivers/misc/cbmem_console.c
+++ b/drivers/misc/cbmem_console.c
@@ -8,6 +8,7 @@
 #ifndef CONFIG_SYS_COREBOOT
 #error This driver requires coreboot
 #endif
+#include <linux/string.h>
 
 #include <asm/arch/sysinfo.h>
 
diff --git a/drivers/misc/cros_ec.c b/drivers/misc/cros_ec.c
index ccac7a60c12..881dce016fa 100644
--- a/drivers/misc/cros_ec.c
+++ b/drivers/misc/cros_ec.c
@@ -33,6 +33,7 @@
 #include <dm/device-internal.h>
 #include <dm/of_extra.h>
 #include <dm/uclass-internal.h>
+#include <linux/string.h>
 
 #ifdef DEBUG_TRACE
 #define debug_trace(fmt, b...)	debug(fmt, #b)
diff --git a/drivers/misc/cros_ec_i2c.c b/drivers/misc/cros_ec_i2c.c
index c00f5f764a0..6a5dcc016f2 100644
--- a/drivers/misc/cros_ec_i2c.c
+++ b/drivers/misc/cros_ec_i2c.c
@@ -17,6 +17,7 @@
 #include <i2c.h>
 #include <cros_ec.h>
 #include <log.h>
+#include <linux/string.h>
 
 #ifdef DEBUG_TRACE
 #define debug_trace(fmt, b...)	debug(fmt, #b)
diff --git a/drivers/misc/cros_ec_sandbox.c b/drivers/misc/cros_ec_sandbox.c
index 8575e56a337..81d2191542c 100644
--- a/drivers/misc/cros_ec_sandbox.c
+++ b/drivers/misc/cros_ec_sandbox.c
@@ -14,6 +14,7 @@
 #include <log.h>
 #include <os.h>
 #include <time.h>
+#include <linux/string.h>
 #include <u-boot/sha256.h>
 #include <spi.h>
 #include <asm/malloc.h>
diff --git a/drivers/misc/cros_ec_spi.c b/drivers/misc/cros_ec_spi.c
index d8778eeb387..357e31f7edc 100644
--- a/drivers/misc/cros_ec_spi.c
+++ b/drivers/misc/cros_ec_spi.c
@@ -19,6 +19,7 @@
 #include <log.h>
 #include <spi.h>
 #include <time.h>
+#include <linux/string.h>
 
 int cros_ec_spi_packet(struct udevice *udev, int out_bytes, int in_bytes)
 {
diff --git a/drivers/misc/ds4510.c b/drivers/misc/ds4510.c
index a2a52915654..d914123fdf9 100644
--- a/drivers/misc/ds4510.c
+++ b/drivers/misc/ds4510.c
@@ -12,6 +12,7 @@
 #include <i2c.h>
 #include <command.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include "ds4510.h"
 
 enum {
diff --git a/drivers/misc/fsl_portals.c b/drivers/misc/fsl_portals.c
index 632430e4209..2c8cec7c421 100644
--- a/drivers/misc/fsl_portals.c
+++ b/drivers/misc/fsl_portals.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
+#include <linux/string.h>
 
 #include <asm/processor.h>
 #include <asm/io.h>
diff --git a/drivers/misc/gdsys_ioep.c b/drivers/misc/gdsys_ioep.c
index 69e16a06a0a..8c65f1473c3 100644
--- a/drivers/misc/gdsys_ioep.c
+++ b/drivers/misc/gdsys_ioep.c
@@ -16,6 +16,7 @@
 #include <log.h>
 #include <misc.h>
 #include <regmap.h>
+#include <linux/string.h>
 
 #include "gdsys_ioep.h"
 
diff --git a/drivers/misc/i2c_eeprom_emul.c b/drivers/misc/i2c_eeprom_emul.c
index 6be76ad02ef..925120ea0d5 100644
--- a/drivers/misc/i2c_eeprom_emul.c
+++ b/drivers/misc/i2c_eeprom_emul.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <asm/test.h>
+#include <linux/string.h>
 
 #ifdef DEBUG
 #define debug_buffer print_buffer
diff --git a/drivers/misc/ihs_fpga.c b/drivers/misc/ihs_fpga.c
index 00d34a3adc2..9d9d52e978c 100644
--- a/drivers/misc/ihs_fpga.c
+++ b/drivers/misc/ihs_fpga.c
@@ -16,6 +16,7 @@
 #include <asm/gpio.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include "ihs_fpga.h"
 
diff --git a/drivers/misc/misc_sandbox.c b/drivers/misc/misc_sandbox.c
index f7c5b2e25fa..9ea2a35db60 100644
--- a/drivers/misc/misc_sandbox.c
+++ b/drivers/misc/misc_sandbox.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <misc.h>
+#include <linux/string.h>
 
 struct misc_sandbox_priv {
 	u8 mem[128];
diff --git a/drivers/misc/mpc83xx_serdes.c b/drivers/misc/mpc83xx_serdes.c
index ab1e34e6f46..b2f23e1343b 100644
--- a/drivers/misc/mpc83xx_serdes.c
+++ b/drivers/misc/mpc83xx_serdes.c
@@ -15,6 +15,7 @@
 #include <mapmem.h>
 #include <misc.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include "mpc83xx_serdes.h"
 
diff --git a/drivers/misc/qfw.c b/drivers/misc/qfw.c
index f6eb6583ed0..fed08422419 100644
--- a/drivers/misc/qfw.c
+++ b/drivers/misc/qfw.c
@@ -14,6 +14,7 @@
 #include <asm/tables.h>
 #endif
 #include <linux/list.h>
+#include <linux/string.h>
 
 static bool fwcfg_present;
 static bool fwcfg_dma_present;
diff --git a/drivers/misc/rockchip-efuse.c b/drivers/misc/rockchip-efuse.c
index 46ce6305fe6..adaa51ce99b 100644
--- a/drivers/misc/rockchip-efuse.c
+++ b/drivers/misc/rockchip-efuse.c
@@ -14,6 +14,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <misc.h>
+#include <linux/string.h>
 
 #define RK3399_A_SHIFT          16
 #define RK3399_A_MASK           0x3ff
diff --git a/drivers/misc/sifive-otp.c b/drivers/misc/sifive-otp.c
index 0a4fa67f335..7d502febea4 100644
--- a/drivers/misc/sifive-otp.c
+++ b/drivers/misc/sifive-otp.c
@@ -25,6 +25,7 @@
 #include <linux/io.h>
 #include <misc.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #define BYTES_PER_FUSE		4
 
diff --git a/drivers/misc/tegra186_bpmp.c b/drivers/misc/tegra186_bpmp.c
index 73cc2666e49..c9079b86a7a 100644
--- a/drivers/misc/tegra186_bpmp.c
+++ b/drivers/misc/tegra186_bpmp.c
@@ -18,6 +18,7 @@
 #include <linux/bitops.h>
 #include <linux/err.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #define BPMP_IVC_FRAME_COUNT 1
 #define BPMP_IVC_FRAME_SIZE 128
diff --git a/drivers/misc/vexpress_config.c b/drivers/misc/vexpress_config.c
index 02e5b586e29..9a9c5f75573 100644
--- a/drivers/misc/vexpress_config.c
+++ b/drivers/misc/vexpress_config.c
@@ -12,6 +12,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <misc.h>
+#include <linux/string.h>
 
 #define SYS_CFGDATA		0xa0
 
diff --git a/drivers/mmc/ca_dw_mmc.c b/drivers/mmc/ca_dw_mmc.c
index 562dcb8ee35..8ae5bd41454 100644
--- a/drivers/mmc/ca_dw_mmc.c
+++ b/drivers/mmc/ca_dw_mmc.c
@@ -13,6 +13,7 @@
 #include <errno.h>
 #include <dm.h>
 #include <mapmem.h>
+#include <linux/string.h>
 
 #define SD_CLK_SEL_MASK (0x3)
 #define SD_DLL_DEFAULT  (0x143000)
diff --git a/drivers/mmc/davinci_mmc.c b/drivers/mmc/davinci_mmc.c
index 0a05fb13bc9..9b2fe0653c6 100644
--- a/drivers/mmc/davinci_mmc.c
+++ b/drivers/mmc/davinci_mmc.c
@@ -17,6 +17,7 @@
 #include <asm/arch/sdmmc_defs.h>
 #include <asm-generic/gpio.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #define WATCHDOG_COUNT		(100000)
 
diff --git a/drivers/mmc/fsl_esdhc_imx.c b/drivers/mmc/fsl_esdhc_imx.c
index 5fdcffd5d2c..29292147bcb 100644
--- a/drivers/mmc/fsl_esdhc_imx.c
+++ b/drivers/mmc/fsl_esdhc_imx.c
@@ -28,6 +28,7 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include <power/regulator.h>
 #include <malloc.h>
 #include <fsl_esdhc_imx.h>
diff --git a/drivers/mmc/fsl_esdhc_spl.c b/drivers/mmc/fsl_esdhc_spl.c
index afe55fad9de..033fd0edd8f 100644
--- a/drivers/mmc/fsl_esdhc_spl.c
+++ b/drivers/mmc/fsl_esdhc_spl.c
@@ -8,6 +8,7 @@
 #include <hang.h>
 #include <mmc.h>
 #include <malloc.h>
+#include <linux/string.h>
 
 /*
  * The environment variables are written to just after the u-boot image
diff --git a/drivers/mmc/ftsdc010_mci.c b/drivers/mmc/ftsdc010_mci.c
index 113ed2b7a71..b26571e0a69 100644
--- a/drivers/mmc/ftsdc010_mci.c
+++ b/drivers/mmc/ftsdc010_mci.c
@@ -22,6 +22,7 @@
 #include <linux/errno.h>
 #include <asm/byteorder.h>
 #include <faraday/ftsdc010.h>
+#include <linux/string.h>
 #include "ftsdc010_mci.h"
 #include <dm.h>
 #include <dt-structs.h>
diff --git a/drivers/mmc/iproc_sdhci.c b/drivers/mmc/iproc_sdhci.c
index 7eda1d606fd..ef7d8f8b41e 100644
--- a/drivers/mmc/iproc_sdhci.c
+++ b/drivers/mmc/iproc_sdhci.c
@@ -11,6 +11,7 @@
 #include <sdhci.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/mmc/meson_gx_mmc.c b/drivers/mmc/meson_gx_mmc.c
index f70ced37d31..2afc80ff0c5 100644
--- a/drivers/mmc/meson_gx_mmc.c
+++ b/drivers/mmc/meson_gx_mmc.c
@@ -17,6 +17,7 @@
 #include <asm/arch/sd_emmc.h>
 #include <linux/delay.h>
 #include <linux/log2.h>
+#include <linux/string.h>
 
 static inline void *get_regbase(const struct mmc *mmc)
 {
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index 544534a78a7..e8c2360f976 100644
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@ -21,6 +21,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include <power/regulator.h>
 #include <malloc.h>
 #include <memalign.h>
diff --git a/drivers/mmc/mmc_spi.c b/drivers/mmc/mmc_spi.c
index 50fcd32674f..56755c66fd2 100644
--- a/drivers/mmc/mmc_spi.c
+++ b/drivers/mmc/mmc_spi.c
@@ -14,6 +14,7 @@
 #include <mmc.h>
 #include <stdlib.h>
 #include <linux/bitops.h>
+#include <linux/string.h>
 #include <u-boot/crc.h>
 #include <linux/crc7.h>
 #include <asm/byteorder.h>
diff --git a/drivers/mmc/msm_sdhci.c b/drivers/mmc/msm_sdhci.c
index 525c1dc9027..27d8fb84fab 100644
--- a/drivers/mmc/msm_sdhci.c
+++ b/drivers/mmc/msm_sdhci.c
@@ -16,6 +16,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
+#include <linux/string.h>
 
 /* Non-standard registers needed for SDHCI startup */
 #define SDCC_MCI_POWER   0x0
diff --git a/drivers/mmc/mv_sdhci.c b/drivers/mmc/mv_sdhci.c
index fa7c12837d1..356d161d51f 100644
--- a/drivers/mmc/mv_sdhci.c
+++ b/drivers/mmc/mv_sdhci.c
@@ -9,6 +9,7 @@
 #include <sdhci.h>
 #include <asm/global_data.h>
 #include <linux/mbus.h>
+#include <linux/string.h>
 
 #define MVSDH_NAME "mv_sdh"
 
diff --git a/drivers/mmc/mxcmmc.c b/drivers/mmc/mxcmmc.c
index 0057273a2a7..5ca4a5140e1 100644
--- a/drivers/mmc/mxcmmc.c
+++ b/drivers/mmc/mxcmmc.c
@@ -27,6 +27,7 @@
 #include <linux/errno.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
+#include <linux/string.h>
 
 #define DRIVER_NAME "mxc-mmc"
 
diff --git a/drivers/mmc/mxsmmc.c b/drivers/mmc/mxsmmc.c
index 2b3a3a992cb..5bb12b612e3 100644
--- a/drivers/mmc/mxsmmc.c
+++ b/drivers/mmc/mxsmmc.c
@@ -33,6 +33,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/mach-imx/dma.h>
 #include <bouncebuf.h>
+#include <linux/string.h>
 
 #define	MXSMMC_MAX_TIMEOUT	10000
 #define MXSMMC_SMALL_TRANSFER	512
diff --git a/drivers/mmc/pxa_mmc_gen.c b/drivers/mmc/pxa_mmc_gen.c
index 2c081fdc69f..7d88ca015c1 100644
--- a/drivers/mmc/pxa_mmc_gen.c
+++ b/drivers/mmc/pxa_mmc_gen.c
@@ -18,6 +18,7 @@
 #include <dm/platform_data/pxa_mmc_gen.h>
 #include <malloc.h>
 #include <mmc.h>
+#include <linux/string.h>
 
 /* PXAMMC Generic default config for various CPUs */
 #if defined(CONFIG_CPU_PXA25X)
diff --git a/drivers/mmc/rpmb.c b/drivers/mmc/rpmb.c
index ea7e506666b..7a596b2f19b 100644
--- a/drivers/mmc/rpmb.c
+++ b/drivers/mmc/rpmb.c
@@ -13,6 +13,7 @@
 #include <memalign.h>
 #include <mmc.h>
 #include <sdhci.h>
+#include <linux/string.h>
 #include <u-boot/sha256.h>
 #include "mmc_private.h"
 
diff --git a/drivers/mmc/sandbox_mmc.c b/drivers/mmc/sandbox_mmc.c
index e86ea8fe096..d4780271fc3 100644
--- a/drivers/mmc/sandbox_mmc.c
+++ b/drivers/mmc/sandbox_mmc.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <mmc.h>
 #include <asm/test.h>
+#include <linux/string.h>
 
 struct sandbox_mmc_plat {
 	struct mmc_config cfg;
diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c
index 01dc9c3fd54..d4bc40f19e2 100644
--- a/drivers/mmc/sdhci.c
+++ b/drivers/mmc/sdhci.c
@@ -23,6 +23,7 @@
 #include <linux/dma-mapping.h>
 #include <phys2bus.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 static void sdhci_reset(struct sdhci_host *host, u8 mask)
 {
diff --git a/drivers/mmc/sh_mmcif.c b/drivers/mmc/sh_mmcif.c
index f7dd2aadc3e..5f25acd55db 100644
--- a/drivers/mmc/sh_mmcif.c
+++ b/drivers/mmc/sh_mmcif.c
@@ -22,6 +22,7 @@
 #include <linux/compat.h>
 #include <linux/io.h>
 #include <linux/sizes.h>
+#include <linux/string.h>
 #include "sh_mmcif.h"
 
 #define DRIVER_NAME	"sh_mmcif"
diff --git a/drivers/mmc/snps_dw_mmc.c b/drivers/mmc/snps_dw_mmc.c
index c606ef011bf..f7c64312154 100644
--- a/drivers/mmc/snps_dw_mmc.c
+++ b/drivers/mmc/snps_dw_mmc.c
@@ -17,6 +17,7 @@
 #include <linux/libfdt.h>
 #include <linux/err.h>
 #include <malloc.h>
+#include <linux/string.h>
 
 #define CLOCK_MIN		400000	/*  400 kHz */
 #define FIFO_MIN		8
diff --git a/drivers/mmc/sti_sdhci.c b/drivers/mmc/sti_sdhci.c
index 11ae392734c..394c4d19b56 100644
--- a/drivers/mmc/sti_sdhci.c
+++ b/drivers/mmc/sti_sdhci.c
@@ -13,6 +13,7 @@
 #include <asm/arch/sdhci.h>
 #include <asm/global_data.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/mmc/sunxi_mmc.c b/drivers/mmc/sunxi_mmc.c
index f9046305930..96d8f18d0f5 100644
--- a/drivers/mmc/sunxi_mmc.c
+++ b/drivers/mmc/sunxi_mmc.c
@@ -23,6 +23,7 @@
 #include <asm/arch/mmc.h>
 #include <asm-generic/gpio.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #ifdef CONFIG_DM_MMC
 struct sunxi_mmc_variant {
diff --git a/drivers/mmc/xenon_sdhci.c b/drivers/mmc/xenon_sdhci.c
index 50c5b194cad..57fe6a4df23 100644
--- a/drivers/mmc/xenon_sdhci.c
+++ b/drivers/mmc/xenon_sdhci.c
@@ -24,6 +24,7 @@
 #include <malloc.h>
 #include <sdhci.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/mtd/altera_qspi.c b/drivers/mtd/altera_qspi.c
index 346244e1110..c406963d757 100644
--- a/drivers/mtd/altera_qspi.c
+++ b/drivers/mtd/altera_qspi.c
@@ -14,6 +14,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c
index 74cf47b7637..21cdf62478a 100644
--- a/drivers/mtd/cfi_flash.c
+++ b/drivers/mtd/cfi_flash.c
@@ -34,6 +34,7 @@
 #include <asm/unaligned.h>
 #include <env_internal.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include <mtd/cfi_flash.h>
 #include <watchdog.h>
 
diff --git a/drivers/mtd/cfi_mtd.c b/drivers/mtd/cfi_mtd.c
index a5bb0962e55..21ca7bd65d4 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 <linux/string.h>
 
 #include <linux/errno.h>
 #include <linux/mtd/mtd.h>
diff --git a/drivers/mtd/mtd_uboot.c b/drivers/mtd/mtd_uboot.c
index 2499cb52d8c..16fe4ecdb6e 100644
--- a/drivers/mtd/mtd_uboot.c
+++ b/drivers/mtd/mtd_uboot.c
@@ -14,6 +14,7 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 #include <mtd.h>
+#include <linux/string.h>
 
 #define MTD_NAME_MAX_LEN 20
 
diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c
index cad11805690..ef3eb456ac8 100644
--- a/drivers/mtd/mtdpart.c
+++ b/drivers/mtd/mtdpart.c
@@ -26,6 +26,7 @@
 #include <linux/compat.h>
 #include <ubi_uboot.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
diff --git a/drivers/mtd/nand/raw/atmel_nand.c b/drivers/mtd/nand/raw/atmel_nand.c
index 599bdfc0d6d..dcd5f8ff82e 100644
--- a/drivers/mtd/nand/raw/atmel_nand.c
+++ b/drivers/mtd/nand/raw/atmel_nand.c
@@ -20,6 +20,7 @@
 #include <linux/bug.h>
 #include <linux/delay.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #include <malloc.h>
 #include <nand.h>
diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand.c b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
index a57013e72c4..3ac5b444516 100644
--- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c
+++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
@@ -29,6 +29,7 @@
 #include <linux/log2.h>
 #include <asm/processor.h>
 #include <dm.h>
+#include <linux/string.h>
 
 #include "brcmnand.h"
 #include "brcmnand_compat.h"
diff --git a/drivers/mtd/nand/raw/denali.c b/drivers/mtd/nand/raw/denali.c
index ab91db85467..ca99aa88b3d 100644
--- a/drivers/mtd/nand/raw/denali.c
+++ b/drivers/mtd/nand/raw/denali.c
@@ -23,6 +23,7 @@
 #include <linux/io.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/rawnand.h>
+#include <linux/string.h>
 
 #include "denali.h"
 
diff --git a/drivers/mtd/nand/raw/denali_spl.c b/drivers/mtd/nand/raw/denali_spl.c
index f72142817e7..7252e0340c6 100644
--- a/drivers/mtd/nand/raw/denali_spl.c
+++ b/drivers/mtd/nand/raw/denali_spl.c
@@ -10,6 +10,7 @@
 #include <asm/unaligned.h>
 #include <linux/delay.h>
 #include <linux/mtd/rawnand.h>
+#include <linux/string.h>
 #include "denali.h"
 
 #define DENALI_MAP01		(1 << 26)	/* read/write pages in PIO */
diff --git a/drivers/mtd/nand/raw/fsmc_nand.c b/drivers/mtd/nand/raw/fsmc_nand.c
index ad34af30e81..a5ef0ae75e0 100644
--- a/drivers/mtd/nand/raw/fsmc_nand.c
+++ b/drivers/mtd/nand/raw/fsmc_nand.c
@@ -16,6 +16,7 @@
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/fsmc_nand.h>
 #include <asm/arch/hardware.h>
+#include <linux/string.h>
 
 static u32 fsmc_version;
 static struct fsmc_regs *const fsmc_regs_p = (struct fsmc_regs *)
diff --git a/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c b/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c
index 588fb010ee8..cfa2510b038 100644
--- a/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c
+++ b/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c
@@ -28,6 +28,7 @@
 #include <asm/arch/clk.h>
 #include <asm/arch/sys_proto.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 /*
  * MLC NAND controller registers.
diff --git a/drivers/mtd/nand/raw/mxs_nand.c b/drivers/mtd/nand/raw/mxs_nand.c
index a7852a841ce..3ba3afbbf29 100644
--- a/drivers/mtd/nand/raw/mxs_nand.c
+++ b/drivers/mtd/nand/raw/mxs_nand.c
@@ -19,6 +19,7 @@
 #include <asm/cache.h>
 #include <linux/mtd/rawnand.h>
 #include <linux/sizes.h>
+#include <linux/string.h>
 #include <linux/types.h>
 #include <malloc.h>
 #include <linux/errno.h>
diff --git a/drivers/mtd/nand/raw/mxs_nand_spl.c b/drivers/mtd/nand/raw/mxs_nand_spl.c
index ee778e13aa1..2e1f4c522a6 100644
--- a/drivers/mtd/nand/raw/mxs_nand_spl.c
+++ b/drivers/mtd/nand/raw/mxs_nand_spl.c
@@ -14,6 +14,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/string.h>
 
 static struct mtd_info *mtd;
 static struct nand_chip nand_chip;
diff --git a/drivers/mtd/nand/raw/nand_base.c b/drivers/mtd/nand/raw/nand_base.c
index 693e088f19a..a6b3504facd 100644
--- a/drivers/mtd/nand/raw/nand_base.c
+++ b/drivers/mtd/nand/raw/nand_base.c
@@ -53,6 +53,7 @@
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 /* Define default oob placement schemes for large and small page devices */
 #ifndef CONFIG_SYS_NAND_DRIVER_ECC_LAYOUT
diff --git a/drivers/mtd/nand/raw/nand_bch.c b/drivers/mtd/nand/raw/nand_bch.c
index bb48ebbb96c..5733bcb9c62 100644
--- a/drivers/mtd/nand/raw/nand_bch.c
+++ b/drivers/mtd/nand/raw/nand_bch.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <dm/devres.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 /*#include <asm/io.h>*/
 #include <linux/types.h>
 
diff --git a/drivers/mtd/nand/raw/nand_spl_loaders.c b/drivers/mtd/nand/raw/nand_spl_loaders.c
index 4befc75c047..f297205bc79 100644
--- a/drivers/mtd/nand/raw/nand_spl_loaders.c
+++ b/drivers/mtd/nand/raw/nand_spl_loaders.c
@@ -1,3 +1,4 @@
+#include <linux/string.h>
 int nand_spl_load_image(uint32_t offs, unsigned int size, void *dst)
 {
 	unsigned int block, lastblock;
diff --git a/drivers/mtd/nand/raw/nand_util.c b/drivers/mtd/nand/raw/nand_util.c
index 5b74ef0dfdb..264a1efada9 100644
--- a/drivers/mtd/nand/raw/nand_util.c
+++ b/drivers/mtd/nand/raw/nand_util.c
@@ -27,6 +27,7 @@
 #include <div64.h>
 #include <asm/cache.h>
 #include <dm/devres.h>
+#include <linux/string.h>
 
 #include <linux/errno.h>
 #include <linux/mtd/mtd.h>
diff --git a/drivers/mtd/nand/raw/omap_gpmc.c b/drivers/mtd/nand/raw/omap_gpmc.c
index 97fd5690f51..9fef305da1c 100644
--- a/drivers/mtd/nand/raw/omap_gpmc.c
+++ b/drivers/mtd/nand/raw/omap_gpmc.c
@@ -15,6 +15,7 @@
 #include <linux/compiler.h>
 #include <nand.h>
 #include <linux/mtd/omap_elm.h>
+#include <linux/string.h>
 
 #define BADBLOCK_MARKER_LENGTH	2
 #define SECTOR_BYTES		512
diff --git a/drivers/mtd/nand/raw/pxa3xx_nand.c b/drivers/mtd/nand/raw/pxa3xx_nand.c
index bccaa2d8212..e222fb994b0 100644
--- a/drivers/mtd/nand/raw/pxa3xx_nand.c
+++ b/drivers/mtd/nand/raw/pxa3xx_nand.c
@@ -24,6 +24,7 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/rawnand.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include <linux/types.h>
 
 #include "pxa3xx_nand.h"
diff --git a/drivers/mtd/nand/raw/sunxi_nand.c b/drivers/mtd/nand/raw/sunxi_nand.c
index 606e606fe8b..5fd741f1124 100644
--- a/drivers/mtd/nand/raw/sunxi_nand.c
+++ b/drivers/mtd/nand/raw/sunxi_nand.c
@@ -37,6 +37,7 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #include <linux/kernel.h>
 #include <linux/mtd/mtd.h>
diff --git a/drivers/mtd/nand/raw/sunxi_nand_spl.c b/drivers/mtd/nand/raw/sunxi_nand_spl.c
index 85d8013b1a6..942f2366849 100644
--- a/drivers/mtd/nand/raw/sunxi_nand_spl.c
+++ b/drivers/mtd/nand/raw/sunxi_nand_spl.c
@@ -12,6 +12,7 @@
 #include <linux/bitops.h>
 #include <linux/ctype.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 /* registers */
 #define NFC_CTL                    0x00000000
diff --git a/drivers/mtd/nand/raw/tegra_nand.c b/drivers/mtd/nand/raw/tegra_nand.c
index a28f830e8cd..0b81fe1d487 100644
--- a/drivers/mtd/nand/raw/tegra_nand.c
+++ b/drivers/mtd/nand/raw/tegra_nand.c
@@ -24,6 +24,7 @@
 #include <bouncebuf.h>
 #include <dm.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include "tegra_nand.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/mtd/nand/raw/vf610_nfc.c b/drivers/mtd/nand/raw/vf610_nfc.c
index 02ca385ed2d..457efcc23e6 100644
--- a/drivers/mtd/nand/raw/vf610_nfc.c
+++ b/drivers/mtd/nand/raw/vf610_nfc.c
@@ -26,6 +26,7 @@
 #include <time.h>
 #include <dm/device_compat.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/rawnand.h>
diff --git a/drivers/mtd/nand/spi/core.c b/drivers/mtd/nand/spi/core.c
index ae8932d377c..87494854fc2 100644
--- a/drivers/mtd/nand/spi/core.c
+++ b/drivers/mtd/nand/spi/core.c
@@ -31,6 +31,7 @@
 #include <linux/bug.h>
 #include <linux/mtd/spinand.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #endif
 
 /* SPI NAND index visible in MTD names */
diff --git a/drivers/mtd/onenand/onenand_base.c b/drivers/mtd/onenand/onenand_base.c
index cfc137c6b95..bd73642752b 100644
--- a/drivers/mtd/onenand/onenand_base.c
+++ b/drivers/mtd/onenand/onenand_base.c
@@ -28,6 +28,7 @@
 #include <linux/compat.h>
 #include <linux/mtd/mtd.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include "linux/mtd/flashchip.h"
 #include <linux/mtd/onenand.h>
 
diff --git a/drivers/mtd/onenand/onenand_bbt.c b/drivers/mtd/onenand/onenand_bbt.c
index cc1e449f4a7..026280e5e62 100644
--- a/drivers/mtd/onenand/onenand_bbt.c
+++ b/drivers/mtd/onenand/onenand_bbt.c
@@ -21,6 +21,7 @@
 #include <linux/mtd/onenand.h>
 #include <malloc.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #include <linux/errno.h>
 
diff --git a/drivers/mtd/onenand/onenand_spl.c b/drivers/mtd/onenand/onenand_spl.c
index ab6f1a8be3e..463ec9b8d50 100644
--- a/drivers/mtd/onenand/onenand_spl.c
+++ b/drivers/mtd/onenand/onenand_spl.c
@@ -12,6 +12,7 @@
 #include <linux/bitops.h>
 #include <linux/mtd/onenand_regs.h>
 #include <onenand_uboot.h>
+#include <linux/string.h>
 
 /*
  * Device geometry:
diff --git a/drivers/mtd/onenand/onenand_uboot.c b/drivers/mtd/onenand/onenand_uboot.c
index 3a8c7b867eb..b6ec9eecda6 100644
--- a/drivers/mtd/onenand/onenand_uboot.c
+++ b/drivers/mtd/onenand/onenand_uboot.c
@@ -18,6 +18,7 @@
 #include <linux/compat.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/onenand.h>
+#include <linux/string.h>
 
 struct mtd_info onenand_mtd;
 struct onenand_chip onenand_chip;
diff --git a/drivers/mtd/onenand/samsung.c b/drivers/mtd/onenand/samsung.c
index c415e5149a0..27143d4d0a5 100644
--- a/drivers/mtd/onenand/samsung.c
+++ b/drivers/mtd/onenand/samsung.c
@@ -17,6 +17,7 @@
 #include <linux/mtd/flashchip.h>
 #include <linux/mtd/samsung_onenand.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #include <asm/io.h>
 #include <linux/errno.h>
diff --git a/drivers/mtd/pic32_flash.c b/drivers/mtd/pic32_flash.c
index ea0dbe9eeee..71f22406bad 100644
--- a/drivers/mtd/pic32_flash.c
+++ b/drivers/mtd/pic32_flash.c
@@ -14,6 +14,7 @@
 #include <irq_func.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
+#include <linux/string.h>
 #include <mach/pic32.h>
 #include <wait_bit.h>
 
diff --git a/drivers/mtd/spi/fsl_espi_spl.c b/drivers/mtd/spi/fsl_espi_spl.c
index 5c41d7558c2..9c997574884 100644
--- a/drivers/mtd/spi/fsl_espi_spl.c
+++ b/drivers/mtd/spi/fsl_espi_spl.c
@@ -8,6 +8,7 @@
 #include <hang.h>
 #include <spi_flash.h>
 #include <malloc.h>
+#include <linux/string.h>
 
 #define ESPI_BOOT_IMAGE_SIZE	0x48
 #define ESPI_BOOT_IMAGE_ADDR	0x50
diff --git a/drivers/mtd/spi/sandbox.c b/drivers/mtd/spi/sandbox.c
index 0b602dc9140..a63e92d0340 100644
--- a/drivers/mtd/spi/sandbox.c
+++ b/drivers/mtd/spi/sandbox.c
@@ -16,6 +16,7 @@
 #include <malloc.h>
 #include <spi.h>
 #include <os.h>
+#include <linux/string.h>
 
 #include <spi_flash.h>
 #include "sf_internal.h"
diff --git a/drivers/mtd/spi/sf-uclass.c b/drivers/mtd/spi/sf-uclass.c
index 121804e3269..5e96d3dc6c8 100644
--- a/drivers/mtd/spi/sf-uclass.c
+++ b/drivers/mtd/spi/sf-uclass.c
@@ -11,6 +11,7 @@
 #include <spi_flash.h>
 #include <asm/global_data.h>
 #include <dm/device-internal.h>
+#include <linux/string.h>
 #include "sf_internal.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/mtd/spi/sf_dataflash.c b/drivers/mtd/spi/sf_dataflash.c
index c292ddfb893..11a396f11a2 100644
--- a/drivers/mtd/spi/sf_dataflash.c
+++ b/drivers/mtd/spi/sf_dataflash.c
@@ -20,6 +20,7 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/math64.h>
+#include <linux/string.h>
 
 #include "sf_internal.h"
 
diff --git a/drivers/mtd/spi/sf_mtd.c b/drivers/mtd/spi/sf_mtd.c
index 987fac2501f..1d8276d59d6 100644
--- a/drivers/mtd/spi/sf_mtd.c
+++ b/drivers/mtd/spi/sf_mtd.c
@@ -9,6 +9,7 @@
 #include <linux/errno.h>
 #include <linux/mtd/mtd.h>
 #include <spi_flash.h>
+#include <linux/string.h>
 
 static struct mtd_info sf_mtd_info;
 static bool sf_mtd_registered;
diff --git a/drivers/mtd/spi/sf_probe.c b/drivers/mtd/spi/sf_probe.c
index 475f6c31dbd..31b42f42b17 100644
--- a/drivers/mtd/spi/sf_probe.c
+++ b/drivers/mtd/spi/sf_probe.c
@@ -14,6 +14,7 @@
 #include <malloc.h>
 #include <spi.h>
 #include <spi_flash.h>
+#include <linux/string.h>
 
 #include "sf_internal.h"
 
diff --git a/drivers/mtd/spi/spi-nor-core.c b/drivers/mtd/spi/spi-nor-core.c
index 3baac137aed..b765a05e5cf 100644
--- a/drivers/mtd/spi/spi-nor-core.c
+++ b/drivers/mtd/spi/spi-nor-core.c
@@ -22,6 +22,7 @@
 #include <linux/math64.h>
 #include <linux/printk.h>
 #include <linux/sizes.h>
+#include <linux/string.h>
 
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/spi-nor.h>
diff --git a/drivers/mtd/spi/spi-nor-tiny.c b/drivers/mtd/spi/spi-nor-tiny.c
index 532e9a2c9e4..2d9b3cac2fb 100644
--- a/drivers/mtd/spi/spi-nor-tiny.c
+++ b/drivers/mtd/spi/spi-nor-tiny.c
@@ -19,6 +19,7 @@
 #include <linux/math64.h>
 #include <linux/printk.h>
 #include <linux/sizes.h>
+#include <linux/string.h>
 
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/spi-nor.h>
diff --git a/drivers/mtd/ubi/attach.c b/drivers/mtd/ubi/attach.c
index 2ef8fde3d32..7b9ca10ed2a 100644
--- a/drivers/mtd/ubi/attach.c
+++ b/drivers/mtd/ubi/attach.c
@@ -82,6 +82,7 @@
 #include <linux/bug.h>
 #include <linux/err.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #endif
 
 #include <linux/math64.h>
diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c
index f4e72ae7e56..a449b21b5bf 100644
--- a/drivers/mtd/ubi/build.c
+++ b/drivers/mtd/ubi/build.c
@@ -34,6 +34,7 @@
 #include <linux/bug.h>
 #include <linux/log2.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #endif
 #include <linux/err.h>
 #include <ubi_uboot.h>
diff --git a/drivers/mtd/ubi/debug.c b/drivers/mtd/ubi/debug.c
index b119cb6e9c0..393419bd137 100644
--- a/drivers/mtd/ubi/debug.c
+++ b/drivers/mtd/ubi/debug.c
@@ -9,6 +9,7 @@
 #include <malloc.h>
 #include <ubi_uboot.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include "ubi.h"
 #ifndef __UBOOT__
 #include <linux/debugfs.h>
diff --git a/drivers/mtd/ubi/eba.c b/drivers/mtd/ubi/eba.c
index 9d4337bcfff..9fe5ed79125 100644
--- a/drivers/mtd/ubi/eba.c
+++ b/drivers/mtd/ubi/eba.c
@@ -36,6 +36,7 @@
 #include <u-boot/crc.h>
 #else
 #include <ubi_uboot.h>
+#include <linux/string.h>
 #endif
 
 #include <linux/err.h>
diff --git a/drivers/mtd/ubi/fastmap.c b/drivers/mtd/ubi/fastmap.c
index b54b56375b4..90ed73b8577 100644
--- a/drivers/mtd/ubi/fastmap.c
+++ b/drivers/mtd/ubi/fastmap.c
@@ -17,6 +17,7 @@
 #include <malloc.h>
 #include <ubi_uboot.h>
 #include <linux/bug.h>
+#include <linux/string.h>
 #endif
 
 #include <linux/compat.h>
diff --git a/drivers/mtd/ubi/io.c b/drivers/mtd/ubi/io.c
index b8b878b9182..ef819a86d27 100644
--- a/drivers/mtd/ubi/io.c
+++ b/drivers/mtd/ubi/io.c
@@ -83,6 +83,7 @@
 #else
 #include <hexdump.h>
 #include <ubi_uboot.h>
+#include <linux/string.h>
 #endif
 
 #include "ubi.h"
diff --git a/drivers/mtd/ubi/kapi.c b/drivers/mtd/ubi/kapi.c
index 41680cdad13..3fac8b2b308 100644
--- a/drivers/mtd/ubi/kapi.c
+++ b/drivers/mtd/ubi/kapi.c
@@ -16,6 +16,7 @@
 #include <asm/div64.h>
 #else
 #include <ubi_uboot.h>
+#include <linux/string.h>
 #endif
 #include <linux/err.h>
 
diff --git a/drivers/mtd/ubi/upd.c b/drivers/mtd/ubi/upd.c
index 28a362aa14a..c4856b6c11e 100644
--- a/drivers/mtd/ubi/upd.c
+++ b/drivers/mtd/ubi/upd.c
@@ -32,6 +32,7 @@
 #else
 #include <div64.h>
 #include <ubi_uboot.h>
+#include <linux/string.h>
 #endif
 #include <linux/err.h>
 #include <linux/math64.h>
diff --git a/drivers/mtd/ubi/vmt.c b/drivers/mtd/ubi/vmt.c
index 0bfedd0debd..da68f3519da 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 <linux/string.h>
 #endif
 #include <linux/math64.h>
 
diff --git a/drivers/mtd/ubi/vtbl.c b/drivers/mtd/ubi/vtbl.c
index a2b5352cb2d..cb4de78fcbb 100644
--- a/drivers/mtd/ubi/vtbl.c
+++ b/drivers/mtd/ubi/vtbl.c
@@ -56,6 +56,7 @@
 #else
 #include <ubi_uboot.h>
 #include <linux/bug.h>
+#include <linux/string.h>
 #endif
 
 #include <linux/err.h>
diff --git a/drivers/mtd/ubispl/ubispl.c b/drivers/mtd/ubispl/ubispl.c
index 03b31f002b9..3ffad548535 100644
--- a/drivers/mtd/ubispl/ubispl.c
+++ b/drivers/mtd/ubispl/ubispl.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <errno.h>
 #include <linux/bug.h>
+#include <linux/string.h>
 #include <u-boot/crc.h>
 #include <ubispl.h>
 
diff --git a/drivers/net/ag7xxx.c b/drivers/net/ag7xxx.c
index 48cf45d9a8f..7171479c80d 100644
--- a/drivers/net/ag7xxx.c
+++ b/drivers/net/ag7xxx.c
@@ -25,6 +25,7 @@
 #include <linux/mii.h>
 #include <wait_bit.h>
 #include <asm/io.h>
+#include <linux/string.h>
 
 #include <mach/ath79.h>
 
diff --git a/drivers/net/altera_tse.c b/drivers/net/altera_tse.c
index 8b4ab9627c3..e9793762800 100644
--- a/drivers/net/altera_tse.c
+++ b/drivers/net/altera_tse.c
@@ -22,6 +22,7 @@
 #include <asm/global_data.h>
 #include <linux/dma-mapping.h>
 #include <asm/io.h>
+#include <linux/string.h>
 #include "altera_tse.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/net/armada100_fec.c b/drivers/net/armada100_fec.c
index 018891e173c..2dbd2d870b3 100644
--- a/drivers/net/armada100_fec.c
+++ b/drivers/net/armada100_fec.c
@@ -22,6 +22,7 @@
 #include <linux/mii.h>
 #include <asm/io.h>
 #include <asm/arch/armada100.h>
+#include <linux/string.h>
 #include "armada100_fec.h"
 
 #define  PHY_ADR_REQ     0xFF	/* Magic number to read/write PHY address */
diff --git a/drivers/net/at91_emac.c b/drivers/net/at91_emac.c
index e40b94ad892..b6282938788 100644
--- a/drivers/net/at91_emac.c
+++ b/drivers/net/at91_emac.c
@@ -20,6 +20,7 @@
 #include <miiphy.h>
 #include <linux/delay.h>
 #include <linux/mii.h>
+#include <linux/string.h>
 
 #undef MII_DEBUG
 #undef ET_DEBUG
diff --git a/drivers/net/ax88180.c b/drivers/net/ax88180.c
index 402bcdb63ed..a679b6529ff 100644
--- a/drivers/net/ax88180.c
+++ b/drivers/net/ax88180.c
@@ -44,6 +44,7 @@
 #include <malloc.h>
 #include <linux/delay.h>
 #include <linux/mii.h>
+#include <linux/string.h>
 #include "ax88180.h"
 
 /*
diff --git a/drivers/net/bcm-sf2-eth-gmac.c b/drivers/net/bcm-sf2-eth-gmac.c
index cbe1e85222f..3ab5841a7d0 100644
--- a/drivers/net/bcm-sf2-eth-gmac.c
+++ b/drivers/net/bcm-sf2-eth-gmac.c
@@ -8,6 +8,7 @@
 #define DEBUG
 #include <linux/printk.h>
 #endif
+#include <linux/string.h>
 #endif
 
 #include <config.h>
diff --git a/drivers/net/bcm-sf2-eth.c b/drivers/net/bcm-sf2-eth.c
index 040b72e6db0..7ffdd87449a 100644
--- a/drivers/net/bcm-sf2-eth.c
+++ b/drivers/net/bcm-sf2-eth.c
@@ -10,6 +10,7 @@
 #include <config.h>
 #include <linux/delay.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #include <phy.h>
 #include <miiphy.h>
diff --git a/drivers/net/bcm6368-eth.c b/drivers/net/bcm6368-eth.c
index f626412ef00..8b020535006 100644
--- a/drivers/net/bcm6368-eth.c
+++ b/drivers/net/bcm6368-eth.c
@@ -20,6 +20,7 @@
 #include <dm/device_compat.h>
 #include <linux/delay.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #define ETH_PORT_STR			"brcm,enetsw-port"
 
diff --git a/drivers/net/calxedaxgmac.c b/drivers/net/calxedaxgmac.c
index 8b2ee49b441..75b519ccfd1 100644
--- a/drivers/net/calxedaxgmac.c
+++ b/drivers/net/calxedaxgmac.c
@@ -10,6 +10,7 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <asm/io.h>
+#include <linux/string.h>
 
 #define TX_NUM_DESC			1
 #define RX_NUM_DESC			32
diff --git a/drivers/net/dc2114x.c b/drivers/net/dc2114x.c
index 9f8c6c58d95..8eacba7083c 100644
--- a/drivers/net/dc2114x.c
+++ b/drivers/net/dc2114x.c
@@ -9,6 +9,7 @@
 #include <pci.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #define SROM_DLEVEL	0
 
diff --git a/drivers/net/designware.c b/drivers/net/designware.c
index c2f3a6483dd..490db2b69fc 100644
--- a/drivers/net/designware.c
+++ b/drivers/net/designware.c
@@ -29,6 +29,7 @@
 #include <linux/kernel.h>
 #include <asm/io.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include <power/regulator.h>
 #include "designware.h"
 
diff --git a/drivers/net/dm9000x.c b/drivers/net/dm9000x.c
index 3ff3824d52f..9860830da09 100644
--- a/drivers/net/dm9000x.c
+++ b/drivers/net/dm9000x.c
@@ -56,6 +56,7 @@ TODO: external MII is not functional, only internal at the moment.
 #include <asm/io.h>
 #include <dm9000.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include "dm9000x.h"
 
diff --git a/drivers/net/dnet.c b/drivers/net/dnet.c
index fbcf15f2680..888a9990efe 100644
--- a/drivers/net/dnet.c
+++ b/drivers/net/dnet.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <log.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #ifndef CONFIG_DNET_AUTONEG_TIMEOUT
 #define CONFIG_DNET_AUTONEG_TIMEOUT	5000000	/* default value */
diff --git a/drivers/net/dwc_eth_qos.c b/drivers/net/dwc_eth_qos.c
index 299d1ad5eb2..84fbe0ff3c1 100644
--- a/drivers/net/dwc_eth_qos.c
+++ b/drivers/net/dwc_eth_qos.c
@@ -52,6 +52,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 /* Core registers */
 
diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c
index 49be7667021..cf2c56cd123 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 <linux/delay.h>
+#include <linux/string.h>
 #include "e1000.h"
 #include <asm/cache.h>
 
diff --git a/drivers/net/e1000_spi.c b/drivers/net/e1000_spi.c
index 4fcc65d9782..ed3e987b12b 100644
--- a/drivers/net/e1000_spi.c
+++ b/drivers/net/e1000_spi.c
@@ -2,6 +2,7 @@
 #include <command.h>
 #include <console.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include "e1000.h"
 #include <malloc.h>
 #include <linux/compiler.h>
diff --git a/drivers/net/eepro100.c b/drivers/net/eepro100.c
index feba5327da4..392d44f89d7 100644
--- a/drivers/net/eepro100.c
+++ b/drivers/net/eepro100.c
@@ -13,6 +13,7 @@
 #include <netdev.h>
 #include <pci.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 /* Ethernet chip registers. */
 #define SCB_STATUS		0	/* Rx/Command Unit Status *Word* */
diff --git a/drivers/net/ep93xx_eth.c b/drivers/net/ep93xx_eth.c
index d1d881d6bd9..a72d9c2471d 100644
--- a/drivers/net/ep93xx_eth.c
+++ b/drivers/net/ep93xx_eth.c
@@ -26,6 +26,7 @@
 #include <miiphy.h>
 #include <linux/bug.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include <linux/types.h>
 #include "ep93xx_eth.h"
 
diff --git a/drivers/net/ethoc.c b/drivers/net/ethoc.c
index a93358af1a7..7c56b7242d4 100644
--- a/drivers/net/ethoc.c
+++ b/drivers/net/ethoc.c
@@ -21,6 +21,7 @@
 #include <miiphy.h>
 #include <asm/cache.h>
 #include <wait_bit.h>
+#include <linux/string.h>
 
 /* register offsets */
 #define	MODER		0x00
diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c
index c0fc3133afb..eef443f5f63 100644
--- a/drivers/net/fec_mxc.c
+++ b/drivers/net/fec_mxc.c
@@ -21,6 +21,7 @@
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include <power/regulator.h>
 
 #include <asm/io.h>
diff --git a/drivers/net/fm/eth.c b/drivers/net/fm/eth.c
index 2f433cedd09..252f9678799 100644
--- a/drivers/net/fm/eth.c
+++ b/drivers/net/fm/eth.c
@@ -25,6 +25,7 @@
 #include <fsl_tgec.h>
 #include <fsl_memac.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include "fm.h"
 
diff --git a/drivers/net/fm/fm.c b/drivers/net/fm/fm.c
index bbb1738c4bd..247a1c13645 100644
--- a/drivers/net/fm/fm.c
+++ b/drivers/net/fm/fm.c
@@ -8,6 +8,7 @@
 #include <malloc.h>
 #include <asm/io.h>
 #include <linux/errno.h>
+#include <linux/string.h>
 #include <u-boot/crc.h>
 #ifdef CONFIG_DM_ETH
 #include <dm.h>
diff --git a/drivers/net/fm/init.c b/drivers/net/fm/init.c
index 2fed64205cb..8f1a45b3a22 100644
--- a/drivers/net/fm/init.c
+++ b/drivers/net/fm/init.c
@@ -14,6 +14,7 @@
 #else
 #include <asm/fsl_serdes.h>
 #endif
+#include <linux/string.h>
 
 #include "fm.h"
 
diff --git a/drivers/net/fm/memac_phy.c b/drivers/net/fm/memac_phy.c
index e15c28d5005..53e0760833c 100644
--- a/drivers/net/fm/memac_phy.c
+++ b/drivers/net/fm/memac_phy.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <fsl_memac.h>
 #include <fm_eth.h>
+#include <linux/string.h>
 
 #ifdef CONFIG_SYS_MEMAC_LITTLE_ENDIAN
 #define memac_out_32(a, v)	out_le32(a, v)
diff --git a/drivers/net/fm/tgec_phy.c b/drivers/net/fm/tgec_phy.c
index 22225c2f82f..ad6c08e431c 100644
--- a/drivers/net/fm/tgec_phy.c
+++ b/drivers/net/fm/tgec_phy.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <fsl_tgec.h>
 #include <fm_eth.h>
+#include <linux/string.h>
 
 /*
  * Write value to the PHY for this device to the register at regnum, waiting
diff --git a/drivers/net/fsl-mc/dpio/qbman_portal.c b/drivers/net/fsl-mc/dpio/qbman_portal.c
index 44ce00041ee..5a0bef9324f 100644
--- a/drivers/net/fsl-mc/dpio/qbman_portal.c
+++ b/drivers/net/fsl-mc/dpio/qbman_portal.c
@@ -7,6 +7,7 @@
 #include <malloc.h>
 #include <asm/arch/clock.h>
 #include <linux/bug.h>
+#include <linux/string.h>
 #include "qbman_portal.h"
 
 /* QBMan portal management command codes */
diff --git a/drivers/net/fsl-mc/dpio/qbman_sys.h b/drivers/net/fsl-mc/dpio/qbman_sys.h
index fb760b94f85..e320e9b905e 100644
--- a/drivers/net/fsl-mc/dpio/qbman_sys.h
+++ b/drivers/net/fsl-mc/dpio/qbman_sys.h
@@ -22,6 +22,7 @@
  * required. */
 #include <linux/bug.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #undef QBMAN_CCSR_TRACE
 #undef QBMAN_CINH_TRACE
 #undef QBMAN_CENA_TRACE
diff --git a/drivers/net/fsl-mc/mc.c b/drivers/net/fsl-mc/mc.c
index 26e9523288e..e088d1fc12d 100644
--- a/drivers/net/fsl-mc/mc.c
+++ b/drivers/net/fsl-mc/mc.c
@@ -28,6 +28,7 @@
 #include <fsl-mc/fsl_dpsparser.h>
 #include <fsl-mc/fsl_qbman_portal.h>
 #include <fsl-mc/ldpaa_wriop.h>
+#include <linux/string.h>
 
 #define MC_RAM_BASE_ADDR_ALIGNMENT  (512UL * 1024 * 1024)
 #define MC_RAM_BASE_ADDR_ALIGNMENT_MASK	(~(MC_RAM_BASE_ADDR_ALIGNMENT - 1))
diff --git a/drivers/net/fsl_enetc.c b/drivers/net/fsl_enetc.c
index 2929ae72092..d983841bafd 100644
--- a/drivers/net/fsl_enetc.c
+++ b/drivers/net/fsl_enetc.c
@@ -17,6 +17,7 @@
 #include <miiphy.h>
 #include <linux/bug.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include "fsl_enetc.h"
 
diff --git a/drivers/net/fsl_mcdmafec.c b/drivers/net/fsl_mcdmafec.c
index f3eea57fb9a..62f9d00ece3 100644
--- a/drivers/net/fsl_mcdmafec.c
+++ b/drivers/net/fsl_mcdmafec.c
@@ -23,6 +23,7 @@
 #include <linux/mii.h>
 #include <asm/immap.h>
 #include <asm/fsl_mcdmafec.h>
+#include <linux/string.h>
 
 #include "MCD_dma.h"
 
diff --git a/drivers/net/fsl_mdio.c b/drivers/net/fsl_mdio.c
index d2edd1751c3..5f692a27f23 100644
--- a/drivers/net/fsl_mdio.c
+++ b/drivers/net/fsl_mdio.c
@@ -11,6 +11,7 @@
 #include <fsl_mdio.h>
 #include <asm/io.h>
 #include <linux/errno.h>
+#include <linux/string.h>
 
 #ifdef CONFIG_DM_MDIO
 struct tsec_mdio_priv {
diff --git a/drivers/net/ftmac100.c b/drivers/net/ftmac100.c
index 4b94fd6405a..c61d13aa21f 100644
--- a/drivers/net/ftmac100.c
+++ b/drivers/net/ftmac100.c
@@ -16,6 +16,7 @@
 #include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/io.h>
+#include <linux/string.h>
 
 #include "ftmac100.h"
 #ifdef CONFIG_DM_ETH
diff --git a/drivers/net/ftmac110.c b/drivers/net/ftmac110.c
index d4a92a70e73..f186148b619 100644
--- a/drivers/net/ftmac110.c
+++ b/drivers/net/ftmac110.c
@@ -16,6 +16,7 @@
 #include <linux/errno.h>
 #include <asm/io.h>
 #include <linux/dma-mapping.h>
+#include <linux/string.h>
 
 #if defined(CONFIG_MII) || defined(CONFIG_CMD_MII)
 #include <miiphy.h>
diff --git a/drivers/net/gmac_rockchip.c b/drivers/net/gmac_rockchip.c
index 98d7c39f9fe..7cd2451e084 100644
--- a/drivers/net/gmac_rockchip.c
+++ b/drivers/net/gmac_rockchip.c
@@ -28,6 +28,7 @@
 #include <dm/pinctrl.h>
 #include <dt-bindings/clock/rk3288-cru.h>
 #include <linux/bitops.h>
+#include <linux/string.h>
 #include "designware.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/net/higmacv300.c b/drivers/net/higmacv300.c
index 2aae7f4863c..0c71c51ceb4 100644
--- a/drivers/net/higmacv300.c
+++ b/drivers/net/higmacv300.c
@@ -18,6 +18,7 @@
 #include <net.h>
 #include <reset.h>
 #include <wait_bit.h>
+#include <linux/string.h>
 
 #define STATION_ADDR_LOW		0x0000
 #define STATION_ADDR_HIGH		0x0004
diff --git a/drivers/net/lan91c96.c b/drivers/net/lan91c96.c
index ce3c406ea6c..524e9455ccf 100644
--- a/drivers/net/lan91c96.c
+++ b/drivers/net/lan91c96.c
@@ -50,6 +50,7 @@
 #include <malloc.h>
 #include <time.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include "lan91c96.h"
 #include <net.h>
 #include <linux/compiler.h>
diff --git a/drivers/net/ldpaa_eth/ldpaa_eth.c b/drivers/net/ldpaa_eth/ldpaa_eth.c
index bbd2aed0ab2..d5384b216ab 100644
--- a/drivers/net/ldpaa_eth/ldpaa_eth.c
+++ b/drivers/net/ldpaa_eth/ldpaa_eth.c
@@ -20,6 +20,7 @@
 #include <linux/compat.h>
 #include <fsl-mc/fsl_dpmac.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include <fsl-mc/ldpaa_wriop.h>
 #include "ldpaa_eth.h"
diff --git a/drivers/net/lpc32xx_eth.c b/drivers/net/lpc32xx_eth.c
index 3f281a515c6..b059accf524 100644
--- a/drivers/net/lpc32xx_eth.c
+++ b/drivers/net/lpc32xx_eth.c
@@ -19,6 +19,7 @@
 #include <asm/byteorder.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/config.h>
+#include <linux/string.h>
 
 /*
  * Notes:
diff --git a/drivers/net/macb.c b/drivers/net/macb.c
index cda9b16cc24..26939c6fa46 100644
--- a/drivers/net/macb.c
+++ b/drivers/net/macb.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 /*
  * The u-boot networking stack is a little weird.  It seems like the
diff --git a/drivers/net/mcffec.c b/drivers/net/mcffec.c
index d881c5eb871..2d307b23afb 100644
--- a/drivers/net/mcffec.c
+++ b/drivers/net/mcffec.c
@@ -22,6 +22,7 @@
 #include <asm/immap.h>
 #include <linux/delay.h>
 #include <linux/mii.h>
+#include <linux/string.h>
 
 #undef	ET_DEBUG
 #undef	MII_DEBUG
diff --git a/drivers/net/mcfmii.c b/drivers/net/mcfmii.c
index da5075172fa..c99950d0e9e 100644
--- a/drivers/net/mcfmii.c
+++ b/drivers/net/mcfmii.c
@@ -10,6 +10,7 @@
 #include <netdev.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #ifdef CONFIG_MCF547x_8x
 #include <asm/fsl_mcdmafec.h>
diff --git a/drivers/net/mpc8xx_fec.c b/drivers/net/mpc8xx_fec.c
index 282c2599d3c..b6f805683e2 100644
--- a/drivers/net/mpc8xx_fec.c
+++ b/drivers/net/mpc8xx_fec.c
@@ -14,6 +14,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include <phy.h>
 #include <linux/mii.h>
diff --git a/drivers/net/mscc_eswitch/jr2_switch.c b/drivers/net/mscc_eswitch/jr2_switch.c
index 97b2b081efb..92debab424f 100644
--- a/drivers/net/mscc_eswitch/jr2_switch.c
+++ b/drivers/net/mscc_eswitch/jr2_switch.c
@@ -18,6 +18,7 @@
 #include <net.h>
 #include <wait_bit.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #include <dt-bindings/mscc/jr2_data.h>
 #include "mscc_xfer.h"
diff --git a/drivers/net/mscc_eswitch/luton_switch.c b/drivers/net/mscc_eswitch/luton_switch.c
index 1d46d0e5e1e..79f4d19dad9 100644
--- a/drivers/net/mscc_eswitch/luton_switch.c
+++ b/drivers/net/mscc_eswitch/luton_switch.c
@@ -16,6 +16,7 @@
 #include <miiphy.h>
 #include <net.h>
 #include <wait_bit.h>
+#include <linux/string.h>
 
 #include "mscc_xfer.h"
 #include "mscc_mac_table.h"
diff --git a/drivers/net/mscc_eswitch/ocelot_switch.c b/drivers/net/mscc_eswitch/ocelot_switch.c
index bdadaa13c72..de8a44e48bc 100644
--- a/drivers/net/mscc_eswitch/ocelot_switch.c
+++ b/drivers/net/mscc_eswitch/ocelot_switch.c
@@ -18,6 +18,7 @@
 #include <net.h>
 #include <wait_bit.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #include "mscc_xfer.h"
 #include "mscc_mac_table.h"
diff --git a/drivers/net/mscc_eswitch/serval_switch.c b/drivers/net/mscc_eswitch/serval_switch.c
index bbced95f7e4..540799567ec 100644
--- a/drivers/net/mscc_eswitch/serval_switch.c
+++ b/drivers/net/mscc_eswitch/serval_switch.c
@@ -18,6 +18,7 @@
 #include <net.h>
 #include <wait_bit.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #include "mscc_xfer.h"
 #include "mscc_mac_table.h"
diff --git a/drivers/net/mscc_eswitch/servalt_switch.c b/drivers/net/mscc_eswitch/servalt_switch.c
index c8aaf7d4897..fc79d34b519 100644
--- a/drivers/net/mscc_eswitch/servalt_switch.c
+++ b/drivers/net/mscc_eswitch/servalt_switch.c
@@ -17,6 +17,7 @@
 #include <net.h>
 #include <wait_bit.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #include "mscc_xfer.h"
 #include "mscc_miim.h"
diff --git a/drivers/net/mt7628-eth.c b/drivers/net/mt7628-eth.c
index 8b278c62ba7..3bf8b636ea8 100644
--- a/drivers/net/mt7628-eth.c
+++ b/drivers/net/mt7628-eth.c
@@ -29,6 +29,7 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 /* Ethernet frame engine register */
 #define PDMA_RELATED		0x0800
diff --git a/drivers/net/mtk_eth.c b/drivers/net/mtk_eth.c
index 774c1e3bb51..7e769933996 100644
--- a/drivers/net/mtk_eth.c
+++ b/drivers/net/mtk_eth.c
@@ -28,6 +28,7 @@
 #include <linux/mdio.h>
 #include <linux/mii.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #include "mtk_eth.h"
 
diff --git a/drivers/net/mvgbe.c b/drivers/net/mvgbe.c
index bf5f6f4b672..5ceb37324f3 100644
--- a/drivers/net/mvgbe.c
+++ b/drivers/net/mvgbe.c
@@ -26,6 +26,7 @@
 #include <asm/system.h>
 #include <asm/byteorder.h>
 #include <asm/arch/cpu.h>
+#include <linux/string.h>
 
 #if defined(CONFIG_ARCH_KIRKWOOD)
 #include <asm/arch/soc.h>
diff --git a/drivers/net/mvneta.c b/drivers/net/mvneta.c
index 5fd668b5e42..6ee0e1c7897 100644
--- a/drivers/net/mvneta.c
+++ b/drivers/net/mvneta.c
@@ -37,6 +37,7 @@
 #include <linux/compat.h>
 #include <linux/mbus.h>
 #include <asm-generic/gpio.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/net/mvpp2.c b/drivers/net/mvpp2.c
index 37a8a7849f4..06eb619c002 100644
--- a/drivers/net/mvpp2.c
+++ b/drivers/net/mvpp2.c
@@ -43,6 +43,7 @@
 #include <asm-generic/gpio.h>
 #include <fdt_support.h>
 #include <linux/mdio.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/net/natsemi.c b/drivers/net/natsemi.c
index bfd8cc396b9..e44787d33ba 100644
--- a/drivers/net/natsemi.c
+++ b/drivers/net/natsemi.c
@@ -57,6 +57,7 @@
 #include <asm/io.h>
 #include <pci.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 /* defines */
 #define EEPROM_SIZE 0xb /*12 16-bit chunks, or 24 bytes*/
diff --git a/drivers/net/ne2000_base.c b/drivers/net/ne2000_base.c
index 25c258dd3f7..2fad4671220 100644
--- a/drivers/net/ne2000_base.c
+++ b/drivers/net/ne2000_base.c
@@ -80,6 +80,7 @@ Add SNMP
 #include <malloc.h>
 #include <time.h>
 #include <linux/compiler.h>
+#include <linux/string.h>
 
 /* forward definition of function used for the uboot interface */
 void uboot_push_packet_len(int len);
diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c
index f1d0630d020..432d2b0121c 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 <linux/string.h>
 
 #ifndef CONFIG_NETCONSOLE_BUFFER_SIZE
 #define CONFIG_NETCONSOLE_BUFFER_SIZE 512
diff --git a/drivers/net/ns8382x.c b/drivers/net/ns8382x.c
index d79872af093..7192156a698 100644
--- a/drivers/net/ns8382x.c
+++ b/drivers/net/ns8382x.c
@@ -58,6 +58,7 @@
 #include <asm/io.h>
 #include <pci.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 /* defines */
 #define DSIZE     0x00000FFF
diff --git a/drivers/net/pch_gbe.c b/drivers/net/pch_gbe.c
index 20d757f5dff..c1596a2cd35 100644
--- a/drivers/net/pch_gbe.c
+++ b/drivers/net/pch_gbe.c
@@ -16,6 +16,7 @@
 #include <pci.h>
 #include <miiphy.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include "pch_gbe.h"
 
 #if !defined(CONFIG_PHYLIB)
diff --git a/drivers/net/pcnet.c b/drivers/net/pcnet.c
index 559560860bd..1f5cca71835 100644
--- a/drivers/net/pcnet.c
+++ b/drivers/net/pcnet.c
@@ -19,6 +19,7 @@
 #include <asm/io.h>
 #include <pci.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #define	PCNET_DEBUG_LEVEL	0	/* 0=off, 1=init, 2=rx/tx */
 
diff --git a/drivers/net/pfe_eth/pfe_cmd.c b/drivers/net/pfe_eth/pfe_cmd.c
index 1e69525cb71..f72413cf132 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 <linux/delay.h>
+#include <linux/string.h>
 #include <net/pfe_eth/pfe_eth.h>
 
 static inline void pfe_command_help(void)
diff --git a/drivers/net/pfe_eth/pfe_driver.c b/drivers/net/pfe_eth/pfe_driver.c
index 6f443b4ea81..573ceabcf7e 100644
--- a/drivers/net/pfe_eth/pfe_driver.c
+++ b/drivers/net/pfe_eth/pfe_driver.c
@@ -7,6 +7,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include <net/pfe_eth/pfe_eth.h>
 #include <net/pfe_eth/pfe_firmware.h>
 
diff --git a/drivers/net/pfe_eth/pfe_firmware.c b/drivers/net/pfe_eth/pfe_firmware.c
index 55e661c0e1d..1601ec48a59 100644
--- a/drivers/net/pfe_eth/pfe_firmware.c
+++ b/drivers/net/pfe_eth/pfe_firmware.c
@@ -14,6 +14,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <linux/bitops.h>
+#include <linux/string.h>
 #include <net/pfe_eth/pfe_eth.h>
 #include <net/pfe_eth/pfe_firmware.h>
 #include <spi_flash.h>
diff --git a/drivers/net/pfe_eth/pfe_hw.c b/drivers/net/pfe_eth/pfe_hw.c
index 722f5c238fa..2889dd6b907 100644
--- a/drivers/net/pfe_eth/pfe_hw.c
+++ b/drivers/net/pfe_eth/pfe_hw.c
@@ -5,6 +5,7 @@
  */
 #include <log.h>
 #include <linux/bitops.h>
+#include <linux/string.h>
 #include <net/pfe_eth/pfe_eth.h>
 #include <net/pfe_eth/pfe/pfe_hw.h>
 
diff --git a/drivers/net/phy/aquantia.c b/drivers/net/phy/aquantia.c
index 68cd3d03fd0..59c7abeb667 100644
--- a/drivers/net/phy/aquantia.c
+++ b/drivers/net/phy/aquantia.c
@@ -13,6 +13,7 @@
 #include <phy.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include <u-boot/crc.h>
 #include <malloc.h>
 #include <asm/byteorder.h>
diff --git a/drivers/net/phy/atheros.c b/drivers/net/phy/atheros.c
index f922fecd6b5..29db299c1e7 100644
--- a/drivers/net/phy/atheros.c
+++ b/drivers/net/phy/atheros.c
@@ -12,6 +12,7 @@
 #include <linux/bitfield.h>
 #include <linux/bitops.h>
 #include <dt-bindings/net/qca-ar803x.h>
+#include <linux/string.h>
 
 #define AR803x_PHY_DEBUG_ADDR_REG	0x1d
 #define AR803x_PHY_DEBUG_DATA_REG	0x1e
diff --git a/drivers/net/phy/b53.c b/drivers/net/phy/b53.c
index 21da53c7e5b..b376ef8f82b 100644
--- a/drivers/net/phy/b53.c
+++ b/drivers/net/phy/b53.c
@@ -26,6 +26,7 @@
 #include <command.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include <errno.h>
 #include <malloc.h>
diff --git a/drivers/net/phy/fixed.c b/drivers/net/phy/fixed.c
index 3228672fc4a..d3e9e3e3d4a 100644
--- a/drivers/net/phy/fixed.c
+++ b/drivers/net/phy/fixed.c
@@ -12,6 +12,7 @@
 #include <dm.h>
 #include <fdt_support.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/net/phy/miiphybb.c b/drivers/net/phy/miiphybb.c
index bb5aa3513b6..6b031196f44 100644
--- a/drivers/net/phy/miiphybb.c
+++ b/drivers/net/phy/miiphybb.c
@@ -17,6 +17,7 @@
 #include <ppc_asm.tmpl>
 #include <miiphy.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 
 #define BB_MII_RELOCATE(v,off) (v += (v?off:0))
 
diff --git a/drivers/net/phy/mv88e61xx.c b/drivers/net/phy/mv88e61xx.c
index 7eff37b2449..832b538f5e9 100644
--- a/drivers/net/phy/mv88e61xx.c
+++ b/drivers/net/phy/mv88e61xx.c
@@ -33,6 +33,7 @@
 #include <log.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include <bitfield.h>
 #include <errno.h>
diff --git a/drivers/net/phy/mv88e6352.c b/drivers/net/phy/mv88e6352.c
index 62a7f192149..40e0edc6d88 100644
--- a/drivers/net/phy/mv88e6352.c
+++ b/drivers/net/phy/mv88e6352.c
@@ -11,6 +11,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <mv88e6352.h>
+#include <linux/string.h>
 
 #define SMI_HDR		((0x8 | 0x1) << 12)
 #define SMI_BUSY_MASK	(0x8000)
diff --git a/drivers/net/phy/ncsi.c b/drivers/net/phy/ncsi.c
index bf1e832be9f..862a1564a73 100644
--- a/drivers/net/phy/ncsi.c
+++ b/drivers/net/phy/ncsi.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <phy.h>
+#include <linux/string.h>
 #include <net/ncsi.h>
 #include <net/ncsi-pkt.h>
 #include <asm/unaligned.h>
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index f8254759386..030dc753824 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -22,6 +22,7 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/compiler.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/net/pic32_mdio.c b/drivers/net/pic32_mdio.c
index d4049cfea52..802563960a1 100644
--- a/drivers/net/pic32_mdio.c
+++ b/drivers/net/pic32_mdio.c
@@ -12,6 +12,7 @@
 #include <wait_bit.h>
 #include <asm/io.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include "pic32_eth.h"
 
 static int pic32_mdio_write(struct mii_dev *bus,
diff --git a/drivers/net/ravb.c b/drivers/net/ravb.c
index 6ab56e6e653..8f76279c7ee 100644
--- a/drivers/net/ravb.c
+++ b/drivers/net/ravb.c
@@ -25,6 +25,7 @@
 #include <wait_bit.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
+#include <linux/string.h>
 
 /* Registers */
 #define RAVB_REG_CCC		0x000
diff --git a/drivers/net/rtl8139.c b/drivers/net/rtl8139.c
index 71f2aba4c70..1229e94185c 100644
--- a/drivers/net/rtl8139.c
+++ b/drivers/net/rtl8139.c
@@ -79,6 +79,7 @@
 #include <pci.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include <linux/types.h>
 
 #define RTL_TIMEOUT	100000
diff --git a/drivers/net/rtl8169.c b/drivers/net/rtl8169.c
index 5ff99273a02..9157dd1e351 100644
--- a/drivers/net/rtl8169.c
+++ b/drivers/net/rtl8169.c
@@ -56,6 +56,7 @@
 #include <pci.h>
 #include <linux/delay.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #undef DEBUG_RTL8169
 #undef DEBUG_RTL8169_TX
diff --git a/drivers/net/sandbox-raw-bus.c b/drivers/net/sandbox-raw-bus.c
index fb1ba5a8c83..6b111d47eea 100644
--- a/drivers/net/sandbox-raw-bus.c
+++ b/drivers/net/sandbox-raw-bus.c
@@ -11,6 +11,7 @@
 #include <malloc.h>
 #include <dm/device-internal.h>
 #include <dm/lists.h>
+#include <linux/string.h>
 
 static int eth_raw_bus_post_bind(struct udevice *dev)
 {
diff --git a/drivers/net/sandbox-raw.c b/drivers/net/sandbox-raw.c
index 6dddae911b0..bda3ffd003b 100644
--- a/drivers/net/sandbox-raw.c
+++ b/drivers/net/sandbox-raw.c
@@ -14,6 +14,7 @@
 #include <malloc.h>
 #include <net.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/net/sandbox.c b/drivers/net/sandbox.c
index 555d9147d11..b63b3aaebcf 100644
--- a/drivers/net/sandbox.c
+++ b/drivers/net/sandbox.c
@@ -15,6 +15,7 @@
 #include <asm/eth.h>
 #include <asm/global_data.h>
 #include <asm/test.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c
index 49b4a91875a..8f2fe1515e6 100644
--- a/drivers/net/sh_eth.c
+++ b/drivers/net/sh_eth.c
@@ -22,6 +22,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/io.h>
+#include <linux/string.h>
 
 #ifdef CONFIG_DM_ETH
 #include <clk.h>
diff --git a/drivers/net/smc91111.c b/drivers/net/smc91111.c
index 3ae9f805a79..3ae55a1db7d 100644
--- a/drivers/net/smc91111.c
+++ b/drivers/net/smc91111.c
@@ -53,6 +53,7 @@
 #include <malloc.h>
 #include <time.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include "smc91111.h"
 #include <net.h>
 
diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
index 09372d7f6ba..0ac1e3fb3d7 100644
--- a/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.c
@@ -12,6 +12,7 @@
 #include <miiphy.h>
 #include <linux/io.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include <linux/types.h>
 
 #include "smc911x.h"
diff --git a/drivers/net/sni_ave.c b/drivers/net/sni_ave.c
index 6e228da2984..9288355fb4a 100644
--- a/drivers/net/sni_ave.c
+++ b/drivers/net/sni_ave.c
@@ -24,6 +24,7 @@
 #include <linux/io.h>
 #include <linux/iopoll.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #define AVE_GRST_DELAY_MSEC	40
 #define AVE_MIN_XMITSIZE	60
diff --git a/drivers/net/sun8i_emac.c b/drivers/net/sun8i_emac.c
index e74cfa99324..77c03cbf301 100644
--- a/drivers/net/sun8i_emac.c
+++ b/drivers/net/sun8i_emac.c
@@ -34,6 +34,7 @@
 #if CONFIG_IS_ENABLED(DM_GPIO)
 #include <asm-generic/gpio.h>
 #endif
+#include <linux/string.h>
 
 #define MDIO_CMD_MII_BUSY		BIT(0)
 #define MDIO_CMD_MII_WRITE		BIT(1)
diff --git a/drivers/net/sunxi_emac.c b/drivers/net/sunxi_emac.c
index df18ecc0645..e1176454f2e 100644
--- a/drivers/net/sunxi_emac.c
+++ b/drivers/net/sunxi_emac.c
@@ -18,6 +18,7 @@
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/gpio.h>
+#include <linux/string.h>
 
 /* EMAC register  */
 struct emac_regs {
diff --git a/drivers/net/ti/cpsw-common.c b/drivers/net/ti/cpsw-common.c
index d5428274d19..9ed0b56cc80 100644
--- a/drivers/net/ti/cpsw-common.c
+++ b/drivers/net/ti/cpsw-common.c
@@ -13,6 +13,7 @@
 #include <cpsw.h>
 #include <dm/device_compat.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/net/ti/cpsw.c b/drivers/net/ti/cpsw.c
index 7521deaaa97..044a74776c3 100644
--- a/drivers/net/ti/cpsw.c
+++ b/drivers/net/ti/cpsw.c
@@ -25,6 +25,7 @@
 #include <asm/arch/cpu.h>
 #include <dm.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #include "cpsw_mdio.h"
 
diff --git a/drivers/net/ti/davinci_emac.c b/drivers/net/ti/davinci_emac.c
index 56ea1fec0af..c2df17d3a6f 100644
--- a/drivers/net/ti/davinci_emac.c
+++ b/drivers/net/ti/davinci_emac.c
@@ -33,6 +33,7 @@
 #include <asm/arch/emac_defs.h>
 #include <asm/io.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include "davinci_emac.h"
 
 unsigned int	emac_dbg = 0;
diff --git a/drivers/net/tsec.c b/drivers/net/tsec.c
index 5d12e4b7755..b7623bf85b1 100644
--- a/drivers/net/tsec.c
+++ b/drivers/net/tsec.c
@@ -20,6 +20,7 @@
 #include <linux/errno.h>
 #include <asm/processor.h>
 #include <asm/io.h>
+#include <linux/string.h>
 
 #ifndef CONFIG_DM_ETH
 /* Default initializations for TSEC controllers. */
diff --git a/drivers/net/uli526x.c b/drivers/net/uli526x.c
index 3191868cae5..3784f72b87e 100644
--- a/drivers/net/uli526x.c
+++ b/drivers/net/uli526x.c
@@ -17,6 +17,7 @@
 #include <pci.h>
 #include <miiphy.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 /* some kernel function compatible define */
 
diff --git a/drivers/net/xilinx_axi_emac.c b/drivers/net/xilinx_axi_emac.c
index 2a2e0585a34..da571efde4e 100644
--- a/drivers/net/xilinx_axi_emac.c
+++ b/drivers/net/xilinx_axi_emac.c
@@ -19,6 +19,7 @@
 #include <miiphy.h>
 #include <wait_bit.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/net/zynq_gem.c b/drivers/net/zynq_gem.c
index da4b6fba9ff..9d19e89090c 100644
--- a/drivers/net/zynq_gem.c
+++ b/drivers/net/zynq_gem.c
@@ -31,6 +31,7 @@
 #include <linux/bitops.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/string.h>
 
 /* Bit/mask specification */
 #define ZYNQ_GEM_PHYMNTNC_OP_MASK	0x40020000 /* operation mask bits */
diff --git a/drivers/nvme/nvme.c b/drivers/nvme/nvme.c
index fc64d93ab83..6d8ab8bf786 100644
--- a/drivers/nvme/nvme.c
+++ b/drivers/nvme/nvme.c
@@ -16,6 +16,7 @@
 #include <time.h>
 #include <dm/device-internal.h>
 #include <linux/compat.h>
+#include <linux/string.h>
 #include "nvme.h"
 
 #define NVME_Q_DEPTH		2
diff --git a/drivers/pci/fsl_pci_init.c b/drivers/pci/fsl_pci_init.c
index e72a60c1318..ffd160439fd 100644
--- a/drivers/pci/fsl_pci_init.c
+++ b/drivers/pci/fsl_pci_init.c
@@ -11,6 +11,7 @@
 #include <asm/fsl_serdes.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/pci/pci-uclass.c b/drivers/pci/pci-uclass.c
index b2f9e0638bd..b40765a3894 100644
--- a/drivers/pci/pci-uclass.c
+++ b/drivers/pci/pci-uclass.c
@@ -20,6 +20,7 @@
 #endif
 #include <linux/delay.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include "pci_internal.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/pci/pci_ftpci100.c b/drivers/pci/pci_ftpci100.c
index 32fac878a67..f7a60172672 100644
--- a/drivers/pci/pci_ftpci100.c
+++ b/drivers/pci/pci_ftpci100.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <pci.h>
+#include <linux/string.h>
 
 #include <faraday/ftpci100.h>
 
diff --git a/drivers/pci/pci_rom.c b/drivers/pci/pci_rom.c
index c69919faafe..68b9949ba1e 100644
--- a/drivers/pci/pci_rom.c
+++ b/drivers/pci/pci_rom.c
@@ -41,6 +41,7 @@
 #include <acpi/acpi_s3.h>
 #include <asm/global_data.h>
 #include <linux/screen_info.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/pci/pci_tegra.c b/drivers/pci/pci_tegra.c
index abd4e26543b..8845dc451e5 100644
--- a/drivers/pci/pci_tegra.c
+++ b/drivers/pci/pci_tegra.c
@@ -24,6 +24,7 @@
 #include <time.h>
 #include <linux/delay.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #include <asm/io.h>
 #include <asm/gpio.h>
diff --git a/drivers/pci/pcie_imx.c b/drivers/pci/pcie_imx.c
index cbf12371a0f..16468e73364 100644
--- a/drivers/pci/pcie_imx.c
+++ b/drivers/pci/pcie_imx.c
@@ -24,6 +24,7 @@
 #include <linux/sizes.h>
 #include <errno.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/string.h>
 
 #define PCI_ACCESS_READ  0
 #define PCI_ACCESS_WRITE 1
diff --git a/drivers/pci/pcie_layerscape_fixup_common.c b/drivers/pci/pcie_layerscape_fixup_common.c
index 814650f1e15..bba410e386f 100644
--- a/drivers/pci/pcie_layerscape_fixup_common.c
+++ b/drivers/pci/pcie_layerscape_fixup_common.c
@@ -12,6 +12,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/soc.h>
 #include <linux/libfdt.h>
+#include <linux/string.h>
 #include "pcie_layerscape_fixup_common.h"
 
 void ft_pci_setup(void *blob, struct bd_info *bd)
diff --git a/drivers/pci_endpoint/sandbox-pci_ep.c b/drivers/pci_endpoint/sandbox-pci_ep.c
index 8e05d5ba890..d1e552a2466 100644
--- a/drivers/pci_endpoint/sandbox-pci_ep.c
+++ b/drivers/pci_endpoint/sandbox-pci_ep.c
@@ -9,6 +9,7 @@
 #include <pci.h>
 #include <pci_ep.h>
 #include <asm/test.h>
+#include <linux/string.h>
 
 /**
  * struct sandbox_pci_ep_priv - private data for driver
diff --git a/drivers/phy/allwinner/phy-sun4i-usb.c b/drivers/phy/allwinner/phy-sun4i-usb.c
index f050645044c..db62fd45f8f 100644
--- a/drivers/phy/allwinner/phy-sun4i-usb.c
+++ b/drivers/phy/allwinner/phy-sun4i-usb.c
@@ -26,6 +26,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/string.h>
 
 #define REG_ISCR			0x00
 #define REG_PHYCTL_A10			0x04
diff --git a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
index 29749b4c3fa..75bd0fff5db 100644
--- a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
+++ b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
@@ -19,6 +19,7 @@
 #include <asm/io.h>
 #include <linux/iopoll.h>
 #include <asm/arch-rockchip/clock.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/phy/rockchip/phy-rockchip-typec.c b/drivers/phy/rockchip/phy-rockchip-typec.c
index 6a5dc7ee44f..9a9a653c7ef 100644
--- a/drivers/phy/rockchip/phy-rockchip-typec.c
+++ b/drivers/phy/rockchip/phy-rockchip-typec.c
@@ -21,6 +21,7 @@
 #include <asm/io.h>
 #include <linux/iopoll.h>
 #include <asm/arch-rockchip/clock.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/pinctrl/exynos/pinctrl-exynos.c b/drivers/pinctrl/exynos/pinctrl-exynos.c
index cc7ef799895..6034794f671 100644
--- a/drivers/pinctrl/exynos/pinctrl-exynos.c
+++ b/drivers/pinctrl/exynos/pinctrl-exynos.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <linux/string.h>
 #include "pinctrl-exynos.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/pinctrl/mtmips/pinctrl-mtmips-common.c b/drivers/pinctrl/mtmips/pinctrl-mtmips-common.c
index e361916eb28..d5262438e17 100644
--- a/drivers/pinctrl/mtmips/pinctrl-mtmips-common.c
+++ b/drivers/pinctrl/mtmips/pinctrl-mtmips-common.c
@@ -10,6 +10,7 @@
 #include <malloc.h>
 #include <dm/pinctrl.h>
 #include <linux/io.h>
+#include <linux/string.h>
 
 #include "pinctrl-mtmips-common.h"
 
diff --git a/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c b/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c
index b64ad9a21c6..7541898ac46 100644
--- a/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c
+++ b/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c
@@ -36,6 +36,7 @@
 #include <linux/bitops.h>
 #include <linux/libfdt.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/pinctrl/pinctrl-generic.c b/drivers/pinctrl/pinctrl-generic.c
index 313aeccb1ee..7a2131d73ea 100644
--- a/drivers/pinctrl/pinctrl-generic.c
+++ b/drivers/pinctrl/pinctrl-generic.c
@@ -8,6 +8,7 @@
 #include <dm/device_compat.h>
 #include <linux/compat.h>
 #include <dm/pinctrl.h>
+#include <linux/string.h>
 
 /**
  * pinctrl_pin_name_to_selector() - return the pin selector for a pin
diff --git a/drivers/pinctrl/pinctrl-sandbox.c b/drivers/pinctrl/pinctrl-sandbox.c
index ac0119d1988..b3312294683 100644
--- a/drivers/pinctrl/pinctrl-sandbox.c
+++ b/drivers/pinctrl/pinctrl-sandbox.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <dm/pinctrl.h>
 #include <linux/bitops.h>
+#include <linux/string.h>
 
 static const char * const sandbox_pins[] = {
 	"SCL",
diff --git a/drivers/pinctrl/pinctrl-stmfx.c b/drivers/pinctrl/pinctrl-stmfx.c
index c2ea82770e6..2c437c25f69 100644
--- a/drivers/pinctrl/pinctrl-stmfx.c
+++ b/drivers/pinctrl/pinctrl-stmfx.c
@@ -17,6 +17,7 @@
 #include <linux/bitfield.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include <power/regulator.h>
 
 /* STMFX pins = GPIO[15:0] + aGPIO[7:0] */
diff --git a/drivers/pinctrl/rockchip/pinctrl-rockchip-core.c b/drivers/pinctrl/rockchip/pinctrl-rockchip-core.c
index 8abad950431..16efb09b57f 100644
--- a/drivers/pinctrl/rockchip/pinctrl-rockchip-core.c
+++ b/drivers/pinctrl/rockchip/pinctrl-rockchip-core.c
@@ -13,6 +13,7 @@
 #include <fdtdec.h>
 #include <linux/bitops.h>
 #include <linux/libfdt.h>
+#include <linux/string.h>
 
 #include "pinctrl-rockchip.h"
 
diff --git a/drivers/power/domain/imx8-power-domain-legacy.c b/drivers/power/domain/imx8-power-domain-legacy.c
index 961382f33e1..980b946fca1 100644
--- a/drivers/power/domain/imx8-power-domain-legacy.c
+++ b/drivers/power/domain/imx8-power-domain-legacy.c
@@ -15,6 +15,7 @@
 #include <dm/device.h>
 #include <dm/uclass-internal.h>
 #include <asm/arch/sci/sci.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/power/pmic/i2c_pmic_emul.c b/drivers/power/pmic/i2c_pmic_emul.c
index 83d3c292044..4e72e966cfe 100644
--- a/drivers/power/pmic/i2c_pmic_emul.c
+++ b/drivers/power/pmic/i2c_pmic_emul.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include <power/pmic.h>
 #include <power/sandbox_pmic.h>
 
diff --git a/drivers/power/pmic/palmas.c b/drivers/power/pmic/palmas.c
index eb83c88d564..88f88e0014c 100644
--- a/drivers/power/pmic/palmas.c
+++ b/drivers/power/pmic/palmas.c
@@ -11,6 +11,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/palmas.h>
diff --git a/drivers/power/pmic/pmic-uclass.c b/drivers/power/pmic/pmic-uclass.c
index 7770171917d..a83131e1736 100644
--- a/drivers/power/pmic/pmic-uclass.c
+++ b/drivers/power/pmic/pmic-uclass.c
@@ -13,6 +13,7 @@
 #include <dm/lists.h>
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
+#include <linux/string.h>
 #include <power/pmic.h>
 #include <linux/ctype.h>
 
diff --git a/drivers/power/power_core.c b/drivers/power/power_core.c
index eeed8e24a90..9caa4d72b6d 100644
--- a/drivers/power/power_core.c
+++ b/drivers/power/power_core.c
@@ -13,6 +13,7 @@
 #include <command.h>
 #include <log.h>
 #include <malloc.h>
+#include <linux/string.h>
 #include <linux/types.h>
 #include <linux/list.h>
 #include <power/pmic.h>
diff --git a/drivers/power/power_i2c.c b/drivers/power/power_i2c.c
index 5a0455e1195..41d7113251d 100644
--- a/drivers/power/power_i2c.c
+++ b/drivers/power/power_i2c.c
@@ -12,6 +12,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <linux/string.h>
 #include <linux/types.h>
 #include <power/pmic.h>
 #include <i2c.h>
diff --git a/drivers/power/regulator/bd71837.c b/drivers/power/regulator/bd71837.c
index 3499bd2c56b..8c7f71be3e8 100644
--- a/drivers/power/regulator/bd71837.c
+++ b/drivers/power/regulator/bd71837.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <linux/bitops.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include <power/bd71837.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/regulator/da9063.c b/drivers/power/regulator/da9063.c
index 5055e39cb79..3e5d2596561 100644
--- a/drivers/power/regulator/da9063.c
+++ b/drivers/power/regulator/da9063.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <linux/bitops.h>
+#include <linux/string.h>
 #include <power/da9063_pmic.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/regulator/palmas_regulator.c b/drivers/power/regulator/palmas_regulator.c
index 78909f70189..9bb8c7ff32a 100644
--- a/drivers/power/regulator/palmas_regulator.c
+++ b/drivers/power/regulator/palmas_regulator.c
@@ -11,6 +11,7 @@
 #include <errno.h>
 #include <dm.h>
 #include <i2c.h>
+#include <linux/string.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/palmas.h>
diff --git a/drivers/power/regulator/pfuze100.c b/drivers/power/regulator/pfuze100.c
index b56843046f2..15f34b915f2 100644
--- a/drivers/power/regulator/pfuze100.c
+++ b/drivers/power/regulator/pfuze100.c
@@ -11,6 +11,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <log.h>
+#include <linux/string.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/pfuze100_pmic.h>
diff --git a/drivers/power/regulator/regulator-uclass.c b/drivers/power/regulator/regulator-uclass.c
index da679a572c2..c20c42b29d0 100644
--- a/drivers/power/regulator/regulator-uclass.c
+++ b/drivers/power/regulator/regulator-uclass.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <dm/uclass-internal.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 
diff --git a/drivers/qe/qe.c b/drivers/qe/qe.c
index 79dcbf049a0..cfcc247389a 100644
--- a/drivers/qe/qe.c
+++ b/drivers/qe/qe.c
@@ -15,6 +15,7 @@
 #include <linux/immap_qe.h>
 #include <fsl_qe.h>
 #include <mmc.h>
+#include <linux/string.h>
 #include <u-boot/crc.h>
 
 #ifdef CONFIG_ARCH_LS1021A
diff --git a/drivers/qe/uccf.c b/drivers/qe/uccf.c
index 9beb5d90aca..4d5840e77b1 100644
--- a/drivers/qe/uccf.c
+++ b/drivers/qe/uccf.c
@@ -11,6 +11,7 @@
 #include <linux/errno.h>
 #include <asm/io.h>
 #include <linux/immap_qe.h>
+#include <linux/string.h>
 #include "uccf.h"
 #include <fsl_qe.h>
 
diff --git a/drivers/qe/uec.c b/drivers/qe/uec.c
index 01434543873..409d806dd8f 100644
--- a/drivers/qe/uec.c
+++ b/drivers/qe/uec.c
@@ -13,6 +13,7 @@
 #include <linux/errno.h>
 #include <asm/io.h>
 #include <linux/immap_qe.h>
+#include <linux/string.h>
 #include "uccf.h"
 #include "uec.h"
 #include "uec_phy.h"
diff --git a/drivers/qe/uec_phy.c b/drivers/qe/uec_phy.c
index 69c22dd5e26..69a520d4baf 100644
--- a/drivers/qe/uec_phy.c
+++ b/drivers/qe/uec_phy.c
@@ -16,6 +16,7 @@
 #include <linux/errno.h>
 #include <linux/immap_qe.h>
 #include <asm/io.h>
+#include <linux/string.h>
 #include "uccf.h"
 #include "uec.h"
 #include "uec_phy.h"
diff --git a/drivers/ram/imxrt_sdram.c b/drivers/ram/imxrt_sdram.c
index 8be15340b94..dcf3590c6c3 100644
--- a/drivers/ram/imxrt_sdram.c
+++ b/drivers/ram/imxrt_sdram.c
@@ -15,6 +15,7 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 /* SDRAM Command Code */
 #define SD_CC_ARD		0x0     /* Master Bus (AXI) command - Read */
diff --git a/drivers/ram/rockchip/sdram_rk3188.c b/drivers/ram/rockchip/sdram_rk3188.c
index 06f9eba1a5b..d3ed9bcc29e 100644
--- a/drivers/ram/rockchip/sdram_rk3188.c
+++ b/drivers/ram/rockchip/sdram_rk3188.c
@@ -27,6 +27,7 @@
 #include <asm/arch-rockchip/sdram_rk3288.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/string.h>
 
 struct chan_info {
 	struct rk3288_ddr_pctl *pctl;
diff --git a/drivers/ram/rockchip/sdram_rk322x.c b/drivers/ram/rockchip/sdram_rk322x.c
index 4a24854a3df..4154f0c2642 100644
--- a/drivers/ram/rockchip/sdram_rk322x.c
+++ b/drivers/ram/rockchip/sdram_rk322x.c
@@ -23,6 +23,7 @@
 #include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 struct chan_info {
diff --git a/drivers/ram/rockchip/sdram_rk3288.c b/drivers/ram/rockchip/sdram_rk3288.c
index 26e8d059b5d..01f030e01a1 100644
--- a/drivers/ram/rockchip/sdram_rk3288.c
+++ b/drivers/ram/rockchip/sdram_rk3288.c
@@ -27,6 +27,7 @@
 #include <asm/arch-rockchip/sdram_rk3288.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/string.h>
 #include <power/regulator.h>
 #include <power/rk8xx_pmic.h>
 
diff --git a/drivers/ram/rockchip/sdram_rk3328.c b/drivers/ram/rockchip/sdram_rk3328.c
index 98c7feb6cfa..586e82e6ebc 100644
--- a/drivers/ram/rockchip/sdram_rk3328.c
+++ b/drivers/ram/rockchip/sdram_rk3328.c
@@ -20,6 +20,7 @@
 #include <asm/arch-rockchip/sdram_rk3328.h>
 #include <asm/arch-rockchip/uart.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 struct dram_info {
 #ifdef CONFIG_TPL_BUILD
diff --git a/drivers/ram/stm32_sdram.c b/drivers/ram/stm32_sdram.c
index de5a9bc0569..1b8cb594966 100644
--- a/drivers/ram/stm32_sdram.c
+++ b/drivers/ram/stm32_sdram.c
@@ -15,6 +15,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #define MEM_MODE_MASK	GENMASK(2, 0)
 #define SWP_FMC_OFFSET 10
diff --git a/drivers/ram/stm32mp1/stm32mp1_ddr.c b/drivers/ram/stm32mp1/stm32mp1_ddr.c
index 8b59903e6bf..350681bcfe5 100644
--- a/drivers/ram/stm32mp1/stm32mp1_ddr.c
+++ b/drivers/ram/stm32mp1/stm32mp1_ddr.c
@@ -15,6 +15,7 @@
 #include <linux/delay.h>
 #include <linux/iopoll.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include "stm32mp1_ddr.h"
 #include "stm32mp1_ddr_regs.h"
 
diff --git a/drivers/ram/stm32mp1/stm32mp1_interactive.c b/drivers/ram/stm32mp1/stm32mp1_interactive.c
index d3b8b3b5afa..398018e4c25 100644
--- a/drivers/ram/stm32mp1/stm32mp1_interactive.c
+++ b/drivers/ram/stm32mp1/stm32mp1_interactive.c
@@ -14,6 +14,7 @@
 #include <reset.h>
 #include <time.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 #include "stm32mp1_ddr.h"
 #include "stm32mp1_tests.h"
 
diff --git a/drivers/ram/stm32mp1/stm32mp1_ram.c b/drivers/ram/stm32mp1/stm32mp1_ram.c
index 63333a1b1b6..85e01ffd098 100644
--- a/drivers/ram/stm32mp1/stm32mp1_ram.c
+++ b/drivers/ram/stm32mp1/stm32mp1_ram.c
@@ -13,6 +13,7 @@
 #include <syscon.h>
 #include <asm/io.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include "stm32mp1_ddr.h"
 
 static const char *const clkname[] = {
diff --git a/drivers/ram/stm32mp1/stm32mp1_tests.c b/drivers/ram/stm32mp1/stm32mp1_tests.c
index b0c510ad5e9..a5433ac1402 100644
--- a/drivers/ram/stm32mp1/stm32mp1_tests.c
+++ b/drivers/ram/stm32mp1/stm32mp1_tests.c
@@ -11,6 +11,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/log2.h>
+#include <linux/string.h>
 #include "stm32mp1_tests.h"
 
 #define ADDR_INVALID	0xFFFFFFFF
diff --git a/drivers/ram/stm32mp1/stm32mp1_tuning.c b/drivers/ram/stm32mp1/stm32mp1_tuning.c
index 2fc8e32847c..222777ad3cf 100644
--- a/drivers/ram/stm32mp1/stm32mp1_tuning.c
+++ b/drivers/ram/stm32mp1/stm32mp1_tuning.c
@@ -14,6 +14,7 @@
 #include <linux/delay.h>
 #include <linux/iopoll.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #include "stm32mp1_ddr_regs.h"
 #include "stm32mp1_ddr.h"
diff --git a/drivers/remoteproc/k3_system_controller.c b/drivers/remoteproc/k3_system_controller.c
index 54209fccb3e..44271c5baf8 100644
--- a/drivers/remoteproc/k3_system_controller.c
+++ b/drivers/remoteproc/k3_system_controller.c
@@ -14,6 +14,7 @@
 #include <mailbox.h>
 #include <dm/device_compat.h>
 #include <linux/soc/ti/k3-sec-proxy.h>
+#include <linux/string.h>
 
 #define K3_MSG_R5_TO_M3_M3FW			0x8105
 #define K3_MSG_M3_TO_R5_CERT_RESULT		0x8805
diff --git a/drivers/remoteproc/rproc-elf-loader.c b/drivers/remoteproc/rproc-elf-loader.c
index 1e309c0f4f9..45331107353 100644
--- a/drivers/remoteproc/rproc-elf-loader.c
+++ b/drivers/remoteproc/rproc-elf-loader.c
@@ -12,6 +12,7 @@
 #include <dm/device_compat.h>
 #include <linux/compat.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 /**
  * struct resource_table - firmware resource table header
diff --git a/drivers/remoteproc/rproc-uclass.c b/drivers/remoteproc/rproc-uclass.c
index 0c2b601c472..1ed194aa034 100644
--- a/drivers/remoteproc/rproc-uclass.c
+++ b/drivers/remoteproc/rproc-uclass.c
@@ -17,6 +17,7 @@
 #include <dm/uclass.h>
 #include <dm/uclass-internal.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/remoteproc/ti_k3_dsp_rproc.c b/drivers/remoteproc/ti_k3_dsp_rproc.c
index 3361555c536..cbebfacb48c 100644
--- a/drivers/remoteproc/ti_k3_dsp_rproc.c
+++ b/drivers/remoteproc/ti_k3_dsp_rproc.c
@@ -21,6 +21,7 @@
 #include <linux/err.h>
 #include <linux/sizes.h>
 #include <linux/soc/ti/ti_sci_protocol.h>
+#include <linux/string.h>
 #include "ti_sci_proc.h"
 
 #define KEYSTONE_RPROC_LOCAL_ADDRESS_MASK	(SZ_16M - 1)
diff --git a/drivers/remoteproc/ti_k3_r5f_rproc.c b/drivers/remoteproc/ti_k3_r5f_rproc.c
index 1a7f1f8a005..c3018d74a47 100644
--- a/drivers/remoteproc/ti_k3_r5f_rproc.c
+++ b/drivers/remoteproc/ti_k3_r5f_rproc.c
@@ -19,6 +19,7 @@
 #include <linux/err.h>
 #include <linux/kernel.h>
 #include <linux/soc/ti/ti_sci_protocol.h>
+#include <linux/string.h>
 #include "ti_sci_proc.h"
 
 /*
diff --git a/drivers/remoteproc/ti_power_proc.c b/drivers/remoteproc/ti_power_proc.c
index 86fa6457ede..0d78ec439d0 100644
--- a/drivers/remoteproc/ti_power_proc.c
+++ b/drivers/remoteproc/ti_power_proc.c
@@ -12,6 +12,7 @@
 #include <remoteproc.h>
 #include <asm/global_data.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include <mach/psc_defs.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/rng/meson-rng.c b/drivers/rng/meson-rng.c
index 4b81a623535..448d4537b05 100644
--- a/drivers/rng/meson-rng.c
+++ b/drivers/rng/meson-rng.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <rng.h>
 #include <asm/io.h>
+#include <linux/string.h>
 
 struct meson_rng_platdata {
 	fdt_addr_t base;
diff --git a/drivers/rng/stm32mp1_rng.c b/drivers/rng/stm32mp1_rng.c
index 7ef7ff9756d..4354edd4a1b 100644
--- a/drivers/rng/stm32mp1_rng.c
+++ b/drivers/rng/stm32mp1_rng.c
@@ -11,6 +11,7 @@
 #include <rng.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include <asm/io.h>
 #include <linux/iopoll.h>
diff --git a/drivers/rtc/ds1302.c b/drivers/rtc/ds1302.c
index 189607c3e02..21655085d1b 100644
--- a/drivers/rtc/ds1302.c
+++ b/drivers/rtc/ds1302.c
@@ -9,6 +9,7 @@
 #include <command.h>
 #include <rtc.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 /* GPP Pins */
 #define DATA		0x200
diff --git a/drivers/rtc/i2c_rtc_emul.c b/drivers/rtc/i2c_rtc_emul.c
index 7f78ff83cb0..a78dc78cfcc 100644
--- a/drivers/rtc/i2c_rtc_emul.c
+++ b/drivers/rtc/i2c_rtc_emul.c
@@ -21,6 +21,7 @@
 #include <rtc.h>
 #include <asm/rtc.h>
 #include <asm/test.h>
+#include <linux/string.h>
 
 #ifdef DEBUG
 #define debug_buffer print_buffer
diff --git a/drivers/rtc/rs5c372.c b/drivers/rtc/rs5c372.c
index 97ec001aef5..64ff8c89d40 100644
--- a/drivers/rtc/rs5c372.c
+++ b/drivers/rtc/rs5c372.c
@@ -23,6 +23,7 @@
 #include <command.h>
 #include <rtc.h>
 #include <i2c.h>
+#include <linux/string.h>
 
 /*
  * Reads are always done starting with register 15, which requires some
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
index 0ab1d441f40..2492c3394b9 100644
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -15,6 +15,7 @@
 #include <scsi.h>
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
+#include <linux/string.h>
 
 #if !defined(CONFIG_DM_SCSI)
 # ifdef CONFIG_SCSI_DEV_LIST
diff --git a/drivers/serial/sandbox.c b/drivers/serial/sandbox.c
index 8a7f171e041..01c924675af 100644
--- a/drivers/serial/sandbox.c
+++ b/drivers/serial/sandbox.c
@@ -20,6 +20,7 @@
 #include <asm/global_data.h>
 #include <linux/compiler.h>
 #include <asm/state.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/serial/serial-uclass.c b/drivers/serial/serial-uclass.c
index c1df29c530b..7ad61d8d39f 100644
--- a/drivers/serial/serial-uclass.c
+++ b/drivers/serial/serial-uclass.c
@@ -17,6 +17,7 @@
 #include <dm/device-internal.h>
 #include <dm/of_access.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/serial/serial.c b/drivers/serial/serial.c
index 839c3972b6d..4b9a2333801 100644
--- a/drivers/serial/serial.c
+++ b/drivers/serial/serial.c
@@ -14,6 +14,7 @@
 #include <linux/compiler.h>
 #include <errno.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/serial/usbtty.c b/drivers/serial/usbtty.c
index f1c1a260da5..f0b64809560 100644
--- a/drivers/serial/usbtty.c
+++ b/drivers/serial/usbtty.c
@@ -14,6 +14,7 @@
 #include <serial.h>
 #include <stdio_dev.h>
 #include <asm/unaligned.h>
+#include <linux/string.h>
 #include "usbtty.h"
 #include "usb_cdc_acm.h"
 #include "usbdescriptors.h"
diff --git a/drivers/smem/msm_smem.c b/drivers/smem/msm_smem.c
index bf1696e85e0..09a1268e276 100644
--- a/drivers/smem/msm_smem.c
+++ b/drivers/smem/msm_smem.c
@@ -19,6 +19,7 @@
 #include <linux/ioport.h>
 #include <linux/io.h>
 #include <smem.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/soc/soc-uclass.c b/drivers/soc/soc-uclass.c
index c32d647864f..d22773e478b 100644
--- a/drivers/soc/soc-uclass.c
+++ b/drivers/soc/soc-uclass.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <dm/lists.h>
 #include <dm/root.h>
+#include <linux/string.h>
 
 int soc_get(struct udevice **devp)
 {
diff --git a/drivers/soc/ti/k3-navss-ringacc.c b/drivers/soc/ti/k3-navss-ringacc.c
index fb04da2717d..f4a0272f3ae 100644
--- a/drivers/soc/ti/k3-navss-ringacc.c
+++ b/drivers/soc/ti/k3-navss-ringacc.c
@@ -24,6 +24,7 @@
 #include <linux/printk.h>
 #include <linux/soc/ti/k3-navss-ringacc.h>
 #include <linux/soc/ti/ti_sci_protocol.h>
+#include <linux/string.h>
 
 #define set_bit(bit, bitmap)	__set_bit(bit, bitmap)
 #define clear_bit(bit, bitmap)	__clear_bit(bit, bitmap)
diff --git a/drivers/spi/atcspi200_spi.c b/drivers/spi/atcspi200_spi.c
index 9e7d40d0a81..7ba208baf2e 100644
--- a/drivers/spi/atcspi200_spi.c
+++ b/drivers/spi/atcspi200_spi.c
@@ -14,6 +14,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/spi/bcmstb_spi.c b/drivers/spi/bcmstb_spi.c
index f400a0f5732..40364fbf57c 100644
--- a/drivers/spi/bcmstb_spi.c
+++ b/drivers/spi/bcmstb_spi.c
@@ -18,6 +18,7 @@
 #include <malloc.h>
 #include <spi.h>
 #include <time.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/spi/cadence_qspi_apb.c b/drivers/spi/cadence_qspi_apb.c
index 77ec7c6ecda..f1f510ef65f 100644
--- a/drivers/spi/cadence_qspi_apb.c
+++ b/drivers/spi/cadence_qspi_apb.c
@@ -37,6 +37,7 @@
 #include <spi.h>
 #include <spi-mem.h>
 #include <malloc.h>
+#include <linux/string.h>
 #include "cadence_qspi.h"
 
 #define CQSPI_REG_POLL_US			1 /* 1us */
diff --git a/drivers/spi/cf_spi.c b/drivers/spi/cf_spi.c
index 242dc9d8909..0f39fe84398 100644
--- a/drivers/spi/cf_spi.c
+++ b/drivers/spi/cf_spi.c
@@ -22,6 +22,7 @@
 #include <malloc.h>
 #include <asm/coldfire/dspi.h>
 #include <asm/io.h>
+#include <linux/string.h>
 
 struct coldfire_spi_priv {
 	struct dspi *regs;
diff --git a/drivers/spi/fsl_espi.c b/drivers/spi/fsl_espi.c
index 3dd98aadbaa..35f8a58da16 100644
--- a/drivers/spi/fsl_espi.c
+++ b/drivers/spi/fsl_espi.c
@@ -13,6 +13,7 @@
 #include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include <malloc.h>
 #include <spi.h>
diff --git a/drivers/spi/fsl_qspi.c b/drivers/spi/fsl_qspi.c
index 84b4714c050..2923fb5fb3d 100644
--- a/drivers/spi/fsl_qspi.c
+++ b/drivers/spi/fsl_qspi.c
@@ -38,6 +38,7 @@
 #include <linux/err.h>
 #include <spi.h>
 #include <spi-mem.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/spi/ich.c b/drivers/spi/ich.c
index 224c2b07919..308ace8a580 100644
--- a/drivers/spi/ich.c
+++ b/drivers/spi/ich.c
@@ -30,6 +30,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/sizes.h>
+#include <linux/string.h>
 
 #include "ich.h"
 
diff --git a/drivers/spi/meson_spifc.c b/drivers/spi/meson_spifc.c
index 2cdc0186825..5bc99370a10 100644
--- a/drivers/spi/meson_spifc.c
+++ b/drivers/spi/meson_spifc.c
@@ -17,6 +17,7 @@
 #include <asm/io.h>
 #include <linux/bitfield.h>
 #include <linux/bitops.h>
+#include <linux/string.h>
 
 /* register map */
 #define REG_CMD			0x00
diff --git a/drivers/spi/mtk_snfi_spi.c b/drivers/spi/mtk_snfi_spi.c
index c30c8f4ff6d..7f5d78e357e 100644
--- a/drivers/spi/mtk_snfi_spi.c
+++ b/drivers/spi/mtk_snfi_spi.c
@@ -17,6 +17,7 @@
 #include <linux/bitops.h>
 #include <linux/io.h>
 #include <linux/iopoll.h>
+#include <linux/string.h>
 
 #define SNFI_MAC_CTL			0x500
 #define MAC_XIO_SEL			BIT(4)
diff --git a/drivers/spi/mxc_spi.c b/drivers/spi/mxc_spi.c
index cb1abf14416..a2dbd8a96de 100644
--- a/drivers/spi/mxc_spi.c
+++ b/drivers/spi/mxc_spi.c
@@ -20,6 +20,7 @@
 #include <asm/arch/clock.h>
 #include <asm/mach-imx/spi.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/spi/mxs_spi.c b/drivers/spi/mxs_spi.c
index fb0af02be08..8d7bb35d02f 100644
--- a/drivers/spi/mxs_spi.c
+++ b/drivers/spi/mxs_spi.c
@@ -29,6 +29,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/mach-imx/dma.h>
+#include <linux/string.h>
 
 #define	MXS_SPI_MAX_TIMEOUT	1000000
 #define	MXS_SPI_PORT_OFFSET	0x2000
diff --git a/drivers/spi/nxp_fspi.c b/drivers/spi/nxp_fspi.c
index c507437f2e7..b4f928741f3 100644
--- a/drivers/spi/nxp_fspi.c
+++ b/drivers/spi/nxp_fspi.c
@@ -46,6 +46,7 @@
 #include <linux/iopoll.h>
 #include <linux/bug.h>
 #include <linux/err.h>
+#include <linux/string.h>
 
 /*
  * The driver only uses one single LUT entry, that is updated on
diff --git a/drivers/spi/renesas_rpc_spi.c b/drivers/spi/renesas_rpc_spi.c
index 72a9e464776..1ceb7294bb6 100644
--- a/drivers/spi/renesas_rpc_spi.c
+++ b/drivers/spi/renesas_rpc_spi.c
@@ -18,6 +18,7 @@
 #include <linux/errno.h>
 #include <spi.h>
 #include <wait_bit.h>
+#include <linux/string.h>
 
 #define RPC_CMNCR		0x0000	/* R/W */
 #define RPC_CMNCR_MD		BIT(31)
diff --git a/drivers/spi/spi-mem-nodm.c b/drivers/spi/spi-mem-nodm.c
index 765f05fe542..841eefc12ce 100644
--- a/drivers/spi/spi-mem-nodm.c
+++ b/drivers/spi/spi-mem-nodm.c
@@ -7,6 +7,7 @@
 #include <malloc.h>
 #include <spi.h>
 #include <spi-mem.h>
+#include <linux/string.h>
 
 int spi_mem_exec_op(struct spi_slave *slave,
 		    const struct spi_mem_op *op)
diff --git a/drivers/spi/spi-mem.c b/drivers/spi/spi-mem.c
index d344701aebb..13027613dda 100644
--- a/drivers/spi/spi-mem.c
+++ b/drivers/spi/spi-mem.c
@@ -16,6 +16,7 @@
 #include <dm/device_compat.h>
 #include <spi.h>
 #include <spi-mem.h>
+#include <linux/string.h>
 #endif
 
 #ifndef __UBOOT__
diff --git a/drivers/spi/spi-sifive.c b/drivers/spi/spi-sifive.c
index 0e0ce25abb9..87635cf5bec 100644
--- a/drivers/spi/spi-sifive.c
+++ b/drivers/spi/spi-sifive.c
@@ -16,6 +16,7 @@
 #include <linux/bitops.h>
 #include <linux/log2.h>
 #include <clk.h>
+#include <linux/string.h>
 
 #define SIFIVE_SPI_MAX_CS		32
 
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 22910de0dd9..426d30c6b21 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -7,6 +7,7 @@
 #include <fdtdec.h>
 #include <malloc.h>
 #include <spi.h>
+#include <linux/string.h>
 
 int spi_set_wordlen(struct spi_slave *slave, unsigned int wordlen)
 {
diff --git a/drivers/spi/tegra210_qspi.c b/drivers/spi/tegra210_qspi.c
index 293b16c6fe9..90ac21f8ad9 100644
--- a/drivers/spi/tegra210_qspi.c
+++ b/drivers/spi/tegra210_qspi.c
@@ -18,6 +18,7 @@
 #include <fdtdec.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include "tegra_spi.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/spi/zynq_qspi.c b/drivers/spi/zynq_qspi.c
index af130d4418b..7607c510249 100644
--- a/drivers/spi/zynq_qspi.c
+++ b/drivers/spi/zynq_qspi.c
@@ -15,6 +15,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/spi/zynqmp_gqspi.c b/drivers/spi/zynqmp_gqspi.c
index cd2c7d40b86..151618a99f4 100644
--- a/drivers/spi/zynqmp_gqspi.c
+++ b/drivers/spi/zynqmp_gqspi.c
@@ -22,6 +22,7 @@
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/err.h>
+#include <linux/string.h>
 
 #define GQSPI_GFIFO_STRT_MODE_MASK	BIT(29)
 #define GQSPI_CONFIG_MODE_EN_MASK	(3 << 30)
diff --git a/drivers/sysreset/sysreset_sandbox.c b/drivers/sysreset/sysreset_sandbox.c
index 69c22a70008..cb90266ab0c 100644
--- a/drivers/sysreset/sysreset_sandbox.c
+++ b/drivers/sysreset/sysreset_sandbox.c
@@ -10,6 +10,7 @@
 #include <sysreset.h>
 #include <asm/state.h>
 #include <asm/test.h>
+#include <linux/string.h>
 
 static int sandbox_warm_sysreset_request(struct udevice *dev,
 					 enum sysreset_t type)
diff --git a/drivers/tee/broadcom/chimp_optee.c b/drivers/tee/broadcom/chimp_optee.c
index 37f9b094f76..91ebc17c036 100644
--- a/drivers/tee/broadcom/chimp_optee.c
+++ b/drivers/tee/broadcom/chimp_optee.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <string.h>
 #include <tee.h>
 #include <broadcom/chimp.h>
 
diff --git a/drivers/tee/optee/core.c b/drivers/tee/optee/core.c
index 5260dab3ac0..0fc7a0ec7f1 100644
--- a/drivers/tee/optee/core.c
+++ b/drivers/tee/optee/core.c
@@ -11,6 +11,7 @@
 #include <linux/arm-smccc.h>
 #include <linux/err.h>
 #include <linux/io.h>
+#include <linux/string.h>
 
 #include "optee_smc.h"
 #include "optee_msg.h"
diff --git a/drivers/tee/sandbox.c b/drivers/tee/sandbox.c
index 4b91e7db1bc..2f174fa00f9 100644
--- a/drivers/tee/sandbox.c
+++ b/drivers/tee/sandbox.c
@@ -6,6 +6,7 @@
 #include <dm.h>
 #include <sandboxtee.h>
 #include <tee.h>
+#include <linux/string.h>
 #include <tee/optee_ta_avb.h>
 
 /*
diff --git a/drivers/tee/tee-uclass.c b/drivers/tee/tee-uclass.c
index 112e2168834..76de11c3fb8 100644
--- a/drivers/tee/tee-uclass.c
+++ b/drivers/tee/tee-uclass.c
@@ -10,6 +10,7 @@
 #include <tee.h>
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
+#include <linux/string.h>
 
 /**
  * struct tee_uclass_priv - information of a TEE, stored by the uclass
diff --git a/drivers/thermal/imx_scu_thermal.c b/drivers/thermal/imx_scu_thermal.c
index dc92e6b603e..b3c823ffcb7 100644
--- a/drivers/thermal/imx_scu_thermal.c
+++ b/drivers/thermal/imx_scu_thermal.c
@@ -15,6 +15,7 @@
 #include <asm/arch/sci/sci.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/thermal/imx_tmu.c b/drivers/thermal/imx_tmu.c
index d8acfef4925..b9bdec00c6d 100644
--- a/drivers/thermal/imx_tmu.c
+++ b/drivers/thermal/imx_tmu.c
@@ -17,6 +17,7 @@
 #include <fuse.h>
 #include <malloc.h>
 #include <thermal.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/tpm/cr50_i2c.c b/drivers/tpm/cr50_i2c.c
index b0075d3bb48..611dd534dc3 100644
--- a/drivers/tpm/cr50_i2c.c
+++ b/drivers/tpm/cr50_i2c.c
@@ -20,6 +20,7 @@
 #include <asm/arch/iomap.h>
 #include <asm/arch/pm.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 enum {
 	TIMEOUT_INIT_MS		= 30000, /* Very long timeout for TPM init */
diff --git a/drivers/tpm/tpm-uclass.c b/drivers/tpm/tpm-uclass.c
index 01d7c2f47c1..61331726833 100644
--- a/drivers/tpm/tpm-uclass.c
+++ b/drivers/tpm/tpm-uclass.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <time.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include <linux/unaligned/be_byteshift.h>
 #include <tpm-v1.h>
 #include <tpm-v2.h>
diff --git a/drivers/tpm/tpm2_ftpm_tee.c b/drivers/tpm/tpm2_ftpm_tee.c
index 3197e0ebcd3..a7c94c7429b 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 <linux/string.h>
 
 #include "tpm_tis.h"
 #include "tpm2_ftpm_tee.h"
diff --git a/drivers/tpm/tpm2_tis_sandbox.c b/drivers/tpm/tpm2_tis_sandbox.c
index 41a15bd49fb..708d030f5eb 100644
--- a/drivers/tpm/tpm2_tis_sandbox.c
+++ b/drivers/tpm/tpm2_tis_sandbox.c
@@ -10,6 +10,7 @@
 #include <asm/state.h>
 #include <asm/unaligned.h>
 #include <linux/bitops.h>
+#include <linux/string.h>
 #include <u-boot/crc.h>
 
 /* Hierarchies */
diff --git a/drivers/tpm/tpm2_tis_spi.c b/drivers/tpm/tpm2_tis_spi.c
index 195d8be8bf3..52fb3a9235f 100644
--- a/drivers/tpm/tpm2_tis_spi.c
+++ b/drivers/tpm/tpm2_tis_spi.c
@@ -25,6 +25,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/compiler.h>
+#include <linux/string.h>
 #include <linux/types.h>
 #include <linux/unaligned/be_byteshift.h>
 #include <asm-generic/gpio.h>
diff --git a/drivers/tpm/tpm_atmel_twi.c b/drivers/tpm/tpm_atmel_twi.c
index 9444c1b4813..ade72c05638 100644
--- a/drivers/tpm/tpm_atmel_twi.c
+++ b/drivers/tpm/tpm_atmel_twi.c
@@ -13,6 +13,7 @@
 #include <i2c.h>
 #include <asm/unaligned.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include "tpm_internal.h"
 
diff --git a/drivers/tpm/tpm_tis_infineon.c b/drivers/tpm/tpm_tis_infineon.c
index fe832d41329..e8391eaa1e6 100644
--- a/drivers/tpm/tpm_tis_infineon.c
+++ b/drivers/tpm/tpm_tis_infineon.c
@@ -30,6 +30,7 @@
 #include <linux/errno.h>
 #include <linux/compiler.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include <linux/types.h>
 #include <linux/unaligned/be_byteshift.h>
 
diff --git a/drivers/tpm/tpm_tis_lpc.c b/drivers/tpm/tpm_tis_lpc.c
index 2dd374cf77d..8929b269ddf 100644
--- a/drivers/tpm/tpm_tis_lpc.c
+++ b/drivers/tpm/tpm_tis_lpc.c
@@ -19,6 +19,7 @@
 #include <tpm-v1.h>
 #include <asm/io.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #define PREFIX "lpc_tpm: "
 
diff --git a/drivers/tpm/tpm_tis_sandbox.c b/drivers/tpm/tpm_tis_sandbox.c
index f35d6920442..d923e9723ae 100644
--- a/drivers/tpm/tpm_tis_sandbox.c
+++ b/drivers/tpm/tpm_tis_sandbox.c
@@ -9,6 +9,7 @@
 #include <tpm-v1.h>
 #include <asm/state.h>
 #include <asm/unaligned.h>
+#include <linux/string.h>
 #include <u-boot/crc.h>
 
 /* TPM NVRAM location indices. */
diff --git a/drivers/tpm/tpm_tis_st33zp24_i2c.c b/drivers/tpm/tpm_tis_st33zp24_i2c.c
index 60af8385b5d..f648ea406d7 100644
--- a/drivers/tpm/tpm_tis_st33zp24_i2c.c
+++ b/drivers/tpm/tpm_tis_st33zp24_i2c.c
@@ -21,6 +21,7 @@
 #include <tpm-v1.h>
 #include <errno.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include <linux/types.h>
 #include <asm/unaligned.h>
 
diff --git a/drivers/tpm/tpm_tis_st33zp24_spi.c b/drivers/tpm/tpm_tis_st33zp24_spi.c
index edd7d7840b9..5c3ce137244 100644
--- a/drivers/tpm/tpm_tis_st33zp24_spi.c
+++ b/drivers/tpm/tpm_tis_st33zp24_spi.c
@@ -21,6 +21,7 @@
 #include <tpm-v1.h>
 #include <errno.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include <linux/types.h>
 #include <asm/unaligned.h>
 #include <linux/compat.h>
diff --git a/drivers/ufs/ufs.c b/drivers/ufs/ufs.c
index 97fa80de068..71132314c22 100644
--- a/drivers/ufs/ufs.c
+++ b/drivers/ufs/ufs.c
@@ -22,6 +22,7 @@
 #include <scsi.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include <linux/dma-mapping.h>
 
diff --git a/drivers/usb/cdns3/gadget.c b/drivers/usb/cdns3/gadget.c
index de57029cf40..d4aaa19dad6 100644
--- a/drivers/usb/cdns3/gadget.c
+++ b/drivers/usb/cdns3/gadget.c
@@ -63,6 +63,7 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include <linux/usb/gadget.h>
 #include <linux/compat.h>
 #include <linux/iopoll.h>
diff --git a/drivers/usb/common/common.c b/drivers/usb/common/common.c
index d27ab90d22d..5a8d24da821 100644
--- a/drivers/usb/common/common.c
+++ b/drivers/usb/common/common.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <asm/global_data.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include <linux/usb/otg.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/phy.h>
diff --git a/drivers/usb/common/fsl-dt-fixup.c b/drivers/usb/common/fsl-dt-fixup.c
index 4d7a2acd8e5..5fc887c7cf7 100644
--- a/drivers/usb/common/fsl-dt-fixup.c
+++ b/drivers/usb/common/fsl-dt-fixup.c
@@ -15,6 +15,7 @@
 #include <fsl_errata.h>
 #include <fsl_usb.h>
 #include <fdt_support.h>
+#include <linux/string.h>
 
 #ifndef CONFIG_USB_MAX_CONTROLLER_COUNT
 #define CONFIG_USB_MAX_CONTROLLER_COUNT 1
diff --git a/drivers/usb/dwc3/ep0.c b/drivers/usb/dwc3/ep0.c
index 385bed3e34c..f9420873bba 100644
--- a/drivers/usb/dwc3/ep0.c
+++ b/drivers/usb/dwc3/ep0.c
@@ -18,6 +18,7 @@
 #include <linux/bug.h>
 #include <linux/kernel.h>
 #include <linux/list.h>
+#include <linux/string.h>
 
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
index 17d04b8b71f..55324118ae7 100644
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@ -24,6 +24,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/list.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
diff --git a/drivers/usb/dwc3/linux-compat.h b/drivers/usb/dwc3/linux-compat.h
index 82793765bea..92a3dc2850b 100644
--- a/drivers/usb/dwc3/linux-compat.h
+++ b/drivers/usb/dwc3/linux-compat.h
@@ -11,6 +11,7 @@
 #ifndef __DWC3_LINUX_COMPAT__
 #define __DWC3_LINUX_COMPAT__
 
+#include <linux/string.h>
 #define dev_WARN(dev, format, arg...)	debug(format, ##arg)
 
 static inline size_t strlcat(char *dest, const char *src, size_t n)
diff --git a/drivers/usb/emul/sandbox_flash.c b/drivers/usb/emul/sandbox_flash.c
index 9c305f46e94..883f6ae6d39 100644
--- a/drivers/usb/emul/sandbox_flash.c
+++ b/drivers/usb/emul/sandbox_flash.c
@@ -10,6 +10,7 @@
 #include <os.h>
 #include <scsi.h>
 #include <usb.h>
+#include <linux/string.h>
 
 /*
  * This driver emulates a flash stick using the UFI command specification and
diff --git a/drivers/usb/emul/sandbox_keyb.c b/drivers/usb/emul/sandbox_keyb.c
index f562fb7eca2..9f4b4089562 100644
--- a/drivers/usb/emul/sandbox_keyb.c
+++ b/drivers/usb/emul/sandbox_keyb.c
@@ -10,6 +10,7 @@
 #include <os.h>
 #include <scsi.h>
 #include <usb.h>
+#include <linux/string.h>
 
 /*
  * This driver emulates a USB keyboard using the USB HID specification (boot
diff --git a/drivers/usb/emul/usb-emul-uclass.c b/drivers/usb/emul/usb-emul-uclass.c
index e3419e2fd47..9807cbed165 100644
--- a/drivers/usb/emul/usb-emul-uclass.c
+++ b/drivers/usb/emul/usb-emul-uclass.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <usb.h>
 #include <dm/device-internal.h>
+#include <linux/string.h>
 
 static int copy_to_unicode(char *buff, int length, const char *str)
 {
diff --git a/drivers/usb/eth/asix.c b/drivers/usb/eth/asix.c
index ac4a27fff20..3a0d8dadb35 100644
--- a/drivers/usb/eth/asix.c
+++ b/drivers/usb/eth/asix.c
@@ -14,6 +14,7 @@
 #include <memalign.h>
 #include <linux/delay.h>
 #include <linux/mii.h>
+#include <linux/string.h>
 #include "usb_ether.h"
 
 /* ASIX AX8817X based USB 2.0 Ethernet Devices */
diff --git a/drivers/usb/eth/asix88179.c b/drivers/usb/eth/asix88179.c
index c142b8b19bf..b4249d9ad51 100644
--- a/drivers/usb/eth/asix88179.c
+++ b/drivers/usb/eth/asix88179.c
@@ -12,6 +12,7 @@
 #include <net.h>
 #include <linux/delay.h>
 #include <linux/mii.h>
+#include <linux/string.h>
 #include "usb_ether.h"
 #include <malloc.h>
 #include <memalign.h>
diff --git a/drivers/usb/eth/lan75xx.c b/drivers/usb/eth/lan75xx.c
index 46b92e8d68b..7d828d75dc6 100644
--- a/drivers/usb/eth/lan75xx.c
+++ b/drivers/usb/eth/lan75xx.c
@@ -8,6 +8,7 @@
 #include <usb.h>
 #include <linux/bitops.h>
 #include <linux/mii.h>
+#include <linux/string.h>
 #include "usb_ether.h"
 #include "lan7x.h"
 
diff --git a/drivers/usb/eth/lan78xx.c b/drivers/usb/eth/lan78xx.c
index e34ad2603fb..9a7a0d834a1 100644
--- a/drivers/usb/eth/lan78xx.c
+++ b/drivers/usb/eth/lan78xx.c
@@ -8,6 +8,7 @@
 #include <net.h>
 #include <usb.h>
 #include <linux/bitops.h>
+#include <linux/string.h>
 #include "usb_ether.h"
 #include "lan7x.h"
 
diff --git a/drivers/usb/eth/lan7x.c b/drivers/usb/eth/lan7x.c
index 0a283619ae5..b1483612783 100644
--- a/drivers/usb/eth/lan7x.c
+++ b/drivers/usb/eth/lan7x.c
@@ -12,6 +12,7 @@
 #include <usb.h>
 #include <linux/ethtool.h>
 #include <linux/mii.h>
+#include <linux/string.h>
 #include "usb_ether.h"
 #include "lan7x.h"
 
diff --git a/drivers/usb/eth/mcs7830.c b/drivers/usb/eth/mcs7830.c
index 02eef9b269d..5cdd7a10e7c 100644
--- a/drivers/usb/eth/mcs7830.c
+++ b/drivers/usb/eth/mcs7830.c
@@ -20,6 +20,7 @@
 #include <memalign.h>
 #include <usb.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #include "usb_ether.h"
 
diff --git a/drivers/usb/eth/r8152.c b/drivers/usb/eth/r8152.c
index 1845d957f97..40947150a0b 100644
--- a/drivers/usb/eth/r8152.c
+++ b/drivers/usb/eth/r8152.c
@@ -15,6 +15,7 @@
 #include <linux/delay.h>
 #include <linux/mii.h>
 #include <linux/bitops.h>
+#include <linux/string.h>
 #include "usb_ether.h"
 #include "r8152.h"
 
diff --git a/drivers/usb/eth/smsc95xx.c b/drivers/usb/eth/smsc95xx.c
index dacf607ed83..5d8e93c2337 100644
--- a/drivers/usb/eth/smsc95xx.c
+++ b/drivers/usb/eth/smsc95xx.c
@@ -18,6 +18,7 @@
 #include <asm/unaligned.h>
 #include <linux/delay.h>
 #include <linux/mii.h>
+#include <linux/string.h>
 #include "usb_ether.h"
 
 /* SMSC LAN95xx based USB 2.0 Ethernet Devices */
diff --git a/drivers/usb/eth/usb_ether.c b/drivers/usb/eth/usb_ether.c
index e368ecda0d7..91f34ab175d 100644
--- a/drivers/usb/eth/usb_ether.c
+++ b/drivers/usb/eth/usb_ether.c
@@ -12,6 +12,7 @@
 #include <usb.h>
 #include <asm/cache.h>
 #include <dm/device-internal.h>
+#include <linux/string.h>
 
 #include "usb_ether.h"
 
diff --git a/drivers/usb/gadget/at91_udc.c b/drivers/usb/gadget/at91_udc.c
index e198ef1d34d..8674f3c9f4f 100644
--- a/drivers/usb/gadget/at91_udc.c
+++ b/drivers/usb/gadget/at91_udc.c
@@ -22,6 +22,7 @@
 #include <asm/gpio.h>
 #include <asm/hardware.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include <mach/at91_matrix.h>
 #include <linux/list.h>
 #include <linux/usb/ch9.h>
diff --git a/drivers/usb/gadget/atmel_usba_udc.c b/drivers/usb/gadget/atmel_usba_udc.c
index ed3b3c14e60..23e107b8621 100644
--- a/drivers/usb/gadget/atmel_usba_udc.c
+++ b/drivers/usb/gadget/atmel_usba_udc.c
@@ -14,6 +14,7 @@
 #include <asm/hardware.h>
 #include <linux/list.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
 #include <linux/usb/atmel_usba_udc.h>
diff --git a/drivers/usb/gadget/ci_udc.c b/drivers/usb/gadget/ci_udc.c
index cdbdbcc5cac..98a88c102e9 100644
--- a/drivers/usb/gadget/ci_udc.c
+++ b/drivers/usb/gadget/ci_udc.c
@@ -19,6 +19,7 @@
 #include <linux/errno.h>
 #include <asm/io.h>
 #include <asm/unaligned.h>
+#include <linux/string.h>
 #include <linux/types.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
index 91ed7fcec5a..f353f1a3cd2 100644
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@ -11,6 +11,7 @@
 #include <dm/devres.h>
 #include <linux/bitops.h>
 #include <linux/bug.h>
+#include <linux/string.h>
 #include <linux/usb/composite.h>
 
 #define USB_BUFSIZ	4096
diff --git a/drivers/usb/gadget/designware_udc.c b/drivers/usb/gadget/designware_udc.c
index 7fc5d27d436..d4b94a7cfce 100644
--- a/drivers/usb/gadget/designware_udc.c
+++ b/drivers/usb/gadget/designware_udc.c
@@ -11,6 +11,7 @@
 #include <serial.h>
 #include <asm/io.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include <env.h>
 #include <usbdevice.h>
diff --git a/drivers/usb/gadget/dwc2_udc_otg.c b/drivers/usb/gadget/dwc2_udc_otg.c
index f548cbc9eb2..8a5edc776ef 100644
--- a/drivers/usb/gadget/dwc2_udc_otg.c
+++ b/drivers/usb/gadget/dwc2_udc_otg.c
@@ -29,6 +29,7 @@
 #include <linux/bug.h>
 #include <linux/delay.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #include <linux/errno.h>
 #include <linux/list.h>
diff --git a/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c b/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c
index 1c0505eb28c..80b7e519978 100644
--- a/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c
+++ b/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c
@@ -21,6 +21,7 @@
 #include <cpu_func.h>
 #include <log.h>
 #include <linux/bug.h>
+#include <linux/string.h>
 
 static u8 clear_feature_num;
 int clear_feature_flag;
diff --git a/drivers/usb/gadget/epautoconf.c b/drivers/usb/gadget/epautoconf.c
index e61fe5d1144..c7b0a965188 100644
--- a/drivers/usb/gadget/epautoconf.c
+++ b/drivers/usb/gadget/epautoconf.c
@@ -9,6 +9,7 @@
  */
 
 #include <common.h>
+#include <linux/string.h>
 #include <linux/usb/ch9.h>
 #include <linux/errno.h>
 #include <linux/usb/gadget.h>
diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c
index f3885a376b8..f12b07fd1ab 100644
--- a/drivers/usb/gadget/ether.c
+++ b/drivers/usb/gadget/ether.c
@@ -16,6 +16,7 @@
 #include <linux/errno.h>
 #include <linux/netdevice.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/cdc.h>
 #include <linux/usb/gadget.h>
diff --git a/drivers/usb/gadget/f_dfu.c b/drivers/usb/gadget/f_dfu.c
index 4bedc7d3a19..b7b1e0c1add 100644
--- a/drivers/usb/gadget/f_dfu.c
+++ b/drivers/usb/gadget/f_dfu.c
@@ -19,6 +19,7 @@
 #include <common.h>
 #include <log.h>
 #include <malloc.h>
+#include <linux/string.h>
 
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
diff --git a/drivers/usb/gadget/f_fastboot.c b/drivers/usb/gadget/f_fastboot.c
index fce933dba5f..e14262676f3 100644
--- a/drivers/usb/gadget/f_fastboot.c
+++ b/drivers/usb/gadget/f_fastboot.c
@@ -18,6 +18,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
 #include <linux/usb/composite.h>
diff --git a/drivers/usb/gadget/f_mass_storage.c b/drivers/usb/gadget/f_mass_storage.c
index 439a31c2556..d87701b4a35 100644
--- a/drivers/usb/gadget/f_mass_storage.c
+++ b/drivers/usb/gadget/f_mass_storage.c
@@ -248,6 +248,7 @@
 #include <g_dnl.h>
 #include <dm/devres.h>
 #include <linux/bug.h>
+#include <linux/string.h>
 
 #include <linux/err.h>
 #include <linux/usb/ch9.h>
diff --git a/drivers/usb/gadget/f_rockusb.c b/drivers/usb/gadget/f_rockusb.c
index 9ae02ae78c1..2ff3c692edc 100644
--- a/drivers/usb/gadget/f_rockusb.c
+++ b/drivers/usb/gadget/f_rockusb.c
@@ -13,6 +13,7 @@
 #include <malloc.h>
 #include <memalign.h>
 #include <part.h>
+#include <linux/string.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
 #include <linux/usb/composite.h>
diff --git a/drivers/usb/gadget/f_sdp.c b/drivers/usb/gadget/f_sdp.c
index 4169763c094..120aed4d95e 100644
--- a/drivers/usb/gadget/f_sdp.c
+++ b/drivers/usb/gadget/f_sdp.c
@@ -23,6 +23,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
diff --git a/drivers/usb/gadget/f_thor.c b/drivers/usb/gadget/f_thor.c
index 3c47e6251b1..4758ccb7c46 100644
--- a/drivers/usb/gadget/f_thor.c
+++ b/drivers/usb/gadget/f_thor.c
@@ -25,6 +25,7 @@
 #include <version.h>
 #include <linux/delay.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
 #include <linux/usb/composite.h>
diff --git a/drivers/usb/gadget/fotg210.c b/drivers/usb/gadget/fotg210.c
index c6eb22bdfd3..1c145eb428e 100644
--- a/drivers/usb/gadget/fotg210.c
+++ b/drivers/usb/gadget/fotg210.c
@@ -17,6 +17,7 @@
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/string.h>
 #include <linux/types.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
diff --git a/drivers/usb/gadget/g_dnl.c b/drivers/usb/gadget/g_dnl.c
index 86fdd16b012..c6ecbb30192 100644
--- a/drivers/usb/gadget/g_dnl.c
+++ b/drivers/usb/gadget/g_dnl.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <log.h>
 #include <malloc.h>
+#include <linux/string.h>
 
 #include <mmc.h>
 #include <part.h>
diff --git a/drivers/usb/gadget/gadget_chips.h b/drivers/usb/gadget/gadget_chips.h
index 91b0285244e..70067afa7d4 100644
--- a/drivers/usb/gadget/gadget_chips.h
+++ b/drivers/usb/gadget/gadget_chips.h
@@ -14,6 +14,8 @@
  * Ported to U-Boot by: Thomas Smits <ts.smits@gmail.com> and
  *                      Remy Bohmer <linux@bohmer.net>
  */
+#include <linux/string.h>
+
 #ifdef CONFIG_USB_GADGET_NET2280
 #define	gadget_is_net2280(g)	(!strcmp("net2280", (g)->name))
 #else
diff --git a/drivers/usb/gadget/pxa25x_udc.c b/drivers/usb/gadget/pxa25x_udc.c
index 2d9f2e4e33d..4f4d2982f88 100644
--- a/drivers/usb/gadget/pxa25x_udc.c
+++ b/drivers/usb/gadget/pxa25x_udc.c
@@ -31,6 +31,7 @@
 #include <asm/io.h>
 #include <asm/arch/pxa.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
diff --git a/drivers/usb/gadget/rndis.c b/drivers/usb/gadget/rndis.c
index 13c327ea38a..92c01adb75d 100644
--- a/drivers/usb/gadget/rndis.c
+++ b/drivers/usb/gadget/rndis.c
@@ -22,6 +22,7 @@
 #include <log.h>
 #include <net.h>
 #include <malloc.h>
+#include <linux/string.h>
 #include <linux/types.h>
 #include <linux/list.h>
 #include <linux/netdevice.h>
diff --git a/drivers/usb/gadget/usbstring.c b/drivers/usb/gadget/usbstring.c
index 83cdd8a2595..2870052fec3 100644
--- a/drivers/usb/gadget/usbstring.c
+++ b/drivers/usb/gadget/usbstring.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <linux/errno.h>
+#include <linux/string.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
 
diff --git a/drivers/usb/host/dwc2.c b/drivers/usb/host/dwc2.c
index ec0b799e149..7f04ea81bfc 100644
--- a/drivers/usb/host/dwc2.c
+++ b/drivers/usb/host/dwc2.c
@@ -22,6 +22,7 @@
 #include <asm/io.h>
 #include <dm/device_compat.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include <power/regulator.h>
 #include <reset.h>
 
diff --git a/drivers/usb/host/ehci-fsl.c b/drivers/usb/host/ehci-fsl.c
index eed67e77dc6..8c5403fbdb3 100644
--- a/drivers/usb/host/ehci-fsl.c
+++ b/drivers/usb/host/ehci-fsl.c
@@ -15,6 +15,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include <usb/ehci-ci.h>
 #include <hwconfig.h>
 #include <fsl_usb.h>
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index 26400cac08c..60e5f4e41bc 100644
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -23,6 +23,7 @@
 #include <dm/device_compat.h>
 #include <linux/compiler.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include "ehci.h"
 
diff --git a/drivers/usb/host/ehci-mx5.c b/drivers/usb/host/ehci-mx5.c
index 516d6495359..ca6cb6b645b 100644
--- a/drivers/usb/host/ehci-mx5.c
+++ b/drivers/usb/host/ehci-mx5.c
@@ -11,6 +11,7 @@
 #include <asm/global_data.h>
 #include <linux/compiler.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include <usb/ehci-ci.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c
index 90a02406836..5aa9eb445af 100644
--- a/drivers/usb/host/ehci-omap.c
+++ b/drivers/usb/host/ehci-omap.c
@@ -15,6 +15,7 @@
 #include <time.h>
 #include <usb.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include <usb/ulpi.h>
 #include <errno.h>
 #include <asm/io.h>
diff --git a/drivers/usb/host/ehci-tegra.c b/drivers/usb/host/ehci-tegra.c
index d81f4a03f14..3b9373f2cd6 100644
--- a/drivers/usb/host/ehci-tegra.c
+++ b/drivers/usb/host/ehci-tegra.c
@@ -16,6 +16,7 @@
 #include <asm/arch-tegra/usb.h>
 #include <asm/arch-tegra/clk_rst.h>
 #include <usb.h>
+#include <linux/string.h>
 #include <usb/ulpi.h>
 #include <linux/libfdt.h>
 
diff --git a/drivers/usb/host/ehci-vf.c b/drivers/usb/host/ehci-vf.c
index 86eac41ea66..39d5b1dd9be 100644
--- a/drivers/usb/host/ehci-vf.c
+++ b/drivers/usb/host/ehci-vf.c
@@ -21,6 +21,7 @@
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/mach-imx/regs-usbphy.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include <usb/ehci-ci.h>
 #include <linux/libfdt.h>
 #include <fdtdec.h>
diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c
index c62d8feecce..89592f0a114 100644
--- a/drivers/usb/host/ohci-hcd.c
+++ b/drivers/usb/host/ohci-hcd.c
@@ -34,6 +34,7 @@
 #include <errno.h>
 #include <asm/cache.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #if defined(CONFIG_PCI_OHCI)
 # include <pci.h>
diff --git a/drivers/usb/host/r8a66597-hcd.c b/drivers/usb/host/r8a66597-hcd.c
index 37aa2c55f24..339e260ea33 100644
--- a/drivers/usb/host/r8a66597-hcd.c
+++ b/drivers/usb/host/r8a66597-hcd.c
@@ -14,6 +14,7 @@
 #include <dm/device_compat.h>
 #include <linux/delay.h>
 #include <linux/iopoll.h>
+#include <linux/string.h>
 #include <power/regulator.h>
 
 #include "r8a66597.h"
diff --git a/drivers/usb/host/r8a66597.h b/drivers/usb/host/r8a66597.h
index 625d4938cce..b42389b9188 100644
--- a/drivers/usb/host/r8a66597.h
+++ b/drivers/usb/host/r8a66597.h
@@ -9,6 +9,7 @@
 #define __R8A66597_H__
 
 #include <linux/bitops.h>
+#include <linux/string.h>
 #define SYSCFG0		0x00
 #define SYSCFG1		0x02
 #define SYSSTS0		0x04
diff --git a/drivers/usb/host/sl811-hcd.c b/drivers/usb/host/sl811-hcd.c
index 39d5988b36a..b33d7dc9ac4 100644
--- a/drivers/usb/host/sl811-hcd.c
+++ b/drivers/usb/host/sl811-hcd.c
@@ -23,6 +23,7 @@
 #include <time.h>
 #include <usb.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include "sl811.h"
 
 #include "../../../board/kup/common/kup.h"
diff --git a/drivers/usb/host/usb-uclass.c b/drivers/usb/host/usb-uclass.c
index f42c0625cbf..ae425b9bfd9 100644
--- a/drivers/usb/host/usb-uclass.c
+++ b/drivers/usb/host/usb-uclass.c
@@ -15,6 +15,7 @@
 #include <dm/device-internal.h>
 #include <dm/lists.h>
 #include <dm/uclass-internal.h>
+#include <linux/string.h>
 
 extern bool usb_started; /* flag for the started/stopped USB status */
 static bool asynch_allowed;
diff --git a/drivers/usb/host/xhci-dwc3.c b/drivers/usb/host/xhci-dwc3.c
index 27f84102db3..44cb31c9c5f 100644
--- a/drivers/usb/host/xhci-dwc3.c
+++ b/drivers/usb/host/xhci-dwc3.c
@@ -14,6 +14,7 @@
 #include <usb.h>
 #include <dwc3-uboot.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include <usb/xhci.h>
 #include <asm/io.h>
diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c
index 108f4bd8cfd..e9b90a827fe 100644
--- a/drivers/usb/host/xhci-mem.c
+++ b/drivers/usb/host/xhci-mem.c
@@ -23,6 +23,7 @@
 #include <asm/cache.h>
 #include <linux/bug.h>
 #include <linux/errno.h>
+#include <linux/string.h>
 
 #include <usb/xhci.h>
 
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index f635bb39f6a..0dae35f8f9a 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -33,6 +33,7 @@
 #include <linux/bug.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/string.h>
 #include <usb/xhci.h>
 
 #ifndef CONFIG_USB_MAX_CONTROLLER_COUNT
diff --git a/drivers/usb/musb-new/am35x.c b/drivers/usb/musb-new/am35x.c
index ea0a944a87b..410cf042f66 100644
--- a/drivers/usb/musb-new/am35x.c
+++ b/drivers/usb/musb-new/am35x.c
@@ -29,6 +29,7 @@
 #include <asm/omap_musb.h>
 #include <linux/bug.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include "linux-compat.h"
 #endif
 
diff --git a/drivers/usb/musb-new/mt85xx.c b/drivers/usb/musb-new/mt85xx.c
index 110b5b610f6..f826b986ba7 100644
--- a/drivers/usb/musb-new/mt85xx.c
+++ b/drivers/usb/musb-new/mt85xx.c
@@ -16,6 +16,7 @@
 #include <dm/root.h>
 #include <linux/delay.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include <linux/usb/musb.h>
 #include <usb.h>
 #include "linux-compat.h"
diff --git a/drivers/usb/musb-new/musb_core.c b/drivers/usb/musb-new/musb_core.c
index f29131c69bb..a696c5a5b47 100644
--- a/drivers/usb/musb-new/musb_core.c
+++ b/drivers/usb/musb-new/musb_core.c
@@ -85,6 +85,7 @@
 #include <linux/bug.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
 #include <linux/usb/musb.h>
diff --git a/drivers/usb/musb-new/musb_gadget.c b/drivers/usb/musb-new/musb_gadget.c
index fb3b3e45ef0..c6e346d5d80 100644
--- a/drivers/usb/musb-new/musb_gadget.c
+++ b/drivers/usb/musb-new/musb_gadget.c
@@ -25,6 +25,7 @@
 #include <common.h>
 #include <linux/bug.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include <linux/usb/ch9.h>
 #include "linux-compat.h"
 #endif
diff --git a/drivers/usb/musb-new/musb_uboot.c b/drivers/usb/musb-new/musb_uboot.c
index 6ec8f429951..0948fd598f9 100644
--- a/drivers/usb/musb-new/musb_uboot.c
+++ b/drivers/usb/musb-new/musb_uboot.c
@@ -6,6 +6,7 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/string.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
 
diff --git a/drivers/usb/musb-new/pic32.c b/drivers/usb/musb-new/pic32.c
index 9d1aa971c27..cc3a16b628c 100644
--- a/drivers/usb/musb-new/pic32.c
+++ b/drivers/usb/musb-new/pic32.c
@@ -14,6 +14,7 @@
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include <linux/usb/musb.h>
 #include "linux-compat.h"
 #include "musb_core.h"
diff --git a/drivers/usb/musb-new/sunxi.c b/drivers/usb/musb-new/sunxi.c
index 9ae8a0e6b7a..082df93fdd8 100644
--- a/drivers/usb/musb-new/sunxi.c
+++ b/drivers/usb/musb-new/sunxi.c
@@ -33,6 +33,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include <linux/usb/musb.h>
 #include "linux-compat.h"
 #include "musb_core.h"
diff --git a/drivers/usb/musb-new/ti-musb.c b/drivers/usb/musb-new/ti-musb.c
index d447baf13bb..4867c2e792e 100644
--- a/drivers/usb/musb-new/ti-musb.c
+++ b/drivers/usb/musb-new/ti-musb.c
@@ -13,6 +13,7 @@
 #include <malloc.h>
 #include <asm/global_data.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include <linux/usb/otg.h>
 #include <dm/device-internal.h>
 #include <dm/lists.h>
diff --git a/drivers/usb/musb/am35x.c b/drivers/usb/musb/am35x.c
index f945f1f5e2c..e749ae97180 100644
--- a/drivers/usb/musb/am35x.c
+++ b/drivers/usb/musb/am35x.c
@@ -11,6 +11,7 @@
 
 #include <common.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include "am35x.h"
 
diff --git a/drivers/usb/musb/musb_hcd.c b/drivers/usb/musb/musb_hcd.c
index afbc648883b..99514419e5f 100644
--- a/drivers/usb/musb/musb_hcd.c
+++ b/drivers/usb/musb/musb_hcd.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <usb.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include "musb_hcd.h"
 
 /* MSC control transfers */
diff --git a/drivers/video/am335x-fb.c b/drivers/video/am335x-fb.c
index 4354c3efac1..b381b147cdd 100644
--- a/drivers/video/am335x-fb.c
+++ b/drivers/video/am335x-fb.c
@@ -26,6 +26,7 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include "am335x-fb.h"
 
 #define LCDC_FMAX				200000000
diff --git a/drivers/video/ati_radeon_fb.c b/drivers/video/ati_radeon_fb.c
index c4da2e3ae7f..c326722c550 100644
--- a/drivers/video/ati_radeon_fb.c
+++ b/drivers/video/ati_radeon_fb.c
@@ -17,6 +17,7 @@
 
 #include <common.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include <command.h>
 #include <bios_emul.h>
diff --git a/drivers/video/bridge/anx6345.c b/drivers/video/bridge/anx6345.c
index 1c5270ff05c..5d76cedbcea 100644
--- a/drivers/video/bridge/anx6345.c
+++ b/drivers/video/bridge/anx6345.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <video_bridge.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include "../anx98xx-edp.h"
 
 #define DP_MAX_LINK_RATE		0x001
diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c
index 3a51ad4a9d4..f9e3c1ac43e 100644
--- a/drivers/video/cfb_console.c
+++ b/drivers/video/cfb_console.c
@@ -76,6 +76,7 @@
 #include <video.h>
 #include <asm/global_data.h>
 #include <linux/compiler.h>
+#include <linux/string.h>
 
 #if defined(CONFIG_VIDEO_MXS)
 #define VIDEO_FB_16BPP_WORD_SWAP
diff --git a/drivers/video/console_truetype.c b/drivers/video/console_truetype.c
index 22b2ea7191e..26093408453 100644
--- a/drivers/video/console_truetype.c
+++ b/drivers/video/console_truetype.c
@@ -9,6 +9,7 @@
 #include <malloc.h>
 #include <video.h>
 #include <video_console.h>
+#include <linux/string.h>
 
 /* Functions needed by stb_truetype.h */
 static int tt_floor(double val)
diff --git a/drivers/video/da8xx-fb.c b/drivers/video/da8xx-fb.c
index 462c318126d..994b90a9665 100644
--- a/drivers/video/da8xx-fb.c
+++ b/drivers/video/da8xx-fb.c
@@ -21,6 +21,7 @@
 #include <linux/delay.h>
 #include <linux/list.h>
 #include <linux/fb.h>
+#include <linux/string.h>
 
 #include <linux/errno.h>
 #include <asm/io.h>
diff --git a/drivers/video/dw_hdmi.c b/drivers/video/dw_hdmi.c
index 16db3d38a2c..b2868413144 100644
--- a/drivers/video/dw_hdmi.c
+++ b/drivers/video/dw_hdmi.c
@@ -13,6 +13,7 @@
 #include <i2c.h>
 #include <media_bus_format.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include "dw_hdmi.h"
 
 struct tmds_n_cts {
diff --git a/drivers/video/dw_mipi_dsi.c b/drivers/video/dw_mipi_dsi.c
index b7bfbb5e501..547dfc4b81c 100644
--- a/drivers/video/dw_mipi_dsi.c
+++ b/drivers/video/dw_mipi_dsi.c
@@ -24,6 +24,7 @@
 #include <linux/delay.h>
 #include <linux/iopoll.h>
 #include <video_bridge.h>
+#include <linux/string.h>
 
 #define HWVER_131			0x31333100	/* IP version 1.31 */
 
diff --git a/drivers/video/exynos/exynos_dp.c b/drivers/video/exynos/exynos_dp.c
index 36595556f13..71dae58f08b 100644
--- a/drivers/video/exynos/exynos_dp.c
+++ b/drivers/video/exynos/exynos_dp.c
@@ -24,6 +24,7 @@
 #include <asm/arch/dp.h>
 #include <asm/arch/pinmux.h>
 #include <asm/arch/power.h>
+#include <linux/string.h>
 
 #include "exynos_dp_lowlevel.h"
 
diff --git a/drivers/video/exynos/exynos_mipi_dsi.c b/drivers/video/exynos/exynos_mipi_dsi.c
index c56eadc8237..376e6abf2cf 100644
--- a/drivers/video/exynos/exynos_mipi_dsi.c
+++ b/drivers/video/exynos/exynos_mipi_dsi.c
@@ -20,6 +20,7 @@
 #include <asm/arch/power.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/clk.h>
+#include <linux/string.h>
 
 #include "exynos_mipi_dsi_lowlevel.h"
 #include "exynos_mipi_dsi_common.h"
diff --git a/drivers/video/fsl_dcu_fb.c b/drivers/video/fsl_dcu_fb.c
index 60b97e40633..bfa4ed3129b 100644
--- a/drivers/video/fsl_dcu_fb.c
+++ b/drivers/video/fsl_dcu_fb.c
@@ -18,6 +18,7 @@
 #include <malloc.h>
 #include <video.h>
 #include <video_fb.h>
+#include <linux/string.h>
 #include "videomodes.h"
 
 /* Convert the X,Y resolution pair into a single number */
diff --git a/drivers/video/fsl_diu_fb.c b/drivers/video/fsl_diu_fb.c
index 2c21e293a2c..e90e23779d7 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 <asm/io.h>
+#include <linux/string.h>
 
 #include "videomodes.h"
 #include <video_fb.h>
diff --git a/drivers/video/ihs_video_out.c b/drivers/video/ihs_video_out.c
index f02fd13d28c..2124b826d28 100644
--- a/drivers/video/ihs_video_out.c
+++ b/drivers/video/ihs_video_out.c
@@ -16,6 +16,7 @@
 #include <regmap.h>
 #include <video_osd.h>
 #include <asm/gpio.h>
+#include <linux/string.h>
 
 static const uint MAX_X_CHARS = 53;
 static const uint MAX_Y_CHARS = 26;
diff --git a/drivers/video/imx/ipu_common.c b/drivers/video/imx/ipu_common.c
index 5908b23acc9..da7e5c85183 100644
--- a/drivers/video/imx/ipu_common.c
+++ b/drivers/video/imx/ipu_common.c
@@ -14,6 +14,7 @@
 #include <common.h>
 #include <log.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include <linux/types.h>
 #include <linux/err.h>
 #include <asm/io.h>
diff --git a/drivers/video/lg4573.c b/drivers/video/lg4573.c
index 45df9c13474..3e61f7f53ce 100644
--- a/drivers/video/lg4573.c
+++ b/drivers/video/lg4573.c
@@ -16,6 +16,7 @@
 #include <spi.h>
 #include <asm/gpio.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #define PWR_ON_DELAY_MSECS  120
 
diff --git a/drivers/video/logicore_dp_tx.c b/drivers/video/logicore_dp_tx.c
index 9bc4bbb85d3..e752f457560 100644
--- a/drivers/video/logicore_dp_tx.c
+++ b/drivers/video/logicore_dp_tx.c
@@ -15,6 +15,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include "axi.h"
 #include "logicore_dp_dpcd.h"
diff --git a/drivers/video/mali_dp.c b/drivers/video/mali_dp.c
index 7f9443828b2..e487d6742a1 100644
--- a/drivers/video/mali_dp.c
+++ b/drivers/video/mali_dp.c
@@ -21,6 +21,7 @@
 #include <dm/device_compat.h>
 #include <linux/delay.h>
 #include <linux/sizes.h>
+#include <linux/string.h>
 
 #define MALIDP_CORE_ID		0x0018
 #define MALIDP_REG_BG_COLOR	0x0044
diff --git a/drivers/video/meson/meson_venc.c b/drivers/video/meson/meson_venc.c
index e7366dd2fde..ce64865d591 100644
--- a/drivers/video/meson/meson_venc.c
+++ b/drivers/video/meson/meson_venc.c
@@ -12,6 +12,7 @@
 #include <fdtdec.h>
 #include <log.h>
 #include <asm/io.h>
+#include <linux/string.h>
 #include "meson_vpu.h"
 
 enum {
diff --git a/drivers/video/mipi_dsi.c b/drivers/video/mipi_dsi.c
index ecacea1dbeb..5caa6a6fef6 100644
--- a/drivers/video/mipi_dsi.c
+++ b/drivers/video/mipi_dsi.c
@@ -39,6 +39,7 @@
 #include <mipi_display.h>
 #include <mipi_dsi.h>
 #include <dm/devres.h>
+#include <linux/string.h>
 
 /**
  * DOC: dsi helpers
diff --git a/drivers/video/mx3fb.c b/drivers/video/mx3fb.c
index 9b42ca8d03f..05b65429187 100644
--- a/drivers/video/mx3fb.c
+++ b/drivers/video/mx3fb.c
@@ -11,6 +11,7 @@
 #include <malloc.h>
 #include <video_fb.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/clock.h>
diff --git a/drivers/video/mxsfb.c b/drivers/video/mxsfb.c
index d84adb004bc..4bb817669f7 100644
--- a/drivers/video/mxsfb.c
+++ b/drivers/video/mxsfb.c
@@ -17,6 +17,7 @@
 #include <malloc.h>
 #include <video.h>
 #include <video_fb.h>
+#include <linux/string.h>
 
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
diff --git a/drivers/video/orisetech_otm8009a.c b/drivers/video/orisetech_otm8009a.c
index 362bf6a6fe4..acb8f384a88 100644
--- a/drivers/video/orisetech_otm8009a.c
+++ b/drivers/video/orisetech_otm8009a.c
@@ -15,6 +15,7 @@
 #include <asm/gpio.h>
 #include <dm/device_compat.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include <power/regulator.h>
 
 #define OTM8009A_BACKLIGHT_DEFAULT	240
diff --git a/drivers/video/raydium-rm68200.c b/drivers/video/raydium-rm68200.c
index 353894503b9..1efd1607f63 100644
--- a/drivers/video/raydium-rm68200.c
+++ b/drivers/video/raydium-rm68200.c
@@ -15,6 +15,7 @@
 #include <asm/gpio.h>
 #include <dm/device_compat.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include <power/regulator.h>
 
 /*** Manufacturer Command Set ***/
diff --git a/drivers/video/rockchip/rk_edp.c b/drivers/video/rockchip/rk_edp.c
index 36d17deea58..b5fa492e253 100644
--- a/drivers/video/rockchip/rk_edp.c
+++ b/drivers/video/rockchip/rk_edp.c
@@ -23,6 +23,7 @@
 #include <asm/arch-rockchip/hardware.h>
 #include <dt-bindings/clock/rk3288-cru.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #define MAX_CR_LOOP 5
 #define MAX_EQ_LOOP 5
diff --git a/drivers/video/sandbox_osd.c b/drivers/video/sandbox_osd.c
index 7e722326b3d..9fb1224bf59 100644
--- a/drivers/video/sandbox_osd.c
+++ b/drivers/video/sandbox_osd.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <malloc.h>
 #include <video_osd.h>
+#include <linux/string.h>
 
 #include "sandbox_osd.h"
 
diff --git a/drivers/video/simplefb.c b/drivers/video/simplefb.c
index e7c2e184ba5..a45e9aa9e0f 100644
--- a/drivers/video/simplefb.c
+++ b/drivers/video/simplefb.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <video.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 
 static int simple_video_probe(struct udevice *dev)
 {
diff --git a/drivers/video/stb_truetype.h b/drivers/video/stb_truetype.h
index 5d00bff9fd0..93518d200ff 100644
--- a/drivers/video/stb_truetype.h
+++ b/drivers/video/stb_truetype.h
@@ -232,6 +232,8 @@
 //
 //  Incomplete text-in-3d-api example, which draws quads properly aligned to be lossless
 //
+#include <linux/string.h>
+
 #if 0
 #define STB_TRUETYPE_IMPLEMENTATION  // force following include to generate implementation
 #include "stb_truetype.h"
diff --git a/drivers/video/sunxi/sunxi_de2.c b/drivers/video/sunxi/sunxi_de2.c
index b657e163f06..6e3999649d3 100644
--- a/drivers/video/sunxi/sunxi_de2.c
+++ b/drivers/video/sunxi/sunxi_de2.c
@@ -22,6 +22,7 @@
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
 #include <linux/bitops.h>
+#include <linux/string.h>
 #include "simplefb_common.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/video/sunxi/sunxi_display.c b/drivers/video/sunxi/sunxi_display.c
index f52aba4d21c..d1330314621 100644
--- a/drivers/video/sunxi/sunxi_display.c
+++ b/drivers/video/sunxi/sunxi_display.c
@@ -12,6 +12,7 @@
 #include <init.h>
 #include <time.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include <asm/arch/clock.h>
 #include <asm/arch/display.h>
diff --git a/drivers/video/sunxi/sunxi_lcd.c b/drivers/video/sunxi/sunxi_lcd.c
index 10f7e2ac234..c39438ff09a 100644
--- a/drivers/video/sunxi/sunxi_lcd.c
+++ b/drivers/video/sunxi/sunxi_lcd.c
@@ -18,6 +18,7 @@
 #include <asm/arch/lcdc.h>
 #include <asm/arch/gpio.h>
 #include <asm/gpio.h>
+#include <linux/string.h>
 
 struct sunxi_lcd_priv {
 	struct display_timing timing;
diff --git a/drivers/video/tegra124/dp.c b/drivers/video/tegra124/dp.c
index b09943897c1..5fcb03835d1 100644
--- a/drivers/video/tegra124/dp.c
+++ b/drivers/video/tegra124/dp.c
@@ -15,6 +15,7 @@
 #include <asm/io.h>
 #include <asm/arch-tegra/dc.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include "display.h"
 #include "edid.h"
 #include "sor.h"
diff --git a/drivers/video/vidconsole-uclass.c b/drivers/video/vidconsole-uclass.c
index 3a07f36ce27..6912177993d 100644
--- a/drivers/video/vidconsole-uclass.c
+++ b/drivers/video/vidconsole-uclass.c
@@ -16,6 +16,7 @@
 #include <video_console.h>
 #include <video_font.h>		/* Bitmap font for code page 437 */
 #include <linux/ctype.h>
+#include <linux/string.h>
 
 /*
  * Structure to describe a console color
diff --git a/drivers/video/video-uclass.c b/drivers/video/video-uclass.c
index eb234cc9bf4..75a4ea17e36 100644
--- a/drivers/video/video-uclass.c
+++ b/drivers/video/video-uclass.c
@@ -22,6 +22,7 @@
 #ifdef CONFIG_SANDBOX
 #include <asm/sdl.h>
 #endif
+#include <linux/string.h>
 
 /*
  * Theory of operation:
diff --git a/drivers/video/videomodes.c b/drivers/video/videomodes.c
index ed7373eac84..8d3aff1a14c 100644
--- a/drivers/video/videomodes.c
+++ b/drivers/video/videomodes.c
@@ -62,6 +62,7 @@
 #include <errno.h>
 #include <fdtdec.h>
 #include <linux/ctype.h>
+#include <linux/string.h>
 
 #include "videomodes.h"
 
diff --git a/drivers/virtio/virtio-uclass.c b/drivers/virtio/virtio-uclass.c
index 2636cbedfe2..5264fc209c9 100644
--- a/drivers/virtio/virtio-uclass.c
+++ b/drivers/virtio/virtio-uclass.c
@@ -23,6 +23,7 @@
 #include <virtio.h>
 #include <dm/lists.h>
 #include <linux/bug.h>
+#include <linux/string.h>
 
 static const char *const virtio_drv_name[VIRTIO_ID_MAX_NUM] = {
 	[VIRTIO_ID_NET]		= VIRTIO_NET_DRV_NAME,
diff --git a/drivers/virtio/virtio_mmio.c b/drivers/virtio/virtio_mmio.c
index b951ea3257b..50f79dcb3b1 100644
--- a/drivers/virtio/virtio_mmio.c
+++ b/drivers/virtio/virtio_mmio.c
@@ -17,6 +17,7 @@
 #include <linux/compat.h>
 #include <linux/err.h>
 #include <linux/io.h>
+#include <linux/string.h>
 #include "virtio_mmio.h"
 
 static int virtio_mmio_get_config(struct udevice *udev, unsigned int offset,
diff --git a/drivers/virtio/virtio_net.c b/drivers/virtio/virtio_net.c
index 0dbbd780230..a16268f9d27 100644
--- a/drivers/virtio/virtio_net.c
+++ b/drivers/virtio/virtio_net.c
@@ -10,6 +10,7 @@
 #include <virtio_types.h>
 #include <virtio.h>
 #include <virtio_ring.h>
+#include <linux/string.h>
 #include "virtio_net.h"
 
 /* Amount of buffers to keep in the RX virtqueue */
diff --git a/drivers/virtio/virtio_pci_modern.c b/drivers/virtio/virtio_pci_modern.c
index 2e5bbade002..483525872dd 100644
--- a/drivers/virtio/virtio_pci_modern.c
+++ b/drivers/virtio/virtio_pci_modern.c
@@ -18,6 +18,7 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/io.h>
+#include <linux/string.h>
 #include "virtio_pci.h"
 
 #define VIRTIO_PCI_DRV_NAME	"virtio-pci.m"
diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c
index 7f1cbc59329..dfd0ce8db63 100644
--- a/drivers/virtio/virtio_ring.c
+++ b/drivers/virtio/virtio_ring.c
@@ -15,6 +15,7 @@
 #include <virtio_ring.h>
 #include <linux/bug.h>
 #include <linux/compat.h>
+#include <linux/string.h>
 
 int virtqueue_add(struct virtqueue *vq, struct virtio_sg *sgs[],
 		  unsigned int out_sgs, unsigned int in_sgs)
diff --git a/drivers/virtio/virtio_rng.c b/drivers/virtio/virtio_rng.c
index fc3e19cfaee..111f8de2855 100644
--- a/drivers/virtio/virtio_rng.c
+++ b/drivers/virtio/virtio_rng.c
@@ -10,6 +10,7 @@
 #include <virtio_types.h>
 #include <virtio.h>
 #include <virtio_ring.h>
+#include <linux/string.h>
 
 #define BUFFER_SIZE	16UL
 
diff --git a/drivers/w1-eeprom/ds2502.c b/drivers/w1-eeprom/ds2502.c
index 19ee4b17ea5..42a3560c237 100644
--- a/drivers/w1-eeprom/ds2502.c
+++ b/drivers/w1-eeprom/ds2502.c
@@ -26,6 +26,7 @@
 #include <linux/err.h>
 #include <w1-eeprom.h>
 #include <w1.h>
+#include <linux/string.h>
 
 #define DS2502_PAGE_SIZE	32
 #define DS2502_PAGE_COUNT	4
diff --git a/drivers/w1-eeprom/eep_sandbox.c b/drivers/w1-eeprom/eep_sandbox.c
index 27c7f9f1b6b..86c02b9b915 100644
--- a/drivers/w1-eeprom/eep_sandbox.c
+++ b/drivers/w1-eeprom/eep_sandbox.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <w1-eeprom.h>
 #include <w1.h>
+#include <linux/string.h>
 
 #define W1_F2D_READ_EEPROM      0xf0
 
diff --git a/drivers/watchdog/mpc8xx_wdt.c b/drivers/watchdog/mpc8xx_wdt.c
index c8b104d8f56..3cb50ab091f 100644
--- a/drivers/watchdog/mpc8xx_wdt.c
+++ b/drivers/watchdog/mpc8xx_wdt.c
@@ -10,6 +10,7 @@
 #include <mpc8xx.h>
 #include <asm/cpm_8xx.h>
 #include <asm/io.h>
+#include <linux/string.h>
 
 void hw_watchdog_reset(void)
 {
diff --git a/env/callback.c b/env/callback.c
index 638a02b28f7..3bcd5c111e8 100644
--- a/env/callback.c
+++ b/env/callback.c
@@ -8,6 +8,7 @@
 #include <env.h>
 #include <env_internal.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 
 #if defined(CONFIG_NEEDS_MANUAL_RELOC)
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/env/common.c b/env/common.c
index b6a1f45271c..1918bfa47ff 100644
--- a/env/common.c
+++ b/env/common.c
@@ -20,6 +20,7 @@
 #include <search.h>
 #include <errno.h>
 #include <malloc.h>
+#include <linux/string.h>
 #include <u-boot/crc.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/env/ext4.c b/env/ext4.c
index d4869a1a457..03f8e4e027b 100644
--- a/env/ext4.c
+++ b/env/ext4.c
@@ -20,6 +20,7 @@
 
 #include <common.h>
 #include <part.h>
+#include <linux/string.h>
 
 #include <command.h>
 #include <env.h>
diff --git a/env/fat.c b/env/fat.c
index 71bf8bfa18f..adc5e9259c2 100644
--- a/env/fat.c
+++ b/env/fat.c
@@ -19,6 +19,7 @@
 #include <mmc.h>
 #include <asm/cache.h>
 #include <linux/stddef.h>
+#include <linux/string.h>
 
 #ifdef CONFIG_SPL_BUILD
 /* TODO(sjg at chromium.org): Figure out why this is needed */
diff --git a/env/flash.c b/env/flash.c
index ebee9069e4e..6fb9ba7edef 100644
--- a/env/flash.c
+++ b/env/flash.c
@@ -20,6 +20,7 @@
 #include <malloc.h>
 #include <search.h>
 #include <errno.h>
+#include <linux/string.h>
 #include <u-boot/crc.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/env/mmc.c b/env/mmc.c
index 66a94631e38..af022843704 100644
--- a/env/mmc.c
+++ b/env/mmc.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 
 #include <command.h>
 #include <env.h>
diff --git a/env/nvram.c b/env/nvram.c
index f4126858b5b..7af5c4cf4b8 100644
--- a/env/nvram.c
+++ b/env/nvram.c
@@ -31,6 +31,7 @@
 #include <linux/stddef.h>
 #include <search.h>
 #include <errno.h>
+#include <linux/string.h>
 #include <u-boot/crc.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/env/ubi.c b/env/ubi.c
index eb21c4f38b4..f1e9d42dbf4 100644
--- a/env/ubi.c
+++ b/env/ubi.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 
 #include <command.h>
 #include <env.h>
diff --git a/examples/api/demo.c b/examples/api/demo.c
index d586174ce8c..789847c401e 100644
--- a/examples/api/demo.c
+++ b/examples/api/demo.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <env.h>
+#include <linux/string.h>
 #include <linux/types.h>
 #include <api_public.h>
 
diff --git a/examples/api/glue.c b/examples/api/glue.c
index 91d13157a1e..c90765e8d28 100644
--- a/examples/api/glue.c
+++ b/examples/api/glue.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <env.h>
+#include <linux/string.h>
 #include <linux/types.h>
 #include <api_public.h>
 #include <u-boot/crc.h>
diff --git a/examples/standalone/atmel_df_pow2.c b/examples/standalone/atmel_df_pow2.c
index 9c74f4994b9..271561d7d96 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 <linux/delay.h>
+#include <linux/string.h>
 
 #define CMD_ID    0x9f
 #define CMD_STAT  0xd7
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index 913a4d402e9..477a4ab8173 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -10,6 +10,7 @@
 #include <memalign.h>
 #include <part.h>
 #include <linux/compat.h>
+#include <linux/string.h>
 #include "btrfs.h"
 
 #define BTRFS_SUPER_FLAG_SUPP	(BTRFS_HEADER_FLAG_WRITTEN	\
diff --git a/fs/cbfs/cbfs.c b/fs/cbfs/cbfs.c
index 9007aa7d159..51a59030f60 100644
--- a/fs/cbfs/cbfs.c
+++ b/fs/cbfs/cbfs.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <asm/byteorder.h>
+#include <linux/string.h>
 
 /* Offset of master header from the start of a coreboot ROM */
 #define MASTER_HDR_OFFSET	0x38
diff --git a/fs/cramfs/cramfs.c b/fs/cramfs/cramfs.c
index 7ef48bbc064..975e29d00b1 100644
--- a/fs/cramfs/cramfs.c
+++ b/fs/cramfs/cramfs.c
@@ -32,6 +32,7 @@
 #include <jffs2/jffs2.h>
 #include <jffs2/load_kernel.h>
 #include <cramfs/cramfs_fs.h>
+#include <linux/string.h>
 
 /* These two macros may change in future, to provide better st_ino
    semantics. */
diff --git a/fs/ext4/ext4_common.c b/fs/ext4/ext4_common.c
index c52cc400e1f..8022d737634 100644
--- a/fs/ext4/ext4_common.c
+++ b/fs/ext4/ext4_common.c
@@ -28,6 +28,7 @@
 #include <part.h>
 #include <stddef.h>
 #include <linux/stat.h>
+#include <linux/string.h>
 #include <linux/time.h>
 #include <asm/byteorder.h>
 #include "ext4_common.h"
diff --git a/fs/ext4/ext4_common.h b/fs/ext4/ext4_common.h
index beaee9c80bd..1314cf20df8 100644
--- a/fs/ext4/ext4_common.h
+++ b/fs/ext4/ext4_common.h
@@ -29,6 +29,7 @@
 #include "ext4_journal.h"
 #include "crc16.h"
 #endif
+#include <linux/string.h>
 
 #define YES		1
 #define NO		0
diff --git a/fs/ext4/ext4_journal.c b/fs/ext4/ext4_journal.c
index 361baa35c92..82af0784bd8 100644
--- a/fs/ext4/ext4_journal.c
+++ b/fs/ext4/ext4_journal.c
@@ -20,6 +20,7 @@
 #include <malloc.h>
 #include <ext_common.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 #include "ext4_common.h"
 
 static struct revoke_blk_list *revk_blk_list;
diff --git a/fs/ext4/ext4_write.c b/fs/ext4/ext4_write.c
index f22af45d1b9..7c04c5d3dd6 100644
--- a/fs/ext4/ext4_write.c
+++ b/fs/ext4/ext4_write.c
@@ -29,6 +29,7 @@
 #include <part.h>
 #include <linux/stat.h>
 #include <div64.h>
+#include <linux/string.h>
 #include "ext4_common.h"
 
 static inline void ext4fs_sb_free_inodes_inc(struct ext2_sblock *sb)
diff --git a/fs/ext4/ext4fs.c b/fs/ext4/ext4fs.c
index 691d7e29b6d..44df0f4a4ad 100644
--- a/fs/ext4/ext4fs.c
+++ b/fs/ext4/ext4fs.c
@@ -28,6 +28,7 @@
 #include <malloc.h>
 #include <part.h>
 #include <uuid.h>
+#include <linux/string.h>
 #include "ext4_common.h"
 
 int ext4fs_symlinknest;
diff --git a/fs/fat/fat.c b/fs/fat/fat.c
index 9578b74bae7..e590fdd0f1e 100644
--- a/fs/fat/fat.c
+++ b/fs/fat/fat.c
@@ -22,6 +22,7 @@
 #include <asm/cache.h>
 #include <linux/compiler.h>
 #include <linux/ctype.h>
+#include <linux/string.h>
 
 /*
  * Convert a string to lowercase.  Converts at most 'len' characters,
diff --git a/fs/fat/fat_write.c b/fs/fat/fat_write.c
index a2682b5f465..9facf7609f2 100644
--- a/fs/fat/fat_write.c
+++ b/fs/fat/fat_write.c
@@ -17,6 +17,7 @@
 #include <linux/ctype.h>
 #include <div64.h>
 #include <linux/math64.h>
+#include <linux/string.h>
 #include "fat.c"
 
 static void uppercase(char *str, int len)
diff --git a/fs/fs.c b/fs/fs.c
index 15524c479c6..c6fdbdcc4b4 100644
--- a/fs/fs.c
+++ b/fs/fs.c
@@ -25,6 +25,7 @@
 #include <div64.h>
 #include <linux/math64.h>
 #include <efi_loader.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/fs/fs_internal.c b/fs/fs_internal.c
index 8b19811a639..55d6d26ba5f 100644
--- a/fs/fs_internal.c
+++ b/fs/fs_internal.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <part.h>
 #include <memalign.h>
+#include <linux/string.h>
 
 int fs_devread(struct blk_desc *blk, struct disk_partition *partition,
 	       lbaint_t sector, int byte_offset, int byte_len, char *buf)
diff --git a/fs/jffs2/compr_zlib.c b/fs/jffs2/compr_zlib.c
index d306b6dc4cf..12c5ed65e13 100644
--- a/fs/jffs2/compr_zlib.c
+++ b/fs/jffs2/compr_zlib.c
@@ -37,6 +37,7 @@
 
 #include <common.h>
 #include <config.h>
+#include <string.h>
 #include <jffs2/jffs2.h>
 #include <jffs2/mini_inflate.h>
 
diff --git a/fs/jffs2/jffs2_1pass.c b/fs/jffs2/jffs2_1pass.c
index a98745c50ea..c5b14297398 100644
--- a/fs/jffs2/jffs2_1pass.c
+++ b/fs/jffs2/jffs2_1pass.c
@@ -118,6 +118,7 @@
 #include <div64.h>
 #include <linux/compiler.h>
 #include <linux/stat.h>
+#include <linux/string.h>
 #include <linux/time.h>
 #include <u-boot/crc.h>
 #include <watchdog.h>
diff --git a/fs/jffs2/mini_inflate.c b/fs/jffs2/mini_inflate.c
index 3072eedd8c1..117e8f58b30 100644
--- a/fs/jffs2/mini_inflate.c
+++ b/fs/jffs2/mini_inflate.c
@@ -9,6 +9,7 @@
 
 #include <config.h>
 #include <jffs2/mini_inflate.h>
+#include <linux/string.h>
 
 /* The order that the code lengths in section 3.2.7 are in */
 static unsigned char huffman_order[] = {16, 17, 18,  0,  8,  7,  9,  6, 10,  5,
diff --git a/fs/reiserfs/reiserfs.c b/fs/reiserfs/reiserfs.c
index 635aab2eba7..cf053e12d94 100644
--- a/fs/reiserfs/reiserfs.c
+++ b/fs/reiserfs/reiserfs.c
@@ -18,6 +18,7 @@
 #include <common.h>
 #include <malloc.h>
 #include <linux/ctype.h>
+#include <linux/string.h>
 #include <linux/time.h>
 #include <asm/byteorder.h>
 #include <reiserfs.h>
diff --git a/fs/ubifs/debug.c b/fs/ubifs/debug.c
index 4f0f680131f..2bd0073cc59 100644
--- a/fs/ubifs/debug.c
+++ b/fs/ubifs/debug.c
@@ -20,6 +20,7 @@
 #include <time.h>
 #include <dm/devres.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #ifndef __UBOOT__
 #include <linux/module.h>
diff --git a/fs/ubifs/io.c b/fs/ubifs/io.c
index eb14b895447..57e0847464c 100644
--- a/fs/ubifs/io.c
+++ b/fs/ubifs/io.c
@@ -68,6 +68,7 @@
 #else
 #include <linux/compat.h>
 #include <linux/err.h>
+#include <linux/string.h>
 #endif
 #include "ubifs.h"
 
diff --git a/fs/ubifs/key.h b/fs/ubifs/key.h
index 70c2faf331b..f5b19525621 100644
--- a/fs/ubifs/key.h
+++ b/fs/ubifs/key.h
@@ -33,6 +33,7 @@
  * reserved for "." and "..". %2 is reserved for "end of readdir" marker. This
  * function makes sure the reserved values are not used.
  */
+#include <linux/string.h>
 static inline uint32_t key_mask_hash(uint32_t hash)
 {
 	hash &= UBIFS_S_KEY_HASH_MASK;
diff --git a/fs/ubifs/log.c b/fs/ubifs/log.c
index 77ff52575ea..0c8671a8847 100644
--- a/fs/ubifs/log.c
+++ b/fs/ubifs/log.c
@@ -19,6 +19,7 @@
 #include <log.h>
 #include <dm/devres.h>
 #include <linux/err.h>
+#include <linux/string.h>
 #endif
 #include "ubifs.h"
 
diff --git a/fs/ubifs/lprops.c b/fs/ubifs/lprops.c
index a9e22abe6b4..83e6b2d5df2 100644
--- a/fs/ubifs/lprops.c
+++ b/fs/ubifs/lprops.c
@@ -20,6 +20,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <linux/err.h>
+#include <linux/string.h>
 #endif
 #include "ubifs.h"
 
diff --git a/fs/ubifs/lpt_commit.c b/fs/ubifs/lpt_commit.c
index 3ca8d704aaf..583f113902e 100644
--- a/fs/ubifs/lpt_commit.c
+++ b/fs/ubifs/lpt_commit.c
@@ -24,6 +24,7 @@
 #include <linux/compat.h>
 #include <linux/err.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include "crc16.h"
 #endif
 #include "ubifs.h"
diff --git a/fs/ubifs/recovery.c b/fs/ubifs/recovery.c
index 6b6884fb209..cf2b8a48b8a 100644
--- a/fs/ubifs/recovery.c
+++ b/fs/ubifs/recovery.c
@@ -43,6 +43,7 @@
 #include <u-boot/crc.h>
 #else
 #include <linux/err.h>
+#include <linux/string.h>
 #endif
 #include "ubifs.h"
 
diff --git a/fs/ubifs/replay.c b/fs/ubifs/replay.c
index aa7f281ef6b..0862fe4ebf3 100644
--- a/fs/ubifs/replay.c
+++ b/fs/ubifs/replay.c
@@ -25,6 +25,7 @@
 #include <dm/devres.h>
 #include <linux/compat.h>
 #include <linux/err.h>
+#include <linux/string.h>
 #endif
 #include "ubifs.h"
 #include <linux/bug.h>
diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c
index 347f8365642..1ce46ef542d 100644
--- a/fs/ubifs/super.c
+++ b/fs/ubifs/super.c
@@ -38,6 +38,7 @@
 #include <linux/printk.h>
 #include <linux/stat.h>
 #include <linux/err.h>
+#include <linux/string.h>
 #include "ubifs.h"
 #include <ubi_uboot.h>
 #include <linux/stringify.h>
diff --git a/fs/ubifs/tnc.c b/fs/ubifs/tnc.c
index e8b8f168380..c8aef71d86a 100644
--- a/fs/ubifs/tnc.c
+++ b/fs/ubifs/tnc.c
@@ -30,6 +30,7 @@
 #include <linux/compat.h>
 #include <linux/err.h>
 #include <linux/stat.h>
+#include <linux/string.h>
 #endif
 #include "ubifs.h"
 
diff --git a/fs/ubifs/ubifs.c b/fs/ubifs/ubifs.c
index d6be5c947d7..76ea7a8031e 100644
--- a/fs/ubifs/ubifs.c
+++ b/fs/ubifs/ubifs.c
@@ -18,6 +18,7 @@
 #include <malloc.h>
 #include <memalign.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 #include "ubifs.h"
 #include <part.h>
 #include <dm/devres.h>
diff --git a/fs/yaffs2/yaffs_mtdif2.c b/fs/yaffs2/yaffs_mtdif2.c
index 81a4d964f3e..9cf4deee99e 100644
--- a/fs/yaffs2/yaffs_mtdif2.c
+++ b/fs/yaffs2/yaffs_mtdif2.c
@@ -17,6 +17,7 @@
 #include <common.h>
 #include <linux/bug.h>
 #include <linux/errno.h>
+#include <linux/string.h>
 
 #include "yportenv.h"
 #include "yaffs_trace.h"
diff --git a/fs/yaffs2/yaffs_uboot_glue.c b/fs/yaffs2/yaffs_uboot_glue.c
index 913eb323f38..3528a70dc05 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 <linux/printk.h>
+#include <linux/string.h>
 
 #include <config.h>
 #include "nand.h"
diff --git a/fs/yaffs2/yaffsfs.c b/fs/yaffs2/yaffsfs.c
index 510faaeed14..2643cc51057 100644
--- a/fs/yaffs2/yaffsfs.c
+++ b/fs/yaffs2/yaffsfs.c
@@ -12,6 +12,7 @@
  */
 
 #include <div64.h>
+#include <linux/string.h>
 #include "yaffsfs.h"
 #include "yaffs_guts.h"
 #include "yaffscfg.h"
diff --git a/fs/yaffs2/ydirectenv.h b/fs/yaffs2/ydirectenv.h
index d274f22e84d..a68c7637867 100644
--- a/fs/yaffs2/ydirectenv.h
+++ b/fs/yaffs2/ydirectenv.h
@@ -23,6 +23,7 @@
 #include <common.h>
 #include <malloc.h>
 #include <linux/compat.h>
+#include <linux/string.h>
 
 #include "yaffs_osglue.h"
 
diff --git a/fs/zfs/zfs.c b/fs/zfs/zfs.c
index 1fec96cd5ce..8958a256227 100644
--- a/fs/zfs/zfs.c
+++ b/fs/zfs/zfs.c
@@ -14,6 +14,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <linux/stat.h>
+#include <linux/string.h>
 #include <linux/time.h>
 #include <linux/ctype.h>
 #include <asm/byteorder.h>
diff --git a/include/common.h b/include/common.h
index a904f41c366..69fa1932483 100644
--- a/include/common.h
+++ b/include/common.h
@@ -16,7 +16,6 @@
 #include <config.h>
 #include <errno.h>
 #include <linux/types.h>
-#include <linux/string.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <linux/kernel.h>
diff --git a/include/dm/of.h b/include/dm/of.h
index 6bef73b441c..a64822f7e91 100644
--- a/include/dm/of.h
+++ b/include/dm/of.h
@@ -9,6 +9,7 @@
 
 #include <asm/u-boot.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 
 /* integer value within a device tree property which references another node */
 typedef u32 phandle;
diff --git a/include/exception.h b/include/exception.h
index a7f21e73d75..7f4638e4252 100644
--- a/include/exception.h
+++ b/include/exception.h
@@ -6,6 +6,7 @@
  */
 
 #include <command.h>
+#include <linux/string.h>
 
 static int do_exception(struct cmd_tbl *cmdtp, int flag, int argc,
 			char *const argv[])
diff --git a/include/exports.h b/include/exports.h
index 4b9aa5ff405..902f8b559b2 100644
--- a/include/exports.h
+++ b/include/exports.h
@@ -5,6 +5,7 @@
 #include <time.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #ifndef __ASSEMBLY__
 #ifdef CONFIG_PHY_AQUANTIA
diff --git a/include/fdt_support.h b/include/fdt_support.h
index 9684cffe80b..443bfe5e3a3 100644
--- a/include/fdt_support.h
+++ b/include/fdt_support.h
@@ -338,6 +338,7 @@ int fdt_overlay_apply_verbose(void *fdt, void *fdto);
  */
 int fdt_get_cells_len(const void *blob, char *nr_cells_name);
 
+#include <linux/string.h>
 #endif /* ifdef CONFIG_OF_LIBFDT */
 
 #ifdef USE_HOSTCC
diff --git a/include/imx8image.h b/include/imx8image.h
index 00c614ab6cc..72daa6ed5d3 100644
--- a/include/imx8image.h
+++ b/include/imx8image.h
@@ -10,6 +10,7 @@
 
 #include <image.h>
 #include <inttypes.h>
+#include <linux/string.h>
 #include "imagetool.h"
 
 #define __packed   __attribute__((packed))
diff --git a/include/malloc.h b/include/malloc.h
index f66c2e86176..36f8556f9fe 100644
--- a/include/malloc.h
+++ b/include/malloc.h
@@ -215,7 +215,6 @@
 
 */
 
-\f
 #ifndef __MALLOC_H__
 #define __MALLOC_H__
 
@@ -230,6 +229,7 @@
 #else
 #define __STD_C     0
 #endif /*__cplusplus*/
+#include <linux/string.h>
 #endif /*__STDC__*/
 #endif /*__STD_C*/
 
diff --git a/include/net.h b/include/net.h
index 1bf9867f8cf..26163f9f097 100644
--- a/include/net.h
+++ b/include/net.h
@@ -12,6 +12,7 @@
 #ifndef __NET_H__
 #define __NET_H__
 
+#include <linux/string.h>
 #include <linux/types.h>
 #include <asm/cache.h>
 #include <asm/byteorder.h>	/* for nton* / ntoh* stuff */
diff --git a/include/phy_interface.h b/include/phy_interface.h
index 882e4af8ffd..b19fd50cd7a 100644
--- a/include/phy_interface.h
+++ b/include/phy_interface.h
@@ -10,6 +10,7 @@
 #ifndef _PHY_INTERFACE_H
 #define _PHY_INTERFACE_H
 
+#include <linux/string.h>
 typedef enum {
 	PHY_INTERFACE_MODE_MII,
 	PHY_INTERFACE_MODE_GMII,
diff --git a/include/spi_flash.h b/include/spi_flash.h
index b3366194876..e5e9e3eb040 100644
--- a/include/spi_flash.h
+++ b/include/spi_flash.h
@@ -10,6 +10,7 @@
 #define _SPI_FLASH_H_
 
 #include <dm.h>	/* Because we dereference struct udevice here */
+#include <linux/string.h>
 #include <linux/types.h>
 #include <linux/mtd/spi-nor.h>
 
diff --git a/include/test/ut.h b/include/test/ut.h
index 99bbb1230c7..51a896e8e79 100644
--- a/include/test/ut.h
+++ b/include/test/ut.h
@@ -11,6 +11,7 @@
 #include <command.h>
 #include <hexdump.h>
 #include <linux/err.h>
+#include <linux/string.h>
 
 struct unit_test_state;
 
diff --git a/include/tlv_eeprom.h b/include/tlv_eeprom.h
index 9f4a109dca9..f7e130296a7 100644
--- a/include/tlv_eeprom.h
+++ b/include/tlv_eeprom.h
@@ -8,6 +8,7 @@
 #define __TLV_EEPROM_H_
 
 #include <compiler.h>
+#include <linux/string.h>
 
 /*
  *  The Definition of the TlvInfo EEPROM format can be found at onie.org or
diff --git a/include/video_console.h b/include/video_console.h
index 06b798ef10c..b033dc24b39 100644
--- a/include/video_console.h
+++ b/include/video_console.h
@@ -7,6 +7,7 @@
 #define __video_console_h
 
 #include <video.h>
+#include <linux/string.h>
 
 struct video_priv;
 
diff --git a/lib/acpi/acpi_device.c b/lib/acpi/acpi_device.c
index 3c75b6d9629..cefbb5f69c5 100644
--- a/lib/acpi/acpi_device.c
+++ b/lib/acpi/acpi_device.c
@@ -16,6 +16,7 @@
 #include <acpi/acpigen.h>
 #include <asm-generic/gpio.h>
 #include <dm/acpi.h>
+#include <linux/string.h>
 
 /**
  * acpi_device_path_fill() - Find the root device and build a path from there
diff --git a/lib/acpi/acpi_dp.c b/lib/acpi/acpi_dp.c
index 579cab47715..194e79d7d03 100644
--- a/lib/acpi/acpi_dp.c
+++ b/lib/acpi/acpi_dp.c
@@ -14,6 +14,7 @@
 #include <acpi/acpigen.h>
 #include <acpi/acpi_dp.h>
 #include <dm/acpi.h>
+#include <linux/string.h>
 
 static void acpi_dp_write_array(struct acpi_ctx *ctx,
 				const struct acpi_dp *array);
diff --git a/lib/acpi/acpi_table.c b/lib/acpi/acpi_table.c
index a3b0fb3bce0..d6abb6068a6 100644
--- a/lib/acpi/acpi_table.c
+++ b/lib/acpi/acpi_table.c
@@ -15,6 +15,7 @@
 #include <acpi/acpi_table.h>
 #include <asm/global_data.h>
 #include <dm/acpi.h>
+#include <linux/string.h>
 
 int acpi_create_dmar(struct acpi_dmar *dmar, enum dmar_flags flags)
 {
diff --git a/lib/acpi/acpigen.c b/lib/acpi/acpigen.c
index c609ef4daa4..0906b1d3030 100644
--- a/lib/acpi/acpigen.c
+++ b/lib/acpi/acpigen.c
@@ -16,6 +16,7 @@
 #include <acpi/acpi_device.h>
 #include <acpi/acpi_table.h>
 #include <dm/acpi.h>
+#include <linux/string.h>
 
 u8 *acpigen_get_current(struct acpi_ctx *ctx)
 {
diff --git a/lib/aes.c b/lib/aes.c
index bc6d4dfd4e0..ab1f8d67a53 100644
--- a/lib/aes.c
+++ b/lib/aes.c
@@ -25,6 +25,7 @@
 #include <common.h>
 #include <display_options.h>
 #include <log.h>
+#include <linux/string.h>
 #else
 #include <string.h>
 #endif
diff --git a/lib/aes/aes-decrypt.c b/lib/aes/aes-decrypt.c
index 345029fa784..06b5e027409 100644
--- a/lib/aes/aes-decrypt.c
+++ b/lib/aes/aes-decrypt.c
@@ -6,6 +6,7 @@
 #ifndef USE_HOSTCC
 #include <common.h>
 #include <malloc.h>
+#include <linux/string.h>
 #endif
 #include <image.h>
 #include <uboot_aes.h>
diff --git a/lib/bch.c b/lib/bch.c
index 72b4fdcc9c4..7f82cef242b 100644
--- a/lib/bch.c
+++ b/lib/bch.c
@@ -59,6 +59,7 @@
 #include <malloc.h>
 #include <ubi_uboot.h>
 #include <dm/devres.h>
+#include <linux/string.h>
 
 #include <linux/bitops.h>
 #include <linux/printk.h>
diff --git a/lib/bzip2/bzlib.c b/lib/bzip2/bzlib.c
index 377b269b06d..010ff4d7331 100644
--- a/lib/bzip2/bzlib.c
+++ b/lib/bzip2/bzlib.c
@@ -2,6 +2,7 @@
 #include <common.h>
 #include <malloc.h>
 #include <watchdog.h>
+#include <linux/string.h>
 
 /*
  * This file is a modified version of bzlib.c from the bzip2-1.0.2
diff --git a/lib/charset.c b/lib/charset.c
index a28034ee1f1..55a487253fa 100644
--- a/lib/charset.c
+++ b/lib/charset.c
@@ -9,6 +9,7 @@
 #include <charset.h>
 #include <capitalization.h>
 #include <malloc.h>
+#include <linux/string.h>
 
 static struct capitalization_table capitalization_table[] =
 #ifdef CONFIG_EFI_UNICODE_CAPITALIZATION
diff --git a/lib/crc16.c b/lib/crc16.c
index f46ba727c9a..aa6d117ae17 100644
--- a/lib/crc16.c
+++ b/lib/crc16.c
@@ -26,6 +26,7 @@
 #include <arpa/inet.h>
 #else
 #include <common.h>
+#include <linux/string.h>
 #endif
 #include <u-boot/crc.h>
 
diff --git a/lib/crc32.c b/lib/crc32.c
index e9be3bf386e..aa210cea055 100644
--- a/lib/crc32.c
+++ b/lib/crc32.c
@@ -14,6 +14,7 @@
 #else
 #include <common.h>
 #include <efi_loader.h>
+#include <linux/string.h>
 #endif
 #include <compiler.h>
 #include <u-boot/crc.h>
diff --git a/lib/crypto/pkcs7_verify.c b/lib/crypto/pkcs7_verify.c
index db02f346f76..5ca268ee00c 100644
--- a/lib/crypto/pkcs7_verify.c
+++ b/lib/crypto/pkcs7_verify.c
@@ -16,6 +16,7 @@
 #include <linux/compat.h>
 #include <linux/asn1.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include <u-boot/rsa-checksum.h>
 #include <crypto/public_key.h>
 #include <crypto/pkcs7_parser.h>
diff --git a/lib/crypto/public_key.c b/lib/crypto/public_key.c
index 899908e1bbe..ce5709449e7 100644
--- a/lib/crypto/public_key.c
+++ b/lib/crypto/public_key.c
@@ -14,6 +14,7 @@
 #include <linux/compat.h>
 #include <linux/err.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #else
 #include <linux/module.h>
 #include <linux/export.h>
diff --git a/lib/crypto/x509_public_key.c b/lib/crypto/x509_public_key.c
index 518dc906731..f79b4ea6b0f 100644
--- a/lib/crypto/x509_public_key.c
+++ b/lib/crypto/x509_public_key.c
@@ -14,6 +14,7 @@
 #include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #else
 #include <linux/module.h>
 #endif
diff --git a/lib/dhry/dhry_1.c b/lib/dhry/dhry_1.c
index dcc224fb387..b36c1672b4a 100644
--- a/lib/dhry/dhry_1.c
+++ b/lib/dhry/dhry_1.c
@@ -44,6 +44,7 @@ char SCCSid[] = "@(#) @(#)dhry_1.c:3.4 -- 5/15/91 19:30:21";
 
 #include <common.h>
 #include <malloc.h>
+#include <string.h>
 
 #include "dhry.h"
 
diff --git a/lib/dhry/dhry_2.c b/lib/dhry/dhry_2.c
index 1ba879673e3..02cd9827e89 100644
--- a/lib/dhry/dhry_2.c
+++ b/lib/dhry/dhry_2.c
@@ -40,6 +40,7 @@
 /* SCCSid is defined in dhry_1.c */
 
 #include <common.h>
+#include <string.h>
 #include "dhry.h"
 
 #ifndef REG
diff --git a/lib/efi/efi_app.c b/lib/efi/efi_app.c
index 907bacd716a..878c1cd6e5c 100644
--- a/lib/efi/efi_app.c
+++ b/lib/efi/efi_app.c
@@ -17,6 +17,7 @@
 #include <malloc.h>
 #include <asm/global_data.h>
 #include <linux/err.h>
+#include <linux/string.h>
 #include <linux/types.h>
 #include <efi.h>
 #include <efi_api.h>
diff --git a/lib/efi/efi_stub.c b/lib/efi/efi_stub.c
index 7d650d512e3..b19e6d21a79 100644
--- a/lib/efi/efi_stub.c
+++ b/lib/efi/efi_stub.c
@@ -19,6 +19,7 @@
 #include <asm/cpu.h>
 #include <asm/io.h>
 #include <linux/err.h>
+#include <linux/string.h>
 #include <linux/types.h>
 
 #ifndef CONFIG_X86
diff --git a/lib/efi_loader/efi_bootmgr.c b/lib/efi_loader/efi_bootmgr.c
index e03198b57a8..12706e88ab8 100644
--- a/lib/efi_loader/efi_bootmgr.c
+++ b/lib/efi_loader/efi_bootmgr.c
@@ -14,6 +14,7 @@
 #include <efi_loader.h>
 #include <efi_variable.h>
 #include <asm/unaligned.h>
+#include <linux/string.h>
 
 static const struct efi_boot_services *bs;
 static const struct efi_runtime_services *rs;
diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c
index d07e36caa3f..b39ca817dde 100644
--- a/lib/efi_loader/efi_boottime.c
+++ b/lib/efi_loader/efi_boottime.c
@@ -14,6 +14,7 @@
 #include <time.h>
 #include <asm/global_data.h>
 #include <linux/libfdt_env.h>
+#include <linux/string.h>
 #include <u-boot/crc.h>
 #include <bootm.h>
 #include <pe.h>
diff --git a/lib/efi_loader/efi_console.c b/lib/efi_loader/efi_console.c
index 426de779517..48c7940e5bf 100644
--- a/lib/efi_loader/efi_console.c
+++ b/lib/efi_loader/efi_console.c
@@ -14,6 +14,7 @@
 #include <env.h>
 #include <stdio_dev.h>
 #include <video_console.h>
+#include <linux/string.h>
 
 #define EFI_COUT_MODE_2 2
 #define EFI_MAX_COUT_MODE 3
diff --git a/lib/efi_loader/efi_device_path.c b/lib/efi_loader/efi_device_path.c
index 7ae14f34239..d3b1e273b9b 100644
--- a/lib/efi_loader/efi_device_path.c
+++ b/lib/efi_loader/efi_device_path.c
@@ -18,6 +18,7 @@
 #include <sandboxblockdev.h>
 #include <asm-generic/unaligned.h>
 #include <linux/compat.h> /* U16_MAX */
+#include <linux/string.h>
 
 #ifdef CONFIG_SANDBOX
 const efi_guid_t efi_guid_host_dev = U_BOOT_HOST_DEV_GUID;
diff --git a/lib/efi_loader/efi_device_path_to_text.c b/lib/efi_loader/efi_device_path_to_text.c
index 5ae4833fa78..ece99eb9424 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 <linux/string.h>
 
 #define MAC_OUTPUT_LEN 22
 #define UNKNOWN_OUTPUT_LEN 23
diff --git a/lib/efi_loader/efi_disk.c b/lib/efi_loader/efi_disk.c
index 7bd1ccec450..6a66b5cf292 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 <linux/string.h>
 
 struct efi_system_partition efi_system_partition;
 
diff --git a/lib/efi_loader/efi_file.c b/lib/efi_loader/efi_file.c
index 44fafae0586..5954397e4da 100644
--- a/lib/efi_loader/efi_file.c
+++ b/lib/efi_loader/efi_file.c
@@ -13,6 +13,7 @@
 #include <mapmem.h>
 #include <fs.h>
 #include <part.h>
+#include <linux/string.h>
 
 /* GUID for file system information */
 const efi_guid_t efi_file_system_info_guid = EFI_FILE_SYSTEM_INFO_GUID;
diff --git a/lib/efi_loader/efi_freestanding.c b/lib/efi_loader/efi_freestanding.c
index bd0dff162f6..87c1633804c 100644
--- a/lib/efi_loader/efi_freestanding.c
+++ b/lib/efi_loader/efi_freestanding.c
@@ -9,6 +9,7 @@
  */
 
 #include <common.h>
+#include <linux/string.h>
 
 /**
  * memcmp() - compare memory areas
diff --git a/lib/efi_loader/efi_gop.c b/lib/efi_loader/efi_gop.c
index 1206b2d7a2c..c26493af6ca 100644
--- a/lib/efi_loader/efi_gop.c
+++ b/lib/efi_loader/efi_gop.c
@@ -13,6 +13,7 @@
 #include <malloc.h>
 #include <video.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/lib/efi_loader/efi_hii.c b/lib/efi_loader/efi_hii.c
index 77e330285a7..92ae7e44e0a 100644
--- a/lib/efi_loader/efi_hii.c
+++ b/lib/efi_loader/efi_hii.c
@@ -10,6 +10,7 @@
 #include <efi_loader.h>
 #include <malloc.h>
 #include <asm/unaligned.h>
+#include <linux/string.h>
 
 const efi_guid_t efi_guid_hii_database_protocol
 		= EFI_HII_DATABASE_PROTOCOL_GUID;
diff --git a/lib/efi_loader/efi_image_loader.c b/lib/efi_loader/efi_image_loader.c
index fef0bb870c6..d4c7d3f770e 100644
--- a/lib/efi_loader/efi_image_loader.c
+++ b/lib/efi_loader/efi_image_loader.c
@@ -15,6 +15,7 @@
 #include <sort.h>
 #include <crypto/pkcs7_parser.h>
 #include <linux/err.h>
+#include <linux/string.h>
 
 const efi_guid_t efi_global_variable_guid = EFI_GLOBAL_VARIABLE_GUID;
 const efi_guid_t efi_guid_device_path = EFI_DEVICE_PATH_PROTOCOL_GUID;
diff --git a/lib/efi_loader/efi_load_initrd.c b/lib/efi_loader/efi_load_initrd.c
index 574a83d7e30..800ff9fc41a 100644
--- a/lib/efi_loader/efi_load_initrd.c
+++ b/lib/efi_loader/efi_load_initrd.c
@@ -11,6 +11,7 @@
 #include <fs.h>
 #include <efi_loader.h>
 #include <efi_load_initrd.h>
+#include <linux/string.h>
 
 static const efi_guid_t efi_guid_load_file2_protocol =
 		EFI_LOAD_FILE2_PROTOCOL_GUID;
diff --git a/lib/efi_loader/efi_net.c b/lib/efi_loader/efi_net.c
index 22f0123eca4..b056e08b3ec 100644
--- a/lib/efi_loader/efi_net.c
+++ b/lib/efi_loader/efi_net.c
@@ -19,6 +19,7 @@
 #include <efi_loader.h>
 #include <malloc.h>
 #include <net.h>
+#include <linux/string.h>
 
 static const efi_guid_t efi_net_guid = EFI_SIMPLE_NETWORK_PROTOCOL_GUID;
 static const efi_guid_t efi_pxe_base_code_protocol_guid =
diff --git a/lib/efi_loader/efi_runtime.c b/lib/efi_loader/efi_runtime.c
index d0235c46e18..ddc6e6a4cde 100644
--- a/lib/efi_loader/efi_runtime.c
+++ b/lib/efi_loader/efi_runtime.c
@@ -15,6 +15,7 @@
 #include <malloc.h>
 #include <rtc.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 #include <u-boot/crc.h>
 
 /* For manual relocation support */
diff --git a/lib/efi_loader/efi_setup.c b/lib/efi_loader/efi_setup.c
index 6196c0a06cd..51fc48b780b 100644
--- a/lib/efi_loader/efi_setup.c
+++ b/lib/efi_loader/efi_setup.c
@@ -9,6 +9,7 @@
 #include <bootm.h>
 #include <efi_loader.h>
 #include <efi_variable.h>
+#include <linux/string.h>
 
 #define OBJ_LIST_NOT_INITIALIZED 1
 
diff --git a/lib/efi_loader/efi_signature.c b/lib/efi_loader/efi_signature.c
index fc0314e6d48..18392920575 100644
--- a/lib/efi_loader/efi_signature.c
+++ b/lib/efi_loader/efi_signature.c
@@ -13,6 +13,7 @@
 #include <crypto/pkcs7_parser.h>
 #include <linux/compat.h>
 #include <linux/oid_registry.h>
+#include <linux/string.h>
 #include <u-boot/rsa.h>
 #include <u-boot/sha256.h>
 
diff --git a/lib/efi_loader/efi_unicode_collation.c b/lib/efi_loader/efi_unicode_collation.c
index 6655c68092e..e002ed6a392 100644
--- a/lib/efi_loader/efi_unicode_collation.c
+++ b/lib/efi_loader/efi_unicode_collation.c
@@ -10,6 +10,7 @@
 #include <cp1250.h>
 #include <cp437.h>
 #include <efi_loader.h>
+#include <linux/string.h>
 
 /* Characters that may not be used in FAT 8.3 file names */
 static const char illegal[] = "+,<=>:;\"/\\|?*[]\x7f";
diff --git a/lib/efi_loader/efi_var_file.c b/lib/efi_loader/efi_var_file.c
index 6f9d76f2a2d..eda9ced626b 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 <linux/string.h>
 #include <u-boot/crc.h>
 
 #define PART_STR_LEN 10
diff --git a/lib/efi_loader/efi_var_mem.c b/lib/efi_loader/efi_var_mem.c
index bfa8a56a8f6..a42970ffde1 100644
--- a/lib/efi_loader/efi_var_mem.c
+++ b/lib/efi_loader/efi_var_mem.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <efi_loader.h>
 #include <efi_variable.h>
+#include <linux/string.h>
 #include <u-boot/crc.h>
 
 static struct efi_var_file __efi_runtime_data *efi_var_buf;
diff --git a/lib/efi_loader/efi_variable.c b/lib/efi_loader/efi_variable.c
index 39a84829038..7093e33d282 100644
--- a/lib/efi_loader/efi_variable.c
+++ b/lib/efi_loader/efi_variable.c
@@ -20,6 +20,7 @@
 #include <uuid.h>
 #include <crypto/pkcs7_parser.h>
 #include <linux/compat.h>
+#include <linux/string.h>
 #include <u-boot/crc.h>
 #include <asm/sections.h>
 
diff --git a/lib/efi_loader/efi_variable_tee.c b/lib/efi_loader/efi_variable_tee.c
index 94c4de87034..df34bc5974d 100644
--- a/lib/efi_loader/efi_variable_tee.c
+++ b/lib/efi_loader/efi_variable_tee.c
@@ -14,6 +14,7 @@
 #include <tee.h>
 #include <malloc.h>
 #include <mm_communication.h>
+#include <linux/string.h>
 
 static efi_uintn_t max_buffer_size;	/* comm + var + func + data */
 static efi_uintn_t max_payload_size;	/* func + data */
diff --git a/lib/efi_loader/helloworld.c b/lib/efi_loader/helloworld.c
index 9ae2ee33898..2598fdfd124 100644
--- a/lib/efi_loader/helloworld.c
+++ b/lib/efi_loader/helloworld.c
@@ -11,6 +11,7 @@
 
 #include <common.h>
 #include <efi_api.h>
+#include <linux/string.h>
 
 static const efi_guid_t loaded_image_guid = EFI_LOADED_IMAGE_PROTOCOL_GUID;
 static const efi_guid_t fdt_guid = EFI_FDT_GUID;
diff --git a/lib/efi_selftest/efi_selftest_block_device.c b/lib/efi_selftest/efi_selftest_block_device.c
index 5eb297d285a..63d340342a9 100644
--- a/lib/efi_selftest/efi_selftest_block_device.c
+++ b/lib/efi_selftest/efi_selftest_block_device.c
@@ -14,6 +14,7 @@
  */
 
 #include <efi_selftest.h>
+#include <linux/string.h>
 #include "efi_selftest_disk_image.h"
 #include <asm/cache.h>
 
diff --git a/lib/efi_selftest/efi_selftest_config_table.c b/lib/efi_selftest/efi_selftest_config_table.c
index 2bf12b5bb68..6f6a8757ac5 100644
--- a/lib/efi_selftest/efi_selftest_config_table.c
+++ b/lib/efi_selftest/efi_selftest_config_table.c
@@ -9,6 +9,7 @@
  */
 
 #include <efi_selftest.h>
+#include <linux/string.h>
 #include <u-boot/crc.h>
 
 static const struct efi_system_table *sys_table;
diff --git a/lib/efi_selftest/efi_selftest_load_initrd.c b/lib/efi_selftest/efi_selftest_load_initrd.c
index e16163caca8..144443ff685 100644
--- a/lib/efi_selftest/efi_selftest_load_initrd.c
+++ b/lib/efi_selftest/efi_selftest_load_initrd.c
@@ -41,6 +41,7 @@
 #include <efi_selftest.h>
 #include <efi_loader.h>
 #include <efi_load_initrd.h>
+#include <linux/string.h>
 
 static struct efi_boot_services *boottime;
 
diff --git a/lib/efi_selftest/efi_selftest_loaded_image.c b/lib/efi_selftest/efi_selftest_loaded_image.c
index 5889ab12617..01f6dee2ea6 100644
--- a/lib/efi_selftest/efi_selftest_loaded_image.c
+++ b/lib/efi_selftest/efi_selftest_loaded_image.c
@@ -8,6 +8,7 @@
  */
 
 #include <efi_selftest.h>
+#include <linux/string.h>
 
 static efi_guid_t loaded_image_protocol_guid =
 	EFI_GUID(0x5b1b31a1, 0x9562, 0x11d2,
diff --git a/lib/efi_selftest/efi_selftest_loadimage.c b/lib/efi_selftest/efi_selftest_loadimage.c
index 06a87df8620..f251cbc33bc 100644
--- a/lib/efi_selftest/efi_selftest_loadimage.c
+++ b/lib/efi_selftest/efi_selftest_loadimage.c
@@ -11,6 +11,7 @@
  */
 
 #include <efi_selftest.h>
+#include <linux/string.h>
 /* Include containing the efi_selftest_miniapp_exit.efi application */
 #include "efi_miniapp_file_image_exit.h"
 
diff --git a/lib/efi_selftest/efi_selftest_manageprotocols.c b/lib/efi_selftest/efi_selftest_manageprotocols.c
index 8edb1e4d467..f22cad4c1c0 100644
--- a/lib/efi_selftest/efi_selftest_manageprotocols.c
+++ b/lib/efi_selftest/efi_selftest_manageprotocols.c
@@ -12,6 +12,7 @@
  */
 
 #include <efi_selftest.h>
+#include <linux/string.h>
 
 /*
  * The test currently does not actually call the interface function.
diff --git a/lib/efi_selftest/efi_selftest_mem.c b/lib/efi_selftest/efi_selftest_mem.c
index 51f0fec39b9..c5f0d7ccfa1 100644
--- a/lib/efi_selftest/efi_selftest_mem.c
+++ b/lib/efi_selftest/efi_selftest_mem.c
@@ -11,6 +11,7 @@
  */
 
 #include <efi_selftest.h>
+#include <linux/string.h>
 
 static struct efi_boot_services *boottime;
 
diff --git a/lib/efi_selftest/efi_selftest_memory.c b/lib/efi_selftest/efi_selftest_memory.c
index 4d32a280061..2efb6e42aa2 100644
--- a/lib/efi_selftest/efi_selftest_memory.c
+++ b/lib/efi_selftest/efi_selftest_memory.c
@@ -11,6 +11,7 @@
  */
 
 #include <efi_selftest.h>
+#include <linux/string.h>
 
 #define EFI_ST_NUM_PAGES 8
 
diff --git a/lib/efi_selftest/efi_selftest_rng.c b/lib/efi_selftest/efi_selftest_rng.c
index fca9749d072..ecf13a41faf 100644
--- a/lib/efi_selftest/efi_selftest_rng.c
+++ b/lib/efi_selftest/efi_selftest_rng.c
@@ -9,6 +9,7 @@
 
 #include <efi_selftest.h>
 #include <efi_rng.h>
+#include <linux/string.h>
 
 #define RNG_LEN 9
 
diff --git a/lib/efi_selftest/efi_selftest_set_virtual_address_map.c b/lib/efi_selftest/efi_selftest_set_virtual_address_map.c
index a4e5a50f632..b9045fe1143 100644
--- a/lib/efi_selftest/efi_selftest_set_virtual_address_map.c
+++ b/lib/efi_selftest/efi_selftest_set_virtual_address_map.c
@@ -9,6 +9,7 @@
  */
 
 #include <efi_selftest.h>
+#include <linux/string.h>
 
 static const struct efi_boot_services *boottime;
 static const struct efi_runtime_services *runtime;
diff --git a/lib/efi_selftest/efi_selftest_snp.c b/lib/efi_selftest/efi_selftest_snp.c
index 79f04678039..3357048c7f4 100644
--- a/lib/efi_selftest/efi_selftest_snp.c
+++ b/lib/efi_selftest/efi_selftest_snp.c
@@ -16,6 +16,7 @@
 
 #include <efi_selftest.h>
 #include <net.h>
+#include <linux/string.h>
 
 /*
  * MAC address for broadcasts
diff --git a/lib/efi_selftest/efi_selftest_startimage_exit.c b/lib/efi_selftest/efi_selftest_startimage_exit.c
index 11207b8162f..1406dfc9172 100644
--- a/lib/efi_selftest/efi_selftest_startimage_exit.c
+++ b/lib/efi_selftest/efi_selftest_startimage_exit.c
@@ -10,6 +10,7 @@
  */
 
 #include <efi_selftest.h>
+#include <linux/string.h>
 /* Include containing the miniapp.efi application */
 #include "efi_miniapp_file_image_exit.h"
 
diff --git a/lib/efi_selftest/efi_selftest_variables.c b/lib/efi_selftest/efi_selftest_variables.c
index 2c16f3db6cc..dfbdeb99f31 100644
--- a/lib/efi_selftest/efi_selftest_variables.c
+++ b/lib/efi_selftest/efi_selftest_variables.c
@@ -9,6 +9,7 @@
  */
 
 #include <efi_selftest.h>
+#include <linux/string.h>
 
 #define EFI_ST_MAX_DATA_SIZE 16
 #define EFI_ST_MAX_VARNAME_SIZE 80
diff --git a/lib/efi_selftest/efi_selftest_variables_runtime.c b/lib/efi_selftest/efi_selftest_variables_runtime.c
index 3226069c0b2..619da67a292 100644
--- a/lib/efi_selftest/efi_selftest_variables_runtime.c
+++ b/lib/efi_selftest/efi_selftest_variables_runtime.c
@@ -10,6 +10,7 @@
  */
 
 #include <efi_selftest.h>
+#include <linux/string.h>
 
 #define EFI_ST_MAX_DATA_SIZE 16
 #define EFI_ST_MAX_VARNAME_SIZE 40
diff --git a/lib/elf.c b/lib/elf.c
index d074e4e0a7d..4c5b050da2e 100644
--- a/lib/elf.c
+++ b/lib/elf.c
@@ -15,6 +15,7 @@
 #include <asm/e820.h>
 #include <linux/linkage.h>
 #endif
+#include <linux/string.h>
 
 /*
  * A very simple ELF64 loader, assumes the image is valid, returns the
diff --git a/lib/fdtdec.c b/lib/fdtdec.c
index c3724790a6e..37bacdd7b33 100644
--- a/lib/fdtdec.c
+++ b/lib/fdtdec.c
@@ -26,6 +26,7 @@
 #include <asm/sections.h>
 #include <linux/ctype.h>
 #include <linux/lzo.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/lib/fdtdec_test.c b/lib/fdtdec_test.c
index e0c6e0971cd..28260468e07 100644
--- a/lib/fdtdec_test.c
+++ b/lib/fdtdec_test.c
@@ -12,6 +12,7 @@
 #include <linux/libfdt.h>
 #include <malloc.h>
 #include <os.h>
+#include <linux/string.h>
 
 /* The size of our test fdt blob */
 #define FDT_SIZE	(16 * 1024)
diff --git a/lib/gunzip.c b/lib/gunzip.c
index bee3b9261f3..1073bebac06 100644
--- a/lib/gunzip.c
+++ b/lib/gunzip.c
@@ -13,6 +13,7 @@
 #include <image.h>
 #include <malloc.h>
 #include <memalign.h>
+#include <linux/string.h>
 #include <u-boot/crc.h>
 #include <watchdog.h>
 #include <u-boot/zlib.h>
diff --git a/lib/hashtable.c b/lib/hashtable.c
index 4a8c50b4b8a..063e2aaf578 100644
--- a/lib/hashtable.c
+++ b/lib/hashtable.c
@@ -16,6 +16,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <sort.h>
+#include <linux/string.h>
 
 #ifdef USE_HOSTCC		/* HOST build */
 # include <string.h>
diff --git a/lib/libavb/avb_sysdeps_posix.c b/lib/libavb/avb_sysdeps_posix.c
index 6ffdb0b7eb3..88135b90850 100644
--- a/lib/libavb/avb_sysdeps_posix.c
+++ b/lib/libavb/avb_sysdeps_posix.c
@@ -7,6 +7,7 @@
 #include <malloc.h>
 #include <stdarg.h>
 #include <stdlib.h>
+#include <linux/string.h>
 
 #include "avb_sysdeps.h"
 
diff --git a/lib/linux_compat.c b/lib/linux_compat.c
index c83426f59dc..8b9b562f98e 100644
--- a/lib/linux_compat.c
+++ b/lib/linux_compat.c
@@ -4,6 +4,7 @@
 #include <memalign.h>
 #include <asm/cache.h>
 #include <linux/compat.h>
+#include <linux/string.h>
 
 struct p_current cur = {
 	.pid = 1,
diff --git a/lib/list_sort.c b/lib/list_sort.c
index 1c9e0617327..44d85ff43fe 100644
--- a/lib/list_sort.c
+++ b/lib/list_sort.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <malloc.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #endif
 #include <linux/list.h>
 #include <linux/list_sort.h>
diff --git a/lib/lz4.c b/lib/lz4.c
index 046c34e3906..e803c087a26 100644
--- a/lib/lz4.c
+++ b/lib/lz4.c
@@ -8,6 +8,7 @@
    - LZ4 public forum : https://groups.google.com/forum/#!forum/lz4c
 */
 
+#include <linux/string.h>
 
 /**************************************
 *  Reading and writing into memory
diff --git a/lib/lz4_wrapper.c b/lib/lz4_wrapper.c
index e0f7d3688ee..edce13da6bd 100644
--- a/lib/lz4_wrapper.c
+++ b/lib/lz4_wrapper.c
@@ -8,6 +8,7 @@
 #include <image.h>
 #include <lz4.h>
 #include <linux/kernel.h>
+#include <linux/string.h>
 #include <linux/types.h>
 #include <asm/unaligned.h>
 
diff --git a/lib/lzo/lzo1x_decompress.c b/lib/lzo/lzo1x_decompress.c
index 65fef0b0eb9..48800c91ccf 100644
--- a/lib/lzo/lzo1x_decompress.c
+++ b/lib/lzo/lzo1x_decompress.c
@@ -15,6 +15,7 @@
 #include <linux/lzo.h>
 #include <asm/byteorder.h>
 #include <asm/unaligned.h>
+#include <linux/string.h>
 #include "lzodefs.h"
 
 #define HAVE_IP(x, ip_end, ip) ((size_t)(ip_end - ip) < (x))
diff --git a/lib/membuff.c b/lib/membuff.c
index 36dc43a523f..b0fc716a04b 100644
--- a/lib/membuff.c
+++ b/lib/membuff.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <log.h>
 #include <malloc.h>
+#include <linux/string.h>
 #include "membuff.h"
 
 void membuff_purge(struct membuff *mb)
diff --git a/lib/of_live.c b/lib/of_live.c
index 05a45ed34af..c27a7a6e24f 100644
--- a/lib/of_live.c
+++ b/lib/of_live.c
@@ -15,6 +15,7 @@
 #include <malloc.h>
 #include <dm/of_access.h>
 #include <linux/err.h>
+#include <linux/string.h>
 
 static void *unflatten_dt_alloc(void **mem, unsigned long size,
 				unsigned long align)
diff --git a/lib/optee/optee.c b/lib/optee/optee.c
index ed973168023..ec1e29cc3f6 100644
--- a/lib/optee/optee.c
+++ b/lib/optee/optee.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <linux/libfdt.h>
+#include <linux/string.h>
 #include <tee/optee.h>
 
 #define optee_hdr_err_msg \
diff --git a/lib/physmem.c b/lib/physmem.c
index fc90ce4d7cf..43f034766ab 100644
--- a/lib/physmem.c
+++ b/lib/physmem.c
@@ -13,6 +13,7 @@
 #include <mapmem.h>
 #include <physmem.h>
 #include <linux/compiler.h>
+#include <linux/string.h>
 
 phys_addr_t __weak arch_phys_memset(phys_addr_t s, int c, phys_size_t n)
 {
diff --git a/lib/qsort.c b/lib/qsort.c
index 2f18588dfcc..40f90d28866 100644
--- a/lib/qsort.c
+++ b/lib/qsort.c
@@ -16,6 +16,7 @@
  * bcc and gcc. */
 
 #include <log.h>
+#include <linux/string.h>
 #include <linux/types.h>
 #include <common.h>
 #include <exports.h>
diff --git a/lib/rsa/rsa-keyprop.c b/lib/rsa/rsa-keyprop.c
index 1e83eedc82c..4114e33d36e 100644
--- a/lib/rsa/rsa-keyprop.c
+++ b/lib/rsa/rsa-keyprop.c
@@ -14,6 +14,7 @@
 #include <malloc.h>
 #include <asm/byteorder.h>
 #include <crypto/internal/rsa.h>
+#include <linux/string.h>
 #include <u-boot/rsa-mod-exp.h>
 
 /**
diff --git a/lib/rsa/rsa-mod-exp.c b/lib/rsa/rsa-mod-exp.c
index a437cbe26f2..d8cd3ecd88d 100644
--- a/lib/rsa/rsa-mod-exp.c
+++ b/lib/rsa/rsa-mod-exp.c
@@ -12,6 +12,7 @@
 #include <linux/errno.h>
 #include <asm/types.h>
 #include <asm/unaligned.h>
+#include <linux/string.h>
 #else
 #include "fdt_host.h"
 #include "mkimage.h"
diff --git a/lib/rsa/rsa-verify.c b/lib/rsa/rsa-verify.c
index 2057f6819db..22ec890b407 100644
--- a/lib/rsa/rsa-verify.c
+++ b/lib/rsa/rsa-verify.c
@@ -14,6 +14,7 @@
 #include <asm/types.h>
 #include <asm/unaligned.h>
 #include <dm.h>
+#include <linux/string.h>
 #else
 #include "fdt_host.h"
 #include "mkimage.h"
diff --git a/lib/slre.c b/lib/slre.c
index e82a9e7635b..da17c018d83 100644
--- a/lib/slre.c
+++ b/lib/slre.c
@@ -26,6 +26,7 @@
 #endif /* SLRE_TEST */
 
 #include <errno.h>
+#include <linux/string.h>
 
 #include <slre.h>
 
diff --git a/lib/smbios.c b/lib/smbios.c
index 11790443e1a..12f0a3a4ffd 100644
--- a/lib/smbios.c
+++ b/lib/smbios.c
@@ -16,6 +16,7 @@
 #include <dm.h>
 #include <dm/uclass-internal.h>
 #endif
+#include <linux/string.h>
 
 /**
  * smbios_add_string() - add a string to the string area
diff --git a/lib/strto.c b/lib/strto.c
index c00bb5895df..009e67d417a 100644
--- a/lib/strto.c
+++ b/lib/strto.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <errno.h>
 #include <linux/ctype.h>
+#include <linux/string.h>
 
 /* from lib/kstrtox.c */
 static const char *_parse_integer_fixup_radix(const char *s, unsigned int *base)
diff --git a/lib/tpm-common.c b/lib/tpm-common.c
index e4af87f76aa..adfe4919069 100644
--- a/lib/tpm-common.c
+++ b/lib/tpm-common.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <asm/unaligned.h>
 #include <tpm-common.h>
+#include <linux/string.h>
 #include "tpm-utils.h"
 
 enum tpm_version tpm_get_version(struct udevice *dev)
diff --git a/lib/tpm-v1.c b/lib/tpm-v1.c
index a846fe00dd3..e7221dd8f2e 100644
--- a/lib/tpm-v1.c
+++ b/lib/tpm-v1.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <log.h>
 #include <asm/unaligned.h>
+#include <linux/string.h>
 #include <u-boot/sha1.h>
 #include <tpm-common.h>
 #include <tpm-v1.h>
diff --git a/lib/tpm-v2.c b/lib/tpm-v2.c
index a4c352e3ef7..594ccb6c234 100644
--- a/lib/tpm-v2.c
+++ b/lib/tpm-v2.c
@@ -9,6 +9,7 @@
 #include <tpm-common.h>
 #include <tpm-v2.h>
 #include <linux/bitops.h>
+#include <linux/string.h>
 #include "tpm-utils.h"
 
 u32 tpm2_startup(struct udevice *dev, enum tpm2_startup_types mode)
diff --git a/lib/trace.c b/lib/trace.c
index 854e495ed71..1b59e7d1cb9 100644
--- a/lib/trace.c
+++ b/lib/trace.c
@@ -10,6 +10,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/sections.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/lib/uuid.c b/lib/uuid.c
index e62d5ca2643..ec6beedd55a 100644
--- a/lib/uuid.c
+++ b/lib/uuid.c
@@ -15,6 +15,7 @@
 #include <asm/io.h>
 #include <part_efi.h>
 #include <malloc.h>
+#include <linux/string.h>
 
 /*
  * UUID - Universally Unique IDentifier - 128 bits unique number.
diff --git a/lib/zstd/zstd_opt.h b/lib/zstd/zstd_opt.h
index af0aaf5b20d..25f78bdba24 100644
--- a/lib/zstd/zstd_opt.h
+++ b/lib/zstd/zstd_opt.h
@@ -9,6 +9,7 @@
 #ifndef ZSTD_OPT_H_91842398743
 #define ZSTD_OPT_H_91842398743
 
+#include <linux/string.h>
 #define ZSTD_LITFREQ_ADD 2
 #define ZSTD_FREQ_DIV 4
 #define ZSTD_MAX_PRICE (1 << 30)
diff --git a/net/arp.c b/net/arp.c
index 7913812b9a2..52f4f31e529 100644
--- a/net/arp.c
+++ b/net/arp.c
@@ -15,6 +15,7 @@
 #include <net.h>
 #include <time.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include "arp.h"
 
diff --git a/net/bootp.c b/net/bootp.c
index 23b5b8ad9b9..6038e7a86c6 100644
--- a/net/bootp.c
+++ b/net/bootp.c
@@ -19,6 +19,7 @@
 #include <time.h>
 #include <uuid.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include <net/tftp.h>
 #include "bootp.h"
 #ifdef CONFIG_LED_STATUS
diff --git a/net/cdp.c b/net/cdp.c
index fac02046819..af4ea9cd41a 100644
--- a/net/cdp.c
+++ b/net/cdp.c
@@ -14,6 +14,7 @@
 #if defined(CONFIG_CDP_VERSION)
 #include <timestamp.h>
 #endif
+#include <linux/string.h>
 
 #include "cdp.h"
 
diff --git a/net/dns.c b/net/dns.c
index 677e39dd031..12182c9501c 100644
--- a/net/dns.c
+++ b/net/dns.c
@@ -29,6 +29,7 @@
 #include <net.h>
 #include <time.h>
 #include <asm/unaligned.h>
+#include <linux/string.h>
 
 #include "dns.h"
 
diff --git a/net/eth-uclass.c b/net/eth-uclass.c
index 9b5c3c04ecc..42eb460e833 100644
--- a/net/eth-uclass.c
+++ b/net/eth-uclass.c
@@ -14,6 +14,7 @@
 #include <asm/global_data.h>
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
+#include <linux/string.h>
 #include <net/pcap.h>
 #include "eth_internal.h"
 #include <eth_phy.h>
diff --git a/net/eth_common.c b/net/eth_common.c
index 58f899a0240..44047abe7c9 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 <linux/string.h>
 #include "eth_internal.h"
 
 int eth_env_get_enetaddr_by_index(const char *base_name, int index,
diff --git a/net/eth_legacy.c b/net/eth_legacy.c
index 9397113a632..6e6a3b5e8dd 100644
--- a/net/eth_legacy.c
+++ b/net/eth_legacy.c
@@ -15,6 +15,7 @@
 #include <asm/global_data.h>
 #include <linux/bug.h>
 #include <linux/errno.h>
+#include <linux/string.h>
 #include <net/pcap.h>
 #include "eth_internal.h"
 
diff --git a/net/fastboot.c b/net/fastboot.c
index c35953f3e33..4f1fed9e778 100644
--- a/net/fastboot.c
+++ b/net/fastboot.c
@@ -9,6 +9,7 @@
 #include <net.h>
 #include <time.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include <net/fastboot.h>
 
 /* Fastboot port # defined in spec */
diff --git a/net/link_local.c b/net/link_local.c
index 16bc5c8b90a..0ddd1bd061f 100644
--- a/net/link_local.c
+++ b/net/link_local.c
@@ -17,6 +17,7 @@
 #include <net.h>
 #include <rand.h>
 #include <time.h>
+#include <linux/string.h>
 #include "arp.h"
 #include "net_rand.h"
 
diff --git a/net/mdio-uclass.c b/net/mdio-uclass.c
index 66ee2e19763..1c9ce801dc8 100644
--- a/net/mdio-uclass.c
+++ b/net/mdio-uclass.c
@@ -13,6 +13,7 @@
 #include <dm/device_compat.h>
 #include <dm/uclass-internal.h>
 #include <linux/compat.h>
+#include <linux/string.h>
 
 /* DT node properties for MAC-PHY interface */
 #define PHY_MODE_STR_CNT	2
diff --git a/net/net.c b/net/net.c
index 23d1988c181..cf399b50918 100644
--- a/net/net.c
+++ b/net/net.c
@@ -98,6 +98,7 @@
 #include <log.h>
 #include <net.h>
 #include <time.h>
+#include <linux/string.h>
 #include <net/fastboot.h>
 #include <net/tftp.h>
 #if defined(CONFIG_CMD_PCAP)
diff --git a/net/net_rand.h b/net/net_rand.h
index 4bf9bd817e5..3181aa358cc 100644
--- a/net/net_rand.h
+++ b/net/net_rand.h
@@ -10,6 +10,7 @@
 #define __NET_RAND_H__
 
 #include <common.h>
+#include <linux/string.h>
 
 /*
  * Return a seed for the PRNG derived from the eth0 MAC address.
diff --git a/net/nfs.c b/net/nfs.c
index 8a3b04adcdc..3d7ebeaff09 100644
--- a/net/nfs.c
+++ b/net/nfs.c
@@ -35,6 +35,7 @@
 #include <net.h>
 #include <malloc.h>
 #include <mapmem.h>
+#include <linux/string.h>
 #include "nfs.h"
 #include "bootp.h"
 #include <time.h>
diff --git a/net/pcap.c b/net/pcap.c
index 4036d8a3fa5..981f8f750e2 100644
--- a/net/pcap.c
+++ b/net/pcap.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <net.h>
+#include <linux/string.h>
 #include <net/pcap.h>
 #include <time.h>
 #include <asm/io.h>
diff --git a/net/rarp.c b/net/rarp.c
index a676a4253b5..6fd07bc6f14 100644
--- a/net/rarp.c
+++ b/net/rarp.c
@@ -8,6 +8,7 @@
 #include <command.h>
 #include <log.h>
 #include <net.h>
+#include <linux/string.h>
 #include <net/tftp.h>
 #include "nfs.h"
 #include "bootp.h"
diff --git a/net/sntp.c b/net/sntp.c
index 8ecc0117ca7..e814af66b79 100644
--- a/net/sntp.c
+++ b/net/sntp.c
@@ -12,6 +12,7 @@
 #include <net.h>
 #include <rtc.h>
 #include <time.h>
+#include <linux/string.h>
 
 #include "sntp.h"
 
diff --git a/net/tftp.c b/net/tftp.c
index e1e0042f157..4c9e532fc01 100644
--- a/net/tftp.c
+++ b/net/tftp.c
@@ -18,6 +18,7 @@
 #include <net.h>
 #include <time.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 #include <net/tftp.h>
 #include "bootp.h"
 #ifdef CONFIG_SYS_DIRECT_FLASH_TFTP
diff --git a/net/wol.c b/net/wol.c
index 0a625668a99..e985f4adc59 100644
--- a/net/wol.c
+++ b/net/wol.c
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <env.h>
 #include <net.h>
+#include <linux/string.h>
 #include "wol.h"
 
 static ulong wol_timeout = WOL_DEFAULT_TIMEOUT;
diff --git a/post/drivers/flash.c b/post/drivers/flash.c
index 07eab332d21..7c6caa4f197 100644
--- a/post/drivers/flash.c
+++ b/post/drivers/flash.c
@@ -10,6 +10,7 @@
 #include <malloc.h>
 #include <post.h>
 #include <flash.h>
+#include <linux/string.h>
 
 #if CONFIG_POST & CONFIG_SYS_POST_FLASH
 
diff --git a/post/lib_powerpc/multi.c b/post/lib_powerpc/multi.c
index f082e4c546c..31134a9f1b5 100644
--- a/post/lib_powerpc/multi.c
+++ b/post/lib_powerpc/multi.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <irq_func.h>
 #include <log.h>
+#include <linux/string.h>
 
 /*
  * CPU test
diff --git a/post/lib_powerpc/string.c b/post/lib_powerpc/string.c
index fc460ceb9f0..c292f8f0f8e 100644
--- a/post/lib_powerpc/string.c
+++ b/post/lib_powerpc/string.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <irq_func.h>
+#include <linux/string.h>
 
 /*
  * CPU test
diff --git a/post/post.c b/post/post.c
index c344ec5810f..65162e6d985 100644
--- a/post/post.c
+++ b/post/post.c
@@ -15,6 +15,7 @@
 #include <div64.h>
 #include <post.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 
 #ifdef CONFIG_SYS_POST_HOTKEYS_GPIO
 #include <asm/gpio.h>
-- 
2.28.0.163.g6104cc2f0b6-goog

^ permalink raw reply related	[flat|nested] 35+ messages in thread

* [PATCH 07/16] common: Drop asm/u-boot.h from common header
  2020-08-02 22:59 [PATCH 00/16] common: Drop remaining includes in common.h Simon Glass
                   ` (5 preceding siblings ...)
  2020-08-02 22:59 ` [PATCH 06/16] common: Drop linux/string.h " Simon Glass
@ 2020-08-02 22:59 ` Simon Glass
  2020-08-02 22:59 ` [PATCH 08/16] common: Drop stdio.h " Simon Glass
                   ` (9 subsequent siblings)
  16 siblings, 0 replies; 35+ messages in thread
From: Simon Glass @ 2020-08-02 22:59 UTC (permalink / raw)
  To: u-boot

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

There is quite a bit of clean-up that could be undertaken late. For
example, some of the function prototypes defined in the various arch's
u-boot-xxx.h header are generic and could be defined in the generic
init.h header file.

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

 arch/arc/lib/bootm.c                                       | 1 +
 arch/arc/lib/cpu.c                                         | 1 +
 arch/arc/lib/interrupts.c                                  | 1 +
 arch/arm/cpu/arm1136/mx35/generic.c                        | 1 +
 arch/arm/cpu/arm720t/cpu.c                                 | 2 ++
 arch/arm/cpu/arm926ejs/armada100/cpu.c                     | 1 +
 arch/arm/cpu/arm926ejs/armada100/dram.c                    | 1 +
 arch/arm/cpu/arm926ejs/mx25/generic.c                      | 1 +
 arch/arm/cpu/arm926ejs/mx27/generic.c                      | 1 +
 arch/arm/cpu/arm926ejs/mxs/mxs.c                           | 1 +
 arch/arm/cpu/arm926ejs/mxs/spl_boot.c                      | 1 +
 arch/arm/cpu/arm926ejs/spear/cpu.c                         | 1 +
 arch/arm/cpu/arm926ejs/spear/spl.c                         | 1 +
 arch/arm/cpu/arm926ejs/spear/spr_misc.c                    | 1 +
 arch/arm/cpu/armv7/cpu.c                                   | 1 +
 arch/arm/cpu/armv7/kona-common/s_init.c                    | 1 +
 arch/arm/cpu/armv7/ls102xa/clock.c                         | 1 +
 arch/arm/cpu/armv7/ls102xa/cpu.c                           | 1 +
 arch/arm/cpu/armv7/ls102xa/fdt.c                           | 1 +
 arch/arm/cpu/armv7/ls102xa/soc.c                           | 1 +
 arch/arm/cpu/armv7/s5p-common/cpu_info.c                   | 1 +
 arch/arm/cpu/armv7/s5p-common/timer.c                      | 1 +
 arch/arm/cpu/armv7/vf610/generic.c                         | 1 +
 arch/arm/cpu/armv7m/cpu.c                                  | 1 +
 arch/arm/cpu/armv8/cpu.c                                   | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/cpu.c                    | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/fdt.c                    | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c        | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c        | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/mp.c                     | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/soc.c                    | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/spl.c                    | 1 +
 arch/arm/cpu/armv8/s32v234/cpu.c                           | 1 +
 arch/arm/cpu/armv8/s32v234/generic.c                       | 1 +
 arch/arm/cpu/pxa/pxa2xx.c                                  | 1 +
 arch/arm/include/asm/arch-fsl-layerscape/clock.h           | 1 +
 arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h     | 1 +
 arch/arm/include/asm/arch-fsl-layerscape/speed.h           | 1 +
 arch/arm/include/asm/arch-ls102xa/clock.h                  | 1 +
 arch/arm/include/asm/arch-ls102xa/immap_ls102xa.h          | 1 +
 arch/arm/include/asm/arch-mx27/mxcmmc.h                    | 1 +
 arch/arm/include/asm/arch-mx31/sys_proto.h                 | 1 +
 arch/arm/include/asm/arch-mx6/litesom.h                    | 1 +
 arch/arm/include/asm/arch-mxs/sys_proto.h                  | 1 +
 arch/arm/include/asm/mach-imx/sys_proto.h                  | 1 +
 arch/arm/include/asm/omap_common.h                         | 1 +
 arch/arm/lib/bdinfo.c                                      | 1 +
 arch/arm/lib/bootm-fdt.c                                   | 1 +
 arch/arm/lib/bootm.c                                       | 1 +
 arch/arm/lib/cache-cp15.c                                  | 1 +
 arch/arm/lib/image.c                                       | 1 +
 arch/arm/lib/interrupts_64.c                               | 1 +
 arch/arm/lib/interrupts_m.c                                | 1 +
 arch/arm/lib/reset.c                                       | 1 +
 arch/arm/lib/spl.c                                         | 1 +
 arch/arm/mach-aspeed/ast2500-board.c                       | 1 +
 arch/arm/mach-at91/arm920t/cpu.c                           | 1 +
 arch/arm/mach-at91/arm926ejs/cpu.c                         | 1 +
 arch/arm/mach-at91/armv7/cpu.c                             | 1 +
 arch/arm/mach-at91/spl_atmel.c                             | 1 +
 arch/arm/mach-bcm283x/init.c                               | 1 +
 arch/arm/mach-davinci/cpu.c                                | 1 +
 arch/arm/mach-davinci/da850_lowlevel.c                     | 1 +
 arch/arm/mach-davinci/include/mach/sdmmc_defs.h            | 1 +
 arch/arm/mach-davinci/misc.c                               | 1 +
 arch/arm/mach-exynos/lowlevel_init.c                       | 1 +
 arch/arm/mach-imx/cpu.c                                    | 1 +
 arch/arm/mach-imx/imx8/ahab.c                              | 1 +
 arch/arm/mach-imx/imx8/cpu.c                               | 1 +
 arch/arm/mach-imx/imx8/fdt.c                               | 1 +
 arch/arm/mach-imx/imx8m/soc.c                              | 1 +
 arch/arm/mach-imx/imxrt/soc.c                              | 1 +
 arch/arm/mach-imx/misc.c                                   | 1 +
 arch/arm/mach-imx/mx5/mx53_dram.c                          | 1 +
 arch/arm/mach-imx/mx6/litesom.c                            | 1 +
 arch/arm/mach-imx/mx6/module_fuse.c                        | 1 +
 arch/arm/mach-imx/mx6/opos6ul.c                            | 1 +
 arch/arm/mach-imx/mx6/soc.c                                | 1 +
 arch/arm/mach-imx/mx7/soc.c                                | 1 +
 arch/arm/mach-imx/mx7ulp/soc.c                             | 1 +
 arch/arm/mach-imx/spl.c                                    | 1 +
 arch/arm/mach-keystone/init.c                              | 1 +
 arch/arm/mach-kirkwood/cpu.c                               | 1 +
 arch/arm/mach-lpc32xx/cpu.c                                | 1 +
 arch/arm/mach-mediatek/cpu.c                               | 1 +
 arch/arm/mach-mediatek/mt8512/init.c                       | 1 +
 arch/arm/mach-mediatek/mt8516/init.c                       | 1 +
 arch/arm/mach-mediatek/mt8518/init.c                       | 1 +
 arch/arm/mach-meson/board-common.c                         | 1 +
 arch/arm/mach-mvebu/arm64-common.c                         | 1 +
 arch/arm/mach-mvebu/armada3700/cpu.c                       | 1 +
 arch/arm/mach-mvebu/armada8k/dram.c                        | 1 +
 arch/arm/mach-mvebu/cpu.c                                  | 1 +
 arch/arm/mach-mvebu/dram.c                                 | 1 +
 arch/arm/mach-omap2/am33xx/board.c                         | 1 +
 arch/arm/mach-omap2/am33xx/fdt.c                           | 1 +
 arch/arm/mach-omap2/boot-common.c                          | 1 +
 arch/arm/mach-omap2/fdt-common.c                           | 1 +
 arch/arm/mach-omap2/hwinit-common.c                        | 1 +
 arch/arm/mach-omap2/omap-cache.c                           | 1 +
 arch/arm/mach-omap2/omap3/board.c                          | 1 +
 arch/arm/mach-omap2/omap3/emac.c                           | 1 +
 arch/arm/mach-omap2/omap3/emif4.c                          | 1 +
 arch/arm/mach-omap2/omap3/sdrc.c                           | 1 +
 arch/arm/mach-omap2/omap5/fdt.c                            | 1 +
 arch/arm/mach-orion5x/cpu.c                                | 1 +
 arch/arm/mach-orion5x/dram.c                               | 1 +
 arch/arm/mach-owl/soc.c                                    | 1 +
 arch/arm/mach-rmobile/cpu_info.c                           | 1 +
 arch/arm/mach-rmobile/emac.c                               | 1 +
 arch/arm/mach-rmobile/memmap-gen3.c                        | 1 +
 arch/arm/mach-rockchip/board.c                             | 1 +
 arch/arm/mach-rockchip/px30/px30.c                         | 1 +
 arch/arm/mach-rockchip/rk3128/rk3128.c                     | 1 +
 arch/arm/mach-rockchip/rk3188/rk3188.c                     | 1 +
 arch/arm/mach-rockchip/rk322x/rk322x.c                     | 1 +
 arch/arm/mach-rockchip/rk3288/rk3288.c                     | 1 +
 arch/arm/mach-rockchip/rk3308/rk3308.c                     | 1 +
 arch/arm/mach-rockchip/rk3328/rk3328.c                     | 1 +
 arch/arm/mach-rockchip/rk3368/rk3368.c                     | 1 +
 arch/arm/mach-rockchip/rk3399/rk3399.c                     | 1 +
 arch/arm/mach-rockchip/sdram.c                             | 1 +
 arch/arm/mach-rockchip/spl.c                               | 1 +
 arch/arm/mach-socfpga/board.c                              | 1 +
 arch/arm/mach-socfpga/clock_manager.c                      | 1 +
 arch/arm/mach-socfpga/misc.c                               | 1 +
 arch/arm/mach-socfpga/misc_arria10.c                       | 1 +
 arch/arm/mach-socfpga/misc_gen5.c                          | 1 +
 arch/arm/mach-socfpga/misc_s10.c                           | 1 +
 arch/arm/mach-stm32/soc.c                                  | 1 +
 arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c            | 1 +
 arch/arm/mach-stm32mp/cpu.c                                | 1 +
 arch/arm/mach-stm32mp/dram_init.c                          | 1 +
 arch/arm/mach-stm32mp/fdt.c                                | 1 +
 arch/arm/mach-stm32mp/spl.c                                | 1 +
 arch/arm/mach-sunxi/board.c                                | 1 +
 arch/arm/mach-tegra/ap.c                                   | 1 +
 arch/arm/mach-tegra/board2.c                               | 1 +
 arch/arm/mach-tegra/cboot.c                                | 1 +
 arch/arm/mach-tegra/dt-setup.c                             | 1 +
 arch/arm/mach-uniphier/bcu/bcu-ld4.c                       | 1 +
 arch/arm/mach-uniphier/board_init.c                        | 1 +
 arch/arm/mach-uniphier/clk/dpll-ld4.c                      | 1 +
 arch/arm/mach-uniphier/clk/dpll-pro4.c                     | 1 +
 arch/arm/mach-uniphier/dram/umc-ld4.c                      | 1 +
 arch/arm/mach-uniphier/dram/umc-pro4.c                     | 1 +
 arch/arm/mach-uniphier/dram/umc-pxs2.c                     | 1 +
 arch/arm/mach-uniphier/dram/umc-sld8.c                     | 1 +
 arch/arm/mach-uniphier/fdt-fixup.c                         | 1 +
 arch/arm/mach-uniphier/memconf.c                           | 1 +
 arch/arm/mach-versal/clk.c                                 | 1 +
 arch/arm/mach-versal/cpu.c                                 | 1 +
 arch/arm/mach-zynq/clk.c                                   | 1 +
 arch/arm/mach-zynq/cpu.c                                   | 1 +
 arch/arm/mach-zynq/spl.c                                   | 1 +
 arch/arm/mach-zynqmp-r5/cpu.c                              | 1 +
 arch/arm/mach-zynqmp/clk.c                                 | 1 +
 arch/arm/mach-zynqmp/cpu.c                                 | 1 +
 arch/arm/mach-zynqmp/spl.c                                 | 1 +
 arch/m68k/cpu/mcf5227x/cpu_init.c                          | 1 +
 arch/m68k/cpu/mcf523x/cpu.c                                | 1 +
 arch/m68k/cpu/mcf523x/cpu_init.c                           | 1 +
 arch/m68k/cpu/mcf52x2/cpu.c                                | 1 +
 arch/m68k/cpu/mcf52x2/cpu_init.c                           | 1 +
 arch/m68k/cpu/mcf530x/cpu_init.c                           | 1 +
 arch/m68k/cpu/mcf532x/cpu.c                                | 1 +
 arch/m68k/cpu/mcf532x/cpu_init.c                           | 1 +
 arch/m68k/cpu/mcf5445x/cpu.c                               | 1 +
 arch/m68k/cpu/mcf5445x/cpu_init.c                          | 1 +
 arch/m68k/cpu/mcf547x_8x/cpu.c                             | 1 +
 arch/m68k/cpu/mcf547x_8x/cpu_init.c                        | 1 +
 arch/m68k/lib/bdinfo.c                                     | 1 +
 arch/m68k/lib/bootm.c                                      | 1 +
 arch/m68k/lib/traps.c                                      | 1 +
 arch/microblaze/cpu/timer.c                                | 1 +
 arch/microblaze/include/asm/processor.h                    | 1 +
 arch/microblaze/lib/bootm.c                                | 1 +
 arch/mips/lib/boot.c                                       | 1 +
 arch/mips/lib/bootm.c                                      | 1 +
 arch/mips/lib/traps.c                                      | 1 +
 arch/mips/mach-ath79/ar933x/clk.c                          | 1 +
 arch/mips/mach-ath79/ar934x/clk.c                          | 1 +
 arch/mips/mach-ath79/qca953x/clk.c                         | 1 +
 arch/mips/mach-ath79/qca956x/clk.c                         | 1 +
 arch/mips/mach-jz47xx/jz4780/jz4780.c                      | 1 +
 arch/mips/mach-octeon/dram.c                               | 1 +
 arch/nds32/cpu/n1213/ae3xx/cpu.c                           | 1 +
 arch/nds32/cpu/n1213/ag101/cpu.c                           | 1 +
 arch/nds32/cpu/n1213/ag101/timer.c                         | 2 ++
 arch/nds32/lib/boot.c                                      | 1 +
 arch/nds32/lib/bootm.c                                     | 1 +
 arch/nds32/lib/interrupts.c                                | 1 +
 arch/powerpc/cpu/mpc83xx/cpu.c                             | 1 +
 arch/powerpc/cpu/mpc83xx/ecc.c                             | 1 +
 arch/powerpc/cpu/mpc83xx/fdt.c                             | 1 +
 arch/powerpc/cpu/mpc83xx/interrupts.c                      | 1 +
 arch/powerpc/cpu/mpc83xx/law.c                             | 1 +
 arch/powerpc/cpu/mpc83xx/pci.c                             | 1 +
 arch/powerpc/cpu/mpc83xx/pcie.c                            | 1 +
 arch/powerpc/cpu/mpc83xx/spd_sdram.c                       | 1 +
 arch/powerpc/cpu/mpc83xx/speed.c                           | 1 +
 arch/powerpc/cpu/mpc83xx/spl_minimal.c                     | 1 +
 arch/powerpc/cpu/mpc83xx/traps.c                           | 1 +
 arch/powerpc/cpu/mpc85xx/cmd_errata.c                      | 1 +
 arch/powerpc/cpu/mpc85xx/cpu.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_corenet2_serdes.c             | 1 +
 arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c              | 1 +
 arch/powerpc/cpu/mpc85xx/interrupts.c                      | 1 +
 arch/powerpc/cpu/mpc85xx/liodn.c                           | 1 +
 arch/powerpc/cpu/mpc85xx/mp.c                              | 1 +
 arch/powerpc/cpu/mpc85xx/mpc8536_serdes.c                  | 1 +
 arch/powerpc/cpu/mpc85xx/mpc8544_serdes.c                  | 1 +
 arch/powerpc/cpu/mpc85xx/mpc8548_serdes.c                  | 1 +
 arch/powerpc/cpu/mpc85xx/mpc8568_serdes.c                  | 1 +
 arch/powerpc/cpu/mpc85xx/mpc8569_serdes.c                  | 1 +
 arch/powerpc/cpu/mpc85xx/mpc8572_serdes.c                  | 1 +
 arch/powerpc/cpu/mpc85xx/p1010_serdes.c                    | 1 +
 arch/powerpc/cpu/mpc85xx/p1021_serdes.c                    | 1 +
 arch/powerpc/cpu/mpc85xx/p1022_serdes.c                    | 1 +
 arch/powerpc/cpu/mpc85xx/p1023_serdes.c                    | 1 +
 arch/powerpc/cpu/mpc85xx/p2020_serdes.c                    | 1 +
 arch/powerpc/cpu/mpc85xx/p2041_serdes.c                    | 1 +
 arch/powerpc/cpu/mpc85xx/p3041_serdes.c                    | 1 +
 arch/powerpc/cpu/mpc85xx/p4080_serdes.c                    | 1 +
 arch/powerpc/cpu/mpc85xx/p5020_serdes.c                    | 1 +
 arch/powerpc/cpu/mpc85xx/p5040_serdes.c                    | 1 +
 arch/powerpc/cpu/mpc85xx/pci.c                             | 1 +
 arch/powerpc/cpu/mpc85xx/qe_io.c                           | 1 +
 arch/powerpc/cpu/mpc85xx/speed.c                           | 1 +
 arch/powerpc/cpu/mpc85xx/spl_minimal.c                     | 1 +
 arch/powerpc/cpu/mpc85xx/t1024_serdes.c                    | 2 +-
 arch/powerpc/cpu/mpc85xx/t1040_serdes.c                    | 1 +
 arch/powerpc/cpu/mpc85xx/t2080_serdes.c                    | 1 +
 arch/powerpc/cpu/mpc85xx/t4240_serdes.c                    | 1 +
 arch/powerpc/cpu/mpc85xx/tlb.c                             | 1 +
 arch/powerpc/cpu/mpc85xx/traps.c                           | 1 +
 arch/powerpc/cpu/mpc86xx/cpu.c                             | 1 +
 arch/powerpc/cpu/mpc86xx/cpu_init.c                        | 1 +
 arch/powerpc/cpu/mpc86xx/fdt.c                             | 1 +
 arch/powerpc/cpu/mpc86xx/interrupts.c                      | 1 +
 arch/powerpc/cpu/mpc86xx/speed.c                           | 1 +
 arch/powerpc/cpu/mpc86xx/traps.c                           | 1 +
 arch/powerpc/cpu/mpc8xx/cpu.c                              | 1 +
 arch/powerpc/cpu/mpc8xx/cpu_init.c                         | 1 +
 arch/powerpc/cpu/mpc8xx/fdt.c                              | 1 +
 arch/powerpc/cpu/mpc8xx/immap.c                            | 1 +
 arch/powerpc/cpu/mpc8xx/interrupts.c                       | 1 +
 arch/powerpc/cpu/mpc8xx/traps.c                            | 1 +
 arch/powerpc/cpu/mpc8xxx/cpu.c                             | 1 +
 arch/powerpc/cpu/mpc8xxx/fdt.c                             | 1 +
 arch/powerpc/cpu/mpc8xxx/fsl_lbc.c                         | 1 +
 arch/powerpc/cpu/mpc8xxx/fsl_pamu.c                        | 1 +
 arch/powerpc/cpu/mpc8xxx/law.c                             | 1 +
 arch/powerpc/cpu/mpc8xxx/srio.c                            | 1 +
 arch/powerpc/include/asm/fsl_liodn.h                       | 1 +
 arch/powerpc/include/asm/ppc.h                             | 1 +
 arch/powerpc/lib/bdinfo.c                                  | 1 +
 arch/powerpc/lib/bootm.c                                   | 1 +
 arch/powerpc/lib/extable.c                                 | 1 +
 arch/powerpc/lib/interrupts.c                              | 7 ++++---
 arch/powerpc/lib/kgdb.c                                    | 1 +
 arch/riscv/cpu/ax25/cpu.c                                  | 1 +
 arch/riscv/cpu/cpu.c                                       | 1 +
 arch/riscv/cpu/fu540/cpu.c                                 | 1 +
 arch/riscv/cpu/fu540/dram.c                                | 1 +
 arch/riscv/cpu/generic/cpu.c                               | 1 +
 arch/riscv/cpu/generic/dram.c                              | 1 +
 arch/riscv/lib/boot.c                                      | 1 +
 arch/riscv/lib/bootm.c                                     | 1 +
 arch/riscv/lib/fdt_fixup.c                                 | 1 +
 arch/sandbox/cpu/cpu.c                                     | 1 +
 arch/sandbox/cpu/start.c                                   | 1 +
 arch/sandbox/lib/pci_io.c                                  | 1 +
 arch/sh/cpu/sh4/cpu.c                                      | 1 +
 arch/x86/cpu/apollolake/cpu_spl.c                          | 1 +
 arch/x86/cpu/baytrail/early_uart.c                         | 1 +
 arch/x86/cpu/baytrail/valleyview.c                         | 1 +
 arch/x86/cpu/braswell/braswell.c                           | 1 +
 arch/x86/cpu/braswell/early_uart.c                         | 1 +
 arch/x86/cpu/broadwell/cpu.c                               | 1 +
 arch/x86/cpu/broadwell/cpu_full.c                          | 1 +
 arch/x86/cpu/broadwell/refcode.c                           | 1 +
 arch/x86/cpu/broadwell/sdram.c                             | 1 +
 arch/x86/cpu/coreboot/coreboot.c                           | 1 +
 arch/x86/cpu/coreboot/sdram.c                              | 1 +
 arch/x86/cpu/coreboot/timestamp.c                          | 1 +
 arch/x86/cpu/cpu.c                                         | 1 +
 arch/x86/cpu/efi/app.c                                     | 1 +
 arch/x86/cpu/efi/payload.c                                 | 1 +
 arch/x86/cpu/efi/sdram.c                                   | 1 +
 arch/x86/cpu/i386/cpu.c                                    | 1 +
 arch/x86/cpu/i386/interrupt.c                              | 1 +
 arch/x86/cpu/intel_common/cpu_from_spl.c                   | 1 +
 arch/x86/cpu/intel_common/mrc.c                            | 1 +
 arch/x86/cpu/ivybridge/cpu.c                               | 1 +
 arch/x86/cpu/ivybridge/ivybridge.c                         | 1 +
 arch/x86/cpu/ivybridge/sdram.c                             | 1 +
 arch/x86/cpu/ivybridge/sdram_nop.c                         | 1 +
 arch/x86/cpu/qemu/dram.c                                   | 1 +
 arch/x86/cpu/qemu/qemu.c                                   | 1 +
 arch/x86/cpu/quark/dram.c                                  | 1 +
 arch/x86/cpu/quark/mrc.c                                   | 1 +
 arch/x86/cpu/quark/mrc_util.c                              | 1 +
 arch/x86/cpu/quark/quark.c                                 | 1 +
 arch/x86/cpu/quark/smc.c                                   | 1 +
 arch/x86/cpu/queensbay/tnc.c                               | 1 +
 arch/x86/cpu/slimbootloader/sdram.c                        | 1 +
 arch/x86/cpu/slimbootloader/slimbootloader.c               | 1 +
 arch/x86/cpu/tangier/sdram.c                               | 1 +
 arch/x86/cpu/tangier/tangier.c                             | 1 +
 arch/x86/cpu/x86_64/cpu.c                                  | 1 +
 arch/x86/lib/bootm.c                                       | 1 +
 arch/x86/lib/fsp/fsp_common.c                              | 1 +
 arch/x86/lib/fsp/fsp_dram.c                                | 1 +
 arch/x86/lib/fsp1/fsp_dram.c                               | 1 +
 arch/x86/lib/fsp1/fsp_support.c                            | 1 +
 arch/x86/lib/fsp2/fsp_dram.c                               | 1 +
 arch/x86/lib/fsp2/fsp_meminit.c                            | 1 +
 arch/x86/lib/i8254.c                                       | 1 +
 arch/x86/lib/init_helpers.c                                | 1 +
 arch/x86/lib/interrupts.c                                  | 1 +
 arch/x86/lib/ramtest.c                                     | 1 +
 arch/x86/lib/spl.c                                         | 1 +
 arch/x86/lib/tpl.c                                         | 1 +
 arch/xtensa/cpu/cpu.c                                      | 1 +
 arch/xtensa/lib/bootm.c                                    | 1 +
 board/AndesTech/adp-ae3xx/adp-ae3xx.c                      | 1 +
 board/AndesTech/adp-ag101p/adp-ag101p.c                    | 1 +
 board/AndesTech/ax25-ae350/ax25-ae350.c                    | 1 +
 board/Arcturus/ucp1020/ddr.c                               | 1 +
 board/Arcturus/ucp1020/law.c                               | 1 +
 board/Arcturus/ucp1020/spl.c                               | 1 +
 board/Arcturus/ucp1020/tlb.c                               | 1 +
 board/Arcturus/ucp1020/ucp1020.c                           | 1 +
 board/BuR/brppt1/board.c                                   | 1 +
 board/BuR/brppt2/board.c                                   | 1 +
 board/BuR/brsmarc1/board.c                                 | 1 +
 board/BuR/brxre1/board.c                                   | 1 +
 board/BuR/common/bur_common.h                              | 1 +
 board/BuR/common/common.c                                  | 1 +
 board/CZ.NIC/turris_mox/turris_mox.c                       | 1 +
 board/CZ.NIC/turris_omnia/turris_omnia.c                   | 1 +
 board/CarMediaLab/flea3/flea3.c                            | 1 +
 board/LaCie/edminiv2/edminiv2.c                            | 1 +
 board/LaCie/net2big_v2/net2big_v2.c                        | 1 +
 board/LaCie/netspace_v2/netspace_v2.c                      | 1 +
 board/Marvell/aspenite/aspenite.c                          | 1 +
 board/Marvell/db-88f6281-bp/db-88f6281-bp.c                | 1 +
 board/Marvell/db-88f6720/db-88f6720.c                      | 1 +
 board/Marvell/db-88f6820-amc/db-88f6820-amc.c              | 1 +
 board/Marvell/db-88f6820-gp/db-88f6820-gp.c                | 1 +
 board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c                | 1 +
 board/Marvell/db-xc3-24g4xg/db-xc3-24g4xg.c                | 1 +
 board/Marvell/dreamplug/dreamplug.c                        | 1 +
 board/Marvell/gplugd/gplugd.c                              | 1 +
 board/Marvell/guruplug/guruplug.c                          | 1 +
 board/Marvell/mvebu_armada-37xx/board.c                    | 1 +
 board/Marvell/mvebu_armada-8k/board.c                      | 1 +
 board/Marvell/openrd/openrd.c                              | 1 +
 board/Marvell/sheevaplug/sheevaplug.c                      | 1 +
 board/Seagate/dockstar/dockstar.c                          | 1 +
 board/Seagate/goflexhome/goflexhome.c                      | 1 +
 board/Seagate/nas220/nas220.c                              | 1 +
 board/Synology/ds109/ds109.c                               | 1 +
 board/Synology/ds414/ds414.c                               | 1 +
 board/abilis/tb100/tb100.c                                 | 1 +
 board/advantech/dms-ba16/dms-ba16.c                        | 1 +
 board/advantech/imx8qm_rom7720_a1/imx8qm_rom7720_a1.c      | 1 +
 board/advantech/imx8qm_rom7720_a1/spl.c                    | 1 +
 board/advantech/som-db5800-som-6867/som-db5800-som-6867.c  | 1 +
 board/alliedtelesis/SBx81LIFKW/sbx81lifkw.c                | 1 +
 board/alliedtelesis/SBx81LIFXCAT/sbx81lifxcat.c            | 1 +
 board/alliedtelesis/x530/x530.c                            | 1 +
 board/amazon/kc1/kc1.c                                     | 1 +
 board/aristainetos/aristainetos.c                          | 1 +
 board/armadeus/apf27/apf27.c                               | 1 +
 board/armltd/integrator/integrator.c                       | 1 +
 board/armltd/vexpress/vexpress_common.c                    | 1 +
 board/armltd/vexpress64/vexpress64.c                       | 1 +
 board/atmark-techno/armadillo-800eva/armadillo-800eva.c    | 1 +
 board/atmel/at91rm9200ek/at91rm9200ek.c                    | 1 +
 board/atmel/at91sam9260ek/at91sam9260ek.c                  | 1 +
 board/atmel/at91sam9261ek/at91sam9261ek.c                  | 1 +
 board/atmel/at91sam9263ek/at91sam9263ek.c                  | 1 +
 board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c            | 1 +
 board/atmel/at91sam9n12ek/at91sam9n12ek.c                  | 1 +
 board/atmel/at91sam9rlek/at91sam9rlek.c                    | 1 +
 board/atmel/at91sam9x5ek/at91sam9x5ek.c                    | 1 +
 board/atmel/common/video_display.c                         | 1 +
 board/atmel/sam9x60ek/sam9x60ek.c                          | 1 +
 board/atmel/sama5d27_som1_ek/sama5d27_som1_ek.c            | 1 +
 board/atmel/sama5d27_wlsom1_ek/sama5d27_wlsom1_ek.c        | 1 +
 board/atmel/sama5d2_icp/sama5d2_icp.c                      | 1 +
 board/atmel/sama5d2_ptc_ek/sama5d2_ptc_ek.c                | 1 +
 board/atmel/sama5d2_xplained/sama5d2_xplained.c            | 1 +
 board/atmel/sama5d3_xplained/sama5d3_xplained.c            | 1 +
 board/atmel/sama5d3xek/sama5d3xek.c                        | 1 +
 board/atmel/sama5d4_xplained/sama5d4_xplained.c            | 1 +
 board/atmel/sama5d4ek/sama5d4ek.c                          | 1 +
 board/bachmann/ot1200/ot1200.c                             | 1 +
 board/bachmann/ot1200/ot1200_spl.c                         | 1 +
 board/barco/platinum/platinum.c                            | 1 +
 board/barco/platinum/spl_picon.c                           | 1 +
 board/barco/platinum/spl_titanium.c                        | 1 +
 board/barco/titanium/titanium.c                            | 1 +
 board/beacon/beacon-rzg2m/beacon-rzg2m.c                   | 1 +
 board/beacon/imx8mm/imx8mm_beacon.c                        | 1 +
 board/beacon/imx8mm/spl.c                                  | 1 +
 board/beckhoff/mx53cx9020/mx53cx9020.c                     | 1 +
 board/bluegiga/apx4devkit/apx4devkit.c                     | 1 +
 board/bluewater/gurnard/gurnard.c                          | 1 +
 board/bluewater/snapper9260/snapper9260.c                  | 1 +
 board/bosch/guardian/board.c                               | 1 +
 board/bosch/shc/board.c                                    | 1 +
 board/boundary/nitrogen6x/nitrogen6x.c                     | 1 +
 board/broadcom/bcm23550_w1d/bcm23550_w1d.c                 | 1 +
 board/broadcom/bcm28155_ap/bcm28155_ap.c                   | 1 +
 board/broadcom/bcm963158/bcm963158.c                       | 1 +
 board/broadcom/bcm968360bg/bcm968360bg.c                   | 1 +
 board/broadcom/bcm968580xref/bcm968580xref.c               | 1 +
 board/broadcom/bcm_ep/board.c                              | 1 +
 board/broadcom/bcmns2/northstar2.c                         | 1 +
 board/broadcom/bcmstb/bcmstb.c                             | 1 +
 board/bticino/mamoj/mamoj.c                                | 1 +
 board/bticino/mamoj/spl.c                                  | 1 +
 board/buffalo/lsxl/lsxl.c                                  | 1 +
 board/cadence/xtfpga/xtfpga.c                              | 1 +
 board/calao/usb_a9263/usb_a9263.c                          | 1 +
 board/cavium/thunderx/thunderx.c                           | 1 +
 board/ccv/xpress/spl.c                                     | 1 +
 board/ccv/xpress/xpress.c                                  | 1 +
 board/cirrus/edb93xx/edb93xx.c                             | 1 +
 board/cloudengines/pogo_e02/pogo_e02.c                     | 1 +
 board/compulab/cl-som-imx7/cl-som-imx7.c                   | 1 +
 board/compulab/cl-som-imx7/spl.c                           | 1 +
 board/compulab/cm_fx6/cm_fx6.c                             | 1 +
 board/compulab/cm_fx6/spl.c                                | 1 +
 board/compulab/cm_t335/cm_t335.c                           | 1 +
 board/compulab/cm_t43/cm_t43.c                             | 1 +
 board/congatec/cgtqmx6eval/cgtqmx6eval.c                   | 1 +
 board/congatec/conga-qeval20-qa3-e3845/conga-qeval20-qa3.c | 1 +
 board/corscience/tricorder/tricorder.c                     | 1 +
 board/cortina/presidio-asic/presidio.c                     | 1 +
 board/creative/xfi3/xfi3.c                                 | 1 +
 board/cssi/MCR3000/MCR3000.c                               | 1 +
 board/d-link/dns325/dns325.c                               | 1 +
 board/davinci/da8xxevm/da850evm.c                          | 1 +
 board/davinci/da8xxevm/omapl138_lcdk.c                     | 1 +
 board/dfi/dfi-bt700/dfi-bt700.c                            | 1 +
 board/dhelectronics/dh_imx6/dh_imx6.c                      | 1 +
 board/dhelectronics/dh_imx6/dh_imx6_spl.c                  | 1 +
 board/dhelectronics/dh_stm32mp1/board.c                    | 1 +
 board/ea/mx7ulp_com/mx7ulp_com.c                           | 1 +
 board/eets/pdu001/board.c                                  | 1 +
 board/egnite/ethernut5/ethernut5.c                         | 1 +
 board/el/el6x/el6x.c                                       | 1 +
 board/elgin/elgin_rv1108/elgin_rv1108.c                    | 1 +
 board/embest/mx6boards/mx6boards.c                         | 1 +
 board/emulation/qemu-arm/qemu-arm.c                        | 1 +
 board/emulation/qemu-riscv/qemu-riscv.c                    | 1 +
 board/engicam/common/board.c                               | 1 +
 board/engicam/common/spl.c                                 | 1 +
 board/esd/meesc/meesc.c                                    | 1 +
 board/esd/vme8349/vme8349.c                                | 1 +
 board/freescale/common/cds_pci_ft.c                        | 1 +
 board/freescale/common/p_corenet/law.c                     | 1 +
 board/freescale/common/p_corenet/pci.c                     | 1 +
 board/freescale/common/p_corenet/tlb.c                     | 1 +
 board/freescale/common/vid.c                               | 1 +
 board/freescale/corenet_ds/corenet_ds.c                    | 1 +
 board/freescale/corenet_ds/corenet_ds.h                    | 1 +
 board/freescale/corenet_ds/ddr.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/imx8mm_evk/imx8mm_evk.c                    | 1 +
 board/freescale/imx8mm_evk/spl.c                           | 1 +
 board/freescale/imx8mn_evk/imx8mn_evk.c                    | 1 +
 board/freescale/imx8mn_evk/spl.c                           | 1 +
 board/freescale/imx8mp_evk/imx8mp_evk.c                    | 1 +
 board/freescale/imx8mp_evk/spl.c                           | 1 +
 board/freescale/imx8mq_evk/imx8mq_evk.c                    | 1 +
 board/freescale/imx8mq_evk/spl.c                           | 1 +
 board/freescale/imx8qm_mek/imx8qm_mek.c                    | 1 +
 board/freescale/imx8qm_mek/spl.c                           | 1 +
 board/freescale/imx8qxp_mek/imx8qxp_mek.c                  | 1 +
 board/freescale/imx8qxp_mek/spl.c                          | 1 +
 board/freescale/imxrt1020-evk/imxrt1020-evk.c              | 1 +
 board/freescale/imxrt1050-evk/imxrt1050-evk.c              | 1 +
 board/freescale/ls1012afrdm/ls1012afrdm.c                  | 1 +
 board/freescale/ls1012aqds/ls1012aqds.c                    | 1 +
 board/freescale/ls1012ardb/ls1012ardb.c                    | 1 +
 board/freescale/ls1021aiot/ls1021aiot.c                    | 1 +
 board/freescale/ls1021aqds/ddr.c                           | 1 +
 board/freescale/ls1021aqds/eth.c                           | 1 +
 board/freescale/ls1021aqds/ls1021aqds.c                    | 1 +
 board/freescale/ls1021atsn/ls1021atsn.c                    | 1 +
 board/freescale/ls1021atwr/ls1021atwr.c                    | 1 +
 board/freescale/ls1028a/ls1028a.c                          | 1 +
 board/freescale/ls1043aqds/ddr.c                           | 1 +
 board/freescale/ls1043aqds/eth.c                           | 1 +
 board/freescale/ls1043aqds/ls1043aqds.c                    | 1 +
 board/freescale/ls1043ardb/ddr.c                           | 1 +
 board/freescale/ls1043ardb/eth.c                           | 1 +
 board/freescale/ls1043ardb/ls1043ardb.c                    | 1 +
 board/freescale/ls1046afrwy/eth.c                          | 1 +
 board/freescale/ls1046afrwy/ls1046afrwy.c                  | 1 +
 board/freescale/ls1046aqds/ddr.c                           | 1 +
 board/freescale/ls1046aqds/eth.c                           | 1 +
 board/freescale/ls1046aqds/ls1046aqds.c                    | 1 +
 board/freescale/ls1046ardb/ddr.c                           | 1 +
 board/freescale/ls1046ardb/eth.c                           | 1 +
 board/freescale/ls1046ardb/ls1046ardb.c                    | 1 +
 board/freescale/ls1088a/ddr.c                              | 1 +
 board/freescale/ls1088a/eth_ls1088aqds.c                   | 1 +
 board/freescale/ls1088a/eth_ls1088ardb.c                   | 1 +
 board/freescale/ls1088a/ls1088a.c                          | 1 +
 board/freescale/ls2080a/ddr.c                              | 1 +
 board/freescale/ls2080a/ls2080a.c                          | 1 +
 board/freescale/ls2080aqds/ddr.c                           | 1 +
 board/freescale/ls2080aqds/eth.c                           | 1 +
 board/freescale/ls2080aqds/ls2080aqds.c                    | 1 +
 board/freescale/ls2080ardb/ddr.c                           | 1 +
 board/freescale/ls2080ardb/eth_ls2080rdb.c                 | 1 +
 board/freescale/ls2080ardb/ls2080ardb.c                    | 1 +
 board/freescale/lx2160a/eth_lx2160aqds.c                   | 1 +
 board/freescale/lx2160a/eth_lx2160ardb.c                   | 1 +
 board/freescale/lx2160a/lx2160a.c                          | 1 +
 board/freescale/m5253demo/m5253demo.c                      | 1 +
 board/freescale/mpc8308rdb/mpc8308rdb.c                    | 1 +
 board/freescale/mpc8313erdb/mpc8313erdb.c                  | 1 +
 board/freescale/mpc8315erdb/mpc8315erdb.c                  | 1 +
 board/freescale/mpc8323erdb/mpc8323erdb.c                  | 1 +
 board/freescale/mpc832xemds/mpc832xemds.c                  | 1 +
 board/freescale/mpc8349emds/ddr.c                          | 1 +
 board/freescale/mpc8349emds/mpc8349emds.c                  | 1 +
 board/freescale/mpc8349itx/mpc8349itx.c                    | 1 +
 board/freescale/mpc837xemds/mpc837xemds.c                  | 1 +
 board/freescale/mpc837xemds/pci.c                          | 1 +
 board/freescale/mpc837xemds/pci.h                          | 1 +
 board/freescale/mpc837xerdb/mpc837xerdb.c                  | 1 +
 board/freescale/mpc8541cds/law.c                           | 1 +
 board/freescale/mpc8541cds/mpc8541cds.c                    | 1 +
 board/freescale/mpc8541cds/tlb.c                           | 1 +
 board/freescale/mpc8544ds/law.c                            | 1 +
 board/freescale/mpc8544ds/mpc8544ds.c                      | 1 +
 board/freescale/mpc8544ds/tlb.c                            | 1 +
 board/freescale/mpc8548cds/law.c                           | 1 +
 board/freescale/mpc8548cds/mpc8548cds.c                    | 1 +
 board/freescale/mpc8548cds/tlb.c                           | 1 +
 board/freescale/mpc8555cds/law.c                           | 1 +
 board/freescale/mpc8555cds/mpc8555cds.c                    | 1 +
 board/freescale/mpc8555cds/tlb.c                           | 1 +
 board/freescale/mpc8568mds/law.c                           | 1 +
 board/freescale/mpc8568mds/mpc8568mds.c                    | 1 +
 board/freescale/mpc8568mds/tlb.c                           | 1 +
 board/freescale/mpc8569mds/law.c                           | 1 +
 board/freescale/mpc8569mds/mpc8569mds.c                    | 1 +
 board/freescale/mpc8569mds/tlb.c                           | 1 +
 board/freescale/mpc8572ds/ddr.c                            | 1 +
 board/freescale/mpc8572ds/law.c                            | 1 +
 board/freescale/mpc8572ds/mpc8572ds.c                      | 1 +
 board/freescale/mpc8572ds/tlb.c                            | 1 +
 board/freescale/mpc8610hpcd/law.c                          | 1 +
 board/freescale/mpc8610hpcd/mpc8610hpcd.c                  | 1 +
 board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c              | 1 +
 board/freescale/mpc8641hpcn/ddr.c                          | 1 +
 board/freescale/mpc8641hpcn/law.c                          | 1 +
 board/freescale/mpc8641hpcn/mpc8641hpcn.c                  | 1 +
 board/freescale/mx23evk/mx23evk.c                          | 1 +
 board/freescale/mx25pdk/mx25pdk.c                          | 1 +
 board/freescale/mx28evk/mx28evk.c                          | 1 +
 board/freescale/mx35pdk/mx35pdk.c                          | 1 +
 board/freescale/mx51evk/mx51evk.c                          | 1 +
 board/freescale/mx53ard/mx53ard.c                          | 1 +
 board/freescale/mx53evk/mx53evk.c                          | 1 +
 board/freescale/mx53loco/mx53loco.c                        | 1 +
 board/freescale/mx53smd/mx53smd.c                          | 1 +
 board/freescale/mx6memcal/mx6memcal.c                      | 1 +
 board/freescale/mx6memcal/spl.c                            | 1 +
 board/freescale/mx6qarm2/mx6qarm2.c                        | 1 +
 board/freescale/mx6sabreauto/mx6sabreauto.c                | 1 +
 board/freescale/mx6sabresd/mx6sabresd.c                    | 1 +
 board/freescale/mx6slevk/mx6slevk.c                        | 1 +
 board/freescale/mx6sllevk/mx6sllevk.c                      | 1 +
 board/freescale/mx6sxsabreauto/mx6sxsabreauto.c            | 1 +
 board/freescale/mx6sxsabresd/mx6sxsabresd.c                | 1 +
 board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c          | 1 +
 board/freescale/mx6ullevk/mx6ullevk.c                      | 1 +
 board/freescale/mx7dsabresd/mx7dsabresd.c                  | 1 +
 board/freescale/mx7ulp_evk/mx7ulp_evk.c                    | 1 +
 board/freescale/p1010rdb/ddr.c                             | 1 +
 board/freescale/p1010rdb/law.c                             | 1 +
 board/freescale/p1010rdb/p1010rdb.c                        | 1 +
 board/freescale/p1010rdb/spl.c                             | 1 +
 board/freescale/p1010rdb/tlb.c                             | 1 +
 board/freescale/p1023rdb/law.c                             | 1 +
 board/freescale/p1023rdb/p1023rdb.c                        | 1 +
 board/freescale/p1023rdb/tlb.c                             | 1 +
 board/freescale/p1_p2_rdb_pc/ddr.c                         | 1 +
 board/freescale/p1_p2_rdb_pc/law.c                         | 1 +
 board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c                | 1 +
 board/freescale/p1_p2_rdb_pc/spl.c                         | 1 +
 board/freescale/p1_p2_rdb_pc/tlb.c                         | 1 +
 board/freescale/p2041rdb/ddr.c                             | 1 +
 board/freescale/p2041rdb/eth.c                             | 1 +
 board/freescale/p2041rdb/p2041rdb.c                        | 1 +
 board/freescale/qemu-ppce500/qemu-ppce500.c                | 1 +
 board/freescale/s32v234evb/s32v234evb.c                    | 1 +
 board/freescale/t102xrdb/ddr.c                             | 1 +
 board/freescale/t102xrdb/eth_t102xrdb.c                    | 1 +
 board/freescale/t102xrdb/law.c                             | 1 +
 board/freescale/t102xrdb/pci.c                             | 1 +
 board/freescale/t102xrdb/spl.c                             | 1 +
 board/freescale/t102xrdb/t102xrdb.c                        | 1 +
 board/freescale/t102xrdb/t102xrdb.h                        | 1 +
 board/freescale/t102xrdb/tlb.c                             | 1 +
 board/freescale/t104xrdb/ddr.c                             | 1 +
 board/freescale/t104xrdb/diu.c                             | 1 +
 board/freescale/t104xrdb/eth.c                             | 1 +
 board/freescale/t104xrdb/law.c                             | 1 +
 board/freescale/t104xrdb/pci.c                             | 1 +
 board/freescale/t104xrdb/spl.c                             | 1 +
 board/freescale/t104xrdb/t104xrdb.c                        | 1 +
 board/freescale/t104xrdb/t104xrdb.h                        | 1 +
 board/freescale/t104xrdb/tlb.c                             | 1 +
 board/freescale/t208xqds/ddr.c                             | 1 +
 board/freescale/t208xqds/eth_t208xqds.c                    | 1 +
 board/freescale/t208xqds/law.c                             | 1 +
 board/freescale/t208xqds/pci.c                             | 1 +
 board/freescale/t208xqds/spl.c                             | 1 +
 board/freescale/t208xqds/t208xqds.c                        | 1 +
 board/freescale/t208xqds/t208xqds.h                        | 1 +
 board/freescale/t208xqds/tlb.c                             | 1 +
 board/freescale/t208xrdb/cpld.c                            | 1 +
 board/freescale/t208xrdb/ddr.c                             | 1 +
 board/freescale/t208xrdb/eth_t208xrdb.c                    | 1 +
 board/freescale/t208xrdb/law.c                             | 1 +
 board/freescale/t208xrdb/pci.c                             | 1 +
 board/freescale/t208xrdb/spl.c                             | 1 +
 board/freescale/t208xrdb/t208xrdb.c                        | 1 +
 board/freescale/t208xrdb/t208xrdb.h                        | 1 +
 board/freescale/t208xrdb/tlb.c                             | 1 +
 board/freescale/t4rdb/ddr.c                                | 1 +
 board/freescale/t4rdb/eth.c                                | 1 +
 board/freescale/t4rdb/law.c                                | 1 +
 board/freescale/t4rdb/pci.c                                | 1 +
 board/freescale/t4rdb/spl.c                                | 1 +
 board/freescale/t4rdb/t4240rdb.c                           | 1 +
 board/freescale/t4rdb/t4rdb.h                              | 1 +
 board/freescale/t4rdb/tlb.c                                | 1 +
 board/freescale/vf610twr/vf610twr.c                        | 1 +
 board/gardena/smart-gateway-at91sam/board.c                | 1 +
 board/gateworks/gw_ventana/common.c                        | 1 +
 board/gateworks/gw_ventana/gw_ventana.c                    | 1 +
 board/gateworks/gw_ventana/gw_ventana_spl.c                | 1 +
 board/gdsys/a38x/controlcenterdc.c                         | 1 +
 board/gdsys/common/ioep-fpga.c                             | 2 +-
 board/gdsys/mpc8308/gazerbeam.c                            | 1 +
 board/gdsys/mpc8308/hrcon.c                                | 1 +
 board/gdsys/mpc8308/strider.c                              | 1 +
 board/gdsys/p1022/controlcenterd.c                         | 1 +
 board/gdsys/p1022/diu.c                                    | 1 +
 board/gdsys/p1022/law.c                                    | 1 +
 board/gdsys/p1022/tlb.c                                    | 1 +
 board/ge/bx50v3/bx50v3.c                                   | 1 +
 board/ge/mx53ppd/mx53ppd.c                                 | 1 +
 board/google/chromebook_coral/coral.c                      | 1 +
 board/google/imx8mq_phanbell/imx8mq_phanbell.c             | 1 +
 board/google/imx8mq_phanbell/spl.c                         | 1 +
 board/grinn/chiliboard/board.c                             | 1 +
 board/grinn/liteboard/board.c                              | 1 +
 board/highbank/highbank.c                                  | 1 +
 board/hisilicon/hikey/hikey.c                              | 1 +
 board/hisilicon/hikey960/hikey960.c                        | 1 +
 board/hisilicon/poplar/poplar.c                            | 1 +
 board/ids/ids8313/ids8313.c                                | 1 +
 board/imgtec/boston/ddr.c                                  | 1 +
 board/imgtec/boston/dt.c                                   | 1 +
 board/imgtec/ci20/ci20.c                                   | 1 +
 board/imgtec/malta/malta.c                                 | 1 +
 board/inversepath/usbarmory/usbarmory.c                    | 1 +
 board/iomega/iconnect/iconnect.c                           | 1 +
 board/isee/igep003x/board.c                                | 1 +
 board/isee/igep00x0/common.c                               | 1 +
 board/isee/igep00x0/igep00x0.c                             | 1 +
 board/k+p/kp_imx53/kp_imx53.c                              | 1 +
 board/k+p/kp_imx6q_tpc/kp_imx6q_tpc.c                      | 1 +
 board/k+p/kp_imx6q_tpc/kp_imx6q_tpc_spl.c                  | 1 +
 board/keymile/common/common.c                              | 1 +
 board/keymile/common/qrio.c                                | 1 +
 board/keymile/km83xx/km83xx.c                              | 1 +
 board/keymile/km83xx/km83xx_i2c.c                          | 1 +
 board/keymile/km_arm/km_arm.c                              | 1 +
 board/keymile/kmp204x/eth.c                                | 1 +
 board/keymile/kmp204x/kmp204x.c                            | 1 +
 board/keymile/kmp204x/kmp204x.h                            | 1 +
 board/keymile/kmp204x/law.c                                | 1 +
 board/keymile/kmp204x/pci.c                                | 1 +
 board/keymile/kmp204x/tlb.c                                | 1 +
 board/kmc/kzm9g/kzm9g.c                                    | 1 +
 board/kobol/helios4/helios4.c                              | 1 +
 board/kosagi/novena/novena.c                               | 1 +
 board/kosagi/novena/novena_spl.c                           | 1 +
 board/l+g/vinco/vinco.c                                    | 1 +
 board/laird/wb45n/wb45n.c                                  | 1 +
 board/laird/wb50n/wb50n.c                                  | 1 +
 board/lego/ev3/legoev3.c                                   | 1 +
 board/lg/sniper/sniper.c                                   | 1 +
 board/liebherr/display5/display5.c                         | 1 +
 board/liebherr/display5/spl.c                              | 1 +
 board/liebherr/mccmon6/mccmon6.c                           | 1 +
 board/liebherr/mccmon6/spl.c                               | 1 +
 board/liebherr/xea/xea.c                                   | 1 +
 board/logicpd/am3517evm/am3517evm.c                        | 1 +
 board/logicpd/imx6/imx6logic.c                             | 1 +
 board/logicpd/omap3som/omap3logic.c                        | 1 +
 board/maxbcm/maxbcm.c                                      | 1 +
 board/mediatek/mt7622/mt7622_rfb.c                         | 1 +
 board/mediatek/mt7623/mt7623_rfb.c                         | 1 +
 board/mediatek/mt7629/mt7629_rfb.c                         | 1 +
 board/mediatek/mt8512/mt8512.c                             | 1 +
 board/mediatek/mt8518/mt8518_ap1.c                         | 1 +
 board/mediatek/pumpkin/pumpkin.c                           | 1 +
 board/menlo/m53menlo/m53menlo.c                            | 1 +
 board/microchip/mpfs_icicle/mpfs_icicle.c                  | 1 +
 board/mikrotik/crs3xx-98dx3236/crs3xx-98dx3236.c           | 1 +
 board/mini-box/picosam9g45/picosam9g45.c                   | 1 +
 board/mpc8308_p1m/mpc8308_p1m.c                            | 1 +
 board/mscc/jr2/jr2.c                                       | 1 +
 board/mscc/luton/luton.c                                   | 1 +
 board/mscc/ocelot/ocelot.c                                 | 1 +
 board/mscc/serval/serval.c                                 | 1 +
 board/mscc/servalt/servalt.c                               | 1 +
 board/nokia/rx51/rx51.c                                    | 1 +
 board/novtech/meerkat96/meerkat96.c                        | 1 +
 board/nvidia/p2371-2180/p2371-2180.c                       | 1 +
 board/nvidia/p2771-0000/p2771-0000.c                       | 1 +
 board/nvidia/p3450-0000/p3450-0000.c                       | 1 +
 board/olimex/mx23_olinuxino/mx23_olinuxino.c               | 1 +
 board/phytec/pcl063/pcl063.c                               | 1 +
 board/phytec/pcl063/spl.c                                  | 1 +
 board/phytec/pcm052/pcm052.c                               | 1 +
 board/phytec/pcm058/pcm058.c                               | 1 +
 board/phytec/pfla02/pfla02.c                               | 1 +
 board/phytec/phycore_am335x_r2/board.c                     | 1 +
 board/phytium/durian/durian.c                              | 1 +
 board/ppcag/bg0900/bg0900.c                                | 1 +
 board/qemu-mips/qemu-mips.c                                | 1 +
 board/qualcomm/dragonboard410c/dragonboard410c.c           | 1 +
 board/qualcomm/dragonboard820c/dragonboard820c.c           | 1 +
 board/raidsonic/ib62x0/ib62x0.c                            | 1 +
 board/raspberrypi/rpi/rpi.c                                | 1 +
 board/renesas/MigoR/migo_r.c                               | 1 +
 board/renesas/alt/alt.c                                    | 1 +
 board/renesas/blanche/blanche.c                            | 1 +
 board/renesas/condor/condor.c                              | 1 +
 board/renesas/draak/draak.c                                | 1 +
 board/renesas/eagle/eagle.c                                | 1 +
 board/renesas/ebisu/ebisu.c                                | 1 +
 board/renesas/gose/gose.c                                  | 1 +
 board/renesas/grpeach/grpeach.c                            | 1 +
 board/renesas/koelsch/koelsch.c                            | 1 +
 board/renesas/lager/lager.c                                | 1 +
 board/renesas/porter/porter.c                              | 1 +
 board/renesas/r2dplus/r2dplus.c                            | 1 +
 board/renesas/r7780mp/r7780mp.c                            | 1 +
 board/renesas/rcar-common/common.c                         | 1 +
 board/renesas/rcar-common/gen3-spl.c                       | 1 +
 board/renesas/salvator-x/salvator-x.c                      | 1 +
 board/renesas/sh7752evb/sh7752evb.c                        | 1 +
 board/renesas/sh7753evb/sh7753evb.c                        | 1 +
 board/renesas/sh7757lcr/sh7757lcr.c                        | 1 +
 board/renesas/sh7763rdp/sh7763rdp.c                        | 1 +
 board/renesas/silk/silk.c                                  | 1 +
 board/renesas/stout/stout.c                                | 1 +
 board/renesas/ulcb/ulcb.c                                  | 1 +
 board/ronetix/pm9261/pm9261.c                              | 1 +
 board/ronetix/pm9263/pm9263.c                              | 1 +
 board/ronetix/pm9g45/pm9g45.c                              | 1 +
 board/samsung/arndale/arndale.c                            | 1 +
 board/samsung/common/board.c                               | 1 +
 board/samsung/goni/goni.c                                  | 1 +
 board/samsung/smdkc100/smdkc100.c                          | 1 +
 board/samsung/smdkv310/smdkv310.c                          | 1 +
 board/samsung/universal_c210/universal.c                   | 1 +
 board/sandbox/sandbox.c                                    | 1 +
 board/sandisk/sansa_fuze_plus/sfp.c                        | 1 +
 board/sbc8349/sbc8349.c                                    | 1 +
 board/sbc8548/law.c                                        | 1 +
 board/sbc8548/sbc8548.c                                    | 1 +
 board/sbc8548/tlb.c                                        | 1 +
 board/sbc8641d/law.c                                       | 1 +
 board/sbc8641d/sbc8641d.c                                  | 1 +
 board/schulercontrol/sc_sps_1/sc_sps_1.c                   | 1 +
 board/seco/mx6quq7/mx6quq7.c                               | 1 +
 board/siemens/capricorn/board.c                            | 1 +
 board/siemens/capricorn/spl.c                              | 1 +
 board/siemens/common/board.c                               | 1 +
 board/siemens/corvus/board.c                               | 1 +
 board/siemens/draco/board.c                                | 1 +
 board/siemens/pxm2/board.c                                 | 1 +
 board/siemens/rut/board.c                                  | 1 +
 board/siemens/smartweb/smartweb.c                          | 1 +
 board/siemens/taurus/taurus.c                              | 1 +
 board/sifive/fu540/fu540.c                                 | 1 +
 board/sipeed/maix/maix.c                                   | 1 +
 board/sks-kinkel/sksimx6/sksimx6.c                         | 1 +
 board/socrates/law.c                                       | 1 +
 board/socrates/socrates.c                                  | 1 +
 board/socrates/tlb.c                                       | 1 +
 board/softing/vining_2000/vining_2000.c                    | 1 +
 board/softing/vining_fpga/socfpga.c                        | 1 +
 board/solidrun/clearfog/clearfog.c                         | 1 +
 board/solidrun/mx6cuboxi/mx6cuboxi.c                       | 1 +
 board/somlabs/visionsom-6ull/visionsom-6ull.c              | 1 +
 board/spear/spear300/spear300.c                            | 1 +
 board/spear/spear310/spear310.c                            | 1 +
 board/spear/spear320/spear320.c                            | 1 +
 board/spear/spear600/spear600.c                            | 1 +
 board/spear/x600/x600.c                                    | 1 +
 board/st/stih410-b2260/board.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/stm32f746-disco/stm32f746-disco.c                 | 1 +
 board/st/stm32h743-disco/stm32h743-disco.c                 | 1 +
 board/st/stm32h743-eval/stm32h743-eval.c                   | 1 +
 board/st/stm32mp1/stm32mp1.c                               | 1 +
 board/st/stv0991/stv0991.c                                 | 1 +
 board/ste/stemmy/stemmy.c                                  | 1 +
 board/sunxi/board.c                                        | 1 +
 board/syteco/zmx25/zmx25.c                                 | 1 +
 board/tbs/tbs2910/tbs2910.c                                | 1 +
 board/tcl/sl50/board.c                                     | 1 +
 board/technexion/pico-imx6/pico-imx6.c                     | 1 +
 board/technexion/pico-imx6/spl.c                           | 1 +
 board/technexion/pico-imx6ul/pico-imx6ul.c                 | 1 +
 board/technexion/pico-imx6ul/spl.c                         | 1 +
 board/technexion/pico-imx7d/pico-imx7d.c                   | 1 +
 board/technexion/pico-imx7d/spl.c                          | 1 +
 board/technexion/pico-imx8mq/pico-imx8mq.c                 | 1 +
 board/technexion/pico-imx8mq/spl.c                         | 1 +
 board/technexion/tao3530/tao3530.c                         | 1 +
 board/technologic/ts4600/ts4600.c                          | 1 +
 board/technologic/ts4800/ts4800.c                          | 1 +
 board/theadorable/theadorable.c                            | 1 +
 board/ti/am335x/board.c                                    | 1 +
 board/ti/am3517crane/am3517crane.c                         | 1 +
 board/ti/am43xx/board.c                                    | 1 +
 board/ti/am57xx/board.c                                    | 1 +
 board/ti/am65x/evm.c                                       | 1 +
 board/ti/beagle/beagle.c                                   | 1 +
 board/ti/dra7xx/evm.c                                      | 1 +
 board/ti/evm/evm.c                                         | 1 +
 board/ti/j721e/evm.c                                       | 1 +
 board/ti/ks2_evm/board.c                                   | 1 +
 board/ti/ks2_evm/board_k2g.c                               | 1 +
 board/ti/omap5_uevm/evm.c                                  | 1 +
 board/ti/panda/panda.c                                     | 1 +
 board/ti/sdp4430/sdp.c                                     | 1 +
 board/ti/ti816x/evm.c                                      | 1 +
 board/timll/devkit3250/devkit3250.c                        | 1 +
 board/timll/devkit8000/devkit8000.c                        | 1 +
 board/toradex/apalis-imx8/apalis-imx8.c                    | 1 +
 board/toradex/apalis-tk1/apalis-tk1.c                      | 1 +
 board/toradex/apalis_imx6/apalis_imx6.c                    | 1 +
 board/toradex/apalis_t30/apalis_t30.c                      | 1 +
 board/toradex/colibri-imx6ull/colibri-imx6ull.c            | 1 +
 board/toradex/colibri-imx8x/colibri-imx8x.c                | 1 +
 board/toradex/colibri_imx6/colibri_imx6.c                  | 1 +
 board/toradex/colibri_imx7/colibri_imx7.c                  | 1 +
 board/toradex/colibri_pxa270/colibri_pxa270.c              | 1 +
 board/toradex/colibri_t20/colibri_t20.c                    | 1 +
 board/toradex/colibri_t30/colibri_t30.c                    | 1 +
 board/toradex/colibri_vf/colibri_vf.c                      | 1 +
 board/toradex/common/tdx-common.c                          | 1 +
 board/toradex/common/tdx-common.h                          | 1 +
 board/toradex/verdin-imx8mm/spl.c                          | 1 +
 board/toradex/verdin-imx8mm/verdin-imx8mm.c                | 1 +
 board/tqc/tqm834x/tqm834x.c                                | 1 +
 board/tqc/tqma6/tqma6.c                                    | 1 +
 board/tqc/tqma6/tqma6_bb.h                                 | 1 +
 board/tqc/tqma6/tqma6_mba6.c                               | 1 +
 board/tqc/tqma6/tqma6_wru4.c                               | 1 +
 board/udoo/neo/neo.c                                       | 1 +
 board/udoo/udoo.c                                          | 1 +
 board/udoo/udoo_spl.c                                      | 1 +
 board/variscite/dart_6ul/dart_6ul.c                        | 1 +
 board/variscite/dart_6ul/spl.c                             | 1 +
 board/varisys/cyrus/cyrus.c                                | 1 +
 board/varisys/cyrus/cyrus.h                                | 1 +
 board/varisys/cyrus/ddr.c                                  | 1 +
 board/varisys/cyrus/eth.c                                  | 1 +
 board/varisys/cyrus/law.c                                  | 1 +
 board/varisys/cyrus/pci.c                                  | 1 +
 board/varisys/cyrus/tlb.c                                  | 1 +
 board/ve8313/ve8313.c                                      | 1 +
 board/vscom/baltos/board.c                                 | 1 +
 board/wandboard/spl.c                                      | 1 +
 board/wandboard/wandboard.c                                | 1 +
 board/warp/warp.c                                          | 1 +
 board/warp7/warp7.c                                        | 1 +
 board/work-microwave/work_92105/work_92105.c               | 1 +
 board/xes/common/fsl_8xxx_clk.c                            | 1 +
 board/xes/common/fsl_8xxx_misc.c                           | 1 +
 board/xes/common/fsl_8xxx_pci.c                            | 1 +
 board/xes/xpedite517x/ddr.c                                | 1 +
 board/xes/xpedite517x/law.c                                | 1 +
 board/xes/xpedite517x/xpedite517x.c                        | 1 +
 board/xes/xpedite520x/law.c                                | 1 +
 board/xes/xpedite520x/tlb.c                                | 1 +
 board/xes/xpedite520x/xpedite520x.c                        | 1 +
 board/xes/xpedite537x/ddr.c                                | 1 +
 board/xes/xpedite537x/law.c                                | 1 +
 board/xes/xpedite537x/tlb.c                                | 1 +
 board/xes/xpedite537x/xpedite537x.c                        | 1 +
 board/xes/xpedite550x/ddr.c                                | 1 +
 board/xes/xpedite550x/law.c                                | 1 +
 board/xes/xpedite550x/tlb.c                                | 1 +
 board/xes/xpedite550x/xpedite550x.c                        | 1 +
 board/xilinx/versal/board.c                                | 1 +
 board/xilinx/zynq/board.c                                  | 1 +
 board/xilinx/zynq/cmds.c                                   | 1 +
 board/xilinx/zynqmp/zynqmp.c                               | 1 +
 board/xilinx/zynqmp_r5/board.c                             | 1 +
 board/zyxel/nsa310s/nsa310s.c                              | 1 +
 cmd/bdinfo.c                                               | 1 +
 cmd/bedbug.c                                               | 1 +
 cmd/bootefi.c                                              | 1 +
 cmd/bootm.c                                                | 1 +
 cmd/bootz.c                                                | 1 +
 cmd/mmc.c                                                  | 1 +
 cmd/reginfo.c                                              | 1 +
 cmd/spl.c                                                  | 1 +
 common/board_f.c                                           | 1 +
 common/board_r.c                                           | 1 +
 common/bootm.c                                             | 1 +
 common/bootm_os.c                                          | 1 +
 common/image.c                                             | 1 +
 common/init/handoff.c                                      | 1 +
 drivers/ata/fsl_sata.c                                     | 1 +
 drivers/bootcount/bootcount_ram.c                          | 1 +
 drivers/cpu/mpc83xx_cpu.c                                  | 1 +
 drivers/ddr/altera/sdram_agilex.c                          | 1 +
 drivers/ddr/altera/sdram_s10.c                             | 1 +
 drivers/ddr/altera/sdram_soc64.c                           | 1 +
 drivers/ddr/fsl/arm_ddr_gen3.c                             | 1 +
 drivers/ddr/fsl/ctrl_regs.c                                | 1 +
 drivers/ddr/fsl/fsl_ddr_gen4.c                             | 1 +
 drivers/ddr/fsl/mpc85xx_ddr_gen1.c                         | 1 +
 drivers/ddr/fsl/mpc85xx_ddr_gen2.c                         | 1 +
 drivers/ddr/fsl/mpc85xx_ddr_gen3.c                         | 1 +
 drivers/ddr/fsl/options.c                                  | 1 +
 drivers/ddr/fsl/util.c                                     | 1 +
 drivers/dma/fsl_dma.c                                      | 1 +
 drivers/firmware/psci.c                                    | 1 +
 drivers/i2c/fsl_i2c.c                                      | 1 +
 drivers/input/i8042.c                                      | 1 +
 drivers/misc/fsl_ifc.c                                     | 1 +
 drivers/misc/fsl_portals.c                                 | 1 +
 drivers/misc/fsl_sec_mon.c                                 | 1 +
 drivers/mmc/davinci_mmc.c                                  | 1 +
 drivers/mmc/dw_mmc.c                                       | 1 +
 drivers/mmc/fsl_esdhc.c                                    | 1 +
 drivers/mmc/fsl_esdhc_imx.c                                | 1 +
 drivers/mmc/mmc.c                                          | 1 +
 drivers/mmc/mvebu_mmc.c                                    | 1 +
 drivers/mmc/mxcmmc.c                                       | 1 +
 drivers/mmc/mxsmmc.c                                       | 1 +
 drivers/mtd/altera_qspi.c                                  | 1 +
 drivers/mtd/cfi_flash.c                                    | 1 +
 drivers/mtd/nand/raw/nand_bbt.c                            | 1 +
 drivers/mtd/onenand/onenand_bbt.c                          | 1 +
 drivers/mtd/renesas_rpc_hf.c                               | 1 +
 drivers/net/ag7xxx.c                                       | 1 +
 drivers/net/armada100_fec.c                                | 1 +
 drivers/net/at91_emac.c                                    | 1 +
 drivers/net/ax88180.c                                      | 1 +
 drivers/net/bcm-sf2-eth.c                                  | 1 +
 drivers/net/calxedaxgmac.c                                 | 1 +
 drivers/net/dc2114x.c                                      | 1 +
 drivers/net/designware.c                                   | 1 +
 drivers/net/dm9000x.c                                      | 1 +
 drivers/net/dnet.c                                         | 1 +
 drivers/net/e1000.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/fec_mxc.h                                      | 1 +
 drivers/net/fm/eth.c                                       | 1 +
 drivers/net/fm/init.c                                      | 1 +
 drivers/net/fm/memac_phy.c                                 | 1 +
 drivers/net/fm/tgec_phy.c                                  | 1 +
 drivers/net/fsl-mc/dpio/qbman_private.h                    | 1 +
 drivers/net/fsl-mc/mc.c                                    | 1 +
 drivers/net/fsl_mcdmafec.c                                 | 1 +
 drivers/net/fsl_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/lpc32xx_eth.c                                  | 1 +
 drivers/net/macb.c                                         | 1 +
 drivers/net/mcffec.c                                       | 1 +
 drivers/net/mpc8xx_fec.c                                   | 1 +
 drivers/net/mvgbe.c                                        | 1 +
 drivers/net/natsemi.c                                      | 1 +
 drivers/net/ne2000_base.c                                  | 1 +
 drivers/net/ns8382x.c                                      | 1 +
 drivers/net/pcnet.c                                        | 1 +
 drivers/net/pfe_eth/pfe_driver.c                           | 1 +
 drivers/net/rtl8139.c                                      | 1 +
 drivers/net/rtl8169.c                                      | 1 +
 drivers/net/sh_eth.c                                       | 1 +
 drivers/net/smc91111.c                                     | 1 +
 drivers/net/smc911x.c                                      | 1 +
 drivers/net/ti/cpsw.c                                      | 1 +
 drivers/net/tsec.c                                         | 1 +
 drivers/net/uli526x.c                                      | 1 +
 drivers/net/vsc9953.c                                      | 1 +
 drivers/pci/pci-emul-uclass.c                              | 1 +
 drivers/pci/pci-uclass.c                                   | 1 +
 drivers/pci/pcie_layerscape.c                              | 1 +
 drivers/pci/pcie_layerscape_ep.c                           | 1 +
 drivers/pci/pcie_layerscape_fixup.c                        | 1 +
 drivers/pci/pcie_layerscape_fixup_common.c                 | 1 +
 drivers/pci/pcie_layerscape_fixup_common.h                 | 1 +
 drivers/pci/pcie_layerscape_gen4_fixup.c                   | 1 +
 drivers/pci/pcie_layerscape_rc.c                           | 1 +
 drivers/qe/uec.c                                           | 1 +
 drivers/rtc/ds174x.c                                       | 1 +
 drivers/rtc/mc146818.c                                     | 1 +
 drivers/rtc/mk48t59.c                                      | 1 +
 drivers/spi/fsl_espi.c                                     | 1 +
 drivers/sysreset/sysreset_sandbox.c                        | 1 +
 drivers/timer/mpc83xx_timer.c                              | 1 +
 drivers/timer/tsc_timer.c                                  | 1 +
 drivers/usb/common/fsl-dt-fixup.c                          | 1 +
 drivers/usb/common/fsl-errata.c                            | 1 +
 drivers/usb/eth/asix.c                                     | 1 +
 drivers/usb/eth/asix88179.c                                | 1 +
 drivers/usb/eth/mcs7830.c                                  | 1 +
 drivers/usb/eth/r8152.c                                    | 1 +
 drivers/usb/eth/smsc95xx.c                                 | 1 +
 drivers/usb/gadget/ether.c                                 | 1 +
 drivers/usb/host/ehci-marvell.c                            | 1 +
 drivers/video/cfb_console.c                                | 1 +
 drivers/video/fsl_dcu_fb.c                                 | 1 +
 drivers/video/fsl_diu_fb.c                                 | 1 +
 drivers/video/meson/meson_vpu.c                            | 1 +
 drivers/video/sunxi/sunxi_de2.c                            | 1 +
 drivers/video/sunxi/sunxi_display.c                        | 1 +
 include/asm-generic/global_data.h                          | 1 +
 include/asm-generic/u-boot.h                               | 1 +
 include/button.h                                           | 2 ++
 include/clock_legacy.h                                     | 1 +
 include/common.h                                           | 1 -
 include/fdtdec.h                                           | 1 +
 include/fm_eth.h                                           | 1 +
 include/fsl-mc/fsl_mc.h                                    | 1 +
 include/fsl_ddr_sdram.h                                    | 1 +
 include/fsl_errata.h                                       | 1 +
 include/fsl_esdhc.h                                        | 1 +
 include/fsl_esdhc_imx.h                                    | 1 +
 include/fsl_mdio.h                                         | 1 +
 include/mmc.h                                              | 1 +
 include/mvebu_mmc.h                                        | 1 +
 include/net.h                                              | 1 +
 include/net/pfe_eth/pfe_eth.h                              | 1 +
 include/netdev.h                                           | 1 +
 include/post.h                                             | 3 +++
 include/tsec.h                                             | 1 +
 include/vsc9953.h                                          | 1 +
 lib/asm-offsets.c                                          | 1 +
 lib/efi_loader/efi_boottime.c                              | 1 +
 lib/efi_loader/efi_memory.c                                | 1 +
 lib/fdtdec.c                                               | 1 +
 lib/lmb.c                                                  | 1 +
 net/eth_legacy.c                                           | 1 +
 post/cpu/mpc83xx/ecc.c                                     | 1 +
 post/drivers/memory.c                                      | 1 +
 test/dm/pci.c                                              | 1 +
 1088 files changed, 1095 insertions(+), 6 deletions(-)

diff --git a/arch/arc/lib/bootm.c b/arch/arc/lib/bootm.c
index 8a8d394a5f0..60c6fe9d55b 100644
--- a/arch/arc/lib/bootm.c
+++ b/arch/arc/lib/bootm.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arc/lib/cpu.c b/arch/arc/lib/cpu.c
index 8b83822fac8..6926c6eb44c 100644
--- a/arch/arc/lib/cpu.c
+++ b/arch/arc/lib/cpu.c
@@ -10,6 +10,7 @@
 #include <asm/arcregs.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arc/lib/interrupts.c b/arch/arc/lib/interrupts.c
index db21fbb1142..acc6792ea7a 100644
--- a/arch/arc/lib/interrupts.c
+++ b/arch/arc/lib/interrupts.c
@@ -7,6 +7,7 @@
 #include <irq_func.h>
 #include <asm/arcregs.h>
 #include <asm/ptrace.h>
+#include <asm/u-boot.h>
 
 /* Bit values in STATUS32 */
 #define E1_MASK		(1 << 1)	/* Level 1 interrupts enable */
diff --git a/arch/arm/cpu/arm1136/mx35/generic.c b/arch/arm/cpu/arm1136/mx35/generic.c
index 99e7ec0744f..b0dccac64b6 100644
--- a/arch/arm/cpu/arm1136/mx35/generic.c
+++ b/arch/arm/cpu/arm1136/mx35/generic.c
@@ -14,6 +14,7 @@
 #include <net.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/crm_regs.h>
diff --git a/arch/arm/cpu/arm720t/cpu.c b/arch/arm/cpu/arm720t/cpu.c
index ece09c83a4a..3deb2eb6298 100644
--- a/arch/arm/cpu/arm720t/cpu.c
+++ b/arch/arm/cpu/arm720t/cpu.c
@@ -9,6 +9,8 @@
  * Alex Zuepke <azu@sysgo.de>
  */
 
+#include <asm/u-boot.h>
+
 /*
  * cleanup_before_linux() - Prepare the CPU to jump to Linux
  *
diff --git a/arch/arm/cpu/arm926ejs/armada100/cpu.c b/arch/arm/cpu/arm926ejs/armada100/cpu.c
index 96726b3144e..e271ae473f4 100644
--- a/arch/arm/cpu/arm926ejs/armada100/cpu.c
+++ b/arch/arm/cpu/arm926ejs/armada100/cpu.c
@@ -11,6 +11,7 @@
 #include <init.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/armada100.h>
+#include <asm/u-boot.h>
 
 #define UARTCLK14745KHZ	(APBC_APBCLK | APBC_FNCLK | APBC_FNCLKSEL(1))
 #define SET_MRVL_ID	(1<<8)
diff --git a/arch/arm/cpu/arm926ejs/armada100/dram.c b/arch/arm/cpu/arm926ejs/armada100/dram.c
index c97b5b1940a..966bdc67ea6 100644
--- a/arch/arm/cpu/arm926ejs/armada100/dram.c
+++ b/arch/arm/cpu/arm926ejs/armada100/dram.c
@@ -11,6 +11,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/armada100.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/cpu/arm926ejs/mx25/generic.c b/arch/arm/cpu/arm926ejs/mx25/generic.c
index 9cd60abcccb..5b745880b9c 100644
--- a/arch/arm/cpu/arm926ejs/mx25/generic.c
+++ b/arch/arm/cpu/arm926ejs/mx25/generic.c
@@ -20,6 +20,7 @@
 #include <asm/arch-imx/cpu.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/clock.h>
+#include <asm/u-boot.h>
 
 #ifdef CONFIG_FSL_ESDHC_IMX
 #include <fsl_esdhc_imx.h>
diff --git a/arch/arm/cpu/arm926ejs/mx27/generic.c b/arch/arm/cpu/arm926ejs/mx27/generic.c
index 8b9d3a272af..0c804b8bad2 100644
--- a/arch/arm/cpu/arm926ejs/mx27/generic.c
+++ b/arch/arm/cpu/arm926ejs/mx27/generic.c
@@ -17,6 +17,7 @@
 #ifdef CONFIG_MMC_MXC
 #include <asm/arch/mxcmmc.h>
 #endif
+#include <asm/u-boot.h>
 
 /*
  *  get the system pll clock in Hz
diff --git a/arch/arm/cpu/arm926ejs/mxs/mxs.c b/arch/arm/cpu/arm926ejs/mxs/mxs.c
index 91ea4f02d02..8d5a3d75053 100644
--- a/arch/arm/cpu/arm926ejs/mxs/mxs.c
+++ b/arch/arm/cpu/arm926ejs/mxs/mxs.c
@@ -16,6 +16,7 @@
 #include <init.h>
 #include <net.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/io.h>
diff --git a/arch/arm/cpu/arm926ejs/mxs/spl_boot.c b/arch/arm/cpu/arm926ejs/mxs/spl_boot.c
index 35f503f93b0..f24378305fc 100644
--- a/arch/arm/cpu/arm926ejs/mxs/spl_boot.c
+++ b/arch/arm/cpu/arm926ejs/mxs/spl_boot.c
@@ -16,6 +16,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/gpio.h>
+#include <asm/u-boot.h>
 #include <linux/compiler.h>
 #include <linux/string.h>
 
diff --git a/arch/arm/cpu/arm926ejs/spear/cpu.c b/arch/arm/cpu/arm926ejs/spear/cpu.c
index 93fd7a6d8df..e181fe65d13 100644
--- a/arch/arm/cpu/arm926ejs/spear/cpu.c
+++ b/arch/arm/cpu/arm926ejs/spear/cpu.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/spr_misc.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 
 int arch_cpu_init(void)
diff --git a/arch/arm/cpu/arm926ejs/spear/spl.c b/arch/arm/cpu/arm926ejs/spear/spl.c
index 08b98a2d068..2ef53110ebc 100644
--- a/arch/arm/cpu/arm926ejs/spear/spl.c
+++ b/arch/arm/cpu/arm926ejs/spear/spl.c
@@ -16,6 +16,7 @@
 #include <asm/arch/spr_defs.h>
 #include <asm/arch/spr_misc.h>
 #include <asm/arch/spr_syscntl.h>
+#include <asm/u-boot.h>
 #include <linux/mtd/st_smi.h>
 
 /* Reserve some space to store the BootROM's stack pointer during SPL operation.
diff --git a/arch/arm/cpu/arm926ejs/spear/spr_misc.c b/arch/arm/cpu/arm926ejs/spear/spr_misc.c
index a910b7134f3..5af983cd1c7 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 <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/mtd/st_smi.h>
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
diff --git a/arch/arm/cpu/armv7/cpu.c b/arch/arm/cpu/armv7/cpu.c
index 68807d20997..8d1f91cd439 100644
--- a/arch/arm/cpu/armv7/cpu.c
+++ b/arch/arm/cpu/armv7/cpu.c
@@ -21,6 +21,7 @@
 #include <asm/system.h>
 #include <asm/cache.h>
 #include <asm/armv7.h>
+#include <asm/u-boot.h>
 #include <linux/compiler.h>
 
 void __weak cpu_cache_initialization(void){}
diff --git a/arch/arm/cpu/armv7/kona-common/s_init.c b/arch/arm/cpu/armv7/kona-common/s_init.c
index 778b9176fa2..5b998b62854 100644
--- a/arch/arm/cpu/armv7/kona-common/s_init.c
+++ b/arch/arm/cpu/armv7/kona-common/s_init.c
@@ -3,6 +3,7 @@
  * Copyright 2014 Broadcom Corporation.
  */
 
+#include <asm/u-boot.h>
 /*
  * Early system init. Currently empty.
  */
diff --git a/arch/arm/cpu/armv7/ls102xa/clock.c b/arch/arm/cpu/armv7/ls102xa/clock.c
index 940995ef5af..3b59dd9657e 100644
--- a/arch/arm/cpu/armv7/ls102xa/clock.c
+++ b/arch/arm/cpu/armv7/ls102xa/clock.c
@@ -10,6 +10,7 @@
 #include <asm/arch/immap_ls102xa.h>
 #include <asm/arch/clock.h>
 #include <fsl_ifc.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/cpu/armv7/ls102xa/cpu.c b/arch/arm/cpu/armv7/ls102xa/cpu.c
index cbc8254b42a..61b80261f52 100644
--- a/arch/arm/cpu/armv7/ls102xa/cpu.c
+++ b/arch/arm/cpu/armv7/ls102xa/cpu.c
@@ -19,6 +19,7 @@
 #include <fsl_esdhc.h>
 #include <config.h>
 #include <fsl_wdog.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 
 #include "fsl_epu.h"
diff --git a/arch/arm/cpu/armv7/ls102xa/fdt.c b/arch/arm/cpu/armv7/ls102xa/fdt.c
index b2e80751a98..0ab9e9092d0 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 <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <asm/io.h>
diff --git a/arch/arm/cpu/armv7/ls102xa/soc.c b/arch/arm/cpu/armv7/ls102xa/soc.c
index 8a95ee86a9b..175909b2a44 100644
--- a/arch/arm/cpu/armv7/ls102xa/soc.c
+++ b/arch/arm/cpu/armv7/ls102xa/soc.c
@@ -13,6 +13,7 @@
 #include <asm/arch/ls102xa_stream_id.h>
 #include <fsl_csu.h>
 #include <fsl_ddr_sdram.h>
+#include <asm/u-boot.h>
 
 struct liodn_id_table sec_liodn_tbl[] = {
 	SET_SEC_JR_LIODN_ENTRY(0, 0x10, 0x10),
diff --git a/arch/arm/cpu/armv7/s5p-common/cpu_info.c b/arch/arm/cpu/armv7/s5p-common/cpu_info.c
index fb2920950d4..7382046517a 100644
--- a/arch/arm/cpu/armv7/s5p-common/cpu_info.c
+++ b/arch/arm/cpu/armv7/s5p-common/cpu_info.c
@@ -10,6 +10,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clk.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/cpu/armv7/s5p-common/timer.c b/arch/arm/cpu/armv7/s5p-common/timer.c
index 8141f40d5c0..777a119438a 100644
--- a/arch/arm/cpu/armv7/s5p-common/timer.c
+++ b/arch/arm/cpu/armv7/s5p-common/timer.c
@@ -14,6 +14,7 @@
 #include <asm/io.h>
 #include <asm/arch/pwm.h>
 #include <asm/arch/clk.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 
 /* Use the old PWM interface for now */
diff --git a/arch/arm/cpu/armv7/vf610/generic.c b/arch/arm/cpu/armv7/vf610/generic.c
index 3f266178c98..83459204a8f 100644
--- a/arch/arm/cpu/armv7/vf610/generic.c
+++ b/arch/arm/cpu/armv7/vf610/generic.c
@@ -21,6 +21,7 @@
 #ifdef CONFIG_FSL_ESDHC_IMX
 #include <fsl_esdhc_imx.h>
 #endif
+#include <asm/u-boot.h>
 #include <linux/string.h>
 
 #ifdef CONFIG_FSL_ESDHC_IMX
diff --git a/arch/arm/cpu/armv7m/cpu.c b/arch/arm/cpu/armv7m/cpu.c
index 7f827da033b..1d1c629c44c 100644
--- a/arch/arm/cpu/armv7m/cpu.c
+++ b/arch/arm/cpu/armv7m/cpu.c
@@ -12,6 +12,7 @@
 #include <irq_func.h>
 #include <asm/io.h>
 #include <asm/armv7m.h>
+#include <asm/u-boot.h>
 
 /*
  * This is called right before passing control to
diff --git a/arch/arm/cpu/armv8/cpu.c b/arch/arm/cpu/armv8/cpu.c
index 21c10cf6c7c..8c0a492a3fa 100644
--- a/arch/arm/cpu/armv8/cpu.c
+++ b/arch/arm/cpu/armv8/cpu.c
@@ -17,6 +17,7 @@
 #include <asm/cache.h>
 #include <asm/system.h>
 #include <asm/secure.h>
+#include <asm/u-boot.h>
 #include <linux/compiler.h>
 #include <linux/string.h>
 
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
index 5839f0b9c9e..f19b02dc473 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
@@ -17,6 +17,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/ptrace.h>
+#include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <asm/system.h>
 #include <fm_eth.h>
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/fdt.c b/arch/arm/cpu/armv8/fsl-layerscape/fdt.c
index ab4f4a5eb1a..0553faf90e0 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/fdt.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/fdt.c
@@ -9,6 +9,7 @@
 #include <efi_loader.h>
 #include <log.h>
 #include <asm/cache.h>
+#include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <phy.h>
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c
index 63d34e1ec03..26c3b5b79e5 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c
@@ -8,6 +8,7 @@
 #include <clock_legacy.h>
 #include <cpu_func.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/compiler.h>
 #include <asm/io.h>
 #include <asm/processor.h>
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c
index 767359fa5bd..2eafcc19a00 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c
@@ -10,6 +10,7 @@
 #include <clock_legacy.h>
 #include <cpu_func.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/compiler.h>
 #include <fsl_ifc.h>
 #include <asm/processor.h>
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/mp.c b/arch/arm/cpu/armv8/fsl-layerscape/mp.c
index 8675007da51..10fc75412d3 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/mp.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/mp.c
@@ -13,6 +13,7 @@
 #include <asm/system.h>
 #include <asm/arch/mp.h>
 #include <asm/arch/soc.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 #include "cpu.h"
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/soc.c b/arch/arm/cpu/armv8/fsl-layerscape/soc.c
index fde893e8c9b..dbc6f9f14c4 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/soc.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/soc.c
@@ -11,6 +11,7 @@
 #include <fsl_immap.h>
 #include <fsl_ifc.h>
 #include <init.h>
+#include <asm/u-boot.h>
 #include <linux/sizes.h>
 #include <log.h>
 #include <asm/arch/fsl_serdes.h>
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/spl.c b/arch/arm/cpu/armv8/fsl-layerscape/spl.c
index 7c44dc7a95a..5ba5db3223a 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/spl.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/spl.c
@@ -20,6 +20,7 @@
 #include <asm/arch/fdt.h>
 #include <asm/arch/ppa.h>
 #include <asm/arch/soc.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/cpu/armv8/s32v234/cpu.c b/arch/arm/cpu/armv8/s32v234/cpu.c
index 8ee3adc8058..b26298553bb 100644
--- a/arch/arm/cpu/armv8/s32v234/cpu.c
+++ b/arch/arm/cpu/armv8/s32v234/cpu.c
@@ -12,6 +12,7 @@
 #include <asm/armv8/mmu.h>
 #include <asm/io.h>
 #include <asm/arch/mc_me_regs.h>
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include "cpu.h"
 
diff --git a/arch/arm/cpu/armv8/s32v234/generic.c b/arch/arm/cpu/armv8/s32v234/generic.c
index 0fc98852228..5a49a8a4a0d 100644
--- a/arch/arm/cpu/armv8/s32v234/generic.c
+++ b/arch/arm/cpu/armv8/s32v234/generic.c
@@ -18,6 +18,7 @@
 #include <netdev.h>
 #include <div64.h>
 #include <errno.h>
+#include <asm/u-boot.h>
 
 u32 get_cpu_rev(void)
 {
diff --git a/arch/arm/cpu/pxa/pxa2xx.c b/arch/arm/cpu/pxa/pxa2xx.c
index ea91d8aaec2..9a8b2361ad9 100644
--- a/arch/arm/cpu/pxa/pxa2xx.c
+++ b/arch/arm/cpu/pxa/pxa2xx.c
@@ -18,6 +18,7 @@
 #include <asm/io.h>
 #include <asm/system.h>
 #include <command.h>
+#include <asm/u-boot.h>
 
 /* Flush I/D-cache */
 static void cache_flush(void)
diff --git a/arch/arm/include/asm/arch-fsl-layerscape/clock.h b/arch/arm/include/asm/arch-fsl-layerscape/clock.h
index d5616914374..41272e44bf3 100644
--- a/arch/arm/include/asm/arch-fsl-layerscape/clock.h
+++ b/arch/arm/include/asm/arch-fsl-layerscape/clock.h
@@ -8,6 +8,7 @@
 #ifndef __ASM_ARCH_FSL_LAYERSCAPE_CLOCK_H_
 #define __ASM_ARCH_FSL_LAYERSCAPE_CLOCK_H_
 
+#include <asm/u-boot.h>
 enum mxc_clock {
 	MXC_ARM_CLK = 0,
 	MXC_BUS_CLK,
diff --git a/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h b/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h
index c9be0768e34..ae0504652bf 100644
--- a/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h
+++ b/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h
@@ -8,6 +8,7 @@
 
 #include <fsl_immap.h>
 #ifndef __ASSEMBLY__
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 #endif
 
diff --git a/arch/arm/include/asm/arch-fsl-layerscape/speed.h b/arch/arm/include/asm/arch-fsl-layerscape/speed.h
index 26721699cc0..9d8d4065159 100644
--- a/arch/arm/include/asm/arch-fsl-layerscape/speed.h
+++ b/arch/arm/include/asm/arch-fsl-layerscape/speed.h
@@ -5,6 +5,7 @@
 
 #ifndef _FSL_LAYERSCAPE_SPEED_H
 #define _FSL_LAYERSCAPE_SPEED_H
+#include <asm/u-boot.h>
 void get_sys_info(struct sys_info *sys_info);
 #ifdef CONFIG_SYS_DPAA_QBMAN
 unsigned long get_qman_freq(void);
diff --git a/arch/arm/include/asm/arch-ls102xa/clock.h b/arch/arm/include/asm/arch-ls102xa/clock.h
index 01978c08f5e..bfb58d75455 100644
--- a/arch/arm/include/asm/arch-ls102xa/clock.h
+++ b/arch/arm/include/asm/arch-ls102xa/clock.h
@@ -7,6 +7,7 @@
 #ifndef __ASM_ARCH_LS102XA_CLOCK_H_
 #define __ASM_ARCH_LS102XA_CLOCK_H_
 
+#include <asm/u-boot.h>
 enum mxc_clock {
 	MXC_ARM_CLK = 0,
 	MXC_UART_CLK,
diff --git a/arch/arm/include/asm/arch-ls102xa/immap_ls102xa.h b/arch/arm/include/asm/arch-ls102xa/immap_ls102xa.h
index f2ba182346e..4bae3f4ed5d 100644
--- a/arch/arm/include/asm/arch-ls102xa/immap_ls102xa.h
+++ b/arch/arm/include/asm/arch-ls102xa/immap_ls102xa.h
@@ -6,6 +6,7 @@
 #ifndef __ASM_ARCH_LS102XA_IMMAP_H_
 #define __ASM_ARCH_LS102XA_IMMAP_H_
 #include <fsl_immap.h>
+#include <asm/u-boot.h>
 
 #define SVR_MAJ(svr)		(((svr) >>  4) & 0xf)
 #define SVR_MIN(svr)		(((svr) >>  0) & 0xf)
diff --git a/arch/arm/include/asm/arch-mx27/mxcmmc.h b/arch/arm/include/asm/arch-mx27/mxcmmc.h
index 52fb0ab5782..bf85a128bc7 100644
--- a/arch/arm/include/asm/arch-mx27/mxcmmc.h
+++ b/arch/arm/include/asm/arch-mx27/mxcmmc.h
@@ -6,6 +6,7 @@
 #ifndef ASM_ARCH_MXCMMC_H
 #define ASM_ARCH_MXCMMC_H
 
+#include <asm/u-boot.h>
 int mxc_mmc_init(struct bd_info *bis);
 
 #endif
diff --git a/arch/arm/include/asm/arch-mx31/sys_proto.h b/arch/arm/include/asm/arch-mx31/sys_proto.h
index 29fc0fda0e6..a530afcbc91 100644
--- a/arch/arm/include/asm/arch-mx31/sys_proto.h
+++ b/arch/arm/include/asm/arch-mx31/sys_proto.h
@@ -8,6 +8,7 @@
 #define _MX31_SYS_PROTO_H_
 
 #include <asm/mach-imx/sys_proto.h>
+#include <asm/u-boot.h>
 
 struct mxc_weimcs {
 	u32 upper;
diff --git a/arch/arm/include/asm/arch-mx6/litesom.h b/arch/arm/include/asm/arch-mx6/litesom.h
index 37a16d2c309..43adf8f422d 100644
--- a/arch/arm/include/asm/arch-mx6/litesom.h
+++ b/arch/arm/include/asm/arch-mx6/litesom.h
@@ -6,6 +6,7 @@
 #ifndef __ARCH_ARM_MX6UL_LITESOM_H__
 #define __ARCH_ARM_MX6UL_LITESOM_H__
 
+#include <asm/u-boot.h>
 int litesom_mmc_init(struct bd_info *bis);
 
 #ifdef CONFIG_SPL_BUILD
diff --git a/arch/arm/include/asm/arch-mxs/sys_proto.h b/arch/arm/include/asm/arch-mxs/sys_proto.h
index 20ee863ac7e..85374e2b87c 100644
--- a/arch/arm/include/asm/arch-mxs/sys_proto.h
+++ b/arch/arm/include/asm/arch-mxs/sys_proto.h
@@ -10,6 +10,7 @@
 #define __MXS_SYS_PROTO_H__
 
 #include <asm/mach-imx/sys_proto.h>
+#include <asm/u-boot.h>
 
 int mxsmmc_initialize(struct bd_info *bis, int id, int (*wp)(int),
 		      int (*cd)(int));
diff --git a/arch/arm/include/asm/mach-imx/sys_proto.h b/arch/arm/include/asm/mach-imx/sys_proto.h
index ab94024c9b8..ae33d6a9a49 100644
--- a/arch/arm/include/asm/mach-imx/sys_proto.h
+++ b/arch/arm/include/asm/mach-imx/sys_proto.h
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <asm/mach-imx/regs-common.h>
 #include <asm/mach-imx/module_fuse.h>
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include "../arch-imx/cpu.h"
 
diff --git a/arch/arm/include/asm/omap_common.h b/arch/arm/include/asm/omap_common.h
index de8fc99d047..25789677378 100644
--- a/arch/arm/include/asm/omap_common.h
+++ b/arch/arm/include/asm/omap_common.h
@@ -10,6 +10,7 @@
 
 #ifndef __ASSEMBLY__
 
+#include <asm/u-boot.h>
 #include <linux/types.h>
 
 #define NUM_SYS_CLKS	7
diff --git a/arch/arm/lib/bdinfo.c b/arch/arm/lib/bdinfo.c
index 572f7fb2429..73b9ed0815a 100644
--- a/arch/arm/lib/bdinfo.c
+++ b/arch/arm/lib/bdinfo.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <init.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/lib/bootm-fdt.c b/arch/arm/lib/bootm-fdt.c
index e1970ea9f14..72a86f7defe 100644
--- a/arch/arm/lib/bootm-fdt.c
+++ b/arch/arm/lib/bootm-fdt.c
@@ -22,6 +22,7 @@
 #include <asm/global_data.h>
 #include <asm/psci.h>
 #include <asm/spin_table.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c
index 101f9d9b3ae..9dbca39b52a 100644
--- a/arch/arm/lib/bootm.c
+++ b/arch/arm/lib/bootm.c
@@ -20,6 +20,7 @@
 #include <lmb.h>
 #include <log.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <dm/root.h>
 #include <env.h>
 #include <image.h>
diff --git a/arch/arm/lib/cache-cp15.c b/arch/arm/lib/cache-cp15.c
index 24050e5bdd3..d33136a9dbc 100644
--- a/arch/arm/lib/cache-cp15.c
+++ b/arch/arm/lib/cache-cp15.c
@@ -10,6 +10,7 @@
 #include <asm/global_data.h>
 #include <asm/system.h>
 #include <asm/cache.h>
+#include <asm/u-boot.h>
 #include <linux/compiler.h>
 #include <asm/armv7_mpu.h>
 
diff --git a/arch/arm/lib/image.c b/arch/arm/lib/image.c
index e394c1ad909..7194bf08b44 100644
--- a/arch/arm/lib/image.c
+++ b/arch/arm/lib/image.c
@@ -8,6 +8,7 @@
 #include <image.h>
 #include <mapmem.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/sizes.h>
 
diff --git a/arch/arm/lib/interrupts_64.c b/arch/arm/lib/interrupts_64.c
index c653e67db28..1da953af8c8 100644
--- a/arch/arm/lib/interrupts_64.c
+++ b/arch/arm/lib/interrupts_64.c
@@ -8,6 +8,7 @@
 #include <asm/global_data.h>
 #include <asm/ptrace.h>
 #include <irq_func.h>
+#include <asm/u-boot.h>
 #include <linux/compiler.h>
 #include <efi_loader.h>
 
diff --git a/arch/arm/lib/interrupts_m.c b/arch/arm/lib/interrupts_m.c
index 2ae1c5ba76c..cb456f846f7 100644
--- a/arch/arm/lib/interrupts_m.c
+++ b/arch/arm/lib/interrupts_m.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <irq_func.h>
+#include <asm/u-boot.h>
 
 /*
  * Upon exception entry ARMv7-M processors automatically save stack
diff --git a/arch/arm/lib/reset.c b/arch/arm/lib/reset.c
index 4f1a768bfe1..109ed120482 100644
--- a/arch/arm/lib/reset.c
+++ b/arch/arm/lib/reset.c
@@ -24,6 +24,7 @@
 #include <command.h>
 #include <cpu_func.h>
 #include <irq_func.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 
 __weak void reset_misc(void)
diff --git a/arch/arm/lib/spl.c b/arch/arm/lib/spl.c
index b2b54f28fc4..2dbbc53c516 100644
--- a/arch/arm/lib/spl.c
+++ b/arch/arm/lib/spl.c
@@ -15,6 +15,7 @@
 #include <image.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/compiler.h>
 #include <asm/mach-types.h>
 
diff --git a/arch/arm/mach-aspeed/ast2500-board.c b/arch/arm/mach-aspeed/ast2500-board.c
index 2d1d27bfa2e..88b063def40 100644
--- a/arch/arm/mach-aspeed/ast2500-board.c
+++ b/arch/arm/mach-aspeed/ast2500-board.c
@@ -12,6 +12,7 @@
 #include <asm/io.h>
 #include <asm/arch/timer.h>
 #include <asm/arch/wdt.h>
+#include <asm/u-boot.h>
 #include <linux/err.h>
 #include <dm/uclass.h>
 
diff --git a/arch/arm/mach-at91/arm920t/cpu.c b/arch/arm/mach-at91/arm920t/cpu.c
index 44c079c0fdd..55e072e38be 100644
--- a/arch/arm/mach-at91/arm920t/cpu.c
+++ b/arch/arm/mach-at91/arm920t/cpu.c
@@ -15,6 +15,7 @@
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/clk.h>
+#include <asm/u-boot.h>
 
 #ifndef CONFIG_SYS_AT91_MAIN_CLOCK
 #define CONFIG_SYS_AT91_MAIN_CLOCK 0
diff --git a/arch/arm/mach-at91/arm926ejs/cpu.c b/arch/arm/mach-at91/arm926ejs/cpu.c
index 761edb6df58..8a20be467aa 100644
--- a/arch/arm/mach-at91/arm926ejs/cpu.c
+++ b/arch/arm/mach-at91/arm926ejs/cpu.c
@@ -14,6 +14,7 @@
 #include <asm/arch/at91_pit.h>
 #include <asm/arch/at91_gpbr.h>
 #include <asm/arch/clk.h>
+#include <asm/u-boot.h>
 
 #ifndef CONFIG_SYS_AT91_MAIN_CLOCK
 #define CONFIG_SYS_AT91_MAIN_CLOCK 0
diff --git a/arch/arm/mach-at91/armv7/cpu.c b/arch/arm/mach-at91/armv7/cpu.c
index a8f4356ce94..d04d10447c7 100644
--- a/arch/arm/mach-at91/armv7/cpu.c
+++ b/arch/arm/mach-at91/armv7/cpu.c
@@ -17,6 +17,7 @@
 #include <asm/arch/at91_pit.h>
 #include <asm/arch/at91_gpbr.h>
 #include <asm/arch/clk.h>
+#include <asm/u-boot.h>
 
 #ifndef CONFIG_SYS_AT91_MAIN_CLOCK
 #define CONFIG_SYS_AT91_MAIN_CLOCK 0
diff --git a/arch/arm/mach-at91/spl_atmel.c b/arch/arm/mach-at91/spl_atmel.c
index 23588e79f94..526379fae1a 100644
--- a/arch/arm/mach-at91/spl_atmel.c
+++ b/arch/arm/mach-at91/spl_atmel.c
@@ -16,6 +16,7 @@
 #include <asm/arch/at91_wdt.h>
 #include <asm/arch/clk.h>
 #include <spl.h>
+#include <asm/u-boot.h>
 
 static void switch_to_main_crystal_osc(void)
 {
diff --git a/arch/arm/mach-bcm283x/init.c b/arch/arm/mach-bcm283x/init.c
index b2708e4876e..c80c77e0fcc 100644
--- a/arch/arm/mach-bcm283x/init.c
+++ b/arch/arm/mach-bcm283x/init.c
@@ -10,6 +10,7 @@
 #include <cpu_func.h>
 #include <init.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <dm/device.h>
 #include <fdt_support.h>
 
diff --git a/arch/arm/mach-davinci/cpu.c b/arch/arm/mach-davinci/cpu.c
index aefd21dc458..79946b901b1 100644
--- a/arch/arm/mach-davinci/cpu.c
+++ b/arch/arm/mach-davinci/cpu.c
@@ -9,6 +9,7 @@
 #include <asm/arch/hardware.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-davinci/da850_lowlevel.c b/arch/arm/mach-davinci/da850_lowlevel.c
index 07bf19b5e42..bb3f616d0b3 100644
--- a/arch/arm/mach-davinci/da850_lowlevel.c
+++ b/arch/arm/mach-davinci/da850_lowlevel.c
@@ -16,6 +16,7 @@
 #include <asm/arch/ddr2_defs.h>
 #include <asm/ti-common/davinci_nand.h>
 #include <asm/arch/pll_defs.h>
+#include <asm/u-boot.h>
 
 void davinci_enable_uart0(void)
 {
diff --git a/arch/arm/mach-davinci/include/mach/sdmmc_defs.h b/arch/arm/mach-davinci/include/mach/sdmmc_defs.h
index d4195cf588d..e1851c5ae4e 100644
--- a/arch/arm/mach-davinci/include/mach/sdmmc_defs.h
+++ b/arch/arm/mach-davinci/include/mach/sdmmc_defs.h
@@ -9,6 +9,7 @@
 #define _SDMMC_DEFS_H_
 
 #include <asm/arch/hardware.h>
+#include <asm/u-boot.h>
 
 /* MMC Control Reg fields */
 #define MMCCTL_DATRST		(1 << 0)
diff --git a/arch/arm/mach-davinci/misc.c b/arch/arm/mach-davinci/misc.c
index 90b38b7e020..7324af07d6b 100644
--- a/arch/arm/mach-davinci/misc.c
+++ b/arch/arm/mach-davinci/misc.c
@@ -18,6 +18,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/davinci_misc.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-exynos/lowlevel_init.c b/arch/arm/mach-exynos/lowlevel_init.c
index 97d6ca8fc2a..7a2fe744527 100644
--- a/arch/arm/mach-exynos/lowlevel_init.c
+++ b/arch/arm/mach-exynos/lowlevel_init.c
@@ -36,6 +36,7 @@
 #include <asm/arch/pinmux.h>
 #include <asm/arch/system.h>
 #include <asm/armv7.h>
+#include <asm/u-boot.h>
 #include "common_setup.h"
 #include "exynos5_setup.h"
 
diff --git a/arch/arm/mach-imx/cpu.c b/arch/arm/mach-imx/cpu.c
index dc182eb12d2..80a4ae4d92a 100644
--- a/arch/arm/mach-imx/cpu.c
+++ b/arch/arm/mach-imx/cpu.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <net.h>
 #include <netdev.h>
+#include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
diff --git a/arch/arm/mach-imx/imx8/ahab.c b/arch/arm/mach-imx/imx8/ahab.c
index 9eb38cac029..0df61fca476 100644
--- a/arch/arm/mach-imx/imx8/ahab.c
+++ b/arch/arm/mach-imx/imx8/ahab.c
@@ -15,6 +15,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/image.h>
 #include <console.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-imx/imx8/cpu.c b/arch/arm/mach-imx/imx8/cpu.c
index 293c931b2ff..71686cd07ed 100644
--- a/arch/arm/mach-imx/imx8/cpu.c
+++ b/arch/arm/mach-imx/imx8/cpu.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <dm/device-internal.h>
 #include <dm/lists.h>
 #include <dm/uclass.h>
diff --git a/arch/arm/mach-imx/imx8/fdt.c b/arch/arm/mach-imx/imx8/fdt.c
index 94da4d0951d..6c473ddcc9c 100644
--- a/arch/arm/mach-imx/imx8/fdt.c
+++ b/arch/arm/mach-imx/imx8/fdt.c
@@ -8,6 +8,7 @@
 #include <asm/arch/sci/sci.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <dm/ofnode.h>
 #include <fdt_support.h>
 #include <linux/libfdt.h>
diff --git a/arch/arm/mach-imx/imx8m/soc.c b/arch/arm/mach-imx/imx8m/soc.c
index 5e714b2973c..7bcf573d170 100644
--- a/arch/arm/mach-imx/imx8m/soc.c
+++ b/arch/arm/mach-imx/imx8m/soc.c
@@ -19,6 +19,7 @@
 #include <asm/mach-imx/syscounter.h>
 #include <asm/ptrace.h>
 #include <asm/armv8/mmu.h>
+#include <asm/u-boot.h>
 #include <dm/uclass.h>
 #include <efi_loader.h>
 #include <env.h>
diff --git a/arch/arm/mach-imx/imxrt/soc.c b/arch/arm/mach-imx/imxrt/soc.c
index 8e7d15160da..0ac64e883f7 100644
--- a/arch/arm/mach-imx/imxrt/soc.c
+++ b/arch/arm/mach-imx/imxrt/soc.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <asm/io.h>
 #include <asm/armv7_mpu.h>
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 
 int arch_cpu_init(void)
diff --git a/arch/arm/mach-imx/misc.c b/arch/arm/mach-imx/misc.c
index d82efa7f8f0..e30e87d3aa0 100644
--- a/arch/arm/mach-imx/misc.c
+++ b/arch/arm/mach-imx/misc.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/io.h>
diff --git a/arch/arm/mach-imx/mx5/mx53_dram.c b/arch/arm/mach-imx/mx5/mx53_dram.c
index f7441441947..f9b7762a356 100644
--- a/arch/arm/mach-imx/mx5/mx53_dram.c
+++ b/arch/arm/mach-imx/mx5/mx53_dram.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <init.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-imx/mx6/litesom.c b/arch/arm/mach-imx/mx6/litesom.c
index 699a3dc317f..17108a83981 100644
--- a/arch/arm/mach-imx/mx6/litesom.c
+++ b/arch/arm/mach-imx/mx6/litesom.c
@@ -19,6 +19,7 @@
 #include <asm/io.h>
 #include <common.h>
 #include <fsl_esdhc_imx.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/sizes.h>
 #include <mmc.h>
diff --git a/arch/arm/mach-imx/mx6/module_fuse.c b/arch/arm/mach-imx/mx6/module_fuse.c
index 0305b2a7e02..ced49dcad33 100644
--- a/arch/arm/mach-imx/mx6/module_fuse.c
+++ b/arch/arm/mach-imx/mx6/module_fuse.c
@@ -9,6 +9,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/mach-imx/module_fuse.h>
+#include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 
diff --git a/arch/arm/mach-imx/mx6/opos6ul.c b/arch/arm/mach-imx/mx6/opos6ul.c
index e9d78740a15..67b8c65963d 100644
--- a/arch/arm/mach-imx/mx6/opos6ul.c
+++ b/arch/arm/mach-imx/mx6/opos6ul.c
@@ -12,6 +12,7 @@
 #include <asm/io.h>
 #include <common.h>
 #include <env.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-imx/mx6/soc.c b/arch/arm/mach-imx/mx6/soc.c
index e1292860656..ef031364fbf 100644
--- a/arch/arm/mach-imx/mx6/soc.c
+++ b/arch/arm/mach-imx/mx6/soc.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/io.h>
diff --git a/arch/arm/mach-imx/mx7/soc.c b/arch/arm/mach-imx/mx7/soc.c
index 798fe74a3d6..36f3f8f945b 100644
--- a/arch/arm/mach-imx/mx7/soc.c
+++ b/arch/arm/mach-imx/mx7/soc.c
@@ -19,6 +19,7 @@
 #include <imx_thermal.h>
 #include <fsl_sec.h>
 #include <asm/setup.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 
 #define IOMUXC_GPR1		0x4
diff --git a/arch/arm/mach-imx/mx7ulp/soc.c b/arch/arm/mach-imx/mx7ulp/soc.c
index 8dd6b4d40e7..07e8ff917c6 100644
--- a/arch/arm/mach-imx/mx7ulp/soc.c
+++ b/arch/arm/mach-imx/mx7ulp/soc.c
@@ -13,6 +13,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/mach-imx/boot_mode.h>
 #include <asm/mach-imx/hab.h>
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 
 #define PMC0_BASE_ADDR		0x410a1000
diff --git a/arch/arm/mach-imx/spl.c b/arch/arm/mach-imx/spl.c
index 578b510e780..1ba86223c6a 100644
--- a/arch/arm/mach-imx/spl.c
+++ b/arch/arm/mach-imx/spl.c
@@ -19,6 +19,7 @@
 #include <asm/mach-imx/hab.h>
 #include <asm/mach-imx/boot_mode.h>
 #include <g_dnl.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-keystone/init.c b/arch/arm/mach-keystone/init.c
index 88e8912959f..d578b194ea8 100644
--- a/arch/arm/mach-keystone/init.c
+++ b/arch/arm/mach-keystone/init.c
@@ -16,6 +16,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/psc_defs.h>
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 
 #define MAX_PCI_PORTS		2
diff --git a/arch/arm/mach-kirkwood/cpu.c b/arch/arm/mach-kirkwood/cpu.c
index 551c22a8ea1..beee83b2249 100644
--- a/arch/arm/mach-kirkwood/cpu.c
+++ b/arch/arm/mach-kirkwood/cpu.c
@@ -18,6 +18,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
 #include <mvebu_mmc.h>
+#include <asm/u-boot.h>
 
 void reset_cpu(unsigned long ignored)
 {
diff --git a/arch/arm/mach-lpc32xx/cpu.c b/arch/arm/mach-lpc32xx/cpu.c
index 32af6206056..df500620761 100644
--- a/arch/arm/mach-lpc32xx/cpu.c
+++ b/arch/arm/mach-lpc32xx/cpu.c
@@ -13,6 +13,7 @@
 #include <asm/arch/wdt.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 
 static struct clk_pm_regs *clk = (struct clk_pm_regs *)CLK_PM_BASE;
 static struct wdt_regs  *wdt = (struct wdt_regs *)WDT_BASE;
diff --git a/arch/arm/mach-mediatek/cpu.c b/arch/arm/mach-mediatek/cpu.c
index c329e7cc98a..58d2c26d206 100644
--- a/arch/arm/mach-mediatek/cpu.c
+++ b/arch/arm/mach-mediatek/cpu.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <init.h>
 #include <wdt.h>
+#include <asm/u-boot.h>
 #include <dm/uclass-internal.h>
 
 int arch_cpu_init(void)
diff --git a/arch/arm/mach-mediatek/mt8512/init.c b/arch/arm/mach-mediatek/mt8512/init.c
index c14e7d22e6f..5a126d317c1 100644
--- a/arch/arm/mach-mediatek/mt8512/init.c
+++ b/arch/arm/mach-mediatek/mt8512/init.c
@@ -19,6 +19,7 @@
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <asm/sections.h>
+#include <asm/u-boot.h>
 #include <dm/uclass.h>
 #include <dt-bindings/clock/mt8512-clk.h>
 
diff --git a/arch/arm/mach-mediatek/mt8516/init.c b/arch/arm/mach-mediatek/mt8516/init.c
index 0eb65aa76b5..0f79bfca952 100644
--- a/arch/arm/mach-mediatek/mt8516/init.c
+++ b/arch/arm/mach-mediatek/mt8516/init.c
@@ -17,6 +17,7 @@
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <asm/sections.h>
+#include <asm/u-boot.h>
 #include <dm/uclass.h>
 #include <dt-bindings/clock/mt8516-clk.h>
 
diff --git a/arch/arm/mach-mediatek/mt8518/init.c b/arch/arm/mach-mediatek/mt8518/init.c
index 28b00c3dec8..27087e6eb8c 100644
--- a/arch/arm/mach-mediatek/mt8518/init.c
+++ b/arch/arm/mach-mediatek/mt8518/init.c
@@ -18,6 +18,7 @@
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <asm/sections.h>
+#include <asm/u-boot.h>
 #include <dm/uclass.h>
 #include <dt-bindings/clock/mt8518-clk.h>
 
diff --git a/arch/arm/mach-meson/board-common.c b/arch/arm/mach-meson/board-common.c
index 2e1dcf0e010..67d85d4e1ce 100644
--- a/arch/arm/mach-meson/board-common.c
+++ b/arch/arm/mach-meson/board-common.c
@@ -12,6 +12,7 @@
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <asm/ptrace.h>
+#include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <linux/err.h>
 #include <asm/arch/mem.h>
diff --git a/arch/arm/mach-mvebu/arm64-common.c b/arch/arm/mach-mvebu/arm64-common.c
index fa687d8abbb..68c5849e2c4 100644
--- a/arch/arm/mach-mvebu/arm64-common.c
+++ b/arch/arm/mach-mvebu/arm64-common.c
@@ -10,6 +10,7 @@
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <asm/ptrace.h>
+#include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <linux/sizes.h>
 #include <pci.h>
diff --git a/arch/arm/mach-mvebu/armada3700/cpu.c b/arch/arm/mach-mvebu/armada3700/cpu.c
index 7ab5c653f1e..f16addcc816 100644
--- a/arch/arm/mach-mvebu/armada3700/cpu.c
+++ b/arch/arm/mach-mvebu/armada3700/cpu.c
@@ -10,6 +10,7 @@
 #include <fdtdec.h>
 #include <init.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/libfdt.h>
 #include <asm/io.h>
diff --git a/arch/arm/mach-mvebu/armada8k/dram.c b/arch/arm/mach-mvebu/armada8k/dram.c
index bab375e18ac..445bdd01d8e 100644
--- a/arch/arm/mach-mvebu/armada8k/dram.c
+++ b/arch/arm/mach-mvebu/armada8k/dram.c
@@ -9,6 +9,7 @@
 #include <asm/global_data.h>
 #include <asm/ptrace.h>
 #include <asm/system.h>
+#include <asm/u-boot.h>
 #include <linux/sizes.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-mvebu/cpu.c b/arch/arm/mach-mvebu/cpu.c
index 7dce11e77f3..19886c5f139 100644
--- a/arch/arm/mach-mvebu/cpu.c
+++ b/arch/arm/mach-mvebu/cpu.c
@@ -7,6 +7,7 @@
 #include <ahci.h>
 #include <cpu_func.h>
 #include <init.h>
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/mbus.h>
diff --git a/arch/arm/mach-mvebu/dram.c b/arch/arm/mach-mvebu/dram.c
index 349e0cc4c18..0f17c2504f8 100644
--- a/arch/arm/mach-mvebu/dram.c
+++ b/arch/arm/mach-mvebu/dram.c
@@ -12,6 +12,7 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <asm/u-boot.h>
 
 #if defined(CONFIG_ARCH_MVEBU)
 /* Use common XOR definitions for A3x and AXP */
diff --git a/arch/arm/mach-omap2/am33xx/board.c b/arch/arm/mach-omap2/am33xx/board.c
index cff8c205734..0b0372e22ca 100644
--- a/arch/arm/mach-omap2/am33xx/board.c
+++ b/arch/arm/mach-omap2/am33xx/board.c
@@ -33,6 +33,7 @@
 #include <i2c.h>
 #include <miiphy.h>
 #include <cpsw.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/compiler.h>
diff --git a/arch/arm/mach-omap2/am33xx/fdt.c b/arch/arm/mach-omap2/am33xx/fdt.c
index 2ec30b1f9c3..2b4fd731db0 100644
--- a/arch/arm/mach-omap2/am33xx/fdt.c
+++ b/arch/arm/mach-omap2/am33xx/fdt.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <hang.h>
+#include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <malloc.h>
diff --git a/arch/arm/mach-omap2/boot-common.c b/arch/arm/mach-omap2/boot-common.c
index 05efe04dc35..b8fba785a96 100644
--- a/arch/arm/mach-omap2/boot-common.c
+++ b/arch/arm/mach-omap2/boot-common.c
@@ -19,6 +19,7 @@
 #include <watchdog.h>
 #include <scsi.h>
 #include <i2c.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-omap2/fdt-common.c b/arch/arm/mach-omap2/fdt-common.c
index 5eb04473123..b122db8bf7a 100644
--- a/arch/arm/mach-omap2/fdt-common.c
+++ b/arch/arm/mach-omap2/fdt-common.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 
diff --git a/arch/arm/mach-omap2/hwinit-common.c b/arch/arm/mach-omap2/hwinit-common.c
index 3da50f974dc..b6be35b0647 100644
--- a/arch/arm/mach-omap2/hwinit-common.c
+++ b/arch/arm/mach-omap2/hwinit-common.c
@@ -17,6 +17,7 @@
 #include <spl.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/sizes.h>
 #include <asm/emif.h>
 #include <asm/omap_common.h>
diff --git a/arch/arm/mach-omap2/omap-cache.c b/arch/arm/mach-omap2/omap-cache.c
index 1b246f844a8..5034404801a 100644
--- a/arch/arm/mach-omap2/omap-cache.c
+++ b/arch/arm/mach-omap2/omap-cache.c
@@ -16,6 +16,7 @@
 #include <log.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-omap2/omap3/board.c b/arch/arm/mach-omap2/omap3/board.c
index c741652f241..0603110ef98 100644
--- a/arch/arm/mach-omap2/omap3/board.c
+++ b/arch/arm/mach-omap2/omap3/board.c
@@ -27,6 +27,7 @@
 #include <asm/armv7.h>
 #include <asm/gpio.h>
 #include <asm/omap_common.h>
+#include <asm/u-boot.h>
 #include <linux/compiler.h>
 #include <linux/string.h>
 
diff --git a/arch/arm/mach-omap2/omap3/emac.c b/arch/arm/mach-omap2/omap3/emac.c
index d0d0b7a75a6..4c102dadf42 100644
--- a/arch/arm/mach-omap2/omap3/emac.c
+++ b/arch/arm/mach-omap2/omap3/emac.c
@@ -10,6 +10,7 @@
 #include <net.h>
 #include <asm/io.h>
 #include <asm/arch/am35x_def.h>
+#include <asm/u-boot.h>
 
 /*
  * Initializes on-chip ethernet controllers.
diff --git a/arch/arm/mach-omap2/omap3/emif4.c b/arch/arm/mach-omap2/omap3/emif4.c
index df6e9ce1d6c..dd99aeb63bd 100644
--- a/arch/arm/mach-omap2/omap3/emif4.c
+++ b/arch/arm/mach-omap2/omap3/emif4.c
@@ -16,6 +16,7 @@
 #include <asm/arch/mem.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/emif4.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 extern omap3_sysinfo sysinfo;
diff --git a/arch/arm/mach-omap2/omap3/sdrc.c b/arch/arm/mach-omap2/omap3/sdrc.c
index 4d85b1dee99..78456f03f98 100644
--- a/arch/arm/mach-omap2/omap3/sdrc.c
+++ b/arch/arm/mach-omap2/omap3/sdrc.c
@@ -27,6 +27,7 @@
 #include <asm/io.h>
 #include <asm/arch/mem.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 extern omap3_sysinfo sysinfo;
diff --git a/arch/arm/mach-omap2/omap5/fdt.c b/arch/arm/mach-omap2/omap5/fdt.c
index c4162420f3a..bf4f015cf52 100644
--- a/arch/arm/mach-omap2/omap5/fdt.c
+++ b/arch/arm/mach-omap2/omap5/fdt.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <hang.h>
 #include <log.h>
+#include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <malloc.h>
diff --git a/arch/arm/mach-orion5x/cpu.c b/arch/arm/mach-orion5x/cpu.c
index beae7b84843..aef39986006 100644
--- a/arch/arm/mach-orion5x/cpu.c
+++ b/arch/arm/mach-orion5x/cpu.c
@@ -15,6 +15,7 @@
 #include <netdev.h>
 #include <asm/cache.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 #include <u-boot/md5.h>
 #include <asm/arch/cpu.h>
 
diff --git a/arch/arm/mach-orion5x/dram.c b/arch/arm/mach-orion5x/dram.c
index c9a3750e48d..5e6f51de5c4 100644
--- a/arch/arm/mach-orion5x/dram.c
+++ b/arch/arm/mach-orion5x/dram.c
@@ -13,6 +13,7 @@
 #include <init.h>
 #include <asm/arch/cpu.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-owl/soc.c b/arch/arm/mach-owl/soc.c
index 4d2b9d0b0eb..37c6683959d 100644
--- a/arch/arm/mach-owl/soc.c
+++ b/arch/arm/mach-owl/soc.c
@@ -9,6 +9,7 @@
 #include <init.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/arm-smccc.h>
 #include <linux/psci.h>
 #include <common.h>
diff --git a/arch/arm/mach-rmobile/cpu_info.c b/arch/arm/mach-rmobile/cpu_info.c
index fdbbd72e285..88de2781626 100644
--- a/arch/arm/mach-rmobile/cpu_info.c
+++ b/arch/arm/mach-rmobile/cpu_info.c
@@ -9,6 +9,7 @@
 #include <init.h>
 #include <asm/io.h>
 #include <env.h>
+#include <asm/u-boot.h>
 #include <linux/ctype.h>
 
 #ifdef CONFIG_ARCH_CPU_INIT
diff --git a/arch/arm/mach-rmobile/emac.c b/arch/arm/mach-rmobile/emac.c
index cb9bce0cf23..2066ab7796e 100644
--- a/arch/arm/mach-rmobile/emac.c
+++ b/arch/arm/mach-rmobile/emac.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <net.h>
+#include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <netdev.h>
 
diff --git a/arch/arm/mach-rmobile/memmap-gen3.c b/arch/arm/mach-rmobile/memmap-gen3.c
index a68eb806b35..7d5657a778d 100644
--- a/arch/arm/mach-rmobile/memmap-gen3.c
+++ b/arch/arm/mach-rmobile/memmap-gen3.c
@@ -9,6 +9,7 @@
 #include <cpu_func.h>
 #include <asm/armv8/mmu.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 
 #define GEN3_NR_REGIONS 16
 
diff --git a/arch/arm/mach-rockchip/board.c b/arch/arm/mach-rockchip/board.c
index 2c41e58f598..5a02f6c3f55 100644
--- a/arch/arm/mach-rockchip/board.c
+++ b/arch/arm/mach-rockchip/board.c
@@ -17,6 +17,7 @@
 #include <asm/arch-rockchip/clock.h>
 #include <asm/arch-rockchip/periph.h>
 #include <asm/arch-rockchip/misc.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 #include <power/regulator.h>
 
diff --git a/arch/arm/mach-rockchip/px30/px30.c b/arch/arm/mach-rockchip/px30/px30.c
index 6fcef63c1b0..f11424d105b 100644
--- a/arch/arm/mach-rockchip/px30/px30.c
+++ b/arch/arm/mach-rockchip/px30/px30.c
@@ -13,6 +13,7 @@
 #include <asm/arch-rockchip/uart.h>
 #include <asm/arch-rockchip/clock.h>
 #include <asm/arch-rockchip/cru_px30.h>
+#include <asm/u-boot.h>
 #include <dt-bindings/clock/px30-cru.h>
 
 static struct mm_region px30_mem_map[] = {
diff --git a/arch/arm/mach-rockchip/rk3128/rk3128.c b/arch/arm/mach-rockchip/rk3128/rk3128.c
index 01dbfa75cb2..ef2f50866a2 100644
--- a/arch/arm/mach-rockchip/rk3128/rk3128.c
+++ b/arch/arm/mach-rockchip/rk3128/rk3128.c
@@ -5,6 +5,7 @@
 #include <common.h>
 #include <init.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-rockchip/rk3188/rk3188.c b/arch/arm/mach-rockchip/rk3188/rk3188.c
index 1338979febb..1a6750d39b1 100644
--- a/arch/arm/mach-rockchip/rk3188/rk3188.c
+++ b/arch/arm/mach-rockchip/rk3188/rk3188.c
@@ -14,6 +14,7 @@
 #include <asm/arch-rockchip/clock.h>
 #include <asm/arch-rockchip/grf_rk3188.h>
 #include <asm/arch-rockchip/hardware.h>
+#include <asm/u-boot.h>
 #include <linux/err.h>
 #include <linux/printk.h>
 
diff --git a/arch/arm/mach-rockchip/rk322x/rk322x.c b/arch/arm/mach-rockchip/rk322x/rk322x.c
index ad4ac62e514..f94b8c8129c 100644
--- a/arch/arm/mach-rockchip/rk322x/rk322x.c
+++ b/arch/arm/mach-rockchip/rk322x/rk322x.c
@@ -7,6 +7,7 @@
 #include <asm/arch-rockchip/bootrom.h>
 #include <asm/arch-rockchip/grf_rk322x.h>
 #include <asm/arch-rockchip/hardware.h>
+#include <asm/u-boot.h>
 
 const char * const boot_devices[BROM_LAST_BOOTSOURCE + 1] = {
 	[BROM_BOOTSOURCE_EMMC] = "/dwmmc at 30020000",
diff --git a/arch/arm/mach-rockchip/rk3288/rk3288.c b/arch/arm/mach-rockchip/rk3288/rk3288.c
index bc20bc5ab90..d54eedb6a58 100644
--- a/arch/arm/mach-rockchip/rk3288/rk3288.c
+++ b/arch/arm/mach-rockchip/rk3288/rk3288.c
@@ -21,6 +21,7 @@
 #include <asm/arch-rockchip/pmu_rk3288.h>
 #include <asm/arch-rockchip/qos_rk3288.h>
 #include <asm/arch-rockchip/sdram.h>
+#include <asm/u-boot.h>
 #include <linux/err.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-rockchip/rk3308/rk3308.c b/arch/arm/mach-rockchip/rk3308/rk3308.c
index 70fe0d0ac35..5d5c44b8ea5 100644
--- a/arch/arm/mach-rockchip/rk3308/rk3308.c
+++ b/arch/arm/mach-rockchip/rk3308/rk3308.c
@@ -11,6 +11,7 @@
 #include <asm/arch-rockchip/hardware.h>
 #include <asm/gpio.h>
 #include <debug_uart.h>
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-rockchip/rk3328/rk3328.c b/arch/arm/mach-rockchip/rk3328/rk3328.c
index ec3336cb49a..6d49d28e059 100644
--- a/arch/arm/mach-rockchip/rk3328/rk3328.c
+++ b/arch/arm/mach-rockchip/rk3328/rk3328.c
@@ -12,6 +12,7 @@
 #include <asm/armv8/mmu.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-rockchip/rk3368/rk3368.c b/arch/arm/mach-rockchip/rk3368/rk3368.c
index 9b7132d471c..fef8bfc476a 100644
--- a/arch/arm/mach-rockchip/rk3368/rk3368.c
+++ b/arch/arm/mach-rockchip/rk3368/rk3368.c
@@ -15,6 +15,7 @@
 #include <asm/arch-rockchip/cru_rk3368.h>
 #include <asm/arch-rockchip/grf_rk3368.h>
 #include <asm/arch-rockchip/hardware.h>
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 
diff --git a/arch/arm/mach-rockchip/rk3399/rk3399.c b/arch/arm/mach-rockchip/rk3399/rk3399.c
index f8f6799a7fd..79d3045beb3 100644
--- a/arch/arm/mach-rockchip/rk3399/rk3399.c
+++ b/arch/arm/mach-rockchip/rk3399/rk3399.c
@@ -18,6 +18,7 @@
 #include <asm/arch-rockchip/gpio.h>
 #include <asm/arch-rockchip/grf_rk3399.h>
 #include <asm/arch-rockchip/hardware.h>
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/printk.h>
 #include <power/regulator.h>
diff --git a/arch/arm/mach-rockchip/sdram.c b/arch/arm/mach-rockchip/sdram.c
index ed07ece15a4..40335b8d208 100644
--- a/arch/arm/mach-rockchip/sdram.c
+++ b/arch/arm/mach-rockchip/sdram.c
@@ -11,6 +11,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch-rockchip/sdram.h>
+#include <asm/u-boot.h>
 #include <dm/uclass-internal.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-rockchip/spl.c b/arch/arm/mach-rockchip/spl.c
index 4b5c22dc138..6c8ab3192b3 100644
--- a/arch/arm/mach-rockchip/spl.c
+++ b/arch/arm/mach-rockchip/spl.c
@@ -15,6 +15,7 @@
 #include <asm/arch-rockchip/bootrom.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-socfpga/board.c b/arch/arm/mach-socfpga/board.c
index bdd5b863c45..0e5d68ede98 100644
--- a/arch/arm/mach-socfpga/board.c
+++ b/arch/arm/mach-socfpga/board.c
@@ -14,6 +14,7 @@
 #include <asm/arch/misc.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 
 #include <usb.h>
 #include <usb/dwc2_udc.h>
diff --git a/arch/arm/mach-socfpga/clock_manager.c b/arch/arm/mach-socfpga/clock_manager.c
index f0b15f770cc..017af139bc9 100644
--- a/arch/arm/mach-socfpga/clock_manager.c
+++ b/arch/arm/mach-socfpga/clock_manager.c
@@ -10,6 +10,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock_manager.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-socfpga/misc.c b/arch/arm/mach-socfpga/misc.c
index 6813279e6ae..52226d549c7 100644
--- a/arch/arm/mach-socfpga/misc.c
+++ b/arch/arm/mach-socfpga/misc.c
@@ -13,6 +13,7 @@
 #include <asm/io.h>
 #include <errno.h>
 #include <fdtdec.h>
+#include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <altera.h>
 #include <miiphy.h>
diff --git a/arch/arm/mach-socfpga/misc_arria10.c b/arch/arm/mach-socfpga/misc_arria10.c
index bf978053ca6..20394a5f6b3 100644
--- a/arch/arm/mach-socfpga/misc_arria10.c
+++ b/arch/arm/mach-socfpga/misc_arria10.c
@@ -21,6 +21,7 @@
 #include <asm/arch/nic301.h>
 #include <asm/io.h>
 #include <asm/pl310.h>
+#include <asm/u-boot.h>
 
 #define PINMUX_UART0_TX_SHARED_IO_OFFSET_Q1_3	0x08
 #define PINMUX_UART0_TX_SHARED_IO_OFFSET_Q2_11	0x58
diff --git a/arch/arm/mach-socfpga/misc_gen5.c b/arch/arm/mach-socfpga/misc_gen5.c
index 4edf4f9b5c1..fefb79a8486 100644
--- a/arch/arm/mach-socfpga/misc_gen5.c
+++ b/arch/arm/mach-socfpga/misc_gen5.c
@@ -11,6 +11,7 @@
 #include <env.h>
 #include <errno.h>
 #include <fdtdec.h>
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/libfdt.h>
 #include <altera.h>
diff --git a/arch/arm/mach-socfpga/misc_s10.c b/arch/arm/mach-socfpga/misc_s10.c
index 1e9a3f62059..461f0d189b1 100644
--- a/arch/arm/mach-socfpga/misc_s10.c
+++ b/arch/arm/mach-socfpga/misc_s10.c
@@ -19,6 +19,7 @@
 #include <asm/arch/system_manager.h>
 #include <asm/arch/misc.h>
 #include <asm/pl310.h>
+#include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <asm/arch/mailbox_s10.h>
 #include <linux/string.h>
diff --git a/arch/arm/mach-stm32/soc.c b/arch/arm/mach-stm32/soc.c
index 1f12da401c1..3ae6b7c4e9b 100644
--- a/arch/arm/mach-stm32/soc.c
+++ b/arch/arm/mach-stm32/soc.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <asm/io.h>
 #include <asm/armv7_mpu.h>
+#include <asm/u-boot.h>
 
 int arch_cpu_init(void)
 {
diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c
index 02923c80802..54ea1606515 100644
--- a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c
+++ b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c
@@ -12,6 +12,7 @@
 #include <part.h>
 #include <asm/arch/stm32mp1_smc.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <dm/uclass.h>
 #include <jffs2/load_kernel.h>
 #include <linux/list.h>
diff --git a/arch/arm/mach-stm32mp/cpu.c b/arch/arm/mach-stm32mp/cpu.c
index cd27a774d44..9c49e8fe684 100644
--- a/arch/arm/mach-stm32mp/cpu.c
+++ b/arch/arm/mach-stm32mp/cpu.c
@@ -16,6 +16,7 @@
 #include <asm/arch/bsec.h>
 #include <asm/arch/stm32.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/u-boot.h>
 #include <dm/device.h>
 #include <dm/uclass.h>
 #include <linux/bitops.h>
diff --git a/arch/arm/mach-stm32mp/dram_init.c b/arch/arm/mach-stm32mp/dram_init.c
index 611e0ff0eb7..36f07eacaab 100644
--- a/arch/arm/mach-stm32mp/dram_init.c
+++ b/arch/arm/mach-stm32mp/dram_init.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <ram.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-stm32mp/fdt.c b/arch/arm/mach-stm32mp/fdt.c
index 5a7d761586c..ded804403e3 100644
--- a/arch/arm/mach-stm32mp/fdt.c
+++ b/arch/arm/mach-stm32mp/fdt.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <tee.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/u-boot.h>
 #include <dt-bindings/pinctrl/stm32-pinfunc.h>
 #include <linux/io.h>
 #include <linux/string.h>
diff --git a/arch/arm/mach-stm32mp/spl.c b/arch/arm/mach-stm32mp/spl.c
index ab467de231a..701588df56d 100644
--- a/arch/arm/mach-stm32mp/spl.c
+++ b/arch/arm/mach-stm32mp/spl.c
@@ -14,6 +14,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/u-boot.h>
 #include <linux/libfdt.h>
 
 u32 spl_boot_device(void)
diff --git a/arch/arm/mach-sunxi/board.c b/arch/arm/mach-sunxi/board.c
index f40fccd8f8b..5c66da3eb10 100644
--- a/arch/arm/mach-sunxi/board.c
+++ b/arch/arm/mach-sunxi/board.c
@@ -27,6 +27,7 @@
 #include <asm/arch/timer.h>
 #include <asm/arch/tzpc.h>
 #include <asm/arch/mmc.h>
+#include <asm/u-boot.h>
 
 #include <linux/compiler.h>
 
diff --git a/arch/arm/mach-tegra/ap.c b/arch/arm/mach-tegra/ap.c
index 532730fe727..cfb6e899209 100644
--- a/arch/arm/mach-tegra/ap.c
+++ b/arch/arm/mach-tegra/ap.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <asm/u-boot.h>
 #include <linux/bug.h>
 #include <asm/io.h>
 #include <asm/arch/gp_padctrl.h>
diff --git a/arch/arm/mach-tegra/board2.c b/arch/arm/mach-tegra/board2.c
index 66376dd39a2..513153cbbb6 100644
--- a/arch/arm/mach-tegra/board2.c
+++ b/arch/arm/mach-tegra/board2.c
@@ -37,6 +37,7 @@
 #ifdef CONFIG_TEGRA_CLOCK_SCALING
 #include <asm/arch/emc.h>
 #endif
+#include <asm/u-boot.h>
 #include "emc.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-tegra/cboot.c b/arch/arm/mach-tegra/cboot.c
index b89f7badb52..33b40f8f7c8 100644
--- a/arch/arm/mach-tegra/cboot.c
+++ b/arch/arm/mach-tegra/cboot.c
@@ -15,6 +15,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/arch/arm/mach-tegra/dt-setup.c b/arch/arm/mach-tegra/dt-setup.c
index 602b20e6b7e..237f184b751 100644
--- a/arch/arm/mach-tegra/dt-setup.c
+++ b/arch/arm/mach-tegra/dt-setup.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <asm/arch-tegra/gpu.h>
+#include <asm/u-boot.h>
 
 /*
  * This function is called right before the kernel is booted. "blob" is the
diff --git a/arch/arm/mach-uniphier/bcu/bcu-ld4.c b/arch/arm/mach-uniphier/bcu/bcu-ld4.c
index ea6088ba1cb..33c1f12ce9a 100644
--- a/arch/arm/mach-uniphier/bcu/bcu-ld4.c
+++ b/arch/arm/mach-uniphier/bcu/bcu-ld4.c
@@ -5,6 +5,7 @@
  *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  */
 
+#include <asm/u-boot.h>
 #include <linux/io.h>
 
 #include "../init.h"
diff --git a/arch/arm/mach-uniphier/board_init.c b/arch/arm/mach-uniphier/board_init.c
index 30e4e23a643..b112b4c8cad 100644
--- a/arch/arm/mach-uniphier/board_init.c
+++ b/arch/arm/mach-uniphier/board_init.c
@@ -5,6 +5,7 @@
  *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  */
 
+#include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/printk.h>
diff --git a/arch/arm/mach-uniphier/clk/dpll-ld4.c b/arch/arm/mach-uniphier/clk/dpll-ld4.c
index f24a0eb0b82..fcdd2fddab3 100644
--- a/arch/arm/mach-uniphier/clk/dpll-ld4.c
+++ b/arch/arm/mach-uniphier/clk/dpll-ld4.c
@@ -4,6 +4,7 @@
  * Copyright (C) 2015-2016 Socionext Inc.
  */
 
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/io.h>
diff --git a/arch/arm/mach-uniphier/clk/dpll-pro4.c b/arch/arm/mach-uniphier/clk/dpll-pro4.c
index 204aee1a62c..b5ba17af136 100644
--- a/arch/arm/mach-uniphier/clk/dpll-pro4.c
+++ b/arch/arm/mach-uniphier/clk/dpll-pro4.c
@@ -4,6 +4,7 @@
  * Copyright (C) 2015-2016 Socionext Inc.
  */
 
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/io.h>
diff --git a/arch/arm/mach-uniphier/dram/umc-ld4.c b/arch/arm/mach-uniphier/dram/umc-ld4.c
index 1eb15b611fd..2a3002d1891 100644
--- a/arch/arm/mach-uniphier/dram/umc-ld4.c
+++ b/arch/arm/mach-uniphier/dram/umc-ld4.c
@@ -5,6 +5,7 @@
  *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  */
 
+#include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/printk.h>
diff --git a/arch/arm/mach-uniphier/dram/umc-pro4.c b/arch/arm/mach-uniphier/dram/umc-pro4.c
index 0114df782b4..535545866c8 100644
--- a/arch/arm/mach-uniphier/dram/umc-pro4.c
+++ b/arch/arm/mach-uniphier/dram/umc-pro4.c
@@ -5,6 +5,7 @@
  *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  */
 
+#include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/printk.h>
diff --git a/arch/arm/mach-uniphier/dram/umc-pxs2.c b/arch/arm/mach-uniphier/dram/umc-pxs2.c
index 73574201e31..199e846dc9d 100644
--- a/arch/arm/mach-uniphier/dram/umc-pxs2.c
+++ b/arch/arm/mach-uniphier/dram/umc-pxs2.c
@@ -7,6 +7,7 @@
  * Copyright (C) 2015 Socionext Inc.
  */
 
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/arch/arm/mach-uniphier/dram/umc-sld8.c b/arch/arm/mach-uniphier/dram/umc-sld8.c
index 583a1bad8b7..99039617479 100644
--- a/arch/arm/mach-uniphier/dram/umc-sld8.c
+++ b/arch/arm/mach-uniphier/dram/umc-sld8.c
@@ -5,6 +5,7 @@
  *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  */
 
+#include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/printk.h>
diff --git a/arch/arm/mach-uniphier/fdt-fixup.c b/arch/arm/mach-uniphier/fdt-fixup.c
index dfa32fdd48b..f65a8b62e66 100644
--- a/arch/arm/mach-uniphier/fdt-fixup.c
+++ b/arch/arm/mach-uniphier/fdt-fixup.c
@@ -6,6 +6,7 @@
 
 #include <fdt_support.h>
 #include <fdtdec.h>
+#include <asm/u-boot.h>
 #include <jffs2/load_kernel.h>
 #include <mtd_node.h>
 #include <linux/errno.h>
diff --git a/arch/arm/mach-uniphier/memconf.c b/arch/arm/mach-uniphier/memconf.c
index ab0d187a1fa..7a79340a92c 100644
--- a/arch/arm/mach-uniphier/memconf.c
+++ b/arch/arm/mach-uniphier/memconf.c
@@ -5,6 +5,7 @@
  *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  */
 
+#include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/printk.h>
diff --git a/arch/arm/mach-versal/clk.c b/arch/arm/mach-versal/clk.c
index 249e050cc8d..497b6d06aa1 100644
--- a/arch/arm/mach-versal/clk.c
+++ b/arch/arm/mach-versal/clk.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <time.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-versal/cpu.c b/arch/arm/mach-versal/cpu.c
index a35aac2c02c..c8a8415d5eb 100644
--- a/arch/arm/mach-versal/cpu.c
+++ b/arch/arm/mach-versal/cpu.c
@@ -13,6 +13,7 @@
 #include <asm/arch/hardware.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/cache.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-zynq/clk.c b/arch/arm/mach-zynq/clk.c
index 9bab393e211..0d652db49ec 100644
--- a/arch/arm/mach-zynq/clk.c
+++ b/arch/arm/mach-zynq/clk.c
@@ -10,6 +10,7 @@
 #include <malloc.h>
 #include <asm/arch/clk.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-zynq/cpu.c b/arch/arm/mach-zynq/cpu.c
index 77b7cb13071..cdd4a5b8c7a 100644
--- a/arch/arm/mach-zynq/cpu.c
+++ b/arch/arm/mach-zynq/cpu.c
@@ -13,6 +13,7 @@
 #include <asm/arch/hardware.h>
 #include <asm/arch/ps7_init_gpl.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/u-boot.h>
 
 #define ZYNQ_SILICON_VER_MASK	0xF0000000
 #define ZYNQ_SILICON_VER_SHIFT	28
diff --git a/arch/arm/mach-zynq/spl.c b/arch/arm/mach-zynq/spl.c
index eceb6e114c0..311c3dfe443 100644
--- a/arch/arm/mach-zynq/spl.c
+++ b/arch/arm/mach-zynq/spl.c
@@ -9,6 +9,7 @@
 #include <init.h>
 #include <log.h>
 #include <spl.h>
+#include <asm/u-boot.h>
 #include <generated/dt.h>
 #include <linux/string.h>
 
diff --git a/arch/arm/mach-zynqmp-r5/cpu.c b/arch/arm/mach-zynqmp-r5/cpu.c
index b9574997859..a16c2216a29 100644
--- a/arch/arm/mach-zynqmp-r5/cpu.c
+++ b/arch/arm/mach-zynqmp-r5/cpu.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <asm/armv7_mpu.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-zynqmp/clk.c b/arch/arm/mach-zynqmp/clk.c
index 1e6e726e879..83dfd4f1bd8 100644
--- a/arch/arm/mach-zynqmp/clk.c
+++ b/arch/arm/mach-zynqmp/clk.c
@@ -11,6 +11,7 @@
 #include <asm/arch/hardware.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-zynqmp/cpu.c b/arch/arm/mach-zynqmp/cpu.c
index a03b29acb83..443f6afbee1 100644
--- a/arch/arm/mach-zynqmp/cpu.c
+++ b/arch/arm/mach-zynqmp/cpu.c
@@ -15,6 +15,7 @@
 #include <asm/io.h>
 #include <zynqmp_firmware.h>
 #include <asm/cache.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 
 #define ZYNQ_SILICON_VER_MASK	0xF000
diff --git a/arch/arm/mach-zynqmp/spl.c b/arch/arm/mach-zynqmp/spl.c
index 9dd61e25f6f..14253a1c675 100644
--- a/arch/arm/mach-zynqmp/spl.c
+++ b/arch/arm/mach-zynqmp/spl.c
@@ -10,6 +10,7 @@
 #include <init.h>
 #include <log.h>
 #include <spl.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 
 #include <asm/io.h>
diff --git a/arch/m68k/cpu/mcf5227x/cpu_init.c b/arch/m68k/cpu/mcf5227x/cpu_init.c
index 4ab13b4d8ea..182656b62f0 100644
--- a/arch/m68k/cpu/mcf5227x/cpu_init.c
+++ b/arch/m68k/cpu/mcf5227x/cpu_init.c
@@ -12,6 +12,7 @@
 #include <cpu_func.h>
 #include <init.h>
 #include <watchdog.h>
+#include <asm/u-boot.h>
 
 #include <asm/immap.h>
 #include <asm/io.h>
diff --git a/arch/m68k/cpu/mcf523x/cpu.c b/arch/m68k/cpu/mcf523x/cpu.c
index 8d3ab6f3fb2..c091d39ef67 100644
--- a/arch/m68k/cpu/mcf523x/cpu.c
+++ b/arch/m68k/cpu/mcf523x/cpu.c
@@ -16,6 +16,7 @@
 #include <command.h>
 #include <netdev.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 
 #include <asm/immap.h>
 #include <asm/io.h>
diff --git a/arch/m68k/cpu/mcf523x/cpu_init.c b/arch/m68k/cpu/mcf523x/cpu_init.c
index 87effa71dc3..8d3619b3166 100644
--- a/arch/m68k/cpu/mcf523x/cpu_init.c
+++ b/arch/m68k/cpu/mcf523x/cpu_init.c
@@ -14,6 +14,7 @@
 #include <watchdog.h>
 #include <asm/immap.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 
 #if defined(CONFIG_CMD_NET)
 #include <config.h>
diff --git a/arch/m68k/cpu/mcf52x2/cpu.c b/arch/m68k/cpu/mcf52x2/cpu.c
index 0676e391410..9a6a77e13c0 100644
--- a/arch/m68k/cpu/mcf52x2/cpu.c
+++ b/arch/m68k/cpu/mcf52x2/cpu.c
@@ -23,6 +23,7 @@
 #include <asm/immap.h>
 #include <asm/io.h>
 #include <netdev.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include "cpu.h"
 
diff --git a/arch/m68k/cpu/mcf52x2/cpu_init.c b/arch/m68k/cpu/mcf52x2/cpu_init.c
index 9d4a10f028d..b564e75dbd0 100644
--- a/arch/m68k/cpu/mcf52x2/cpu_init.c
+++ b/arch/m68k/cpu/mcf52x2/cpu_init.c
@@ -23,6 +23,7 @@
 #include <watchdog.h>
 #include <asm/immap.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 
 #if defined(CONFIG_CMD_NET)
 #include <config.h>
diff --git a/arch/m68k/cpu/mcf530x/cpu_init.c b/arch/m68k/cpu/mcf530x/cpu_init.c
index 83529408eb3..b7dfb0d90ee 100644
--- a/arch/m68k/cpu/mcf530x/cpu_init.c
+++ b/arch/m68k/cpu/mcf530x/cpu_init.c
@@ -10,6 +10,7 @@
 #include <watchdog.h>
 #include <asm/immap.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 
 #if defined(CONFIG_M5307)
 /*
diff --git a/arch/m68k/cpu/mcf532x/cpu.c b/arch/m68k/cpu/mcf532x/cpu.c
index d37dd3defb7..cc56cdebb25 100644
--- a/arch/m68k/cpu/mcf532x/cpu.c
+++ b/arch/m68k/cpu/mcf532x/cpu.c
@@ -16,6 +16,7 @@
 #include <command.h>
 #include <netdev.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 
 #include <asm/immap.h>
diff --git a/arch/m68k/cpu/mcf532x/cpu_init.c b/arch/m68k/cpu/mcf532x/cpu_init.c
index 1311f3967c9..f7d371e37a1 100644
--- a/arch/m68k/cpu/mcf532x/cpu_init.c
+++ b/arch/m68k/cpu/mcf532x/cpu_init.c
@@ -14,6 +14,7 @@
 #include <watchdog.h>
 #include <asm/immap.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 
 #if defined(CONFIG_MCFFEC)
 #include <config.h>
diff --git a/arch/m68k/cpu/mcf5445x/cpu.c b/arch/m68k/cpu/mcf5445x/cpu.c
index ac1e5916816..1bdf983ac2e 100644
--- a/arch/m68k/cpu/mcf5445x/cpu.c
+++ b/arch/m68k/cpu/mcf5445x/cpu.c
@@ -16,6 +16,7 @@
 #include <command.h>
 #include <netdev.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 
 #include <asm/immap.h>
diff --git a/arch/m68k/cpu/mcf5445x/cpu_init.c b/arch/m68k/cpu/mcf5445x/cpu_init.c
index 9deab51d07e..7610e03fa5f 100644
--- a/arch/m68k/cpu/mcf5445x/cpu_init.c
+++ b/arch/m68k/cpu/mcf5445x/cpu_init.c
@@ -16,6 +16,7 @@
 #include <asm/processor.h>
 #include <asm/rtc.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 #include <linux/compiler.h>
 
 #if defined(CONFIG_CMD_NET)
diff --git a/arch/m68k/cpu/mcf547x_8x/cpu.c b/arch/m68k/cpu/mcf547x_8x/cpu.c
index c1361e70579..4df8459f698 100644
--- a/arch/m68k/cpu/mcf547x_8x/cpu.c
+++ b/arch/m68k/cpu/mcf547x_8x/cpu.c
@@ -16,6 +16,7 @@
 #include <command.h>
 #include <netdev.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 
 #include <asm/immap.h>
 #include <asm/io.h>
diff --git a/arch/m68k/cpu/mcf547x_8x/cpu_init.c b/arch/m68k/cpu/mcf547x_8x/cpu_init.c
index 8e42b631412..20443e81835 100644
--- a/arch/m68k/cpu/mcf547x_8x/cpu_init.c
+++ b/arch/m68k/cpu/mcf547x_8x/cpu_init.c
@@ -14,6 +14,7 @@
 #include <init.h>
 #include <asm/immap.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 
 #if defined(CONFIG_CMD_NET)
 #include <config.h>
diff --git a/arch/m68k/lib/bdinfo.c b/arch/m68k/lib/bdinfo.c
index c88e4fea407..da4ad9049bd 100644
--- a/arch/m68k/lib/bdinfo.c
+++ b/arch/m68k/lib/bdinfo.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <init.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/m68k/lib/bootm.c b/arch/m68k/lib/bootm.c
index 51a6f938586..6dbb86ee396 100644
--- a/arch/m68k/lib/bootm.c
+++ b/arch/m68k/lib/bootm.c
@@ -12,6 +12,7 @@
 #include <lmb.h>
 #include <log.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <u-boot/zlib.h>
 #include <bzlib.h>
 #include <watchdog.h>
diff --git a/arch/m68k/lib/traps.c b/arch/m68k/lib/traps.c
index c49141f376d..78bbe6f56ba 100644
--- a/arch/m68k/lib/traps.c
+++ b/arch/m68k/lib/traps.c
@@ -13,6 +13,7 @@
 #include <command.h>
 #include <asm/processor.h>
 #include <asm/ptrace.h>
+#include <asm/u-boot.h>
 
 
 extern void _exc_handler(void);
diff --git a/arch/microblaze/cpu/timer.c b/arch/microblaze/cpu/timer.c
index 05ab0e1b157..64ac5bc2851 100644
--- a/arch/microblaze/cpu/timer.c
+++ b/arch/microblaze/cpu/timer.c
@@ -13,6 +13,7 @@
 #include <asm/global_data.h>
 #include <asm/microblaze_timer.h>
 #include <asm/microblaze_intc.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/microblaze/include/asm/processor.h b/arch/microblaze/include/asm/processor.h
index 16e0d0ef0a9..444f5eabba9 100644
--- a/arch/microblaze/include/asm/processor.h
+++ b/arch/microblaze/include/asm/processor.h
@@ -8,6 +8,7 @@
 
 /* References to section boundaries */
 
+#include <asm/u-boot.h>
 extern char __end[];
 extern char __text_start[];
 
diff --git a/arch/microblaze/lib/bootm.c b/arch/microblaze/lib/bootm.c
index 6695ac63c77..cdf8124d901 100644
--- a/arch/microblaze/lib/bootm.c
+++ b/arch/microblaze/lib/bootm.c
@@ -19,6 +19,7 @@
 #include <log.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <u-boot/zlib.h>
 #include <asm/byteorder.h>
 
diff --git a/arch/mips/lib/boot.c b/arch/mips/lib/boot.c
index d5a139ef5ec..53e8cccad47 100644
--- a/arch/mips/lib/boot.c
+++ b/arch/mips/lib/boot.c
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <cpu_func.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/mips/lib/bootm.c b/arch/mips/lib/bootm.c
index ec165a32b0a..c0004176c4c 100644
--- a/arch/mips/lib/bootm.c
+++ b/arch/mips/lib/bootm.c
@@ -14,6 +14,7 @@
 #include <asm/addrspace.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/mips/lib/traps.c b/arch/mips/lib/traps.c
index 510ef4c6c09..190a3cc495e 100644
--- a/arch/mips/lib/traps.c
+++ b/arch/mips/lib/traps.c
@@ -20,6 +20,7 @@
 #include <asm/mipsregs.h>
 #include <asm/addrspace.h>
 #include <asm/system.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/mips/mach-ath79/ar933x/clk.c b/arch/mips/mach-ath79/ar933x/clk.c
index 68d48939d7d..6b3cbdd0e57 100644
--- a/arch/mips/mach-ath79/ar933x/clk.c
+++ b/arch/mips/mach-ath79/ar933x/clk.c
@@ -9,6 +9,7 @@
 #include <asm/io.h>
 #include <asm/addrspace.h>
 #include <asm/types.h>
+#include <asm/u-boot.h>
 #include <mach/ar71xx_regs.h>
 #include <mach/ath79.h>
 
diff --git a/arch/mips/mach-ath79/ar934x/clk.c b/arch/mips/mach-ath79/ar934x/clk.c
index 6ed4057353a..9e4dd8bb7e5 100644
--- a/arch/mips/mach-ath79/ar934x/clk.c
+++ b/arch/mips/mach-ath79/ar934x/clk.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <asm/addrspace.h>
 #include <asm/types.h>
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <mach/ar71xx_regs.h>
diff --git a/arch/mips/mach-ath79/qca953x/clk.c b/arch/mips/mach-ath79/qca953x/clk.c
index f5438ef1c8d..6e8a4c0d194 100644
--- a/arch/mips/mach-ath79/qca953x/clk.c
+++ b/arch/mips/mach-ath79/qca953x/clk.c
@@ -9,6 +9,7 @@
 #include <asm/io.h>
 #include <asm/addrspace.h>
 #include <asm/types.h>
+#include <asm/u-boot.h>
 #include <mach/ar71xx_regs.h>
 #include <mach/ath79.h>
 
diff --git a/arch/mips/mach-ath79/qca956x/clk.c b/arch/mips/mach-ath79/qca956x/clk.c
index 6a58dba91f3..996f846c480 100644
--- a/arch/mips/mach-ath79/qca956x/clk.c
+++ b/arch/mips/mach-ath79/qca956x/clk.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <asm/addrspace.h>
 #include <asm/types.h>
+#include <asm/u-boot.h>
 #include <mach/ar71xx_regs.h>
 #include <mach/ath79.h>
 #include <wait_bit.h>
diff --git a/arch/mips/mach-jz47xx/jz4780/jz4780.c b/arch/mips/mach-jz47xx/jz4780/jz4780.c
index de9bd05fcfd..5eeaaf7a146 100644
--- a/arch/mips/mach-jz47xx/jz4780/jz4780.c
+++ b/arch/mips/mach-jz47xx/jz4780/jz4780.c
@@ -15,6 +15,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/sections.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 #include <mach/jz4780.h>
 #include <mach/jz4780_dram.h>
diff --git a/arch/mips/mach-octeon/dram.c b/arch/mips/mach-octeon/dram.c
index ff7a59f2ab8..331394b34a6 100644
--- a/arch/mips/mach-octeon/dram.c
+++ b/arch/mips/mach-octeon/dram.c
@@ -6,6 +6,7 @@
 #include <dm.h>
 #include <ram.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/compat.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/nds32/cpu/n1213/ae3xx/cpu.c b/arch/nds32/cpu/n1213/ae3xx/cpu.c
index c3efa31f594..733a513ed58 100644
--- a/arch/nds32/cpu/n1213/ae3xx/cpu.c
+++ b/arch/nds32/cpu/n1213/ae3xx/cpu.c
@@ -19,6 +19,7 @@
 #include <irq_func.h>
 #include <watchdog.h>
 #include <asm/cache.h>
+#include <asm/u-boot.h>
 
 #include <faraday/ftwdt010_wdt.h>
 
diff --git a/arch/nds32/cpu/n1213/ag101/cpu.c b/arch/nds32/cpu/n1213/ag101/cpu.c
index 9d99c83bf3a..8fd331779cb 100644
--- a/arch/nds32/cpu/n1213/ag101/cpu.c
+++ b/arch/nds32/cpu/n1213/ag101/cpu.c
@@ -19,6 +19,7 @@
 #include <irq_func.h>
 #include <watchdog.h>
 #include <asm/cache.h>
+#include <asm/u-boot.h>
 
 #include <faraday/ftwdt010_wdt.h>
 
diff --git a/arch/nds32/cpu/n1213/ag101/timer.c b/arch/nds32/cpu/n1213/ag101/timer.c
index 394fc10ec3a..7fef69cd213 100644
--- a/arch/nds32/cpu/n1213/ag101/timer.c
+++ b/arch/nds32/cpu/n1213/ag101/timer.c
@@ -14,6 +14,7 @@
 #include <log.h>
 #include <time.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 #include <faraday/fttmr010.h>
 #include <linux/delay.h>
 
@@ -193,4 +194,5 @@ ulong get_tbclk(void)
 	return CONFIG_SYS_CLK_FREQ;
 #endif
 }
+
 #endif /* CONFIG_TIMER */
diff --git a/arch/nds32/lib/boot.c b/arch/nds32/lib/boot.c
index da2fd36a16c..9411285fe23 100644
--- a/arch/nds32/lib/boot.c
+++ b/arch/nds32/lib/boot.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <asm/u-boot.h>
 
 unsigned long do_go_exec(ulong (*entry)(int, char * const []),
 			 int argc, char *const argv[])
diff --git a/arch/nds32/lib/bootm.c b/arch/nds32/lib/bootm.c
index 4668ed9af8b..95759930454 100644
--- a/arch/nds32/lib/bootm.c
+++ b/arch/nds32/lib/bootm.c
@@ -13,6 +13,7 @@
 #include <image.h>
 #include <log.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 #include <u-boot/zlib.h>
 #include <asm/byteorder.h>
diff --git a/arch/nds32/lib/interrupts.c b/arch/nds32/lib/interrupts.c
index 1481e055007..3d04e3091f8 100644
--- a/arch/nds32/lib/interrupts.c
+++ b/arch/nds32/lib/interrupts.c
@@ -14,6 +14,7 @@
 #include <irq_func.h>
 #include <asm/ptrace.h>
 #include <asm/system.h>
+#include <asm/u-boot.h>
 #undef INTERRUPT_MODE
 
 static int int_flag;
diff --git a/arch/powerpc/cpu/mpc83xx/cpu.c b/arch/powerpc/cpu/mpc83xx/cpu.c
index 8d531898bd8..927cdc515d9 100644
--- a/arch/powerpc/cpu/mpc83xx/cpu.c
+++ b/arch/powerpc/cpu/mpc83xx/cpu.c
@@ -20,6 +20,7 @@
 #include <mpc83xx.h>
 #include <asm/global_data.h>
 #include <asm/processor.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 #include <tsec.h>
diff --git a/arch/powerpc/cpu/mpc83xx/ecc.c b/arch/powerpc/cpu/mpc83xx/ecc.c
index 903983ded3e..4760c188307 100644
--- a/arch/powerpc/cpu/mpc83xx/ecc.c
+++ b/arch/powerpc/cpu/mpc83xx/ecc.c
@@ -10,6 +10,7 @@
 #include <irq_func.h>
 #include <mpc83xx.h>
 #include <command.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 
 #if defined(CONFIG_DDR_ECC) && defined(CONFIG_DDR_ECC_CMD)
diff --git a/arch/powerpc/cpu/mpc83xx/fdt.c b/arch/powerpc/cpu/mpc83xx/fdt.c
index 707838ac9ab..f658f98d5d6 100644
--- a/arch/powerpc/cpu/mpc83xx/fdt.c
+++ b/arch/powerpc/cpu/mpc83xx/fdt.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <clock_legacy.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <asm/processor.h>
diff --git a/arch/powerpc/cpu/mpc83xx/interrupts.c b/arch/powerpc/cpu/mpc83xx/interrupts.c
index f9486678af3..2f463f87f7c 100644
--- a/arch/powerpc/cpu/mpc83xx/interrupts.c
+++ b/arch/powerpc/cpu/mpc83xx/interrupts.c
@@ -13,6 +13,7 @@
 #include <asm/global_data.h>
 #include <asm/processor.h>
 #include <asm/ptrace.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/powerpc/cpu/mpc83xx/law.c b/arch/powerpc/cpu/mpc83xx/law.c
index 5e02f4094bb..33ed4895d3b 100644
--- a/arch/powerpc/cpu/mpc83xx/law.c
+++ b/arch/powerpc/cpu/mpc83xx/law.c
@@ -7,6 +7,7 @@
 #include <log.h>
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
+#include <asm/u-boot.h>
 #include <linux/log2.h>
 
 int set_ddr_laws(u64 start, u64 sz, enum law_trgt_if id)
diff --git a/arch/powerpc/cpu/mpc83xx/pci.c b/arch/powerpc/cpu/mpc83xx/pci.c
index 5c289d00226..7f5ddb99840 100644
--- a/arch/powerpc/cpu/mpc83xx/pci.c
+++ b/arch/powerpc/cpu/mpc83xx/pci.c
@@ -11,6 +11,7 @@
 #include <pci.h>
 #include <asm/bitops.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 
 #if defined(CONFIG_OF_LIBFDT)
diff --git a/arch/powerpc/cpu/mpc83xx/pcie.c b/arch/powerpc/cpu/mpc83xx/pcie.c
index 84797c871c9..f05f0a9b127 100644
--- a/arch/powerpc/cpu/mpc83xx/pcie.c
+++ b/arch/powerpc/cpu/mpc83xx/pcie.c
@@ -12,6 +12,7 @@
 #include <mpc83xx.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/powerpc/cpu/mpc83xx/spd_sdram.c b/arch/powerpc/cpu/mpc83xx/spd_sdram.c
index a861e8dd2dd..2d194745ed1 100644
--- a/arch/powerpc/cpu/mpc83xx/spd_sdram.c
+++ b/arch/powerpc/cpu/mpc83xx/spd_sdram.c
@@ -25,6 +25,7 @@
 #include <spd_sdram.h>
 #include <asm/bitops.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/powerpc/cpu/mpc83xx/speed.c b/arch/powerpc/cpu/mpc83xx/speed.c
index 58e197f1208..0ec27a5ac1c 100644
--- a/arch/powerpc/cpu/mpc83xx/speed.c
+++ b/arch/powerpc/cpu/mpc83xx/speed.c
@@ -602,4 +602,5 @@ U_BOOT_CMD(clocks, 1, 0, do_clocks,
 	"    clocks"
 );
 
+#include <asm/u-boot.h>
 #endif
diff --git a/arch/powerpc/cpu/mpc83xx/spl_minimal.c b/arch/powerpc/cpu/mpc83xx/spl_minimal.c
index 00cb2bd044e..efd5ddf8798 100644
--- a/arch/powerpc/cpu/mpc83xx/spl_minimal.c
+++ b/arch/powerpc/cpu/mpc83xx/spl_minimal.c
@@ -9,6 +9,7 @@
 #include <mpc83xx.h>
 #include <time.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 
 #include "lblaw/lblaw.h"
 #include "elbc/elbc.h"
diff --git a/arch/powerpc/cpu/mpc83xx/traps.c b/arch/powerpc/cpu/mpc83xx/traps.c
index 74781126e94..a0539f4924d 100644
--- a/arch/powerpc/cpu/mpc83xx/traps.c
+++ b/arch/powerpc/cpu/mpc83xx/traps.c
@@ -18,6 +18,7 @@
 #include <kgdb.h>
 #include <asm/processor.h>
 #include <asm/mpc8349_pci.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/powerpc/cpu/mpc85xx/cmd_errata.c b/arch/powerpc/cpu/mpc85xx/cmd_errata.c
index ff73596ba90..53bc1ccca19 100644
--- a/arch/powerpc/cpu/mpc85xx/cmd_errata.c
+++ b/arch/powerpc/cpu/mpc85xx/cmd_errata.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <command.h>
 #include <init.h>
+#include <asm/u-boot.h>
 #include <linux/compiler.h>
 #include <fsl_errata.h>
 #include <asm/processor.h>
diff --git a/arch/powerpc/cpu/mpc85xx/cpu.c b/arch/powerpc/cpu/mpc85xx/cpu.c
index d35c9780172..ea3554af781 100644
--- a/arch/powerpc/cpu/mpc85xx/cpu.c
+++ b/arch/powerpc/cpu/mpc85xx/cpu.c
@@ -31,6 +31,7 @@
 #include <asm/processor.h>
 #include <fsl_ddr_sdram.h>
 #include <asm/ppc.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init.c b/arch/powerpc/cpu/mpc85xx/cpu_init.c
index ad6e79396e7..c4ebab036d3 100644
--- a/arch/powerpc/cpu/mpc85xx/cpu_init.c
+++ b/arch/powerpc/cpu/mpc85xx/cpu_init.c
@@ -33,6 +33,7 @@
 #endif
 #include <fsl_usb.h>
 #include <hwconfig.h>
+#include <asm/u-boot.h>
 #include <linux/compiler.h>
 #include <linux/delay.h>
 #include <linux/string.h>
diff --git a/arch/powerpc/cpu/mpc85xx/ether_fcc.c b/arch/powerpc/cpu/mpc85xx/ether_fcc.c
index c6f89e0eba9..d458d0e135e 100644
--- a/arch/powerpc/cpu/mpc85xx/ether_fcc.c
+++ b/arch/powerpc/cpu/mpc85xx/ether_fcc.c
@@ -30,6 +30,7 @@
 #include <command.h>
 #include <config.h>
 #include <net.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 
 #if defined(CONFIG_MII) || defined(CONFIG_CMD_MII)
diff --git a/arch/powerpc/cpu/mpc85xx/fdt.c b/arch/powerpc/cpu/mpc85xx/fdt.c
index 4eecbe667ec..41bbddf81d4 100644
--- a/arch/powerpc/cpu/mpc85xx/fdt.c
+++ b/arch/powerpc/cpu/mpc85xx/fdt.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <time.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <asm/processor.h>
diff --git a/arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c b/arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c
index 29a64b309b2..6cf2cde8f7f 100644
--- a/arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <asm/processor.h>
 #include <asm/fsl_law.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <fsl_errata.h>
diff --git a/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c b/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c
index f5126e2c8ac..98b501c6126 100644
--- a/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c
@@ -14,6 +14,7 @@
 #include <asm/immap_85xx.h>
 #include <asm/io.h>
 #include <asm/processor.h>
+#include <asm/u-boot.h>
 #include <asm/fsl_law.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/arch/powerpc/cpu/mpc85xx/interrupts.c b/arch/powerpc/cpu/mpc85xx/interrupts.c
index 4ad762683fb..cfb2c7bf0ad 100644
--- a/arch/powerpc/cpu/mpc85xx/interrupts.c
+++ b/arch/powerpc/cpu/mpc85xx/interrupts.c
@@ -22,6 +22,7 @@
 #include <post.h>
 #endif
 #include <asm/ptrace.h>
+#include <asm/u-boot.h>
 
 void interrupt_init_cpu(unsigned *decrementer_count)
 {
diff --git a/arch/powerpc/cpu/mpc85xx/liodn.c b/arch/powerpc/cpu/mpc85xx/liodn.c
index a85c8117920..397167b3e85 100644
--- a/arch/powerpc/cpu/mpc85xx/liodn.c
+++ b/arch/powerpc/cpu/mpc85xx/liodn.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <linux/string.h>
diff --git a/arch/powerpc/cpu/mpc85xx/mp.c b/arch/powerpc/cpu/mpc85xx/mp.c
index c9854a82a96..c9f307d259e 100644
--- a/arch/powerpc/cpu/mpc85xx/mp.c
+++ b/arch/powerpc/cpu/mpc85xx/mp.c
@@ -16,6 +16,7 @@
 #include <asm/mmu.h>
 #include <asm/fsl_law.h>
 #include <fsl_ddr_sdram.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 #include "mp.h"
diff --git a/arch/powerpc/cpu/mpc85xx/mpc8536_serdes.c b/arch/powerpc/cpu/mpc85xx/mpc8536_serdes.c
index 111692f15d1..cfae81fbced 100644
--- a/arch/powerpc/cpu/mpc85xx/mpc8536_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/mpc8536_serdes.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
+#include <asm/u-boot.h>
 
 /* PORDEVSR register */
 #define GUTS_PORDEVSR_OFFS		0xc
diff --git a/arch/powerpc/cpu/mpc85xx/mpc8544_serdes.c b/arch/powerpc/cpu/mpc85xx/mpc8544_serdes.c
index f3b5450ad55..6aa55b9d842 100644
--- a/arch/powerpc/cpu/mpc85xx/mpc8544_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/mpc8544_serdes.c
@@ -9,6 +9,7 @@
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
+#include <asm/u-boot.h>
 
 #define SRDS1_MAX_LANES		8
 #define SRDS2_MAX_LANES		4
diff --git a/arch/powerpc/cpu/mpc85xx/mpc8548_serdes.c b/arch/powerpc/cpu/mpc85xx/mpc8548_serdes.c
index 2a5c3e32002..94b584e03b5 100644
--- a/arch/powerpc/cpu/mpc85xx/mpc8548_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/mpc8548_serdes.c
@@ -9,6 +9,7 @@
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
+#include <asm/u-boot.h>
 
 #define SRDS1_MAX_LANES		8
 
diff --git a/arch/powerpc/cpu/mpc85xx/mpc8568_serdes.c b/arch/powerpc/cpu/mpc85xx/mpc8568_serdes.c
index 81b66c3fa6a..d2d93a9e5f7 100644
--- a/arch/powerpc/cpu/mpc85xx/mpc8568_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/mpc8568_serdes.c
@@ -9,6 +9,7 @@
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
+#include <asm/u-boot.h>
 
 #define SRDS1_MAX_LANES		8
 
diff --git a/arch/powerpc/cpu/mpc85xx/mpc8569_serdes.c b/arch/powerpc/cpu/mpc85xx/mpc8569_serdes.c
index eb54b8252b2..474be34b77d 100644
--- a/arch/powerpc/cpu/mpc85xx/mpc8569_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/mpc8569_serdes.c
@@ -9,6 +9,7 @@
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
+#include <asm/u-boot.h>
 
 #define SRDS1_MAX_LANES		4
 
diff --git a/arch/powerpc/cpu/mpc85xx/mpc8572_serdes.c b/arch/powerpc/cpu/mpc85xx/mpc8572_serdes.c
index 1b4e6149184..231e12bdfea 100644
--- a/arch/powerpc/cpu/mpc85xx/mpc8572_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/mpc8572_serdes.c
@@ -9,6 +9,7 @@
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
+#include <asm/u-boot.h>
 
 #define SRDS1_MAX_LANES		8
 
diff --git a/arch/powerpc/cpu/mpc85xx/p1010_serdes.c b/arch/powerpc/cpu/mpc85xx/p1010_serdes.c
index 8cba4222c4f..4fafd03b945 100644
--- a/arch/powerpc/cpu/mpc85xx/p1010_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/p1010_serdes.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
+#include <asm/u-boot.h>
 
 #define SRDS1_MAX_LANES		4
 #define SRDS2_MAX_LANES		2
diff --git a/arch/powerpc/cpu/mpc85xx/p1021_serdes.c b/arch/powerpc/cpu/mpc85xx/p1021_serdes.c
index 6b8e447e94a..32f3927f444 100644
--- a/arch/powerpc/cpu/mpc85xx/p1021_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/p1021_serdes.c
@@ -9,6 +9,7 @@
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 
 typedef struct serdes_85xx {
diff --git a/arch/powerpc/cpu/mpc85xx/p1022_serdes.c b/arch/powerpc/cpu/mpc85xx/p1022_serdes.c
index 719cb4f3d4e..8dd9660bd4d 100644
--- a/arch/powerpc/cpu/mpc85xx/p1022_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/p1022_serdes.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
+#include <asm/u-boot.h>
 
 #define SRDS1_MAX_LANES		4
 #define SRDS2_MAX_LANES		2
diff --git a/arch/powerpc/cpu/mpc85xx/p1023_serdes.c b/arch/powerpc/cpu/mpc85xx/p1023_serdes.c
index bf5cac61992..516f61b452e 100644
--- a/arch/powerpc/cpu/mpc85xx/p1023_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/p1023_serdes.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
+#include <asm/u-boot.h>
 
 #define SRDS1_MAX_LANES		4
 
diff --git a/arch/powerpc/cpu/mpc85xx/p2020_serdes.c b/arch/powerpc/cpu/mpc85xx/p2020_serdes.c
index f36b1b64ede..4e79a7fcfa1 100644
--- a/arch/powerpc/cpu/mpc85xx/p2020_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/p2020_serdes.c
@@ -9,6 +9,7 @@
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
+#include <asm/u-boot.h>
 
 #define SRDS1_MAX_LANES		4
 
diff --git a/arch/powerpc/cpu/mpc85xx/p2041_serdes.c b/arch/powerpc/cpu/mpc85xx/p2041_serdes.c
index 3eca3a69326..47e30a15e2e 100644
--- a/arch/powerpc/cpu/mpc85xx/p2041_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/p2041_serdes.c
@@ -7,6 +7,7 @@
 #include <asm/fsl_serdes.h>
 #include <asm/processor.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 #include "fsl_corenet_serdes.h"
 
 static u8 serdes_cfg_tbl[][SRDS_MAX_LANES] = {
diff --git a/arch/powerpc/cpu/mpc85xx/p3041_serdes.c b/arch/powerpc/cpu/mpc85xx/p3041_serdes.c
index ec8234c1c1e..be417c94112 100644
--- a/arch/powerpc/cpu/mpc85xx/p3041_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/p3041_serdes.c
@@ -7,6 +7,7 @@
 #include <asm/fsl_serdes.h>
 #include <asm/processor.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 #include "fsl_corenet_serdes.h"
 
 static u8 serdes_cfg_tbl[][SRDS_MAX_LANES] = {
diff --git a/arch/powerpc/cpu/mpc85xx/p4080_serdes.c b/arch/powerpc/cpu/mpc85xx/p4080_serdes.c
index 463fa119c9b..fdbb3f7a172 100644
--- a/arch/powerpc/cpu/mpc85xx/p4080_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/p4080_serdes.c
@@ -8,6 +8,7 @@
 #include <asm/fsl_serdes.h>
 #include <asm/processor.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 #include "fsl_corenet_serdes.h"
 
 static u8 serdes_cfg_tbl[][SRDS_MAX_LANES] = {
diff --git a/arch/powerpc/cpu/mpc85xx/p5020_serdes.c b/arch/powerpc/cpu/mpc85xx/p5020_serdes.c
index ec8234c1c1e..be417c94112 100644
--- a/arch/powerpc/cpu/mpc85xx/p5020_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/p5020_serdes.c
@@ -7,6 +7,7 @@
 #include <asm/fsl_serdes.h>
 #include <asm/processor.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 #include "fsl_corenet_serdes.h"
 
 static u8 serdes_cfg_tbl[][SRDS_MAX_LANES] = {
diff --git a/arch/powerpc/cpu/mpc85xx/p5040_serdes.c b/arch/powerpc/cpu/mpc85xx/p5040_serdes.c
index 2327b2c2a41..a8403d21bbe 100644
--- a/arch/powerpc/cpu/mpc85xx/p5040_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/p5040_serdes.c
@@ -7,6 +7,7 @@
 #include <asm/fsl_serdes.h>
 #include <asm/processor.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 #include "fsl_corenet_serdes.h"
 
 /*
diff --git a/arch/powerpc/cpu/mpc85xx/pci.c b/arch/powerpc/cpu/mpc85xx/pci.c
index 9a6fc13b73f..8853a6ea489 100644
--- a/arch/powerpc/cpu/mpc85xx/pci.c
+++ b/arch/powerpc/cpu/mpc85xx/pci.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <asm/bitops.h>
 #include <asm/cpm_85xx.h>
+#include <asm/u-boot.h>
 #include <pci.h>
 
 #if !defined(CONFIG_FSL_PCI_INIT) && !defined(CONFIG_DM_PCI)
diff --git a/arch/powerpc/cpu/mpc85xx/qe_io.c b/arch/powerpc/cpu/mpc85xx/qe_io.c
index c5b1443058e..fb75fa105ba 100644
--- a/arch/powerpc/cpu/mpc85xx/qe_io.c
+++ b/arch/powerpc/cpu/mpc85xx/qe_io.c
@@ -10,6 +10,7 @@
 #include <linux/errno.h>
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
+#include <asm/u-boot.h>
 
 #if defined(CONFIG_QE) && !defined(CONFIG_U_QE)
 #define	NUM_OF_PINS	32
diff --git a/arch/powerpc/cpu/mpc85xx/speed.c b/arch/powerpc/cpu/mpc85xx/speed.c
index 09653c70125..c83727ed05a 100644
--- a/arch/powerpc/cpu/mpc85xx/speed.c
+++ b/arch/powerpc/cpu/mpc85xx/speed.c
@@ -13,6 +13,7 @@
 #include <cpu_func.h>
 #include <ppc_asm.tmpl>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/compiler.h>
 #include <asm/processor.h>
 #include <asm/io.h>
diff --git a/arch/powerpc/cpu/mpc85xx/spl_minimal.c b/arch/powerpc/cpu/mpc85xx/spl_minimal.c
index 21b35db08df..723f6ecef62 100644
--- a/arch/powerpc/cpu/mpc85xx/spl_minimal.c
+++ b/arch/powerpc/cpu/mpc85xx/spl_minimal.c
@@ -8,6 +8,7 @@
 #include <asm/global_data.h>
 #include <fsl_ifc.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/powerpc/cpu/mpc85xx/t1024_serdes.c b/arch/powerpc/cpu/mpc85xx/t1024_serdes.c
index 16458e73be1..d803fc6c2b2 100644
--- a/arch/powerpc/cpu/mpc85xx/t1024_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/t1024_serdes.c
@@ -7,7 +7,7 @@
 #include <asm/fsl_serdes.h>
 #include <asm/processor.h>
 #include <asm/io.h>
-
+#include <asm/u-boot.h>
 
 static u8 serdes_cfg_tbl[][SRDS_MAX_LANES] = {
 	[0x40] = {PCIE1, PCIE1, PCIE1, PCIE1},
diff --git a/arch/powerpc/cpu/mpc85xx/t1040_serdes.c b/arch/powerpc/cpu/mpc85xx/t1040_serdes.c
index 3a7fdef79c2..4b77ab66bc9 100644
--- a/arch/powerpc/cpu/mpc85xx/t1040_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/t1040_serdes.c
@@ -7,6 +7,7 @@
 #include <asm/fsl_serdes.h>
 #include <asm/processor.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 
 
 static u8 serdes_cfg_tbl[][SRDS_MAX_LANES] = {
diff --git a/arch/powerpc/cpu/mpc85xx/t2080_serdes.c b/arch/powerpc/cpu/mpc85xx/t2080_serdes.c
index 32cfcc0242b..f6fc13c48e1 100644
--- a/arch/powerpc/cpu/mpc85xx/t2080_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/t2080_serdes.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <asm/fsl_serdes.h>
 #include <asm/processor.h>
+#include <asm/u-boot.h>
 #include "fsl_corenet2_serdes.h"
 
 struct serdes_config {
diff --git a/arch/powerpc/cpu/mpc85xx/t4240_serdes.c b/arch/powerpc/cpu/mpc85xx/t4240_serdes.c
index a8c0c47f4af..6ee09d78413 100644
--- a/arch/powerpc/cpu/mpc85xx/t4240_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/t4240_serdes.c
@@ -7,6 +7,7 @@
 #include <asm/fsl_serdes.h>
 #include <asm/processor.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 #include "fsl_corenet2_serdes.h"
 
 struct serdes_config {
diff --git a/arch/powerpc/cpu/mpc85xx/tlb.c b/arch/powerpc/cpu/mpc85xx/tlb.c
index 927df4e5b66..2993a528630 100644
--- a/arch/powerpc/cpu/mpc85xx/tlb.c
+++ b/arch/powerpc/cpu/mpc85xx/tlb.c
@@ -12,6 +12,7 @@
 #include <asm/global_data.h>
 #include <asm/processor.h>
 #include <asm/mmu.h>
+#include <asm/u-boot.h>
 #ifdef CONFIG_ADDR_MAP
 #include <addr_map.h>
 #endif
diff --git a/arch/powerpc/cpu/mpc85xx/traps.c b/arch/powerpc/cpu/mpc85xx/traps.c
index 080451ec567..0f37ed283f6 100644
--- a/arch/powerpc/cpu/mpc85xx/traps.c
+++ b/arch/powerpc/cpu/mpc85xx/traps.c
@@ -27,6 +27,7 @@
 #include <irq_func.h>
 #include <kgdb.h>
 #include <asm/processor.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/powerpc/cpu/mpc86xx/cpu.c b/arch/powerpc/cpu/mpc86xx/cpu.c
index 05160778566..bab81cc72ab 100644
--- a/arch/powerpc/cpu/mpc86xx/cpu.c
+++ b/arch/powerpc/cpu/mpc86xx/cpu.c
@@ -19,6 +19,7 @@
 #include <mpc86xx.h>
 #include <asm/fsl_law.h>
 #include <asm/ppc.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/powerpc/cpu/mpc86xx/cpu_init.c b/arch/powerpc/cpu/mpc86xx/cpu_init.c
index 73779f862c2..4e18aebcfa5 100644
--- a/arch/powerpc/cpu/mpc86xx/cpu_init.c
+++ b/arch/powerpc/cpu/mpc86xx/cpu_init.c
@@ -19,6 +19,7 @@
 #include <asm/fsl_law.h>
 #include <asm/fsl_serdes.h>
 #include <asm/mp.h>
+#include <asm/u-boot.h>
 
 extern void srio_init(void);
 
diff --git a/arch/powerpc/cpu/mpc86xx/fdt.c b/arch/powerpc/cpu/mpc86xx/fdt.c
index 24e53115ecc..a5c313b8a25 100644
--- a/arch/powerpc/cpu/mpc86xx/fdt.c
+++ b/arch/powerpc/cpu/mpc86xx/fdt.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <asm/mp.h>
diff --git a/arch/powerpc/cpu/mpc86xx/interrupts.c b/arch/powerpc/cpu/mpc86xx/interrupts.c
index 5a916600ed6..d3ebda7d408 100644
--- a/arch/powerpc/cpu/mpc86xx/interrupts.c
+++ b/arch/powerpc/cpu/mpc86xx/interrupts.c
@@ -25,6 +25,7 @@
 #include <post.h>
 #endif
 #include <asm/ptrace.h>
+#include <asm/u-boot.h>
 
 void interrupt_init_cpu(unsigned *decrementer_count)
 {
diff --git a/arch/powerpc/cpu/mpc86xx/speed.c b/arch/powerpc/cpu/mpc86xx/speed.c
index 86c1709c4ca..770a9449197 100644
--- a/arch/powerpc/cpu/mpc86xx/speed.c
+++ b/arch/powerpc/cpu/mpc86xx/speed.c
@@ -14,6 +14,7 @@
 #include <asm/global_data.h>
 #include <asm/processor.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/powerpc/cpu/mpc86xx/traps.c b/arch/powerpc/cpu/mpc86xx/traps.c
index 0d258b3a97f..91f68fa57cd 100644
--- a/arch/powerpc/cpu/mpc86xx/traps.c
+++ b/arch/powerpc/cpu/mpc86xx/traps.c
@@ -20,6 +20,7 @@
 #include <init.h>
 #include <kgdb.h>
 #include <asm/processor.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/powerpc/cpu/mpc8xx/cpu.c b/arch/powerpc/cpu/mpc8xx/cpu.c
index f79a06d19a2..06931f96f32 100644
--- a/arch/powerpc/cpu/mpc8xx/cpu.c
+++ b/arch/powerpc/cpu/mpc8xx/cpu.c
@@ -29,6 +29,7 @@
 #include <asm/cache.h>
 #include <asm/cpm_8xx.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/compiler.h>
 #include <asm/io.h>
 
diff --git a/arch/powerpc/cpu/mpc8xx/cpu_init.c b/arch/powerpc/cpu/mpc8xx/cpu_init.c
index c8d06b0508d..fdba3d2c42c 100644
--- a/arch/powerpc/cpu/mpc8xx/cpu_init.c
+++ b/arch/powerpc/cpu/mpc8xx/cpu_init.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <init.h>
 #include <watchdog.h>
+#include <asm/u-boot.h>
 
 #include <mpc8xx.h>
 #include <asm/cpm_8xx.h>
diff --git a/arch/powerpc/cpu/mpc8xx/fdt.c b/arch/powerpc/cpu/mpc8xx/fdt.c
index 75aef758f06..7c01af4ccde 100644
--- a/arch/powerpc/cpu/mpc8xx/fdt.c
+++ b/arch/powerpc/cpu/mpc8xx/fdt.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <time.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 
diff --git a/arch/powerpc/cpu/mpc8xx/immap.c b/arch/powerpc/cpu/mpc8xx/immap.c
index 40793c26e12..c95182444b5 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 <asm/global_data.h>
+#include <asm/u-boot.h>
 
 #include <asm/immap_8xx.h>
 #include <asm/cpm_8xx.h>
diff --git a/arch/powerpc/cpu/mpc8xx/interrupts.c b/arch/powerpc/cpu/mpc8xx/interrupts.c
index eef1951f2fd..799edced8f0 100644
--- a/arch/powerpc/cpu/mpc8xx/interrupts.c
+++ b/arch/powerpc/cpu/mpc8xx/interrupts.c
@@ -13,6 +13,7 @@
 #include <asm/processor.h>
 #include <asm/io.h>
 #include <asm/ptrace.h>
+#include <asm/u-boot.h>
 
 /************************************************************************/
 
diff --git a/arch/powerpc/cpu/mpc8xx/traps.c b/arch/powerpc/cpu/mpc8xx/traps.c
index 56794b08a15..33ecc0e00b9 100644
--- a/arch/powerpc/cpu/mpc8xx/traps.c
+++ b/arch/powerpc/cpu/mpc8xx/traps.c
@@ -19,6 +19,7 @@
 #include <asm/ptrace.h>
 #include <command.h>
 #include <asm/processor.h>
+#include <asm/u-boot.h>
 
 /* Returns 0 if exception not found and fixup otherwise.  */
 extern unsigned long search_exception_table(unsigned long);
diff --git a/arch/powerpc/cpu/mpc8xxx/cpu.c b/arch/powerpc/cpu/mpc8xxx/cpu.c
index 560488be22e..4c9da029304 100644
--- a/arch/powerpc/cpu/mpc8xxx/cpu.c
+++ b/arch/powerpc/cpu/mpc8xxx/cpu.c
@@ -20,6 +20,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <vsc9953.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/powerpc/cpu/mpc8xxx/fdt.c b/arch/powerpc/cpu/mpc8xxx/fdt.c
index 67f8b100018..ea4375f2cfd 100644
--- a/arch/powerpc/cpu/mpc8xxx/fdt.c
+++ b/arch/powerpc/cpu/mpc8xxx/fdt.c
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <cpu_func.h>
+#include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <asm/mp.h>
diff --git a/arch/powerpc/cpu/mpc8xxx/fsl_lbc.c b/arch/powerpc/cpu/mpc8xxx/fsl_lbc.c
index 29489b46e6c..406965df28e 100644
--- a/arch/powerpc/cpu/mpc8xxx/fsl_lbc.c
+++ b/arch/powerpc/cpu/mpc8xxx/fsl_lbc.c
@@ -7,6 +7,7 @@
 #include <hang.h>
 #include <init.h>
 #include <asm/fsl_lbc.h>
+#include <asm/u-boot.h>
 
 #ifdef CONFIG_MPC83xx
 #include "../mpc83xx/elbc/elbc.h"
diff --git a/arch/powerpc/cpu/mpc8xxx/fsl_pamu.c b/arch/powerpc/cpu/mpc8xxx/fsl_pamu.c
index bc5958511d7..393729448a6 100644
--- a/arch/powerpc/cpu/mpc8xxx/fsl_pamu.c
+++ b/arch/powerpc/cpu/mpc8xxx/fsl_pamu.c
@@ -11,6 +11,7 @@
 #include <linux/log2.h>
 #include <malloc.h>
 #include <asm/fsl_pamu.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 
 struct paace *ppaact;
diff --git a/arch/powerpc/cpu/mpc8xxx/law.c b/arch/powerpc/cpu/mpc8xxx/law.c
index ff4b878aa9c..bc1f34d781e 100644
--- a/arch/powerpc/cpu/mpc8xxx/law.c
+++ b/arch/powerpc/cpu/mpc8xxx/law.c
@@ -10,6 +10,7 @@
 #include <display_options.h>
 #include <asm/bitops.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/compiler.h>
 #include <asm/fsl_law.h>
 #include <asm/io.h>
diff --git a/arch/powerpc/cpu/mpc8xxx/srio.c b/arch/powerpc/cpu/mpc8xxx/srio.c
index c73cf9319c8..aa9b2d9e2ad 100644
--- a/arch/powerpc/cpu/mpc8xxx/srio.c
+++ b/arch/powerpc/cpu/mpc8xxx/srio.c
@@ -10,6 +10,7 @@
 #include <asm/fsl_law.h>
 #include <asm/fsl_serdes.h>
 #include <asm/fsl_srio.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 
diff --git a/arch/powerpc/include/asm/fsl_liodn.h b/arch/powerpc/include/asm/fsl_liodn.h
index 7ced50c1d42..2f1c6c297c4 100644
--- a/arch/powerpc/include/asm/fsl_liodn.h
+++ b/arch/powerpc/include/asm/fsl_liodn.h
@@ -7,6 +7,7 @@
 #define _FSL_LIODN_H_
 
 #include <asm/types.h>
+#include <asm/u-boot.h>
 #include <fsl_qbman.h>
 
 struct srio_liodn_id_table {
diff --git a/arch/powerpc/include/asm/ppc.h b/arch/powerpc/include/asm/ppc.h
index 055364c58fd..661e7b5989a 100644
--- a/arch/powerpc/include/asm/ppc.h
+++ b/arch/powerpc/include/asm/ppc.h
@@ -38,6 +38,7 @@
 #endif
 
 #include <asm/processor.h>
+#include <asm/u-boot.h>
 
 static inline uint get_immr(void)
 {
diff --git a/arch/powerpc/lib/bdinfo.c b/arch/powerpc/lib/bdinfo.c
index 231790ff854..2d9bd267d52 100644
--- a/arch/powerpc/lib/bdinfo.c
+++ b/arch/powerpc/lib/bdinfo.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <init.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/powerpc/lib/bootm.c b/arch/powerpc/lib/bootm.c
index cf3e3fd8409..a43126e3974 100644
--- a/arch/powerpc/lib/bootm.c
+++ b/arch/powerpc/lib/bootm.c
@@ -19,6 +19,7 @@
 #include <image.h>
 #include <malloc.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <u-boot/zlib.h>
 #include <bzlib.h>
 #include <asm/byteorder.h>
diff --git a/arch/powerpc/lib/extable.c b/arch/powerpc/lib/extable.c
index 7e9d4f22f39..20ee6205854 100644
--- a/arch/powerpc/lib/extable.c
+++ b/arch/powerpc/lib/extable.c
@@ -7,6 +7,7 @@
  */
 #include <common.h>
 #include <log.h>
+#include <asm/u-boot.h>
 
 /*
  * The exception table consists of pairs of addresses: the first is the
diff --git a/arch/powerpc/lib/interrupts.c b/arch/powerpc/lib/interrupts.c
index 14f32cbd937..c232a1412c8 100644
--- a/arch/powerpc/lib/interrupts.c
+++ b/arch/powerpc/lib/interrupts.c
@@ -11,6 +11,7 @@
 #include <irq_func.h>
 #include <time.h>
 #include <asm/processor.h>
+#include <asm/u-boot.h>
 #include <watchdog.h>
 #ifdef CONFIG_LED_STATUS
 #include <status_led.h>
@@ -43,13 +44,13 @@ static __inline__ void set_dec (unsigned long val)
 
 void enable_interrupts(void)
 {
-	set_msr (get_msr () | MSR_EE);
+	set_msr(get_msr() | MSR_EE);
 }
 
 /* returns flag if MSR_EE was set before */
 int disable_interrupts(void)
 {
-	ulong msr = get_msr ();
+	ulong msr = get_msr();
 
 	set_msr (msr & ~MSR_EE);
 	return ((msr & MSR_EE) != 0);
@@ -63,7 +64,7 @@ int interrupt_init(void)
 
 	set_dec (decrementer_count);
 
-	set_msr (get_msr () | MSR_EE);
+	set_msr(get_msr() | MSR_EE);
 
 	return (0);
 }
diff --git a/arch/powerpc/lib/kgdb.c b/arch/powerpc/lib/kgdb.c
index 8727d18884c..145c5004e0e 100644
--- a/arch/powerpc/lib/kgdb.c
+++ b/arch/powerpc/lib/kgdb.c
@@ -4,6 +4,7 @@
 #include <asm/ptrace.h>
 #include <asm/signal.h>
 #include <asm/processor.h>
+#include <asm/u-boot.h>
 
 #define PC_REGNUM 64
 #define SP_REGNUM 1
diff --git a/arch/riscv/cpu/ax25/cpu.c b/arch/riscv/cpu/ax25/cpu.c
index f092600e14d..9fdb4078a35 100644
--- a/arch/riscv/cpu/ax25/cpu.c
+++ b/arch/riscv/cpu/ax25/cpu.c
@@ -9,6 +9,7 @@
 #include <cpu_func.h>
 #include <irq_func.h>
 #include <asm/cache.h>
+#include <asm/u-boot.h>
 
 /*
  * cleanup_before_linux() is called just before we call linux
diff --git a/arch/riscv/cpu/cpu.c b/arch/riscv/cpu/cpu.c
index 53fc9455f75..56a76170977 100644
--- a/arch/riscv/cpu/cpu.c
+++ b/arch/riscv/cpu/cpu.c
@@ -9,6 +9,7 @@
 #include <init.h>
 #include <log.h>
 #include <asm/encoding.h>
+#include <asm/u-boot.h>
 #include <dm/uclass-internal.h>
 #include <linux/bitops.h>
 #include <linux/string.h>
diff --git a/arch/riscv/cpu/fu540/cpu.c b/arch/riscv/cpu/fu540/cpu.c
index f13c18942f3..70e00851e9d 100644
--- a/arch/riscv/cpu/fu540/cpu.c
+++ b/arch/riscv/cpu/fu540/cpu.c
@@ -5,6 +5,7 @@
 
 #include <irq_func.h>
 #include <asm/cache.h>
+#include <asm/u-boot.h>
 
 /*
  * cleanup_before_linux() is called just before we call linux
diff --git a/arch/riscv/cpu/fu540/dram.c b/arch/riscv/cpu/fu540/dram.c
index cec130ec8dc..26118ea4c82 100644
--- a/arch/riscv/cpu/fu540/dram.c
+++ b/arch/riscv/cpu/fu540/dram.c
@@ -7,6 +7,7 @@
 #include <fdtdec.h>
 #include <init.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/sizes.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/riscv/cpu/generic/cpu.c b/arch/riscv/cpu/generic/cpu.c
index d78e1a3453a..c38e53b477e 100644
--- a/arch/riscv/cpu/generic/cpu.c
+++ b/arch/riscv/cpu/generic/cpu.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <irq_func.h>
 #include <asm/cache.h>
+#include <asm/u-boot.h>
 
 /*
  * cleanup_before_linux() is called just before we call linux
diff --git a/arch/riscv/cpu/generic/dram.c b/arch/riscv/cpu/generic/dram.c
index cec130ec8dc..26118ea4c82 100644
--- a/arch/riscv/cpu/generic/dram.c
+++ b/arch/riscv/cpu/generic/dram.c
@@ -7,6 +7,7 @@
 #include <fdtdec.h>
 #include <init.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/sizes.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/riscv/lib/boot.c b/arch/riscv/lib/boot.c
index 778d011f7ce..83c96799e91 100644
--- a/arch/riscv/lib/boot.c
+++ b/arch/riscv/lib/boot.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <asm/u-boot.h>
 
 unsigned long do_go_exec(ulong (*entry)(int, char * const []),
 			 int argc, char *const argv[])
diff --git a/arch/riscv/lib/bootm.c b/arch/riscv/lib/bootm.c
index 8dd18205403..19ccd1b43ca 100644
--- a/arch/riscv/lib/bootm.c
+++ b/arch/riscv/lib/bootm.c
@@ -14,6 +14,7 @@
 #include <hang.h>
 #include <log.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <dm/root.h>
 #include <image.h>
 #include <asm/byteorder.h>
diff --git a/arch/riscv/lib/fdt_fixup.c b/arch/riscv/lib/fdt_fixup.c
index d0a33474497..3a93ac47eb0 100644
--- a/arch/riscv/lib/fdt_fixup.c
+++ b/arch/riscv/lib/fdt_fixup.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <mapmem.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/sandbox/cpu/cpu.c b/arch/sandbox/cpu/cpu.c
index edd48e2c1b7..110134c6d42 100644
--- a/arch/sandbox/cpu/cpu.c
+++ b/arch/sandbox/cpu/cpu.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <log.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 #include <os.h>
diff --git a/arch/sandbox/cpu/start.c b/arch/sandbox/cpu/start.c
index 9845d3e8fcb..153015f956b 100644
--- a/arch/sandbox/cpu/start.c
+++ b/arch/sandbox/cpu/start.c
@@ -16,6 +16,7 @@
 #include <asm/malloc.h>
 #include <asm/sections.h>
 #include <asm/state.h>
+#include <asm/u-boot.h>
 #include <linux/ctype.h>
 #include <linux/string.h>
 
diff --git a/arch/sandbox/lib/pci_io.c b/arch/sandbox/lib/pci_io.c
index 2038141947a..b0d7d42adf5 100644
--- a/arch/sandbox/lib/pci_io.c
+++ b/arch/sandbox/lib/pci_io.c
@@ -13,6 +13,7 @@
 #include <dm.h>
 #include <log.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 
 int pci_map_physmem(phys_addr_t paddr, unsigned long *lenp,
 		    struct udevice **devp, void **ptrp)
diff --git a/arch/sh/cpu/sh4/cpu.c b/arch/sh/cpu/sh4/cpu.c
index 801102fc7d5..d4cdfb61ab5 100644
--- a/arch/sh/cpu/sh4/cpu.c
+++ b/arch/sh/cpu/sh4/cpu.c
@@ -11,6 +11,7 @@
 #include <net.h>
 #include <netdev.h>
 #include <asm/processor.h>
+#include <asm/u-boot.h>
 
 int checkcpu(void)
 {
diff --git a/arch/x86/cpu/apollolake/cpu_spl.c b/arch/x86/cpu/apollolake/cpu_spl.c
index a52bc288617..a9009d375fc 100644
--- a/arch/x86/cpu/apollolake/cpu_spl.c
+++ b/arch/x86/cpu/apollolake/cpu_spl.c
@@ -33,6 +33,7 @@
 #include <asm/arch/systemagent.h>
 #include <asm/arch/uart.h>
 #include <asm/fsp2/fsp_api.h>
+#include <asm/u-boot.h>
 #include <linux/sizes.h>
 #include <power/acpi_pmc.h>
 
diff --git a/arch/x86/cpu/baytrail/early_uart.c b/arch/x86/cpu/baytrail/early_uart.c
index 08dbd5538f7..e8ed6ea447b 100644
--- a/arch/x86/cpu/baytrail/early_uart.c
+++ b/arch/x86/cpu/baytrail/early_uart.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <errno.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 
 #define PCI_DEV_CONFIG(segbus, dev, fn) ( \
 		(((segbus) & 0xfff) << 20) | \
diff --git a/arch/x86/cpu/baytrail/valleyview.c b/arch/x86/cpu/baytrail/valleyview.c
index f73738ce5c0..d0e2bcc10fd 100644
--- a/arch/x86/cpu/baytrail/valleyview.c
+++ b/arch/x86/cpu/baytrail/valleyview.c
@@ -11,6 +11,7 @@
 #include <asm/mrccache.h>
 #include <asm/post.h>
 #include <asm/arch/iomap.h>
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 
 /* GPIO SUS */
diff --git a/arch/x86/cpu/braswell/braswell.c b/arch/x86/cpu/braswell/braswell.c
index 3345049993d..c487b9b4347 100644
--- a/arch/x86/cpu/braswell/braswell.c
+++ b/arch/x86/cpu/braswell/braswell.c
@@ -7,6 +7,7 @@
 #include <init.h>
 #include <asm/mrccache.h>
 #include <asm/post.h>
+#include <asm/u-boot.h>
 
 int arch_cpu_init(void)
 {
diff --git a/arch/x86/cpu/braswell/early_uart.c b/arch/x86/cpu/braswell/early_uart.c
index d78c6b0feb6..f6f3e9d8a80 100644
--- a/arch/x86/cpu/braswell/early_uart.c
+++ b/arch/x86/cpu/braswell/early_uart.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 
 #define PCI_DEV_CONFIG(segbus, dev, fn) ( \
 		(((segbus) & 0xfff) << 20) | \
diff --git a/arch/x86/cpu/broadwell/cpu.c b/arch/x86/cpu/broadwell/cpu.c
index 3832a97f2c7..c5ef51c43f2 100644
--- a/arch/x86/cpu/broadwell/cpu.c
+++ b/arch/x86/cpu/broadwell/cpu.c
@@ -23,6 +23,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/pch.h>
 #include <asm/arch/rcb.h>
+#include <asm/u-boot.h>
 
 int arch_cpu_init_dm(void)
 {
diff --git a/arch/x86/cpu/broadwell/cpu_full.c b/arch/x86/cpu/broadwell/cpu_full.c
index 4debddce8ad..9d9abe39847 100644
--- a/arch/x86/cpu/broadwell/cpu_full.c
+++ b/arch/x86/cpu/broadwell/cpu_full.c
@@ -21,6 +21,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/pch.h>
 #include <asm/arch/rcb.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 
 struct cpu_broadwell_priv {
diff --git a/arch/x86/cpu/broadwell/refcode.c b/arch/x86/cpu/broadwell/refcode.c
index ee045a34833..ec929bfb5f5 100644
--- a/arch/x86/cpu/broadwell/refcode.c
+++ b/arch/x86/cpu/broadwell/refcode.c
@@ -12,6 +12,7 @@
 #include <init.h>
 #include <log.h>
 #include <asm/arch/pei_data.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 
 #define RMODULE_MAGIC		0xf8fe
diff --git a/arch/x86/cpu/broadwell/sdram.c b/arch/x86/cpu/broadwell/sdram.c
index 874b2034b9f..0aa2300f1c7 100644
--- a/arch/x86/cpu/broadwell/sdram.c
+++ b/arch/x86/cpu/broadwell/sdram.c
@@ -24,6 +24,7 @@
 #include <asm/arch/pch.h>
 #include <asm/arch/pei_data.h>
 #include <asm/arch/pm.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 
 ulong board_get_usable_ram_top(ulong total_size)
diff --git a/arch/x86/cpu/coreboot/coreboot.c b/arch/x86/cpu/coreboot/coreboot.c
index 15c3ad879a0..16c1a5e5bfa 100644
--- a/arch/x86/cpu/coreboot/coreboot.c
+++ b/arch/x86/cpu/coreboot/coreboot.c
@@ -16,6 +16,7 @@
 #include <asm/mtrr.h>
 #include <asm/arch/sysinfo.h>
 #include <asm/arch/timestamp.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/coreboot/sdram.c b/arch/x86/cpu/coreboot/sdram.c
index a2e47d196a2..b3fddca7098 100644
--- a/arch/x86/cpu/coreboot/sdram.c
+++ b/arch/x86/cpu/coreboot/sdram.c
@@ -10,6 +10,7 @@
 #include <asm/e820.h>
 #include <asm/arch/sysinfo.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/coreboot/timestamp.c b/arch/x86/cpu/coreboot/timestamp.c
index 01625978095..86e1f9693ee 100644
--- a/arch/x86/cpu/coreboot/timestamp.c
+++ b/arch/x86/cpu/coreboot/timestamp.c
@@ -9,6 +9,7 @@
 #include <bootstage.h>
 #include <asm/arch/timestamp.h>
 #include <asm/arch/sysinfo.h>
+#include <asm/u-boot.h>
 #include <linux/compiler.h>
 
 struct timestamp_entry {
diff --git a/arch/x86/cpu/cpu.c b/arch/x86/cpu/cpu.c
index 078607a435c..4e67391b333 100644
--- a/arch/x86/cpu/cpu.c
+++ b/arch/x86/cpu/cpu.c
@@ -47,6 +47,7 @@
 #include <asm/processor-flags.h>
 #include <asm/interrupt.h>
 #include <asm/tables.h>
+#include <asm/u-boot.h>
 #include <linux/compiler.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/x86/cpu/efi/app.c b/arch/x86/cpu/efi/app.c
index f754489784a..91fbad19504 100644
--- a/arch/x86/cpu/efi/app.c
+++ b/arch/x86/cpu/efi/app.c
@@ -8,6 +8,7 @@
 #include <fdtdec.h>
 #include <init.h>
 #include <netdev.h>
+#include <asm/u-boot.h>
 
 int arch_cpu_init(void)
 {
diff --git a/arch/x86/cpu/efi/payload.c b/arch/x86/cpu/efi/payload.c
index d9955bb4714..a97409f3db1 100644
--- a/arch/x86/cpu/efi/payload.c
+++ b/arch/x86/cpu/efi/payload.c
@@ -15,6 +15,7 @@
 #include <asm/e820.h>
 #include <asm/global_data.h>
 #include <asm/post.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/x86/cpu/efi/sdram.c b/arch/x86/cpu/efi/sdram.c
index af65982fd0c..2b164f72de9 100644
--- a/arch/x86/cpu/efi/sdram.c
+++ b/arch/x86/cpu/efi/sdram.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <asm/global_data.h>
 #include <asm/u-boot-x86.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/i386/cpu.c b/arch/x86/cpu/i386/cpu.c
index f0a01c2295f..fec8f2c60b2 100644
--- a/arch/x86/cpu/i386/cpu.c
+++ b/arch/x86/cpu/i386/cpu.c
@@ -32,6 +32,7 @@
 #include <asm/msr.h>
 #include <asm/mtrr.h>
 #include <asm/processor-flags.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/x86/cpu/i386/interrupt.c b/arch/x86/cpu/i386/interrupt.c
index 67a72146de8..3ecf907e72e 100644
--- a/arch/x86/cpu/i386/interrupt.c
+++ b/arch/x86/cpu/i386/interrupt.c
@@ -25,6 +25,7 @@
 #include <asm/lapic.h>
 #include <asm/processor-flags.h>
 #include <asm/ptrace.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/intel_common/cpu_from_spl.c b/arch/x86/cpu/intel_common/cpu_from_spl.c
index 1c0dcedb582..9af8ac90195 100644
--- a/arch/x86/cpu/intel_common/cpu_from_spl.c
+++ b/arch/x86/cpu/intel_common/cpu_from_spl.c
@@ -17,6 +17,7 @@
 #include <asm/mtrr.h>
 #include <asm/post.h>
 #include <asm/microcode.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/intel_common/mrc.c b/arch/x86/cpu/intel_common/mrc.c
index eb27f8f1883..a5c62de0919 100644
--- a/arch/x86/cpu/intel_common/mrc.c
+++ b/arch/x86/cpu/intel_common/mrc.c
@@ -18,6 +18,7 @@
 #include <asm/post.h>
 #include <asm/arch/me.h>
 #include <asm/report_platform.h>
+#include <asm/u-boot.h>
 
 static const char *const ecc_decoder[] = {
 	"inactive",
diff --git a/arch/x86/cpu/ivybridge/cpu.c b/arch/x86/cpu/ivybridge/cpu.c
index bddba3eddec..7f5c9e1d201 100644
--- a/arch/x86/cpu/ivybridge/cpu.c
+++ b/arch/x86/cpu/ivybridge/cpu.c
@@ -34,6 +34,7 @@
 #include <asm/arch/model_206ax.h>
 #include <asm/arch/pch.h>
 #include <asm/arch/sandybridge.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/ivybridge/ivybridge.c b/arch/x86/cpu/ivybridge/ivybridge.c
index eb3f362e4e9..5677833b1c9 100644
--- a/arch/x86/cpu/ivybridge/ivybridge.c
+++ b/arch/x86/cpu/ivybridge/ivybridge.c
@@ -7,6 +7,7 @@
 #include <init.h>
 #include <asm/post.h>
 #include <asm/processor.h>
+#include <asm/u-boot.h>
 
 int arch_cpu_init(void)
 {
diff --git a/arch/x86/cpu/ivybridge/sdram.c b/arch/x86/cpu/ivybridge/sdram.c
index a86ecd7ac40..8e1f615f389 100644
--- a/arch/x86/cpu/ivybridge/sdram.c
+++ b/arch/x86/cpu/ivybridge/sdram.c
@@ -36,6 +36,7 @@
 #include <asm/arch/pch.h>
 #include <asm/post.h>
 #include <asm/arch/sandybridge.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/x86/cpu/ivybridge/sdram_nop.c b/arch/x86/cpu/ivybridge/sdram_nop.c
index 51dfe23f94d..7522e3672f0 100644
--- a/arch/x86/cpu/ivybridge/sdram_nop.c
+++ b/arch/x86/cpu/ivybridge/sdram_nop.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <init.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/qemu/dram.c b/arch/x86/cpu/qemu/dram.c
index c1745501294..aeb40f767e5 100644
--- a/arch/x86/cpu/qemu/dram.c
+++ b/arch/x86/cpu/qemu/dram.c
@@ -8,6 +8,7 @@
 #include <asm/global_data.h>
 #include <asm/post.h>
 #include <asm/arch/qemu.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/qemu/qemu.c b/arch/x86/cpu/qemu/qemu.c
index 044a429c13f..8fab346f801 100644
--- a/arch/x86/cpu/qemu/qemu.c
+++ b/arch/x86/cpu/qemu/qemu.c
@@ -13,6 +13,7 @@
 #include <asm/processor.h>
 #include <asm/arch/device.h>
 #include <asm/arch/qemu.h>
+#include <asm/u-boot.h>
 
 static bool i440fx;
 
diff --git a/arch/x86/cpu/quark/dram.c b/arch/x86/cpu/quark/dram.c
index d38c3d0809a..e7ccecfe271 100644
--- a/arch/x86/cpu/quark/dram.c
+++ b/arch/x86/cpu/quark/dram.c
@@ -18,6 +18,7 @@
 #include <asm/arch/mrc.h>
 #include <asm/arch/msg_port.h>
 #include <asm/arch/quark.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/x86/cpu/quark/mrc.c b/arch/x86/cpu/quark/mrc.c
index 3e8c0bc28c5..d3b237e87e4 100644
--- a/arch/x86/cpu/quark/mrc.c
+++ b/arch/x86/cpu/quark/mrc.c
@@ -36,6 +36,7 @@
 #include <version.h>
 #include <asm/arch/mrc.h>
 #include <asm/arch/msg_port.h>
+#include <asm/u-boot.h>
 #include "mrc_util.h"
 #include "smc.h"
 
diff --git a/arch/x86/cpu/quark/mrc_util.c b/arch/x86/cpu/quark/mrc_util.c
index b0bc59b71ef..28176fdd006 100644
--- a/arch/x86/cpu/quark/mrc_util.c
+++ b/arch/x86/cpu/quark/mrc_util.c
@@ -13,6 +13,7 @@
 #include <asm/arch/mrc.h>
 #include <asm/arch/msg_port.h>
 #include <asm/arch/quark.h>
+#include <asm/u-boot.h>
 #include "mrc_util.h"
 #include "hte.h"
 #include "smc.h"
diff --git a/arch/x86/cpu/quark/quark.c b/arch/x86/cpu/quark/quark.c
index 30b4711b9a5..44529b6c2ec 100644
--- a/arch/x86/cpu/quark/quark.c
+++ b/arch/x86/cpu/quark/quark.c
@@ -18,6 +18,7 @@
 #include <asm/arch/device.h>
 #include <asm/arch/msg_port.h>
 #include <asm/arch/quark.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 
 static void quark_setup_mtrr(void)
diff --git a/arch/x86/cpu/quark/smc.c b/arch/x86/cpu/quark/smc.c
index fa47e587a23..af158bab345 100644
--- a/arch/x86/cpu/quark/smc.c
+++ b/arch/x86/cpu/quark/smc.c
@@ -12,6 +12,7 @@
 #include <asm/arch/device.h>
 #include <asm/arch/mrc.h>
 #include <asm/arch/msg_port.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 #include "mrc_util.h"
 #include "hte.h"
diff --git a/arch/x86/cpu/queensbay/tnc.c b/arch/x86/cpu/queensbay/tnc.c
index 782ed863fe7..5601422d496 100644
--- a/arch/x86/cpu/queensbay/tnc.c
+++ b/arch/x86/cpu/queensbay/tnc.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <dm.h>
 #include <init.h>
+#include <asm/u-boot.h>
 #include <dm/device-internal.h>
 #include <pci.h>
 #include <asm/io.h>
diff --git a/arch/x86/cpu/slimbootloader/sdram.c b/arch/x86/cpu/slimbootloader/sdram.c
index 36d0d4da553..bcae2d42519 100644
--- a/arch/x86/cpu/slimbootloader/sdram.c
+++ b/arch/x86/cpu/slimbootloader/sdram.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <init.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/sizes.h>
 #include <asm/e820.h>
 #include <asm/arch/slimbootloader.h>
diff --git a/arch/x86/cpu/slimbootloader/slimbootloader.c b/arch/x86/cpu/slimbootloader/slimbootloader.c
index ec5b87cfd63..c568651cf79 100644
--- a/arch/x86/cpu/slimbootloader/slimbootloader.c
+++ b/arch/x86/cpu/slimbootloader/slimbootloader.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <asm/arch/slimbootloader.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/tangier/sdram.c b/arch/x86/cpu/tangier/sdram.c
index e1531385fb8..920dfaf5e26 100644
--- a/arch/x86/cpu/tangier/sdram.c
+++ b/arch/x86/cpu/tangier/sdram.c
@@ -9,6 +9,7 @@
 #include <asm/e820.h>
 #include <asm/global_data.h>
 #include <asm/sfi.h>
+#include <asm/u-boot.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/arch/x86/cpu/tangier/tangier.c b/arch/x86/cpu/tangier/tangier.c
index 1e2f6cc8b70..5747c97aea2 100644
--- a/arch/x86/cpu/tangier/tangier.c
+++ b/arch/x86/cpu/tangier/tangier.c
@@ -7,6 +7,7 @@
 #include <cpu_func.h>
 #include <init.h>
 #include <asm/u-boot-x86.h>
+#include <asm/u-boot.h>
 
 /*
  * Miscellaneous platform dependent initializations
diff --git a/arch/x86/cpu/x86_64/cpu.c b/arch/x86/cpu/x86_64/cpu.c
index 740851f24f3..c1047b4dc63 100644
--- a/arch/x86/cpu/x86_64/cpu.c
+++ b/arch/x86/cpu/x86_64/cpu.c
@@ -9,6 +9,7 @@
 #include <debug_uart.h>
 #include <init.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 
 /*
  * Global declaration of gd.
diff --git a/arch/x86/lib/bootm.c b/arch/x86/lib/bootm.c
index b255144318c..e8d252abcd6 100644
--- a/arch/x86/lib/bootm.c
+++ b/arch/x86/lib/bootm.c
@@ -13,6 +13,7 @@
 #include <hang.h>
 #include <log.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <dm/device.h>
 #include <dm/root.h>
 #include <errno.h>
diff --git a/arch/x86/lib/fsp/fsp_common.c b/arch/x86/lib/fsp/fsp_common.c
index 82f7d3ab5f0..821d9200d8b 100644
--- a/arch/x86/lib/fsp/fsp_common.c
+++ b/arch/x86/lib/fsp/fsp_common.c
@@ -19,6 +19,7 @@
 #include <asm/post.h>
 #include <asm/processor.h>
 #include <asm/fsp/fsp_support.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/lib/fsp/fsp_dram.c b/arch/x86/lib/fsp/fsp_dram.c
index 32680033736..dfa08867ecd 100644
--- a/arch/x86/lib/fsp/fsp_dram.c
+++ b/arch/x86/lib/fsp/fsp_dram.c
@@ -13,6 +13,7 @@
 #include <asm/mrccache.h>
 #include <asm/mtrr.h>
 #include <asm/post.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/lib/fsp1/fsp_dram.c b/arch/x86/lib/fsp1/fsp_dram.c
index cfd9b9f48c3..74181a78b69 100644
--- a/arch/x86/lib/fsp1/fsp_dram.c
+++ b/arch/x86/lib/fsp1/fsp_dram.c
@@ -7,6 +7,7 @@
 #include <init.h>
 #include <asm/fsp/fsp_support.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 
 int dram_init(void)
 {
diff --git a/arch/x86/lib/fsp1/fsp_support.c b/arch/x86/lib/fsp1/fsp_support.c
index 25aa71c6c20..3bc46b24ab4 100644
--- a/arch/x86/lib/fsp1/fsp_support.c
+++ b/arch/x86/lib/fsp1/fsp_support.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <asm/fsp1/fsp_support.h>
 #include <asm/post.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 
 struct fsp_header *__attribute__((optimize("O0"))) fsp_find_header(void)
diff --git a/arch/x86/lib/fsp2/fsp_dram.c b/arch/x86/lib/fsp2/fsp_dram.c
index c31e2a11b7a..b882f9466a8 100644
--- a/arch/x86/lib/fsp2/fsp_dram.c
+++ b/arch/x86/lib/fsp2/fsp_dram.c
@@ -15,6 +15,7 @@
 #include <asm/fsp2/fsp_api.h>
 #include <asm/fsp2/fsp_internal.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/sizes.h>
 
 int dram_init(void)
diff --git a/arch/x86/lib/fsp2/fsp_meminit.c b/arch/x86/lib/fsp2/fsp_meminit.c
index abbe1a011dd..cef17666c35 100644
--- a/arch/x86/lib/fsp2/fsp_meminit.c
+++ b/arch/x86/lib/fsp2/fsp_meminit.c
@@ -18,6 +18,7 @@
 #include <asm/fsp2/fsp_internal.h>
 #include <asm/arch/fsp/fsp_configs.h>
 #include <asm/arch/fsp/fsp_m_upd.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 
 static int prepare_mrc_cache_type(enum mrc_type_t type,
diff --git a/arch/x86/lib/i8254.c b/arch/x86/lib/i8254.c
index 0f975389103..33db3dab2e9 100644
--- a/arch/x86/lib/i8254.c
+++ b/arch/x86/lib/i8254.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <asm/io.h>
 #include <asm/i8254.h>
+#include <asm/u-boot.h>
 
 #define TIMER1_VALUE		18	/* 15.6us */
 #define BEEP_FREQUENCY_HZ	440
diff --git a/arch/x86/lib/init_helpers.c b/arch/x86/lib/init_helpers.c
index 066dc404a2d..cf2b7651e8d 100644
--- a/arch/x86/lib/init_helpers.c
+++ b/arch/x86/lib/init_helpers.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <init.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <asm/mtrr.h>
 
diff --git a/arch/x86/lib/interrupts.c b/arch/x86/lib/interrupts.c
index a81e4291105..adcaabbd78f 100644
--- a/arch/x86/lib/interrupts.c
+++ b/arch/x86/lib/interrupts.c
@@ -33,6 +33,7 @@
 #include <command.h>
 #include <irq_func.h>
 #include <asm/interrupt.h>
+#include <asm/u-boot.h>
 
 #if !CONFIG_IS_ENABLED(X86_64)
 
diff --git a/arch/x86/lib/ramtest.c b/arch/x86/lib/ramtest.c
index 03385396325..2e5ead02060 100644
--- a/arch/x86/lib/ramtest.c
+++ b/arch/x86/lib/ramtest.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <asm/io.h>
 #include <asm/post.h>
+#include <asm/u-boot.h>
 
 static void write_phys(unsigned long addr, u32 value)
 {
diff --git a/arch/x86/lib/spl.c b/arch/x86/lib/spl.c
index 96885c6cc55..63c29673fef 100644
--- a/arch/x86/lib/spl.c
+++ b/arch/x86/lib/spl.c
@@ -24,6 +24,7 @@
 #include <asm/processor.h>
 #include <asm/spl.h>
 #include <asm-generic/sections.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/x86/lib/tpl.c b/arch/x86/lib/tpl.c
index 789472bc9a2..23e32402db3 100644
--- a/arch/x86/lib/tpl.c
+++ b/arch/x86/lib/tpl.c
@@ -16,6 +16,7 @@
 #include <asm/mtrr.h>
 #include <asm/processor.h>
 #include <asm-generic/sections.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/xtensa/cpu/cpu.c b/arch/xtensa/cpu/cpu.c
index 85d3464607d..c7d39b35b37 100644
--- a/arch/xtensa/cpu/cpu.c
+++ b/arch/xtensa/cpu/cpu.c
@@ -12,6 +12,7 @@
 #include <command.h>
 #include <init.h>
 #include <vsprintf.h>
+#include <asm/u-boot.h>
 #include <linux/stringify.h>
 #include <asm/global_data.h>
 #include <asm/cache.h>
diff --git a/arch/xtensa/lib/bootm.c b/arch/xtensa/lib/bootm.c
index c33bcf2f9ed..61ae0851756 100644
--- a/arch/xtensa/lib/bootm.c
+++ b/arch/xtensa/lib/bootm.c
@@ -10,6 +10,7 @@
 #include <cpu_func.h>
 #include <env.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 #include <u-boot/zlib.h>
 #include <asm/byteorder.h>
diff --git a/board/AndesTech/adp-ae3xx/adp-ae3xx.c b/board/AndesTech/adp-ae3xx/adp-ae3xx.c
index 3c4a27d63f6..1c142b80a5a 100644
--- a/board/AndesTech/adp-ae3xx/adp-ae3xx.c
+++ b/board/AndesTech/adp-ae3xx/adp-ae3xx.c
@@ -14,6 +14,7 @@
 #if defined(CONFIG_FTMAC100) && !defined(CONFIG_DM_ETH)
 #include <netdev.h>
 #endif
+#include <asm/u-boot.h>
 #include <linux/io.h>
 #include <faraday/ftsmc020.h>
 
diff --git a/board/AndesTech/adp-ag101p/adp-ag101p.c b/board/AndesTech/adp-ag101p/adp-ag101p.c
index 8848b7f9738..97f25fa42ed 100644
--- a/board/AndesTech/adp-ag101p/adp-ag101p.c
+++ b/board/AndesTech/adp-ag101p/adp-ag101p.c
@@ -13,6 +13,7 @@
 #include <netdev.h>
 #endif
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/io.h>
 #include <asm/io.h>
 #include <asm/mach-types.h>
diff --git a/board/AndesTech/ax25-ae350/ax25-ae350.c b/board/AndesTech/ax25-ae350/ax25-ae350.c
index d781038de28..bb0dfb5e95d 100644
--- a/board/AndesTech/ax25-ae350/ax25-ae350.c
+++ b/board/AndesTech/ax25-ae350/ax25-ae350.c
@@ -13,6 +13,7 @@
 #include <netdev.h>
 #endif
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/io.h>
 #include <faraday/ftsmc020.h>
 #include <fdtdec.h>
diff --git a/board/Arcturus/ucp1020/ddr.c b/board/Arcturus/ucp1020/ddr.c
index 712023faf7d..2fedc10d3f2 100644
--- a/board/Arcturus/ucp1020/ddr.c
+++ b/board/Arcturus/ucp1020/ddr.c
@@ -16,6 +16,7 @@
 #include <fsl_ddr_dimm_params.h>
 #include <asm/io.h>
 #include <asm/fsl_law.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 
 #ifdef CONFIG_SYS_DDR_RAW_TIMING
diff --git a/board/Arcturus/ucp1020/law.c b/board/Arcturus/ucp1020/law.c
index cb53692a32b..0dfb8ebc849 100644
--- a/board/Arcturus/ucp1020/law.c
+++ b/board/Arcturus/ucp1020/law.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
+#include <asm/u-boot.h>
 
 struct law_entry law_table[] = {
 #ifdef CONFIG_VSC7385_ENET
diff --git a/board/Arcturus/ucp1020/spl.c b/board/Arcturus/ucp1020/spl.c
index b5db24da294..1f9206aa614 100644
--- a/board/Arcturus/ucp1020/spl.c
+++ b/board/Arcturus/ucp1020/spl.c
@@ -21,6 +21,7 @@
 #include <fsl_esdhc.h>
 #include <spi_flash.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/Arcturus/ucp1020/tlb.c b/board/Arcturus/ucp1020/tlb.c
index 2c07df63e5b..fc8bcea302b 100644
--- a/board/Arcturus/ucp1020/tlb.c
+++ b/board/Arcturus/ucp1020/tlb.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <asm/mmu.h>
+#include <asm/u-boot.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/Arcturus/ucp1020/ucp1020.c b/board/Arcturus/ucp1020/ucp1020.c
index 0846bb0e9ef..838b7995693 100644
--- a/board/Arcturus/ucp1020/ucp1020.c
+++ b/board/Arcturus/ucp1020/ucp1020.c
@@ -18,6 +18,7 @@
 #include <pci.h>
 #include <i2c.h>
 #include <miiphy.h>
+#include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <fsl_mdio.h>
diff --git a/board/BuR/brppt1/board.c b/board/BuR/brppt1/board.c
index 7df37e4e66a..9b69baa5dae 100644
--- a/board/BuR/brppt1/board.c
+++ b/board/BuR/brppt1/board.c
@@ -28,6 +28,7 @@
 #include <asm/emif.h>
 #include <asm/gpio.h>
 #include <i2c.h>
+#include <asm/u-boot.h>
 #include <power/tps65217.h>
 #include "../common/bur_common.h"
 #include <watchdog.h>
diff --git a/board/BuR/brppt2/board.c b/board/BuR/brppt2/board.c
index e6eb403fc3d..97605945d1c 100644
--- a/board/BuR/brppt2/board.c
+++ b/board/BuR/brppt2/board.c
@@ -24,6 +24,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
+#include <asm/u-boot.h>
 
 #define USBHUB_RSTN	IMX_GPIO_NR(1, 16)
 #define BKLT_EN		IMX_GPIO_NR(1, 15)
diff --git a/board/BuR/brsmarc1/board.c b/board/BuR/brsmarc1/board.c
index 738a5d2ff94..c31f40086ad 100644
--- a/board/BuR/brsmarc1/board.c
+++ b/board/BuR/brsmarc1/board.c
@@ -23,6 +23,7 @@
 #include <asm/io.h>
 #include <asm/gpio.h>
 #include <asm/emif.h>
+#include <asm/u-boot.h>
 #include <power/tps65217.h>
 #include "../common/bur_common.h"
 #include "../common/br_resetc.h"
diff --git a/board/BuR/brxre1/board.c b/board/BuR/brxre1/board.c
index ef692b006d5..6ad7bbec490 100644
--- a/board/BuR/brxre1/board.c
+++ b/board/BuR/brxre1/board.c
@@ -26,6 +26,7 @@
 #include <asm/emif.h>
 #include <asm/gpio.h>
 #include <dm.h>
+#include <asm/u-boot.h>
 #include <power/tps65217.h>
 #include "../common/bur_common.h"
 #include "../common/br_resetc.h"
diff --git a/board/BuR/common/bur_common.h b/board/BuR/common/bur_common.h
index c64ebe93b0e..4db630668e2 100644
--- a/board/BuR/common/bur_common.h
+++ b/board/BuR/common/bur_common.h
@@ -26,4 +26,5 @@ int board_eth_init(struct bd_info *bis);
 
 int brdefaultip_setup(int bus, int chip);
 
+#include <asm/u-boot.h>
 #endif
diff --git a/board/BuR/common/common.c b/board/BuR/common/common.c
index c42711d9733..377d3f41fe6 100644
--- a/board/BuR/common/common.c
+++ b/board/BuR/common/common.c
@@ -16,6 +16,7 @@
 #include <i2c.h>
 #include <lcd.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 #include "bur_common.h"
diff --git a/board/CZ.NIC/turris_mox/turris_mox.c b/board/CZ.NIC/turris_mox/turris_mox.c
index 486680a49e8..f7f5c117431 100644
--- a/board/CZ.NIC/turris_mox/turris_mox.c
+++ b/board/CZ.NIC/turris_mox/turris_mox.c
@@ -15,6 +15,7 @@
 #include <env.h>
 #include <fdt_support.h>
 #include <init.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 #include <linux/string.h>
diff --git a/board/CZ.NIC/turris_omnia/turris_omnia.c b/board/CZ.NIC/turris_omnia/turris_omnia.c
index b84227a56e0..995c01d48cd 100644
--- a/board/CZ.NIC/turris_omnia/turris_omnia.c
+++ b/board/CZ.NIC/turris_omnia/turris_omnia.c
@@ -19,6 +19,7 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <asm/u-boot.h>
 #include <dm/uclass.h>
 #include <fdt_support.h>
 #include <time.h>
diff --git a/board/CarMediaLab/flea3/flea3.c b/board/CarMediaLab/flea3/flea3.c
index 12c5ac331f9..a5beea9e550 100644
--- a/board/CarMediaLab/flea3/flea3.c
+++ b/board/CarMediaLab/flea3/flea3.c
@@ -12,6 +12,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <env.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/LaCie/edminiv2/edminiv2.c b/board/LaCie/edminiv2/edminiv2.c
index 9c066a283c9..1e13f506b5a 100644
--- a/board/LaCie/edminiv2/edminiv2.c
+++ b/board/LaCie/edminiv2/edminiv2.c
@@ -12,6 +12,7 @@
 #include <net.h>
 #include <asm/arch/orion5x.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include "../common/common.h"
 #include <spl.h>
 #include <ns16550.h>
diff --git a/board/LaCie/net2big_v2/net2big_v2.c b/board/LaCie/net2big_v2/net2big_v2.c
index 695d6f6ed47..01d159e19f4 100644
--- a/board/LaCie/net2big_v2/net2big_v2.c
+++ b/board/LaCie/net2big_v2/net2big_v2.c
@@ -20,6 +20,7 @@
 #include <asm/arch/soc.h>
 #include <asm/arch/mpp.h>
 #include <asm/arch/gpio.h>
+#include <asm/u-boot.h>
 
 #include "net2big_v2.h"
 #include "../common/common.h"
diff --git a/board/LaCie/netspace_v2/netspace_v2.c b/board/LaCie/netspace_v2/netspace_v2.c
index 730eab7e703..3246e5d0dc0 100644
--- a/board/LaCie/netspace_v2/netspace_v2.c
+++ b/board/LaCie/netspace_v2/netspace_v2.c
@@ -19,6 +19,7 @@
 #include <asm/arch/soc.h>
 #include <asm/arch/mpp.h>
 #include <asm/arch/gpio.h>
+#include <asm/u-boot.h>
 
 #include "netspace_v2.h"
 #include "../common/common.h"
diff --git a/board/Marvell/aspenite/aspenite.c b/board/Marvell/aspenite/aspenite.c
index 1f9389c0a7a..78ba8f4b61c 100644
--- a/board/Marvell/aspenite/aspenite.c
+++ b/board/Marvell/aspenite/aspenite.c
@@ -14,6 +14,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/mfp.h>
 #include <asm/arch/armada100.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/Marvell/db-88f6281-bp/db-88f6281-bp.c b/board/Marvell/db-88f6281-bp/db-88f6281-bp.c
index 08f79d4b532..43cbe2416d6 100644
--- a/board/Marvell/db-88f6281-bp/db-88f6281-bp.c
+++ b/board/Marvell/db-88f6281-bp/db-88f6281-bp.c
@@ -4,6 +4,7 @@
 #include <init.h>
 #include <net.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/io.h>
 #include <miiphy.h>
diff --git a/board/Marvell/db-88f6720/db-88f6720.c b/board/Marvell/db-88f6720/db-88f6720.c
index 26c30647fbb..8f2b0f55b0e 100644
--- a/board/Marvell/db-88f6720/db-88f6720.c
+++ b/board/Marvell/db-88f6720/db-88f6720.c
@@ -12,6 +12,7 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/Marvell/db-88f6820-amc/db-88f6820-amc.c b/board/Marvell/db-88f6820-amc/db-88f6820-amc.c
index 163a1b3de9d..948988c788d 100644
--- a/board/Marvell/db-88f6820-amc/db-88f6820-amc.c
+++ b/board/Marvell/db-88f6820-amc/db-88f6820-amc.c
@@ -13,6 +13,7 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 
 #include "../drivers/ddr/marvell/a38x/ddr3_init.h"
diff --git a/board/Marvell/db-88f6820-gp/db-88f6820-gp.c b/board/Marvell/db-88f6820-gp/db-88f6820-gp.c
index 06307e582ce..508f007d52e 100644
--- a/board/Marvell/db-88f6820-gp/db-88f6820-gp.c
+++ b/board/Marvell/db-88f6820-gp/db-88f6820-gp.c
@@ -13,6 +13,7 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 
 #include "../drivers/ddr/marvell/a38x/ddr3_init.h"
diff --git a/board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c b/board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c
index 9e1fdecfca4..66c308bda54 100644
--- a/board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c
+++ b/board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c
@@ -12,6 +12,7 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/Marvell/db-xc3-24g4xg/db-xc3-24g4xg.c b/board/Marvell/db-xc3-24g4xg/db-xc3-24g4xg.c
index 0abdca1cd21..8b2bb4f97a5 100644
--- a/board/Marvell/db-xc3-24g4xg/db-xc3-24g4xg.c
+++ b/board/Marvell/db-xc3-24g4xg/db-xc3-24g4xg.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <asm/global_data.h>
 #include <asm/gpio.h>
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/mbus.h>
 #include <linux/io.h>
diff --git a/board/Marvell/dreamplug/dreamplug.c b/board/Marvell/dreamplug/dreamplug.c
index e1c64b52246..ca07a742eab 100644
--- a/board/Marvell/dreamplug/dreamplug.c
+++ b/board/Marvell/dreamplug/dreamplug.c
@@ -16,6 +16,7 @@
 #include <asm/arch/soc.h>
 #include <asm/arch/mpp.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include "dreamplug.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/Marvell/gplugd/gplugd.c b/board/Marvell/gplugd/gplugd.c
index c6376cdf6a9..f8d1b9cc13a 100644
--- a/board/Marvell/gplugd/gplugd.c
+++ b/board/Marvell/gplugd/gplugd.c
@@ -22,6 +22,7 @@
 #include <asm/gpio.h>
 #include <miiphy.h>
 #include <asm/mach-types.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 
 #ifdef CONFIG_ARMADA100_FEC
diff --git a/board/Marvell/guruplug/guruplug.c b/board/Marvell/guruplug/guruplug.c
index 8e7dbb3f3f6..2d5118a176e 100644
--- a/board/Marvell/guruplug/guruplug.c
+++ b/board/Marvell/guruplug/guruplug.c
@@ -14,6 +14,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
 #include <asm/arch/mpp.h>
+#include <asm/u-boot.h>
 #include "guruplug.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/Marvell/mvebu_armada-37xx/board.c b/board/Marvell/mvebu_armada-37xx/board.c
index 73e2c3723a3..3470f3ac478 100644
--- a/board/Marvell/mvebu_armada-37xx/board.c
+++ b/board/Marvell/mvebu_armada-37xx/board.c
@@ -12,6 +12,7 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/Marvell/mvebu_armada-8k/board.c b/board/Marvell/mvebu_armada-8k/board.c
index fa27a352142..055e639e3c5 100644
--- a/board/Marvell/mvebu_armada-8k/board.c
+++ b/board/Marvell/mvebu_armada-8k/board.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/Marvell/openrd/openrd.c b/board/Marvell/openrd/openrd.c
index f44ac3315eb..55641922657 100644
--- a/board/Marvell/openrd/openrd.c
+++ b/board/Marvell/openrd/openrd.c
@@ -19,6 +19,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
 #include <asm/arch/mpp.h>
+#include <asm/u-boot.h>
 #include "openrd.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/Marvell/sheevaplug/sheevaplug.c b/board/Marvell/sheevaplug/sheevaplug.c
index 0cc7f2b3924..afa23620a31 100644
--- a/board/Marvell/sheevaplug/sheevaplug.c
+++ b/board/Marvell/sheevaplug/sheevaplug.c
@@ -14,6 +14,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
 #include <asm/arch/mpp.h>
+#include <asm/u-boot.h>
 #include "sheevaplug.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/Seagate/dockstar/dockstar.c b/board/Seagate/dockstar/dockstar.c
index 380e37be550..45776cf9117 100644
--- a/board/Seagate/dockstar/dockstar.c
+++ b/board/Seagate/dockstar/dockstar.c
@@ -19,6 +19,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/mach-types.h>
+#include <asm/u-boot.h>
 #include "dockstar.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/Seagate/goflexhome/goflexhome.c b/board/Seagate/goflexhome/goflexhome.c
index 4c19fa7195e..8a287ab364b 100644
--- a/board/Seagate/goflexhome/goflexhome.c
+++ b/board/Seagate/goflexhome/goflexhome.c
@@ -22,6 +22,7 @@
 #include <asm/arch/mpp.h>
 #include <asm/arch/cpu.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/Seagate/nas220/nas220.c b/board/Seagate/nas220/nas220.c
index cd2bbdad1cd..aac3224a946 100644
--- a/board/Seagate/nas220/nas220.c
+++ b/board/Seagate/nas220/nas220.c
@@ -18,6 +18,7 @@
 #include <asm/arch/mpp.h>
 #include <asm/arch/cpu.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/Synology/ds109/ds109.c b/board/Synology/ds109/ds109.c
index 7159535ec45..edadf0441ce 100644
--- a/board/Synology/ds109/ds109.c
+++ b/board/Synology/ds109/ds109.c
@@ -14,6 +14,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
 #include <asm/arch/mpp.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 #include "ds109.h"
diff --git a/board/Synology/ds414/ds414.c b/board/Synology/ds414/ds414.c
index 9c4ce670ddf..669b53ad5ed 100644
--- a/board/Synology/ds414/ds414.c
+++ b/board/Synology/ds414/ds414.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/mbus.h>
 
diff --git a/board/abilis/tb100/tb100.c b/board/abilis/tb100/tb100.c
index 52dc5b8d867..9ef7ed6e7f4 100644
--- a/board/abilis/tb100/tb100.c
+++ b/board/abilis/tb100/tb100.c
@@ -8,6 +8,7 @@
 #include <net.h>
 #include <netdev.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 
 void reset_cpu(ulong addr)
 {
diff --git a/board/advantech/dms-ba16/dms-ba16.c b/board/advantech/dms-ba16/dms-ba16.c
index 07a47e9fbb0..685fd20f423 100644
--- a/board/advantech/dms-ba16/dms-ba16.c
+++ b/board/advantech/dms-ba16/dms-ba16.c
@@ -12,6 +12,7 @@
 #include <asm/arch/iomux.h>
 #include <asm/arch/mx6-pins.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
diff --git a/board/advantech/imx8qm_rom7720_a1/imx8qm_rom7720_a1.c b/board/advantech/imx8qm_rom7720_a1/imx8qm_rom7720_a1.c
index 8492e7603b4..69626bc40f6 100644
--- a/board/advantech/imx8qm_rom7720_a1/imx8qm_rom7720_a1.c
+++ b/board/advantech/imx8qm_rom7720_a1/imx8qm_rom7720_a1.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <init.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 #include <asm/io.h>
diff --git a/board/advantech/imx8qm_rom7720_a1/spl.c b/board/advantech/imx8qm_rom7720_a1/spl.c
index 5a9a0090535..67028b79a1b 100644
--- a/board/advantech/imx8qm_rom7720_a1/spl.c
+++ b/board/advantech/imx8qm_rom7720_a1/spl.c
@@ -10,6 +10,7 @@
 #include <spl.h>
 #include <fsl_esdhc.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 
 #include <asm/io.h>
diff --git a/board/advantech/som-db5800-som-6867/som-db5800-som-6867.c b/board/advantech/som-db5800-som-6867/som-db5800-som-6867.c
index 8499fc541fa..c2eda4ff44b 100644
--- a/board/advantech/som-db5800-som-6867/som-db5800-som-6867.c
+++ b/board/advantech/som-db5800-som-6867/som-db5800-som-6867.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <init.h>
 #include <asm/fsp1/fsp_support.h>
+#include <asm/u-boot.h>
 
 /* ALC262 Verb Table - 10EC0262 */
 static const u32 verb_table_data13[] = {
diff --git a/board/alliedtelesis/SBx81LIFKW/sbx81lifkw.c b/board/alliedtelesis/SBx81LIFKW/sbx81lifkw.c
index d8b9fdfe356..b8ed9f513c6 100644
--- a/board/alliedtelesis/SBx81LIFKW/sbx81lifkw.c
+++ b/board/alliedtelesis/SBx81LIFKW/sbx81lifkw.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <net.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/io.h>
diff --git a/board/alliedtelesis/SBx81LIFXCAT/sbx81lifxcat.c b/board/alliedtelesis/SBx81LIFXCAT/sbx81lifxcat.c
index 52b8eba92fc..3a91decbb76 100644
--- a/board/alliedtelesis/SBx81LIFXCAT/sbx81lifxcat.c
+++ b/board/alliedtelesis/SBx81LIFXCAT/sbx81lifxcat.c
@@ -11,6 +11,7 @@
 #include <netdev.h>
 #include <led.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/io.h>
 #include <asm/arch/cpu.h>
diff --git a/board/alliedtelesis/x530/x530.c b/board/alliedtelesis/x530/x530.c
index d602092d732..aa4e8915882 100644
--- a/board/alliedtelesis/x530/x530.c
+++ b/board/alliedtelesis/x530/x530.c
@@ -12,6 +12,7 @@
 #include <wdt.h>
 #include <asm/global_data.h>
 #include <asm/gpio.h>
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/mbus.h>
 #include <linux/io.h>
diff --git a/board/amazon/kc1/kc1.c b/board/amazon/kc1/kc1.c
index 94e39613440..a1b179d1a3c 100644
--- a/board/amazon/kc1/kc1.c
+++ b/board/amazon/kc1/kc1.c
@@ -10,6 +10,7 @@
 #include <env.h>
 #include <init.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/ctype.h>
 #include <linux/usb/musb.h>
 #include <asm/omap_musb.h>
diff --git a/board/aristainetos/aristainetos.c b/board/aristainetos/aristainetos.c
index ab73a928d66..4b7694a7e88 100644
--- a/board/aristainetos/aristainetos.c
+++ b/board/aristainetos/aristainetos.c
@@ -17,6 +17,7 @@
 #include <asm/arch/iomux.h>
 #include <asm/arch/mx6-pins.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
 #include <asm/mach-imx/iomux-v3.h>
diff --git a/board/armadeus/apf27/apf27.c b/board/armadeus/apf27/apf27.c
index 5e3fdd36fa2..8f205624496 100644
--- a/board/armadeus/apf27/apf27.c
+++ b/board/armadeus/apf27/apf27.c
@@ -10,6 +10,7 @@
 #include <hang.h>
 #include <init.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <jffs2/jffs2.h>
 #include <nand.h>
 #include <netdev.h>
diff --git a/board/armltd/integrator/integrator.c b/board/armltd/integrator/integrator.c
index a730f15c7a3..ddad2bd80da 100644
--- a/board/armltd/integrator/integrator.c
+++ b/board/armltd/integrator/integrator.c
@@ -26,6 +26,7 @@
 #include <netdev.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 #include <dm/platform_data/serial_pl01x.h>
 #include "arm-ebi.h"
 #include "integrator-sc.h"
diff --git a/board/armltd/vexpress/vexpress_common.c b/board/armltd/vexpress/vexpress_common.c
index d359a36c774..d4835191a93 100644
--- a/board/armltd/vexpress/vexpress_common.c
+++ b/board/armltd/vexpress/vexpress_common.c
@@ -29,6 +29,7 @@
 #include <asm/arch/systimer.h>
 #include <asm/arch/sysctrl.h>
 #include <asm/arch/wdt.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 #include "../drivers/mmc/arm_pl180_mmci.h"
 
diff --git a/board/armltd/vexpress64/vexpress64.c b/board/armltd/vexpress64/vexpress64.c
index cc118a02f11..c88482d3cef 100644
--- a/board/armltd/vexpress64/vexpress64.c
+++ b/board/armltd/vexpress64/vexpress64.c
@@ -14,6 +14,7 @@
 #include <netdev.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 #include <linux/compiler.h>
 #include <dm/platform_data/serial_pl01x.h>
 #include <linux/string.h>
diff --git a/board/atmark-techno/armadillo-800eva/armadillo-800eva.c b/board/atmark-techno/armadillo-800eva/armadillo-800eva.c
index 1bae2832522..9520be30529 100644
--- a/board/atmark-techno/armadillo-800eva/armadillo-800eva.c
+++ b/board/atmark-techno/armadillo-800eva/armadillo-800eva.c
@@ -31,6 +31,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/gpio.h>
 #include <asm/arch/rmobile.h>
+#include <asm/u-boot.h>
 
 #define s_init_wait(cnt) \
 		({	\
diff --git a/board/atmel/at91rm9200ek/at91rm9200ek.c b/board/atmel/at91rm9200ek/at91rm9200ek.c
index a314ced5e4a..5838e36c7a4 100644
--- a/board/atmel/at91rm9200ek/at91rm9200ek.c
+++ b/board/atmel/at91rm9200ek/at91rm9200ek.c
@@ -19,6 +19,7 @@
 #include <asm/arch/at91_pio.h>
 #include <asm/arch/at91_common.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/atmel/at91sam9260ek/at91sam9260ek.c b/board/atmel/at91sam9260ek/at91sam9260ek.c
index 38f97bce204..56687ccf13b 100644
--- a/board/atmel/at91sam9260ek/at91sam9260ek.c
+++ b/board/atmel/at91sam9260ek/at91sam9260ek.c
@@ -16,6 +16,7 @@
 #include <asm/arch/at91_common.h>
 #include <asm/arch/clk.h>
 #include <asm/arch/gpio.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/atmel/at91sam9261ek/at91sam9261ek.c b/board/atmel/at91sam9261ek/at91sam9261ek.c
index 0318eeaa94e..3a36a23a4d3 100644
--- a/board/atmel/at91sam9261ek/at91sam9261ek.c
+++ b/board/atmel/at91sam9261ek/at91sam9261ek.c
@@ -25,6 +25,7 @@
 #include <netdev.h>
 #endif
 #include <asm/mach-types.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/atmel/at91sam9263ek/at91sam9263ek.c b/board/atmel/at91sam9263ek/at91sam9263ek.c
index 3218e14e860..5960c1862ce 100644
--- a/board/atmel/at91sam9263ek/at91sam9263ek.c
+++ b/board/atmel/at91sam9263ek/at91sam9263ek.c
@@ -12,6 +12,7 @@
 #include <net.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/sizes.h>
 #include <asm/arch/at91sam9263.h>
 #include <asm/arch/at91sam9_smc.h>
diff --git a/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c b/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c
index 8cb2808e058..7f728125c06 100644
--- a/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c
+++ b/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c
@@ -19,6 +19,7 @@
 #include <asm/arch/gpio.h>
 #include <asm/arch/clk.h>
 #include <lcd.h>
+#include <asm/u-boot.h>
 #include <linux/mtd/rawnand.h>
 #include <atmel_lcdc.h>
 #include <asm/mach-types.h>
diff --git a/board/atmel/at91sam9n12ek/at91sam9n12ek.c b/board/atmel/at91sam9n12ek/at91sam9n12ek.c
index a3fc55bbc34..75d5ffa88ae 100644
--- a/board/atmel/at91sam9n12ek/at91sam9n12ek.c
+++ b/board/atmel/at91sam9n12ek/at91sam9n12ek.c
@@ -20,6 +20,7 @@
 #include <lcd.h>
 #include <atmel_hlcdc.h>
 #include <netdev.h>
+#include <asm/u-boot.h>
 
 #ifdef CONFIG_LCD_INFO
 #include <nand.h>
diff --git a/board/atmel/at91sam9rlek/at91sam9rlek.c b/board/atmel/at91sam9rlek/at91sam9rlek.c
index f427ee658bf..6f3debe3f37 100644
--- a/board/atmel/at91sam9rlek/at91sam9rlek.c
+++ b/board/atmel/at91sam9rlek/at91sam9rlek.c
@@ -19,6 +19,7 @@
 #include <asm/arch/at91_rstc.h>
 #include <asm/arch/clk.h>
 #include <asm/arch/gpio.h>
+#include <asm/u-boot.h>
 
 #include <lcd.h>
 #include <atmel_lcdc.h>
diff --git a/board/atmel/at91sam9x5ek/at91sam9x5ek.c b/board/atmel/at91sam9x5ek/at91sam9x5ek.c
index e0abe4aeb08..12dad5557a7 100644
--- a/board/atmel/at91sam9x5ek/at91sam9x5ek.c
+++ b/board/atmel/at91sam9x5ek/at91sam9x5ek.c
@@ -15,6 +15,7 @@
 #include <asm/arch/gpio.h>
 #include <debug_uart.h>
 #include <asm/mach-types.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/atmel/common/video_display.c b/board/atmel/common/video_display.c
index 33725a01f50..b3f876c6e58 100644
--- a/board/atmel/common/video_display.c
+++ b/board/atmel/common/video_display.c
@@ -16,6 +16,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clk.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/atmel/sam9x60ek/sam9x60ek.c b/board/atmel/sam9x60ek/sam9x60ek.c
index 32e5a2bf23a..4788d174caf 100644
--- a/board/atmel/sam9x60ek/sam9x60ek.c
+++ b/board/atmel/sam9x60ek/sam9x60ek.c
@@ -17,6 +17,7 @@
 #include <asm/arch/gpio.h>
 #include <debug_uart.h>
 #include <asm/mach-types.h>
+#include <asm/u-boot.h>
 
 extern void at91_pda_detect(void);
 
diff --git a/board/atmel/sama5d27_som1_ek/sama5d27_som1_ek.c b/board/atmel/sama5d27_som1_ek/sama5d27_som1_ek.c
index 1b7d946b50c..0f8ce6d29c0 100644
--- a/board/atmel/sama5d27_som1_ek/sama5d27_som1_ek.c
+++ b/board/atmel/sama5d27_som1_ek/sama5d27_som1_ek.c
@@ -16,6 +16,7 @@
 #include <asm/arch/clk.h>
 #include <asm/arch/gpio.h>
 #include <asm/arch/sama5d2.h>
+#include <asm/u-boot.h>
 
 extern void at91_pda_detect(void);
 
diff --git a/board/atmel/sama5d27_wlsom1_ek/sama5d27_wlsom1_ek.c b/board/atmel/sama5d27_wlsom1_ek/sama5d27_wlsom1_ek.c
index 32d51bba7d9..b8d02c4639b 100644
--- a/board/atmel/sama5d27_wlsom1_ek/sama5d27_wlsom1_ek.c
+++ b/board/atmel/sama5d27_wlsom1_ek/sama5d27_wlsom1_ek.c
@@ -17,6 +17,7 @@
 #include <asm/arch/clk.h>
 #include <asm/arch/gpio.h>
 #include <asm/arch/sama5d2.h>
+#include <asm/u-boot.h>
 
 extern void at91_pda_detect(void);
 
diff --git a/board/atmel/sama5d2_icp/sama5d2_icp.c b/board/atmel/sama5d2_icp/sama5d2_icp.c
index 3f33fcfc466..889a09fd855 100644
--- a/board/atmel/sama5d2_icp/sama5d2_icp.c
+++ b/board/atmel/sama5d2_icp/sama5d2_icp.c
@@ -16,6 +16,7 @@
 #include <asm/arch/clk.h>
 #include <asm/arch/gpio.h>
 #include <asm/arch/sama5d2.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/atmel/sama5d2_ptc_ek/sama5d2_ptc_ek.c b/board/atmel/sama5d2_ptc_ek/sama5d2_ptc_ek.c
index a6937e7d524..96abf9ef3d4 100644
--- a/board/atmel/sama5d2_ptc_ek/sama5d2_ptc_ek.c
+++ b/board/atmel/sama5d2_ptc_ek/sama5d2_ptc_ek.c
@@ -21,6 +21,7 @@
 #include <asm/arch/gpio.h>
 #include <asm/arch/sama5d2.h>
 #include <asm/arch/sama5d2_smc.h>
+#include <asm/u-boot.h>
 
 extern void at91_pda_detect(void);
 
diff --git a/board/atmel/sama5d2_xplained/sama5d2_xplained.c b/board/atmel/sama5d2_xplained/sama5d2_xplained.c
index 5110ec89697..4dbd9d63e2c 100644
--- a/board/atmel/sama5d2_xplained/sama5d2_xplained.c
+++ b/board/atmel/sama5d2_xplained/sama5d2_xplained.c
@@ -16,6 +16,7 @@
 #include <asm/arch/clk.h>
 #include <asm/arch/gpio.h>
 #include <asm/arch/sama5d2.h>
+#include <asm/u-boot.h>
 
 extern void at91_pda_detect(void);
 
diff --git a/board/atmel/sama5d3_xplained/sama5d3_xplained.c b/board/atmel/sama5d3_xplained/sama5d3_xplained.c
index db9603f5847..8956abfced4 100644
--- a/board/atmel/sama5d3_xplained/sama5d3_xplained.c
+++ b/board/atmel/sama5d3_xplained/sama5d3_xplained.c
@@ -17,6 +17,7 @@
 #include <spl.h>
 #include <asm/arch/atmel_mpddrc.h>
 #include <asm/arch/at91_wdt.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/atmel/sama5d3xek/sama5d3xek.c b/board/atmel/sama5d3xek/sama5d3xek.c
index 4fe979bc8a5..9e1caafb952 100644
--- a/board/atmel/sama5d3xek/sama5d3xek.c
+++ b/board/atmel/sama5d3xek/sama5d3xek.c
@@ -15,6 +15,7 @@
 #include <asm/arch/clk.h>
 #include <debug_uart.h>
 #include <env.h>
+#include <asm/u-boot.h>
 #include <linux/ctype.h>
 #include <spl.h>
 #include <asm/arch/atmel_mpddrc.h>
diff --git a/board/atmel/sama5d4_xplained/sama5d4_xplained.c b/board/atmel/sama5d4_xplained/sama5d4_xplained.c
index 2088b48b7ee..f021276c6df 100644
--- a/board/atmel/sama5d4_xplained/sama5d4_xplained.c
+++ b/board/atmel/sama5d4_xplained/sama5d4_xplained.c
@@ -16,6 +16,7 @@
 #include <asm/arch/sama5d3_smc.h>
 #include <asm/arch/sama5d4.h>
 #include <debug_uart.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/atmel/sama5d4ek/sama5d4ek.c b/board/atmel/sama5d4ek/sama5d4ek.c
index 46ec1eb3246..8f4a91cbaed 100644
--- a/board/atmel/sama5d4ek/sama5d4ek.c
+++ b/board/atmel/sama5d4ek/sama5d4ek.c
@@ -16,6 +16,7 @@
 #include <asm/arch/sama5d3_smc.h>
 #include <asm/arch/sama5d4.h>
 #include <debug_uart.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/bachmann/ot1200/ot1200.c b/board/bachmann/ot1200/ot1200.c
index 69d1b106b07..0754a599433 100644
--- a/board/bachmann/ot1200/ot1200.c
+++ b/board/bachmann/ot1200/ot1200.c
@@ -28,6 +28,7 @@
 #include <pca953x.h>
 #include <asm/gpio.h>
 #include <phy.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/bachmann/ot1200/ot1200_spl.c b/board/bachmann/ot1200/ot1200_spl.c
index 7fbd6f2c5d3..297d5a72b0e 100644
--- a/board/bachmann/ot1200/ot1200_spl.c
+++ b/board/bachmann/ot1200/ot1200_spl.c
@@ -7,6 +7,7 @@
 #include <init.h>
 #include <spl.h>
 #include <asm/arch/mx6-ddr.h>
+#include <asm/u-boot.h>
 
 /* Configure MX6Q/DUAL mmdc DDR io registers */
 static struct mx6dq_iomux_ddr_regs ot1200_ddr_ioregs = {
diff --git a/board/barco/platinum/platinum.c b/board/barco/platinum/platinum.c
index ec8d5528887..af2b37cbdb1 100644
--- a/board/barco/platinum/platinum.c
+++ b/board/barco/platinum/platinum.c
@@ -22,6 +22,7 @@
 #include <asm/gpio.h>
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/mach-imx/boot_mode.h>
+#include <asm/u-boot.h>
 
 #include "platinum.h"
 
diff --git a/board/barco/platinum/spl_picon.c b/board/barco/platinum/spl_picon.c
index aa33d1feb32..a023ddca33c 100644
--- a/board/barco/platinum/spl_picon.c
+++ b/board/barco/platinum/spl_picon.c
@@ -18,6 +18,7 @@
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/mach-imx/mxc_i2c.h>
 #include <spl.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 
 #include "platinum.h"
diff --git a/board/barco/platinum/spl_titanium.c b/board/barco/platinum/spl_titanium.c
index ef1e2c419b4..0395d197448 100644
--- a/board/barco/platinum/spl_titanium.c
+++ b/board/barco/platinum/spl_titanium.c
@@ -18,6 +18,7 @@
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/mach-imx/mxc_i2c.h>
 #include <spl.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 
 #include "platinum.h"
diff --git a/board/barco/titanium/titanium.c b/board/barco/titanium/titanium.c
index efd1dc35ef4..fe27965b482 100644
--- a/board/barco/titanium/titanium.c
+++ b/board/barco/titanium/titanium.c
@@ -23,6 +23,7 @@
 #include <micrel.h>
 #include <miiphy.h>
 #include <netdev.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/beacon/beacon-rzg2m/beacon-rzg2m.c b/board/beacon/beacon-rzg2m/beacon-rzg2m.c
index c343de51023..17b99df5e81 100644
--- a/board/beacon/beacon-rzg2m/beacon-rzg2m.c
+++ b/board/beacon/beacon-rzg2m/beacon-rzg2m.c
@@ -7,6 +7,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/rcar-mstp.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/beacon/imx8mm/imx8mm_beacon.c b/board/beacon/imx8mm/imx8mm_beacon.c
index 87ffebb5713..f4ac47e7f31 100644
--- a/board/beacon/imx8mm/imx8mm_beacon.c
+++ b/board/beacon/imx8mm/imx8mm_beacon.c
@@ -7,6 +7,7 @@
 #include <miiphy.h>
 #include <netdev.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 
 #include <asm/arch/clock.h>
 #include <asm/arch/sys_proto.h>
diff --git a/board/beacon/imx8mm/spl.c b/board/beacon/imx8mm/spl.c
index 572dc519123..ed9843ac269 100644
--- a/board/beacon/imx8mm/spl.c
+++ b/board/beacon/imx8mm/spl.c
@@ -14,6 +14,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/mach-imx/boot_mode.h>
 #include <asm/arch/ddr.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 
 #include <dm/uclass.h>
diff --git a/board/beckhoff/mx53cx9020/mx53cx9020.c b/board/beckhoff/mx53cx9020/mx53cx9020.c
index e451ef9ef36..3fbfcb525af 100644
--- a/board/beckhoff/mx53cx9020/mx53cx9020.c
+++ b/board/beckhoff/mx53cx9020/mx53cx9020.c
@@ -17,6 +17,7 @@
 #include <asm/mach-imx/mx5_video.h>
 #include <ACEX1K.h>
 #include <asm/gpio.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 
diff --git a/board/bluegiga/apx4devkit/apx4devkit.c b/board/bluegiga/apx4devkit/apx4devkit.c
index ed0885f724c..0bb752e51bd 100644
--- a/board/bluegiga/apx4devkit/apx4devkit.c
+++ b/board/bluegiga/apx4devkit/apx4devkit.c
@@ -25,6 +25,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/sys_proto.h>
 #include <env.h>
+#include <asm/u-boot.h>
 #include <linux/mii.h>
 #include <miiphy.h>
 #include <netdev.h>
diff --git a/board/bluewater/gurnard/gurnard.c b/board/bluewater/gurnard/gurnard.c
index 2ac23674f9c..706bb6935d2 100644
--- a/board/bluewater/gurnard/gurnard.c
+++ b/board/bluewater/gurnard/gurnard.c
@@ -33,6 +33,7 @@
 #include <asm/arch/atmel_serial.h>
 #include <asm/arch/clk.h>
 #include <asm/arch/gpio.h>
+#include <asm/u-boot.h>
 #include <dm/uclass-internal.h>
 #include <linux/delay.h>
 #include <linux/string.h>
diff --git a/board/bluewater/snapper9260/snapper9260.c b/board/bluewater/snapper9260/snapper9260.c
index 87fb967ea05..188001c77ed 100644
--- a/board/bluewater/snapper9260/snapper9260.c
+++ b/board/bluewater/snapper9260/snapper9260.c
@@ -24,6 +24,7 @@
 #include <netdev.h>
 #include <i2c.h>
 #include <pca953x.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/bosch/guardian/board.c b/board/bosch/guardian/board.c
index 113838f8b72..a397190d434 100644
--- a/board/bosch/guardian/board.c
+++ b/board/bosch/guardian/board.c
@@ -20,6 +20,7 @@
 #include <miiphy.h>
 #include <panel.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <power/tps65217.h>
 #include <power/tps65910.h>
 #include <spl.h>
diff --git a/board/bosch/shc/board.c b/board/bosch/shc/board.c
index bfce291691a..3b453623826 100644
--- a/board/bosch/shc/board.c
+++ b/board/bosch/shc/board.c
@@ -36,6 +36,7 @@
 #include <i2c.h>
 #include <miiphy.h>
 #include <cpsw.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <power/tps65217.h>
 #include <env_internal.h>
diff --git a/board/boundary/nitrogen6x/nitrogen6x.c b/board/boundary/nitrogen6x/nitrogen6x.c
index 3cc093ed530..16b50dac92a 100644
--- a/board/boundary/nitrogen6x/nitrogen6x.c
+++ b/board/boundary/nitrogen6x/nitrogen6x.c
@@ -17,6 +17,7 @@
 #include <asm/arch/sys_proto.h>
 #include <malloc.h>
 #include <asm/arch/mx6-pins.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
diff --git a/board/broadcom/bcm23550_w1d/bcm23550_w1d.c b/board/broadcom/bcm23550_w1d/bcm23550_w1d.c
index 90685c072a3..0a5ae5718be 100644
--- a/board/broadcom/bcm23550_w1d/bcm23550_w1d.c
+++ b/board/broadcom/bcm23550_w1d/bcm23550_w1d.c
@@ -14,6 +14,7 @@
 #include <asm/kona-common/kona_sdhci.h>
 #include <asm/kona-common/clk.h>
 #include <asm/arch/sysmap.h>
+#include <asm/u-boot.h>
 
 #include <usb.h>
 #include <usb/dwc2_udc.h>
diff --git a/board/broadcom/bcm28155_ap/bcm28155_ap.c b/board/broadcom/bcm28155_ap/bcm28155_ap.c
index 43726f79bde..4c097308947 100644
--- a/board/broadcom/bcm28155_ap/bcm28155_ap.c
+++ b/board/broadcom/bcm28155_ap/bcm28155_ap.c
@@ -14,6 +14,7 @@
 #include <asm/kona-common/kona_sdhci.h>
 #include <asm/kona-common/clk.h>
 #include <asm/arch/sysmap.h>
+#include <asm/u-boot.h>
 
 #include <usb.h>
 #include <usb/dwc2_udc.h>
diff --git a/board/broadcom/bcm963158/bcm963158.c b/board/broadcom/bcm963158/bcm963158.c
index 9feaee3c0fc..b2244ad5578 100644
--- a/board/broadcom/bcm963158/bcm963158.c
+++ b/board/broadcom/bcm963158/bcm963158.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <fdtdec.h>
 #include <init.h>
+#include <asm/u-boot.h>
 #include <linux/io.h>
 
 #ifdef CONFIG_ARM64
diff --git a/board/broadcom/bcm968360bg/bcm968360bg.c b/board/broadcom/bcm968360bg/bcm968360bg.c
index 90af6b88bd4..4ed21504be6 100644
--- a/board/broadcom/bcm968360bg/bcm968360bg.c
+++ b/board/broadcom/bcm968360bg/bcm968360bg.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <fdtdec.h>
 #include <init.h>
+#include <asm/u-boot.h>
 #include <linux/io.h>
 
 #ifdef CONFIG_ARM64
diff --git a/board/broadcom/bcm968580xref/bcm968580xref.c b/board/broadcom/bcm968580xref/bcm968580xref.c
index 1bd723d49ed..78ef68db1bf 100644
--- a/board/broadcom/bcm968580xref/bcm968580xref.c
+++ b/board/broadcom/bcm968580xref/bcm968580xref.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <fdtdec.h>
 #include <init.h>
+#include <asm/u-boot.h>
 #include <linux/io.h>
 
 #ifdef CONFIG_ARM64
diff --git a/board/broadcom/bcm_ep/board.c b/board/broadcom/bcm_ep/board.c
index 6064eb43db1..d14bb9e9e01 100644
--- a/board/broadcom/bcm_ep/board.c
+++ b/board/broadcom/bcm_ep/board.c
@@ -14,6 +14,7 @@
 #include <netdev.h>
 #include <asm/system.h>
 #include <asm/iproc-common/armpll.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/broadcom/bcmns2/northstar2.c b/board/broadcom/bcmns2/northstar2.c
index 494e457ff65..4ced6609086 100644
--- a/board/broadcom/bcmns2/northstar2.c
+++ b/board/broadcom/bcmns2/northstar2.c
@@ -9,6 +9,7 @@
 #include <asm/global_data.h>
 #include <asm/system.h>
 #include <asm/armv8/mmu.h>
+#include <asm/u-boot.h>
 
 static struct mm_region ns2_mem_map[] = {
 	{
diff --git a/board/broadcom/bcmstb/bcmstb.c b/board/broadcom/bcmstb/bcmstb.c
index f6bdf1f5f40..4e942f5f71c 100644
--- a/board/broadcom/bcmstb/bcmstb.c
+++ b/board/broadcom/bcmstb/bcmstb.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <time.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/types.h>
 #include <common.h>
 #include <env.h>
diff --git a/board/bticino/mamoj/mamoj.c b/board/bticino/mamoj/mamoj.c
index c9da42b43bf..875eebd96f5 100644
--- a/board/bticino/mamoj/mamoj.c
+++ b/board/bticino/mamoj/mamoj.c
@@ -9,6 +9,7 @@
 #include <init.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/bticino/mamoj/spl.c b/board/bticino/mamoj/spl.c
index 883b7f4133b..f033b6d19ec 100644
--- a/board/bticino/mamoj/spl.c
+++ b/board/bticino/mamoj/spl.c
@@ -10,6 +10,7 @@
 #include <serial.h>
 #include <spl.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 
 #include <asm/io.h>
diff --git a/board/buffalo/lsxl/lsxl.c b/board/buffalo/lsxl/lsxl.c
index 34be601fdde..9eff76527fe 100644
--- a/board/buffalo/lsxl/lsxl.c
+++ b/board/buffalo/lsxl/lsxl.c
@@ -25,6 +25,7 @@
 #include <asm/arch/mpp.h>
 #include <asm/arch/gpio.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 
 #include "lsxl.h"
diff --git a/board/cadence/xtfpga/xtfpga.c b/board/cadence/xtfpga/xtfpga.c
index 2869e5cf688..0ff90c4f483 100644
--- a/board/cadence/xtfpga/xtfpga.c
+++ b/board/cadence/xtfpga/xtfpga.c
@@ -8,6 +8,7 @@
 #include <command.h>
 #include <dm.h>
 #include <init.h>
+#include <asm/u-boot.h>
 #include <dm/platform_data/net_ethoc.h>
 #include <env.h>
 #include <linux/ctype.h>
diff --git a/board/calao/usb_a9263/usb_a9263.c b/board/calao/usb_a9263/usb_a9263.c
index c0a5c518ca8..0f59a9276c7 100644
--- a/board/calao/usb_a9263/usb_a9263.c
+++ b/board/calao/usb_a9263/usb_a9263.c
@@ -19,6 +19,7 @@
 #include <asm/io.h>
 #include <net.h>
 #include <netdev.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/cavium/thunderx/thunderx.c b/board/cavium/thunderx/thunderx.c
index ccb6b26c91b..18b0f43aa7d 100644
--- a/board/cavium/thunderx/thunderx.c
+++ b/board/cavium/thunderx/thunderx.c
@@ -11,6 +11,7 @@
 #include <errno.h>
 #include <net.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/compiler.h>
 
 #include <cavium/atf.h>
diff --git a/board/ccv/xpress/spl.c b/board/ccv/xpress/spl.c
index 38bda8d1847..357945eea1a 100644
--- a/board/ccv/xpress/spl.c
+++ b/board/ccv/xpress/spl.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <asm/arch/mx6-ddr.h>
 #include <asm/arch/crm_regs.h>
+#include <asm/u-boot.h>
 
 /* Configuration for IM IME1G16D3EEBG-15EI, 64M x 16 -> 128MiB */
 
diff --git a/board/ccv/xpress/xpress.c b/board/ccv/xpress/xpress.c
index 9f5e78ce680..8e23359751a 100644
--- a/board/ccv/xpress/xpress.c
+++ b/board/ccv/xpress/xpress.c
@@ -26,6 +26,7 @@
 #include <mmc.h>
 #include <netdev.h>
 #include <usb.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <usb/ehci-ci.h>
 
diff --git a/board/cirrus/edb93xx/edb93xx.c b/board/cirrus/edb93xx/edb93xx.c
index 7a7f62fe88e..f2fb24000c8 100644
--- a/board/cirrus/edb93xx/edb93xx.c
+++ b/board/cirrus/edb93xx/edb93xx.c
@@ -25,6 +25,7 @@
 #include <asm/io.h>
 #include <asm/mach-types.h>
 #include <asm/arch/ep93xx.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/cloudengines/pogo_e02/pogo_e02.c b/board/cloudengines/pogo_e02/pogo_e02.c
index 039fd6e3dd6..66543f2f1b5 100644
--- a/board/cloudengines/pogo_e02/pogo_e02.c
+++ b/board/cloudengines/pogo_e02/pogo_e02.c
@@ -18,6 +18,7 @@
 #include <asm/arch/soc.h>
 #include <asm/arch/mpp.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include "pogo_e02.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/compulab/cl-som-imx7/cl-som-imx7.c b/board/compulab/cl-som-imx7/cl-som-imx7.c
index 454c93a572f..46a0fa76473 100644
--- a/board/compulab/cl-som-imx7/cl-som-imx7.c
+++ b/board/compulab/cl-som-imx7/cl-som-imx7.c
@@ -16,6 +16,7 @@
 #include <netdev.h>
 #include <fsl_esdhc_imx.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <power/pmic.h>
 #include <power/pfuze3000_pmic.h>
diff --git a/board/compulab/cl-som-imx7/spl.c b/board/compulab/cl-som-imx7/spl.c
index 0128b912801..18dc86cdc83 100644
--- a/board/compulab/cl-som-imx7/spl.c
+++ b/board/compulab/cl-som-imx7/spl.c
@@ -16,6 +16,7 @@
 #include <asm/arch-mx7/mx7-pins.h>
 #include <asm/arch-mx7/clock.h>
 #include <asm/arch-mx7/mx7-ddr.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 #include "common.h"
 
diff --git a/board/compulab/cm_fx6/cm_fx6.c b/board/compulab/cm_fx6/cm_fx6.c
index 46da479a45f..4147c4f7d02 100644
--- a/board/compulab/cm_fx6/cm_fx6.c
+++ b/board/compulab/cm_fx6/cm_fx6.c
@@ -33,6 +33,7 @@
 #include <asm/mach-imx/video.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
+#include <asm/u-boot.h>
 #include <dm/platform_data/serial_mxc.h>
 #include <dm/device-internal.h>
 #include <jffs2/load_kernel.h>
diff --git a/board/compulab/cm_fx6/spl.c b/board/compulab/cm_fx6/spl.c
index c3c816181fd..ab739330d9c 100644
--- a/board/compulab/cm_fx6/spl.c
+++ b/board/compulab/cm_fx6/spl.c
@@ -20,6 +20,7 @@
 #include <asm/arch/crm_regs.h>
 #include <asm/mach-imx/iomux-v3.h>
 #include <fsl_esdhc_imx.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include "common.h"
 
diff --git a/board/compulab/cm_t335/cm_t335.c b/board/compulab/cm_t335/cm_t335.c
index 1d4a3aceef5..2a63aadf0d7 100644
--- a/board/compulab/cm_t335/cm_t335.c
+++ b/board/compulab/cm_t335/cm_t335.c
@@ -15,6 +15,7 @@
 #include <status_led.h>
 #include <cpsw.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 
 #include <asm/arch/sys_proto.h>
diff --git a/board/compulab/cm_t43/cm_t43.c b/board/compulab/cm_t43/cm_t43.c
index efdade155b5..92c8092d6d7 100644
--- a/board/compulab/cm_t43/cm_t43.c
+++ b/board/compulab/cm_t43/cm_t43.c
@@ -12,6 +12,7 @@
 #include <asm/gpio.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/emif.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <power/pmic.h>
 #include <power/tps65218.h>
diff --git a/board/congatec/cgtqmx6eval/cgtqmx6eval.c b/board/congatec/cgtqmx6eval/cgtqmx6eval.c
index 3f74cd87890..62c53d782e0 100644
--- a/board/congatec/cgtqmx6eval/cgtqmx6eval.c
+++ b/board/congatec/cgtqmx6eval/cgtqmx6eval.c
@@ -28,6 +28,7 @@
 #include <fsl_esdhc_imx.h>
 #include <i2c.h>
 #include <input.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 #include <power/pmic.h>
diff --git a/board/congatec/conga-qeval20-qa3-e3845/conga-qeval20-qa3.c b/board/congatec/conga-qeval20-qa3-e3845/conga-qeval20-qa3.c
index 315b6dc5429..df2170ba109 100644
--- a/board/congatec/conga-qeval20-qa3-e3845/conga-qeval20-qa3.c
+++ b/board/congatec/conga-qeval20-qa3-e3845/conga-qeval20-qa3.c
@@ -10,6 +10,7 @@
 #include <asm/gpio.h>
 #include <asm/ibmpc.h>
 #include <asm/pnp_def.h>
+#include <asm/u-boot.h>
 
 int board_early_init_f(void)
 {
diff --git a/board/corscience/tricorder/tricorder.c b/board/corscience/tricorder/tricorder.c
index a6fc7f67d02..53495aa187b 100644
--- a/board/corscience/tricorder/tricorder.c
+++ b/board/corscience/tricorder/tricorder.c
@@ -21,6 +21,7 @@
 #include <asm/arch/mux.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/mem.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 #include "tricorder.h"
 #include "tricorder-eeprom.h"
diff --git a/board/cortina/presidio-asic/presidio.c b/board/cortina/presidio-asic/presidio.c
index 5c735222637..1c46293ffd5 100644
--- a/board/cortina/presidio-asic/presidio.c
+++ b/board/cortina/presidio-asic/presidio.c
@@ -10,6 +10,7 @@
 #include <netdev.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/compiler.h>
 #include <configs/presidio_asic.h>
diff --git a/board/creative/xfi3/xfi3.c b/board/creative/xfi3/xfi3.c
index 2aa2435e49c..cbaa5e59eac 100644
--- a/board/creative/xfi3/xfi3.c
+++ b/board/creative/xfi3/xfi3.c
@@ -20,6 +20,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/cssi/MCR3000/MCR3000.c b/board/cssi/MCR3000/MCR3000.c
index 2603ad4c57d..b9015254234 100644
--- a/board/cssi/MCR3000/MCR3000.c
+++ b/board/cssi/MCR3000/MCR3000.c
@@ -16,6 +16,7 @@
 #include <serial.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 #include <dm/uclass.h>
 #include <wdt.h>
 #include <linux/delay.h>
diff --git a/board/d-link/dns325/dns325.c b/board/d-link/dns325/dns325.c
index 055783f63ad..9c8f8775ac5 100644
--- a/board/d-link/dns325/dns325.c
+++ b/board/d-link/dns325/dns325.c
@@ -20,6 +20,7 @@
 #include <asm/arch/mpp.h>
 #include <asm/arch/gpio.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include "dns325.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/davinci/da8xxevm/da850evm.c b/board/davinci/da8xxevm/da850evm.c
index 7b3f303f3a7..38e51eb23e3 100644
--- a/board/davinci/da8xxevm/da850evm.c
+++ b/board/davinci/da8xxevm/da850evm.c
@@ -23,6 +23,7 @@
 #include <asm/arch/pinmux_defs.h>
 #include <asm/io.h>
 #include <asm/arch/davinci_misc.h>
+#include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <hwconfig.h>
 #include <asm/mach-types.h>
diff --git a/board/davinci/da8xxevm/omapl138_lcdk.c b/board/davinci/da8xxevm/omapl138_lcdk.c
index 3f4bd39ec8f..347f616df67 100644
--- a/board/davinci/da8xxevm/omapl138_lcdk.c
+++ b/board/davinci/da8xxevm/omapl138_lcdk.c
@@ -18,6 +18,7 @@
 #include <asm/ti-common/davinci_nand.h>
 #include <asm/io.h>
 #include <ns16550.h>
+#include <asm/u-boot.h>
 #include <dm/platdata.h>
 #include <linux/errno.h>
 #include <asm/mach-types.h>
diff --git a/board/dfi/dfi-bt700/dfi-bt700.c b/board/dfi/dfi-bt700/dfi-bt700.c
index 87506a77a17..0b294595d4c 100644
--- a/board/dfi/dfi-bt700/dfi-bt700.c
+++ b/board/dfi/dfi-bt700/dfi-bt700.c
@@ -10,6 +10,7 @@
 #include <asm/gpio.h>
 #include <asm/ibmpc.h>
 #include <asm/pnp_def.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 
 int board_early_init_f(void)
diff --git a/board/dhelectronics/dh_imx6/dh_imx6.c b/board/dhelectronics/dh_imx6/dh_imx6.c
index c8c99a2aa47..8428cc6183b 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 <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <dm/device-internal.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/crm_regs.h>
diff --git a/board/dhelectronics/dh_imx6/dh_imx6_spl.c b/board/dhelectronics/dh_imx6/dh_imx6_spl.c
index dd8f1625be3..bcb39eab886 100644
--- a/board/dhelectronics/dh_imx6/dh_imx6_spl.c
+++ b/board/dhelectronics/dh_imx6/dh_imx6_spl.c
@@ -25,6 +25,7 @@
 #include <i2c.h>
 #include <mmc.h>
 #include <spl.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 
diff --git a/board/dhelectronics/dh_stm32mp1/board.c b/board/dhelectronics/dh_stm32mp1/board.c
index 851024f52b3..61c86a2d443 100644
--- a/board/dhelectronics/dh_stm32mp1/board.c
+++ b/board/dhelectronics/dh_stm32mp1/board.c
@@ -16,6 +16,7 @@
 #include <clk.h>
 #include <config.h>
 #include <dm.h>
+#include <asm/u-boot.h>
 #include <dm/device.h>
 #include <dm/uclass.h>
 #include <env.h>
diff --git a/board/ea/mx7ulp_com/mx7ulp_com.c b/board/ea/mx7ulp_com/mx7ulp_com.c
index 5b2d444366c..0aa2be80e00 100644
--- a/board/ea/mx7ulp_com/mx7ulp_com.c
+++ b/board/ea/mx7ulp_com/mx7ulp_com.c
@@ -11,6 +11,7 @@
 #include <asm/arch/mx7ulp-pins.h>
 #include <asm/arch/iomux.h>
 #include <asm/gpio.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/eets/pdu001/board.c b/board/eets/pdu001/board.c
index f806d1e7672..a7e529c2151 100644
--- a/board/eets/pdu001/board.c
+++ b/board/eets/pdu001/board.c
@@ -19,6 +19,7 @@
 #include <watchdog.h>
 #include <debug_uart.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <dm/ofnode.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/board/egnite/ethernut5/ethernut5.c b/board/egnite/ethernut5/ethernut5.c
index 559fdd2f646..6dc58eab14e 100644
--- a/board/egnite/ethernut5/ethernut5.c
+++ b/board/egnite/ethernut5/ethernut5.c
@@ -61,6 +61,7 @@
 #include <mmc.h>
 #include <atmel_mci.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 
 #include <asm/arch/at91sam9260.h>
 #include <asm/arch/at91sam9260_matrix.h>
diff --git a/board/el/el6x/el6x.c b/board/el/el6x/el6x.c
index 382a255d162..f5c874dcda8 100644
--- a/board/el/el6x/el6x.c
+++ b/board/el/el6x/el6x.c
@@ -14,6 +14,7 @@
 #include <asm/arch/mx6-pins.h>
 #include <env.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
diff --git a/board/elgin/elgin_rv1108/elgin_rv1108.c b/board/elgin/elgin_rv1108/elgin_rv1108.c
index e0057ce1e6e..c26abf9ce10 100644
--- a/board/elgin/elgin_rv1108/elgin_rv1108.c
+++ b/board/elgin/elgin_rv1108/elgin_rv1108.c
@@ -13,6 +13,7 @@
 #include <asm/arch-rockchip/grf_rv1108.h>
 #include <asm/arch-rockchip/hardware.h>
 #include <asm/gpio.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/embest/mx6boards/mx6boards.c b/board/embest/mx6boards/mx6boards.c
index 65b3942e399..3cd24de612b 100644
--- a/board/embest/mx6boards/mx6boards.c
+++ b/board/embest/mx6boards/mx6boards.c
@@ -21,6 +21,7 @@
 #include <asm/arch/iomux.h>
 #include <asm/arch/mx6-pins.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
diff --git a/board/emulation/qemu-arm/qemu-arm.c b/board/emulation/qemu-arm/qemu-arm.c
index f18f2ed7da3..2d9cb0a9a42 100644
--- a/board/emulation/qemu-arm/qemu-arm.c
+++ b/board/emulation/qemu-arm/qemu-arm.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <virtio_types.h>
 #include <virtio.h>
+#include <asm/u-boot.h>
 
 #ifdef CONFIG_ARM64
 #include <asm/armv8/mmu.h>
diff --git a/board/emulation/qemu-riscv/qemu-riscv.c b/board/emulation/qemu-riscv/qemu-riscv.c
index dcfd3f20bee..575367e1de7 100644
--- a/board/emulation/qemu-riscv/qemu-riscv.c
+++ b/board/emulation/qemu-riscv/qemu-riscv.c
@@ -13,6 +13,7 @@
 #include <init.h>
 #include <virtio_types.h>
 #include <virtio.h>
+#include <asm/u-boot.h>
 
 int board_init(void)
 {
diff --git a/board/engicam/common/board.c b/board/engicam/common/board.c
index 28080d423b3..e301f3e98bc 100644
--- a/board/engicam/common/board.c
+++ b/board/engicam/common/board.c
@@ -17,6 +17,7 @@
 #include <asm/arch/sys_proto.h>
 #include <watchdog.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 
 #include "board.h"
diff --git a/board/engicam/common/spl.c b/board/engicam/common/spl.c
index d57419a78ef..1e3dbbe111e 100644
--- a/board/engicam/common/spl.c
+++ b/board/engicam/common/spl.c
@@ -10,6 +10,7 @@
 #include <init.h>
 #include <serial.h>
 #include <spl.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 
diff --git a/board/esd/meesc/meesc.c b/board/esd/meesc/meesc.c
index 81aa22bc831..fe2f9a4d2b1 100644
--- a/board/esd/meesc/meesc.c
+++ b/board/esd/meesc/meesc.c
@@ -28,6 +28,7 @@
 #include <asm/arch/at91_pio.h>
 #include <asm/arch/clk.h>
 #include <netdev.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/esd/vme8349/vme8349.c b/board/esd/vme8349/vme8349.c
index 56dd2269cb8..15b1e07d89f 100644
--- a/board/esd/vme8349/vme8349.c
+++ b/board/esd/vme8349/vme8349.c
@@ -28,6 +28,7 @@
 #include <spd_sdram.h>
 #include <i2c.h>
 #include <netdev.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/common/cds_pci_ft.c b/board/freescale/common/cds_pci_ft.c
index be97a28ed25..6b3690610d9 100644
--- a/board/freescale/common/cds_pci_ft.c
+++ b/board/freescale/common/cds_pci_ft.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include "cadmus.h"
diff --git a/board/freescale/common/p_corenet/law.c b/board/freescale/common/p_corenet/law.c
index 603384ac4f9..f70ed76386f 100644
--- a/board/freescale/common/p_corenet/law.c
+++ b/board/freescale/common/p_corenet/law.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
+#include <asm/u-boot.h>
 
 struct law_entry law_table[] = {
 	SET_LAW(CONFIG_SYS_FLASH_BASE_PHYS, LAW_SIZE_256M, LAW_TRGT_IF_LBC),
diff --git a/board/freescale/common/p_corenet/pci.c b/board/freescale/common/p_corenet/pci.c
index 636334863e1..ce6c375aff4 100644
--- a/board/freescale/common/p_corenet/pci.c
+++ b/board/freescale/common/p_corenet/pci.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <pci.h>
 #include <asm/fsl_pci.h>
+#include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <asm/fsl_serdes.h>
diff --git a/board/freescale/common/p_corenet/tlb.c b/board/freescale/common/p_corenet/tlb.c
index c0ab1a5fd14..6f8d8354e87 100644
--- a/board/freescale/common/p_corenet/tlb.c
+++ b/board/freescale/common/p_corenet/tlb.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <asm/mmu.h>
+#include <asm/u-boot.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/freescale/common/vid.c b/board/freescale/common/vid.c
index ed0d9b471ca..2d4d9202994 100644
--- a/board/freescale/common/vid.c
+++ b/board/freescale/common/vid.c
@@ -17,6 +17,7 @@
 #else
 #include <asm/immap_85xx.h>
 #endif
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include "vid.h"
 
diff --git a/board/freescale/corenet_ds/corenet_ds.c b/board/freescale/corenet_ds/corenet_ds.c
index 3a83e65f2fe..67b47e33e72 100644
--- a/board/freescale/corenet_ds/corenet_ds.c
+++ b/board/freescale/corenet_ds/corenet_ds.c
@@ -11,6 +11,7 @@
 #include <init.h>
 #include <netdev.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/compiler.h>
 #include <asm/mmu.h>
 #include <asm/processor.h>
diff --git a/board/freescale/corenet_ds/corenet_ds.h b/board/freescale/corenet_ds/corenet_ds.h
index 84e5c4a2de2..bf9181e0768 100644
--- a/board/freescale/corenet_ds/corenet_ds.h
+++ b/board/freescale/corenet_ds/corenet_ds.h
@@ -6,6 +6,7 @@
 #ifndef __CORENET_DS_H__
 #define __CORENET_DS_H__
 
+#include <asm/u-boot.h>
 void fdt_fixup_board_enet(void *blob);
 void pci_of_setup(void *blob, struct bd_info *bd);
 
diff --git a/board/freescale/corenet_ds/ddr.c b/board/freescale/corenet_ds/ddr.c
index a8e499869f5..4fbbe4b00d0 100644
--- a/board/freescale/corenet_ds/ddr.c
+++ b/board/freescale/corenet_ds/ddr.c
@@ -14,6 +14,7 @@
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
 #include <asm/fsl_law.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/corenet_ds/eth_hydra.c b/board/freescale/corenet_ds/eth_hydra.c
index 90ce999be0c..71c588c1417 100644
--- a/board/freescale/corenet_ds/eth_hydra.c
+++ b/board/freescale/corenet_ds/eth_hydra.c
@@ -56,6 +56,7 @@
 #include <malloc.h>
 #include <fdt_support.h>
 #include <fsl_dtsec.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 
 #include "../common/ngpixis.h"
diff --git a/board/freescale/corenet_ds/eth_p4080.c b/board/freescale/corenet_ds/eth_p4080.c
index 650013bb6fc..3360e0ffc79 100644
--- a/board/freescale/corenet_ds/eth_p4080.c
+++ b/board/freescale/corenet_ds/eth_p4080.c
@@ -22,6 +22,7 @@
 #include <fsl_mdio.h>
 #include <miiphy.h>
 #include <phy.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 
 #include "../common/ngpixis.h"
diff --git a/board/freescale/corenet_ds/eth_superhydra.c b/board/freescale/corenet_ds/eth_superhydra.c
index 296b2b10027..57fb5a77f06 100644
--- a/board/freescale/corenet_ds/eth_superhydra.c
+++ b/board/freescale/corenet_ds/eth_superhydra.c
@@ -57,6 +57,7 @@
 #include <malloc.h>
 #include <fdt_support.h>
 #include <fsl_dtsec.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 
 #include "../common/ngpixis.h"
diff --git a/board/freescale/imx8mm_evk/imx8mm_evk.c b/board/freescale/imx8mm_evk/imx8mm_evk.c
index ab55135a972..0e505b39bf8 100644
--- a/board/freescale/imx8mm_evk/imx8mm_evk.c
+++ b/board/freescale/imx8mm_evk/imx8mm_evk.c
@@ -9,6 +9,7 @@
 #include <miiphy.h>
 #include <netdev.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 
 #include <asm/arch/clock.h>
 #include <asm/arch/sys_proto.h>
diff --git a/board/freescale/imx8mm_evk/spl.c b/board/freescale/imx8mm_evk/spl.c
index fbc13ad128a..1e366fd8fa6 100644
--- a/board/freescale/imx8mm_evk/spl.c
+++ b/board/freescale/imx8mm_evk/spl.c
@@ -19,6 +19,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/mach-imx/boot_mode.h>
 #include <asm/arch/ddr.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 
 #include <dm/uclass.h>
diff --git a/board/freescale/imx8mn_evk/imx8mn_evk.c b/board/freescale/imx8mn_evk/imx8mn_evk.c
index 9a0a0488bf4..d12a8f68a91 100644
--- a/board/freescale/imx8mn_evk/imx8mn_evk.c
+++ b/board/freescale/imx8mn_evk/imx8mn_evk.c
@@ -7,6 +7,7 @@
 #include <env.h>
 #include <init.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/imx8mn_evk/spl.c b/board/freescale/imx8mn_evk/spl.c
index 9f3c5884128..3fda215ba4c 100644
--- a/board/freescale/imx8mn_evk/spl.c
+++ b/board/freescale/imx8mn_evk/spl.c
@@ -20,6 +20,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/mach-imx/boot_mode.h>
 #include <asm/arch/ddr.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 
 #include <dm/uclass.h>
diff --git a/board/freescale/imx8mp_evk/imx8mp_evk.c b/board/freescale/imx8mp_evk/imx8mp_evk.c
index 56da4d4c6a3..4f16a14cd8e 100644
--- a/board/freescale/imx8mp_evk/imx8mp_evk.c
+++ b/board/freescale/imx8mp_evk/imx8mp_evk.c
@@ -13,6 +13,7 @@
 #include <asm/arch/imx8mp_pins.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/mach-imx/gpio.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/imx8mp_evk/spl.c b/board/freescale/imx8mp_evk/spl.c
index ebfd94dc1fa..8965f623a1f 100644
--- a/board/freescale/imx8mp_evk/spl.c
+++ b/board/freescale/imx8mp_evk/spl.c
@@ -20,6 +20,7 @@
 #include <asm/arch/imx8mp_pins.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/mach-imx/boot_mode.h>
+#include <asm/u-boot.h>
 #include <power/pmic.h>
 
 #include <power/pca9450.h>
diff --git a/board/freescale/imx8mq_evk/imx8mq_evk.c b/board/freescale/imx8mq_evk/imx8mq_evk.c
index 93da67d7798..18f0b7f3d3b 100644
--- a/board/freescale/imx8mq_evk/imx8mq_evk.c
+++ b/board/freescale/imx8mq_evk/imx8mq_evk.c
@@ -22,6 +22,7 @@
 #include <asm/mach-imx/mxc_i2c.h>
 #include <asm/arch/clock.h>
 #include <spl.h>
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <power/pmic.h>
 #include <power/pfuze100_pmic.h>
diff --git a/board/freescale/imx8mq_evk/spl.c b/board/freescale/imx8mq_evk/spl.c
index 66a0be0b3df..d9d1973120b 100644
--- a/board/freescale/imx8mq_evk/spl.c
+++ b/board/freescale/imx8mq_evk/spl.c
@@ -23,6 +23,7 @@
 #include <asm/mach-imx/mxc_i2c.h>
 #include <fsl_esdhc_imx.h>
 #include <mmc.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 #include <power/pmic.h>
diff --git a/board/freescale/imx8qm_mek/imx8qm_mek.c b/board/freescale/imx8qm_mek/imx8qm_mek.c
index 7b280be8e94..de9e4f0de41 100644
--- a/board/freescale/imx8qm_mek/imx8qm_mek.c
+++ b/board/freescale/imx8qm_mek/imx8qm_mek.c
@@ -9,6 +9,7 @@
 #include <errno.h>
 #include <init.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <asm/io.h>
diff --git a/board/freescale/imx8qm_mek/spl.c b/board/freescale/imx8qm_mek/spl.c
index cdbff80e31b..9853c258fe8 100644
--- a/board/freescale/imx8qm_mek/spl.c
+++ b/board/freescale/imx8qm_mek/spl.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <spl.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <dm/uclass.h>
 #include <dm/device.h>
 #include <dm/uclass-internal.h>
diff --git a/board/freescale/imx8qxp_mek/imx8qxp_mek.c b/board/freescale/imx8qxp_mek/imx8qxp_mek.c
index 645e9923548..b6511d4e9df 100644
--- a/board/freescale/imx8qxp_mek/imx8qxp_mek.c
+++ b/board/freescale/imx8qxp_mek/imx8qxp_mek.c
@@ -9,6 +9,7 @@
 #include <errno.h>
 #include <init.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 #include <fsl_esdhc_imx.h>
diff --git a/board/freescale/imx8qxp_mek/spl.c b/board/freescale/imx8qxp_mek/spl.c
index 9eb4268ce3f..ac354d396e5 100644
--- a/board/freescale/imx8qxp_mek/spl.c
+++ b/board/freescale/imx8qxp_mek/spl.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <spl.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <dm/uclass.h>
 #include <dm/device.h>
 #include <dm/uclass-internal.h>
diff --git a/board/freescale/imxrt1020-evk/imxrt1020-evk.c b/board/freescale/imxrt1020-evk/imxrt1020-evk.c
index 35241acd224..81695fc27d0 100644
--- a/board/freescale/imxrt1020-evk/imxrt1020-evk.c
+++ b/board/freescale/imxrt1020-evk/imxrt1020-evk.c
@@ -13,6 +13,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/armv7m.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/imxrt1050-evk/imxrt1050-evk.c b/board/freescale/imxrt1050-evk/imxrt1050-evk.c
index b8d852f097b..1b56414c020 100644
--- a/board/freescale/imxrt1050-evk/imxrt1050-evk.c
+++ b/board/freescale/imxrt1050-evk/imxrt1050-evk.c
@@ -13,6 +13,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/armv7m.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/ls1012afrdm/ls1012afrdm.c b/board/freescale/ls1012afrdm/ls1012afrdm.c
index 2cd651b943f..c872318b2c8 100644
--- a/board/freescale/ls1012afrdm/ls1012afrdm.c
+++ b/board/freescale/ls1012afrdm/ls1012afrdm.c
@@ -23,6 +23,7 @@
 #include <fsl_mmdc.h>
 #include <netdev.h>
 #include <fsl_sec.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/ls1012aqds/ls1012aqds.c b/board/freescale/ls1012aqds/ls1012aqds.c
index 5c89385acca..163d2c41948 100644
--- a/board/freescale/ls1012aqds/ls1012aqds.c
+++ b/board/freescale/ls1012aqds/ls1012aqds.c
@@ -29,6 +29,7 @@
 #include <spl.h>
 #include <netdev.h>
 #include <fsl_sec.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 #include "../common/qixis.h"
 #include "ls1012aqds_qixis.h"
diff --git a/board/freescale/ls1012ardb/ls1012ardb.c b/board/freescale/ls1012ardb/ls1012ardb.c
index 02f3ff6aa02..1d3461f2423 100644
--- a/board/freescale/ls1012ardb/ls1012ardb.c
+++ b/board/freescale/ls1012ardb/ls1012ardb.c
@@ -28,6 +28,7 @@
 #include <fsl_mmdc.h>
 #include <netdev.h>
 #include <fsl_sec.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/ls1021aiot/ls1021aiot.c b/board/freescale/ls1021aiot/ls1021aiot.c
index d257f9723e3..0170712c246 100644
--- a/board/freescale/ls1021aiot/ls1021aiot.c
+++ b/board/freescale/ls1021aiot/ls1021aiot.c
@@ -13,6 +13,7 @@
 #include <asm/arch/fsl_serdes.h>
 #include <asm/arch/ls102xa_stream_id.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 
diff --git a/board/freescale/ls1021aqds/ddr.c b/board/freescale/ls1021aqds/ddr.c
index e63fe63e40c..8ce2b4e5c01 100644
--- a/board/freescale/ls1021aqds/ddr.c
+++ b/board/freescale/ls1021aqds/ddr.c
@@ -11,6 +11,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 #include "ddr.h"
diff --git a/board/freescale/ls1021aqds/eth.c b/board/freescale/ls1021aqds/eth.c
index 9cf797477b8..f9aa2f09fb9 100644
--- a/board/freescale/ls1021aqds/eth.c
+++ b/board/freescale/ls1021aqds/eth.c
@@ -20,6 +20,7 @@
 #include <fsl_mdio.h>
 #include <tsec.h>
 #include <malloc.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 
 #include "../common/sgmii_riser.h"
diff --git a/board/freescale/ls1021aqds/ls1021aqds.c b/board/freescale/ls1021aqds/ls1021aqds.c
index d3af462e68a..267af86ccb2 100644
--- a/board/freescale/ls1021aqds/ls1021aqds.c
+++ b/board/freescale/ls1021aqds/ls1021aqds.c
@@ -25,6 +25,7 @@
 #include <fsl_devdis.h>
 #include <fsl_validate.h>
 #include <fsl_ddr.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 #include "../common/sleep.h"
 #include "../common/qixis.h"
diff --git a/board/freescale/ls1021atsn/ls1021atsn.c b/board/freescale/ls1021atsn/ls1021atsn.c
index 010d243754c..16d9df1b704 100644
--- a/board/freescale/ls1021atsn/ls1021atsn.c
+++ b/board/freescale/ls1021atsn/ls1021atsn.c
@@ -12,6 +12,7 @@
 #include <asm/arch/ls102xa_soc.h>
 #include <asm/arch/fsl_serdes.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 #include "../common/sleep.h"
diff --git a/board/freescale/ls1021atwr/ls1021atwr.c b/board/freescale/ls1021atwr/ls1021atwr.c
index 72014b2173a..8640d2746a2 100644
--- a/board/freescale/ls1021atwr/ls1021atwr.c
+++ b/board/freescale/ls1021atwr/ls1021atwr.c
@@ -29,6 +29,7 @@
 #include <fsl_sec.h>
 #include <fsl_devdis.h>
 #include <spl.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 #include "../common/sleep.h"
diff --git a/board/freescale/ls1028a/ls1028a.c b/board/freescale/ls1028a/ls1028a.c
index 984883bb00f..de41dd155e6 100644
--- a/board/freescale/ls1028a/ls1028a.c
+++ b/board/freescale/ls1028a/ls1028a.c
@@ -14,6 +14,7 @@
 #include <asm/io.h>
 #include <hwconfig.h>
 #include <fdt_support.h>
+#include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <env_internal.h>
 #include <asm/arch-fsl-layerscape/soc.h>
diff --git a/board/freescale/ls1043aqds/ddr.c b/board/freescale/ls1043aqds/ddr.c
index 23947bdb84c..38362d1332a 100644
--- a/board/freescale/ls1043aqds/ddr.c
+++ b/board/freescale/ls1043aqds/ddr.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <asm/arch/clock.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include "ddr.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/ls1043aqds/eth.c b/board/freescale/ls1043aqds/eth.c
index fc4dc210f90..68e1642d2d4 100644
--- a/board/freescale/ls1043aqds/eth.c
+++ b/board/freescale/ls1043aqds/eth.c
@@ -13,6 +13,7 @@
 #include <fm_eth.h>
 #include <fsl_mdio.h>
 #include <fsl_dtsec.h>
+#include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <malloc.h>
 #include <asm/arch/fsl_serdes.h>
diff --git a/board/freescale/ls1043aqds/ls1043aqds.c b/board/freescale/ls1043aqds/ls1043aqds.c
index 44e4c61eab2..8fc20ea46e7 100644
--- a/board/freescale/ls1043aqds/ls1043aqds.c
+++ b/board/freescale/ls1043aqds/ls1043aqds.c
@@ -28,6 +28,7 @@
 #include <fsl_esdhc.h>
 #include <fsl_ifc.h>
 #include <spl.h>
+#include <asm/u-boot.h>
 
 #include "../common/qixis.h"
 #include "ls1043aqds_qixis.h"
diff --git a/board/freescale/ls1043ardb/ddr.c b/board/freescale/ls1043ardb/ddr.c
index 75346de3726..73156305b62 100644
--- a/board/freescale/ls1043ardb/ddr.c
+++ b/board/freescale/ls1043ardb/ddr.c
@@ -7,6 +7,7 @@
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 #include "ddr.h"
 #include <log.h>
diff --git a/board/freescale/ls1043ardb/eth.c b/board/freescale/ls1043ardb/eth.c
index 1f01c155165..dde2f376c9a 100644
--- a/board/freescale/ls1043ardb/eth.c
+++ b/board/freescale/ls1043ardb/eth.c
@@ -10,6 +10,7 @@
 #include <fsl_dtsec.h>
 #include <fsl_mdio.h>
 #include <malloc.h>
+#include <asm/u-boot.h>
 
 #include "../common/fman.h"
 
diff --git a/board/freescale/ls1043ardb/ls1043ardb.c b/board/freescale/ls1043ardb/ls1043ardb.c
index beef26b084b..d9ab32bd2cc 100644
--- a/board/freescale/ls1043ardb/ls1043ardb.c
+++ b/board/freescale/ls1043ardb/ls1043ardb.c
@@ -21,6 +21,7 @@
 #include <fsl_esdhc.h>
 #include <fsl_ifc.h>
 #include <fsl_sec.h>
+#include <asm/u-boot.h>
 #include "cpld.h"
 #ifdef CONFIG_U_QE
 #include <fsl_qe.h>
diff --git a/board/freescale/ls1046afrwy/eth.c b/board/freescale/ls1046afrwy/eth.c
index 1b27d3e8538..5797c764dce 100644
--- a/board/freescale/ls1046afrwy/eth.c
+++ b/board/freescale/ls1046afrwy/eth.c
@@ -11,6 +11,7 @@
 #include <fsl_dtsec.h>
 #include <fsl_mdio.h>
 #include <malloc.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 
 #include "../common/fman.h"
diff --git a/board/freescale/ls1046afrwy/ls1046afrwy.c b/board/freescale/ls1046afrwy/ls1046afrwy.c
index 9813a36ca07..4d2d66b6b35 100644
--- a/board/freescale/ls1046afrwy/ls1046afrwy.c
+++ b/board/freescale/ls1046afrwy/ls1046afrwy.c
@@ -22,6 +22,7 @@
 #include <fsl_esdhc.h>
 #include <fsl_sec.h>
 #include <fsl_dspi.h>
+#include <asm/u-boot.h>
 
 #define LS1046A_PORSR1_REG 0x1EE0000
 #define BOOT_SRC_SD        0x20000000
diff --git a/board/freescale/ls1046aqds/ddr.c b/board/freescale/ls1046aqds/ddr.c
index 9a96de27178..7d13e1d6a8d 100644
--- a/board/freescale/ls1046aqds/ddr.c
+++ b/board/freescale/ls1046aqds/ddr.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <asm/arch/clock.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include "ddr.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/ls1046aqds/eth.c b/board/freescale/ls1046aqds/eth.c
index 8f5f95e3968..b4ea0239da4 100644
--- a/board/freescale/ls1046aqds/eth.c
+++ b/board/freescale/ls1046aqds/eth.c
@@ -15,6 +15,7 @@
 #include <fsl_dtsec.h>
 #include <malloc.h>
 #include <asm/arch/fsl_serdes.h>
+#include <asm/u-boot.h>
 
 #include "../common/qixis.h"
 #include "../common/fman.h"
diff --git a/board/freescale/ls1046aqds/ls1046aqds.c b/board/freescale/ls1046aqds/ls1046aqds.c
index 3c96c900c32..cb11eb633bb 100644
--- a/board/freescale/ls1046aqds/ls1046aqds.c
+++ b/board/freescale/ls1046aqds/ls1046aqds.c
@@ -29,6 +29,7 @@
 #include <fsl_ifc.h>
 #include <fsl_sec.h>
 #include <spl.h>
+#include <asm/u-boot.h>
 
 #include "../common/vid.h"
 #include "../common/qixis.h"
diff --git a/board/freescale/ls1046ardb/ddr.c b/board/freescale/ls1046ardb/ddr.c
index befb556bd30..cb41b6c6707 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 <asm/global_data.h>
+#include <asm/u-boot.h>
 #include "ddr.h"
 #ifdef CONFIG_FSL_DEEP_SLEEP
 #include <fsl_sleep.h>
diff --git a/board/freescale/ls1046ardb/eth.c b/board/freescale/ls1046ardb/eth.c
index ddfee621793..c0ae35c6e39 100644
--- a/board/freescale/ls1046ardb/eth.c
+++ b/board/freescale/ls1046ardb/eth.c
@@ -11,6 +11,7 @@
 #include <fsl_dtsec.h>
 #include <fsl_mdio.h>
 #include <malloc.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 
 #include "../common/fman.h"
diff --git a/board/freescale/ls1046ardb/ls1046ardb.c b/board/freescale/ls1046ardb/ls1046ardb.c
index 93ef903f299..6a15cdfcd33 100644
--- a/board/freescale/ls1046ardb/ls1046ardb.c
+++ b/board/freescale/ls1046ardb/ls1046ardb.c
@@ -21,6 +21,7 @@
 #include <fm_eth.h>
 #include <fsl_csu.h>
 #include <fsl_esdhc.h>
+#include <asm/u-boot.h>
 #include <power/mc34vr500_pmic.h>
 #include "cpld.h"
 #include <fsl_sec.h>
diff --git a/board/freescale/ls1088a/ddr.c b/board/freescale/ls1088a/ddr.c
index 995c4296017..9694a6c0e05 100644
--- a/board/freescale/ls1088a/ddr.c
+++ b/board/freescale/ls1088a/ddr.c
@@ -10,6 +10,7 @@
 #include <asm/arch/soc.h>
 #include <asm/arch/clock.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include "ddr.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/ls1088a/eth_ls1088aqds.c b/board/freescale/ls1088a/eth_ls1088aqds.c
index f1cccf7d73f..de44024173f 100644
--- a/board/freescale/ls1088a/eth_ls1088aqds.c
+++ b/board/freescale/ls1088a/eth_ls1088aqds.c
@@ -18,6 +18,7 @@
 #include <fm_eth.h>
 #include <i2c.h>
 #include <miiphy.h>
+#include <asm/u-boot.h>
 #include <fsl-mc/fsl_mc.h>
 #include <fsl-mc/ldpaa_wriop.h>
 #include <linux/delay.h>
diff --git a/board/freescale/ls1088a/eth_ls1088ardb.c b/board/freescale/ls1088a/eth_ls1088ardb.c
index a8e9ef15dc4..5c5655e549b 100644
--- a/board/freescale/ls1088a/eth_ls1088ardb.c
+++ b/board/freescale/ls1088a/eth_ls1088ardb.c
@@ -15,6 +15,7 @@
 #include <asm/io.h>
 #include <exports.h>
 #include <asm/arch/fsl_serdes.h>
+#include <asm/u-boot.h>
 #include <fsl-mc/fsl_mc.h>
 #include <fsl-mc/ldpaa_wriop.h>
 
diff --git a/board/freescale/ls1088a/ls1088a.c b/board/freescale/ls1088a/ls1088a.c
index 8fcd8ef7cdd..921fd985bf6 100644
--- a/board/freescale/ls1088a/ls1088a.c
+++ b/board/freescale/ls1088a/ls1088a.c
@@ -17,6 +17,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <fdt_support.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 #include <fsl-mc/fsl_mc.h>
diff --git a/board/freescale/ls2080a/ddr.c b/board/freescale/ls2080a/ddr.c
index a647cc6a3f7..87a721fc500 100644
--- a/board/freescale/ls2080a/ddr.c
+++ b/board/freescale/ls2080a/ddr.c
@@ -10,6 +10,7 @@
 #include <asm/arch/soc.h>
 #include <asm/arch/clock.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 #include "ddr.h"
 
diff --git a/board/freescale/ls2080a/ls2080a.c b/board/freescale/ls2080a/ls2080a.c
index 020e7bfcb5c..d9c87d6840d 100644
--- a/board/freescale/ls2080a/ls2080a.c
+++ b/board/freescale/ls2080a/ls2080a.c
@@ -14,6 +14,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <fdt_support.h>
+#include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <fsl-mc/fsl_mc.h>
 #include <env_internal.h>
diff --git a/board/freescale/ls2080aqds/ddr.c b/board/freescale/ls2080aqds/ddr.c
index 2767d058cc9..5b0f64df6c2 100644
--- a/board/freescale/ls2080aqds/ddr.c
+++ b/board/freescale/ls2080aqds/ddr.c
@@ -10,6 +10,7 @@
 #include <asm/arch/soc.h>
 #include <asm/arch/clock.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include "ddr.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/ls2080aqds/eth.c b/board/freescale/ls2080aqds/eth.c
index 1b8235c9a09..1a3a891f825 100644
--- a/board/freescale/ls2080aqds/eth.c
+++ b/board/freescale/ls2080aqds/eth.c
@@ -16,6 +16,7 @@
 #include <fm_eth.h>
 #include <i2c.h>
 #include <miiphy.h>
+#include <asm/u-boot.h>
 #include <fsl-mc/fsl_mc.h>
 #include <fsl-mc/ldpaa_wriop.h>
 #include <linux/delay.h>
diff --git a/board/freescale/ls2080aqds/ls2080aqds.c b/board/freescale/ls2080aqds/ls2080aqds.c
index 87d7e5312f4..ac4388a1188 100644
--- a/board/freescale/ls2080aqds/ls2080aqds.c
+++ b/board/freescale/ls2080aqds/ls2080aqds.c
@@ -14,6 +14,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <fdt_support.h>
+#include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <fsl-mc/fsl_mc.h>
 #include <env_internal.h>
diff --git a/board/freescale/ls2080ardb/ddr.c b/board/freescale/ls2080ardb/ddr.c
index 07fa8473332..2d33f662dce 100644
--- a/board/freescale/ls2080ardb/ddr.c
+++ b/board/freescale/ls2080ardb/ddr.c
@@ -10,6 +10,7 @@
 #include <asm/arch/soc.h>
 #include <asm/arch/clock.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include "ddr.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/ls2080ardb/eth_ls2080rdb.c b/board/freescale/ls2080ardb/eth_ls2080rdb.c
index 21b4c16ff27..786a253cbd5 100644
--- a/board/freescale/ls2080ardb/eth_ls2080rdb.c
+++ b/board/freescale/ls2080ardb/eth_ls2080rdb.c
@@ -17,6 +17,7 @@
 #include <asm/io.h>
 #include <exports.h>
 #include <asm/arch/fsl_serdes.h>
+#include <asm/u-boot.h>
 #include <fsl-mc/fsl_mc.h>
 #include <fsl-mc/ldpaa_wriop.h>
 
diff --git a/board/freescale/ls2080ardb/ls2080ardb.c b/board/freescale/ls2080ardb/ls2080ardb.c
index a6ece49c01e..49304091638 100644
--- a/board/freescale/ls2080ardb/ls2080ardb.c
+++ b/board/freescale/ls2080ardb/ls2080ardb.c
@@ -16,6 +16,7 @@
 #include <asm/io.h>
 #include <hwconfig.h>
 #include <fdt_support.h>
+#include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <fsl-mc/fsl_mc.h>
 #include <env_internal.h>
diff --git a/board/freescale/lx2160a/eth_lx2160aqds.c b/board/freescale/lx2160a/eth_lx2160aqds.c
index b069e4fb266..20dffcbf327 100644
--- a/board/freescale/lx2160a/eth_lx2160aqds.c
+++ b/board/freescale/lx2160a/eth_lx2160aqds.c
@@ -21,6 +21,7 @@
 #include <asm/io.h>
 #include <exports.h>
 #include <asm/arch/fsl_serdes.h>
+#include <asm/u-boot.h>
 #include <fsl-mc/fsl_mc.h>
 #include <fsl-mc/ldpaa_wriop.h>
 #include <linux/libfdt.h>
diff --git a/board/freescale/lx2160a/eth_lx2160ardb.c b/board/freescale/lx2160a/eth_lx2160ardb.c
index 02f36f4f5f5..604922f8412 100644
--- a/board/freescale/lx2160a/eth_lx2160ardb.c
+++ b/board/freescale/lx2160a/eth_lx2160ardb.c
@@ -18,6 +18,7 @@
 #include <asm/io.h>
 #include <exports.h>
 #include <asm/arch/fsl_serdes.h>
+#include <asm/u-boot.h>
 #include <fsl-mc/fsl_mc.h>
 #include <fsl-mc/ldpaa_wriop.h>
 
diff --git a/board/freescale/lx2160a/lx2160a.c b/board/freescale/lx2160a/lx2160a.c
index 8d87b29cfde..2133177cbe1 100644
--- a/board/freescale/lx2160a/lx2160a.c
+++ b/board/freescale/lx2160a/lx2160a.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <init.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <dm/platform_data/serial_pl01x.h>
 #include <i2c.h>
 #include <malloc.h>
diff --git a/board/freescale/m5253demo/m5253demo.c b/board/freescale/m5253demo/m5253demo.c
index 2a4703579da..f593c31c842 100644
--- a/board/freescale/m5253demo/m5253demo.c
+++ b/board/freescale/m5253demo/m5253demo.c
@@ -14,6 +14,7 @@
 #include <asm/immap.h>
 #include <netdev.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/mpc8308rdb/mpc8308rdb.c b/board/freescale/mpc8308rdb/mpc8308rdb.c
index db9c5ba1935..f5ad1dde606 100644
--- a/board/freescale/mpc8308rdb/mpc8308rdb.c
+++ b/board/freescale/mpc8308rdb/mpc8308rdb.c
@@ -10,6 +10,7 @@
 #include <init.h>
 #include <net.h>
 #include <spi.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
diff --git a/board/freescale/mpc8313erdb/mpc8313erdb.c b/board/freescale/mpc8313erdb/mpc8313erdb.c
index f309961dca8..1bd4b381da3 100644
--- a/board/freescale/mpc8313erdb/mpc8313erdb.c
+++ b/board/freescale/mpc8313erdb/mpc8313erdb.c
@@ -21,6 +21,7 @@
 #include <asm/gpio.h>
 #endif
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/mpc8315erdb/mpc8315erdb.c b/board/freescale/mpc8315erdb/mpc8315erdb.c
index 795162b3c0c..3f9c9b68e21 100644
--- a/board/freescale/mpc8315erdb/mpc8315erdb.c
+++ b/board/freescale/mpc8315erdb/mpc8315erdb.c
@@ -12,6 +12,7 @@
 #include <init.h>
 #include <net.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
diff --git a/board/freescale/mpc8323erdb/mpc8323erdb.c b/board/freescale/mpc8323erdb/mpc8323erdb.c
index 977bd512059..a587796f042 100644
--- a/board/freescale/mpc8323erdb/mpc8323erdb.c
+++ b/board/freescale/mpc8323erdb/mpc8323erdb.c
@@ -20,6 +20,7 @@
 #include <miiphy.h>
 #include <command.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 #include <linux/string.h>
diff --git a/board/freescale/mpc832xemds/mpc832xemds.c b/board/freescale/mpc832xemds/mpc832xemds.c
index f34758a9470..e012b2714ab 100644
--- a/board/freescale/mpc832xemds/mpc832xemds.c
+++ b/board/freescale/mpc832xemds/mpc832xemds.c
@@ -24,6 +24,7 @@
 #if defined(CONFIG_PQ_MDS_PIB)
 #include "../common/pq-mds-pib.h"
 #endif
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/mpc8349emds/ddr.c b/board/freescale/mpc8349emds/ddr.c
index ac5ddc6d94b..75175fb0ca9 100644
--- a/board/freescale/mpc8349emds/ddr.c
+++ b/board/freescale/mpc8349emds/ddr.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <asm/u-boot.h>
 
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
diff --git a/board/freescale/mpc8349emds/mpc8349emds.c b/board/freescale/mpc8349emds/mpc8349emds.c
index 5f38639afd4..bf113280bec 100644
--- a/board/freescale/mpc8349emds/mpc8349emds.c
+++ b/board/freescale/mpc8349emds/mpc8349emds.c
@@ -20,6 +20,7 @@
 #else
 #include <spd_sdram.h>
 #endif
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 
 #if defined(CONFIG_OF_LIBFDT)
diff --git a/board/freescale/mpc8349itx/mpc8349itx.c b/board/freescale/mpc8349itx/mpc8349itx.c
index 356b0ea2daa..14e08f033a5 100644
--- a/board/freescale/mpc8349itx/mpc8349itx.c
+++ b/board/freescale/mpc8349itx/mpc8349itx.c
@@ -23,6 +23,7 @@
 #if defined(CONFIG_OF_LIBFDT)
 #include <linux/libfdt.h>
 #endif
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 
diff --git a/board/freescale/mpc837xemds/mpc837xemds.c b/board/freescale/mpc837xemds/mpc837xemds.c
index c4233aad741..699aa4a5bf8 100644
--- a/board/freescale/mpc837xemds/mpc837xemds.c
+++ b/board/freescale/mpc837xemds/mpc837xemds.c
@@ -15,6 +15,7 @@
 #include <asm/fsl_mpc83xx_serdes.h>
 #include <spd_sdram.h>
 #include <tsec.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
diff --git a/board/freescale/mpc837xemds/pci.c b/board/freescale/mpc837xemds/pci.c
index 3e5a64d14f0..06cb3a6553b 100644
--- a/board/freescale/mpc837xemds/pci.c
+++ b/board/freescale/mpc837xemds/pci.c
@@ -14,6 +14,7 @@
 #include <fdt_support.h>
 #include <asm/fsl_i2c.h>
 #include <asm/fsl_mpc83xx_serdes.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 
diff --git a/board/freescale/mpc837xemds/pci.h b/board/freescale/mpc837xemds/pci.h
index a5680319888..bf56a3bf2b2 100644
--- a/board/freescale/mpc837xemds/pci.h
+++ b/board/freescale/mpc837xemds/pci.h
@@ -1,6 +1,7 @@
 #ifndef __BOARD_MPC837XEMDS_PCI_H
 #define __BOARD_MPC837XEMDS_PCI_H
 
+#include <asm/u-boot.h>
 extern void ft_pcie_fixup(void *blob, struct bd_info *bd);
 
 #endif /* __BOARD_MPC837XEMDS_PCI_H */
diff --git a/board/freescale/mpc837xerdb/mpc837xerdb.c b/board/freescale/mpc837xerdb/mpc837xerdb.c
index 81d31f19c4c..d3cc5274537 100644
--- a/board/freescale/mpc837xerdb/mpc837xerdb.c
+++ b/board/freescale/mpc837xerdb/mpc837xerdb.c
@@ -18,6 +18,7 @@
 #include <spd_sdram.h>
 #include <vsc7385.h>
 #include <fsl_esdhc.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/mpc8541cds/law.c b/board/freescale/mpc8541cds/law.c
index 69f151b6151..f4b7bde0a81 100644
--- a/board/freescale/mpc8541cds/law.c
+++ b/board/freescale/mpc8541cds/law.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
+#include <asm/u-boot.h>
 
 /*
  * LAW(Local Access Window) configuration:
diff --git a/board/freescale/mpc8541cds/mpc8541cds.c b/board/freescale/mpc8541cds/mpc8541cds.c
index 3986d81c62d..6f02b8e7b8f 100644
--- a/board/freescale/mpc8541cds/mpc8541cds.c
+++ b/board/freescale/mpc8541cds/mpc8541cds.c
@@ -16,6 +16,7 @@
 #include <fsl_ddr_sdram.h>
 #include <ioports.h>
 #include <spd_sdram.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
diff --git a/board/freescale/mpc8541cds/tlb.c b/board/freescale/mpc8541cds/tlb.c
index d4ed51c5438..ff596f988df 100644
--- a/board/freescale/mpc8541cds/tlb.c
+++ b/board/freescale/mpc8541cds/tlb.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <asm/mmu.h>
+#include <asm/u-boot.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/freescale/mpc8544ds/law.c b/board/freescale/mpc8544ds/law.c
index 52cec7fbb59..8e9c8b4d232 100644
--- a/board/freescale/mpc8544ds/law.c
+++ b/board/freescale/mpc8544ds/law.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
+#include <asm/u-boot.h>
 
 struct law_entry law_table[] = {
 	SET_LAW(CONFIG_SYS_LBC_NONCACHE_BASE, LAW_SIZE_128M, LAW_TRGT_IF_LBC),
diff --git a/board/freescale/mpc8544ds/mpc8544ds.c b/board/freescale/mpc8544ds/mpc8544ds.c
index 30ed7083657..06dc619cf93 100644
--- a/board/freescale/mpc8544ds/mpc8544ds.c
+++ b/board/freescale/mpc8544ds/mpc8544ds.c
@@ -16,6 +16,7 @@
 #include <asm/fsl_serdes.h>
 #include <asm/io.h>
 #include <miiphy.h>
+#include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <fsl_mdio.h>
diff --git a/board/freescale/mpc8544ds/tlb.c b/board/freescale/mpc8544ds/tlb.c
index 7bd462934aa..a07e6834918 100644
--- a/board/freescale/mpc8544ds/tlb.c
+++ b/board/freescale/mpc8544ds/tlb.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <asm/mmu.h>
+#include <asm/u-boot.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/freescale/mpc8548cds/law.c b/board/freescale/mpc8548cds/law.c
index d1943889915..4c8bbed5c39 100644
--- a/board/freescale/mpc8548cds/law.c
+++ b/board/freescale/mpc8548cds/law.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
+#include <asm/u-boot.h>
 
 struct law_entry law_table[] = {
 	/* LBC window - maps 256M */
diff --git a/board/freescale/mpc8548cds/mpc8548cds.c b/board/freescale/mpc8548cds/mpc8548cds.c
index fd51c0e8018..941071594bd 100644
--- a/board/freescale/mpc8548cds/mpc8548cds.c
+++ b/board/freescale/mpc8548cds/mpc8548cds.c
@@ -18,6 +18,7 @@
 #include <fsl_ddr_sdram.h>
 #include <asm/fsl_serdes.h>
 #include <miiphy.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
diff --git a/board/freescale/mpc8548cds/tlb.c b/board/freescale/mpc8548cds/tlb.c
index 8d1e5fee936..b6869c33078 100644
--- a/board/freescale/mpc8548cds/tlb.c
+++ b/board/freescale/mpc8548cds/tlb.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <asm/mmu.h>
+#include <asm/u-boot.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/freescale/mpc8555cds/law.c b/board/freescale/mpc8555cds/law.c
index 69f151b6151..f4b7bde0a81 100644
--- a/board/freescale/mpc8555cds/law.c
+++ b/board/freescale/mpc8555cds/law.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
+#include <asm/u-boot.h>
 
 /*
  * LAW(Local Access Window) configuration:
diff --git a/board/freescale/mpc8555cds/mpc8555cds.c b/board/freescale/mpc8555cds/mpc8555cds.c
index d91763ae800..d66f5699666 100644
--- a/board/freescale/mpc8555cds/mpc8555cds.c
+++ b/board/freescale/mpc8555cds/mpc8555cds.c
@@ -14,6 +14,7 @@
 #include <fsl_ddr_sdram.h>
 #include <ioports.h>
 #include <spd_sdram.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
diff --git a/board/freescale/mpc8555cds/tlb.c b/board/freescale/mpc8555cds/tlb.c
index 4a18f05af0d..b0e0af9b697 100644
--- a/board/freescale/mpc8555cds/tlb.c
+++ b/board/freescale/mpc8555cds/tlb.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <asm/mmu.h>
+#include <asm/u-boot.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/freescale/mpc8568mds/law.c b/board/freescale/mpc8568mds/law.c
index c04c36b5d82..f315288611f 100644
--- a/board/freescale/mpc8568mds/law.c
+++ b/board/freescale/mpc8568mds/law.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
+#include <asm/u-boot.h>
 
 /*
  * LAW(Local Access Window) configuration:
diff --git a/board/freescale/mpc8568mds/mpc8568mds.c b/board/freescale/mpc8568mds/mpc8568mds.c
index 1acdf93e4d7..810bcff8b6b 100644
--- a/board/freescale/mpc8568mds/mpc8568mds.c
+++ b/board/freescale/mpc8568mds/mpc8568mds.c
@@ -20,6 +20,7 @@
 #include <spd_sdram.h>
 #include <i2c.h>
 #include <ioports.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
diff --git a/board/freescale/mpc8568mds/tlb.c b/board/freescale/mpc8568mds/tlb.c
index fea1606a1d3..98864e7716a 100644
--- a/board/freescale/mpc8568mds/tlb.c
+++ b/board/freescale/mpc8568mds/tlb.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <asm/mmu.h>
+#include <asm/u-boot.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/freescale/mpc8569mds/law.c b/board/freescale/mpc8569mds/law.c
index 35cdd75d6e6..1f0bd1279ef 100644
--- a/board/freescale/mpc8569mds/law.c
+++ b/board/freescale/mpc8569mds/law.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
+#include <asm/u-boot.h>
 
 /*
  * LAW(Local Access Window) configuration:
diff --git a/board/freescale/mpc8569mds/mpc8569mds.c b/board/freescale/mpc8569mds/mpc8569mds.c
index b4b75f3642a..7f00ddc82a1 100644
--- a/board/freescale/mpc8569mds/mpc8569mds.c
+++ b/board/freescale/mpc8569mds/mpc8569mds.c
@@ -23,6 +23,7 @@
 #include <spd_sdram.h>
 #include <i2c.h>
 #include <ioports.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
diff --git a/board/freescale/mpc8569mds/tlb.c b/board/freescale/mpc8569mds/tlb.c
index fdbac549847..5bec3a1663b 100644
--- a/board/freescale/mpc8569mds/tlb.c
+++ b/board/freescale/mpc8569mds/tlb.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <asm/mmu.h>
+#include <asm/u-boot.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/freescale/mpc8572ds/ddr.c b/board/freescale/mpc8572ds/ddr.c
index 11ca08d1a0b..886cabf6324 100644
--- a/board/freescale/mpc8572ds/ddr.c
+++ b/board/freescale/mpc8572ds/ddr.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <asm/u-boot.h>
 
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
diff --git a/board/freescale/mpc8572ds/law.c b/board/freescale/mpc8572ds/law.c
index 10d1572c5de..7f9a2c3785a 100644
--- a/board/freescale/mpc8572ds/law.c
+++ b/board/freescale/mpc8572ds/law.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
+#include <asm/u-boot.h>
 
 struct law_entry law_table[] = {
 	SET_LAW(CONFIG_SYS_FLASH_BASE_PHYS, LAW_SIZE_256M, LAW_TRGT_IF_LBC),
diff --git a/board/freescale/mpc8572ds/mpc8572ds.c b/board/freescale/mpc8572ds/mpc8572ds.c
index 97e73533ab4..d81a3308359 100644
--- a/board/freescale/mpc8572ds/mpc8572ds.c
+++ b/board/freescale/mpc8572ds/mpc8572ds.c
@@ -20,6 +20,7 @@
 #include <asm/io.h>
 #include <asm/fsl_serdes.h>
 #include <miiphy.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
diff --git a/board/freescale/mpc8572ds/tlb.c b/board/freescale/mpc8572ds/tlb.c
index 99b136b0429..72f0aa572c1 100644
--- a/board/freescale/mpc8572ds/tlb.c
+++ b/board/freescale/mpc8572ds/tlb.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <asm/mmu.h>
+#include <asm/u-boot.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/freescale/mpc8610hpcd/law.c b/board/freescale/mpc8610hpcd/law.c
index 7bf5e6815d7..7f9a58e7a79 100644
--- a/board/freescale/mpc8610hpcd/law.c
+++ b/board/freescale/mpc8610hpcd/law.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
+#include <asm/u-boot.h>
 
 struct law_entry law_table[] = {
 #if !defined(CONFIG_SPD_EEPROM)
diff --git a/board/freescale/mpc8610hpcd/mpc8610hpcd.c b/board/freescale/mpc8610hpcd/mpc8610hpcd.c
index 74b0e45b4f8..157f850fef5 100644
--- a/board/freescale/mpc8610hpcd/mpc8610hpcd.c
+++ b/board/freescale/mpc8610hpcd/mpc8610hpcd.c
@@ -17,6 +17,7 @@
 #include <asm/fsl_serdes.h>
 #include <i2c.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
diff --git a/board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c b/board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c
index 3e45a3390a2..fd182fe8717 100644
--- a/board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c
+++ b/board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c
@@ -13,6 +13,7 @@
 #include <log.h>
 #include <asm/io.h>
 #include <fsl_diu_fb.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 #include "../common/pixis.h"
 
diff --git a/board/freescale/mpc8641hpcn/ddr.c b/board/freescale/mpc8641hpcn/ddr.c
index df7e3eceed7..f2dccadd3d1 100644
--- a/board/freescale/mpc8641hpcn/ddr.c
+++ b/board/freescale/mpc8641hpcn/ddr.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <asm/u-boot.h>
 
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
diff --git a/board/freescale/mpc8641hpcn/law.c b/board/freescale/mpc8641hpcn/law.c
index b73d6608831..0e00138835e 100644
--- a/board/freescale/mpc8641hpcn/law.c
+++ b/board/freescale/mpc8641hpcn/law.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
+#include <asm/u-boot.h>
 
 /*
  * LAW(Local Access Window) configuration:
diff --git a/board/freescale/mpc8641hpcn/mpc8641hpcn.c b/board/freescale/mpc8641hpcn/mpc8641hpcn.c
index b30b86364d5..c4a7a568cd1 100644
--- a/board/freescale/mpc8641hpcn/mpc8641hpcn.c
+++ b/board/freescale/mpc8641hpcn/mpc8641hpcn.c
@@ -15,6 +15,7 @@
 #include <fsl_ddr_sdram.h>
 #include <asm/fsl_serdes.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
diff --git a/board/freescale/mx23evk/mx23evk.c b/board/freescale/mx23evk/mx23evk.c
index 605cdec218a..b25bdb38601 100644
--- a/board/freescale/mx23evk/mx23evk.c
+++ b/board/freescale/mx23evk/mx23evk.c
@@ -19,6 +19,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/iomux-mx23.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/mx25pdk/mx25pdk.c b/board/freescale/mx25pdk/mx25pdk.c
index 3b445a46dd7..4c2f6da69c2 100644
--- a/board/freescale/mx25pdk/mx25pdk.c
+++ b/board/freescale/mx25pdk/mx25pdk.c
@@ -16,6 +16,7 @@
 #include <mmc.h>
 #include <fsl_esdhc_imx.h>
 #include <i2c.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <power/pmic.h>
 #include <fsl_pmic.h>
diff --git a/board/freescale/mx28evk/mx28evk.c b/board/freescale/mx28evk/mx28evk.c
index 21c9cb11283..72abf8739bc 100644
--- a/board/freescale/mx28evk/mx28evk.c
+++ b/board/freescale/mx28evk/mx28evk.c
@@ -21,6 +21,7 @@
 #include <asm/arch/iomux-mx28.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/mii.h>
 #include <miiphy.h>
diff --git a/board/freescale/mx35pdk/mx35pdk.c b/board/freescale/mx35pdk/mx35pdk.c
index 4039d9f049a..362a0391e4f 100644
--- a/board/freescale/mx35pdk/mx35pdk.c
+++ b/board/freescale/mx35pdk/mx35pdk.c
@@ -10,6 +10,7 @@
 #include <net.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/freescale/mx51evk/mx51evk.c b/board/freescale/mx51evk/mx51evk.c
index ac48e7668c0..f1625ebac5c 100644
--- a/board/freescale/mx51evk/mx51evk.c
+++ b/board/freescale/mx51evk/mx51evk.c
@@ -10,6 +10,7 @@
 #include <asm/gpio.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux-mx51.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/arch/sys_proto.h>
diff --git a/board/freescale/mx53ard/mx53ard.c b/board/freescale/mx53ard/mx53ard.c
index f9ec5ca6ef3..89aa16a097b 100644
--- a/board/freescale/mx53ard/mx53ard.c
+++ b/board/freescale/mx53ard/mx53ard.c
@@ -13,6 +13,7 @@
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/iomux-mx53.h>
+#include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <netdev.h>
 #include <mmc.h>
diff --git a/board/freescale/mx53evk/mx53evk.c b/board/freescale/mx53evk/mx53evk.c
index b006638e2c1..5567f3f01a9 100644
--- a/board/freescale/mx53evk/mx53evk.c
+++ b/board/freescale/mx53evk/mx53evk.c
@@ -12,6 +12,7 @@
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/iomux-mx53.h>
+#include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <asm/mach-imx/boot_mode.h>
 #include <netdev.h>
diff --git a/board/freescale/mx53loco/mx53loco.c b/board/freescale/mx53loco/mx53loco.c
index ee54a61d874..7a1cebbebfd 100644
--- a/board/freescale/mx53loco/mx53loco.c
+++ b/board/freescale/mx53loco/mx53loco.c
@@ -16,6 +16,7 @@
 #include <asm/arch/iomux-mx53.h>
 #include <asm/arch/clock.h>
 #include <env.h>
+#include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <asm/mach-imx/mx5_video.h>
 #include <netdev.h>
diff --git a/board/freescale/mx53smd/mx53smd.c b/board/freescale/mx53smd/mx53smd.c
index 2f91a0525c4..335146604a5 100644
--- a/board/freescale/mx53smd/mx53smd.c
+++ b/board/freescale/mx53smd/mx53smd.c
@@ -12,6 +12,7 @@
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/iomux-mx53.h>
+#include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <netdev.h>
 #include <mmc.h>
diff --git a/board/freescale/mx6memcal/mx6memcal.c b/board/freescale/mx6memcal/mx6memcal.c
index 1cc744fa9ba..35dc7fd15f2 100644
--- a/board/freescale/mx6memcal/mx6memcal.c
+++ b/board/freescale/mx6memcal/mx6memcal.c
@@ -11,6 +11,7 @@
 #include <init.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/mx6memcal/spl.c b/board/freescale/mx6memcal/spl.c
index 87020e3ffb1..63f4f531b86 100644
--- a/board/freescale/mx6memcal/spl.c
+++ b/board/freescale/mx6memcal/spl.c
@@ -16,6 +16,7 @@
 #include <asm/arch/mx6-pins.h>
 #include <asm/arch/sys_proto.h>
 #include <spl.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/mx6qarm2/mx6qarm2.c b/board/freescale/mx6qarm2/mx6qarm2.c
index c06fd643677..03cceefb60d 100644
--- a/board/freescale/mx6qarm2/mx6qarm2.c
+++ b/board/freescale/mx6qarm2/mx6qarm2.c
@@ -11,6 +11,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/mx6-pins.h>
 #include <asm/arch/clock.h>
+#include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
 #include <asm/mach-imx/iomux-v3.h>
diff --git a/board/freescale/mx6sabreauto/mx6sabreauto.c b/board/freescale/mx6sabreauto/mx6sabreauto.c
index f8612c82342..98b3ab4b765 100644
--- a/board/freescale/mx6sabreauto/mx6sabreauto.c
+++ b/board/freescale/mx6sabreauto/mx6sabreauto.c
@@ -16,6 +16,7 @@
 #include <asm/arch/iomux.h>
 #include <asm/arch/mx6-pins.h>
 #include <env.h>
+#include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
 #include <asm/mach-imx/iomux-v3.h>
diff --git a/board/freescale/mx6sabresd/mx6sabresd.c b/board/freescale/mx6sabresd/mx6sabresd.c
index 15f5b654c1b..40423d77c4b 100644
--- a/board/freescale/mx6sabresd/mx6sabresd.c
+++ b/board/freescale/mx6sabresd/mx6sabresd.c
@@ -15,6 +15,7 @@
 #include <asm/global_data.h>
 #include <asm/mach-imx/spi.h>
 #include <env.h>
+#include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
 #include <asm/mach-imx/mxc_i2c.h>
diff --git a/board/freescale/mx6slevk/mx6slevk.c b/board/freescale/mx6slevk/mx6slevk.c
index 24086a124f0..781c5392655 100644
--- a/board/freescale/mx6slevk/mx6slevk.c
+++ b/board/freescale/mx6slevk/mx6slevk.c
@@ -19,6 +19,7 @@
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/mach-imx/mxc_i2c.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 #include <linux/sizes.h>
 #include <common.h>
 #include <fsl_esdhc_imx.h>
diff --git a/board/freescale/mx6sllevk/mx6sllevk.c b/board/freescale/mx6sllevk/mx6sllevk.c
index b4fddafe640..9ce66e42899 100644
--- a/board/freescale/mx6sllevk/mx6sllevk.c
+++ b/board/freescale/mx6sllevk/mx6sllevk.c
@@ -16,6 +16,7 @@
 #include <asm/mach-imx/boot_mode.h>
 #include <asm/io.h>
 #include <common.h>
+#include <asm/u-boot.h>
 #include <linux/sizes.h>
 #include <mmc.h>
 #include <power/pmic.h>
diff --git a/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c b/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c
index 7340a344023..f705505b518 100644
--- a/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c
+++ b/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c
@@ -18,6 +18,7 @@
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/mach-imx/boot_mode.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/sizes.h>
 #include <common.h>
diff --git a/board/freescale/mx6sxsabresd/mx6sxsabresd.c b/board/freescale/mx6sxsabresd/mx6sxsabresd.c
index 57fab238641..d8f4e915cfd 100644
--- a/board/freescale/mx6sxsabresd/mx6sxsabresd.c
+++ b/board/freescale/mx6sxsabresd/mx6sxsabresd.c
@@ -19,6 +19,7 @@
 #include <asm/io.h>
 #include <asm/mach-imx/mxc_i2c.h>
 #include <env.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/sizes.h>
 #include <common.h>
diff --git a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
index ef2408715cf..6805d949f17 100644
--- a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
+++ b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
@@ -23,6 +23,7 @@
 #include <fsl_esdhc_imx.h>
 #include <i2c.h>
 #include <miiphy.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/sizes.h>
 #include <mmc.h>
diff --git a/board/freescale/mx6ullevk/mx6ullevk.c b/board/freescale/mx6ullevk/mx6ullevk.c
index 86c11c7bd3a..4686981e44c 100644
--- a/board/freescale/mx6ullevk/mx6ullevk.c
+++ b/board/freescale/mx6ullevk/mx6ullevk.c
@@ -18,6 +18,7 @@
 #include <common.h>
 #include <env.h>
 #include <fsl_esdhc_imx.h>
+#include <asm/u-boot.h>
 #include <linux/sizes.h>
 #include <mmc.h>
 #include <miiphy.h>
diff --git a/board/freescale/mx7dsabresd/mx7dsabresd.c b/board/freescale/mx7dsabresd/mx7dsabresd.c
index 2777ae13bce..d3cdfd85894 100644
--- a/board/freescale/mx7dsabresd/mx7dsabresd.c
+++ b/board/freescale/mx7dsabresd/mx7dsabresd.c
@@ -13,6 +13,7 @@
 #include <asm/gpio.h>
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/sizes.h>
 #include <common.h>
diff --git a/board/freescale/mx7ulp_evk/mx7ulp_evk.c b/board/freescale/mx7ulp_evk/mx7ulp_evk.c
index 01e32136532..1e4053edbe7 100644
--- a/board/freescale/mx7ulp_evk/mx7ulp_evk.c
+++ b/board/freescale/mx7ulp_evk/mx7ulp_evk.c
@@ -12,6 +12,7 @@
 #include <asm/arch/mx7ulp-pins.h>
 #include <asm/arch/iomux.h>
 #include <asm/mach-imx/boot_mode.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/p1010rdb/ddr.c b/board/freescale/p1010rdb/ddr.c
index 9444a39b6e8..2e2a524b0e2 100644
--- a/board/freescale/p1010rdb/ddr.c
+++ b/board/freescale/p1010rdb/ddr.c
@@ -13,6 +13,7 @@
 #include <fsl_ddr_dimm_params.h>
 #include <asm/io.h>
 #include <asm/fsl_law.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/p1010rdb/law.c b/board/freescale/p1010rdb/law.c
index debf571482b..756f0524da0 100644
--- a/board/freescale/p1010rdb/law.c
+++ b/board/freescale/p1010rdb/law.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
+#include <asm/u-boot.h>
 
 struct law_entry law_table[] = {
 	SET_LAW(CONFIG_SYS_FLASH_BASE_PHYS, LAW_SIZE_32M, LAW_TRGT_IF_IFC),
diff --git a/board/freescale/p1010rdb/p1010rdb.c b/board/freescale/p1010rdb/p1010rdb.c
index 3ffec6a02f1..f209f72fdbe 100644
--- a/board/freescale/p1010rdb/p1010rdb.c
+++ b/board/freescale/p1010rdb/p1010rdb.c
@@ -17,6 +17,7 @@
 #include <asm/io.h>
 #include <env.h>
 #include <miiphy.h>
+#include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <fsl_mdio.h>
diff --git a/board/freescale/p1010rdb/spl.c b/board/freescale/p1010rdb/spl.c
index 059ce8e100f..3e35b49f3d2 100644
--- a/board/freescale/p1010rdb/spl.c
+++ b/board/freescale/p1010rdb/spl.c
@@ -16,6 +16,7 @@
 #include <fsl_esdhc.h>
 #include <spi_flash.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 #include "../common/spl.h"
 
diff --git a/board/freescale/p1010rdb/tlb.c b/board/freescale/p1010rdb/tlb.c
index 04faefe994d..5357bc8e7b0 100644
--- a/board/freescale/p1010rdb/tlb.c
+++ b/board/freescale/p1010rdb/tlb.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <asm/mmu.h>
+#include <asm/u-boot.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/freescale/p1023rdb/law.c b/board/freescale/p1023rdb/law.c
index 405fcd7b490..69238db8dde 100644
--- a/board/freescale/p1023rdb/law.c
+++ b/board/freescale/p1023rdb/law.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
+#include <asm/u-boot.h>
 
 struct law_entry law_table[] = {
 	SET_LAW(CONFIG_SYS_NAND_BASE_PHYS, LAW_SIZE_1M, LAW_TRGT_IF_LBC),
diff --git a/board/freescale/p1023rdb/p1023rdb.c b/board/freescale/p1023rdb/p1023rdb.c
index bb4a39a3fa6..c760b4c83bd 100644
--- a/board/freescale/p1023rdb/p1023rdb.c
+++ b/board/freescale/p1023rdb/p1023rdb.c
@@ -23,6 +23,7 @@
 #include <fsl_ddr_sdram.h>
 #include <asm/fsl_portals.h>
 #include <fsl_qbman.h>
+#include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <netdev.h>
diff --git a/board/freescale/p1023rdb/tlb.c b/board/freescale/p1023rdb/tlb.c
index 9f0314d190f..4c0e668e99b 100644
--- a/board/freescale/p1023rdb/tlb.c
+++ b/board/freescale/p1023rdb/tlb.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <asm/mmu.h>
+#include <asm/u-boot.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/freescale/p1_p2_rdb_pc/ddr.c b/board/freescale/p1_p2_rdb_pc/ddr.c
index 2c7e5fe4c7b..87c78886e14 100644
--- a/board/freescale/p1_p2_rdb_pc/ddr.c
+++ b/board/freescale/p1_p2_rdb_pc/ddr.c
@@ -12,6 +12,7 @@
 #include <fsl_ddr_dimm_params.h>
 #include <asm/io.h>
 #include <asm/fsl_law.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 
 #ifdef CONFIG_SYS_DDR_RAW_TIMING
diff --git a/board/freescale/p1_p2_rdb_pc/law.c b/board/freescale/p1_p2_rdb_pc/law.c
index 5f4d713ca56..5aebabcc901 100644
--- a/board/freescale/p1_p2_rdb_pc/law.c
+++ b/board/freescale/p1_p2_rdb_pc/law.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
+#include <asm/u-boot.h>
 
 struct law_entry law_table[] = {
 	SET_LAW(CONFIG_SYS_CPLD_BASE_PHYS, LAW_SIZE_1M, LAW_TRGT_IF_LBC),
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 7c703b354fa..f4ab4492536 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
@@ -25,6 +25,7 @@
 #include <asm/fsl_lbc.h>
 #include <asm/mp.h>
 #include <miiphy.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
diff --git a/board/freescale/p1_p2_rdb_pc/spl.c b/board/freescale/p1_p2_rdb_pc/spl.c
index 46c5d15ad18..9b687bc4c08 100644
--- a/board/freescale/p1_p2_rdb_pc/spl.c
+++ b/board/freescale/p1_p2_rdb_pc/spl.c
@@ -17,6 +17,7 @@
 #include <fsl_esdhc.h>
 #include <spi_flash.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 #include "../common/spl.h"
 
diff --git a/board/freescale/p1_p2_rdb_pc/tlb.c b/board/freescale/p1_p2_rdb_pc/tlb.c
index 14971f0476e..1254ab4d306 100644
--- a/board/freescale/p1_p2_rdb_pc/tlb.c
+++ b/board/freescale/p1_p2_rdb_pc/tlb.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <asm/mmu.h>
+#include <asm/u-boot.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/freescale/p2041rdb/ddr.c b/board/freescale/p2041rdb/ddr.c
index 910058cefe1..281368bfc8a 100644
--- a/board/freescale/p2041rdb/ddr.c
+++ b/board/freescale/p2041rdb/ddr.c
@@ -13,6 +13,7 @@
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
 #include <asm/fsl_law.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/p2041rdb/eth.c b/board/freescale/p2041rdb/eth.c
index 396981605d2..a4936531120 100644
--- a/board/freescale/p2041rdb/eth.c
+++ b/board/freescale/p2041rdb/eth.c
@@ -20,6 +20,7 @@
 #include <fsl_mdio.h>
 #include <malloc.h>
 #include <fsl_dtsec.h>
+#include <asm/u-boot.h>
 
 #include "cpld.h"
 #include "../common/fman.h"
diff --git a/board/freescale/p2041rdb/p2041rdb.c b/board/freescale/p2041rdb/p2041rdb.c
index 4ece1e6ea0a..2f8e9c12551 100644
--- a/board/freescale/p2041rdb/p2041rdb.c
+++ b/board/freescale/p2041rdb/p2041rdb.c
@@ -11,6 +11,7 @@
 #include <init.h>
 #include <netdev.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/compiler.h>
 #include <asm/mmu.h>
 #include <asm/processor.h>
diff --git a/board/freescale/qemu-ppce500/qemu-ppce500.c b/board/freescale/qemu-ppce500/qemu-ppce500.c
index b38d03c07a3..c99f998fbb3 100644
--- a/board/freescale/qemu-ppce500/qemu-ppce500.c
+++ b/board/freescale/qemu-ppce500/qemu-ppce500.c
@@ -17,6 +17,7 @@
 #include <asm/mmu.h>
 #include <asm/fsl_pci.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <netdev.h>
diff --git a/board/freescale/s32v234evb/s32v234evb.c b/board/freescale/s32v234evb/s32v234evb.c
index 304f5acf3be..846a89849f0 100644
--- a/board/freescale/s32v234evb/s32v234evb.c
+++ b/board/freescale/s32v234evb/s32v234evb.c
@@ -16,6 +16,7 @@
 #include <miiphy.h>
 #include <netdev.h>
 #include <i2c.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/t102xrdb/ddr.c b/board/freescale/t102xrdb/ddr.c
index f4cdbf5b446..f62f5d12405 100644
--- a/board/freescale/t102xrdb/ddr.c
+++ b/board/freescale/t102xrdb/ddr.c
@@ -14,6 +14,7 @@
 #include <fsl_ddr_dimm_params.h>
 #include <asm/fsl_law.h>
 #include <asm/mpc85xx_gpio.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 
diff --git a/board/freescale/t102xrdb/eth_t102xrdb.c b/board/freescale/t102xrdb/eth_t102xrdb.c
index b64590f9d79..414a45f2c0a 100644
--- a/board/freescale/t102xrdb/eth_t102xrdb.c
+++ b/board/freescale/t102xrdb/eth_t102xrdb.c
@@ -24,6 +24,7 @@
 #include <phy.h>
 #include <fsl_dtsec.h>
 #include <asm/fsl_serdes.h>
+#include <asm/u-boot.h>
 #include "../common/fman.h"
 
 int board_eth_init(struct bd_info *bis)
diff --git a/board/freescale/t102xrdb/law.c b/board/freescale/t102xrdb/law.c
index 04a4239797c..0cb63f80797 100644
--- a/board/freescale/t102xrdb/law.c
+++ b/board/freescale/t102xrdb/law.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
+#include <asm/u-boot.h>
 
 struct law_entry law_table[] = {
 #ifdef CONFIG_MTD_NOR_FLASH
diff --git a/board/freescale/t102xrdb/pci.c b/board/freescale/t102xrdb/pci.c
index 45ab9223ae1..2f1a27b4250 100644
--- a/board/freescale/t102xrdb/pci.c
+++ b/board/freescale/t102xrdb/pci.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <pci.h>
 #include <asm/fsl_pci.h>
+#include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <asm/fsl_serdes.h>
diff --git a/board/freescale/t102xrdb/spl.c b/board/freescale/t102xrdb/spl.c
index d8bfbd82791..6596f2cfafe 100644
--- a/board/freescale/t102xrdb/spl.c
+++ b/board/freescale/t102xrdb/spl.c
@@ -15,6 +15,7 @@
 #include <fsl_esdhc.h>
 #include <spi_flash.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 #include "../common/sleep.h"
 #include "../common/spl.h"
diff --git a/board/freescale/t102xrdb/t102xrdb.c b/board/freescale/t102xrdb/t102xrdb.c
index c51555a97e2..5f98f768cc3 100644
--- a/board/freescale/t102xrdb/t102xrdb.c
+++ b/board/freescale/t102xrdb/t102xrdb.c
@@ -13,6 +13,7 @@
 #include <init.h>
 #include <netdev.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/compiler.h>
 #include <asm/mmu.h>
 #include <asm/processor.h>
diff --git a/board/freescale/t102xrdb/t102xrdb.h b/board/freescale/t102xrdb/t102xrdb.h
index 33df0f24df8..a567ae18dab 100644
--- a/board/freescale/t102xrdb/t102xrdb.h
+++ b/board/freescale/t102xrdb/t102xrdb.h
@@ -6,6 +6,7 @@
 #ifndef __T1024_RDB_H__
 #define __T1024_RDB_H__
 
+#include <asm/u-boot.h>
 void fdt_fixup_board_enet(void *blob);
 void pci_of_setup(void *blob, struct bd_info *bd);
 #ifdef CONFIG_TARGET_T1023RDB
diff --git a/board/freescale/t102xrdb/tlb.c b/board/freescale/t102xrdb/tlb.c
index 97080eb95e5..57f5c50bc98 100644
--- a/board/freescale/t102xrdb/tlb.c
+++ b/board/freescale/t102xrdb/tlb.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <asm/mmu.h>
+#include <asm/u-boot.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/freescale/t104xrdb/ddr.c b/board/freescale/t104xrdb/ddr.c
index 8351f7ce9db..2198acfba61 100644
--- a/board/freescale/t104xrdb/ddr.c
+++ b/board/freescale/t104xrdb/ddr.c
@@ -14,6 +14,7 @@
 #include <fsl_ddr_dimm_params.h>
 #include <asm/fsl_law.h>
 #include <asm/mpc85xx_gpio.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include "ddr.h"
 
diff --git a/board/freescale/t104xrdb/diu.c b/board/freescale/t104xrdb/diu.c
index 25c8597202a..dc46a977317 100644
--- a/board/freescale/t104xrdb/diu.c
+++ b/board/freescale/t104xrdb/diu.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <command.h>
 #include <fsl_diu_fb.h>
+#include <asm/u-boot.h>
 #include <linux/ctype.h>
 #include <video_fb.h>
 
diff --git a/board/freescale/t104xrdb/eth.c b/board/freescale/t104xrdb/eth.c
index 8e2f0358740..a554083470e 100644
--- a/board/freescale/t104xrdb/eth.c
+++ b/board/freescale/t104xrdb/eth.c
@@ -13,6 +13,7 @@
 #include <malloc.h>
 #include <fsl_dtsec.h>
 #include <vsc9953.h>
+#include <asm/u-boot.h>
 
 #include "../common/fman.h"
 
diff --git a/board/freescale/t104xrdb/law.c b/board/freescale/t104xrdb/law.c
index 0f6b71a8c22..74f6d8a34e3 100644
--- a/board/freescale/t104xrdb/law.c
+++ b/board/freescale/t104xrdb/law.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
+#include <asm/u-boot.h>
 
 struct law_entry law_table[] = {
 #ifdef CONFIG_MTD_NOR_FLASH
diff --git a/board/freescale/t104xrdb/pci.c b/board/freescale/t104xrdb/pci.c
index 1fd24027000..787d03e1078 100644
--- a/board/freescale/t104xrdb/pci.c
+++ b/board/freescale/t104xrdb/pci.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <pci.h>
 #include <asm/fsl_pci.h>
+#include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <asm/fsl_serdes.h>
diff --git a/board/freescale/t104xrdb/spl.c b/board/freescale/t104xrdb/spl.c
index 2e29b3995d8..6551b2248ef 100644
--- a/board/freescale/t104xrdb/spl.c
+++ b/board/freescale/t104xrdb/spl.c
@@ -15,6 +15,7 @@
 #include <fsl_esdhc.h>
 #include <spi_flash.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 #include "../common/sleep.h"
 #include "../common/spl.h"
diff --git a/board/freescale/t104xrdb/t104xrdb.c b/board/freescale/t104xrdb/t104xrdb.c
index 780043483df..fc496478397 100644
--- a/board/freescale/t104xrdb/t104xrdb.c
+++ b/board/freescale/t104xrdb/t104xrdb.c
@@ -13,6 +13,7 @@
 #include <log.h>
 #include <netdev.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/compiler.h>
 #include <asm/mmu.h>
 #include <asm/processor.h>
diff --git a/board/freescale/t104xrdb/t104xrdb.h b/board/freescale/t104xrdb/t104xrdb.h
index 678724c7e2b..8b009f83379 100644
--- a/board/freescale/t104xrdb/t104xrdb.h
+++ b/board/freescale/t104xrdb/t104xrdb.h
@@ -6,6 +6,7 @@
 #ifndef __T104x_RDB_H__
 #define __T104x_RDB_H__
 
+#include <asm/u-boot.h>
 void fdt_fixup_board_enet(void *blob);
 void pci_of_setup(void *blob, struct bd_info *bd);
 
diff --git a/board/freescale/t104xrdb/tlb.c b/board/freescale/t104xrdb/tlb.c
index 9dcba7933ff..cbfbf117861 100644
--- a/board/freescale/t104xrdb/tlb.c
+++ b/board/freescale/t104xrdb/tlb.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <asm/mmu.h>
+#include <asm/u-boot.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/freescale/t208xqds/ddr.c b/board/freescale/t208xqds/ddr.c
index 56471b3988b..5a6728bd05b 100644
--- a/board/freescale/t208xqds/ddr.c
+++ b/board/freescale/t208xqds/ddr.c
@@ -13,6 +13,7 @@
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
 #include <asm/fsl_law.h>
+#include <asm/u-boot.h>
 #include "ddr.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/t208xqds/eth_t208xqds.c b/board/freescale/t208xqds/eth_t208xqds.c
index e110f3babf1..61dc408c5b1 100644
--- a/board/freescale/t208xqds/eth_t208xqds.c
+++ b/board/freescale/t208xqds/eth_t208xqds.c
@@ -27,6 +27,7 @@
 #include <fsl_dtsec.h>
 #include <asm/fsl_serdes.h>
 #include <hwconfig.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 #include "../common/qixis.h"
 #include "../common/fman.h"
diff --git a/board/freescale/t208xqds/law.c b/board/freescale/t208xqds/law.c
index 40fdcf61c05..646d6ca9b4e 100644
--- a/board/freescale/t208xqds/law.c
+++ b/board/freescale/t208xqds/law.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
+#include <asm/u-boot.h>
 
 struct law_entry law_table[] = {
 	SET_LAW(CONFIG_SYS_FLASH_BASE_PHYS, LAW_SIZE_256M, LAW_TRGT_IF_IFC),
diff --git a/board/freescale/t208xqds/pci.c b/board/freescale/t208xqds/pci.c
index a03b11ccb50..46f558f5cfe 100644
--- a/board/freescale/t208xqds/pci.c
+++ b/board/freescale/t208xqds/pci.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <pci.h>
 #include <asm/fsl_pci.h>
+#include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <asm/fsl_serdes.h>
diff --git a/board/freescale/t208xqds/spl.c b/board/freescale/t208xqds/spl.c
index 4345c29c3b1..bf1b049af7f 100644
--- a/board/freescale/t208xqds/spl.c
+++ b/board/freescale/t208xqds/spl.c
@@ -15,6 +15,7 @@
 #include <fsl_esdhc.h>
 #include <spi_flash.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 #include "../common/qixis.h"
 #include "t208xqds_qixis.h"
diff --git a/board/freescale/t208xqds/t208xqds.c b/board/freescale/t208xqds/t208xqds.c
index dedf722c695..a0ead05e37d 100644
--- a/board/freescale/t208xqds/t208xqds.c
+++ b/board/freescale/t208xqds/t208xqds.c
@@ -14,6 +14,7 @@
 #include <log.h>
 #include <netdev.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/compiler.h>
 #include <asm/mmu.h>
 #include <asm/processor.h>
diff --git a/board/freescale/t208xqds/t208xqds.h b/board/freescale/t208xqds/t208xqds.h
index 50ebb6f6f98..8a77206b0df 100644
--- a/board/freescale/t208xqds/t208xqds.h
+++ b/board/freescale/t208xqds/t208xqds.h
@@ -6,6 +6,7 @@
 #ifndef __CORENET_DS_H__
 #define __CORENET_DS_H__
 
+#include <asm/u-boot.h>
 void fdt_fixup_board_enet(void *blob);
 void pci_of_setup(void *blob, struct bd_info *bd);
 
diff --git a/board/freescale/t208xqds/tlb.c b/board/freescale/t208xqds/tlb.c
index 1e501da363d..713bcde4566 100644
--- a/board/freescale/t208xqds/tlb.c
+++ b/board/freescale/t208xqds/tlb.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <asm/mmu.h>
+#include <asm/u-boot.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/freescale/t208xrdb/cpld.c b/board/freescale/t208xrdb/cpld.c
index 81e220ff114..cf39623b7ae 100644
--- a/board/freescale/t208xrdb/cpld.c
+++ b/board/freescale/t208xrdb/cpld.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <asm/io.h>
 #include <linux/string.h>
 #include "cpld.h"
 
diff --git a/board/freescale/t208xrdb/ddr.c b/board/freescale/t208xrdb/ddr.c
index 1fbab36e1a2..86f1e7614cb 100644
--- a/board/freescale/t208xrdb/ddr.c
+++ b/board/freescale/t208xrdb/ddr.c
@@ -13,6 +13,7 @@
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
 #include <asm/fsl_law.h>
+#include <asm/u-boot.h>
 #include "ddr.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/t208xrdb/eth_t208xrdb.c b/board/freescale/t208xrdb/eth_t208xrdb.c
index c16538850cd..de997db78f7 100644
--- a/board/freescale/t208xrdb/eth_t208xrdb.c
+++ b/board/freescale/t208xrdb/eth_t208xrdb.c
@@ -24,6 +24,7 @@
 #include <phy.h>
 #include <fsl_dtsec.h>
 #include <asm/fsl_serdes.h>
+#include <asm/u-boot.h>
 
 int board_eth_init(struct bd_info *bis)
 {
diff --git a/board/freescale/t208xrdb/law.c b/board/freescale/t208xrdb/law.c
index d3b263f59d9..62e51a145e2 100644
--- a/board/freescale/t208xrdb/law.c
+++ b/board/freescale/t208xrdb/law.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
+#include <asm/u-boot.h>
 
 struct law_entry law_table[] = {
 	SET_LAW(CONFIG_SYS_FLASH_BASE_PHYS, LAW_SIZE_256M, LAW_TRGT_IF_IFC),
diff --git a/board/freescale/t208xrdb/pci.c b/board/freescale/t208xrdb/pci.c
index 45ab9223ae1..2f1a27b4250 100644
--- a/board/freescale/t208xrdb/pci.c
+++ b/board/freescale/t208xrdb/pci.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <pci.h>
 #include <asm/fsl_pci.h>
+#include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <asm/fsl_serdes.h>
diff --git a/board/freescale/t208xrdb/spl.c b/board/freescale/t208xrdb/spl.c
index a9bf5fb6466..234fd145e7d 100644
--- a/board/freescale/t208xrdb/spl.c
+++ b/board/freescale/t208xrdb/spl.c
@@ -15,6 +15,7 @@
 #include <fsl_esdhc.h>
 #include <spi_flash.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 #include "../common/spl.h"
 
diff --git a/board/freescale/t208xrdb/t208xrdb.c b/board/freescale/t208xrdb/t208xrdb.c
index a18459841c6..e09f0efdda6 100644
--- a/board/freescale/t208xrdb/t208xrdb.c
+++ b/board/freescale/t208xrdb/t208xrdb.c
@@ -12,6 +12,7 @@
 #include <init.h>
 #include <netdev.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/compiler.h>
 #include <asm/mmu.h>
 #include <asm/processor.h>
diff --git a/board/freescale/t208xrdb/t208xrdb.h b/board/freescale/t208xrdb/t208xrdb.h
index 22a496fb8cf..b830fe86c9b 100644
--- a/board/freescale/t208xrdb/t208xrdb.h
+++ b/board/freescale/t208xrdb/t208xrdb.h
@@ -6,6 +6,7 @@
 #ifndef __CORENET_DS_H__
 #define __CORENET_DS_H__
 
+#include <asm/u-boot.h>
 void fdt_fixup_board_enet(void *blob);
 void pci_of_setup(void *blob, struct bd_info *bd);
 
diff --git a/board/freescale/t208xrdb/tlb.c b/board/freescale/t208xrdb/tlb.c
index 542ab1e034f..488261828df 100644
--- a/board/freescale/t208xrdb/tlb.c
+++ b/board/freescale/t208xrdb/tlb.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <asm/mmu.h>
+#include <asm/u-boot.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/freescale/t4rdb/ddr.c b/board/freescale/t4rdb/ddr.c
index 57cbde154f0..0e2ba282690 100644
--- a/board/freescale/t4rdb/ddr.c
+++ b/board/freescale/t4rdb/ddr.c
@@ -13,6 +13,7 @@
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
 #include <asm/fsl_law.h>
+#include <asm/u-boot.h>
 #include "ddr.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/t4rdb/eth.c b/board/freescale/t4rdb/eth.c
index c815a3a4fa5..a81b3be878b 100644
--- a/board/freescale/t4rdb/eth.c
+++ b/board/freescale/t4rdb/eth.c
@@ -27,6 +27,7 @@
 #include <fsl_dtsec.h>
 #include <asm/fsl_serdes.h>
 #include <hwconfig.h>
+#include <asm/u-boot.h>
 
 #include "../common/fman.h"
 #include "t4rdb.h"
diff --git a/board/freescale/t4rdb/law.c b/board/freescale/t4rdb/law.c
index 038f60565f7..4c195d5b023 100644
--- a/board/freescale/t4rdb/law.c
+++ b/board/freescale/t4rdb/law.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
+#include <asm/u-boot.h>
 
 struct law_entry law_table[] = {
 	SET_LAW(CONFIG_SYS_FLASH_BASE_PHYS, LAW_SIZE_256M, LAW_TRGT_IF_IFC),
diff --git a/board/freescale/t4rdb/pci.c b/board/freescale/t4rdb/pci.c
index c2bc05164dd..14dacb7e3c9 100644
--- a/board/freescale/t4rdb/pci.c
+++ b/board/freescale/t4rdb/pci.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <pci.h>
 #include <asm/fsl_pci.h>
+#include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <asm/fsl_serdes.h>
diff --git a/board/freescale/t4rdb/spl.c b/board/freescale/t4rdb/spl.c
index 79763119968..186327a3cde 100644
--- a/board/freescale/t4rdb/spl.c
+++ b/board/freescale/t4rdb/spl.c
@@ -18,6 +18,7 @@
 #include <mmc.h>
 #include <fsl_esdhc.h>
 #include <i2c.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 
 #include "t4rdb.h"
diff --git a/board/freescale/t4rdb/t4240rdb.c b/board/freescale/t4rdb/t4240rdb.c
index 6ab35ca9185..bee6d42c83d 100644
--- a/board/freescale/t4rdb/t4240rdb.c
+++ b/board/freescale/t4rdb/t4240rdb.c
@@ -12,6 +12,7 @@
 #include <init.h>
 #include <netdev.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/compiler.h>
 #include <asm/mmu.h>
 #include <asm/processor.h>
diff --git a/board/freescale/t4rdb/t4rdb.h b/board/freescale/t4rdb/t4rdb.h
index 3f1fa7bbd24..0bb1b9cca1f 100644
--- a/board/freescale/t4rdb/t4rdb.h
+++ b/board/freescale/t4rdb/t4rdb.h
@@ -6,6 +6,7 @@
 #ifndef __T4RDB_H__
 #define __T4RDB_H__
 
+#include <asm/u-boot.h>
 #undef CONFIG_SYS_NUM_FM1_DTSEC
 #undef CONFIG_SYS_NUM_FM2_DTSEC
 #define CONFIG_SYS_NUM_FM1_DTSEC	4
diff --git a/board/freescale/t4rdb/tlb.c b/board/freescale/t4rdb/tlb.c
index b927dd8484f..01e8e75825f 100644
--- a/board/freescale/t4rdb/tlb.c
+++ b/board/freescale/t4rdb/tlb.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <asm/mmu.h>
+#include <asm/u-boot.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/freescale/vf610twr/vf610twr.c b/board/freescale/vf610twr/vf610twr.c
index 98cb0140ad0..3641e5fb92f 100644
--- a/board/freescale/vf610twr/vf610twr.c
+++ b/board/freescale/vf610twr/vf610twr.c
@@ -17,6 +17,7 @@
 #include <miiphy.h>
 #include <netdev.h>
 #include <i2c.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/gardena/smart-gateway-at91sam/board.c b/board/gardena/smart-gateway-at91sam/board.c
index 3f402cfeee8..e50f0b8a476 100644
--- a/board/gardena/smart-gateway-at91sam/board.c
+++ b/board/gardena/smart-gateway-at91sam/board.c
@@ -12,6 +12,7 @@
 #include <asm/arch/at91_common.h>
 #include <asm/arch/clk.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/gateworks/gw_ventana/common.c b/board/gateworks/gw_ventana/common.c
index 14f45bf07da..ec42d5aa093 100644
--- a/board/gateworks/gw_ventana/common.c
+++ b/board/gateworks/gw_ventana/common.c
@@ -15,6 +15,7 @@
 #include <env.h>
 #include <fsl_esdhc_imx.h>
 #include <hwconfig.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <power/pmic.h>
 #include <power/ltc3676_pmic.h>
diff --git a/board/gateworks/gw_ventana/gw_ventana.c b/board/gateworks/gw_ventana/gw_ventana.c
index b0cfd2e931a..84de3c3bb0f 100644
--- a/board/gateworks/gw_ventana/gw_ventana.c
+++ b/board/gateworks/gw_ventana/gw_ventana.c
@@ -24,6 +24,7 @@
 #include <asm/io.h>
 #include <asm/setup.h>
 #include <dm.h>
+#include <asm/u-boot.h>
 #include <dm/platform_data/serial_mxc.h>
 #include <env.h>
 #include <hwconfig.h>
diff --git a/board/gateworks/gw_ventana/gw_ventana_spl.c b/board/gateworks/gw_ventana/gw_ventana_spl.c
index e0e4bac1612..c9e742e58ee 100644
--- a/board/gateworks/gw_ventana/gw_ventana_spl.c
+++ b/board/gateworks/gw_ventana/gw_ventana_spl.c
@@ -20,6 +20,7 @@
 #include <env.h>
 #include <i2c.h>
 #include <spl.h>
+#include <asm/u-boot.h>
 
 #include "gsc.h"
 #include "common.h"
diff --git a/board/gdsys/a38x/controlcenterdc.c b/board/gdsys/a38x/controlcenterdc.c
index ba57a272187..d26ee0d313d 100644
--- a/board/gdsys/a38x/controlcenterdc.c
+++ b/board/gdsys/a38x/controlcenterdc.c
@@ -15,6 +15,7 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm-generic/gpio.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 
 #include "../drivers/ddr/marvell/a38x/ddr3_init.h"
diff --git a/board/gdsys/common/ioep-fpga.c b/board/gdsys/common/ioep-fpga.c
index 9c01661dc32..c758c8a885d 100644
--- a/board/gdsys/common/ioep-fpga.c
+++ b/board/gdsys/common/ioep-fpga.c
@@ -7,7 +7,7 @@
 #ifdef CONFIG_GDSYS_LEGACY_DRIVERS
 
 #include <common.h>
-
+#include <string.h>
 #include <gdsys_fpga.h>
 #include <linux/bitops.h>
 
diff --git a/board/gdsys/mpc8308/gazerbeam.c b/board/gdsys/mpc8308/gazerbeam.c
index 68a9595511c..9891baa1126 100644
--- a/board/gdsys/mpc8308/gazerbeam.c
+++ b/board/gdsys/mpc8308/gazerbeam.c
@@ -18,6 +18,7 @@
 #include <tpm-v1.h>
 #include <video_osd.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 
 #include "../common/ihs_mdio.h"
 #include "../../../drivers/board/gazerbeam.h"
diff --git a/board/gdsys/mpc8308/hrcon.c b/board/gdsys/mpc8308/hrcon.c
index 446a756fbbe..bc2980f1a67 100644
--- a/board/gdsys/mpc8308/hrcon.c
+++ b/board/gdsys/mpc8308/hrcon.c
@@ -11,6 +11,7 @@
 #include <i2c.h>
 #include <init.h>
 #include <spi.h>
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
diff --git a/board/gdsys/mpc8308/strider.c b/board/gdsys/mpc8308/strider.c
index 983d2847614..a6a2e797581 100644
--- a/board/gdsys/mpc8308/strider.c
+++ b/board/gdsys/mpc8308/strider.c
@@ -11,6 +11,7 @@
 #include <i2c.h>
 #include <init.h>
 #include <spi.h>
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
diff --git a/board/gdsys/p1022/controlcenterd.c b/board/gdsys/p1022/controlcenterd.c
index d31cba3d06e..0348b710075 100644
--- a/board/gdsys/p1022/controlcenterd.c
+++ b/board/gdsys/p1022/controlcenterd.c
@@ -36,6 +36,7 @@
 #include <fsl_ddr_sdram.h>
 #include <asm/fsl_serdes.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
diff --git a/board/gdsys/p1022/diu.c b/board/gdsys/p1022/diu.c
index 9a5d3c11e14..c67dc182cbb 100644
--- a/board/gdsys/p1022/diu.c
+++ b/board/gdsys/p1022/diu.c
@@ -10,6 +10,7 @@
 #include <clock_legacy.h>
 #include <command.h>
 #include <log.h>
+#include <asm/u-boot.h>
 #include <linux/ctype.h>
 #include <asm/io.h>
 #include <stdio_dev.h>
diff --git a/board/gdsys/p1022/law.c b/board/gdsys/p1022/law.c
index 5214109943a..30ff4eb93f7 100644
--- a/board/gdsys/p1022/law.c
+++ b/board/gdsys/p1022/law.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
+#include <asm/u-boot.h>
 
 struct law_entry law_table[] = {
 	SET_LAW(CONFIG_SYS_ELBC_BASE_PHYS, LAW_SIZE_1M, LAW_TRGT_IF_LBC),
diff --git a/board/gdsys/p1022/tlb.c b/board/gdsys/p1022/tlb.c
index 00139ac5e39..5f63fad4cfe 100644
--- a/board/gdsys/p1022/tlb.c
+++ b/board/gdsys/p1022/tlb.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <asm/mmu.h>
+#include <asm/u-boot.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/ge/bx50v3/bx50v3.c b/board/ge/bx50v3/bx50v3.c
index 3876b25420b..8df982450c2 100644
--- a/board/ge/bx50v3/bx50v3.c
+++ b/board/ge/bx50v3/bx50v3.c
@@ -13,6 +13,7 @@
 #include <asm/arch/mx6-pins.h>
 #include <env.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/libfdt.h>
diff --git a/board/ge/mx53ppd/mx53ppd.c b/board/ge/mx53ppd/mx53ppd.c
index 7018b29d5ac..02d17952d58 100644
--- a/board/ge/mx53ppd/mx53ppd.c
+++ b/board/ge/mx53ppd/mx53ppd.c
@@ -19,6 +19,7 @@
 #include <asm/arch/iomux-mx53.h>
 #include <asm/arch/clock.h>
 #include <env.h>
+#include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <asm/mach-imx/mxc_i2c.h>
diff --git a/board/google/chromebook_coral/coral.c b/board/google/chromebook_coral/coral.c
index 12d4fe63cb0..4dbdfe343cc 100644
--- a/board/google/chromebook_coral/coral.c
+++ b/board/google/chromebook_coral/coral.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <asm/u-boot.h>
 
 int arch_misc_init(void)
 {
diff --git a/board/google/imx8mq_phanbell/imx8mq_phanbell.c b/board/google/imx8mq_phanbell/imx8mq_phanbell.c
index d0a740dd3f4..33ccaa6ff4c 100644
--- a/board/google/imx8mq_phanbell/imx8mq_phanbell.c
+++ b/board/google/imx8mq_phanbell/imx8mq_phanbell.c
@@ -21,6 +21,7 @@
 #include <asm/mach-imx/gpio.h>
 #include <asm/arch/clock.h>
 #include <spl.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/google/imx8mq_phanbell/spl.c b/board/google/imx8mq_phanbell/spl.c
index fd5d745118c..aee71acc98e 100644
--- a/board/google/imx8mq_phanbell/spl.c
+++ b/board/google/imx8mq_phanbell/spl.c
@@ -20,6 +20,7 @@
 #include <asm/mach-imx/gpio.h>
 #include <asm/mach-imx/mxc_i2c.h>
 #include <asm/sections.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <fsl_esdhc_imx.h>
 #include <mmc.h>
diff --git a/board/grinn/chiliboard/board.c b/board/grinn/chiliboard/board.c
index 12480f5729d..2c88701a4dc 100644
--- a/board/grinn/chiliboard/board.c
+++ b/board/grinn/chiliboard/board.c
@@ -24,6 +24,7 @@
 #include <miiphy.h>
 #include <spl.h>
 #include <watchdog.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/grinn/liteboard/board.c b/board/grinn/liteboard/board.c
index 46c7138b303..0617e7978c9 100644
--- a/board/grinn/liteboard/board.c
+++ b/board/grinn/liteboard/board.c
@@ -23,6 +23,7 @@
 #include <common.h>
 #include <env.h>
 #include <fsl_esdhc_imx.h>
+#include <asm/u-boot.h>
 #include <linux/sizes.h>
 #include <linux/fb.h>
 #include <miiphy.h>
diff --git a/board/highbank/highbank.c b/board/highbank/highbank.c
index a790d453da0..1a47a845737 100644
--- a/board/highbank/highbank.c
+++ b/board/highbank/highbank.c
@@ -13,6 +13,7 @@
 #include <netdev.h>
 #include <scsi.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 
 #include <linux/sizes.h>
 #include <asm/io.h>
diff --git a/board/hisilicon/hikey/hikey.c b/board/hisilicon/hikey/hikey.c
index 5a858dec64e..0c6cdb5c9cf 100644
--- a/board/hisilicon/hikey/hikey.c
+++ b/board/hisilicon/hikey/hikey.c
@@ -10,6 +10,7 @@
 #include <init.h>
 #include <log.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <dm/platform_data/serial_pl01x.h>
 #include <errno.h>
 #include <malloc.h>
diff --git a/board/hisilicon/hikey960/hikey960.c b/board/hisilicon/hikey960/hikey960.c
index a14b9e44fa5..e302b169e1e 100644
--- a/board/hisilicon/hikey960/hikey960.c
+++ b/board/hisilicon/hikey960/hikey960.c
@@ -15,6 +15,7 @@
 #include <asm/arch/hi3660.h>
 #include <asm/armv8/mmu.h>
 #include <asm/psci.h>
+#include <asm/u-boot.h>
 #include <linux/arm-smccc.h>
 #include <linux/delay.h>
 #include <linux/psci.h>
diff --git a/board/hisilicon/poplar/poplar.c b/board/hisilicon/poplar/poplar.c
index 486e37f90a6..e0f290ef544 100644
--- a/board/hisilicon/poplar/poplar.c
+++ b/board/hisilicon/poplar/poplar.c
@@ -11,6 +11,7 @@
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 #include <dm/platform_data/serial_pl01x.h>
 #include <asm/arch/hi3798cv200.h>
 #include <asm/armv8/mmu.h>
diff --git a/board/ids/ids8313/ids8313.c b/board/ids/ids8313/ids8313.c
index 45c77a249a9..7ebae113370 100644
--- a/board/ids/ids8313/ids8313.c
+++ b/board/ids/ids8313/ids8313.c
@@ -18,6 +18,7 @@
 #include <spi.h>
 #include <asm/bitops.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 
diff --git a/board/imgtec/boston/ddr.c b/board/imgtec/boston/ddr.c
index 182f79b9182..cbbbf280d8d 100644
--- a/board/imgtec/boston/ddr.c
+++ b/board/imgtec/boston/ddr.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <init.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 
 #include <asm/io.h>
 
diff --git a/board/imgtec/boston/dt.c b/board/imgtec/boston/dt.c
index bf772ff5dec..1d7a95073ab 100644
--- a/board/imgtec/boston/dt.c
+++ b/board/imgtec/boston/dt.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <fdt_support.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 
 int ft_board_setup(void *blob, struct bd_info *bd)
 {
diff --git a/board/imgtec/ci20/ci20.c b/board/imgtec/ci20/ci20.c
index 7ee175d40a5..8f45ff89e5f 100644
--- a/board/imgtec/ci20/ci20.c
+++ b/board/imgtec/ci20/ci20.c
@@ -14,6 +14,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <mach/jz4780.h>
diff --git a/board/imgtec/malta/malta.c b/board/imgtec/malta/malta.c
index 4a6fd785731..0a6ab37e12d 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 <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 
diff --git a/board/inversepath/usbarmory/usbarmory.c b/board/inversepath/usbarmory/usbarmory.c
index 086d0522c78..2ad772c225f 100644
--- a/board/inversepath/usbarmory/usbarmory.c
+++ b/board/inversepath/usbarmory/usbarmory.c
@@ -18,6 +18,7 @@
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/iomux-mx53.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <i2c.h>
diff --git a/board/iomega/iconnect/iconnect.c b/board/iomega/iconnect/iconnect.c
index fe4be28b13c..1bafcb977e1 100644
--- a/board/iomega/iconnect/iconnect.c
+++ b/board/iomega/iconnect/iconnect.c
@@ -12,6 +12,7 @@
 #include <asm/arch/soc.h>
 #include <asm/arch/mpp.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include "iconnect.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/isee/igep003x/board.c b/board/isee/igep003x/board.c
index 02ae7df04db..8844bb42720 100644
--- a/board/isee/igep003x/board.c
+++ b/board/isee/igep003x/board.c
@@ -30,6 +30,7 @@
 #include <cpsw.h>
 #include <fdt_support.h>
 #include <mtd_node.h>
+#include <asm/u-boot.h>
 #include <jffs2/load_kernel.h>
 #include "board.h"
 
diff --git a/board/isee/igep00x0/common.c b/board/isee/igep00x0/common.c
index 3fdf83e845c..e4ea96f076e 100644
--- a/board/isee/igep00x0/common.c
+++ b/board/isee/igep00x0/common.c
@@ -7,6 +7,7 @@
 #include <asm/omap_mmc.h>
 #include <asm/arch/mux.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/u-boot.h>
 #include <jffs2/load_kernel.h>
 #include <linux/delay.h>
 #include <linux/mtd/rawnand.h>
diff --git a/board/isee/igep00x0/igep00x0.c b/board/isee/igep00x0/igep00x0.c
index 836a3f91957..098ef3f9664 100644
--- a/board/isee/igep00x0/igep00x0.c
+++ b/board/isee/igep00x0/igep00x0.c
@@ -20,6 +20,7 @@
 #include <asm/arch/mmc_host_def.h>
 #include <asm/arch/mux.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/rawnand.h>
diff --git a/board/k+p/kp_imx53/kp_imx53.c b/board/k+p/kp_imx53/kp_imx53.c
index a5ee4a8a519..42e540ae1e4 100644
--- a/board/k+p/kp_imx53/kp_imx53.c
+++ b/board/k+p/kp_imx53/kp_imx53.c
@@ -16,6 +16,7 @@
 #include <asm/arch/clock.h>
 #include <asm/gpio.h>
 #include <env.h>
+#include <asm/u-boot.h>
 #include <power/pmic.h>
 #include <fsl_pmic.h>
 #include "kp_id_rev.h"
diff --git a/board/k+p/kp_imx6q_tpc/kp_imx6q_tpc.c b/board/k+p/kp_imx6q_tpc/kp_imx6q_tpc.c
index 110496d9950..c1ec01f21a0 100644
--- a/board/k+p/kp_imx6q_tpc/kp_imx6q_tpc.c
+++ b/board/k+p/kp_imx6q_tpc/kp_imx6q_tpc.c
@@ -18,6 +18,7 @@
 #include <errno.h>
 #include <miiphy.h>
 #include <usb.h>
+#include <asm/u-boot.h>
 #include <usb/ehci-ci.h>
 #include <led.h>
 
diff --git a/board/k+p/kp_imx6q_tpc/kp_imx6q_tpc_spl.c b/board/k+p/kp_imx6q_tpc/kp_imx6q_tpc_spl.c
index 4bd2e8d0e87..d5c1c762254 100644
--- a/board/k+p/kp_imx6q_tpc/kp_imx6q_tpc_spl.c
+++ b/board/k+p/kp_imx6q_tpc/kp_imx6q_tpc_spl.c
@@ -17,6 +17,7 @@
 #include <asm/io.h>
 #include <errno.h>
 #include <spl.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 
diff --git a/board/keymile/common/common.c b/board/keymile/common/common.c
index 4f64a1805f7..bada40e1e62 100644
--- a/board/keymile/common/common.c
+++ b/board/keymile/common/common.c
@@ -17,6 +17,7 @@
 #include <netdev.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 #include <linux/ctype.h>
 #include <linux/delay.h>
 #include <linux/string.h>
diff --git a/board/keymile/common/qrio.c b/board/keymile/common/qrio.c
index 06a4e67881f..e447083f13a 100644
--- a/board/keymile/common/qrio.c
+++ b/board/keymile/common/qrio.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 
 #include "common.h"
diff --git a/board/keymile/km83xx/km83xx.c b/board/keymile/km83xx/km83xx.c
index 1e5c33b5fd5..f0422d906e7 100644
--- a/board/keymile/km83xx/km83xx.c
+++ b/board/keymile/km83xx/km83xx.c
@@ -27,6 +27,7 @@
 #include <asm/mmu.h>
 #include <asm/processor.h>
 #include <pci.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 #include <post.h>
diff --git a/board/keymile/km83xx/km83xx_i2c.c b/board/keymile/km83xx/km83xx_i2c.c
index 62100b19492..104e30875d7 100644
--- a/board/keymile/km83xx/km83xx_i2c.c
+++ b/board/keymile/km83xx/km83xx_i2c.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <i2c.h>
+#include <asm/fsl_i2c.h>
 #include <asm/io.h>
 #include <linux/ctype.h>
 #include <linux/delay.h>
diff --git a/board/keymile/km_arm/km_arm.c b/board/keymile/km_arm/km_arm.c
index f4235b377fc..3f6aa49416f 100644
--- a/board/keymile/km_arm/km_arm.c
+++ b/board/keymile/km_arm/km_arm.c
@@ -25,6 +25,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
 #include <asm/arch/mpp.h>
+#include <asm/u-boot.h>
 
 #include "../common/common.h"
 
diff --git a/board/keymile/kmp204x/eth.c b/board/keymile/kmp204x/eth.c
index 29c5b339ae8..0cac3ecdad3 100644
--- a/board/keymile/kmp204x/eth.c
+++ b/board/keymile/kmp204x/eth.c
@@ -10,6 +10,7 @@
 #include <fm_eth.h>
 #include <fsl_mdio.h>
 #include <phy.h>
+#include <asm/u-boot.h>
 
 int board_eth_init(struct bd_info *bis)
 {
diff --git a/board/keymile/kmp204x/kmp204x.c b/board/keymile/kmp204x/kmp204x.c
index 29dde7a8024..1d491bda92f 100644
--- a/board/keymile/kmp204x/kmp204x.c
+++ b/board/keymile/kmp204x/kmp204x.c
@@ -13,6 +13,7 @@
 #include <image.h>
 #include <init.h>
 #include <netdev.h>
+#include <asm/u-boot.h>
 #include <linux/compiler.h>
 #include <asm/mmu.h>
 #include <asm/processor.h>
diff --git a/board/keymile/kmp204x/kmp204x.h b/board/keymile/kmp204x/kmp204x.h
index 3b858a55711..077954faebb 100644
--- a/board/keymile/kmp204x/kmp204x.h
+++ b/board/keymile/kmp204x/kmp204x.h
@@ -5,4 +5,5 @@
  */
 
 
+#include <asm/u-boot.h>
 void pci_of_setup(void *blob, struct bd_info *bd);
diff --git a/board/keymile/kmp204x/law.c b/board/keymile/kmp204x/law.c
index 2d83dfea15f..2c702dc631b 100644
--- a/board/keymile/kmp204x/law.c
+++ b/board/keymile/kmp204x/law.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
+#include <asm/u-boot.h>
 
 struct law_entry law_table[] = {
 #ifdef CONFIG_SYS_BMAN_MEM_PHYS
diff --git a/board/keymile/kmp204x/pci.c b/board/keymile/kmp204x/pci.c
index cdb498da03b..bfc853a2e82 100644
--- a/board/keymile/kmp204x/pci.c
+++ b/board/keymile/kmp204x/pci.c
@@ -11,6 +11,7 @@
 #include <init.h>
 #include <pci.h>
 #include <asm/fsl_pci.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
diff --git a/board/keymile/kmp204x/tlb.c b/board/keymile/kmp204x/tlb.c
index a268bd8e959..72efe5044b5 100644
--- a/board/keymile/kmp204x/tlb.c
+++ b/board/keymile/kmp204x/tlb.c
@@ -11,6 +11,7 @@
 
 #include <common.h>
 #include <asm/mmu.h>
+#include <asm/u-boot.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/kmc/kzm9g/kzm9g.c b/board/kmc/kzm9g/kzm9g.c
index 02c87a031c3..5b0c198940a 100644
--- a/board/kmc/kzm9g/kzm9g.c
+++ b/board/kmc/kzm9g/kzm9g.c
@@ -14,6 +14,7 @@
 #include <asm/gpio.h>
 #include <netdev.h>
 #include <i2c.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/kobol/helios4/helios4.c b/board/kobol/helios4/helios4.c
index adb091ce4fd..79cd4a4bc1f 100644
--- a/board/kobol/helios4/helios4.c
+++ b/board/kobol/helios4/helios4.c
@@ -14,6 +14,7 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <asm/u-boot.h>
 
 #include "../drivers/ddr/marvell/a38x/ddr3_init.h"
 #include <../serdes/a38x/high_speed_env_spec.h>
diff --git a/board/kosagi/novena/novena.c b/board/kosagi/novena/novena.c
index 383d3705734..1825cd04976 100644
--- a/board/kosagi/novena/novena.c
+++ b/board/kosagi/novena/novena.c
@@ -12,6 +12,7 @@
 #include <init.h>
 #include <log.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <dm/device-internal.h>
 #include <ahci.h>
 #include <env.h>
diff --git a/board/kosagi/novena/novena_spl.c b/board/kosagi/novena/novena_spl.c
index 3d22f2019e9..eddea6e2915 100644
--- a/board/kosagi/novena/novena_spl.c
+++ b/board/kosagi/novena/novena_spl.c
@@ -23,6 +23,7 @@
 #include <mmc.h>
 #include <fsl_esdhc_imx.h>
 #include <spl.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 
 #include <asm/arch/mx6-ddr.h>
diff --git a/board/l+g/vinco/vinco.c b/board/l+g/vinco/vinco.c
index f221f05261a..9f8533faa9e 100644
--- a/board/l+g/vinco/vinco.c
+++ b/board/l+g/vinco/vinco.c
@@ -31,6 +31,7 @@
 #include <nand.h>
 #include <spi.h>
 #include <version.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/laird/wb45n/wb45n.c b/board/laird/wb45n/wb45n.c
index 5e1ef8a49ac..fa96682625a 100644
--- a/board/laird/wb45n/wb45n.c
+++ b/board/laird/wb45n/wb45n.c
@@ -14,6 +14,7 @@
 #include <asm/arch/gpio.h>
 #include <net.h>
 #include <netdev.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/laird/wb50n/wb50n.c b/board/laird/wb50n/wb50n.c
index f1a7555ac9c..13ac53ab21a 100644
--- a/board/laird/wb50n/wb50n.c
+++ b/board/laird/wb50n/wb50n.c
@@ -20,6 +20,7 @@
 #include <spl.h>
 #include <asm/arch/atmel_mpddrc.h>
 #include <asm/arch/at91_wdt.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/lego/ev3/legoev3.c b/board/lego/ev3/legoev3.c
index 5e5c8c1198f..6afb02bc2b0 100644
--- a/board/lego/ev3/legoev3.c
+++ b/board/lego/ev3/legoev3.c
@@ -22,6 +22,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/davinci_misc.h>
+#include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <hwconfig.h>
 #include <asm/mach-types.h>
diff --git a/board/lg/sniper/sniper.c b/board/lg/sniper/sniper.c
index 15c088d7348..3de18af2a1d 100644
--- a/board/lg/sniper/sniper.c
+++ b/board/lg/sniper/sniper.c
@@ -11,6 +11,7 @@
 #include <env.h>
 #include <init.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/ctype.h>
 #include <linux/usb/musb.h>
 #include <asm/omap_musb.h>
diff --git a/board/liebherr/display5/display5.c b/board/liebherr/display5/display5.c
index c47f43a9164..c68e04815e6 100644
--- a/board/liebherr/display5/display5.c
+++ b/board/liebherr/display5/display5.c
@@ -26,6 +26,7 @@
 #include <miiphy.h>
 #include <netdev.h>
 #include <i2c.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 
diff --git a/board/liebherr/display5/spl.c b/board/liebherr/display5/spl.c
index a48eba58f9d..b910b3fbf0e 100644
--- a/board/liebherr/display5/spl.c
+++ b/board/liebherr/display5/spl.c
@@ -13,6 +13,7 @@
 #include <serial.h>
 #include <spl.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 #include <asm/io.h>
diff --git a/board/liebherr/mccmon6/mccmon6.c b/board/liebherr/mccmon6/mccmon6.c
index 1b49526fba4..db0ae9bc4ca 100644
--- a/board/liebherr/mccmon6/mccmon6.c
+++ b/board/liebherr/mccmon6/mccmon6.c
@@ -14,6 +14,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/global_data.h>
 #include <asm/gpio.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/liebherr/mccmon6/spl.c b/board/liebherr/mccmon6/spl.c
index 1153a7e19f8..69cf7def1f6 100644
--- a/board/liebherr/mccmon6/spl.c
+++ b/board/liebherr/mccmon6/spl.c
@@ -22,6 +22,7 @@
 #include <asm/arch/sys_proto.h>
 #include <serial.h>
 #include <spl.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 
diff --git a/board/liebherr/xea/xea.c b/board/liebherr/xea/xea.c
index cd11b0ada77..eee2e00b78e 100644
--- a/board/liebherr/xea/xea.c
+++ b/board/liebherr/xea/xea.c
@@ -25,6 +25,7 @@
 #include <asm/arch/iomux-mx28.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/mii.h>
 #include <miiphy.h>
diff --git a/board/logicpd/am3517evm/am3517evm.c b/board/logicpd/am3517evm/am3517evm.c
index f0141659282..e0e57868546 100644
--- a/board/logicpd/am3517evm/am3517evm.c
+++ b/board/logicpd/am3517evm/am3517evm.c
@@ -26,6 +26,7 @@
 #include <asm/arch/mmc_host_def.h>
 #include <asm/arch/musb.h>
 #include <asm/mach-types.h>
+#include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
 #include <linux/usb/ch9.h>
diff --git a/board/logicpd/imx6/imx6logic.c b/board/logicpd/imx6/imx6logic.c
index 0d53548dcb4..f065aa96eca 100644
--- a/board/logicpd/imx6/imx6logic.c
+++ b/board/logicpd/imx6/imx6logic.c
@@ -19,6 +19,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
+#include <asm/u-boot.h>
 #include <linux/sizes.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/crm_regs.h>
diff --git a/board/logicpd/omap3som/omap3logic.c b/board/logicpd/omap3som/omap3logic.c
index 2379b521904..e5a9ffdda55 100644
--- a/board/logicpd/omap3som/omap3logic.c
+++ b/board/logicpd/omap3som/omap3logic.c
@@ -29,6 +29,7 @@
 #include <asm/gpio.h>
 #include <asm/omap_mmc.h>
 #include <asm/mach-types.h>
+#include <asm/u-boot.h>
 #include <linux/mtd/rawnand.h>
 #include <asm/omap_musb.h>
 #include <linux/errno.h>
diff --git a/board/maxbcm/maxbcm.c b/board/maxbcm/maxbcm.c
index e92132ad19a..cb6bc6f531a 100644
--- a/board/maxbcm/maxbcm.c
+++ b/board/maxbcm/maxbcm.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <asm/u-boot.h>
 #include <linux/mbus.h>
 
 #include "../drivers/ddr/marvell/axp/ddr3_hw_training.h"
diff --git a/board/mediatek/mt7622/mt7622_rfb.c b/board/mediatek/mt7622/mt7622_rfb.c
index 0504d6177fd..021bbb55cfe 100644
--- a/board/mediatek/mt7622/mt7622_rfb.c
+++ b/board/mediatek/mt7622/mt7622_rfb.c
@@ -9,6 +9,7 @@
 #include <env.h>
 #include <init.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/mediatek/mt7623/mt7623_rfb.c b/board/mediatek/mt7623/mt7623_rfb.c
index 090270b20d1..180f55f65d7 100644
--- a/board/mediatek/mt7623/mt7623_rfb.c
+++ b/board/mediatek/mt7623/mt7623_rfb.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <mmc.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/mediatek/mt7629/mt7629_rfb.c b/board/mediatek/mt7629/mt7629_rfb.c
index d1bca6d62ef..b376a00fb95 100644
--- a/board/mediatek/mt7629/mt7629_rfb.c
+++ b/board/mediatek/mt7629/mt7629_rfb.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/mediatek/mt8512/mt8512.c b/board/mediatek/mt8512/mt8512.c
index ac3adb80122..dc369aba8ec 100644
--- a/board/mediatek/mt8512/mt8512.c
+++ b/board/mediatek/mt8512/mt8512.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <wdt.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/mediatek/mt8518/mt8518_ap1.c b/board/mediatek/mt8518/mt8518_ap1.c
index 5a300821c9b..23480167b95 100644
--- a/board/mediatek/mt8518/mt8518_ap1.c
+++ b/board/mediatek/mt8518/mt8518_ap1.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <log.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/printk.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/mediatek/pumpkin/pumpkin.c b/board/mediatek/pumpkin/pumpkin.c
index 666e4d6a26f..0020fd6b33c 100644
--- a/board/mediatek/pumpkin/pumpkin.c
+++ b/board/mediatek/pumpkin/pumpkin.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <asm/u-boot.h>
 
 int board_init(void)
 {
diff --git a/board/menlo/m53menlo/m53menlo.c b/board/menlo/m53menlo/m53menlo.c
index eee12ccdc68..4c7fd84e281 100644
--- a/board/menlo/m53menlo/m53menlo.c
+++ b/board/menlo/m53menlo/m53menlo.c
@@ -27,6 +27,7 @@
 #include <gzip.h>
 #include <i2c.h>
 #include <ipu_pixfmt.h>
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/fb.h>
diff --git a/board/microchip/mpfs_icicle/mpfs_icicle.c b/board/microchip/mpfs_icicle/mpfs_icicle.c
index 8381361ec36..7ab3788f232 100644
--- a/board/microchip/mpfs_icicle/mpfs_icicle.c
+++ b/board/microchip/mpfs_icicle/mpfs_icicle.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <init.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 
 #define MPFS_SYSREG_SOFT_RESET	((unsigned int *)0x20002088)
 
diff --git a/board/mikrotik/crs3xx-98dx3236/crs3xx-98dx3236.c b/board/mikrotik/crs3xx-98dx3236/crs3xx-98dx3236.c
index 315169ba661..9993e006f6e 100644
--- a/board/mikrotik/crs3xx-98dx3236/crs3xx-98dx3236.c
+++ b/board/mikrotik/crs3xx-98dx3236/crs3xx-98dx3236.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <asm/global_data.h>
 #include <asm/gpio.h>
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/mbus.h>
 #include <linux/io.h>
diff --git a/board/mini-box/picosam9g45/picosam9g45.c b/board/mini-box/picosam9g45/picosam9g45.c
index 5d6cb24966d..d4af394670c 100644
--- a/board/mini-box/picosam9g45/picosam9g45.c
+++ b/board/mini-box/picosam9g45/picosam9g45.c
@@ -22,6 +22,7 @@
 #include <asm/arch/gpio.h>
 #include <asm/arch/clk.h>
 #include <lcd.h>
+#include <asm/u-boot.h>
 #include <linux/mtd/rawnand.h>
 #include <atmel_lcdc.h>
 #include <atmel_mci.h>
diff --git a/board/mpc8308_p1m/mpc8308_p1m.c b/board/mpc8308_p1m/mpc8308_p1m.c
index 87607bd4898..1a44e2df47f 100644
--- a/board/mpc8308_p1m/mpc8308_p1m.c
+++ b/board/mpc8308_p1m/mpc8308_p1m.c
@@ -8,6 +8,7 @@
 #include <i2c.h>
 #include <init.h>
 #include <net.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
diff --git a/board/mscc/jr2/jr2.c b/board/mscc/jr2/jr2.c
index 2aca78ac794..c61e44ee8b4 100644
--- a/board/mscc/jr2/jr2.c
+++ b/board/mscc/jr2/jr2.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <led.h>
 #include <miiphy.h>
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/string.h>
diff --git a/board/mscc/luton/luton.c b/board/mscc/luton/luton.c
index ebb9060f3d7..584062c9ee9 100644
--- a/board/mscc/luton/luton.c
+++ b/board/mscc/luton/luton.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <led.h>
 #include <miiphy.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 
 enum {
diff --git a/board/mscc/ocelot/ocelot.c b/board/mscc/ocelot/ocelot.c
index d26b93f12bd..ace20caf10e 100644
--- a/board/mscc/ocelot/ocelot.c
+++ b/board/mscc/ocelot/ocelot.c
@@ -15,6 +15,7 @@
 #include <led.h>
 #include <wait_bit.h>
 #include <miiphy.h>
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/printk.h>
 #include <linux/string.h>
diff --git a/board/mscc/serval/serval.c b/board/mscc/serval/serval.c
index 0da835828f8..d7b42d177a7 100644
--- a/board/mscc/serval/serval.c
+++ b/board/mscc/serval/serval.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <led.h>
 #include <miiphy.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 
 enum {
diff --git a/board/mscc/servalt/servalt.c b/board/mscc/servalt/servalt.c
index 818863a5df5..123b69e9981 100644
--- a/board/mscc/servalt/servalt.c
+++ b/board/mscc/servalt/servalt.c
@@ -9,6 +9,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <led.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 
 enum {
diff --git a/board/nokia/rx51/rx51.c b/board/nokia/rx51/rx51.c
index 20d82447b01..e58bf3acc2e 100644
--- a/board/nokia/rx51/rx51.c
+++ b/board/nokia/rx51/rx51.c
@@ -38,6 +38,7 @@
 #include <asm/arch/mux.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/mmc_host_def.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 
 #include "rx51.h"
diff --git a/board/novtech/meerkat96/meerkat96.c b/board/novtech/meerkat96/meerkat96.c
index 1edebe5db9b..388f8630be1 100644
--- a/board/novtech/meerkat96/meerkat96.c
+++ b/board/novtech/meerkat96/meerkat96.c
@@ -13,6 +13,7 @@
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/io.h>
 #include <common.h>
+#include <asm/u-boot.h>
 #include <linux/sizes.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/nvidia/p2371-2180/p2371-2180.c b/board/nvidia/p2371-2180/p2371-2180.c
index 0f4796b559b..4631fa21f5b 100644
--- a/board/nvidia/p2371-2180/p2371-2180.c
+++ b/board/nvidia/p2371-2180/p2371-2180.c
@@ -10,6 +10,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <net.h>
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/libfdt.h>
 #include <asm/arch/gpio.h>
diff --git a/board/nvidia/p2771-0000/p2771-0000.c b/board/nvidia/p2771-0000/p2771-0000.c
index e96edcc1c91..14b151d8a16 100644
--- a/board/nvidia/p2771-0000/p2771-0000.c
+++ b/board/nvidia/p2771-0000/p2771-0000.c
@@ -9,6 +9,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <net.h>
+#include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <asm/arch-tegra/cboot.h>
 #include <linux/string.h>
diff --git a/board/nvidia/p3450-0000/p3450-0000.c b/board/nvidia/p3450-0000/p3450-0000.c
index 2a16b1e3b46..e40644388ec 100644
--- a/board/nvidia/p3450-0000/p3450-0000.c
+++ b/board/nvidia/p3450-0000/p3450-0000.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <fdtdec.h>
 #include <i2c.h>
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/libfdt.h>
 #include <pca953x.h>
diff --git a/board/olimex/mx23_olinuxino/mx23_olinuxino.c b/board/olimex/mx23_olinuxino/mx23_olinuxino.c
index d1e189cbb6e..bfaf18fca47 100644
--- a/board/olimex/mx23_olinuxino/mx23_olinuxino.c
+++ b/board/olimex/mx23_olinuxino/mx23_olinuxino.c
@@ -17,6 +17,7 @@
 #ifdef CONFIG_LED_STATUS
 #include <status_led.h>
 #endif
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/phytec/pcl063/pcl063.c b/board/phytec/pcl063/pcl063.c
index b2e435f6908..9051a0ca0d3 100644
--- a/board/phytec/pcl063/pcl063.c
+++ b/board/phytec/pcl063/pcl063.c
@@ -15,6 +15,7 @@
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/mach-imx/mxc_i2c.h>
 #include <fsl_esdhc_imx.h>
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <miiphy.h>
 #include <netdev.h>
diff --git a/board/phytec/pcl063/spl.c b/board/phytec/pcl063/spl.c
index fea4aa33655..175223dbc75 100644
--- a/board/phytec/pcl063/spl.c
+++ b/board/phytec/pcl063/spl.c
@@ -16,6 +16,7 @@
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/sys_proto.h>
 #include <fsl_esdhc_imx.h>
+#include <asm/u-boot.h>
 
 /* Configuration for Micron MT41K256M16TW-107 IT:P, 32M x 16 x 8 -> 256MiB */
 
diff --git a/board/phytec/pcm052/pcm052.c b/board/phytec/pcm052/pcm052.c
index f9cf4abd474..ce545cfa844 100644
--- a/board/phytec/pcm052/pcm052.c
+++ b/board/phytec/pcm052/pcm052.c
@@ -18,6 +18,7 @@
 #include <env.h>
 #include <led.h>
 #include <miiphy.h>
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/phytec/pcm058/pcm058.c b/board/phytec/pcm058/pcm058.c
index a2304b764d6..dd8c91c176d 100644
--- a/board/phytec/pcm058/pcm058.c
+++ b/board/phytec/pcm058/pcm058.c
@@ -18,6 +18,7 @@
 #include <asm/mach-imx/boot_mode.h>
 #include <asm/arch/sys_proto.h>
 #include <dm.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/phytec/pfla02/pfla02.c b/board/phytec/pfla02/pfla02.c
index 996fcedfa2c..225fdd55cc5 100644
--- a/board/phytec/pfla02/pfla02.c
+++ b/board/phytec/pfla02/pfla02.c
@@ -21,6 +21,7 @@
 #include <asm/mach-imx/mxc_i2c.h>
 #include <asm/mach-imx/spi.h>
 #include <env.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
diff --git a/board/phytec/phycore_am335x_r2/board.c b/board/phytec/phycore_am335x_r2/board.c
index 5ca94152049..19c1033c9d7 100644
--- a/board/phytec/phycore_am335x_r2/board.c
+++ b/board/phytec/phycore_am335x_r2/board.c
@@ -18,6 +18,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <power/tps65910.h>
 #include <jffs2/load_kernel.h>
 #include <mtd_node.h>
diff --git a/board/phytium/durian/durian.c b/board/phytium/durian/durian.c
index 8a82a4591ac..4b588206c22 100644
--- a/board/phytium/durian/durian.c
+++ b/board/phytium/durian/durian.c
@@ -15,6 +15,7 @@
 #include <asm/global_data.h>
 #include <asm/system.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 #include <linux/arm-smccc.h>
 #include <linux/kernel.h>
 #include <scsi.h>
diff --git a/board/ppcag/bg0900/bg0900.c b/board/ppcag/bg0900/bg0900.c
index 578f5c73b6c..5fe7ed9a3a8 100644
--- a/board/ppcag/bg0900/bg0900.c
+++ b/board/ppcag/bg0900/bg0900.c
@@ -15,6 +15,7 @@
 #include <asm/arch/iomux-mx28.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/mii.h>
 #include <miiphy.h>
diff --git a/board/qemu-mips/qemu-mips.c b/board/qemu-mips/qemu-mips.c
index f57091739ec..21437168044 100644
--- a/board/qemu-mips/qemu-mips.c
+++ b/board/qemu-mips/qemu-mips.c
@@ -12,6 +12,7 @@
 #include <asm/mipsregs.h>
 #include <asm/io.h>
 #include <netdev.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/qualcomm/dragonboard410c/dragonboard410c.c b/board/qualcomm/dragonboard410c/dragonboard410c.c
index 1aa67f96d3d..bac8b1ff899 100644
--- a/board/qualcomm/dragonboard410c/dragonboard410c.c
+++ b/board/qualcomm/dragonboard410c/dragonboard410c.c
@@ -18,6 +18,7 @@
 #include <fdt_support.h>
 #include <asm/arch/dram.h>
 #include <asm/arch/misc.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 
diff --git a/board/qualcomm/dragonboard820c/dragonboard820c.c b/board/qualcomm/dragonboard820c/dragonboard820c.c
index 877e34c2101..847022939d0 100644
--- a/board/qualcomm/dragonboard820c/dragonboard820c.c
+++ b/board/qualcomm/dragonboard820c/dragonboard820c.c
@@ -11,6 +11,7 @@
 #include <env.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/arm-smccc.h>
 #include <linux/psci.h>
 #include <common.h>
diff --git a/board/raidsonic/ib62x0/ib62x0.c b/board/raidsonic/ib62x0/ib62x0.c
index f9bc07649e0..afbfdd997a1 100644
--- a/board/raidsonic/ib62x0/ib62x0.c
+++ b/board/raidsonic/ib62x0/ib62x0.c
@@ -14,6 +14,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
 #include <asm/arch/mpp.h>
+#include <asm/u-boot.h>
 #include "ib62x0.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c
index 6b1fa5fc144..e76fc2cca94 100644
--- a/board/raspberrypi/rpi/rpi.c
+++ b/board/raspberrypi/rpi/rpi.c
@@ -19,6 +19,7 @@
 #include <asm/arch/msg.h>
 #include <asm/arch/sdhci.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <dm/platform_data/serial_bcm283x_mu.h>
 #ifdef CONFIG_ARM64
 #include <asm/armv8/mmu.h>
diff --git a/board/renesas/MigoR/migo_r.c b/board/renesas/MigoR/migo_r.c
index f2f4c657534..61564a2f50f 100644
--- a/board/renesas/MigoR/migo_r.c
+++ b/board/renesas/MigoR/migo_r.c
@@ -15,6 +15,7 @@
 #include <netdev.h>
 #include <asm/io.h>
 #include <asm/processor.h>
+#include <asm/u-boot.h>
 
 int checkboard(void)
 {
diff --git a/board/renesas/alt/alt.c b/board/renesas/alt/alt.c
index 854c47636d3..97379858e4f 100644
--- a/board/renesas/alt/alt.c
+++ b/board/renesas/alt/alt.c
@@ -13,6 +13,7 @@
 #include <malloc.h>
 #include <dm.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <dm/platform_data/serial_sh.h>
 #include <env_internal.h>
 #include <asm/processor.h>
diff --git a/board/renesas/blanche/blanche.c b/board/renesas/blanche/blanche.c
index 9671382f2a3..77d4cc8bd6c 100644
--- a/board/renesas/blanche/blanche.c
+++ b/board/renesas/blanche/blanche.c
@@ -21,6 +21,7 @@
 #include <asm/mach-types.h>
 #include <asm/processor.h>
 #include <dm.h>
+#include <asm/u-boot.h>
 #include <dm/platform_data/serial_sh.h>
 #include <env.h>
 #include <hang.h>
diff --git a/board/renesas/condor/condor.c b/board/renesas/condor/condor.c
index 99e7dd6e1e1..f9c3f324f83 100644
--- a/board/renesas/condor/condor.c
+++ b/board/renesas/condor/condor.c
@@ -14,6 +14,7 @@
 #include <asm/processor.h>
 #include <asm/mach-types.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <asm/arch/sys_proto.h>
 
diff --git a/board/renesas/draak/draak.c b/board/renesas/draak/draak.c
index bc4ce95a727..643bfce33ad 100644
--- a/board/renesas/draak/draak.c
+++ b/board/renesas/draak/draak.c
@@ -14,6 +14,7 @@
 #include <netdev.h>
 #include <dm.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <dm/platform_data/serial_sh.h>
 #include <asm/processor.h>
 #include <asm/mach-types.h>
diff --git a/board/renesas/eagle/eagle.c b/board/renesas/eagle/eagle.c
index f9e553feaa7..a6602a52506 100644
--- a/board/renesas/eagle/eagle.c
+++ b/board/renesas/eagle/eagle.c
@@ -14,6 +14,7 @@
 #include <netdev.h>
 #include <dm.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <dm/platform_data/serial_sh.h>
 #include <asm/processor.h>
 #include <asm/mach-types.h>
diff --git a/board/renesas/ebisu/ebisu.c b/board/renesas/ebisu/ebisu.c
index 620d250284a..a01ae27e5b2 100644
--- a/board/renesas/ebisu/ebisu.c
+++ b/board/renesas/ebisu/ebisu.c
@@ -14,6 +14,7 @@
 #include <netdev.h>
 #include <dm.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <dm/platform_data/serial_sh.h>
 #include <asm/processor.h>
 #include <asm/mach-types.h>
diff --git a/board/renesas/gose/gose.c b/board/renesas/gose/gose.c
index 56cdc73b1a7..5841da94fc1 100644
--- a/board/renesas/gose/gose.c
+++ b/board/renesas/gose/gose.c
@@ -13,6 +13,7 @@
 #include <malloc.h>
 #include <dm.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <dm/platform_data/serial_sh.h>
 #include <env_internal.h>
 #include <asm/processor.h>
diff --git a/board/renesas/grpeach/grpeach.c b/board/renesas/grpeach/grpeach.c
index ac989eb29c2..22b53743315 100644
--- a/board/renesas/grpeach/grpeach.c
+++ b/board/renesas/grpeach/grpeach.c
@@ -10,6 +10,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/u-boot.h>
 
 #define RZA1_WDT_BASE	0xfcfe0000
 #define WTCSR		0x00
diff --git a/board/renesas/koelsch/koelsch.c b/board/renesas/koelsch/koelsch.c
index b0a66ea2669..e20fed98631 100644
--- a/board/renesas/koelsch/koelsch.c
+++ b/board/renesas/koelsch/koelsch.c
@@ -14,6 +14,7 @@
 #include <malloc.h>
 #include <dm.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <dm/platform_data/serial_sh.h>
 #include <env_internal.h>
 #include <asm/processor.h>
diff --git a/board/renesas/lager/lager.c b/board/renesas/lager/lager.c
index add4eef3d53..636a7b27747 100644
--- a/board/renesas/lager/lager.c
+++ b/board/renesas/lager/lager.c
@@ -17,6 +17,7 @@
 #include <netdev.h>
 #include <dm.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <dm/platform_data/serial_sh.h>
 #include <asm/processor.h>
 #include <asm/mach-types.h>
diff --git a/board/renesas/porter/porter.c b/board/renesas/porter/porter.c
index b3e4c08d74d..368cf9550a3 100644
--- a/board/renesas/porter/porter.c
+++ b/board/renesas/porter/porter.c
@@ -14,6 +14,7 @@
 #include <malloc.h>
 #include <dm.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <dm/platform_data/serial_sh.h>
 #include <env_internal.h>
 #include <asm/processor.h>
diff --git a/board/renesas/r2dplus/r2dplus.c b/board/renesas/r2dplus/r2dplus.c
index 4b9959a4326..e637b4f9876 100644
--- a/board/renesas/r2dplus/r2dplus.c
+++ b/board/renesas/r2dplus/r2dplus.c
@@ -11,6 +11,7 @@
 #include <netdev.h>
 #include <asm/processor.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 
 int checkboard(void)
 {
diff --git a/board/renesas/r7780mp/r7780mp.c b/board/renesas/r7780mp/r7780mp.c
index 422381ca780..28c99bf5854 100644
--- a/board/renesas/r7780mp/r7780mp.c
+++ b/board/renesas/r7780mp/r7780mp.c
@@ -12,6 +12,7 @@
 #include <asm/io.h>
 #include <asm/pci.h>
 #include <netdev.h>
+#include <asm/u-boot.h>
 #include "r7780mp.h"
 
 int checkboard(void)
diff --git a/board/renesas/rcar-common/common.c b/board/renesas/rcar-common/common.c
index 1d645a82aaf..4f56627b812 100644
--- a/board/renesas/rcar-common/common.c
+++ b/board/renesas/rcar-common/common.c
@@ -11,6 +11,7 @@
 #include <dm.h>
 #include <init.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <dm/uclass-internal.h>
 #include <asm/arch/rmobile.h>
 #include <linux/libfdt.h>
diff --git a/board/renesas/rcar-common/gen3-spl.c b/board/renesas/rcar-common/gen3-spl.c
index fd6e5054a6d..aecc053dc10 100644
--- a/board/renesas/rcar-common/gen3-spl.c
+++ b/board/renesas/rcar-common/gen3-spl.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <asm/io.h>
 #include <spl.h>
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 
 #define RCAR_CNTC_BASE	0xE6080000
diff --git a/board/renesas/salvator-x/salvator-x.c b/board/renesas/salvator-x/salvator-x.c
index 30596822299..8da12ea9010 100644
--- a/board/renesas/salvator-x/salvator-x.c
+++ b/board/renesas/salvator-x/salvator-x.c
@@ -15,6 +15,7 @@
 #include <netdev.h>
 #include <dm.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <dm/platform_data/serial_sh.h>
 #include <asm/processor.h>
 #include <asm/mach-types.h>
diff --git a/board/renesas/sh7752evb/sh7752evb.c b/board/renesas/sh7752evb/sh7752evb.c
index 07c51e7147e..4df154a2a91 100644
--- a/board/renesas/sh7752evb/sh7752evb.c
+++ b/board/renesas/sh7752evb/sh7752evb.c
@@ -15,6 +15,7 @@
 #include <asm/mmc.h>
 #include <spi.h>
 #include <spi_flash.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 
diff --git a/board/renesas/sh7753evb/sh7753evb.c b/board/renesas/sh7753evb/sh7753evb.c
index 8f6f2eee904..de719983979 100644
--- a/board/renesas/sh7753evb/sh7753evb.c
+++ b/board/renesas/sh7753evb/sh7753evb.c
@@ -15,6 +15,7 @@
 #include <asm/mmc.h>
 #include <spi.h>
 #include <spi_flash.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 
diff --git a/board/renesas/sh7757lcr/sh7757lcr.c b/board/renesas/sh7757lcr/sh7757lcr.c
index a81bdbf9cdc..2adca5dc6dc 100644
--- a/board/renesas/sh7757lcr/sh7757lcr.c
+++ b/board/renesas/sh7757lcr/sh7757lcr.c
@@ -15,6 +15,7 @@
 #include <asm/mmc.h>
 #include <spi.h>
 #include <spi_flash.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 
 int checkboard(void)
diff --git a/board/renesas/sh7763rdp/sh7763rdp.c b/board/renesas/sh7763rdp/sh7763rdp.c
index 73a53c1e5ac..35c77be1bca 100644
--- a/board/renesas/sh7763rdp/sh7763rdp.c
+++ b/board/renesas/sh7763rdp/sh7763rdp.c
@@ -11,6 +11,7 @@
 #include <init.h>
 #include <asm/io.h>
 #include <asm/processor.h>
+#include <asm/u-boot.h>
 
 #define CPU_CMDREG	0xB1000006
 #define PDCR        0xffef0006
diff --git a/board/renesas/silk/silk.c b/board/renesas/silk/silk.c
index 05af5f4d68b..c2667bb9c8a 100644
--- a/board/renesas/silk/silk.c
+++ b/board/renesas/silk/silk.c
@@ -14,6 +14,7 @@
 #include <malloc.h>
 #include <dm.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <dm/platform_data/serial_sh.h>
 #include <env_internal.h>
 #include <asm/processor.h>
diff --git a/board/renesas/stout/stout.c b/board/renesas/stout/stout.c
index 3fdf936ddca..163137a65c6 100644
--- a/board/renesas/stout/stout.c
+++ b/board/renesas/stout/stout.c
@@ -15,6 +15,7 @@
 #include <netdev.h>
 #include <dm.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <dm/platform_data/serial_sh.h>
 #include <env_internal.h>
 #include <asm/processor.h>
diff --git a/board/renesas/ulcb/ulcb.c b/board/renesas/ulcb/ulcb.c
index 09711559aef..0bec9954c36 100644
--- a/board/renesas/ulcb/ulcb.c
+++ b/board/renesas/ulcb/ulcb.c
@@ -13,6 +13,7 @@
 #include <netdev.h>
 #include <dm.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <dm/platform_data/serial_sh.h>
 #include <asm/processor.h>
 #include <asm/mach-types.h>
diff --git a/board/ronetix/pm9261/pm9261.c b/board/ronetix/pm9261/pm9261.c
index 5be2c5e192b..b5b79b28391 100644
--- a/board/ronetix/pm9261/pm9261.c
+++ b/board/ronetix/pm9261/pm9261.c
@@ -11,6 +11,7 @@
 #include <init.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/sizes.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
diff --git a/board/ronetix/pm9263/pm9263.c b/board/ronetix/pm9263/pm9263.c
index 95c0dec4db5..ec73ced7604 100644
--- a/board/ronetix/pm9263/pm9263.c
+++ b/board/ronetix/pm9263/pm9263.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <init.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/sizes.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
diff --git a/board/ronetix/pm9g45/pm9g45.c b/board/ronetix/pm9g45/pm9g45.c
index 8d5825c7f13..fa0d9f2467e 100644
--- a/board/ronetix/pm9g45/pm9g45.c
+++ b/board/ronetix/pm9g45/pm9g45.c
@@ -13,6 +13,7 @@
 #include <common.h>
 #include <init.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/sizes.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
diff --git a/board/samsung/arndale/arndale.c b/board/samsung/arndale/arndale.c
index 2742a7f32b2..d1525b4a856 100644
--- a/board/samsung/arndale/arndale.c
+++ b/board/samsung/arndale/arndale.c
@@ -13,6 +13,7 @@
 #include <asm/arch/pinmux.h>
 #include <asm/arch/dwmmc.h>
 #include <asm/arch/power.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/samsung/common/board.c b/board/samsung/common/board.c
index 9eea11f755b..ae66bc73fd1 100644
--- a/board/samsung/common/board.c
+++ b/board/samsung/common/board.c
@@ -33,6 +33,7 @@
 #include <stdio_dev.h>
 #include <usb.h>
 #include <dwc3-uboot.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <samsung/misc.h>
 #include <dm/pinctrl.h>
diff --git a/board/samsung/goni/goni.c b/board/samsung/goni/goni.c
index 5fb01bba055..1631e68e713 100644
--- a/board/samsung/goni/goni.c
+++ b/board/samsung/goni/goni.c
@@ -12,6 +12,7 @@
 #include <asm/gpio.h>
 #include <asm/arch/mmc.h>
 #include <dm.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/printk.h>
 #include <power/pmic.h>
diff --git a/board/samsung/smdkc100/smdkc100.c b/board/samsung/smdkc100/smdkc100.c
index 69ed715403f..f343a6f9dfe 100644
--- a/board/samsung/smdkc100/smdkc100.c
+++ b/board/samsung/smdkc100/smdkc100.c
@@ -14,6 +14,7 @@
 #include <asm/arch/sromc.h>
 #include <netdev.h>
 #include <asm/mach-types.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/samsung/smdkv310/smdkv310.c b/board/samsung/smdkv310/smdkv310.c
index 8811cbb9ad0..0be4ddf92d8 100644
--- a/board/samsung/smdkv310/smdkv310.c
+++ b/board/samsung/smdkv310/smdkv310.c
@@ -16,6 +16,7 @@
 #include <asm/arch/periph.h>
 #include <asm/arch/pinmux.h>
 #include <asm/arch/sromc.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/samsung/universal_c210/universal.c b/board/samsung/universal_c210/universal.c
index 9ef11b8471c..732f70f576c 100644
--- a/board/samsung/universal_c210/universal.c
+++ b/board/samsung/universal_c210/universal.c
@@ -17,6 +17,7 @@
 #include <asm/arch/pinmux.h>
 #include <asm/arch/watchdog.h>
 #include <ld9040.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <power/pmic.h>
 #include <usb.h>
diff --git a/board/sandbox/sandbox.c b/board/sandbox/sandbox.c
index b1bed64910c..9773074d088 100644
--- a/board/sandbox/sandbox.c
+++ b/board/sandbox/sandbox.c
@@ -15,6 +15,7 @@
 #include <asm/global_data.h>
 #include <asm/test.h>
 #include <asm/u-boot-sandbox.h>
+#include <asm/u-boot.h>
 
 /*
  * Pointer to initial global data area
diff --git a/board/sandisk/sansa_fuze_plus/sfp.c b/board/sandisk/sansa_fuze_plus/sfp.c
index f46b02e38e5..c6cce3b3fa6 100644
--- a/board/sandisk/sansa_fuze_plus/sfp.c
+++ b/board/sandisk/sansa_fuze_plus/sfp.c
@@ -20,6 +20,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/sbc8349/sbc8349.c b/board/sbc8349/sbc8349.c
index b440a0b17e9..7e1beeafa6c 100644
--- a/board/sbc8349/sbc8349.c
+++ b/board/sbc8349/sbc8349.c
@@ -21,6 +21,7 @@
 #if defined(CONFIG_OF_LIBFDT)
 #include <linux/libfdt.h>
 #endif
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/sbc8548/law.c b/board/sbc8548/law.c
index 97271ea6f66..af281d338f0 100644
--- a/board/sbc8548/law.c
+++ b/board/sbc8548/law.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
+#include <asm/u-boot.h>
 
 /*
  * LAW(Local Access Window) configuration:
diff --git a/board/sbc8548/sbc8548.c b/board/sbc8548/sbc8548.c
index 13a66507ffc..b3c1da920a8 100644
--- a/board/sbc8548/sbc8548.c
+++ b/board/sbc8548/sbc8548.c
@@ -24,6 +24,7 @@
 #include <netdev.h>
 #include <tsec.h>
 #include <miiphy.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
diff --git a/board/sbc8548/tlb.c b/board/sbc8548/tlb.c
index 8ad01d10e49..4fcc1f2710c 100644
--- a/board/sbc8548/tlb.c
+++ b/board/sbc8548/tlb.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <asm/mmu.h>
+#include <asm/u-boot.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/sbc8641d/law.c b/board/sbc8641d/law.c
index dc4696d123f..446d63bf1f0 100644
--- a/board/sbc8641d/law.c
+++ b/board/sbc8641d/law.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
+#include <asm/u-boot.h>
 
 /*
  * LAW (Local Access Window) configuration:
diff --git a/board/sbc8641d/sbc8641d.c b/board/sbc8641d/sbc8641d.c
index a67092daf47..cc17f80d07d 100644
--- a/board/sbc8641d/sbc8641d.c
+++ b/board/sbc8641d/sbc8641d.c
@@ -22,6 +22,7 @@
 #include <asm/fsl_pci.h>
 #include <fsl_ddr_sdram.h>
 #include <asm/fsl_serdes.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
diff --git a/board/schulercontrol/sc_sps_1/sc_sps_1.c b/board/schulercontrol/sc_sps_1/sc_sps_1.c
index 3a04b1a634c..a5b25b60fc4 100644
--- a/board/schulercontrol/sc_sps_1/sc_sps_1.c
+++ b/board/schulercontrol/sc_sps_1/sc_sps_1.c
@@ -16,6 +16,7 @@
 #include <asm/arch/iomux-mx28.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/u-boot.h>
 #include <linux/mii.h>
 #include <miiphy.h>
 #include <netdev.h>
diff --git a/board/seco/mx6quq7/mx6quq7.c b/board/seco/mx6quq7/mx6quq7.c
index a061d7d8afb..138c6e04291 100644
--- a/board/seco/mx6quq7/mx6quq7.c
+++ b/board/seco/mx6quq7/mx6quq7.c
@@ -14,6 +14,7 @@
 #include <asm/arch/iomux.h>
 #include <asm/arch/mx6-pins.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
diff --git a/board/siemens/capricorn/board.c b/board/siemens/capricorn/board.c
index 6f34bd73f0d..03418707a85 100644
--- a/board/siemens/capricorn/board.c
+++ b/board/siemens/capricorn/board.c
@@ -27,6 +27,7 @@
 #ifndef CONFIG_SPL
 #include <asm/arch-imx8/clock.h>
 #endif
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 #include "../common/factoryset.h"
diff --git a/board/siemens/capricorn/spl.c b/board/siemens/capricorn/spl.c
index da893629172..d81764832de 100644
--- a/board/siemens/capricorn/spl.c
+++ b/board/siemens/capricorn/spl.c
@@ -10,6 +10,7 @@
 #include <spl.h>
 #include <dm.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <dm/uclass.h>
 #include <dm/device.h>
 #include <dm/uclass-internal.h>
diff --git a/board/siemens/common/board.c b/board/siemens/common/board.c
index 19f27f6805a..db063659a47 100644
--- a/board/siemens/common/board.c
+++ b/board/siemens/common/board.c
@@ -34,6 +34,7 @@
 #include <cpsw.h>
 #include <watchdog.h>
 #include <asm/mach-types.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 #include "../common/factoryset.h"
 
diff --git a/board/siemens/corvus/board.c b/board/siemens/corvus/board.c
index 2acd3226cf2..fbccbb0f6da 100644
--- a/board/siemens/corvus/board.c
+++ b/board/siemens/corvus/board.c
@@ -31,6 +31,7 @@
 #include <netdev.h>
 #endif
 #include <spi.h>
+#include <asm/u-boot.h>
 
 #ifdef CONFIG_USB_GADGET_ATMEL_USBA
 #include <asm/arch/atmel_usba_udc.h>
diff --git a/board/siemens/draco/board.c b/board/siemens/draco/board.c
index b512bdbfabf..2c15cfdda3f 100644
--- a/board/siemens/draco/board.c
+++ b/board/siemens/draco/board.c
@@ -35,6 +35,7 @@
 #include <miiphy.h>
 #include <cpsw.h>
 #include <watchdog.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include "board.h"
 #include "../common/factoryset.h"
diff --git a/board/siemens/pxm2/board.c b/board/siemens/pxm2/board.c
index 7f36848b265..8ab3610da7d 100644
--- a/board/siemens/pxm2/board.c
+++ b/board/siemens/pxm2/board.c
@@ -28,6 +28,7 @@
 #include <asm/arch/gpio.h>
 #include <asm/arch/mmc_host_def.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 #include "../../../drivers/video/da8xx-fb.h"
 #include <asm/io.h>
diff --git a/board/siemens/rut/board.c b/board/siemens/rut/board.c
index 22d8c40a53b..84053b10d84 100644
--- a/board/siemens/rut/board.c
+++ b/board/siemens/rut/board.c
@@ -34,6 +34,7 @@
 #include <cpsw.h>
 #include <video.h>
 #include <watchdog.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 #include "board.h"
diff --git a/board/siemens/smartweb/smartweb.c b/board/siemens/smartweb/smartweb.c
index d500a6214d5..f3415e54517 100644
--- a/board/siemens/smartweb/smartweb.c
+++ b/board/siemens/smartweb/smartweb.c
@@ -32,6 +32,7 @@
 #include <asm/arch/gpio.h>
 #include <asm/gpio.h>
 #include <watchdog.h>
+#include <asm/u-boot.h>
 # include <net.h>
 #ifndef CONFIG_DM_ETH
 # include <netdev.h>
diff --git a/board/siemens/taurus/taurus.c b/board/siemens/taurus/taurus.c
index cad16f90656..3fb7d6bca22 100644
--- a/board/siemens/taurus/taurus.c
+++ b/board/siemens/taurus/taurus.c
@@ -28,6 +28,7 @@
 #include <asm/arch/atmel_serial.h>
 #include <asm/arch/clk.h>
 #include <asm/gpio.h>
+#include <asm/u-boot.h>
 #include <linux/mtd/rawnand.h>
 #include <atmel_mci.h>
 #include <asm/arch/at91_spi.h>
diff --git a/board/sifive/fu540/fu540.c b/board/sifive/fu540/fu540.c
index 57753ba50ba..3542bd1ecab 100644
--- a/board/sifive/fu540/fu540.c
+++ b/board/sifive/fu540/fu540.c
@@ -10,6 +10,7 @@
 #include <env.h>
 #include <init.h>
 #include <log.h>
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/bug.h>
 #include <linux/delay.h>
diff --git a/board/sipeed/maix/maix.c b/board/sipeed/maix/maix.c
index cbcb23cf5c2..7b7face393d 100644
--- a/board/sipeed/maix/maix.c
+++ b/board/sipeed/maix/maix.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <fdt_support.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 
 phys_size_t get_effective_memsize(void)
 {
diff --git a/board/sks-kinkel/sksimx6/sksimx6.c b/board/sks-kinkel/sksimx6/sksimx6.c
index bfe4634fdd7..cbf3a5952be 100644
--- a/board/sks-kinkel/sksimx6/sksimx6.c
+++ b/board/sks-kinkel/sksimx6/sksimx6.c
@@ -12,6 +12,7 @@
 #include <asm/arch/iomux.h>
 #include <asm/arch/mx6-pins.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
diff --git a/board/socrates/law.c b/board/socrates/law.c
index 840941b63e5..5010e0cee36 100644
--- a/board/socrates/law.c
+++ b/board/socrates/law.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
+#include <asm/u-boot.h>
 
 /*
  * LAW(Local Access Window) configuration:
diff --git a/board/socrates/socrates.c b/board/socrates/socrates.c
index 0c9262d3540..711ddcf256e 100644
--- a/board/socrates/socrates.c
+++ b/board/socrates/socrates.c
@@ -21,6 +21,7 @@
 #include <asm/immap_85xx.h>
 #include <ioports.h>
 #include <flash.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
diff --git a/board/socrates/tlb.c b/board/socrates/tlb.c
index de80c3c0e57..4dc0f7dbcda 100644
--- a/board/socrates/tlb.c
+++ b/board/socrates/tlb.c
@@ -11,6 +11,7 @@
 
 #include <common.h>
 #include <asm/mmu.h>
+#include <asm/u-boot.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/softing/vining_2000/vining_2000.c b/board/softing/vining_2000/vining_2000.c
index 1c5863714c6..93670b7a946 100644
--- a/board/softing/vining_2000/vining_2000.c
+++ b/board/softing/vining_2000/vining_2000.c
@@ -20,6 +20,7 @@
 #include <asm/io.h>
 #include <asm/mach-imx/mxc_i2c.h>
 #include <env.h>
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/sizes.h>
diff --git a/board/softing/vining_fpga/socfpga.c b/board/softing/vining_fpga/socfpga.c
index 34ce6a13003..6eec9815f28 100644
--- a/board/softing/vining_fpga/socfpga.c
+++ b/board/softing/vining_fpga/socfpga.c
@@ -14,6 +14,7 @@
 #include <asm/io.h>
 #include <asm/gpio.h>
 #include <i2c.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 
diff --git a/board/solidrun/clearfog/clearfog.c b/board/solidrun/clearfog/clearfog.c
index a4d60e1540c..46ffc026f34 100644
--- a/board/solidrun/clearfog/clearfog.c
+++ b/board/solidrun/clearfog/clearfog.c
@@ -14,6 +14,7 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/string.h>
diff --git a/board/solidrun/mx6cuboxi/mx6cuboxi.c b/board/solidrun/mx6cuboxi/mx6cuboxi.c
index e56e32e8c84..9057ac9470a 100644
--- a/board/solidrun/mx6cuboxi/mx6cuboxi.c
+++ b/board/solidrun/mx6cuboxi/mx6cuboxi.c
@@ -24,6 +24,7 @@
 #include <asm/arch/mxc_hdmi.h>
 #include <env.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
diff --git a/board/somlabs/visionsom-6ull/visionsom-6ull.c b/board/somlabs/visionsom-6ull/visionsom-6ull.c
index 076c641d8a9..55470cd2d17 100644
--- a/board/somlabs/visionsom-6ull/visionsom-6ull.c
+++ b/board/somlabs/visionsom-6ull/visionsom-6ull.c
@@ -22,6 +22,7 @@
 #include <fsl_esdhc_imx.h>
 #include <i2c.h>
 #include <miiphy.h>
+#include <asm/u-boot.h>
 #include <linux/sizes.h>
 #include <mmc.h>
 #include <netdev.h>
diff --git a/board/spear/spear300/spear300.c b/board/spear/spear300/spear300.c
index a5945383932..1fe825182f3 100644
--- a/board/spear/spear300/spear300.c
+++ b/board/spear/spear300/spear300.c
@@ -10,6 +10,7 @@
 #include <netdev.h>
 #include <nand.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 #include <linux/mtd/fsmc_nand.h>
 #include <asm/mach-types.h>
 #include <asm/arch/hardware.h>
diff --git a/board/spear/spear310/spear310.c b/board/spear/spear310/spear310.c
index b4c3c0c5c78..721b1dd4aa5 100644
--- a/board/spear/spear310/spear310.c
+++ b/board/spear/spear310/spear310.c
@@ -11,6 +11,7 @@
 #include <netdev.h>
 #include <nand.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 #include <linux/mtd/fsmc_nand.h>
 #include <asm/mach-types.h>
 #include <asm/arch/hardware.h>
diff --git a/board/spear/spear320/spear320.c b/board/spear/spear320/spear320.c
index 291337b8049..f726f8fccf0 100644
--- a/board/spear/spear320/spear320.c
+++ b/board/spear/spear320/spear320.c
@@ -11,6 +11,7 @@
 #include <netdev.h>
 #include <nand.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 #include <linux/mtd/fsmc_nand.h>
 #include <asm/mach-types.h>
 #include <asm/arch/hardware.h>
diff --git a/board/spear/spear600/spear600.c b/board/spear/spear600/spear600.c
index 4706c52c127..0c01f1fbf9e 100644
--- a/board/spear/spear600/spear600.c
+++ b/board/spear/spear600/spear600.c
@@ -10,6 +10,7 @@
 #include <netdev.h>
 #include <nand.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 #include <linux/mtd/fsmc_nand.h>
 #include <asm/mach-types.h>
 #include <asm/arch/hardware.h>
diff --git a/board/spear/x600/x600.c b/board/spear/x600/x600.c
index 9c30581ec01..fcc7524121c 100644
--- a/board/spear/x600/x600.c
+++ b/board/spear/x600/x600.c
@@ -20,6 +20,7 @@
 #include <asm/arch/hardware.h>
 #include <asm/arch/spr_defs.h>
 #include <asm/arch/spr_misc.h>
+#include <asm/u-boot.h>
 #include <linux/mtd/fsmc_nand.h>
 #include "fpga.h"
 
diff --git a/board/st/stih410-b2260/board.c b/board/st/stih410-b2260/board.c
index b87468cca21..90eefd5cd1f 100644
--- a/board/st/stih410-b2260/board.c
+++ b/board/st/stih410-b2260/board.c
@@ -9,6 +9,7 @@
 #include <init.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/usb/otg.h>
 #include <dwc3-sti-glue.h>
 #include <dwc3-uboot.h>
diff --git a/board/st/stm32f429-discovery/stm32f429-discovery.c b/board/st/stm32f429-discovery/stm32f429-discovery.c
index 9d8fc9f5a2e..3e10eb59e0b 100644
--- a/board/st/stm32f429-discovery/stm32f429-discovery.c
+++ b/board/st/stm32f429-discovery/stm32f429-discovery.c
@@ -16,6 +16,7 @@
 #include <init.h>
 #include <log.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 
 #include <asm/io.h>
 #include <asm/arch/stm32.h>
diff --git a/board/st/stm32f429-evaluation/stm32f429-evaluation.c b/board/st/stm32f429-evaluation/stm32f429-evaluation.c
index 35e71380b89..76dd3a2a0a2 100644
--- a/board/st/stm32f429-evaluation/stm32f429-evaluation.c
+++ b/board/st/stm32f429-evaluation/stm32f429-evaluation.c
@@ -10,6 +10,7 @@
 #include <init.h>
 #include <log.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 
 #include <asm/io.h>
 #include <asm/arch/stm32.h>
diff --git a/board/st/stm32f469-discovery/stm32f469-discovery.c b/board/st/stm32f469-discovery/stm32f469-discovery.c
index fcc34e7955a..0a024ffe1c4 100644
--- a/board/st/stm32f469-discovery/stm32f469-discovery.c
+++ b/board/st/stm32f469-discovery/stm32f469-discovery.c
@@ -10,6 +10,7 @@
 #include <init.h>
 #include <log.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 
 #include <asm/io.h>
 #include <asm/arch/stm32.h>
diff --git a/board/st/stm32f746-disco/stm32f746-disco.c b/board/st/stm32f746-disco/stm32f746-disco.c
index 40450ca914b..07471d54e8e 100644
--- a/board/st/stm32f746-disco/stm32f746-disco.c
+++ b/board/st/stm32f746-disco/stm32f746-disco.c
@@ -24,6 +24,7 @@
 #include <asm/arch/gpio.h>
 #include <asm/arch/syscfg.h>
 #include <asm/gpio.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/st/stm32h743-disco/stm32h743-disco.c b/board/st/stm32h743-disco/stm32h743-disco.c
index 53bf0922197..8e43be5fa86 100644
--- a/board/st/stm32h743-disco/stm32h743-disco.c
+++ b/board/st/stm32h743-disco/stm32h743-disco.c
@@ -9,6 +9,7 @@
 #include <init.h>
 #include <log.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/st/stm32h743-eval/stm32h743-eval.c b/board/st/stm32h743-eval/stm32h743-eval.c
index 53bf0922197..8e43be5fa86 100644
--- a/board/st/stm32h743-eval/stm32h743-eval.c
+++ b/board/st/stm32h743-eval/stm32h743-eval.c
@@ -9,6 +9,7 @@
 #include <init.h>
 #include <log.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/st/stm32mp1/stm32mp1.c b/board/st/stm32mp1/stm32mp1.c
index 68c3111f518..c941628eb4c 100644
--- a/board/st/stm32mp1/stm32mp1.c
+++ b/board/st/stm32mp1/stm32mp1.c
@@ -34,6 +34,7 @@
 #include <asm/gpio.h>
 #include <asm/arch/stm32.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/u-boot.h>
 #include <jffs2/load_kernel.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/board/st/stv0991/stv0991.c b/board/st/stv0991/stv0991.c
index 72399cf5f65..e2d62a7ede9 100644
--- a/board/st/stv0991/stv0991.c
+++ b/board/st/stv0991/stv0991.c
@@ -17,6 +17,7 @@
 #include <netdev.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 #include <dm/platform_data/serial_pl01x.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/ste/stemmy/stemmy.c b/board/ste/stemmy/stemmy.c
index b9b2a6fddc2..796541ad90c 100644
--- a/board/ste/stemmy/stemmy.c
+++ b/board/ste/stemmy/stemmy.c
@@ -5,6 +5,7 @@
 #include <common.h>
 #include <init.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/sunxi/board.c b/board/sunxi/board.c
index 193ec8cff57..a34b1f4cf17 100644
--- a/board/sunxi/board.c
+++ b/board/sunxi/board.c
@@ -29,6 +29,7 @@
 #include <asm/arch/mmc.h>
 #include <asm/arch/spl.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/printk.h>
 #include <linux/string.h>
diff --git a/board/syteco/zmx25/zmx25.c b/board/syteco/zmx25/zmx25.c
index a3e5efad7c6..71eba4842b3 100644
--- a/board/syteco/zmx25/zmx25.c
+++ b/board/syteco/zmx25/zmx25.c
@@ -22,6 +22,7 @@
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux-mx25.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 
diff --git a/board/tbs/tbs2910/tbs2910.c b/board/tbs/tbs2910/tbs2910.c
index ac1b8231281..a35efc9848a 100644
--- a/board/tbs/tbs2910/tbs2910.c
+++ b/board/tbs/tbs2910/tbs2910.c
@@ -10,6 +10,7 @@
 #include <asm/arch/iomux.h>
 #include <asm/arch/mx6-pins.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
 #include <asm/mach-imx/iomux-v3.h>
diff --git a/board/tcl/sl50/board.c b/board/tcl/sl50/board.c
index 4821925c026..8095053fd60 100644
--- a/board/tcl/sl50/board.c
+++ b/board/tcl/sl50/board.c
@@ -30,6 +30,7 @@
 #include <i2c.h>
 #include <miiphy.h>
 #include <cpsw.h>
+#include <asm/u-boot.h>
 #include <power/tps65217.h>
 #include <power/tps65910.h>
 #include <env_internal.h>
diff --git a/board/technexion/pico-imx6/pico-imx6.c b/board/technexion/pico-imx6/pico-imx6.c
index 6b9c4f4373c..90592900ec6 100644
--- a/board/technexion/pico-imx6/pico-imx6.c
+++ b/board/technexion/pico-imx6/pico-imx6.c
@@ -22,6 +22,7 @@
 #include <asm/mach-imx/video.h>
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/sizes.h>
 #include <miiphy.h>
diff --git a/board/technexion/pico-imx6/spl.c b/board/technexion/pico-imx6/spl.c
index 7b6cdd6c3b1..dd5e154e671 100644
--- a/board/technexion/pico-imx6/spl.c
+++ b/board/technexion/pico-imx6/spl.c
@@ -13,6 +13,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/mx6-pins.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
diff --git a/board/technexion/pico-imx6ul/pico-imx6ul.c b/board/technexion/pico-imx6ul/pico-imx6ul.c
index c9f553bdfd5..0d972158b1c 100644
--- a/board/technexion/pico-imx6ul/pico-imx6ul.c
+++ b/board/technexion/pico-imx6ul/pico-imx6ul.c
@@ -20,6 +20,7 @@
 #include <common.h>
 #include <miiphy.h>
 #include <netdev.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/sizes.h>
 #include <usb.h>
diff --git a/board/technexion/pico-imx6ul/spl.c b/board/technexion/pico-imx6ul/spl.c
index faee99e8d29..bea16a7ab9f 100644
--- a/board/technexion/pico-imx6ul/spl.c
+++ b/board/technexion/pico-imx6ul/spl.c
@@ -15,6 +15,7 @@
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/mach-imx/boot_mode.h>
 #include <fsl_esdhc_imx.h>
+#include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <spl.h>
 #include <linux/string.h>
diff --git a/board/technexion/pico-imx7d/pico-imx7d.c b/board/technexion/pico-imx7d/pico-imx7d.c
index 2d749dac19a..b7582f2148a 100644
--- a/board/technexion/pico-imx7d/pico-imx7d.c
+++ b/board/technexion/pico-imx7d/pico-imx7d.c
@@ -18,6 +18,7 @@
 #include <common.h>
 #include <i2c.h>
 #include <miiphy.h>
+#include <asm/u-boot.h>
 #include <power/pmic.h>
 #include <power/pfuze3000_pmic.h>
 #include "../../freescale/common/pfuze.h"
diff --git a/board/technexion/pico-imx7d/spl.c b/board/technexion/pico-imx7d/spl.c
index ccb094f1884..3739706dee1 100644
--- a/board/technexion/pico-imx7d/spl.c
+++ b/board/technexion/pico-imx7d/spl.c
@@ -18,6 +18,7 @@
 #include <asm/gpio.h>
 #include <fsl_esdhc_imx.h>
 #include <spl.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 
 #if defined(CONFIG_SPL_BUILD)
diff --git a/board/technexion/pico-imx8mq/pico-imx8mq.c b/board/technexion/pico-imx8mq/pico-imx8mq.c
index 951e3e1985b..2ac96146f43 100644
--- a/board/technexion/pico-imx8mq/pico-imx8mq.c
+++ b/board/technexion/pico-imx8mq/pico-imx8mq.c
@@ -21,6 +21,7 @@
 #include <asm/mach-imx/gpio.h>
 #include <asm/mach-imx/mxc_i2c.h>
 #include <asm/arch/clock.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <spl.h>
 #include <power/pmic.h>
diff --git a/board/technexion/pico-imx8mq/spl.c b/board/technexion/pico-imx8mq/spl.c
index b434e1e16f2..02b2a01cae7 100644
--- a/board/technexion/pico-imx8mq/spl.c
+++ b/board/technexion/pico-imx8mq/spl.c
@@ -16,6 +16,7 @@
 #include <asm/mach-imx/gpio.h>
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/mach-imx/mxc_i2c.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <errno.h>
 #include <fsl_esdhc_imx.h>
diff --git a/board/technexion/tao3530/tao3530.c b/board/technexion/tao3530/tao3530.c
index 0c9dca31e67..157ad85d4f7 100644
--- a/board/technexion/tao3530/tao3530.c
+++ b/board/technexion/tao3530/tao3530.c
@@ -18,6 +18,7 @@
 #include <asm/arch/gpio.h>
 #include <asm/gpio.h>
 #include <asm/mach-types.h>
+#include <asm/u-boot.h>
 
 #include <usb.h>
 #include <asm/ehci-omap.h>
diff --git a/board/technologic/ts4600/ts4600.c b/board/technologic/ts4600/ts4600.c
index b9cce821d96..7daac4e53aa 100644
--- a/board/technologic/ts4600/ts4600.c
+++ b/board/technologic/ts4600/ts4600.c
@@ -22,6 +22,7 @@
 #include <asm/arch/iomux-mx28.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/mii.h>
 #include <miiphy.h>
diff --git a/board/technologic/ts4800/ts4800.c b/board/technologic/ts4800/ts4800.c
index a309e58b27f..61ec4ffb831 100644
--- a/board/technologic/ts4800/ts4800.c
+++ b/board/technologic/ts4800/ts4800.c
@@ -16,6 +16,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux-mx51.h>
 #include <env.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/arch/sys_proto.h>
diff --git a/board/theadorable/theadorable.c b/board/theadorable/theadorable.c
index fb3d1fc4260..9664a8c0ef3 100644
--- a/board/theadorable/theadorable.c
+++ b/board/theadorable/theadorable.c
@@ -19,6 +19,7 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/mbus.h>
 #ifdef CONFIG_NET
diff --git a/board/ti/am335x/board.c b/board/ti/am335x/board.c
index be474a8472c..7103dc454d8 100644
--- a/board/ti/am335x/board.c
+++ b/board/ti/am335x/board.c
@@ -37,6 +37,7 @@
 #include <i2c.h>
 #include <miiphy.h>
 #include <cpsw.h>
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/string.h>
diff --git a/board/ti/am3517crane/am3517crane.c b/board/ti/am3517crane/am3517crane.c
index b1017d6c9b7..b7f6ce21243 100644
--- a/board/ti/am3517crane/am3517crane.c
+++ b/board/ti/am3517crane/am3517crane.c
@@ -19,6 +19,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/mach-types.h>
 #include <i2c.h>
+#include <asm/u-boot.h>
 #include "am3517crane.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/ti/am43xx/board.c b/board/ti/am43xx/board.c
index ba479672c66..463dccc0ccb 100644
--- a/board/ti/am43xx/board.c
+++ b/board/ti/am43xx/board.c
@@ -11,6 +11,7 @@
 #include <eeprom.h>
 #include <image.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <dm/uclass.h>
 #include <env.h>
 #include <fdt_support.h>
diff --git a/board/ti/am57xx/board.c b/board/ti/am57xx/board.c
index d9b28dff52b..fca15a9a629 100644
--- a/board/ti/am57xx/board.c
+++ b/board/ti/am57xx/board.c
@@ -33,6 +33,7 @@
 #include <asm/arch/gpio.h>
 #include <asm/arch/omap.h>
 #include <usb.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 #include <linux/usb/gadget.h>
 #include <dwc3-uboot.h>
diff --git a/board/ti/am65x/evm.c b/board/ti/am65x/evm.c
index 655789d9b9b..e0c6d6fa003 100644
--- a/board/ti/am65x/evm.c
+++ b/board/ti/am65x/evm.c
@@ -22,6 +22,7 @@
 #include <env.h>
 #include <spl.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/u-boot.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c
index 25297b0ae0c..752cb584c66 100644
--- a/board/ti/beagle/beagle.c
+++ b/board/ti/beagle/beagle.c
@@ -25,6 +25,7 @@
 #endif
 #include <twl4030.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/mtd/rawnand.h>
 #include <asm/io.h>
 #include <asm/arch/mmc_host_def.h>
diff --git a/board/ti/dra7xx/evm.c b/board/ti/dra7xx/evm.c
index 851471cd130..fa56ebb2533 100644
--- a/board/ti/dra7xx/evm.c
+++ b/board/ti/dra7xx/evm.c
@@ -20,6 +20,7 @@
 #include <sata.h>
 #include <serial.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 #include <asm/gpio.h>
 #include <usb.h>
diff --git a/board/ti/evm/evm.c b/board/ti/evm/evm.c
index 573b75e076b..664ddeb4fe9 100644
--- a/board/ti/evm/evm.c
+++ b/board/ti/evm/evm.c
@@ -29,6 +29,7 @@
 #include <twl4030.h>
 #include <asm/mach-types.h>
 #include <asm/omap_musb.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/mtd/rawnand.h>
 #include <linux/usb/ch9.h>
diff --git a/board/ti/j721e/evm.c b/board/ti/j721e/evm.c
index 58ecc188831..00d5cb2e685 100644
--- a/board/ti/j721e/evm.c
+++ b/board/ti/j721e/evm.c
@@ -22,6 +22,7 @@
 #include <spl.h>
 #include <asm/arch/sys_proto.h>
 #include <dm.h>
+#include <asm/u-boot.h>
 #include <dm/uclass-internal.h>
 #include <linux/printk.h>
 #include <linux/string.h>
diff --git a/board/ti/ks2_evm/board.c b/board/ti/ks2_evm/board.c
index 078b89073fc..ba08c22f942 100644
--- a/board/ti/ks2_evm/board.c
+++ b/board/ti/ks2_evm/board.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 #include "board.h"
 #include <env.h>
diff --git a/board/ti/ks2_evm/board_k2g.c b/board/ti/ks2_evm/board_k2g.c
index b6ef7164d9f..979b1febc02 100644
--- a/board/ti/ks2_evm/board_k2g.c
+++ b/board/ti/ks2_evm/board_k2g.c
@@ -18,6 +18,7 @@
 #include <fdtdec.h>
 #include <i2c.h>
 #include <remoteproc.h>
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/string.h>
diff --git a/board/ti/omap5_uevm/evm.c b/board/ti/omap5_uevm/evm.c
index 4777622156b..a6c75bda3c3 100644
--- a/board/ti/omap5_uevm/evm.c
+++ b/board/ti/omap5_uevm/evm.c
@@ -16,6 +16,7 @@
 #include <tca642x.h>
 #include <usb.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/usb/gadget.h>
 #include <dwc3-uboot.h>
diff --git a/board/ti/panda/panda.c b/board/ti/panda/panda.c
index fda8d5f3c83..c36690eec17 100644
--- a/board/ti/panda/panda.c
+++ b/board/ti/panda/panda.c
@@ -18,6 +18,7 @@
 #include <asm/gpio.h>
 #include <env.h>
 #include <twl6030.h>
+#include <asm/u-boot.h>
 
 #include "panda_mux_data.h"
 
diff --git a/board/ti/sdp4430/sdp.c b/board/ti/sdp4430/sdp.c
index 4895bfafd80..fe12d6e8913 100644
--- a/board/ti/sdp4430/sdp.c
+++ b/board/ti/sdp4430/sdp.c
@@ -13,6 +13,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/mmc_host_def.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 
 #include "sdp4430_mux_data.h"
 
diff --git a/board/ti/ti816x/evm.c b/board/ti/ti816x/evm.c
index 2d42af6b809..12c56a607c9 100644
--- a/board/ti/ti816x/evm.c
+++ b/board/ti/ti816x/evm.c
@@ -22,6 +22,7 @@
 #include <asm/arch/mmc_host_def.h>
 #include <asm/arch/mem.h>
 #include <asm/arch/mux.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/timll/devkit3250/devkit3250.c b/board/timll/devkit3250/devkit3250.c
index 3c744b943f4..a90a0d34349 100644
--- a/board/timll/devkit3250/devkit3250.c
+++ b/board/timll/devkit3250/devkit3250.c
@@ -14,6 +14,7 @@
 #include <asm/arch/wdt.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/timll/devkit8000/devkit8000.c b/board/timll/devkit8000/devkit8000.c
index 5af88318062..e1b33d091ee 100644
--- a/board/timll/devkit8000/devkit8000.c
+++ b/board/timll/devkit8000/devkit8000.c
@@ -29,6 +29,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/mem.h>
 #include <asm/mach-types.h>
+#include <asm/u-boot.h>
 #include "devkit8000.h"
 #include <asm/gpio.h>
 #ifdef CONFIG_DRIVER_DM9000
diff --git a/board/toradex/apalis-imx8/apalis-imx8.c b/board/toradex/apalis-imx8/apalis-imx8.c
index 6e8594a6472..1c4ff3d1984 100644
--- a/board/toradex/apalis-imx8/apalis-imx8.c
+++ b/board/toradex/apalis-imx8/apalis-imx8.c
@@ -7,6 +7,7 @@
 #include <cpu_func.h>
 #include <init.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 
 #include <asm/arch/clock.h>
 #include <asm/arch/imx8-pins.h>
diff --git a/board/toradex/apalis-tk1/apalis-tk1.c b/board/toradex/apalis-tk1/apalis-tk1.c
index 2883f1b98c5..6d907817593 100644
--- a/board/toradex/apalis-tk1/apalis-tk1.c
+++ b/board/toradex/apalis-tk1/apalis-tk1.c
@@ -15,6 +15,7 @@
 #include <asm/arch/pinmux.h>
 #include <env_internal.h>
 #include <pci_tegra.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/printk.h>
 #include <linux/string.h>
diff --git a/board/toradex/apalis_imx6/apalis_imx6.c b/board/toradex/apalis_imx6/apalis_imx6.c
index d17f90f86fd..db7746e78c8 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 <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/string.h>
diff --git a/board/toradex/apalis_t30/apalis_t30.c b/board/toradex/apalis_t30/apalis_t30.c
index 0396eea56b5..cad2f32b665 100644
--- a/board/toradex/apalis_t30/apalis_t30.c
+++ b/board/toradex/apalis_t30/apalis_t30.c
@@ -17,6 +17,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <pci_tegra.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include "../common/tdx-common.h"
 
diff --git a/board/toradex/colibri-imx6ull/colibri-imx6ull.c b/board/toradex/colibri-imx6ull/colibri-imx6ull.c
index 8e9b74f6479..ee073962964 100644
--- a/board/toradex/colibri-imx6ull/colibri-imx6ull.c
+++ b/board/toradex/colibri-imx6ull/colibri-imx6ull.c
@@ -5,6 +5,7 @@
 #include <common.h>
 #include <init.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 
 #include <asm/arch/clock.h>
diff --git a/board/toradex/colibri-imx8x/colibri-imx8x.c b/board/toradex/colibri-imx8x/colibri-imx8x.c
index 9531ec64a5d..09f3525bb45 100644
--- a/board/toradex/colibri-imx8x/colibri-imx8x.c
+++ b/board/toradex/colibri-imx8x/colibri-imx8x.c
@@ -7,6 +7,7 @@
 #include <cpu_func.h>
 #include <init.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 
 #include <asm/arch/clock.h>
 #include <asm/arch/imx8-pins.h>
diff --git a/board/toradex/colibri_imx6/colibri_imx6.c b/board/toradex/colibri_imx6/colibri_imx6.c
index 1f18552b57c..dc026fd3e40 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 <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/string.h>
diff --git a/board/toradex/colibri_imx7/colibri_imx7.c b/board/toradex/colibri_imx7/colibri_imx7.c
index 11560ee0677..7d9390cf5eb 100644
--- a/board/toradex/colibri_imx7/colibri_imx7.c
+++ b/board/toradex/colibri_imx7/colibri_imx7.c
@@ -18,6 +18,7 @@
 #include <asm/io.h>
 #include <common.h>
 #include <dm.h>
+#include <asm/u-boot.h>
 #include <dm/platform_data/serial_mxc.h>
 #include <fdt_support.h>
 #include <fsl_esdhc_imx.h>
diff --git a/board/toradex/colibri_pxa270/colibri_pxa270.c b/board/toradex/colibri_pxa270/colibri_pxa270.c
index bc7a79f0b34..81b7f72d6da 100644
--- a/board/toradex/colibri_pxa270/colibri_pxa270.c
+++ b/board/toradex/colibri_pxa270/colibri_pxa270.c
@@ -17,6 +17,7 @@
 #include <asm/arch/regs-uart.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 #include <dm/platdata.h>
 #include <dm/platform_data/pxa_mmc_gen.h>
 #include <dm/platform_data/serial_pxa.h>
diff --git a/board/toradex/colibri_t20/colibri_t20.c b/board/toradex/colibri_t20/colibri_t20.c
index 73ef4d2db32..bb37ff7507d 100644
--- a/board/toradex/colibri_t20/colibri_t20.c
+++ b/board/toradex/colibri_t20/colibri_t20.c
@@ -17,6 +17,7 @@
 #include <asm/io.h>
 #include <i2c.h>
 #include <nand.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include "../common/tdx-common.h"
 
diff --git a/board/toradex/colibri_t30/colibri_t30.c b/board/toradex/colibri_t30/colibri_t30.c
index c5562f6d578..de13ec49c5f 100644
--- a/board/toradex/colibri_t30/colibri_t30.c
+++ b/board/toradex/colibri_t30/colibri_t30.c
@@ -13,6 +13,7 @@
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <i2c.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include "pinmux-config-colibri_t30.h"
 #include "../common/tdx-common.h"
diff --git a/board/toradex/colibri_vf/colibri_vf.c b/board/toradex/colibri_vf/colibri_vf.c
index e9c5bc06322..5056447761d 100644
--- a/board/toradex/colibri_vf/colibri_vf.c
+++ b/board/toradex/colibri_vf/colibri_vf.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <init.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 
 #include <asm/arch/clock.h>
 #include <asm/arch/crm_regs.h>
diff --git a/board/toradex/common/tdx-common.c b/board/toradex/common/tdx-common.c
index e19be067ce3..29d4972df8e 100644
--- a/board/toradex/common/tdx-common.c
+++ b/board/toradex/common/tdx-common.c
@@ -7,6 +7,7 @@
 #include <env.h>
 #include <g_dnl.h>
 #include <init.h>
+#include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <linux/string.h>
 
diff --git a/board/toradex/common/tdx-common.h b/board/toradex/common/tdx-common.h
index 81375de598c..f7d09cee525 100644
--- a/board/toradex/common/tdx-common.h
+++ b/board/toradex/common/tdx-common.h
@@ -6,6 +6,7 @@
 #ifndef _TDX_COMMON_H
 #define _TDX_COMMON_H
 
+#include <asm/u-boot.h>
 #define TORADEX_USB_PRODUCT_NUM_OFFSET	0x4000
 #define TDX_USB_VID			0x1B67
 
diff --git a/board/toradex/verdin-imx8mm/spl.c b/board/toradex/verdin-imx8mm/spl.c
index 5ee86dd3f89..c593ac01cd3 100644
--- a/board/toradex/verdin-imx8mm/spl.c
+++ b/board/toradex/verdin-imx8mm/spl.c
@@ -17,6 +17,7 @@
 #include <asm/mach-imx/boot_mode.h>
 #include <asm/mach-imx/iomux-v3.h>
 #include <cpu_func.h>
+#include <asm/u-boot.h>
 #include <dm/device.h>
 #include <dm/device-internal.h>
 #include <dm/uclass.h>
diff --git a/board/toradex/verdin-imx8mm/verdin-imx8mm.c b/board/toradex/verdin-imx8mm/verdin-imx8mm.c
index 1161b5c31d9..2fe5d407ef9 100644
--- a/board/toradex/verdin-imx8mm/verdin-imx8mm.c
+++ b/board/toradex/verdin-imx8mm/verdin-imx8mm.c
@@ -12,6 +12,7 @@
 #include <miiphy.h>
 #include <netdev.h>
 #include <micrel.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/tqc/tqm834x/tqm834x.c b/board/tqc/tqm834x/tqm834x.c
index 17b4662c167..9e22d4ebcf8 100644
--- a/board/tqc/tqm834x/tqm834x.c
+++ b/board/tqc/tqm834x/tqm834x.c
@@ -17,6 +17,7 @@
 #include <asm/mmu.h>
 #include <pci.h>
 #include <flash.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <mtd/cfi_flash.h>
 
diff --git a/board/tqc/tqma6/tqma6.c b/board/tqc/tqma6/tqma6.c
index 26d557cece9..d9bbbfc5e43 100644
--- a/board/tqc/tqma6/tqma6.c
+++ b/board/tqc/tqma6/tqma6.c
@@ -16,6 +16,7 @@
 #include <env.h>
 #include <fdt_support.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
diff --git a/board/tqc/tqma6/tqma6_bb.h b/board/tqc/tqma6/tqma6_bb.h
index b0f1f99a83c..1c5f3fc5adf 100644
--- a/board/tqc/tqma6/tqma6_bb.h
+++ b/board/tqc/tqma6/tqma6_bb.h
@@ -8,6 +8,7 @@
 #define __TQMA6_BB__
 
 #include <common.h>
+#include <asm/u-boot.h>
 
 int tqma6_bb_board_mmc_getwp(struct mmc *mmc);
 int tqma6_bb_board_mmc_getcd(struct mmc *mmc);
diff --git a/board/tqc/tqma6/tqma6_mba6.c b/board/tqc/tqma6/tqma6_mba6.c
index 801619e80b6..e50bd9ecebd 100644
--- a/board/tqc/tqma6/tqma6_mba6.c
+++ b/board/tqc/tqma6/tqma6_mba6.c
@@ -15,6 +15,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
diff --git a/board/tqc/tqma6/tqma6_wru4.c b/board/tqc/tqma6/tqma6_wru4.c
index 3b1bc603ce8..9a4350cce6d 100644
--- a/board/tqc/tqma6/tqma6_wru4.c
+++ b/board/tqc/tqma6/tqma6_wru4.c
@@ -17,6 +17,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
diff --git a/board/udoo/neo/neo.c b/board/udoo/neo/neo.c
index aef82e2c2df..1ae4bc33978 100644
--- a/board/udoo/neo/neo.c
+++ b/board/udoo/neo/neo.c
@@ -26,6 +26,7 @@
 #include <asm/mach-imx/mxc_i2c.h>
 #include <asm/arch/sys_proto.h>
 #include <spl.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/sizes.h>
 #include <common.h>
diff --git a/board/udoo/udoo.c b/board/udoo/udoo.c
index d83f23dd358..e6d441f582b 100644
--- a/board/udoo/udoo.c
+++ b/board/udoo/udoo.c
@@ -14,6 +14,7 @@
 #include <malloc.h>
 #include <asm/arch/mx6-pins.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
diff --git a/board/udoo/udoo_spl.c b/board/udoo/udoo_spl.c
index d9afbbb7419..9ef9db18cd0 100644
--- a/board/udoo/udoo_spl.c
+++ b/board/udoo/udoo_spl.c
@@ -12,6 +12,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/mx6-pins.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
diff --git a/board/variscite/dart_6ul/dart_6ul.c b/board/variscite/dart_6ul/dart_6ul.c
index 1c52cfd882e..6378d44863b 100644
--- a/board/variscite/dart_6ul/dart_6ul.c
+++ b/board/variscite/dart_6ul/dart_6ul.c
@@ -14,6 +14,7 @@
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/mach-imx/mxc_i2c.h>
 #include <fsl_esdhc_imx.h>
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <miiphy.h>
 #include <netdev.h>
diff --git a/board/variscite/dart_6ul/spl.c b/board/variscite/dart_6ul/spl.c
index 725600770b7..49ff41cab0f 100644
--- a/board/variscite/dart_6ul/spl.c
+++ b/board/variscite/dart_6ul/spl.c
@@ -13,6 +13,7 @@
 #include <asm/arch/mx6-pins.h>
 #include <asm/arch/crm_regs.h>
 #include <fsl_esdhc_imx.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 
 #define UART_PAD_CTRL  (PAD_CTL_PKE | PAD_CTL_PUE |		\
diff --git a/board/varisys/cyrus/cyrus.c b/board/varisys/cyrus/cyrus.c
index c5d34df777d..0c8060e4d7d 100644
--- a/board/varisys/cyrus/cyrus.c
+++ b/board/varisys/cyrus/cyrus.c
@@ -10,6 +10,7 @@
 #include <image.h>
 #include <init.h>
 #include <netdev.h>
+#include <asm/u-boot.h>
 #include <linux/compiler.h>
 #include <asm/mmu.h>
 #include <asm/processor.h>
diff --git a/board/varisys/cyrus/cyrus.h b/board/varisys/cyrus/cyrus.h
index d8f8d6c8ec8..4aefae46ae9 100644
--- a/board/varisys/cyrus/cyrus.h
+++ b/board/varisys/cyrus/cyrus.h
@@ -3,6 +3,7 @@
 #ifndef __CYRUS_H
 #define __CYRUS_H
 
+#include <asm/u-boot.h>
 void fdt_fixup_board_enet(void *blob);
 void pci_of_setup(void *blob, struct bd_info *bd);
 
diff --git a/board/varisys/cyrus/ddr.c b/board/varisys/cyrus/ddr.c
index 184948094db..2f732dd18f7 100644
--- a/board/varisys/cyrus/ddr.c
+++ b/board/varisys/cyrus/ddr.c
@@ -13,6 +13,7 @@
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
 #include <asm/fsl_law.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/varisys/cyrus/eth.c b/board/varisys/cyrus/eth.c
index bc681079e26..07e3b979c47 100644
--- a/board/varisys/cyrus/eth.c
+++ b/board/varisys/cyrus/eth.c
@@ -13,6 +13,7 @@
 #include <malloc.h>
 #include <fdt_support.h>
 #include <fsl_dtsec.h>
+#include <asm/u-boot.h>
 
 #ifdef CONFIG_FMAN_ENET
 
diff --git a/board/varisys/cyrus/law.c b/board/varisys/cyrus/law.c
index 8b1b118b551..0391d606f9c 100644
--- a/board/varisys/cyrus/law.c
+++ b/board/varisys/cyrus/law.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
+#include <asm/u-boot.h>
 
 struct law_entry law_table[] = {
 	SET_LAW(CONFIG_SYS_LBC0_BASE_PHYS, LAW_SIZE_64K, LAW_TRGT_IF_LBC),
diff --git a/board/varisys/cyrus/pci.c b/board/varisys/cyrus/pci.c
index 429c398cb44..373d15c0e27 100644
--- a/board/varisys/cyrus/pci.c
+++ b/board/varisys/cyrus/pci.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <pci.h>
 #include <asm/fsl_pci.h>
+#include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <asm/fsl_serdes.h>
diff --git a/board/varisys/cyrus/tlb.c b/board/varisys/cyrus/tlb.c
index b1af3e04d64..8068ec0ca1d 100644
--- a/board/varisys/cyrus/tlb.c
+++ b/board/varisys/cyrus/tlb.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <asm/mmu.h>
+#include <asm/u-boot.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/ve8313/ve8313.c b/board/ve8313/ve8313.c
index 78d401e955e..dcd6d2a132e 100644
--- a/board/ve8313/ve8313.c
+++ b/board/ve8313/ve8313.c
@@ -12,6 +12,7 @@
 #include <fdt_support.h>
 #include <init.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 #include <pci.h>
diff --git a/board/vscom/baltos/board.c b/board/vscom/baltos/board.c
index ed375c58cb9..f01a78897c6 100644
--- a/board/vscom/baltos/board.c
+++ b/board/vscom/baltos/board.c
@@ -14,6 +14,7 @@
 #include <net.h>
 #include <serial.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <spl.h>
 #include <asm/arch/cpu.h>
diff --git a/board/wandboard/spl.c b/board/wandboard/spl.c
index 0983d100588..c61428d6c64 100644
--- a/board/wandboard/spl.c
+++ b/board/wandboard/spl.c
@@ -11,6 +11,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/mx6-pins.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
diff --git a/board/wandboard/wandboard.c b/board/wandboard/wandboard.c
index 7d3da302395..e7e3bf6f8de 100644
--- a/board/wandboard/wandboard.c
+++ b/board/wandboard/wandboard.c
@@ -26,6 +26,7 @@
 #include <asm/mach-imx/sata.h>
 #include <asm/io.h>
 #include <env.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/sizes.h>
 #include <common.h>
diff --git a/board/warp/warp.c b/board/warp/warp.c
index 0f1d038fabd..fbf7a5be71c 100644
--- a/board/warp/warp.c
+++ b/board/warp/warp.c
@@ -18,6 +18,7 @@
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/mach-imx/mxc_i2c.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 #include <linux/sizes.h>
 #include <common.h>
 #include <watchdog.h>
diff --git a/board/warp7/warp7.c b/board/warp7/warp7.c
index 0f202241dd7..929ec65947c 100644
--- a/board/warp7/warp7.c
+++ b/board/warp7/warp7.c
@@ -19,6 +19,7 @@
 #include <env.h>
 #include <asm/arch/crm_regs.h>
 #include <netdev.h>
+#include <asm/u-boot.h>
 #include <power/pmic.h>
 #include <power/pfuze3000_pmic.h>
 #include "../freescale/common/pfuze.h"
diff --git a/board/work-microwave/work_92105/work_92105.c b/board/work-microwave/work_92105/work_92105.c
index bdcecff7308..97a7cad3833 100644
--- a/board/work-microwave/work_92105/work_92105.c
+++ b/board/work-microwave/work_92105/work_92105.c
@@ -17,6 +17,7 @@
 #include <asm/arch/wdt.h>
 #include <asm/gpio.h>
 #include <spl.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include "work_92105_display.h"
 
diff --git a/board/xes/common/fsl_8xxx_clk.c b/board/xes/common/fsl_8xxx_clk.c
index 8ca65ca8593..abd86694f30 100644
--- a/board/xes/common/fsl_8xxx_clk.c
+++ b/board/xes/common/fsl_8xxx_clk.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 
 /*
  * Return SYSCLK input frequency - 50 MHz or 66 MHz depending on POR config
diff --git a/board/xes/common/fsl_8xxx_misc.c b/board/xes/common/fsl_8xxx_misc.c
index b26810338f8..fe6858e0d29 100644
--- a/board/xes/common/fsl_8xxx_misc.c
+++ b/board/xes/common/fsl_8xxx_misc.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <asm/mmu.h>
+#include <asm/u-boot.h>
 #ifdef CONFIG_PCA953X
 #include <pca953x.h>
 
diff --git a/board/xes/common/fsl_8xxx_pci.c b/board/xes/common/fsl_8xxx_pci.c
index 157aa32826a..c4aa04b41c9 100644
--- a/board/xes/common/fsl_8xxx_pci.c
+++ b/board/xes/common/fsl_8xxx_pci.c
@@ -10,6 +10,7 @@
 #include <asm/fsl_pci.h>
 #include <asm/fsl_serdes.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 #include <linux/compiler.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
diff --git a/board/xes/xpedite517x/ddr.c b/board/xes/xpedite517x/ddr.c
index a3fd2fc8ca8..973da7099cc 100644
--- a/board/xes/xpedite517x/ddr.c
+++ b/board/xes/xpedite517x/ddr.c
@@ -9,6 +9,7 @@
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
 #include <log.h>
+#include <asm/u-boot.h>
 
 void get_spd(ddr2_spd_eeprom_t *spd, u8 i2c_address)
 {
diff --git a/board/xes/xpedite517x/law.c b/board/xes/xpedite517x/law.c
index b82f9f0d3b1..b72cdd0f2ed 100644
--- a/board/xes/xpedite517x/law.c
+++ b/board/xes/xpedite517x/law.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
+#include <asm/u-boot.h>
 
 /*
  * Notes:
diff --git a/board/xes/xpedite517x/xpedite517x.c b/board/xes/xpedite517x/xpedite517x.c
index 8a5b52c4952..333edd4cd99 100644
--- a/board/xes/xpedite517x/xpedite517x.c
+++ b/board/xes/xpedite517x/xpedite517x.c
@@ -12,6 +12,7 @@
 #include <asm/io.h>
 #include <fdt_support.h>
 #include <pca953x.h>
+#include <asm/u-boot.h>
 #include "../common/fsl_8xxx_misc.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/xes/xpedite520x/law.c b/board/xes/xpedite520x/law.c
index 10613ead3f2..34173b1d300 100644
--- a/board/xes/xpedite520x/law.c
+++ b/board/xes/xpedite520x/law.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
+#include <asm/u-boot.h>
 
 /*
  * Notes:
diff --git a/board/xes/xpedite520x/tlb.c b/board/xes/xpedite520x/tlb.c
index d45f532861e..3a10fdb83d5 100644
--- a/board/xes/xpedite520x/tlb.c
+++ b/board/xes/xpedite520x/tlb.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <asm/mmu.h>
+#include <asm/u-boot.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/xes/xpedite520x/xpedite520x.c b/board/xes/xpedite520x/xpedite520x.c
index 63e1e0efe54..016bd412ce8 100644
--- a/board/xes/xpedite520x/xpedite520x.c
+++ b/board/xes/xpedite520x/xpedite520x.c
@@ -14,6 +14,7 @@
 #include <asm/io.h>
 #include <asm/cache.h>
 #include <asm/mmu.h>
+#include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <pca953x.h>
diff --git a/board/xes/xpedite537x/ddr.c b/board/xes/xpedite537x/ddr.c
index f55102a072e..b34c190ee09 100644
--- a/board/xes/xpedite537x/ddr.c
+++ b/board/xes/xpedite537x/ddr.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <i2c.h>
 #include <log.h>
+#include <asm/u-boot.h>
 
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
diff --git a/board/xes/xpedite537x/law.c b/board/xes/xpedite537x/law.c
index a1f375900cb..c69129cdd36 100644
--- a/board/xes/xpedite537x/law.c
+++ b/board/xes/xpedite537x/law.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
+#include <asm/u-boot.h>
 
 /*
  * Notes:
diff --git a/board/xes/xpedite537x/tlb.c b/board/xes/xpedite537x/tlb.c
index 6d50360f069..6a1db856f43 100644
--- a/board/xes/xpedite537x/tlb.c
+++ b/board/xes/xpedite537x/tlb.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <asm/mmu.h>
+#include <asm/u-boot.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/xes/xpedite537x/xpedite537x.c b/board/xes/xpedite537x/xpedite537x.c
index 437b57d4ff6..a55c7d24264 100644
--- a/board/xes/xpedite537x/xpedite537x.c
+++ b/board/xes/xpedite537x/xpedite537x.c
@@ -12,6 +12,7 @@
 #include <asm/fsl_pci.h>
 #include <asm/io.h>
 #include <asm/cache.h>
+#include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <pca953x.h>
diff --git a/board/xes/xpedite550x/ddr.c b/board/xes/xpedite550x/ddr.c
index ad52c9455b8..e6fb11dfcba 100644
--- a/board/xes/xpedite550x/ddr.c
+++ b/board/xes/xpedite550x/ddr.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <i2c.h>
+#include <asm/u-boot.h>
 
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
diff --git a/board/xes/xpedite550x/law.c b/board/xes/xpedite550x/law.c
index 1e2d604d9d4..c4de11b2980 100644
--- a/board/xes/xpedite550x/law.c
+++ b/board/xes/xpedite550x/law.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
+#include <asm/u-boot.h>
 
 /*
  * Notes:
diff --git a/board/xes/xpedite550x/tlb.c b/board/xes/xpedite550x/tlb.c
index 7cb6cd67706..3bb913b1d0a 100644
--- a/board/xes/xpedite550x/tlb.c
+++ b/board/xes/xpedite550x/tlb.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <asm/mmu.h>
+#include <asm/u-boot.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/xes/xpedite550x/xpedite550x.c b/board/xes/xpedite550x/xpedite550x.c
index 9089a0cc72a..9347b895885 100644
--- a/board/xes/xpedite550x/xpedite550x.c
+++ b/board/xes/xpedite550x/xpedite550x.c
@@ -12,6 +12,7 @@
 #include <asm/fsl_pci.h>
 #include <asm/io.h>
 #include <asm/cache.h>
+#include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <pca953x.h>
diff --git a/board/xilinx/versal/board.c b/board/xilinx/versal/board.c
index 025212b223c..962f482f585 100644
--- a/board/xilinx/versal/board.c
+++ b/board/xilinx/versal/board.c
@@ -17,6 +17,7 @@
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/u-boot.h>
 #include <dm/device.h>
 #include <dm/uclass.h>
 #include <versalpl.h>
diff --git a/board/xilinx/zynq/board.c b/board/xilinx/zynq/board.c
index 91446fb9c39..28eb960aa89 100644
--- a/board/xilinx/zynq/board.c
+++ b/board/xilinx/zynq/board.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <init.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <dm/uclass.h>
 #include <env.h>
 #include <fdtdec.h>
diff --git a/board/xilinx/zynq/cmds.c b/board/xilinx/zynq/cmds.c
index c43727ab87a..cad94339fc7 100644
--- a/board/xilinx/zynq/cmds.c
+++ b/board/xilinx/zynq/cmds.c
@@ -11,6 +11,7 @@
 #include <asm/arch/hardware.h>
 #include <asm/arch/sys_proto.h>
 #include <malloc.h>
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/string.h>
 #include <u-boot/md5.h>
diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c
index 3bd39d5eb47..fa06a4237f6 100644
--- a/board/xilinx/zynqmp/zynqmp.c
+++ b/board/xilinx/zynqmp/zynqmp.c
@@ -25,6 +25,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/ptrace.h>
+#include <asm/u-boot.h>
 #include <dm/device.h>
 #include <dm/uclass.h>
 #include <usb.h>
diff --git a/board/xilinx/zynqmp_r5/board.c b/board/xilinx/zynqmp_r5/board.c
index 5c5a2e93863..817db3d5c88 100644
--- a/board/xilinx/zynqmp_r5/board.c
+++ b/board/xilinx/zynqmp_r5/board.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <fdtdec.h>
 #include <init.h>
+#include <asm/u-boot.h>
 
 int board_init(void)
 {
diff --git a/board/zyxel/nsa310s/nsa310s.c b/board/zyxel/nsa310s/nsa310s.c
index cd4a7723b12..738286f7f14 100644
--- a/board/zyxel/nsa310s/nsa310s.c
+++ b/board/zyxel/nsa310s/nsa310s.c
@@ -14,6 +14,7 @@
 #include <asm/arch/mpp.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 #include "nsa310s.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/cmd/bdinfo.c b/cmd/bdinfo.c
index 40079608d1a..6c346cd8b0a 100644
--- a/cmd/bdinfo.c
+++ b/cmd/bdinfo.c
@@ -13,6 +13,7 @@
 #include <vsprintf.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/cmd/bedbug.c b/cmd/bedbug.c
index 6dc3bab74da..87296e2db05 100644
--- a/cmd/bedbug.c
+++ b/cmd/bedbug.c
@@ -8,6 +8,7 @@
 #include <console.h>
 #include <asm/global_data.h>
 #include <asm/ptrace.h>
+#include <asm/u-boot.h>
 #include <linux/ctype.h>
 #include <net.h>
 #include <bedbug/type.h>
diff --git a/cmd/bootefi.c b/cmd/bootefi.c
index e9f2039cb78..636b3868aef 100644
--- a/cmd/bootefi.c
+++ b/cmd/bootefi.c
@@ -19,6 +19,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <linux/libfdt_env.h>
 #include <mapmem.h>
diff --git a/cmd/bootm.c b/cmd/bootm.c
index 599251f7181..f72fdf21091 100644
--- a/cmd/bootm.c
+++ b/cmd/bootm.c
@@ -17,6 +17,7 @@
 #include <nand.h>
 #include <asm/byteorder.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/ctype.h>
 #include <linux/err.h>
 #include <linux/string.h>
diff --git a/cmd/bootz.c b/cmd/bootz.c
index 1c8b0cf89f9..6496f027c4b 100644
--- a/cmd/bootz.c
+++ b/cmd/bootz.c
@@ -11,6 +11,7 @@
 #include <irq_func.h>
 #include <lmb.h>
 #include <log.h>
+#include <asm/u-boot.h>
 #include <linux/compiler.h>
 
 int __weak bootz_setup(ulong image, ulong *start, ulong *end)
diff --git a/cmd/mmc.c b/cmd/mmc.c
index bc7e991c86e..ab9f4b9e8a5 100644
--- a/cmd/mmc.c
+++ b/cmd/mmc.c
@@ -14,6 +14,7 @@
 #include <part.h>
 #include <sparse_format.h>
 #include <image-sparse.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 
 static int curr_device = -1;
diff --git a/cmd/reginfo.c b/cmd/reginfo.c
index c8a04b1754e..f7e1803445b 100644
--- a/cmd/reginfo.c
+++ b/cmd/reginfo.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <command.h>
 #include <asm/ppc.h>
+#include <asm/u-boot.h>
 
 static int do_reginfo(struct cmd_tbl *cmdtp, int flag, int argc,
 		      char *const argv[])
diff --git a/cmd/spl.c b/cmd/spl.c
index 472703f8fe1..42e7eb2e309 100644
--- a/cmd/spl.c
+++ b/cmd/spl.c
@@ -11,6 +11,7 @@
 #include <image.h>
 #include <log.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/libfdt.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/common/board_f.c b/common/board_f.c
index 949f8774c83..362c81521c8 100644
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -53,6 +53,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/sections.h>
+#include <asm/u-boot.h>
 #include <dm/root.h>
 #include <linux/errno.h>
 #include <linux/string.h>
diff --git a/common/board_r.c b/common/board_r.c
index 714a9137aba..20534a31881 100644
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -23,6 +23,7 @@
 #include <net.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <u-boot/crc.h>
 /* TODO: can we just include all these headers whether needed or not? */
 #if defined(CONFIG_CMD_BEDBUG)
diff --git a/common/bootm.c b/common/bootm.c
index f9ff1ce78ba..8a1ea66cff0 100644
--- a/common/bootm.c
+++ b/common/bootm.c
@@ -23,6 +23,7 @@
 #if defined(CONFIG_CMD_USB)
 #include <usb.h>
 #endif
+#include <asm/u-boot.h>
 #include <linux/string.h>
 #else
 #include "mkimage.h"
diff --git a/common/bootm_os.c b/common/bootm_os.c
index 295c6b8c064..9c78bba8e61 100644
--- a/common/bootm_os.c
+++ b/common/bootm_os.c
@@ -15,6 +15,7 @@
 #include <lmb.h>
 #include <log.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <malloc.h>
 #include <mapmem.h>
diff --git a/common/image.c b/common/image.c
index ab0f0439bad..e183a9cefa0 100644
--- a/common/image.c
+++ b/common/image.c
@@ -16,6 +16,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <asm/cache.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
 #include <watchdog.h>
diff --git a/common/init/handoff.c b/common/init/handoff.c
index 0e7470ad78e..0b8ac0d4d74 100644
--- a/common/init/handoff.c
+++ b/common/init/handoff.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <handoff.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/ata/fsl_sata.c b/drivers/ata/fsl_sata.c
index d2f802aff86..8d107602022 100644
--- a/drivers/ata/fsl_sata.c
+++ b/drivers/ata/fsl_sata.c
@@ -14,6 +14,7 @@
 #include <asm/io.h>
 #include <asm/processor.h>
 #include <asm/fsl_serdes.h>
+#include <asm/u-boot.h>
 #include <malloc.h>
 #include <libata.h>
 #include <fis.h>
diff --git a/drivers/bootcount/bootcount_ram.c b/drivers/bootcount/bootcount_ram.c
index 8cc30cf40ef..a34d154b310 100644
--- a/drivers/bootcount/bootcount_ram.c
+++ b/drivers/bootcount/bootcount_ram.c
@@ -9,6 +9,7 @@
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/cpu/mpc83xx_cpu.c b/drivers/cpu/mpc83xx_cpu.c
index 5f1592f9ad4..6929b6cf45b 100644
--- a/drivers/cpu/mpc83xx_cpu.c
+++ b/drivers/cpu/mpc83xx_cpu.c
@@ -11,6 +11,7 @@
 #include <dm.h>
 #include <log.h>
 #include <vsprintf.h>
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 
 #include "mpc83xx_cpu.h"
diff --git a/drivers/ddr/altera/sdram_agilex.c b/drivers/ddr/altera/sdram_agilex.c
index d554df87eba..1ddc35d5d3b 100644
--- a/drivers/ddr/altera/sdram_agilex.c
+++ b/drivers/ddr/altera/sdram_agilex.c
@@ -14,6 +14,7 @@
 #include <ram.h>
 #include <reset.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include "sdram_soc64.h"
 #include <wait_bit.h>
 #include <asm/arch/firewall.h>
diff --git a/drivers/ddr/altera/sdram_s10.c b/drivers/ddr/altera/sdram_s10.c
index 6235bd959fe..71c68d3e7a8 100644
--- a/drivers/ddr/altera/sdram_s10.c
+++ b/drivers/ddr/altera/sdram_s10.c
@@ -16,6 +16,7 @@
 #include <ram.h>
 #include <reset.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include "sdram_s10.h"
 #include <wait_bit.h>
 #include <asm/arch/firewall.h>
diff --git a/drivers/ddr/altera/sdram_soc64.c b/drivers/ddr/altera/sdram_soc64.c
index 1312244ae52..5729588a074 100644
--- a/drivers/ddr/altera/sdram_soc64.c
+++ b/drivers/ddr/altera/sdram_soc64.c
@@ -17,6 +17,7 @@
 #include <reset.h>
 #include <time.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 #include "sdram_soc64.h"
 #include <wait_bit.h>
diff --git a/drivers/ddr/fsl/arm_ddr_gen3.c b/drivers/ddr/fsl/arm_ddr_gen3.c
index 629ba6784e0..ca241ee5fff 100644
--- a/drivers/ddr/fsl/arm_ddr_gen3.c
+++ b/drivers/ddr/fsl/arm_ddr_gen3.c
@@ -13,6 +13,7 @@
 #include <fsl_immap.h>
 #include <fsl_ddr.h>
 #include <asm/arch/clock.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 
 #if (CONFIG_CHIP_SELECTS_PER_CTRL > 4)
diff --git a/drivers/ddr/fsl/ctrl_regs.c b/drivers/ddr/fsl/ctrl_regs.c
index 247587c646b..1edd39b9b73 100644
--- a/drivers/ddr/fsl/ctrl_regs.c
+++ b/drivers/ddr/fsl/ctrl_regs.c
@@ -22,6 +22,7 @@
 	defined(CONFIG_ARM)
 #include <asm/arch/clock.h>
 #endif
+#include <asm/u-boot.h>
 #include <linux/string.h>
 
 /*
diff --git a/drivers/ddr/fsl/fsl_ddr_gen4.c b/drivers/ddr/fsl/fsl_ddr_gen4.c
index e43c6801546..c0a9540f420 100644
--- a/drivers/ddr/fsl/fsl_ddr_gen4.c
+++ b/drivers/ddr/fsl/fsl_ddr_gen4.c
@@ -16,6 +16,7 @@
 	defined(CONFIG_ARM)
 #include <asm/arch/clock.h>
 #endif
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 
 #define CTLR_INTLV_MASK	0x20000000
diff --git a/drivers/ddr/fsl/mpc85xx_ddr_gen1.c b/drivers/ddr/fsl/mpc85xx_ddr_gen1.c
index 572f3703d51..467775d2be9 100644
--- a/drivers/ddr/fsl/mpc85xx_ddr_gen1.c
+++ b/drivers/ddr/fsl/mpc85xx_ddr_gen1.c
@@ -7,6 +7,7 @@
 #include <log.h>
 #include <asm/io.h>
 #include <fsl_ddr_sdram.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 
 #if (CONFIG_CHIP_SELECTS_PER_CTRL > 4)
diff --git a/drivers/ddr/fsl/mpc85xx_ddr_gen2.c b/drivers/ddr/fsl/mpc85xx_ddr_gen2.c
index d7b8064e5f1..14af7ca4a78 100644
--- a/drivers/ddr/fsl/mpc85xx_ddr_gen2.c
+++ b/drivers/ddr/fsl/mpc85xx_ddr_gen2.c
@@ -7,6 +7,7 @@
 #include <asm/io.h>
 #include <asm/processor.h>
 #include <fsl_ddr_sdram.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 
 #if (CONFIG_CHIP_SELECTS_PER_CTRL > 4)
diff --git a/drivers/ddr/fsl/mpc85xx_ddr_gen3.c b/drivers/ddr/fsl/mpc85xx_ddr_gen3.c
index 1ed4d50cc74..3c18d441ed1 100644
--- a/drivers/ddr/fsl/mpc85xx_ddr_gen3.c
+++ b/drivers/ddr/fsl/mpc85xx_ddr_gen3.c
@@ -8,6 +8,7 @@
 #include <asm/io.h>
 #include <fsl_ddr_sdram.h>
 #include <asm/processor.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 
 #if (CONFIG_CHIP_SELECTS_PER_CTRL > 4)
diff --git a/drivers/ddr/fsl/options.c b/drivers/ddr/fsl/options.c
index c000a45f8ea..fce4fb66334 100644
--- a/drivers/ddr/fsl/options.c
+++ b/drivers/ddr/fsl/options.c
@@ -9,6 +9,7 @@
 #include <hwconfig.h>
 #include <fsl_ddr_sdram.h>
 #include <log.h>
+#include <asm/u-boot.h>
 
 #include <fsl_ddr.h>
 #if defined(CONFIG_FSL_LSCH2) || defined(CONFIG_FSL_LSCH3) || \
diff --git a/drivers/ddr/fsl/util.c b/drivers/ddr/fsl/util.c
index ac4f8d2732d..2386667f3a0 100644
--- a/drivers/ddr/fsl/util.c
+++ b/drivers/ddr/fsl/util.c
@@ -8,6 +8,7 @@
 #include <asm/fsl_law.h>
 #endif
 #include <div64.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 
 #include <fsl_ddr.h>
diff --git a/drivers/dma/fsl_dma.c b/drivers/dma/fsl_dma.c
index b7eddf0f04c..a9d28779ebd 100644
--- a/drivers/dma/fsl_dma.c
+++ b/drivers/dma/fsl_dma.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <asm/io.h>
 #include <asm/fsl_dma.h>
+#include <asm/u-boot.h>
 
 /* Controller can only transfer 2^26 - 1 bytes at a time */
 #define FSL_DMA_MAX_SIZE	(0x3ffffff)
diff --git a/drivers/firmware/psci.c b/drivers/firmware/psci.c
index 9f4a936ecb6..22b04143d17 100644
--- a/drivers/firmware/psci.c
+++ b/drivers/firmware/psci.c
@@ -11,6 +11,7 @@
 #include <dm.h>
 #include <irq_func.h>
 #include <log.h>
+#include <asm/u-boot.h>
 #include <dm/lists.h>
 #include <efi_loader.h>
 #include <linux/delay.h>
diff --git a/drivers/i2c/fsl_i2c.c b/drivers/i2c/fsl_i2c.c
index c2000104b51..9be7587261c 100644
--- a/drivers/i2c/fsl_i2c.c
+++ b/drivers/i2c/fsl_i2c.c
@@ -17,6 +17,7 @@
 #include <clk.h>
 #include <dm.h>
 #include <mapmem.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 
diff --git a/drivers/input/i8042.c b/drivers/input/i8042.c
index b484cebfb4e..b490a99abce 100644
--- a/drivers/input/i8042.c
+++ b/drivers/input/i8042.c
@@ -16,6 +16,7 @@
 #include <log.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 
diff --git a/drivers/misc/fsl_ifc.c b/drivers/misc/fsl_ifc.c
index 8fdaacd5e04..d0b189c4db3 100644
--- a/drivers/misc/fsl_ifc.c
+++ b/drivers/misc/fsl_ifc.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <fsl_ifc.h>
 #include <part.h>
+#include <asm/u-boot.h>
 
 #ifdef CONFIG_TFABOOT
 struct ifc_regs ifc_cfg_default_boot[CONFIG_SYS_FSL_IFC_BANK_COUNT] = {
diff --git a/drivers/misc/fsl_portals.c b/drivers/misc/fsl_portals.c
index 2c8cec7c421..deaebb2eb23 100644
--- a/drivers/misc/fsl_portals.c
+++ b/drivers/misc/fsl_portals.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <linux/string.h>
diff --git a/drivers/misc/fsl_sec_mon.c b/drivers/misc/fsl_sec_mon.c
index 321bd27fd32..12c610f1dc9 100644
--- a/drivers/misc/fsl_sec_mon.c
+++ b/drivers/misc/fsl_sec_mon.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <fsl_sec_mon.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 
 static u32 get_sec_mon_state(void)
diff --git a/drivers/mmc/davinci_mmc.c b/drivers/mmc/davinci_mmc.c
index 9b2fe0653c6..50731f3fe7b 100644
--- a/drivers/mmc/davinci_mmc.c
+++ b/drivers/mmc/davinci_mmc.c
@@ -16,6 +16,7 @@
 #include <asm/io.h>
 #include <asm/arch/sdmmc_defs.h>
 #include <asm-generic/gpio.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 
diff --git a/drivers/mmc/dw_mmc.c b/drivers/mmc/dw_mmc.c
index ce7cfb5930e..3f8d4228150 100644
--- a/drivers/mmc/dw_mmc.c
+++ b/drivers/mmc/dw_mmc.c
@@ -17,6 +17,7 @@
 #include <time.h>
 #include <wait_bit.h>
 #include <asm/cache.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <power/regulator.h>
 
diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c
index 058ba827940..d18a8d0a314 100644
--- a/drivers/mmc/fsl_esdhc.c
+++ b/drivers/mmc/fsl_esdhc.c
@@ -25,6 +25,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm.h>
+#include <asm/u-boot.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/drivers/mmc/fsl_esdhc_imx.c b/drivers/mmc/fsl_esdhc_imx.c
index 29292147bcb..f0eb7c88805 100644
--- a/drivers/mmc/fsl_esdhc_imx.c
+++ b/drivers/mmc/fsl_esdhc_imx.c
@@ -23,6 +23,7 @@
 #include <time.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index e8c2360f976..e9c181555d0 100644
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@ -14,6 +14,7 @@
 #include <dm.h>
 #include <log.h>
 #include <time.h>
+#include <asm/u-boot.h>
 #include <dm/device-internal.h>
 #include <errno.h>
 #include <mmc.h>
diff --git a/drivers/mmc/mvebu_mmc.c b/drivers/mmc/mvebu_mmc.c
index 8101f6bcc27..b33cd40faee 100644
--- a/drivers/mmc/mvebu_mmc.c
+++ b/drivers/mmc/mvebu_mmc.c
@@ -19,6 +19,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
 #include <mvebu_mmc.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/mmc/mxcmmc.c b/drivers/mmc/mxcmmc.c
index 5ca4a5140e1..00720c64084 100644
--- a/drivers/mmc/mxcmmc.c
+++ b/drivers/mmc/mxcmmc.c
@@ -24,6 +24,7 @@
 #include <malloc.h>
 #include <mmc.h>
 #include <time.h>
+#include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
diff --git a/drivers/mmc/mxsmmc.c b/drivers/mmc/mxsmmc.c
index 5bb12b612e3..4df872cc3ec 100644
--- a/drivers/mmc/mxsmmc.c
+++ b/drivers/mmc/mxsmmc.c
@@ -24,6 +24,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <mmc.h>
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/mtd/altera_qspi.c b/drivers/mtd/altera_qspi.c
index c406963d757..79ac5a8d170 100644
--- a/drivers/mtd/altera_qspi.c
+++ b/drivers/mtd/altera_qspi.c
@@ -13,6 +13,7 @@
 #include <mtd.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/string.h>
 
diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c
index 21cdf62478a..9d4f5437b1f 100644
--- a/drivers/mtd/cfi_flash.c
+++ b/drivers/mtd/cfi_flash.c
@@ -31,6 +31,7 @@
 #include <asm/processor.h>
 #include <asm/io.h>
 #include <asm/byteorder.h>
+#include <asm/u-boot.h>
 #include <asm/unaligned.h>
 #include <env_internal.h>
 #include <linux/delay.h>
diff --git a/drivers/mtd/nand/raw/nand_bbt.c b/drivers/mtd/nand/raw/nand_bbt.c
index 4f3c3223ca7..9c758172c11 100644
--- a/drivers/mtd/nand/raw/nand_bbt.c
+++ b/drivers/mtd/nand/raw/nand_bbt.c
@@ -60,6 +60,7 @@
 #include <common.h>
 #include <log.h>
 #include <malloc.h>
+#include <asm/u-boot.h>
 #include <dm/devres.h>
 #include <linux/bug.h>
 #include <linux/compat.h>
diff --git a/drivers/mtd/onenand/onenand_bbt.c b/drivers/mtd/onenand/onenand_bbt.c
index 026280e5e62..a698961597f 100644
--- a/drivers/mtd/onenand/onenand_bbt.c
+++ b/drivers/mtd/onenand/onenand_bbt.c
@@ -16,6 +16,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <asm/u-boot.h>
 #include <linux/compat.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/onenand.h>
diff --git a/drivers/mtd/renesas_rpc_hf.c b/drivers/mtd/renesas_rpc_hf.c
index f15228741ff..7ac45b97b9f 100644
--- a/drivers/mtd/renesas_rpc_hf.c
+++ b/drivers/mtd/renesas_rpc_hf.c
@@ -13,6 +13,7 @@
 #include <asm/io.h>
 #include <clk.h>
 #include <dm.h>
+#include <asm/u-boot.h>
 #include <dm/device_compat.h>
 #include <dm/of_access.h>
 #include <errno.h>
diff --git a/drivers/net/ag7xxx.c b/drivers/net/ag7xxx.c
index 7171479c80d..518ba44da33 100644
--- a/drivers/net/ag7xxx.c
+++ b/drivers/net/ag7xxx.c
@@ -18,6 +18,7 @@
 #include <time.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/compiler.h>
 #include <linux/delay.h>
diff --git a/drivers/net/armada100_fec.c b/drivers/net/armada100_fec.c
index 2dbd2d870b3..375f1b13999 100644
--- a/drivers/net/armada100_fec.c
+++ b/drivers/net/armada100_fec.c
@@ -17,6 +17,7 @@
 #include <netdev.h>
 #include <asm/types.h>
 #include <asm/byteorder.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/mii.h>
diff --git a/drivers/net/at91_emac.c b/drivers/net/at91_emac.c
index b6282938788..62263cb435a 100644
--- a/drivers/net/at91_emac.c
+++ b/drivers/net/at91_emac.c
@@ -18,6 +18,7 @@
 #include <netdev.h>
 #include <malloc.h>
 #include <miiphy.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/mii.h>
 #include <linux/string.h>
diff --git a/drivers/net/ax88180.c b/drivers/net/ax88180.c
index a679b6529ff..b971c16a654 100644
--- a/drivers/net/ax88180.c
+++ b/drivers/net/ax88180.c
@@ -42,6 +42,7 @@
 #include <log.h>
 #include <net.h>
 #include <malloc.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/mii.h>
 #include <linux/string.h>
diff --git a/drivers/net/bcm-sf2-eth.c b/drivers/net/bcm-sf2-eth.c
index 7ffdd87449a..2e864208633 100644
--- a/drivers/net/bcm-sf2-eth.c
+++ b/drivers/net/bcm-sf2-eth.c
@@ -8,6 +8,7 @@
 #include <malloc.h>
 #include <net.h>
 #include <config.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/printk.h>
 #include <linux/string.h>
diff --git a/drivers/net/calxedaxgmac.c b/drivers/net/calxedaxgmac.c
index 75b519ccfd1..ff8131fafc2 100644
--- a/drivers/net/calxedaxgmac.c
+++ b/drivers/net/calxedaxgmac.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <malloc.h>
 #include <net.h>
+#include <asm/u-boot.h>
 #include <linux/compiler.h>
 #include <linux/delay.h>
 #include <linux/err.h>
diff --git a/drivers/net/dc2114x.c b/drivers/net/dc2114x.c
index 8eacba7083c..fea6ad77d0a 100644
--- a/drivers/net/dc2114x.c
+++ b/drivers/net/dc2114x.c
@@ -7,6 +7,7 @@
 #include <net.h>
 #include <netdev.h>
 #include <pci.h>
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/string.h>
diff --git a/drivers/net/designware.c b/drivers/net/designware.c
index 490db2b69fc..f325bf23731 100644
--- a/drivers/net/designware.c
+++ b/drivers/net/designware.c
@@ -21,6 +21,7 @@
 #include <reset.h>
 #include <time.h>
 #include <asm/cache.h>
+#include <asm/u-boot.h>
 #include <dm/device_compat.h>
 #include <dm/devres.h>
 #include <linux/compiler.h>
diff --git a/drivers/net/dm9000x.c b/drivers/net/dm9000x.c
index 9860830da09..928c6d85856 100644
--- a/drivers/net/dm9000x.c
+++ b/drivers/net/dm9000x.c
@@ -55,6 +55,7 @@ TODO: external MII is not functional, only internal at the moment.
 #include <time.h>
 #include <asm/io.h>
 #include <dm9000.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 
diff --git a/drivers/net/dnet.c b/drivers/net/dnet.c
index 888a9990efe..4efb8199dfb 100644
--- a/drivers/net/dnet.c
+++ b/drivers/net/dnet.c
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <log.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 cf2c56cd123..9613af44422 100644
--- a/drivers/net/e1000.c
+++ b/drivers/net/e1000.c
@@ -39,6 +39,7 @@ tested on both gig copper and gig fiber boards
 #include <memalign.h>
 #include <net.h>
 #include <pci.h>
+#include <asm/u-boot.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 392d44f89d7..9ff078176b8 100644
--- a/drivers/net/eepro100.c
+++ b/drivers/net/eepro100.c
@@ -12,6 +12,7 @@
 #include <net.h>
 #include <netdev.h>
 #include <pci.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 
diff --git a/drivers/net/ep93xx_eth.c b/drivers/net/ep93xx_eth.c
index a72d9c2471d..72ad7936d63 100644
--- a/drivers/net/ep93xx_eth.c
+++ b/drivers/net/ep93xx_eth.c
@@ -24,6 +24,7 @@
 #include <asm/io.h>
 #include <malloc.h>
 #include <miiphy.h>
+#include <asm/u-boot.h>
 #include <linux/bug.h>
 #include <linux/printk.h>
 #include <linux/string.h>
diff --git a/drivers/net/ethoc.c b/drivers/net/ethoc.c
index 7c56b7242d4..f158c7625bd 100644
--- a/drivers/net/ethoc.c
+++ b/drivers/net/ethoc.c
@@ -14,6 +14,7 @@
 #include <dm.h>
 #include <log.h>
 #include <time.h>
+#include <asm/u-boot.h>
 #include <dm/platform_data/net_ethoc.h>
 #include <linux/io.h>
 #include <malloc.h>
diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c
index eef443f5f63..1d8bdb9e12f 100644
--- a/drivers/net/fec_mxc.c
+++ b/drivers/net/fec_mxc.c
@@ -20,6 +20,7 @@
 #include <time.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 #include <power/regulator.h>
diff --git a/drivers/net/fec_mxc.h b/drivers/net/fec_mxc.h
index 5ccde9193b2..20e1712a077 100644
--- a/drivers/net/fec_mxc.h
+++ b/drivers/net/fec_mxc.h
@@ -17,6 +17,7 @@
 #define __FEC_MXC_H
 
 #include <clk.h>
+#include <asm/u-boot.h>
 
 /* Layout description of the FEC */
 struct ethernet_regs {
diff --git a/drivers/net/fm/eth.c b/drivers/net/fm/eth.c
index 252f9678799..358643c70fb 100644
--- a/drivers/net/fm/eth.c
+++ b/drivers/net/fm/eth.c
@@ -24,6 +24,7 @@
 #include <fsl_dtsec.h>
 #include <fsl_tgec.h>
 #include <fsl_memac.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 
diff --git a/drivers/net/fm/init.c b/drivers/net/fm/init.c
index 8f1a45b3a22..b779b5c2299 100644
--- a/drivers/net/fm/init.c
+++ b/drivers/net/fm/init.c
@@ -14,6 +14,7 @@
 #else
 #include <asm/fsl_serdes.h>
 #endif
+#include <asm/u-boot.h>
 #include <linux/string.h>
 
 #include "fm.h"
diff --git a/drivers/net/fm/memac_phy.c b/drivers/net/fm/memac_phy.c
index 53e0760833c..72246192b3c 100644
--- a/drivers/net/fm/memac_phy.c
+++ b/drivers/net/fm/memac_phy.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <fsl_memac.h>
 #include <fm_eth.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 
 #ifdef CONFIG_SYS_MEMAC_LITTLE_ENDIAN
diff --git a/drivers/net/fm/tgec_phy.c b/drivers/net/fm/tgec_phy.c
index ad6c08e431c..39044418796 100644
--- a/drivers/net/fm/tgec_phy.c
+++ b/drivers/net/fm/tgec_phy.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <fsl_tgec.h>
 #include <fm_eth.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 
 /*
diff --git a/drivers/net/fsl-mc/dpio/qbman_private.h b/drivers/net/fsl-mc/dpio/qbman_private.h
index 53f1300eaf8..59b83487cf8 100644
--- a/drivers/net/fsl-mc/dpio/qbman_private.h
+++ b/drivers/net/fsl-mc/dpio/qbman_private.h
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <errno.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 #include <linux/bug.h>
 #include <linux/types.h>
 #include <asm/atomic.h>
diff --git a/drivers/net/fsl-mc/mc.c b/drivers/net/fsl-mc/mc.c
index e088d1fc12d..1ce12ae5db9 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 <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/bug.h>
 #include <asm/io.h>
 #include <linux/delay.h>
diff --git a/drivers/net/fsl_mcdmafec.c b/drivers/net/fsl_mcdmafec.c
index 62f9d00ece3..1c2449d18f4 100644
--- a/drivers/net/fsl_mcdmafec.c
+++ b/drivers/net/fsl_mcdmafec.c
@@ -19,6 +19,7 @@
 #include <net.h>
 #include <miiphy.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/mii.h>
 #include <asm/immap.h>
diff --git a/drivers/net/fsl_mdio.c b/drivers/net/fsl_mdio.c
index 5f692a27f23..a06b7201335 100644
--- a/drivers/net/fsl_mdio.c
+++ b/drivers/net/fsl_mdio.c
@@ -10,6 +10,7 @@
 #include <phy.h>
 #include <fsl_mdio.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 
diff --git a/drivers/net/ftmac100.c b/drivers/net/ftmac100.c
index c61d13aa21f..763e0f72318 100644
--- a/drivers/net/ftmac100.c
+++ b/drivers/net/ftmac100.c
@@ -14,6 +14,7 @@
 #include <net.h>
 #include <time.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/io.h>
 #include <linux/string.h>
diff --git a/drivers/net/ftmac110.c b/drivers/net/ftmac110.c
index f186148b619..449bb987355 100644
--- a/drivers/net/ftmac110.c
+++ b/drivers/net/ftmac110.c
@@ -13,6 +13,7 @@
 #include <net.h>
 #include <time.h>
 #include <asm/cache.h>
+#include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <asm/io.h>
 #include <linux/dma-mapping.h>
diff --git a/drivers/net/ks8851_mll.c b/drivers/net/ks8851_mll.c
index d22668446da..be4da897b8d 100644
--- a/drivers/net/ks8851_mll.c
+++ b/drivers/net/ks8851_mll.c
@@ -11,6 +11,7 @@
 #include <malloc.h>
 #include <net.h>
 #include <miiphy.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 
 #include "ks8851_mll.h"
diff --git a/drivers/net/lan91c96.c b/drivers/net/lan91c96.c
index 524e9455ccf..bcaa18747f4 100644
--- a/drivers/net/lan91c96.c
+++ b/drivers/net/lan91c96.c
@@ -49,6 +49,7 @@
 #include <env.h>
 #include <malloc.h>
 #include <time.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 #include "lan91c96.h"
diff --git a/drivers/net/ldpaa_eth/ldpaa_eth.c b/drivers/net/ldpaa_eth/ldpaa_eth.c
index d5384b216ab..c4befd9028b 100644
--- a/drivers/net/ldpaa_eth/ldpaa_eth.c
+++ b/drivers/net/ldpaa_eth/ldpaa_eth.c
@@ -16,6 +16,7 @@
 #include <hwconfig.h>
 #include <phy.h>
 #include <miiphy.h>
+#include <asm/u-boot.h>
 #include <linux/bug.h>
 #include <linux/compat.h>
 #include <fsl-mc/fsl_dpmac.h>
diff --git a/drivers/net/lpc32xx_eth.c b/drivers/net/lpc32xx_eth.c
index b059accf524..4b4b09b5438 100644
--- a/drivers/net/lpc32xx_eth.c
+++ b/drivers/net/lpc32xx_eth.c
@@ -12,6 +12,7 @@
 #include <malloc.h>
 #include <miiphy.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/types.h>
diff --git a/drivers/net/macb.c b/drivers/net/macb.c
index 26939c6fa46..ec8817799da 100644
--- a/drivers/net/macb.c
+++ b/drivers/net/macb.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <log.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 
diff --git a/drivers/net/mcffec.c b/drivers/net/mcffec.c
index 2d307b23afb..d5bead5e2ce 100644
--- a/drivers/net/mcffec.c
+++ b/drivers/net/mcffec.c
@@ -20,6 +20,7 @@
 #include <asm/fec.h>
 #include <asm/global_data.h>
 #include <asm/immap.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/mii.h>
 #include <linux/string.h>
diff --git a/drivers/net/mpc8xx_fec.c b/drivers/net/mpc8xx_fec.c
index b6f805683e2..9cf1f5cba9f 100644
--- a/drivers/net/mpc8xx_fec.c
+++ b/drivers/net/mpc8xx_fec.c
@@ -13,6 +13,7 @@
 #include <asm/cpm_8xx.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 
diff --git a/drivers/net/mvgbe.c b/drivers/net/mvgbe.c
index 5ceb37324f3..54febc7ce42 100644
--- a/drivers/net/mvgbe.c
+++ b/drivers/net/mvgbe.c
@@ -20,6 +20,7 @@
 #include <wait_bit.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/types.h>
diff --git a/drivers/net/natsemi.c b/drivers/net/natsemi.c
index e44787d33ba..5f81d22bf0e 100644
--- a/drivers/net/natsemi.c
+++ b/drivers/net/natsemi.c
@@ -56,6 +56,7 @@
 #include <netdev.h>
 #include <asm/io.h>
 #include <pci.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 
diff --git a/drivers/net/ne2000_base.c b/drivers/net/ne2000_base.c
index 2fad4671220..409c41a179b 100644
--- a/drivers/net/ne2000_base.c
+++ b/drivers/net/ne2000_base.c
@@ -79,6 +79,7 @@ Add SNMP
 #include <net.h>
 #include <malloc.h>
 #include <time.h>
+#include <asm/u-boot.h>
 #include <linux/compiler.h>
 #include <linux/string.h>
 
diff --git a/drivers/net/ns8382x.c b/drivers/net/ns8382x.c
index 7192156a698..7ae60e8a3e7 100644
--- a/drivers/net/ns8382x.c
+++ b/drivers/net/ns8382x.c
@@ -57,6 +57,7 @@
 #include <netdev.h>
 #include <asm/io.h>
 #include <pci.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 
diff --git a/drivers/net/pcnet.c b/drivers/net/pcnet.c
index 1f5cca71835..b1c0a8badd1 100644
--- a/drivers/net/pcnet.c
+++ b/drivers/net/pcnet.c
@@ -18,6 +18,7 @@
 #include <asm/cache.h>
 #include <asm/io.h>
 #include <pci.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 
diff --git a/drivers/net/pfe_eth/pfe_driver.c b/drivers/net/pfe_eth/pfe_driver.c
index 573ceabcf7e..d2d23858961 100644
--- a/drivers/net/pfe_eth/pfe_driver.c
+++ b/drivers/net/pfe_eth/pfe_driver.c
@@ -6,6 +6,7 @@
 
 #include <log.h>
 #include <malloc.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 #include <net/pfe_eth/pfe_eth.h>
diff --git a/drivers/net/rtl8139.c b/drivers/net/rtl8139.c
index 1229e94185c..f52fa66a4eb 100644
--- a/drivers/net/rtl8139.c
+++ b/drivers/net/rtl8139.c
@@ -77,6 +77,7 @@
 #include <netdev.h>
 #include <asm/io.h>
 #include <pci.h>
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/string.h>
diff --git a/drivers/net/rtl8169.c b/drivers/net/rtl8169.c
index 9157dd1e351..683e5d5d9e9 100644
--- a/drivers/net/rtl8169.c
+++ b/drivers/net/rtl8169.c
@@ -54,6 +54,7 @@
 #include <asm/cache.h>
 #include <asm/io.h>
 #include <pci.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/printk.h>
 #include <linux/string.h>
diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c
index 8f2fe1515e6..5ea0adb6b10 100644
--- a/drivers/net/sh_eth.c
+++ b/drivers/net/sh_eth.c
@@ -19,6 +19,7 @@
 #include <miiphy.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/io.h>
diff --git a/drivers/net/smc91111.c b/drivers/net/smc91111.c
index 3ae55a1db7d..a341bca51cf 100644
--- a/drivers/net/smc91111.c
+++ b/drivers/net/smc91111.c
@@ -52,6 +52,7 @@
 #include <config.h>
 #include <malloc.h>
 #include <time.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 #include "smc91111.h"
diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
index 0ac1e3fb3d7..6f352165117 100644
--- a/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.c
@@ -10,6 +10,7 @@
 #include <malloc.h>
 #include <net.h>
 #include <miiphy.h>
+#include <asm/u-boot.h>
 #include <linux/io.h>
 #include <linux/delay.h>
 #include <linux/string.h>
diff --git a/drivers/net/ti/cpsw.c b/drivers/net/ti/cpsw.c
index 044a74776c3..921d5639426 100644
--- a/drivers/net/ti/cpsw.c
+++ b/drivers/net/ti/cpsw.c
@@ -15,6 +15,7 @@
 #include <net.h>
 #include <netdev.h>
 #include <cpsw.h>
+#include <asm/u-boot.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/compiler.h>
diff --git a/drivers/net/tsec.c b/drivers/net/tsec.c
index b7623bf85b1..5ab450cf8a4 100644
--- a/drivers/net/tsec.c
+++ b/drivers/net/tsec.c
@@ -15,6 +15,7 @@
 #include <command.h>
 #include <tsec.h>
 #include <fsl_mdio.h>
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/net/uli526x.c b/drivers/net/uli526x.c
index 3784f72b87e..d6bc29c0c10 100644
--- a/drivers/net/uli526x.c
+++ b/drivers/net/uli526x.c
@@ -16,6 +16,7 @@
 #include <asm/io.h>
 #include <pci.h>
 #include <miiphy.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 
diff --git a/drivers/net/vsc9953.c b/drivers/net/vsc9953.c
index 29f26b4b332..a4c701e86a3 100644
--- a/drivers/net/vsc9953.c
+++ b/drivers/net/vsc9953.c
@@ -17,6 +17,7 @@
 #include <malloc.h>
 #include <vsc9953.h>
 #include <ethsw.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 
 static struct vsc9953_info vsc9953_l2sw = {
diff --git a/drivers/pci/pci-emul-uclass.c b/drivers/pci/pci-emul-uclass.c
index a52064341e0..6355daee5e1 100644
--- a/drivers/pci/pci-emul-uclass.c
+++ b/drivers/pci/pci-emul-uclass.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <fdtdec.h>
 #include <log.h>
+#include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <pci.h>
 #include <dm/lists.h>
diff --git a/drivers/pci/pci-uclass.c b/drivers/pci/pci-uclass.c
index b40765a3894..7b039c98243 100644
--- a/drivers/pci/pci-uclass.c
+++ b/drivers/pci/pci-uclass.c
@@ -13,6 +13,7 @@
 #include <pci.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 #include <dm/device-internal.h>
 #include <dm/lists.h>
 #if defined(CONFIG_X86) && defined(CONFIG_HAVE_FSP)
diff --git a/drivers/pci/pcie_layerscape.c b/drivers/pci/pcie_layerscape.c
index 3c7c4ca18e8..9369457b8e7 100644
--- a/drivers/pci/pcie_layerscape.c
+++ b/drivers/pci/pcie_layerscape.c
@@ -15,6 +15,7 @@
 	defined(CONFIG_ARM)
 #include <asm/arch/clock.h>
 #endif
+#include <asm/u-boot.h>
 #include "pcie_layerscape.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/pci/pcie_layerscape_ep.c b/drivers/pci/pcie_layerscape_ep.c
index 6de93fac997..c029b1ef735 100644
--- a/drivers/pci/pcie_layerscape_ep.c
+++ b/drivers/pci/pcie_layerscape_ep.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <dm/devres.h>
 #include <errno.h>
 #include <pci_ep.h>
diff --git a/drivers/pci/pcie_layerscape_fixup.c b/drivers/pci/pcie_layerscape_fixup.c
index 94de4edaf4f..d056294d649 100644
--- a/drivers/pci/pcie_layerscape_fixup.c
+++ b/drivers/pci/pcie_layerscape_fixup.c
@@ -18,6 +18,7 @@
 #ifdef CONFIG_ARM
 #include <asm/arch/clock.h>
 #endif
+#include <asm/u-boot.h>
 #include "pcie_layerscape.h"
 #include "pcie_layerscape_fixup_common.h"
 
diff --git a/drivers/pci/pcie_layerscape_fixup_common.c b/drivers/pci/pcie_layerscape_fixup_common.c
index bba410e386f..b1a7578ec43 100644
--- a/drivers/pci/pcie_layerscape_fixup_common.c
+++ b/drivers/pci/pcie_layerscape_fixup_common.c
@@ -11,6 +11,7 @@
 #include <init.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/soc.h>
+#include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <linux/string.h>
 #include "pcie_layerscape_fixup_common.h"
diff --git a/drivers/pci/pcie_layerscape_fixup_common.h b/drivers/pci/pcie_layerscape_fixup_common.h
index 70bd3f0cba3..0d9504fe672 100644
--- a/drivers/pci/pcie_layerscape_fixup_common.h
+++ b/drivers/pci/pcie_layerscape_fixup_common.h
@@ -10,6 +10,7 @@
 #define _PCIE_LAYERSCAPE_FIXUP_COMMON_H_
 
 #include <common.h>
+#include <asm/u-boot.h>
 
 void ft_pci_setup_ls(void *blob, struct bd_info *bd);
 
diff --git a/drivers/pci/pcie_layerscape_gen4_fixup.c b/drivers/pci/pcie_layerscape_gen4_fixup.c
index 375ce45839b..b061388a22b 100644
--- a/drivers/pci/pcie_layerscape_gen4_fixup.c
+++ b/drivers/pci/pcie_layerscape_gen4_fixup.c
@@ -19,6 +19,7 @@
 #ifdef CONFIG_ARM
 #include <asm/arch/clock.h>
 #endif
+#include <asm/u-boot.h>
 #include "pcie_layerscape_gen4.h"
 #include "pcie_layerscape_fixup_common.h"
 
diff --git a/drivers/pci/pcie_layerscape_rc.c b/drivers/pci/pcie_layerscape_rc.c
index 7ae5b48bb92..1c5d73c0f75 100644
--- a/drivers/pci/pcie_layerscape_rc.c
+++ b/drivers/pci/pcie_layerscape_rc.c
@@ -12,6 +12,7 @@
 #include <errno.h>
 #include <malloc.h>
 #include <dm.h>
+#include <asm/u-boot.h>
 #include <dm/devres.h>
 #if defined(CONFIG_FSL_LSCH2) || defined(CONFIG_FSL_LSCH3) || \
 	defined(CONFIG_ARM)
diff --git a/drivers/qe/uec.c b/drivers/qe/uec.c
index 409d806dd8f..3d2a37466a5 100644
--- a/drivers/qe/uec.c
+++ b/drivers/qe/uec.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <net.h>
 #include <malloc.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/io.h>
diff --git a/drivers/rtc/ds174x.c b/drivers/rtc/ds174x.c
index 94f943d97a5..a7bd3e02509 100644
--- a/drivers/rtc/ds174x.c
+++ b/drivers/rtc/ds174x.c
@@ -15,6 +15,7 @@
 #include <common.h>
 #include <command.h>
 #include <rtc.h>
+#include <asm/u-boot.h>
 
 static uchar rtc_read( unsigned int addr );
 static void  rtc_write( unsigned int addr, uchar val);
diff --git a/drivers/rtc/mc146818.c b/drivers/rtc/mc146818.c
index b98c39d8219..5ef086d6006 100644
--- a/drivers/rtc/mc146818.c
+++ b/drivers/rtc/mc146818.c
@@ -12,6 +12,7 @@
 #include <command.h>
 #include <dm.h>
 #include <rtc.h>
+#include <asm/u-boot.h>
 
 #if defined(CONFIG_X86) || defined(CONFIG_MALTA)
 #include <asm/io.h>
diff --git a/drivers/rtc/mk48t59.c b/drivers/rtc/mk48t59.c
index 8c90a704076..0fa155c14d0 100644
--- a/drivers/rtc/mk48t59.c
+++ b/drivers/rtc/mk48t59.c
@@ -15,6 +15,7 @@
 #include <config.h>
 #include <rtc.h>
 #include <mk48t59.h>
+#include <asm/u-boot.h>
 
 #if defined(CONFIG_BAB7xx)
 
diff --git a/drivers/spi/fsl_espi.c b/drivers/spi/fsl_espi.c
index 35f8a58da16..cf79947cb44 100644
--- a/drivers/spi/fsl_espi.c
+++ b/drivers/spi/fsl_espi.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <log.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/string.h>
diff --git a/drivers/sysreset/sysreset_sandbox.c b/drivers/sysreset/sysreset_sandbox.c
index cb90266ab0c..5d14a01ca74 100644
--- a/drivers/sysreset/sysreset_sandbox.c
+++ b/drivers/sysreset/sysreset_sandbox.c
@@ -10,6 +10,7 @@
 #include <sysreset.h>
 #include <asm/state.h>
 #include <asm/test.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 
 static int sandbox_warm_sysreset_request(struct udevice *dev,
diff --git a/drivers/timer/mpc83xx_timer.c b/drivers/timer/mpc83xx_timer.c
index 51ad79aa6eb..becaadee7d6 100644
--- a/drivers/timer/mpc83xx_timer.c
+++ b/drivers/timer/mpc83xx_timer.c
@@ -16,6 +16,7 @@
 #include <watchdog.h>
 #include <asm/global_data.h>
 #include <asm/ptrace.h>
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/timer/tsc_timer.c b/drivers/timer/tsc_timer.c
index b4c40fe1c2d..94ebd8ad54e 100644
--- a/drivers/timer/tsc_timer.c
+++ b/drivers/timer/tsc_timer.c
@@ -20,6 +20,7 @@
 #include <asm/ibmpc.h>
 #include <asm/msr.h>
 #include <asm/u-boot-x86.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 
 #define MAX_NUM_FREQS	9
diff --git a/drivers/usb/common/fsl-dt-fixup.c b/drivers/usb/common/fsl-dt-fixup.c
index 5fc887c7cf7..bda8885d7cd 100644
--- a/drivers/usb/common/fsl-dt-fixup.c
+++ b/drivers/usb/common/fsl-dt-fixup.c
@@ -15,6 +15,7 @@
 #include <fsl_errata.h>
 #include <fsl_usb.h>
 #include <fdt_support.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 
 #ifndef CONFIG_USB_MAX_CONTROLLER_COUNT
diff --git a/drivers/usb/common/fsl-errata.c b/drivers/usb/common/fsl-errata.c
index 9eb1d230672..297a05baf3e 100644
--- a/drivers/usb/common/fsl-errata.c
+++ b/drivers/usb/common/fsl-errata.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <hwconfig.h>
 #include <fsl_errata.h>
+#include <asm/u-boot.h>
 #include<fsl_usb.h>
 #if defined(CONFIG_FSL_LSCH2) || defined(CONFIG_FSL_LSCH3) || \
 	defined(CONFIG_ARM)
diff --git a/drivers/usb/eth/asix.c b/drivers/usb/eth/asix.c
index 3a0d8dadb35..c649813600b 100644
--- a/drivers/usb/eth/asix.c
+++ b/drivers/usb/eth/asix.c
@@ -12,6 +12,7 @@
 #include <usb.h>
 #include <malloc.h>
 #include <memalign.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/mii.h>
 #include <linux/string.h>
diff --git a/drivers/usb/eth/asix88179.c b/drivers/usb/eth/asix88179.c
index b4249d9ad51..f26b47dcb6a 100644
--- a/drivers/usb/eth/asix88179.c
+++ b/drivers/usb/eth/asix88179.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <usb.h>
 #include <net.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/mii.h>
 #include <linux/string.h>
diff --git a/drivers/usb/eth/mcs7830.c b/drivers/usb/eth/mcs7830.c
index 5cdd7a10e7c..c9bbc4035c1 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 <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/mii.h>
 #include <malloc.h>
diff --git a/drivers/usb/eth/r8152.c b/drivers/usb/eth/r8152.c
index 40947150a0b..0f37a5aaea5 100644
--- a/drivers/usb/eth/r8152.c
+++ b/drivers/usb/eth/r8152.c
@@ -12,6 +12,7 @@
 #include <memalign.h>
 #include <net.h>
 #include <usb.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/mii.h>
 #include <linux/bitops.h>
diff --git a/drivers/usb/eth/smsc95xx.c b/drivers/usb/eth/smsc95xx.c
index 5d8e93c2337..f12e67bf238 100644
--- a/drivers/usb/eth/smsc95xx.c
+++ b/drivers/usb/eth/smsc95xx.c
@@ -15,6 +15,7 @@
 #include <net.h>
 #include <time.h>
 #include <usb.h>
+#include <asm/u-boot.h>
 #include <asm/unaligned.h>
 #include <linux/delay.h>
 #include <linux/mii.h>
diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c
index f12b07fd1ab..f58bd60a8cb 100644
--- a/drivers/usb/gadget/ether.c
+++ b/drivers/usb/gadget/ether.c
@@ -13,6 +13,7 @@
 #include <log.h>
 #include <part.h>
 #include <time.h>
+#include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <linux/netdevice.h>
 #include <linux/printk.h>
diff --git a/drivers/usb/host/ehci-marvell.c b/drivers/usb/host/ehci-marvell.c
index 9f6b8a2ae5f..440280f722e 100644
--- a/drivers/usb/host/ehci-marvell.c
+++ b/drivers/usb/host/ehci-marvell.c
@@ -10,6 +10,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <usb.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include "ehci.h"
 #include <linux/mbus.h>
diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c
index f9e3c1ac43e..bc1e999b761 100644
--- a/drivers/video/cfb_console.c
+++ b/drivers/video/cfb_console.c
@@ -75,6 +75,7 @@
 #include <malloc.h>
 #include <video.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/compiler.h>
 #include <linux/string.h>
 
diff --git a/drivers/video/fsl_dcu_fb.c b/drivers/video/fsl_dcu_fb.c
index bfa4ed3129b..1d3d26c3e89 100644
--- a/drivers/video/fsl_dcu_fb.c
+++ b/drivers/video/fsl_dcu_fb.c
@@ -14,6 +14,7 @@
 #include <dm.h>
 #include <fdt_support.h>
 #include <fsl_dcu_fb.h>
+#include <asm/u-boot.h>
 #include <linux/fb.h>
 #include <malloc.h>
 #include <video.h>
diff --git a/drivers/video/fsl_diu_fb.c b/drivers/video/fsl_diu_fb.c
index e90e23779d7..5fd6a8084d5 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 <asm/io.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 
 #include "videomodes.h"
diff --git a/drivers/video/meson/meson_vpu.c b/drivers/video/meson/meson_vpu.c
index 2d095c6a28e..b34e5df5630 100644
--- a/drivers/video/meson/meson_vpu.c
+++ b/drivers/video/meson/meson_vpu.c
@@ -14,6 +14,7 @@
 #include <log.h>
 #include <part.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/sizes.h>
 #include <asm/arch/mem.h>
 #include <dm/device-internal.h>
diff --git a/drivers/video/sunxi/sunxi_de2.c b/drivers/video/sunxi/sunxi_de2.c
index 6e3999649d3..8529504014e 100644
--- a/drivers/video/sunxi/sunxi_de2.c
+++ b/drivers/video/sunxi/sunxi_de2.c
@@ -19,6 +19,7 @@
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/display2.h>
+#include <asm/u-boot.h>
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
 #include <linux/bitops.h>
diff --git a/drivers/video/sunxi/sunxi_display.c b/drivers/video/sunxi/sunxi_display.c
index d1330314621..1967a2a1f6c 100644
--- a/drivers/video/sunxi/sunxi_display.c
+++ b/drivers/video/sunxi/sunxi_display.c
@@ -11,6 +11,7 @@
 #include <efi_loader.h>
 #include <init.h>
 #include <time.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 
diff --git a/include/asm-generic/global_data.h b/include/asm-generic/global_data.h
index d4a4e2215dc..7a6b90d7da0 100644
--- a/include/asm-generic/global_data.h
+++ b/include/asm-generic/global_data.h
@@ -22,6 +22,7 @@
 #ifndef __ASSEMBLY__
 #include <fdtdec.h>
 #include <membuff.h>
+#include <asm/u-boot.h>
 #include <linux/list.h>
 
 typedef struct global_data {
diff --git a/include/asm-generic/u-boot.h b/include/asm-generic/u-boot.h
index 62e61d41cc9..3d4f2247e2c 100644
--- a/include/asm-generic/u-boot.h
+++ b/include/asm-generic/u-boot.h
@@ -24,6 +24,7 @@
 #ifndef __ASSEMBLY__
 
 #include <asm/types.h>
+#include <asm/u-boot.h>
 #include <linux/types.h>
 
 struct bd_info {
diff --git a/include/button.h b/include/button.h
index 688b63b082c..ee14fadf0cf 100644
--- a/include/button.h
+++ b/include/button.h
@@ -6,6 +6,8 @@
 #ifndef __BUTTON_H
 #define __BUTTON_H
 
+struct udevice;
+
 /**
  * struct button_uc_plat - Platform data the uclass stores about each device
  *
diff --git a/include/clock_legacy.h b/include/clock_legacy.h
index b0a8333ea6e..7c9a66adf33 100644
--- a/include/clock_legacy.h
+++ b/include/clock_legacy.h
@@ -7,6 +7,7 @@
 #ifndef __CLOCK_LEGACY_H
 #define __CLOCK_LEGACY_H
 
+#include <asm/u-boot.h>
 int get_clocks(void);
 unsigned long get_bus_freq(unsigned long dummy);
 int get_serial_clock(void);
diff --git a/include/common.h b/include/common.h
index 69fa1932483..6407748e53d 100644
--- a/include/common.h
+++ b/include/common.h
@@ -19,7 +19,6 @@
 #include <stdarg.h>
 #include <stdio.h>
 #include <linux/kernel.h>
-#include <asm/u-boot.h> /* boot information for Linux kernel */
 #include <vsprintf.h>
 #endif	/* __ASSEMBLY__ */
 
diff --git a/include/fdtdec.h b/include/fdtdec.h
index 760b392bdfb..138c1e9b590 100644
--- a/include/fdtdec.h
+++ b/include/fdtdec.h
@@ -14,6 +14,7 @@
  * changes to support FDT are minimized.
  */
 
+#include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <pci.h>
 
diff --git a/include/fm_eth.h b/include/fm_eth.h
index 44da014c66c..0a6000137b1 100644
--- a/include/fm_eth.h
+++ b/include/fm_eth.h
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <phy.h>
 #include <asm/types.h>
+#include <asm/u-boot.h>
 
 enum fm_port {
 	FM1_DTSEC1,
diff --git a/include/fsl-mc/fsl_mc.h b/include/fsl-mc/fsl_mc.h
index a8b072ad7c1..732b4953b5d 100644
--- a/include/fsl-mc/fsl_mc.h
+++ b/include/fsl-mc/fsl_mc.h
@@ -7,6 +7,7 @@
 #define __FSL_MC_H__
 
 #include <common.h>
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 
 #define MC_CCSR_BASE_ADDR \
diff --git a/include/fsl_ddr_sdram.h b/include/fsl_ddr_sdram.h
index 56c9db2594c..43face5c435 100644
--- a/include/fsl_ddr_sdram.h
+++ b/include/fsl_ddr_sdram.h
@@ -12,6 +12,7 @@
  */
 #include <ddr_spd.h>
 #include <fsl_ddrc_version.h>
+#include <asm/u-boot.h>
 
 #define SDRAM_TYPE_DDR1		2
 #define SDRAM_TYPE_DDR2		3
diff --git a/include/fsl_errata.h b/include/fsl_errata.h
index 88f4268658a..95ac2e3e10c 100644
--- a/include/fsl_errata.h
+++ b/include/fsl_errata.h
@@ -14,6 +14,7 @@
 #elif defined(CONFIG_FSL_LAYERSCAPE)
 #include <asm/arch/soc.h>
 #endif
+#include <asm/u-boot.h>
 
 
 #ifdef CONFIG_SYS_FSL_ERRATUM_A006379
diff --git a/include/fsl_esdhc.h b/include/fsl_esdhc.h
index 7f8f8edc621..e15d10c669d 100644
--- a/include/fsl_esdhc.h
+++ b/include/fsl_esdhc.h
@@ -207,6 +207,7 @@ void fdt_fixup_esdhc(void *blob, struct bd_info *bd);
 static inline int fsl_esdhc_execute_tuning(struct udevice *dev,
 					   uint32_t opcode) {return 0; }
 #endif
+#include <asm/u-boot.h>
 #else
 static inline int fsl_esdhc_mmc_init(struct bd_info *bis) { return -ENOSYS; }
 static inline void fdt_fixup_esdhc(void *blob, struct bd_info *bd) {}
diff --git a/include/fsl_esdhc_imx.h b/include/fsl_esdhc_imx.h
index 45ed635a77b..78f0e18dde3 100644
--- a/include/fsl_esdhc_imx.h
+++ b/include/fsl_esdhc_imx.h
@@ -12,6 +12,7 @@
 #ifndef __FSL_ESDHC_IMX_H__
 #define __FSL_ESDHC_IMX_H__
 
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <asm/byteorder.h>
diff --git a/include/fsl_mdio.h b/include/fsl_mdio.h
index 41cb73717bc..b8fed2a0d2c 100644
--- a/include/fsl_mdio.h
+++ b/include/fsl_mdio.h
@@ -10,6 +10,7 @@
 
 #include <net.h>
 #include <miiphy.h>
+#include <asm/u-boot.h>
 
 struct tsec_mii_mng {
 	u32 miimcfg;		/* MII management configuration reg */
diff --git a/include/mmc.h b/include/mmc.h
index 82562193cc4..c1562a61ea5 100644
--- a/include/mmc.h
+++ b/include/mmc.h
@@ -9,6 +9,7 @@
 #ifndef _MMC_H_
 #define _MMC_H_
 
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/list.h>
 #include <linux/sizes.h>
diff --git a/include/mvebu_mmc.h b/include/mvebu_mmc.h
index a35e5a12ce8..790199ca5e6 100644
--- a/include/mvebu_mmc.h
+++ b/include/mvebu_mmc.h
@@ -12,6 +12,7 @@
 
 /* needed for the mmc_cfg definition */
 #include <mmc.h>
+#include <asm/u-boot.h>
 
 #define MMC_BLOCK_SIZE				512
 
diff --git a/include/net.h b/include/net.h
index 26163f9f097..bf6e2f05227 100644
--- a/include/net.h
+++ b/include/net.h
@@ -12,6 +12,7 @@
 #ifndef __NET_H__
 #define __NET_H__
 
+#include <asm/u-boot.h>
 #include <linux/string.h>
 #include <linux/types.h>
 #include <asm/cache.h>
diff --git a/include/net/pfe_eth/pfe_eth.h b/include/net/pfe_eth/pfe_eth.h
index 92dc46ee9ac..64ac9be763c 100644
--- a/include/net/pfe_eth/pfe_eth.h
+++ b/include/net/pfe_eth/pfe_eth.h
@@ -7,6 +7,7 @@
 #ifndef __PFE_ETH_H__
 #define __PFE_ETH_H__
 
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/sizes.h>
 #include <asm/io.h>
diff --git a/include/netdev.h b/include/netdev.h
index 0ad9f8dc3a5..52db3d56411 100644
--- a/include/netdev.h
+++ b/include/netdev.h
@@ -11,6 +11,7 @@
 #ifndef _NETDEV_H_
 #define _NETDEV_H_
 #include <phy_interface.h>
+#include <asm/u-boot.h>
 
 struct udevice;
 
diff --git a/include/post.h b/include/post.h
index eb218acde5f..cea1a53c4c1 100644
--- a/include/post.h
+++ b/include/post.h
@@ -22,16 +22,19 @@
 #else
 
 #if defined(CONFIG_ARCH_MPC8360)
+#include <asm/u-boot.h>
 #include <linux/immap_qe.h>
 #define _POST_WORD_ADDR	(CONFIG_SYS_IMMR + CPM_POST_WORD_ADDR)
 
 #elif defined (CONFIG_MPC85xx)
 #include <asm/immap_85xx.h>
+#include <asm/u-boot.h>
 #define _POST_WORD_ADDR	(CONFIG_SYS_IMMR + CONFIG_SYS_MPC85xx_PIC_OFFSET + \
 				offsetof(ccsr_pic_t, tfrr))
 
 #elif defined (CONFIG_MPC86xx)
 #include <asm/immap_86xx.h>
+#include <asm/u-boot.h>
 #define _POST_WORD_ADDR	(CONFIG_SYS_IMMR + CONFIG_SYS_MPC86xx_PIC_OFFSET + \
 				offsetof(ccsr_pic_t, tfrr))
 #endif
diff --git a/include/tsec.h b/include/tsec.h
index 43255e538f7..630c30b6396 100644
--- a/include/tsec.h
+++ b/include/tsec.h
@@ -16,6 +16,7 @@
 #include <net.h>
 #include <config.h>
 #include <phy.h>
+#include <asm/u-boot.h>
 
 #define TSEC_MDIO_REGS_OFFSET	0x520
 
diff --git a/include/vsc9953.h b/include/vsc9953.h
index a9c84b4b50c..604214ee32d 100644
--- a/include/vsc9953.h
+++ b/include/vsc9953.h
@@ -11,6 +11,7 @@
 #include <config.h>
 #include <miiphy.h>
 #include <asm/types.h>
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 
 #define VSC9953_OFFSET			(CONFIG_SYS_CCSRBAR_DEFAULT + 0x800000)
diff --git a/lib/asm-offsets.c b/lib/asm-offsets.c
index ee592cfda1c..e4fb52e8760 100644
--- a/lib/asm-offsets.c
+++ b/lib/asm-offsets.c
@@ -14,6 +14,7 @@
 #include <common.h>
 #include <asm-offsets.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 
 #include <linux/kbuild.h>
 
diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c
index b39ca817dde..8f264532f62 100644
--- a/lib/efi_loader/efi_boottime.c
+++ b/lib/efi_loader/efi_boottime.c
@@ -13,6 +13,7 @@
 #include <malloc.h>
 #include <time.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/libfdt_env.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c
index 9e0e08bc7a9..7041bd6ed2b 100644
--- a/lib/efi_loader/efi_memory.c
+++ b/lib/efi_loader/efi_memory.c
@@ -13,6 +13,7 @@
 #include <watchdog.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/list_sort.h>
 #include <linux/sizes.h>
 
diff --git a/lib/fdtdec.c b/lib/fdtdec.c
index 37bacdd7b33..e938ea5ea30 100644
--- a/lib/fdtdec.c
+++ b/lib/fdtdec.c
@@ -13,6 +13,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <net.h>
+#include <asm/u-boot.h>
 #include <dm/of_extra.h>
 #include <env.h>
 #include <errno.h>
diff --git a/lib/lmb.c b/lib/lmb.c
index 2d680d8d02f..61a0bdb1e1a 100644
--- a/lib/lmb.c
+++ b/lib/lmb.c
@@ -11,6 +11,7 @@
 #include <lmb.h>
 #include <log.h>
 #include <malloc.h>
+#include <asm/u-boot.h>
 
 #define LMB_ALLOC_ANYWHERE	0
 
diff --git a/net/eth_legacy.c b/net/eth_legacy.c
index 6e6a3b5e8dd..1c9afd75f36 100644
--- a/net/eth_legacy.c
+++ b/net/eth_legacy.c
@@ -13,6 +13,7 @@
 #include <net.h>
 #include <phy.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/bug.h>
 #include <linux/errno.h>
 #include <linux/string.h>
diff --git a/post/cpu/mpc83xx/ecc.c b/post/cpu/mpc83xx/ecc.c
index cc971a89097..37a1a576a80 100644
--- a/post/cpu/mpc83xx/ecc.c
+++ b/post/cpu/mpc83xx/ecc.c
@@ -16,6 +16,7 @@
 #include <watchdog.h>
 #include <asm/io.h>
 #include <post.h>
+#include <asm/u-boot.h>
 
 #if CONFIG_POST & CONFIG_SYS_POST_ECC
 /*
diff --git a/post/drivers/memory.c b/post/drivers/memory.c
index 281989da6fa..05dbfc144c8 100644
--- a/post/drivers/memory.c
+++ b/post/drivers/memory.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <log.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 
 /* Memory test
  *
diff --git a/test/dm/pci.c b/test/dm/pci.c
index 39e82b3699f..41b7adb62ea 100644
--- a/test/dm/pci.c
+++ b/test/dm/pci.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <asm/io.h>
 #include <asm/test.h>
+#include <asm/u-boot.h>
 #include <dm/test.h>
 #include <test/ut.h>
 
-- 
2.28.0.163.g6104cc2f0b6-goog

^ permalink raw reply related	[flat|nested] 35+ messages in thread

* [PATCH 08/16] common: Drop stdio.h from common header
  2020-08-02 22:59 [PATCH 00/16] common: Drop remaining includes in common.h Simon Glass
                   ` (6 preceding siblings ...)
  2020-08-02 22:59 ` [PATCH 07/16] common: Drop asm/u-boot.h " Simon Glass
@ 2020-08-02 22:59 ` Simon Glass
  2020-08-02 22:59 ` [PATCH 09/16] common: Drop stdarg.h " Simon Glass
                   ` (8 subsequent siblings)
  16 siblings, 0 replies; 35+ messages in thread
From: Simon Glass @ 2020-08-02 22:59 UTC (permalink / raw)
  To: u-boot

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 +
 api/api_net.c                                              | 1 +
 api/api_storage.c                                          | 1 +
 arch/arc/lib/bootm.c                                       | 1 +
 arch/arc/lib/cpu.c                                         | 1 +
 arch/arc/lib/interrupts.c                                  | 1 +
 arch/arc/lib/reset.c                                       | 1 +
 arch/arm/cpu/arm1136/mx31/generic.c                        | 1 +
 arch/arm/cpu/arm1136/mx35/generic.c                        | 1 +
 arch/arm/cpu/arm926ejs/armada100/cpu.c                     | 1 +
 arch/arm/cpu/arm926ejs/armada100/dram.c                    | 1 +
 arch/arm/cpu/arm926ejs/mx25/generic.c                      | 1 +
 arch/arm/cpu/arm926ejs/mx27/generic.c                      | 1 +
 arch/arm/cpu/arm926ejs/mxs/mxs.c                           | 1 +
 arch/arm/cpu/arm926ejs/spear/cpu.c                         | 1 +
 arch/arm/cpu/arm926ejs/spear/reset.c                       | 1 +
 arch/arm/cpu/arm926ejs/spear/spl.c                         | 1 +
 arch/arm/cpu/arm926ejs/spear/spr_misc.c                    | 1 +
 arch/arm/cpu/armv7/bcm235xx/clk-bsc.c                      | 1 +
 arch/arm/cpu/armv7/bcm235xx/clk-core.c                     | 1 +
 arch/arm/cpu/armv7/bcm235xx/clk-core.h                     | 1 +
 arch/arm/cpu/armv7/bcm235xx/clk-eth.c                      | 1 +
 arch/arm/cpu/armv7/bcm235xx/clk-sdio.c                     | 1 +
 arch/arm/cpu/armv7/bcm235xx/clk-usb-otg.c                  | 1 +
 arch/arm/cpu/armv7/bcm281xx/clk-bsc.c                      | 1 +
 arch/arm/cpu/armv7/bcm281xx/clk-core.c                     | 1 +
 arch/arm/cpu/armv7/bcm281xx/clk-core.h                     | 1 +
 arch/arm/cpu/armv7/bcm281xx/clk-eth.c                      | 1 +
 arch/arm/cpu/armv7/bcm281xx/clk-sdio.c                     | 1 +
 arch/arm/cpu/armv7/bcm281xx/clk-usb-otg.c                  | 1 +
 arch/arm/cpu/armv7/iproc-common/armpll.c                   | 1 +
 arch/arm/cpu/armv7/ls102xa/clock.c                         | 1 +
 arch/arm/cpu/armv7/ls102xa/cpu.c                           | 1 +
 arch/arm/cpu/armv7/ls102xa/fdt.c                           | 1 +
 arch/arm/cpu/armv7/ls102xa/fsl_ls1_serdes.c                | 1 +
 arch/arm/cpu/armv7/s5p-common/cpu_info.c                   | 1 +
 arch/arm/cpu/armv7/stv0991/reset.c                         | 1 +
 arch/arm/cpu/armv7/vf610/generic.c                         | 1 +
 arch/arm/cpu/armv7/virt-v7.c                               | 1 +
 arch/arm/cpu/armv7m/cache.c                                | 1 +
 arch/arm/cpu/armv8/cache_v8.c                              | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/cpu.c                    | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/fdt.c                    | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_serdes.c       | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c        | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c       | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c        | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/icid.c                   | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/mp.c                     | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/ppa.c                    | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/soc.c                    | 1 +
 arch/arm/cpu/armv8/s32v234/cpu.c                           | 1 +
 arch/arm/cpu/armv8/s32v234/generic.c                       | 1 +
 arch/arm/cpu/armv8/sec_firmware.c                          | 1 +
 arch/arm/cpu/armv8/spin_table.c                            | 1 +
 arch/arm/cpu/pxa/cpuinfo.c                                 | 1 +
 arch/arm/include/asm/arch-mx7ulp/scg.h                     | 2 ++
 arch/arm/lib/bdinfo.c                                      | 1 +
 arch/arm/lib/bootm.c                                       | 1 +
 arch/arm/lib/cache-cp15.c                                  | 1 +
 arch/arm/lib/cache-pl310.c                                 | 1 +
 arch/arm/lib/cache.c                                       | 1 +
 arch/arm/lib/eabi_compat.c                                 | 1 +
 arch/arm/lib/image.c                                       | 1 +
 arch/arm/lib/interrupts.c                                  | 1 +
 arch/arm/lib/interrupts_64.c                               | 1 +
 arch/arm/lib/interrupts_m.c                                | 1 +
 arch/arm/lib/psci-dt.c                                     | 1 +
 arch/arm/lib/semihosting.c                                 | 1 +
 arch/arm/lib/zimage.c                                      | 1 +
 arch/arm/mach-at91/arm920t/clock.c                         | 1 +
 arch/arm/mach-at91/arm926ejs/clock.c                       | 1 +
 arch/arm/mach-at91/arm926ejs/cpu.c                         | 1 +
 arch/arm/mach-at91/arm926ejs/eflash.c                      | 1 +
 arch/arm/mach-at91/armv7/clock.c                           | 1 +
 arch/arm/mach-at91/armv7/cpu.c                             | 1 +
 arch/arm/mach-at91/clock.c                                 | 1 +
 arch/arm/mach-at91/phy.c                                   | 1 +
 arch/arm/mach-at91/spl.c                                   | 1 +
 arch/arm/mach-bcm283x/mbox.c                               | 1 +
 arch/arm/mach-bcm283x/msg.c                                | 1 +
 arch/arm/mach-davinci/misc.c                               | 1 +
 arch/arm/mach-davinci/spl.c                                | 1 +
 arch/arm/mach-exynos/clock.c                               | 1 +
 arch/arm/mach-imx/cache.c                                  | 1 +
 arch/arm/mach-imx/cmd_nandbcb.c                            | 1 +
 arch/arm/mach-imx/cpu.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/clock.c                             | 1 +
 arch/arm/mach-imx/imx8/cpu.c                               | 1 +
 arch/arm/mach-imx/imx8/fdt.c                               | 1 +
 arch/arm/mach-imx/imx8/image.c                             | 1 +
 arch/arm/mach-imx/imx8/iomux.c                             | 1 +
 arch/arm/mach-imx/imx8/misc.c                              | 1 +
 arch/arm/mach-imx/imx8/parse-container.c                   | 1 +
 arch/arm/mach-imx/imx8/snvs_security_sc.c                  | 1 +
 arch/arm/mach-imx/imx8m/clock_imx8mm.c                     | 1 +
 arch/arm/mach-imx/imx8m/clock_imx8mq.c                     | 1 +
 arch/arm/mach-imx/imx8m/soc.c                              | 1 +
 arch/arm/mach-imx/imx_bootaux.c                            | 1 +
 arch/arm/mach-imx/mx5/clock.c                              | 1 +
 arch/arm/mach-imx/mx6/clock.c                              | 1 +
 arch/arm/mach-imx/mx6/ddr.c                                | 1 +
 arch/arm/mach-imx/mx6/litesom.c                            | 1 +
 arch/arm/mach-imx/mx6/module_fuse.c                        | 1 +
 arch/arm/mach-imx/mx6/mp.c                                 | 1 +
 arch/arm/mach-imx/mx7/clock.c                              | 1 +
 arch/arm/mach-imx/mx7/clock_slice.c                        | 1 +
 arch/arm/mach-imx/mx7ulp/clock.c                           | 1 +
 arch/arm/mach-imx/mx7ulp/pcc.c                             | 1 +
 arch/arm/mach-imx/mx7ulp/scg.c                             | 1 +
 arch/arm/mach-imx/mx7ulp/soc.c                             | 1 +
 arch/arm/mach-imx/spl.c                                    | 1 +
 arch/arm/mach-imx/spl_imx_romapi.c                         | 1 +
 arch/arm/mach-imx/video.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/security.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/ddr3_spd.c                          | 1 +
 arch/arm/mach-keystone/init.c                              | 1 +
 arch/arm/mach-keystone/keystone.c                          | 1 +
 arch/arm/mach-keystone/mon.c                               | 1 +
 arch/arm/mach-keystone/psc.c                               | 1 +
 arch/arm/mach-kirkwood/cpu.c                               | 1 +
 arch/arm/mach-lpc32xx/cpu.c                                | 1 +
 arch/arm/mach-mediatek/mt7622/init.c                       | 1 +
 arch/arm/mach-mediatek/mt7623/init.c                       | 1 +
 arch/arm/mach-mediatek/mt7629/init.c                       | 1 +
 arch/arm/mach-mediatek/mt8516/init.c                       | 1 +
 arch/arm/mach-mediatek/mt8518/init.c                       | 1 +
 arch/arm/mach-meson/board-axg.c                            | 1 +
 arch/arm/mach-meson/board-common.c                         | 1 +
 arch/arm/mach-meson/board-g12a.c                           | 1 +
 arch/arm/mach-meson/board-gx.c                             | 1 +
 arch/arm/mach-meson/board-info.c                           | 1 +
 arch/arm/mach-meson/sm.c                                   | 1 +
 arch/arm/mach-mvebu/armada3700/cpu.c                       | 1 +
 arch/arm/mach-mvebu/cpu.c                                  | 1 +
 arch/arm/mach-mvebu/dram.c                                 | 1 +
 arch/arm/mach-mvebu/mbus.c                                 | 1 +
 arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec-38x.c  | 1 +
 arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec.c      | 1 +
 arch/arm/mach-mvebu/serdes/a38x/seq_exec.c                 | 1 +
 arch/arm/mach-mvebu/serdes/a38x/sys_env_lib.c              | 1 +
 arch/arm/mach-omap2/abb.c                                  | 1 +
 arch/arm/mach-omap2/am33xx/chilisom.c                      | 1 +
 arch/arm/mach-omap2/am33xx/clk_synthesizer.c               | 1 +
 arch/arm/mach-omap2/am33xx/clock.c                         | 1 +
 arch/arm/mach-omap2/am33xx/clock_am33xx.c                  | 1 +
 arch/arm/mach-omap2/am33xx/ddr.c                           | 1 +
 arch/arm/mach-omap2/am33xx/fdt.c                           | 1 +
 arch/arm/mach-omap2/am33xx/sys_info.c                      | 1 +
 arch/arm/mach-omap2/clocks-common.c                        | 1 +
 arch/arm/mach-omap2/emif-common.c                          | 1 +
 arch/arm/mach-omap2/fdt-common.c                           | 1 +
 arch/arm/mach-omap2/hwinit-common.c                        | 1 +
 arch/arm/mach-omap2/omap3/am35x_musb.c                     | 1 +
 arch/arm/mach-omap2/omap3/board.c                          | 1 +
 arch/arm/mach-omap2/omap3/sys_info.c                       | 1 +
 arch/arm/mach-omap2/omap4/hw_data.c                        | 1 +
 arch/arm/mach-omap2/omap5/dra7xx_iodelay.c                 | 1 +
 arch/arm/mach-omap2/omap5/fdt.c                            | 1 +
 arch/arm/mach-omap2/omap5/hw_data.c                        | 1 +
 arch/arm/mach-omap2/omap5/sdram.c                          | 1 +
 arch/arm/mach-omap2/pipe3-phy.c                            | 1 +
 arch/arm/mach-omap2/sec-common.c                           | 1 +
 arch/arm/mach-omap2/utils.c                                | 1 +
 arch/arm/mach-omap2/vc.c                                   | 1 +
 arch/arm/mach-orion5x/cpu.c                                | 1 +
 arch/arm/mach-owl/soc.c                                    | 1 +
 arch/arm/mach-rmobile/board.c                              | 1 +
 arch/arm/mach-rmobile/cpu_info.c                           | 1 +
 arch/arm/mach-rockchip/board.c                             | 1 +
 arch/arm/mach-rockchip/boot_mode.c                         | 1 +
 arch/arm/mach-rockchip/bootrom.c                           | 1 +
 arch/arm/mach-rockchip/cpu-info.c                          | 1 +
 arch/arm/mach-rockchip/misc.c                              | 1 +
 arch/arm/mach-rockchip/rk3288/rk3288.c                     | 1 +
 arch/arm/mach-rockchip/rk3308/rk3308.c                     | 1 +
 arch/arm/mach-rockchip/spl.c                               | 1 +
 arch/arm/mach-rockchip/tpl.c                               | 1 +
 arch/arm/mach-s5pc1xx/clock.c                              | 1 +
 arch/arm/mach-snapdragon/dram.c                            | 1 +
 arch/arm/mach-socfpga/board.c                              | 1 +
 arch/arm/mach-socfpga/clock_manager_agilex.c               | 1 +
 arch/arm/mach-socfpga/clock_manager_arria10.c              | 1 +
 arch/arm/mach-socfpga/clock_manager_gen5.c                 | 1 +
 arch/arm/mach-socfpga/clock_manager_s10.c                  | 1 +
 arch/arm/mach-socfpga/mailbox_s10.c                        | 1 +
 arch/arm/mach-socfpga/misc_arria10.c                       | 1 +
 arch/arm/mach-socfpga/misc_gen5.c                          | 1 +
 arch/arm/mach-socfpga/misc_s10.c                           | 1 +
 arch/arm/mach-socfpga/reset_manager_gen5.c                 | 1 +
 arch/arm/mach-socfpga/spl_a10.c                            | 1 +
 arch/arm/mach-socfpga/spl_gen5.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_serial.c     | 1 +
 arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_usb.c        | 1 +
 arch/arm/mach-stm32mp/cpu.c                                | 1 +
 arch/arm/mach-stm32mp/fdt.c                                | 1 +
 arch/arm/mach-stm32mp/spl.c                                | 1 +
 arch/arm/mach-sunxi/clock_sun4i.c                          | 1 +
 arch/arm/mach-sunxi/cpu_info.c                             | 1 +
 arch/arm/mach-sunxi/dram_sun9i.c                           | 1 +
 arch/arm/mach-tegra/ap.c                                   | 1 +
 arch/arm/mach-tegra/board2.c                               | 1 +
 arch/arm/mach-tegra/cboot.c                                | 1 +
 arch/arm/mach-tegra/clock.c                                | 1 +
 arch/arm/mach-tegra/cmd_enterrcm.c                         | 1 +
 arch/arm/mach-tegra/cpu.c                                  | 1 +
 arch/arm/mach-tegra/pinmux-common.c                        | 1 +
 arch/arm/mach-tegra/pmc.c                                  | 1 +
 arch/arm/mach-tegra/sys_info.c                             | 1 +
 arch/arm/mach-tegra/tegra114/clock.c                       | 1 +
 arch/arm/mach-tegra/tegra124/clock.c                       | 1 +
 arch/arm/mach-tegra/tegra20/clock.c                        | 1 +
 arch/arm/mach-tegra/tegra20/warmboot.c                     | 1 +
 arch/arm/mach-tegra/tegra210/clock.c                       | 1 +
 arch/arm/mach-tegra/tegra30/clock.c                        | 1 +
 arch/arm/mach-u8500/cpuinfo.c                              | 1 +
 arch/arm/mach-uniphier/micro-support-card.c                | 1 +
 arch/arm/mach-versal/cpu.c                                 | 1 +
 arch/arm/mach-versal/mp.c                                  | 1 +
 arch/arm/mach-zynq/clk.c                                   | 1 +
 arch/arm/mach-zynq/cpu.c                                   | 1 +
 arch/arm/mach-zynq/ddrc.c                                  | 1 +
 arch/arm/mach-zynq/spl.c                                   | 1 +
 arch/arm/mach-zynqmp/cpu.c                                 | 1 +
 arch/arm/mach-zynqmp/mp.c                                  | 1 +
 arch/arm/mach-zynqmp/spl.c                                 | 1 +
 arch/m68k/cpu/mcf5227x/cpu.c                               | 1 +
 arch/m68k/cpu/mcf523x/cpu.c                                | 1 +
 arch/m68k/cpu/mcf52x2/cpu.c                                | 1 +
 arch/m68k/cpu/mcf530x/cpu.c                                | 1 +
 arch/m68k/cpu/mcf532x/cpu.c                                | 1 +
 arch/m68k/cpu/mcf5445x/cpu.c                               | 1 +
 arch/m68k/cpu/mcf547x_8x/cpu.c                             | 1 +
 arch/m68k/lib/bootm.c                                      | 1 +
 arch/m68k/lib/fec.c                                        | 1 +
 arch/m68k/lib/traps.c                                      | 1 +
 arch/microblaze/cpu/exception.c                            | 1 +
 arch/microblaze/cpu/interrupts.c                           | 1 +
 arch/microblaze/lib/bootm.c                                | 1 +
 arch/mips/lib/cache.c                                      | 1 +
 arch/mips/lib/traps.c                                      | 1 +
 arch/mips/mach-ath79/ar934x/clk.c                          | 1 +
 arch/mips/mach-ath79/cpu.c                                 | 1 +
 arch/mips/mach-ath79/reset.c                               | 1 +
 arch/mips/mach-jz47xx/jz4780/jz4780.c                      | 1 +
 arch/mips/mach-jz47xx/jz4780/pll.c                         | 1 +
 arch/mips/mach-mscc/dram.c                                 | 1 +
 arch/mips/mach-mtmips/cpu.c                                | 1 +
 arch/mips/mach-mtmips/mt7628/init.c                        | 1 +
 arch/mips/mach-octeon/cpu.c                                | 1 +
 arch/mips/mach-pic32/cpu.c                                 | 1 +
 arch/nds32/lib/bootm.c                                     | 1 +
 arch/nds32/lib/interrupts.c                                | 1 +
 arch/nios2/cpu/cpu.c                                       | 1 +
 arch/powerpc/cpu/mpc83xx/cpu.c                             | 1 +
 arch/powerpc/cpu/mpc83xx/cpu_init.c                        | 1 +
 arch/powerpc/cpu/mpc83xx/ecc.c                             | 1 +
 arch/powerpc/cpu/mpc83xx/pci.c                             | 1 +
 arch/powerpc/cpu/mpc83xx/pcie.c                            | 1 +
 arch/powerpc/cpu/mpc83xx/spd_sdram.c                       | 1 +
 arch/powerpc/cpu/mpc83xx/speed.c                           | 1 +
 arch/powerpc/cpu/mpc83xx/spl_minimal.c                     | 1 +
 arch/powerpc/cpu/mpc83xx/traps.c                           | 1 +
 arch/powerpc/cpu/mpc85xx/bsc9132_serdes.c                  | 1 +
 arch/powerpc/cpu/mpc85xx/c29x_serdes.c                     | 1 +
 arch/powerpc/cpu/mpc85xx/cmd_errata.c                      | 1 +
 arch/powerpc/cpu/mpc85xx/cpu.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_corenet2_serdes.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/mpc8536_serdes.c                  | 1 +
 arch/powerpc/cpu/mpc85xx/mpc8544_serdes.c                  | 1 +
 arch/powerpc/cpu/mpc85xx/mpc8548_serdes.c                  | 1 +
 arch/powerpc/cpu/mpc85xx/mpc8568_serdes.c                  | 1 +
 arch/powerpc/cpu/mpc85xx/mpc8569_serdes.c                  | 1 +
 arch/powerpc/cpu/mpc85xx/mpc8572_serdes.c                  | 1 +
 arch/powerpc/cpu/mpc85xx/p1010_serdes.c                    | 1 +
 arch/powerpc/cpu/mpc85xx/p1021_serdes.c                    | 1 +
 arch/powerpc/cpu/mpc85xx/p1022_serdes.c                    | 1 +
 arch/powerpc/cpu/mpc85xx/p1023_serdes.c                    | 1 +
 arch/powerpc/cpu/mpc85xx/p2020_serdes.c                    | 1 +
 arch/powerpc/cpu/mpc85xx/pci.c                             | 1 +
 arch/powerpc/cpu/mpc85xx/portals.c                         | 1 +
 arch/powerpc/cpu/mpc85xx/speed.c                           | 1 +
 arch/powerpc/cpu/mpc85xx/tlb.c                             | 1 +
 arch/powerpc/cpu/mpc85xx/traps.c                           | 1 +
 arch/powerpc/cpu/mpc86xx/cpu.c                             | 1 +
 arch/powerpc/cpu/mpc86xx/fdt.c                             | 1 +
 arch/powerpc/cpu/mpc86xx/interrupts.c                      | 1 +
 arch/powerpc/cpu/mpc86xx/mp.c                              | 1 +
 arch/powerpc/cpu/mpc86xx/mpc8610_serdes.c                  | 1 +
 arch/powerpc/cpu/mpc86xx/mpc8641_serdes.c                  | 1 +
 arch/powerpc/cpu/mpc86xx/traps.c                           | 1 +
 arch/powerpc/cpu/mpc8xx/cpu.c                              | 1 +
 arch/powerpc/cpu/mpc8xx/immap.c                            | 1 +
 arch/powerpc/cpu/mpc8xx/interrupts.c                       | 1 +
 arch/powerpc/cpu/mpc8xx/traps.c                            | 1 +
 arch/powerpc/cpu/mpc8xxx/fdt.c                             | 1 +
 arch/powerpc/cpu/mpc8xxx/fsl_lbc.c                         | 1 +
 arch/powerpc/cpu/mpc8xxx/fsl_pamu.c                        | 1 +
 arch/powerpc/cpu/mpc8xxx/law.c                             | 1 +
 arch/powerpc/cpu/mpc8xxx/srio.c                            | 1 +
 arch/powerpc/lib/bat_rw.c                                  | 1 +
 arch/powerpc/lib/bdinfo.c                                  | 1 +
 arch/powerpc/lib/bootm.c                                   | 1 +
 arch/riscv/lib/bootm.c                                     | 1 +
 arch/riscv/lib/fdt_fixup.c                                 | 1 +
 arch/riscv/lib/image.c                                     | 1 +
 arch/riscv/lib/interrupts.c                                | 1 +
 arch/riscv/lib/reset.c                                     | 1 +
 arch/sandbox/cpu/cpu.c                                     | 1 +
 arch/sandbox/cpu/sdl.c                                     | 1 +
 arch/sandbox/cpu/spl.c                                     | 1 +
 arch/sandbox/cpu/start.c                                   | 1 +
 arch/sandbox/cpu/state.c                                   | 1 +
 arch/sandbox/lib/bootm.c                                   | 1 +
 arch/sh/cpu/sh4/cpu.c                                      | 1 +
 arch/sh/lib/bootm.c                                        | 1 +
 arch/x86/cpu/apollolake/cpu_spl.c                          | 1 +
 arch/x86/cpu/broadwell/cpu.c                               | 1 +
 arch/x86/cpu/broadwell/iobp.c                              | 1 +
 arch/x86/cpu/broadwell/northbridge.c                       | 1 +
 arch/x86/cpu/broadwell/sdram.c                             | 1 +
 arch/x86/cpu/coreboot/coreboot.c                           | 1 +
 arch/x86/cpu/coreboot/sdram.c                              | 1 +
 arch/x86/cpu/cpu.c                                         | 1 +
 arch/x86/cpu/efi/payload.c                                 | 1 +
 arch/x86/cpu/i386/cpu.c                                    | 1 +
 arch/x86/cpu/i386/interrupt.c                              | 1 +
 arch/x86/cpu/intel_common/cpu.c                            | 1 +
 arch/x86/cpu/intel_common/microcode.c                      | 1 +
 arch/x86/cpu/intel_common/mrc.c                            | 1 +
 arch/x86/cpu/irq.c                                         | 1 +
 arch/x86/cpu/ivybridge/bd82x6x.c                           | 1 +
 arch/x86/cpu/ivybridge/cpu.c                               | 1 +
 arch/x86/cpu/ivybridge/early_me.c                          | 1 +
 arch/x86/cpu/ivybridge/lpc.c                               | 1 +
 arch/x86/cpu/ivybridge/sdram.c                             | 1 +
 arch/x86/cpu/mp_init.c                                     | 1 +
 arch/x86/cpu/qfw_cpu.c                                     | 1 +
 arch/x86/lib/acpi_s3.c                                     | 1 +
 arch/x86/lib/acpi_table.c                                  | 1 +
 arch/x86/lib/bios_interrupts.c                             | 1 +
 arch/x86/lib/bootm.c                                       | 1 +
 arch/x86/lib/fsp/fsp_graphics.c                            | 1 +
 arch/x86/lib/fsp2/fsp_meminit.c                            | 1 +
 arch/x86/lib/interrupts.c                                  | 1 +
 arch/x86/lib/mrccache.c                                    | 1 +
 arch/x86/lib/pirq_routing.c                                | 1 +
 arch/x86/lib/pmu.c                                         | 1 +
 arch/x86/lib/relocate.c                                    | 1 +
 arch/x86/lib/scu.c                                         | 1 +
 arch/x86/lib/spl.c                                         | 1 +
 arch/x86/lib/tables.c                                      | 1 +
 arch/x86/lib/tpl.c                                         | 1 +
 arch/x86/lib/zimage.c                                      | 1 +
 arch/xtensa/cpu/cpu.c                                      | 1 +
 arch/xtensa/cpu/exceptions.c                               | 1 +
 arch/xtensa/lib/bootm.c                                    | 1 +
 board/AndesTech/adp-ae3xx/adp-ae3xx.c                      | 1 +
 board/AndesTech/adp-ag101p/adp-ag101p.c                    | 1 +
 board/Arcturus/ucp1020/cmd_arc.c                           | 1 +
 board/Arcturus/ucp1020/ddr.c                               | 1 +
 board/Arcturus/ucp1020/spl.c                               | 1 +
 board/Arcturus/ucp1020/spl_minimal.c                       | 1 +
 board/Arcturus/ucp1020/ucp1020.c                           | 1 +
 board/BuR/brppt1/board.c                                   | 1 +
 board/BuR/brppt2/board.c                                   | 1 +
 board/BuR/brsmarc1/board.c                                 | 1 +
 board/BuR/brxre1/board.c                                   | 1 +
 board/BuR/common/br_resetc.c                               | 1 +
 board/BuR/common/common.c                                  | 1 +
 board/BuS/eb_cpu5282/eb_cpu5282.c                          | 1 +
 board/CZ.NIC/turris_mox/turris_mox.c                       | 1 +
 board/CZ.NIC/turris_omnia/turris_omnia.c                   | 1 +
 board/CarMediaLab/flea3/flea3.c                            | 1 +
 board/LaCie/common/common.c                                | 1 +
 board/LaCie/net2big_v2/net2big_v2.c                        | 1 +
 board/Marvell/db-88f6720/db-88f6720.c                      | 1 +
 board/Marvell/db-88f6820-amc/db-88f6820-amc.c              | 1 +
 board/Marvell/db-88f6820-gp/db-88f6820-gp.c                | 1 +
 board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c                | 1 +
 board/Marvell/db-xc3-24g4xg/db-xc3-24g4xg.c                | 1 +
 board/Marvell/dreamplug/dreamplug.c                        | 1 +
 board/Marvell/gplugd/gplugd.c                              | 1 +
 board/Marvell/guruplug/guruplug.c                          | 1 +
 board/Marvell/mvebu_armada-37xx/board.c                    | 1 +
 board/Marvell/mvebu_armada-8k/board.c                      | 1 +
 board/Marvell/openrd/openrd.c                              | 1 +
 board/Marvell/sheevaplug/sheevaplug.c                      | 1 +
 board/Seagate/dockstar/dockstar.c                          | 1 +
 board/Seagate/goflexhome/goflexhome.c                      | 1 +
 board/Seagate/nas220/nas220.c                              | 1 +
 board/Synology/ds109/ds109.c                               | 1 +
 board/Synology/ds414/cmd_syno.c                            | 1 +
 board/Synology/ds414/ds414.c                               | 1 +
 board/advantech/dms-ba16/dms-ba16.c                        | 1 +
 board/advantech/imx8qm_rom7720_a1/imx8qm_rom7720_a1.c      | 1 +
 board/advantech/imx8qm_rom7720_a1/spl.c                    | 1 +
 board/alliedtelesis/x530/x530.c                            | 1 +
 board/aristainetos/aristainetos.c                          | 1 +
 board/armadeus/apf27/apf27.c                               | 1 +
 board/armadeus/opos6uldev/board.c                          | 1 +
 board/armltd/integrator/integrator.c                       | 1 +
 board/armltd/vexpress/vexpress_common.c                    | 1 +
 board/armltd/vexpress/vexpress_tc2.c                       | 1 +
 board/armltd/vexpress64/pcie.c                             | 1 +
 board/armltd/vexpress64/vexpress64.c                       | 1 +
 board/astro/mcf5373l/fpga.c                                | 1 +
 board/astro/mcf5373l/mcf5373l.c                            | 1 +
 board/atmel/common/board.c                                 | 1 +
 board/bachmann/ot1200/ot1200.c                             | 1 +
 board/barco/platinum/platinum.c                            | 1 +
 board/barco/titanium/titanium.c                            | 1 +
 board/beacon/imx8mm/spl.c                                  | 1 +
 board/beckhoff/mx53cx9020/mx53cx9020.c                     | 1 +
 board/bluegiga/apx4devkit/apx4devkit.c                     | 1 +
 board/bluewater/gurnard/gurnard.c                          | 1 +
 board/bosch/guardian/board.c                               | 1 +
 board/bosch/shc/board.c                                    | 1 +
 board/bosch/shc/mux.c                                      | 1 +
 board/boundary/nitrogen6x/nitrogen6x.c                     | 1 +
 board/broadcom/bcm23550_w1d/bcm23550_w1d.c                 | 1 +
 board/broadcom/bcm28155_ap/bcm28155_ap.c                   | 1 +
 board/broadcom/bcm963158/bcm963158.c                       | 1 +
 board/broadcom/bcm968360bg/bcm968360bg.c                   | 1 +
 board/broadcom/bcm968580xref/bcm968580xref.c               | 1 +
 board/broadcom/bcm_ep/board.c                              | 1 +
 board/buffalo/lsxl/lsxl.c                                  | 1 +
 board/cadence/xtfpga/xtfpga.c                              | 1 +
 board/cavium/thunderx/atf.c                                | 1 +
 board/cavium/thunderx/thunderx.c                           | 1 +
 board/ccv/xpress/xpress.c                                  | 1 +
 board/cirrus/edb93xx/edb93xx.c                             | 1 +
 board/cloudengines/pogo_e02/pogo_e02.c                     | 1 +
 board/compulab/cl-som-imx7/cl-som-imx7.c                   | 1 +
 board/compulab/cl-som-imx7/spl.c                           | 1 +
 board/compulab/cm_fx6/cm_fx6.c                             | 1 +
 board/compulab/cm_fx6/spl.c                                | 1 +
 board/compulab/cm_t335/cm_t335.c                           | 1 +
 board/compulab/cm_t335/spl.c                               | 1 +
 board/compulab/cm_t43/cm_t43.c                             | 1 +
 board/compulab/common/common.c                             | 1 +
 board/compulab/common/eeprom.c                             | 1 +
 board/compulab/common/omap3_display.c                      | 1 +
 board/compulab/common/omap3_smc911x.c                      | 1 +
 board/congatec/cgtqmx6eval/cgtqmx6eval.c                   | 1 +
 board/congatec/conga-qeval20-qa3-e3845/conga-qeval20-qa3.c | 1 +
 board/corscience/tricorder/tricorder-eeprom.c              | 1 +
 board/corscience/tricorder/tricorder.c                     | 1 +
 board/cortina/presidio-asic/presidio.c                     | 1 +
 board/cssi/MCR3000/MCR3000.c                               | 1 +
 board/d-link/dns325/dns325.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_imx6/dh_imx6_spl.c                  | 1 +
 board/dhelectronics/dh_stm32mp1/board.c                    | 1 +
 board/egnite/ethernut5/ethernut5_pwrman.c                  | 1 +
 board/el/el6x/el6x.c                                       | 1 +
 board/embest/mx6boards/mx6boards.c                         | 1 +
 board/engicam/common/spl.c                                 | 1 +
 board/esd/meesc/meesc.c                                    | 1 +
 board/esd/vme8349/caddy.c                                  | 1 +
 board/esd/vme8349/pci.c                                    | 1 +
 board/esd/vme8349/vme8349.c                                | 1 +
 board/firefly/firefly-rk3308/roc_cc_rk3308.c               | 1 +
 board/freescale/common/cmd_esbc_validate.c                 | 1 +
 board/freescale/common/dcu_sii9022a.c                      | 1 +
 board/freescale/common/diu_ch7301.c                        | 1 +
 board/freescale/common/emc2305.c                           | 1 +
 board/freescale/common/fsl_chain_of_trust.c                | 1 +
 board/freescale/common/fsl_validate.c                      | 1 +
 board/freescale/common/mc34vr500.c                         | 1 +
 board/freescale/common/ngpixis.c                           | 1 +
 board/freescale/common/pfuze.c                             | 1 +
 board/freescale/common/pixis.c                             | 1 +
 board/freescale/common/pq-mds-pib.c                        | 1 +
 board/freescale/common/qixis.c                             | 1 +
 board/freescale/common/sys_eeprom.c                        | 1 +
 board/freescale/common/vid.c                               | 1 +
 board/freescale/corenet_ds/corenet_ds.c                    | 1 +
 board/freescale/corenet_ds/ddr.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/imx8mm_evk/spl.c                           | 1 +
 board/freescale/imx8mn_evk/spl.c                           | 1 +
 board/freescale/imx8mp_evk/spl.c                           | 1 +
 board/freescale/imx8mq_evk/spl.c                           | 1 +
 board/freescale/imx8qm_mek/imx8qm_mek.c                    | 1 +
 board/freescale/imx8qm_mek/spl.c                           | 1 +
 board/freescale/imx8qxp_mek/imx8qxp_mek.c                  | 1 +
 board/freescale/imx8qxp_mek/spl.c                          | 1 +
 board/freescale/ls1012afrdm/eth.c                          | 1 +
 board/freescale/ls1012afrdm/ls1012afrdm.c                  | 1 +
 board/freescale/ls1012aqds/eth.c                           | 1 +
 board/freescale/ls1012aqds/ls1012aqds.c                    | 1 +
 board/freescale/ls1012ardb/eth.c                           | 1 +
 board/freescale/ls1012ardb/ls1012ardb.c                    | 1 +
 board/freescale/ls1021aiot/dcu.c                           | 1 +
 board/freescale/ls1021aiot/ls1021aiot.c                    | 1 +
 board/freescale/ls1021aqds/dcu.c                           | 1 +
 board/freescale/ls1021aqds/ddr.c                           | 1 +
 board/freescale/ls1021aqds/eth.c                           | 1 +
 board/freescale/ls1021aqds/ls1021aqds.c                    | 1 +
 board/freescale/ls1021atwr/dcu.c                           | 1 +
 board/freescale/ls1021atwr/ls1021atwr.c                    | 1 +
 board/freescale/ls1028a/ls1028a.c                          | 1 +
 board/freescale/ls1043aqds/ddr.c                           | 1 +
 board/freescale/ls1043aqds/eth.c                           | 1 +
 board/freescale/ls1043aqds/ls1043aqds.c                    | 1 +
 board/freescale/ls1043ardb/cpld.c                          | 1 +
 board/freescale/ls1043ardb/ddr.c                           | 1 +
 board/freescale/ls1043ardb/eth.c                           | 1 +
 board/freescale/ls1043ardb/ls1043ardb.c                    | 1 +
 board/freescale/ls1046afrwy/eth.c                          | 1 +
 board/freescale/ls1046afrwy/ls1046afrwy.c                  | 1 +
 board/freescale/ls1046aqds/ddr.c                           | 1 +
 board/freescale/ls1046aqds/eth.c                           | 1 +
 board/freescale/ls1046aqds/ls1046aqds.c                    | 1 +
 board/freescale/ls1046ardb/cpld.c                          | 1 +
 board/freescale/ls1046ardb/ddr.c                           | 1 +
 board/freescale/ls1046ardb/eth.c                           | 1 +
 board/freescale/ls1046ardb/ls1046ardb.c                    | 1 +
 board/freescale/ls1088a/ddr.c                              | 1 +
 board/freescale/ls1088a/eth_ls1088aqds.c                   | 1 +
 board/freescale/ls1088a/eth_ls1088ardb.c                   | 1 +
 board/freescale/ls1088a/ls1088a.c                          | 1 +
 board/freescale/ls2080a/ddr.c                              | 1 +
 board/freescale/ls2080a/ls2080a.c                          | 1 +
 board/freescale/ls2080aqds/ddr.c                           | 1 +
 board/freescale/ls2080aqds/eth.c                           | 1 +
 board/freescale/ls2080aqds/ls2080aqds.c                    | 1 +
 board/freescale/ls2080ardb/ddr.c                           | 1 +
 board/freescale/ls2080ardb/eth_ls2080rdb.c                 | 1 +
 board/freescale/ls2080ardb/ls2080ardb.c                    | 1 +
 board/freescale/lx2160a/eth_lx2160aqds.c                   | 1 +
 board/freescale/lx2160a/eth_lx2160ardb.c                   | 1 +
 board/freescale/lx2160a/lx2160a.c                          | 1 +
 board/freescale/m5208evbe/m5208evbe.c                      | 1 +
 board/freescale/m52277evb/m52277evb.c                      | 1 +
 board/freescale/m5235evb/m5235evb.c                        | 1 +
 board/freescale/m5249evb/m5249evb.c                        | 1 +
 board/freescale/m5253demo/flash.c                          | 1 +
 board/freescale/m5253demo/m5253demo.c                      | 1 +
 board/freescale/m5275evb/m5275evb.c                        | 1 +
 board/freescale/m53017evb/m53017evb.c                      | 1 +
 board/freescale/m5329evb/m5329evb.c                        | 1 +
 board/freescale/m5373evb/m5373evb.c                        | 1 +
 board/freescale/m54418twr/m54418twr.c                      | 1 +
 board/freescale/m54451evb/m54451evb.c                      | 1 +
 board/freescale/m54455evb/m54455evb.c                      | 1 +
 board/freescale/m547xevb/m547xevb.c                        | 1 +
 board/freescale/m548xevb/m548xevb.c                        | 1 +
 board/freescale/mpc8308rdb/mpc8308rdb.c                    | 1 +
 board/freescale/mpc8313erdb/mpc8313erdb.c                  | 1 +
 board/freescale/mpc8313erdb/sdram.c                        | 1 +
 board/freescale/mpc8315erdb/mpc8315erdb.c                  | 1 +
 board/freescale/mpc8315erdb/sdram.c                        | 1 +
 board/freescale/mpc8323erdb/mpc8323erdb.c                  | 1 +
 board/freescale/mpc832xemds/mpc832xemds.c                  | 1 +
 board/freescale/mpc832xemds/pci.c                          | 1 +
 board/freescale/mpc8349emds/ddr.c                          | 1 +
 board/freescale/mpc8349emds/mpc8349emds.c                  | 1 +
 board/freescale/mpc8349emds/pci.c                          | 1 +
 board/freescale/mpc8349itx/mpc8349itx.c                    | 1 +
 board/freescale/mpc837xemds/mpc837xemds.c                  | 1 +
 board/freescale/mpc837xerdb/mpc837xerdb.c                  | 1 +
 board/freescale/mpc8541cds/mpc8541cds.c                    | 1 +
 board/freescale/mpc8544ds/mpc8544ds.c                      | 1 +
 board/freescale/mpc8548cds/mpc8548cds.c                    | 1 +
 board/freescale/mpc8555cds/mpc8555cds.c                    | 1 +
 board/freescale/mpc8568mds/mpc8568mds.c                    | 1 +
 board/freescale/mpc8569mds/mpc8569mds.c                    | 1 +
 board/freescale/mpc8572ds/ddr.c                            | 1 +
 board/freescale/mpc8572ds/mpc8572ds.c                      | 1 +
 board/freescale/mpc8610hpcd/mpc8610hpcd.c                  | 1 +
 board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c              | 1 +
 board/freescale/mpc8641hpcn/ddr.c                          | 1 +
 board/freescale/mpc8641hpcn/mpc8641hpcn.c                  | 1 +
 board/freescale/mx23evk/mx23evk.c                          | 1 +
 board/freescale/mx25pdk/mx25pdk.c                          | 1 +
 board/freescale/mx28evk/mx28evk.c                          | 1 +
 board/freescale/mx35pdk/mx35pdk.c                          | 1 +
 board/freescale/mx51evk/mx51evk.c                          | 1 +
 board/freescale/mx51evk/mx51evk_video.c                    | 1 +
 board/freescale/mx53ard/mx53ard.c                          | 1 +
 board/freescale/mx53evk/mx53evk.c                          | 1 +
 board/freescale/mx53loco/mx53loco.c                        | 1 +
 board/freescale/mx53loco/mx53loco_video.c                  | 1 +
 board/freescale/mx53smd/mx53smd.c                          | 1 +
 board/freescale/mx6memcal/mx6memcal.c                      | 1 +
 board/freescale/mx6memcal/spl.c                            | 1 +
 board/freescale/mx6qarm2/mx6qarm2.c                        | 1 +
 board/freescale/mx6sabreauto/mx6sabreauto.c                | 1 +
 board/freescale/mx6sabresd/mx6sabresd.c                    | 1 +
 board/freescale/mx6slevk/mx6slevk.c                        | 1 +
 board/freescale/mx6sllevk/mx6sllevk.c                      | 1 +
 board/freescale/mx6sxsabreauto/mx6sxsabreauto.c            | 1 +
 board/freescale/mx6sxsabresd/mx6sxsabresd.c                | 1 +
 board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c          | 1 +
 board/freescale/mx6ullevk/mx6ullevk.c                      | 1 +
 board/freescale/mx7dsabresd/mx7dsabresd.c                  | 1 +
 board/freescale/mx7ulp_evk/mx7ulp_evk.c                    | 1 +
 board/freescale/p1010rdb/ddr.c                             | 1 +
 board/freescale/p1010rdb/p1010rdb.c                        | 1 +
 board/freescale/p1010rdb/spl.c                             | 1 +
 board/freescale/p1010rdb/spl_minimal.c                     | 1 +
 board/freescale/p1023rdb/p1023rdb.c                        | 1 +
 board/freescale/p1_p2_rdb_pc/ddr.c                         | 1 +
 board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c                | 1 +
 board/freescale/p1_p2_rdb_pc/spl.c                         | 1 +
 board/freescale/p1_p2_rdb_pc/spl_minimal.c                 | 1 +
 board/freescale/p2041rdb/cpld.c                            | 1 +
 board/freescale/p2041rdb/ddr.c                             | 1 +
 board/freescale/p2041rdb/eth.c                             | 1 +
 board/freescale/p2041rdb/p2041rdb.c                        | 1 +
 board/freescale/qemu-ppce500/qemu-ppce500.c                | 1 +
 board/freescale/s32v234evb/s32v234evb.c                    | 1 +
 board/freescale/t102xrdb/cpld.c                            | 1 +
 board/freescale/t102xrdb/ddr.c                             | 1 +
 board/freescale/t102xrdb/eth_t102xrdb.c                    | 1 +
 board/freescale/t102xrdb/spl.c                             | 1 +
 board/freescale/t102xrdb/t102xrdb.c                        | 1 +
 board/freescale/t104xrdb/cpld.c                            | 1 +
 board/freescale/t104xrdb/ddr.c                             | 1 +
 board/freescale/t104xrdb/diu.c                             | 1 +
 board/freescale/t104xrdb/eth.c                             | 1 +
 board/freescale/t104xrdb/spl.c                             | 1 +
 board/freescale/t104xrdb/t104xrdb.c                        | 1 +
 board/freescale/t208xqds/ddr.c                             | 1 +
 board/freescale/t208xqds/eth_t208xqds.c                    | 1 +
 board/freescale/t208xqds/spl.c                             | 1 +
 board/freescale/t208xqds/t208xqds.c                        | 1 +
 board/freescale/t208xrdb/ddr.c                             | 1 +
 board/freescale/t208xrdb/eth_t208xrdb.c                    | 1 +
 board/freescale/t208xrdb/spl.c                             | 1 +
 board/freescale/t208xrdb/t208xrdb.c                        | 1 +
 board/freescale/t4rdb/cpld.c                               | 1 +
 board/freescale/t4rdb/ddr.c                                | 1 +
 board/freescale/t4rdb/eth.c                                | 1 +
 board/freescale/t4rdb/spl.c                                | 1 +
 board/freescale/t4rdb/t4240rdb.c                           | 1 +
 board/freescale/vf610twr/vf610twr.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/gateworks/gw_ventana/gw_ventana_spl.c                | 1 +
 board/gdsys/a38x/controlcenterdc.c                         | 1 +
 board/gdsys/a38x/hre.c                                     | 1 +
 board/gdsys/a38x/hydra.c                                   | 1 +
 board/gdsys/a38x/ihs_phys.c                                | 1 +
 board/gdsys/a38x/keyprogram.c                              | 1 +
 board/gdsys/a38x/spl.c                                     | 1 +
 board/gdsys/common/cmd_ioloop.c                            | 1 +
 board/gdsys/common/dp501.c                                 | 1 +
 board/gdsys/common/ihs_mdio.c                              | 1 +
 board/gdsys/common/ioep-fpga.c                             | 1 +
 board/gdsys/common/osd.c                                   | 1 +
 board/gdsys/common/osd_cmd.c                               | 1 +
 board/gdsys/common/phy.c                                   | 1 +
 board/gdsys/mpc8308/gazerbeam.c                            | 1 +
 board/gdsys/mpc8308/hrcon.c                                | 1 +
 board/gdsys/mpc8308/strider.c                              | 1 +
 board/gdsys/p1022/controlcenterd-id.c                      | 1 +
 board/gdsys/p1022/controlcenterd.c                         | 1 +
 board/gdsys/p1022/ddr.c                                    | 1 +
 board/gdsys/p1022/diu.c                                    | 1 +
 board/ge/bx50v3/bx50v3.c                                   | 1 +
 board/ge/mx53ppd/mx53ppd.c                                 | 1 +
 board/ge/mx53ppd/mx53ppd_video.c                           | 1 +
 board/google/chromebook_coral/coral.c                      | 1 +
 board/google/imx8mq_phanbell/spl.c                         | 1 +
 board/grinn/chiliboard/board.c                             | 1 +
 board/grinn/liteboard/board.c                              | 1 +
 board/hisilicon/hikey/hikey.c                              | 1 +
 board/hisilicon/hikey960/hikey960.c                        | 1 +
 board/hisilicon/poplar/poplar.c                            | 1 +
 board/ids/ids8313/ids8313.c                                | 1 +
 board/imgtec/boston/checkboard.c                           | 1 +
 board/imgtec/ci20/ci20.c                                   | 1 +
 board/imgtec/malta/malta.c                                 | 1 +
 board/intel/edison/edison.c                                | 1 +
 board/inversepath/usbarmory/usbarmory.c                    | 1 +
 board/isee/igep003x/board.c                                | 1 +
 board/k+p/kp_imx53/kp_id_rev.c                             | 1 +
 board/k+p/kp_imx53/kp_imx53.c                              | 1 +
 board/k+p/kp_imx6q_tpc/kp_imx6q_tpc.c                      | 1 +
 board/k+p/kp_imx6q_tpc/kp_imx6q_tpc_spl.c                  | 1 +
 board/keymile/common/common.c                              | 1 +
 board/keymile/common/ivm.c                                 | 1 +
 board/keymile/km83xx/km83xx.c                              | 1 +
 board/keymile/km83xx/km83xx_i2c.c                          | 1 +
 board/keymile/km_arm/fpga_config.c                         | 1 +
 board/keymile/km_arm/km_arm.c                              | 1 +
 board/keymile/kmp204x/ddr.c                                | 1 +
 board/keymile/kmp204x/eth.c                                | 1 +
 board/keymile/kmp204x/kmp204x.c                            | 1 +
 board/keymile/kmp204x/pci.c                                | 1 +
 board/keymile/secu1/socfpga.c                              | 1 +
 board/kobol/helios4/helios4.c                              | 1 +
 board/kosagi/novena/novena.c                               | 1 +
 board/kosagi/novena/video.c                                | 1 +
 board/lego/ev3/legoev3.c                                   | 1 +
 board/liebherr/display5/display5.c                         | 1 +
 board/liebherr/display5/spl.c                              | 1 +
 board/liebherr/mccmon6/mccmon6.c                           | 1 +
 board/liebherr/mccmon6/spl.c                               | 1 +
 board/liebherr/xea/xea.c                                   | 1 +
 board/maxbcm/maxbcm.c                                      | 1 +
 board/mediatek/mt7623/mt7623_rfb.c                         | 1 +
 board/menlo/m53menlo/m53menlo.c                            | 1 +
 board/microchip/pic32mzda/pic32mzda.c                      | 1 +
 board/mikrotik/crs3xx-98dx3236/crs3xx-98dx3236.c           | 1 +
 board/mpc8308_p1m/mpc8308_p1m.c                            | 1 +
 board/novtech/meerkat96/meerkat96.c                        | 1 +
 board/nvidia/dalmore/dalmore.c                             | 1 +
 board/nvidia/e2220-1170/e2220-1170.c                       | 1 +
 board/nvidia/p2371-0000/p2371-0000.c                       | 1 +
 board/nvidia/p2371-2180/p2371-2180.c                       | 1 +
 board/nvidia/p2571/p2571.c                                 | 1 +
 board/nvidia/p2771-0000/p2771-0000.c                       | 1 +
 board/nvidia/p3450-0000/p3450-0000.c                       | 1 +
 board/phytec/pcl063/pcl063.c                               | 1 +
 board/phytec/pcl063/spl.c                                  | 1 +
 board/phytec/pcm052/pcm052.c                               | 1 +
 board/phytec/pcm058/pcm058.c                               | 1 +
 board/phytec/pfla02/pfla02.c                               | 1 +
 board/phytec/phycore_rk3288/phycore-rk3288.c               | 1 +
 board/phytium/durian/durian.c                              | 1 +
 board/ppcag/bg0900/bg0900.c                                | 1 +
 board/qemu-mips/qemu-mips.c                                | 1 +
 board/qualcomm/dragonboard410c/dragonboard410c.c           | 1 +
 board/qualcomm/dragonboard820c/dragonboard820c.c           | 1 +
 board/raspberrypi/rpi/rpi.c                                | 1 +
 board/renesas/MigoR/migo_r.c                               | 1 +
 board/renesas/alt/alt_spl.c                                | 1 +
 board/renesas/blanche/blanche.c                            | 1 +
 board/renesas/gose/gose_spl.c                              | 1 +
 board/renesas/koelsch/koelsch_spl.c                        | 1 +
 board/renesas/lager/lager_spl.c                            | 1 +
 board/renesas/porter/porter_spl.c                          | 1 +
 board/renesas/r2dplus/r2dplus.c                            | 1 +
 board/renesas/r7780mp/r7780mp.c                            | 1 +
 board/renesas/rcar-common/common.c                         | 1 +
 board/renesas/sh7752evb/sh7752evb.c                        | 1 +
 board/renesas/sh7753evb/sh7753evb.c                        | 1 +
 board/renesas/sh7757lcr/sh7757lcr.c                        | 1 +
 board/renesas/sh7763rdp/sh7763rdp.c                        | 1 +
 board/renesas/silk/silk_spl.c                              | 1 +
 board/renesas/stout/cpld.c                                 | 1 +
 board/renesas/stout/stout_spl.c                            | 1 +
 board/renesas/ulcb/cpld.c                                  | 1 +
 board/rockchip/evb_rk3308/evb_rk3308.c                     | 1 +
 board/rockchip/kylin_rk3036/kylin_rk3036.c                 | 1 +
 board/ronetix/pm9263/pm9263.c                              | 1 +
 board/samsung/arndale/arndale.c                            | 1 +
 board/samsung/common/board.c                               | 1 +
 board/samsung/common/misc.c                                | 1 +
 board/samsung/goni/goni.c                                  | 1 +
 board/samsung/smdkc100/smdkc100.c                          | 1 +
 board/samsung/smdkv310/smdkv310.c                          | 1 +
 board/samsung/trats/trats.c                                | 1 +
 board/samsung/trats2/trats2.c                              | 1 +
 board/samsung/universal_c210/universal.c                   | 1 +
 board/sandbox/sandbox.c                                    | 1 +
 board/sbc8349/sbc8349.c                                    | 1 +
 board/sbc8548/ddr.c                                        | 1 +
 board/sbc8548/sbc8548.c                                    | 1 +
 board/schulercontrol/sc_sps_1/sc_sps_1.c                   | 1 +
 board/seco/common/mx6.c                                    | 1 +
 board/seco/mx6quq7/mx6quq7.c                               | 1 +
 board/siemens/capricorn/board.c                            | 1 +
 board/siemens/common/board.c                               | 1 +
 board/siemens/common/factoryset.c                          | 1 +
 board/siemens/draco/board.c                                | 1 +
 board/siemens/draco/board.h                                | 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/sks-kinkel/sksimx6/sksimx6.c                         | 1 +
 board/socrates/nand.c                                      | 1 +
 board/socrates/socrates.c                                  | 1 +
 board/softing/vining_2000/vining_2000.c                    | 1 +
 board/softing/vining_fpga/socfpga.c                        | 1 +
 board/solidrun/clearfog/clearfog.c                         | 1 +
 board/solidrun/mx6cuboxi/mx6cuboxi.c                       | 1 +
 board/somlabs/visionsom-6ull/visionsom-6ull.c              | 1 +
 board/spear/x600/x600.c                                    | 1 +
 board/st/common/stm32mp_dfu.c                              | 1 +
 board/st/common/stpmic1.c                                  | 1 +
 board/st/stm32f746-disco/stm32f746-disco.c                 | 1 +
 board/st/stm32mp1/stm32mp1.c                               | 1 +
 board/st/stv0991/stv0991.c                                 | 1 +
 board/sunxi/board.c                                        | 1 +
 board/synopsys/axs10x/axs10x.c                             | 1 +
 board/synopsys/emsdp/emsdp.c                               | 1 +
 board/synopsys/hsdk/clk-lib.c                              | 1 +
 board/synopsys/hsdk/hsdk.c                                 | 1 +
 board/synopsys/iot_devkit/iot_devkit.c                     | 1 +
 board/synopsys/nsim/nsim.c                                 | 1 +
 board/sysam/amcore/amcore.c                                | 1 +
 board/sysam/stmark2/stmark2.c                              | 1 +
 board/tbs/tbs2910/tbs2910.c                                | 1 +
 board/tcl/sl50/board.c                                     | 1 +
 board/technexion/pico-imx6/pico-imx6.c                     | 1 +
 board/technexion/pico-imx6ul/pico-imx6ul.c                 | 1 +
 board/technexion/pico-imx6ul/spl.c                         | 1 +
 board/technexion/pico-imx7d/pico-imx7d.c                   | 1 +
 board/technexion/pico-imx8mq/pico-imx8mq.c                 | 1 +
 board/technexion/pico-imx8mq/spl.c                         | 1 +
 board/technexion/tao3530/tao3530.c                         | 1 +
 board/technologic/ts4600/ts4600.c                          | 1 +
 board/technologic/ts4800/ts4800.c                          | 1 +
 board/theadorable/theadorable.c                            | 1 +
 board/ti/am335x/board.c                                    | 1 +
 board/ti/am335x/mux.c                                      | 1 +
 board/ti/am43xx/board.c                                    | 1 +
 board/ti/am43xx/mux.c                                      | 1 +
 board/ti/am57xx/board.c                                    | 1 +
 board/ti/am65x/evm.c                                       | 1 +
 board/ti/beagle/beagle.c                                   | 1 +
 board/ti/common/board_detect.c                             | 1 +
 board/ti/dra7xx/evm.c                                      | 1 +
 board/ti/evm/evm.c                                         | 1 +
 board/ti/j721e/evm.c                                       | 1 +
 board/ti/ks2_evm/board.c                                   | 1 +
 board/ti/ks2_evm/board_k2g.c                               | 1 +
 board/ti/ks2_evm/ddr3_k2e.c                                | 1 +
 board/ti/ks2_evm/ddr3_k2hk.c                               | 1 +
 board/ti/ks2_evm/ddr3_k2l.c                                | 1 +
 board/ti/ks2_evm/mux-k2g.h                                 | 1 +
 board/ti/omap5_uevm/evm.c                                  | 1 +
 board/ti/ti816x/evm.c                                      | 1 +
 board/timll/devkit8000/devkit8000.c                        | 1 +
 board/toradex/apalis-imx8/apalis-imx8.c                    | 1 +
 board/toradex/apalis-tk1/apalis-tk1.c                      | 1 +
 board/toradex/apalis_imx6/apalis_imx6.c                    | 1 +
 board/toradex/apalis_imx6/pf0100.c                         | 1 +
 board/toradex/apalis_t30/apalis_t30.c                      | 1 +
 board/toradex/colibri-imx6ull/colibri-imx6ull.c            | 1 +
 board/toradex/colibri-imx8x/colibri-imx8x.c                | 1 +
 board/toradex/colibri_imx6/colibri_imx6.c                  | 1 +
 board/toradex/colibri_imx6/pf0100.c                        | 1 +
 board/toradex/colibri_imx7/colibri_imx7.c                  | 1 +
 board/toradex/colibri_pxa270/colibri_pxa270.c              | 1 +
 board/toradex/colibri_t20/colibri_t20.c                    | 1 +
 board/toradex/colibri_t30/colibri_t30.c                    | 1 +
 board/toradex/colibri_vf/colibri_vf.c                      | 1 +
 board/toradex/common/tdx-cfg-block.c                       | 1 +
 board/toradex/common/tdx-common.c                          | 1 +
 board/toradex/verdin-imx8mm/spl.c                          | 1 +
 board/tqc/tqm834x/tqm834x.c                                | 1 +
 board/tqc/tqma6/tqma6.c                                    | 1 +
 board/tqc/tqma6/tqma6_wru4.c                               | 1 +
 board/udoo/neo/neo.c                                       | 1 +
 board/udoo/udoo.c                                          | 1 +
 board/variscite/dart_6ul/dart_6ul.c                        | 1 +
 board/variscite/dart_6ul/spl.c                             | 1 +
 board/varisys/common/sys_eeprom.c                          | 1 +
 board/varisys/cyrus/cyrus.c                                | 1 +
 board/varisys/cyrus/ddr.c                                  | 1 +
 board/varisys/cyrus/eth.c                                  | 1 +
 board/ve8313/ve8313.c                                      | 1 +
 board/vscom/baltos/board.c                                 | 1 +
 board/wandboard/spl.c                                      | 1 +
 board/wandboard/wandboard.c                                | 1 +
 board/warp/warp.c                                          | 1 +
 board/warp7/warp7.c                                        | 1 +
 board/work-microwave/work_92105/work_92105_display.c       | 1 +
 board/xes/common/board.c                                   | 1 +
 board/xes/common/fsl_8xxx_pci.c                            | 1 +
 board/xes/xpedite517x/xpedite517x.c                        | 1 +
 board/xes/xpedite520x/xpedite520x.c                        | 1 +
 board/xes/xpedite537x/xpedite537x.c                        | 1 +
 board/xes/xpedite550x/ddr.c                                | 1 +
 board/xes/xpedite550x/xpedite550x.c                        | 1 +
 board/xilinx/microblaze-generic/microblaze-generic.c       | 1 +
 board/xilinx/versal/board.c                                | 1 +
 board/xilinx/zynq/bootimg.c                                | 1 +
 board/xilinx/zynq/cmds.c                                   | 1 +
 board/xilinx/zynqmp/cmds.c                                 | 1 +
 board/xilinx/zynqmp/zynqmp.c                               | 1 +
 board/zyxel/nsa310s/nsa310s.c                              | 1 +
 cmd/ab_select.c                                            | 1 +
 cmd/abootimg.c                                             | 1 +
 cmd/acpi.c                                                 | 1 +
 cmd/adc.c                                                  | 1 +
 cmd/adtimg.c                                               | 1 +
 cmd/armflash.c                                             | 1 +
 cmd/avb.c                                                  | 1 +
 cmd/axi.c                                                  | 1 +
 cmd/bcb.c                                                  | 1 +
 cmd/bdinfo.c                                               | 1 +
 cmd/bind.c                                                 | 1 +
 cmd/binop.c                                                | 1 +
 cmd/blk_common.c                                           | 1 +
 cmd/blkcache.c                                             | 1 +
 cmd/bmp.c                                                  | 1 +
 cmd/bootcount.c                                            | 1 +
 cmd/booti.c                                                | 1 +
 cmd/bootm.c                                                | 1 +
 cmd/bootmenu.c                                             | 1 +
 cmd/bootstage.c                                            | 1 +
 cmd/bootz.c                                                | 1 +
 cmd/cache.c                                                | 1 +
 cmd/cbfs.c                                                 | 1 +
 cmd/clk.c                                                  | 1 +
 cmd/config.c                                               | 1 +
 cmd/conitrace.c                                            | 1 +
 cmd/cpu.c                                                  | 1 +
 cmd/cramfs.c                                               | 1 +
 cmd/cros_ec.c                                              | 1 +
 cmd/date.c                                                 | 1 +
 cmd/demo.c                                                 | 1 +
 cmd/disk.c                                                 | 1 +
 cmd/echo.c                                                 | 1 +
 cmd/eeprom.c                                               | 1 +
 cmd/efi.c                                                  | 1 +
 cmd/efidebug.c                                             | 1 +
 cmd/elf.c                                                  | 1 +
 cmd/ethsw.c                                                | 1 +
 cmd/fastboot.c                                             | 1 +
 cmd/fat.c                                                  | 1 +
 cmd/fdt.c                                                  | 1 +
 cmd/flash.c                                                | 1 +
 cmd/fpga.c                                                 | 1 +
 cmd/fuse.c                                                 | 1 +
 cmd/gettime.c                                              | 1 +
 cmd/gpio.c                                                 | 1 +
 cmd/gpt.c                                                  | 1 +
 cmd/host.c                                                 | 1 +
 cmd/i2c.c                                                  | 1 +
 cmd/ide.c                                                  | 1 +
 cmd/ini.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/license.c                                              | 1 +
 cmd/load.c                                                 | 1 +
 cmd/log.c                                                  | 1 +
 cmd/lsblk.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/mvebu/bubt.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/part.c                                                 | 1 +
 cmd/pci.c                                                  | 1 +
 cmd/pinmux.c                                               | 1 +
 cmd/pmc.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/reiser.c                                               | 1 +
 cmd/remoteproc.c                                           | 1 +
 cmd/rng.c                                                  | 1 +
 cmd/rockusb.c                                              | 1 +
 cmd/rtc.c                                                  | 1 +
 cmd/sata.c                                                 | 1 +
 cmd/sb.c                                                   | 1 +
 cmd/scsi.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/spl.c                                                  | 1 +
 cmd/strings.c                                              | 1 +
 cmd/sysboot.c                                              | 1 +
 cmd/terminal.c                                             | 1 +
 cmd/thordown.c                                             | 1 +
 cmd/ti/ddr3.c                                              | 1 +
 cmd/time.c                                                 | 1 +
 cmd/tlv_eeprom.c                                           | 1 +
 cmd/tpm-common.c                                           | 1 +
 cmd/tpm-v1.c                                               | 1 +
 cmd/tpm-v2.c                                               | 1 +
 cmd/tpm_test.c                                             | 1 +
 cmd/trace.c                                                | 1 +
 cmd/tsi148.c                                               | 1 +
 cmd/ubi.c                                                  | 1 +
 cmd/ubifs.c                                                | 1 +
 cmd/universe.c                                             | 1 +
 cmd/unlz4.c                                                | 1 +
 cmd/unzip.c                                                | 1 +
 cmd/usb.c                                                  | 1 +
 cmd/usb_mass_storage.c                                     | 1 +
 cmd/version.c                                              | 1 +
 cmd/w1.c                                                   | 1 +
 cmd/wdt.c                                                  | 1 +
 cmd/x86/fsp.c                                              | 1 +
 cmd/x86/hob.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/avb_verify.c                                        | 1 +
 common/board_f.c                                           | 1 +
 common/board_info.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.c                                               | 1 +
 common/cli_readline.c                                      | 1 +
 common/cli_simple.c                                        | 1 +
 common/command.c                                           | 1 +
 common/common_fit.c                                        | 1 +
 common/console.c                                           | 1 +
 common/ddr_spd.c                                           | 1 +
 common/dlmalloc.c                                          | 1 +
 common/edid.c                                              | 1 +
 common/eeprom/eeprom_field.c                               | 1 +
 common/eeprom/eeprom_layout.c                              | 1 +
 common/fdt_support.c                                       | 1 +
 common/flash.c                                             | 1 +
 common/hash.c                                              | 1 +
 common/image-android-dt.c                                  | 1 +
 common/image-android.c                                     | 1 +
 common/image-cipher.c                                      | 1 +
 common/image-fdt.c                                         | 1 +
 common/image-fit-sig.c                                     | 1 +
 common/image-fit.c                                         | 1 +
 common/image.c                                             | 1 +
 common/iomux.c                                             | 1 +
 common/kgdb.c                                              | 1 +
 common/kgdb_stubs.c                                        | 1 +
 common/lcd.c                                               | 1 +
 common/lcd_console_rotation.c                              | 1 +
 common/log_console.c                                       | 1 +
 common/menu.c                                              | 1 +
 common/miiphyutil.c                                        | 1 +
 common/spl/spl.c                                           | 1 +
 common/spl/spl_ext.c                                       | 1 +
 common/spl/spl_fat.c                                       | 1 +
 common/spl/spl_fit.c                                       | 1 +
 common/spl/spl_legacy.c                                    | 1 +
 common/spl/spl_mmc.c                                       | 1 +
 common/spl/spl_nand.c                                      | 1 +
 common/spl/spl_net.c                                       | 1 +
 common/spl/spl_nor.c                                       | 1 +
 common/spl/spl_sata.c                                      | 1 +
 common/spl/spl_spi.c                                       | 1 +
 common/spl/spl_ubi.c                                       | 1 +
 common/spl/spl_usb.c                                       | 1 +
 common/spl/spl_ymodem.c                                    | 1 +
 common/splash.c                                            | 1 +
 common/splash_source.c                                     | 1 +
 common/stdio.c                                             | 1 +
 common/update.c                                            | 1 +
 common/usb.c                                               | 1 +
 common/usb_hub.c                                           | 1 +
 common/usb_kbd.c                                           | 1 +
 common/usb_storage.c                                       | 1 +
 disk/part.c                                                | 1 +
 disk/part_amiga.c                                          | 1 +
 disk/part_dos.c                                            | 1 +
 disk/part_efi.c                                            | 1 +
 disk/part_iso.c                                            | 1 +
 disk/part_mac.c                                            | 1 +
 drivers/adc/adc-uclass.c                                   | 1 +
 drivers/adc/meson-saradc.c                                 | 1 +
 drivers/ata/ahci.c                                         | 1 +
 drivers/ata/ahci_sunxi.c                                   | 1 +
 drivers/ata/dwc_ahsata.c                                   | 1 +
 drivers/ata/fsl_sata.c                                     | 1 +
 drivers/ata/libata.c                                       | 1 +
 drivers/ata/sata.c                                         | 1 +
 drivers/ata/sata_mv.c                                      | 1 +
 drivers/ata/sata_sil.c                                     | 1 +
 drivers/bios_emulator/atibios.c                            | 1 +
 drivers/bios_emulator/besys.c                              | 1 +
 drivers/bios_emulator/bios.c                               | 1 +
 drivers/bios_emulator/biosemu.c                            | 1 +
 drivers/bios_emulator/include/x86emu.h                     | 1 +
 drivers/bios_emulator/include/x86emu/debug.h               | 2 ++
 drivers/bios_emulator/x86emu/ops.c                         | 1 +
 drivers/block/blk-uclass.c                                 | 1 +
 drivers/block/blk_legacy.c                                 | 1 +
 drivers/block/ide.c                                        | 1 +
 drivers/block/sandbox.c                                    | 1 +
 drivers/bootcount/bootcount_ext.c                          | 1 +
 drivers/bootcount/bootcount_i2c.c                          | 1 +
 drivers/cache/cache-ncore.c                                | 1 +
 drivers/cache/cache-v5l2.c                                 | 1 +
 drivers/clk/at91/clk-utmi.c                                | 1 +
 drivers/clk/clk-mux.c                                      | 1 +
 drivers/clk/clk-uclass.c                                   | 1 +
 drivers/clk/clk.c                                          | 1 +
 drivers/clk/clk_pic32.c                                    | 1 +
 drivers/clk/clk_stm32mp1.c                                 | 1 +
 drivers/clk/clk_versal.c                                   | 1 +
 drivers/clk/clk_zynqmp.c                                   | 1 +
 drivers/clk/ics8n3qv01.c                                   | 1 +
 drivers/clk/imx/clk-imx6q.c                                | 1 +
 drivers/clk/imx/clk-imx8.c                                 | 1 +
 drivers/clk/imx/clk-imx8qm.c                               | 1 +
 drivers/clk/imx/clk-imx8qxp.c                              | 1 +
 drivers/clk/mpc83xx_clk.c                                  | 1 +
 drivers/clk/mvebu/armada-37xx-periph.c                     | 1 +
 drivers/clk/mvebu/armada-37xx-tbg.c                        | 1 +
 drivers/clk/renesas/clk-rcar-gen2.c                        | 1 +
 drivers/clk/renesas/clk-rcar-gen3.c                        | 1 +
 drivers/clk/rockchip/clk_pll.c                             | 1 +
 drivers/clk/rockchip/clk_px30.c                            | 1 +
 drivers/clk/rockchip/clk_rk3128.c                          | 1 +
 drivers/clk/rockchip/clk_rk3288.c                          | 1 +
 drivers/clk/rockchip/clk_rk3308.c                          | 1 +
 drivers/clk/rockchip/clk_rk3328.c                          | 1 +
 drivers/clk/rockchip/clk_rk3399.c                          | 1 +
 drivers/clk/rockchip/clk_rv1108.c                          | 1 +
 drivers/clk/sunxi/clk_sunxi.c                              | 1 +
 drivers/core/acpi.c                                        | 1 +
 drivers/core/devres.c                                      | 1 +
 drivers/core/dump.c                                        | 1 +
 drivers/core/util.c                                        | 1 +
 drivers/cpu/bmips_cpu.c                                    | 1 +
 drivers/cpu/imx8_cpu.c                                     | 1 +
 drivers/crypto/fsl/desc_constr.h                           | 1 +
 drivers/crypto/fsl/fsl_blob.c                              | 1 +
 drivers/crypto/fsl/fsl_hash.c                              | 1 +
 drivers/crypto/fsl/jobdesc.c                               | 1 +
 drivers/crypto/fsl/jr.c                                    | 1 +
 drivers/crypto/fsl/sec.c                                   | 1 +
 drivers/ddr/altera/sdram_agilex.c                          | 1 +
 drivers/ddr/altera/sdram_arria10.c                         | 1 +
 drivers/ddr/altera/sdram_gen5.c                            | 1 +
 drivers/ddr/altera/sdram_s10.c                             | 1 +
 drivers/ddr/altera/sdram_soc64.c                           | 1 +
 drivers/ddr/fsl/arm_ddr_gen3.c                             | 1 +
 drivers/ddr/fsl/ctrl_regs.c                                | 1 +
 drivers/ddr/fsl/ddr1_dimm_params.c                         | 1 +
 drivers/ddr/fsl/ddr2_dimm_params.c                         | 1 +
 drivers/ddr/fsl/ddr3_dimm_params.c                         | 1 +
 drivers/ddr/fsl/ddr4_dimm_params.c                         | 1 +
 drivers/ddr/fsl/fsl_ddr_gen4.c                             | 1 +
 drivers/ddr/fsl/fsl_mmdc.c                                 | 1 +
 drivers/ddr/fsl/interactive.c                              | 1 +
 drivers/ddr/fsl/lc_common_dimm_params.c                    | 1 +
 drivers/ddr/fsl/main.c                                     | 1 +
 drivers/ddr/fsl/mpc85xx_ddr_gen1.c                         | 1 +
 drivers/ddr/fsl/mpc85xx_ddr_gen2.c                         | 1 +
 drivers/ddr/fsl/mpc85xx_ddr_gen3.c                         | 1 +
 drivers/ddr/fsl/mpc86xx_ddr.c                              | 1 +
 drivers/ddr/fsl/options.c                                  | 1 +
 drivers/ddr/fsl/util.c                                     | 1 +
 drivers/ddr/imx/imx8m/helper.c                             | 1 +
 drivers/ddr/marvell/a38x/ddr_ml_wrapper.h                  | 1 +
 drivers/ddr/marvell/axp/ddr3_dfs.c                         | 1 +
 drivers/ddr/marvell/axp/ddr3_dqs.c                         | 1 +
 drivers/ddr/marvell/axp/ddr3_hw_training.c                 | 1 +
 drivers/ddr/marvell/axp/ddr3_init.c                        | 1 +
 drivers/ddr/marvell/axp/ddr3_pbs.c                         | 1 +
 drivers/ddr/marvell/axp/ddr3_read_leveling.c               | 1 +
 drivers/ddr/marvell/axp/ddr3_spd.c                         | 1 +
 drivers/ddr/marvell/axp/ddr3_write_leveling.c              | 1 +
 drivers/ddr/microchip/ddr2.c                               | 1 +
 drivers/demo/demo-shape.c                                  | 1 +
 drivers/demo/demo-simple.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_sf.c                                       | 1 +
 drivers/dma/MCD_dmaApi.c                                   | 1 +
 drivers/dma/apbh_dma.c                                     | 1 +
 drivers/dma/ti/k3-udma.c                                   | 1 +
 drivers/fastboot/fb_command.c                              | 1 +
 drivers/fastboot/fb_common.c                               | 1 +
 drivers/fastboot/fb_mmc.c                                  | 1 +
 drivers/fastboot/fb_nand.c                                 | 1 +
 drivers/firmware/firmware-zynqmp.c                         | 1 +
 drivers/firmware/psci.c                                    | 1 +
 drivers/fpga/altera.c                                      | 1 +
 drivers/fpga/cyclon2.c                                     | 1 +
 drivers/fpga/fpga.c                                        | 1 +
 drivers/fpga/ivm_core.c                                    | 1 +
 drivers/fpga/lattice.c                                     | 1 +
 drivers/fpga/socfpga_arria10.c                             | 1 +
 drivers/fpga/socfpga_gen5.c                                | 1 +
 drivers/fpga/stratix10.c                                   | 1 +
 drivers/fpga/stratixv.c                                    | 1 +
 drivers/fpga/versalpl.c                                    | 1 +
 drivers/fpga/virtex2.c                                     | 1 +
 drivers/fpga/xilinx.c                                      | 1 +
 drivers/fpga/zynqmppl.c                                    | 1 +
 drivers/fpga/zynqpl.c                                      | 1 +
 drivers/gpio/adi_gpio2.c                                   | 1 +
 drivers/gpio/at91_gpio.c                                   | 1 +
 drivers/gpio/atmel_pio4.c                                  | 1 +
 drivers/gpio/da8xx_gpio.c                                  | 1 +
 drivers/gpio/db8500_gpio.c                                 | 1 +
 drivers/gpio/gpio-uclass.c                                 | 1 +
 drivers/gpio/kona_gpio.c                                   | 1 +
 drivers/gpio/kw_gpio.c                                     | 1 +
 drivers/gpio/mpc83xx_gpio.c                                | 1 +
 drivers/gpio/mvgpio.c                                      | 1 +
 drivers/gpio/mxs_gpio.c                                    | 1 +
 drivers/gpio/omap_gpio.c                                   | 1 +
 drivers/gpio/pca953x.c                                     | 1 +
 drivers/gpio/pcf8575_gpio.c                                | 1 +
 drivers/gpio/sandbox.c                                     | 1 +
 drivers/gpio/tca642x.c                                     | 1 +
 drivers/gpio/xilinx_gpio.c                                 | 1 +
 drivers/gpio/zynq_gpio.c                                   | 1 +
 drivers/i2c/davinci_i2c.c                                  | 1 +
 drivers/i2c/designware_i2c.c                               | 1 +
 drivers/i2c/i2c-cdns.c                                     | 1 +
 drivers/i2c/i2c-cortina.c                                  | 1 +
 drivers/i2c/i2c-uclass.c                                   | 1 +
 drivers/i2c/i2c_core.c                                     | 1 +
 drivers/i2c/imx_lpi2c.c                                    | 1 +
 drivers/i2c/intel_i2c.c                                    | 1 +
 drivers/i2c/kona_i2c.c                                     | 1 +
 drivers/i2c/muxes/i2c-arb-gpio-challenge.c                 | 1 +
 drivers/i2c/mv_i2c.c                                       | 1 +
 drivers/i2c/mvtwsi.c                                       | 1 +
 drivers/i2c/mxc_i2c.c                                      | 1 +
 drivers/i2c/omap24xx_i2c.c                                 | 1 +
 drivers/input/keyboard-uclass.c                            | 1 +
 drivers/mailbox/k3-sec-proxy.c                             | 1 +
 drivers/memory/ti-aemif.c                                  | 1 +
 drivers/misc/altera_sysid.c                                | 1 +
 drivers/misc/cros_ec.c                                     | 1 +
 drivers/misc/cros_ec_i2c.c                                 | 1 +
 drivers/misc/cros_ec_lpc.c                                 | 1 +
 drivers/misc/cros_ec_sandbox.c                             | 1 +
 drivers/misc/cros_ec_spi.c                                 | 1 +
 drivers/misc/ds4510.c                                      | 1 +
 drivers/misc/fsl_ifc.c                                     | 1 +
 drivers/misc/fsl_iim.c                                     | 1 +
 drivers/misc/fsl_portals.c                                 | 1 +
 drivers/misc/fsl_sec_mon.c                                 | 1 +
 drivers/misc/gpio_led.c                                    | 1 +
 drivers/misc/ihs_fpga.c                                    | 1 +
 drivers/misc/imx8/fuse.c                                   | 1 +
 drivers/misc/imx8/scu.c                                    | 1 +
 drivers/misc/imx8/scu_api.c                                | 1 +
 drivers/misc/k3_avs.c                                      | 1 +
 drivers/misc/mc9sdz60.c                                    | 1 +
 drivers/misc/mxc_ocotp.c                                   | 1 +
 drivers/misc/mxs_ocotp.c                                   | 1 +
 drivers/misc/qfw.c                                         | 1 +
 drivers/misc/rockchip-efuse.c                              | 1 +
 drivers/misc/rockchip-otp.c                                | 1 +
 drivers/misc/sifive-otp.c                                  | 1 +
 drivers/misc/spltest_sandbox.c                             | 1 +
 drivers/misc/stm32mp_fuse.c                                | 1 +
 drivers/mmc/atmel_sdhci.c                                  | 1 +
 drivers/mmc/bcm2835_sdhost.c                               | 1 +
 drivers/mmc/davinci_mmc.c                                  | 1 +
 drivers/mmc/exynos_dw_mmc.c                                | 1 +
 drivers/mmc/fsl_esdhc.c                                    | 1 +
 drivers/mmc/fsl_esdhc_imx.c                                | 1 +
 drivers/mmc/fsl_esdhc_spl.c                                | 1 +
 drivers/mmc/ftsdc010_mci.c                                 | 1 +
 drivers/mmc/gen_atmel_mci.c                                | 1 +
 drivers/mmc/iproc_sdhci.c                                  | 1 +
 drivers/mmc/kona_sdhci.c                                   | 1 +
 drivers/mmc/mmc-uclass.c                                   | 1 +
 drivers/mmc/mmc.c                                          | 1 +
 drivers/mmc/mmc_legacy.c                                   | 1 +
 drivers/mmc/mmc_write.c                                    | 1 +
 drivers/mmc/msm_sdhci.c                                    | 1 +
 drivers/mmc/mv_sdhci.c                                     | 1 +
 drivers/mmc/mvebu_mmc.c                                    | 1 +
 drivers/mmc/mxcmmc.c                                       | 1 +
 drivers/mmc/mxsmmc.c                                       | 1 +
 drivers/mmc/omap_hsmmc.c                                   | 1 +
 drivers/mmc/pic32_sdhci.c                                  | 1 +
 drivers/mmc/pxa_mmc_gen.c                                  | 1 +
 drivers/mmc/rockchip_sdhci.c                               | 1 +
 drivers/mmc/rpmb.c                                         | 1 +
 drivers/mmc/s5p_sdhci.c                                    | 1 +
 drivers/mmc/sdhci.c                                        | 1 +
 drivers/mmc/sh_mmcif.c                                     | 1 +
 drivers/mmc/sh_sdhi.c                                      | 1 +
 drivers/mmc/socfpga_dw_mmc.c                               | 1 +
 drivers/mmc/stm32_sdmmc2.c                                 | 1 +
 drivers/mmc/sunxi_mmc.c                                    | 1 +
 drivers/mmc/tegra_mmc.c                                    | 1 +
 drivers/mmc/xenon_sdhci.c                                  | 1 +
 drivers/mmc/zynq_sdhci.c                                   | 1 +
 drivers/mtd/altera_qspi.c                                  | 1 +
 drivers/mtd/cfi_flash.c                                    | 1 +
 drivers/mtd/jedec_flash.c                                  | 1 +
 drivers/mtd/mtd_uboot.c                                    | 1 +
 drivers/mtd/mtdpart.c                                      | 1 +
 drivers/mtd/mw_eeprom.c                                    | 1 +
 drivers/mtd/nand/raw/arasan_nfc.c                          | 1 +
 drivers/mtd/nand/raw/fsl_elbc_nand.c                       | 1 +
 drivers/mtd/nand/raw/fsl_elbc_spl.c                        | 1 +
 drivers/mtd/nand/raw/fsl_ifc_nand.c                        | 1 +
 drivers/mtd/nand/raw/fsl_ifc_spl.c                         | 1 +
 drivers/mtd/nand/raw/fsmc_nand.c                           | 1 +
 drivers/mtd/nand/raw/mxs_nand.c                            | 1 +
 drivers/mtd/nand/raw/mxs_nand_spl.c                        | 1 +
 drivers/mtd/nand/raw/nand_util.c                           | 1 +
 drivers/mtd/nand/raw/omap_elm.c                            | 1 +
 drivers/mtd/nand/raw/omap_gpmc.c                           | 1 +
 drivers/mtd/nand/raw/sunxi_nand_spl.c                      | 1 +
 drivers/mtd/nand/raw/tegra_nand.c                          | 1 +
 drivers/mtd/nand/raw/vf610_nfc.c                           | 1 +
 drivers/mtd/nand/raw/zynq_nand.c                           | 1 +
 drivers/mtd/onenand/onenand_uboot.c                        | 1 +
 drivers/mtd/onenand/samsung.c                              | 1 +
 drivers/mtd/pic32_flash.c                                  | 1 +
 drivers/mtd/renesas_rpc_hf.c                               | 1 +
 drivers/mtd/spi/fsl_espi_spl.c                             | 1 +
 drivers/mtd/spi/sandbox.c                                  | 1 +
 drivers/mtd/spi/sf_dataflash.c                             | 1 +
 drivers/mtd/spi/sf_mtd.c                                   | 1 +
 drivers/mtd/spi/sf_probe.c                                 | 1 +
 drivers/mtd/spi/spi-nor-core.c                             | 1 +
 drivers/mtd/spi/spi-nor-tiny.c                             | 1 +
 drivers/mtd/st_smi.c                                       | 1 +
 drivers/mtd/stm32_flash.c                                  | 1 +
 drivers/mtd/ubi/debug.c                                    | 1 +
 drivers/net/ag7xxx.c                                       | 1 +
 drivers/net/altera_tse.c                                   | 1 +
 drivers/net/armada100_fec.c                                | 1 +
 drivers/net/at91_emac.c                                    | 1 +
 drivers/net/ax88180.c                                      | 1 +
 drivers/net/bcm-sf2-eth-gmac.c                             | 1 +
 drivers/net/bcm-sf2-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/dm9000x.c                                      | 1 +
 drivers/net/dnet.c                                         | 1 +
 drivers/net/e1000.c                                        | 1 +
 drivers/net/e1000.h                                        | 1 +
 drivers/net/e1000_spi.c                                    | 1 +
 drivers/net/eepro100.c                                     | 1 +
 drivers/net/ep93xx_eth.c                                   | 1 +
 drivers/net/eth-phy-uclass.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/fm/fm.c                                        | 1 +
 drivers/net/fm/memac_phy.c                                 | 1 +
 drivers/net/fm/tgec_phy.c                                  | 1 +
 drivers/net/fsl-mc/dpio/qbman_portal.c                     | 1 +
 drivers/net/fsl-mc/dpio/qbman_sys.h                        | 1 +
 drivers/net/fsl-mc/mc.c                                    | 1 +
 drivers/net/fsl-mc/mc_sys.c                                | 1 +
 drivers/net/fsl_enetc_mdio.c                               | 1 +
 drivers/net/fsl_mcdmafec.c                                 | 1 +
 drivers/net/fsl_mdio.c                                     | 1 +
 drivers/net/ftgmac100.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/lpc32xx_eth.c                                  | 1 +
 drivers/net/macb.c                                         | 1 +
 drivers/net/mcffec.c                                       | 1 +
 drivers/net/mcfmii.c                                       | 1 +
 drivers/net/mpc8xx_fec.c                                   | 1 +
 drivers/net/mscc_eswitch/jr2_switch.c                      | 1 +
 drivers/net/mscc_eswitch/luton_switch.c                    | 1 +
 drivers/net/mscc_eswitch/servalt_switch.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/ne2000.c                                       | 1 +
 drivers/net/ne2000_base.c                                  | 1 +
 drivers/net/ne2000_base.h                                  | 1 +
 drivers/net/ns8382x.c                                      | 1 +
 drivers/net/pch_gbe.c                                      | 1 +
 drivers/net/pcnet.c                                        | 1 +
 drivers/net/pfe_eth/pfe_cmd.c                              | 1 +
 drivers/net/pfe_eth/pfe_driver.c                           | 1 +
 drivers/net/pfe_eth/pfe_eth.c                              | 1 +
 drivers/net/pfe_eth/pfe_firmware.c                         | 1 +
 drivers/net/pfe_eth/pfe_hw.c                               | 1 +
 drivers/net/pfe_eth/pfe_mdio.c                             | 1 +
 drivers/net/phy/aquantia.c                                 | 1 +
 drivers/net/phy/b53.c                                      | 1 +
 drivers/net/phy/broadcom.c                                 | 1 +
 drivers/net/phy/cortina.c                                  | 1 +
 drivers/net/phy/fixed.c                                    | 1 +
 drivers/net/phy/marvell.c                                  | 1 +
 drivers/net/phy/meson-gxl.c                                | 1 +
 drivers/net/phy/miiphybb.c                                 | 1 +
 drivers/net/phy/mscc.c                                     | 1 +
 drivers/net/phy/mv88e61xx.c                                | 1 +
 drivers/net/phy/mv88e6352.c                                | 1 +
 drivers/net/phy/ncsi.c                                     | 1 +
 drivers/net/phy/phy.c                                      | 1 +
 drivers/net/phy/realtek.c                                  | 1 +
 drivers/net/phy/teranetics.c                               | 1 +
 drivers/net/phy/vitesse.c                                  | 1 +
 drivers/net/phy/xilinx_gmii2rgmii.c                        | 1 +
 drivers/net/pic32_eth.c                                    | 1 +
 drivers/net/pic32_mdio.c                                   | 1 +
 drivers/net/rtl8139.c                                      | 1 +
 drivers/net/rtl8169.c                                      | 1 +
 drivers/net/sandbox-raw.c                                  | 1 +
 drivers/net/sandbox.c                                      | 1 +
 drivers/net/sh_eth.c                                       | 1 +
 drivers/net/smc91111.c                                     | 1 +
 drivers/net/smc911x.c                                      | 1 +
 drivers/net/sun8i_emac.c                                   | 1 +
 drivers/net/sunxi_emac.c                                   | 1 +
 drivers/net/ti/am65-cpsw-nuss.c                            | 1 +
 drivers/net/ti/cpsw.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/vsc7385.c                                      | 1 +
 drivers/net/vsc9953.c                                      | 1 +
 drivers/net/xilinx_axi_emac.c                              | 1 +
 drivers/net/xilinx_emaclite.c                              | 1 +
 drivers/net/zynq_gem.c                                     | 1 +
 drivers/nvme/nvme.c                                        | 1 +
 drivers/nvme/nvme_show.c                                   | 1 +
 drivers/pci/fsl_pci_init.c                                 | 1 +
 drivers/pci/pci-aardvark.c                                 | 1 +
 drivers/pci/pci-uclass.c                                   | 1 +
 drivers/pci/pci.c                                          | 1 +
 drivers/pci/pci_auto.c                                     | 1 +
 drivers/pci/pci_common.c                                   | 1 +
 drivers/pci/pci_ftpci100.c                                 | 1 +
 drivers/pci/pci_mpc85xx.c                                  | 1 +
 drivers/pci/pci_mvebu.c                                    | 1 +
 drivers/pci/pci_rom.c                                      | 1 +
 drivers/pci/pci_sh4.c                                      | 1 +
 drivers/pci/pci_sh7751.c                                   | 1 +
 drivers/pci/pci_sh7780.c                                   | 1 +
 drivers/pci/pcie_brcmstb.c                                 | 1 +
 drivers/pci/pcie_dw_mvebu.c                                | 1 +
 drivers/pci/pcie_dw_ti.c                                   | 1 +
 drivers/pci/pcie_fsl.c                                     | 1 +
 drivers/pci/pcie_imx.c                                     | 1 +
 drivers/pci/pcie_layerscape_ep.c                           | 1 +
 drivers/pci/pcie_layerscape_gen4.c                         | 1 +
 drivers/pci/pcie_layerscape_rc.c                           | 1 +
 drivers/phy/marvell/comphy_a3700.c                         | 1 +
 drivers/phy/marvell/comphy_core.c                          | 1 +
 drivers/phy/marvell/comphy_core.h                          | 1 +
 drivers/phy/marvell/comphy_cp110.c                         | 1 +
 drivers/phy/omap-usb2-phy.c                                | 1 +
 drivers/phy/ti-pipe3-phy.c                                 | 1 +
 drivers/pinctrl/broadcom/pinctrl-bcm283x.c                 | 1 +
 drivers/pinctrl/intel/pinctrl.c                            | 1 +
 drivers/pinctrl/meson/pinctrl-meson.c                      | 1 +
 drivers/pinctrl/mvebu/pinctrl-armada-37xx.c                | 1 +
 drivers/pinctrl/nxp/pinctrl-scu.c                          | 1 +
 drivers/pinctrl/pinctrl-at91-pio4.c                        | 1 +
 drivers/pinctrl/pinctrl_pic32.c                            | 1 +
 drivers/pinctrl/renesas/pfc-r7s72100.c                     | 1 +
 drivers/pinctrl/renesas/pfc.c                              | 1 +
 drivers/power/acpi_pmc/acpi-pmc-uclass.c                   | 1 +
 drivers/power/battery/bat_trats.c                          | 1 +
 drivers/power/battery/bat_trats2.c                         | 1 +
 drivers/power/domain/imx8-power-domain-legacy.c            | 1 +
 drivers/power/domain/imx8-power-domain.c                   | 1 +
 drivers/power/domain/imx8m-power-domain.c                  | 1 +
 drivers/power/fuel_gauge/fg_max17042.c                     | 1 +
 drivers/power/mfd/fg_max77693.c                            | 1 +
 drivers/power/mfd/muic_max77693.c                          | 1 +
 drivers/power/mfd/pmic_max77693.c                          | 1 +
 drivers/power/mt6323.c                                     | 1 +
 drivers/power/palmas.c                                     | 1 +
 drivers/power/pmic/lp873x.c                                | 1 +
 drivers/power/pmic/lp87565.c                               | 1 +
 drivers/power/pmic/mc34708.c                               | 1 +
 drivers/power/pmic/muic_max8997.c                          | 1 +
 drivers/power/pmic/pmic_hi6553.c                           | 1 +
 drivers/power/pmic/pmic_ltc3676.c                          | 1 +
 drivers/power/pmic/pmic_max77696.c                         | 1 +
 drivers/power/pmic/pmic_max8997.c                          | 1 +
 drivers/power/pmic/pmic_max8998.c                          | 1 +
 drivers/power/pmic/pmic_mc34vr500.c                        | 1 +
 drivers/power/pmic/pmic_pca9450.c                          | 1 +
 drivers/power/pmic/pmic_pfuze100.c                         | 1 +
 drivers/power/pmic/pmic_pfuze3000.c                        | 1 +
 drivers/power/pmic/pmic_tps62362.c                         | 1 +
 drivers/power/pmic/pmic_tps65218.c                         | 1 +
 drivers/power/pmic/rk8xx.c                                 | 1 +
 drivers/power/pmic/tps65941.c                              | 1 +
 drivers/power/power_core.c                                 | 1 +
 drivers/power/power_dialog.c                               | 1 +
 drivers/power/power_fsl.c                                  | 1 +
 drivers/power/power_i2c.c                                  | 1 +
 drivers/power/regulator/lp873x_regulator.c                 | 1 +
 drivers/power/regulator/lp87565_regulator.c                | 1 +
 drivers/power/regulator/palmas_regulator.c                 | 1 +
 drivers/power/regulator/pwm_regulator.c                    | 1 +
 drivers/power/regulator/regulator-uclass.c                 | 1 +
 drivers/power/regulator/tps65941_regulator.c               | 1 +
 drivers/power/twl4030.c                                    | 1 +
 drivers/power/twl6030.c                                    | 1 +
 drivers/pwm/pwm-imx-util.c                                 | 1 +
 drivers/pwm/pwm-mtk.c                                      | 1 +
 drivers/qe/qe.c                                            | 1 +
 drivers/qe/uccf.c                                          | 1 +
 drivers/qe/uec.c                                           | 1 +
 drivers/qe/uec_phy.c                                       | 1 +
 drivers/ram/k3-am654-ddrss.c                               | 1 +
 drivers/ram/k3-j721e/k3-j721e-ddrss.c                      | 1 +
 drivers/ram/rockchip/dmc-rk3368.c                          | 1 +
 drivers/ram/rockchip/sdram_common.c                        | 1 +
 drivers/ram/rockchip/sdram_rk3188.c                        | 1 +
 drivers/ram/rockchip/sdram_rk322x.c                        | 1 +
 drivers/ram/rockchip/sdram_rk3288.c                        | 1 +
 drivers/ram/rockchip/sdram_rk3328.c                        | 1 +
 drivers/ram/rockchip/sdram_rk3399.c                        | 1 +
 drivers/ram/sifive/fu540_ddr.c                             | 1 +
 drivers/ram/stm32mp1/stm32mp1_ddr.c                        | 1 +
 drivers/ram/stm32mp1/stm32mp1_interactive.c                | 1 +
 drivers/ram/stm32mp1/stm32mp1_ram.c                        | 1 +
 drivers/ram/stm32mp1/stm32mp1_tests.c                      | 1 +
 drivers/ram/stm32mp1/stm32mp1_tuning.c                     | 1 +
 drivers/remoteproc/ti_k3_r5f_rproc.c                       | 1 +
 drivers/reset/reset-socfpga.c                              | 1 +
 drivers/reset/reset-sunxi.c                                | 1 +
 drivers/rng/stm32mp1_rng.c                                 | 1 +
 drivers/rtc/davinci.c                                      | 1 +
 drivers/rtc/ds1302.c                                       | 1 +
 drivers/rtc/ds1307.c                                       | 1 +
 drivers/rtc/ds1337.c                                       | 1 +
 drivers/rtc/ds1374.c                                       | 1 +
 drivers/rtc/ds1556.c                                       | 1 +
 drivers/rtc/ds164x.c                                       | 1 +
 drivers/rtc/ds174x.c                                       | 1 +
 drivers/rtc/ds3231.c                                       | 1 +
 drivers/rtc/imxdi.c                                        | 1 +
 drivers/rtc/isl1208.c                                      | 1 +
 drivers/rtc/m41t11.c                                       | 1 +
 drivers/rtc/m41t60.c                                       | 1 +
 drivers/rtc/m41t62.c                                       | 1 +
 drivers/rtc/mc146818.c                                     | 1 +
 drivers/rtc/mcfrtc.c                                       | 1 +
 drivers/rtc/mvrtc.c                                        | 1 +
 drivers/rtc/mxsrtc.c                                       | 1 +
 drivers/rtc/pcf2127.c                                      | 1 +
 drivers/rtc/pcf8563.c                                      | 1 +
 drivers/rtc/pt7c4338.c                                     | 1 +
 drivers/rtc/rs5c372.c                                      | 1 +
 drivers/rtc/rv3029.c                                       | 1 +
 drivers/rtc/rv8803.c                                       | 1 +
 drivers/rtc/rx8010sj.c                                     | 1 +
 drivers/rtc/rx8025.c                                       | 1 +
 drivers/rtc/s35392a.c                                      | 1 +
 drivers/rtc/s3c24x0_rtc.c                                  | 1 +
 drivers/scsi/scsi.c                                        | 1 +
 drivers/serial/serial-uclass.c                             | 1 +
 drivers/serial/serial.c                                    | 1 +
 drivers/soc/ti/keystone_serdes.c                           | 1 +
 drivers/sound/hda_codec.c                                  | 1 +
 drivers/spi/atcspi200_spi.c                                | 1 +
 drivers/spi/bcm63xx_hsspi.c                                | 1 +
 drivers/spi/bcm63xx_spi.c                                  | 1 +
 drivers/spi/bcmstb_spi.c                                   | 1 +
 drivers/spi/cadence_qspi.c                                 | 1 +
 drivers/spi/cadence_qspi_apb.c                             | 1 +
 drivers/spi/cf_spi.c                                       | 1 +
 drivers/spi/davinci_spi.c                                  | 1 +
 drivers/spi/designware_spi.c                               | 1 +
 drivers/spi/kirkwood_spi.c                                 | 1 +
 drivers/spi/mpc8xx_spi.c                                   | 1 +
 drivers/spi/mpc8xxx_spi.c                                  | 1 +
 drivers/spi/mt7621_spi.c                                   | 1 +
 drivers/spi/mtk_snfi_spi.c                                 | 1 +
 drivers/spi/mxc_spi.c                                      | 1 +
 drivers/spi/mxs_spi.c                                      | 1 +
 drivers/spi/omap3_spi.c                                    | 1 +
 drivers/spi/pic32_spi.c                                    | 1 +
 drivers/spi/renesas_rpc_spi.c                              | 1 +
 drivers/spi/sandbox_spi.c                                  | 1 +
 drivers/spi/sh_qspi.c                                      | 1 +
 drivers/spi/spi-sifive.c                                   | 1 +
 drivers/spi/spi-sunxi.c                                    | 1 +
 drivers/spi/spi-uclass.c                                   | 1 +
 drivers/spi/spi.c                                          | 1 +
 drivers/spi/tegra114_spi.c                                 | 1 +
 drivers/spi/tegra20_sflash.c                               | 1 +
 drivers/spi/tegra20_slink.c                                | 1 +
 drivers/spi/tegra210_qspi.c                                | 1 +
 drivers/spi/ti_qspi.c                                      | 1 +
 drivers/spi/xilinx_spi.c                                   | 1 +
 drivers/spi/zynq_qspi.c                                    | 1 +
 drivers/spi/zynq_spi.c                                     | 1 +
 drivers/spi/zynqmp_gqspi.c                                 | 1 +
 drivers/spmi/spmi-msm.c                                    | 1 +
 drivers/sysreset/sysreset-uclass.c                         | 1 +
 drivers/sysreset/sysreset_microblaze.c                     | 1 +
 drivers/sysreset/sysreset_mpc83xx.c                        | 1 +
 drivers/sysreset/sysreset_socfpga_s10.c                    | 1 +
 drivers/tee/sandbox.c                                      | 1 +
 drivers/thermal/imx_scu_thermal.c                          | 1 +
 drivers/thermal/imx_thermal.c                              | 1 +
 drivers/thermal/imx_tmu.c                                  | 1 +
 drivers/tpm/cr50_i2c.c                                     | 1 +
 drivers/tpm/tpm2_tis_sandbox.c                             | 1 +
 drivers/tpm/tpm_atmel_twi.c                                | 1 +
 drivers/tpm/tpm_tis_lpc.c                                  | 1 +
 drivers/tpm/tpm_tis_sandbox.c                              | 1 +
 drivers/ufs/ufs.c                                          | 1 +
 drivers/usb/cdns3/core.c                                   | 1 +
 drivers/usb/common/fsl-dt-fixup.c                          | 1 +
 drivers/usb/eth/asix.c                                     | 1 +
 drivers/usb/eth/asix88179.c                                | 1 +
 drivers/usb/eth/lan7x.c                                    | 1 +
 drivers/usb/eth/lan7x.h                                    | 1 +
 drivers/usb/eth/r8152.c                                    | 1 +
 drivers/usb/eth/smsc95xx.c                                 | 1 +
 drivers/usb/eth/usb_ether.c                                | 1 +
 drivers/usb/gadget/at91_udc.c                              | 1 +
 drivers/usb/gadget/atmel_usba_udc.c                        | 1 +
 drivers/usb/gadget/ci_udc.c                                | 1 +
 drivers/usb/gadget/dwc2_udc_otg.c                          | 1 +
 drivers/usb/gadget/dwc2_udc_otg_phy.c                      | 1 +
 drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c                 | 1 +
 drivers/usb/gadget/ether.c                                 | 1 +
 drivers/usb/gadget/f_dfu.c                                 | 1 +
 drivers/usb/gadget/f_fastboot.c                            | 1 +
 drivers/usb/gadget/f_mass_storage.c                        | 1 +
 drivers/usb/gadget/f_rockusb.c                             | 1 +
 drivers/usb/gadget/f_sdp.c                                 | 1 +
 drivers/usb/gadget/f_thor.c                                | 1 +
 drivers/usb/gadget/fotg210.c                               | 1 +
 drivers/usb/gadget/g_dnl.c                                 | 1 +
 drivers/usb/gadget/pxa25x_udc.c                            | 1 +
 drivers/usb/gadget/udc/udc-core.c                          | 1 +
 drivers/usb/host/dwc2.c                                    | 1 +
 drivers/usb/host/ehci-faraday.c                            | 1 +
 drivers/usb/host/ehci-fsl.c                                | 1 +
 drivers/usb/host/ehci-hcd.c                                | 1 +
 drivers/usb/host/ehci-msm.c                                | 1 +
 drivers/usb/host/ehci-mx5.c                                | 1 +
 drivers/usb/host/ehci-mx6.c                                | 1 +
 drivers/usb/host/ehci-mxs.c                                | 1 +
 drivers/usb/host/ehci-omap.c                               | 1 +
 drivers/usb/host/ehci-pci.c                                | 1 +
 drivers/usb/host/ehci-rmobile.c                            | 1 +
 drivers/usb/host/ehci-spear.c                              | 1 +
 drivers/usb/host/ehci-tegra.c                              | 1 +
 drivers/usb/host/ehci-zynq.c                               | 1 +
 drivers/usb/host/ohci-hcd.c                                | 1 +
 drivers/usb/host/r8a66597-hcd.c                            | 1 +
 drivers/usb/host/sl811-hcd.c                               | 1 +
 drivers/usb/host/sl811.h                                   | 1 +
 drivers/usb/host/usb-uclass.c                              | 1 +
 drivers/usb/host/xhci-dwc3.c                               | 1 +
 drivers/usb/host/xhci-exynos5.c                            | 1 +
 drivers/usb/host/xhci-fsl.c                                | 1 +
 drivers/usb/host/xhci-mem.c                                | 1 +
 drivers/usb/host/xhci-mvebu.c                              | 1 +
 drivers/usb/host/xhci-omap.c                               | 1 +
 drivers/usb/host/xhci-ring.c                               | 1 +
 drivers/usb/host/xhci.c                                    | 1 +
 drivers/usb/musb-new/mt85xx.c                              | 1 +
 drivers/usb/musb-new/musb_uboot.c                          | 1 +
 drivers/usb/musb-new/pic32.c                               | 1 +
 drivers/usb/musb-new/sunxi.c                               | 1 +
 drivers/usb/phy/twl4030.c                                  | 1 +
 drivers/usb/ulpi/ulpi-viewport.c                           | 1 +
 drivers/usb/ulpi/ulpi.c                                    | 1 +
 drivers/video/am335x-fb.c                                  | 1 +
 drivers/video/anx9804.c                                    | 1 +
 drivers/video/ati_radeon_fb.c                              | 1 +
 drivers/video/ati_radeon_fb.h                              | 1 +
 drivers/video/atmel_hlcdfb.c                               | 1 +
 drivers/video/broadwell_igd.c                              | 1 +
 drivers/video/bus_vcxk.c                                   | 1 +
 drivers/video/cfb_console.c                                | 1 +
 drivers/video/coreboot.c                                   | 1 +
 drivers/video/da8xx-fb.c                                   | 1 +
 drivers/video/efi.c                                        | 1 +
 drivers/video/exynos/exynos_dp.c                           | 1 +
 drivers/video/exynos/exynos_dp_lowlevel.c                  | 1 +
 drivers/video/exynos/exynos_fb.c                           | 1 +
 drivers/video/exynos/exynos_mipi_dsi.c                     | 1 +
 drivers/video/exynos/exynos_mipi_dsi_lowlevel.c            | 1 +
 drivers/video/formike.c                                    | 1 +
 drivers/video/fsl_dcu_fb.c                                 | 1 +
 drivers/video/fsl_diu_fb.c                                 | 1 +
 drivers/video/hitachi_tx18d42vm_lcd.c                      | 1 +
 drivers/video/imx/ipu_common.c                             | 1 +
 drivers/video/imx/ipu_disp.c                               | 1 +
 drivers/video/imx/ipu_regs.h                               | 1 +
 drivers/video/imx/mxc_ipuv3_fb.c                           | 1 +
 drivers/video/ivybridge_igd.c                              | 1 +
 drivers/video/lg4573.c                                     | 1 +
 drivers/video/logicore_dp_tx.c                             | 1 +
 drivers/video/mali_dp.c                                    | 1 +
 drivers/video/mb862xx.c                                    | 1 +
 drivers/video/meson/meson_vclk.c                           | 1 +
 drivers/video/mx3fb.c                                      | 1 +
 drivers/video/mxsfb.c                                      | 1 +
 drivers/video/pxa_lcd.c                                    | 1 +
 drivers/video/rockchip/rk_edp.c                            | 1 +
 drivers/video/sandbox_sdl.c                                | 1 +
 drivers/video/scf0403_lcd.c                                | 1 +
 drivers/video/simplefb.c                                   | 1 +
 drivers/video/ssd2828.c                                    | 1 +
 drivers/video/sunxi/sunxi_display.c                        | 1 +
 drivers/video/sunxi/sunxi_dw_hdmi.c                        | 1 +
 drivers/video/tda19988.c                                   | 1 +
 drivers/video/tegra.c                                      | 1 +
 drivers/video/tegra124/display.c                           | 1 +
 drivers/video/tegra124/dp.c                                | 1 +
 drivers/video/tegra124/sor.c                               | 1 +
 drivers/video/video-uclass.c                               | 1 +
 drivers/video/video_bmp.c                                  | 1 +
 drivers/video/videomodes.c                                 | 1 +
 drivers/virtio/virtio_pci_legacy.c                         | 1 +
 drivers/virtio/virtio_pci_modern.c                         | 1 +
 drivers/virtio/virtio_ring.c                               | 1 +
 drivers/w1-eeprom/w1-eeprom-uclass.c                       | 1 +
 drivers/w1/w1-gpio.c                                       | 1 +
 drivers/w1/w1-uclass.c                                     | 1 +
 drivers/watchdog/at91sam9_wdt.c                            | 1 +
 drivers/watchdog/ftwdt010_wdt.c                            | 1 +
 drivers/watchdog/wdt-uclass.c                              | 1 +
 env/common.c                                               | 1 +
 env/env.c                                                  | 1 +
 env/ext4.c                                                 | 1 +
 env/fat.c                                                  | 1 +
 env/flash.c                                                | 1 +
 env/mmc.c                                                  | 1 +
 env/nand.c                                                 | 1 +
 env/onenand.c                                              | 1 +
 env/remote.c                                               | 1 +
 env/sata.c                                                 | 1 +
 env/sf.c                                                   | 1 +
 env/ubi.c                                                  | 1 +
 examples/api/demo.c                                        | 1 +
 examples/api/libgenwrap.c                                  | 1 +
 examples/standalone/atmel_df_pow2.c                        | 1 +
 examples/standalone/hello_world.c                          | 1 +
 examples/standalone/sched.c                                | 1 +
 fs/btrfs/dir-item.c                                        | 1 +
 fs/btrfs/inode.c                                           | 1 +
 fs/btrfs/root.c                                            | 1 +
 fs/btrfs/subvolume.c                                       | 1 +
 fs/btrfs/super.c                                           | 1 +
 fs/cramfs/uncompress.c                                     | 1 +
 fs/ext4/ext4_common.c                                      | 1 +
 fs/ext4/ext4_journal.c                                     | 1 +
 fs/ext4/ext4_write.c                                       | 1 +
 fs/ext4/ext4fs.c                                           | 1 +
 fs/fat/fat.c                                               | 1 +
 fs/fat/fat_write.c                                         | 1 +
 fs/fs.c                                                    | 1 +
 fs/fs_internal.c                                           | 1 +
 fs/jffs2/jffs2_1pass.c                                     | 1 +
 fs/reiserfs/reiserfs.c                                     | 1 +
 fs/sandbox/sandboxfs.c                                     | 1 +
 fs/ubifs/super.c                                           | 1 +
 fs/ubifs/ubifs.c                                           | 1 +
 fs/yaffs2/yaffs_uboot_glue.c                               | 1 +
 fs/yaffs2/yaffsfs.c                                        | 1 +
 fs/yaffs2/ydirectenv.h                                     | 1 +
 fs/zfs/zfs.c                                               | 1 +
 fs/zfs/zfs_lzjb.c                                          | 1 +
 include/bootcount.h                                        | 1 +
 include/common.h                                           | 1 -
 include/dfu.h                                              | 1 +
 include/exports.h                                          | 1 +
 include/i2c.h                                              | 1 +
 include/initcall.h                                         | 1 +
 include/spi_flash.h                                        | 1 +
 include/wait_bit.h                                         | 1 +
 lib/aes.c                                                  | 1 +
 lib/aes/aes-decrypt.c                                      | 1 +
 lib/bzip2/bzlib.c                                          | 1 +
 lib/charset.c                                              | 1 +
 lib/dhry/cmd_dhry.c                                        | 1 +
 lib/dhry/dhry_1.c                                          | 1 +
 lib/display_options.c                                      | 1 +
 lib/efi/efi_app.c                                          | 1 +
 lib/efi/efi_stub.c                                         | 1 +
 lib/efi_driver/efi_uclass.c                                | 1 +
 lib/efi_loader/efi_boottime.c                              | 1 +
 lib/efi_loader/efi_console.c                               | 1 +
 lib/efi_loader/efi_file.c                                  | 1 +
 lib/efi_loader/efi_gop.c                                   | 1 +
 lib/efi_loader/efi_image_loader.c                          | 1 +
 lib/efi_loader/efi_memory.c                                | 1 +
 lib/efi_loader/efi_net.c                                   | 1 +
 lib/efi_loader/efi_runtime.c                               | 1 +
 lib/efi_loader/efi_setup.c                                 | 1 +
 lib/efi_loader/efi_var_common.c                            | 1 +
 lib/efi_loader/efi_watchdog.c                              | 1 +
 lib/efi_selftest/efi_selftest_devicepath_util.c            | 1 +
 lib/efi_selftest/efi_selftest_fdt.c                        | 1 +
 lib/efi_selftest/efi_selftest_manageprotocols.c            | 1 +
 lib/elf.c                                                  | 1 +
 lib/fdtdec.c                                               | 1 +
 lib/fdtdec_test.c                                          | 1 +
 lib/gunzip.c                                               | 1 +
 lib/gzip.c                                                 | 1 +
 lib/hang.c                                                 | 1 +
 lib/hashtable.c                                            | 1 +
 lib/hexdump.c                                              | 1 +
 lib/image-sparse.c                                         | 1 +
 lib/libavb/avb_sysdeps_posix.c                             | 1 +
 lib/lmb.c                                                  | 1 +
 lib/optee/optee.c                                          | 1 +
 lib/panic.c                                                | 1 +
 lib/rsa/rsa-verify.c                                       | 1 +
 lib/smbios.c                                               | 1 +
 lib/tiny-printf.c                                          | 1 +
 lib/trace.c                                                | 1 +
 lib/uuid.c                                                 | 1 +
 lib/vsprintf.c                                             | 1 +
 net/arp.c                                                  | 1 +
 net/bootp.c                                                | 1 +
 net/cdp.c                                                  | 1 +
 net/dns.c                                                  | 1 +
 net/eth-uclass.c                                           | 1 +
 net/eth_legacy.c                                           | 1 +
 net/fastboot.c                                             | 1 +
 net/link_local.c                                           | 1 +
 net/net.c                                                  | 1 +
 net/nfs.c                                                  | 1 +
 net/pcap.c                                                 | 1 +
 net/rarp.c                                                 | 1 +
 net/sntp.c                                                 | 1 +
 net/tftp.c                                                 | 1 +
 post/cpu/mpc83xx/ecc.c                                     | 1 +
 post/drivers/flash.c                                       | 1 +
 post/post.c                                                | 1 +
 test/cmd_ut.c                                              | 1 +
 test/command_ut.c                                          | 1 +
 test/compression.c                                         | 1 +
 test/dm/core.c                                             | 1 +
 test/dm/osd.c                                              | 1 +
 test/dm/rtc.c                                              | 1 +
 test/dm/test-fdt.c                                         | 1 +
 test/dm/test-main.c                                        | 1 +
 test/dm/usb.c                                              | 1 +
 test/lib/test_aes.c                                        | 1 +
 test/log/log_test.c                                        | 1 +
 test/print_ut.c                                            | 1 +
 test/stdint/int-types.c                                    | 1 +
 test/time_ut.c                                             | 1 +
 test/ut.c                                                  | 1 +
 1891 files changed, 1892 insertions(+), 1 deletion(-)

diff --git a/api/api.c b/api/api.c
index 05f0203584d..d6b5b60c225 100644
--- a/api/api.c
+++ b/api/api.c
@@ -11,6 +11,7 @@
 #include <env.h>
 #include <malloc.h>
 #include <env_internal.h>
+#include <stdio.h>
 #include <time.h>
 #include <linux/delay.h>
 #include <linux/string.h>
diff --git a/api/api_net.c b/api/api_net.c
index 63ac3ee09c7..0982ec778ea 100644
--- a/api/api_net.c
+++ b/api/api_net.c
@@ -8,6 +8,7 @@
 #include <config.h>
 #include <common.h>
 #include <net.h>
+#include <stdio.h>
 #include <linux/string.h>
 #include <linux/types.h>
 #include <api_public.h>
diff --git a/api/api_storage.c b/api/api_storage.c
index a0dacad1a55..d4474d7d55c 100644
--- a/api/api_storage.c
+++ b/api/api_storage.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <api_public.h>
 #include <part.h>
+#include <stdio.h>
 
 #if defined(CONFIG_CMD_USB) && defined(CONFIG_USB_STORAGE)
 #include <usb.h>
diff --git a/arch/arc/lib/bootm.c b/arch/arc/lib/bootm.c
index 60c6fe9d55b..cf2f269882f 100644
--- a/arch/arc/lib/bootm.c
+++ b/arch/arc/lib/bootm.c
@@ -10,6 +10,7 @@
 #include <irq_func.h>
 #include <lmb.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
diff --git a/arch/arc/lib/cpu.c b/arch/arc/lib/cpu.c
index 6926c6eb44c..d3327c939ee 100644
--- a/arch/arc/lib/cpu.c
+++ b/arch/arc/lib/cpu.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <init.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <vsprintf.h>
 #include <asm/arcregs.h>
 #include <asm/cache.h>
diff --git a/arch/arc/lib/interrupts.c b/arch/arc/lib/interrupts.c
index acc6792ea7a..2b4145ad491 100644
--- a/arch/arc/lib/interrupts.c
+++ b/arch/arc/lib/interrupts.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <irq_func.h>
+#include <stdio.h>
 #include <asm/arcregs.h>
 #include <asm/ptrace.h>
 #include <asm/u-boot.h>
diff --git a/arch/arc/lib/reset.c b/arch/arc/lib/reset.c
index fbb56ec83af..4869fa936bf 100644
--- a/arch/arc/lib/reset.c
+++ b/arch/arc/lib/reset.c
@@ -6,6 +6,7 @@
 #include <command.h>
 #include <common.h>
 #include <cpu_func.h>
+#include <stdio.h>
 
 __weak void reset_cpu(ulong addr)
 {
diff --git a/arch/arm/cpu/arm1136/mx31/generic.c b/arch/arm/cpu/arm1136/mx31/generic.c
index a3d4f147962..ef738d6cd84 100644
--- a/arch/arm/cpu/arm1136/mx31/generic.c
+++ b/arch/arm/cpu/arm1136/mx31/generic.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <div64.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/clock.h>
 #include <asm/io.h>
diff --git a/arch/arm/cpu/arm1136/mx35/generic.c b/arch/arm/cpu/arm1136/mx35/generic.c
index b0dccac64b6..a001dee838d 100644
--- a/arch/arm/cpu/arm1136/mx35/generic.c
+++ b/arch/arm/cpu/arm1136/mx35/generic.c
@@ -12,6 +12,7 @@
 #include <div64.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/u-boot.h>
diff --git a/arch/arm/cpu/arm926ejs/armada100/cpu.c b/arch/arm/cpu/arm926ejs/armada100/cpu.c
index e271ae473f4..5c178ae6170 100644
--- a/arch/arm/cpu/arm926ejs/armada100/cpu.c
+++ b/arch/arm/cpu/arm926ejs/armada100/cpu.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/armada100.h>
 #include <asm/u-boot.h>
diff --git a/arch/arm/cpu/arm926ejs/armada100/dram.c b/arch/arm/cpu/arm926ejs/armada100/dram.c
index 966bdc67ea6..56bda678d67 100644
--- a/arch/arm/cpu/arm926ejs/armada100/dram.c
+++ b/arch/arm/cpu/arm926ejs/armada100/dram.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/armada100.h>
diff --git a/arch/arm/cpu/arm926ejs/mx25/generic.c b/arch/arm/cpu/arm926ejs/mx25/generic.c
index 5b745880b9c..e9ebda4317c 100644
--- a/arch/arm/cpu/arm926ejs/mx25/generic.c
+++ b/arch/arm/cpu/arm926ejs/mx25/generic.c
@@ -14,6 +14,7 @@
 #include <init.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/arch/arm/cpu/arm926ejs/mx27/generic.c b/arch/arm/cpu/arm926ejs/mx27/generic.c
index 0c804b8bad2..ec5f5e12e1e 100644
--- a/arch/arm/cpu/arm926ejs/mx27/generic.c
+++ b/arch/arm/cpu/arm926ejs/mx27/generic.c
@@ -8,6 +8,7 @@
 #include <div64.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <vsprintf.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
diff --git a/arch/arm/cpu/arm926ejs/mxs/mxs.c b/arch/arm/cpu/arm926ejs/mxs/mxs.c
index 8d5a3d75053..84d67228631 100644
--- a/arch/arm/cpu/arm926ejs/mxs/mxs.c
+++ b/arch/arm/cpu/arm926ejs/mxs/mxs.c
@@ -15,6 +15,7 @@
 #include <hang.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
diff --git a/arch/arm/cpu/arm926ejs/spear/cpu.c b/arch/arm/cpu/arm926ejs/spear/cpu.c
index e181fe65d13..1c5f3af1bda 100644
--- a/arch/arm/cpu/arm926ejs/spear/cpu.c
+++ b/arch/arm/cpu/arm926ejs/spear/cpu.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <command.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/spr_misc.h>
diff --git a/arch/arm/cpu/arm926ejs/spear/reset.c b/arch/arm/cpu/arm926ejs/spear/reset.c
index a316540d52a..7c3ba8b2dbd 100644
--- a/arch/arm/cpu/arm926ejs/spear/reset.c
+++ b/arch/arm/cpu/arm926ejs/spear/reset.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <cpu_func.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/spr_syscntl.h>
diff --git a/arch/arm/cpu/arm926ejs/spear/spl.c b/arch/arm/cpu/arm926ejs/spear/spl.c
index 2ef53110ebc..fa4beced986 100644
--- a/arch/arm/cpu/arm926ejs/spear/spl.c
+++ b/arch/arm/cpu/arm926ejs/spear/spl.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <init.h>
 #include <spl.h>
+#include <stdio.h>
 #include <version.h>
 #include <asm/io.h>
 #include <asm/ptrace.h>
diff --git a/arch/arm/cpu/arm926ejs/spear/spr_misc.c b/arch/arm/cpu/arm926ejs/spear/spr_misc.c
index 5af983cd1c7..928fb4d5106 100644
--- a/arch/arm/cpu/arm926ejs/spear/spr_misc.c
+++ b/arch/arm/cpu/arm926ejs/spear/spr_misc.c
@@ -11,6 +11,7 @@
 #include <i2c.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/mtd/st_smi.h>
diff --git a/arch/arm/cpu/armv7/bcm235xx/clk-bsc.c b/arch/arm/cpu/armv7/bcm235xx/clk-bsc.c
index 1b3f36aebe1..c8a8e358f74 100644
--- a/arch/arm/cpu/armv7/bcm235xx/clk-bsc.c
+++ b/arch/arm/cpu/armv7/bcm235xx/clk-bsc.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <asm/arch/sysmap.h>
diff --git a/arch/arm/cpu/armv7/bcm235xx/clk-core.c b/arch/arm/cpu/armv7/bcm235xx/clk-core.c
index a6bd627e20e..8c718bf5f0b 100644
--- a/arch/arm/cpu/armv7/bcm235xx/clk-core.c
+++ b/arch/arm/cpu/armv7/bcm235xx/clk-core.c
@@ -11,6 +11,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/arch/arm/cpu/armv7/bcm235xx/clk-core.h b/arch/arm/cpu/armv7/bcm235xx/clk-core.h
index ace384dea78..91d38703fa7 100644
--- a/arch/arm/cpu/armv7/bcm235xx/clk-core.h
+++ b/arch/arm/cpu/armv7/bcm235xx/clk-core.h
@@ -3,6 +3,7 @@
  * Copyright 2013 Broadcom Corporation.
  */
 
+#include <stdio.h>
 #include <linux/stddef.h>
 #include <linux/stringify.h>
 
diff --git a/arch/arm/cpu/armv7/bcm235xx/clk-eth.c b/arch/arm/cpu/armv7/bcm235xx/clk-eth.c
index 209ceca9a06..0b564fbf12b 100644
--- a/arch/arm/cpu/armv7/bcm235xx/clk-eth.c
+++ b/arch/arm/cpu/armv7/bcm235xx/clk-eth.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/arch/arm/cpu/armv7/bcm235xx/clk-sdio.c b/arch/arm/cpu/armv7/bcm235xx/clk-sdio.c
index f2ba354c24f..c21a23c2abe 100644
--- a/arch/arm/cpu/armv7/bcm235xx/clk-sdio.c
+++ b/arch/arm/cpu/armv7/bcm235xx/clk-sdio.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <asm/arch/sysmap.h>
diff --git a/arch/arm/cpu/armv7/bcm235xx/clk-usb-otg.c b/arch/arm/cpu/armv7/bcm235xx/clk-usb-otg.c
index f604aec62fa..f065560d2d0 100644
--- a/arch/arm/cpu/armv7/bcm235xx/clk-usb-otg.c
+++ b/arch/arm/cpu/armv7/bcm235xx/clk-usb-otg.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <linux/errno.h>
 #include <asm/arch/sysmap.h>
 #include "clk-core.h"
diff --git a/arch/arm/cpu/armv7/bcm281xx/clk-bsc.c b/arch/arm/cpu/armv7/bcm281xx/clk-bsc.c
index 1b3f36aebe1..c8a8e358f74 100644
--- a/arch/arm/cpu/armv7/bcm281xx/clk-bsc.c
+++ b/arch/arm/cpu/armv7/bcm281xx/clk-bsc.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <asm/arch/sysmap.h>
diff --git a/arch/arm/cpu/armv7/bcm281xx/clk-core.c b/arch/arm/cpu/armv7/bcm281xx/clk-core.c
index a70979d0933..d1828d6234a 100644
--- a/arch/arm/cpu/armv7/bcm281xx/clk-core.c
+++ b/arch/arm/cpu/armv7/bcm281xx/clk-core.c
@@ -11,6 +11,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/arch/arm/cpu/armv7/bcm281xx/clk-core.h b/arch/arm/cpu/armv7/bcm281xx/clk-core.h
index f0fbff081d0..531d9a4f3eb 100644
--- a/arch/arm/cpu/armv7/bcm281xx/clk-core.h
+++ b/arch/arm/cpu/armv7/bcm281xx/clk-core.h
@@ -3,6 +3,7 @@
  * Copyright 2013 Broadcom Corporation.
  */
 
+#include <stdio.h>
 #include <linux/stddef.h>
 #include <linux/stringify.h>
 
diff --git a/arch/arm/cpu/armv7/bcm281xx/clk-eth.c b/arch/arm/cpu/armv7/bcm281xx/clk-eth.c
index 209ceca9a06..0b564fbf12b 100644
--- a/arch/arm/cpu/armv7/bcm281xx/clk-eth.c
+++ b/arch/arm/cpu/armv7/bcm281xx/clk-eth.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/arch/arm/cpu/armv7/bcm281xx/clk-sdio.c b/arch/arm/cpu/armv7/bcm281xx/clk-sdio.c
index f2ba354c24f..c21a23c2abe 100644
--- a/arch/arm/cpu/armv7/bcm281xx/clk-sdio.c
+++ b/arch/arm/cpu/armv7/bcm281xx/clk-sdio.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <asm/arch/sysmap.h>
diff --git a/arch/arm/cpu/armv7/bcm281xx/clk-usb-otg.c b/arch/arm/cpu/armv7/bcm281xx/clk-usb-otg.c
index f604aec62fa..f065560d2d0 100644
--- a/arch/arm/cpu/armv7/bcm281xx/clk-usb-otg.c
+++ b/arch/arm/cpu/armv7/bcm281xx/clk-usb-otg.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <linux/errno.h>
 #include <asm/arch/sysmap.h>
 #include "clk-core.h"
diff --git a/arch/arm/cpu/armv7/iproc-common/armpll.c b/arch/arm/cpu/armv7/iproc-common/armpll.c
index efa3d9e5a9b..2ac598cee7b 100644
--- a/arch/arm/cpu/armv7/iproc-common/armpll.c
+++ b/arch/arm/cpu/armv7/iproc-common/armpll.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/iproc-common/armpll.h>
 #include <asm/iproc-common/sysmap.h>
diff --git a/arch/arm/cpu/armv7/ls102xa/clock.c b/arch/arm/cpu/armv7/ls102xa/clock.c
index 3b59dd9657e..b7c2ec6b5d2 100644
--- a/arch/arm/cpu/armv7/ls102xa/clock.c
+++ b/arch/arm/cpu/armv7/ls102xa/clock.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <clock_legacy.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/immap_ls102xa.h>
diff --git a/arch/arm/cpu/armv7/ls102xa/cpu.c b/arch/arm/cpu/armv7/ls102xa/cpu.c
index 61b80261f52..b7ec5ccdd26 100644
--- a/arch/arm/cpu/armv7/ls102xa/cpu.c
+++ b/arch/arm/cpu/armv7/ls102xa/cpu.c
@@ -7,6 +7,7 @@
 #include <cpu_func.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <vsprintf.h>
 #include <asm/arch/clock.h>
 #include <asm/global_data.h>
diff --git a/arch/arm/cpu/armv7/ls102xa/fdt.c b/arch/arm/cpu/armv7/ls102xa/fdt.c
index 0ab9e9092d0..ea068727f57 100644
--- a/arch/arm/cpu/armv7/ls102xa/fdt.c
+++ b/arch/arm/cpu/armv7/ls102xa/fdt.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <clock_legacy.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/libfdt.h>
diff --git a/arch/arm/cpu/armv7/ls102xa/fsl_ls1_serdes.c b/arch/arm/cpu/armv7/ls102xa/fsl_ls1_serdes.c
index caf51e17b35..2683b59a2a0 100644
--- a/arch/arm/cpu/armv7/ls102xa/fsl_ls1_serdes.c
+++ b/arch/arm/cpu/armv7/ls102xa/fsl_ls1_serdes.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/arch/fsl_serdes.h>
 #include <asm/arch/immap_ls102xa.h>
 #include <linux/errno.h>
diff --git a/arch/arm/cpu/armv7/s5p-common/cpu_info.c b/arch/arm/cpu/armv7/s5p-common/cpu_info.c
index 7382046517a..0a00762ee06 100644
--- a/arch/arm/cpu/armv7/s5p-common/cpu_info.c
+++ b/arch/arm/cpu/armv7/s5p-common/cpu_info.c
@@ -7,6 +7,7 @@
 #include <display_options.h>
 #include <fdtdec.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clk.h>
diff --git a/arch/arm/cpu/armv7/stv0991/reset.c b/arch/arm/cpu/armv7/stv0991/reset.c
index fb67de10f48..1be1dc486d4 100644
--- a/arch/arm/cpu/armv7/stv0991/reset.c
+++ b/arch/arm/cpu/armv7/stv0991/reset.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <cpu_func.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/stv0991_wdru.h>
 #include <linux/delay.h>
diff --git a/arch/arm/cpu/armv7/vf610/generic.c b/arch/arm/cpu/armv7/vf610/generic.c
index 83459204a8f..297a3d2378a 100644
--- a/arch/arm/cpu/armv7/vf610/generic.c
+++ b/arch/arm/cpu/armv7/vf610/generic.c
@@ -9,6 +9,7 @@
 #include <cpu_func.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/arch/arm/cpu/armv7/virt-v7.c b/arch/arm/cpu/armv7/virt-v7.c
index 8731af9f687..0031bf85975 100644
--- a/arch/arm/cpu/armv7/virt-v7.c
+++ b/arch/arm/cpu/armv7/virt-v7.c
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <cpu_func.h>
+#include <stdio.h>
 #include <asm/armv7.h>
 #include <asm/cache.h>
 #include <asm/gic.h>
diff --git a/arch/arm/cpu/armv7m/cache.c b/arch/arm/cpu/armv7m/cache.c
index d1aecf6a85c..f87e1d39367 100644
--- a/arch/arm/cpu/armv7m/cache.c
+++ b/arch/arm/cpu/armv7m/cache.c
@@ -8,6 +8,7 @@
 #include <cpu_func.h>
 #include <errno.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/armv7m.h>
 #include <asm/cache.h>
 #include <asm/io.h>
diff --git a/arch/arm/cpu/armv8/cache_v8.c b/arch/arm/cpu/armv8/cache_v8.c
index 0930d206ccd..ad019f4fe2e 100644
--- a/arch/arm/cpu/armv8/cache_v8.c
+++ b/arch/arm/cpu/armv8/cache_v8.c
@@ -11,6 +11,7 @@
 #include <cpu_func.h>
 #include <hang.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <asm/system.h>
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
index f19b02dc473..bf38eacb8eb 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
@@ -12,6 +12,7 @@
 #include <hang.h>
 #include <log.h>
 #include <net.h>
+#include <stdio.h>
 #include <vsprintf.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/fdt.c b/arch/arm/cpu/armv8/fsl-layerscape/fdt.c
index 0553faf90e0..09750dc2e88 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/fdt.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/fdt.c
@@ -8,6 +8,7 @@
 #include <clock_legacy.h>
 #include <efi_loader.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <asm/u-boot.h>
 #include <linux/libfdt.h>
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_serdes.c b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_serdes.c
index 4a2f22d0366..86b2d335ab0 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_serdes.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_serdes.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c
index 26c3b5b79e5..dce6cac4f7a 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <clock_legacy.h>
 #include <cpu_func.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/compiler.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 f14636a0f5d..34d5fe81d0e 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <env.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c
index 2eafcc19a00..36182fcf97a 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <clock_legacy.h>
 #include <cpu_func.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/compiler.h>
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/icid.c b/arch/arm/cpu/armv8/fsl-layerscape/icid.c
index 82c5a8b123a..84ca91a0cc8 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/icid.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/icid.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/mp.c b/arch/arm/cpu/armv8/fsl-layerscape/mp.c
index 10fc75412d3..8619f8ecb83 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/mp.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/mp.c
@@ -7,6 +7,7 @@
 #include <cpu_func.h>
 #include <image.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ppa.c b/arch/arm/cpu/armv8/fsl-layerscape/ppa.c
index f26be5a25b0..0d458d0273e 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/ppa.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/ppa.c
@@ -7,6 +7,7 @@
 #include <malloc.h>
 #include <config.h>
 #include <errno.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <asm/system.h>
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/soc.c b/arch/arm/cpu/armv8/fsl-layerscape/soc.c
index dbc6f9f14c4..4418709a459 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/soc.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/soc.c
@@ -11,6 +11,7 @@
 #include <fsl_immap.h>
 #include <fsl_ifc.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 #include <linux/sizes.h>
 #include <log.h>
diff --git a/arch/arm/cpu/armv8/s32v234/cpu.c b/arch/arm/cpu/armv8/s32v234/cpu.c
index b26298553bb..c58fb38e531 100644
--- a/arch/arm/cpu/armv8/s32v234/cpu.c
+++ b/arch/arm/cpu/armv8/s32v234/cpu.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <asm/io.h>
 #include <asm/system.h>
diff --git a/arch/arm/cpu/armv8/s32v234/generic.c b/arch/arm/cpu/armv8/s32v234/generic.c
index 5a49a8a4a0d..59900958cd2 100644
--- a/arch/arm/cpu/armv8/s32v234/generic.c
+++ b/arch/arm/cpu/armv8/s32v234/generic.c
@@ -8,6 +8,7 @@
 #include <cpu_func.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
diff --git a/arch/arm/cpu/armv8/sec_firmware.c b/arch/arm/cpu/armv8/sec_firmware.c
index 46d58d176c5..8f7eef0d4c0 100644
--- a/arch/arm/cpu/armv8/sec_firmware.c
+++ b/arch/arm/cpu/armv8/sec_firmware.c
@@ -9,6 +9,7 @@
 #include <fdt_support.h>
 #include <image.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <asm/ptrace.h>
diff --git a/arch/arm/cpu/armv8/spin_table.c b/arch/arm/cpu/armv8/spin_table.c
index 6aafb3b6ea3..f687b54d0e1 100644
--- a/arch/arm/cpu/armv8/spin_table.c
+++ b/arch/arm/cpu/armv8/spin_table.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <linux/libfdt.h>
 #include <asm/spin_table.h>
 #include <linux/string.h>
diff --git a/arch/arm/cpu/pxa/cpuinfo.c b/arch/arm/cpu/pxa/cpuinfo.c
index 0d9542f998e..582c1fcaa7a 100644
--- a/arch/arm/cpu/pxa/cpuinfo.c
+++ b/arch/arm/cpu/pxa/cpuinfo.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <errno.h>
 #include <linux/compiler.h>
diff --git a/arch/arm/include/asm/arch-mx7ulp/scg.h b/arch/arm/include/asm/arch-mx7ulp/scg.h
index 3b5b7f6803c..71e241db288 100644
--- a/arch/arm/include/asm/arch-mx7ulp/scg.h
+++ b/arch/arm/include/asm/arch-mx7ulp/scg.h
@@ -6,6 +6,8 @@
 #ifndef _ASM_ARCH_SCG_H
 #define _ASM_ARCH_SCG_H
 
+#include <stdio.h>
+
 #ifdef CONFIG_CLK_DEBUG
 #define clk_debug(fmt, args...)	printf(fmt, ##args)
 #else
diff --git a/arch/arm/lib/bdinfo.c b/arch/arm/lib/bdinfo.c
index 73b9ed0815a..3cca68e24fc 100644
--- a/arch/arm/lib/bdinfo.c
+++ b/arch/arm/lib/bdinfo.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 
diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c
index 9dbca39b52a..613e7abeaae 100644
--- a/arch/arm/lib/bootm.c
+++ b/arch/arm/lib/bootm.c
@@ -19,6 +19,7 @@
 #include <hang.h>
 #include <lmb.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <dm/root.h>
diff --git a/arch/arm/lib/cache-cp15.c b/arch/arm/lib/cache-cp15.c
index d33136a9dbc..e0e273495b3 100644
--- a/arch/arm/lib/cache-cp15.c
+++ b/arch/arm/lib/cache-cp15.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/system.h>
 #include <asm/cache.h>
diff --git a/arch/arm/lib/cache-pl310.c b/arch/arm/lib/cache-pl310.c
index bbaaaa4157a..7976d854c98 100644
--- a/arch/arm/lib/cache-pl310.c
+++ b/arch/arm/lib/cache-pl310.c
@@ -4,6 +4,7 @@
  * Texas Instruments, <www.ti.com>
  * Aneesh V <aneesh@ti.com>
  */
+#include <stdio.h>
 #include <linux/types.h>
 #include <asm/io.h>
 #include <asm/armv7.h>
diff --git a/arch/arm/lib/cache.c b/arch/arm/lib/cache.c
index b494611d6e8..4956942002d 100644
--- a/arch/arm/lib/cache.c
+++ b/arch/arm/lib/cache.c
@@ -10,6 +10,7 @@
 #include <cpu_func.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 
diff --git a/arch/arm/lib/eabi_compat.c b/arch/arm/lib/eabi_compat.c
index 35ce83a6fac..9e2912ffe39 100644
--- a/arch/arm/lib/eabi_compat.c
+++ b/arch/arm/lib/eabi_compat.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 int raise (int signum)
diff --git a/arch/arm/lib/image.c b/arch/arm/lib/image.c
index 7194bf08b44..bb251af08ad 100644
--- a/arch/arm/lib/image.c
+++ b/arch/arm/lib/image.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <image.h>
 #include <mapmem.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
diff --git a/arch/arm/lib/interrupts.c b/arch/arm/lib/interrupts.c
index 05bb1a38b35..af65144f7a7 100644
--- a/arch/arm/lib/interrupts.c
+++ b/arch/arm/lib/interrupts.c
@@ -22,6 +22,7 @@
 #include <cpu_func.h>
 #include <efi_loader.h>
 #include <irq_func.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/proc-armv/ptrace.h>
 #include <asm/ptrace.h>
diff --git a/arch/arm/lib/interrupts_64.c b/arch/arm/lib/interrupts_64.c
index 1da953af8c8..d19c2ad67c3 100644
--- a/arch/arm/lib/interrupts_64.c
+++ b/arch/arm/lib/interrupts_64.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <stdio.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 cb456f846f7..826d1fc1283 100644
--- a/arch/arm/lib/interrupts_m.c
+++ b/arch/arm/lib/interrupts_m.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <irq_func.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 
 /*
diff --git a/arch/arm/lib/psci-dt.c b/arch/arm/lib/psci-dt.c
index 6acefab42c0..5c6f7bfe4b0 100644
--- a/arch/arm/lib/psci-dt.c
+++ b/arch/arm/lib/psci-dt.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
diff --git a/arch/arm/lib/semihosting.c b/arch/arm/lib/semihosting.c
index 73c860dbb3d..d186584c379 100644
--- a/arch/arm/lib/semihosting.c
+++ b/arch/arm/lib/semihosting.c
@@ -15,6 +15,7 @@
 #include <command.h>
 #include <env.h>
 #include <log.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 #define SYSOPEN		0x01
diff --git a/arch/arm/lib/zimage.c b/arch/arm/lib/zimage.c
index 477ea94997d..b5155c2a914 100644
--- a/arch/arm/lib/zimage.c
+++ b/arch/arm/lib/zimage.c
@@ -8,6 +8,7 @@
  */
 #include <common.h>
 #include <image.h>
+#include <stdio.h>
 
 #define	LINUX_ARM_ZIMAGE_MAGIC	0x016f2818
 #define	BAREBOX_IMAGE_MAGIC	0x00786f62
diff --git a/arch/arm/mach-at91/arm920t/clock.c b/arch/arm/mach-at91/arm920t/clock.c
index 2c8fbe6d284..57cb159d1f6 100644
--- a/arch/arm/mach-at91/arm920t/clock.c
+++ b/arch/arm/mach-at91/arm920t/clock.c
@@ -8,6 +8,7 @@
  * Copyright (C) 2009 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
  */
 #include <common.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/arch/arm/mach-at91/arm926ejs/clock.c b/arch/arm/mach-at91/arm926ejs/clock.c
index 9b97987fecb..97e45fffd1d 100644
--- a/arch/arm/mach-at91/arm926ejs/clock.c
+++ b/arch/arm/mach-at91/arm926ejs/clock.c
@@ -8,6 +8,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/arch/arm/mach-at91/arm926ejs/cpu.c b/arch/arm/mach-at91/arm926ejs/cpu.c
index 8a20be467aa..9fb8b98944a 100644
--- a/arch/arm/mach-at91/arm926ejs/cpu.c
+++ b/arch/arm/mach-at91/arm926ejs/cpu.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <vsprintf.h>
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
diff --git a/arch/arm/mach-at91/arm926ejs/eflash.c b/arch/arm/mach-at91/arm926ejs/eflash.c
index ef579e6089c..ca52791d5bc 100644
--- a/arch/arm/mach-at91/arm926ejs/eflash.c
+++ b/arch/arm/mach-at91/arm926ejs/eflash.c
@@ -46,6 +46,7 @@
 #include <display_options.h>
 #include <flash.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/at91_common.h>
diff --git a/arch/arm/mach-at91/armv7/clock.c b/arch/arm/mach-at91/armv7/clock.c
index aa6bb6bf31e..7fab52d1e7e 100644
--- a/arch/arm/mach-at91/armv7/clock.c
+++ b/arch/arm/mach-at91/armv7/clock.c
@@ -10,6 +10,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/arch/arm/mach-at91/armv7/cpu.c b/arch/arm/mach-at91/armv7/cpu.c
index d04d10447c7..b40834bcbe3 100644
--- a/arch/arm/mach-at91/armv7/cpu.c
+++ b/arch/arm/mach-at91/armv7/cpu.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <init.h>
+#include <stdio.h>
 #include <vsprintf.h>
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
diff --git a/arch/arm/mach-at91/clock.c b/arch/arm/mach-at91/clock.c
index 5b8ce52f5c1..f9723bd145e 100644
--- a/arch/arm/mach-at91/clock.c
+++ b/arch/arm/mach-at91/clock.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <stdio.h>
 #include <time.h>
 #include <wdt.h>
 #include <asm/io.h>
diff --git a/arch/arm/mach-at91/phy.c b/arch/arm/mach-at91/phy.c
index b68e4bd355f..c9e2db787df 100644
--- a/arch/arm/mach-at91/phy.c
+++ b/arch/arm/mach-at91/phy.c
@@ -12,6 +12,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/hardware.h>
 #include <asm/io.h>
diff --git a/arch/arm/mach-at91/spl.c b/arch/arm/mach-at91/spl.c
index 156150c89c8..217fcfa6689 100644
--- a/arch/arm/mach-at91/spl.c
+++ b/arch/arm/mach-at91/spl.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <hang.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/at91_common.h>
 #include <asm/arch/at91_wdt.h>
diff --git a/arch/arm/mach-bcm283x/mbox.c b/arch/arm/mach-bcm283x/mbox.c
index 940699337f1..ed724497b0c 100644
--- a/arch/arm/mach-bcm283x/mbox.c
+++ b/arch/arm/mach-bcm283x/mbox.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/cache.h>
 #include <asm/io.h>
diff --git a/arch/arm/mach-bcm283x/msg.c b/arch/arm/mach-bcm283x/msg.c
index 347aece3cd8..ac43d51e64d 100644
--- a/arch/arm/mach-bcm283x/msg.c
+++ b/arch/arm/mach-bcm283x/msg.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <memalign.h>
 #include <phys2bus.h>
+#include <stdio.h>
 #include <asm/arch/mbox.h>
 #include <linux/delay.h>
 
diff --git a/arch/arm/mach-davinci/misc.c b/arch/arm/mach-davinci/misc.c
index 7324af07d6b..6ae7ab2887a 100644
--- a/arch/arm/mach-davinci/misc.c
+++ b/arch/arm/mach-davinci/misc.c
@@ -14,6 +14,7 @@
 #include <init.h>
 #include <log.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/arch/hardware.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/arch/arm/mach-davinci/spl.c b/arch/arm/mach-davinci/spl.c
index 5fea935d6e4..9e14284ab02 100644
--- a/arch/arm/mach-davinci/spl.c
+++ b/arch/arm/mach-davinci/spl.c
@@ -8,6 +8,7 @@
 #include <hang.h>
 #include <init.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 #include <asm/utils.h>
 #include <nand.h>
diff --git a/arch/arm/mach-exynos/clock.c b/arch/arm/mach-exynos/clock.c
index 6c21fd642cd..76bb97e3732 100644
--- a/arch/arm/mach-exynos/clock.c
+++ b/arch/arm/mach-exynos/clock.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
diff --git a/arch/arm/mach-imx/cache.c b/arch/arm/mach-imx/cache.c
index 4e3b49a3fdf..ce49253d0b4 100644
--- a/arch/arm/mach-imx/cache.c
+++ b/arch/arm/mach-imx/cache.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <cpu_func.h>
+#include <stdio.h>
 #include <asm/armv7.h>
 #include <asm/cache.h>
 #include <asm/pl310.h>
diff --git a/arch/arm/mach-imx/cmd_nandbcb.c b/arch/arm/mach-imx/cmd_nandbcb.c
index 21010d455ab..c2ca33888b5 100644
--- a/arch/arm/mach-imx/cmd_nandbcb.c
+++ b/arch/arm/mach-imx/cmd_nandbcb.c
@@ -16,6 +16,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <nand.h>
+#include <stdio.h>
 #include <dm/devres.h>
 #include <linux/bug.h>
 #include <linux/string.h>
diff --git a/arch/arm/mach-imx/cpu.c b/arch/arm/mach-imx/cpu.c
index 80a4ae4d92a..837bd7e3a45 100644
--- a/arch/arm/mach-imx/cpu.c
+++ b/arch/arm/mach-imx/cpu.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <asm/io.h>
diff --git a/arch/arm/mach-imx/hab.c b/arch/arm/mach-imx/hab.c
index 7510735bf46..0d2cbf98963 100644
--- a/arch/arm/mach-imx/hab.c
+++ b/arch/arm/mach-imx/hab.c
@@ -10,6 +10,7 @@
 #include <fuse.h>
 #include <mapmem.h>
 #include <image.h>
+#include <stdio.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 5e3d79b887f..5f5103a12a6 100644
--- a/arch/arm/mach-imx/i2c-mxv7.c
+++ b/arch/arm/mach-imx/i2c-mxv7.c
@@ -4,6 +4,7 @@
  */
 #include <common.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
diff --git a/arch/arm/mach-imx/imx8/ahab.c b/arch/arm/mach-imx/imx8/ahab.c
index 0df61fca476..69033420ee5 100644
--- a/arch/arm/mach-imx/imx8/ahab.c
+++ b/arch/arm/mach-imx/imx8/ahab.c
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <errno.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/sci/sci.h>
diff --git a/arch/arm/mach-imx/imx8/clock.c b/arch/arm/mach-imx/imx8/clock.c
index 9941b57b4be..9288282dfb0 100644
--- a/arch/arm/mach-imx/imx8/clock.c
+++ b/arch/arm/mach-imx/imx8/clock.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
 #include <asm/arch/clock.h>
diff --git a/arch/arm/mach-imx/imx8/cpu.c b/arch/arm/mach-imx/imx8/cpu.c
index 71686cd07ed..5869dc85c18 100644
--- a/arch/arm/mach-imx/imx8/cpu.c
+++ b/arch/arm/mach-imx/imx8/cpu.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
diff --git a/arch/arm/mach-imx/imx8/fdt.c b/arch/arm/mach-imx/imx8/fdt.c
index 6c473ddcc9c..0fd0c4bca09 100644
--- a/arch/arm/mach-imx/imx8/fdt.c
+++ b/arch/arm/mach-imx/imx8/fdt.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/arch/sci/sci.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/global_data.h>
diff --git a/arch/arm/mach-imx/imx8/image.c b/arch/arm/mach-imx/imx8/image.c
index 638aac2eafe..9b4fc6f0905 100644
--- a/arch/arm/mach-imx/imx8/image.c
+++ b/arch/arm/mach-imx/imx8/image.c
@@ -7,6 +7,7 @@
 #include <errno.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <mmc.h>
 #include <spi_flash.h>
diff --git a/arch/arm/mach-imx/imx8/iomux.c b/arch/arm/mach-imx/imx8/iomux.c
index 9c3cfbf0068..0f4f0cac107 100644
--- a/arch/arm/mach-imx/imx8/iomux.c
+++ b/arch/arm/mach-imx/imx8/iomux.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/iomux.h>
diff --git a/arch/arm/mach-imx/imx8/misc.c b/arch/arm/mach-imx/imx8/misc.c
index de19955e2f7..e83c0517fca 100644
--- a/arch/arm/mach-imx/imx8/misc.c
+++ b/arch/arm/mach-imx/imx8/misc.c
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0+
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/arch/sci/sci.h>
 #include <asm/mach-imx/sys_proto.h>
 #include <imx_sip.h>
diff --git a/arch/arm/mach-imx/imx8/parse-container.c b/arch/arm/mach-imx/imx8/parse-container.c
index ed69abc76d8..3a1c8c7a5e5 100644
--- a/arch/arm/mach-imx/imx8/parse-container.c
+++ b/arch/arm/mach-imx/imx8/parse-container.c
@@ -7,6 +7,7 @@
 #include <errno.h>
 #include <log.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/arch/image.h>
 #include <asm/arch/sci/sci.h>
 #include <linux/string.h>
diff --git a/arch/arm/mach-imx/imx8/snvs_security_sc.c b/arch/arm/mach-imx/imx8/snvs_security_sc.c
index 6f9b1c99fcd..84d400f0283 100644
--- a/arch/arm/mach-imx/imx8/snvs_security_sc.c
+++ b/arch/arm/mach-imx/imx8/snvs_security_sc.c
@@ -15,6 +15,7 @@
 #include <log.h>
 #include <stddef.h>
 #include <common.h>
+#include <stdio.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/clock_imx8mm.c b/arch/arm/mach-imx/imx8m/clock_imx8mm.c
index 7f99c5c4b91..ff3943e5106 100644
--- a/arch/arm/mach-imx/imx8m/clock_imx8mm.c
+++ b/arch/arm/mach-imx/imx8m/clock_imx8mm.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
diff --git a/arch/arm/mach-imx/imx8m/clock_imx8mq.c b/arch/arm/mach-imx/imx8m/clock_imx8mq.c
index 759ec6d114e..444e9b7feee 100644
--- a/arch/arm/mach-imx/imx8m/clock_imx8mq.c
+++ b/arch/arm/mach-imx/imx8m/clock_imx8mq.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/io.h>
diff --git a/arch/arm/mach-imx/imx8m/soc.c b/arch/arm/mach-imx/imx8m/soc.c
index 7bcf573d170..e98cff2788e 100644
--- a/arch/arm/mach-imx/imx8m/soc.c
+++ b/arch/arm/mach-imx/imx8m/soc.c
@@ -9,6 +9,7 @@
 #include <cpu_func.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.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 e1fc4b3e19a..46a4d3661d1 100644
--- a/arch/arm/mach-imx/imx_bootaux.c
+++ b/arch/arm/mach-imx/imx_bootaux.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/mach-imx/sys_proto.h>
 #include <command.h>
diff --git a/arch/arm/mach-imx/mx5/clock.c b/arch/arm/mach-imx/mx5/clock.c
index cc93716c74e..c6a14a6a7ec 100644
--- a/arch/arm/mach-imx/mx5/clock.c
+++ b/arch/arm/mach-imx/mx5/clock.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <command.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <asm/arch/imx-regs.h>
diff --git a/arch/arm/mach-imx/mx6/clock.c b/arch/arm/mach-imx/mx6/clock.c
index c40d8855125..c91259f4bec 100644
--- a/arch/arm/mach-imx/mx6/clock.c
+++ b/arch/arm/mach-imx/mx6/clock.c
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <div64.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/io.h>
 #include <linux/errno.h>
diff --git a/arch/arm/mach-imx/mx6/ddr.c b/arch/arm/mach-imx/mx6/ddr.c
index 16df71083db..fc147962939 100644
--- a/arch/arm/mach-imx/mx6/ddr.c
+++ b/arch/arm/mach-imx/mx6/ddr.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <hang.h>
 #include <log.h>
+#include <stdio.h>
 #include <linux/delay.h>
 #include <linux/types.h>
 #include <asm/arch/clock.h>
diff --git a/arch/arm/mach-imx/mx6/litesom.c b/arch/arm/mach-imx/mx6/litesom.c
index 17108a83981..5514389ca2a 100644
--- a/arch/arm/mach-imx/mx6/litesom.c
+++ b/arch/arm/mach-imx/mx6/litesom.c
@@ -5,6 +5,7 @@
  */
 
 #include <init.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/imx-regs.h>
diff --git a/arch/arm/mach-imx/mx6/module_fuse.c b/arch/arm/mach-imx/mx6/module_fuse.c
index ced49dcad33..569c8dc0b13 100644
--- a/arch/arm/mach-imx/mx6/module_fuse.c
+++ b/arch/arm/mach-imx/mx6/module_fuse.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <fdt_support.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/imx-regs.h>
diff --git a/arch/arm/mach-imx/mx6/mp.c b/arch/arm/mach-imx/mx6/mp.c
index 2fdf070a08b..fe591a8ffc3 100644
--- a/arch/arm/mach-imx/mx6/mp.c
+++ b/arch/arm/mach-imx/mx6/mp.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <cpu_func.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <asm/arch/sys_proto.h>
diff --git a/arch/arm/mach-imx/mx7/clock.c b/arch/arm/mach-imx/mx7/clock.c
index 56e0cfa9887..b2d566737a4 100644
--- a/arch/arm/mach-imx/mx7/clock.c
+++ b/arch/arm/mach-imx/mx7/clock.c
@@ -11,6 +11,7 @@
 #include <command.h>
 #include <div64.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/arch/arm/mach-imx/mx7/clock_slice.c b/arch/arm/mach-imx/mx7/clock_slice.c
index dd731d94962..ce2f59cd098 100644
--- a/arch/arm/mach-imx/mx7/clock_slice.c
+++ b/arch/arm/mach-imx/mx7/clock_slice.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <div64.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <asm/arch/imx-regs.h>
diff --git a/arch/arm/mach-imx/mx7ulp/clock.c b/arch/arm/mach-imx/mx7ulp/clock.c
index 467832074af..10390a74165 100644
--- a/arch/arm/mach-imx/mx7ulp/clock.c
+++ b/arch/arm/mach-imx/mx7ulp/clock.c
@@ -7,6 +7,7 @@
 #include <clock_legacy.h>
 #include <command.h>
 #include <div64.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <errno.h>
diff --git a/arch/arm/mach-imx/mx7ulp/pcc.c b/arch/arm/mach-imx/mx7ulp/pcc.c
index aa7ea86a443..a70131dfa3b 100644
--- a/arch/arm/mach-imx/mx7ulp/pcc.c
+++ b/arch/arm/mach-imx/mx7ulp/pcc.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <div64.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <errno.h>
 #include <asm/arch/imx-regs.h>
diff --git a/arch/arm/mach-imx/mx7ulp/scg.c b/arch/arm/mach-imx/mx7ulp/scg.c
index 4c066557c1c..6c24ec2d819 100644
--- a/arch/arm/mach-imx/mx7ulp/scg.c
+++ b/arch/arm/mach-imx/mx7ulp/scg.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <div64.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <errno.h>
 #include <asm/arch/imx-regs.h>
diff --git a/arch/arm/mach-imx/mx7ulp/soc.c b/arch/arm/mach-imx/mx7ulp/soc.c
index 07e8ff917c6..3731df69e9e 100644
--- a/arch/arm/mach-imx/mx7ulp/soc.c
+++ b/arch/arm/mach-imx/mx7ulp/soc.c
@@ -7,6 +7,7 @@
 #include <cpu_func.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
diff --git a/arch/arm/mach-imx/spl.c b/arch/arm/mach-imx/spl.c
index 1ba86223c6a..62ede7423f5 100644
--- a/arch/arm/mach-imx/spl.c
+++ b/arch/arm/mach-imx/spl.c
@@ -10,6 +10,7 @@
 #include <hang.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
diff --git a/arch/arm/mach-imx/spl_imx_romapi.c b/arch/arm/mach-imx/spl_imx_romapi.c
index dc13a397ea8..8750fbdaf4e 100644
--- a/arch/arm/mach-imx/spl_imx_romapi.c
+++ b/arch/arm/mach-imx/spl_imx_romapi.c
@@ -7,6 +7,7 @@
 #include <errno.h>
 #include <image.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/libfdt.h>
 #include <spl.h>
diff --git a/arch/arm/mach-imx/video.c b/arch/arm/mach-imx/video.c
index 4d76ecc2969..fbf2a73ea1d 100644
--- a/arch/arm/mach-imx/video.c
+++ b/arch/arm/mach-imx/video.c
@@ -2,6 +2,7 @@
 
 #include <common.h>
 #include <env.h>
+#include <stdio.h>
 #include <linux/errno.h>
 #include <asm/mach-imx/video.h>
 #include <linux/string.h>
diff --git a/arch/arm/mach-k3/am6_init.c b/arch/arm/mach-k3/am6_init.c
index 516a02e8a89..b502332d8ca 100644
--- a/arch/arm/mach-k3/am6_init.c
+++ b/arch/arm/mach-k3/am6_init.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.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 0d74dfc29d8..98d2225e913 100644
--- a/arch/arm/mach-k3/common.c
+++ b/arch/arm/mach-k3/common.c
@@ -12,6 +12,7 @@
 #include <init.h>
 #include <log.h>
 #include <spl.h>
+#include <stdio.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 f9454e3273e..622a4fb6cb5 100644
--- a/arch/arm/mach-k3/j721e_init.c
+++ b/arch/arm/mach-k3/j721e_init.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <init.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/armv7_mpu.h>
 #include <asm/arch/hardware.h>
diff --git a/arch/arm/mach-k3/security.c b/arch/arm/mach-k3/security.c
index 66f90a5a34d..484884819b4 100644
--- a/arch/arm/mach-k3/security.c
+++ b/arch/arm/mach-k3/security.c
@@ -12,6 +12,7 @@
 #include <hang.h>
 #include <image.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <linux/soc/ti/ti_sci_protocol.h>
 #include <mach/spl.h>
diff --git a/arch/arm/mach-keystone/cmd_clock.c b/arch/arm/mach-keystone/cmd_clock.c
index 15fa0ebddea..22277b5987e 100644
--- a/arch/arm/mach-keystone/cmd_clock.c
+++ b/arch/arm/mach-keystone/cmd_clock.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <stdio.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 f9d5cda827f..94e55331d5c 100644
--- a/arch/arm/mach-keystone/cmd_mon.c
+++ b/arch/arm/mach-keystone/cmd_mon.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <command.h>
 #include <image.h>
+#include <stdio.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 7dea600d509..b646599587a 100644
--- a/arch/arm/mach-keystone/ddr3.c
+++ b/arch/arm/mach-keystone/ddr3.c
@@ -8,6 +8,7 @@
 
 #include <cpu_func.h>
 #include <env.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <common.h>
 #include <asm/arch/msmc.h>
diff --git a/arch/arm/mach-keystone/ddr3_spd.c b/arch/arm/mach-keystone/ddr3_spd.c
index e84f3253b39..a7aa7f36521 100644
--- a/arch/arm/mach-keystone/ddr3_spd.c
+++ b/arch/arm/mach-keystone/ddr3_spd.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 #include <i2c.h>
diff --git a/arch/arm/mach-keystone/init.c b/arch/arm/mach-keystone/init.c
index d578b194ea8..880698c5f77 100644
--- a/arch/arm/mach-keystone/init.c
+++ b/arch/arm/mach-keystone/init.c
@@ -10,6 +10,7 @@
 #include <cpu_func.h>
 #include <init.h>
 #include <ns16550.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <asm/io.h>
 #include <asm/arch/msmc.h>
diff --git a/arch/arm/mach-keystone/keystone.c b/arch/arm/mach-keystone/keystone.c
index efaabca5a7e..2337adb6ef2 100644
--- a/arch/arm/mach-keystone/keystone.c
+++ b/arch/arm/mach-keystone/keystone.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <env.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/psc_defs.h>
 #include <asm/arch/hardware.h>
diff --git a/arch/arm/mach-keystone/mon.c b/arch/arm/mach-keystone/mon.c
index bbae14c58f1..af038dec7ae 100644
--- a/arch/arm/mach-keystone/mon.c
+++ b/arch/arm/mach-keystone/mon.c
@@ -7,6 +7,7 @@
 
 #include <hang.h>
 #include <image.h>
+#include <stdio.h>
 #include <asm/unaligned.h>
 #include <common.h>
 #include <command.h>
diff --git a/arch/arm/mach-keystone/psc.c b/arch/arm/mach-keystone/psc.c
index 145aff8ac66..6d68ecba4f8 100644
--- a/arch/arm/mach-keystone/psc.c
+++ b/arch/arm/mach-keystone/psc.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/io.h>
diff --git a/arch/arm/mach-kirkwood/cpu.c b/arch/arm/mach-kirkwood/cpu.c
index beee83b2249..087240b4d3f 100644
--- a/arch/arm/mach-kirkwood/cpu.c
+++ b/arch/arm/mach-kirkwood/cpu.c
@@ -13,6 +13,7 @@
 #include <log.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
diff --git a/arch/arm/mach-lpc32xx/cpu.c b/arch/arm/mach-lpc32xx/cpu.c
index df500620761..cdc069639d5 100644
--- a/arch/arm/mach-lpc32xx/cpu.c
+++ b/arch/arm/mach-lpc32xx/cpu.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/clk.h>
 #include <asm/arch/wdt.h>
diff --git a/arch/arm/mach-mediatek/mt7622/init.c b/arch/arm/mach-mediatek/mt7622/init.c
index 7f6ce80f37b..ff07936be34 100644
--- a/arch/arm/mach-mediatek/mt7622/init.c
+++ b/arch/arm/mach-mediatek/mt7622/init.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <fdtdec.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/armv8/mmu.h>
 #include <asm/cache.h>
 
diff --git a/arch/arm/mach-mediatek/mt7623/init.c b/arch/arm/mach-mediatek/mt7623/init.c
index 5d837e05971..7db7336494e 100644
--- a/arch/arm/mach-mediatek/mt7623/init.c
+++ b/arch/arm/mach-mediatek/mt7623/init.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/io.h>
 #include <linux/sizes.h>
diff --git a/arch/arm/mach-mediatek/mt7629/init.c b/arch/arm/mach-mediatek/mt7629/init.c
index 617a77e9800..5cee055f94c 100644
--- a/arch/arm/mach-mediatek/mt7629/init.c
+++ b/arch/arm/mach-mediatek/mt7629/init.c
@@ -11,6 +11,7 @@
 #include <init.h>
 #include <log.h>
 #include <ram.h>
+#include <stdio.h>
 #include <asm/arch/misc.h>
 #include <asm/global_data.h>
 #include <asm/sections.h>
diff --git a/arch/arm/mach-mediatek/mt8516/init.c b/arch/arm/mach-mediatek/mt8516/init.c
index 0f79bfca952..a12955a89c0 100644
--- a/arch/arm/mach-mediatek/mt8516/init.c
+++ b/arch/arm/mach-mediatek/mt8516/init.c
@@ -12,6 +12,7 @@
 #include <fdtdec.h>
 #include <init.h>
 #include <ram.h>
+#include <stdio.h>
 #include <asm/arch/misc.h>
 #include <asm/armv8/mmu.h>
 #include <asm/cache.h>
diff --git a/arch/arm/mach-mediatek/mt8518/init.c b/arch/arm/mach-mediatek/mt8518/init.c
index 27087e6eb8c..dce53612e46 100644
--- a/arch/arm/mach-mediatek/mt8518/init.c
+++ b/arch/arm/mach-mediatek/mt8518/init.c
@@ -13,6 +13,7 @@
 #include <fdtdec.h>
 #include <init.h>
 #include <ram.h>
+#include <stdio.h>
 #include <asm/arch/misc.h>
 #include <asm/armv8/mmu.h>
 #include <asm/cache.h>
diff --git a/arch/arm/mach-meson/board-axg.c b/arch/arm/mach-meson/board-axg.c
index 9ec63141ab1..7e07465d254 100644
--- a/arch/arm/mach-meson/board-axg.c
+++ b/arch/arm/mach-meson/board-axg.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/arch/boot.h>
 #include <asm/arch/eth.h>
 #include <asm/arch/axg.h>
diff --git a/arch/arm/mach-meson/board-common.c b/arch/arm/mach-meson/board-common.c
index 67d85d4e1ce..a8d0254d576 100644
--- a/arch/arm/mach-meson/board-common.c
+++ b/arch/arm/mach-meson/board-common.c
@@ -7,6 +7,7 @@
 #include <cpu_func.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/arch/boot.h>
 #include <env.h>
 #include <asm/cache.h>
diff --git a/arch/arm/mach-meson/board-g12a.c b/arch/arm/mach-meson/board-g12a.c
index bb75d4f8ad3..b698298e13e 100644
--- a/arch/arm/mach-meson/board-g12a.c
+++ b/arch/arm/mach-meson/board-g12a.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <log.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/arch/boot.h>
 #include <asm/arch/eth.h>
 #include <asm/arch/g12a.h>
diff --git a/arch/arm/mach-meson/board-gx.c b/arch/arm/mach-meson/board-gx.c
index 53756cc6875..ec2f1c07314 100644
--- a/arch/arm/mach-meson/board-gx.c
+++ b/arch/arm/mach-meson/board-gx.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/arch/boot.h>
 #include <asm/arch/eth.h>
 #include <asm/arch/gx.h>
diff --git a/arch/arm/mach-meson/board-info.c b/arch/arm/mach-meson/board-info.c
index 28385488995..fdc8df59556 100644
--- a/arch/arm/mach-meson/board-info.c
+++ b/arch/arm/mach-meson/board-info.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm.h>
diff --git a/arch/arm/mach-meson/sm.c b/arch/arm/mach-meson/sm.c
index e8036b94a0a..a2a30eb80b0 100644
--- a/arch/arm/mach-meson/sm.c
+++ b/arch/arm/mach-meson/sm.c
@@ -9,6 +9,7 @@
 #include <command.h>
 #include <env.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/arch/sm.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
diff --git a/arch/arm/mach-mvebu/armada3700/cpu.c b/arch/arm/mach-mvebu/armada3700/cpu.c
index f16addcc816..a02ab17beae 100644
--- a/arch/arm/mach-mvebu/armada3700/cpu.c
+++ b/arch/arm/mach-mvebu/armada3700/cpu.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <fdtdec.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
diff --git a/arch/arm/mach-mvebu/cpu.c b/arch/arm/mach-mvebu/cpu.c
index 19886c5f139..d529407987e 100644
--- a/arch/arm/mach-mvebu/cpu.c
+++ b/arch/arm/mach-mvebu/cpu.c
@@ -7,6 +7,7 @@
 #include <ahci.h>
 #include <cpu_func.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/arch/arm/mach-mvebu/dram.c b/arch/arm/mach-mvebu/dram.c
index 0f17c2504f8..eb84ad9333c 100644
--- a/arch/arm/mach-mvebu/dram.c
+++ b/arch/arm/mach-mvebu/dram.c
@@ -8,6 +8,7 @@
 #include <config.h>
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
diff --git a/arch/arm/mach-mvebu/mbus.c b/arch/arm/mach-mvebu/mbus.c
index f29abe59110..e754f122b1c 100644
--- a/arch/arm/mach-mvebu/mbus.c
+++ b/arch/arm/mach-mvebu/mbus.c
@@ -48,6 +48,7 @@
 
 #include <common.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <asm/io.h>
diff --git a/arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec-38x.c b/arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec-38x.c
index 12596ec2d8b..98354da9b27 100644
--- a/arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec-38x.c
+++ b/arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec-38x.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
diff --git a/arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec.c b/arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec.c
index 2454730e6d8..e4bec786429 100644
--- a/arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec.c
+++ b/arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
diff --git a/arch/arm/mach-mvebu/serdes/a38x/seq_exec.c b/arch/arm/mach-mvebu/serdes/a38x/seq_exec.c
index 2a51b7113ce..a8f491b5b41 100644
--- a/arch/arm/mach-mvebu/serdes/a38x/seq_exec.c
+++ b/arch/arm/mach-mvebu/serdes/a38x/seq_exec.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
diff --git a/arch/arm/mach-mvebu/serdes/a38x/sys_env_lib.c b/arch/arm/mach-mvebu/serdes/a38x/sys_env_lib.c
index 3c4c7e01a1c..1be86bc4ae1 100644
--- a/arch/arm/mach-mvebu/serdes/a38x/sys_env_lib.c
+++ b/arch/arm/mach-mvebu/serdes/a38x/sys_env_lib.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
diff --git a/arch/arm/mach-omap2/abb.c b/arch/arm/mach-omap2/abb.c
index 722e6db0566..c8c455fef1e 100644
--- a/arch/arm/mach-omap2/abb.c
+++ b/arch/arm/mach-omap2/abb.c
@@ -9,6 +9,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/omap_common.h>
 #include <asm/arch/clock.h>
 #include <asm/io.h>
diff --git a/arch/arm/mach-omap2/am33xx/chilisom.c b/arch/arm/mach-omap2/am33xx/chilisom.c
index 15b6b35ae7c..8ab9b49a2f7 100644
--- a/arch/arm/mach-omap2/am33xx/chilisom.c
+++ b/arch/arm/mach-omap2/am33xx/chilisom.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/clk_synthesizer.h>
 #include <asm/arch/cpu.h>
diff --git a/arch/arm/mach-omap2/am33xx/clk_synthesizer.c b/arch/arm/mach-omap2/am33xx/clk_synthesizer.c
index ff1bfaf84b6..b2493d8179b 100644
--- a/arch/arm/mach-omap2/am33xx/clk_synthesizer.c
+++ b/arch/arm/mach-omap2/am33xx/clk_synthesizer.c
@@ -9,6 +9,7 @@
 
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/arch/clk_synthesizer.h>
 #include <i2c.h>
 
diff --git a/arch/arm/mach-omap2/am33xx/clock.c b/arch/arm/mach-omap2/am33xx/clock.c
index 8819062aaad..4339817b556 100644
--- a/arch/arm/mach-omap2/am33xx/clock.c
+++ b/arch/arm/mach-omap2/am33xx/clock.c
@@ -11,6 +11,7 @@
 #include <hang.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/hardware.h>
diff --git a/arch/arm/mach-omap2/am33xx/clock_am33xx.c b/arch/arm/mach-omap2/am33xx/clock_am33xx.c
index 2427933c8ba..b5136f8f46c 100644
--- a/arch/arm/mach-omap2/am33xx/clock_am33xx.c
+++ b/arch/arm/mach-omap2/am33xx/clock_am33xx.c
@@ -8,6 +8,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/clock.h>
diff --git a/arch/arm/mach-omap2/am33xx/ddr.c b/arch/arm/mach-omap2/am33xx/ddr.c
index f8434ecf575..4caa2d62ab2 100644
--- a/arch/arm/mach-omap2/am33xx/ddr.c
+++ b/arch/arm/mach-omap2/am33xx/ddr.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/ddr_defs.h>
 #include <asm/arch/sys_proto.h>
diff --git a/arch/arm/mach-omap2/am33xx/fdt.c b/arch/arm/mach-omap2/am33xx/fdt.c
index 2b4fd731db0..e5787df566b 100644
--- a/arch/arm/mach-omap2/am33xx/fdt.c
+++ b/arch/arm/mach-omap2/am33xx/fdt.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <hang.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
diff --git a/arch/arm/mach-omap2/am33xx/sys_info.c b/arch/arm/mach-omap2/am33xx/sys_info.c
index 338f6afcae3..0809664b7ec 100644
--- a/arch/arm/mach-omap2/am33xx/sys_info.c
+++ b/arch/arm/mach-omap2/am33xx/sys_info.c
@@ -13,6 +13,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/cpu.h>
diff --git a/arch/arm/mach-omap2/clocks-common.c b/arch/arm/mach-omap2/clocks-common.c
index 757fa3801a1..a151358f6e0 100644
--- a/arch/arm/mach-omap2/clocks-common.c
+++ b/arch/arm/mach-omap2/clocks-common.c
@@ -17,6 +17,7 @@
 #include <i2c.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/omap_common.h>
 #include <asm/gpio.h>
 #include <asm/arch/clock.h>
diff --git a/arch/arm/mach-omap2/emif-common.c b/arch/arm/mach-omap2/emif-common.c
index 8346d899e47..7405d692e7b 100644
--- a/arch/arm/mach-omap2/emif-common.c
+++ b/arch/arm/mach-omap2/emif-common.c
@@ -13,6 +13,7 @@
 #include <init.h>
 #include <log.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/emif.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/sys_proto.h>
diff --git a/arch/arm/mach-omap2/fdt-common.c b/arch/arm/mach-omap2/fdt-common.c
index b122db8bf7a..e1d3a72ec6d 100644
--- a/arch/arm/mach-omap2/fdt-common.c
+++ b/arch/arm/mach-omap2/fdt-common.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
diff --git a/arch/arm/mach-omap2/hwinit-common.c b/arch/arm/mach-omap2/hwinit-common.c
index b6be35b0647..c7e912c2da0 100644
--- a/arch/arm/mach-omap2/hwinit-common.c
+++ b/arch/arm/mach-omap2/hwinit-common.c
@@ -15,6 +15,7 @@
 #include <fdtdec.h>
 #include <init.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
diff --git a/arch/arm/mach-omap2/omap3/am35x_musb.c b/arch/arm/mach-omap2/omap3/am35x_musb.c
index ada70743a33..23b55d8d705 100644
--- a/arch/arm/mach-omap2/omap3/am35x_musb.c
+++ b/arch/arm/mach-omap2/omap3/am35x_musb.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/io.h>
 #include <asm/arch/am35x_def.h>
diff --git a/arch/arm/mach-omap2/omap3/board.c b/arch/arm/mach-omap2/omap3/board.c
index 0603110ef98..272a4c9ed95 100644
--- a/arch/arm/mach-omap2/omap3/board.c
+++ b/arch/arm/mach-omap2/omap3/board.c
@@ -20,6 +20,7 @@
 #include <dm.h>
 #include <init.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/mem.h>
diff --git a/arch/arm/mach-omap2/omap3/sys_info.c b/arch/arm/mach-omap2/omap3/sys_info.c
index ac72633c20f..5ed2c6bdeee 100644
--- a/arch/arm/mach-omap2/omap3/sys_info.c
+++ b/arch/arm/mach-omap2/omap3/sys_info.c
@@ -12,6 +12,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/mem.h>	/* get mem tables */
 #include <asm/arch/sys_proto.h>
diff --git a/arch/arm/mach-omap2/omap4/hw_data.c b/arch/arm/mach-omap2/omap4/hw_data.c
index d587a4d4def..5f15e086c64 100644
--- a/arch/arm/mach-omap2/omap4/hw_data.c
+++ b/arch/arm/mach-omap2/omap4/hw_data.c
@@ -9,6 +9,7 @@
  * Sricharan R <r.sricharan@ti.com>
  */
 #include <common.h>
+#include <stdio.h>
 #include <asm/arch/omap.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/omap_common.h>
diff --git a/arch/arm/mach-omap2/omap5/dra7xx_iodelay.c b/arch/arm/mach-omap2/omap5/dra7xx_iodelay.c
index 8569eff31ab..c5d51aabfc9 100644
--- a/arch/arm/mach-omap2/omap5/dra7xx_iodelay.c
+++ b/arch/arm/mach-omap2/omap5/dra7xx_iodelay.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <hang.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/utils.h>
 #include <asm/arch/dra7xx_iodelay.h>
 #include <asm/arch/omap.h>
diff --git a/arch/arm/mach-omap2/omap5/fdt.c b/arch/arm/mach-omap2/omap5/fdt.c
index bf4f015cf52..d6259434a23 100644
--- a/arch/arm/mach-omap2/omap5/fdt.c
+++ b/arch/arm/mach-omap2/omap5/fdt.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <hang.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
diff --git a/arch/arm/mach-omap2/omap5/hw_data.c b/arch/arm/mach-omap2/omap5/hw_data.c
index fa4e27063c5..d9c447c0e8d 100644
--- a/arch/arm/mach-omap2/omap5/hw_data.c
+++ b/arch/arm/mach-omap2/omap5/hw_data.c
@@ -10,6 +10,7 @@
  */
 #include <common.h>
 #include <palmas.h>
+#include <stdio.h>
 #include <asm/arch/omap.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/omap_common.h>
diff --git a/arch/arm/mach-omap2/omap5/sdram.c b/arch/arm/mach-omap2/omap5/sdram.c
index 786da45fac8..a35218ae600 100644
--- a/arch/arm/mach-omap2/omap5/sdram.c
+++ b/arch/arm/mach-omap2/omap5/sdram.c
@@ -11,6 +11,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/emif.h>
 #include <asm/arch/sys_proto.h>
 
diff --git a/arch/arm/mach-omap2/pipe3-phy.c b/arch/arm/mach-omap2/pipe3-phy.c
index 35ec81d3146..fb64961db4b 100644
--- a/arch/arm/mach-omap2/pipe3-phy.c
+++ b/arch/arm/mach-omap2/pipe3-phy.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <sata.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/io.h>
diff --git a/arch/arm/mach-omap2/sec-common.c b/arch/arm/mach-omap2/sec-common.c
index 4fca91ffbd0..03375321a47 100644
--- a/arch/arm/mach-omap2/sec-common.c
+++ b/arch/arm/mach-omap2/sec-common.c
@@ -19,6 +19,7 @@
 #include <init.h>
 #include <log.h>
 #include <stdarg.h>
+#include <stdio.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 095b5d3c36f..2e10ab983eb 100644
--- a/arch/arm/mach-omap2/utils.c
+++ b/arch/arm/mach-omap2/utils.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <env.h>
 #include <part.h>
+#include <stdio.h>
 #include <asm/setup.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/omap_common.h>
diff --git a/arch/arm/mach-omap2/vc.c b/arch/arm/mach-omap2/vc.c
index b7f79800de5..5888bc86752 100644
--- a/arch/arm/mach-omap2/vc.c
+++ b/arch/arm/mach-omap2/vc.c
@@ -15,6 +15,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/omap_common.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/clock.h>
diff --git a/arch/arm/mach-orion5x/cpu.c b/arch/arm/mach-orion5x/cpu.c
index aef39986006..f2c925b2d11 100644
--- a/arch/arm/mach-orion5x/cpu.c
+++ b/arch/arm/mach-orion5x/cpu.c
@@ -13,6 +13,7 @@
 #include <init.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <asm/io.h>
 #include <asm/u-boot.h>
diff --git a/arch/arm/mach-owl/soc.c b/arch/arm/mach-owl/soc.c
index 37c6683959d..34b05223c0c 100644
--- a/arch/arm/mach-owl/soc.c
+++ b/arch/arm/mach-owl/soc.c
@@ -7,6 +7,7 @@
 
 #include <cpu_func.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
diff --git a/arch/arm/mach-rmobile/board.c b/arch/arm/mach-rmobile/board.c
index a10371f74e0..b10ac4a630f 100644
--- a/arch/arm/mach-rmobile/board.c
+++ b/arch/arm/mach-rmobile/board.c
@@ -5,6 +5,7 @@
  */
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/io.h>
 
 #ifdef CONFIG_ARCH_RMOBILE_BOARD_STRING
diff --git a/arch/arm/mach-rmobile/cpu_info.c b/arch/arm/mach-rmobile/cpu_info.c
index 88de2781626..4088f33156f 100644
--- a/arch/arm/mach-rmobile/cpu_info.c
+++ b/arch/arm/mach-rmobile/cpu_info.c
@@ -5,6 +5,7 @@
  */
 #include <common.h>
 #include <cpu_func.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <init.h>
 #include <asm/io.h>
diff --git a/arch/arm/mach-rockchip/board.c b/arch/arm/mach-rockchip/board.c
index 5a02f6c3f55..76ad4721261 100644
--- a/arch/arm/mach-rockchip/board.c
+++ b/arch/arm/mach-rockchip/board.c
@@ -9,6 +9,7 @@
 #include <init.h>
 #include <log.h>
 #include <ram.h>
+#include <stdio.h>
 #include <syscon.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
diff --git a/arch/arm/mach-rockchip/boot_mode.c b/arch/arm/mach-rockchip/boot_mode.c
index 10d8a1ac5e9..fefffc71ffa 100644
--- a/arch/arm/mach-rockchip/boot_mode.c
+++ b/arch/arm/mach-rockchip/boot_mode.c
@@ -8,6 +8,7 @@
 #include <command.h>
 #include <env.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch-rockchip/boot_mode.h>
 #include <dm/device.h>
diff --git a/arch/arm/mach-rockchip/bootrom.c b/arch/arm/mach-rockchip/bootrom.c
index b36e559e871..71ac29ee435 100644
--- a/arch/arm/mach-rockchip/bootrom.c
+++ b/arch/arm/mach-rockchip/bootrom.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <hang.h>
+#include <stdio.h>
 #include <asm/arch-rockchip/bootrom.h>
 #include <asm/arch-rockchip/boot_mode.h>
 #include <asm/cache.h>
diff --git a/arch/arm/mach-rockchip/cpu-info.c b/arch/arm/mach-rockchip/cpu-info.c
index d0f030109f4..8bde5bdd298 100644
--- a/arch/arm/mach-rockchip/cpu-info.c
+++ b/arch/arm/mach-rockchip/cpu-info.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <env.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch-rockchip/clock.h>
 #include <asm/arch-rockchip/cru.h>
diff --git a/arch/arm/mach-rockchip/misc.c b/arch/arm/mach-rockchip/misc.c
index 3cbb1794254..ce75e7c1f2c 100644
--- a/arch/arm/mach-rockchip/misc.c
+++ b/arch/arm/mach-rockchip/misc.c
@@ -14,6 +14,7 @@
 #include <dm.h>
 #include <hash.h>
 #include <log.h>
+#include <stdio.h>
 #include <dm/uclass-internal.h>
 #include <misc.h>
 #include <linux/string.h>
diff --git a/arch/arm/mach-rockchip/rk3288/rk3288.c b/arch/arm/mach-rockchip/rk3288/rk3288.c
index d54eedb6a58..97900fb3a31 100644
--- a/arch/arm/mach-rockchip/rk3288/rk3288.c
+++ b/arch/arm/mach-rockchip/rk3288/rk3288.c
@@ -9,6 +9,7 @@
 #include <clk.h>
 #include <init.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/armv7.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/arch/arm/mach-rockchip/rk3308/rk3308.c b/arch/arm/mach-rockchip/rk3308/rk3308.c
index 5d5c44b8ea5..c50da1365d5 100644
--- a/arch/arm/mach-rockchip/rk3308/rk3308.c
+++ b/arch/arm/mach-rockchip/rk3308/rk3308.c
@@ -5,6 +5,7 @@
 #include <common.h>
 #include <init.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/grf_rk3308.h>
diff --git a/arch/arm/mach-rockchip/spl.c b/arch/arm/mach-rockchip/spl.c
index 6c8ab3192b3..1bf85c2b58a 100644
--- a/arch/arm/mach-rockchip/spl.c
+++ b/arch/arm/mach-rockchip/spl.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <ram.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/arch-rockchip/bootrom.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/arch/arm/mach-rockchip/tpl.c b/arch/arm/mach-rockchip/tpl.c
index cc908e1b0e8..df052b82f2f 100644
--- a/arch/arm/mach-rockchip/tpl.c
+++ b/arch/arm/mach-rockchip/tpl.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <ram.h>
 #include <spl.h>
+#include <stdio.h>
 #include <version.h>
 #include <asm/io.h>
 #include <asm/arch-rockchip/bootrom.h>
diff --git a/arch/arm/mach-s5pc1xx/clock.c b/arch/arm/mach-s5pc1xx/clock.c
index 555228a5208..e8809aa8ce2 100644
--- a/arch/arm/mach-s5pc1xx/clock.c
+++ b/arch/arm/mach-s5pc1xx/clock.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/clk.h>
diff --git a/arch/arm/mach-snapdragon/dram.c b/arch/arm/mach-snapdragon/dram.c
index 2a161be137c..c3e61007417 100644
--- a/arch/arm/mach-snapdragon/dram.c
+++ b/arch/arm/mach-snapdragon/dram.c
@@ -12,6 +12,7 @@
 #include <part.h>
 #include <smem.h>
 #include <fdt_support.h>
+#include <stdio.h>
 #include <asm/arch/dram.h>
 
 #define SMEM_USABLE_RAM_PARTITION_TABLE 402
diff --git a/arch/arm/mach-socfpga/board.c b/arch/arm/mach-socfpga/board.c
index 0e5d68ede98..4e9b57ba2ed 100644
--- a/arch/arm/mach-socfpga/board.c
+++ b/arch/arm/mach-socfpga/board.c
@@ -9,6 +9,7 @@
 #include <errno.h>
 #include <fdtdec.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/arch/reset_manager.h>
 #include <asm/arch/clock_manager.h>
 #include <asm/arch/misc.h>
diff --git a/arch/arm/mach-socfpga/clock_manager_agilex.c b/arch/arm/mach-socfpga/clock_manager_agilex.c
index 4bf01f3c8ae..0582b0b0857 100644
--- a/arch/arm/mach-socfpga/clock_manager_agilex.c
+++ b/arch/arm/mach-socfpga/clock_manager_agilex.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/arch/clock_manager.h>
 #include <asm/arch/system_manager.h>
 #include <asm/global_data.h>
diff --git a/arch/arm/mach-socfpga/clock_manager_arria10.c b/arch/arm/mach-socfpga/clock_manager_arria10.c
index 9f46df6b2f9..9379005444d 100644
--- a/arch/arm/mach-socfpga/clock_manager_arria10.c
+++ b/arch/arm/mach-socfpga/clock_manager_arria10.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <fdtdec.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <dm.h>
 #include <clk.h>
diff --git a/arch/arm/mach-socfpga/clock_manager_gen5.c b/arch/arm/mach-socfpga/clock_manager_gen5.c
index 8fa2760798b..85a3d1926c1 100644
--- a/arch/arm/mach-socfpga/clock_manager_gen5.c
+++ b/arch/arm/mach-socfpga/clock_manager_gen5.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/io.h>
 #include <dm.h>
diff --git a/arch/arm/mach-socfpga/clock_manager_s10.c b/arch/arm/mach-socfpga/clock_manager_s10.c
index 642dcbb0ac0..6355a312833 100644
--- a/arch/arm/mach-socfpga/clock_manager_s10.c
+++ b/arch/arm/mach-socfpga/clock_manager_s10.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock_manager.h>
diff --git a/arch/arm/mach-socfpga/mailbox_s10.c b/arch/arm/mach-socfpga/mailbox_s10.c
index 82dfcd124ca..58d94694b7e 100644
--- a/arch/arm/mach-socfpga/mailbox_s10.c
+++ b/arch/arm/mach-socfpga/mailbox_s10.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <hang.h>
+#include <stdio.h>
 #include <wait_bit.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/arch/arm/mach-socfpga/misc_arria10.c b/arch/arm/mach-socfpga/misc_arria10.c
index 20394a5f6b3..980f0d97e88 100644
--- a/arch/arm/mach-socfpga/misc_arria10.c
+++ b/arch/arm/mach-socfpga/misc_arria10.c
@@ -11,6 +11,7 @@
 #include <miiphy.h>
 #include <netdev.h>
 #include <ns16550.h>
+#include <stdio.h>
 #include <watchdog.h>
 #include <asm/arch/misc.h>
 #include <asm/arch/pinmux.h>
diff --git a/arch/arm/mach-socfpga/misc_gen5.c b/arch/arm/mach-socfpga/misc_gen5.c
index fefb79a8486..9672496ad46 100644
--- a/arch/arm/mach-socfpga/misc_gen5.c
+++ b/arch/arm/mach-socfpga/misc_gen5.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <env.h>
diff --git a/arch/arm/mach-socfpga/misc_s10.c b/arch/arm/mach-socfpga/misc_s10.c
index 461f0d189b1..9a522fb8961 100644
--- a/arch/arm/mach-socfpga/misc_s10.c
+++ b/arch/arm/mach-socfpga/misc_s10.c
@@ -13,6 +13,7 @@
 #include <log.h>
 #include <miiphy.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/reset_manager.h>
diff --git a/arch/arm/mach-socfpga/reset_manager_gen5.c b/arch/arm/mach-socfpga/reset_manager_gen5.c
index a65860ef021..090567e9d8a 100644
--- a/arch/arm/mach-socfpga/reset_manager_gen5.c
+++ b/arch/arm/mach-socfpga/reset_manager_gen5.c
@@ -5,6 +5,7 @@
 
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/fpga_manager.h>
 #include <asm/arch/reset_manager.h>
diff --git a/arch/arm/mach-socfpga/spl_a10.c b/arch/arm/mach-socfpga/spl_a10.c
index 92231b5ba3c..daf75addde7 100644
--- a/arch/arm/mach-socfpga/spl_a10.c
+++ b/arch/arm/mach-socfpga/spl_a10.c
@@ -7,6 +7,7 @@
 #include <cpu_func.h>
 #include <hang.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/pl310.h>
diff --git a/arch/arm/mach-socfpga/spl_gen5.c b/arch/arm/mach-socfpga/spl_gen5.c
index 7c716117685..2cffc2ef778 100644
--- a/arch/arm/mach-socfpga/spl_gen5.c
+++ b/arch/arm/mach-socfpga/spl_gen5.c
@@ -7,6 +7,7 @@
 #include <hang.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/u-boot.h>
diff --git a/arch/arm/mach-stm32mp/cmd_stm32key.c b/arch/arm/mach-stm32mp/cmd_stm32key.c
index ad857e95c46..d12e24f0fef 100644
--- a/arch/arm/mach-stm32mp/cmd_stm32key.c
+++ b/arch/arm/mach-stm32mp/cmd_stm32key.c
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <console.h>
 #include <misc.h>
+#include <stdio.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 68cd9d1547d..d73a4cf4e99 100644
--- a/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c
+++ b/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <dfu.h>
 #include <image.h>
+#include <stdio.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 54ea1606515..0bac482c9ac 100644
--- a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c
+++ b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c
@@ -10,6 +10,7 @@
 #include <misc.h>
 #include <mmc.h>
 #include <part.h>
+#include <stdio.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_serial.c b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_serial.c
index d48f0378a55..44bcfe8bdd2 100644
--- a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_serial.c
+++ b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_serial.c
@@ -8,6 +8,7 @@
 #include <dfu.h>
 #include <malloc.h>
 #include <serial.h>
+#include <stdio.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 33bf7a44b38..bcc9239ba92 100644
--- a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_usb.c
+++ b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_usb.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <dfu.h>
 #include <g_dnl.h>
+#include <stdio.h>
 #include <usb.h>
 #include <asm/arch/stm32prog.h>
 #include <asm/arch/sys_proto.h>
diff --git a/arch/arm/mach-stm32mp/cpu.c b/arch/arm/mach-stm32mp/cpu.c
index 9c49e8fe684..6ca75e24581 100644
--- a/arch/arm/mach-stm32mp/cpu.c
+++ b/arch/arm/mach-stm32mp/cpu.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <misc.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/bsec.h>
diff --git a/arch/arm/mach-stm32mp/fdt.c b/arch/arm/mach-stm32mp/fdt.c
index ded804403e3..1bfa19207d1 100644
--- a/arch/arm/mach-stm32mp/fdt.c
+++ b/arch/arm/mach-stm32mp/fdt.c
@@ -7,6 +7,7 @@
 #include <fdtdec.h>
 #include <fdt_support.h>
 #include <log.h>
+#include <stdio.h>
 #include <tee.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/u-boot.h>
diff --git a/arch/arm/mach-stm32mp/spl.c b/arch/arm/mach-stm32mp/spl.c
index 701588df56d..c23195510ad 100644
--- a/arch/arm/mach-stm32mp/spl.c
+++ b/arch/arm/mach-stm32mp/spl.c
@@ -10,6 +10,7 @@
 #include <init.h>
 #include <log.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/arch/arm/mach-sunxi/clock_sun4i.c b/arch/arm/mach-sunxi/clock_sun4i.c
index 57ee018eaa2..bd9f476543d 100644
--- a/arch/arm/mach-sunxi/clock_sun4i.c
+++ b/arch/arm/mach-sunxi/clock_sun4i.c
@@ -10,6 +10,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/gpio.h>
diff --git a/arch/arm/mach-sunxi/cpu_info.c b/arch/arm/mach-sunxi/cpu_info.c
index 875e5a1a8a8..5198fb555a9 100644
--- a/arch/arm/mach-sunxi/cpu_info.c
+++ b/arch/arm/mach-sunxi/cpu_info.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/clock.h>
diff --git a/arch/arm/mach-sunxi/dram_sun9i.c b/arch/arm/mach-sunxi/dram_sun9i.c
index 14be212e891..e2ab5d2fafb 100644
--- a/arch/arm/mach-sunxi/dram_sun9i.c
+++ b/arch/arm/mach-sunxi/dram_sun9i.c
@@ -16,6 +16,7 @@
 #include <init.h>
 #include <log.h>
 #include <ram.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/dram.h>
diff --git a/arch/arm/mach-tegra/ap.c b/arch/arm/mach-tegra/ap.c
index cfb6e899209..f8a1b36ed93 100644
--- a/arch/arm/mach-tegra/ap.c
+++ b/arch/arm/mach-tegra/ap.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 #include <linux/bug.h>
 #include <asm/io.h>
diff --git a/arch/arm/mach-tegra/board2.c b/arch/arm/mach-tegra/board2.c
index 513153cbbb6..819dabd90ea 100644
--- a/arch/arm/mach-tegra/board2.c
+++ b/arch/arm/mach-tegra/board2.c
@@ -11,6 +11,7 @@
 #include <init.h>
 #include <log.h>
 #include <ns16550.h>
+#include <stdio.h>
 #include <usb.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/arch/arm/mach-tegra/cboot.c b/arch/arm/mach-tegra/cboot.c
index 33b40f8f7c8..4fc9a6706a4 100644
--- a/arch/arm/mach-tegra/cboot.c
+++ b/arch/arm/mach-tegra/cboot.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <net.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <asm/global_data.h>
diff --git a/arch/arm/mach-tegra/clock.c b/arch/arm/mach-tegra/clock.c
index 18c19dbf606..6b587209c1c 100644
--- a/arch/arm/mach-tegra/clock.c
+++ b/arch/arm/mach-tegra/clock.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
diff --git a/arch/arm/mach-tegra/cmd_enterrcm.c b/arch/arm/mach-tegra/cmd_enterrcm.c
index 25df31a3b85..32091e04b91 100644
--- a/arch/arm/mach-tegra/cmd_enterrcm.c
+++ b/arch/arm/mach-tegra/cmd_enterrcm.c
@@ -28,6 +28,7 @@
 #include <command.h>
 #include <cpu_func.h>
 #include <irq_func.h>
+#include <stdio.h>
 #include <asm/arch/tegra.h>
 #include <asm/arch-tegra/pmc.h>
 #include <linux/delay.h>
diff --git a/arch/arm/mach-tegra/cpu.c b/arch/arm/mach-tegra/cpu.c
index 65b15b79fe9..216e307ccb2 100644
--- a/arch/arm/mach-tegra/cpu.c
+++ b/arch/arm/mach-tegra/cpu.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/gp_padctrl.h>
diff --git a/arch/arm/mach-tegra/pinmux-common.c b/arch/arm/mach-tegra/pinmux-common.c
index 16b03bfe7b0..64c397fa497 100644
--- a/arch/arm/mach-tegra/pinmux-common.c
+++ b/arch/arm/mach-tegra/pinmux-common.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/pinmux.h>
 
diff --git a/arch/arm/mach-tegra/pmc.c b/arch/arm/mach-tegra/pmc.c
index 93db63e104a..0d4063ad1a2 100644
--- a/arch/arm/mach-tegra/pmc.c
+++ b/arch/arm/mach-tegra/pmc.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 
 #include <linux/arm-smccc.h>
diff --git a/arch/arm/mach-tegra/sys_info.c b/arch/arm/mach-tegra/sys_info.c
index 5ad586ac17f..956a2e1730f 100644
--- a/arch/arm/mach-tegra/sys_info.c
+++ b/arch/arm/mach-tegra/sys_info.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <linux/ctype.h>
 #if defined(CONFIG_TEGRA124) || defined(CONFIG_TEGRA30)
 #include <asm/arch-tegra/pmc.h>
diff --git a/arch/arm/mach-tegra/tegra114/clock.c b/arch/arm/mach-tegra/tegra114/clock.c
index 167589d1bb7..53d958e82dd 100644
--- a/arch/arm/mach-tegra/tegra114/clock.c
+++ b/arch/arm/mach-tegra/tegra114/clock.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/sysctr.h>
diff --git a/arch/arm/mach-tegra/tegra124/clock.c b/arch/arm/mach-tegra/tegra124/clock.c
index 79e67f5194e..8dfdd2bc8ad 100644
--- a/arch/arm/mach-tegra/tegra124/clock.c
+++ b/arch/arm/mach-tegra/tegra124/clock.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/sysctr.h>
diff --git a/arch/arm/mach-tegra/tegra20/clock.c b/arch/arm/mach-tegra/tegra20/clock.c
index b1e2c87e629..fc197a050c5 100644
--- a/arch/arm/mach-tegra/tegra20/clock.c
+++ b/arch/arm/mach-tegra/tegra20/clock.c
@@ -11,6 +11,7 @@
 #include <errno.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/tegra.h>
diff --git a/arch/arm/mach-tegra/tegra20/warmboot.c b/arch/arm/mach-tegra/tegra20/warmboot.c
index b36b2f652ba..215cf5ae561 100644
--- a/arch/arm/mach-tegra/tegra20/warmboot.c
+++ b/arch/arm/mach-tegra/tegra20/warmboot.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/errno.h>
diff --git a/arch/arm/mach-tegra/tegra210/clock.c b/arch/arm/mach-tegra/tegra210/clock.c
index 711d02c036f..7f8c3c3a7c7 100644
--- a/arch/arm/mach-tegra/tegra210/clock.c
+++ b/arch/arm/mach-tegra/tegra210/clock.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/cache.h>
 #include <asm/io.h>
diff --git a/arch/arm/mach-tegra/tegra30/clock.c b/arch/arm/mach-tegra/tegra30/clock.c
index d516ac5f4cb..38b53cbbe48 100644
--- a/arch/arm/mach-tegra/tegra30/clock.c
+++ b/arch/arm/mach-tegra/tegra30/clock.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/tegra.h>
diff --git a/arch/arm/mach-u8500/cpuinfo.c b/arch/arm/mach-u8500/cpuinfo.c
index ab05b8a51b2..bc3fd036035 100644
--- a/arch/arm/mach-u8500/cpuinfo.c
+++ b/arch/arm/mach-u8500/cpuinfo.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/io.h>
 
 #define U8500_BOOTROM_BASE	0x90000000
diff --git a/arch/arm/mach-uniphier/micro-support-card.c b/arch/arm/mach-uniphier/micro-support-card.c
index dbd156ffcec..f3abb855412 100644
--- a/arch/arm/mach-uniphier/micro-support-card.c
+++ b/arch/arm/mach-uniphier/micro-support-card.c
@@ -7,6 +7,7 @@
 
 #include <dm.h>
 #include <fdt_support.h>
+#include <stdio.h>
 #include <linux/ctype.h>
 #include <linux/delay.h>
 #include <linux/io.h>
diff --git a/arch/arm/mach-versal/cpu.c b/arch/arm/mach-versal/cpu.c
index c8a8415d5eb..67678600816 100644
--- a/arch/arm/mach-versal/cpu.c
+++ b/arch/arm/mach-versal/cpu.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/armv8/mmu.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
diff --git a/arch/arm/mach-versal/mp.c b/arch/arm/mach-versal/mp.c
index 540c010f52c..df196460dd5 100644
--- a/arch/arm/mach-versal/mp.c
+++ b/arch/arm/mach-versal/mp.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
diff --git a/arch/arm/mach-zynq/clk.c b/arch/arm/mach-zynq/clk.c
index 0d652db49ec..c22f13c2402 100644
--- a/arch/arm/mach-zynq/clk.c
+++ b/arch/arm/mach-zynq/clk.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <init.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/arch/clk.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
diff --git a/arch/arm/mach-zynq/cpu.c b/arch/arm/mach-zynq/cpu.c
index cdd4a5b8c7a..e9082217d55 100644
--- a/arch/arm/mach-zynq/cpu.c
+++ b/arch/arm/mach-zynq/cpu.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <init.h>
+#include <stdio.h>
 #include <zynqpl.h>
 #include <asm/cache.h>
 #include <asm/io.h>
diff --git a/arch/arm/mach-zynq/ddrc.c b/arch/arm/mach-zynq/ddrc.c
index 65c255da209..f601c927f1a 100644
--- a/arch/arm/mach-zynq/ddrc.c
+++ b/arch/arm/mach-zynq/ddrc.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/hardware.h>
diff --git a/arch/arm/mach-zynq/spl.c b/arch/arm/mach-zynq/spl.c
index 311c3dfe443..9c3ec9a0c3f 100644
--- a/arch/arm/mach-zynq/spl.c
+++ b/arch/arm/mach-zynq/spl.c
@@ -9,6 +9,7 @@
 #include <init.h>
 #include <log.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 #include <generated/dt.h>
 #include <linux/string.h>
diff --git a/arch/arm/mach-zynqmp/cpu.c b/arch/arm/mach-zynqmp/cpu.c
index 443f6afbee1..341b5f1af46 100644
--- a/arch/arm/mach-zynqmp/cpu.c
+++ b/arch/arm/mach-zynqmp/cpu.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/sys_proto.h>
diff --git a/arch/arm/mach-zynqmp/mp.c b/arch/arm/mach-zynqmp/mp.c
index b699f36f1d3..b2fcae619dc 100644
--- a/arch/arm/mach-zynqmp/mp.c
+++ b/arch/arm/mach-zynqmp/mp.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/io.h>
diff --git a/arch/arm/mach-zynqmp/spl.c b/arch/arm/mach-zynqmp/spl.c
index 14253a1c675..e8c2ae57774 100644
--- a/arch/arm/mach-zynqmp/spl.c
+++ b/arch/arm/mach-zynqmp/spl.c
@@ -10,6 +10,7 @@
 #include <init.h>
 #include <log.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 
diff --git a/arch/m68k/cpu/mcf5227x/cpu.c b/arch/m68k/cpu/mcf5227x/cpu.c
index a7adf64f0de..e4c7041c421 100644
--- a/arch/m68k/cpu/mcf5227x/cpu.c
+++ b/arch/m68k/cpu/mcf5227x/cpu.c
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <vsprintf.h>
 #include <watchdog.h>
 #include <command.h>
diff --git a/arch/m68k/cpu/mcf523x/cpu.c b/arch/m68k/cpu/mcf523x/cpu.c
index c091d39ef67..bf3acb8f893 100644
--- a/arch/m68k/cpu/mcf523x/cpu.c
+++ b/arch/m68k/cpu/mcf523x/cpu.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <vsprintf.h>
 #include <watchdog.h>
 #include <command.h>
diff --git a/arch/m68k/cpu/mcf52x2/cpu.c b/arch/m68k/cpu/mcf52x2/cpu.c
index 9a6a77e13c0..82f5b3c2f80 100644
--- a/arch/m68k/cpu/mcf52x2/cpu.c
+++ b/arch/m68k/cpu/mcf52x2/cpu.c
@@ -16,6 +16,7 @@
 #include <common.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <vsprintf.h>
 #include <watchdog.h>
 #include <command.h>
diff --git a/arch/m68k/cpu/mcf530x/cpu.c b/arch/m68k/cpu/mcf530x/cpu.c
index 0659bf65581..4b8d2bd833e 100644
--- a/arch/m68k/cpu/mcf530x/cpu.c
+++ b/arch/m68k/cpu/mcf530x/cpu.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <command.h>
 #include <init.h>
+#include <stdio.h>
 #include <vsprintf.h>
 #include <asm/immap.h>
 #include <asm/io.h>
diff --git a/arch/m68k/cpu/mcf532x/cpu.c b/arch/m68k/cpu/mcf532x/cpu.c
index cc56cdebb25..776543f06a9 100644
--- a/arch/m68k/cpu/mcf532x/cpu.c
+++ b/arch/m68k/cpu/mcf532x/cpu.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <vsprintf.h>
 #include <watchdog.h>
 #include <command.h>
diff --git a/arch/m68k/cpu/mcf5445x/cpu.c b/arch/m68k/cpu/mcf5445x/cpu.c
index 1bdf983ac2e..aa9af8a5a2a 100644
--- a/arch/m68k/cpu/mcf5445x/cpu.c
+++ b/arch/m68k/cpu/mcf5445x/cpu.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <vsprintf.h>
 #include <watchdog.h>
 #include <command.h>
diff --git a/arch/m68k/cpu/mcf547x_8x/cpu.c b/arch/m68k/cpu/mcf547x_8x/cpu.c
index 4df8459f698..e1a7f360e77 100644
--- a/arch/m68k/cpu/mcf547x_8x/cpu.c
+++ b/arch/m68k/cpu/mcf547x_8x/cpu.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <vsprintf.h>
 #include <watchdog.h>
 #include <command.h>
diff --git a/arch/m68k/lib/bootm.c b/arch/m68k/lib/bootm.c
index 6dbb86ee396..20ff33f7532 100644
--- a/arch/m68k/lib/bootm.c
+++ b/arch/m68k/lib/bootm.c
@@ -11,6 +11,7 @@
 #include <image.h>
 #include <lmb.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <u-boot/zlib.h>
diff --git a/arch/m68k/lib/fec.c b/arch/m68k/lib/fec.c
index eecea7a0235..3b76d1392bf 100644
--- a/arch/m68k/lib/fec.c
+++ b/arch/m68k/lib/fec.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
diff --git a/arch/m68k/lib/traps.c b/arch/m68k/lib/traps.c
index 78bbe6f56ba..3591bb22f09 100644
--- a/arch/m68k/lib/traps.c
+++ b/arch/m68k/lib/traps.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <watchdog.h>
 #include <command.h>
 #include <asm/processor.h>
diff --git a/arch/microblaze/cpu/exception.c b/arch/microblaze/cpu/exception.c
index b8dedc4e195..dd35f8c16f1 100644
--- a/arch/microblaze/cpu/exception.c
+++ b/arch/microblaze/cpu/exception.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <hang.h>
+#include <stdio.h>
 #include <asm/asm.h>
 
 void _hw_exception_handler (void)
diff --git a/arch/microblaze/cpu/interrupts.c b/arch/microblaze/cpu/interrupts.c
index fe65f3728fd..e86f0cda9df 100644
--- a/arch/microblaze/cpu/interrupts.c
+++ b/arch/microblaze/cpu/interrupts.c
@@ -13,6 +13,7 @@
 #include <irq_func.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/microblaze_intc.h>
 #include <asm/asm.h>
diff --git a/arch/microblaze/lib/bootm.c b/arch/microblaze/lib/bootm.c
index cdf8124d901..f8835b591c6 100644
--- a/arch/microblaze/lib/bootm.c
+++ b/arch/microblaze/lib/bootm.c
@@ -17,6 +17,7 @@
 #include <image.h>
 #include <lmb.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
diff --git a/arch/mips/lib/cache.c b/arch/mips/lib/cache.c
index 51a8f433475..1eb1459184c 100644
--- a/arch/mips/lib/cache.c
+++ b/arch/mips/lib/cache.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <cpu_func.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <asm/cacheops.h>
 #include <asm/cm.h>
diff --git a/arch/mips/lib/traps.c b/arch/mips/lib/traps.c
index 190a3cc495e..8b16ee056e3 100644
--- a/arch/mips/lib/traps.c
+++ b/arch/mips/lib/traps.c
@@ -11,6 +11,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/ptrace.h>
 #include <cpu_func.h>
diff --git a/arch/mips/mach-ath79/ar934x/clk.c b/arch/mips/mach-ath79/ar934x/clk.c
index 9e4dd8bb7e5..6d94491c545 100644
--- a/arch/mips/mach-ath79/ar934x/clk.c
+++ b/arch/mips/mach-ath79/ar934x/clk.c
@@ -7,6 +7,7 @@
 #include <clock_legacy.h>
 #include <command.h>
 #include <hang.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/addrspace.h>
diff --git a/arch/mips/mach-ath79/cpu.c b/arch/mips/mach-ath79/cpu.c
index ed190e8f9b0..709fa7a9c3b 100644
--- a/arch/mips/mach-ath79/cpu.c
+++ b/arch/mips/mach-ath79/cpu.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/addrspace.h>
diff --git a/arch/mips/mach-ath79/reset.c b/arch/mips/mach-ath79/reset.c
index 6cd5e77fd15..6ecde8a39ff 100644
--- a/arch/mips/mach-ath79/reset.c
+++ b/arch/mips/mach-ath79/reset.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/arch/mips/mach-jz47xx/jz4780/jz4780.c b/arch/mips/mach-jz47xx/jz4780/jz4780.c
index 5eeaaf7a146..496016724d7 100644
--- a/arch/mips/mach-jz47xx/jz4780/jz4780.c
+++ b/arch/mips/mach-jz47xx/jz4780/jz4780.c
@@ -12,6 +12,7 @@
 #include <hang.h>
 #include <image.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/sections.h>
diff --git a/arch/mips/mach-jz47xx/jz4780/pll.c b/arch/mips/mach-jz47xx/jz4780/pll.c
index 323c634fb32..9aada2ef15b 100644
--- a/arch/mips/mach-jz47xx/jz4780/pll.c
+++ b/arch/mips/mach-jz47xx/jz4780/pll.c
@@ -8,6 +8,7 @@
 
 #include <config.h>
 #include <common.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/arch/mips/mach-mscc/dram.c b/arch/mips/mach-mscc/dram.c
index c53a4202e0d..4aa5c90a3b1 100644
--- a/arch/mips/mach-mscc/dram.c
+++ b/arch/mips/mach-mscc/dram.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 
 #include <asm/io.h>
diff --git a/arch/mips/mach-mtmips/cpu.c b/arch/mips/mach-mtmips/cpu.c
index f9cdce5ff8d..1cb59178018 100644
--- a/arch/mips/mach-mtmips/cpu.c
+++ b/arch/mips/mach-mtmips/cpu.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <init.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/io.h>
diff --git a/arch/mips/mach-mtmips/mt7628/init.c b/arch/mips/mach-mtmips/mt7628/init.c
index 3fa0e139e75..c0b4387585f 100644
--- a/arch/mips/mach-mtmips/mt7628/init.c
+++ b/arch/mips/mach-mtmips/mt7628/init.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <clk.h>
 #include <dm.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/global_data.h>
 #include <dm/uclass.h>
diff --git a/arch/mips/mach-octeon/cpu.c b/arch/mips/mach-octeon/cpu.c
index 2680a2e6ed6..1831f1dfa8c 100644
--- a/arch/mips/mach-octeon/cpu.c
+++ b/arch/mips/mach-octeon/cpu.c
@@ -3,6 +3,7 @@
  * Copyright (C) 2020 Marvell International Ltd.
  */
 
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/bitfield.h>
 #include <linux/bitops.h>
diff --git a/arch/mips/mach-pic32/cpu.c b/arch/mips/mach-pic32/cpu.c
index eac2fe5f8c9..bc76152ed3d 100644
--- a/arch/mips/mach-pic32/cpu.c
+++ b/arch/mips/mach-pic32/cpu.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <init.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <mach/pic32.h>
 #include <mach/ddr.h>
diff --git a/arch/nds32/lib/bootm.c b/arch/nds32/lib/bootm.c
index 95759930454..3afd1c5cff2 100644
--- a/arch/nds32/lib/bootm.c
+++ b/arch/nds32/lib/bootm.c
@@ -12,6 +12,7 @@
 #include <hang.h>
 #include <image.h>
 #include <log.h>
+#include <stdio.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 3d04e3091f8..e8b07be1ded 100644
--- a/arch/nds32/lib/interrupts.c
+++ b/arch/nds32/lib/interrupts.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <irq_func.h>
+#include <stdio.h>
 #include <asm/ptrace.h>
 #include <asm/system.h>
 #include <asm/u-boot.h>
diff --git a/arch/nios2/cpu/cpu.c b/arch/nios2/cpu/cpu.c
index c670d51f1df..0203348df01 100644
--- a/arch/nios2/cpu/cpu.c
+++ b/arch/nios2/cpu/cpu.c
@@ -12,6 +12,7 @@
 #include <errno.h>
 #include <init.h>
 #include <irq_func.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <asm/system.h>
diff --git a/arch/powerpc/cpu/mpc83xx/cpu.c b/arch/powerpc/cpu/mpc83xx/cpu.c
index 927cdc515d9..ba897987c59 100644
--- a/arch/powerpc/cpu/mpc83xx/cpu.c
+++ b/arch/powerpc/cpu/mpc83xx/cpu.c
@@ -13,6 +13,7 @@
 #include <cpu_func.h>
 #include <irq_func.h>
 #include <net.h>
+#include <stdio.h>
 #include <time.h>
 #include <vsprintf.h>
 #include <watchdog.h>
diff --git a/arch/powerpc/cpu/mpc83xx/cpu_init.c b/arch/powerpc/cpu/mpc83xx/cpu_init.c
index 8793639e20e..c8c231f887f 100644
--- a/arch/powerpc/cpu/mpc83xx/cpu_init.c
+++ b/arch/powerpc/cpu/mpc83xx/cpu_init.c
@@ -7,6 +7,7 @@
 #include <asm-offsets.h>
 #include <mpc83xx.h>
 #include <ioports.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/processor.h>
diff --git a/arch/powerpc/cpu/mpc83xx/ecc.c b/arch/powerpc/cpu/mpc83xx/ecc.c
index 4760c188307..88d4cb5d5a0 100644
--- a/arch/powerpc/cpu/mpc83xx/ecc.c
+++ b/arch/powerpc/cpu/mpc83xx/ecc.c
@@ -10,6 +10,7 @@
 #include <irq_func.h>
 #include <mpc83xx.h>
 #include <command.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
 
diff --git a/arch/powerpc/cpu/mpc83xx/pci.c b/arch/powerpc/cpu/mpc83xx/pci.c
index 7f5ddb99840..17882bce7d2 100644
--- a/arch/powerpc/cpu/mpc83xx/pci.c
+++ b/arch/powerpc/cpu/mpc83xx/pci.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <init.h>
 #include <pci.h>
+#include <stdio.h>
 #include <asm/bitops.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
diff --git a/arch/powerpc/cpu/mpc83xx/pcie.c b/arch/powerpc/cpu/mpc83xx/pcie.c
index f05f0a9b127..8a5c9bb0dd3 100644
--- a/arch/powerpc/cpu/mpc83xx/pcie.c
+++ b/arch/powerpc/cpu/mpc83xx/pcie.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <pci.h>
 #include <mpc83xx.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/u-boot.h>
diff --git a/arch/powerpc/cpu/mpc83xx/spd_sdram.c b/arch/powerpc/cpu/mpc83xx/spd_sdram.c
index 2d194745ed1..b258f7f98a5 100644
--- a/arch/powerpc/cpu/mpc83xx/spd_sdram.c
+++ b/arch/powerpc/cpu/mpc83xx/spd_sdram.c
@@ -15,6 +15,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <vsprintf.h>
 #include <asm/processor.h>
diff --git a/arch/powerpc/cpu/mpc83xx/speed.c b/arch/powerpc/cpu/mpc83xx/speed.c
index 0ec27a5ac1c..73009d7a01d 100644
--- a/arch/powerpc/cpu/mpc83xx/speed.c
+++ b/arch/powerpc/cpu/mpc83xx/speed.c
@@ -602,5 +602,6 @@ U_BOOT_CMD(clocks, 1, 0, do_clocks,
 	"    clocks"
 );
 
+#include <stdio.h>
 #include <asm/u-boot.h>
 #endif
diff --git a/arch/powerpc/cpu/mpc83xx/spl_minimal.c b/arch/powerpc/cpu/mpc83xx/spl_minimal.c
index efd5ddf8798..f0d8330d3ac 100644
--- a/arch/powerpc/cpu/mpc83xx/spl_minimal.c
+++ b/arch/powerpc/cpu/mpc83xx/spl_minimal.c
@@ -7,6 +7,7 @@
 #include <asm-offsets.h>
 #include <clock_legacy.h>
 #include <mpc83xx.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
diff --git a/arch/powerpc/cpu/mpc83xx/traps.c b/arch/powerpc/cpu/mpc83xx/traps.c
index a0539f4924d..c6c2917f881 100644
--- a/arch/powerpc/cpu/mpc83xx/traps.c
+++ b/arch/powerpc/cpu/mpc83xx/traps.c
@@ -12,6 +12,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/ptrace.h>
 #include <command.h>
diff --git a/arch/powerpc/cpu/mpc85xx/bsc9132_serdes.c b/arch/powerpc/cpu/mpc85xx/bsc9132_serdes.c
index b972cf3b5e4..e08484324d0 100644
--- a/arch/powerpc/cpu/mpc85xx/bsc9132_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/bsc9132_serdes.c
@@ -7,6 +7,7 @@
 #include <config.h>
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
diff --git a/arch/powerpc/cpu/mpc85xx/c29x_serdes.c b/arch/powerpc/cpu/mpc85xx/c29x_serdes.c
index 34b58bb7f9e..10bc15c45ca 100644
--- a/arch/powerpc/cpu/mpc85xx/c29x_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/c29x_serdes.c
@@ -6,6 +6,7 @@
 #include <config.h>
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
diff --git a/arch/powerpc/cpu/mpc85xx/cmd_errata.c b/arch/powerpc/cpu/mpc85xx/cmd_errata.c
index 53bc1ccca19..2e3b0a21dd7 100644
--- a/arch/powerpc/cpu/mpc85xx/cmd_errata.c
+++ b/arch/powerpc/cpu/mpc85xx/cmd_errata.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <command.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 #include <linux/compiler.h>
 #include <fsl_errata.h>
diff --git a/arch/powerpc/cpu/mpc85xx/cpu.c b/arch/powerpc/cpu/mpc85xx/cpu.c
index ea3554af781..afcfc47554d 100644
--- a/arch/powerpc/cpu/mpc85xx/cpu.c
+++ b/arch/powerpc/cpu/mpc85xx/cpu.c
@@ -15,6 +15,7 @@
 #include <init.h>
 #include <irq_func.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <vsprintf.h>
 #include <watchdog.h>
diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init.c b/arch/powerpc/cpu/mpc85xx/cpu_init.c
index c4ebab036d3..c8194852df5 100644
--- a/arch/powerpc/cpu/mpc85xx/cpu_init.c
+++ b/arch/powerpc/cpu/mpc85xx/cpu_init.c
@@ -14,6 +14,7 @@
 #include <env.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.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 d458d0e135e..2a6e07f2834 100644
--- a/arch/powerpc/cpu/mpc85xx/ether_fcc.c
+++ b/arch/powerpc/cpu/mpc85xx/ether_fcc.c
@@ -26,6 +26,7 @@
 
 #include <common.h>
 #include <malloc.h>
+#include <stdio.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 41bbddf81d4..c8388da6331 100644
--- a/arch/powerpc/cpu/mpc85xx/fdt.c
+++ b/arch/powerpc/cpu/mpc85xx/fdt.c
@@ -10,6 +10,7 @@
 #include <clock_legacy.h>
 #include <env.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
diff --git a/arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c b/arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c
index 6cf2cde8f7f..accc10983b2 100644
--- a/arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/fsl_serdes.h>
 #include <asm/immap_85xx.h>
 #include <asm/io.h>
diff --git a/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c b/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c
index 98b501c6126..1af6e2ab7ac 100644
--- a/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <env.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #ifdef CONFIG_SYS_P4080_ERRATUM_SERDES8
 #include <hwconfig.h>
diff --git a/arch/powerpc/cpu/mpc85xx/liodn.c b/arch/powerpc/cpu/mpc85xx/liodn.c
index 397167b3e85..4a9fa7e78b0 100644
--- a/arch/powerpc/cpu/mpc85xx/liodn.c
+++ b/arch/powerpc/cpu/mpc85xx/liodn.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.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 c9f307d259e..8dd9b6d55ca 100644
--- a/arch/powerpc/cpu/mpc85xx/mp.c
+++ b/arch/powerpc/cpu/mpc85xx/mp.c
@@ -7,6 +7,7 @@
 #include <cpu_func.h>
 #include <env.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/processor.h>
 #include <env.h>
diff --git a/arch/powerpc/cpu/mpc85xx/mpc8536_serdes.c b/arch/powerpc/cpu/mpc85xx/mpc8536_serdes.c
index cfae81fbced..bc7f1724486 100644
--- a/arch/powerpc/cpu/mpc85xx/mpc8536_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/mpc8536_serdes.c
@@ -7,6 +7,7 @@
 #include <config.h>
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
diff --git a/arch/powerpc/cpu/mpc85xx/mpc8544_serdes.c b/arch/powerpc/cpu/mpc85xx/mpc8544_serdes.c
index 6aa55b9d842..22d17e2e3b2 100644
--- a/arch/powerpc/cpu/mpc85xx/mpc8544_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/mpc8544_serdes.c
@@ -6,6 +6,7 @@
 #include <config.h>
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
diff --git a/arch/powerpc/cpu/mpc85xx/mpc8548_serdes.c b/arch/powerpc/cpu/mpc85xx/mpc8548_serdes.c
index 94b584e03b5..798fdb46edb 100644
--- a/arch/powerpc/cpu/mpc85xx/mpc8548_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/mpc8548_serdes.c
@@ -6,6 +6,7 @@
 #include <config.h>
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
diff --git a/arch/powerpc/cpu/mpc85xx/mpc8568_serdes.c b/arch/powerpc/cpu/mpc85xx/mpc8568_serdes.c
index d2d93a9e5f7..df0470700c5 100644
--- a/arch/powerpc/cpu/mpc85xx/mpc8568_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/mpc8568_serdes.c
@@ -6,6 +6,7 @@
 #include <config.h>
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
diff --git a/arch/powerpc/cpu/mpc85xx/mpc8569_serdes.c b/arch/powerpc/cpu/mpc85xx/mpc8569_serdes.c
index 474be34b77d..1b88b7afb21 100644
--- a/arch/powerpc/cpu/mpc85xx/mpc8569_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/mpc8569_serdes.c
@@ -6,6 +6,7 @@
 #include <config.h>
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
diff --git a/arch/powerpc/cpu/mpc85xx/mpc8572_serdes.c b/arch/powerpc/cpu/mpc85xx/mpc8572_serdes.c
index 231e12bdfea..7d040d32ac8 100644
--- a/arch/powerpc/cpu/mpc85xx/mpc8572_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/mpc8572_serdes.c
@@ -6,6 +6,7 @@
 #include <config.h>
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
diff --git a/arch/powerpc/cpu/mpc85xx/p1010_serdes.c b/arch/powerpc/cpu/mpc85xx/p1010_serdes.c
index 4fafd03b945..e43d99da15b 100644
--- a/arch/powerpc/cpu/mpc85xx/p1010_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/p1010_serdes.c
@@ -7,6 +7,7 @@
 #include <config.h>
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
diff --git a/arch/powerpc/cpu/mpc85xx/p1021_serdes.c b/arch/powerpc/cpu/mpc85xx/p1021_serdes.c
index 32f3927f444..7d054804a02 100644
--- a/arch/powerpc/cpu/mpc85xx/p1021_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/p1021_serdes.c
@@ -6,6 +6,7 @@
 #include <config.h>
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
diff --git a/arch/powerpc/cpu/mpc85xx/p1022_serdes.c b/arch/powerpc/cpu/mpc85xx/p1022_serdes.c
index 8dd9660bd4d..badc694930d 100644
--- a/arch/powerpc/cpu/mpc85xx/p1022_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/p1022_serdes.c
@@ -7,6 +7,7 @@
 #include <config.h>
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
diff --git a/arch/powerpc/cpu/mpc85xx/p1023_serdes.c b/arch/powerpc/cpu/mpc85xx/p1023_serdes.c
index 516f61b452e..ae8dd356c4c 100644
--- a/arch/powerpc/cpu/mpc85xx/p1023_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/p1023_serdes.c
@@ -7,6 +7,7 @@
 #include <config.h>
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
diff --git a/arch/powerpc/cpu/mpc85xx/p2020_serdes.c b/arch/powerpc/cpu/mpc85xx/p2020_serdes.c
index 4e79a7fcfa1..6dfe61415a9 100644
--- a/arch/powerpc/cpu/mpc85xx/p2020_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/p2020_serdes.c
@@ -6,6 +6,7 @@
 #include <config.h>
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
diff --git a/arch/powerpc/cpu/mpc85xx/pci.c b/arch/powerpc/cpu/mpc85xx/pci.c
index 8853a6ea489..5cfdb0e0d2e 100644
--- a/arch/powerpc/cpu/mpc85xx/pci.c
+++ b/arch/powerpc/cpu/mpc85xx/pci.c
@@ -9,6 +9,7 @@
  * PCI Configuration space access support for MPC85xx PCI Bridge
  */
 #include <common.h>
+#include <stdio.h>
 #include <asm/bitops.h>
 #include <asm/cpm_85xx.h>
 #include <asm/u-boot.h>
diff --git a/arch/powerpc/cpu/mpc85xx/portals.c b/arch/powerpc/cpu/mpc85xx/portals.c
index c0f18d924b6..5fc672d153d 100644
--- a/arch/powerpc/cpu/mpc85xx/portals.c
+++ b/arch/powerpc/cpu/mpc85xx/portals.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <linux/string.h>
diff --git a/arch/powerpc/cpu/mpc85xx/speed.c b/arch/powerpc/cpu/mpc85xx/speed.c
index c83727ed05a..2e354897863 100644
--- a/arch/powerpc/cpu/mpc85xx/speed.c
+++ b/arch/powerpc/cpu/mpc85xx/speed.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <ppc_asm.tmpl>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/compiler.h>
diff --git a/arch/powerpc/cpu/mpc85xx/tlb.c b/arch/powerpc/cpu/mpc85xx/tlb.c
index 2993a528630..1678975efb4 100644
--- a/arch/powerpc/cpu/mpc85xx/tlb.c
+++ b/arch/powerpc/cpu/mpc85xx/tlb.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <display_options.h>
+#include <stdio.h>
 #include <asm/bitops.h>
 #include <asm/global_data.h>
 #include <asm/processor.h>
diff --git a/arch/powerpc/cpu/mpc85xx/traps.c b/arch/powerpc/cpu/mpc85xx/traps.c
index 0f37ed283f6..ae448008d08 100644
--- a/arch/powerpc/cpu/mpc85xx/traps.c
+++ b/arch/powerpc/cpu/mpc85xx/traps.c
@@ -20,6 +20,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/ptrace.h>
 #include <command.h>
diff --git a/arch/powerpc/cpu/mpc86xx/cpu.c b/arch/powerpc/cpu/mpc86xx/cpu.c
index bab81cc72ab..87a2eab8115 100644
--- a/arch/powerpc/cpu/mpc86xx/cpu.c
+++ b/arch/powerpc/cpu/mpc86xx/cpu.c
@@ -9,6 +9,7 @@
 #include <cpu_func.h>
 #include <display_options.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <vsprintf.h>
 #include <watchdog.h>
diff --git a/arch/powerpc/cpu/mpc86xx/fdt.c b/arch/powerpc/cpu/mpc86xx/fdt.c
index a5c313b8a25..be6292dd6a3 100644
--- a/arch/powerpc/cpu/mpc86xx/fdt.c
+++ b/arch/powerpc/cpu/mpc86xx/fdt.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
diff --git a/arch/powerpc/cpu/mpc86xx/interrupts.c b/arch/powerpc/cpu/mpc86xx/interrupts.c
index d3ebda7d408..7ae5b7d0b3a 100644
--- a/arch/powerpc/cpu/mpc86xx/interrupts.c
+++ b/arch/powerpc/cpu/mpc86xx/interrupts.c
@@ -19,6 +19,7 @@
 #include <log.h>
 #include <mpc86xx.h>
 #include <command.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/processor.h>
 #ifdef CONFIG_POST
diff --git a/arch/powerpc/cpu/mpc86xx/mp.c b/arch/powerpc/cpu/mpc86xx/mp.c
index 2d23742a2bd..d6256e8b375 100644
--- a/arch/powerpc/cpu/mpc86xx/mp.c
+++ b/arch/powerpc/cpu/mpc86xx/mp.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <cpu_func.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/processor.h>
 #include <asm/mmu.h>
diff --git a/arch/powerpc/cpu/mpc86xx/mpc8610_serdes.c b/arch/powerpc/cpu/mpc86xx/mpc8610_serdes.c
index ecc88ba4374..2f755ac2012 100644
--- a/arch/powerpc/cpu/mpc86xx/mpc8610_serdes.c
+++ b/arch/powerpc/cpu/mpc86xx/mpc8610_serdes.c
@@ -6,6 +6,7 @@
 #include <config.h>
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/immap_86xx.h>
 #include <asm/fsl_serdes.h>
diff --git a/arch/powerpc/cpu/mpc86xx/mpc8641_serdes.c b/arch/powerpc/cpu/mpc86xx/mpc8641_serdes.c
index 4df446618c0..1621fd116dd 100644
--- a/arch/powerpc/cpu/mpc86xx/mpc8641_serdes.c
+++ b/arch/powerpc/cpu/mpc86xx/mpc8641_serdes.c
@@ -6,6 +6,7 @@
 #include <config.h>
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/immap_86xx.h>
 #include <asm/fsl_serdes.h>
diff --git a/arch/powerpc/cpu/mpc86xx/traps.c b/arch/powerpc/cpu/mpc86xx/traps.c
index 91f68fa57cd..30fa3e08cde 100644
--- a/arch/powerpc/cpu/mpc86xx/traps.c
+++ b/arch/powerpc/cpu/mpc86xx/traps.c
@@ -14,6 +14,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/ptrace.h>
 #include <command.h>
diff --git a/arch/powerpc/cpu/mpc8xx/cpu.c b/arch/powerpc/cpu/mpc8xx/cpu.c
index 06931f96f32..926a163eeea 100644
--- a/arch/powerpc/cpu/mpc8xx/cpu.c
+++ b/arch/powerpc/cpu/mpc8xx/cpu.c
@@ -20,6 +20,7 @@
 #include <cpu_func.h>
 #include <display_options.h>
 #include <net.h>
+#include <stdio.h>
 #include <time.h>
 #include <vsprintf.h>
 #include <watchdog.h>
diff --git a/arch/powerpc/cpu/mpc8xx/immap.c b/arch/powerpc/cpu/mpc8xx/immap.c
index c95182444b5..d0e0753c269 100644
--- a/arch/powerpc/cpu/mpc8xx/immap.c
+++ b/arch/powerpc/cpu/mpc8xx/immap.c
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 
diff --git a/arch/powerpc/cpu/mpc8xx/interrupts.c b/arch/powerpc/cpu/mpc8xx/interrupts.c
index 799edced8f0..e0f3936f1bc 100644
--- a/arch/powerpc/cpu/mpc8xx/interrupts.c
+++ b/arch/powerpc/cpu/mpc8xx/interrupts.c
@@ -8,6 +8,7 @@
 #include <irq_func.h>
 #include <mpc8xx.h>
 #include <mpc8xx_irq.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/cpm_8xx.h>
 #include <asm/processor.h>
diff --git a/arch/powerpc/cpu/mpc8xx/traps.c b/arch/powerpc/cpu/mpc8xx/traps.c
index 33ecc0e00b9..02b8fc706e6 100644
--- a/arch/powerpc/cpu/mpc8xx/traps.c
+++ b/arch/powerpc/cpu/mpc8xx/traps.c
@@ -16,6 +16,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/ptrace.h>
 #include <command.h>
 #include <asm/processor.h>
diff --git a/arch/powerpc/cpu/mpc8xxx/fdt.c b/arch/powerpc/cpu/mpc8xxx/fdt.c
index ea4375f2cfd..0bd2dbe8f97 100644
--- a/arch/powerpc/cpu/mpc8xxx/fdt.c
+++ b/arch/powerpc/cpu/mpc8xxx/fdt.c
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <cpu_func.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
diff --git a/arch/powerpc/cpu/mpc8xxx/fsl_lbc.c b/arch/powerpc/cpu/mpc8xxx/fsl_lbc.c
index 406965df28e..75c2d7629ce 100644
--- a/arch/powerpc/cpu/mpc8xxx/fsl_lbc.c
+++ b/arch/powerpc/cpu/mpc8xxx/fsl_lbc.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <hang.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/fsl_lbc.h>
 #include <asm/u-boot.h>
 
diff --git a/arch/powerpc/cpu/mpc8xxx/fsl_pamu.c b/arch/powerpc/cpu/mpc8xxx/fsl_pamu.c
index 393729448a6..bc1b38da541 100644
--- a/arch/powerpc/cpu/mpc8xxx/fsl_pamu.c
+++ b/arch/powerpc/cpu/mpc8xxx/fsl_pamu.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <linux/bitops.h>
 #include <linux/log2.h>
 #include <malloc.h>
diff --git a/arch/powerpc/cpu/mpc8xxx/law.c b/arch/powerpc/cpu/mpc8xxx/law.c
index bc1f34d781e..5cdb1363f78 100644
--- a/arch/powerpc/cpu/mpc8xxx/law.c
+++ b/arch/powerpc/cpu/mpc8xxx/law.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <display_options.h>
+#include <stdio.h>
 #include <asm/bitops.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
diff --git a/arch/powerpc/cpu/mpc8xxx/srio.c b/arch/powerpc/cpu/mpc8xxx/srio.c
index aa9b2d9e2ad..3548acdb256 100644
--- a/arch/powerpc/cpu/mpc8xxx/srio.c
+++ b/arch/powerpc/cpu/mpc8xxx/srio.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <config.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/fsl_law.h>
 #include <asm/fsl_serdes.h>
diff --git a/arch/powerpc/lib/bat_rw.c b/arch/powerpc/lib/bat_rw.c
index 24dd30615bd..2eae204f294 100644
--- a/arch/powerpc/lib/bat_rw.c
+++ b/arch/powerpc/lib/bat_rw.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/processor.h>
 #include <asm/mmu.h>
diff --git a/arch/powerpc/lib/bdinfo.c b/arch/powerpc/lib/bdinfo.c
index 2d9bd267d52..8174d282b53 100644
--- a/arch/powerpc/lib/bdinfo.c
+++ b/arch/powerpc/lib/bdinfo.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 
diff --git a/arch/powerpc/lib/bootm.c b/arch/powerpc/lib/bootm.c
index a43126e3974..d72da1da2d2 100644
--- a/arch/powerpc/lib/bootm.c
+++ b/arch/powerpc/lib/bootm.c
@@ -14,6 +14,7 @@
 #include <init.h>
 #include <lmb.h>
 #include <log.h>
+#include <stdio.h>
 #include <watchdog.h>
 #include <command.h>
 #include <image.h>
diff --git a/arch/riscv/lib/bootm.c b/arch/riscv/lib/bootm.c
index 19ccd1b43ca..8bd6fd0c89d 100644
--- a/arch/riscv/lib/bootm.c
+++ b/arch/riscv/lib/bootm.c
@@ -13,6 +13,7 @@
 #include <fdt_support.h>
 #include <hang.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <dm/root.h>
diff --git a/arch/riscv/lib/fdt_fixup.c b/arch/riscv/lib/fdt_fixup.c
index 3a93ac47eb0..caa19cd8dd1 100644
--- a/arch/riscv/lib/fdt_fixup.c
+++ b/arch/riscv/lib/fdt_fixup.c
@@ -10,6 +10,7 @@
 #include <fdt_support.h>
 #include <log.h>
 #include <mapmem.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
diff --git a/arch/riscv/lib/image.c b/arch/riscv/lib/image.c
index 47f2edcf7fc..636b6597c06 100644
--- a/arch/riscv/lib/image.c
+++ b/arch/riscv/lib/image.c
@@ -10,6 +10,7 @@
 #include <image.h>
 #include <mapmem.h>
 #include <errno.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/sizes.h>
 #include <linux/stddef.h>
diff --git a/arch/riscv/lib/interrupts.c b/arch/riscv/lib/interrupts.c
index 074c70ee77a..38c0048577c 100644
--- a/arch/riscv/lib/interrupts.c
+++ b/arch/riscv/lib/interrupts.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <hang.h>
 #include <irq_func.h>
+#include <stdio.h>
 #include <asm/ptrace.h>
 #include <asm/system.h>
 #include <asm/encoding.h>
diff --git a/arch/riscv/lib/reset.c b/arch/riscv/lib/reset.c
index 8779c619cc5..76ffdb90439 100644
--- a/arch/riscv/lib/reset.c
+++ b/arch/riscv/lib/reset.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <command.h>
 #include <hang.h>
+#include <stdio.h>
 
 int do_reset(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 {
diff --git a/arch/sandbox/cpu/cpu.c b/arch/sandbox/cpu/cpu.c
index 110134c6d42..12db5249ee1 100644
--- a/arch/sandbox/cpu/cpu.c
+++ b/arch/sandbox/cpu/cpu.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
diff --git a/arch/sandbox/cpu/sdl.c b/arch/sandbox/cpu/sdl.c
index 813fdcdac60..8673e601e5e 100644
--- a/arch/sandbox/cpu/sdl.c
+++ b/arch/sandbox/cpu/sdl.c
@@ -4,6 +4,7 @@
  */
 
 #include <errno.h>
+#include <stdio.h>
 #include <unistd.h>
 #include <stdbool.h>
 #include <linux/input.h>
diff --git a/arch/sandbox/cpu/spl.c b/arch/sandbox/cpu/spl.c
index 8998f92858e..41591d6528c 100644
--- a/arch/sandbox/cpu/spl.c
+++ b/arch/sandbox/cpu/spl.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <os.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/spl.h>
 #include <asm/state.h>
diff --git a/arch/sandbox/cpu/start.c b/arch/sandbox/cpu/start.c
index 153015f956b..111fc85854e 100644
--- a/arch/sandbox/cpu/start.c
+++ b/arch/sandbox/cpu/start.c
@@ -10,6 +10,7 @@
 #include <os.h>
 #include <cli.h>
 #include <sort.h>
+#include <stdio.h>
 #include <asm/getopt.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/arch/sandbox/cpu/state.c b/arch/sandbox/cpu/state.c
index ec432d06429..bfc4f0b8def 100644
--- a/arch/sandbox/cpu/state.c
+++ b/arch/sandbox/cpu/state.c
@@ -8,6 +8,7 @@
 #include <fdtdec.h>
 #include <log.h>
 #include <os.h>
+#include <stdio.h>
 #include <asm/malloc.h>
 #include <asm/state.h>
 #include <linux/string.h>
diff --git a/arch/sandbox/lib/bootm.c b/arch/sandbox/lib/bootm.c
index ab9f8a5f9c9..d9378f019c0 100644
--- a/arch/sandbox/lib/bootm.c
+++ b/arch/sandbox/lib/bootm.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <bootstage.h>
 #include <image.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/string.h>
 
diff --git a/arch/sh/cpu/sh4/cpu.c b/arch/sh/cpu/sh4/cpu.c
index d4cdfb61ab5..edab955079e 100644
--- a/arch/sh/cpu/sh4/cpu.c
+++ b/arch/sh/cpu/sh4/cpu.c
@@ -10,6 +10,7 @@
 #include <cpu_func.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/processor.h>
 #include <asm/u-boot.h>
 
diff --git a/arch/sh/lib/bootm.c b/arch/sh/lib/bootm.c
index 71d964586c5..b6e961f7083 100644
--- a/arch/sh/lib/bootm.c
+++ b/arch/sh/lib/bootm.c
@@ -11,6 +11,7 @@
 #include <command.h>
 #include <env.h>
 #include <image.h>
+#include <stdio.h>
 #include <asm/byteorder.h>
 #include <asm/zimage.h>
 #include <linux/string.h>
diff --git a/arch/x86/cpu/apollolake/cpu_spl.c b/arch/x86/cpu/apollolake/cpu_spl.c
index a9009d375fc..786d65311c8 100644
--- a/arch/x86/cpu/apollolake/cpu_spl.c
+++ b/arch/x86/cpu/apollolake/cpu_spl.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <spi_flash.h>
 #include <spl.h>
+#include <stdio.h>
 #include <syscon.h>
 #include <acpi/acpi_s3.h>
 #include <asm/cpu.h>
diff --git a/arch/x86/cpu/broadwell/cpu.c b/arch/x86/cpu/broadwell/cpu.c
index c5ef51c43f2..9e35e9f699e 100644
--- a/arch/x86/cpu/broadwell/cpu.c
+++ b/arch/x86/cpu/broadwell/cpu.c
@@ -10,6 +10,7 @@
 #include <cpu.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/cpu.h>
 #include <asm/cpu_x86.h>
 #include <asm/cpu_common.h>
diff --git a/arch/x86/cpu/broadwell/iobp.c b/arch/x86/cpu/broadwell/iobp.c
index cb5595c930e..16c840690bc 100644
--- a/arch/x86/cpu/broadwell/iobp.c
+++ b/arch/x86/cpu/broadwell/iobp.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <errno.h>
+#include <stdio.h>
 #include <asm/intel_regs.h>
 #include <asm/io.h>
 #include <asm/arch/pch.h>
diff --git a/arch/x86/cpu/broadwell/northbridge.c b/arch/x86/cpu/broadwell/northbridge.c
index 4f3ccf589e5..4b0dd46f7fe 100644
--- a/arch/x86/cpu/broadwell/northbridge.c
+++ b/arch/x86/cpu/broadwell/northbridge.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/mrc_common.h>
diff --git a/arch/x86/cpu/broadwell/sdram.c b/arch/x86/cpu/broadwell/sdram.c
index 0aa2300f1c7..ea456f17eb0 100644
--- a/arch/x86/cpu/broadwell/sdram.c
+++ b/arch/x86/cpu/broadwell/sdram.c
@@ -10,6 +10,7 @@
 #include <init.h>
 #include <log.h>
 #include <pci.h>
+#include <stdio.h>
 #include <syscon.h>
 #include <asm/cpu.h>
 #include <asm/global_data.h>
diff --git a/arch/x86/cpu/coreboot/coreboot.c b/arch/x86/cpu/coreboot/coreboot.c
index 16c1a5e5bfa..748b8dabe71 100644
--- a/arch/x86/cpu/coreboot/coreboot.c
+++ b/arch/x86/cpu/coreboot/coreboot.c
@@ -9,6 +9,7 @@
 #include <cpu_func.h>
 #include <fdtdec.h>
 #include <init.h>
+#include <stdio.h>
 #include <usb.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/arch/x86/cpu/coreboot/sdram.c b/arch/x86/cpu/coreboot/sdram.c
index b3fddca7098..16fec6c7116 100644
--- a/arch/x86/cpu/coreboot/sdram.c
+++ b/arch/x86/cpu/coreboot/sdram.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/e820.h>
 #include <asm/arch/sysinfo.h>
 #include <asm/global_data.h>
diff --git a/arch/x86/cpu/cpu.c b/arch/x86/cpu/cpu.c
index 4e67391b333..fc96b32240c 100644
--- a/arch/x86/cpu/cpu.c
+++ b/arch/x86/cpu/cpu.c
@@ -28,6 +28,7 @@
 #include <irq.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <syscon.h>
 #include <acpi/acpi_s3.h>
 #include <acpi/acpi_table.h>
diff --git a/arch/x86/cpu/efi/payload.c b/arch/x86/cpu/efi/payload.c
index a97409f3db1..d6b6c3781f4 100644
--- a/arch/x86/cpu/efi/payload.c
+++ b/arch/x86/cpu/efi/payload.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <usb.h>
 #include <asm/bootparam.h>
 #include <asm/e820.h>
diff --git a/arch/x86/cpu/i386/cpu.c b/arch/x86/cpu/i386/cpu.c
index fec8f2c60b2..e10dcca9768 100644
--- a/arch/x86/cpu/i386/cpu.c
+++ b/arch/x86/cpu/i386/cpu.c
@@ -24,6 +24,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/control_regs.h>
 #include <asm/coreboot_tables.h>
 #include <asm/cpu.h>
diff --git a/arch/x86/cpu/i386/interrupt.c b/arch/x86/cpu/i386/interrupt.c
index 3ecf907e72e..98daa1f7dd3 100644
--- a/arch/x86/cpu/i386/interrupt.c
+++ b/arch/x86/cpu/i386/interrupt.c
@@ -17,6 +17,7 @@
 #include <init.h>
 #include <irq.h>
 #include <irq_func.h>
+#include <stdio.h>
 #include <asm/control_regs.h>
 #include <asm/global_data.h>
 #include <asm/i8259.h>
diff --git a/arch/x86/cpu/intel_common/cpu.c b/arch/x86/cpu/intel_common/cpu.c
index 3a4fd35cff1..87da5feaf61 100644
--- a/arch/x86/cpu/intel_common/cpu.c
+++ b/arch/x86/cpu/intel_common/cpu.c
@@ -12,6 +12,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/cpu.h>
 #include <asm/cpu_common.h>
 #include <asm/global_data.h>
diff --git a/arch/x86/cpu/intel_common/microcode.c b/arch/x86/cpu/intel_common/microcode.c
index 4d8e1d21083..919d146940a 100644
--- a/arch/x86/cpu/intel_common/microcode.c
+++ b/arch/x86/cpu/intel_common/microcode.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <fdtdec.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/libfdt.h>
 #include <asm/cpu.h>
diff --git a/arch/x86/cpu/intel_common/mrc.c b/arch/x86/cpu/intel_common/mrc.c
index a5c62de0919..9a8828b0e41 100644
--- a/arch/x86/cpu/intel_common/mrc.c
+++ b/arch/x86/cpu/intel_common/mrc.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <syscon.h>
 #include <time.h>
 #include <asm/cpu.h>
diff --git a/arch/x86/cpu/irq.c b/arch/x86/cpu/irq.c
index 001c8913fad..0775c5cddac 100644
--- a/arch/x86/cpu/irq.c
+++ b/arch/x86/cpu/irq.c
@@ -10,6 +10,7 @@
 #include <irq.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/irq.h>
diff --git a/arch/x86/cpu/ivybridge/bd82x6x.c b/arch/x86/cpu/ivybridge/bd82x6x.c
index 0540b021618..84d719e6c4e 100644
--- a/arch/x86/cpu/ivybridge/bd82x6x.c
+++ b/arch/x86/cpu/ivybridge/bd82x6x.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <pch.h>
+#include <stdio.h>
 #include <asm/cpu.h>
 #include <asm/global_data.h>
 #include <asm/intel_regs.h>
diff --git a/arch/x86/cpu/ivybridge/cpu.c b/arch/x86/cpu/ivybridge/cpu.c
index 7f5c9e1d201..2b966cc5de0 100644
--- a/arch/x86/cpu/ivybridge/cpu.c
+++ b/arch/x86/cpu/ivybridge/cpu.c
@@ -18,6 +18,7 @@
 #include <init.h>
 #include <log.h>
 #include <pch.h>
+#include <stdio.h>
 #include <asm/cpu.h>
 #include <asm/cpu_common.h>
 #include <asm/global_data.h>
diff --git a/arch/x86/cpu/ivybridge/early_me.c b/arch/x86/cpu/ivybridge/early_me.c
index bee1671baf8..4f43986926a 100644
--- a/arch/x86/cpu/ivybridge/early_me.c
+++ b/arch/x86/cpu/ivybridge/early_me.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
+#include <stdio.h>
 #include <sysreset.h>
 #include <asm/pci.h>
 #include <asm/cpu.h>
diff --git a/arch/x86/cpu/ivybridge/lpc.c b/arch/x86/cpu/ivybridge/lpc.c
index f931d2be1b5..2d82984dbdf 100644
--- a/arch/x86/cpu/ivybridge/lpc.c
+++ b/arch/x86/cpu/ivybridge/lpc.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <rtc.h>
 #include <pci.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/intel_regs.h>
 #include <asm/interrupt.h>
diff --git a/arch/x86/cpu/ivybridge/sdram.c b/arch/x86/cpu/ivybridge/sdram.c
index 8e1f615f389..2c3ee2f4ab5 100644
--- a/arch/x86/cpu/ivybridge/sdram.c
+++ b/arch/x86/cpu/ivybridge/sdram.c
@@ -19,6 +19,7 @@
 #include <rtc.h>
 #include <spi.h>
 #include <spi_flash.h>
+#include <stdio.h>
 #include <syscon.h>
 #include <sysreset.h>
 #include <asm/cpu.h>
diff --git a/arch/x86/cpu/mp_init.c b/arch/x86/cpu/mp_init.c
index 22cd1dbe52a..a32283a7e8a 100644
--- a/arch/x86/cpu/mp_init.c
+++ b/arch/x86/cpu/mp_init.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <qfw.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/atomic.h>
 #include <asm/cpu.h>
diff --git a/arch/x86/cpu/qfw_cpu.c b/arch/x86/cpu/qfw_cpu.c
index 2747cb312c7..cfa70c10e07 100644
--- a/arch/x86/cpu/qfw_cpu.c
+++ b/arch/x86/cpu/qfw_cpu.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <malloc.h>
 #include <qfw.h>
+#include <stdio.h>
 #include <dm/lists.h>
 #include <dm/uclass-internal.h>
 #include <dm/root.h>
diff --git a/arch/x86/lib/acpi_s3.c b/arch/x86/lib/acpi_s3.c
index 244764152b2..06b15825fc1 100644
--- a/arch/x86/lib/acpi_s3.c
+++ b/arch/x86/lib/acpi_s3.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <acpi/acpi_s3.h>
 #include <acpi/acpi_table.h>
 #include <asm/acpi.h>
diff --git a/arch/x86/lib/acpi_table.c b/arch/x86/lib/acpi_table.c
index c6500f62ad8..0d0b8edfcaf 100644
--- a/arch/x86/lib/acpi_table.c
+++ b/arch/x86/lib/acpi_table.c
@@ -10,6 +10,7 @@
 #include <cpu.h>
 #include <dm.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <dm/uclass-internal.h>
 #include <mapmem.h>
diff --git a/arch/x86/lib/bios_interrupts.c b/arch/x86/lib/bios_interrupts.c
index d6b4da7e250..2582ac1b840 100644
--- a/arch/x86/lib/bios_interrupts.c
+++ b/arch/x86/lib/bios_interrupts.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/pci.h>
 #include "bios_emul.h"
 
diff --git a/arch/x86/lib/bootm.c b/arch/x86/lib/bootm.c
index e8d252abcd6..a4bd65d3b7b 100644
--- a/arch/x86/lib/bootm.c
+++ b/arch/x86/lib/bootm.c
@@ -12,6 +12,7 @@
 #include <command.h>
 #include <hang.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <dm/device.h>
diff --git a/arch/x86/lib/fsp/fsp_graphics.c b/arch/x86/lib/fsp/fsp_graphics.c
index 32995e2df60..c5129ff1f30 100644
--- a/arch/x86/lib/fsp/fsp_graphics.c
+++ b/arch/x86/lib/fsp/fsp_graphics.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <vbe.h>
 #include <video.h>
 #include <asm/fsp/fsp_support.h>
diff --git a/arch/x86/lib/fsp2/fsp_meminit.c b/arch/x86/lib/fsp2/fsp_meminit.c
index cef17666c35..451e08223ba 100644
--- a/arch/x86/lib/fsp2/fsp_meminit.c
+++ b/arch/x86/lib/fsp2/fsp_meminit.c
@@ -11,6 +11,7 @@
 #include <bootstage.h>
 #include <dm.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/mrccache.h>
 #include <asm/fsp/fsp_infoheader.h>
diff --git a/arch/x86/lib/interrupts.c b/arch/x86/lib/interrupts.c
index adcaabbd78f..a3fcade2ffd 100644
--- a/arch/x86/lib/interrupts.c
+++ b/arch/x86/lib/interrupts.c
@@ -32,6 +32,7 @@
 #include <common.h>
 #include <command.h>
 #include <irq_func.h>
+#include <stdio.h>
 #include <asm/interrupt.h>
 #include <asm/u-boot.h>
 
diff --git a/arch/x86/lib/mrccache.c b/arch/x86/lib/mrccache.c
index 12c24e1e46f..3582f42733f 100644
--- a/arch/x86/lib/mrccache.c
+++ b/arch/x86/lib/mrccache.c
@@ -15,6 +15,7 @@
 #include <net.h>
 #include <spi.h>
 #include <spi_flash.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/mrccache.h>
 #include <dm/device-internal.h>
diff --git a/arch/x86/lib/pirq_routing.c b/arch/x86/lib/pirq_routing.c
index 8aeba8496a9..d99a90fb826 100644
--- a/arch/x86/lib/pirq_routing.c
+++ b/arch/x86/lib/pirq_routing.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <log.h>
 #include <pci.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/pci.h>
 #include <asm/pirq_routing.h>
diff --git a/arch/x86/lib/pmu.c b/arch/x86/lib/pmu.c
index 3cd7b1f536e..8f2649d9829 100644
--- a/arch/x86/lib/pmu.c
+++ b/arch/x86/lib/pmu.c
@@ -5,6 +5,7 @@
 #include <common.h>
 #include <dm.h>
 #include <regmap.h>
+#include <stdio.h>
 #include <syscon.h>
 #include <asm/cpu.h>
 #include <asm/pmu.h>
diff --git a/arch/x86/lib/relocate.c b/arch/x86/lib/relocate.c
index ffccbf54dfc..8a5082d6f30 100644
--- a/arch/x86/lib/relocate.c
+++ b/arch/x86/lib/relocate.c
@@ -17,6 +17,7 @@
 #include <common.h>
 #include <log.h>
 #include <relocate.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot-x86.h>
 #include <asm/sections.h>
diff --git a/arch/x86/lib/scu.c b/arch/x86/lib/scu.c
index a9d06d82bb4..792b87c2f1b 100644
--- a/arch/x86/lib/scu.c
+++ b/arch/x86/lib/scu.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <dm.h>
 #include <regmap.h>
+#include <stdio.h>
 #include <syscon.h>
 #include <asm/cpu.h>
 #include <asm/scu.h>
diff --git a/arch/x86/lib/spl.c b/arch/x86/lib/spl.c
index 63c29673fef..5e259792af0 100644
--- a/arch/x86/lib/spl.c
+++ b/arch/x86/lib/spl.c
@@ -14,6 +14,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <spl.h>
+#include <stdio.h>
 #include <syscon.h>
 #include <asm/cpu.h>
 #include <asm/cpu_common.h>
diff --git a/arch/x86/lib/tables.c b/arch/x86/lib/tables.c
index e4ed0f4aae1..6c1464f4fa4 100644
--- a/arch/x86/lib/tables.c
+++ b/arch/x86/lib/tables.c
@@ -7,6 +7,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <smbios.h>
+#include <stdio.h>
 #include <acpi/acpi_table.h>
 #include <asm/global_data.h>
 #include <asm/sfi.h>
diff --git a/arch/x86/lib/tpl.c b/arch/x86/lib/tpl.c
index 23e32402db3..91e34eb0799 100644
--- a/arch/x86/lib/tpl.c
+++ b/arch/x86/lib/tpl.c
@@ -11,6 +11,7 @@
 #include <init.h>
 #include <log.h>
 #include <spl.h>
+#include <stdio.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 e7c0ff32120..d467657f879 100644
--- a/arch/x86/lib/zimage.c
+++ b/arch/x86/lib/zimage.c
@@ -17,6 +17,7 @@
 #include <env.h>
 #include <irq_func.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <acpi/acpi_table.h>
 #include <asm/io.h>
 #include <asm/ptrace.h>
diff --git a/arch/xtensa/cpu/cpu.c b/arch/xtensa/cpu/cpu.c
index c7d39b35b37..16f44774a3e 100644
--- a/arch/xtensa/cpu/cpu.c
+++ b/arch/xtensa/cpu/cpu.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <command.h>
 #include <init.h>
+#include <stdio.h>
 #include <vsprintf.h>
 #include <asm/u-boot.h>
 #include <linux/stringify.h>
diff --git a/arch/xtensa/cpu/exceptions.c b/arch/xtensa/cpu/exceptions.c
index cf9af4326a2..7047b1938d2 100644
--- a/arch/xtensa/cpu/exceptions.c
+++ b/arch/xtensa/cpu/exceptions.c
@@ -13,6 +13,7 @@
 #include <common.h>
 #include <command.h>
 #include <irq_func.h>
+#include <stdio.h>
 #include <asm/ptrace.h>
 #include <asm/string.h>
 #include <asm/regs.h>
diff --git a/arch/xtensa/lib/bootm.c b/arch/xtensa/lib/bootm.c
index 61ae0851756..0299534728c 100644
--- a/arch/xtensa/lib/bootm.c
+++ b/arch/xtensa/lib/bootm.c
@@ -9,6 +9,7 @@
 #include <command.h>
 #include <cpu_func.h>
 #include <env.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
diff --git a/board/AndesTech/adp-ae3xx/adp-ae3xx.c b/board/AndesTech/adp-ae3xx/adp-ae3xx.c
index 1c142b80a5a..69611c78832 100644
--- a/board/AndesTech/adp-ae3xx/adp-ae3xx.c
+++ b/board/AndesTech/adp-ae3xx/adp-ae3xx.c
@@ -7,6 +7,7 @@
 
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/mach-types.h>
 #include <common.h>
diff --git a/board/AndesTech/adp-ag101p/adp-ag101p.c b/board/AndesTech/adp-ag101p/adp-ag101p.c
index 97f25fa42ed..9ba4f732223 100644
--- a/board/AndesTech/adp-ag101p/adp-ag101p.c
+++ b/board/AndesTech/adp-ag101p/adp-ag101p.c
@@ -12,6 +12,7 @@
 #if defined(CONFIG_FTMAC100) && !defined(CONFIG_DM_ETH)
 #include <netdev.h>
 #endif
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/io.h>
diff --git a/board/Arcturus/ucp1020/cmd_arc.c b/board/Arcturus/ucp1020/cmd_arc.c
index 99652dde928..2cd51d0aa87 100644
--- a/board/Arcturus/ucp1020/cmd_arc.c
+++ b/board/Arcturus/ucp1020/cmd_arc.c
@@ -17,6 +17,7 @@
 #include <malloc.h>
 #include <spi_flash.h>
 #include <mmc.h>
+#include <stdio.h>
 #include <version.h>
 #include <asm/io.h>
 #include <linux/string.h>
diff --git a/board/Arcturus/ucp1020/ddr.c b/board/Arcturus/ucp1020/ddr.c
index 2fedc10d3f2..ff56fe7df50 100644
--- a/board/Arcturus/ucp1020/ddr.c
+++ b/board/Arcturus/ucp1020/ddr.c
@@ -8,6 +8,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <vsprintf.h>
 #include <asm/mmu.h>
 #include <asm/immap_85xx.h>
diff --git a/board/Arcturus/ucp1020/spl.c b/board/Arcturus/ucp1020/spl.c
index 1f9206aa614..9a6b465bf96 100644
--- a/board/Arcturus/ucp1020/spl.c
+++ b/board/Arcturus/ucp1020/spl.c
@@ -20,6 +20,7 @@
 #include <i2c.h>
 #include <fsl_esdhc.h>
 #include <spi_flash.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
diff --git a/board/Arcturus/ucp1020/spl_minimal.c b/board/Arcturus/ucp1020/spl_minimal.c
index cd0022a73e1..718139688bf 100644
--- a/board/Arcturus/ucp1020/spl_minimal.c
+++ b/board/Arcturus/ucp1020/spl_minimal.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <init.h>
 #include <ns16550.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <nand.h>
 #include <linux/compiler.h>
diff --git a/board/Arcturus/ucp1020/ucp1020.c b/board/Arcturus/ucp1020/ucp1020.c
index 838b7995693..791c91d0e0d 100644
--- a/board/Arcturus/ucp1020/ucp1020.c
+++ b/board/Arcturus/ucp1020/ucp1020.c
@@ -18,6 +18,7 @@
 #include <pci.h>
 #include <i2c.h>
 #include <miiphy.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
diff --git a/board/BuR/brppt1/board.c b/board/BuR/brppt1/board.c
index 9b69baa5dae..2c4feb98ae9 100644
--- a/board/BuR/brppt1/board.c
+++ b/board/BuR/brppt1/board.c
@@ -15,6 +15,7 @@
 #include <errno.h>
 #include <init.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/omap.h>
diff --git a/board/BuR/brppt2/board.c b/board/BuR/brppt2/board.c
index 97605945d1c..be5474832a0 100644
--- a/board/BuR/brppt2/board.c
+++ b/board/BuR/brppt2/board.c
@@ -13,6 +13,7 @@
 #include <spl.h>
 #include <dm.h>
 #include <miiphy.h>
+#include <stdio.h>
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/iomux.h>
diff --git a/board/BuR/brsmarc1/board.c b/board/BuR/brsmarc1/board.c
index c31f40086ad..a069bd4cbf6 100644
--- a/board/BuR/brsmarc1/board.c
+++ b/board/BuR/brsmarc1/board.c
@@ -12,6 +12,7 @@
 #include <errno.h>
 #include <init.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/omap.h>
diff --git a/board/BuR/brxre1/board.c b/board/BuR/brxre1/board.c
index 6ad7bbec490..8a47304bef7 100644
--- a/board/BuR/brxre1/board.c
+++ b/board/BuR/brxre1/board.c
@@ -13,6 +13,7 @@
 #include <errno.h>
 #include <init.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/omap.h>
diff --git a/board/BuR/common/br_resetc.c b/board/BuR/common/br_resetc.c
index 5006687fbf0..6bbea816a0e 100644
--- a/board/BuR/common/br_resetc.c
+++ b/board/BuR/common/br_resetc.c
@@ -9,6 +9,7 @@
 #include <env.h>
 #include <errno.h>
 #include <i2c.h>
+#include <stdio.h>
 #include <dm/uclass.h>
 #include <linux/delay.h>
 #include "br_resetc.h"
diff --git a/board/BuR/common/common.c b/board/BuR/common/common.c
index 377d3f41fe6..b6e763b77fa 100644
--- a/board/BuR/common/common.c
+++ b/board/BuR/common/common.c
@@ -9,6 +9,7 @@
  *
  */
 #include <log.h>
+#include <stdio.h>
 #include <version.h>
 #include <common.h>
 #include <env.h>
diff --git a/board/BuS/eb_cpu5282/eb_cpu5282.c b/board/BuS/eb_cpu5282/eb_cpu5282.c
index fb612c70752..7768aeb59df 100644
--- a/board/BuS/eb_cpu5282/eb_cpu5282.c
+++ b/board/BuS/eb_cpu5282/eb_cpu5282.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/string.h>
 #include "asm/m5282.h"
diff --git a/board/CZ.NIC/turris_mox/turris_mox.c b/board/CZ.NIC/turris_mox/turris_mox.c
index f7f5c117431..f5fcb93262b 100644
--- a/board/CZ.NIC/turris_mox/turris_mox.c
+++ b/board/CZ.NIC/turris_mox/turris_mox.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
 #include <net.h>
diff --git a/board/CZ.NIC/turris_omnia/turris_omnia.c b/board/CZ.NIC/turris_omnia/turris_omnia.c
index 995c01d48cd..783266c29b8 100644
--- a/board/CZ.NIC/turris_omnia/turris_omnia.c
+++ b/board/CZ.NIC/turris_omnia/turris_omnia.c
@@ -15,6 +15,7 @@
 #include <miiphy.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
diff --git a/board/CarMediaLab/flea3/flea3.c b/board/CarMediaLab/flea3/flea3.c
index a5beea9e550..a0322219d43 100644
--- a/board/CarMediaLab/flea3/flea3.c
+++ b/board/CarMediaLab/flea3/flea3.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <env.h>
diff --git a/board/LaCie/common/common.c b/board/LaCie/common/common.c
index 52880a16fad..325bc9b3bf7 100644
--- a/board/LaCie/common/common.c
+++ b/board/LaCie/common/common.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <i2c.h>
 #include <miiphy.h>
+#include <stdio.h>
 
 #if defined(CONFIG_CMD_NET) && defined(CONFIG_RESET_PHY_R)
 
diff --git a/board/LaCie/net2big_v2/net2big_v2.c b/board/LaCie/net2big_v2/net2big_v2.c
index 01d159e19f4..5ad887217c1 100644
--- a/board/LaCie/net2big_v2/net2big_v2.c
+++ b/board/LaCie/net2big_v2/net2big_v2.c
@@ -14,6 +14,7 @@
 #include <i2c.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/mach-types.h>
 #include <asm/arch/cpu.h>
diff --git a/board/Marvell/db-88f6720/db-88f6720.c b/board/Marvell/db-88f6720/db-88f6720.c
index 8f2b0f55b0e..82b7ce568e4 100644
--- a/board/Marvell/db-88f6720/db-88f6720.c
+++ b/board/Marvell/db-88f6720/db-88f6720.c
@@ -8,6 +8,7 @@
 #include <miiphy.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
diff --git a/board/Marvell/db-88f6820-amc/db-88f6820-amc.c b/board/Marvell/db-88f6820-amc/db-88f6820-amc.c
index 948988c788d..62f59ecb728 100644
--- a/board/Marvell/db-88f6820-amc/db-88f6820-amc.c
+++ b/board/Marvell/db-88f6820-amc/db-88f6820-amc.c
@@ -9,6 +9,7 @@
 #include <miiphy.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
diff --git a/board/Marvell/db-88f6820-gp/db-88f6820-gp.c b/board/Marvell/db-88f6820-gp/db-88f6820-gp.c
index 508f007d52e..8fbf78e6d8b 100644
--- a/board/Marvell/db-88f6820-gp/db-88f6820-gp.c
+++ b/board/Marvell/db-88f6820-gp/db-88f6820-gp.c
@@ -9,6 +9,7 @@
 #include <miiphy.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
diff --git a/board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c b/board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c
index 66c308bda54..39a1a52f704 100644
--- a/board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c
+++ b/board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c
@@ -8,6 +8,7 @@
 #include <miiphy.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
diff --git a/board/Marvell/db-xc3-24g4xg/db-xc3-24g4xg.c b/board/Marvell/db-xc3-24g4xg/db-xc3-24g4xg.c
index 8b2bb4f97a5..7ae85585982 100644
--- a/board/Marvell/db-xc3-24g4xg/db-xc3-24g4xg.c
+++ b/board/Marvell/db-xc3-24g4xg/db-xc3-24g4xg.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <i2c.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/u-boot.h>
diff --git a/board/Marvell/dreamplug/dreamplug.c b/board/Marvell/dreamplug/dreamplug.c
index ca07a742eab..8605f5324f4 100644
--- a/board/Marvell/dreamplug/dreamplug.c
+++ b/board/Marvell/dreamplug/dreamplug.c
@@ -12,6 +12,7 @@
 #include <init.h>
 #include <miiphy.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
 #include <asm/arch/mpp.h>
diff --git a/board/Marvell/gplugd/gplugd.c b/board/Marvell/gplugd/gplugd.c
index f8d1b9cc13a..8909fba8837 100644
--- a/board/Marvell/gplugd/gplugd.c
+++ b/board/Marvell/gplugd/gplugd.c
@@ -15,6 +15,7 @@
 #include <init.h>
 #include <log.h>
 #include <mvmfp.h>
+#include <stdio.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/mfp.h>
 #include <asm/arch/armada100.h>
diff --git a/board/Marvell/guruplug/guruplug.c b/board/Marvell/guruplug/guruplug.c
index 2d5118a176e..dba94106f53 100644
--- a/board/Marvell/guruplug/guruplug.c
+++ b/board/Marvell/guruplug/guruplug.c
@@ -9,6 +9,7 @@
 #include <init.h>
 #include <miiphy.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/mach-types.h>
 #include <asm/arch/cpu.h>
diff --git a/board/Marvell/mvebu_armada-37xx/board.c b/board/Marvell/mvebu_armada-37xx/board.c
index 3470f3ac478..0dbb4c2f370 100644
--- a/board/Marvell/mvebu_armada-37xx/board.c
+++ b/board/Marvell/mvebu_armada-37xx/board.c
@@ -8,6 +8,7 @@
 #include <i2c.h>
 #include <init.h>
 #include <phy.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
diff --git a/board/Marvell/mvebu_armada-8k/board.c b/board/Marvell/mvebu_armada-8k/board.c
index 055e639e3c5..1a7f17ed17c 100644
--- a/board/Marvell/mvebu_armada-8k/board.c
+++ b/board/Marvell/mvebu_armada-8k/board.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
diff --git a/board/Marvell/openrd/openrd.c b/board/Marvell/openrd/openrd.c
index 55641922657..a451db9bff8 100644
--- a/board/Marvell/openrd/openrd.c
+++ b/board/Marvell/openrd/openrd.c
@@ -14,6 +14,7 @@
 #include <init.h>
 #include <miiphy.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/mach-types.h>
 #include <asm/arch/cpu.h>
diff --git a/board/Marvell/sheevaplug/sheevaplug.c b/board/Marvell/sheevaplug/sheevaplug.c
index afa23620a31..0211323e679 100644
--- a/board/Marvell/sheevaplug/sheevaplug.c
+++ b/board/Marvell/sheevaplug/sheevaplug.c
@@ -9,6 +9,7 @@
 #include <init.h>
 #include <miiphy.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/mach-types.h>
 #include <asm/arch/cpu.h>
diff --git a/board/Seagate/dockstar/dockstar.c b/board/Seagate/dockstar/dockstar.c
index 45776cf9117..22ef37d567f 100644
--- a/board/Seagate/dockstar/dockstar.c
+++ b/board/Seagate/dockstar/dockstar.c
@@ -13,6 +13,7 @@
 #include <init.h>
 #include <miiphy.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/arch/soc.h>
 #include <asm/arch/mpp.h>
 #include <asm/arch/cpu.h>
diff --git a/board/Seagate/goflexhome/goflexhome.c b/board/Seagate/goflexhome/goflexhome.c
index 8a287ab364b..b11d5becb1f 100644
--- a/board/Seagate/goflexhome/goflexhome.c
+++ b/board/Seagate/goflexhome/goflexhome.c
@@ -16,6 +16,7 @@
 #include <init.h>
 #include <miiphy.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/mach-types.h>
 #include <asm/arch/soc.h>
diff --git a/board/Seagate/nas220/nas220.c b/board/Seagate/nas220/nas220.c
index aac3224a946..b448acfb4b2 100644
--- a/board/Seagate/nas220/nas220.c
+++ b/board/Seagate/nas220/nas220.c
@@ -12,6 +12,7 @@
 #include <init.h>
 #include <miiphy.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/mach-types.h>
 #include <asm/arch/soc.h>
diff --git a/board/Synology/ds109/ds109.c b/board/Synology/ds109/ds109.c
index edadf0441ce..91d6ba52a66 100644
--- a/board/Synology/ds109/ds109.c
+++ b/board/Synology/ds109/ds109.c
@@ -9,6 +9,7 @@
 #include <init.h>
 #include <miiphy.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/setup.h>
 #include <asm/arch/cpu.h>
diff --git a/board/Synology/ds414/cmd_syno.c b/board/Synology/ds414/cmd_syno.c
index 94a56368970..95911a300a7 100644
--- a/board/Synology/ds414/cmd_syno.c
+++ b/board/Synology/ds414/cmd_syno.c
@@ -12,6 +12,7 @@
 #include <net.h>
 #include <spi.h>
 #include <spi_flash.h>
+#include <stdio.h>
 #include <linux/mtd/mtd.h>
 #include <linux/string.h>
 
diff --git a/board/Synology/ds414/ds414.c b/board/Synology/ds414/ds414.c
index 669b53ad5ed..b818c08838f 100644
--- a/board/Synology/ds414/ds414.c
+++ b/board/Synology/ds414/ds414.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <init.h>
 #include <miiphy.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
diff --git a/board/advantech/dms-ba16/dms-ba16.c b/board/advantech/dms-ba16/dms-ba16.c
index 685fd20f423..b59f42c6daf 100644
--- a/board/advantech/dms-ba16/dms-ba16.c
+++ b/board/advantech/dms-ba16/dms-ba16.c
@@ -7,6 +7,7 @@
 
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux.h>
diff --git a/board/advantech/imx8qm_rom7720_a1/imx8qm_rom7720_a1.c b/board/advantech/imx8qm_rom7720_a1/imx8qm_rom7720_a1.c
index 69626bc40f6..a87a8dc07f6 100644
--- a/board/advantech/imx8qm_rom7720_a1/imx8qm_rom7720_a1.c
+++ b/board/advantech/imx8qm_rom7720_a1/imx8qm_rom7720_a1.c
@@ -9,6 +9,7 @@
 #include <env.h>
 #include <errno.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
diff --git a/board/advantech/imx8qm_rom7720_a1/spl.c b/board/advantech/imx8qm_rom7720_a1/spl.c
index 67028b79a1b..4d2f692b294 100644
--- a/board/advantech/imx8qm_rom7720_a1/spl.c
+++ b/board/advantech/imx8qm_rom7720_a1/spl.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <spl.h>
 #include <fsl_esdhc.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
diff --git a/board/alliedtelesis/x530/x530.c b/board/alliedtelesis/x530/x530.c
index aa4e8915882..6f0e82e9558 100644
--- a/board/alliedtelesis/x530/x530.c
+++ b/board/alliedtelesis/x530/x530.c
@@ -9,6 +9,7 @@
 #include <env.h>
 #include <i2c.h>
 #include <init.h>
+#include <stdio.h>
 #include <wdt.h>
 #include <asm/global_data.h>
 #include <asm/gpio.h>
diff --git a/board/aristainetos/aristainetos.c b/board/aristainetos/aristainetos.c
index 4b7694a7e88..70a2489a474 100644
--- a/board/aristainetos/aristainetos.c
+++ b/board/aristainetos/aristainetos.c
@@ -12,6 +12,7 @@
 #include <command.h>
 #include <image.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux.h>
diff --git a/board/armadeus/apf27/apf27.c b/board/armadeus/apf27/apf27.c
index 8f205624496..ed9069f8f12 100644
--- a/board/armadeus/apf27/apf27.c
+++ b/board/armadeus/apf27/apf27.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <hang.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <jffs2/jffs2.h>
diff --git a/board/armadeus/opos6uldev/board.c b/board/armadeus/opos6uldev/board.c
index 365fdca1b76..34c2ce33c92 100644
--- a/board/armadeus/opos6uldev/board.c
+++ b/board/armadeus/opos6uldev/board.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
diff --git a/board/armltd/integrator/integrator.c b/board/armltd/integrator/integrator.c
index ddad2bd80da..a85ac69962b 100644
--- a/board/armltd/integrator/integrator.c
+++ b/board/armltd/integrator/integrator.c
@@ -24,6 +24,7 @@
 #include <init.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/u-boot.h>
diff --git a/board/armltd/vexpress/vexpress_common.c b/board/armltd/vexpress/vexpress_common.c
index d4835191a93..5e0d7464dd8 100644
--- a/board/armltd/vexpress/vexpress_common.c
+++ b/board/armltd/vexpress/vexpress_common.c
@@ -23,6 +23,7 @@
 #include <errno.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/mach-types.h>
diff --git a/board/armltd/vexpress/vexpress_tc2.c b/board/armltd/vexpress/vexpress_tc2.c
index fe5389b4e44..f0bedda24a5 100644
--- a/board/armltd/vexpress/vexpress_tc2.c
+++ b/board/armltd/vexpress/vexpress_tc2.c
@@ -6,6 +6,7 @@
  * TC2 specific code for Versatile Express.
  */
 
+#include <stdio.h>
 #include <asm/armv7.h>
 #include <asm/io.h>
 #include <asm/u-boot.h>
diff --git a/board/armltd/vexpress64/pcie.c b/board/armltd/vexpress64/pcie.c
index 733b190e594..1ad320df3a9 100644
--- a/board/armltd/vexpress64/pcie.c
+++ b/board/armltd/vexpress64/pcie.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <pci_ids.h>
diff --git a/board/armltd/vexpress64/vexpress64.c b/board/armltd/vexpress64/vexpress64.c
index c88482d3cef..2a44828d6e6 100644
--- a/board/armltd/vexpress64/vexpress64.c
+++ b/board/armltd/vexpress64/vexpress64.c
@@ -12,6 +12,7 @@
 #include <errno.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/u-boot.h>
diff --git a/board/astro/mcf5373l/fpga.c b/board/astro/mcf5373l/fpga.c
index ef82f066070..871700ebfe8 100644
--- a/board/astro/mcf5373l/fpga.c
+++ b/board/astro/mcf5373l/fpga.c
@@ -15,6 +15,7 @@
 
 #include <common.h>
 #include <console.h>
+#include <stdio.h>
 #include <watchdog.h>
 #include <altera.h>
 #include <ACEX1K.h>
diff --git a/board/astro/mcf5373l/mcf5373l.c b/board/astro/mcf5373l/mcf5373l.c
index cb336fca046..3eabf924c4a 100644
--- a/board/astro/mcf5373l/mcf5373l.c
+++ b/board/astro/mcf5373l/mcf5373l.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <init.h>
 #include <serial.h>
+#include <stdio.h>
 #include <time.h>
 #include <watchdog.h>
 #include <command.h>
diff --git a/board/atmel/common/board.c b/board/atmel/common/board.c
index c41706c4005..fdf8f43cc79 100644
--- a/board/atmel/common/board.c
+++ b/board/atmel/common/board.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <env.h>
+#include <stdio.h>
 #include <w1.h>
 #include <w1-eeprom.h>
 #include <dm/device-internal.h>
diff --git a/board/bachmann/ot1200/ot1200.c b/board/bachmann/ot1200/ot1200.c
index 0754a599433..6872af6dcd2 100644
--- a/board/bachmann/ot1200/ot1200.c
+++ b/board/bachmann/ot1200/ot1200.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
diff --git a/board/barco/platinum/platinum.c b/board/barco/platinum/platinum.c
index af2b37cbdb1..b98c577fbba 100644
--- a/board/barco/platinum/platinum.c
+++ b/board/barco/platinum/platinum.c
@@ -11,6 +11,7 @@
 #include <miiphy.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
diff --git a/board/barco/titanium/titanium.c b/board/barco/titanium/titanium.c
index fe27965b482..9cd88e2a72d 100644
--- a/board/barco/titanium/titanium.c
+++ b/board/barco/titanium/titanium.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
diff --git a/board/beacon/imx8mm/spl.c b/board/beacon/imx8mm/spl.c
index ed9843ac269..a9a049b66d9 100644
--- a/board/beacon/imx8mm/spl.c
+++ b/board/beacon/imx8mm/spl.c
@@ -6,6 +6,7 @@
 #include <init.h>
 #include <log.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/mach-imx/iomux-v3.h>
diff --git a/board/beckhoff/mx53cx9020/mx53cx9020.c b/board/beckhoff/mx53cx9020/mx53cx9020.c
index 3fbfcb525af..4a8bc4a78dc 100644
--- a/board/beckhoff/mx53cx9020/mx53cx9020.c
+++ b/board/beckhoff/mx53cx9020/mx53cx9020.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/iomux-mx53.h>
diff --git a/board/bluegiga/apx4devkit/apx4devkit.c b/board/bluegiga/apx4devkit/apx4devkit.c
index 0bb752e51bd..93fda9c5b1f 100644
--- a/board/bluegiga/apx4devkit/apx4devkit.c
+++ b/board/bluegiga/apx4devkit/apx4devkit.c
@@ -16,6 +16,7 @@
 #include <common.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.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 706bb6935d2..874d24e22d6 100644
--- a/board/bluewater/gurnard/gurnard.c
+++ b/board/bluewater/gurnard/gurnard.c
@@ -19,6 +19,7 @@
 #ifndef CONFIG_DM_ETH
 #include <netdev.h>
 #endif
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
diff --git a/board/bosch/guardian/board.c b/board/bosch/guardian/board.c
index a397190d434..d9ba7fe653d 100644
--- a/board/bosch/guardian/board.c
+++ b/board/bosch/guardian/board.c
@@ -19,6 +19,7 @@
 #include <led.h>
 #include <miiphy.h>
 #include <panel.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <power/tps65217.h>
diff --git a/board/bosch/shc/board.c b/board/bosch/shc/board.c
index 3b453623826..243a810c420 100644
--- a/board/bosch/shc/board.c
+++ b/board/bosch/shc/board.c
@@ -20,6 +20,7 @@
 #include <irq_func.h>
 #include <net.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/omap.h>
diff --git a/board/bosch/shc/mux.c b/board/bosch/shc/mux.c
index 0a97eafea6c..97cf9c79d82 100644
--- a/board/bosch/shc/mux.c
+++ b/board/bosch/shc/mux.c
@@ -11,6 +11,7 @@
 
 #include <common.h>
 #include <hang.h>
+#include <stdio.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/mux.h>
diff --git a/board/boundary/nitrogen6x/nitrogen6x.c b/board/boundary/nitrogen6x/nitrogen6x.c
index 16b50dac92a..25005a390f5 100644
--- a/board/boundary/nitrogen6x/nitrogen6x.c
+++ b/board/boundary/nitrogen6x/nitrogen6x.c
@@ -9,6 +9,7 @@
 #include <env.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
diff --git a/board/broadcom/bcm23550_w1d/bcm23550_w1d.c b/board/broadcom/bcm23550_w1d/bcm23550_w1d.c
index 0a5ae5718be..4c1694985df 100644
--- a/board/broadcom/bcm23550_w1d/bcm23550_w1d.c
+++ b/board/broadcom/bcm23550_w1d/bcm23550_w1d.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/mach-types.h>
diff --git a/board/broadcom/bcm28155_ap/bcm28155_ap.c b/board/broadcom/bcm28155_ap/bcm28155_ap.c
index 4c097308947..66e7b916f1f 100644
--- a/board/broadcom/bcm28155_ap/bcm28155_ap.c
+++ b/board/broadcom/bcm28155_ap/bcm28155_ap.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/mach-types.h>
diff --git a/board/broadcom/bcm963158/bcm963158.c b/board/broadcom/bcm963158/bcm963158.c
index b2244ad5578..6e22991137d 100644
--- a/board/broadcom/bcm963158/bcm963158.c
+++ b/board/broadcom/bcm963158/bcm963158.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <fdtdec.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 #include <linux/io.h>
 
diff --git a/board/broadcom/bcm968360bg/bcm968360bg.c b/board/broadcom/bcm968360bg/bcm968360bg.c
index 4ed21504be6..5516e6ab4b4 100644
--- a/board/broadcom/bcm968360bg/bcm968360bg.c
+++ b/board/broadcom/bcm968360bg/bcm968360bg.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <fdtdec.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 #include <linux/io.h>
 
diff --git a/board/broadcom/bcm968580xref/bcm968580xref.c b/board/broadcom/bcm968580xref/bcm968580xref.c
index 78ef68db1bf..cd328cbc7f4 100644
--- a/board/broadcom/bcm968580xref/bcm968580xref.c
+++ b/board/broadcom/bcm968580xref/bcm968580xref.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <fdtdec.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 #include <linux/io.h>
 
diff --git a/board/broadcom/bcm_ep/board.c b/board/broadcom/bcm_ep/board.c
index d14bb9e9e01..3776d00b8d8 100644
--- a/board/broadcom/bcm_ep/board.c
+++ b/board/broadcom/bcm_ep/board.c
@@ -7,6 +7,7 @@
 #include <cpu_func.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/board/buffalo/lsxl/lsxl.c b/board/buffalo/lsxl/lsxl.c
index 9eff76527fe..e1670a4265d 100644
--- a/board/buffalo/lsxl/lsxl.c
+++ b/board/buffalo/lsxl/lsxl.c
@@ -20,6 +20,7 @@
 #include <miiphy.h>
 #include <spi.h>
 #include <spi_flash.h>
+#include <stdio.h>
 #include <asm/arch/soc.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/mpp.h>
diff --git a/board/cadence/xtfpga/xtfpga.c b/board/cadence/xtfpga/xtfpga.c
index 0ff90c4f483..227e14ac389 100644
--- a/board/cadence/xtfpga/xtfpga.c
+++ b/board/cadence/xtfpga/xtfpga.c
@@ -8,6 +8,7 @@
 #include <command.h>
 #include <dm.h>
 #include <init.h>
+#include <stdio.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 a60c944089d..9c812e9531f 100644
--- a/board/cavium/thunderx/atf.c
+++ b/board/cavium/thunderx/atf.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <asm/io.h>
 #include <asm/ptrace.h>
diff --git a/board/cavium/thunderx/thunderx.c b/board/cavium/thunderx/thunderx.c
index 18b0f43aa7d..71444324f31 100644
--- a/board/cavium/thunderx/thunderx.c
+++ b/board/cavium/thunderx/thunderx.c
@@ -10,6 +10,7 @@
 #include <malloc.h>
 #include <errno.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/compiler.h>
diff --git a/board/ccv/xpress/xpress.c b/board/ccv/xpress/xpress.c
index 8e23359751a..1edec6158ef 100644
--- a/board/ccv/xpress/xpress.c
+++ b/board/ccv/xpress/xpress.c
@@ -5,6 +5,7 @@
 
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/cirrus/edb93xx/edb93xx.c b/board/cirrus/edb93xx/edb93xx.c
index f2fb24000c8..d33861f229c 100644
--- a/board/cirrus/edb93xx/edb93xx.c
+++ b/board/cirrus/edb93xx/edb93xx.c
@@ -21,6 +21,7 @@
 #include <net.h>
 #include <netdev.h>
 #include <status_led.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/mach-types.h>
diff --git a/board/cloudengines/pogo_e02/pogo_e02.c b/board/cloudengines/pogo_e02/pogo_e02.c
index 66543f2f1b5..631ba5b7af7 100644
--- a/board/cloudengines/pogo_e02/pogo_e02.c
+++ b/board/cloudengines/pogo_e02/pogo_e02.c
@@ -14,6 +14,7 @@
 #include <log.h>
 #include <miiphy.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
 #include <asm/arch/mpp.h>
diff --git a/board/compulab/cl-som-imx7/cl-som-imx7.c b/board/compulab/cl-som-imx7/cl-som-imx7.c
index 46a0fa76473..edb37225e74 100644
--- a/board/compulab/cl-som-imx7/cl-som-imx7.c
+++ b/board/compulab/cl-som-imx7/cl-som-imx7.c
@@ -15,6 +15,7 @@
 #include <phy.h>
 #include <netdev.h>
 #include <fsl_esdhc_imx.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
diff --git a/board/compulab/cl-som-imx7/spl.c b/board/compulab/cl-som-imx7/spl.c
index 18dc86cdc83..d75951615be 100644
--- a/board/compulab/cl-som-imx7/spl.c
+++ b/board/compulab/cl-som-imx7/spl.c
@@ -12,6 +12,7 @@
 #include <init.h>
 #include <spl.h>
 #include <fsl_esdhc_imx.h>
+#include <stdio.h>
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/arch-mx7/mx7-pins.h>
 #include <asm/arch-mx7/clock.h>
diff --git a/board/compulab/cm_fx6/cm_fx6.c b/board/compulab/cm_fx6/cm_fx6.c
index 4147c4f7d02..aeab97d7d20 100644
--- a/board/compulab/cm_fx6/cm_fx6.c
+++ b/board/compulab/cm_fx6/cm_fx6.c
@@ -19,6 +19,7 @@
 #include <net.h>
 #include <netdev.h>
 #include <errno.h>
+#include <stdio.h>
 #include <usb.h>
 #include <fdt_support.h>
 #include <sata.h>
diff --git a/board/compulab/cm_fx6/spl.c b/board/compulab/cm_fx6/spl.c
index ab739330d9c..0dab1cbd60a 100644
--- a/board/compulab/cm_fx6/spl.c
+++ b/board/compulab/cm_fx6/spl.c
@@ -12,6 +12,7 @@
 #include <hang.h>
 #include <init.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
 #include <asm/arch/mx6-ddr.h>
diff --git a/board/compulab/cm_t335/cm_t335.c b/board/compulab/cm_t335/cm_t335.c
index 2a63aadf0d7..26ba6711c93 100644
--- a/board/compulab/cm_t335/cm_t335.c
+++ b/board/compulab/cm_t335/cm_t335.c
@@ -14,6 +14,7 @@
 #include <net.h>
 #include <status_led.h>
 #include <cpsw.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
diff --git a/board/compulab/cm_t335/spl.c b/board/compulab/cm_t335/spl.c
index 8662632a7e3..293323b4b0f 100644
--- a/board/compulab/cm_t335/spl.c
+++ b/board/compulab/cm_t335/spl.c
@@ -14,6 +14,7 @@
 #include <errno.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 
 #include <asm/arch/ddr_defs.h>
 #include <asm/arch/clock.h>
diff --git a/board/compulab/cm_t43/cm_t43.c b/board/compulab/cm_t43/cm_t43.c
index 92c8092d6d7..c035f364310 100644
--- a/board/compulab/cm_t43/cm_t43.c
+++ b/board/compulab/cm_t43/cm_t43.c
@@ -8,6 +8,7 @@
 #include <miiphy.h>
 #include <cpsw.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/arch/sys_proto.h>
diff --git a/board/compulab/common/common.c b/board/compulab/common/common.c
index 528c97df19a..7021e73b082 100644
--- a/board/compulab/common/common.c
+++ b/board/compulab/common/common.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/bootm.h>
 #include <asm/gpio.h>
 #include <asm/setup.h>
diff --git a/board/compulab/common/eeprom.c b/board/compulab/common/eeprom.c
index fa4ab7d6567..94ab9003b35 100644
--- a/board/compulab/common/eeprom.c
+++ b/board/compulab/common/eeprom.c
@@ -11,6 +11,7 @@
 #include <i2c.h>
 #include <eeprom_layout.h>
 #include <eeprom_field.h>
+#include <stdio.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 e1511e82ecc..93ae1c6b086 100644
--- a/board/compulab/common/omap3_display.c
+++ b/board/compulab/common/omap3_display.c
@@ -8,6 +8,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <env.h>
diff --git a/board/compulab/common/omap3_smc911x.c b/board/compulab/common/omap3_smc911x.c
index f0d365272c1..a6a03bc5823 100644
--- a/board/compulab/common/omap3_smc911x.c
+++ b/board/compulab/common/omap3_smc911x.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <linux/delay.h>
 
 #include <asm/io.h>
diff --git a/board/congatec/cgtqmx6eval/cgtqmx6eval.c b/board/congatec/cgtqmx6eval/cgtqmx6eval.c
index 62c53d782e0..c4b3772e835 100644
--- a/board/congatec/cgtqmx6eval/cgtqmx6eval.c
+++ b/board/congatec/cgtqmx6eval/cgtqmx6eval.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
diff --git a/board/congatec/conga-qeval20-qa3-e3845/conga-qeval20-qa3.c b/board/congatec/conga-qeval20-qa3-e3845/conga-qeval20-qa3.c
index df2170ba109..f43a027fa39 100644
--- a/board/congatec/conga-qeval20-qa3-e3845/conga-qeval20-qa3.c
+++ b/board/congatec/conga-qeval20-qa3-e3845/conga-qeval20-qa3.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <i2c.h>
 #include <init.h>
+#include <stdio.h>
 #include <winbond_w83627.h>
 #include <asm/gpio.h>
 #include <asm/ibmpc.h>
diff --git a/board/corscience/tricorder/tricorder-eeprom.c b/board/corscience/tricorder/tricorder-eeprom.c
index 266f43a0058..002daf23f4d 100644
--- a/board/corscience/tricorder/tricorder-eeprom.c
+++ b/board/corscience/tricorder/tricorder-eeprom.c
@@ -9,6 +9,7 @@
 #include <display_options.h>
 #include <eeprom.h>
 #include <i2c.h>
+#include <stdio.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 53495aa187b..8fec67a6912 100644
--- a/board/corscience/tricorder/tricorder.c
+++ b/board/corscience/tricorder/tricorder.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <init.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <twl4030.h>
 #include <status_led.h>
 #include <asm/global_data.h>
diff --git a/board/cortina/presidio-asic/presidio.c b/board/cortina/presidio-asic/presidio.c
index 1c46293ffd5..4fe6251e009 100644
--- a/board/cortina/presidio-asic/presidio.c
+++ b/board/cortina/presidio-asic/presidio.c
@@ -8,6 +8,7 @@
 #include <malloc.h>
 #include <errno.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/u-boot.h>
diff --git a/board/cssi/MCR3000/MCR3000.c b/board/cssi/MCR3000/MCR3000.c
index b9015254234..3bcbfd5a794 100644
--- a/board/cssi/MCR3000/MCR3000.c
+++ b/board/cssi/MCR3000/MCR3000.c
@@ -14,6 +14,7 @@
 #include <mpc8xx.h>
 #include <fdt_support.h>
 #include <serial.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/u-boot.h>
diff --git a/board/d-link/dns325/dns325.c b/board/d-link/dns325/dns325.c
index 9c8f8775ac5..e22235a16da 100644
--- a/board/d-link/dns325/dns325.c
+++ b/board/d-link/dns325/dns325.c
@@ -15,6 +15,7 @@
 #include <miiphy.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
 #include <asm/arch/mpp.h>
diff --git a/board/davinci/da8xxevm/da850evm.c b/board/davinci/da8xxevm/da850evm.c
index 38e51eb23e3..80c317a5a5d 100644
--- a/board/davinci/da8xxevm/da850evm.c
+++ b/board/davinci/da8xxevm/da850evm.c
@@ -16,6 +16,7 @@
 #include <net.h>
 #include <spi.h>
 #include <spi_flash.h>
+#include <stdio.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 347f616df67..7a75494d7f3 100644
--- a/board/davinci/da8xxevm/omapl138_lcdk.c
+++ b/board/davinci/da8xxevm/omapl138_lcdk.c
@@ -13,6 +13,7 @@
 #include <i2c.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.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 8428cc6183b..910285c6a3d 100644
--- a/board/dhelectronics/dh_imx6/dh_imx6.c
+++ b/board/dhelectronics/dh_imx6/dh_imx6.c
@@ -11,6 +11,7 @@
 #include <image.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <dm/device-internal.h>
diff --git a/board/dhelectronics/dh_imx6/dh_imx6_spl.c b/board/dhelectronics/dh_imx6/dh_imx6_spl.c
index bcb39eab886..fdf915fead4 100644
--- a/board/dhelectronics/dh_imx6/dh_imx6_spl.c
+++ b/board/dhelectronics/dh_imx6/dh_imx6_spl.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/dhelectronics/dh_stm32mp1/board.c b/board/dhelectronics/dh_stm32mp1/board.c
index 61c86a2d443..3baa1bea26a 100644
--- a/board/dhelectronics/dh_stm32mp1/board.c
+++ b/board/dhelectronics/dh_stm32mp1/board.c
@@ -7,6 +7,7 @@
 #include <adc.h>
 #include <log.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/arch/stm32.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/global_data.h>
diff --git a/board/egnite/ethernut5/ethernut5_pwrman.c b/board/egnite/ethernut5/ethernut5_pwrman.c
index 56c33bfade4..b91020ec33f 100644
--- a/board/egnite/ethernut5/ethernut5_pwrman.c
+++ b/board/egnite/ethernut5/ethernut5_pwrman.c
@@ -33,6 +33,7 @@
  */
 #include <common.h>
 #include <command.h>
+#include <stdio.h>
 #include <asm/arch/at91sam9260.h>
 #include <asm/arch/at91_common.h>
 #include <asm/arch/gpio.h>
diff --git a/board/el/el6x/el6x.c b/board/el/el6x/el6x.c
index f5c874dcda8..8272e1459d2 100644
--- a/board/el/el6x/el6x.c
+++ b/board/el/el6x/el6x.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux.h>
diff --git a/board/embest/mx6boards/mx6boards.c b/board/embest/mx6boards/mx6boards.c
index 3cd24de612b..6bd0b10a9e1 100644
--- a/board/embest/mx6boards/mx6boards.c
+++ b/board/embest/mx6boards/mx6boards.c
@@ -15,6 +15,7 @@
 #include <common.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/engicam/common/spl.c b/board/engicam/common/spl.c
index 1e3dbbe111e..965123a82c0 100644
--- a/board/engicam/common/spl.c
+++ b/board/engicam/common/spl.c
@@ -10,6 +10,7 @@
 #include <init.h>
 #include <serial.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
diff --git a/board/esd/meesc/meesc.c b/board/esd/meesc/meesc.c
index fe2f9a4d2b1..6ddaed412ed 100644
--- a/board/esd/meesc/meesc.c
+++ b/board/esd/meesc/meesc.c
@@ -14,6 +14,7 @@
 #include <init.h>
 #include <net.h>
 #include <serial.h>
+#include <stdio.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/board/esd/vme8349/caddy.c b/board/esd/vme8349/caddy.c
index fc4855a5bea..6bda7b04073 100644
--- a/board/esd/vme8349/caddy.c
+++ b/board/esd/vme8349/caddy.c
@@ -11,6 +11,7 @@
 #include <console.h>
 #include <ioports.h>
 #include <mpc83xx.h>
+#include <stdio.h>
 #include <asm/mpc8349_pci.h>
 #include <pci.h>
 #include <asm/mmu.h>
diff --git a/board/esd/vme8349/pci.c b/board/esd/vme8349/pci.c
index bf51d39b67c..dea5e1690a2 100644
--- a/board/esd/vme8349/pci.c
+++ b/board/esd/vme8349/pci.c
@@ -11,6 +11,7 @@
  */
 
 #include <init.h>
+#include <stdio.h>
 #include <asm/mmu.h>
 #include <asm/io.h>
 #include <common.h>
diff --git a/board/esd/vme8349/vme8349.c b/board/esd/vme8349/vme8349.c
index 15b1e07d89f..0243e17bbb0 100644
--- a/board/esd/vme8349/vme8349.c
+++ b/board/esd/vme8349/vme8349.c
@@ -17,6 +17,7 @@
 #include <ioports.h>
 #include <mpc83xx.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/mpc8349_pci.h>
 #if defined(CONFIG_OF_LIBFDT)
diff --git a/board/firefly/firefly-rk3308/roc_cc_rk3308.c b/board/firefly/firefly-rk3308/roc_cc_rk3308.c
index 28dcc2a6903..d559fccf2ab 100644
--- a/board/firefly/firefly-rk3308/roc_cc_rk3308.c
+++ b/board/firefly/firefly-rk3308/roc_cc_rk3308.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <adc.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/grf_rk3308.h>
 #include <asm/arch-rockchip/hardware.h>
diff --git a/board/freescale/common/cmd_esbc_validate.c b/board/freescale/common/cmd_esbc_validate.c
index 638aa3c19a4..2190e51c150 100644
--- a/board/freescale/common/cmd_esbc_validate.c
+++ b/board/freescale/common/cmd_esbc_validate.c
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <env.h>
 #include <fsl_validate.h>
+#include <stdio.h>
 
 int do_esbc_halt(struct cmd_tbl *cmdtp, int flag, int argc,
 		 char *const argv[])
diff --git a/board/freescale/common/dcu_sii9022a.c b/board/freescale/common/dcu_sii9022a.c
index 832ae258f14..dc0f27bfe71 100644
--- a/board/freescale/common/dcu_sii9022a.c
+++ b/board/freescale/common/dcu_sii9022a.c
@@ -4,6 +4,7 @@
  * Copyright 2019 NXP
  */
 
+#include <stdio.h>
 #include <asm/io.h>
 #include <common.h>
 #include <fsl_dcu_fb.h>
diff --git a/board/freescale/common/diu_ch7301.c b/board/freescale/common/diu_ch7301.c
index 02a271895bd..cd6264b354f 100644
--- a/board/freescale/common/diu_ch7301.c
+++ b/board/freescale/common/diu_ch7301.c
@@ -10,6 +10,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <stdio_dev.h>
 #include <i2c.h>
 #include <linux/delay.h>
diff --git a/board/freescale/common/emc2305.c b/board/freescale/common/emc2305.c
index 07b2ec06bbc..b8f2bbd2b5a 100644
--- a/board/freescale/common/emc2305.c
+++ b/board/freescale/common/emc2305.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <command.h>
 #include <i2c.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 
diff --git a/board/freescale/common/fsl_chain_of_trust.c b/board/freescale/common/fsl_chain_of_trust.c
index cafb24971b2..7567ea2c1c2 100644
--- a/board/freescale/common/fsl_chain_of_trust.c
+++ b/board/freescale/common/fsl_chain_of_trust.c
@@ -10,6 +10,7 @@
 #include <fsl_secboot_err.h>
 #include <fsl_sfp.h>
 #include <log.h>
+#include <stdio.h>
 #include <dm/root.h>
 
 #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_FRAMEWORK)
diff --git a/board/freescale/common/fsl_validate.c b/board/freescale/common/fsl_validate.c
index 213545e777f..ff6e2bfb34f 100644
--- a/board/freescale/common/fsl_validate.c
+++ b/board/freescale/common/fsl_validate.c
@@ -13,6 +13,7 @@
 #include <command.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <linux/string.h>
 #include <u-boot/rsa-mod-exp.h>
 #include <hash.h>
diff --git a/board/freescale/common/mc34vr500.c b/board/freescale/common/mc34vr500.c
index d6b4c65a3c0..6f485ea233e 100644
--- a/board/freescale/common/mc34vr500.c
+++ b/board/freescale/common/mc34vr500.c
@@ -8,6 +8,7 @@
 #include <errno.h>
 #include <i2c.h>
 #include <log.h>
+#include <stdio.h>
 #include <power/pmic.h>
 #include <power/mc34vr500_pmic.h>
 
diff --git a/board/freescale/common/ngpixis.c b/board/freescale/common/ngpixis.c
index a89b07986bb..5bceb7747d5 100644
--- a/board/freescale/common/ngpixis.c
+++ b/board/freescale/common/ngpixis.c
@@ -31,6 +31,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/string.h>
 
diff --git a/board/freescale/common/pfuze.c b/board/freescale/common/pfuze.c
index 6dca22960bf..af1ee044bb3 100644
--- a/board/freescale/common/pfuze.c
+++ b/board/freescale/common/pfuze.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <errno.h>
+#include <stdio.h>
 #include <power/pmic.h>
 #include <power/pfuze100_pmic.h>
 
diff --git a/board/freescale/common/pixis.c b/board/freescale/common/pixis.c
index 99e8069ad29..6f4f2e6d241 100644
--- a/board/freescale/common/pixis.c
+++ b/board/freescale/common/pixis.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/string.h>
 
diff --git a/board/freescale/common/pq-mds-pib.c b/board/freescale/common/pq-mds-pib.c
index ae660398575..10e1dfe43f9 100644
--- a/board/freescale/common/pq-mds-pib.c
+++ b/board/freescale/common/pq-mds-pib.c
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <i2c.h>
+#include <stdio.h>
 #include <asm/io.h>
 
 #include "pq-mds-pib.h"
diff --git a/board/freescale/common/qixis.c b/board/freescale/common/qixis.c
index 8592b0f0f0a..e1716676a4a 100644
--- a/board/freescale/common/qixis.c
+++ b/board/freescale/common/qixis.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/compiler.h>
 #include <linux/string.h>
diff --git a/board/freescale/common/sys_eeprom.c b/board/freescale/common/sys_eeprom.c
index 566920d5feb..2f1144dcd74 100644
--- a/board/freescale/common/sys_eeprom.c
+++ b/board/freescale/common/sys_eeprom.c
@@ -11,6 +11,7 @@
 #include <env.h>
 #include <i2c.h>
 #include <init.h>
+#include <stdio.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 2d4d9202994..b21fd7a00ae 100644
--- a/board/freescale/common/vid.c
+++ b/board/freescale/common/vid.c
@@ -9,6 +9,7 @@
 #include <i2c.h>
 #include <irq_func.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #ifdef CONFIG_FSL_LSCH2
 #include <asm/arch/immap_lsch2.h>
diff --git a/board/freescale/corenet_ds/corenet_ds.c b/board/freescale/corenet_ds/corenet_ds.c
index 67b47e33e72..a6b93bab4e8 100644
--- a/board/freescale/corenet_ds/corenet_ds.c
+++ b/board/freescale/corenet_ds/corenet_ds.c
@@ -10,6 +10,7 @@
 #include <image.h>
 #include <init.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/compiler.h>
diff --git a/board/freescale/corenet_ds/ddr.c b/board/freescale/corenet_ds/ddr.c
index 4fbbe4b00d0..282346cd45c 100644
--- a/board/freescale/corenet_ds/ddr.c
+++ b/board/freescale/corenet_ds/ddr.c
@@ -8,6 +8,7 @@
 #include <hwconfig.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/mmu.h>
diff --git a/board/freescale/corenet_ds/eth_hydra.c b/board/freescale/corenet_ds/eth_hydra.c
index 71c588c1417..0a31c9e3112 100644
--- a/board/freescale/corenet_ds/eth_hydra.c
+++ b/board/freescale/corenet_ds/eth_hydra.c
@@ -50,6 +50,7 @@
 #include <common.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdio.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 3360e0ffc79..09f9f85f91b 100644
--- a/board/freescale/corenet_ds/eth_p4080.c
+++ b/board/freescale/corenet_ds/eth_p4080.c
@@ -8,6 +8,7 @@
 #include <fdt_support.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdio.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 57fb5a77f06..954f55bdbf6 100644
--- a/board/freescale/corenet_ds/eth_superhydra.c
+++ b/board/freescale/corenet_ds/eth_superhydra.c
@@ -51,6 +51,7 @@
 #include <log.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/fsl_serdes.h>
 #include <fm_eth.h>
 #include <fsl_mdio.h>
diff --git a/board/freescale/imx8mm_evk/spl.c b/board/freescale/imx8mm_evk/spl.c
index 1e366fd8fa6..9296b032b25 100644
--- a/board/freescale/imx8mm_evk/spl.c
+++ b/board/freescale/imx8mm_evk/spl.c
@@ -11,6 +11,7 @@
 #include <init.h>
 #include <log.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/mach-imx/iomux-v3.h>
diff --git a/board/freescale/imx8mn_evk/spl.c b/board/freescale/imx8mn_evk/spl.c
index 3fda215ba4c..2eb2c20071e 100644
--- a/board/freescale/imx8mn_evk/spl.c
+++ b/board/freescale/imx8mn_evk/spl.c
@@ -12,6 +12,7 @@
 #include <init.h>
 #include <log.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/mach-imx/iomux-v3.h>
diff --git a/board/freescale/imx8mp_evk/spl.c b/board/freescale/imx8mp_evk/spl.c
index 8965f623a1f..61988cb6ea1 100644
--- a/board/freescale/imx8mp_evk/spl.c
+++ b/board/freescale/imx8mp_evk/spl.c
@@ -12,6 +12,7 @@
 #include <init.h>
 #include <log.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <errno.h>
diff --git a/board/freescale/imx8mq_evk/spl.c b/board/freescale/imx8mq_evk/spl.c
index d9d1973120b..7316c762a2b 100644
--- a/board/freescale/imx8mq_evk/spl.c
+++ b/board/freescale/imx8mq_evk/spl.c
@@ -10,6 +10,7 @@
 #include <image.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <errno.h>
diff --git a/board/freescale/imx8qm_mek/imx8qm_mek.c b/board/freescale/imx8qm_mek/imx8qm_mek.c
index de9e4f0de41..4f0b0467da0 100644
--- a/board/freescale/imx8qm_mek/imx8qm_mek.c
+++ b/board/freescale/imx8qm_mek/imx8qm_mek.c
@@ -8,6 +8,7 @@
 #include <env.h>
 #include <errno.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/libfdt.h>
diff --git a/board/freescale/imx8qm_mek/spl.c b/board/freescale/imx8qm_mek/spl.c
index 9853c258fe8..b46ddffda06 100644
--- a/board/freescale/imx8qm_mek/spl.c
+++ b/board/freescale/imx8qm_mek/spl.c
@@ -10,6 +10,7 @@
 #include <init.h>
 #include <log.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <dm/uclass.h>
diff --git a/board/freescale/imx8qxp_mek/imx8qxp_mek.c b/board/freescale/imx8qxp_mek/imx8qxp_mek.c
index b6511d4e9df..9b70813281b 100644
--- a/board/freescale/imx8qxp_mek/imx8qxp_mek.c
+++ b/board/freescale/imx8qxp_mek/imx8qxp_mek.c
@@ -8,6 +8,7 @@
 #include <env.h>
 #include <errno.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
diff --git a/board/freescale/imx8qxp_mek/spl.c b/board/freescale/imx8qxp_mek/spl.c
index ac354d396e5..e43393d323b 100644
--- a/board/freescale/imx8qxp_mek/spl.c
+++ b/board/freescale/imx8qxp_mek/spl.c
@@ -10,6 +10,7 @@
 #include <init.h>
 #include <log.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <dm/uclass.h>
diff --git a/board/freescale/ls1012afrdm/eth.c b/board/freescale/ls1012afrdm/eth.c
index eaea1c46e48..c29cb639e3a 100644
--- a/board/freescale/ls1012afrdm/eth.c
+++ b/board/freescale/ls1012afrdm/eth.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <netdev.h>
 #include <fm_eth.h>
diff --git a/board/freescale/ls1012afrdm/ls1012afrdm.c b/board/freescale/ls1012afrdm/ls1012afrdm.c
index c872318b2c8..3100aee2715 100644
--- a/board/freescale/ls1012afrdm/ls1012afrdm.c
+++ b/board/freescale/ls1012afrdm/ls1012afrdm.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <fdt_support.h>
 #include <i2c.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <init.h>
 #include <asm/global_data.h>
diff --git a/board/freescale/ls1012aqds/eth.c b/board/freescale/ls1012aqds/eth.c
index b4ef60738eb..d0d012e67f2 100644
--- a/board/freescale/ls1012aqds/eth.c
+++ b/board/freescale/ls1012aqds/eth.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <netdev.h>
 #include <fm_eth.h>
diff --git a/board/freescale/ls1012aqds/ls1012aqds.c b/board/freescale/ls1012aqds/ls1012aqds.c
index 163d2c41948..50e04204c68 100644
--- a/board/freescale/ls1012aqds/ls1012aqds.c
+++ b/board/freescale/ls1012aqds/ls1012aqds.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <i2c.h>
 #include <fdt_support.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <init.h>
 #include <asm/global_data.h>
diff --git a/board/freescale/ls1012ardb/eth.c b/board/freescale/ls1012ardb/eth.c
index a65ff4dc9c4..7d4d4017e92 100644
--- a/board/freescale/ls1012ardb/eth.c
+++ b/board/freescale/ls1012ardb/eth.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <netdev.h>
 #include <fm_eth.h>
diff --git a/board/freescale/ls1012ardb/ls1012ardb.c b/board/freescale/ls1012ardb/ls1012ardb.c
index 1d3461f2423..278dc2221e4 100644
--- a/board/freescale/ls1012ardb/ls1012ardb.c
+++ b/board/freescale/ls1012ardb/ls1012ardb.c
@@ -8,6 +8,7 @@
 #include <fdt_support.h>
 #include <hang.h>
 #include <i2c.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <init.h>
 #include <asm/global_data.h>
diff --git a/board/freescale/ls1021aiot/dcu.c b/board/freescale/ls1021aiot/dcu.c
index 55706549852..581165100c7 100644
--- a/board/freescale/ls1021aiot/dcu.c
+++ b/board/freescale/ls1021aiot/dcu.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <fsl_dcu_fb.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/string.h>
 #include "div64.h"
diff --git a/board/freescale/ls1021aiot/ls1021aiot.c b/board/freescale/ls1021aiot/ls1021aiot.c
index 0170712c246..09ef96e6bb4 100644
--- a/board/freescale/ls1021aiot/ls1021aiot.c
+++ b/board/freescale/ls1021aiot/ls1021aiot.c
@@ -8,6 +8,7 @@
 #include <fdt_support.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/arch/immap_ls102xa.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/fsl_serdes.h>
diff --git a/board/freescale/ls1021aqds/dcu.c b/board/freescale/ls1021aqds/dcu.c
index 1bfd94bb7a1..7f0ae42e92b 100644
--- a/board/freescale/ls1021aqds/dcu.c
+++ b/board/freescale/ls1021aqds/dcu.c
@@ -6,6 +6,7 @@
  * FSL DCU Framebuffer driver
  */
 
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <common.h>
diff --git a/board/freescale/ls1021aqds/ddr.c b/board/freescale/ls1021aqds/ddr.c
index 8ce2b4e5c01..6d43c8b02e5 100644
--- a/board/freescale/ls1021aqds/ddr.c
+++ b/board/freescale/ls1021aqds/ddr.c
@@ -8,6 +8,7 @@
 #include <fsl_ddr_dimm_params.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
diff --git a/board/freescale/ls1021aqds/eth.c b/board/freescale/ls1021aqds/eth.c
index f9aa2f09fb9..786935b8b33 100644
--- a/board/freescale/ls1021aqds/eth.c
+++ b/board/freescale/ls1021aqds/eth.c
@@ -16,6 +16,7 @@
 #include <common.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/arch/fsl_serdes.h>
 #include <fsl_mdio.h>
 #include <tsec.h>
diff --git a/board/freescale/ls1021aqds/ls1021aqds.c b/board/freescale/ls1021aqds/ls1021aqds.c
index 267af86ccb2..1b7dcf2d33d 100644
--- a/board/freescale/ls1021aqds/ls1021aqds.c
+++ b/board/freescale/ls1021aqds/ls1021aqds.c
@@ -10,6 +10,7 @@
 #include <i2c.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/immap_ls102xa.h>
 #include <asm/arch/clock.h>
diff --git a/board/freescale/ls1021atwr/dcu.c b/board/freescale/ls1021atwr/dcu.c
index b52d297bb96..89b1fb80271 100644
--- a/board/freescale/ls1021atwr/dcu.c
+++ b/board/freescale/ls1021atwr/dcu.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <fsl_dcu_fb.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/string.h>
 #include "div64.h"
diff --git a/board/freescale/ls1021atwr/ls1021atwr.c b/board/freescale/ls1021atwr/ls1021atwr.c
index 8640d2746a2..cf9c171889e 100644
--- a/board/freescale/ls1021atwr/ls1021atwr.c
+++ b/board/freescale/ls1021atwr/ls1021atwr.c
@@ -11,6 +11,7 @@
 #include <i2c.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/immap_ls102xa.h>
diff --git a/board/freescale/ls1028a/ls1028a.c b/board/freescale/ls1028a/ls1028a.c
index de41dd155e6..220d0b0befa 100644
--- a/board/freescale/ls1028a/ls1028a.c
+++ b/board/freescale/ls1028a/ls1028a.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <fsl_ddr.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <hwconfig.h>
diff --git a/board/freescale/ls1043aqds/ddr.c b/board/freescale/ls1043aqds/ddr.c
index 38362d1332a..96d3adfed72 100644
--- a/board/freescale/ls1043aqds/ddr.c
+++ b/board/freescale/ls1043aqds/ddr.c
@@ -10,6 +10,7 @@
 #include <fsl_sleep.h>
 #endif
 #include <log.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
diff --git a/board/freescale/ls1043aqds/eth.c b/board/freescale/ls1043aqds/eth.c
index 68e1642d2d4..ba56512ec96 100644
--- a/board/freescale/ls1043aqds/eth.c
+++ b/board/freescale/ls1043aqds/eth.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <log.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <netdev.h>
 #include <fdt_support.h>
diff --git a/board/freescale/ls1043aqds/ls1043aqds.c b/board/freescale/ls1043aqds/ls1043aqds.c
index 8fc20ea46e7..183fdcf12c3 100644
--- a/board/freescale/ls1043aqds/ls1043aqds.c
+++ b/board/freescale/ls1043aqds/ls1043aqds.c
@@ -10,6 +10,7 @@
 #include <fsl_ddr_sdram.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
diff --git a/board/freescale/ls1043ardb/cpld.c b/board/freescale/ls1043ardb/cpld.c
index 90faa0ba209..c230dcdca5d 100644
--- a/board/freescale/ls1043ardb/cpld.c
+++ b/board/freescale/ls1043ardb/cpld.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/string.h>
 #include "cpld.h"
diff --git a/board/freescale/ls1043ardb/ddr.c b/board/freescale/ls1043ardb/ddr.c
index 73156305b62..1ffde4b246b 100644
--- a/board/freescale/ls1043ardb/ddr.c
+++ b/board/freescale/ls1043ardb/ddr.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
diff --git a/board/freescale/ls1043ardb/eth.c b/board/freescale/ls1043ardb/eth.c
index dde2f376c9a..a89978bbd7d 100644
--- a/board/freescale/ls1043ardb/eth.c
+++ b/board/freescale/ls1043ardb/eth.c
@@ -4,6 +4,7 @@
  */
 #include <common.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <netdev.h>
 #include <fm_eth.h>
diff --git a/board/freescale/ls1043ardb/ls1043ardb.c b/board/freescale/ls1043ardb/ls1043ardb.c
index d9ab32bd2cc..86309266a04 100644
--- a/board/freescale/ls1043ardb/ls1043ardb.c
+++ b/board/freescale/ls1043ardb/ls1043ardb.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <i2c.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
diff --git a/board/freescale/ls1046afrwy/eth.c b/board/freescale/ls1046afrwy/eth.c
index 5797c764dce..278856f56d7 100644
--- a/board/freescale/ls1046afrwy/eth.c
+++ b/board/freescale/ls1046afrwy/eth.c
@@ -5,6 +5,7 @@
 #include <common.h>
 #include <fdt_support.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <netdev.h>
 #include <fm_eth.h>
diff --git a/board/freescale/ls1046afrwy/ls1046afrwy.c b/board/freescale/ls1046afrwy/ls1046afrwy.c
index 4d2d66b6b35..550c901a76b 100644
--- a/board/freescale/ls1046afrwy/ls1046afrwy.c
+++ b/board/freescale/ls1046afrwy/ls1046afrwy.c
@@ -7,6 +7,7 @@
 #include <i2c.h>
 #include <fdt_support.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
diff --git a/board/freescale/ls1046aqds/ddr.c b/board/freescale/ls1046aqds/ddr.c
index 7d13e1d6a8d..90ff767e12c 100644
--- a/board/freescale/ls1046aqds/ddr.c
+++ b/board/freescale/ls1046aqds/ddr.c
@@ -10,6 +10,7 @@
 #include <fsl_sleep.h>
 #endif
 #include <log.h>
+#include <stdio.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 b4ea0239da4..93a41cd4a12 100644
--- a/board/freescale/ls1046aqds/eth.c
+++ b/board/freescale/ls1046aqds/eth.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <log.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <netdev.h>
 #include <fdt_support.h>
diff --git a/board/freescale/ls1046aqds/ls1046aqds.c b/board/freescale/ls1046aqds/ls1046aqds.c
index cb11eb633bb..52266a59436 100644
--- a/board/freescale/ls1046aqds/ls1046aqds.c
+++ b/board/freescale/ls1046aqds/ls1046aqds.c
@@ -9,6 +9,7 @@
 #include <fdt_support.h>
 #include <fsl_ddr_sdram.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
diff --git a/board/freescale/ls1046ardb/cpld.c b/board/freescale/ls1046ardb/cpld.c
index 252b5adaf5e..4182baa4975 100644
--- a/board/freescale/ls1046ardb/cpld.c
+++ b/board/freescale/ls1046ardb/cpld.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/string.h>
 #include "cpld.h"
diff --git a/board/freescale/ls1046ardb/ddr.c b/board/freescale/ls1046ardb/ddr.c
index cb41b6c6707..4128a6962f7 100644
--- a/board/freescale/ls1046ardb/ddr.c
+++ b/board/freescale/ls1046ardb/ddr.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include "ddr.h"
diff --git a/board/freescale/ls1046ardb/eth.c b/board/freescale/ls1046ardb/eth.c
index c0ae35c6e39..6d05c964bd0 100644
--- a/board/freescale/ls1046ardb/eth.c
+++ b/board/freescale/ls1046ardb/eth.c
@@ -5,6 +5,7 @@
 #include <common.h>
 #include <fdt_support.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <netdev.h>
 #include <fm_eth.h>
diff --git a/board/freescale/ls1046ardb/ls1046ardb.c b/board/freescale/ls1046ardb/ls1046ardb.c
index 6a15cdfcd33..ad4caaa5044 100644
--- a/board/freescale/ls1046ardb/ls1046ardb.c
+++ b/board/freescale/ls1046ardb/ls1046ardb.c
@@ -7,6 +7,7 @@
 #include <i2c.h>
 #include <fdt_support.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
diff --git a/board/freescale/ls1088a/ddr.c b/board/freescale/ls1088a/ddr.c
index 9694a6c0e05..8a8e75c8d0f 100644
--- a/board/freescale/ls1088a/ddr.c
+++ b/board/freescale/ls1088a/ddr.c
@@ -7,6 +7,7 @@
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
 #include <log.h>
+#include <stdio.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 de44024173f..f26bbf3267e 100644
--- a/board/freescale/ls1088a/eth_ls1088aqds.c
+++ b/board/freescale/ls1088a/eth_ls1088aqds.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/fsl_serdes.h>
 #include <hwconfig.h>
diff --git a/board/freescale/ls1088a/eth_ls1088ardb.c b/board/freescale/ls1088a/eth_ls1088ardb.c
index 5c5655e549b..6898dfc6f39 100644
--- a/board/freescale/ls1088a/eth_ls1088ardb.c
+++ b/board/freescale/ls1088a/eth_ls1088ardb.c
@@ -12,6 +12,7 @@
 #include <miiphy.h>
 #include <phy.h>
 #include <fm_eth.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <exports.h>
 #include <asm/arch/fsl_serdes.h>
diff --git a/board/freescale/ls1088a/ls1088a.c b/board/freescale/ls1088a/ls1088a.c
index 921fd985bf6..8d33151cdad 100644
--- a/board/freescale/ls1088a/ls1088a.c
+++ b/board/freescale/ls1088a/ls1088a.c
@@ -14,6 +14,7 @@
 #include <fsl_ifc.h>
 #include <fsl_ddr.h>
 #include <fsl_sec.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <fdt_support.h>
diff --git a/board/freescale/ls2080a/ddr.c b/board/freescale/ls2080a/ddr.c
index 87a721fc500..4b42caa989f 100644
--- a/board/freescale/ls2080a/ddr.c
+++ b/board/freescale/ls2080a/ddr.c
@@ -7,6 +7,7 @@
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/arch/soc.h>
 #include <asm/arch/clock.h>
 #include <asm/global_data.h>
diff --git a/board/freescale/ls2080a/ls2080a.c b/board/freescale/ls2080a/ls2080a.c
index d9c87d6840d..b2fb47eaaa5 100644
--- a/board/freescale/ls2080a/ls2080a.c
+++ b/board/freescale/ls2080a/ls2080a.c
@@ -11,6 +11,7 @@
 #include <netdev.h>
 #include <fsl_ifc.h>
 #include <fsl_ddr.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <fdt_support.h>
diff --git a/board/freescale/ls2080aqds/ddr.c b/board/freescale/ls2080aqds/ddr.c
index 5b0f64df6c2..4da5235e052 100644
--- a/board/freescale/ls2080aqds/ddr.c
+++ b/board/freescale/ls2080aqds/ddr.c
@@ -7,6 +7,7 @@
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
 #include <log.h>
+#include <stdio.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 1a3a891f825..2a25cb9f070 100644
--- a/board/freescale/ls2080aqds/eth.c
+++ b/board/freescale/ls2080aqds/eth.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/fsl_serdes.h>
 #include <hwconfig.h>
diff --git a/board/freescale/ls2080aqds/ls2080aqds.c b/board/freescale/ls2080aqds/ls2080aqds.c
index ac4388a1188..39724dcbcba 100644
--- a/board/freescale/ls2080aqds/ls2080aqds.c
+++ b/board/freescale/ls2080aqds/ls2080aqds.c
@@ -11,6 +11,7 @@
 #include <netdev.h>
 #include <fsl_ifc.h>
 #include <fsl_ddr.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <fdt_support.h>
diff --git a/board/freescale/ls2080ardb/ddr.c b/board/freescale/ls2080ardb/ddr.c
index 2d33f662dce..8ebd1ae2378 100644
--- a/board/freescale/ls2080ardb/ddr.c
+++ b/board/freescale/ls2080ardb/ddr.c
@@ -7,6 +7,7 @@
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/arch/soc.h>
 #include <asm/arch/clock.h>
 #include <asm/global_data.h>
diff --git a/board/freescale/ls2080ardb/eth_ls2080rdb.c b/board/freescale/ls2080ardb/eth_ls2080rdb.c
index 786a253cbd5..b4f718b1ae6 100644
--- a/board/freescale/ls2080ardb/eth_ls2080rdb.c
+++ b/board/freescale/ls2080ardb/eth_ls2080rdb.c
@@ -13,6 +13,7 @@
 #include <miiphy.h>
 #include <phy.h>
 #include <fm_eth.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <exports.h>
diff --git a/board/freescale/ls2080ardb/ls2080ardb.c b/board/freescale/ls2080ardb/ls2080ardb.c
index 49304091638..3a154564f3f 100644
--- a/board/freescale/ls2080ardb/ls2080ardb.c
+++ b/board/freescale/ls2080ardb/ls2080ardb.c
@@ -12,6 +12,7 @@
 #include <netdev.h>
 #include <fsl_ifc.h>
 #include <fsl_ddr.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <hwconfig.h>
diff --git a/board/freescale/lx2160a/eth_lx2160aqds.c b/board/freescale/lx2160a/eth_lx2160aqds.c
index 20dffcbf327..5dfe7489ba8 100644
--- a/board/freescale/lx2160a/eth_lx2160aqds.c
+++ b/board/freescale/lx2160a/eth_lx2160aqds.c
@@ -17,6 +17,7 @@
 #include <miiphy.h>
 #include <phy.h>
 #include <fm_eth.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <exports.h>
diff --git a/board/freescale/lx2160a/eth_lx2160ardb.c b/board/freescale/lx2160a/eth_lx2160ardb.c
index 604922f8412..ea2c8c5647a 100644
--- a/board/freescale/lx2160a/eth_lx2160ardb.c
+++ b/board/freescale/lx2160a/eth_lx2160ardb.c
@@ -14,6 +14,7 @@
 #include <miiphy.h>
 #include <phy.h>
 #include <fm_eth.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <exports.h>
diff --git a/board/freescale/lx2160a/lx2160a.c b/board/freescale/lx2160a/lx2160a.c
index 2133177cbe1..31308525641 100644
--- a/board/freescale/lx2160a/lx2160a.c
+++ b/board/freescale/lx2160a/lx2160a.c
@@ -8,6 +8,7 @@
 #include <display_options.h>
 #include <dm.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <dm/platform_data/serial_pl01x.h>
diff --git a/board/freescale/m5208evbe/m5208evbe.c b/board/freescale/m5208evbe/m5208evbe.c
index 7bfb4557dd5..594728a2dd6 100644
--- a/board/freescale/m5208evbe/m5208evbe.c
+++ b/board/freescale/m5208evbe/m5208evbe.c
@@ -10,6 +10,7 @@
 #include <config.h>
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/immap.h>
 #include <asm/io.h>
diff --git a/board/freescale/m52277evb/m52277evb.c b/board/freescale/m52277evb/m52277evb.c
index 510af33e4c3..1ecdfb39312 100644
--- a/board/freescale/m52277evb/m52277evb.c
+++ b/board/freescale/m52277evb/m52277evb.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/immap.h>
 #include <asm/io.h>
diff --git a/board/freescale/m5235evb/m5235evb.c b/board/freescale/m5235evb/m5235evb.c
index e7c7a94036b..6050d5c621d 100644
--- a/board/freescale/m5235evb/m5235evb.c
+++ b/board/freescale/m5235evb/m5235evb.c
@@ -10,6 +10,7 @@
 #include <config.h>
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/immap.h>
 #include <asm/io.h>
diff --git a/board/freescale/m5249evb/m5249evb.c b/board/freescale/m5249evb/m5249evb.c
index 48c00791114..9cb08d85cc7 100644
--- a/board/freescale/m5249evb/m5249evb.c
+++ b/board/freescale/m5249evb/m5249evb.c
@@ -8,6 +8,7 @@
 #include <command.h>
 #include <init.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/immap.h>
 #include <linux/delay.h>
diff --git a/board/freescale/m5253demo/flash.c b/board/freescale/m5253demo/flash.c
index d37ba362b6c..025e9dbcf52 100644
--- a/board/freescale/m5253demo/flash.c
+++ b/board/freescale/m5253demo/flash.c
@@ -11,6 +11,7 @@
 #include <flash.h>
 #include <init.h>
 #include <irq_func.h>
+#include <stdio.h>
 #include <time.h>
 
 #include <asm/immap.h>
diff --git a/board/freescale/m5253demo/m5253demo.c b/board/freescale/m5253demo/m5253demo.c
index f593c31c842..90c79a60f83 100644
--- a/board/freescale/m5253demo/m5253demo.c
+++ b/board/freescale/m5253demo/m5253demo.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/immap.h>
 #include <netdev.h>
diff --git a/board/freescale/m5275evb/m5275evb.c b/board/freescale/m5275evb/m5275evb.c
index 1c4fb7232af..bd0901c0c5d 100644
--- a/board/freescale/m5275evb/m5275evb.c
+++ b/board/freescale/m5275evb/m5275evb.c
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/immap.h>
 #include <asm/io.h>
diff --git a/board/freescale/m53017evb/m53017evb.c b/board/freescale/m53017evb/m53017evb.c
index c9f89353ce4..e1c5dca7004 100644
--- a/board/freescale/m53017evb/m53017evb.c
+++ b/board/freescale/m53017evb/m53017evb.c
@@ -10,6 +10,7 @@
 #include <config.h>
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/immap.h>
 #include <asm/io.h>
diff --git a/board/freescale/m5329evb/m5329evb.c b/board/freescale/m5329evb/m5329evb.c
index 7a75b04dd0d..ccbcbeb342e 100644
--- a/board/freescale/m5329evb/m5329evb.c
+++ b/board/freescale/m5329evb/m5329evb.c
@@ -10,6 +10,7 @@
 #include <config.h>
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/immap.h>
 #include <asm/io.h>
diff --git a/board/freescale/m5373evb/m5373evb.c b/board/freescale/m5373evb/m5373evb.c
index cfa5ca4a477..bd65509ac60 100644
--- a/board/freescale/m5373evb/m5373evb.c
+++ b/board/freescale/m5373evb/m5373evb.c
@@ -10,6 +10,7 @@
 #include <config.h>
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/immap.h>
 #include <asm/io.h>
diff --git a/board/freescale/m54418twr/m54418twr.c b/board/freescale/m54418twr/m54418twr.c
index ca8993197e3..b931b869326 100644
--- a/board/freescale/m54418twr/m54418twr.c
+++ b/board/freescale/m54418twr/m54418twr.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <init.h>
 #include <spi.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/immap.h>
diff --git a/board/freescale/m54451evb/m54451evb.c b/board/freescale/m54451evb/m54451evb.c
index a4ddc69166b..deaf62530a1 100644
--- a/board/freescale/m54451evb/m54451evb.c
+++ b/board/freescale/m54451evb/m54451evb.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <init.h>
 #include <spi.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/immap.h>
 #include <asm/io.h>
diff --git a/board/freescale/m54455evb/m54455evb.c b/board/freescale/m54455evb/m54455evb.c
index c749ee407e7..64ff296ad80 100644
--- a/board/freescale/m54455evb/m54455evb.c
+++ b/board/freescale/m54455evb/m54455evb.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <init.h>
 #include <pci.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/immap.h>
 #include <asm/io.h>
diff --git a/board/freescale/m547xevb/m547xevb.c b/board/freescale/m547xevb/m547xevb.c
index 1568f455e92..255a42baeee 100644
--- a/board/freescale/m547xevb/m547xevb.c
+++ b/board/freescale/m547xevb/m547xevb.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <init.h>
 #include <pci.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/immap.h>
 #include <asm/io.h>
diff --git a/board/freescale/m548xevb/m548xevb.c b/board/freescale/m548xevb/m548xevb.c
index b62355a7ae7..9228ccbb06f 100644
--- a/board/freescale/m548xevb/m548xevb.c
+++ b/board/freescale/m548xevb/m548xevb.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <init.h>
 #include <pci.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/immap.h>
 #include <asm/io.h>
diff --git a/board/freescale/mpc8308rdb/mpc8308rdb.c b/board/freescale/mpc8308rdb/mpc8308rdb.c
index f5ad1dde606..08507351d2f 100644
--- a/board/freescale/mpc8308rdb/mpc8308rdb.c
+++ b/board/freescale/mpc8308rdb/mpc8308rdb.c
@@ -10,6 +10,7 @@
 #include <init.h>
 #include <net.h>
 #include <spi.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
diff --git a/board/freescale/mpc8313erdb/mpc8313erdb.c b/board/freescale/mpc8313erdb/mpc8313erdb.c
index 1bd4b381da3..36297b81a3a 100644
--- a/board/freescale/mpc8313erdb/mpc8313erdb.c
+++ b/board/freescale/mpc8313erdb/mpc8313erdb.c
@@ -14,6 +14,7 @@
 #endif
 #include <pci.h>
 #include <mpc83xx.h>
+#include <stdio.h>
 #include <vsc7385.h>
 #include <ns16550.h>
 #include <nand.h>
diff --git a/board/freescale/mpc8313erdb/sdram.c b/board/freescale/mpc8313erdb/sdram.c
index f146ae5d43c..22de0f6f3bd 100644
--- a/board/freescale/mpc8313erdb/sdram.c
+++ b/board/freescale/mpc8313erdb/sdram.c
@@ -11,6 +11,7 @@
 #include <init.h>
 #include <mpc83xx.h>
 #include <spd_sdram.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
 
diff --git a/board/freescale/mpc8315erdb/mpc8315erdb.c b/board/freescale/mpc8315erdb/mpc8315erdb.c
index 3f9c9b68e21..a4e769934aa 100644
--- a/board/freescale/mpc8315erdb/mpc8315erdb.c
+++ b/board/freescale/mpc8315erdb/mpc8315erdb.c
@@ -11,6 +11,7 @@
 #include <i2c.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
diff --git a/board/freescale/mpc8315erdb/sdram.c b/board/freescale/mpc8315erdb/sdram.c
index ffbb79aaec1..3fc26fefde3 100644
--- a/board/freescale/mpc8315erdb/sdram.c
+++ b/board/freescale/mpc8315erdb/sdram.c
@@ -11,6 +11,7 @@
 #include <init.h>
 #include <mpc83xx.h>
 #include <spd_sdram.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
 
diff --git a/board/freescale/mpc8323erdb/mpc8323erdb.c b/board/freescale/mpc8323erdb/mpc8323erdb.c
index a587796f042..35ca2f1a077 100644
--- a/board/freescale/mpc8323erdb/mpc8323erdb.c
+++ b/board/freescale/mpc8323erdb/mpc8323erdb.c
@@ -19,6 +19,7 @@
 #include <i2c.h>
 #include <miiphy.h>
 #include <command.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
diff --git a/board/freescale/mpc832xemds/mpc832xemds.c b/board/freescale/mpc832xemds/mpc832xemds.c
index e012b2714ab..7686dc5f66e 100644
--- a/board/freescale/mpc832xemds/mpc832xemds.c
+++ b/board/freescale/mpc832xemds/mpc832xemds.c
@@ -16,6 +16,7 @@
 #if defined(CONFIG_PCI)
 #include <pci.h>
 #endif
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/mmu.h>
 #if defined(CONFIG_OF_LIBFDT)
diff --git a/board/freescale/mpc832xemds/pci.c b/board/freescale/mpc832xemds/pci.c
index 944108f6319..04b5a11e9fd 100644
--- a/board/freescale/mpc832xemds/pci.c
+++ b/board/freescale/mpc832xemds/pci.c
@@ -7,6 +7,7 @@
  * PCI Configuration space access support for MPC83xx PCI Bridge
  */
 #include <init.h>
+#include <stdio.h>
 #include <asm/mmu.h>
 #include <asm/io.h>
 #include <common.h>
diff --git a/board/freescale/mpc8349emds/ddr.c b/board/freescale/mpc8349emds/ddr.c
index 75175fb0ca9..beeb508771b 100644
--- a/board/freescale/mpc8349emds/ddr.c
+++ b/board/freescale/mpc8349emds/ddr.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 
 #include <fsl_ddr_sdram.h>
diff --git a/board/freescale/mpc8349emds/mpc8349emds.c b/board/freescale/mpc8349emds/mpc8349emds.c
index bf113280bec..43a6e59bd35 100644
--- a/board/freescale/mpc8349emds/mpc8349emds.c
+++ b/board/freescale/mpc8349emds/mpc8349emds.c
@@ -9,6 +9,7 @@
 #include <init.h>
 #include <ioports.h>
 #include <mpc83xx.h>
+#include <stdio.h>
 #include <asm/bitops.h>
 #include <asm/global_data.h>
 #include <asm/mpc8349_pci.h>
diff --git a/board/freescale/mpc8349emds/pci.c b/board/freescale/mpc8349emds/pci.c
index 3ddbe717756..254ed2a79d1 100644
--- a/board/freescale/mpc8349emds/pci.c
+++ b/board/freescale/mpc8349emds/pci.c
@@ -4,6 +4,7 @@
  */
 
 #include <init.h>
+#include <stdio.h>
 #include <asm/mmu.h>
 #include <asm/io.h>
 #include <common.h>
diff --git a/board/freescale/mpc8349itx/mpc8349itx.c b/board/freescale/mpc8349itx/mpc8349itx.c
index 14e08f033a5..fae6a7c9648 100644
--- a/board/freescale/mpc8349itx/mpc8349itx.c
+++ b/board/freescale/mpc8349itx/mpc8349itx.c
@@ -11,6 +11,7 @@
 #include <mpc83xx.h>
 #include <i2c.h>
 #include <miiphy.h>
+#include <stdio.h>
 #include <vsc7385.h>
 #ifdef CONFIG_PCI
 #include <asm/mpc8349_pci.h>
diff --git a/board/freescale/mpc837xemds/mpc837xemds.c b/board/freescale/mpc837xemds/mpc837xemds.c
index 699aa4a5bf8..58eeb2910bf 100644
--- a/board/freescale/mpc837xemds/mpc837xemds.c
+++ b/board/freescale/mpc837xemds/mpc837xemds.c
@@ -9,6 +9,7 @@
 #include <i2c.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/bitops.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/board/freescale/mpc837xerdb/mpc837xerdb.c b/board/freescale/mpc837xerdb/mpc837xerdb.c
index d3cc5274537..8b70109f5d0 100644
--- a/board/freescale/mpc837xerdb/mpc837xerdb.c
+++ b/board/freescale/mpc837xerdb/mpc837xerdb.c
@@ -10,6 +10,7 @@
 #include <hwconfig.h>
 #include <i2c.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/bitops.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/board/freescale/mpc8541cds/mpc8541cds.c b/board/freescale/mpc8541cds/mpc8541cds.c
index 6f02b8e7b8f..ed71fa4d384 100644
--- a/board/freescale/mpc8541cds/mpc8541cds.c
+++ b/board/freescale/mpc8541cds/mpc8541cds.c
@@ -9,6 +9,7 @@
 #include <display_options.h>
 #include <init.h>
 #include <pci.h>
+#include <stdio.h>
 #include <vsprintf.h>
 #include <asm/processor.h>
 #include <asm/mmu.h>
diff --git a/board/freescale/mpc8544ds/mpc8544ds.c b/board/freescale/mpc8544ds/mpc8544ds.c
index 06dc619cf93..a495e081800 100644
--- a/board/freescale/mpc8544ds/mpc8544ds.c
+++ b/board/freescale/mpc8544ds/mpc8544ds.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <net.h>
 #include <pci.h>
+#include <stdio.h>
 #include <asm/processor.h>
 #include <asm/mmu.h>
 #include <asm/immap_85xx.h>
diff --git a/board/freescale/mpc8548cds/mpc8548cds.c b/board/freescale/mpc8548cds/mpc8548cds.c
index 941071594bd..08ac02b4923 100644
--- a/board/freescale/mpc8548cds/mpc8548cds.c
+++ b/board/freescale/mpc8548cds/mpc8548cds.c
@@ -10,6 +10,7 @@
 #include <init.h>
 #include <net.h>
 #include <pci.h>
+#include <stdio.h>
 #include <vsprintf.h>
 #include <asm/processor.h>
 #include <asm/mmu.h>
diff --git a/board/freescale/mpc8555cds/mpc8555cds.c b/board/freescale/mpc8555cds/mpc8555cds.c
index d66f5699666..e3c96ae162f 100644
--- a/board/freescale/mpc8555cds/mpc8555cds.c
+++ b/board/freescale/mpc8555cds/mpc8555cds.c
@@ -7,6 +7,7 @@
 #include <display_options.h>
 #include <init.h>
 #include <pci.h>
+#include <stdio.h>
 #include <vsprintf.h>
 #include <asm/processor.h>
 #include <asm/mmu.h>
diff --git a/board/freescale/mpc8568mds/mpc8568mds.c b/board/freescale/mpc8568mds/mpc8568mds.c
index 810bcff8b6b..8ea51e1f236 100644
--- a/board/freescale/mpc8568mds/mpc8568mds.c
+++ b/board/freescale/mpc8568mds/mpc8568mds.c
@@ -11,6 +11,7 @@
 #include <init.h>
 #include <log.h>
 #include <pci.h>
+#include <stdio.h>
 #include <asm/processor.h>
 #include <asm/mmu.h>
 #include <asm/immap_85xx.h>
diff --git a/board/freescale/mpc8569mds/mpc8569mds.c b/board/freescale/mpc8569mds/mpc8569mds.c
index 7f00ddc82a1..012fd54c3fe 100644
--- a/board/freescale/mpc8569mds/mpc8569mds.c
+++ b/board/freescale/mpc8569mds/mpc8569mds.c
@@ -12,6 +12,7 @@
 #include <init.h>
 #include <log.h>
 #include <pci.h>
+#include <stdio.h>
 #include <asm/processor.h>
 #include <asm/mmu.h>
 #include <asm/cache.h>
diff --git a/board/freescale/mpc8572ds/ddr.c b/board/freescale/mpc8572ds/ddr.c
index 886cabf6324..64f81261678 100644
--- a/board/freescale/mpc8572ds/ddr.c
+++ b/board/freescale/mpc8572ds/ddr.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 
 #include <fsl_ddr_sdram.h>
diff --git a/board/freescale/mpc8572ds/mpc8572ds.c b/board/freescale/mpc8572ds/mpc8572ds.c
index d81a3308359..c62862f1db0 100644
--- a/board/freescale/mpc8572ds/mpc8572ds.c
+++ b/board/freescale/mpc8572ds/mpc8572ds.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <net.h>
 #include <pci.h>
+#include <stdio.h>
 #include <asm/processor.h>
 #include <asm/mmu.h>
 #include <asm/cache.h>
diff --git a/board/freescale/mpc8610hpcd/mpc8610hpcd.c b/board/freescale/mpc8610hpcd/mpc8610hpcd.c
index 157f850fef5..d696e23bc53 100644
--- a/board/freescale/mpc8610hpcd/mpc8610hpcd.c
+++ b/board/freescale/mpc8610hpcd/mpc8610hpcd.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <net.h>
 #include <pci.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/processor.h>
 #include <asm/immap_86xx.h>
diff --git a/board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c b/board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c
index fd182fe8717..cabb8bab335 100644
--- a/board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c
+++ b/board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c
@@ -11,6 +11,7 @@
 #include <clock_legacy.h>
 #include <command.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <fsl_diu_fb.h>
 #include <asm/u-boot.h>
diff --git a/board/freescale/mpc8641hpcn/ddr.c b/board/freescale/mpc8641hpcn/ddr.c
index f2dccadd3d1..5c1232e3534 100644
--- a/board/freescale/mpc8641hpcn/ddr.c
+++ b/board/freescale/mpc8641hpcn/ddr.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 
 #include <fsl_ddr_sdram.h>
diff --git a/board/freescale/mpc8641hpcn/mpc8641hpcn.c b/board/freescale/mpc8641hpcn/mpc8641hpcn.c
index c4a7a568cd1..209c354dda4 100644
--- a/board/freescale/mpc8641hpcn/mpc8641hpcn.c
+++ b/board/freescale/mpc8641hpcn/mpc8641hpcn.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <net.h>
 #include <pci.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/processor.h>
 #include <asm/immap_86xx.h>
diff --git a/board/freescale/mx23evk/mx23evk.c b/board/freescale/mx23evk/mx23evk.c
index b25bdb38601..96f2de11245 100644
--- a/board/freescale/mx23evk/mx23evk.c
+++ b/board/freescale/mx23evk/mx23evk.c
@@ -13,6 +13,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/freescale/mx25pdk/mx25pdk.c b/board/freescale/mx25pdk/mx25pdk.c
index 4c2f6da69c2..8e0edb45c3e 100644
--- a/board/freescale/mx25pdk/mx25pdk.c
+++ b/board/freescale/mx25pdk/mx25pdk.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
diff --git a/board/freescale/mx28evk/mx28evk.c b/board/freescale/mx28evk/mx28evk.c
index 72abf8739bc..8ff35fbd02b 100644
--- a/board/freescale/mx28evk/mx28evk.c
+++ b/board/freescale/mx28evk/mx28evk.c
@@ -14,6 +14,7 @@
 #include <common.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
diff --git a/board/freescale/mx35pdk/mx35pdk.c b/board/freescale/mx35pdk/mx35pdk.c
index 362a0391e4f..940ada7b167 100644
--- a/board/freescale/mx35pdk/mx35pdk.c
+++ b/board/freescale/mx35pdk/mx35pdk.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/u-boot.h>
diff --git a/board/freescale/mx51evk/mx51evk.c b/board/freescale/mx51evk/mx51evk.c
index f1625ebac5c..0a656179901 100644
--- a/board/freescale/mx51evk/mx51evk.c
+++ b/board/freescale/mx51evk/mx51evk.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
diff --git a/board/freescale/mx51evk/mx51evk_video.c b/board/freescale/mx51evk/mx51evk_video.c
index 2aa456f1c5f..06fd4140a2e 100644
--- a/board/freescale/mx51evk/mx51evk_video.c
+++ b/board/freescale/mx51evk/mx51evk_video.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <env.h>
+#include <stdio.h>
 #include <linux/list.h>
 #include <asm/gpio.h>
 #include <asm/arch/iomux-mx51.h>
diff --git a/board/freescale/mx53ard/mx53ard.c b/board/freescale/mx53ard/mx53ard.c
index 89aa16a097b..cb4f063e95a 100644
--- a/board/freescale/mx53ard/mx53ard.c
+++ b/board/freescale/mx53ard/mx53ard.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/freescale/mx53evk/mx53evk.c b/board/freescale/mx53evk/mx53evk.c
index 5567f3f01a9..37a94605408 100644
--- a/board/freescale/mx53evk/mx53evk.c
+++ b/board/freescale/mx53evk/mx53evk.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/freescale/mx53loco/mx53loco.c b/board/freescale/mx53loco/mx53loco.c
index 7a1cebbebfd..67bb279104d 100644
--- a/board/freescale/mx53loco/mx53loco.c
+++ b/board/freescale/mx53loco/mx53loco.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/freescale/mx53loco/mx53loco_video.c b/board/freescale/mx53loco/mx53loco_video.c
index 67c279adf18..45a40a8959c 100644
--- a/board/freescale/mx53loco/mx53loco_video.c
+++ b/board/freescale/mx53loco/mx53loco_video.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <env.h>
+#include <stdio.h>
 #include <linux/list.h>
 #include <asm/gpio.h>
 #include <asm/arch/iomux-mx53.h>
diff --git a/board/freescale/mx53smd/mx53smd.c b/board/freescale/mx53smd/mx53smd.c
index 335146604a5..6a654934140 100644
--- a/board/freescale/mx53smd/mx53smd.c
+++ b/board/freescale/mx53smd/mx53smd.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/freescale/mx6memcal/mx6memcal.c b/board/freescale/mx6memcal/mx6memcal.c
index 35dc7fd15f2..728b17fb640 100644
--- a/board/freescale/mx6memcal/mx6memcal.c
+++ b/board/freescale/mx6memcal/mx6memcal.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
diff --git a/board/freescale/mx6memcal/spl.c b/board/freescale/mx6memcal/spl.c
index 63f4f531b86..b7dd87abacb 100644
--- a/board/freescale/mx6memcal/spl.c
+++ b/board/freescale/mx6memcal/spl.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/iomux.h>
diff --git a/board/freescale/mx6qarm2/mx6qarm2.c b/board/freescale/mx6qarm2/mx6qarm2.c
index 03cceefb60d..bdc2e2a146b 100644
--- a/board/freescale/mx6qarm2/mx6qarm2.c
+++ b/board/freescale/mx6qarm2/mx6qarm2.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/freescale/mx6sabreauto/mx6sabreauto.c b/board/freescale/mx6sabreauto/mx6sabreauto.c
index 98b3ab4b765..359f5bca17c 100644
--- a/board/freescale/mx6sabreauto/mx6sabreauto.c
+++ b/board/freescale/mx6sabreauto/mx6sabreauto.c
@@ -9,6 +9,7 @@
 #include <image.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
diff --git a/board/freescale/mx6sabresd/mx6sabresd.c b/board/freescale/mx6sabresd/mx6sabresd.c
index 40423d77c4b..01d6340c624 100644
--- a/board/freescale/mx6sabresd/mx6sabresd.c
+++ b/board/freescale/mx6sabresd/mx6sabresd.c
@@ -8,6 +8,7 @@
 #include <image.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux.h>
diff --git a/board/freescale/mx6slevk/mx6slevk.c b/board/freescale/mx6slevk/mx6slevk.c
index 781c5392655..5e6072dd424 100644
--- a/board/freescale/mx6slevk/mx6slevk.c
+++ b/board/freescale/mx6slevk/mx6slevk.c
@@ -7,6 +7,7 @@
 
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/crm_regs.h>
diff --git a/board/freescale/mx6sllevk/mx6sllevk.c b/board/freescale/mx6sllevk/mx6sllevk.c
index 9ce66e42899..cfb1fe2103e 100644
--- a/board/freescale/mx6sllevk/mx6sllevk.c
+++ b/board/freescale/mx6sllevk/mx6sllevk.c
@@ -4,6 +4,7 @@
  */
 
 #include <init.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/iomux.h>
diff --git a/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c b/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c
index f705505b518..d5621c5e042 100644
--- a/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c
+++ b/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c
@@ -7,6 +7,7 @@
 
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/iomux.h>
diff --git a/board/freescale/mx6sxsabresd/mx6sxsabresd.c b/board/freescale/mx6sxsabresd/mx6sxsabresd.c
index d8f4e915cfd..361c3c2c517 100644
--- a/board/freescale/mx6sxsabresd/mx6sxsabresd.c
+++ b/board/freescale/mx6sxsabresd/mx6sxsabresd.c
@@ -7,6 +7,7 @@
 
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/iomux.h>
diff --git a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
index 6805d949f17..bb6c2474abd 100644
--- a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
+++ b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
@@ -5,6 +5,7 @@
 
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/freescale/mx6ullevk/mx6ullevk.c b/board/freescale/mx6ullevk/mx6ullevk.c
index 4686981e44c..272348e2423 100644
--- a/board/freescale/mx6ullevk/mx6ullevk.c
+++ b/board/freescale/mx6ullevk/mx6ullevk.c
@@ -4,6 +4,7 @@
  */
 
 #include <init.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/freescale/mx7dsabresd/mx7dsabresd.c b/board/freescale/mx7dsabresd/mx7dsabresd.c
index d3cdfd85894..bcd30668b5d 100644
--- a/board/freescale/mx7dsabresd/mx7dsabresd.c
+++ b/board/freescale/mx7dsabresd/mx7dsabresd.c
@@ -5,6 +5,7 @@
 
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/mx7-pins.h>
diff --git a/board/freescale/mx7ulp_evk/mx7ulp_evk.c b/board/freescale/mx7ulp_evk/mx7ulp_evk.c
index 1e4053edbe7..da3f9e72d61 100644
--- a/board/freescale/mx7ulp_evk/mx7ulp_evk.c
+++ b/board/freescale/mx7ulp_evk/mx7ulp_evk.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <fdt_support.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
diff --git a/board/freescale/p1010rdb/ddr.c b/board/freescale/p1010rdb/ddr.c
index 2e2a524b0e2..38c274275bf 100644
--- a/board/freescale/p1010rdb/ddr.c
+++ b/board/freescale/p1010rdb/ddr.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/mmu.h>
diff --git a/board/freescale/p1010rdb/p1010rdb.c b/board/freescale/p1010rdb/p1010rdb.c
index f209f72fdbe..a57b564f5ef 100644
--- a/board/freescale/p1010rdb/p1010rdb.c
+++ b/board/freescale/p1010rdb/p1010rdb.c
@@ -9,6 +9,7 @@
 #include <image.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/processor.h>
 #include <asm/mmu.h>
diff --git a/board/freescale/p1010rdb/spl.c b/board/freescale/p1010rdb/spl.c
index 3e35b49f3d2..a11ec6b0c98 100644
--- a/board/freescale/p1010rdb/spl.c
+++ b/board/freescale/p1010rdb/spl.c
@@ -15,6 +15,7 @@
 #include <i2c.h>
 #include <fsl_esdhc.h>
 #include <spi_flash.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
diff --git a/board/freescale/p1010rdb/spl_minimal.c b/board/freescale/p1010rdb/spl_minimal.c
index 0bb2c838720..4d72665dbb7 100644
--- a/board/freescale/p1010rdb/spl_minimal.c
+++ b/board/freescale/p1010rdb/spl_minimal.c
@@ -5,6 +5,7 @@
 #include <common.h>
 #include <init.h>
 #include <mpc85xx.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <ns16550.h>
 #include <nand.h>
diff --git a/board/freescale/p1023rdb/p1023rdb.c b/board/freescale/p1023rdb/p1023rdb.c
index c760b4c83bd..e7862d18498 100644
--- a/board/freescale/p1023rdb/p1023rdb.c
+++ b/board/freescale/p1023rdb/p1023rdb.c
@@ -13,6 +13,7 @@
 #include <init.h>
 #include <net.h>
 #include <pci.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/cache.h>
diff --git a/board/freescale/p1_p2_rdb_pc/ddr.c b/board/freescale/p1_p2_rdb_pc/ddr.c
index 87c78886e14..90ce75a70e3 100644
--- a/board/freescale/p1_p2_rdb_pc/ddr.c
+++ b/board/freescale/p1_p2_rdb_pc/ddr.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <vsprintf.h>
 #include <asm/mmu.h>
 #include <asm/immap_85xx.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 f4ab4492536..648ff4c3e79 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
@@ -14,6 +14,7 @@
 #include <net.h>
 #include <pci.h>
 #include <i2c.h>
+#include <stdio.h>
 #include <asm/processor.h>
 #include <asm/mmu.h>
 #include <asm/cache.h>
diff --git a/board/freescale/p1_p2_rdb_pc/spl.c b/board/freescale/p1_p2_rdb_pc/spl.c
index 9b687bc4c08..f69f7fced31 100644
--- a/board/freescale/p1_p2_rdb_pc/spl.c
+++ b/board/freescale/p1_p2_rdb_pc/spl.c
@@ -16,6 +16,7 @@
 #include <i2c.h>
 #include <fsl_esdhc.h>
 #include <spi_flash.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
diff --git a/board/freescale/p1_p2_rdb_pc/spl_minimal.c b/board/freescale/p1_p2_rdb_pc/spl_minimal.c
index ced5f3c3b5d..3079e21d1c1 100644
--- a/board/freescale/p1_p2_rdb_pc/spl_minimal.c
+++ b/board/freescale/p1_p2_rdb_pc/spl_minimal.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <init.h>
 #include <ns16550.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <nand.h>
 #include <linux/compiler.h>
diff --git a/board/freescale/p2041rdb/cpld.c b/board/freescale/p2041rdb/cpld.c
index 84f1b3c7710..256cdc68424 100644
--- a/board/freescale/p2041rdb/cpld.c
+++ b/board/freescale/p2041rdb/cpld.c
@@ -13,6 +13,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/string.h>
 
diff --git a/board/freescale/p2041rdb/ddr.c b/board/freescale/p2041rdb/ddr.c
index 281368bfc8a..bb54f6d5b0a 100644
--- a/board/freescale/p2041rdb/ddr.c
+++ b/board/freescale/p2041rdb/ddr.c
@@ -8,6 +8,7 @@
 #include <hwconfig.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.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 a4936531120..0faa288f003 100644
--- a/board/freescale/p2041rdb/eth.c
+++ b/board/freescale/p2041rdb/eth.c
@@ -15,6 +15,7 @@
 #include <common.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/fsl_serdes.h>
 #include <fm_eth.h>
 #include <fsl_mdio.h>
diff --git a/board/freescale/p2041rdb/p2041rdb.c b/board/freescale/p2041rdb/p2041rdb.c
index 2f8e9c12551..ca2a8eb9597 100644
--- a/board/freescale/p2041rdb/p2041rdb.c
+++ b/board/freescale/p2041rdb/p2041rdb.c
@@ -10,6 +10,7 @@
 #include <image.h>
 #include <init.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/compiler.h>
diff --git a/board/freescale/qemu-ppce500/qemu-ppce500.c b/board/freescale/qemu-ppce500/qemu-ppce500.c
index c99f998fbb3..6588804fbba 100644
--- a/board/freescale/qemu-ppce500/qemu-ppce500.c
+++ b/board/freescale/qemu-ppce500/qemu-ppce500.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <net.h>
 #include <pci.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/global_data.h>
 #include <asm/processor.h>
diff --git a/board/freescale/s32v234evb/s32v234evb.c b/board/freescale/s32v234evb/s32v234evb.c
index 846a89849f0..4f390aa0de5 100644
--- a/board/freescale/s32v234evb/s32v234evb.c
+++ b/board/freescale/s32v234evb/s32v234evb.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/freescale/t102xrdb/cpld.c b/board/freescale/t102xrdb/cpld.c
index 5dc3e54bbc3..601afbc336d 100644
--- a/board/freescale/t102xrdb/cpld.c
+++ b/board/freescale/t102xrdb/cpld.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/string.h>
 #include "cpld.h"
diff --git a/board/freescale/t102xrdb/ddr.c b/board/freescale/t102xrdb/ddr.c
index f62f5d12405..6b5b5181e67 100644
--- a/board/freescale/t102xrdb/ddr.c
+++ b/board/freescale/t102xrdb/ddr.c
@@ -8,6 +8,7 @@
 #include <hwconfig.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/mmu.h>
 #include <fsl_ddr_sdram.h>
diff --git a/board/freescale/t102xrdb/eth_t102xrdb.c b/board/freescale/t102xrdb/eth_t102xrdb.c
index 414a45f2c0a..95d49e26f44 100644
--- a/board/freescale/t102xrdb/eth_t102xrdb.c
+++ b/board/freescale/t102xrdb/eth_t102xrdb.c
@@ -10,6 +10,7 @@
 #include <fdt_support.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/mmu.h>
 #include <asm/processor.h>
 #include <asm/immap_85xx.h>
diff --git a/board/freescale/t102xrdb/spl.c b/board/freescale/t102xrdb/spl.c
index 6596f2cfafe..1d8da111668 100644
--- a/board/freescale/t102xrdb/spl.c
+++ b/board/freescale/t102xrdb/spl.c
@@ -14,6 +14,7 @@
 #include <mmc.h>
 #include <fsl_esdhc.h>
 #include <spi_flash.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
diff --git a/board/freescale/t102xrdb/t102xrdb.c b/board/freescale/t102xrdb/t102xrdb.c
index 5f98f768cc3..cdecfb08706 100644
--- a/board/freescale/t102xrdb/t102xrdb.c
+++ b/board/freescale/t102xrdb/t102xrdb.c
@@ -12,6 +12,7 @@
 #include <image.h>
 #include <init.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/compiler.h>
diff --git a/board/freescale/t104xrdb/cpld.c b/board/freescale/t104xrdb/cpld.c
index 6ab7bbdd332..c2dfb17a1cf 100644
--- a/board/freescale/t104xrdb/cpld.c
+++ b/board/freescale/t104xrdb/cpld.c
@@ -12,6 +12,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/string.h>
 
diff --git a/board/freescale/t104xrdb/ddr.c b/board/freescale/t104xrdb/ddr.c
index 2198acfba61..8f2b92bd55d 100644
--- a/board/freescale/t104xrdb/ddr.c
+++ b/board/freescale/t104xrdb/ddr.c
@@ -8,6 +8,7 @@
 #include <hwconfig.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/mmu.h>
 #include <fsl_ddr_sdram.h>
diff --git a/board/freescale/t104xrdb/diu.c b/board/freescale/t104xrdb/diu.c
index dc46a977317..fe5a1de57d9 100644
--- a/board/freescale/t104xrdb/diu.c
+++ b/board/freescale/t104xrdb/diu.c
@@ -5,6 +5,7 @@
  */
 
 #include <clock_legacy.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <common.h>
 #include <command.h>
diff --git a/board/freescale/t104xrdb/eth.c b/board/freescale/t104xrdb/eth.c
index a554083470e..fbd247e301b 100644
--- a/board/freescale/t104xrdb/eth.c
+++ b/board/freescale/t104xrdb/eth.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/fsl_serdes.h>
 #include <asm/immap_85xx.h>
 #include <fm_eth.h>
diff --git a/board/freescale/t104xrdb/spl.c b/board/freescale/t104xrdb/spl.c
index 6551b2248ef..4a3f02d10fc 100644
--- a/board/freescale/t104xrdb/spl.c
+++ b/board/freescale/t104xrdb/spl.c
@@ -14,6 +14,7 @@
 #include <mmc.h>
 #include <fsl_esdhc.h>
 #include <spi_flash.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
diff --git a/board/freescale/t104xrdb/t104xrdb.c b/board/freescale/t104xrdb/t104xrdb.c
index fc496478397..292c31246c4 100644
--- a/board/freescale/t104xrdb/t104xrdb.c
+++ b/board/freescale/t104xrdb/t104xrdb.c
@@ -12,6 +12,7 @@
 #include <init.h>
 #include <log.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/compiler.h>
diff --git a/board/freescale/t208xqds/ddr.c b/board/freescale/t208xqds/ddr.c
index 5a6728bd05b..36de0f73558 100644
--- a/board/freescale/t208xqds/ddr.c
+++ b/board/freescale/t208xqds/ddr.c
@@ -8,6 +8,7 @@
 #include <hwconfig.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.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 61dc408c5b1..f60e2047759 100644
--- a/board/freescale/t208xqds/eth_t208xqds.c
+++ b/board/freescale/t208xqds/eth_t208xqds.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/mmu.h>
 #include <asm/processor.h>
 #include <asm/immap_85xx.h>
diff --git a/board/freescale/t208xqds/spl.c b/board/freescale/t208xqds/spl.c
index bf1b049af7f..7902b746d56 100644
--- a/board/freescale/t208xqds/spl.c
+++ b/board/freescale/t208xqds/spl.c
@@ -14,6 +14,7 @@
 #include <mmc.h>
 #include <fsl_esdhc.h>
 #include <spi_flash.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
diff --git a/board/freescale/t208xqds/t208xqds.c b/board/freescale/t208xqds/t208xqds.c
index a0ead05e37d..c25b0a72ce5 100644
--- a/board/freescale/t208xqds/t208xqds.c
+++ b/board/freescale/t208xqds/t208xqds.c
@@ -13,6 +13,7 @@
 #include <init.h>
 #include <log.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/compiler.h>
diff --git a/board/freescale/t208xrdb/ddr.c b/board/freescale/t208xrdb/ddr.c
index 86f1e7614cb..a6f710e64bd 100644
--- a/board/freescale/t208xrdb/ddr.c
+++ b/board/freescale/t208xrdb/ddr.c
@@ -8,6 +8,7 @@
 #include <hwconfig.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/mmu.h>
 #include <fsl_ddr_sdram.h>
diff --git a/board/freescale/t208xrdb/eth_t208xrdb.c b/board/freescale/t208xrdb/eth_t208xrdb.c
index de997db78f7..fda113f0156 100644
--- a/board/freescale/t208xrdb/eth_t208xrdb.c
+++ b/board/freescale/t208xrdb/eth_t208xrdb.c
@@ -10,6 +10,7 @@
 #include <fdt_support.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/mmu.h>
 #include <asm/processor.h>
 #include <asm/immap_85xx.h>
diff --git a/board/freescale/t208xrdb/spl.c b/board/freescale/t208xrdb/spl.c
index 234fd145e7d..8ef46a09c95 100644
--- a/board/freescale/t208xrdb/spl.c
+++ b/board/freescale/t208xrdb/spl.c
@@ -14,6 +14,7 @@
 #include <mmc.h>
 #include <fsl_esdhc.h>
 #include <spi_flash.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
diff --git a/board/freescale/t208xrdb/t208xrdb.c b/board/freescale/t208xrdb/t208xrdb.c
index e09f0efdda6..bc5152810ef 100644
--- a/board/freescale/t208xrdb/t208xrdb.c
+++ b/board/freescale/t208xrdb/t208xrdb.c
@@ -11,6 +11,7 @@
 #include <image.h>
 #include <init.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/compiler.h>
diff --git a/board/freescale/t4rdb/cpld.c b/board/freescale/t4rdb/cpld.c
index 5bc149f4ab6..023b39852a7 100644
--- a/board/freescale/t4rdb/cpld.c
+++ b/board/freescale/t4rdb/cpld.c
@@ -16,6 +16,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/string.h>
 
diff --git a/board/freescale/t4rdb/ddr.c b/board/freescale/t4rdb/ddr.c
index 0e2ba282690..54b9f8fce67 100644
--- a/board/freescale/t4rdb/ddr.c
+++ b/board/freescale/t4rdb/ddr.c
@@ -8,6 +8,7 @@
 #include <hwconfig.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/mmu.h>
 #include <fsl_ddr_sdram.h>
diff --git a/board/freescale/t4rdb/eth.c b/board/freescale/t4rdb/eth.c
index a81b3be878b..def5e6c8b32 100644
--- a/board/freescale/t4rdb/eth.c
+++ b/board/freescale/t4rdb/eth.c
@@ -10,6 +10,7 @@
 #include <fdt_support.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/mmu.h>
 #include <asm/processor.h>
 #include <asm/cache.h>
diff --git a/board/freescale/t4rdb/spl.c b/board/freescale/t4rdb/spl.c
index 186327a3cde..8ae19d00685 100644
--- a/board/freescale/t4rdb/spl.c
+++ b/board/freescale/t4rdb/spl.c
@@ -10,6 +10,7 @@
 #include <console.h>
 #include <env_internal.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/spl.h>
 #include <malloc.h>
diff --git a/board/freescale/t4rdb/t4240rdb.c b/board/freescale/t4rdb/t4240rdb.c
index bee6d42c83d..3cd6eb8e8bb 100644
--- a/board/freescale/t4rdb/t4240rdb.c
+++ b/board/freescale/t4rdb/t4240rdb.c
@@ -11,6 +11,7 @@
 #include <image.h>
 #include <init.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/compiler.h>
diff --git a/board/freescale/vf610twr/vf610twr.c b/board/freescale/vf610twr/vf610twr.c
index 3641e5fb92f..342feb42d17 100644
--- a/board/freescale/vf610twr/vf610twr.c
+++ b/board/freescale/vf610twr/vf610twr.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/gardena/smart-gateway-mt7688/board.c b/board/gardena/smart-gateway-mt7688/board.c
index 0c36f53a5a7..03a9e43875a 100644
--- a/board/gardena/smart-gateway-mt7688/board.c
+++ b/board/gardena/smart-gateway-mt7688/board.c
@@ -15,6 +15,7 @@
 #include <net.h>
 #include <spi.h>
 #include <spi_flash.h>
+#include <stdio.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 ec42d5aa093..3f7ce584528 100644
--- a/board/gateworks/gw_ventana/common.c
+++ b/board/gateworks/gw_ventana/common.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.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 325527ceee1..efaff179a2c 100644
--- a/board/gateworks/gw_ventana/eeprom.c
+++ b/board/gateworks/gw_ventana/eeprom.c
@@ -11,6 +11,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.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 54ca5da4fa0..143493c24ab 100644
--- a/board/gateworks/gw_ventana/gsc.c
+++ b/board/gateworks/gw_ventana/gsc.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <command.h>
 #include <log.h>
+#include <stdio.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 84de3c3bb0f..a8b012dda73 100644
--- a/board/gateworks/gw_ventana/gw_ventana.c
+++ b/board/gateworks/gw_ventana/gw_ventana.c
@@ -9,6 +9,7 @@
 #include <init.h>
 #include <log.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/iomux.h>
diff --git a/board/gateworks/gw_ventana/gw_ventana_spl.c b/board/gateworks/gw_ventana/gw_ventana_spl.c
index c9e742e58ee..8cb3b479b70 100644
--- a/board/gateworks/gw_ventana/gw_ventana_spl.c
+++ b/board/gateworks/gw_ventana/gw_ventana_spl.c
@@ -9,6 +9,7 @@
 #include <hang.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/mx6-ddr.h>
diff --git a/board/gdsys/a38x/controlcenterdc.c b/board/gdsys/a38x/controlcenterdc.c
index d26ee0d313d..7044524a735 100644
--- a/board/gdsys/a38x/controlcenterdc.c
+++ b/board/gdsys/a38x/controlcenterdc.c
@@ -10,6 +10,7 @@
 #include <init.h>
 #include <miiphy.h>
 #include <net.h>
+#include <stdio.h>
 #include <tpm-v1.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/board/gdsys/a38x/hre.c b/board/gdsys/a38x/hre.c
index 615973894a1..1e7d7e71f12 100644
--- a/board/gdsys/a38x/hre.c
+++ b/board/gdsys/a38x/hre.c
@@ -10,6 +10,7 @@
 #include <fs.h>
 #include <i2c.h>
 #include <mmc.h>
+#include <stdio.h>
 #include <tpm-v1.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
diff --git a/board/gdsys/a38x/hydra.c b/board/gdsys/a38x/hydra.c
index 495a9769188..bd66cd52b86 100644
--- a/board/gdsys/a38x/hydra.c
+++ b/board/gdsys/a38x/hydra.c
@@ -2,6 +2,7 @@
 #include <command.h>
 #include <console.h> /* ctrlc */
 #include <pci.h>
+#include <stdio.h>
 #include <asm/io.h>
 
 #include "hydra.h"
diff --git a/board/gdsys/a38x/ihs_phys.c b/board/gdsys/a38x/ihs_phys.c
index 31a4aa26b50..4d6d0da76fa 100644
--- a/board/gdsys/a38x/ihs_phys.c
+++ b/board/gdsys/a38x/ihs_phys.c
@@ -1,6 +1,7 @@
 #include <common.h>
 #include <dm.h>
 #include <miiphy.h>
+#include <stdio.h>
 #include <asm-generic/gpio.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/board/gdsys/a38x/keyprogram.c b/board/gdsys/a38x/keyprogram.c
index 38e25e8fd24..be41844dcf1 100644
--- a/board/gdsys/a38x/keyprogram.c
+++ b/board/gdsys/a38x/keyprogram.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <command.h>
 #include <env.h>
+#include <stdio.h>
 #include <tpm-v1.h>
 #include <malloc.h>
 #include <linux/ctype.h>
diff --git a/board/gdsys/a38x/spl.c b/board/gdsys/a38x/spl.c
index 84864d19746..a06acd64f9f 100644
--- a/board/gdsys/a38x/spl.c
+++ b/board/gdsys/a38x/spl.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <config.h>
+#include <stdio.h>
 #include <asm/arch/cpu.h>
 
 void spl_board_init(void)
diff --git a/board/gdsys/common/cmd_ioloop.c b/board/gdsys/common/cmd_ioloop.c
index 88bf9b2aadd..72fef03d7b1 100644
--- a/board/gdsys/common/cmd_ioloop.c
+++ b/board/gdsys/common/cmd_ioloop.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <command.h>
 #include <console.h>
+#include <stdio.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/string.h>
diff --git a/board/gdsys/common/dp501.c b/board/gdsys/common/dp501.c
index 9ca69ebcbbe..ae82274a896 100644
--- a/board/gdsys/common/dp501.c
+++ b/board/gdsys/common/dp501.c
@@ -158,4 +158,5 @@ int dp501_probe(unsigned screen, bool power)
 	return 0;
 }
 
+#include <stdio.h>
 #endif /* CONFIG_GDSYS_LEGACY_DRIVERS */
diff --git a/board/gdsys/common/ihs_mdio.c b/board/gdsys/common/ihs_mdio.c
index 3a51338d92a..ea91d767d5b 100644
--- a/board/gdsys/common/ihs_mdio.c
+++ b/board/gdsys/common/ihs_mdio.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 
diff --git a/board/gdsys/common/ioep-fpga.c b/board/gdsys/common/ioep-fpga.c
index c758c8a885d..a75de339b7a 100644
--- a/board/gdsys/common/ioep-fpga.c
+++ b/board/gdsys/common/ioep-fpga.c
@@ -444,6 +444,7 @@ static int get_features(unsigned int fpga, struct fpga_features *features)
 	return 0;
 }
 
+#include <stdio.h>
 #include <linux/bitops.h>
 #include <linux/string.h>
 #endif
diff --git a/board/gdsys/common/osd.c b/board/gdsys/common/osd.c
index 9fe95f02059..e4941a94f31 100644
--- a/board/gdsys/common/osd.c
+++ b/board/gdsys/common/osd.c
@@ -503,5 +503,6 @@ U_BOOT_CMD(
 	") size_y(max. " __stringify(MAX_Y_CHARS) ")\n"
 );
 
+#include <stdio.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 120e1efc81e..b73e2597299 100644
--- a/board/gdsys/common/osd_cmd.c
+++ b/board/gdsys/common/osd_cmd.c
@@ -13,6 +13,7 @@
 #include <command.h>
 #include <dm.h>
 #include <hexdump.h>
+#include <stdio.h>
 #include <video_osd.h>
 #include <malloc.h>
 #include <linux/string.h>
diff --git a/board/gdsys/common/phy.c b/board/gdsys/common/phy.c
index a4104a9d202..7b969853b3c 100644
--- a/board/gdsys/common/phy.c
+++ b/board/gdsys/common/phy.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 
 #include <miiphy.h>
diff --git a/board/gdsys/mpc8308/gazerbeam.c b/board/gdsys/mpc8308/gazerbeam.c
index 9891baa1126..3258cc72179 100644
--- a/board/gdsys/mpc8308/gazerbeam.c
+++ b/board/gdsys/mpc8308/gazerbeam.c
@@ -15,6 +15,7 @@
 #include <init.h>
 #include <miiphy.h>
 #include <misc.h>
+#include <stdio.h>
 #include <tpm-v1.h>
 #include <video_osd.h>
 #include <asm/global_data.h>
diff --git a/board/gdsys/mpc8308/hrcon.c b/board/gdsys/mpc8308/hrcon.c
index bc2980f1a67..5cf8f283dff 100644
--- a/board/gdsys/mpc8308/hrcon.c
+++ b/board/gdsys/mpc8308/hrcon.c
@@ -11,6 +11,7 @@
 #include <i2c.h>
 #include <init.h>
 #include <spi.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/board/gdsys/mpc8308/strider.c b/board/gdsys/mpc8308/strider.c
index a6a2e797581..33a16ba5513 100644
--- a/board/gdsys/mpc8308/strider.c
+++ b/board/gdsys/mpc8308/strider.c
@@ -11,6 +11,7 @@
 #include <i2c.h>
 #include <init.h>
 #include <spi.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/board/gdsys/p1022/controlcenterd-id.c b/board/gdsys/p1022/controlcenterd-id.c
index 6ec49996ab9..ddf419edab4 100644
--- a/board/gdsys/p1022/controlcenterd-id.c
+++ b/board/gdsys/p1022/controlcenterd-id.c
@@ -22,6 +22,7 @@
 #include <fs.h>
 #include <i2c.h>
 #include <mmc.h>
+#include <stdio.h>
 #include <tpm-v1.h>
 #include <linux/delay.h>
 #include <linux/string.h>
diff --git a/board/gdsys/p1022/controlcenterd.c b/board/gdsys/p1022/controlcenterd.c
index 0348b710075..619e8073253 100644
--- a/board/gdsys/p1022/controlcenterd.c
+++ b/board/gdsys/p1022/controlcenterd.c
@@ -28,6 +28,7 @@
 #include <init.h>
 #include <net.h>
 #include <pci.h>
+#include <stdio.h>
 #include <asm/processor.h>
 #include <asm/mmu.h>
 #include <asm/cache.h>
diff --git a/board/gdsys/p1022/ddr.c b/board/gdsys/p1022/ddr.c
index b2d44da4adc..1ed8b9ff283 100644
--- a/board/gdsys/p1022/ddr.c
+++ b/board/gdsys/p1022/ddr.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <i2c.h>
 #include <log.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 #include <fsl_ddr_sdram.h>
diff --git a/board/gdsys/p1022/diu.c b/board/gdsys/p1022/diu.c
index c67dc182cbb..8af03534c81 100644
--- a/board/gdsys/p1022/diu.c
+++ b/board/gdsys/p1022/diu.c
@@ -10,6 +10,7 @@
 #include <clock_legacy.h>
 #include <command.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 #include <linux/ctype.h>
 #include <asm/io.h>
diff --git a/board/ge/bx50v3/bx50v3.c b/board/ge/bx50v3/bx50v3.c
index 8df982450c2..0d88f8ad4a9 100644
--- a/board/ge/bx50v3/bx50v3.c
+++ b/board/ge/bx50v3/bx50v3.c
@@ -7,6 +7,7 @@
 
 #include <image.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux.h>
diff --git a/board/ge/mx53ppd/mx53ppd.c b/board/ge/mx53ppd/mx53ppd.c
index 02d17952d58..a02c8a4de80 100644
--- a/board/ge/mx53ppd/mx53ppd.c
+++ b/board/ge/mx53ppd/mx53ppd.c
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/ge/mx53ppd/mx53ppd_video.c b/board/ge/mx53ppd/mx53ppd_video.c
index 3240ed62aeb..3c56120c032 100644
--- a/board/ge/mx53ppd/mx53ppd_video.c
+++ b/board/ge/mx53ppd/mx53ppd_video.c
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <stdio.h>
 #include <linux/list.h>
 #include <asm/arch/iomux-mx53.h>
 #include <asm/mach-imx/video.h>
diff --git a/board/google/chromebook_coral/coral.c b/board/google/chromebook_coral/coral.c
index 4dbdfe343cc..4180da077d4 100644
--- a/board/google/chromebook_coral/coral.c
+++ b/board/google/chromebook_coral/coral.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 
 int arch_misc_init(void)
diff --git a/board/google/imx8mq_phanbell/spl.c b/board/google/imx8mq_phanbell/spl.c
index aee71acc98e..0e822d01c4c 100644
--- a/board/google/imx8mq_phanbell/spl.c
+++ b/board/google/imx8mq_phanbell/spl.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <hang.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <errno.h>
diff --git a/board/grinn/chiliboard/board.c b/board/grinn/chiliboard/board.c
index 2c88701a4dc..7c86fe864df 100644
--- a/board/grinn/chiliboard/board.c
+++ b/board/grinn/chiliboard/board.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/arch/chilisom.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/hardware.h>
diff --git a/board/grinn/liteboard/board.c b/board/grinn/liteboard/board.c
index 0617e7978c9..fbbfbd8fb29 100644
--- a/board/grinn/liteboard/board.c
+++ b/board/grinn/liteboard/board.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <command.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/hisilicon/hikey/hikey.c b/board/hisilicon/hikey/hikey.c
index 0c6cdb5c9cf..5525ec91872 100644
--- a/board/hisilicon/hikey/hikey.c
+++ b/board/hisilicon/hikey/hikey.c
@@ -9,6 +9,7 @@
 #include <fdt_support.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <dm/platform_data/serial_pl01x.h>
diff --git a/board/hisilicon/hikey960/hikey960.c b/board/hisilicon/hikey960/hikey960.c
index e302b169e1e..256b951586e 100644
--- a/board/hisilicon/hikey960/hikey960.c
+++ b/board/hisilicon/hikey960/hikey960.c
@@ -8,6 +8,7 @@
 #include <cpu_func.h>
 #include <dm.h>
 #include <errno.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <init.h>
 #include <asm/global_data.h>
diff --git a/board/hisilicon/poplar/poplar.c b/board/hisilicon/poplar/poplar.c
index e0f290ef544..8e0c122f367 100644
--- a/board/hisilicon/poplar/poplar.c
+++ b/board/hisilicon/poplar/poplar.c
@@ -8,6 +8,7 @@
 #include <cpu_func.h>
 #include <dm.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/board/ids/ids8313/ids8313.c b/board/ids/ids8313/ids8313.c
index 7ebae113370..568a1877fc9 100644
--- a/board/ids/ids8313/ids8313.c
+++ b/board/ids/ids8313/ids8313.c
@@ -16,6 +16,7 @@
 #include <init.h>
 #include <mpc83xx.h>
 #include <spi.h>
+#include <stdio.h>
 #include <asm/bitops.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
diff --git a/board/imgtec/boston/checkboard.c b/board/imgtec/boston/checkboard.c
index 1b8a47d2549..9d3a90282a0 100644
--- a/board/imgtec/boston/checkboard.c
+++ b/board/imgtec/boston/checkboard.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 
 #include <asm/io.h>
 #include <asm/mipsregs.h>
diff --git a/board/imgtec/ci20/ci20.c b/board/imgtec/ci20/ci20.c
index 8f45ff89e5f..11f140f172e 100644
--- a/board/imgtec/ci20/ci20.c
+++ b/board/imgtec/ci20/ci20.c
@@ -11,6 +11,7 @@
 #include <init.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
diff --git a/board/imgtec/malta/malta.c b/board/imgtec/malta/malta.c
index 0a6ab37e12d..7ed9b53bc16 100644
--- a/board/imgtec/malta/malta.c
+++ b/board/imgtec/malta/malta.c
@@ -13,6 +13,7 @@
 #include <pci_gt64120.h>
 #include <pci_msc01.h>
 #include <rtc.h>
+#include <stdio.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 652f9755155..8d1c4ade1c5 100644
--- a/board/intel/edison/edison.c
+++ b/board/intel/edison/edison.c
@@ -7,6 +7,7 @@
 #include <env.h>
 #include <init.h>
 #include <mmc.h>
+#include <stdio.h>
 #include <u-boot/md5.h>
 #include <usb.h>
 #include <watchdog.h>
diff --git a/board/inversepath/usbarmory/usbarmory.c b/board/inversepath/usbarmory/usbarmory.c
index 2ad772c225f..4eb30ae3374 100644
--- a/board/inversepath/usbarmory/usbarmory.c
+++ b/board/inversepath/usbarmory/usbarmory.c
@@ -11,6 +11,7 @@
 #include <command.h>
 #include <fs.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/isee/igep003x/board.c b/board/isee/igep003x/board.c
index 8844bb42720..a3ae8753721 100644
--- a/board/isee/igep003x/board.c
+++ b/board/isee/igep003x/board.c
@@ -13,6 +13,7 @@
 #include <net.h>
 #include <serial.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/omap.h>
diff --git a/board/k+p/kp_imx53/kp_id_rev.c b/board/k+p/kp_imx53/kp_id_rev.c
index 3e9315f5522..9a5c5cb64da 100644
--- a/board/k+p/kp_imx53/kp_id_rev.c
+++ b/board/k+p/kp_imx53/kp_id_rev.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <env.h>
 #include <i2c.h>
+#include <stdio.h>
 #include <linux/string.h>
 #include "kp_id_rev.h"
 #include <net.h>
diff --git a/board/k+p/kp_imx53/kp_imx53.c b/board/k+p/kp_imx53/kp_imx53.c
index 42e540ae1e4..662fd1f24b2 100644
--- a/board/k+p/kp_imx53/kp_imx53.c
+++ b/board/k+p/kp_imx53/kp_imx53.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/k+p/kp_imx6q_tpc/kp_imx6q_tpc.c b/board/k+p/kp_imx6q_tpc/kp_imx6q_tpc.c
index c1ec01f21a0..0a16b1c563a 100644
--- a/board/k+p/kp_imx6q_tpc/kp_imx6q_tpc.c
+++ b/board/k+p/kp_imx6q_tpc/kp_imx6q_tpc.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/k+p/kp_imx6q_tpc/kp_imx6q_tpc_spl.c b/board/k+p/kp_imx6q_tpc/kp_imx6q_tpc_spl.c
index d5c1c762254..bee4c398585 100644
--- a/board/k+p/kp_imx6q_tpc/kp_imx6q_tpc_spl.c
+++ b/board/k+p/kp_imx6q_tpc/kp_imx6q_tpc_spl.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/keymile/common/common.c b/board/keymile/common/common.c
index bada40e1e62..5287ec20535 100644
--- a/board/keymile/common/common.c
+++ b/board/keymile/common/common.c
@@ -15,6 +15,7 @@
 #include <cli_hush.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdio.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 ef51e81996b..f850c4d7563 100644
--- a/board/keymile/common/ivm.c
+++ b/board/keymile/common/ivm.c
@@ -8,6 +8,7 @@
 #include <cli_hush.h>
 #include <env.h>
 #include <i2c.h>
+#include <stdio.h>
 #include <linux/string.h>
 #include "common.h"
 
diff --git a/board/keymile/km83xx/km83xx.c b/board/keymile/km83xx/km83xx.c
index f0422d906e7..21f4dcd1a38 100644
--- a/board/keymile/km83xx/km83xx.c
+++ b/board/keymile/km83xx/km83xx.c
@@ -22,6 +22,7 @@
 #include <mpc83xx.h>
 #include <i2c.h>
 #include <miiphy.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/mmu.h>
diff --git a/board/keymile/km83xx/km83xx_i2c.c b/board/keymile/km83xx/km83xx_i2c.c
index 104e30875d7..55c993481c2 100644
--- a/board/keymile/km83xx/km83xx_i2c.c
+++ b/board/keymile/km83xx/km83xx_i2c.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <i2c.h>
+#include <stdio.h>
 #include <asm/fsl_i2c.h>
 #include <asm/io.h>
 #include <linux/ctype.h>
diff --git a/board/keymile/km_arm/fpga_config.c b/board/keymile/km_arm/fpga_config.c
index abb5b7d60d0..2e60221f228 100644
--- a/board/keymile/km_arm/fpga_config.c
+++ b/board/keymile/km_arm/fpga_config.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <i2c.h>
+#include <stdio.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 
diff --git a/board/keymile/km_arm/km_arm.c b/board/keymile/km_arm/km_arm.c
index 3f6aa49416f..0e5de8ad871 100644
--- a/board/keymile/km_arm/km_arm.c
+++ b/board/keymile/km_arm/km_arm.c
@@ -20,6 +20,7 @@
 #include <netdev.h>
 #include <miiphy.h>
 #include <spi.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
diff --git a/board/keymile/kmp204x/ddr.c b/board/keymile/kmp204x/ddr.c
index 77a00c55c95..80f824c3013 100644
--- a/board/keymile/kmp204x/ddr.c
+++ b/board/keymile/kmp204x/ddr.c
@@ -11,6 +11,7 @@
 #include <hwconfig.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/mmu.h>
 #include <fsl_ddr_sdram.h>
diff --git a/board/keymile/kmp204x/eth.c b/board/keymile/kmp204x/eth.c
index 0cac3ecdad3..a1e3a23cd75 100644
--- a/board/keymile/kmp204x/eth.c
+++ b/board/keymile/kmp204x/eth.c
@@ -10,6 +10,7 @@
 #include <fm_eth.h>
 #include <fsl_mdio.h>
 #include <phy.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 
 int board_eth_init(struct bd_info *bis)
diff --git a/board/keymile/kmp204x/kmp204x.c b/board/keymile/kmp204x/kmp204x.c
index 1d491bda92f..46316d34542 100644
--- a/board/keymile/kmp204x/kmp204x.c
+++ b/board/keymile/kmp204x/kmp204x.c
@@ -13,6 +13,7 @@
 #include <image.h>
 #include <init.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 #include <linux/compiler.h>
 #include <asm/mmu.h>
diff --git a/board/keymile/kmp204x/pci.c b/board/keymile/kmp204x/pci.c
index bfc853a2e82..169c8bc6edb 100644
--- a/board/keymile/kmp204x/pci.c
+++ b/board/keymile/kmp204x/pci.c
@@ -10,6 +10,7 @@
 #include <command.h>
 #include <init.h>
 #include <pci.h>
+#include <stdio.h>
 #include <asm/fsl_pci.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
diff --git a/board/keymile/secu1/socfpga.c b/board/keymile/secu1/socfpga.c
index dc04a21abea..4afaf0dec72 100644
--- a/board/keymile/secu1/socfpga.c
+++ b/board/keymile/secu1/socfpga.c
@@ -4,6 +4,7 @@
  */
 #include <common.h>
 #include <i2c.h>
+#include <stdio.h>
 #include <asm/gpio.h>
 
 #include "../common/common.h"
diff --git a/board/kobol/helios4/helios4.c b/board/kobol/helios4/helios4.c
index 79cd4a4bc1f..560a2e393a4 100644
--- a/board/kobol/helios4/helios4.c
+++ b/board/kobol/helios4/helios4.c
@@ -10,6 +10,7 @@
 #include <miiphy.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
diff --git a/board/kosagi/novena/novena.c b/board/kosagi/novena/novena.c
index 1825cd04976..23b4ba25f78 100644
--- a/board/kosagi/novena/novena.c
+++ b/board/kosagi/novena/novena.c
@@ -11,6 +11,7 @@
 #include <eeprom.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <dm/device-internal.h>
diff --git a/board/kosagi/novena/video.c b/board/kosagi/novena/video.c
index a96a877f5f2..8fc76d6347a 100644
--- a/board/kosagi/novena/video.c
+++ b/board/kosagi/novena/video.c
@@ -11,6 +11,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
diff --git a/board/lego/ev3/legoev3.c b/board/lego/ev3/legoev3.c
index 6afb02bc2b0..5ccd7290ad1 100644
--- a/board/lego/ev3/legoev3.c
+++ b/board/lego/ev3/legoev3.c
@@ -17,6 +17,7 @@
 #include <init.h>
 #include <spi.h>
 #include <spi_flash.h>
+#include <stdio.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/pinmux_defs.h>
 #include <asm/global_data.h>
diff --git a/board/liebherr/display5/display5.c b/board/liebherr/display5/display5.c
index c68e04815e6..a4bba42d8e4 100644
--- a/board/liebherr/display5/display5.c
+++ b/board/liebherr/display5/display5.c
@@ -9,6 +9,7 @@
 #include <fdt_support.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
diff --git a/board/liebherr/display5/spl.c b/board/liebherr/display5/spl.c
index b910b3fbf0e..3225ca0197b 100644
--- a/board/liebherr/display5/spl.c
+++ b/board/liebherr/display5/spl.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <serial.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
diff --git a/board/liebherr/mccmon6/mccmon6.c b/board/liebherr/mccmon6/mccmon6.c
index db0ae9bc4ca..bbe8cb7b7bc 100644
--- a/board/liebherr/mccmon6/mccmon6.c
+++ b/board/liebherr/mccmon6/mccmon6.c
@@ -8,6 +8,7 @@
 #include <env.h>
 #include <init.h>
 #include <serial.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/liebherr/mccmon6/spl.c b/board/liebherr/mccmon6/spl.c
index 69cf7def1f6..6eacd60ddca 100644
--- a/board/liebherr/mccmon6/spl.c
+++ b/board/liebherr/mccmon6/spl.c
@@ -7,6 +7,7 @@
 
 #include <image.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux.h>
diff --git a/board/liebherr/xea/xea.c b/board/liebherr/xea/xea.c
index eee2e00b78e..7dd6cc34156 100644
--- a/board/liebherr/xea/xea.c
+++ b/board/liebherr/xea/xea.c
@@ -18,6 +18,7 @@
 #include <init.h>
 #include <log.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
diff --git a/board/maxbcm/maxbcm.c b/board/maxbcm/maxbcm.c
index cb6bc6f531a..32062852556 100644
--- a/board/maxbcm/maxbcm.c
+++ b/board/maxbcm/maxbcm.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <init.h>
 #include <miiphy.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
diff --git a/board/mediatek/mt7623/mt7623_rfb.c b/board/mediatek/mt7623/mt7623_rfb.c
index 180f55f65d7..e38f4391f6b 100644
--- a/board/mediatek/mt7623/mt7623_rfb.c
+++ b/board/mediatek/mt7623/mt7623_rfb.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <mmc.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
diff --git a/board/menlo/m53menlo/m53menlo.c b/board/menlo/m53menlo/m53menlo.c
index 4c7fd84e281..93186b9bca3 100644
--- a/board/menlo/m53menlo/m53menlo.c
+++ b/board/menlo/m53menlo/m53menlo.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <init.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/microchip/pic32mzda/pic32mzda.c b/board/microchip/pic32mzda/pic32mzda.c
index e7337deea7f..96bb8c8f425 100644
--- a/board/microchip/pic32mzda/pic32mzda.c
+++ b/board/microchip/pic32mzda/pic32mzda.c
@@ -12,6 +12,7 @@
 #include <clk.h>
 #include <init.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <dt-bindings/clock/microchip,clock.h>
 #include <mach/pic32.h>
 
diff --git a/board/mikrotik/crs3xx-98dx3236/crs3xx-98dx3236.c b/board/mikrotik/crs3xx-98dx3236/crs3xx-98dx3236.c
index 9993e006f6e..ef18dff4004 100644
--- a/board/mikrotik/crs3xx-98dx3236/crs3xx-98dx3236.c
+++ b/board/mikrotik/crs3xx-98dx3236/crs3xx-98dx3236.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <i2c.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/u-boot.h>
diff --git a/board/mpc8308_p1m/mpc8308_p1m.c b/board/mpc8308_p1m/mpc8308_p1m.c
index 1a44e2df47f..aa8b8e19dbe 100644
--- a/board/mpc8308_p1m/mpc8308_p1m.c
+++ b/board/mpc8308_p1m/mpc8308_p1m.c
@@ -8,6 +8,7 @@
 #include <i2c.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
diff --git a/board/novtech/meerkat96/meerkat96.c b/board/novtech/meerkat96/meerkat96.c
index 388f8630be1..297ccd080eb 100644
--- a/board/novtech/meerkat96/meerkat96.c
+++ b/board/novtech/meerkat96/meerkat96.c
@@ -5,6 +5,7 @@
  */
 
 #include <init.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/mx7-pins.h>
diff --git a/board/nvidia/dalmore/dalmore.c b/board/nvidia/dalmore/dalmore.c
index 72511e401e3..21b00855eb5 100644
--- a/board/nvidia/dalmore/dalmore.c
+++ b/board/nvidia/dalmore/dalmore.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/arch/pinmux.h>
 #include <asm/arch/gp_padctrl.h>
 #include "pinmux-config-dalmore.h"
diff --git a/board/nvidia/e2220-1170/e2220-1170.c b/board/nvidia/e2220-1170/e2220-1170.c
index b819b049f4b..4c59b61e5da 100644
--- a/board/nvidia/e2220-1170/e2220-1170.c
+++ b/board/nvidia/e2220-1170/e2220-1170.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <i2c.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/arch/gpio.h>
 #include <asm/arch/pinmux.h>
 #include "../p2571/max77620_init.h"
diff --git a/board/nvidia/p2371-0000/p2371-0000.c b/board/nvidia/p2371-0000/p2371-0000.c
index b819b049f4b..4c59b61e5da 100644
--- a/board/nvidia/p2371-0000/p2371-0000.c
+++ b/board/nvidia/p2371-0000/p2371-0000.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <i2c.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/arch/gpio.h>
 #include <asm/arch/pinmux.h>
 #include "../p2571/max77620_init.h"
diff --git a/board/nvidia/p2371-2180/p2371-2180.c b/board/nvidia/p2371-2180/p2371-2180.c
index 4631fa21f5b..e20a74943ff 100644
--- a/board/nvidia/p2371-2180/p2371-2180.c
+++ b/board/nvidia/p2371-2180/p2371-2180.c
@@ -10,6 +10,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/libfdt.h>
diff --git a/board/nvidia/p2571/p2571.c b/board/nvidia/p2571/p2571.c
index a4c4259eeae..e8760ca5172 100644
--- a/board/nvidia/p2571/p2571.c
+++ b/board/nvidia/p2571/p2571.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <i2c.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/arch/gpio.h>
 #include <asm/arch/pinmux.h>
 #include <asm/gpio.h>
diff --git a/board/nvidia/p2771-0000/p2771-0000.c b/board/nvidia/p2771-0000/p2771-0000.c
index 14b151d8a16..c1d9b79d3e9 100644
--- a/board/nvidia/p2771-0000/p2771-0000.c
+++ b/board/nvidia/p2771-0000/p2771-0000.c
@@ -9,6 +9,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <asm/arch-tegra/cboot.h>
diff --git a/board/nvidia/p3450-0000/p3450-0000.c b/board/nvidia/p3450-0000/p3450-0000.c
index e40644388ec..f6751b65ab9 100644
--- a/board/nvidia/p3450-0000/p3450-0000.c
+++ b/board/nvidia/p3450-0000/p3450-0000.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <fdtdec.h>
 #include <i2c.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/libfdt.h>
diff --git a/board/phytec/pcl063/pcl063.c b/board/phytec/pcl063/pcl063.c
index 9051a0ca0d3..cd8ba35ab9d 100644
--- a/board/phytec/pcl063/pcl063.c
+++ b/board/phytec/pcl063/pcl063.c
@@ -7,6 +7,7 @@
  */
 
 #include <init.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/mx6-pins.h>
diff --git a/board/phytec/pcl063/spl.c b/board/phytec/pcl063/spl.c
index 175223dbc75..662f3d7e12d 100644
--- a/board/phytec/pcl063/spl.c
+++ b/board/phytec/pcl063/spl.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <init.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/io.h>
 #include <asm/arch/mx6-ddr.h>
diff --git a/board/phytec/pcm052/pcm052.c b/board/phytec/pcm052/pcm052.c
index ce545cfa844..ab2513ed071 100644
--- a/board/phytec/pcm052/pcm052.c
+++ b/board/phytec/pcm052/pcm052.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/phytec/pcm058/pcm058.c b/board/phytec/pcm058/pcm058.c
index dd8c91c176d..41a391ef0ef 100644
--- a/board/phytec/pcm058/pcm058.c
+++ b/board/phytec/pcm058/pcm058.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/mx6-ddr.h>
 #include <asm/global_data.h>
diff --git a/board/phytec/pfla02/pfla02.c b/board/phytec/pfla02/pfla02.c
index 225fdd55cc5..57f30a04ed8 100644
--- a/board/phytec/pfla02/pfla02.c
+++ b/board/phytec/pfla02/pfla02.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <log.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
diff --git a/board/phytec/phycore_rk3288/phycore-rk3288.c b/board/phytec/phycore_rk3288/phycore-rk3288.c
index f588fc3b0c7..141707c7b9a 100644
--- a/board/phytec/phycore_rk3288/phycore-rk3288.c
+++ b/board/phytec/phycore_rk3288/phycore-rk3288.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <log.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <common.h>
diff --git a/board/phytium/durian/durian.c b/board/phytium/durian/durian.c
index 4b588206c22..ce0cbdb9c4a 100644
--- a/board/phytium/durian/durian.c
+++ b/board/phytium/durian/durian.c
@@ -10,6 +10,7 @@
 #include <cpu_func.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/armv8/mmu.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
diff --git a/board/ppcag/bg0900/bg0900.c b/board/ppcag/bg0900/bg0900.c
index 5fe7ed9a3a8..9d2ad0b2014 100644
--- a/board/ppcag/bg0900/bg0900.c
+++ b/board/ppcag/bg0900/bg0900.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
diff --git a/board/qemu-mips/qemu-mips.c b/board/qemu-mips/qemu-mips.c
index 21437168044..7d00176ffe6 100644
--- a/board/qemu-mips/qemu-mips.c
+++ b/board/qemu-mips/qemu-mips.c
@@ -8,6 +8,7 @@
 #include <command.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/mipsregs.h>
 #include <asm/io.h>
diff --git a/board/qualcomm/dragonboard410c/dragonboard410c.c b/board/qualcomm/dragonboard410c/dragonboard410c.c
index bac8b1ff899..9ba3dcb092a 100644
--- a/board/qualcomm/dragonboard410c/dragonboard410c.c
+++ b/board/qualcomm/dragonboard410c/dragonboard410c.c
@@ -11,6 +11,7 @@
 #include <env.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <usb.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
diff --git a/board/qualcomm/dragonboard820c/dragonboard820c.c b/board/qualcomm/dragonboard820c/dragonboard820c.c
index 847022939d0..8ed5deadec1 100644
--- a/board/qualcomm/dragonboard820c/dragonboard820c.c
+++ b/board/qualcomm/dragonboard820c/dragonboard820c.c
@@ -7,6 +7,7 @@
 
 #include <cpu_func.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/arch/sysmap-apq8096.h>
 #include <env.h>
 #include <asm/cache.h>
diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c
index e76fc2cca94..647ebde09a7 100644
--- a/board/raspberrypi/rpi/rpi.c
+++ b/board/raspberrypi/rpi/rpi.c
@@ -14,6 +14,7 @@
 #include <lcd.h>
 #include <memalign.h>
 #include <mmc.h>
+#include <stdio.h>
 #include <asm/gpio.h>
 #include <asm/arch/mbox.h>
 #include <asm/arch/msg.h>
diff --git a/board/renesas/MigoR/migo_r.c b/board/renesas/MigoR/migo_r.c
index 61564a2f50f..29cb1a82215 100644
--- a/board/renesas/MigoR/migo_r.c
+++ b/board/renesas/MigoR/migo_r.c
@@ -13,6 +13,7 @@
 #include <init.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/processor.h>
 #include <asm/u-boot.h>
diff --git a/board/renesas/alt/alt_spl.c b/board/renesas/alt/alt_spl.c
index 2de236fc298..02e3ed3b563 100644
--- a/board/renesas/alt/alt_spl.c
+++ b/board/renesas/alt/alt_spl.c
@@ -9,6 +9,7 @@
 #include <cpu_func.h>
 #include <init.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <dm/platform_data/serial_sh.h>
 #include <asm/processor.h>
 #include <asm/mach-types.h>
diff --git a/board/renesas/blanche/blanche.c b/board/renesas/blanche/blanche.c
index 77d4cc8bd6c..e91cffaa8c5 100644
--- a/board/renesas/blanche/blanche.c
+++ b/board/renesas/blanche/blanche.c
@@ -10,6 +10,7 @@
 #include <cpu_func.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/arch/mmc.h>
 #include <asm/arch/rcar-mstp.h>
 #include <asm/arch/rmobile.h>
diff --git a/board/renesas/gose/gose_spl.c b/board/renesas/gose/gose_spl.c
index 624ba5db04e..a181ffd6dcf 100644
--- a/board/renesas/gose/gose_spl.c
+++ b/board/renesas/gose/gose_spl.c
@@ -9,6 +9,7 @@
 #include <cpu_func.h>
 #include <init.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <dm/platform_data/serial_sh.h>
 #include <asm/processor.h>
 #include <asm/mach-types.h>
diff --git a/board/renesas/koelsch/koelsch_spl.c b/board/renesas/koelsch/koelsch_spl.c
index 449bbfa7b81..f5be6548738 100644
--- a/board/renesas/koelsch/koelsch_spl.c
+++ b/board/renesas/koelsch/koelsch_spl.c
@@ -9,6 +9,7 @@
 #include <cpu_func.h>
 #include <init.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <dm/platform_data/serial_sh.h>
 #include <asm/processor.h>
 #include <asm/mach-types.h>
diff --git a/board/renesas/lager/lager_spl.c b/board/renesas/lager/lager_spl.c
index 1ca857c2c3d..4dc47ecd5f7 100644
--- a/board/renesas/lager/lager_spl.c
+++ b/board/renesas/lager/lager_spl.c
@@ -9,6 +9,7 @@
 #include <cpu_func.h>
 #include <init.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <dm/platform_data/serial_sh.h>
 #include <asm/processor.h>
 #include <asm/mach-types.h>
diff --git a/board/renesas/porter/porter_spl.c b/board/renesas/porter/porter_spl.c
index f10c6cffc2b..9b4e787b5f1 100644
--- a/board/renesas/porter/porter_spl.c
+++ b/board/renesas/porter/porter_spl.c
@@ -9,6 +9,7 @@
 #include <cpu_func.h>
 #include <init.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <dm/platform_data/serial_sh.h>
 #include <asm/processor.h>
 #include <asm/mach-types.h>
diff --git a/board/renesas/r2dplus/r2dplus.c b/board/renesas/r2dplus/r2dplus.c
index e637b4f9876..824b4d34dea 100644
--- a/board/renesas/r2dplus/r2dplus.c
+++ b/board/renesas/r2dplus/r2dplus.c
@@ -9,6 +9,7 @@
 #include <init.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/processor.h>
 #include <asm/io.h>
 #include <asm/u-boot.h>
diff --git a/board/renesas/r7780mp/r7780mp.c b/board/renesas/r7780mp/r7780mp.c
index 28c99bf5854..0c9af494c23 100644
--- a/board/renesas/r7780mp/r7780mp.c
+++ b/board/renesas/r7780mp/r7780mp.c
@@ -8,6 +8,7 @@
 #include <ide.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/processor.h>
 #include <asm/io.h>
 #include <asm/pci.h>
diff --git a/board/renesas/rcar-common/common.c b/board/renesas/rcar-common/common.c
index 4f56627b812..f4a0179b9f8 100644
--- a/board/renesas/rcar-common/common.c
+++ b/board/renesas/rcar-common/common.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <dm.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <dm/uclass-internal.h>
diff --git a/board/renesas/sh7752evb/sh7752evb.c b/board/renesas/sh7752evb/sh7752evb.c
index 4df154a2a91..5c65b0d692a 100644
--- a/board/renesas/sh7752evb/sh7752evb.c
+++ b/board/renesas/sh7752evb/sh7752evb.c
@@ -10,6 +10,7 @@
 #include <init.h>
 #include <malloc.h>
 #include <net.h>
+#include <stdio.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 de719983979..014fdf94b75 100644
--- a/board/renesas/sh7753evb/sh7753evb.c
+++ b/board/renesas/sh7753evb/sh7753evb.c
@@ -10,6 +10,7 @@
 #include <init.h>
 #include <malloc.h>
 #include <net.h>
+#include <stdio.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 2adca5dc6dc..80f29644406 100644
--- a/board/renesas/sh7757lcr/sh7757lcr.c
+++ b/board/renesas/sh7757lcr/sh7757lcr.c
@@ -10,6 +10,7 @@
 #include <init.h>
 #include <malloc.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/processor.h>
 #include <asm/io.h>
 #include <asm/mmc.h>
diff --git a/board/renesas/sh7763rdp/sh7763rdp.c b/board/renesas/sh7763rdp/sh7763rdp.c
index 35c77be1bca..fbef959c52a 100644
--- a/board/renesas/sh7763rdp/sh7763rdp.c
+++ b/board/renesas/sh7763rdp/sh7763rdp.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/processor.h>
 #include <asm/u-boot.h>
diff --git a/board/renesas/silk/silk_spl.c b/board/renesas/silk/silk_spl.c
index f10f84a3cce..27f59ce9e4d 100644
--- a/board/renesas/silk/silk_spl.c
+++ b/board/renesas/silk/silk_spl.c
@@ -9,6 +9,7 @@
 #include <cpu_func.h>
 #include <init.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <dm/platform_data/serial_sh.h>
 #include <asm/processor.h>
 #include <asm/mach-types.h>
diff --git a/board/renesas/stout/cpld.c b/board/renesas/stout/cpld.c
index e6e0a3a3e3d..366076a3b88 100644
--- a/board/renesas/stout/cpld.c
+++ b/board/renesas/stout/cpld.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <command.h>
 #include <cpu_func.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
 #include <linux/string.h>
diff --git a/board/renesas/stout/stout_spl.c b/board/renesas/stout/stout_spl.c
index 57c1fabaf3a..f3a5dbc8d0b 100644
--- a/board/renesas/stout/stout_spl.c
+++ b/board/renesas/stout/stout_spl.c
@@ -9,6 +9,7 @@
 #include <cpu_func.h>
 #include <init.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <dm/platform_data/serial_sh.h>
 #include <asm/processor.h>
 #include <asm/mach-types.h>
diff --git a/board/renesas/ulcb/cpld.c b/board/renesas/ulcb/cpld.c
index c9579a9dd17..b443c36b1df 100644
--- a/board/renesas/ulcb/cpld.c
+++ b/board/renesas/ulcb/cpld.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <stdio.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <dm.h>
diff --git a/board/rockchip/evb_rk3308/evb_rk3308.c b/board/rockchip/evb_rk3308/evb_rk3308.c
index e0c96fd70a2..efe6363a413 100644
--- a/board/rockchip/evb_rk3308/evb_rk3308.c
+++ b/board/rockchip/evb_rk3308/evb_rk3308.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <adc.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/rockchip/kylin_rk3036/kylin_rk3036.c b/board/rockchip/kylin_rk3036/kylin_rk3036.c
index 0ca91cdeb01..6caee58e9d8 100644
--- a/board/rockchip/kylin_rk3036/kylin_rk3036.c
+++ b/board/rockchip/kylin_rk3036/kylin_rk3036.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <env.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch-rockchip/uart.h>
 #include <asm/arch-rockchip/sdram_rk3036.h>
diff --git a/board/ronetix/pm9263/pm9263.c b/board/ronetix/pm9263/pm9263.c
index ec73ced7604..58263a90823 100644
--- a/board/ronetix/pm9263/pm9263.c
+++ b/board/ronetix/pm9263/pm9263.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/sizes.h>
diff --git a/board/samsung/arndale/arndale.c b/board/samsung/arndale/arndale.c
index d1525b4a856..fa568f76c66 100644
--- a/board/samsung/arndale/arndale.c
+++ b/board/samsung/arndale/arndale.c
@@ -7,6 +7,7 @@
 #include <cpu_func.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <usb.h>
 #include <asm/global_data.h>
 #include <asm/gpio.h>
diff --git a/board/samsung/common/board.c b/board/samsung/common/board.c
index ae66bc73fd1..8ee9ca43c41 100644
--- a/board/samsung/common/board.c
+++ b/board/samsung/common/board.c
@@ -14,6 +14,7 @@
 #include <log.h>
 #include <net.h>
 #include <spi.h>
+#include <stdio.h>
 #include <tmu.h>
 #include <netdev.h>
 #include <asm/global_data.h>
diff --git a/board/samsung/common/misc.c b/board/samsung/common/misc.c
index 0243d8971c8..eef565d1cee 100644
--- a/board/samsung/common/misc.c
+++ b/board/samsung/common/misc.c
@@ -9,6 +9,7 @@
 #include <env.h>
 #include <lcd.h>
 #include <libtizen.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/printk.h>
diff --git a/board/samsung/goni/goni.c b/board/samsung/goni/goni.c
index 1631e68e713..9476a437113 100644
--- a/board/samsung/goni/goni.c
+++ b/board/samsung/goni/goni.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/arch/mmc.h>
diff --git a/board/samsung/smdkc100/smdkc100.c b/board/samsung/smdkc100/smdkc100.c
index f343a6f9dfe..38cfde4f136 100644
--- a/board/samsung/smdkc100/smdkc100.c
+++ b/board/samsung/smdkc100/smdkc100.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
diff --git a/board/samsung/smdkv310/smdkv310.c b/board/samsung/smdkv310/smdkv310.c
index 0be4ddf92d8..58b71df0817 100644
--- a/board/samsung/smdkv310/smdkv310.c
+++ b/board/samsung/smdkv310/smdkv310.c
@@ -7,6 +7,7 @@
 #include <init.h>
 #include <log.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
diff --git a/board/samsung/trats/trats.c b/board/samsung/trats/trats.c
index 2e80dbbc84a..b79a8724273 100644
--- a/board/samsung/trats/trats.c
+++ b/board/samsung/trats/trats.c
@@ -10,6 +10,7 @@
 #include <env.h>
 #include <lcd.h>
 #include <log.h>
+#include <stdio.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 69e0ef192d1..6880dcda1ca 100644
--- a/board/samsung/trats2/trats2.c
+++ b/board/samsung/trats2/trats2.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <lcd.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/gpio.h>
 #include <asm/arch/pinmux.h>
 #include <asm/arch/power.h>
diff --git a/board/samsung/universal_c210/universal.c b/board/samsung/universal_c210/universal.c
index 732f70f576c..65ab6e49986 100644
--- a/board/samsung/universal_c210/universal.c
+++ b/board/samsung/universal_c210/universal.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <spi.h>
 #include <lcd.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
diff --git a/board/sandbox/sandbox.c b/board/sandbox/sandbox.c
index 9773074d088..f1d93dc0aa1 100644
--- a/board/sandbox/sandbox.c
+++ b/board/sandbox/sandbox.c
@@ -11,6 +11,7 @@
 #include <init.h>
 #include <led.h>
 #include <os.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/global_data.h>
 #include <asm/test.h>
diff --git a/board/sbc8349/sbc8349.c b/board/sbc8349/sbc8349.c
index 7e1beeafa6c..a0cfa407694 100644
--- a/board/sbc8349/sbc8349.c
+++ b/board/sbc8349/sbc8349.c
@@ -12,6 +12,7 @@
 #include <init.h>
 #include <ioports.h>
 #include <mpc83xx.h>
+#include <stdio.h>
 #include <asm/bitops.h>
 #include <asm/global_data.h>
 #include <asm/mpc8349_pci.h>
diff --git a/board/sbc8548/ddr.c b/board/sbc8548/ddr.c
index c3239fd1e1a..0c96e96d6c4 100644
--- a/board/sbc8548/ddr.c
+++ b/board/sbc8548/ddr.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <i2c.h>
+#include <stdio.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 
diff --git a/board/sbc8548/sbc8548.c b/board/sbc8548/sbc8548.c
index b3c1da920a8..7780b53a204 100644
--- a/board/sbc8548/sbc8548.c
+++ b/board/sbc8548/sbc8548.c
@@ -15,6 +15,7 @@
 #include <log.h>
 #include <net.h>
 #include <pci.h>
+#include <stdio.h>
 #include <asm/processor.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_pci.h>
diff --git a/board/schulercontrol/sc_sps_1/sc_sps_1.c b/board/schulercontrol/sc_sps_1/sc_sps_1.c
index a5b25b60fc4..23345604d63 100644
--- a/board/schulercontrol/sc_sps_1/sc_sps_1.c
+++ b/board/schulercontrol/sc_sps_1/sc_sps_1.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
diff --git a/board/seco/common/mx6.c b/board/seco/common/mx6.c
index 51832b9d082..eaf7edf952d 100644
--- a/board/seco/common/mx6.c
+++ b/board/seco/common/mx6.c
@@ -7,6 +7,7 @@
  * Modified by: Boris Brezillon <boris.brezillon@free-electrons.com>
  */
 
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux.h>
diff --git a/board/seco/mx6quq7/mx6quq7.c b/board/seco/mx6quq7/mx6quq7.c
index 138c6e04291..e022e057b64 100644
--- a/board/seco/mx6quq7/mx6quq7.c
+++ b/board/seco/mx6quq7/mx6quq7.c
@@ -9,6 +9,7 @@
 
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux.h>
diff --git a/board/siemens/capricorn/board.c b/board/siemens/capricorn/board.c
index 03418707a85..18d9c64f55a 100644
--- a/board/siemens/capricorn/board.c
+++ b/board/siemens/capricorn/board.c
@@ -19,6 +19,7 @@
 #include <led.h>
 #include <pca953x.h>
 #include <power-domain.h>
+#include <stdio.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 db063659a47..0a11f25c288 100644
--- a/board/siemens/common/board.c
+++ b/board/siemens/common/board.c
@@ -17,6 +17,7 @@
 #include <malloc.h>
 #include <serial.h>
 #include <spl.h>
+#include <stdio.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 5ceb0871fa0..75c34797322 100644
--- a/board/siemens/common/factoryset.c
+++ b/board/siemens/common/factoryset.c
@@ -17,6 +17,7 @@
 #if !CONFIG_IS_ENABLED(TARGET_GIEDI) && !CONFIG_IS_ENABLED(TARGET_DENEB)
 #include <asm/arch/cpu.h>
 #endif
+#include <stdio.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/unaligned.h>
 #include <net.h>
diff --git a/board/siemens/draco/board.c b/board/siemens/draco/board.c
index 2c15cfdda3f..83cc14421dc 100644
--- a/board/siemens/draco/board.c
+++ b/board/siemens/draco/board.c
@@ -19,6 +19,7 @@
 #include <init.h>
 #include <net.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/omap.h>
diff --git a/board/siemens/draco/board.h b/board/siemens/draco/board.h
index 7c29a45c036..3e8ce399229 100644
--- a/board/siemens/draco/board.h
+++ b/board/siemens/draco/board.h
@@ -15,6 +15,7 @@
 #ifndef _BOARD_H_
 #define _BOARD_H_
 
+#include <stdio.h>
 #define PARGS(x)	#x , /* Parameter Name */ \
 			settings.ddr3.x, /* EEPROM Value */ \
 			ddr3_default.x, /* Default Value */ \
diff --git a/board/siemens/pxm2/board.c b/board/siemens/pxm2/board.c
index 8ab3610da7d..4fec3d8c95e 100644
--- a/board/siemens/pxm2/board.c
+++ b/board/siemens/pxm2/board.c
@@ -20,6 +20,7 @@
 #include <malloc.h>
 #include <net.h>
 #include <spl.h>
+#include <stdio.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 84053b10d84..531ed7e1597 100644
--- a/board/siemens/rut/board.c
+++ b/board/siemens/rut/board.c
@@ -18,6 +18,7 @@
 #include <net.h>
 #include <spi.h>
 #include <spl.h>
+#include <stdio.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 3fb7d6bca22..631812f1508 100644
--- a/board/siemens/taurus/taurus.c
+++ b/board/siemens/taurus/taurus.c
@@ -17,6 +17,7 @@
 #include <env.h>
 #include <flash.h>
 #include <init.h>
+#include <stdio.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 3542bd1ecab..ad0fcc20470 100644
--- a/board/sifive/fu540/fu540.c
+++ b/board/sifive/fu540/fu540.c
@@ -10,6 +10,7 @@
 #include <env.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/bug.h>
diff --git a/board/sks-kinkel/sksimx6/sksimx6.c b/board/sks-kinkel/sksimx6/sksimx6.c
index cbf3a5952be..15c75959e6a 100644
--- a/board/sks-kinkel/sksimx6/sksimx6.c
+++ b/board/sks-kinkel/sksimx6/sksimx6.c
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux.h>
diff --git a/board/socrates/nand.c b/board/socrates/nand.c
index 07c493679bf..3fca5d063ca 100644
--- a/board/socrates/nand.c
+++ b/board/socrates/nand.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 
 #if defined(CONFIG_SYS_NAND_BASE)
 #include <nand.h>
diff --git a/board/socrates/socrates.c b/board/socrates/socrates.c
index 711ddcf256e..96cde5afcbe 100644
--- a/board/socrates/socrates.c
+++ b/board/socrates/socrates.c
@@ -15,6 +15,7 @@
 #include <env.h>
 #include <init.h>
 #include <pci.h>
+#include <stdio.h>
 #include <uuid.h>
 #include <asm/global_data.h>
 #include <asm/processor.h>
diff --git a/board/softing/vining_2000/vining_2000.c b/board/softing/vining_2000/vining_2000.c
index 93670b7a946..7c9c8d78b33 100644
--- a/board/softing/vining_2000/vining_2000.c
+++ b/board/softing/vining_2000/vining_2000.c
@@ -8,6 +8,7 @@
 
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/iomux.h>
diff --git a/board/softing/vining_fpga/socfpga.c b/board/softing/vining_fpga/socfpga.c
index 6eec9815f28..e9f7eb6cfb9 100644
--- a/board/softing/vining_fpga/socfpga.c
+++ b/board/softing/vining_fpga/socfpga.c
@@ -9,6 +9,7 @@
 #include <init.h>
 #include <net.h>
 #include <status_led.h>
+#include <stdio.h>
 #include <asm/arch/reset_manager.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/board/solidrun/clearfog/clearfog.c b/board/solidrun/clearfog/clearfog.c
index 46ffc026f34..660962364f6 100644
--- a/board/solidrun/clearfog/clearfog.c
+++ b/board/solidrun/clearfog/clearfog.c
@@ -10,6 +10,7 @@
 #include <miiphy.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
diff --git a/board/solidrun/mx6cuboxi/mx6cuboxi.c b/board/solidrun/mx6cuboxi/mx6cuboxi.c
index 9057ac9470a..6318d7f2393 100644
--- a/board/solidrun/mx6cuboxi/mx6cuboxi.c
+++ b/board/solidrun/mx6cuboxi/mx6cuboxi.c
@@ -17,6 +17,7 @@
 #include <image.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux.h>
diff --git a/board/somlabs/visionsom-6ull/visionsom-6ull.c b/board/somlabs/visionsom-6ull/visionsom-6ull.c
index 55470cd2d17..7c330101bb0 100644
--- a/board/somlabs/visionsom-6ull/visionsom-6ull.c
+++ b/board/somlabs/visionsom-6ull/visionsom-6ull.c
@@ -5,6 +5,7 @@
  */
 
 #include <init.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/spear/x600/x600.c b/board/spear/x600/x600.c
index fcc7524121c..e3e9008fa3e 100644
--- a/board/spear/x600/x600.c
+++ b/board/spear/x600/x600.c
@@ -15,6 +15,7 @@
 #include <netdev.h>
 #include <phy.h>
 #include <rtc.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/mach-types.h>
 #include <asm/arch/hardware.h>
diff --git a/board/st/common/stm32mp_dfu.c b/board/st/common/stm32mp_dfu.c
index 95d63aaf54f..e3059808e16 100644
--- a/board/st/common/stm32mp_dfu.c
+++ b/board/st/common/stm32mp_dfu.c
@@ -11,6 +11,7 @@
 #include <misc.h>
 #include <mtd.h>
 #include <mtd_node.h>
+#include <stdio.h>
 #include <asm/arch/stm32prog.h>
 #include <linux/printk.h>
 #include <linux/string.h>
diff --git a/board/st/common/stpmic1.c b/board/st/common/stpmic1.c
index 3aa379e8a50..042476dc318 100644
--- a/board/st/common/stpmic1.c
+++ b/board/st/common/stpmic1.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/ddr.h>
 #include <linux/bitops.h>
diff --git a/board/st/stm32f746-disco/stm32f746-disco.c b/board/st/stm32f746-disco/stm32f746-disco.c
index 07471d54e8e..cf553ff5b6a 100644
--- a/board/st/stm32f746-disco/stm32f746-disco.c
+++ b/board/st/stm32f746-disco/stm32f746-disco.c
@@ -16,6 +16,7 @@
 #include <spl.h>
 #include <splash.h>
 #include <st_logo_data.h>
+#include <stdio.h>
 #include <video.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/board/st/stm32mp1/stm32mp1.c b/board/st/stm32mp1/stm32mp1.c
index c941628eb4c..cf78db5b44e 100644
--- a/board/st/stm32mp1/stm32mp1.c
+++ b/board/st/stm32mp1/stm32mp1.c
@@ -26,6 +26,7 @@
 #include <phy.h>
 #include <remoteproc.h>
 #include <reset.h>
+#include <stdio.h>
 #include <syscon.h>
 #include <usb.h>
 #include <watchdog.h>
diff --git a/board/st/stv0991/stv0991.c b/board/st/stv0991/stv0991.c
index e2d62a7ede9..bd2d56d6d59 100644
--- a/board/st/stv0991/stv0991.c
+++ b/board/st/stv0991/stv0991.c
@@ -10,6 +10,7 @@
 #include <init.h>
 #include <miiphy.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/arch/stv0991_periph.h>
 #include <asm/arch/stv0991_defs.h>
 #include <asm/arch/hardware.h>
diff --git a/board/sunxi/board.c b/board/sunxi/board.c
index a34b1f4cf17..cca98e2d542 100644
--- a/board/sunxi/board.c
+++ b/board/sunxi/board.c
@@ -21,6 +21,7 @@
 #include <axp_pmic.h>
 #include <generic-phy.h>
 #include <phy-sun4i-usb.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/display.h>
diff --git a/board/synopsys/axs10x/axs10x.c b/board/synopsys/axs10x/axs10x.c
index 75e4d037623..8faaf8045c1 100644
--- a/board/synopsys/axs10x/axs10x.c
+++ b/board/synopsys/axs10x/axs10x.c
@@ -8,6 +8,7 @@
 #include <dwmmc.h>
 #include <init.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/arcregs.h>
 #include <asm/global_data.h>
 #include "axs10x.h"
diff --git a/board/synopsys/emsdp/emsdp.c b/board/synopsys/emsdp/emsdp.c
index a2eaf36ef13..7a33440f273 100644
--- a/board/synopsys/emsdp/emsdp.c
+++ b/board/synopsys/emsdp/emsdp.c
@@ -9,6 +9,7 @@
 #include <dwmmc.h>
 #include <init.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/string.h>
diff --git a/board/synopsys/hsdk/clk-lib.c b/board/synopsys/hsdk/clk-lib.c
index eed0fa15b19..93f3dca9afd 100644
--- a/board/synopsys/hsdk/clk-lib.c
+++ b/board/synopsys/hsdk/clk-lib.c
@@ -7,6 +7,7 @@
 #include <clk.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <dm/device.h>
 #include <linux/printk.h>
 
diff --git a/board/synopsys/hsdk/hsdk.c b/board/synopsys/hsdk/hsdk.c
index 8644a41fe0b..9c6e8dbc8f2 100644
--- a/board/synopsys/hsdk/hsdk.c
+++ b/board/synopsys/hsdk/hsdk.c
@@ -13,6 +13,7 @@
 #include <init.h>
 #include <irq_func.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
diff --git a/board/synopsys/iot_devkit/iot_devkit.c b/board/synopsys/iot_devkit/iot_devkit.c
index c6051363c1f..151ade5fb7c 100644
--- a/board/synopsys/iot_devkit/iot_devkit.c
+++ b/board/synopsys/iot_devkit/iot_devkit.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <malloc.h>
 #include <dwmmc.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/libfdt.h>
diff --git a/board/synopsys/nsim/nsim.c b/board/synopsys/nsim/nsim.c
index 00e5cc36414..06eea41eb78 100644
--- a/board/synopsys/nsim/nsim.c
+++ b/board/synopsys/nsim/nsim.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <dm/device.h>
 #include <virtio_types.h>
 #include <virtio.h>
diff --git a/board/sysam/amcore/amcore.c b/board/sysam/amcore/amcore.c
index 9e1b8022705..183a78d9ed7 100644
--- a/board/sysam/amcore/amcore.c
+++ b/board/sysam/amcore/amcore.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/immap.h>
 #include <asm/io.h>
diff --git a/board/sysam/stmark2/stmark2.c b/board/sysam/stmark2/stmark2.c
index d48da48b69d..4c75bd6a5be 100644
--- a/board/sysam/stmark2/stmark2.c
+++ b/board/sysam/stmark2/stmark2.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <init.h>
 #include <spi.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/immap.h>
diff --git a/board/tbs/tbs2910/tbs2910.c b/board/tbs/tbs2910/tbs2910.c
index a35efc9848a..6cbb22ef99e 100644
--- a/board/tbs/tbs2910/tbs2910.c
+++ b/board/tbs/tbs2910/tbs2910.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux.h>
diff --git a/board/tcl/sl50/board.c b/board/tcl/sl50/board.c
index 8095053fd60..7adaea5d587 100644
--- a/board/tcl/sl50/board.c
+++ b/board/tcl/sl50/board.c
@@ -14,6 +14,7 @@
 #include <net.h>
 #include <serial.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/omap.h>
diff --git a/board/technexion/pico-imx6/pico-imx6.c b/board/technexion/pico-imx6/pico-imx6.c
index 90592900ec6..87a78f41843 100644
--- a/board/technexion/pico-imx6/pico-imx6.c
+++ b/board/technexion/pico-imx6/pico-imx6.c
@@ -10,6 +10,7 @@
 #include <env.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/iomux.h>
diff --git a/board/technexion/pico-imx6ul/pico-imx6ul.c b/board/technexion/pico-imx6ul/pico-imx6ul.c
index 0d972158b1c..11ae82b6bf2 100644
--- a/board/technexion/pico-imx6ul/pico-imx6ul.c
+++ b/board/technexion/pico-imx6ul/pico-imx6ul.c
@@ -7,6 +7,7 @@
 
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/technexion/pico-imx6ul/spl.c b/board/technexion/pico-imx6ul/spl.c
index bea16a7ab9f..0c5b166b653 100644
--- a/board/technexion/pico-imx6ul/spl.c
+++ b/board/technexion/pico-imx6ul/spl.c
@@ -4,6 +4,7 @@
 #include <cpu_func.h>
 #include <hang.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/technexion/pico-imx7d/pico-imx7d.c b/board/technexion/pico-imx7d/pico-imx7d.c
index b7582f2148a..18b2a0082ed 100644
--- a/board/technexion/pico-imx7d/pico-imx7d.c
+++ b/board/technexion/pico-imx7d/pico-imx7d.c
@@ -5,6 +5,7 @@
 
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/technexion/pico-imx8mq/pico-imx8mq.c b/board/technexion/pico-imx8mq/pico-imx8mq.c
index 2ac96146f43..f89bcc2e032 100644
--- a/board/technexion/pico-imx8mq/pico-imx8mq.c
+++ b/board/technexion/pico-imx8mq/pico-imx8mq.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <malloc.h>
 #include <errno.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <miiphy.h>
diff --git a/board/technexion/pico-imx8mq/spl.c b/board/technexion/pico-imx8mq/spl.c
index 02b2a01cae7..048ffb48d3f 100644
--- a/board/technexion/pico-imx8mq/spl.c
+++ b/board/technexion/pico-imx8mq/spl.c
@@ -7,6 +7,7 @@
 #include <hang.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/ddr.h>
 #include <asm/arch/imx8mq_pins.h>
diff --git a/board/technexion/tao3530/tao3530.c b/board/technexion/tao3530/tao3530.c
index 157ad85d4f7..31bf21c94cb 100644
--- a/board/technexion/tao3530/tao3530.c
+++ b/board/technexion/tao3530/tao3530.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <malloc.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <twl4030.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/board/technologic/ts4600/ts4600.c b/board/technologic/ts4600/ts4600.c
index 7daac4e53aa..033fdcd9713 100644
--- a/board/technologic/ts4600/ts4600.c
+++ b/board/technologic/ts4600/ts4600.c
@@ -15,6 +15,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
diff --git a/board/technologic/ts4800/ts4800.c b/board/technologic/ts4800/ts4800.c
index 61ec4ffb831..37347949a38 100644
--- a/board/technologic/ts4800/ts4800.c
+++ b/board/technologic/ts4800/ts4800.c
@@ -10,6 +10,7 @@
 #include <init.h>
 #include <log.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
diff --git a/board/theadorable/theadorable.c b/board/theadorable/theadorable.c
index 9664a8c0ef3..090a471a717 100644
--- a/board/theadorable/theadorable.c
+++ b/board/theadorable/theadorable.c
@@ -13,6 +13,7 @@
 #if !defined(CONFIG_SPL_BUILD)
 #include <bootcount.h>
 #endif
+#include <stdio.h>
 #include <time.h>
 #include <asm/global_data.h>
 #include <asm/gpio.h>
diff --git a/board/ti/am335x/board.c b/board/ti/am335x/board.c
index 7103dc454d8..0fa4d31a2e7 100644
--- a/board/ti/am335x/board.c
+++ b/board/ti/am335x/board.c
@@ -17,6 +17,7 @@
 #include <net.h>
 #include <spl.h>
 #include <serial.h>
+#include <stdio.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/omap.h>
diff --git a/board/ti/am335x/mux.c b/board/ti/am335x/mux.c
index 6fb2c009ba0..b5333b10ab7 100644
--- a/board/ti/am335x/mux.c
+++ b/board/ti/am335x/mux.c
@@ -14,6 +14,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/mux.h>
diff --git a/board/ti/am43xx/board.c b/board/ti/am43xx/board.c
index 463dccc0ccb..28bc5333c52 100644
--- a/board/ti/am43xx/board.c
+++ b/board/ti/am43xx/board.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <eeprom.h>
 #include <image.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <dm/uclass.h>
diff --git a/board/ti/am43xx/mux.c b/board/ti/am43xx/mux.c
index f59e93a0ebb..13591a369f5 100644
--- a/board/ti/am43xx/mux.c
+++ b/board/ti/am43xx/mux.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/mux.h>
 #include "../common/board_detect.h"
diff --git a/board/ti/am57xx/board.c b/board/ti/am57xx/board.c
index fca15a9a629..e0fb2b39b7d 100644
--- a/board/ti/am57xx/board.c
+++ b/board/ti/am57xx/board.c
@@ -17,6 +17,7 @@
 #include <palmas.h>
 #include <sata.h>
 #include <serial.h>
+#include <stdio.h>
 #include <usb.h>
 #include <errno.h>
 #include <asm/global_data.h>
diff --git a/board/ti/am65x/evm.c b/board/ti/am65x/evm.c
index e0c6d6fa003..d3e5be34c02 100644
--- a/board/ti/am65x/evm.c
+++ b/board/ti/am65x/evm.c
@@ -13,6 +13,7 @@
 #include <image.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/hardware.h>
 #include <asm/global_data.h>
diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c
index 752cb584c66..fe8aeac9e46 100644
--- a/board/ti/beagle/beagle.c
+++ b/board/ti/beagle/beagle.c
@@ -23,6 +23,7 @@
 #ifdef CONFIG_LED_STATUS
 #include <status_led.h>
 #endif
+#include <stdio.h>
 #include <twl4030.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
diff --git a/board/ti/common/board_detect.c b/board/ti/common/board_detect.c
index f51bacfbbcd..5721ef9e11d 100644
--- a/board/ti/common/board_detect.c
+++ b/board/ti/common/board_detect.c
@@ -11,6 +11,7 @@
 #include <eeprom.h>
 #include <log.h>
 #include <net.h>
+#include <stdio.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 fa56ebb2533..e88aac06683 100644
--- a/board/ti/dra7xx/evm.c
+++ b/board/ti/dra7xx/evm.c
@@ -19,6 +19,7 @@
 #include <palmas.h>
 #include <sata.h>
 #include <serial.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
diff --git a/board/ti/evm/evm.c b/board/ti/evm/evm.c
index 664ddeb4fe9..2716c4d4c08 100644
--- a/board/ti/evm/evm.c
+++ b/board/ti/evm/evm.c
@@ -18,6 +18,7 @@
 #include <ns16550.h>
 #include <netdev.h>
 #include <serial.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/mem.h>
diff --git a/board/ti/j721e/evm.c b/board/ti/j721e/evm.c
index 00d5cb2e685..e34598d6587 100644
--- a/board/ti/j721e/evm.c
+++ b/board/ti/j721e/evm.c
@@ -14,6 +14,7 @@
 #include <init.h>
 #include <log.h>
 #include <net.h>
+#include <stdio.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 ba08c22f942..7b6f04b36be 100644
--- a/board/ti/ks2_evm/board.c
+++ b/board/ti/ks2_evm/board.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
diff --git a/board/ti/ks2_evm/board_k2g.c b/board/ti/ks2_evm/board_k2g.c
index 979b1febc02..e79497752a6 100644
--- a/board/ti/ks2_evm/board_k2g.c
+++ b/board/ti/ks2_evm/board_k2g.c
@@ -11,6 +11,7 @@
 #include <hang.h>
 #include <image.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/ti-common/keystone_net.h>
 #include <asm/arch/psc_defs.h>
diff --git a/board/ti/ks2_evm/ddr3_k2e.c b/board/ti/ks2_evm/ddr3_k2e.c
index 95fe3a9021e..85e70fc6776 100644
--- a/board/ti/ks2_evm/ddr3_k2e.c
+++ b/board/ti/ks2_evm/ddr3_k2e.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include "ddr3_cfg.h"
 #include <asm/arch/ddr3.h>
 
diff --git a/board/ti/ks2_evm/ddr3_k2hk.c b/board/ti/ks2_evm/ddr3_k2hk.c
index 198c5da0e62..03bae4bf91e 100644
--- a/board/ti/ks2_evm/ddr3_k2hk.c
+++ b/board/ti/ks2_evm/ddr3_k2hk.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include "ddr3_cfg.h"
 #include <asm/arch/ddr3.h>
 #include <asm/arch/hardware.h>
diff --git a/board/ti/ks2_evm/ddr3_k2l.c b/board/ti/ks2_evm/ddr3_k2l.c
index 805bf81f6bd..36babcc5e11 100644
--- a/board/ti/ks2_evm/ddr3_k2l.c
+++ b/board/ti/ks2_evm/ddr3_k2l.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include "ddr3_cfg.h"
 #include <asm/arch/ddr3.h>
 
diff --git a/board/ti/ks2_evm/mux-k2g.h b/board/ti/ks2_evm/mux-k2g.h
index 3ecf571c5c3..239064c1dc6 100644
--- a/board/ti/ks2_evm/mux-k2g.h
+++ b/board/ti/ks2_evm/mux-k2g.h
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <hang.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/mux-k2g.h>
 #include <asm/arch/hardware.h>
diff --git a/board/ti/omap5_uevm/evm.c b/board/ti/omap5_uevm/evm.c
index a6c75bda3c3..e47da78fb77 100644
--- a/board/ti/omap5_uevm/evm.c
+++ b/board/ti/omap5_uevm/evm.c
@@ -9,6 +9,7 @@
 #include <init.h>
 #include <net.h>
 #include <palmas.h>
+#include <stdio.h>
 #include <asm/arch/omap.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/mmc_host_def.h>
diff --git a/board/ti/ti816x/evm.c b/board/ti/ti816x/evm.c
index 12c56a607c9..2689e48c8ce 100644
--- a/board/ti/ti816x/evm.c
+++ b/board/ti/ti816x/evm.c
@@ -11,6 +11,7 @@
 #include <init.h>
 #include <net.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/board/timll/devkit8000/devkit8000.c b/board/timll/devkit8000/devkit8000.c
index e1b33d091ee..4c05c9a8b7f 100644
--- a/board/timll/devkit8000/devkit8000.c
+++ b/board/timll/devkit8000/devkit8000.c
@@ -21,6 +21,7 @@
 #include <init.h>
 #include <malloc.h>
 #include <ns16550.h>
+#include <stdio.h>
 #include <twl4030.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/board/toradex/apalis-imx8/apalis-imx8.c b/board/toradex/apalis-imx8/apalis-imx8.c
index 1c4ff3d1984..d46ab222f89 100644
--- a/board/toradex/apalis-imx8/apalis-imx8.c
+++ b/board/toradex/apalis-imx8/apalis-imx8.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 
diff --git a/board/toradex/apalis-tk1/apalis-tk1.c b/board/toradex/apalis-tk1/apalis-tk1.c
index 6d907817593..052a16bb7b3 100644
--- a/board/toradex/apalis-tk1/apalis-tk1.c
+++ b/board/toradex/apalis-tk1/apalis-tk1.c
@@ -8,6 +8,7 @@
 #include <env.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/arch-tegra/ap.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
diff --git a/board/toradex/apalis_imx6/apalis_imx6.c b/board/toradex/apalis_imx6/apalis_imx6.c
index db7746e78c8..76cf8e360f9 100644
--- a/board/toradex/apalis_imx6/apalis_imx6.c
+++ b/board/toradex/apalis_imx6/apalis_imx6.c
@@ -12,6 +12,7 @@
 #include <image.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
diff --git a/board/toradex/apalis_imx6/pf0100.c b/board/toradex/apalis_imx6/pf0100.c
index c89052ff5da..a720099f91e 100644
--- a/board/toradex/apalis_imx6/pf0100.c
+++ b/board/toradex/apalis_imx6/pf0100.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <command.h>
 #include <i2c.h>
+#include <stdio.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/mx6-pins.h>
diff --git a/board/toradex/apalis_t30/apalis_t30.c b/board/toradex/apalis_t30/apalis_t30.c
index cad2f32b665..bdc0691755e 100644
--- a/board/toradex/apalis_t30/apalis_t30.c
+++ b/board/toradex/apalis_t30/apalis_t30.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/arch/gp_padctrl.h>
 #include <asm/arch/pinmux.h>
 #include <asm/arch-tegra/ap.h>
diff --git a/board/toradex/colibri-imx6ull/colibri-imx6ull.c b/board/toradex/colibri-imx6ull/colibri-imx6ull.c
index ee073962964..5d787b61902 100644
--- a/board/toradex/colibri-imx6ull/colibri-imx6ull.c
+++ b/board/toradex/colibri-imx6ull/colibri-imx6ull.c
@@ -4,6 +4,7 @@
  */
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
diff --git a/board/toradex/colibri-imx8x/colibri-imx8x.c b/board/toradex/colibri-imx8x/colibri-imx8x.c
index 09f3525bb45..d80762aec3c 100644
--- a/board/toradex/colibri-imx8x/colibri-imx8x.c
+++ b/board/toradex/colibri-imx8x/colibri-imx8x.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 
diff --git a/board/toradex/colibri_imx6/colibri_imx6.c b/board/toradex/colibri_imx6/colibri_imx6.c
index dc026fd3e40..51e62b6ab20 100644
--- a/board/toradex/colibri_imx6/colibri_imx6.c
+++ b/board/toradex/colibri_imx6/colibri_imx6.c
@@ -12,6 +12,7 @@
 #include <env.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
diff --git a/board/toradex/colibri_imx6/pf0100.c b/board/toradex/colibri_imx6/pf0100.c
index 8f08d8c7337..caaf7553e5a 100644
--- a/board/toradex/colibri_imx6/pf0100.c
+++ b/board/toradex/colibri_imx6/pf0100.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <command.h>
 #include <i2c.h>
+#include <stdio.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/mx6-pins.h>
diff --git a/board/toradex/colibri_imx7/colibri_imx7.c b/board/toradex/colibri_imx7/colibri_imx7.c
index 7d9390cf5eb..a69ff55a6a7 100644
--- a/board/toradex/colibri_imx7/colibri_imx7.c
+++ b/board/toradex/colibri_imx7/colibri_imx7.c
@@ -7,6 +7,7 @@
 #include <cpu_func.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/toradex/colibri_pxa270/colibri_pxa270.c b/board/toradex/colibri_pxa270/colibri_pxa270.c
index 81b7f72d6da..d3716ab85f8 100644
--- a/board/toradex/colibri_pxa270/colibri_pxa270.c
+++ b/board/toradex/colibri_pxa270/colibri_pxa270.c
@@ -11,6 +11,7 @@
 #include <dm.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/pxa.h>
 #include <asm/arch/regs-mmc.h>
diff --git a/board/toradex/colibri_t20/colibri_t20.c b/board/toradex/colibri_t20/colibri_t20.c
index bb37ff7507d..f809260aa21 100644
--- a/board/toradex/colibri_t20/colibri_t20.c
+++ b/board/toradex/colibri_t20/colibri_t20.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/funcmux.h>
 #include <asm/arch/pinmux.h>
diff --git a/board/toradex/colibri_t30/colibri_t30.c b/board/toradex/colibri_t30/colibri_t30.c
index de13ec49c5f..7a185ef8ec9 100644
--- a/board/toradex/colibri_t30/colibri_t30.c
+++ b/board/toradex/colibri_t30/colibri_t30.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/arch/gp_padctrl.h>
 #include <asm/arch/pinmux.h>
 #include <asm/arch-tegra/ap.h>
diff --git a/board/toradex/colibri_vf/colibri_vf.c b/board/toradex/colibri_vf/colibri_vf.c
index 5056447761d..071c6b55b82 100644
--- a/board/toradex/colibri_vf/colibri_vf.c
+++ b/board/toradex/colibri_vf/colibri_vf.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 
diff --git a/board/toradex/common/tdx-cfg-block.c b/board/toradex/common/tdx-cfg-block.c
index 5c88a984b7e..fa9716cf57d 100644
--- a/board/toradex/common/tdx-cfg-block.c
+++ b/board/toradex/common/tdx-cfg-block.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <stdio.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 29d4972df8e..523c1bd8ca2 100644
--- a/board/toradex/common/tdx-common.c
+++ b/board/toradex/common/tdx-common.c
@@ -7,6 +7,7 @@
 #include <env.h>
 #include <g_dnl.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <linux/string.h>
diff --git a/board/toradex/verdin-imx8mm/spl.c b/board/toradex/verdin-imx8mm/spl.c
index c593ac01cd3..2b59d90fa4f 100644
--- a/board/toradex/verdin-imx8mm/spl.c
+++ b/board/toradex/verdin-imx8mm/spl.c
@@ -8,6 +8,7 @@
 #include <image.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/ddr.h>
 #include <asm/arch/imx8mm_pins.h>
diff --git a/board/tqc/tqm834x/tqm834x.c b/board/tqc/tqm834x/tqm834x.c
index 9e22d4ebcf8..98a04ff9067 100644
--- a/board/tqc/tqm834x/tqm834x.c
+++ b/board/tqc/tqm834x/tqm834x.c
@@ -10,6 +10,7 @@
 #include <ioports.h>
 #include <log.h>
 #include <mpc83xx.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/mpc8349_pci.h>
 #include <i2c.h>
diff --git a/board/tqc/tqma6/tqma6.c b/board/tqc/tqma6/tqma6.c
index d9bbbfc5e43..5ebbdda38e2 100644
--- a/board/tqc/tqma6/tqma6.c
+++ b/board/tqc/tqma6/tqma6.c
@@ -8,6 +8,7 @@
  */
 
 #include <init.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/mx6-pins.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/tqc/tqma6/tqma6_wru4.c b/board/tqc/tqma6/tqma6_wru4.c
index 9a4350cce6d..70b1626e972 100644
--- a/board/tqc/tqma6/tqma6_wru4.c
+++ b/board/tqc/tqma6/tqma6_wru4.c
@@ -11,6 +11,7 @@
 
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/mx6-pins.h>
diff --git a/board/udoo/neo/neo.c b/board/udoo/neo/neo.c
index 1ae4bc33978..0a8f0fec9ce 100644
--- a/board/udoo/neo/neo.c
+++ b/board/udoo/neo/neo.c
@@ -10,6 +10,7 @@
 
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/udoo/udoo.c b/board/udoo/udoo.c
index e6d441f582b..c0cd357845e 100644
--- a/board/udoo/udoo.c
+++ b/board/udoo/udoo.c
@@ -7,6 +7,7 @@
 
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux.h>
diff --git a/board/variscite/dart_6ul/dart_6ul.c b/board/variscite/dart_6ul/dart_6ul.c
index 6378d44863b..ec1e1d262cf 100644
--- a/board/variscite/dart_6ul/dart_6ul.c
+++ b/board/variscite/dart_6ul/dart_6ul.c
@@ -6,6 +6,7 @@
 
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/mx6-pins.h>
diff --git a/board/variscite/dart_6ul/spl.c b/board/variscite/dart_6ul/spl.c
index 49ff41cab0f..7610182b725 100644
--- a/board/variscite/dart_6ul/spl.c
+++ b/board/variscite/dart_6ul/spl.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <init.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/io.h>
 #include <asm/arch/mx6-ddr.h>
diff --git a/board/varisys/common/sys_eeprom.c b/board/varisys/common/sys_eeprom.c
index facda8e5419..7667bbdc579 100644
--- a/board/varisys/common/sys_eeprom.c
+++ b/board/varisys/common/sys_eeprom.c
@@ -14,6 +14,7 @@
 #include <command.h>
 #include <env.h>
 #include <i2c.h>
+#include <stdio.h>
 #include <linux/ctype.h>
 #include <linux/delay.h>
 #include <linux/string.h>
diff --git a/board/varisys/cyrus/cyrus.c b/board/varisys/cyrus/cyrus.c
index 0c8060e4d7d..a7721274aed 100644
--- a/board/varisys/cyrus/cyrus.c
+++ b/board/varisys/cyrus/cyrus.c
@@ -10,6 +10,7 @@
 #include <image.h>
 #include <init.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 #include <linux/compiler.h>
 #include <asm/mmu.h>
diff --git a/board/varisys/cyrus/ddr.c b/board/varisys/cyrus/ddr.c
index 2f732dd18f7..98cc1d9db7f 100644
--- a/board/varisys/cyrus/ddr.c
+++ b/board/varisys/cyrus/ddr.c
@@ -8,6 +8,7 @@
 #include <hwconfig.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/mmu.h>
 #include <fsl_ddr_sdram.h>
diff --git a/board/varisys/cyrus/eth.c b/board/varisys/cyrus/eth.c
index 07e3b979c47..b85e8208be1 100644
--- a/board/varisys/cyrus/eth.c
+++ b/board/varisys/cyrus/eth.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/fsl_serdes.h>
 #include <fm_eth.h>
 #include <fsl_mdio.h>
diff --git a/board/ve8313/ve8313.c b/board/ve8313/ve8313.c
index dcd6d2a132e..34422424bee 100644
--- a/board/ve8313/ve8313.c
+++ b/board/ve8313/ve8313.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <fdt_support.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
diff --git a/board/vscom/baltos/board.c b/board/vscom/baltos/board.c
index f01a78897c6..045e46aba30 100644
--- a/board/vscom/baltos/board.c
+++ b/board/vscom/baltos/board.c
@@ -13,6 +13,7 @@
 #include <init.h>
 #include <net.h>
 #include <serial.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/libfdt.h>
diff --git a/board/wandboard/spl.c b/board/wandboard/spl.c
index c61428d6c64..e6ba3561217 100644
--- a/board/wandboard/spl.c
+++ b/board/wandboard/spl.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux.h>
diff --git a/board/wandboard/wandboard.c b/board/wandboard/wandboard.c
index e7e3bf6f8de..d0a42c16a54 100644
--- a/board/wandboard/wandboard.c
+++ b/board/wandboard/wandboard.c
@@ -10,6 +10,7 @@
 #include <image.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/iomux.h>
diff --git a/board/warp/warp.c b/board/warp/warp.c
index fbf7a5be71c..73d7aca7aad 100644
--- a/board/warp/warp.c
+++ b/board/warp/warp.c
@@ -8,6 +8,7 @@
  */
 
 #include <init.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/warp7/warp7.c b/board/warp7/warp7.c
index 929ec65947c..d13a10e1a7c 100644
--- a/board/warp7/warp7.c
+++ b/board/warp7/warp7.c
@@ -6,6 +6,7 @@
 
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/mx7-pins.h>
diff --git a/board/work-microwave/work_92105/work_92105_display.c b/board/work-microwave/work_92105/work_92105_display.c
index eefcb8545f5..53d5d3c5a83 100644
--- a/board/work-microwave/work_92105/work_92105_display.c
+++ b/board/work-microwave/work_92105/work_92105_display.c
@@ -13,6 +13,7 @@
 #include <common.h>
 #include <command.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/emc.h>
diff --git a/board/xes/common/board.c b/board/xes/common/board.c
index b6aeee3f2ca..eb9749f8a71 100644
--- a/board/xes/common/board.c
+++ b/board/xes/common/board.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <env.h>
+#include <stdio.h>
 #include <linux/string.h>
 #include "fsl_8xxx_misc.h"
 #include <init.h>
diff --git a/board/xes/common/fsl_8xxx_pci.c b/board/xes/common/fsl_8xxx_pci.c
index c4aa04b41c9..6c6db6c2fcf 100644
--- a/board/xes/common/fsl_8xxx_pci.c
+++ b/board/xes/common/fsl_8xxx_pci.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <init.h>
 #include <pci.h>
+#include <stdio.h>
 #include <asm/fsl_pci.h>
 #include <asm/fsl_serdes.h>
 #include <asm/io.h>
diff --git a/board/xes/xpedite517x/xpedite517x.c b/board/xes/xpedite517x/xpedite517x.c
index 333edd4cd99..768b1027110 100644
--- a/board/xes/xpedite517x/xpedite517x.c
+++ b/board/xes/xpedite517x/xpedite517x.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/processor.h>
 #include <fsl_ddr_sdram.h>
diff --git a/board/xes/xpedite520x/xpedite520x.c b/board/xes/xpedite520x/xpedite520x.c
index 016bd412ce8..2433bcd6459 100644
--- a/board/xes/xpedite520x/xpedite520x.c
+++ b/board/xes/xpedite520x/xpedite520x.c
@@ -8,6 +8,7 @@
 #include <command.h>
 #include <init.h>
 #include <pci.h>
+#include <stdio.h>
 #include <asm/processor.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_pci.h>
diff --git a/board/xes/xpedite537x/xpedite537x.c b/board/xes/xpedite537x/xpedite537x.c
index a55c7d24264..8aeca7de758 100644
--- a/board/xes/xpedite537x/xpedite537x.c
+++ b/board/xes/xpedite537x/xpedite537x.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <command.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/processor.h>
 #include <asm/mmu.h>
 #include <asm/immap_85xx.h>
diff --git a/board/xes/xpedite550x/ddr.c b/board/xes/xpedite550x/ddr.c
index e6fb11dfcba..419b25d6ad4 100644
--- a/board/xes/xpedite550x/ddr.c
+++ b/board/xes/xpedite550x/ddr.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <i2c.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 
 #include <fsl_ddr_sdram.h>
diff --git a/board/xes/xpedite550x/xpedite550x.c b/board/xes/xpedite550x/xpedite550x.c
index 9347b895885..69d3292af27 100644
--- a/board/xes/xpedite550x/xpedite550x.c
+++ b/board/xes/xpedite550x/xpedite550x.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <command.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/processor.h>
 #include <asm/mmu.h>
 #include <asm/immap_85xx.h>
diff --git a/board/xilinx/microblaze-generic/microblaze-generic.c b/board/xilinx/microblaze-generic/microblaze-generic.c
index 7729ce915ea..49478b05bea 100644
--- a/board/xilinx/microblaze-generic/microblaze-generic.c
+++ b/board/xilinx/microblaze-generic/microblaze-generic.c
@@ -15,6 +15,7 @@
 #include <env.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <dm/lists.h>
 #include <fdtdec.h>
diff --git a/board/xilinx/versal/board.c b/board/xilinx/versal/board.c
index 962f482f585..6254df95716 100644
--- a/board/xilinx/versal/board.c
+++ b/board/xilinx/versal/board.c
@@ -11,6 +11,7 @@
 #include <init.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
diff --git a/board/xilinx/zynq/bootimg.c b/board/xilinx/zynq/bootimg.c
index 1a9d3ed3ec5..332500bdc72 100644
--- a/board/xilinx/zynq/bootimg.c
+++ b/board/xilinx/zynq/bootimg.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <log.h>
 #include <part.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
diff --git a/board/xilinx/zynq/cmds.c b/board/xilinx/zynq/cmds.c
index cad94339fc7..c0da312b5d8 100644
--- a/board/xilinx/zynq/cmds.c
+++ b/board/xilinx/zynq/cmds.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <command.h>
 #include <log.h>
+#include <stdio.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 c0d28a73e45..48898f69c93 100644
--- a/board/xilinx/zynqmp/cmds.c
+++ b/board/xilinx/zynqmp/cmds.c
@@ -9,6 +9,7 @@
 #include <cpu_func.h>
 #include <env.h>
 #include <malloc.h>
+#include <stdio.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 fa06a4237f6..2a1eb645574 100644
--- a/board/xilinx/zynqmp/zynqmp.c
+++ b/board/xilinx/zynqmp/zynqmp.c
@@ -16,6 +16,7 @@
 #include <ahci.h>
 #include <scsi.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <wdt.h>
 #include <asm/arch/clk.h>
 #include <asm/arch/hardware.h>
diff --git a/board/zyxel/nsa310s/nsa310s.c b/board/zyxel/nsa310s/nsa310s.c
index 738286f7f14..ad36ee23471 100644
--- a/board/zyxel/nsa310s/nsa310s.c
+++ b/board/zyxel/nsa310s/nsa310s.c
@@ -9,6 +9,7 @@
 #include <init.h>
 #include <miiphy.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
 #include <asm/arch/mpp.h>
diff --git a/cmd/ab_select.c b/cmd/ab_select.c
index 6298fcfb604..1ee3206c340 100644
--- a/cmd/ab_select.c
+++ b/cmd/ab_select.c
@@ -8,6 +8,7 @@
 #include <command.h>
 #include <env.h>
 #include <part.h>
+#include <stdio.h>
 
 static int do_ab_select(struct cmd_tbl *cmdtp, int flag, int argc,
 			char *const argv[])
diff --git a/cmd/abootimg.c b/cmd/abootimg.c
index f21b77dbf6f..f90468a1ae3 100644
--- a/cmd/abootimg.c
+++ b/cmd/abootimg.c
@@ -9,6 +9,7 @@
 #include <command.h>
 #include <image.h>
 #include <mapmem.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 #define abootimg_addr() \
diff --git a/cmd/acpi.c b/cmd/acpi.c
index b009368eace..2904b146bef 100644
--- a/cmd/acpi.c
+++ b/cmd/acpi.c
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <display_options.h>
 #include <mapmem.h>
+#include <stdio.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 557a2c1f5d0..9869aad8dce 100644
--- a/cmd/adc.c
+++ b/cmd/adc.c
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <dm.h>
 #include <adc.h>
+#include <stdio.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 2d43dd147d4..90a72619720 100644
--- a/cmd/adtimg.c
+++ b/cmd/adtimg.c
@@ -9,6 +9,7 @@
 #include <env.h>
 #include <image-android-dt.h>
 #include <common.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 #define OPT_INDEX	"--index"
diff --git a/cmd/armflash.c b/cmd/armflash.c
index 2365f16ce4c..4c4a719ad01 100644
--- a/cmd/armflash.c
+++ b/cmd/armflash.c
@@ -9,6 +9,7 @@
 #include <command.h>
 #include <console.h>
 #include <flash.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/string.h>
 
diff --git a/cmd/avb.c b/cmd/avb.c
index 5e9db6f2385..a9de5bed973 100644
--- a/cmd/avb.c
+++ b/cmd/avb.c
@@ -11,6 +11,7 @@
 #include <image.h>
 #include <malloc.h>
 #include <mmc.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 #define AVB_BOOTARGS	"avb_bootargs"
diff --git a/cmd/axi.c b/cmd/axi.c
index 36508223c34..e61cc3e35ca 100644
--- a/cmd/axi.c
+++ b/cmd/axi.c
@@ -16,6 +16,7 @@
 #include <display_options.h>
 #include <dm.h>
 #include <log.h>
+#include <stdio.h>
 
 /* Currently selected AXI bus device */
 static struct udevice *axi_cur_bus;
diff --git a/cmd/bcb.c b/cmd/bcb.c
index 2de6a08beb9..4cccd8eab3f 100644
--- a/cmd/bcb.c
+++ b/cmd/bcb.c
@@ -11,6 +11,7 @@
 #include <display_options.h>
 #include <log.h>
 #include <part.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 enum bcb_cmd {
diff --git a/cmd/bdinfo.c b/cmd/bdinfo.c
index 6c346cd8b0a..a1b3f4be9b2 100644
--- a/cmd/bdinfo.c
+++ b/cmd/bdinfo.c
@@ -10,6 +10,7 @@
 #include <command.h>
 #include <env.h>
 #include <net.h>
+#include <stdio.h>
 #include <vsprintf.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
diff --git a/cmd/bind.c b/cmd/bind.c
index 068b1399ab1..050c4be2d72 100644
--- a/cmd/bind.c
+++ b/cmd/bind.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <command.h>
 #include <dm.h>
+#include <stdio.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 afeffadc44f..a643cc906ce 100644
--- a/cmd/binop.c
+++ b/cmd/binop.c
@@ -6,6 +6,7 @@
 #include <hexdump.h>
 #include <malloc.h>
 #include <mapmem.h>
+#include <stdio.h>
 #include <linux/ctype.h>
 #include <linux/string.h>
 
diff --git a/cmd/blk_common.c b/cmd/blk_common.c
index 14413da3f6d..aed076acb77 100644
--- a/cmd/blk_common.c
+++ b/cmd/blk_common.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <blk.h>
 #include <command.h>
+#include <stdio.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 25f252e455e..025c692b485 100644
--- a/cmd/blkcache.c
+++ b/cmd/blkcache.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <malloc.h>
 #include <part.h>
+#include <stdio.h>
 
 static int blkc_show(struct cmd_tbl *cmdtp, int flag,
 		     int argc, char *const argv[])
diff --git a/cmd/bmp.c b/cmd/bmp.c
index 3ecf8db5e65..499e3585f74 100644
--- a/cmd/bmp.c
+++ b/cmd/bmp.c
@@ -19,6 +19,7 @@
 #include <malloc.h>
 #include <mapmem.h>
 #include <splash.h>
+#include <stdio.h>
 #include <video.h>
 #include <asm/byteorder.h>
 #include <linux/string.h>
diff --git a/cmd/bootcount.c b/cmd/bootcount.c
index 654bbb805c1..a1ad62ad419 100644
--- a/cmd/bootcount.c
+++ b/cmd/bootcount.c
@@ -3,6 +3,7 @@
 #include <common.h>
 #include <command.h>
 #include <bootcount.h>
+#include <stdio.h>
 
 static int do_bootcount_print(struct cmd_tbl *cmdtp, int flag, int argc,
 			      char *const argv[])
diff --git a/cmd/booti.c b/cmd/booti.c
index 7df747bc575..de60d4ea7cb 100644
--- a/cmd/booti.c
+++ b/cmd/booti.c
@@ -12,6 +12,7 @@
 #include <lmb.h>
 #include <log.h>
 #include <mapmem.h>
+#include <stdio.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 f72fdf21091..bc914b2fccb 100644
--- a/cmd/bootm.c
+++ b/cmd/bootm.c
@@ -15,6 +15,7 @@
 #include <image.h>
 #include <malloc.h>
 #include <nand.h>
+#include <stdio.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 18efe25751f..e307660e516 100644
--- a/cmd/bootmenu.c
+++ b/cmd/bootmenu.c
@@ -9,6 +9,7 @@
 #include <env.h>
 #include <log.h>
 #include <menu.h>
+#include <stdio.h>
 #include <watchdog.h>
 #include <malloc.h>
 #include <linux/delay.h>
diff --git a/cmd/bootstage.c b/cmd/bootstage.c
index 37615c3ffec..1592f24c11d 100644
--- a/cmd/bootstage.c
+++ b/cmd/bootstage.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <bootstage.h>
 #include <command.h>
+#include <stdio.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 6496f027c4b..3a6c7ce931b 100644
--- a/cmd/bootz.c
+++ b/cmd/bootz.c
@@ -11,6 +11,7 @@
 #include <irq_func.h>
 #include <lmb.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 #include <linux/compiler.h>
 
diff --git a/cmd/cache.c b/cmd/cache.c
index 0ea2c6c033a..19890c2566c 100644
--- a/cmd/cache.c
+++ b/cmd/cache.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <command.h>
 #include <cpu_func.h>
+#include <stdio.h>
 #include <linux/compiler.h>
 #include <linux/string.h>
 
diff --git a/cmd/cbfs.c b/cmd/cbfs.c
index 10c2c929c37..432974009a1 100644
--- a/cmd/cbfs.c
+++ b/cmd/cbfs.c
@@ -10,6 +10,7 @@
 #include <command.h>
 #include <env.h>
 #include <cbfs.h>
+#include <stdio.h>
 
 static int do_cbfs_init(struct cmd_tbl *cmdtp, int flag, int argc,
 			char *const argv[])
diff --git a/cmd/clk.c b/cmd/clk.c
index 439736d0724..5946d527d35 100644
--- a/cmd/clk.c
+++ b/cmd/clk.c
@@ -12,6 +12,7 @@
 #include <dm/device-internal.h>
 #include <linux/clk-provider.h>
 #endif
+#include <stdio.h>
 
 #if defined(CONFIG_DM) && defined(CONFIG_CLK)
 static void show_clks(struct udevice *dev, int depth, int last_flag)
diff --git a/cmd/config.c b/cmd/config.c
index cf30841a359..763afe9ca75 100644
--- a/cmd/config.c
+++ b/cmd/config.c
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <gzip.h>
 #include <malloc.h>
+#include <stdio.h>
 
 #include "config_data_gz.h"
 #include "config_data_size.h"
diff --git a/cmd/conitrace.c b/cmd/conitrace.c
index 88850db541f..0050831accf 100644
--- a/cmd/conitrace.c
+++ b/cmd/conitrace.c
@@ -7,6 +7,7 @@
  */
 #include <common.h>
 #include <command.h>
+#include <stdio.h>
 #include <linux/delay.h>
 
 static int do_conitrace(struct cmd_tbl *cmdtp, int flag, int argc,
diff --git a/cmd/cpu.c b/cmd/cpu.c
index b3dd7e57449..27b0919709a 100644
--- a/cmd/cpu.c
+++ b/cmd/cpu.c
@@ -11,6 +11,7 @@
 #include <display_options.h>
 #include <dm.h>
 #include <errno.h>
+#include <stdio.h>
 
 static const char *cpu_feature_name[CPU_FEAT_COUNT] = {
 	"L1 cache",
diff --git a/cmd/cramfs.c b/cmd/cramfs.c
index 1aeb56702ca..8f4d0ab54a0 100644
--- a/cmd/cramfs.c
+++ b/cmd/cramfs.c
@@ -16,6 +16,7 @@
 #include <image.h>
 #include <malloc.h>
 #include <mapmem.h>
+#include <stdio.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 b4059f0e7dc..d381980ec6c 100644
--- a/cmd/cros_ec.c
+++ b/cmd/cros_ec.c
@@ -12,6 +12,7 @@
 #include <dm.h>
 #include <flash.h>
 #include <log.h>
+#include <stdio.h>
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
 #include <linux/string.h>
diff --git a/cmd/date.c b/cmd/date.c
index 8e8f54ba405..306f640fdc5 100644
--- a/cmd/date.c
+++ b/cmd/date.c
@@ -12,6 +12,7 @@
 #include <dm.h>
 #include <rtc.h>
 #include <i2c.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/string.h>
 
diff --git a/cmd/demo.c b/cmd/demo.c
index 9da06f5e4d3..64e41a7d26f 100644
--- a/cmd/demo.c
+++ b/cmd/demo.c
@@ -10,6 +10,7 @@
 #include <command.h>
 #include <dm-demo.h>
 #include <mapmem.h>
+#include <stdio.h>
 #include <asm/io.h>
 
 struct udevice *demo_dev;
diff --git a/cmd/disk.c b/cmd/disk.c
index 8060e753ebd..bfebe3520c3 100644
--- a/cmd/disk.c
+++ b/cmd/disk.c
@@ -10,6 +10,7 @@
 #include <image.h>
 #include <log.h>
 #include <part.h>
+#include <stdio.h>
 
 int common_diskboot(struct cmd_tbl *cmdtp, const char *intf, int argc,
 		    char *const argv[])
diff --git a/cmd/echo.c b/cmd/echo.c
index 1d85e23c218..44350a882e5 100644
--- a/cmd/echo.c
+++ b/cmd/echo.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 static int do_echo(struct cmd_tbl *cmdtp, int flag, int argc,
diff --git a/cmd/eeprom.c b/cmd/eeprom.c
index 654004e1430..ffd1db893bf 100644
--- a/cmd/eeprom.c
+++ b/cmd/eeprom.c
@@ -25,6 +25,7 @@
 #include <eeprom.h>
 #include <i2c.h>
 #include <eeprom_layout.h>
+#include <stdio.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 
diff --git a/cmd/efi.c b/cmd/efi.c
index 11531cd1b4a..7b7a019e1af 100644
--- a/cmd/efi.c
+++ b/cmd/efi.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <sort.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/string.h>
 
diff --git a/cmd/efidebug.c b/cmd/efidebug.c
index 585dc12a237..64b3b5fcb89 100644
--- a/cmd/efidebug.c
+++ b/cmd/efidebug.c
@@ -15,6 +15,7 @@
 #include <malloc.h>
 #include <mapmem.h>
 #include <search.h>
+#include <stdio.h>
 #include <linux/ctype.h>
 #include <linux/string.h>
 
diff --git a/cmd/elf.c b/cmd/elf.c
index a3cb6e274f4..c38d8d015a9 100644
--- a/cmd/elf.c
+++ b/cmd/elf.c
@@ -12,6 +12,7 @@
 #include <image.h>
 #include <log.h>
 #include <net.h>
+#include <stdio.h>
 #include <vxworks.h>
 #ifdef CONFIG_X86
 #include <vbe.h>
diff --git a/cmd/ethsw.c b/cmd/ethsw.c
index 8e2bd3dfa57..6b76061cd0f 100644
--- a/cmd/ethsw.c
+++ b/cmd/ethsw.c
@@ -12,6 +12,7 @@
 #include <env_flags.h>
 #include <ethsw.h>
 #include <net.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 static const char *ethsw_name;
diff --git a/cmd/fastboot.c b/cmd/fastboot.c
index 90efc85360d..8340af5df8c 100644
--- a/cmd/fastboot.c
+++ b/cmd/fastboot.c
@@ -12,6 +12,7 @@
 #include <g_dnl.h>
 #include <fastboot.h>
 #include <net.h>
+#include <stdio.h>
 #include <usb.h>
 #include <watchdog.h>
 #include <linux/printk.h>
diff --git a/cmd/fat.c b/cmd/fat.c
index b438ce16c91..d56648f2a85 100644
--- a/cmd/fat.c
+++ b/cmd/fat.c
@@ -13,6 +13,7 @@
 #include <fat.h>
 #include <fs.h>
 #include <part.h>
+#include <stdio.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 f5f1f6b0017..e784b0d5d94 100644
--- a/cmd/fdt.c
+++ b/cmd/fdt.c
@@ -11,6 +11,7 @@
 #include <command.h>
 #include <env.h>
 #include <image.h>
+#include <stdio.h>
 #include <linux/ctype.h>
 #include <linux/string.h>
 #include <linux/types.h>
diff --git a/cmd/flash.c b/cmd/flash.c
index 3e7b335109d..ce44d7dc76b 100644
--- a/cmd/flash.c
+++ b/cmd/flash.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <command.h>
 #include <log.h>
+#include <stdio.h>
 #include <uuid.h>
 #include <linux/string.h>
 
diff --git a/cmd/fpga.c b/cmd/fpga.c
index 3151100aa14..924ca10749d 100644
--- a/cmd/fpga.c
+++ b/cmd/fpga.c
@@ -16,6 +16,7 @@
 #include <image.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 static long do_fpga_get_device(char *arg)
diff --git a/cmd/fuse.c b/cmd/fuse.c
index db504349af1..d3680e98440 100644
--- a/cmd/fuse.c
+++ b/cmd/fuse.c
@@ -12,6 +12,7 @@
 #include <command.h>
 #include <console.h>
 #include <fuse.h>
+#include <stdio.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 
diff --git a/cmd/gettime.c b/cmd/gettime.c
index ebaa45812a6..697e80a3a97 100644
--- a/cmd/gettime.c
+++ b/cmd/gettime.c
@@ -13,6 +13,7 @@
  */
 #include <common.h>
 #include <command.h>
+#include <stdio.h>
 #include <time.h>
 
 static int do_gettime(struct cmd_tbl *cmdtp, int flag, int argc,
diff --git a/cmd/gpio.c b/cmd/gpio.c
index e256f83ea10..92831350b48 100644
--- a/cmd/gpio.c
+++ b/cmd/gpio.c
@@ -12,6 +12,7 @@
 #include <dm.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/gpio.h>
 #include <linux/err.h>
 #include <linux/string.h>
diff --git a/cmd/gpt.c b/cmd/gpt.c
index db70ba887b4..639fcae8e31 100644
--- a/cmd/gpt.c
+++ b/cmd/gpt.c
@@ -19,6 +19,7 @@
 #include <part.h>
 #include <part_efi.h>
 #include <exports.h>
+#include <stdio.h>
 #include <uuid.h>
 #include <linux/ctype.h>
 #include <div64.h>
diff --git a/cmd/host.c b/cmd/host.c
index ff119da7389..dec1da41def 100644
--- a/cmd/host.c
+++ b/cmd/host.c
@@ -9,6 +9,7 @@
 #include <fs.h>
 #include <part.h>
 #include <sandboxblockdev.h>
+#include <stdio.h>
 #include <dm/device_compat.h>
 #include <linux/errno.h>
 
diff --git a/cmd/i2c.c b/cmd/i2c.c
index 83e4cfaa255..c1f7372a151 100644
--- a/cmd/i2c.c
+++ b/cmd/i2c.c
@@ -75,6 +75,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/byteorder.h>
 #include <linux/compiler.h>
 #include <linux/delay.h>
diff --git a/cmd/ide.c b/cmd/ide.c
index 8fefaf3f815..788269080ad 100644
--- a/cmd/ide.c
+++ b/cmd/ide.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <blk.h>
 #include <config.h>
+#include <stdio.h>
 #include <watchdog.h>
 #include <command.h>
 #include <image.h>
diff --git a/cmd/ini.c b/cmd/ini.c
index c075be623cc..787e3ed950e 100644
--- a/cmd/ini.c
+++ b/cmd/ini.c
@@ -14,6 +14,7 @@
 #include <common.h>
 #include <command.h>
 #include <env.h>
+#include <stdio.h>
 #include <linux/ctype.h>
 #include <linux/string.h>
 
diff --git a/cmd/iotrace.c b/cmd/iotrace.c
index 652ebefb89e..e691e91c486 100644
--- a/cmd/iotrace.c
+++ b/cmd/iotrace.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <command.h>
 #include <iotrace.h>
+#include <stdio.h>
 
 static void do_print_stats(void)
 {
diff --git a/cmd/itest.c b/cmd/itest.c
index 4ccc4cbb8a9..0ec595c0d70 100644
--- a/cmd/itest.c
+++ b/cmd/itest.c
@@ -16,6 +16,7 @@
 #include <command.h>
 #include <env.h>
 #include <mapmem.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 #include <asm/io.h>
diff --git a/cmd/jffs2.c b/cmd/jffs2.c
index e06ab60a77f..5ccd5b09153 100644
--- a/cmd/jffs2.c
+++ b/cmd/jffs2.c
@@ -76,6 +76,7 @@
 #include <flash.h>
 #include <image.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <jffs2/jffs2.h>
 #include <linux/bug.h>
 #include <linux/list.h>
diff --git a/cmd/led.c b/cmd/led.c
index a2b2f1b5e56..33714e26ae9 100644
--- a/cmd/led.c
+++ b/cmd/led.c
@@ -8,6 +8,7 @@
 #include <command.h>
 #include <dm.h>
 #include <led.h>
+#include <stdio.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 ac7139f84d6..c763121fe5e 100644
--- a/cmd/legacy-mtd-utils.c
+++ b/cmd/legacy-mtd-utils.c
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0+
 
 #include <common.h>
+#include <stdio.h>
 #include <jffs2/jffs2.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
diff --git a/cmd/license.c b/cmd/license.c
index 15411b5a92d..255f476d52b 100644
--- a/cmd/license.c
+++ b/cmd/license.c
@@ -8,6 +8,7 @@
 #include <command.h>
 #include <gzip.h>
 #include <malloc.h>
+#include <stdio.h>
 
 #include "license_data_gz.h"
 #include "license_data_size.h"
diff --git a/cmd/load.c b/cmd/load.c
index a651478d920..fc50722e065 100644
--- a/cmd/load.c
+++ b/cmd/load.c
@@ -18,6 +18,7 @@
 #include <net.h>
 #include <exports.h>
 #include <serial.h>
+#include <stdio.h>
 #include <xyzModem.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
diff --git a/cmd/log.c b/cmd/log.c
index f47ff5d17e9..a233d239bb3 100644
--- a/cmd/log.c
+++ b/cmd/log.c
@@ -8,6 +8,7 @@
 #include <command.h>
 #include <dm.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/string.h>
 
diff --git a/cmd/lsblk.c b/cmd/lsblk.c
index 653dffce041..b41a34491e6 100644
--- a/cmd/lsblk.c
+++ b/cmd/lsblk.c
@@ -8,6 +8,7 @@
 #include <blk.h>
 #include <command.h>
 #include <dm.h>
+#include <stdio.h>
 
 static int do_lsblk(struct cmd_tbl *cmdtp, int flag, int argc, char * const argv[])
 {
diff --git a/cmd/lzmadec.c b/cmd/lzmadec.c
index 3b8db0a8538..409ad6e69c1 100644
--- a/cmd/lzmadec.c
+++ b/cmd/lzmadec.c
@@ -13,6 +13,7 @@
 #include <command.h>
 #include <env.h>
 #include <mapmem.h>
+#include <stdio.h>
 #include <asm/io.h>
 
 #include <lzma/LzmaTools.h>
diff --git a/cmd/md5sum.c b/cmd/md5sum.c
index ae2d81470d7..a6e12bba4b5 100644
--- a/cmd/md5sum.c
+++ b/cmd/md5sum.c
@@ -12,6 +12,7 @@
 #include <env.h>
 #include <image.h>
 #include <mapmem.h>
+#include <stdio.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 f9b2a1caaa9..47a33fa7813 100644
--- a/cmd/mdio.c
+++ b/cmd/mdio.c
@@ -12,6 +12,7 @@
 #include <command.h>
 #include <miiphy.h>
 #include <phy.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 static char last_op[2];
diff --git a/cmd/mem.c b/cmd/mem.c
index 41ab1bbfbb4..5ed3fced194 100644
--- a/cmd/mem.c
+++ b/cmd/mem.c
@@ -22,6 +22,7 @@
 #include <log.h>
 #include <mapmem.h>
 #include <rand.h>
+#include <stdio.h>
 #include <time.h>
 #include <watchdog.h>
 #include <asm/global_data.h>
diff --git a/cmd/mii.c b/cmd/mii.c
index 3a795dbad6f..26dfad827b3 100644
--- a/cmd/mii.c
+++ b/cmd/mii.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <command.h>
 #include <miiphy.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 typedef struct _MII_field_desc_t {
diff --git a/cmd/misc.c b/cmd/misc.c
index 8743a34cff5..c349ade10f1 100644
--- a/cmd/misc.c
+++ b/cmd/misc.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <command.h>
 #include <console.h>
+#include <stdio.h>
 #include <time.h>
 #include <linux/delay.h>
 #include <linux/string.h>
diff --git a/cmd/mmc.c b/cmd/mmc.c
index ab9f4b9e8a5..6fdee2d4b21 100644
--- a/cmd/mmc.c
+++ b/cmd/mmc.c
@@ -14,6 +14,7 @@
 #include <part.h>
 #include <sparse_format.h>
 #include <image-sparse.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
 
diff --git a/cmd/mp.c b/cmd/mp.c
index a14ebbd0b56..d82a8675e66 100644
--- a/cmd/mp.c
+++ b/cmd/mp.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <command.h>
 #include <cpu_func.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 static int cpu_status_all(void)
diff --git a/cmd/mtd.c b/cmd/mtd.c
index fe1e94f6cc4..25c288f356c 100644
--- a/cmd/mtd.c
+++ b/cmd/mtd.c
@@ -14,6 +14,7 @@
 #include <malloc.h>
 #include <mapmem.h>
 #include <mtd.h>
+#include <stdio.h>
 #include <dm/devres.h>
 #include <linux/err.h>
 #include <linux/string.h>
diff --git a/cmd/mtdparts.c b/cmd/mtdparts.c
index 077793e8857..875424013fe 100644
--- a/cmd/mtdparts.c
+++ b/cmd/mtdparts.c
@@ -75,6 +75,7 @@
 #include <env.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <jffs2/load_kernel.h>
 #include <linux/list.h>
diff --git a/cmd/mvebu/bubt.c b/cmd/mvebu/bubt.c
index 5f363da7597..2f4d2d607ad 100644
--- a/cmd/mvebu/bubt.c
+++ b/cmd/mvebu/bubt.c
@@ -11,6 +11,7 @@
 #include <flash.h>
 #include <image.h>
 #include <net.h>
+#include <stdio.h>
 #include <vsprintf.h>
 #include <errno.h>
 #include <dm.h>
diff --git a/cmd/nand.c b/cmd/nand.c
index 880ee53d837..787baa78c55 100644
--- a/cmd/nand.c
+++ b/cmd/nand.c
@@ -22,6 +22,7 @@
 #include <common.h>
 #include <bootstage.h>
 #include <image.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <linux/mtd/mtd.h>
 #include <command.h>
diff --git a/cmd/net.c b/cmd/net.c
index c505656a949..d7020658710 100644
--- a/cmd/net.c
+++ b/cmd/net.c
@@ -13,6 +13,7 @@
 #include <env.h>
 #include <image.h>
 #include <net.h>
+#include <stdio.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 c73472ec226..e859dfc29bb 100644
--- a/cmd/nvedit.c
+++ b/cmd/nvedit.c
@@ -35,6 +35,7 @@
 #include <errno.h>
 #include <malloc.h>
 #include <mapmem.h>
+#include <stdio.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 4f0148b074c..aac7fb91a60 100644
--- a/cmd/nvedit_efi.c
+++ b/cmd/nvedit_efi.c
@@ -16,6 +16,7 @@
 #include <malloc.h>
 #include <mapmem.h>
 #include <rtc.h>
+#include <stdio.h>
 #include <uuid.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
diff --git a/cmd/onenand.c b/cmd/onenand.c
index fa12f0dec75..af974b93fc5 100644
--- a/cmd/onenand.c
+++ b/cmd/onenand.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <command.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/cmd/osd.c b/cmd/osd.c
index c1ef7eb8cda..2d9ac604cae 100644
--- a/cmd/osd.c
+++ b/cmd/osd.c
@@ -13,6 +13,7 @@
 #include <command.h>
 #include <dm.h>
 #include <hexdump.h>
+#include <stdio.h>
 #include <video_osd.h>
 #include <malloc.h>
 #include <linux/string.h>
diff --git a/cmd/part.c b/cmd/part.c
index f53edac8357..796fb65bacc 100644
--- a/cmd/part.c
+++ b/cmd/part.c
@@ -20,6 +20,7 @@
 #include <command.h>
 #include <env.h>
 #include <part.h>
+#include <stdio.h>
 #include <vsprintf.h>
 #include <linux/string.h>
 
diff --git a/cmd/pci.c b/cmd/pci.c
index c2d4e5d4ed6..b8818b5f3d7 100644
--- a/cmd/pci.c
+++ b/cmd/pci.c
@@ -19,6 +19,7 @@
 #include <console.h>
 #include <dm.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/processor.h>
 #include <asm/io.h>
 #include <pci.h>
diff --git a/cmd/pinmux.c b/cmd/pinmux.c
index 6f8a3fd9440..60856cdc3c4 100644
--- a/cmd/pinmux.c
+++ b/cmd/pinmux.c
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <dm.h>
 #include <errno.h>
+#include <stdio.h>
 #include <dm/pinctrl.h>
 #include <dm/uclass-internal.h>
 #include <linux/string.h>
diff --git a/cmd/pmc.c b/cmd/pmc.c
index 9a3ba2bffc5..753d7b8fbf0 100644
--- a/cmd/pmc.c
+++ b/cmd/pmc.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <command.h>
 #include <dm.h>
+#include <stdio.h>
 #include <power/acpi_pmc.h>
 
 static int get_pmc_dev(struct udevice **devp)
diff --git a/cmd/pmic.c b/cmd/pmic.c
index 3bda0534a36..6712d9238dc 100644
--- a/cmd/pmic.c
+++ b/cmd/pmic.c
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <errno.h>
 #include <dm.h>
+#include <stdio.h>
 #include <dm/uclass-internal.h>
 #include <power/pmic.h>
 
diff --git a/cmd/pxe.c b/cmd/pxe.c
index 6372fc98718..84f7c9f37ef 100644
--- a/cmd/pxe.c
+++ b/cmd/pxe.c
@@ -8,6 +8,7 @@
 #include <command.h>
 #include <fs.h>
 #include <net.h>
+#include <stdio.h>
 
 #include "pxe_utils.h"
 
diff --git a/cmd/pxe_utils.c b/cmd/pxe_utils.c
index 8716e782f6a..425e6f984fb 100644
--- a/cmd/pxe_utils.c
+++ b/cmd/pxe_utils.c
@@ -13,6 +13,7 @@
 #include <mapmem.h>
 #include <lcd.h>
 #include <net.h>
+#include <stdio.h>
 #include <linux/string.h>
 #include <linux/ctype.h>
 #include <errno.h>
diff --git a/cmd/qfw.c b/cmd/qfw.c
index bb571487f06..4470059975a 100644
--- a/cmd/qfw.c
+++ b/cmd/qfw.c
@@ -8,6 +8,7 @@
 #include <env.h>
 #include <errno.h>
 #include <qfw.h>
+#include <stdio.h>
 
 /*
  * This function prepares kernel for zboot. It loads kernel data
diff --git a/cmd/read.c b/cmd/read.c
index 34f53f9a292..f1d23fb478f 100644
--- a/cmd/read.c
+++ b/cmd/read.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <command.h>
 #include <part.h>
+#include <stdio.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 6e91c177537..a9105561b6e 100644
--- a/cmd/regulator.c
+++ b/cmd/regulator.c
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <errno.h>
 #include <dm.h>
+#include <stdio.h>
 #include <dm/uclass-internal.h>
 #include <linux/printk.h>
 #include <linux/string.h>
diff --git a/cmd/reiser.c b/cmd/reiser.c
index 3db926f8064..8a2f976a213 100644
--- a/cmd/reiser.c
+++ b/cmd/reiser.c
@@ -13,6 +13,7 @@
 #include <command.h>
 #include <env.h>
 #include <image.h>
+#include <stdio.h>
 #include <linux/ctype.h>
 #include <asm/byteorder.h>
 #include <reiserfs.h>
diff --git a/cmd/remoteproc.c b/cmd/remoteproc.c
index 7adf4553400..660a1b56357 100644
--- a/cmd/remoteproc.c
+++ b/cmd/remoteproc.c
@@ -9,6 +9,7 @@
 #include <errno.h>
 #include <malloc.h>
 #include <remoteproc.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 /**
diff --git a/cmd/rng.c b/cmd/rng.c
index 9747c11be46..d5a1faf7a77 100644
--- a/cmd/rng.c
+++ b/cmd/rng.c
@@ -10,6 +10,7 @@
 #include <hexdump.h>
 #include <malloc.h>
 #include <rng.h>
+#include <stdio.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 f181ec61119..4eda6fa3e94 100644
--- a/cmd/rockusb.c
+++ b/cmd/rockusb.c
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <console.h>
 #include <g_dnl.h>
+#include <stdio.h>
 #include <usb.h>
 #include <asm/arch-rockchip/f_rockusb.h>
 
diff --git a/cmd/rtc.c b/cmd/rtc.c
index b3f46f13eb4..f048494c551 100644
--- a/cmd/rtc.c
+++ b/cmd/rtc.c
@@ -8,6 +8,7 @@
 #include <i2c.h>
 #include <mapmem.h>
 #include <rtc.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 #define MAX_RTC_BYTES 32
diff --git a/cmd/sata.c b/cmd/sata.c
index 9b19ca49b18..2c7be9c5fe8 100644
--- a/cmd/sata.c
+++ b/cmd/sata.c
@@ -16,6 +16,7 @@
 #include <command.h>
 #include <part.h>
 #include <sata.h>
+#include <stdio.h>
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
 #include <linux/string.h>
diff --git a/cmd/sb.c b/cmd/sb.c
index 0d55818e3c6..16e37c18cb5 100644
--- a/cmd/sb.c
+++ b/cmd/sb.c
@@ -8,6 +8,7 @@
 #include <command.h>
 #include <dm.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/state.h>
 
diff --git a/cmd/scsi.c b/cmd/scsi.c
index 61437ef21eb..6e3f3308f1e 100644
--- a/cmd/scsi.c
+++ b/cmd/scsi.c
@@ -11,6 +11,7 @@
 #include <blk.h>
 #include <command.h>
 #include <scsi.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 static int scsi_curr_dev; /* current device */
diff --git a/cmd/setexpr.c b/cmd/setexpr.c
index 1569d7ad72d..29d6e3eac02 100644
--- a/cmd/setexpr.c
+++ b/cmd/setexpr.c
@@ -14,6 +14,7 @@
 #include <env.h>
 #include <log.h>
 #include <mapmem.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 static ulong get_arg(char *s, int w)
diff --git a/cmd/sf.c b/cmd/sf.c
index c74651d23b6..cf4be777437 100644
--- a/cmd/sf.c
+++ b/cmd/sf.c
@@ -16,6 +16,7 @@
 #include <mapmem.h>
 #include <spi.h>
 #include <spi_flash.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/cache.h>
 #include <jffs2/jffs2.h>
diff --git a/cmd/smccc.c b/cmd/smccc.c
index 101959c848a..89ef440f1dc 100644
--- a/cmd/smccc.c
+++ b/cmd/smccc.c
@@ -3,6 +3,7 @@
  * Copyright 2018
  * Michalis Pappas <mpappas@fastmail.fm>
  */
+#include <stdio.h>
 #include <asm/psci.h>
 #include <common.h>
 #include <command.h>
diff --git a/cmd/sound.c b/cmd/sound.c
index fdcde365339..95d7b8b6ecc 100644
--- a/cmd/sound.c
+++ b/cmd/sound.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <fdtdec.h>
 #include <sound.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/cmd/source.c b/cmd/source.c
index b6c709a3d25..b7dfeb0adf2 100644
--- a/cmd/source.c
+++ b/cmd/source.c
@@ -21,6 +21,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <mapmem.h>
+#include <stdio.h>
 #include <asm/byteorder.h>
 #include <asm/io.h>
 
diff --git a/cmd/spi.c b/cmd/spi.c
index df05e828fd1..7184e44c030 100644
--- a/cmd/spi.c
+++ b/cmd/spi.c
@@ -13,6 +13,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <spi.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 /*-----------------------------------------------------------------------
diff --git a/cmd/spl.c b/cmd/spl.c
index 42e7eb2e309..20e783337e8 100644
--- a/cmd/spl.c
+++ b/cmd/spl.c
@@ -10,6 +10,7 @@
 #include <env.h>
 #include <image.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/libfdt.h>
diff --git a/cmd/strings.c b/cmd/strings.c
index bf4efa4aa3a..adc6e814712 100644
--- a/cmd/strings.c
+++ b/cmd/strings.c
@@ -9,6 +9,7 @@
 #include <config.h>
 #include <common.h>
 #include <command.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 static char *start_addr, *last_addr;
diff --git a/cmd/sysboot.c b/cmd/sysboot.c
index 38aa2a2cdb0..4f6869382f2 100644
--- a/cmd/sysboot.c
+++ b/cmd/sysboot.c
@@ -4,6 +4,7 @@
 #include <command.h>
 #include <env.h>
 #include <fs.h>
+#include <stdio.h>
 #include <linux/string.h>
 #include "pxe_utils.h"
 
diff --git a/cmd/terminal.c b/cmd/terminal.c
index f6e4d2539e3..3af67bb2d00 100644
--- a/cmd/terminal.c
+++ b/cmd/terminal.c
@@ -9,6 +9,7 @@
  */
 #include <common.h>
 #include <command.h>
+#include <stdio.h>
 #include <stdio_dev.h>
 #include <serial.h>
 
diff --git a/cmd/thordown.c b/cmd/thordown.c
index f36fb20e26e..e837064ffdd 100644
--- a/cmd/thordown.c
+++ b/cmd/thordown.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <stdio.h>
 #include <thor.h>
 #include <dfu.h>
 #include <g_dnl.h>
diff --git a/cmd/ti/ddr3.c b/cmd/ti/ddr3.c
index f3c3e7e9fbe..6be51f8c335 100644
--- a/cmd/ti/ddr3.c
+++ b/cmd/ti/ddr3.c
@@ -9,6 +9,7 @@
 #include <env.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/arch/hardware.h>
 #include <asm/cache.h>
 #include <asm/emif.h>
diff --git a/cmd/time.c b/cmd/time.c
index db8c1892df4..7d4345bbf74 100644
--- a/cmd/time.c
+++ b/cmd/time.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <stdio.h>
 
 static void report_time(ulong cycles)
 {
diff --git a/cmd/tlv_eeprom.c b/cmd/tlv_eeprom.c
index 663beeb9f73..5a9abf44058 100644
--- a/cmd/tlv_eeprom.c
+++ b/cmd/tlv_eeprom.c
@@ -17,6 +17,7 @@
 #include <env.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.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 88c9e08e318..943bd0bfc9a 100644
--- a/cmd/tpm-common.c
+++ b/cmd/tpm-common.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <env.h>
 #include <malloc.h>
+#include <stdio.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 77cd5e3bd7c..4e935b28676 100644
--- a/cmd/tpm-v1.c
+++ b/cmd/tpm-v1.c
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <env.h>
 #include <malloc.h>
+#include <stdio.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 392811f1279..33cc85fa6f0 100644
--- a/cmd/tpm-v2.c
+++ b/cmd/tpm-v2.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <log.h>
 #include <mapmem.h>
+#include <stdio.h>
 #include <tpm-common.h>
 #include <tpm-v2.h>
 #include <linux/string.h>
diff --git a/cmd/tpm_test.c b/cmd/tpm_test.c
index fbaa1de66ee..39d1ad2b4af 100644
--- a/cmd/tpm_test.c
+++ b/cmd/tpm_test.c
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <cpu_func.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <tpm-v1.h>
 #include <linux/printk.h>
diff --git a/cmd/trace.c b/cmd/trace.c
index 4ce47c76276..a09d837c049 100644
--- a/cmd/trace.c
+++ b/cmd/trace.c
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <env.h>
 #include <mapmem.h>
+#include <stdio.h>
 #include <trace.h>
 #include <asm/io.h>
 
diff --git a/cmd/tsi148.c b/cmd/tsi148.c
index cbe898475ba..6a9e346f27d 100644
--- a/cmd/tsi148.c
+++ b/cmd/tsi148.c
@@ -11,6 +11,7 @@
 #include <command.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <pci.h>
 #include <linux/string.h>
diff --git a/cmd/ubi.c b/cmd/ubi.c
index afd45bab943..707f1a9b87d 100644
--- a/cmd/ubi.c
+++ b/cmd/ubi.c
@@ -20,6 +20,7 @@
 #include <mtd.h>
 #include <nand.h>
 #include <onenand_uboot.h>
+#include <stdio.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 a26b653d61e..1e2dfab2f49 100644
--- a/cmd/ubifs.c
+++ b/cmd/ubifs.c
@@ -15,6 +15,7 @@
 #include <config.h>
 #include <command.h>
 #include <log.h>
+#include <stdio.h>
 #include <ubifs_uboot.h>
 
 static int ubifs_initialized;
diff --git a/cmd/universe.c b/cmd/universe.c
index 37437a1cddd..c7edde24d45 100644
--- a/cmd/universe.c
+++ b/cmd/universe.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <command.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <pci.h>
 #include <linux/string.h>
diff --git a/cmd/unlz4.c b/cmd/unlz4.c
index 4ae7f34d36e..7221a8bd2c7 100644
--- a/cmd/unlz4.c
+++ b/cmd/unlz4.c
@@ -8,6 +8,7 @@
 #include <command.h>
 #include <env.h>
 #include <lz4.h>
+#include <stdio.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 9b28328a1d7..a2d21ffa0a8 100644
--- a/cmd/unzip.c
+++ b/cmd/unzip.c
@@ -9,6 +9,7 @@
 #include <env.h>
 #include <gzip.h>
 #include <part.h>
+#include <stdio.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 04205a7a52e..cc2f4f62e99 100644
--- a/cmd/usb.c
+++ b/cmd/usb.c
@@ -16,6 +16,7 @@
 #include <command.h>
 #include <console.h>
 #include <dm.h>
+#include <stdio.h>
 #include <dm/uclass-internal.h>
 #include <memalign.h>
 #include <asm/byteorder.h>
diff --git a/cmd/usb_mass_storage.c b/cmd/usb_mass_storage.c
index 43fdb097078..51d5ad78c63 100644
--- a/cmd/usb_mass_storage.c
+++ b/cmd/usb_mass_storage.c
@@ -14,6 +14,7 @@
 #include <g_dnl.h>
 #include <malloc.h>
 #include <part.h>
+#include <stdio.h>
 #include <usb.h>
 #include <usb_mass_storage.h>
 #include <watchdog.h>
diff --git a/cmd/version.c b/cmd/version.c
index 2c321a92f9b..dcd91f09fa1 100644
--- a/cmd/version.c
+++ b/cmd/version.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <command.h>
 #include <display_options.h>
+#include <stdio.h>
 #include <version.h>
 #include <linux/compiler.h>
 #ifdef CONFIG_SYS_COREBOOT
diff --git a/cmd/w1.c b/cmd/w1.c
index da1ede6a439..ee2eefecdf8 100644
--- a/cmd/w1.c
+++ b/cmd/w1.c
@@ -6,6 +6,7 @@
  */
 #include <common.h>
 #include <command.h>
+#include <stdio.h>
 #include <w1.h>
 #include <w1-eeprom.h>
 #include <dm/device-internal.h>
diff --git a/cmd/wdt.c b/cmd/wdt.c
index 27410981e7b..fff95a93b32 100644
--- a/cmd/wdt.c
+++ b/cmd/wdt.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <command.h>
 #include <dm.h>
+#include <stdio.h>
 #include <wdt.h>
 
 static struct udevice *currdev;
diff --git a/cmd/x86/fsp.c b/cmd/x86/fsp.c
index 82e4415b16e..ef49b530b55 100644
--- a/cmd/x86/fsp.c
+++ b/cmd/x86/fsp.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <stdio.h>
 #include <asm/fsp/fsp_support.h>
 #include <asm/global_data.h>
 
diff --git a/cmd/x86/hob.c b/cmd/x86/hob.c
index 1b8dfa99f7b..37f54052165 100644
--- a/cmd/x86/hob.c
+++ b/cmd/x86/hob.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <command.h>
 #include <efi.h>
+#include <stdio.h>
 #include <uuid.h>
 #include <asm/global_data.h>
 #include <asm/hob.h>
diff --git a/cmd/x86/mtrr.c b/cmd/x86/mtrr.c
index 3e46a342a05..6bc4fb1c9be 100644
--- a/cmd/x86/mtrr.c
+++ b/cmd/x86/mtrr.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <command.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/msr.h>
 #include <asm/mp.h>
 #include <asm/mtrr.h>
diff --git a/cmd/ximg.c b/cmd/ximg.c
index c9cf4009d0d..c6016719dc9 100644
--- a/cmd/ximg.c
+++ b/cmd/ximg.c
@@ -19,6 +19,7 @@
 #include <image.h>
 #include <malloc.h>
 #include <mapmem.h>
+#include <stdio.h>
 #include <watchdog.h>
 #if defined(CONFIG_BZIP2)
 #include <bzlib.h>
diff --git a/cmd/yaffs2.c b/cmd/yaffs2.c
index 1ecb5bea8e2..3a3dba3cfd3 100644
--- a/cmd/yaffs2.c
+++ b/cmd/yaffs2.c
@@ -14,6 +14,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 #include <config.h>
diff --git a/cmd/zfs.c b/cmd/zfs.c
index d01835573a4..9a03722a030 100644
--- a/cmd/zfs.c
+++ b/cmd/zfs.c
@@ -14,6 +14,7 @@
 #include <command.h>
 #include <env.h>
 #include <image.h>
+#include <stdio.h>
 #include <linux/ctype.h>
 #include <asm/byteorder.h>
 #include <zfs_common.h>
diff --git a/cmd/zip.c b/cmd/zip.c
index 8ad37684647..407390a95a4 100644
--- a/cmd/zip.c
+++ b/cmd/zip.c
@@ -8,6 +8,7 @@
 #include <command.h>
 #include <env.h>
 #include <gzip.h>
+#include <stdio.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 6db00525977..1effce6f7e5 100644
--- a/common/autoboot.c
+++ b/common/autoboot.c
@@ -18,6 +18,7 @@
 #include <memalign.h>
 #include <menu.h>
 #include <post.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
diff --git a/common/avb_verify.c b/common/avb_verify.c
index 6894f6872e9..7a7a5096852 100644
--- a/common/avb_verify.c
+++ b/common/avb_verify.c
@@ -11,6 +11,7 @@
 #include <image.h>
 #include <malloc.h>
 #include <part.h>
+#include <stdio.h>
 #include <tee.h>
 #include <linux/string.h>
 #include <tee/optee_ta_avb.h>
diff --git a/common/board_f.c b/common/board_f.c
index 362c81521c8..4ad67042769 100644
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -38,6 +38,7 @@
 #include <spl.h>
 #endif
 #include <status_led.h>
+#include <stdio.h>
 #include <sysreset.h>
 #include <timer.h>
 #include <trace.h>
diff --git a/common/board_info.c b/common/board_info.c
index b54aa30a944..bfa5324e821 100644
--- a/common/board_info.c
+++ b/common/board_info.c
@@ -2,6 +2,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/libfdt.h>
 #include <linux/compiler.h>
diff --git a/common/board_r.c b/common/board_r.c
index 20534a31881..6f08a07ab19 100644
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -21,6 +21,7 @@
 #include <irq_func.h>
 #include <log.h>
 #include <net.h>
+#include <stdio.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 8a1ea66cff0..3b8c232922c 100644
--- a/common/bootm.c
+++ b/common/bootm.c
@@ -17,6 +17,7 @@
 #include <malloc.h>
 #include <mapmem.h>
 #include <net.h>
+#include <stdio.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 9c78bba8e61..1987c574d99 100644
--- a/common/bootm_os.c
+++ b/common/bootm_os.c
@@ -14,6 +14,7 @@
 #include <image.h>
 #include <lmb.h>
 #include <log.h>
+#include <stdio.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 dac891fbc5e..cd04ad9894d 100644
--- a/common/bootretry.c
+++ b/common/bootretry.c
@@ -9,6 +9,7 @@
 #include <cli.h>
 #include <env.h>
 #include <errno.h>
+#include <stdio.h>
 #include <time.h>
 #include <watchdog.h>
 
diff --git a/common/bootstage.c b/common/bootstage.c
index 6eb83767949..4656951675c 100644
--- a/common/bootstage.c
+++ b/common/bootstage.c
@@ -16,6 +16,7 @@
 #include <malloc.h>
 #include <sort.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/compiler.h>
 #include <linux/libfdt.h>
diff --git a/common/cli.c b/common/cli.c
index 4fc4c206e4d..88053b58701 100644
--- a/common/cli.c
+++ b/common/cli.c
@@ -18,6 +18,7 @@
 #include <fdtdec.h>
 #include <hang.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/string.h>
 
diff --git a/common/cli_readline.c b/common/cli_readline.c
index 927c5066a9e..78c1faad8f7 100644
--- a/common/cli_readline.c
+++ b/common/cli_readline.c
@@ -12,6 +12,7 @@
 #include <bootretry.h>
 #include <cli.h>
 #include <command.h>
+#include <stdio.h>
 #include <time.h>
 #include <watchdog.h>
 #include <asm/global_data.h>
diff --git a/common/cli_simple.c b/common/cli_simple.c
index b7f21bbbe75..c8e26b9a697 100644
--- a/common/cli_simple.c
+++ b/common/cli_simple.c
@@ -15,6 +15,7 @@
 #include <console.h>
 #include <env.h>
 #include <log.h>
+#include <stdio.h>
 #include <linux/ctype.h>
 #include <linux/string.h>
 
diff --git a/common/command.c b/common/command.c
index 3bc2038f97f..dfad65d735c 100644
--- a/common/command.c
+++ b/common/command.c
@@ -14,6 +14,7 @@
 #include <console.h>
 #include <env.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/global_data.h>
 #include <linux/ctype.h>
diff --git a/common/common_fit.c b/common/common_fit.c
index dfb2134fcf1..50b165016d2 100644
--- a/common/common_fit.c
+++ b/common/common_fit.c
@@ -8,6 +8,7 @@
 #include <errno.h>
 #include <image.h>
 #include <log.h>
+#include <stdio.h>
 #include <linux/libfdt.h>
 #include <linux/string.h>
 
diff --git a/common/console.c b/common/console.c
index cc5d56b6d07..c783a41b520 100644
--- a/common/console.c
+++ b/common/console.c
@@ -16,6 +16,7 @@
 #include <mapmem.h>
 #include <os.h>
 #include <serial.h>
+#include <stdio.h>
 #include <stdio_dev.h>
 #include <exports.h>
 #include <env_internal.h>
diff --git a/common/ddr_spd.c b/common/ddr_spd.c
index 58dc9b3781b..241549bd485 100644
--- a/common/ddr_spd.c
+++ b/common/ddr_spd.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <ddr_spd.h>
+#include <stdio.h>
 
 /* used for ddr1 and ddr2 spd */
 static int
diff --git a/common/dlmalloc.c b/common/dlmalloc.c
index dc584f792b3..9493d1158d4 100644
--- a/common/dlmalloc.c
+++ b/common/dlmalloc.c
@@ -1,5 +1,6 @@
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/string.h>
 
diff --git a/common/edid.c b/common/edid.c
index 553ab8fd01a..d539c521507 100644
--- a/common/edid.c
+++ b/common/edid.c
@@ -14,6 +14,7 @@
 #include <errno.h>
 #include <fdtdec.h>
 #include <log.h>
+#include <stdio.h>
 #include <linux/ctype.h>
 #include <linux/string.h>
 
diff --git a/common/eeprom/eeprom_field.c b/common/eeprom/eeprom_field.c
index f56eebe679f..e68cf5d4810 100644
--- a/common/eeprom/eeprom_field.c
+++ b/common/eeprom/eeprom_field.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <linux/string.h>
 #include <eeprom_field.h>
 
diff --git a/common/eeprom/eeprom_layout.c b/common/eeprom/eeprom_layout.c
index 338185d58c3..cfe457c7444 100644
--- a/common/eeprom/eeprom_layout.c
+++ b/common/eeprom/eeprom_layout.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <linux/kernel.h>
 #include <eeprom_layout.h>
 #include <eeprom_field.h>
diff --git a/common/fdt_support.c b/common/fdt_support.c
index 9b685cc1736..c768e4c8bab 100644
--- a/common/fdt_support.c
+++ b/common/fdt_support.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <mapmem.h>
 #include <net.h>
+#include <stdio.h>
 #include <stdio_dev.h>
 #include <linux/ctype.h>
 #include <linux/string.h>
diff --git a/common/flash.c b/common/flash.c
index 62f4c98749a..c01cb28b92f 100644
--- a/common/flash.c
+++ b/common/flash.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <flash.h>
 #include <log.h>
+#include <stdio.h>
 #include <uuid.h>
 #include <linux/string.h>
 
diff --git a/common/hash.c b/common/hash.c
index e1be8dc05f9..f6d032038f7 100644
--- a/common/hash.c
+++ b/common/hash.c
@@ -17,6 +17,7 @@
 #include <malloc.h>
 #include <mapmem.h>
 #include <hw_sha.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/common/image-android-dt.c b/common/image-android-dt.c
index a2d52df4a2a..74dcbdd1608 100644
--- a/common/image-android-dt.c
+++ b/common/image-android-dt.c
@@ -7,6 +7,7 @@
 #include <image-android-dt.h>
 #include <dt_table.h>
 #include <common.h>
+#include <stdio.h>
 #include <linux/libfdt.h>
 #include <mapmem.h>
 
diff --git a/common/image-android.c b/common/image-android.c
index 7f76be86790..1e79f6b144c 100644
--- a/common/image-android.c
+++ b/common/image-android.c
@@ -10,6 +10,7 @@
 #include <android_image.h>
 #include <malloc.h>
 #include <errno.h>
+#include <stdio.h>
 #include <asm/unaligned.h>
 #include <mapmem.h>
 #include <linux/libfdt.h>
diff --git a/common/image-cipher.c b/common/image-cipher.c
index c611eb52948..3a4ba40b743 100644
--- a/common/image-cipher.c
+++ b/common/image-cipher.c
@@ -9,6 +9,7 @@
 #else
 #include <common.h>
 #include <malloc.h>
+#include <stdio.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 41fce043f54..af93298ffab 100644
--- a/common/image-fdt.c
+++ b/common/image-fdt.c
@@ -17,6 +17,7 @@
 #include <lmb.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/libfdt.h>
 #include <mapmem.h>
diff --git a/common/image-fit-sig.c b/common/image-fit-sig.c
index 0c36649dce0..1247d0280e2 100644
--- a/common/image-fit-sig.c
+++ b/common/image-fit-sig.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/string.h>
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/common/image-fit.c b/common/image-fit.c
index 5d5dd7dc40a..76318ca6ed3 100644
--- a/common/image-fit.c
+++ b/common/image-fit.c
@@ -14,6 +14,7 @@
 #include <linux/libfdt.h>
 #include <u-boot/crc.h>
 #else
+#include <stdio.h>
 #include <linux/compiler.h>
 #include <linux/kconfig.h>
 #include <common.h>
diff --git a/common/image.c b/common/image.c
index e183a9cefa0..61c60885856 100644
--- a/common/image.c
+++ b/common/image.c
@@ -15,6 +15,7 @@
 #include <lmb.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
diff --git a/common/iomux.c b/common/iomux.c
index d552e0ee61a..2fa90eadc65 100644
--- a/common/iomux.c
+++ b/common/iomux.c
@@ -8,6 +8,7 @@
 #include <console.h>
 #include <serial.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 #if CONFIG_IS_ENABLED(CONSOLE_MUX)
diff --git a/common/kgdb.c b/common/kgdb.c
index 2f3bb7f6142..62997f10005 100644
--- a/common/kgdb.c
+++ b/common/kgdb.c
@@ -88,6 +88,7 @@
  ****************************************************************************/
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/ptrace.h>
 #include <linux/string.h>
 
diff --git a/common/kgdb_stubs.c b/common/kgdb_stubs.c
index 66aed7cea1c..43d9a3646a3 100644
--- a/common/kgdb_stubs.c
+++ b/common/kgdb_stubs.c
@@ -11,6 +11,7 @@
 #include <cpu_func.h>
 #include <kgdb.h>
 #include <serial.h>
+#include <stdio.h>
 #include <asm/ptrace.h>
 
 int (*debugger_exception_handler)(struct pt_regs *);
diff --git a/common/lcd.c b/common/lcd.c
index 04736d6c980..442e61d9fd2 100644
--- a/common/lcd.c
+++ b/common/lcd.c
@@ -13,6 +13,7 @@
 #include <cpu_func.h>
 #include <env_callback.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <init.h>
 #include <asm/global_data.h>
diff --git a/common/lcd_console_rotation.c b/common/lcd_console_rotation.c
index a5f5c6da7be..8fc333d4e32 100644
--- a/common/lcd_console_rotation.c
+++ b/common/lcd_console_rotation.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <lcd.h>
+#include <stdio.h>
 #include <video_font.h>		/* Get font data, width and height */
 
 static void lcd_putc_xy90(struct console_t *pcons, ushort x, ushort y, char c)
diff --git a/common/log_console.c b/common/log_console.c
index 357dff29168..5084dcc8d82 100644
--- a/common/log_console.c
+++ b/common/log_console.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/common/menu.c b/common/menu.c
index 0d08321e0e7..d61c274eedf 100644
--- a/common/menu.c
+++ b/common/menu.c
@@ -8,6 +8,7 @@
 #include <cli.h>
 #include <malloc.h>
 #include <errno.h>
+#include <stdio.h>
 #include <linux/list.h>
 #include <linux/string.h>
 
diff --git a/common/miiphyutil.c b/common/miiphyutil.c
index fa273f1c201..5680157b720 100644
--- a/common/miiphyutil.c
+++ b/common/miiphyutil.c
@@ -14,6 +14,7 @@
 #include <log.h>
 #include <miiphy.h>
 #include <phy.h>
+#include <stdio.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 
diff --git a/common/spl/spl.c b/common/spl/spl.c
index bea542ed2e3..4c852d34754 100644
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -18,6 +18,7 @@
 #include <log.h>
 #include <serial.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <nand.h>
diff --git a/common/spl/spl_ext.c b/common/spl/spl_ext.c
index d73f0627621..50f0f5f4ca7 100644
--- a/common/spl/spl_ext.c
+++ b/common/spl/spl_ext.c
@@ -4,6 +4,7 @@
 #include <env.h>
 #include <part.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 #include <ext4fs.h>
 #include <errno.h>
diff --git a/common/spl/spl_fat.c b/common/spl/spl_fat.c
index c2eb097365f..20b44090650 100644
--- a/common/spl/spl_fat.c
+++ b/common/spl/spl_fat.c
@@ -12,6 +12,7 @@
 #include <env.h>
 #include <log.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 #include <fat.h>
 #include <errno.h>
diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c
index 5da3fceb0de..87d48269558 100644
--- a/common/spl/spl_fit.c
+++ b/common/spl/spl_fit.c
@@ -13,6 +13,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <linux/libfdt.h>
diff --git a/common/spl/spl_legacy.c b/common/spl/spl_legacy.c
index 82d03268061..6813759aa4e 100644
--- a/common/spl/spl_legacy.c
+++ b/common/spl/spl_legacy.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <spl.h>
+#include <stdio.h>
 
 #include <lzma/LzmaTypes.h>
 #include <lzma/LzmaDec.h>
diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c
index add2785b4e3..1cfe4b2b442 100644
--- a/common/spl/spl_mmc.c
+++ b/common/spl/spl_mmc.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <part.h>
 #include <spl.h>
+#include <stdio.h>
 #include <linux/compiler.h>
 #include <errno.h>
 #include <asm/u-boot.h>
diff --git a/common/spl/spl_nand.c b/common/spl/spl_nand.c
index d13a5245974..15101f39423 100644
--- a/common/spl/spl_nand.c
+++ b/common/spl/spl_nand.c
@@ -9,6 +9,7 @@
 #include <image.h>
 #include <log.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <nand.h>
 #include <linux/libfdt_env.h>
diff --git a/common/spl/spl_net.c b/common/spl/spl_net.c
index 6ac8b65eebd..ac7be6360bb 100644
--- a/common/spl/spl_net.c
+++ b/common/spl/spl_net.c
@@ -13,6 +13,7 @@
 #include <log.h>
 #include <spl.h>
 #include <net.h>
+#include <stdio.h>
 #include <linux/libfdt.h>
 #include <linux/string.h>
 
diff --git a/common/spl/spl_nor.c b/common/spl/spl_nor.c
index a1966cbad85..a198577a2bd 100644
--- a/common/spl/spl_nor.c
+++ b/common/spl/spl_nor.c
@@ -7,6 +7,7 @@
 #include <image.h>
 #include <log.h>
 #include <spl.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 static ulong spl_nor_load_read(struct spl_load_info *load, ulong sector,
diff --git a/common/spl/spl_sata.c b/common/spl/spl_sata.c
index e108af0576a..3ac3b743d99 100644
--- a/common/spl/spl_sata.c
+++ b/common/spl/spl_sata.c
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 #include <sata.h>
 #include <scsi.h>
diff --git a/common/spl/spl_spi.c b/common/spl/spl_spi.c
index 6a4e0332870..caa5ed10e1a 100644
--- a/common/spl/spl_spi.c
+++ b/common/spl/spl_spi.c
@@ -15,6 +15,7 @@
 #include <spi_flash.h>
 #include <errno.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/common/spl/spl_ubi.c b/common/spl/spl_ubi.c
index 6a3679300d7..a142268c0f7 100644
--- a/common/spl/spl_ubi.c
+++ b/common/spl/spl_ubi.c
@@ -9,6 +9,7 @@
 #include <image.h>
 #include <nand.h>
 #include <onenand_uboot.h>
+#include <stdio.h>
 #include <ubispl.h>
 #include <spl.h>
 #include <linux/string.h>
diff --git a/common/spl/spl_usb.c b/common/spl/spl_usb.c
index 08837b38fc9..607e5ba2d1f 100644
--- a/common/spl/spl_usb.c
+++ b/common/spl/spl_usb.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <log.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 #include <errno.h>
 #include <usb.h>
diff --git a/common/spl/spl_ymodem.c b/common/spl/spl_ymodem.c
index c1958613299..7124f604b0a 100644
--- a/common/spl/spl_ymodem.c
+++ b/common/spl/spl_ymodem.c
@@ -13,6 +13,7 @@
 #include <image.h>
 #include <log.h>
 #include <spl.h>
+#include <stdio.h>
 #include <xyzModem.h>
 #include <asm/u-boot.h>
 #include <linux/libfdt.h>
diff --git a/common/splash.c b/common/splash.c
index 31bbbc2f531..e6dce1dbf3a 100644
--- a/common/splash.c
+++ b/common/splash.c
@@ -25,6 +25,7 @@
 #include <env.h>
 #include <splash.h>
 #include <lcd.h>
+#include <stdio.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 12ea112a9d4..8166d0055b9 100644
--- a/common/splash_source.c
+++ b/common/splash_source.c
@@ -19,6 +19,7 @@
 #include <spi.h>
 #include <spi_flash.h>
 #include <splash.h>
+#include <stdio.h>
 #include <usb.h>
 #include <asm/global_data.h>
 #include <linux/string.h>
diff --git a/common/stdio.c b/common/stdio.c
index 411796138f7..3f29c91ce48 100644
--- a/common/stdio.c
+++ b/common/stdio.c
@@ -15,6 +15,7 @@
 #include <log.h>
 #include <stdarg.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <stdio_dev.h>
 #include <serial.h>
 #include <splash.h>
diff --git a/common/update.c b/common/update.c
index 8851943b15c..5fb6a2d5288 100644
--- a/common/update.c
+++ b/common/update.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <image.h>
+#include <stdio.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/common/usb.c b/common/usb.c
index 7dd34df3cd6..5a319393025 100644
--- a/common/usb.c
+++ b/common/usb.c
@@ -31,6 +31,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <memalign.h>
+#include <stdio.h>
 #include <asm/processor.h>
 #include <linux/compiler.h>
 #include <linux/ctype.h>
diff --git a/common/usb_hub.c b/common/usb_hub.c
index 1eee9401dc3..244bd0a1369 100644
--- a/common/usb_hub.c
+++ b/common/usb_hub.c
@@ -29,6 +29,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <memalign.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/processor.h>
 #include <asm/unaligned.h>
diff --git a/common/usb_kbd.c b/common/usb_kbd.c
index 0fb955c14b6..0d3a34ea5c1 100644
--- a/common/usb_kbd.c
+++ b/common/usb_kbd.c
@@ -14,6 +14,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <memalign.h>
+#include <stdio.h>
 #include <stdio_dev.h>
 #include <time.h>
 #include <watchdog.h>
diff --git a/common/usb_storage.c b/common/usb_storage.c
index 492a9374ad2..3416bee012f 100644
--- a/common/usb_storage.c
+++ b/common/usb_storage.c
@@ -40,6 +40,7 @@
 #include <log.h>
 #include <mapmem.h>
 #include <memalign.h>
+#include <stdio.h>
 #include <asm/byteorder.h>
 #include <asm/cache.h>
 #include <asm/processor.h>
diff --git a/disk/part.c b/disk/part.c
index 04aac1f5f5a..bc5afc2f018 100644
--- a/disk/part.c
+++ b/disk/part.c
@@ -13,6 +13,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <part.h>
+#include <stdio.h>
 #include <ubifs_uboot.h>
 #include <linux/string.h>
 
diff --git a/disk/part_amiga.c b/disk/part_amiga.c
index 17c595a0a7b..e8c7068081b 100644
--- a/disk/part_amiga.c
+++ b/disk/part_amiga.c
@@ -8,6 +8,7 @@
 #include <command.h>
 #include <env.h>
 #include <ide.h>
+#include <stdio.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 8eaa85e6b29..a321ad2d220 100644
--- a/disk/part_dos.c
+++ b/disk/part_dos.c
@@ -18,6 +18,7 @@
 #include <command.h>
 #include <ide.h>
 #include <memalign.h>
+#include <stdio.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 b995efc732d..d066d9c920c 100644
--- a/disk/part_efi.c
+++ b/disk/part_efi.c
@@ -13,6 +13,7 @@
 #include <blk.h>
 #include <log.h>
 #include <part.h>
+#include <stdio.h>
 #include <uuid.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
diff --git a/disk/part_iso.c b/disk/part_iso.c
index a7d63d64e90..accb95da3bc 100644
--- a/disk/part_iso.c
+++ b/disk/part_iso.c
@@ -8,6 +8,7 @@
 #include <blk.h>
 #include <command.h>
 #include <part.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <asm/unaligned.h>
 #include <linux/string.h>
diff --git a/disk/part_mac.c b/disk/part_mac.c
index e01ae745661..2d9aa380168 100644
--- a/disk/part_mac.c
+++ b/disk/part_mac.c
@@ -17,6 +17,7 @@
 #include <log.h>
 #include <memalign.h>
 #include <ide.h>
+#include <stdio.h>
 #include "part_mac.h"
 #include <part.h>
 
diff --git a/drivers/adc/adc-uclass.c b/drivers/adc/adc-uclass.c
index 7c033a6855b..c1dd1f0599d 100644
--- a/drivers/adc/adc-uclass.c
+++ b/drivers/adc/adc-uclass.c
@@ -8,6 +8,7 @@
 #include <errno.h>
 #include <div64.h>
 #include <dm.h>
+#include <stdio.h>
 #include <dm/lists.h>
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
diff --git a/drivers/adc/meson-saradc.c b/drivers/adc/meson-saradc.c
index d4abb6b943d..d7c02f1aa3f 100644
--- a/drivers/adc/meson-saradc.c
+++ b/drivers/adc/meson-saradc.c
@@ -13,6 +13,7 @@
 #include <dm.h>
 #include <regmap.h>
 #include <errno.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index 271c2ddf4a8..e31e280f541 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -12,6 +12,7 @@
 #include <blk.h>
 #include <cpu_func.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/drivers/ata/ahci_sunxi.c b/drivers/ata/ahci_sunxi.c
index 58e345d9983..162e7de5194 100644
--- a/drivers/ata/ahci_sunxi.c
+++ b/drivers/ata/ahci_sunxi.c
@@ -4,6 +4,7 @@
 #include <log.h>
 #include <scsi.h>
 #include <errno.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
 #include <linux/delay.h>
diff --git a/drivers/ata/dwc_ahsata.c b/drivers/ata/dwc_ahsata.c
index 1ecae1d1c95..90db0d21014 100644
--- a/drivers/ata/dwc_ahsata.c
+++ b/drivers/ata/dwc_ahsata.c
@@ -17,6 +17,7 @@
 #include <memalign.h>
 #include <part.h>
 #include <sata.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
diff --git a/drivers/ata/fsl_sata.c b/drivers/ata/fsl_sata.c
index 8d107602022..d05968dada8 100644
--- a/drivers/ata/fsl_sata.c
+++ b/drivers/ata/fsl_sata.c
@@ -11,6 +11,7 @@
 #include <console.h>
 #include <cpu_func.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/processor.h>
 #include <asm/fsl_serdes.h>
diff --git a/drivers/ata/libata.c b/drivers/ata/libata.c
index cdc83c75bb6..c830ef49025 100644
--- a/drivers/ata/libata.c
+++ b/drivers/ata/libata.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <compiler.h>
 #include <libata.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 u64 ata_id_n_sectors(u16 *id)
diff --git a/drivers/ata/sata.c b/drivers/ata/sata.c
index fa17ee3ab48..b70de83df2c 100644
--- a/drivers/ata/sata.c
+++ b/drivers/ata/sata.c
@@ -15,6 +15,7 @@
 #include <dm.h>
 #include <part.h>
 #include <sata.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 #ifndef CONFIG_AHCI
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index 9554aeb137d..f122d154e33 100644
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -37,6 +37,7 @@
 #include <cpu_func.h>
 #include <dm.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
diff --git a/drivers/ata/sata_sil.c b/drivers/ata/sata_sil.c
index c34af206669..920a3c9f901 100644
--- a/drivers/ata/sata_sil.c
+++ b/drivers/ata/sata_sil.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <pci.h>
 #include <command.h>
+#include <stdio.h>
 #include <asm/byteorder.h>
 #include <malloc.h>
 #include <asm/io.h>
diff --git a/drivers/bios_emulator/atibios.c b/drivers/bios_emulator/atibios.c
index 3d1b22f1f54..dbf74a45eed 100644
--- a/drivers/bios_emulator/atibios.c
+++ b/drivers/bios_emulator/atibios.c
@@ -51,6 +51,7 @@
 #include <errno.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <vbe.h>
 #include <linux/delay.h>
 #include <linux/string.h>
diff --git a/drivers/bios_emulator/besys.c b/drivers/bios_emulator/besys.c
index 02c4286a854..a8475b13886 100644
--- a/drivers/bios_emulator/besys.c
+++ b/drivers/bios_emulator/besys.c
@@ -49,6 +49,7 @@
 
 #define __io
 #include <common.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include "biosemui.h"
 
diff --git a/drivers/bios_emulator/bios.c b/drivers/bios_emulator/bios.c
index 77c7f94bc63..af27582275b 100644
--- a/drivers/bios_emulator/bios.c
+++ b/drivers/bios_emulator/bios.c
@@ -43,6 +43,7 @@
 
 #define __io
 #include <common.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include "biosemui.h"
 
diff --git a/drivers/bios_emulator/biosemu.c b/drivers/bios_emulator/biosemu.c
index e605238d439..ca083a4d646 100644
--- a/drivers/bios_emulator/biosemu.c
+++ b/drivers/bios_emulator/biosemu.c
@@ -47,6 +47,7 @@
 
 #include <malloc.h>
 #include <common.h>
+#include <stdio.h>
 #include <linux/string.h>
 #include "biosemui.h"
 
diff --git a/drivers/bios_emulator/include/x86emu.h b/drivers/bios_emulator/include/x86emu.h
index b28cdc6b8ca..0970faaa21b 100644
--- a/drivers/bios_emulator/include/x86emu.h
+++ b/drivers/bios_emulator/include/x86emu.h
@@ -41,6 +41,7 @@
 #ifndef __X86EMU_X86EMU_H
 #define __X86EMU_X86EMU_H
 
+#include <stdio.h>
 #include <asm/types.h>
 #include <common.h>
 #include <pci.h>
diff --git a/drivers/bios_emulator/include/x86emu/debug.h b/drivers/bios_emulator/include/x86emu/debug.h
index 859b54d8600..e80c89d763d 100644
--- a/drivers/bios_emulator/include/x86emu/debug.h
+++ b/drivers/bios_emulator/include/x86emu/debug.h
@@ -39,6 +39,8 @@
 #ifndef __X86EMU_DEBUG_H
 #define __X86EMU_DEBUG_H
 
+#include <stdio.h>
+
 /*---------------------- Macros and type definitions ----------------------*/
 
 /* checks to be enabled for "runtime" */
diff --git a/drivers/bios_emulator/x86emu/ops.c b/drivers/bios_emulator/x86emu/ops.c
index 8c1a146165c..9c8c1eecdda 100644
--- a/drivers/bios_emulator/x86emu/ops.c
+++ b/drivers/bios_emulator/x86emu/ops.c
@@ -73,6 +73,7 @@
 ****************************************************************************/
 
 #include <common.h>
+#include <stdio.h>
 #include <linux/printk.h>
 #include "x86emu/x86emui.h"
 
diff --git a/drivers/block/blk-uclass.c b/drivers/block/blk-uclass.c
index 777525530ee..a13b239cc9c 100644
--- a/drivers/block/blk-uclass.c
+++ b/drivers/block/blk-uclass.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <part.h>
+#include <stdio.h>
 #include <dm/device-internal.h>
 #include <dm/lists.h>
 #include <dm/uclass-internal.h>
diff --git a/drivers/block/blk_legacy.c b/drivers/block/blk_legacy.c
index f812169a4f2..2b02e4d3b1c 100644
--- a/drivers/block/blk_legacy.c
+++ b/drivers/block/blk_legacy.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <blk.h>
 #include <part.h>
+#include <stdio.h>
 #include <linux/err.h>
 #include <linux/string.h>
 
diff --git a/drivers/block/ide.c b/drivers/block/ide.c
index 01bf76d0023..6ac9323420d 100644
--- a/drivers/block/ide.c
+++ b/drivers/block/ide.c
@@ -11,6 +11,7 @@
 #include <ide.h>
 #include <log.h>
 #include <part.h>
+#include <stdio.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 a3b2e77ef30..5c4d24c9c02 100644
--- a/drivers/block/sandbox.c
+++ b/drivers/block/sandbox.c
@@ -11,6 +11,7 @@
 #include <os.h>
 #include <malloc.h>
 #include <sandboxblockdev.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <dm/device_compat.h>
 #include <linux/errno.h>
diff --git a/drivers/bootcount/bootcount_ext.c b/drivers/bootcount/bootcount_ext.c
index 9639e638e95..44f97a1054f 100644
--- a/drivers/bootcount/bootcount_ext.c
+++ b/drivers/bootcount/bootcount_ext.c
@@ -6,6 +6,7 @@
 #include <bootcount.h>
 #include <fs.h>
 #include <mapmem.h>
+#include <stdio.h>
 
 #define BC_MAGIC	0xbd
 #define BC_VERSION	1
diff --git a/drivers/bootcount/bootcount_i2c.c b/drivers/bootcount/bootcount_i2c.c
index 496741d63f7..6f8d12e8fdd 100644
--- a/drivers/bootcount/bootcount_i2c.c
+++ b/drivers/bootcount/bootcount_i2c.c
@@ -5,6 +5,7 @@
  */
 
 #include <bootcount.h>
+#include <stdio.h>
 #include <linux/compiler.h>
 #include <i2c.h>
 
diff --git a/drivers/cache/cache-ncore.c b/drivers/cache/cache-ncore.c
index 3beff780de0..efef0561378 100644
--- a/drivers/cache/cache-ncore.c
+++ b/drivers/cache/cache-ncore.c
@@ -5,6 +5,7 @@
  */
 #include <dm.h>
 #include <hang.h>
+#include <stdio.h>
 #include <wait_bit.h>
 
 #include <asm/io.h>
diff --git a/drivers/cache/cache-v5l2.c b/drivers/cache/cache-v5l2.c
index 305a737d3b3..7adc69d514c 100644
--- a/drivers/cache/cache-v5l2.c
+++ b/drivers/cache/cache-v5l2.c
@@ -9,6 +9,7 @@
 #include <cache.h>
 #include <dm.h>
 #include <hang.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm/ofnode.h>
diff --git a/drivers/clk/at91/clk-utmi.c b/drivers/clk/at91/clk-utmi.c
index 18af0bfeaad..72b97af1bcb 100644
--- a/drivers/clk/at91/clk-utmi.c
+++ b/drivers/clk/at91/clk-utmi.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <clk-uclass.h>
 #include <dm.h>
+#include <stdio.h>
 #include <syscon.h>
 #include <linux/io.h>
 #include <mach/at91_pmc.h>
diff --git a/drivers/clk/clk-mux.c b/drivers/clk/clk-mux.c
index 075d4932a9c..446c0c7b52d 100644
--- a/drivers/clk/clk-mux.c
+++ b/drivers/clk/clk-mux.c
@@ -22,6 +22,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <malloc.h>
 #include <clk-uclass.h>
diff --git a/drivers/clk/clk-uclass.c b/drivers/clk/clk-uclass.c
index e6f20c43e81..97cd7b1f315 100644
--- a/drivers/clk/clk-uclass.c
+++ b/drivers/clk/clk-uclass.c
@@ -14,6 +14,7 @@
 #include <errno.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <dm/devres.h>
 #include <dm/read.h>
diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
index 0f55ba751c0..f55d57a95e6 100644
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <clk-uclass.h>
 #include <log.h>
+#include <stdio.h>
 #include <dm/device.h>
 #include <dm/uclass.h>
 #include <dm/lists.h>
diff --git a/drivers/clk/clk_pic32.c b/drivers/clk/clk_pic32.c
index 78daf2cbad3..fff359a8035 100644
--- a/drivers/clk/clk_pic32.c
+++ b/drivers/clk/clk_pic32.c
@@ -8,6 +8,7 @@
 #include <clk-uclass.h>
 #include <dm.h>
 #include <div64.h>
+#include <stdio.h>
 #include <time.h>
 #include <wait_bit.h>
 #include <asm/global_data.h>
diff --git a/drivers/clk/clk_stm32mp1.c b/drivers/clk/clk_stm32mp1.c
index 8244b7c99fc..b2e0c8ca00d 100644
--- a/drivers/clk/clk_stm32mp1.c
+++ b/drivers/clk/clk_stm32mp1.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <regmap.h>
 #include <spl.h>
+#include <stdio.h>
 #include <syscon.h>
 #include <time.h>
 #include <vsprintf.h>
diff --git a/drivers/clk/clk_versal.c b/drivers/clk/clk_versal.c
index 7a04d68f8dd..19db23159f0 100644
--- a/drivers/clk/clk_versal.c
+++ b/drivers/clk/clk_versal.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <asm/ptrace.h>
 #include <dm/device_compat.h>
diff --git a/drivers/clk/clk_zynqmp.c b/drivers/clk/clk_zynqmp.c
index 2313ac0bc04..8c62b63ea2b 100644
--- a/drivers/clk/clk_zynqmp.c
+++ b/drivers/clk/clk_zynqmp.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <clk-uclass.h>
diff --git a/drivers/clk/ics8n3qv01.c b/drivers/clk/ics8n3qv01.c
index 4f80bf6e522..95f1c7641f2 100644
--- a/drivers/clk/ics8n3qv01.c
+++ b/drivers/clk/ics8n3qv01.c
@@ -14,6 +14,7 @@
 #include <clk-uclass.h>
 #include <i2c.h>
 #include <log.h>
+#include <stdio.h>
 
 const long long ICS8N3QV01_FREF = 114285000;
 const long long ICS8N3QV01_FREF_LL = 114285000LL;
diff --git a/drivers/clk/imx/clk-imx6q.c b/drivers/clk/imx/clk-imx6q.c
index 11d194363d3..c8d826b0141 100644
--- a/drivers/clk/imx/clk-imx6q.c
+++ b/drivers/clk/imx/clk-imx6q.c
@@ -8,6 +8,7 @@
 #include <clk-uclass.h>
 #include <dm.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <dt-bindings/clock/imx6qdl-clock.h>
diff --git a/drivers/clk/imx/clk-imx8.c b/drivers/clk/imx/clk-imx8.c
index 27a652a625a..523ead82e97 100644
--- a/drivers/clk/imx/clk-imx8.c
+++ b/drivers/clk/imx/clk-imx8.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/arch/sci/sci.h>
 #include <asm/arch/clock.h>
 #include <dt-bindings/clock/imx8qxp-clock.h>
diff --git a/drivers/clk/imx/clk-imx8qm.c b/drivers/clk/imx/clk-imx8qm.c
index 54fb09fda40..d781bcd8a93 100644
--- a/drivers/clk/imx/clk-imx8qm.c
+++ b/drivers/clk/imx/clk-imx8qm.c
@@ -8,6 +8,7 @@
 #include <clk-uclass.h>
 #include <dm.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/arch/sci/sci.h>
 #include <asm/arch/clock.h>
 #include <dt-bindings/clock/imx8qm-clock.h>
diff --git a/drivers/clk/imx/clk-imx8qxp.c b/drivers/clk/imx/clk-imx8qxp.c
index e6b2fb40da2..40761340739 100644
--- a/drivers/clk/imx/clk-imx8qxp.c
+++ b/drivers/clk/imx/clk-imx8qxp.c
@@ -8,6 +8,7 @@
 #include <clk-uclass.h>
 #include <dm.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/arch/sci/sci.h>
 #include <asm/arch/clock.h>
 #include <dt-bindings/clock/imx8qxp-clock.h>
diff --git a/drivers/clk/mpc83xx_clk.c b/drivers/clk/mpc83xx_clk.c
index 9ec41d7705a..b95aedeb2dc 100644
--- a/drivers/clk/mpc83xx_clk.c
+++ b/drivers/clk/mpc83xx_clk.c
@@ -10,6 +10,7 @@
 #include <command.h>
 #include <dm.h>
 #include <log.h>
+#include <stdio.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <dm/lists.h>
diff --git a/drivers/clk/mvebu/armada-37xx-periph.c b/drivers/clk/mvebu/armada-37xx-periph.c
index 30710040ff9..2e2ac6fe870 100644
--- a/drivers/clk/mvebu/armada-37xx-periph.c
+++ b/drivers/clk/mvebu/armada-37xx-periph.c
@@ -13,6 +13,7 @@
 #include <clk-uclass.h>
 #include <clk.h>
 #include <dm.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <dm/device_compat.h>
diff --git a/drivers/clk/mvebu/armada-37xx-tbg.c b/drivers/clk/mvebu/armada-37xx-tbg.c
index 233926e9b6a..bb943830266 100644
--- a/drivers/clk/mvebu/armada-37xx-tbg.c
+++ b/drivers/clk/mvebu/armada-37xx-tbg.c
@@ -12,6 +12,7 @@
 #include <clk-uclass.h>
 #include <clk.h>
 #include <dm.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <dm/device_compat.h>
diff --git a/drivers/clk/renesas/clk-rcar-gen2.c b/drivers/clk/renesas/clk-rcar-gen2.c
index cbf2ffe6e85..a859625b60b 100644
--- a/drivers/clk/renesas/clk-rcar-gen2.c
+++ b/drivers/clk/renesas/clk-rcar-gen2.c
@@ -15,6 +15,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/string.h>
diff --git a/drivers/clk/renesas/clk-rcar-gen3.c b/drivers/clk/renesas/clk-rcar-gen3.c
index 3223becd753..ad2c73998d4 100644
--- a/drivers/clk/renesas/clk-rcar-gen3.c
+++ b/drivers/clk/renesas/clk-rcar-gen3.c
@@ -15,6 +15,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
+#include <stdio.h>
 #include <wait_bit.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/clk/rockchip/clk_pll.c b/drivers/clk/rockchip/clk_pll.c
index 83d45c75ee2..3424a9a36a3 100644
--- a/drivers/clk/rockchip/clk_pll.c
+++ b/drivers/clk/rockchip/clk_pll.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch-rockchip/clock.h>
 #include <asm/arch-rockchip/hardware.h>
diff --git a/drivers/clk/rockchip/clk_px30.c b/drivers/clk/rockchip/clk_px30.c
index 0ef449159d9..4178502bdff 100644
--- a/drivers/clk/rockchip/clk_px30.c
+++ b/drivers/clk/rockchip/clk_px30.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <syscon.h>
 #include <asm/arch-rockchip/clock.h>
 #include <asm/arch-rockchip/cru_px30.h>
diff --git a/drivers/clk/rockchip/clk_rk3128.c b/drivers/clk/rockchip/clk_rk3128.c
index 61f823e254e..5a0079e0298 100644
--- a/drivers/clk/rockchip/clk_rk3128.c
+++ b/drivers/clk/rockchip/clk_rk3128.c
@@ -9,6 +9,7 @@
 #include <errno.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <syscon.h>
 #include <asm/io.h>
 #include <asm/arch-rockchip/clock.h>
diff --git a/drivers/clk/rockchip/clk_rk3288.c b/drivers/clk/rockchip/clk_rk3288.c
index a3c5bbf1f6b..6221515df20 100644
--- a/drivers/clk/rockchip/clk_rk3288.c
+++ b/drivers/clk/rockchip/clk_rk3288.c
@@ -13,6 +13,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <mapmem.h>
+#include <stdio.h>
 #include <syscon.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/clk/rockchip/clk_rk3308.c b/drivers/clk/rockchip/clk_rk3308.c
index 4a72fe29375..c6270aa07e1 100644
--- a/drivers/clk/rockchip/clk_rk3308.c
+++ b/drivers/clk/rockchip/clk_rk3308.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <syscon.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/clk/rockchip/clk_rk3328.c b/drivers/clk/rockchip/clk_rk3328.c
index e04042f0bd9..1050559cedf 100644
--- a/drivers/clk/rockchip/clk_rk3328.c
+++ b/drivers/clk/rockchip/clk_rk3328.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <syscon.h>
 #include <asm/arch-rockchip/clock.h>
 #include <asm/arch-rockchip/cru_rk3328.h>
diff --git a/drivers/clk/rockchip/clk_rk3399.c b/drivers/clk/rockchip/clk_rk3399.c
index c2eaf67f58f..e6d74ab6b93 100644
--- a/drivers/clk/rockchip/clk_rk3399.c
+++ b/drivers/clk/rockchip/clk_rk3399.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <mapmem.h>
+#include <stdio.h>
 #include <syscon.h>
 #include <bitfield.h>
 #include <asm/io.h>
diff --git a/drivers/clk/rockchip/clk_rv1108.c b/drivers/clk/rockchip/clk_rv1108.c
index 9e6bb9cd88d..87a2847485c 100644
--- a/drivers/clk/rockchip/clk_rv1108.c
+++ b/drivers/clk/rockchip/clk_rv1108.c
@@ -11,6 +11,7 @@
 #include <errno.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <syscon.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/clk/sunxi/clk_sunxi.c b/drivers/clk/sunxi/clk_sunxi.c
index 41934cd826e..d440abc1394 100644
--- a/drivers/clk/sunxi/clk_sunxi.c
+++ b/drivers/clk/sunxi/clk_sunxi.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <log.h>
 #include <reset.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/ccu.h>
 #include <linux/bitops.h>
diff --git a/drivers/core/acpi.c b/drivers/core/acpi.c
index a28b56a7333..26f494f2aeb 100644
--- a/drivers/core/acpi.c
+++ b/drivers/core/acpi.c
@@ -13,6 +13,7 @@
 #include <dm.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <acpi/acpi_device.h>
 #include <dm/acpi.h>
 #include <dm/device-internal.h>
diff --git a/drivers/core/devres.c b/drivers/core/devres.c
index 88244698b0c..e2d4a80cefd 100644
--- a/drivers/core/devres.c
+++ b/drivers/core/devres.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <linux/compat.h>
 #include <linux/kernel.h>
 #include <linux/list.h>
diff --git a/drivers/core/dump.c b/drivers/core/dump.c
index 6debaf97a1d..3b707eb4933 100644
--- a/drivers/core/dump.c
+++ b/drivers/core/dump.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <dm.h>
 #include <mapmem.h>
+#include <stdio.h>
 #include <dm/root.h>
 #include <dm/util.h>
 #include <dm/uclass-internal.h>
diff --git a/drivers/core/util.c b/drivers/core/util.c
index 25b0d76f430..7a2fe1f4394 100644
--- a/drivers/core/util.c
+++ b/drivers/core/util.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <dm/device.h>
 #include <dm/ofnode.h>
 #include <dm/read.h>
diff --git a/drivers/cpu/bmips_cpu.c b/drivers/cpu/bmips_cpu.c
index 8419adb3cc3..fd079951d6f 100644
--- a/drivers/cpu/bmips_cpu.c
+++ b/drivers/cpu/bmips_cpu.c
@@ -13,6 +13,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
 
diff --git a/drivers/cpu/imx8_cpu.c b/drivers/cpu/imx8_cpu.c
index 21ccc1ce31d..907358f312e 100644
--- a/drivers/cpu/imx8_cpu.c
+++ b/drivers/cpu/imx8_cpu.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <cpu.h>
 #include <dm.h>
+#include <stdio.h>
 #include <thermal.h>
 #include <asm/global_data.h>
 #include <asm/system.h>
diff --git a/drivers/crypto/fsl/desc_constr.h b/drivers/crypto/fsl/desc_constr.h
index ef4cd525e3a..7d6546fd9c0 100644
--- a/drivers/crypto/fsl/desc_constr.h
+++ b/drivers/crypto/fsl/desc_constr.h
@@ -7,6 +7,7 @@
  * Based on desc_constr.h file in linux drivers/crypto/caam
  */
 
+#include <stdio.h>
 #include <linux/compat.h>
 #include <linux/string.h>
 #include "desc.h"
diff --git a/drivers/crypto/fsl/fsl_blob.c b/drivers/crypto/fsl/fsl_blob.c
index d6bd861251e..5bc0f3d5f22 100644
--- a/drivers/crypto/fsl/fsl_blob.c
+++ b/drivers/crypto/fsl/fsl_blob.c
@@ -10,6 +10,7 @@
 #include <malloc.h>
 #include <memalign.h>
 #include <fsl_sec.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <linux/errno.h>
 #include "jobdesc.h"
diff --git a/drivers/crypto/fsl/fsl_hash.c b/drivers/crypto/fsl/fsl_hash.c
index 5182f21acb2..80640248c37 100644
--- a/drivers/crypto/fsl/fsl_hash.c
+++ b/drivers/crypto/fsl/fsl_hash.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <memalign.h>
+#include <stdio.h>
 #include <linux/string.h>
 #include "jobdesc.h"
 #include "desc.h"
diff --git a/drivers/crypto/fsl/jobdesc.c b/drivers/crypto/fsl/jobdesc.c
index 17777e5551d..e85c2dd01d9 100644
--- a/drivers/crypto/fsl/jobdesc.c
+++ b/drivers/crypto/fsl/jobdesc.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <fsl_sec.h>
+#include <stdio.h>
 #include <linux/string.h>
 #include "desc_constr.h"
 #include "jobdesc.h"
diff --git a/drivers/crypto/fsl/jr.c b/drivers/crypto/fsl/jr.c
index afca79dfc0a..9e31e92024c 100644
--- a/drivers/crypto/fsl/jr.c
+++ b/drivers/crypto/fsl/jr.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <cpu_func.h>
+#include <stdio.h>
 #include <linux/kernel.h>
 #include <log.h>
 #include <malloc.h>
diff --git a/drivers/crypto/fsl/sec.c b/drivers/crypto/fsl/sec.c
index f0a4a63d886..afdad43d331 100644
--- a/drivers/crypto/fsl/sec.c
+++ b/drivers/crypto/fsl/sec.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <stdio.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_agilex.c b/drivers/ddr/altera/sdram_agilex.c
index 1ddc35d5d3b..771820941aa 100644
--- a/drivers/ddr/altera/sdram_agilex.c
+++ b/drivers/ddr/altera/sdram_agilex.c
@@ -13,6 +13,7 @@
 #include <log.h>
 #include <ram.h>
 #include <reset.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include "sdram_soc64.h"
diff --git a/drivers/ddr/altera/sdram_arria10.c b/drivers/ddr/altera/sdram_arria10.c
index b2053bf412c..b7986a4f47e 100644
--- a/drivers/ddr/altera/sdram_arria10.c
+++ b/drivers/ddr/altera/sdram_arria10.c
@@ -10,6 +10,7 @@
 #include <init.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <wait_bit.h>
 #include <watchdog.h>
 #include <asm/cache.h>
diff --git a/drivers/ddr/altera/sdram_gen5.c b/drivers/ddr/altera/sdram_gen5.c
index 52cde7d409b..01857f29256 100644
--- a/drivers/ddr/altera/sdram_gen5.c
+++ b/drivers/ddr/altera/sdram_gen5.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <ram.h>
 #include <reset.h>
+#include <stdio.h>
 #include <watchdog.h>
 #include <asm/arch/fpga_manager.h>
 #include <asm/arch/reset_manager.h>
diff --git a/drivers/ddr/altera/sdram_s10.c b/drivers/ddr/altera/sdram_s10.c
index 71c68d3e7a8..4c913e9b5b6 100644
--- a/drivers/ddr/altera/sdram_s10.c
+++ b/drivers/ddr/altera/sdram_s10.c
@@ -15,6 +15,7 @@
 #include <log.h>
 #include <ram.h>
 #include <reset.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include "sdram_s10.h"
diff --git a/drivers/ddr/altera/sdram_soc64.c b/drivers/ddr/altera/sdram_soc64.c
index 5729588a074..03ca6b58cfc 100644
--- a/drivers/ddr/altera/sdram_soc64.c
+++ b/drivers/ddr/altera/sdram_soc64.c
@@ -15,6 +15,7 @@
 #include <log.h>
 #include <ram.h>
 #include <reset.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
diff --git a/drivers/ddr/fsl/arm_ddr_gen3.c b/drivers/ddr/fsl/arm_ddr_gen3.c
index ca241ee5fff..2f503b1a101 100644
--- a/drivers/ddr/fsl/arm_ddr_gen3.c
+++ b/drivers/ddr/fsl/arm_ddr_gen3.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <fsl_ddr_sdram.h>
 #include <asm/processor.h>
diff --git a/drivers/ddr/fsl/ctrl_regs.c b/drivers/ddr/fsl/ctrl_regs.c
index 1edd39b9b73..c3409703ea9 100644
--- a/drivers/ddr/fsl/ctrl_regs.c
+++ b/drivers/ddr/fsl/ctrl_regs.c
@@ -16,6 +16,7 @@
 #include <fsl_ddr.h>
 #include <fsl_immap.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/bitops.h>
 #include <asm/io.h>
 #if defined(CONFIG_FSL_LSCH2) || defined(CONFIG_FSL_LSCH3) || \
diff --git a/drivers/ddr/fsl/ddr1_dimm_params.c b/drivers/ddr/fsl/ddr1_dimm_params.c
index 2ccf1e82f9a..698324073db 100644
--- a/drivers/ddr/fsl/ddr1_dimm_params.c
+++ b/drivers/ddr/fsl/ddr1_dimm_params.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <fsl_ddr_sdram.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/bitops.h>
 #include <linux/string.h>
 
diff --git a/drivers/ddr/fsl/ddr2_dimm_params.c b/drivers/ddr/fsl/ddr2_dimm_params.c
index 9ee2dfc2455..95a250c33f4 100644
--- a/drivers/ddr/fsl/ddr2_dimm_params.c
+++ b/drivers/ddr/fsl/ddr2_dimm_params.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <fsl_ddr_sdram.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/bitops.h>
 #include <linux/string.h>
 
diff --git a/drivers/ddr/fsl/ddr3_dimm_params.c b/drivers/ddr/fsl/ddr3_dimm_params.c
index d0625ea0e1b..b3e42519e86 100644
--- a/drivers/ddr/fsl/ddr3_dimm_params.c
+++ b/drivers/ddr/fsl/ddr3_dimm_params.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <fsl_ddr_sdram.h>
 #include <log.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 #include <fsl_ddr.h>
diff --git a/drivers/ddr/fsl/ddr4_dimm_params.c b/drivers/ddr/fsl/ddr4_dimm_params.c
index 37e43dc8f17..cc6c034747f 100644
--- a/drivers/ddr/fsl/ddr4_dimm_params.c
+++ b/drivers/ddr/fsl/ddr4_dimm_params.c
@@ -13,6 +13,7 @@
 #include <common.h>
 #include <fsl_ddr_sdram.h>
 #include <log.h>
+#include <stdio.h>
 #include <linux/bug.h>
 #include <linux/string.h>
 
diff --git a/drivers/ddr/fsl/fsl_ddr_gen4.c b/drivers/ddr/fsl/fsl_ddr_gen4.c
index c0a9540f420..fceae90414c 100644
--- a/drivers/ddr/fsl/fsl_ddr_gen4.c
+++ b/drivers/ddr/fsl/fsl_ddr_gen4.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <env.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <fsl_ddr_sdram.h>
 #include <asm/processor.h>
diff --git a/drivers/ddr/fsl/fsl_mmdc.c b/drivers/ddr/fsl/fsl_mmdc.c
index cbd625b7eea..b88c65cd2e4 100644
--- a/drivers/ddr/fsl/fsl_mmdc.c
+++ b/drivers/ddr/fsl/fsl_mmdc.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <fsl_mmdc.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/delay.h>
 
diff --git a/drivers/ddr/fsl/interactive.c b/drivers/ddr/fsl/interactive.c
index 3736ea129a7..645d83c0df8 100644
--- a/drivers/ddr/fsl/interactive.c
+++ b/drivers/ddr/fsl/interactive.c
@@ -16,6 +16,7 @@
 #include <command.h>
 #include <env.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/bitops.h>
 #include <linux/ctype.h>
 #include <asm/types.h>
diff --git a/drivers/ddr/fsl/lc_common_dimm_params.c b/drivers/ddr/fsl/lc_common_dimm_params.c
index d299d763db1..d6a2ad99c42 100644
--- a/drivers/ddr/fsl/lc_common_dimm_params.c
+++ b/drivers/ddr/fsl/lc_common_dimm_params.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <fsl_ddr_sdram.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/bitops.h>
 
 #include <fsl_ddr.h>
diff --git a/drivers/ddr/fsl/main.c b/drivers/ddr/fsl/main.c
index 5b2ddc3893a..cf0731bd842 100644
--- a/drivers/ddr/fsl/main.c
+++ b/drivers/ddr/fsl/main.c
@@ -17,6 +17,7 @@
 #include <fsl_ddr.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/bitops.h>
 #include <linux/string.h>
 
diff --git a/drivers/ddr/fsl/mpc85xx_ddr_gen1.c b/drivers/ddr/fsl/mpc85xx_ddr_gen1.c
index 467775d2be9..091d7582f95 100644
--- a/drivers/ddr/fsl/mpc85xx_ddr_gen1.c
+++ b/drivers/ddr/fsl/mpc85xx_ddr_gen1.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <fsl_ddr_sdram.h>
 #include <asm/u-boot.h>
diff --git a/drivers/ddr/fsl/mpc85xx_ddr_gen2.c b/drivers/ddr/fsl/mpc85xx_ddr_gen2.c
index 14af7ca4a78..7fc264aa936 100644
--- a/drivers/ddr/fsl/mpc85xx_ddr_gen2.c
+++ b/drivers/ddr/fsl/mpc85xx_ddr_gen2.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/processor.h>
 #include <fsl_ddr_sdram.h>
diff --git a/drivers/ddr/fsl/mpc85xx_ddr_gen3.c b/drivers/ddr/fsl/mpc85xx_ddr_gen3.c
index 3c18d441ed1..cbe434a1a6a 100644
--- a/drivers/ddr/fsl/mpc85xx_ddr_gen3.c
+++ b/drivers/ddr/fsl/mpc85xx_ddr_gen3.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <fsl_ddr_sdram.h>
 #include <asm/processor.h>
diff --git a/drivers/ddr/fsl/mpc86xx_ddr.c b/drivers/ddr/fsl/mpc86xx_ddr.c
index 43ed1ba432d..a57cfec5b8c 100644
--- a/drivers/ddr/fsl/mpc86xx_ddr.c
+++ b/drivers/ddr/fsl/mpc86xx_ddr.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <fsl_ddr_sdram.h>
 #include <linux/delay.h>
diff --git a/drivers/ddr/fsl/options.c b/drivers/ddr/fsl/options.c
index fce4fb66334..22bee2d3632 100644
--- a/drivers/ddr/fsl/options.c
+++ b/drivers/ddr/fsl/options.c
@@ -9,6 +9,7 @@
 #include <hwconfig.h>
 #include <fsl_ddr_sdram.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 
 #include <fsl_ddr.h>
diff --git a/drivers/ddr/fsl/util.c b/drivers/ddr/fsl/util.c
index 2386667f3a0..daf78f0d1ba 100644
--- a/drivers/ddr/fsl/util.c
+++ b/drivers/ddr/fsl/util.c
@@ -8,6 +8,7 @@
 #include <asm/fsl_law.h>
 #endif
 #include <div64.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 
diff --git a/drivers/ddr/imx/imx8m/helper.c b/drivers/ddr/imx/imx8m/helper.c
index f23904bf712..8903ff146fc 100644
--- a/drivers/ddr/imx/imx8m/helper.c
+++ b/drivers/ddr/imx/imx8m/helper.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <log.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <errno.h>
diff --git a/drivers/ddr/marvell/a38x/ddr_ml_wrapper.h b/drivers/ddr/marvell/a38x/ddr_ml_wrapper.h
index 5bf32399211..688cbbeefc5 100644
--- a/drivers/ddr/marvell/a38x/ddr_ml_wrapper.h
+++ b/drivers/ddr/marvell/a38x/ddr_ml_wrapper.h
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <i2c.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
diff --git a/drivers/ddr/marvell/axp/ddr3_dfs.c b/drivers/ddr/marvell/axp/ddr3_dfs.c
index b58c0fe01e5..86abdf70db7 100644
--- a/drivers/ddr/marvell/axp/ddr3_dfs.c
+++ b/drivers/ddr/marvell/axp/ddr3_dfs.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <i2c.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
diff --git a/drivers/ddr/marvell/axp/ddr3_dqs.c b/drivers/ddr/marvell/axp/ddr3_dqs.c
index 0db94212b90..33187fbc64f 100644
--- a/drivers/ddr/marvell/axp/ddr3_dqs.c
+++ b/drivers/ddr/marvell/axp/ddr3_dqs.c
@@ -7,6 +7,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
diff --git a/drivers/ddr/marvell/axp/ddr3_hw_training.c b/drivers/ddr/marvell/axp/ddr3_hw_training.c
index c39f40095fc..cc36f29ff86 100644
--- a/drivers/ddr/marvell/axp/ddr3_hw_training.c
+++ b/drivers/ddr/marvell/axp/ddr3_hw_training.c
@@ -7,6 +7,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
diff --git a/drivers/ddr/marvell/axp/ddr3_init.c b/drivers/ddr/marvell/axp/ddr3_init.c
index 607f3e12c3a..f934957a0f3 100644
--- a/drivers/ddr/marvell/axp/ddr3_init.c
+++ b/drivers/ddr/marvell/axp/ddr3_init.c
@@ -7,6 +7,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
diff --git a/drivers/ddr/marvell/axp/ddr3_pbs.c b/drivers/ddr/marvell/axp/ddr3_pbs.c
index a963b3c55be..dd7905dd7f4 100644
--- a/drivers/ddr/marvell/axp/ddr3_pbs.c
+++ b/drivers/ddr/marvell/axp/ddr3_pbs.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <i2c.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
diff --git a/drivers/ddr/marvell/axp/ddr3_read_leveling.c b/drivers/ddr/marvell/axp/ddr3_read_leveling.c
index 30a5c354885..03dae99107a 100644
--- a/drivers/ddr/marvell/axp/ddr3_read_leveling.c
+++ b/drivers/ddr/marvell/axp/ddr3_read_leveling.c
@@ -7,6 +7,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
diff --git a/drivers/ddr/marvell/axp/ddr3_spd.c b/drivers/ddr/marvell/axp/ddr3_spd.c
index 8927abe17ef..f96d2bdaeb9 100644
--- a/drivers/ddr/marvell/axp/ddr3_spd.c
+++ b/drivers/ddr/marvell/axp/ddr3_spd.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <i2c.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
diff --git a/drivers/ddr/marvell/axp/ddr3_write_leveling.c b/drivers/ddr/marvell/axp/ddr3_write_leveling.c
index de8dfc299f7..8c875287b4c 100644
--- a/drivers/ddr/marvell/axp/ddr3_write_leveling.c
+++ b/drivers/ddr/marvell/axp/ddr3_write_leveling.c
@@ -7,6 +7,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
diff --git a/drivers/ddr/microchip/ddr2.c b/drivers/ddr/microchip/ddr2.c
index 149b6071cfd..90ebf4642d5 100644
--- a/drivers/ddr/microchip/ddr2.c
+++ b/drivers/ddr/microchip/ddr2.c
@@ -4,6 +4,7 @@
  *
  */
 #include <common.h>
+#include <stdio.h>
 #include <wait_bit.h>
 #include <linux/kernel.h>
 #include <linux/bitops.h>
diff --git a/drivers/demo/demo-shape.c b/drivers/demo/demo-shape.c
index d0c0c736551..3e1f79aee50 100644
--- a/drivers/demo/demo-shape.c
+++ b/drivers/demo/demo-shape.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <dm-demo.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
diff --git a/drivers/demo/demo-simple.c b/drivers/demo/demo-simple.c
index 68972c780f4..325f653877f 100644
--- a/drivers/demo/demo-simple.c
+++ b/drivers/demo/demo-simple.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <dm-demo.h>
 #include <mapmem.h>
+#include <stdio.h>
 #include <asm/io.h>
 
 static int simple_hello(struct udevice *dev, int ch)
diff --git a/drivers/dfu/dfu.c b/drivers/dfu/dfu.c
index 5dc5f80854e..043c03a3492 100644
--- a/drivers/dfu/dfu.c
+++ b/drivers/dfu/dfu.c
@@ -15,6 +15,7 @@
 #include <fat.h>
 #include <dfu.h>
 #include <hash.h>
+#include <stdio.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 0fd69d0d1e4..a3444f131ea 100644
--- a/drivers/dfu/dfu_mmc.c
+++ b/drivers/dfu/dfu_mmc.c
@@ -16,6 +16,7 @@
 #include <fat.h>
 #include <mmc.h>
 #include <part.h>
+#include <stdio.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/dfu/dfu_mtd.c b/drivers/dfu/dfu_mtd.c
index 861a0b370e0..ebf4b8b26e8 100644
--- a/drivers/dfu/dfu_mtd.c
+++ b/drivers/dfu/dfu_mtd.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <dfu.h>
 #include <mtd.h>
+#include <stdio.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 38f46b2f412..b4abe6005d9 100644
--- a/drivers/dfu/dfu_nand.c
+++ b/drivers/dfu/dfu_nand.c
@@ -15,6 +15,7 @@
 #include <errno.h>
 #include <div64.h>
 #include <dfu.h>
+#include <stdio.h>
 #include <linux/mtd/mtd.h>
 #include <jffs2/load_kernel.h>
 #include <nand.h>
diff --git a/drivers/dfu/dfu_sf.c b/drivers/dfu/dfu_sf.c
index 20e1c286902..b64570aa4c7 100644
--- a/drivers/dfu/dfu_sf.c
+++ b/drivers/dfu/dfu_sf.c
@@ -11,6 +11,7 @@
 #include <dfu.h>
 #include <spi.h>
 #include <spi_flash.h>
+#include <stdio.h>
 #include <jffs2/load_kernel.h>
 #include <linux/mtd/mtd.h>
 #include <linux/string.h>
diff --git a/drivers/dma/MCD_dmaApi.c b/drivers/dma/MCD_dmaApi.c
index af0e1345220..d3c79e122cb 100644
--- a/drivers/dma/MCD_dmaApi.c
+++ b/drivers/dma/MCD_dmaApi.c
@@ -6,6 +6,7 @@
 /*Main C file for multi-channel DMA API. */
 
 #include <common.h>
+#include <stdio.h>
 
 #include <MCD_dma.h>
 #include <MCD_tasksInit.h>
diff --git a/drivers/dma/apbh_dma.c b/drivers/dma/apbh_dma.c
index a2a76aba84a..8a7ef5013e8 100644
--- a/drivers/dma/apbh_dma.c
+++ b/drivers/dma/apbh_dma.c
@@ -12,6 +12,7 @@
  */
 
 #include <cpu_func.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <linux/list.h>
 #include <linux/string.h>
diff --git a/drivers/dma/ti/k3-udma.c b/drivers/dma/ti/k3-udma.c
index aa835498d29..cab6031ccf2 100644
--- a/drivers/dma/ti/k3-udma.c
+++ b/drivers/dma/ti/k3-udma.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <log.h>
+#include <stdio.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 699fc52fc1c..ab477f5cb91 100644
--- a/drivers/fastboot/fb_command.c
+++ b/drivers/fastboot/fb_command.c
@@ -12,6 +12,7 @@
 #include <fb_nand.h>
 #include <flash.h>
 #include <part.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <linux/printk.h>
 #include <linux/string.h>
diff --git a/drivers/fastboot/fb_common.c b/drivers/fastboot/fb_common.c
index 3c8338f7c68..da467666cf4 100644
--- a/drivers/fastboot/fb_common.c
+++ b/drivers/fastboot/fb_common.c
@@ -14,6 +14,7 @@
 #include <command.h>
 #include <env.h>
 #include <fastboot.h>
+#include <stdio.h>
 #include <linux/string.h>
 #include <net/fastboot.h>
 
diff --git a/drivers/fastboot/fb_mmc.c b/drivers/fastboot/fb_mmc.c
index 3512e2191f0..5dc58f00a75 100644
--- a/drivers/fastboot/fb_mmc.c
+++ b/drivers/fastboot/fb_mmc.c
@@ -17,6 +17,7 @@
 #include <part.h>
 #include <mmc.h>
 #include <div64.h>
+#include <stdio.h>
 #include <linux/compat.h>
 #include <android_image.h>
 #include <linux/printk.h>
diff --git a/drivers/fastboot/fb_nand.c b/drivers/fastboot/fb_nand.c
index c048600d44a..43158063116 100644
--- a/drivers/fastboot/fb_nand.c
+++ b/drivers/fastboot/fb_nand.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <blk.h>
 #include <flash.h>
+#include <stdio.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/firmware/firmware-zynqmp.c b/drivers/firmware/firmware-zynqmp.c
index 66edc169301..3e38848d4cc 100644
--- a/drivers/firmware/firmware-zynqmp.c
+++ b/drivers/firmware/firmware-zynqmp.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <stdio.h>
 #include <zynqmp_firmware.h>
 #include <asm/cache.h>
 #include <asm/ptrace.h>
diff --git a/drivers/firmware/psci.c b/drivers/firmware/psci.c
index 22b04143d17..d4d9c8d8833 100644
--- a/drivers/firmware/psci.c
+++ b/drivers/firmware/psci.c
@@ -11,6 +11,7 @@
 #include <dm.h>
 #include <irq_func.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 #include <dm/lists.h>
 #include <efi_loader.h>
diff --git a/drivers/fpga/altera.c b/drivers/fpga/altera.c
index bb27b3778f3..7f7d768c5cb 100644
--- a/drivers/fpga/altera.c
+++ b/drivers/fpga/altera.c
@@ -14,6 +14,7 @@
 #include <errno.h>
 #include <ACEX1K.h>
 #include <log.h>
+#include <stdio.h>
 #include <stratixII.h>
 
 /* Define FPGA_DEBUG to 1 to get debug printf's */
diff --git a/drivers/fpga/cyclon2.c b/drivers/fpga/cyclon2.c
index 477379449ed..a163f722515 100644
--- a/drivers/fpga/cyclon2.c
+++ b/drivers/fpga/cyclon2.c
@@ -8,6 +8,7 @@
 #include <common.h>		/* core U-Boot definitions */
 #include <altera.h>
 #include <ACEX1K.h>		/* ACEX device family */
+#include <stdio.h>
 #include <time.h>
 #include <linux/delay.h>
 
diff --git a/drivers/fpga/fpga.c b/drivers/fpga/fpga.c
index 4140c825452..1d76e123212 100644
--- a/drivers/fpga/fpga.c
+++ b/drivers/fpga/fpga.c
@@ -8,6 +8,7 @@
 #include <common.h>             /* core U-Boot definitions */
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <xilinx.h>             /* xilinx specific definitions */
 #include <altera.h>             /* altera specific definitions */
 #include <lattice.h>
diff --git a/drivers/fpga/ivm_core.c b/drivers/fpga/ivm_core.c
index adc60919f3b..180663ca32f 100644
--- a/drivers/fpga/ivm_core.c
+++ b/drivers/fpga/ivm_core.c
@@ -31,6 +31,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <linux/string.h>
 #include <malloc.h>
 #include <lattice.h>
diff --git a/drivers/fpga/lattice.c b/drivers/fpga/lattice.c
index e292d991cd1..cbdf00d3a2e 100644
--- a/drivers/fpga/lattice.c
+++ b/drivers/fpga/lattice.c
@@ -15,6 +15,7 @@
 #include <malloc.h>
 #include <fpga.h>
 #include <lattice.h>
+#include <stdio.h>
 #include <linux/delay.h>
 
 static lattice_board_specific_func *pfns;
diff --git a/drivers/fpga/socfpga_arria10.c b/drivers/fpga/socfpga_arria10.c
index 89b338b6968..10d57a90f56 100644
--- a/drivers/fpga/socfpga_arria10.c
+++ b/drivers/fpga/socfpga_arria10.c
@@ -4,6 +4,7 @@
  */
 #include <image.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/fpga/socfpga_gen5.c b/drivers/fpga/socfpga_gen5.c
index d73474f29ee..1edd494a5b0 100644
--- a/drivers/fpga/socfpga_gen5.c
+++ b/drivers/fpga/socfpga_gen5.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <asm/arch/fpga_manager.h>
diff --git a/drivers/fpga/stratix10.c b/drivers/fpga/stratix10.c
index 84f453f76e0..81a3c35d9eb 100644
--- a/drivers/fpga/stratix10.c
+++ b/drivers/fpga/stratix10.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <altera.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/arch/mailbox_s10.h>
 #include <linux/delay.h>
diff --git a/drivers/fpga/stratixv.c b/drivers/fpga/stratixv.c
index abae3b5b751..403865c1e37 100644
--- a/drivers/fpga/stratixv.c
+++ b/drivers/fpga/stratixv.c
@@ -7,6 +7,7 @@
 #include <altera.h>
 #include <log.h>
 #include <spi.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/fpga/versalpl.c b/drivers/fpga/versalpl.c
index 5d67ce215ce..7738cfaf103 100644
--- a/drivers/fpga/versalpl.c
+++ b/drivers/fpga/versalpl.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/arch/sys_proto.h>
 #include <memalign.h>
 #include <versalpl.h>
diff --git a/drivers/fpga/virtex2.c b/drivers/fpga/virtex2.c
index aae9250f198..c6449cfc60f 100644
--- a/drivers/fpga/virtex2.c
+++ b/drivers/fpga/virtex2.c
@@ -14,6 +14,7 @@
 
 #include <common.h>
 #include <console.h>
+#include <stdio.h>
 #include <time.h>
 #include <virtex2.h>
 #include <linux/delay.h>
diff --git a/drivers/fpga/xilinx.c b/drivers/fpga/xilinx.c
index d9f3b82a40e..30259607410 100644
--- a/drivers/fpga/xilinx.c
+++ b/drivers/fpga/xilinx.c
@@ -14,6 +14,7 @@
 #include <common.h>
 #include <fpga.h>
 #include <log.h>
+#include <stdio.h>
 #include <virtex2.h>
 #include <spartan2.h>
 #include <spartan3.h>
diff --git a/drivers/fpga/zynqmppl.c b/drivers/fpga/zynqmppl.c
index 328e275cd37..fd92b47d67a 100644
--- a/drivers/fpga/zynqmppl.c
+++ b/drivers/fpga/zynqmppl.c
@@ -10,6 +10,7 @@
 #include <compiler.h>
 #include <cpu_func.h>
 #include <log.h>
+#include <stdio.h>
 #include <zynqmppl.h>
 #include <zynqmp_firmware.h>
 #include <asm/cache.h>
diff --git a/drivers/fpga/zynqpl.c b/drivers/fpga/zynqpl.c
index 86df6fa32d4..14de9c11d54 100644
--- a/drivers/fpga/zynqpl.c
+++ b/drivers/fpga/zynqpl.c
@@ -10,6 +10,7 @@
 #include <console.h>
 #include <cpu_func.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/cache.h>
 #include <asm/io.h>
diff --git a/drivers/gpio/adi_gpio2.c b/drivers/gpio/adi_gpio2.c
index 8d4ee813985..fc508093d6f 100644
--- a/drivers/gpio/adi_gpio2.c
+++ b/drivers/gpio/adi_gpio2.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <linux/bug.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
diff --git a/drivers/gpio/at91_gpio.c b/drivers/gpio/at91_gpio.c
index 4a8b2e6ff61..d738a04033a 100644
--- a/drivers/gpio/at91_gpio.c
+++ b/drivers/gpio/at91_gpio.c
@@ -12,6 +12,7 @@
 #include <clk.h>
 #include <dm.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/sizes.h>
 #include <asm/gpio.h>
diff --git a/drivers/gpio/atmel_pio4.c b/drivers/gpio/atmel_pio4.c
index 3256469ddc1..b82fe74a62b 100644
--- a/drivers/gpio/atmel_pio4.c
+++ b/drivers/gpio/atmel_pio4.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <fdtdec.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/arch/hardware.h>
 #include <asm/global_data.h>
 #include <asm/gpio.h>
diff --git a/drivers/gpio/da8xx_gpio.c b/drivers/gpio/da8xx_gpio.c
index 0f39972ceeb..dd7506ff177 100644
--- a/drivers/gpio/da8xx_gpio.c
+++ b/drivers/gpio/da8xx_gpio.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <fdtdec.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
diff --git a/drivers/gpio/db8500_gpio.c b/drivers/gpio/db8500_gpio.c
index eefb56d83f6..4e79571aa4e 100644
--- a/drivers/gpio/db8500_gpio.c
+++ b/drivers/gpio/db8500_gpio.c
@@ -17,6 +17,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/io.h>
 
 #include <asm/arch/db8500_gpio.h>
diff --git a/drivers/gpio/gpio-uclass.c b/drivers/gpio/gpio-uclass.c
index 28f4a48900f..7d4e3354f17 100644
--- a/drivers/gpio/gpio-uclass.c
+++ b/drivers/gpio/gpio-uclass.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <dm/device-internal.h>
 #include <dm/lists.h>
diff --git a/drivers/gpio/kona_gpio.c b/drivers/gpio/kona_gpio.c
index 29791882a34..9b8e6240f5a 100644
--- a/drivers/gpio/kona_gpio.c
+++ b/drivers/gpio/kona_gpio.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/sysmap.h>
 
diff --git a/drivers/gpio/kw_gpio.c b/drivers/gpio/kw_gpio.c
index a15769793f1..39a73ccfb74 100644
--- a/drivers/gpio/kw_gpio.c
+++ b/drivers/gpio/kw_gpio.c
@@ -13,6 +13,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <linux/bitops.h>
 #include <asm/io.h>
 #include <asm/arch/soc.h>
diff --git a/drivers/gpio/mpc83xx_gpio.c b/drivers/gpio/mpc83xx_gpio.c
index 276a3b350dc..d041a8b1a5b 100644
--- a/drivers/gpio/mpc83xx_gpio.c
+++ b/drivers/gpio/mpc83xx_gpio.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <malloc.h>
 #include <mpc83xx.h>
+#include <stdio.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 
diff --git a/drivers/gpio/mvgpio.c b/drivers/gpio/mvgpio.c
index 12e7197daf7..bf1842ccf7e 100644
--- a/drivers/gpio/mvgpio.c
+++ b/drivers/gpio/mvgpio.c
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/errno.h>
 #include "mvgpio.h"
diff --git a/drivers/gpio/mxs_gpio.c b/drivers/gpio/mxs_gpio.c
index 2a9f64d633c..4ff267899cb 100644
--- a/drivers/gpio/mxs_gpio.c
+++ b/drivers/gpio/mxs_gpio.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.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 91d664e02ff..fb2f5a30b6d 100644
--- a/drivers/gpio/omap_gpio.c
+++ b/drivers/gpio/omap_gpio.c
@@ -20,6 +20,7 @@
 #include <common.h>
 #include <dm.h>
 #include <fdtdec.h>
+#include <stdio.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 4ab8cee2d18..3e32d70e29d 100644
--- a/drivers/gpio/pca953x.c
+++ b/drivers/gpio/pca953x.c
@@ -12,6 +12,7 @@
 #include <command.h>
 #include <i2c.h>
 #include <pca953x.h>
+#include <stdio.h>
 
 /* Default to an address that hopefully won't corrupt other i2c devices */
 #ifndef CONFIG_SYS_I2C_PCA953X_ADDR
diff --git a/drivers/gpio/pcf8575_gpio.c b/drivers/gpio/pcf8575_gpio.c
index 8a9214dec3e..7eeacd77c2a 100644
--- a/drivers/gpio/pcf8575_gpio.c
+++ b/drivers/gpio/pcf8575_gpio.c
@@ -27,6 +27,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm-generic/gpio.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
diff --git a/drivers/gpio/sandbox.c b/drivers/gpio/sandbox.c
index c2f80472b83..599df135acf 100644
--- a/drivers/gpio/sandbox.c
+++ b/drivers/gpio/sandbox.c
@@ -8,6 +8,7 @@
 #include <fdtdec.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <acpi/acpi_device.h>
 #include <asm/gpio.h>
 #include <dm/acpi.h>
diff --git a/drivers/gpio/tca642x.c b/drivers/gpio/tca642x.c
index 463cfe879a8..21e432d7d80 100644
--- a/drivers/gpio/tca642x.c
+++ b/drivers/gpio/tca642x.c
@@ -23,6 +23,7 @@
 #include <common.h>
 #include <command.h>
 #include <i2c.h>
+#include <stdio.h>
 #include <tca642x.h>
 
 /* tca642x register address definitions */
diff --git a/drivers/gpio/xilinx_gpio.c b/drivers/gpio/xilinx_gpio.c
index 23de1f44e9c..6ee0757e03c 100644
--- a/drivers/gpio/xilinx_gpio.c
+++ b/drivers/gpio/xilinx_gpio.c
@@ -7,6 +7,7 @@
 #include <errno.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <linux/list.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
diff --git a/drivers/gpio/zynq_gpio.c b/drivers/gpio/zynq_gpio.c
index 8888d2324c4..91b8cd945e3 100644
--- a/drivers/gpio/zynq_gpio.c
+++ b/drivers/gpio/zynq_gpio.c
@@ -9,6 +9,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
diff --git a/drivers/i2c/davinci_i2c.c b/drivers/i2c/davinci_i2c.c
index a54f2151fd3..b4bd22fcc85 100644
--- a/drivers/i2c/davinci_i2c.c
+++ b/drivers/i2c/davinci_i2c.c
@@ -15,6 +15,7 @@
 #include <i2c.h>
 #include <dm.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/i2c_defs.h>
 #include <asm/io.h>
diff --git a/drivers/i2c/designware_i2c.c b/drivers/i2c/designware_i2c.c
index 6cd5d517de7..6ea5a31160b 100644
--- a/drivers/i2c/designware_i2c.c
+++ b/drivers/i2c/designware_i2c.c
@@ -12,6 +12,7 @@
 #include <malloc.h>
 #include <pci.h>
 #include <reset.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/io.h>
 #include <linux/delay.h>
diff --git a/drivers/i2c/i2c-cdns.c b/drivers/i2c/i2c-cdns.c
index 024c63c4eae..abbfdcbcc5c 100644
--- a/drivers/i2c/i2c-cdns.c
+++ b/drivers/i2c/i2c-cdns.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <stdio.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/types.h>
diff --git a/drivers/i2c/i2c-cortina.c b/drivers/i2c/i2c-cortina.c
index 4129d6a6888..4575ab6c40c 100644
--- a/drivers/i2c/i2c-cortina.c
+++ b/drivers/i2c/i2c-cortina.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <i2c.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/io.h>
 #include <dm.h>
diff --git a/drivers/i2c/i2c-uclass.c b/drivers/i2c/i2c-uclass.c
index c16bda46978..d73748adc4c 100644
--- a/drivers/i2c/i2c-uclass.c
+++ b/drivers/i2c/i2c-uclass.c
@@ -9,6 +9,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <dm/device-internal.h>
 #include <dm/lists.h>
 #include <dm/pinctrl.h>
diff --git a/drivers/i2c/i2c_core.c b/drivers/i2c/i2c_core.c
index 85cf75ecd92..40096e95aa0 100644
--- a/drivers/i2c/i2c_core.c
+++ b/drivers/i2c/i2c_core.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <i2c.h>
 #include <linker_lists.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 
 struct i2c_adapter *i2c_get_adapter(int index)
diff --git a/drivers/i2c/imx_lpi2c.c b/drivers/i2c/imx_lpi2c.c
index b02f3883b0d..eeb35e050b7 100644
--- a/drivers/i2c/imx_lpi2c.c
+++ b/drivers/i2c/imx_lpi2c.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <errno.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
diff --git a/drivers/i2c/intel_i2c.c b/drivers/i2c/intel_i2c.c
index fa36f48df9a..0e98e08e4a7 100644
--- a/drivers/i2c/intel_i2c.c
+++ b/drivers/i2c/intel_i2c.c
@@ -12,6 +12,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <pci.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/io.h>
 #include <linux/string.h>
diff --git a/drivers/i2c/kona_i2c.c b/drivers/i2c/kona_i2c.c
index 4edcba29110..e2632a6e36c 100644
--- a/drivers/i2c/kona_i2c.c
+++ b/drivers/i2c/kona_i2c.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/i2c/muxes/i2c-arb-gpio-challenge.c b/drivers/i2c/muxes/i2c-arb-gpio-challenge.c
index 567660f9a74..14ead6e2753 100644
--- a/drivers/i2c/muxes/i2c-arb-gpio-challenge.c
+++ b/drivers/i2c/muxes/i2c-arb-gpio-challenge.c
@@ -10,6 +10,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/global_data.h>
 #include <asm/gpio.h>
diff --git a/drivers/i2c/mv_i2c.c b/drivers/i2c/mv_i2c.c
index 54fa069528b..1850dc6a567 100644
--- a/drivers/i2c/mv_i2c.c
+++ b/drivers/i2c/mv_i2c.c
@@ -20,6 +20,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <linux/string.h>
diff --git a/drivers/i2c/mvtwsi.c b/drivers/i2c/mvtwsi.c
index 1cc9cfc2eb8..775f0240346 100644
--- a/drivers/i2c/mvtwsi.c
+++ b/drivers/i2c/mvtwsi.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <i2c.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/i2c/mxc_i2c.c b/drivers/i2c/mxc_i2c.c
index e4e50436379..683b45bd8fd 100644
--- a/drivers/i2c/mxc_i2c.c
+++ b/drivers/i2c/mxc_i2c.c
@@ -16,6 +16,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
diff --git a/drivers/i2c/omap24xx_i2c.c b/drivers/i2c/omap24xx_i2c.c
index aaf2d10f6fd..db0812c17ec 100644
--- a/drivers/i2c/omap24xx_i2c.c
+++ b/drivers/i2c/omap24xx_i2c.c
@@ -42,6 +42,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <log.h>
+#include <stdio.h>
 #include <linux/delay.h>
 #include <linux/printk.h>
 
diff --git a/drivers/input/keyboard-uclass.c b/drivers/input/keyboard-uclass.c
index a265c02efe7..2007032e10c 100644
--- a/drivers/input/keyboard-uclass.c
+++ b/drivers/input/keyboard-uclass.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <keyboard.h>
 #include <log.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 static int keyboard_start(struct stdio_dev *sdev)
diff --git a/drivers/mailbox/k3-sec-proxy.c b/drivers/mailbox/k3-sec-proxy.c
index b9337f2db5c..1edb7dfd56c 100644
--- a/drivers/mailbox/k3-sec-proxy.c
+++ b/drivers/mailbox/k3-sec-proxy.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm/device_compat.h>
diff --git a/drivers/memory/ti-aemif.c b/drivers/memory/ti-aemif.c
index 6250e274e12..b5fd376862c 100644
--- a/drivers/memory/ti-aemif.c
+++ b/drivers/memory/ti-aemif.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/ti-common/ti-aemif.h>
 
 #define AEMIF_WAITCYCLE_CONFIG		(CONFIG_AEMIF_CNTRL_BASE + 0x4)
diff --git a/drivers/misc/altera_sysid.c b/drivers/misc/altera_sysid.c
index c6502650b75..600315be5ea 100644
--- a/drivers/misc/altera_sysid.c
+++ b/drivers/misc/altera_sysid.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <misc.h>
+#include <stdio.h>
 #include <linux/time.h>
 #include <asm/io.h>
 
diff --git a/drivers/misc/cros_ec.c b/drivers/misc/cros_ec.c
index 881dce016fa..a3ae33acd05 100644
--- a/drivers/misc/cros_ec.c
+++ b/drivers/misc/cros_ec.c
@@ -25,6 +25,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <spi.h>
+#include <stdio.h>
 #include <time.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/misc/cros_ec_i2c.c b/drivers/misc/cros_ec_i2c.c
index 6a5dcc016f2..e3678d0213a 100644
--- a/drivers/misc/cros_ec_i2c.c
+++ b/drivers/misc/cros_ec_i2c.c
@@ -17,6 +17,7 @@
 #include <i2c.h>
 #include <cros_ec.h>
 #include <log.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 #ifdef DEBUG_TRACE
diff --git a/drivers/misc/cros_ec_lpc.c b/drivers/misc/cros_ec_lpc.c
index 0a4f45b2e89..caca59471f1 100644
--- a/drivers/misc/cros_ec_lpc.c
+++ b/drivers/misc/cros_ec_lpc.c
@@ -17,6 +17,7 @@
 #include <command.h>
 #include <cros_ec.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/io.h>
 
diff --git a/drivers/misc/cros_ec_sandbox.c b/drivers/misc/cros_ec_sandbox.c
index 81d2191542c..308b34e2f4b 100644
--- a/drivers/misc/cros_ec_sandbox.c
+++ b/drivers/misc/cros_ec_sandbox.c
@@ -13,6 +13,7 @@
 #include <hash.h>
 #include <log.h>
 #include <os.h>
+#include <stdio.h>
 #include <time.h>
 #include <linux/string.h>
 #include <u-boot/sha256.h>
diff --git a/drivers/misc/cros_ec_spi.c b/drivers/misc/cros_ec_spi.c
index 357e31f7edc..a94e216cac7 100644
--- a/drivers/misc/cros_ec_spi.c
+++ b/drivers/misc/cros_ec_spi.c
@@ -18,6 +18,7 @@
 #include <errno.h>
 #include <log.h>
 #include <spi.h>
+#include <stdio.h>
 #include <time.h>
 #include <linux/string.h>
 
diff --git a/drivers/misc/ds4510.c b/drivers/misc/ds4510.c
index d914123fdf9..bd2818197c6 100644
--- a/drivers/misc/ds4510.c
+++ b/drivers/misc/ds4510.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <i2c.h>
 #include <command.h>
+#include <stdio.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 #include "ds4510.h"
diff --git a/drivers/misc/fsl_ifc.c b/drivers/misc/fsl_ifc.c
index d0b189c4db3..a0e979e09e1 100644
--- a/drivers/misc/fsl_ifc.c
+++ b/drivers/misc/fsl_ifc.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <fsl_ifc.h>
 #include <part.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 
 #ifdef CONFIG_TFABOOT
diff --git a/drivers/misc/fsl_iim.c b/drivers/misc/fsl_iim.c
index 85cc3c26b2e..be6d03444d5 100644
--- a/drivers/misc/fsl_iim.c
+++ b/drivers/misc/fsl_iim.c
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <fuse.h>
+#include <stdio.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/io.h>
diff --git a/drivers/misc/fsl_portals.c b/drivers/misc/fsl_portals.c
index deaebb2eb23..4ac0bead51b 100644
--- a/drivers/misc/fsl_portals.c
+++ b/drivers/misc/fsl_portals.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
diff --git a/drivers/misc/fsl_sec_mon.c b/drivers/misc/fsl_sec_mon.c
index 12c610f1dc9..62691068bb4 100644
--- a/drivers/misc/fsl_sec_mon.c
+++ b/drivers/misc/fsl_sec_mon.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <fsl_sec_mon.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 
diff --git a/drivers/misc/gpio_led.c b/drivers/misc/gpio_led.c
index b913069849a..acf3ec8c017 100644
--- a/drivers/misc/gpio_led.c
+++ b/drivers/misc/gpio_led.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <status_led.h>
+#include <stdio.h>
 #include <asm/gpio.h>
 
 #ifndef CONFIG_GPIO_LED_INVERTED_TABLE
diff --git a/drivers/misc/ihs_fpga.c b/drivers/misc/ihs_fpga.c
index 9d9d52e978c..6a61a22c071 100644
--- a/drivers/misc/ihs_fpga.c
+++ b/drivers/misc/ihs_fpga.c
@@ -13,6 +13,7 @@
 #include <dm.h>
 #include <log.h>
 #include <regmap.h>
+#include <stdio.h>
 #include <asm/gpio.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/drivers/misc/imx8/fuse.c b/drivers/misc/imx8/fuse.c
index 38111c52548..e25d68e6a2e 100644
--- a/drivers/misc/imx8/fuse.c
+++ b/drivers/misc/imx8/fuse.c
@@ -7,6 +7,7 @@
 #include <console.h>
 #include <errno.h>
 #include <fuse.h>
+#include <stdio.h>
 #include <asm/arch/sci/sci.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/global_data.h>
diff --git a/drivers/misc/imx8/scu.c b/drivers/misc/imx8/scu.c
index fc9320fa993..ce1a35a552b 100644
--- a/drivers/misc/imx8/scu.c
+++ b/drivers/misc/imx8/scu.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm.h>
diff --git a/drivers/misc/imx8/scu_api.c b/drivers/misc/imx8/scu_api.c
index 27ecce710fc..bc0d8f7ae5c 100644
--- a/drivers/misc/imx8/scu_api.c
+++ b/drivers/misc/imx8/scu_api.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <hang.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm.h>
diff --git a/drivers/misc/k3_avs.c b/drivers/misc/k3_avs.c
index 408c89315a9..3468f02208e 100644
--- a/drivers/misc/k3_avs.c
+++ b/drivers/misc/k3_avs.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <i2c.h>
 #include <k3-avs.h>
diff --git a/drivers/misc/mc9sdz60.c b/drivers/misc/mc9sdz60.c
index e68a056a559..7f9f9223f71 100644
--- a/drivers/misc/mc9sdz60.c
+++ b/drivers/misc/mc9sdz60.c
@@ -6,6 +6,7 @@
 
 #include <config.h>
 #include <common.h>
+#include <stdio.h>
 #include <linux/errno.h>
 #include <linux/types.h>
 #include <i2c.h>
diff --git a/drivers/misc/mxc_ocotp.c b/drivers/misc/mxc_ocotp.c
index 926c62c8a14..5d7a74afe2c 100644
--- a/drivers/misc/mxc_ocotp.c
+++ b/drivers/misc/mxc_ocotp.c
@@ -13,6 +13,7 @@
 
 #include <common.h>
 #include <fuse.h>
+#include <stdio.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/io.h>
diff --git a/drivers/misc/mxs_ocotp.c b/drivers/misc/mxs_ocotp.c
index facc720c8ef..fa185612b2c 100644
--- a/drivers/misc/mxs_ocotp.c
+++ b/drivers/misc/mxs_ocotp.c
@@ -13,6 +13,7 @@
 
 #include <common.h>
 #include <fuse.h>
+#include <stdio.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/io.h>
diff --git a/drivers/misc/qfw.c b/drivers/misc/qfw.c
index fed08422419..5c3ff8e52f6 100644
--- a/drivers/misc/qfw.c
+++ b/drivers/misc/qfw.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <qfw.h>
+#include <stdio.h>
 #include <asm/io.h>
 #ifdef CONFIG_GENERATE_ACPI_TABLE
 #include <asm/tables.h>
diff --git a/drivers/misc/rockchip-efuse.c b/drivers/misc/rockchip-efuse.c
index adaa51ce99b..d5c1a62ba64 100644
--- a/drivers/misc/rockchip-efuse.c
+++ b/drivers/misc/rockchip-efuse.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <command.h>
 #include <display_options.h>
diff --git a/drivers/misc/rockchip-otp.c b/drivers/misc/rockchip-otp.c
index bdd443b3db9..482de69070d 100644
--- a/drivers/misc/rockchip-otp.c
+++ b/drivers/misc/rockchip-otp.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <command.h>
 #include <dm.h>
diff --git a/drivers/misc/sifive-otp.c b/drivers/misc/sifive-otp.c
index 7d502febea4..799d75b0873 100644
--- a/drivers/misc/sifive-otp.c
+++ b/drivers/misc/sifive-otp.c
@@ -18,6 +18,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <dm/device.h>
 #include <dm/read.h>
 #include <linux/bitops.h>
diff --git a/drivers/misc/spltest_sandbox.c b/drivers/misc/spltest_sandbox.c
index 999031625b5..8a5e6b1975e 100644
--- a/drivers/misc/spltest_sandbox.c
+++ b/drivers/misc/spltest_sandbox.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <dt-structs.h>
+#include <stdio.h>
 
 static int sandbox_spl_probe(struct udevice *dev)
 {
diff --git a/drivers/misc/stm32mp_fuse.c b/drivers/misc/stm32mp_fuse.c
index 0eed3459734..530a7824e3e 100644
--- a/drivers/misc/stm32mp_fuse.c
+++ b/drivers/misc/stm32mp_fuse.c
@@ -8,6 +8,7 @@
 #include <fuse.h>
 #include <misc.h>
 #include <errno.h>
+#include <stdio.h>
 #include <dm/device.h>
 #include <dm/uclass.h>
 #include <power/stpmic1.h>
diff --git a/drivers/mmc/atmel_sdhci.c b/drivers/mmc/atmel_sdhci.c
index 96cbb2a2c51..1781d7a3f91 100644
--- a/drivers/mmc/atmel_sdhci.c
+++ b/drivers/mmc/atmel_sdhci.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <malloc.h>
 #include <sdhci.h>
+#include <stdio.h>
 #include <asm/arch/clk.h>
 #include <asm/global_data.h>
 
diff --git a/drivers/mmc/bcm2835_sdhost.c b/drivers/mmc/bcm2835_sdhost.c
index a138165855d..cf362f620ae 100644
--- a/drivers/mmc/bcm2835_sdhost.c
+++ b/drivers/mmc/bcm2835_sdhost.c
@@ -33,6 +33,7 @@
 #include <common.h>
 #include <dm.h>
 #include <mmc.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/arch/msg.h>
 #include <asm/arch/mbox.h>
diff --git a/drivers/mmc/davinci_mmc.c b/drivers/mmc/davinci_mmc.c
index 50731f3fe7b..f4edff7566e 100644
--- a/drivers/mmc/davinci_mmc.c
+++ b/drivers/mmc/davinci_mmc.c
@@ -13,6 +13,7 @@
 #include <command.h>
 #include <part.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/sdmmc_defs.h>
 #include <asm-generic/gpio.h>
diff --git a/drivers/mmc/exynos_dw_mmc.c b/drivers/mmc/exynos_dw_mmc.c
index 499fafe8f5e..55d3ad1692c 100644
--- a/drivers/mmc/exynos_dw_mmc.c
+++ b/drivers/mmc/exynos_dw_mmc.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dwmmc.h>
 #include <fdtdec.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/libfdt.h>
 #include <malloc.h>
diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c
index d18a8d0a314..60cab7c0fca 100644
--- a/drivers/mmc/fsl_esdhc.c
+++ b/drivers/mmc/fsl_esdhc.c
@@ -20,6 +20,7 @@
 #include <malloc.h>
 #include <fsl_esdhc.h>
 #include <fdt_support.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
diff --git a/drivers/mmc/fsl_esdhc_imx.c b/drivers/mmc/fsl_esdhc_imx.c
index f0eb7c88805..a90839ee9f5 100644
--- a/drivers/mmc/fsl_esdhc_imx.c
+++ b/drivers/mmc/fsl_esdhc_imx.c
@@ -20,6 +20,7 @@
 #include <log.h>
 #include <mmc.h>
 #include <part.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
diff --git a/drivers/mmc/fsl_esdhc_spl.c b/drivers/mmc/fsl_esdhc_spl.c
index 033fd0edd8f..4c725436de4 100644
--- a/drivers/mmc/fsl_esdhc_spl.c
+++ b/drivers/mmc/fsl_esdhc_spl.c
@@ -8,6 +8,7 @@
 #include <hang.h>
 #include <mmc.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 /*
diff --git a/drivers/mmc/ftsdc010_mci.c b/drivers/mmc/ftsdc010_mci.c
index b26571e0a69..cc0348d4663 100644
--- a/drivers/mmc/ftsdc010_mci.c
+++ b/drivers/mmc/ftsdc010_mci.c
@@ -15,6 +15,7 @@
 #include <malloc.h>
 #include <part.h>
 #include <mmc.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
diff --git a/drivers/mmc/gen_atmel_mci.c b/drivers/mmc/gen_atmel_mci.c
index 44c9f1288b3..19ba2b51182 100644
--- a/drivers/mmc/gen_atmel_mci.c
+++ b/drivers/mmc/gen_atmel_mci.c
@@ -16,6 +16,7 @@
 #include <mmc.h>
 #include <part.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/mmc/iproc_sdhci.c b/drivers/mmc/iproc_sdhci.c
index ef7d8f8b41e..cd9d87be98b 100644
--- a/drivers/mmc/iproc_sdhci.c
+++ b/drivers/mmc/iproc_sdhci.c
@@ -9,6 +9,7 @@
 #include <errno.h>
 #include <malloc.h>
 #include <sdhci.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/string.h>
diff --git a/drivers/mmc/kona_sdhci.c b/drivers/mmc/kona_sdhci.c
index 2bbe673b912..dc7a203f1f0 100644
--- a/drivers/mmc/kona_sdhci.c
+++ b/drivers/mmc/kona_sdhci.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <malloc.h>
 #include <sdhci.h>
+#include <stdio.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/kona-common/clk.h>
diff --git a/drivers/mmc/mmc-uclass.c b/drivers/mmc/mmc-uclass.c
index 90690c8d1e3..9c30e01028b 100644
--- a/drivers/mmc/mmc-uclass.c
+++ b/drivers/mmc/mmc-uclass.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <mmc.h>
 #include <dm.h>
+#include <stdio.h>
 #include <dm/device-internal.h>
 #include <dm/device_compat.h>
 #include <dm/lists.h>
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index e9c181555d0..e5a712fbf1b 100644
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@ -13,6 +13,7 @@
 #include <command.h>
 #include <dm.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/u-boot.h>
 #include <dm/device-internal.h>
diff --git a/drivers/mmc/mmc_legacy.c b/drivers/mmc/mmc_legacy.c
index a05da6c2e88..da2941bada8 100644
--- a/drivers/mmc/mmc_legacy.c
+++ b/drivers/mmc/mmc_legacy.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <mmc.h>
+#include <stdio.h>
 #include "mmc_private.h"
 
 static struct list_head mmc_devices;
diff --git a/drivers/mmc/mmc_write.c b/drivers/mmc/mmc_write.c
index 6a4453ca02e..68d872fd142 100644
--- a/drivers/mmc/mmc_write.c
+++ b/drivers/mmc/mmc_write.c
@@ -12,6 +12,7 @@
 #include <dm.h>
 #include <part.h>
 #include <div64.h>
+#include <stdio.h>
 #include <linux/math64.h>
 #include "mmc_private.h"
 
diff --git a/drivers/mmc/msm_sdhci.c b/drivers/mmc/msm_sdhci.c
index 27d8fb84fab..6e61ef6b858 100644
--- a/drivers/mmc/msm_sdhci.c
+++ b/drivers/mmc/msm_sdhci.c
@@ -12,6 +12,7 @@
 #include <dm.h>
 #include <malloc.h>
 #include <sdhci.h>
+#include <stdio.h>
 #include <wait_bit.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/mmc/mv_sdhci.c b/drivers/mmc/mv_sdhci.c
index 356d161d51f..775f2041a1a 100644
--- a/drivers/mmc/mv_sdhci.c
+++ b/drivers/mmc/mv_sdhci.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <malloc.h>
 #include <sdhci.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/mbus.h>
 #include <linux/string.h>
diff --git a/drivers/mmc/mvebu_mmc.c b/drivers/mmc/mvebu_mmc.c
index b33cd40faee..d586342a58d 100644
--- a/drivers/mmc/mvebu_mmc.c
+++ b/drivers/mmc/mvebu_mmc.c
@@ -13,6 +13,7 @@
 #include <malloc.h>
 #include <part.h>
 #include <mmc.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/mmc/mxcmmc.c b/drivers/mmc/mxcmmc.c
index 00720c64084..01d57d4c778 100644
--- a/drivers/mmc/mxcmmc.c
+++ b/drivers/mmc/mxcmmc.c
@@ -23,6 +23,7 @@
 #include <part.h>
 #include <malloc.h>
 #include <mmc.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
diff --git a/drivers/mmc/mxsmmc.c b/drivers/mmc/mxsmmc.c
index 4df872cc3ec..a54e1e12835 100644
--- a/drivers/mmc/mxsmmc.c
+++ b/drivers/mmc/mxsmmc.c
@@ -24,6 +24,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <mmc.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/drivers/mmc/omap_hsmmc.c b/drivers/mmc/omap_hsmmc.c
index c54edd9c8d1..95d3cad4d0c 100644
--- a/drivers/mmc/omap_hsmmc.c
+++ b/drivers/mmc/omap_hsmmc.c
@@ -34,6 +34,7 @@
 #if defined(CONFIG_OMAP54XX) || defined(CONFIG_OMAP44XX)
 #include <palmas.h>
 #endif
+#include <stdio.h>
 #include <time.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
diff --git a/drivers/mmc/pic32_sdhci.c b/drivers/mmc/pic32_sdhci.c
index 963809fb2ae..009bf00a7f8 100644
--- a/drivers/mmc/pic32_sdhci.c
+++ b/drivers/mmc/pic32_sdhci.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <dm.h>
 #include <sdhci.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
 #include <mach/pic32.h>
diff --git a/drivers/mmc/pxa_mmc_gen.c b/drivers/mmc/pxa_mmc_gen.c
index 7d88ca015c1..854d346a746 100644
--- a/drivers/mmc/pxa_mmc_gen.c
+++ b/drivers/mmc/pxa_mmc_gen.c
@@ -9,6 +9,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/regs-mmc.h>
 #include <linux/delay.h>
diff --git a/drivers/mmc/rockchip_sdhci.c b/drivers/mmc/rockchip_sdhci.c
index b073f1a08d4..f8def838ca2 100644
--- a/drivers/mmc/rockchip_sdhci.c
+++ b/drivers/mmc/rockchip_sdhci.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <dm.h>
 #include <dt-structs.h>
+#include <stdio.h>
 #include <linux/err.h>
 #include <linux/libfdt.h>
 #include <malloc.h>
diff --git a/drivers/mmc/rpmb.c b/drivers/mmc/rpmb.c
index 7a596b2f19b..0d1b3eb875b 100644
--- a/drivers/mmc/rpmb.c
+++ b/drivers/mmc/rpmb.c
@@ -13,6 +13,7 @@
 #include <memalign.h>
 #include <mmc.h>
 #include <sdhci.h>
+#include <stdio.h>
 #include <linux/string.h>
 #include <u-boot/sha256.h>
 #include "mmc_private.h"
diff --git a/drivers/mmc/s5p_sdhci.c b/drivers/mmc/s5p_sdhci.c
index 240db8a7569..e06662141f5 100644
--- a/drivers/mmc/s5p_sdhci.c
+++ b/drivers/mmc/s5p_sdhci.c
@@ -10,6 +10,7 @@
 #include <malloc.h>
 #include <sdhci.h>
 #include <fdtdec.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/libfdt.h>
 #include <asm/gpio.h>
diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c
index d4bc40f19e2..a73eb478b03 100644
--- a/drivers/mmc/sdhci.c
+++ b/drivers/mmc/sdhci.c
@@ -16,6 +16,7 @@
 #include <mmc.h>
 #include <sdhci.h>
 #include <dm.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/cache.h>
 #include <linux/bitops.h>
diff --git a/drivers/mmc/sh_mmcif.c b/drivers/mmc/sh_mmcif.c
index 5f25acd55db..e9ff31b4afe 100644
--- a/drivers/mmc/sh_mmcif.c
+++ b/drivers/mmc/sh_mmcif.c
@@ -8,6 +8,7 @@
 #include <config.h>
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <watchdog.h>
 #include <command.h>
 #include <mmc.h>
diff --git a/drivers/mmc/sh_sdhi.c b/drivers/mmc/sh_sdhi.c
index a279bc69aaf..97fb1ee48ec 100644
--- a/drivers/mmc/sh_sdhi.c
+++ b/drivers/mmc/sh_sdhi.c
@@ -15,6 +15,7 @@
 #include <mmc.h>
 #include <dm.h>
 #include <part.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
diff --git a/drivers/mmc/socfpga_dw_mmc.c b/drivers/mmc/socfpga_dw_mmc.c
index 16a6e3056dc..1c3d996bcd5 100644
--- a/drivers/mmc/socfpga_dw_mmc.c
+++ b/drivers/mmc/socfpga_dw_mmc.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/arch/clock_manager.h>
 #include <asm/arch/system_manager.h>
 #include <clk.h>
diff --git a/drivers/mmc/stm32_sdmmc2.c b/drivers/mmc/stm32_sdmmc2.c
index 4736cae7689..0bc2ecee69b 100644
--- a/drivers/mmc/stm32_sdmmc2.c
+++ b/drivers/mmc/stm32_sdmmc2.c
@@ -11,6 +11,7 @@
 #include <fdtdec.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/bitops.h>
 #include <asm/cache.h>
 #include <linux/bitops.h>
diff --git a/drivers/mmc/sunxi_mmc.c b/drivers/mmc/sunxi_mmc.c
index 96d8f18d0f5..4152b7be0e4 100644
--- a/drivers/mmc/sunxi_mmc.c
+++ b/drivers/mmc/sunxi_mmc.c
@@ -15,6 +15,7 @@
 #include <mmc.h>
 #include <clk.h>
 #include <reset.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
diff --git a/drivers/mmc/tegra_mmc.c b/drivers/mmc/tegra_mmc.c
index 94e062c1246..e7a06ec7949 100644
--- a/drivers/mmc/tegra_mmc.c
+++ b/drivers/mmc/tegra_mmc.c
@@ -12,6 +12,7 @@
 #include <errno.h>
 #include <log.h>
 #include <mmc.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
diff --git a/drivers/mmc/xenon_sdhci.c b/drivers/mmc/xenon_sdhci.c
index 57fe6a4df23..1336d919335 100644
--- a/drivers/mmc/xenon_sdhci.c
+++ b/drivers/mmc/xenon_sdhci.c
@@ -17,6 +17,7 @@
 #include <common.h>
 #include <dm.h>
 #include <fdtdec.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/drivers/mmc/zynq_sdhci.c b/drivers/mmc/zynq_sdhci.c
index 43b9f215229..01e75e2e770 100644
--- a/drivers/mmc/zynq_sdhci.c
+++ b/drivers/mmc/zynq_sdhci.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <dm.h>
 #include <fdtdec.h>
+#include <stdio.h>
 #include <linux/delay.h>
 #include "mmc_private.h"
 #include <log.h>
diff --git a/drivers/mtd/altera_qspi.c b/drivers/mtd/altera_qspi.c
index 79ac5a8d170..e85005a1c10 100644
--- a/drivers/mtd/altera_qspi.c
+++ b/drivers/mtd/altera_qspi.c
@@ -11,6 +11,7 @@
 #include <flash.h>
 #include <log.h>
 #include <mtd.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/u-boot.h>
diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c
index 9d4f5437b1f..d2d6640a747 100644
--- a/drivers/mtd/cfi_flash.c
+++ b/drivers/mtd/cfi_flash.c
@@ -26,6 +26,7 @@
 #include <init.h>
 #include <irq_func.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/global_data.h>
 #include <asm/processor.h>
diff --git a/drivers/mtd/jedec_flash.c b/drivers/mtd/jedec_flash.c
index 859c7fd4ec2..790373dac8f 100644
--- a/drivers/mtd/jedec_flash.c
+++ b/drivers/mtd/jedec_flash.c
@@ -14,6 +14,7 @@
 #include <common.h>
 #include <flash.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/processor.h>
 #include <asm/io.h>
 #include <asm/byteorder.h>
diff --git a/drivers/mtd/mtd_uboot.c b/drivers/mtd/mtd_uboot.c
index 16fe4ecdb6e..ebdec0dd6c5 100644
--- a/drivers/mtd/mtd_uboot.c
+++ b/drivers/mtd/mtd_uboot.c
@@ -7,6 +7,7 @@
 #include <env.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <dm/device.h>
 #include <dm/uclass-internal.h>
diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c
index ef3eb456ac8..2f882b7df07 100644
--- a/drivers/mtd/mtdpart.c
+++ b/drivers/mtd/mtdpart.c
@@ -21,6 +21,7 @@
 
 #include <common.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <linux/bug.h>
 #include <linux/errno.h>
 #include <linux/compat.h>
diff --git a/drivers/mtd/mw_eeprom.c b/drivers/mtd/mw_eeprom.c
index 9837733beee..5d1a3573241 100644
--- a/drivers/mtd/mw_eeprom.c
+++ b/drivers/mtd/mw_eeprom.c
@@ -2,6 +2,7 @@
 
 #include <common.h>
 #include <eeprom.h>
+#include <stdio.h>
 #include <asm/ic/ssi.h>
 #include <linux/delay.h>
 
diff --git a/drivers/mtd/nand/raw/arasan_nfc.c b/drivers/mtd/nand/raw/arasan_nfc.c
index 9733e666676..978174ffa8d 100644
--- a/drivers/mtd/nand/raw/arasan_nfc.c
+++ b/drivers/mtd/nand/raw/arasan_nfc.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/mtd/nand/raw/fsl_elbc_nand.c b/drivers/mtd/nand/raw/fsl_elbc_nand.c
index 32ee212694a..99749f9e50a 100644
--- a/drivers/mtd/nand/raw/fsl_elbc_nand.c
+++ b/drivers/mtd/nand/raw/fsl_elbc_nand.c
@@ -11,6 +11,7 @@
 #include <command.h>
 #include <malloc.h>
 #include <nand.h>
+#include <stdio.h>
 #include <time.h>
 #include <dm/devres.h>
 
diff --git a/drivers/mtd/nand/raw/fsl_elbc_spl.c b/drivers/mtd/nand/raw/fsl_elbc_spl.c
index a62ab69ee1e..e8b9f40f3b0 100644
--- a/drivers/mtd/nand/raw/fsl_elbc_spl.c
+++ b/drivers/mtd/nand/raw/fsl_elbc_spl.c
@@ -11,6 +11,7 @@
 
 #include <common.h>
 #include <cpu_func.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/fsl_lbc.h>
 #include <nand.h>
diff --git a/drivers/mtd/nand/raw/fsl_ifc_nand.c b/drivers/mtd/nand/raw/fsl_ifc_nand.c
index 964a329023d..33c80d03209 100644
--- a/drivers/mtd/nand/raw/fsl_ifc_nand.c
+++ b/drivers/mtd/nand/raw/fsl_ifc_nand.c
@@ -10,6 +10,7 @@
 #include <command.h>
 #include <malloc.h>
 #include <nand.h>
+#include <stdio.h>
 #include <time.h>
 #include <dm/devres.h>
 
diff --git a/drivers/mtd/nand/raw/fsl_ifc_spl.c b/drivers/mtd/nand/raw/fsl_ifc_spl.c
index b7e37416a49..cf09fce3fbb 100644
--- a/drivers/mtd/nand/raw/fsl_ifc_spl.c
+++ b/drivers/mtd/nand/raw/fsl_ifc_spl.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <cpu_func.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <fsl_ifc.h>
 #include <part.h>
diff --git a/drivers/mtd/nand/raw/fsmc_nand.c b/drivers/mtd/nand/raw/fsmc_nand.c
index a5ef0ae75e0..1feaeadd4b7 100644
--- a/drivers/mtd/nand/raw/fsmc_nand.c
+++ b/drivers/mtd/nand/raw/fsmc_nand.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <nand.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
diff --git a/drivers/mtd/nand/raw/mxs_nand.c b/drivers/mtd/nand/raw/mxs_nand.c
index 3ba3afbbf29..d59528e27fd 100644
--- a/drivers/mtd/nand/raw/mxs_nand.c
+++ b/drivers/mtd/nand/raw/mxs_nand.c
@@ -16,6 +16,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <dm.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <linux/mtd/rawnand.h>
 #include <linux/sizes.h>
diff --git a/drivers/mtd/nand/raw/mxs_nand_spl.c b/drivers/mtd/nand/raw/mxs_nand_spl.c
index 2e1f4c522a6..bc3bc836434 100644
--- a/drivers/mtd/nand/raw/mxs_nand_spl.c
+++ b/drivers/mtd/nand/raw/mxs_nand_spl.c
@@ -9,6 +9,7 @@
 #include <nand.h>
 #include <malloc.h>
 #include <mxs_nand.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/cache.h>
 #include <linux/bitops.h>
diff --git a/drivers/mtd/nand/raw/nand_util.c b/drivers/mtd/nand/raw/nand_util.c
index 264a1efada9..162f6fe1f0c 100644
--- a/drivers/mtd/nand/raw/nand_util.c
+++ b/drivers/mtd/nand/raw/nand_util.c
@@ -21,6 +21,7 @@
 #include <common.h>
 #include <command.h>
 #include <log.h>
+#include <stdio.h>
 #include <watchdog.h>
 #include <malloc.h>
 #include <memalign.h>
diff --git a/drivers/mtd/nand/raw/omap_elm.c b/drivers/mtd/nand/raw/omap_elm.c
index 35c6dd1f1bc..87368743a9a 100644
--- a/drivers/mtd/nand/raw/omap_elm.c
+++ b/drivers/mtd/nand/raw/omap_elm.c
@@ -13,6 +13,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <linux/mtd/omap_elm.h>
diff --git a/drivers/mtd/nand/raw/omap_gpmc.c b/drivers/mtd/nand/raw/omap_gpmc.c
index 9fef305da1c..2863b1de1b6 100644
--- a/drivers/mtd/nand/raw/omap_gpmc.c
+++ b/drivers/mtd/nand/raw/omap_gpmc.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <asm/arch/mem.h>
diff --git a/drivers/mtd/nand/raw/sunxi_nand_spl.c b/drivers/mtd/nand/raw/sunxi_nand_spl.c
index 942f2366849..b098ebef8f3 100644
--- a/drivers/mtd/nand/raw/sunxi_nand_spl.c
+++ b/drivers/mtd/nand/raw/sunxi_nand_spl.c
@@ -4,6 +4,7 @@
  * Copyright (c) 2015, AW-SOM Technologies <www.aw-som.com>
  */
 
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/io.h>
 #include <common.h>
diff --git a/drivers/mtd/nand/raw/tegra_nand.c b/drivers/mtd/nand/raw/tegra_nand.c
index 0b81fe1d487..ace59249b9e 100644
--- a/drivers/mtd/nand/raw/tegra_nand.c
+++ b/drivers/mtd/nand/raw/tegra_nand.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <memalign.h>
diff --git a/drivers/mtd/nand/raw/vf610_nfc.c b/drivers/mtd/nand/raw/vf610_nfc.c
index 457efcc23e6..708653ab162 100644
--- a/drivers/mtd/nand/raw/vf610_nfc.c
+++ b/drivers/mtd/nand/raw/vf610_nfc.c
@@ -23,6 +23,7 @@
 
 #include <common.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <time.h>
 #include <dm/device_compat.h>
 #include <linux/printk.h>
diff --git a/drivers/mtd/nand/raw/zynq_nand.c b/drivers/mtd/nand/raw/zynq_nand.c
index 37a6835060c..47435cfdccc 100644
--- a/drivers/mtd/nand/raw/zynq_nand.c
+++ b/drivers/mtd/nand/raw/zynq_nand.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/mtd/onenand/onenand_uboot.c b/drivers/mtd/onenand/onenand_uboot.c
index b6ec9eecda6..c76ae04a1ef 100644
--- a/drivers/mtd/onenand/onenand_uboot.c
+++ b/drivers/mtd/onenand/onenand_uboot.c
@@ -15,6 +15,7 @@
 
 #include <common.h>
 #include <display_options.h>
+#include <stdio.h>
 #include <linux/compat.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/onenand.h>
diff --git a/drivers/mtd/onenand/samsung.c b/drivers/mtd/onenand/samsung.c
index 27143d4d0a5..be6c8e1def3 100644
--- a/drivers/mtd/onenand/samsung.c
+++ b/drivers/mtd/onenand/samsung.c
@@ -11,6 +11,7 @@
 
 #include <common.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <linux/compat.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/onenand.h>
diff --git a/drivers/mtd/pic32_flash.c b/drivers/mtd/pic32_flash.c
index 71f22406bad..a50aec7d77e 100644
--- a/drivers/mtd/pic32_flash.c
+++ b/drivers/mtd/pic32_flash.c
@@ -12,6 +12,7 @@
 #include <flash.h>
 #include <init.h>
 #include <irq_func.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/string.h>
diff --git a/drivers/mtd/renesas_rpc_hf.c b/drivers/mtd/renesas_rpc_hf.c
index 7ac45b97b9f..b13d688b660 100644
--- a/drivers/mtd/renesas_rpc_hf.c
+++ b/drivers/mtd/renesas_rpc_hf.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <clk.h>
diff --git a/drivers/mtd/spi/fsl_espi_spl.c b/drivers/mtd/spi/fsl_espi_spl.c
index 9c997574884..5a3b5abd5c7 100644
--- a/drivers/mtd/spi/fsl_espi_spl.c
+++ b/drivers/mtd/spi/fsl_espi_spl.c
@@ -8,6 +8,7 @@
 #include <hang.h>
 #include <spi_flash.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 #define ESPI_BOOT_IMAGE_SIZE	0x48
diff --git a/drivers/mtd/spi/sandbox.c b/drivers/mtd/spi/sandbox.c
index a63e92d0340..e18326b5692 100644
--- a/drivers/mtd/spi/sandbox.c
+++ b/drivers/mtd/spi/sandbox.c
@@ -16,6 +16,7 @@
 #include <malloc.h>
 #include <spi.h>
 #include <os.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 #include <spi_flash.h>
diff --git a/drivers/mtd/spi/sf_dataflash.c b/drivers/mtd/spi/sf_dataflash.c
index 11a396f11a2..90f09a5fa1d 100644
--- a/drivers/mtd/spi/sf_dataflash.c
+++ b/drivers/mtd/spi/sf_dataflash.c
@@ -16,6 +16,7 @@
 #include <spi.h>
 #include <spi_flash.h>
 #include <div64.h>
+#include <stdio.h>
 #include <time.h>
 #include <linux/delay.h>
 #include <linux/err.h>
diff --git a/drivers/mtd/spi/sf_mtd.c b/drivers/mtd/spi/sf_mtd.c
index 1d8276d59d6..d41811ecdae 100644
--- a/drivers/mtd/spi/sf_mtd.c
+++ b/drivers/mtd/spi/sf_mtd.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <flash.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <linux/errno.h>
 #include <linux/mtd/mtd.h>
 #include <spi_flash.h>
diff --git a/drivers/mtd/spi/sf_probe.c b/drivers/mtd/spi/sf_probe.c
index 31b42f42b17..afd63d8fa6f 100644
--- a/drivers/mtd/spi/sf_probe.c
+++ b/drivers/mtd/spi/sf_probe.c
@@ -14,6 +14,7 @@
 #include <malloc.h>
 #include <spi.h>
 #include <spi_flash.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 #include "sf_internal.h"
diff --git a/drivers/mtd/spi/spi-nor-core.c b/drivers/mtd/spi/spi-nor-core.c
index b765a05e5cf..007c27129b4 100644
--- a/drivers/mtd/spi/spi-nor-core.c
+++ b/drivers/mtd/spi/spi-nor-core.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <display_options.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <dm/device_compat.h>
 #include <dm/devres.h>
diff --git a/drivers/mtd/spi/spi-nor-tiny.c b/drivers/mtd/spi/spi-nor-tiny.c
index 2d9b3cac2fb..c9777324019 100644
--- a/drivers/mtd/spi/spi-nor-tiny.c
+++ b/drivers/mtd/spi/spi-nor-tiny.c
@@ -11,6 +11,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <dm/device_compat.h>
 #include <linux/err.h>
diff --git a/drivers/mtd/st_smi.c b/drivers/mtd/st_smi.c
index 970c6ee7043..d5346605990 100644
--- a/drivers/mtd/st_smi.c
+++ b/drivers/mtd/st_smi.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <flash.h>
+#include <stdio.h>
 #include <time.h>
 #include <linux/delay.h>
 #include <linux/err.h>
diff --git a/drivers/mtd/stm32_flash.c b/drivers/mtd/stm32_flash.c
index 95afa2d6bc7..703afc7a07e 100644
--- a/drivers/mtd/stm32_flash.c
+++ b/drivers/mtd/stm32_flash.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <flash.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/stm32.h>
 #include "stm32_flash.h"
diff --git a/drivers/mtd/ubi/debug.c b/drivers/mtd/ubi/debug.c
index 393419bd137..e9c50a4852b 100644
--- a/drivers/mtd/ubi/debug.c
+++ b/drivers/mtd/ubi/debug.c
@@ -7,6 +7,7 @@
 
 #include <hexdump.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <ubi_uboot.h>
 #include <linux/printk.h>
 #include <linux/string.h>
diff --git a/drivers/net/ag7xxx.c b/drivers/net/ag7xxx.c
index 518ba44da33..337e09d167e 100644
--- a/drivers/net/ag7xxx.c
+++ b/drivers/net/ag7xxx.c
@@ -15,6 +15,7 @@
 #include <miiphy.h>
 #include <malloc.h>
 #include <net.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
diff --git a/drivers/net/altera_tse.c b/drivers/net/altera_tse.c
index e9793762800..0c5c2e3053d 100644
--- a/drivers/net/altera_tse.c
+++ b/drivers/net/altera_tse.c
@@ -17,6 +17,7 @@
 #include <memalign.h>
 #include <miiphy.h>
 #include <net.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
diff --git a/drivers/net/armada100_fec.c b/drivers/net/armada100_fec.c
index 375f1b13999..87c01e0e3cd 100644
--- a/drivers/net/armada100_fec.c
+++ b/drivers/net/armada100_fec.c
@@ -15,6 +15,7 @@
 #include <malloc.h>
 #include <miiphy.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/types.h>
 #include <asm/byteorder.h>
 #include <asm/u-boot.h>
diff --git a/drivers/net/at91_emac.c b/drivers/net/at91_emac.c
index 62263cb435a..d49f9216c7d 100644
--- a/drivers/net/at91_emac.c
+++ b/drivers/net/at91_emac.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/at91_emac.h>
diff --git a/drivers/net/ax88180.c b/drivers/net/ax88180.c
index b971c16a654..5783c42aa23 100644
--- a/drivers/net/ax88180.c
+++ b/drivers/net/ax88180.c
@@ -42,6 +42,7 @@
 #include <log.h>
 #include <net.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/mii.h>
diff --git a/drivers/net/bcm-sf2-eth-gmac.c b/drivers/net/bcm-sf2-eth-gmac.c
index 3ab5841a7d0..67c8498f0f6 100644
--- a/drivers/net/bcm-sf2-eth-gmac.c
+++ b/drivers/net/bcm-sf2-eth-gmac.c
@@ -8,6 +8,7 @@
 #define DEBUG
 #include <linux/printk.h>
 #endif
+#include <stdio.h>
 #include <linux/string.h>
 #endif
 
diff --git a/drivers/net/bcm-sf2-eth.c b/drivers/net/bcm-sf2-eth.c
index 2e864208633..21266d66dd6 100644
--- a/drivers/net/bcm-sf2-eth.c
+++ b/drivers/net/bcm-sf2-eth.c
@@ -8,6 +8,7 @@
 #include <malloc.h>
 #include <net.h>
 #include <config.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/printk.h>
diff --git a/drivers/net/bcmgenet.c b/drivers/net/bcmgenet.c
index 11b6148ab63..ed17df0392b 100644
--- a/drivers/net/bcmgenet.c
+++ b/drivers/net/bcmgenet.c
@@ -17,6 +17,7 @@
  */
 
 #include <log.h>
+#include <stdio.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 ff8131fafc2..0fcbcf919a0 100644
--- a/drivers/net/calxedaxgmac.c
+++ b/drivers/net/calxedaxgmac.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <malloc.h>
 #include <net.h>
+#include <stdio.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 fea6ad77d0a..9baef753b60 100644
--- a/drivers/net/dc2114x.c
+++ b/drivers/net/dc2114x.c
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0+
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <dm.h>
 #include <malloc.h>
diff --git a/drivers/net/designware.c b/drivers/net/designware.c
index f325bf23731..2abe901a855 100644
--- a/drivers/net/designware.c
+++ b/drivers/net/designware.c
@@ -19,6 +19,7 @@
 #include <net.h>
 #include <pci.h>
 #include <reset.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/cache.h>
 #include <asm/u-boot.h>
diff --git a/drivers/net/dm9000x.c b/drivers/net/dm9000x.c
index 928c6d85856..33cd6c72e19 100644
--- a/drivers/net/dm9000x.c
+++ b/drivers/net/dm9000x.c
@@ -52,6 +52,7 @@ TODO: external MII is not functional, only internal at the moment.
 #include <common.h>
 #include <command.h>
 #include <net.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/io.h>
 #include <dm9000.h>
diff --git a/drivers/net/dnet.c b/drivers/net/dnet.c
index 4efb8199dfb..1233d7814dd 100644
--- a/drivers/net/dnet.c
+++ b/drivers/net/dnet.c
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.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 9613af44422..151ae3e038d 100644
--- a/drivers/net/e1000.c
+++ b/drivers/net/e1000.c
@@ -39,6 +39,7 @@ tested on both gig copper and gig fiber boards
 #include <memalign.h>
 #include <net.h>
 #include <pci.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
diff --git a/drivers/net/e1000.h b/drivers/net/e1000.h
index 19ed4777d9a..641502ea928 100644
--- a/drivers/net/e1000.h
+++ b/drivers/net/e1000.h
@@ -18,6 +18,7 @@
 #ifndef _E1000_HW_H_
 #define _E1000_HW_H_
 
+#include <stdio.h>
 #include <linux/list.h>
 #include <malloc.h>
 #include <net.h>
diff --git a/drivers/net/e1000_spi.c b/drivers/net/e1000_spi.c
index ed3e987b12b..6af5b32e413 100644
--- a/drivers/net/e1000_spi.c
+++ b/drivers/net/e1000_spi.c
@@ -1,6 +1,7 @@
 #include <common.h>
 #include <command.h>
 #include <console.h>
+#include <stdio.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 9ff078176b8..1272e915f0e 100644
--- a/drivers/net/eepro100.c
+++ b/drivers/net/eepro100.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <stdio.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 72ad7936d63..2116f31cf76 100644
--- a/drivers/net/ep93xx_eth.c
+++ b/drivers/net/ep93xx_eth.c
@@ -20,6 +20,7 @@
 #include <common.h>
 #include <log.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/arch/ep93xx.h>
 #include <asm/io.h>
 #include <malloc.h>
diff --git a/drivers/net/eth-phy-uclass.c b/drivers/net/eth-phy-uclass.c
index b383f455276..4afa6c87461 100644
--- a/drivers/net/eth-phy-uclass.c
+++ b/drivers/net/eth-phy-uclass.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <dm.h>
 #include <net.h>
+#include <stdio.h>
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
 #include <dm/lists.h>
diff --git a/drivers/net/ethoc.c b/drivers/net/ethoc.c
index f158c7625bd..73228d9e568 100644
--- a/drivers/net/ethoc.c
+++ b/drivers/net/ethoc.c
@@ -13,6 +13,7 @@
 #include <cpu_func.h>
 #include <dm.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/u-boot.h>
 #include <dm/platform_data/net_ethoc.h>
diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c
index 1d8bdb9e12f..79eb1497930 100644
--- a/drivers/net/fec_mxc.c
+++ b/drivers/net/fec_mxc.c
@@ -17,6 +17,7 @@
 #include <miiphy.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
diff --git a/drivers/net/fm/eth.c b/drivers/net/fm/eth.c
index 358643c70fb..308b2baf936 100644
--- a/drivers/net/fm/eth.c
+++ b/drivers/net/fm/eth.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <log.h>
 #include <part.h>
+#include <stdio.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 242d27a34ea..608e2add6cc 100644
--- a/drivers/net/fm/fdt.c
+++ b/drivers/net/fm/fdt.c
@@ -2,6 +2,7 @@
 /*
  * Copyright 2016 Freescale Semiconductor, Inc.
  */
+#include <stdio.h>
 #include <asm/io.h>
 #include <env.h>
 #include <fdt_support.h>
diff --git a/drivers/net/fm/fm.c b/drivers/net/fm/fm.c
index 247a1c13645..964dc01884b 100644
--- a/drivers/net/fm/fm.c
+++ b/drivers/net/fm/fm.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <env.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <linux/string.h>
diff --git a/drivers/net/fm/memac_phy.c b/drivers/net/fm/memac_phy.c
index 72246192b3c..8973f498d17 100644
--- a/drivers/net/fm/memac_phy.c
+++ b/drivers/net/fm/memac_phy.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <miiphy.h>
 #include <phy.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <fsl_memac.h>
 #include <fm_eth.h>
diff --git a/drivers/net/fm/tgec_phy.c b/drivers/net/fm/tgec_phy.c
index 39044418796..7afcf01916f 100644
--- a/drivers/net/fm/tgec_phy.c
+++ b/drivers/net/fm/tgec_phy.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <miiphy.h>
 #include <phy.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <fsl_tgec.h>
 #include <fm_eth.h>
diff --git a/drivers/net/fsl-mc/dpio/qbman_portal.c b/drivers/net/fsl-mc/dpio/qbman_portal.c
index 5a0bef9324f..bedff4ff321 100644
--- a/drivers/net/fsl-mc/dpio/qbman_portal.c
+++ b/drivers/net/fsl-mc/dpio/qbman_portal.c
@@ -5,6 +5,7 @@
 
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <linux/bug.h>
 #include <linux/string.h>
diff --git a/drivers/net/fsl-mc/dpio/qbman_sys.h b/drivers/net/fsl-mc/dpio/qbman_sys.h
index e320e9b905e..2d94d91129d 100644
--- a/drivers/net/fsl-mc/dpio/qbman_sys.h
+++ b/drivers/net/fsl-mc/dpio/qbman_sys.h
@@ -20,6 +20,7 @@
 
 /* Trace the 3 different classes of read/write access to QBMan. #undef as
  * required. */
+#include <stdio.h>
 #include <linux/bug.h>
 #include <linux/printk.h>
 #include <linux/string.h>
diff --git a/drivers/net/fsl-mc/mc.c b/drivers/net/fsl-mc/mc.c
index 1ce12ae5db9..aa0cfee67ae 100644
--- a/drivers/net/fsl-mc/mc.c
+++ b/drivers/net/fsl-mc/mc.c
@@ -11,6 +11,7 @@
 #include <image.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/bug.h>
diff --git a/drivers/net/fsl-mc/mc_sys.c b/drivers/net/fsl-mc/mc_sys.c
index b5ae2ea3eb5..239bccb4b0a 100644
--- a/drivers/net/fsl-mc/mc_sys.c
+++ b/drivers/net/fsl-mc/mc_sys.c
@@ -6,6 +6,7 @@
  * Author: German Rivera <German.Rivera@freescale.com>
  */
 
+#include <stdio.h>
 #include <fsl-mc/fsl_mc_sys.h>
 #include <fsl-mc/fsl_mc_cmd.h>
 #include <common.h>
diff --git a/drivers/net/fsl_enetc_mdio.c b/drivers/net/fsl_enetc_mdio.c
index 47257a6cf68..474714da958 100644
--- a/drivers/net/fsl_enetc_mdio.c
+++ b/drivers/net/fsl_enetc_mdio.c
@@ -9,6 +9,7 @@
 #include <errno.h>
 #include <pci.h>
 #include <miiphy.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/processor.h>
 #include <miiphy.h>
diff --git a/drivers/net/fsl_mcdmafec.c b/drivers/net/fsl_mcdmafec.c
index 1c2449d18f4..819de623625 100644
--- a/drivers/net/fsl_mcdmafec.c
+++ b/drivers/net/fsl_mcdmafec.c
@@ -18,6 +18,7 @@
 #include <config.h>
 #include <net.h>
 #include <miiphy.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
diff --git a/drivers/net/fsl_mdio.c b/drivers/net/fsl_mdio.c
index a06b7201335..36fa90766c2 100644
--- a/drivers/net/fsl_mdio.c
+++ b/drivers/net/fsl_mdio.c
@@ -9,6 +9,7 @@
 #include <miiphy.h>
 #include <phy.h>
 #include <fsl_mdio.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
diff --git a/drivers/net/ftgmac100.c b/drivers/net/ftgmac100.c
index 74fea1e45fd..f5e50ff0847 100644
--- a/drivers/net/ftgmac100.c
+++ b/drivers/net/ftgmac100.c
@@ -19,6 +19,7 @@
 #include <malloc.h>
 #include <miiphy.h>
 #include <net.h>
+#include <stdio.h>
 #include <wait_bit.h>
 #include <asm/cache.h>
 #include <dm/device_compat.h>
diff --git a/drivers/net/ftmac100.c b/drivers/net/ftmac100.c
index 763e0f72318..26901136d58 100644
--- a/drivers/net/ftmac100.c
+++ b/drivers/net/ftmac100.c
@@ -12,6 +12,7 @@
 #include <env.h>
 #include <malloc.h>
 #include <net.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
diff --git a/drivers/net/ftmac110.c b/drivers/net/ftmac110.c
index 449bb987355..6ce47832a68 100644
--- a/drivers/net/ftmac110.c
+++ b/drivers/net/ftmac110.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <net.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/cache.h>
 #include <asm/u-boot.h>
diff --git a/drivers/net/ks8851_mll.c b/drivers/net/ks8851_mll.c
index be4da897b8d..c1b6d8195b5 100644
--- a/drivers/net/ks8851_mll.c
+++ b/drivers/net/ks8851_mll.c
@@ -5,6 +5,7 @@
  */
 
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <common.h>
 #include <command.h>
diff --git a/drivers/net/lan91c96.c b/drivers/net/lan91c96.c
index bcaa18747f4..0bc2c21e599 100644
--- a/drivers/net/lan91c96.c
+++ b/drivers/net/lan91c96.c
@@ -48,6 +48,7 @@
 #include <command.h>
 #include <env.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
diff --git a/drivers/net/ldpaa_eth/ldpaa_eth.c b/drivers/net/ldpaa_eth/ldpaa_eth.c
index c4befd9028b..5de15c9684f 100644
--- a/drivers/net/ldpaa_eth/ldpaa_eth.c
+++ b/drivers/net/ldpaa_eth/ldpaa_eth.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/net/lpc32xx_eth.c b/drivers/net/lpc32xx_eth.c
index 4b4b09b5438..a43623a1adf 100644
--- a/drivers/net/lpc32xx_eth.c
+++ b/drivers/net/lpc32xx_eth.c
@@ -11,6 +11,7 @@
 #include <net.h>
 #include <malloc.h>
 #include <miiphy.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
diff --git a/drivers/net/macb.c b/drivers/net/macb.c
index ec8817799da..fcb940037a3 100644
--- a/drivers/net/macb.c
+++ b/drivers/net/macb.c
@@ -7,6 +7,7 @@
 #include <cpu_func.h>
 #include <dm.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
diff --git a/drivers/net/mcffec.c b/drivers/net/mcffec.c
index d5bead5e2ce..5a86f204ee3 100644
--- a/drivers/net/mcffec.c
+++ b/drivers/net/mcffec.c
@@ -17,6 +17,7 @@
 #include <command.h>
 #include <net.h>
 #include <miiphy.h>
+#include <stdio.h>
 #include <asm/fec.h>
 #include <asm/global_data.h>
 #include <asm/immap.h>
diff --git a/drivers/net/mcfmii.c b/drivers/net/mcfmii.c
index c99950d0e9e..0e906e85670 100644
--- a/drivers/net/mcfmii.c
+++ b/drivers/net/mcfmii.c
@@ -8,6 +8,7 @@
 #include <config.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/string.h>
diff --git a/drivers/net/mpc8xx_fec.c b/drivers/net/mpc8xx_fec.c
index 9cf1f5cba9f..9056394eab4 100644
--- a/drivers/net/mpc8xx_fec.c
+++ b/drivers/net/mpc8xx_fec.c
@@ -10,6 +10,7 @@
 #include <malloc.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/cpm_8xx.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/net/mscc_eswitch/jr2_switch.c b/drivers/net/mscc_eswitch/jr2_switch.c
index 92debab424f..d4752492c5b 100644
--- a/drivers/net/mscc_eswitch/jr2_switch.c
+++ b/drivers/net/mscc_eswitch/jr2_switch.c
@@ -7,6 +7,7 @@
 #include <config.h>
 #include <dm.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <dm/of_access.h>
 #include <dm/of_addr.h>
 #include <fdt_support.h>
diff --git a/drivers/net/mscc_eswitch/luton_switch.c b/drivers/net/mscc_eswitch/luton_switch.c
index 79f4d19dad9..0ebc207157b 100644
--- a/drivers/net/mscc_eswitch/luton_switch.c
+++ b/drivers/net/mscc_eswitch/luton_switch.c
@@ -7,6 +7,7 @@
 #include <config.h>
 #include <dm.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <dm/of_access.h>
 #include <dm/of_addr.h>
 #include <fdt_support.h>
diff --git a/drivers/net/mscc_eswitch/servalt_switch.c b/drivers/net/mscc_eswitch/servalt_switch.c
index fc79d34b519..a1c86062fac 100644
--- a/drivers/net/mscc_eswitch/servalt_switch.c
+++ b/drivers/net/mscc_eswitch/servalt_switch.c
@@ -7,6 +7,7 @@
 #include <config.h>
 #include <dm.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <dm/of_access.h>
 #include <dm/of_addr.h>
 #include <fdt_support.h>
diff --git a/drivers/net/mt7628-eth.c b/drivers/net/mt7628-eth.c
index 3bf8b636ea8..b8739562b73 100644
--- a/drivers/net/mt7628-eth.c
+++ b/drivers/net/mt7628-eth.c
@@ -21,6 +21,7 @@
 #include <miiphy.h>
 #include <net.h>
 #include <reset.h>
+#include <stdio.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 7e769933996..0ad215da92f 100644
--- a/drivers/net/mtk_eth.c
+++ b/drivers/net/mtk_eth.c
@@ -15,6 +15,7 @@
 #include <net.h>
 #include <regmap.h>
 #include <reset.h>
+#include <stdio.h>
 #include <syscon.h>
 #include <time.h>
 #include <wait_bit.h>
diff --git a/drivers/net/mvgbe.c b/drivers/net/mvgbe.c
index 54febc7ce42..227f22f7e05 100644
--- a/drivers/net/mvgbe.c
+++ b/drivers/net/mvgbe.c
@@ -17,6 +17,7 @@
 #include <net.h>
 #include <malloc.h>
 #include <miiphy.h>
+#include <stdio.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 6ee0e1c7897..99653479258 100644
--- a/drivers/net/mvneta.c
+++ b/drivers/net/mvneta.c
@@ -20,6 +20,7 @@
 #include <netdev.h>
 #include <config.h>
 #include <malloc.h>
+#include <stdio.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 06eb619c002..98a56cb8de1 100644
--- a/drivers/net/mvpp2.c
+++ b/drivers/net/mvpp2.c
@@ -16,6 +16,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <dm.h>
+#include <stdio.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 5f81d22bf0e..1819c24a843 100644
--- a/drivers/net/natsemi.c
+++ b/drivers/net/natsemi.c
@@ -54,6 +54,7 @@
 #include <malloc.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <pci.h>
 #include <asm/u-boot.h>
diff --git a/drivers/net/ne2000.c b/drivers/net/ne2000.c
index 28a99bb8c48..85da482b8ff 100644
--- a/drivers/net/ne2000.c
+++ b/drivers/net/ne2000.c
@@ -74,6 +74,7 @@ Add SNMP
 
 #include <common.h>
 #include <command.h>
+#include <stdio.h>
 #include <linux/delay.h>
 
 /* NE2000 base header file */
diff --git a/drivers/net/ne2000_base.c b/drivers/net/ne2000_base.c
index 409c41a179b..7ed8721bc80 100644
--- a/drivers/net/ne2000_base.c
+++ b/drivers/net/ne2000_base.c
@@ -78,6 +78,7 @@ Add SNMP
 #include <log.h>
 #include <net.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/u-boot.h>
 #include <linux/compiler.h>
diff --git a/drivers/net/ne2000_base.h b/drivers/net/ne2000_base.h
index 2493608a5a6..21c1a8c15b5 100644
--- a/drivers/net/ne2000_base.h
+++ b/drivers/net/ne2000_base.h
@@ -106,6 +106,7 @@ are GPL, so this is, of course, GPL.
 #endif
 
 /* timeout for tx/rx in s */
+#include <stdio.h>
 #include <linux/delay.h>
 #define TOUT 5
 /* Ether MAC address size */
diff --git a/drivers/net/ns8382x.c b/drivers/net/ns8382x.c
index 7ae60e8a3e7..b0aeb470a19 100644
--- a/drivers/net/ns8382x.c
+++ b/drivers/net/ns8382x.c
@@ -55,6 +55,7 @@
 #include <malloc.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <pci.h>
 #include <asm/u-boot.h>
diff --git a/drivers/net/pch_gbe.c b/drivers/net/pch_gbe.c
index c1596a2cd35..fa824079391 100644
--- a/drivers/net/pch_gbe.c
+++ b/drivers/net/pch_gbe.c
@@ -11,6 +11,7 @@
 #include <errno.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/io.h>
 #include <pci.h>
diff --git a/drivers/net/pcnet.c b/drivers/net/pcnet.c
index b1c0a8badd1..164b6b4afa2 100644
--- a/drivers/net/pcnet.c
+++ b/drivers/net/pcnet.c
@@ -15,6 +15,7 @@
 #include <memalign.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdio.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 f72413cf132..365a74aa094 100644
--- a/drivers/net/pfe_eth/pfe_cmd.c
+++ b/drivers/net/pfe_eth/pfe_cmd.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <command.h>
 #include <log.h>
+#include <stdio.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 #include <net/pfe_eth/pfe_eth.h>
diff --git a/drivers/net/pfe_eth/pfe_driver.c b/drivers/net/pfe_eth/pfe_driver.c
index d2d23858961..58a4df2ae24 100644
--- a/drivers/net/pfe_eth/pfe_driver.c
+++ b/drivers/net/pfe_eth/pfe_driver.c
@@ -6,6 +6,7 @@
 
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
diff --git a/drivers/net/pfe_eth/pfe_eth.c b/drivers/net/pfe_eth/pfe_eth.c
index e49bf4a6f3c..4fb81ab0cd4 100644
--- a/drivers/net/pfe_eth/pfe_eth.c
+++ b/drivers/net/pfe_eth/pfe_eth.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <dm/platform_data/pfe_dm_eth.h>
 #include <net.h>
 #include <linux/delay.h>
diff --git a/drivers/net/pfe_eth/pfe_firmware.c b/drivers/net/pfe_eth/pfe_firmware.c
index 1601ec48a59..66d5ad930e3 100644
--- a/drivers/net/pfe_eth/pfe_firmware.c
+++ b/drivers/net/pfe_eth/pfe_firmware.c
@@ -13,6 +13,7 @@
 #include <image.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <linux/bitops.h>
 #include <linux/string.h>
 #include <net/pfe_eth/pfe_eth.h>
diff --git a/drivers/net/pfe_eth/pfe_hw.c b/drivers/net/pfe_eth/pfe_hw.c
index 2889dd6b907..fb60e605b19 100644
--- a/drivers/net/pfe_eth/pfe_hw.c
+++ b/drivers/net/pfe_eth/pfe_hw.c
@@ -4,6 +4,7 @@
  * Copyright 2017 NXP
  */
 #include <log.h>
+#include <stdio.h>
 #include <linux/bitops.h>
 #include <linux/string.h>
 #include <net/pfe_eth/pfe_eth.h>
diff --git a/drivers/net/pfe_eth/pfe_mdio.c b/drivers/net/pfe_eth/pfe_mdio.c
index 3228b8df49d..0f682d1cfdd 100644
--- a/drivers/net/pfe_eth/pfe_mdio.c
+++ b/drivers/net/pfe_eth/pfe_mdio.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <dm/platform_data/pfe_dm_eth.h>
 #include <net.h>
 #include <linux/delay.h>
diff --git a/drivers/net/phy/aquantia.c b/drivers/net/phy/aquantia.c
index 59c7abeb667..aa3e566bf2e 100644
--- a/drivers/net/phy/aquantia.c
+++ b/drivers/net/phy/aquantia.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <net.h>
 #include <phy.h>
+#include <stdio.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/string.h>
diff --git a/drivers/net/phy/b53.c b/drivers/net/phy/b53.c
index b376ef8f82b..34ba893dcdb 100644
--- a/drivers/net/phy/b53.c
+++ b/drivers/net/phy/b53.c
@@ -24,6 +24,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <stdio.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/string.h>
diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c
index 566fcb8de73..91e8f6123de 100644
--- a/drivers/net/phy/broadcom.c
+++ b/drivers/net/phy/broadcom.c
@@ -7,6 +7,7 @@
  */
 #include <common.h>
 #include <phy.h>
+#include <stdio.h>
 #include <linux/delay.h>
 
 /* Broadcom BCM54xx -- taken from linux sungem_phy */
diff --git a/drivers/net/phy/cortina.c b/drivers/net/phy/cortina.c
index dbc20b14051..a02d620d966 100644
--- a/drivers/net/phy/cortina.c
+++ b/drivers/net/phy/cortina.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <linux/ctype.h>
 #include <linux/delay.h>
 #include <linux/string.h>
diff --git a/drivers/net/phy/fixed.c b/drivers/net/phy/fixed.c
index d3e9e3e3d4a..b4833c5ac96 100644
--- a/drivers/net/phy/fixed.c
+++ b/drivers/net/phy/fixed.c
@@ -11,6 +11,7 @@
 #include <phy.h>
 #include <dm.h>
 #include <fdt_support.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/string.h>
 
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
index a62c695c5c8..a313e8bf917 100644
--- a/drivers/net/phy/marvell.c
+++ b/drivers/net/phy/marvell.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <errno.h>
 #include <phy.h>
+#include <stdio.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 
diff --git a/drivers/net/phy/meson-gxl.c b/drivers/net/phy/meson-gxl.c
index ffb1a61402e..e7a1008f14d 100644
--- a/drivers/net/phy/meson-gxl.c
+++ b/drivers/net/phy/meson-gxl.c
@@ -8,6 +8,7 @@
  */
 #include <config.h>
 #include <common.h>
+#include <stdio.h>
 #include <linux/bitops.h>
 #include <dm.h>
 #include <phy.h>
diff --git a/drivers/net/phy/miiphybb.c b/drivers/net/phy/miiphybb.c
index 6b031196f44..d19a13dd62b 100644
--- a/drivers/net/phy/miiphybb.c
+++ b/drivers/net/phy/miiphybb.c
@@ -16,6 +16,7 @@
 #include <ioports.h>
 #include <ppc_asm.tmpl>
 #include <miiphy.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/string.h>
 
diff --git a/drivers/net/phy/mscc.c b/drivers/net/phy/mscc.c
index 264afcd1a57..f8a4d069440 100644
--- a/drivers/net/phy/mscc.c
+++ b/drivers/net/phy/mscc.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <miiphy.h>
 #include <bitfield.h>
+#include <stdio.h>
 #include <time.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/drivers/net/phy/mv88e61xx.c b/drivers/net/phy/mv88e61xx.c
index 832b538f5e9..0a783e03129 100644
--- a/drivers/net/phy/mv88e61xx.c
+++ b/drivers/net/phy/mv88e61xx.c
@@ -31,6 +31,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/string.h>
diff --git a/drivers/net/phy/mv88e6352.c b/drivers/net/phy/mv88e6352.c
index 40e0edc6d88..977102d4d80 100644
--- a/drivers/net/phy/mv88e6352.c
+++ b/drivers/net/phy/mv88e6352.c
@@ -8,6 +8,7 @@
 #include <command.h>
 #include <log.h>
 #include <miiphy.h>
+#include <stdio.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <mv88e6352.h>
diff --git a/drivers/net/phy/ncsi.c b/drivers/net/phy/ncsi.c
index 862a1564a73..f112fa2bee9 100644
--- a/drivers/net/phy/ncsi.c
+++ b/drivers/net/phy/ncsi.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <phy.h>
+#include <stdio.h>
 #include <linux/string.h>
 #include <net/ncsi.h>
 #include <net/ncsi-pkt.h>
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 030dc753824..026ccc467f6 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -17,6 +17,7 @@
 #include <miiphy.h>
 #include <phy.h>
 #include <errno.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/drivers/net/phy/realtek.c b/drivers/net/phy/realtek.c
index b1b1fa50809..2f9b50e168a 100644
--- a/drivers/net/phy/realtek.c
+++ b/drivers/net/phy/realtek.c
@@ -7,6 +7,7 @@
  * Copyright 2016 Karsten Merker <merker@debian.org>
  */
 #include <common.h>
+#include <stdio.h>
 #include <linux/bitops.h>
 #include <phy.h>
 #include <linux/delay.h>
diff --git a/drivers/net/phy/teranetics.c b/drivers/net/phy/teranetics.c
index 60049c2074f..7b5494eea98 100644
--- a/drivers/net/phy/teranetics.c
+++ b/drivers/net/phy/teranetics.c
@@ -7,6 +7,7 @@
  */
 #include <common.h>
 #include <phy.h>
+#include <stdio.h>
 #include <linux/delay.h>
 
 #ifndef CONFIG_PHYLIB_10G
diff --git a/drivers/net/phy/vitesse.c b/drivers/net/phy/vitesse.c
index eca26c98938..fdc67610236 100644
--- a/drivers/net/phy/vitesse.c
+++ b/drivers/net/phy/vitesse.c
@@ -8,6 +8,7 @@
  */
 #include <common.h>
 #include <miiphy.h>
+#include <stdio.h>
 
 /* Cicada Auxiliary Control/Status Register */
 #define MIIM_CIS82xx_AUX_CONSTAT	0x1c
diff --git a/drivers/net/phy/xilinx_gmii2rgmii.c b/drivers/net/phy/xilinx_gmii2rgmii.c
index 74105c0b7d6..86492e90c4d 100644
--- a/drivers/net/phy/xilinx_gmii2rgmii.c
+++ b/drivers/net/phy/xilinx_gmii2rgmii.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <log.h>
 #include <phy.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/net/pic32_eth.c b/drivers/net/pic32_eth.c
index bbc305f81db..5627b5d2d1a 100644
--- a/drivers/net/pic32_eth.c
+++ b/drivers/net/pic32_eth.c
@@ -12,6 +12,7 @@
 #include <net.h>
 #include <miiphy.h>
 #include <console.h>
+#include <stdio.h>
 #include <time.h>
 #include <wait_bit.h>
 #include <asm/global_data.h>
diff --git a/drivers/net/pic32_mdio.c b/drivers/net/pic32_mdio.c
index 802563960a1..963b9e7fc8f 100644
--- a/drivers/net/pic32_mdio.c
+++ b/drivers/net/pic32_mdio.c
@@ -9,6 +9,7 @@
 #include <phy.h>
 #include <miiphy.h>
 #include <errno.h>
+#include <stdio.h>
 #include <wait_bit.h>
 #include <asm/io.h>
 #include <linux/delay.h>
diff --git a/drivers/net/rtl8139.c b/drivers/net/rtl8139.c
index f52fa66a4eb..42169e99683 100644
--- a/drivers/net/rtl8139.c
+++ b/drivers/net/rtl8139.c
@@ -75,6 +75,7 @@
 #include <malloc.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <pci.h>
 #include <asm/u-boot.h>
diff --git a/drivers/net/rtl8169.c b/drivers/net/rtl8169.c
index 683e5d5d9e9..c64888be490 100644
--- a/drivers/net/rtl8169.c
+++ b/drivers/net/rtl8169.c
@@ -50,6 +50,7 @@
 #ifndef CONFIG_DM_ETH
 #include <netdev.h>
 #endif
+#include <stdio.h>
 #include <time.h>
 #include <asm/cache.h>
 #include <asm/io.h>
diff --git a/drivers/net/sandbox-raw.c b/drivers/net/sandbox-raw.c
index bda3ffd003b..cc358428a36 100644
--- a/drivers/net/sandbox-raw.c
+++ b/drivers/net/sandbox-raw.c
@@ -7,6 +7,7 @@
  */
 
 #include <log.h>
+#include <stdio.h>
 #include <asm/eth-raw-os.h>
 #include <common.h>
 #include <dm.h>
diff --git a/drivers/net/sandbox.c b/drivers/net/sandbox.c
index b63b3aaebcf..0551d0670b1 100644
--- a/drivers/net/sandbox.c
+++ b/drivers/net/sandbox.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <net.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/eth.h>
 #include <asm/global_data.h>
diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c
index 5ea0adb6b10..84f3fa473c7 100644
--- a/drivers/net/sh_eth.c
+++ b/drivers/net/sh_eth.c
@@ -17,6 +17,7 @@
 #include <net.h>
 #include <netdev.h>
 #include <miiphy.h>
+#include <stdio.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 a341bca51cf..9b279d48002 100644
--- a/drivers/net/smc91111.c
+++ b/drivers/net/smc91111.c
@@ -51,6 +51,7 @@
 #include <command.h>
 #include <config.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
index 6f352165117..a28ccc8c18a 100644
--- a/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.c
@@ -10,6 +10,7 @@
 #include <malloc.h>
 #include <net.h>
 #include <miiphy.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 #include <linux/io.h>
 #include <linux/delay.h>
diff --git a/drivers/net/sun8i_emac.c b/drivers/net/sun8i_emac.c
index 77c03cbf301..b0d83de8cbd 100644
--- a/drivers/net/sun8i_emac.c
+++ b/drivers/net/sun8i_emac.c
@@ -12,6 +12,7 @@
 
 #include <cpu_func.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
diff --git a/drivers/net/sunxi_emac.c b/drivers/net/sunxi_emac.c
index e1176454f2e..009d0de4845 100644
--- a/drivers/net/sunxi_emac.c
+++ b/drivers/net/sunxi_emac.c
@@ -9,6 +9,7 @@
 #include <clk.h>
 #include <dm.h>
 #include <log.h>
+#include <stdio.h>
 #include <dm/device_compat.h>
 #include <linux/delay.h>
 #include <linux/err.h>
diff --git a/drivers/net/ti/am65-cpsw-nuss.c b/drivers/net/ti/am65-cpsw-nuss.c
index 08cd26b3c4b..571f1ebfc46 100644
--- a/drivers/net/ti/am65-cpsw-nuss.c
+++ b/drivers/net/ti/am65-cpsw-nuss.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <asm/io.h>
 #include <asm/processor.h>
diff --git a/drivers/net/ti/cpsw.c b/drivers/net/ti/cpsw.c
index 921d5639426..02dd3bc984f 100644
--- a/drivers/net/ti/cpsw.c
+++ b/drivers/net/ti/cpsw.c
@@ -15,6 +15,7 @@
 #include <net.h>
 #include <netdev.h>
 #include <cpsw.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
diff --git a/drivers/net/ti/davinci_emac.c b/drivers/net/ti/davinci_emac.c
index c2df17d3a6f..b4647554bce 100644
--- a/drivers/net/ti/davinci_emac.c
+++ b/drivers/net/ti/davinci_emac.c
@@ -28,6 +28,7 @@
 #include <net.h>
 #include <miiphy.h>
 #include <malloc.h>
+#include <stdio.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 5e44215e223..4dd205c1507 100644
--- a/drivers/net/ti/keystone_net.c
+++ b/drivers/net/ti/keystone_net.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <command.h>
 #include <console.h>
+#include <stdio.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 5ab450cf8a4..17ce68baffe 100644
--- a/drivers/net/tsec.c
+++ b/drivers/net/tsec.c
@@ -13,6 +13,7 @@
 #include <malloc.h>
 #include <net.h>
 #include <command.h>
+#include <stdio.h>
 #include <tsec.h>
 #include <fsl_mdio.h>
 #include <asm/u-boot.h>
diff --git a/drivers/net/uli526x.c b/drivers/net/uli526x.c
index d6bc29c0c10..0a8369f96e3 100644
--- a/drivers/net/uli526x.c
+++ b/drivers/net/uli526x.c
@@ -13,6 +13,7 @@
 #include <malloc.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <pci.h>
 #include <miiphy.h>
diff --git a/drivers/net/vsc7385.c b/drivers/net/vsc7385.c
index af8d99cefbe..ba4793122ea 100644
--- a/drivers/net/vsc7385.c
+++ b/drivers/net/vsc7385.c
@@ -16,6 +16,7 @@
 #include <common.h>
 #include <console.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/net/vsc9953.c b/drivers/net/vsc9953.c
index a4c701e86a3..b1bb27fb7f8 100644
--- a/drivers/net/vsc9953.c
+++ b/drivers/net/vsc9953.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <command.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/fsl_serdes.h>
 #include <fm_eth.h>
diff --git a/drivers/net/xilinx_axi_emac.c b/drivers/net/xilinx_axi_emac.c
index da571efde4e..f6cf8df44ff 100644
--- a/drivers/net/xilinx_axi_emac.c
+++ b/drivers/net/xilinx_axi_emac.c
@@ -13,6 +13,7 @@
 #include <log.h>
 #include <net.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <phy.h>
diff --git a/drivers/net/xilinx_emaclite.c b/drivers/net/xilinx_emaclite.c
index 321429090f6..5334b61c7aa 100644
--- a/drivers/net/xilinx_emaclite.c
+++ b/drivers/net/xilinx_emaclite.c
@@ -13,6 +13,7 @@
 #include <dm.h>
 #include <console.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/net/zynq_gem.c b/drivers/net/zynq_gem.c
index 9d19e89090c..8e3a96c51ef 100644
--- a/drivers/net/zynq_gem.c
+++ b/drivers/net/zynq_gem.c
@@ -18,6 +18,7 @@
 #include <config.h>
 #include <console.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <asm/io.h>
 #include <phy.h>
diff --git a/drivers/nvme/nvme.c b/drivers/nvme/nvme.c
index 6d8ab8bf786..8b3b60570d7 100644
--- a/drivers/nvme/nvme.c
+++ b/drivers/nvme/nvme.c
@@ -13,6 +13,7 @@
 #include <malloc.h>
 #include <memalign.h>
 #include <pci.h>
+#include <stdio.h>
 #include <time.h>
 #include <dm/device-internal.h>
 #include <linux/compat.h>
diff --git a/drivers/nvme/nvme_show.c b/drivers/nvme/nvme_show.c
index 15e459da1ac..5a0bb4a223e 100644
--- a/drivers/nvme/nvme_show.c
+++ b/drivers/nvme/nvme_show.c
@@ -9,6 +9,7 @@
 #include <errno.h>
 #include <memalign.h>
 #include <nvme.h>
+#include <stdio.h>
 #include "nvme.h"
 
 static void print_optional_admin_cmd(u16 oacs, int devnum)
diff --git a/drivers/pci/fsl_pci_init.c b/drivers/pci/fsl_pci_init.c
index ffd160439fd..afb2dfd30e5 100644
--- a/drivers/pci/fsl_pci_init.c
+++ b/drivers/pci/fsl_pci_init.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/fsl_serdes.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
diff --git a/drivers/pci/pci-aardvark.c b/drivers/pci/pci-aardvark.c
index 711b930d0f9..76234ea61c4 100644
--- a/drivers/pci/pci-aardvark.c
+++ b/drivers/pci/pci-aardvark.c
@@ -27,6 +27,7 @@
 #include <common.h>
 #include <dm.h>
 #include <pci.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm-generic/gpio.h>
 #include <dm/device_compat.h>
diff --git a/drivers/pci/pci-uclass.c b/drivers/pci/pci-uclass.c
index 7b039c98243..72b68d61ff1 100644
--- a/drivers/pci/pci-uclass.c
+++ b/drivers/pci/pci-uclass.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <pci.h>
+#include <stdio.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 25a755627c0..b6a147ec1f5 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -17,6 +17,7 @@
 #include <common.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
 
diff --git a/drivers/pci/pci_auto.c b/drivers/pci/pci_auto.c
index 3f46b7697d7..e0e325755e1 100644
--- a/drivers/pci/pci_auto.c
+++ b/drivers/pci/pci_auto.c
@@ -12,6 +12,7 @@
 #include <errno.h>
 #include <log.h>
 #include <pci.h>
+#include <stdio.h>
 
 /* the user can define CONFIG_SYS_PCI_CACHE_LINE_SIZE to avoid problems */
 #ifndef CONFIG_SYS_PCI_CACHE_LINE_SIZE
diff --git a/drivers/pci/pci_common.c b/drivers/pci/pci_common.c
index 5231b69dc9a..e7469d88d82 100644
--- a/drivers/pci/pci_common.c
+++ b/drivers/pci/pci_common.c
@@ -14,6 +14,7 @@
 #include <env.h>
 #include <errno.h>
 #include <pci.h>
+#include <stdio.h>
 #include <asm/io.h>
 
 const char *pci_class_str(u8 class)
diff --git a/drivers/pci/pci_ftpci100.c b/drivers/pci/pci_ftpci100.c
index f7a60172672..b3d928ac1fe 100644
--- a/drivers/pci/pci_ftpci100.c
+++ b/drivers/pci/pci_ftpci100.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <pci.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 #include <faraday/ftpci100.h>
diff --git a/drivers/pci/pci_mpc85xx.c b/drivers/pci/pci_mpc85xx.c
index 6576f53f52a..d7073a49694 100644
--- a/drivers/pci/pci_mpc85xx.c
+++ b/drivers/pci/pci_mpc85xx.c
@@ -5,6 +5,7 @@
  *
  */
 #include <common.h>
+#include <stdio.h>
 #include <asm/bitops.h>
 #include <asm/cpm_85xx.h>
 #include <pci.h>
diff --git a/drivers/pci/pci_mvebu.c b/drivers/pci/pci_mvebu.c
index 95ed1730358..07c34fe74da 100644
--- a/drivers/pci/pci_mvebu.c
+++ b/drivers/pci/pci_mvebu.c
@@ -13,6 +13,7 @@
 #include <dm.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <dm/device-internal.h>
 #include <dm/lists.h>
diff --git a/drivers/pci/pci_rom.c b/drivers/pci/pci_rom.c
index 68b9949ba1e..3a046df743d 100644
--- a/drivers/pci/pci_rom.c
+++ b/drivers/pci/pci_rom.c
@@ -34,6 +34,7 @@
 #include <malloc.h>
 #include <pci.h>
 #include <pci_rom.h>
+#include <stdio.h>
 #include <time.h>
 #include <vbe.h>
 #include <video.h>
diff --git a/drivers/pci/pci_sh4.c b/drivers/pci/pci_sh4.c
index aac9be055e2..c6609d58e89 100644
--- a/drivers/pci/pci_sh4.c
+++ b/drivers/pci/pci_sh4.c
@@ -9,6 +9,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <linux/delay.h>
 
 #include <asm/processor.h>
diff --git a/drivers/pci/pci_sh7751.c b/drivers/pci/pci_sh7751.c
index e110550c71c..62d098d378f 100644
--- a/drivers/pci/pci_sh7751.c
+++ b/drivers/pci/pci_sh7751.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <dm.h>
 #include <pci.h>
+#include <stdio.h>
 #include <asm/processor.h>
 #include <asm/io.h>
 #include <asm/pci.h>
diff --git a/drivers/pci/pci_sh7780.c b/drivers/pci/pci_sh7780.c
index 06d711a6cb9..ed0834a984e 100644
--- a/drivers/pci/pci_sh7780.c
+++ b/drivers/pci/pci_sh7780.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <linux/delay.h>
 
 #include <pci.h>
diff --git a/drivers/pci/pcie_brcmstb.c b/drivers/pci/pcie_brcmstb.c
index dade79e9c86..4fd4d4dfbd1 100644
--- a/drivers/pci/pcie_brcmstb.c
+++ b/drivers/pci/pcie_brcmstb.c
@@ -15,6 +15,7 @@
 #include <common.h>
 #include <errno.h>
 #include <dm.h>
+#include <stdio.h>
 #include <dm/ofnode.h>
 #include <pci.h>
 #include <asm/io.h>
diff --git a/drivers/pci/pcie_dw_mvebu.c b/drivers/pci/pcie_dw_mvebu.c
index dbc8bb81a7c..b1f2750888c 100644
--- a/drivers/pci/pcie_dw_mvebu.c
+++ b/drivers/pci/pcie_dw_mvebu.c
@@ -14,6 +14,7 @@
 #include <dm.h>
 #include <log.h>
 #include <pci.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/pci/pcie_dw_ti.c b/drivers/pci/pcie_dw_ti.c
index eed5e428972..3d86bdaaafb 100644
--- a/drivers/pci/pcie_dw_ti.c
+++ b/drivers/pci/pcie_dw_ti.c
@@ -10,6 +10,7 @@
 #include <generic-phy.h>
 #include <power-domain.h>
 #include <regmap.h>
+#include <stdio.h>
 #include <syscon.h>
 #include <time.h>
 #include <asm/global_data.h>
diff --git a/drivers/pci/pcie_fsl.c b/drivers/pci/pcie_fsl.c
index 3ba7d5b7a01..a8978dcc3bd 100644
--- a/drivers/pci/pcie_fsl.c
+++ b/drivers/pci/pcie_fsl.c
@@ -11,6 +11,7 @@
 #include <malloc.h>
 #include <mapmem.h>
 #include <pci.h>
+#include <stdio.h>
 #include <asm/fsl_pci.h>
 #include <asm/fsl_serdes.h>
 #include <asm/global_data.h>
diff --git a/drivers/pci/pcie_imx.c b/drivers/pci/pcie_imx.c
index 16468e73364..ab3d96efc53 100644
--- a/drivers/pci/pcie_imx.c
+++ b/drivers/pci/pcie_imx.c
@@ -14,6 +14,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <pci.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/crm_regs.h>
diff --git a/drivers/pci/pcie_layerscape_ep.c b/drivers/pci/pcie_layerscape_ep.c
index c029b1ef735..c32c40f7957 100644
--- a/drivers/pci/pcie_layerscape_ep.c
+++ b/drivers/pci/pcie_layerscape_ep.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <dm/devres.h>
diff --git a/drivers/pci/pcie_layerscape_gen4.c b/drivers/pci/pcie_layerscape_gen4.c
index 96c6527f806..369124c2b8b 100644
--- a/drivers/pci/pcie_layerscape_gen4.c
+++ b/drivers/pci/pcie_layerscape_gen4.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/arch/fsl_serdes.h>
 #include <pci.h>
 #include <asm/global_data.h>
diff --git a/drivers/pci/pcie_layerscape_rc.c b/drivers/pci/pcie_layerscape_rc.c
index 1c5d73c0f75..4c96f721b05 100644
--- a/drivers/pci/pcie_layerscape_rc.c
+++ b/drivers/pci/pcie_layerscape_rc.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/arch/fsl_serdes.h>
 #include <pci.h>
 #include <asm/global_data.h>
diff --git a/drivers/phy/marvell/comphy_a3700.c b/drivers/phy/marvell/comphy_a3700.c
index e9ba4cfec22..b106fd3e132 100644
--- a/drivers/phy/marvell/comphy_a3700.c
+++ b/drivers/phy/marvell/comphy_a3700.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <fdtdec.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
diff --git a/drivers/phy/marvell/comphy_core.c b/drivers/phy/marvell/comphy_core.c
index 5ef6129f349..99f68fff12c 100644
--- a/drivers/phy/marvell/comphy_core.c
+++ b/drivers/phy/marvell/comphy_core.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <dm.h>
 #include <fdtdec.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm/device_compat.h>
diff --git a/drivers/phy/marvell/comphy_core.h b/drivers/phy/marvell/comphy_core.h
index 12ab921d24c..58c5c2fabdc 100644
--- a/drivers/phy/marvell/comphy_core.h
+++ b/drivers/phy/marvell/comphy_core.h
@@ -7,6 +7,7 @@
 #define _COMPHY_CORE_H_
 
 #include <fdtdec.h>
+#include <stdio.h>
 #include <mvebu/comphy.h>
 
 #if defined(DEBUG)
diff --git a/drivers/phy/marvell/comphy_cp110.c b/drivers/phy/marvell/comphy_cp110.c
index 35da55c4fee..90d2d283c0e 100644
--- a/drivers/phy/marvell/comphy_cp110.c
+++ b/drivers/phy/marvell/comphy_cp110.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <fdtdec.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
diff --git a/drivers/phy/omap-usb2-phy.c b/drivers/phy/omap-usb2-phy.c
index ae0968ab5b2..a460a0560c3 100644
--- a/drivers/phy/omap-usb2-phy.c
+++ b/drivers/phy/omap-usb2-phy.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm.h>
diff --git a/drivers/phy/ti-pipe3-phy.c b/drivers/phy/ti-pipe3-phy.c
index 5953d118bae..2aa2a90c47c 100644
--- a/drivers/phy/ti-pipe3-phy.c
+++ b/drivers/phy/ti-pipe3-phy.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <dm/device.h>
 #include <generic-phy.h>
diff --git a/drivers/pinctrl/broadcom/pinctrl-bcm283x.c b/drivers/pinctrl/broadcom/pinctrl-bcm283x.c
index c22d534da9a..775a8a0a48a 100644
--- a/drivers/pinctrl/broadcom/pinctrl-bcm283x.c
+++ b/drivers/pinctrl/broadcom/pinctrl-bcm283x.c
@@ -15,6 +15,7 @@
 #include <errno.h>
 #include <dm.h>
 #include <log.h>
+#include <stdio.h>
 #include <dm/pinctrl.h>
 #include <dm/root.h>
 #include <dm/device-internal.h>
diff --git a/drivers/pinctrl/intel/pinctrl.c b/drivers/pinctrl/intel/pinctrl.c
index ba21c9dcc2e..933175d2b6c 100644
--- a/drivers/pinctrl/intel/pinctrl.c
+++ b/drivers/pinctrl/intel/pinctrl.c
@@ -23,6 +23,7 @@
 #include <malloc.h>
 #include <p2sb.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm-generic/gpio.h>
 #include <asm/intel_pinctrl.h>
 #include <asm/intel_pinctrl_defs.h>
diff --git a/drivers/pinctrl/meson/pinctrl-meson.c b/drivers/pinctrl/meson/pinctrl-meson.c
index 664af76d584..639eb849db4 100644
--- a/drivers/pinctrl/meson/pinctrl-meson.c
+++ b/drivers/pinctrl/meson/pinctrl-meson.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.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 7541898ac46..0fe1b348809 100644
--- a/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c
+++ b/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c
@@ -20,6 +20,7 @@
 #include <config.h>
 #include <dm.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <dm/device-internal.h>
 #include <dm/device_compat.h>
diff --git a/drivers/pinctrl/nxp/pinctrl-scu.c b/drivers/pinctrl/nxp/pinctrl-scu.c
index c032be782a1..33bba8696f6 100644
--- a/drivers/pinctrl/nxp/pinctrl-scu.c
+++ b/drivers/pinctrl/nxp/pinctrl-scu.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <errno.h>
+#include <stdio.h>
 #include <linux/bitops.h>
 #include <asm/io.h>
 #include <asm/arch/sci/sci.h>
diff --git a/drivers/pinctrl/pinctrl-at91-pio4.c b/drivers/pinctrl/pinctrl-at91-pio4.c
index d325422f854..4400e8088d8 100644
--- a/drivers/pinctrl/pinctrl-at91-pio4.c
+++ b/drivers/pinctrl/pinctrl-at91-pio4.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <dm/pinctrl.h>
 #include <linux/bitops.h>
diff --git a/drivers/pinctrl/pinctrl_pic32.c b/drivers/pinctrl/pinctrl_pic32.c
index 79c95034985..2eb80d92b34 100644
--- a/drivers/pinctrl/pinctrl_pic32.c
+++ b/drivers/pinctrl/pinctrl_pic32.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm/pinctrl.h>
diff --git a/drivers/pinctrl/renesas/pfc-r7s72100.c b/drivers/pinctrl/renesas/pfc-r7s72100.c
index b368336c887..3d0caa9bb77 100644
--- a/drivers/pinctrl/renesas/pfc-r7s72100.c
+++ b/drivers/pinctrl/renesas/pfc-r7s72100.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <dm/lists.h>
 #include <dm/pinctrl.h>
diff --git a/drivers/pinctrl/renesas/pfc.c b/drivers/pinctrl/renesas/pfc.c
index 7183b118088..6bf8fdff478 100644
--- a/drivers/pinctrl/renesas/pfc.c
+++ b/drivers/pinctrl/renesas/pfc.c
@@ -14,6 +14,7 @@
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
+#include <stdio.h>
 #include <dm/device_compat.h>
 #include <dm/devres.h>
 #include <dm/pinctrl.h>
diff --git a/drivers/power/acpi_pmc/acpi-pmc-uclass.c b/drivers/power/acpi_pmc/acpi-pmc-uclass.c
index 828963d8a09..98d217ca72f 100644
--- a/drivers/power/acpi_pmc/acpi-pmc-uclass.c
+++ b/drivers/power/acpi_pmc/acpi-pmc-uclass.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <stdio.h>
 #include <acpi/acpi_s3.h>
 #ifdef CONFIG_X86
 #include <asm/intel_pinctrl.h>
diff --git a/drivers/power/battery/bat_trats.c b/drivers/power/battery/bat_trats.c
index 54b2bf91e5c..d1545004de3 100644
--- a/drivers/power/battery/bat_trats.c
+++ b/drivers/power/battery/bat_trats.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <console.h>
 #include <log.h>
+#include <stdio.h>
 #include <linux/delay.h>
 #include <power/pmic.h>
 #include <power/battery.h>
diff --git a/drivers/power/battery/bat_trats2.c b/drivers/power/battery/bat_trats2.c
index 1172970d1e0..abac714ff34 100644
--- a/drivers/power/battery/bat_trats2.c
+++ b/drivers/power/battery/bat_trats2.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <power/pmic.h>
 #include <power/battery.h>
 #include <power/max77693_pmic.h>
diff --git a/drivers/power/domain/imx8-power-domain-legacy.c b/drivers/power/domain/imx8-power-domain-legacy.c
index 980b946fca1..61ed7172f28 100644
--- a/drivers/power/domain/imx8-power-domain-legacy.c
+++ b/drivers/power/domain/imx8-power-domain-legacy.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <power-domain-uclass.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/power-domain.h>
diff --git a/drivers/power/domain/imx8-power-domain.c b/drivers/power/domain/imx8-power-domain.c
index 6461ab23d62..b0107dff1f8 100644
--- a/drivers/power/domain/imx8-power-domain.c
+++ b/drivers/power/domain/imx8-power-domain.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <power-domain-uclass.h>
+#include <stdio.h>
 #include <asm/arch/power-domain.h>
 #include <asm/arch/sci/sci.h>
 
diff --git a/drivers/power/domain/imx8m-power-domain.c b/drivers/power/domain/imx8m-power-domain.c
index f6681c7b0b5..e50ded8b4c5 100644
--- a/drivers/power/domain/imx8m-power-domain.c
+++ b/drivers/power/domain/imx8m-power-domain.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <malloc.h>
 #include <power-domain-uclass.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/power-domain.h>
diff --git a/drivers/power/fuel_gauge/fg_max17042.c b/drivers/power/fuel_gauge/fg_max17042.c
index a395d587a86..fde4bd19554 100644
--- a/drivers/power/fuel_gauge/fg_max17042.c
+++ b/drivers/power/fuel_gauge/fg_max17042.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <linux/delay.h>
 #include <power/pmic.h>
 #include <power/max17042_fg.h>
diff --git a/drivers/power/mfd/fg_max77693.c b/drivers/power/mfd/fg_max77693.c
index 983a6d4a2bd..4633f79bbe7 100644
--- a/drivers/power/mfd/fg_max77693.c
+++ b/drivers/power/mfd/fg_max77693.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <power/pmic.h>
 #include <power/max77693_fg.h>
 #include <i2c.h>
diff --git a/drivers/power/mfd/muic_max77693.c b/drivers/power/mfd/muic_max77693.c
index 36ee44b9a2c..a021c04ccd4 100644
--- a/drivers/power/mfd/muic_max77693.c
+++ b/drivers/power/mfd/muic_max77693.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <power/pmic.h>
 #include <power/power_chrg.h>
 #include <power/max77693_muic.h>
diff --git a/drivers/power/mfd/pmic_max77693.c b/drivers/power/mfd/pmic_max77693.c
index e32a9722a40..1955189c239 100644
--- a/drivers/power/mfd/pmic_max77693.c
+++ b/drivers/power/mfd/pmic_max77693.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <power/pmic.h>
 #include <power/max77693_pmic.h>
 #include <i2c.h>
diff --git a/drivers/power/mt6323.c b/drivers/power/mt6323.c
index 354817a0378..21e62755983 100644
--- a/drivers/power/mt6323.c
+++ b/drivers/power/mt6323.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/delay.h>
 
diff --git a/drivers/power/palmas.c b/drivers/power/palmas.c
index d2083a51ac9..c716e4ff10d 100644
--- a/drivers/power/palmas.c
+++ b/drivers/power/palmas.c
@@ -5,6 +5,7 @@
  */
 #include <config.h>
 #include <palmas.h>
+#include <stdio.h>
 #include <linux/printk.h>
 
 void palmas_init_settings(void)
diff --git a/drivers/power/pmic/lp873x.c b/drivers/power/pmic/lp873x.c
index fda5bc15164..c307a9e3024 100644
--- a/drivers/power/pmic/lp873x.c
+++ b/drivers/power/pmic/lp873x.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <log.h>
+#include <stdio.h>
 #include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/pmic/lp87565.c b/drivers/power/pmic/lp87565.c
index 904e02c4d81..ba67a5efc02 100644
--- a/drivers/power/pmic/lp87565.c
+++ b/drivers/power/pmic/lp87565.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <log.h>
+#include <stdio.h>
 #include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/pmic/mc34708.c b/drivers/power/pmic/mc34708.c
index 40d732224b6..d1661f01999 100644
--- a/drivers/power/pmic/mc34708.c
+++ b/drivers/power/pmic/mc34708.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <fsl_pmic.h>
 #include <i2c.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <power/pmic.h>
 
diff --git a/drivers/power/pmic/muic_max8997.c b/drivers/power/pmic/muic_max8997.c
index 969ce902395..6184b70e2fd 100644
--- a/drivers/power/pmic/muic_max8997.c
+++ b/drivers/power/pmic/muic_max8997.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <power/pmic.h>
 #include <power/power_chrg.h>
 #include <power/max8997_muic.h>
diff --git a/drivers/power/pmic/pmic_hi6553.c b/drivers/power/pmic/pmic_hi6553.c
index 80b9078cf8f..4442f3501f7 100644
--- a/drivers/power/pmic/pmic_hi6553.c
+++ b/drivers/power/pmic/pmic_hi6553.c
@@ -3,6 +3,7 @@
  *  Copyright (C) 2015 Linaro
  *  Peter Griffin <peter.griffin@linaro.org>
  */
+#include <stdio.h>
 #include <asm/io.h>
 #include <common.h>
 #include <linux/delay.h>
diff --git a/drivers/power/pmic/pmic_ltc3676.c b/drivers/power/pmic/pmic_ltc3676.c
index 00c3e201cd5..5dc0079c2af 100644
--- a/drivers/power/pmic/pmic_ltc3676.c
+++ b/drivers/power/pmic/pmic_ltc3676.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <errno.h>
 #include <i2c.h>
+#include <stdio.h>
 #include <power/pmic.h>
 #include <power/ltc3676_pmic.h>
 
diff --git a/drivers/power/pmic/pmic_max77696.c b/drivers/power/pmic/pmic_max77696.c
index f3a73d6405f..de36b462180 100644
--- a/drivers/power/pmic/pmic_max77696.c
+++ b/drivers/power/pmic/pmic_max77696.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <errno.h>
 #include <i2c.h>
+#include <stdio.h>
 #include <power/pmic.h>
 #include <power/max77696_pmic.h>
 
diff --git a/drivers/power/pmic/pmic_max8997.c b/drivers/power/pmic/pmic_max8997.c
index 1d834ff7130..bf8a015dc8c 100644
--- a/drivers/power/pmic/pmic_max8997.c
+++ b/drivers/power/pmic/pmic_max8997.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <power/pmic.h>
 #include <power/max8997_pmic.h>
 #include <i2c.h>
diff --git a/drivers/power/pmic/pmic_max8998.c b/drivers/power/pmic/pmic_max8998.c
index f058238c921..8e2c4b8e02e 100644
--- a/drivers/power/pmic/pmic_max8998.c
+++ b/drivers/power/pmic/pmic_max8998.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <power/pmic.h>
 #include <power/max8998_pmic.h>
 #include <errno.h>
diff --git a/drivers/power/pmic/pmic_mc34vr500.c b/drivers/power/pmic/pmic_mc34vr500.c
index 9dd1c46ea22..9a3f748538c 100644
--- a/drivers/power/pmic/pmic_mc34vr500.c
+++ b/drivers/power/pmic/pmic_mc34vr500.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <errno.h>
 #include <i2c.h>
+#include <stdio.h>
 #include <power/pmic.h>
 #include <power/mc34vr500_pmic.h>
 
diff --git a/drivers/power/pmic/pmic_pca9450.c b/drivers/power/pmic/pmic_pca9450.c
index d4f27428bd1..651f3a0c274 100644
--- a/drivers/power/pmic/pmic_pca9450.c
+++ b/drivers/power/pmic/pmic_pca9450.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <errno.h>
 #include <i2c.h>
+#include <stdio.h>
 #include <power/pmic.h>
 #include <power/pca9450.h>
 
diff --git a/drivers/power/pmic/pmic_pfuze100.c b/drivers/power/pmic/pmic_pfuze100.c
index c646a0c31f8..25a4aa0ed62 100644
--- a/drivers/power/pmic/pmic_pfuze100.c
+++ b/drivers/power/pmic/pmic_pfuze100.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <errno.h>
 #include <i2c.h>
+#include <stdio.h>
 #include <power/pmic.h>
 #include <power/pfuze100_pmic.h>
 
diff --git a/drivers/power/pmic/pmic_pfuze3000.c b/drivers/power/pmic/pmic_pfuze3000.c
index 1077fa5e9d9..82d932cef1b 100644
--- a/drivers/power/pmic/pmic_pfuze3000.c
+++ b/drivers/power/pmic/pmic_pfuze3000.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <errno.h>
 #include <i2c.h>
+#include <stdio.h>
 #include <power/pmic.h>
 #include <power/pfuze3000_pmic.h>
 
diff --git a/drivers/power/pmic/pmic_tps62362.c b/drivers/power/pmic/pmic_tps62362.c
index c3977fccc3b..790f1fad047 100644
--- a/drivers/power/pmic/pmic_tps62362.c
+++ b/drivers/power/pmic/pmic_tps62362.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <i2c.h>
+#include <stdio.h>
 #include <linux/errno.h>
 #include <power/pmic.h>
 #include <power/tps62362.h>
diff --git a/drivers/power/pmic/pmic_tps65218.c b/drivers/power/pmic/pmic_tps65218.c
index 7c95e5e7580..992838de1b3 100644
--- a/drivers/power/pmic/pmic_tps65218.c
+++ b/drivers/power/pmic/pmic_tps65218.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <i2c.h>
+#include <stdio.h>
 #include <linux/errno.h>
 #include <power/pmic.h>
 #include <power/tps65218.h>
diff --git a/drivers/power/pmic/rk8xx.c b/drivers/power/pmic/rk8xx.c
index 148ee29cca0..71027e8da35 100644
--- a/drivers/power/pmic/rk8xx.c
+++ b/drivers/power/pmic/rk8xx.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
+#include <stdio.h>
 #include <power/rk8xx_pmic.h>
 #include <power/pmic.h>
 
diff --git a/drivers/power/pmic/tps65941.c b/drivers/power/pmic/tps65941.c
index e464d2984e4..fd350b24df2 100644
--- a/drivers/power/pmic/tps65941.c
+++ b/drivers/power/pmic/tps65941.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <log.h>
+#include <stdio.h>
 #include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/power_core.c b/drivers/power/power_core.c
index 9caa4d72b6d..a7df7965f64 100644
--- a/drivers/power/power_core.c
+++ b/drivers/power/power_core.c
@@ -13,6 +13,7 @@
 #include <command.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <linux/string.h>
 #include <linux/types.h>
 #include <linux/list.h>
diff --git a/drivers/power/power_dialog.c b/drivers/power/power_dialog.c
index e286dd108f3..62e460bd581 100644
--- a/drivers/power/power_dialog.c
+++ b/drivers/power/power_dialog.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <power/pmic.h>
 #include <dialog_pmic.h>
 #include <errno.h>
diff --git a/drivers/power/power_fsl.c b/drivers/power/power_fsl.c
index a163300ab6b..2324815a5bd 100644
--- a/drivers/power/power_fsl.c
+++ b/drivers/power/power_fsl.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <spi.h>
+#include <stdio.h>
 #include <power/pmic.h>
 #include <fsl_pmic.h>
 #include <errno.h>
diff --git a/drivers/power/power_i2c.c b/drivers/power/power_i2c.c
index 41d7113251d..ebf078fe714 100644
--- a/drivers/power/power_i2c.c
+++ b/drivers/power/power_i2c.c
@@ -12,6 +12,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <linux/string.h>
 #include <linux/types.h>
 #include <power/pmic.h>
diff --git a/drivers/power/regulator/lp873x_regulator.c b/drivers/power/regulator/lp873x_regulator.c
index 5b73f54172c..9ec23b6f548 100644
--- a/drivers/power/regulator/lp873x_regulator.c
+++ b/drivers/power/regulator/lp873x_regulator.c
@@ -11,6 +11,7 @@
 #include <errno.h>
 #include <dm.h>
 #include <i2c.h>
+#include <stdio.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/lp873x.h>
diff --git a/drivers/power/regulator/lp87565_regulator.c b/drivers/power/regulator/lp87565_regulator.c
index 4ea6c346d7c..5b14c07b4ce 100644
--- a/drivers/power/regulator/lp87565_regulator.c
+++ b/drivers/power/regulator/lp87565_regulator.c
@@ -12,6 +12,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <log.h>
+#include <stdio.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/lp87565.h>
diff --git a/drivers/power/regulator/palmas_regulator.c b/drivers/power/regulator/palmas_regulator.c
index 9bb8c7ff32a..adbc921e53a 100644
--- a/drivers/power/regulator/palmas_regulator.c
+++ b/drivers/power/regulator/palmas_regulator.c
@@ -11,6 +11,7 @@
 #include <errno.h>
 #include <dm.h>
 #include <i2c.h>
+#include <stdio.h>
 #include <linux/string.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/regulator/pwm_regulator.c b/drivers/power/regulator/pwm_regulator.c
index 185e38e32a4..2031d882953 100644
--- a/drivers/power/regulator/pwm_regulator.c
+++ b/drivers/power/regulator/pwm_regulator.c
@@ -12,6 +12,7 @@
 #include <errno.h>
 #include <log.h>
 #include <pwm.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <dm/device_compat.h>
 #include <power/regulator.h>
diff --git a/drivers/power/regulator/regulator-uclass.c b/drivers/power/regulator/regulator-uclass.c
index c20c42b29d0..2f095d57e8e 100644
--- a/drivers/power/regulator/regulator-uclass.c
+++ b/drivers/power/regulator/regulator-uclass.c
@@ -8,6 +8,7 @@
 #include <errno.h>
 #include <dm.h>
 #include <log.h>
+#include <stdio.h>
 #include <dm/uclass-internal.h>
 #include <linux/delay.h>
 #include <linux/string.h>
diff --git a/drivers/power/regulator/tps65941_regulator.c b/drivers/power/regulator/tps65941_regulator.c
index 150c72d7ec4..c25ca318100 100644
--- a/drivers/power/regulator/tps65941_regulator.c
+++ b/drivers/power/regulator/tps65941_regulator.c
@@ -12,6 +12,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <log.h>
+#include <stdio.h>
 #include <linux/delay.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/twl4030.c b/drivers/power/twl4030.c
index 34e7fa3d720..c62db5f24f5 100644
--- a/drivers/power/twl4030.c
+++ b/drivers/power/twl4030.c
@@ -23,6 +23,7 @@
  */
 
 #include <command.h>
+#include <stdio.h>
 #include <twl4030.h>
 #include <linux/delay.h>
 #include <linux/printk.h>
diff --git a/drivers/power/twl6030.c b/drivers/power/twl6030.c
index 2c5e4960e54..3f9c2550c3d 100644
--- a/drivers/power/twl6030.c
+++ b/drivers/power/twl6030.c
@@ -4,6 +4,7 @@
  * Texas Instruments, <www.ti.com>
  */
 #include <config.h>
+#include <stdio.h>
 #include <linux/delay.h>
 #include <linux/printk.h>
 
diff --git a/drivers/pwm/pwm-imx-util.c b/drivers/pwm/pwm-imx-util.c
index 823a9d2d6bf..3da4cf988a3 100644
--- a/drivers/pwm/pwm-imx-util.c
+++ b/drivers/pwm/pwm-imx-util.c
@@ -12,6 +12,7 @@
 
 #include <common.h>
 #include <div64.h>
+#include <stdio.h>
 #include <asm/arch/imx-regs.h>
 
 /* pwm_id from 0..7 */
diff --git a/drivers/pwm/pwm-mtk.c b/drivers/pwm/pwm-mtk.c
index 7bd82518d67..48acb6d744e 100644
--- a/drivers/pwm/pwm-mtk.c
+++ b/drivers/pwm/pwm-mtk.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <pwm.h>
 #include <div64.h>
+#include <stdio.h>
 #include <linux/bitops.h>
 #include <linux/io.h>
 
diff --git a/drivers/qe/qe.c b/drivers/qe/qe.c
index cfcc247389a..cd3ef178967 100644
--- a/drivers/qe/qe.c
+++ b/drivers/qe/qe.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <malloc.h>
 #include <command.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
 #include <asm/io.h>
diff --git a/drivers/qe/uccf.c b/drivers/qe/uccf.c
index 4d5840e77b1..b4f0a0979c2 100644
--- a/drivers/qe/uccf.c
+++ b/drivers/qe/uccf.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <linux/errno.h>
 #include <asm/io.h>
 #include <linux/immap_qe.h>
diff --git a/drivers/qe/uec.c b/drivers/qe/uec.c
index 3d2a37466a5..d765cd1f595 100644
--- a/drivers/qe/uec.c
+++ b/drivers/qe/uec.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <net.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/qe/uec_phy.c b/drivers/qe/uec_phy.c
index 69a520d4baf..c9beb852def 100644
--- a/drivers/qe/uec_phy.c
+++ b/drivers/qe/uec_phy.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <net.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/immap_qe.h>
diff --git a/drivers/ram/k3-am654-ddrss.c b/drivers/ram/k3-am654-ddrss.c
index 8bbd8cfa836..1ed7c3aabc1 100644
--- a/drivers/ram/k3-am654-ddrss.c
+++ b/drivers/ram/k3-am654-ddrss.c
@@ -11,6 +11,7 @@
 #include <dm.h>
 #include <log.h>
 #include <ram.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <power-domain.h>
 #include <dm.h>
diff --git a/drivers/ram/k3-j721e/k3-j721e-ddrss.c b/drivers/ram/k3-j721e/k3-j721e-ddrss.c
index d647a8a2090..25cdf83922f 100644
--- a/drivers/ram/k3-j721e/k3-j721e-ddrss.c
+++ b/drivers/ram/k3-j721e/k3-j721e-ddrss.c
@@ -11,6 +11,7 @@
 #include <hang.h>
 #include <log.h>
 #include <ram.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <power-domain.h>
 #include <wait_bit.h>
diff --git a/drivers/ram/rockchip/dmc-rk3368.c b/drivers/ram/rockchip/dmc-rk3368.c
index faf291e5763..8795ad1c32c 100644
--- a/drivers/ram/rockchip/dmc-rk3368.c
+++ b/drivers/ram/rockchip/dmc-rk3368.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <hang.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <dt-bindings/memory/rk3368-dmc.h>
 #include <dt-structs.h>
diff --git a/drivers/ram/rockchip/sdram_common.c b/drivers/ram/rockchip/sdram_common.c
index b3e7421d085..5dd68c97682 100644
--- a/drivers/ram/rockchip/sdram_common.c
+++ b/drivers/ram/rockchip/sdram_common.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <debug_uart.h>
 #include <ram.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch-rockchip/sdram.h>
 #include <asm/arch-rockchip/sdram_common.h>
diff --git a/drivers/ram/rockchip/sdram_rk3188.c b/drivers/ram/rockchip/sdram_rk3188.c
index d3ed9bcc29e..a2c36fa3cad 100644
--- a/drivers/ram/rockchip/sdram_rk3188.c
+++ b/drivers/ram/rockchip/sdram_rk3188.c
@@ -16,6 +16,7 @@
 #include <log.h>
 #include <ram.h>
 #include <regmap.h>
+#include <stdio.h>
 #include <syscon.h>
 #include <asm/io.h>
 #include <asm/arch-rockchip/clock.h>
diff --git a/drivers/ram/rockchip/sdram_rk322x.c b/drivers/ram/rockchip/sdram_rk322x.c
index 4154f0c2642..51d87e6d29f 100644
--- a/drivers/ram/rockchip/sdram_rk322x.c
+++ b/drivers/ram/rockchip/sdram_rk322x.c
@@ -10,6 +10,7 @@
 #include <init.h>
 #include <ram.h>
 #include <regmap.h>
+#include <stdio.h>
 #include <syscon.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/ram/rockchip/sdram_rk3288.c b/drivers/ram/rockchip/sdram_rk3288.c
index 01f030e01a1..1063fde3e87 100644
--- a/drivers/ram/rockchip/sdram_rk3288.c
+++ b/drivers/ram/rockchip/sdram_rk3288.c
@@ -16,6 +16,7 @@
 #include <log.h>
 #include <ram.h>
 #include <regmap.h>
+#include <stdio.h>
 #include <syscon.h>
 #include <asm/io.h>
 #include <asm/arch-rockchip/clock.h>
diff --git a/drivers/ram/rockchip/sdram_rk3328.c b/drivers/ram/rockchip/sdram_rk3328.c
index 586e82e6ebc..e61972e322c 100644
--- a/drivers/ram/rockchip/sdram_rk3328.c
+++ b/drivers/ram/rockchip/sdram_rk3328.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <ram.h>
 #include <regmap.h>
+#include <stdio.h>
 #include <syscon.h>
 #include <asm/io.h>
 #include <asm/arch-rockchip/clock.h>
diff --git a/drivers/ram/rockchip/sdram_rk3399.c b/drivers/ram/rockchip/sdram_rk3399.c
index 530c8a2f401..935bfc97b14 100644
--- a/drivers/ram/rockchip/sdram_rk3399.c
+++ b/drivers/ram/rockchip/sdram_rk3399.c
@@ -13,6 +13,7 @@
 #include <log.h>
 #include <ram.h>
 #include <regmap.h>
+#include <stdio.h>
 #include <syscon.h>
 #include <asm/io.h>
 #include <asm/arch-rockchip/clock.h>
diff --git a/drivers/ram/sifive/fu540_ddr.c b/drivers/ram/sifive/fu540_ddr.c
index 7208d350f41..eff6da55ad2 100644
--- a/drivers/ram/sifive/fu540_ddr.c
+++ b/drivers/ram/sifive/fu540_ddr.c
@@ -12,6 +12,7 @@
 #include <init.h>
 #include <ram.h>
 #include <regmap.h>
+#include <stdio.h>
 #include <syscon.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/ram/stm32mp1/stm32mp1_ddr.c b/drivers/ram/stm32mp1/stm32mp1_ddr.c
index 350681bcfe5..911bc2223db 100644
--- a/drivers/ram/stm32mp1/stm32mp1_ddr.c
+++ b/drivers/ram/stm32mp1/stm32mp1_ddr.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <ram.h>
 #include <reset.h>
+#include <stdio.h>
 #include <timer.h>
 #include <asm/io.h>
 #include <asm/arch/ddr.h>
diff --git a/drivers/ram/stm32mp1/stm32mp1_interactive.c b/drivers/ram/stm32mp1/stm32mp1_interactive.c
index 398018e4c25..e758abe9ee9 100644
--- a/drivers/ram/stm32mp1/stm32mp1_interactive.c
+++ b/drivers/ram/stm32mp1/stm32mp1_interactive.c
@@ -12,6 +12,7 @@
 #include <malloc.h>
 #include <ram.h>
 #include <reset.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/global_data.h>
 #include <linux/string.h>
diff --git a/drivers/ram/stm32mp1/stm32mp1_ram.c b/drivers/ram/stm32mp1/stm32mp1_ram.c
index 85e01ffd098..a24788957df 100644
--- a/drivers/ram/stm32mp1/stm32mp1_ram.c
+++ b/drivers/ram/stm32mp1/stm32mp1_ram.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <ram.h>
 #include <regmap.h>
+#include <stdio.h>
 #include <syscon.h>
 #include <asm/io.h>
 #include <linux/printk.h>
diff --git a/drivers/ram/stm32mp1/stm32mp1_tests.c b/drivers/ram/stm32mp1/stm32mp1_tests.c
index a5433ac1402..2d73b768b49 100644
--- a/drivers/ram/stm32mp1/stm32mp1_tests.c
+++ b/drivers/ram/stm32mp1/stm32mp1_tests.c
@@ -7,6 +7,7 @@
 #include <init.h>
 #include <log.h>
 #include <rand.h>
+#include <stdio.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 222777ad3cf..8707dead754 100644
--- a/drivers/ram/stm32mp1/stm32mp1_tuning.c
+++ b/drivers/ram/stm32mp1/stm32mp1_tuning.c
@@ -9,6 +9,7 @@
 #include <ram.h>
 #include <rand.h>
 #include <reset.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/drivers/remoteproc/ti_k3_r5f_rproc.c b/drivers/remoteproc/ti_k3_r5f_rproc.c
index c3018d74a47..964a75309ad 100644
--- a/drivers/remoteproc/ti_k3_r5f_rproc.c
+++ b/drivers/remoteproc/ti_k3_r5f_rproc.c
@@ -14,6 +14,7 @@
 #include <errno.h>
 #include <clk.h>
 #include <reset.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <dm/device_compat.h>
 #include <linux/err.h>
diff --git a/drivers/reset/reset-socfpga.c b/drivers/reset/reset-socfpga.c
index 830eda9430e..87daf65d7fe 100644
--- a/drivers/reset/reset-socfpga.c
+++ b/drivers/reset/reset-socfpga.c
@@ -16,6 +16,7 @@
 #include <dm.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <dm/lists.h>
 #include <dm/of_access.h>
 #include <env.h>
diff --git a/drivers/reset/reset-sunxi.c b/drivers/reset/reset-sunxi.c
index 05f7f599ce3..b9ca80e9b02 100644
--- a/drivers/reset/reset-sunxi.c
+++ b/drivers/reset/reset-sunxi.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <reset-uclass.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <dm/lists.h>
 #include <linux/bitops.h>
diff --git a/drivers/rng/stm32mp1_rng.c b/drivers/rng/stm32mp1_rng.c
index 4354edd4a1b..32f8cebb687 100644
--- a/drivers/rng/stm32mp1_rng.c
+++ b/drivers/rng/stm32mp1_rng.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <reset.h>
 #include <rng.h>
+#include <stdio.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/string.h>
diff --git a/drivers/rtc/davinci.c b/drivers/rtc/davinci.c
index c446e7a735f..fe6a21fdf00 100644
--- a/drivers/rtc/davinci.c
+++ b/drivers/rtc/davinci.c
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <log.h>
 #include <rtc.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/davinci_rtc.h>
 #include <linux/delay.h>
diff --git a/drivers/rtc/ds1302.c b/drivers/rtc/ds1302.c
index 21655085d1b..2667f149baf 100644
--- a/drivers/rtc/ds1302.c
+++ b/drivers/rtc/ds1302.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <command.h>
 #include <rtc.h>
+#include <stdio.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 
diff --git a/drivers/rtc/ds1307.c b/drivers/rtc/ds1307.c
index 17344d4d4ff..acdae077c40 100644
--- a/drivers/rtc/ds1307.c
+++ b/drivers/rtc/ds1307.c
@@ -19,6 +19,7 @@
 #include <log.h>
 #include <rtc.h>
 #include <i2c.h>
+#include <stdio.h>
 
 enum ds_type {
 	ds_1307,
diff --git a/drivers/rtc/ds1337.c b/drivers/rtc/ds1337.c
index 4986c96f862..9b9a9d6a810 100644
--- a/drivers/rtc/ds1337.c
+++ b/drivers/rtc/ds1337.c
@@ -17,6 +17,7 @@
 #include <log.h>
 #include <rtc.h>
 #include <i2c.h>
+#include <stdio.h>
 
 /*
  * RTC register addresses
diff --git a/drivers/rtc/ds1374.c b/drivers/rtc/ds1374.c
index 9f2647d707e..5ca0e32b50c 100644
--- a/drivers/rtc/ds1374.c
+++ b/drivers/rtc/ds1374.c
@@ -17,6 +17,7 @@
 #include <command.h>
 #include <rtc.h>
 #include <i2c.h>
+#include <stdio.h>
 
 /*---------------------------------------------------------------------*/
 #undef DEBUG_RTC
diff --git a/drivers/rtc/ds1556.c b/drivers/rtc/ds1556.c
index 687b32937a0..27bf4281698 100644
--- a/drivers/rtc/ds1556.c
+++ b/drivers/rtc/ds1556.c
@@ -18,6 +18,7 @@
 #include <common.h>
 #include <command.h>
 #include <rtc.h>
+#include <stdio.h>
 
 #if defined(CONFIG_CMD_DATE)
 
diff --git a/drivers/rtc/ds164x.c b/drivers/rtc/ds164x.c
index f8707892e71..b363908e79a 100644
--- a/drivers/rtc/ds164x.c
+++ b/drivers/rtc/ds164x.c
@@ -18,6 +18,7 @@
 #include <common.h>
 #include <command.h>
 #include <rtc.h>
+#include <stdio.h>
 
 
 static uchar    rtc_read(unsigned int addr );
diff --git a/drivers/rtc/ds174x.c b/drivers/rtc/ds174x.c
index a7bd3e02509..827c06b2b47 100644
--- a/drivers/rtc/ds174x.c
+++ b/drivers/rtc/ds174x.c
@@ -15,6 +15,7 @@
 #include <common.h>
 #include <command.h>
 #include <rtc.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 
 static uchar rtc_read( unsigned int addr );
diff --git a/drivers/rtc/ds3231.c b/drivers/rtc/ds3231.c
index 5b72e86768a..328b03ed05d 100644
--- a/drivers/rtc/ds3231.c
+++ b/drivers/rtc/ds3231.c
@@ -20,6 +20,7 @@
 #include <log.h>
 #include <rtc.h>
 #include <i2c.h>
+#include <stdio.h>
 
 /*
  * RTC register addresses
diff --git a/drivers/rtc/imxdi.c b/drivers/rtc/imxdi.c
index e3a1393266c..55def3ac9fd 100644
--- a/drivers/rtc/imxdi.c
+++ b/drivers/rtc/imxdi.c
@@ -14,6 +14,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <stdio.h>
 #include <linux/compat.h>
 #include <rtc.h>
 #include <linux/delay.h>
diff --git a/drivers/rtc/isl1208.c b/drivers/rtc/isl1208.c
index 59a60b75b30..47c48bfc11f 100644
--- a/drivers/rtc/isl1208.c
+++ b/drivers/rtc/isl1208.c
@@ -16,6 +16,7 @@
 #include <dm.h>
 #include <rtc.h>
 #include <i2c.h>
+#include <stdio.h>
 
 /*---------------------------------------------------------------------*/
 #ifdef DEBUG_RTC
diff --git a/drivers/rtc/m41t11.c b/drivers/rtc/m41t11.c
index 706b7188cf8..469551980a9 100644
--- a/drivers/rtc/m41t11.c
+++ b/drivers/rtc/m41t11.c
@@ -16,6 +16,7 @@
 #include <log.h>
 #include <rtc.h>
 #include <i2c.h>
+#include <stdio.h>
 
 /*
 	I Don't have an example config file but this
diff --git a/drivers/rtc/m41t60.c b/drivers/rtc/m41t60.c
index 692042b9351..21775a5aed6 100644
--- a/drivers/rtc/m41t60.c
+++ b/drivers/rtc/m41t60.c
@@ -21,6 +21,7 @@
 #include <log.h>
 #include <rtc.h>
 #include <i2c.h>
+#include <stdio.h>
 
 /*
  * Convert between century and "century bits" (CB1 and CB0).  These routines
diff --git a/drivers/rtc/m41t62.c b/drivers/rtc/m41t62.c
index 94a6b523aab..23ebaddf941 100644
--- a/drivers/rtc/m41t62.c
+++ b/drivers/rtc/m41t62.c
@@ -22,6 +22,7 @@
 #include <log.h>
 #include <rtc.h>
 #include <i2c.h>
+#include <stdio.h>
 
 #define M41T62_REG_SSEC	0
 #define M41T62_REG_SEC	1
diff --git a/drivers/rtc/mc146818.c b/drivers/rtc/mc146818.c
index 5ef086d6006..7c25afb1819 100644
--- a/drivers/rtc/mc146818.c
+++ b/drivers/rtc/mc146818.c
@@ -12,6 +12,7 @@
 #include <command.h>
 #include <dm.h>
 #include <rtc.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 
 #if defined(CONFIG_X86) || defined(CONFIG_MALTA)
diff --git a/drivers/rtc/mcfrtc.c b/drivers/rtc/mcfrtc.c
index e10638ec7dd..f86caae9eb2 100644
--- a/drivers/rtc/mcfrtc.c
+++ b/drivers/rtc/mcfrtc.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 
 #include <command.h>
 #include <rtc.h>
diff --git a/drivers/rtc/mvrtc.c b/drivers/rtc/mvrtc.c
index ed057f7bc4e..6a0224cad73 100644
--- a/drivers/rtc/mvrtc.c
+++ b/drivers/rtc/mvrtc.c
@@ -12,6 +12,7 @@
 #include <command.h>
 #include <dm.h>
 #include <rtc.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/delay.h>
 #include "mvrtc.h"
diff --git a/drivers/rtc/mxsrtc.c b/drivers/rtc/mxsrtc.c
index be899a92540..ec0c631cc49 100644
--- a/drivers/rtc/mxsrtc.c
+++ b/drivers/rtc/mxsrtc.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <rtc.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
diff --git a/drivers/rtc/pcf2127.c b/drivers/rtc/pcf2127.c
index 88ff8c52c35..e4ab395f514 100644
--- a/drivers/rtc/pcf2127.c
+++ b/drivers/rtc/pcf2127.c
@@ -11,6 +11,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <rtc.h>
+#include <stdio.h>
 
 #define PCF2127_REG_CTRL1	0x00
 #define PCF2127_REG_CTRL2	0x01
diff --git a/drivers/rtc/pcf8563.c b/drivers/rtc/pcf8563.c
index 19faefba7c8..79d1b71a0cf 100644
--- a/drivers/rtc/pcf8563.c
+++ b/drivers/rtc/pcf8563.c
@@ -16,6 +16,7 @@
 #include <log.h>
 #include <rtc.h>
 #include <i2c.h>
+#include <stdio.h>
 
 #if !CONFIG_IS_ENABLED(DM_RTC)
 static uchar rtc_read  (uchar reg);
diff --git a/drivers/rtc/pt7c4338.c b/drivers/rtc/pt7c4338.c
index c987494b669..4718229657e 100644
--- a/drivers/rtc/pt7c4338.c
+++ b/drivers/rtc/pt7c4338.c
@@ -24,6 +24,7 @@
 #include <log.h>
 #include <rtc.h>
 #include <i2c.h>
+#include <stdio.h>
 
 /* RTC register addresses */
 #define RTC_SEC_REG_ADDR        0x0
diff --git a/drivers/rtc/rs5c372.c b/drivers/rtc/rs5c372.c
index 64ff8c89d40..e9a3329a731 100644
--- a/drivers/rtc/rs5c372.c
+++ b/drivers/rtc/rs5c372.c
@@ -23,6 +23,7 @@
 #include <command.h>
 #include <rtc.h>
 #include <i2c.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 /*
diff --git a/drivers/rtc/rv3029.c b/drivers/rtc/rv3029.c
index 188560d3d45..4dddf62aca8 100644
--- a/drivers/rtc/rv3029.c
+++ b/drivers/rtc/rv3029.c
@@ -14,6 +14,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <rtc.h>
+#include <stdio.h>
 #include <time.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
diff --git a/drivers/rtc/rv8803.c b/drivers/rtc/rv8803.c
index acd50c65648..5e16676c04c 100644
--- a/drivers/rtc/rv8803.c
+++ b/drivers/rtc/rv8803.c
@@ -16,6 +16,7 @@
 #include <log.h>
 #include <rtc.h>
 #include <i2c.h>
+#include <stdio.h>
 #include <linux/bitops.h>
 
 /*
diff --git a/drivers/rtc/rx8010sj.c b/drivers/rtc/rx8010sj.c
index d513561b820..1d9b7cd6358 100644
--- a/drivers/rtc/rx8010sj.c
+++ b/drivers/rtc/rx8010sj.c
@@ -21,6 +21,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <rtc.h>
+#include <stdio.h>
 #include <linux/bitops.h>
 
 /*---------------------------------------------------------------------*/
diff --git a/drivers/rtc/rx8025.c b/drivers/rtc/rx8025.c
index e717dcbbfe3..7fd04d999b0 100644
--- a/drivers/rtc/rx8025.c
+++ b/drivers/rtc/rx8025.c
@@ -13,6 +13,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <rtc.h>
+#include <stdio.h>
 
 /*---------------------------------------------------------------------*/
 #undef DEBUG_RTC
diff --git a/drivers/rtc/s35392a.c b/drivers/rtc/s35392a.c
index 80f55c86233..5d70ed1ecda 100644
--- a/drivers/rtc/s35392a.c
+++ b/drivers/rtc/s35392a.c
@@ -21,6 +21,7 @@
 #include <common.h>
 #include <dm.h>
 #include <i2c.h>
+#include <stdio.h>
 #include <linux/bitrev.h>
 #include <rtc.h>
 #include <linux/delay.h>
diff --git a/drivers/rtc/s3c24x0_rtc.c b/drivers/rtc/s3c24x0_rtc.c
index 96ea3cf878e..807347a9149 100644
--- a/drivers/rtc/s3c24x0_rtc.c
+++ b/drivers/rtc/s3c24x0_rtc.c
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <stdio.h>
 
 #include <asm/arch/s3c24x0_cpu.h>
 
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
index 2492c3394b9..6f940d23e7a 100644
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -13,6 +13,7 @@
 #include <part.h>
 #include <pci.h>
 #include <scsi.h>
+#include <stdio.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 7ad61d8d39f..86fec934c1e 100644
--- a/drivers/serial/serial-uclass.c
+++ b/drivers/serial/serial-uclass.c
@@ -10,6 +10,7 @@
 #include <malloc.h>
 #include <os.h>
 #include <serial.h>
+#include <stdio.h>
 #include <stdio_dev.h>
 #include <watchdog.h>
 #include <asm/global_data.h>
diff --git a/drivers/serial/serial.c b/drivers/serial/serial.c
index 4b9a2333801..ac967b1648d 100644
--- a/drivers/serial/serial.c
+++ b/drivers/serial/serial.c
@@ -8,6 +8,7 @@
 #include <env_internal.h>
 #include <hang.h>
 #include <serial.h>
+#include <stdio.h>
 #include <stdio_dev.h>
 #include <post.h>
 #include <asm/global_data.h>
diff --git a/drivers/soc/ti/keystone_serdes.c b/drivers/soc/ti/keystone_serdes.c
index 2ece1a8f647..f2a5c18b80b 100644
--- a/drivers/soc/ti/keystone_serdes.c
+++ b/drivers/soc/ti/keystone_serdes.c
@@ -8,6 +8,7 @@
 
 #include <errno.h>
 #include <common.h>
+#include <stdio.h>
 #include <asm/ti-common/keystone_serdes.h>
 #include <linux/bitops.h>
 
diff --git a/drivers/sound/hda_codec.c b/drivers/sound/hda_codec.c
index 4154d293998..93820d77802 100644
--- a/drivers/sound/hda_codec.c
+++ b/drivers/sound/hda_codec.c
@@ -13,6 +13,7 @@
 #include <log.h>
 #include <pci.h>
 #include <sound.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <dt-bindings/sound/azalia.h>
 #include <linux/bitops.h>
diff --git a/drivers/spi/atcspi200_spi.c b/drivers/spi/atcspi200_spi.c
index 7ba208baf2e..79bcd12367b 100644
--- a/drivers/spi/atcspi200_spi.c
+++ b/drivers/spi/atcspi200_spi.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <spi.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm.h>
diff --git a/drivers/spi/bcm63xx_hsspi.c b/drivers/spi/bcm63xx_hsspi.c
index f30a8a42bd4..f5914380248 100644
--- a/drivers/spi/bcm63xx_hsspi.c
+++ b/drivers/spi/bcm63xx_hsspi.c
@@ -14,6 +14,7 @@
 #include <malloc.h>
 #include <spi.h>
 #include <reset.h>
+#include <stdio.h>
 #include <wait_bit.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
diff --git a/drivers/spi/bcm63xx_spi.c b/drivers/spi/bcm63xx_spi.c
index acc1a493c4e..a5550a214e8 100644
--- a/drivers/spi/bcm63xx_spi.c
+++ b/drivers/spi/bcm63xx_spi.c
@@ -14,6 +14,7 @@
 #include <malloc.h>
 #include <spi.h>
 #include <reset.h>
+#include <stdio.h>
 #include <wait_bit.h>
 #include <asm/io.h>
 
diff --git a/drivers/spi/bcmstb_spi.c b/drivers/spi/bcmstb_spi.c
index 40364fbf57c..5879a7883b1 100644
--- a/drivers/spi/bcmstb_spi.c
+++ b/drivers/spi/bcmstb_spi.c
@@ -5,6 +5,7 @@
  * Author: Thomas Fitzsimmons <fitzsim@fitzsim.org>
  */
 
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <command.h>
diff --git a/drivers/spi/cadence_qspi.c b/drivers/spi/cadence_qspi.c
index 1e857492090..4b77a6b4b72 100644
--- a/drivers/spi/cadence_qspi.c
+++ b/drivers/spi/cadence_qspi.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <clk.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm-generic/io.h>
 #include <dm.h>
 #include <fdtdec.h>
diff --git a/drivers/spi/cadence_qspi_apb.c b/drivers/spi/cadence_qspi_apb.c
index f1f510ef65f..d97b299a93c 100644
--- a/drivers/spi/cadence_qspi_apb.c
+++ b/drivers/spi/cadence_qspi_apb.c
@@ -27,6 +27,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/io.h>
 #include <dma.h>
diff --git a/drivers/spi/cf_spi.c b/drivers/spi/cf_spi.c
index 0f39fe84398..a6a5c7f17c9 100644
--- a/drivers/spi/cf_spi.c
+++ b/drivers/spi/cf_spi.c
@@ -16,6 +16,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <dm/platform_data/spi_coldfire.h>
 #include <spi.h>
diff --git a/drivers/spi/davinci_spi.c b/drivers/spi/davinci_spi.c
index c1b21a8cd35..3d1c0b58070 100644
--- a/drivers/spi/davinci_spi.c
+++ b/drivers/spi/davinci_spi.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <spi.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
diff --git a/drivers/spi/designware_spi.c b/drivers/spi/designware_spi.c
index 2559aac2e94..3838504455a 100644
--- a/drivers/spi/designware_spi.c
+++ b/drivers/spi/designware_spi.c
@@ -11,6 +11,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm-generic/gpio.h>
 #include <clk.h>
 #include <dm.h>
diff --git a/drivers/spi/kirkwood_spi.c b/drivers/spi/kirkwood_spi.c
index dc7d2bc1f01..3659e5e8ade 100644
--- a/drivers/spi/kirkwood_spi.c
+++ b/drivers/spi/kirkwood_spi.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <spi.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/soc.h>
 #ifdef CONFIG_ARCH_KIRKWOOD
diff --git a/drivers/spi/mpc8xx_spi.c b/drivers/spi/mpc8xx_spi.c
index 0026ad23e37..2b08756497a 100644
--- a/drivers/spi/mpc8xx_spi.c
+++ b/drivers/spi/mpc8xx_spi.c
@@ -20,6 +20,7 @@
 #include <dm.h>
 #include <mpc8xx.h>
 #include <spi.h>
+#include <stdio.h>
 #include <linux/delay.h>
 
 #include <asm/cpm_8xx.h>
diff --git a/drivers/spi/mpc8xxx_spi.c b/drivers/spi/mpc8xxx_spi.c
index 4f4b7ea22e0..b7fd47984de 100644
--- a/drivers/spi/mpc8xxx_spi.c
+++ b/drivers/spi/mpc8xxx_spi.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <spi.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/mpc8xxx_spi.h>
 #include <asm-generic/gpio.h>
diff --git a/drivers/spi/mt7621_spi.c b/drivers/spi/mt7621_spi.c
index f13d21f5b2c..786afaaa9cd 100644
--- a/drivers/spi/mt7621_spi.c
+++ b/drivers/spi/mt7621_spi.c
@@ -13,6 +13,7 @@
 #include <dm.h>
 #include <log.h>
 #include <spi.h>
+#include <stdio.h>
 #include <wait_bit.h>
 #include <linux/bitops.h>
 #include <linux/io.h>
diff --git a/drivers/spi/mtk_snfi_spi.c b/drivers/spi/mtk_snfi_spi.c
index 7f5d78e357e..bd9b79929a9 100644
--- a/drivers/spi/mtk_snfi_spi.c
+++ b/drivers/spi/mtk_snfi_spi.c
@@ -12,6 +12,7 @@
 #include <spi.h>
 #include <spi-mem.h>
 #include <stdbool.h>
+#include <stdio.h>
 #include <watchdog.h>
 #include <dm/pinctrl.h>
 #include <linux/bitops.h>
diff --git a/drivers/spi/mxc_spi.c b/drivers/spi/mxc_spi.c
index a2dbd8a96de..00e3b596227 100644
--- a/drivers/spi/mxc_spi.c
+++ b/drivers/spi/mxc_spi.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <spi.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/global_data.h>
 #include <dm/device_compat.h>
diff --git a/drivers/spi/mxs_spi.c b/drivers/spi/mxs_spi.c
index 8d7bb35d02f..8c541dc03e6 100644
--- a/drivers/spi/mxs_spi.c
+++ b/drivers/spi/mxs_spi.c
@@ -21,6 +21,7 @@
 #include <malloc.h>
 #include <memalign.h>
 #include <spi.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
diff --git a/drivers/spi/omap3_spi.c b/drivers/spi/omap3_spi.c
index 942db5ca5ba..3cee5a7fccd 100644
--- a/drivers/spi/omap3_spi.c
+++ b/drivers/spi/omap3_spi.c
@@ -20,6 +20,7 @@
 #include <dm.h>
 #include <spi.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/spi/pic32_spi.c b/drivers/spi/pic32_spi.c
index d08c26c8f4f..4eb039f3579 100644
--- a/drivers/spi/pic32_spi.c
+++ b/drivers/spi/pic32_spi.c
@@ -10,6 +10,7 @@
 #include <clk.h>
 #include <dm.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
diff --git a/drivers/spi/renesas_rpc_spi.c b/drivers/spi/renesas_rpc_spi.c
index 1ceb7294bb6..9090667bf0f 100644
--- a/drivers/spi/renesas_rpc_spi.c
+++ b/drivers/spi/renesas_rpc_spi.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <clk.h>
diff --git a/drivers/spi/sandbox_spi.c b/drivers/spi/sandbox_spi.c
index 755f1768614..d7cef659ea4 100644
--- a/drivers/spi/sandbox_spi.c
+++ b/drivers/spi/sandbox_spi.c
@@ -17,6 +17,7 @@
 #include <spi.h>
 #include <spi_flash.h>
 #include <os.h>
+#include <stdio.h>
 
 #include <linux/errno.h>
 #include <asm/spi.h>
diff --git a/drivers/spi/sh_qspi.c b/drivers/spi/sh_qspi.c
index aa1c03047e2..49f3fdb6928 100644
--- a/drivers/spi/sh_qspi.c
+++ b/drivers/spi/sh_qspi.c
@@ -10,6 +10,7 @@
 #include <console.h>
 #include <malloc.h>
 #include <spi.h>
+#include <stdio.h>
 #include <wait_bit.h>
 #include <asm/arch/rmobile.h>
 #include <asm/io.h>
diff --git a/drivers/spi/spi-sifive.c b/drivers/spi/spi-sifive.c
index 87635cf5bec..026ef439ef9 100644
--- a/drivers/spi/spi-sifive.c
+++ b/drivers/spi/spi-sifive.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <stdio.h>
 #include <dm/device_compat.h>
 #include <malloc.h>
 #include <spi-mem.h>
diff --git a/drivers/spi/spi-sunxi.c b/drivers/spi/spi-sunxi.c
index be6ef1757a0..3b1e9fc2284 100644
--- a/drivers/spi/spi-sunxi.c
+++ b/drivers/spi/spi-sunxi.c
@@ -26,6 +26,7 @@
 #include <errno.h>
 #include <fdt_support.h>
 #include <reset.h>
+#include <stdio.h>
 #include <wait_bit.h>
 #include <asm/global_data.h>
 #include <dm/device_compat.h>
diff --git a/drivers/spi/spi-uclass.c b/drivers/spi/spi-uclass.c
index 46b5249f509..56869c125af 100644
--- a/drivers/spi/spi-uclass.c
+++ b/drivers/spi/spi-uclass.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <spi.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 426d30c6b21..7662932d40a 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -7,6 +7,7 @@
 #include <fdtdec.h>
 #include <malloc.h>
 #include <spi.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 int spi_set_wordlen(struct spi_slave *slave, unsigned int wordlen)
diff --git a/drivers/spi/tegra114_spi.c b/drivers/spi/tegra114_spi.c
index 0e8198c5a02..1b7246af258 100644
--- a/drivers/spi/tegra114_spi.c
+++ b/drivers/spi/tegra114_spi.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
diff --git a/drivers/spi/tegra20_sflash.c b/drivers/spi/tegra20_sflash.c
index 5066f43ba61..7b81e785215 100644
--- a/drivers/spi/tegra20_sflash.c
+++ b/drivers/spi/tegra20_sflash.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/spi/tegra20_slink.c b/drivers/spi/tegra20_slink.c
index d725a957485..64485de5d32 100644
--- a/drivers/spi/tegra20_slink.c
+++ b/drivers/spi/tegra20_slink.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/spi/tegra210_qspi.c b/drivers/spi/tegra210_qspi.c
index 90ac21f8ad9..19e50919f6d 100644
--- a/drivers/spi/tegra210_qspi.c
+++ b/drivers/spi/tegra210_qspi.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/spi/ti_qspi.c b/drivers/spi/ti_qspi.c
index 26cd83be76a..ba97f3ece77 100644
--- a/drivers/spi/ti_qspi.c
+++ b/drivers/spi/ti_qspi.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/spi/xilinx_spi.c b/drivers/spi/xilinx_spi.c
index 348630faf38..6b1cea4519e 100644
--- a/drivers/spi/xilinx_spi.c
+++ b/drivers/spi/xilinx_spi.c
@@ -19,6 +19,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <spi.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <wait_bit.h>
 #include <linux/bitops.h>
diff --git a/drivers/spi/zynq_qspi.c b/drivers/spi/zynq_qspi.c
index 7607c510249..a1022ad496e 100644
--- a/drivers/spi/zynq_qspi.c
+++ b/drivers/spi/zynq_qspi.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <spi.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/spi/zynq_spi.c b/drivers/spi/zynq_spi.c
index b4604a4b202..bbac203e0dd 100644
--- a/drivers/spi/zynq_spi.c
+++ b/drivers/spi/zynq_spi.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <spi.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/spi/zynqmp_gqspi.c b/drivers/spi/zynqmp_gqspi.c
index 151618a99f4..01186f3c039 100644
--- a/drivers/spi/zynqmp_gqspi.c
+++ b/drivers/spi/zynqmp_gqspi.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
diff --git a/drivers/spmi/spmi-msm.c b/drivers/spmi/spmi-msm.c
index 6b12a96ee3c..1f9b3c31008 100644
--- a/drivers/spmi/spmi-msm.c
+++ b/drivers/spmi/spmi-msm.c
@@ -11,6 +11,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <fdtdec.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm/device_compat.h>
diff --git a/drivers/sysreset/sysreset-uclass.c b/drivers/sysreset/sysreset-uclass.c
index c39711e21b7..717e2fc9453 100644
--- a/drivers/sysreset/sysreset-uclass.c
+++ b/drivers/sysreset/sysreset-uclass.c
@@ -11,6 +11,7 @@
 #include <cpu_func.h>
 #include <hang.h>
 #include <log.h>
+#include <stdio.h>
 #include <sysreset.h>
 #include <dm.h>
 #include <errno.h>
diff --git a/drivers/sysreset/sysreset_microblaze.c b/drivers/sysreset/sysreset_microblaze.c
index 514c95817f2..b45e894440d 100644
--- a/drivers/sysreset/sysreset_microblaze.c
+++ b/drivers/sysreset/sysreset_microblaze.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
+#include <stdio.h>
 #include <sysreset.h>
 #include <linux/err.h>
 
diff --git a/drivers/sysreset/sysreset_mpc83xx.c b/drivers/sysreset/sysreset_mpc83xx.c
index ddd7e26d696..0f86e89b90a 100644
--- a/drivers/sysreset/sysreset_mpc83xx.c
+++ b/drivers/sysreset/sysreset_mpc83xx.c
@@ -8,6 +8,7 @@
 #include <command.h>
 #include <dm.h>
 #include <log.h>
+#include <stdio.h>
 #include <sysreset.h>
 #include <wait_bit.h>
 #include <asm/global_data.h>
diff --git a/drivers/sysreset/sysreset_socfpga_s10.c b/drivers/sysreset/sysreset_socfpga_s10.c
index 9837aadf64b..b109320eedd 100644
--- a/drivers/sysreset/sysreset_socfpga_s10.c
+++ b/drivers/sysreset/sysreset_socfpga_s10.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
+#include <stdio.h>
 #include <sysreset.h>
 #include <asm/arch/mailbox_s10.h>
 
diff --git a/drivers/tee/sandbox.c b/drivers/tee/sandbox.c
index 2f174fa00f9..00e6f91df98 100644
--- a/drivers/tee/sandbox.c
+++ b/drivers/tee/sandbox.c
@@ -5,6 +5,7 @@
 #include <common.h>
 #include <dm.h>
 #include <sandboxtee.h>
+#include <stdio.h>
 #include <tee.h>
 #include <linux/string.h>
 #include <tee/optee_ta_avb.h>
diff --git a/drivers/thermal/imx_scu_thermal.c b/drivers/thermal/imx_scu_thermal.c
index b3c823ffcb7..9b2f74636a5 100644
--- a/drivers/thermal/imx_scu_thermal.c
+++ b/drivers/thermal/imx_scu_thermal.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
+#include <stdio.h>
 #include <thermal.h>
 #include <asm/global_data.h>
 #include <dm/device-internal.h>
diff --git a/drivers/thermal/imx_thermal.c b/drivers/thermal/imx_thermal.c
index 101bd5ef2d7..82e8f8e6512 100644
--- a/drivers/thermal/imx_thermal.c
+++ b/drivers/thermal/imx_thermal.c
@@ -10,6 +10,7 @@
 #include <div64.h>
 #include <fuse.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/sys_proto.h>
diff --git a/drivers/thermal/imx_tmu.c b/drivers/thermal/imx_tmu.c
index b9bdec00c6d..6ec16a35f27 100644
--- a/drivers/thermal/imx_tmu.c
+++ b/drivers/thermal/imx_tmu.c
@@ -6,6 +6,7 @@
 
 #include <config.h>
 #include <common.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
diff --git a/drivers/tpm/cr50_i2c.c b/drivers/tpm/cr50_i2c.c
index 611dd534dc3..8a1c65bbe8c 100644
--- a/drivers/tpm/cr50_i2c.c
+++ b/drivers/tpm/cr50_i2c.c
@@ -13,6 +13,7 @@
 #include <irq.h>
 #include <log.h>
 #include <spl.h>
+#include <stdio.h>
 #include <time.h>
 #include <tpm-v2.h>
 #include <asm/gpio.h>
diff --git a/drivers/tpm/tpm2_tis_sandbox.c b/drivers/tpm/tpm2_tis_sandbox.c
index 708d030f5eb..70e4e258db1 100644
--- a/drivers/tpm/tpm2_tis_sandbox.c
+++ b/drivers/tpm/tpm2_tis_sandbox.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <stdio.h>
 #include <tpm-v2.h>
 #include <asm/state.h>
 #include <asm/unaligned.h>
diff --git a/drivers/tpm/tpm_atmel_twi.c b/drivers/tpm/tpm_atmel_twi.c
index ade72c05638..c8b597d43cc 100644
--- a/drivers/tpm/tpm_atmel_twi.c
+++ b/drivers/tpm/tpm_atmel_twi.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <display_options.h>
 #include <dm.h>
+#include <stdio.h>
 #include <time.h>
 #include <tpm-v1.h>
 #include <i2c.h>
diff --git a/drivers/tpm/tpm_tis_lpc.c b/drivers/tpm/tpm_tis_lpc.c
index 8929b269ddf..9ef0f334733 100644
--- a/drivers/tpm/tpm_tis_lpc.c
+++ b/drivers/tpm/tpm_tis_lpc.c
@@ -16,6 +16,7 @@
 #include <dm.h>
 #include <log.h>
 #include <mapmem.h>
+#include <stdio.h>
 #include <tpm-v1.h>
 #include <asm/io.h>
 #include <linux/delay.h>
diff --git a/drivers/tpm/tpm_tis_sandbox.c b/drivers/tpm/tpm_tis_sandbox.c
index d923e9723ae..bc96c7354d8 100644
--- a/drivers/tpm/tpm_tis_sandbox.c
+++ b/drivers/tpm/tpm_tis_sandbox.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <display_options.h>
 #include <dm.h>
+#include <stdio.h>
 #include <tpm-v1.h>
 #include <asm/state.h>
 #include <asm/unaligned.h>
diff --git a/drivers/ufs/ufs.c b/drivers/ufs/ufs.c
index 71132314c22..ee2f9dbf588 100644
--- a/drivers/ufs/ufs.c
+++ b/drivers/ufs/ufs.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <dm/device_compat.h>
 #include <dm/devres.h>
diff --git a/drivers/usb/cdns3/core.c b/drivers/usb/cdns3/core.c
index ea86a250608..d5fb8a0edb3 100644
--- a/drivers/usb/cdns3/core.c
+++ b/drivers/usb/cdns3/core.c
@@ -14,6 +14,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <stdio.h>
 #include <dm/device-internal.h>
 #include <dm/device_compat.h>
 #include <dm/devres.h>
diff --git a/drivers/usb/common/fsl-dt-fixup.c b/drivers/usb/common/fsl-dt-fixup.c
index bda8885d7cd..b62b120d96f 100644
--- a/drivers/usb/common/fsl-dt-fixup.c
+++ b/drivers/usb/common/fsl-dt-fixup.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <usb.h>
 #include <asm/io.h>
 #include <hwconfig.h>
diff --git a/drivers/usb/eth/asix.c b/drivers/usb/eth/asix.c
index c649813600b..cbf2b12ffb0 100644
--- a/drivers/usb/eth/asix.c
+++ b/drivers/usb/eth/asix.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <log.h>
 #include <net.h>
+#include <stdio.h>
 #include <usb.h>
 #include <malloc.h>
 #include <memalign.h>
diff --git a/drivers/usb/eth/asix88179.c b/drivers/usb/eth/asix88179.c
index f26b47dcb6a..fa983257f30 100644
--- a/drivers/usb/eth/asix88179.c
+++ b/drivers/usb/eth/asix88179.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <stdio.h>
 #include <usb.h>
 #include <net.h>
 #include <asm/u-boot.h>
diff --git a/drivers/usb/eth/lan7x.c b/drivers/usb/eth/lan7x.c
index b1483612783..d4fcda1ecd3 100644
--- a/drivers/usb/eth/lan7x.c
+++ b/drivers/usb/eth/lan7x.c
@@ -9,6 +9,7 @@
 #include <miiphy.h>
 #include <memalign.h>
 #include <net.h>
+#include <stdio.h>
 #include <usb.h>
 #include <linux/ethtool.h>
 #include <linux/mii.h>
diff --git a/drivers/usb/eth/lan7x.h b/drivers/usb/eth/lan7x.h
index f71e8c7268c..feec7427a41 100644
--- a/drivers/usb/eth/lan7x.h
+++ b/drivers/usb/eth/lan7x.h
@@ -4,6 +4,7 @@
  */
 
 #include <console.h>
+#include <stdio.h>
 #include <time.h>
 #include <watchdog.h>
 #include <linux/bitops.h>
diff --git a/drivers/usb/eth/r8152.c b/drivers/usb/eth/r8152.c
index 0f37a5aaea5..d1b51201a35 100644
--- a/drivers/usb/eth/r8152.c
+++ b/drivers/usb/eth/r8152.c
@@ -11,6 +11,7 @@
 #include <malloc.h>
 #include <memalign.h>
 #include <net.h>
+#include <stdio.h>
 #include <usb.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
diff --git a/drivers/usb/eth/smsc95xx.c b/drivers/usb/eth/smsc95xx.c
index f12e67bf238..fb645f22e42 100644
--- a/drivers/usb/eth/smsc95xx.c
+++ b/drivers/usb/eth/smsc95xx.c
@@ -13,6 +13,7 @@
 #include <malloc.h>
 #include <memalign.h>
 #include <net.h>
+#include <stdio.h>
 #include <time.h>
 #include <usb.h>
 #include <asm/u-boot.h>
diff --git a/drivers/usb/eth/usb_ether.c b/drivers/usb/eth/usb_ether.c
index 91f34ab175d..097425b7afa 100644
--- a/drivers/usb/eth/usb_ether.c
+++ b/drivers/usb/eth/usb_ether.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <net.h>
+#include <stdio.h>
 #include <usb.h>
 #include <asm/cache.h>
 #include <dm/device-internal.h>
diff --git a/drivers/usb/gadget/at91_udc.c b/drivers/usb/gadget/at91_udc.c
index 8674f3c9f4f..64682355daa 100644
--- a/drivers/usb/gadget/at91_udc.c
+++ b/drivers/usb/gadget/at91_udc.c
@@ -14,6 +14,7 @@
 #undef	PACKET_TRACE
 
 #include <common.h>
+#include <stdio.h>
 #include <dm/devres.h>
 #include <linux/bug.h>
 #include <linux/err.h>
diff --git a/drivers/usb/gadget/atmel_usba_udc.c b/drivers/usb/gadget/atmel_usba_udc.c
index 23e107b8621..a586e16347d 100644
--- a/drivers/usb/gadget/atmel_usba_udc.c
+++ b/drivers/usb/gadget/atmel_usba_udc.c
@@ -8,6 +8,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
diff --git a/drivers/usb/gadget/ci_udc.c b/drivers/usb/gadget/ci_udc.c
index 98a88c102e9..e119fd6a033 100644
--- a/drivers/usb/gadget/ci_udc.c
+++ b/drivers/usb/gadget/ci_udc.c
@@ -13,6 +13,7 @@
 #include <cpu_func.h>
 #include <net.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/byteorder.h>
 #include <asm/cache.h>
 #include <linux/delay.h>
diff --git a/drivers/usb/gadget/dwc2_udc_otg.c b/drivers/usb/gadget/dwc2_udc_otg.c
index 8a5edc776ef..867f31be7b4 100644
--- a/drivers/usb/gadget/dwc2_udc_otg.c
+++ b/drivers/usb/gadget/dwc2_udc_otg.c
@@ -24,6 +24,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <reset.h>
+#include <stdio.h>
 #include <dm/device_compat.h>
 #include <dm/devres.h>
 #include <linux/bug.h>
diff --git a/drivers/usb/gadget/dwc2_udc_otg_phy.c b/drivers/usb/gadget/dwc2_udc_otg_phy.c
index 7f8e9564b9e..69d71228243 100644
--- a/drivers/usb/gadget/dwc2_udc_otg_phy.c
+++ b/drivers/usb/gadget/dwc2_udc_otg_phy.c
@@ -18,6 +18,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/list.h>
diff --git a/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c b/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c
index 80b7e519978..84b46709a58 100644
--- a/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c
+++ b/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c
@@ -20,6 +20,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <log.h>
+#include <stdio.h>
 #include <linux/bug.h>
 #include <linux/string.h>
 
diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c
index f58bd60a8cb..691b0b49243 100644
--- a/drivers/usb/gadget/ether.c
+++ b/drivers/usb/gadget/ether.c
@@ -12,6 +12,7 @@
 #include <env.h>
 #include <log.h>
 #include <part.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
diff --git a/drivers/usb/gadget/f_dfu.c b/drivers/usb/gadget/f_dfu.c
index b7b1e0c1add..43a342c5afe 100644
--- a/drivers/usb/gadget/f_dfu.c
+++ b/drivers/usb/gadget/f_dfu.c
@@ -19,6 +19,7 @@
 #include <common.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 #include <linux/usb/ch9.h>
diff --git a/drivers/usb/gadget/f_fastboot.c b/drivers/usb/gadget/f_fastboot.c
index e14262676f3..14a710a5238 100644
--- a/drivers/usb/gadget/f_fastboot.c
+++ b/drivers/usb/gadget/f_fastboot.c
@@ -17,6 +17,7 @@
 #include <fastboot.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include <linux/usb/ch9.h>
diff --git a/drivers/usb/gadget/f_mass_storage.c b/drivers/usb/gadget/f_mass_storage.c
index d87701b4a35..a220d151761 100644
--- a/drivers/usb/gadget/f_mass_storage.c
+++ b/drivers/usb/gadget/f_mass_storage.c
@@ -246,6 +246,7 @@
 #include <common.h>
 #include <console.h>
 #include <g_dnl.h>
+#include <stdio.h>
 #include <dm/devres.h>
 #include <linux/bug.h>
 #include <linux/string.h>
diff --git a/drivers/usb/gadget/f_rockusb.c b/drivers/usb/gadget/f_rockusb.c
index 2ff3c692edc..1705b7a611a 100644
--- a/drivers/usb/gadget/f_rockusb.c
+++ b/drivers/usb/gadget/f_rockusb.c
@@ -13,6 +13,7 @@
 #include <malloc.h>
 #include <memalign.h>
 #include <part.h>
+#include <stdio.h>
 #include <linux/string.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
diff --git a/drivers/usb/gadget/f_sdp.c b/drivers/usb/gadget/f_sdp.c
index 120aed4d95e..34c393c9f04 100644
--- a/drivers/usb/gadget/f_sdp.c
+++ b/drivers/usb/gadget/f_sdp.c
@@ -22,6 +22,7 @@
 #include <env.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/usb/gadget/f_thor.c b/drivers/usb/gadget/f_thor.c
index 4758ccb7c46..11d703eb332 100644
--- a/drivers/usb/gadget/f_thor.c
+++ b/drivers/usb/gadget/f_thor.c
@@ -22,6 +22,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <memalign.h>
+#include <stdio.h>
 #include <version.h>
 #include <linux/delay.h>
 #include <linux/printk.h>
diff --git a/drivers/usb/gadget/fotg210.c b/drivers/usb/gadget/fotg210.c
index 1c145eb428e..ff9e98a7566 100644
--- a/drivers/usb/gadget/fotg210.c
+++ b/drivers/usb/gadget/fotg210.c
@@ -13,6 +13,7 @@
 #include <log.h>
 #include <net.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/io.h>
 #include <linux/delay.h>
diff --git a/drivers/usb/gadget/g_dnl.c b/drivers/usb/gadget/g_dnl.c
index c6ecbb30192..cd4015f65a0 100644
--- a/drivers/usb/gadget/g_dnl.c
+++ b/drivers/usb/gadget/g_dnl.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 #include <mmc.h>
diff --git a/drivers/usb/gadget/pxa25x_udc.c b/drivers/usb/gadget/pxa25x_udc.c
index 4f4d2982f88..22db49164da 100644
--- a/drivers/usb/gadget/pxa25x_udc.c
+++ b/drivers/usb/gadget/pxa25x_udc.c
@@ -19,6 +19,7 @@
 #include <common.h>
 #include <errno.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/byteorder.h>
 #include <asm/system.h>
diff --git a/drivers/usb/gadget/udc/udc-core.c b/drivers/usb/gadget/udc/udc-core.c
index 7f73926cb3e..13c42aabab3 100644
--- a/drivers/usb/gadget/udc/udc-core.c
+++ b/drivers/usb/gadget/udc/udc-core.c
@@ -13,6 +13,7 @@
  *		       usb_
  */
 
+#include <stdio.h>
 #include <dm/device_compat.h>
 #include <dm/devres.h>
 #include <linux/compat.h>
diff --git a/drivers/usb/host/dwc2.c b/drivers/usb/host/dwc2.c
index 7f04ea81bfc..62eab821bb6 100644
--- a/drivers/usb/host/dwc2.c
+++ b/drivers/usb/host/dwc2.c
@@ -14,6 +14,7 @@
 #include <malloc.h>
 #include <memalign.h>
 #include <phys2bus.h>
+#include <stdio.h>
 #include <time.h>
 #include <usb.h>
 #include <usbroothubdes.h>
diff --git a/drivers/usb/host/ehci-faraday.c b/drivers/usb/host/ehci-faraday.c
index b61b5382df4..fe28aec8a85 100644
--- a/drivers/usb/host/ehci-faraday.c
+++ b/drivers/usb/host/ehci-faraday.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <usb.h>
 #include <linux/delay.h>
diff --git a/drivers/usb/host/ehci-fsl.c b/drivers/usb/host/ehci-fsl.c
index 8c5403fbdb3..45b82da4f4a 100644
--- a/drivers/usb/host/ehci-fsl.c
+++ b/drivers/usb/host/ehci-fsl.c
@@ -11,6 +11,7 @@
 #include <env.h>
 #include <log.h>
 #include <pci.h>
+#include <stdio.h>
 #include <usb.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index 60e5f4e41bc..fe6459e4a31 100644
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -11,6 +11,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/byteorder.h>
 #include <asm/cache.h>
diff --git a/drivers/usb/host/ehci-msm.c b/drivers/usb/host/ehci-msm.c
index dd92808ff7b..6492769b2a3 100644
--- a/drivers/usb/host/ehci-msm.c
+++ b/drivers/usb/host/ehci-msm.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
+#include <stdio.h>
 #include <usb.h>
 #include <usb/ehci-ci.h>
 #include <usb/ulpi.h>
diff --git a/drivers/usb/host/ehci-mx5.c b/drivers/usb/host/ehci-mx5.c
index ca6cb6b645b..709cb1cff54 100644
--- a/drivers/usb/host/ehci-mx5.c
+++ b/drivers/usb/host/ehci-mx5.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <usb.h>
 #include <errno.h>
 #include <asm/global_data.h>
diff --git a/drivers/usb/host/ehci-mx6.c b/drivers/usb/host/ehci-mx6.c
index f9e72ba0d96..51723fca051 100644
--- a/drivers/usb/host/ehci-mx6.c
+++ b/drivers/usb/host/ehci-mx6.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <usb.h>
 #include <errno.h>
 #include <wait_bit.h>
diff --git a/drivers/usb/host/ehci-mxs.c b/drivers/usb/host/ehci-mxs.c
index 824c620e638..05c0f4a196e 100644
--- a/drivers/usb/host/ehci-mxs.c
+++ b/drivers/usb/host/ehci-mxs.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
 #include <errno.h>
diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c
index 5aa9eb445af..4d3b6527ac9 100644
--- a/drivers/usb/host/ehci-omap.c
+++ b/drivers/usb/host/ehci-omap.c
@@ -12,6 +12,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <usb.h>
 #include <linux/delay.h>
diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c
index 7dd5c33c13d..d8dbd77114a 100644
--- a/drivers/usb/host/ehci-pci.c
+++ b/drivers/usb/host/ehci-pci.c
@@ -10,6 +10,7 @@
 #include <init.h>
 #include <log.h>
 #include <pci.h>
+#include <stdio.h>
 #include <usb.h>
 #include <asm/io.h>
 
diff --git a/drivers/usb/host/ehci-rmobile.c b/drivers/usb/host/ehci-rmobile.c
index 130b73dfe49..72ae211d627 100644
--- a/drivers/usb/host/ehci-rmobile.c
+++ b/drivers/usb/host/ehci-rmobile.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/ehci-rmobile.h>
 #include <linux/delay.h>
diff --git a/drivers/usb/host/ehci-spear.c b/drivers/usb/host/ehci-spear.c
index 3e87e0c7fd8..2e3ea349a72 100644
--- a/drivers/usb/host/ehci-spear.c
+++ b/drivers/usb/host/ehci-spear.c
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <usb.h>
 #include <linux/delay.h>
diff --git a/drivers/usb/host/ehci-tegra.c b/drivers/usb/host/ehci-tegra.c
index 3b9373f2cd6..d71e455446f 100644
--- a/drivers/usb/host/ehci-tegra.c
+++ b/drivers/usb/host/ehci-tegra.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <stdio.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/io.h>
diff --git a/drivers/usb/host/ehci-zynq.c b/drivers/usb/host/ehci-zynq.c
index 939c30999ee..6eef3814a14 100644
--- a/drivers/usb/host/ehci-zynq.c
+++ b/drivers/usb/host/ehci-zynq.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <stdio.h>
 #include <usb.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/sys_proto.h>
diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c
index 89592f0a114..598567d6047 100644
--- a/drivers/usb/host/ohci-hcd.c
+++ b/drivers/usb/host/ohci-hcd.c
@@ -29,6 +29,7 @@
 
 #include <common.h>
 #include <cpu_func.h>
+#include <stdio.h>
 #include <asm/byteorder.h>
 #include <dm.h>
 #include <errno.h>
diff --git a/drivers/usb/host/r8a66597-hcd.c b/drivers/usb/host/r8a66597-hcd.c
index 339e260ea33..7595813868c 100644
--- a/drivers/usb/host/r8a66597-hcd.c
+++ b/drivers/usb/host/r8a66597-hcd.c
@@ -9,6 +9,7 @@
 #include <console.h>
 #include <dm.h>
 #include <log.h>
+#include <stdio.h>
 #include <usb.h>
 #include <asm/io.h>
 #include <dm/device_compat.h>
diff --git a/drivers/usb/host/sl811-hcd.c b/drivers/usb/host/sl811-hcd.c
index b33d7dc9ac4..c87b02f9747 100644
--- a/drivers/usb/host/sl811-hcd.c
+++ b/drivers/usb/host/sl811-hcd.c
@@ -20,6 +20,7 @@
 
 #include <common.h>
 #include <mpc8xx.h>
+#include <stdio.h>
 #include <time.h>
 #include <usb.h>
 #include <linux/delay.h>
diff --git a/drivers/usb/host/sl811.h b/drivers/usb/host/sl811.h
index c1f9f013bd1..8eddb456194 100644
--- a/drivers/usb/host/sl811.h
+++ b/drivers/usb/host/sl811.h
@@ -1,6 +1,7 @@
 #ifndef __UBOOT_SL811_H
 #define __UBOOT_SL811_H
 
+#include <stdio.h>
 #undef SL811_DEBUG
 
 #ifdef SL811_DEBUG
diff --git a/drivers/usb/host/usb-uclass.c b/drivers/usb/host/usb-uclass.c
index ae425b9bfd9..22e4ffd42eb 100644
--- a/drivers/usb/host/usb-uclass.c
+++ b/drivers/usb/host/usb-uclass.c
@@ -11,6 +11,7 @@
 #include <errno.h>
 #include <log.h>
 #include <memalign.h>
+#include <stdio.h>
 #include <usb.h>
 #include <dm/device-internal.h>
 #include <dm/lists.h>
diff --git a/drivers/usb/host/xhci-dwc3.c b/drivers/usb/host/xhci-dwc3.c
index 44cb31c9c5f..fdbf2c83b56 100644
--- a/drivers/usb/host/xhci-dwc3.c
+++ b/drivers/usb/host/xhci-dwc3.c
@@ -11,6 +11,7 @@
 #include <dm.h>
 #include <generic-phy.h>
 #include <log.h>
+#include <stdio.h>
 #include <usb.h>
 #include <dwc3-uboot.h>
 #include <linux/delay.h>
diff --git a/drivers/usb/host/xhci-exynos5.c b/drivers/usb/host/xhci-exynos5.c
index 77c2534da44..ee61c88e2aa 100644
--- a/drivers/usb/host/xhci-exynos5.c
+++ b/drivers/usb/host/xhci-exynos5.c
@@ -16,6 +16,7 @@
 #include <dm.h>
 #include <fdtdec.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
diff --git a/drivers/usb/host/xhci-fsl.c b/drivers/usb/host/xhci-fsl.c
index 0a2da70e200..440f17f66d6 100644
--- a/drivers/usb/host/xhci-fsl.c
+++ b/drivers/usb/host/xhci-fsl.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <usb.h>
 #include <linux/errno.h>
 #include <linux/compat.h>
diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c
index e9b90a827fe..5418ce40642 100644
--- a/drivers/usb/host/xhci-mem.c
+++ b/drivers/usb/host/xhci-mem.c
@@ -17,6 +17,7 @@
 #include <cpu_func.h>
 #include <dm.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/byteorder.h>
 #include <usb.h>
 #include <malloc.h>
diff --git a/drivers/usb/host/xhci-mvebu.c b/drivers/usb/host/xhci-mvebu.c
index f2e338f6fbc..32e00378ab7 100644
--- a/drivers/usb/host/xhci-mvebu.c
+++ b/drivers/usb/host/xhci-mvebu.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <fdtdec.h>
 #include <log.h>
+#include <stdio.h>
 #include <usb.h>
 #include <power/regulator.h>
 #include <asm/gpio.h>
diff --git a/drivers/usb/host/xhci-omap.c b/drivers/usb/host/xhci-omap.c
index 501129d769a..00b7d8571d2 100644
--- a/drivers/usb/host/xhci-omap.c
+++ b/drivers/usb/host/xhci-omap.c
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <usb.h>
 #include <linux/errno.h>
 #include <asm/omap_common.h>
diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
index 1811e4377da..853f4c85089 100644
--- a/drivers/usb/host/xhci-ring.c
+++ b/drivers/usb/host/xhci-ring.c
@@ -16,6 +16,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/byteorder.h>
 #include <usb.h>
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index 0dae35f8f9a..f8601dc8363 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -23,6 +23,7 @@
 #include <cpu_func.h>
 #include <dm.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/byteorder.h>
 #include <usb.h>
 #include <malloc.h>
diff --git a/drivers/usb/musb-new/mt85xx.c b/drivers/usb/musb-new/mt85xx.c
index f826b986ba7..78b4c93e860 100644
--- a/drivers/usb/musb-new/mt85xx.c
+++ b/drivers/usb/musb-new/mt85xx.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <clk.h>
 #include <dm.h>
+#include <stdio.h>
 #include <dm/lists.h>
 #include <dm/root.h>
 #include <linux/delay.h>
diff --git a/drivers/usb/musb-new/musb_uboot.c b/drivers/usb/musb-new/musb_uboot.c
index 0948fd598f9..9d22b50b8c3 100644
--- a/drivers/usb/musb-new/musb_uboot.c
+++ b/drivers/usb/musb-new/musb_uboot.c
@@ -1,6 +1,7 @@
 #include <common.h>
 #include <console.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <time.h>
 #include <watchdog.h>
 #include <linux/delay.h>
diff --git a/drivers/usb/musb-new/pic32.c b/drivers/usb/musb-new/pic32.c
index cc3a16b628c..f1bd127b7d4 100644
--- a/drivers/usb/musb-new/pic32.c
+++ b/drivers/usb/musb-new/pic32.c
@@ -10,6 +10,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
diff --git a/drivers/usb/musb-new/sunxi.c b/drivers/usb/musb-new/sunxi.c
index 082df93fdd8..20d968f8497 100644
--- a/drivers/usb/musb-new/sunxi.c
+++ b/drivers/usb/musb-new/sunxi.c
@@ -23,6 +23,7 @@
 #include <malloc.h>
 #include <phy-sun4i-usb.h>
 #include <reset.h>
+#include <stdio.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/gpio.h>
diff --git a/drivers/usb/phy/twl4030.c b/drivers/usb/phy/twl4030.c
index 676868bead3..9bea192fccf 100644
--- a/drivers/usb/phy/twl4030.c
+++ b/drivers/usb/phy/twl4030.c
@@ -23,6 +23,7 @@
  * ------------------------------------------------------------------------
  */
 
+#include <stdio.h>
 #include <twl4030.h>
 #include <linux/delay.h>
 
diff --git a/drivers/usb/ulpi/ulpi-viewport.c b/drivers/usb/ulpi/ulpi-viewport.c
index 3bb152be893..5a7f034da1d 100644
--- a/drivers/usb/ulpi/ulpi-viewport.c
+++ b/drivers/usb/ulpi/ulpi-viewport.c
@@ -14,6 +14,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <usb/ulpi.h>
diff --git a/drivers/usb/ulpi/ulpi.c b/drivers/usb/ulpi/ulpi.c
index dd0da0e841e..d5045a17959 100644
--- a/drivers/usb/ulpi/ulpi.c
+++ b/drivers/usb/ulpi/ulpi.c
@@ -22,6 +22,7 @@
 #include <common.h>
 #include <exports.h>
 #include <log.h>
+#include <stdio.h>
 #include <linux/delay.h>
 #include <usb/ulpi.h>
 
diff --git a/drivers/video/am335x-fb.c b/drivers/video/am335x-fb.c
index b381b147cdd..4e0d9c2b098 100644
--- a/drivers/video/am335x-fb.c
+++ b/drivers/video/am335x-fb.c
@@ -15,6 +15,7 @@
 #include <dm.h>
 #include <lcd.h>
 #include <log.h>
+#include <stdio.h>
 #include <video.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/hardware.h>
diff --git a/drivers/video/anx9804.c b/drivers/video/anx9804.c
index b050c4292f6..648564bc3e1 100644
--- a/drivers/video/anx9804.c
+++ b/drivers/video/anx9804.c
@@ -11,6 +11,7 @@
 
 #include <common.h>
 #include <i2c.h>
+#include <stdio.h>
 #include <linux/delay.h>
 #include "anx98xx-edp.h"
 #include "anx9804.h"
diff --git a/drivers/video/ati_radeon_fb.c b/drivers/video/ati_radeon_fb.c
index c326722c550..d7938ac2cbd 100644
--- a/drivers/video/ati_radeon_fb.c
+++ b/drivers/video/ati_radeon_fb.c
@@ -16,6 +16,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 
diff --git a/drivers/video/ati_radeon_fb.h b/drivers/video/ati_radeon_fb.h
index 9dd638bb9e4..dde2067ef2e 100644
--- a/drivers/video/ati_radeon_fb.h
+++ b/drivers/video/ati_radeon_fb.h
@@ -8,6 +8,7 @@
 /*
  * Chip families. Must fit in the low 16 bits of a long word
  */
+#include <stdio.h>
 enum radeon_family {
 	CHIP_FAMILY_UNKNOW,
 	CHIP_FAMILY_LEGACY,
diff --git a/drivers/video/atmel_hlcdfb.c b/drivers/video/atmel_hlcdfb.c
index bfe76349fda..13dc28412c7 100644
--- a/drivers/video/atmel_hlcdfb.c
+++ b/drivers/video/atmel_hlcdfb.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <part.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/gpio.h>
diff --git a/drivers/video/broadwell_igd.c b/drivers/video/broadwell_igd.c
index 84b31025f74..7a282be660f 100644
--- a/drivers/video/broadwell_igd.c
+++ b/drivers/video/broadwell_igd.c
@@ -11,6 +11,7 @@
 #include <dm.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <vbe.h>
 #include <video.h>
diff --git a/drivers/video/bus_vcxk.c b/drivers/video/bus_vcxk.c
index 2a72d23eb87..8f9b607099e 100644
--- a/drivers/video/bus_vcxk.c
+++ b/drivers/video/bus_vcxk.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <bmp_layout.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 
 vu_char  *vcxk_bws      = ((vu_char *) (CONFIG_SYS_VCXK_BASE));
diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c
index bc1e999b761..af92a83d6a0 100644
--- a/drivers/video/cfb_console.c
+++ b/drivers/video/cfb_console.c
@@ -71,6 +71,7 @@
 #include <fdtdec.h>
 #include <gzip.h>
 #include <log.h>
+#include <stdio.h>
 #include <version.h>
 #include <malloc.h>
 #include <video.h>
diff --git a/drivers/video/coreboot.c b/drivers/video/coreboot.c
index c8797a0d9c4..6914162d3ac 100644
--- a/drivers/video/coreboot.c
+++ b/drivers/video/coreboot.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <stdio.h>
 #include <vbe.h>
 #include <video.h>
 #include <asm/arch/sysinfo.h>
diff --git a/drivers/video/da8xx-fb.c b/drivers/video/da8xx-fb.c
index 994b90a9665..27234e7adee 100644
--- a/drivers/video/da8xx-fb.c
+++ b/drivers/video/da8xx-fb.c
@@ -16,6 +16,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <memalign.h>
+#include <stdio.h>
 #include <video_fb.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
diff --git a/drivers/video/efi.c b/drivers/video/efi.c
index 47441a35a64..489998f3625 100644
--- a/drivers/video/efi.c
+++ b/drivers/video/efi.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <efi_api.h>
 #include <log.h>
+#include <stdio.h>
 #include <vbe.h>
 #include <video.h>
 
diff --git a/drivers/video/exynos/exynos_dp.c b/drivers/video/exynos/exynos_dp.c
index 71dae58f08b..d63d9effb00 100644
--- a/drivers/video/exynos/exynos_dp.c
+++ b/drivers/video/exynos/exynos_dp.c
@@ -11,6 +11,7 @@
 #include <display.h>
 #include <fdtdec.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
diff --git a/drivers/video/exynos/exynos_dp_lowlevel.c b/drivers/video/exynos/exynos_dp_lowlevel.c
index ae500a70280..efa3b924af1 100644
--- a/drivers/video/exynos/exynos_dp_lowlevel.c
+++ b/drivers/video/exynos/exynos_dp_lowlevel.c
@@ -8,6 +8,7 @@
 #include <config.h>
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <asm/arch/cpu.h>
diff --git a/drivers/video/exynos/exynos_fb.c b/drivers/video/exynos/exynos_fb.c
index 26068ab056f..42ec0494fa0 100644
--- a/drivers/video/exynos/exynos_fb.c
+++ b/drivers/video/exynos/exynos_fb.c
@@ -13,6 +13,7 @@
 #include <dm.h>
 #include <fdtdec.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/libfdt.h>
 #include <panel.h>
diff --git a/drivers/video/exynos/exynos_mipi_dsi.c b/drivers/video/exynos/exynos_mipi_dsi.c
index 376e6abf2cf..1d5ed38bf44 100644
--- a/drivers/video/exynos/exynos_mipi_dsi.c
+++ b/drivers/video/exynos/exynos_mipi_dsi.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <fdtdec.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <dm/devres.h>
 #include <linux/libfdt.h>
diff --git a/drivers/video/exynos/exynos_mipi_dsi_lowlevel.c b/drivers/video/exynos/exynos_mipi_dsi_lowlevel.c
index 8111acd9a0b..d7a8db62fa9 100644
--- a/drivers/video/exynos/exynos_mipi_dsi_lowlevel.c
+++ b/drivers/video/exynos/exynos_mipi_dsi_lowlevel.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/arch/dsim.h>
 #include <asm/arch/mipi_dsim.h>
 #include <asm/arch/power.h>
diff --git a/drivers/video/formike.c b/drivers/video/formike.c
index 5cbe50d4cbd..14c39b65f5c 100644
--- a/drivers/video/formike.c
+++ b/drivers/video/formike.c
@@ -9,6 +9,7 @@
 #include <errno.h>
 #include <log.h>
 #include <spi.h>
+#include <stdio.h>
 #include <linux/delay.h>
 
 #define TAG_READ	0x80
diff --git a/drivers/video/fsl_dcu_fb.c b/drivers/video/fsl_dcu_fb.c
index 1d3d26c3e89..0dafac2829e 100644
--- a/drivers/video/fsl_dcu_fb.c
+++ b/drivers/video/fsl_dcu_fb.c
@@ -7,6 +7,7 @@
  */
 
 #include <init.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/video/fsl_diu_fb.c b/drivers/video/fsl_diu_fb.c
index 5fd6a8084d5..d0fe6923432 100644
--- a/drivers/video/fsl_diu_fb.c
+++ b/drivers/video/fsl_diu_fb.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
diff --git a/drivers/video/hitachi_tx18d42vm_lcd.c b/drivers/video/hitachi_tx18d42vm_lcd.c
index c6c8df6a96e..752bc62eb68 100644
--- a/drivers/video/hitachi_tx18d42vm_lcd.c
+++ b/drivers/video/hitachi_tx18d42vm_lcd.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <linux/delay.h>
 
 #include <asm/gpio.h>
diff --git a/drivers/video/imx/ipu_common.c b/drivers/video/imx/ipu_common.c
index da7e5c85183..2d5f47ff4ad 100644
--- a/drivers/video/imx/ipu_common.c
+++ b/drivers/video/imx/ipu_common.c
@@ -13,6 +13,7 @@
 /* #define DEBUG */
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 #include <linux/types.h>
diff --git a/drivers/video/imx/ipu_disp.c b/drivers/video/imx/ipu_disp.c
index 45069897faf..cc2c57553f6 100644
--- a/drivers/video/imx/ipu_disp.c
+++ b/drivers/video/imx/ipu_disp.c
@@ -14,6 +14,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <linux/delay.h>
 #include <linux/types.h>
 #include <linux/errno.h>
diff --git a/drivers/video/imx/ipu_regs.h b/drivers/video/imx/ipu_regs.h
index deb44002d75..1e29f66e67b 100644
--- a/drivers/video/imx/ipu_regs.h
+++ b/drivers/video/imx/ipu_regs.h
@@ -13,6 +13,7 @@
 #ifndef __IPU_REGS_INCLUDED__
 #define __IPU_REGS_INCLUDED__
 
+#include <stdio.h>
 #define IPU_DISP0_BASE		0x00000000
 #define IPU_MCU_T_DEFAULT	8
 #define IPU_DISP1_BASE		(IPU_MCU_T_DEFAULT << 25)
diff --git a/drivers/video/imx/mxc_ipuv3_fb.c b/drivers/video/imx/mxc_ipuv3_fb.c
index 587d62f2d86..356d410bea3 100644
--- a/drivers/video/imx/mxc_ipuv3_fb.c
+++ b/drivers/video/imx/mxc_ipuv3_fb.c
@@ -13,6 +13,7 @@
 #include <common.h>
 #include <log.h>
 #include <part.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <linux/errno.h>
 #include <asm/global_data.h>
diff --git a/drivers/video/ivybridge_igd.c b/drivers/video/ivybridge_igd.c
index cd742b2273c..d4247ee6406 100644
--- a/drivers/video/ivybridge_igd.c
+++ b/drivers/video/ivybridge_igd.c
@@ -10,6 +10,7 @@
 #include <fdtdec.h>
 #include <log.h>
 #include <pci_rom.h>
+#include <stdio.h>
 #include <vbe.h>
 #include <video.h>
 #include <asm/global_data.h>
diff --git a/drivers/video/lg4573.c b/drivers/video/lg4573.c
index 3e61f7f53ce..f91ee7363f5 100644
--- a/drivers/video/lg4573.c
+++ b/drivers/video/lg4573.c
@@ -10,6 +10,7 @@
 #include <display.h>
 #include <dm.h>
 #include <log.h>
+#include <stdio.h>
 #include <dm/read.h>
 #include <dm/uclass-internal.h>
 #include <errno.h>
diff --git a/drivers/video/logicore_dp_tx.c b/drivers/video/logicore_dp_tx.c
index e752f457560..45eba82c409 100644
--- a/drivers/video/logicore_dp_tx.c
+++ b/drivers/video/logicore_dp_tx.c
@@ -14,6 +14,7 @@
 #include <display.h>
 #include <dm.h>
 #include <errno.h>
+#include <stdio.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 
diff --git a/drivers/video/mali_dp.c b/drivers/video/mali_dp.c
index e487d6742a1..778a9a917dd 100644
--- a/drivers/video/mali_dp.c
+++ b/drivers/video/mali_dp.c
@@ -7,6 +7,7 @@
 #define DEBUG
 #include <common.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <video.h>
 #include <dm.h>
 #ifdef CONFIG_DISPLAY
diff --git a/drivers/video/mb862xx.c b/drivers/video/mb862xx.c
index 04e435f913c..8b736f9e737 100644
--- a/drivers/video/mb862xx.c
+++ b/drivers/video/mb862xx.c
@@ -10,6 +10,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <linux/delay.h>
 
 #include <asm/io.h>
diff --git a/drivers/video/meson/meson_vclk.c b/drivers/video/meson/meson_vclk.c
index e718a0074ed..e096b437a38 100644
--- a/drivers/video/meson/meson_vclk.c
+++ b/drivers/video/meson/meson_vclk.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <dm.h>
 #include <edid.h>
+#include <stdio.h>
 #include <linux/bitops.h>
 #include <linux/printk.h>
 #include "meson_vpu.h"
diff --git a/drivers/video/mx3fb.c b/drivers/video/mx3fb.c
index 05b65429187..ff29773170b 100644
--- a/drivers/video/mx3fb.c
+++ b/drivers/video/mx3fb.c
@@ -9,6 +9,7 @@
 #include <env.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <video_fb.h>
 #include <linux/delay.h>
 #include <linux/string.h>
diff --git a/drivers/video/mxsfb.c b/drivers/video/mxsfb.c
index 4bb817669f7..82a94507b2e 100644
--- a/drivers/video/mxsfb.c
+++ b/drivers/video/mxsfb.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <env.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <dm/device_compat.h>
diff --git a/drivers/video/pxa_lcd.c b/drivers/video/pxa_lcd.c
index 67f5266164f..79981e99707 100644
--- a/drivers/video/pxa_lcd.c
+++ b/drivers/video/pxa_lcd.c
@@ -12,6 +12,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/arch/pxa-regs.h>
 #include <asm/io.h>
 #include <lcd.h>
diff --git a/drivers/video/rockchip/rk_edp.c b/drivers/video/rockchip/rk_edp.c
index b5fa492e253..575aee1cdb1 100644
--- a/drivers/video/rockchip/rk_edp.c
+++ b/drivers/video/rockchip/rk_edp.c
@@ -13,6 +13,7 @@
 #include <malloc.h>
 #include <panel.h>
 #include <regmap.h>
+#include <stdio.h>
 #include <syscon.h>
 #include <time.h>
 #include <asm/gpio.h>
diff --git a/drivers/video/sandbox_sdl.c b/drivers/video/sandbox_sdl.c
index 48470e6f556..898790c09d5 100644
--- a/drivers/video/sandbox_sdl.c
+++ b/drivers/video/sandbox_sdl.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <fdtdec.h>
 #include <log.h>
+#include <stdio.h>
 #include <video.h>
 #include <asm/global_data.h>
 #include <asm/sdl.h>
diff --git a/drivers/video/scf0403_lcd.c b/drivers/video/scf0403_lcd.c
index 54f0f88b4c9..dcf0504ae56 100644
--- a/drivers/video/scf0403_lcd.c
+++ b/drivers/video/scf0403_lcd.c
@@ -15,6 +15,7 @@
 
 #include <common.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/gpio.h>
 #include <spi.h>
 #include <linux/delay.h>
diff --git a/drivers/video/simplefb.c b/drivers/video/simplefb.c
index a45e9aa9e0f..c545c79ced8 100644
--- a/drivers/video/simplefb.c
+++ b/drivers/video/simplefb.c
@@ -8,6 +8,7 @@
 #include <fdtdec.h>
 #include <fdt_support.h>
 #include <log.h>
+#include <stdio.h>
 #include <video.h>
 #include <asm/global_data.h>
 #include <linux/string.h>
diff --git a/drivers/video/ssd2828.c b/drivers/video/ssd2828.c
index 4cdcbe7755a..84479b3ded9 100644
--- a/drivers/video/ssd2828.c
+++ b/drivers/video/ssd2828.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <malloc.h>
 #include <mipi_display.h>
+#include <stdio.h>
 #include <asm/arch/gpio.h>
 #include <asm/gpio.h>
 #include <linux/delay.h>
diff --git a/drivers/video/sunxi/sunxi_display.c b/drivers/video/sunxi/sunxi_display.c
index 1967a2a1f6c..56c63e4ea43 100644
--- a/drivers/video/sunxi/sunxi_display.c
+++ b/drivers/video/sunxi/sunxi_display.c
@@ -10,6 +10,7 @@
 #include <cpu_func.h>
 #include <efi_loader.h>
 #include <init.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
diff --git a/drivers/video/sunxi/sunxi_dw_hdmi.c b/drivers/video/sunxi/sunxi_dw_hdmi.c
index 01d4b7a11c9..418b429ce0e 100644
--- a/drivers/video/sunxi/sunxi_dw_hdmi.c
+++ b/drivers/video/sunxi/sunxi_dw_hdmi.c
@@ -11,6 +11,7 @@
 #include <dw_hdmi.h>
 #include <edid.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
diff --git a/drivers/video/tda19988.c b/drivers/video/tda19988.c
index 191cda3ce76..48c29129192 100644
--- a/drivers/video/tda19988.c
+++ b/drivers/video/tda19988.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <display.h>
 #include <i2c.h>
+#include <stdio.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 
diff --git a/drivers/video/tegra.c b/drivers/video/tegra.c
index a32478ea627..5e03aab67bb 100644
--- a/drivers/video/tegra.c
+++ b/drivers/video/tegra.c
@@ -10,6 +10,7 @@
 #include <panel.h>
 #include <part.h>
 #include <pwm.h>
+#include <stdio.h>
 #include <video.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
diff --git a/drivers/video/tegra124/display.c b/drivers/video/tegra124/display.c
index 4f46b222b44..1c47b133c85 100644
--- a/drivers/video/tegra124/display.c
+++ b/drivers/video/tegra124/display.c
@@ -15,6 +15,7 @@
 #include <lcd.h>
 #include <log.h>
 #include <part.h>
+#include <stdio.h>
 #include <time.h>
 #include <video.h>
 #include <asm/gpio.h>
diff --git a/drivers/video/tegra124/dp.c b/drivers/video/tegra124/dp.c
index 5fcb03835d1..9c5ce04c376 100644
--- a/drivers/video/tegra124/dp.c
+++ b/drivers/video/tegra124/dp.c
@@ -10,6 +10,7 @@
 #include <div64.h>
 #include <errno.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <video_bridge.h>
 #include <asm/io.h>
diff --git a/drivers/video/tegra124/sor.c b/drivers/video/tegra124/sor.c
index 119219e18bb..345974f465b 100644
--- a/drivers/video/tegra124/sor.c
+++ b/drivers/video/tegra124/sor.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <panel.h>
+#include <stdio.h>
 #include <syscon.h>
 #include <time.h>
 #include <video_bridge.h>
diff --git a/drivers/video/video-uclass.c b/drivers/video/video-uclass.c
index 75a4ea17e36..bb8555000a9 100644
--- a/drivers/video/video-uclass.c
+++ b/drivers/video/video-uclass.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <mapmem.h>
+#include <stdio.h>
 #include <stdio_dev.h>
 #include <time.h>
 #include <video.h>
diff --git a/drivers/video/video_bmp.c b/drivers/video/video_bmp.c
index 5a4d12c68d4..802d84a8860 100644
--- a/drivers/video/video_bmp.c
+++ b/drivers/video/video_bmp.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <mapmem.h>
 #include <splash.h>
+#include <stdio.h>
 #include <video.h>
 #include <watchdog.h>
 #include <asm/unaligned.h>
diff --git a/drivers/video/videomodes.c b/drivers/video/videomodes.c
index 8d3aff1a14c..f1781dbb666 100644
--- a/drivers/video/videomodes.c
+++ b/drivers/video/videomodes.c
@@ -61,6 +61,7 @@
 #include <env.h>
 #include <errno.h>
 #include <fdtdec.h>
+#include <stdio.h>
 #include <linux/ctype.h>
 #include <linux/string.h>
 
diff --git a/drivers/virtio/virtio_pci_legacy.c b/drivers/virtio/virtio_pci_legacy.c
index fa7f2429f1f..a617fffd7aa 100644
--- a/drivers/virtio/virtio_pci_legacy.c
+++ b/drivers/virtio/virtio_pci_legacy.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <stdio.h>
 #include <virtio_types.h>
 #include <virtio.h>
 #include <virtio_ring.h>
diff --git a/drivers/virtio/virtio_pci_modern.c b/drivers/virtio/virtio_pci_modern.c
index 483525872dd..7a5926ebe64 100644
--- a/drivers/virtio/virtio_pci_modern.c
+++ b/drivers/virtio/virtio_pci_modern.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <stdio.h>
 #include <virtio_types.h>
 #include <virtio.h>
 #include <virtio_ring.h>
diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c
index dfd0ce8db63..f058b2f8de8 100644
--- a/drivers/virtio/virtio_ring.c
+++ b/drivers/virtio/virtio_ring.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <virtio_types.h>
 #include <virtio.h>
 #include <virtio_ring.h>
diff --git a/drivers/w1-eeprom/w1-eeprom-uclass.c b/drivers/w1-eeprom/w1-eeprom-uclass.c
index d515b4c5366..8a63f614c58 100644
--- a/drivers/w1-eeprom/w1-eeprom-uclass.c
+++ b/drivers/w1-eeprom/w1-eeprom-uclass.c
@@ -13,6 +13,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <stdio.h>
 #include <w1.h>
 #include <w1-eeprom.h>
 
diff --git a/drivers/w1/w1-gpio.c b/drivers/w1/w1-gpio.c
index 45ad47a5d6b..ba3dd688e6e 100644
--- a/drivers/w1/w1-gpio.c
+++ b/drivers/w1/w1-gpio.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <stdio.h>
 #include <w1.h>
 #include <linux/delay.h>
 
diff --git a/drivers/w1/w1-uclass.c b/drivers/w1/w1-uclass.c
index 9478c93e9b0..61887bee1de 100644
--- a/drivers/w1/w1-uclass.c
+++ b/drivers/w1/w1-uclass.c
@@ -13,6 +13,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <stdio.h>
 #include <w1.h>
 #include <w1-eeprom.h>
 
diff --git a/drivers/watchdog/at91sam9_wdt.c b/drivers/watchdog/at91sam9_wdt.c
index e64831132dc..a5cbc4309cc 100644
--- a/drivers/watchdog/at91sam9_wdt.c
+++ b/drivers/watchdog/at91sam9_wdt.c
@@ -15,6 +15,7 @@
  */
 
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/at91_wdt.h>
diff --git a/drivers/watchdog/ftwdt010_wdt.c b/drivers/watchdog/ftwdt010_wdt.c
index 6aed41642de..c46e610577e 100644
--- a/drivers/watchdog/ftwdt010_wdt.c
+++ b/drivers/watchdog/ftwdt010_wdt.c
@@ -15,6 +15,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <watchdog.h>
 #include <asm/io.h>
 #include <faraday/ftwdt010_wdt.h>
diff --git a/drivers/watchdog/wdt-uclass.c b/drivers/watchdog/wdt-uclass.c
index 28f7918c467..0ef303f1f2d 100644
--- a/drivers/watchdog/wdt-uclass.c
+++ b/drivers/watchdog/wdt-uclass.c
@@ -8,6 +8,7 @@
 #include <errno.h>
 #include <hang.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <wdt.h>
 #include <asm/global_data.h>
diff --git a/env/common.c b/env/common.c
index 1918bfa47ff..4df445eb2c4 100644
--- a/env/common.c
+++ b/env/common.c
@@ -14,6 +14,7 @@
 #include <env_internal.h>
 #include <log.h>
 #include <sort.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/printk.h>
 #include <linux/stddef.h>
diff --git a/env/env.c b/env/env.c
index 51f55ec3fe8..c289af4c6a4 100644
--- a/env/env.c
+++ b/env/env.c
@@ -8,6 +8,7 @@
 #include <env.h>
 #include <env_internal.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/bug.h>
diff --git a/env/ext4.c b/env/ext4.c
index 03f8e4e027b..a51c7c6eff3 100644
--- a/env/ext4.c
+++ b/env/ext4.c
@@ -20,6 +20,7 @@
 
 #include <common.h>
 #include <part.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 #include <command.h>
diff --git a/env/fat.c b/env/fat.c
index adc5e9259c2..e95af7e19d3 100644
--- a/env/fat.c
+++ b/env/fat.c
@@ -17,6 +17,7 @@
 #include <errno.h>
 #include <fat.h>
 #include <mmc.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <linux/stddef.h>
 #include <linux/string.h>
diff --git a/env/flash.c b/env/flash.c
index 6fb9ba7edef..7e355d22726 100644
--- a/env/flash.c
+++ b/env/flash.c
@@ -15,6 +15,7 @@
 #include <env_internal.h>
 #include <flash.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/stddef.h>
 #include <malloc.h>
diff --git a/env/mmc.c b/env/mmc.c
index af022843704..13966f3395c 100644
--- a/env/mmc.c
+++ b/env/mmc.c
@@ -6,6 +6,7 @@
 /* #define DEBUG */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/string.h>
 
diff --git a/env/nand.c b/env/nand.c
index be82e97d69c..e8d226ee715 100644
--- a/env/nand.c
+++ b/env/nand.c
@@ -17,6 +17,7 @@
 #include <command.h>
 #include <env.h>
 #include <env_internal.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/stddef.h>
 #include <malloc.h>
diff --git a/env/onenand.c b/env/onenand.c
index c8da3ff8114..8ef4ca7535e 100644
--- a/env/onenand.c
+++ b/env/onenand.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <command.h>
 #include <env_internal.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/stddef.h>
 #include <malloc.h>
diff --git a/env/remote.c b/env/remote.c
index 166bebf52b5..131ac83584f 100644
--- a/env/remote.c
+++ b/env/remote.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <command.h>
 #include <env_internal.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/stddef.h>
 #include <u-boot/crc.h>
diff --git a/env/sata.c b/env/sata.c
index 9442cfcaf3c..d88771b27e2 100644
--- a/env/sata.c
+++ b/env/sata.c
@@ -6,6 +6,7 @@
 /* #define DEBUG */
 
 #include <common.h>
+#include <stdio.h>
 
 #include <command.h>
 #include <env.h>
diff --git a/env/sf.c b/env/sf.c
index f01d1dbcb21..077d82f8e77 100644
--- a/env/sf.c
+++ b/env/sf.c
@@ -18,6 +18,7 @@
 #include <spi_flash.h>
 #include <search.h>
 #include <errno.h>
+#include <stdio.h>
 #include <uuid.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
diff --git a/env/ubi.c b/env/ubi.c
index f1e9d42dbf4..12495776609 100644
--- a/env/ubi.c
+++ b/env/ubi.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/string.h>
 
diff --git a/examples/api/demo.c b/examples/api/demo.c
index 789847c401e..ce1e07bf485 100644
--- a/examples/api/demo.c
+++ b/examples/api/demo.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <env.h>
+#include <stdio.h>
 #include <linux/string.h>
 #include <linux/types.h>
 #include <api_public.h>
diff --git a/examples/api/libgenwrap.c b/examples/api/libgenwrap.c
index 3aa222866ff..b69ce054ab2 100644
--- a/examples/api/libgenwrap.c
+++ b/examples/api/libgenwrap.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <command.h>
 #include <hang.h>
+#include <stdio.h>
 #include <linux/delay.h>
 #include <linux/types.h>
 #include <api_public.h>
diff --git a/examples/standalone/atmel_df_pow2.c b/examples/standalone/atmel_df_pow2.c
index 271561d7d96..1d32aa90342 100644
--- a/examples/standalone/atmel_df_pow2.c
+++ b/examples/standalone/atmel_df_pow2.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <exports.h>
 #include <spi.h>
+#include <stdio.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 
diff --git a/examples/standalone/hello_world.c b/examples/standalone/hello_world.c
index 263cd9ca079..64f2d950be4 100644
--- a/examples/standalone/hello_world.c
+++ b/examples/standalone/hello_world.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <exports.h>
+#include <stdio.h>
 
 int hello_world(int argc, char *const argv[])
 {
diff --git a/examples/standalone/sched.c b/examples/standalone/sched.c
index 1c529607132..0d734e7c9df 100644
--- a/examples/standalone/sched.c
+++ b/examples/standalone/sched.c
@@ -2,6 +2,7 @@
 
 #include <common.h>
 #include <exports.h>
+#include <stdio.h>
 
 /*
  * Author: Arun Dharankar <ADharankar@ATTBI.Com>
diff --git a/fs/btrfs/dir-item.c b/fs/btrfs/dir-item.c
index 63b5bf0a860..9ce2979a758 100644
--- a/fs/btrfs/dir-item.c
+++ b/fs/btrfs/dir-item.c
@@ -6,6 +6,7 @@
  */
 
 #include "btrfs.h"
+#include <stdio.h>
 
 static int verify_dir_item(struct btrfs_dir_item *item, u32 start, u32 total)
 {
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 991c2f68c3b..f1e185b2a9e 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -7,6 +7,7 @@
 
 #include "btrfs.h"
 #include <malloc.h>
+#include <stdio.h>
 
 u64 btrfs_lookup_inode_ref(struct btrfs_root *root, u64 inr,
 			   struct btrfs_inode_ref *refp, char *name)
diff --git a/fs/btrfs/root.c b/fs/btrfs/root.c
index 127b67fd1c8..2c302506953 100644
--- a/fs/btrfs/root.c
+++ b/fs/btrfs/root.c
@@ -6,6 +6,7 @@
  */
 
 #include "btrfs.h"
+#include <stdio.h>
 
 static void read_root_item(struct btrfs_path *p, struct btrfs_root_item *item)
 {
diff --git a/fs/btrfs/subvolume.c b/fs/btrfs/subvolume.c
index 06e54f33109..72f9b01d3b3 100644
--- a/fs/btrfs/subvolume.c
+++ b/fs/btrfs/subvolume.c
@@ -7,6 +7,7 @@
 
 #include "btrfs.h"
 #include <malloc.h>
+#include <stdio.h>
 
 static int get_subvol_name(u64 subvolid, char *name, int max_len)
 {
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index 477a4ab8173..0b6def086ea 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <memalign.h>
 #include <part.h>
+#include <stdio.h>
 #include <linux/compat.h>
 #include <linux/string.h>
 #include "btrfs.h"
diff --git a/fs/cramfs/uncompress.c b/fs/cramfs/uncompress.c
index f431cc46c1f..a30747f8501 100644
--- a/fs/cramfs/uncompress.c
+++ b/fs/cramfs/uncompress.c
@@ -22,6 +22,7 @@
 
 #include <common.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <watchdog.h>
 #include <u-boot/zlib.h>
 
diff --git a/fs/ext4/ext4_common.c b/fs/ext4/ext4_common.c
index 8022d737634..a6fbd5a971d 100644
--- a/fs/ext4/ext4_common.c
+++ b/fs/ext4/ext4_common.c
@@ -27,6 +27,7 @@
 #include <memalign.h>
 #include <part.h>
 #include <stddef.h>
+#include <stdio.h>
 #include <linux/stat.h>
 #include <linux/string.h>
 #include <linux/time.h>
diff --git a/fs/ext4/ext4_journal.c b/fs/ext4/ext4_journal.c
index 82af0784bd8..9f1eb6ad9d1 100644
--- a/fs/ext4/ext4_journal.c
+++ b/fs/ext4/ext4_journal.c
@@ -19,6 +19,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <ext_common.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/string.h>
 #include "ext4_common.h"
diff --git a/fs/ext4/ext4_write.c b/fs/ext4/ext4_write.c
index 7c04c5d3dd6..22bb845f8bf 100644
--- a/fs/ext4/ext4_write.c
+++ b/fs/ext4/ext4_write.c
@@ -27,6 +27,7 @@
 #include <malloc.h>
 #include <memalign.h>
 #include <part.h>
+#include <stdio.h>
 #include <linux/stat.h>
 #include <div64.h>
 #include <linux/string.h>
diff --git a/fs/ext4/ext4fs.c b/fs/ext4/ext4fs.c
index 44df0f4a4ad..c004d5facbb 100644
--- a/fs/ext4/ext4fs.c
+++ b/fs/ext4/ext4fs.c
@@ -27,6 +27,7 @@
 #include <div64.h>
 #include <malloc.h>
 #include <part.h>
+#include <stdio.h>
 #include <uuid.h>
 #include <linux/string.h>
 #include "ext4_common.h"
diff --git a/fs/fat/fat.c b/fs/fat/fat.c
index e590fdd0f1e..28ac59c2d73 100644
--- a/fs/fat/fat.c
+++ b/fs/fat/fat.c
@@ -15,6 +15,7 @@
 #include <fat.h>
 #include <fs.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/byteorder.h>
 #include <part.h>
 #include <malloc.h>
diff --git a/fs/fat/fat_write.c b/fs/fat/fat_write.c
index 9facf7609f2..bdc604038ad 100644
--- a/fs/fat/fat_write.c
+++ b/fs/fat/fat_write.c
@@ -11,6 +11,7 @@
 #include <fat.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/byteorder.h>
 #include <part.h>
 #include <asm/cache.h>
diff --git a/fs/fs.c b/fs/fs.c
index c6fdbdcc4b4..5b8e2d6557e 100644
--- a/fs/fs.c
+++ b/fs/fs.c
@@ -17,6 +17,7 @@
 #include <fat.h>
 #include <fs.h>
 #include <sandboxfs.h>
+#include <stdio.h>
 #include <time.h>
 #include <ubifs_uboot.h>
 #include <btrfs.h>
diff --git a/fs/fs_internal.c b/fs/fs_internal.c
index 55d6d26ba5f..37223573a7c 100644
--- a/fs/fs_internal.c
+++ b/fs/fs_internal.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <part.h>
 #include <memalign.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 int fs_devread(struct blk_desc *blk, struct disk_partition *partition,
diff --git a/fs/jffs2/jffs2_1pass.c b/fs/jffs2/jffs2_1pass.c
index c5b14297398..af3a0fc48aa 100644
--- a/fs/jffs2/jffs2_1pass.c
+++ b/fs/jffs2/jffs2_1pass.c
@@ -116,6 +116,7 @@
 #include <flash.h>
 #include <malloc.h>
 #include <div64.h>
+#include <stdio.h>
 #include <linux/compiler.h>
 #include <linux/stat.h>
 #include <linux/string.h>
diff --git a/fs/reiserfs/reiserfs.c b/fs/reiserfs/reiserfs.c
index cf053e12d94..37068e295b3 100644
--- a/fs/reiserfs/reiserfs.c
+++ b/fs/reiserfs/reiserfs.c
@@ -17,6 +17,7 @@
 
 #include <common.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <linux/ctype.h>
 #include <linux/string.h>
 #include <linux/time.h>
diff --git a/fs/sandbox/sandboxfs.c b/fs/sandbox/sandboxfs.c
index 4ae41d5b4db..59e18d0c049 100644
--- a/fs/sandbox/sandboxfs.c
+++ b/fs/sandbox/sandboxfs.c
@@ -8,6 +8,7 @@
 #include <malloc.h>
 #include <os.h>
 #include <sandboxfs.h>
+#include <stdio.h>
 
 int sandbox_fs_set_blk_dev(struct blk_desc *rbdd, struct disk_partition *info)
 {
diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c
index 1ce46ef542d..ebb0d1c1571 100644
--- a/fs/ubifs/super.c
+++ b/fs/ubifs/super.c
@@ -32,6 +32,7 @@
 #include <common.h>
 #include <malloc.h>
 #include <memalign.h>
+#include <stdio.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 76ea7a8031e..deb2d21b0a2 100644
--- a/fs/ubifs/ubifs.c
+++ b/fs/ubifs/ubifs.c
@@ -17,6 +17,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <memalign.h>
+#include <stdio.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 3528a70dc05..91ed09888e7 100644
--- a/fs/yaffs2/yaffs_uboot_glue.c
+++ b/fs/yaffs2/yaffs_uboot_glue.c
@@ -22,6 +22,7 @@
 #include <common.h>
 #include <div64.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/fs/yaffs2/yaffsfs.c b/fs/yaffs2/yaffsfs.c
index 2643cc51057..5bf9350c822 100644
--- a/fs/yaffs2/yaffsfs.c
+++ b/fs/yaffs2/yaffsfs.c
@@ -12,6 +12,7 @@
  */
 
 #include <div64.h>
+#include <stdio.h>
 #include <linux/string.h>
 #include "yaffsfs.h"
 #include "yaffs_guts.h"
diff --git a/fs/yaffs2/ydirectenv.h b/fs/yaffs2/ydirectenv.h
index a68c7637867..cad7a35a4e5 100644
--- a/fs/yaffs2/ydirectenv.h
+++ b/fs/yaffs2/ydirectenv.h
@@ -22,6 +22,7 @@
 
 #include <common.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <linux/compat.h>
 #include <linux/string.h>
 
diff --git a/fs/zfs/zfs.c b/fs/zfs/zfs.c
index 8958a256227..b63022aae32 100644
--- a/fs/zfs/zfs.c
+++ b/fs/zfs/zfs.c
@@ -13,6 +13,7 @@
 #include <common.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <linux/stat.h>
 #include <linux/string.h>
 #include <linux/time.h>
diff --git a/fs/zfs/zfs_lzjb.c b/fs/zfs/zfs_lzjb.c
index b42d4980129..c2a9ae1ddef 100644
--- a/fs/zfs/zfs_lzjb.c
+++ b/fs/zfs/zfs_lzjb.c
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <linux/stat.h>
 #include <linux/time.h>
 #include <linux/ctype.h>
diff --git a/include/bootcount.h b/include/bootcount.h
index bb235407e30..a3ce4094854 100644
--- a/include/bootcount.h
+++ b/include/bootcount.h
@@ -7,6 +7,7 @@
 #define _BOOTCOUNT_H__
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/byteorder.h>
diff --git a/include/common.h b/include/common.h
index 6407748e53d..33171360ddb 100644
--- a/include/common.h
+++ b/include/common.h
@@ -17,7 +17,6 @@
 #include <errno.h>
 #include <linux/types.h>
 #include <stdarg.h>
-#include <stdio.h>
 #include <linux/kernel.h>
 #include <vsprintf.h>
 #endif	/* __ASSEMBLY__ */
diff --git a/include/dfu.h b/include/dfu.h
index 6fa45059360..436057e378e 100644
--- a/include/dfu.h
+++ b/include/dfu.h
@@ -11,6 +11,7 @@
 #define __DFU_ENTITY_H_
 
 #include <common.h>
+#include <stdio.h>
 #include <linux/list.h>
 #include <mmc.h>
 #include <spi_flash.h>
diff --git a/include/exports.h b/include/exports.h
index 902f8b559b2..5e10fc3bce5 100644
--- a/include/exports.h
+++ b/include/exports.h
@@ -2,6 +2,7 @@
 #define __EXPORTS_H__
 
 #include <irq_func.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
diff --git a/include/i2c.h b/include/i2c.h
index 1d792db454a..7ea6b9a14cb 100644
--- a/include/i2c.h
+++ b/include/i2c.h
@@ -17,6 +17,7 @@
 #define _I2C_H_
 
 #include <linker_lists.h>
+#include <stdio.h>
 
 /*
  * For now there are essentially two parts to this file - driver model
diff --git a/include/initcall.h b/include/initcall.h
index 41b74dc52d2..63098644cd3 100644
--- a/include/initcall.h
+++ b/include/initcall.h
@@ -12,6 +12,7 @@ typedef int (*init_fnc_t)(void);
 #ifdef CONFIG_EFI_APP
 #include <efi.h>
 #endif
+#include <stdio.h>
 
 /*
  * To enable debugging. add #define DEBUG at the top of the including file.
diff --git a/include/spi_flash.h b/include/spi_flash.h
index e5e9e3eb040..35af2cf5707 100644
--- a/include/spi_flash.h
+++ b/include/spi_flash.h
@@ -10,6 +10,7 @@
 #define _SPI_FLASH_H_
 
 #include <dm.h>	/* Because we dereference struct udevice here */
+#include <stdio.h>
 #include <linux/string.h>
 #include <linux/types.h>
 #include <linux/mtd/spi-nor.h>
diff --git a/include/wait_bit.h b/include/wait_bit.h
index dc2ffeb2c24..a9bf4d90a8f 100644
--- a/include/wait_bit.h
+++ b/include/wait_bit.h
@@ -10,6 +10,7 @@
 
 #include <console.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <watchdog.h>
 #include <linux/delay.h>
diff --git a/lib/aes.c b/lib/aes.c
index ab1f8d67a53..204431bcf77 100644
--- a/lib/aes.c
+++ b/lib/aes.c
@@ -25,6 +25,7 @@
 #include <common.h>
 #include <display_options.h>
 #include <log.h>
+#include <stdio.h>
 #include <linux/string.h>
 #else
 #include <string.h>
diff --git a/lib/aes/aes-decrypt.c b/lib/aes/aes-decrypt.c
index 06b5e027409..09fdf38df63 100644
--- a/lib/aes/aes-decrypt.c
+++ b/lib/aes/aes-decrypt.c
@@ -6,6 +6,7 @@
 #ifndef USE_HOSTCC
 #include <common.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <linux/string.h>
 #endif
 #include <image.h>
diff --git a/lib/bzip2/bzlib.c b/lib/bzip2/bzlib.c
index 010ff4d7331..3051b7eb1a5 100644
--- a/lib/bzip2/bzlib.c
+++ b/lib/bzip2/bzlib.c
@@ -1,6 +1,7 @@
 #include <config.h>
 #include <common.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <watchdog.h>
 #include <linux/string.h>
 
diff --git a/lib/charset.c b/lib/charset.c
index 55a487253fa..b69e111918a 100644
--- a/lib/charset.c
+++ b/lib/charset.c
@@ -9,6 +9,7 @@
 #include <charset.h>
 #include <capitalization.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 static struct capitalization_table capitalization_table[] =
diff --git a/lib/dhry/cmd_dhry.c b/lib/dhry/cmd_dhry.c
index bbb02d4ad9b..ec4b511d492 100644
--- a/lib/dhry/cmd_dhry.c
+++ b/lib/dhry/cmd_dhry.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <command.h>
 #include <div64.h>
+#include <stdio.h>
 #include <time.h>
 #include "dhry.h"
 
diff --git a/lib/dhry/dhry_1.c b/lib/dhry/dhry_1.c
index b36c1672b4a..3636097ba08 100644
--- a/lib/dhry/dhry_1.c
+++ b/lib/dhry/dhry_1.c
@@ -44,6 +44,7 @@ char SCCSid[] = "@(#) @(#)dhry_1.c:3.4 -- 5/15/91 19:30:21";
 
 #include <common.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <string.h>
 
 #include "dhry.h"
diff --git a/lib/display_options.c b/lib/display_options.c
index 90e8ce54783..14cb3cff055 100644
--- a/lib/display_options.c
+++ b/lib/display_options.c
@@ -9,6 +9,7 @@
 #include <console.h>
 #include <display_options.h>
 #include <div64.h>
+#include <stdio.h>
 #include <version.h>
 #include <linux/ctype.h>
 #include <asm/io.h>
diff --git a/lib/efi/efi_app.c b/lib/efi/efi_app.c
index 878c1cd6e5c..c1796f83a59 100644
--- a/lib/efi/efi_app.c
+++ b/lib/efi/efi_app.c
@@ -15,6 +15,7 @@
 #include <errno.h>
 #include <init.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/err.h>
 #include <linux/string.h>
diff --git a/lib/efi/efi_stub.c b/lib/efi/efi_stub.c
index b19e6d21a79..97a709904df 100644
--- a/lib/efi/efi_stub.c
+++ b/lib/efi/efi_stub.c
@@ -16,6 +16,7 @@
 #include <errno.h>
 #include <malloc.h>
 #include <ns16550.h>
+#include <stdio.h>
 #include <asm/cpu.h>
 #include <asm/io.h>
 #include <linux/err.h>
diff --git a/lib/efi_driver/efi_uclass.c b/lib/efi_driver/efi_uclass.c
index 04e4e457344..15e1e67bdc9 100644
--- a/lib/efi_driver/efi_uclass.c
+++ b/lib/efi_driver/efi_uclass.c
@@ -20,6 +20,7 @@
 #include <efi_driver.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 
 /**
  * check_node_type() - check node type
diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c
index 8f264532f62..7bdd8a0a913 100644
--- a/lib/efi_loader/efi_boottime.c
+++ b/lib/efi_loader/efi_boottime.c
@@ -11,6 +11,7 @@
 #include <irq_func.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
diff --git a/lib/efi_loader/efi_console.c b/lib/efi_loader/efi_console.c
index 48c7940e5bf..088e3eacb82 100644
--- a/lib/efi_loader/efi_console.c
+++ b/lib/efi_loader/efi_console.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <charset.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <time.h>
 #include <dm/device.h>
 #include <efi_loader.h>
diff --git a/lib/efi_loader/efi_file.c b/lib/efi_loader/efi_file.c
index 5954397e4da..0226e65ef54 100644
--- a/lib/efi_loader/efi_file.c
+++ b/lib/efi_loader/efi_file.c
@@ -13,6 +13,7 @@
 #include <mapmem.h>
 #include <fs.h>
 #include <part.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 /* GUID for file system information */
diff --git a/lib/efi_loader/efi_gop.c b/lib/efi_loader/efi_gop.c
index c26493af6ca..44ffed05c69 100644
--- a/lib/efi_loader/efi_gop.c
+++ b/lib/efi_loader/efi_gop.c
@@ -11,6 +11,7 @@
 #include <lcd.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <video.h>
 #include <asm/global_data.h>
 #include <linux/string.h>
diff --git a/lib/efi_loader/efi_image_loader.c b/lib/efi_loader/efi_image_loader.c
index d4c7d3f770e..eec1e2aeab1 100644
--- a/lib/efi_loader/efi_image_loader.c
+++ b/lib/efi_loader/efi_image_loader.c
@@ -13,6 +13,7 @@
 #include <malloc.h>
 #include <pe.h>
 #include <sort.h>
+#include <stdio.h>
 #include <crypto/pkcs7_parser.h>
 #include <linux/err.h>
 #include <linux/string.h>
diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c
index 7041bd6ed2b..9b7bfc8fc29 100644
--- a/lib/efi_loader/efi_memory.c
+++ b/lib/efi_loader/efi_memory.c
@@ -10,6 +10,7 @@
 #include <init.h>
 #include <malloc.h>
 #include <mapmem.h>
+#include <stdio.h>
 #include <watchdog.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
diff --git a/lib/efi_loader/efi_net.c b/lib/efi_loader/efi_net.c
index b056e08b3ec..51c1bd2f606 100644
--- a/lib/efi_loader/efi_net.c
+++ b/lib/efi_loader/efi_net.c
@@ -19,6 +19,7 @@
 #include <efi_loader.h>
 #include <malloc.h>
 #include <net.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 static const efi_guid_t efi_net_guid = EFI_SIMPLE_NETWORK_PROTOCOL_GUID;
diff --git a/lib/efi_loader/efi_runtime.c b/lib/efi_loader/efi_runtime.c
index ddc6e6a4cde..5b6ab297cbb 100644
--- a/lib/efi_loader/efi_runtime.c
+++ b/lib/efi_loader/efi_runtime.c
@@ -14,6 +14,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <rtc.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
diff --git a/lib/efi_loader/efi_setup.c b/lib/efi_loader/efi_setup.c
index 51fc48b780b..d675b96e64f 100644
--- a/lib/efi_loader/efi_setup.c
+++ b/lib/efi_loader/efi_setup.c
@@ -9,6 +9,7 @@
 #include <bootm.h>
 #include <efi_loader.h>
 #include <efi_variable.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 #define OBJ_LIST_NOT_INITIALIZED 1
diff --git a/lib/efi_loader/efi_var_common.c b/lib/efi_loader/efi_var_common.c
index ee2e67bc8cb..0b491ed472d 100644
--- a/lib/efi_loader/efi_var_common.c
+++ b/lib/efi_loader/efi_var_common.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <efi_loader.h>
 #include <efi_variable.h>
+#include <stdio.h>
 
 enum efi_secure_mode {
 	EFI_MODE_SETUP,
diff --git a/lib/efi_loader/efi_watchdog.c b/lib/efi_loader/efi_watchdog.c
index 61ea0f79260..4d097929e83 100644
--- a/lib/efi_loader/efi_watchdog.c
+++ b/lib/efi_loader/efi_watchdog.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <efi_loader.h>
+#include <stdio.h>
 
 /* Conversion factor from seconds to multiples of 100ns */
 #define EFI_SECONDS_TO_100NS 10000000ULL
diff --git a/lib/efi_selftest/efi_selftest_devicepath_util.c b/lib/efi_selftest/efi_selftest_devicepath_util.c
index c846e057d35..c82b3725832 100644
--- a/lib/efi_selftest/efi_selftest_devicepath_util.c
+++ b/lib/efi_selftest/efi_selftest_devicepath_util.c
@@ -8,6 +8,7 @@
  */
 
 #include <efi_selftest.h>
+#include <stdio.h>
 
 static struct efi_boot_services *boottime;
 
diff --git a/lib/efi_selftest/efi_selftest_fdt.c b/lib/efi_selftest/efi_selftest_fdt.c
index 94d72d3f6d8..db94bef0803 100644
--- a/lib/efi_selftest/efi_selftest_fdt.c
+++ b/lib/efi_selftest/efi_selftest_fdt.c
@@ -11,6 +11,7 @@
  */
 
 #include <efi_selftest.h>
+#include <stdio.h>
 #include <linux/libfdt.h>
 
 static const struct efi_system_table *systemtab;
diff --git a/lib/efi_selftest/efi_selftest_manageprotocols.c b/lib/efi_selftest/efi_selftest_manageprotocols.c
index f22cad4c1c0..717774e00f3 100644
--- a/lib/efi_selftest/efi_selftest_manageprotocols.c
+++ b/lib/efi_selftest/efi_selftest_manageprotocols.c
@@ -12,6 +12,7 @@
  */
 
 #include <efi_selftest.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 /*
diff --git a/lib/elf.c b/lib/elf.c
index 4c5b050da2e..7b24ca685a4 100644
--- a/lib/elf.c
+++ b/lib/elf.c
@@ -9,6 +9,7 @@
 #include <elf.h>
 #include <env.h>
 #include <net.h>
+#include <stdio.h>
 #include <vxworks.h>
 #ifdef CONFIG_X86
 #include <vbe.h>
diff --git a/lib/fdtdec.c b/lib/fdtdec.c
index e938ea5ea30..8370ecd11ea 100644
--- a/lib/fdtdec.c
+++ b/lib/fdtdec.c
@@ -13,6 +13,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <net.h>
+#include <stdio.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 28260468e07..897b2d26299 100644
--- a/lib/fdtdec_test.c
+++ b/lib/fdtdec_test.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <command.h>
 #include <fdtdec.h>
+#include <stdio.h>
 #include <linux/libfdt.h>
 #include <malloc.h>
 #include <os.h>
diff --git a/lib/gunzip.c b/lib/gunzip.c
index 1073bebac06..60429e5dd7e 100644
--- a/lib/gunzip.c
+++ b/lib/gunzip.c
@@ -13,6 +13,7 @@
 #include <image.h>
 #include <malloc.h>
 #include <memalign.h>
+#include <stdio.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
 #include <watchdog.h>
diff --git a/lib/gzip.c b/lib/gzip.c
index c6c0ec880cf..db36a3e5680 100644
--- a/lib/gzip.c
+++ b/lib/gzip.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <watchdog.h>
 #include <command.h>
 #include <gzip.h>
diff --git a/lib/hang.c b/lib/hang.c
index 578ac78d453..875ed55187b 100644
--- a/lib/hang.c
+++ b/lib/hang.c
@@ -11,6 +11,7 @@
 #include <bootstage.h>
 #include <hang.h>
 #include <os.h>
+#include <stdio.h>
 
 /**
  * hang - stop processing by staying in an endless loop
diff --git a/lib/hashtable.c b/lib/hashtable.c
index 063e2aaf578..f3f99bf1dfc 100644
--- a/lib/hashtable.c
+++ b/lib/hashtable.c
@@ -16,6 +16,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <sort.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 #ifdef USE_HOSTCC		/* HOST build */
diff --git a/lib/hexdump.c b/lib/hexdump.c
index a3f219a8741..3a0861c7d38 100644
--- a/lib/hexdump.c
+++ b/lib/hexdump.c
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <hexdump.h>
+#include <stdio.h>
 #include <linux/ctype.h>
 #include <linux/compat.h>
 #include <linux/log2.h>
diff --git a/lib/image-sparse.c b/lib/image-sparse.c
index 187ac28cd36..5f985a0aa5c 100644
--- a/lib/image-sparse.c
+++ b/lib/image-sparse.c
@@ -43,6 +43,7 @@
 #include <malloc.h>
 #include <part.h>
 #include <sparse_format.h>
+#include <stdio.h>
 #include <asm/cache.h>
 
 #include <linux/math64.h>
diff --git a/lib/libavb/avb_sysdeps_posix.c b/lib/libavb/avb_sysdeps_posix.c
index 88135b90850..a563d397bf5 100644
--- a/lib/libavb/avb_sysdeps_posix.c
+++ b/lib/libavb/avb_sysdeps_posix.c
@@ -6,6 +6,7 @@
 #include <hang.h>
 #include <malloc.h>
 #include <stdarg.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <linux/string.h>
 
diff --git a/lib/lmb.c b/lib/lmb.c
index 61a0bdb1e1a..b0b93839c28 100644
--- a/lib/lmb.c
+++ b/lib/lmb.c
@@ -11,6 +11,7 @@
 #include <lmb.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 
 #define LMB_ALLOC_ANYWHERE	0
diff --git a/lib/optee/optee.c b/lib/optee/optee.c
index ec1e29cc3f6..c902eee3bc4 100644
--- a/lib/optee/optee.c
+++ b/lib/optee/optee.c
@@ -9,6 +9,7 @@
 #include <image.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <linux/libfdt.h>
 #include <linux/string.h>
 #include <tee/optee.h>
diff --git a/lib/panic.c b/lib/panic.c
index 58382ac4f4c..eba1d43b755 100644
--- a/lib/panic.c
+++ b/lib/panic.c
@@ -14,6 +14,7 @@
 #if !defined(CONFIG_PANIC_HANG)
 #include <command.h>
 #endif
+#include <stdio.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 22ec890b407..a8f4f089f13 100644
--- a/lib/rsa/rsa-verify.c
+++ b/lib/rsa/rsa-verify.c
@@ -8,6 +8,7 @@
 #include <fdtdec.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/types.h>
 #include <asm/byteorder.h>
 #include <linux/errno.h>
diff --git a/lib/smbios.c b/lib/smbios.c
index 12f0a3a4ffd..489a0d61ee2 100644
--- a/lib/smbios.c
+++ b/lib/smbios.c
@@ -9,6 +9,7 @@
 #include <env.h>
 #include <mapmem.h>
 #include <smbios.h>
+#include <stdio.h>
 #include <tables_csum.h>
 #include <version.h>
 #ifdef CONFIG_CPU
diff --git a/lib/tiny-printf.c b/lib/tiny-printf.c
index 8fc7e48d994..4d65bd9eeb5 100644
--- a/lib/tiny-printf.c
+++ b/lib/tiny-printf.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <stdarg.h>
 #include <serial.h>
+#include <stdio.h>
 #include <linux/ctype.h>
 
 struct printf_info {
diff --git a/lib/trace.c b/lib/trace.c
index 1b59e7d1cb9..e6f34287295 100644
--- a/lib/trace.c
+++ b/lib/trace.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <mapmem.h>
+#include <stdio.h>
 #include <time.h>
 #include <trace.h>
 #include <asm/global_data.h>
diff --git a/lib/uuid.c b/lib/uuid.c
index ec6beedd55a..63efc114f84 100644
--- a/lib/uuid.c
+++ b/lib/uuid.c
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <env.h>
 #include <rand.h>
+#include <stdio.h>
 #include <time.h>
 #include <uuid.h>
 #include <linux/ctype.h>
diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index 9dc96c81c62..18d4bc5a27b 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -19,6 +19,7 @@
 #include <div64.h>
 #include <hexdump.h>
 #include <stdarg.h>
+#include <stdio.h>
 #include <uuid.h>
 #include <vsprintf.h>
 #include <linux/ctype.h>
diff --git a/net/arp.c b/net/arp.c
index 52f4f31e529..bea265b3674 100644
--- a/net/arp.c
+++ b/net/arp.c
@@ -13,6 +13,7 @@
 #include <env.h>
 #include <log.h>
 #include <net.h>
+#include <stdio.h>
 #include <time.h>
 #include <linux/delay.h>
 #include <linux/string.h>
diff --git a/net/bootp.c b/net/bootp.c
index 6038e7a86c6..f5d4f85fe24 100644
--- a/net/bootp.c
+++ b/net/bootp.c
@@ -16,6 +16,7 @@
 #include <log.h>
 #include <net.h>
 #include <rand.h>
+#include <stdio.h>
 #include <time.h>
 #include <uuid.h>
 #include <linux/delay.h>
diff --git a/net/cdp.c b/net/cdp.c
index af4ea9cd41a..fe19914659b 100644
--- a/net/cdp.c
+++ b/net/cdp.c
@@ -14,6 +14,7 @@
 #if defined(CONFIG_CDP_VERSION)
 #include <timestamp.h>
 #endif
+#include <stdio.h>
 #include <linux/string.h>
 
 #include "cdp.h"
diff --git a/net/dns.c b/net/dns.c
index 12182c9501c..c86e519c3c7 100644
--- a/net/dns.c
+++ b/net/dns.c
@@ -27,6 +27,7 @@
 #include <env.h>
 #include <log.h>
 #include <net.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/unaligned.h>
 #include <linux/string.h>
diff --git a/net/eth-uclass.c b/net/eth-uclass.c
index 42eb460e833..6eae0746d4d 100644
--- a/net/eth-uclass.c
+++ b/net/eth-uclass.c
@@ -11,6 +11,7 @@
 #include <env.h>
 #include <log.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
diff --git a/net/eth_legacy.c b/net/eth_legacy.c
index 1c9afd75f36..f130f260952 100644
--- a/net/eth_legacy.c
+++ b/net/eth_legacy.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <net.h>
 #include <phy.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/bug.h>
diff --git a/net/fastboot.c b/net/fastboot.c
index 4f1fed9e778..93b4863d476 100644
--- a/net/fastboot.c
+++ b/net/fastboot.c
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <fastboot.h>
 #include <net.h>
+#include <stdio.h>
 #include <time.h>
 #include <linux/printk.h>
 #include <linux/string.h>
diff --git a/net/link_local.c b/net/link_local.c
index 0ddd1bd061f..ce49abd0d1f 100644
--- a/net/link_local.c
+++ b/net/link_local.c
@@ -16,6 +16,7 @@
 #include <log.h>
 #include <net.h>
 #include <rand.h>
+#include <stdio.h>
 #include <time.h>
 #include <linux/string.h>
 #include "arp.h"
diff --git a/net/net.c b/net/net.c
index cf399b50918..612d8bc78b1 100644
--- a/net/net.c
+++ b/net/net.c
@@ -97,6 +97,7 @@
 #include <image.h>
 #include <log.h>
 #include <net.h>
+#include <stdio.h>
 #include <time.h>
 #include <linux/string.h>
 #include <net/fastboot.h>
diff --git a/net/nfs.c b/net/nfs.c
index 3d7ebeaff09..c675d8076a5 100644
--- a/net/nfs.c
+++ b/net/nfs.c
@@ -35,6 +35,7 @@
 #include <net.h>
 #include <malloc.h>
 #include <mapmem.h>
+#include <stdio.h>
 #include <linux/string.h>
 #include "nfs.h"
 #include "bootp.h"
diff --git a/net/pcap.c b/net/pcap.c
index 981f8f750e2..31cfc1ca848 100644
--- a/net/pcap.c
+++ b/net/pcap.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <net.h>
+#include <stdio.h>
 #include <linux/string.h>
 #include <net/pcap.h>
 #include <time.h>
diff --git a/net/rarp.c b/net/rarp.c
index 6fd07bc6f14..28abc8a4bcf 100644
--- a/net/rarp.c
+++ b/net/rarp.c
@@ -8,6 +8,7 @@
 #include <command.h>
 #include <log.h>
 #include <net.h>
+#include <stdio.h>
 #include <linux/string.h>
 #include <net/tftp.h>
 #include "nfs.h"
diff --git a/net/sntp.c b/net/sntp.c
index e814af66b79..9968984eece 100644
--- a/net/sntp.c
+++ b/net/sntp.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <net.h>
 #include <rtc.h>
+#include <stdio.h>
 #include <time.h>
 #include <linux/string.h>
 
diff --git a/net/tftp.c b/net/tftp.c
index 4c9e532fc01..e3bac0c95d8 100644
--- a/net/tftp.c
+++ b/net/tftp.c
@@ -16,6 +16,7 @@
 #include <log.h>
 #include <mapmem.h>
 #include <net.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/global_data.h>
 #include <linux/string.h>
diff --git a/post/cpu/mpc83xx/ecc.c b/post/cpu/mpc83xx/ecc.c
index 37a1a576a80..2d2849ee4f1 100644
--- a/post/cpu/mpc83xx/ecc.c
+++ b/post/cpu/mpc83xx/ecc.c
@@ -13,6 +13,7 @@
 #include <irq_func.h>
 #include <log.h>
 #include <mpc83xx.h>
+#include <stdio.h>
 #include <watchdog.h>
 #include <asm/io.h>
 #include <post.h>
diff --git a/post/drivers/flash.c b/post/drivers/flash.c
index 7c6caa4f197..721d48eb6b3 100644
--- a/post/drivers/flash.c
+++ b/post/drivers/flash.c
@@ -10,6 +10,7 @@
 #include <malloc.h>
 #include <post.h>
 #include <flash.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 #if CONFIG_POST & CONFIG_SYS_POST_FLASH
diff --git a/post/post.c b/post/post.c
index 65162e6d985..5671da10251 100644
--- a/post/post.c
+++ b/post/post.c
@@ -9,6 +9,7 @@
 #include <env.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <stdio_dev.h>
 #include <time.h>
 #include <watchdog.h>
diff --git a/test/cmd_ut.c b/test/cmd_ut.c
index cc9543c315c..a1cbbe2e405 100644
--- a/test/cmd_ut.c
+++ b/test/cmd_ut.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <stdio.h>
 #include <test/suites.h>
 #include <test/test.h>
 
diff --git a/test/command_ut.c b/test/command_ut.c
index 9837d10eb5c..3379252fd7d 100644
--- a/test/command_ut.c
+++ b/test/command_ut.c
@@ -9,6 +9,7 @@
 #include <command.h>
 #include <env.h>
 #include <log.h>
+#include <stdio.h>
 
 static const char test_cmd[] = "setenv list 1\n setenv list ${list}2; "
 		"setenv list ${list}3\0"
diff --git a/test/compression.c b/test/compression.c
index a2a4b9ff9e8..4fc7b07fece 100644
--- a/test/compression.c
+++ b/test/compression.c
@@ -12,6 +12,7 @@
 #include <lz4.h>
 #include <malloc.h>
 #include <mapmem.h>
+#include <stdio.h>
 #include <asm/io.h>
 
 #include <u-boot/zlib.h>
diff --git a/test/dm/core.c b/test/dm/core.c
index 621ce61f40a..194dc130a16 100644
--- a/test/dm/core.c
+++ b/test/dm/core.c
@@ -11,6 +11,7 @@
 #include <fdtdec.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <dm/device-internal.h>
 #include <dm/root.h>
diff --git a/test/dm/osd.c b/test/dm/osd.c
index 5739dfa0b8f..e1329349b2c 100644
--- a/test/dm/osd.c
+++ b/test/dm/osd.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <display_options.h>
 #include <dm.h>
+#include <stdio.h>
 #include <dm/test.h>
 #include <test/ut.h>
 #include <video_osd.h>
diff --git a/test/dm/rtc.c b/test/dm/rtc.c
index dd037a6e17a..cc91d91f398 100644
--- a/test/dm/rtc.c
+++ b/test/dm/rtc.c
@@ -10,6 +10,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <rtc.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/rtc.h>
 #include <asm/test.h>
diff --git a/test/dm/test-fdt.c b/test/dm/test-fdt.c
index 495883caaaf..12ec40c7b46 100644
--- a/test/dm/test-fdt.c
+++ b/test/dm/test-fdt.c
@@ -9,6 +9,7 @@
 #include <fdtdec.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm/test.h>
diff --git a/test/dm/test-main.c b/test/dm/test-main.c
index 32ae3b1d296..4c6b17db75e 100644
--- a/test/dm/test-main.c
+++ b/test/dm/test-main.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/state.h>
 #include <dm/test.h>
diff --git a/test/dm/usb.c b/test/dm/usb.c
index b273a515efd..293c0b43e5f 100644
--- a/test/dm/usb.c
+++ b/test/dm/usb.c
@@ -7,6 +7,7 @@
 #include <console.h>
 #include <dm.h>
 #include <part.h>
+#include <stdio.h>
 #include <usb.h>
 #include <asm/io.h>
 #include <asm/state.h>
diff --git a/test/lib/test_aes.c b/test/lib/test_aes.c
index cbc712f7eda..d287aedbdd1 100644
--- a/test/lib/test_aes.c
+++ b/test/lib/test_aes.c
@@ -9,6 +9,7 @@
 #include <command.h>
 #include <hexdump.h>
 #include <rand.h>
+#include <stdio.h>
 #include <uboot_aes.h>
 #include <test/lib.h>
 #include <test/test.h>
diff --git a/test/log/log_test.c b/test/log/log_test.c
index 4245372d65f..6b263557945 100644
--- a/test/log/log_test.c
+++ b/test/log/log_test.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <command.h>
 #include <log.h>
+#include <stdio.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 a456a449efa..206a72c789c 100644
--- a/test/print_ut.c
+++ b/test/print_ut.c
@@ -12,6 +12,7 @@
 #endif
 #include <display_options.h>
 #include <log.h>
+#include <stdio.h>
 #include <version.h>
 
 #define FAKE_BUILD_TAG	"jenkins-u-boot-denx_uboot_dm-master-build-aarch64" \
diff --git a/test/stdint/int-types.c b/test/stdint/int-types.c
index f6d09e8643d..0cde46dafa0 100644
--- a/test/stdint/int-types.c
+++ b/test/stdint/int-types.c
@@ -1,4 +1,5 @@
 #include <common.h>
+#include <stdio.h>
 
 int test_types(void)
 {
diff --git a/test/time_ut.c b/test/time_ut.c
index 80b82dbfd83..701b6cb4a7e 100644
--- a/test/time_ut.c
+++ b/test/time_ut.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <command.h>
 #include <errno.h>
+#include <stdio.h>
 #include <time.h>
 #include <linux/delay.h>
 
diff --git a/test/ut.c b/test/ut.c
index 9a11af4ad54..7acaae23d1d 100644
--- a/test/ut.c
+++ b/test/ut.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <console.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <test/test.h>
 #include <test/ut.h>
-- 
2.28.0.163.g6104cc2f0b6-goog

^ permalink raw reply related	[flat|nested] 35+ messages in thread

* [PATCH 09/16] common: Drop stdarg.h from common header
  2020-08-02 22:59 [PATCH 00/16] common: Drop remaining includes in common.h Simon Glass
                   ` (7 preceding siblings ...)
  2020-08-02 22:59 ` [PATCH 08/16] common: Drop stdio.h " Simon Glass
@ 2020-08-02 22:59 ` Simon Glass
  2020-08-02 22:59 ` [PATCH 10/16] common: Drop vsprintf.h " Simon Glass
                   ` (7 subsequent siblings)
  16 siblings, 0 replies; 35+ messages in thread
From: Simon Glass @ 2020-08-02 22:59 UTC (permalink / raw)
  To: u-boot

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 +
 board/CZ.NIC/turris_mox/turris_mox.c            | 1 +
 common/lcd_console.c                            | 1 +
 common/log.c                                    | 1 +
 common/log_syslog.c                             | 1 +
 drivers/core/util.c                             | 1 +
 drivers/fastboot/fb_common.c                    | 1 +
 drivers/gpio/gpio-uclass.c                      | 1 +
 drivers/mtd/nand/raw/brcmnand/brcmnand_compat.c | 1 +
 include/common.h                                | 1 -
 include/efi.h                                   | 1 +
 include/exports.h                               | 1 +
 lib/efi_selftest/efi_selftest_console.c         | 1 +
 lib/panic.c                                     | 1 +
 lib/tpm-common.c                                | 1 +
 post/post.c                                     | 1 +
 test/ut.c                                       | 1 +
 17 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/api/api.c b/api/api.c
index d6b5b60c225..748df20bebe 100644
--- a/api/api.c
+++ b/api/api.c
@@ -11,6 +11,7 @@
 #include <env.h>
 #include <malloc.h>
 #include <env_internal.h>
+#include <stdarg.h>
 #include <stdio.h>
 #include <time.h>
 #include <linux/delay.h>
diff --git a/board/CZ.NIC/turris_mox/turris_mox.c b/board/CZ.NIC/turris_mox/turris_mox.c
index f5fcb93262b..7f2ed1350bf 100644
--- a/board/CZ.NIC/turris_mox/turris_mox.c
+++ b/board/CZ.NIC/turris_mox/turris_mox.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <stdarg.h>
 #include <stdio.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
diff --git a/common/lcd_console.c b/common/lcd_console.c
index 7a10a20d724..0ccb4a46880 100644
--- a/common/lcd_console.c
+++ b/common/lcd_console.c
@@ -11,6 +11,7 @@
 #include <lcd.h>
 #include <log.h>
 #include <serial.h>
+#include <stdarg.h>
 #include <video_font.h>		/* Get font data, width and height */
 #if defined(CONFIG_LCD_LOGO)
 #include <bmp_logo.h>
diff --git a/common/log.c b/common/log.c
index 0eeee6a66b0..493ee0ff0d9 100644
--- a/common/log.c
+++ b/common/log.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdarg.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 2f3c93bf839..6cb4ed18ca1 100644
--- a/common/log_syslog.c
+++ b/common/log_syslog.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <log.h>
 #include <net.h>
+#include <stdarg.h>
 #include <asm/global_data.h>
 #include <linux/string.h>
 
diff --git a/drivers/core/util.c b/drivers/core/util.c
index 7a2fe1f4394..cd15768970c 100644
--- a/drivers/core/util.c
+++ b/drivers/core/util.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <stdarg.h>
 #include <stdio.h>
 #include <dm/device.h>
 #include <dm/ofnode.h>
diff --git a/drivers/fastboot/fb_common.c b/drivers/fastboot/fb_common.c
index da467666cf4..325ce4d283f 100644
--- a/drivers/fastboot/fb_common.c
+++ b/drivers/fastboot/fb_common.c
@@ -14,6 +14,7 @@
 #include <command.h>
 #include <env.h>
 #include <fastboot.h>
+#include <stdarg.h>
 #include <stdio.h>
 #include <linux/string.h>
 #include <net/fastboot.h>
diff --git a/drivers/gpio/gpio-uclass.c b/drivers/gpio/gpio-uclass.c
index 7d4e3354f17..2e371f3ad79 100644
--- a/drivers/gpio/gpio-uclass.c
+++ b/drivers/gpio/gpio-uclass.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <stdarg.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <dm/device-internal.h>
diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand_compat.c b/drivers/mtd/nand/raw/brcmnand/brcmnand_compat.c
index c58679834ed..93c75e4d9bb 100644
--- a/drivers/mtd/nand/raw/brcmnand/brcmnand_compat.c
+++ b/drivers/mtd/nand/raw/brcmnand/brcmnand_compat.c
@@ -2,6 +2,7 @@
 
 #include <common.h>
 #include <malloc.h>
+#include <stdarg.h>
 #include <dm/devres.h>
 #include "brcmnand_compat.h"
 
diff --git a/include/common.h b/include/common.h
index 33171360ddb..31c3d462132 100644
--- a/include/common.h
+++ b/include/common.h
@@ -16,7 +16,6 @@
 #include <config.h>
 #include <errno.h>
 #include <linux/types.h>
-#include <stdarg.h>
 #include <linux/kernel.h>
 #include <vsprintf.h>
 #endif	/* __ASSEMBLY__ */
diff --git a/include/efi.h b/include/efi.h
index f986aad8777..818295642dd 100644
--- a/include/efi.h
+++ b/include/efi.h
@@ -16,6 +16,7 @@
 #ifndef _EFI_H
 #define _EFI_H
 
+#include <stdarg.h>
 #include <linux/linkage.h>
 #include <linux/string.h>
 #include <linux/types.h>
diff --git a/include/exports.h b/include/exports.h
index 5e10fc3bce5..935cf594c3b 100644
--- a/include/exports.h
+++ b/include/exports.h
@@ -2,6 +2,7 @@
 #define __EXPORTS_H__
 
 #include <irq_func.h>
+#include <stdarg.h>
 #include <stdio.h>
 #include <time.h>
 #include <asm/global_data.h>
diff --git a/lib/efi_selftest/efi_selftest_console.c b/lib/efi_selftest/efi_selftest_console.c
index 13f3ee6bc19..0462c196c16 100644
--- a/lib/efi_selftest/efi_selftest_console.c
+++ b/lib/efi_selftest/efi_selftest_console.c
@@ -7,6 +7,7 @@
 
 #include <efi_selftest.h>
 #include <net.h>
+#include <stdarg.h>
 #include <vsprintf.h>
 
 struct efi_simple_text_output_protocol *con_out;
diff --git a/lib/panic.c b/lib/panic.c
index eba1d43b755..2267a8d4fb9 100644
--- a/lib/panic.c
+++ b/lib/panic.c
@@ -14,6 +14,7 @@
 #if !defined(CONFIG_PANIC_HANG)
 #include <command.h>
 #endif
+#include <stdarg.h>
 #include <stdio.h>
 #include <linux/delay.h>
 
diff --git a/lib/tpm-common.c b/lib/tpm-common.c
index adfe4919069..21fc4c7c865 100644
--- a/lib/tpm-common.c
+++ b/lib/tpm-common.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <stdarg.h>
 #include <asm/unaligned.h>
 #include <tpm-common.h>
 #include <linux/string.h>
diff --git a/post/post.c b/post/post.c
index 5671da10251..ad700975846 100644
--- a/post/post.c
+++ b/post/post.c
@@ -9,6 +9,7 @@
 #include <env.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdio_dev.h>
 #include <time.h>
diff --git a/test/ut.c b/test/ut.c
index 7acaae23d1d..ef5152bfdf0 100644
--- a/test/ut.c
+++ b/test/ut.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <console.h>
 #include <malloc.h>
+#include <stdarg.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <test/test.h>
-- 
2.28.0.163.g6104cc2f0b6-goog

^ permalink raw reply related	[flat|nested] 35+ messages in thread

* [PATCH 10/16] common: Drop vsprintf.h from common header
  2020-08-02 22:59 [PATCH 00/16] common: Drop remaining includes in common.h Simon Glass
                   ` (8 preceding siblings ...)
  2020-08-02 22:59 ` [PATCH 09/16] common: Drop stdarg.h " Simon Glass
@ 2020-08-02 22:59 ` Simon Glass
  2020-08-02 22:59 ` [PATCH 11/16] common: Drop errno.h " Simon Glass
                   ` (6 subsequent siblings)
  16 siblings, 0 replies; 35+ messages in thread
From: Simon Glass @ 2020-08-02 22:59 UTC (permalink / raw)
  To: u-boot

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

^ permalink raw reply related	[flat|nested] 35+ messages in thread

* [PATCH 11/16] common: Drop errno.h from common header
  2020-08-02 22:59 [PATCH 00/16] common: Drop remaining includes in common.h Simon Glass
                   ` (9 preceding siblings ...)
  2020-08-02 22:59 ` [PATCH 10/16] common: Drop vsprintf.h " Simon Glass
@ 2020-08-02 22:59 ` Simon Glass
  2020-08-02 22:59 ` [PATCH 12/16] common: Drop linux/kernel.h " Simon Glass
                   ` (5 subsequent siblings)
  16 siblings, 0 replies; 35+ messages in thread
From: Simon Glass @ 2020-08-02 22:59 UTC (permalink / raw)
  To: u-boot

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

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

 arch/arm/cpu/arm926ejs/mx25/generic.c               |  1 +
 arch/arm/cpu/armv7/s5p-common/pwm.c                 |  1 +
 arch/arm/cpu/armv7/vf610/generic.c                  |  1 +
 arch/arm/cpu/armv7/virt-dt.c                        |  1 +
 arch/arm/cpu/armv7m/cache.c                         |  1 +
 arch/arm/cpu/armv8/fsl-layerscape/ppa.c             |  1 +
 arch/arm/cpu/armv8/fsl-layerscape/soc.c             |  1 +
 arch/arm/cpu/armv8/s32v234/generic.c                |  1 +
 arch/arm/cpu/armv8/sec_firmware.c                   |  1 +
 arch/arm/cpu/armv8/spin_table.c                     |  1 +
 arch/arm/cpu/pxa/cpuinfo.c                          |  1 +
 arch/arm/include/asm/arch-tegra/cboot.h             |  1 +
 arch/arm/lib/gic-v3-its.c                           |  1 +
 arch/arm/mach-aspeed/ast2500/sdram_ast2500.c        |  1 +
 arch/arm/mach-bcm283x/msg.c                         |  1 +
 arch/arm/mach-imx/cmd_nandbcb.c                     |  1 +
 arch/arm/mach-imx/imx8/ahab.c                       |  1 +
 arch/arm/mach-imx/imx8/cpu.c                        |  1 +
 arch/arm/mach-imx/imx8/fdt.c                        |  1 +
 arch/arm/mach-imx/imx8/image.c                      |  1 +
 arch/arm/mach-imx/imx8/parse-container.c            |  1 +
 arch/arm/mach-imx/imx8/snvs_security_sc.c           |  1 +
 arch/arm/mach-imx/imx8m/clock_imx8mm.c              |  1 +
 arch/arm/mach-imx/imx8m/clock_imx8mq.c              |  1 +
 arch/arm/mach-imx/imx8m/clock_slice.c               |  1 +
 arch/arm/mach-imx/imx8m/soc.c                       |  1 +
 arch/arm/mach-imx/imx_bootaux.c                     |  1 +
 arch/arm/mach-imx/mx7ulp/clock.c                    |  1 +
 arch/arm/mach-imx/mx7ulp/pcc.c                      |  1 +
 arch/arm/mach-imx/mx7ulp/scg.c                      |  1 +
 arch/arm/mach-ipq40xx/clock-ipq4019.c               |  1 +
 arch/arm/mach-ipq40xx/pinctrl-snapdragon.c          |  1 +
 arch/arm/mach-k3/sysfw-loader.c                     |  1 +
 arch/arm/mach-keystone/cmd_mon.c                    |  1 +
 arch/arm/mach-meson/board-common.c                  |  1 +
 arch/arm/mach-meson/board-g12a.c                    |  1 +
 arch/arm/mach-meson/board-gx.c                      |  1 +
 arch/arm/mach-meson/sm.c                            |  1 +
 arch/arm/mach-mvebu/arm64-common.c                  |  1 +
 arch/arm/mach-mvebu/armada3700/cpu.c                |  1 +
 arch/arm/mach-mvebu/efuse.c                         |  1 +
 arch/arm/mach-nexell/clock.c                        |  1 +
 arch/arm/mach-omap2/sec-common.c                    |  1 +
 arch/arm/mach-rockchip/board.c                      |  1 +
 arch/arm/mach-rockchip/boot_mode.c                  |  1 +
 arch/arm/mach-rockchip/spl-boot-order.c             |  1 +
 arch/arm/mach-snapdragon/clock-snapdragon.c         |  1 +
 arch/arm/mach-snapdragon/dram.c                     |  1 +
 arch/arm/mach-snapdragon/pinctrl-snapdragon.c       |  1 +
 arch/arm/mach-socfpga/board.c                       |  1 +
 arch/arm/mach-socfpga/clock_manager_agilex.c        |  1 +
 arch/arm/mach-socfpga/clock_manager_arria10.c       |  1 +
 arch/arm/mach-socfpga/mailbox_s10.c                 |  1 +
 arch/arm/mach-socfpga/misc.c                        |  1 +
 arch/arm/mach-socfpga/misc_gen5.c                   |  1 +
 arch/arm/mach-socfpga/misc_s10.c                    |  1 +
 arch/arm/mach-socfpga/pinmux_arria10.c              |  1 +
 arch/arm/mach-socfpga/scan_manager.c                |  1 +
 arch/arm/mach-socfpga/wrap_iocsr_config.c           |  1 +
 arch/arm/mach-stm32mp/bsec.c                        |  1 +
 arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c     |  1 +
 .../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-stm32mp/include/mach/stm32mp1_smc.h   |  1 +
 arch/arm/mach-stm32mp/pwr_regulator.c               |  1 +
 arch/arm/mach-stm32mp/spl.c                         |  1 +
 arch/arm/mach-sunxi/cpu_info.c                      |  1 +
 arch/arm/mach-sunxi/dram_sun8i_a33.c                |  1 +
 arch/arm/mach-sunxi/dram_sun8i_a83t.c               |  1 +
 arch/arm/mach-sunxi/p2wi.c                          |  1 +
 arch/arm/mach-sunxi/rsb.c                           |  1 +
 arch/arm/mach-tegra/cboot.c                         |  1 +
 arch/arm/mach-tegra/clock.c                         |  1 +
 arch/arm/mach-tegra/ivc.c                           |  1 +
 arch/arm/mach-tegra/powergate.c                     |  1 +
 arch/arm/mach-tegra/tegra124/xusb-padctl.c          |  1 +
 arch/arm/mach-tegra/tegra20/clock.c                 |  1 +
 arch/arm/mach-tegra/tegra210/clock.c                |  1 +
 arch/arm/mach-tegra/tegra210/xusb-padctl.c          |  1 +
 arch/arm/mach-tegra/tegra30/clock.c                 |  1 +
 arch/arm/mach-tegra/xusb-padctl-common.c            |  1 +
 arch/arm/mach-tegra/xusb-padctl-dummy.c             |  1 +
 arch/arm/mach-zynq/clk.c                            |  1 +
 arch/arm/mach-zynq/cpu.c                            |  1 +
 arch/arm/mach-zynqmp/cpu.c                          |  1 +
 arch/m68k/lib/fec.c                                 |  1 +
 arch/nios2/cpu/cpu.c                                |  1 +
 arch/powerpc/cpu/mpc85xx/ether_fcc.c                |  1 +
 arch/riscv/lib/andes_plic.c                         |  1 +
 arch/riscv/lib/image.c                              |  1 +
 arch/riscv/lib/sbi.c                                |  1 +
 arch/riscv/lib/smp.c                                |  1 +
 arch/sandbox/cpu/cpu.c                              |  1 +
 arch/sandbox/cpu/eth-raw-os.c                       |  1 +
 arch/sandbox/cpu/os.c                               |  1 +
 arch/sandbox/cpu/sdl.c                              |  1 +
 arch/sandbox/cpu/spl.c                              |  1 +
 arch/sandbox/cpu/start.c                            |  1 +
 arch/sandbox/cpu/state.c                            |  1 +
 arch/sandbox/include/asm/sdl.h                      |  1 +
 arch/sandbox/lib/pci_io.c                           |  1 +
 arch/x86/cpu/acpi_gpe.c                             |  1 +
 arch/x86/cpu/apollolake/fsp_bindings.c              |  1 +
 arch/x86/cpu/apollolake/fsp_m.c                     |  1 +
 arch/x86/cpu/apollolake/fsp_s.c                     |  1 +
 arch/x86/cpu/apollolake/lpc.c                       |  1 +
 arch/x86/cpu/apollolake/punit.c                     |  1 +
 arch/x86/cpu/apollolake/spl.c                       |  1 +
 arch/x86/cpu/apollolake/uart.c                      |  1 +
 arch/x86/cpu/broadwell/adsp.c                       |  1 +
 arch/x86/cpu/broadwell/cpu.c                        |  1 +
 arch/x86/cpu/broadwell/cpu_from_spl.c               |  1 +
 arch/x86/cpu/broadwell/cpu_full.c                   |  1 +
 arch/x86/cpu/broadwell/iobp.c                       |  1 +
 arch/x86/cpu/broadwell/me.c                         |  1 +
 arch/x86/cpu/broadwell/pch.c                        |  1 +
 arch/x86/cpu/broadwell/pinctrl_broadwell.c          |  1 +
 arch/x86/cpu/broadwell/refcode.c                    |  1 +
 arch/x86/cpu/broadwell/sdram.c                      |  1 +
 arch/x86/cpu/coreboot/tables.c                      |  1 +
 arch/x86/cpu/cpu.c                                  |  1 +
 arch/x86/cpu/cpu_x86.c                              |  1 +
 arch/x86/cpu/efi/payload.c                          |  1 +
 arch/x86/cpu/i386/cpu.c                             |  1 +
 arch/x86/cpu/i386/interrupt.c                       |  1 +
 arch/x86/cpu/intel_common/cpu.c                     |  1 +
 arch/x86/cpu/intel_common/itss.c                    |  1 +
 arch/x86/cpu/intel_common/lpc.c                     |  1 +
 arch/x86/cpu/intel_common/microcode.c               |  1 +
 arch/x86/cpu/intel_common/mrc.c                     |  1 +
 arch/x86/cpu/intel_common/p2sb.c                    |  1 +
 arch/x86/cpu/irq.c                                  |  1 +
 arch/x86/cpu/ivybridge/bd82x6x.c                    |  1 +
 arch/x86/cpu/ivybridge/cpu.c                        |  1 +
 arch/x86/cpu/ivybridge/early_me.c                   |  1 +
 arch/x86/cpu/ivybridge/lpc.c                        |  1 +
 arch/x86/cpu/ivybridge/model_206ax.c                |  1 +
 arch/x86/cpu/ivybridge/sdram.c                      |  1 +
 arch/x86/cpu/mp_init.c                              |  1 +
 arch/x86/cpu/mtrr.c                                 |  1 +
 arch/x86/cpu/qemu/cpu.c                             |  1 +
 arch/x86/cpu/qfw_cpu.c                              |  1 +
 arch/x86/cpu/quark/dram.c                           |  1 +
 arch/x86/cpu/slimbootloader/serial.c                |  1 +
 arch/x86/cpu/tangier/pinmux.c                       |  1 +
 arch/x86/cpu/tangier/sdram.c                        |  1 +
 arch/x86/cpu/tangier/sysreset.c                     |  1 +
 arch/x86/include/asm/mp.h                           |  1 +
 arch/x86/lib/acpi_nhlt.c                            |  1 +
 arch/x86/lib/acpi_table.c                           |  1 +
 arch/x86/lib/bootm.c                                |  1 +
 arch/x86/lib/fsp/fsp_common.c                       |  1 +
 arch/x86/lib/fsp/fsp_graphics.c                     |  1 +
 arch/x86/lib/fsp2/fsp_dram.c                        |  1 +
 arch/x86/lib/fsp2/fsp_init.c                        |  1 +
 arch/x86/lib/fsp2/fsp_meminit.c                     |  1 +
 arch/x86/lib/fsp2/fsp_silicon_init.c                |  1 +
 arch/x86/lib/fsp2/fsp_support.c                     |  1 +
 arch/x86/lib/i8254.c                                |  1 +
 arch/x86/lib/mpspec.c                               |  1 +
 arch/x86/lib/mrccache.c                             |  1 +
 arch/x86/lib/pinctrl_ich6.c                         |  1 +
 arch/x86/lib/sfi.c                                  |  1 +
 arch/x86/lib/spl.c                                  |  1 +
 arch/x86/lib/tpl.c                                  |  1 +
 arch/x86/lib/zimage.c                               |  1 +
 board/AndesTech/ax25-ae350/ax25-ae350.c             |  1 +
 board/CZ.NIC/turris_mox/mox_sp.c                    |  1 +
 board/CZ.NIC/turris_mox/turris_mox.c                |  1 +
 board/CZ.NIC/turris_omnia/turris_omnia.c            |  1 +
 board/Marvell/mvebu_armada-37xx/board.c             |  1 +
 board/Marvell/mvebu_armada-8k/board.c               |  1 +
 board/alliedtelesis/common/gpio_hog.c               |  1 +
 board/alliedtelesis/x530/x530.c                     |  1 +
 board/armltd/vexpress/vexpress_common.c             |  1 +
 board/atmel/common/mac-spi-nor.c                    |  1 +
 board/bachmann/ot1200/ot1200.c                      |  1 +
 board/beacon/beacon-rzg2m/beacon-rzg2m.c            |  1 +
 board/beacon/imx8mm/spl.c                           |  1 +
 board/bluegiga/apx4devkit/apx4devkit.c              |  1 +
 board/bosch/guardian/board.c                        |  1 +
 board/bosch/shc/board.c                             |  1 +
 board/broadcom/bcmns3/ns3.c                         |  1 +
 board/broadcom/bcmstb/bcmstb.c                      |  1 +
 board/ccv/xpress/xpress.c                           |  1 +
 board/compulab/cl-som-imx7/cl-som-imx7.c            |  1 +
 board/compulab/cm_fx6/cm_fx6.c                      |  1 +
 board/compulab/common/eeprom.c                      |  1 +
 board/compulab/common/eeprom.h                      |  1 +
 board/congatec/cgtqmx6eval/cgtqmx6eval.c            |  1 +
 board/creative/xfi3/xfi3.c                          |  1 +
 board/dhelectronics/dh_imx6/dh_imx6.c               |  1 +
 board/dhelectronics/dh_stm32mp1/board.c             |  1 +
 board/emulation/qemu-arm/qemu-arm.c                 |  1 +
 board/engicam/common/board.c                        |  1 +
 board/esd/vme8349/vme8349.c                         |  1 +
 board/freescale/common/fsl_validate.c               |  1 +
 board/freescale/common/mc34vr500.c                  |  1 +
 board/freescale/common/pfuze.c                      |  1 +
 board/freescale/imx8mm_evk/spl.c                    |  1 +
 board/freescale/imx8mq_evk/spl.c                    |  1 +
 board/freescale/ls1012ardb/ls1012ardb.c             |  1 +
 board/freescale/mpc8308rdb/sdram.c                  |  1 +
 board/freescale/mpc8313erdb/sdram.c                 |  1 +
 board/freescale/mpc8315erdb/sdram.c                 |  1 +
 board/freescale/mpc8323erdb/mpc8323erdb.c           |  1 +
 board/freescale/mpc832xemds/mpc832xemds.c           |  1 +
 board/freescale/mpc8349emds/mpc8349emds.c           |  1 +
 board/freescale/mpc8349itx/mpc8349itx.c             |  1 +
 board/freescale/mpc837xemds/mpc837xemds.c           |  1 +
 board/freescale/mpc837xerdb/mpc837xerdb.c           |  1 +
 board/freescale/mx25pdk/mx25pdk.c                   |  1 +
 board/freescale/mx28evk/mx28evk.c                   |  1 +
 board/freescale/mx6slevk/mx6slevk.c                 |  1 +
 board/freescale/mx6sllevk/mx6sllevk.c               |  1 +
 board/freescale/mx6sxsabreauto/mx6sxsabreauto.c     |  1 +
 board/freescale/mx6sxsabresd/mx6sxsabresd.c         |  1 +
 board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c   |  1 +
 board/freescale/mx7dsabresd/mx7dsabresd.c           |  1 +
 board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c         |  1 +
 board/freescale/p2041rdb/ddr.c                      |  1 +
 board/freescale/qemu-ppce500/qemu-ppce500.c         |  1 +
 board/friendlyarm/nanopi2/onewire.c                 |  1 +
 board/gateworks/gw_ventana/gw_ventana.c             |  1 +
 board/gdsys/a38x/ihs_phys.c                         |  1 +
 board/gdsys/mpc8308/hrcon.c                         |  1 +
 board/gdsys/mpc8308/sdram.c                         |  1 +
 board/gdsys/mpc8308/strider.c                       |  1 +
 board/ge/common/ge_common.c                         |  1 +
 board/ge/common/vpd_reader.c                        | 13 +++++++------
 board/ge/common/vpd_reader.h                        |  2 --
 board/google/imx8mq_phanbell/spl.c                  |  1 +
 board/ids/ids8313/ids8313.c                         |  1 +
 board/intel/cougarcanyon2/cougarcanyon2.c           |  1 +
 board/intel/edison/edison.c                         |  1 +
 board/keymile/km83xx/km83xx.c                       |  1 +
 board/liebherr/display5/spl.c                       |  1 +
 board/liebherr/mccmon6/spl.c                        |  1 +
 board/nvidia/jetson-tk1/jetson-tk1.c                |  1 +
 board/ppcag/bg0900/bg0900.c                         |  1 +
 board/renesas/grpeach/grpeach.c                     |  1 +
 board/renesas/ulcb/cpld.c                           |  1 +
 board/samsung/common/board.c                        |  1 +
 board/samsung/common/exynos5-dt.c                   |  1 +
 board/samsung/goni/goni.c                           |  1 +
 board/samsung/trats/trats.c                         |  1 +
 board/samsung/trats2/trats2.c                       |  1 +
 board/samsung/universal_c210/universal.c            |  1 +
 board/sandbox/sandbox.c                             |  1 +
 board/sandisk/sansa_fuze_plus/sfp.c                 |  1 +
 board/siemens/draco/board.c                         |  1 +
 board/siemens/taurus/taurus.c                       |  1 +
 board/sipeed/maix/maix.c                            |  1 +
 board/softing/vining_2000/vining_2000.c             |  1 +
 board/st/common/stm32mp_dfu.c                       |  1 +
 board/st/stm32f429-discovery/stm32f429-discovery.c  |  1 +
 .../st/stm32f429-evaluation/stm32f429-evaluation.c  |  1 +
 board/st/stm32f469-discovery/stm32f469-discovery.c  |  1 +
 board/st/stm32h743-disco/stm32h743-disco.c          |  1 +
 board/st/stm32h743-eval/stm32h743-eval.c            |  1 +
 board/st/stm32mp1/stm32mp1.c                        |  1 +
 board/sunxi/board.c                                 |  1 +
 board/synopsys/hsdk/clk-lib.c                       |  1 +
 board/synopsys/hsdk/env-lib.c                       |  1 +
 board/synopsys/hsdk/hsdk.c                          |  1 +
 board/synopsys/iot_devkit/iot_devkit.c              |  1 +
 board/technexion/pico-imx6ul/pico-imx6ul.c          |  1 +
 board/technexion/pico-imx7d/pico-imx7d.c            |  1 +
 board/theadorable/fpga.c                            |  1 +
 board/ti/am335x/board.c                             |  1 +
 board/ti/am57xx/board.c                             |  1 +
 board/ti/am65x/evm.c                                |  1 +
 board/ti/common/board_detect.c                      |  1 +
 board/ti/j721e/evm.c                                |  1 +
 board/ti/omap5_uevm/evm.c                           |  1 +
 board/toradex/apalis-tk1/apalis-tk1.c               |  1 +
 board/toradex/colibri_imx7/colibri_imx7.c           |  1 +
 board/toradex/common/tdx-cfg-block.c                |  1 +
 board/toradex/verdin-imx8mm/spl.c                   |  1 +
 board/udoo/neo/neo.c                                |  1 +
 board/vscom/baltos/board.c                          |  1 +
 board/wandboard/wandboard.c                         |  1 +
 board/warp/warp.c                                   |  1 +
 board/warp7/warp7.c                                 |  1 +
 board/xilinx/common/board.c                         |  1 +
 .../xilinx/microblaze-generic/microblaze-generic.c  |  1 +
 board/xilinx/versal/board.c                         |  1 +
 board/xilinx/zynq/board.c                           |  1 +
 board/xilinx/zynqmp/cmds.c                          |  1 +
 board/xilinx/zynqmp/zynqmp.c                        |  1 +
 board/xilinx/zynqmp_r5/board.c                      |  1 +
 cmd/acpi.c                                          |  1 +
 cmd/axi.c                                           |  1 +
 cmd/bcb.c                                           |  1 +
 cmd/bind.c                                          |  1 +
 cmd/booti.c                                         |  1 +
 cmd/bootm.c                                         |  1 +
 cmd/button.c                                        |  1 +
 cmd/cpu.c                                           |  1 +
 cmd/efi.c                                           |  1 +
 cmd/elf.c                                           |  1 +
 cmd/ethsw.c                                         |  1 +
 cmd/gpio.c                                          |  1 +
 cmd/gpt.c                                           |  1 +
 cmd/i2c.c                                           |  1 +
 cmd/led.c                                           |  1 +
 cmd/mtd.c                                           |  1 +
 cmd/mvebu/bubt.c                                    |  1 +
 cmd/nand.c                                          |  1 +
 cmd/nvedit.c                                        |  1 +
 cmd/osd.c                                           |  1 +
 cmd/pci.c                                           |  1 +
 cmd/pinmux.c                                        |  1 +
 cmd/pmic.c                                          |  1 +
 cmd/pxe.c                                           |  1 +
 cmd/pxe_utils.c                                     |  1 +
 cmd/regulator.c                                     |  1 +
 cmd/spi.c                                           |  1 +
 cmd/sysboot.c                                       |  1 +
 cmd/tlv_eeprom.c                                    |  1 +
 cmd/tpm-v2.c                                        |  1 +
 cmd/usb_mass_storage.c                              |  1 +
 cmd/wdt.c                                           |  1 +
 common/android_ab.c                                 |  1 +
 common/avb_verify.c                                 |  1 +
 common/bloblist.c                                   |  1 +
 common/board_r.c                                    |  1 +
 common/boot_fit.c                                   |  1 +
 common/bootm.c                                      |  1 +
 common/bootretry.c                                  |  1 +
 common/bootstage.c                                  |  1 +
 common/bouncebuf.c                                  |  1 +
 common/cli_hush.c                                   |  1 +
 common/common_fit.c                                 |  1 +
 common/edid.c                                       |  1 +
 common/image-android.c                              |  1 +
 common/image-fdt.c                                  |  1 +
 common/image-fit-sig.c                              |  1 +
 common/image-fit.c                                  |  1 +
 common/lcd_simplefb.c                               |  1 +
 common/log.c                                        |  1 +
 common/menu.c                                       |  1 +
 common/spl/spl.c                                    |  1 +
 common/spl/spl_dfu.c                                |  1 +
 common/spl/spl_ext.c                                |  1 +
 common/spl/spl_fat.c                                |  1 +
 common/spl/spl_fit.c                                |  1 +
 common/spl/spl_legacy.c                             |  1 +
 common/spl/spl_mmc.c                                |  1 +
 common/spl/spl_net.c                                |  1 +
 common/spl/spl_opensbi.c                            |  1 +
 common/spl/spl_sata.c                               |  1 +
 common/spl/spl_sdp.c                                |  1 +
 common/spl/spl_spi.c                                |  1 +
 common/spl/spl_usb.c                                |  1 +
 common/spl/spl_ymodem.c                             |  1 +
 common/splash.c                                     |  1 +
 common/splash_source.c                              |  1 +
 common/stdio.c                                      |  1 +
 common/update.c                                     |  1 +
 common/usb.c                                        |  1 +
 common/usb_hub.c                                    |  1 +
 common/usb_kbd.c                                    |  1 +
 common/usb_storage.c                                |  1 +
 disk/part.c                                         |  1 +
 disk/part_efi.c                                     |  1 +
 drivers/adc/adc-uclass.c                            |  1 +
 drivers/adc/exynos-adc.c                            |  1 +
 drivers/adc/meson-saradc.c                          |  1 +
 drivers/adc/rockchip-saradc.c                       |  1 +
 drivers/adc/sandbox.c                               |  1 +
 drivers/adc/stm32-adc-core.c                        |  1 +
 drivers/adc/stm32-adc.c                             |  1 +
 drivers/ata/ahci_sunxi.c                            |  1 +
 drivers/ata/fsl_sata.c                              |  1 +
 drivers/ata/sata.c                                  |  1 +
 drivers/ata/sata_ceva.c                             |  1 +
 drivers/ata/sata_sil.c                              |  1 +
 drivers/axi/axi-emul-uclass.c                       |  1 +
 drivers/axi/axi-uclass.c                            |  1 +
 drivers/axi/axi_sandbox.c                           |  1 +
 drivers/axi/ihs_axi.c                               |  1 +
 drivers/axi/sandbox_store.c                         |  1 +
 drivers/bios_emulator/atibios.c                     |  1 +
 drivers/block/blk-uclass.c                          |  1 +
 drivers/block/blk_legacy.c                          |  1 +
 drivers/board/board-uclass.c                        |  1 +
 drivers/board/gazerbeam.c                           |  1 +
 drivers/board/sandbox.c                             |  1 +
 drivers/bootcount/bootcount-uclass.c                |  1 +
 drivers/bootcount/bootcount.c                       |  1 +
 drivers/bootcount/i2c-eeprom.c                      |  1 +
 drivers/bootcount/rtc.c                             |  1 +
 drivers/button/button-gpio.c                        |  1 +
 drivers/button/button-uclass.c                      |  1 +
 drivers/cache/cache-ncore.c                         |  1 +
 drivers/cache/cache-uclass.c                        |  1 +
 drivers/cache/cache-v5l2.c                          |  1 +
 drivers/clk/altera/clk-agilex.c                     |  1 +
 drivers/clk/altera/clk-arria10.c                    |  1 +
 drivers/clk/analogbits/wrpll-cln28hpc.c             |  1 +
 drivers/clk/aspeed/clk_ast2500.c                    |  1 +
 drivers/clk/at91/clk-main.c                         |  1 +
 drivers/clk/at91/clk-plla.c                         |  1 +
 drivers/clk/at91/clk-plladiv.c                      |  1 +
 drivers/clk/at91/clk-system.c                       |  1 +
 drivers/clk/at91/clk-utmi.c                         |  1 +
 drivers/clk/at91/pmc.c                              |  1 +
 drivers/clk/clk-cdce9xx.c                           |  1 +
 drivers/clk/clk-composite.c                         |  1 +
 drivers/clk/clk-divider.c                           |  1 +
 drivers/clk/clk-fixed-factor.c                      |  1 +
 drivers/clk/clk-gate.c                              |  1 +
 drivers/clk/clk-hsdk-cgu.c                          |  1 +
 drivers/clk/clk-mux.c                               |  1 +
 drivers/clk/clk-ti-sci.c                            |  1 +
 drivers/clk/clk-uclass.c                            |  1 +
 drivers/clk/clk.c                                   |  1 +
 drivers/clk/clk_bcm6345.c                           |  1 +
 drivers/clk/clk_boston.c                            |  1 +
 drivers/clk/clk_pic32.c                             |  1 +
 drivers/clk/clk_sandbox.c                           |  1 +
 drivers/clk/clk_sandbox_ccf.c                       |  1 +
 drivers/clk/clk_sandbox_test.c                      |  1 +
 drivers/clk/clk_stm32f.c                            |  1 +
 drivers/clk/clk_stm32h7.c                           |  1 +
 drivers/clk/clk_stm32mp1.c                          |  1 +
 drivers/clk/clk_versal.c                            |  1 +
 drivers/clk/clk_vexpress_osc.c                      |  1 +
 drivers/clk/clk_zynq.c                              |  1 +
 drivers/clk/clk_zynqmp.c                            |  1 +
 drivers/clk/exynos/clk-exynos7420.c                 |  1 +
 drivers/clk/ics8n3qv01.c                            |  1 +
 drivers/clk/imx/clk-composite-8m.c                  |  1 +
 drivers/clk/imx/clk-gate2.c                         |  1 +
 drivers/clk/imx/clk-imx6q.c                         |  1 +
 drivers/clk/imx/clk-imx8.c                          |  1 +
 drivers/clk/imx/clk-imx8mm.c                        |  1 +
 drivers/clk/imx/clk-imx8mn.c                        |  1 +
 drivers/clk/imx/clk-imx8mp.c                        |  1 +
 drivers/clk/imx/clk-imx8qm.c                        |  1 +
 drivers/clk/imx/clk-imx8qxp.c                       |  1 +
 drivers/clk/imx/clk-imxrt1020.c                     |  1 +
 drivers/clk/imx/clk-imxrt1050.c                     |  1 +
 drivers/clk/imx/clk-pfd.c                           |  1 +
 drivers/clk/imx/clk-pll14xx.c                       |  1 +
 drivers/clk/imx/clk-pllv3.c                         |  1 +
 drivers/clk/intel/clk_intel.c                       |  1 +
 drivers/clk/kendryte/bypass.c                       |  1 +
 drivers/clk/kendryte/clk.c                          |  1 +
 drivers/clk/kendryte/pll.c                          |  1 +
 drivers/clk/mediatek/clk-mt7622.c                   |  1 +
 drivers/clk/mediatek/clk-mt7623.c                   |  1 +
 drivers/clk/mediatek/clk-mt7629.c                   |  1 +
 drivers/clk/mediatek/clk-mtk.c                      |  1 +
 drivers/clk/meson/axg.c                             |  1 +
 drivers/clk/meson/g12a.c                            |  1 +
 drivers/clk/meson/gxbb.c                            |  1 +
 drivers/clk/mpc83xx_clk.c                           |  1 +
 drivers/clk/mpc83xx_clk.h                           |  1 +
 drivers/clk/mtmips/clk-mt7628.c                     |  1 +
 drivers/clk/mvebu/armada-37xx-periph.c              |  1 +
 drivers/clk/mvebu/armada-37xx-tbg.c                 |  1 +
 drivers/clk/owl/clk_owl.c                           |  1 +
 drivers/clk/renesas/clk-rcar-gen2.c                 |  1 +
 drivers/clk/renesas/clk-rcar-gen3.c                 |  1 +
 drivers/clk/renesas/renesas-cpg-mssr.c              |  1 +
 drivers/clk/rockchip/clk_pll.c                      |  1 +
 drivers/clk/rockchip/clk_px30.c                     |  1 +
 drivers/clk/rockchip/clk_rk3036.c                   |  1 +
 drivers/clk/rockchip/clk_rk3128.c                   |  1 +
 drivers/clk/rockchip/clk_rk3188.c                   |  1 +
 drivers/clk/rockchip/clk_rk322x.c                   |  1 +
 drivers/clk/rockchip/clk_rk3288.c                   |  1 +
 drivers/clk/rockchip/clk_rk3308.c                   |  1 +
 drivers/clk/rockchip/clk_rk3328.c                   |  1 +
 drivers/clk/rockchip/clk_rk3368.c                   |  1 +
 drivers/clk/rockchip/clk_rk3399.c                   |  1 +
 drivers/clk/rockchip/clk_rv1108.c                   |  1 +
 drivers/clk/sifive/fu540-prci.c                     |  1 +
 drivers/clk/sunxi/clk_sunxi.c                       |  1 +
 drivers/clk/tegra/tegra-car-clk.c                   |  1 +
 drivers/clk/uniphier/clk-uniphier-core.c            |  1 +
 drivers/core/acpi.c                                 |  1 +
 drivers/core/device-remove.c                        |  1 +
 drivers/core/device.c                               |  1 +
 drivers/core/devres.c                               |  1 +
 drivers/core/lists.c                                |  1 +
 drivers/core/of_access.c                            |  1 +
 drivers/core/of_addr.c                              |  1 +
 drivers/core/of_extra.c                             |  1 +
 drivers/core/ofnode.c                               |  1 +
 drivers/core/read.c                                 |  1 +
 drivers/core/regmap.c                               |  1 +
 drivers/core/root.c                                 |  1 +
 drivers/core/simple-pm-bus.c                        |  1 +
 drivers/core/syscon-uclass.c                        |  1 +
 drivers/core/uclass.c                               |  1 +
 drivers/core/util.c                                 |  1 +
 drivers/cpu/bmips_cpu.c                             |  1 +
 drivers/cpu/cpu-uclass.c                            |  1 +
 drivers/cpu/imx8_cpu.c                              |  1 +
 drivers/cpu/mpc83xx_cpu.c                           |  1 +
 drivers/cpu/riscv_cpu.c                             |  1 +
 drivers/crypto/fsl/fsl_rsa.c                        |  1 +
 drivers/crypto/fsl/jr.c                             |  1 +
 drivers/crypto/fsl/rng.c                            |  1 +
 drivers/crypto/rsa_mod_exp/mod_exp_uclass.c         |  1 +
 drivers/ddr/altera/sdram_agilex.c                   |  1 +
 drivers/ddr/altera/sdram_arria10.c                  |  1 +
 drivers/ddr/altera/sdram_gen5.c                     |  1 +
 drivers/ddr/altera/sdram_soc64.c                    |  1 +
 drivers/ddr/altera/sequencer.c                      |  1 +
 drivers/demo/demo-shape.c                           |  1 +
 drivers/demo/demo-uclass.c                          |  1 +
 drivers/dfu/dfu.c                                   |  1 +
 drivers/dfu/dfu_mmc.c                               |  1 +
 drivers/dfu/dfu_mtd.c                               |  1 +
 drivers/dfu/dfu_ram.c                               |  1 +
 drivers/dfu/dfu_sf.c                                |  1 +
 drivers/dfu/dfu_tftp.c                              |  1 +
 drivers/dma/bcm6348-iudma.c                         |  1 +
 drivers/dma/dma-uclass.c                            |  1 +
 drivers/dma/lpc32xx_dma.c                           |  1 +
 drivers/dma/sandbox-dma-test.c                      |  1 +
 drivers/dma/ti/k3-psil.c                            |  1 +
 drivers/dma/ti/k3-udma.c                            |  1 +
 drivers/fastboot/fb_common.c                        |  1 +
 drivers/fastboot/fb_getvar.c                        |  1 +
 drivers/fastboot/fb_mmc.c                           |  1 +
 drivers/fastboot/fb_nand.c                          |  1 +
 drivers/firmware/firmware-zynqmp.c                  |  1 +
 drivers/firmware/ti_sci.c                           |  1 +
 drivers/fpga/altera.c                               |  1 +
 drivers/fpga/socfpga_arria10.c                      |  1 +
 drivers/fpga/stratix10.c                            |  1 +
 drivers/gpio/74x164_gpio.c                          |  1 +
 drivers/gpio/atmel_pio4.c                           |  1 +
 drivers/gpio/axp_gpio.c                             |  1 +
 drivers/gpio/bcm2835_gpio.c                         |  1 +
 drivers/gpio/bcm6345_gpio.c                         |  1 +
 drivers/gpio/cortina_gpio.c                         |  1 +
 drivers/gpio/da8xx_gpio.c                           |  1 +
 drivers/gpio/dwapb_gpio.c                           |  1 +
 drivers/gpio/gpio-rza1.c                            |  1 +
 drivers/gpio/gpio-uclass.c                          |  1 +
 drivers/gpio/hi6220_gpio.c                          |  1 +
 drivers/gpio/hsdk-creg-gpio.c                       |  1 +
 drivers/gpio/imx_rgpio2p.c                          |  1 +
 drivers/gpio/intel_broadwell_gpio.c                 |  1 +
 drivers/gpio/intel_gpio.c                           |  1 +
 drivers/gpio/intel_ich6_gpio.c                      |  1 +
 drivers/gpio/iproc_gpio.c                           |  1 +
 drivers/gpio/mpc83xx_spisel_boot.c                  |  1 +
 drivers/gpio/mpc8xxx_gpio.c                         |  1 +
 drivers/gpio/mscc_sgpio.c                           |  1 +
 drivers/gpio/msm_gpio.c                             |  1 +
 drivers/gpio/mt7621_gpio.c                          |  1 +
 drivers/gpio/mxc_gpio.c                             |  1 +
 drivers/gpio/pca953x_gpio.c                         |  1 +
 drivers/gpio/pic32_gpio.c                           |  1 +
 drivers/gpio/pm8916_gpio.c                          |  1 +
 drivers/gpio/s5p_gpio.c                             |  1 +
 drivers/gpio/sandbox.c                              |  1 +
 drivers/gpio/sifive-gpio.c                          |  1 +
 drivers/gpio/spear_gpio.c                           |  1 +
 drivers/gpio/sunxi_gpio.c                           |  1 +
 drivers/gpio/tegra186_gpio.c                        |  1 +
 drivers/gpio/tegra_gpio.c                           |  1 +
 drivers/gpio/vybrid_gpio.c                          |  1 +
 drivers/gpio/xilinx_gpio.c                          |  1 +
 drivers/hwspinlock/hwspinlock-uclass.c              |  1 +
 drivers/hwspinlock/stm32_hwspinlock.c               |  1 +
 drivers/i2c/ast_i2c.c                               |  1 +
 drivers/i2c/at91_i2c.c                              |  1 +
 drivers/i2c/cros_ec_ldo.c                           |  1 +
 drivers/i2c/davinci_i2c.c                           |  1 +
 drivers/i2c/designware_i2c.c                        |  1 +
 drivers/i2c/designware_i2c_pci.c                    |  1 +
 drivers/i2c/exynos_hs_i2c.c                         |  1 +
 drivers/i2c/fsl_i2c.c                               |  1 +
 drivers/i2c/i2c-cortina.c                           |  1 +
 drivers/i2c/i2c-gpio.c                              |  1 +
 drivers/i2c/i2c-uclass.c                            |  1 +
 drivers/i2c/i2c-versatile.c                         |  1 +
 drivers/i2c/ihs_i2c.c                               |  1 +
 drivers/i2c/imx_lpi2c.c                             |  1 +
 drivers/i2c/intel_i2c.c                             |  1 +
 drivers/i2c/iproc_i2c.c                             |  1 +
 drivers/i2c/meson_i2c.c                             |  1 +
 drivers/i2c/muxes/i2c-arb-gpio-challenge.c          |  1 +
 drivers/i2c/muxes/i2c-mux-uclass.c                  |  1 +
 drivers/i2c/muxes/pca954x.c                         |  1 +
 drivers/i2c/mv_i2c.c                                |  1 +
 drivers/i2c/nx_i2c.c                                |  1 +
 drivers/i2c/octeon_i2c.c                            |  1 +
 drivers/i2c/omap24xx_i2c.c                          |  1 +
 drivers/i2c/rcar_i2c.c                              |  1 +
 drivers/i2c/rcar_iic.c                              |  1 +
 drivers/i2c/rk_i2c.c                                |  1 +
 drivers/i2c/s3c24x0_i2c.c                           |  1 +
 drivers/i2c/sandbox_i2c.c                           |  1 +
 drivers/i2c/stm32f7_i2c.c                           |  1 +
 drivers/i2c/tegra186_bpmp_i2c.c                     |  1 +
 drivers/i2c/tegra_i2c.c                             |  1 +
 drivers/i2c/xilinx_xiic.c                           |  1 +
 drivers/input/cros_ec_keyb.c                        |  1 +
 drivers/input/i8042.c                               |  1 +
 drivers/input/keyboard-uclass.c                     |  1 +
 drivers/input/tegra-kbc.c                           |  1 +
 drivers/led/led-uclass.c                            |  1 +
 drivers/led/led_bcm6328.c                           |  1 +
 drivers/led/led_bcm6358.c                           |  1 +
 drivers/led/led_bcm6858.c                           |  1 +
 drivers/led/led_gpio.c                              |  1 +
 drivers/mailbox/k3-sec-proxy.c                      |  1 +
 drivers/mailbox/mailbox-uclass.c                    |  1 +
 drivers/mailbox/sandbox-mbox.c                      |  1 +
 drivers/mailbox/stm32-ipcc.c                        |  1 +
 drivers/mailbox/tegra-hsp.c                         |  1 +
 drivers/mailbox/zynqmp-ipi.c                        |  1 +
 drivers/misc/atsha204a-i2c.c                        |  1 +
 drivers/misc/cros_ec_i2c.c                          |  1 +
 drivers/misc/cros_ec_lpc.c                          |  1 +
 drivers/misc/cros_ec_sandbox.c                      |  1 +
 drivers/misc/cros_ec_spi.c                          |  1 +
 drivers/misc/fs_loader.c                            |  1 +
 drivers/misc/gdsys_ioep.c                           |  1 +
 drivers/misc/gdsys_soc.c                            |  1 +
 drivers/misc/i2c_eeprom.c                           |  1 +
 drivers/misc/i2c_eeprom_emul.c                      |  1 +
 drivers/misc/ihs_fpga.c                             |  1 +
 drivers/misc/imx8/fuse.c                            |  1 +
 drivers/misc/imx8/scu.c                             |  1 +
 drivers/misc/irq-uclass.c                           |  1 +
 drivers/misc/irq_sandbox.c                          |  1 +
 drivers/misc/k3_avs.c                               |  1 +
 drivers/misc/k3_esm.c                               |  1 +
 drivers/misc/microchip_flexcom.c                    |  1 +
 drivers/misc/misc-uclass.c                          |  1 +
 drivers/misc/misc_sandbox.c                         |  1 +
 drivers/misc/mpc83xx_serdes.c                       |  1 +
 drivers/misc/p2sb-uclass.c                          |  1 +
 drivers/misc/p2sb_emul.c                            |  1 +
 drivers/misc/pca9551_led.c                          |  1 +
 drivers/misc/pwrseq-uclass.c                        |  1 +
 drivers/misc/qfw.c                                  |  1 +
 drivers/misc/rockchip-otp.c                         |  1 +
 drivers/misc/sifive-otp.c                           |  1 +
 drivers/misc/smsc_sio1007.c                         |  1 +
 drivers/misc/stm32_rcc.c                            |  1 +
 drivers/misc/stm32mp_fuse.c                         |  1 +
 drivers/misc/swap_case.c                            |  1 +
 drivers/misc/tegra186_bpmp.c                        |  1 +
 drivers/misc/vexpress_config.c                      |  1 +
 drivers/mmc/am654_sdhci.c                           |  1 +
 drivers/mmc/atmel_sdhci.c                           |  1 +
 drivers/mmc/bcm2835_sdhci.c                         |  1 +
 drivers/mmc/bcm2835_sdhost.c                        |  1 +
 drivers/mmc/bcmstb_sdhci.c                          |  1 +
 drivers/mmc/ca_dw_mmc.c                             |  1 +
 drivers/mmc/davinci_mmc.c                           |  1 +
 drivers/mmc/dw_mmc.c                                |  1 +
 drivers/mmc/exynos_dw_mmc.c                         |  1 +
 drivers/mmc/fsl_esdhc.c                             |  1 +
 drivers/mmc/fsl_esdhc_imx.c                         |  1 +
 drivers/mmc/iproc_sdhci.c                           |  1 +
 drivers/mmc/jz_mmc.c                                |  1 +
 drivers/mmc/meson_gx_mmc.c                          |  1 +
 drivers/mmc/mmc-uclass.c                            |  1 +
 drivers/mmc/mmc.c                                   |  1 +
 drivers/mmc/mmc_legacy.c                            |  1 +
 drivers/mmc/mmc_spi.c                               |  1 +
 drivers/mmc/msm_sdhci.c                             |  1 +
 drivers/mmc/mtk-sd.c                                |  1 +
 drivers/mmc/mv_sdhci.c                              |  1 +
 drivers/mmc/mvebu_mmc.c                             |  1 +
 drivers/mmc/nexell_dw_mmc.c                         |  1 +
 drivers/mmc/omap_hsmmc.c                            |  1 +
 drivers/mmc/pci_mmc.c                               |  1 +
 drivers/mmc/renesas-sdhi.c                          |  1 +
 drivers/mmc/rockchip_dw_mmc.c                       |  1 +
 drivers/mmc/rpmb.c                                  |  1 +
 drivers/mmc/s5p_sdhci.c                             |  1 +
 drivers/mmc/sdhci-cadence.c                         |  1 +
 drivers/mmc/sdhci.c                                 |  1 +
 drivers/mmc/snps_dw_mmc.c                           |  1 +
 drivers/mmc/socfpga_dw_mmc.c                        |  1 +
 drivers/mmc/sti_sdhci.c                             |  1 +
 drivers/mmc/stm32_sdmmc2.c                          |  1 +
 drivers/mmc/sunxi_mmc.c                             |  1 +
 drivers/mmc/tangier_sdhci.c                         |  1 +
 drivers/mmc/tegra_mmc.c                             |  1 +
 drivers/mmc/tmio-common.c                           |  1 +
 drivers/mmc/xenon_sdhci.c                           |  1 +
 drivers/mmc/zynq_sdhci.c                            |  1 +
 drivers/mtd/altera_qspi.c                           |  1 +
 drivers/mtd/cfi_flash.c                             |  1 +
 drivers/mtd/hbmc-am654.c                            |  1 +
 drivers/mtd/mtd_uboot.c                             |  1 +
 drivers/mtd/mtdconcat.c                             |  1 +
 drivers/mtd/mtdcore.c                               |  1 +
 drivers/mtd/nand/bbt.c                              |  1 +
 drivers/mtd/nand/core.c                             |  1 +
 drivers/mtd/nand/raw/atmel_nand.c                   |  1 +
 drivers/mtd/nand/raw/davinci_nand.c                 |  1 +
 drivers/mtd/nand/raw/denali_dt.c                    |  1 +
 drivers/mtd/nand/raw/denali_spl.c                   |  1 +
 drivers/mtd/nand/raw/fsmc_nand.c                    |  1 +
 drivers/mtd/nand/raw/mxc_nand.c                     |  1 +
 drivers/mtd/nand/raw/mxc_nand_spl.c                 |  1 +
 drivers/mtd/nand/raw/mxs_nand_dt.c                  |  1 +
 drivers/mtd/nand/raw/mxs_nand_spl.c                 |  1 +
 drivers/mtd/nand/raw/nand.c                         |  1 +
 drivers/mtd/nand/raw/nand_bbt.c                     |  1 +
 drivers/mtd/nand/raw/nand_bch.c                     |  1 +
 drivers/mtd/nand/raw/nand_timings.c                 |  1 +
 drivers/mtd/nand/raw/stm32_fmc2_nand.c              |  1 +
 drivers/mtd/nand/raw/sunxi_nand.c                   |  1 +
 drivers/mtd/nand/raw/sunxi_nand_spl.c               |  1 +
 drivers/mtd/nand/raw/vf610_nfc.c                    |  1 +
 drivers/mtd/nand/spi/core.c                         |  1 +
 drivers/mtd/nand/spi/gigadevice.c                   |  1 +
 drivers/mtd/nand/spi/macronix.c                     |  1 +
 drivers/mtd/nand/spi/micron.c                       |  1 +
 drivers/mtd/nand/spi/toshiba.c                      |  1 +
 drivers/mtd/nand/spi/winbond.c                      |  1 +
 drivers/mtd/pic32_flash.c                           |  1 +
 drivers/mtd/renesas_rpc_hf.c                        |  1 +
 drivers/mtd/spi/sandbox.c                           |  1 +
 drivers/mtd/spi/sf_dataflash.c                      |  1 +
 drivers/mtd/spi/sf_probe.c                          |  1 +
 drivers/mtd/st_smi.c                                |  1 +
 drivers/mtd/ubi/attach.c                            |  1 +
 drivers/mtd/ubi/build.c                             |  1 +
 drivers/mtd/ubi/debug.c                             |  1 +
 drivers/mtd/ubi/eba.c                               |  1 +
 drivers/mtd/ubi/fastmap-wl.c                        |  2 ++
 drivers/mtd/ubi/fastmap.c                           |  1 +
 drivers/mtd/ubi/io.c                                |  1 +
 drivers/mtd/ubi/kapi.c                              |  1 +
 drivers/mtd/ubi/misc.c                              |  1 +
 drivers/mtd/ubi/ubi.h                               |  1 +
 drivers/mtd/ubi/upd.c                               |  1 +
 drivers/mtd/ubi/vmt.c                               |  1 +
 drivers/mtd/ubi/vtbl.c                              |  1 +
 drivers/mtd/ubi/wl.c                                |  1 +
 drivers/mtd/ubispl/ubispl.c                         |  1 +
 drivers/net/ag7xxx.c                                |  1 +
 drivers/net/altera_tse.c                            |  1 +
 drivers/net/armada100_fec.c                         |  1 +
 drivers/net/at91_emac.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/dwc_eth_qos.c                           |  1 +
 drivers/net/dwmac_socfpga.c                         |  1 +
 drivers/net/e1000.c                                 |  1 +
 drivers/net/eepro100.c                              |  1 +
 drivers/net/ep93xx_eth.c                            |  1 +
 drivers/net/eth-phy-uclass.c                        |  1 +
 drivers/net/ethoc.c                                 |  1 +
 drivers/net/fm/eth.c                                |  1 +
 drivers/net/fm/init.c                               |  1 +
 drivers/net/fm/memac_phy.c                          |  1 +
 drivers/net/fsl-mc/dpio/qbman_portal.c              |  1 +
 drivers/net/fsl-mc/mc.c                             |  1 +
 drivers/net/fsl-mc/mc_sys.c                         |  1 +
 drivers/net/fsl_enetc.c                             |  1 +
 drivers/net/fsl_enetc_mdio.c                        |  1 +
 drivers/net/fsl_mcdmafec.c                          |  1 +
 drivers/net/ftgmac100.c                             |  1 +
 drivers/net/ftmac100.c                              |  1 +
 drivers/net/gmac_rockchip.c                         |  1 +
 drivers/net/higmacv300.c                            |  1 +
 drivers/net/ks8851_mll.c                            |  1 +
 drivers/net/ldpaa_eth/ldpaa_eth.c                   |  1 +
 drivers/net/ldpaa_eth/ldpaa_wriop.c                 |  1 +
 drivers/net/ldpaa_eth/lx2160a.c                     |  1 +
 drivers/net/mcffec.c                                |  1 +
 drivers/net/mdio_mux_sandbox.c                      |  1 +
 drivers/net/mdio_sandbox.c                          |  1 +
 drivers/net/mpc8xx_fec.c                            |  1 +
 drivers/net/mscc_eswitch/jr2_switch.c               |  1 +
 drivers/net/mscc_eswitch/luton_switch.c             |  1 +
 drivers/net/mscc_eswitch/mscc_mac_table.c           |  1 +
 drivers/net/mscc_eswitch/mscc_miim.c                |  1 +
 drivers/net/mscc_eswitch/mscc_xfer.c                |  1 +
 drivers/net/mscc_eswitch/ocelot_switch.c            |  1 +
 drivers/net/mscc_eswitch/serval_switch.c            |  1 +
 drivers/net/mscc_eswitch/servalt_switch.c           |  1 +
 drivers/net/mt7628-eth.c                            |  1 +
 drivers/net/mtk_eth.c                               |  1 +
 drivers/net/mvmdio.c                                |  1 +
 drivers/net/pch_gbe.c                               |  1 +
 drivers/net/pcnet.c                                 |  1 +
 drivers/net/pfe_eth/pfe_driver.c                    |  1 +
 drivers/net/pfe_eth/pfe_eth.c                       |  1 +
 drivers/net/pfe_eth/pfe_firmware.c                  |  1 +
 drivers/net/pfe_eth/pfe_mdio.c                      |  1 +
 drivers/net/phy/aquantia.c                          |  1 +
 drivers/net/phy/atheros.c                           |  1 +
 drivers/net/phy/b53.c                               |  1 +
 drivers/net/phy/cortina.c                           |  1 +
 drivers/net/phy/dp83867.c                           |  1 +
 drivers/net/phy/fixed.c                             |  1 +
 drivers/net/phy/marvell.c                           |  1 +
 drivers/net/phy/meson-gxl.c                         |  1 +
 drivers/net/phy/micrel_ksz90x1.c                    |  1 +
 drivers/net/phy/mscc.c                              |  1 +
 drivers/net/phy/mv88e61xx.c                         |  1 +
 drivers/net/phy/ncsi.c                              |  1 +
 drivers/net/phy/phy.c                               |  1 +
 drivers/net/phy/xilinx_gmii2rgmii.c                 |  1 +
 drivers/net/phy/xilinx_phy.c                        |  1 +
 drivers/net/pic32_eth.c                             |  1 +
 drivers/net/pic32_mdio.c                            |  1 +
 drivers/net/ravb.c                                  |  1 +
 drivers/net/rtl8139.c                               |  1 +
 drivers/net/rtl8169.c                               |  1 +
 drivers/net/sandbox-raw-bus.c                       |  1 +
 drivers/net/sandbox.c                               |  1 +
 drivers/net/smc911x.c                               |  1 +
 drivers/net/sni_ave.c                               |  1 +
 drivers/net/sun8i_emac.c                            |  1 +
 drivers/net/sunxi_emac.c                            |  1 +
 drivers/net/ti/am65-cpsw-nuss.c                     |  1 +
 drivers/net/ti/cpsw-common.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/vsc9953.c                               |  1 +
 drivers/net/xilinx_axi_emac.c                       |  1 +
 drivers/nvme/nvme.c                                 |  1 +
 drivers/nvme/nvme_show.c                            |  1 +
 drivers/pch/pch-uclass.c                            |  1 +
 drivers/pch/pch7.c                                  |  1 +
 drivers/pch/pch9.c                                  |  1 +
 drivers/pch/sandbox_pch.c                           |  1 +
 drivers/pci/pci-aardvark.c                          |  1 +
 drivers/pci/pci-emul-uclass.c                       |  1 +
 drivers/pci/pci-rcar-gen2.c                         |  1 +
 drivers/pci/pci-rcar-gen3.c                         |  1 +
 drivers/pci/pci-uclass.c                            |  1 +
 drivers/pci/pci_common.c                            |  1 +
 drivers/pci/pci_mpc85xx.c                           |  1 +
 drivers/pci/pci_rom.c                               |  1 +
 drivers/pci/pci_sandbox.c                           |  1 +
 drivers/pci/pci_sh7751.c                            |  1 +
 drivers/pci/pci_tegra.c                             |  1 +
 drivers/pci/pcie_brcmstb.c                          |  1 +
 drivers/pci/pcie_dw_mvebu.c                         |  1 +
 drivers/pci/pcie_dw_ti.c                            |  1 +
 drivers/pci/pcie_fsl.c                              |  1 +
 drivers/pci/pcie_imx.c                              |  1 +
 drivers/pci/pcie_intel_fpga.c                       |  1 +
 drivers/pci/pcie_layerscape_ep.c                    |  1 +
 drivers/pci/pcie_layerscape_fixup.c                 |  1 +
 drivers/pci/pcie_layerscape_fixup_common.c          |  1 +
 drivers/pci/pcie_layerscape_gen4.c                  |  1 +
 drivers/pci/pcie_layerscape_gen4_fixup.c            |  1 +
 drivers/pci/pcie_layerscape_rc.c                    |  1 +
 drivers/pci/pcie_mediatek.c                         |  1 +
 drivers/pci/pcie_phytium.c                          |  1 +
 drivers/pci/pcie_rockchip.c                         |  1 +
 drivers/pci/pcie_xilinx.c                           |  1 +
 drivers/pci_endpoint/pci_ep-uclass.c                |  1 +
 drivers/pci_endpoint/pcie-cadence-ep.c              |  1 +
 drivers/pci_endpoint/sandbox-pci_ep.c               |  1 +
 drivers/phy/allwinner/phy-sun4i-usb.c               |  1 +
 drivers/phy/bcm6318-usbh-phy.c                      |  1 +
 drivers/phy/bcm6348-usbh-phy.c                      |  1 +
 drivers/phy/bcm6358-usbh-phy.c                      |  1 +
 drivers/phy/bcm6368-usbh-phy.c                      |  1 +
 drivers/phy/keystone-usb-phy.c                      |  1 +
 drivers/phy/meson-g12a-usb2.c                       |  1 +
 drivers/phy/meson-g12a-usb3-pcie.c                  |  1 +
 drivers/phy/meson-gxbb-usb2.c                       |  1 +
 drivers/phy/meson-gxl-usb2.c                        |  1 +
 drivers/phy/meson-gxl-usb3.c                        |  1 +
 drivers/phy/msm8916-usbh-phy.c                      |  1 +
 drivers/phy/mt76x8-usb-phy.c                        |  1 +
 drivers/phy/omap-usb2-phy.c                         |  1 +
 drivers/phy/phy-da8xx-usb.c                         |  1 +
 drivers/phy/phy-mtk-tphy.c                          |  1 +
 drivers/phy/phy-rcar-gen2.c                         |  1 +
 drivers/phy/phy-rcar-gen3.c                         |  1 +
 drivers/phy/phy-stm32-usbphyc.c                     |  1 +
 drivers/phy/phy-ti-am654.c                          |  1 +
 drivers/phy/phy-uclass.c                            |  1 +
 drivers/phy/rockchip/phy-rockchip-inno-usb2.c       |  1 +
 drivers/phy/rockchip/phy-rockchip-pcie.c            |  1 +
 drivers/phy/rockchip/phy-rockchip-typec.c           |  1 +
 drivers/phy/sandbox-phy.c                           |  1 +
 drivers/phy/sti_usb_phy.c                           |  1 +
 drivers/phy/ti-pipe3-phy.c                          |  1 +
 drivers/pinctrl/aspeed/pinctrl_ast2500.c            |  1 +
 drivers/pinctrl/ath79/pinctrl_ar933x.c              |  1 +
 drivers/pinctrl/ath79/pinctrl_qca953x.c             |  1 +
 drivers/pinctrl/broadcom/pinctrl-bcm283x.c          |  1 +
 drivers/pinctrl/broadcom/pinctrl-bcm6838.c          |  1 +
 drivers/pinctrl/exynos/pinctrl-exynos.c             |  1 +
 drivers/pinctrl/exynos/pinctrl-exynos7420.c         |  1 +
 drivers/pinctrl/intel/pinctrl.c                     |  1 +
 drivers/pinctrl/mediatek/pinctrl-mtk-common.c       |  1 +
 drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c       |  1 +
 drivers/pinctrl/meson/pinctrl-meson.c               |  1 +
 drivers/pinctrl/mscc/mscc-common.c                  |  1 +
 drivers/pinctrl/mtmips/pinctrl-mt7628.c             |  1 +
 drivers/pinctrl/mtmips/pinctrl-mtmips-common.c      |  1 +
 drivers/pinctrl/mvebu/pinctrl-armada-37xx.c         |  1 +
 drivers/pinctrl/mvebu/pinctrl-mvebu.c               |  1 +
 drivers/pinctrl/nexell/pinctrl-nexell.c             |  1 +
 drivers/pinctrl/nexell/pinctrl-s5pxx18.c            |  1 +
 drivers/pinctrl/nxp/pinctrl-imx.c                   |  1 +
 drivers/pinctrl/nxp/pinctrl-mxs.c                   |  1 +
 drivers/pinctrl/nxp/pinctrl-scu.c                   |  1 +
 drivers/pinctrl/pinctrl-at91-pio4.c                 |  1 +
 drivers/pinctrl/pinctrl-at91.c                      |  1 +
 drivers/pinctrl/pinctrl-generic.c                   |  1 +
 drivers/pinctrl/pinctrl-single.c                    |  1 +
 drivers/pinctrl/pinctrl-sti.c                       |  1 +
 drivers/pinctrl/pinctrl-stmfx.c                     |  1 +
 drivers/pinctrl/pinctrl-uclass.c                    |  1 +
 drivers/pinctrl/pinctrl_pic32.c                     |  1 +
 drivers/pinctrl/pinctrl_stm32.c                     |  1 +
 drivers/pinctrl/renesas/pfc-r7s72100.c              |  1 +
 drivers/pinctrl/renesas/pfc-r8a7790.c               |  1 +
 drivers/pinctrl/renesas/pfc-r8a7791.c               |  1 +
 drivers/pinctrl/renesas/pfc-r8a7794.c               |  1 +
 drivers/pinctrl/renesas/pfc-r8a77970.c              |  1 +
 drivers/pinctrl/renesas/pfc-r8a77980.c              |  1 +
 drivers/pinctrl/renesas/pfc-r8a77990.c              |  1 +
 drivers/pinctrl/renesas/pfc.c                       |  1 +
 drivers/pinctrl/rockchip/pinctrl-px30.c             |  1 +
 drivers/pinctrl/rockchip/pinctrl-rk3036.c           |  1 +
 drivers/pinctrl/rockchip/pinctrl-rk3128.c           |  1 +
 drivers/pinctrl/rockchip/pinctrl-rk3188.c           |  1 +
 drivers/pinctrl/rockchip/pinctrl-rk322x.c           |  1 +
 drivers/pinctrl/rockchip/pinctrl-rk3288.c           |  1 +
 drivers/pinctrl/rockchip/pinctrl-rk3308.c           |  1 +
 drivers/pinctrl/rockchip/pinctrl-rk3328.c           |  1 +
 drivers/pinctrl/rockchip/pinctrl-rk3368.c           |  1 +
 drivers/pinctrl/rockchip/pinctrl-rk3399.c           |  1 +
 drivers/pinctrl/rockchip/pinctrl-rockchip-core.c    |  1 +
 drivers/pinctrl/rockchip/pinctrl-rv1108.c           |  1 +
 drivers/pinctrl/uniphier/pinctrl-uniphier-core.c    |  1 +
 drivers/power/acpi_pmc/acpi-pmc-uclass.c            |  1 +
 drivers/power/acpi_pmc/pmc_emul.c                   |  1 +
 drivers/power/acpi_pmc/sandbox.c                    |  1 +
 drivers/power/axp152.c                              |  1 +
 drivers/power/axp209.c                              |  1 +
 drivers/power/axp221.c                              |  1 +
 drivers/power/axp809.c                              |  1 +
 drivers/power/axp818.c                              |  1 +
 drivers/power/battery/bat_trats.c                   |  1 +
 drivers/power/battery/bat_trats2.c                  |  1 +
 drivers/power/domain/bcm6328-power-domain.c         |  1 +
 drivers/power/domain/imx8-power-domain-legacy.c     |  1 +
 drivers/power/domain/imx8m-power-domain.c           |  1 +
 drivers/power/domain/meson-ee-pwrc.c                |  1 +
 drivers/power/domain/meson-gx-pwrc-vpu.c            |  1 +
 drivers/power/domain/mtk-power-domain.c             |  1 +
 drivers/power/domain/power-domain-uclass.c          |  1 +
 drivers/power/domain/sandbox-power-domain.c         |  1 +
 drivers/power/domain/ti-sci-power-domain.c          |  1 +
 drivers/power/exynos-tmu.c                          |  1 +
 drivers/power/fuel_gauge/fg_max17042.c              |  1 +
 drivers/power/mfd/fg_max77693.c                     |  1 +
 drivers/power/mfd/muic_max77693.c                   |  1 +
 drivers/power/mfd/pmic_max77693.c                   |  1 +
 drivers/power/pmic/act8846.c                        |  1 +
 drivers/power/pmic/as3722.c                         |  1 +
 drivers/power/pmic/as3722_gpio.c                    |  1 +
 drivers/power/pmic/bd71837.c                        |  1 +
 drivers/power/pmic/da9063.c                         |  1 +
 drivers/power/pmic/fan53555.c                       |  1 +
 drivers/power/pmic/i2c_pmic_emul.c                  |  1 +
 drivers/power/pmic/lp873x.c                         |  1 +
 drivers/power/pmic/lp87565.c                        |  1 +
 drivers/power/pmic/max77686.c                       |  1 +
 drivers/power/pmic/mc34708.c                        |  1 +
 drivers/power/pmic/muic_max8997.c                   |  1 +
 drivers/power/pmic/palmas.c                         |  1 +
 drivers/power/pmic/pca9450.c                        |  1 +
 drivers/power/pmic/pfuze100.c                       |  1 +
 drivers/power/pmic/pm8916.c                         |  1 +
 drivers/power/pmic/pmic-uclass.c                    |  1 +
 drivers/power/pmic/pmic_hi6553.c                    |  1 +
 drivers/power/pmic/pmic_ltc3676.c                   |  1 +
 drivers/power/pmic/pmic_max77696.c                  |  1 +
 drivers/power/pmic/pmic_max8997.c                   |  1 +
 drivers/power/pmic/pmic_max8998.c                   |  1 +
 drivers/power/pmic/pmic_mc34vr500.c                 |  1 +
 drivers/power/pmic/pmic_pca9450.c                   |  1 +
 drivers/power/pmic/pmic_pfuze100.c                  |  1 +
 drivers/power/pmic/pmic_pfuze3000.c                 |  1 +
 drivers/power/pmic/pmic_tps65910_dm.c               |  1 +
 drivers/power/pmic/rk8xx.c                          |  1 +
 drivers/power/pmic/s2mps11.c                        |  1 +
 drivers/power/pmic/s5m8767.c                        |  1 +
 drivers/power/pmic/sandbox.c                        |  1 +
 drivers/power/pmic/stpmic1.c                        |  1 +
 drivers/power/pmic/tps65090.c                       |  1 +
 drivers/power/pmic/tps65941.c                       |  1 +
 drivers/power/power_core.c                          |  1 +
 drivers/power/power_dialog.c                        |  1 +
 drivers/power/power_fsl.c                           |  1 +
 drivers/power/power_i2c.c                           |  1 +
 drivers/power/power_spi.c                           |  1 +
 drivers/power/regulator/act8846.c                   |  1 +
 drivers/power/regulator/as3722_regulator.c          |  1 +
 drivers/power/regulator/bd71837.c                   |  1 +
 drivers/power/regulator/da9063.c                    |  1 +
 drivers/power/regulator/fan53555.c                  |  1 +
 drivers/power/regulator/fixed.c                     |  1 +
 drivers/power/regulator/gpio-regulator.c            |  1 +
 drivers/power/regulator/lp873x_regulator.c          |  1 +
 drivers/power/regulator/lp87565_regulator.c         |  1 +
 drivers/power/regulator/max77686.c                  |  1 +
 drivers/power/regulator/palmas_regulator.c          |  1 +
 drivers/power/regulator/pbias_regulator.c           |  1 +
 drivers/power/regulator/pfuze100.c                  |  1 +
 drivers/power/regulator/pwm_regulator.c             |  1 +
 drivers/power/regulator/regulator-uclass.c          |  1 +
 drivers/power/regulator/regulator_common.c          |  1 +
 drivers/power/regulator/rk8xx.c                     |  1 +
 drivers/power/regulator/s2mps11_regulator.c         |  1 +
 drivers/power/regulator/s5m8767.c                   |  1 +
 drivers/power/regulator/sandbox.c                   |  1 +
 drivers/power/regulator/stm32-vrefbuf.c             |  1 +
 drivers/power/regulator/stpmic1.c                   |  1 +
 drivers/power/regulator/tps62360_regulator.c        |  1 +
 drivers/power/regulator/tps65090_regulator.c        |  1 +
 drivers/power/regulator/tps65910_regulator.c        |  1 +
 drivers/power/regulator/tps65941_regulator.c        |  1 +
 drivers/power/tps6586x.c                            |  1 +
 drivers/pwm/exynos_pwm.c                            |  1 +
 drivers/pwm/pwm-mtk.c                               |  1 +
 drivers/pwm/pwm-sifive.c                            |  1 +
 drivers/pwm/pwm-uclass.c                            |  1 +
 drivers/pwm/rk_pwm.c                                |  1 +
 drivers/pwm/sandbox_pwm.c                           |  1 +
 drivers/pwm/sunxi_pwm.c                             |  1 +
 drivers/pwm/tegra_pwm.c                             |  1 +
 drivers/ram/bmips_ram.c                             |  1 +
 drivers/ram/imxrt_sdram.c                           |  1 +
 drivers/ram/k3-am654-ddrss.c                        |  1 +
 drivers/ram/k3-j721e/k3-j721e-ddrss.c               |  1 +
 drivers/ram/k3-j721e/lpddr4_sanity.h                |  1 +
 drivers/ram/mediatek/ddr3-mt7629.c                  |  1 +
 drivers/ram/mpc83xx_sdram.c                         |  1 +
 drivers/ram/ram-uclass.c                            |  1 +
 drivers/ram/rockchip/dmc-rk3368.c                   |  1 +
 drivers/ram/rockchip/sdram_rk3188.c                 |  1 +
 drivers/ram/rockchip/sdram_rk322x.c                 |  1 +
 drivers/ram/rockchip/sdram_rk3288.c                 |  1 +
 drivers/ram/rockchip/sdram_rk3399.c                 |  1 +
 drivers/ram/sifive/fu540_ddr.c                      |  1 +
 drivers/ram/stm32_sdram.c                           |  1 +
 drivers/ram/stm32mp1/stm32mp1_ddr.c                 |  1 +
 drivers/ram/stm32mp1/stm32mp1_ram.c                 |  1 +
 drivers/remoteproc/k3_system_controller.c           |  1 +
 drivers/remoteproc/rproc-elf-loader.c               |  1 +
 drivers/remoteproc/rproc-uclass.c                   |  1 +
 drivers/remoteproc/sandbox_testproc.c               |  1 +
 drivers/remoteproc/stm32_copro.c                    |  1 +
 drivers/remoteproc/ti_k3_arm64_rproc.c              |  1 +
 drivers/remoteproc/ti_k3_dsp_rproc.c                |  1 +
 drivers/remoteproc/ti_k3_r5f_rproc.c                |  1 +
 drivers/remoteproc/ti_power_proc.c                  |  1 +
 drivers/reset/reset-bcm6345.c                       |  1 +
 drivers/reset/reset-hisilicon.c                     |  1 +
 drivers/reset/reset-hsdk.c                          |  1 +
 drivers/reset/reset-imx7.c                          |  1 +
 drivers/reset/reset-mediatek.c                      |  1 +
 drivers/reset/reset-meson.c                         |  1 +
 drivers/reset/reset-mtmips.c                        |  1 +
 drivers/reset/reset-raspberrypi.c                   |  1 +
 drivers/reset/reset-rockchip.c                      |  1 +
 drivers/reset/reset-sunxi.c                         |  1 +
 drivers/reset/reset-syscon.c                        |  1 +
 drivers/reset/reset-ti-sci.c                        |  1 +
 drivers/reset/reset-uclass.c                        |  1 +
 drivers/reset/reset-uniphier.c                      |  1 +
 drivers/reset/sandbox-reset.c                       |  1 +
 drivers/reset/sti-reset.c                           |  1 +
 drivers/reset/stm32-reset.c                         |  1 +
 drivers/reset/tegra-car-reset.c                     |  1 +
 drivers/rng/meson-rng.c                             |  1 +
 drivers/rng/rng-uclass.c                            |  1 +
 drivers/rng/rockchip_rng.c                          |  1 +
 drivers/rng/stm32mp1_rng.c                          |  1 +
 drivers/rtc/ds3231.c                                |  1 +
 drivers/rtc/ds3232.c                                |  1 +
 drivers/rtc/pl031.c                                 |  1 +
 drivers/rtc/rtc-uclass.c                            |  1 +
 drivers/rtc/rv3029.c                                |  1 +
 drivers/rtc/rx8010sj.c                              |  1 +
 drivers/rtc/rx8025.c                                |  1 +
 drivers/rtc/s35392a.c                               |  1 +
 drivers/rtc/stm32_rtc.c                             |  1 +
 drivers/scsi/scsi-uclass.c                          |  1 +
 drivers/scsi/scsi.c                                 |  1 +
 drivers/serial/altera_jtag_uart.c                   |  1 +
 drivers/serial/altera_uart.c                        |  1 +
 drivers/serial/arm_dcc.c                            |  1 +
 drivers/serial/atmel_usart.c                        |  1 +
 drivers/serial/lpc32xx_hsuart.c                     |  1 +
 drivers/serial/ns16550.c                            |  1 +
 drivers/serial/sandbox.c                            |  1 +
 drivers/serial/serial-uclass.c                      |  1 +
 drivers/serial/serial.c                             |  1 +
 drivers/serial/serial_ar933x.c                      |  1 +
 drivers/serial/serial_bcm283x_mu.c                  |  1 +
 drivers/serial/serial_bcm283x_pl011.c               |  1 +
 drivers/serial/serial_bcm6345.c                     |  1 +
 drivers/serial/serial_cortina.c                     |  1 +
 drivers/serial/serial_efi.c                         |  1 +
 drivers/serial/serial_linflexuart.c                 |  1 +
 drivers/serial/serial_lpuart.c                      |  1 +
 drivers/serial/serial_mcf.c                         |  1 +
 drivers/serial/serial_meson.c                       |  1 +
 drivers/serial/serial_msm.c                         |  1 +
 drivers/serial/serial_mtk.c                         |  1 +
 drivers/serial/serial_mxc.c                         |  1 +
 drivers/serial/serial_nulldev.c                     |  1 +
 drivers/serial/serial_omap.c                        |  1 +
 drivers/serial/serial_owl.c                         |  1 +
 drivers/serial/serial_pic32.c                       |  1 +
 drivers/serial/serial_pl01x.c                       |  1 +
 drivers/serial/serial_pxa.c                         |  1 +
 drivers/serial/serial_s5p.c                         |  1 +
 drivers/serial/serial_sh.c                          |  1 +
 drivers/serial/serial_sifive.c                      |  1 +
 drivers/serial/serial_sti_asc.c                     |  1 +
 drivers/serial/serial_stm32.c                       |  1 +
 drivers/serial/serial_xuartlite.c                   |  1 +
 drivers/serial/serial_zynq.c                        |  1 +
 drivers/smem/msm_smem.c                             |  1 +
 drivers/smem/smem-uclass.c                          |  1 +
 drivers/soc/soc-uclass.c                            |  1 +
 drivers/soc/soc_ti_k3.c                             |  1 +
 drivers/soc/ti/k3-navss-ringacc.c                   |  1 +
 drivers/soc/ti/keystone_serdes.c                    |  1 +
 drivers/sound/broadwell_i2s.c                       |  1 +
 drivers/sound/broadwell_sound.c                     |  1 +
 drivers/sound/codec-uclass.c                        |  1 +
 drivers/sound/da7219.c                              |  1 +
 drivers/sound/hda_codec.c                           |  1 +
 drivers/sound/i2s-uclass.c                          |  1 +
 drivers/sound/max98088.c                            |  1 +
 drivers/sound/max98090.c                            |  1 +
 drivers/sound/max98095.c                            |  1 +
 drivers/sound/max98357a.c                           |  1 +
 drivers/sound/rockchip_i2s.c                        |  1 +
 drivers/sound/rockchip_sound.c                      |  1 +
 drivers/sound/rt5677.c                              |  1 +
 drivers/sound/samsung-i2s.c                         |  1 +
 drivers/sound/samsung_sound.c                       |  1 +
 drivers/sound/sandbox.c                             |  1 +
 drivers/sound/sound-uclass.c                        |  1 +
 drivers/sound/tegra_ahub.c                          |  1 +
 drivers/sound/tegra_i2s.c                           |  1 +
 drivers/sound/tegra_sound.c                         |  1 +
 drivers/sound/wm8994.c                              |  1 +
 drivers/spi/atcspi200_spi.c                         |  1 +
 drivers/spi/atmel-quadspi.c                         |  1 +
 drivers/spi/atmel_spi.c                             |  1 +
 drivers/spi/bcm63xx_hsspi.c                         |  1 +
 drivers/spi/bcm63xx_spi.c                           |  1 +
 drivers/spi/bcmstb_spi.c                            |  1 +
 drivers/spi/cf_spi.c                                |  1 +
 drivers/spi/davinci_spi.c                           |  1 +
 drivers/spi/designware_spi.c                        |  1 +
 drivers/spi/exynos_spi.c                            |  1 +
 drivers/spi/fsl_dspi.c                              |  1 +
 drivers/spi/fsl_espi.c                              |  1 +
 drivers/spi/fsl_qspi.c                              |  1 +
 drivers/spi/ich.c                                   |  1 +
 drivers/spi/meson_spifc.c                           |  1 +
 drivers/spi/mpc8xx_spi.c                            |  1 +
 drivers/spi/mpc8xxx_spi.c                           |  1 +
 drivers/spi/mt7621_spi.c                            |  1 +
 drivers/spi/mtk_snfi_spi.c                          |  1 +
 drivers/spi/nxp_fspi.c                              |  1 +
 drivers/spi/pic32_spi.c                             |  1 +
 drivers/spi/pl022_spi.c                             |  1 +
 drivers/spi/soft_spi.c                              |  1 +
 drivers/spi/spi-mem-nodm.c                          |  1 +
 drivers/spi/spi-mem.c                               |  1 +
 drivers/spi/spi-sifive.c                            |  1 +
 drivers/spi/spi-sunxi.c                             |  1 +
 drivers/spi/spi-uclass.c                            |  1 +
 drivers/spi/stm32_qspi.c                            |  1 +
 drivers/spi/stm32_spi.c                             |  1 +
 drivers/spi/tegra20_sflash.c                        |  1 +
 drivers/spi/ti_qspi.c                               |  1 +
 drivers/spi/uniphier_spi.c                          |  1 +
 drivers/spi/zynq_qspi.c                             |  1 +
 drivers/spi/zynqmp_gqspi.c                          |  1 +
 drivers/spmi/spmi-msm.c                             |  1 +
 drivers/spmi/spmi-sandbox.c                         |  1 +
 drivers/spmi/spmi-uclass.c                          |  1 +
 drivers/sysreset/sysreset-ti-sci.c                  |  1 +
 drivers/sysreset/sysreset-uclass.c                  |  1 +
 drivers/sysreset/sysreset_ast.c                     |  1 +
 drivers/sysreset/sysreset_microblaze.c              |  1 +
 drivers/sysreset/sysreset_mpc83xx.c                 |  1 +
 drivers/sysreset/sysreset_octeon.c                  |  1 +
 drivers/sysreset/sysreset_rockchip.c                |  1 +
 drivers/sysreset/sysreset_sandbox.c                 |  1 +
 drivers/sysreset/sysreset_socfpga.c                 |  1 +
 drivers/sysreset/sysreset_socfpga_s10.c             |  1 +
 drivers/sysreset/sysreset_sti.c                     |  1 +
 drivers/sysreset/sysreset_syscon.c                  |  1 +
 drivers/sysreset/sysreset_watchdog.c                |  1 +
 drivers/sysreset/sysreset_x86.c                     |  1 +
 drivers/sysreset/sysreset_xtfpga.c                  |  1 +
 drivers/tee/broadcom/chimp_optee.c                  |  1 +
 drivers/tee/optee/core.c                            |  1 +
 drivers/tee/optee/supplicant.c                      |  1 +
 drivers/tee/sandbox.c                               |  1 +
 drivers/tee/tee-uclass.c                            |  1 +
 drivers/thermal/imx_scu_thermal.c                   |  1 +
 drivers/thermal/imx_thermal.c                       |  1 +
 drivers/thermal/imx_tmu.c                           |  1 +
 drivers/thermal/thermal-uclass.c                    |  1 +
 drivers/timer/arc_timer.c                           |  1 +
 drivers/timer/atmel_pit_timer.c                     |  1 +
 drivers/timer/mpc83xx_timer.c                       |  1 +
 drivers/timer/mtk_timer.c                           |  1 +
 drivers/timer/nomadik-mtu-timer.c                   |  1 +
 drivers/timer/rockchip_timer.c                      |  1 +
 drivers/timer/sti-timer.c                           |  1 +
 drivers/timer/stm32_timer.c                         |  1 +
 drivers/timer/timer-uclass.c                        |  1 +
 drivers/tpm/cr50_i2c.c                              |  1 +
 drivers/tpm/tpm-uclass.c                            |  1 +
 drivers/tpm/tpm2_ftpm_tee.c                         |  1 +
 drivers/tpm/tpm2_tis_sandbox.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/ufs/ufs.c                                   |  1 +
 drivers/usb/cdns3/cdns3-ti.c                        |  1 +
 drivers/usb/cdns3/core.c                            |  1 +
 drivers/usb/cdns3/drd.c                             |  1 +
 drivers/usb/cdns3/ep0.c                             |  1 +
 drivers/usb/cdns3/gadget-export.h                   |  1 +
 drivers/usb/cdns3/gadget.c                          |  1 +
 drivers/usb/cdns3/host-export.h                     |  1 +
 drivers/usb/cdns3/host.c                            |  1 +
 drivers/usb/common/fsl-dt-fixup.c                   |  1 +
 drivers/usb/dwc3/core.c                             |  1 +
 drivers/usb/dwc3/dwc3-generic.c                     |  1 +
 drivers/usb/dwc3/dwc3-meson-g12a.c                  |  1 +
 drivers/usb/dwc3/dwc3-omap.c                        |  1 +
 drivers/usb/dwc3/ep0.c                              |  1 +
 drivers/usb/dwc3/gadget.c                           |  1 +
 drivers/usb/dwc3/ti_usb_phy.c                       |  1 +
 drivers/usb/emul/sandbox_flash.c                    |  1 +
 drivers/usb/emul/sandbox_hub.c                      |  1 +
 drivers/usb/emul/sandbox_keyb.c                     |  1 +
 drivers/usb/emul/usb-emul-uclass.c                  |  1 +
 drivers/usb/eth/asix.c                              |  1 +
 drivers/usb/eth/asix88179.c                         |  1 +
 drivers/usb/eth/lan78xx.c                           |  1 +
 drivers/usb/eth/lan7x.c                             |  1 +
 drivers/usb/eth/mcs7830.c                           |  1 +
 drivers/usb/eth/r8152.c                             |  1 +
 drivers/usb/eth/r8152_fw.c                          |  1 +
 drivers/usb/eth/smsc95xx.c                          |  1 +
 drivers/usb/eth/usb_ether.c                         |  1 +
 drivers/usb/gadget/composite.c                      |  1 +
 drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c          |  1 +
 drivers/usb/gadget/f_dfu.c                          |  1 +
 drivers/usb/gadget/f_fastboot.c                     |  1 +
 drivers/usb/gadget/f_mass_storage.c                 |  1 +
 drivers/usb/gadget/f_rockusb.c                      |  1 +
 drivers/usb/gadget/f_sdp.c                          |  1 +
 drivers/usb/gadget/f_thor.c                         |  1 +
 drivers/usb/gadget/g_dnl.c                          |  1 +
 drivers/usb/gadget/gadget_chips.h                   |  1 +
 drivers/usb/gadget/pxa25x_udc.c                     |  1 +
 drivers/usb/gadget/udc/udc-core.c                   |  1 +
 drivers/usb/gadget/udc/udc-uclass.c                 |  1 +
 drivers/usb/host/dwc2.c                             |  1 +
 drivers/usb/host/dwc3-of-simple.c                   |  1 +
 drivers/usb/host/dwc3-sti-glue.c                    |  1 +
 drivers/usb/host/ehci-atmel.c                       |  1 +
 drivers/usb/host/ehci-fsl.c                         |  1 +
 drivers/usb/host/ehci-generic.c                     |  1 +
 drivers/usb/host/ehci-hcd.c                         |  1 +
 drivers/usb/host/ehci-marvell.c                     |  1 +
 drivers/usb/host/ehci-msm.c                         |  1 +
 drivers/usb/host/ehci-mx5.c                         |  1 +
 drivers/usb/host/ehci-mx6.c                         |  1 +
 drivers/usb/host/ehci-mxc.c                         |  1 +
 drivers/usb/host/ehci-mxs.c                         |  1 +
 drivers/usb/host/ehci-omap.c                        |  1 +
 drivers/usb/host/ehci-vf.c                          |  1 +
 drivers/usb/host/ehci-zynq.c                        |  1 +
 drivers/usb/host/ohci-da8xx.c                       |  1 +
 drivers/usb/host/ohci-generic.c                     |  1 +
 drivers/usb/host/ohci-hcd.c                         |  1 +
 drivers/usb/host/r8a66597-hcd.c                     |  1 +
 drivers/usb/host/usb-uclass.c                       |  1 +
 drivers/usb/host/xhci-brcm.c                        |  1 +
 drivers/usb/host/xhci-dwc3.c                        |  1 +
 drivers/usb/host/xhci-mvebu.c                       |  1 +
 drivers/usb/host/xhci-rcar.c                        |  1 +
 drivers/usb/musb-new/am35x.c                        |  1 +
 drivers/usb/musb-new/da8xx.c                        |  1 +
 drivers/usb/musb-new/mt85xx.c                       |  1 +
 drivers/usb/musb-new/musb_dsps.c                    |  1 +
 drivers/usb/musb-new/musb_gadget.c                  |  1 +
 drivers/usb/musb-new/musb_gadget_ep0.c              |  1 +
 drivers/usb/musb-new/omap2430.c                     |  1 +
 drivers/usb/musb-new/pic32.c                        |  1 +
 drivers/usb/musb-new/sunxi.c                        |  1 +
 drivers/usb/musb-new/ti-musb.c                      |  1 +
 drivers/video/am335x-fb.c                           |  1 +
 drivers/video/atmel_hlcdfb.c                        |  1 +
 drivers/video/atmel_lcdfb.c                         |  1 +
 drivers/video/backlight-uclass.c                    |  1 +
 drivers/video/bcm2835.c                             |  1 +
 drivers/video/bridge/anx6345.c                      |  1 +
 drivers/video/bridge/ps862x.c                       |  1 +
 drivers/video/bridge/video-bridge-uclass.c          |  1 +
 drivers/video/broadwell_igd.c                       |  1 +
 drivers/video/console_normal.c                      |  1 +
 drivers/video/console_rotate.c                      |  1 +
 drivers/video/console_truetype.c                    |  1 +
 drivers/video/coreboot.c                            |  1 +
 drivers/video/display-uclass.c                      |  1 +
 drivers/video/dsi-host-uclass.c                     |  1 +
 drivers/video/dw_mipi_dsi.c                         |  1 +
 drivers/video/efi.c                                 |  1 +
 drivers/video/exynos/exynos_dp.c                    |  1 +
 drivers/video/exynos/exynos_dp_lowlevel.c           |  1 +
 drivers/video/exynos/exynos_mipi_dsi.c              |  1 +
 drivers/video/exynos/exynos_mipi_dsi_common.c       |  1 +
 drivers/video/fsl_dcu_fb.c                          |  1 +
 drivers/video/hitachi_tx18d42vm_lcd.c               |  1 +
 drivers/video/ihs_video_out.c                       |  1 +
 drivers/video/ivybridge_igd.c                       |  1 +
 drivers/video/lg4573.c                              |  1 +
 drivers/video/logicore_dp_tx.c                      |  1 +
 drivers/video/mali_dp.c                             |  1 +
 drivers/video/meson/meson_dw_hdmi.c                 |  1 +
 drivers/video/meson/meson_vpu.c                     |  1 +
 drivers/video/mipi_dsi.c                            |  1 +
 drivers/video/mvebu_lcd.c                           |  1 +
 drivers/video/nexell/s5pxx18_dp.c                   |  1 +
 drivers/video/nexell/s5pxx18_dp_hdmi.c              |  1 +
 drivers/video/nexell/s5pxx18_dp_lvds.c              |  1 +
 drivers/video/nexell/s5pxx18_dp_mipi.c              |  1 +
 drivers/video/nexell_display.c                      |  1 +
 drivers/video/orisetech_otm8009a.c                  |  1 +
 drivers/video/panel-uclass.c                        |  1 +
 drivers/video/pwm_backlight.c                       |  1 +
 drivers/video/raydium-rm68200.c                     |  1 +
 drivers/video/rockchip/rk3288_mipi.c                |  1 +
 drivers/video/rockchip/rk3399_mipi.c                |  1 +
 drivers/video/rockchip/rk_edp.c                     |  1 +
 drivers/video/rockchip/rk_lvds.c                    |  1 +
 drivers/video/rockchip/rk_mipi.c                    |  1 +
 drivers/video/rockchip/rk_vop.c                     |  1 +
 drivers/video/sandbox_osd.c                         |  1 +
 drivers/video/simple_panel.c                        |  1 +
 drivers/video/simplefb.c                            |  1 +
 drivers/video/stm32/stm32_dsi.c                     |  1 +
 drivers/video/stm32/stm32_ltdc.c                    |  1 +
 drivers/video/sunxi/sunxi_de2.c                     |  1 +
 drivers/video/sunxi/sunxi_display.c                 |  1 +
 drivers/video/sunxi/sunxi_lcd.c                     |  1 +
 drivers/video/tda19988.c                            |  1 +
 drivers/video/tegra.c                               |  1 +
 drivers/video/tegra124/display.c                    |  1 +
 drivers/video/tegra124/dp.c                         |  1 +
 drivers/video/tegra124/sor.c                        |  1 +
 drivers/video/vidconsole-uclass.c                   |  1 +
 drivers/video/video-uclass.c                        |  1 +
 drivers/video/video_bmp.c                           |  1 +
 drivers/video/videomodes.c                          |  1 +
 drivers/virtio/virtio-uclass.c                      |  1 +
 drivers/virtio/virtio_blk.c                         |  1 +
 drivers/virtio/virtio_mmio.c                        |  1 +
 drivers/virtio/virtio_net.c                         |  1 +
 drivers/virtio/virtio_pci_legacy.c                  |  1 +
 drivers/virtio/virtio_pci_modern.c                  |  1 +
 drivers/virtio/virtio_ring.c                        |  1 +
 drivers/virtio/virtio_sandbox.c                     |  1 +
 drivers/w1-eeprom/ds2502.c                          |  1 +
 drivers/w1-eeprom/w1-eeprom-uclass.c                |  1 +
 drivers/w1/mxc_w1.c                                 |  1 +
 drivers/w1/w1-uclass.c                              |  1 +
 drivers/watchdog/armada-37xx-wdt.c                  |  1 +
 drivers/watchdog/at91sam9_wdt.c                     |  1 +
 drivers/watchdog/bcm6345_wdt.c                      |  1 +
 drivers/watchdog/cortina_wdt.c                      |  1 +
 drivers/watchdog/designware_wdt.c                   |  1 +
 drivers/watchdog/imx_watchdog.c                     |  1 +
 drivers/watchdog/mpc8xx_wdt.c                       |  1 +
 drivers/watchdog/mt7621_wdt.c                       |  1 +
 drivers/watchdog/mtk_wdt.c                          |  1 +
 drivers/watchdog/omap_wdt.c                         |  1 +
 drivers/watchdog/orion_wdt.c                        |  1 +
 drivers/watchdog/stm32mp_wdt.c                      |  1 +
 drivers/watchdog/wdt-uclass.c                       |  1 +
 drivers/watchdog/xilinx_tb_wdt.c                    |  1 +
 drivers/watchdog/xilinx_wwdt.c                      |  1 +
 env/common.c                                        |  1 +
 env/env.c                                           |  1 +
 env/ext4.c                                          |  1 +
 env/fat.c                                           |  1 +
 env/mmc.c                                           |  1 +
 env/nand.c                                          |  1 +
 env/remote.c                                        |  1 +
 env/sata.c                                          |  1 +
 env/sf.c                                            |  1 +
 env/ubi.c                                           |  1 +
 fs/btrfs/btrfs.c                                    |  1 +
 fs/cbfs/cbfs.c                                      |  1 +
 fs/ext4/ext4_common.c                               |  1 +
 fs/ext4/ext4_journal.c                              |  1 +
 fs/ext4/ext4_write.c                                |  1 +
 fs/ext4/ext4fs.c                                    |  1 +
 fs/fat/fat.c                                        |  1 +
 fs/fat/fat_write.c                                  |  1 +
 fs/fs.c                                             |  1 +
 fs/ubifs/debug.c                                    |  1 +
 fs/ubifs/io.c                                       |  1 +
 fs/ubifs/log.c                                      |  1 +
 fs/ubifs/lprops.c                                   |  1 +
 fs/ubifs/lpt_commit.c                               |  1 +
 fs/ubifs/orphan.c                                   |  1 +
 fs/ubifs/recovery.c                                 |  1 +
 fs/ubifs/replay.c                                   |  1 +
 fs/ubifs/scan.c                                     |  1 +
 fs/ubifs/super.c                                    |  1 +
 fs/ubifs/tnc.c                                      |  1 +
 fs/ubifs/tnc_misc.c                                 |  1 +
 fs/ubifs/ubifs.c                                    |  1 +
 fs/yaffs2/yaffs_uboot_glue.c                        |  1 +
 fs/yaffs2/yaffsfs.c                                 |  1 +
 fs/yaffs2/yportenv.h                                |  1 +
 include/acpi/acpi_s3.h                              |  1 +
 include/board.h                                     |  1 +
 include/common.h                                    |  1 -
 include/dfu.h                                       |  1 +
 include/dm/pinctrl.h                                |  1 +
 include/dwc3-uboot.h                                |  1 +
 include/eeprom.h                                    |  1 +
 include/hwspinlock.h                                |  1 +
 include/linux/soc/ti/ti_sci_protocol.h              |  1 +
 include/mipi_dsi.h                                  |  1 +
 include/power-domain.h                              |  1 +
 include/power/sandbox_pmic.h                        |  1 +
 include/regmap.h                                    |  1 +
 include/remoteproc.h                                |  1 +
 include/soc.h                                       |  1 +
 include/spi-mem.h                                   |  1 +
 include/spi_flash.h                                 |  1 +
 include/splash.h                                    |  1 +
 include/tlv_eeprom.h                                |  1 +
 include/u-boot/aes.h                                |  1 +
 include/u-boot/rsa.h                                |  1 +
 lib/acpi/acpi_device.c                              |  1 +
 lib/acpi/acpi_dp.c                                  |  1 +
 lib/acpi/acpi_table.c                               |  1 +
 lib/acpi/acpigen.c                                  |  1 +
 lib/aes/aes-decrypt.c                               |  1 +
 lib/bch.c                                           |  1 +
 lib/binman.c                                        |  1 +
 lib/crypto/asymmetric_type.c                        |  1 +
 lib/crypto/pkcs7_parser.c                           |  1 +
 lib/crypto/pkcs7_verify.c                           |  1 +
 lib/crypto/public_key.c                             |  1 +
 lib/crypto/rsa_helper.c                             |  1 +
 lib/crypto/x509_cert_parser.c                       |  1 +
 lib/efi/efi_app.c                                   |  1 +
 lib/efi/efi_info.c                                  |  1 +
 lib/efi/efi_stub.c                                  |  1 +
 lib/efi_driver/efi_block_device.c                   |  1 +
 lib/efi_loader/efi_variable_tee.c                   |  1 +
 lib/errno_str.c                                     |  1 +
 lib/fdtdec.c                                        |  1 +
 lib/hashtable.c                                     |  1 +
 lib/list_sort.c                                     |  1 +
 lib/lz4_wrapper.c                                   |  1 +
 lib/membuff.c                                       |  1 +
 lib/of_live.c                                       |  1 +
 lib/optee/optee.c                                   |  1 +
 lib/rsa/rsa-keyprop.c                               |  1 +
 lib/strto.c                                         |  1 +
 lib/trace.c                                         |  1 +
 lib/uuid.c                                          |  1 +
 lib/vsprintf.c                                      |  1 +
 net/eth-uclass.c                                    |  1 +
 net/mdio-mux-uclass.c                               |  1 +
 net/mdio-uclass.c                                   |  1 +
 net/net.c                                           |  1 +
 net/pcap.c                                          |  1 +
 test/bloblist.c                                     |  1 +
 test/dm/acpi.c                                      |  1 +
 test/dm/acpi_dp.c                                   |  1 +
 test/dm/acpigen.c                                   |  1 +
 test/dm/adc.c                                       |  1 +
 test/dm/blk.c                                       |  1 +
 test/dm/bus.c                                       |  1 +
 test/dm/button.c                                    |  1 +
 test/dm/core.c                                      |  1 +
 test/dm/eth.c                                       |  1 +
 test/dm/gpio.c                                      |  1 +
 test/dm/i2c.c                                       |  1 +
 test/dm/irq.c                                       |  1 +
 test/dm/k210_pll.c                                  |  1 +
 test/dm/led.c                                       |  1 +
 test/dm/mailbox.c                                   |  1 +
 test/dm/nop.c                                       |  1 +
 test/dm/pch.c                                       |  1 +
 test/dm/phy.c                                       |  1 +
 test/dm/pwm.c                                       |  1 +
 test/dm/regmap.c                                    |  1 +
 test/dm/regulator.c                                 |  1 +
 test/dm/remoteproc.c                                |  1 +
 test/dm/rtc.c                                       |  1 +
 test/dm/serial.c                                    |  1 +
 test/dm/sound.c                                     |  1 +
 test/dm/spi.c                                       |  1 +
 test/dm/syscon-reset.c                              |  1 +
 test/dm/syscon.c                                    |  1 +
 test/dm/sysreset.c                                  |  1 +
 test/dm/tee.c                                       |  1 +
 test/dm/test-driver.c                               |  1 +
 test/dm/test-fdt.c                                  |  1 +
 test/dm/test-uclass.c                               |  1 +
 test/dm/usb.c                                       |  1 +
 test/dm/video.c                                     |  1 +
 test/dm/virtio.c                                    |  1 +
 test/env/attr.c                                     |  1 +
 test/lib/test_errno_str.c                           |  1 +
 test/optee/cmd_ut_optee.c                           |  1 +
 test/overlay/cmd_ut_overlay.c                       |  1 +
 test/time_ut.c                                      |  1 +
 1553 files changed, 1558 insertions(+), 9 deletions(-)

diff --git a/arch/arm/cpu/arm926ejs/mx25/generic.c b/arch/arm/cpu/arm926ejs/mx25/generic.c
index e9ebda4317c..8b74650b364 100644
--- a/arch/arm/cpu/arm926ejs/mx25/generic.c
+++ b/arch/arm/cpu/arm926ejs/mx25/generic.c
@@ -22,6 +22,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/clock.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 
 #ifdef CONFIG_FSL_ESDHC_IMX
 #include <fsl_esdhc_imx.h>
diff --git a/arch/arm/cpu/armv7/s5p-common/pwm.c b/arch/arm/cpu/armv7/s5p-common/pwm.c
index aef2e5574b4..67c9208084d 100644
--- a/arch/arm/cpu/armv7/s5p-common/pwm.c
+++ b/arch/arm/cpu/armv7/s5p-common/pwm.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <asm/arch/pwm.h>
 #include <asm/arch/clk.h>
+#include <linux/errno.h>
 
 int pwm_enable(int pwm_id)
 {
diff --git a/arch/arm/cpu/armv7/vf610/generic.c b/arch/arm/cpu/armv7/vf610/generic.c
index 297a3d2378a..93418ce9a8c 100644
--- a/arch/arm/cpu/armv7/vf610/generic.c
+++ b/arch/arm/cpu/armv7/vf610/generic.c
@@ -23,6 +23,7 @@
 #include <fsl_esdhc_imx.h>
 #endif
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #ifdef CONFIG_FSL_ESDHC_IMX
diff --git a/arch/arm/cpu/armv7/virt-dt.c b/arch/arm/cpu/armv7/virt-dt.c
index 61c82f64699..d4818bf75fc 100644
--- a/arch/arm/cpu/armv7/virt-dt.c
+++ b/arch/arm/cpu/armv7/virt-dt.c
@@ -20,6 +20,7 @@
 #include <log.h>
 #include <stdio_dev.h>
 #include <linux/ctype.h>
+#include <linux/errno.h>
 #include <linux/types.h>
 #include <asm/global_data.h>
 #include <linux/libfdt.h>
diff --git a/arch/arm/cpu/armv7m/cache.c b/arch/arm/cpu/armv7m/cache.c
index f87e1d39367..abed2e36df4 100644
--- a/arch/arm/cpu/armv7m/cache.c
+++ b/arch/arm/cpu/armv7m/cache.c
@@ -13,6 +13,7 @@
 #include <asm/cache.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 /* Cache maintenance operation registers */
 
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ppa.c b/arch/arm/cpu/armv8/fsl-layerscape/ppa.c
index 0d458d0273e..60f2a4b002d 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/ppa.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/ppa.c
@@ -24,6 +24,7 @@
 #ifdef CONFIG_CHAIN_OF_TRUST
 #include <fsl_validate.h>
 #endif
+#include <linux/errno.h>
 
 #ifdef CONFIG_SYS_LS_PPA_FW_IN_NAND
 #include <nand.h>
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/soc.c b/arch/arm/cpu/armv8/fsl-layerscape/soc.c
index fb8560b4b9a..40e748b00a6 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/soc.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/soc.c
@@ -14,6 +14,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 #include <linux/sizes.h>
 #include <log.h>
 #include <asm/arch/fsl_serdes.h>
diff --git a/arch/arm/cpu/armv8/s32v234/generic.c b/arch/arm/cpu/armv8/s32v234/generic.c
index 59900958cd2..575dbb1f609 100644
--- a/arch/arm/cpu/armv8/s32v234/generic.c
+++ b/arch/arm/cpu/armv8/s32v234/generic.c
@@ -20,6 +20,7 @@
 #include <div64.h>
 #include <errno.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 
 u32 get_cpu_rev(void)
 {
diff --git a/arch/arm/cpu/armv8/sec_firmware.c b/arch/arm/cpu/armv8/sec_firmware.c
index 8f7eef0d4c0..1b273db4f98 100644
--- a/arch/arm/cpu/armv8/sec_firmware.c
+++ b/arch/arm/cpu/armv8/sec_firmware.c
@@ -13,6 +13,7 @@
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <asm/ptrace.h>
+#include <linux/errno.h>
 #include <linux/kernel.h>
 #include <asm/io.h>
 #include <asm/system.h>
diff --git a/arch/arm/cpu/armv8/spin_table.c b/arch/arm/cpu/armv8/spin_table.c
index f687b54d0e1..49e1903a29f 100644
--- a/arch/arm/cpu/armv8/spin_table.c
+++ b/arch/arm/cpu/armv8/spin_table.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <asm/spin_table.h>
 #include <linux/string.h>
diff --git a/arch/arm/cpu/pxa/cpuinfo.c b/arch/arm/cpu/pxa/cpuinfo.c
index 582c1fcaa7a..ff56c3a82be 100644
--- a/arch/arm/cpu/pxa/cpuinfo.c
+++ b/arch/arm/cpu/pxa/cpuinfo.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <errno.h>
 #include <linux/compiler.h>
+#include <linux/errno.h>
 
 #ifdef CONFIG_CPU_PXA25X
 #if ((CONFIG_SYS_INIT_SP_ADDR) != 0xfffff800)
diff --git a/arch/arm/include/asm/arch-tegra/cboot.h b/arch/arm/include/asm/arch-tegra/cboot.h
index 4e1da98d1f2..d89e784f2d2 100644
--- a/arch/arm/include/asm/arch-tegra/cboot.h
+++ b/arch/arm/include/asm/arch-tegra/cboot.h
@@ -7,6 +7,7 @@
 #define _TEGRA_CBOOT_H_
 
 #include <net.h>
+#include <linux/errno.h>
 
 #ifdef CONFIG_ARM64
 
diff --git a/arch/arm/lib/gic-v3-its.c b/arch/arm/lib/gic-v3-its.c
index 6cdcd1ed60c..45c8ae09350 100644
--- a/arch/arm/lib/gic-v3-its.c
+++ b/arch/arm/lib/gic-v3-its.c
@@ -10,6 +10,7 @@
 #include <asm/gic-v3.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/sizes.h>
 
diff --git a/arch/arm/mach-aspeed/ast2500/sdram_ast2500.c b/arch/arm/mach-aspeed/ast2500/sdram_ast2500.c
index cfb0374d60c..9eefeef5fb3 100644
--- a/arch/arm/mach-aspeed/ast2500/sdram_ast2500.c
+++ b/arch/arm/mach-aspeed/ast2500/sdram_ast2500.c
@@ -19,6 +19,7 @@
 #include <asm/arch/sdram_ast2500.h>
 #include <asm/arch/wdt.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/kernel.h>
 #include <dt-bindings/clock/ast2500-scu.h>
 
diff --git a/arch/arm/mach-bcm283x/msg.c b/arch/arm/mach-bcm283x/msg.c
index ac43d51e64d..3c3eac9025b 100644
--- a/arch/arm/mach-bcm283x/msg.c
+++ b/arch/arm/mach-bcm283x/msg.c
@@ -9,6 +9,7 @@
 #include <stdio.h>
 #include <asm/arch/mbox.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 struct msg_set_power_state {
 	struct bcm2835_mbox_hdr hdr;
diff --git a/arch/arm/mach-imx/cmd_nandbcb.c b/arch/arm/mach-imx/cmd_nandbcb.c
index 2b7affaaccd..beb538677d9 100644
--- a/arch/arm/mach-imx/cmd_nandbcb.c
+++ b/arch/arm/mach-imx/cmd_nandbcb.c
@@ -20,6 +20,7 @@
 #include <vsprintf.h>
 #include <dm/devres.h>
 #include <linux/bug.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include <asm/io.h>
diff --git a/arch/arm/mach-imx/imx8/ahab.c b/arch/arm/mach-imx/imx8/ahab.c
index 1d92c07be24..fb1d067f9c5 100644
--- a/arch/arm/mach-imx/imx8/ahab.c
+++ b/arch/arm/mach-imx/imx8/ahab.c
@@ -18,6 +18,7 @@
 #include <asm/arch/image.h>
 #include <console.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-imx/imx8/cpu.c b/arch/arm/mach-imx/imx8/cpu.c
index 5869dc85c18..d729c3536e7 100644
--- a/arch/arm/mach-imx/imx8/cpu.c
+++ b/arch/arm/mach-imx/imx8/cpu.c
@@ -28,6 +28,7 @@
 #include <asm/setup.h>
 #include <asm/mach-imx/boot_mode.h>
 #include <spl.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-imx/imx8/fdt.c b/arch/arm/mach-imx/imx8/fdt.c
index 0fd0c4bca09..239adfc2e5c 100644
--- a/arch/arm/mach-imx/imx8/fdt.c
+++ b/arch/arm/mach-imx/imx8/fdt.c
@@ -12,6 +12,7 @@
 #include <asm/u-boot.h>
 #include <dm/ofnode.h>
 #include <fdt_support.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <linux/printk.h>
 #include <linux/string.h>
diff --git a/arch/arm/mach-imx/imx8/image.c b/arch/arm/mach-imx/imx8/image.c
index 9b4fc6f0905..528a42a5996 100644
--- a/arch/arm/mach-imx/imx8/image.c
+++ b/arch/arm/mach-imx/imx8/image.c
@@ -15,6 +15,7 @@
 #include <asm/arch/image.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/mach-imx/boot_mode.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #define MMC_DEV		0
diff --git a/arch/arm/mach-imx/imx8/parse-container.c b/arch/arm/mach-imx/imx8/parse-container.c
index 3a1c8c7a5e5..6a3a4eaa7c7 100644
--- a/arch/arm/mach-imx/imx8/parse-container.c
+++ b/arch/arm/mach-imx/imx8/parse-container.c
@@ -10,6 +10,7 @@
 #include <stdio.h>
 #include <asm/arch/image.h>
 #include <asm/arch/sci/sci.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #define SEC_SECURE_RAM_BASE		0x31800000UL
diff --git a/arch/arm/mach-imx/imx8/snvs_security_sc.c b/arch/arm/mach-imx/imx8/snvs_security_sc.c
index 6bb067e08bd..391d2d0e4b1 100644
--- a/arch/arm/mach-imx/imx8/snvs_security_sc.c
+++ b/arch/arm/mach-imx/imx8/snvs_security_sc.c
@@ -21,6 +21,7 @@
 #include <asm/arch-imx8/imx8-pins.h>
 #include <asm/arch-imx8/snvs_security_sc.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 
 /* Access to gd */
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-imx/imx8m/clock_imx8mm.c b/arch/arm/mach-imx/imx8m/clock_imx8mm.c
index ff3943e5106..170e6c20853 100644
--- a/arch/arm/mach-imx/imx8m/clock_imx8mm.c
+++ b/arch/arm/mach-imx/imx8m/clock_imx8mm.c
@@ -16,6 +16,7 @@
 #include <errno.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-imx/imx8m/clock_imx8mq.c b/arch/arm/mach-imx/imx8m/clock_imx8mq.c
index 444e9b7feee..0c74f99f440 100644
--- a/arch/arm/mach-imx/imx8m/clock_imx8mq.c
+++ b/arch/arm/mach-imx/imx8m/clock_imx8mq.c
@@ -14,6 +14,7 @@
 #include <asm/arch/sys_proto.h>
 #include <errno.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/iopoll.h>
 
 static struct anamix_pll *ana_pll = (struct anamix_pll *)ANATOP_BASE_ADDR;
diff --git a/arch/arm/mach-imx/imx8m/clock_slice.c b/arch/arm/mach-imx/imx8m/clock_slice.c
index b5ed27a923e..ad0d553c1cf 100644
--- a/arch/arm/mach-imx/imx8m/clock_slice.c
+++ b/arch/arm/mach-imx/imx8m/clock_slice.c
@@ -10,6 +10,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/io.h>
 #include <errno.h>
+#include <linux/errno.h>
 
 static struct ccm_reg *ccm_reg = (struct ccm_reg *)CCM_BASE_ADDR;
 
diff --git a/arch/arm/mach-imx/imx8m/soc.c b/arch/arm/mach-imx/imx8m/soc.c
index 09830301e7b..8fff7f4f95b 100644
--- a/arch/arm/mach-imx/imx8m/soc.c
+++ b/arch/arm/mach-imx/imx8m/soc.c
@@ -32,6 +32,7 @@
 #include <imx_sip.h>
 #include <linux/arm-smccc.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-imx/imx_bootaux.c b/arch/arm/mach-imx/imx_bootaux.c
index c94da85bf76..02fa1d7b62b 100644
--- a/arch/arm/mach-imx/imx_bootaux.c
+++ b/arch/arm/mach-imx/imx_bootaux.c
@@ -15,6 +15,7 @@
 #include <linux/arm-smccc.h>
 #include <linux/compiler.h>
 #include <cpu_func.h>
+#include <linux/errno.h>
 
 int arch_auxiliary_core_up(u32 core_id, ulong addr)
 {
diff --git a/arch/arm/mach-imx/mx7ulp/clock.c b/arch/arm/mach-imx/mx7ulp/clock.c
index 10390a74165..c7dfa798b45 100644
--- a/arch/arm/mach-imx/mx7ulp/clock.c
+++ b/arch/arm/mach-imx/mx7ulp/clock.c
@@ -13,6 +13,7 @@
 #include <errno.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-imx/mx7ulp/pcc.c b/arch/arm/mach-imx/mx7ulp/pcc.c
index a70131dfa3b..1fd8b0a540f 100644
--- a/arch/arm/mach-imx/mx7ulp/pcc.c
+++ b/arch/arm/mach-imx/mx7ulp/pcc.c
@@ -12,6 +12,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/pcc.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/errno.h>
 
 #define PCC_CLKSRC_TYPES 2
 #define PCC_CLKSRC_NUM 7
diff --git a/arch/arm/mach-imx/mx7ulp/scg.c b/arch/arm/mach-imx/mx7ulp/scg.c
index 6c24ec2d819..58bc3df1e78 100644
--- a/arch/arm/mach-imx/mx7ulp/scg.c
+++ b/arch/arm/mach-imx/mx7ulp/scg.c
@@ -13,6 +13,7 @@
 #include <asm/arch/pcc.h>
 #include <asm/arch/sys_proto.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 scg_p scg1_regs = (scg_p)SCG1_RBASE;
 
diff --git a/arch/arm/mach-ipq40xx/clock-ipq4019.c b/arch/arm/mach-ipq40xx/clock-ipq4019.c
index 7cf98a203c2..dae070f0ed6 100644
--- a/arch/arm/mach-ipq40xx/clock-ipq4019.c
+++ b/arch/arm/mach-ipq40xx/clock-ipq4019.c
@@ -12,6 +12,7 @@
 #include <clk-uclass.h>
 #include <dm.h>
 #include <errno.h>
+#include <linux/errno.h>
 
 struct msm_clk_priv {
 	phys_addr_t base;
diff --git a/arch/arm/mach-ipq40xx/pinctrl-snapdragon.c b/arch/arm/mach-ipq40xx/pinctrl-snapdragon.c
index 64b8b049fa1..08001da66f1 100644
--- a/arch/arm/mach-ipq40xx/pinctrl-snapdragon.c
+++ b/arch/arm/mach-ipq40xx/pinctrl-snapdragon.c
@@ -16,6 +16,7 @@
 #include <asm/io.h>
 #include <dm/pinctrl.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include "pinctrl-snapdragon.h"
 
 struct msm_pinctrl_priv {
diff --git a/arch/arm/mach-k3/sysfw-loader.c b/arch/arm/mach-k3/sysfw-loader.c
index f3c4bd61e8d..bfaf4952071 100644
--- a/arch/arm/mach-k3/sysfw-loader.c
+++ b/arch/arm/mach-k3/sysfw-loader.c
@@ -15,6 +15,7 @@
 #include <vsprintf.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/soc/ti/ti_sci_protocol.h>
 #include <g_dnl.h>
 #include <usb.h>
diff --git a/arch/arm/mach-keystone/cmd_mon.c b/arch/arm/mach-keystone/cmd_mon.c
index e98df01e89f..5887a89ff11 100644
--- a/arch/arm/mach-keystone/cmd_mon.c
+++ b/arch/arm/mach-keystone/cmd_mon.c
@@ -11,6 +11,7 @@
 #include <image.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <mach/mon.h>
 asm(".arch_extension sec\n\t");
diff --git a/arch/arm/mach-meson/board-common.c b/arch/arm/mach-meson/board-common.c
index a8d0254d576..cdae5f98770 100644
--- a/arch/arm/mach-meson/board-common.c
+++ b/arch/arm/mach-meson/board-common.c
@@ -14,6 +14,7 @@
 #include <asm/global_data.h>
 #include <asm/ptrace.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <linux/err.h>
 #include <asm/arch/mem.h>
diff --git a/arch/arm/mach-meson/board-g12a.c b/arch/arm/mach-meson/board-g12a.c
index b698298e13e..cdaed763b42 100644
--- a/arch/arm/mach-meson/board-g12a.c
+++ b/arch/arm/mach-meson/board-g12a.c
@@ -17,6 +17,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/armv8/mmu.h>
+#include <linux/errno.h>
 #include <linux/sizes.h>
 #include <usb.h>
 #include <linux/usb/otg.h>
diff --git a/arch/arm/mach-meson/board-gx.c b/arch/arm/mach-meson/board-gx.c
index ec2f1c07314..b38811fb951 100644
--- a/arch/arm/mach-meson/board-gx.c
+++ b/arch/arm/mach-meson/board-gx.c
@@ -16,6 +16,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/armv8/mmu.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/sizes.h>
 #include <usb.h>
diff --git a/arch/arm/mach-meson/sm.c b/arch/arm/mach-meson/sm.c
index f4f54fafce9..62feaccfce0 100644
--- a/arch/arm/mach-meson/sm.c
+++ b/arch/arm/mach-meson/sm.c
@@ -17,6 +17,7 @@
 #include <asm/ptrace.h>
 #include <linux/bitops.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/kernel.h>
 #include <dm.h>
 #include <linux/bitfield.h>
diff --git a/arch/arm/mach-mvebu/arm64-common.c b/arch/arm/mach-mvebu/arm64-common.c
index 68c5849e2c4..513dcbf9878 100644
--- a/arch/arm/mach-mvebu/arm64-common.c
+++ b/arch/arm/mach-mvebu/arm64-common.c
@@ -11,6 +11,7 @@
 #include <asm/global_data.h>
 #include <asm/ptrace.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <linux/sizes.h>
 #include <pci.h>
diff --git a/arch/arm/mach-mvebu/armada3700/cpu.c b/arch/arm/mach-mvebu/armada3700/cpu.c
index a02ab17beae..a6b92cf8fb8 100644
--- a/arch/arm/mach-mvebu/armada3700/cpu.c
+++ b/arch/arm/mach-mvebu/armada3700/cpu.c
@@ -13,6 +13,7 @@
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <asm/io.h>
 #include <asm/system.h>
diff --git a/arch/arm/mach-mvebu/efuse.c b/arch/arm/mach-mvebu/efuse.c
index c79eee98fe9..8ada3cf93e7 100644
--- a/arch/arm/mach-mvebu/efuse.c
+++ b/arch/arm/mach-mvebu/efuse.c
@@ -12,6 +12,7 @@
 #include <asm/arch/soc.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/mbus.h>
 
 #if defined(CONFIG_MVEBU_EFUSE_FAKE)
diff --git a/arch/arm/mach-nexell/clock.c b/arch/arm/mach-nexell/clock.c
index 0fac5efc2a7..38f6b1fc901 100644
--- a/arch/arm/mach-nexell/clock.c
+++ b/arch/arm/mach-nexell/clock.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <asm/arch/nexell.h>
 #include <asm/arch/clk.h>
+#include <linux/errno.h>
 
 /*
  * clock generator macros
diff --git a/arch/arm/mach-omap2/sec-common.c b/arch/arm/mach-omap2/sec-common.c
index f96d1379bb3..f24e0ad6366 100644
--- a/arch/arm/mach-omap2/sec-common.c
+++ b/arch/arm/mach-omap2/sec-common.c
@@ -21,6 +21,7 @@
 #include <stdarg.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include <asm/arch/sys_proto.h>
diff --git a/arch/arm/mach-rockchip/board.c b/arch/arm/mach-rockchip/board.c
index 76ad4721261..b7835a14a90 100644
--- a/arch/arm/mach-rockchip/board.c
+++ b/arch/arm/mach-rockchip/board.c
@@ -19,6 +19,7 @@
 #include <asm/arch-rockchip/periph.h>
 #include <asm/arch-rockchip/misc.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <power/regulator.h>
 
diff --git a/arch/arm/mach-rockchip/boot_mode.c b/arch/arm/mach-rockchip/boot_mode.c
index fefffc71ffa..20d44d424be 100644
--- a/arch/arm/mach-rockchip/boot_mode.c
+++ b/arch/arm/mach-rockchip/boot_mode.c
@@ -13,6 +13,7 @@
 #include <asm/arch-rockchip/boot_mode.h>
 #include <dm/device.h>
 #include <dm/uclass.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/arch/arm/mach-rockchip/spl-boot-order.c b/arch/arm/mach-rockchip/spl-boot-order.c
index ddc4081dbb4..57ea84a9346 100644
--- a/arch/arm/mach-rockchip/spl-boot-order.c
+++ b/arch/arm/mach-rockchip/spl-boot-order.c
@@ -9,6 +9,7 @@
 #include <mmc.h>
 #include <spl.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #if CONFIG_IS_ENABLED(OF_LIBFDT)
diff --git a/arch/arm/mach-snapdragon/clock-snapdragon.c b/arch/arm/mach-snapdragon/clock-snapdragon.c
index 69d65c82e3e..78e30ea5bab 100644
--- a/arch/arm/mach-snapdragon/clock-snapdragon.c
+++ b/arch/arm/mach-snapdragon/clock-snapdragon.c
@@ -13,6 +13,7 @@
 #include <errno.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include "clock-snapdragon.h"
 
 /* CBCR register fields */
diff --git a/arch/arm/mach-snapdragon/dram.c b/arch/arm/mach-snapdragon/dram.c
index c3e61007417..df7148fee11 100644
--- a/arch/arm/mach-snapdragon/dram.c
+++ b/arch/arm/mach-snapdragon/dram.c
@@ -14,6 +14,7 @@
 #include <fdt_support.h>
 #include <stdio.h>
 #include <asm/arch/dram.h>
+#include <linux/errno.h>
 
 #define SMEM_USABLE_RAM_PARTITION_TABLE 402
 #define RAM_PART_NAME_LENGTH            16
diff --git a/arch/arm/mach-snapdragon/pinctrl-snapdragon.c b/arch/arm/mach-snapdragon/pinctrl-snapdragon.c
index 4c2af213082..b1c075a44ac 100644
--- a/arch/arm/mach-snapdragon/pinctrl-snapdragon.c
+++ b/arch/arm/mach-snapdragon/pinctrl-snapdragon.c
@@ -12,6 +12,7 @@
 #include <asm/io.h>
 #include <dm/pinctrl.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include "pinctrl-snapdragon.h"
 
 struct msm_pinctrl_priv {
diff --git a/arch/arm/mach-socfpga/board.c b/arch/arm/mach-socfpga/board.c
index 4e9b57ba2ed..101456f1474 100644
--- a/arch/arm/mach-socfpga/board.c
+++ b/arch/arm/mach-socfpga/board.c
@@ -16,6 +16,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 
 #include <usb.h>
 #include <usb/dwc2_udc.h>
diff --git a/arch/arm/mach-socfpga/clock_manager_agilex.c b/arch/arm/mach-socfpga/clock_manager_agilex.c
index 0582b0b0857..9c229de4b92 100644
--- a/arch/arm/mach-socfpga/clock_manager_agilex.c
+++ b/arch/arm/mach-socfpga/clock_manager_agilex.c
@@ -15,6 +15,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <dt-bindings/clock/agilex-clock.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-socfpga/clock_manager_arria10.c b/arch/arm/mach-socfpga/clock_manager_arria10.c
index 9379005444d..82c90fb526c 100644
--- a/arch/arm/mach-socfpga/clock_manager_arria10.c
+++ b/arch/arm/mach-socfpga/clock_manager_arria10.c
@@ -13,6 +13,7 @@
 #include <dm/device-internal.h>
 #include <asm/arch/clock_manager.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #ifdef CONFIG_SPL_BUILD
diff --git a/arch/arm/mach-socfpga/mailbox_s10.c b/arch/arm/mach-socfpga/mailbox_s10.c
index 58d94694b7e..85df32968d8 100644
--- a/arch/arm/mach-socfpga/mailbox_s10.c
+++ b/arch/arm/mach-socfpga/mailbox_s10.c
@@ -13,6 +13,7 @@
 #include <asm/arch/mailbox_s10.h>
 #include <asm/arch/system_manager.h>
 #include <asm/secure.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-socfpga/misc.c b/arch/arm/mach-socfpga/misc.c
index 406023f1ef9..5a5f1a82779 100644
--- a/arch/arm/mach-socfpga/misc.c
+++ b/arch/arm/mach-socfpga/misc.c
@@ -15,6 +15,7 @@
 #include <errno.h>
 #include <fdtdec.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <altera.h>
 #include <miiphy.h>
diff --git a/arch/arm/mach-socfpga/misc_gen5.c b/arch/arm/mach-socfpga/misc_gen5.c
index 9672496ad46..033ed6229f7 100644
--- a/arch/arm/mach-socfpga/misc_gen5.c
+++ b/arch/arm/mach-socfpga/misc_gen5.c
@@ -14,6 +14,7 @@
 #include <fdtdec.h>
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <altera.h>
 #include <miiphy.h>
diff --git a/arch/arm/mach-socfpga/misc_s10.c b/arch/arm/mach-socfpga/misc_s10.c
index e2b6a85cfd1..c5c72acfa20 100644
--- a/arch/arm/mach-socfpga/misc_s10.c
+++ b/arch/arm/mach-socfpga/misc_s10.c
@@ -22,6 +22,7 @@
 #include <asm/arch/misc.h>
 #include <asm/pl310.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <asm/arch/mailbox_s10.h>
 #include <linux/string.h>
diff --git a/arch/arm/mach-socfpga/pinmux_arria10.c b/arch/arm/mach-socfpga/pinmux_arria10.c
index a38b19c395e..aee51c039c9 100644
--- a/arch/arm/mach-socfpga/pinmux_arria10.c
+++ b/arch/arm/mach-socfpga/pinmux_arria10.c
@@ -8,6 +8,7 @@
 #include <asm/io.h>
 #include <common.h>
 #include <fdtdec.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 static int do_pinctr_pin(const void *blob, int child, const char *node_name)
diff --git a/arch/arm/mach-socfpga/scan_manager.c b/arch/arm/mach-socfpga/scan_manager.c
index 36d6880141e..d5601739ef6 100644
--- a/arch/arm/mach-socfpga/scan_manager.c
+++ b/arch/arm/mach-socfpga/scan_manager.c
@@ -10,6 +10,7 @@
 #include <asm/arch/scan_manager.h>
 #include <asm/arch/system_manager.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 /*
  * Maximum polling loop to wait for IO scan chain engine becomes idle
diff --git a/arch/arm/mach-socfpga/wrap_iocsr_config.c b/arch/arm/mach-socfpga/wrap_iocsr_config.c
index f810fade92a..01864be5edb 100644
--- a/arch/arm/mach-socfpga/wrap_iocsr_config.c
+++ b/arch/arm/mach-socfpga/wrap_iocsr_config.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <errno.h>
 #include <asm/arch/clock_manager.h>
+#include <linux/errno.h>
 
 /* Board-specific header. */
 #include <qts/iocsr_config.h>
diff --git a/arch/arm/mach-stm32mp/bsec.c b/arch/arm/mach-stm32mp/bsec.c
index 7bd9c06de57..d3c1262ee84 100644
--- a/arch/arm/mach-stm32mp/bsec.c
+++ b/arch/arm/mach-stm32mp/bsec.c
@@ -11,6 +11,7 @@
 #include <asm/arch/bsec.h>
 #include <asm/arch/stm32mp1_smc.h>
 #include <linux/arm-smccc.h>
+#include <linux/errno.h>
 #include <linux/iopoll.h>
 #include <linux/printk.h>
 
diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c
index 3ed7b8d3b38..4b14326d65f 100644
--- a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c
+++ b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c
@@ -17,6 +17,7 @@
 #include <asm/u-boot.h>
 #include <dm/uclass.h>
 #include <jffs2/load_kernel.h>
+#include <linux/errno.h>
 #include <linux/list.h>
 #include <linux/list_sort.h>
 #include <linux/mtd/mtd.h>
diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_serial.c b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_serial.c
index 1fbb870f581..f16bfff2428 100644
--- a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_serial.c
+++ b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_serial.c
@@ -15,6 +15,7 @@
 #include <dm/lists.h>
 #include <dm/device-internal.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include "stm32prog.h"
diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_usb.c b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_usb.c
index 616f556ab90..15ca72043a3 100644
--- a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_usb.c
+++ b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_usb.c
@@ -11,6 +11,7 @@
 #include <vsprintf.h>
 #include <asm/arch/stm32prog.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include "stm32prog.h"
diff --git a/arch/arm/mach-stm32mp/cpu.c b/arch/arm/mach-stm32mp/cpu.c
index e31d33d3a30..4eadd20f065 100644
--- a/arch/arm/mach-stm32mp/cpu.c
+++ b/arch/arm/mach-stm32mp/cpu.c
@@ -22,6 +22,7 @@
 #include <dm/device.h>
 #include <dm/uclass.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 /* RCC register */
diff --git a/arch/arm/mach-stm32mp/include/mach/stm32mp1_smc.h b/arch/arm/mach-stm32mp/include/mach/stm32mp1_smc.h
index 1b2bba3d34c..fbc082703dc 100644
--- a/arch/arm/mach-stm32mp/include/mach/stm32mp1_smc.h
+++ b/arch/arm/mach-stm32mp/include/mach/stm32mp1_smc.h
@@ -7,6 +7,7 @@
 #define __STM32MP1_SMC_H__
 
 #include <linux/arm-smccc.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 /*
diff --git a/arch/arm/mach-stm32mp/pwr_regulator.c b/arch/arm/mach-stm32mp/pwr_regulator.c
index eb024b85116..954603f6745 100644
--- a/arch/arm/mach-stm32mp/pwr_regulator.c
+++ b/arch/arm/mach-stm32mp/pwr_regulator.c
@@ -12,6 +12,7 @@
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 
diff --git a/arch/arm/mach-stm32mp/spl.c b/arch/arm/mach-stm32mp/spl.c
index c23195510ad..d2aae1a69f1 100644
--- a/arch/arm/mach-stm32mp/spl.c
+++ b/arch/arm/mach-stm32mp/spl.c
@@ -16,6 +16,7 @@
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 
 u32 spl_boot_device(void)
diff --git a/arch/arm/mach-sunxi/cpu_info.c b/arch/arm/mach-sunxi/cpu_info.c
index 5198fb555a9..5a7d03dce89 100644
--- a/arch/arm/mach-sunxi/cpu_info.c
+++ b/arch/arm/mach-sunxi/cpu_info.c
@@ -13,6 +13,7 @@
 #include <asm/arch/clock.h>
 #include <axp_pmic.h>
 #include <errno.h>
+#include <linux/errno.h>
 
 #ifdef CONFIG_MACH_SUN6I
 int sunxi_get_ss_bonding_id(void)
diff --git a/arch/arm/mach-sunxi/dram_sun8i_a33.c b/arch/arm/mach-sunxi/dram_sun8i_a33.c
index d99a38b10aa..d5d324860e3 100644
--- a/arch/arm/mach-sunxi/dram_sun8i_a33.c
+++ b/arch/arm/mach-sunxi/dram_sun8i_a33.c
@@ -15,6 +15,7 @@
 #include <asm/arch/dram.h>
 #include <asm/arch/prcm.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 /* PLL runs at 2x dram-clk, controller runs at PLL / 4 (dram-clk / 2) */
 #define DRAM_CLK_MUL 2
diff --git a/arch/arm/mach-sunxi/dram_sun8i_a83t.c b/arch/arm/mach-sunxi/dram_sun8i_a83t.c
index a3f833dd341..8a32ea4f0a1 100644
--- a/arch/arm/mach-sunxi/dram_sun8i_a83t.c
+++ b/arch/arm/mach-sunxi/dram_sun8i_a83t.c
@@ -15,6 +15,7 @@
 #include <asm/arch/dram.h>
 #include <asm/arch/prcm.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 #define DRAM_CLK_MUL 2
 #define DRAM_CLK_DIV 1
diff --git a/arch/arm/mach-sunxi/p2wi.c b/arch/arm/mach-sunxi/p2wi.c
index 7c5c12254ea..550b37b3663 100644
--- a/arch/arm/mach-sunxi/p2wi.c
+++ b/arch/arm/mach-sunxi/p2wi.c
@@ -23,6 +23,7 @@
 #include <asm/arch/prcm.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/errno.h>
 
 void p2wi_init(void)
 {
diff --git a/arch/arm/mach-sunxi/rsb.c b/arch/arm/mach-sunxi/rsb.c
index 01bb09b7478..2ec63f5a568 100644
--- a/arch/arm/mach-sunxi/rsb.c
+++ b/arch/arm/mach-sunxi/rsb.c
@@ -15,6 +15,7 @@
 #include <asm/arch/gpio.h>
 #include <asm/arch/prcm.h>
 #include <asm/arch/rsb.h>
+#include <linux/errno.h>
 
 static int rsb_set_device_mode(void);
 
diff --git a/arch/arm/mach-tegra/cboot.c b/arch/arm/mach-tegra/cboot.c
index 4fc9a6706a4..14f75625cec 100644
--- a/arch/arm/mach-tegra/cboot.c
+++ b/arch/arm/mach-tegra/cboot.c
@@ -17,6 +17,7 @@
 #include <string.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/arch/arm/mach-tegra/clock.c b/arch/arm/mach-tegra/clock.c
index 6b587209c1c..9056fe0dd31 100644
--- a/arch/arm/mach-tegra/clock.c
+++ b/arch/arm/mach-tegra/clock.c
@@ -20,6 +20,7 @@
 #include <asm/arch-tegra/pmc.h>
 #include <asm/arch-tegra/timer.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 /*
  * This is our record of the current clock rate of each clock. We don't
diff --git a/arch/arm/mach-tegra/ivc.c b/arch/arm/mach-tegra/ivc.c
index 66c1276f4b8..216673e4367 100644
--- a/arch/arm/mach-tegra/ivc.c
+++ b/arch/arm/mach-tegra/ivc.c
@@ -8,6 +8,7 @@
 #include <asm/io.h>
 #include <asm/arch-tegra/ivc.h>
 #include <linux/bug.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 #define TEGRA_IVC_ALIGN 64
diff --git a/arch/arm/mach-tegra/powergate.c b/arch/arm/mach-tegra/powergate.c
index c5ced7e3f38..5b3e3d8f56e 100644
--- a/arch/arm/mach-tegra/powergate.c
+++ b/arch/arm/mach-tegra/powergate.c
@@ -7,6 +7,7 @@
 #include <errno.h>
 #include <time.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 #include <asm/io.h>
 #include <asm/types.h>
diff --git a/arch/arm/mach-tegra/tegra124/xusb-padctl.c b/arch/arm/mach-tegra/tegra124/xusb-padctl.c
index a1136f1558b..6985515499f 100644
--- a/arch/arm/mach-tegra/tegra124/xusb-padctl.c
+++ b/arch/arm/mach-tegra/tegra124/xusb-padctl.c
@@ -13,6 +13,7 @@
 #include <dm/of_access.h>
 #include <dm/ofnode.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 #include "../xusb-padctl-common.h"
diff --git a/arch/arm/mach-tegra/tegra20/clock.c b/arch/arm/mach-tegra/tegra20/clock.c
index fc197a050c5..c8db06cf66c 100644
--- a/arch/arm/mach-tegra/tegra20/clock.c
+++ b/arch/arm/mach-tegra/tegra20/clock.c
@@ -20,6 +20,7 @@
 #include <div64.h>
 #include <fdtdec.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 /*
diff --git a/arch/arm/mach-tegra/tegra210/clock.c b/arch/arm/mach-tegra/tegra210/clock.c
index 7f8c3c3a7c7..48f7e354108 100644
--- a/arch/arm/mach-tegra/tegra210/clock.c
+++ b/arch/arm/mach-tegra/tegra210/clock.c
@@ -23,6 +23,7 @@
 #include <fdtdec.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 /*
  * Clock types that we can use as a source. The Tegra210 has muxes for the
diff --git a/arch/arm/mach-tegra/tegra210/xusb-padctl.c b/arch/arm/mach-tegra/tegra210/xusb-padctl.c
index 0af6e256ad1..572ba95d5b0 100644
--- a/arch/arm/mach-tegra/tegra210/xusb-padctl.c
+++ b/arch/arm/mach-tegra/tegra210/xusb-padctl.c
@@ -13,6 +13,7 @@
 #include <dm/of_access.h>
 #include <dm/ofnode.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 #include "../xusb-padctl-common.h"
diff --git a/arch/arm/mach-tegra/tegra30/clock.c b/arch/arm/mach-tegra/tegra30/clock.c
index 38b53cbbe48..b35f02eedd4 100644
--- a/arch/arm/mach-tegra/tegra30/clock.c
+++ b/arch/arm/mach-tegra/tegra30/clock.c
@@ -19,6 +19,7 @@
 #include <div64.h>
 #include <fdtdec.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 /*
diff --git a/arch/arm/mach-tegra/xusb-padctl-common.c b/arch/arm/mach-tegra/xusb-padctl-common.c
index 42d64cf2c75..94a271311ce 100644
--- a/arch/arm/mach-tegra/xusb-padctl-common.c
+++ b/arch/arm/mach-tegra/xusb-padctl-common.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <errno.h>
 #include <log.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/arch/arm/mach-tegra/xusb-padctl-dummy.c b/arch/arm/mach-tegra/xusb-padctl-dummy.c
index f2d90302f6d..b3c5c9453b2 100644
--- a/arch/arm/mach-tegra/xusb-padctl-dummy.c
+++ b/arch/arm/mach-tegra/xusb-padctl-dummy.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <errno.h>
+#include <linux/errno.h>
 
 #include <asm/arch-tegra/xusb-padctl.h>
 
diff --git a/arch/arm/mach-zynq/clk.c b/arch/arm/mach-zynq/clk.c
index c22f13c2402..188f3803cad 100644
--- a/arch/arm/mach-zynq/clk.c
+++ b/arch/arm/mach-zynq/clk.c
@@ -12,6 +12,7 @@
 #include <asm/arch/clk.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-zynq/cpu.c b/arch/arm/mach-zynq/cpu.c
index e9082217d55..d7933afee41 100644
--- a/arch/arm/mach-zynq/cpu.c
+++ b/arch/arm/mach-zynq/cpu.c
@@ -15,6 +15,7 @@
 #include <asm/arch/ps7_init_gpl.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 
 #define ZYNQ_SILICON_VER_MASK	0xF0000000
 #define ZYNQ_SILICON_VER_SHIFT	28
diff --git a/arch/arm/mach-zynqmp/cpu.c b/arch/arm/mach-zynqmp/cpu.c
index 341b5f1af46..892cfb239a0 100644
--- a/arch/arm/mach-zynqmp/cpu.c
+++ b/arch/arm/mach-zynqmp/cpu.c
@@ -17,6 +17,7 @@
 #include <zynqmp_firmware.h>
 #include <asm/cache.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #define ZYNQ_SILICON_VER_MASK	0xF000
diff --git a/arch/m68k/lib/fec.c b/arch/m68k/lib/fec.c
index 3b76d1392bf..4f013238928 100644
--- a/arch/m68k/lib/fec.c
+++ b/arch/m68k/lib/fec.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 
diff --git a/arch/nios2/cpu/cpu.c b/arch/nios2/cpu/cpu.c
index 0203348df01..f13e61b6a98 100644
--- a/arch/nios2/cpu/cpu.c
+++ b/arch/nios2/cpu/cpu.c
@@ -16,6 +16,7 @@
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <asm/system.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/powerpc/cpu/mpc85xx/ether_fcc.c b/arch/powerpc/cpu/mpc85xx/ether_fcc.c
index 35bc146a38b..5504ded9e05 100644
--- a/arch/powerpc/cpu/mpc85xx/ether_fcc.c
+++ b/arch/powerpc/cpu/mpc85xx/ether_fcc.c
@@ -33,6 +33,7 @@
 #include <config.h>
 #include <net.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #if defined(CONFIG_MII) || defined(CONFIG_CMD_MII)
diff --git a/arch/riscv/lib/andes_plic.c b/arch/riscv/lib/andes_plic.c
index eb3463b49a8..f892548a6c5 100644
--- a/arch/riscv/lib/andes_plic.c
+++ b/arch/riscv/lib/andes_plic.c
@@ -19,6 +19,7 @@
 #include <asm/syscon.h>
 #include <cpu.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 /* pending register */
diff --git a/arch/riscv/lib/image.c b/arch/riscv/lib/image.c
index 636b6597c06..88563331b33 100644
--- a/arch/riscv/lib/image.c
+++ b/arch/riscv/lib/image.c
@@ -12,6 +12,7 @@
 #include <errno.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/sizes.h>
 #include <linux/stddef.h>
 
diff --git a/arch/riscv/lib/sbi.c b/arch/riscv/lib/sbi.c
index 8fbc23839dd..984499960a1 100644
--- a/arch/riscv/lib/sbi.c
+++ b/arch/riscv/lib/sbi.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <asm/encoding.h>
 #include <asm/sbi.h>
+#include <linux/errno.h>
 
 struct sbiret sbi_ecall(int ext, int fid, unsigned long arg0,
 			unsigned long arg1, unsigned long arg2,
diff --git a/arch/riscv/lib/smp.c b/arch/riscv/lib/smp.c
index 879b7ab9a78..09dd439b59a 100644
--- a/arch/riscv/lib/smp.c
+++ b/arch/riscv/lib/smp.c
@@ -10,6 +10,7 @@
 #include <asm/barrier.h>
 #include <asm/global_data.h>
 #include <asm/smp.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/sandbox/cpu/cpu.c b/arch/sandbox/cpu/cpu.c
index 12db5249ee1..4b8af862e60 100644
--- a/arch/sandbox/cpu/cpu.c
+++ b/arch/sandbox/cpu/cpu.c
@@ -13,6 +13,7 @@
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <os.h>
 #include <asm/io.h>
diff --git a/arch/sandbox/cpu/eth-raw-os.c b/arch/sandbox/cpu/eth-raw-os.c
index 8ef8f65ebaf..00b3785bad9 100644
--- a/arch/sandbox/cpu/eth-raw-os.c
+++ b/arch/sandbox/cpu/eth-raw-os.c
@@ -7,6 +7,7 @@
 #include <asm/eth-raw-os.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <net/if.h>
 #include <netinet/in.h>
diff --git a/arch/sandbox/cpu/os.c b/arch/sandbox/cpu/os.c
index f0721d3f7c5..581a48ea9ed 100644
--- a/arch/sandbox/cpu/os.c
+++ b/arch/sandbox/cpu/os.c
@@ -17,6 +17,7 @@
 #include <time.h>
 #include <unistd.h>
 #include <vsprintf.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
diff --git a/arch/sandbox/cpu/sdl.c b/arch/sandbox/cpu/sdl.c
index 8673e601e5e..c1c9bb68e0a 100644
--- a/arch/sandbox/cpu/sdl.c
+++ b/arch/sandbox/cpu/sdl.c
@@ -7,6 +7,7 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <stdbool.h>
+#include <linux/errno.h>
 #include <linux/input.h>
 #include <SDL2/SDL.h>
 #include <asm/state.h>
diff --git a/arch/sandbox/cpu/spl.c b/arch/sandbox/cpu/spl.c
index 41591d6528c..52cabd7ff12 100644
--- a/arch/sandbox/cpu/spl.c
+++ b/arch/sandbox/cpu/spl.c
@@ -14,6 +14,7 @@
 #include <asm/global_data.h>
 #include <asm/spl.h>
 #include <asm/state.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/sandbox/cpu/start.c b/arch/sandbox/cpu/start.c
index b05daa01ed7..2c6f90740f3 100644
--- a/arch/sandbox/cpu/start.c
+++ b/arch/sandbox/cpu/start.c
@@ -20,6 +20,7 @@
 #include <asm/state.h>
 #include <asm/u-boot.h>
 #include <linux/ctype.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/sandbox/cpu/state.c b/arch/sandbox/cpu/state.c
index bfc4f0b8def..35bc7586fa5 100644
--- a/arch/sandbox/cpu/state.c
+++ b/arch/sandbox/cpu/state.c
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <asm/malloc.h>
 #include <asm/state.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 /* Main state record for the sandbox */
diff --git a/arch/sandbox/include/asm/sdl.h b/arch/sandbox/include/asm/sdl.h
index 47fc4889d20..2a98a7f49b2 100644
--- a/arch/sandbox/include/asm/sdl.h
+++ b/arch/sandbox/include/asm/sdl.h
@@ -7,6 +7,7 @@
 #define __SANDBOX_SDL_H
 
 #include <errno.h>
+#include <linux/errno.h>
 
 #ifdef CONFIG_SANDBOX_SDL
 
diff --git a/arch/sandbox/lib/pci_io.c b/arch/sandbox/lib/pci_io.c
index b0d7d42adf5..b7ce34aa1ea 100644
--- a/arch/sandbox/lib/pci_io.c
+++ b/arch/sandbox/lib/pci_io.c
@@ -14,6 +14,7 @@
 #include <log.h>
 #include <asm/io.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 
 int pci_map_physmem(phys_addr_t paddr, unsigned long *lenp,
 		    struct udevice **devp, void **ptrp)
diff --git a/arch/x86/cpu/acpi_gpe.c b/arch/x86/cpu/acpi_gpe.c
index 47ee817eb7a..5610d543723 100644
--- a/arch/x86/cpu/acpi_gpe.c
+++ b/arch/x86/cpu/acpi_gpe.c
@@ -13,6 +13,7 @@
 #include <asm/io.h>
 #include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/interrupt-controller/x86-irq.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 /**
diff --git a/arch/x86/cpu/apollolake/fsp_bindings.c b/arch/x86/cpu/apollolake/fsp_bindings.c
index d1190075495..bea3a259345 100644
--- a/arch/x86/cpu/apollolake/fsp_bindings.c
+++ b/arch/x86/cpu/apollolake/fsp_bindings.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <log.h>
 #include <asm/arch/fsp_bindings.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 /**
diff --git a/arch/x86/cpu/apollolake/fsp_m.c b/arch/x86/cpu/apollolake/fsp_m.c
index cef937573b0..83f94d20f58 100644
--- a/arch/x86/cpu/apollolake/fsp_m.c
+++ b/arch/x86/cpu/apollolake/fsp_m.c
@@ -11,6 +11,7 @@
 #include <asm/arch/fsp_bindings.h>
 #include <asm/fsp2/fsp_internal.h>
 #include <dm/uclass-internal.h>
+#include <linux/errno.h>
 
 int fspm_update_config(struct udevice *dev, struct fspm_upd *upd)
 {
diff --git a/arch/x86/cpu/apollolake/fsp_s.c b/arch/x86/cpu/apollolake/fsp_s.c
index a4e1c511614..c6da4bbfce6 100644
--- a/arch/x86/cpu/apollolake/fsp_s.c
+++ b/arch/x86/cpu/apollolake/fsp_s.c
@@ -28,6 +28,7 @@
 #include <asm/arch/fsp/fsp_s_upd.h>
 #include <dm/uclass-internal.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #define PCH_P2SB_E0		0xe0
 #define HIDE_BIT		BIT(0)
diff --git a/arch/x86/cpu/apollolake/lpc.c b/arch/x86/cpu/apollolake/lpc.c
index b81a458f2eb..1de8c4a9804 100644
--- a/arch/x86/cpu/apollolake/lpc.c
+++ b/arch/x86/cpu/apollolake/lpc.c
@@ -13,6 +13,7 @@
 #include <asm/pci.h>
 #include <asm/arch/iomap.h>
 #include <asm/arch/lpc.h>
+#include <linux/errno.h>
 #include <linux/log2.h>
 
 void lpc_enable_fixed_io_ranges(uint io_enables)
diff --git a/arch/x86/cpu/apollolake/punit.c b/arch/x86/cpu/apollolake/punit.c
index 3514ba21591..632309f6901 100644
--- a/arch/x86/cpu/apollolake/punit.c
+++ b/arch/x86/cpu/apollolake/punit.c
@@ -15,6 +15,7 @@
 #include <asm/pci.h>
 #include <asm/arch/systemagent.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 /*
  * Punit Initialisation code. This all isn't documented, but
diff --git a/arch/x86/cpu/apollolake/spl.c b/arch/x86/cpu/apollolake/spl.c
index a318bca5a62..44cbe4590a7 100644
--- a/arch/x86/cpu/apollolake/spl.c
+++ b/arch/x86/cpu/apollolake/spl.c
@@ -19,6 +19,7 @@
 #include <asm/arch/iomap.h>
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 /* This reads the next phase from mapped SPI flash */
diff --git a/arch/x86/cpu/apollolake/uart.c b/arch/x86/cpu/apollolake/uart.c
index f368f7d2db4..2a201022945 100644
--- a/arch/x86/cpu/apollolake/uart.c
+++ b/arch/x86/cpu/apollolake/uart.c
@@ -16,6 +16,7 @@
 #include <asm/io.h>
 #include <asm/pci.h>
 #include <asm/lpss.h>
+#include <linux/errno.h>
 
 /* Low-power Subsystem (LPSS) clock register */
 enum {
diff --git a/arch/x86/cpu/broadwell/adsp.c b/arch/x86/cpu/broadwell/adsp.c
index 41f7d5d4d1a..f5ae97c88ce 100644
--- a/arch/x86/cpu/broadwell/adsp.c
+++ b/arch/x86/cpu/broadwell/adsp.c
@@ -19,6 +19,7 @@
 #include <asm/arch/adsp.h>
 #include <asm/arch/pch.h>
 #include <asm/arch/rcb.h>
+#include <linux/errno.h>
 
 enum pci_type_t {
 	LYNX_POINT,
diff --git a/arch/x86/cpu/broadwell/cpu.c b/arch/x86/cpu/broadwell/cpu.c
index 9e35e9f699e..5b54edb848e 100644
--- a/arch/x86/cpu/broadwell/cpu.c
+++ b/arch/x86/cpu/broadwell/cpu.c
@@ -25,6 +25,7 @@
 #include <asm/arch/pch.h>
 #include <asm/arch/rcb.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 
 int arch_cpu_init_dm(void)
 {
diff --git a/arch/x86/cpu/broadwell/cpu_from_spl.c b/arch/x86/cpu/broadwell/cpu_from_spl.c
index 6cede74a829..4ca4fdcabb7 100644
--- a/arch/x86/cpu/broadwell/cpu_from_spl.c
+++ b/arch/x86/cpu/broadwell/cpu_from_spl.c
@@ -13,6 +13,7 @@
 #include <log.h>
 #include <asm/global_data.h>
 #include <asm/mtrr.h>
+#include <linux/errno.h>
 
 int misc_init_r(void)
 {
diff --git a/arch/x86/cpu/broadwell/cpu_full.c b/arch/x86/cpu/broadwell/cpu_full.c
index 9d9abe39847..883531712ea 100644
--- a/arch/x86/cpu/broadwell/cpu_full.c
+++ b/arch/x86/cpu/broadwell/cpu_full.c
@@ -23,6 +23,7 @@
 #include <asm/arch/rcb.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 struct cpu_broadwell_priv {
 	bool ht_disabled;
diff --git a/arch/x86/cpu/broadwell/iobp.c b/arch/x86/cpu/broadwell/iobp.c
index 16c840690bc..9805f8dbed4 100644
--- a/arch/x86/cpu/broadwell/iobp.c
+++ b/arch/x86/cpu/broadwell/iobp.c
@@ -12,6 +12,7 @@
 #include <asm/io.h>
 #include <asm/arch/pch.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 #define IOBP_RETRY 1000
 
diff --git a/arch/x86/cpu/broadwell/me.c b/arch/x86/cpu/broadwell/me.c
index 4ae084bf452..89b7bd15082 100644
--- a/arch/x86/cpu/broadwell/me.c
+++ b/arch/x86/cpu/broadwell/me.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <asm/arch/me.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 static inline void me_read_dword_ptr(struct udevice *dev, void *ptr, int offset)
diff --git a/arch/x86/cpu/broadwell/pch.c b/arch/x86/cpu/broadwell/pch.c
index f012db9debe..6a5d9dc345e 100644
--- a/arch/x86/cpu/broadwell/pch.c
+++ b/arch/x86/cpu/broadwell/pch.c
@@ -26,6 +26,7 @@
 #include <asm/arch/spi.h>
 #include <dm/uclass-internal.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 #define BIOS_CTRL	0xdc
 
diff --git a/arch/x86/cpu/broadwell/pinctrl_broadwell.c b/arch/x86/cpu/broadwell/pinctrl_broadwell.c
index 2bc3ef97214..332d45fd088 100644
--- a/arch/x86/cpu/broadwell/pinctrl_broadwell.c
+++ b/arch/x86/cpu/broadwell/pinctrl_broadwell.c
@@ -19,6 +19,7 @@
 #include <dt-bindings/gpio/x86-gpio.h>
 #include <dm/pinctrl.h>
 #include <dm/uclass-internal.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/x86/cpu/broadwell/refcode.c b/arch/x86/cpu/broadwell/refcode.c
index ec929bfb5f5..f6f6250dfbd 100644
--- a/arch/x86/cpu/broadwell/refcode.c
+++ b/arch/x86/cpu/broadwell/refcode.c
@@ -13,6 +13,7 @@
 #include <log.h>
 #include <asm/arch/pei_data.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #define RMODULE_MAGIC		0xf8fe
diff --git a/arch/x86/cpu/broadwell/sdram.c b/arch/x86/cpu/broadwell/sdram.c
index ea456f17eb0..d606d4e1932 100644
--- a/arch/x86/cpu/broadwell/sdram.c
+++ b/arch/x86/cpu/broadwell/sdram.c
@@ -26,6 +26,7 @@
 #include <asm/arch/pei_data.h>
 #include <asm/arch/pm.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 ulong board_get_usable_ram_top(ulong total_size)
diff --git a/arch/x86/cpu/coreboot/tables.c b/arch/x86/cpu/coreboot/tables.c
index c52741ac9da..f0c350605e1 100644
--- a/arch/x86/cpu/coreboot/tables.c
+++ b/arch/x86/cpu/coreboot/tables.c
@@ -10,6 +10,7 @@
 #include <net.h>
 #include <asm/arch/sysinfo.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/cpu.c b/arch/x86/cpu/cpu.c
index fc96b32240c..5942e6b3972 100644
--- a/arch/x86/cpu/cpu.c
+++ b/arch/x86/cpu/cpu.c
@@ -50,6 +50,7 @@
 #include <asm/tables.h>
 #include <asm/u-boot.h>
 #include <linux/compiler.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/cpu_x86.c b/arch/x86/cpu/cpu_x86.c
index 8b3a9e75d1d..fc76839cc7d 100644
--- a/arch/x86/cpu/cpu_x86.c
+++ b/arch/x86/cpu/cpu_x86.c
@@ -9,6 +9,7 @@
 #include <errno.h>
 #include <asm/cpu.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/x86/cpu/efi/payload.c b/arch/x86/cpu/efi/payload.c
index eab1664200a..41f51a21ff6 100644
--- a/arch/x86/cpu/efi/payload.c
+++ b/arch/x86/cpu/efi/payload.c
@@ -18,6 +18,7 @@
 #include <asm/global_data.h>
 #include <asm/post.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/x86/cpu/i386/cpu.c b/arch/x86/cpu/i386/cpu.c
index e10dcca9768..f7e5b92da25 100644
--- a/arch/x86/cpu/i386/cpu.c
+++ b/arch/x86/cpu/i386/cpu.c
@@ -34,6 +34,7 @@
 #include <asm/mtrr.h>
 #include <asm/processor-flags.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/x86/cpu/i386/interrupt.c b/arch/x86/cpu/i386/interrupt.c
index 98daa1f7dd3..fc9853d225e 100644
--- a/arch/x86/cpu/i386/interrupt.c
+++ b/arch/x86/cpu/i386/interrupt.c
@@ -27,6 +27,7 @@
 #include <asm/processor-flags.h>
 #include <asm/ptrace.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/intel_common/cpu.c b/arch/x86/cpu/intel_common/cpu.c
index 87da5feaf61..a292dd72a88 100644
--- a/arch/x86/cpu/intel_common/cpu.c
+++ b/arch/x86/cpu/intel_common/cpu.c
@@ -23,6 +23,7 @@
 #include <asm/mtrr.h>
 #include <asm/post.h>
 #include <asm/microcode.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/intel_common/itss.c b/arch/x86/cpu/intel_common/itss.c
index d6bc051397b..cc9111d7fc5 100644
--- a/arch/x86/cpu/intel_common/itss.c
+++ b/arch/x86/cpu/intel_common/itss.c
@@ -19,6 +19,7 @@
 #include <spl.h>
 #include <asm/global_data.h>
 #include <asm/itss.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 struct itss_platdata {
diff --git a/arch/x86/cpu/intel_common/lpc.c b/arch/x86/cpu/intel_common/lpc.c
index 23befbef15f..eda4e58d608 100644
--- a/arch/x86/cpu/intel_common/lpc.c
+++ b/arch/x86/cpu/intel_common/lpc.c
@@ -14,6 +14,7 @@
 #include <asm/io.h>
 #include <asm/lpc_common.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/intel_common/microcode.c b/arch/x86/cpu/intel_common/microcode.c
index 919d146940a..157350a8949 100644
--- a/arch/x86/cpu/intel_common/microcode.c
+++ b/arch/x86/cpu/intel_common/microcode.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <asm/cpu.h>
 #include <asm/microcode.h>
diff --git a/arch/x86/cpu/intel_common/mrc.c b/arch/x86/cpu/intel_common/mrc.c
index 88fe58eea9a..384e721063f 100644
--- a/arch/x86/cpu/intel_common/mrc.c
+++ b/arch/x86/cpu/intel_common/mrc.c
@@ -21,6 +21,7 @@
 #include <asm/arch/me.h>
 #include <asm/report_platform.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 
 static const char *const ecc_decoder[] = {
 	"inactive",
diff --git a/arch/x86/cpu/intel_common/p2sb.c b/arch/x86/cpu/intel_common/p2sb.c
index 361d4c90cb9..8b62cc5d7be 100644
--- a/arch/x86/cpu/intel_common/p2sb.c
+++ b/arch/x86/cpu/intel_common/p2sb.c
@@ -15,6 +15,7 @@
 #include <spl.h>
 #include <asm/pci.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #define PCH_P2SB_E0		0xe0
 #define HIDE_BIT		BIT(0)
diff --git a/arch/x86/cpu/irq.c b/arch/x86/cpu/irq.c
index 0775c5cddac..547eedfbb85 100644
--- a/arch/x86/cpu/irq.c
+++ b/arch/x86/cpu/irq.c
@@ -17,6 +17,7 @@
 #include <asm/pci.h>
 #include <asm/pirq_routing.h>
 #include <asm/tables.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/ivybridge/bd82x6x.c b/arch/x86/cpu/ivybridge/bd82x6x.c
index 84d719e6c4e..fefea448ade 100644
--- a/arch/x86/cpu/ivybridge/bd82x6x.c
+++ b/arch/x86/cpu/ivybridge/bd82x6x.c
@@ -22,6 +22,7 @@
 #include <asm/arch/sandybridge.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/ivybridge/cpu.c b/arch/x86/cpu/ivybridge/cpu.c
index 2b966cc5de0..b819bec8030 100644
--- a/arch/x86/cpu/ivybridge/cpu.c
+++ b/arch/x86/cpu/ivybridge/cpu.c
@@ -36,6 +36,7 @@
 #include <asm/arch/pch.h>
 #include <asm/arch/sandybridge.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/ivybridge/early_me.c b/arch/x86/cpu/ivybridge/early_me.c
index 4f43986926a..9758c9a653d 100644
--- a/arch/x86/cpu/ivybridge/early_me.c
+++ b/arch/x86/cpu/ivybridge/early_me.c
@@ -18,6 +18,7 @@
 #include <asm/arch/pch.h>
 #include <asm/io.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 static const char *const me_ack_values[] = {
 	[ME_HFS_ACK_NO_DID]	= "No DID Ack received",
diff --git a/arch/x86/cpu/ivybridge/lpc.c b/arch/x86/cpu/ivybridge/lpc.c
index 2d82984dbdf..a579eb3b38e 100644
--- a/arch/x86/cpu/ivybridge/lpc.c
+++ b/arch/x86/cpu/ivybridge/lpc.c
@@ -21,6 +21,7 @@
 #include <asm/lpc_common.h>
 #include <asm/pci.h>
 #include <asm/arch/pch.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/ivybridge/model_206ax.c b/arch/x86/cpu/ivybridge/model_206ax.c
index 788e589b26d..e11aa0001c4 100644
--- a/arch/x86/cpu/ivybridge/model_206ax.c
+++ b/arch/x86/cpu/ivybridge/model_206ax.c
@@ -23,6 +23,7 @@
 #include <asm/speedstep.h>
 #include <asm/turbo.h>
 #include <asm/arch/model_206ax.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/ivybridge/sdram.c b/arch/x86/cpu/ivybridge/sdram.c
index 2c3ee2f4ab5..78511e908e0 100644
--- a/arch/x86/cpu/ivybridge/sdram.c
+++ b/arch/x86/cpu/ivybridge/sdram.c
@@ -38,6 +38,7 @@
 #include <asm/post.h>
 #include <asm/arch/sandybridge.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/x86/cpu/mp_init.c b/arch/x86/cpu/mp_init.c
index a32283a7e8a..1a34c2f0375 100644
--- a/arch/x86/cpu/mp_init.c
+++ b/arch/x86/cpu/mp_init.c
@@ -31,6 +31,7 @@
 #include <dm/lists.h>
 #include <dm/root.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/linkage.h>
 #include <linux/string.h>
 
diff --git a/arch/x86/cpu/mtrr.c b/arch/x86/cpu/mtrr.c
index 44a6f5c8124..fd86a4e105b 100644
--- a/arch/x86/cpu/mtrr.c
+++ b/arch/x86/cpu/mtrr.c
@@ -25,6 +25,7 @@
 #include <asm/mp.h>
 #include <asm/msr.h>
 #include <asm/mtrr.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/qemu/cpu.c b/arch/x86/cpu/qemu/cpu.c
index 9ce86b379c4..a8451fa066f 100644
--- a/arch/x86/cpu/qemu/cpu.c
+++ b/arch/x86/cpu/qemu/cpu.c
@@ -9,6 +9,7 @@
 #include <errno.h>
 #include <qfw.h>
 #include <asm/cpu.h>
+#include <linux/errno.h>
 
 int cpu_qemu_get_desc(const struct udevice *dev, char *buf, int size)
 {
diff --git a/arch/x86/cpu/qfw_cpu.c b/arch/x86/cpu/qfw_cpu.c
index 3db95256015..5f13984278b 100644
--- a/arch/x86/cpu/qfw_cpu.c
+++ b/arch/x86/cpu/qfw_cpu.c
@@ -13,6 +13,7 @@
 #include <dm/lists.h>
 #include <dm/uclass-internal.h>
 #include <dm/root.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 int qemu_cpu_fixup(void)
diff --git a/arch/x86/cpu/quark/dram.c b/arch/x86/cpu/quark/dram.c
index e7ccecfe271..b91d4603b69 100644
--- a/arch/x86/cpu/quark/dram.c
+++ b/arch/x86/cpu/quark/dram.c
@@ -19,6 +19,7 @@
 #include <asm/arch/msg_port.h>
 #include <asm/arch/quark.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/x86/cpu/slimbootloader/serial.c b/arch/x86/cpu/slimbootloader/serial.c
index 10e4e9300ec..cb502966741 100644
--- a/arch/x86/cpu/slimbootloader/serial.c
+++ b/arch/x86/cpu/slimbootloader/serial.c
@@ -11,6 +11,7 @@
 #include <vsprintf.h>
 #include <asm/arch/slimbootloader.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 
 /**
  * The serial port info hob is generated by Slim Bootloader, so eligible for
diff --git a/arch/x86/cpu/tangier/pinmux.c b/arch/x86/cpu/tangier/pinmux.c
index 596c2c177ce..aba74a083d7 100644
--- a/arch/x86/cpu/tangier/pinmux.c
+++ b/arch/x86/cpu/tangier/pinmux.c
@@ -12,6 +12,7 @@
 #include <syscon.h>
 #include <asm/cpu.h>
 #include <asm/scu.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/printk.h>
 
diff --git a/arch/x86/cpu/tangier/sdram.c b/arch/x86/cpu/tangier/sdram.c
index 920dfaf5e26..9605d776c4d 100644
--- a/arch/x86/cpu/tangier/sdram.c
+++ b/arch/x86/cpu/tangier/sdram.c
@@ -10,6 +10,7 @@
 #include <asm/global_data.h>
 #include <asm/sfi.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/arch/x86/cpu/tangier/sysreset.c b/arch/x86/cpu/tangier/sysreset.c
index b03bc28f935..c0246dfdf96 100644
--- a/arch/x86/cpu/tangier/sysreset.c
+++ b/arch/x86/cpu/tangier/sysreset.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <sysreset.h>
 #include <asm/scu.h>
+#include <linux/errno.h>
 
 static int tangier_sysreset_request(struct udevice *dev, enum sysreset_t type)
 {
diff --git a/arch/x86/include/asm/mp.h b/arch/x86/include/asm/mp.h
index 25edabbdd39..f93426ed784 100644
--- a/arch/x86/include/asm/mp.h
+++ b/arch/x86/include/asm/mp.h
@@ -10,6 +10,7 @@
 
 #include <asm/atomic.h>
 #include <asm/cache.h>
+#include <linux/errno.h>
 
 struct udevice;
 
diff --git a/arch/x86/lib/acpi_nhlt.c b/arch/x86/lib/acpi_nhlt.c
index 8df5ddd4a7a..83f110ebba8 100644
--- a/arch/x86/lib/acpi_nhlt.c
+++ b/arch/x86/lib/acpi_nhlt.c
@@ -17,6 +17,7 @@
 #include <asm/acpi_nhlt.h>
 #include <asm/unaligned.h>
 #include <dm/acpi.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #define NHLT_RID		1
diff --git a/arch/x86/lib/acpi_table.c b/arch/x86/lib/acpi_table.c
index 0d0b8edfcaf..2de8ad0d6f4 100644
--- a/arch/x86/lib/acpi_table.c
+++ b/arch/x86/lib/acpi_table.c
@@ -26,6 +26,7 @@
 #include <asm/arch/global_nvs.h>
 #include <dm/acpi.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 /*
diff --git a/arch/x86/lib/bootm.c b/arch/x86/lib/bootm.c
index a4bd65d3b7b..66fc8a69aaa 100644
--- a/arch/x86/lib/bootm.c
+++ b/arch/x86/lib/bootm.c
@@ -20,6 +20,7 @@
 #include <errno.h>
 #include <fdt_support.h>
 #include <image.h>
+#include <linux/errno.h>
 #include <u-boot/zlib.h>
 #include <asm/bootparam.h>
 #include <asm/cpu.h>
diff --git a/arch/x86/lib/fsp/fsp_common.c b/arch/x86/lib/fsp/fsp_common.c
index 821d9200d8b..c7775cc33c0 100644
--- a/arch/x86/lib/fsp/fsp_common.c
+++ b/arch/x86/lib/fsp/fsp_common.c
@@ -20,6 +20,7 @@
 #include <asm/processor.h>
 #include <asm/fsp/fsp_support.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/lib/fsp/fsp_graphics.c b/arch/x86/lib/fsp/fsp_graphics.c
index c5129ff1f30..6e4368d4184 100644
--- a/arch/x86/lib/fsp/fsp_graphics.c
+++ b/arch/x86/lib/fsp/fsp_graphics.c
@@ -13,6 +13,7 @@
 #include <asm/fsp/fsp_support.h>
 #include <asm/global_data.h>
 #include <asm/mtrr.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/lib/fsp2/fsp_dram.c b/arch/x86/lib/fsp2/fsp_dram.c
index b882f9466a8..81805ae8299 100644
--- a/arch/x86/lib/fsp2/fsp_dram.c
+++ b/arch/x86/lib/fsp2/fsp_dram.c
@@ -16,6 +16,7 @@
 #include <asm/fsp2/fsp_internal.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 #include <linux/sizes.h>
 
 int dram_init(void)
diff --git a/arch/x86/lib/fsp2/fsp_init.c b/arch/x86/lib/fsp2/fsp_init.c
index 85cae54a0ca..31702b90fd7 100644
--- a/arch/x86/lib/fsp2/fsp_init.c
+++ b/arch/x86/lib/fsp2/fsp_init.c
@@ -17,6 +17,7 @@
 #include <asm/intel_pinctrl.h>
 #include <dm/uclass-internal.h>
 #include <asm/fsp2/fsp_internal.h>
+#include <linux/errno.h>
 
 int arch_cpu_init_dm(void)
 {
diff --git a/arch/x86/lib/fsp2/fsp_meminit.c b/arch/x86/lib/fsp2/fsp_meminit.c
index 451e08223ba..84826bb683e 100644
--- a/arch/x86/lib/fsp2/fsp_meminit.c
+++ b/arch/x86/lib/fsp2/fsp_meminit.c
@@ -20,6 +20,7 @@
 #include <asm/arch/fsp/fsp_configs.h>
 #include <asm/arch/fsp/fsp_m_upd.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 static int prepare_mrc_cache_type(enum mrc_type_t type,
diff --git a/arch/x86/lib/fsp2/fsp_silicon_init.c b/arch/x86/lib/fsp2/fsp_silicon_init.c
index ca064eaf716..7d83ae2a1cb 100644
--- a/arch/x86/lib/fsp2/fsp_silicon_init.c
+++ b/arch/x86/lib/fsp2/fsp_silicon_init.c
@@ -18,6 +18,7 @@
 #include <asm/fsp/fsp_infoheader.h>
 #include <asm/fsp2/fsp_internal.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 int fsp_silicon_init(bool s3wake, bool use_spi_flash)
diff --git a/arch/x86/lib/fsp2/fsp_support.c b/arch/x86/lib/fsp2/fsp_support.c
index 1f68479ec58..b962487418b 100644
--- a/arch/x86/lib/fsp2/fsp_support.c
+++ b/arch/x86/lib/fsp2/fsp_support.c
@@ -11,6 +11,7 @@
 #include <asm/fsp/fsp_support.h>
 #include <asm/fsp2/fsp_internal.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 /* The amount of the FSP header to probe to obtain what we need */
diff --git a/arch/x86/lib/i8254.c b/arch/x86/lib/i8254.c
index 33db3dab2e9..33c63233ad0 100644
--- a/arch/x86/lib/i8254.c
+++ b/arch/x86/lib/i8254.c
@@ -8,6 +8,7 @@
 #include <asm/io.h>
 #include <asm/i8254.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 
 #define TIMER1_VALUE		18	/* 15.6us */
 #define BEEP_FREQUENCY_HZ	440
diff --git a/arch/x86/lib/mpspec.c b/arch/x86/lib/mpspec.c
index 78724564605..bda9b7f1a11 100644
--- a/arch/x86/lib/mpspec.c
+++ b/arch/x86/lib/mpspec.c
@@ -19,6 +19,7 @@
 #include <asm/mpspec.h>
 #include <asm/tables.h>
 #include <dm/uclass-internal.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/x86/lib/mrccache.c b/arch/x86/lib/mrccache.c
index 3582f42733f..0488a261c65 100644
--- a/arch/x86/lib/mrccache.c
+++ b/arch/x86/lib/mrccache.c
@@ -20,6 +20,7 @@
 #include <asm/mrccache.h>
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/x86/lib/pinctrl_ich6.c b/arch/x86/lib/pinctrl_ich6.c
index fd5e311b291..82de4cbdc43 100644
--- a/arch/x86/lib/pinctrl_ich6.c
+++ b/arch/x86/lib/pinctrl_ich6.c
@@ -16,6 +16,7 @@
 #include <asm/io.h>
 #include <asm/pci.h>
 #include <dm/pinctrl.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/lib/sfi.c b/arch/x86/lib/sfi.c
index 2e68504d886..13029fc08cb 100644
--- a/arch/x86/lib/sfi.c
+++ b/arch/x86/lib/sfi.c
@@ -20,6 +20,7 @@
 #include <asm/sfi.h>
 #include <asm/tables.h>
 #include <dm/uclass-internal.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 struct table_info {
diff --git a/arch/x86/lib/spl.c b/arch/x86/lib/spl.c
index 5e259792af0..4efd96a6ba0 100644
--- a/arch/x86/lib/spl.c
+++ b/arch/x86/lib/spl.c
@@ -26,6 +26,7 @@
 #include <asm/spl.h>
 #include <asm-generic/sections.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/x86/lib/tpl.c b/arch/x86/lib/tpl.c
index dee51f4a753..3213b2749ec 100644
--- a/arch/x86/lib/tpl.c
+++ b/arch/x86/lib/tpl.c
@@ -19,6 +19,7 @@
 #include <asm/processor.h>
 #include <asm-generic/sections.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/lib/zimage.c b/arch/x86/lib/zimage.c
index 219e70607bf..a13eb78e222 100644
--- a/arch/x86/lib/zimage.c
+++ b/arch/x86/lib/zimage.c
@@ -30,6 +30,7 @@
 #include <asm/arch/timestamp.h>
 #endif
 #include <linux/compiler.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <linux/string.h>
 
diff --git a/board/AndesTech/ax25-ae350/ax25-ae350.c b/board/AndesTech/ax25-ae350/ax25-ae350.c
index bb0dfb5e95d..4e546adfc68 100644
--- a/board/AndesTech/ax25-ae350/ax25-ae350.c
+++ b/board/AndesTech/ax25-ae350/ax25-ae350.c
@@ -14,6 +14,7 @@
 #endif
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <faraday/ftsmc020.h>
 #include <fdtdec.h>
diff --git a/board/CZ.NIC/turris_mox/mox_sp.c b/board/CZ.NIC/turris_mox/mox_sp.c
index 2c0c4956cd4..c15f8ee5b51 100644
--- a/board/CZ.NIC/turris_mox/mox_sp.c
+++ b/board/CZ.NIC/turris_mox/mox_sp.c
@@ -9,6 +9,7 @@
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 #define RWTM_BASE		(MVEBU_REGISTER(0xb0000))
 #define RWTM_CMD_PARAM(i)	(size_t)(RWTM_BASE + (i) * 4)
diff --git a/board/CZ.NIC/turris_mox/turris_mox.c b/board/CZ.NIC/turris_mox/turris_mox.c
index 32dabe99598..9429806b673 100644
--- a/board/CZ.NIC/turris_mox/turris_mox.c
+++ b/board/CZ.NIC/turris_mox/turris_mox.c
@@ -20,6 +20,7 @@
 #include <init.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <linux/string.h>
 #include <miiphy.h>
diff --git a/board/CZ.NIC/turris_omnia/turris_omnia.c b/board/CZ.NIC/turris_omnia/turris_omnia.c
index 783266c29b8..b1f6cf67d43 100644
--- a/board/CZ.NIC/turris_omnia/turris_omnia.c
+++ b/board/CZ.NIC/turris_omnia/turris_omnia.c
@@ -25,6 +25,7 @@
 #include <fdt_support.h>
 #include <time.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
 # include <atsha204a-i2c.h>
diff --git a/board/Marvell/mvebu_armada-37xx/board.c b/board/Marvell/mvebu_armada-37xx/board.c
index 0dbb4c2f370..eb0fe5b3727 100644
--- a/board/Marvell/mvebu_armada-37xx/board.c
+++ b/board/Marvell/mvebu_armada-37xx/board.c
@@ -15,6 +15,7 @@
 #include <asm/arch/soc.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/Marvell/mvebu_armada-8k/board.c b/board/Marvell/mvebu_armada-8k/board.c
index 1a7f17ed17c..e407238562f 100644
--- a/board/Marvell/mvebu_armada-8k/board.c
+++ b/board/Marvell/mvebu_armada-8k/board.c
@@ -14,6 +14,7 @@
 #include <asm/arch/soc.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/alliedtelesis/common/gpio_hog.c b/board/alliedtelesis/common/gpio_hog.c
index 4aecf7e2cef..7d26ccbd462 100644
--- a/board/alliedtelesis/common/gpio_hog.c
+++ b/board/alliedtelesis/common/gpio_hog.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <asm/global_data.h>
 #include <asm/gpio.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/alliedtelesis/x530/x530.c b/board/alliedtelesis/x530/x530.c
index 6f0e82e9558..25d2aede99f 100644
--- a/board/alliedtelesis/x530/x530.c
+++ b/board/alliedtelesis/x530/x530.c
@@ -15,6 +15,7 @@
 #include <asm/gpio.h>
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/mbus.h>
 #include <linux/io.h>
 #include <asm/arch/cpu.h>
diff --git a/board/armltd/vexpress/vexpress_common.c b/board/armltd/vexpress/vexpress_common.c
index 5e0d7464dd8..ee9f61f2b7a 100644
--- a/board/armltd/vexpress/vexpress_common.c
+++ b/board/armltd/vexpress/vexpress_common.c
@@ -31,6 +31,7 @@
 #include <asm/arch/sysctrl.h>
 #include <asm/arch/wdt.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include "../drivers/mmc/arm_pl180_mmci.h"
 
diff --git a/board/atmel/common/mac-spi-nor.c b/board/atmel/common/mac-spi-nor.c
index 3b150dac7d8..67bfd3785b7 100644
--- a/board/atmel/common/mac-spi-nor.c
+++ b/board/atmel/common/mac-spi-nor.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <env.h>
 #include <net.h>
+#include <linux/errno.h>
 #include <linux/mtd/spi-nor.h>
 #include <netdev.h>
 #include <linux/string.h>
diff --git a/board/bachmann/ot1200/ot1200.c b/board/bachmann/ot1200/ot1200.c
index 6872af6dcd2..ac9eba85180 100644
--- a/board/bachmann/ot1200/ot1200.c
+++ b/board/bachmann/ot1200/ot1200.c
@@ -30,6 +30,7 @@
 #include <asm/gpio.h>
 #include <phy.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/beacon/beacon-rzg2m/beacon-rzg2m.c b/board/beacon/beacon-rzg2m/beacon-rzg2m.c
index 17b99df5e81..cd362db58a9 100644
--- a/board/beacon/beacon-rzg2m/beacon-rzg2m.c
+++ b/board/beacon/beacon-rzg2m/beacon-rzg2m.c
@@ -8,6 +8,7 @@
 #include <asm/io.h>
 #include <asm/arch/rcar-mstp.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/beacon/imx8mm/spl.c b/board/beacon/imx8mm/spl.c
index a9a049b66d9..e3e26769323 100644
--- a/board/beacon/imx8mm/spl.c
+++ b/board/beacon/imx8mm/spl.c
@@ -16,6 +16,7 @@
 #include <asm/mach-imx/boot_mode.h>
 #include <asm/arch/ddr.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include <dm/uclass.h>
diff --git a/board/bluegiga/apx4devkit/apx4devkit.c b/board/bluegiga/apx4devkit/apx4devkit.c
index ca44e5aba96..2d4437fbfe0 100644
--- a/board/bluegiga/apx4devkit/apx4devkit.c
+++ b/board/bluegiga/apx4devkit/apx4devkit.c
@@ -28,6 +28,7 @@
 #include <asm/arch/sys_proto.h>
 #include <env.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 #include <linux/mii.h>
 #include <miiphy.h>
 #include <netdev.h>
diff --git a/board/bosch/guardian/board.c b/board/bosch/guardian/board.c
index d9ba7fe653d..6cf3649f070 100644
--- a/board/bosch/guardian/board.c
+++ b/board/bosch/guardian/board.c
@@ -22,6 +22,7 @@
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 #include <power/tps65217.h>
 #include <power/tps65910.h>
 #include <spl.h>
diff --git a/board/bosch/shc/board.c b/board/bosch/shc/board.c
index 243a810c420..ac8665fc77b 100644
--- a/board/bosch/shc/board.c
+++ b/board/bosch/shc/board.c
@@ -39,6 +39,7 @@
 #include <cpsw.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <power/tps65217.h>
 #include <env_internal.h>
 #include <watchdog.h>
diff --git a/board/broadcom/bcmns3/ns3.c b/board/broadcom/bcmns3/ns3.c
index 40eda6d465d..ac9ca20f8ad 100644
--- a/board/broadcom/bcmns3/ns3.c
+++ b/board/broadcom/bcmns3/ns3.c
@@ -13,6 +13,7 @@
 #include <asm/armv8/mmu.h>
 #include <asm/arch-bcmns3/bl33_info.h>
 #include <dt-bindings/memory/bcm-ns3-mc.h>
+#include <linux/errno.h>
 
 /* Default reset-level = 3 and strap-val = 0 */
 #define L3_RESET	30
diff --git a/board/broadcom/bcmstb/bcmstb.c b/board/broadcom/bcmstb/bcmstb.c
index 4e942f5f71c..4f180b734d0 100644
--- a/board/broadcom/bcmstb/bcmstb.c
+++ b/board/broadcom/bcmstb/bcmstb.c
@@ -12,6 +12,7 @@
 #include <time.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 #include <linux/types.h>
 #include <common.h>
 #include <env.h>
diff --git a/board/ccv/xpress/xpress.c b/board/ccv/xpress/xpress.c
index 1edec6158ef..c7476ba197c 100644
--- a/board/ccv/xpress/xpress.c
+++ b/board/ccv/xpress/xpress.c
@@ -29,6 +29,7 @@
 #include <usb.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <usb/ehci-ci.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/compulab/cl-som-imx7/cl-som-imx7.c b/board/compulab/cl-som-imx7/cl-som-imx7.c
index edb37225e74..28f4859f649 100644
--- a/board/compulab/cl-som-imx7/cl-som-imx7.c
+++ b/board/compulab/cl-som-imx7/cl-som-imx7.c
@@ -19,6 +19,7 @@
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <power/pmic.h>
 #include <power/pfuze3000_pmic.h>
 #include <asm/mach-imx/mxc_i2c.h>
diff --git a/board/compulab/cm_fx6/cm_fx6.c b/board/compulab/cm_fx6/cm_fx6.c
index aeab97d7d20..e39768378f9 100644
--- a/board/compulab/cm_fx6/cm_fx6.c
+++ b/board/compulab/cm_fx6/cm_fx6.c
@@ -39,6 +39,7 @@
 #include <dm/device-internal.h>
 #include <jffs2/load_kernel.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include "common.h"
 #include "../common/eeprom.h"
diff --git a/board/compulab/common/eeprom.c b/board/compulab/common/eeprom.c
index 0ffa82dd6d3..cc190103c4c 100644
--- a/board/compulab/common/eeprom.c
+++ b/board/compulab/common/eeprom.c
@@ -14,6 +14,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/setup.h>
+#include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include "eeprom.h"
diff --git a/board/compulab/common/eeprom.h b/board/compulab/common/eeprom.h
index a9c0203b81a..5e5aa41074d 100644
--- a/board/compulab/common/eeprom.h
+++ b/board/compulab/common/eeprom.h
@@ -9,6 +9,7 @@
 #ifndef _EEPROM_
 #define _EEPROM_
 #include <errno.h>
+#include <linux/errno.h>
 
 #ifdef CONFIG_SYS_I2C
 int cl_eeprom_read_mac_addr(uchar *buf, uint eeprom_bus);
diff --git a/board/congatec/cgtqmx6eval/cgtqmx6eval.c b/board/congatec/cgtqmx6eval/cgtqmx6eval.c
index c4b3772e835..c857a73df74 100644
--- a/board/congatec/cgtqmx6eval/cgtqmx6eval.c
+++ b/board/congatec/cgtqmx6eval/cgtqmx6eval.c
@@ -31,6 +31,7 @@
 #include <input.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <power/pmic.h>
 #include <power/pfuze100_pmic.h>
diff --git a/board/creative/xfi3/xfi3.c b/board/creative/xfi3/xfi3.c
index cbaa5e59eac..3e7f7e6e173 100644
--- a/board/creative/xfi3/xfi3.c
+++ b/board/creative/xfi3/xfi3.c
@@ -22,6 +22,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/dhelectronics/dh_imx6/dh_imx6.c b/board/dhelectronics/dh_imx6/dh_imx6.c
index 04798f5bfde..8e05de356a2 100644
--- a/board/dhelectronics/dh_imx6/dh_imx6.c
+++ b/board/dhelectronics/dh_imx6/dh_imx6.c
@@ -37,6 +37,7 @@
 #include <mmc.h>
 #include <usb.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <usb/ehci-ci.h>
 
diff --git a/board/dhelectronics/dh_stm32mp1/board.c b/board/dhelectronics/dh_stm32mp1/board.c
index 6b63252a3fa..40a91da0df2 100644
--- a/board/dhelectronics/dh_stm32mp1/board.c
+++ b/board/dhelectronics/dh_stm32mp1/board.c
@@ -38,6 +38,7 @@
 #include <phy.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include <power/regulator.h>
diff --git a/board/emulation/qemu-arm/qemu-arm.c b/board/emulation/qemu-arm/qemu-arm.c
index 2d9cb0a9a42..820194fc887 100644
--- a/board/emulation/qemu-arm/qemu-arm.c
+++ b/board/emulation/qemu-arm/qemu-arm.c
@@ -12,6 +12,7 @@
 #include <virtio_types.h>
 #include <virtio.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 
 #ifdef CONFIG_ARM64
 #include <asm/armv8/mmu.h>
diff --git a/board/engicam/common/board.c b/board/engicam/common/board.c
index 9f94b91fe97..eab67c0aa95 100644
--- a/board/engicam/common/board.c
+++ b/board/engicam/common/board.c
@@ -19,6 +19,7 @@
 #include <watchdog.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include "board.h"
diff --git a/board/esd/vme8349/vme8349.c b/board/esd/vme8349/vme8349.c
index 0243e17bbb0..f7934b0f016 100644
--- a/board/esd/vme8349/vme8349.c
+++ b/board/esd/vme8349/vme8349.c
@@ -30,6 +30,7 @@
 #include <i2c.h>
 #include <netdev.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/common/fsl_validate.c b/board/freescale/common/fsl_validate.c
index f12dcb3cf14..a228c82bc8e 100644
--- a/board/freescale/common/fsl_validate.c
+++ b/board/freescale/common/fsl_validate.c
@@ -15,6 +15,7 @@
 #include <malloc.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <u-boot/rsa-mod-exp.h>
 #include <hash.h>
diff --git a/board/freescale/common/mc34vr500.c b/board/freescale/common/mc34vr500.c
index 6f485ea233e..d96d1e2293f 100644
--- a/board/freescale/common/mc34vr500.c
+++ b/board/freescale/common/mc34vr500.c
@@ -9,6 +9,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <power/pmic.h>
 #include <power/mc34vr500_pmic.h>
 
diff --git a/board/freescale/common/pfuze.c b/board/freescale/common/pfuze.c
index af1ee044bb3..2011738fe21 100644
--- a/board/freescale/common/pfuze.c
+++ b/board/freescale/common/pfuze.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <errno.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <power/pmic.h>
 #include <power/pfuze100_pmic.h>
 
diff --git a/board/freescale/imx8mm_evk/spl.c b/board/freescale/imx8mm_evk/spl.c
index 9296b032b25..2f5f4ab7bba 100644
--- a/board/freescale/imx8mm_evk/spl.c
+++ b/board/freescale/imx8mm_evk/spl.c
@@ -21,6 +21,7 @@
 #include <asm/mach-imx/boot_mode.h>
 #include <asm/arch/ddr.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include <dm/uclass.h>
diff --git a/board/freescale/imx8mq_evk/spl.c b/board/freescale/imx8mq_evk/spl.c
index 7316c762a2b..6a37467314c 100644
--- a/board/freescale/imx8mq_evk/spl.c
+++ b/board/freescale/imx8mq_evk/spl.c
@@ -26,6 +26,7 @@
 #include <mmc.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <power/pmic.h>
 #include <power/pfuze100_pmic.h>
diff --git a/board/freescale/ls1012ardb/ls1012ardb.c b/board/freescale/ls1012ardb/ls1012ardb.c
index 278dc2221e4..1ca23aef0eb 100644
--- a/board/freescale/ls1012ardb/ls1012ardb.c
+++ b/board/freescale/ls1012ardb/ls1012ardb.c
@@ -30,6 +30,7 @@
 #include <netdev.h>
 #include <fsl_sec.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/mpc8308rdb/sdram.c b/board/freescale/mpc8308rdb/sdram.c
index 6340fd16ea9..10605ae79a7 100644
--- a/board/freescale/mpc8308rdb/sdram.c
+++ b/board/freescale/mpc8308rdb/sdram.c
@@ -15,6 +15,7 @@
 #include <init.h>
 #include <mpc83xx.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 
 #include <asm/bitops.h>
 #include <asm/io.h>
diff --git a/board/freescale/mpc8313erdb/sdram.c b/board/freescale/mpc8313erdb/sdram.c
index 22de0f6f3bd..5c69e201afd 100644
--- a/board/freescale/mpc8313erdb/sdram.c
+++ b/board/freescale/mpc8313erdb/sdram.c
@@ -14,6 +14,7 @@
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 #include <asm/bitops.h>
 #include <asm/io.h>
diff --git a/board/freescale/mpc8315erdb/sdram.c b/board/freescale/mpc8315erdb/sdram.c
index 3fc26fefde3..84abf2c3501 100644
--- a/board/freescale/mpc8315erdb/sdram.c
+++ b/board/freescale/mpc8315erdb/sdram.c
@@ -14,6 +14,7 @@
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 #include <asm/bitops.h>
 #include <asm/io.h>
diff --git a/board/freescale/mpc8323erdb/mpc8323erdb.c b/board/freescale/mpc8323erdb/mpc8323erdb.c
index 007d9d2283e..e2f56ae31d6 100644
--- a/board/freescale/mpc8323erdb/mpc8323erdb.c
+++ b/board/freescale/mpc8323erdb/mpc8323erdb.c
@@ -24,6 +24,7 @@
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
diff --git a/board/freescale/mpc832xemds/mpc832xemds.c b/board/freescale/mpc832xemds/mpc832xemds.c
index 7686dc5f66e..92fd0336a76 100644
--- a/board/freescale/mpc832xemds/mpc832xemds.c
+++ b/board/freescale/mpc832xemds/mpc832xemds.c
@@ -27,6 +27,7 @@
 #endif
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/mpc8349emds/mpc8349emds.c b/board/freescale/mpc8349emds/mpc8349emds.c
index 43a6e59bd35..b864a1cd4f6 100644
--- a/board/freescale/mpc8349emds/mpc8349emds.c
+++ b/board/freescale/mpc8349emds/mpc8349emds.c
@@ -23,6 +23,7 @@
 #endif
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 #if defined(CONFIG_OF_LIBFDT)
 #include <linux/libfdt.h>
diff --git a/board/freescale/mpc8349itx/mpc8349itx.c b/board/freescale/mpc8349itx/mpc8349itx.c
index fae6a7c9648..aa97625c0f5 100644
--- a/board/freescale/mpc8349itx/mpc8349itx.c
+++ b/board/freescale/mpc8349itx/mpc8349itx.c
@@ -26,6 +26,7 @@
 #endif
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include "../../../arch/powerpc/cpu/mpc83xx/hrcw/hrcw.h"
diff --git a/board/freescale/mpc837xemds/mpc837xemds.c b/board/freescale/mpc837xemds/mpc837xemds.c
index 58eeb2910bf..49eb2874d86 100644
--- a/board/freescale/mpc837xemds/mpc837xemds.c
+++ b/board/freescale/mpc837xemds/mpc837xemds.c
@@ -18,6 +18,7 @@
 #include <tsec.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <fsl_esdhc.h>
diff --git a/board/freescale/mpc837xerdb/mpc837xerdb.c b/board/freescale/mpc837xerdb/mpc837xerdb.c
index 8b70109f5d0..5f3f747ee9a 100644
--- a/board/freescale/mpc837xerdb/mpc837xerdb.c
+++ b/board/freescale/mpc837xerdb/mpc837xerdb.c
@@ -21,6 +21,7 @@
 #include <fsl_esdhc.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/mx25pdk/mx25pdk.c b/board/freescale/mx25pdk/mx25pdk.c
index 8e0edb45c3e..f20087328b3 100644
--- a/board/freescale/mx25pdk/mx25pdk.c
+++ b/board/freescale/mx25pdk/mx25pdk.c
@@ -19,6 +19,7 @@
 #include <i2c.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <power/pmic.h>
 #include <fsl_pmic.h>
 #include <mc34704.h>
diff --git a/board/freescale/mx28evk/mx28evk.c b/board/freescale/mx28evk/mx28evk.c
index 8ff35fbd02b..d6cbdaf406f 100644
--- a/board/freescale/mx28evk/mx28evk.c
+++ b/board/freescale/mx28evk/mx28evk.c
@@ -24,6 +24,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/mii.h>
 #include <miiphy.h>
 #include <netdev.h>
diff --git a/board/freescale/mx6slevk/mx6slevk.c b/board/freescale/mx6slevk/mx6slevk.c
index 5e6072dd424..9e7a81d4bb5 100644
--- a/board/freescale/mx6slevk/mx6slevk.c
+++ b/board/freescale/mx6slevk/mx6slevk.c
@@ -21,6 +21,7 @@
 #include <asm/mach-imx/mxc_i2c.h>
 #include <asm/io.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 #include <linux/sizes.h>
 #include <common.h>
 #include <fsl_esdhc_imx.h>
diff --git a/board/freescale/mx6sllevk/mx6sllevk.c b/board/freescale/mx6sllevk/mx6sllevk.c
index cfb1fe2103e..9dc0bdcbe7a 100644
--- a/board/freescale/mx6sllevk/mx6sllevk.c
+++ b/board/freescale/mx6sllevk/mx6sllevk.c
@@ -18,6 +18,7 @@
 #include <asm/io.h>
 #include <common.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 #include <linux/sizes.h>
 #include <mmc.h>
 #include <power/pmic.h>
diff --git a/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c b/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c
index d5621c5e042..aefc1ab2bd8 100644
--- a/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c
+++ b/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c
@@ -21,6 +21,7 @@
 #include <asm/io.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/sizes.h>
 #include <common.h>
 #include <fsl_esdhc_imx.h>
diff --git a/board/freescale/mx6sxsabresd/mx6sxsabresd.c b/board/freescale/mx6sxsabresd/mx6sxsabresd.c
index 361c3c2c517..ad3461c6661 100644
--- a/board/freescale/mx6sxsabresd/mx6sxsabresd.c
+++ b/board/freescale/mx6sxsabresd/mx6sxsabresd.c
@@ -22,6 +22,7 @@
 #include <env.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/sizes.h>
 #include <common.h>
 #include <fsl_esdhc_imx.h>
diff --git a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
index bb6c2474abd..cb903798df5 100644
--- a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
+++ b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
@@ -26,6 +26,7 @@
 #include <miiphy.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/sizes.h>
 #include <mmc.h>
 #include <netdev.h>
diff --git a/board/freescale/mx7dsabresd/mx7dsabresd.c b/board/freescale/mx7dsabresd/mx7dsabresd.c
index bcd30668b5d..5ebb142e0c7 100644
--- a/board/freescale/mx7dsabresd/mx7dsabresd.c
+++ b/board/freescale/mx7dsabresd/mx7dsabresd.c
@@ -16,6 +16,7 @@
 #include <asm/io.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/sizes.h>
 #include <common.h>
 #include <fsl_esdhc_imx.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 f4bf325e0d3..7fec510c8ca 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
@@ -29,6 +29,7 @@
 #include <miiphy.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <fsl_mdio.h>
diff --git a/board/freescale/p2041rdb/ddr.c b/board/freescale/p2041rdb/ddr.c
index 1dfb7b062fc..83dccf90370 100644
--- a/board/freescale/p2041rdb/ddr.c
+++ b/board/freescale/p2041rdb/ddr.c
@@ -16,6 +16,7 @@
 #include <fsl_ddr_dimm_params.h>
 #include <asm/fsl_law.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/qemu-ppce500/qemu-ppce500.c b/board/freescale/qemu-ppce500/qemu-ppce500.c
index 00c83d66438..5c84b404e0e 100644
--- a/board/freescale/qemu-ppce500/qemu-ppce500.c
+++ b/board/freescale/qemu-ppce500/qemu-ppce500.c
@@ -20,6 +20,7 @@
 #include <asm/fsl_pci.h>
 #include <asm/io.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <netdev.h>
diff --git a/board/friendlyarm/nanopi2/onewire.c b/board/friendlyarm/nanopi2/onewire.c
index 994befb1ec9..be0f0c79efe 100644
--- a/board/friendlyarm/nanopi2/onewire.c
+++ b/board/friendlyarm/nanopi2/onewire.c
@@ -11,6 +11,7 @@
 #include <asm/arch/clk.h>
 #include <i2c.h>
 #include <pwm.h>
+#include <linux/errno.h>
 
 #include <irq_func.h>
 
diff --git a/board/gateworks/gw_ventana/gw_ventana.c b/board/gateworks/gw_ventana/gw_ventana.c
index 4932fc2d117..800d9e76d38 100644
--- a/board/gateworks/gw_ventana/gw_ventana.c
+++ b/board/gateworks/gw_ventana/gw_ventana.c
@@ -40,6 +40,7 @@
 #include <netdev.h>
 #include <pci.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <linux/string.h>
 #include <power/pmic.h>
diff --git a/board/gdsys/a38x/ihs_phys.c b/board/gdsys/a38x/ihs_phys.c
index feeae37cd70..c4017a25af3 100644
--- a/board/gdsys/a38x/ihs_phys.c
+++ b/board/gdsys/a38x/ihs_phys.c
@@ -6,6 +6,7 @@
 #include <asm-generic/gpio.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include "ihs_phys.h"
diff --git a/board/gdsys/mpc8308/hrcon.c b/board/gdsys/mpc8308/hrcon.c
index 5cf8f283dff..415eb6e6938 100644
--- a/board/gdsys/mpc8308/hrcon.c
+++ b/board/gdsys/mpc8308/hrcon.c
@@ -15,6 +15,7 @@
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <pci.h>
diff --git a/board/gdsys/mpc8308/sdram.c b/board/gdsys/mpc8308/sdram.c
index bfd55f54e4e..365555d3baf 100644
--- a/board/gdsys/mpc8308/sdram.c
+++ b/board/gdsys/mpc8308/sdram.c
@@ -23,6 +23,7 @@
 #include <asm/io.h>
 
 #include <asm/processor.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/gdsys/mpc8308/strider.c b/board/gdsys/mpc8308/strider.c
index 33a16ba5513..d60a4573c5d 100644
--- a/board/gdsys/mpc8308/strider.c
+++ b/board/gdsys/mpc8308/strider.c
@@ -15,6 +15,7 @@
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <pci.h>
diff --git a/board/ge/common/ge_common.c b/board/ge/common/ge_common.c
index 48c3778046f..4885c997929 100644
--- a/board/ge/common/ge_common.c
+++ b/board/ge/common/ge_common.c
@@ -7,6 +7,7 @@
 #include <env.h>
 #include <dm/uclass.h>
 #include <rtc.h>
+#include <linux/errno.h>
 
 void check_time(void)
 {
diff --git a/board/ge/common/vpd_reader.c b/board/ge/common/vpd_reader.c
index d42b00da2fe..cdf96802d9e 100644
--- a/board/ge/common/vpd_reader.c
+++ b/board/ge/common/vpd_reader.c
@@ -3,15 +3,16 @@
  * Copyright 2016 General Electric Company
  */
 
-#include "vpd_reader.h"
-#include <malloc.h>
-
+#include <common.h>
+#include <hexdump.h>
 #include <i2c.h>
-#include <linux/bch.h>
+#include <i2c_eeprom.h>
+#include <malloc.h>
 #include <stdlib.h>
 #include <dm/uclass.h>
-#include <i2c_eeprom.h>
-#include <hexdump.h>
+#include <linux/bch.h>
+#include <linux/errno.h>
+#include "vpd_reader.h"
 
 /* BCH configuration */
 
diff --git a/board/ge/common/vpd_reader.h b/board/ge/common/vpd_reader.h
index 3045b7e21e2..2c1028bfbe2 100644
--- a/board/ge/common/vpd_reader.h
+++ b/board/ge/common/vpd_reader.h
@@ -3,8 +3,6 @@
  * Copyright 2016 General Electric Company
  */
 
-#include "common.h"
-
 struct vpd_cache;
 
 /*
diff --git a/board/google/imx8mq_phanbell/spl.c b/board/google/imx8mq_phanbell/spl.c
index 0e822d01c4c..38045791f13 100644
--- a/board/google/imx8mq_phanbell/spl.c
+++ b/board/google/imx8mq_phanbell/spl.c
@@ -26,6 +26,7 @@
 #include <fsl_esdhc_imx.h>
 #include <mmc.h>
 #include <spl.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/ids/ids8313/ids8313.c b/board/ids/ids8313/ids8313.c
index 568a1877fc9..7ceb6d3d04b 100644
--- a/board/ids/ids8313/ids8313.c
+++ b/board/ids/ids8313/ids8313.c
@@ -21,6 +21,7 @@
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/intel/cougarcanyon2/cougarcanyon2.c b/board/intel/cougarcanyon2/cougarcanyon2.c
index ce11eae59d5..412660bd414 100644
--- a/board/intel/cougarcanyon2/cougarcanyon2.c
+++ b/board/intel/cougarcanyon2/cougarcanyon2.c
@@ -13,6 +13,7 @@
 #include <asm/lpc_common.h>
 #include <asm/pci.h>
 #include <asm/arch/pch.h>
+#include <linux/errno.h>
 
 #define SIO1007_RUNTIME_IOPORT	0x180
 
diff --git a/board/intel/edison/edison.c b/board/intel/edison/edison.c
index 42ebb831f57..755162070cd 100644
--- a/board/intel/edison/edison.c
+++ b/board/intel/edison/edison.c
@@ -9,6 +9,7 @@
 #include <mmc.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/errno.h>
 #include <u-boot/md5.h>
 #include <usb.h>
 #include <watchdog.h>
diff --git a/board/keymile/km83xx/km83xx.c b/board/keymile/km83xx/km83xx.c
index 21f4dcd1a38..afa53808a06 100644
--- a/board/keymile/km83xx/km83xx.c
+++ b/board/keymile/km83xx/km83xx.c
@@ -30,6 +30,7 @@
 #include <pci.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <post.h>
 
diff --git a/board/liebherr/display5/spl.c b/board/liebherr/display5/spl.c
index 3225ca0197b..1580b8d3cf9 100644
--- a/board/liebherr/display5/spl.c
+++ b/board/liebherr/display5/spl.c
@@ -16,6 +16,7 @@
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
diff --git a/board/liebherr/mccmon6/spl.c b/board/liebherr/mccmon6/spl.c
index 6eacd60ddca..1da59eb0668 100644
--- a/board/liebherr/mccmon6/spl.c
+++ b/board/liebherr/mccmon6/spl.c
@@ -25,6 +25,7 @@
 #include <spl.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include <asm/arch/mx6-ddr.h>
diff --git a/board/nvidia/jetson-tk1/jetson-tk1.c b/board/nvidia/jetson-tk1/jetson-tk1.c
index ae1c76b133d..06a8b390a0b 100644
--- a/board/nvidia/jetson-tk1/jetson-tk1.c
+++ b/board/nvidia/jetson-tk1/jetson-tk1.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <power/as3722.h>
 #include <power/pmic.h>
diff --git a/board/ppcag/bg0900/bg0900.c b/board/ppcag/bg0900/bg0900.c
index 9d2ad0b2014..4f2ab859f30 100644
--- a/board/ppcag/bg0900/bg0900.c
+++ b/board/ppcag/bg0900/bg0900.c
@@ -18,6 +18,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/mii.h>
 #include <miiphy.h>
 #include <netdev.h>
diff --git a/board/renesas/grpeach/grpeach.c b/board/renesas/grpeach/grpeach.c
index 22b53743315..ef9a12bdc8b 100644
--- a/board/renesas/grpeach/grpeach.c
+++ b/board/renesas/grpeach/grpeach.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 
 #define RZA1_WDT_BASE	0xfcfe0000
 #define WTCSR		0x00
diff --git a/board/renesas/ulcb/cpld.c b/board/renesas/ulcb/cpld.c
index 7a52eaa9d39..30f96966b57 100644
--- a/board/renesas/ulcb/cpld.c
+++ b/board/renesas/ulcb/cpld.c
@@ -16,6 +16,7 @@
 #include <errno.h>
 #include <linux/err.h>
 #include <sysreset.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #define CPLD_ADDR_MODE		0x00 /* RW */
diff --git a/board/samsung/common/board.c b/board/samsung/common/board.c
index 4fcc0bf6f77..e79f5ddd2c9 100644
--- a/board/samsung/common/board.c
+++ b/board/samsung/common/board.c
@@ -37,6 +37,7 @@
 #include <dwc3-uboot.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <samsung/misc.h>
 #include <dm/pinctrl.h>
 #include <dm.h>
diff --git a/board/samsung/common/exynos5-dt.c b/board/samsung/common/exynos5-dt.c
index 4463f64dbc2..1783983ab11 100644
--- a/board/samsung/common/exynos5-dt.c
+++ b/board/samsung/common/exynos5-dt.c
@@ -27,6 +27,7 @@
 #include <asm/arch/pinmux.h>
 #include <asm/arch/power.h>
 #include <asm/arch/sromc.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/max77686_pmic.h>
diff --git a/board/samsung/goni/goni.c b/board/samsung/goni/goni.c
index 9476a437113..183579c4e3e 100644
--- a/board/samsung/goni/goni.c
+++ b/board/samsung/goni/goni.c
@@ -15,6 +15,7 @@
 #include <dm.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <power/pmic.h>
 #include <usb/dwc2_udc.h>
diff --git a/board/samsung/trats/trats.c b/board/samsung/trats/trats.c
index f21cfe40d53..18f311da979 100644
--- a/board/samsung/trats/trats.c
+++ b/board/samsung/trats/trats.c
@@ -21,6 +21,7 @@
 #include <asm/arch/watchdog.h>
 #include <asm/arch/power.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <power/pmic.h>
 #include <usb/dwc2_udc.h>
 #include <power/max8997_pmic.h>
diff --git a/board/samsung/trats2/trats2.c b/board/samsung/trats2/trats2.c
index fcbead5c127..6b008943da1 100644
--- a/board/samsung/trats2/trats2.c
+++ b/board/samsung/trats2/trats2.c
@@ -15,6 +15,7 @@
 #include <asm/arch/power.h>
 #include <asm/arch/mipi_dsim.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <power/pmic.h>
 #include <power/max77686_pmic.h>
 #include <power/battery.h>
diff --git a/board/samsung/universal_c210/universal.c b/board/samsung/universal_c210/universal.c
index 65ab6e49986..15d866abcc7 100644
--- a/board/samsung/universal_c210/universal.c
+++ b/board/samsung/universal_c210/universal.c
@@ -20,6 +20,7 @@
 #include <ld9040.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <power/pmic.h>
 #include <usb.h>
 #include <usb/dwc2_udc.h>
diff --git a/board/sandbox/sandbox.c b/board/sandbox/sandbox.c
index 2e4c72f9781..deee7b147df 100644
--- a/board/sandbox/sandbox.c
+++ b/board/sandbox/sandbox.c
@@ -18,6 +18,7 @@
 #include <asm/test.h>
 #include <asm/u-boot-sandbox.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 
 /*
  * Pointer to initial global data area
diff --git a/board/sandisk/sansa_fuze_plus/sfp.c b/board/sandisk/sansa_fuze_plus/sfp.c
index c6cce3b3fa6..b5052deb7ac 100644
--- a/board/sandisk/sansa_fuze_plus/sfp.c
+++ b/board/sandisk/sansa_fuze_plus/sfp.c
@@ -22,6 +22,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/siemens/draco/board.c b/board/siemens/draco/board.c
index 83cc14421dc..7fa7d632ae2 100644
--- a/board/siemens/draco/board.c
+++ b/board/siemens/draco/board.c
@@ -38,6 +38,7 @@
 #include <watchdog.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include "board.h"
 #include "../common/factoryset.h"
 #include <nand.h>
diff --git a/board/siemens/taurus/taurus.c b/board/siemens/taurus/taurus.c
index 102e7e82cd9..dd37a64792a 100644
--- a/board/siemens/taurus/taurus.c
+++ b/board/siemens/taurus/taurus.c
@@ -31,6 +31,7 @@
 #include <asm/arch/clk.h>
 #include <asm/gpio.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 #include <linux/mtd/rawnand.h>
 #include <atmel_mci.h>
 #include <asm/arch/at91_spi.h>
diff --git a/board/sipeed/maix/maix.c b/board/sipeed/maix/maix.c
index 7b7face393d..34c87802403 100644
--- a/board/sipeed/maix/maix.c
+++ b/board/sipeed/maix/maix.c
@@ -9,6 +9,7 @@
 #include <fdt_support.h>
 #include <asm/io.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 
 phys_size_t get_effective_memsize(void)
 {
diff --git a/board/softing/vining_2000/vining_2000.c b/board/softing/vining_2000/vining_2000.c
index 7c9c8d78b33..1c84539c120 100644
--- a/board/softing/vining_2000/vining_2000.c
+++ b/board/softing/vining_2000/vining_2000.c
@@ -24,6 +24,7 @@
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/sizes.h>
 #include <common.h>
 #include <fsl_esdhc_imx.h>
diff --git a/board/st/common/stm32mp_dfu.c b/board/st/common/stm32mp_dfu.c
index 79799e2a5ea..b44af077112 100644
--- a/board/st/common/stm32mp_dfu.c
+++ b/board/st/common/stm32mp_dfu.c
@@ -14,6 +14,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/arch/stm32prog.h>
+#include <linux/errno.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 7443b089a31..205979d96f1 100644
--- a/board/st/stm32f429-discovery/stm32f429-discovery.c
+++ b/board/st/stm32f429-discovery/stm32f429-discovery.c
@@ -18,6 +18,7 @@
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 
 #include <asm/io.h>
 #include <asm/arch/stm32.h>
diff --git a/board/st/stm32f429-evaluation/stm32f429-evaluation.c b/board/st/stm32f429-evaluation/stm32f429-evaluation.c
index ff9505d2cad..396cc61a458 100644
--- a/board/st/stm32f429-evaluation/stm32f429-evaluation.c
+++ b/board/st/stm32f429-evaluation/stm32f429-evaluation.c
@@ -12,6 +12,7 @@
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 
 #include <asm/io.h>
 #include <asm/arch/stm32.h>
diff --git a/board/st/stm32f469-discovery/stm32f469-discovery.c b/board/st/stm32f469-discovery/stm32f469-discovery.c
index cdc5a0f8ded..b70fd39ff30 100644
--- a/board/st/stm32f469-discovery/stm32f469-discovery.c
+++ b/board/st/stm32f469-discovery/stm32f469-discovery.c
@@ -12,6 +12,7 @@
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 
 #include <asm/io.h>
 #include <asm/arch/stm32.h>
diff --git a/board/st/stm32h743-disco/stm32h743-disco.c b/board/st/stm32h743-disco/stm32h743-disco.c
index 8e43be5fa86..ec87fc3e5ef 100644
--- a/board/st/stm32h743-disco/stm32h743-disco.c
+++ b/board/st/stm32h743-disco/stm32h743-disco.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/st/stm32h743-eval/stm32h743-eval.c b/board/st/stm32h743-eval/stm32h743-eval.c
index 8e43be5fa86..ec87fc3e5ef 100644
--- a/board/st/stm32h743-eval/stm32h743-eval.c
+++ b/board/st/stm32h743-eval/stm32h743-eval.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/st/stm32mp1/stm32mp1.c b/board/st/stm32mp1/stm32mp1.c
index 1ae544ff3d6..d1593e5e4ee 100644
--- a/board/st/stm32mp1/stm32mp1.c
+++ b/board/st/stm32mp1/stm32mp1.c
@@ -41,6 +41,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/iopoll.h>
 #include <linux/printk.h>
 #include <linux/string.h>
diff --git a/board/sunxi/board.c b/board/sunxi/board.c
index b2ee68d9c21..f49984238f1 100644
--- a/board/sunxi/board.c
+++ b/board/sunxi/board.c
@@ -33,6 +33,7 @@
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
diff --git a/board/synopsys/hsdk/clk-lib.c b/board/synopsys/hsdk/clk-lib.c
index 93f3dca9afd..295e80afe72 100644
--- a/board/synopsys/hsdk/clk-lib.c
+++ b/board/synopsys/hsdk/clk-lib.c
@@ -9,6 +9,7 @@
 #include <malloc.h>
 #include <stdio.h>
 #include <dm/device.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 #include "clk-lib.h"
diff --git a/board/synopsys/hsdk/env-lib.c b/board/synopsys/hsdk/env-lib.c
index 6b1fff98a45..ae55c0ab138 100644
--- a/board/synopsys/hsdk/env-lib.c
+++ b/board/synopsys/hsdk/env-lib.c
@@ -8,6 +8,7 @@
 #include <env.h>
 #include <log.h>
 #include <vsprintf.h>
+#include <linux/errno.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 4fe6219514d..0812126a98d 100644
--- a/board/synopsys/hsdk/hsdk.c
+++ b/board/synopsys/hsdk/hsdk.c
@@ -19,6 +19,7 @@
 #include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/kernel.h>
 #include <linux/io.h>
diff --git a/board/synopsys/iot_devkit/iot_devkit.c b/board/synopsys/iot_devkit/iot_devkit.c
index 151ade5fb7c..50af75fb7e2 100644
--- a/board/synopsys/iot_devkit/iot_devkit.c
+++ b/board/synopsys/iot_devkit/iot_devkit.c
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <fdtdec.h>
 
diff --git a/board/technexion/pico-imx6ul/pico-imx6ul.c b/board/technexion/pico-imx6ul/pico-imx6ul.c
index 11ae82b6bf2..fb3d9ee726a 100644
--- a/board/technexion/pico-imx6ul/pico-imx6ul.c
+++ b/board/technexion/pico-imx6ul/pico-imx6ul.c
@@ -23,6 +23,7 @@
 #include <netdev.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/sizes.h>
 #include <usb.h>
 #include <power/pmic.h>
diff --git a/board/technexion/pico-imx7d/pico-imx7d.c b/board/technexion/pico-imx7d/pico-imx7d.c
index 18b2a0082ed..70f61c50253 100644
--- a/board/technexion/pico-imx7d/pico-imx7d.c
+++ b/board/technexion/pico-imx7d/pico-imx7d.c
@@ -20,6 +20,7 @@
 #include <i2c.h>
 #include <miiphy.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 #include <power/pmic.h>
 #include <power/pfuze3000_pmic.h>
 #include "../../freescale/common/pfuze.h"
diff --git a/board/theadorable/fpga.c b/board/theadorable/fpga.c
index 4cfc4bbf0ac..904af3ed2e9 100644
--- a/board/theadorable/fpga.c
+++ b/board/theadorable/fpga.c
@@ -13,6 +13,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
 #include <asm/arch-mvebu/spi.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include "theadorable.h"
 
diff --git a/board/ti/am335x/board.c b/board/ti/am335x/board.c
index 67695ca61f5..17096159442 100644
--- a/board/ti/am335x/board.c
+++ b/board/ti/am335x/board.c
@@ -42,6 +42,7 @@
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <power/tps65217.h>
 #include <power/tps65910.h>
diff --git a/board/ti/am57xx/board.c b/board/ti/am57xx/board.c
index 869131a08f9..808b9993703 100644
--- a/board/ti/am57xx/board.c
+++ b/board/ti/am57xx/board.c
@@ -36,6 +36,7 @@
 #include <asm/arch/omap.h>
 #include <usb.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/usb/gadget.h>
 #include <dwc3-uboot.h>
diff --git a/board/ti/am65x/evm.c b/board/ti/am65x/evm.c
index d3e5be34c02..b8bb6b47581 100644
--- a/board/ti/am65x/evm.c
+++ b/board/ti/am65x/evm.c
@@ -24,6 +24,7 @@
 #include <spl.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/board/ti/common/board_detect.c b/board/ti/common/board_detect.c
index 862398e53a2..5519d2d7e61 100644
--- a/board/ti/common/board_detect.c
+++ b/board/ti/common/board_detect.c
@@ -21,6 +21,7 @@
 #include <mmc.h>
 #include <errno.h>
 #include <malloc.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/board/ti/j721e/evm.c b/board/ti/j721e/evm.c
index c5e313b14de..27971506074 100644
--- a/board/ti/j721e/evm.c
+++ b/board/ti/j721e/evm.c
@@ -26,6 +26,7 @@
 #include <dm.h>
 #include <asm/u-boot.h>
 #include <dm/uclass-internal.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/board/ti/omap5_uevm/evm.c b/board/ti/omap5_uevm/evm.c
index e47da78fb77..dd9217f0fba 100644
--- a/board/ti/omap5_uevm/evm.c
+++ b/board/ti/omap5_uevm/evm.c
@@ -19,6 +19,7 @@
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/usb/gadget.h>
 #include <dwc3-uboot.h>
 #include <dwc3-omap-uboot.h>
diff --git a/board/toradex/apalis-tk1/apalis-tk1.c b/board/toradex/apalis-tk1/apalis-tk1.c
index 052a16bb7b3..adc9bef31e7 100644
--- a/board/toradex/apalis-tk1/apalis-tk1.c
+++ b/board/toradex/apalis-tk1/apalis-tk1.c
@@ -18,6 +18,7 @@
 #include <pci_tegra.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include <power/as3722.h>
diff --git a/board/toradex/colibri_imx7/colibri_imx7.c b/board/toradex/colibri_imx7/colibri_imx7.c
index a69ff55a6a7..38fdaf648b8 100644
--- a/board/toradex/colibri_imx7/colibri_imx7.c
+++ b/board/toradex/colibri_imx7/colibri_imx7.c
@@ -25,6 +25,7 @@
 #include <fsl_esdhc_imx.h>
 #include <jffs2/load_kernel.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/sizes.h>
 #include <mmc.h>
 #include <miiphy.h>
diff --git a/board/toradex/common/tdx-cfg-block.c b/board/toradex/common/tdx-cfg-block.c
index 1f894ce1e48..84b20bf1daa 100644
--- a/board/toradex/common/tdx-cfg-block.c
+++ b/board/toradex/common/tdx-cfg-block.c
@@ -7,6 +7,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include "tdx-cfg-block.h"
 #include <command.h>
diff --git a/board/toradex/verdin-imx8mm/spl.c b/board/toradex/verdin-imx8mm/spl.c
index 2b59d90fa4f..0d422b65093 100644
--- a/board/toradex/verdin-imx8mm/spl.c
+++ b/board/toradex/verdin-imx8mm/spl.c
@@ -24,6 +24,7 @@
 #include <dm/uclass.h>
 #include <dm/uclass-internal.h>
 #include <hang.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <power/bd71837.h>
 #include <power/pmic.h>
diff --git a/board/udoo/neo/neo.c b/board/udoo/neo/neo.c
index 0a8f0fec9ce..1853330e2ce 100644
--- a/board/udoo/neo/neo.c
+++ b/board/udoo/neo/neo.c
@@ -29,6 +29,7 @@
 #include <spl.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/sizes.h>
 #include <common.h>
 #include <i2c.h>
diff --git a/board/vscom/baltos/board.c b/board/vscom/baltos/board.c
index 434aadd8763..a7ba5393183 100644
--- a/board/vscom/baltos/board.c
+++ b/board/vscom/baltos/board.c
@@ -17,6 +17,7 @@
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <spl.h>
 #include <asm/arch/cpu.h>
diff --git a/board/wandboard/wandboard.c b/board/wandboard/wandboard.c
index d0a42c16a54..cd773d8f1d8 100644
--- a/board/wandboard/wandboard.c
+++ b/board/wandboard/wandboard.c
@@ -29,6 +29,7 @@
 #include <env.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/sizes.h>
 #include <common.h>
 #include <miiphy.h>
diff --git a/board/warp/warp.c b/board/warp/warp.c
index 73d7aca7aad..a99e74b0c95 100644
--- a/board/warp/warp.c
+++ b/board/warp/warp.c
@@ -20,6 +20,7 @@
 #include <asm/mach-imx/mxc_i2c.h>
 #include <asm/io.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 #include <linux/sizes.h>
 #include <common.h>
 #include <watchdog.h>
diff --git a/board/warp7/warp7.c b/board/warp7/warp7.c
index 7272dc2bb2e..db255f36788 100644
--- a/board/warp7/warp7.c
+++ b/board/warp7/warp7.c
@@ -22,6 +22,7 @@
 #include <asm/arch/crm_regs.h>
 #include <netdev.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 #include <power/pmic.h>
 #include <power/pfuze3000_pmic.h>
 #include "../freescale/common/pfuze.h"
diff --git a/board/xilinx/common/board.c b/board/xilinx/common/board.c
index 458eef45adf..83ff23dacdc 100644
--- a/board/xilinx/common/board.c
+++ b/board/xilinx/common/board.c
@@ -11,6 +11,7 @@
 #include <asm/sections.h>
 #include <dm/uclass.h>
 #include <i2c.h>
+#include <linux/errno.h>
 #include <linux/sizes.h>
 #include "board.h"
 
diff --git a/board/xilinx/microblaze-generic/microblaze-generic.c b/board/xilinx/microblaze-generic/microblaze-generic.c
index 49478b05bea..385f5c752a5 100644
--- a/board/xilinx/microblaze-generic/microblaze-generic.c
+++ b/board/xilinx/microblaze-generic/microblaze-generic.c
@@ -19,6 +19,7 @@
 #include <asm/global_data.h>
 #include <dm/lists.h>
 #include <fdtdec.h>
+#include <linux/errno.h>
 #include <linux/sizes.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/xilinx/versal/board.c b/board/xilinx/versal/board.c
index e731070b5e6..d58e5fc53c0 100644
--- a/board/xilinx/versal/board.c
+++ b/board/xilinx/versal/board.c
@@ -23,6 +23,7 @@
 #include <dm/device.h>
 #include <dm/uclass.h>
 #include <versalpl.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include "../common/board.h"
 
diff --git a/board/xilinx/zynq/board.c b/board/xilinx/zynq/board.c
index 0be26931f22..215baf504b9 100644
--- a/board/xilinx/zynq/board.c
+++ b/board/xilinx/zynq/board.c
@@ -20,6 +20,7 @@
 #include <zynqpl.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include "../common/board.h"
 
diff --git a/board/xilinx/zynqmp/cmds.c b/board/xilinx/zynqmp/cmds.c
index 15a05989613..fe4ffba7fb6 100644
--- a/board/xilinx/zynqmp/cmds.c
+++ b/board/xilinx/zynqmp/cmds.c
@@ -15,6 +15,7 @@
 #include <asm/arch/hardware.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/io.h>
+#include <linux/errno.h>
 
 static int do_zynqmp_verify_secure(struct cmd_tbl *cmdtp, int flag, int argc,
 				   char *const argv[])
diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c
index 5bb8e877f3c..7c7266caa6f 100644
--- a/board/xilinx/zynqmp/zynqmp.c
+++ b/board/xilinx/zynqmp/zynqmp.c
@@ -37,6 +37,7 @@
 #include <g_dnl.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/sizes.h>
 #include <linux/string.h>
 #include "../common/board.h"
diff --git a/board/xilinx/zynqmp_r5/board.c b/board/xilinx/zynqmp_r5/board.c
index 817db3d5c88..11f29df5415 100644
--- a/board/xilinx/zynqmp_r5/board.c
+++ b/board/xilinx/zynqmp_r5/board.c
@@ -7,6 +7,7 @@
 #include <fdtdec.h>
 #include <init.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 
 int board_init(void)
 {
diff --git a/cmd/acpi.c b/cmd/acpi.c
index a6df5785f5f..a11cf5c29ac 100644
--- a/cmd/acpi.c
+++ b/cmd/acpi.c
@@ -13,6 +13,7 @@
 #include <asm/acpi_table.h>
 #include <asm/global_data.h>
 #include <dm/acpi.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/cmd/axi.c b/cmd/axi.c
index 858fddee131..68e8a06ae9e 100644
--- a/cmd/axi.c
+++ b/cmd/axi.c
@@ -18,6 +18,7 @@
 #include <log.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/errno.h>
 
 /* Currently selected AXI bus device */
 static struct udevice *axi_cur_bus;
diff --git a/cmd/bcb.c b/cmd/bcb.c
index 46737101f65..d145856d14f 100644
--- a/cmd/bcb.c
+++ b/cmd/bcb.c
@@ -13,6 +13,7 @@
 #include <part.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 enum bcb_cmd {
diff --git a/cmd/bind.c b/cmd/bind.c
index b008d4a6e8c..91202fbd4a9 100644
--- a/cmd/bind.c
+++ b/cmd/bind.c
@@ -11,6 +11,7 @@
 #include <dm/device-internal.h>
 #include <dm/lists.h>
 #include <dm/uclass-internal.h>
+#include <linux/errno.h>
 
 static int bind_by_class_index(const char *uclass, int index,
 			       const char *drv_name)
diff --git a/cmd/booti.c b/cmd/booti.c
index 52ce6bbc031..405152c80eb 100644
--- a/cmd/booti.c
+++ b/cmd/booti.c
@@ -15,6 +15,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <linux/string.h>
diff --git a/cmd/bootm.c b/cmd/bootm.c
index 8a976de6d3d..35c862768a1 100644
--- a/cmd/bootm.c
+++ b/cmd/bootm.c
@@ -22,6 +22,7 @@
 #include <asm/u-boot.h>
 #include <linux/ctype.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <u-boot/zlib.h>
 #include <mapmem.h>
diff --git a/cmd/button.c b/cmd/button.c
index 84ad1653c7b..0371ae8774d 100644
--- a/cmd/button.c
+++ b/cmd/button.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <button.h>
 #include <dm/uclass-internal.h>
+#include <linux/errno.h>
 
 static const char *const state_label[] = {
 	[BUTTON_OFF]	= "off",
diff --git a/cmd/cpu.c b/cmd/cpu.c
index 27b0919709a..4066f764292 100644
--- a/cmd/cpu.c
+++ b/cmd/cpu.c
@@ -12,6 +12,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <stdio.h>
+#include <linux/errno.h>
 
 static const char *cpu_feature_name[CPU_FEAT_COUNT] = {
 	"L1 cache",
diff --git a/cmd/efi.c b/cmd/efi.c
index 7b7a019e1af..762d4c1c380 100644
--- a/cmd/efi.c
+++ b/cmd/efi.c
@@ -13,6 +13,7 @@
 #include <sort.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 static const char *const type_name[] = {
diff --git a/cmd/elf.c b/cmd/elf.c
index 37267ccacae..3eaf1fe137d 100644
--- a/cmd/elf.c
+++ b/cmd/elf.c
@@ -21,6 +21,7 @@
 #include <asm/e820.h>
 #include <linux/linkage.h>
 #endif
+#include <linux/errno.h>
 #include <linux/string.h>
 
 /* Allow ports to override the default behavior */
diff --git a/cmd/ethsw.c b/cmd/ethsw.c
index fe93d2a8b17..83a229720de 100644
--- a/cmd/ethsw.c
+++ b/cmd/ethsw.c
@@ -14,6 +14,7 @@
 #include <net.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 static const char *ethsw_name;
diff --git a/cmd/gpio.c b/cmd/gpio.c
index 3171556bb28..570c17d5bac 100644
--- a/cmd/gpio.c
+++ b/cmd/gpio.c
@@ -16,6 +16,7 @@
 #include <vsprintf.h>
 #include <asm/gpio.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 __weak int name_to_gpio(const char *name)
diff --git a/cmd/gpt.c b/cmd/gpt.c
index 086a91ab577..11ad5f7de46 100644
--- a/cmd/gpt.c
+++ b/cmd/gpt.c
@@ -27,6 +27,7 @@
 #include <memalign.h>
 #include <linux/compat.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/sizes.h>
 #include <stdlib.h>
 #include <linux/string.h>
diff --git a/cmd/i2c.c b/cmd/i2c.c
index 2f442f0e811..b8f587a26fa 100644
--- a/cmd/i2c.c
+++ b/cmd/i2c.c
@@ -80,6 +80,7 @@
 #include <asm/byteorder.h>
 #include <linux/compiler.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
 
diff --git a/cmd/led.c b/cmd/led.c
index 5ba86806852..8d0abd048ec 100644
--- a/cmd/led.c
+++ b/cmd/led.c
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <dm/uclass-internal.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #define LED_TOGGLE LEDST_COUNT
diff --git a/cmd/mtd.c b/cmd/mtd.c
index 5c749354995..70ba0d01c71 100644
--- a/cmd/mtd.c
+++ b/cmd/mtd.c
@@ -18,6 +18,7 @@
 #include <vsprintf.h>
 #include <dm/devres.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include <linux/ctype.h>
diff --git a/cmd/mvebu/bubt.c b/cmd/mvebu/bubt.c
index 2f4d2d607ad..45b1bd9c009 100644
--- a/cmd/mvebu/bubt.c
+++ b/cmd/mvebu/bubt.c
@@ -15,6 +15,7 @@
 #include <vsprintf.h>
 #include <errno.h>
 #include <dm.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include <spi_flash.h>
diff --git a/cmd/nand.c b/cmd/nand.c
index 286d5ee1df5..f52343c42cd 100644
--- a/cmd/nand.c
+++ b/cmd/nand.c
@@ -25,6 +25,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/cache.h>
+#include <linux/errno.h>
 #include <linux/mtd/mtd.h>
 #include <command.h>
 #include <console.h>
diff --git a/cmd/nvedit.c b/cmd/nvedit.c
index 84af5f05e97..e450bb14a54 100644
--- a/cmd/nvedit.c
+++ b/cmd/nvedit.c
@@ -39,6 +39,7 @@
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
diff --git a/cmd/osd.c b/cmd/osd.c
index 9ad0407521a..6cccd8968c1 100644
--- a/cmd/osd.c
+++ b/cmd/osd.c
@@ -17,6 +17,7 @@
 #include <video_osd.h>
 #include <malloc.h>
 #include <vsprintf.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 /* Container for selected OSD device */
diff --git a/cmd/pci.c b/cmd/pci.c
index 48a945e30f0..ead55d46c21 100644
--- a/cmd/pci.c
+++ b/cmd/pci.c
@@ -24,6 +24,7 @@
 #include <asm/processor.h>
 #include <asm/io.h>
 #include <pci.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 struct pci_reg_info {
diff --git a/cmd/pinmux.c b/cmd/pinmux.c
index 60856cdc3c4..84cbf564e8a 100644
--- a/cmd/pinmux.c
+++ b/cmd/pinmux.c
@@ -10,6 +10,7 @@
 #include <stdio.h>
 #include <dm/pinctrl.h>
 #include <dm/uclass-internal.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #define LIMIT_DEVNAME	30
diff --git a/cmd/pmic.c b/cmd/pmic.c
index 3ac12938c8a..8e7956724f6 100644
--- a/cmd/pmic.c
+++ b/cmd/pmic.c
@@ -10,6 +10,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <dm/uclass-internal.h>
+#include <linux/errno.h>
 #include <power/pmic.h>
 
 #define LIMIT_DEV	32
diff --git a/cmd/pxe.c b/cmd/pxe.c
index 7673469d39f..8804faa170a 100644
--- a/cmd/pxe.c
+++ b/cmd/pxe.c
@@ -10,6 +10,7 @@
 #include <net.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/errno.h>
 
 #include "pxe_utils.h"
 
diff --git a/cmd/pxe_utils.c b/cmd/pxe_utils.c
index 748c314fa07..af6071ed68a 100644
--- a/cmd/pxe_utils.c
+++ b/cmd/pxe_utils.c
@@ -15,6 +15,7 @@
 #include <net.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/ctype.h>
 #include <errno.h>
diff --git a/cmd/regulator.c b/cmd/regulator.c
index cdf8940fa9e..e492da4f03c 100644
--- a/cmd/regulator.c
+++ b/cmd/regulator.c
@@ -10,6 +10,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <dm/uclass-internal.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include <power/regulator.h>
diff --git a/cmd/spi.c b/cmd/spi.c
index 72662f0e0b1..2079ed0e1be 100644
--- a/cmd/spi.c
+++ b/cmd/spi.c
@@ -15,6 +15,7 @@
 #include <spi.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 /*-----------------------------------------------------------------------
diff --git a/cmd/sysboot.c b/cmd/sysboot.c
index 9090b8ee441..8a965eaf12d 100644
--- a/cmd/sysboot.c
+++ b/cmd/sysboot.c
@@ -6,6 +6,7 @@
 #include <fs.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include "pxe_utils.h"
 
diff --git a/cmd/tlv_eeprom.c b/cmd/tlv_eeprom.c
index 98104fb7f2d..ca315dad0cc 100644
--- a/cmd/tlv_eeprom.c
+++ b/cmd/tlv_eeprom.c
@@ -21,6 +21,7 @@
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <linux/ctype.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
 
diff --git a/cmd/tpm-v2.c b/cmd/tpm-v2.c
index 1a6e80a3866..56c5aca12c8 100644
--- a/cmd/tpm-v2.c
+++ b/cmd/tpm-v2.c
@@ -13,6 +13,7 @@
 #include <tpm-common.h>
 #include <tpm-v2.h>
 #include <vsprintf.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include "tpm-user-utils.h"
 
diff --git a/cmd/usb_mass_storage.c b/cmd/usb_mass_storage.c
index 84d919d4467..36a905cd771 100644
--- a/cmd/usb_mass_storage.c
+++ b/cmd/usb_mass_storage.c
@@ -20,6 +20,7 @@
 #include <vsprintf.h>
 #include <watchdog.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/cmd/wdt.c b/cmd/wdt.c
index 422be75a0db..c9c7a610efd 100644
--- a/cmd/wdt.c
+++ b/cmd/wdt.c
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <wdt.h>
+#include <linux/errno.h>
 
 static struct udevice *currdev;
 
diff --git a/common/android_ab.c b/common/android_ab.c
index 794df3fde7a..4c58f7a75c8 100644
--- a/common/android_ab.c
+++ b/common/android_ab.c
@@ -11,6 +11,7 @@
 #include <part.h>
 #include <memalign.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
 #include <u-boot/crc.h>
diff --git a/common/avb_verify.c b/common/avb_verify.c
index 7a7a5096852..230d576835d 100644
--- a/common/avb_verify.c
+++ b/common/avb_verify.c
@@ -13,6 +13,7 @@
 #include <part.h>
 #include <stdio.h>
 #include <tee.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <tee/optee_ta_avb.h>
 
diff --git a/common/bloblist.c b/common/bloblist.c
index 9abd360db8d..20a29c82bb5 100644
--- a/common/bloblist.c
+++ b/common/bloblist.c
@@ -10,6 +10,7 @@
 #include <mapmem.h>
 #include <spl.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
 
diff --git a/common/board_r.c b/common/board_r.c
index 735fa4128d5..0c8be80d76e 100644
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -26,6 +26,7 @@
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 #include <u-boot/crc.h>
 /* TODO: can we just include all these headers whether needed or not? */
 #if defined(CONFIG_CMD_BEDBUG)
diff --git a/common/boot_fit.c b/common/boot_fit.c
index dfc2a3117d1..d1e298baf5b 100644
--- a/common/boot_fit.c
+++ b/common/boot_fit.c
@@ -11,6 +11,7 @@
 #include <errno.h>
 #include <image.h>
 #include <log.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 
 static int fdt_offset(const void *fit)
diff --git a/common/bootm.c b/common/bootm.c
index ae71ee0e30a..d1687238f2a 100644
--- a/common/bootm.c
+++ b/common/bootm.c
@@ -26,6 +26,7 @@
 #include <usb.h>
 #endif
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #else
 #include "mkimage.h"
diff --git a/common/bootretry.c b/common/bootretry.c
index 5417389a9a3..41d52a7b9c1 100644
--- a/common/bootretry.c
+++ b/common/bootretry.c
@@ -13,6 +13,7 @@
 #include <time.h>
 #include <vsprintf.h>
 #include <watchdog.h>
+#include <linux/errno.h>
 
 #ifndef CONFIG_BOOT_RETRY_MIN
 #define CONFIG_BOOT_RETRY_MIN CONFIG_BOOT_RETRY_TIME
diff --git a/common/bootstage.c b/common/bootstage.c
index 190379f8ac0..9eaa65b009f 100644
--- a/common/bootstage.c
+++ b/common/bootstage.c
@@ -20,6 +20,7 @@
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <linux/compiler.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <linux/string.h>
 
diff --git a/common/bouncebuf.c b/common/bouncebuf.c
index bcca7838bcc..519ca264992 100644
--- a/common/bouncebuf.c
+++ b/common/bouncebuf.c
@@ -12,6 +12,7 @@
 #include <errno.h>
 #include <bouncebuf.h>
 #include <asm/cache.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 static int addr_aligned(struct bounce_buffer *state)
diff --git a/common/cli_hush.c b/common/cli_hush.c
index 7a66d337148..34facc8397e 100644
--- a/common/cli_hush.c
+++ b/common/cli_hush.c
@@ -89,6 +89,7 @@
 #endif
 #include <vsprintf.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #endif
 #ifndef __U_BOOT__
diff --git a/common/common_fit.c b/common/common_fit.c
index 50b165016d2..8872b83646a 100644
--- a/common/common_fit.c
+++ b/common/common_fit.c
@@ -9,6 +9,7 @@
 #include <image.h>
 #include <log.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <linux/string.h>
 
diff --git a/common/edid.c b/common/edid.c
index d539c521507..b047c724630 100644
--- a/common/edid.c
+++ b/common/edid.c
@@ -16,6 +16,7 @@
 #include <log.h>
 #include <stdio.h>
 #include <linux/ctype.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 int edid_check_info(struct edid1_info *edid_info)
diff --git a/common/image-android.c b/common/image-android.c
index 1e79f6b144c..1615f2c415d 100644
--- a/common/image-android.c
+++ b/common/image-android.c
@@ -13,6 +13,7 @@
 #include <stdio.h>
 #include <asm/unaligned.h>
 #include <mapmem.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <linux/string.h>
 
diff --git a/common/image-fdt.c b/common/image-fdt.c
index e01e88b989a..c05495ee36c 100644
--- a/common/image-fdt.c
+++ b/common/image-fdt.c
@@ -20,6 +20,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <mapmem.h>
 #include <asm/io.h>
diff --git a/common/image-fit-sig.c b/common/image-fit-sig.c
index 1247d0280e2..e65e27f5109 100644
--- a/common/image-fit-sig.c
+++ b/common/image-fit-sig.c
@@ -12,6 +12,7 @@
 #include <malloc.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 DECLARE_GLOBAL_DATA_PTR;
 #endif /* !USE_HOSTCC*/
diff --git a/common/image-fit.c b/common/image-fit.c
index 01353f0157d..bc12b3fe0e6 100644
--- a/common/image-fit.c
+++ b/common/image-fit.c
@@ -17,6 +17,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/compiler.h>
+#include <linux/errno.h>
 #include <linux/kconfig.h>
 #include <common.h>
 #include <errno.h>
diff --git a/common/lcd_simplefb.c b/common/lcd_simplefb.c
index 6dd7972f709..7a2f0056fd4 100644
--- a/common/lcd_simplefb.c
+++ b/common/lcd_simplefb.c
@@ -11,6 +11,7 @@
 #include <lcd.h>
 #include <fdt_support.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <video.h>
 
diff --git a/common/log.c b/common/log.c
index c4eaed2c91e..79e23aacece 100644
--- a/common/log.c
+++ b/common/log.c
@@ -13,6 +13,7 @@
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <dm/uclass.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/common/menu.c b/common/menu.c
index d61c274eedf..b7ee3cb8e49 100644
--- a/common/menu.c
+++ b/common/menu.c
@@ -9,6 +9,7 @@
 #include <malloc.h>
 #include <errno.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <linux/list.h>
 #include <linux/string.h>
 
diff --git a/common/spl/spl.c b/common/spl/spl.c
index 5fd0119cb59..671bda67ed7 100644
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -24,6 +24,7 @@
 #include <asm/u-boot.h>
 #include <nand.h>
 #include <fat.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
 #include <version.h>
diff --git a/common/spl/spl_dfu.c b/common/spl/spl_dfu.c
index 8a779da8fa1..4709ffaff94 100644
--- a/common/spl/spl_dfu.c
+++ b/common/spl/spl_dfu.c
@@ -15,6 +15,7 @@
 #include <g_dnl.h>
 #include <usb.h>
 #include <dfu.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 static int run_dfu(int usb_index, char *interface, char *devstring)
diff --git a/common/spl/spl_ext.c b/common/spl/spl_ext.c
index 50f0f5f4ca7..4f152270da7 100644
--- a/common/spl/spl_ext.c
+++ b/common/spl/spl_ext.c
@@ -9,6 +9,7 @@
 #include <ext4fs.h>
 #include <errno.h>
 #include <image.h>
+#include <linux/errno.h>
 
 int spl_load_image_ext(struct spl_image_info *spl_image,
 		       struct blk_desc *block_dev, int partition,
diff --git a/common/spl/spl_fat.c b/common/spl/spl_fat.c
index 20b44090650..f31fdee02ba 100644
--- a/common/spl/spl_fat.c
+++ b/common/spl/spl_fat.c
@@ -17,6 +17,7 @@
 #include <fat.h>
 #include <errno.h>
 #include <image.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 
 static int fat_registered;
diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c
index 87d48269558..4d588a85c8f 100644
--- a/common/spl/spl_fit.c
+++ b/common/spl/spl_fit.c
@@ -16,6 +16,7 @@
 #include <stdio.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <linux/printk.h>
 #include <linux/string.h>
diff --git a/common/spl/spl_legacy.c b/common/spl/spl_legacy.c
index 6813759aa4e..d8ca3e9873b 100644
--- a/common/spl/spl_legacy.c
+++ b/common/spl/spl_legacy.c
@@ -9,6 +9,7 @@
 #include <malloc.h>
 #include <spl.h>
 #include <stdio.h>
+#include <linux/errno.h>
 
 #include <lzma/LzmaTypes.h>
 #include <lzma/LzmaDec.h>
diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c
index 1cfe4b2b442..897ea3fbfa6 100644
--- a/common/spl/spl_mmc.c
+++ b/common/spl/spl_mmc.c
@@ -17,6 +17,7 @@
 #include <errno.h>
 #include <mmc.h>
 #include <image.h>
+#include <linux/errno.h>
 
 static int mmc_load_legacy(struct spl_image_info *spl_image, struct mmc *mmc,
 			   ulong sector, struct image_header *header)
diff --git a/common/spl/spl_net.c b/common/spl/spl_net.c
index ac7be6360bb..b4a0a56b701 100644
--- a/common/spl/spl_net.c
+++ b/common/spl/spl_net.c
@@ -14,6 +14,7 @@
 #include <spl.h>
 #include <net.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <linux/string.h>
 
diff --git a/common/spl/spl_opensbi.c b/common/spl/spl_opensbi.c
index 4bde3bb4687..086759d63f2 100644
--- a/common/spl/spl_opensbi.c
+++ b/common/spl/spl_opensbi.c
@@ -14,6 +14,7 @@
 #include <asm/global_data.h>
 #include <asm/smp.h>
 #include <opensbi.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <linux/printk.h>
 
diff --git a/common/spl/spl_sata.c b/common/spl/spl_sata.c
index 3ac3b743d99..599243f1823 100644
--- a/common/spl/spl_sata.c
+++ b/common/spl/spl_sata.c
@@ -17,6 +17,7 @@
 #include <errno.h>
 #include <fat.h>
 #include <image.h>
+#include <linux/errno.h>
 
 #ifndef CONFIG_SYS_SATA_FAT_BOOT_PARTITION
 #define CONFIG_SYS_SATA_FAT_BOOT_PARTITION	1
diff --git a/common/spl/spl_sdp.c b/common/spl/spl_sdp.c
index 78ecc962551..c406d2ce038 100644
--- a/common/spl/spl_sdp.c
+++ b/common/spl/spl_sdp.c
@@ -10,6 +10,7 @@
 #include <usb.h>
 #include <g_dnl.h>
 #include <sdp.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 static int spl_sdp_load_image(struct spl_image_info *spl_image,
diff --git a/common/spl/spl_spi.c b/common/spl/spl_spi.c
index caa5ed10e1a..1121813abf0 100644
--- a/common/spl/spl_spi.c
+++ b/common/spl/spl_spi.c
@@ -17,6 +17,7 @@
 #include <spl.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/common/spl/spl_usb.c b/common/spl/spl_usb.c
index 607e5ba2d1f..35880883808 100644
--- a/common/spl/spl_usb.c
+++ b/common/spl/spl_usb.c
@@ -16,6 +16,7 @@
 #include <errno.h>
 #include <usb.h>
 #include <fat.h>
+#include <linux/errno.h>
 
 static int usb_stor_curr_dev = -1; /* current device */
 
diff --git a/common/spl/spl_ymodem.c b/common/spl/spl_ymodem.c
index 7124f604b0a..f9c7c2b04fc 100644
--- a/common/spl/spl_ymodem.c
+++ b/common/spl/spl_ymodem.c
@@ -16,6 +16,7 @@
 #include <stdio.h>
 #include <xyzModem.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <linux/string.h>
 
diff --git a/common/splash.c b/common/splash.c
index 1f92d791df8..174f82486eb 100644
--- a/common/splash.c
+++ b/common/splash.c
@@ -27,6 +27,7 @@
 #include <lcd.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/errno.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 99dce118a8f..9c5c285b76e 100644
--- a/common/splash_source.c
+++ b/common/splash_source.c
@@ -23,6 +23,7 @@
 #include <usb.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/common/stdio.c b/common/stdio.c
index eea1507754d..634ab9203af 100644
--- a/common/stdio.c
+++ b/common/stdio.c
@@ -21,6 +21,7 @@
 #include <splash.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #if defined(CONFIG_SYS_I2C)
diff --git a/common/update.c b/common/update.c
index 5cf02ddec2d..ab92824c70f 100644
--- a/common/update.c
+++ b/common/update.c
@@ -11,6 +11,7 @@
 #include <image.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/common/usb.c b/common/usb.c
index 5a319393025..16b51e8f4c7 100644
--- a/common/usb.c
+++ b/common/usb.c
@@ -40,6 +40,7 @@
 #include <errno.h>
 #include <usb.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #define USB_BUFSIZ	512
diff --git a/common/usb_hub.c b/common/usb_hub.c
index a846fc5dff9..46d074f0b55 100644
--- a/common/usb_hub.c
+++ b/common/usb_hub.c
@@ -36,6 +36,7 @@
 #include <asm/unaligned.h>
 #include <linux/ctype.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/list.h>
 #include <asm/byteorder.h>
 #ifdef CONFIG_SANDBOX
diff --git a/common/usb_kbd.c b/common/usb_kbd.c
index 0d3a34ea5c1..3fafbda40fd 100644
--- a/common/usb_kbd.c
+++ b/common/usb_kbd.c
@@ -19,6 +19,7 @@
 #include <time.h>
 #include <watchdog.h>
 #include <asm/byteorder.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include <usb.h>
diff --git a/common/usb_storage.c b/common/usb_storage.c
index 9fc002bcf67..d46e9288c05 100644
--- a/common/usb_storage.c
+++ b/common/usb_storage.c
@@ -48,6 +48,7 @@
 #include <dm/device-internal.h>
 #include <dm/lists.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include <part.h>
diff --git a/disk/part.c b/disk/part.c
index f2aadc47f49..58fd9b89e64 100644
--- a/disk/part.c
+++ b/disk/part.c
@@ -16,6 +16,7 @@
 #include <stdio.h>
 #include <ubifs_uboot.h>
 #include <vsprintf.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #undef	PART_DEBUG
diff --git a/disk/part_efi.c b/disk/part_efi.c
index 65937379199..f062bc383ea 100644
--- a/disk/part_efi.c
+++ b/disk/part_efi.c
@@ -27,6 +27,7 @@
 #include <part_efi.h>
 #include <linux/compiler.h>
 #include <linux/ctype.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
diff --git a/drivers/adc/adc-uclass.c b/drivers/adc/adc-uclass.c
index c1dd1f0599d..fa88040126f 100644
--- a/drivers/adc/adc-uclass.c
+++ b/drivers/adc/adc-uclass.c
@@ -14,6 +14,7 @@
 #include <dm/uclass-internal.h>
 #include <adc.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <power/regulator.h>
 
diff --git a/drivers/adc/exynos-adc.c b/drivers/adc/exynos-adc.c
index 973533d261a..7e9ad41ec26 100644
--- a/drivers/adc/exynos-adc.c
+++ b/drivers/adc/exynos-adc.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <adc.h>
 #include <asm/arch/adc.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 struct exynos_adc_priv {
diff --git a/drivers/adc/meson-saradc.c b/drivers/adc/meson-saradc.c
index d7c02f1aa3f..785d37c238f 100644
--- a/drivers/adc/meson-saradc.c
+++ b/drivers/adc/meson-saradc.c
@@ -17,6 +17,7 @@
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/math64.h>
 #include <linux/bitfield.h>
 #include <linux/printk.h>
diff --git a/drivers/adc/rockchip-saradc.c b/drivers/adc/rockchip-saradc.c
index 61e3f2cef90..26e037509cd 100644
--- a/drivers/adc/rockchip-saradc.c
+++ b/drivers/adc/rockchip-saradc.c
@@ -13,6 +13,7 @@
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 #define SARADC_CTRL_CHN_MASK		GENMASK(2, 0)
diff --git a/drivers/adc/sandbox.c b/drivers/adc/sandbox.c
index fa1174bbaa3..0bbb8efccbd 100644
--- a/drivers/adc/sandbox.c
+++ b/drivers/adc/sandbox.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <adc.h>
 #include <sandbox-adc.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 /**
diff --git a/drivers/adc/stm32-adc-core.c b/drivers/adc/stm32-adc-core.c
index 31bbb6f9d68..a40de83fd5b 100644
--- a/drivers/adc/stm32-adc-core.c
+++ b/drivers/adc/stm32-adc-core.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <power/regulator.h>
 #include "stm32-adc-core.h"
 
diff --git a/drivers/adc/stm32-adc.c b/drivers/adc/stm32-adc.c
index b12f894a9bf..431dfa4c435 100644
--- a/drivers/adc/stm32-adc.c
+++ b/drivers/adc/stm32-adc.c
@@ -12,6 +12,7 @@
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/iopoll.h>
 #include "stm32-adc-core.h"
 
diff --git a/drivers/ata/ahci_sunxi.c b/drivers/ata/ahci_sunxi.c
index 162e7de5194..f584317ab23 100644
--- a/drivers/ata/ahci_sunxi.c
+++ b/drivers/ata/ahci_sunxi.c
@@ -8,6 +8,7 @@
 #include <asm/io.h>
 #include <asm/gpio.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 #define AHCI_PHYCS0R 0x00c0
 #define AHCI_PHYCS1R 0x00c4
diff --git a/drivers/ata/fsl_sata.c b/drivers/ata/fsl_sata.c
index d44df799e97..cdc4c678d7a 100644
--- a/drivers/ata/fsl_sata.c
+++ b/drivers/ata/fsl_sata.c
@@ -22,6 +22,7 @@
 #include <fis.h>
 #include <sata.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include "fsl_sata.h"
 
diff --git a/drivers/ata/sata.c b/drivers/ata/sata.c
index b70de83df2c..453338e944b 100644
--- a/drivers/ata/sata.c
+++ b/drivers/ata/sata.c
@@ -16,6 +16,7 @@
 #include <part.h>
 #include <sata.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #ifndef CONFIG_AHCI
diff --git a/drivers/ata/sata_ceva.c b/drivers/ata/sata_ceva.c
index 77508aa5bc7..cd10d228964 100644
--- a/drivers/ata/sata_ceva.c
+++ b/drivers/ata/sata_ceva.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <scsi.h>
 #include <asm/io.h>
+#include <linux/errno.h>
 #include <linux/ioport.h>
 
 /* Vendor Specific Register Offsets */
diff --git a/drivers/ata/sata_sil.c b/drivers/ata/sata_sil.c
index b55b9daab74..54a9141808b 100644
--- a/drivers/ata/sata_sil.c
+++ b/drivers/ata/sata_sil.c
@@ -20,6 +20,7 @@
 #include <libata.h>
 #include <sata.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #if CONFIG_IS_ENABLED(BLK)
diff --git a/drivers/axi/axi-emul-uclass.c b/drivers/axi/axi-emul-uclass.c
index b28351f1adb..fb56b824513 100644
--- a/drivers/axi/axi-emul-uclass.c
+++ b/drivers/axi/axi-emul-uclass.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <dm/device-internal.h>
 #include <asm/axi.h>
+#include <linux/errno.h>
 
 int axi_sandbox_get_emul(struct udevice *bus, ulong address,
 			 enum axi_size_t size, struct udevice **emulp)
diff --git a/drivers/axi/axi-uclass.c b/drivers/axi/axi-uclass.c
index af8acd9f88b..3d642e71078 100644
--- a/drivers/axi/axi-uclass.c
+++ b/drivers/axi/axi-uclass.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <axi.h>
+#include <linux/errno.h>
 
 int axi_read(struct udevice *dev, ulong address, void *data,
 	     enum axi_size_t size)
diff --git a/drivers/axi/axi_sandbox.c b/drivers/axi/axi_sandbox.c
index b91c91f6b3b..41f62065e8e 100644
--- a/drivers/axi/axi_sandbox.c
+++ b/drivers/axi/axi_sandbox.c
@@ -8,6 +8,7 @@
 #include <axi.h>
 #include <dm.h>
 #include <asm/axi.h>
+#include <linux/errno.h>
 
 /*
  * This driver implements a AXI bus for the sandbox architecture for testing
diff --git a/drivers/axi/ihs_axi.c b/drivers/axi/ihs_axi.c
index 39455110907..0e4cbab9762 100644
--- a/drivers/axi/ihs_axi.c
+++ b/drivers/axi/ihs_axi.c
@@ -14,6 +14,7 @@
 #include <regmap.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 /**
  * struct ihs_axi_regs - Structure for the register map of a IHS AXI device
diff --git a/drivers/axi/sandbox_store.c b/drivers/axi/sandbox_store.c
index 42bcae6af26..72a4191946e 100644
--- a/drivers/axi/sandbox_store.c
+++ b/drivers/axi/sandbox_store.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <log.h>
 #include <malloc.h>
+#include <linux/errno.h>
 
 /**
  * struct sandbox_store_priv - Private data structure of a AXI store device
diff --git a/drivers/bios_emulator/atibios.c b/drivers/bios_emulator/atibios.c
index dbf74a45eed..d49839542a5 100644
--- a/drivers/bios_emulator/atibios.c
+++ b/drivers/bios_emulator/atibios.c
@@ -54,6 +54,7 @@
 #include <stdio.h>
 #include <vbe.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include "biosemui.h"
 
diff --git a/drivers/block/blk-uclass.c b/drivers/block/blk-uclass.c
index b31586ab811..5d7d3d616ee 100644
--- a/drivers/block/blk-uclass.c
+++ b/drivers/block/blk-uclass.c
@@ -16,6 +16,7 @@
 #include <dm/lists.h>
 #include <dm/uclass-internal.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 static const char *if_typename_str[IF_TYPE_COUNT] = {
diff --git a/drivers/block/blk_legacy.c b/drivers/block/blk_legacy.c
index 2b02e4d3b1c..c1a78f72a36 100644
--- a/drivers/block/blk_legacy.c
+++ b/drivers/block/blk_legacy.c
@@ -9,6 +9,7 @@
 #include <part.h>
 #include <stdio.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 struct blk_driver *blk_driver_lookup_type(int if_type)
diff --git a/drivers/board/board-uclass.c b/drivers/board/board-uclass.c
index b5485e9895b..57a28f065bf 100644
--- a/drivers/board/board-uclass.c
+++ b/drivers/board/board-uclass.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <board.h>
+#include <linux/errno.h>
 
 int board_get(struct udevice **devp)
 {
diff --git a/drivers/board/gazerbeam.c b/drivers/board/gazerbeam.c
index ed50fc530cb..7be676fff58 100644
--- a/drivers/board/gazerbeam.c
+++ b/drivers/board/gazerbeam.c
@@ -10,6 +10,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <asm/gpio.h>
+#include <linux/errno.h>
 
 #include "gazerbeam.h"
 
diff --git a/drivers/board/sandbox.c b/drivers/board/sandbox.c
index 22aaad10283..5de82750418 100644
--- a/drivers/board/sandbox.c
+++ b/drivers/board/sandbox.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <board.h>
 #include <vsprintf.h>
+#include <linux/errno.h>
 
 #include "sandbox.h"
 
diff --git a/drivers/bootcount/bootcount-uclass.c b/drivers/bootcount/bootcount-uclass.c
index 2a492c87ebd..81ca0027ebd 100644
--- a/drivers/bootcount/bootcount-uclass.c
+++ b/drivers/bootcount/bootcount-uclass.c
@@ -8,6 +8,7 @@
 #include <errno.h>
 #include <bootcount.h>
 #include <log.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 int dm_bootcount_get(struct udevice *dev, u32 *bootcount)
diff --git a/drivers/bootcount/bootcount.c b/drivers/bootcount/bootcount.c
index e8db8542f93..0a2fb50efea 100644
--- a/drivers/bootcount/bootcount.c
+++ b/drivers/bootcount/bootcount.c
@@ -8,6 +8,7 @@
 #include <cpu_func.h>
 #include <asm/cache.h>
 #include <linux/compiler.h>
+#include <linux/errno.h>
 
 #if !defined(CONFIG_DM_BOOTCOUNT)
 /* Now implement the generic default functions */
diff --git a/drivers/bootcount/i2c-eeprom.c b/drivers/bootcount/i2c-eeprom.c
index a3aa0cf5595..141713c3d52 100644
--- a/drivers/bootcount/i2c-eeprom.c
+++ b/drivers/bootcount/i2c-eeprom.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <i2c_eeprom.h>
 #include <log.h>
+#include <linux/errno.h>
 
 static const u8 bootcount_magic = 0xbc;
 
diff --git a/drivers/bootcount/rtc.c b/drivers/bootcount/rtc.c
index 076a8bb2be8..c6b30cd1483 100644
--- a/drivers/bootcount/rtc.c
+++ b/drivers/bootcount/rtc.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <log.h>
 #include <rtc.h>
+#include <linux/errno.h>
 
 static const u8 bootcount_magic = 0xbc;
 
diff --git a/drivers/button/button-gpio.c b/drivers/button/button-gpio.c
index 985ae7f5a76..3e6f11f74d0 100644
--- a/drivers/button/button-gpio.c
+++ b/drivers/button/button-gpio.c
@@ -10,6 +10,7 @@
 #include <dm/uclass-internal.h>
 #include <log.h>
 #include <asm/gpio.h>
+#include <linux/errno.h>
 
 struct button_gpio_priv {
 	struct gpio_desc gpio;
diff --git a/drivers/button/button-uclass.c b/drivers/button/button-uclass.c
index 1c742c265cf..c2c3960d7b1 100644
--- a/drivers/button/button-uclass.c
+++ b/drivers/button/button-uclass.c
@@ -9,6 +9,7 @@
 #include <button.h>
 #include <dm.h>
 #include <dm/uclass-internal.h>
+#include <linux/errno.h>
 
 int button_get_by_label(const char *label, struct udevice **devp)
 {
diff --git a/drivers/cache/cache-ncore.c b/drivers/cache/cache-ncore.c
index efef0561378..279e3c2801b 100644
--- a/drivers/cache/cache-ncore.c
+++ b/drivers/cache/cache-ncore.c
@@ -7,6 +7,7 @@
 #include <hang.h>
 #include <stdio.h>
 #include <wait_bit.h>
+#include <linux/errno.h>
 
 #include <asm/io.h>
 #include <linux/bitops.h>
diff --git a/drivers/cache/cache-uclass.c b/drivers/cache/cache-uclass.c
index 3b20a10f087..10497b37eda 100644
--- a/drivers/cache/cache-uclass.c
+++ b/drivers/cache/cache-uclass.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <cache.h>
 #include <dm.h>
+#include <linux/errno.h>
 
 int cache_get_info(struct udevice *dev, struct cache_info *info)
 {
diff --git a/drivers/cache/cache-v5l2.c b/drivers/cache/cache-v5l2.c
index 7adc69d514c..298eadb4af1 100644
--- a/drivers/cache/cache-v5l2.c
+++ b/drivers/cache/cache-v5l2.c
@@ -14,6 +14,7 @@
 #include <asm/io.h>
 #include <dm/ofnode.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 struct l2cache {
 	volatile u64	configure;
diff --git a/drivers/clk/altera/clk-agilex.c b/drivers/clk/altera/clk-agilex.c
index 8254ce68e4d..e6c01dd7b32 100644
--- a/drivers/clk/altera/clk-agilex.c
+++ b/drivers/clk/altera/clk-agilex.c
@@ -13,6 +13,7 @@
 #include <dm/util.h>
 #include <dt-bindings/clock/agilex-clock.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #include <asm/arch/clock_manager.h>
 
diff --git a/drivers/clk/altera/clk-arria10.c b/drivers/clk/altera/clk-arria10.c
index b05648e8a54..85300e61178 100644
--- a/drivers/clk/altera/clk-arria10.c
+++ b/drivers/clk/altera/clk-arria10.c
@@ -14,6 +14,7 @@
 #include <dm/lists.h>
 #include <dm/util.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include <asm/arch/clock_manager.h>
diff --git a/drivers/clk/analogbits/wrpll-cln28hpc.c b/drivers/clk/analogbits/wrpll-cln28hpc.c
index a3cb109d357..291a23d93f7 100644
--- a/drivers/clk/analogbits/wrpll-cln28hpc.c
+++ b/drivers/clk/analogbits/wrpll-cln28hpc.c
@@ -23,6 +23,7 @@
 
 #include <linux/bug.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/log2.h>
 #include <linux/math64.h>
 #include <linux/clk/analogbits-wrpll-cln28hpc.h>
diff --git a/drivers/clk/aspeed/clk_ast2500.c b/drivers/clk/aspeed/clk_ast2500.c
index d83e6590d6c..e837e0cd19a 100644
--- a/drivers/clk/aspeed/clk_ast2500.c
+++ b/drivers/clk/aspeed/clk_ast2500.c
@@ -14,6 +14,7 @@
 #include <dt-bindings/clock/ast2500-scu.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 
 /*
  * MAC Clock Delay settings, taken from Aspeed SDK
diff --git a/drivers/clk/at91/clk-main.c b/drivers/clk/at91/clk-main.c
index c1ca09c2109..85ec506de12 100644
--- a/drivers/clk/at91/clk-main.c
+++ b/drivers/clk/at91/clk-main.c
@@ -8,6 +8,7 @@
 #include <clk-uclass.h>
 #include <dm.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <mach/at91_pmc.h>
 #include "pmc.h"
diff --git a/drivers/clk/at91/clk-plla.c b/drivers/clk/at91/clk-plla.c
index 4f246afa18a..ae7df40f20d 100644
--- a/drivers/clk/at91/clk-plla.c
+++ b/drivers/clk/at91/clk-plla.c
@@ -8,6 +8,7 @@
 #include <clk-uclass.h>
 #include <dm.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <mach/at91_pmc.h>
 #include "pmc.h"
diff --git a/drivers/clk/at91/clk-plladiv.c b/drivers/clk/at91/clk-plladiv.c
index ca6158ef6ab..7c074327e27 100644
--- a/drivers/clk/at91/clk-plladiv.c
+++ b/drivers/clk/at91/clk-plladiv.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <clk-uclass.h>
 #include <dm/device.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <mach/at91_pmc.h>
 #include "pmc.h"
diff --git a/drivers/clk/at91/clk-system.c b/drivers/clk/at91/clk-system.c
index 76b1958670d..8e1a5f75774 100644
--- a/drivers/clk/at91/clk-system.c
+++ b/drivers/clk/at91/clk-system.c
@@ -8,6 +8,7 @@
 #include <clk-uclass.h>
 #include <dm.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <mach/at91_pmc.h>
 #include "pmc.h"
diff --git a/drivers/clk/at91/clk-utmi.c b/drivers/clk/at91/clk-utmi.c
index 72b97af1bcb..99a1ae86535 100644
--- a/drivers/clk/at91/clk-utmi.c
+++ b/drivers/clk/at91/clk-utmi.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <stdio.h>
 #include <syscon.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <mach/at91_pmc.h>
 #include <mach/at91_sfr.h>
diff --git a/drivers/clk/at91/pmc.c b/drivers/clk/at91/pmc.c
index 11859db3265..91e57b38777 100644
--- a/drivers/clk/at91/pmc.c
+++ b/drivers/clk/at91/pmc.c
@@ -11,6 +11,7 @@
 #include <asm/global_data.h>
 #include <dm/lists.h>
 #include <dm/util.h>
+#include <linux/errno.h>
 #include "pmc.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/clk/clk-cdce9xx.c b/drivers/clk/clk-cdce9xx.c
index fd47872ab99..a6e49a7765e 100644
--- a/drivers/clk/clk-cdce9xx.c
+++ b/drivers/clk/clk-cdce9xx.c
@@ -15,6 +15,7 @@
 #include <i2c.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #define MAX_NUMBER_OF_PLLS		4
 #define MAX_NUMER_OF_OUTPUTS		9
diff --git a/drivers/clk/clk-composite.c b/drivers/clk/clk-composite.c
index 819bfca2fcf..62d404d791d 100644
--- a/drivers/clk/clk-composite.c
+++ b/drivers/clk/clk-composite.c
@@ -13,6 +13,7 @@
 #include <linux/clk-provider.h>
 #include <clk.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 
 #include "clk.h"
 
diff --git a/drivers/clk/clk-divider.c b/drivers/clk/clk-divider.c
index 0e0c2d48b74..d2039512b21 100644
--- a/drivers/clk/clk-divider.c
+++ b/drivers/clk/clk-divider.c
@@ -21,6 +21,7 @@
 #include <linux/bug.h>
 #include <linux/clk-provider.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/log2.h>
 #include <div64.h>
 #include <clk.h>
diff --git a/drivers/clk/clk-fixed-factor.c b/drivers/clk/clk-fixed-factor.c
index 0eb24b87fc3..c181c0b6ea5 100644
--- a/drivers/clk/clk-fixed-factor.c
+++ b/drivers/clk/clk-fixed-factor.c
@@ -13,6 +13,7 @@
 #include <linux/clk-provider.h>
 #include <div64.h>
 #include <clk.h>
+#include <linux/errno.h>
 #include "clk.h"
 #include <linux/err.h>
 
diff --git a/drivers/clk/clk-gate.c b/drivers/clk/clk-gate.c
index cdca3e38d0d..221db043abc 100644
--- a/drivers/clk/clk-gate.c
+++ b/drivers/clk/clk-gate.c
@@ -16,6 +16,7 @@
 #include <linux/bitops.h>
 #include <linux/clk-provider.h>
 #include <clk.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include "clk.h"
 #include <linux/err.h>
diff --git a/drivers/clk/clk-hsdk-cgu.c b/drivers/clk/clk-hsdk-cgu.c
index 2067316e672..6f4cd1ecf2a 100644
--- a/drivers/clk/clk-hsdk-cgu.c
+++ b/drivers/clk/clk-hsdk-cgu.c
@@ -17,6 +17,7 @@
 #include <linux/bitops.h>
 #include <linux/bug.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <asm/arcregs.h>
 #include <linux/printk.h>
diff --git a/drivers/clk/clk-mux.c b/drivers/clk/clk-mux.c
index 446c0c7b52d..cba7113f3b6 100644
--- a/drivers/clk/clk-mux.c
+++ b/drivers/clk/clk-mux.c
@@ -31,6 +31,7 @@
 #include <linux/bitops.h>
 #include <linux/clk-provider.h>
 #include <clk.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include "clk.h"
diff --git a/drivers/clk/clk-ti-sci.c b/drivers/clk/clk-ti-sci.c
index 7a9a6451374..0f31ee73d9e 100644
--- a/drivers/clk/clk-ti-sci.c
+++ b/drivers/clk/clk-ti-sci.c
@@ -16,6 +16,7 @@
 #include <malloc.h>
 #include <dm/device_compat.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/soc/ti/ti_sci_protocol.h>
 #include <k3-avs.h>
 
diff --git a/drivers/clk/clk-uclass.c b/drivers/clk/clk-uclass.c
index 97cd7b1f315..090d0f21693 100644
--- a/drivers/clk/clk-uclass.c
+++ b/drivers/clk/clk-uclass.c
@@ -21,6 +21,7 @@
 #include <linux/bug.h>
 #include <linux/clk-provider.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 
 static inline const struct clk_ops *clk_dev_ops(struct udevice *dev)
 {
diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
index f55d57a95e6..5dac14c185e 100644
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@ -13,6 +13,7 @@
 #include <dm/lists.h>
 #include <dm/device-internal.h>
 #include <clk.h>
+#include <linux/errno.h>
 
 int clk_register(struct clk *clk, const char *drv_name,
 		 const char *name, const char *parent_name)
diff --git a/drivers/clk/clk_bcm6345.c b/drivers/clk/clk_bcm6345.c
index b850b9fc069..a03cee546c7 100644
--- a/drivers/clk/clk_bcm6345.c
+++ b/drivers/clk/clk_bcm6345.c
@@ -12,6 +12,7 @@
 #include <errno.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #define MAX_CLKS	32
 
diff --git a/drivers/clk/clk_boston.c b/drivers/clk/clk_boston.c
index 47424d8f533..c97d457062c 100644
--- a/drivers/clk/clk_boston.c
+++ b/drivers/clk/clk_boston.c
@@ -10,6 +10,7 @@
 #include <regmap.h>
 #include <syscon.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 struct clk_boston {
diff --git a/drivers/clk/clk_pic32.c b/drivers/clk/clk_pic32.c
index 664d8f98615..c9b047914a4 100644
--- a/drivers/clk/clk_pic32.c
+++ b/drivers/clk/clk_pic32.c
@@ -17,6 +17,7 @@
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/bug.h>
+#include <linux/errno.h>
 #include <mach/pic32.h>
 #include <dt-bindings/clock/microchip,clock.h>
 
diff --git a/drivers/clk/clk_sandbox.c b/drivers/clk/clk_sandbox.c
index 768fbb7c520..d1e2c0dab31 100644
--- a/drivers/clk/clk_sandbox.c
+++ b/drivers/clk/clk_sandbox.c
@@ -9,6 +9,7 @@
 #include <errno.h>
 #include <malloc.h>
 #include <asm/clk.h>
+#include <linux/errno.h>
 
 struct sandbox_clk_priv {
 	bool probed;
diff --git a/drivers/clk/clk_sandbox_ccf.c b/drivers/clk/clk_sandbox_ccf.c
index 0619d04f0ec..b282735c1d6 100644
--- a/drivers/clk/clk_sandbox_ccf.c
+++ b/drivers/clk/clk_sandbox_ccf.c
@@ -17,6 +17,7 @@
 #include <linux/clk-provider.h>
 #include <sandbox-clk.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 
 /*
  * Sandbox implementation of CCF primitives necessary for clk-uclass testing
diff --git a/drivers/clk/clk_sandbox_test.c b/drivers/clk/clk_sandbox_test.c
index 873383856f9..6eef29f9dc3 100644
--- a/drivers/clk/clk_sandbox_test.c
+++ b/drivers/clk/clk_sandbox_test.c
@@ -10,6 +10,7 @@
 #include <asm/clk.h>
 #include <dm/device_compat.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 
 struct sandbox_clk_test {
 	struct clk clks[SANDBOX_CLK_TEST_NON_DEVM_COUNT];
diff --git a/drivers/clk/clk_stm32f.c b/drivers/clk/clk_stm32f.c
index 45f5f567f8d..4d0eadf7e4f 100644
--- a/drivers/clk/clk_stm32f.c
+++ b/drivers/clk/clk_stm32f.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <stm32_rcc.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/clk/clk_stm32h7.c b/drivers/clk/clk_stm32h7.c
index c1856d8678b..d97a211423c 100644
--- a/drivers/clk/clk_stm32h7.c
+++ b/drivers/clk/clk_stm32h7.c
@@ -13,6 +13,7 @@
 #include <asm/io.h>
 #include <dm/root.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 #include <dt-bindings/clock/stm32h7-clks.h>
diff --git a/drivers/clk/clk_stm32mp1.c b/drivers/clk/clk_stm32mp1.c
index b2e0c8ca00d..e7e57ad73a9 100644
--- a/drivers/clk/clk_stm32mp1.c
+++ b/drivers/clk/clk_stm32mp1.c
@@ -17,6 +17,7 @@
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/iopoll.h>
 #include <asm/arch/sys_proto.h>
diff --git a/drivers/clk/clk_versal.c b/drivers/clk/clk_versal.c
index 19db23159f0..b73dcc2980d 100644
--- a/drivers/clk/clk_versal.c
+++ b/drivers/clk/clk_versal.c
@@ -19,6 +19,7 @@
 #include <asm/arch/sys_proto.h>
 #include <zynqmp_firmware.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #define MAX_PARENT			100
diff --git a/drivers/clk/clk_vexpress_osc.c b/drivers/clk/clk_vexpress_osc.c
index b48319bba67..950c72d573a 100644
--- a/drivers/clk/clk_vexpress_osc.c
+++ b/drivers/clk/clk_vexpress_osc.c
@@ -14,6 +14,7 @@
 #include <errno.h>
 #include <misc.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #define CLK_FUNCTION		BIT(20)
 
diff --git a/drivers/clk/clk_zynq.c b/drivers/clk/clk_zynq.c
index f590ad8dfa9..2c8b851295c 100644
--- a/drivers/clk/clk_zynq.c
+++ b/drivers/clk/clk_zynq.c
@@ -20,6 +20,7 @@
 #include <asm/arch/clk.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/errno.h>
 
 /* Register bitfield defines */
 #define PLLCTRL_FBDIV_MASK	0x7f000
diff --git a/drivers/clk/clk_zynqmp.c b/drivers/clk/clk_zynqmp.c
index 8c62b63ea2b..3ebf6223c06 100644
--- a/drivers/clk/clk_zynqmp.c
+++ b/drivers/clk/clk_zynqmp.c
@@ -16,6 +16,7 @@
 #include <asm/arch/sys_proto.h>
 #include <dm.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 
 static const resource_size_t zynqmp_crf_apb_clkc_base = 0xfd1a0020;
 static const resource_size_t zynqmp_crl_apb_clkc_base = 0xff5e0020;
diff --git a/drivers/clk/exynos/clk-exynos7420.c b/drivers/clk/exynos/clk-exynos7420.c
index 4a023ea736b..d86f84acef1 100644
--- a/drivers/clk/exynos/clk-exynos7420.c
+++ b/drivers/clk/exynos/clk-exynos7420.c
@@ -11,6 +11,7 @@
 #include <clk-uclass.h>
 #include <asm/io.h>
 #include <dt-bindings/clock/exynos7420-clk.h>
+#include <linux/errno.h>
 #include "clk-pll.h"
 
 #define DIVIDER(reg, shift, mask)	\
diff --git a/drivers/clk/ics8n3qv01.c b/drivers/clk/ics8n3qv01.c
index 95f1c7641f2..7d551b7c8d8 100644
--- a/drivers/clk/ics8n3qv01.c
+++ b/drivers/clk/ics8n3qv01.c
@@ -15,6 +15,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <stdio.h>
+#include <linux/errno.h>
 
 const long long ICS8N3QV01_FREF = 114285000;
 const long long ICS8N3QV01_FREF_LL = 114285000LL;
diff --git a/drivers/clk/imx/clk-composite-8m.c b/drivers/clk/imx/clk-composite-8m.c
index 494156751da..64756ed9e64 100644
--- a/drivers/clk/imx/clk-composite-8m.c
+++ b/drivers/clk/imx/clk-composite-8m.c
@@ -12,6 +12,7 @@
 #include <dm/devres.h>
 #include <linux/clk-provider.h>
 #include <clk.h>
+#include <linux/errno.h>
 #include "clk.h"
 #include <linux/err.h>
 
diff --git a/drivers/clk/imx/clk-gate2.c b/drivers/clk/imx/clk-gate2.c
index 40b2d4caab4..0e3678acc63 100644
--- a/drivers/clk/imx/clk-gate2.c
+++ b/drivers/clk/imx/clk-gate2.c
@@ -22,6 +22,7 @@
 #include <dm/devres.h>
 #include <linux/clk-provider.h>
 #include <clk.h>
+#include <linux/errno.h>
 #include "clk.h"
 #include <linux/err.h>
 
diff --git a/drivers/clk/imx/clk-imx6q.c b/drivers/clk/imx/clk-imx6q.c
index c8d826b0141..709c2883da5 100644
--- a/drivers/clk/imx/clk-imx6q.c
+++ b/drivers/clk/imx/clk-imx6q.c
@@ -12,6 +12,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <dt-bindings/clock/imx6qdl-clock.h>
+#include <linux/errno.h>
 
 #include "clk.h"
 
diff --git a/drivers/clk/imx/clk-imx8.c b/drivers/clk/imx/clk-imx8.c
index 523ead82e97..63fd42a2946 100644
--- a/drivers/clk/imx/clk-imx8.c
+++ b/drivers/clk/imx/clk-imx8.c
@@ -15,6 +15,7 @@
 #include <dt-bindings/clock/imx8qxp-clock.h>
 #include <dt-bindings/soc/imx_rsrc.h>
 #include <misc.h>
+#include <linux/errno.h>
 
 #include "clk-imx8.h"
 
diff --git a/drivers/clk/imx/clk-imx8mm.c b/drivers/clk/imx/clk-imx8mm.c
index d32ff8409aa..081d8aee01b 100644
--- a/drivers/clk/imx/clk-imx8mm.c
+++ b/drivers/clk/imx/clk-imx8mm.c
@@ -12,6 +12,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <dt-bindings/clock/imx8mm-clock.h>
+#include <linux/errno.h>
 
 #include "clk.h"
 
diff --git a/drivers/clk/imx/clk-imx8mn.c b/drivers/clk/imx/clk-imx8mn.c
index e29d902544c..c35689bdea4 100644
--- a/drivers/clk/imx/clk-imx8mn.c
+++ b/drivers/clk/imx/clk-imx8mn.c
@@ -12,6 +12,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <dt-bindings/clock/imx8mn-clock.h>
+#include <linux/errno.h>
 
 #include "clk.h"
 
diff --git a/drivers/clk/imx/clk-imx8mp.c b/drivers/clk/imx/clk-imx8mp.c
index c77500bcce0..883a29a4f31 100644
--- a/drivers/clk/imx/clk-imx8mp.c
+++ b/drivers/clk/imx/clk-imx8mp.c
@@ -12,6 +12,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <dt-bindings/clock/imx8mp-clock.h>
+#include <linux/errno.h>
 
 #include "clk.h"
 
diff --git a/drivers/clk/imx/clk-imx8qm.c b/drivers/clk/imx/clk-imx8qm.c
index d781bcd8a93..1a818694d25 100644
--- a/drivers/clk/imx/clk-imx8qm.c
+++ b/drivers/clk/imx/clk-imx8qm.c
@@ -14,6 +14,7 @@
 #include <dt-bindings/clock/imx8qm-clock.h>
 #include <dt-bindings/soc/imx_rsrc.h>
 #include <misc.h>
+#include <linux/errno.h>
 
 #include "clk-imx8.h"
 
diff --git a/drivers/clk/imx/clk-imx8qxp.c b/drivers/clk/imx/clk-imx8qxp.c
index 40761340739..755d8518f64 100644
--- a/drivers/clk/imx/clk-imx8qxp.c
+++ b/drivers/clk/imx/clk-imx8qxp.c
@@ -14,6 +14,7 @@
 #include <dt-bindings/clock/imx8qxp-clock.h>
 #include <dt-bindings/soc/imx_rsrc.h>
 #include <misc.h>
+#include <linux/errno.h>
 
 #include "clk-imx8.h"
 
diff --git a/drivers/clk/imx/clk-imxrt1020.c b/drivers/clk/imx/clk-imxrt1020.c
index 840f783940f..6bf82fee4eb 100644
--- a/drivers/clk/imx/clk-imxrt1020.c
+++ b/drivers/clk/imx/clk-imxrt1020.c
@@ -11,6 +11,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <dt-bindings/clock/imxrt1020-clock.h>
+#include <linux/errno.h>
 
 #include "clk.h"
 
diff --git a/drivers/clk/imx/clk-imxrt1050.c b/drivers/clk/imx/clk-imxrt1050.c
index 594093ee5fb..4127fa75236 100644
--- a/drivers/clk/imx/clk-imxrt1050.c
+++ b/drivers/clk/imx/clk-imxrt1050.c
@@ -12,6 +12,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <dt-bindings/clock/imxrt1050-clock.h>
+#include <linux/errno.h>
 
 #include "clk.h"
 
diff --git a/drivers/clk/imx/clk-pfd.c b/drivers/clk/imx/clk-pfd.c
index b8be3167c4c..08f1234aab2 100644
--- a/drivers/clk/imx/clk-pfd.c
+++ b/drivers/clk/imx/clk-pfd.c
@@ -23,6 +23,7 @@
 #include <linux/clk-provider.h>
 #include <div64.h>
 #include <clk.h>
+#include <linux/errno.h>
 #include "clk.h"
 #include <linux/err.h>
 
diff --git a/drivers/clk/imx/clk-pll14xx.c b/drivers/clk/imx/clk-pll14xx.c
index ac2461948d2..a9b56b79027 100644
--- a/drivers/clk/imx/clk-pll14xx.c
+++ b/drivers/clk/imx/clk-pll14xx.c
@@ -15,6 +15,7 @@
 #include <linux/clk-provider.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/iopoll.h>
 #include <clk.h>
 #include <div64.h>
diff --git a/drivers/clk/imx/clk-pllv3.c b/drivers/clk/imx/clk-pllv3.c
index b4a9d587e1b..a0193e18519 100644
--- a/drivers/clk/imx/clk-pllv3.c
+++ b/drivers/clk/imx/clk-pllv3.c
@@ -13,6 +13,7 @@
 #include <dm/devres.h>
 #include <dm/uclass.h>
 #include <clk.h>
+#include <linux/errno.h>
 #include "clk.h"
 #include <linux/err.h>
 
diff --git a/drivers/clk/intel/clk_intel.c b/drivers/clk/intel/clk_intel.c
index b633934d90a..371898f2744 100644
--- a/drivers/clk/intel/clk_intel.c
+++ b/drivers/clk/intel/clk_intel.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <clk-uclass.h>
 #include <dt-bindings/clock/intel-clock.h>
+#include <linux/errno.h>
 
 static ulong intel_clk_get_rate(struct clk *clk)
 {
diff --git a/drivers/clk/kendryte/bypass.c b/drivers/clk/kendryte/bypass.c
index d1fd28175ba..0d8eb1ce331 100644
--- a/drivers/clk/kendryte/bypass.c
+++ b/drivers/clk/kendryte/bypass.c
@@ -5,6 +5,7 @@
 
 #define LOG_CATEGORY UCLASS_CLK
 #include <kendryte/bypass.h>
+#include <linux/errno.h>
 
 #include <clk-uclass.h>
 #include <linux/clk-provider.h>
diff --git a/drivers/clk/kendryte/clk.c b/drivers/clk/kendryte/clk.c
index 981b3b7699b..5128cca1060 100644
--- a/drivers/clk/kendryte/clk.c
+++ b/drivers/clk/kendryte/clk.c
@@ -3,6 +3,7 @@
  * Copyright (C) 2019-20 Sean Anderson <seanga2@gmail.com>
  */
 #include <kendryte/clk.h>
+#include <linux/errno.h>
 
 #include <asm/io.h>
 #include <dt-bindings/clock/k210-sysctl.h>
diff --git a/drivers/clk/kendryte/pll.c b/drivers/clk/kendryte/pll.c
index 19e358856a8..d439134ed24 100644
--- a/drivers/clk/kendryte/pll.c
+++ b/drivers/clk/kendryte/pll.c
@@ -4,6 +4,7 @@
  */
 #define LOG_CATEGORY UCLASS_CLK
 #include <kendryte/pll.h>
+#include <linux/errno.h>
 
 #include <asm/io.h>
 /* For DIV_ROUND_DOWN_ULL, defined in linux/kernel.h */
diff --git a/drivers/clk/mediatek/clk-mt7622.c b/drivers/clk/mediatek/clk-mt7622.c
index dc0ba71f109..3462b49c69d 100644
--- a/drivers/clk/mediatek/clk-mt7622.c
+++ b/drivers/clk/mediatek/clk-mt7622.c
@@ -13,6 +13,7 @@
 #include <asm/io.h>
 #include <dt-bindings/clock/mt7622-clk.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #include "clk-mtk.h"
 
diff --git a/drivers/clk/mediatek/clk-mt7623.c b/drivers/clk/mediatek/clk-mt7623.c
index a15fb45e8e7..042031dd70f 100644
--- a/drivers/clk/mediatek/clk-mt7623.c
+++ b/drivers/clk/mediatek/clk-mt7623.c
@@ -13,6 +13,7 @@
 #include <asm/io.h>
 #include <dt-bindings/clock/mt7623-clk.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #include "clk-mtk.h"
 
diff --git a/drivers/clk/mediatek/clk-mt7629.c b/drivers/clk/mediatek/clk-mt7629.c
index 5b2aa5f200a..94b83a53281 100644
--- a/drivers/clk/mediatek/clk-mt7629.c
+++ b/drivers/clk/mediatek/clk-mt7629.c
@@ -13,6 +13,7 @@
 #include <asm/io.h>
 #include <dt-bindings/clock/mt7629-clk.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #include "clk-mtk.h"
 
diff --git a/drivers/clk/mediatek/clk-mtk.c b/drivers/clk/mediatek/clk-mtk.c
index 388471b03a9..e4217bd9627 100644
--- a/drivers/clk/mediatek/clk-mtk.c
+++ b/drivers/clk/mediatek/clk-mtk.c
@@ -13,6 +13,7 @@
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 #include "clk-mtk.h"
 
diff --git a/drivers/clk/meson/axg.c b/drivers/clk/meson/axg.c
index 6ef8b418d78..99b4da09417 100644
--- a/drivers/clk/meson/axg.c
+++ b/drivers/clk/meson/axg.c
@@ -16,6 +16,7 @@
 #include <div64.h>
 #include <dt-bindings/clock/axg-clkc.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include "clk_meson.h"
 #include <linux/err.h>
 
diff --git a/drivers/clk/meson/g12a.c b/drivers/clk/meson/g12a.c
index bf2f357435a..ba9ec818de6 100644
--- a/drivers/clk/meson/g12a.c
+++ b/drivers/clk/meson/g12a.c
@@ -18,6 +18,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/kernel.h>
 #include "clk_meson.h"
 
diff --git a/drivers/clk/meson/gxbb.c b/drivers/clk/meson/gxbb.c
index b9353c053eb..d66b23c2a90 100644
--- a/drivers/clk/meson/gxbb.c
+++ b/drivers/clk/meson/gxbb.c
@@ -16,6 +16,7 @@
 #include <syscon.h>
 #include <dt-bindings/clock/gxbb-clkc.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include "clk_meson.h"
 #include <linux/err.h>
 
diff --git a/drivers/clk/mpc83xx_clk.c b/drivers/clk/mpc83xx_clk.c
index b95aedeb2dc..f892074d9d6 100644
--- a/drivers/clk/mpc83xx_clk.c
+++ b/drivers/clk/mpc83xx_clk.c
@@ -17,6 +17,7 @@
 #include <dt-bindings/clk/mpc83xx-clk.h>
 #include <asm/arch/soc.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #include "mpc83xx_clk.h"
 
diff --git a/drivers/clk/mpc83xx_clk.h b/drivers/clk/mpc83xx_clk.h
index 8a31a4c868f..b03b35a8784 100644
--- a/drivers/clk/mpc83xx_clk.h
+++ b/drivers/clk/mpc83xx_clk.h
@@ -18,6 +18,7 @@
  * @RAT_3_TO_1:   Ratio 3:1
  */
 #include <linux/bitops.h>
+#include <linux/errno.h>
 enum ratio {
 	RAT_UNK,
 	RAT_BYP,
diff --git a/drivers/clk/mtmips/clk-mt7628.c b/drivers/clk/mtmips/clk-mt7628.c
index 35780de8c49..f013c77df28 100644
--- a/drivers/clk/mtmips/clk-mt7628.c
+++ b/drivers/clk/mtmips/clk-mt7628.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <dt-bindings/clock/mt7628-clk.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 
 /* SYSCFG0 */
diff --git a/drivers/clk/mvebu/armada-37xx-periph.c b/drivers/clk/mvebu/armada-37xx-periph.c
index 2e2ac6fe870..dd2b0b9914b 100644
--- a/drivers/clk/mvebu/armada-37xx-periph.c
+++ b/drivers/clk/mvebu/armada-37xx-periph.c
@@ -18,6 +18,7 @@
 #include <asm/arch/cpu.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #define TBG_SEL		0x0
diff --git a/drivers/clk/mvebu/armada-37xx-tbg.c b/drivers/clk/mvebu/armada-37xx-tbg.c
index bb943830266..512a1f5824f 100644
--- a/drivers/clk/mvebu/armada-37xx-tbg.c
+++ b/drivers/clk/mvebu/armada-37xx-tbg.c
@@ -16,6 +16,7 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <dm/device_compat.h>
+#include <linux/errno.h>
 
 #define NUM_TBG	    4
 
diff --git a/drivers/clk/owl/clk_owl.c b/drivers/clk/owl/clk_owl.c
index 1999c87a336..d596c0cf161 100644
--- a/drivers/clk/owl/clk_owl.c
+++ b/drivers/clk/owl/clk_owl.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <linux/errno.h>
 #include "clk_owl.h"
 #include <asm/io.h>
 #if defined(CONFIG_MACH_S900)
diff --git a/drivers/clk/renesas/clk-rcar-gen2.c b/drivers/clk/renesas/clk-rcar-gen2.c
index a859625b60b..52d7bba0cff 100644
--- a/drivers/clk/renesas/clk-rcar-gen2.c
+++ b/drivers/clk/renesas/clk-rcar-gen2.c
@@ -18,6 +18,7 @@
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include <dt-bindings/clock/renesas-cpg-mssr.h>
diff --git a/drivers/clk/renesas/clk-rcar-gen3.c b/drivers/clk/renesas/clk-rcar-gen3.c
index ad2c73998d4..be230d1d923 100644
--- a/drivers/clk/renesas/clk-rcar-gen3.c
+++ b/drivers/clk/renesas/clk-rcar-gen3.c
@@ -20,6 +20,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #include <dt-bindings/clock/renesas-cpg-mssr.h>
 
diff --git a/drivers/clk/renesas/renesas-cpg-mssr.c b/drivers/clk/renesas/renesas-cpg-mssr.c
index 7c1222f6c8c..e3e5d9640c9 100644
--- a/drivers/clk/renesas/renesas-cpg-mssr.c
+++ b/drivers/clk/renesas/renesas-cpg-mssr.c
@@ -17,6 +17,7 @@
 #include <wait_bit.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #include <dt-bindings/clock/renesas-cpg-mssr.h>
 
diff --git a/drivers/clk/rockchip/clk_pll.c b/drivers/clk/rockchip/clk_pll.c
index 3424a9a36a3..65da88b5109 100644
--- a/drivers/clk/rockchip/clk_pll.c
+++ b/drivers/clk/rockchip/clk_pll.c
@@ -14,6 +14,7 @@
 #include <asm/arch-rockchip/hardware.h>
 #include <div64.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 static struct rockchip_pll_rate_table rockchip_auto_table;
 
diff --git a/drivers/clk/rockchip/clk_px30.c b/drivers/clk/rockchip/clk_px30.c
index 4178502bdff..8fc3b6e572f 100644
--- a/drivers/clk/rockchip/clk_px30.c
+++ b/drivers/clk/rockchip/clk_px30.c
@@ -21,6 +21,7 @@
 #include <dt-bindings/clock/px30-cru.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/clk/rockchip/clk_rk3036.c b/drivers/clk/rockchip/clk_rk3036.c
index 274572f70c1..80aa7c2f39a 100644
--- a/drivers/clk/rockchip/clk_rk3036.c
+++ b/drivers/clk/rockchip/clk_rk3036.c
@@ -17,6 +17,7 @@
 #include <dm/lists.h>
 #include <dt-bindings/clock/rk3036-cru.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/log2.h>
 #include <linux/stringify.h>
 
diff --git a/drivers/clk/rockchip/clk_rk3128.c b/drivers/clk/rockchip/clk_rk3128.c
index 5a0079e0298..b9c896460f0 100644
--- a/drivers/clk/rockchip/clk_rk3128.c
+++ b/drivers/clk/rockchip/clk_rk3128.c
@@ -19,6 +19,7 @@
 #include <dm/lists.h>
 #include <dt-bindings/clock/rk3128-cru.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/log2.h>
 
 enum {
diff --git a/drivers/clk/rockchip/clk_rk3188.c b/drivers/clk/rockchip/clk_rk3188.c
index aacc8cf2d14..b77b92e4c5b 100644
--- a/drivers/clk/rockchip/clk_rk3188.c
+++ b/drivers/clk/rockchip/clk_rk3188.c
@@ -24,6 +24,7 @@
 #include <dm/uclass-internal.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/log2.h>
 #include <linux/stringify.h>
 
diff --git a/drivers/clk/rockchip/clk_rk322x.c b/drivers/clk/rockchip/clk_rk322x.c
index b63fb9b3cca..780fd7e725b 100644
--- a/drivers/clk/rockchip/clk_rk322x.c
+++ b/drivers/clk/rockchip/clk_rk322x.c
@@ -18,6 +18,7 @@
 #include <dt-bindings/clock/rk3228-cru.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/log2.h>
 #include <linux/string.h>
 #include <linux/stringify.h>
diff --git a/drivers/clk/rockchip/clk_rk3288.c b/drivers/clk/rockchip/clk_rk3288.c
index 6221515df20..da40f74d424 100644
--- a/drivers/clk/rockchip/clk_rk3288.c
+++ b/drivers/clk/rockchip/clk_rk3288.c
@@ -28,6 +28,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/log2.h>
 #include <linux/string.h>
 #include <linux/stringify.h>
diff --git a/drivers/clk/rockchip/clk_rk3308.c b/drivers/clk/rockchip/clk_rk3308.c
index c6270aa07e1..7106685bb50 100644
--- a/drivers/clk/rockchip/clk_rk3308.c
+++ b/drivers/clk/rockchip/clk_rk3308.c
@@ -20,6 +20,7 @@
 #include <dm/lists.h>
 #include <dt-bindings/clock/rk3308-cru.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/clk/rockchip/clk_rk3328.c b/drivers/clk/rockchip/clk_rk3328.c
index 1050559cedf..6c7626ab154 100644
--- a/drivers/clk/rockchip/clk_rk3328.c
+++ b/drivers/clk/rockchip/clk_rk3328.c
@@ -21,6 +21,7 @@
 #include <dt-bindings/clock/rk3328-cru.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 struct pll_div {
diff --git a/drivers/clk/rockchip/clk_rk3368.c b/drivers/clk/rockchip/clk_rk3368.c
index 586639344d0..0d677f55ee1 100644
--- a/drivers/clk/rockchip/clk_rk3368.c
+++ b/drivers/clk/rockchip/clk_rk3368.c
@@ -22,6 +22,7 @@
 #include <dm/lists.h>
 #include <dt-bindings/clock/rk3368-cru.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include <linux/stringify.h>
diff --git a/drivers/clk/rockchip/clk_rk3399.c b/drivers/clk/rockchip/clk_rk3399.c
index e6d74ab6b93..016633c1382 100644
--- a/drivers/clk/rockchip/clk_rk3399.c
+++ b/drivers/clk/rockchip/clk_rk3399.c
@@ -23,6 +23,7 @@
 #include <dt-bindings/clock/rk3399-cru.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/clk/rockchip/clk_rv1108.c b/drivers/clk/rockchip/clk_rv1108.c
index 87a2847485c..4297934b981 100644
--- a/drivers/clk/rockchip/clk_rv1108.c
+++ b/drivers/clk/rockchip/clk_rv1108.c
@@ -21,6 +21,7 @@
 #include <dm/lists.h>
 #include <dt-bindings/clock/rv1108-cru.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/stringify.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/clk/sifive/fu540-prci.c b/drivers/clk/sifive/fu540-prci.c
index 6cb56d21acd..0aa4ac5eebd 100644
--- a/drivers/clk/sifive/fu540-prci.c
+++ b/drivers/clk/sifive/fu540-prci.c
@@ -37,6 +37,7 @@
 #include <errno.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include <linux/math64.h>
diff --git a/drivers/clk/sunxi/clk_sunxi.c b/drivers/clk/sunxi/clk_sunxi.c
index d440abc1394..1b70f15ab9a 100644
--- a/drivers/clk/sunxi/clk_sunxi.c
+++ b/drivers/clk/sunxi/clk_sunxi.c
@@ -14,6 +14,7 @@
 #include <asm/io.h>
 #include <asm/arch/ccu.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/log2.h>
 
 static const struct ccu_clk_gate *priv_to_gate(struct ccu_priv *priv,
diff --git a/drivers/clk/tegra/tegra-car-clk.c b/drivers/clk/tegra/tegra-car-clk.c
index 09a7cf470ca..d6abf0d6c11 100644
--- a/drivers/clk/tegra/tegra-car-clk.c
+++ b/drivers/clk/tegra/tegra-car-clk.c
@@ -10,6 +10,7 @@
 #include <malloc.h>
 #include <asm/arch/clock.h>
 #include <asm/arch-tegra/clk_rst.h>
+#include <linux/errno.h>
 
 static int tegra_car_clk_request(struct clk *clk)
 {
diff --git a/drivers/clk/uniphier/clk-uniphier-core.c b/drivers/clk/uniphier/clk-uniphier-core.c
index 4e25db354e0..13f2b76c890 100644
--- a/drivers/clk/uniphier/clk-uniphier-core.c
+++ b/drivers/clk/uniphier/clk-uniphier-core.c
@@ -10,6 +10,7 @@
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/bug.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/sizes.h>
 
diff --git a/drivers/core/acpi.c b/drivers/core/acpi.c
index 26f494f2aeb..356cf0862a5 100644
--- a/drivers/core/acpi.c
+++ b/drivers/core/acpi.c
@@ -18,6 +18,7 @@
 #include <dm/acpi.h>
 #include <dm/device-internal.h>
 #include <dm/root.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #define MAX_ACPI_ITEMS	100
diff --git a/drivers/core/device-remove.c b/drivers/core/device-remove.c
index 360cfa72bc1..3de629d24df 100644
--- a/drivers/core/device-remove.c
+++ b/drivers/core/device-remove.c
@@ -19,6 +19,7 @@
 #include <dm/uclass-internal.h>
 #include <dm/util.h>
 #include <power-domain.h>
+#include <linux/errno.h>
 
 int device_chld_unbind(struct udevice *dev, struct driver *drv)
 {
diff --git a/drivers/core/device.c b/drivers/core/device.c
index 29b71e24055..ac6ce92bc0f 100644
--- a/drivers/core/device.c
+++ b/drivers/core/device.c
@@ -29,6 +29,7 @@
 #include <dm/uclass-internal.h>
 #include <dm/util.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/list.h>
 #include <power-domain.h>
 #include <linux/printk.h>
diff --git a/drivers/core/devres.c b/drivers/core/devres.c
index e2d4a80cefd..9507ecb9a80 100644
--- a/drivers/core/devres.c
+++ b/drivers/core/devres.c
@@ -14,6 +14,7 @@
 #include <malloc.h>
 #include <stdio.h>
 #include <linux/compat.h>
+#include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/list.h>
 #include <dm/device.h>
diff --git a/drivers/core/lists.c b/drivers/core/lists.c
index 86a99abfaae..dcc1e4a4f95 100644
--- a/drivers/core/lists.c
+++ b/drivers/core/lists.c
@@ -19,6 +19,7 @@
 #include <dm/util.h>
 #include <fdtdec.h>
 #include <linux/compiler.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 struct driver *lists_driver_lookup_name(const char *name)
diff --git a/drivers/core/of_access.c b/drivers/core/of_access.c
index 368cd023578..ad9bd7dd5a2 100644
--- a/drivers/core/of_access.c
+++ b/drivers/core/of_access.c
@@ -25,6 +25,7 @@
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <linux/bug.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <dm/of_access.h>
 #include <linux/ctype.h>
diff --git a/drivers/core/of_addr.c b/drivers/core/of_addr.c
index 6316b651534..4fd4ee0c889 100644
--- a/drivers/core/of_addr.c
+++ b/drivers/core/of_addr.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <log.h>
 #include <linux/bug.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <dm/of_access.h>
 #include <dm/of_addr.h>
diff --git a/drivers/core/of_extra.c b/drivers/core/of_extra.c
index e04fc9d2687..f2efc0c8ad9 100644
--- a/drivers/core/of_extra.c
+++ b/drivers/core/of_extra.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <log.h>
 #include <vsprintf.h>
+#include <linux/errno.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 fe94799b230..d68be142e68 100644
--- a/drivers/core/ofnode.c
+++ b/drivers/core/ofnode.c
@@ -12,6 +12,7 @@
 #include <malloc.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <dm/of_access.h>
 #include <dm/of_addr.h>
diff --git a/drivers/core/read.c b/drivers/core/read.c
index 8a31dc67c9b..ecd812566ce 100644
--- a/drivers/core/read.c
+++ b/drivers/core/read.c
@@ -11,6 +11,7 @@
 #include <mapmem.h>
 #include <asm/types.h>
 #include <asm/io.h>
+#include <linux/errno.h>
 
 int dev_read_u32(const struct udevice *dev, const char *propname, u32 *outp)
 {
diff --git a/drivers/core/regmap.c b/drivers/core/regmap.c
index e3f2affd1cf..37fff77dc09 100644
--- a/drivers/core/regmap.c
+++ b/drivers/core/regmap.c
@@ -9,6 +9,7 @@
 #include <errno.h>
 #include <log.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <malloc.h>
 #include <mapmem.h>
diff --git a/drivers/core/root.c b/drivers/core/root.c
index 1e9d580c494..2d0deea9f78 100644
--- a/drivers/core/root.c
+++ b/drivers/core/root.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <dm/acpi.h>
 #include <dm/device.h>
diff --git a/drivers/core/simple-pm-bus.c b/drivers/core/simple-pm-bus.c
index 51dc9b206fd..96608bd95ed 100644
--- a/drivers/core/simple-pm-bus.c
+++ b/drivers/core/simple-pm-bus.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <clk.h>
 #include <dm.h>
+#include <linux/errno.h>
 
 /*
  * Power domains are taken care of by driver_probe, so we just have to enable
diff --git a/drivers/core/syscon-uclass.c b/drivers/core/syscon-uclass.c
index b5cd763b6bb..11ac1b17733 100644
--- a/drivers/core/syscon-uclass.c
+++ b/drivers/core/syscon-uclass.c
@@ -15,6 +15,7 @@
 #include <dm/lists.h>
 #include <dm/root.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 
 /*
  * Caution:
diff --git a/drivers/core/uclass.c b/drivers/core/uclass.c
index 98fdb014222..3fae359866f 100644
--- a/drivers/core/uclass.c
+++ b/drivers/core/uclass.c
@@ -20,6 +20,7 @@
 #include <dm/uclass.h>
 #include <dm/uclass-internal.h>
 #include <dm/util.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/core/util.c b/drivers/core/util.c
index cd15768970c..242fb7010de 100644
--- a/drivers/core/util.c
+++ b/drivers/core/util.c
@@ -10,6 +10,7 @@
 #include <dm/ofnode.h>
 #include <dm/read.h>
 #include <dm/util.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <vsprintf.h>
 
diff --git a/drivers/cpu/bmips_cpu.c b/drivers/cpu/bmips_cpu.c
index 5a2fe894a5d..44110e1d8ec 100644
--- a/drivers/cpu/bmips_cpu.c
+++ b/drivers/cpu/bmips_cpu.c
@@ -17,6 +17,7 @@
 #include <vsprintf.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #define REV_CHIPID_SHIFT		16
 #define REV_CHIPID_MASK			(0xffff << REV_CHIPID_SHIFT)
diff --git a/drivers/cpu/cpu-uclass.c b/drivers/cpu/cpu-uclass.c
index 58c8f833c6f..7aac150b12c 100644
--- a/drivers/cpu/cpu-uclass.c
+++ b/drivers/cpu/cpu-uclass.c
@@ -12,6 +12,7 @@
 #include <dm/lists.h>
 #include <dm/root.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 int cpu_probe_all(void)
diff --git a/drivers/cpu/imx8_cpu.c b/drivers/cpu/imx8_cpu.c
index 2ebb2819488..0c660f81227 100644
--- a/drivers/cpu/imx8_cpu.c
+++ b/drivers/cpu/imx8_cpu.c
@@ -16,6 +16,7 @@
 #include <asm/arch-imx/cpu.h>
 #include <asm/armv8/cpu.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/cpu/mpc83xx_cpu.c b/drivers/cpu/mpc83xx_cpu.c
index 6929b6cf45b..126ae6cf7ae 100644
--- a/drivers/cpu/mpc83xx_cpu.c
+++ b/drivers/cpu/mpc83xx_cpu.c
@@ -13,6 +13,7 @@
 #include <vsprintf.h>
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #include "mpc83xx_cpu.h"
 
diff --git a/drivers/cpu/riscv_cpu.c b/drivers/cpu/riscv_cpu.c
index fcf487d73d0..2fd18901dd4 100644
--- a/drivers/cpu/riscv_cpu.c
+++ b/drivers/cpu/riscv_cpu.c
@@ -15,6 +15,7 @@
 #include <dm/lists.h>
 #include <linux/bitops.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/crypto/fsl/fsl_rsa.c b/drivers/crypto/fsl/fsl_rsa.c
index ed2a54f6ec2..2658f8c0434 100644
--- a/drivers/crypto/fsl/fsl_rsa.c
+++ b/drivers/crypto/fsl/fsl_rsa.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <asm/types.h>
 #include <malloc.h>
+#include <linux/errno.h>
 #include "jobdesc.h"
 #include "desc.h"
 #include "jr.h"
diff --git a/drivers/crypto/fsl/jr.c b/drivers/crypto/fsl/jr.c
index 9e31e92024c..9ac4817d448 100644
--- a/drivers/crypto/fsl/jr.c
+++ b/drivers/crypto/fsl/jr.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <linux/kernel.h>
 #include <log.h>
 #include <malloc.h>
diff --git a/drivers/crypto/fsl/rng.c b/drivers/crypto/fsl/rng.c
index e4a952caeec..77f8e8a055f 100644
--- a/drivers/crypto/fsl/rng.c
+++ b/drivers/crypto/fsl/rng.c
@@ -11,6 +11,7 @@
 #include <cpu_func.h>
 #include <dm.h>
 #include <rng.h>
+#include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include "desc_constr.h"
diff --git a/drivers/crypto/rsa_mod_exp/mod_exp_uclass.c b/drivers/crypto/rsa_mod_exp/mod_exp_uclass.c
index f5ae35e1325..8997980caca 100644
--- a/drivers/crypto/rsa_mod_exp/mod_exp_uclass.c
+++ b/drivers/crypto/rsa_mod_exp/mod_exp_uclass.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <u-boot/rsa-mod-exp.h>
 #include <errno.h>
 #include <fdtdec.h>
diff --git a/drivers/ddr/altera/sdram_agilex.c b/drivers/ddr/altera/sdram_agilex.c
index 771820941aa..8cc648bc98e 100644
--- a/drivers/ddr/altera/sdram_agilex.c
+++ b/drivers/ddr/altera/sdram_agilex.c
@@ -16,6 +16,7 @@
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 #include "sdram_soc64.h"
 #include <wait_bit.h>
 #include <asm/arch/firewall.h>
diff --git a/drivers/ddr/altera/sdram_arria10.c b/drivers/ddr/altera/sdram_arria10.c
index 488f950dfcf..7d51bfd83c5 100644
--- a/drivers/ddr/altera/sdram_arria10.c
+++ b/drivers/ddr/altera/sdram_arria10.c
@@ -23,6 +23,7 @@
 #include <asm/arch/sdram.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
 
diff --git a/drivers/ddr/altera/sdram_gen5.c b/drivers/ddr/altera/sdram_gen5.c
index 01857f29256..bc20fa09645 100644
--- a/drivers/ddr/altera/sdram_gen5.c
+++ b/drivers/ddr/altera/sdram_gen5.c
@@ -19,6 +19,7 @@
 #include <asm/bitops.h>
 #include <asm/io.h>
 #include <dm/device_compat.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include "sequencer.h"
diff --git a/drivers/ddr/altera/sdram_soc64.c b/drivers/ddr/altera/sdram_soc64.c
index 03ca6b58cfc..778528bf863 100644
--- a/drivers/ddr/altera/sdram_soc64.c
+++ b/drivers/ddr/altera/sdram_soc64.c
@@ -19,6 +19,7 @@
 #include <time.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include "sdram_soc64.h"
 #include <wait_bit.h>
diff --git a/drivers/ddr/altera/sequencer.c b/drivers/ddr/altera/sequencer.c
index 7c54f001825..8d62f02660d 100644
--- a/drivers/ddr/altera/sequencer.c
+++ b/drivers/ddr/altera/sequencer.c
@@ -9,6 +9,7 @@
 #include <asm/arch/sdram.h>
 #include <errno.h>
 #include <hang.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include "sequencer.h"
 
diff --git a/drivers/demo/demo-shape.c b/drivers/demo/demo-shape.c
index 3e1f79aee50..f35bc3e1492 100644
--- a/drivers/demo/demo-shape.c
+++ b/drivers/demo/demo-shape.c
@@ -14,6 +14,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/demo/demo-uclass.c b/drivers/demo/demo-uclass.c
index 5856a9891e8..cf85bf24a3f 100644
--- a/drivers/demo/demo-uclass.c
+++ b/drivers/demo/demo-uclass.c
@@ -15,6 +15,7 @@
 #include <malloc.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <linux/errno.h>
 #include <linux/list.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/dfu/dfu.c b/drivers/dfu/dfu.c
index dad6b5a1e36..4cc2be16bb3 100644
--- a/drivers/dfu/dfu.c
+++ b/drivers/dfu/dfu.c
@@ -17,6 +17,7 @@
 #include <hash.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/errno.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 d34456c82f2..94989c2ba23 100644
--- a/drivers/dfu/dfu_mmc.c
+++ b/drivers/dfu/dfu_mmc.c
@@ -18,6 +18,7 @@
 #include <part.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/dfu/dfu_mtd.c b/drivers/dfu/dfu_mtd.c
index 679c7713fba..b93d9987374 100644
--- a/drivers/dfu/dfu_mtd.c
+++ b/drivers/dfu/dfu_mtd.c
@@ -14,6 +14,7 @@
 #include <vsprintf.h>
 #include <jffs2/load_kernel.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 static bool mtd_is_aligned_with_block_size(struct mtd_info *mtd, u64 size)
diff --git a/drivers/dfu/dfu_ram.c b/drivers/dfu/dfu_ram.c
index 969468e7e41..55c3dc9eb19 100644
--- a/drivers/dfu/dfu_ram.c
+++ b/drivers/dfu/dfu_ram.c
@@ -13,6 +13,7 @@
 #include <errno.h>
 #include <dfu.h>
 #include <vsprintf.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/dfu/dfu_sf.c b/drivers/dfu/dfu_sf.c
index c6c5328602e..3d0a4f98971 100644
--- a/drivers/dfu/dfu_sf.c
+++ b/drivers/dfu/dfu_sf.c
@@ -14,6 +14,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <jffs2/load_kernel.h>
+#include <linux/errno.h>
 #include <linux/mtd/mtd.h>
 #include <linux/string.h>
 
diff --git a/drivers/dfu/dfu_tftp.c b/drivers/dfu/dfu_tftp.c
index efa25d86f22..61efb11a545 100644
--- a/drivers/dfu/dfu_tftp.c
+++ b/drivers/dfu/dfu_tftp.c
@@ -9,6 +9,7 @@
 #include <malloc.h>
 #include <errno.h>
 #include <dfu.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/dma/bcm6348-iudma.c b/drivers/dma/bcm6348-iudma.c
index ceb8de9b8af..e1130f8f9fb 100644
--- a/drivers/dma/bcm6348-iudma.c
+++ b/drivers/dma/bcm6348-iudma.c
@@ -28,6 +28,7 @@
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 #define DMA_RX_DESC	6
diff --git a/drivers/dma/dma-uclass.c b/drivers/dma/dma-uclass.c
index 79fbfa87d12..cc872831b5f 100644
--- a/drivers/dma/dma-uclass.c
+++ b/drivers/dma/dma-uclass.c
@@ -19,6 +19,7 @@
 #include <dma-uclass.h>
 #include <dt-structs.h>
 #include <errno.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 #ifdef CONFIG_DMA_CHANNELS
diff --git a/drivers/dma/lpc32xx_dma.c b/drivers/dma/lpc32xx_dma.c
index 3fd56053fae..7078d3e7c6a 100644
--- a/drivers/dma/lpc32xx_dma.c
+++ b/drivers/dma/lpc32xx_dma.c
@@ -18,6 +18,7 @@
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 /* DMA controller channel register structure */
diff --git a/drivers/dma/sandbox-dma-test.c b/drivers/dma/sandbox-dma-test.c
index 6e02e8ff6e3..9a6904cd634 100644
--- a/drivers/dma/sandbox-dma-test.c
+++ b/drivers/dma/sandbox-dma-test.c
@@ -16,6 +16,7 @@
 #include <dma-uclass.h>
 #include <dt-structs.h>
 #include <errno.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/dma/ti/k3-psil.c b/drivers/dma/ti/k3-psil.c
index b5c92b28293..56da1e605c3 100644
--- a/drivers/dma/ti/k3-psil.c
+++ b/drivers/dma/ti/k3-psil.c
@@ -4,6 +4,7 @@
  *  Author: Peter Ujfalusi <peter.ujfalusi@ti.com>
  */
 
+#include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/err.h>
 
diff --git a/drivers/dma/ti/k3-udma.c b/drivers/dma/ti/k3-udma.c
index 15be04b0898..0b6de5bbbcc 100644
--- a/drivers/dma/ti/k3-udma.c
+++ b/drivers/dma/ti/k3-udma.c
@@ -26,6 +26,7 @@
 #include <linux/delay.h>
 #include <linux/bitmap.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/soc/ti/k3-navss-ringacc.h>
 #include <linux/soc/ti/cppi5.h>
diff --git a/drivers/fastboot/fb_common.c b/drivers/fastboot/fb_common.c
index dfa383de57d..74a5bce22f7 100644
--- a/drivers/fastboot/fb_common.c
+++ b/drivers/fastboot/fb_common.c
@@ -17,6 +17,7 @@
 #include <stdarg.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <net/fastboot.h>
 
diff --git a/drivers/fastboot/fb_getvar.c b/drivers/fastboot/fb_getvar.c
index 448840ae4fe..b8f4938f9d5 100644
--- a/drivers/fastboot/fb_getvar.c
+++ b/drivers/fastboot/fb_getvar.c
@@ -13,6 +13,7 @@
 #include <part.h>
 #include <version.h>
 #include <vsprintf.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/fastboot/fb_mmc.c b/drivers/fastboot/fb_mmc.c
index 5dc58f00a75..37cef1890f2 100644
--- a/drivers/fastboot/fb_mmc.c
+++ b/drivers/fastboot/fb_mmc.c
@@ -20,6 +20,7 @@
 #include <stdio.h>
 #include <linux/compat.h>
 #include <android_image.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/fastboot/fb_nand.c b/drivers/fastboot/fb_nand.c
index 43158063116..074aa2aeb2b 100644
--- a/drivers/fastboot/fb_nand.c
+++ b/drivers/fastboot/fb_nand.c
@@ -9,6 +9,7 @@
 #include <blk.h>
 #include <flash.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/firmware/firmware-zynqmp.c b/drivers/firmware/firmware-zynqmp.c
index b4f8dba9604..01d5ac72f8f 100644
--- a/drivers/firmware/firmware-zynqmp.c
+++ b/drivers/firmware/firmware-zynqmp.c
@@ -13,6 +13,7 @@
 #include <zynqmp_firmware.h>
 #include <asm/cache.h>
 #include <asm/ptrace.h>
+#include <linux/errno.h>
 
 #if defined(CONFIG_ZYNQMP_IPI)
 #include <mailbox.h>
diff --git a/drivers/firmware/ti_sci.c b/drivers/firmware/ti_sci.c
index 1a38526d80a..d2e1be9c994 100644
--- a/drivers/firmware/ti_sci.c
+++ b/drivers/firmware/ti_sci.c
@@ -19,6 +19,7 @@
 #include <linux/bitops.h>
 #include <linux/compat.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/soc/ti/k3-sec-proxy.h>
 #include <linux/soc/ti/ti_sci_protocol.h>
 #include <linux/string.h>
diff --git a/drivers/fpga/altera.c b/drivers/fpga/altera.c
index 7f7d768c5cb..9908630c2d4 100644
--- a/drivers/fpga/altera.c
+++ b/drivers/fpga/altera.c
@@ -16,6 +16,7 @@
 #include <log.h>
 #include <stdio.h>
 #include <stratixII.h>
+#include <linux/errno.h>
 
 /* Define FPGA_DEBUG to 1 to get debug printf's */
 #define FPGA_DEBUG	0
diff --git a/drivers/fpga/socfpga_arria10.c b/drivers/fpga/socfpga_arria10.c
index 10d57a90f56..cd70cd922f3 100644
--- a/drivers/fpga/socfpga_arria10.c
+++ b/drivers/fpga/socfpga_arria10.c
@@ -23,6 +23,7 @@
 #include <watchdog.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #define CFGWDTH_32	1
diff --git a/drivers/fpga/stratix10.c b/drivers/fpga/stratix10.c
index 81a3c35d9eb..e4a513171eb 100644
--- a/drivers/fpga/stratix10.c
+++ b/drivers/fpga/stratix10.c
@@ -10,6 +10,7 @@
 #include <time.h>
 #include <asm/arch/mailbox_s10.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #define RECONFIG_STATUS_POLL_RESP_TIMEOUT_MS		60000
diff --git a/drivers/gpio/74x164_gpio.c b/drivers/gpio/74x164_gpio.c
index 81666c83a59..a6d360a04e1 100644
--- a/drivers/gpio/74x164_gpio.c
+++ b/drivers/gpio/74x164_gpio.c
@@ -20,6 +20,7 @@
 #include <dm/device_compat.h>
 #include <dt-bindings/gpio/gpio.h>
 #include <spi.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/gpio/atmel_pio4.c b/drivers/gpio/atmel_pio4.c
index b82fe74a62b..9b291ae976a 100644
--- a/drivers/gpio/atmel_pio4.c
+++ b/drivers/gpio/atmel_pio4.c
@@ -15,6 +15,7 @@
 #include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <mach/gpio.h>
 #include <mach/atmel_pio4.h>
 
diff --git a/drivers/gpio/axp_gpio.c b/drivers/gpio/axp_gpio.c
index 88993b643e2..76008670e0b 100644
--- a/drivers/gpio/axp_gpio.c
+++ b/drivers/gpio/axp_gpio.c
@@ -15,6 +15,7 @@
 #include <dm/lists.h>
 #include <dm/root.h>
 #include <errno.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 static int axp_gpio_set_value(struct udevice *dev, unsigned pin, int val);
diff --git a/drivers/gpio/bcm2835_gpio.c b/drivers/gpio/bcm2835_gpio.c
index 0dff9ac711d..c7d120246fc 100644
--- a/drivers/gpio/bcm2835_gpio.c
+++ b/drivers/gpio/bcm2835_gpio.c
@@ -11,6 +11,7 @@
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <fdtdec.h>
+#include <linux/errno.h>
 
 struct bcm2835_gpios {
 	struct bcm2835_gpio_regs *reg;
diff --git a/drivers/gpio/bcm6345_gpio.c b/drivers/gpio/bcm6345_gpio.c
index 5da11d988e0..5eaad77dcb6 100644
--- a/drivers/gpio/bcm6345_gpio.c
+++ b/drivers/gpio/bcm6345_gpio.c
@@ -13,6 +13,7 @@
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 struct bcm6345_gpio_priv {
 	void __iomem *reg_dirout;
diff --git a/drivers/gpio/cortina_gpio.c b/drivers/gpio/cortina_gpio.c
index 055907c1a1d..3b093c87568 100644
--- a/drivers/gpio/cortina_gpio.c
+++ b/drivers/gpio/cortina_gpio.c
@@ -13,6 +13,7 @@
 #include <linux/bitops.h>
 #include <linux/compat.h>
 #include <linux/compiler.h>
+#include <linux/errno.h>
 
 /* GPIO Register Map */
 #define CORTINA_GPIO_CFG	0x00
diff --git a/drivers/gpio/da8xx_gpio.c b/drivers/gpio/da8xx_gpio.c
index dd7506ff177..d38a3f75bc5 100644
--- a/drivers/gpio/da8xx_gpio.c
+++ b/drivers/gpio/da8xx_gpio.c
@@ -15,6 +15,7 @@
 #include <asm/io.h>
 #include <asm/gpio.h>
 #include <dt-bindings/gpio/gpio.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include "da8xx_gpio.h"
diff --git a/drivers/gpio/dwapb_gpio.c b/drivers/gpio/dwapb_gpio.c
index e5e35181940..3ab3b399c6b 100644
--- a/drivers/gpio/dwapb_gpio.c
+++ b/drivers/gpio/dwapb_gpio.c
@@ -20,6 +20,7 @@
 #include <errno.h>
 #include <reset.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #define GPIO_SWPORT_DR(p)	(0x00 + (p) * 0xc)
 #define GPIO_SWPORT_DDR(p)	(0x04 + (p) * 0xc)
diff --git a/drivers/gpio/gpio-rza1.c b/drivers/gpio/gpio-rza1.c
index aa600e483a6..6407727b453 100644
--- a/drivers/gpio/gpio-rza1.c
+++ b/drivers/gpio/gpio-rza1.c
@@ -11,6 +11,7 @@
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #define P(bank)			(0x0000 + (bank) * 4)
 #define PSR(bank)		(0x0100 + (bank) * 4)
diff --git a/drivers/gpio/gpio-uclass.c b/drivers/gpio/gpio-uclass.c
index b4501da67d1..44ba2ac2b3c 100644
--- a/drivers/gpio/gpio-uclass.c
+++ b/drivers/gpio/gpio-uclass.c
@@ -22,6 +22,7 @@
 #include <dm/device_compat.h>
 #include <linux/bug.h>
 #include <linux/ctype.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/gpio/hi6220_gpio.c b/drivers/gpio/hi6220_gpio.c
index 49236c97722..eb369195c8d 100644
--- a/drivers/gpio/hi6220_gpio.c
+++ b/drivers/gpio/hi6220_gpio.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <errno.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 static int hi6220_gpio_direction_input(struct udevice *dev, unsigned int gpio)
diff --git a/drivers/gpio/hsdk-creg-gpio.c b/drivers/gpio/hsdk-creg-gpio.c
index d9df804f639..82ce0a813ba 100644
--- a/drivers/gpio/hsdk-creg-gpio.c
+++ b/drivers/gpio/hsdk-creg-gpio.c
@@ -16,6 +16,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 #define DRV_NAME	"gpio_creg"
diff --git a/drivers/gpio/imx_rgpio2p.c b/drivers/gpio/imx_rgpio2p.c
index 60b8e8e25ac..fe171af18c5 100644
--- a/drivers/gpio/imx_rgpio2p.c
+++ b/drivers/gpio/imx_rgpio2p.c
@@ -13,6 +13,7 @@
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <malloc.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 enum imx_rgpio2p_direction {
diff --git a/drivers/gpio/intel_broadwell_gpio.c b/drivers/gpio/intel_broadwell_gpio.c
index 4323f0ba760..4fc345c755e 100644
--- a/drivers/gpio/intel_broadwell_gpio.c
+++ b/drivers/gpio/intel_broadwell_gpio.c
@@ -18,6 +18,7 @@
 #include <asm/pci.h>
 #include <asm/arch/gpio.h>
 #include <dt-bindings/gpio/x86-gpio.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/gpio/intel_gpio.c b/drivers/gpio/intel_gpio.c
index 975293ff3ab..360ec685249 100644
--- a/drivers/gpio/intel_gpio.c
+++ b/drivers/gpio/intel_gpio.c
@@ -22,6 +22,7 @@
 #include <asm/arch/gpio.h>
 #include <dm/acpi.h>
 #include <dt-bindings/gpio/x86-gpio.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 static int intel_gpio_direction_input(struct udevice *dev, uint offset)
diff --git a/drivers/gpio/intel_ich6_gpio.c b/drivers/gpio/intel_ich6_gpio.c
index 4a2757d1ac6..b3df925c756 100644
--- a/drivers/gpio/intel_ich6_gpio.c
+++ b/drivers/gpio/intel_ich6_gpio.c
@@ -38,6 +38,7 @@
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <asm/pci.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/gpio/iproc_gpio.c b/drivers/gpio/iproc_gpio.c
index cc26a1306b6..50eb95d2522 100644
--- a/drivers/gpio/iproc_gpio.c
+++ b/drivers/gpio/iproc_gpio.c
@@ -11,6 +11,7 @@
 #include <dm/device_compat.h>
 #include <dm/devres.h>
 #include <dm/pinctrl.h>
+#include <linux/errno.h>
 
 /*
  * There are five GPIO bank register. Each bank can configure max of 32 gpios.
diff --git a/drivers/gpio/mpc83xx_spisel_boot.c b/drivers/gpio/mpc83xx_spisel_boot.c
index d818954ce29..34705769cbf 100644
--- a/drivers/gpio/mpc83xx_spisel_boot.c
+++ b/drivers/gpio/mpc83xx_spisel_boot.c
@@ -10,6 +10,7 @@
 #include <mapmem.h>
 #include <vsprintf.h>
 #include <asm/gpio.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 struct mpc83xx_spisel_boot {
diff --git a/drivers/gpio/mpc8xxx_gpio.c b/drivers/gpio/mpc8xxx_gpio.c
index 20ad373d023..6959f1c5d62 100644
--- a/drivers/gpio/mpc8xxx_gpio.c
+++ b/drivers/gpio/mpc8xxx_gpio.c
@@ -13,6 +13,7 @@
 #include <mapmem.h>
 #include <vsprintf.h>
 #include <asm/gpio.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 struct ccsr_gpio {
diff --git a/drivers/gpio/mscc_sgpio.c b/drivers/gpio/mscc_sgpio.c
index 780d77b2f86..0133e14bb73 100644
--- a/drivers/gpio/mscc_sgpio.c
+++ b/drivers/gpio/mscc_sgpio.c
@@ -17,6 +17,7 @@
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 
 #define MSCC_SGPIOS_PER_BANK	32
 #define MSCC_SGPIO_BANK_DEPTH	4
diff --git a/drivers/gpio/msm_gpio.c b/drivers/gpio/msm_gpio.c
index 710994b4e12..d0877485085 100644
--- a/drivers/gpio/msm_gpio.c
+++ b/drivers/gpio/msm_gpio.c
@@ -11,6 +11,7 @@
 #include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/gpio/mt7621_gpio.c b/drivers/gpio/mt7621_gpio.c
index 612413e17bc..e569c67a615 100644
--- a/drivers/gpio/mt7621_gpio.c
+++ b/drivers/gpio/mt7621_gpio.c
@@ -13,6 +13,7 @@
 #include <fdtdec.h>
 #include <malloc.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
diff --git a/drivers/gpio/mxc_gpio.c b/drivers/gpio/mxc_gpio.c
index 1334e156654..fd64a7abadf 100644
--- a/drivers/gpio/mxc_gpio.c
+++ b/drivers/gpio/mxc_gpio.c
@@ -14,6 +14,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 enum mxc_gpio_direction {
diff --git a/drivers/gpio/pca953x_gpio.c b/drivers/gpio/pca953x_gpio.c
index e5fbd291377..1f7563531e7 100644
--- a/drivers/gpio/pca953x_gpio.c
+++ b/drivers/gpio/pca953x_gpio.c
@@ -30,6 +30,7 @@
 #include <dm/device_compat.h>
 #include <dt-bindings/gpio/gpio.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #define PCA953X_INPUT           0
diff --git a/drivers/gpio/pic32_gpio.c b/drivers/gpio/pic32_gpio.c
index 7a98469de46..a4352ec8ba8 100644
--- a/drivers/gpio/pic32_gpio.c
+++ b/drivers/gpio/pic32_gpio.c
@@ -14,6 +14,7 @@
 #include <asm/gpio.h>
 #include <linux/bitops.h>
 #include <linux/compat.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <mach/pic32.h>
 
diff --git a/drivers/gpio/pm8916_gpio.c b/drivers/gpio/pm8916_gpio.c
index 58f044678b7..de150c44a54 100644
--- a/drivers/gpio/pm8916_gpio.c
+++ b/drivers/gpio/pm8916_gpio.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <linux/errno.h>
 #include <power/pmic.h>
 #include <spmi/spmi.h>
 #include <asm/io.h>
diff --git a/drivers/gpio/s5p_gpio.c b/drivers/gpio/s5p_gpio.c
index 14f262739d2..0d87c6be7f2 100644
--- a/drivers/gpio/s5p_gpio.c
+++ b/drivers/gpio/s5p_gpio.c
@@ -14,6 +14,7 @@
 #include <asm/io.h>
 #include <asm/gpio.h>
 #include <dm/device-internal.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/gpio/sandbox.c b/drivers/gpio/sandbox.c
index df4ca043ac1..acbc6495c83 100644
--- a/drivers/gpio/sandbox.c
+++ b/drivers/gpio/sandbox.c
@@ -19,6 +19,7 @@
 #include <dm/pinctrl.h>
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/gpio/sandbox-gpio.h>
+#include <linux/errno.h>
 
 
 struct gpio_state {
diff --git a/drivers/gpio/sifive-gpio.c b/drivers/gpio/sifive-gpio.c
index e7dbeea400d..76e3c702e21 100644
--- a/drivers/gpio/sifive-gpio.c
+++ b/drivers/gpio/sifive-gpio.c
@@ -13,6 +13,7 @@
 #include <errno.h>
 #include <asm/gpio.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 static int sifive_gpio_probe(struct udevice *dev)
diff --git a/drivers/gpio/spear_gpio.c b/drivers/gpio/spear_gpio.c
index 4e4cd125457..2aed08781d7 100644
--- a/drivers/gpio/spear_gpio.c
+++ b/drivers/gpio/spear_gpio.c
@@ -13,6 +13,7 @@
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <errno.h>
+#include <linux/errno.h>
 
 static int gpio_direction(unsigned gpio,
 			  enum gpio_direction direction)
diff --git a/drivers/gpio/sunxi_gpio.c b/drivers/gpio/sunxi_gpio.c
index 20a60fe8b07..d7ba86cc151 100644
--- a/drivers/gpio/sunxi_gpio.c
+++ b/drivers/gpio/sunxi_gpio.c
@@ -20,6 +20,7 @@
 #include <asm/gpio.h>
 #include <dm/device-internal.h>
 #include <dt-bindings/gpio/gpio.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #define SUNXI_GPIOS_PER_BANK	SUNXI_GPIO_A_NR
diff --git a/drivers/gpio/tegra186_gpio.c b/drivers/gpio/tegra186_gpio.c
index 6626b5415a3..cf973e2d7f2 100644
--- a/drivers/gpio/tegra186_gpio.c
+++ b/drivers/gpio/tegra186_gpio.c
@@ -14,6 +14,7 @@
 #include <asm/gpio.h>
 #include <dm/device-internal.h>
 #include <dt-bindings/gpio/gpio.h>
+#include <linux/errno.h>
 #include "tegra186_gpio_priv.h"
 
 struct tegra186_gpio_port_data {
diff --git a/drivers/gpio/tegra_gpio.c b/drivers/gpio/tegra_gpio.c
index 912577a5719..c002e6864dd 100644
--- a/drivers/gpio/tegra_gpio.c
+++ b/drivers/gpio/tegra_gpio.c
@@ -22,6 +22,7 @@
 #include <asm/gpio.h>
 #include <dm/device-internal.h>
 #include <dt-bindings/gpio/gpio.h>
+#include <linux/errno.h>
 
 static const int CONFIG_SFIO = 0;
 static const int CONFIG_GPIO = 1;
diff --git a/drivers/gpio/vybrid_gpio.c b/drivers/gpio/vybrid_gpio.c
index 82ae6d88941..99f5d07cca0 100644
--- a/drivers/gpio/vybrid_gpio.c
+++ b/drivers/gpio/vybrid_gpio.c
@@ -13,6 +13,7 @@
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/io.h>
 #include <malloc.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/gpio/xilinx_gpio.c b/drivers/gpio/xilinx_gpio.c
index 6ee0757e03c..2fb39ca0382 100644
--- a/drivers/gpio/xilinx_gpio.c
+++ b/drivers/gpio/xilinx_gpio.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <linux/list.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
diff --git a/drivers/hwspinlock/hwspinlock-uclass.c b/drivers/hwspinlock/hwspinlock-uclass.c
index 6100fdfd0a5..14bfc6ae1b6 100644
--- a/drivers/hwspinlock/hwspinlock-uclass.c
+++ b/drivers/hwspinlock/hwspinlock-uclass.c
@@ -13,6 +13,7 @@
 #include <dm/device-internal.h>
 #include <dm/device_compat.h>
 #include <linux/compat.h>
+#include <linux/errno.h>
 
 static inline const struct hwspinlock_ops *
 hwspinlock_dev_ops(struct udevice *dev)
diff --git a/drivers/hwspinlock/stm32_hwspinlock.c b/drivers/hwspinlock/stm32_hwspinlock.c
index 8be585a0c86..ea54063c19b 100644
--- a/drivers/hwspinlock/stm32_hwspinlock.c
+++ b/drivers/hwspinlock/stm32_hwspinlock.c
@@ -10,6 +10,7 @@
 #include <malloc.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #define STM32_MUTEX_COREID	BIT(8)
 #define STM32_MUTEX_LOCK_BIT	BIT(31)
diff --git a/drivers/i2c/ast_i2c.c b/drivers/i2c/ast_i2c.c
index 214362d04bb..f0d830e5636 100644
--- a/drivers/i2c/ast_i2c.c
+++ b/drivers/i2c/ast_i2c.c
@@ -16,6 +16,7 @@
 #include <asm/arch/scu_ast2500.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 
 #include "ast_i2c.h"
 
diff --git a/drivers/i2c/at91_i2c.c b/drivers/i2c/at91_i2c.c
index 57fbb0ce262..b825599dba5 100644
--- a/drivers/i2c/at91_i2c.c
+++ b/drivers/i2c/at91_i2c.c
@@ -16,6 +16,7 @@
 #include <fdtdec.h>
 #include <i2c.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <mach/clk.h>
 
 #include "at91_i2c.h"
diff --git a/drivers/i2c/cros_ec_ldo.c b/drivers/i2c/cros_ec_ldo.c
index c593540ac13..13b9973b543 100644
--- a/drivers/i2c/cros_ec_ldo.c
+++ b/drivers/i2c/cros_ec_ldo.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <i2c.h>
 #include <log.h>
+#include <linux/errno.h>
 #include <power/tps65090.h>
 
 static int cros_ec_ldo_set_bus_speed(struct udevice *dev, unsigned int speed)
diff --git a/drivers/i2c/davinci_i2c.c b/drivers/i2c/davinci_i2c.c
index b4bd22fcc85..694172106c1 100644
--- a/drivers/i2c/davinci_i2c.c
+++ b/drivers/i2c/davinci_i2c.c
@@ -20,6 +20,7 @@
 #include <asm/arch/i2c_defs.h>
 #include <asm/io.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include "davinci_i2c.h"
 
 #ifdef CONFIG_DM_I2C
diff --git a/drivers/i2c/designware_i2c.c b/drivers/i2c/designware_i2c.c
index 6ea5a31160b..e32bfbc2c29 100644
--- a/drivers/i2c/designware_i2c.c
+++ b/drivers/i2c/designware_i2c.c
@@ -16,6 +16,7 @@
 #include <time.h>
 #include <asm/io.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include "designware_i2c.h"
 #include <dm/device_compat.h>
 #include <linux/err.h>
diff --git a/drivers/i2c/designware_i2c_pci.c b/drivers/i2c/designware_i2c_pci.c
index 946506b89b2..50649710aae 100644
--- a/drivers/i2c/designware_i2c_pci.c
+++ b/drivers/i2c/designware_i2c_pci.c
@@ -16,6 +16,7 @@
 #include <dm/acpi.h>
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
+#include <linux/errno.h>
 #include "designware_i2c.h"
 
 enum {
diff --git a/drivers/i2c/exynos_hs_i2c.c b/drivers/i2c/exynos_hs_i2c.c
index 34d10abde06..c334755a276 100644
--- a/drivers/i2c/exynos_hs_i2c.c
+++ b/drivers/i2c/exynos_hs_i2c.c
@@ -15,6 +15,7 @@
 #include <asm/arch/pinmux.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include "s3c24x0_i2c.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/i2c/fsl_i2c.c b/drivers/i2c/fsl_i2c.c
index 9be7587261c..dad4a5549c1 100644
--- a/drivers/i2c/fsl_i2c.c
+++ b/drivers/i2c/fsl_i2c.c
@@ -19,6 +19,7 @@
 #include <mapmem.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 /* The maximum number of microseconds we will wait until another master has
diff --git a/drivers/i2c/i2c-cortina.c b/drivers/i2c/i2c-cortina.c
index 4575ab6c40c..aa7f3a0264e 100644
--- a/drivers/i2c/i2c-cortina.c
+++ b/drivers/i2c/i2c-cortina.c
@@ -12,6 +12,7 @@
 #include <asm/io.h>
 #include <dm.h>
 #include <mapmem.h>
+#include <linux/errno.h>
 #include "i2c-cortina.h"
 
 static void set_speed(struct i2c_regs *regs, int i2c_spd)
diff --git a/drivers/i2c/i2c-gpio.c b/drivers/i2c/i2c-gpio.c
index fe90abd24a6..c29e5d7def0 100644
--- a/drivers/i2c/i2c-gpio.c
+++ b/drivers/i2c/i2c-gpio.c
@@ -13,6 +13,7 @@
 #include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 #define DEFAULT_UDELAY	5
diff --git a/drivers/i2c/i2c-uclass.c b/drivers/i2c/i2c-uclass.c
index 3b7db392b67..9e2d5dd0b12 100644
--- a/drivers/i2c/i2c-uclass.c
+++ b/drivers/i2c/i2c-uclass.c
@@ -18,6 +18,7 @@
 #include <asm/gpio.h>
 #endif
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #define I2C_MAX_OFFSET_LEN	4
diff --git a/drivers/i2c/i2c-versatile.c b/drivers/i2c/i2c-versatile.c
index 62831522bd3..f78b12a560c 100644
--- a/drivers/i2c/i2c-versatile.c
+++ b/drivers/i2c/i2c-versatile.c
@@ -13,6 +13,7 @@
 #include <clk.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 
 #define I2C_CONTROL_REG		0x00
diff --git a/drivers/i2c/ihs_i2c.c b/drivers/i2c/ihs_i2c.c
index f6cd1222b87..31e8cc5d8eb 100644
--- a/drivers/i2c/ihs_i2c.c
+++ b/drivers/i2c/ihs_i2c.c
@@ -17,6 +17,7 @@
 #include <asm/unaligned.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #ifdef CONFIG_DM_I2C
diff --git a/drivers/i2c/imx_lpi2c.c b/drivers/i2c/imx_lpi2c.c
index eeb35e050b7..f7186639d18 100644
--- a/drivers/i2c/imx_lpi2c.c
+++ b/drivers/i2c/imx_lpi2c.c
@@ -17,6 +17,7 @@
 #include <fdtdec.h>
 #include <i2c.h>
 #include <dm/device_compat.h>
+#include <linux/errno.h>
 
 #define LPI2C_FIFO_SIZE 4
 #define LPI2C_NACK_TOUT_MS 1
diff --git a/drivers/i2c/intel_i2c.c b/drivers/i2c/intel_i2c.c
index 57ff9ec2a4a..cbda069131a 100644
--- a/drivers/i2c/intel_i2c.c
+++ b/drivers/i2c/intel_i2c.c
@@ -16,6 +16,7 @@
 #include <time.h>
 #include <vsprintf.h>
 #include <asm/io.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 /* PCI Configuration Space (D31:F3): SMBus */
diff --git a/drivers/i2c/iproc_i2c.c b/drivers/i2c/iproc_i2c.c
index 4231c0c617f..b5d865d66ba 100644
--- a/drivers/i2c/iproc_i2c.c
+++ b/drivers/i2c/iproc_i2c.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <config.h>
 #include <dm.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include "errno.h"
 #include <i2c.h>
diff --git a/drivers/i2c/meson_i2c.c b/drivers/i2c/meson_i2c.c
index b133aa1175e..051b238e166 100644
--- a/drivers/i2c/meson_i2c.c
+++ b/drivers/i2c/meson_i2c.c
@@ -12,6 +12,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 
 #define I2C_TIMEOUT_MS		100
 
diff --git a/drivers/i2c/muxes/i2c-arb-gpio-challenge.c b/drivers/i2c/muxes/i2c-arb-gpio-challenge.c
index 14ead6e2753..2b9e0ba585a 100644
--- a/drivers/i2c/muxes/i2c-arb-gpio-challenge.c
+++ b/drivers/i2c/muxes/i2c-arb-gpio-challenge.c
@@ -15,6 +15,7 @@
 #include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/i2c/muxes/i2c-mux-uclass.c b/drivers/i2c/muxes/i2c-mux-uclass.c
index 8f6d1547f16..1af7b68e205 100644
--- a/drivers/i2c/muxes/i2c-mux-uclass.c
+++ b/drivers/i2c/muxes/i2c-mux-uclass.c
@@ -12,6 +12,7 @@
 #include <malloc.h>
 #include <dm/lists.h>
 #include <dm/root.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 /**
diff --git a/drivers/i2c/muxes/pca954x.c b/drivers/i2c/muxes/pca954x.c
index 87e9f9cb21d..3140a1abb6c 100644
--- a/drivers/i2c/muxes/pca954x.c
+++ b/drivers/i2c/muxes/pca954x.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 
 #include <asm-generic/gpio.h>
 
diff --git a/drivers/i2c/mv_i2c.c b/drivers/i2c/mv_i2c.c
index 1850dc6a567..37d04bf11e9 100644
--- a/drivers/i2c/mv_i2c.c
+++ b/drivers/i2c/mv_i2c.c
@@ -23,6 +23,7 @@
 #include <stdio.h>
 #include <asm/io.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include "mv_i2c.h"
 
diff --git a/drivers/i2c/nx_i2c.c b/drivers/i2c/nx_i2c.c
index af58c2c76ef..738796788af 100644
--- a/drivers/i2c/nx_i2c.c
+++ b/drivers/i2c/nx_i2c.c
@@ -9,6 +9,7 @@
 #include <asm/arch/clk.h>
 #include <asm/arch/nx_gpio.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 #define I2C_WRITE       0
 #define I2C_READ        1
diff --git a/drivers/i2c/octeon_i2c.c b/drivers/i2c/octeon_i2c.c
index ef04ae5698a..19b7622b418 100644
--- a/drivers/i2c/octeon_i2c.c
+++ b/drivers/i2c/octeon_i2c.c
@@ -13,6 +13,7 @@
 #include <linux/bitfield.h>
 #include <linux/compat.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 #define TWSI_SW_TWSI		0x00
 #define TWSI_TWSI_SW		0x08
diff --git a/drivers/i2c/omap24xx_i2c.c b/drivers/i2c/omap24xx_i2c.c
index db0812c17ec..b8cfc69c6cc 100644
--- a/drivers/i2c/omap24xx_i2c.c
+++ b/drivers/i2c/omap24xx_i2c.c
@@ -44,6 +44,7 @@
 #include <log.h>
 #include <stdio.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 #include <asm/io.h>
diff --git a/drivers/i2c/rcar_i2c.c b/drivers/i2c/rcar_i2c.c
index 4267bbfa5a9..1fe207e7bc8 100644
--- a/drivers/i2c/rcar_i2c.c
+++ b/drivers/i2c/rcar_i2c.c
@@ -20,6 +20,7 @@
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 #define RCAR_I2C_ICSCR			0x00 /* slave ctrl */
 #define RCAR_I2C_ICMCR			0x04 /* master ctrl */
diff --git a/drivers/i2c/rcar_iic.c b/drivers/i2c/rcar_iic.c
index cad0a623d36..dd0e921725b 100644
--- a/drivers/i2c/rcar_iic.c
+++ b/drivers/i2c/rcar_iic.c
@@ -16,6 +16,7 @@
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 struct rcar_iic_priv {
 	void __iomem		*base;
diff --git a/drivers/i2c/rk_i2c.c b/drivers/i2c/rk_i2c.c
index 81d8e1eb11d..98a0aee9b0e 100644
--- a/drivers/i2c/rk_i2c.c
+++ b/drivers/i2c/rk_i2c.c
@@ -19,6 +19,7 @@
 #include <asm/arch-rockchip/periph.h>
 #include <dm/pinctrl.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/sizes.h>
 
 /* i2c timerout */
diff --git a/drivers/i2c/s3c24x0_i2c.c b/drivers/i2c/s3c24x0_i2c.c
index 0fe92fe2357..ae3084d549d 100644
--- a/drivers/i2c/s3c24x0_i2c.c
+++ b/drivers/i2c/s3c24x0_i2c.c
@@ -20,6 +20,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <i2c.h>
+#include <linux/errno.h>
 #include "s3c24x0_i2c.h"
 
 #ifndef CONFIG_SYS_I2C_S3C24X0_SLAVE
diff --git a/drivers/i2c/sandbox_i2c.c b/drivers/i2c/sandbox_i2c.c
index 57b1c60fde6..2afd17f92fc 100644
--- a/drivers/i2c/sandbox_i2c.c
+++ b/drivers/i2c/sandbox_i2c.c
@@ -14,6 +14,7 @@
 #include <dm/acpi.h>
 #include <dm/lists.h>
 #include <dm/device-internal.h>
+#include <linux/errno.h>
 
 struct sandbox_i2c_priv {
 	bool test_mode;
diff --git a/drivers/i2c/stm32f7_i2c.c b/drivers/i2c/stm32f7_i2c.c
index 0f5c8446365..a353f063ed9 100644
--- a/drivers/i2c/stm32f7_i2c.c
+++ b/drivers/i2c/stm32f7_i2c.c
@@ -14,6 +14,7 @@
 #include <time.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/i2c/tegra186_bpmp_i2c.c b/drivers/i2c/tegra186_bpmp_i2c.c
index 897627a1236..188821bb878 100644
--- a/drivers/i2c/tegra186_bpmp_i2c.c
+++ b/drivers/i2c/tegra186_bpmp_i2c.c
@@ -11,6 +11,7 @@
 #include <asm/arch-tegra/bpmp_abi.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/i2c/tegra_i2c.c b/drivers/i2c/tegra_i2c.c
index 2cb51473a6c..03687b7532b 100644
--- a/drivers/i2c/tegra_i2c.c
+++ b/drivers/i2c/tegra_i2c.c
@@ -21,6 +21,7 @@
 #include <asm/arch-tegra/tegra_i2c.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/i2c/xilinx_xiic.c b/drivers/i2c/xilinx_xiic.c
index 149bd327bdf..aa86c630885 100644
--- a/drivers/i2c/xilinx_xiic.c
+++ b/drivers/i2c/xilinx_xiic.c
@@ -16,6 +16,7 @@
 #include <wait_bit.h>
 #include <asm/io.h>
 #include <dm/device_compat.h>
+#include <linux/errno.h>
 
 struct xilinx_xiic_priv {
 	void __iomem		*base;
diff --git a/drivers/input/cros_ec_keyb.c b/drivers/input/cros_ec_keyb.c
index c09a66376af..60f89562fad 100644
--- a/drivers/input/cros_ec_keyb.c
+++ b/drivers/input/cros_ec_keyb.c
@@ -14,6 +14,7 @@
 #include <key_matrix.h>
 #include <log.h>
 #include <stdio_dev.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 enum {
diff --git a/drivers/input/i8042.c b/drivers/input/i8042.c
index b490a99abce..e90a38ad97b 100644
--- a/drivers/input/i8042.c
+++ b/drivers/input/i8042.c
@@ -18,6 +18,7 @@
 #include <asm/io.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/input/keyboard-uclass.c b/drivers/input/keyboard-uclass.c
index 2007032e10c..fe73cd7bfd0 100644
--- a/drivers/input/keyboard-uclass.c
+++ b/drivers/input/keyboard-uclass.c
@@ -8,6 +8,7 @@
 #include <keyboard.h>
 #include <log.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 static int keyboard_start(struct stdio_dev *sdev)
diff --git a/drivers/input/tegra-kbc.c b/drivers/input/tegra-kbc.c
index 3654510858f..af289c8badb 100644
--- a/drivers/input/tegra-kbc.c
+++ b/drivers/input/tegra-kbc.c
@@ -19,6 +19,7 @@
 #include <asm/arch/funcmux.h>
 #include <asm/arch-tegra/timer.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/input.h>
 #include <linux/string.h>
 
diff --git a/drivers/led/led-uclass.c b/drivers/led/led-uclass.c
index ae9c3cbd7d3..70a94a19cd7 100644
--- a/drivers/led/led-uclass.c
+++ b/drivers/led/led-uclass.c
@@ -11,6 +11,7 @@
 #include <dm/device-internal.h>
 #include <dm/root.h>
 #include <dm/uclass-internal.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 int led_get_by_label(const char *label, struct udevice **devp)
diff --git a/drivers/led/led_bcm6328.c b/drivers/led/led_bcm6328.c
index 52946835de3..4a07bcc8a70 100644
--- a/drivers/led/led_bcm6328.c
+++ b/drivers/led/led_bcm6328.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <asm/io.h>
 #include <dm/lists.h>
+#include <linux/errno.h>
 
 #define LEDS_MAX			24
 
diff --git a/drivers/led/led_bcm6358.c b/drivers/led/led_bcm6358.c
index 307d418a178..019a84813ac 100644
--- a/drivers/led/led_bcm6358.c
+++ b/drivers/led/led_bcm6358.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <dm/lists.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 #define LEDS_MAX		32
 #define LEDS_WAIT		100
diff --git a/drivers/led/led_bcm6858.c b/drivers/led/led_bcm6858.c
index b415d8b2b40..c0f5a1a7bb6 100644
--- a/drivers/led/led_bcm6858.c
+++ b/drivers/led/led_bcm6858.c
@@ -15,6 +15,7 @@
 #include <asm/io.h>
 #include <dm/lists.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #define LEDS_MAX		32
 #define LEDS_WAIT		100
diff --git a/drivers/led/led_gpio.c b/drivers/led/led_gpio.c
index ef9b61ee626..c576c0eae52 100644
--- a/drivers/led/led_gpio.c
+++ b/drivers/led/led_gpio.c
@@ -12,6 +12,7 @@
 #include <malloc.h>
 #include <asm/gpio.h>
 #include <dm/lists.h>
+#include <linux/errno.h>
 
 struct led_gpio_priv {
 	struct gpio_desc gpio;
diff --git a/drivers/mailbox/k3-sec-proxy.c b/drivers/mailbox/k3-sec-proxy.c
index 1edb7dfd56c..d9516bd59e4 100644
--- a/drivers/mailbox/k3-sec-proxy.c
+++ b/drivers/mailbox/k3-sec-proxy.c
@@ -13,6 +13,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm/device_compat.h>
+#include <linux/errno.h>
 #include <linux/types.h>
 #include <linux/bitops.h>
 #include <linux/soc/ti/k3-sec-proxy.h>
diff --git a/drivers/mailbox/mailbox-uclass.c b/drivers/mailbox/mailbox-uclass.c
index c972d846089..233fa4f715f 100644
--- a/drivers/mailbox/mailbox-uclass.c
+++ b/drivers/mailbox/mailbox-uclass.c
@@ -10,6 +10,7 @@
 #include <mailbox-uclass.h>
 #include <malloc.h>
 #include <time.h>
+#include <linux/errno.h>
 
 static inline struct mbox_ops *mbox_dev_ops(struct udevice *dev)
 {
diff --git a/drivers/mailbox/sandbox-mbox.c b/drivers/mailbox/sandbox-mbox.c
index 19704dd5da9..4dd5371fc19 100644
--- a/drivers/mailbox/sandbox-mbox.c
+++ b/drivers/mailbox/sandbox-mbox.c
@@ -10,6 +10,7 @@
 #include <malloc.h>
 #include <asm/io.h>
 #include <asm/mbox.h>
+#include <linux/errno.h>
 
 #define SANDBOX_MBOX_CHANNELS 2
 
diff --git a/drivers/mailbox/stm32-ipcc.c b/drivers/mailbox/stm32-ipcc.c
index b8bf356b4ac..0c72f5e7c3d 100644
--- a/drivers/mailbox/stm32-ipcc.c
+++ b/drivers/mailbox/stm32-ipcc.c
@@ -12,6 +12,7 @@
 #include <asm/io.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 /*
  * IPCC has one set of registers per CPU
diff --git a/drivers/mailbox/tegra-hsp.c b/drivers/mailbox/tegra-hsp.c
index e91dac201d2..4b71e3ca7ef 100644
--- a/drivers/mailbox/tegra-hsp.c
+++ b/drivers/mailbox/tegra-hsp.c
@@ -11,6 +11,7 @@
 #include <mailbox-uclass.h>
 #include <dt-bindings/mailbox/tegra186-hsp.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #define TEGRA_HSP_INT_DIMENSIONING		0x380
 #define TEGRA_HSP_INT_DIMENSIONING_NSI_SHIFT	16
diff --git a/drivers/mailbox/zynqmp-ipi.c b/drivers/mailbox/zynqmp-ipi.c
index f206a27a79e..ef8c93fa460 100644
--- a/drivers/mailbox/zynqmp-ipi.c
+++ b/drivers/mailbox/zynqmp-ipi.c
@@ -11,6 +11,7 @@
 #include <dm.h>
 #include <mailbox-uclass.h>
 #include <dm/device_compat.h>
+#include <linux/errno.h>
 #include <mach/sys_proto.h>
 #include <linux/ioport.h>
 #include <linux/io.h>
diff --git a/drivers/misc/atsha204a-i2c.c b/drivers/misc/atsha204a-i2c.c
index 779e1a17607..5262c005a04 100644
--- a/drivers/misc/atsha204a-i2c.c
+++ b/drivers/misc/atsha204a-i2c.c
@@ -18,6 +18,7 @@
 #include <log.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
 
diff --git a/drivers/misc/cros_ec_i2c.c b/drivers/misc/cros_ec_i2c.c
index e3678d0213a..782ee703eb6 100644
--- a/drivers/misc/cros_ec_i2c.c
+++ b/drivers/misc/cros_ec_i2c.c
@@ -18,6 +18,7 @@
 #include <cros_ec.h>
 #include <log.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #ifdef DEBUG_TRACE
diff --git a/drivers/misc/cros_ec_lpc.c b/drivers/misc/cros_ec_lpc.c
index caca59471f1..6c9c9593a7c 100644
--- a/drivers/misc/cros_ec_lpc.c
+++ b/drivers/misc/cros_ec_lpc.c
@@ -20,6 +20,7 @@
 #include <stdio.h>
 #include <time.h>
 #include <asm/io.h>
+#include <linux/errno.h>
 
 #ifdef DEBUG_TRACE
 #define debug_trace(fmt, b...)	debug(fmt, ##b)
diff --git a/drivers/misc/cros_ec_sandbox.c b/drivers/misc/cros_ec_sandbox.c
index 308b34e2f4b..5a5af51eb39 100644
--- a/drivers/misc/cros_ec_sandbox.c
+++ b/drivers/misc/cros_ec_sandbox.c
@@ -15,6 +15,7 @@
 #include <os.h>
 #include <stdio.h>
 #include <time.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <u-boot/sha256.h>
 #include <spi.h>
diff --git a/drivers/misc/cros_ec_spi.c b/drivers/misc/cros_ec_spi.c
index a94e216cac7..bb7b8c1b1de 100644
--- a/drivers/misc/cros_ec_spi.c
+++ b/drivers/misc/cros_ec_spi.c
@@ -20,6 +20,7 @@
 #include <spi.h>
 #include <stdio.h>
 #include <time.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 int cros_ec_spi_packet(struct udevice *udev, int out_bytes, int in_bytes)
diff --git a/drivers/misc/fs_loader.c b/drivers/misc/fs_loader.c
index f6383a02398..a4d048afd7f 100644
--- a/drivers/misc/fs_loader.c
+++ b/drivers/misc/fs_loader.c
@@ -12,6 +12,7 @@
 #include <fs_loader.h>
 #include <log.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <mapmem.h>
 #include <malloc.h>
diff --git a/drivers/misc/gdsys_ioep.c b/drivers/misc/gdsys_ioep.c
index 8c65f1473c3..22afebd9ab0 100644
--- a/drivers/misc/gdsys_ioep.c
+++ b/drivers/misc/gdsys_ioep.c
@@ -16,6 +16,7 @@
 #include <log.h>
 #include <misc.h>
 #include <regmap.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include "gdsys_ioep.h"
diff --git a/drivers/misc/gdsys_soc.c b/drivers/misc/gdsys_soc.c
index b4c721c6fe6..09216f0e398 100644
--- a/drivers/misc/gdsys_soc.c
+++ b/drivers/misc/gdsys_soc.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <log.h>
 #include <dm/lists.h>
+#include <linux/errno.h>
 
 #include "gdsys_soc.h"
 
diff --git a/drivers/misc/i2c_eeprom.c b/drivers/misc/i2c_eeprom.c
index 45c34d388c8..0e1ba165f91 100644
--- a/drivers/misc/i2c_eeprom.c
+++ b/drivers/misc/i2c_eeprom.c
@@ -7,6 +7,7 @@
 #include <eeprom.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/kernel.h>
 #include <dm.h>
 #include <dm/device-internal.h>
diff --git a/drivers/misc/i2c_eeprom_emul.c b/drivers/misc/i2c_eeprom_emul.c
index 925120ea0d5..9f0d89673d9 100644
--- a/drivers/misc/i2c_eeprom_emul.c
+++ b/drivers/misc/i2c_eeprom_emul.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <asm/test.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #ifdef DEBUG
diff --git a/drivers/misc/ihs_fpga.c b/drivers/misc/ihs_fpga.c
index 6a61a22c071..9dbb857101d 100644
--- a/drivers/misc/ihs_fpga.c
+++ b/drivers/misc/ihs_fpga.c
@@ -17,6 +17,7 @@
 #include <asm/gpio.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include "ihs_fpga.h"
diff --git a/drivers/misc/imx8/fuse.c b/drivers/misc/imx8/fuse.c
index e25d68e6a2e..c3a7d3a40b3 100644
--- a/drivers/misc/imx8/fuse.c
+++ b/drivers/misc/imx8/fuse.c
@@ -12,6 +12,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/global_data.h>
 #include <linux/arm-smccc.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/misc/imx8/scu.c b/drivers/misc/imx8/scu.c
index ce1a35a552b..74cab629482 100644
--- a/drivers/misc/imx8/scu.c
+++ b/drivers/misc/imx8/scu.c
@@ -16,6 +16,7 @@
 #include <dm/device-internal.h>
 #include <asm/arch/sci/sci.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/iopoll.h>
 #include <misc.h>
 
diff --git a/drivers/misc/irq-uclass.c b/drivers/misc/irq-uclass.c
index 94fa233f193..6b6813e1fc5 100644
--- a/drivers/misc/irq-uclass.c
+++ b/drivers/misc/irq-uclass.c
@@ -12,6 +12,7 @@
 #include <irq.h>
 #include <log.h>
 #include <dm/device-internal.h>
+#include <linux/errno.h>
 
 int irq_route_pmc_gpio_gpe(struct udevice *dev, uint pmc_gpe_num)
 {
diff --git a/drivers/misc/irq_sandbox.c b/drivers/misc/irq_sandbox.c
index a2511b32fcd..14366febd38 100644
--- a/drivers/misc/irq_sandbox.c
+++ b/drivers/misc/irq_sandbox.c
@@ -10,6 +10,7 @@
 #include <irq.h>
 #include <acpi/acpi_device.h>
 #include <asm/test.h>
+#include <linux/errno.h>
 
 /**
  * struct sandbox_irq_priv - private data for this driver
diff --git a/drivers/misc/k3_avs.c b/drivers/misc/k3_avs.c
index 5aabac79309..621ce8b28d9 100644
--- a/drivers/misc/k3_avs.c
+++ b/drivers/misc/k3_avs.c
@@ -17,6 +17,7 @@
 #include <k3-avs.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <power/regulator.h>
 
 #define AM6_VTM_DEVINFO(i)	(priv->base + 0x100 + 0x20 * (i))
diff --git a/drivers/misc/k3_esm.c b/drivers/misc/k3_esm.c
index cc2a23dd663..82aa2545c08 100644
--- a/drivers/misc/k3_esm.c
+++ b/drivers/misc/k3_esm.c
@@ -13,6 +13,7 @@
 #include <asm/io.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #define ESM_SFT_RST			0x0c
 #define ESM_SFT_RST_KEY			0x0f
diff --git a/drivers/misc/microchip_flexcom.c b/drivers/misc/microchip_flexcom.c
index 64cc4ae7b61..0886fbdd865 100644
--- a/drivers/misc/microchip_flexcom.c
+++ b/drivers/misc/microchip_flexcom.c
@@ -11,6 +11,7 @@
 #include <misc.h>
 #include <asm/io.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 
 struct microchip_flexcom_regs {
 	u32 cr;
diff --git a/drivers/misc/misc-uclass.c b/drivers/misc/misc-uclass.c
index 55381edc980..c0db58b8967 100644
--- a/drivers/misc/misc-uclass.c
+++ b/drivers/misc/misc-uclass.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <misc.h>
+#include <linux/errno.h>
 
 /*
  * Implement a  miscellaneous uclass for those do not fit other more
diff --git a/drivers/misc/misc_sandbox.c b/drivers/misc/misc_sandbox.c
index 9ea2a35db60..4e3e8a4a364 100644
--- a/drivers/misc/misc_sandbox.c
+++ b/drivers/misc/misc_sandbox.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <misc.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 struct misc_sandbox_priv {
diff --git a/drivers/misc/mpc83xx_serdes.c b/drivers/misc/mpc83xx_serdes.c
index b2f23e1343b..925e6ec3ab8 100644
--- a/drivers/misc/mpc83xx_serdes.c
+++ b/drivers/misc/mpc83xx_serdes.c
@@ -15,6 +15,7 @@
 #include <mapmem.h>
 #include <misc.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include "mpc83xx_serdes.h"
diff --git a/drivers/misc/p2sb-uclass.c b/drivers/misc/p2sb-uclass.c
index b5219df46be..149f3d28ebf 100644
--- a/drivers/misc/p2sb-uclass.c
+++ b/drivers/misc/p2sb-uclass.c
@@ -15,6 +15,7 @@
 #include <spl.h>
 #include <asm/io.h>
 #include <dm/uclass-internal.h>
+#include <linux/errno.h>
 
 #define PCR_COMMON_IOSF_1_0	1
 
diff --git a/drivers/misc/p2sb_emul.c b/drivers/misc/p2sb_emul.c
index a4b6dba5162..3c17f6de3f6 100644
--- a/drivers/misc/p2sb_emul.c
+++ b/drivers/misc/p2sb_emul.c
@@ -16,6 +16,7 @@
 #include <pci.h>
 #include <asm/test.h>
 #include <p2sb.h>
+#include <linux/errno.h>
 
 /**
  * struct p2sb_emul_platdata - platform data for this device
diff --git a/drivers/misc/pca9551_led.c b/drivers/misc/pca9551_led.c
index cdc4390f815..312192fd62d 100644
--- a/drivers/misc/pca9551_led.c
+++ b/drivers/misc/pca9551_led.c
@@ -7,6 +7,7 @@
 #include <errno.h>
 #include <i2c.h>
 #include <status_led.h>
+#include <linux/errno.h>
 
 #ifndef CONFIG_PCA9551_I2C_ADDR
 #error "CONFIG_PCA9551_I2C_ADDR not defined!"
diff --git a/drivers/misc/pwrseq-uclass.c b/drivers/misc/pwrseq-uclass.c
index c8f6c46069b..220567ee279 100644
--- a/drivers/misc/pwrseq-uclass.c
+++ b/drivers/misc/pwrseq-uclass.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <dm.h>
 #include <pwrseq.h>
+#include <linux/errno.h>
 
 int pwrseq_set_power(struct udevice *dev, bool enable)
 {
diff --git a/drivers/misc/qfw.c b/drivers/misc/qfw.c
index 5c3ff8e52f6..c5629183f86 100644
--- a/drivers/misc/qfw.c
+++ b/drivers/misc/qfw.c
@@ -14,6 +14,7 @@
 #ifdef CONFIG_GENERATE_ACPI_TABLE
 #include <asm/tables.h>
 #endif
+#include <linux/errno.h>
 #include <linux/list.h>
 #include <linux/string.h>
 
diff --git a/drivers/misc/rockchip-otp.c b/drivers/misc/rockchip-otp.c
index 482de69070d..a8563a305d0 100644
--- a/drivers/misc/rockchip-otp.c
+++ b/drivers/misc/rockchip-otp.c
@@ -11,6 +11,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <misc.h>
+#include <linux/errno.h>
 
 /* OTP Register Offsets */
 #define OTPC_SBPI_CTRL			0x0020
diff --git a/drivers/misc/sifive-otp.c b/drivers/misc/sifive-otp.c
index 799d75b0873..97cb40b542c 100644
--- a/drivers/misc/sifive-otp.c
+++ b/drivers/misc/sifive-otp.c
@@ -23,6 +23,7 @@
 #include <dm/read.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <misc.h>
 #include <linux/printk.h>
diff --git a/drivers/misc/smsc_sio1007.c b/drivers/misc/smsc_sio1007.c
index 3b7b1c8bcf2..9fe6a18f59e 100644
--- a/drivers/misc/smsc_sio1007.c
+++ b/drivers/misc/smsc_sio1007.c
@@ -7,6 +7,7 @@
 #include <asm/io.h>
 #include <errno.h>
 #include <smsc_sio1007.h>
+#include <linux/errno.h>
 
 static inline u8 sio1007_read(int port, int reg)
 {
diff --git a/drivers/misc/stm32_rcc.c b/drivers/misc/stm32_rcc.c
index b82fe54c600..9a03679d21a 100644
--- a/drivers/misc/stm32_rcc.c
+++ b/drivers/misc/stm32_rcc.c
@@ -12,6 +12,7 @@
 #include <dm/device-internal.h>
 #include <dm/device_compat.h>
 #include <dm/lists.h>
+#include <linux/errno.h>
 
 struct stm32_rcc_clk stm32_rcc_clk_f42x = {
 	.drv_name = "stm32fx_rcc_clock",
diff --git a/drivers/misc/stm32mp_fuse.c b/drivers/misc/stm32mp_fuse.c
index 530a7824e3e..2d8c43b123f 100644
--- a/drivers/misc/stm32mp_fuse.c
+++ b/drivers/misc/stm32mp_fuse.c
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <dm/device.h>
 #include <dm/uclass.h>
+#include <linux/errno.h>
 #include <power/stpmic1.h>
 
 #define STM32MP_OTP_BANK	0
diff --git a/drivers/misc/swap_case.c b/drivers/misc/swap_case.c
index 07c67577d54..64f29f86baa 100644
--- a/drivers/misc/swap_case.c
+++ b/drivers/misc/swap_case.c
@@ -13,6 +13,7 @@
 #include <pci.h>
 #include <asm/test.h>
 #include <linux/ctype.h>
+#include <linux/errno.h>
 
 /**
  * struct swap_case_platdata - platform data for this device
diff --git a/drivers/misc/tegra186_bpmp.c b/drivers/misc/tegra186_bpmp.c
index c9079b86a7a..24ff0cd120d 100644
--- a/drivers/misc/tegra186_bpmp.c
+++ b/drivers/misc/tegra186_bpmp.c
@@ -17,6 +17,7 @@
 #include <asm/arch-tegra/ivc.h>
 #include <linux/bitops.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/misc/vexpress_config.c b/drivers/misc/vexpress_config.c
index 9a9c5f75573..2b1d19a14a7 100644
--- a/drivers/misc/vexpress_config.c
+++ b/drivers/misc/vexpress_config.c
@@ -12,6 +12,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <misc.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #define SYS_CFGDATA		0xa0
diff --git a/drivers/mmc/am654_sdhci.c b/drivers/mmc/am654_sdhci.c
index 8c6894921d2..a8d1e9d7bbb 100644
--- a/drivers/mmc/am654_sdhci.c
+++ b/drivers/mmc/am654_sdhci.c
@@ -16,6 +16,7 @@
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 
 /* CTL_CFG Registers */
 #define CTL_CFG_2		0x14
diff --git a/drivers/mmc/atmel_sdhci.c b/drivers/mmc/atmel_sdhci.c
index 1781d7a3f91..cb838a398a6 100644
--- a/drivers/mmc/atmel_sdhci.c
+++ b/drivers/mmc/atmel_sdhci.c
@@ -12,6 +12,7 @@
 #include <stdio.h>
 #include <asm/arch/clk.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 
 #define ATMEL_SDHC_MIN_FREQ	400000
 #define ATMEL_SDHC_GCK_RATE	240000000
diff --git a/drivers/mmc/bcm2835_sdhci.c b/drivers/mmc/bcm2835_sdhci.c
index 7a410d1dd36..ac1a421cd3e 100644
--- a/drivers/mmc/bcm2835_sdhci.c
+++ b/drivers/mmc/bcm2835_sdhci.c
@@ -45,6 +45,7 @@
 #include <time.h>
 #include <asm/arch/msg.h>
 #include <asm/arch/mbox.h>
+#include <linux/errno.h>
 #include <mach/sdhci.h>
 #include <mach/timer.h>
 
diff --git a/drivers/mmc/bcm2835_sdhost.c b/drivers/mmc/bcm2835_sdhost.c
index cf362f620ae..97ca2ce029a 100644
--- a/drivers/mmc/bcm2835_sdhost.c
+++ b/drivers/mmc/bcm2835_sdhost.c
@@ -43,6 +43,7 @@
 #include <linux/bug.h>
 #include <linux/compat.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/iopoll.h>
 #include <linux/sizes.h>
diff --git a/drivers/mmc/bcmstb_sdhci.c b/drivers/mmc/bcmstb_sdhci.c
index 5269aa77ceb..5c4d227c6f0 100644
--- a/drivers/mmc/bcmstb_sdhci.c
+++ b/drivers/mmc/bcmstb_sdhci.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <linux/errno.h>
 #include <mach/sdhci.h>
 #include <malloc.h>
 #include <sdhci.h>
diff --git a/drivers/mmc/ca_dw_mmc.c b/drivers/mmc/ca_dw_mmc.c
index 8ae5bd41454..fcb2700a7a8 100644
--- a/drivers/mmc/ca_dw_mmc.c
+++ b/drivers/mmc/ca_dw_mmc.c
@@ -8,6 +8,7 @@
 #include <dwmmc.h>
 #include <fdtdec.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <malloc.h>
 #include <errno.h>
diff --git a/drivers/mmc/davinci_mmc.c b/drivers/mmc/davinci_mmc.c
index f4edff7566e..f8dc47bc239 100644
--- a/drivers/mmc/davinci_mmc.c
+++ b/drivers/mmc/davinci_mmc.c
@@ -19,6 +19,7 @@
 #include <asm-generic/gpio.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #define WATCHDOG_COUNT		(100000)
diff --git a/drivers/mmc/dw_mmc.c b/drivers/mmc/dw_mmc.c
index 3f8d4228150..95f3cf1d946 100644
--- a/drivers/mmc/dw_mmc.c
+++ b/drivers/mmc/dw_mmc.c
@@ -19,6 +19,7 @@
 #include <asm/cache.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <power/regulator.h>
 
 #define PAGE_SIZE 4096
diff --git a/drivers/mmc/exynos_dw_mmc.c b/drivers/mmc/exynos_dw_mmc.c
index 55d3ad1692c..f54413aa9e5 100644
--- a/drivers/mmc/exynos_dw_mmc.c
+++ b/drivers/mmc/exynos_dw_mmc.c
@@ -9,6 +9,7 @@
 #include <fdtdec.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <malloc.h>
 #include <errno.h>
diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c
index 01a028ddb9f..c73ec572f14 100644
--- a/drivers/mmc/fsl_esdhc.c
+++ b/drivers/mmc/fsl_esdhc.c
@@ -31,6 +31,7 @@
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/mmc/fsl_esdhc_imx.c b/drivers/mmc/fsl_esdhc_imx.c
index a90839ee9f5..2e667abf414 100644
--- a/drivers/mmc/fsl_esdhc_imx.c
+++ b/drivers/mmc/fsl_esdhc_imx.c
@@ -29,6 +29,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include <power/regulator.h>
diff --git a/drivers/mmc/iproc_sdhci.c b/drivers/mmc/iproc_sdhci.c
index cd9d87be98b..216538d435a 100644
--- a/drivers/mmc/iproc_sdhci.c
+++ b/drivers/mmc/iproc_sdhci.c
@@ -12,6 +12,7 @@
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/mmc/jz_mmc.c b/drivers/mmc/jz_mmc.c
index eec432a0df6..608e5623976 100644
--- a/drivers/mmc/jz_mmc.c
+++ b/drivers/mmc/jz_mmc.c
@@ -16,6 +16,7 @@
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <mach/jz4780.h>
 #include <wait_bit.h>
 
diff --git a/drivers/mmc/meson_gx_mmc.c b/drivers/mmc/meson_gx_mmc.c
index 2afc80ff0c5..b804a0c8364 100644
--- a/drivers/mmc/meson_gx_mmc.c
+++ b/drivers/mmc/meson_gx_mmc.c
@@ -16,6 +16,7 @@
 #include <asm/gpio.h>
 #include <asm/arch/sd_emmc.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/log2.h>
 #include <linux/string.h>
 
diff --git a/drivers/mmc/mmc-uclass.c b/drivers/mmc/mmc-uclass.c
index 9c30e01028b..cdc93c756c0 100644
--- a/drivers/mmc/mmc-uclass.c
+++ b/drivers/mmc/mmc-uclass.c
@@ -14,6 +14,7 @@
 #include <dm/device_compat.h>
 #include <dm/lists.h>
 #include <linux/compat.h>
+#include <linux/errno.h>
 #include "mmc_private.h"
 
 int dm_mmc_get_b_max(struct udevice *dev, void *dst, lbaint_t blkcnt)
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index a3fdc5d63cc..93220596896 100644
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@ -23,6 +23,7 @@
 #include <part.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include <power/regulator.h>
diff --git a/drivers/mmc/mmc_legacy.c b/drivers/mmc/mmc_legacy.c
index da2941bada8..42077f88652 100644
--- a/drivers/mmc/mmc_legacy.c
+++ b/drivers/mmc/mmc_legacy.c
@@ -10,6 +10,7 @@
 #include <malloc.h>
 #include <mmc.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include "mmc_private.h"
 
 static struct list_head mmc_devices;
diff --git a/drivers/mmc/mmc_spi.c b/drivers/mmc/mmc_spi.c
index f8943314173..0581adb0841 100644
--- a/drivers/mmc/mmc_spi.c
+++ b/drivers/mmc/mmc_spi.c
@@ -15,6 +15,7 @@
 #include <stdlib.h>
 #include <vsprintf.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
 #include <linux/crc7.h>
diff --git a/drivers/mmc/msm_sdhci.c b/drivers/mmc/msm_sdhci.c
index 6e61ef6b858..0ac7529f01a 100644
--- a/drivers/mmc/msm_sdhci.c
+++ b/drivers/mmc/msm_sdhci.c
@@ -17,6 +17,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 /* Non-standard registers needed for SDHCI startup */
diff --git a/drivers/mmc/mtk-sd.c b/drivers/mmc/mtk-sd.c
index 2fe33e07c18..2ec53e853a9 100644
--- a/drivers/mmc/mtk-sd.c
+++ b/drivers/mmc/mtk-sd.c
@@ -18,6 +18,7 @@
 #include <dm/device_compat.h>
 #include <dm/pinctrl.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/iopoll.h>
 #include <linux/printk.h>
diff --git a/drivers/mmc/mv_sdhci.c b/drivers/mmc/mv_sdhci.c
index 775f2041a1a..f3e44f53cb4 100644
--- a/drivers/mmc/mv_sdhci.c
+++ b/drivers/mmc/mv_sdhci.c
@@ -9,6 +9,7 @@
 #include <sdhci.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/mbus.h>
 #include <linux/string.h>
 
diff --git a/drivers/mmc/mvebu_mmc.c b/drivers/mmc/mvebu_mmc.c
index d586342a58d..3a967ac7720 100644
--- a/drivers/mmc/mvebu_mmc.c
+++ b/drivers/mmc/mvebu_mmc.c
@@ -21,6 +21,7 @@
 #include <asm/arch/soc.h>
 #include <mvebu_mmc.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/mmc/nexell_dw_mmc.c b/drivers/mmc/nexell_dw_mmc.c
index 04627594449..e5df2920242 100644
--- a/drivers/mmc/nexell_dw_mmc.c
+++ b/drivers/mmc/nexell_dw_mmc.c
@@ -14,6 +14,7 @@
 #include <syscon.h>
 #include <asm/arch/reset.h>
 #include <asm/arch/clk.h>
+#include <linux/errno.h>
 
 #define DWMCI_CLKSEL			0x09C
 #define DWMCI_SHIFT_0			0x0
diff --git a/drivers/mmc/omap_hsmmc.c b/drivers/mmc/omap_hsmmc.c
index 54a34c72598..606c4a5c1c6 100644
--- a/drivers/mmc/omap_hsmmc.c
+++ b/drivers/mmc/omap_hsmmc.c
@@ -57,6 +57,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <power/regulator.h>
 #include <thermal.h>
 
diff --git a/drivers/mmc/pci_mmc.c b/drivers/mmc/pci_mmc.c
index 0c45e1b8936..345a330a983 100644
--- a/drivers/mmc/pci_mmc.c
+++ b/drivers/mmc/pci_mmc.c
@@ -16,6 +16,7 @@
 #include <acpi/acpi_dp.h>
 #include <asm-generic/gpio.h>
 #include <dm/acpi.h>
+#include <linux/errno.h>
 
 struct pci_mmc_plat {
 	struct mmc_config cfg;
diff --git a/drivers/mmc/renesas-sdhi.c b/drivers/mmc/renesas-sdhi.c
index 83153c5c4c4..4e8d2a9e509 100644
--- a/drivers/mmc/renesas-sdhi.c
+++ b/drivers/mmc/renesas-sdhi.c
@@ -17,6 +17,7 @@
 #include <linux/compat.h>
 #include <linux/delay.h>
 #include <linux/dma-direction.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/sizes.h>
 #include <power/regulator.h>
diff --git a/drivers/mmc/rockchip_dw_mmc.c b/drivers/mmc/rockchip_dw_mmc.c
index f1dafa6ce71..6d31f9f3d30 100644
--- a/drivers/mmc/rockchip_dw_mmc.c
+++ b/drivers/mmc/rockchip_dw_mmc.c
@@ -18,6 +18,7 @@
 #include <asm/arch-rockchip/periph.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 
 struct rockchip_mmc_plat {
 #if CONFIG_IS_ENABLED(OF_PLATDATA)
diff --git a/drivers/mmc/rpmb.c b/drivers/mmc/rpmb.c
index 0d1b3eb875b..93fdf72f344 100644
--- a/drivers/mmc/rpmb.c
+++ b/drivers/mmc/rpmb.c
@@ -14,6 +14,7 @@
 #include <mmc.h>
 #include <sdhci.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <u-boot/sha256.h>
 #include "mmc_private.h"
diff --git a/drivers/mmc/s5p_sdhci.c b/drivers/mmc/s5p_sdhci.c
index e06662141f5..cf32ca80821 100644
--- a/drivers/mmc/s5p_sdhci.c
+++ b/drivers/mmc/s5p_sdhci.c
@@ -12,6 +12,7 @@
 #include <fdtdec.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <asm/gpio.h>
 #include <asm/arch/mmc.h>
diff --git a/drivers/mmc/sdhci-cadence.c b/drivers/mmc/sdhci-cadence.c
index b1e53e8d425..96901bce72d 100644
--- a/drivers/mmc/sdhci-cadence.c
+++ b/drivers/mmc/sdhci-cadence.c
@@ -11,6 +11,7 @@
 #include <linux/bitfield.h>
 #include <linux/bitops.h>
 #include <linux/bug.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/iopoll.h>
 #include <linux/sizes.h>
diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c
index a73eb478b03..b7add7f0312 100644
--- a/drivers/mmc/sdhci.c
+++ b/drivers/mmc/sdhci.c
@@ -23,6 +23,7 @@
 #include <linux/delay.h>
 #include <linux/dma-mapping.h>
 #include <phys2bus.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/mmc/snps_dw_mmc.c b/drivers/mmc/snps_dw_mmc.c
index f7c64312154..f123d3fe222 100644
--- a/drivers/mmc/snps_dw_mmc.c
+++ b/drivers/mmc/snps_dw_mmc.c
@@ -14,6 +14,7 @@
 #include <errno.h>
 #include <fdtdec.h>
 #include <dm/device_compat.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <linux/err.h>
 #include <malloc.h>
diff --git a/drivers/mmc/socfpga_dw_mmc.c b/drivers/mmc/socfpga_dw_mmc.c
index 1c3d996bcd5..9877919f4f1 100644
--- a/drivers/mmc/socfpga_dw_mmc.c
+++ b/drivers/mmc/socfpga_dw_mmc.c
@@ -15,6 +15,7 @@
 #include <fdtdec.h>
 #include <asm/global_data.h>
 #include <dm/device_compat.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <linux/err.h>
 #include <malloc.h>
diff --git a/drivers/mmc/sti_sdhci.c b/drivers/mmc/sti_sdhci.c
index 394c4d19b56..e71b63a8fdf 100644
--- a/drivers/mmc/sti_sdhci.c
+++ b/drivers/mmc/sti_sdhci.c
@@ -12,6 +12,7 @@
 #include <sdhci.h>
 #include <asm/arch/sdhci.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/mmc/stm32_sdmmc2.c b/drivers/mmc/stm32_sdmmc2.c
index 0bc2ecee69b..f46c9a8e5bf 100644
--- a/drivers/mmc/stm32_sdmmc2.c
+++ b/drivers/mmc/stm32_sdmmc2.c
@@ -16,6 +16,7 @@
 #include <asm/cache.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <mmc.h>
 #include <reset.h>
diff --git a/drivers/mmc/sunxi_mmc.c b/drivers/mmc/sunxi_mmc.c
index 4152b7be0e4..7164db122fa 100644
--- a/drivers/mmc/sunxi_mmc.c
+++ b/drivers/mmc/sunxi_mmc.c
@@ -24,6 +24,7 @@
 #include <asm/arch/mmc.h>
 #include <asm-generic/gpio.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #ifdef CONFIG_DM_MMC
diff --git a/drivers/mmc/tangier_sdhci.c b/drivers/mmc/tangier_sdhci.c
index 879e2c98a21..622cc3ef1be 100644
--- a/drivers/mmc/tangier_sdhci.c
+++ b/drivers/mmc/tangier_sdhci.c
@@ -5,6 +5,7 @@
 #include <common.h>
 #include <dm.h>
 #include <dm/device.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/sizes.h>
 #include <malloc.h>
diff --git a/drivers/mmc/tegra_mmc.c b/drivers/mmc/tegra_mmc.c
index e7a06ec7949..4cf18386434 100644
--- a/drivers/mmc/tegra_mmc.c
+++ b/drivers/mmc/tegra_mmc.c
@@ -23,6 +23,7 @@
 #if defined(CONFIG_TEGRA30) || defined(CONFIG_TEGRA210)
 #include <asm/arch/clock.h>
 #endif
+#include <linux/errno.h>
 
 struct tegra_mmc_plat {
 	struct mmc_config cfg;
diff --git a/drivers/mmc/tmio-common.c b/drivers/mmc/tmio-common.c
index b56f650f8a7..ff563cf9773 100644
--- a/drivers/mmc/tmio-common.c
+++ b/drivers/mmc/tmio-common.c
@@ -16,6 +16,7 @@
 #include <linux/compat.h>
 #include <linux/delay.h>
 #include <linux/dma-mapping.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/sizes.h>
 #include <power/regulator.h>
diff --git a/drivers/mmc/xenon_sdhci.c b/drivers/mmc/xenon_sdhci.c
index 1336d919335..355b4eecb09 100644
--- a/drivers/mmc/xenon_sdhci.c
+++ b/drivers/mmc/xenon_sdhci.c
@@ -21,6 +21,7 @@
 #include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <malloc.h>
 #include <sdhci.h>
diff --git a/drivers/mmc/zynq_sdhci.c b/drivers/mmc/zynq_sdhci.c
index 01e75e2e770..923a10f11ec 100644
--- a/drivers/mmc/zynq_sdhci.c
+++ b/drivers/mmc/zynq_sdhci.c
@@ -11,6 +11,7 @@
 #include <fdtdec.h>
 #include <stdio.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include "mmc_private.h"
 #include <log.h>
 #include <dm/device_compat.h>
diff --git a/drivers/mtd/altera_qspi.c b/drivers/mtd/altera_qspi.c
index e85005a1c10..1a43ad9977a 100644
--- a/drivers/mtd/altera_qspi.c
+++ b/drivers/mtd/altera_qspi.c
@@ -16,6 +16,7 @@
 #include <asm/io.h>
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c
index 413fa41e770..252f49fb4c6 100644
--- a/drivers/mtd/cfi_flash.c
+++ b/drivers/mtd/cfi_flash.c
@@ -37,6 +37,7 @@
 #include <asm/unaligned.h>
 #include <env_internal.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <mtd/cfi_flash.h>
 #include <watchdog.h>
diff --git a/drivers/mtd/hbmc-am654.c b/drivers/mtd/hbmc-am654.c
index 846b0e832b7..1583efd267d 100644
--- a/drivers/mtd/hbmc-am654.c
+++ b/drivers/mtd/hbmc-am654.c
@@ -9,6 +9,7 @@
 #include <regmap.h>
 #include <syscon.h>
 #include <dm/device_compat.h>
+#include <linux/errno.h>
 
 #define FSS_SYSC_REG	0x4
 
diff --git a/drivers/mtd/mtd_uboot.c b/drivers/mtd/mtd_uboot.c
index ebdec0dd6c5..cdf4600cd31 100644
--- a/drivers/mtd/mtd_uboot.c
+++ b/drivers/mtd/mtd_uboot.c
@@ -12,6 +12,7 @@
 #include <dm/device.h>
 #include <dm/uclass-internal.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 #include <mtd.h>
diff --git a/drivers/mtd/mtdconcat.c b/drivers/mtd/mtdconcat.c
index 1baaa6e9475..46f2330468c 100644
--- a/drivers/mtd/mtdconcat.c
+++ b/drivers/mtd/mtdconcat.c
@@ -23,6 +23,7 @@
 #include <div64.h>
 #include <linux/bug.h>
 #include <linux/compat.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #endif
 
diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c
index ba19bd8c7fa..b995fb8abab 100644
--- a/drivers/mtd/mtdcore.c
+++ b/drivers/mtd/mtdcore.c
@@ -33,6 +33,7 @@
 #include <linux/bug.h>
 #include <linux/err.h>
 #include <ubi_uboot.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #endif
 
diff --git a/drivers/mtd/nand/bbt.c b/drivers/mtd/nand/bbt.c
index 809ccf644d8..51d7efd2200 100644
--- a/drivers/mtd/nand/bbt.c
+++ b/drivers/mtd/nand/bbt.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <dm/devres.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/mtd/nand.h>
 #ifndef __UBOOT__
 #include <linux/slab.h>
diff --git a/drivers/mtd/nand/core.c b/drivers/mtd/nand/core.c
index 45d827f686c..1d9d13dfe1e 100644
--- a/drivers/mtd/nand/core.c
+++ b/drivers/mtd/nand/core.c
@@ -15,6 +15,7 @@
 #include <linux/module.h>
 #endif
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/mtd/nand.h>
 #include <linux/printk.h>
 
diff --git a/drivers/mtd/nand/raw/atmel_nand.c b/drivers/mtd/nand/raw/atmel_nand.c
index dcd5f8ff82e..75c21ff7852 100644
--- a/drivers/mtd/nand/raw/atmel_nand.c
+++ b/drivers/mtd/nand/raw/atmel_nand.c
@@ -19,6 +19,7 @@
 #include <linux/bitops.h>
 #include <linux/bug.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/mtd/nand/raw/davinci_nand.c b/drivers/mtd/nand/raw/davinci_nand.c
index f64de80bf2b..6c4eb58abb6 100644
--- a/drivers/mtd/nand/raw/davinci_nand.c
+++ b/drivers/mtd/nand/raw/davinci_nand.c
@@ -34,6 +34,7 @@
 #include <nand.h>
 #include <dm/uclass.h>
 #include <asm/ti-common/davinci_nand.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 /* Definitions for 4-bit hardware ECC */
diff --git a/drivers/mtd/nand/raw/denali_dt.c b/drivers/mtd/nand/raw/denali_dt.c
index 8318ff507f3..1f6963b55fe 100644
--- a/drivers/mtd/nand/raw/denali_dt.c
+++ b/drivers/mtd/nand/raw/denali_dt.c
@@ -9,6 +9,7 @@
 #include <dm/device_compat.h>
 #include <linux/bug.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/ioport.h>
 #include <linux/printk.h>
diff --git a/drivers/mtd/nand/raw/denali_spl.c b/drivers/mtd/nand/raw/denali_spl.c
index 7252e0340c6..504f773e4de 100644
--- a/drivers/mtd/nand/raw/denali_spl.c
+++ b/drivers/mtd/nand/raw/denali_spl.c
@@ -9,6 +9,7 @@
 #include <asm/io.h>
 #include <asm/unaligned.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/mtd/rawnand.h>
 #include <linux/string.h>
 #include "denali.h"
diff --git a/drivers/mtd/nand/raw/fsmc_nand.c b/drivers/mtd/nand/raw/fsmc_nand.c
index 1feaeadd4b7..0991a398f45 100644
--- a/drivers/mtd/nand/raw/fsmc_nand.c
+++ b/drivers/mtd/nand/raw/fsmc_nand.c
@@ -14,6 +14,7 @@
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/fsmc_nand.h>
 #include <asm/arch/hardware.h>
diff --git a/drivers/mtd/nand/raw/mxc_nand.c b/drivers/mtd/nand/raw/mxc_nand.c
index c5e56c05873..a90d30bd100 100644
--- a/drivers/mtd/nand/raw/mxc_nand.c
+++ b/drivers/mtd/nand/raw/mxc_nand.c
@@ -15,6 +15,7 @@
 	defined(CONFIG_MX51) || defined(CONFIG_MX53)
 #include <asm/arch/imx-regs.h>
 #endif
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include "mxc_nand.h"
 
diff --git a/drivers/mtd/nand/raw/mxc_nand_spl.c b/drivers/mtd/nand/raw/mxc_nand_spl.c
index e1e542519d8..ad01cdce260 100644
--- a/drivers/mtd/nand/raw/mxc_nand_spl.c
+++ b/drivers/mtd/nand/raw/mxc_nand_spl.c
@@ -15,6 +15,7 @@
 #include <nand.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/io.h>
+#include <linux/errno.h>
 #include "mxc_nand.h"
 
 #if defined(MXC_NFC_V1) || defined(MXC_NFC_V2_1)
diff --git a/drivers/mtd/nand/raw/mxs_nand_dt.c b/drivers/mtd/nand/raw/mxs_nand_dt.c
index 43dbe9e66ec..675b284b063 100644
--- a/drivers/mtd/nand/raw/mxs_nand_dt.c
+++ b/drivers/mtd/nand/raw/mxs_nand_dt.c
@@ -13,6 +13,7 @@
  */
 
 #include <dm.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/ioport.h>
 #include <linux/printk.h>
diff --git a/drivers/mtd/nand/raw/mxs_nand_spl.c b/drivers/mtd/nand/raw/mxs_nand_spl.c
index bc3bc836434..0fe538e7d6d 100644
--- a/drivers/mtd/nand/raw/mxs_nand_spl.c
+++ b/drivers/mtd/nand/raw/mxs_nand_spl.c
@@ -15,6 +15,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 static struct mtd_info *mtd;
diff --git a/drivers/mtd/nand/raw/nand.c b/drivers/mtd/nand/raw/nand.c
index 1b7918c54b6..486c1b4a8bd 100644
--- a/drivers/mtd/nand/raw/nand.c
+++ b/drivers/mtd/nand/raw/nand.c
@@ -9,6 +9,7 @@
 #include <nand.h>
 #include <errno.h>
 #include <vsprintf.h>
+#include <linux/errno.h>
 #include <linux/mtd/concat.h>
 
 #ifndef CONFIG_SYS_NAND_BASE_LIST
diff --git a/drivers/mtd/nand/raw/nand_bbt.c b/drivers/mtd/nand/raw/nand_bbt.c
index 9c758172c11..336a341f0a0 100644
--- a/drivers/mtd/nand/raw/nand_bbt.c
+++ b/drivers/mtd/nand/raw/nand_bbt.c
@@ -64,6 +64,7 @@
 #include <dm/devres.h>
 #include <linux/bug.h>
 #include <linux/compat.h>
+#include <linux/errno.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/bbm.h>
 #include <linux/mtd/rawnand.h>
diff --git a/drivers/mtd/nand/raw/nand_bch.c b/drivers/mtd/nand/raw/nand_bch.c
index 5733bcb9c62..94e03e9ba5e 100644
--- a/drivers/mtd/nand/raw/nand_bch.c
+++ b/drivers/mtd/nand/raw/nand_bch.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <log.h>
 #include <dm/devres.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 /*#include <asm/io.h>*/
diff --git a/drivers/mtd/nand/raw/nand_timings.c b/drivers/mtd/nand/raw/nand_timings.c
index e6aa7903913..008ea3bdf40 100644
--- a/drivers/mtd/nand/raw/nand_timings.c
+++ b/drivers/mtd/nand/raw/nand_timings.c
@@ -10,6 +10,7 @@
  */
 #include <common.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/mtd/rawnand.h>
 
diff --git a/drivers/mtd/nand/raw/stm32_fmc2_nand.c b/drivers/mtd/nand/raw/stm32_fmc2_nand.c
index 422367a2650..2e41efcb5fb 100644
--- a/drivers/mtd/nand/raw/stm32_fmc2_nand.c
+++ b/drivers/mtd/nand/raw/stm32_fmc2_nand.c
@@ -13,6 +13,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/iopoll.h>
 #include <linux/ioport.h>
 #include <linux/printk.h>
diff --git a/drivers/mtd/nand/raw/sunxi_nand.c b/drivers/mtd/nand/raw/sunxi_nand.c
index 5fd741f1124..025f18ad49d 100644
--- a/drivers/mtd/nand/raw/sunxi_nand.c
+++ b/drivers/mtd/nand/raw/sunxi_nand.c
@@ -36,6 +36,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/mtd/nand/raw/sunxi_nand_spl.c b/drivers/mtd/nand/raw/sunxi_nand_spl.c
index b098ebef8f3..9b54d007f8e 100644
--- a/drivers/mtd/nand/raw/sunxi_nand_spl.c
+++ b/drivers/mtd/nand/raw/sunxi_nand_spl.c
@@ -13,6 +13,7 @@
 #include <linux/bitops.h>
 #include <linux/ctype.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 /* registers */
diff --git a/drivers/mtd/nand/raw/vf610_nfc.c b/drivers/mtd/nand/raw/vf610_nfc.c
index 708653ab162..ceec8c81e94 100644
--- a/drivers/mtd/nand/raw/vf610_nfc.c
+++ b/drivers/mtd/nand/raw/vf610_nfc.c
@@ -26,6 +26,7 @@
 #include <stdio.h>
 #include <time.h>
 #include <dm/device_compat.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/mtd/nand/spi/core.c b/drivers/mtd/nand/spi/core.c
index a59dae357f3..99622a335a3 100644
--- a/drivers/mtd/nand/spi/core.c
+++ b/drivers/mtd/nand/spi/core.c
@@ -30,6 +30,7 @@
 #include <dm/devres.h>
 #include <linux/bitops.h>
 #include <linux/bug.h>
+#include <linux/errno.h>
 #include <linux/mtd/spinand.h>
 #include <linux/printk.h>
 #include <linux/string.h>
diff --git a/drivers/mtd/nand/spi/gigadevice.c b/drivers/mtd/nand/spi/gigadevice.c
index 0b228dcb5b1..465f18642b0 100644
--- a/drivers/mtd/nand/spi/gigadevice.c
+++ b/drivers/mtd/nand/spi/gigadevice.c
@@ -11,6 +11,7 @@
 #include <linux/device.h>
 #include <linux/kernel.h>
 #endif
+#include <linux/errno.h>
 #include <linux/mtd/spinand.h>
 
 #define SPINAND_MFR_GIGADEVICE			0xC8
diff --git a/drivers/mtd/nand/spi/macronix.c b/drivers/mtd/nand/spi/macronix.c
index 215f09acc37..83f9daaf579 100644
--- a/drivers/mtd/nand/spi/macronix.c
+++ b/drivers/mtd/nand/spi/macronix.c
@@ -11,6 +11,7 @@
 #include <linux/kernel.h>
 #endif
 #include <linux/bug.h>
+#include <linux/errno.h>
 #include <linux/mtd/spinand.h>
 
 #define SPINAND_MFR_MACRONIX		0xC2
diff --git a/drivers/mtd/nand/spi/micron.c b/drivers/mtd/nand/spi/micron.c
index 6bacf14aafe..5fde4a78d23 100644
--- a/drivers/mtd/nand/spi/micron.c
+++ b/drivers/mtd/nand/spi/micron.c
@@ -12,6 +12,7 @@
 #include <linux/kernel.h>
 #endif
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/mtd/spinand.h>
 
 #define SPINAND_MFR_MICRON		0x2c
diff --git a/drivers/mtd/nand/spi/toshiba.c b/drivers/mtd/nand/spi/toshiba.c
index c2cd3b426b3..d0b003d2957 100644
--- a/drivers/mtd/nand/spi/toshiba.c
+++ b/drivers/mtd/nand/spi/toshiba.c
@@ -12,6 +12,7 @@
 #include <linux/kernel.h>
 #endif
 #include <linux/bug.h>
+#include <linux/errno.h>
 #include <linux/mtd/spinand.h>
 
 #define SPINAND_MFR_TOSHIBA		0x98
diff --git a/drivers/mtd/nand/spi/winbond.c b/drivers/mtd/nand/spi/winbond.c
index c119486efb7..4e1c8883b38 100644
--- a/drivers/mtd/nand/spi/winbond.c
+++ b/drivers/mtd/nand/spi/winbond.c
@@ -13,6 +13,7 @@
 #include <linux/kernel.h>
 #endif
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/mtd/spinand.h>
 
 #define SPINAND_MFR_WINBOND		0xEF
diff --git a/drivers/mtd/pic32_flash.c b/drivers/mtd/pic32_flash.c
index a50aec7d77e..3daa76f949a 100644
--- a/drivers/mtd/pic32_flash.c
+++ b/drivers/mtd/pic32_flash.c
@@ -15,6 +15,7 @@
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <mach/pic32.h>
 #include <wait_bit.h>
diff --git a/drivers/mtd/renesas_rpc_hf.c b/drivers/mtd/renesas_rpc_hf.c
index b13d688b660..cef18a95a42 100644
--- a/drivers/mtd/renesas_rpc_hf.c
+++ b/drivers/mtd/renesas_rpc_hf.c
@@ -23,6 +23,7 @@
 #include <mtd.h>
 #include <wait_bit.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <mtd/cfi_flash.h>
 
 #define RPC_CMNCR		0x0000	/* R/W */
diff --git a/drivers/mtd/spi/sandbox.c b/drivers/mtd/spi/sandbox.c
index e18326b5692..0ab3596a2a1 100644
--- a/drivers/mtd/spi/sandbox.c
+++ b/drivers/mtd/spi/sandbox.c
@@ -17,6 +17,7 @@
 #include <spi.h>
 #include <os.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include <spi_flash.h>
diff --git a/drivers/mtd/spi/sf_dataflash.c b/drivers/mtd/spi/sf_dataflash.c
index 90f09a5fa1d..c65d62e7cdb 100644
--- a/drivers/mtd/spi/sf_dataflash.c
+++ b/drivers/mtd/spi/sf_dataflash.c
@@ -20,6 +20,7 @@
 #include <time.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/math64.h>
 #include <linux/string.h>
 
diff --git a/drivers/mtd/spi/sf_probe.c b/drivers/mtd/spi/sf_probe.c
index afd63d8fa6f..8cf4acf45d6 100644
--- a/drivers/mtd/spi/sf_probe.c
+++ b/drivers/mtd/spi/sf_probe.c
@@ -15,6 +15,7 @@
 #include <spi.h>
 #include <spi_flash.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include "sf_internal.h"
diff --git a/drivers/mtd/st_smi.c b/drivers/mtd/st_smi.c
index d5346605990..a6c1a0e1c78 100644
--- a/drivers/mtd/st_smi.c
+++ b/drivers/mtd/st_smi.c
@@ -10,6 +10,7 @@
 #include <time.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/mtd/st_smi.h>
 
 #include <asm/io.h>
diff --git a/drivers/mtd/ubi/attach.c b/drivers/mtd/ubi/attach.c
index 7b9ca10ed2a..2fdf3dbc658 100644
--- a/drivers/mtd/ubi/attach.c
+++ b/drivers/mtd/ubi/attach.c
@@ -81,6 +81,7 @@
 #include <div64.h>
 #include <linux/bug.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #endif
diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c
index f07051c9f73..f0f63ae7df0 100644
--- a/drivers/mtd/ubi/build.c
+++ b/drivers/mtd/ubi/build.c
@@ -33,6 +33,7 @@
 #else
 #include <vsprintf.h>
 #include <linux/bug.h>
+#include <linux/errno.h>
 #include <linux/log2.h>
 #include <linux/printk.h>
 #include <linux/string.h>
diff --git a/drivers/mtd/ubi/debug.c b/drivers/mtd/ubi/debug.c
index c84e3471266..213061847d7 100644
--- a/drivers/mtd/ubi/debug.c
+++ b/drivers/mtd/ubi/debug.c
@@ -10,6 +10,7 @@
 #include <stdio.h>
 #include <ubi_uboot.h>
 #include <vsprintf.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include "ubi.h"
diff --git a/drivers/mtd/ubi/eba.c b/drivers/mtd/ubi/eba.c
index 9fe5ed79125..23a72d6a325 100644
--- a/drivers/mtd/ubi/eba.c
+++ b/drivers/mtd/ubi/eba.c
@@ -36,6 +36,7 @@
 #include <u-boot/crc.h>
 #else
 #include <ubi_uboot.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #endif
 
diff --git a/drivers/mtd/ubi/fastmap-wl.c b/drivers/mtd/ubi/fastmap-wl.c
index 4cb1377c425..df5fab00e1a 100644
--- a/drivers/mtd/ubi/fastmap-wl.c
+++ b/drivers/mtd/ubi/fastmap-wl.c
@@ -6,6 +6,8 @@
  *
  */
 
+#include <linux/errno.h>
+
 /**
  * update_fastmap_work_fn - calls ubi_update_fastmap from a work queue
  * @wrk: the work description object
diff --git a/drivers/mtd/ubi/fastmap.c b/drivers/mtd/ubi/fastmap.c
index 90ed73b8577..6812b122d65 100644
--- a/drivers/mtd/ubi/fastmap.c
+++ b/drivers/mtd/ubi/fastmap.c
@@ -17,6 +17,7 @@
 #include <malloc.h>
 #include <ubi_uboot.h>
 #include <linux/bug.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #endif
 
diff --git a/drivers/mtd/ubi/io.c b/drivers/mtd/ubi/io.c
index ef819a86d27..f88bafd35d3 100644
--- a/drivers/mtd/ubi/io.c
+++ b/drivers/mtd/ubi/io.c
@@ -83,6 +83,7 @@
 #else
 #include <hexdump.h>
 #include <ubi_uboot.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #endif
 
diff --git a/drivers/mtd/ubi/kapi.c b/drivers/mtd/ubi/kapi.c
index 3fac8b2b308..981146ef034 100644
--- a/drivers/mtd/ubi/kapi.c
+++ b/drivers/mtd/ubi/kapi.c
@@ -16,6 +16,7 @@
 #include <asm/div64.h>
 #else
 #include <ubi_uboot.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #endif
 #include <linux/err.h>
diff --git a/drivers/mtd/ubi/misc.c b/drivers/mtd/ubi/misc.c
index 81275deaeb7..b9bad95cf6f 100644
--- a/drivers/mtd/ubi/misc.c
+++ b/drivers/mtd/ubi/misc.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <ubi_uboot.h>
+#include <linux/errno.h>
 #include "ubi.h"
 
 /**
diff --git a/drivers/mtd/ubi/ubi.h b/drivers/mtd/ubi/ubi.h
index 175988899c3..d91c9effd07 100644
--- a/drivers/mtd/ubi/ubi.h
+++ b/drivers/mtd/ubi/ubi.h
@@ -28,6 +28,7 @@
 #include <asm/pgtable.h>
 #else
 #include <ubi_uboot.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #endif
 #include <linux/mtd/mtd.h>
diff --git a/drivers/mtd/ubi/upd.c b/drivers/mtd/ubi/upd.c
index c4856b6c11e..96ecaf60c04 100644
--- a/drivers/mtd/ubi/upd.c
+++ b/drivers/mtd/ubi/upd.c
@@ -32,6 +32,7 @@
 #else
 #include <div64.h>
 #include <ubi_uboot.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #endif
 #include <linux/err.h>
diff --git a/drivers/mtd/ubi/vmt.c b/drivers/mtd/ubi/vmt.c
index 079ffbe7563..806abc9122e 100644
--- a/drivers/mtd/ubi/vmt.c
+++ b/drivers/mtd/ubi/vmt.c
@@ -20,6 +20,7 @@
 #include <div64.h>
 #include <ubi_uboot.h>
 #include <vsprintf.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #endif
 #include <linux/math64.h>
diff --git a/drivers/mtd/ubi/vtbl.c b/drivers/mtd/ubi/vtbl.c
index cb4de78fcbb..91c0589bb62 100644
--- a/drivers/mtd/ubi/vtbl.c
+++ b/drivers/mtd/ubi/vtbl.c
@@ -56,6 +56,7 @@
 #else
 #include <ubi_uboot.h>
 #include <linux/bug.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #endif
 
diff --git a/drivers/mtd/ubi/wl.c b/drivers/mtd/ubi/wl.c
index b7e5cc17ef4..d0963285b1f 100644
--- a/drivers/mtd/ubi/wl.c
+++ b/drivers/mtd/ubi/wl.c
@@ -95,6 +95,7 @@
 #else
 #include <ubi_uboot.h>
 #include <vsprintf.h>
+#include <linux/errno.h>
 #endif
 
 #include "ubi.h"
diff --git a/drivers/mtd/ubispl/ubispl.c b/drivers/mtd/ubispl/ubispl.c
index 3ffad548535..96afa7dec11 100644
--- a/drivers/mtd/ubispl/ubispl.c
+++ b/drivers/mtd/ubispl/ubispl.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <errno.h>
 #include <linux/bug.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
 #include <ubispl.h>
diff --git a/drivers/net/ag7xxx.c b/drivers/net/ag7xxx.c
index 7714178e478..b82ea522a69 100644
--- a/drivers/net/ag7xxx.c
+++ b/drivers/net/ag7xxx.c
@@ -25,6 +25,7 @@
 #include <linux/compiler.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/mii.h>
 #include <wait_bit.h>
 #include <asm/io.h>
diff --git a/drivers/net/altera_tse.c b/drivers/net/altera_tse.c
index 8e58464cc6c..bf17d1fb29a 100644
--- a/drivers/net/altera_tse.c
+++ b/drivers/net/altera_tse.c
@@ -24,6 +24,7 @@
 #include <asm/global_data.h>
 #include <linux/dma-mapping.h>
 #include <asm/io.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include "altera_tse.h"
 
diff --git a/drivers/net/armada100_fec.c b/drivers/net/armada100_fec.c
index 87c01e0e3cd..c8f61a23d12 100644
--- a/drivers/net/armada100_fec.c
+++ b/drivers/net/armada100_fec.c
@@ -21,6 +21,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/mii.h>
 #include <asm/io.h>
 #include <asm/arch/armada100.h>
diff --git a/drivers/net/at91_emac.c b/drivers/net/at91_emac.c
index d49f9216c7d..26381a1bc6e 100644
--- a/drivers/net/at91_emac.c
+++ b/drivers/net/at91_emac.c
@@ -21,6 +21,7 @@
 #include <miiphy.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/mii.h>
 #include <linux/string.h>
 
diff --git a/drivers/net/bcm-sf2-eth.c b/drivers/net/bcm-sf2-eth.c
index a0cbecf60df..db7930fb88e 100644
--- a/drivers/net/bcm-sf2-eth.c
+++ b/drivers/net/bcm-sf2-eth.c
@@ -12,6 +12,7 @@
 #include <vsprintf.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/net/bcm6348-eth.c b/drivers/net/bcm6348-eth.c
index b759d12867d..eeea3dc579f 100644
--- a/drivers/net/bcm6348-eth.c
+++ b/drivers/net/bcm6348-eth.c
@@ -19,6 +19,7 @@
 #include <vsprintf.h>
 #include <wait_bit.h>
 #include <asm/io.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 #define ETH_RX_DESC			PKTBUFSRX
diff --git a/drivers/net/bcm6368-eth.c b/drivers/net/bcm6368-eth.c
index f6b473ae9b0..0e6d266f103 100644
--- a/drivers/net/bcm6368-eth.c
+++ b/drivers/net/bcm6368-eth.c
@@ -20,6 +20,7 @@
 #include <asm/io.h>
 #include <dm/device_compat.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/net/bcmgenet.c b/drivers/net/bcmgenet.c
index a767fa6e6de..cd3dac49e7e 100644
--- a/drivers/net/bcmgenet.c
+++ b/drivers/net/bcmgenet.c
@@ -33,6 +33,7 @@
 #include <net.h>
 #include <dm/of_access.h>
 #include <dm/ofnode.h>
+#include <linux/errno.h>
 #include <linux/iopoll.h>
 #include <linux/sizes.h>
 #include <asm/dma-mapping.h>
diff --git a/drivers/net/calxedaxgmac.c b/drivers/net/calxedaxgmac.c
index 5df36fa6726..37c3a54761b 100644
--- a/drivers/net/calxedaxgmac.c
+++ b/drivers/net/calxedaxgmac.c
@@ -13,6 +13,7 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <asm/io.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #define TX_NUM_DESC			1
diff --git a/drivers/net/dc2114x.c b/drivers/net/dc2114x.c
index 3b0219eee92..8bc75baf97f 100644
--- a/drivers/net/dc2114x.c
+++ b/drivers/net/dc2114x.c
@@ -12,6 +12,7 @@
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #define SROM_DLEVEL	0
diff --git a/drivers/net/designware.c b/drivers/net/designware.c
index bb36b77169a..ffb41e8bf1f 100644
--- a/drivers/net/designware.c
+++ b/drivers/net/designware.c
@@ -29,6 +29,7 @@
 #include <linux/compiler.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/kernel.h>
 #include <asm/io.h>
 #include <linux/printk.h>
diff --git a/drivers/net/dwc_eth_qos.c b/drivers/net/dwc_eth_qos.c
index 84fbe0ff3c1..c5e22aff5c0 100644
--- a/drivers/net/dwc_eth_qos.c
+++ b/drivers/net/dwc_eth_qos.c
@@ -51,6 +51,7 @@
 #endif
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/net/dwmac_socfpga.c b/drivers/net/dwmac_socfpga.c
index e93561dffa8..cddbd56ac7d 100644
--- a/drivers/net/dwmac_socfpga.c
+++ b/drivers/net/dwmac_socfpga.c
@@ -13,6 +13,7 @@
 #include <regmap.h>
 #include <reset.h>
 #include <syscon.h>
+#include <linux/errno.h>
 #include "designware.h"
 #include <dm/device_compat.h>
 #include <linux/err.h>
diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c
index 5041a1894ee..1705dde9d2c 100644
--- a/drivers/net/e1000.c
+++ b/drivers/net/e1000.c
@@ -43,6 +43,7 @@ tested on both gig copper and gig fiber boards
 #include <vsprintf.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include "e1000.h"
 #include <asm/cache.h>
diff --git a/drivers/net/eepro100.c b/drivers/net/eepro100.c
index a8a20a08012..3d7decd126a 100644
--- a/drivers/net/eepro100.c
+++ b/drivers/net/eepro100.c
@@ -16,6 +16,7 @@
 #include <pci.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 /* Ethernet chip registers. */
diff --git a/drivers/net/ep93xx_eth.c b/drivers/net/ep93xx_eth.c
index 802d04a26ba..a4767e8742d 100644
--- a/drivers/net/ep93xx_eth.c
+++ b/drivers/net/ep93xx_eth.c
@@ -28,6 +28,7 @@
 #include <miiphy.h>
 #include <asm/u-boot.h>
 #include <linux/bug.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include <linux/types.h>
diff --git a/drivers/net/eth-phy-uclass.c b/drivers/net/eth-phy-uclass.c
index 4afa6c87461..861fc1bfb8a 100644
--- a/drivers/net/eth-phy-uclass.c
+++ b/drivers/net/eth-phy-uclass.c
@@ -10,6 +10,7 @@
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
 #include <dm/lists.h>
+#include <linux/errno.h>
 
 struct eth_phy_device_priv {
 	struct mii_dev *mdio_bus;
diff --git a/drivers/net/ethoc.c b/drivers/net/ethoc.c
index a1e051770c7..c331cd9e97c 100644
--- a/drivers/net/ethoc.c
+++ b/drivers/net/ethoc.c
@@ -18,6 +18,7 @@
 #include <vsprintf.h>
 #include <asm/u-boot.h>
 #include <dm/platform_data/net_ethoc.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <malloc.h>
 #include <net.h>
diff --git a/drivers/net/fm/eth.c b/drivers/net/fm/eth.c
index 7d65ee70be4..c451b136ae3 100644
--- a/drivers/net/fm/eth.c
+++ b/drivers/net/fm/eth.c
@@ -28,6 +28,7 @@
 #include <fsl_memac.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include "fm.h"
diff --git a/drivers/net/fm/init.c b/drivers/net/fm/init.c
index b779b5c2299..1829517d024 100644
--- a/drivers/net/fm/init.c
+++ b/drivers/net/fm/init.c
@@ -15,6 +15,7 @@
 #include <asm/fsl_serdes.h>
 #endif
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include "fm.h"
diff --git a/drivers/net/fm/memac_phy.c b/drivers/net/fm/memac_phy.c
index 8973f498d17..79a15989ad9 100644
--- a/drivers/net/fm/memac_phy.c
+++ b/drivers/net/fm/memac_phy.c
@@ -13,6 +13,7 @@
 #include <fsl_memac.h>
 #include <fm_eth.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #ifdef CONFIG_SYS_MEMAC_LITTLE_ENDIAN
diff --git a/drivers/net/fsl-mc/dpio/qbman_portal.c b/drivers/net/fsl-mc/dpio/qbman_portal.c
index bedff4ff321..fb325846322 100644
--- a/drivers/net/fsl-mc/dpio/qbman_portal.c
+++ b/drivers/net/fsl-mc/dpio/qbman_portal.c
@@ -8,6 +8,7 @@
 #include <stdio.h>
 #include <asm/arch/clock.h>
 #include <linux/bug.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include "qbman_portal.h"
 
diff --git a/drivers/net/fsl-mc/mc.c b/drivers/net/fsl-mc/mc.c
index 3a7e8e84b46..d2f8869a340 100644
--- a/drivers/net/fsl-mc/mc.c
+++ b/drivers/net/fsl-mc/mc.c
@@ -18,6 +18,7 @@
 #include <linux/bug.h>
 #include <asm/io.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <net.h>
 #include <fdt_support.h>
diff --git a/drivers/net/fsl-mc/mc_sys.c b/drivers/net/fsl-mc/mc_sys.c
index 239bccb4b0a..aa50e64bced 100644
--- a/drivers/net/fsl-mc/mc_sys.c
+++ b/drivers/net/fsl-mc/mc_sys.c
@@ -13,6 +13,7 @@
 #include <errno.h>
 #include <asm/io.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 #define MC_CMD_HDR_READ_CMDID(_hdr) \
 	((uint16_t)mc_dec((_hdr), MC_CMD_HDR_CMDID_O, MC_CMD_HDR_CMDID_S))
diff --git a/drivers/net/fsl_enetc.c b/drivers/net/fsl_enetc.c
index ed302eace59..7b9730a8446 100644
--- a/drivers/net/fsl_enetc.c
+++ b/drivers/net/fsl_enetc.c
@@ -18,6 +18,7 @@
 #include <miiphy.h>
 #include <linux/bug.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include "fsl_enetc.h"
diff --git a/drivers/net/fsl_enetc_mdio.c b/drivers/net/fsl_enetc_mdio.c
index 9bca18e9407..282c08c82f5 100644
--- a/drivers/net/fsl_enetc_mdio.c
+++ b/drivers/net/fsl_enetc_mdio.c
@@ -14,6 +14,7 @@
 #include <asm/io.h>
 #include <asm/processor.h>
 #include <miiphy.h>
+#include <linux/errno.h>
 
 #include "fsl_enetc.h"
 
diff --git a/drivers/net/fsl_mcdmafec.c b/drivers/net/fsl_mcdmafec.c
index 819de623625..64c1e71ebbe 100644
--- a/drivers/net/fsl_mcdmafec.c
+++ b/drivers/net/fsl_mcdmafec.c
@@ -22,6 +22,7 @@
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/mii.h>
 #include <asm/immap.h>
 #include <asm/fsl_mcdmafec.h>
diff --git a/drivers/net/ftgmac100.c b/drivers/net/ftgmac100.c
index f5e50ff0847..af58d04da23 100644
--- a/drivers/net/ftgmac100.c
+++ b/drivers/net/ftgmac100.c
@@ -24,6 +24,7 @@
 #include <asm/cache.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/iopoll.h>
 #include <linux/printk.h>
diff --git a/drivers/net/ftmac100.c b/drivers/net/ftmac100.c
index e2b897a7ccc..569f1e40047 100644
--- a/drivers/net/ftmac100.c
+++ b/drivers/net/ftmac100.c
@@ -18,6 +18,7 @@
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/string.h>
 
diff --git a/drivers/net/gmac_rockchip.c b/drivers/net/gmac_rockchip.c
index 7cd2451e084..8aed219d9ed 100644
--- a/drivers/net/gmac_rockchip.c
+++ b/drivers/net/gmac_rockchip.c
@@ -28,6 +28,7 @@
 #include <dm/pinctrl.h>
 #include <dt-bindings/clock/rk3288-cru.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include "designware.h"
 
diff --git a/drivers/net/higmacv300.c b/drivers/net/higmacv300.c
index 0c71c51ceb4..7310d6a0426 100644
--- a/drivers/net/higmacv300.c
+++ b/drivers/net/higmacv300.c
@@ -13,6 +13,7 @@
 #include <linux/bitops.h>
 #include <linux/bug.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/mii.h>
 #include <miiphy.h>
 #include <net.h>
diff --git a/drivers/net/ks8851_mll.c b/drivers/net/ks8851_mll.c
index 65b160f8c40..f357fec5cc9 100644
--- a/drivers/net/ks8851_mll.c
+++ b/drivers/net/ks8851_mll.c
@@ -15,6 +15,7 @@
 #include <miiphy.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 #include "ks8851_mll.h"
 
diff --git a/drivers/net/ldpaa_eth/ldpaa_eth.c b/drivers/net/ldpaa_eth/ldpaa_eth.c
index ac0487e68d2..5da5582200d 100644
--- a/drivers/net/ldpaa_eth/ldpaa_eth.c
+++ b/drivers/net/ldpaa_eth/ldpaa_eth.c
@@ -23,6 +23,7 @@
 #include <linux/compat.h>
 #include <fsl-mc/fsl_dpmac.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include <fsl-mc/ldpaa_wriop.h>
diff --git a/drivers/net/ldpaa_eth/ldpaa_wriop.c b/drivers/net/ldpaa_eth/ldpaa_wriop.c
index 06a284ad684..e2ad13b8975 100644
--- a/drivers/net/ldpaa_eth/ldpaa_wriop.c
+++ b/drivers/net/ldpaa_eth/ldpaa_wriop.c
@@ -11,6 +11,7 @@
 #include <linux/compat.h>
 #include <asm/arch/fsl_serdes.h>
 #include <fsl-mc/ldpaa_wriop.h>
+#include <linux/errno.h>
 
 struct wriop_dpmac_info dpmac_info[NUM_WRIOP_PORTS];
 
diff --git a/drivers/net/ldpaa_eth/lx2160a.c b/drivers/net/ldpaa_eth/lx2160a.c
index 9432b6eb85c..a61508befc8 100644
--- a/drivers/net/ldpaa_eth/lx2160a.c
+++ b/drivers/net/ldpaa_eth/lx2160a.c
@@ -8,6 +8,7 @@
 #include <asm/io.h>
 #include <asm/arch/fsl_serdes.h>
 #include <asm/arch/soc.h>
+#include <linux/errno.h>
 #include <linux/mii.h>
 
 u32 dpmac_to_devdisr[] = {
diff --git a/drivers/net/mcffec.c b/drivers/net/mcffec.c
index 5a86f204ee3..91ca0e03216 100644
--- a/drivers/net/mcffec.c
+++ b/drivers/net/mcffec.c
@@ -23,6 +23,7 @@
 #include <asm/immap.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/mii.h>
 #include <linux/string.h>
 
diff --git a/drivers/net/mdio_mux_sandbox.c b/drivers/net/mdio_mux_sandbox.c
index 3dba4d18a15..c22882c6e8d 100644
--- a/drivers/net/mdio_mux_sandbox.c
+++ b/drivers/net/mdio_mux_sandbox.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <miiphy.h>
+#include <linux/errno.h>
 
 /* macros copied over from mdio_sandbox.c */
 #define SANDBOX_PHY_ADDR	5
diff --git a/drivers/net/mdio_sandbox.c b/drivers/net/mdio_sandbox.c
index b731f60a98a..2d7c845a098 100644
--- a/drivers/net/mdio_sandbox.c
+++ b/drivers/net/mdio_sandbox.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <miiphy.h>
+#include <linux/errno.h>
 
 #define SANDBOX_PHY_ADDR	5
 #define SANDBOX_PHY_REG_CNT	2
diff --git a/drivers/net/mpc8xx_fec.c b/drivers/net/mpc8xx_fec.c
index d65378cec72..63e18789184 100644
--- a/drivers/net/mpc8xx_fec.c
+++ b/drivers/net/mpc8xx_fec.c
@@ -17,6 +17,7 @@
 #include <asm/io.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include <phy.h>
diff --git a/drivers/net/mscc_eswitch/jr2_switch.c b/drivers/net/mscc_eswitch/jr2_switch.c
index d4752492c5b..0e0a4d7037c 100644
--- a/drivers/net/mscc_eswitch/jr2_switch.c
+++ b/drivers/net/mscc_eswitch/jr2_switch.c
@@ -13,6 +13,7 @@
 #include <fdt_support.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/ioport.h>
 #include <miiphy.h>
diff --git a/drivers/net/mscc_eswitch/luton_switch.c b/drivers/net/mscc_eswitch/luton_switch.c
index 0ebc207157b..6ceb250688a 100644
--- a/drivers/net/mscc_eswitch/luton_switch.c
+++ b/drivers/net/mscc_eswitch/luton_switch.c
@@ -12,6 +12,7 @@
 #include <dm/of_addr.h>
 #include <fdt_support.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/ioport.h>
 #include <miiphy.h>
diff --git a/drivers/net/mscc_eswitch/mscc_mac_table.c b/drivers/net/mscc_eswitch/mscc_mac_table.c
index 25b9cad42c9..dba44318f52 100644
--- a/drivers/net/mscc_eswitch/mscc_mac_table.c
+++ b/drivers/net/mscc_eswitch/mscc_mac_table.c
@@ -4,6 +4,7 @@
  */
 
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include "mscc_mac_table.h"
 
diff --git a/drivers/net/mscc_eswitch/mscc_miim.c b/drivers/net/mscc_eswitch/mscc_miim.c
index de257d4d60f..9d59fc53ee9 100644
--- a/drivers/net/mscc_eswitch/mscc_miim.c
+++ b/drivers/net/mscc_eswitch/mscc_miim.c
@@ -7,6 +7,7 @@
 #include <vsprintf.h>
 #include <wait_bit.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include "mscc_miim.h"
 
 #define MIIM_STATUS			0x0
diff --git a/drivers/net/mscc_eswitch/mscc_xfer.c b/drivers/net/mscc_eswitch/mscc_xfer.c
index 6f747464571..a2827b5377e 100644
--- a/drivers/net/mscc_eswitch/mscc_xfer.c
+++ b/drivers/net/mscc_eswitch/mscc_xfer.c
@@ -6,6 +6,7 @@
 #include <log.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include "mscc_xfer.h"
 
diff --git a/drivers/net/mscc_eswitch/ocelot_switch.c b/drivers/net/mscc_eswitch/ocelot_switch.c
index de8a44e48bc..b787524af16 100644
--- a/drivers/net/mscc_eswitch/ocelot_switch.c
+++ b/drivers/net/mscc_eswitch/ocelot_switch.c
@@ -12,6 +12,7 @@
 #include <dm/of_addr.h>
 #include <fdt_support.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/ioport.h>
 #include <miiphy.h>
diff --git a/drivers/net/mscc_eswitch/serval_switch.c b/drivers/net/mscc_eswitch/serval_switch.c
index 540799567ec..9b6e5d8743d 100644
--- a/drivers/net/mscc_eswitch/serval_switch.c
+++ b/drivers/net/mscc_eswitch/serval_switch.c
@@ -12,6 +12,7 @@
 #include <dm/of_addr.h>
 #include <fdt_support.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/ioport.h>
 #include <miiphy.h>
diff --git a/drivers/net/mscc_eswitch/servalt_switch.c b/drivers/net/mscc_eswitch/servalt_switch.c
index a1c86062fac..eecf6153245 100644
--- a/drivers/net/mscc_eswitch/servalt_switch.c
+++ b/drivers/net/mscc_eswitch/servalt_switch.c
@@ -12,6 +12,7 @@
 #include <dm/of_addr.h>
 #include <fdt_support.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/ioport.h>
 #include <miiphy.h>
diff --git a/drivers/net/mt7628-eth.c b/drivers/net/mt7628-eth.c
index 1eea520b876..fd619361727 100644
--- a/drivers/net/mt7628-eth.c
+++ b/drivers/net/mt7628-eth.c
@@ -30,6 +30,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/net/mtk_eth.c b/drivers/net/mtk_eth.c
index ad86820bbb0..8cf78422f7d 100644
--- a/drivers/net/mtk_eth.c
+++ b/drivers/net/mtk_eth.c
@@ -26,6 +26,7 @@
 #include <dm/device_compat.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/ioport.h>
 #include <linux/mdio.h>
 #include <linux/mii.h>
diff --git a/drivers/net/mvmdio.c b/drivers/net/mvmdio.c
index deaba8aee4f..c712043dc7d 100644
--- a/drivers/net/mvmdio.c
+++ b/drivers/net/mvmdio.c
@@ -13,6 +13,7 @@
 #include <asm/io.h>
 #include <wait_bit.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 #define MVMDIO_SMI_DATA_SHIFT		0
diff --git a/drivers/net/pch_gbe.c b/drivers/net/pch_gbe.c
index fa824079391..887958fef54 100644
--- a/drivers/net/pch_gbe.c
+++ b/drivers/net/pch_gbe.c
@@ -17,6 +17,7 @@
 #include <pci.h>
 #include <miiphy.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include "pch_gbe.h"
 
diff --git a/drivers/net/pcnet.c b/drivers/net/pcnet.c
index 24947a33d74..2e7cd2b3dfc 100644
--- a/drivers/net/pcnet.c
+++ b/drivers/net/pcnet.c
@@ -22,6 +22,7 @@
 #include <pci.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #define	PCNET_DEBUG_LEVEL	0	/* 0=off, 1=init, 2=rx/tx */
diff --git a/drivers/net/pfe_eth/pfe_driver.c b/drivers/net/pfe_eth/pfe_driver.c
index 58a4df2ae24..3b777ea77ad 100644
--- a/drivers/net/pfe_eth/pfe_driver.c
+++ b/drivers/net/pfe_eth/pfe_driver.c
@@ -9,6 +9,7 @@
 #include <stdio.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <net/pfe_eth/pfe_eth.h>
 #include <net/pfe_eth/pfe_firmware.h>
diff --git a/drivers/net/pfe_eth/pfe_eth.c b/drivers/net/pfe_eth/pfe_eth.c
index 4848e2e2aa9..f582f8c5af5 100644
--- a/drivers/net/pfe_eth/pfe_eth.c
+++ b/drivers/net/pfe_eth/pfe_eth.c
@@ -13,6 +13,7 @@
 #include <dm/platform_data/pfe_dm_eth.h>
 #include <net.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <net/pfe_eth/pfe_eth.h>
 #include <net/pfe_eth/pfe_mdio.h>
 
diff --git a/drivers/net/pfe_eth/pfe_firmware.c b/drivers/net/pfe_eth/pfe_firmware.c
index 66d5ad930e3..286594d91b9 100644
--- a/drivers/net/pfe_eth/pfe_firmware.c
+++ b/drivers/net/pfe_eth/pfe_firmware.c
@@ -15,6 +15,7 @@
 #include <malloc.h>
 #include <stdio.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <net/pfe_eth/pfe_eth.h>
 #include <net/pfe_eth/pfe_firmware.h>
diff --git a/drivers/net/pfe_eth/pfe_mdio.c b/drivers/net/pfe_eth/pfe_mdio.c
index 4cc55b36885..08536dea67e 100644
--- a/drivers/net/pfe_eth/pfe_mdio.c
+++ b/drivers/net/pfe_eth/pfe_mdio.c
@@ -12,6 +12,7 @@
 #include <dm/platform_data/pfe_dm_eth.h>
 #include <net.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <net/pfe_eth/pfe_eth.h>
 
 extern struct gemac_s gem_info[];
diff --git a/drivers/net/phy/aquantia.c b/drivers/net/phy/aquantia.c
index aa3e566bf2e..1395af5444d 100644
--- a/drivers/net/phy/aquantia.c
+++ b/drivers/net/phy/aquantia.c
@@ -14,6 +14,7 @@
 #include <stdio.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
 #include <malloc.h>
diff --git a/drivers/net/phy/atheros.c b/drivers/net/phy/atheros.c
index 29db299c1e7..7577ebdbe83 100644
--- a/drivers/net/phy/atheros.c
+++ b/drivers/net/phy/atheros.c
@@ -12,6 +12,7 @@
 #include <linux/bitfield.h>
 #include <linux/bitops.h>
 #include <dt-bindings/net/qca-ar803x.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #define AR803x_PHY_DEBUG_ADDR_REG	0x1d
diff --git a/drivers/net/phy/b53.c b/drivers/net/phy/b53.c
index 2e4796f5d6c..1bc9b2e4e7c 100644
--- a/drivers/net/phy/b53.c
+++ b/drivers/net/phy/b53.c
@@ -28,6 +28,7 @@
 #include <vsprintf.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include <errno.h>
diff --git a/drivers/net/phy/cortina.c b/drivers/net/phy/cortina.c
index 18e9f5ab25c..8ab483cdd58 100644
--- a/drivers/net/phy/cortina.c
+++ b/drivers/net/phy/cortina.c
@@ -15,6 +15,7 @@
 #include <vsprintf.h>
 #include <linux/ctype.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/err.h>
 #include <phy.h>
diff --git a/drivers/net/phy/dp83867.c b/drivers/net/phy/dp83867.c
index e4081244f21..9f07045007c 100644
--- a/drivers/net/phy/dp83867.c
+++ b/drivers/net/phy/dp83867.c
@@ -10,6 +10,7 @@
 #include <linux/bitops.h>
 #include <linux/compat.h>
 #include <malloc.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 #include <dm.h>
diff --git a/drivers/net/phy/fixed.c b/drivers/net/phy/fixed.c
index b4833c5ac96..987cde1fc12 100644
--- a/drivers/net/phy/fixed.c
+++ b/drivers/net/phy/fixed.c
@@ -13,6 +13,7 @@
 #include <fdt_support.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
index a313e8bf917..f03b5541a97 100644
--- a/drivers/net/phy/marvell.c
+++ b/drivers/net/phy/marvell.c
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 #define PHY_AUTONEGOTIATE_TIMEOUT 5000
 
diff --git a/drivers/net/phy/meson-gxl.c b/drivers/net/phy/meson-gxl.c
index e7a1008f14d..d65368a85e1 100644
--- a/drivers/net/phy/meson-gxl.c
+++ b/drivers/net/phy/meson-gxl.c
@@ -12,6 +12,7 @@
 #include <linux/bitops.h>
 #include <dm.h>
 #include <phy.h>
+#include <linux/errno.h>
 
 /* This function is provided to cope with the possible failures of this phy
  * during aneg process. When aneg fails, the PHY reports that aneg is done
diff --git a/drivers/net/phy/micrel_ksz90x1.c b/drivers/net/phy/micrel_ksz90x1.c
index f0032e8ce16..4c0b2f4af85 100644
--- a/drivers/net/phy/micrel_ksz90x1.c
+++ b/drivers/net/phy/micrel_ksz90x1.c
@@ -14,6 +14,7 @@
 #include <errno.h>
 #include <micrel.h>
 #include <phy.h>
+#include <linux/errno.h>
 
 /*
  * KSZ9021 - KSZ9031 common
diff --git a/drivers/net/phy/mscc.c b/drivers/net/phy/mscc.c
index f8a4d069440..f0d37d1b81f 100644
--- a/drivers/net/phy/mscc.c
+++ b/drivers/net/phy/mscc.c
@@ -16,6 +16,7 @@
 #include <time.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 /* Microsemi PHY ID's */
diff --git a/drivers/net/phy/mv88e61xx.c b/drivers/net/phy/mv88e61xx.c
index 0a783e03129..927edb62a2e 100644
--- a/drivers/net/phy/mv88e61xx.c
+++ b/drivers/net/phy/mv88e61xx.c
@@ -34,6 +34,7 @@
 #include <stdio.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include <bitfield.h>
diff --git a/drivers/net/phy/ncsi.c b/drivers/net/phy/ncsi.c
index f112fa2bee9..9f68d14bf53 100644
--- a/drivers/net/phy/ncsi.c
+++ b/drivers/net/phy/ncsi.c
@@ -10,6 +10,7 @@
 #include <malloc.h>
 #include <phy.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <net/ncsi.h>
 #include <net/ncsi-pkt.h>
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 026ccc467f6..bda41672cc9 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -23,6 +23,7 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/compiler.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/net/phy/xilinx_gmii2rgmii.c b/drivers/net/phy/xilinx_gmii2rgmii.c
index 86492e90c4d..1a7b24f0f68 100644
--- a/drivers/net/phy/xilinx_gmii2rgmii.c
+++ b/drivers/net/phy/xilinx_gmii2rgmii.c
@@ -11,6 +11,7 @@
 #include <phy.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/net/phy/xilinx_phy.c b/drivers/net/phy/xilinx_phy.c
index 39dbfdb7da8..84fb1f0fe2e 100644
--- a/drivers/net/phy/xilinx_phy.c
+++ b/drivers/net/phy/xilinx_phy.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <phy.h>
 #include <dm.h>
+#include <linux/errno.h>
 
 #define MII_PHY_STATUS_SPD_MASK		0x0C00
 #define MII_PHY_STATUS_FULLDUPLEX	0x1000
diff --git a/drivers/net/pic32_eth.c b/drivers/net/pic32_eth.c
index 5627b5d2d1a..3be550e64d5 100644
--- a/drivers/net/pic32_eth.c
+++ b/drivers/net/pic32_eth.c
@@ -18,6 +18,7 @@
 #include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/mii.h>
 
 #include "pic32_eth.h"
diff --git a/drivers/net/pic32_mdio.c b/drivers/net/pic32_mdio.c
index 963b9e7fc8f..d30bceb4e53 100644
--- a/drivers/net/pic32_mdio.c
+++ b/drivers/net/pic32_mdio.c
@@ -13,6 +13,7 @@
 #include <wait_bit.h>
 #include <asm/io.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include "pic32_eth.h"
 
diff --git a/drivers/net/ravb.c b/drivers/net/ravb.c
index b3f392cb8bf..d9d376c09ec 100644
--- a/drivers/net/ravb.c
+++ b/drivers/net/ravb.c
@@ -22,6 +22,7 @@
 #include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/mii.h>
 #include <wait_bit.h>
 #include <asm/io.h>
diff --git a/drivers/net/rtl8139.c b/drivers/net/rtl8139.c
index ba0f477bf23..7c0bb2372d3 100644
--- a/drivers/net/rtl8139.c
+++ b/drivers/net/rtl8139.c
@@ -82,6 +82,7 @@
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/types.h>
 
diff --git a/drivers/net/rtl8169.c b/drivers/net/rtl8169.c
index c64888be490..9cc5cc8acf9 100644
--- a/drivers/net/rtl8169.c
+++ b/drivers/net/rtl8169.c
@@ -57,6 +57,7 @@
 #include <pci.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/net/sandbox-raw-bus.c b/drivers/net/sandbox-raw-bus.c
index 6b111d47eea..1509630b835 100644
--- a/drivers/net/sandbox-raw-bus.c
+++ b/drivers/net/sandbox-raw-bus.c
@@ -11,6 +11,7 @@
 #include <malloc.h>
 #include <dm/device-internal.h>
 #include <dm/lists.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 static int eth_raw_bus_post_bind(struct udevice *dev)
diff --git a/drivers/net/sandbox.c b/drivers/net/sandbox.c
index 0551d0670b1..37eeaab4e82 100644
--- a/drivers/net/sandbox.c
+++ b/drivers/net/sandbox.c
@@ -16,6 +16,7 @@
 #include <asm/eth.h>
 #include <asm/global_data.h>
 #include <asm/test.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
index 196020c1b81..8b1aae24467 100644
--- a/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.c
@@ -13,6 +13,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/delay.h>
 #include <linux/string.h>
diff --git a/drivers/net/sni_ave.c b/drivers/net/sni_ave.c
index 13ec074acac..eb422f33b70 100644
--- a/drivers/net/sni_ave.c
+++ b/drivers/net/sni_ave.c
@@ -22,6 +22,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/iopoll.h>
 #include <linux/printk.h>
diff --git a/drivers/net/sun8i_emac.c b/drivers/net/sun8i_emac.c
index 0715cf81c74..8b94322ae74 100644
--- a/drivers/net/sun8i_emac.c
+++ b/drivers/net/sun8i_emac.c
@@ -36,6 +36,7 @@
 #if CONFIG_IS_ENABLED(DM_GPIO)
 #include <asm-generic/gpio.h>
 #endif
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #define MDIO_CMD_MII_BUSY		BIT(0)
diff --git a/drivers/net/sunxi_emac.c b/drivers/net/sunxi_emac.c
index 009d0de4845..4470c741fa9 100644
--- a/drivers/net/sunxi_emac.c
+++ b/drivers/net/sunxi_emac.c
@@ -19,6 +19,7 @@
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/gpio.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 /* EMAC register  */
diff --git a/drivers/net/ti/am65-cpsw-nuss.c b/drivers/net/ti/am65-cpsw-nuss.c
index 571f1ebfc46..14956af4580 100644
--- a/drivers/net/ti/am65-cpsw-nuss.c
+++ b/drivers/net/ti/am65-cpsw-nuss.c
@@ -23,6 +23,7 @@
 #include <phy.h>
 #include <power-domain.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/soc/ti/ti-udma.h>
 
diff --git a/drivers/net/ti/cpsw-common.c b/drivers/net/ti/cpsw-common.c
index 9ed0b56cc80..0b4adb1aa61 100644
--- a/drivers/net/ti/cpsw-common.c
+++ b/drivers/net/ti/cpsw-common.c
@@ -12,6 +12,7 @@
 #include <asm/io.h>
 #include <cpsw.h>
 #include <dm/device_compat.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/net/ti/cpsw_mdio.c b/drivers/net/ti/cpsw_mdio.c
index e47d5a2a5c5..2e70477756a 100644
--- a/drivers/net/ti/cpsw_mdio.c
+++ b/drivers/net/ti/cpsw_mdio.c
@@ -14,6 +14,7 @@
 #include <wait_bit.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 struct cpsw_mdio_regs {
 	u32	version;
diff --git a/drivers/net/ti/davinci_emac.c b/drivers/net/ti/davinci_emac.c
index 19041be320e..272127903f5 100644
--- a/drivers/net/ti/davinci_emac.c
+++ b/drivers/net/ti/davinci_emac.c
@@ -35,6 +35,7 @@
 #include <asm/arch/emac_defs.h>
 #include <asm/io.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include "davinci_emac.h"
 
diff --git a/drivers/net/ti/keystone_net.c b/drivers/net/ti/keystone_net.c
index 96bbb219d5d..a6062e33638 100644
--- a/drivers/net/ti/keystone_net.c
+++ b/drivers/net/ti/keystone_net.c
@@ -12,6 +12,7 @@
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 #include <dm.h>
diff --git a/drivers/net/vsc9953.c b/drivers/net/vsc9953.c
index 4ae225e879f..36960bf1234 100644
--- a/drivers/net/vsc9953.c
+++ b/drivers/net/vsc9953.c
@@ -21,6 +21,7 @@
 #include <ethsw.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 static struct vsc9953_info vsc9953_l2sw = {
 		.port[0] = VSC9953_PORT_INFO_INITIALIZER(0),
diff --git a/drivers/net/xilinx_axi_emac.c b/drivers/net/xilinx_axi_emac.c
index f6cf8df44ff..0da2385a92e 100644
--- a/drivers/net/xilinx_axi_emac.c
+++ b/drivers/net/xilinx_axi_emac.c
@@ -20,6 +20,7 @@
 #include <miiphy.h>
 #include <wait_bit.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/nvme/nvme.c b/drivers/nvme/nvme.c
index 9ce57335bc6..47a401cc96f 100644
--- a/drivers/nvme/nvme.c
+++ b/drivers/nvme/nvme.c
@@ -18,6 +18,7 @@
 #include <vsprintf.h>
 #include <dm/device-internal.h>
 #include <linux/compat.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include "nvme.h"
 
diff --git a/drivers/nvme/nvme_show.c b/drivers/nvme/nvme_show.c
index 5a0bb4a223e..2c3d7bcfa00 100644
--- a/drivers/nvme/nvme_show.c
+++ b/drivers/nvme/nvme_show.c
@@ -10,6 +10,7 @@
 #include <memalign.h>
 #include <nvme.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include "nvme.h"
 
 static void print_optional_admin_cmd(u16 oacs, int devnum)
diff --git a/drivers/pch/pch-uclass.c b/drivers/pch/pch-uclass.c
index ad4906aa58b..be9b89539f0 100644
--- a/drivers/pch/pch-uclass.c
+++ b/drivers/pch/pch-uclass.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <pch.h>
+#include <linux/errno.h>
 
 int pch_get_spi_base(struct udevice *dev, ulong *sbasep)
 {
diff --git a/drivers/pch/pch7.c b/drivers/pch/pch7.c
index 5fb35a19eff..8fc6388593f 100644
--- a/drivers/pch/pch7.c
+++ b/drivers/pch/pch7.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <log.h>
 #include <pch.h>
+#include <linux/errno.h>
 
 #define GPIO_BASE	0x44
 #define BIOS_CTRL	0xd8
diff --git a/drivers/pch/pch9.c b/drivers/pch/pch9.c
index 3bd011518b3..f36b70c53ab 100644
--- a/drivers/pch/pch9.c
+++ b/drivers/pch/pch9.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <log.h>
 #include <pch.h>
+#include <linux/errno.h>
 
 #define GPIO_BASE	0x48
 #define IO_BASE		0x4c
diff --git a/drivers/pch/sandbox_pch.c b/drivers/pch/sandbox_pch.c
index 76f552527e3..c9317f1fda2 100644
--- a/drivers/pch/sandbox_pch.c
+++ b/drivers/pch/sandbox_pch.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <dm.h>
 #include <pch.h>
+#include <linux/errno.h>
 
 struct sandbox_pch_priv {
 	bool protect;
diff --git a/drivers/pci/pci-aardvark.c b/drivers/pci/pci-aardvark.c
index 76234ea61c4..f2c2eb3870f 100644
--- a/drivers/pci/pci-aardvark.c
+++ b/drivers/pci/pci-aardvark.c
@@ -33,6 +33,7 @@
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/ioport.h>
 
 /* PCIe core registers */
diff --git a/drivers/pci/pci-emul-uclass.c b/drivers/pci/pci-emul-uclass.c
index 6355daee5e1..1ba42693a84 100644
--- a/drivers/pci/pci-emul-uclass.c
+++ b/drivers/pci/pci-emul-uclass.c
@@ -9,6 +9,7 @@
 #include <fdtdec.h>
 #include <log.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <pci.h>
 #include <dm/lists.h>
diff --git a/drivers/pci/pci-rcar-gen2.c b/drivers/pci/pci-rcar-gen2.c
index e76abc1f84c..d73c171846f 100644
--- a/drivers/pci/pci-rcar-gen2.c
+++ b/drivers/pci/pci-rcar-gen2.c
@@ -12,6 +12,7 @@
 #include <errno.h>
 #include <pci.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 /* AHB-PCI Bridge PCI communication registers */
 #define RCAR_AHBPCI_PCICOM_OFFSET	0x800
diff --git a/drivers/pci/pci-rcar-gen3.c b/drivers/pci/pci-rcar-gen3.c
index 1f51854ccc6..9a990a06324 100644
--- a/drivers/pci/pci-rcar-gen3.c
+++ b/drivers/pci/pci-rcar-gen3.c
@@ -23,6 +23,7 @@
 #include <pci.h>
 #include <wait_bit.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #define PCIECAR			0x000010
 #define PCIECCTLR		0x000018
diff --git a/drivers/pci/pci-uclass.c b/drivers/pci/pci-uclass.c
index 1174d90b5f1..3cd87c7fc65 100644
--- a/drivers/pci/pci-uclass.c
+++ b/drivers/pci/pci-uclass.c
@@ -22,6 +22,7 @@
 #include <asm/fsp/fsp_support.h>
 #endif
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include "pci_internal.h"
diff --git a/drivers/pci/pci_common.c b/drivers/pci/pci_common.c
index e7469d88d82..7ee0980bb75 100644
--- a/drivers/pci/pci_common.c
+++ b/drivers/pci/pci_common.c
@@ -16,6 +16,7 @@
 #include <pci.h>
 #include <stdio.h>
 #include <asm/io.h>
+#include <linux/errno.h>
 
 const char *pci_class_str(u8 class)
 {
diff --git a/drivers/pci/pci_mpc85xx.c b/drivers/pci/pci_mpc85xx.c
index d7073a49694..d207f8e645b 100644
--- a/drivers/pci/pci_mpc85xx.c
+++ b/drivers/pci/pci_mpc85xx.c
@@ -11,6 +11,7 @@
 #include <pci.h>
 #include <dm.h>
 #include <asm/fsl_law.h>
+#include <linux/errno.h>
 
 struct mpc85xx_pci_priv {
 	void __iomem		*cfg_addr;
diff --git a/drivers/pci/pci_rom.c b/drivers/pci/pci_rom.c
index 3a046df743d..85ad27322f9 100644
--- a/drivers/pci/pci_rom.c
+++ b/drivers/pci/pci_rom.c
@@ -41,6 +41,7 @@
 #include <video_fb.h>
 #include <acpi/acpi_s3.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/screen_info.h>
 #include <linux/string.h>
 
diff --git a/drivers/pci/pci_sandbox.c b/drivers/pci/pci_sandbox.c
index 8745f286bd4..4af0bf73034 100644
--- a/drivers/pci/pci_sandbox.c
+++ b/drivers/pci/pci_sandbox.c
@@ -9,6 +9,7 @@
 #include <fdtdec.h>
 #include <log.h>
 #include <pci.h>
+#include <linux/errno.h>
 
 #define FDT_DEV_INFO_CELLS	4
 #define FDT_DEV_INFO_SIZE	(FDT_DEV_INFO_CELLS * sizeof(u32))
diff --git a/drivers/pci/pci_sh7751.c b/drivers/pci/pci_sh7751.c
index 62d098d378f..d5d1147f37d 100644
--- a/drivers/pci/pci_sh7751.c
+++ b/drivers/pci/pci_sh7751.c
@@ -14,6 +14,7 @@
 #include <asm/pci.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 /* Register addresses and such */
 #define SH7751_BCR1	(vu_long *)0xFF800000
diff --git a/drivers/pci/pci_tegra.c b/drivers/pci/pci_tegra.c
index 8845dc451e5..5f8cde34bdf 100644
--- a/drivers/pci/pci_tegra.c
+++ b/drivers/pci/pci_tegra.c
@@ -23,6 +23,7 @@
 #include <reset.h>
 #include <time.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/pci/pcie_brcmstb.c b/drivers/pci/pcie_brcmstb.c
index 4fd4d4dfbd1..10a19bdc950 100644
--- a/drivers/pci/pcie_brcmstb.c
+++ b/drivers/pci/pcie_brcmstb.c
@@ -20,6 +20,7 @@
 #include <pci.h>
 #include <asm/io.h>
 #include <linux/bitfield.h>
+#include <linux/errno.h>
 #include <linux/log2.h>
 #include <linux/iopoll.h>
 
diff --git a/drivers/pci/pcie_dw_mvebu.c b/drivers/pci/pcie_dw_mvebu.c
index b1f2750888c..287736cd88c 100644
--- a/drivers/pci/pcie_dw_mvebu.c
+++ b/drivers/pci/pcie_dw_mvebu.c
@@ -20,6 +20,7 @@
 #include <asm/io.h>
 #include <asm-generic/gpio.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/pci/pcie_dw_ti.c b/drivers/pci/pcie_dw_ti.c
index 3d86bdaaafb..00b9a2418ab 100644
--- a/drivers/pci/pcie_dw_ti.c
+++ b/drivers/pci/pcie_dw_ti.c
@@ -20,6 +20,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/pci/pcie_fsl.c b/drivers/pci/pcie_fsl.c
index a8978dcc3bd..055c454599d 100644
--- a/drivers/pci/pcie_fsl.c
+++ b/drivers/pci/pcie_fsl.c
@@ -17,6 +17,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include "pcie_fsl.h"
 #include <dm/device_compat.h>
diff --git a/drivers/pci/pcie_imx.c b/drivers/pci/pcie_imx.c
index ab3d96efc53..928f624da9a 100644
--- a/drivers/pci/pcie_imx.c
+++ b/drivers/pci/pcie_imx.c
@@ -22,6 +22,7 @@
 #include <asm/io.h>
 #include <dm.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/sizes.h>
 #include <errno.h>
 #include <asm/arch/sys_proto.h>
diff --git a/drivers/pci/pcie_intel_fpga.c b/drivers/pci/pcie_intel_fpga.c
index 2aedbdd0e56..bc937532642 100644
--- a/drivers/pci/pcie_intel_fpga.c
+++ b/drivers/pci/pcie_intel_fpga.c
@@ -14,6 +14,7 @@
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 #define RP_TX_REG0			0x2000
 #define RP_TX_CNTRL			0x2004
diff --git a/drivers/pci/pcie_layerscape_ep.c b/drivers/pci/pcie_layerscape_ep.c
index c32c40f7957..680455fb31f 100644
--- a/drivers/pci/pcie_layerscape_ep.c
+++ b/drivers/pci/pcie_layerscape_ep.c
@@ -13,6 +13,7 @@
 #include <errno.h>
 #include <pci_ep.h>
 #include <asm/io.h>
+#include <linux/errno.h>
 #include <linux/sizes.h>
 #include <linux/log2.h>
 #include "pcie_layerscape.h"
diff --git a/drivers/pci/pcie_layerscape_fixup.c b/drivers/pci/pcie_layerscape_fixup.c
index d056294d649..6cab1f0f99b 100644
--- a/drivers/pci/pcie_layerscape_fixup.c
+++ b/drivers/pci/pcie_layerscape_fixup.c
@@ -19,6 +19,7 @@
 #include <asm/arch/clock.h>
 #endif
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 #include "pcie_layerscape.h"
 #include "pcie_layerscape_fixup_common.h"
 
diff --git a/drivers/pci/pcie_layerscape_fixup_common.c b/drivers/pci/pcie_layerscape_fixup_common.c
index b1a7578ec43..05b5f76cf2c 100644
--- a/drivers/pci/pcie_layerscape_fixup_common.c
+++ b/drivers/pci/pcie_layerscape_fixup_common.c
@@ -12,6 +12,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/soc.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <linux/string.h>
 #include "pcie_layerscape_fixup_common.h"
diff --git a/drivers/pci/pcie_layerscape_gen4.c b/drivers/pci/pcie_layerscape_gen4.c
index 369124c2b8b..dcb991596b0 100644
--- a/drivers/pci/pcie_layerscape_gen4.c
+++ b/drivers/pci/pcie_layerscape_gen4.c
@@ -16,6 +16,7 @@
 #include <errno.h>
 #include <malloc.h>
 #include <dm.h>
+#include <linux/errno.h>
 #include <linux/sizes.h>
 
 #include "pcie_layerscape_gen4.h"
diff --git a/drivers/pci/pcie_layerscape_gen4_fixup.c b/drivers/pci/pcie_layerscape_gen4_fixup.c
index b061388a22b..be70a9a8b57 100644
--- a/drivers/pci/pcie_layerscape_gen4_fixup.c
+++ b/drivers/pci/pcie_layerscape_gen4_fixup.c
@@ -20,6 +20,7 @@
 #include <asm/arch/clock.h>
 #endif
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 #include "pcie_layerscape_gen4.h"
 #include "pcie_layerscape_fixup_common.h"
 
diff --git a/drivers/pci/pcie_layerscape_rc.c b/drivers/pci/pcie_layerscape_rc.c
index 4c96f721b05..18d025d3b16 100644
--- a/drivers/pci/pcie_layerscape_rc.c
+++ b/drivers/pci/pcie_layerscape_rc.c
@@ -19,6 +19,7 @@
 	defined(CONFIG_ARM)
 #include <asm/arch/clock.h>
 #endif
+#include <linux/errno.h>
 #include "pcie_layerscape.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/pci/pcie_mediatek.c b/drivers/pci/pcie_mediatek.c
index 8318b9ee796..29d82739486 100644
--- a/drivers/pci/pcie_mediatek.c
+++ b/drivers/pci/pcie_mediatek.c
@@ -19,6 +19,7 @@
 #include <asm/io.h>
 #include <dm/devres.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/iopoll.h>
 #include <linux/list.h>
 #include <linux/printk.h>
diff --git a/drivers/pci/pcie_phytium.c b/drivers/pci/pcie_phytium.c
index 926e7b33a86..3d91706ccf1 100644
--- a/drivers/pci/pcie_phytium.c
+++ b/drivers/pci/pcie_phytium.c
@@ -12,6 +12,7 @@
 #include <pci.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 /**
diff --git a/drivers/pci/pcie_rockchip.c b/drivers/pci/pcie_rockchip.c
index 7d84be36be9..460d74a3088 100644
--- a/drivers/pci/pcie_rockchip.c
+++ b/drivers/pci/pcie_rockchip.c
@@ -19,6 +19,7 @@
 #include <generic-phy.h>
 #include <pci.h>
 #include <power-domain.h>
+#include <linux/errno.h>
 #include <power/regulator.h>
 #include <reset.h>
 #include <syscon.h>
diff --git a/drivers/pci/pcie_xilinx.c b/drivers/pci/pcie_xilinx.c
index 600c69e20cf..442a21c1115 100644
--- a/drivers/pci/pcie_xilinx.c
+++ b/drivers/pci/pcie_xilinx.c
@@ -10,6 +10,7 @@
 #include <pci.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 #include <asm/io.h>
diff --git a/drivers/pci_endpoint/pci_ep-uclass.c b/drivers/pci_endpoint/pci_ep-uclass.c
index 71b6bfa6382..aba38c3fe79 100644
--- a/drivers/pci_endpoint/pci_ep-uclass.c
+++ b/drivers/pci_endpoint/pci_ep-uclass.c
@@ -13,6 +13,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/log2.h>
 #include <pci_ep.h>
 
diff --git a/drivers/pci_endpoint/pcie-cadence-ep.c b/drivers/pci_endpoint/pcie-cadence-ep.c
index e392fae338a..44cce69a9aa 100644
--- a/drivers/pci_endpoint/pcie-cadence-ep.c
+++ b/drivers/pci_endpoint/pcie-cadence-ep.c
@@ -9,6 +9,7 @@
 #include <errno.h>
 #include <pci_ep.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/sizes.h>
 #include <linux/log2.h>
 #include "pcie-cadence.h"
diff --git a/drivers/pci_endpoint/sandbox-pci_ep.c b/drivers/pci_endpoint/sandbox-pci_ep.c
index d1e552a2466..59c330066d7 100644
--- a/drivers/pci_endpoint/sandbox-pci_ep.c
+++ b/drivers/pci_endpoint/sandbox-pci_ep.c
@@ -9,6 +9,7 @@
 #include <pci.h>
 #include <pci_ep.h>
 #include <asm/test.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 /**
diff --git a/drivers/phy/allwinner/phy-sun4i-usb.c b/drivers/phy/allwinner/phy-sun4i-usb.c
index 16c412b245d..17c2de2caee 100644
--- a/drivers/phy/allwinner/phy-sun4i-usb.c
+++ b/drivers/phy/allwinner/phy-sun4i-usb.c
@@ -27,6 +27,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #define REG_ISCR			0x00
diff --git a/drivers/phy/bcm6318-usbh-phy.c b/drivers/phy/bcm6318-usbh-phy.c
index d29344ddb48..f6b7e4c1ca5 100644
--- a/drivers/phy/bcm6318-usbh-phy.c
+++ b/drivers/phy/bcm6318-usbh-phy.c
@@ -19,6 +19,7 @@
 #include <dm/device.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 /* USBH Setup register */
 #define USBH_SETUP_REG		0x00
diff --git a/drivers/phy/bcm6348-usbh-phy.c b/drivers/phy/bcm6348-usbh-phy.c
index 8d28292726c..13031b886d4 100644
--- a/drivers/phy/bcm6348-usbh-phy.c
+++ b/drivers/phy/bcm6348-usbh-phy.c
@@ -17,6 +17,7 @@
 #include <asm/io.h>
 #include <dm/device.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #define USBH_SETUP_PORT1_EN	BIT(0)
 
diff --git a/drivers/phy/bcm6358-usbh-phy.c b/drivers/phy/bcm6358-usbh-phy.c
index 501b97f3e21..aaa32315fa7 100644
--- a/drivers/phy/bcm6358-usbh-phy.c
+++ b/drivers/phy/bcm6358-usbh-phy.c
@@ -16,6 +16,7 @@
 #include <asm/io.h>
 #include <dm/device.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 /* USBH Swap Control register */
 #define USBH_SWAP_REG		0x00
diff --git a/drivers/phy/bcm6368-usbh-phy.c b/drivers/phy/bcm6368-usbh-phy.c
index 99fdd33499a..3bd4d688419 100644
--- a/drivers/phy/bcm6368-usbh-phy.c
+++ b/drivers/phy/bcm6368-usbh-phy.c
@@ -19,6 +19,7 @@
 #include <dm/device.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 /* USBH PLL Control register */
 #define USBH_PLL_REG		0x18
diff --git a/drivers/phy/keystone-usb-phy.c b/drivers/phy/keystone-usb-phy.c
index 27e1d35fc12..2806ee50ead 100644
--- a/drivers/phy/keystone-usb-phy.c
+++ b/drivers/phy/keystone-usb-phy.c
@@ -13,6 +13,7 @@
 #include <asm/arch/psc_defs.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 /* USB PHY control register offsets */
diff --git a/drivers/phy/meson-g12a-usb2.c b/drivers/phy/meson-g12a-usb2.c
index 734c79b78aa..3a63900833e 100644
--- a/drivers/phy/meson-g12a-usb2.c
+++ b/drivers/phy/meson-g12a-usb2.c
@@ -17,6 +17,7 @@
 #include <generic-phy.h>
 #include <regmap.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <power/regulator.h>
 #include <reset.h>
diff --git a/drivers/phy/meson-g12a-usb3-pcie.c b/drivers/phy/meson-g12a-usb3-pcie.c
index dc5dd62381f..02feae1e2cd 100644
--- a/drivers/phy/meson-g12a-usb3-pcie.c
+++ b/drivers/phy/meson-g12a-usb3-pcie.c
@@ -18,6 +18,7 @@
 #include <bitfield.h>
 #include <generic-phy.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 #include <linux/bitops.h>
diff --git a/drivers/phy/meson-gxbb-usb2.c b/drivers/phy/meson-gxbb-usb2.c
index 6ae06364a57..8a06bc5aadb 100644
--- a/drivers/phy/meson-gxbb-usb2.c
+++ b/drivers/phy/meson-gxbb-usb2.c
@@ -12,6 +12,7 @@
 #include <clk.h>
 #include <dm.h>
 #include <generic-phy.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <power/regulator.h>
 #include <regmap.h>
diff --git a/drivers/phy/meson-gxl-usb2.c b/drivers/phy/meson-gxl-usb2.c
index 4bddd0eed9e..ebfde063ee8 100644
--- a/drivers/phy/meson-gxl-usb2.c
+++ b/drivers/phy/meson-gxl-usb2.c
@@ -16,6 +16,7 @@
 #include <generic-phy.h>
 #include <regmap.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <power/regulator.h>
 #include <clk.h>
diff --git a/drivers/phy/meson-gxl-usb3.c b/drivers/phy/meson-gxl-usb3.c
index 875fe6b44a6..f566ef78663 100644
--- a/drivers/phy/meson-gxl-usb3.c
+++ b/drivers/phy/meson-gxl-usb3.c
@@ -16,6 +16,7 @@
 #include <generic-phy.h>
 #include <regmap.h>
 #include <clk.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/usb/otg.h>
 
diff --git a/drivers/phy/msm8916-usbh-phy.c b/drivers/phy/msm8916-usbh-phy.c
index 4efaddd701c..5883926f087 100644
--- a/drivers/phy/msm8916-usbh-phy.c
+++ b/drivers/phy/msm8916-usbh-phy.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <generic-phy.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <usb/ehci-ci.h>
 #include <usb/ulpi.h>
 #include <asm/io.h>
diff --git a/drivers/phy/mt76x8-usb-phy.c b/drivers/phy/mt76x8-usb-phy.c
index 4c0818f6e8d..8c05e5e00df 100644
--- a/drivers/phy/mt76x8-usb-phy.c
+++ b/drivers/phy/mt76x8-usb-phy.c
@@ -15,6 +15,7 @@
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 #define OFS_U2_PHY_AC0			0x800
 #define USBPLL_FBDIV_S			16
diff --git a/drivers/phy/omap-usb2-phy.c b/drivers/phy/omap-usb2-phy.c
index a460a0560c3..df9ee140291 100644
--- a/drivers/phy/omap-usb2-phy.c
+++ b/drivers/phy/omap-usb2-phy.c
@@ -17,6 +17,7 @@
 #include <syscon.h>
 #include <linux/bitops.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 
 #define OMAP_USB2_CALIBRATE_FALSE_DISCONNECT	BIT(0)
 #define OMAP_USB2_DISABLE_CHG_DET		BIT(1)
diff --git a/drivers/phy/phy-da8xx-usb.c b/drivers/phy/phy-da8xx-usb.c
index ec87d3fea2d..943c908fafa 100644
--- a/drivers/phy/phy-da8xx-usb.c
+++ b/drivers/phy/phy-da8xx-usb.c
@@ -16,6 +16,7 @@
 #include <asm/arch/da8xx-usb.h>
 #include <asm/io.h>
 #include <generic-phy.h>
+#include <linux/errno.h>
 
 static int da8xx_usb_phy_power_on(struct phy *phy)
 {
diff --git a/drivers/phy/phy-mtk-tphy.c b/drivers/phy/phy-mtk-tphy.c
index 1e65c24356e..375a7575b77 100644
--- a/drivers/phy/phy-mtk-tphy.c
+++ b/drivers/phy/phy-mtk-tphy.c
@@ -16,6 +16,7 @@
 #include <dm/devres.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 #include <dt-bindings/phy/phy.h>
 
diff --git a/drivers/phy/phy-rcar-gen2.c b/drivers/phy/phy-rcar-gen2.c
index 18da86e4bea..db32d3b1a41 100644
--- a/drivers/phy/phy-rcar-gen2.c
+++ b/drivers/phy/phy-rcar-gen2.c
@@ -19,6 +19,7 @@
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <power/regulator.h>
 
 #define USBHS_LPSTS			0x02
diff --git a/drivers/phy/phy-rcar-gen3.c b/drivers/phy/phy-rcar-gen3.c
index 4afdb791505..fdd61efe4ac 100644
--- a/drivers/phy/phy-rcar-gen3.c
+++ b/drivers/phy/phy-rcar-gen3.c
@@ -17,6 +17,7 @@
 #include <usb.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <power/regulator.h>
 
diff --git a/drivers/phy/phy-stm32-usbphyc.c b/drivers/phy/phy-stm32-usbphyc.c
index d61a33422bc..c66d185cc82 100644
--- a/drivers/phy/phy-stm32-usbphyc.c
+++ b/drivers/phy/phy-stm32-usbphyc.c
@@ -17,6 +17,7 @@
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <power/regulator.h>
 
diff --git a/drivers/phy/phy-ti-am654.c b/drivers/phy/phy-ti-am654.c
index 6907c1afb39..fa22b714540 100644
--- a/drivers/phy/phy-ti-am654.c
+++ b/drivers/phy/phy-ti-am654.c
@@ -23,6 +23,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 
 #define CMU_R07C		0x7c
 #define CMU_MASTER_CDN_O	BIT(24)
diff --git a/drivers/phy/phy-uclass.c b/drivers/phy/phy-uclass.c
index af5c2c6497a..bde8d029a44 100644
--- a/drivers/phy/phy-uclass.c
+++ b/drivers/phy/phy-uclass.c
@@ -9,6 +9,7 @@
 #include <dm/devres.h>
 #include <generic-phy.h>
 #include <log.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 static inline struct phy_ops *phy_dev_ops(struct udevice *dev)
diff --git a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
index 75bd0fff5db..93d3696b133 100644
--- a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
+++ b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
@@ -17,6 +17,7 @@
 #include <syscon.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
+#include <linux/errno.h>
 #include <linux/iopoll.h>
 #include <asm/arch-rockchip/clock.h>
 #include <linux/string.h>
diff --git a/drivers/phy/rockchip/phy-rockchip-pcie.c b/drivers/phy/rockchip/phy-rockchip-pcie.c
index c3bec8263f8..fc7801224ac 100644
--- a/drivers/phy/rockchip/phy-rockchip-pcie.c
+++ b/drivers/phy/rockchip/phy-rockchip-pcie.c
@@ -17,6 +17,7 @@
 #include <syscon.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
+#include <linux/errno.h>
 #include <linux/iopoll.h>
 #include <asm/arch-rockchip/clock.h>
 
diff --git a/drivers/phy/rockchip/phy-rockchip-typec.c b/drivers/phy/rockchip/phy-rockchip-typec.c
index 9a9a653c7ef..f018a95497d 100644
--- a/drivers/phy/rockchip/phy-rockchip-typec.c
+++ b/drivers/phy/rockchip/phy-rockchip-typec.c
@@ -19,6 +19,7 @@
 #include <syscon.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
+#include <linux/errno.h>
 #include <linux/iopoll.h>
 #include <asm/arch-rockchip/clock.h>
 #include <linux/string.h>
diff --git a/drivers/phy/sandbox-phy.c b/drivers/phy/sandbox-phy.c
index 84ff5c6275b..5b867a6294e 100644
--- a/drivers/phy/sandbox-phy.c
+++ b/drivers/phy/sandbox-phy.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <generic-phy.h>
+#include <linux/errno.h>
 
 struct sandbox_phy_priv {
 	bool initialized;
diff --git a/drivers/phy/sti_usb_phy.c b/drivers/phy/sti_usb_phy.c
index cfc24e76b24..03a4d61434e 100644
--- a/drivers/phy/sti_usb_phy.c
+++ b/drivers/phy/sti_usb_phy.c
@@ -13,6 +13,7 @@
 #include <errno.h>
 #include <fdtdec.h>
 #include <generic-phy.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <regmap.h>
 #include <reset-uclass.h>
diff --git a/drivers/phy/ti-pipe3-phy.c b/drivers/phy/ti-pipe3-phy.c
index 2aa2a90c47c..96a573add48 100644
--- a/drivers/phy/ti-pipe3-phy.c
+++ b/drivers/phy/ti-pipe3-phy.c
@@ -17,6 +17,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 /* PLLCTRL Registers */
diff --git a/drivers/pinctrl/aspeed/pinctrl_ast2500.c b/drivers/pinctrl/aspeed/pinctrl_ast2500.c
index 05ef24864f2..3f57aabea1d 100644
--- a/drivers/pinctrl/aspeed/pinctrl_ast2500.c
+++ b/drivers/pinctrl/aspeed/pinctrl_ast2500.c
@@ -11,6 +11,7 @@
 #include <asm/arch/pinctrl.h>
 #include <asm/arch/scu_ast2500.h>
 #include <dm/pinctrl.h>
+#include <linux/errno.h>
 
 /*
  * This driver works with very simple configuration that has the same name
diff --git a/drivers/pinctrl/ath79/pinctrl_ar933x.c b/drivers/pinctrl/ath79/pinctrl_ar933x.c
index b3f9f6a01fd..9f8ecf49ca4 100644
--- a/drivers/pinctrl/ath79/pinctrl_ar933x.c
+++ b/drivers/pinctrl/ath79/pinctrl_ar933x.c
@@ -10,6 +10,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm/pinctrl.h>
+#include <linux/errno.h>
 #include <mach/ar71xx_regs.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/pinctrl/ath79/pinctrl_qca953x.c b/drivers/pinctrl/ath79/pinctrl_qca953x.c
index d27848c1ddd..409ab041173 100644
--- a/drivers/pinctrl/ath79/pinctrl_qca953x.c
+++ b/drivers/pinctrl/ath79/pinctrl_qca953x.c
@@ -10,6 +10,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm/pinctrl.h>
+#include <linux/errno.h>
 #include <mach/ar71xx_regs.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/pinctrl/broadcom/pinctrl-bcm283x.c b/drivers/pinctrl/broadcom/pinctrl-bcm283x.c
index 775a8a0a48a..a7c928c71e3 100644
--- a/drivers/pinctrl/broadcom/pinctrl-bcm283x.c
+++ b/drivers/pinctrl/broadcom/pinctrl-bcm283x.c
@@ -23,6 +23,7 @@
 #include <asm/system.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
+#include <linux/errno.h>
 
 struct bcm283x_pinctrl_priv {
 	u32 *base_reg;
diff --git a/drivers/pinctrl/broadcom/pinctrl-bcm6838.c b/drivers/pinctrl/broadcom/pinctrl-bcm6838.c
index af10ead601f..2f871b611fd 100644
--- a/drivers/pinctrl/broadcom/pinctrl-bcm6838.c
+++ b/drivers/pinctrl/broadcom/pinctrl-bcm6838.c
@@ -7,6 +7,7 @@
 #include <vsprintf.h>
 #include <dm/device_compat.h>
 #include <dm/pinctrl.h>
+#include <linux/errno.h>
 
 #define BCM6838_CMD_LOAD_MUX            0x21
 
diff --git a/drivers/pinctrl/exynos/pinctrl-exynos.c b/drivers/pinctrl/exynos/pinctrl-exynos.c
index 6034794f671..4a49519416c 100644
--- a/drivers/pinctrl/exynos/pinctrl-exynos.c
+++ b/drivers/pinctrl/exynos/pinctrl-exynos.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include "pinctrl-exynos.h"
 
diff --git a/drivers/pinctrl/exynos/pinctrl-exynos7420.c b/drivers/pinctrl/exynos/pinctrl-exynos7420.c
index ff6d6c4143f..7f1aeeda940 100644
--- a/drivers/pinctrl/exynos/pinctrl-exynos7420.c
+++ b/drivers/pinctrl/exynos/pinctrl-exynos7420.c
@@ -13,6 +13,7 @@
 #include <dm/root.h>
 #include <fdtdec.h>
 #include <asm/arch/pinmux.h>
+#include <linux/errno.h>
 #include "pinctrl-exynos.h"
 
 #define	GPD1_OFFSET	0xc0
diff --git a/drivers/pinctrl/intel/pinctrl.c b/drivers/pinctrl/intel/pinctrl.c
index 933175d2b6c..aa261a8bdc5 100644
--- a/drivers/pinctrl/intel/pinctrl.c
+++ b/drivers/pinctrl/intel/pinctrl.c
@@ -32,6 +32,7 @@
 #include <dm/device-internal.h>
 #include <dt-bindings/gpio/gpio.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 
 #define GPIO_DW_SIZE(x)			(sizeof(u32) * (x))
 #define PAD_CFG_OFFSET(x, dw_num)	((x) + GPIO_DW_SIZE(dw_num))
diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
index 6553dde45c2..9227e5948c8 100644
--- a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
@@ -12,6 +12,7 @@
 #include <asm/io.h>
 #include <asm-generic/gpio.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #include "pinctrl-mtk-common.h"
 
diff --git a/drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c b/drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c
index 8246aa6890e..0ed4b50b458 100644
--- a/drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c
+++ b/drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <dm.h>
 #include <dm/pinctrl.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include "pinctrl-meson-axg.h"
 
diff --git a/drivers/pinctrl/meson/pinctrl-meson.c b/drivers/pinctrl/meson/pinctrl-meson.c
index 8a3c292548e..ad44da1e8bb 100644
--- a/drivers/pinctrl/meson/pinctrl-meson.c
+++ b/drivers/pinctrl/meson/pinctrl-meson.c
@@ -17,6 +17,7 @@
 #include <fdt_support.h>
 #include <linux/bitops.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/libfdt.h>
 #include <linux/sizes.h>
diff --git a/drivers/pinctrl/mscc/mscc-common.c b/drivers/pinctrl/mscc/mscc-common.c
index 307ed1db875..308f23b742d 100644
--- a/drivers/pinctrl/mscc/mscc-common.c
+++ b/drivers/pinctrl/mscc/mscc-common.c
@@ -22,6 +22,7 @@
 #include <errno.h>
 #include <fdtdec.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include "mscc-common.h"
 
diff --git a/drivers/pinctrl/mtmips/pinctrl-mt7628.c b/drivers/pinctrl/mtmips/pinctrl-mt7628.c
index 1b51c229271..2e043509cf8 100644
--- a/drivers/pinctrl/mtmips/pinctrl-mt7628.c
+++ b/drivers/pinctrl/mtmips/pinctrl-mt7628.c
@@ -10,6 +10,7 @@
 #include <asm/global_data.h>
 #include <dm/pinctrl.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 
 #include "pinctrl-mtmips-common.h"
diff --git a/drivers/pinctrl/mtmips/pinctrl-mtmips-common.c b/drivers/pinctrl/mtmips/pinctrl-mtmips-common.c
index d5262438e17..ad9bd0311cc 100644
--- a/drivers/pinctrl/mtmips/pinctrl-mtmips-common.c
+++ b/drivers/pinctrl/mtmips/pinctrl-mtmips-common.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <malloc.h>
 #include <dm/pinctrl.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/string.h>
 
diff --git a/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c b/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c
index 1e8c345b847..c52b8f5df33 100644
--- a/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c
+++ b/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c
@@ -36,6 +36,7 @@
 #include <asm/system.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <linux/printk.h>
 #include <linux/string.h>
diff --git a/drivers/pinctrl/mvebu/pinctrl-mvebu.c b/drivers/pinctrl/mvebu/pinctrl-mvebu.c
index c2b9c80586b..e5820375393 100644
--- a/drivers/pinctrl/mvebu/pinctrl-mvebu.c
+++ b/drivers/pinctrl/mvebu/pinctrl-mvebu.c
@@ -17,6 +17,7 @@
 #include <asm/io.h>
 #include <asm/arch-armada8k/soc-info.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include "pinctrl-mvebu.h"
 
 #define AP_EMMC_PHY_CTRL_REG		0x100
diff --git a/drivers/pinctrl/nexell/pinctrl-nexell.c b/drivers/pinctrl/nexell/pinctrl-nexell.c
index 4518c05d468..da5ca6846cf 100644
--- a/drivers/pinctrl/nexell/pinctrl-nexell.c
+++ b/drivers/pinctrl/nexell/pinctrl-nexell.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <asm/io.h>
+#include <linux/errno.h>
 #include "pinctrl-nexell.h"
 #include "pinctrl-s5pxx18.h"
 
diff --git a/drivers/pinctrl/nexell/pinctrl-s5pxx18.c b/drivers/pinctrl/nexell/pinctrl-s5pxx18.c
index 96a2ed38a05..5bb012b197f 100644
--- a/drivers/pinctrl/nexell/pinctrl-s5pxx18.c
+++ b/drivers/pinctrl/nexell/pinctrl-s5pxx18.c
@@ -13,6 +13,7 @@
 #include <asm/io.h>
 #include <dm/pinctrl.h>
 #include <dm/root.h>
+#include <linux/errno.h>
 #include "pinctrl-nexell.h"
 #include "pinctrl-s5pxx18.h"
 
diff --git a/drivers/pinctrl/nxp/pinctrl-imx.c b/drivers/pinctrl/nxp/pinctrl-imx.c
index 1596dcc4747..6db7313aecd 100644
--- a/drivers/pinctrl/nxp/pinctrl-imx.c
+++ b/drivers/pinctrl/nxp/pinctrl-imx.c
@@ -10,6 +10,7 @@
 #include <dm/device_compat.h>
 #include <dm/devres.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/err.h>
 #include <dm.h>
diff --git a/drivers/pinctrl/nxp/pinctrl-mxs.c b/drivers/pinctrl/nxp/pinctrl-mxs.c
index 1067654e07e..6cb6977812a 100644
--- a/drivers/pinctrl/nxp/pinctrl-mxs.c
+++ b/drivers/pinctrl/nxp/pinctrl-mxs.c
@@ -9,6 +9,7 @@
 #include <asm/global_data.h>
 #include <dm/device_compat.h>
 #include <dm/devres.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/err.h>
 #include <dm.h>
diff --git a/drivers/pinctrl/nxp/pinctrl-scu.c b/drivers/pinctrl/nxp/pinctrl-scu.c
index 33bba8696f6..81f6eb56db3 100644
--- a/drivers/pinctrl/nxp/pinctrl-scu.c
+++ b/drivers/pinctrl/nxp/pinctrl-scu.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <asm/arch/sci/sci.h>
 #include <misc.h>
+#include <linux/errno.h>
 
 #include "pinctrl-imx.h"
 
diff --git a/drivers/pinctrl/pinctrl-at91-pio4.c b/drivers/pinctrl/pinctrl-at91-pio4.c
index 4400e8088d8..49eb9078f15 100644
--- a/drivers/pinctrl/pinctrl-at91-pio4.c
+++ b/drivers/pinctrl/pinctrl-at91-pio4.c
@@ -12,6 +12,7 @@
 #include <asm/global_data.h>
 #include <dm/pinctrl.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/err.h>
 #include <mach/atmel_pio4.h>
diff --git a/drivers/pinctrl/pinctrl-at91.c b/drivers/pinctrl/pinctrl-at91.c
index 30f2bebbc78..aa5d05d93e9 100644
--- a/drivers/pinctrl/pinctrl-at91.c
+++ b/drivers/pinctrl/pinctrl-at91.c
@@ -13,6 +13,7 @@
 #include <dm/pinctrl.h>
 #include <asm/hardware.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/err.h>
 #include <mach/at91_pio.h>
diff --git a/drivers/pinctrl/pinctrl-generic.c b/drivers/pinctrl/pinctrl-generic.c
index 7a2131d73ea..45b3ad5d793 100644
--- a/drivers/pinctrl/pinctrl-generic.c
+++ b/drivers/pinctrl/pinctrl-generic.c
@@ -8,6 +8,7 @@
 #include <dm/device_compat.h>
 #include <linux/compat.h>
 #include <dm/pinctrl.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 /**
diff --git a/drivers/pinctrl/pinctrl-single.c b/drivers/pinctrl/pinctrl-single.c
index 738f5bd6364..e4a05f5cce6 100644
--- a/drivers/pinctrl/pinctrl-single.c
+++ b/drivers/pinctrl/pinctrl-single.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <dm/device_compat.h>
 #include <dm/pinctrl.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <asm/io.h>
 
diff --git a/drivers/pinctrl/pinctrl-sti.c b/drivers/pinctrl/pinctrl-sti.c
index d446982c4e7..f6444181671 100644
--- a/drivers/pinctrl/pinctrl-sti.c
+++ b/drivers/pinctrl/pinctrl-sti.c
@@ -17,6 +17,7 @@
 #include <asm/io.h>
 #include <dm/pinctrl.h>
 #include <linux/bug.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <linux/printk.h>
 
diff --git a/drivers/pinctrl/pinctrl-stmfx.c b/drivers/pinctrl/pinctrl-stmfx.c
index dc063e087e8..bdf852c5f02 100644
--- a/drivers/pinctrl/pinctrl-stmfx.c
+++ b/drivers/pinctrl/pinctrl-stmfx.c
@@ -18,6 +18,7 @@
 #include <linux/bitfield.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <power/regulator.h>
 
diff --git a/drivers/pinctrl/pinctrl-uclass.c b/drivers/pinctrl/pinctrl-uclass.c
index f821959137e..817ea3f3323 100644
--- a/drivers/pinctrl/pinctrl-uclass.c
+++ b/drivers/pinctrl/pinctrl-uclass.c
@@ -8,6 +8,7 @@
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <dm/device_compat.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <linux/err.h>
 #include <linux/list.h>
diff --git a/drivers/pinctrl/pinctrl_pic32.c b/drivers/pinctrl/pinctrl_pic32.c
index 2eb80d92b34..6f2b34f2813 100644
--- a/drivers/pinctrl/pinctrl_pic32.c
+++ b/drivers/pinctrl/pinctrl_pic32.c
@@ -13,6 +13,7 @@
 #include <asm/io.h>
 #include <dm/pinctrl.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <mach/pic32.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/pinctrl/pinctrl_stm32.c b/drivers/pinctrl/pinctrl_stm32.c
index 998b90f803f..faec68c3b2e 100644
--- a/drivers/pinctrl/pinctrl_stm32.c
+++ b/drivers/pinctrl/pinctrl_stm32.c
@@ -13,6 +13,7 @@
 #include <dm/pinctrl.h>
 #include <linux/bitops.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <linux/printk.h>
 
diff --git a/drivers/pinctrl/renesas/pfc-r7s72100.c b/drivers/pinctrl/renesas/pfc-r7s72100.c
index 3d0caa9bb77..db4dea11104 100644
--- a/drivers/pinctrl/renesas/pfc-r7s72100.c
+++ b/drivers/pinctrl/renesas/pfc-r7s72100.c
@@ -12,6 +12,7 @@
 #include <dm/lists.h>
 #include <dm/pinctrl.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/err.h>
 
diff --git a/drivers/pinctrl/renesas/pfc-r8a7790.c b/drivers/pinctrl/renesas/pfc-r8a7790.c
index 5e1502ed969..30e9a117f8d 100644
--- a/drivers/pinctrl/renesas/pfc-r8a7790.c
+++ b/drivers/pinctrl/renesas/pfc-r8a7790.c
@@ -12,6 +12,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <dm/pinctrl.h>
+#include <linux/errno.h>
 #include <linux/kernel.h>
 
 #include "sh_pfc.h"
diff --git a/drivers/pinctrl/renesas/pfc-r8a7791.c b/drivers/pinctrl/renesas/pfc-r8a7791.c
index d6095d6f674..7ae6e4081c0 100644
--- a/drivers/pinctrl/renesas/pfc-r8a7791.c
+++ b/drivers/pinctrl/renesas/pfc-r8a7791.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <dm/pinctrl.h>
+#include <linux/errno.h>
 #include <linux/kernel.h>
 
 #include "sh_pfc.h"
diff --git a/drivers/pinctrl/renesas/pfc-r8a7794.c b/drivers/pinctrl/renesas/pfc-r8a7794.c
index 91ac815f3da..e59fd7656e0 100644
--- a/drivers/pinctrl/renesas/pfc-r8a7794.c
+++ b/drivers/pinctrl/renesas/pfc-r8a7794.c
@@ -11,6 +11,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <dm/pinctrl.h>
+#include <linux/errno.h>
 #include <linux/kernel.h>
 
 #include "sh_pfc.h"
diff --git a/drivers/pinctrl/renesas/pfc-r8a77970.c b/drivers/pinctrl/renesas/pfc-r8a77970.c
index 33ecd933986..9996eb9298c 100644
--- a/drivers/pinctrl/renesas/pfc-r8a77970.c
+++ b/drivers/pinctrl/renesas/pfc-r8a77970.c
@@ -16,6 +16,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <dm/pinctrl.h>
+#include <linux/errno.h>
 #include <linux/kernel.h>
 
 #include "sh_pfc.h"
diff --git a/drivers/pinctrl/renesas/pfc-r8a77980.c b/drivers/pinctrl/renesas/pfc-r8a77980.c
index 32efb4409c6..1b04250e527 100644
--- a/drivers/pinctrl/renesas/pfc-r8a77980.c
+++ b/drivers/pinctrl/renesas/pfc-r8a77980.c
@@ -16,6 +16,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <dm/pinctrl.h>
+#include <linux/errno.h>
 #include <linux/kernel.h>
 
 #include "sh_pfc.h"
diff --git a/drivers/pinctrl/renesas/pfc-r8a77990.c b/drivers/pinctrl/renesas/pfc-r8a77990.c
index de22e49ebef..e0bf1e4a300 100644
--- a/drivers/pinctrl/renesas/pfc-r8a77990.c
+++ b/drivers/pinctrl/renesas/pfc-r8a77990.c
@@ -16,6 +16,7 @@
 #include <errno.h>
 #include <dm/pinctrl.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/kernel.h>
 
 #include "sh_pfc.h"
diff --git a/drivers/pinctrl/renesas/pfc.c b/drivers/pinctrl/renesas/pfc.c
index 6bf8fdff478..1a7e686a465 100644
--- a/drivers/pinctrl/renesas/pfc.c
+++ b/drivers/pinctrl/renesas/pfc.c
@@ -20,6 +20,7 @@
 #include <dm/pinctrl.h>
 #include <linux/bitops.h>
 #include <linux/bug.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/sizes.h>
 
diff --git a/drivers/pinctrl/rockchip/pinctrl-px30.c b/drivers/pinctrl/rockchip/pinctrl-px30.c
index 617721a6264..bf1ee07c5fe 100644
--- a/drivers/pinctrl/rockchip/pinctrl-px30.c
+++ b/drivers/pinctrl/rockchip/pinctrl-px30.c
@@ -10,6 +10,7 @@
 #include <regmap.h>
 #include <syscon.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #include "pinctrl-rockchip.h"
 
diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3036.c b/drivers/pinctrl/rockchip/pinctrl-rk3036.c
index d49e3007cea..11d4e784d02 100644
--- a/drivers/pinctrl/rockchip/pinctrl-rk3036.c
+++ b/drivers/pinctrl/rockchip/pinctrl-rk3036.c
@@ -9,6 +9,7 @@
 #include <regmap.h>
 #include <syscon.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #include "pinctrl-rockchip.h"
 
diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3128.c b/drivers/pinctrl/rockchip/pinctrl-rk3128.c
index a175d6c07f1..445dbf85d4f 100644
--- a/drivers/pinctrl/rockchip/pinctrl-rk3128.c
+++ b/drivers/pinctrl/rockchip/pinctrl-rk3128.c
@@ -9,6 +9,7 @@
 #include <regmap.h>
 #include <syscon.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #include "pinctrl-rockchip.h"
 
diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3188.c b/drivers/pinctrl/rockchip/pinctrl-rk3188.c
index 8f197110e5e..c4ff4e58531 100644
--- a/drivers/pinctrl/rockchip/pinctrl-rk3188.c
+++ b/drivers/pinctrl/rockchip/pinctrl-rk3188.c
@@ -9,6 +9,7 @@
 #include <dm/pinctrl.h>
 #include <regmap.h>
 #include <syscon.h>
+#include <linux/errno.h>
 
 #include "pinctrl-rockchip.h"
 
diff --git a/drivers/pinctrl/rockchip/pinctrl-rk322x.c b/drivers/pinctrl/rockchip/pinctrl-rk322x.c
index 85bc0ef0f31..3e925837ee8 100644
--- a/drivers/pinctrl/rockchip/pinctrl-rk322x.c
+++ b/drivers/pinctrl/rockchip/pinctrl-rk322x.c
@@ -10,6 +10,7 @@
 #include <regmap.h>
 #include <syscon.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #include "pinctrl-rockchip.h"
 
diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3288.c b/drivers/pinctrl/rockchip/pinctrl-rk3288.c
index 011ca286ec9..e8cdca1bd28 100644
--- a/drivers/pinctrl/rockchip/pinctrl-rk3288.c
+++ b/drivers/pinctrl/rockchip/pinctrl-rk3288.c
@@ -9,6 +9,7 @@
 #include <dm/pinctrl.h>
 #include <regmap.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #include "pinctrl-rockchip.h"
 
diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3308.c b/drivers/pinctrl/rockchip/pinctrl-rk3308.c
index db2b10a6906..088617de5db 100644
--- a/drivers/pinctrl/rockchip/pinctrl-rk3308.c
+++ b/drivers/pinctrl/rockchip/pinctrl-rk3308.c
@@ -10,6 +10,7 @@
 #include <regmap.h>
 #include <syscon.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #include "pinctrl-rockchip.h"
 
diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3328.c b/drivers/pinctrl/rockchip/pinctrl-rk3328.c
index 61eb9e0af0c..342d67d06d9 100644
--- a/drivers/pinctrl/rockchip/pinctrl-rk3328.c
+++ b/drivers/pinctrl/rockchip/pinctrl-rk3328.c
@@ -10,6 +10,7 @@
 #include <regmap.h>
 #include <syscon.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #include "pinctrl-rockchip.h"
 
diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3368.c b/drivers/pinctrl/rockchip/pinctrl-rk3368.c
index d8ccd4de576..d66b62d9136 100644
--- a/drivers/pinctrl/rockchip/pinctrl-rk3368.c
+++ b/drivers/pinctrl/rockchip/pinctrl-rk3368.c
@@ -9,6 +9,7 @@
 #include <dm/pinctrl.h>
 #include <regmap.h>
 #include <syscon.h>
+#include <linux/errno.h>
 
 #include "pinctrl-rockchip.h"
 
diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3399.c b/drivers/pinctrl/rockchip/pinctrl-rk3399.c
index d04c1afb090..ec33f89bb82 100644
--- a/drivers/pinctrl/rockchip/pinctrl-rk3399.c
+++ b/drivers/pinctrl/rockchip/pinctrl-rk3399.c
@@ -10,6 +10,7 @@
 #include <regmap.h>
 #include <syscon.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #include "pinctrl-rockchip.h"
 
diff --git a/drivers/pinctrl/rockchip/pinctrl-rockchip-core.c b/drivers/pinctrl/rockchip/pinctrl-rockchip-core.c
index 16efb09b57f..389d584078f 100644
--- a/drivers/pinctrl/rockchip/pinctrl-rockchip-core.c
+++ b/drivers/pinctrl/rockchip/pinctrl-rockchip-core.c
@@ -12,6 +12,7 @@
 #include <syscon.h>
 #include <fdtdec.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <linux/string.h>
 
diff --git a/drivers/pinctrl/rockchip/pinctrl-rv1108.c b/drivers/pinctrl/rockchip/pinctrl-rv1108.c
index 22334329ed4..c0fb962ef05 100644
--- a/drivers/pinctrl/rockchip/pinctrl-rv1108.c
+++ b/drivers/pinctrl/rockchip/pinctrl-rv1108.c
@@ -10,6 +10,7 @@
 #include <regmap.h>
 #include <syscon.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #include "pinctrl-rockchip.h"
 
diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-core.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-core.c
index 631bb1f963b..44a1571db4f 100644
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier-core.c
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-core.c
@@ -9,6 +9,7 @@
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/bug.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/err.h>
 #include <linux/kernel.h>
diff --git a/drivers/power/acpi_pmc/acpi-pmc-uclass.c b/drivers/power/acpi_pmc/acpi-pmc-uclass.c
index 98d217ca72f..d713dc81f0a 100644
--- a/drivers/power/acpi_pmc/acpi-pmc-uclass.c
+++ b/drivers/power/acpi_pmc/acpi-pmc-uclass.c
@@ -14,6 +14,7 @@
 #include <asm/intel_pinctrl.h>
 #endif
 #include <asm/io.h>
+#include <linux/errno.h>
 #include <power/acpi_pmc.h>
 
 struct tco_regs {
diff --git a/drivers/power/acpi_pmc/pmc_emul.c b/drivers/power/acpi_pmc/pmc_emul.c
index 5ed6fcca262..93ba847e2ec 100644
--- a/drivers/power/acpi_pmc/pmc_emul.c
+++ b/drivers/power/acpi_pmc/pmc_emul.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <pci.h>
 #include <asm/test.h>
+#include <linux/errno.h>
 #include <power/acpi_pmc.h>
 
 /**
diff --git a/drivers/power/acpi_pmc/sandbox.c b/drivers/power/acpi_pmc/sandbox.c
index 48a6c663bd2..667b7a5daf5 100644
--- a/drivers/power/acpi_pmc/sandbox.c
+++ b/drivers/power/acpi_pmc/sandbox.c
@@ -11,6 +11,7 @@
 #include <dm.h>
 #include <log.h>
 #include <asm/io.h>
+#include <linux/errno.h>
 #include <power/acpi_pmc.h>
 
 #define GPIO_GPE_CFG		0x1050
diff --git a/drivers/power/axp152.c b/drivers/power/axp152.c
index d6e36125c12..bf07232b08d 100644
--- a/drivers/power/axp152.c
+++ b/drivers/power/axp152.c
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <asm/arch/pmic_bus.h>
 #include <axp_pmic.h>
+#include <linux/errno.h>
 
 static u8 axp152_mvolt_to_target(int mvolt, int min, int max, int div)
 {
diff --git a/drivers/power/axp209.c b/drivers/power/axp209.c
index ade531940b9..878ccf45906 100644
--- a/drivers/power/axp209.c
+++ b/drivers/power/axp209.c
@@ -9,6 +9,7 @@
 #include <asm/arch/pmic_bus.h>
 #include <axp_pmic.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 #ifdef CONFIG_AXP_ALDO3_VOLT_SLOPE_08
 #  define AXP209_VRC_SLOPE AXP209_VRC_LDO3_800uV_uS
diff --git a/drivers/power/axp221.c b/drivers/power/axp221.c
index 3446fe7365d..e0249796729 100644
--- a/drivers/power/axp221.c
+++ b/drivers/power/axp221.c
@@ -14,6 +14,7 @@
 #include <errno.h>
 #include <asm/arch/pmic_bus.h>
 #include <axp_pmic.h>
+#include <linux/errno.h>
 
 static u8 axp221_mvolt_to_cfg(int mvolt, int min, int max, int div)
 {
diff --git a/drivers/power/axp809.c b/drivers/power/axp809.c
index 6323492b66d..fd85b734145 100644
--- a/drivers/power/axp809.c
+++ b/drivers/power/axp809.c
@@ -16,6 +16,7 @@
 #include <asm/arch/gpio.h>
 #include <asm/arch/pmic_bus.h>
 #include <axp_pmic.h>
+#include <linux/errno.h>
 
 static u8 axp809_mvolt_to_cfg(int mvolt, int min, int max, int div)
 {
diff --git a/drivers/power/axp818.c b/drivers/power/axp818.c
index 0531707c8aa..bfdc3d93caf 100644
--- a/drivers/power/axp818.c
+++ b/drivers/power/axp818.c
@@ -16,6 +16,7 @@
 #include <asm/arch/gpio.h>
 #include <asm/arch/pmic_bus.h>
 #include <axp_pmic.h>
+#include <linux/errno.h>
 
 static u8 axp818_mvolt_to_cfg(int mvolt, int min, int max, int div)
 {
diff --git a/drivers/power/battery/bat_trats.c b/drivers/power/battery/bat_trats.c
index d1545004de3..c7350afe8e2 100644
--- a/drivers/power/battery/bat_trats.c
+++ b/drivers/power/battery/bat_trats.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <stdio.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <power/pmic.h>
 #include <power/battery.h>
 #include <power/max8997_pmic.h>
diff --git a/drivers/power/battery/bat_trats2.c b/drivers/power/battery/bat_trats2.c
index abac714ff34..67fd7d8dbae 100644
--- a/drivers/power/battery/bat_trats2.c
+++ b/drivers/power/battery/bat_trats2.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <log.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <power/pmic.h>
 #include <power/battery.h>
 #include <power/max77693_pmic.h>
diff --git a/drivers/power/domain/bcm6328-power-domain.c b/drivers/power/domain/bcm6328-power-domain.c
index a494bfa8c9d..21933018fc4 100644
--- a/drivers/power/domain/bcm6328-power-domain.c
+++ b/drivers/power/domain/bcm6328-power-domain.c
@@ -9,6 +9,7 @@
 #include <power-domain-uclass.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #define MAX_DOMAINS	32
 
diff --git a/drivers/power/domain/imx8-power-domain-legacy.c b/drivers/power/domain/imx8-power-domain-legacy.c
index 61ed7172f28..37167b33460 100644
--- a/drivers/power/domain/imx8-power-domain-legacy.c
+++ b/drivers/power/domain/imx8-power-domain-legacy.c
@@ -16,6 +16,7 @@
 #include <dm/device.h>
 #include <dm/uclass-internal.h>
 #include <asm/arch/sci/sci.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/power/domain/imx8m-power-domain.c b/drivers/power/domain/imx8m-power-domain.c
index e50ded8b4c5..0d9501cf8ac 100644
--- a/drivers/power/domain/imx8m-power-domain.c
+++ b/drivers/power/domain/imx8m-power-domain.c
@@ -16,6 +16,7 @@
 #include <dm/device.h>
 #include <imx_sip.h>
 #include <linux/arm-smccc.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/power/domain/meson-ee-pwrc.c b/drivers/power/domain/meson-ee-pwrc.c
index 8349a9c1582..7e131d32553 100644
--- a/drivers/power/domain/meson-ee-pwrc.c
+++ b/drivers/power/domain/meson-ee-pwrc.c
@@ -18,6 +18,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 
 /* AO Offsets */
 
diff --git a/drivers/power/domain/meson-gx-pwrc-vpu.c b/drivers/power/domain/meson-gx-pwrc-vpu.c
index a41b230448f..78ac99e8d9b 100644
--- a/drivers/power/domain/meson-gx-pwrc-vpu.c
+++ b/drivers/power/domain/meson-gx-pwrc-vpu.c
@@ -18,6 +18,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 
 enum {
 	VPU_PWRC_COMPATIBLE_GX		= 0,
diff --git a/drivers/power/domain/mtk-power-domain.c b/drivers/power/domain/mtk-power-domain.c
index fae4749012b..d8467ac6c26 100644
--- a/drivers/power/domain/mtk-power-domain.c
+++ b/drivers/power/domain/mtk-power-domain.c
@@ -15,6 +15,7 @@
 #include <asm/processor.h>
 #include <linux/bitops.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/iopoll.h>
 
 #include <dt-bindings/power/mt7623-power.h>
diff --git a/drivers/power/domain/power-domain-uclass.c b/drivers/power/domain/power-domain-uclass.c
index c2c7c3bd507..cf9227572f9 100644
--- a/drivers/power/domain/power-domain-uclass.c
+++ b/drivers/power/domain/power-domain-uclass.c
@@ -10,6 +10,7 @@
 #include <power-domain.h>
 #include <power-domain-uclass.h>
 #include <dm/device-internal.h>
+#include <linux/errno.h>
 
 static inline struct power_domain_ops *power_domain_dev_ops(struct udevice *dev)
 {
diff --git a/drivers/power/domain/sandbox-power-domain.c b/drivers/power/domain/sandbox-power-domain.c
index 4d9a2006e66..373db61ba0f 100644
--- a/drivers/power/domain/sandbox-power-domain.c
+++ b/drivers/power/domain/sandbox-power-domain.c
@@ -10,6 +10,7 @@
 #include <power-domain-uclass.h>
 #include <asm/io.h>
 #include <asm/power-domain.h>
+#include <linux/errno.h>
 
 #define SANDBOX_POWER_DOMAINS 3
 
diff --git a/drivers/power/domain/ti-sci-power-domain.c b/drivers/power/domain/ti-sci-power-domain.c
index 7ee121dfb26..fd90f4926db 100644
--- a/drivers/power/domain/ti-sci-power-domain.c
+++ b/drivers/power/domain/ti-sci-power-domain.c
@@ -16,6 +16,7 @@
 #include <power-domain-uclass.h>
 #include <dm/device_compat.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/soc/ti/ti_sci_protocol.h>
 #include <dt-bindings/soc/ti,sci_pm_domain.h>
 
diff --git a/drivers/power/exynos-tmu.c b/drivers/power/exynos-tmu.c
index bc872488215..e714add9995 100644
--- a/drivers/power/exynos-tmu.c
+++ b/drivers/power/exynos-tmu.c
@@ -25,6 +25,7 @@
 #include <tmu.h>
 #include <asm/arch/tmu.h>
 #include <asm/arch/power.h>
+#include <linux/errno.h>
 
 #define TRIMINFO_RELOAD		1
 #define CORE_EN			1
diff --git a/drivers/power/fuel_gauge/fg_max17042.c b/drivers/power/fuel_gauge/fg_max17042.c
index fde4bd19554..89a170aea60 100644
--- a/drivers/power/fuel_gauge/fg_max17042.c
+++ b/drivers/power/fuel_gauge/fg_max17042.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <stdio.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <power/pmic.h>
 #include <power/max17042_fg.h>
 #include <i2c.h>
diff --git a/drivers/power/mfd/fg_max77693.c b/drivers/power/mfd/fg_max77693.c
index 4633f79bbe7..e96e5907628 100644
--- a/drivers/power/mfd/fg_max77693.c
+++ b/drivers/power/mfd/fg_max77693.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <log.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <power/pmic.h>
 #include <power/max77693_fg.h>
 #include <i2c.h>
diff --git a/drivers/power/mfd/muic_max77693.c b/drivers/power/mfd/muic_max77693.c
index a021c04ccd4..8f567c0ebe9 100644
--- a/drivers/power/mfd/muic_max77693.c
+++ b/drivers/power/mfd/muic_max77693.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <log.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <power/pmic.h>
 #include <power/power_chrg.h>
 #include <power/max77693_muic.h>
diff --git a/drivers/power/mfd/pmic_max77693.c b/drivers/power/mfd/pmic_max77693.c
index 1955189c239..64519d92fd1 100644
--- a/drivers/power/mfd/pmic_max77693.c
+++ b/drivers/power/mfd/pmic_max77693.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <log.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <power/pmic.h>
 #include <power/max77693_pmic.h>
 #include <i2c.h>
diff --git a/drivers/power/pmic/act8846.c b/drivers/power/pmic/act8846.c
index 8f0f5a6d96e..7bd69ccc0b4 100644
--- a/drivers/power/pmic/act8846.c
+++ b/drivers/power/pmic/act8846.c
@@ -9,6 +9,7 @@
 #include <errno.h>
 #include <fdtdec.h>
 #include <log.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <power/act8846_pmic.h>
 #include <power/pmic.h>
diff --git a/drivers/power/pmic/as3722.c b/drivers/power/pmic/as3722.c
index c7dd9705d18..9152f657ff7 100644
--- a/drivers/power/pmic/as3722.c
+++ b/drivers/power/pmic/as3722.c
@@ -12,6 +12,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <dm/lists.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <power/as3722.h>
 #include <power/pmic.h>
diff --git a/drivers/power/pmic/as3722_gpio.c b/drivers/power/pmic/as3722_gpio.c
index 987fbdf9bc0..6b091a58b8b 100644
--- a/drivers/power/pmic/as3722_gpio.c
+++ b/drivers/power/pmic/as3722_gpio.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <dm.h>
 #include <asm/gpio.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <power/as3722.h>
 #include <power/pmic.h>
diff --git a/drivers/power/pmic/bd71837.c b/drivers/power/pmic/bd71837.c
index da9aa541979..35d5018a391 100644
--- a/drivers/power/pmic/bd71837.c
+++ b/drivers/power/pmic/bd71837.c
@@ -9,6 +9,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/pmic/da9063.c b/drivers/power/pmic/da9063.c
index ca95b82e6d0..b88e79f4314 100644
--- a/drivers/power/pmic/da9063.c
+++ b/drivers/power/pmic/da9063.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <log.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/pmic/fan53555.c b/drivers/power/pmic/fan53555.c
index c9b15d5b68f..256c455aa29 100644
--- a/drivers/power/pmic/fan53555.c
+++ b/drivers/power/pmic/fan53555.c
@@ -10,6 +10,7 @@
 #include <dm/device_compat.h>
 #include <dm/lists.h>
 #include <i2c.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <power/fan53555.h>
 #include <power/pmic.h>
diff --git a/drivers/power/pmic/i2c_pmic_emul.c b/drivers/power/pmic/i2c_pmic_emul.c
index 4e72e966cfe..1a044ea5b17 100644
--- a/drivers/power/pmic/i2c_pmic_emul.c
+++ b/drivers/power/pmic/i2c_pmic_emul.c
@@ -10,6 +10,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <malloc.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include <power/pmic.h>
diff --git a/drivers/power/pmic/lp873x.c b/drivers/power/pmic/lp873x.c
index c307a9e3024..4addcf9cbd1 100644
--- a/drivers/power/pmic/lp873x.c
+++ b/drivers/power/pmic/lp873x.c
@@ -11,6 +11,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/pmic/lp87565.c b/drivers/power/pmic/lp87565.c
index ba67a5efc02..c4bf1aff78c 100644
--- a/drivers/power/pmic/lp87565.c
+++ b/drivers/power/pmic/lp87565.c
@@ -11,6 +11,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/pmic/max77686.c b/drivers/power/pmic/max77686.c
index 7e6f7d1966f..2c83aab57a8 100644
--- a/drivers/power/pmic/max77686.c
+++ b/drivers/power/pmic/max77686.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <log.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/pmic/mc34708.c b/drivers/power/pmic/mc34708.c
index d1661f01999..df66038d68d 100644
--- a/drivers/power/pmic/mc34708.c
+++ b/drivers/power/pmic/mc34708.c
@@ -12,6 +12,7 @@
 #include <i2c.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <power/pmic.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/power/pmic/muic_max8997.c b/drivers/power/pmic/muic_max8997.c
index 6184b70e2fd..6994eb96d7c 100644
--- a/drivers/power/pmic/muic_max8997.c
+++ b/drivers/power/pmic/muic_max8997.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <log.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <power/pmic.h>
 #include <power/power_chrg.h>
 #include <power/max8997_muic.h>
diff --git a/drivers/power/pmic/palmas.c b/drivers/power/pmic/palmas.c
index 88f88e0014c..0b4366a2715 100644
--- a/drivers/power/pmic/palmas.c
+++ b/drivers/power/pmic/palmas.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <log.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include <power/pmic.h>
diff --git a/drivers/power/pmic/pca9450.c b/drivers/power/pmic/pca9450.c
index b61dac193f2..6e80c5cdc4f 100644
--- a/drivers/power/pmic/pca9450.c
+++ b/drivers/power/pmic/pca9450.c
@@ -10,6 +10,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/pmic/pfuze100.c b/drivers/power/pmic/pfuze100.c
index 15420acb472..0955d46fc78 100644
--- a/drivers/power/pmic/pfuze100.c
+++ b/drivers/power/pmic/pfuze100.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <log.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/pmic/pm8916.c b/drivers/power/pmic/pm8916.c
index ddc30604cff..c47c89754d1 100644
--- a/drivers/power/pmic/pm8916.c
+++ b/drivers/power/pmic/pm8916.c
@@ -6,6 +6,7 @@
  */
 #include <common.h>
 #include <dm.h>
+#include <linux/errno.h>
 #include <power/pmic.h>
 #include <spmi/spmi.h>
 
diff --git a/drivers/power/pmic/pmic-uclass.c b/drivers/power/pmic/pmic-uclass.c
index a83131e1736..257e514b10b 100644
--- a/drivers/power/pmic/pmic-uclass.c
+++ b/drivers/power/pmic/pmic-uclass.c
@@ -13,6 +13,7 @@
 #include <dm/lists.h>
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <power/pmic.h>
 #include <linux/ctype.h>
diff --git a/drivers/power/pmic/pmic_hi6553.c b/drivers/power/pmic/pmic_hi6553.c
index 4442f3501f7..b724fe4a69e 100644
--- a/drivers/power/pmic/pmic_hi6553.c
+++ b/drivers/power/pmic/pmic_hi6553.c
@@ -7,6 +7,7 @@
 #include <asm/io.h>
 #include <common.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <power/pmic.h>
 #include <power/max8997_muic.h>
 #include <power/hi6553_pmic.h>
diff --git a/drivers/power/pmic/pmic_ltc3676.c b/drivers/power/pmic/pmic_ltc3676.c
index 5dc0079c2af..022d782e83d 100644
--- a/drivers/power/pmic/pmic_ltc3676.c
+++ b/drivers/power/pmic/pmic_ltc3676.c
@@ -8,6 +8,7 @@
 #include <errno.h>
 #include <i2c.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <power/pmic.h>
 #include <power/ltc3676_pmic.h>
 
diff --git a/drivers/power/pmic/pmic_max77696.c b/drivers/power/pmic/pmic_max77696.c
index de36b462180..b29fa6dedfd 100644
--- a/drivers/power/pmic/pmic_max77696.c
+++ b/drivers/power/pmic/pmic_max77696.c
@@ -8,6 +8,7 @@
 #include <errno.h>
 #include <i2c.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <power/pmic.h>
 #include <power/max77696_pmic.h>
 
diff --git a/drivers/power/pmic/pmic_max8997.c b/drivers/power/pmic/pmic_max8997.c
index bf8a015dc8c..6c4958208c8 100644
--- a/drivers/power/pmic/pmic_max8997.c
+++ b/drivers/power/pmic/pmic_max8997.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <log.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <power/pmic.h>
 #include <power/max8997_pmic.h>
 #include <i2c.h>
diff --git a/drivers/power/pmic/pmic_max8998.c b/drivers/power/pmic/pmic_max8998.c
index 8e2c4b8e02e..c4cc8485ea8 100644
--- a/drivers/power/pmic/pmic_max8998.c
+++ b/drivers/power/pmic/pmic_max8998.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <power/pmic.h>
 #include <power/max8998_pmic.h>
 #include <errno.h>
diff --git a/drivers/power/pmic/pmic_mc34vr500.c b/drivers/power/pmic/pmic_mc34vr500.c
index 9a3f748538c..a28c3e9b2b1 100644
--- a/drivers/power/pmic/pmic_mc34vr500.c
+++ b/drivers/power/pmic/pmic_mc34vr500.c
@@ -8,6 +8,7 @@
 #include <errno.h>
 #include <i2c.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <power/pmic.h>
 #include <power/mc34vr500_pmic.h>
 
diff --git a/drivers/power/pmic/pmic_pca9450.c b/drivers/power/pmic/pmic_pca9450.c
index 651f3a0c274..323b81a66ca 100644
--- a/drivers/power/pmic/pmic_pca9450.c
+++ b/drivers/power/pmic/pmic_pca9450.c
@@ -7,6 +7,7 @@
 #include <errno.h>
 #include <i2c.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <power/pmic.h>
 #include <power/pca9450.h>
 
diff --git a/drivers/power/pmic/pmic_pfuze100.c b/drivers/power/pmic/pmic_pfuze100.c
index 25a4aa0ed62..1beb42393c3 100644
--- a/drivers/power/pmic/pmic_pfuze100.c
+++ b/drivers/power/pmic/pmic_pfuze100.c
@@ -8,6 +8,7 @@
 #include <errno.h>
 #include <i2c.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <power/pmic.h>
 #include <power/pfuze100_pmic.h>
 
diff --git a/drivers/power/pmic/pmic_pfuze3000.c b/drivers/power/pmic/pmic_pfuze3000.c
index 82d932cef1b..7d426801b7d 100644
--- a/drivers/power/pmic/pmic_pfuze3000.c
+++ b/drivers/power/pmic/pmic_pfuze3000.c
@@ -8,6 +8,7 @@
 #include <errno.h>
 #include <i2c.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <power/pmic.h>
 #include <power/pfuze3000_pmic.h>
 
diff --git a/drivers/power/pmic/pmic_tps65910_dm.c b/drivers/power/pmic/pmic_tps65910_dm.c
index 8ead1db802a..422fb72c38e 100644
--- a/drivers/power/pmic/pmic_tps65910_dm.c
+++ b/drivers/power/pmic/pmic_tps65910_dm.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <log.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/pmic/rk8xx.c b/drivers/power/pmic/rk8xx.c
index 71027e8da35..991a94b41ab 100644
--- a/drivers/power/pmic/rk8xx.c
+++ b/drivers/power/pmic/rk8xx.c
@@ -9,6 +9,7 @@
 #include <errno.h>
 #include <log.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <power/rk8xx_pmic.h>
 #include <power/pmic.h>
 
diff --git a/drivers/power/pmic/s2mps11.c b/drivers/power/pmic/s2mps11.c
index 5ff4f205211..93c3507e8fa 100644
--- a/drivers/power/pmic/s2mps11.c
+++ b/drivers/power/pmic/s2mps11.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <log.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/s2mps11.h>
diff --git a/drivers/power/pmic/s5m8767.c b/drivers/power/pmic/s5m8767.c
index eea072ae824..f1fa6740660 100644
--- a/drivers/power/pmic/s5m8767.c
+++ b/drivers/power/pmic/s5m8767.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <log.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/pmic/sandbox.c b/drivers/power/pmic/sandbox.c
index 398b72341bd..813294c7f36 100644
--- a/drivers/power/pmic/sandbox.c
+++ b/drivers/power/pmic/sandbox.c
@@ -9,6 +9,7 @@
 #include <errno.h>
 #include <dm.h>
 #include <i2c.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/pmic/stpmic1.c b/drivers/power/pmic/stpmic1.c
index 2c85410b1bf..c7cd596da08 100644
--- a/drivers/power/pmic/stpmic1.c
+++ b/drivers/power/pmic/stpmic1.c
@@ -13,6 +13,7 @@
 #include <dm/device.h>
 #include <dm/device_compat.h>
 #include <dm/lists.h>
+#include <linux/errno.h>
 #include <power/pmic.h>
 #include <power/stpmic1.h>
 
diff --git a/drivers/power/pmic/tps65090.c b/drivers/power/pmic/tps65090.c
index 2a04d5948a5..8c8ffbe2046 100644
--- a/drivers/power/pmic/tps65090.c
+++ b/drivers/power/pmic/tps65090.c
@@ -10,6 +10,7 @@
 #include <fdtdec.h>
 #include <i2c.h>
 #include <log.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/tps65090.h>
diff --git a/drivers/power/pmic/tps65941.c b/drivers/power/pmic/tps65941.c
index fd350b24df2..a05023516ba 100644
--- a/drivers/power/pmic/tps65941.c
+++ b/drivers/power/pmic/tps65941.c
@@ -11,6 +11,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/power_core.c b/drivers/power/power_core.c
index 35be5d90732..bc8a2b6bf8c 100644
--- a/drivers/power/power_core.c
+++ b/drivers/power/power_core.c
@@ -15,6 +15,7 @@
 #include <malloc.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/types.h>
 #include <linux/list.h>
diff --git a/drivers/power/power_dialog.c b/drivers/power/power_dialog.c
index 62e460bd581..267ef50203f 100644
--- a/drivers/power/power_dialog.c
+++ b/drivers/power/power_dialog.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <log.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <power/pmic.h>
 #include <dialog_pmic.h>
 #include <errno.h>
diff --git a/drivers/power/power_fsl.c b/drivers/power/power_fsl.c
index 2324815a5bd..e26b60c6abc 100644
--- a/drivers/power/power_fsl.c
+++ b/drivers/power/power_fsl.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <spi.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <power/pmic.h>
 #include <fsl_pmic.h>
 #include <errno.h>
diff --git a/drivers/power/power_i2c.c b/drivers/power/power_i2c.c
index ebf078fe714..263d0f3eaa6 100644
--- a/drivers/power/power_i2c.c
+++ b/drivers/power/power_i2c.c
@@ -13,6 +13,7 @@
 #include <common.h>
 #include <log.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/types.h>
 #include <power/pmic.h>
diff --git a/drivers/power/power_spi.c b/drivers/power/power_spi.c
index 1eaf9773ef8..adf317e849a 100644
--- a/drivers/power/power_spi.c
+++ b/drivers/power/power_spi.c
@@ -10,6 +10,7 @@
  */
 
 #include <common.h>
+#include <linux/errno.h>
 #include <linux/types.h>
 #include <power/pmic.h>
 #include <spi.h>
diff --git a/drivers/power/regulator/act8846.c b/drivers/power/regulator/act8846.c
index 1783813a158..0140231214a 100644
--- a/drivers/power/regulator/act8846.c
+++ b/drivers/power/regulator/act8846.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
+#include <linux/errno.h>
 #include <power/act8846_pmic.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/regulator/as3722_regulator.c b/drivers/power/regulator/as3722_regulator.c
index 0fee9bf00b6..da25e58dec9 100644
--- a/drivers/power/regulator/as3722_regulator.c
+++ b/drivers/power/regulator/as3722_regulator.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
+#include <linux/errno.h>
 #include <power/as3722.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/regulator/bd71837.c b/drivers/power/regulator/bd71837.c
index 8c7f71be3e8..7ebba28a992 100644
--- a/drivers/power/regulator/bd71837.c
+++ b/drivers/power/regulator/bd71837.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <log.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include <power/bd71837.h>
diff --git a/drivers/power/regulator/da9063.c b/drivers/power/regulator/da9063.c
index 3e5d2596561..ae069e602a3 100644
--- a/drivers/power/regulator/da9063.c
+++ b/drivers/power/regulator/da9063.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <power/da9063_pmic.h>
 #include <power/pmic.h>
diff --git a/drivers/power/regulator/fan53555.c b/drivers/power/regulator/fan53555.c
index a7fa01f787b..fa8dc96f9da 100644
--- a/drivers/power/regulator/fan53555.c
+++ b/drivers/power/regulator/fan53555.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <asm/gpio.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <power/fan53555.h>
 #include <power/pmic.h>
diff --git a/drivers/power/regulator/fixed.c b/drivers/power/regulator/fixed.c
index 0303c6c5224..78245de90a6 100644
--- a/drivers/power/regulator/fixed.c
+++ b/drivers/power/regulator/fixed.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <log.h>
 #include <asm/gpio.h>
+#include <linux/errno.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include "regulator_common.h"
diff --git a/drivers/power/regulator/gpio-regulator.c b/drivers/power/regulator/gpio-regulator.c
index 8b93a1da72e..bc862179a80 100644
--- a/drivers/power/regulator/gpio-regulator.c
+++ b/drivers/power/regulator/gpio-regulator.c
@@ -11,6 +11,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <asm/gpio.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/regulator/lp873x_regulator.c b/drivers/power/regulator/lp873x_regulator.c
index 9ec23b6f548..c47a4a9a778 100644
--- a/drivers/power/regulator/lp873x_regulator.c
+++ b/drivers/power/regulator/lp873x_regulator.c
@@ -12,6 +12,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/lp873x.h>
diff --git a/drivers/power/regulator/lp87565_regulator.c b/drivers/power/regulator/lp87565_regulator.c
index 5b14c07b4ce..2275a7367b0 100644
--- a/drivers/power/regulator/lp87565_regulator.c
+++ b/drivers/power/regulator/lp87565_regulator.c
@@ -13,6 +13,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/lp87565.h>
diff --git a/drivers/power/regulator/max77686.c b/drivers/power/regulator/max77686.c
index 4d3ac980fc8..bcbe257f53f 100644
--- a/drivers/power/regulator/max77686.c
+++ b/drivers/power/regulator/max77686.c
@@ -11,6 +11,7 @@
 #include <errno.h>
 #include <dm.h>
 #include <i2c.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/regulator/palmas_regulator.c b/drivers/power/regulator/palmas_regulator.c
index adbc921e53a..9f1ae1d246f 100644
--- a/drivers/power/regulator/palmas_regulator.c
+++ b/drivers/power/regulator/palmas_regulator.c
@@ -12,6 +12,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/regulator/pbias_regulator.c b/drivers/power/regulator/pbias_regulator.c
index 0bc8562b317..26598b7129f 100644
--- a/drivers/power/regulator/pbias_regulator.c
+++ b/drivers/power/regulator/pbias_regulator.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/regulator/pfuze100.c b/drivers/power/regulator/pfuze100.c
index 15f34b915f2..b874d58961c 100644
--- a/drivers/power/regulator/pfuze100.c
+++ b/drivers/power/regulator/pfuze100.c
@@ -11,6 +11,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <log.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/regulator/pwm_regulator.c b/drivers/power/regulator/pwm_regulator.c
index 2031d882953..451ce106e4f 100644
--- a/drivers/power/regulator/pwm_regulator.c
+++ b/drivers/power/regulator/pwm_regulator.c
@@ -15,6 +15,7 @@
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <dm/device_compat.h>
+#include <linux/errno.h>
 #include <power/regulator.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/power/regulator/regulator-uclass.c b/drivers/power/regulator/regulator-uclass.c
index 2f095d57e8e..704a33d057a 100644
--- a/drivers/power/regulator/regulator-uclass.c
+++ b/drivers/power/regulator/regulator-uclass.c
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <dm/uclass-internal.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/regulator/regulator_common.c b/drivers/power/regulator/regulator_common.c
index aae110a6655..ace87764092 100644
--- a/drivers/power/regulator/regulator_common.c
+++ b/drivers/power/regulator/regulator_common.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <asm/gpio.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <power/regulator.h>
 #include "regulator_common.h"
 
diff --git a/drivers/power/regulator/rk8xx.c b/drivers/power/regulator/rk8xx.c
index a08e2151f93..03e6ffcc978 100644
--- a/drivers/power/regulator/rk8xx.c
+++ b/drivers/power/regulator/rk8xx.c
@@ -12,6 +12,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
+#include <linux/errno.h>
 #include <power/rk8xx_pmic.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/regulator/s2mps11_regulator.c b/drivers/power/regulator/s2mps11_regulator.c
index 295e1d2c62a..ffbc06d9b79 100644
--- a/drivers/power/regulator/s2mps11_regulator.c
+++ b/drivers/power/regulator/s2mps11_regulator.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/regulator/s5m8767.c b/drivers/power/regulator/s5m8767.c
index b46a2a486ec..7e1d08b8d11 100644
--- a/drivers/power/regulator/s5m8767.c
+++ b/drivers/power/regulator/s5m8767.c
@@ -8,6 +8,7 @@
 #include <errno.h>
 #include <dm.h>
 #include <i2c.h>
+#include <linux/errno.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/s5m8767.h>
diff --git a/drivers/power/regulator/sandbox.c b/drivers/power/regulator/sandbox.c
index 18596770b37..88c6f3ca3b2 100644
--- a/drivers/power/regulator/sandbox.c
+++ b/drivers/power/regulator/sandbox.c
@@ -9,6 +9,7 @@
 #include <errno.h>
 #include <dm.h>
 #include <i2c.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/regulator/stm32-vrefbuf.c b/drivers/power/regulator/stm32-vrefbuf.c
index 92136961c2e..73cae7c6d8e 100644
--- a/drivers/power/regulator/stm32-vrefbuf.c
+++ b/drivers/power/regulator/stm32-vrefbuf.c
@@ -12,6 +12,7 @@
 #include <asm/io.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/iopoll.h>
 #include <linux/kernel.h>
 #include <power/regulator.h>
diff --git a/drivers/power/regulator/stpmic1.c b/drivers/power/regulator/stpmic1.c
index 3e342f48086..38cd18b0d4f 100644
--- a/drivers/power/regulator/stpmic1.c
+++ b/drivers/power/regulator/stpmic1.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/stpmic1.h>
diff --git a/drivers/power/regulator/tps62360_regulator.c b/drivers/power/regulator/tps62360_regulator.c
index ce54495490d..5d7d3d43ed5 100644
--- a/drivers/power/regulator/tps62360_regulator.c
+++ b/drivers/power/regulator/tps62360_regulator.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <dm/device_compat.h>
+#include <linux/errno.h>
 #include <power/regulator.h>
 
 #define TPS62360_REG_SET0	0
diff --git a/drivers/power/regulator/tps65090_regulator.c b/drivers/power/regulator/tps65090_regulator.c
index 74403a5a894..95db2d60e50 100644
--- a/drivers/power/regulator/tps65090_regulator.c
+++ b/drivers/power/regulator/tps65090_regulator.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <time.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/tps65090.h>
diff --git a/drivers/power/regulator/tps65910_regulator.c b/drivers/power/regulator/tps65910_regulator.c
index 2c0dd0604b3..a2bd9c6c18a 100644
--- a/drivers/power/regulator/tps65910_regulator.c
+++ b/drivers/power/regulator/tps65910_regulator.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/regulator/tps65941_regulator.c b/drivers/power/regulator/tps65941_regulator.c
index c25ca318100..535d88a7e19 100644
--- a/drivers/power/regulator/tps65941_regulator.c
+++ b/drivers/power/regulator/tps65941_regulator.c
@@ -14,6 +14,7 @@
 #include <log.h>
 #include <stdio.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/tps65941.h>
diff --git a/drivers/power/tps6586x.c b/drivers/power/tps6586x.c
index 49b28a5e6bf..acf0d5cfa4f 100644
--- a/drivers/power/tps6586x.c
+++ b/drivers/power/tps6586x.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <i2c.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 static struct udevice *tps6586x_dev;
 
diff --git a/drivers/pwm/exynos_pwm.c b/drivers/pwm/exynos_pwm.c
index e55fcceafd7..5417e95ef7b 100644
--- a/drivers/pwm/exynos_pwm.c
+++ b/drivers/pwm/exynos_pwm.c
@@ -11,6 +11,7 @@
 #include <asm/arch/clk.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/pwm.h>
+#include <linux/errno.h>
 
 struct exynos_pwm_priv {
 	struct s5p_timer *regs;
diff --git a/drivers/pwm/pwm-mtk.c b/drivers/pwm/pwm-mtk.c
index c6973dad3a8..1459e7fa673 100644
--- a/drivers/pwm/pwm-mtk.c
+++ b/drivers/pwm/pwm-mtk.c
@@ -13,6 +13,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 
 /* PWM registers and bits definitions */
diff --git a/drivers/pwm/pwm-sifive.c b/drivers/pwm/pwm-sifive.c
index 0b819cfbf78..866b243c004 100644
--- a/drivers/pwm/pwm-sifive.c
+++ b/drivers/pwm/pwm-sifive.c
@@ -19,6 +19,7 @@
 #include <pwm.h>
 #include <regmap.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/log2.h>
 #include <linux/bitfield.h>
diff --git a/drivers/pwm/pwm-uclass.c b/drivers/pwm/pwm-uclass.c
index 027181c6465..ab2df85e3ea 100644
--- a/drivers/pwm/pwm-uclass.c
+++ b/drivers/pwm/pwm-uclass.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <pwm.h>
+#include <linux/errno.h>
 
 int pwm_set_invert(struct udevice *dev, uint channel, bool polarity)
 {
diff --git a/drivers/pwm/rk_pwm.c b/drivers/pwm/rk_pwm.c
index 0fb894804b5..04c16ff36d8 100644
--- a/drivers/pwm/rk_pwm.c
+++ b/drivers/pwm/rk_pwm.c
@@ -16,6 +16,7 @@
 #include <asm/io.h>
 #include <asm/arch-rockchip/pwm.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <power/regulator.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/pwm/sandbox_pwm.c b/drivers/pwm/sandbox_pwm.c
index 28988187e03..0e267064b14 100644
--- a/drivers/pwm/sandbox_pwm.c
+++ b/drivers/pwm/sandbox_pwm.c
@@ -9,6 +9,7 @@
 #include <errno.h>
 #include <pwm.h>
 #include <asm/test.h>
+#include <linux/errno.h>
 
 enum {
 	NUM_CHANNELS	= 3,
diff --git a/drivers/pwm/sunxi_pwm.c b/drivers/pwm/sunxi_pwm.c
index ffcf60c5584..d3e714a6ab3 100644
--- a/drivers/pwm/sunxi_pwm.c
+++ b/drivers/pwm/sunxi_pwm.c
@@ -14,6 +14,7 @@
 #include <asm/io.h>
 #include <asm/arch/pwm.h>
 #include <asm/arch/gpio.h>
+#include <linux/errno.h>
 #include <power/regulator.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/pwm/tegra_pwm.c b/drivers/pwm/tegra_pwm.c
index 5e98d0fc2c7..2cfb3787dc4 100644
--- a/drivers/pwm/tegra_pwm.c
+++ b/drivers/pwm/tegra_pwm.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/pwm.h>
+#include <linux/errno.h>
 
 struct tegra_pwm_priv {
 	struct pwm_ctlr *regs;
diff --git a/drivers/ram/bmips_ram.c b/drivers/ram/bmips_ram.c
index 8f953e79afd..0746d677a4c 100644
--- a/drivers/ram/bmips_ram.c
+++ b/drivers/ram/bmips_ram.c
@@ -13,6 +13,7 @@
 #include <init.h>
 #include <ram.h>
 #include <asm/io.h>
+#include <linux/errno.h>
 
 #define SDRAM_CFG_REG		0x0
 #define SDRAM_CFG_COL_SHIFT	4
diff --git a/drivers/ram/imxrt_sdram.c b/drivers/ram/imxrt_sdram.c
index 3726a39335e..bfdf666cc43 100644
--- a/drivers/ram/imxrt_sdram.c
+++ b/drivers/ram/imxrt_sdram.c
@@ -15,6 +15,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/ram/k3-am654-ddrss.c b/drivers/ram/k3-am654-ddrss.c
index 1ed7c3aabc1..d4cc6d772e7 100644
--- a/drivers/ram/k3-am654-ddrss.c
+++ b/drivers/ram/k3-am654-ddrss.c
@@ -17,6 +17,7 @@
 #include <dm.h>
 #include <asm/arch/sys_proto.h>
 #include <dm/device_compat.h>
+#include <linux/errno.h>
 #include <power/regulator.h>
 #include "k3-am654-ddrss.h"
 
diff --git a/drivers/ram/k3-j721e/k3-j721e-ddrss.c b/drivers/ram/k3-j721e/k3-j721e-ddrss.c
index 25cdf83922f..bccf5a65c92 100644
--- a/drivers/ram/k3-j721e/k3-j721e-ddrss.c
+++ b/drivers/ram/k3-j721e/k3-j721e-ddrss.c
@@ -16,6 +16,7 @@
 #include <power-domain.h>
 #include <wait_bit.h>
 #include <dm/device_compat.h>
+#include <linux/errno.h>
 
 #include "lpddr4_obj_if.h"
 #include "lpddr4_if.h"
diff --git a/drivers/ram/k3-j721e/lpddr4_sanity.h b/drivers/ram/k3-j721e/lpddr4_sanity.h
index 0f0fc2767c1..84050d72c4a 100644
--- a/drivers/ram/k3-j721e/lpddr4_sanity.h
+++ b/drivers/ram/k3-j721e/lpddr4_sanity.h
@@ -21,6 +21,7 @@
 #define LPDDR4_SANITY_H
 
 #include <errno.h>
+#include <linux/errno.h>
 #include <linux/types.h>
 #include "lpddr4_if.h"
 
diff --git a/drivers/ram/mediatek/ddr3-mt7629.c b/drivers/ram/mediatek/ddr3-mt7629.c
index b3a68cb0787..a2f72b70470 100644
--- a/drivers/ram/mediatek/ddr3-mt7629.c
+++ b/drivers/ram/mediatek/ddr3-mt7629.c
@@ -14,6 +14,7 @@
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 /* EMI */
 #define EMI_CONA			0x000
diff --git a/drivers/ram/mpc83xx_sdram.c b/drivers/ram/mpc83xx_sdram.c
index 2a78291deb5..844a8a0d9fb 100644
--- a/drivers/ram/mpc83xx_sdram.c
+++ b/drivers/ram/mpc83xx_sdram.c
@@ -12,6 +12,7 @@
 #include <asm/bitops.h>
 #include <asm/global_data.h>
 #include <dt-bindings/memory/mpc83xx-sdram.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/ram/ram-uclass.c b/drivers/ram/ram-uclass.c
index f4d387fed1e..7f3b6276f9f 100644
--- a/drivers/ram/ram-uclass.c
+++ b/drivers/ram/ram-uclass.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <dm/lists.h>
 #include <dm/root.h>
+#include <linux/errno.h>
 
 int ram_get_info(struct udevice *dev, struct ram_info *info)
 {
diff --git a/drivers/ram/rockchip/dmc-rk3368.c b/drivers/ram/rockchip/dmc-rk3368.c
index 8795ad1c32c..1c3d95d7d63 100644
--- a/drivers/ram/rockchip/dmc-rk3368.c
+++ b/drivers/ram/rockchip/dmc-rk3368.c
@@ -25,6 +25,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 struct dram_info {
diff --git a/drivers/ram/rockchip/sdram_rk3188.c b/drivers/ram/rockchip/sdram_rk3188.c
index a2c36fa3cad..a8db0e34122 100644
--- a/drivers/ram/rockchip/sdram_rk3188.c
+++ b/drivers/ram/rockchip/sdram_rk3188.c
@@ -28,6 +28,7 @@
 #include <asm/arch-rockchip/sdram_rk3288.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 struct chan_info {
diff --git a/drivers/ram/rockchip/sdram_rk322x.c b/drivers/ram/rockchip/sdram_rk322x.c
index 51d87e6d29f..92fe235be5a 100644
--- a/drivers/ram/rockchip/sdram_rk322x.c
+++ b/drivers/ram/rockchip/sdram_rk322x.c
@@ -24,6 +24,7 @@
 #include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/ram/rockchip/sdram_rk3288.c b/drivers/ram/rockchip/sdram_rk3288.c
index 1063fde3e87..4f48da4b4e5 100644
--- a/drivers/ram/rockchip/sdram_rk3288.c
+++ b/drivers/ram/rockchip/sdram_rk3288.c
@@ -28,6 +28,7 @@
 #include <asm/arch-rockchip/sdram_rk3288.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <power/regulator.h>
 #include <power/rk8xx_pmic.h>
diff --git a/drivers/ram/rockchip/sdram_rk3399.c b/drivers/ram/rockchip/sdram_rk3399.c
index 935bfc97b14..45c20b7cfa3 100644
--- a/drivers/ram/rockchip/sdram_rk3399.c
+++ b/drivers/ram/rockchip/sdram_rk3399.c
@@ -26,6 +26,7 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <time.h>
+#include <linux/errno.h>
 
 #define PRESET_SGRF_HOLD(n)	((0x1 << (6 + 16)) | ((n) << 6))
 #define PRESET_GPIO0_HOLD(n)	((0x1 << (7 + 16)) | ((n) << 7))
diff --git a/drivers/ram/sifive/fu540_ddr.c b/drivers/ram/sifive/fu540_ddr.c
index eff6da55ad2..0270dd088db 100644
--- a/drivers/ram/sifive/fu540_ddr.c
+++ b/drivers/ram/sifive/fu540_ddr.c
@@ -19,6 +19,7 @@
 #include <clk.h>
 #include <wait_bit.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #define DENALI_CTL_0	0
 #define DENALI_CTL_21	21
diff --git a/drivers/ram/stm32_sdram.c b/drivers/ram/stm32_sdram.c
index 3f61addac31..04fb730525d 100644
--- a/drivers/ram/stm32_sdram.c
+++ b/drivers/ram/stm32_sdram.c
@@ -15,6 +15,7 @@
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/ram/stm32mp1/stm32mp1_ddr.c b/drivers/ram/stm32mp1/stm32mp1_ddr.c
index 1f39ce5ea49..6742aa6a986 100644
--- a/drivers/ram/stm32mp1/stm32mp1_ddr.c
+++ b/drivers/ram/stm32mp1/stm32mp1_ddr.c
@@ -15,6 +15,7 @@
 #include <asm/arch/ddr.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/iopoll.h>
 #include <linux/printk.h>
 #include <linux/string.h>
diff --git a/drivers/ram/stm32mp1/stm32mp1_ram.c b/drivers/ram/stm32mp1/stm32mp1_ram.c
index a24788957df..347ff769e40 100644
--- a/drivers/ram/stm32mp1/stm32mp1_ram.c
+++ b/drivers/ram/stm32mp1/stm32mp1_ram.c
@@ -13,6 +13,7 @@
 #include <stdio.h>
 #include <syscon.h>
 #include <asm/io.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include "stm32mp1_ddr.h"
diff --git a/drivers/remoteproc/k3_system_controller.c b/drivers/remoteproc/k3_system_controller.c
index 44271c5baf8..aa993b97392 100644
--- a/drivers/remoteproc/k3_system_controller.c
+++ b/drivers/remoteproc/k3_system_controller.c
@@ -13,6 +13,7 @@
 #include <errno.h>
 #include <mailbox.h>
 #include <dm/device_compat.h>
+#include <linux/errno.h>
 #include <linux/soc/ti/k3-sec-proxy.h>
 #include <linux/string.h>
 
diff --git a/drivers/remoteproc/rproc-elf-loader.c b/drivers/remoteproc/rproc-elf-loader.c
index 45331107353..d4064a311b5 100644
--- a/drivers/remoteproc/rproc-elf-loader.c
+++ b/drivers/remoteproc/rproc-elf-loader.c
@@ -11,6 +11,7 @@
 #include <asm/cache.h>
 #include <dm/device_compat.h>
 #include <linux/compat.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/remoteproc/rproc-uclass.c b/drivers/remoteproc/rproc-uclass.c
index 1ed194aa034..950dc3f9b11 100644
--- a/drivers/remoteproc/rproc-uclass.c
+++ b/drivers/remoteproc/rproc-uclass.c
@@ -16,6 +16,7 @@
 #include <dm.h>
 #include <dm/uclass.h>
 #include <dm/uclass-internal.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/remoteproc/sandbox_testproc.c b/drivers/remoteproc/sandbox_testproc.c
index 4317af78d29..e3759eed95c 100644
--- a/drivers/remoteproc/sandbox_testproc.c
+++ b/drivers/remoteproc/sandbox_testproc.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <remoteproc.h>
 #include <asm/io.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 /**
diff --git a/drivers/remoteproc/stm32_copro.c b/drivers/remoteproc/stm32_copro.c
index e09d2b9a646..eb437464ae1 100644
--- a/drivers/remoteproc/stm32_copro.c
+++ b/drivers/remoteproc/stm32_copro.c
@@ -15,6 +15,7 @@
 #include <asm/io.h>
 #include <dm/device_compat.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 #define RCC_GCR_HOLD_BOOT	0
diff --git a/drivers/remoteproc/ti_k3_arm64_rproc.c b/drivers/remoteproc/ti_k3_arm64_rproc.c
index 28c6ddb6919..20b02f691e3 100644
--- a/drivers/remoteproc/ti_k3_arm64_rproc.c
+++ b/drivers/remoteproc/ti_k3_arm64_rproc.c
@@ -17,6 +17,7 @@
 #include <power-domain.h>
 #include <dm/device_compat.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/soc/ti/ti_sci_protocol.h>
 #include "ti_sci_proc.h"
 
diff --git a/drivers/remoteproc/ti_k3_dsp_rproc.c b/drivers/remoteproc/ti_k3_dsp_rproc.c
index cbebfacb48c..722b9432491 100644
--- a/drivers/remoteproc/ti_k3_dsp_rproc.c
+++ b/drivers/remoteproc/ti_k3_dsp_rproc.c
@@ -19,6 +19,7 @@
 #include <power-domain.h>
 #include <dm/device_compat.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/sizes.h>
 #include <linux/soc/ti/ti_sci_protocol.h>
 #include <linux/string.h>
diff --git a/drivers/remoteproc/ti_k3_r5f_rproc.c b/drivers/remoteproc/ti_k3_r5f_rproc.c
index 964a75309ad..db437c1a686 100644
--- a/drivers/remoteproc/ti_k3_r5f_rproc.c
+++ b/drivers/remoteproc/ti_k3_r5f_rproc.c
@@ -18,6 +18,7 @@
 #include <asm/io.h>
 #include <dm/device_compat.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/soc/ti/ti_sci_protocol.h>
 #include <linux/string.h>
diff --git a/drivers/remoteproc/ti_power_proc.c b/drivers/remoteproc/ti_power_proc.c
index 0d78ec439d0..84e621ca9ee 100644
--- a/drivers/remoteproc/ti_power_proc.c
+++ b/drivers/remoteproc/ti_power_proc.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <remoteproc.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include <mach/psc_defs.h>
diff --git a/drivers/reset/reset-bcm6345.c b/drivers/reset/reset-bcm6345.c
index 156703e0843..69793967c42 100644
--- a/drivers/reset/reset-bcm6345.c
+++ b/drivers/reset/reset-bcm6345.c
@@ -15,6 +15,7 @@
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 #define MAX_RESETS	32
 
diff --git a/drivers/reset/reset-hisilicon.c b/drivers/reset/reset-hisilicon.c
index 139bc5d73e0..2012421e417 100644
--- a/drivers/reset/reset-hisilicon.c
+++ b/drivers/reset/reset-hisilicon.c
@@ -11,6 +11,7 @@
 #include <dt-bindings/reset/ti-syscon.h>
 #include <reset-uclass.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 struct hisi_reset_priv {
 	void __iomem *base;
diff --git a/drivers/reset/reset-hsdk.c b/drivers/reset/reset-hsdk.c
index 0c8f276293d..531e2cfb5fa 100644
--- a/drivers/reset/reset-hsdk.c
+++ b/drivers/reset/reset-hsdk.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <dm.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/iopoll.h>
 #include <reset-uclass.h>
 
diff --git a/drivers/reset/reset-imx7.c b/drivers/reset/reset-imx7.c
index 96916b644ad..1ad031b9041 100644
--- a/drivers/reset/reset-imx7.c
+++ b/drivers/reset/reset-imx7.c
@@ -13,6 +13,7 @@
 #include <reset-uclass.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 struct imx7_reset_priv {
 	void __iomem *base;
diff --git a/drivers/reset/reset-mediatek.c b/drivers/reset/reset-mediatek.c
index 97d3d575927..9df4c2a1c7b 100644
--- a/drivers/reset/reset-mediatek.c
+++ b/drivers/reset/reset-mediatek.c
@@ -16,6 +16,7 @@
 #include <syscon.h>
 #include <linux/bitops.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 
 struct mediatek_reset_priv {
 	struct regmap *regmap;
diff --git a/drivers/reset/reset-meson.c b/drivers/reset/reset-meson.c
index 4e3327898e2..8322a48a8ae 100644
--- a/drivers/reset/reset-meson.c
+++ b/drivers/reset/reset-meson.c
@@ -13,6 +13,7 @@
 #include <reset-uclass.h>
 #include <regmap.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #define REG_COUNT	8
 #define BITS_PER_REG	32
diff --git a/drivers/reset/reset-mtmips.c b/drivers/reset/reset-mtmips.c
index bc20e3335c5..4d59a9b8ac5 100644
--- a/drivers/reset/reset-mtmips.c
+++ b/drivers/reset/reset-mtmips.c
@@ -12,6 +12,7 @@
 #include <malloc.h>
 #include <reset-uclass.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 
 struct mtmips_reset_priv {
diff --git a/drivers/reset/reset-raspberrypi.c b/drivers/reset/reset-raspberrypi.c
index e2d284e5aca..e4aa7ca6d3b 100644
--- a/drivers/reset/reset-raspberrypi.c
+++ b/drivers/reset/reset-raspberrypi.c
@@ -9,6 +9,7 @@
 #include <reset-uclass.h>
 #include <asm/arch/msg.h>
 #include <dt-bindings/reset/raspberrypi,firmware-reset.h>
+#include <linux/errno.h>
 
 static int raspberrypi_reset_request(struct reset_ctl *reset_ctl)
 {
diff --git a/drivers/reset/reset-rockchip.c b/drivers/reset/reset-rockchip.c
index 80925556508..5e8daa28913 100644
--- a/drivers/reset/reset-rockchip.c
+++ b/drivers/reset/reset-rockchip.c
@@ -9,6 +9,7 @@
 #include <malloc.h>
 #include <reset-uclass.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <asm/arch-rockchip/hardware.h>
 #include <dm/lists.h>
diff --git a/drivers/reset/reset-sunxi.c b/drivers/reset/reset-sunxi.c
index b9ca80e9b02..54692cc3f5e 100644
--- a/drivers/reset/reset-sunxi.c
+++ b/drivers/reset/reset-sunxi.c
@@ -14,6 +14,7 @@
 #include <asm/io.h>
 #include <dm/lists.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/log2.h>
 #include <asm/arch/ccu.h>
 
diff --git a/drivers/reset/reset-syscon.c b/drivers/reset/reset-syscon.c
index 8520227d551..16e74dc8e94 100644
--- a/drivers/reset/reset-syscon.c
+++ b/drivers/reset/reset-syscon.c
@@ -11,6 +11,7 @@
 #include <syscon.h>
 #include <linux/bitops.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 
 struct syscon_reset_priv {
 	struct regmap *regmap;
diff --git a/drivers/reset/reset-ti-sci.c b/drivers/reset/reset-ti-sci.c
index 95cd3885876..4d00622eb81 100644
--- a/drivers/reset/reset-ti-sci.c
+++ b/drivers/reset/reset-ti-sci.c
@@ -16,6 +16,7 @@
 #include <reset-uclass.h>
 #include <dm/device_compat.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/soc/ti/ti_sci_protocol.h>
 
 /**
diff --git a/drivers/reset/reset-uclass.c b/drivers/reset/reset-uclass.c
index 5e38ce5c066..4dc2950bbab 100644
--- a/drivers/reset/reset-uclass.c
+++ b/drivers/reset/reset-uclass.c
@@ -11,6 +11,7 @@
 #include <reset.h>
 #include <reset-uclass.h>
 #include <dm/devres.h>
+#include <linux/errno.h>
 
 static inline struct reset_ops *reset_dev_ops(struct udevice *dev)
 {
diff --git a/drivers/reset/reset-uniphier.c b/drivers/reset/reset-uniphier.c
index fe1bd5541bd..b557906b890 100644
--- a/drivers/reset/reset-uniphier.c
+++ b/drivers/reset/reset-uniphier.c
@@ -11,6 +11,7 @@
 #include <reset-uclass.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/sizes.h>
 
diff --git a/drivers/reset/sandbox-reset.c b/drivers/reset/sandbox-reset.c
index 7a6f7f676cc..a6936e81877 100644
--- a/drivers/reset/sandbox-reset.c
+++ b/drivers/reset/sandbox-reset.c
@@ -10,6 +10,7 @@
 #include <reset-uclass.h>
 #include <asm/io.h>
 #include <asm/reset.h>
+#include <linux/errno.h>
 
 #define SANDBOX_RESET_SIGNALS 101
 
diff --git a/drivers/reset/sti-reset.c b/drivers/reset/sti-reset.c
index 12000d05cc8..75d972a5fa2 100644
--- a/drivers/reset/sti-reset.c
+++ b/drivers/reset/sti-reset.c
@@ -16,6 +16,7 @@
 #include <asm/global_data.h>
 #include <dt-bindings/reset/stih407-resets.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/reset/stm32-reset.c b/drivers/reset/stm32-reset.c
index 64a11cfcfc0..6f68c479e36 100644
--- a/drivers/reset/stm32-reset.c
+++ b/drivers/reset/stm32-reset.c
@@ -13,6 +13,7 @@
 #include <stm32_rcc.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 /* reset clear offset for STM32MP RCC */
 #define RCC_CL 0x4
diff --git a/drivers/reset/tegra-car-reset.c b/drivers/reset/tegra-car-reset.c
index a33d4533a82..68ec38643fd 100644
--- a/drivers/reset/tegra-car-reset.c
+++ b/drivers/reset/tegra-car-reset.c
@@ -10,6 +10,7 @@
 #include <reset-uclass.h>
 #include <asm/arch/clock.h>
 #include <asm/arch-tegra/clk_rst.h>
+#include <linux/errno.h>
 
 static int tegra_car_reset_request(struct reset_ctl *reset_ctl)
 {
diff --git a/drivers/rng/meson-rng.c b/drivers/rng/meson-rng.c
index 448d4537b05..0debe8a1068 100644
--- a/drivers/rng/meson-rng.c
+++ b/drivers/rng/meson-rng.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <rng.h>
 #include <asm/io.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 struct meson_rng_platdata {
diff --git a/drivers/rng/rng-uclass.c b/drivers/rng/rng-uclass.c
index b6af3b8606a..b315401f20e 100644
--- a/drivers/rng/rng-uclass.c
+++ b/drivers/rng/rng-uclass.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <dm.h>
 #include <rng.h>
+#include <linux/errno.h>
 
 int dm_rng_read(struct udevice *dev, void *buffer, size_t size)
 {
diff --git a/drivers/rng/rockchip_rng.c b/drivers/rng/rockchip_rng.c
index c6a834b67c5..efc1980e449 100644
--- a/drivers/rng/rockchip_rng.c
+++ b/drivers/rng/rockchip_rng.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/iopoll.h>
 #include <linux/string.h>
 #include <rng.h>
diff --git a/drivers/rng/stm32mp1_rng.c b/drivers/rng/stm32mp1_rng.c
index 32f8cebb687..25cba160222 100644
--- a/drivers/rng/stm32mp1_rng.c
+++ b/drivers/rng/stm32mp1_rng.c
@@ -12,6 +12,7 @@
 #include <stdio.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include <asm/io.h>
diff --git a/drivers/rtc/ds3231.c b/drivers/rtc/ds3231.c
index 328b03ed05d..ebb1cc65c64 100644
--- a/drivers/rtc/ds3231.c
+++ b/drivers/rtc/ds3231.c
@@ -21,6 +21,7 @@
 #include <rtc.h>
 #include <i2c.h>
 #include <stdio.h>
+#include <linux/errno.h>
 
 /*
  * RTC register addresses
diff --git a/drivers/rtc/ds3232.c b/drivers/rtc/ds3232.c
index 0a30e0eabb4..e6c9f878665 100644
--- a/drivers/rtc/ds3232.c
+++ b/drivers/rtc/ds3232.c
@@ -10,6 +10,7 @@
 #include <rtc.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 /*
  * RTC register addresses
diff --git a/drivers/rtc/pl031.c b/drivers/rtc/pl031.c
index 1b6717232c7..f98e3506eb6 100644
--- a/drivers/rtc/pl031.c
+++ b/drivers/rtc/pl031.c
@@ -14,6 +14,7 @@
 #include <rtc.h>
 #include <asm/io.h>
 #include <asm/types.h>
+#include <linux/errno.h>
 
 /*
  * Register definitions
diff --git a/drivers/rtc/rtc-uclass.c b/drivers/rtc/rtc-uclass.c
index 8035f7fe9cc..1fda0cd8fbc 100644
--- a/drivers/rtc/rtc-uclass.c
+++ b/drivers/rtc/rtc-uclass.c
@@ -9,6 +9,7 @@
 #include <errno.h>
 #include <log.h>
 #include <rtc.h>
+#include <linux/errno.h>
 
 int dm_rtc_get(struct udevice *dev, struct rtc_time *time)
 {
diff --git a/drivers/rtc/rv3029.c b/drivers/rtc/rv3029.c
index 4dddf62aca8..ffed37ad5aa 100644
--- a/drivers/rtc/rv3029.c
+++ b/drivers/rtc/rv3029.c
@@ -19,6 +19,7 @@
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 #define RTC_RV3029_PAGE_LEN             7
 
diff --git a/drivers/rtc/rx8010sj.c b/drivers/rtc/rx8010sj.c
index 1d9b7cd6358..1da7a7d6c90 100644
--- a/drivers/rtc/rx8010sj.c
+++ b/drivers/rtc/rx8010sj.c
@@ -23,6 +23,7 @@
 #include <rtc.h>
 #include <stdio.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 /*---------------------------------------------------------------------*/
 /* #undef DEBUG_RTC */
diff --git a/drivers/rtc/rx8025.c b/drivers/rtc/rx8025.c
index 7fd04d999b0..aaa3609be00 100644
--- a/drivers/rtc/rx8025.c
+++ b/drivers/rtc/rx8025.c
@@ -14,6 +14,7 @@
 #include <i2c.h>
 #include <rtc.h>
 #include <stdio.h>
+#include <linux/errno.h>
 
 /*---------------------------------------------------------------------*/
 #undef DEBUG_RTC
diff --git a/drivers/rtc/s35392a.c b/drivers/rtc/s35392a.c
index 5d70ed1ecda..3744d8445fb 100644
--- a/drivers/rtc/s35392a.c
+++ b/drivers/rtc/s35392a.c
@@ -25,6 +25,7 @@
 #include <linux/bitrev.h>
 #include <rtc.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 #define S35390A_CHIP_ADDR	0x30
 
diff --git a/drivers/rtc/stm32_rtc.c b/drivers/rtc/stm32_rtc.c
index f9db318af1d..8f9540697df 100644
--- a/drivers/rtc/stm32_rtc.c
+++ b/drivers/rtc/stm32_rtc.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/iopoll.h>
 
 #define STM32_RTC_TR		0x00
diff --git a/drivers/scsi/scsi-uclass.c b/drivers/scsi/scsi-uclass.c
index acf3b3dc957..4b063ad06e1 100644
--- a/drivers/scsi/scsi-uclass.c
+++ b/drivers/scsi/scsi-uclass.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <dm.h>
 #include <scsi.h>
+#include <linux/errno.h>
 
 int scsi_exec(struct udevice *dev, struct scsi_cmd *pccb)
 {
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
index 1a5e256d61a..ad7ca9e8784 100644
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -17,6 +17,7 @@
 #include <vsprintf.h>
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #if !defined(CONFIG_DM_SCSI)
diff --git a/drivers/serial/altera_jtag_uart.c b/drivers/serial/altera_jtag_uart.c
index 35b76f53f93..6b20d3d487b 100644
--- a/drivers/serial/altera_jtag_uart.c
+++ b/drivers/serial/altera_jtag_uart.c
@@ -10,6 +10,7 @@
 #include <serial.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 /* data register */
 #define ALTERA_JTAG_RVALID	BIT(15)	/* Read valid */
diff --git a/drivers/serial/altera_uart.c b/drivers/serial/altera_uart.c
index 0be5cd75c85..ea9eb206a10 100644
--- a/drivers/serial/altera_uart.c
+++ b/drivers/serial/altera_uart.c
@@ -10,6 +10,7 @@
 #include <serial.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 /* status register */
 #define ALTERA_UART_TMT		BIT(5)	/* tx empty */
diff --git a/drivers/serial/arm_dcc.c b/drivers/serial/arm_dcc.c
index dfcb6fd6981..270f61cc074 100644
--- a/drivers/serial/arm_dcc.c
+++ b/drivers/serial/arm_dcc.c
@@ -18,6 +18,7 @@
 #include <common.h>
 #include <dm.h>
 #include <serial.h>
+#include <linux/errno.h>
 
 #if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_V7A) || defined(CONFIG_CPU_V7R)
 /*
diff --git a/drivers/serial/atmel_usart.c b/drivers/serial/atmel_usart.c
index f2065935886..f6e14cc9021 100644
--- a/drivers/serial/atmel_usart.c
+++ b/drivers/serial/atmel_usart.c
@@ -16,6 +16,7 @@
 #include <asm/global_data.h>
 #include <linux/compiler.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 #include <asm/io.h>
 #ifdef CONFIG_DM_SERIAL
diff --git a/drivers/serial/lpc32xx_hsuart.c b/drivers/serial/lpc32xx_hsuart.c
index 7d31c6d4a14..598ae08c668 100644
--- a/drivers/serial/lpc32xx_hsuart.c
+++ b/drivers/serial/lpc32xx_hsuart.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <serial.h>
 #include <dm/platform_data/lpc32xx_hsuart.h>
+#include <linux/errno.h>
 
 #include <asm/arch/uart.h>
 #include <linux/compiler.h>
diff --git a/drivers/serial/ns16550.c b/drivers/serial/ns16550.c
index 840d89f16fa..603a8cb5977 100644
--- a/drivers/serial/ns16550.c
+++ b/drivers/serial/ns16550.c
@@ -16,6 +16,7 @@
 #include <watchdog.h>
 #include <asm/global_data.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/types.h>
 #include <asm/io.h>
 
diff --git a/drivers/serial/sandbox.c b/drivers/serial/sandbox.c
index 01c924675af..aef4c75d388 100644
--- a/drivers/serial/sandbox.c
+++ b/drivers/serial/sandbox.c
@@ -20,6 +20,7 @@
 #include <asm/global_data.h>
 #include <linux/compiler.h>
 #include <asm/state.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/serial/serial-uclass.c b/drivers/serial/serial-uclass.c
index bb6bdbe4291..5033298f95a 100644
--- a/drivers/serial/serial-uclass.c
+++ b/drivers/serial/serial-uclass.c
@@ -19,6 +19,7 @@
 #include <dm/device-internal.h>
 #include <dm/of_access.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/serial/serial.c b/drivers/serial/serial.c
index 3f8ab647e55..6e10e5ec846 100644
--- a/drivers/serial/serial.c
+++ b/drivers/serial/serial.c
@@ -16,6 +16,7 @@
 #include <linux/compiler.h>
 #include <errno.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/serial/serial_ar933x.c b/drivers/serial/serial_ar933x.c
index 9de94b69bd0..a16d6a6eca6 100644
--- a/drivers/serial/serial_ar933x.c
+++ b/drivers/serial/serial_ar933x.c
@@ -14,6 +14,7 @@
 #include <asm/types.h>
 #include <dm/pinctrl.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <mach/ar71xx_regs.h>
 
 #define AR933X_UART_DATA_REG            0x00
diff --git a/drivers/serial/serial_bcm283x_mu.c b/drivers/serial/serial_bcm283x_mu.c
index 8a4af87eb64..d9ebb273ddc 100644
--- a/drivers/serial/serial_bcm283x_mu.c
+++ b/drivers/serial/serial_bcm283x_mu.c
@@ -25,6 +25,7 @@
 #include <dm/pinctrl.h>
 #include <linux/bitops.h>
 #include <linux/compiler.h>
+#include <linux/errno.h>
 
 struct bcm283x_mu_regs {
 	u32 io;
diff --git a/drivers/serial/serial_bcm283x_pl011.c b/drivers/serial/serial_bcm283x_pl011.c
index 923f402fbe9..efb6eb60b35 100644
--- a/drivers/serial/serial_bcm283x_pl011.c
+++ b/drivers/serial/serial_bcm283x_pl011.c
@@ -9,6 +9,7 @@
 #include <dm/pinctrl.h>
 #include <dm/platform_data/serial_pl01x.h>
 #include <serial.h>
+#include <linux/errno.h>
 #include "serial_pl01x_internal.h"
 
 /*
diff --git a/drivers/serial/serial_bcm6345.c b/drivers/serial/serial_bcm6345.c
index 5b963ce45bc..309cbf63af9 100644
--- a/drivers/serial/serial_bcm6345.c
+++ b/drivers/serial/serial_bcm6345.c
@@ -14,6 +14,7 @@
 #include <serial.h>
 #include <asm/io.h>
 #include <asm/types.h>
+#include <linux/errno.h>
 
 /* UART Control register */
 #define UART_CTL_REG			0x0
diff --git a/drivers/serial/serial_cortina.c b/drivers/serial/serial_cortina.c
index cc20673efef..c0beba19f58 100644
--- a/drivers/serial/serial_cortina.c
+++ b/drivers/serial/serial_cortina.c
@@ -13,6 +13,7 @@
 #include <serial.h>
 #include <linux/bitops.h>
 #include <linux/compiler.h>
+#include <linux/errno.h>
 
 /* Register definitions */
 #define UCFG			0x00	/* UART config register */
diff --git a/drivers/serial/serial_efi.c b/drivers/serial/serial_efi.c
index b152e102587..df3a0901024 100644
--- a/drivers/serial/serial_efi.c
+++ b/drivers/serial/serial_efi.c
@@ -15,6 +15,7 @@
 #include <linux/compiler.h>
 #include <asm/io.h>
 #include <serial.h>
+#include <linux/errno.h>
 
 /* Information about the efi console */
 struct serial_efi_priv {
diff --git a/drivers/serial/serial_linflexuart.c b/drivers/serial/serial_linflexuart.c
index d8482ba7047..d9be526ffe2 100644
--- a/drivers/serial/serial_linflexuart.c
+++ b/drivers/serial/serial_linflexuart.c
@@ -13,6 +13,7 @@
 #include <linux/compiler.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/clock.h>
+#include <linux/errno.h>
 
 #define US1_TDRE            (1 << 7)
 #define US1_RDRF            (1 << 5)
diff --git a/drivers/serial/serial_lpuart.c b/drivers/serial/serial_lpuart.c
index 8631d790e6f..1017981f97c 100644
--- a/drivers/serial/serial_lpuart.c
+++ b/drivers/serial/serial_lpuart.c
@@ -18,6 +18,7 @@
 #include <linux/compiler.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/clock.h>
+#include <linux/errno.h>
 
 #define US1_TDRE	(1 << 7)
 #define US1_RDRF	(1 << 5)
diff --git a/drivers/serial/serial_mcf.c b/drivers/serial/serial_mcf.c
index 6b907fe1920..2d2f07e369b 100644
--- a/drivers/serial/serial_mcf.c
+++ b/drivers/serial/serial_mcf.c
@@ -23,6 +23,7 @@
 #include <linux/compiler.h>
 #include <asm/immap.h>
 #include <asm/uart.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/serial/serial_meson.c b/drivers/serial/serial_meson.c
index 496a2ca2c35..80141642af8 100644
--- a/drivers/serial/serial_meson.c
+++ b/drivers/serial/serial_meson.c
@@ -10,6 +10,7 @@
 #include <linux/bitops.h>
 #include <linux/compiler.h>
 #include <serial.h>
+#include <linux/errno.h>
 
 struct meson_uart {
 	u32 wfifo;
diff --git a/drivers/serial/serial_msm.c b/drivers/serial/serial_msm.c
index 13c7f9d809e..0809f1ff8a9 100644
--- a/drivers/serial/serial_msm.c
+++ b/drivers/serial/serial_msm.c
@@ -19,6 +19,7 @@
 #include <asm/io.h>
 #include <linux/compiler.h>
 #include <dm/pinctrl.h>
+#include <linux/errno.h>
 
 /* Serial registers - this driver works in uartdm mode*/
 
diff --git a/drivers/serial/serial_mtk.c b/drivers/serial/serial_mtk.c
index 0d2a9dc7e3e..74b5cc880c1 100644
--- a/drivers/serial/serial_mtk.c
+++ b/drivers/serial/serial_mtk.c
@@ -18,6 +18,7 @@
 #include <asm/io.h>
 #include <asm/types.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 struct mtk_serial_regs {
diff --git a/drivers/serial/serial_mxc.c b/drivers/serial/serial_mxc.c
index 1f8eeb2cbfe..1c08f3ec795 100644
--- a/drivers/serial/serial_mxc.c
+++ b/drivers/serial/serial_mxc.c
@@ -13,6 +13,7 @@
 #include <dm/platform_data/serial_mxc.h>
 #include <serial.h>
 #include <linux/compiler.h>
+#include <linux/errno.h>
 
 /* UART Control Register Bit Fields.*/
 #define URXD_CHARRDY	(1<<15)
diff --git a/drivers/serial/serial_nulldev.c b/drivers/serial/serial_nulldev.c
index efae14dd6ca..c92ae698088 100644
--- a/drivers/serial/serial_nulldev.c
+++ b/drivers/serial/serial_nulldev.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <dm.h>
 #include <serial.h>
+#include <linux/errno.h>
 
 static int nulldev_serial_setbrg(struct udevice *dev, int baudrate)
 {
diff --git a/drivers/serial/serial_omap.c b/drivers/serial/serial_omap.c
index f7997fc788f..b661b11f0d8 100644
--- a/drivers/serial/serial_omap.c
+++ b/drivers/serial/serial_omap.c
@@ -14,6 +14,7 @@
 #include <serial.h>
 #include <clk.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 
 #ifndef CONFIG_SYS_NS16550_CLK
 #define CONFIG_SYS_NS16550_CLK  0
diff --git a/drivers/serial/serial_owl.c b/drivers/serial/serial_owl.c
index 2651a45a7f3..d721e24e4bf 100644
--- a/drivers/serial/serial_owl.c
+++ b/drivers/serial/serial_owl.c
@@ -15,6 +15,7 @@
 #include <asm/io.h>
 #include <asm/types.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 /* UART Registers */
 #define	OWL_UART_CTL			(0x0000)
diff --git a/drivers/serial/serial_pic32.c b/drivers/serial/serial_pic32.c
index ce6c5db762f..8e420fb764b 100644
--- a/drivers/serial/serial_pic32.c
+++ b/drivers/serial/serial_pic32.c
@@ -11,6 +11,7 @@
 #include <wait_bit.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <mach/pic32.h>
 #include <dt-bindings/clock/microchip,clock.h>
 
diff --git a/drivers/serial/serial_pl01x.c b/drivers/serial/serial_pl01x.c
index 1ae5bac249a..a472e8ca5de 100644
--- a/drivers/serial/serial_pl01x.c
+++ b/drivers/serial/serial_pl01x.c
@@ -12,6 +12,7 @@
 
 #include <common.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 /* For get_bus_freq() */
 #include <clock_legacy.h>
 #include <dm.h>
diff --git a/drivers/serial/serial_pxa.c b/drivers/serial/serial_pxa.c
index a97d03a8876..e20f0c87540 100644
--- a/drivers/serial/serial_pxa.c
+++ b/drivers/serial/serial_pxa.c
@@ -31,6 +31,7 @@
 #include <linux/compiler.h>
 #include <serial.h>
 #include <watchdog.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/serial/serial_s5p.c b/drivers/serial/serial_s5p.c
index 986c5ca8107..1a939628a5a 100644
--- a/drivers/serial/serial_s5p.c
+++ b/drivers/serial/serial_s5p.c
@@ -18,6 +18,7 @@
 #include <asm/arch/uart.h>
 #include <serial.h>
 #include <clk.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/serial/serial_sh.c b/drivers/serial/serial_sh.c
index d697d62d910..e596c042ca6 100644
--- a/drivers/serial/serial_sh.c
+++ b/drivers/serial/serial_sh.c
@@ -17,6 +17,7 @@
 #include <linux/compiler.h>
 #include <dm/platform_data/serial_sh.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include "serial_sh.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/serial/serial_sifive.c b/drivers/serial/serial_sifive.c
index c3f0a3cb65d..39b62d30eb4 100644
--- a/drivers/serial/serial_sifive.c
+++ b/drivers/serial/serial_sifive.c
@@ -16,6 +16,7 @@
 #include <linux/compiler.h>
 #include <serial.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/serial/serial_sti_asc.c b/drivers/serial/serial_sti_asc.c
index aa3c9efc8a0..0cb53d7ae3f 100644
--- a/drivers/serial/serial_sti_asc.c
+++ b/drivers/serial/serial_sti_asc.c
@@ -13,6 +13,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/serial/serial_stm32.c b/drivers/serial/serial_stm32.c
index cab0db2c96a..5cd4c815cfd 100644
--- a/drivers/serial/serial_stm32.c
+++ b/drivers/serial/serial_stm32.c
@@ -15,6 +15,7 @@
 #include <asm/arch/stm32.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include "serial_stm32.h"
 #include <dm/device_compat.h>
 
diff --git a/drivers/serial/serial_xuartlite.c b/drivers/serial/serial_xuartlite.c
index 5116d13751d..fd9e227557f 100644
--- a/drivers/serial/serial_xuartlite.c
+++ b/drivers/serial/serial_xuartlite.c
@@ -14,6 +14,7 @@
 #include <linux/bitops.h>
 #include <linux/compiler.h>
 #include <serial.h>
+#include <linux/errno.h>
 
 #define SR_TX_FIFO_FULL		BIT(3) /* transmit FIFO full */
 #define SR_TX_FIFO_EMPTY	BIT(2) /* transmit FIFO empty */
diff --git a/drivers/serial/serial_zynq.c b/drivers/serial/serial_zynq.c
index 0e71cada1bb..7fec7d5bec4 100644
--- a/drivers/serial/serial_zynq.c
+++ b/drivers/serial/serial_zynq.c
@@ -18,6 +18,7 @@
 #include <linux/compiler.h>
 #include <serial.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 
 #define ZYNQ_UART_SR_TXACTIVE	BIT(11) /* TX active */
 #define ZYNQ_UART_SR_TXFULL	BIT(4) /* TX FIFO full */
diff --git a/drivers/smem/msm_smem.c b/drivers/smem/msm_smem.c
index 09a1268e276..ba9d108173c 100644
--- a/drivers/smem/msm_smem.c
+++ b/drivers/smem/msm_smem.c
@@ -16,6 +16,7 @@
 #include <asm/io.h>
 #include <linux/bug.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/ioport.h>
 #include <linux/io.h>
 #include <smem.h>
diff --git a/drivers/smem/smem-uclass.c b/drivers/smem/smem-uclass.c
index ce7bf40656e..90b1316d6dc 100644
--- a/drivers/smem/smem-uclass.c
+++ b/drivers/smem/smem-uclass.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <dm.h>
 #include <smem.h>
+#include <linux/errno.h>
 
 int smem_alloc(struct udevice *dev, unsigned int host,
 		unsigned int item, size_t size)
diff --git a/drivers/soc/soc-uclass.c b/drivers/soc/soc-uclass.c
index d22773e478b..29d586e0bcd 100644
--- a/drivers/soc/soc-uclass.c
+++ b/drivers/soc/soc-uclass.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <dm/lists.h>
 #include <dm/root.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 int soc_get(struct udevice **devp)
diff --git a/drivers/soc/soc_ti_k3.c b/drivers/soc/soc_ti_k3.c
index 77514c225e2..5ffccba2e8c 100644
--- a/drivers/soc/soc_ti_k3.c
+++ b/drivers/soc/soc_ti_k3.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <soc.h>
 #include <vsprintf.h>
+#include <linux/errno.h>
 
 #include <asm/io.h>
 
diff --git a/drivers/soc/ti/k3-navss-ringacc.c b/drivers/soc/ti/k3-navss-ringacc.c
index f4a0272f3ae..21c4b3fe194 100644
--- a/drivers/soc/ti/k3-navss-ringacc.c
+++ b/drivers/soc/ti/k3-navss-ringacc.c
@@ -21,6 +21,7 @@
 #include <linux/compat.h>
 #include <linux/dma-mapping.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/soc/ti/k3-navss-ringacc.h>
 #include <linux/soc/ti/ti_sci_protocol.h>
diff --git a/drivers/soc/ti/keystone_serdes.c b/drivers/soc/ti/keystone_serdes.c
index f2a5c18b80b..c121fec52d4 100644
--- a/drivers/soc/ti/keystone_serdes.c
+++ b/drivers/soc/ti/keystone_serdes.c
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <asm/ti-common/keystone_serdes.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #define SERDES_CMU_REGS(x)		(0x0000 + (0x0c00 * (x)))
 #define SERDES_LANE_REGS(x)		(0x0200 + (0x200 * (x)))
diff --git a/drivers/sound/broadwell_i2s.c b/drivers/sound/broadwell_i2s.c
index adb0b2b104d..4258d607cb4 100644
--- a/drivers/sound/broadwell_i2s.c
+++ b/drivers/sound/broadwell_i2s.c
@@ -15,6 +15,7 @@
 #include <log.h>
 #include <time.h>
 #include <asm/io.h>
+#include <linux/errno.h>
 #include "broadwell_i2s.h"
 
 enum {
diff --git a/drivers/sound/broadwell_sound.c b/drivers/sound/broadwell_sound.c
index 6e083fe1f69..ba2a68ce56a 100644
--- a/drivers/sound/broadwell_sound.c
+++ b/drivers/sound/broadwell_sound.c
@@ -13,6 +13,7 @@
 #include <dm.h>
 #include <i2s.h>
 #include <sound.h>
+#include <linux/errno.h>
 
 static int broadwell_sound_probe(struct udevice *dev)
 {
diff --git a/drivers/sound/codec-uclass.c b/drivers/sound/codec-uclass.c
index 1ec77acfc1c..207dc188c48 100644
--- a/drivers/sound/codec-uclass.c
+++ b/drivers/sound/codec-uclass.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <audio_codec.h>
+#include <linux/errno.h>
 
 int audio_codec_set_params(struct udevice *dev, int interface, int rate,
 			   int mclk_freq, int bits_per_sample, uint channels)
diff --git a/drivers/sound/da7219.c b/drivers/sound/da7219.c
index 6bc1ad0036e..41aa338b55f 100644
--- a/drivers/sound/da7219.c
+++ b/drivers/sound/da7219.c
@@ -20,6 +20,7 @@
 #include <asm-generic/gpio.h>
 #include <dt-bindings/sound/nhlt.h>
 #include <dm/acpi.h>
+#include <linux/errno.h>
 
 #define DA7219_ACPI_HID		"DLGS7219"
 
diff --git a/drivers/sound/hda_codec.c b/drivers/sound/hda_codec.c
index 93820d77802..241b6270c4d 100644
--- a/drivers/sound/hda_codec.c
+++ b/drivers/sound/hda_codec.c
@@ -18,6 +18,7 @@
 #include <dt-bindings/sound/azalia.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 /**
  * struct hda_regs - HDA registers
diff --git a/drivers/sound/i2s-uclass.c b/drivers/sound/i2s-uclass.c
index b741e3952d1..e31d9933fff 100644
--- a/drivers/sound/i2s-uclass.c
+++ b/drivers/sound/i2s-uclass.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <i2s.h>
+#include <linux/errno.h>
 
 int i2s_tx_data(struct udevice *dev, void *data, uint data_size)
 {
diff --git a/drivers/sound/max98088.c b/drivers/sound/max98088.c
index 5b4c489f4b1..6c2caf3f77f 100644
--- a/drivers/sound/max98088.c
+++ b/drivers/sound/max98088.c
@@ -17,6 +17,7 @@
 #include <log.h>
 #include <sound.h>
 #include <asm/gpio.h>
+#include <linux/errno.h>
 #include "maxim_codec.h"
 #include "max98088.h"
 
diff --git a/drivers/sound/max98090.c b/drivers/sound/max98090.c
index d23955d6e10..16620c3e967 100644
--- a/drivers/sound/max98090.c
+++ b/drivers/sound/max98090.c
@@ -15,6 +15,7 @@
 #include <sound.h>
 #include <asm/gpio.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include "maxim_codec.h"
 #include "max98090.h"
 
diff --git a/drivers/sound/max98095.c b/drivers/sound/max98095.c
index 5037f9516fa..db52ccdea3b 100644
--- a/drivers/sound/max98095.c
+++ b/drivers/sound/max98095.c
@@ -16,6 +16,7 @@
 #include <log.h>
 #include <sound.h>
 #include <asm/gpio.h>
+#include <linux/errno.h>
 #include "i2s.h"
 #include "max98095.h"
 
diff --git a/drivers/sound/max98357a.c b/drivers/sound/max98357a.c
index 841bc6ef682..8fbcf80abcb 100644
--- a/drivers/sound/max98357a.c
+++ b/drivers/sound/max98357a.c
@@ -20,6 +20,7 @@
 #endif
 #include <dt-bindings/sound/nhlt.h>
 #include <dm/acpi.h>
+#include <linux/errno.h>
 
 struct max98357a_priv {
 	struct gpio_desc sdmode_gpio;
diff --git a/drivers/sound/rockchip_i2s.c b/drivers/sound/rockchip_i2s.c
index 4e9e68aaac8..a20c8e78b88 100644
--- a/drivers/sound/rockchip_i2s.c
+++ b/drivers/sound/rockchip_i2s.c
@@ -14,6 +14,7 @@
 #include <sound.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 struct rk_i2s_regs {
 	u32 txcr;		/* I2S_TXCR, 0x00 */
diff --git a/drivers/sound/rockchip_sound.c b/drivers/sound/rockchip_sound.c
index 94058e603d7..ec93a44aec7 100644
--- a/drivers/sound/rockchip_sound.c
+++ b/drivers/sound/rockchip_sound.c
@@ -16,6 +16,7 @@
 #include <sound.h>
 #include <asm/arch-rockchip/periph.h>
 #include <dm/pinctrl.h>
+#include <linux/errno.h>
 
 static int rockchip_sound_setup(struct udevice *dev)
 {
diff --git a/drivers/sound/rt5677.c b/drivers/sound/rt5677.c
index 16aa9dfc5b2..bfe78ff6b4f 100644
--- a/drivers/sound/rt5677.c
+++ b/drivers/sound/rt5677.c
@@ -9,6 +9,7 @@
 #include <audio_codec.h>
 #include <dm.h>
 #include <i2c.h>
+#include <linux/errno.h>
 #include "rt5677.h"
 #include <log.h>
 
diff --git a/drivers/sound/samsung-i2s.c b/drivers/sound/samsung-i2s.c
index 24e124e8083..51cb9637bab 100644
--- a/drivers/sound/samsung-i2s.c
+++ b/drivers/sound/samsung-i2s.c
@@ -14,6 +14,7 @@
 #include <asm/arch/pinmux.h>
 #include <asm/arch/i2s-regs.h>
 #include <asm/io.h>
+#include <linux/errno.h>
 
 #define FIC_TX2COUNT(x)		(((x) >>  24) & 0xf)
 #define FIC_TX1COUNT(x)		(((x) >>  16) & 0xf)
diff --git a/drivers/sound/samsung_sound.c b/drivers/sound/samsung_sound.c
index 473cedf7e97..16fdb22ea9e 100644
--- a/drivers/sound/samsung_sound.c
+++ b/drivers/sound/samsung_sound.c
@@ -12,6 +12,7 @@
 #include <sound.h>
 #include <asm/gpio.h>
 #include <asm/arch/power.h>
+#include <linux/errno.h>
 
 static int samsung_sound_setup(struct udevice *dev)
 {
diff --git a/drivers/sound/sandbox.c b/drivers/sound/sandbox.c
index 0686add3c8b..1c30f06350f 100644
--- a/drivers/sound/sandbox.c
+++ b/drivers/sound/sandbox.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <sound.h>
 #include <asm/sdl.h>
+#include <linux/errno.h>
 
 struct sandbox_codec_priv {
 	int interface;
diff --git a/drivers/sound/sound-uclass.c b/drivers/sound/sound-uclass.c
index 92f4b0b924b..86722d23c5c 100644
--- a/drivers/sound/sound-uclass.c
+++ b/drivers/sound/sound-uclass.c
@@ -11,6 +11,7 @@
 #include <malloc.h>
 #include <sound.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 #define SOUND_BITS_IN_BYTE 8
 
diff --git a/drivers/sound/tegra_ahub.c b/drivers/sound/tegra_ahub.c
index 2fead1aeffd..cb27be0a7cb 100644
--- a/drivers/sound/tegra_ahub.c
+++ b/drivers/sound/tegra_ahub.c
@@ -16,6 +16,7 @@
 #include <asm/io.h>
 #include <asm/arch-tegra/tegra_ahub.h>
 #include <asm/arch-tegra/tegra_i2s.h>
+#include <linux/errno.h>
 #include "tegra_i2s_priv.h"
 
 struct tegra_ahub_priv {
diff --git a/drivers/sound/tegra_i2s.c b/drivers/sound/tegra_i2s.c
index 5cf82250da2..7749cd47b70 100644
--- a/drivers/sound/tegra_i2s.c
+++ b/drivers/sound/tegra_i2s.c
@@ -14,6 +14,7 @@
 #include <sound.h>
 #include <asm/io.h>
 #include <asm/arch-tegra/tegra_i2s.h>
+#include <linux/errno.h>
 #include "tegra_i2s_priv.h"
 
 int tegra_i2s_set_cif_tx_ctrl(struct udevice *dev, u32 value)
diff --git a/drivers/sound/tegra_sound.c b/drivers/sound/tegra_sound.c
index aef6a2eb147..d76448c7e4d 100644
--- a/drivers/sound/tegra_sound.c
+++ b/drivers/sound/tegra_sound.c
@@ -14,6 +14,7 @@
 #include <misc.h>
 #include <sound.h>
 #include <asm/gpio.h>
+#include <linux/errno.h>
 #include "tegra_i2s_priv.h"
 
 static int tegra_sound_setup(struct udevice *dev)
diff --git a/drivers/sound/wm8994.c b/drivers/sound/wm8994.c
index 367e1445417..c37c787549d 100644
--- a/drivers/sound/wm8994.c
+++ b/drivers/sound/wm8994.c
@@ -17,6 +17,7 @@
 #include <asm/arch/clk.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/sound.h>
+#include <linux/errno.h>
 #include "wm8994.h"
 #include "wm8994_registers.h"
 
diff --git a/drivers/spi/atcspi200_spi.c b/drivers/spi/atcspi200_spi.c
index 79bcd12367b..aed5f64eabb 100644
--- a/drivers/spi/atcspi200_spi.c
+++ b/drivers/spi/atcspi200_spi.c
@@ -15,6 +15,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/spi/atmel-quadspi.c b/drivers/spi/atmel-quadspi.c
index 7dbbe1f43cf..f270eea61e8 100644
--- a/drivers/spi/atmel-quadspi.c
+++ b/drivers/spi/atmel-quadspi.c
@@ -20,6 +20,7 @@
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/iopoll.h>
 #include <linux/ioport.h>
diff --git a/drivers/spi/atmel_spi.c b/drivers/spi/atmel_spi.c
index 33bf382998e..1a95cfb9f65 100644
--- a/drivers/spi/atmel_spi.c
+++ b/drivers/spi/atmel_spi.c
@@ -17,6 +17,7 @@
 #include <asm/gpio.h>
 #endif
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 /*
diff --git a/drivers/spi/bcm63xx_hsspi.c b/drivers/spi/bcm63xx_hsspi.c
index f5914380248..f45214fbda4 100644
--- a/drivers/spi/bcm63xx_hsspi.c
+++ b/drivers/spi/bcm63xx_hsspi.c
@@ -18,6 +18,7 @@
 #include <wait_bit.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #define HSSPI_PP			0
 
diff --git a/drivers/spi/bcm63xx_spi.c b/drivers/spi/bcm63xx_spi.c
index a5550a214e8..ac79961a14e 100644
--- a/drivers/spi/bcm63xx_spi.c
+++ b/drivers/spi/bcm63xx_spi.c
@@ -17,6 +17,7 @@
 #include <stdio.h>
 #include <wait_bit.h>
 #include <asm/io.h>
+#include <linux/errno.h>
 
 /* BCM6348 SPI core */
 #define SPI_6348_CLK			0x06
diff --git a/drivers/spi/bcmstb_spi.c b/drivers/spi/bcmstb_spi.c
index 5879a7883b1..539abcfd953 100644
--- a/drivers/spi/bcmstb_spi.c
+++ b/drivers/spi/bcmstb_spi.c
@@ -19,6 +19,7 @@
 #include <malloc.h>
 #include <spi.h>
 #include <time.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/spi/cf_spi.c b/drivers/spi/cf_spi.c
index a6a5c7f17c9..0a211b37707 100644
--- a/drivers/spi/cf_spi.c
+++ b/drivers/spi/cf_spi.c
@@ -23,6 +23,7 @@
 #include <malloc.h>
 #include <asm/coldfire/dspi.h>
 #include <asm/io.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 struct coldfire_spi_priv {
diff --git a/drivers/spi/davinci_spi.c b/drivers/spi/davinci_spi.c
index 3d1c0b58070..7058ba9acf5 100644
--- a/drivers/spi/davinci_spi.c
+++ b/drivers/spi/davinci_spi.c
@@ -20,6 +20,7 @@
 #include <dm/platform_data/spi_davinci.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 /* SPIGCR0 */
 #define SPIGCR0_SPIENA_MASK	0x1
diff --git a/drivers/spi/designware_spi.c b/drivers/spi/designware_spi.c
index 3838504455a..f6c63435147 100644
--- a/drivers/spi/designware_spi.c
+++ b/drivers/spi/designware_spi.c
@@ -23,6 +23,7 @@
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/compat.h>
+#include <linux/errno.h>
 #include <linux/iopoll.h>
 #include <asm/io.h>
 
diff --git a/drivers/spi/exynos_spi.c b/drivers/spi/exynos_spi.c
index 03c03ab4874..cec59208395 100644
--- a/drivers/spi/exynos_spi.c
+++ b/drivers/spi/exynos_spi.c
@@ -21,6 +21,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/spi/fsl_dspi.c b/drivers/spi/fsl_dspi.c
index eae6b379a9c..190b60b3c4f 100644
--- a/drivers/spi/fsl_dspi.c
+++ b/drivers/spi/fsl_dspi.c
@@ -10,6 +10,7 @@
  */
 
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/math64.h>
 #include <common.h>
 #include <dm.h>
diff --git a/drivers/spi/fsl_espi.c b/drivers/spi/fsl_espi.c
index cf79947cb44..fb82228c92b 100644
--- a/drivers/spi/fsl_espi.c
+++ b/drivers/spi/fsl_espi.c
@@ -14,6 +14,7 @@
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include <malloc.h>
diff --git a/drivers/spi/fsl_qspi.c b/drivers/spi/fsl_qspi.c
index 2923fb5fb3d..195808c4066 100644
--- a/drivers/spi/fsl_qspi.c
+++ b/drivers/spi/fsl_qspi.c
@@ -29,6 +29,7 @@
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <linux/sizes.h>
 #include <linux/iopoll.h>
diff --git a/drivers/spi/ich.c b/drivers/spi/ich.c
index 308ace8a580..51d283c5e6f 100644
--- a/drivers/spi/ich.c
+++ b/drivers/spi/ich.c
@@ -29,6 +29,7 @@
 #include <asm/mtrr.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/sizes.h>
 #include <linux/string.h>
 
diff --git a/drivers/spi/meson_spifc.c b/drivers/spi/meson_spifc.c
index 5bc99370a10..08b3859678f 100644
--- a/drivers/spi/meson_spifc.c
+++ b/drivers/spi/meson_spifc.c
@@ -17,6 +17,7 @@
 #include <asm/io.h>
 #include <linux/bitfield.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 /* register map */
diff --git a/drivers/spi/mpc8xx_spi.c b/drivers/spi/mpc8xx_spi.c
index 2b08756497a..df1489a1e02 100644
--- a/drivers/spi/mpc8xx_spi.c
+++ b/drivers/spi/mpc8xx_spi.c
@@ -22,6 +22,7 @@
 #include <spi.h>
 #include <stdio.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 #include <asm/cpm_8xx.h>
 #include <asm/io.h>
diff --git a/drivers/spi/mpc8xxx_spi.c b/drivers/spi/mpc8xxx_spi.c
index b7fd47984de..eedb29216cb 100644
--- a/drivers/spi/mpc8xxx_spi.c
+++ b/drivers/spi/mpc8xxx_spi.c
@@ -18,6 +18,7 @@
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 enum {
 	SPI_EV_NE = BIT(31 - 22),	/* Receiver Not Empty */
diff --git a/drivers/spi/mt7621_spi.c b/drivers/spi/mt7621_spi.c
index 786afaaa9cd..581a9bd44c4 100644
--- a/drivers/spi/mt7621_spi.c
+++ b/drivers/spi/mt7621_spi.c
@@ -16,6 +16,7 @@
 #include <stdio.h>
 #include <wait_bit.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/printk.h>
 
diff --git a/drivers/spi/mtk_snfi_spi.c b/drivers/spi/mtk_snfi_spi.c
index bd9b79929a9..07a178a8785 100644
--- a/drivers/spi/mtk_snfi_spi.c
+++ b/drivers/spi/mtk_snfi_spi.c
@@ -16,6 +16,7 @@
 #include <watchdog.h>
 #include <dm/pinctrl.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/iopoll.h>
 #include <linux/string.h>
diff --git a/drivers/spi/nxp_fspi.c b/drivers/spi/nxp_fspi.c
index b4f928741f3..fc75913022b 100644
--- a/drivers/spi/nxp_fspi.c
+++ b/drivers/spi/nxp_fspi.c
@@ -41,6 +41,7 @@
 #include <dm.h>
 #include <clk.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <linux/iopoll.h>
diff --git a/drivers/spi/pic32_spi.c b/drivers/spi/pic32_spi.c
index 4eb039f3579..222c30a1ebd 100644
--- a/drivers/spi/pic32_spi.c
+++ b/drivers/spi/pic32_spi.c
@@ -17,6 +17,7 @@
 #include <linux/compat.h>
 #include <malloc.h>
 #include <spi.h>
+#include <linux/errno.h>
 
 #include <asm/types.h>
 #include <asm/io.h>
diff --git a/drivers/spi/pl022_spi.c b/drivers/spi/pl022_spi.c
index 7cf19a1a661..236de5b54a3 100644
--- a/drivers/spi/pl022_spi.c
+++ b/drivers/spi/pl022_spi.c
@@ -14,6 +14,7 @@
 #include <dm.h>
 #include <asm/global_data.h>
 #include <dm/platform_data/spi_pl022.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <spi.h>
 #include <linux/printk.h>
diff --git a/drivers/spi/soft_spi.c b/drivers/spi/soft_spi.c
index 87e1e2417ce..9818ecb4c18 100644
--- a/drivers/spi/soft_spi.c
+++ b/drivers/spi/soft_spi.c
@@ -20,6 +20,7 @@
 #include <asm/gpio.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/spi/spi-mem-nodm.c b/drivers/spi/spi-mem-nodm.c
index 841eefc12ce..42a6126dd7b 100644
--- a/drivers/spi/spi-mem-nodm.c
+++ b/drivers/spi/spi-mem-nodm.c
@@ -7,6 +7,7 @@
 #include <malloc.h>
 #include <spi.h>
 #include <spi-mem.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 int spi_mem_exec_op(struct spi_slave *slave,
diff --git a/drivers/spi/spi-mem.c b/drivers/spi/spi-mem.c
index 13027613dda..5580b34f34f 100644
--- a/drivers/spi/spi-mem.c
+++ b/drivers/spi/spi-mem.c
@@ -16,6 +16,7 @@
 #include <dm/device_compat.h>
 #include <spi.h>
 #include <spi-mem.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #endif
 
diff --git a/drivers/spi/spi-sifive.c b/drivers/spi/spi-sifive.c
index 026ef439ef9..bfc02ec1dc3 100644
--- a/drivers/spi/spi-sifive.c
+++ b/drivers/spi/spi-sifive.c
@@ -15,6 +15,7 @@
 #include <wait_bit.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/log2.h>
 #include <clk.h>
 #include <linux/string.h>
diff --git a/drivers/spi/spi-sunxi.c b/drivers/spi/spi-sunxi.c
index 3b1e9fc2284..c19a24a1c64 100644
--- a/drivers/spi/spi-sunxi.c
+++ b/drivers/spi/spi-sunxi.c
@@ -31,6 +31,7 @@
 #include <asm/global_data.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #include <asm/bitops.h>
 #include <asm/gpio.h>
diff --git a/drivers/spi/spi-uclass.c b/drivers/spi/spi-uclass.c
index 56869c125af..c59ae3ff9b3 100644
--- a/drivers/spi/spi-uclass.c
+++ b/drivers/spi/spi-uclass.c
@@ -15,6 +15,7 @@
 #include <dm/uclass-internal.h>
 #include <dm/lists.h>
 #include <dm/util.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/spi/stm32_qspi.c b/drivers/spi/stm32_qspi.c
index 9f6ea01f99f..34bfd99bead 100644
--- a/drivers/spi/stm32_qspi.c
+++ b/drivers/spi/stm32_qspi.c
@@ -15,6 +15,7 @@
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/iopoll.h>
 #include <linux/ioport.h>
 #include <linux/printk.h>
diff --git a/drivers/spi/stm32_spi.c b/drivers/spi/stm32_spi.c
index 09711b0aabc..d37404f0c8c 100644
--- a/drivers/spi/stm32_spi.c
+++ b/drivers/spi/stm32_spi.c
@@ -15,6 +15,7 @@
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 #include <asm/io.h>
diff --git a/drivers/spi/tegra20_sflash.c b/drivers/spi/tegra20_sflash.c
index 7b81e785215..7be4efd35c6 100644
--- a/drivers/spi/tegra20_sflash.c
+++ b/drivers/spi/tegra20_sflash.c
@@ -21,6 +21,7 @@
 #include <fdtdec.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include "tegra_spi.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/spi/ti_qspi.c b/drivers/spi/ti_qspi.c
index ba97f3ece77..9fecdb20f73 100644
--- a/drivers/spi/ti_qspi.c
+++ b/drivers/spi/ti_qspi.c
@@ -23,6 +23,7 @@
 #include <asm/ti-common/ti-edma3.h>
 #include <linux/bitops.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/kernel.h>
 #include <regmap.h>
 #include <syscon.h>
diff --git a/drivers/spi/uniphier_spi.c b/drivers/spi/uniphier_spi.c
index 21fa7a77efb..742554a09ab 100644
--- a/drivers/spi/uniphier_spi.c
+++ b/drivers/spi/uniphier_spi.c
@@ -14,6 +14,7 @@
 #include <linux/bitfield.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <spi.h>
 #include <wait_bit.h>
diff --git a/drivers/spi/zynq_qspi.c b/drivers/spi/zynq_qspi.c
index a1022ad496e..a95558139d8 100644
--- a/drivers/spi/zynq_qspi.c
+++ b/drivers/spi/zynq_qspi.c
@@ -16,6 +16,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/spi/zynqmp_gqspi.c b/drivers/spi/zynqmp_gqspi.c
index 01186f3c039..1386dc86ed6 100644
--- a/drivers/spi/zynqmp_gqspi.c
+++ b/drivers/spi/zynqmp_gqspi.c
@@ -23,6 +23,7 @@
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #define GQSPI_GFIFO_STRT_MODE_MASK	BIT(29)
diff --git a/drivers/spmi/spmi-msm.c b/drivers/spmi/spmi-msm.c
index 1f9b3c31008..d06fc34c697 100644
--- a/drivers/spmi/spmi-msm.c
+++ b/drivers/spmi/spmi-msm.c
@@ -15,6 +15,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm/device_compat.h>
+#include <linux/errno.h>
 #include <spmi/spmi.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/spmi/spmi-sandbox.c b/drivers/spmi/spmi-sandbox.c
index 0da419c5052..f1e0d691503 100644
--- a/drivers/spmi/spmi-sandbox.c
+++ b/drivers/spmi/spmi-sandbox.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
+#include <linux/errno.h>
 #include <spmi/spmi.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
diff --git a/drivers/spmi/spmi-uclass.c b/drivers/spmi/spmi-uclass.c
index ff098731bb2..fc8252fbc91 100644
--- a/drivers/spmi/spmi-uclass.c
+++ b/drivers/spmi/spmi-uclass.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
+#include <linux/errno.h>
 #include <spmi/spmi.h>
 #include <linux/ctype.h>
 
diff --git a/drivers/sysreset/sysreset-ti-sci.c b/drivers/sysreset/sysreset-ti-sci.c
index 3877b9bc125..09ebd161fcb 100644
--- a/drivers/sysreset/sysreset-ti-sci.c
+++ b/drivers/sysreset/sysreset-ti-sci.c
@@ -13,6 +13,7 @@
 #include <sysreset.h>
 #include <dm/device_compat.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/soc/ti/ti_sci_protocol.h>
 
 /**
diff --git a/drivers/sysreset/sysreset-uclass.c b/drivers/sysreset/sysreset-uclass.c
index 717e2fc9453..015b938b1b7 100644
--- a/drivers/sysreset/sysreset-uclass.c
+++ b/drivers/sysreset/sysreset-uclass.c
@@ -22,6 +22,7 @@
 #include <dm/root.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 
 int sysreset_request(struct udevice *dev, enum sysreset_t type)
 {
diff --git a/drivers/sysreset/sysreset_ast.c b/drivers/sysreset/sysreset_ast.c
index ee941c77706..f93eea629df 100644
--- a/drivers/sysreset/sysreset_ast.c
+++ b/drivers/sysreset/sysreset_ast.c
@@ -12,6 +12,7 @@
 #include <asm/io.h>
 #include <asm/arch/wdt.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 
 static int ast_sysreset_request(struct udevice *dev, enum sysreset_t type)
 {
diff --git a/drivers/sysreset/sysreset_microblaze.c b/drivers/sysreset/sysreset_microblaze.c
index b45e894440d..1bb24914e77 100644
--- a/drivers/sysreset/sysreset_microblaze.c
+++ b/drivers/sysreset/sysreset_microblaze.c
@@ -9,6 +9,7 @@
 #include <stdio.h>
 #include <sysreset.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 
 static int microblaze_sysreset_request(struct udevice *dev,
 				       enum sysreset_t type)
diff --git a/drivers/sysreset/sysreset_mpc83xx.c b/drivers/sysreset/sysreset_mpc83xx.c
index 39274d0b69f..f2b2fc89c61 100644
--- a/drivers/sysreset/sysreset_mpc83xx.c
+++ b/drivers/sysreset/sysreset_mpc83xx.c
@@ -14,6 +14,7 @@
 #include <wait_bit.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 #include "sysreset_mpc83xx.h"
 
diff --git a/drivers/sysreset/sysreset_octeon.c b/drivers/sysreset/sysreset_octeon.c
index a05dac3226e..963ec20dc0b 100644
--- a/drivers/sysreset/sysreset_octeon.c
+++ b/drivers/sysreset/sysreset_octeon.c
@@ -8,6 +8,7 @@
 #include <errno.h>
 #include <sysreset.h>
 #include <asm/io.h>
+#include <linux/errno.h>
 
 #define RST_SOFT_RST		0x0080
 
diff --git a/drivers/sysreset/sysreset_rockchip.c b/drivers/sysreset/sysreset_rockchip.c
index 0fc6b683f2b..a5e0f47c7d8 100644
--- a/drivers/sysreset/sysreset_rockchip.c
+++ b/drivers/sysreset/sysreset_rockchip.c
@@ -12,6 +12,7 @@
 #include <asm/arch-rockchip/cru_rk3328.h>
 #include <asm/arch-rockchip/hardware.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 
 int rockchip_sysreset_request(struct udevice *dev, enum sysreset_t type)
 {
diff --git a/drivers/sysreset/sysreset_sandbox.c b/drivers/sysreset/sysreset_sandbox.c
index 5d14a01ca74..ed37420f60e 100644
--- a/drivers/sysreset/sysreset_sandbox.c
+++ b/drivers/sysreset/sysreset_sandbox.c
@@ -11,6 +11,7 @@
 #include <asm/state.h>
 #include <asm/test.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 static int sandbox_warm_sysreset_request(struct udevice *dev,
diff --git a/drivers/sysreset/sysreset_socfpga.c b/drivers/sysreset/sysreset_socfpga.c
index 178bcb227ff..c348649cedf 100644
--- a/drivers/sysreset/sysreset_socfpga.c
+++ b/drivers/sysreset/sysreset_socfpga.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <asm/arch/reset_manager.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 struct socfpga_sysreset_data {
 	void __iomem *rstmgr_base;
diff --git a/drivers/sysreset/sysreset_socfpga_s10.c b/drivers/sysreset/sysreset_socfpga_s10.c
index b109320eedd..7c6e5391b50 100644
--- a/drivers/sysreset/sysreset_socfpga_s10.c
+++ b/drivers/sysreset/sysreset_socfpga_s10.c
@@ -10,6 +10,7 @@
 #include <stdio.h>
 #include <sysreset.h>
 #include <asm/arch/mailbox_s10.h>
+#include <linux/errno.h>
 
 static int socfpga_sysreset_request(struct udevice *dev,
 				    enum sysreset_t type)
diff --git a/drivers/sysreset/sysreset_sti.c b/drivers/sysreset/sysreset_sti.c
index c1b22873ff4..26431ee129b 100644
--- a/drivers/sysreset/sysreset_sti.c
+++ b/drivers/sysreset/sysreset_sti.c
@@ -12,6 +12,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/sysreset/sysreset_syscon.c b/drivers/sysreset/sysreset_syscon.c
index 0dfa91fc90e..e6e98b383ee 100644
--- a/drivers/sysreset/sysreset_syscon.c
+++ b/drivers/sysreset/sysreset_syscon.c
@@ -14,6 +14,7 @@
 #include <sysreset.h>
 #include <syscon.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 struct syscon_reboot_priv {
diff --git a/drivers/sysreset/sysreset_watchdog.c b/drivers/sysreset/sysreset_watchdog.c
index 3493c5e8e45..4fd234a62ec 100644
--- a/drivers/sysreset/sysreset_watchdog.c
+++ b/drivers/sysreset/sysreset_watchdog.c
@@ -8,6 +8,7 @@
 #include <errno.h>
 #include <sysreset.h>
 #include <wdt.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 struct wdt_reboot_priv {
diff --git a/drivers/sysreset/sysreset_x86.c b/drivers/sysreset/sysreset_x86.c
index bc911435602..0ab2b543abd 100644
--- a/drivers/sysreset/sysreset_x86.c
+++ b/drivers/sysreset/sysreset_x86.c
@@ -13,6 +13,7 @@
 #include <acpi/acpi_s3.h>
 #include <asm/io.h>
 #include <asm/processor.h>
+#include <linux/errno.h>
 
 struct x86_sysreset_platdata {
 	struct udevice *pch;
diff --git a/drivers/sysreset/sysreset_xtfpga.c b/drivers/sysreset/sysreset_xtfpga.c
index ad1781e6c0f..ce30114a17a 100644
--- a/drivers/sysreset/sysreset_xtfpga.c
+++ b/drivers/sysreset/sysreset_xtfpga.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <sysreset.h>
 #include <asm/io.h>
+#include <linux/errno.h>
 
 static int xtfpga_reset_request(struct udevice *dev, enum sysreset_t type)
 {
diff --git a/drivers/tee/broadcom/chimp_optee.c b/drivers/tee/broadcom/chimp_optee.c
index 91ebc17c036..a92fd9c9562 100644
--- a/drivers/tee/broadcom/chimp_optee.c
+++ b/drivers/tee/broadcom/chimp_optee.c
@@ -7,6 +7,7 @@
 #include <string.h>
 #include <tee.h>
 #include <broadcom/chimp.h>
+#include <linux/errno.h>
 
 #ifdef CONFIG_CHIMP_OPTEE
 
diff --git a/drivers/tee/optee/core.c b/drivers/tee/optee/core.c
index 0fc7a0ec7f1..c1460999cbe 100644
--- a/drivers/tee/optee/core.c
+++ b/drivers/tee/optee/core.c
@@ -10,6 +10,7 @@
 #include <tee.h>
 #include <linux/arm-smccc.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/string.h>
 
diff --git a/drivers/tee/optee/supplicant.c b/drivers/tee/optee/supplicant.c
index ae042b9a204..fe99a328adb 100644
--- a/drivers/tee/optee/supplicant.c
+++ b/drivers/tee/optee/supplicant.c
@@ -7,6 +7,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <tee.h>
+#include <linux/errno.h>
 #include <linux/types.h>
 
 #include "optee_msg.h"
diff --git a/drivers/tee/sandbox.c b/drivers/tee/sandbox.c
index 00e6f91df98..14df3ce0130 100644
--- a/drivers/tee/sandbox.c
+++ b/drivers/tee/sandbox.c
@@ -7,6 +7,7 @@
 #include <sandboxtee.h>
 #include <stdio.h>
 #include <tee.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <tee/optee_ta_avb.h>
 
diff --git a/drivers/tee/tee-uclass.c b/drivers/tee/tee-uclass.c
index 76de11c3fb8..f42cc1becb8 100644
--- a/drivers/tee/tee-uclass.c
+++ b/drivers/tee/tee-uclass.c
@@ -10,6 +10,7 @@
 #include <tee.h>
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 /**
diff --git a/drivers/thermal/imx_scu_thermal.c b/drivers/thermal/imx_scu_thermal.c
index 9b2f74636a5..17c92ae0635 100644
--- a/drivers/thermal/imx_scu_thermal.c
+++ b/drivers/thermal/imx_scu_thermal.c
@@ -15,6 +15,7 @@
 #include <dm/device.h>
 #include <asm/arch/sci/sci.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <linux/string.h>
 
diff --git a/drivers/thermal/imx_thermal.c b/drivers/thermal/imx_thermal.c
index 82e8f8e6512..812c2ec07c3 100644
--- a/drivers/thermal/imx_thermal.c
+++ b/drivers/thermal/imx_thermal.c
@@ -18,6 +18,7 @@
 #include <errno.h>
 #include <malloc.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/math64.h>
 #include <thermal.h>
 #include <imx_thermal.h>
diff --git a/drivers/thermal/imx_tmu.c b/drivers/thermal/imx_tmu.c
index 6ec16a35f27..279ea5a322e 100644
--- a/drivers/thermal/imx_tmu.c
+++ b/drivers/thermal/imx_tmu.c
@@ -18,6 +18,7 @@
 #include <fuse.h>
 #include <malloc.h>
 #include <thermal.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/thermal/thermal-uclass.c b/drivers/thermal/thermal-uclass.c
index a4ea1e29145..92dc311168b 100644
--- a/drivers/thermal/thermal-uclass.c
+++ b/drivers/thermal/thermal-uclass.c
@@ -10,6 +10,7 @@
 #include <fdtdec.h>
 #include <malloc.h>
 #include <asm/io.h>
+#include <linux/errno.h>
 #include <linux/list.h>
 
 
diff --git a/drivers/timer/arc_timer.c b/drivers/timer/arc_timer.c
index c6771d15966..592b196cbbc 100644
--- a/drivers/timer/arc_timer.c
+++ b/drivers/timer/arc_timer.c
@@ -10,6 +10,7 @@
 #include <asm/arcregs.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/timer/atmel_pit_timer.c b/drivers/timer/atmel_pit_timer.c
index 70511697fef..07459d9c26b 100644
--- a/drivers/timer/atmel_pit_timer.c
+++ b/drivers/timer/atmel_pit_timer.c
@@ -10,6 +10,7 @@
 #include <timer.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #define AT91_PIT_VALUE		0xfffff
 #define AT91_PIT_PITEN		BIT(24)		/* Timer Enabled */
diff --git a/drivers/timer/mpc83xx_timer.c b/drivers/timer/mpc83xx_timer.c
index becaadee7d6..700b4097373 100644
--- a/drivers/timer/mpc83xx_timer.c
+++ b/drivers/timer/mpc83xx_timer.c
@@ -18,6 +18,7 @@
 #include <asm/ptrace.h>
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/timer/mtk_timer.c b/drivers/timer/mtk_timer.c
index 69ed521811d..7aec7a7d59e 100644
--- a/drivers/timer/mtk_timer.c
+++ b/drivers/timer/mtk_timer.c
@@ -12,6 +12,7 @@
 #include <timer.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #define MTK_GPT4_CTRL	0x40
 #define MTK_GPT4_CLK	0x44
diff --git a/drivers/timer/nomadik-mtu-timer.c b/drivers/timer/nomadik-mtu-timer.c
index 7ff921385a3..5d5eadc47d7 100644
--- a/drivers/timer/nomadik-mtu-timer.c
+++ b/drivers/timer/nomadik-mtu-timer.c
@@ -17,6 +17,7 @@
 #include <timer.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #define MTU_NUM_TIMERS		4
 
diff --git a/drivers/timer/rockchip_timer.c b/drivers/timer/rockchip_timer.c
index 7e7612f154e..20dddd53e4f 100644
--- a/drivers/timer/rockchip_timer.c
+++ b/drivers/timer/rockchip_timer.c
@@ -15,6 +15,7 @@
 #include <dt-structs.h>
 #include <timer.h>
 #include <asm/io.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/timer/sti-timer.c b/drivers/timer/sti-timer.c
index ff42056abdd..2278b049354 100644
--- a/drivers/timer/sti-timer.c
+++ b/drivers/timer/sti-timer.c
@@ -9,6 +9,7 @@
 #include <clk.h>
 #include <timer.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 
 #include <asm/io.h>
 #include <asm/arch-armv7/globaltimer.h>
diff --git a/drivers/timer/stm32_timer.c b/drivers/timer/stm32_timer.c
index c57fa3f5570..96749c8a64f 100644
--- a/drivers/timer/stm32_timer.c
+++ b/drivers/timer/stm32_timer.c
@@ -11,6 +11,7 @@
 #include <timer.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #include <asm/io.h>
 
diff --git a/drivers/timer/timer-uclass.c b/drivers/timer/timer-uclass.c
index d90755a7e74..01b3a42f3e0 100644
--- a/drivers/timer/timer-uclass.c
+++ b/drivers/timer/timer-uclass.c
@@ -14,6 +14,7 @@
 #include <errno.h>
 #include <timer.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/tpm/cr50_i2c.c b/drivers/tpm/cr50_i2c.c
index 24b1e244860..9ba0466f929 100644
--- a/drivers/tpm/cr50_i2c.c
+++ b/drivers/tpm/cr50_i2c.c
@@ -22,6 +22,7 @@
 #include <asm/arch/iomap.h>
 #include <asm/arch/pm.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 enum {
diff --git a/drivers/tpm/tpm-uclass.c b/drivers/tpm/tpm-uclass.c
index 61331726833..23400235a4c 100644
--- a/drivers/tpm/tpm-uclass.c
+++ b/drivers/tpm/tpm-uclass.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <time.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/unaligned/be_byteshift.h>
 #include <tpm-v1.h>
diff --git a/drivers/tpm/tpm2_ftpm_tee.c b/drivers/tpm/tpm2_ftpm_tee.c
index 885b3e2c148..249cf11beff 100644
--- a/drivers/tpm/tpm2_ftpm_tee.c
+++ b/drivers/tpm/tpm2_ftpm_tee.c
@@ -19,6 +19,7 @@
 #include <tpm-v2.h>
 #include <tee.h>
 #include <vsprintf.h>
+#include <linux/errno.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 437f65cc395..6b61dbb88b5 100644
--- a/drivers/tpm/tpm2_tis_sandbox.c
+++ b/drivers/tpm/tpm2_tis_sandbox.c
@@ -12,6 +12,7 @@
 #include <asm/state.h>
 #include <asm/unaligned.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
 
diff --git a/drivers/tpm/tpm_tis_lpc.c b/drivers/tpm/tpm_tis_lpc.c
index 63b86b131bc..e6eec6bca9e 100644
--- a/drivers/tpm/tpm_tis_lpc.c
+++ b/drivers/tpm/tpm_tis_lpc.c
@@ -21,6 +21,7 @@
 #include <vsprintf.h>
 #include <asm/io.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #define PREFIX "lpc_tpm: "
diff --git a/drivers/tpm/tpm_tis_sandbox.c b/drivers/tpm/tpm_tis_sandbox.c
index 4b1cf36d9b9..da31ec3ff56 100644
--- a/drivers/tpm/tpm_tis_sandbox.c
+++ b/drivers/tpm/tpm_tis_sandbox.c
@@ -11,6 +11,7 @@
 #include <vsprintf.h>
 #include <asm/state.h>
 #include <asm/unaligned.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
 
diff --git a/drivers/tpm/tpm_tis_st33zp24_i2c.c b/drivers/tpm/tpm_tis_st33zp24_i2c.c
index bd9c08e06cb..b5c706b7ccf 100644
--- a/drivers/tpm/tpm_tis_st33zp24_i2c.c
+++ b/drivers/tpm/tpm_tis_st33zp24_i2c.c
@@ -22,6 +22,7 @@
 #include <errno.h>
 #include <vsprintf.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/types.h>
 #include <asm/unaligned.h>
diff --git a/drivers/tpm/tpm_tis_st33zp24_spi.c b/drivers/tpm/tpm_tis_st33zp24_spi.c
index 2b6b3714087..33f7392431f 100644
--- a/drivers/tpm/tpm_tis_st33zp24_spi.c
+++ b/drivers/tpm/tpm_tis_st33zp24_spi.c
@@ -22,6 +22,7 @@
 #include <errno.h>
 #include <vsprintf.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/types.h>
 #include <asm/unaligned.h>
diff --git a/drivers/ufs/ufs.c b/drivers/ufs/ufs.c
index ee2f9dbf588..9f4b4555269 100644
--- a/drivers/ufs/ufs.c
+++ b/drivers/ufs/ufs.c
@@ -23,6 +23,7 @@
 #include <scsi.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include <linux/dma-mapping.h>
diff --git a/drivers/usb/cdns3/cdns3-ti.c b/drivers/usb/cdns3/cdns3-ti.c
index cd7b2113ace..5130b4c70d2 100644
--- a/drivers/usb/cdns3/cdns3-ti.c
+++ b/drivers/usb/cdns3/cdns3-ti.c
@@ -11,6 +11,7 @@
 #include <dm.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/usb/otg.h>
 #include <malloc.h>
diff --git a/drivers/usb/cdns3/core.c b/drivers/usb/cdns3/core.c
index d5fb8a0edb3..135ca1b2af9 100644
--- a/drivers/usb/cdns3/core.c
+++ b/drivers/usb/cdns3/core.c
@@ -20,6 +20,7 @@
 #include <dm/devres.h>
 #include <dm/lists.h>
 #include <linux/bug.h>
+#include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/io.h>
 #include <usb.h>
diff --git a/drivers/usb/cdns3/drd.c b/drivers/usb/cdns3/drd.c
index 47874fec29e..e84fb57b2e0 100644
--- a/drivers/usb/cdns3/drd.c
+++ b/drivers/usb/cdns3/drd.c
@@ -13,6 +13,7 @@
 #include <dm.h>
 #include <dm/device_compat.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/iopoll.h>
 #include <linux/kernel.h>
 #include <linux/usb/otg.h>
diff --git a/drivers/usb/cdns3/ep0.c b/drivers/usb/cdns3/ep0.c
index 4fbd450fed3..7be5c8de4e2 100644
--- a/drivers/usb/cdns3/ep0.c
+++ b/drivers/usb/cdns3/ep0.c
@@ -16,6 +16,7 @@
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/usb/composite.h>
 #include <linux/iopoll.h>
 
diff --git a/drivers/usb/cdns3/gadget-export.h b/drivers/usb/cdns3/gadget-export.h
index 577469eee96..99066a2adb5 100644
--- a/drivers/usb/cdns3/gadget-export.h
+++ b/drivers/usb/cdns3/gadget-export.h
@@ -25,4 +25,5 @@ static inline void cdns3_gadget_exit(struct cdns3 *cdns) { }
 
 #endif
 
+#include <linux/errno.h>
 #endif /* __LINUX_CDNS3_GADGET_EXPORT */
diff --git a/drivers/usb/cdns3/gadget.c b/drivers/usb/cdns3/gadget.c
index 535935ac723..e42b82d0c2b 100644
--- a/drivers/usb/cdns3/gadget.c
+++ b/drivers/usb/cdns3/gadget.c
@@ -63,6 +63,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include <linux/usb/gadget.h>
diff --git a/drivers/usb/cdns3/host-export.h b/drivers/usb/cdns3/host-export.h
index b498a170b7e..299fe5749c9 100644
--- a/drivers/usb/cdns3/host-export.h
+++ b/drivers/usb/cdns3/host-export.h
@@ -25,4 +25,5 @@ static inline void cdns3_host_exit(struct cdns3 *cdns) { }
 
 #endif /* CONFIG_USB_CDNS3_HOST */
 
+#include <linux/errno.h>
 #endif /* __LINUX_CDNS3_HOST_EXPORT */
diff --git a/drivers/usb/cdns3/host.c b/drivers/usb/cdns3/host.c
index b44e7df1131..702fc86e92e 100644
--- a/drivers/usb/cdns3/host.c
+++ b/drivers/usb/cdns3/host.c
@@ -12,6 +12,7 @@
 #include <dm/devres.h>
 #include <linux/compat.h>
 #include <usb.h>
+#include <linux/errno.h>
 #include <usb/xhci.h>
 
 #include "core.h"
diff --git a/drivers/usb/common/fsl-dt-fixup.c b/drivers/usb/common/fsl-dt-fixup.c
index 5382447eb72..a279c28bdad 100644
--- a/drivers/usb/common/fsl-dt-fixup.c
+++ b/drivers/usb/common/fsl-dt-fixup.c
@@ -18,6 +18,7 @@
 #include <fsl_usb.h>
 #include <fdt_support.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #ifndef CONFIG_USB_MAX_CONTROLLER_COUNT
diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
index 86825565895..f79f9c93166 100644
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -23,6 +23,7 @@
 #include <linux/delay.h>
 #include <linux/dma-mapping.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/ioport.h>
 #include <dm.h>
 #include <generic-phy.h>
diff --git a/drivers/usb/dwc3/dwc3-generic.c b/drivers/usb/dwc3/dwc3-generic.c
index c78ac00521d..54a9ffb9d68 100644
--- a/drivers/usb/dwc3/dwc3-generic.c
+++ b/drivers/usb/dwc3/dwc3-generic.c
@@ -17,6 +17,7 @@
 #include <dwc3-uboot.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
diff --git a/drivers/usb/dwc3/dwc3-meson-g12a.c b/drivers/usb/dwc3/dwc3-meson-g12a.c
index 6fdf686af8d..999cb11d594 100644
--- a/drivers/usb/dwc3/dwc3-meson-g12a.c
+++ b/drivers/usb/dwc3/dwc3-meson-g12a.c
@@ -15,6 +15,7 @@
 #include <dwc3-uboot.h>
 #include <generic-phy.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
diff --git a/drivers/usb/dwc3/dwc3-omap.c b/drivers/usb/dwc3/dwc3-omap.c
index 9596bf144c3..2d722376efb 100644
--- a/drivers/usb/dwc3/dwc3-omap.c
+++ b/drivers/usb/dwc3/dwc3-omap.c
@@ -20,6 +20,7 @@
 #include <dwc3-omap-uboot.h>
 #include <dm/device_compat.h>
 #include <dm/devres.h>
+#include <linux/errno.h>
 #include <linux/usb/dwc3-omap.h>
 #include <linux/ioport.h>
 
diff --git a/drivers/usb/dwc3/ep0.c b/drivers/usb/dwc3/ep0.c
index f9420873bba..80de10ec125 100644
--- a/drivers/usb/dwc3/ep0.c
+++ b/drivers/usb/dwc3/ep0.c
@@ -16,6 +16,7 @@
 #include <cpu_func.h>
 #include <dm/device_compat.h>
 #include <linux/bug.h>
+#include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/list.h>
 #include <linux/string.h>
diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
index c33e0894e10..fa338119de6 100644
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@ -23,6 +23,7 @@
 #include <linux/bug.h>
 #include <linux/delay.h>
 #include <linux/dma-mapping.h>
+#include <linux/errno.h>
 #include <linux/list.h>
 #include <linux/printk.h>
 #include <linux/string.h>
diff --git a/drivers/usb/dwc3/ti_usb_phy.c b/drivers/usb/dwc3/ti_usb_phy.c
index f8ab06482c9..ea512ea8ffb 100644
--- a/drivers/usb/dwc3/ti_usb_phy.c
+++ b/drivers/usb/dwc3/ti_usb_phy.c
@@ -23,6 +23,7 @@
 #include <dm/devres.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/ioport.h>
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
diff --git a/drivers/usb/emul/sandbox_flash.c b/drivers/usb/emul/sandbox_flash.c
index 883f6ae6d39..e63720f2550 100644
--- a/drivers/usb/emul/sandbox_flash.c
+++ b/drivers/usb/emul/sandbox_flash.c
@@ -10,6 +10,7 @@
 #include <os.h>
 #include <scsi.h>
 #include <usb.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 /*
diff --git a/drivers/usb/emul/sandbox_hub.c b/drivers/usb/emul/sandbox_hub.c
index 21bf3bda48d..b2dc73e65f7 100644
--- a/drivers/usb/emul/sandbox_hub.c
+++ b/drivers/usb/emul/sandbox_hub.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <usb.h>
 #include <dm/device-internal.h>
+#include <linux/errno.h>
 
 /* We only support up to 8 */
 #define SANDBOX_NUM_PORTS	4
diff --git a/drivers/usb/emul/sandbox_keyb.c b/drivers/usb/emul/sandbox_keyb.c
index 9f4b4089562..1c8de6d37fe 100644
--- a/drivers/usb/emul/sandbox_keyb.c
+++ b/drivers/usb/emul/sandbox_keyb.c
@@ -10,6 +10,7 @@
 #include <os.h>
 #include <scsi.h>
 #include <usb.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 /*
diff --git a/drivers/usb/emul/usb-emul-uclass.c b/drivers/usb/emul/usb-emul-uclass.c
index 9807cbed165..6b309592f6b 100644
--- a/drivers/usb/emul/usb-emul-uclass.c
+++ b/drivers/usb/emul/usb-emul-uclass.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <usb.h>
 #include <dm/device-internal.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 static int copy_to_unicode(char *buff, int length, const char *str)
diff --git a/drivers/usb/eth/asix.c b/drivers/usb/eth/asix.c
index fe98a581d0d..de25ba12f61 100644
--- a/drivers/usb/eth/asix.c
+++ b/drivers/usb/eth/asix.c
@@ -16,6 +16,7 @@
 #include <vsprintf.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/mii.h>
 #include <linux/string.h>
 #include "usb_ether.h"
diff --git a/drivers/usb/eth/asix88179.c b/drivers/usb/eth/asix88179.c
index 8191b85eb4d..c1c873c2c2b 100644
--- a/drivers/usb/eth/asix88179.c
+++ b/drivers/usb/eth/asix88179.c
@@ -14,6 +14,7 @@
 #include <vsprintf.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/mii.h>
 #include <linux/string.h>
 #include "usb_ether.h"
diff --git a/drivers/usb/eth/lan78xx.c b/drivers/usb/eth/lan78xx.c
index 9a7a0d834a1..194753fb278 100644
--- a/drivers/usb/eth/lan78xx.c
+++ b/drivers/usb/eth/lan78xx.c
@@ -8,6 +8,7 @@
 #include <net.h>
 #include <usb.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include "usb_ether.h"
 #include "lan7x.h"
diff --git a/drivers/usb/eth/lan7x.c b/drivers/usb/eth/lan7x.c
index b3bca81059c..c3c1ebb1cb6 100644
--- a/drivers/usb/eth/lan7x.c
+++ b/drivers/usb/eth/lan7x.c
@@ -12,6 +12,7 @@
 #include <stdio.h>
 #include <usb.h>
 #include <vsprintf.h>
+#include <linux/errno.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 bbc03c7ea58..02a241414ff 100644
--- a/drivers/usb/eth/mcs7830.c
+++ b/drivers/usb/eth/mcs7830.c
@@ -17,6 +17,7 @@
 #include <vsprintf.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/mii.h>
 #include <malloc.h>
 #include <memalign.h>
diff --git a/drivers/usb/eth/r8152.c b/drivers/usb/eth/r8152.c
index 1f60fc499b9..da0b285077a 100644
--- a/drivers/usb/eth/r8152.c
+++ b/drivers/usb/eth/r8152.c
@@ -16,6 +16,7 @@
 #include <vsprintf.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/mii.h>
 #include <linux/bitops.h>
 #include <linux/string.h>
diff --git a/drivers/usb/eth/r8152_fw.c b/drivers/usb/eth/r8152_fw.c
index f953b0384b8..7e9b13de044 100644
--- a/drivers/usb/eth/r8152_fw.c
+++ b/drivers/usb/eth/r8152_fw.c
@@ -8,6 +8,7 @@
 #include <errno.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include "usb_ether.h"
 #include "r8152.h"
 
diff --git a/drivers/usb/eth/smsc95xx.c b/drivers/usb/eth/smsc95xx.c
index d9085007441..435224c7197 100644
--- a/drivers/usb/eth/smsc95xx.c
+++ b/drivers/usb/eth/smsc95xx.c
@@ -20,6 +20,7 @@
 #include <asm/u-boot.h>
 #include <asm/unaligned.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/mii.h>
 #include <linux/string.h>
 #include "usb_ether.h"
diff --git a/drivers/usb/eth/usb_ether.c b/drivers/usb/eth/usb_ether.c
index 097425b7afa..54bb0118228 100644
--- a/drivers/usb/eth/usb_ether.c
+++ b/drivers/usb/eth/usb_ether.c
@@ -13,6 +13,7 @@
 #include <usb.h>
 #include <asm/cache.h>
 #include <dm/device-internal.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include "usb_ether.h"
diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
index f353f1a3cd2..d5b3d1d40e4 100644
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@ -11,6 +11,7 @@
 #include <dm/devres.h>
 #include <linux/bitops.h>
 #include <linux/bug.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/usb/composite.h>
 
diff --git a/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c b/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c
index 84b46709a58..6b6fe0a5040 100644
--- a/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c
+++ b/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c
@@ -22,6 +22,7 @@
 #include <log.h>
 #include <stdio.h>
 #include <linux/bug.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 static u8 clear_feature_num;
diff --git a/drivers/usb/gadget/f_dfu.c b/drivers/usb/gadget/f_dfu.c
index 43a342c5afe..a1f13b6ec22 100644
--- a/drivers/usb/gadget/f_dfu.c
+++ b/drivers/usb/gadget/f_dfu.c
@@ -20,6 +20,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include <linux/usb/ch9.h>
diff --git a/drivers/usb/gadget/f_fastboot.c b/drivers/usb/gadget/f_fastboot.c
index 14a710a5238..40648ef38bd 100644
--- a/drivers/usb/gadget/f_fastboot.c
+++ b/drivers/usb/gadget/f_fastboot.c
@@ -18,6 +18,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include <linux/usb/ch9.h>
diff --git a/drivers/usb/gadget/f_mass_storage.c b/drivers/usb/gadget/f_mass_storage.c
index 8723c656e0b..e0b898db214 100644
--- a/drivers/usb/gadget/f_mass_storage.c
+++ b/drivers/usb/gadget/f_mass_storage.c
@@ -250,6 +250,7 @@
 #include <vsprintf.h>
 #include <dm/devres.h>
 #include <linux/bug.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include <linux/err.h>
diff --git a/drivers/usb/gadget/f_rockusb.c b/drivers/usb/gadget/f_rockusb.c
index 1705b7a611a..a852707525a 100644
--- a/drivers/usb/gadget/f_rockusb.c
+++ b/drivers/usb/gadget/f_rockusb.c
@@ -14,6 +14,7 @@
 #include <memalign.h>
 #include <part.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
diff --git a/drivers/usb/gadget/f_sdp.c b/drivers/usb/gadget/f_sdp.c
index 34c393c9f04..fde5c2c690e 100644
--- a/drivers/usb/gadget/f_sdp.c
+++ b/drivers/usb/gadget/f_sdp.c
@@ -23,6 +23,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/usb/gadget/f_thor.c b/drivers/usb/gadget/f_thor.c
index 142bd99c698..4a70bdcc5c3 100644
--- a/drivers/usb/gadget/f_thor.c
+++ b/drivers/usb/gadget/f_thor.c
@@ -26,6 +26,7 @@
 #include <version.h>
 #include <vsprintf.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include <linux/usb/ch9.h>
diff --git a/drivers/usb/gadget/g_dnl.c b/drivers/usb/gadget/g_dnl.c
index cd4015f65a0..1a0160b5836 100644
--- a/drivers/usb/gadget/g_dnl.c
+++ b/drivers/usb/gadget/g_dnl.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include <mmc.h>
diff --git a/drivers/usb/gadget/gadget_chips.h b/drivers/usb/gadget/gadget_chips.h
index 70067afa7d4..e43d96eab36 100644
--- a/drivers/usb/gadget/gadget_chips.h
+++ b/drivers/usb/gadget/gadget_chips.h
@@ -14,6 +14,7 @@
  * Ported to U-Boot by: Thomas Smits <ts.smits@gmail.com> and
  *                      Remy Bohmer <linux@bohmer.net>
  */
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #ifdef CONFIG_USB_GADGET_NET2280
diff --git a/drivers/usb/gadget/pxa25x_udc.c b/drivers/usb/gadget/pxa25x_udc.c
index 22db49164da..3e35e0fa45f 100644
--- a/drivers/usb/gadget/pxa25x_udc.c
+++ b/drivers/usb/gadget/pxa25x_udc.c
@@ -32,6 +32,7 @@
 #include <asm/io.h>
 #include <asm/arch/pxa.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include <linux/usb/ch9.h>
diff --git a/drivers/usb/gadget/udc/udc-core.c b/drivers/usb/gadget/udc/udc-core.c
index 13c42aabab3..74d66fd77b2 100644
--- a/drivers/usb/gadget/udc/udc-core.c
+++ b/drivers/usb/gadget/udc/udc-core.c
@@ -23,6 +23,7 @@
 #include <common.h>
 #include <dm.h>
 #include <dm/device-internal.h>
+#include <linux/errno.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
 
diff --git a/drivers/usb/gadget/udc/udc-uclass.c b/drivers/usb/gadget/udc/udc-uclass.c
index 384aa47a98f..7fa4aae4d2b 100644
--- a/drivers/usb/gadget/udc/udc-uclass.c
+++ b/drivers/usb/gadget/udc/udc-uclass.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <dm/device-internal.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/usb/gadget.h>
 
diff --git a/drivers/usb/host/dwc2.c b/drivers/usb/host/dwc2.c
index 62eab821bb6..b8c92f52b2f 100644
--- a/drivers/usb/host/dwc2.c
+++ b/drivers/usb/host/dwc2.c
@@ -23,6 +23,7 @@
 #include <asm/io.h>
 #include <dm/device_compat.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <power/regulator.h>
 #include <reset.h>
diff --git a/drivers/usb/host/dwc3-of-simple.c b/drivers/usb/host/dwc3-of-simple.c
index e4abc6f3b9b..afd304fba86 100644
--- a/drivers/usb/host/dwc3-of-simple.c
+++ b/drivers/usb/host/dwc3-of-simple.c
@@ -14,6 +14,7 @@
 #include <dm.h>
 #include <reset.h>
 #include <clk.h>
+#include <linux/errno.h>
 
 struct dwc3_of_simple {
 	struct clk_bulk		clks;
diff --git a/drivers/usb/host/dwc3-sti-glue.c b/drivers/usb/host/dwc3-sti-glue.c
index da232a6a829..779fd25880c 100644
--- a/drivers/usb/host/dwc3-sti-glue.c
+++ b/drivers/usb/host/dwc3-sti-glue.c
@@ -17,6 +17,7 @@
 #include <reset-uclass.h>
 #include <syscon.h>
 #include <usb.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 #include <linux/usb/dwc3.h>
diff --git a/drivers/usb/host/ehci-atmel.c b/drivers/usb/host/ehci-atmel.c
index 3b208e8eb22..dc6eb5b9bb6 100644
--- a/drivers/usb/host/ehci-atmel.c
+++ b/drivers/usb/host/ehci-atmel.c
@@ -13,6 +13,7 @@
 #include <usb.h>
 #include <asm/io.h>
 #include <asm/arch/clk.h>
+#include <linux/errno.h>
 
 #include "ehci.h"
 
diff --git a/drivers/usb/host/ehci-fsl.c b/drivers/usb/host/ehci-fsl.c
index 35bd319de8a..b929eb9781b 100644
--- a/drivers/usb/host/ehci-fsl.c
+++ b/drivers/usb/host/ehci-fsl.c
@@ -17,6 +17,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <usb/ehci-ci.h>
 #include <hwconfig.h>
diff --git a/drivers/usb/host/ehci-generic.c b/drivers/usb/host/ehci-generic.c
index 304a3437d56..b9ad1785cea 100644
--- a/drivers/usb/host/ehci-generic.c
+++ b/drivers/usb/host/ehci-generic.c
@@ -13,6 +13,7 @@
 #include <reset.h>
 #include <asm/io.h>
 #include <dm.h>
+#include <linux/errno.h>
 #include "ehci.h"
 #include <power/regulator.h>
 
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index fe6459e4a31..4ef54a53d83 100644
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -24,6 +24,7 @@
 #include <dm/device_compat.h>
 #include <linux/compiler.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include "ehci.h"
diff --git a/drivers/usb/host/ehci-marvell.c b/drivers/usb/host/ehci-marvell.c
index 440280f722e..f419a0ab24b 100644
--- a/drivers/usb/host/ehci-marvell.c
+++ b/drivers/usb/host/ehci-marvell.c
@@ -12,6 +12,7 @@
 #include <usb.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include "ehci.h"
 #include <linux/mbus.h>
 #include <asm/arch/cpu.h>
diff --git a/drivers/usb/host/ehci-msm.c b/drivers/usb/host/ehci-msm.c
index 6492769b2a3..458472b7b2e 100644
--- a/drivers/usb/host/ehci-msm.c
+++ b/drivers/usb/host/ehci-msm.c
@@ -12,6 +12,7 @@
 #include <errno.h>
 #include <stdio.h>
 #include <usb.h>
+#include <linux/errno.h>
 #include <usb/ehci-ci.h>
 #include <usb/ulpi.h>
 #include <wait_bit.h>
diff --git a/drivers/usb/host/ehci-mx5.c b/drivers/usb/host/ehci-mx5.c
index 709cb1cff54..2b7c9cc80d7 100644
--- a/drivers/usb/host/ehci-mx5.c
+++ b/drivers/usb/host/ehci-mx5.c
@@ -12,6 +12,7 @@
 #include <asm/global_data.h>
 #include <linux/compiler.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <usb/ehci-ci.h>
 #include <asm/io.h>
diff --git a/drivers/usb/host/ehci-mx6.c b/drivers/usb/host/ehci-mx6.c
index 51723fca051..7ca106520db 100644
--- a/drivers/usb/host/ehci-mx6.c
+++ b/drivers/usb/host/ehci-mx6.c
@@ -13,6 +13,7 @@
 #include <asm/global_data.h>
 #include <linux/compiler.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <usb/ehci-ci.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
diff --git a/drivers/usb/host/ehci-mxc.c b/drivers/usb/host/ehci-mxc.c
index d0b7ac512e8..0cbc8ee75e9 100644
--- a/drivers/usb/host/ehci-mxc.c
+++ b/drivers/usb/host/ehci-mxc.c
@@ -9,6 +9,7 @@
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <usb/ehci-ci.h>
 #include <errno.h>
 
diff --git a/drivers/usb/host/ehci-mxs.c b/drivers/usb/host/ehci-mxs.c
index 05c0f4a196e..7698c7761fe 100644
--- a/drivers/usb/host/ehci-mxs.c
+++ b/drivers/usb/host/ehci-mxs.c
@@ -12,6 +12,7 @@
 #include <asm/arch/imx-regs.h>
 #include <errno.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 #include "ehci.h"
 
diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c
index 45c3418e7f8..cc5c9406112 100644
--- a/drivers/usb/host/ehci-omap.c
+++ b/drivers/usb/host/ehci-omap.c
@@ -17,6 +17,7 @@
 #include <usb.h>
 #include <vsprintf.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <usb/ulpi.h>
 #include <errno.h>
diff --git a/drivers/usb/host/ehci-vf.c b/drivers/usb/host/ehci-vf.c
index 39d5b1dd9be..3f140521c9c 100644
--- a/drivers/usb/host/ehci-vf.c
+++ b/drivers/usb/host/ehci-vf.c
@@ -21,6 +21,7 @@
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/mach-imx/regs-usbphy.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <usb/ehci-ci.h>
 #include <linux/libfdt.h>
diff --git a/drivers/usb/host/ehci-zynq.c b/drivers/usb/host/ehci-zynq.c
index 6eef3814a14..918e224e761 100644
--- a/drivers/usb/host/ehci-zynq.c
+++ b/drivers/usb/host/ehci-zynq.c
@@ -12,6 +12,7 @@
 #include <asm/arch/hardware.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/io.h>
+#include <linux/errno.h>
 #include <usb/ehci-ci.h>
 #include <usb/ulpi.h>
 
diff --git a/drivers/usb/host/ohci-da8xx.c b/drivers/usb/host/ohci-da8xx.c
index e9f87cfb7b0..f034d50a382 100644
--- a/drivers/usb/host/ohci-da8xx.c
+++ b/drivers/usb/host/ohci-da8xx.c
@@ -14,6 +14,7 @@
 #include <dm/ofnode.h>
 #include <generic-phy.h>
 #include <reset.h>
+#include <linux/errno.h>
 #include "ohci.h"
 #include <asm/arch/da8xx-usb.h>
 
diff --git a/drivers/usb/host/ohci-generic.c b/drivers/usb/host/ohci-generic.c
index b84bf8ac0f7..ae7066169d3 100644
--- a/drivers/usb/host/ohci-generic.c
+++ b/drivers/usb/host/ohci-generic.c
@@ -12,6 +12,7 @@
 #include <dm/ofnode.h>
 #include <generic-phy.h>
 #include <reset.h>
+#include <linux/errno.h>
 #include "ohci.h"
 
 #if !defined(CONFIG_USB_OHCI_NEW)
diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c
index 598567d6047..3b204efdd69 100644
--- a/drivers/usb/host/ohci-hcd.c
+++ b/drivers/usb/host/ohci-hcd.c
@@ -35,6 +35,7 @@
 #include <errno.h>
 #include <asm/cache.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #if defined(CONFIG_PCI_OHCI)
diff --git a/drivers/usb/host/r8a66597-hcd.c b/drivers/usb/host/r8a66597-hcd.c
index 7595813868c..f977b3336f0 100644
--- a/drivers/usb/host/r8a66597-hcd.c
+++ b/drivers/usb/host/r8a66597-hcd.c
@@ -14,6 +14,7 @@
 #include <asm/io.h>
 #include <dm/device_compat.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/iopoll.h>
 #include <linux/string.h>
 #include <power/regulator.h>
diff --git a/drivers/usb/host/usb-uclass.c b/drivers/usb/host/usb-uclass.c
index a8f4c56b7e7..1104fb2d040 100644
--- a/drivers/usb/host/usb-uclass.c
+++ b/drivers/usb/host/usb-uclass.c
@@ -17,6 +17,7 @@
 #include <dm/device-internal.h>
 #include <dm/lists.h>
 #include <dm/uclass-internal.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 extern bool usb_started; /* flag for the started/stopped USB status */
diff --git a/drivers/usb/host/xhci-brcm.c b/drivers/usb/host/xhci-brcm.c
index ee65f51c5d2..3308b7e756a 100644
--- a/drivers/usb/host/xhci-brcm.c
+++ b/drivers/usb/host/xhci-brcm.c
@@ -8,6 +8,7 @@
 #include <fdtdec.h>
 #include <usb.h>
 #include <asm/io.h>
+#include <linux/errno.h>
 #include <usb/xhci.h>
 
 #define DRD2U3H_XHC_REGS_AXIWRA	0xC08
diff --git a/drivers/usb/host/xhci-dwc3.c b/drivers/usb/host/xhci-dwc3.c
index fdbf2c83b56..b96aea1e010 100644
--- a/drivers/usb/host/xhci-dwc3.c
+++ b/drivers/usb/host/xhci-dwc3.c
@@ -15,6 +15,7 @@
 #include <usb.h>
 #include <dwc3-uboot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include <usb/xhci.h>
diff --git a/drivers/usb/host/xhci-mvebu.c b/drivers/usb/host/xhci-mvebu.c
index 32e00378ab7..bc3a9f4d018 100644
--- a/drivers/usb/host/xhci-mvebu.c
+++ b/drivers/usb/host/xhci-mvebu.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <stdio.h>
 #include <usb.h>
+#include <linux/errno.h>
 #include <power/regulator.h>
 #include <asm/gpio.h>
 
diff --git a/drivers/usb/host/xhci-rcar.c b/drivers/usb/host/xhci-rcar.c
index 8fc51df3d11..28eea930cc2 100644
--- a/drivers/usb/host/xhci-rcar.c
+++ b/drivers/usb/host/xhci-rcar.c
@@ -15,6 +15,7 @@
 #include <wait_bit.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #include <usb/xhci.h>
 #include "xhci-rcar-r8a779x_usb3_v3.h"
diff --git a/drivers/usb/musb-new/am35x.c b/drivers/usb/musb-new/am35x.c
index 410cf042f66..8d8aa779467 100644
--- a/drivers/usb/musb-new/am35x.c
+++ b/drivers/usb/musb-new/am35x.c
@@ -29,6 +29,7 @@
 #include <asm/omap_musb.h>
 #include <linux/bug.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include "linux-compat.h"
 #endif
diff --git a/drivers/usb/musb-new/da8xx.c b/drivers/usb/musb-new/da8xx.c
index e13a6810b8d..8c44ed2429f 100644
--- a/drivers/usb/musb-new/da8xx.c
+++ b/drivers/usb/musb-new/da8xx.c
@@ -23,6 +23,7 @@
 #include <asm/arch/hardware.h>
 #include <asm/arch/da8xx-usb.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/usb/otg.h>
 #include <asm/omap_musb.h>
 #include <generic-phy.h>
diff --git a/drivers/usb/musb-new/mt85xx.c b/drivers/usb/musb-new/mt85xx.c
index 78b4c93e860..c5b994d906b 100644
--- a/drivers/usb/musb-new/mt85xx.c
+++ b/drivers/usb/musb-new/mt85xx.c
@@ -16,6 +16,7 @@
 #include <dm/lists.h>
 #include <dm/root.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include <linux/usb/musb.h>
diff --git a/drivers/usb/musb-new/musb_dsps.c b/drivers/usb/musb-new/musb_dsps.c
index f9d30b5b76d..14d8cfb70fc 100644
--- a/drivers/usb/musb-new/musb_dsps.c
+++ b/drivers/usb/musb-new/musb_dsps.c
@@ -35,6 +35,7 @@
 #include <time.h>
 #include <vsprintf.h>
 #include <asm/omap_musb.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include "linux-compat.h"
 #endif
diff --git a/drivers/usb/musb-new/musb_gadget.c b/drivers/usb/musb-new/musb_gadget.c
index ceac6a82b64..949bea72aae 100644
--- a/drivers/usb/musb-new/musb_gadget.c
+++ b/drivers/usb/musb-new/musb_gadget.c
@@ -25,6 +25,7 @@
 #include <common.h>
 #include <vsprintf.h>
 #include <linux/bug.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include <linux/usb/ch9.h>
diff --git a/drivers/usb/musb-new/musb_gadget_ep0.c b/drivers/usb/musb-new/musb_gadget_ep0.c
index 22de98559d9..769aa25f175 100644
--- a/drivers/usb/musb-new/musb_gadget_ep0.c
+++ b/drivers/usb/musb-new/musb_gadget_ep0.c
@@ -19,6 +19,7 @@
 #include <linux/interrupt.h>
 #else
 #include <common.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include "linux-compat.h"
 #include <asm/processor.h>
diff --git a/drivers/usb/musb-new/omap2430.c b/drivers/usb/musb-new/omap2430.c
index e8bc3f33597..b609034184f 100644
--- a/drivers/usb/musb-new/omap2430.c
+++ b/drivers/usb/musb-new/omap2430.c
@@ -18,6 +18,7 @@
 #include <dm/device_compat.h>
 #include <dm/lists.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/usb/otg.h>
 #include <asm/omap_common.h>
diff --git a/drivers/usb/musb-new/pic32.c b/drivers/usb/musb-new/pic32.c
index f1bd127b7d4..ca1c8d57867 100644
--- a/drivers/usb/musb-new/pic32.c
+++ b/drivers/usb/musb-new/pic32.c
@@ -15,6 +15,7 @@
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/usb/musb.h>
 #include "linux-compat.h"
diff --git a/drivers/usb/musb-new/sunxi.c b/drivers/usb/musb-new/sunxi.c
index 20d968f8497..1ab74d4be39 100644
--- a/drivers/usb/musb-new/sunxi.c
+++ b/drivers/usb/musb-new/sunxi.c
@@ -33,6 +33,7 @@
 #include <dm/root.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include <linux/usb/musb.h>
diff --git a/drivers/usb/musb-new/ti-musb.c b/drivers/usb/musb-new/ti-musb.c
index bbec8774310..e4382a30969 100644
--- a/drivers/usb/musb-new/ti-musb.c
+++ b/drivers/usb/musb-new/ti-musb.c
@@ -13,6 +13,7 @@
 #include <malloc.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include <linux/usb/otg.h>
diff --git a/drivers/video/am335x-fb.c b/drivers/video/am335x-fb.c
index 4e0d9c2b098..4d74e96e2a3 100644
--- a/drivers/video/am335x-fb.c
+++ b/drivers/video/am335x-fb.c
@@ -26,6 +26,7 @@
 #include <asm/utils.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include "am335x-fb.h"
diff --git a/drivers/video/atmel_hlcdfb.c b/drivers/video/atmel_hlcdfb.c
index 13dc28412c7..bee082508b6 100644
--- a/drivers/video/atmel_hlcdfb.c
+++ b/drivers/video/atmel_hlcdfb.c
@@ -23,6 +23,7 @@
 #include <wait_bit.h>
 #include <atmel_hlcdc.h>
 #include <linux/bug.h>
+#include <linux/errno.h>
 
 #if defined(CONFIG_LCD_LOGO)
 #include <bmp_logo.h>
diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c
index e5e0aeec350..20b9ba661c2 100644
--- a/drivers/video/atmel_lcdfb.c
+++ b/drivers/video/atmel_lcdfb.c
@@ -20,6 +20,7 @@
 #include <bmp_layout.h>
 #include <atmel_lcdc.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/video/backlight-uclass.c b/drivers/video/backlight-uclass.c
index 0aadf8a1f97..60cc206c5fd 100644
--- a/drivers/video/backlight-uclass.c
+++ b/drivers/video/backlight-uclass.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <backlight.h>
+#include <linux/errno.h>
 
 int backlight_enable(struct udevice *dev)
 {
diff --git a/drivers/video/bcm2835.c b/drivers/video/bcm2835.c
index 0888cb00197..7d2a452fd6f 100644
--- a/drivers/video/bcm2835.c
+++ b/drivers/video/bcm2835.c
@@ -10,6 +10,7 @@
 #include <asm/arch/mbox.h>
 #include <asm/arch/msg.h>
 #include <asm/cache.h>
+#include <linux/errno.h>
 
 static int bcm2835_video_probe(struct udevice *dev)
 {
diff --git a/drivers/video/bridge/anx6345.c b/drivers/video/bridge/anx6345.c
index 5d76cedbcea..e7c33e6a18b 100644
--- a/drivers/video/bridge/anx6345.c
+++ b/drivers/video/bridge/anx6345.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <video_bridge.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include "../anx98xx-edp.h"
 
diff --git a/drivers/video/bridge/ps862x.c b/drivers/video/bridge/ps862x.c
index 7e9c6da4545..b6f3e300f35 100644
--- a/drivers/video/bridge/ps862x.c
+++ b/drivers/video/bridge/ps862x.c
@@ -12,6 +12,7 @@
 #include <video_bridge.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <power/regulator.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/video/bridge/video-bridge-uclass.c b/drivers/video/bridge/video-bridge-uclass.c
index 389b02cdcba..d606342d847 100644
--- a/drivers/video/bridge/video-bridge-uclass.c
+++ b/drivers/video/bridge/video-bridge-uclass.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <video_bridge.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 int video_bridge_set_backlight(struct udevice *dev, int percent)
 {
diff --git a/drivers/video/broadwell_igd.c b/drivers/video/broadwell_igd.c
index 7a282be660f..77a4dc15830 100644
--- a/drivers/video/broadwell_igd.c
+++ b/drivers/video/broadwell_igd.c
@@ -24,6 +24,7 @@
 #include <asm/arch/iomap.h>
 #include <asm/arch/pch.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include "i915_reg.h"
 
 struct broadwell_igd_priv {
diff --git a/drivers/video/console_normal.c b/drivers/video/console_normal.c
index 04f022491e5..5b51252aaa6 100644
--- a/drivers/video/console_normal.c
+++ b/drivers/video/console_normal.c
@@ -12,6 +12,7 @@
 #include <video.h>
 #include <video_console.h>
 #include <video_font.h>		/* Get font data, width and height */
+#include <linux/errno.h>
 
 static int console_normal_set_row(struct udevice *dev, uint row, int clr)
 {
diff --git a/drivers/video/console_rotate.c b/drivers/video/console_rotate.c
index 36c8d0609d8..3649bd4487e 100644
--- a/drivers/video/console_rotate.c
+++ b/drivers/video/console_rotate.c
@@ -10,6 +10,7 @@
 #include <video.h>
 #include <video_console.h>
 #include <video_font.h>		/* Get font data, width and height */
+#include <linux/errno.h>
 
 static int console_set_row_1(struct udevice *dev, uint row, int clr)
 {
diff --git a/drivers/video/console_truetype.c b/drivers/video/console_truetype.c
index 26093408453..17e040bc926 100644
--- a/drivers/video/console_truetype.c
+++ b/drivers/video/console_truetype.c
@@ -9,6 +9,7 @@
 #include <malloc.h>
 #include <video.h>
 #include <video_console.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 /* Functions needed by stb_truetype.h */
diff --git a/drivers/video/coreboot.c b/drivers/video/coreboot.c
index 6914162d3ac..e29b0651a67 100644
--- a/drivers/video/coreboot.c
+++ b/drivers/video/coreboot.c
@@ -9,6 +9,7 @@
 #include <vbe.h>
 #include <video.h>
 #include <asm/arch/sysinfo.h>
+#include <linux/errno.h>
 
 static int save_vesa_mode(struct cb_framebuffer *fb,
 			  struct vesa_mode_info *vesa)
diff --git a/drivers/video/display-uclass.c b/drivers/video/display-uclass.c
index 1a29ce5d858..8b49a7ba028 100644
--- a/drivers/video/display-uclass.c
+++ b/drivers/video/display-uclass.c
@@ -8,6 +8,7 @@
 #include <display.h>
 #include <edid.h>
 #include <errno.h>
+#include <linux/errno.h>
 
 int display_read_edid(struct udevice *dev, u8 *buf, int buf_size)
 {
diff --git a/drivers/video/dsi-host-uclass.c b/drivers/video/dsi-host-uclass.c
index 1db1f88a179..78e3d94e3e7 100644
--- a/drivers/video/dsi-host-uclass.c
+++ b/drivers/video/dsi-host-uclass.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <dm.h>
 #include <dsi_host.h>
+#include <linux/errno.h>
 
 int dsi_host_init(struct udevice *dev,
 		  struct mipi_dsi_device *device,
diff --git a/drivers/video/dw_mipi_dsi.c b/drivers/video/dw_mipi_dsi.c
index 547dfc4b81c..1a2d2b3b7f5 100644
--- a/drivers/video/dw_mipi_dsi.c
+++ b/drivers/video/dw_mipi_dsi.c
@@ -22,6 +22,7 @@
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/iopoll.h>
 #include <video_bridge.h>
 #include <linux/string.h>
diff --git a/drivers/video/efi.c b/drivers/video/efi.c
index 489998f3625..aa67cf17ad0 100644
--- a/drivers/video/efi.c
+++ b/drivers/video/efi.c
@@ -12,6 +12,7 @@
 #include <stdio.h>
 #include <vbe.h>
 #include <video.h>
+#include <linux/errno.h>
 
 struct pixel {
 	u8 pos;
diff --git a/drivers/video/exynos/exynos_dp.c b/drivers/video/exynos/exynos_dp.c
index d63d9effb00..72333b47010 100644
--- a/drivers/video/exynos/exynos_dp.c
+++ b/drivers/video/exynos/exynos_dp.c
@@ -14,6 +14,7 @@
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <malloc.h>
 #include <video_bridge.h>
diff --git a/drivers/video/exynos/exynos_dp_lowlevel.c b/drivers/video/exynos/exynos_dp_lowlevel.c
index efa3b924af1..c87e18f1dad 100644
--- a/drivers/video/exynos/exynos_dp_lowlevel.c
+++ b/drivers/video/exynos/exynos_dp_lowlevel.c
@@ -15,6 +15,7 @@
 #include <asm/arch/dp_info.h>
 #include <asm/arch/dp.h>
 #include <fdtdec.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include "exynos_dp_lowlevel.h"
 
diff --git a/drivers/video/exynos/exynos_mipi_dsi.c b/drivers/video/exynos/exynos_mipi_dsi.c
index 1d5ed38bf44..a21c185cc79 100644
--- a/drivers/video/exynos/exynos_mipi_dsi.c
+++ b/drivers/video/exynos/exynos_mipi_dsi.c
@@ -13,6 +13,7 @@
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <dm/devres.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <linux/compat.h>
 #include <linux/err.h>
diff --git a/drivers/video/exynos/exynos_mipi_dsi_common.c b/drivers/video/exynos/exynos_mipi_dsi_common.c
index ab7d61afc88..26e5d24314b 100644
--- a/drivers/video/exynos/exynos_mipi_dsi_common.c
+++ b/drivers/video/exynos/exynos_mipi_dsi_common.c
@@ -13,6 +13,7 @@
 #include <linux/err.h>
 #include <asm/arch/dsim.h>
 #include <asm/arch/mipi_dsim.h>
+#include <linux/errno.h>
 
 #include "exynos_mipi_dsi_lowlevel.h"
 
diff --git a/drivers/video/fsl_dcu_fb.c b/drivers/video/fsl_dcu_fb.c
index 0dafac2829e..a8404dd2711 100644
--- a/drivers/video/fsl_dcu_fb.c
+++ b/drivers/video/fsl_dcu_fb.c
@@ -16,6 +16,7 @@
 #include <fdt_support.h>
 #include <fsl_dcu_fb.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 #include <linux/fb.h>
 #include <malloc.h>
 #include <video.h>
diff --git a/drivers/video/hitachi_tx18d42vm_lcd.c b/drivers/video/hitachi_tx18d42vm_lcd.c
index 752bc62eb68..fd51761485d 100644
--- a/drivers/video/hitachi_tx18d42vm_lcd.c
+++ b/drivers/video/hitachi_tx18d42vm_lcd.c
@@ -9,6 +9,7 @@
 #include <malloc.h>
 #include <stdio.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 #include <asm/gpio.h>
 #include <errno.h>
diff --git a/drivers/video/ihs_video_out.c b/drivers/video/ihs_video_out.c
index 2124b826d28..dcbfbde688f 100644
--- a/drivers/video/ihs_video_out.c
+++ b/drivers/video/ihs_video_out.c
@@ -16,6 +16,7 @@
 #include <regmap.h>
 #include <video_osd.h>
 #include <asm/gpio.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 static const uint MAX_X_CHARS = 53;
diff --git a/drivers/video/ivybridge_igd.c b/drivers/video/ivybridge_igd.c
index d4247ee6406..47aa55ebdfc 100644
--- a/drivers/video/ivybridge_igd.c
+++ b/drivers/video/ivybridge_igd.c
@@ -21,6 +21,7 @@
 #include <asm/arch/pch.h>
 #include <asm/arch/sandybridge.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/video/lg4573.c b/drivers/video/lg4573.c
index f91ee7363f5..7d4ddca1573 100644
--- a/drivers/video/lg4573.c
+++ b/drivers/video/lg4573.c
@@ -17,6 +17,7 @@
 #include <spi.h>
 #include <asm/gpio.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #define PWR_ON_DELAY_MSECS  120
diff --git a/drivers/video/logicore_dp_tx.c b/drivers/video/logicore_dp_tx.c
index 45eba82c409..938455c0e4a 100644
--- a/drivers/video/logicore_dp_tx.c
+++ b/drivers/video/logicore_dp_tx.c
@@ -16,6 +16,7 @@
 #include <errno.h>
 #include <stdio.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include "axi.h"
diff --git a/drivers/video/mali_dp.c b/drivers/video/mali_dp.c
index 778a9a917dd..44841a9f929 100644
--- a/drivers/video/mali_dp.c
+++ b/drivers/video/mali_dp.c
@@ -21,6 +21,7 @@
 #include <clk.h>
 #include <dm/device_compat.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/sizes.h>
 #include <linux/string.h>
 
diff --git a/drivers/video/meson/meson_dw_hdmi.c b/drivers/video/meson/meson_dw_hdmi.c
index ec550b57fda..0fa1178415a 100644
--- a/drivers/video/meson/meson_dw_hdmi.c
+++ b/drivers/video/meson/meson_dw_hdmi.c
@@ -14,6 +14,7 @@
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <power/regulator.h>
 #include <clk.h>
diff --git a/drivers/video/meson/meson_vpu.c b/drivers/video/meson/meson_vpu.c
index b34e5df5630..9acc2eab356 100644
--- a/drivers/video/meson/meson_vpu.c
+++ b/drivers/video/meson/meson_vpu.c
@@ -15,6 +15,7 @@
 #include <part.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 #include <linux/sizes.h>
 #include <asm/arch/mem.h>
 #include <dm/device-internal.h>
diff --git a/drivers/video/mipi_dsi.c b/drivers/video/mipi_dsi.c
index 5caa6a6fef6..7f9e2c8357f 100644
--- a/drivers/video/mipi_dsi.c
+++ b/drivers/video/mipi_dsi.c
@@ -39,6 +39,7 @@
 #include <mipi_display.h>
 #include <mipi_dsi.h>
 #include <dm/devres.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 /**
diff --git a/drivers/video/mvebu_lcd.c b/drivers/video/mvebu_lcd.c
index f3cb2bfb480..142ae235599 100644
--- a/drivers/video/mvebu_lcd.c
+++ b/drivers/video/mvebu_lcd.c
@@ -12,6 +12,7 @@
 #include <asm/cache.h>
 #include <dm/device_compat.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/mbus.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
diff --git a/drivers/video/nexell/s5pxx18_dp.c b/drivers/video/nexell/s5pxx18_dp.c
index 2248f479057..e857b004d91 100644
--- a/drivers/video/nexell/s5pxx18_dp.c
+++ b/drivers/video/nexell/s5pxx18_dp.c
@@ -12,6 +12,7 @@
 #include <asm/arch/reset.h>
 #include <asm/arch/nexell.h>
 #include <asm/arch/display.h>
+#include <linux/errno.h>
 
 #include "soc/s5pxx18_soc_disptop.h"
 #include "soc/s5pxx18_soc_dpc.h"
diff --git a/drivers/video/nexell/s5pxx18_dp_hdmi.c b/drivers/video/nexell/s5pxx18_dp_hdmi.c
index 3f1fb8a5757..087cb11f916 100644
--- a/drivers/video/nexell/s5pxx18_dp_hdmi.c
+++ b/drivers/video/nexell/s5pxx18_dp_hdmi.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <errno.h>
 #include <log.h>
+#include <linux/errno.h>
 
 #include <asm/arch/nexell.h>
 #include <asm/arch/tieoff.h>
diff --git a/drivers/video/nexell/s5pxx18_dp_lvds.c b/drivers/video/nexell/s5pxx18_dp_lvds.c
index f8ea63fdf1b..cc95de13f51 100644
--- a/drivers/video/nexell/s5pxx18_dp_lvds.c
+++ b/drivers/video/nexell/s5pxx18_dp_lvds.c
@@ -8,6 +8,7 @@
 #include <config.h>
 #include <common.h>
 #include <errno.h>
+#include <linux/errno.h>
 
 #include <asm/arch/nexell.h>
 #include <asm/arch/reset.h>
diff --git a/drivers/video/nexell/s5pxx18_dp_mipi.c b/drivers/video/nexell/s5pxx18_dp_mipi.c
index 670272b2680..0eb1ebb377a 100644
--- a/drivers/video/nexell/s5pxx18_dp_mipi.c
+++ b/drivers/video/nexell/s5pxx18_dp_mipi.c
@@ -8,6 +8,7 @@
 #include <config.h>
 #include <common.h>
 #include <errno.h>
+#include <linux/errno.h>
 
 #include <asm/arch/nexell.h>
 #include <asm/arch/tieoff.h>
diff --git a/drivers/video/nexell_display.c b/drivers/video/nexell_display.c
index 4101e0962a9..1592e9b46ab 100644
--- a/drivers/video/nexell_display.c
+++ b/drivers/video/nexell_display.c
@@ -22,6 +22,7 @@
 #include <asm/io.h>
 #include <asm/arch/display.h>
 #include <asm/arch/display_dev.h>
+#include <linux/errno.h>
 #include "videomodes.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/video/orisetech_otm8009a.c b/drivers/video/orisetech_otm8009a.c
index acb8f384a88..b6a8527533c 100644
--- a/drivers/video/orisetech_otm8009a.c
+++ b/drivers/video/orisetech_otm8009a.c
@@ -15,6 +15,7 @@
 #include <asm/gpio.h>
 #include <dm/device_compat.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <power/regulator.h>
 
diff --git a/drivers/video/panel-uclass.c b/drivers/video/panel-uclass.c
index 246d1b2836d..8bdba13c457 100644
--- a/drivers/video/panel-uclass.c
+++ b/drivers/video/panel-uclass.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <panel.h>
+#include <linux/errno.h>
 
 int panel_enable_backlight(struct udevice *dev)
 {
diff --git a/drivers/video/pwm_backlight.c b/drivers/video/pwm_backlight.c
index 468a5703bdb..6aacb067ad3 100644
--- a/drivers/video/pwm_backlight.c
+++ b/drivers/video/pwm_backlight.c
@@ -14,6 +14,7 @@
 #include <pwm.h>
 #include <asm/gpio.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <power/regulator.h>
 
 /**
diff --git a/drivers/video/raydium-rm68200.c b/drivers/video/raydium-rm68200.c
index 1efd1607f63..d31cbb4c34a 100644
--- a/drivers/video/raydium-rm68200.c
+++ b/drivers/video/raydium-rm68200.c
@@ -15,6 +15,7 @@
 #include <asm/gpio.h>
 #include <dm/device_compat.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <power/regulator.h>
 
diff --git a/drivers/video/rockchip/rk3288_mipi.c b/drivers/video/rockchip/rk3288_mipi.c
index b232ff0b76b..f842dfeb1d7 100644
--- a/drivers/video/rockchip/rk3288_mipi.c
+++ b/drivers/video/rockchip/rk3288_mipi.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <panel.h>
 #include <regmap.h>
+#include <linux/errno.h>
 #include "rk_mipi.h"
 #include <syscon.h>
 #include <asm/gpio.h>
diff --git a/drivers/video/rockchip/rk3399_mipi.c b/drivers/video/rockchip/rk3399_mipi.c
index 113708d97e5..efcd8614c03 100644
--- a/drivers/video/rockchip/rk3399_mipi.c
+++ b/drivers/video/rockchip/rk3399_mipi.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <panel.h>
 #include <regmap.h>
+#include <linux/errno.h>
 #include "rk_mipi.h"
 #include <syscon.h>
 #include <asm/gpio.h>
diff --git a/drivers/video/rockchip/rk_edp.c b/drivers/video/rockchip/rk_edp.c
index 575aee1cdb1..d6478d4f398 100644
--- a/drivers/video/rockchip/rk_edp.c
+++ b/drivers/video/rockchip/rk_edp.c
@@ -24,6 +24,7 @@
 #include <asm/arch-rockchip/hardware.h>
 #include <dt-bindings/clock/rk3288-cru.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #define MAX_CR_LOOP 5
diff --git a/drivers/video/rockchip/rk_lvds.c b/drivers/video/rockchip/rk_lvds.c
index 24f3caabb01..c9890feac0f 100644
--- a/drivers/video/rockchip/rk_lvds.c
+++ b/drivers/video/rockchip/rk_lvds.c
@@ -20,6 +20,7 @@
 #include <asm/arch-rockchip/lvds_rk3288.h>
 #include <dt-bindings/clock/rk3288-cru.h>
 #include <dt-bindings/video/rk3288.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/video/rockchip/rk_mipi.c b/drivers/video/rockchip/rk_mipi.c
index 2e235cb6c2c..2438d44cf3f 100644
--- a/drivers/video/rockchip/rk_mipi.c
+++ b/drivers/video/rockchip/rk_mipi.c
@@ -12,6 +12,7 @@
 #include <panel.h>
 #include <regmap.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include "rk_mipi.h"
 #include <syscon.h>
 #include <asm/gpio.h>
diff --git a/drivers/video/rockchip/rk_vop.c b/drivers/video/rockchip/rk_vop.c
index 7e864698697..41541ef8222 100644
--- a/drivers/video/rockchip/rk_vop.c
+++ b/drivers/video/rockchip/rk_vop.c
@@ -23,6 +23,7 @@
 #include <dm/uclass-internal.h>
 #include <linux/bitops.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <power/regulator.h>
 #include "rk_vop.h"
 
diff --git a/drivers/video/sandbox_osd.c b/drivers/video/sandbox_osd.c
index 9fb1224bf59..ab6abae520e 100644
--- a/drivers/video/sandbox_osd.c
+++ b/drivers/video/sandbox_osd.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <malloc.h>
 #include <video_osd.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include "sandbox_osd.h"
diff --git a/drivers/video/simple_panel.c b/drivers/video/simple_panel.c
index 6c624c37699..74ae68ea3ad 100644
--- a/drivers/video/simple_panel.c
+++ b/drivers/video/simple_panel.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <panel.h>
 #include <asm/gpio.h>
+#include <linux/errno.h>
 #include <power/regulator.h>
 
 struct simple_panel_priv {
diff --git a/drivers/video/simplefb.c b/drivers/video/simplefb.c
index c545c79ced8..d722832f3eb 100644
--- a/drivers/video/simplefb.c
+++ b/drivers/video/simplefb.c
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <video.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 static int simple_video_probe(struct udevice *dev)
diff --git a/drivers/video/stm32/stm32_dsi.c b/drivers/video/stm32/stm32_dsi.c
index e77a0f478a6..617d900343c 100644
--- a/drivers/video/stm32/stm32_dsi.c
+++ b/drivers/video/stm32/stm32_dsi.c
@@ -25,6 +25,7 @@
 #include <dm/device_compat.h>
 #include <dm/lists.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/iopoll.h>
 #include <linux/printk.h>
 #include <power/regulator.h>
diff --git a/drivers/video/stm32/stm32_ltdc.c b/drivers/video/stm32/stm32_ltdc.c
index d2ac2e57c8a..3767792a399 100644
--- a/drivers/video/stm32/stm32_ltdc.c
+++ b/drivers/video/stm32/stm32_ltdc.c
@@ -20,6 +20,7 @@
 #include <dm/device-internal.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 struct stm32_ltdc_priv {
diff --git a/drivers/video/sunxi/sunxi_de2.c b/drivers/video/sunxi/sunxi_de2.c
index 8529504014e..c323e0b0d5a 100644
--- a/drivers/video/sunxi/sunxi_de2.c
+++ b/drivers/video/sunxi/sunxi_de2.c
@@ -23,6 +23,7 @@
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include "simplefb_common.h"
 
diff --git a/drivers/video/sunxi/sunxi_display.c b/drivers/video/sunxi/sunxi_display.c
index 56c63e4ea43..9e59da06bf4 100644
--- a/drivers/video/sunxi/sunxi_display.c
+++ b/drivers/video/sunxi/sunxi_display.c
@@ -14,6 +14,7 @@
 #include <time.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include <asm/arch/clock.h>
diff --git a/drivers/video/sunxi/sunxi_lcd.c b/drivers/video/sunxi/sunxi_lcd.c
index c39438ff09a..841ef433493 100644
--- a/drivers/video/sunxi/sunxi_lcd.c
+++ b/drivers/video/sunxi/sunxi_lcd.c
@@ -18,6 +18,7 @@
 #include <asm/arch/lcdc.h>
 #include <asm/arch/gpio.h>
 #include <asm/gpio.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 struct sunxi_lcd_priv {
diff --git a/drivers/video/tda19988.c b/drivers/video/tda19988.c
index 48c29129192..bead13f2934 100644
--- a/drivers/video/tda19988.c
+++ b/drivers/video/tda19988.c
@@ -12,6 +12,7 @@
 #include <stdio.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 /*
  * TDA19988 uses paged registers. We encode the page# in the upper
diff --git a/drivers/video/tegra.c b/drivers/video/tegra.c
index 5e03aab67bb..f10c509345d 100644
--- a/drivers/video/tegra.c
+++ b/drivers/video/tegra.c
@@ -17,6 +17,7 @@
 #include <asm/system.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
+#include <linux/errno.h>
 
 #include <asm/arch/clock.h>
 #include <asm/arch/funcmux.h>
diff --git a/drivers/video/tegra124/display.c b/drivers/video/tegra124/display.c
index 1c47b133c85..c16110f1191 100644
--- a/drivers/video/tegra124/display.c
+++ b/drivers/video/tegra124/display.c
@@ -25,6 +25,7 @@
 #include <asm/arch-tegra/dc.h>
 #include <dm/uclass-internal.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include "displayport.h"
 
 /* return in 1000ths of a Hertz */
diff --git a/drivers/video/tegra124/dp.c b/drivers/video/tegra124/dp.c
index 9c5ce04c376..52b06f32ea8 100644
--- a/drivers/video/tegra124/dp.c
+++ b/drivers/video/tegra124/dp.c
@@ -16,6 +16,7 @@
 #include <asm/io.h>
 #include <asm/arch-tegra/dc.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include "display.h"
 #include "edid.h"
diff --git a/drivers/video/tegra124/sor.c b/drivers/video/tegra124/sor.c
index 345974f465b..17a1f75a9bf 100644
--- a/drivers/video/tegra124/sor.c
+++ b/drivers/video/tegra124/sor.c
@@ -17,6 +17,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch-tegra/dc.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include "displayport.h"
 #include "sor.h"
diff --git a/drivers/video/vidconsole-uclass.c b/drivers/video/vidconsole-uclass.c
index 128fa88648f..7262cc0a65c 100644
--- a/drivers/video/vidconsole-uclass.c
+++ b/drivers/video/vidconsole-uclass.c
@@ -17,6 +17,7 @@
 #include <video_font.h>		/* Bitmap font for code page 437 */
 #include <vsprintf.h>
 #include <linux/ctype.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 /*
diff --git a/drivers/video/video-uclass.c b/drivers/video/video-uclass.c
index 398f1a97e04..722a9c8765a 100644
--- a/drivers/video/video-uclass.c
+++ b/drivers/video/video-uclass.c
@@ -24,6 +24,7 @@
 #ifdef CONFIG_SANDBOX
 #include <asm/sdl.h>
 #endif
+#include <linux/errno.h>
 #include <linux/string.h>
 
 /*
diff --git a/drivers/video/video_bmp.c b/drivers/video/video_bmp.c
index 802d84a8860..e854e3a3bfe 100644
--- a/drivers/video/video_bmp.c
+++ b/drivers/video/video_bmp.c
@@ -13,6 +13,7 @@
 #include <video.h>
 #include <watchdog.h>
 #include <asm/unaligned.h>
+#include <linux/errno.h>
 
 #ifdef CONFIG_VIDEO_BMP_RLE8
 #define BMP_RLE8_ESCAPE		0
diff --git a/drivers/video/videomodes.c b/drivers/video/videomodes.c
index ba0fa3589f6..f14fe3bb9e6 100644
--- a/drivers/video/videomodes.c
+++ b/drivers/video/videomodes.c
@@ -64,6 +64,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/ctype.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include "videomodes.h"
diff --git a/drivers/virtio/virtio-uclass.c b/drivers/virtio/virtio-uclass.c
index 50e143bb9e5..da0945b5c60 100644
--- a/drivers/virtio/virtio-uclass.c
+++ b/drivers/virtio/virtio-uclass.c
@@ -24,6 +24,7 @@
 #include <vsprintf.h>
 #include <dm/lists.h>
 #include <linux/bug.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 static const char *const virtio_drv_name[VIRTIO_ID_MAX_NUM] = {
diff --git a/drivers/virtio/virtio_blk.c b/drivers/virtio/virtio_blk.c
index 95b7360656a..5117b925126 100644
--- a/drivers/virtio/virtio_blk.c
+++ b/drivers/virtio/virtio_blk.c
@@ -12,6 +12,7 @@
 #include <virtio.h>
 #include <virtio_ring.h>
 #include <vsprintf.h>
+#include <linux/errno.h>
 #include "virtio_blk.h"
 
 struct virtio_blk_priv {
diff --git a/drivers/virtio/virtio_mmio.c b/drivers/virtio/virtio_mmio.c
index 50f79dcb3b1..42baf5c9fd2 100644
--- a/drivers/virtio/virtio_mmio.c
+++ b/drivers/virtio/virtio_mmio.c
@@ -16,6 +16,7 @@
 #include <linux/bug.h>
 #include <linux/compat.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/string.h>
 #include "virtio_mmio.h"
diff --git a/drivers/virtio/virtio_net.c b/drivers/virtio/virtio_net.c
index a16268f9d27..277d4832fbb 100644
--- a/drivers/virtio/virtio_net.c
+++ b/drivers/virtio/virtio_net.c
@@ -10,6 +10,7 @@
 #include <virtio_types.h>
 #include <virtio.h>
 #include <virtio_ring.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include "virtio_net.h"
 
diff --git a/drivers/virtio/virtio_pci_legacy.c b/drivers/virtio/virtio_pci_legacy.c
index 59deadeec33..bef5dd1ca3c 100644
--- a/drivers/virtio/virtio_pci_legacy.c
+++ b/drivers/virtio/virtio_pci_legacy.c
@@ -18,6 +18,7 @@
 #include <linux/bug.h>
 #include <linux/compat.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include "virtio_pci.h"
 
diff --git a/drivers/virtio/virtio_pci_modern.c b/drivers/virtio/virtio_pci_modern.c
index cc3378d8758..9edb271e929 100644
--- a/drivers/virtio/virtio_pci_modern.c
+++ b/drivers/virtio/virtio_pci_modern.c
@@ -19,6 +19,7 @@
 #include <linux/compat.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/string.h>
 #include "virtio_pci.h"
diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c
index f058b2f8de8..76dc7d3a762 100644
--- a/drivers/virtio/virtio_ring.c
+++ b/drivers/virtio/virtio_ring.c
@@ -16,6 +16,7 @@
 #include <virtio_ring.h>
 #include <linux/bug.h>
 #include <linux/compat.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 int virtqueue_add(struct virtqueue *vq, struct virtio_sg *sgs[],
diff --git a/drivers/virtio/virtio_sandbox.c b/drivers/virtio/virtio_sandbox.c
index 1e5589f004c..8fb04b8b39e 100644
--- a/drivers/virtio/virtio_sandbox.c
+++ b/drivers/virtio/virtio_sandbox.c
@@ -14,6 +14,7 @@
 #include <linux/bug.h>
 #include <linux/compat.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 
 struct virtio_sandbox_priv {
diff --git a/drivers/w1-eeprom/ds2502.c b/drivers/w1-eeprom/ds2502.c
index 42a3560c237..167351055af 100644
--- a/drivers/w1-eeprom/ds2502.c
+++ b/drivers/w1-eeprom/ds2502.c
@@ -26,6 +26,7 @@
 #include <linux/err.h>
 #include <w1-eeprom.h>
 #include <w1.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #define DS2502_PAGE_SIZE	32
diff --git a/drivers/w1-eeprom/w1-eeprom-uclass.c b/drivers/w1-eeprom/w1-eeprom-uclass.c
index 8a63f614c58..07e1c12e5ce 100644
--- a/drivers/w1-eeprom/w1-eeprom-uclass.c
+++ b/drivers/w1-eeprom/w1-eeprom-uclass.c
@@ -16,6 +16,7 @@
 #include <stdio.h>
 #include <w1.h>
 #include <w1-eeprom.h>
+#include <linux/errno.h>
 
 #include <dm/device-internal.h>
 
diff --git a/drivers/w1/mxc_w1.c b/drivers/w1/mxc_w1.c
index 8e6372f0bed..92b18606c82 100644
--- a/drivers/w1/mxc_w1.c
+++ b/drivers/w1/mxc_w1.c
@@ -23,6 +23,7 @@
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <w1.h>
 
diff --git a/drivers/w1/w1-uclass.c b/drivers/w1/w1-uclass.c
index 61887bee1de..a40beaefd67 100644
--- a/drivers/w1/w1-uclass.c
+++ b/drivers/w1/w1-uclass.c
@@ -16,6 +16,7 @@
 #include <stdio.h>
 #include <w1.h>
 #include <w1-eeprom.h>
+#include <linux/errno.h>
 
 #include <dm/device-internal.h>
 
diff --git a/drivers/watchdog/armada-37xx-wdt.c b/drivers/watchdog/armada-37xx-wdt.c
index 7af680a5c25..b845e2b2e3d 100644
--- a/drivers/watchdog/armada-37xx-wdt.c
+++ b/drivers/watchdog/armada-37xx-wdt.c
@@ -13,6 +13,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
 #include <dm/device_compat.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/watchdog/at91sam9_wdt.c b/drivers/watchdog/at91sam9_wdt.c
index a5cbc4309cc..c116a011263 100644
--- a/drivers/watchdog/at91sam9_wdt.c
+++ b/drivers/watchdog/at91sam9_wdt.c
@@ -24,6 +24,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <wdt.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/watchdog/bcm6345_wdt.c b/drivers/watchdog/bcm6345_wdt.c
index ee77f49a944..5999561efd2 100644
--- a/drivers/watchdog/bcm6345_wdt.c
+++ b/drivers/watchdog/bcm6345_wdt.c
@@ -13,6 +13,7 @@
 #include <wdt.h>
 #include <clk.h>
 #include <asm/io.h>
+#include <linux/errno.h>
 
 /* WDT Value register */
 #define WDT_VAL_REG		0x0
diff --git a/drivers/watchdog/cortina_wdt.c b/drivers/watchdog/cortina_wdt.c
index 7ab9d7b2db9..0f60b3a6322 100644
--- a/drivers/watchdog/cortina_wdt.c
+++ b/drivers/watchdog/cortina_wdt.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <wdt.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #define CA_WDT_CTRL		0x00
 #define CA_WDT_PS		0x04
diff --git a/drivers/watchdog/designware_wdt.c b/drivers/watchdog/designware_wdt.c
index 12f09a7a392..b2d17f6e335 100644
--- a/drivers/watchdog/designware_wdt.c
+++ b/drivers/watchdog/designware_wdt.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <asm/utils.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #define DW_WDT_CR	0x00
 #define DW_WDT_TORR	0x04
diff --git a/drivers/watchdog/imx_watchdog.c b/drivers/watchdog/imx_watchdog.c
index b90c2daecee..e17d9217cc0 100644
--- a/drivers/watchdog/imx_watchdog.c
+++ b/drivers/watchdog/imx_watchdog.c
@@ -17,6 +17,7 @@
 #endif
 #include <fsl_wdog.h>
 #include <div64.h>
+#include <linux/errno.h>
 
 #define TIMEOUT_MAX	128000
 #define TIMEOUT_MIN	500
diff --git a/drivers/watchdog/mpc8xx_wdt.c b/drivers/watchdog/mpc8xx_wdt.c
index 3cb50ab091f..d2277356cc4 100644
--- a/drivers/watchdog/mpc8xx_wdt.c
+++ b/drivers/watchdog/mpc8xx_wdt.c
@@ -10,6 +10,7 @@
 #include <mpc8xx.h>
 #include <asm/cpm_8xx.h>
 #include <asm/io.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 void hw_watchdog_reset(void)
diff --git a/drivers/watchdog/mt7621_wdt.c b/drivers/watchdog/mt7621_wdt.c
index ff5c3243ce7..d033d95b6f5 100644
--- a/drivers/watchdog/mt7621_wdt.c
+++ b/drivers/watchdog/mt7621_wdt.c
@@ -14,6 +14,7 @@
 #include <wdt.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/watchdog/mtk_wdt.c b/drivers/watchdog/mtk_wdt.c
index a636cff354d..2a38bef43ec 100644
--- a/drivers/watchdog/mtk_wdt.c
+++ b/drivers/watchdog/mtk_wdt.c
@@ -12,6 +12,7 @@
 #include <wdt.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #define MTK_WDT_MODE			0x00
 #define MTK_WDT_LENGTH			0x04
diff --git a/drivers/watchdog/omap_wdt.c b/drivers/watchdog/omap_wdt.c
index 9059a4c6105..9d3896a5d99 100644
--- a/drivers/watchdog/omap_wdt.c
+++ b/drivers/watchdog/omap_wdt.c
@@ -46,6 +46,7 @@
 #include <wdt.h>
 #include <dm.h>
 #include <errno.h>
+#include <linux/errno.h>
 
 /* Hardware timeout in seconds */
 #define WDT_HW_TIMEOUT 60
diff --git a/drivers/watchdog/orion_wdt.c b/drivers/watchdog/orion_wdt.c
index 3284321299d..804a7681107 100644
--- a/drivers/watchdog/orion_wdt.c
+++ b/drivers/watchdog/orion_wdt.c
@@ -19,6 +19,7 @@
 #include <wdt.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/kernel.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
diff --git a/drivers/watchdog/stm32mp_wdt.c b/drivers/watchdog/stm32mp_wdt.c
index 89ce5588a37..c45dbdc9bdb 100644
--- a/drivers/watchdog/stm32mp_wdt.c
+++ b/drivers/watchdog/stm32mp_wdt.c
@@ -11,6 +11,7 @@
 #include <wdt.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/iopoll.h>
 #include <linux/printk.h>
 
diff --git a/drivers/watchdog/wdt-uclass.c b/drivers/watchdog/wdt-uclass.c
index 0ef303f1f2d..e2791a0dba0 100644
--- a/drivers/watchdog/wdt-uclass.c
+++ b/drivers/watchdog/wdt-uclass.c
@@ -14,6 +14,7 @@
 #include <asm/global_data.h>
 #include <dm/device-internal.h>
 #include <dm/lists.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/watchdog/xilinx_tb_wdt.c b/drivers/watchdog/xilinx_tb_wdt.c
index ea4311c8ce1..5047cd04561 100644
--- a/drivers/watchdog/xilinx_tb_wdt.c
+++ b/drivers/watchdog/xilinx_tb_wdt.c
@@ -13,6 +13,7 @@
 #include <log.h>
 #include <wdt.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 
 #define XWT_CSR0_WRS_MASK	0x00000008 /* Reset status Mask */
diff --git a/drivers/watchdog/xilinx_wwdt.c b/drivers/watchdog/xilinx_wwdt.c
index d8a585a4830..a486e032624 100644
--- a/drivers/watchdog/xilinx_wwdt.c
+++ b/drivers/watchdog/xilinx_wwdt.c
@@ -14,6 +14,7 @@
 #include <regmap.h>
 #include <wdt.h>
 #include <linux/compat.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 
 /* Refresh Register Masks */
diff --git a/env/common.c b/env/common.c
index 4df445eb2c4..b8ac49cf499 100644
--- a/env/common.c
+++ b/env/common.c
@@ -16,6 +16,7 @@
 #include <sort.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/stddef.h>
 #include <search.h>
diff --git a/env/env.c b/env/env.c
index c289af4c6a4..60c0295affb 100644
--- a/env/env.c
+++ b/env/env.c
@@ -12,6 +12,7 @@
 #include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/bug.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/env/ext4.c b/env/ext4.c
index a51c7c6eff3..59ed02c0ca1 100644
--- a/env/ext4.c
+++ b/env/ext4.c
@@ -21,6 +21,7 @@
 #include <common.h>
 #include <part.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include <command.h>
diff --git a/env/fat.c b/env/fat.c
index e95af7e19d3..c4c09fee02b 100644
--- a/env/fat.c
+++ b/env/fat.c
@@ -19,6 +19,7 @@
 #include <mmc.h>
 #include <stdio.h>
 #include <asm/cache.h>
+#include <linux/errno.h>
 #include <linux/stddef.h>
 #include <linux/string.h>
 
diff --git a/env/mmc.c b/env/mmc.c
index 6b1a795f434..361197916f7 100644
--- a/env/mmc.c
+++ b/env/mmc.c
@@ -9,6 +9,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include <command.h>
diff --git a/env/nand.c b/env/nand.c
index e8d226ee715..730baf0095c 100644
--- a/env/nand.c
+++ b/env/nand.c
@@ -19,6 +19,7 @@
 #include <env_internal.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/stddef.h>
 #include <malloc.h>
 #include <memalign.h>
diff --git a/env/remote.c b/env/remote.c
index 131ac83584f..0d026176794 100644
--- a/env/remote.c
+++ b/env/remote.c
@@ -10,6 +10,7 @@
 #include <env_internal.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/stddef.h>
 #include <u-boot/crc.h>
 
diff --git a/env/sata.c b/env/sata.c
index d88771b27e2..56109397d53 100644
--- a/env/sata.c
+++ b/env/sata.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <stdio.h>
+#include <linux/errno.h>
 
 #include <command.h>
 #include <env.h>
diff --git a/env/sf.c b/env/sf.c
index 077d82f8e77..4bf67dcc8a9 100644
--- a/env/sf.c
+++ b/env/sf.c
@@ -23,6 +23,7 @@
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <dm/device-internal.h>
+#include <linux/errno.h>
 #include <u-boot/crc.h>
 
 #ifndef CONFIG_SPL_BUILD
diff --git a/env/ubi.c b/env/ubi.c
index 12495776609..da691f470c8 100644
--- a/env/ubi.c
+++ b/env/ubi.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include <command.h>
diff --git a/fs/btrfs/btrfs.c b/fs/btrfs/btrfs.c
index de16217d0dd..9b9f9b5ffa3 100644
--- a/fs/btrfs/btrfs.c
+++ b/fs/btrfs/btrfs.c
@@ -9,6 +9,7 @@
 #include <config.h>
 #include <malloc.h>
 #include <uuid.h>
+#include <linux/errno.h>
 #include <linux/time.h>
 
 struct btrfs_info btrfs_info;
diff --git a/fs/cbfs/cbfs.c b/fs/cbfs/cbfs.c
index 51a59030f60..1b27320a760 100644
--- a/fs/cbfs/cbfs.c
+++ b/fs/cbfs/cbfs.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <asm/byteorder.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 /* Offset of master header from the start of a coreboot ROM */
diff --git a/fs/ext4/ext4_common.c b/fs/ext4/ext4_common.c
index a6fbd5a971d..c3ca193a190 100644
--- a/fs/ext4/ext4_common.c
+++ b/fs/ext4/ext4_common.c
@@ -28,6 +28,7 @@
 #include <part.h>
 #include <stddef.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <linux/stat.h>
 #include <linux/string.h>
 #include <linux/time.h>
diff --git a/fs/ext4/ext4_journal.c b/fs/ext4/ext4_journal.c
index 9f1eb6ad9d1..ad967d39f95 100644
--- a/fs/ext4/ext4_journal.c
+++ b/fs/ext4/ext4_journal.c
@@ -21,6 +21,7 @@
 #include <ext_common.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include "ext4_common.h"
 
diff --git a/fs/ext4/ext4_write.c b/fs/ext4/ext4_write.c
index 22bb845f8bf..a38e0edd6a7 100644
--- a/fs/ext4/ext4_write.c
+++ b/fs/ext4/ext4_write.c
@@ -28,6 +28,7 @@
 #include <memalign.h>
 #include <part.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <linux/stat.h>
 #include <div64.h>
 #include <linux/string.h>
diff --git a/fs/ext4/ext4fs.c b/fs/ext4/ext4fs.c
index c004d5facbb..8143079b8b0 100644
--- a/fs/ext4/ext4fs.c
+++ b/fs/ext4/ext4fs.c
@@ -29,6 +29,7 @@
 #include <part.h>
 #include <stdio.h>
 #include <uuid.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include "ext4_common.h"
 
diff --git a/fs/fat/fat.c b/fs/fat/fat.c
index 28ac59c2d73..6b8cf4ff02c 100644
--- a/fs/fat/fat.c
+++ b/fs/fat/fat.c
@@ -23,6 +23,7 @@
 #include <asm/cache.h>
 #include <linux/compiler.h>
 #include <linux/ctype.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 /*
diff --git a/fs/fat/fat_write.c b/fs/fat/fat_write.c
index bdc604038ad..42ddb285789 100644
--- a/fs/fat/fat_write.c
+++ b/fs/fat/fat_write.c
@@ -17,6 +17,7 @@
 #include <asm/cache.h>
 #include <linux/ctype.h>
 #include <div64.h>
+#include <linux/errno.h>
 #include <linux/math64.h>
 #include <linux/string.h>
 #include "fat.c"
diff --git a/fs/fs.c b/fs/fs.c
index 207420b0ab4..092e1725050 100644
--- a/fs/fs.c
+++ b/fs/fs.c
@@ -25,6 +25,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <div64.h>
+#include <linux/errno.h>
 #include <linux/math64.h>
 #include <efi_loader.h>
 #include <linux/string.h>
diff --git a/fs/ubifs/debug.c b/fs/ubifs/debug.c
index 77178e0e28a..07196c52e4f 100644
--- a/fs/ubifs/debug.c
+++ b/fs/ubifs/debug.c
@@ -20,6 +20,7 @@
 #include <time.h>
 #include <vsprintf.h>
 #include <dm/devres.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/fs/ubifs/io.c b/fs/ubifs/io.c
index 57e0847464c..4ef1381fc7d 100644
--- a/fs/ubifs/io.c
+++ b/fs/ubifs/io.c
@@ -68,6 +68,7 @@
 #else
 #include <linux/compat.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #endif
 #include "ubifs.h"
diff --git a/fs/ubifs/log.c b/fs/ubifs/log.c
index 0c8671a8847..6e43a9c62b4 100644
--- a/fs/ubifs/log.c
+++ b/fs/ubifs/log.c
@@ -19,6 +19,7 @@
 #include <log.h>
 #include <dm/devres.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #endif
 #include "ubifs.h"
diff --git a/fs/ubifs/lprops.c b/fs/ubifs/lprops.c
index 83e6b2d5df2..b5ddde857c3 100644
--- a/fs/ubifs/lprops.c
+++ b/fs/ubifs/lprops.c
@@ -20,6 +20,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #endif
 #include "ubifs.h"
diff --git a/fs/ubifs/lpt_commit.c b/fs/ubifs/lpt_commit.c
index 583f113902e..7c5f5d9a246 100644
--- a/fs/ubifs/lpt_commit.c
+++ b/fs/ubifs/lpt_commit.c
@@ -23,6 +23,7 @@
 #include <linux/bitops.h>
 #include <linux/compat.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include "crc16.h"
diff --git a/fs/ubifs/orphan.c b/fs/ubifs/orphan.c
index 6aa2890ff05..1d7b8b6a181 100644
--- a/fs/ubifs/orphan.c
+++ b/fs/ubifs/orphan.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <dm/devres.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include "ubifs.h"
 
 /*
diff --git a/fs/ubifs/recovery.c b/fs/ubifs/recovery.c
index cf2b8a48b8a..8d342766221 100644
--- a/fs/ubifs/recovery.c
+++ b/fs/ubifs/recovery.c
@@ -43,6 +43,7 @@
 #include <u-boot/crc.h>
 #else
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #endif
 #include "ubifs.h"
diff --git a/fs/ubifs/replay.c b/fs/ubifs/replay.c
index 0862fe4ebf3..248a8065925 100644
--- a/fs/ubifs/replay.c
+++ b/fs/ubifs/replay.c
@@ -25,6 +25,7 @@
 #include <dm/devres.h>
 #include <linux/compat.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #endif
 #include "ubifs.h"
diff --git a/fs/ubifs/scan.c b/fs/ubifs/scan.c
index 7a6e46df5d9..9332a61ff34 100644
--- a/fs/ubifs/scan.c
+++ b/fs/ubifs/scan.c
@@ -20,6 +20,7 @@
 #include <log.h>
 #include <dm/devres.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #endif
 #include "ubifs.h"
 
diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c
index 62b03731f8d..8f219ba8533 100644
--- a/fs/ubifs/super.c
+++ b/fs/ubifs/super.c
@@ -36,6 +36,7 @@
 #include <vsprintf.h>
 #include <linux/bitops.h>
 #include <linux/bug.h>
+#include <linux/errno.h>
 #include <linux/log2.h>
 #include <linux/printk.h>
 #include <linux/stat.h>
diff --git a/fs/ubifs/tnc.c b/fs/ubifs/tnc.c
index c8aef71d86a..72bcd422746 100644
--- a/fs/ubifs/tnc.c
+++ b/fs/ubifs/tnc.c
@@ -29,6 +29,7 @@
 #include <linux/bug.h>
 #include <linux/compat.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/stat.h>
 #include <linux/string.h>
 #endif
diff --git a/fs/ubifs/tnc_misc.c b/fs/ubifs/tnc_misc.c
index e4cd785b9f5..659ff2e2ce2 100644
--- a/fs/ubifs/tnc_misc.c
+++ b/fs/ubifs/tnc_misc.c
@@ -19,6 +19,7 @@
 #include <log.h>
 #include <dm/devres.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #endif
 #include "ubifs.h"
 
diff --git a/fs/ubifs/ubifs.c b/fs/ubifs/ubifs.c
index ab48f10310c..e76839e098d 100644
--- a/fs/ubifs/ubifs.c
+++ b/fs/ubifs/ubifs.c
@@ -20,6 +20,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include "ubifs.h"
 #include <part.h>
diff --git a/fs/yaffs2/yaffs_uboot_glue.c b/fs/yaffs2/yaffs_uboot_glue.c
index a3ff0044788..62f034552e5 100644
--- a/fs/yaffs2/yaffs_uboot_glue.c
+++ b/fs/yaffs2/yaffs_uboot_glue.c
@@ -24,6 +24,7 @@
 #include <malloc.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/fs/yaffs2/yaffsfs.c b/fs/yaffs2/yaffsfs.c
index 5bf9350c822..8f43d3ac085 100644
--- a/fs/yaffs2/yaffsfs.c
+++ b/fs/yaffs2/yaffsfs.c
@@ -13,6 +13,7 @@
 
 #include <div64.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include "yaffsfs.h"
 #include "yaffs_guts.h"
diff --git a/fs/yaffs2/yportenv.h b/fs/yaffs2/yportenv.h
index 081391a1d0f..607b7cc31cf 100644
--- a/fs/yaffs2/yportenv.h
+++ b/fs/yaffs2/yportenv.h
@@ -18,6 +18,7 @@
 #define __YPORTENV_H__
 
 #include <linux/bug.h>
+#include <linux/errno.h>
 #include <linux/types.h>
 
 /* Definition of types */
diff --git a/include/acpi/acpi_s3.h b/include/acpi/acpi_s3.h
index baa848dcd15..1dc568117bd 100644
--- a/include/acpi/acpi_s3.h
+++ b/include/acpi/acpi_s3.h
@@ -6,6 +6,7 @@
 #ifndef __ASM_ACPI_S3_H__
 #define __ASM_ACPI_S3_H__
 
+#include <linux/errno.h>
 #define WAKEUP_BASE	0x600
 
 /* PM1_STATUS register */
diff --git a/include/board.h b/include/board.h
index a43f35a021b..755a888e338 100644
--- a/include/board.h
+++ b/include/board.h
@@ -4,6 +4,7 @@
  * Mario Six,  Guntermann & Drunck GmbH, mario.six at gdsys.cc
  */
 
+#include <linux/errno.h>
 struct udevice;
 
 /*
diff --git a/include/common.h b/include/common.h
index 2b7a422fbe1..4fa613216ef 100644
--- a/include/common.h
+++ b/include/common.h
@@ -14,7 +14,6 @@
 
 #ifndef __ASSEMBLY__		/* put C only stuff in this section */
 #include <config.h>
-#include <errno.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
 #endif	/* __ASSEMBLY__ */
diff --git a/include/dfu.h b/include/dfu.h
index 436057e378e..475b2a254d6 100644
--- a/include/dfu.h
+++ b/include/dfu.h
@@ -12,6 +12,7 @@
 
 #include <common.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <linux/list.h>
 #include <mmc.h>
 #include <spi_flash.h>
diff --git a/include/dm/pinctrl.h b/include/dm/pinctrl.h
index 692e5fc8cbf..f879901279d 100644
--- a/include/dm/pinctrl.h
+++ b/include/dm/pinctrl.h
@@ -6,6 +6,7 @@
 #ifndef __PINCTRL_H
 #define __PINCTRL_H
 
+#include <linux/errno.h>
 #define PINNAME_SIZE	10
 #define PINMUX_SIZE	40
 
diff --git a/include/dwc3-uboot.h b/include/dwc3-uboot.h
index e08530ec4e5..6c583e5e7b6 100644
--- a/include/dwc3-uboot.h
+++ b/include/dwc3-uboot.h
@@ -10,6 +10,7 @@
 #define __DWC3_UBOOT_H_
 
 #include <generic-phy.h>
+#include <linux/errno.h>
 #include <linux/usb/otg.h>
 #include <linux/usb/phy.h>
 
diff --git a/include/eeprom.h b/include/eeprom.h
index 6820844cea3..06f2a471657 100644
--- a/include/eeprom.h
+++ b/include/eeprom.h
@@ -25,4 +25,5 @@ int eeprom_write(uint dev_addr, uint offset, uchar *buffer, uint cnt);
 # define CONFIG_SYS_DEF_EEPROM_ADDR CONFIG_SYS_I2C_EEPROM_ADDR
 #endif
 
+#include <linux/errno.h>
 #endif
diff --git a/include/hwspinlock.h b/include/hwspinlock.h
index 99389c13c24..88a2868b70e 100644
--- a/include/hwspinlock.h
+++ b/include/hwspinlock.h
@@ -12,6 +12,7 @@
  * critical sections and synchronisation between multiprocessors.
  */
 
+#include <linux/errno.h>
 struct udevice;
 
 /**
diff --git a/include/linux/soc/ti/ti_sci_protocol.h b/include/linux/soc/ti/ti_sci_protocol.h
index eb916ba1019..0d02ca82aef 100644
--- a/include/linux/soc/ti/ti_sci_protocol.h
+++ b/include/linux/soc/ti/ti_sci_protocol.h
@@ -21,6 +21,7 @@
  * @firmware_description: Firmware description (not usually used).
  */
 #include <linux/bitops.h>
+#include <linux/errno.h>
 struct ti_sci_version_info {
 	u8 abi_major;
 	u8 abi_minor;
diff --git a/include/mipi_dsi.h b/include/mipi_dsi.h
index c8a7d3daefa..33eae9fb6d0 100644
--- a/include/mipi_dsi.h
+++ b/include/mipi_dsi.h
@@ -17,6 +17,7 @@
 
 #include <mipi_display.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 struct mipi_dsi_host;
 struct mipi_dsi_device;
diff --git a/include/power-domain.h b/include/power-domain.h
index 72ff2ff25ba..12945f07854 100644
--- a/include/power-domain.h
+++ b/include/power-domain.h
@@ -42,6 +42,7 @@
  * by which power domains are managed.
  */
 
+#include <linux/errno.h>
 struct udevice;
 
 /**
diff --git a/include/power/sandbox_pmic.h b/include/power/sandbox_pmic.h
index 1dbd15b5235..25cb95db84f 100644
--- a/include/power/sandbox_pmic.h
+++ b/include/power/sandbox_pmic.h
@@ -7,6 +7,7 @@
 #ifndef _SANDBOX_PMIC_H_
 #define  _SANDBOX_PMIC_H_
 
+#include <linux/errno.h>
 #define SANDBOX_LDO_DRIVER		"sandbox_ldo"
 #define SANDBOX_OF_LDO_PREFIX		"ldo"
 #define SANDBOX_BUCK_DRIVER		"sandbox_buck"
diff --git a/include/regmap.h b/include/regmap.h
index bae96a6ef0b..5a3f3dce02c 100644
--- a/include/regmap.h
+++ b/include/regmap.h
@@ -9,6 +9,7 @@
 
 #include <time.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 /**
  * DOC: Overview
diff --git a/include/remoteproc.h b/include/remoteproc.h
index a903acb9b24..92de5604a80 100644
--- a/include/remoteproc.h
+++ b/include/remoteproc.h
@@ -14,6 +14,7 @@
  * platforms have moved to dm/fdt.
  */
 #include <dm/platdata.h>	/* For platform data support - non dt world */
+#include <linux/errno.h>
 
 /**
  * enum rproc_mem_type - What type of memory model does the rproc use
diff --git a/include/soc.h b/include/soc.h
index a52a300a84a..eda52d78cdf 100644
--- a/include/soc.h
+++ b/include/soc.h
@@ -7,6 +7,7 @@
 #ifndef __SOC_H
 #define __SOC_H
 
+#include <linux/errno.h>
 #define SOC_MAX_STR_SIZE	128
 
 struct udevice;
diff --git a/include/spi-mem.h b/include/spi-mem.h
index 893f7bd7337..da495777bba 100644
--- a/include/spi-mem.h
+++ b/include/spi-mem.h
@@ -15,6 +15,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <spi.h>
+#include <linux/errno.h>
 
 #define SPI_MEM_OP_CMD(__opcode, __buswidth)			\
 	{							\
diff --git a/include/spi_flash.h b/include/spi_flash.h
index 35af2cf5707..8cab4f27088 100644
--- a/include/spi_flash.h
+++ b/include/spi_flash.h
@@ -11,6 +11,7 @@
 
 #include <dm.h>	/* Because we dereference struct udevice here */
 #include <stdio.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/types.h>
 #include <linux/mtd/spi-nor.h>
diff --git a/include/splash.h b/include/splash.h
index 7fd2de8fea1..8b70e4a8068 100644
--- a/include/splash.h
+++ b/include/splash.h
@@ -23,6 +23,7 @@
 #define _SPLASH_H_
 
 #include <errno.h>
+#include <linux/errno.h>
 
 enum splash_storage {
 	SPLASH_STORAGE_NAND,
diff --git a/include/tlv_eeprom.h b/include/tlv_eeprom.h
index f7e130296a7..99cefa61dfa 100644
--- a/include/tlv_eeprom.h
+++ b/include/tlv_eeprom.h
@@ -8,6 +8,7 @@
 #define __TLV_EEPROM_H_
 
 #include <compiler.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 /*
diff --git a/include/u-boot/aes.h b/include/u-boot/aes.h
index 32281041de2..ee686394509 100644
--- a/include/u-boot/aes.h
+++ b/include/u-boot/aes.h
@@ -8,6 +8,7 @@
 
 #include <errno.h>
 #include <image.h>
+#include <linux/errno.h>
 
 #if IMAGE_ENABLE_ENCRYPT
 int image_aes_encrypt(struct image_cipher_info *info,
diff --git a/include/u-boot/rsa.h b/include/u-boot/rsa.h
index bed1c097c2c..6d5f50a0030 100644
--- a/include/u-boot/rsa.h
+++ b/include/u-boot/rsa.h
@@ -13,6 +13,7 @@
 
 #include <errno.h>
 #include <image.h>
+#include <linux/errno.h>
 
 /**
  * struct rsa_public_key - holder for a public key
diff --git a/lib/acpi/acpi_device.c b/lib/acpi/acpi_device.c
index f891f3ade90..9e31a69c20f 100644
--- a/lib/acpi/acpi_device.c
+++ b/lib/acpi/acpi_device.c
@@ -17,6 +17,7 @@
 #include <acpi/acpigen.h>
 #include <asm-generic/gpio.h>
 #include <dm/acpi.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 /**
diff --git a/lib/acpi/acpi_dp.c b/lib/acpi/acpi_dp.c
index 194e79d7d03..87e7bc4313b 100644
--- a/lib/acpi/acpi_dp.c
+++ b/lib/acpi/acpi_dp.c
@@ -14,6 +14,7 @@
 #include <acpi/acpigen.h>
 #include <acpi/acpi_dp.h>
 #include <dm/acpi.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 static void acpi_dp_write_array(struct acpi_ctx *ctx,
diff --git a/lib/acpi/acpi_table.c b/lib/acpi/acpi_table.c
index d6abb6068a6..0f6cb8728cd 100644
--- a/lib/acpi/acpi_table.c
+++ b/lib/acpi/acpi_table.c
@@ -15,6 +15,7 @@
 #include <acpi/acpi_table.h>
 #include <asm/global_data.h>
 #include <dm/acpi.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 int acpi_create_dmar(struct acpi_dmar *dmar, enum dmar_flags flags)
diff --git a/lib/acpi/acpigen.c b/lib/acpi/acpigen.c
index 0906b1d3030..f119de2bca6 100644
--- a/lib/acpi/acpigen.c
+++ b/lib/acpi/acpigen.c
@@ -16,6 +16,7 @@
 #include <acpi/acpi_device.h>
 #include <acpi/acpi_table.h>
 #include <dm/acpi.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 u8 *acpigen_get_current(struct acpi_ctx *ctx)
diff --git a/lib/aes/aes-decrypt.c b/lib/aes/aes-decrypt.c
index 09fdf38df63..3b01d1c8cbb 100644
--- a/lib/aes/aes-decrypt.c
+++ b/lib/aes/aes-decrypt.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <malloc.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #endif
 #include <image.h>
diff --git a/lib/bch.c b/lib/bch.c
index 7f82cef242b..578f4191309 100644
--- a/lib/bch.c
+++ b/lib/bch.c
@@ -59,6 +59,7 @@
 #include <malloc.h>
 #include <ubi_uboot.h>
 #include <dm/devres.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include <linux/bitops.h>
diff --git a/lib/binman.c b/lib/binman.c
index 7a8ad62c4a8..f6c2d0a6432 100644
--- a/lib/binman.c
+++ b/lib/binman.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <mapmem.h>
+#include <linux/errno.h>
 
 /**
  * struct binman_info - Information needed by the binman library
diff --git a/lib/crypto/asymmetric_type.c b/lib/crypto/asymmetric_type.c
index 24c2d15ef97..46d0dd468e5 100644
--- a/lib/crypto/asymmetric_type.c
+++ b/lib/crypto/asymmetric_type.c
@@ -18,6 +18,7 @@
 #include <linux/compat.h>
 #include <linux/ctype.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #else
diff --git a/lib/crypto/pkcs7_parser.c b/lib/crypto/pkcs7_parser.c
index d5efa828d6a..3cb13fae86d 100644
--- a/lib/crypto/pkcs7_parser.c
+++ b/lib/crypto/pkcs7_parser.c
@@ -11,6 +11,7 @@
 #include <dm/devres.h>
 #include <linux/bitops.h>
 #include <linux/compat.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #endif
 #include <linux/kernel.h>
diff --git a/lib/crypto/pkcs7_verify.c b/lib/crypto/pkcs7_verify.c
index 5ca268ee00c..2d9113fd2e0 100644
--- a/lib/crypto/pkcs7_verify.c
+++ b/lib/crypto/pkcs7_verify.c
@@ -15,6 +15,7 @@
 #include <linux/bitops.h>
 #include <linux/compat.h>
 #include <linux/asn1.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include <u-boot/rsa-checksum.h>
diff --git a/lib/crypto/public_key.c b/lib/crypto/public_key.c
index 839f867050a..4b64adbe352 100644
--- a/lib/crypto/public_key.c
+++ b/lib/crypto/public_key.c
@@ -14,6 +14,7 @@
 #include <linux/bug.h>
 #include <linux/compat.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #else
diff --git a/lib/crypto/rsa_helper.c b/lib/crypto/rsa_helper.c
index c941d40fd7a..acea8b26213 100644
--- a/lib/crypto/rsa_helper.c
+++ b/lib/crypto/rsa_helper.c
@@ -15,6 +15,7 @@
 #include <linux/fips.h>
 #endif
 #include <crypto/internal/rsa.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include "rsapubkey.asn1.h"
 #ifndef __UBOOT__
diff --git a/lib/crypto/x509_cert_parser.c b/lib/crypto/x509_cert_parser.c
index a0f0689118f..909190c8af8 100644
--- a/lib/crypto/x509_cert_parser.c
+++ b/lib/crypto/x509_cert_parser.c
@@ -8,6 +8,7 @@
 #define pr_fmt(fmt) "X.509: "fmt
 #include <log.h>
 #include <dm/devres.h>
+#include <linux/errno.h>
 #include <linux/kernel.h>
 #ifndef __UBOOT__
 #include <linux/export.h>
diff --git a/lib/efi/efi_app.c b/lib/efi/efi_app.c
index c1796f83a59..046ca411e42 100644
--- a/lib/efi/efi_app.c
+++ b/lib/efi/efi_app.c
@@ -18,6 +18,7 @@
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/types.h>
 #include <efi.h>
diff --git a/lib/efi/efi_info.c b/lib/efi/efi_info.c
index 4d78923c4d4..6ba042f6894 100644
--- a/lib/efi/efi_info.c
+++ b/lib/efi/efi_info.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <mapmem.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 
 int efi_info_get(enum efi_entry_t type, void **datap, int *sizep)
 {
diff --git a/lib/efi/efi_stub.c b/lib/efi/efi_stub.c
index 97a709904df..ef8b80a4625 100644
--- a/lib/efi/efi_stub.c
+++ b/lib/efi/efi_stub.c
@@ -20,6 +20,7 @@
 #include <asm/cpu.h>
 #include <asm/io.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/types.h>
 
diff --git a/lib/efi_driver/efi_block_device.c b/lib/efi_driver/efi_block_device.c
index 5efd63ec93d..54f83eee596 100644
--- a/lib/efi_driver/efi_block_device.c
+++ b/lib/efi_driver/efi_block_device.c
@@ -35,6 +35,7 @@
 #include <vsprintf.h>
 #include <dm/device-internal.h>
 #include <dm/root.h>
+#include <linux/errno.h>
 
 /*
  * EFI attributes of the udevice handled by this driver.
diff --git a/lib/efi_loader/efi_variable_tee.c b/lib/efi_loader/efi_variable_tee.c
index df34bc5974d..9f0dbcd79e7 100644
--- a/lib/efi_loader/efi_variable_tee.c
+++ b/lib/efi_loader/efi_variable_tee.c
@@ -14,6 +14,7 @@
 #include <tee.h>
 #include <malloc.h>
 #include <mm_communication.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 static efi_uintn_t max_buffer_size;	/* comm + var + func + data */
diff --git a/lib/errno_str.c b/lib/errno_str.c
index 2e5f4a887d5..d342ed70b60 100644
--- a/lib/errno_str.c
+++ b/lib/errno_str.c
@@ -6,6 +6,7 @@
  */
 #include <common.h>
 #include <errno.h>
+#include <linux/errno.h>
 
 #define ERRNO_MSG(errno, msg)	msg
 #define SAME_AS(x)		(const char *)&errno_message[x]
diff --git a/lib/fdtdec.c b/lib/fdtdec.c
index faf7be634f3..3ac889ba730 100644
--- a/lib/fdtdec.c
+++ b/lib/fdtdec.c
@@ -23,6 +23,7 @@
 #include <fdt_support.h>
 #include <gzip.h>
 #include <mapmem.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <serial.h>
 #include <asm/global_data.h>
diff --git a/lib/hashtable.c b/lib/hashtable.c
index f3f99bf1dfc..c5581800d65 100644
--- a/lib/hashtable.c
+++ b/lib/hashtable.c
@@ -17,6 +17,7 @@
 #include <malloc.h>
 #include <sort.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #ifdef USE_HOSTCC		/* HOST build */
diff --git a/lib/list_sort.c b/lib/list_sort.c
index 44d85ff43fe..0c060528504 100644
--- a/lib/list_sort.c
+++ b/lib/list_sort.c
@@ -8,6 +8,7 @@
 #include <linux/compat.h>
 #include <common.h>
 #include <malloc.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #endif
diff --git a/lib/lz4_wrapper.c b/lib/lz4_wrapper.c
index edce13da6bd..c5ebe962461 100644
--- a/lib/lz4_wrapper.c
+++ b/lib/lz4_wrapper.c
@@ -7,6 +7,7 @@
 #include <compiler.h>
 #include <image.h>
 #include <lz4.h>
+#include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/types.h>
diff --git a/lib/membuff.c b/lib/membuff.c
index b0fc716a04b..6abac4114f9 100644
--- a/lib/membuff.c
+++ b/lib/membuff.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <log.h>
 #include <malloc.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include "membuff.h"
 
diff --git a/lib/of_live.c b/lib/of_live.c
index c27a7a6e24f..fd83a6ba420 100644
--- a/lib/of_live.c
+++ b/lib/of_live.c
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <of_live.h>
 #include <malloc.h>
diff --git a/lib/optee/optee.c b/lib/optee/optee.c
index c902eee3bc4..8493ca6c621 100644
--- a/lib/optee/optee.c
+++ b/lib/optee/optee.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <linux/string.h>
 #include <tee/optee.h>
diff --git a/lib/rsa/rsa-keyprop.c b/lib/rsa/rsa-keyprop.c
index 4114e33d36e..e5ece615245 100644
--- a/lib/rsa/rsa-keyprop.c
+++ b/lib/rsa/rsa-keyprop.c
@@ -14,6 +14,7 @@
 #include <malloc.h>
 #include <asm/byteorder.h>
 #include <crypto/internal/rsa.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <u-boot/rsa-mod-exp.h>
 
diff --git a/lib/strto.c b/lib/strto.c
index e6f69b31e47..9636c797ea5 100644
--- a/lib/strto.c
+++ b/lib/strto.c
@@ -13,6 +13,7 @@
 #include <errno.h>
 #include <vsprintf.h>
 #include <linux/ctype.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 /* from lib/kstrtox.c */
diff --git a/lib/trace.c b/lib/trace.c
index 37f53dad235..8ab4258b35a 100644
--- a/lib/trace.c
+++ b/lib/trace.c
@@ -12,6 +12,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/sections.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/lib/uuid.c b/lib/uuid.c
index 91f99bcb5ff..3a6cd7e87fd 100644
--- a/lib/uuid.c
+++ b/lib/uuid.c
@@ -17,6 +17,7 @@
 #include <asm/io.h>
 #include <part_efi.h>
 #include <malloc.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 /*
diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index 18d4bc5a27b..7be3127c2a1 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -24,6 +24,7 @@
 #include <vsprintf.h>
 #include <linux/ctype.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/types.h>
 #include <linux/string.h>
 
diff --git a/net/eth-uclass.c b/net/eth-uclass.c
index 9af7971fc49..a20b896170c 100644
--- a/net/eth-uclass.c
+++ b/net/eth-uclass.c
@@ -16,6 +16,7 @@
 #include <asm/global_data.h>
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <net/pcap.h>
 #include "eth_internal.h"
diff --git a/net/mdio-mux-uclass.c b/net/mdio-mux-uclass.c
index 6674eb6bee7..1325484e0d9 100644
--- a/net/mdio-mux-uclass.c
+++ b/net/mdio-mux-uclass.c
@@ -11,6 +11,7 @@
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
 #include <dm/lists.h>
+#include <linux/errno.h>
 
 #define MDIO_MUX_CHILD_DRV_NAME	"mdio-mux-bus-drv"
 
diff --git a/net/mdio-uclass.c b/net/mdio-uclass.c
index 1c9ce801dc8..3e39a9b74f8 100644
--- a/net/mdio-uclass.c
+++ b/net/mdio-uclass.c
@@ -13,6 +13,7 @@
 #include <dm/device_compat.h>
 #include <dm/uclass-internal.h>
 #include <linux/compat.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 /* DT node properties for MAC-PHY interface */
diff --git a/net/net.c b/net/net.c
index 3ead48c768f..8fb5c25c00d 100644
--- a/net/net.c
+++ b/net/net.c
@@ -100,6 +100,7 @@
 #include <stdio.h>
 #include <time.h>
 #include <vsprintf.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <net/fastboot.h>
 #include <net/tftp.h>
diff --git a/net/pcap.c b/net/pcap.c
index 31cfc1ca848..907aa1cda09 100644
--- a/net/pcap.c
+++ b/net/pcap.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <net.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <net/pcap.h>
 #include <time.h>
diff --git a/test/bloblist.c b/test/bloblist.c
index b93e2713dfd..19b8f65b81b 100644
--- a/test/bloblist.c
+++ b/test/bloblist.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <mapmem.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <test/suites.h>
 #include <test/test.h>
 #include <test/ut.h>
diff --git a/test/dm/acpi.c b/test/dm/acpi.c
index b6988f26739..6890c51859d 100644
--- a/test/dm/acpi.c
+++ b/test/dm/acpi.c
@@ -20,6 +20,7 @@
 #include <asm/global_data.h>
 #include <dm/acpi.h>
 #include <dm/test.h>
+#include <linux/errno.h>
 #include <test/ut.h>
 #include "acpi.h"
 
diff --git a/test/dm/acpi_dp.c b/test/dm/acpi_dp.c
index 93604b87e18..8f4ec5fccb2 100644
--- a/test/dm/acpi_dp.c
+++ b/test/dm/acpi_dp.c
@@ -14,6 +14,7 @@
 #include <asm/unaligned.h>
 #include <dm/acpi.h>
 #include <dm/test.h>
+#include <linux/errno.h>
 #include <test/ut.h>
 #include "acpi.h"
 
diff --git a/test/dm/acpigen.c b/test/dm/acpigen.c
index 14a758d08a3..094af174526 100644
--- a/test/dm/acpigen.c
+++ b/test/dm/acpigen.c
@@ -18,6 +18,7 @@
 #include <dm/acpi.h>
 #include <dm/test.h>
 #include <dm/uclass-internal.h>
+#include <linux/errno.h>
 #include <test/ut.h>
 #include "acpi.h"
 
diff --git a/test/dm/adc.c b/test/dm/adc.c
index da7bd4bf1f9..2b9dd4d8a13 100644
--- a/test/dm/adc.c
+++ b/test/dm/adc.c
@@ -14,6 +14,7 @@
 #include <dm/test.h>
 #include <errno.h>
 #include <fdtdec.h>
+#include <linux/errno.h>
 #include <power/regulator.h>
 #include <power/sandbox_pmic.h>
 #include <sandbox-adc.h>
diff --git a/test/dm/blk.c b/test/dm/blk.c
index ffc0fcd1491..57dc666b8b6 100644
--- a/test/dm/blk.c
+++ b/test/dm/blk.c
@@ -11,6 +11,7 @@
 #include <asm/global_data.h>
 #include <asm/state.h>
 #include <dm/test.h>
+#include <linux/errno.h>
 #include <test/ut.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/test/dm/bus.c b/test/dm/bus.c
index 24c2b09d81c..ba9cd6a71fc 100644
--- a/test/dm/bus.c
+++ b/test/dm/bus.c
@@ -15,6 +15,7 @@
 #include <dm/test.h>
 #include <dm/uclass-internal.h>
 #include <dm/util.h>
+#include <linux/errno.h>
 #include <test/ut.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/test/dm/button.c b/test/dm/button.c
index 890f470d97a..68baed50a4f 100644
--- a/test/dm/button.c
+++ b/test/dm/button.c
@@ -10,6 +10,7 @@
 #include <button.h>
 #include <asm/gpio.h>
 #include <dm/test.h>
+#include <linux/errno.h>
 #include <test/ut.h>
 
 /* Base test of the button uclass */
diff --git a/test/dm/core.c b/test/dm/core.c
index 194dc130a16..c357e56efea 100644
--- a/test/dm/core.c
+++ b/test/dm/core.c
@@ -18,6 +18,7 @@
 #include <dm/util.h>
 #include <dm/test.h>
 #include <dm/uclass-internal.h>
+#include <linux/errno.h>
 #include <test/ut.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/test/dm/eth.c b/test/dm/eth.c
index b58c9640a27..5e24b87fca3 100644
--- a/test/dm/eth.c
+++ b/test/dm/eth.c
@@ -17,6 +17,7 @@
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
 #include <asm/eth.h>
+#include <linux/errno.h>
 #include <test/ut.h>
 
 #define DM_TEST_ETH_NUM		4
diff --git a/test/dm/gpio.c b/test/dm/gpio.c
index b7ee8fc3cae..4bcd91a03a6 100644
--- a/test/dm/gpio.c
+++ b/test/dm/gpio.c
@@ -13,6 +13,7 @@
 #include <dm/test.h>
 #include <dm/util.h>
 #include <asm/gpio.h>
+#include <linux/errno.h>
 #include <test/ut.h>
 
 /* Test that sandbox GPIOs work correctly */
diff --git a/test/dm/i2c.c b/test/dm/i2c.c
index 2025c4216d0..fc54c7323c3 100644
--- a/test/dm/i2c.c
+++ b/test/dm/i2c.c
@@ -16,6 +16,7 @@
 #include <dm/uclass-internal.h>
 #include <dm/util.h>
 #include <hexdump.h>
+#include <linux/errno.h>
 #include <test/ut.h>
 
 static const int busnum;
diff --git a/test/dm/irq.c b/test/dm/irq.c
index 51bae31b0f8..0a495ea270e 100644
--- a/test/dm/irq.c
+++ b/test/dm/irq.c
@@ -11,6 +11,7 @@
 #include <acpi/acpi_device.h>
 #include <asm/test.h>
 #include <dm/test.h>
+#include <linux/errno.h>
 #include <test/ut.h>
 
 /* Base test of the irq uclass */
diff --git a/test/dm/k210_pll.c b/test/dm/k210_pll.c
index 54764f269c5..94740ce0926 100644
--- a/test/dm/k210_pll.c
+++ b/test/dm/k210_pll.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <linux/errno.h>
 /* For DIV_ROUND_DOWN_ULL, defined in linux/kernel.h */
 #include <div64.h>
 #include <dm/test.h>
diff --git a/test/dm/led.c b/test/dm/led.c
index 00de7b3997c..76be0893de1 100644
--- a/test/dm/led.c
+++ b/test/dm/led.c
@@ -8,6 +8,7 @@
 #include <led.h>
 #include <asm/gpio.h>
 #include <dm/test.h>
+#include <linux/errno.h>
 #include <test/ut.h>
 
 /* Base test of the led uclass */
diff --git a/test/dm/mailbox.c b/test/dm/mailbox.c
index e6c521b8b54..a511da04d1a 100644
--- a/test/dm/mailbox.c
+++ b/test/dm/mailbox.c
@@ -8,6 +8,7 @@
 #include <malloc.h>
 #include <dm/test.h>
 #include <asm/mbox.h>
+#include <linux/errno.h>
 #include <test/ut.h>
 
 static int dm_test_mailbox(struct unit_test_state *uts)
diff --git a/test/dm/nop.c b/test/dm/nop.c
index 2df29f3d15b..d511249c5bb 100644
--- a/test/dm/nop.c
+++ b/test/dm/nop.c
@@ -13,6 +13,7 @@
 #include <dm/device.h>
 #include <dm/test.h>
 #include <misc.h>
+#include <linux/errno.h>
 #include <test/ut.h>
 
 static int noptest_bind(struct udevice *parent)
diff --git a/test/dm/pch.c b/test/dm/pch.c
index 54e33d187b6..d054723627d 100644
--- a/test/dm/pch.c
+++ b/test/dm/pch.c
@@ -8,6 +8,7 @@
 #include <pch.h>
 #include <asm/test.h>
 #include <dm/test.h>
+#include <linux/errno.h>
 #include <test/ut.h>
 
 /* Test that sandbox PCH works correctly */
diff --git a/test/dm/phy.c b/test/dm/phy.c
index 99f01195578..0e6aee7069b 100644
--- a/test/dm/phy.c
+++ b/test/dm/phy.c
@@ -9,6 +9,7 @@
 #include <generic-phy.h>
 #include <log.h>
 #include <dm/test.h>
+#include <linux/errno.h>
 #include <test/ut.h>
 
 /* Base test of the phy uclass */
diff --git a/test/dm/pwm.c b/test/dm/pwm.c
index b52ee21a69e..cbc38bffa1f 100644
--- a/test/dm/pwm.c
+++ b/test/dm/pwm.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <pwm.h>
 #include <dm/test.h>
+#include <linux/errno.h>
 #include <test/ut.h>
 
 /* Basic test of the pwm uclass */
diff --git a/test/dm/regmap.c b/test/dm/regmap.c
index 4082778a56a..92d6bf7be29 100644
--- a/test/dm/regmap.c
+++ b/test/dm/regmap.c
@@ -13,6 +13,7 @@
 #include <asm/test.h>
 #include <dm/test.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <test/ut.h>
 
 /* Base test of register maps */
diff --git a/test/dm/regulator.c b/test/dm/regulator.c
index ca916eeebb6..2ba90755a7d 100644
--- a/test/dm/regulator.c
+++ b/test/dm/regulator.c
@@ -17,6 +17,7 @@
 #include <dm/util.h>
 #include <dm/test.h>
 #include <dm/uclass-internal.h>
+#include <linux/errno.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/sandbox_pmic.h>
diff --git a/test/dm/remoteproc.c b/test/dm/remoteproc.c
index 9511c7dd6f5..6b72fa0c2b9 100644
--- a/test/dm/remoteproc.c
+++ b/test/dm/remoteproc.c
@@ -10,6 +10,7 @@
 #include <remoteproc.h>
 #include <asm/io.h>
 #include <dm/test.h>
+#include <linux/errno.h>
 #include <test/ut.h>
 /**
  * dm_test_remoteproc_base() - test the operations after initializations
diff --git a/test/dm/rtc.c b/test/dm/rtc.c
index cc91d91f398..d6f7ce6ae44 100644
--- a/test/dm/rtc.c
+++ b/test/dm/rtc.c
@@ -15,6 +15,7 @@
 #include <asm/rtc.h>
 #include <asm/test.h>
 #include <dm/test.h>
+#include <linux/errno.h>
 #include <test/ut.h>
 
 /* Simple RTC sanity check */
diff --git a/test/dm/serial.c b/test/dm/serial.c
index 6237693cb80..a9ca9689ce8 100644
--- a/test/dm/serial.c
+++ b/test/dm/serial.c
@@ -8,6 +8,7 @@
 #include <serial.h>
 #include <dm.h>
 #include <dm/test.h>
+#include <linux/errno.h>
 #include <test/ut.h>
 
 static int dm_test_serial(struct unit_test_state *uts)
diff --git a/test/dm/sound.c b/test/dm/sound.c
index aa5368f05b9..bac17db3354 100644
--- a/test/dm/sound.c
+++ b/test/dm/sound.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <sound.h>
 #include <dm/test.h>
+#include <linux/errno.h>
 #include <test/ut.h>
 #include <asm/test.h>
 
diff --git a/test/dm/spi.c b/test/dm/spi.c
index ff2cddd2459..08009fb4fd2 100644
--- a/test/dm/spi.c
+++ b/test/dm/spi.c
@@ -13,6 +13,7 @@
 #include <dm/test.h>
 #include <dm/uclass-internal.h>
 #include <dm/util.h>
+#include <linux/errno.h>
 #include <test/ut.h>
 
 /* Test that we can find buses and chip-selects */
diff --git a/test/dm/syscon-reset.c b/test/dm/syscon-reset.c
index edabdb2e781..85ac3d8ade0 100644
--- a/test/dm/syscon-reset.c
+++ b/test/dm/syscon-reset.c
@@ -9,6 +9,7 @@
 #include <regmap.h>
 #include <reset.h>
 #include <syscon.h>
+#include <linux/errno.h>
 #include <test/ut.h>
 #include <asm/test.h>
 #include <linux/bitops.h>
diff --git a/test/dm/syscon.c b/test/dm/syscon.c
index 06a1c69ac5c..4b39651f332 100644
--- a/test/dm/syscon.c
+++ b/test/dm/syscon.c
@@ -11,6 +11,7 @@
 #include <asm/test.h>
 #include <dm/test.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <test/ut.h>
 
 /* Base test of system controllers */
diff --git a/test/dm/sysreset.c b/test/dm/sysreset.c
index 5b2358ef674..1d58126ea80 100644
--- a/test/dm/sysreset.c
+++ b/test/dm/sysreset.c
@@ -9,6 +9,7 @@
 #include <asm/state.h>
 #include <asm/test.h>
 #include <dm/test.h>
+#include <linux/errno.h>
 #include <test/ut.h>
 
 /* Test that we can use particular sysreset devices */
diff --git a/test/dm/tee.c b/test/dm/tee.c
index 632e9960b0b..4a55ab287c4 100644
--- a/test/dm/tee.c
+++ b/test/dm/tee.c
@@ -10,6 +10,7 @@
 #include <dm/test.h>
 #include <sandboxtee.h>
 #include <tee.h>
+#include <linux/errno.h>
 #include <test/ut.h>
 #include <tee/optee_ta_avb.h>
 
diff --git a/test/dm/test-driver.c b/test/dm/test-driver.c
index ba85fa313e8..b8d8267097e 100644
--- a/test/dm/test-driver.c
+++ b/test/dm/test-driver.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <dm/test.h>
+#include <linux/errno.h>
 #include <test/ut.h>
 #include <asm/io.h>
 
diff --git a/test/dm/test-fdt.c b/test/dm/test-fdt.c
index 12ec40c7b46..180a8c93f02 100644
--- a/test/dm/test-fdt.c
+++ b/test/dm/test-fdt.c
@@ -20,6 +20,7 @@
 #include <dm/util.h>
 #include <dm/lists.h>
 #include <dm/of_access.h>
+#include <linux/errno.h>
 #include <test/ut.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/test/dm/test-uclass.c b/test/dm/test-uclass.c
index b6d629a285c..e6a0db0ec7f 100644
--- a/test/dm/test-uclass.c
+++ b/test/dm/test-uclass.c
@@ -13,6 +13,7 @@
 #include <errno.h>
 #include <asm/io.h>
 #include <dm/test.h>
+#include <linux/errno.h>
 #include <linux/list.h>
 #include <test/ut.h>
 
diff --git a/test/dm/usb.c b/test/dm/usb.c
index 293c0b43e5f..a4b39846983 100644
--- a/test/dm/usb.c
+++ b/test/dm/usb.c
@@ -15,6 +15,7 @@
 #include <dm/device-internal.h>
 #include <dm/test.h>
 #include <dm/uclass-internal.h>
+#include <linux/errno.h>
 #include <test/ut.h>
 
 struct keyboard_test_data {
diff --git a/test/dm/video.c b/test/dm/video.c
index 19f78b62390..1ab35482fea 100644
--- a/test/dm/video.c
+++ b/test/dm/video.c
@@ -15,6 +15,7 @@
 #include <video_console.h>
 #include <dm/test.h>
 #include <dm/uclass-internal.h>
+#include <linux/errno.h>
 #include <test/ut.h>
 
 /*
diff --git a/test/dm/virtio.c b/test/dm/virtio.c
index 4a0c0b23b88..191229272be 100644
--- a/test/dm/virtio.c
+++ b/test/dm/virtio.c
@@ -12,6 +12,7 @@
 #include <dm/uclass-internal.h>
 #include <dm/root.h>
 #include <dm/test.h>
+#include <linux/errno.h>
 #include <test/ut.h>
 
 /* Basic test of the virtio uclass */
diff --git a/test/env/attr.c b/test/env/attr.c
index 8d5c0f1c3df..64eb14475e8 100644
--- a/test/env/attr.c
+++ b/test/env/attr.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <command.h>
 #include <env_attr.h>
+#include <linux/errno.h>
 #include <test/env.h>
 #include <test/ut.h>
 
diff --git a/test/lib/test_errno_str.c b/test/lib/test_errno_str.c
index 8a9f1fd9805..1a02e712048 100644
--- a/test/lib/test_errno_str.c
+++ b/test/lib/test_errno_str.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <command.h>
 #include <errno.h>
+#include <linux/errno.h>
 #include <test/lib.h>
 #include <test/test.h>
 #include <test/ut.h>
diff --git a/test/optee/cmd_ut_optee.c b/test/optee/cmd_ut_optee.c
index 9fa4c91e0dd..9153d715918 100644
--- a/test/optee/cmd_ut_optee.c
+++ b/test/optee/cmd_ut_optee.c
@@ -9,6 +9,7 @@
 #include <fdt_support.h>
 #include <log.h>
 #include <malloc.h>
+#include <linux/errno.h>
 #include <tee/optee.h>
 
 #include <linux/sizes.h>
diff --git a/test/overlay/cmd_ut_overlay.c b/test/overlay/cmd_ut_overlay.c
index c001fb183fe..ee8c4944e40 100644
--- a/test/overlay/cmd_ut_overlay.c
+++ b/test/overlay/cmd_ut_overlay.c
@@ -11,6 +11,7 @@
 #include <image.h>
 #include <log.h>
 #include <malloc.h>
+#include <linux/errno.h>
 
 #include <linux/sizes.h>
 
diff --git a/test/time_ut.c b/test/time_ut.c
index 701b6cb4a7e..1670c5d2184 100644
--- a/test/time_ut.c
+++ b/test/time_ut.c
@@ -10,6 +10,7 @@
 #include <stdio.h>
 #include <time.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 static int test_get_timer(void)
 {
-- 
2.28.0.163.g6104cc2f0b6-goog

^ permalink raw reply related	[flat|nested] 35+ messages in thread

* [PATCH 12/16] common: Drop linux/kernel.h from common header
  2020-08-02 22:59 [PATCH 00/16] common: Drop remaining includes in common.h Simon Glass
                   ` (10 preceding siblings ...)
  2020-08-02 22:59 ` [PATCH 11/16] common: Drop errno.h " Simon Glass
@ 2020-08-02 22:59 ` Simon Glass
  2020-08-02 22:59 ` [PATCH 13/16] common: Drop linux/types.h " Simon Glass
                   ` (4 subsequent siblings)
  16 siblings, 0 replies; 35+ messages in thread
From: Simon Glass @ 2020-08-02 22:59 UTC (permalink / raw)
  To: u-boot

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

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

 arch/arc/lib/cpu.c                                      | 1 +
 arch/arm/cpu/arm1136/mx31/generic.c                     | 1 +
 arch/arm/cpu/arm926ejs/mx25/generic.c                   | 1 +
 arch/arm/cpu/arm926ejs/mx27/generic.c                   | 1 +
 arch/arm/cpu/arm926ejs/mxs/spl_boot.c                   | 1 +
 arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c               | 1 +
 arch/arm/cpu/arm926ejs/mxs/spl_power_init.c             | 1 +
 arch/arm/cpu/arm926ejs/spear/spear600.c                 | 1 +
 arch/arm/cpu/armv7/bcm235xx/clk-bcm235xx.c              | 1 +
 arch/arm/cpu/armv7/bcm235xx/clk-core.c                  | 1 +
 arch/arm/cpu/armv7/bcm235xx/clk-core.h                  | 1 +
 arch/arm/cpu/armv7/bcm281xx/clk-bcm281xx.c              | 1 +
 arch/arm/cpu/armv7/bcm281xx/clk-core.c                  | 1 +
 arch/arm/cpu/armv7/bcm281xx/clk-core.h                  | 1 +
 arch/arm/cpu/armv7/exception_level.c                    | 1 +
 arch/arm/cpu/armv7/kona-common/clk-stubs.c              | 1 +
 arch/arm/cpu/armv7/ls102xa/cpu.c                        | 1 +
 arch/arm/cpu/armv7/ls102xa/fdt.c                        | 1 +
 arch/arm/cpu/armv7/ls102xa/ls102xa_serdes.c             | 1 +
 arch/arm/cpu/armv7/ls102xa/soc.c                        | 1 +
 arch/arm/cpu/armv7/sunxi/psci.c                         | 1 +
 arch/arm/cpu/armv7/virt-v7.c                            | 1 +
 arch/arm/cpu/armv8/cache_v8.c                           | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/cpu.c                 | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c    | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/icid.c                | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/ls1012a_serdes.c      | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/ls1028_ids.c          | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/ls1028a_serdes.c      | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/ls1043_ids.c          | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/ls1043a_serdes.c      | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/ls1046_ids.c          | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/ls1046a_serdes.c      | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/ls1088_ids.c          | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/ls1088a_serdes.c      | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/ls2080a_serdes.c      | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/ls2088_ids.c          | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/lx2160_ids.c          | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/lx2160a_serdes.c      | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/mp.c                  | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/ppa.c                 | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/soc.c                 | 1 +
 arch/arm/cpu/armv8/fwcall.c                             | 1 +
 arch/arm/include/asm/arch-fsl-layerscape/fsl_icid.h     | 1 +
 arch/arm/include/asm/arch-fsl-layerscape/soc.h          | 1 +
 arch/arm/include/asm/arch-imx8/sys_proto.h              | 1 +
 arch/arm/include/asm/arch-imx8m/clock.h                 | 1 +
 arch/arm/include/asm/arch-mx25/clock.h                  | 1 +
 arch/arm/include/asm/arch-mx5/clock.h                   | 1 +
 arch/arm/include/asm/arch-mx6/clock.h                   | 1 +
 arch/arm/include/asm/arch-mx7/clock_slice.h             | 1 +
 arch/arm/include/asm/arch-mx7ulp/pcc.h                  | 1 +
 arch/arm/include/asm/arch-mx7ulp/scg.h                  | 1 +
 arch/arm/include/asm/arch-rk3308/cru_rk3308.h           | 1 +
 arch/arm/include/asm/arch-rk3308/grf_rk3308.h           | 1 +
 arch/arm/include/asm/arch-rockchip/clock.h              | 2 ++
 arch/arm/include/asm/arch-rockchip/cpu_rk3288.h         | 1 +
 arch/arm/include/asm/arch-rockchip/cru_px30.h           | 1 +
 arch/arm/include/asm/arch-rockchip/cru_rk3036.h         | 1 +
 arch/arm/include/asm/arch-rockchip/cru_rk3128.h         | 1 +
 arch/arm/include/asm/arch-rockchip/cru_rk3188.h         | 2 ++
 arch/arm/include/asm/arch-rockchip/cru_rk322x.h         | 1 +
 arch/arm/include/asm/arch-rockchip/cru_rk3288.h         | 1 +
 arch/arm/include/asm/arch-rockchip/cru_rk3328.h         | 1 +
 arch/arm/include/asm/arch-rockchip/cru_rk3368.h         | 1 +
 arch/arm/include/asm/arch-rockchip/cru_rk3399.h         | 1 +
 arch/arm/include/asm/arch-rockchip/cru_rv1108.h         | 1 +
 arch/arm/include/asm/arch-rockchip/ddr_rk3188.h         | 1 +
 arch/arm/include/asm/arch-rockchip/ddr_rk3288.h         | 1 +
 arch/arm/include/asm/arch-rockchip/ddr_rk3368.h         | 1 +
 arch/arm/include/asm/arch-rockchip/edp_rk3288.h         | 1 +
 arch/arm/include/asm/arch-rockchip/gpio.h               | 1 +
 arch/arm/include/asm/arch-rockchip/grf_px30.h           | 1 +
 arch/arm/include/asm/arch-rockchip/grf_rk3036.h         | 1 +
 arch/arm/include/asm/arch-rockchip/grf_rk3128.h         | 1 +
 arch/arm/include/asm/arch-rockchip/grf_rk3188.h         | 1 +
 arch/arm/include/asm/arch-rockchip/grf_rk322x.h         | 1 +
 arch/arm/include/asm/arch-rockchip/grf_rk3328.h         | 1 +
 arch/arm/include/asm/arch-rockchip/grf_rk3368.h         | 1 +
 arch/arm/include/asm/arch-rockchip/grf_rk3399.h         | 1 +
 arch/arm/include/asm/arch-rockchip/grf_rv1108.h         | 1 +
 arch/arm/include/asm/arch-rockchip/pmu_rk3188.h         | 1 +
 arch/arm/include/asm/arch-rockchip/pmu_rk3288.h         | 1 +
 arch/arm/include/asm/arch-rockchip/pmu_rk3399.h         | 1 +
 arch/arm/include/asm/arch-rockchip/sdram_rk3036.h       | 1 +
 arch/arm/include/asm/arch-rockchip/sdram_rk322x.h       | 1 +
 arch/arm/include/asm/arch-rockchip/sdram_rk3288.h       | 1 +
 arch/arm/include/asm/arch-rockchip/vop_rk3288.h         | 1 +
 arch/arm/include/asm/arch-sunxi/clock_sun6i.h           | 1 +
 arch/arm/include/asm/arch-sunxi/dram.h                  | 1 +
 arch/arm/include/asm/arch-sunxi/dram_sun50i_h6.h        | 1 +
 arch/arm/include/asm/arch-sunxi/dram_sunxi_dw.h         | 1 +
 arch/arm/include/asm/arch-sunxi/lcdc.h                  | 1 +
 arch/arm/include/asm/arch-tegra/ap.h                    | 1 +
 arch/arm/include/asm/arch-tegra/clock.h                 | 1 +
 arch/arm/include/asm/armv7.h                            | 1 +
 arch/arm/include/asm/armv8/sec_firmware.h               | 2 ++
 arch/arm/include/asm/mach-imx/hab.h                     | 1 +
 arch/arm/include/asm/mach-imx/iomux-v3.h                | 1 +
 arch/arm/lib/bootm.c                                    | 1 +
 arch/arm/lib/cache-cp15.c                               | 1 +
 arch/arm/lib/cache.c                                    | 1 +
 arch/arm/lib/gic-v3-its.c                               | 1 +
 arch/arm/lib/image.c                                    | 1 +
 arch/arm/mach-at91/atmel_sfr.c                          | 1 +
 arch/arm/mach-at91/include/mach/at91_common.h           | 1 +
 arch/arm/mach-at91/include/mach/atmel_usba_udc.h        | 1 +
 arch/arm/mach-bcm283x/mbox.c                            | 1 +
 arch/arm/mach-davinci/include/mach/davinci_misc.h       | 1 +
 arch/arm/mach-exynos/clock.c                            | 1 +
 arch/arm/mach-exynos/clock_init_exynos5.c               | 1 +
 arch/arm/mach-exynos/dmc_init_ddr3.c                    | 2 ++
 arch/arm/mach-exynos/pinmux.c                           | 1 +
 arch/arm/mach-exynos/spl_boot.c                         | 1 +
 arch/arm/mach-imx/cmd_bmode.c                           | 1 +
 arch/arm/mach-imx/cmd_nandbcb.c                         | 1 +
 arch/arm/mach-imx/ddrmc-vf610.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/cpu.c                            | 1 +
 arch/arm/mach-imx/imx8/fdt.c                            | 1 +
 arch/arm/mach-imx/imx8/image.c                          | 1 +
 arch/arm/mach-imx/imx8/parse-container.c                | 1 +
 arch/arm/mach-imx/imx8/snvs_security_sc.c               | 1 +
 arch/arm/mach-imx/imx8m/clock_imx8mm.c                  | 1 +
 arch/arm/mach-imx/imx8m/clock_imx8mq.c                  | 1 +
 arch/arm/mach-imx/imx8m/clock_slice.c                   | 1 +
 arch/arm/mach-imx/imx8m/soc.c                           | 1 +
 arch/arm/mach-imx/imxrt/soc.c                           | 1 +
 arch/arm/mach-imx/mac.c                                 | 1 +
 arch/arm/mach-imx/mx5/clock.c                           | 1 +
 arch/arm/mach-imx/mx6/clock.c                           | 1 +
 arch/arm/mach-imx/mx6/ddr.c                             | 1 +
 arch/arm/mach-imx/mx6/litesom.c                         | 1 +
 arch/arm/mach-imx/mx6/module_fuse.c                     | 1 +
 arch/arm/mach-imx/mx6/soc.c                             | 1 +
 arch/arm/mach-imx/mx7/clock_slice.c                     | 1 +
 arch/arm/mach-imx/mx7/psci-mx7.c                        | 1 +
 arch/arm/mach-imx/mx7/soc.c                             | 1 +
 arch/arm/mach-imx/mx7ulp/pcc.c                          | 1 +
 arch/arm/mach-imx/mx7ulp/scg.c                          | 1 +
 arch/arm/mach-imx/mx7ulp/soc.c                          | 1 +
 arch/arm/mach-imx/spl.c                                 | 1 +
 arch/arm/mach-imx/spl_imx_romapi.c                      | 1 +
 arch/arm/mach-ipq40xx/pinctrl-snapdragon.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/security.c                             | 1 +
 arch/arm/mach-k3/sysfw-loader.c                         | 1 +
 arch/arm/mach-keystone/include/mach/psc_defs.h          | 1 +
 arch/arm/mach-keystone/psc.c                            | 1 +
 arch/arm/mach-kirkwood/cpu.c                            | 1 +
 arch/arm/mach-mediatek/mt7623/init.c                    | 1 +
 arch/arm/mach-mediatek/mt7629/init.c                    | 1 +
 arch/arm/mach-mediatek/mt8516/init.c                    | 1 +
 arch/arm/mach-meson/board-g12a.c                        | 1 +
 arch/arm/mach-meson/board-info.c                        | 1 +
 arch/arm/mach-mvebu/cpu.c                               | 1 +
 arch/arm/mach-nexell/clock.c                            | 1 +
 arch/arm/mach-nexell/nx_gpio.c                          | 1 +
 arch/arm/mach-nexell/timer.c                            | 1 +
 arch/arm/mach-omap2/abb.c                               | 1 +
 arch/arm/mach-omap2/am33xx/sys_info.c                   | 1 +
 arch/arm/mach-omap2/emif-common.c                       | 1 +
 arch/arm/mach-omap2/omap5/fdt.c                         | 1 +
 arch/arm/mach-omap2/omap5/sdram.c                       | 1 +
 arch/arm/mach-omap2/sec-common.c                        | 1 +
 arch/arm/mach-rmobile/cpu_info.c                        | 1 +
 arch/arm/mach-rmobile/pfc-r8a7740.c                     | 1 +
 arch/arm/mach-rmobile/pfc-sh73a0.c                      | 1 +
 arch/arm/mach-rockchip/board.c                          | 1 +
 arch/arm/mach-rockchip/boot_mode.c                      | 1 +
 arch/arm/mach-rockchip/bootrom.c                        | 1 +
 arch/arm/mach-rockchip/rk3288/rk3288.c                  | 1 +
 arch/arm/mach-rockchip/rk3399/rk3399.c                  | 1 +
 arch/arm/mach-rockchip/sdram.c                          | 1 +
 arch/arm/mach-rockchip/spl.c                            | 1 +
 arch/arm/mach-snapdragon/pinctrl-apq8016.c              | 1 +
 arch/arm/mach-snapdragon/pinctrl-apq8096.c              | 1 +
 arch/arm/mach-snapdragon/pinctrl-snapdragon.c           | 1 +
 arch/arm/mach-socfpga/clock_manager_arria10.c           | 1 +
 arch/arm/mach-socfpga/firewall.c                        | 1 +
 arch/arm/mach-socfpga/freeze_controller.c               | 1 +
 arch/arm/mach-socfpga/include/mach/misc.h               | 1 +
 arch/arm/mach-socfpga/include/mach/reset_manager_gen5.h | 1 +
 arch/arm/mach-socfpga/misc_gen5.c                       | 1 +
 arch/arm/mach-socfpga/misc_s10.c                        | 1 +
 arch/arm/mach-socfpga/reset_manager_arria10.c           | 1 +
 arch/arm/mach-socfpga/reset_manager_gen5.c              | 1 +
 arch/arm/mach-socfpga/wrap_pinmux_config.c              | 1 +
 arch/arm/mach-socfpga/wrap_pinmux_config_s10.c          | 1 +
 arch/arm/mach-socfpga/wrap_sdram_config.c               | 1 +
 arch/arm/mach-stm32/soc.c                               | 1 +
 arch/arm/mach-stm32mp/bsec.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-stm32mp/dram_init.c                       | 1 +
 arch/arm/mach-stm32mp/fdt.c                             | 1 +
 arch/arm/mach-stm32mp/include/mach/bsec.h               | 1 +
 arch/arm/mach-stm32mp/include/mach/stm32prog.h          | 1 +
 arch/arm/mach-sunxi/clock_sun4i.c                       | 1 +
 arch/arm/mach-sunxi/clock_sun6i.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_sun8i_a33.c                    | 1 +
 arch/arm/mach-sunxi/dram_sun8i_a83t.c                   | 1 +
 arch/arm/mach-sunxi/dram_sunxi_dw.c                     | 1 +
 arch/arm/mach-sunxi/dram_timings/ddr2_v3s.c             | 1 +
 arch/arm/mach-sunxi/dram_timings/ddr3_1333.c            | 1 +
 arch/arm/mach-sunxi/dram_timings/h6_ddr3_1333.c         | 1 +
 arch/arm/mach-sunxi/dram_timings/h6_lpddr3.c            | 1 +
 arch/arm/mach-sunxi/dram_timings/lpddr3_stock.c         | 1 +
 arch/arm/mach-sunxi/spl_spi_sunxi.c                     | 1 +
 arch/arm/mach-tegra/board.c                             | 1 +
 arch/arm/mach-tegra/cboot.c                             | 1 +
 arch/arm/mach-tegra/clock.c                             | 1 +
 arch/arm/mach-tegra/dt-setup.c                          | 1 +
 arch/arm/mach-tegra/gpu.c                               | 1 +
 arch/arm/mach-tegra/pmc.c                               | 1 +
 arch/arm/mach-tegra/powergate.c                         | 1 +
 arch/arm/mach-tegra/tegra114/cpu.c                      | 1 +
 arch/arm/mach-tegra/tegra124/clock.c                    | 1 +
 arch/arm/mach-tegra/tegra124/cpu.c                      | 1 +
 arch/arm/mach-tegra/tegra124/xusb-padctl.c              | 1 +
 arch/arm/mach-tegra/tegra20/funcmux.c                   | 1 +
 arch/arm/mach-tegra/tegra20/warmboot.c                  | 1 +
 arch/arm/mach-tegra/tegra210/xusb-padctl.c              | 1 +
 arch/arm/mach-tegra/xusb-padctl-dummy.c                 | 1 +
 arch/arm/mach-uniphier/dram/ddrphy-init.h               | 1 +
 arch/arm/mach-uniphier/dram/ddrphy-ld4.c                | 1 +
 arch/arm/mach-uniphier/dram/umc-ld4.c                   | 1 +
 arch/arm/mach-uniphier/dram/umc-pro4.c                  | 1 +
 arch/arm/mach-uniphier/dram/umc-pxs2.c                  | 1 +
 arch/arm/mach-uniphier/dram/umc-sld8.c                  | 1 +
 arch/arm/mach-uniphier/micro-support-card.c             | 1 +
 arch/arm/mach-uniphier/mmc-first-dev.c                  | 1 +
 arch/arm/mach-versal/mp.c                               | 1 +
 arch/arm/mach-zynq/slcr.c                               | 1 +
 arch/arm/mach-zynqmp/include/mach/sys_proto.h           | 1 +
 arch/arm/mach-zynqmp/mp.c                               | 1 +
 arch/m68k/lib/cache.c                                   | 1 +
 arch/m68k/lib/interrupts.c                              | 1 +
 arch/microblaze/cpu/spl.c                               | 1 +
 arch/microblaze/cpu/timer.c                             | 1 +
 arch/mips/cpu/time.c                                    | 1 +
 arch/mips/lib/cache.c                                   | 1 +
 arch/mips/mach-ath79/ar934x/clk.c                       | 1 +
 arch/mips/mach-ath79/cpu.c                              | 1 +
 arch/mips/mach-jz47xx/jz4780/pll.c                      | 1 +
 arch/mips/mach-mscc/include/mach/ddr.h                  | 1 +
 arch/mips/mach-mtmips/ddr_cal.c                         | 1 +
 arch/mips/mach-mtmips/mt7628/init.c                     | 1 +
 arch/mips/mach-octeon/clock.c                           | 1 +
 arch/nios2/cpu/traps.c                                  | 1 +
 arch/powerpc/cpu/mpc83xx/cpu.c                          | 1 +
 arch/powerpc/cpu/mpc83xx/cpu_init.c                     | 1 +
 arch/powerpc/cpu/mpc83xx/law.c                          | 1 +
 arch/powerpc/cpu/mpc83xx/pcie.c                         | 1 +
 arch/powerpc/cpu/mpc83xx/speed.c                        | 1 +
 arch/powerpc/cpu/mpc85xx/b4860_ids.c                    | 1 +
 arch/powerpc/cpu/mpc85xx/b4860_serdes.c                 | 1 +
 arch/powerpc/cpu/mpc85xx/bsc9132_serdes.c               | 1 +
 arch/powerpc/cpu/mpc85xx/c29x_serdes.c                  | 1 +
 arch/powerpc/cpu/mpc85xx/cmd_errata.c                   | 1 +
 arch/powerpc/cpu/mpc85xx/cpu.c                          | 1 +
 arch/powerpc/cpu/mpc85xx/cpu_init.c                     | 1 +
 arch/powerpc/cpu/mpc85xx/ether_fcc.c                    | 1 +
 arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c           | 1 +
 arch/powerpc/cpu/mpc85xx/mpc8536_serdes.c               | 1 +
 arch/powerpc/cpu/mpc85xx/mpc8544_serdes.c               | 1 +
 arch/powerpc/cpu/mpc85xx/mpc8548_serdes.c               | 1 +
 arch/powerpc/cpu/mpc85xx/mpc8568_serdes.c               | 1 +
 arch/powerpc/cpu/mpc85xx/mpc8569_serdes.c               | 1 +
 arch/powerpc/cpu/mpc85xx/mpc8572_serdes.c               | 1 +
 arch/powerpc/cpu/mpc85xx/p1010_serdes.c                 | 1 +
 arch/powerpc/cpu/mpc85xx/p1021_serdes.c                 | 1 +
 arch/powerpc/cpu/mpc85xx/p1022_serdes.c                 | 1 +
 arch/powerpc/cpu/mpc85xx/p1023_serdes.c                 | 1 +
 arch/powerpc/cpu/mpc85xx/p2020_serdes.c                 | 1 +
 arch/powerpc/cpu/mpc85xx/p2041_ids.c                    | 1 +
 arch/powerpc/cpu/mpc85xx/p2041_serdes.c                 | 1 +
 arch/powerpc/cpu/mpc85xx/p3041_ids.c                    | 1 +
 arch/powerpc/cpu/mpc85xx/p3041_serdes.c                 | 1 +
 arch/powerpc/cpu/mpc85xx/p4080_ids.c                    | 1 +
 arch/powerpc/cpu/mpc85xx/p4080_serdes.c                 | 1 +
 arch/powerpc/cpu/mpc85xx/p5020_ids.c                    | 1 +
 arch/powerpc/cpu/mpc85xx/p5020_serdes.c                 | 1 +
 arch/powerpc/cpu/mpc85xx/p5040_ids.c                    | 1 +
 arch/powerpc/cpu/mpc85xx/p5040_serdes.c                 | 1 +
 arch/powerpc/cpu/mpc85xx/t1024_ids.c                    | 1 +
 arch/powerpc/cpu/mpc85xx/t1024_serdes.c                 | 1 +
 arch/powerpc/cpu/mpc85xx/t1040_ids.c                    | 1 +
 arch/powerpc/cpu/mpc85xx/t1040_serdes.c                 | 1 +
 arch/powerpc/cpu/mpc85xx/t2080_ids.c                    | 1 +
 arch/powerpc/cpu/mpc85xx/t2080_serdes.c                 | 1 +
 arch/powerpc/cpu/mpc85xx/t4240_ids.c                    | 1 +
 arch/powerpc/cpu/mpc85xx/t4240_serdes.c                 | 1 +
 arch/powerpc/cpu/mpc85xx/tlb.c                          | 1 +
 arch/powerpc/cpu/mpc86xx/cpu.c                          | 1 +
 arch/powerpc/cpu/mpc86xx/mpc8610_serdes.c               | 1 +
 arch/powerpc/cpu/mpc86xx/mpc8641_serdes.c               | 1 +
 arch/powerpc/cpu/mpc8xxx/cpu.c                          | 1 +
 arch/powerpc/cpu/mpc8xxx/law.c                          | 1 +
 arch/powerpc/cpu/mpc8xxx/pamu_table.c                   | 1 +
 arch/powerpc/include/asm/arch-mpc83xx/soc.h             | 1 +
 arch/powerpc/lib/bootm.c                                | 1 +
 arch/riscv/cpu/cpu.c                                    | 1 +
 arch/riscv/lib/cache.c                                  | 1 +
 arch/riscv/lib/fdt_fixup.c                              | 1 +
 arch/riscv/lib/image.c                                  | 1 +
 arch/riscv/lib/interrupts.c                             | 1 +
 arch/sandbox/cpu/cpu.c                                  | 1 +
 arch/sandbox/cpu/os.c                                   | 1 +
 arch/sandbox/cpu/start.c                                | 1 +
 arch/sandbox/cpu/state.c                                | 1 +
 arch/sandbox/include/asm/eth.h                          | 1 +
 arch/sandbox/include/asm/sdl.h                          | 1 +
 arch/sandbox/include/asm/test.h                         | 1 +
 arch/x86/cpu/apollolake/fsp_bindings.c                  | 1 +
 arch/x86/cpu/apollolake/fsp_s.c                         | 1 +
 arch/x86/cpu/apollolake/hostbridge.c                    | 1 +
 arch/x86/cpu/apollolake/lpc.c                           | 1 +
 arch/x86/cpu/apollolake/pch.c                           | 1 +
 arch/x86/cpu/apollolake/pmc.c                           | 1 +
 arch/x86/cpu/apollolake/spl.c                           | 1 +
 arch/x86/cpu/broadwell/adsp.c                           | 1 +
 arch/x86/cpu/broadwell/cpu_full.c                       | 1 +
 arch/x86/cpu/broadwell/iobp.c                           | 1 +
 arch/x86/cpu/broadwell/pch.c                            | 1 +
 arch/x86/cpu/broadwell/pinctrl_broadwell.c              | 1 +
 arch/x86/cpu/coreboot/sdram.c                           | 1 +
 arch/x86/cpu/cpu.c                                      | 1 +
 arch/x86/cpu/i386/cpu.c                                 | 1 +
 arch/x86/cpu/intel_common/cpu.c                         | 1 +
 arch/x86/cpu/intel_common/itss.c                        | 1 +
 arch/x86/cpu/intel_common/lpc.c                         | 1 +
 arch/x86/cpu/intel_common/me_status.c                   | 1 +
 arch/x86/cpu/intel_common/mrc.c                         | 1 +
 arch/x86/cpu/intel_common/p2sb.c                        | 1 +
 arch/x86/cpu/intel_common/report_platform.c             | 1 +
 arch/x86/cpu/irq.c                                      | 1 +
 arch/x86/cpu/ivybridge/bd82x6x.c                        | 1 +
 arch/x86/cpu/ivybridge/lpc.c                            | 1 +
 arch/x86/cpu/ivybridge/model_206ax.c                    | 1 +
 arch/x86/cpu/mp_init.c                                  | 1 +
 arch/x86/cpu/mtrr.c                                     | 1 +
 arch/x86/cpu/qemu/qemu.c                                | 1 +
 arch/x86/cpu/quark/mrc.c                                | 1 +
 arch/x86/cpu/quark/mrc_util.c                           | 1 +
 arch/x86/cpu/quark/mrc_util.h                           | 1 +
 arch/x86/cpu/quark/smc.c                                | 1 +
 arch/x86/cpu/slimbootloader/sdram.c                     | 1 +
 arch/x86/cpu/tangier/pinmux.c                           | 1 +
 arch/x86/include/asm/arch-apollolake/fsp_bindings.h     | 1 +
 arch/x86/include/asm/arch-broadwell/gpio.h              | 1 +
 arch/x86/include/asm/arch-broadwell/pch.h               | 2 ++
 arch/x86/include/asm/arch-ivybridge/model_206ax.h       | 1 +
 arch/x86/include/asm/bootm.h                            | 1 +
 arch/x86/include/asm/cpu_common.h                       | 2 ++
 arch/x86/include/asm/fast_spi.h                         | 1 +
 arch/x86/include/asm/fsp2/fsp_api.h                     | 1 +
 arch/x86/include/asm/fsp2/fsp_internal.h                | 1 +
 arch/x86/include/asm/global_data.h                      | 1 +
 arch/x86/include/asm/hob.h                              | 1 +
 arch/x86/include/asm/intel_pinctrl.h                    | 1 +
 arch/x86/include/asm/interrupt.h                        | 1 +
 arch/x86/include/asm/irq.h                              | 1 +
 arch/x86/include/asm/itss.h                             | 1 +
 arch/x86/include/asm/lpc_common.h                       | 1 +
 arch/x86/include/asm/mrc_common.h                       | 1 +
 arch/x86/include/asm/mrccache.h                         | 2 ++
 arch/x86/include/asm/mtrr.h                             | 1 +
 arch/x86/include/asm/pirq_routing.h                     | 1 +
 arch/x86/include/asm/pmu.h                              | 1 +
 arch/x86/lib/acpi_nhlt.c                                | 1 +
 arch/x86/lib/acpi_table.c                               | 1 +
 arch/x86/lib/bootm.c                                    | 1 +
 arch/x86/lib/coreboot_table.c                           | 1 +
 arch/x86/lib/e820.c                                     | 1 +
 arch/x86/lib/fsp/fsp_dram.c                             | 1 +
 arch/x86/lib/fsp2/fsp_dram.c                            | 1 +
 arch/x86/lib/fsp2/fsp_init.c                            | 1 +
 arch/x86/lib/fsp2/fsp_meminit.c                         | 1 +
 arch/x86/lib/fsp2/fsp_silicon_init.c                    | 1 +
 arch/x86/lib/fsp2/fsp_support.c                         | 1 +
 arch/x86/lib/i8259.c                                    | 1 +
 arch/x86/lib/init_helpers.c                             | 1 +
 arch/x86/lib/mpspec.c                                   | 1 +
 arch/x86/lib/mrccache.c                                 | 1 +
 arch/x86/lib/physmem.c                                  | 1 +
 arch/x86/lib/pinctrl_ich6.c                             | 1 +
 arch/x86/lib/pirq_routing.c                             | 1 +
 arch/x86/lib/pmu.c                                      | 1 +
 arch/x86/lib/sfi.c                                      | 1 +
 arch/x86/lib/tables.c                                   | 1 +
 arch/x86/lib/zimage.c                                   | 1 +
 board/AndesTech/ax25-ae350/ax25-ae350.c                 | 1 +
 board/Arcturus/ucp1020/law.c                            | 1 +
 board/Arcturus/ucp1020/tlb.c                            | 1 +
 board/CZ.NIC/turris_mox/turris_mox.c                    | 1 +
 board/CZ.NIC/turris_omnia/turris_omnia.c                | 1 +
 board/CarMediaLab/flea3/flea3.c                         | 1 +
 board/LaCie/net2big_v2/net2big_v2.c                     | 1 +
 board/Marvell/db-88f6820-amc/db-88f6820-amc.c           | 1 +
 board/Marvell/db-88f6820-gp/db-88f6820-gp.c             | 1 +
 board/Synology/ds414/ds414.c                            | 1 +
 board/advantech/dms-ba16/dms-ba16.c                     | 1 +
 board/advantech/imx8qm_rom7720_a1/imx8qm_rom7720_a1.c   | 1 +
 board/advantech/imx8qm_rom7720_a1/spl.c                 | 1 +
 board/alliedtelesis/x530/x530.c                         | 1 +
 board/aristainetos/aristainetos.c                       | 1 +
 board/armadeus/apf27/apf27.c                            | 1 +
 board/armltd/vexpress/vexpress_tc2.c                    | 1 +
 board/avionic-design/common/tamonten-ng.c               | 1 +
 board/bachmann/ot1200/ot1200.c                          | 1 +
 board/barco/platinum/platinum.c                         | 1 +
 board/barco/platinum/platinum_picon.c                   | 1 +
 board/barco/platinum/platinum_titanium.c                | 1 +
 board/barco/titanium/titanium.c                         | 1 +
 board/beacon/imx8mm/spl.c                               | 1 +
 board/beckhoff/mx53cx9020/mx53cx9020_video.c            | 1 +
 board/bluegiga/apx4devkit/spl_boot.c                    | 1 +
 board/boundary/nitrogen6x/nitrogen6x.c                  | 1 +
 board/ccv/xpress/xpress.c                               | 1 +
 board/cei/cei-tk1-som/cei-tk1-som.c                     | 1 +
 board/compulab/cl-som-imx7/mux.c                        | 1 +
 board/compulab/cm_fx6/cm_fx6.c                          | 1 +
 board/compulab/cm_fx6/spl.c                             | 1 +
 board/compulab/cm_t43/spl.c                             | 1 +
 board/compulab/common/omap3_display.c                   | 1 +
 board/congatec/cgtqmx6eval/cgtqmx6eval.c                | 1 +
 board/corscience/tricorder/tricorder-eeprom.c           | 1 +
 board/creative/xfi3/spl_boot.c                          | 1 +
 board/creative/xfi3/xfi3.c                              | 1 +
 board/davinci/da8xxevm/da850evm.c                       | 1 +
 board/davinci/da8xxevm/omapl138_lcdk.c                  | 1 +
 board/dhelectronics/dh_stm32mp1/board.c                 | 1 +
 board/ea/mx7ulp_com/mx7ulp_com.c                        | 1 +
 board/el/el6x/el6x.c                                    | 1 +
 board/embest/mx6boards/mx6boards.c                      | 1 +
 board/engicam/imx6q/imx6q.c                             | 1 +
 board/firefly/roc-pc-rk3399/roc-pc-rk3399.c             | 1 +
 board/freescale/common/arm_sleep.c                      | 1 +
 board/freescale/common/ics307_clk.c                     | 1 +
 board/freescale/common/mpc85xx_sleep.c                  | 1 +
 board/freescale/common/ns_access.c                      | 1 +
 board/freescale/common/p_corenet/law.c                  | 1 +
 board/freescale/common/p_corenet/tlb.c                  | 1 +
 board/freescale/common/qixis.c                          | 1 +
 board/freescale/common/sleep.h                          | 1 +
 board/freescale/common/sys_eeprom.c                     | 1 +
 board/freescale/common/vid.c                            | 1 +
 board/freescale/imx8mm_evk/spl.c                        | 1 +
 board/freescale/imx8mn_evk/spl.c                        | 1 +
 board/freescale/imx8mp_evk/imx8mp_evk.c                 | 1 +
 board/freescale/imx8mq_evk/imx8mq_evk.c                 | 1 +
 board/freescale/imx8mq_evk/spl.c                        | 1 +
 board/freescale/imx8qm_mek/imx8qm_mek.c                 | 1 +
 board/freescale/imx8qxp_mek/imx8qxp_mek.c               | 1 +
 board/freescale/imx8qxp_mek/spl.c                       | 1 +
 board/freescale/ls1012ardb/ls1012ardb.c                 | 1 +
 board/freescale/ls1021aiot/ls1021aiot.c                 | 1 +
 board/freescale/ls1021aqds/ls1021aqds.c                 | 1 +
 board/freescale/ls1021atsn/ls1021atsn.c                 | 1 +
 board/freescale/ls1021atwr/ls1021atwr.c                 | 1 +
 board/freescale/ls1043aqds/ls1043aqds.c                 | 1 +
 board/freescale/ls1046aqds/ls1046aqds.c                 | 1 +
 board/freescale/ls1046ardb/cpld.c                       | 1 +
 board/freescale/ls1046ardb/cpld.h                       | 1 +
 board/freescale/ls1046ardb/ls1046ardb.c                 | 1 +
 board/freescale/ls1088a/eth_ls1088aqds.c                | 1 +
 board/freescale/ls1088a/ls1088a.c                       | 1 +
 board/freescale/ls2080aqds/eth.c                        | 1 +
 board/freescale/ls2080aqds/ls2080aqds.c                 | 1 +
 board/freescale/ls2080ardb/ls2080ardb.c                 | 1 +
 board/freescale/lx2160a/eth_lx2160aqds.c                | 1 +
 board/freescale/lx2160a/eth_lx2160ardb.c                | 1 +
 board/freescale/lx2160a/lx2160a.c                       | 1 +
 board/freescale/mpc8541cds/law.c                        | 1 +
 board/freescale/mpc8541cds/tlb.c                        | 1 +
 board/freescale/mpc8544ds/law.c                         | 1 +
 board/freescale/mpc8544ds/tlb.c                         | 1 +
 board/freescale/mpc8548cds/law.c                        | 1 +
 board/freescale/mpc8548cds/tlb.c                        | 1 +
 board/freescale/mpc8555cds/law.c                        | 1 +
 board/freescale/mpc8555cds/tlb.c                        | 1 +
 board/freescale/mpc8568mds/law.c                        | 1 +
 board/freescale/mpc8568mds/tlb.c                        | 1 +
 board/freescale/mpc8569mds/law.c                        | 1 +
 board/freescale/mpc8569mds/tlb.c                        | 1 +
 board/freescale/mpc8572ds/law.c                         | 1 +
 board/freescale/mpc8572ds/tlb.c                         | 1 +
 board/freescale/mpc8610hpcd/law.c                       | 1 +
 board/freescale/mpc8641hpcn/law.c                       | 1 +
 board/freescale/mx23evk/spl_boot.c                      | 1 +
 board/freescale/mx25pdk/mx25pdk.c                       | 1 +
 board/freescale/mx28evk/iomux.c                         | 1 +
 board/freescale/mx35pdk/mx35pdk.c                       | 1 +
 board/freescale/mx51evk/mx51evk.c                       | 1 +
 board/freescale/mx53ard/mx53ard.c                       | 1 +
 board/freescale/mx53evk/mx53evk.c                       | 1 +
 board/freescale/mx53loco/mx53loco.c                     | 1 +
 board/freescale/mx53loco/mx53loco_video.c               | 1 +
 board/freescale/mx53smd/mx53smd.c                       | 1 +
 board/freescale/mx6qarm2/mx6qarm2.c                     | 1 +
 board/freescale/mx6sabreauto/mx6sabreauto.c             | 1 +
 board/freescale/mx6sabresd/mx6sabresd.c                 | 1 +
 board/freescale/mx6slevk/mx6slevk.c                     | 1 +
 board/freescale/mx6sllevk/mx6sllevk.c                   | 1 +
 board/freescale/mx6sxsabreauto/mx6sxsabreauto.c         | 1 +
 board/freescale/mx6sxsabresd/mx6sxsabresd.c             | 1 +
 board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c       | 1 +
 board/freescale/mx6ullevk/mx6ullevk.c                   | 1 +
 board/freescale/mx7dsabresd/mx7dsabresd.c               | 1 +
 board/freescale/mx7ulp_evk/mx7ulp_evk.c                 | 1 +
 board/freescale/p1010rdb/law.c                          | 1 +
 board/freescale/p1010rdb/tlb.c                          | 1 +
 board/freescale/p1023rdb/law.c                          | 1 +
 board/freescale/p1023rdb/tlb.c                          | 1 +
 board/freescale/p1_p2_rdb_pc/law.c                      | 1 +
 board/freescale/p1_p2_rdb_pc/tlb.c                      | 1 +
 board/freescale/t102xrdb/law.c                          | 1 +
 board/freescale/t102xrdb/tlb.c                          | 1 +
 board/freescale/t104xrdb/law.c                          | 1 +
 board/freescale/t104xrdb/tlb.c                          | 1 +
 board/freescale/t208xqds/law.c                          | 1 +
 board/freescale/t208xqds/tlb.c                          | 1 +
 board/freescale/t208xrdb/law.c                          | 1 +
 board/freescale/t208xrdb/tlb.c                          | 1 +
 board/freescale/t4rdb/law.c                             | 1 +
 board/freescale/t4rdb/tlb.c                             | 1 +
 board/freescale/vf610twr/vf610twr.c                     | 1 +
 board/friendlyarm/nanopi2/board.c                       | 1 +
 board/friendlyarm/nanopi2/lcds.c                        | 1 +
 board/gardena/smart-gateway-mt7688/board.c              | 1 +
 board/gateworks/gw_ventana/common.c                     | 1 +
 board/gateworks/gw_ventana/gw_ventana.c                 | 1 +
 board/gdsys/a38x/controlcenterdc.c                      | 1 +
 board/gdsys/a38x/dt_helpers.c                           | 1 +
 board/gdsys/a38x/dt_helpers.h                           | 1 +
 board/gdsys/a38x/hre.c                                  | 1 +
 board/gdsys/a38x/hre.h                                  | 1 +
 board/gdsys/a38x/ihs_phys.c                             | 1 +
 board/gdsys/common/ch7301.h                             | 1 +
 board/gdsys/common/dp501.c                              | 1 +
 board/gdsys/common/dp501.h                              | 1 +
 board/gdsys/common/ioep-fpga.c                          | 6 +++---
 board/gdsys/common/ioep-fpga.h                          | 1 +
 board/gdsys/common/osd.c                                | 1 +
 board/gdsys/common/osd.h                                | 1 +
 board/gdsys/common/phy.c                                | 1 +
 board/gdsys/mpc8308/hrcon.c                             | 1 +
 board/gdsys/mpc8308/strider.c                           | 1 +
 board/gdsys/p1022/controlcenterd-id.c                   | 1 +
 board/gdsys/p1022/law.c                                 | 1 +
 board/gdsys/p1022/tlb.c                                 | 1 +
 board/ge/bx50v3/bx50v3.c                                | 1 +
 board/ge/mx53ppd/mx53ppd.c                              | 1 +
 board/ge/mx53ppd/mx53ppd_video.c                        | 1 +
 board/google/imx8mq_phanbell/imx8mq_phanbell.c          | 1 +
 board/google/imx8mq_phanbell/spl.c                      | 1 +
 board/grinn/liteboard/board.c                           | 1 +
 board/hisilicon/poplar/poplar.c                         | 1 +
 board/imgtec/boston/ddr.c                               | 1 +
 board/imgtec/boston/dt.c                                | 1 +
 board/imgtec/malta/malta.c                              | 1 +
 board/imgtec/malta/superio.c                            | 1 +
 board/inversepath/usbarmory/usbarmory.c                 | 1 +
 board/isee/igep003x/board.c                             | 1 +
 board/isee/igep00x0/igep00x0.c                          | 1 +
 board/keymile/common/ivm.c                              | 1 +
 board/keymile/common/qrio.c                             | 1 +
 board/keymile/common/qrio.h                             | 1 +
 board/keymile/km_arm/km_arm.c                           | 1 +
 board/keymile/kmp204x/kmp204x.c                         | 1 +
 board/keymile/kmp204x/law.c                             | 1 +
 board/keymile/kmp204x/pci.c                             | 1 +
 board/keymile/kmp204x/tlb.c                             | 1 +
 board/kobol/helios4/helios4.c                           | 1 +
 board/kosagi/novena/novena_spl.c                        | 1 +
 board/kosagi/novena/video.c                             | 1 +
 board/lego/ev3/legoev3.c                                | 1 +
 board/liebherr/display5/display5.c                      | 1 +
 board/liebherr/xea/spl_xea.c                            | 1 +
 board/logicpd/imx6/imx6logic.c                          | 1 +
 board/menlo/m53menlo/m53menlo.c                         | 1 +
 board/mscc/common/spi.c                                 | 1 +
 board/mscc/ocelot/ocelot.c                              | 1 +
 board/novtech/meerkat96/meerkat96.c                     | 1 +
 board/nvidia/cardhu/cardhu.c                            | 1 +
 board/nvidia/dalmore/dalmore.c                          | 1 +
 board/nvidia/jetson-tk1/jetson-tk1.c                    | 1 +
 board/nvidia/nyan-big/nyan-big.c                        | 1 +
 board/nvidia/p2371-2180/p2371-2180.c                    | 1 +
 board/nvidia/p2771-0000/p2771-0000.c                    | 1 +
 board/nvidia/p3450-0000/p3450-0000.c                    | 1 +
 board/nvidia/venice2/venice2.c                          | 1 +
 board/olimex/mx23_olinuxino/spl_boot.c                  | 1 +
 board/phytec/pcl063/pcl063.c                            | 1 +
 board/phytec/phycore_am335x_r2/board.c                  | 1 +
 board/ppcag/bg0900/spl_boot.c                           | 1 +
 board/qualcomm/dragonboard820c/dragonboard820c.c        | 1 +
 board/raspberrypi/rpi/rpi.c                             | 1 +
 board/renesas/alt/alt_spl.c                             | 1 +
 board/renesas/blanche/blanche.c                         | 1 +
 board/renesas/gose/gose_spl.c                           | 1 +
 board/renesas/koelsch/koelsch_spl.c                     | 1 +
 board/renesas/lager/lager_spl.c                         | 1 +
 board/renesas/porter/porter_spl.c                       | 1 +
 board/renesas/silk/silk_spl.c                           | 1 +
 board/renesas/stout/stout_spl.c                         | 1 +
 board/rockchip/evb_rk3308/evb_rk3308.c                  | 1 +
 board/samsung/common/exynos5-dt-types.c                 | 1 +
 board/samsung/common/misc.c                             | 1 +
 board/sandisk/sansa_fuze_plus/sfp.c                     | 1 +
 board/sandisk/sansa_fuze_plus/spl_boot.c                | 1 +
 board/sbc8548/law.c                                     | 1 +
 board/sbc8548/tlb.c                                     | 1 +
 board/sbc8641d/law.c                                    | 1 +
 board/schulercontrol/sc_sps_1/spl_boot.c                | 1 +
 board/seco/common/mx6.c                                 | 1 +
 board/siemens/capricorn/board.c                         | 1 +
 board/siemens/rut/board.c                               | 1 +
 board/sipeed/maix/maix.c                                | 1 +
 board/socrates/law.c                                    | 1 +
 board/socrates/tlb.c                                    | 1 +
 board/softing/vining_2000/vining_2000.c                 | 1 +
 board/solidrun/clearfog/clearfog.c                      | 1 +
 board/solidrun/common/tlv_data.c                        | 1 +
 board/solidrun/common/tlv_data.h                        | 1 +
 board/solidrun/mx6cuboxi/mx6cuboxi.c                    | 1 +
 board/somlabs/visionsom-6ull/visionsom-6ull.c           | 1 +
 board/st/common/stm32mp_dfu.c                           | 1 +
 board/st/common/stm32mp_mtdparts.c                      | 1 +
 board/st/common/stpmic1.c                               | 1 +
 board/st/stm32mp1/stm32mp1.c                            | 1 +
 board/synopsys/emsdp/emsdp.c                            | 1 +
 board/synopsys/hsdk/env-lib.h                           | 1 +
 board/syteco/zmx25/zmx25.c                              | 1 +
 board/tbs/tbs2910/tbs2910.c                             | 1 +
 board/technexion/pico-imx6/pico-imx6.c                  | 1 +
 board/technexion/pico-imx6ul/pico-imx6ul.c              | 1 +
 board/technexion/pico-imx6ul/spl.c                      | 1 +
 board/technexion/pico-imx7d/pico-imx7d.c                | 1 +
 board/technexion/pico-imx7d/spl.c                       | 1 +
 board/technexion/pico-imx8mq/pico-imx8mq.c              | 1 +
 board/technexion/pico-imx8mq/spl.c                      | 1 +
 board/technologic/ts4600/iomux.c                        | 1 +
 board/technologic/ts4800/ts4800.c                       | 1 +
 board/theadorable/fpga.c                                | 1 +
 board/ti/am335x/board.c                                 | 1 +
 board/ti/am43xx/board.c                                 | 1 +
 board/ti/am57xx/board.c                                 | 1 +
 board/ti/am65x/evm.c                                    | 1 +
 board/ti/beagle/beagle.c                                | 1 +
 board/ti/common/board_detect.c                          | 1 +
 board/ti/common/board_detect.h                          | 1 +
 board/ti/dra7xx/evm.c                                   | 1 +
 board/ti/j721e/evm.c                                    | 1 +
 board/ti/ks2_evm/board.c                                | 1 +
 board/ti/ks2_evm/board_k2g.c                            | 1 +
 board/toradex/apalis-imx8/apalis-imx8.c                 | 1 +
 board/toradex/apalis-tk1/apalis-tk1.c                   | 1 +
 board/toradex/apalis_imx6/apalis_imx6.c                 | 1 +
 board/toradex/apalis_imx6/pf0100.c                      | 1 +
 board/toradex/apalis_t30/apalis_t30.c                   | 1 +
 board/toradex/colibri-imx6ull/colibri-imx6ull.c         | 1 +
 board/toradex/colibri-imx8x/colibri-imx8x.c             | 1 +
 board/toradex/colibri_imx6/colibri_imx6.c               | 1 +
 board/toradex/colibri_imx6/pf0100.c                     | 1 +
 board/toradex/colibri_imx7/colibri_imx7.c               | 1 +
 board/toradex/colibri_t30/colibri_t30.c                 | 1 +
 board/toradex/colibri_vf/colibri_vf.c                   | 1 +
 board/toradex/common/tdx-cfg-block.c                    | 1 +
 board/toradex/verdin-imx8mm/spl.c                       | 1 +
 board/tqc/tqma6/tqma6.c                                 | 1 +
 board/tqc/tqma6/tqma6_mba6.c                            | 1 +
 board/tqc/tqma6/tqma6_wru4.c                            | 1 +
 board/udoo/neo/neo.c                                    | 1 +
 board/variscite/dart_6ul/dart_6ul.c                     | 1 +
 board/variscite/dart_6ul/spl.c                          | 1 +
 board/varisys/common/sys_eeprom.c                       | 1 +
 board/varisys/cyrus/law.c                               | 1 +
 board/varisys/cyrus/tlb.c                               | 1 +
 board/wandboard/wandboard.c                             | 1 +
 board/warp/warp.c                                       | 1 +
 board/warp7/warp7.c                                     | 1 +
 board/xes/xpedite517x/ddr.c                             | 1 +
 board/xes/xpedite517x/law.c                             | 1 +
 board/xes/xpedite520x/law.c                             | 1 +
 board/xes/xpedite520x/tlb.c                             | 1 +
 board/xes/xpedite537x/ddr.c                             | 1 +
 board/xes/xpedite537x/law.c                             | 1 +
 board/xes/xpedite537x/tlb.c                             | 1 +
 board/xes/xpedite550x/law.c                             | 1 +
 board/xes/xpedite550x/tlb.c                             | 1 +
 board/xilinx/common/board.c                             | 1 +
 board/xilinx/microblaze-generic/microblaze-generic.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/adtimg.c                                            | 1 +
 cmd/aes.c                                               | 1 +
 cmd/avb.c                                               | 1 +
 cmd/axi.c                                               | 1 +
 cmd/bcb.c                                               | 1 +
 cmd/bind.c                                              | 1 +
 cmd/blkcache.c                                          | 1 +
 cmd/bmp.c                                               | 1 +
 cmd/bootcount.c                                         | 1 +
 cmd/bootm.c                                             | 1 +
 cmd/bootstage.c                                         | 1 +
 cmd/clk.c                                               | 1 +
 cmd/conitrace.c                                         | 1 +
 cmd/cpu.c                                               | 1 +
 cmd/cros_ec.c                                           | 1 +
 cmd/demo.c                                              | 1 +
 cmd/dm.c                                                | 1 +
 cmd/eeprom.c                                            | 1 +
 cmd/efi.c                                               | 1 +
 cmd/efidebug.c                                          | 1 +
 cmd/elf.c                                               | 1 +
 cmd/ethsw.c                                             | 1 +
 cmd/fdt.c                                               | 1 +
 cmd/fpga.c                                              | 1 +
 cmd/host.c                                              | 1 +
 cmd/i2c.c                                               | 1 +
 cmd/ini.c                                               | 1 +
 cmd/io.c                                                | 1 +
 cmd/itest.c                                             | 1 +
 cmd/load.c                                              | 1 +
 cmd/log.c                                               | 1 +
 cmd/mem.c                                               | 1 +
 cmd/mii.c                                               | 1 +
 cmd/mmc.c                                               | 1 +
 cmd/mtd.c                                               | 1 +
 cmd/mvebu/bubt.c                                        | 1 +
 cmd/nand.c                                              | 1 +
 cmd/nvedit.c                                            | 1 +
 cmd/onenand.c                                           | 1 +
 cmd/osd.c                                               | 1 +
 cmd/part.c                                              | 1 +
 cmd/pci.c                                               | 1 +
 cmd/pinmux.c                                            | 1 +
 cmd/pmc.c                                               | 1 +
 cmd/pmic.c                                              | 1 +
 cmd/pxe.c                                               | 1 +
 cmd/pxe_utils.c                                         | 1 +
 cmd/pxe_utils.h                                         | 1 +
 cmd/qfw.c                                               | 1 +
 cmd/regulator.c                                         | 1 +
 cmd/remoteproc.c                                        | 1 +
 cmd/rtc.c                                               | 1 +
 cmd/sb.c                                                | 1 +
 cmd/sf.c                                                | 1 +
 cmd/sound.c                                             | 1 +
 cmd/spl.c                                               | 1 +
 cmd/test.c                                              | 1 +
 cmd/tlv_eeprom.c                                        | 1 +
 cmd/tpm-v1.c                                            | 1 +
 cmd/tpm-v2.c                                            | 1 +
 cmd/tpm_test.c                                          | 1 +
 cmd/trace.c                                             | 1 +
 cmd/ubi.c                                               | 1 +
 cmd/x86/fsp.c                                           | 1 +
 cmd/x86/hob.c                                           | 1 +
 cmd/x86/mtrr.c                                          | 1 +
 cmd/ximg.c                                              | 1 +
 common/android_ab.c                                     | 1 +
 common/autoboot.c                                       | 1 +
 common/avb_verify.c                                     | 1 +
 common/bloblist.c                                       | 1 +
 common/board_f.c                                        | 1 +
 common/board_r.c                                        | 1 +
 common/bootm.c                                          | 1 +
 common/bootm_os.c                                       | 1 +
 common/bootstage.c                                      | 1 +
 common/bouncebuf.c                                      | 1 +
 common/cli.c                                            | 1 +
 common/cli_hush.c                                       | 1 +
 common/console.c                                        | 1 +
 common/dfu.c                                            | 1 +
 common/dlmalloc.c                                       | 1 +
 common/edid.c                                           | 1 +
 common/eeprom/eeprom_field.c                            | 1 +
 common/fdt_support.c                                    | 1 +
 common/hash.c                                           | 1 +
 common/image-android-dt.c                               | 1 +
 common/image-android.c                                  | 1 +
 common/image-cipher.c                                   | 1 +
 common/image-fit-sig.c                                  | 1 +
 common/image-fit.c                                      | 1 +
 common/image-sig.c                                      | 1 +
 common/image.c                                          | 1 +
 common/init/board_init.c                                | 1 +
 common/iotrace.c                                        | 1 +
 common/lcd.c                                            | 1 +
 common/lcd_console.c                                    | 1 +
 common/log.c                                            | 1 +
 common/malloc_simple.c                                  | 1 +
 common/spl/spl.c                                        | 1 +
 common/spl/spl_fit.c                                    | 1 +
 common/spl/spl_sata.c                                   | 1 +
 common/spl/spl_spi.c                                    | 1 +
 common/splash.c                                         | 1 +
 common/splash_source.c                                  | 1 +
 common/update.c                                         | 1 +
 common/usb.c                                            | 1 +
 common/usb_hub.c                                        | 1 +
 common/usb_kbd.c                                        | 1 +
 common/xyzModem.c                                       | 1 +
 disk/part_dos.c                                         | 1 +
 disk/part_efi.c                                         | 1 +
 drivers/adc/adc-uclass.c                                | 1 +
 drivers/adc/meson-saradc.c                              | 1 +
 drivers/adc/stm32-adc-core.c                            | 1 +
 drivers/adc/stm32-adc.c                                 | 1 +
 drivers/ata/ahci.c                                      | 1 +
 drivers/ata/fsl_sata.c                                  | 1 +
 drivers/ata/sata_mv.c                                   | 1 +
 drivers/axi/axi-emul-uclass.c                           | 1 +
 drivers/axi/sandbox_store.c                             | 1 +
 drivers/bios_emulator/atibios.c                         | 1 +
 drivers/bios_emulator/x86emu/prim_ops.c                 | 1 +
 drivers/board/board-uclass.c                            | 1 +
 drivers/board/gazerbeam.c                               | 1 +
 drivers/board/sandbox.c                                 | 1 +
 drivers/bootcount/bootcount.c                           | 1 +
 drivers/clk/altera/clk-agilex.c                         | 1 +
 drivers/clk/altera/clk-arria10.c                        | 1 +
 drivers/clk/analogbits/wrpll-cln28hpc.c                 | 1 +
 drivers/clk/aspeed/clk_ast2500.c                        | 1 +
 drivers/clk/at91/clk-generated.c                        | 1 +
 drivers/clk/at91/clk-usb.c                              | 1 +
 drivers/clk/at91/pmc.c                                  | 1 +
 drivers/clk/clk-divider.c                               | 1 +
 drivers/clk/clk-hsdk-cgu.c                              | 1 +
 drivers/clk/clk-ti-sci.c                                | 1 +
 drivers/clk/clk.c                                       | 1 +
 drivers/clk/clk_sandbox.c                               | 1 +
 drivers/clk/clk_sandbox_ccf.c                           | 1 +
 drivers/clk/clk_stm32f.c                                | 1 +
 drivers/clk/clk_stm32mp1.c                              | 1 +
 drivers/clk/clk_versal.c                                | 1 +
 drivers/clk/clk_zynq.c                                  | 1 +
 drivers/clk/clk_zynqmp.c                                | 1 +
 drivers/clk/imx/clk-composite-8m.c                      | 1 +
 drivers/clk/imx/clk-gate2.c                             | 1 +
 drivers/clk/imx/clk-imx6q.c                             | 1 +
 drivers/clk/imx/clk-imx8.c                              | 1 +
 drivers/clk/imx/clk-imx8.h                              | 1 +
 drivers/clk/imx/clk-imx8mm.c                            | 1 +
 drivers/clk/imx/clk-imx8mn.c                            | 1 +
 drivers/clk/imx/clk-imx8mp.c                            | 1 +
 drivers/clk/imx/clk-imx8qm.c                            | 1 +
 drivers/clk/imx/clk-imx8qxp.c                           | 1 +
 drivers/clk/imx/clk-imxrt1020.c                         | 1 +
 drivers/clk/imx/clk-imxrt1050.c                         | 1 +
 drivers/clk/imx/clk-pfd.c                               | 1 +
 drivers/clk/imx/clk-pll14xx.c                           | 1 +
 drivers/clk/imx/clk-pllv3.c                             | 1 +
 drivers/clk/imx/clk.h                                   | 1 +
 drivers/clk/kendryte/clk.c                              | 1 +
 drivers/clk/kendryte/pll.c                              | 1 +
 drivers/clk/mediatek/clk-mtk.h                          | 1 +
 drivers/clk/meson/axg.c                                 | 1 +
 drivers/clk/meson/gxbb.c                                | 1 +
 drivers/clk/mpc83xx_clk.c                               | 1 +
 drivers/clk/mtmips/clk-mt7628.c                         | 1 +
 drivers/clk/mvebu/armada-37xx-periph.c                  | 1 +
 drivers/clk/renesas/clk-rcar-gen3.c                     | 1 +
 drivers/clk/renesas/r8a774a1-cpg-mssr.c                 | 1 +
 drivers/clk/renesas/r8a7790-cpg-mssr.c                  | 1 +
 drivers/clk/renesas/r8a7791-cpg-mssr.c                  | 1 +
 drivers/clk/renesas/r8a7792-cpg-mssr.c                  | 1 +
 drivers/clk/renesas/r8a7794-cpg-mssr.c                  | 1 +
 drivers/clk/renesas/r8a7795-cpg-mssr.c                  | 1 +
 drivers/clk/renesas/r8a7796-cpg-mssr.c                  | 1 +
 drivers/clk/renesas/r8a77965-cpg-mssr.c                 | 1 +
 drivers/clk/renesas/r8a77970-cpg-mssr.c                 | 1 +
 drivers/clk/renesas/r8a77980-cpg-mssr.c                 | 1 +
 drivers/clk/renesas/r8a77990-cpg-mssr.c                 | 1 +
 drivers/clk/renesas/r8a77995-cpg-mssr.c                 | 1 +
 drivers/clk/renesas/rcar-gen3-cpg.h                     | 1 +
 drivers/clk/renesas/renesas-cpg-mssr.c                  | 1 +
 drivers/clk/renesas/renesas-cpg-mssr.h                  | 1 +
 drivers/clk/rockchip/clk_px30.c                         | 1 +
 drivers/clk/rockchip/clk_rk3036.c                       | 1 +
 drivers/clk/rockchip/clk_rk3128.c                       | 1 +
 drivers/clk/rockchip/clk_rk3188.c                       | 1 +
 drivers/clk/rockchip/clk_rk322x.c                       | 1 +
 drivers/clk/rockchip/clk_rk3288.c                       | 1 +
 drivers/clk/rockchip/clk_rk3308.c                       | 1 +
 drivers/clk/rockchip/clk_rk3328.c                       | 1 +
 drivers/clk/rockchip/clk_rk3368.c                       | 1 +
 drivers/clk/rockchip/clk_rk3399.c                       | 1 +
 drivers/clk/rockchip/clk_rv1108.c                       | 1 +
 drivers/clk/sifive/fu540-prci.c                         | 1 +
 drivers/clk/sunxi/clk_a10.c                             | 1 +
 drivers/clk/sunxi/clk_a10s.c                            | 1 +
 drivers/clk/sunxi/clk_a23.c                             | 1 +
 drivers/clk/sunxi/clk_a31.c                             | 1 +
 drivers/clk/sunxi/clk_a64.c                             | 1 +
 drivers/clk/sunxi/clk_a80.c                             | 1 +
 drivers/clk/sunxi/clk_a83t.c                            | 1 +
 drivers/clk/sunxi/clk_h3.c                              | 1 +
 drivers/clk/sunxi/clk_h6.c                              | 1 +
 drivers/clk/sunxi/clk_r40.c                             | 1 +
 drivers/clk/sunxi/clk_v3s.c                             | 1 +
 drivers/clk/uniphier/clk-uniphier-core.c                | 1 +
 drivers/core/device-remove.c                            | 1 +
 drivers/core/device.c                                   | 1 +
 drivers/core/lists.c                                    | 1 +
 drivers/core/of_access.c                                | 1 +
 drivers/core/of_addr.c                                  | 1 +
 drivers/core/read.c                                     | 1 +
 drivers/core/root.c                                     | 1 +
 drivers/core/simple-bus.c                               | 1 +
 drivers/core/syscon-uclass.c                            | 1 +
 drivers/core/uclass.c                                   | 1 +
 drivers/cpu/mpc83xx_cpu.c                               | 1 +
 drivers/crypto/fsl/desc_constr.h                        | 1 +
 drivers/crypto/fsl/error.c                              | 1 +
 drivers/crypto/fsl/fsl_blob.c                           | 1 +
 drivers/crypto/fsl/fsl_hash.c                           | 1 +
 drivers/crypto/fsl/jobdesc.c                            | 1 +
 drivers/crypto/fsl/sec.c                                | 1 +
 drivers/crypto/rsa_mod_exp/mod_exp_uclass.c             | 1 +
 drivers/ddr/altera/sdram_gen5.c                         | 1 +
 drivers/ddr/altera/sdram_s10.c                          | 1 +
 drivers/ddr/altera/sdram_soc64.c                        | 1 +
 drivers/ddr/altera/sequencer.c                          | 1 +
 drivers/ddr/altera/sequencer.h                          | 1 +
 drivers/ddr/fsl/ctrl_regs.c                             | 1 +
 drivers/ddr/fsl/ddr1_dimm_params.c                      | 1 +
 drivers/ddr/fsl/ddr2_dimm_params.c                      | 1 +
 drivers/ddr/fsl/ddr4_dimm_params.c                      | 1 +
 drivers/ddr/fsl/interactive.c                           | 1 +
 drivers/ddr/fsl/lc_common_dimm_params.c                 | 1 +
 drivers/ddr/fsl/main.c                                  | 1 +
 drivers/ddr/fsl/util.c                                  | 1 +
 drivers/ddr/imx/imx8m/helper.c                          | 1 +
 drivers/ddr/marvell/axp/ddr3_spd.c                      | 1 +
 drivers/demo/demo-shape.c                               | 1 +
 drivers/dfu/dfu.c                                       | 1 +
 drivers/dfu/dfu_mmc.c                                   | 1 +
 drivers/dfu/dfu_mtd.c                                   | 1 +
 drivers/dma/apbh_dma.c                                  | 1 +
 drivers/dma/bcm6348-iudma.c                             | 1 +
 drivers/dma/dma-uclass.c                                | 1 +
 drivers/dma/fsl_dma.c                                   | 1 +
 drivers/dma/sandbox-dma-test.c                          | 1 +
 drivers/dma/ti/k3-udma.c                                | 1 +
 drivers/fastboot/fb_getvar.c                            | 1 +
 drivers/fastboot/fb_mmc.c                               | 1 +
 drivers/firmware/firmware-zynqmp.c                      | 1 +
 drivers/firmware/ti_sci.c                               | 1 +
 drivers/fpga/altera.c                                   | 1 +
 drivers/fpga/cyclon2.c                                  | 1 +
 drivers/fpga/socfpga.c                                  | 1 +
 drivers/fpga/socfpga_arria10.c                          | 1 +
 drivers/fpga/spartan3.c                                 | 2 ++
 drivers/fpga/stratix10.c                                | 1 +
 drivers/fpga/versalpl.c                                 | 1 +
 drivers/fpga/zynqmppl.c                                 | 1 +
 drivers/fpga/zynqpl.c                                   | 1 +
 drivers/gpio/at91_gpio.c                                | 1 +
 drivers/gpio/bcm6345_gpio.c                             | 1 +
 drivers/gpio/gpio-rcar.c                                | 1 +
 drivers/gpio/gpio-rza1.c                                | 1 +
 drivers/gpio/gpio-uclass.c                              | 1 +
 drivers/gpio/intel_ich6_gpio.c                          | 1 +
 drivers/gpio/iproc_gpio.c                               | 1 +
 drivers/gpio/mscc_sgpio.c                               | 1 +
 drivers/gpio/mxc_gpio.c                                 | 1 +
 drivers/gpio/mxs_gpio.c                                 | 1 +
 drivers/gpio/pca953x.c                                  | 1 +
 drivers/gpio/pca953x_gpio.c                             | 1 +
 drivers/gpio/pm8916_gpio.c                              | 1 +
 drivers/gpio/rk_gpio.c                                  | 1 +
 drivers/gpio/sh_pfc.c                                   | 1 +
 drivers/gpio/sifive-gpio.c                              | 1 +
 drivers/gpio/tca642x.c                                  | 1 +
 drivers/gpio/tegra186_gpio.c                            | 1 +
 drivers/i2c/at91_i2c.c                                  | 1 +
 drivers/i2c/cros_ec_ldo.c                               | 1 +
 drivers/i2c/designware_i2c.c                            | 1 +
 drivers/i2c/designware_i2c.h                            | 1 +
 drivers/i2c/designware_i2c_pci.c                        | 1 +
 drivers/i2c/exynos_hs_i2c.c                             | 1 +
 drivers/i2c/fsl_i2c.c                                   | 1 +
 drivers/i2c/i2c-cdns.c                                  | 1 +
 drivers/i2c/i2c-gpio.c                                  | 1 +
 drivers/i2c/i2c-uclass.c                                | 1 +
 drivers/i2c/i2c-uniphier-f.c                            | 1 +
 drivers/i2c/i2c-uniphier.c                              | 1 +
 drivers/i2c/ihs_i2c.c                                   | 1 +
 drivers/i2c/imx_lpi2c.c                                 | 1 +
 drivers/i2c/meson_i2c.c                                 | 1 +
 drivers/i2c/mxc_i2c.c                                   | 1 +
 drivers/i2c/nx_i2c.c                                    | 1 +
 drivers/i2c/rcar_iic.c                                  | 1 +
 drivers/i2c/rk_i2c.c                                    | 1 +
 drivers/i2c/s3c24x0_i2c.c                               | 1 +
 drivers/i2c/s3c24x0_i2c.h                               | 1 +
 drivers/i2c/sandbox_i2c.c                               | 1 +
 drivers/i2c/stm32f7_i2c.c                               | 1 +
 drivers/i2c/tegra186_bpmp_i2c.c                         | 1 +
 drivers/i2c/tegra_i2c.c                                 | 1 +
 drivers/input/cros_ec_keyb.c                            | 1 +
 drivers/input/i8042.c                                   | 1 +
 drivers/input/input.c                                   | 1 +
 drivers/led/led_bcm6328.c                               | 1 +
 drivers/led/led_bcm6358.c                               | 1 +
 drivers/led/led_bcm6858.c                               | 1 +
 drivers/mailbox/k3-sec-proxy.c                          | 1 +
 drivers/mailbox/sandbox-mbox.c                          | 1 +
 drivers/misc/atsha204a-i2c.c                            | 1 +
 drivers/misc/cros_ec.c                                  | 1 +
 drivers/misc/cros_ec_i2c.c                              | 1 +
 drivers/misc/cros_ec_sandbox.c                          | 1 +
 drivers/misc/cros_ec_spi.c                              | 1 +
 drivers/misc/ds4510.c                                   | 1 +
 drivers/misc/fsl_ifc.c                                  | 1 +
 drivers/misc/fsl_iim.c                                  | 1 +
 drivers/misc/gdsys_ioep.c                               | 1 +
 drivers/misc/gdsys_rxaui_ctrl.c                         | 1 +
 drivers/misc/gpio_led.c                                 | 1 +
 drivers/misc/i2c_eeprom_emul.c                          | 1 +
 drivers/misc/ihs_fpga.c                                 | 1 +
 drivers/misc/irq-uclass.c                               | 1 +
 drivers/misc/irq_sandbox.c                              | 1 +
 drivers/misc/misc-uclass.c                              | 1 +
 drivers/misc/misc_sandbox.c                             | 1 +
 drivers/misc/mpc83xx_serdes.c                           | 1 +
 drivers/misc/mxc_ocotp.c                                | 2 ++
 drivers/misc/mxs_ocotp.c                                | 1 +
 drivers/misc/p2sb-uclass.c                              | 1 +
 drivers/misc/p2sb_emul.c                                | 1 +
 drivers/misc/pwrseq-uclass.c                            | 1 +
 drivers/misc/qfw.c                                      | 1 +
 drivers/misc/rockchip-efuse.c                           | 1 +
 drivers/misc/rockchip-otp.c                             | 1 +
 drivers/misc/spltest_sandbox.c                          | 1 +
 drivers/misc/swap_case.c                                | 1 +
 drivers/misc/tegra186_bpmp.c                            | 1 +
 drivers/misc/vexpress_config.c                          | 1 +
 drivers/mmc/bcm2835_sdhost.c                            | 1 +
 drivers/mmc/dw_mmc.c                                    | 1 +
 drivers/mmc/exynos_dw_mmc.c                             | 1 +
 drivers/mmc/fsl_esdhc.c                                 | 1 +
 drivers/mmc/fsl_esdhc_imx.c                             | 1 +
 drivers/mmc/fsl_esdhc_spl.c                             | 1 +
 drivers/mmc/ftsdc010_mci.h                              | 1 +
 drivers/mmc/gen_atmel_mci.c                             | 1 +
 drivers/mmc/hi6220_dw_mmc.c                             | 1 +
 drivers/mmc/jz_mmc.c                                    | 1 +
 drivers/mmc/meson_gx_mmc.c                              | 1 +
 drivers/mmc/mmc-uclass.c                                | 1 +
 drivers/mmc/mmc.c                                       | 1 +
 drivers/mmc/mmc_spi.c                                   | 1 +
 drivers/mmc/mmc_write.c                                 | 1 +
 drivers/mmc/mtk-sd.c                                    | 1 +
 drivers/mmc/mxsmmc.c                                    | 1 +
 drivers/mmc/nexell_dw_mmc.c                             | 1 +
 drivers/mmc/omap_hsmmc.c                                | 1 +
 drivers/mmc/pxa_mmc_gen.c                               | 1 +
 drivers/mmc/renesas-sdhi.c                              | 1 +
 drivers/mmc/rpmb.c                                      | 1 +
 drivers/mmc/sandbox_mmc.c                               | 1 +
 drivers/mmc/sdhci-cadence.c                             | 1 +
 drivers/mmc/sdhci.c                                     | 1 +
 drivers/mmc/sh_mmcif.c                                  | 1 +
 drivers/mmc/snps_dw_mmc.c                               | 1 +
 drivers/mmc/stm32_sdmmc2.c                              | 1 +
 drivers/mmc/sunxi_mmc.c                                 | 1 +
 drivers/mmc/tmio-common.c                               | 1 +
 drivers/mmc/tmio-common.h                               | 1 +
 drivers/mmc/uniphier-sd.c                               | 1 +
 drivers/mmc/xenon_sdhci.c                               | 1 +
 drivers/mtd/cfi_flash.c                                 | 1 +
 drivers/mtd/hbmc-am654.c                                | 1 +
 drivers/mtd/jedec_flash.c                               | 1 +
 drivers/mtd/nand/bbt.c                                  | 1 +
 drivers/mtd/nand/core.c                                 | 1 +
 drivers/mtd/nand/raw/arasan_nfc.c                       | 1 +
 drivers/mtd/nand/raw/brcmnand/bcm63158_nand.c           | 1 +
 drivers/mtd/nand/raw/brcmnand/bcm6368_nand.c            | 1 +
 drivers/mtd/nand/raw/brcmnand/bcm68360_nand.c           | 1 +
 drivers/mtd/nand/raw/brcmnand/bcm6838_nand.c            | 1 +
 drivers/mtd/nand/raw/brcmnand/bcm6858_nand.c            | 1 +
 drivers/mtd/nand/raw/brcmnand/brcmnand.c                | 1 +
 drivers/mtd/nand/raw/brcmnand/brcmnand.h                | 1 +
 drivers/mtd/nand/raw/davinci_nand.c                     | 1 +
 drivers/mtd/nand/raw/denali.c                           | 1 +
 drivers/mtd/nand/raw/denali_spl.c                       | 1 +
 drivers/mtd/nand/raw/fsl_elbc_nand.c                    | 1 +
 drivers/mtd/nand/raw/fsl_ifc_nand.c                     | 1 +
 drivers/mtd/nand/raw/fsmc_nand.c                        | 1 +
 drivers/mtd/nand/raw/lpc32xx_nand_mlc.c                 | 1 +
 drivers/mtd/nand/raw/lpc32xx_nand_slc.c                 | 1 +
 drivers/mtd/nand/raw/mxc_nand.c                         | 1 +
 drivers/mtd/nand/raw/mxc_nand_spl.c                     | 1 +
 drivers/mtd/nand/raw/mxs_nand.c                         | 1 +
 drivers/mtd/nand/raw/nand_base.c                        | 1 +
 drivers/mtd/nand/raw/nand_bbt.c                         | 1 +
 drivers/mtd/nand/raw/nand_bch.c                         | 1 +
 drivers/mtd/nand/raw/nand_spl_loaders.c                 | 1 +
 drivers/mtd/nand/raw/nand_util.c                        | 1 +
 drivers/mtd/nand/raw/pxa3xx_nand.c                      | 1 +
 drivers/mtd/nand/raw/pxa3xx_nand.h                      | 1 +
 drivers/mtd/nand/raw/stm32_fmc2_nand.c                  | 1 +
 drivers/mtd/nand/raw/sunxi_nand_spl.c                   | 1 +
 drivers/mtd/nand/raw/vf610_nfc.c                        | 1 +
 drivers/mtd/nand/raw/zynq_nand.c                        | 1 +
 drivers/mtd/onenand/onenand_base.c                      | 1 +
 drivers/mtd/onenand/onenand_spl.c                       | 1 +
 drivers/mtd/renesas_rpc_hf.c                            | 1 +
 drivers/mtd/spi/sandbox.c                               | 1 +
 drivers/mtd/spi/sf_dataflash.c                          | 1 +
 drivers/mtd/spi/sf_mtd.c                                | 1 +
 drivers/mtd/spi/spi-nor-core.c                          | 1 +
 drivers/mtd/spi/spi-nor-tiny.c                          | 1 +
 drivers/mtd/st_smi.c                                    | 1 +
 drivers/mtd/ubi/debug.c                                 | 1 +
 drivers/mtd/ubi/eba.c                                   | 1 +
 drivers/mtd/ubi/fastmap-wl.c                            | 1 +
 drivers/mtd/ubi/fastmap.c                               | 1 +
 drivers/mtd/ubi/io.c                                    | 1 +
 drivers/mtd/ubi/misc.c                                  | 1 +
 drivers/mtd/ubi/ubi.h                                   | 1 +
 drivers/mtd/ubi/upd.c                                   | 1 +
 drivers/mtd/ubi/vmt.c                                   | 1 +
 drivers/mtd/ubi/vtbl.c                                  | 1 +
 drivers/mtd/ubispl/ubispl.c                             | 1 +
 drivers/net/armada100_fec.h                             | 1 +
 drivers/net/ax88180.c                                   | 1 +
 drivers/net/bcm-sf2-eth-gmac.c                          | 1 +
 drivers/net/bcm-sf2-eth.h                               | 1 +
 drivers/net/bcm6348-eth.c                               | 1 +
 drivers/net/bcm6368-eth.c                               | 1 +
 drivers/net/bcmgenet.c                                  | 1 +
 drivers/net/dc2114x.c                                   | 1 +
 drivers/net/dnet.c                                      | 1 +
 drivers/net/dwc_eth_qos.c                               | 1 +
 drivers/net/e1000.c                                     | 1 +
 drivers/net/e1000.h                                     | 1 +
 drivers/net/e1000_spi.c                                 | 1 +
 drivers/net/eepro100.c                                  | 1 +
 drivers/net/fec_mxc.c                                   | 1 +
 drivers/net/fm/eth.c                                    | 1 +
 drivers/net/fm/init.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/ftgmac100.c                                 | 1 +
 drivers/net/ftmac110.c                                  | 1 +
 drivers/net/gmac_rockchip.c                             | 1 +
 drivers/net/ks8851_mll.c                                | 1 +
 drivers/net/lan91c96.c                                  | 1 +
 drivers/net/ldpaa_eth/ldpaa_eth.c                       | 1 +
 drivers/net/ldpaa_eth/ldpaa_eth.h                       | 1 +
 drivers/net/lpc32xx_eth.c                               | 1 +
 drivers/net/macb.c                                      | 1 +
 drivers/net/mcfmii.c                                    | 1 +
 drivers/net/mpc8xx_fec.c                                | 1 +
 drivers/net/mscc_eswitch/jr2_switch.c                   | 1 +
 drivers/net/mscc_eswitch/luton_switch.c                 | 1 +
 drivers/net/mscc_eswitch/mscc_xfer.c                    | 1 +
 drivers/net/mscc_eswitch/mscc_xfer.h                    | 1 +
 drivers/net/mscc_eswitch/ocelot_switch.c                | 1 +
 drivers/net/mscc_eswitch/serval_switch.c                | 1 +
 drivers/net/mscc_eswitch/servalt_switch.c               | 1 +
 drivers/net/mtk_eth.c                                   | 1 +
 drivers/net/mvgbe.h                                     | 1 +
 drivers/net/mvneta.c                                    | 1 +
 drivers/net/mvpp2.c                                     | 1 +
 drivers/net/ne2000.c                                    | 1 +
 drivers/net/ne2000_base.c                               | 1 +
 drivers/net/ne2000_base.h                               | 1 +
 drivers/net/netconsole.c                                | 1 +
 drivers/net/pch_gbe.h                                   | 1 +
 drivers/net/pfe_eth/pfe_mdio.c                          | 1 +
 drivers/net/phy/aquantia.c                              | 1 +
 drivers/net/phy/atheros.c                               | 1 +
 drivers/net/phy/dp83867.c                               | 1 +
 drivers/net/phy/micrel_ksz90x1.c                        | 1 +
 drivers/net/phy/mscc.c                                  | 1 +
 drivers/net/phy/mv88e61xx.c                             | 1 +
 drivers/net/phy/ncsi.c                                  | 1 +
 drivers/net/ravb.c                                      | 1 +
 drivers/net/rtl8139.c                                   | 1 +
 drivers/net/rtl8169.c                                   | 1 +
 drivers/net/sandbox.c                                   | 1 +
 drivers/net/sh_eth.c                                    | 1 +
 drivers/net/smc911x.c                                   | 1 +
 drivers/net/sni_ave.c                                   | 1 +
 drivers/net/sun8i_emac.c                                | 1 +
 drivers/net/ti/am65-cpsw-nuss.c                         | 1 +
 drivers/net/ti/cpsw.c                                   | 1 +
 drivers/net/ti/davinci_emac.c                           | 1 +
 drivers/net/ti/davinci_emac.h                           | 1 +
 drivers/net/ti/keystone_net.c                           | 1 +
 drivers/net/tsec.c                                      | 1 +
 drivers/net/zynq_gem.c                                  | 1 +
 drivers/nvme/nvme.c                                     | 1 +
 drivers/nvme/nvme.h                                     | 1 +
 drivers/pch/pch-uclass.c                                | 1 +
 drivers/pch/pch7.c                                      | 1 +
 drivers/pch/sandbox_pch.c                               | 1 +
 drivers/pci/fsl_pci_init.c                              | 1 +
 drivers/pci/pci-aardvark.c                              | 1 +
 drivers/pci/pci-rcar-gen3.c                             | 1 +
 drivers/pci/pci-uclass.c                                | 1 +
 drivers/pci/pci.c                                       | 1 +
 drivers/pci/pci_auto.c                                  | 1 +
 drivers/pci/pci_auto_common.c                           | 1 +
 drivers/pci/pci_auto_old.c                              | 1 +
 drivers/pci/pci_gt64120.c                               | 1 +
 drivers/pci/pci_msc01.c                                 | 1 +
 drivers/pci/pci_mvebu.c                                 | 1 +
 drivers/pci/pci_rom.c                                   | 1 +
 drivers/pci/pci_tegra.c                                 | 1 +
 drivers/pci/pcie_brcmstb.c                              | 1 +
 drivers/pci/pcie_dw_mvebu.c                             | 1 +
 drivers/pci/pcie_dw_ti.c                                | 1 +
 drivers/pci/pcie_ecam_generic.c                         | 1 +
 drivers/pci/pcie_fsl.c                                  | 1 +
 drivers/pci/pcie_fsl.h                                  | 1 +
 drivers/pci/pcie_imx.c                                  | 1 +
 drivers/pci/pcie_intel_fpga.c                           | 1 +
 drivers/pci/pcie_layerscape.h                           | 1 +
 drivers/pci/pcie_layerscape_ep.c                        | 1 +
 drivers/pci/pcie_layerscape_fixup_common.c              | 1 +
 drivers/pci/pcie_layerscape_gen4.c                      | 1 +
 drivers/pci/pcie_layerscape_gen4.h                      | 1 +
 drivers/pci/pcie_xilinx.c                               | 1 +
 drivers/pci_endpoint/pci_ep-uclass.c                    | 1 +
 drivers/pci_endpoint/pcie-cadence-ep.c                  | 1 +
 drivers/phy/marvell/comphy_a3700.c                      | 1 +
 drivers/phy/marvell/comphy_cp110.c                      | 1 +
 drivers/phy/phy-stm32-usbphyc.c                         | 1 +
 drivers/phy/rockchip/phy-rockchip-inno-usb2.c           | 1 +
 drivers/phy/rockchip/phy-rockchip-typec.c               | 1 +
 drivers/phy/sandbox-phy.c                               | 1 +
 drivers/phy/sti_usb_phy.c                               | 1 +
 drivers/pinctrl/aspeed/pinctrl_ast2500.c                | 1 +
 drivers/pinctrl/ath79/pinctrl_ar933x.c                  | 1 +
 drivers/pinctrl/ath79/pinctrl_qca953x.c                 | 1 +
 drivers/pinctrl/exynos/pinctrl-exynos7420.c             | 1 +
 drivers/pinctrl/intel/pinctrl_apl.c                     | 1 +
 drivers/pinctrl/mediatek/pinctrl-mt7622.c               | 1 +
 drivers/pinctrl/mediatek/pinctrl-mt7623.c               | 1 +
 drivers/pinctrl/mediatek/pinctrl-mt7629.c               | 1 +
 drivers/pinctrl/mediatek/pinctrl-mt8512.c               | 1 +
 drivers/pinctrl/mediatek/pinctrl-mt8516.c               | 1 +
 drivers/pinctrl/mediatek/pinctrl-mt8518.c               | 1 +
 drivers/pinctrl/mediatek/pinctrl-mtk-common.c           | 1 +
 drivers/pinctrl/mediatek/pinctrl-mtk-common.h           | 1 +
 drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c           | 1 +
 drivers/pinctrl/meson/pinctrl-meson-axg.c               | 1 +
 drivers/pinctrl/meson/pinctrl-meson-g12a.c              | 1 +
 drivers/pinctrl/meson/pinctrl-meson-gx-pmx.c            | 1 +
 drivers/pinctrl/meson/pinctrl-meson-gxbb.c              | 1 +
 drivers/pinctrl/meson/pinctrl-meson-gxl.c               | 1 +
 drivers/pinctrl/meson/pinctrl-meson.h                   | 1 +
 drivers/pinctrl/mscc/pinctrl-jr2.c                      | 1 +
 drivers/pinctrl/mscc/pinctrl-luton.c                    | 1 +
 drivers/pinctrl/mscc/pinctrl-ocelot.c                   | 1 +
 drivers/pinctrl/mscc/pinctrl-serval.c                   | 1 +
 drivers/pinctrl/mscc/pinctrl-servalt.c                  | 1 +
 drivers/pinctrl/mtmips/pinctrl-mt7628.c                 | 1 +
 drivers/pinctrl/mtmips/pinctrl-mtmips-common.h          | 1 +
 drivers/pinctrl/mvebu/pinctrl-armada-37xx.c             | 1 +
 drivers/pinctrl/nexell/pinctrl-s5pxx18.c                | 1 +
 drivers/pinctrl/pinctrl-at91-pio4.c                     | 1 +
 drivers/pinctrl/pinctrl-at91.c                          | 1 +
 drivers/pinctrl/pinctrl-generic.c                       | 1 +
 drivers/pinctrl/pinctrl-sandbox.c                       | 1 +
 drivers/pinctrl/pinctrl-single.c                        | 1 +
 drivers/pinctrl/pinctrl-sti.c                           | 1 +
 drivers/pinctrl/pinctrl-stmfx.c                         | 1 +
 drivers/pinctrl/pinctrl_pic32.c                         | 1 +
 drivers/pinctrl/pinctrl_stm32.c                         | 1 +
 drivers/pinctrl/renesas/pfc-r7s72100.c                  | 1 +
 drivers/pinctrl/renesas/pfc.c                           | 1 +
 drivers/pinctrl/renesas/sh_pfc.h                        | 1 +
 drivers/pinctrl/rockchip/pinctrl-px30.c                 | 1 +
 drivers/pinctrl/rockchip/pinctrl-rk3036.c               | 1 +
 drivers/pinctrl/rockchip/pinctrl-rk3128.c               | 1 +
 drivers/pinctrl/rockchip/pinctrl-rk3188.c               | 1 +
 drivers/pinctrl/rockchip/pinctrl-rk322x.c               | 1 +
 drivers/pinctrl/rockchip/pinctrl-rk3288.c               | 1 +
 drivers/pinctrl/rockchip/pinctrl-rk3308.c               | 1 +
 drivers/pinctrl/rockchip/pinctrl-rk3328.c               | 1 +
 drivers/pinctrl/rockchip/pinctrl-rk3368.c               | 1 +
 drivers/pinctrl/rockchip/pinctrl-rk3399.c               | 1 +
 drivers/pinctrl/rockchip/pinctrl-rockchip-core.c        | 1 +
 drivers/pinctrl/rockchip/pinctrl-rockchip.h             | 1 +
 drivers/pinctrl/rockchip/pinctrl-rv1108.c               | 1 +
 drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c        | 1 +
 drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c        | 1 +
 drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c         | 1 +
 drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c        | 1 +
 drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c        | 1 +
 drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c        | 1 +
 drivers/pinctrl/uniphier/pinctrl-uniphier-pxs2.c        | 1 +
 drivers/pinctrl/uniphier/pinctrl-uniphier-pxs3.c        | 1 +
 drivers/pinctrl/uniphier/pinctrl-uniphier-sld8.c        | 1 +
 drivers/power/acpi_pmc/acpi-pmc-uclass.c                | 1 +
 drivers/power/acpi_pmc/pmc_emul.c                       | 1 +
 drivers/power/axp809.c                                  | 1 +
 drivers/power/axp818.c                                  | 1 +
 drivers/power/domain/imx8-power-domain-legacy.c         | 1 +
 drivers/power/domain/meson-ee-pwrc.c                    | 1 +
 drivers/power/domain/power-domain-uclass.c              | 1 +
 drivers/power/domain/sandbox-power-domain.c             | 1 +
 drivers/power/domain/tegra186-power-domain.c            | 1 +
 drivers/power/fuel_gauge/fg_max17042.c                  | 1 +
 drivers/power/pmic/da9063.c                             | 1 +
 drivers/power/pmic/i2c_pmic_emul.c                      | 1 +
 drivers/power/pmic/rk8xx.c                              | 1 +
 drivers/power/regulator/act8846.c                       | 1 +
 drivers/power/regulator/as3722_regulator.c              | 1 +
 drivers/power/regulator/bd71837.c                       | 1 +
 drivers/power/regulator/da9063.c                        | 1 +
 drivers/power/regulator/fan53555.c                      | 1 +
 drivers/power/regulator/fixed.c                         | 1 +
 drivers/power/regulator/gpio-regulator.c                | 1 +
 drivers/power/regulator/lp873x_regulator.c              | 1 +
 drivers/power/regulator/lp87565_regulator.c             | 1 +
 drivers/power/regulator/max77686.c                      | 1 +
 drivers/power/regulator/palmas_regulator.c              | 1 +
 drivers/power/regulator/pfuze100.c                      | 1 +
 drivers/power/regulator/pwm_regulator.c                 | 1 +
 drivers/power/regulator/regulator-uclass.c              | 1 +
 drivers/power/regulator/regulator_common.c              | 1 +
 drivers/power/regulator/regulator_common.h              | 2 ++
 drivers/power/regulator/rk8xx.c                         | 1 +
 drivers/power/regulator/s2mps11_regulator.c             | 1 +
 drivers/power/regulator/s5m8767.c                       | 1 +
 drivers/power/regulator/sandbox.c                       | 1 +
 drivers/power/regulator/stpmic1.c                       | 1 +
 drivers/power/regulator/tps62360_regulator.c            | 1 +
 drivers/power/regulator/tps65090_regulator.c            | 1 +
 drivers/power/regulator/tps65910_regulator.c            | 1 +
 drivers/power/regulator/tps65941_regulator.c            | 1 +
 drivers/power/tps6586x.c                                | 1 +
 drivers/pwm/exynos_pwm.c                                | 1 +
 drivers/pwm/pwm-imx.c                                   | 1 +
 drivers/pwm/pwm-mtk.c                                   | 1 +
 drivers/pwm/pwm-sifive.c                                | 1 +
 drivers/pwm/pwm-uclass.c                                | 1 +
 drivers/pwm/rk_pwm.c                                    | 1 +
 drivers/pwm/sandbox_pwm.c                               | 1 +
 drivers/pwm/sunxi_pwm.c                                 | 1 +
 drivers/pwm/tegra_pwm.c                                 | 1 +
 drivers/qe/uec.c                                        | 1 +
 drivers/qe/uec_phy.c                                    | 1 +
 drivers/ram/k3-j721e/lpddr4_if.h                        | 1 +
 drivers/ram/k3-j721e/lpddr4_sanity.h                    | 1 +
 drivers/ram/k3-j721e/lpddr4_structs_if.h                | 1 +
 drivers/ram/rockchip/dmc-rk3368.c                       | 1 +
 drivers/ram/rockchip/sdram_px30.c                       | 1 +
 drivers/ram/rockchip/sdram_rk3188.c                     | 1 +
 drivers/ram/rockchip/sdram_rk322x.c                     | 1 +
 drivers/ram/rockchip/sdram_rk3288.c                     | 1 +
 drivers/ram/rockchip/sdram_rk3328.c                     | 1 +
 drivers/ram/rockchip/sdram_rk3399.c                     | 1 +
 drivers/ram/stm32mp1/stm32mp1_ddr.c                     | 1 +
 drivers/ram/stm32mp1/stm32mp1_ddr.h                     | 1 +
 drivers/ram/stm32mp1/stm32mp1_interactive.c             | 1 +
 drivers/ram/stm32mp1/stm32mp1_ram.c                     | 1 +
 drivers/ram/stm32mp1/stm32mp1_tests.c                   | 1 +
 drivers/ram/stm32mp1/stm32mp1_tuning.c                  | 1 +
 drivers/remoteproc/rproc-elf-loader.c                   | 1 +
 drivers/remoteproc/rproc-uclass.c                       | 1 +
 drivers/remoteproc/ti_k3_dsp_rproc.c                    | 1 +
 drivers/reset/ast2500-reset.c                           | 1 +
 drivers/reset/reset-hsdk.c                              | 1 +
 drivers/reset/reset-meson.c                             | 1 +
 drivers/reset/reset-socfpga.c                           | 1 +
 drivers/reset/sandbox-reset.c                           | 1 +
 drivers/reset/sti-reset.c                               | 1 +
 drivers/rng/rockchip_rng.c                              | 1 +
 drivers/rtc/ds1374.c                                    | 1 +
 drivers/rtc/i2c_rtc_emul.c                              | 1 +
 drivers/rtc/rv3029.c                                    | 1 +
 drivers/scsi/scsi.c                                     | 1 +
 drivers/serial/altera_jtag_uart.c                       | 1 +
 drivers/serial/altera_uart.c                            | 1 +
 drivers/serial/arm_dcc.c                                | 1 +
 drivers/serial/atmel_usart.c                            | 1 +
 drivers/serial/lpc32xx_hsuart.c                         | 1 +
 drivers/serial/ns16550.c                                | 1 +
 drivers/serial/sandbox.c                                | 1 +
 drivers/serial/serial-uclass.c                          | 1 +
 drivers/serial/serial.c                                 | 1 +
 drivers/serial/serial_ar933x.c                          | 1 +
 drivers/serial/serial_arc.c                             | 1 +
 drivers/serial/serial_bcm283x_mu.c                      | 1 +
 drivers/serial/serial_bcm283x_pl011.c                   | 1 +
 drivers/serial/serial_bcm6345.c                         | 1 +
 drivers/serial/serial_cortina.c                         | 1 +
 drivers/serial/serial_efi.c                             | 1 +
 drivers/serial/serial_linflexuart.c                     | 1 +
 drivers/serial/serial_lpuart.c                          | 1 +
 drivers/serial/serial_mcf.c                             | 1 +
 drivers/serial/serial_meson.c                           | 1 +
 drivers/serial/serial_mpc8xx.c                          | 1 +
 drivers/serial/serial_msm.c                             | 1 +
 drivers/serial/serial_mtk.c                             | 1 +
 drivers/serial/serial_mvebu_a3700.c                     | 1 +
 drivers/serial/serial_mxc.c                             | 1 +
 drivers/serial/serial_nulldev.c                         | 1 +
 drivers/serial/serial_owl.c                             | 1 +
 drivers/serial/serial_pic32.c                           | 1 +
 drivers/serial/serial_pl01x.c                           | 1 +
 drivers/serial/serial_pl01x_internal.h                  | 1 +
 drivers/serial/serial_pxa.c                             | 1 +
 drivers/serial/serial_s5p.c                             | 1 +
 drivers/serial/serial_sh.c                              | 1 +
 drivers/serial/serial_sti_asc.c                         | 1 +
 drivers/serial/serial_stm32.c                           | 1 +
 drivers/serial/serial_stm32.h                           | 1 +
 drivers/serial/serial_uniphier.c                        | 1 +
 drivers/serial/serial_xuartlite.c                       | 1 +
 drivers/serial/usbtty.c                                 | 1 +
 drivers/smem/msm_smem.c                                 | 1 +
 drivers/soc/soc-uclass.c                                | 1 +
 drivers/soc/ti/k3-navss-ringacc.c                       | 1 +
 drivers/soc/ti/keystone_serdes.c                        | 1 +
 drivers/sound/da7219.c                                  | 1 +
 drivers/sound/max98088.c                                | 1 +
 drivers/sound/max98095.c                                | 1 +
 drivers/sound/max98357a.c                               | 1 +
 drivers/sound/rockchip_i2s.c                            | 1 +
 drivers/sound/rt5677.c                                  | 1 +
 drivers/sound/sandbox.c                                 | 1 +
 drivers/sound/tegra_ahub.c                              | 1 +
 drivers/sound/wm8994.c                                  | 1 +
 drivers/spi/atcspi200_spi.c                             | 1 +
 drivers/spi/atmel-quadspi.c                             | 1 +
 drivers/spi/atmel_spi.c                                 | 1 +
 drivers/spi/bcm63xx_hsspi.c                             | 1 +
 drivers/spi/bcmstb_spi.c                                | 1 +
 drivers/spi/cadence_qspi.h                              | 1 +
 drivers/spi/cadence_qspi_apb.c                          | 1 +
 drivers/spi/davinci_spi.c                               | 1 +
 drivers/spi/designware_spi.c                            | 1 +
 drivers/spi/exynos_spi.c                                | 1 +
 drivers/spi/fsl_dspi.c                                  | 1 +
 drivers/spi/fsl_espi.c                                  | 1 +
 drivers/spi/fsl_qspi.c                                  | 1 +
 drivers/spi/ich.c                                       | 1 +
 drivers/spi/kirkwood_spi.c                              | 1 +
 drivers/spi/meson_spifc.c                               | 1 +
 drivers/spi/mpc8xxx_spi.c                               | 1 +
 drivers/spi/mscc_bb_spi.c                               | 1 +
 drivers/spi/mt7621_spi.c                                | 1 +
 drivers/spi/mvebu_a3700_spi.c                           | 1 +
 drivers/spi/mxc_spi.c                                   | 1 +
 drivers/spi/mxs_spi.c                                   | 1 +
 drivers/spi/pic32_spi.c                                 | 1 +
 drivers/spi/pl022_spi.c                                 | 1 +
 drivers/spi/renesas_rpc_spi.c                           | 1 +
 drivers/spi/rk_spi.c                                    | 1 +
 drivers/spi/sh_qspi.c                                   | 1 +
 drivers/spi/spi-mem-nodm.c                              | 1 +
 drivers/spi/spi-mem.c                                   | 1 +
 drivers/spi/spi-sifive.c                                | 1 +
 drivers/spi/spi-sunxi.c                                 | 1 +
 drivers/spi/spi-uclass.c                                | 1 +
 drivers/spi/stm32_qspi.c                                | 1 +
 drivers/spi/stm32_spi.c                                 | 1 +
 drivers/spi/uniphier_spi.c                              | 1 +
 drivers/spi/zynqmp_gqspi.c                              | 1 +
 drivers/spmi/spmi-msm.c                                 | 1 +
 drivers/spmi/spmi-sandbox.c                             | 1 +
 drivers/sysreset/sysreset_mpc83xx.c                     | 1 +
 drivers/tee/broadcom/chimp_optee.c                      | 1 +
 drivers/tee/optee/core.c                                | 1 +
 drivers/tee/optee/optee_smc.h                           | 1 +
 drivers/tee/optee/rpmb.c                                | 1 +
 drivers/tee/sandbox.c                                   | 1 +
 drivers/tee/tee-uclass.c                                | 1 +
 drivers/thermal/imx_scu_thermal.c                       | 1 +
 drivers/thermal/imx_tmu.c                               | 1 +
 drivers/timer/sandbox_timer.c                           | 1 +
 drivers/timer/timer-uclass.c                            | 1 +
 drivers/timer/tsc_timer.c                               | 2 ++
 drivers/tpm/cr50_i2c.c                                  | 1 +
 drivers/tpm/tpm2_tis_sandbox.c                          | 1 +
 drivers/tpm/tpm2_tis_spi.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/ufs/ufs.c                                       | 1 +
 drivers/ufs/ufs.h                                       | 1 +
 drivers/usb/cdns3/cdns3-ti.c                            | 1 +
 drivers/usb/cdns3/core.h                                | 1 +
 drivers/usb/cdns3/ep0.c                                 | 1 +
 drivers/usb/cdns3/gadget.c                              | 1 +
 drivers/usb/cdns3/gadget.h                              | 1 +
 drivers/usb/common/common.c                             | 1 +
 drivers/usb/common/fsl-dt-fixup.c                       | 1 +
 drivers/usb/common/fsl-errata.c                         | 1 +
 drivers/usb/dwc3/core.c                                 | 1 +
 drivers/usb/dwc3/gadget.c                               | 1 +
 drivers/usb/dwc3/gadget.h                               | 1 +
 drivers/usb/dwc3/io.h                                   | 1 +
 drivers/usb/emul/sandbox_flash.c                        | 1 +
 drivers/usb/emul/sandbox_keyb.c                         | 1 +
 drivers/usb/emul/usb-emul-uclass.c                      | 1 +
 drivers/usb/eth/lan7x.c                                 | 1 +
 drivers/usb/eth/lan7x.h                                 | 1 +
 drivers/usb/eth/mcs7830.c                               | 1 +
 drivers/usb/eth/r8152.c                                 | 1 +
 drivers/usb/eth/r8152.h                                 | 1 +
 drivers/usb/eth/r8152_fw.c                              | 1 +
 drivers/usb/eth/smsc95xx.c                              | 1 +
 drivers/usb/eth/usb_ether.c                             | 1 +
 drivers/usb/gadget/at91_udc.c                           | 1 +
 drivers/usb/gadget/at91_udc.h                           | 1 +
 drivers/usb/gadget/atmel_usba_udc.c                     | 1 +
 drivers/usb/gadget/atmel_usba_udc.h                     | 1 +
 drivers/usb/gadget/ci_udc.c                             | 1 +
 drivers/usb/gadget/ci_udc.h                             | 1 +
 drivers/usb/gadget/composite.c                          | 1 +
 drivers/usb/gadget/designware_udc.c                     | 1 +
 drivers/usb/gadget/dwc2_udc_otg.c                       | 1 +
 drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c              | 1 +
 drivers/usb/gadget/ep0.c                                | 1 +
 drivers/usb/gadget/ether.c                              | 1 +
 drivers/usb/gadget/f_dfu.c                              | 1 +
 drivers/usb/gadget/f_fastboot.c                         | 1 +
 drivers/usb/gadget/f_mass_storage.c                     | 1 +
 drivers/usb/gadget/f_rockusb.c                          | 1 +
 drivers/usb/gadget/f_sdp.c                              | 1 +
 drivers/usb/gadget/f_thor.c                             | 1 +
 drivers/usb/gadget/fotg210.c                            | 1 +
 drivers/usb/gadget/g_dnl.c                              | 1 +
 drivers/usb/gadget/pxa25x_udc.c                         | 1 +
 drivers/usb/gadget/pxa27x_udc.c                         | 1 +
 drivers/usb/gadget/rndis.c                              | 1 +
 drivers/usb/gadget/udc/udc-core.c                       | 1 +
 drivers/usb/gadget/udc/udc-uclass.c                     | 1 +
 drivers/usb/gadget/usbstring.c                          | 1 +
 drivers/usb/host/dwc2.c                                 | 1 +
 drivers/usb/host/dwc3-sti-glue.c                        | 1 +
 drivers/usb/host/ehci-faraday.c                         | 1 +
 drivers/usb/host/ehci-fsl.c                             | 1 +
 drivers/usb/host/ehci-hcd.c                             | 1 +
 drivers/usb/host/ehci-msm.c                             | 1 +
 drivers/usb/host/ehci-mx6.c                             | 1 +
 drivers/usb/host/ehci-mxs.c                             | 1 +
 drivers/usb/host/ehci-rmobile.c                         | 1 +
 drivers/usb/host/ehci-tegra.c                           | 1 +
 drivers/usb/host/ehci-vf.c                              | 1 +
 drivers/usb/host/ohci-hcd.c                             | 1 +
 drivers/usb/host/r8a66597-hcd.c                         | 1 +
 drivers/usb/host/sl811-hcd.c                            | 1 +
 drivers/usb/host/usb-sandbox.c                          | 1 +
 drivers/usb/host/usb-uclass.c                           | 1 +
 drivers/usb/host/xhci-mem.c                             | 1 +
 drivers/usb/host/xhci-rcar.c                            | 1 +
 drivers/usb/host/xhci-ring.c                            | 1 +
 drivers/usb/host/xhci.c                                 | 1 +
 drivers/usb/musb-new/mt85xx.c                           | 1 +
 drivers/usb/musb-new/musb_core.h                        | 1 +
 drivers/usb/musb-new/musb_dma.h                         | 1 +
 drivers/usb/musb-new/musb_gadget.h                      | 1 +
 drivers/usb/musb-new/pic32.c                            | 1 +
 drivers/usb/musb-new/sunxi.c                            | 1 +
 drivers/usb/musb/musb_hcd.c                             | 1 +
 drivers/usb/musb/musb_udc.c                             | 1 +
 drivers/usb/phy/rockchip_usb2_phy.c                     | 1 +
 drivers/video/am335x-fb.c                               | 1 +
 drivers/video/ati_radeon_fb.c                           | 1 +
 drivers/video/atmel_hlcdfb.c                            | 1 +
 drivers/video/atmel_lcdfb.c                             | 1 +
 drivers/video/backlight_gpio.c                          | 1 +
 drivers/video/bcm2835.c                                 | 1 +
 drivers/video/bridge/video-bridge-uclass.c              | 1 +
 drivers/video/broadwell_igd.c                           | 1 +
 drivers/video/cfb_console.c                             | 1 +
 drivers/video/console_truetype.c                        | 1 +
 drivers/video/da8xx-fb.c                                | 1 +
 drivers/video/display-uclass.c                          | 1 +
 drivers/video/dw_hdmi.c                                 | 1 +
 drivers/video/dw_mipi_dsi.c                             | 1 +
 drivers/video/exynos/exynos_fb.c                        | 1 +
 drivers/video/exynos/exynos_mipi_dsi_common.c           | 1 +
 drivers/video/fsl_dcu_fb.c                              | 1 +
 drivers/video/fsl_diu_fb.c                              | 1 +
 drivers/video/hitachi_tx18d42vm_lcd.c                   | 1 +
 drivers/video/ihs_video_out.c                           | 1 +
 drivers/video/imx/ipu.h                                 | 1 +
 drivers/video/imx/mxc_ipuv3_fb.c                        | 1 +
 drivers/video/ivybridge_igd.c                           | 1 +
 drivers/video/ld9040.c                                  | 1 +
 drivers/video/lg4573.c                                  | 1 +
 drivers/video/logicore_dp_tx.c                          | 1 +
 drivers/video/logicore_dp_tx.h                          | 1 +
 drivers/video/mali_dp.c                                 | 1 +
 drivers/video/meson/meson_dw_hdmi.c                     | 1 +
 drivers/video/meson/meson_plane.c                       | 1 +
 drivers/video/meson/meson_vclk.c                        | 1 +
 drivers/video/meson/meson_venc.c                        | 1 +
 drivers/video/meson/meson_vpu.c                         | 1 +
 drivers/video/meson/meson_vpu.h                         | 1 +
 drivers/video/meson/meson_vpu_init.c                    | 1 +
 drivers/video/mipi_dsi.c                                | 1 +
 drivers/video/mvebu_lcd.c                               | 1 +
 drivers/video/mxsfb.c                                   | 1 +
 drivers/video/nexell/s5pxx18_dp_lvds.c                  | 2 ++
 drivers/video/nexell/s5pxx18_dp_mipi.c                  | 1 +
 drivers/video/nexell/s5pxx18_dp_rgb.c                   | 2 ++
 drivers/video/nexell/soc/s5pxx18_soc_disptop_clk.c      | 1 +
 drivers/video/nexell/soc/s5pxx18_soc_lvds.c             | 1 +
 drivers/video/orisetech_otm8009a.c                      | 1 +
 drivers/video/pwm_backlight.c                           | 1 +
 drivers/video/raydium-rm68200.c                         | 1 +
 drivers/video/rockchip/rk3288_hdmi.c                    | 1 +
 drivers/video/rockchip/rk3288_vop.c                     | 1 +
 drivers/video/rockchip/rk3399_hdmi.c                    | 1 +
 drivers/video/rockchip/rk3399_vop.c                     | 1 +
 drivers/video/rockchip/rk_edp.c                         | 1 +
 drivers/video/s6e8ax0.c                                 | 1 +
 drivers/video/scf0403_lcd.c                             | 1 +
 drivers/video/ssd2828.c                                 | 1 +
 drivers/video/stm32/stm32_dsi.c                         | 1 +
 drivers/video/stm32/stm32_ltdc.c                        | 1 +
 drivers/video/sunxi/lcdc.c                              | 1 +
 drivers/video/sunxi/sunxi_de2.c                         | 1 +
 drivers/video/sunxi/sunxi_display.c                     | 1 +
 drivers/video/sunxi/sunxi_dw_hdmi.c                     | 1 +
 drivers/video/tegra.c                                   | 1 +
 drivers/video/tegra124/display.c                        | 1 +
 drivers/video/tegra124/dp.c                             | 1 +
 drivers/video/vidconsole-uclass.c                       | 1 +
 drivers/video/video-uclass.c                            | 1 +
 drivers/video/video_bmp.c                               | 1 +
 drivers/virtio/virtio_net.c                             | 1 +
 drivers/virtio/virtio_ring.c                            | 1 +
 drivers/virtio/virtio_rng.c                             | 1 +
 drivers/w1/mxc_w1.c                                     | 1 +
 drivers/w1/w1-gpio.c                                    | 1 +
 drivers/w1/w1-uclass.c                                  | 1 +
 drivers/watchdog/ast_wdt.c                              | 1 +
 drivers/watchdog/at91sam9_wdt.c                         | 1 +
 drivers/watchdog/cdns_wdt.c                             | 1 +
 drivers/watchdog/designware_wdt.c                       | 1 +
 drivers/watchdog/imx_watchdog.c                         | 1 +
 drivers/watchdog/tangier_wdt.c                          | 1 +
 drivers/watchdog/xilinx_wwdt.c                          | 1 +
 env/common.c                                            | 1 +
 env/env.c                                               | 1 +
 env/flags.c                                             | 1 +
 env/mmc.c                                               | 1 +
 env/nand.c                                              | 1 +
 env/sata.c                                              | 1 +
 env/sf.c                                                | 1 +
 fs/btrfs/inode.c                                        | 1 +
 fs/btrfs/subvolume.c                                    | 2 +-
 fs/btrfs/super.c                                        | 1 +
 fs/cbfs/cbfs.c                                          | 1 +
 fs/ext4/ext4_common.c                                   | 1 +
 fs/ext4/ext4_write.c                                    | 1 +
 fs/fat/fat.c                                            | 1 +
 fs/fat/fat_write.c                                      | 1 +
 fs/fs.c                                                 | 1 +
 fs/fs_internal.c                                        | 1 +
 fs/jffs2/compr_lzo.c                                    | 1 +
 fs/jffs2/jffs2_1pass.c                                  | 1 +
 fs/ubifs/debug.c                                        | 1 +
 fs/ubifs/io.c                                           | 1 +
 fs/ubifs/key.h                                          | 1 +
 fs/ubifs/log.c                                          | 1 +
 fs/ubifs/lprops.c                                       | 1 +
 fs/ubifs/lpt_commit.c                                   | 1 +
 fs/ubifs/misc.h                                         | 1 +
 fs/ubifs/orphan.c                                       | 1 +
 fs/ubifs/recovery.c                                     | 1 +
 fs/ubifs/replay.c                                       | 1 +
 fs/ubifs/scan.c                                         | 1 +
 fs/ubifs/super.c                                        | 1 +
 fs/ubifs/tnc.c                                          | 1 +
 fs/ubifs/ubifs.h                                        | 1 +
 fs/zfs/zfs.c                                            | 1 +
 include/acpi/acpi_device.h                              | 1 +
 include/acpi/acpigen.h                                  | 1 +
 include/adc.h                                           | 2 ++
 include/ahci.h                                          | 1 +
 include/asm-generic/gpio.h                              | 1 +
 include/atsha204a-i2c.h                                 | 1 +
 include/avb_verify.h                                    | 1 +
 include/bmp_layout.h                                    | 2 ++
 include/board.h                                         | 1 +
 include/bootstage.h                                     | 2 ++
 include/cli.h                                           | 1 +
 include/clk.h                                           | 1 +
 include/command.h                                       | 2 ++
 include/common.h                                        | 1 -
 include/cpsw.h                                          | 1 +
 include/cros_ec.h                                       | 1 +
 include/crypto/pkcs7_parser.h                           | 1 +
 include/crypto/public_key.h                             | 1 +
 include/crypto/x509_parser.h                            | 1 +
 include/dfu.h                                           | 1 +
 include/display.h                                       | 2 ++
 include/display_options.h                               | 2 ++
 include/div64.h                                         | 1 +
 include/dm/device-internal.h                            | 1 +
 include/dm/device.h                                     | 1 +
 include/dm/devres.h                                     | 1 +
 include/dm/lists.h                                      | 1 +
 include/dm/of.h                                         | 1 +
 include/dm/of_access.h                                  | 1 +
 include/dm/ofnode.h                                     | 1 +
 include/dm/platform_data/serial_bcm283x_mu.h            | 1 +
 include/dm/platform_data/serial_mxc.h                   | 1 +
 include/dm/platform_data/serial_pl01x.h                 | 1 +
 include/dm/read.h                                       | 1 +
 include/dm/root.h                                       | 1 +
 include/dm/uclass-internal.h                            | 1 +
 include/dw_hdmi.h                                       | 1 +
 include/dwmmc.h                                         | 1 +
 include/edid.h                                          | 1 +
 include/efi.h                                           | 1 +
 include/efi_api.h                                       | 1 +
 include/efi_selftest.h                                  | 1 +
 include/efi_variable.h                                  | 1 +
 include/exception.h                                     | 1 +
 include/fdtdec.h                                        | 1 +
 include/fsl-mc/fsl_dpaa_fd.h                            | 1 +
 include/fsl_ddr_sdram.h                                 | 1 +
 include/fsl_errata.h                                    | 1 +
 include/fsl_usb.h                                       | 1 +
 include/g_dnl.h                                         | 1 +
 include/generic-phy.h                                   | 1 +
 include/hexdump.h                                       | 1 +
 include/i2c.h                                           | 1 +
 include/image-android-dt.h                              | 1 +
 include/image-sparse.h                                  | 1 +
 include/input.h                                         | 1 +
 include/irq.h                                           | 1 +
 include/kendryte/bypass.h                               | 1 +
 include/kendryte/pll.h                                  | 1 +
 include/keys/asymmetric-type.h                          | 1 +
 include/lcd.h                                           | 1 +
 include/linux/err.h                                     | 2 +-
 include/linux/list.h                                    | 1 +
 include/linux/log2.h                                    | 1 +
 include/linux/soc/ti/cppi5.h                            | 1 +
 include/linux/soc/ti/ti_sci_protocol.h                  | 1 +
 include/linux/types.h                                   | 1 -
 include/log.h                                           | 1 +
 include/memalign.h                                      | 1 +
 include/membuff.h                                       | 2 ++
 include/mipi_dsi.h                                      | 1 +
 include/misc.h                                          | 1 +
 include/mmc.h                                           | 1 +
 include/mvebu/comphy.h                                  | 1 +
 include/mxs_nand.h                                      | 1 +
 include/net.h                                           | 1 +
 include/net/ncsi.h                                      | 1 +
 include/net/pcap.h                                      | 1 +
 include/os.h                                            | 1 +
 include/p2sb.h                                          | 1 +
 include/pch.h                                           | 1 +
 include/pci.h                                           | 2 ++
 include/phy-sun4i-usb.h                                 | 1 +
 include/phy.h                                           | 1 +
 include/phy_interface.h                                 | 2 ++
 include/power/acpi_pmc.h                                | 1 +
 include/power/regulator.h                               | 1 +
 include/pwm.h                                           | 1 +
 include/pwrseq.h                                        | 1 +
 include/qfw.h                                           | 1 +
 include/remoteproc.h                                    | 1 +
 include/reset.h                                         | 1 +
 include/rtc.h                                           | 1 +
 include/samsung/exynos5-dt-types.h                      | 1 +
 include/scsi.h                                          | 1 +
 include/sdhci.h                                         | 1 +
 include/serial.h                                        | 1 +
 include/spi-mem.h                                       | 1 +
 include/spi_flash.h                                     | 1 +
 include/spl.h                                           | 1 +
 include/stm32_rcc.h                                     | 1 +
 include/tee.h                                           | 1 +
 include/test/ut.h                                       | 1 +
 include/tlv_eeprom.h                                    | 1 +
 include/usb.h                                           | 1 +
 include/usb/dwc2_udc.h                                  | 1 +
 include/usb/xhci.h                                      | 2 ++
 include/usb_defs.h                                      | 1 +
 include/vbe.h                                           | 1 +
 include/video.h                                         | 1 +
 include/video_bridge.h                                  | 1 +
 include/virtio.h                                        | 1 +
 include/virtio_ring.h                                   | 1 +
 include/w1.h                                            | 1 +
 include/wait_bit.h                                      | 1 +
 include/xyzModem.h                                      | 1 +
 lib/acpi/acpi_device.c                                  | 1 +
 lib/acpi/acpi_table.c                                   | 1 +
 lib/acpi/acpigen.c                                      | 1 +
 lib/aes/aes-decrypt.c                                   | 1 +
 lib/bch.c                                               | 1 +
 lib/crypto/asymmetric_type.c                            | 1 +
 lib/display_options.c                                   | 1 +
 lib/efi/efi_stub.c                                      | 1 +
 lib/efi_loader/efi_acpi.c                               | 1 +
 lib/efi_loader/efi_boottime.c                           | 1 +
 lib/efi_loader/efi_console.c                            | 1 +
 lib/efi_loader/efi_device_path.c                        | 1 +
 lib/efi_loader/efi_device_path_to_text.c                | 1 +
 lib/efi_loader/efi_device_path_utilities.c              | 1 +
 lib/efi_loader/efi_disk.c                               | 1 +
 lib/efi_loader/efi_file.c                               | 1 +
 lib/efi_loader/efi_gop.c                                | 1 +
 lib/efi_loader/efi_hii.c                                | 1 +
 lib/efi_loader/efi_image_loader.c                       | 1 +
 lib/efi_loader/efi_load_initrd.c                        | 1 +
 lib/efi_loader/efi_memory.c                             | 1 +
 lib/efi_loader/efi_net.c                                | 1 +
 lib/efi_loader/efi_runtime.c                            | 1 +
 lib/efi_loader/efi_signature.c                          | 1 +
 lib/efi_loader/efi_smbios.c                             | 1 +
 lib/efi_loader/efi_unicode_collation.c                  | 1 +
 lib/efi_loader/efi_var_common.c                         | 1 +
 lib/efi_loader/efi_var_file.c                           | 1 +
 lib/efi_loader/efi_var_mem.c                            | 1 +
 lib/efi_loader/efi_variable.c                           | 1 +
 lib/efi_loader/efi_variable_tee.c                       | 1 +
 lib/efi_selftest/efi_selftest_loaded_image.c            | 1 +
 lib/efi_selftest/efi_selftest_memory.c                  | 1 +
 lib/efi_selftest/efi_selftest_set_virtual_address_map.c | 1 +
 lib/efi_selftest/efi_selftest_textinputex.c             | 1 +
 lib/efi_selftest/efi_selftest_unicode_collation.c       | 1 +
 lib/efi_selftest/efi_selftest_watchdog.c                | 1 +
 lib/elf.c                                               | 1 +
 lib/errno_str.c                                         | 1 +
 lib/fdtdec.c                                            | 1 +
 lib/fdtdec_test.c                                       | 1 +
 lib/hexdump.c                                           | 1 +
 lib/image-sparse.c                                      | 1 +
 lib/libavb/avb_sysdeps.h                                | 1 +
 lib/lmb.c                                               | 1 +
 lib/lzma/LzmaTools.c                                    | 1 +
 lib/lzo/lzo1x_decompress.c                              | 2 ++
 lib/membuff.c                                           | 1 +
 lib/of_live.c                                           | 1 +
 lib/smbios.c                                            | 1 +
 lib/time.c                                              | 1 +
 lib/tiny-printf.c                                       | 1 +
 lib/tpm-v1.c                                            | 1 +
 lib/tpm-v2.c                                            | 1 +
 lib/trace.c                                             | 1 +
 lib/uuid.c                                              | 1 +
 lib/vsprintf.c                                          | 1 +
 net/arp.c                                               | 1 +
 net/bootp.c                                             | 1 +
 net/eth-uclass.c                                        | 1 +
 net/eth_legacy.c                                        | 1 +
 net/fastboot.c                                          | 1 +
 net/mdio-mux-uclass.c                                   | 1 +
 net/net.c                                               | 1 +
 net/pcap.c                                              | 1 +
 net/tftp.c                                              | 1 +
 post/drivers/memory.c                                   | 1 +
 post/lib_powerpc/andi.c                                 | 1 +
 post/lib_powerpc/cmp.c                                  | 1 +
 post/lib_powerpc/cmpi.c                                 | 1 +
 post/lib_powerpc/cr.c                                   | 1 +
 post/lib_powerpc/fpu/mul-subnormal-single-1.c           | 1 +
 post/lib_powerpc/load.c                                 | 1 +
 post/lib_powerpc/multi.c                                | 1 +
 post/lib_powerpc/rlwimi.c                               | 1 +
 post/lib_powerpc/rlwinm.c                               | 1 +
 post/lib_powerpc/rlwnm.c                                | 1 +
 post/lib_powerpc/srawi.c                                | 1 +
 post/lib_powerpc/store.c                                | 1 +
 post/lib_powerpc/three.c                                | 1 +
 post/lib_powerpc/threei.c                               | 1 +
 post/lib_powerpc/threex.c                               | 1 +
 post/lib_powerpc/two.c                                  | 1 +
 post/lib_powerpc/twox.c                                 | 1 +
 post/post.c                                             | 1 +
 post/tests.c                                            | 1 +
 test/bloblist.c                                         | 1 +
 test/cmd_ut.c                                           | 1 +
 test/dm/acpi.c                                          | 1 +
 test/dm/acpi_dp.c                                       | 1 +
 test/dm/acpigen.c                                       | 1 +
 test/dm/axi.c                                           | 1 +
 test/dm/board.c                                         | 1 +
 test/dm/core.c                                          | 1 +
 test/dm/gpio.c                                          | 1 +
 test/dm/i2s.c                                           | 1 +
 test/dm/k210_pll.c                                      | 1 +
 test/dm/misc.c                                          | 1 +
 test/dm/panel.c                                         | 1 +
 test/dm/regulator.c                                     | 1 +
 test/dm/remoteproc.c                                    | 1 +
 test/dm/rtc.c                                           | 1 +
 test/dm/test-main.c                                     | 1 +
 test/lib/test_aes.c                                     | 1 +
 test/optee/cmd_ut_optee.c                               | 1 +
 test/str_ut.c                                           | 1 +
 test/time_ut.c                                          | 1 +
 test/unicode_ut.c                                       | 1 +
 1926 files changed, 1950 insertions(+), 7 deletions(-)

diff --git a/arch/arc/lib/cpu.c b/arch/arc/lib/cpu.c
index d3327c939ee..b8d9ab5ab6d 100644
--- a/arch/arc/lib/cpu.c
+++ b/arch/arc/lib/cpu.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <init.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/arcregs.h>
diff --git a/arch/arm/cpu/arm1136/mx31/generic.c b/arch/arm/cpu/arm1136/mx31/generic.c
index ef738d6cd84..c6814a82d76 100644
--- a/arch/arm/cpu/arm1136/mx31/generic.c
+++ b/arch/arm/cpu/arm1136/mx31/generic.c
@@ -12,6 +12,7 @@
 #include <asm/arch/clock.h>
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/kernel.h>
 
 static u32 mx31_decode_pll(u32 reg, u32 infreq)
 {
diff --git a/arch/arm/cpu/arm926ejs/mx25/generic.c b/arch/arm/cpu/arm926ejs/mx25/generic.c
index 8b74650b364..71e143b8a92 100644
--- a/arch/arm/cpu/arm926ejs/mx25/generic.c
+++ b/arch/arm/cpu/arm926ejs/mx25/generic.c
@@ -14,6 +14,7 @@
 #include <init.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
diff --git a/arch/arm/cpu/arm926ejs/mx27/generic.c b/arch/arm/cpu/arm926ejs/mx27/generic.c
index ec5f5e12e1e..376ab2eaeac 100644
--- a/arch/arm/cpu/arm926ejs/mx27/generic.c
+++ b/arch/arm/cpu/arm926ejs/mx27/generic.c
@@ -19,6 +19,7 @@
 #include <asm/arch/mxcmmc.h>
 #endif
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 /*
  *  get the system pll clock in Hz
diff --git a/arch/arm/cpu/arm926ejs/mxs/spl_boot.c b/arch/arm/cpu/arm926ejs/mxs/spl_boot.c
index f24378305fc..88386dbb20f 100644
--- a/arch/arm/cpu/arm926ejs/mxs/spl_boot.c
+++ b/arch/arm/cpu/arm926ejs/mxs/spl_boot.c
@@ -18,6 +18,7 @@
 #include <asm/gpio.h>
 #include <asm/u-boot.h>
 #include <linux/compiler.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include "mxs_init.h"
diff --git a/arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c b/arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c
index a94803ee93d..4d2d988c287 100644
--- a/arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c
+++ b/arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c
@@ -14,6 +14,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
 #include <linux/compiler.h>
+#include <linux/kernel.h>
 
 #include "mxs_init.h"
 
diff --git a/arch/arm/cpu/arm926ejs/mxs/spl_power_init.c b/arch/arm/cpu/arm926ejs/mxs/spl_power_init.c
index 35ea71a5ba8..f57e1bb96c8 100644
--- a/arch/arm/cpu/arm926ejs/mxs/spl_power_init.c
+++ b/arch/arm/cpu/arm926ejs/mxs/spl_power_init.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
+#include <linux/kernel.h>
 
 #include "mxs_init.h"
 
diff --git a/arch/arm/cpu/arm926ejs/spear/spear600.c b/arch/arm/cpu/arm926ejs/spear/spear600.c
index b31ede5eb94..2b036215d1c 100644
--- a/arch/arm/cpu/arm926ejs/spear/spear600.c
+++ b/arch/arm/cpu/arm926ejs/spear/spear600.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <stdbool.h>
 #include <asm/hardware.h>
 #include <asm/io.h>
 #include <asm/arch/spr_misc.h>
diff --git a/arch/arm/cpu/armv7/bcm235xx/clk-bcm235xx.c b/arch/arm/cpu/armv7/bcm235xx/clk-bcm235xx.c
index abdbcb068ee..3c6cba611de 100644
--- a/arch/arm/cpu/armv7/bcm235xx/clk-bcm235xx.c
+++ b/arch/arm/cpu/armv7/bcm235xx/clk-bcm235xx.c
@@ -14,6 +14,7 @@
 #include <linux/errno.h>
 #include <asm/arch/sysmap.h>
 #include <asm/kona-common/clk.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "clk-core.h"
 
diff --git a/arch/arm/cpu/armv7/bcm235xx/clk-core.c b/arch/arm/cpu/armv7/bcm235xx/clk-core.c
index 8c718bf5f0b..098c5afb731 100644
--- a/arch/arm/cpu/armv7/bcm235xx/clk-core.c
+++ b/arch/arm/cpu/armv7/bcm235xx/clk-core.c
@@ -18,6 +18,7 @@
 #include <bitfield.h>
 #include <asm/arch/sysmap.h>
 #include <asm/kona-common/clk.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "clk-core.h"
 
diff --git a/arch/arm/cpu/armv7/bcm235xx/clk-core.h b/arch/arm/cpu/armv7/bcm235xx/clk-core.h
index 91d38703fa7..6dfc4afb006 100644
--- a/arch/arm/cpu/armv7/bcm235xx/clk-core.h
+++ b/arch/arm/cpu/armv7/bcm235xx/clk-core.h
@@ -4,6 +4,7 @@
  */
 
 #include <stdio.h>
+#include <linux/kernel.h>
 #include <linux/stddef.h>
 #include <linux/stringify.h>
 
diff --git a/arch/arm/cpu/armv7/bcm281xx/clk-bcm281xx.c b/arch/arm/cpu/armv7/bcm281xx/clk-bcm281xx.c
index ee0e7530480..96ce2333cde 100644
--- a/arch/arm/cpu/armv7/bcm281xx/clk-bcm281xx.c
+++ b/arch/arm/cpu/armv7/bcm281xx/clk-bcm281xx.c
@@ -14,6 +14,7 @@
 #include <linux/errno.h>
 #include <asm/arch/sysmap.h>
 #include <asm/kona-common/clk.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "clk-core.h"
 
diff --git a/arch/arm/cpu/armv7/bcm281xx/clk-core.c b/arch/arm/cpu/armv7/bcm281xx/clk-core.c
index d1828d6234a..2fb195bf8f9 100644
--- a/arch/arm/cpu/armv7/bcm281xx/clk-core.c
+++ b/arch/arm/cpu/armv7/bcm281xx/clk-core.c
@@ -18,6 +18,7 @@
 #include <bitfield.h>
 #include <asm/arch/sysmap.h>
 #include <asm/kona-common/clk.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "clk-core.h"
 
diff --git a/arch/arm/cpu/armv7/bcm281xx/clk-core.h b/arch/arm/cpu/armv7/bcm281xx/clk-core.h
index 531d9a4f3eb..74780012e24 100644
--- a/arch/arm/cpu/armv7/bcm281xx/clk-core.h
+++ b/arch/arm/cpu/armv7/bcm281xx/clk-core.h
@@ -4,6 +4,7 @@
  */
 
 #include <stdio.h>
+#include <linux/kernel.h>
 #include <linux/stddef.h>
 #include <linux/stringify.h>
 
diff --git a/arch/arm/cpu/armv7/exception_level.c b/arch/arm/cpu/armv7/exception_level.c
index f6d25bb682c..5845cca9a33 100644
--- a/arch/arm/cpu/armv7/exception_level.c
+++ b/arch/arm/cpu/armv7/exception_level.c
@@ -12,6 +12,7 @@
 #include <bootm.h>
 #include <cpu_func.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/armv7.h>
 #include <asm/secure.h>
 #include <asm/setjmp.h>
diff --git a/arch/arm/cpu/armv7/kona-common/clk-stubs.c b/arch/arm/cpu/armv7/kona-common/clk-stubs.c
index 2dfa3f7e731..19aa6c07358 100644
--- a/arch/arm/cpu/armv7/kona-common/clk-stubs.c
+++ b/arch/arm/cpu/armv7/kona-common/clk-stubs.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 
 /*
  * These weak functions are available to kona architectures that don't
diff --git a/arch/arm/cpu/armv7/ls102xa/cpu.c b/arch/arm/cpu/armv7/ls102xa/cpu.c
index b7ec5ccdd26..5e922953c96 100644
--- a/arch/arm/cpu/armv7/ls102xa/cpu.c
+++ b/arch/arm/cpu/armv7/ls102xa/cpu.c
@@ -22,6 +22,7 @@
 #include <fsl_wdog.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 
 #include "fsl_epu.h"
 
diff --git a/arch/arm/cpu/armv7/ls102xa/fdt.c b/arch/arm/cpu/armv7/ls102xa/fdt.c
index 684c0c91ef5..aef54ebf3c8 100644
--- a/arch/arm/cpu/armv7/ls102xa/fdt.c
+++ b/arch/arm/cpu/armv7/ls102xa/fdt.c
@@ -10,6 +10,7 @@
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <asm/io.h>
diff --git a/arch/arm/cpu/armv7/ls102xa/ls102xa_serdes.c b/arch/arm/cpu/armv7/ls102xa/ls102xa_serdes.c
index 8c030be8b36..3d313b1ad76 100644
--- a/arch/arm/cpu/armv7/ls102xa/ls102xa_serdes.c
+++ b/arch/arm/cpu/armv7/ls102xa/ls102xa_serdes.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <asm/arch/fsl_serdes.h>
 #include <asm/arch/immap_ls102xa.h>
+#include <linux/kernel.h>
 
 static u8 serdes_cfg_tbl[][SRDS_MAX_LANES] = {
 	[0x00] = {PCIE1, PCIE1, PCIE1, PCIE1},
diff --git a/arch/arm/cpu/armv7/ls102xa/soc.c b/arch/arm/cpu/armv7/ls102xa/soc.c
index 175909b2a44..caba26abcbe 100644
--- a/arch/arm/cpu/armv7/ls102xa/soc.c
+++ b/arch/arm/cpu/armv7/ls102xa/soc.c
@@ -14,6 +14,7 @@
 #include <fsl_csu.h>
 #include <fsl_ddr_sdram.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 struct liodn_id_table sec_liodn_tbl[] = {
 	SET_SEC_JR_LIODN_ENTRY(0, 0x10, 0x10),
diff --git a/arch/arm/cpu/armv7/sunxi/psci.c b/arch/arm/cpu/armv7/sunxi/psci.c
index 1ac50f558a4..5f21529bf2e 100644
--- a/arch/arm/cpu/armv7/sunxi/psci.c
+++ b/arch/arm/cpu/armv7/sunxi/psci.c
@@ -8,6 +8,7 @@
  */
 #include <config.h>
 #include <common.h>
+#include <stdbool.h>
 #include <asm/cache.h>
 
 #include <asm/arch/cpu.h>
diff --git a/arch/arm/cpu/armv7/virt-v7.c b/arch/arm/cpu/armv7/virt-v7.c
index 0031bf85975..cf0954cb9b3 100644
--- a/arch/arm/cpu/armv7/virt-v7.c
+++ b/arch/arm/cpu/armv7/virt-v7.c
@@ -16,6 +16,7 @@
 #include <asm/gic.h>
 #include <asm/io.h>
 #include <asm/secure.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 static unsigned int read_id_pfr1(void)
diff --git a/arch/arm/cpu/armv8/cache_v8.c b/arch/arm/cpu/armv8/cache_v8.c
index 052ba4d5407..8add6ac333b 100644
--- a/arch/arm/cpu/armv8/cache_v8.c
+++ b/arch/arm/cpu/armv8/cache_v8.c
@@ -17,6 +17,7 @@
 #include <asm/global_data.h>
 #include <asm/system.h>
 #include <asm/armv8/mmu.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
index bf38eacb8eb..38ff2ce207d 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
@@ -42,6 +42,7 @@
 #include <asm/arch/clock.h>
 #include <hwconfig.h>
 #include <fsl_qbman.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #ifdef CONFIG_TFABOOT
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 917ae991a52..f79328394c9 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <env.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/io.h>
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/icid.c b/arch/arm/cpu/armv8/fsl-layerscape/icid.c
index 84ca91a0cc8..5c378da0636 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/icid.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/icid.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <stdio.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls1012a_serdes.c b/arch/arm/cpu/armv8/fsl-layerscape/ls1012a_serdes.c
index 8d7beca7db3..33d9a64e680 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/ls1012a_serdes.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/ls1012a_serdes.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <asm/arch/fsl_serdes.h>
 #include <asm/arch/immap_lsch2.h>
+#include <linux/kernel.h>
 
 struct serdes_config {
 	u32 protocol;
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls1028_ids.c b/arch/arm/cpu/armv8/fsl-layerscape/ls1028_ids.c
index 2d25c92c6ee..4d12ffae1bd 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/ls1028_ids.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/ls1028_ids.c
@@ -9,6 +9,7 @@
 #include <asm/arch-fsl-layerscape/immap_lsch3.h>
 #include <asm/arch-fsl-layerscape/fsl_icid.h>
 #include <asm/arch-fsl-layerscape/fsl_portals.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 struct icid_id_table icid_tbl[] = {
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls1028a_serdes.c b/arch/arm/cpu/armv8/fsl-layerscape/ls1028a_serdes.c
index 80d2910f679..1079dd8b95f 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/ls1028a_serdes.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/ls1028a_serdes.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <asm/arch/fsl_serdes.h>
+#include <linux/kernel.h>
 
 struct serdes_config {
 	u32 protocol;
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls1043_ids.c b/arch/arm/cpu/armv8/fsl-layerscape/ls1043_ids.c
index 3bd993bebfb..780b11aff31 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/ls1043_ids.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/ls1043_ids.c
@@ -8,6 +8,7 @@
 #include <asm/arch-fsl-layerscape/fsl_icid.h>
 #include <asm/arch-fsl-layerscape/fsl_portals.h>
 #include <fsl_sec.h>
+#include <linux/kernel.h>
 
 #ifdef CONFIG_SYS_DPAA_QBMAN
 struct qportal_info qp_info[CONFIG_SYS_QMAN_NUM_PORTALS] = {
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls1043a_serdes.c b/arch/arm/cpu/armv8/fsl-layerscape/ls1043a_serdes.c
index 6c5e52ebaa6..8a9ef8fef93 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/ls1043a_serdes.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/ls1043a_serdes.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <asm/arch/fsl_serdes.h>
 #include <asm/arch/immap_lsch2.h>
+#include <linux/kernel.h>
 
 struct serdes_config {
 	u32 protocol;
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls1046_ids.c b/arch/arm/cpu/armv8/fsl-layerscape/ls1046_ids.c
index abd847b5be0..bb0814162e2 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/ls1046_ids.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/ls1046_ids.c
@@ -7,6 +7,7 @@
 #include <asm/arch-fsl-layerscape/immap_lsch2.h>
 #include <asm/arch-fsl-layerscape/fsl_icid.h>
 #include <asm/arch-fsl-layerscape/fsl_portals.h>
+#include <linux/kernel.h>
 
 #ifdef CONFIG_SYS_DPAA_QBMAN
 struct qportal_info qp_info[CONFIG_SYS_QMAN_NUM_PORTALS] = {
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls1046a_serdes.c b/arch/arm/cpu/armv8/fsl-layerscape/ls1046a_serdes.c
index 9347e516bf6..0c1c40d04b3 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/ls1046a_serdes.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/ls1046a_serdes.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <asm/arch/fsl_serdes.h>
 #include <asm/arch/immap_lsch2.h>
+#include <linux/kernel.h>
 
 struct serdes_config {
 	u32 protocol;
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls1088_ids.c b/arch/arm/cpu/armv8/fsl-layerscape/ls1088_ids.c
index 23743ae10cf..0fb0699768d 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/ls1088_ids.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/ls1088_ids.c
@@ -7,6 +7,7 @@
 #include <asm/arch-fsl-layerscape/immap_lsch3.h>
 #include <asm/arch-fsl-layerscape/fsl_icid.h>
 #include <asm/arch-fsl-layerscape/fsl_portals.h>
+#include <linux/kernel.h>
 
 struct icid_id_table icid_tbl[] = {
 	SET_SDHC_ICID(1, FSL_SDMMC_STREAM_ID),
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls1088a_serdes.c b/arch/arm/cpu/armv8/fsl-layerscape/ls1088a_serdes.c
index 280afbbf98f..fb7680fdc5f 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/ls1088a_serdes.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/ls1088a_serdes.c
@@ -7,6 +7,7 @@
 #include <asm/arch/fsl_serdes.h>
 #include <asm/arch/soc.h>
 #include <asm/io.h>
+#include <linux/kernel.h>
 
 struct serdes_config {
 	u8 ip_protocol;
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls2080a_serdes.c b/arch/arm/cpu/armv8/fsl-layerscape/ls2080a_serdes.c
index 7997422840f..b21da530dcf 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/ls2080a_serdes.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/ls2080a_serdes.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <asm/arch/fsl_serdes.h>
+#include <linux/kernel.h>
 
 struct serdes_config {
 	u8 protocol;
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls2088_ids.c b/arch/arm/cpu/armv8/fsl-layerscape/ls2088_ids.c
index e6403b79526..f4af82abd86 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/ls2088_ids.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/ls2088_ids.c
@@ -7,6 +7,7 @@
 #include <asm/arch-fsl-layerscape/immap_lsch3.h>
 #include <asm/arch-fsl-layerscape/fsl_icid.h>
 #include <asm/arch-fsl-layerscape/fsl_portals.h>
+#include <linux/kernel.h>
 
 struct icid_id_table icid_tbl[] = {
 	SET_SDHC_ICID(1, FSL_SDMMC_STREAM_ID),
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/lx2160_ids.c b/arch/arm/cpu/armv8/fsl-layerscape/lx2160_ids.c
index 3a0ed1fa550..90fe6889b9d 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/lx2160_ids.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/lx2160_ids.c
@@ -7,6 +7,7 @@
 #include <asm/arch-fsl-layerscape/immap_lsch3.h>
 #include <asm/arch-fsl-layerscape/fsl_icid.h>
 #include <asm/arch-fsl-layerscape/fsl_portals.h>
+#include <linux/kernel.h>
 
 struct icid_id_table icid_tbl[] = {
 	SET_SDHC_ICID(1, FSL_SDMMC_STREAM_ID),
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/lx2160a_serdes.c b/arch/arm/cpu/armv8/fsl-layerscape/lx2160a_serdes.c
index a04a370268b..67c8f665146 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/lx2160a_serdes.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/lx2160a_serdes.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <asm/arch/fsl_serdes.h>
+#include <linux/kernel.h>
 
 struct serdes_config {
 	u8 protocol;
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/mp.c b/arch/arm/cpu/armv8/fsl-layerscape/mp.c
index 986dd2482dc..0bccb38998c 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/mp.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/mp.c
@@ -17,6 +17,7 @@
 #include <asm/arch/soc.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "cpu.h"
 #include <asm/arch-fsl-layerscape/soc.h>
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ppa.c b/arch/arm/cpu/armv8/fsl-layerscape/ppa.c
index 60f2a4b002d..4aaeda367bf 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/ppa.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/ppa.c
@@ -25,6 +25,7 @@
 #include <fsl_validate.h>
 #endif
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #ifdef CONFIG_SYS_LS_PPA_FW_IN_NAND
 #include <nand.h>
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/soc.c b/arch/arm/cpu/armv8/fsl-layerscape/soc.c
index 40e748b00a6..1bd6f2111c5 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/soc.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/soc.c
@@ -11,6 +11,7 @@
 #include <fsl_immap.h>
 #include <fsl_ifc.h>
 #include <init.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/u-boot.h>
diff --git a/arch/arm/cpu/armv8/fwcall.c b/arch/arm/cpu/armv8/fwcall.c
index b29bc30fc25..8085a0351f3 100644
--- a/arch/arm/cpu/armv8/fwcall.c
+++ b/arch/arm/cpu/armv8/fwcall.c
@@ -7,6 +7,7 @@
 
 #include <asm-offsets.h>
 #include <config.h>
+#include <stdbool.h>
 #include <version.h>
 #include <asm/cache.h>
 #include <asm/macro.h>
diff --git a/arch/arm/include/asm/arch-fsl-layerscape/fsl_icid.h b/arch/arm/include/asm/arch-fsl-layerscape/fsl_icid.h
index 3c06a55cb85..24b249b0683 100644
--- a/arch/arm/include/asm/arch-fsl-layerscape/fsl_icid.h
+++ b/arch/arm/include/asm/arch-fsl-layerscape/fsl_icid.h
@@ -6,6 +6,7 @@
 #ifndef _FSL_ICID_H_
 #define _FSL_ICID_H_
 
+#include <stdbool.h>
 #include <asm/types.h>
 #include <fsl_qbman.h>
 #include <fsl_sec.h>
diff --git a/arch/arm/include/asm/arch-fsl-layerscape/soc.h b/arch/arm/include/asm/arch-fsl-layerscape/soc.h
index 020548ac6ce..52f0452cded 100644
--- a/arch/arm/include/asm/arch-fsl-layerscape/soc.h
+++ b/arch/arm/include/asm/arch-fsl-layerscape/soc.h
@@ -8,6 +8,7 @@
 #define _ASM_ARMV8_FSL_LAYERSCAPE_SOC_H_
 
 #ifndef __ASSEMBLY__
+#include <stdbool.h>
 #include <linux/types.h>
 #ifdef CONFIG_FSL_LSCH2
 #include <asm/arch/immap_lsch2.h>
diff --git a/arch/arm/include/asm/arch-imx8/sys_proto.h b/arch/arm/include/asm/arch-imx8/sys_proto.h
index 6f1fc8f999d..12f65718620 100644
--- a/arch/arm/include/asm/arch-imx8/sys_proto.h
+++ b/arch/arm/include/asm/arch-imx8/sys_proto.h
@@ -3,6 +3,7 @@
  * Copyright 2018 NXP
  */
 
+#include <stdbool.h>
 #include <asm/arch/sci/sci.h>
 #include <asm/mach-imx/sys_proto.h>
 #include <asm/arch/power-domain.h>
diff --git a/arch/arm/include/asm/arch-imx8m/clock.h b/arch/arm/include/asm/arch-imx8m/clock.h
index 87cc4d3b2b7..848a93ec3f2 100644
--- a/arch/arm/include/asm/arch-imx8m/clock.h
+++ b/arch/arm/include/asm/arch-imx8m/clock.h
@@ -5,6 +5,7 @@
  * Peng Fan <peng.fan@nxp.com>
  */
 
+#include <stdbool.h>
 #include <linux/bitops.h>
 
 #ifdef CONFIG_IMX8MQ
diff --git a/arch/arm/include/asm/arch-mx25/clock.h b/arch/arm/include/asm/arch-mx25/clock.h
index 3045b78d08f..7baee482114 100644
--- a/arch/arm/include/asm/arch-mx25/clock.h
+++ b/arch/arm/include/asm/arch-mx25/clock.h
@@ -21,6 +21,7 @@
 #define MXC_CLK32	32768
 #endif
 
+#include <stdbool.h>
 enum mxc_clock {
 	/* PER clocks (do not change order) */
 	MXC_CSI_CLK,
diff --git a/arch/arm/include/asm/arch-mx5/clock.h b/arch/arm/include/asm/arch-mx5/clock.h
index 63a51042e1e..86aeb5d5610 100644
--- a/arch/arm/include/asm/arch-mx5/clock.h
+++ b/arch/arm/include/asm/arch-mx5/clock.h
@@ -19,6 +19,7 @@
 #define MXC_CLK32	32768
 #endif
 
+#include <stdbool.h>
 enum mxc_clock {
 	MXC_ARM_CLK = 0,
 	MXC_AHB_CLK,
diff --git a/arch/arm/include/asm/arch-mx6/clock.h b/arch/arm/include/asm/arch-mx6/clock.h
index 8ae49715789..4bdb11a5b96 100644
--- a/arch/arm/include/asm/arch-mx6/clock.h
+++ b/arch/arm/include/asm/arch-mx6/clock.h
@@ -7,6 +7,7 @@
 #ifndef __ASM_ARCH_CLOCK_H
 #define __ASM_ARCH_CLOCK_H
 
+#include <stdbool.h>
 #include <linux/types.h>
 
 #ifdef CONFIG_SYS_MX6_HCLK
diff --git a/arch/arm/include/asm/arch-mx7/clock_slice.h b/arch/arm/include/asm/arch-mx7/clock_slice.h
index 9a7c1f8237a..1eac3bec5cb 100644
--- a/arch/arm/include/asm/arch-mx7/clock_slice.h
+++ b/arch/arm/include/asm/arch-mx7/clock_slice.h
@@ -9,6 +9,7 @@
 #ifndef _ASM_ARCH_CLOCK_SLICE_H
 #define _ASM_ARCH_CLOCK_SLICE_H
 
+#include <stdbool.h>
 enum root_pre_div {
 	CLK_ROOT_PRE_DIV1 = 0,
 	CLK_ROOT_PRE_DIV2,
diff --git a/arch/arm/include/asm/arch-mx7ulp/pcc.h b/arch/arm/include/asm/arch-mx7ulp/pcc.h
index 8f0d7006286..25d10fb7d1a 100644
--- a/arch/arm/include/asm/arch-mx7ulp/pcc.h
+++ b/arch/arm/include/asm/arch-mx7ulp/pcc.h
@@ -6,6 +6,7 @@
 #ifndef _ASM_ARCH_PCC_H
 #define _ASM_ARCH_PCC_H
 
+#include <stdbool.h>
 #include <asm/arch/scg.h>
 
 /* PCC2 */
diff --git a/arch/arm/include/asm/arch-mx7ulp/scg.h b/arch/arm/include/asm/arch-mx7ulp/scg.h
index 71e241db288..b4d92d1ed44 100644
--- a/arch/arm/include/asm/arch-mx7ulp/scg.h
+++ b/arch/arm/include/asm/arch-mx7ulp/scg.h
@@ -6,6 +6,7 @@
 #ifndef _ASM_ARCH_SCG_H
 #define _ASM_ARCH_SCG_H
 
+#include <stdbool.h>
 #include <stdio.h>
 
 #ifdef CONFIG_CLK_DEBUG
diff --git a/arch/arm/include/asm/arch-rk3308/cru_rk3308.h b/arch/arm/include/asm/arch-rk3308/cru_rk3308.h
index 86c906bb0ed..08af4f547dd 100644
--- a/arch/arm/include/asm/arch-rk3308/cru_rk3308.h
+++ b/arch/arm/include/asm/arch-rk3308/cru_rk3308.h
@@ -5,6 +5,7 @@
 #ifndef _ASM_ARCH_CRU_RK3308_H
 #define _ASM_ARCH_CRU_RK3308_H
 
+#include <linux/kernel.h>
 #define MHz		1000000
 #define OSC_HZ		(24 * MHz)
 
diff --git a/arch/arm/include/asm/arch-rk3308/grf_rk3308.h b/arch/arm/include/asm/arch-rk3308/grf_rk3308.h
index a995bb950d9..b268e456572 100644
--- a/arch/arm/include/asm/arch-rk3308/grf_rk3308.h
+++ b/arch/arm/include/asm/arch-rk3308/grf_rk3308.h
@@ -5,6 +5,7 @@
 #ifndef _ASM_ARCH_GRF_rk3308_H
 #define _ASM_ARCH_GRF_rk3308_H
 
+#include <linux/kernel.h>
 struct rk3308_grf {
 	unsigned int gpio0a_iomux;
 	unsigned int reserved0;
diff --git a/arch/arm/include/asm/arch-rockchip/clock.h b/arch/arm/include/asm/arch-rockchip/clock.h
index 5108180ea77..2b47b7a9d26 100644
--- a/arch/arm/include/asm/arch-rockchip/clock.h
+++ b/arch/arm/include/asm/arch-rockchip/clock.h
@@ -6,6 +6,8 @@
 #ifndef _ASM_ARCH_CLOCK_H
 #define _ASM_ARCH_CLOCK_H
 
+#include <linux/kernel.h>
+
 struct udevice;
 
 /* define pll mode */
diff --git a/arch/arm/include/asm/arch-rockchip/cpu_rk3288.h b/arch/arm/include/asm/arch-rockchip/cpu_rk3288.h
index 7445e64b8c7..3536f444946 100644
--- a/arch/arm/include/asm/arch-rockchip/cpu_rk3288.h
+++ b/arch/arm/include/asm/arch-rockchip/cpu_rk3288.h
@@ -6,6 +6,7 @@
 #ifndef __ASM_ARCH_CPU_RK3288_H
 #define __ASM_ARCH_CPU_RK3288_H
 
+#include <stdbool.h>
 #include <asm/io.h>
 
 #define ROCKCHIP_CPU_MASK       0xffff0000
diff --git a/arch/arm/include/asm/arch-rockchip/cru_px30.h b/arch/arm/include/asm/arch-rockchip/cru_px30.h
index 732ca370403..c76d5751ef5 100644
--- a/arch/arm/include/asm/arch-rockchip/cru_px30.h
+++ b/arch/arm/include/asm/arch-rockchip/cru_px30.h
@@ -5,6 +5,7 @@
 #ifndef _ASM_ARCH_CRU_PX30_H
 #define _ASM_ARCH_CRU_PX30_H
 
+#include <linux/kernel.h>
 #define MHz		1000000
 #define KHz		1000
 #define OSC_HZ		(24 * MHz)
diff --git a/arch/arm/include/asm/arch-rockchip/cru_rk3036.h b/arch/arm/include/asm/arch-rockchip/cru_rk3036.h
index 5db0407baa7..c580bf12034 100644
--- a/arch/arm/include/asm/arch-rockchip/cru_rk3036.h
+++ b/arch/arm/include/asm/arch-rockchip/cru_rk3036.h
@@ -5,6 +5,7 @@
 #ifndef _ASM_ARCH_CRU_RK3036_H
 #define _ASM_ARCH_CRU_RK3036_H
 
+#include <linux/kernel.h>
 #define OSC_HZ		(24 * 1000 * 1000)
 
 #define APLL_HZ		(600 * 1000000)
diff --git a/arch/arm/include/asm/arch-rockchip/cru_rk3128.h b/arch/arm/include/asm/arch-rockchip/cru_rk3128.h
index cca812d29e4..e7dec3c7c9e 100644
--- a/arch/arm/include/asm/arch-rockchip/cru_rk3128.h
+++ b/arch/arm/include/asm/arch-rockchip/cru_rk3128.h
@@ -8,6 +8,7 @@
 
 #ifndef __ASSEMBLY__
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 #endif
 
 #define MHz		1000000
diff --git a/arch/arm/include/asm/arch-rockchip/cru_rk3188.h b/arch/arm/include/asm/arch-rockchip/cru_rk3188.h
index eec4815bbc0..97268b8777e 100644
--- a/arch/arm/include/asm/arch-rockchip/cru_rk3188.h
+++ b/arch/arm/include/asm/arch-rockchip/cru_rk3188.h
@@ -5,6 +5,8 @@
 #ifndef _ASM_ARCH_CRU_RK3188_H
 #define _ASM_ARCH_CRU_RK3188_H
 
+#include <stdbool.h>
+#include <linux/kernel.h>
 #define OSC_HZ		(24 * 1000 * 1000)
 
 #define APLL_HZ		(1608 * 1000000)
diff --git a/arch/arm/include/asm/arch-rockchip/cru_rk322x.h b/arch/arm/include/asm/arch-rockchip/cru_rk322x.h
index ee12fa831f2..ca4d727a6a7 100644
--- a/arch/arm/include/asm/arch-rockchip/cru_rk322x.h
+++ b/arch/arm/include/asm/arch-rockchip/cru_rk322x.h
@@ -5,6 +5,7 @@
 #ifndef _ASM_ARCH_CRU_RK322X_H
 #define _ASM_ARCH_CRU_RK322X_H
 
+#include <linux/kernel.h>
 #define MHz		1000000
 #define OSC_HZ		(24 * MHz)
 
diff --git a/arch/arm/include/asm/arch-rockchip/cru_rk3288.h b/arch/arm/include/asm/arch-rockchip/cru_rk3288.h
index 412b73e55fa..7affb2f0644 100644
--- a/arch/arm/include/asm/arch-rockchip/cru_rk3288.h
+++ b/arch/arm/include/asm/arch-rockchip/cru_rk3288.h
@@ -8,6 +8,7 @@
 #ifndef _ASM_ARCH_CRU_RK3288_H
 #define _ASM_ARCH_CRU_RK3288_H
 
+#include <linux/kernel.h>
 #define OSC_HZ		(24 * 1000 * 1000)
 
 #define APLL_HZ		(1800 * 1000000)
diff --git a/arch/arm/include/asm/arch-rockchip/cru_rk3328.h b/arch/arm/include/asm/arch-rockchip/cru_rk3328.h
index 226744d67d9..2cd984ad009 100644
--- a/arch/arm/include/asm/arch-rockchip/cru_rk3328.h
+++ b/arch/arm/include/asm/arch-rockchip/cru_rk3328.h
@@ -6,6 +6,7 @@
 #ifndef __ASM_ARCH_CRU_RK3328_H_
 #define __ASM_ARCH_CRU_RK3328_H_
 
+#include <linux/kernel.h>
 struct rk3328_clk_priv {
 	struct rk3328_cru *cru;
 	ulong rate;
diff --git a/arch/arm/include/asm/arch-rockchip/cru_rk3368.h b/arch/arm/include/asm/arch-rockchip/cru_rk3368.h
index 316c67c62f9..2db4e92301e 100644
--- a/arch/arm/include/asm/arch-rockchip/cru_rk3368.h
+++ b/arch/arm/include/asm/arch-rockchip/cru_rk3368.h
@@ -8,6 +8,7 @@
 
 #ifndef __ASSEMBLY__
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 #endif
 
 /* RK3368 clock numbers */
diff --git a/arch/arm/include/asm/arch-rockchip/cru_rk3399.h b/arch/arm/include/asm/arch-rockchip/cru_rk3399.h
index d941a129f3e..fdeb3735770 100644
--- a/arch/arm/include/asm/arch-rockchip/cru_rk3399.h
+++ b/arch/arm/include/asm/arch-rockchip/cru_rk3399.h
@@ -7,6 +7,7 @@
 #define __ASM_ARCH_CRU_RK3399_H_
 
 /* Private data for the clock driver - used by rockchip_get_cru() */
+#include <linux/kernel.h>
 struct rk3399_clk_priv {
 	struct rockchip_cru *cru;
 };
diff --git a/arch/arm/include/asm/arch-rockchip/cru_rv1108.h b/arch/arm/include/asm/arch-rockchip/cru_rv1108.h
index 0ba5ff6a04f..4499b453b68 100644
--- a/arch/arm/include/asm/arch-rockchip/cru_rv1108.h
+++ b/arch/arm/include/asm/arch-rockchip/cru_rv1108.h
@@ -8,6 +8,7 @@
 
 #ifndef __ASSEMBLY__
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 #endif
 
 #define OSC_HZ		(24 * 1000 * 1000)
diff --git a/arch/arm/include/asm/arch-rockchip/ddr_rk3188.h b/arch/arm/include/asm/arch-rockchip/ddr_rk3188.h
index db83d0e7d3b..c60655fcae0 100644
--- a/arch/arm/include/asm/arch-rockchip/ddr_rk3188.h
+++ b/arch/arm/include/asm/arch-rockchip/ddr_rk3188.h
@@ -7,6 +7,7 @@
 #define _ASM_ARCH_DDR_RK3188_H
 
 #include <asm/arch-rockchip/ddr_rk3288.h>
+#include <linux/kernel.h>
 
 /*
  * RK3188 Memory scheduler register map.
diff --git a/arch/arm/include/asm/arch-rockchip/ddr_rk3288.h b/arch/arm/include/asm/arch-rockchip/ddr_rk3288.h
index 979d5470e7a..ea3b6f48d90 100644
--- a/arch/arm/include/asm/arch-rockchip/ddr_rk3288.h
+++ b/arch/arm/include/asm/arch-rockchip/ddr_rk3288.h
@@ -6,6 +6,7 @@
 #ifndef _ASM_ARCH_DDR_RK3288_H
 #define _ASM_ARCH_DDR_RK3288_H
 
+#include <linux/kernel.h>
 struct rk3288_ddr_pctl {
 	u32 scfg;
 	u32 sctl;
diff --git a/arch/arm/include/asm/arch-rockchip/ddr_rk3368.h b/arch/arm/include/asm/arch-rockchip/ddr_rk3368.h
index 40cdcf4a45a..a03d3318e02 100644
--- a/arch/arm/include/asm/arch-rockchip/ddr_rk3368.h
+++ b/arch/arm/include/asm/arch-rockchip/ddr_rk3368.h
@@ -8,6 +8,7 @@
 
 #ifndef __ASSEMBLY__
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 #endif
 
 /*
diff --git a/arch/arm/include/asm/arch-rockchip/edp_rk3288.h b/arch/arm/include/asm/arch-rockchip/edp_rk3288.h
index 105a335daba..97383fce190 100644
--- a/arch/arm/include/asm/arch-rockchip/edp_rk3288.h
+++ b/arch/arm/include/asm/arch-rockchip/edp_rk3288.h
@@ -7,6 +7,7 @@
 #ifndef _ASM_ARCH_EDP_H
 #define _ASM_ARCH_EDP_H
 
+#include <linux/kernel.h>
 struct rk3288_edp {
 	u8	res0[0x10];
 	u32	dp_tx_version;
diff --git a/arch/arm/include/asm/arch-rockchip/gpio.h b/arch/arm/include/asm/arch-rockchip/gpio.h
index 1aaec5faecc..0ec09d40b4e 100644
--- a/arch/arm/include/asm/arch-rockchip/gpio.h
+++ b/arch/arm/include/asm/arch-rockchip/gpio.h
@@ -6,6 +6,7 @@
 #ifndef _ASM_ARCH_GPIO_H
 #define _ASM_ARCH_GPIO_H
 
+#include <linux/kernel.h>
 struct rockchip_gpio_regs {
 	u32 swport_dr;
 	u32 swport_ddr;
diff --git a/arch/arm/include/asm/arch-rockchip/grf_px30.h b/arch/arm/include/asm/arch-rockchip/grf_px30.h
index d51e29b19ee..0834ae673c2 100644
--- a/arch/arm/include/asm/arch-rockchip/grf_px30.h
+++ b/arch/arm/include/asm/arch-rockchip/grf_px30.h
@@ -5,6 +5,7 @@
 #ifndef _ASM_ARCH_GRF_px30_H
 #define _ASM_ARCH_GRF_px30_H
 
+#include <linux/kernel.h>
 struct px30_grf {
 	unsigned int gpio1al_iomux;
 	unsigned int gpio1ah_iomux;
diff --git a/arch/arm/include/asm/arch-rockchip/grf_rk3036.h b/arch/arm/include/asm/arch-rockchip/grf_rk3036.h
index 08348d8228a..e540f390d9a 100644
--- a/arch/arm/include/asm/arch-rockchip/grf_rk3036.h
+++ b/arch/arm/include/asm/arch-rockchip/grf_rk3036.h
@@ -5,6 +5,7 @@
 #ifndef _ASM_ARCH_GRF_RK3036_H
 #define _ASM_ARCH_GRF_RK3036_H
 
+#include <linux/kernel.h>
 struct rk3036_grf {
 	unsigned int reserved[0x2a];
 	unsigned int gpio0a_iomux;
diff --git a/arch/arm/include/asm/arch-rockchip/grf_rk3128.h b/arch/arm/include/asm/arch-rockchip/grf_rk3128.h
index fe07d69b428..71eb99246c1 100644
--- a/arch/arm/include/asm/arch-rockchip/grf_rk3128.h
+++ b/arch/arm/include/asm/arch-rockchip/grf_rk3128.h
@@ -5,6 +5,7 @@
 #ifndef _ASM_ARCH_GRF_RK3128_H
 #define _ASM_ARCH_GRF_RK3128_H
 
+#include <linux/kernel.h>
 struct rk3128_grf {
 	unsigned int reserved[0x2a];
 	unsigned int gpio0a_iomux;
diff --git a/arch/arm/include/asm/arch-rockchip/grf_rk3188.h b/arch/arm/include/asm/arch-rockchip/grf_rk3188.h
index d05197670d3..8e80749a76e 100644
--- a/arch/arm/include/asm/arch-rockchip/grf_rk3188.h
+++ b/arch/arm/include/asm/arch-rockchip/grf_rk3188.h
@@ -6,6 +6,7 @@
 #ifndef _ASM_ARCH_GRF_RK3188_H
 #define _ASM_ARCH_GRF_RK3188_H
 
+#include <linux/kernel.h>
 struct rk3188_grf_gpio_lh {
 	u32 l;
 	u32 h;
diff --git a/arch/arm/include/asm/arch-rockchip/grf_rk322x.h b/arch/arm/include/asm/arch-rockchip/grf_rk322x.h
index 5f4d9d82249..9e0b9105924 100644
--- a/arch/arm/include/asm/arch-rockchip/grf_rk322x.h
+++ b/arch/arm/include/asm/arch-rockchip/grf_rk322x.h
@@ -5,6 +5,7 @@
 #ifndef _ASM_ARCH_GRF_RK322X_H
 #define _ASM_ARCH_GRF_RK322X_H
 
+#include <linux/kernel.h>
 struct rk322x_grf {
 	unsigned int gpio0a_iomux;
 	unsigned int gpio0b_iomux;
diff --git a/arch/arm/include/asm/arch-rockchip/grf_rk3328.h b/arch/arm/include/asm/arch-rockchip/grf_rk3328.h
index d8a46800fd9..663a3fa52e3 100644
--- a/arch/arm/include/asm/arch-rockchip/grf_rk3328.h
+++ b/arch/arm/include/asm/arch-rockchip/grf_rk3328.h
@@ -6,6 +6,7 @@
 #ifndef __SOC_ROCKCHIP_RK3328_GRF_H__
 #define __SOC_ROCKCHIP_RK3328_GRF_H__
 
+#include <linux/kernel.h>
 struct rk3328_grf_regs {
 	u32 gpio0a_iomux;
 	u32 gpio0b_iomux;
diff --git a/arch/arm/include/asm/arch-rockchip/grf_rk3368.h b/arch/arm/include/asm/arch-rockchip/grf_rk3368.h
index 0079d200780..8e4b3ec481c 100644
--- a/arch/arm/include/asm/arch-rockchip/grf_rk3368.h
+++ b/arch/arm/include/asm/arch-rockchip/grf_rk3368.h
@@ -8,6 +8,7 @@
 
 #ifndef __ASSEMBLY__
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 #endif
 
 struct rk3368_grf {
diff --git a/arch/arm/include/asm/arch-rockchip/grf_rk3399.h b/arch/arm/include/asm/arch-rockchip/grf_rk3399.h
index dd89cd20505..0a7249560f2 100644
--- a/arch/arm/include/asm/arch-rockchip/grf_rk3399.h
+++ b/arch/arm/include/asm/arch-rockchip/grf_rk3399.h
@@ -6,6 +6,7 @@
 #ifndef __SOC_ROCKCHIP_RK3399_GRF_H__
 #define __SOC_ROCKCHIP_RK3399_GRF_H__
 
+#include <linux/kernel.h>
 struct rk3399_grf_regs {
 	u32 reserved[0x800];
 	u32 usb3_perf_con0;
diff --git a/arch/arm/include/asm/arch-rockchip/grf_rv1108.h b/arch/arm/include/asm/arch-rockchip/grf_rv1108.h
index 92bbe34af68..aefbe9b56e1 100644
--- a/arch/arm/include/asm/arch-rockchip/grf_rv1108.h
+++ b/arch/arm/include/asm/arch-rockchip/grf_rv1108.h
@@ -5,6 +5,7 @@
 #ifndef _ASM_ARCH_GRF_RV1108_H
 #define _ASM_ARCH_GRF_RV1108_H
 
+#include <linux/kernel.h>
 struct rv1108_grf {
 	u32 reserved[4];
 	u32 gpio1a_iomux;
diff --git a/arch/arm/include/asm/arch-rockchip/pmu_rk3188.h b/arch/arm/include/asm/arch-rockchip/pmu_rk3188.h
index f7b9a0674c1..6227dc0ed5a 100644
--- a/arch/arm/include/asm/arch-rockchip/pmu_rk3188.h
+++ b/arch/arm/include/asm/arch-rockchip/pmu_rk3188.h
@@ -6,6 +6,7 @@
 #ifndef _ASM_ARCH_PMU_RK3188_H
 #define _ASM_ARCH_PMU_RK3188_H
 
+#include <linux/kernel.h>
 struct rk3188_pmu {
 	u32 wakeup_cfg[2];
 	u32 pwrdn_con;
diff --git a/arch/arm/include/asm/arch-rockchip/pmu_rk3288.h b/arch/arm/include/asm/arch-rockchip/pmu_rk3288.h
index 8553d2eee4c..1b50cd5326e 100644
--- a/arch/arm/include/asm/arch-rockchip/pmu_rk3288.h
+++ b/arch/arm/include/asm/arch-rockchip/pmu_rk3288.h
@@ -8,6 +8,7 @@
 #ifndef _ASM_ARCH_PMU_RK3288_H
 #define _ASM_ARCH_PMU_RK3288_H
 
+#include <linux/kernel.h>
 struct rk3288_pmu {
 	u32 wakeup_cfg[2];
 	u32 pwrdn_con;
diff --git a/arch/arm/include/asm/arch-rockchip/pmu_rk3399.h b/arch/arm/include/asm/arch-rockchip/pmu_rk3399.h
index f1096dccced..350559d5054 100644
--- a/arch/arm/include/asm/arch-rockchip/pmu_rk3399.h
+++ b/arch/arm/include/asm/arch-rockchip/pmu_rk3399.h
@@ -7,6 +7,7 @@
 #ifndef __SOC_ROCKCHIP_RK3399_PMU_H__
 #define __SOC_ROCKCHIP_RK3399_PMU_H__
 
+#include <linux/kernel.h>
 struct rk3399_pmu_regs {
 	u32 pmu_wakeup_cfg[5];
 	u32 pmu_pwrdn_con;
diff --git a/arch/arm/include/asm/arch-rockchip/sdram_rk3036.h b/arch/arm/include/asm/arch-rockchip/sdram_rk3036.h
index 46298165fbc..7f89d7f9211 100644
--- a/arch/arm/include/asm/arch-rockchip/sdram_rk3036.h
+++ b/arch/arm/include/asm/arch-rockchip/sdram_rk3036.h
@@ -5,6 +5,7 @@
 #ifndef _ASM_ARCH_SDRAM_RK3036_H
 #define _ASM_ARCH_SDRAM_RK3036_H
 
+#include <linux/kernel.h>
 struct rk3036_ddr_pctl {
 	u32 scfg;
 	u32 sctl;
diff --git a/arch/arm/include/asm/arch-rockchip/sdram_rk322x.h b/arch/arm/include/asm/arch-rockchip/sdram_rk322x.h
index 6f6c5c9954f..2aaf66c1ab0 100644
--- a/arch/arm/include/asm/arch-rockchip/sdram_rk322x.h
+++ b/arch/arm/include/asm/arch-rockchip/sdram_rk322x.h
@@ -7,6 +7,7 @@
 
 #ifndef __ASSEMBLY__
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 #endif
 
 struct rk322x_sdram_channel {
diff --git a/arch/arm/include/asm/arch-rockchip/sdram_rk3288.h b/arch/arm/include/asm/arch-rockchip/sdram_rk3288.h
index 9220763fa7f..9dede806843 100644
--- a/arch/arm/include/asm/arch-rockchip/sdram_rk3288.h
+++ b/arch/arm/include/asm/arch-rockchip/sdram_rk3288.h
@@ -8,6 +8,7 @@
 #ifndef _ASM_ARCH_RK3288_SDRAM_H__
 #define _ASM_ARCH_RK3288_SDRAM_H__
 
+#include <linux/kernel.h>
 struct rk3288_sdram_channel {
 	/*
 	 * bit width in address, eg:
diff --git a/arch/arm/include/asm/arch-rockchip/vop_rk3288.h b/arch/arm/include/asm/arch-rockchip/vop_rk3288.h
index 872a158b714..c1aab4219e4 100644
--- a/arch/arm/include/asm/arch-rockchip/vop_rk3288.h
+++ b/arch/arm/include/asm/arch-rockchip/vop_rk3288.h
@@ -7,6 +7,7 @@
 #ifndef _ASM_ARCH_VOP_RK3288_H
 #define _ASM_ARCH_VOP_RK3288_H
 
+#include <linux/kernel.h>
 struct rk3288_vop {
 	u32 reg_cfg_done;
 	u32 version_info;
diff --git a/arch/arm/include/asm/arch-sunxi/clock_sun6i.h b/arch/arm/include/asm/arch-sunxi/clock_sun6i.h
index ee387127f37..3c3ebfd3a20 100644
--- a/arch/arm/include/asm/arch-sunxi/clock_sun6i.h
+++ b/arch/arm/include/asm/arch-sunxi/clock_sun6i.h
@@ -10,6 +10,7 @@
 #ifndef _SUNXI_CLOCK_SUN6I_H
 #define _SUNXI_CLOCK_SUN6I_H
 
+#include <stdbool.h>
 struct sunxi_ccm_reg {
 	u32 pll1_cfg;		/* 0x00 pll1 control */
 	u32 reserved0;
diff --git a/arch/arm/include/asm/arch-sunxi/dram.h b/arch/arm/include/asm/arch-sunxi/dram.h
index 8002b7efdc1..51c3139a6f9 100644
--- a/arch/arm/include/asm/arch-sunxi/dram.h
+++ b/arch/arm/include/asm/arch-sunxi/dram.h
@@ -11,6 +11,7 @@
 #ifndef _SUNXI_DRAM_H
 #define _SUNXI_DRAM_H
 
+#include <stdbool.h>
 #include <asm/io.h>
 #include <linux/types.h>
 
diff --git a/arch/arm/include/asm/arch-sunxi/dram_sun50i_h6.h b/arch/arm/include/asm/arch-sunxi/dram_sun50i_h6.h
index be02655cdd5..ddaa238c279 100644
--- a/arch/arm/include/asm/arch-sunxi/dram_sun50i_h6.h
+++ b/arch/arm/include/asm/arch-sunxi/dram_sun50i_h6.h
@@ -12,6 +12,7 @@
 #include <stdbool.h>
 #ifndef __ASSEMBLY__
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 #endif
 
 enum sunxi_dram_type {
diff --git a/arch/arm/include/asm/arch-sunxi/dram_sunxi_dw.h b/arch/arm/include/asm/arch-sunxi/dram_sunxi_dw.h
index a5a7ebde44e..3420f939f24 100644
--- a/arch/arm/include/asm/arch-sunxi/dram_sunxi_dw.h
+++ b/arch/arm/include/asm/arch-sunxi/dram_sunxi_dw.h
@@ -13,6 +13,7 @@
 #define _SUNXI_DRAM_SUN8I_H3_H
 
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 
 struct sunxi_mctl_com_reg {
 	u32 cr;			/* 0x00 control register */
diff --git a/arch/arm/include/asm/arch-sunxi/lcdc.h b/arch/arm/include/asm/arch-sunxi/lcdc.h
index 90216bcfd51..7fca301df96 100644
--- a/arch/arm/include/asm/arch-sunxi/lcdc.h
+++ b/arch/arm/include/asm/arch-sunxi/lcdc.h
@@ -10,6 +10,7 @@
 #define _LCDC_H
 
 #include <fdtdec.h>
+#include <stdbool.h>
 
 struct sunxi_lcdc_reg {
 	u32 ctrl;			/* 0x00 */
diff --git a/arch/arm/include/asm/arch-tegra/ap.h b/arch/arm/include/asm/arch-tegra/ap.h
index de21dffa55a..9f0f92a3836 100644
--- a/arch/arm/include/asm/arch-tegra/ap.h
+++ b/arch/arm/include/asm/arch-tegra/ap.h
@@ -3,6 +3,7 @@
  * (C) Copyright 2010-2015
  * NVIDIA Corporation <www.nvidia.com>
  */
+#include <stdbool.h>
 #include <asm/types.h>
 
 /* Stabilization delays, in usec */
diff --git a/arch/arm/include/asm/arch-tegra/clock.h b/arch/arm/include/asm/arch-tegra/clock.h
index 1d80d9e9461..630287c1b78 100644
--- a/arch/arm/include/asm/arch-tegra/clock.h
+++ b/arch/arm/include/asm/arch-tegra/clock.h
@@ -38,6 +38,7 @@ enum {
 	MASK_BITS_31_28,
 };
 
+#include <stdbool.h>
 #include <asm/arch/clock-tables.h>
 /* PLL stabilization delay in usec */
 #define CLOCK_PLL_STABLE_DELAY_US 300
diff --git a/arch/arm/include/asm/armv7.h b/arch/arm/include/asm/armv7.h
index 2fb824b69e2..751f492a085 100644
--- a/arch/arm/include/asm/armv7.h
+++ b/arch/arm/include/asm/armv7.h
@@ -56,6 +56,7 @@
 #define ARMV7_CLIDR_CTYPE_UNIFIED		4
 
 #ifndef __ASSEMBLY__
+#include <stdbool.h>
 #include <linux/types.h>
 #include <asm/io.h>
 #include <asm/barriers.h>
diff --git a/arch/arm/include/asm/armv8/sec_firmware.h b/arch/arm/include/asm/armv8/sec_firmware.h
index 0f86c72b24d..9c010953f5f 100644
--- a/arch/arm/include/asm/armv8/sec_firmware.h
+++ b/arch/arm/include/asm/armv8/sec_firmware.h
@@ -6,6 +6,8 @@
 #ifndef __SEC_FIRMWARE_H_
 #define __SEC_FIRMWARE_H_
 
+#include <stdbool.h>
+
 #define PSCI_INVALID_VER		0xffffffff
 #define SEC_JR3_OFFSET			0x40000
 #define WORD_MASK			0xffffffff
diff --git a/arch/arm/include/asm/mach-imx/hab.h b/arch/arm/include/asm/mach-imx/hab.h
index d8bd77075ae..f89f750169b 100644
--- a/arch/arm/include/asm/mach-imx/hab.h
+++ b/arch/arm/include/asm/mach-imx/hab.h
@@ -7,6 +7,7 @@
 #ifndef __SECURE_MX6Q_H__
 #define __SECURE_MX6Q_H__
 
+#include <stdbool.h>
 #include <linux/types.h>
 #include <linux/compiler.h>
 
diff --git a/arch/arm/include/asm/mach-imx/iomux-v3.h b/arch/arm/include/asm/mach-imx/iomux-v3.h
index 1de70933550..f6c0044caff 100644
--- a/arch/arm/include/asm/mach-imx/iomux-v3.h
+++ b/arch/arm/include/asm/mach-imx/iomux-v3.h
@@ -10,6 +10,7 @@
 #ifndef __MACH_IOMUX_V3_H__
 #define __MACH_IOMUX_V3_H__
 
+#include <linux/kernel.h>
 #include <linux/types.h>
 
 /*
diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c
index c9efede771e..a11fe7ed31e 100644
--- a/arch/arm/lib/bootm.c
+++ b/arch/arm/lib/bootm.c
@@ -19,6 +19,7 @@
 #include <hang.h>
 #include <lmb.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
diff --git a/arch/arm/lib/cache-cp15.c b/arch/arm/lib/cache-cp15.c
index e0e273495b3..39d51859ed7 100644
--- a/arch/arm/lib/cache-cp15.c
+++ b/arch/arm/lib/cache-cp15.c
@@ -14,6 +14,7 @@
 #include <asm/u-boot.h>
 #include <linux/compiler.h>
 #include <asm/armv7_mpu.h>
+#include <linux/kernel.h>
 
 #if !(CONFIG_IS_ENABLED(SYS_ICACHE_OFF) && CONFIG_IS_ENABLED(SYS_DCACHE_OFF))
 
diff --git a/arch/arm/lib/cache.c b/arch/arm/lib/cache.c
index 4956942002d..6509052ddcf 100644
--- a/arch/arm/lib/cache.c
+++ b/arch/arm/lib/cache.c
@@ -13,6 +13,7 @@
 #include <stdio.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/lib/gic-v3-its.c b/arch/arm/lib/gic-v3-its.c
index 45c8ae09350..4fc9f9b7833 100644
--- a/arch/arm/lib/gic-v3-its.c
+++ b/arch/arm/lib/gic-v3-its.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/sizes.h>
 
diff --git a/arch/arm/lib/image.c b/arch/arm/lib/image.c
index bb251af08ad..5dfa8eff31a 100644
--- a/arch/arm/lib/image.c
+++ b/arch/arm/lib/image.c
@@ -11,6 +11,7 @@
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-at91/atmel_sfr.c b/arch/arm/mach-at91/atmel_sfr.c
index b14222460f3..c2677c51c0c 100644
--- a/arch/arm/mach-at91/atmel_sfr.c
+++ b/arch/arm/mach-at91/atmel_sfr.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <stdbool.h>
 #include <asm/hardware.h>
 #include <asm/io.h>
 #include <asm/arch/at91_sfr.h>
diff --git a/arch/arm/mach-at91/include/mach/at91_common.h b/arch/arm/mach-at91/include/mach/at91_common.h
index 01e00c508a8..f3551832f3a 100644
--- a/arch/arm/mach-at91/include/mach/at91_common.h
+++ b/arch/arm/mach-at91/include/mach/at91_common.h
@@ -8,6 +8,7 @@
 #ifndef AT91_COMMON_H
 #define AT91_COMMON_H
 
+#include <stdbool.h>
 void at91_can_hw_init(void);
 void at91_gmac_hw_init(void);
 void at91_macb_hw_init(void);
diff --git a/arch/arm/mach-at91/include/mach/atmel_usba_udc.h b/arch/arm/mach-at91/include/mach/atmel_usba_udc.h
index 835b47d91ba..24ccea93df3 100644
--- a/arch/arm/mach-at91/include/mach/atmel_usba_udc.h
+++ b/arch/arm/mach-at91/include/mach/atmel_usba_udc.h
@@ -7,6 +7,7 @@
 #ifndef __ATMEL_USBA_UDC_H__
 #define __ATMEL_USBA_UDC_H__
 
+#include <linux/kernel.h>
 #include <linux/usb/atmel_usba_udc.h>
 
 #define EP(nam, idx, maxpkt, maxbk, dma, isoc)		\
diff --git a/arch/arm/mach-bcm283x/mbox.c b/arch/arm/mach-bcm283x/mbox.c
index ed724497b0c..0c8cf78c188 100644
--- a/arch/arm/mach-bcm283x/mbox.c
+++ b/arch/arm/mach-bcm283x/mbox.c
@@ -13,6 +13,7 @@
 #include <asm/arch/base.h>
 #include <asm/arch/mbox.h>
 #include <phys2bus.h>
+#include <linux/kernel.h>
 
 #define TIMEOUT 1000 /* ms */
 
diff --git a/arch/arm/mach-davinci/include/mach/davinci_misc.h b/arch/arm/mach-davinci/include/mach/davinci_misc.h
index 48b11f7a5c8..41b2c6648ec 100644
--- a/arch/arm/mach-davinci/include/mach/davinci_misc.h
+++ b/arch/arm/mach-davinci/include/mach/davinci_misc.h
@@ -7,6 +7,7 @@
 #define __MISC_H
 
 #include <asm/arch/hardware.h>
+#include <linux/kernel.h>
 
 /* pin muxer definitions */
 #define PIN_MUX_NUM_FIELDS	8	/* Per register */
diff --git a/arch/arm/mach-exynos/clock.c b/arch/arm/mach-exynos/clock.c
index 76bb97e3732..33995ff4ec6 100644
--- a/arch/arm/mach-exynos/clock.c
+++ b/arch/arm/mach-exynos/clock.c
@@ -12,6 +12,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/clk.h>
 #include <asm/arch/periph.h>
+#include <linux/kernel.h>
 
 #define PLL_DIV_1024	1024
 #define PLL_DIV_65535	65535
diff --git a/arch/arm/mach-exynos/clock_init_exynos5.c b/arch/arm/mach-exynos/clock_init_exynos5.c
index 1cb8d391e7c..cf83ef9391a 100644
--- a/arch/arm/mach-exynos/clock_init_exynos5.c
+++ b/arch/arm/mach-exynos/clock_init_exynos5.c
@@ -12,6 +12,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/spl.h>
 #include <asm/arch/dwmmc.h>
+#include <linux/kernel.h>
 
 #include "clock_init.h"
 #include "common_setup.h"
diff --git a/arch/arm/mach-exynos/dmc_init_ddr3.c b/arch/arm/mach-exynos/dmc_init_ddr3.c
index 18c558f92a9..2cf3c2fa06a 100644
--- a/arch/arm/mach-exynos/dmc_init_ddr3.c
+++ b/arch/arm/mach-exynos/dmc_init_ddr3.c
@@ -7,11 +7,13 @@
 
 #include <common.h>
 #include <config.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/dmc.h>
 #include <asm/arch/power.h>
+#include <linux/kernel.h>
 #include "common_setup.h"
 #include "exynos5_setup.h"
 #include "clock_init.h"
diff --git a/arch/arm/mach-exynos/pinmux.c b/arch/arm/mach-exynos/pinmux.c
index ad3fbf2da7a..5d7738ae5ba 100644
--- a/arch/arm/mach-exynos/pinmux.c
+++ b/arch/arm/mach-exynos/pinmux.c
@@ -10,6 +10,7 @@
 #include <asm/gpio.h>
 #include <asm/arch/pinmux.h>
 #include <asm/arch/sromc.h>
+#include <linux/kernel.h>
 
 static void exynos5_uart_config(int peripheral)
 {
diff --git a/arch/arm/mach-exynos/spl_boot.c b/arch/arm/mach-exynos/spl_boot.c
index 27f0dac182d..3ed5d10f1ae 100644
--- a/arch/arm/mach-exynos/spl_boot.c
+++ b/arch/arm/mach-exynos/spl_boot.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <log.h>
 #include <asm/global_data.h>
+#include <linux/kernel.h>
 
 #include <asm/cache.h>
 #include <asm/arch/clock.h>
diff --git a/arch/arm/mach-imx/cmd_bmode.c b/arch/arm/mach-imx/cmd_bmode.c
index 2ad9e6c5f2b..9058127b2a5 100644
--- a/arch/arm/mach-imx/cmd_bmode.c
+++ b/arch/arm/mach-imx/cmd_bmode.c
@@ -8,6 +8,7 @@
 #include <asm/mach-imx/boot_mode.h>
 #include <malloc.h>
 #include <command.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 static const struct boot_mode *modes[2];
diff --git a/arch/arm/mach-imx/cmd_nandbcb.c b/arch/arm/mach-imx/cmd_nandbcb.c
index beb538677d9..9165140e494 100644
--- a/arch/arm/mach-imx/cmd_nandbcb.c
+++ b/arch/arm/mach-imx/cmd_nandbcb.c
@@ -21,6 +21,7 @@
 #include <dm/devres.h>
 #include <linux/bug.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include <asm/io.h>
diff --git a/arch/arm/mach-imx/ddrmc-vf610.c b/arch/arm/mach-imx/ddrmc-vf610.c
index 7895ee66f8a..95fdf1cd436 100644
--- a/arch/arm/mach-imx/ddrmc-vf610.c
+++ b/arch/arm/mach-imx/ddrmc-vf610.c
@@ -12,6 +12,7 @@
 #include <asm/arch/iomux-vf610.h>
 #include <asm/arch/ddrmc-vf610.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include "ddrmc-vf610-calibration.h"
 
 void ddrmc_setup_iomux(const iomux_v3_cfg_t *pads, int pads_count)
diff --git a/arch/arm/mach-imx/hab.c b/arch/arm/mach-imx/hab.c
index 3f3d47c1300..b576b032ec6 100644
--- a/arch/arm/mach-imx/hab.c
+++ b/arch/arm/mach-imx/hab.c
@@ -10,6 +10,7 @@
 #include <fuse.h>
 #include <mapmem.h>
 #include <image.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/io.h>
diff --git a/arch/arm/mach-imx/i2c-mxv7.c b/arch/arm/mach-imx/i2c-mxv7.c
index bf0742e57e3..1e1b14c1272 100644
--- a/arch/arm/mach-imx/i2c-mxv7.c
+++ b/arch/arm/mach-imx/i2c-mxv7.c
@@ -14,6 +14,7 @@
 #include <asm/gpio.h>
 #include <asm/mach-imx/mxc_i2c.h>
 #include <watchdog.h>
+#include <linux/kernel.h>
 
 int force_idle_bus(void *priv)
 {
diff --git a/arch/arm/mach-imx/imx8/ahab.c b/arch/arm/mach-imx/imx8/ahab.c
index fb1d067f9c5..f3c370914c6 100644
--- a/arch/arm/mach-imx/imx8/ahab.c
+++ b/arch/arm/mach-imx/imx8/ahab.c
@@ -19,6 +19,7 @@
 #include <console.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-imx/imx8/cpu.c b/arch/arm/mach-imx/imx8/cpu.c
index d729c3536e7..55a424f6e2f 100644
--- a/arch/arm/mach-imx/imx8/cpu.c
+++ b/arch/arm/mach-imx/imx8/cpu.c
@@ -29,6 +29,7 @@
 #include <asm/mach-imx/boot_mode.h>
 #include <spl.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-imx/imx8/fdt.c b/arch/arm/mach-imx/imx8/fdt.c
index 239adfc2e5c..eee6e529cdc 100644
--- a/arch/arm/mach-imx/imx8/fdt.c
+++ b/arch/arm/mach-imx/imx8/fdt.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/arch/sci/sci.h>
 #include <asm/arch/sys_proto.h>
diff --git a/arch/arm/mach-imx/imx8/image.c b/arch/arm/mach-imx/imx8/image.c
index 528a42a5996..4258abecd08 100644
--- a/arch/arm/mach-imx/imx8/image.c
+++ b/arch/arm/mach-imx/imx8/image.c
@@ -16,6 +16,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/mach-imx/boot_mode.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #define MMC_DEV		0
diff --git a/arch/arm/mach-imx/imx8/parse-container.c b/arch/arm/mach-imx/imx8/parse-container.c
index 6a3a4eaa7c7..a5332358ca5 100644
--- a/arch/arm/mach-imx/imx8/parse-container.c
+++ b/arch/arm/mach-imx/imx8/parse-container.c
@@ -11,6 +11,7 @@
 #include <asm/arch/image.h>
 #include <asm/arch/sci/sci.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #define SEC_SECURE_RAM_BASE		0x31800000UL
diff --git a/arch/arm/mach-imx/imx8/snvs_security_sc.c b/arch/arm/mach-imx/imx8/snvs_security_sc.c
index 391d2d0e4b1..086e89b0e5c 100644
--- a/arch/arm/mach-imx/imx8/snvs_security_sc.c
+++ b/arch/arm/mach-imx/imx8/snvs_security_sc.c
@@ -22,6 +22,7 @@
 #include <asm/arch-imx8/snvs_security_sc.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 /* Access to gd */
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-imx/imx8m/clock_imx8mm.c b/arch/arm/mach-imx/imx8m/clock_imx8mm.c
index 170e6c20853..ac4d0766dab 100644
--- a/arch/arm/mach-imx/imx8m/clock_imx8mm.c
+++ b/arch/arm/mach-imx/imx8m/clock_imx8mm.c
@@ -17,6 +17,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-imx/imx8m/clock_imx8mq.c b/arch/arm/mach-imx/imx8m/clock_imx8mq.c
index 0c74f99f440..95a1dbb7180 100644
--- a/arch/arm/mach-imx/imx8m/clock_imx8mq.c
+++ b/arch/arm/mach-imx/imx8m/clock_imx8mq.c
@@ -16,6 +16,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/iopoll.h>
+#include <linux/kernel.h>
 
 static struct anamix_pll *ana_pll = (struct anamix_pll *)ANATOP_BASE_ADDR;
 
diff --git a/arch/arm/mach-imx/imx8m/clock_slice.c b/arch/arm/mach-imx/imx8m/clock_slice.c
index ad0d553c1cf..4074e1e4c52 100644
--- a/arch/arm/mach-imx/imx8m/clock_slice.c
+++ b/arch/arm/mach-imx/imx8m/clock_slice.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <errno.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 static struct ccm_reg *ccm_reg = (struct ccm_reg *)CCM_BASE_ADDR;
 
diff --git a/arch/arm/mach-imx/imx8m/soc.c b/arch/arm/mach-imx/imx8m/soc.c
index 8fff7f4f95b..f05760771be 100644
--- a/arch/arm/mach-imx/imx8m/soc.c
+++ b/arch/arm/mach-imx/imx8m/soc.c
@@ -33,6 +33,7 @@
 #include <linux/arm-smccc.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-imx/imxrt/soc.c b/arch/arm/mach-imx/imxrt/soc.c
index 0ac64e883f7..1e452bffb16 100644
--- a/arch/arm/mach-imx/imxrt/soc.c
+++ b/arch/arm/mach-imx/imxrt/soc.c
@@ -10,6 +10,7 @@
 #include <asm/armv7_mpu.h>
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 
 int arch_cpu_init(void)
 {
diff --git a/arch/arm/mach-imx/mac.c b/arch/arm/mach-imx/mac.c
index 3b1496b2038..b23315cf90e 100644
--- a/arch/arm/mach-imx/mac.c
+++ b/arch/arm/mach-imx/mac.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <stdbool.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
diff --git a/arch/arm/mach-imx/mx5/clock.c b/arch/arm/mach-imx/mx5/clock.c
index c6a14a6a7ec..adc7dbee7d3 100644
--- a/arch/arm/mach-imx/mx5/clock.c
+++ b/arch/arm/mach-imx/mx5/clock.c
@@ -17,6 +17,7 @@
 #include <asm/arch/clock.h>
 #include <div64.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 enum pll_clocks {
diff --git a/arch/arm/mach-imx/mx6/clock.c b/arch/arm/mach-imx/mx6/clock.c
index c91259f4bec..7e066d39b2d 100644
--- a/arch/arm/mach-imx/mx6/clock.c
+++ b/arch/arm/mach-imx/mx6/clock.c
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <div64.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <asm/io.h>
diff --git a/arch/arm/mach-imx/mx6/ddr.c b/arch/arm/mach-imx/mx6/ddr.c
index fc147962939..d5230d516a1 100644
--- a/arch/arm/mach-imx/mx6/ddr.c
+++ b/arch/arm/mach-imx/mx6/ddr.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <stdio.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/types.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/mx6-ddr.h>
diff --git a/arch/arm/mach-imx/mx6/litesom.c b/arch/arm/mach-imx/mx6/litesom.c
index 5514389ca2a..1e817233dfc 100644
--- a/arch/arm/mach-imx/mx6/litesom.c
+++ b/arch/arm/mach-imx/mx6/litesom.c
@@ -22,6 +22,7 @@
 #include <fsl_esdhc_imx.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <mmc.h>
 
diff --git a/arch/arm/mach-imx/mx6/module_fuse.c b/arch/arm/mach-imx/mx6/module_fuse.c
index 569c8dc0b13..c1731a82856 100644
--- a/arch/arm/mach-imx/mx6/module_fuse.c
+++ b/arch/arm/mach-imx/mx6/module_fuse.c
@@ -12,6 +12,7 @@
 #include <asm/mach-imx/module_fuse.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 static struct fuse_entry_desc mx6_fuse_descs[] = {
diff --git a/arch/arm/mach-imx/mx6/soc.c b/arch/arm/mach-imx/mx6/soc.c
index ef031364fbf..51d1cbc24de 100644
--- a/arch/arm/mach-imx/mx6/soc.c
+++ b/arch/arm/mach-imx/mx6/soc.c
@@ -26,6 +26,7 @@
 #include <fsl_sec.h>
 #include <imx_thermal.h>
 #include <mmc.h>
+#include <linux/kernel.h>
 
 struct scu_regs {
 	u32	ctrl;
diff --git a/arch/arm/mach-imx/mx7/clock_slice.c b/arch/arm/mach-imx/mx7/clock_slice.c
index ce2f59cd098..c5aea2bffd6 100644
--- a/arch/arm/mach-imx/mx7/clock_slice.c
+++ b/arch/arm/mach-imx/mx7/clock_slice.c
@@ -15,6 +15,7 @@
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/kernel.h>
 
 struct mxc_ccm_reg *imx_ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR;
 
diff --git a/arch/arm/mach-imx/mx7/psci-mx7.c b/arch/arm/mach-imx/mx7/psci-mx7.c
index f32945ea371..214e4043f44 100644
--- a/arch/arm/mach-imx/mx7/psci-mx7.c
+++ b/arch/arm/mach-imx/mx7/psci-mx7.c
@@ -5,6 +5,7 @@
  */
 
 #include <cpu_func.h>
+#include <stdbool.h>
 #include <asm/cache.h>
 #include <asm/io.h>
 #include <asm/psci.h>
diff --git a/arch/arm/mach-imx/mx7/soc.c b/arch/arm/mach-imx/mx7/soc.c
index 36f3f8f945b..e97aa8ebe75 100644
--- a/arch/arm/mach-imx/mx7/soc.c
+++ b/arch/arm/mach-imx/mx7/soc.c
@@ -21,6 +21,7 @@
 #include <asm/setup.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 
 #define IOMUXC_GPR1		0x4
 #define BM_IOMUXC_GPR1_IRQ	0x1000
diff --git a/arch/arm/mach-imx/mx7ulp/pcc.c b/arch/arm/mach-imx/mx7ulp/pcc.c
index 1fd8b0a540f..9d06260bdfa 100644
--- a/arch/arm/mach-imx/mx7ulp/pcc.c
+++ b/arch/arm/mach-imx/mx7ulp/pcc.c
@@ -13,6 +13,7 @@
 #include <asm/arch/pcc.h>
 #include <asm/arch/sys_proto.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #define PCC_CLKSRC_TYPES 2
 #define PCC_CLKSRC_NUM 7
diff --git a/arch/arm/mach-imx/mx7ulp/scg.c b/arch/arm/mach-imx/mx7ulp/scg.c
index 58bc3df1e78..bc837aae33a 100644
--- a/arch/arm/mach-imx/mx7ulp/scg.c
+++ b/arch/arm/mach-imx/mx7ulp/scg.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <div64.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/io.h>
 #include <errno.h>
diff --git a/arch/arm/mach-imx/mx7ulp/soc.c b/arch/arm/mach-imx/mx7ulp/soc.c
index be74201f1a0..79a4ef3cbf8 100644
--- a/arch/arm/mach-imx/mx7ulp/soc.c
+++ b/arch/arm/mach-imx/mx7ulp/soc.c
@@ -7,6 +7,7 @@
 #include <cpu_func.h>
 #include <init.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/io.h>
diff --git a/arch/arm/mach-imx/spl.c b/arch/arm/mach-imx/spl.c
index 62ede7423f5..8e712607044 100644
--- a/arch/arm/mach-imx/spl.c
+++ b/arch/arm/mach-imx/spl.c
@@ -21,6 +21,7 @@
 #include <asm/mach-imx/boot_mode.h>
 #include <g_dnl.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-imx/spl_imx_romapi.c b/arch/arm/mach-imx/spl_imx_romapi.c
index 8750fbdaf4e..336b3da6264 100644
--- a/arch/arm/mach-imx/spl_imx_romapi.c
+++ b/arch/arm/mach-imx/spl_imx_romapi.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <spl.h>
 #include <linux/string.h>
diff --git a/arch/arm/mach-ipq40xx/pinctrl-snapdragon.c b/arch/arm/mach-ipq40xx/pinctrl-snapdragon.c
index 08001da66f1..9f73a62d7a1 100644
--- a/arch/arm/mach-ipq40xx/pinctrl-snapdragon.c
+++ b/arch/arm/mach-ipq40xx/pinctrl-snapdragon.c
@@ -17,6 +17,7 @@
 #include <dm/pinctrl.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include "pinctrl-snapdragon.h"
 
 struct msm_pinctrl_priv {
diff --git a/arch/arm/mach-k3/am6_init.c b/arch/arm/mach-k3/am6_init.c
index 7a672c31f23..bda150df9cf 100644
--- a/arch/arm/mach-k3/am6_init.c
+++ b/arch/arm/mach-k3/am6_init.c
@@ -15,6 +15,7 @@
 #include <asm/arch/hardware.h>
 #include <asm/arch/sysfw-loader.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/kernel.h>
 #include "common.h"
 #include <dm.h>
 #include <dm/uclass-internal.h>
diff --git a/arch/arm/mach-k3/common.c b/arch/arm/mach-k3/common.c
index 9592303e921..ef1f3b3209b 100644
--- a/arch/arm/mach-k3/common.c
+++ b/arch/arm/mach-k3/common.c
@@ -15,6 +15,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include "common.h"
diff --git a/arch/arm/mach-k3/j721e_init.c b/arch/arm/mach-k3/j721e_init.c
index 7252a1f5d70..a835309daf1 100644
--- a/arch/arm/mach-k3/j721e_init.c
+++ b/arch/arm/mach-k3/j721e_init.c
@@ -15,6 +15,7 @@
 #include <asm/armv7_mpu.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/sysfw-loader.h>
+#include <linux/kernel.h>
 #include "common.h"
 #include <asm/arch/sys_proto.h>
 #include <linux/soc/ti/ti_sci_protocol.h>
diff --git a/arch/arm/mach-k3/security.c b/arch/arm/mach-k3/security.c
index 484884819b4..f4aef0a025b 100644
--- a/arch/arm/mach-k3/security.c
+++ b/arch/arm/mach-k3/security.c
@@ -14,6 +14,7 @@
 #include <log.h>
 #include <stdio.h>
 #include <asm/cache.h>
+#include <linux/kernel.h>
 #include <linux/soc/ti/ti_sci_protocol.h>
 #include <mach/spl.h>
 #include <spl.h>
diff --git a/arch/arm/mach-k3/sysfw-loader.c b/arch/arm/mach-k3/sysfw-loader.c
index bfaf4952071..39a9da1698d 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 <stdbool.h>
 #include <vsprintf.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
diff --git a/arch/arm/mach-keystone/include/mach/psc_defs.h b/arch/arm/mach-keystone/include/mach/psc_defs.h
index f164f95bf24..0864b37a531 100644
--- a/arch/arm/mach-keystone/include/mach/psc_defs.h
+++ b/arch/arm/mach-keystone/include/mach/psc_defs.h
@@ -6,6 +6,7 @@
 #ifndef _PSC_DEFS_H_
 #define _PSC_DEFS_H_
 
+#include <stdbool.h>
 #include <asm/arch/hardware.h>
 
 /*
diff --git a/arch/arm/mach-keystone/psc.c b/arch/arm/mach-keystone/psc.c
index 6d68ecba4f8..6005cbaeca8 100644
--- a/arch/arm/mach-keystone/psc.c
+++ b/arch/arm/mach-keystone/psc.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/arch/arm/mach-kirkwood/cpu.c b/arch/arm/mach-kirkwood/cpu.c
index a202e83b08f..48d4327be76 100644
--- a/arch/arm/mach-kirkwood/cpu.c
+++ b/arch/arm/mach-kirkwood/cpu.c
@@ -21,6 +21,7 @@
 #include <asm/arch/soc.h>
 #include <mvebu_mmc.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 void reset_cpu(unsigned long ignored)
 {
diff --git a/arch/arm/mach-mediatek/mt7623/init.c b/arch/arm/mach-mediatek/mt7623/init.c
index 7db7336494e..fa7a05291bc 100644
--- a/arch/arm/mach-mediatek/mt7623/init.c
+++ b/arch/arm/mach-mediatek/mt7623/init.c
@@ -8,6 +8,7 @@
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/io.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <asm/arch/misc.h>
 
diff --git a/arch/arm/mach-mediatek/mt7629/init.c b/arch/arm/mach-mediatek/mt7629/init.c
index 5cee055f94c..a643810d245 100644
--- a/arch/arm/mach-mediatek/mt7629/init.c
+++ b/arch/arm/mach-mediatek/mt7629/init.c
@@ -18,6 +18,7 @@
 #include <dm/uclass.h>
 #include <linux/bitops.h>
 #include <linux/io.h>
+#include <linux/kernel.h>
 
 #include <dt-bindings/clock/mt7629-clk.h>
 
diff --git a/arch/arm/mach-mediatek/mt8516/init.c b/arch/arm/mach-mediatek/mt8516/init.c
index a12955a89c0..11fe96f54f3 100644
--- a/arch/arm/mach-mediatek/mt8516/init.c
+++ b/arch/arm/mach-mediatek/mt8516/init.c
@@ -21,6 +21,7 @@
 #include <asm/u-boot.h>
 #include <dm/uclass.h>
 #include <dt-bindings/clock/mt8516-clk.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-meson/board-g12a.c b/arch/arm/mach-meson/board-g12a.c
index cdaed763b42..250a9617c0d 100644
--- a/arch/arm/mach-meson/board-g12a.c
+++ b/arch/arm/mach-meson/board-g12a.c
@@ -18,6 +18,7 @@
 #include <asm/io.h>
 #include <asm/armv8/mmu.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <usb.h>
 #include <linux/usb/otg.h>
diff --git a/arch/arm/mach-meson/board-info.c b/arch/arm/mach-meson/board-info.c
index fdc8df59556..94c523c17fd 100644
--- a/arch/arm/mach-meson/board-info.c
+++ b/arch/arm/mach-meson/board-info.c
@@ -15,6 +15,7 @@
 #include <syscon.h>
 #include <linux/bitops.h>
 #include <linux/err.h>
+#include <linux/kernel.h>
 
 #define AO_SEC_SD_CFG8		0xe0
 #define AO_SEC_SOCINFO_OFFSET	AO_SEC_SD_CFG8
diff --git a/arch/arm/mach-mvebu/cpu.c b/arch/arm/mach-mvebu/cpu.c
index d529407987e..53c44ede7db 100644
--- a/arch/arm/mach-mvebu/cpu.c
+++ b/arch/arm/mach-mvebu/cpu.c
@@ -11,6 +11,7 @@
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/mbus.h>
 #include <asm/io.h>
 #include <asm/pl310.h>
diff --git a/arch/arm/mach-nexell/clock.c b/arch/arm/mach-nexell/clock.c
index 38f6b1fc901..cd66248cd65 100644
--- a/arch/arm/mach-nexell/clock.c
+++ b/arch/arm/mach-nexell/clock.c
@@ -12,6 +12,7 @@
 #include <asm/arch/nexell.h>
 #include <asm/arch/clk.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 /*
  * clock generator macros
diff --git a/arch/arm/mach-nexell/nx_gpio.c b/arch/arm/mach-nexell/nx_gpio.c
index dfba3a2374c..d7fdc968847 100644
--- a/arch/arm/mach-nexell/nx_gpio.c
+++ b/arch/arm/mach-nexell/nx_gpio.c
@@ -7,6 +7,7 @@
 /*
  * FIXME : will be remove after support pinctrl
  */
+#include <stdbool.h>
 #include <linux/types.h>
 #include <asm/io.h>
 #include <asm/arch/nexell.h>
diff --git a/arch/arm/mach-nexell/timer.c b/arch/arm/mach-nexell/timer.c
index fecee67265c..2f98bd7fa4a 100644
--- a/arch/arm/mach-nexell/timer.c
+++ b/arch/arm/mach-nexell/timer.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <linux/kernel.h>
 
 #include <asm/io.h>
 #include <asm/arch/nexell.h>
diff --git a/arch/arm/mach-omap2/abb.c b/arch/arm/mach-omap2/abb.c
index c8c455fef1e..24775bdc41c 100644
--- a/arch/arm/mach-omap2/abb.c
+++ b/arch/arm/mach-omap2/abb.c
@@ -15,6 +15,7 @@
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 
 __weak s8 abb_setup_ldovbb(u32 fuse, u32 ldovbb)
 {
diff --git a/arch/arm/mach-omap2/am33xx/sys_info.c b/arch/arm/mach-omap2/am33xx/sys_info.c
index 0809664b7ec..86078f856ed 100644
--- a/arch/arm/mach-omap2/am33xx/sys_info.c
+++ b/arch/arm/mach-omap2/am33xx/sys_info.c
@@ -18,6 +18,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/clock.h>
+#include <linux/kernel.h>
 #include <power/tps65910.h>
 #include <linux/compiler.h>
 
diff --git a/arch/arm/mach-omap2/emif-common.c b/arch/arm/mach-omap2/emif-common.c
index a6428a23db4..15c13463f90 100644
--- a/arch/arm/mach-omap2/emif-common.c
+++ b/arch/arm/mach-omap2/emif-common.c
@@ -24,6 +24,7 @@
 #include <linux/compiler.h>
 #include <asm/ti-common/ti-edma3.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 static int emif1_enabled = -1, emif2_enabled = -1;
diff --git a/arch/arm/mach-omap2/omap5/fdt.c b/arch/arm/mach-omap2/omap5/fdt.c
index d6259434a23..af9717801e4 100644
--- a/arch/arm/mach-omap2/omap5/fdt.c
+++ b/arch/arm/mach-omap2/omap5/fdt.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <stdio.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <malloc.h>
diff --git a/arch/arm/mach-omap2/omap5/sdram.c b/arch/arm/mach-omap2/omap5/sdram.c
index a35218ae600..f6c8eb9f1bd 100644
--- a/arch/arm/mach-omap2/omap5/sdram.c
+++ b/arch/arm/mach-omap2/omap5/sdram.c
@@ -14,6 +14,7 @@
 #include <stdio.h>
 #include <asm/emif.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/kernel.h>
 
 /*
  * This file provides details of the LPDDR2 SDRAM parts used on OMAP5
diff --git a/arch/arm/mach-omap2/sec-common.c b/arch/arm/mach-omap2/sec-common.c
index f24e0ad6366..8dcaa1ac6c9 100644
--- a/arch/arm/mach-omap2/sec-common.c
+++ b/arch/arm/mach-omap2/sec-common.c
@@ -22,6 +22,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include <asm/arch/sys_proto.h>
diff --git a/arch/arm/mach-rmobile/cpu_info.c b/arch/arm/mach-rmobile/cpu_info.c
index 4088f33156f..1380dc61eb2 100644
--- a/arch/arm/mach-rmobile/cpu_info.c
+++ b/arch/arm/mach-rmobile/cpu_info.c
@@ -12,6 +12,7 @@
 #include <env.h>
 #include <asm/u-boot.h>
 #include <linux/ctype.h>
+#include <linux/kernel.h>
 
 #ifdef CONFIG_ARCH_CPU_INIT
 int arch_cpu_init(void)
diff --git a/arch/arm/mach-rmobile/pfc-r8a7740.c b/arch/arm/mach-rmobile/pfc-r8a7740.c
index 5d42a68266b..1bc72ee992e 100644
--- a/arch/arm/mach-rmobile/pfc-r8a7740.c
+++ b/arch/arm/mach-rmobile/pfc-r8a7740.c
@@ -22,6 +22,7 @@
 #include <sh_pfc.h>
 #include <asm/gpio.h>
 #include <asm/arch/irqs.h>
+#include <linux/kernel.h>
 
 #define CPU_ALL_PORT(fn, pfx, sfx)					\
 	PORT_10(fn, pfx, sfx),		PORT_90(fn, pfx, sfx),		\
diff --git a/arch/arm/mach-rmobile/pfc-sh73a0.c b/arch/arm/mach-rmobile/pfc-sh73a0.c
index 55dab7c1389..11b91e3c79e 100644
--- a/arch/arm/mach-rmobile/pfc-sh73a0.c
+++ b/arch/arm/mach-rmobile/pfc-sh73a0.c
@@ -22,6 +22,7 @@
 #include <common.h>
 #include <sh_pfc.h>
 #include <asm/arch/sh73a0-gpio.h>
+#include <linux/kernel.h>
 
 #define CPU_ALL_PORT(fn, pfx, sfx)				\
 	PORT_10(fn, pfx,    sfx), PORT_10(fn, pfx##1, sfx),	\
diff --git a/arch/arm/mach-rockchip/board.c b/arch/arm/mach-rockchip/board.c
index b7835a14a90..e6e6fc5fbe4 100644
--- a/arch/arm/mach-rockchip/board.c
+++ b/arch/arm/mach-rockchip/board.c
@@ -9,6 +9,7 @@
 #include <init.h>
 #include <log.h>
 #include <ram.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <syscon.h>
 #include <asm/cache.h>
diff --git a/arch/arm/mach-rockchip/boot_mode.c b/arch/arm/mach-rockchip/boot_mode.c
index 20d44d424be..69e64fb39c3 100644
--- a/arch/arm/mach-rockchip/boot_mode.c
+++ b/arch/arm/mach-rockchip/boot_mode.c
@@ -8,6 +8,7 @@
 #include <command.h>
 #include <env.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch-rockchip/boot_mode.h>
diff --git a/arch/arm/mach-rockchip/bootrom.c b/arch/arm/mach-rockchip/bootrom.c
index 71ac29ee435..24ba39537cd 100644
--- a/arch/arm/mach-rockchip/bootrom.c
+++ b/arch/arm/mach-rockchip/bootrom.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <hang.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/arch-rockchip/bootrom.h>
 #include <asm/arch-rockchip/boot_mode.h>
diff --git a/arch/arm/mach-rockchip/rk3288/rk3288.c b/arch/arm/mach-rockchip/rk3288/rk3288.c
index 97900fb3a31..1589ab1b2c7 100644
--- a/arch/arm/mach-rockchip/rk3288/rk3288.c
+++ b/arch/arm/mach-rockchip/rk3288/rk3288.c
@@ -24,6 +24,7 @@
 #include <asm/arch-rockchip/sdram.h>
 #include <asm/u-boot.h>
 #include <linux/err.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-rockchip/rk3399/rk3399.c b/arch/arm/mach-rockchip/rk3399/rk3399.c
index 79d3045beb3..f2ad3f5ec13 100644
--- a/arch/arm/mach-rockchip/rk3399/rk3399.c
+++ b/arch/arm/mach-rockchip/rk3399/rk3399.c
@@ -20,6 +20,7 @@
 #include <asm/arch-rockchip/hardware.h>
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <power/regulator.h>
 
diff --git a/arch/arm/mach-rockchip/sdram.c b/arch/arm/mach-rockchip/sdram.c
index 40335b8d208..d9cf3255914 100644
--- a/arch/arm/mach-rockchip/sdram.c
+++ b/arch/arm/mach-rockchip/sdram.c
@@ -13,6 +13,7 @@
 #include <asm/arch-rockchip/sdram.h>
 #include <asm/u-boot.h>
 #include <dm/uclass-internal.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-rockchip/spl.c b/arch/arm/mach-rockchip/spl.c
index 1bf85c2b58a..345e61058d7 100644
--- a/arch/arm/mach-rockchip/spl.c
+++ b/arch/arm/mach-rockchip/spl.c
@@ -18,6 +18,7 @@
 #include <asm/io.h>
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-snapdragon/pinctrl-apq8016.c b/arch/arm/mach-snapdragon/pinctrl-apq8016.c
index d261129a4dd..42ac25a467a 100644
--- a/arch/arm/mach-snapdragon/pinctrl-apq8016.c
+++ b/arch/arm/mach-snapdragon/pinctrl-apq8016.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <vsprintf.h>
+#include <linux/kernel.h>
 #include "pinctrl-snapdragon.h"
 
 #define MAX_PIN_NAME_LEN 32
diff --git a/arch/arm/mach-snapdragon/pinctrl-apq8096.c b/arch/arm/mach-snapdragon/pinctrl-apq8096.c
index da4a2d3901c..9cd3e1f03a8 100644
--- a/arch/arm/mach-snapdragon/pinctrl-apq8096.c
+++ b/arch/arm/mach-snapdragon/pinctrl-apq8096.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <vsprintf.h>
+#include <linux/kernel.h>
 #include "pinctrl-snapdragon.h"
 
 #define MAX_PIN_NAME_LEN 32
diff --git a/arch/arm/mach-snapdragon/pinctrl-snapdragon.c b/arch/arm/mach-snapdragon/pinctrl-snapdragon.c
index b1c075a44ac..1587d38cbfb 100644
--- a/arch/arm/mach-snapdragon/pinctrl-snapdragon.c
+++ b/arch/arm/mach-snapdragon/pinctrl-snapdragon.c
@@ -13,6 +13,7 @@
 #include <dm/pinctrl.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include "pinctrl-snapdragon.h"
 
 struct msm_pinctrl_priv {
diff --git a/arch/arm/mach-socfpga/clock_manager_arria10.c b/arch/arm/mach-socfpga/clock_manager_arria10.c
index 82c90fb526c..9d84871d463 100644
--- a/arch/arm/mach-socfpga/clock_manager_arria10.c
+++ b/arch/arm/mach-socfpga/clock_manager_arria10.c
@@ -14,6 +14,7 @@
 #include <asm/arch/clock_manager.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #ifdef CONFIG_SPL_BUILD
diff --git a/arch/arm/mach-socfpga/firewall.c b/arch/arm/mach-socfpga/firewall.c
index 69229dc651e..ed411c62c9c 100644
--- a/arch/arm/mach-socfpga/firewall.c
+++ b/arch/arm/mach-socfpga/firewall.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <asm/arch/firewall.h>
 #include <asm/arch/system_manager.h>
+#include <linux/kernel.h>
 
 static void firewall_l4_per_disable(void)
 {
diff --git a/arch/arm/mach-socfpga/freeze_controller.c b/arch/arm/mach-socfpga/freeze_controller.c
index 561d3408cd8..e994d38ba62 100644
--- a/arch/arm/mach-socfpga/freeze_controller.c
+++ b/arch/arm/mach-socfpga/freeze_controller.c
@@ -10,6 +10,7 @@
 #include <asm/arch/freeze_controller.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 static const struct socfpga_freeze_controller *freeze_controller_base =
 		(void *)(SOCFPGA_SYSMGR_ADDRESS + SYSMGR_FRZCTRL_ADDRESS);
diff --git a/arch/arm/mach-socfpga/include/mach/misc.h b/arch/arm/mach-socfpga/include/mach/misc.h
index a85c5aeef95..32bca6775e2 100644
--- a/arch/arm/mach-socfpga/include/mach/misc.h
+++ b/arch/arm/mach-socfpga/include/mach/misc.h
@@ -6,6 +6,7 @@
 #ifndef _SOCFPGA_MISC_H_
 #define _SOCFPGA_MISC_H_
 
+#include <stdbool.h>
 #include <asm/sections.h>
 
 void dwmac_deassert_reset(const unsigned int of_reset_id, const u32 phymode);
diff --git a/arch/arm/mach-socfpga/include/mach/reset_manager_gen5.h b/arch/arm/mach-socfpga/include/mach/reset_manager_gen5.h
index d108eac1e21..e46b48fdbb4 100644
--- a/arch/arm/mach-socfpga/include/mach/reset_manager_gen5.h
+++ b/arch/arm/mach-socfpga/include/mach/reset_manager_gen5.h
@@ -6,6 +6,7 @@
 #ifndef _RESET_MANAGER_GEN5_H_
 #define _RESET_MANAGER_GEN5_H_
 
+#include <stdbool.h>
 #include <dt-bindings/reset/altr,rst-mgr.h>
 
 void socfpga_bridges_set_handoff_regs(bool h2f, bool lwh2f, bool f2h);
diff --git a/arch/arm/mach-socfpga/misc_gen5.c b/arch/arm/mach-socfpga/misc_gen5.c
index 033ed6229f7..51e3568a1dd 100644
--- a/arch/arm/mach-socfpga/misc_gen5.c
+++ b/arch/arm/mach-socfpga/misc_gen5.c
@@ -15,6 +15,7 @@
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <altera.h>
 #include <miiphy.h>
diff --git a/arch/arm/mach-socfpga/misc_s10.c b/arch/arm/mach-socfpga/misc_s10.c
index c5c72acfa20..9fea8e042aa 100644
--- a/arch/arm/mach-socfpga/misc_s10.c
+++ b/arch/arm/mach-socfpga/misc_s10.c
@@ -23,6 +23,7 @@
 #include <asm/pl310.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <asm/arch/mailbox_s10.h>
 #include <linux/string.h>
diff --git a/arch/arm/mach-socfpga/reset_manager_arria10.c b/arch/arm/mach-socfpga/reset_manager_arria10.c
index 27c03080113..461c4592800 100644
--- a/arch/arm/mach-socfpga/reset_manager_arria10.c
+++ b/arch/arm/mach-socfpga/reset_manager_arria10.c
@@ -13,6 +13,7 @@
 #include <errno.h>
 #include <fdtdec.h>
 #include <wait_bit.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-socfpga/reset_manager_gen5.c b/arch/arm/mach-socfpga/reset_manager_gen5.c
index 090567e9d8a..e37325f2ac5 100644
--- a/arch/arm/mach-socfpga/reset_manager_gen5.c
+++ b/arch/arm/mach-socfpga/reset_manager_gen5.c
@@ -5,6 +5,7 @@
 
 
 #include <common.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/fpga_manager.h>
diff --git a/arch/arm/mach-socfpga/wrap_pinmux_config.c b/arch/arm/mach-socfpga/wrap_pinmux_config.c
index 33ca14c9dc7..f5a425db559 100644
--- a/arch/arm/mach-socfpga/wrap_pinmux_config.c
+++ b/arch/arm/mach-socfpga/wrap_pinmux_config.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <errno.h>
+#include <linux/kernel.h>
 
 /* Board-specific header. */
 #include <qts/pinmux_config.h>
diff --git a/arch/arm/mach-socfpga/wrap_pinmux_config_s10.c b/arch/arm/mach-socfpga/wrap_pinmux_config_s10.c
index 0b497ec30c5..8f3688dd19f 100644
--- a/arch/arm/mach-socfpga/wrap_pinmux_config_s10.c
+++ b/arch/arm/mach-socfpga/wrap_pinmux_config_s10.c
@@ -8,6 +8,7 @@
 #include <errno.h>
 #include <asm/io.h>
 #include <asm/arch/handoff_s10.h>
+#include <linux/kernel.h>
 
 static void sysmgr_pinmux_handoff_read(void *handoff_address,
 				       const u32 **table,
diff --git a/arch/arm/mach-socfpga/wrap_sdram_config.c b/arch/arm/mach-socfpga/wrap_sdram_config.c
index 4ea32e72c7c..50fec073b48 100644
--- a/arch/arm/mach-socfpga/wrap_sdram_config.c
+++ b/arch/arm/mach-socfpga/wrap_sdram_config.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <errno.h>
 #include <asm/arch/sdram.h>
+#include <linux/kernel.h>
 
 /* Board-specific header. */
 #include <qts/sdram_config.h>
diff --git a/arch/arm/mach-stm32/soc.c b/arch/arm/mach-stm32/soc.c
index 3ae6b7c4e9b..ff999e5954c 100644
--- a/arch/arm/mach-stm32/soc.c
+++ b/arch/arm/mach-stm32/soc.c
@@ -9,6 +9,7 @@
 #include <asm/io.h>
 #include <asm/armv7_mpu.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 int arch_cpu_init(void)
 {
diff --git a/arch/arm/mach-stm32mp/bsec.c b/arch/arm/mach-stm32mp/bsec.c
index d3c1262ee84..6b5a5c64cb4 100644
--- a/arch/arm/mach-stm32mp/bsec.c
+++ b/arch/arm/mach-stm32mp/bsec.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <log.h>
 #include <misc.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <asm/arch/bsec.h>
 #include <asm/arch/stm32mp1_smc.h>
diff --git a/arch/arm/mach-stm32mp/cmd_stm32key.c b/arch/arm/mach-stm32mp/cmd_stm32key.c
index 7ce8a9dee69..a5c94d331e6 100644
--- a/arch/arm/mach-stm32mp/cmd_stm32key.c
+++ b/arch/arm/mach-stm32mp/cmd_stm32key.c
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <console.h>
 #include <misc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <dm/device.h>
diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c b/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c
index 72da2471fbe..df38f622210 100644
--- a/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c
+++ b/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <dfu.h>
 #include <image.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/arch/stm32prog.h>
diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c
index 4b14326d65f..74b2ba277b3 100644
--- a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c
+++ b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c
@@ -18,6 +18,7 @@
 #include <dm/uclass.h>
 #include <jffs2/load_kernel.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/list.h>
 #include <linux/list_sort.h>
 #include <linux/mtd/mtd.h>
diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.h b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.h
index de1361d9841..46f014cb77f 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 <stdbool.h>
 #include <vsprintf.h>
 #include <linux/printk.h>
 
diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_serial.c b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_serial.c
index f16bfff2428..55485302012 100644
--- a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_serial.c
+++ b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_serial.c
@@ -8,6 +8,7 @@
 #include <dfu.h>
 #include <malloc.h>
 #include <serial.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <watchdog.h>
diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_usb.c b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_usb.c
index 15ca72043a3..a170fdfee94 100644
--- a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_usb.c
+++ b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_usb.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <dfu.h>
 #include <g_dnl.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <usb.h>
 #include <vsprintf.h>
diff --git a/arch/arm/mach-stm32mp/cpu.c b/arch/arm/mach-stm32mp/cpu.c
index 4eadd20f065..50959da323e 100644
--- a/arch/arm/mach-stm32mp/cpu.c
+++ b/arch/arm/mach-stm32mp/cpu.c
@@ -23,6 +23,7 @@
 #include <dm/uclass.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 
 /* RCC register */
diff --git a/arch/arm/mach-stm32mp/dram_init.c b/arch/arm/mach-stm32mp/dram_init.c
index 36f07eacaab..77fd34148d7 100644
--- a/arch/arm/mach-stm32mp/dram_init.c
+++ b/arch/arm/mach-stm32mp/dram_init.c
@@ -12,6 +12,7 @@
 #include <ram.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-stm32mp/fdt.c b/arch/arm/mach-stm32mp/fdt.c
index 1bfa19207d1..e83885440b4 100644
--- a/arch/arm/mach-stm32mp/fdt.c
+++ b/arch/arm/mach-stm32mp/fdt.c
@@ -13,6 +13,7 @@
 #include <asm/u-boot.h>
 #include <dt-bindings/pinctrl/stm32-pinfunc.h>
 #include <linux/io.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #define ETZPC_DECPROT(n)	(STM32_ETZPC_BASE + 0x10 + 4 * (n))
diff --git a/arch/arm/mach-stm32mp/include/mach/bsec.h b/arch/arm/mach-stm32mp/include/mach/bsec.h
index 252eac3946a..8a98312e126 100644
--- a/arch/arm/mach-stm32mp/include/mach/bsec.h
+++ b/arch/arm/mach-stm32mp/include/mach/bsec.h
@@ -4,4 +4,5 @@
  */
 
 /* check self hosted debug status = BSEC_DENABLE.DBGSWENABLE */
+#include <stdbool.h>
 bool bsec_dbgswenable(void);
diff --git a/arch/arm/mach-stm32mp/include/mach/stm32prog.h b/arch/arm/mach-stm32mp/include/mach/stm32prog.h
index c080b9cc42a..7d59c8a9f24 100644
--- a/arch/arm/mach-stm32mp/include/mach/stm32prog.h
+++ b/arch/arm/mach-stm32mp/include/mach/stm32prog.h
@@ -3,6 +3,7 @@
  * Copyright (C) 2020, STMicroelectronics - All Rights Reserved
  */
 
+#include <stdbool.h>
 #define STM32PROG_VIRT_FIRST_DEV_NUM		0xF1
 
 int stm32prog_write_medium_virt(struct dfu_entity *dfu, u64 offset,
diff --git a/arch/arm/mach-sunxi/clock_sun4i.c b/arch/arm/mach-sunxi/clock_sun4i.c
index bd9f476543d..7799c5750d3 100644
--- a/arch/arm/mach-sunxi/clock_sun4i.c
+++ b/arch/arm/mach-sunxi/clock_sun4i.c
@@ -15,6 +15,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/gpio.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/kernel.h>
 
 #ifdef CONFIG_SPL_BUILD
 void clock_init_safe(void)
diff --git a/arch/arm/mach-sunxi/clock_sun6i.c b/arch/arm/mach-sunxi/clock_sun6i.c
index 8e84062bd7c..529fdd7754e 100644
--- a/arch/arm/mach-sunxi/clock_sun6i.c
+++ b/arch/arm/mach-sunxi/clock_sun6i.c
@@ -10,6 +10,7 @@
  */
 
 #include <common.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/prcm.h>
diff --git a/arch/arm/mach-sunxi/dram_helpers.c b/arch/arm/mach-sunxi/dram_helpers.c
index de04e9d8428..ffadaa42570 100644
--- a/arch/arm/mach-sunxi/dram_helpers.c
+++ b/arch/arm/mach-sunxi/dram_helpers.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <stdbool.h>
 #include <time.h>
 #include <vsprintf.h>
 #include <asm/barriers.h>
diff --git a/arch/arm/mach-sunxi/dram_sun4i.c b/arch/arm/mach-sunxi/dram_sun4i.c
index f85f52898d1..6c406f11156 100644
--- a/arch/arm/mach-sunxi/dram_sun4i.c
+++ b/arch/arm/mach-sunxi/dram_sun4i.c
@@ -29,6 +29,7 @@
 #include <asm/arch/timer.h>
 #include <asm/arch/sys_proto.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 
 #define CPU_CFG_CHIP_VER(n) ((n) << 6)
 #define CPU_CFG_CHIP_VER_MASK CPU_CFG_CHIP_VER(0x3)
diff --git a/arch/arm/mach-sunxi/dram_sun50i_h6.c b/arch/arm/mach-sunxi/dram_sun50i_h6.c
index a877d655d86..ea47fa86478 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 <stdbool.h>
 #include <vsprintf.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
diff --git a/arch/arm/mach-sunxi/dram_sun6i.c b/arch/arm/mach-sunxi/dram_sun6i.c
index 9d1620c9758..53f8ac068ae 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 <stdbool.h>
 #include <vsprintf.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
diff --git a/arch/arm/mach-sunxi/dram_sun8i_a33.c b/arch/arm/mach-sunxi/dram_sun8i_a33.c
index d5d324860e3..5b993afe3ef 100644
--- a/arch/arm/mach-sunxi/dram_sun8i_a33.c
+++ b/arch/arm/mach-sunxi/dram_sun8i_a33.c
@@ -16,6 +16,7 @@
 #include <asm/arch/prcm.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 /* PLL runs at 2x dram-clk, controller runs at PLL / 4 (dram-clk / 2) */
 #define DRAM_CLK_MUL 2
diff --git a/arch/arm/mach-sunxi/dram_sun8i_a83t.c b/arch/arm/mach-sunxi/dram_sun8i_a83t.c
index 8a32ea4f0a1..bf627921440 100644
--- a/arch/arm/mach-sunxi/dram_sun8i_a83t.c
+++ b/arch/arm/mach-sunxi/dram_sun8i_a83t.c
@@ -16,6 +16,7 @@
 #include <asm/arch/prcm.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #define DRAM_CLK_MUL 2
 #define DRAM_CLK_DIV 1
diff --git a/arch/arm/mach-sunxi/dram_sunxi_dw.c b/arch/arm/mach-sunxi/dram_sunxi_dw.c
index e3e40aaa5e6..3fa8509efb9 100644
--- a/arch/arm/mach-sunxi/dram_sunxi_dw.c
+++ b/arch/arm/mach-sunxi/dram_sunxi_dw.c
@@ -18,6 +18,7 @@
 #include <asm/arch/cpu.h>
 #include <linux/delay.h>
 #include <linux/kconfig.h>
+#include <linux/kernel.h>
 
 static void mctl_phy_init(u32 val)
 {
diff --git a/arch/arm/mach-sunxi/dram_timings/ddr2_v3s.c b/arch/arm/mach-sunxi/dram_timings/ddr2_v3s.c
index 9077f86a8b4..14ee586e147 100644
--- a/arch/arm/mach-sunxi/dram_timings/ddr2_v3s.c
+++ b/arch/arm/mach-sunxi/dram_timings/ddr2_v3s.c
@@ -1,6 +1,7 @@
 #include <common.h>
 #include <asm/arch/dram.h>
 #include <asm/arch/cpu.h>
+#include <linux/kernel.h>
 
 void mctl_set_timing_params(uint16_t socid, struct dram_para *para)
 {
diff --git a/arch/arm/mach-sunxi/dram_timings/ddr3_1333.c b/arch/arm/mach-sunxi/dram_timings/ddr3_1333.c
index 0471e8a49e5..a297d469a90 100644
--- a/arch/arm/mach-sunxi/dram_timings/ddr3_1333.c
+++ b/arch/arm/mach-sunxi/dram_timings/ddr3_1333.c
@@ -1,6 +1,7 @@
 #include <common.h>
 #include <asm/arch/dram.h>
 #include <asm/arch/cpu.h>
+#include <linux/kernel.h>
 
 void mctl_set_timing_params(uint16_t socid, struct dram_para *para)
 {
diff --git a/arch/arm/mach-sunxi/dram_timings/h6_ddr3_1333.c b/arch/arm/mach-sunxi/dram_timings/h6_ddr3_1333.c
index 611eaa3024c..6160518efee 100644
--- a/arch/arm/mach-sunxi/dram_timings/h6_ddr3_1333.c
+++ b/arch/arm/mach-sunxi/dram_timings/h6_ddr3_1333.c
@@ -22,6 +22,7 @@
 #include <common.h>
 #include <asm/arch/dram.h>
 #include <asm/arch/cpu.h>
+#include <linux/kernel.h>
 
 /*
  * Only the first four are used for DDR3(?)
diff --git a/arch/arm/mach-sunxi/dram_timings/h6_lpddr3.c b/arch/arm/mach-sunxi/dram_timings/h6_lpddr3.c
index 10008601134..497c59d8ae2 100644
--- a/arch/arm/mach-sunxi/dram_timings/h6_lpddr3.c
+++ b/arch/arm/mach-sunxi/dram_timings/h6_lpddr3.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <asm/arch/dram.h>
 #include <asm/arch/cpu.h>
+#include <linux/kernel.h>
 
 static u32 mr_lpddr3[12] = {
 	0x00000000, 0x00000043, 0x0000001a, 0x00000001,
diff --git a/arch/arm/mach-sunxi/dram_timings/lpddr3_stock.c b/arch/arm/mach-sunxi/dram_timings/lpddr3_stock.c
index bd57e2f6aac..6378bbc22a3 100644
--- a/arch/arm/mach-sunxi/dram_timings/lpddr3_stock.c
+++ b/arch/arm/mach-sunxi/dram_timings/lpddr3_stock.c
@@ -1,6 +1,7 @@
 #include <common.h>
 #include <asm/arch/dram.h>
 #include <asm/arch/cpu.h>
+#include <linux/kernel.h>
 
 void mctl_set_timing_params(uint16_t socid, struct dram_para *para)
 {
diff --git a/arch/arm/mach-sunxi/spl_spi_sunxi.c b/arch/arm/mach-sunxi/spl_spi_sunxi.c
index 15e86cbac8f..f9e1f27363f 100644
--- a/arch/arm/mach-sunxi/spl_spi_sunxi.c
+++ b/arch/arm/mach-sunxi/spl_spi_sunxi.c
@@ -7,6 +7,7 @@
 #include <image.h>
 #include <log.h>
 #include <spl.h>
+#include <stdbool.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
diff --git a/arch/arm/mach-tegra/board.c b/arch/arm/mach-tegra/board.c
index ecdfcdde921..cd0eb258bf9 100644
--- a/arch/arm/mach-tegra/board.c
+++ b/arch/arm/mach-tegra/board.c
@@ -30,6 +30,7 @@
 #include <asm/arch-tegra/pmc.h>
 #include <asm/arch-tegra/sys_proto.h>
 #include <asm/arch-tegra/warmboot.h>
+#include <linux/kernel.h>
 
 void save_boot_params_ret(void);
 
diff --git a/arch/arm/mach-tegra/cboot.c b/arch/arm/mach-tegra/cboot.c
index 14f75625cec..8760abbe9d4 100644
--- a/arch/arm/mach-tegra/cboot.c
+++ b/arch/arm/mach-tegra/cboot.c
@@ -18,6 +18,7 @@
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/arch/arm/mach-tegra/clock.c b/arch/arm/mach-tegra/clock.c
index 9056fe0dd31..567ba52ee88 100644
--- a/arch/arm/mach-tegra/clock.c
+++ b/arch/arm/mach-tegra/clock.c
@@ -21,6 +21,7 @@
 #include <asm/arch-tegra/timer.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 /*
  * This is our record of the current clock rate of each clock. We don't
diff --git a/arch/arm/mach-tegra/dt-setup.c b/arch/arm/mach-tegra/dt-setup.c
index 237f184b751..d3848f14985 100644
--- a/arch/arm/mach-tegra/dt-setup.c
+++ b/arch/arm/mach-tegra/dt-setup.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <asm/arch-tegra/gpu.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 /*
  * This function is called right before the kernel is booted. "blob" is the
diff --git a/arch/arm/mach-tegra/gpu.c b/arch/arm/mach-tegra/gpu.c
index 13ffade0408..928a00f222c 100644
--- a/arch/arm/mach-tegra/gpu.c
+++ b/arch/arm/mach-tegra/gpu.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <asm/arch/tegra.h>
 #include <asm/arch/mc.h>
diff --git a/arch/arm/mach-tegra/pmc.c b/arch/arm/mach-tegra/pmc.c
index 0d4063ad1a2..f4747484f29 100644
--- a/arch/arm/mach-tegra/pmc.c
+++ b/arch/arm/mach-tegra/pmc.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 
diff --git a/arch/arm/mach-tegra/powergate.c b/arch/arm/mach-tegra/powergate.c
index 5b3e3d8f56e..3a96708c304 100644
--- a/arch/arm/mach-tegra/powergate.c
+++ b/arch/arm/mach-tegra/powergate.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <errno.h>
+#include <stdbool.h>
 #include <time.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/arch/arm/mach-tegra/tegra114/cpu.c b/arch/arm/mach-tegra/tegra114/cpu.c
index 62c10536306..7e529130ad5 100644
--- a/arch/arm/mach-tegra/tegra114/cpu.c
+++ b/arch/arm/mach-tegra/tegra114/cpu.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/flow.h>
diff --git a/arch/arm/mach-tegra/tegra124/clock.c b/arch/arm/mach-tegra/tegra124/clock.c
index 8dfdd2bc8ad..edca9c3fdc3 100644
--- a/arch/arm/mach-tegra/tegra124/clock.c
+++ b/arch/arm/mach-tegra/tegra124/clock.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <init.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
diff --git a/arch/arm/mach-tegra/tegra124/cpu.c b/arch/arm/mach-tegra/tegra124/cpu.c
index d5f2683b266..2fce060037a 100644
--- a/arch/arm/mach-tegra/tegra124/cpu.c
+++ b/arch/arm/mach-tegra/tegra124/cpu.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <asm/arch/ahb.h>
 #include <asm/arch/clock.h>
diff --git a/arch/arm/mach-tegra/tegra124/xusb-padctl.c b/arch/arm/mach-tegra/tegra124/xusb-padctl.c
index 6985515499f..52398eba3fa 100644
--- a/arch/arm/mach-tegra/tegra124/xusb-padctl.c
+++ b/arch/arm/mach-tegra/tegra124/xusb-padctl.c
@@ -14,6 +14,7 @@
 #include <dm/ofnode.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 
 #include "../xusb-padctl-common.h"
diff --git a/arch/arm/mach-tegra/tegra20/funcmux.c b/arch/arm/mach-tegra/tegra20/funcmux.c
index 90fe0cba8ea..827ae4b748b 100644
--- a/arch/arm/mach-tegra/tegra20/funcmux.c
+++ b/arch/arm/mach-tegra/tegra20/funcmux.c
@@ -9,6 +9,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/funcmux.h>
 #include <asm/arch/pinmux.h>
+#include <linux/kernel.h>
 
 /*
  * The PINMUX macro is used to set up pinmux tables.
diff --git a/arch/arm/mach-tegra/tegra20/warmboot.c b/arch/arm/mach-tegra/tegra20/warmboot.c
index 215cf5ae561..f0050a4f821 100644
--- a/arch/arm/mach-tegra/tegra20/warmboot.c
+++ b/arch/arm/mach-tegra/tegra20/warmboot.c
@@ -21,6 +21,7 @@
 #include <asm/arch-tegra/pmc.h>
 #include <asm/arch-tegra/fuse.h>
 #include <asm/arch-tegra/warmboot.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-tegra/tegra210/xusb-padctl.c b/arch/arm/mach-tegra/tegra210/xusb-padctl.c
index 572ba95d5b0..78cea2b9193 100644
--- a/arch/arm/mach-tegra/tegra210/xusb-padctl.c
+++ b/arch/arm/mach-tegra/tegra210/xusb-padctl.c
@@ -14,6 +14,7 @@
 #include <dm/ofnode.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 
 #include "../xusb-padctl-common.h"
diff --git a/arch/arm/mach-tegra/xusb-padctl-dummy.c b/arch/arm/mach-tegra/xusb-padctl-dummy.c
index b3c5c9453b2..d04069993c6 100644
--- a/arch/arm/mach-tegra/xusb-padctl-dummy.c
+++ b/arch/arm/mach-tegra/xusb-padctl-dummy.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <errno.h>
 #include <linux/errno.h>
 
diff --git a/arch/arm/mach-uniphier/dram/ddrphy-init.h b/arch/arm/mach-uniphier/dram/ddrphy-init.h
index 09981f6e06f..40a8523eb8e 100644
--- a/arch/arm/mach-uniphier/dram/ddrphy-init.h
+++ b/arch/arm/mach-uniphier/dram/ddrphy-init.h
@@ -6,6 +6,7 @@
 #ifndef ARCH_DDRPHY_INIT_H
 #define ARCH_DDRPHY_INTT_H
 
+#include <stdbool.h>
 #include <linux/compiler.h>
 #include <linux/types.h>
 
diff --git a/arch/arm/mach-uniphier/dram/ddrphy-ld4.c b/arch/arm/mach-uniphier/dram/ddrphy-ld4.c
index 26f3ba9d577..747bc64403d 100644
--- a/arch/arm/mach-uniphier/dram/ddrphy-ld4.c
+++ b/arch/arm/mach-uniphier/dram/ddrphy-ld4.c
@@ -4,6 +4,7 @@
  * Copyright (C) 2015-2016 Socionext Inc.
  */
 
+#include <stdbool.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/io.h>
diff --git a/arch/arm/mach-uniphier/dram/umc-ld4.c b/arch/arm/mach-uniphier/dram/umc-ld4.c
index 2a3002d1891..5b840aa0ea1 100644
--- a/arch/arm/mach-uniphier/dram/umc-ld4.c
+++ b/arch/arm/mach-uniphier/dram/umc-ld4.c
@@ -5,6 +5,7 @@
  *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  */
 
+#include <stdbool.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <linux/io.h>
diff --git a/arch/arm/mach-uniphier/dram/umc-pro4.c b/arch/arm/mach-uniphier/dram/umc-pro4.c
index 535545866c8..e1a98e59c05 100644
--- a/arch/arm/mach-uniphier/dram/umc-pro4.c
+++ b/arch/arm/mach-uniphier/dram/umc-pro4.c
@@ -5,6 +5,7 @@
  *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  */
 
+#include <stdbool.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <linux/io.h>
diff --git a/arch/arm/mach-uniphier/dram/umc-pxs2.c b/arch/arm/mach-uniphier/dram/umc-pxs2.c
index 199e846dc9d..0af7ea38621 100644
--- a/arch/arm/mach-uniphier/dram/umc-pxs2.c
+++ b/arch/arm/mach-uniphier/dram/umc-pxs2.c
@@ -12,6 +12,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/io.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/sizes.h>
 #include <asm/processor.h>
diff --git a/arch/arm/mach-uniphier/dram/umc-sld8.c b/arch/arm/mach-uniphier/dram/umc-sld8.c
index 99039617479..28b366ebdea 100644
--- a/arch/arm/mach-uniphier/dram/umc-sld8.c
+++ b/arch/arm/mach-uniphier/dram/umc-sld8.c
@@ -5,6 +5,7 @@
  *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  */
 
+#include <stdbool.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <linux/io.h>
diff --git a/arch/arm/mach-uniphier/micro-support-card.c b/arch/arm/mach-uniphier/micro-support-card.c
index f3abb855412..07ce46bd9dd 100644
--- a/arch/arm/mach-uniphier/micro-support-card.c
+++ b/arch/arm/mach-uniphier/micro-support-card.c
@@ -7,6 +7,7 @@
 
 #include <dm.h>
 #include <fdt_support.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <linux/ctype.h>
 #include <linux/delay.h>
diff --git a/arch/arm/mach-uniphier/mmc-first-dev.c b/arch/arm/mach-uniphier/mmc-first-dev.c
index 45bb10f8eb1..a70a00c7494 100644
--- a/arch/arm/mach-uniphier/mmc-first-dev.c
+++ b/arch/arm/mach-uniphier/mmc-first-dev.c
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <env.h>
 #include <mmc.h>
+#include <stdbool.h>
 #include <linux/errno.h>
 
 static int find_first_mmc_device(bool is_sd)
diff --git a/arch/arm/mach-versal/mp.c b/arch/arm/mach-versal/mp.c
index df196460dd5..001c3e9518a 100644
--- a/arch/arm/mach-versal/mp.c
+++ b/arch/arm/mach-versal/mp.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/arch/arm/mach-zynq/slcr.c b/arch/arm/mach-zynq/slcr.c
index d7c879dc82d..67df265ba96 100644
--- a/arch/arm/mach-zynq/slcr.c
+++ b/arch/arm/mach-zynq/slcr.c
@@ -8,6 +8,7 @@
 #include <malloc.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #define SLCR_LOCK_MAGIC		0x767B
diff --git a/arch/arm/mach-zynqmp/include/mach/sys_proto.h b/arch/arm/mach-zynqmp/include/mach/sys_proto.h
index 2974ffbc2f5..05c81769d63 100644
--- a/arch/arm/mach-zynqmp/include/mach/sys_proto.h
+++ b/arch/arm/mach-zynqmp/include/mach/sys_proto.h
@@ -7,6 +7,7 @@
 #ifndef _ASM_ARCH_SYS_PROTO_H
 #define _ASM_ARCH_SYS_PROTO_H
 
+#include <stdbool.h>
 #define PAYLOAD_ARG_CNT		5
 
 #define ZYNQMP_CSU_SILICON_VER_MASK	0xF
diff --git a/arch/arm/mach-zynqmp/mp.c b/arch/arm/mach-zynqmp/mp.c
index 589f9ec9ab2..b31da25933e 100644
--- a/arch/arm/mach-zynqmp/mp.c
+++ b/arch/arm/mach-zynqmp/mp.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/arch/hardware.h>
diff --git a/arch/m68k/lib/cache.c b/arch/m68k/lib/cache.c
index 68f2eef584b..22048d12d70 100644
--- a/arch/m68k/lib/cache.c
+++ b/arch/m68k/lib/cache.c
@@ -8,6 +8,7 @@
 #include <cpu_func.h>
 #include <asm/immap.h>
 #include <asm/cache.h>
+#include <linux/kernel.h>
 
 volatile int *cf_icache_status = (int *)ICACHE_STATUS;
 volatile int *cf_dcache_status = (int *)DCACHE_STATUS;
diff --git a/arch/m68k/lib/interrupts.c b/arch/m68k/lib/interrupts.c
index 1caef61d20e..a5b808fbe20 100644
--- a/arch/m68k/lib/interrupts.c
+++ b/arch/m68k/lib/interrupts.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <irq_func.h>
 #include <watchdog.h>
+#include <stdio.h>
 #include <asm/processor.h>
 #include <asm/immap.h>
 #include <asm/ptrace.h>
diff --git a/arch/microblaze/cpu/spl.c b/arch/microblaze/cpu/spl.c
index 86522f84479..9f25c2f3952 100644
--- a/arch/microblaze/cpu/spl.c
+++ b/arch/microblaze/cpu/spl.c
@@ -10,6 +10,7 @@
 #include <image.h>
 #include <log.h>
 #include <spl.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <asm/u-boot.h>
 
diff --git a/arch/microblaze/cpu/timer.c b/arch/microblaze/cpu/timer.c
index 64ac5bc2851..eb53f0edcdd 100644
--- a/arch/microblaze/cpu/timer.c
+++ b/arch/microblaze/cpu/timer.c
@@ -15,6 +15,7 @@
 #include <asm/microblaze_intc.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/mips/cpu/time.c b/arch/mips/cpu/time.c
index 5e7a7144d02..aab92ec859b 100644
--- a/arch/mips/cpu/time.c
+++ b/arch/mips/cpu/time.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <time.h>
 #include <asm/mipsregs.h>
 
diff --git a/arch/mips/lib/cache.c b/arch/mips/lib/cache.c
index 1eb1459184c..7be0b559561 100644
--- a/arch/mips/lib/cache.c
+++ b/arch/mips/lib/cache.c
@@ -15,6 +15,7 @@
 #include <asm/mipsregs.h>
 #include <asm/system.h>
 #include <linux/bug.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/mips/mach-ath79/ar934x/clk.c b/arch/mips/mach-ath79/ar934x/clk.c
index 6d94491c545..5ce5ea5ba46 100644
--- a/arch/mips/mach-ath79/ar934x/clk.c
+++ b/arch/mips/mach-ath79/ar934x/clk.c
@@ -15,6 +15,7 @@
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <mach/ar71xx_regs.h>
 #include <mach/ath79.h>
 #include <wait_bit.h>
diff --git a/arch/mips/mach-ath79/cpu.c b/arch/mips/mach-ath79/cpu.c
index 709fa7a9c3b..55d051f8cb9 100644
--- a/arch/mips/mach-ath79/cpu.c
+++ b/arch/mips/mach-ath79/cpu.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <asm/addrspace.h>
 #include <asm/types.h>
+#include <linux/kernel.h>
 #include <mach/ath79.h>
 #include <mach/ar71xx_regs.h>
 
diff --git a/arch/mips/mach-jz47xx/jz4780/pll.c b/arch/mips/mach-jz47xx/jz4780/pll.c
index 9aada2ef15b..ac76a507355 100644
--- a/arch/mips/mach-jz47xx/jz4780/pll.c
+++ b/arch/mips/mach-jz47xx/jz4780/pll.c
@@ -12,6 +12,7 @@
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <mach/jz4780.h>
 
 #define CPM_CPCCR		0x00
diff --git a/arch/mips/mach-mscc/include/mach/ddr.h b/arch/mips/mach-mscc/include/mach/ddr.h
index d52eabbd2b1..8c1f14773ec 100644
--- a/arch/mips/mach-mscc/include/mach/ddr.h
+++ b/arch/mips/mach-mscc/include/mach/ddr.h
@@ -6,6 +6,7 @@
 #ifndef __ASM_MACH_DDR_H
 #define __ASM_MACH_DDR_H
 
+#include <stdbool.h>
 #include <asm/cacheops.h>
 #include <asm/io.h>
 #include <asm/reboot.h>
diff --git a/arch/mips/mach-mtmips/ddr_cal.c b/arch/mips/mach-mtmips/ddr_cal.c
index 762619a960f..1f2f12879b2 100644
--- a/arch/mips/mach-mtmips/ddr_cal.c
+++ b/arch/mips/mach-mtmips/ddr_cal.c
@@ -11,6 +11,7 @@
 #include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/io.h>
+#include <linux/kernel.h>
 #include <mach/mc.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/mips/mach-mtmips/mt7628/init.c b/arch/mips/mach-mtmips/mt7628/init.c
index c0b4387585f..8bf918b3f25 100644
--- a/arch/mips/mach-mtmips/mt7628/init.c
+++ b/arch/mips/mach-mtmips/mt7628/init.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <dm.h>
 #include <stdio.h>
 #include <time.h>
diff --git a/arch/mips/mach-octeon/clock.c b/arch/mips/mach-octeon/clock.c
index 8984bfd7445..05a312b2298 100644
--- a/arch/mips/mach-octeon/clock.c
+++ b/arch/mips/mach-octeon/clock.c
@@ -3,6 +3,7 @@
  * Copyright (C) 2018, 2019 Marvell International Ltd.
  */
 
+#include <compiler.h>
 #include <time.h>
 #include <asm/global_data.h>
 #include <mach/clock.h>
diff --git a/arch/nios2/cpu/traps.c b/arch/nios2/cpu/traps.c
index 087a05097d9..d87b8a4bb2f 100644
--- a/arch/nios2/cpu/traps.c
+++ b/arch/nios2/cpu/traps.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <hang.h>
+#include <stdio.h>
 #include <asm/ptrace.h>
 
 void trap_handler (struct pt_regs *regs)
diff --git a/arch/powerpc/cpu/mpc83xx/cpu.c b/arch/powerpc/cpu/mpc83xx/cpu.c
index ba897987c59..cdbf1e22636 100644
--- a/arch/powerpc/cpu/mpc83xx/cpu.c
+++ b/arch/powerpc/cpu/mpc83xx/cpu.c
@@ -23,6 +23,7 @@
 #include <asm/processor.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <tsec.h>
 #include <netdev.h>
diff --git a/arch/powerpc/cpu/mpc83xx/cpu_init.c b/arch/powerpc/cpu/mpc83xx/cpu_init.c
index c8c231f887f..8d242792987 100644
--- a/arch/powerpc/cpu/mpc83xx/cpu_init.c
+++ b/arch/powerpc/cpu/mpc83xx/cpu_init.c
@@ -15,6 +15,7 @@
 #include <usb/ehci-ci.h>
 #endif
 #include <linux/delay.h>
+#include <linux/kernel.h>
 
 #include "lblaw/lblaw.h"
 #include "elbc/elbc.h"
diff --git a/arch/powerpc/cpu/mpc83xx/law.c b/arch/powerpc/cpu/mpc83xx/law.c
index 33ed4895d3b..fd35b5845b0 100644
--- a/arch/powerpc/cpu/mpc83xx/law.c
+++ b/arch/powerpc/cpu/mpc83xx/law.c
@@ -8,6 +8,7 @@
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 #include <linux/log2.h>
 
 int set_ddr_laws(u64 start, u64 sz, enum law_trgt_if id)
diff --git a/arch/powerpc/cpu/mpc83xx/pcie.c b/arch/powerpc/cpu/mpc83xx/pcie.c
index 8a5c9bb0dd3..31883daa469 100644
--- a/arch/powerpc/cpu/mpc83xx/pcie.c
+++ b/arch/powerpc/cpu/mpc83xx/pcie.c
@@ -15,6 +15,7 @@
 #include <asm/io.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/powerpc/cpu/mpc83xx/speed.c b/arch/powerpc/cpu/mpc83xx/speed.c
index 73009d7a01d..2f1355dfec9 100644
--- a/arch/powerpc/cpu/mpc83xx/speed.c
+++ b/arch/powerpc/cpu/mpc83xx/speed.c
@@ -604,4 +604,5 @@ U_BOOT_CMD(clocks, 1, 0, do_clocks,
 
 #include <stdio.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 #endif
diff --git a/arch/powerpc/cpu/mpc85xx/b4860_ids.c b/arch/powerpc/cpu/mpc85xx/b4860_ids.c
index 3dccc0e1068..dec9438ee8b 100644
--- a/arch/powerpc/cpu/mpc85xx/b4860_ids.c
+++ b/arch/powerpc/cpu/mpc85xx/b4860_ids.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <asm/fsl_portals.h>
 #include <asm/fsl_liodn.h>
+#include <linux/kernel.h>
 
 #ifdef CONFIG_SYS_DPAA_QBMAN
 struct qportal_info qp_info[CONFIG_SYS_QMAN_NUM_PORTALS] = {
diff --git a/arch/powerpc/cpu/mpc85xx/b4860_serdes.c b/arch/powerpc/cpu/mpc85xx/b4860_serdes.c
index 8e18e12f634..ec18f298747 100644
--- a/arch/powerpc/cpu/mpc85xx/b4860_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/b4860_serdes.c
@@ -7,6 +7,7 @@
 #include <asm/fsl_serdes.h>
 #include <asm/processor.h>
 #include <asm/io.h>
+#include <linux/kernel.h>
 #include "fsl_corenet2_serdes.h"
 
 struct serdes_config {
diff --git a/arch/powerpc/cpu/mpc85xx/bsc9132_serdes.c b/arch/powerpc/cpu/mpc85xx/bsc9132_serdes.c
index e08484324d0..f5c9d1d8175 100644
--- a/arch/powerpc/cpu/mpc85xx/bsc9132_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/bsc9132_serdes.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
+#include <linux/kernel.h>
 
 #define SRDS1_MAX_LANES		4
 
diff --git a/arch/powerpc/cpu/mpc85xx/c29x_serdes.c b/arch/powerpc/cpu/mpc85xx/c29x_serdes.c
index 10bc15c45ca..8c61fd471bc 100644
--- a/arch/powerpc/cpu/mpc85xx/c29x_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/c29x_serdes.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
+#include <linux/kernel.h>
 
 #define SRDS1_MAX_LANES		4
 
diff --git a/arch/powerpc/cpu/mpc85xx/cmd_errata.c b/arch/powerpc/cpu/mpc85xx/cmd_errata.c
index 2e3b0a21dd7..59fdc8860d9 100644
--- a/arch/powerpc/cpu/mpc85xx/cmd_errata.c
+++ b/arch/powerpc/cpu/mpc85xx/cmd_errata.c
@@ -12,6 +12,7 @@
 #include <fsl_errata.h>
 #include <asm/processor.h>
 #include <fsl_usb.h>
+#include <linux/kernel.h>
 #include "fsl_corenet_serdes.h"
 
 #ifdef CONFIG_SYS_FSL_ERRATUM_A004849
diff --git a/arch/powerpc/cpu/mpc85xx/cpu.c b/arch/powerpc/cpu/mpc85xx/cpu.c
index afcfc47554d..da578d6c900 100644
--- a/arch/powerpc/cpu/mpc85xx/cpu.c
+++ b/arch/powerpc/cpu/mpc85xx/cpu.c
@@ -34,6 +34,7 @@
 #include <asm/ppc.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init.c b/arch/powerpc/cpu/mpc85xx/cpu_init.c
index 1366e1f191d..96d00883574 100644
--- a/arch/powerpc/cpu/mpc85xx/cpu_init.c
+++ b/arch/powerpc/cpu/mpc85xx/cpu_init.c
@@ -14,6 +14,7 @@
 #include <env.h>
 #include <init.h>
 #include <net.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <watchdog.h>
diff --git a/arch/powerpc/cpu/mpc85xx/ether_fcc.c b/arch/powerpc/cpu/mpc85xx/ether_fcc.c
index 5504ded9e05..df1981cc7ae 100644
--- a/arch/powerpc/cpu/mpc85xx/ether_fcc.c
+++ b/arch/powerpc/cpu/mpc85xx/ether_fcc.c
@@ -34,6 +34,7 @@
 #include <net.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #if defined(CONFIG_MII) || defined(CONFIG_CMD_MII)
diff --git a/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c b/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c
index 96d6a8e000f..a24e5feb932 100644
--- a/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c
@@ -20,6 +20,7 @@
 #include <asm/fsl_law.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include "fsl_corenet_serdes.h"
 
 /*
diff --git a/arch/powerpc/cpu/mpc85xx/mpc8536_serdes.c b/arch/powerpc/cpu/mpc85xx/mpc8536_serdes.c
index bc7f1724486..d87150df761 100644
--- a/arch/powerpc/cpu/mpc85xx/mpc8536_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/mpc8536_serdes.c
@@ -12,6 +12,7 @@
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 /* PORDEVSR register */
 #define GUTS_PORDEVSR_OFFS		0xc
diff --git a/arch/powerpc/cpu/mpc85xx/mpc8544_serdes.c b/arch/powerpc/cpu/mpc85xx/mpc8544_serdes.c
index 22d17e2e3b2..0a472d0fd15 100644
--- a/arch/powerpc/cpu/mpc85xx/mpc8544_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/mpc8544_serdes.c
@@ -11,6 +11,7 @@
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 #define SRDS1_MAX_LANES		8
 #define SRDS2_MAX_LANES		4
diff --git a/arch/powerpc/cpu/mpc85xx/mpc8548_serdes.c b/arch/powerpc/cpu/mpc85xx/mpc8548_serdes.c
index 798fdb46edb..ae291188f91 100644
--- a/arch/powerpc/cpu/mpc85xx/mpc8548_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/mpc8548_serdes.c
@@ -11,6 +11,7 @@
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 #define SRDS1_MAX_LANES		8
 
diff --git a/arch/powerpc/cpu/mpc85xx/mpc8568_serdes.c b/arch/powerpc/cpu/mpc85xx/mpc8568_serdes.c
index df0470700c5..06c47826325 100644
--- a/arch/powerpc/cpu/mpc85xx/mpc8568_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/mpc8568_serdes.c
@@ -11,6 +11,7 @@
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 #define SRDS1_MAX_LANES		8
 
diff --git a/arch/powerpc/cpu/mpc85xx/mpc8569_serdes.c b/arch/powerpc/cpu/mpc85xx/mpc8569_serdes.c
index 1b88b7afb21..b5c9d829b7b 100644
--- a/arch/powerpc/cpu/mpc85xx/mpc8569_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/mpc8569_serdes.c
@@ -11,6 +11,7 @@
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 #define SRDS1_MAX_LANES		4
 
diff --git a/arch/powerpc/cpu/mpc85xx/mpc8572_serdes.c b/arch/powerpc/cpu/mpc85xx/mpc8572_serdes.c
index 7d040d32ac8..f9976cce09d 100644
--- a/arch/powerpc/cpu/mpc85xx/mpc8572_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/mpc8572_serdes.c
@@ -11,6 +11,7 @@
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 #define SRDS1_MAX_LANES		8
 
diff --git a/arch/powerpc/cpu/mpc85xx/p1010_serdes.c b/arch/powerpc/cpu/mpc85xx/p1010_serdes.c
index e43d99da15b..7eac3017052 100644
--- a/arch/powerpc/cpu/mpc85xx/p1010_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/p1010_serdes.c
@@ -12,6 +12,7 @@
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 #define SRDS1_MAX_LANES		4
 #define SRDS2_MAX_LANES		2
diff --git a/arch/powerpc/cpu/mpc85xx/p1021_serdes.c b/arch/powerpc/cpu/mpc85xx/p1021_serdes.c
index 7d054804a02..01e0830d655 100644
--- a/arch/powerpc/cpu/mpc85xx/p1021_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/p1021_serdes.c
@@ -12,6 +12,7 @@
 #include <asm/fsl_serdes.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 
 typedef struct serdes_85xx {
 	u32	srdscr0;	/* 0x00 - SRDS Control Register 0 */
diff --git a/arch/powerpc/cpu/mpc85xx/p1022_serdes.c b/arch/powerpc/cpu/mpc85xx/p1022_serdes.c
index badc694930d..7632fdbaf09 100644
--- a/arch/powerpc/cpu/mpc85xx/p1022_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/p1022_serdes.c
@@ -12,6 +12,7 @@
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 #define SRDS1_MAX_LANES		4
 #define SRDS2_MAX_LANES		2
diff --git a/arch/powerpc/cpu/mpc85xx/p1023_serdes.c b/arch/powerpc/cpu/mpc85xx/p1023_serdes.c
index ae8dd356c4c..fbb2573d2c7 100644
--- a/arch/powerpc/cpu/mpc85xx/p1023_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/p1023_serdes.c
@@ -12,6 +12,7 @@
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 #define SRDS1_MAX_LANES		4
 
diff --git a/arch/powerpc/cpu/mpc85xx/p2020_serdes.c b/arch/powerpc/cpu/mpc85xx/p2020_serdes.c
index 6dfe61415a9..f1a60827f8a 100644
--- a/arch/powerpc/cpu/mpc85xx/p2020_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/p2020_serdes.c
@@ -11,6 +11,7 @@
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 #define SRDS1_MAX_LANES		4
 
diff --git a/arch/powerpc/cpu/mpc85xx/p2041_ids.c b/arch/powerpc/cpu/mpc85xx/p2041_ids.c
index 8a833466782..b003e5037fa 100644
--- a/arch/powerpc/cpu/mpc85xx/p2041_ids.c
+++ b/arch/powerpc/cpu/mpc85xx/p2041_ids.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <asm/fsl_portals.h>
 #include <asm/fsl_liodn.h>
+#include <linux/kernel.h>
 
 #ifdef CONFIG_SYS_DPAA_QBMAN
 struct qportal_info qp_info[CONFIG_SYS_QMAN_NUM_PORTALS] = {
diff --git a/arch/powerpc/cpu/mpc85xx/p2041_serdes.c b/arch/powerpc/cpu/mpc85xx/p2041_serdes.c
index 47e30a15e2e..1825720d6f2 100644
--- a/arch/powerpc/cpu/mpc85xx/p2041_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/p2041_serdes.c
@@ -8,6 +8,7 @@
 #include <asm/processor.h>
 #include <asm/io.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 #include "fsl_corenet_serdes.h"
 
 static u8 serdes_cfg_tbl[][SRDS_MAX_LANES] = {
diff --git a/arch/powerpc/cpu/mpc85xx/p3041_ids.c b/arch/powerpc/cpu/mpc85xx/p3041_ids.c
index 7db05d9672b..c111fb58497 100644
--- a/arch/powerpc/cpu/mpc85xx/p3041_ids.c
+++ b/arch/powerpc/cpu/mpc85xx/p3041_ids.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <asm/fsl_portals.h>
 #include <asm/fsl_liodn.h>
+#include <linux/kernel.h>
 
 #ifdef CONFIG_SYS_DPAA_QBMAN
 struct qportal_info qp_info[CONFIG_SYS_QMAN_NUM_PORTALS] = {
diff --git a/arch/powerpc/cpu/mpc85xx/p3041_serdes.c b/arch/powerpc/cpu/mpc85xx/p3041_serdes.c
index be417c94112..9dbf8463d88 100644
--- a/arch/powerpc/cpu/mpc85xx/p3041_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/p3041_serdes.c
@@ -8,6 +8,7 @@
 #include <asm/processor.h>
 #include <asm/io.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 #include "fsl_corenet_serdes.h"
 
 static u8 serdes_cfg_tbl[][SRDS_MAX_LANES] = {
diff --git a/arch/powerpc/cpu/mpc85xx/p4080_ids.c b/arch/powerpc/cpu/mpc85xx/p4080_ids.c
index 5b766f1d517..227d755cf46 100644
--- a/arch/powerpc/cpu/mpc85xx/p4080_ids.c
+++ b/arch/powerpc/cpu/mpc85xx/p4080_ids.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <asm/fsl_portals.h>
 #include <asm/fsl_liodn.h>
+#include <linux/kernel.h>
 
 #ifdef CONFIG_SYS_DPAA_QBMAN
 struct qportal_info qp_info[CONFIG_SYS_QMAN_NUM_PORTALS] = {
diff --git a/arch/powerpc/cpu/mpc85xx/p4080_serdes.c b/arch/powerpc/cpu/mpc85xx/p4080_serdes.c
index fdbb3f7a172..feb7d6ddb7a 100644
--- a/arch/powerpc/cpu/mpc85xx/p4080_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/p4080_serdes.c
@@ -9,6 +9,7 @@
 #include <asm/processor.h>
 #include <asm/io.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 #include "fsl_corenet_serdes.h"
 
 static u8 serdes_cfg_tbl[][SRDS_MAX_LANES] = {
diff --git a/arch/powerpc/cpu/mpc85xx/p5020_ids.c b/arch/powerpc/cpu/mpc85xx/p5020_ids.c
index 575b604c211..fe274d3f102 100644
--- a/arch/powerpc/cpu/mpc85xx/p5020_ids.c
+++ b/arch/powerpc/cpu/mpc85xx/p5020_ids.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <asm/fsl_portals.h>
 #include <asm/fsl_liodn.h>
+#include <linux/kernel.h>
 
 #ifdef CONFIG_SYS_DPAA_QBMAN
 struct qportal_info qp_info[CONFIG_SYS_QMAN_NUM_PORTALS] = {
diff --git a/arch/powerpc/cpu/mpc85xx/p5020_serdes.c b/arch/powerpc/cpu/mpc85xx/p5020_serdes.c
index be417c94112..9dbf8463d88 100644
--- a/arch/powerpc/cpu/mpc85xx/p5020_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/p5020_serdes.c
@@ -8,6 +8,7 @@
 #include <asm/processor.h>
 #include <asm/io.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 #include "fsl_corenet_serdes.h"
 
 static u8 serdes_cfg_tbl[][SRDS_MAX_LANES] = {
diff --git a/arch/powerpc/cpu/mpc85xx/p5040_ids.c b/arch/powerpc/cpu/mpc85xx/p5040_ids.c
index e3d163af9eb..916f1b3a29a 100644
--- a/arch/powerpc/cpu/mpc85xx/p5040_ids.c
+++ b/arch/powerpc/cpu/mpc85xx/p5040_ids.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <asm/fsl_portals.h>
 #include <asm/fsl_liodn.h>
+#include <linux/kernel.h>
 
 #ifdef CONFIG_SYS_DPAA_QBMAN
 struct qportal_info qp_info[CONFIG_SYS_QMAN_NUM_PORTALS] = {
diff --git a/arch/powerpc/cpu/mpc85xx/p5040_serdes.c b/arch/powerpc/cpu/mpc85xx/p5040_serdes.c
index a8403d21bbe..5bb7ec0a09a 100644
--- a/arch/powerpc/cpu/mpc85xx/p5040_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/p5040_serdes.c
@@ -8,6 +8,7 @@
 #include <asm/processor.h>
 #include <asm/io.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 #include "fsl_corenet_serdes.h"
 
 /*
diff --git a/arch/powerpc/cpu/mpc85xx/t1024_ids.c b/arch/powerpc/cpu/mpc85xx/t1024_ids.c
index d2744bb9f82..b0679aa3458 100644
--- a/arch/powerpc/cpu/mpc85xx/t1024_ids.c
+++ b/arch/powerpc/cpu/mpc85xx/t1024_ids.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <asm/fsl_portals.h>
 #include <asm/fsl_liodn.h>
+#include <linux/kernel.h>
 
 #ifdef CONFIG_SYS_DPAA_QBMAN
 struct qportal_info qp_info[CONFIG_SYS_QMAN_NUM_PORTALS] = {
diff --git a/arch/powerpc/cpu/mpc85xx/t1024_serdes.c b/arch/powerpc/cpu/mpc85xx/t1024_serdes.c
index d803fc6c2b2..b1e1761688d 100644
--- a/arch/powerpc/cpu/mpc85xx/t1024_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/t1024_serdes.c
@@ -8,6 +8,7 @@
 #include <asm/processor.h>
 #include <asm/io.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 static u8 serdes_cfg_tbl[][SRDS_MAX_LANES] = {
 	[0x40] = {PCIE1, PCIE1, PCIE1, PCIE1},
diff --git a/arch/powerpc/cpu/mpc85xx/t1040_ids.c b/arch/powerpc/cpu/mpc85xx/t1040_ids.c
index 99b52bacdad..8c427c6ba6d 100644
--- a/arch/powerpc/cpu/mpc85xx/t1040_ids.c
+++ b/arch/powerpc/cpu/mpc85xx/t1040_ids.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <asm/fsl_portals.h>
 #include <asm/fsl_liodn.h>
+#include <linux/kernel.h>
 
 #ifdef CONFIG_SYS_DPAA_QBMAN
 struct qportal_info qp_info[CONFIG_SYS_QMAN_NUM_PORTALS] = {
diff --git a/arch/powerpc/cpu/mpc85xx/t1040_serdes.c b/arch/powerpc/cpu/mpc85xx/t1040_serdes.c
index 4b77ab66bc9..dc3b660109e 100644
--- a/arch/powerpc/cpu/mpc85xx/t1040_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/t1040_serdes.c
@@ -8,6 +8,7 @@
 #include <asm/processor.h>
 #include <asm/io.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 
 static u8 serdes_cfg_tbl[][SRDS_MAX_LANES] = {
diff --git a/arch/powerpc/cpu/mpc85xx/t2080_ids.c b/arch/powerpc/cpu/mpc85xx/t2080_ids.c
index 17521dc3a4a..f9cebd94fd0 100644
--- a/arch/powerpc/cpu/mpc85xx/t2080_ids.c
+++ b/arch/powerpc/cpu/mpc85xx/t2080_ids.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <asm/fsl_portals.h>
 #include <asm/fsl_liodn.h>
+#include <linux/kernel.h>
 
 #ifdef CONFIG_SYS_DPAA_QBMAN
 struct qportal_info qp_info[CONFIG_SYS_QMAN_NUM_PORTALS] = {
diff --git a/arch/powerpc/cpu/mpc85xx/t2080_serdes.c b/arch/powerpc/cpu/mpc85xx/t2080_serdes.c
index f6fc13c48e1..60c59984508 100644
--- a/arch/powerpc/cpu/mpc85xx/t2080_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/t2080_serdes.c
@@ -9,6 +9,7 @@
 #include <asm/fsl_serdes.h>
 #include <asm/processor.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 #include "fsl_corenet2_serdes.h"
 
 struct serdes_config {
diff --git a/arch/powerpc/cpu/mpc85xx/t4240_ids.c b/arch/powerpc/cpu/mpc85xx/t4240_ids.c
index 172dbdbe464..75a017fe774 100644
--- a/arch/powerpc/cpu/mpc85xx/t4240_ids.c
+++ b/arch/powerpc/cpu/mpc85xx/t4240_ids.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <asm/fsl_portals.h>
 #include <asm/fsl_liodn.h>
+#include <linux/kernel.h>
 
 #ifdef CONFIG_SYS_DPAA_QBMAN
 struct qportal_info qp_info[CONFIG_SYS_QMAN_NUM_PORTALS] = {
diff --git a/arch/powerpc/cpu/mpc85xx/t4240_serdes.c b/arch/powerpc/cpu/mpc85xx/t4240_serdes.c
index 6ee09d78413..e6b59e13313 100644
--- a/arch/powerpc/cpu/mpc85xx/t4240_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/t4240_serdes.c
@@ -8,6 +8,7 @@
 #include <asm/processor.h>
 #include <asm/io.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 #include "fsl_corenet2_serdes.h"
 
 struct serdes_config {
diff --git a/arch/powerpc/cpu/mpc85xx/tlb.c b/arch/powerpc/cpu/mpc85xx/tlb.c
index 1678975efb4..56cbec484fc 100644
--- a/arch/powerpc/cpu/mpc85xx/tlb.c
+++ b/arch/powerpc/cpu/mpc85xx/tlb.c
@@ -17,6 +17,7 @@
 #ifdef CONFIG_ADDR_MAP
 #include <addr_map.h>
 #endif
+#include <linux/kernel.h>
 
 #include <linux/log2.h>
 
diff --git a/arch/powerpc/cpu/mpc86xx/cpu.c b/arch/powerpc/cpu/mpc86xx/cpu.c
index 87a2eab8115..8db7fe91e25 100644
--- a/arch/powerpc/cpu/mpc86xx/cpu.c
+++ b/arch/powerpc/cpu/mpc86xx/cpu.c
@@ -21,6 +21,7 @@
 #include <asm/fsl_law.h>
 #include <asm/ppc.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/powerpc/cpu/mpc86xx/mpc8610_serdes.c b/arch/powerpc/cpu/mpc86xx/mpc8610_serdes.c
index 2f755ac2012..e91ebe4b1db 100644
--- a/arch/powerpc/cpu/mpc86xx/mpc8610_serdes.c
+++ b/arch/powerpc/cpu/mpc86xx/mpc8610_serdes.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <asm/immap_86xx.h>
 #include <asm/fsl_serdes.h>
+#include <linux/kernel.h>
 
 #define SRDS1_MAX_LANES		4
 #define SRDS2_MAX_LANES		4
diff --git a/arch/powerpc/cpu/mpc86xx/mpc8641_serdes.c b/arch/powerpc/cpu/mpc86xx/mpc8641_serdes.c
index 1621fd116dd..232f85c2ad9 100644
--- a/arch/powerpc/cpu/mpc86xx/mpc8641_serdes.c
+++ b/arch/powerpc/cpu/mpc86xx/mpc8641_serdes.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <asm/immap_86xx.h>
 #include <asm/fsl_serdes.h>
+#include <linux/kernel.h>
 
 #define SRDS1_MAX_LANES		4
 #define SRDS2_MAX_LANES		4
diff --git a/arch/powerpc/cpu/mpc8xxx/cpu.c b/arch/powerpc/cpu/mpc8xxx/cpu.c
index 4c9da029304..e9ff1d2aaf9 100644
--- a/arch/powerpc/cpu/mpc8xxx/cpu.c
+++ b/arch/powerpc/cpu/mpc8xxx/cpu.c
@@ -21,6 +21,7 @@
 #include <asm/io.h>
 #include <vsc9953.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/powerpc/cpu/mpc8xxx/law.c b/arch/powerpc/cpu/mpc8xxx/law.c
index 5cdb1363f78..ddb53e6db65 100644
--- a/arch/powerpc/cpu/mpc8xxx/law.c
+++ b/arch/powerpc/cpu/mpc8xxx/law.c
@@ -15,6 +15,7 @@
 #include <linux/compiler.h>
 #include <asm/fsl_law.h>
 #include <asm/io.h>
+#include <linux/kernel.h>
 #include <linux/log2.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/powerpc/cpu/mpc8xxx/pamu_table.c b/arch/powerpc/cpu/mpc8xxx/pamu_table.c
index d917e9dfb62..bf559d0f833 100644
--- a/arch/powerpc/cpu/mpc8xxx/pamu_table.c
+++ b/arch/powerpc/cpu/mpc8xxx/pamu_table.c
@@ -7,6 +7,7 @@
 #include <log.h>
 #include <asm/fsl_pamu.h>
 #include <asm/global_data.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/powerpc/include/asm/arch-mpc83xx/soc.h b/arch/powerpc/include/asm/arch-mpc83xx/soc.h
index 39bf7d5a7f9..7064d1f9d61 100644
--- a/arch/powerpc/include/asm/arch-mpc83xx/soc.h
+++ b/arch/powerpc/include/asm/arch-mpc83xx/soc.h
@@ -7,6 +7,7 @@
 #ifndef _MPC83XX_SOC_H_
 #define _MPC83XX_SOC_H_
 
+#include <stdbool.h>
 enum soc_type {
 	SOC_MPC8308,
 	SOC_MPC8309,
diff --git a/arch/powerpc/lib/bootm.c b/arch/powerpc/lib/bootm.c
index d72da1da2d2..f283c1a9a47 100644
--- a/arch/powerpc/lib/bootm.c
+++ b/arch/powerpc/lib/bootm.c
@@ -21,6 +21,7 @@
 #include <malloc.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 #include <u-boot/zlib.h>
 #include <bzlib.h>
 #include <asm/byteorder.h>
diff --git a/arch/riscv/cpu/cpu.c b/arch/riscv/cpu/cpu.c
index 56a76170977..5d5b1d523ac 100644
--- a/arch/riscv/cpu/cpu.c
+++ b/arch/riscv/cpu/cpu.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <init.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/encoding.h>
 #include <asm/u-boot.h>
 #include <dm/uclass-internal.h>
diff --git a/arch/riscv/lib/cache.c b/arch/riscv/lib/cache.c
index b1d42bcc2bb..4de634b4fbd 100644
--- a/arch/riscv/lib/cache.c
+++ b/arch/riscv/lib/cache.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <cpu_func.h>
 
 void invalidate_icache_all(void)
diff --git a/arch/riscv/lib/fdt_fixup.c b/arch/riscv/lib/fdt_fixup.c
index caa19cd8dd1..932243596cc 100644
--- a/arch/riscv/lib/fdt_fixup.c
+++ b/arch/riscv/lib/fdt_fixup.c
@@ -10,6 +10,7 @@
 #include <fdt_support.h>
 #include <log.h>
 #include <mapmem.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
diff --git a/arch/riscv/lib/image.c b/arch/riscv/lib/image.c
index 88563331b33..2f78b25807a 100644
--- a/arch/riscv/lib/image.c
+++ b/arch/riscv/lib/image.c
@@ -10,6 +10,7 @@
 #include <image.h>
 #include <mapmem.h>
 #include <errno.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
diff --git a/arch/riscv/lib/interrupts.c b/arch/riscv/lib/interrupts.c
index 38c0048577c..7b5a0743cce 100644
--- a/arch/riscv/lib/interrupts.c
+++ b/arch/riscv/lib/interrupts.c
@@ -16,6 +16,7 @@
 #include <asm/ptrace.h>
 #include <asm/system.h>
 #include <asm/encoding.h>
+#include <linux/kernel.h>
 
 static void show_regs(struct pt_regs *regs)
 {
diff --git a/arch/sandbox/cpu/cpu.c b/arch/sandbox/cpu/cpu.c
index 4b8af862e60..8b5323fc815 100644
--- a/arch/sandbox/cpu/cpu.c
+++ b/arch/sandbox/cpu/cpu.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
diff --git a/arch/sandbox/cpu/os.c b/arch/sandbox/cpu/os.c
index 581a48ea9ed..cce8e911cc3 100644
--- a/arch/sandbox/cpu/os.c
+++ b/arch/sandbox/cpu/os.c
@@ -9,6 +9,7 @@
 #include <getopt.h>
 #include <setjmp.h>
 #include <signal.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
diff --git a/arch/sandbox/cpu/start.c b/arch/sandbox/cpu/start.c
index 2c6f90740f3..5533100bdec 100644
--- a/arch/sandbox/cpu/start.c
+++ b/arch/sandbox/cpu/start.c
@@ -21,6 +21,7 @@
 #include <asm/u-boot.h>
 #include <linux/ctype.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/sandbox/cpu/state.c b/arch/sandbox/cpu/state.c
index 35bc7586fa5..849dfbd1d66 100644
--- a/arch/sandbox/cpu/state.c
+++ b/arch/sandbox/cpu/state.c
@@ -8,6 +8,7 @@
 #include <fdtdec.h>
 #include <log.h>
 #include <os.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/malloc.h>
 #include <asm/state.h>
diff --git a/arch/sandbox/include/asm/eth.h b/arch/sandbox/include/asm/eth.h
index b313bf57c63..8c3c957b56f 100644
--- a/arch/sandbox/include/asm/eth.h
+++ b/arch/sandbox/include/asm/eth.h
@@ -10,6 +10,7 @@
 #define __ETH_H
 
 #include <net.h>
+#include <stdbool.h>
 
 void sandbox_eth_disable_response(int index, bool disable);
 
diff --git a/arch/sandbox/include/asm/sdl.h b/arch/sandbox/include/asm/sdl.h
index 2a98a7f49b2..a14e0a8f8a2 100644
--- a/arch/sandbox/include/asm/sdl.h
+++ b/arch/sandbox/include/asm/sdl.h
@@ -7,6 +7,7 @@
 #define __SANDBOX_SDL_H
 
 #include <errno.h>
+#include <stdbool.h>
 #include <linux/errno.h>
 
 #ifdef CONFIG_SANDBOX_SDL
diff --git a/arch/sandbox/include/asm/test.h b/arch/sandbox/include/asm/test.h
index 7f99d07c47f..6ac8c1a8288 100644
--- a/arch/sandbox/include/asm/test.h
+++ b/arch/sandbox/include/asm/test.h
@@ -9,6 +9,7 @@
 #define __ASM_TEST_H
 
 /* The sandbox driver always permits an I2C device with this address */
+#include <stdbool.h>
 #define SANDBOX_I2C_TEST_ADDR		0x59
 
 #define SANDBOX_PCI_VENDOR_ID		0x1234
diff --git a/arch/x86/cpu/apollolake/fsp_bindings.c b/arch/x86/cpu/apollolake/fsp_bindings.c
index bea3a259345..c710db39942 100644
--- a/arch/x86/cpu/apollolake/fsp_bindings.c
+++ b/arch/x86/cpu/apollolake/fsp_bindings.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <asm/arch/fsp_bindings.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 /**
diff --git a/arch/x86/cpu/apollolake/fsp_s.c b/arch/x86/cpu/apollolake/fsp_s.c
index c6da4bbfce6..433dcf08c77 100644
--- a/arch/x86/cpu/apollolake/fsp_s.c
+++ b/arch/x86/cpu/apollolake/fsp_s.c
@@ -29,6 +29,7 @@
 #include <dm/uclass-internal.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #define PCH_P2SB_E0		0xe0
 #define HIDE_BIT		BIT(0)
diff --git a/arch/x86/cpu/apollolake/hostbridge.c b/arch/x86/cpu/apollolake/hostbridge.c
index cb46ec6c0bb..99f1b441312 100644
--- a/arch/x86/cpu/apollolake/hostbridge.c
+++ b/arch/x86/cpu/apollolake/hostbridge.c
@@ -12,6 +12,7 @@
 #include <asm/intel_regs.h>
 #include <asm/pci.h>
 #include <asm/arch/systemagent.h>
+#include <linux/kernel.h>
 
 /**
  * struct apl_hostbridge_platdata - platform data for hostbridge
diff --git a/arch/x86/cpu/apollolake/lpc.c b/arch/x86/cpu/apollolake/lpc.c
index 1de8c4a9804..07a64502061 100644
--- a/arch/x86/cpu/apollolake/lpc.c
+++ b/arch/x86/cpu/apollolake/lpc.c
@@ -14,6 +14,7 @@
 #include <asm/arch/iomap.h>
 #include <asm/arch/lpc.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/log2.h>
 
 void lpc_enable_fixed_io_ranges(uint io_enables)
diff --git a/arch/x86/cpu/apollolake/pch.c b/arch/x86/cpu/apollolake/pch.c
index 1a5a985221f..29ec955e19b 100644
--- a/arch/x86/cpu/apollolake/pch.c
+++ b/arch/x86/cpu/apollolake/pch.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <pch.h>
 #include <spl.h>
+#include <stdbool.h>
 #include <asm/lpc_common.h>
 
 #define BIOS_CTRL	0xdc
diff --git a/arch/x86/cpu/apollolake/pmc.c b/arch/x86/cpu/apollolake/pmc.c
index 83d165c0d9b..8adc33bfd30 100644
--- a/arch/x86/cpu/apollolake/pmc.c
+++ b/arch/x86/cpu/apollolake/pmc.c
@@ -17,6 +17,7 @@
 #include <asm/io.h>
 #include <asm/pci.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <power/acpi_pmc.h>
 
diff --git a/arch/x86/cpu/apollolake/spl.c b/arch/x86/cpu/apollolake/spl.c
index 44cbe4590a7..618b20add16 100644
--- a/arch/x86/cpu/apollolake/spl.c
+++ b/arch/x86/cpu/apollolake/spl.c
@@ -13,6 +13,7 @@
 #include <spi.h>
 #include <spl.h>
 #include <spi_flash.h>
+#include <stdbool.h>
 #include <asm/fast_spi.h>
 #include <asm/spl.h>
 #include <asm/arch/cpu.h>
diff --git a/arch/x86/cpu/broadwell/adsp.c b/arch/x86/cpu/broadwell/adsp.c
index f5ae97c88ce..beab06dee95 100644
--- a/arch/x86/cpu/broadwell/adsp.c
+++ b/arch/x86/cpu/broadwell/adsp.c
@@ -13,6 +13,7 @@
 #include <dm.h>
 #include <log.h>
 #include <pci.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <asm/cpu.h>
 #include <asm/intel_regs.h>
diff --git a/arch/x86/cpu/broadwell/cpu_full.c b/arch/x86/cpu/broadwell/cpu_full.c
index 883531712ea..f4b930225bd 100644
--- a/arch/x86/cpu/broadwell/cpu_full.c
+++ b/arch/x86/cpu/broadwell/cpu_full.c
@@ -24,6 +24,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 struct cpu_broadwell_priv {
 	bool ht_disabled;
diff --git a/arch/x86/cpu/broadwell/iobp.c b/arch/x86/cpu/broadwell/iobp.c
index 9805f8dbed4..68c57f4f18a 100644
--- a/arch/x86/cpu/broadwell/iobp.c
+++ b/arch/x86/cpu/broadwell/iobp.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <errno.h>
 #include <stdio.h>
+#include <stdbool.h>
 #include <asm/intel_regs.h>
 #include <asm/io.h>
 #include <asm/arch/pch.h>
diff --git a/arch/x86/cpu/broadwell/pch.c b/arch/x86/cpu/broadwell/pch.c
index 6a5d9dc345e..f7f975983e6 100644
--- a/arch/x86/cpu/broadwell/pch.c
+++ b/arch/x86/cpu/broadwell/pch.c
@@ -27,6 +27,7 @@
 #include <dm/uclass-internal.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #define BIOS_CTRL	0xdc
 
diff --git a/arch/x86/cpu/broadwell/pinctrl_broadwell.c b/arch/x86/cpu/broadwell/pinctrl_broadwell.c
index 332d45fd088..0bb28739fdc 100644
--- a/arch/x86/cpu/broadwell/pinctrl_broadwell.c
+++ b/arch/x86/cpu/broadwell/pinctrl_broadwell.c
@@ -20,6 +20,7 @@
 #include <dm/pinctrl.h>
 #include <dm/uclass-internal.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/x86/cpu/coreboot/sdram.c b/arch/x86/cpu/coreboot/sdram.c
index 8b768b0d099..e2dfbc1937b 100644
--- a/arch/x86/cpu/coreboot/sdram.c
+++ b/arch/x86/cpu/coreboot/sdram.c
@@ -13,6 +13,7 @@
 #include <asm/arch/sysinfo.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/cpu.c b/arch/x86/cpu/cpu.c
index 5942e6b3972..c1e9be4eda8 100644
--- a/arch/x86/cpu/cpu.c
+++ b/arch/x86/cpu/cpu.c
@@ -51,6 +51,7 @@
 #include <asm/u-boot.h>
 #include <linux/compiler.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/i386/cpu.c b/arch/x86/cpu/i386/cpu.c
index f7e5b92da25..f1b56a3a215 100644
--- a/arch/x86/cpu/i386/cpu.c
+++ b/arch/x86/cpu/i386/cpu.c
@@ -35,6 +35,7 @@
 #include <asm/processor-flags.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/x86/cpu/intel_common/cpu.c b/arch/x86/cpu/intel_common/cpu.c
index a292dd72a88..b5d907126af 100644
--- a/arch/x86/cpu/intel_common/cpu.c
+++ b/arch/x86/cpu/intel_common/cpu.c
@@ -12,6 +12,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/cpu.h>
 #include <asm/cpu_common.h>
diff --git a/arch/x86/cpu/intel_common/itss.c b/arch/x86/cpu/intel_common/itss.c
index cc9111d7fc5..732a4b4c4f4 100644
--- a/arch/x86/cpu/intel_common/itss.c
+++ b/arch/x86/cpu/intel_common/itss.c
@@ -20,6 +20,7 @@
 #include <asm/global_data.h>
 #include <asm/itss.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 struct itss_platdata {
diff --git a/arch/x86/cpu/intel_common/lpc.c b/arch/x86/cpu/intel_common/lpc.c
index eda4e58d608..7eaea5c77c8 100644
--- a/arch/x86/cpu/intel_common/lpc.c
+++ b/arch/x86/cpu/intel_common/lpc.c
@@ -15,6 +15,7 @@
 #include <asm/lpc_common.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/intel_common/me_status.c b/arch/x86/cpu/intel_common/me_status.c
index abc5f6fbc77..2557a9b2665 100644
--- a/arch/x86/cpu/intel_common/me_status.c
+++ b/arch/x86/cpu/intel_common/me_status.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <log.h>
 #include <asm/arch/me.h>
+#include <linux/kernel.h>
 
 /* HFS1[3:0] Current Working State Values */
 static const char *const me_cws_values[] = {
diff --git a/arch/x86/cpu/intel_common/mrc.c b/arch/x86/cpu/intel_common/mrc.c
index 384e721063f..8770546702b 100644
--- a/arch/x86/cpu/intel_common/mrc.c
+++ b/arch/x86/cpu/intel_common/mrc.c
@@ -22,6 +22,7 @@
 #include <asm/report_platform.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 static const char *const ecc_decoder[] = {
 	"inactive",
diff --git a/arch/x86/cpu/intel_common/p2sb.c b/arch/x86/cpu/intel_common/p2sb.c
index 8b62cc5d7be..53e2f21df96 100644
--- a/arch/x86/cpu/intel_common/p2sb.c
+++ b/arch/x86/cpu/intel_common/p2sb.c
@@ -16,6 +16,7 @@
 #include <asm/pci.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #define PCH_P2SB_E0		0xe0
 #define HIDE_BIT		BIT(0)
diff --git a/arch/x86/cpu/intel_common/report_platform.c b/arch/x86/cpu/intel_common/report_platform.c
index 2de29bbbe25..9502b145490 100644
--- a/arch/x86/cpu/intel_common/report_platform.c
+++ b/arch/x86/cpu/intel_common/report_platform.c
@@ -11,6 +11,7 @@
 #include <asm/pci.h>
 #include <asm/report_platform.h>
 #include <asm/arch/pch.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 static void report_cpu_info(void)
diff --git a/arch/x86/cpu/irq.c b/arch/x86/cpu/irq.c
index 547eedfbb85..920a799ec8e 100644
--- a/arch/x86/cpu/irq.c
+++ b/arch/x86/cpu/irq.c
@@ -10,6 +10,7 @@
 #include <irq.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/arch/x86/cpu/ivybridge/bd82x6x.c b/arch/x86/cpu/ivybridge/bd82x6x.c
index fefea448ade..7df278ddbc4 100644
--- a/arch/x86/cpu/ivybridge/bd82x6x.c
+++ b/arch/x86/cpu/ivybridge/bd82x6x.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <pch.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/cpu.h>
 #include <asm/global_data.h>
diff --git a/arch/x86/cpu/ivybridge/lpc.c b/arch/x86/cpu/ivybridge/lpc.c
index a579eb3b38e..57c84435982 100644
--- a/arch/x86/cpu/ivybridge/lpc.c
+++ b/arch/x86/cpu/ivybridge/lpc.c
@@ -22,6 +22,7 @@
 #include <asm/pci.h>
 #include <asm/arch/pch.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/ivybridge/model_206ax.c b/arch/x86/cpu/ivybridge/model_206ax.c
index e11aa0001c4..087754a1dd9 100644
--- a/arch/x86/cpu/ivybridge/model_206ax.c
+++ b/arch/x86/cpu/ivybridge/model_206ax.c
@@ -24,6 +24,7 @@
 #include <asm/turbo.h>
 #include <asm/arch/model_206ax.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/mp_init.c b/arch/x86/cpu/mp_init.c
index 1a34c2f0375..7bf3935ba94 100644
--- a/arch/x86/cpu/mp_init.c
+++ b/arch/x86/cpu/mp_init.c
@@ -32,6 +32,7 @@
 #include <dm/root.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/linkage.h>
 #include <linux/string.h>
 
diff --git a/arch/x86/cpu/mtrr.c b/arch/x86/cpu/mtrr.c
index fd86a4e105b..da1f08eff81 100644
--- a/arch/x86/cpu/mtrr.c
+++ b/arch/x86/cpu/mtrr.c
@@ -19,6 +19,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/arch/x86/cpu/qemu/qemu.c b/arch/x86/cpu/qemu/qemu.c
index 8fab346f801..a38c4d3f01d 100644
--- a/arch/x86/cpu/qemu/qemu.c
+++ b/arch/x86/cpu/qemu/qemu.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <pci.h>
 #include <qfw.h>
+#include <stdbool.h>
 #include <asm/irq.h>
 #include <asm/post.h>
 #include <asm/processor.h>
diff --git a/arch/x86/cpu/quark/mrc.c b/arch/x86/cpu/quark/mrc.c
index d3b237e87e4..cc29f72e745 100644
--- a/arch/x86/cpu/quark/mrc.c
+++ b/arch/x86/cpu/quark/mrc.c
@@ -37,6 +37,7 @@
 #include <asm/arch/mrc.h>
 #include <asm/arch/msg_port.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 #include "mrc_util.h"
 #include "smc.h"
 
diff --git a/arch/x86/cpu/quark/mrc_util.c b/arch/x86/cpu/quark/mrc_util.c
index 28176fdd006..6660568899f 100644
--- a/arch/x86/cpu/quark/mrc_util.c
+++ b/arch/x86/cpu/quark/mrc_util.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <hang.h>
+#include <stdbool.h>
 #include <asm/arch/device.h>
 #include <asm/arch/mrc.h>
 #include <asm/arch/msg_port.h>
diff --git a/arch/x86/cpu/quark/mrc_util.h b/arch/x86/cpu/quark/mrc_util.h
index e6e69c49d09..f4e3e87b6c3 100644
--- a/arch/x86/cpu/quark/mrc_util.h
+++ b/arch/x86/cpu/quark/mrc_util.h
@@ -11,6 +11,7 @@
 #define _MRC_UTIL_H_
 
 #include <log.h>
+#include <stdbool.h>
 
 /* Turn on this macro to enable MRC debugging output */
 #undef  MRC_DEBUG
diff --git a/arch/x86/cpu/quark/smc.c b/arch/x86/cpu/quark/smc.c
index af158bab345..584f2cfbaac 100644
--- a/arch/x86/cpu/quark/smc.c
+++ b/arch/x86/cpu/quark/smc.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <pci.h>
+#include <stdbool.h>
 #include <asm/arch/device.h>
 #include <asm/arch/mrc.h>
 #include <asm/arch/msg_port.h>
diff --git a/arch/x86/cpu/slimbootloader/sdram.c b/arch/x86/cpu/slimbootloader/sdram.c
index e7513d97896..381a88124ff 100644
--- a/arch/x86/cpu/slimbootloader/sdram.c
+++ b/arch/x86/cpu/slimbootloader/sdram.c
@@ -8,6 +8,7 @@
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <asm/e820.h>
 #include <asm/arch/slimbootloader.h>
diff --git a/arch/x86/cpu/tangier/pinmux.c b/arch/x86/cpu/tangier/pinmux.c
index aba74a083d7..41ad198a060 100644
--- a/arch/x86/cpu/tangier/pinmux.c
+++ b/arch/x86/cpu/tangier/pinmux.c
@@ -14,6 +14,7 @@
 #include <asm/scu.h>
 #include <linux/errno.h>
 #include <linux/io.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 
 #define BUFCFG_OFFSET				0x100
diff --git a/arch/x86/include/asm/arch-apollolake/fsp_bindings.h b/arch/x86/include/asm/arch-apollolake/fsp_bindings.h
index b4939519ced..b0510534c8a 100644
--- a/arch/x86/include/asm/arch-apollolake/fsp_bindings.h
+++ b/arch/x86/include/asm/arch-apollolake/fsp_bindings.h
@@ -9,6 +9,7 @@
 
 #include <asm/arch/fsp/fsp_m_upd.h>
 #include <asm/arch/fsp/fsp_s_upd.h>
+#include <linux/kernel.h>
 
 #define ARRAY_SIZE_OF_MEMBER(s, m) (ARRAY_SIZE((((s *)0)->m)))
 #define SIZE_OF_MEMBER(s, m) (sizeof((((s *)0)->m)))
diff --git a/arch/x86/include/asm/arch-broadwell/gpio.h b/arch/x86/include/asm/arch-broadwell/gpio.h
index a32e2db47e1..b5dd5ab4e7f 100644
--- a/arch/x86/include/asm/arch-broadwell/gpio.h
+++ b/arch/x86/include/asm/arch-broadwell/gpio.h
@@ -8,6 +8,7 @@
 #ifndef __ASM_ARCH_GPIO
 #define __ASM_ARCH_GPIO
 
+#include <linux/kernel.h>
 #define GPIO_PER_BANK	32
 #define GPIO_BANKS	3
 
diff --git a/arch/x86/include/asm/arch-broadwell/pch.h b/arch/x86/include/asm/arch-broadwell/pch.h
index ecdf6d16f94..6b6f10ec6c8 100644
--- a/arch/x86/include/asm/arch-broadwell/pch.h
+++ b/arch/x86/include/asm/arch-broadwell/pch.h
@@ -6,6 +6,8 @@
 #ifndef __ASM_ARCH_PCH_H
 #define __ASM_ARCH_PCH_H
 
+#include <stdbool.h>
+
 #define PMBASE			0x40
 #define ACPI_CNTL		0x44
 #define  ACPI_EN		(1 << 7)
diff --git a/arch/x86/include/asm/arch-ivybridge/model_206ax.h b/arch/x86/include/asm/arch-ivybridge/model_206ax.h
index 5c066294bc2..d2d28746974 100644
--- a/arch/x86/include/asm/arch-ivybridge/model_206ax.h
+++ b/arch/x86/include/asm/arch-ivybridge/model_206ax.h
@@ -8,6 +8,7 @@
 #ifndef _ASM_ARCH_MODEL_206AX_H
 #define _ASM_ARCH_MODEL_206AX_H
 
+#include <stdbool.h>
 #define  CPUID_VMX			(1 << 5)
 #define  CPUID_SMX			(1 << 6)
 #define MSR_FEATURE_CONFIG		0x13c
diff --git a/arch/x86/include/asm/bootm.h b/arch/x86/include/asm/bootm.h
index bd8ce55729c..231d11340ca 100644
--- a/arch/x86/include/asm/bootm.h
+++ b/arch/x86/include/asm/bootm.h
@@ -6,6 +6,7 @@
 #ifndef ARM_BOOTM_H
 #define ARM_BOOTM_H
 
+#include <stdbool.h>
 void bootm_announce_and_cleanup(void);
 
 /**
diff --git a/arch/x86/include/asm/cpu_common.h b/arch/x86/include/asm/cpu_common.h
index 4a782a22956..67d150b8d91 100644
--- a/arch/x86/include/asm/cpu_common.h
+++ b/arch/x86/include/asm/cpu_common.h
@@ -8,6 +8,8 @@
 #ifndef __ASM_CPU_COMMON_H
 #define __ASM_CPU_COMMON_H
 
+#include <stdbool.h>
+
 /* Standard Intel bus clock is fixed at 100MHz */
 enum {
 	INTEL_BCLK_MHZ		= 100
diff --git a/arch/x86/include/asm/fast_spi.h b/arch/x86/include/asm/fast_spi.h
index 82e3d8f63ef..ed436a89113 100644
--- a/arch/x86/include/asm/fast_spi.h
+++ b/arch/x86/include/asm/fast_spi.h
@@ -8,6 +8,7 @@
 
 #include <pci.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 
 /* Register offsets from the MMIO region base (PCI_BASE_ADDRESS_0) */
 struct fast_spi_regs {
diff --git a/arch/x86/include/asm/fsp2/fsp_api.h b/arch/x86/include/asm/fsp2/fsp_api.h
index af1e8857b97..16ffb1922cd 100644
--- a/arch/x86/include/asm/fsp2/fsp_api.h
+++ b/arch/x86/include/asm/fsp2/fsp_api.h
@@ -9,6 +9,7 @@
 #ifndef __ASM_FSP2_API_H
 #define __ASM_FSP2_API_H
 
+#include <stdbool.h>
 #include <asm/fsp/fsp_api.h>
 
 struct fspm_upd;
diff --git a/arch/x86/include/asm/fsp2/fsp_internal.h b/arch/x86/include/asm/fsp2/fsp_internal.h
index b4a4fbbd84d..720d677c05d 100644
--- a/arch/x86/include/asm/fsp2/fsp_internal.h
+++ b/arch/x86/include/asm/fsp2/fsp_internal.h
@@ -8,6 +8,7 @@
 #ifndef __ASM_FSP_INTERNAL_H
 #define __ASM_FSP_INTERNAL_H
 
+#include <stdbool.h>
 struct binman_entry;
 struct fsp_header;
 struct fspm_upd;
diff --git a/arch/x86/include/asm/global_data.h b/arch/x86/include/asm/global_data.h
index 3e4044593c8..7fcd21ee2d5 100644
--- a/arch/x86/include/asm/global_data.h
+++ b/arch/x86/include/asm/global_data.h
@@ -9,6 +9,7 @@
 
 #ifndef __ASSEMBLY__
 
+#include <stdbool.h>
 #include <asm/processor.h>
 #include <asm/mrccache.h>
 
diff --git a/arch/x86/include/asm/hob.h b/arch/x86/include/asm/hob.h
index 56e11dbb28f..a58f422de72 100644
--- a/arch/x86/include/asm/hob.h
+++ b/arch/x86/include/asm/hob.h
@@ -9,6 +9,7 @@
 
 #include <efi.h>
 #include <efi_loader.h>
+#include <stdbool.h>
 
 /* Type of HOB Header */
 #define HOB_TYPE_MEM_ALLOC	0x0002
diff --git a/arch/x86/include/asm/intel_pinctrl.h b/arch/x86/include/asm/intel_pinctrl.h
index 00868d17258..bae5d22b883 100644
--- a/arch/x86/include/asm/intel_pinctrl.h
+++ b/arch/x86/include/asm/intel_pinctrl.h
@@ -9,6 +9,7 @@
 #ifndef __ASM_INTEL_PINCTRL_H
 #define __ASM_INTEL_PINCTRL_H
 
+#include <stdbool.h>
 #include <dm/pinctrl.h>
 #include <linux/bitops.h>
 
diff --git a/arch/x86/include/asm/interrupt.h b/arch/x86/include/asm/interrupt.h
index fdeb8571132..d54295989e4 100644
--- a/arch/x86/include/asm/interrupt.h
+++ b/arch/x86/include/asm/interrupt.h
@@ -10,6 +10,7 @@
 #ifndef __ASM_INTERRUPT_H_
 #define __ASM_INTERRUPT_H_ 1
 
+#include <stdbool.h>
 #include <asm/types.h>
 
 #define SYS_NUM_IRQS	16
diff --git a/arch/x86/include/asm/irq.h b/arch/x86/include/asm/irq.h
index e5c916070c8..2f5de45dff1 100644
--- a/arch/x86/include/asm/irq.h
+++ b/arch/x86/include/asm/irq.h
@@ -6,6 +6,7 @@
 #ifndef _ARCH_IRQ_H_
 #define _ARCH_IRQ_H_
 
+#include <stdbool.h>
 #include <dt-bindings/interrupt-router/intel-irq.h>
 
 /**
diff --git a/arch/x86/include/asm/itss.h b/arch/x86/include/asm/itss.h
index f7d32403849..7b63b8435fe 100644
--- a/arch/x86/include/asm/itss.h
+++ b/arch/x86/include/asm/itss.h
@@ -11,6 +11,7 @@
 #ifndef _ASM_ARCH_ITSS_H
 #define _ASM_ARCH_ITSS_H
 
+#include <linux/kernel.h>
 #define GPIO_IRQ_START	50
 #define GPIO_IRQ_END	ITSS_MAX_IRQ
 
diff --git a/arch/x86/include/asm/lpc_common.h b/arch/x86/include/asm/lpc_common.h
index d462c2ec610..2dd19a3d6cf 100644
--- a/arch/x86/include/asm/lpc_common.h
+++ b/arch/x86/include/asm/lpc_common.h
@@ -6,6 +6,7 @@
 #ifndef __ASM_LPC_COMMON_H
 #define __ASM_LPC_COMMON_H
 
+#include <stdbool.h>
 #define PCH_RCBA_BASE		0xf0
 
 #define RC		0x3400	/* 32bit */
diff --git a/arch/x86/include/asm/mrc_common.h b/arch/x86/include/asm/mrc_common.h
index d4e56bf37c1..f060389f789 100644
--- a/arch/x86/include/asm/mrc_common.h
+++ b/arch/x86/include/asm/mrc_common.h
@@ -6,6 +6,7 @@
 #ifndef __ASM_MRC_COMMON_H
 #define __ASM_MRC_COMMON_H
 
+#include <stdbool.h>
 #include <linux/linkage.h>
 
 /**
diff --git a/arch/x86/include/asm/mrccache.h b/arch/x86/include/asm/mrccache.h
index b60d1171f77..8b104a2f0b8 100644
--- a/arch/x86/include/asm/mrccache.h
+++ b/arch/x86/include/asm/mrccache.h
@@ -7,6 +7,8 @@
 #ifndef _ASM_MRCCACHE_H
 #define _ASM_MRCCACHE_H
 
+#include <compiler.h>
+
 #define MRC_DATA_ALIGN		0x100
 #define MRC_DATA_SIGNATURE	(('M' << 0) | ('R' << 8) | \
 				 ('C' << 16) | ('D'<<24))
diff --git a/arch/x86/include/asm/mtrr.h b/arch/x86/include/asm/mtrr.h
index 48db1dd82f7..73edb4d86d3 100644
--- a/arch/x86/include/asm/mtrr.h
+++ b/arch/x86/include/asm/mtrr.h
@@ -9,6 +9,7 @@
 #define _ASM_MTRR_H
 
 /* MTRR region types */
+#include <stdbool.h>
 #define MTRR_TYPE_UNCACHEABLE	0
 #define MTRR_TYPE_WRCOMB	1
 #define MTRR_TYPE_WRTHROUGH	4
diff --git a/arch/x86/include/asm/pirq_routing.h b/arch/x86/include/asm/pirq_routing.h
index 67e5c447ab9..895fa793ef4 100644
--- a/arch/x86/include/asm/pirq_routing.h
+++ b/arch/x86/include/asm/pirq_routing.h
@@ -18,6 +18,7 @@
  *
  * CAUTION: If you change this, PIRQ routing will not work correctly.
  */
+#include <stdbool.h>
 #define MAX_INTX_ENTRIES	4
 
 #define PIRQ_SIGNATURE		\
diff --git a/arch/x86/include/asm/pmu.h b/arch/x86/include/asm/pmu.h
index b76bdf64a30..13052771492 100644
--- a/arch/x86/include/asm/pmu.h
+++ b/arch/x86/include/asm/pmu.h
@@ -5,6 +5,7 @@
 #ifndef _X86_ASM_PMU_IPC_H_
 #define _X86_ASM_PMU_IPC_H_
 
+#include <stdbool.h>
 int pmu_turn_power(unsigned int lss, bool on);
 
 #endif	/* _X86_ASM_PMU_IPC_H_ */
diff --git a/arch/x86/lib/acpi_nhlt.c b/arch/x86/lib/acpi_nhlt.c
index 83f110ebba8..f21d3e32b57 100644
--- a/arch/x86/lib/acpi_nhlt.c
+++ b/arch/x86/lib/acpi_nhlt.c
@@ -18,6 +18,7 @@
 #include <asm/unaligned.h>
 #include <dm/acpi.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #define NHLT_RID		1
diff --git a/arch/x86/lib/acpi_table.c b/arch/x86/lib/acpi_table.c
index 2de8ad0d6f4..db184006830 100644
--- a/arch/x86/lib/acpi_table.c
+++ b/arch/x86/lib/acpi_table.c
@@ -27,6 +27,7 @@
 #include <dm/acpi.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 /*
diff --git a/arch/x86/lib/bootm.c b/arch/x86/lib/bootm.c
index 66fc8a69aaa..0b20cdc16ab 100644
--- a/arch/x86/lib/bootm.c
+++ b/arch/x86/lib/bootm.c
@@ -12,6 +12,7 @@
 #include <command.h>
 #include <hang.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
diff --git a/arch/x86/lib/coreboot_table.c b/arch/x86/lib/coreboot_table.c
index b0377dcee17..f4736ecfc45 100644
--- a/arch/x86/lib/coreboot_table.c
+++ b/arch/x86/lib/coreboot_table.c
@@ -11,6 +11,7 @@
 #include <asm/coreboot_tables.h>
 #include <asm/e820.h>
 #include <asm/global_data.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/x86/lib/e820.c b/arch/x86/lib/e820.c
index 12fcff12380..066bf9b154b 100644
--- a/arch/x86/lib/e820.c
+++ b/arch/x86/lib/e820.c
@@ -7,6 +7,7 @@
 #include <efi_loader.h>
 #include <asm/e820.h>
 #include <asm/global_data.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/lib/fsp/fsp_dram.c b/arch/x86/lib/fsp/fsp_dram.c
index dfa08867ecd..70aa7bbf885 100644
--- a/arch/x86/lib/fsp/fsp_dram.c
+++ b/arch/x86/lib/fsp/fsp_dram.c
@@ -14,6 +14,7 @@
 #include <asm/mtrr.h>
 #include <asm/post.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/lib/fsp2/fsp_dram.c b/arch/x86/lib/fsp2/fsp_dram.c
index 81805ae8299..693f3cf0323 100644
--- a/arch/x86/lib/fsp2/fsp_dram.c
+++ b/arch/x86/lib/fsp2/fsp_dram.c
@@ -9,6 +9,7 @@
 #include <init.h>
 #include <log.h>
 #include <spl.h>
+#include <stdbool.h>
 #include <acpi/acpi_s3.h>
 #include <asm/arch/cpu.h>
 #include <asm/fsp/fsp_support.h>
diff --git a/arch/x86/lib/fsp2/fsp_init.c b/arch/x86/lib/fsp2/fsp_init.c
index 31702b90fd7..eef321d6208 100644
--- a/arch/x86/lib/fsp2/fsp_init.c
+++ b/arch/x86/lib/fsp2/fsp_init.c
@@ -14,6 +14,7 @@
 #include <spi.h>
 #include <spl.h>
 #include <spi_flash.h>
+#include <stdbool.h>
 #include <asm/intel_pinctrl.h>
 #include <dm/uclass-internal.h>
 #include <asm/fsp2/fsp_internal.h>
diff --git a/arch/x86/lib/fsp2/fsp_meminit.c b/arch/x86/lib/fsp2/fsp_meminit.c
index 84826bb683e..509483dcad3 100644
--- a/arch/x86/lib/fsp2/fsp_meminit.c
+++ b/arch/x86/lib/fsp2/fsp_meminit.c
@@ -11,6 +11,7 @@
 #include <bootstage.h>
 #include <dm.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/mrccache.h>
diff --git a/arch/x86/lib/fsp2/fsp_silicon_init.c b/arch/x86/lib/fsp2/fsp_silicon_init.c
index 7d83ae2a1cb..4ab49c5fe6f 100644
--- a/arch/x86/lib/fsp2/fsp_silicon_init.c
+++ b/arch/x86/lib/fsp2/fsp_silicon_init.c
@@ -13,6 +13,7 @@
 #include <bootstage.h>
 #include <dm.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/arch/fsp/fsp_configs.h>
 #include <asm/arch/fsp/fsp_s_upd.h>
 #include <asm/fsp/fsp_infoheader.h>
diff --git a/arch/x86/lib/fsp2/fsp_support.c b/arch/x86/lib/fsp2/fsp_support.c
index b962487418b..f597f752213 100644
--- a/arch/x86/lib/fsp2/fsp_support.c
+++ b/arch/x86/lib/fsp2/fsp_support.c
@@ -12,6 +12,7 @@
 #include <asm/fsp2/fsp_internal.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 /* The amount of the FSP header to probe to obtain what we need */
diff --git a/arch/x86/lib/i8259.c b/arch/x86/lib/i8259.c
index a0e3c092573..c002d103aef 100644
--- a/arch/x86/lib/i8259.c
+++ b/arch/x86/lib/i8259.c
@@ -15,6 +15,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <asm/i8259.h>
 #include <asm/ibmpc.h>
diff --git a/arch/x86/lib/init_helpers.c b/arch/x86/lib/init_helpers.c
index cf2b7651e8d..a9c4519b3f2 100644
--- a/arch/x86/lib/init_helpers.c
+++ b/arch/x86/lib/init_helpers.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
diff --git a/arch/x86/lib/mpspec.c b/arch/x86/lib/mpspec.c
index bda9b7f1a11..17568a03d5c 100644
--- a/arch/x86/lib/mpspec.c
+++ b/arch/x86/lib/mpspec.c
@@ -20,6 +20,7 @@
 #include <asm/tables.h>
 #include <dm/uclass-internal.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/x86/lib/mrccache.c b/arch/x86/lib/mrccache.c
index 0488a261c65..63aace5d4fb 100644
--- a/arch/x86/lib/mrccache.c
+++ b/arch/x86/lib/mrccache.c
@@ -21,6 +21,7 @@
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/x86/lib/physmem.c b/arch/x86/lib/physmem.c
index 1589a887350..71039589dfd 100644
--- a/arch/x86/lib/physmem.c
+++ b/arch/x86/lib/physmem.c
@@ -14,6 +14,7 @@
 #include <asm/cpu.h>
 #include <asm/global_data.h>
 #include <linux/compiler.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/x86/lib/pinctrl_ich6.c b/arch/x86/lib/pinctrl_ich6.c
index 82de4cbdc43..53228cd2848 100644
--- a/arch/x86/lib/pinctrl_ich6.c
+++ b/arch/x86/lib/pinctrl_ich6.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <pch.h>
 #include <pci.h>
+#include <stdbool.h>
 #include <asm/cpu.h>
 #include <asm/global_data.h>
 #include <asm/gpio.h>
diff --git a/arch/x86/lib/pirq_routing.c b/arch/x86/lib/pirq_routing.c
index d99a90fb826..3b5ee3837f8 100644
--- a/arch/x86/lib/pirq_routing.c
+++ b/arch/x86/lib/pirq_routing.c
@@ -12,6 +12,7 @@
 #include <asm/global_data.h>
 #include <asm/pci.h>
 #include <asm/pirq_routing.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/x86/lib/pmu.c b/arch/x86/lib/pmu.c
index 8f2649d9829..314d9f0ecee 100644
--- a/arch/x86/lib/pmu.c
+++ b/arch/x86/lib/pmu.c
@@ -5,6 +5,7 @@
 #include <common.h>
 #include <dm.h>
 #include <regmap.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <syscon.h>
 #include <asm/cpu.h>
diff --git a/arch/x86/lib/sfi.c b/arch/x86/lib/sfi.c
index 13029fc08cb..b85a1b17e84 100644
--- a/arch/x86/lib/sfi.c
+++ b/arch/x86/lib/sfi.c
@@ -21,6 +21,7 @@
 #include <asm/tables.h>
 #include <dm/uclass-internal.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 struct table_info {
diff --git a/arch/x86/lib/tables.c b/arch/x86/lib/tables.c
index 6c1464f4fa4..6fd0ded397d 100644
--- a/arch/x86/lib/tables.c
+++ b/arch/x86/lib/tables.c
@@ -14,6 +14,7 @@
 #include <asm/mpspec.h>
 #include <asm/tables.h>
 #include <asm/coreboot_tables.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 /**
diff --git a/arch/x86/lib/zimage.c b/arch/x86/lib/zimage.c
index a13eb78e222..5e413200268 100644
--- a/arch/x86/lib/zimage.c
+++ b/arch/x86/lib/zimage.c
@@ -31,6 +31,7 @@
 #endif
 #include <linux/compiler.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <linux/string.h>
 
diff --git a/board/AndesTech/ax25-ae350/ax25-ae350.c b/board/AndesTech/ax25-ae350/ax25-ae350.c
index 4e546adfc68..b75e968ee1d 100644
--- a/board/AndesTech/ax25-ae350/ax25-ae350.c
+++ b/board/AndesTech/ax25-ae350/ax25-ae350.c
@@ -20,6 +20,7 @@
 #include <fdtdec.h>
 #include <dm.h>
 #include <spl.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/Arcturus/ucp1020/law.c b/board/Arcturus/ucp1020/law.c
index 0dfb8ebc849..021eb0005d8 100644
--- a/board/Arcturus/ucp1020/law.c
+++ b/board/Arcturus/ucp1020/law.c
@@ -11,6 +11,7 @@
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 struct law_entry law_table[] = {
 #ifdef CONFIG_VSC7385_ENET
diff --git a/board/Arcturus/ucp1020/tlb.c b/board/Arcturus/ucp1020/tlb.c
index fc8bcea302b..bc0467bdb25 100644
--- a/board/Arcturus/ucp1020/tlb.c
+++ b/board/Arcturus/ucp1020/tlb.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <asm/mmu.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/CZ.NIC/turris_mox/turris_mox.c b/board/CZ.NIC/turris_mox/turris_mox.c
index 9429806b673..0c7926b5624 100644
--- a/board/CZ.NIC/turris_mox/turris_mox.c
+++ b/board/CZ.NIC/turris_mox/turris_mox.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <stdarg.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/arch/cpu.h>
diff --git a/board/CZ.NIC/turris_omnia/turris_omnia.c b/board/CZ.NIC/turris_omnia/turris_omnia.c
index b1f6cf67d43..9e3013d2615 100644
--- a/board/CZ.NIC/turris_omnia/turris_omnia.c
+++ b/board/CZ.NIC/turris_omnia/turris_omnia.c
@@ -26,6 +26,7 @@
 #include <time.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
 # include <atsha204a-i2c.h>
diff --git a/board/CarMediaLab/flea3/flea3.c b/board/CarMediaLab/flea3/flea3.c
index a0322219d43..1be57c844c8 100644
--- a/board/CarMediaLab/flea3/flea3.c
+++ b/board/CarMediaLab/flea3/flea3.c
@@ -20,6 +20,7 @@
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/iomux-mx35.h>
 #include <i2c.h>
+#include <linux/kernel.h>
 #include <linux/types.h>
 #include <asm/gpio.h>
 #include <asm/arch/sys_proto.h>
diff --git a/board/LaCie/net2big_v2/net2big_v2.c b/board/LaCie/net2big_v2/net2big_v2.c
index 5ad887217c1..fb1128bb61d 100644
--- a/board/LaCie/net2big_v2/net2big_v2.c
+++ b/board/LaCie/net2big_v2/net2big_v2.c
@@ -22,6 +22,7 @@
 #include <asm/arch/mpp.h>
 #include <asm/arch/gpio.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 #include "net2big_v2.h"
 #include "../common/common.h"
diff --git a/board/Marvell/db-88f6820-amc/db-88f6820-amc.c b/board/Marvell/db-88f6820-amc/db-88f6820-amc.c
index 62f59ecb728..0fa0820d7be 100644
--- a/board/Marvell/db-88f6820-amc/db-88f6820-amc.c
+++ b/board/Marvell/db-88f6820-amc/db-88f6820-amc.c
@@ -16,6 +16,7 @@
 #include <asm/arch/soc.h>
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 
 #include "../drivers/ddr/marvell/a38x/ddr3_init.h"
 #include <../serdes/a38x/high_speed_env_spec.h>
diff --git a/board/Marvell/db-88f6820-gp/db-88f6820-gp.c b/board/Marvell/db-88f6820-gp/db-88f6820-gp.c
index 8fbf78e6d8b..b18ac9c2d0b 100644
--- a/board/Marvell/db-88f6820-gp/db-88f6820-gp.c
+++ b/board/Marvell/db-88f6820-gp/db-88f6820-gp.c
@@ -16,6 +16,7 @@
 #include <asm/arch/soc.h>
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 
 #include "../drivers/ddr/marvell/a38x/ddr3_init.h"
 #include <../serdes/a38x/high_speed_env_spec.h>
diff --git a/board/Synology/ds414/ds414.c b/board/Synology/ds414/ds414.c
index b818c08838f..b2e9bc4ae39 100644
--- a/board/Synology/ds414/ds414.c
+++ b/board/Synology/ds414/ds414.c
@@ -14,6 +14,7 @@
 #include <asm/arch/soc.h>
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 #include <linux/mbus.h>
 
 #include "../drivers/ddr/marvell/axp/ddr3_hw_training.h"
diff --git a/board/advantech/dms-ba16/dms-ba16.c b/board/advantech/dms-ba16/dms-ba16.c
index b59f42c6daf..42bfa740f1b 100644
--- a/board/advantech/dms-ba16/dms-ba16.c
+++ b/board/advantech/dms-ba16/dms-ba16.c
@@ -32,6 +32,7 @@
 #include <i2c.h>
 #include <input.h>
 #include <pwm.h>
+#include <linux/kernel.h>
 DECLARE_GLOBAL_DATA_PTR;
 
 #define NC_PAD_CTRL (PAD_CTL_PUS_100K_UP |	\
diff --git a/board/advantech/imx8qm_rom7720_a1/imx8qm_rom7720_a1.c b/board/advantech/imx8qm_rom7720_a1/imx8qm_rom7720_a1.c
index a87a8dc07f6..3394126b7ae 100644
--- a/board/advantech/imx8qm_rom7720_a1/imx8qm_rom7720_a1.c
+++ b/board/advantech/imx8qm_rom7720_a1/imx8qm_rom7720_a1.c
@@ -13,6 +13,7 @@
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
diff --git a/board/advantech/imx8qm_rom7720_a1/spl.c b/board/advantech/imx8qm_rom7720_a1/spl.c
index 4d2f692b294..8776a94ff07 100644
--- a/board/advantech/imx8qm_rom7720_a1/spl.c
+++ b/board/advantech/imx8qm_rom7720_a1/spl.c
@@ -12,6 +12,7 @@
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include <asm/io.h>
diff --git a/board/alliedtelesis/x530/x530.c b/board/alliedtelesis/x530/x530.c
index 25d2aede99f..112dbd0bea5 100644
--- a/board/alliedtelesis/x530/x530.c
+++ b/board/alliedtelesis/x530/x530.c
@@ -16,6 +16,7 @@
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/mbus.h>
 #include <linux/io.h>
 #include <asm/arch/cpu.h>
diff --git a/board/aristainetos/aristainetos.c b/board/aristainetos/aristainetos.c
index 25c78926b07..dcc8df0be14 100644
--- a/board/aristainetos/aristainetos.c
+++ b/board/aristainetos/aristainetos.c
@@ -37,6 +37,7 @@
 #include <miiphy.h>
 #include <lcd.h>
 #include <led.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/board/armadeus/apf27/apf27.c b/board/armadeus/apf27/apf27.c
index ed9069f8f12..67f0941a640 100644
--- a/board/armadeus/apf27/apf27.c
+++ b/board/armadeus/apf27/apf27.c
@@ -20,6 +20,7 @@
 #include <asm/arch/gpio.h>
 #include <asm/gpio.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <u-boot/crc.h>
 #include "apf27.h"
 #include "fpga.h"
diff --git a/board/armltd/vexpress/vexpress_tc2.c b/board/armltd/vexpress/vexpress_tc2.c
index f0bedda24a5..75f9d820349 100644
--- a/board/armltd/vexpress/vexpress_tc2.c
+++ b/board/armltd/vexpress/vexpress_tc2.c
@@ -6,6 +6,7 @@
  * TC2 specific code for Versatile Express.
  */
 
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/armv7.h>
 #include <asm/io.h>
diff --git a/board/avionic-design/common/tamonten-ng.c b/board/avionic-design/common/tamonten-ng.c
index 29bde60228f..1b509835d76 100644
--- a/board/avionic-design/common/tamonten-ng.c
+++ b/board/avionic-design/common/tamonten-ng.c
@@ -11,6 +11,7 @@
 #include <asm/arch/gp_padctrl.h>
 #include <asm/arch/gpio.h>
 #include <asm/gpio.h>
+#include <linux/kernel.h>
 #include "pinmux-config-tamonten-ng.h"
 #include <i2c.h>
 
diff --git a/board/bachmann/ot1200/ot1200.c b/board/bachmann/ot1200/ot1200.c
index ac9eba85180..47b592117d5 100644
--- a/board/bachmann/ot1200/ot1200.c
+++ b/board/bachmann/ot1200/ot1200.c
@@ -31,6 +31,7 @@
 #include <phy.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/barco/platinum/platinum.c b/board/barco/platinum/platinum.c
index b98c577fbba..03720a97d7d 100644
--- a/board/barco/platinum/platinum.c
+++ b/board/barco/platinum/platinum.c
@@ -24,6 +24,7 @@
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/mach-imx/boot_mode.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 #include "platinum.h"
 
diff --git a/board/barco/platinum/platinum_picon.c b/board/barco/platinum/platinum_picon.c
index 3fc29f9e08c..1eae9355bae 100644
--- a/board/barco/platinum/platinum_picon.c
+++ b/board/barco/platinum/platinum_picon.c
@@ -15,6 +15,7 @@
 #include <i2c.h>
 #include <miiphy.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 
 #include "platinum.h"
 
diff --git a/board/barco/platinum/platinum_titanium.c b/board/barco/platinum/platinum_titanium.c
index 9f7c93b4d54..b7d7c4e828b 100644
--- a/board/barco/platinum/platinum_titanium.c
+++ b/board/barco/platinum/platinum_titanium.c
@@ -13,6 +13,7 @@
 #include <miiphy.h>
 #include <micrel.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 
 #include "platinum.h"
 
diff --git a/board/barco/titanium/titanium.c b/board/barco/titanium/titanium.c
index 9cd88e2a72d..ae293ff42dc 100644
--- a/board/barco/titanium/titanium.c
+++ b/board/barco/titanium/titanium.c
@@ -26,6 +26,7 @@
 #include <netdev.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/beacon/imx8mm/spl.c b/board/beacon/imx8mm/spl.c
index e3e26769323..8ea6fe9d733 100644
--- a/board/beacon/imx8mm/spl.c
+++ b/board/beacon/imx8mm/spl.c
@@ -17,6 +17,7 @@
 #include <asm/arch/ddr.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include <dm/uclass.h>
diff --git a/board/beckhoff/mx53cx9020/mx53cx9020_video.c b/board/beckhoff/mx53cx9020/mx53cx9020_video.c
index bf472902562..3be2cd5f0ff 100644
--- a/board/beckhoff/mx53cx9020/mx53cx9020_video.c
+++ b/board/beckhoff/mx53cx9020/mx53cx9020_video.c
@@ -11,6 +11,7 @@
 #include <asm/arch/iomux-mx53.h>
 #include <asm/gpio.h>
 #include <asm/mach-imx/video.h>
+#include <linux/kernel.h>
 
 #define CX9020_DVI_PWD	IMX_GPIO_NR(6, 1)
 
diff --git a/board/bluegiga/apx4devkit/spl_boot.c b/board/bluegiga/apx4devkit/spl_boot.c
index e5d5c4637b0..d8ee1d0a63e 100644
--- a/board/bluegiga/apx4devkit/spl_boot.c
+++ b/board/bluegiga/apx4devkit/spl_boot.c
@@ -20,6 +20,7 @@
 #include <asm/arch/iomux-mx28.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/kernel.h>
 
 #define	MUX_CONFIG_SSP0	(MXS_PAD_3V3 | MXS_PAD_8MA | MXS_PAD_PULLUP)
 #define	MUX_CONFIG_GPMI	(MXS_PAD_3V3 | MXS_PAD_4MA | MXS_PAD_NOPULL)
diff --git a/board/boundary/nitrogen6x/nitrogen6x.c b/board/boundary/nitrogen6x/nitrogen6x.c
index 79ba375cd2b..c5a522aea25 100644
--- a/board/boundary/nitrogen6x/nitrogen6x.c
+++ b/board/boundary/nitrogen6x/nitrogen6x.c
@@ -38,6 +38,7 @@
 #include <i2c.h>
 #include <input.h>
 #include <netdev.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <usb/ehci-ci.h>
 
diff --git a/board/ccv/xpress/xpress.c b/board/ccv/xpress/xpress.c
index c7476ba197c..dfc71ba91be 100644
--- a/board/ccv/xpress/xpress.c
+++ b/board/ccv/xpress/xpress.c
@@ -30,6 +30,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <usb/ehci-ci.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/cei/cei-tk1-som/cei-tk1-som.c b/board/cei/cei-tk1-som/cei-tk1-som.c
index 95ee7bbfe29..c0b9a1e5db4 100644
--- a/board/cei/cei-tk1-som/cei-tk1-som.c
+++ b/board/cei/cei-tk1-som/cei-tk1-som.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <linux/kernel.h>
 #include <power/as3722.h>
 
 #include <asm/arch/gpio.h>
diff --git a/board/compulab/cl-som-imx7/mux.c b/board/compulab/cl-som-imx7/mux.c
index 18f16a48738..4f316fe8b1d 100644
--- a/board/compulab/cl-som-imx7/mux.c
+++ b/board/compulab/cl-som-imx7/mux.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/arch-mx7/mx7-pins.h>
+#include <linux/kernel.h>
 
 #define PADS_SET(pads_array)						       \
 void cl_som_imx7_##pads_array##_set(void)				       \
diff --git a/board/compulab/cm_fx6/cm_fx6.c b/board/compulab/cm_fx6/cm_fx6.c
index e39768378f9..b3862fcf3a7 100644
--- a/board/compulab/cm_fx6/cm_fx6.c
+++ b/board/compulab/cm_fx6/cm_fx6.c
@@ -40,6 +40,7 @@
 #include <jffs2/load_kernel.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "common.h"
 #include "../common/eeprom.h"
diff --git a/board/compulab/cm_fx6/spl.c b/board/compulab/cm_fx6/spl.c
index 0dab1cbd60a..a66e6016237 100644
--- a/board/compulab/cm_fx6/spl.c
+++ b/board/compulab/cm_fx6/spl.c
@@ -12,6 +12,7 @@
 #include <hang.h>
 #include <init.h>
 #include <spl.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
diff --git a/board/compulab/cm_t43/spl.c b/board/compulab/cm_t43/spl.c
index 016c63a509a..14a37b0f568 100644
--- a/board/compulab/cm_t43/spl.c
+++ b/board/compulab/cm_t43/spl.c
@@ -11,6 +11,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/ddr_defs.h>
 #include <asm/gpio.h>
+#include <linux/kernel.h>
 #include <power/pmic.h>
 #include <power/tps65218.h>
 #include "board.h"
diff --git a/board/compulab/common/omap3_display.c b/board/compulab/common/omap3_display.c
index 4b580b70fbe..61641aa8375 100644
--- a/board/compulab/common/omap3_display.c
+++ b/board/compulab/common/omap3_display.c
@@ -18,6 +18,7 @@
 #include <lcd.h>
 #include <scf0403_lcd.h>
 #include <asm/arch-omap3/dss.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 enum display_type {
diff --git a/board/congatec/cgtqmx6eval/cgtqmx6eval.c b/board/congatec/cgtqmx6eval/cgtqmx6eval.c
index c857a73df74..6b37c27fabc 100644
--- a/board/congatec/cgtqmx6eval/cgtqmx6eval.c
+++ b/board/congatec/cgtqmx6eval/cgtqmx6eval.c
@@ -32,6 +32,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <power/pmic.h>
 #include <power/pfuze100_pmic.h>
diff --git a/board/corscience/tricorder/tricorder-eeprom.c b/board/corscience/tricorder/tricorder-eeprom.c
index 1a878397007..e239eeea145 100644
--- a/board/corscience/tricorder/tricorder-eeprom.c
+++ b/board/corscience/tricorder/tricorder-eeprom.c
@@ -11,6 +11,7 @@
 #include <i2c.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
 
diff --git a/board/creative/xfi3/spl_boot.c b/board/creative/xfi3/spl_boot.c
index 64a13cef305..dd31156e445 100644
--- a/board/creative/xfi3/spl_boot.c
+++ b/board/creative/xfi3/spl_boot.c
@@ -11,6 +11,7 @@
 #include <asm/arch/iomux-mx23.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #define	MUX_CONFIG_EMI	(MXS_PAD_1V8 | MXS_PAD_12MA | MXS_PAD_PULLUP)
diff --git a/board/creative/xfi3/xfi3.c b/board/creative/xfi3/xfi3.c
index 3e7f7e6e173..825a613aee4 100644
--- a/board/creative/xfi3/xfi3.c
+++ b/board/creative/xfi3/xfi3.c
@@ -23,6 +23,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/davinci/da8xxevm/da850evm.c b/board/davinci/da8xxevm/da850evm.c
index 14f8f4d89a2..8cc118cde5a 100644
--- a/board/davinci/da8xxevm/da850evm.c
+++ b/board/davinci/da8xxevm/da850evm.c
@@ -30,6 +30,7 @@
 #include <hwconfig.h>
 #include <asm/mach-types.h>
 #include <asm/gpio.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #ifdef CONFIG_MMC_DAVINCI
diff --git a/board/davinci/da8xxevm/omapl138_lcdk.c b/board/davinci/da8xxevm/omapl138_lcdk.c
index 3694a034b73..30182d02805 100644
--- a/board/davinci/da8xxevm/omapl138_lcdk.c
+++ b/board/davinci/da8xxevm/omapl138_lcdk.c
@@ -29,6 +29,7 @@
 #include <mmc.h>
 #include <asm/arch/sdmmc_defs.h>
 #endif
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/dhelectronics/dh_stm32mp1/board.c b/board/dhelectronics/dh_stm32mp1/board.c
index 40a91da0df2..17dfb85bfd9 100644
--- a/board/dhelectronics/dh_stm32mp1/board.c
+++ b/board/dhelectronics/dh_stm32mp1/board.c
@@ -39,6 +39,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include <power/regulator.h>
diff --git a/board/ea/mx7ulp_com/mx7ulp_com.c b/board/ea/mx7ulp_com/mx7ulp_com.c
index 0aa2be80e00..7eb51d58f0c 100644
--- a/board/ea/mx7ulp_com/mx7ulp_com.c
+++ b/board/ea/mx7ulp_com/mx7ulp_com.c
@@ -12,6 +12,7 @@
 #include <asm/arch/iomux.h>
 #include <asm/gpio.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/el/el6x/el6x.c b/board/el/el6x/el6x.c
index 8272e1459d2..952ec9dae10 100644
--- a/board/el/el6x/el6x.c
+++ b/board/el/el6x/el6x.c
@@ -33,6 +33,7 @@
 #include <asm/arch/sys_proto.h>
 #include <i2c.h>
 #include <input.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <power/pmic.h>
 #include <power/pfuze100_pmic.h>
diff --git a/board/embest/mx6boards/mx6boards.c b/board/embest/mx6boards/mx6boards.c
index 6bd0b10a9e1..b6d29adc5f4 100644
--- a/board/embest/mx6boards/mx6boards.c
+++ b/board/embest/mx6boards/mx6boards.c
@@ -42,6 +42,7 @@
 #include <linux/fb.h>
 #include <ipu_pixfmt.h>
 #include <asm/io.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/engicam/imx6q/imx6q.c b/board/engicam/imx6q/imx6q.c
index e6c888fcfde..3405c7a09e4 100644
--- a/board/engicam/imx6q/imx6q.c
+++ b/board/engicam/imx6q/imx6q.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <linux/kernel.h>
 
 #include <asm/io.h>
 #include <asm/gpio.h>
diff --git a/board/firefly/roc-pc-rk3399/roc-pc-rk3399.c b/board/firefly/roc-pc-rk3399/roc-pc-rk3399.c
index 7029bf7bf86..e0d90f5f0e6 100644
--- a/board/firefly/roc-pc-rk3399/roc-pc-rk3399.c
+++ b/board/firefly/roc-pc-rk3399/roc-pc-rk3399.c
@@ -8,6 +8,7 @@
 #include <env.h>
 #include <log.h>
 #include <spl_gpio.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <linux/string.h>
 #include <power/regulator.h>
diff --git a/board/freescale/common/arm_sleep.c b/board/freescale/common/arm_sleep.c
index 733940860f5..ddcab9f9eef 100644
--- a/board/freescale/common/arm_sleep.c
+++ b/board/freescale/common/arm_sleep.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #ifndef CONFIG_ARMV7_NONSEC
diff --git a/board/freescale/common/ics307_clk.c b/board/freescale/common/ics307_clk.c
index 2143395781a..7a74239fb3a 100644
--- a/board/freescale/common/ics307_clk.c
+++ b/board/freescale/common/ics307_clk.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <log.h>
 #include <asm/io.h>
+#include <linux/kernel.h>
 
 #include "ics307_clk.h"
 
diff --git a/board/freescale/common/mpc85xx_sleep.c b/board/freescale/common/mpc85xx_sleep.c
index d2bb173c183..bfaf8eb2d6f 100644
--- a/board/freescale/common/mpc85xx_sleep.c
+++ b/board/freescale/common/mpc85xx_sleep.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 #include <asm/immap_85xx.h>
 #include "sleep.h"
diff --git a/board/freescale/common/ns_access.c b/board/freescale/common/ns_access.c
index ee8ed616cb5..64eeb1159e7 100644
--- a/board/freescale/common/ns_access.c
+++ b/board/freescale/common/ns_access.c
@@ -10,6 +10,7 @@
 #include <fsl_csu.h>
 #include <asm/arch/ns_access.h>
 #include <asm/arch/fsl_serdes.h>
+#include <linux/kernel.h>
 
 #ifdef CONFIG_ARCH_LS1021A
 static struct csu_ns_dev ns_dev[] = {
diff --git a/board/freescale/common/p_corenet/law.c b/board/freescale/common/p_corenet/law.c
index f70ed76386f..b161049c3f6 100644
--- a/board/freescale/common/p_corenet/law.c
+++ b/board/freescale/common/p_corenet/law.c
@@ -10,6 +10,7 @@
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 struct law_entry law_table[] = {
 	SET_LAW(CONFIG_SYS_FLASH_BASE_PHYS, LAW_SIZE_256M, LAW_TRGT_IF_LBC),
diff --git a/board/freescale/common/p_corenet/tlb.c b/board/freescale/common/p_corenet/tlb.c
index 6f8d8354e87..addc31060c7 100644
--- a/board/freescale/common/p_corenet/tlb.c
+++ b/board/freescale/common/p_corenet/tlb.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <asm/mmu.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/freescale/common/qixis.c b/board/freescale/common/qixis.c
index e1716676a4a..ee42a53dae1 100644
--- a/board/freescale/common/qixis.c
+++ b/board/freescale/common/qixis.c
@@ -12,6 +12,7 @@
 #include <stdio.h>
 #include <asm/io.h>
 #include <linux/compiler.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/time.h>
 #include <i2c.h>
diff --git a/board/freescale/common/sleep.h b/board/freescale/common/sleep.h
index 1450baa0725..276b06101dd 100644
--- a/board/freescale/common/sleep.h
+++ b/board/freescale/common/sleep.h
@@ -6,6 +6,7 @@
 #ifndef __SLEEP_H
 #define __SLEEP_H
 
+#include <stdbool.h>
 #define DCFG_CCSR_CRSTSR_WDRFR	(1 << 3)
 #define DDR_BUFF_LEN			128
 
diff --git a/board/freescale/common/sys_eeprom.c b/board/freescale/common/sys_eeprom.c
index 5f07d28e8ec..f04bec05a41 100644
--- a/board/freescale/common/sys_eeprom.c
+++ b/board/freescale/common/sys_eeprom.c
@@ -15,6 +15,7 @@
 #include <vsprintf.h>
 #include <linux/ctype.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
 
diff --git a/board/freescale/common/vid.c b/board/freescale/common/vid.c
index 16c17ac3e25..ebcb26b574c 100644
--- a/board/freescale/common/vid.c
+++ b/board/freescale/common/vid.c
@@ -21,6 +21,7 @@
 #endif
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include "vid.h"
 
 int __weak i2c_multiplexer_select_vid_channel(u8 channel)
diff --git a/board/freescale/imx8mm_evk/spl.c b/board/freescale/imx8mm_evk/spl.c
index 2f5f4ab7bba..a27d99820d0 100644
--- a/board/freescale/imx8mm_evk/spl.c
+++ b/board/freescale/imx8mm_evk/spl.c
@@ -22,6 +22,7 @@
 #include <asm/arch/ddr.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include <dm/uclass.h>
diff --git a/board/freescale/imx8mn_evk/spl.c b/board/freescale/imx8mn_evk/spl.c
index 2eb2c20071e..67523c404c6 100644
--- a/board/freescale/imx8mn_evk/spl.c
+++ b/board/freescale/imx8mn_evk/spl.c
@@ -22,6 +22,7 @@
 #include <asm/mach-imx/boot_mode.h>
 #include <asm/arch/ddr.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include <dm/uclass.h>
diff --git a/board/freescale/imx8mp_evk/imx8mp_evk.c b/board/freescale/imx8mp_evk/imx8mp_evk.c
index 4f16a14cd8e..3d6595c1ab7 100644
--- a/board/freescale/imx8mp_evk/imx8mp_evk.c
+++ b/board/freescale/imx8mp_evk/imx8mp_evk.c
@@ -14,6 +14,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/mach-imx/gpio.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/imx8mq_evk/imx8mq_evk.c b/board/freescale/imx8mq_evk/imx8mq_evk.c
index 18f0b7f3d3b..4e4d917e09d 100644
--- a/board/freescale/imx8mq_evk/imx8mq_evk.c
+++ b/board/freescale/imx8mq_evk/imx8mq_evk.c
@@ -24,6 +24,7 @@
 #include <spl.h>
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 #include <power/pmic.h>
 #include <power/pfuze100_pmic.h>
 #include "../common/pfuze.h"
diff --git a/board/freescale/imx8mq_evk/spl.c b/board/freescale/imx8mq_evk/spl.c
index 6a37467314c..ccb8f44f115 100644
--- a/board/freescale/imx8mq_evk/spl.c
+++ b/board/freescale/imx8mq_evk/spl.c
@@ -27,6 +27,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <power/pmic.h>
 #include <power/pfuze100_pmic.h>
diff --git a/board/freescale/imx8qm_mek/imx8qm_mek.c b/board/freescale/imx8qm_mek/imx8qm_mek.c
index 4f0b0467da0..3aa6c2d7a23 100644
--- a/board/freescale/imx8qm_mek/imx8qm_mek.c
+++ b/board/freescale/imx8qm_mek/imx8qm_mek.c
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <asm/io.h>
diff --git a/board/freescale/imx8qxp_mek/imx8qxp_mek.c b/board/freescale/imx8qxp_mek/imx8qxp_mek.c
index 9b70813281b..f0220b13100 100644
--- a/board/freescale/imx8qxp_mek/imx8qxp_mek.c
+++ b/board/freescale/imx8qxp_mek/imx8qxp_mek.c
@@ -12,6 +12,7 @@
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <fsl_esdhc_imx.h>
 #include <fdt_support.h>
diff --git a/board/freescale/imx8qxp_mek/spl.c b/board/freescale/imx8qxp_mek/spl.c
index e43393d323b..1cc32eade56 100644
--- a/board/freescale/imx8qxp_mek/spl.c
+++ b/board/freescale/imx8qxp_mek/spl.c
@@ -24,6 +24,7 @@
 #include <asm/arch/imx8-pins.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/ls1012ardb/ls1012ardb.c b/board/freescale/ls1012ardb/ls1012ardb.c
index 1ca23aef0eb..8cc986ab01a 100644
--- a/board/freescale/ls1012ardb/ls1012ardb.c
+++ b/board/freescale/ls1012ardb/ls1012ardb.c
@@ -8,6 +8,7 @@
 #include <fdt_support.h>
 #include <hang.h>
 #include <i2c.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/cache.h>
 #include <init.h>
diff --git a/board/freescale/ls1021aiot/ls1021aiot.c b/board/freescale/ls1021aiot/ls1021aiot.c
index 09ef96e6bb4..66c701e1e35 100644
--- a/board/freescale/ls1021aiot/ls1021aiot.c
+++ b/board/freescale/ls1021aiot/ls1021aiot.c
@@ -16,6 +16,7 @@
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include <asm/arch/ls102xa_devdis.h>
diff --git a/board/freescale/ls1021aqds/ls1021aqds.c b/board/freescale/ls1021aqds/ls1021aqds.c
index 1b7dcf2d33d..c13ec412700 100644
--- a/board/freescale/ls1021aqds/ls1021aqds.c
+++ b/board/freescale/ls1021aqds/ls1021aqds.c
@@ -27,6 +27,7 @@
 #include <fsl_validate.h>
 #include <fsl_ddr.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "../common/sleep.h"
 #include "../common/qixis.h"
diff --git a/board/freescale/ls1021atsn/ls1021atsn.c b/board/freescale/ls1021atsn/ls1021atsn.c
index 16d9df1b704..4ad4f1eb07a 100644
--- a/board/freescale/ls1021atsn/ls1021atsn.c
+++ b/board/freescale/ls1021atsn/ls1021atsn.c
@@ -14,6 +14,7 @@
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "../common/sleep.h"
 #include <fsl_validate.h>
diff --git a/board/freescale/ls1021atwr/ls1021atwr.c b/board/freescale/ls1021atwr/ls1021atwr.c
index cf9c171889e..8c21393a6e5 100644
--- a/board/freescale/ls1021atwr/ls1021atwr.c
+++ b/board/freescale/ls1021atwr/ls1021atwr.c
@@ -32,6 +32,7 @@
 #include <spl.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "../common/sleep.h"
 #ifdef CONFIG_U_QE
diff --git a/board/freescale/ls1043aqds/ls1043aqds.c b/board/freescale/ls1043aqds/ls1043aqds.c
index 183fdcf12c3..6b377d0d997 100644
--- a/board/freescale/ls1043aqds/ls1043aqds.c
+++ b/board/freescale/ls1043aqds/ls1043aqds.c
@@ -10,6 +10,7 @@
 #include <fsl_ddr_sdram.h>
 #include <init.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/board/freescale/ls1046aqds/ls1046aqds.c b/board/freescale/ls1046aqds/ls1046aqds.c
index 52266a59436..1d06c3038a6 100644
--- a/board/freescale/ls1046aqds/ls1046aqds.c
+++ b/board/freescale/ls1046aqds/ls1046aqds.c
@@ -9,6 +9,7 @@
 #include <fdt_support.h>
 #include <fsl_ddr_sdram.h>
 #include <init.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/board/freescale/ls1046ardb/cpld.c b/board/freescale/ls1046ardb/cpld.c
index 4182baa4975..1f6fcc116e5 100644
--- a/board/freescale/ls1046ardb/cpld.c
+++ b/board/freescale/ls1046ardb/cpld.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/io.h>
 #include <linux/string.h>
diff --git a/board/freescale/ls1046ardb/cpld.h b/board/freescale/ls1046ardb/cpld.h
index e87044f5c0d..765962c89ae 100644
--- a/board/freescale/ls1046ardb/cpld.h
+++ b/board/freescale/ls1046ardb/cpld.h
@@ -10,6 +10,7 @@
  * CPLD register set of LS1046ARDB board-specific.
  * CPLD Revision:  V2.1
  */
+#include <stdbool.h>
 struct cpld_data {
 	u8 cpld_ver;		/* 0x0 - CPLD Major Revision Register */
 	u8 cpld_ver_sub;	/* 0x1 - CPLD Minor Revision Register */
diff --git a/board/freescale/ls1046ardb/ls1046ardb.c b/board/freescale/ls1046ardb/ls1046ardb.c
index ad4caaa5044..d2f88ea9d06 100644
--- a/board/freescale/ls1046ardb/ls1046ardb.c
+++ b/board/freescale/ls1046ardb/ls1046ardb.c
@@ -7,6 +7,7 @@
 #include <i2c.h>
 #include <fdt_support.h>
 #include <init.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/board/freescale/ls1088a/eth_ls1088aqds.c b/board/freescale/ls1088a/eth_ls1088aqds.c
index d5a1752c055..fe0a890bb0c 100644
--- a/board/freescale/ls1088a/eth_ls1088aqds.c
+++ b/board/freescale/ls1088a/eth_ls1088aqds.c
@@ -24,6 +24,7 @@
 #include <fsl-mc/fsl_mc.h>
 #include <fsl-mc/ldpaa_wriop.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include "../common/qixis.h"
diff --git a/board/freescale/ls1088a/ls1088a.c b/board/freescale/ls1088a/ls1088a.c
index 8d33151cdad..b35266de231 100644
--- a/board/freescale/ls1088a/ls1088a.c
+++ b/board/freescale/ls1088a/ls1088a.c
@@ -20,6 +20,7 @@
 #include <fdt_support.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <fsl-mc/fsl_mc.h>
 #include <env_internal.h>
diff --git a/board/freescale/ls2080aqds/eth.c b/board/freescale/ls2080aqds/eth.c
index 7756620bdfd..167bd1475c9 100644
--- a/board/freescale/ls2080aqds/eth.c
+++ b/board/freescale/ls2080aqds/eth.c
@@ -22,6 +22,7 @@
 #include <fsl-mc/fsl_mc.h>
 #include <fsl-mc/ldpaa_wriop.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include "../common/qixis.h"
diff --git a/board/freescale/ls2080aqds/ls2080aqds.c b/board/freescale/ls2080aqds/ls2080aqds.c
index 39724dcbcba..8a44ea36003 100644
--- a/board/freescale/ls2080aqds/ls2080aqds.c
+++ b/board/freescale/ls2080aqds/ls2080aqds.c
@@ -16,6 +16,7 @@
 #include <asm/io.h>
 #include <fdt_support.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <fsl-mc/fsl_mc.h>
 #include <env_internal.h>
diff --git a/board/freescale/ls2080ardb/ls2080ardb.c b/board/freescale/ls2080ardb/ls2080ardb.c
index 3a154564f3f..a69f207c213 100644
--- a/board/freescale/ls2080ardb/ls2080ardb.c
+++ b/board/freescale/ls2080ardb/ls2080ardb.c
@@ -12,6 +12,7 @@
 #include <netdev.h>
 #include <fsl_ifc.h>
 #include <fsl_ddr.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/board/freescale/lx2160a/eth_lx2160aqds.c b/board/freescale/lx2160a/eth_lx2160aqds.c
index e592ca12927..74b31f9a877 100644
--- a/board/freescale/lx2160a/eth_lx2160aqds.c
+++ b/board/freescale/lx2160a/eth_lx2160aqds.c
@@ -26,6 +26,7 @@
 #include <asm/u-boot.h>
 #include <fsl-mc/fsl_mc.h>
 #include <fsl-mc/ldpaa_wriop.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <linux/string.h>
 
diff --git a/board/freescale/lx2160a/eth_lx2160ardb.c b/board/freescale/lx2160a/eth_lx2160ardb.c
index ea2c8c5647a..6c25108c8e3 100644
--- a/board/freescale/lx2160a/eth_lx2160ardb.c
+++ b/board/freescale/lx2160a/eth_lx2160ardb.c
@@ -14,6 +14,7 @@
 #include <miiphy.h>
 #include <phy.h>
 #include <fm_eth.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/board/freescale/lx2160a/lx2160a.c b/board/freescale/lx2160a/lx2160a.c
index 31308525641..55a7e9b6f0b 100644
--- a/board/freescale/lx2160a/lx2160a.c
+++ b/board/freescale/lx2160a/lx2160a.c
@@ -21,6 +21,7 @@
 #include <asm/io.h>
 #include <fdt_support.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <linux/delay.h>
 #include <fsl-mc/fsl_mc.h>
diff --git a/board/freescale/mpc8541cds/law.c b/board/freescale/mpc8541cds/law.c
index f4b7bde0a81..b2c98f0c44f 100644
--- a/board/freescale/mpc8541cds/law.c
+++ b/board/freescale/mpc8541cds/law.c
@@ -10,6 +10,7 @@
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 /*
  * LAW(Local Access Window) configuration:
diff --git a/board/freescale/mpc8541cds/tlb.c b/board/freescale/mpc8541cds/tlb.c
index ff596f988df..b8ef8232056 100644
--- a/board/freescale/mpc8541cds/tlb.c
+++ b/board/freescale/mpc8541cds/tlb.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <asm/mmu.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/freescale/mpc8544ds/law.c b/board/freescale/mpc8544ds/law.c
index 8e9c8b4d232..d6ac17af37d 100644
--- a/board/freescale/mpc8544ds/law.c
+++ b/board/freescale/mpc8544ds/law.c
@@ -10,6 +10,7 @@
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 struct law_entry law_table[] = {
 	SET_LAW(CONFIG_SYS_LBC_NONCACHE_BASE, LAW_SIZE_128M, LAW_TRGT_IF_LBC),
diff --git a/board/freescale/mpc8544ds/tlb.c b/board/freescale/mpc8544ds/tlb.c
index a07e6834918..a0cf9c5b17f 100644
--- a/board/freescale/mpc8544ds/tlb.c
+++ b/board/freescale/mpc8544ds/tlb.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <asm/mmu.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/freescale/mpc8548cds/law.c b/board/freescale/mpc8548cds/law.c
index 4c8bbed5c39..be00c66821b 100644
--- a/board/freescale/mpc8548cds/law.c
+++ b/board/freescale/mpc8548cds/law.c
@@ -10,6 +10,7 @@
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 struct law_entry law_table[] = {
 	/* LBC window - maps 256M */
diff --git a/board/freescale/mpc8548cds/tlb.c b/board/freescale/mpc8548cds/tlb.c
index b6869c33078..be08179fd6a 100644
--- a/board/freescale/mpc8548cds/tlb.c
+++ b/board/freescale/mpc8548cds/tlb.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <asm/mmu.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/freescale/mpc8555cds/law.c b/board/freescale/mpc8555cds/law.c
index f4b7bde0a81..b2c98f0c44f 100644
--- a/board/freescale/mpc8555cds/law.c
+++ b/board/freescale/mpc8555cds/law.c
@@ -10,6 +10,7 @@
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 /*
  * LAW(Local Access Window) configuration:
diff --git a/board/freescale/mpc8555cds/tlb.c b/board/freescale/mpc8555cds/tlb.c
index b0e0af9b697..f8410ac0dbc 100644
--- a/board/freescale/mpc8555cds/tlb.c
+++ b/board/freescale/mpc8555cds/tlb.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <asm/mmu.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/freescale/mpc8568mds/law.c b/board/freescale/mpc8568mds/law.c
index f315288611f..8482ef83451 100644
--- a/board/freescale/mpc8568mds/law.c
+++ b/board/freescale/mpc8568mds/law.c
@@ -10,6 +10,7 @@
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 /*
  * LAW(Local Access Window) configuration:
diff --git a/board/freescale/mpc8568mds/tlb.c b/board/freescale/mpc8568mds/tlb.c
index 98864e7716a..dff931cc09b 100644
--- a/board/freescale/mpc8568mds/tlb.c
+++ b/board/freescale/mpc8568mds/tlb.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <asm/mmu.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/freescale/mpc8569mds/law.c b/board/freescale/mpc8569mds/law.c
index 1f0bd1279ef..0a46b40ee0e 100644
--- a/board/freescale/mpc8569mds/law.c
+++ b/board/freescale/mpc8569mds/law.c
@@ -10,6 +10,7 @@
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 /*
  * LAW(Local Access Window) configuration:
diff --git a/board/freescale/mpc8569mds/tlb.c b/board/freescale/mpc8569mds/tlb.c
index 5bec3a1663b..c2fa4ae1821 100644
--- a/board/freescale/mpc8569mds/tlb.c
+++ b/board/freescale/mpc8569mds/tlb.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <asm/mmu.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/freescale/mpc8572ds/law.c b/board/freescale/mpc8572ds/law.c
index 7f9a2c3785a..add70fa0f86 100644
--- a/board/freescale/mpc8572ds/law.c
+++ b/board/freescale/mpc8572ds/law.c
@@ -10,6 +10,7 @@
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 struct law_entry law_table[] = {
 	SET_LAW(CONFIG_SYS_FLASH_BASE_PHYS, LAW_SIZE_256M, LAW_TRGT_IF_LBC),
diff --git a/board/freescale/mpc8572ds/tlb.c b/board/freescale/mpc8572ds/tlb.c
index 72f0aa572c1..60f95c1c060 100644
--- a/board/freescale/mpc8572ds/tlb.c
+++ b/board/freescale/mpc8572ds/tlb.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <asm/mmu.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/freescale/mpc8610hpcd/law.c b/board/freescale/mpc8610hpcd/law.c
index 7f9a58e7a79..b990910a857 100644
--- a/board/freescale/mpc8610hpcd/law.c
+++ b/board/freescale/mpc8610hpcd/law.c
@@ -10,6 +10,7 @@
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 struct law_entry law_table[] = {
 #if !defined(CONFIG_SPD_EEPROM)
diff --git a/board/freescale/mpc8641hpcn/law.c b/board/freescale/mpc8641hpcn/law.c
index 0e00138835e..0a1ca2e833b 100644
--- a/board/freescale/mpc8641hpcn/law.c
+++ b/board/freescale/mpc8641hpcn/law.c
@@ -10,6 +10,7 @@
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 /*
  * LAW(Local Access Window) configuration:
diff --git a/board/freescale/mx23evk/spl_boot.c b/board/freescale/mx23evk/spl_boot.c
index 14e9b4a8634..b7c67cc6883 100644
--- a/board/freescale/mx23evk/spl_boot.c
+++ b/board/freescale/mx23evk/spl_boot.c
@@ -12,6 +12,7 @@
 #include <asm/arch/iomux-mx23.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/kernel.h>
 
 #define	MUX_CONFIG_SSP1	(MXS_PAD_8MA | MXS_PAD_PULLUP)
 #define	MUX_CONFIG_EMI	(MXS_PAD_3V3 | MXS_PAD_12MA | MXS_PAD_PULLUP)
diff --git a/board/freescale/mx25pdk/mx25pdk.c b/board/freescale/mx25pdk/mx25pdk.c
index f20087328b3..1532003ba0a 100644
--- a/board/freescale/mx25pdk/mx25pdk.c
+++ b/board/freescale/mx25pdk/mx25pdk.c
@@ -20,6 +20,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <power/pmic.h>
 #include <fsl_pmic.h>
 #include <mc34704.h>
diff --git a/board/freescale/mx28evk/iomux.c b/board/freescale/mx28evk/iomux.c
index cc0c8588544..9a3f88abd36 100644
--- a/board/freescale/mx28evk/iomux.c
+++ b/board/freescale/mx28evk/iomux.c
@@ -12,6 +12,7 @@
 #include <asm/arch/iomux-mx28.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/kernel.h>
 
 #define	MUX_CONFIG_SSP0	(MXS_PAD_3V3 | MXS_PAD_8MA | MXS_PAD_PULLUP)
 #define	MUX_CONFIG_GPMI	(MXS_PAD_3V3 | MXS_PAD_4MA | MXS_PAD_NOPULL)
diff --git a/board/freescale/mx35pdk/mx35pdk.c b/board/freescale/mx35pdk/mx35pdk.c
index 940ada7b167..3ef1c781c16 100644
--- a/board/freescale/mx35pdk/mx35pdk.c
+++ b/board/freescale/mx35pdk/mx35pdk.c
@@ -19,6 +19,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/iomux-mx35.h>
 #include <i2c.h>
+#include <linux/kernel.h>
 #include <power/pmic.h>
 #include <fsl_pmic.h>
 #include <mmc.h>
diff --git a/board/freescale/mx51evk/mx51evk.c b/board/freescale/mx51evk/mx51evk.c
index 0a656179901..d096948d4d3 100644
--- a/board/freescale/mx51evk/mx51evk.c
+++ b/board/freescale/mx51evk/mx51evk.c
@@ -22,6 +22,7 @@
 #include <input.h>
 #include <mmc.h>
 #include <fsl_esdhc_imx.h>
+#include <linux/kernel.h>
 #include <power/pmic.h>
 #include <fsl_pmic.h>
 #include <mc13892.h>
diff --git a/board/freescale/mx53ard/mx53ard.c b/board/freescale/mx53ard/mx53ard.c
index cb4f063e95a..325f1763976 100644
--- a/board/freescale/mx53ard/mx53ard.c
+++ b/board/freescale/mx53ard/mx53ard.c
@@ -20,6 +20,7 @@
 #include <mmc.h>
 #include <fsl_esdhc_imx.h>
 #include <asm/gpio.h>
+#include <linux/kernel.h>
 
 #define ETHERNET_INT		IMX_GPIO_NR(2, 31)
 
diff --git a/board/freescale/mx53evk/mx53evk.c b/board/freescale/mx53evk/mx53evk.c
index 37a94605408..1e43ea9cece 100644
--- a/board/freescale/mx53evk/mx53evk.c
+++ b/board/freescale/mx53evk/mx53evk.c
@@ -20,6 +20,7 @@
 #include <i2c.h>
 #include <mmc.h>
 #include <fsl_esdhc_imx.h>
+#include <linux/kernel.h>
 #include <power/pmic.h>
 #include <fsl_pmic.h>
 #include <asm/gpio.h>
diff --git a/board/freescale/mx53loco/mx53loco.c b/board/freescale/mx53loco/mx53loco.c
index 67bb279104d..02c6f76d3ab 100644
--- a/board/freescale/mx53loco/mx53loco.c
+++ b/board/freescale/mx53loco/mx53loco.c
@@ -26,6 +26,7 @@
 #include <mmc.h>
 #include <fsl_esdhc_imx.h>
 #include <asm/gpio.h>
+#include <linux/kernel.h>
 #include <power/pmic.h>
 #include <dialog_pmic.h>
 #include <fsl_pmic.h>
diff --git a/board/freescale/mx53loco/mx53loco_video.c b/board/freescale/mx53loco/mx53loco_video.c
index 45a40a8959c..475dc3e934f 100644
--- a/board/freescale/mx53loco/mx53loco_video.c
+++ b/board/freescale/mx53loco/mx53loco_video.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <env.h>
 #include <stdio.h>
+#include <linux/kernel.h>
 #include <linux/list.h>
 #include <asm/gpio.h>
 #include <asm/arch/iomux-mx53.h>
diff --git a/board/freescale/mx53smd/mx53smd.c b/board/freescale/mx53smd/mx53smd.c
index 6a654934140..24807f62916 100644
--- a/board/freescale/mx53smd/mx53smd.c
+++ b/board/freescale/mx53smd/mx53smd.c
@@ -19,6 +19,7 @@
 #include <mmc.h>
 #include <fsl_esdhc_imx.h>
 #include <asm/gpio.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/mx6qarm2/mx6qarm2.c b/board/freescale/mx6qarm2/mx6qarm2.c
index bdc2e2a146b..d2f659d5732 100644
--- a/board/freescale/mx6qarm2/mx6qarm2.c
+++ b/board/freescale/mx6qarm2/mx6qarm2.c
@@ -21,6 +21,7 @@
 #include <miiphy.h>
 #include <netdev.h>
 #include <usb.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/mx6sabreauto/mx6sabreauto.c b/board/freescale/mx6sabreauto/mx6sabreauto.c
index 359f5bca17c..2944220a936 100644
--- a/board/freescale/mx6sabreauto/mx6sabreauto.c
+++ b/board/freescale/mx6sabreauto/mx6sabreauto.c
@@ -34,6 +34,7 @@
 #include <asm/mach-imx/video.h>
 #include <asm/arch/crm_regs.h>
 #include <pca953x.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <power/pmic.h>
 #include <power/pfuze100_pmic.h>
diff --git a/board/freescale/mx6sabresd/mx6sabresd.c b/board/freescale/mx6sabresd/mx6sabresd.c
index 01d6340c624..6f85ba27724 100644
--- a/board/freescale/mx6sabresd/mx6sabresd.c
+++ b/board/freescale/mx6sabresd/mx6sabresd.c
@@ -32,6 +32,7 @@
 #include <asm/arch/sys_proto.h>
 #include <i2c.h>
 #include <input.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <power/pmic.h>
 #include <power/pfuze100_pmic.h>
diff --git a/board/freescale/mx6slevk/mx6slevk.c b/board/freescale/mx6slevk/mx6slevk.c
index 9e7a81d4bb5..da48f7cd674 100644
--- a/board/freescale/mx6slevk/mx6slevk.c
+++ b/board/freescale/mx6slevk/mx6slevk.c
@@ -22,6 +22,7 @@
 #include <asm/io.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <common.h>
 #include <fsl_esdhc_imx.h>
diff --git a/board/freescale/mx6sllevk/mx6sllevk.c b/board/freescale/mx6sllevk/mx6sllevk.c
index 9dc0bdcbe7a..9a696e79929 100644
--- a/board/freescale/mx6sllevk/mx6sllevk.c
+++ b/board/freescale/mx6sllevk/mx6sllevk.c
@@ -19,6 +19,7 @@
 #include <common.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <mmc.h>
 #include <power/pmic.h>
diff --git a/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c b/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c
index aefc1ab2bd8..3e0e733bde3 100644
--- a/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c
+++ b/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c
@@ -22,6 +22,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <common.h>
 #include <fsl_esdhc_imx.h>
diff --git a/board/freescale/mx6sxsabresd/mx6sxsabresd.c b/board/freescale/mx6sxsabresd/mx6sxsabresd.c
index ad3461c6661..965a3808e73 100644
--- a/board/freescale/mx6sxsabresd/mx6sxsabresd.c
+++ b/board/freescale/mx6sxsabresd/mx6sxsabresd.c
@@ -23,6 +23,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <common.h>
 #include <fsl_esdhc_imx.h>
diff --git a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
index cb903798df5..044d1e97457 100644
--- a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
+++ b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
@@ -27,6 +27,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <mmc.h>
 #include <netdev.h>
diff --git a/board/freescale/mx6ullevk/mx6ullevk.c b/board/freescale/mx6ullevk/mx6ullevk.c
index 272348e2423..7f909aae05f 100644
--- a/board/freescale/mx6ullevk/mx6ullevk.c
+++ b/board/freescale/mx6ullevk/mx6ullevk.c
@@ -20,6 +20,7 @@
 #include <env.h>
 #include <fsl_esdhc_imx.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <mmc.h>
 #include <miiphy.h>
diff --git a/board/freescale/mx7dsabresd/mx7dsabresd.c b/board/freescale/mx7dsabresd/mx7dsabresd.c
index 5ebb142e0c7..6787b322db8 100644
--- a/board/freescale/mx7dsabresd/mx7dsabresd.c
+++ b/board/freescale/mx7dsabresd/mx7dsabresd.c
@@ -17,6 +17,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <common.h>
 #include <fsl_esdhc_imx.h>
diff --git a/board/freescale/mx7ulp_evk/mx7ulp_evk.c b/board/freescale/mx7ulp_evk/mx7ulp_evk.c
index da3f9e72d61..9cbb3542499 100644
--- a/board/freescale/mx7ulp_evk/mx7ulp_evk.c
+++ b/board/freescale/mx7ulp_evk/mx7ulp_evk.c
@@ -14,6 +14,7 @@
 #include <asm/arch/iomux.h>
 #include <asm/mach-imx/boot_mode.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/p1010rdb/law.c b/board/freescale/p1010rdb/law.c
index 756f0524da0..8adbe1d3591 100644
--- a/board/freescale/p1010rdb/law.c
+++ b/board/freescale/p1010rdb/law.c
@@ -7,6 +7,7 @@
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 struct law_entry law_table[] = {
 	SET_LAW(CONFIG_SYS_FLASH_BASE_PHYS, LAW_SIZE_32M, LAW_TRGT_IF_IFC),
diff --git a/board/freescale/p1010rdb/tlb.c b/board/freescale/p1010rdb/tlb.c
index 5357bc8e7b0..2081965aa1c 100644
--- a/board/freescale/p1010rdb/tlb.c
+++ b/board/freescale/p1010rdb/tlb.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <asm/mmu.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/freescale/p1023rdb/law.c b/board/freescale/p1023rdb/law.c
index 69238db8dde..7fc381c3480 100644
--- a/board/freescale/p1023rdb/law.c
+++ b/board/freescale/p1023rdb/law.c
@@ -7,6 +7,7 @@
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 struct law_entry law_table[] = {
 	SET_LAW(CONFIG_SYS_NAND_BASE_PHYS, LAW_SIZE_1M, LAW_TRGT_IF_LBC),
diff --git a/board/freescale/p1023rdb/tlb.c b/board/freescale/p1023rdb/tlb.c
index 4c0e668e99b..0dc5e6767dc 100644
--- a/board/freescale/p1023rdb/tlb.c
+++ b/board/freescale/p1023rdb/tlb.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <asm/mmu.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/freescale/p1_p2_rdb_pc/law.c b/board/freescale/p1_p2_rdb_pc/law.c
index 5aebabcc901..5f0744ee723 100644
--- a/board/freescale/p1_p2_rdb_pc/law.c
+++ b/board/freescale/p1_p2_rdb_pc/law.c
@@ -7,6 +7,7 @@
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 struct law_entry law_table[] = {
 	SET_LAW(CONFIG_SYS_CPLD_BASE_PHYS, LAW_SIZE_1M, LAW_TRGT_IF_LBC),
diff --git a/board/freescale/p1_p2_rdb_pc/tlb.c b/board/freescale/p1_p2_rdb_pc/tlb.c
index 1254ab4d306..0bd1e8d5323 100644
--- a/board/freescale/p1_p2_rdb_pc/tlb.c
+++ b/board/freescale/p1_p2_rdb_pc/tlb.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <asm/mmu.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/freescale/t102xrdb/law.c b/board/freescale/t102xrdb/law.c
index 0cb63f80797..20a73ccb932 100644
--- a/board/freescale/t102xrdb/law.c
+++ b/board/freescale/t102xrdb/law.c
@@ -7,6 +7,7 @@
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 struct law_entry law_table[] = {
 #ifdef CONFIG_MTD_NOR_FLASH
diff --git a/board/freescale/t102xrdb/tlb.c b/board/freescale/t102xrdb/tlb.c
index 57f5c50bc98..078b6fa0d0f 100644
--- a/board/freescale/t102xrdb/tlb.c
+++ b/board/freescale/t102xrdb/tlb.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <asm/mmu.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/freescale/t104xrdb/law.c b/board/freescale/t104xrdb/law.c
index 74f6d8a34e3..898f56b2873 100644
--- a/board/freescale/t104xrdb/law.c
+++ b/board/freescale/t104xrdb/law.c
@@ -7,6 +7,7 @@
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 struct law_entry law_table[] = {
 #ifdef CONFIG_MTD_NOR_FLASH
diff --git a/board/freescale/t104xrdb/tlb.c b/board/freescale/t104xrdb/tlb.c
index cbfbf117861..e095fbef4d4 100644
--- a/board/freescale/t104xrdb/tlb.c
+++ b/board/freescale/t104xrdb/tlb.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <asm/mmu.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/freescale/t208xqds/law.c b/board/freescale/t208xqds/law.c
index 646d6ca9b4e..a0c46ee1998 100644
--- a/board/freescale/t208xqds/law.c
+++ b/board/freescale/t208xqds/law.c
@@ -10,6 +10,7 @@
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 struct law_entry law_table[] = {
 	SET_LAW(CONFIG_SYS_FLASH_BASE_PHYS, LAW_SIZE_256M, LAW_TRGT_IF_IFC),
diff --git a/board/freescale/t208xqds/tlb.c b/board/freescale/t208xqds/tlb.c
index 713bcde4566..3a675b0c52d 100644
--- a/board/freescale/t208xqds/tlb.c
+++ b/board/freescale/t208xqds/tlb.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <asm/mmu.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/freescale/t208xrdb/law.c b/board/freescale/t208xrdb/law.c
index 62e51a145e2..3124419f887 100644
--- a/board/freescale/t208xrdb/law.c
+++ b/board/freescale/t208xrdb/law.c
@@ -10,6 +10,7 @@
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 struct law_entry law_table[] = {
 	SET_LAW(CONFIG_SYS_FLASH_BASE_PHYS, LAW_SIZE_256M, LAW_TRGT_IF_IFC),
diff --git a/board/freescale/t208xrdb/tlb.c b/board/freescale/t208xrdb/tlb.c
index 488261828df..29f3979c9e6 100644
--- a/board/freescale/t208xrdb/tlb.c
+++ b/board/freescale/t208xrdb/tlb.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <asm/mmu.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/freescale/t4rdb/law.c b/board/freescale/t4rdb/law.c
index 4c195d5b023..ef6ef9d0a77 100644
--- a/board/freescale/t4rdb/law.c
+++ b/board/freescale/t4rdb/law.c
@@ -7,6 +7,7 @@
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 struct law_entry law_table[] = {
 	SET_LAW(CONFIG_SYS_FLASH_BASE_PHYS, LAW_SIZE_256M, LAW_TRGT_IF_IFC),
diff --git a/board/freescale/t4rdb/tlb.c b/board/freescale/t4rdb/tlb.c
index 01e8e75825f..255bd058f0e 100644
--- a/board/freescale/t4rdb/tlb.c
+++ b/board/freescale/t4rdb/tlb.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <asm/mmu.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/freescale/vf610twr/vf610twr.c b/board/freescale/vf610twr/vf610twr.c
index 342feb42d17..3970f4b87a1 100644
--- a/board/freescale/vf610twr/vf610twr.c
+++ b/board/freescale/vf610twr/vf610twr.c
@@ -19,6 +19,7 @@
 #include <netdev.h>
 #include <i2c.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/friendlyarm/nanopi2/board.c b/board/friendlyarm/nanopi2/board.c
index c0fe2d546f6..c9c9beb86c7 100644
--- a/board/friendlyarm/nanopi2/board.c
+++ b/board/friendlyarm/nanopi2/board.c
@@ -14,6 +14,7 @@
 #endif
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <linux/kernel.h>
 
 #include <asm/arch/nexell.h>
 #include <asm/arch/nx_gpio.h>
diff --git a/board/friendlyarm/nanopi2/lcds.c b/board/friendlyarm/nanopi2/lcds.c
index 7303e53af92..5bec0684ad6 100644
--- a/board/friendlyarm/nanopi2/lcds.c
+++ b/board/friendlyarm/nanopi2/lcds.c
@@ -9,6 +9,7 @@
 #include <fdtdec.h>
 #include <fdt_support.h>
 #include <asm/io.h>
+#include <linux/kernel.h>
 
 #include <asm/arch/nexell.h>
 #include <asm/arch/display.h>
diff --git a/board/gardena/smart-gateway-mt7688/board.c b/board/gardena/smart-gateway-mt7688/board.c
index 2e446f86753..75677b11dd2 100644
--- a/board/gardena/smart-gateway-mt7688/board.c
+++ b/board/gardena/smart-gateway-mt7688/board.c
@@ -15,6 +15,7 @@
 #include <net.h>
 #include <spi.h>
 #include <spi_flash.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/delay.h>
diff --git a/board/gateworks/gw_ventana/common.c b/board/gateworks/gw_ventana/common.c
index 299f92f6826..8e3c3e1ad7a 100644
--- a/board/gateworks/gw_ventana/common.c
+++ b/board/gateworks/gw_ventana/common.c
@@ -19,6 +19,7 @@
 #include <hwconfig.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <power/pmic.h>
 #include <power/ltc3676_pmic.h>
 #include <power/pfuze100_pmic.h>
diff --git a/board/gateworks/gw_ventana/gw_ventana.c b/board/gateworks/gw_ventana/gw_ventana.c
index 800d9e76d38..fe6a7efe3e3 100644
--- a/board/gateworks/gw_ventana/gw_ventana.c
+++ b/board/gateworks/gw_ventana/gw_ventana.c
@@ -41,6 +41,7 @@
 #include <pci.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <linux/string.h>
 #include <power/pmic.h>
diff --git a/board/gdsys/a38x/controlcenterdc.c b/board/gdsys/a38x/controlcenterdc.c
index d7cc7e3d308..241a36f7a59 100644
--- a/board/gdsys/a38x/controlcenterdc.c
+++ b/board/gdsys/a38x/controlcenterdc.c
@@ -19,6 +19,7 @@
 #include <asm-generic/gpio.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 
 #include "../drivers/ddr/marvell/a38x/ddr3_init.h"
 #include "../arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec.h"
diff --git a/board/gdsys/a38x/dt_helpers.c b/board/gdsys/a38x/dt_helpers.c
index c859024a28b..23525b7ed52 100644
--- a/board/gdsys/a38x/dt_helpers.c
+++ b/board/gdsys/a38x/dt_helpers.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <i2c.h>
 #include <fdt_support.h>
+#include <stdbool.h>
 #include <asm-generic/gpio.h>
 #include <dm.h>
 
diff --git a/board/gdsys/a38x/dt_helpers.h b/board/gdsys/a38x/dt_helpers.h
index 245fadd0d79..30dbf298b69 100644
--- a/board/gdsys/a38x/dt_helpers.h
+++ b/board/gdsys/a38x/dt_helpers.h
@@ -7,6 +7,7 @@
 #ifndef __DT_HELPERS_H
 #define __DT_HELPERS_H
 
+#include <stdbool.h>
 int fdt_disable_by_ofname(void *rw_fdt_blob, char *ofname);
 bool dm_i2c_simple_probe(struct udevice *bus, uint chip_addr);
 int request_gpio_by_name(struct gpio_desc *gpio, const char *gpio_dev_name,
diff --git a/board/gdsys/a38x/hre.c b/board/gdsys/a38x/hre.c
index 1e7d7e71f12..93d8045d53b 100644
--- a/board/gdsys/a38x/hre.c
+++ b/board/gdsys/a38x/hre.c
@@ -12,6 +12,7 @@
 #include <mmc.h>
 #include <stdio.h>
 #include <tpm-v1.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
 #include <u-boot/sha1.h>
diff --git a/board/gdsys/a38x/hre.h b/board/gdsys/a38x/hre.h
index da983aa452a..154a02761dc 100644
--- a/board/gdsys/a38x/hre.h
+++ b/board/gdsys/a38x/hre.h
@@ -7,6 +7,7 @@
 #ifndef __HRE_H
 #define __HRE_H
 
+#include <stdbool.h>
 struct key_program {
 	uint32_t magic;
 	uint32_t code_crc;
diff --git a/board/gdsys/a38x/ihs_phys.c b/board/gdsys/a38x/ihs_phys.c
index c4017a25af3..c784421a701 100644
--- a/board/gdsys/a38x/ihs_phys.c
+++ b/board/gdsys/a38x/ihs_phys.c
@@ -7,6 +7,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include "ihs_phys.h"
diff --git a/board/gdsys/common/ch7301.h b/board/gdsys/common/ch7301.h
index e0e8a9e9d4d..c0f8fdf3936 100644
--- a/board/gdsys/common/ch7301.h
+++ b/board/gdsys/common/ch7301.h
@@ -7,6 +7,7 @@
 #ifndef _CH7301_H_
 #define _CH7301_H_
 
+#include <stdbool.h>
 int ch7301_probe(unsigned screen, bool power);
 
 #endif
diff --git a/board/gdsys/common/dp501.c b/board/gdsys/common/dp501.c
index ae82274a896..55be6bc2957 100644
--- a/board/gdsys/common/dp501.c
+++ b/board/gdsys/common/dp501.c
@@ -158,5 +158,6 @@ int dp501_probe(unsigned screen, bool power)
 	return 0;
 }
 
+#include <stdbool.h>
 #include <stdio.h>
 #endif /* CONFIG_GDSYS_LEGACY_DRIVERS */
diff --git a/board/gdsys/common/dp501.h b/board/gdsys/common/dp501.h
index b98b54edc52..9f3238638f1 100644
--- a/board/gdsys/common/dp501.h
+++ b/board/gdsys/common/dp501.h
@@ -24,6 +24,7 @@
 #ifndef _DP501_H_
 #define _DP501_H_
 
+#include <stdbool.h>
 void dp501_powerup(u8 addr);
 void dp501_powerdown(u8 addr);
 int dp501_probe(unsigned screen, bool power);
diff --git a/board/gdsys/common/ioep-fpga.c b/board/gdsys/common/ioep-fpga.c
index a75de339b7a..115f10c30c7 100644
--- a/board/gdsys/common/ioep-fpga.c
+++ b/board/gdsys/common/ioep-fpga.c
@@ -7,9 +7,12 @@
 #ifdef CONFIG_GDSYS_LEGACY_DRIVERS
 
 #include <common.h>
+#include <stdbool.h>
+#include <stdio.h>
 #include <string.h>
 #include <gdsys_fpga.h>
 #include <linux/bitops.h>
+#include <linux/string.h>
 
 enum pcb_video_type {
 	PCB_DVI_SL,
@@ -444,9 +447,6 @@ static int get_features(unsigned int fpga, struct fpga_features *features)
 	return 0;
 }
 
-#include <stdio.h>
-#include <linux/bitops.h>
-#include <linux/string.h>
 #endif
 
 bool ioep_fpga_has_osd(unsigned int fpga)
diff --git a/board/gdsys/common/ioep-fpga.h b/board/gdsys/common/ioep-fpga.h
index 53570b936a8..947cdc45032 100644
--- a/board/gdsys/common/ioep-fpga.h
+++ b/board/gdsys/common/ioep-fpga.h
@@ -7,6 +7,7 @@
 #ifndef _IOEP_FPGA_H_
 #define _IOEP_FPGA_H_
 
+#include <stdbool.h>
 void ioep_fpga_print_info(unsigned int fpga);
 bool ioep_fpga_has_osd(unsigned int fpga);
 
diff --git a/board/gdsys/common/osd.c b/board/gdsys/common/osd.c
index fb9c7b8a6ec..a43031d513d 100644
--- a/board/gdsys/common/osd.c
+++ b/board/gdsys/common/osd.c
@@ -504,6 +504,7 @@ U_BOOT_CMD(
 	") size_y(max. " __stringify(MAX_Y_CHARS) ")\n"
 );
 
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/string.h>
diff --git a/board/gdsys/common/osd.h b/board/gdsys/common/osd.h
index 4e8e53ab43c..0367c59ef6b 100644
--- a/board/gdsys/common/osd.h
+++ b/board/gdsys/common/osd.h
@@ -7,6 +7,7 @@
 #ifndef _OSD_H_
 #define _OSD_H_
 
+#include <stdbool.h>
 int ch7301_probe(unsigned screen, bool power);
 int osd_probe(unsigned screen);
 
diff --git a/board/gdsys/common/phy.c b/board/gdsys/common/phy.c
index 7b969853b3c..cfa681c2e19 100644
--- a/board/gdsys/common/phy.c
+++ b/board/gdsys/common/phy.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <stdio.h>
 #include <time.h>
+#include <linux/kernel.h>
 
 #include <miiphy.h>
 
diff --git a/board/gdsys/mpc8308/hrcon.c b/board/gdsys/mpc8308/hrcon.c
index 415eb6e6938..1d21d13e4c9 100644
--- a/board/gdsys/mpc8308/hrcon.c
+++ b/board/gdsys/mpc8308/hrcon.c
@@ -16,6 +16,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <pci.h>
diff --git a/board/gdsys/mpc8308/strider.c b/board/gdsys/mpc8308/strider.c
index d60a4573c5d..5df68fdd6ca 100644
--- a/board/gdsys/mpc8308/strider.c
+++ b/board/gdsys/mpc8308/strider.c
@@ -16,6 +16,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <pci.h>
diff --git a/board/gdsys/p1022/controlcenterd-id.c b/board/gdsys/p1022/controlcenterd-id.c
index ddf419edab4..713cb6456e8 100644
--- a/board/gdsys/p1022/controlcenterd-id.c
+++ b/board/gdsys/p1022/controlcenterd-id.c
@@ -25,6 +25,7 @@
 #include <stdio.h>
 #include <tpm-v1.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
 #include <u-boot/sha1.h>
diff --git a/board/gdsys/p1022/law.c b/board/gdsys/p1022/law.c
index 30ff4eb93f7..bb9113d90e7 100644
--- a/board/gdsys/p1022/law.c
+++ b/board/gdsys/p1022/law.c
@@ -9,6 +9,7 @@
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 struct law_entry law_table[] = {
 	SET_LAW(CONFIG_SYS_ELBC_BASE_PHYS, LAW_SIZE_1M, LAW_TRGT_IF_LBC),
diff --git a/board/gdsys/p1022/tlb.c b/board/gdsys/p1022/tlb.c
index 5f63fad4cfe..9ba61a35abb 100644
--- a/board/gdsys/p1022/tlb.c
+++ b/board/gdsys/p1022/tlb.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <asm/mmu.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/ge/bx50v3/bx50v3.c b/board/ge/bx50v3/bx50v3.c
index 36489db79ad..a4ade1a9419 100644
--- a/board/ge/bx50v3/bx50v3.c
+++ b/board/ge/bx50v3/bx50v3.c
@@ -18,6 +18,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <asm/gpio.h>
 #include <asm/mach-imx/iomux-v3.h>
diff --git a/board/ge/mx53ppd/mx53ppd.c b/board/ge/mx53ppd/mx53ppd.c
index a02c8a4de80..bf813303ed4 100644
--- a/board/ge/mx53ppd/mx53ppd.c
+++ b/board/ge/mx53ppd/mx53ppd.c
@@ -22,6 +22,7 @@
 #include <env.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <asm/mach-imx/mxc_i2c.h>
 #include <asm/mach-imx/mx5_video.h>
diff --git a/board/ge/mx53ppd/mx53ppd_video.c b/board/ge/mx53ppd/mx53ppd_video.c
index 3c56120c032..cf56983925f 100644
--- a/board/ge/mx53ppd/mx53ppd_video.c
+++ b/board/ge/mx53ppd/mx53ppd_video.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <dm.h>
 #include <stdio.h>
+#include <linux/kernel.h>
 #include <linux/list.h>
 #include <asm/arch/iomux-mx53.h>
 #include <asm/mach-imx/video.h>
diff --git a/board/google/imx8mq_phanbell/imx8mq_phanbell.c b/board/google/imx8mq_phanbell/imx8mq_phanbell.c
index 33ccaa6ff4c..7b1212cd2a9 100644
--- a/board/google/imx8mq_phanbell/imx8mq_phanbell.c
+++ b/board/google/imx8mq_phanbell/imx8mq_phanbell.c
@@ -22,6 +22,7 @@
 #include <asm/arch/clock.h>
 #include <spl.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/google/imx8mq_phanbell/spl.c b/board/google/imx8mq_phanbell/spl.c
index 38045791f13..d309a72a52d 100644
--- a/board/google/imx8mq_phanbell/spl.c
+++ b/board/google/imx8mq_phanbell/spl.c
@@ -27,6 +27,7 @@
 #include <mmc.h>
 #include <spl.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/grinn/liteboard/board.c b/board/grinn/liteboard/board.c
index e6bcb08aadf..986fbd6ef37 100644
--- a/board/grinn/liteboard/board.c
+++ b/board/grinn/liteboard/board.c
@@ -26,6 +26,7 @@
 #include <env.h>
 #include <fsl_esdhc_imx.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <linux/fb.h>
 #include <miiphy.h>
diff --git a/board/hisilicon/poplar/poplar.c b/board/hisilicon/poplar/poplar.c
index 8e0c122f367..9137b800f7f 100644
--- a/board/hisilicon/poplar/poplar.c
+++ b/board/hisilicon/poplar/poplar.c
@@ -18,6 +18,7 @@
 #include <asm/armv8/mmu.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/imgtec/boston/ddr.c b/board/imgtec/boston/ddr.c
index cbbbf280d8d..6ece140774e 100644
--- a/board/imgtec/boston/ddr.c
+++ b/board/imgtec/boston/ddr.c
@@ -7,6 +7,7 @@
 #include <init.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 #include <asm/io.h>
 
diff --git a/board/imgtec/boston/dt.c b/board/imgtec/boston/dt.c
index 1d7a95073ab..2e899ec2ef2 100644
--- a/board/imgtec/boston/dt.c
+++ b/board/imgtec/boston/dt.c
@@ -7,6 +7,7 @@
 #include <fdt_support.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 int ft_board_setup(void *blob, struct bd_info *bd)
 {
diff --git a/board/imgtec/malta/malta.c b/board/imgtec/malta/malta.c
index 1edbf36ea90..dd64f9dffa9 100644
--- a/board/imgtec/malta/malta.c
+++ b/board/imgtec/malta/malta.c
@@ -18,6 +18,7 @@
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include <asm/addrspace.h>
diff --git a/board/imgtec/malta/superio.c b/board/imgtec/malta/superio.c
index aba11e25be3..cb5e0589a71 100644
--- a/board/imgtec/malta/superio.c
+++ b/board/imgtec/malta/superio.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <asm/io.h>
+#include <linux/kernel.h>
 
 #define SIO_CONF_PORT		0x3f0
 #define SIO_DATA_PORT		0x3f1
diff --git a/board/inversepath/usbarmory/usbarmory.c b/board/inversepath/usbarmory/usbarmory.c
index 4eb30ae3374..1028f97ff3a 100644
--- a/board/inversepath/usbarmory/usbarmory.c
+++ b/board/inversepath/usbarmory/usbarmory.c
@@ -26,6 +26,7 @@
 #include <mmc.h>
 #include <fsl_esdhc_imx.h>
 #include <asm/gpio.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/isee/igep003x/board.c b/board/isee/igep003x/board.c
index a3ae8753721..2f53925a9cf 100644
--- a/board/isee/igep003x/board.c
+++ b/board/isee/igep003x/board.c
@@ -33,6 +33,7 @@
 #include <mtd_node.h>
 #include <asm/u-boot.h>
 #include <jffs2/load_kernel.h>
+#include <linux/kernel.h>
 #include "board.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/isee/igep00x0/igep00x0.c b/board/isee/igep00x0/igep00x0.c
index cb129dca03e..3167b5c097f 100644
--- a/board/isee/igep00x0/igep00x0.c
+++ b/board/isee/igep00x0/igep00x0.c
@@ -23,6 +23,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/rawnand.h>
 #include <linux/mtd/onenand.h>
diff --git a/board/keymile/common/ivm.c b/board/keymile/common/ivm.c
index 5aae1db2ad3..af4ccb023d4 100644
--- a/board/keymile/common/ivm.c
+++ b/board/keymile/common/ivm.c
@@ -8,6 +8,7 @@
 #include <cli_hush.h>
 #include <env.h>
 #include <i2c.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/string.h>
diff --git a/board/keymile/common/qrio.c b/board/keymile/common/qrio.c
index e447083f13a..4efcc1adee5 100644
--- a/board/keymile/common/qrio.c
+++ b/board/keymile/common/qrio.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <stdbool.h>
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
 
diff --git a/board/keymile/common/qrio.h b/board/keymile/common/qrio.h
index a04a73266fb..ead6efcca51 100644
--- a/board/keymile/common/qrio.h
+++ b/board/keymile/common/qrio.h
@@ -8,6 +8,7 @@
 #define __QRIO_H
 
 /* QRIO GPIO ports */
+#include <stdbool.h>
 #define QRIO_GPIO_A		0x40
 #define QRIO_GPIO_B		0x60
 
diff --git a/board/keymile/km_arm/km_arm.c b/board/keymile/km_arm/km_arm.c
index daba71cd4cd..bd833e54faf 100644
--- a/board/keymile/km_arm/km_arm.c
+++ b/board/keymile/km_arm/km_arm.c
@@ -28,6 +28,7 @@
 #include <asm/arch/soc.h>
 #include <asm/arch/mpp.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 #include "../common/common.h"
 
diff --git a/board/keymile/kmp204x/kmp204x.c b/board/keymile/kmp204x/kmp204x.c
index 0a977ca84ae..ffb31b8a0c0 100644
--- a/board/keymile/kmp204x/kmp204x.c
+++ b/board/keymile/kmp204x/kmp204x.c
@@ -13,6 +13,7 @@
 #include <image.h>
 #include <init.h>
 #include <netdev.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/u-boot.h>
diff --git a/board/keymile/kmp204x/law.c b/board/keymile/kmp204x/law.c
index 2c702dc631b..84fc9031793 100644
--- a/board/keymile/kmp204x/law.c
+++ b/board/keymile/kmp204x/law.c
@@ -13,6 +13,7 @@
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 struct law_entry law_table[] = {
 #ifdef CONFIG_SYS_BMAN_MEM_PHYS
diff --git a/board/keymile/kmp204x/pci.c b/board/keymile/kmp204x/pci.c
index 169c8bc6edb..7f92d6b322d 100644
--- a/board/keymile/kmp204x/pci.c
+++ b/board/keymile/kmp204x/pci.c
@@ -10,6 +10,7 @@
 #include <command.h>
 #include <init.h>
 #include <pci.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/fsl_pci.h>
 #include <asm/u-boot.h>
diff --git a/board/keymile/kmp204x/tlb.c b/board/keymile/kmp204x/tlb.c
index 72efe5044b5..176caeadb67 100644
--- a/board/keymile/kmp204x/tlb.c
+++ b/board/keymile/kmp204x/tlb.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <asm/mmu.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/kobol/helios4/helios4.c b/board/kobol/helios4/helios4.c
index 560a2e393a4..4dd326402e8 100644
--- a/board/kobol/helios4/helios4.c
+++ b/board/kobol/helios4/helios4.c
@@ -16,6 +16,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 #include "../drivers/ddr/marvell/a38x/ddr3_init.h"
 #include <../serdes/a38x/high_speed_env_spec.h>
diff --git a/board/kosagi/novena/novena_spl.c b/board/kosagi/novena/novena_spl.c
index eddea6e2915..f79a2d46a69 100644
--- a/board/kosagi/novena/novena_spl.c
+++ b/board/kosagi/novena/novena_spl.c
@@ -25,6 +25,7 @@
 #include <spl.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 
 #include <asm/arch/mx6-ddr.h>
 
diff --git a/board/kosagi/novena/video.c b/board/kosagi/novena/video.c
index 8fc76d6347a..f90a9f990c3 100644
--- a/board/kosagi/novena/video.c
+++ b/board/kosagi/novena/video.c
@@ -32,6 +32,7 @@
 #include <linux/input.h>
 #include <malloc.h>
 #include <stdio_dev.h>
+#include <linux/kernel.h>
 
 #include "novena.h"
 
diff --git a/board/lego/ev3/legoev3.c b/board/lego/ev3/legoev3.c
index 5ccd7290ad1..92c13c67ab2 100644
--- a/board/lego/ev3/legoev3.c
+++ b/board/lego/ev3/legoev3.c
@@ -28,6 +28,7 @@
 #include <hwconfig.h>
 #include <asm/mach-types.h>
 #include <asm/setup.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/liebherr/display5/display5.c b/board/liebherr/display5/display5.c
index a4bba42d8e4..e6ab33c74ac 100644
--- a/board/liebherr/display5/display5.c
+++ b/board/liebherr/display5/display5.c
@@ -29,6 +29,7 @@
 #include <i2c.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include <dm.h>
diff --git a/board/liebherr/xea/spl_xea.c b/board/liebherr/xea/spl_xea.c
index d88b75bb3a4..00c1c078f90 100644
--- a/board/liebherr/xea/spl_xea.c
+++ b/board/liebherr/xea/spl_xea.c
@@ -18,6 +18,7 @@
 #include <asm/arch/iomux-mx28.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/kernel.h>
 
 #define	MUX_CONFIG_LCD	(MXS_PAD_3V3 | MXS_PAD_4MA | MXS_PAD_NOPULL)
 #define	MUX_CONFIG_BOOT	(MXS_PAD_3V3 | MXS_PAD_PULLUP)
diff --git a/board/logicpd/imx6/imx6logic.c b/board/logicpd/imx6/imx6logic.c
index f065aa96eca..823d42c953f 100644
--- a/board/logicpd/imx6/imx6logic.c
+++ b/board/logicpd/imx6/imx6logic.c
@@ -20,6 +20,7 @@
 #include <asm/io.h>
 #include <asm/gpio.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/crm_regs.h>
diff --git a/board/menlo/m53menlo/m53menlo.c b/board/menlo/m53menlo/m53menlo.c
index 41751f3d15c..0a81b060b23 100644
--- a/board/menlo/m53menlo/m53menlo.c
+++ b/board/menlo/m53menlo/m53menlo.c
@@ -37,6 +37,7 @@
 #include <netdev.h>
 #include <spl.h>
 #include <splash.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <usb/ehci-ci.h>
 #include <video_console.h>
diff --git a/board/mscc/common/spi.c b/board/mscc/common/spi.c
index 45b9649336d..b1a71f4c292 100644
--- a/board/mscc/common/spi.c
+++ b/board/mscc/common/spi.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <spi.h>
 #include <linux/bitops.h>
diff --git a/board/mscc/ocelot/ocelot.c b/board/mscc/ocelot/ocelot.c
index ace20caf10e..4a11b5a5ed3 100644
--- a/board/mscc/ocelot/ocelot.c
+++ b/board/mscc/ocelot/ocelot.c
@@ -7,6 +7,7 @@
 #include <image.h>
 #include <init.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/addrspace.h>
diff --git a/board/novtech/meerkat96/meerkat96.c b/board/novtech/meerkat96/meerkat96.c
index 297ccd080eb..023cdc83998 100644
--- a/board/novtech/meerkat96/meerkat96.c
+++ b/board/novtech/meerkat96/meerkat96.c
@@ -15,6 +15,7 @@
 #include <asm/io.h>
 #include <common.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/nvidia/cardhu/cardhu.c b/board/nvidia/cardhu/cardhu.c
index 6848e340046..1fe5f851731 100644
--- a/board/nvidia/cardhu/cardhu.c
+++ b/board/nvidia/cardhu/cardhu.c
@@ -12,6 +12,7 @@
 #include <asm/arch/gpio.h>
 #include <asm/gpio.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include "pinmux-config-cardhu.h"
 #include <i2c.h>
 
diff --git a/board/nvidia/dalmore/dalmore.c b/board/nvidia/dalmore/dalmore.c
index 21b00855eb5..ac8df9c3806 100644
--- a/board/nvidia/dalmore/dalmore.c
+++ b/board/nvidia/dalmore/dalmore.c
@@ -9,6 +9,7 @@
 #include <stdio.h>
 #include <asm/arch/pinmux.h>
 #include <asm/arch/gp_padctrl.h>
+#include <linux/kernel.h>
 #include "pinmux-config-dalmore.h"
 #include <i2c.h>
 
diff --git a/board/nvidia/jetson-tk1/jetson-tk1.c b/board/nvidia/jetson-tk1/jetson-tk1.c
index 06a8b390a0b..b8fdcb3392a 100644
--- a/board/nvidia/jetson-tk1/jetson-tk1.c
+++ b/board/nvidia/jetson-tk1/jetson-tk1.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <log.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <power/as3722.h>
 #include <power/pmic.h>
diff --git a/board/nvidia/nyan-big/nyan-big.c b/board/nvidia/nyan-big/nyan-big.c
index 71c71ed6ec2..3923f31f6a7 100644
--- a/board/nvidia/nyan-big/nyan-big.c
+++ b/board/nvidia/nyan-big/nyan-big.c
@@ -16,6 +16,7 @@
 #include <asm/arch-tegra/clk_rst.h>
 #include <asm/arch-tegra/pmc.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <power/as3722.h>
 #include <power/pmic.h>
 #include "pinmux-config-nyan-big.h"
diff --git a/board/nvidia/p2371-2180/p2371-2180.c b/board/nvidia/p2371-2180/p2371-2180.c
index e20a74943ff..7cc163a467e 100644
--- a/board/nvidia/p2371-2180/p2371-2180.c
+++ b/board/nvidia/p2371-2180/p2371-2180.c
@@ -13,6 +13,7 @@
 #include <stdio.h>
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <asm/arch/gpio.h>
 #include <asm/arch/pinmux.h>
diff --git a/board/nvidia/p2771-0000/p2771-0000.c b/board/nvidia/p2771-0000/p2771-0000.c
index c1d9b79d3e9..b5925f30932 100644
--- a/board/nvidia/p2771-0000/p2771-0000.c
+++ b/board/nvidia/p2771-0000/p2771-0000.c
@@ -11,6 +11,7 @@
 #include <net.h>
 #include <stdio.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <asm/arch-tegra/cboot.h>
 #include <linux/string.h>
diff --git a/board/nvidia/p3450-0000/p3450-0000.c b/board/nvidia/p3450-0000/p3450-0000.c
index f6751b65ab9..868bab22ef4 100644
--- a/board/nvidia/p3450-0000/p3450-0000.c
+++ b/board/nvidia/p3450-0000/p3450-0000.c
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <pca953x.h>
 #include <asm/arch-tegra/cboot.h>
diff --git a/board/nvidia/venice2/venice2.c b/board/nvidia/venice2/venice2.c
index d89bbe5ecce..91380a4da8c 100644
--- a/board/nvidia/venice2/venice2.c
+++ b/board/nvidia/venice2/venice2.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <asm/arch/gpio.h>
 #include <asm/arch/pinmux.h>
+#include <linux/kernel.h>
 #include "pinmux-config-venice2.h"
 
 /*
diff --git a/board/olimex/mx23_olinuxino/spl_boot.c b/board/olimex/mx23_olinuxino/spl_boot.c
index 248176c23cd..31d148b885b 100644
--- a/board/olimex/mx23_olinuxino/spl_boot.c
+++ b/board/olimex/mx23_olinuxino/spl_boot.c
@@ -11,6 +11,7 @@
 #include <asm/arch/iomux-mx23.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/kernel.h>
 
 #define	MUX_CONFIG_EMI	(MXS_PAD_3V3 | MXS_PAD_12MA | MXS_PAD_PULLUP)
 #define	MUX_CONFIG_SSP	(MXS_PAD_8MA | MXS_PAD_PULLUP)
diff --git a/board/phytec/pcl063/pcl063.c b/board/phytec/pcl063/pcl063.c
index cd8ba35ab9d..8ac6eb01caa 100644
--- a/board/phytec/pcl063/pcl063.c
+++ b/board/phytec/pcl063/pcl063.c
@@ -21,6 +21,7 @@
 #include <miiphy.h>
 #include <netdev.h>
 #include <usb.h>
+#include <linux/kernel.h>
 #include <usb/ehci-ci.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/phytec/phycore_am335x_r2/board.c b/board/phytec/phycore_am335x_r2/board.c
index 19c1033c9d7..19e15a7c73e 100644
--- a/board/phytec/phycore_am335x_r2/board.c
+++ b/board/phytec/phycore_am335x_r2/board.c
@@ -19,6 +19,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 #include <power/tps65910.h>
 #include <jffs2/load_kernel.h>
 #include <mtd_node.h>
diff --git a/board/ppcag/bg0900/spl_boot.c b/board/ppcag/bg0900/spl_boot.c
index b46bc8939a3..7809c844df7 100644
--- a/board/ppcag/bg0900/spl_boot.c
+++ b/board/ppcag/bg0900/spl_boot.c
@@ -11,6 +11,7 @@
 #include <asm/arch/iomux-mx28.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/kernel.h>
 
 #define	MUX_CONFIG_GPMI	(MXS_PAD_3V3 | MXS_PAD_4MA | MXS_PAD_NOPULL)
 #define	MUX_CONFIG_ENET	(MXS_PAD_3V3 | MXS_PAD_8MA | MXS_PAD_PULLUP)
diff --git a/board/qualcomm/dragonboard820c/dragonboard820c.c b/board/qualcomm/dragonboard820c/dragonboard820c.c
index 8ed5deadec1..ad8db681bd1 100644
--- a/board/qualcomm/dragonboard820c/dragonboard820c.c
+++ b/board/qualcomm/dragonboard820c/dragonboard820c.c
@@ -14,6 +14,7 @@
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/arm-smccc.h>
+#include <linux/kernel.h>
 #include <linux/psci.h>
 #include <common.h>
 #include <dm.h>
diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c
index 45586323f3a..c074726f1ae 100644
--- a/board/raspberrypi/rpi/rpi.c
+++ b/board/raspberrypi/rpi/rpi.c
@@ -28,6 +28,7 @@
 #endif
 #include <watchdog.h>
 #include <dm/pinctrl.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/renesas/alt/alt_spl.c b/board/renesas/alt/alt_spl.c
index 02e3ed3b563..44a8d6c720e 100644
--- a/board/renesas/alt/alt_spl.c
+++ b/board/renesas/alt/alt_spl.c
@@ -20,6 +20,7 @@
 #include <asm/gpio.h>
 #include <asm/arch/rmobile.h>
 #include <asm/arch/rcar-mstp.h>
+#include <linux/kernel.h>
 
 #include <spl.h>
 
diff --git a/board/renesas/blanche/blanche.c b/board/renesas/blanche/blanche.c
index e91cffaa8c5..79bd867c953 100644
--- a/board/renesas/blanche/blanche.c
+++ b/board/renesas/blanche/blanche.c
@@ -33,6 +33,7 @@
 #include <miiphy.h>
 #include <mmc.h>
 #include <netdev.h>
+#include <linux/kernel.h>
 #include "qos.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/renesas/gose/gose_spl.c b/board/renesas/gose/gose_spl.c
index a181ffd6dcf..d4708c691b9 100644
--- a/board/renesas/gose/gose_spl.c
+++ b/board/renesas/gose/gose_spl.c
@@ -20,6 +20,7 @@
 #include <asm/gpio.h>
 #include <asm/arch/rmobile.h>
 #include <asm/arch/rcar-mstp.h>
+#include <linux/kernel.h>
 
 #include <spl.h>
 
diff --git a/board/renesas/koelsch/koelsch_spl.c b/board/renesas/koelsch/koelsch_spl.c
index f5be6548738..a690022f97b 100644
--- a/board/renesas/koelsch/koelsch_spl.c
+++ b/board/renesas/koelsch/koelsch_spl.c
@@ -20,6 +20,7 @@
 #include <asm/gpio.h>
 #include <asm/arch/rmobile.h>
 #include <asm/arch/rcar-mstp.h>
+#include <linux/kernel.h>
 
 #include <spl.h>
 
diff --git a/board/renesas/lager/lager_spl.c b/board/renesas/lager/lager_spl.c
index 4dc47ecd5f7..7cb30ba7212 100644
--- a/board/renesas/lager/lager_spl.c
+++ b/board/renesas/lager/lager_spl.c
@@ -20,6 +20,7 @@
 #include <asm/gpio.h>
 #include <asm/arch/rmobile.h>
 #include <asm/arch/rcar-mstp.h>
+#include <linux/kernel.h>
 
 #include <spl.h>
 
diff --git a/board/renesas/porter/porter_spl.c b/board/renesas/porter/porter_spl.c
index 9b4e787b5f1..d2a93fc5456 100644
--- a/board/renesas/porter/porter_spl.c
+++ b/board/renesas/porter/porter_spl.c
@@ -20,6 +20,7 @@
 #include <asm/gpio.h>
 #include <asm/arch/rmobile.h>
 #include <asm/arch/rcar-mstp.h>
+#include <linux/kernel.h>
 
 #include <spl.h>
 
diff --git a/board/renesas/silk/silk_spl.c b/board/renesas/silk/silk_spl.c
index 27f59ce9e4d..b80c6b421ab 100644
--- a/board/renesas/silk/silk_spl.c
+++ b/board/renesas/silk/silk_spl.c
@@ -20,6 +20,7 @@
 #include <asm/gpio.h>
 #include <asm/arch/rmobile.h>
 #include <asm/arch/rcar-mstp.h>
+#include <linux/kernel.h>
 
 #include <spl.h>
 
diff --git a/board/renesas/stout/stout_spl.c b/board/renesas/stout/stout_spl.c
index f3a5dbc8d0b..10efd09139f 100644
--- a/board/renesas/stout/stout_spl.c
+++ b/board/renesas/stout/stout_spl.c
@@ -20,6 +20,7 @@
 #include <asm/gpio.h>
 #include <asm/arch/rmobile.h>
 #include <asm/arch/rcar-mstp.h>
+#include <linux/kernel.h>
 
 #include <spl.h>
 
diff --git a/board/rockchip/evb_rk3308/evb_rk3308.c b/board/rockchip/evb_rk3308/evb_rk3308.c
index efe6363a413..3ca4e925bbc 100644
--- a/board/rockchip/evb_rk3308/evb_rk3308.c
+++ b/board/rockchip/evb_rk3308/evb_rk3308.c
@@ -7,6 +7,7 @@
 #include <adc.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/samsung/common/exynos5-dt-types.c b/board/samsung/common/exynos5-dt-types.c
index e2d5a7c9ba7..026fc4abf11 100644
--- a/board/samsung/common/exynos5-dt-types.c
+++ b/board/samsung/common/exynos5-dt-types.c
@@ -11,6 +11,7 @@
 #include <fdtdec.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/s2mps11.h>
diff --git a/board/samsung/common/misc.c b/board/samsung/common/misc.c
index 4438bff523e..30a00892e0c 100644
--- a/board/samsung/common/misc.c
+++ b/board/samsung/common/misc.c
@@ -13,6 +13,7 @@
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <samsung/misc.h>
 #include <errno.h>
diff --git a/board/sandisk/sansa_fuze_plus/sfp.c b/board/sandisk/sansa_fuze_plus/sfp.c
index b5052deb7ac..689cd799dd3 100644
--- a/board/sandisk/sansa_fuze_plus/sfp.c
+++ b/board/sandisk/sansa_fuze_plus/sfp.c
@@ -23,6 +23,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/sandisk/sansa_fuze_plus/spl_boot.c b/board/sandisk/sansa_fuze_plus/spl_boot.c
index 37f866ccdc3..59464877fbf 100644
--- a/board/sandisk/sansa_fuze_plus/spl_boot.c
+++ b/board/sandisk/sansa_fuze_plus/spl_boot.c
@@ -11,6 +11,7 @@
 #include <asm/arch/iomux-mx23.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #define	MUX_CONFIG_EMI	(MXS_PAD_1V8 | MXS_PAD_12MA | MXS_PAD_PULLUP)
diff --git a/board/sbc8548/law.c b/board/sbc8548/law.c
index af281d338f0..3ea7ac93da1 100644
--- a/board/sbc8548/law.c
+++ b/board/sbc8548/law.c
@@ -10,6 +10,7 @@
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 /*
  * LAW(Local Access Window) configuration:
diff --git a/board/sbc8548/tlb.c b/board/sbc8548/tlb.c
index 4fcc1f2710c..1bf9a8e7d5a 100644
--- a/board/sbc8548/tlb.c
+++ b/board/sbc8548/tlb.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <asm/mmu.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/sbc8641d/law.c b/board/sbc8641d/law.c
index 446d63bf1f0..860fcd03bc0 100644
--- a/board/sbc8641d/law.c
+++ b/board/sbc8641d/law.c
@@ -10,6 +10,7 @@
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 /*
  * LAW (Local Access Window) configuration:
diff --git a/board/schulercontrol/sc_sps_1/spl_boot.c b/board/schulercontrol/sc_sps_1/spl_boot.c
index 68758eb9970..a58fde351a1 100644
--- a/board/schulercontrol/sc_sps_1/spl_boot.c
+++ b/board/schulercontrol/sc_sps_1/spl_boot.c
@@ -12,6 +12,7 @@
 #include <asm/arch/iomux-mx28.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/kernel.h>
 
 #define	MUX_CONFIG_LED	(MXS_PAD_3V3 | MXS_PAD_4MA | MXS_PAD_NOPULL)
 #define	MUX_CONFIG_SSP0	(MXS_PAD_3V3 | MXS_PAD_12MA | MXS_PAD_PULLUP)
diff --git a/board/seco/common/mx6.c b/board/seco/common/mx6.c
index eaf7edf952d..52d06d3638b 100644
--- a/board/seco/common/mx6.c
+++ b/board/seco/common/mx6.c
@@ -29,6 +29,7 @@
 #include <micrel.h>
 #include <asm/mach-imx/mxc_i2c.h>
 #include <i2c.h>
+#include <linux/kernel.h>
 
 #define UART_PAD_CTRL  (PAD_CTL_PUS_100K_UP |			\
 	PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm |			\
diff --git a/board/siemens/capricorn/board.c b/board/siemens/capricorn/board.c
index ebd34939cb4..433fba067b9 100644
--- a/board/siemens/capricorn/board.c
+++ b/board/siemens/capricorn/board.c
@@ -31,6 +31,7 @@
 #endif
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "../common/factoryset.h"
 
diff --git a/board/siemens/rut/board.c b/board/siemens/rut/board.c
index 2da0560bd2b..7be23e97967 100644
--- a/board/siemens/rut/board.c
+++ b/board/siemens/rut/board.c
@@ -38,6 +38,7 @@
 #include <watchdog.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "board.h"
 #include "../common/factoryset.h"
diff --git a/board/sipeed/maix/maix.c b/board/sipeed/maix/maix.c
index 34c87802403..7632b09c077 100644
--- a/board/sipeed/maix/maix.c
+++ b/board/sipeed/maix/maix.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 phys_size_t get_effective_memsize(void)
 {
diff --git a/board/socrates/law.c b/board/socrates/law.c
index 5010e0cee36..ec3d673b829 100644
--- a/board/socrates/law.c
+++ b/board/socrates/law.c
@@ -13,6 +13,7 @@
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 /*
  * LAW(Local Access Window) configuration:
diff --git a/board/socrates/tlb.c b/board/socrates/tlb.c
index 4dc0f7dbcda..5b921f025ea 100644
--- a/board/socrates/tlb.c
+++ b/board/socrates/tlb.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <asm/mmu.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/softing/vining_2000/vining_2000.c b/board/softing/vining_2000/vining_2000.c
index 1c84539c120..d72aee47ca9 100644
--- a/board/softing/vining_2000/vining_2000.c
+++ b/board/softing/vining_2000/vining_2000.c
@@ -25,6 +25,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <common.h>
 #include <fsl_esdhc_imx.h>
diff --git a/board/solidrun/clearfog/clearfog.c b/board/solidrun/clearfog/clearfog.c
index 660962364f6..83e789b99f7 100644
--- a/board/solidrun/clearfog/clearfog.c
+++ b/board/solidrun/clearfog/clearfog.c
@@ -18,6 +18,7 @@
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "../common/tlv_data.h"
 
diff --git a/board/solidrun/common/tlv_data.c b/board/solidrun/common/tlv_data.c
index 1daf14812ef..315faeb6140 100644
--- a/board/solidrun/common/tlv_data.c
+++ b/board/solidrun/common/tlv_data.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <compiler.h>
 #include <tlv_eeprom.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "tlv_data.h"
 
diff --git a/board/solidrun/common/tlv_data.h b/board/solidrun/common/tlv_data.h
index a1432e4b8e1..2d05fa601be 100644
--- a/board/solidrun/common/tlv_data.h
+++ b/board/solidrun/common/tlv_data.h
@@ -6,6 +6,7 @@
 #ifndef __BOARD_SR_COMMON_H_
 #define __BOARD_SR_COMMON_H_
 
+#include <stdbool.h>
 struct tlv_data {
 	/* Store product name of both SOM and carrier */
 	char tlv_product_name[2][32];
diff --git a/board/solidrun/mx6cuboxi/mx6cuboxi.c b/board/solidrun/mx6cuboxi/mx6cuboxi.c
index fccc88639c5..b523a06b29f 100644
--- a/board/solidrun/mx6cuboxi/mx6cuboxi.c
+++ b/board/solidrun/mx6cuboxi/mx6cuboxi.c
@@ -41,6 +41,7 @@
 #include <asm/arch/sys_proto.h>
 #include <spl.h>
 #include <usb.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <usb/ehci-ci.h>
 
diff --git a/board/somlabs/visionsom-6ull/visionsom-6ull.c b/board/somlabs/visionsom-6ull/visionsom-6ull.c
index 7c330101bb0..84459dac1ee 100644
--- a/board/somlabs/visionsom-6ull/visionsom-6ull.c
+++ b/board/somlabs/visionsom-6ull/visionsom-6ull.c
@@ -24,6 +24,7 @@
 #include <i2c.h>
 #include <miiphy.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <mmc.h>
 #include <netdev.h>
diff --git a/board/st/common/stm32mp_dfu.c b/board/st/common/stm32mp_dfu.c
index b44af077112..21d21dafd8e 100644
--- a/board/st/common/stm32mp_dfu.c
+++ b/board/st/common/stm32mp_dfu.c
@@ -11,6 +11,7 @@
 #include <misc.h>
 #include <mtd.h>
 #include <mtd_node.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/arch/stm32prog.h>
diff --git a/board/st/common/stm32mp_mtdparts.c b/board/st/common/stm32mp_mtdparts.c
index b7dfd4cb741..7a6db7c14cd 100644
--- a/board/st/common/stm32mp_mtdparts.c
+++ b/board/st/common/stm32mp_mtdparts.c
@@ -10,6 +10,7 @@
 #include <env_internal.h>
 #include <mtd.h>
 #include <mtd_node.h>
+#include <stdbool.h>
 #include <tee.h>
 #include <asm/arch/stm32prog.h>
 #include <asm/arch/sys_proto.h>
diff --git a/board/st/common/stpmic1.c b/board/st/common/stpmic1.c
index 042476dc318..7aa85851738 100644
--- a/board/st/common/stpmic1.c
+++ b/board/st/common/stpmic1.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/ddr.h>
diff --git a/board/st/stm32mp1/stm32mp1.c b/board/st/stm32mp1/stm32mp1.c
index d1593e5e4ee..0938906fcb1 100644
--- a/board/st/stm32mp1/stm32mp1.c
+++ b/board/st/stm32mp1/stm32mp1.c
@@ -43,6 +43,7 @@
 #include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/iopoll.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include <power/regulator.h>
diff --git a/board/synopsys/emsdp/emsdp.c b/board/synopsys/emsdp/emsdp.c
index 7a33440f273..995514eab58 100644
--- a/board/synopsys/emsdp/emsdp.c
+++ b/board/synopsys/emsdp/emsdp.c
@@ -12,6 +12,7 @@
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include <asm/arcregs.h>
diff --git a/board/synopsys/hsdk/env-lib.h b/board/synopsys/hsdk/env-lib.h
index 48c17c4d4f6..b745442775c 100644
--- a/board/synopsys/hsdk/env-lib.h
+++ b/board/synopsys/hsdk/env-lib.h
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <config.h>
+#include <stdbool.h>
 #include <linux/kernel.h>
 
 enum env_type {
diff --git a/board/syteco/zmx25/zmx25.c b/board/syteco/zmx25/zmx25.c
index 71eba4842b3..bd6daf11b20 100644
--- a/board/syteco/zmx25/zmx25.c
+++ b/board/syteco/zmx25/zmx25.c
@@ -24,6 +24,7 @@
 #include <asm/arch/iomux-mx25.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/tbs/tbs2910/tbs2910.c b/board/tbs/tbs2910/tbs2910.c
index 6cbb22ef99e..5871e68bfb1 100644
--- a/board/tbs/tbs2910/tbs2910.c
+++ b/board/tbs/tbs2910/tbs2910.c
@@ -23,6 +23,7 @@
 #include <asm/arch/crm_regs.h>
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/kernel.h>
 DECLARE_GLOBAL_DATA_PTR;
 
 #define UART_PAD_CTRL  (PAD_CTL_PUS_100K_UP |			\
diff --git a/board/technexion/pico-imx6/pico-imx6.c b/board/technexion/pico-imx6/pico-imx6.c
index 87a78f41843..24e8376d786 100644
--- a/board/technexion/pico-imx6/pico-imx6.c
+++ b/board/technexion/pico-imx6/pico-imx6.c
@@ -25,6 +25,7 @@
 #include <asm/io.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <miiphy.h>
 #include <netdev.h>
diff --git a/board/technexion/pico-imx6ul/pico-imx6ul.c b/board/technexion/pico-imx6ul/pico-imx6ul.c
index fb3d9ee726a..5ba16bcba58 100644
--- a/board/technexion/pico-imx6ul/pico-imx6ul.c
+++ b/board/technexion/pico-imx6ul/pico-imx6ul.c
@@ -24,6 +24,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <usb.h>
 #include <power/pmic.h>
diff --git a/board/technexion/pico-imx6ul/spl.c b/board/technexion/pico-imx6ul/spl.c
index 0c5b166b653..55d19728af3 100644
--- a/board/technexion/pico-imx6ul/spl.c
+++ b/board/technexion/pico-imx6ul/spl.c
@@ -17,6 +17,7 @@
 #include <asm/mach-imx/boot_mode.h>
 #include <fsl_esdhc_imx.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <spl.h>
 #include <linux/string.h>
diff --git a/board/technexion/pico-imx7d/pico-imx7d.c b/board/technexion/pico-imx7d/pico-imx7d.c
index 70f61c50253..f3efeab26e0 100644
--- a/board/technexion/pico-imx7d/pico-imx7d.c
+++ b/board/technexion/pico-imx7d/pico-imx7d.c
@@ -21,6 +21,7 @@
 #include <miiphy.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <power/pmic.h>
 #include <power/pfuze3000_pmic.h>
 #include "../../freescale/common/pfuze.h"
diff --git a/board/technexion/pico-imx7d/spl.c b/board/technexion/pico-imx7d/spl.c
index 3739706dee1..50604f196f2 100644
--- a/board/technexion/pico-imx7d/spl.c
+++ b/board/technexion/pico-imx7d/spl.c
@@ -19,6 +19,7 @@
 #include <fsl_esdhc_imx.h>
 #include <spl.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #if defined(CONFIG_SPL_BUILD)
diff --git a/board/technexion/pico-imx8mq/pico-imx8mq.c b/board/technexion/pico-imx8mq/pico-imx8mq.c
index f89bcc2e032..2ef9aa11043 100644
--- a/board/technexion/pico-imx8mq/pico-imx8mq.c
+++ b/board/technexion/pico-imx8mq/pico-imx8mq.c
@@ -25,6 +25,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <spl.h>
+#include <linux/kernel.h>
 #include <power/pmic.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/technexion/pico-imx8mq/spl.c b/board/technexion/pico-imx8mq/spl.c
index 048ffb48d3f..e2d557732f6 100644
--- a/board/technexion/pico-imx8mq/spl.c
+++ b/board/technexion/pico-imx8mq/spl.c
@@ -23,6 +23,7 @@
 #include <fsl_esdhc_imx.h>
 #include <mmc.h>
 #include <spl.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include "lpddr4_timing.h"
diff --git a/board/technologic/ts4600/iomux.c b/board/technologic/ts4600/iomux.c
index 9bd3eacb0bd..5ef69154254 100644
--- a/board/technologic/ts4600/iomux.c
+++ b/board/technologic/ts4600/iomux.c
@@ -19,6 +19,7 @@
 #include <asm/arch/iomux-mx28.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/kernel.h>
 
 #define	MUX_CONFIG_SSP0	(MXS_PAD_3V3 | MXS_PAD_8MA | MXS_PAD_PULLUP)
 #define	MUX_CONFIG_EMI	(MXS_PAD_3V3 | MXS_PAD_12MA | MXS_PAD_NOPULL)
diff --git a/board/technologic/ts4800/ts4800.c b/board/technologic/ts4800/ts4800.c
index 37347949a38..c2a28ccf63b 100644
--- a/board/technologic/ts4800/ts4800.c
+++ b/board/technologic/ts4800/ts4800.c
@@ -28,6 +28,7 @@
 #include <input.h>
 #include <fsl_esdhc_imx.h>
 #include <mc13892.h>
+#include <linux/kernel.h>
 
 #include <malloc.h>
 #include <netdev.h>
diff --git a/board/theadorable/fpga.c b/board/theadorable/fpga.c
index 904af3ed2e9..5a34244ea05 100644
--- a/board/theadorable/fpga.c
+++ b/board/theadorable/fpga.c
@@ -14,6 +14,7 @@
 #include <asm/arch/soc.h>
 #include <asm/arch-mvebu/spi.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "theadorable.h"
 
diff --git a/board/ti/am335x/board.c b/board/ti/am335x/board.c
index 17096159442..21f90e0e7e8 100644
--- a/board/ti/am335x/board.c
+++ b/board/ti/am335x/board.c
@@ -17,6 +17,7 @@
 #include <net.h>
 #include <spl.h>
 #include <serial.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/arch/cpu.h>
diff --git a/board/ti/am43xx/board.c b/board/ti/am43xx/board.c
index 28bc5333c52..e3e13421cd3 100644
--- a/board/ti/am43xx/board.c
+++ b/board/ti/am43xx/board.c
@@ -30,6 +30,7 @@
 #include <asm/arch/gpio.h>
 #include <asm/emif.h>
 #include <asm/omap_common.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "../common/board_detect.h"
 #include "board.h"
diff --git a/board/ti/am57xx/board.c b/board/ti/am57xx/board.c
index 808b9993703..4458ddec325 100644
--- a/board/ti/am57xx/board.c
+++ b/board/ti/am57xx/board.c
@@ -37,6 +37,7 @@
 #include <usb.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/usb/gadget.h>
 #include <dwc3-uboot.h>
diff --git a/board/ti/am65x/evm.c b/board/ti/am65x/evm.c
index b8bb6b47581..c34726ac983 100644
--- a/board/ti/am65x/evm.c
+++ b/board/ti/am65x/evm.c
@@ -25,6 +25,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c
index fe8aeac9e46..15b0d5149f8 100644
--- a/board/ti/beagle/beagle.c
+++ b/board/ti/beagle/beagle.c
@@ -23,6 +23,7 @@
 #ifdef CONFIG_LED_STATUS
 #include <status_led.h>
 #endif
+#include <stdbool.h>
 #include <stdio.h>
 #include <twl4030.h>
 #include <asm/global_data.h>
diff --git a/board/ti/common/board_detect.c b/board/ti/common/board_detect.c
index 5519d2d7e61..18b8a967106 100644
--- a/board/ti/common/board_detect.c
+++ b/board/ti/common/board_detect.c
@@ -22,6 +22,7 @@
 #include <errno.h>
 #include <malloc.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/board/ti/common/board_detect.h b/board/ti/common/board_detect.h
index 9f75b5c0044..a74b9468bca 100644
--- a/board/ti/common/board_detect.h
+++ b/board/ti/common/board_detect.h
@@ -9,6 +9,7 @@
 #define __BOARD_DETECT_H
 
 /* TI EEPROM MAGIC Header identifier */
+#include <stdbool.h>
 #include <linux/bitops.h>
 #define TI_EEPROM_HEADER_MAGIC	0xEE3355AA
 #define TI_DEAD_EEPROM_MAGIC	0xADEAD12C
diff --git a/board/ti/dra7xx/evm.c b/board/ti/dra7xx/evm.c
index b283bb41039..baf47edc304 100644
--- a/board/ti/dra7xx/evm.c
+++ b/board/ti/dra7xx/evm.c
@@ -23,6 +23,7 @@
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <asm/gpio.h>
 #include <usb.h>
diff --git a/board/ti/j721e/evm.c b/board/ti/j721e/evm.c
index 27971506074..81810f50a06 100644
--- a/board/ti/j721e/evm.c
+++ b/board/ti/j721e/evm.c
@@ -27,6 +27,7 @@
 #include <asm/u-boot.h>
 #include <dm/uclass-internal.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/board/ti/ks2_evm/board.c b/board/ti/ks2_evm/board.c
index 1b9b79f65ae..449073b6b7a 100644
--- a/board/ti/ks2_evm/board.c
+++ b/board/ti/ks2_evm/board.c
@@ -11,6 +11,7 @@
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "board.h"
 #include <env.h>
diff --git a/board/ti/ks2_evm/board_k2g.c b/board/ti/ks2_evm/board_k2g.c
index e79497752a6..eb115a818f4 100644
--- a/board/ti/ks2_evm/board_k2g.c
+++ b/board/ti/ks2_evm/board_k2g.c
@@ -11,6 +11,7 @@
 #include <hang.h>
 #include <image.h>
 #include <init.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/ti-common/keystone_net.h>
diff --git a/board/toradex/apalis-imx8/apalis-imx8.c b/board/toradex/apalis-imx8/apalis-imx8.c
index d46ab222f89..cae2b789bc7 100644
--- a/board/toradex/apalis-imx8/apalis-imx8.c
+++ b/board/toradex/apalis-imx8/apalis-imx8.c
@@ -9,6 +9,7 @@
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 #include <asm/arch/clock.h>
 #include <asm/arch/imx8-pins.h>
diff --git a/board/toradex/apalis-tk1/apalis-tk1.c b/board/toradex/apalis-tk1/apalis-tk1.c
index adc9bef31e7..023c93c0929 100644
--- a/board/toradex/apalis-tk1/apalis-tk1.c
+++ b/board/toradex/apalis-tk1/apalis-tk1.c
@@ -19,6 +19,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include <power/as3722.h>
diff --git a/board/toradex/apalis_imx6/apalis_imx6.c b/board/toradex/apalis_imx6/apalis_imx6.c
index 62ae4dbf922..6b319c043a6 100644
--- a/board/toradex/apalis_imx6/apalis_imx6.c
+++ b/board/toradex/apalis_imx6/apalis_imx6.c
@@ -18,6 +18,7 @@
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include <ahci.h>
diff --git a/board/toradex/apalis_imx6/pf0100.c b/board/toradex/apalis_imx6/pf0100.c
index a720099f91e..9247a780544 100644
--- a/board/toradex/apalis_imx6/pf0100.c
+++ b/board/toradex/apalis_imx6/pf0100.c
@@ -17,6 +17,7 @@
 #include <asm/gpio.h>
 #include <asm/mach-imx/iomux-v3.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 
 #include "pf0100_otp.inc"
 #include "pf0100.h"
diff --git a/board/toradex/apalis_t30/apalis_t30.c b/board/toradex/apalis_t30/apalis_t30.c
index bdc0691755e..49fb5d7a370 100644
--- a/board/toradex/apalis_t30/apalis_t30.c
+++ b/board/toradex/apalis_t30/apalis_t30.c
@@ -20,6 +20,7 @@
 #include <pci_tegra.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include "../common/tdx-common.h"
 
 #include "pinmux-config-apalis_t30.h"
diff --git a/board/toradex/colibri-imx6ull/colibri-imx6ull.c b/board/toradex/colibri-imx6ull/colibri-imx6ull.c
index 5d787b61902..7f1f1f89ccb 100644
--- a/board/toradex/colibri-imx6ull/colibri-imx6ull.c
+++ b/board/toradex/colibri-imx6ull/colibri-imx6ull.c
@@ -8,6 +8,7 @@
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 
 #include <asm/arch/clock.h>
 #include <asm/arch/crm_regs.h>
diff --git a/board/toradex/colibri-imx8x/colibri-imx8x.c b/board/toradex/colibri-imx8x/colibri-imx8x.c
index d80762aec3c..1a2a23337cf 100644
--- a/board/toradex/colibri-imx8x/colibri-imx8x.c
+++ b/board/toradex/colibri-imx8x/colibri-imx8x.c
@@ -9,6 +9,7 @@
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 #include <asm/arch/clock.h>
 #include <asm/arch/imx8-pins.h>
diff --git a/board/toradex/colibri_imx6/colibri_imx6.c b/board/toradex/colibri_imx6/colibri_imx6.c
index 16bb5799137..99342e820e9 100644
--- a/board/toradex/colibri_imx6/colibri_imx6.c
+++ b/board/toradex/colibri_imx6/colibri_imx6.c
@@ -18,6 +18,7 @@
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include <asm/arch/clock.h>
diff --git a/board/toradex/colibri_imx6/pf0100.c b/board/toradex/colibri_imx6/pf0100.c
index caaf7553e5a..d1bd0566b2a 100644
--- a/board/toradex/colibri_imx6/pf0100.c
+++ b/board/toradex/colibri_imx6/pf0100.c
@@ -17,6 +17,7 @@
 #include <asm/gpio.h>
 #include <asm/mach-imx/iomux-v3.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 
 #include "pf0100_otp.inc"
 #include "pf0100.h"
diff --git a/board/toradex/colibri_imx7/colibri_imx7.c b/board/toradex/colibri_imx7/colibri_imx7.c
index 38fdaf648b8..7bb691350be 100644
--- a/board/toradex/colibri_imx7/colibri_imx7.c
+++ b/board/toradex/colibri_imx7/colibri_imx7.c
@@ -26,6 +26,7 @@
 #include <jffs2/load_kernel.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <mmc.h>
 #include <miiphy.h>
diff --git a/board/toradex/colibri_t30/colibri_t30.c b/board/toradex/colibri_t30/colibri_t30.c
index 7a185ef8ec9..729369a96c0 100644
--- a/board/toradex/colibri_t30/colibri_t30.c
+++ b/board/toradex/colibri_t30/colibri_t30.c
@@ -16,6 +16,7 @@
 #include <i2c.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include "pinmux-config-colibri_t30.h"
 #include "../common/tdx-common.h"
 
diff --git a/board/toradex/colibri_vf/colibri_vf.c b/board/toradex/colibri_vf/colibri_vf.c
index 071c6b55b82..6361ffedb1f 100644
--- a/board/toradex/colibri_vf/colibri_vf.c
+++ b/board/toradex/colibri_vf/colibri_vf.c
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 #include <asm/arch/clock.h>
 #include <asm/arch/crm_regs.h>
diff --git a/board/toradex/common/tdx-cfg-block.c b/board/toradex/common/tdx-cfg-block.c
index 84b20bf1daa..ff52ddffb19 100644
--- a/board/toradex/common/tdx-cfg-block.c
+++ b/board/toradex/common/tdx-cfg-block.c
@@ -8,6 +8,7 @@
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "tdx-cfg-block.h"
 #include <command.h>
diff --git a/board/toradex/verdin-imx8mm/spl.c b/board/toradex/verdin-imx8mm/spl.c
index 0d422b65093..bce63c0574d 100644
--- a/board/toradex/verdin-imx8mm/spl.c
+++ b/board/toradex/verdin-imx8mm/spl.c
@@ -25,6 +25,7 @@
 #include <dm/uclass-internal.h>
 #include <hang.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <power/bd71837.h>
 #include <power/pmic.h>
diff --git a/board/tqc/tqma6/tqma6.c b/board/tqc/tqma6/tqma6.c
index 42dd0a8f173..1b2855c9896 100644
--- a/board/tqc/tqma6/tqma6.c
+++ b/board/tqc/tqma6/tqma6.c
@@ -26,6 +26,7 @@
 #include <asm/mach-imx/spi.h>
 #include <common.h>
 #include <fsl_esdhc_imx.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <i2c.h>
 #include <mmc.h>
diff --git a/board/tqc/tqma6/tqma6_mba6.c b/board/tqc/tqma6/tqma6_mba6.c
index e50bd9ecebd..67e973ad760 100644
--- a/board/tqc/tqma6/tqma6_mba6.c
+++ b/board/tqc/tqma6/tqma6_mba6.c
@@ -20,6 +20,7 @@
 #include <linux/errno.h>
 #include <asm/gpio.h>
 #include <asm/mach-imx/mxc_i2c.h>
+#include <linux/kernel.h>
 
 #include <common.h>
 #include <fsl_esdhc_imx.h>
diff --git a/board/tqc/tqma6/tqma6_wru4.c b/board/tqc/tqma6/tqma6_wru4.c
index 70b1626e972..3d2bbb97dd2 100644
--- a/board/tqc/tqma6/tqma6_wru4.c
+++ b/board/tqc/tqma6/tqma6_wru4.c
@@ -24,6 +24,7 @@
 #include <asm/gpio.h>
 #include <asm/mach-imx/boot_mode.h>
 #include <asm/mach-imx/mxc_i2c.h>
+#include <linux/kernel.h>
 
 #include <common.h>
 #include <fsl_esdhc_imx.h>
diff --git a/board/udoo/neo/neo.c b/board/udoo/neo/neo.c
index 1853330e2ce..4c004a75553 100644
--- a/board/udoo/neo/neo.c
+++ b/board/udoo/neo/neo.c
@@ -30,6 +30,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <common.h>
 #include <i2c.h>
diff --git a/board/variscite/dart_6ul/dart_6ul.c b/board/variscite/dart_6ul/dart_6ul.c
index ec1e1d262cf..3f554381e7b 100644
--- a/board/variscite/dart_6ul/dart_6ul.c
+++ b/board/variscite/dart_6ul/dart_6ul.c
@@ -20,6 +20,7 @@
 #include <miiphy.h>
 #include <netdev.h>
 #include <usb.h>
+#include <linux/kernel.h>
 #include <usb/ehci-ci.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/variscite/dart_6ul/spl.c b/board/variscite/dart_6ul/spl.c
index 7610182b725..bf4c6bd573e 100644
--- a/board/variscite/dart_6ul/spl.c
+++ b/board/variscite/dart_6ul/spl.c
@@ -15,6 +15,7 @@
 #include <asm/arch/crm_regs.h>
 #include <fsl_esdhc_imx.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #define UART_PAD_CTRL  (PAD_CTL_PKE | PAD_CTL_PUE |		\
diff --git a/board/varisys/common/sys_eeprom.c b/board/varisys/common/sys_eeprom.c
index 80cd3753cbf..d285b0f36cd 100644
--- a/board/varisys/common/sys_eeprom.c
+++ b/board/varisys/common/sys_eeprom.c
@@ -18,6 +18,7 @@
 #include <vsprintf.h>
 #include <linux/ctype.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
 
diff --git a/board/varisys/cyrus/law.c b/board/varisys/cyrus/law.c
index 0391d606f9c..11c6675fa35 100644
--- a/board/varisys/cyrus/law.c
+++ b/board/varisys/cyrus/law.c
@@ -8,6 +8,7 @@
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 struct law_entry law_table[] = {
 	SET_LAW(CONFIG_SYS_LBC0_BASE_PHYS, LAW_SIZE_64K, LAW_TRGT_IF_LBC),
diff --git a/board/varisys/cyrus/tlb.c b/board/varisys/cyrus/tlb.c
index 8068ec0ca1d..9af03db7ee0 100644
--- a/board/varisys/cyrus/tlb.c
+++ b/board/varisys/cyrus/tlb.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <asm/mmu.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/wandboard/wandboard.c b/board/wandboard/wandboard.c
index cd773d8f1d8..3a883d5019a 100644
--- a/board/wandboard/wandboard.c
+++ b/board/wandboard/wandboard.c
@@ -30,6 +30,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <common.h>
 #include <miiphy.h>
diff --git a/board/warp/warp.c b/board/warp/warp.c
index a99e74b0c95..2d794b4344c 100644
--- a/board/warp/warp.c
+++ b/board/warp/warp.c
@@ -21,6 +21,7 @@
 #include <asm/io.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <common.h>
 #include <watchdog.h>
diff --git a/board/warp7/warp7.c b/board/warp7/warp7.c
index db255f36788..d696fcdaac5 100644
--- a/board/warp7/warp7.c
+++ b/board/warp7/warp7.c
@@ -23,6 +23,7 @@
 #include <netdev.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <power/pmic.h>
 #include <power/pfuze3000_pmic.h>
 #include "../freescale/common/pfuze.h"
diff --git a/board/xes/xpedite517x/ddr.c b/board/xes/xpedite517x/ddr.c
index 973da7099cc..2be421efd51 100644
--- a/board/xes/xpedite517x/ddr.c
+++ b/board/xes/xpedite517x/ddr.c
@@ -10,6 +10,7 @@
 #include <fsl_ddr_dimm_params.h>
 #include <log.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 void get_spd(ddr2_spd_eeprom_t *spd, u8 i2c_address)
 {
diff --git a/board/xes/xpedite517x/law.c b/board/xes/xpedite517x/law.c
index b72cdd0f2ed..cd4a66895cc 100644
--- a/board/xes/xpedite517x/law.c
+++ b/board/xes/xpedite517x/law.c
@@ -10,6 +10,7 @@
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 /*
  * Notes:
diff --git a/board/xes/xpedite520x/law.c b/board/xes/xpedite520x/law.c
index 34173b1d300..f7fa7d1d746 100644
--- a/board/xes/xpedite520x/law.c
+++ b/board/xes/xpedite520x/law.c
@@ -11,6 +11,7 @@
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 /*
  * Notes:
diff --git a/board/xes/xpedite520x/tlb.c b/board/xes/xpedite520x/tlb.c
index 3a10fdb83d5..9b848dfac58 100644
--- a/board/xes/xpedite520x/tlb.c
+++ b/board/xes/xpedite520x/tlb.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <asm/mmu.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/xes/xpedite537x/ddr.c b/board/xes/xpedite537x/ddr.c
index b34c190ee09..90498fb7045 100644
--- a/board/xes/xpedite537x/ddr.c
+++ b/board/xes/xpedite537x/ddr.c
@@ -8,6 +8,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
diff --git a/board/xes/xpedite537x/law.c b/board/xes/xpedite537x/law.c
index c69129cdd36..d6307642c1c 100644
--- a/board/xes/xpedite537x/law.c
+++ b/board/xes/xpedite537x/law.c
@@ -11,6 +11,7 @@
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 /*
  * Notes:
diff --git a/board/xes/xpedite537x/tlb.c b/board/xes/xpedite537x/tlb.c
index 6a1db856f43..fbacc934e80 100644
--- a/board/xes/xpedite537x/tlb.c
+++ b/board/xes/xpedite537x/tlb.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <asm/mmu.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/xes/xpedite550x/law.c b/board/xes/xpedite550x/law.c
index c4de11b2980..e07927e6e6d 100644
--- a/board/xes/xpedite550x/law.c
+++ b/board/xes/xpedite550x/law.c
@@ -11,6 +11,7 @@
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 /*
  * Notes:
diff --git a/board/xes/xpedite550x/tlb.c b/board/xes/xpedite550x/tlb.c
index 3bb913b1d0a..43587fd6f85 100644
--- a/board/xes/xpedite550x/tlb.c
+++ b/board/xes/xpedite550x/tlb.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <asm/mmu.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/xilinx/common/board.c b/board/xilinx/common/board.c
index 83ff23dacdc..19de01caf0c 100644
--- a/board/xilinx/common/board.c
+++ b/board/xilinx/common/board.c
@@ -12,6 +12,7 @@
 #include <dm/uclass.h>
 #include <i2c.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 #include "board.h"
 
diff --git a/board/xilinx/microblaze-generic/microblaze-generic.c b/board/xilinx/microblaze-generic/microblaze-generic.c
index 385f5c752a5..7e21ffc1958 100644
--- a/board/xilinx/microblaze-generic/microblaze-generic.c
+++ b/board/xilinx/microblaze-generic/microblaze-generic.c
@@ -20,6 +20,7 @@
 #include <dm/lists.h>
 #include <fdtdec.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/xilinx/zynq/cmds.c b/board/xilinx/zynq/cmds.c
index 372a9c0baa9..04afdb693e8 100644
--- a/board/xilinx/zynq/cmds.c
+++ b/board/xilinx/zynq/cmds.c
@@ -15,6 +15,7 @@
 #include <malloc.h>
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <u-boot/md5.h>
 #include <u-boot/rsa.h>
diff --git a/board/xilinx/zynqmp/cmds.c b/board/xilinx/zynqmp/cmds.c
index fe4ffba7fb6..52498147aef 100644
--- a/board/xilinx/zynqmp/cmds.c
+++ b/board/xilinx/zynqmp/cmds.c
@@ -16,6 +16,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/io.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 static int do_zynqmp_verify_secure(struct cmd_tbl *cmdtp, int flag, int argc,
 				   char *const argv[])
diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c
index 7c7266caa6f..91eb35436b6 100644
--- a/board/xilinx/zynqmp/zynqmp.c
+++ b/board/xilinx/zynqmp/zynqmp.c
@@ -38,6 +38,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <linux/string.h>
 #include "../common/board.h"
diff --git a/cmd/abootimg.c b/cmd/abootimg.c
index 73b6053c65d..3c6de9a8e80 100644
--- a/cmd/abootimg.c
+++ b/cmd/abootimg.c
@@ -11,6 +11,7 @@
 #include <mapmem.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #define abootimg_addr() \
diff --git a/cmd/acpi.c b/cmd/acpi.c
index a11cf5c29ac..c47cfdfd95b 100644
--- a/cmd/acpi.c
+++ b/cmd/acpi.c
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <display_options.h>
 #include <mapmem.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <acpi/acpi_table.h>
diff --git a/cmd/adtimg.c b/cmd/adtimg.c
index e31a5b10b56..ea6230ba1f0 100644
--- a/cmd/adtimg.c
+++ b/cmd/adtimg.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #define OPT_INDEX	"--index"
diff --git a/cmd/aes.c b/cmd/aes.c
index db4cd114628..b4a3dcc74c6 100644
--- a/cmd/aes.c
+++ b/cmd/aes.c
@@ -13,6 +13,7 @@
 #include <asm/byteorder.h>
 #include <linux/compiler.h>
 #include <mapmem.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 u32 aes_get_key_len(char *command)
diff --git a/cmd/avb.c b/cmd/avb.c
index 6cf9648670a..08711e3240a 100644
--- a/cmd/avb.c
+++ b/cmd/avb.c
@@ -13,6 +13,7 @@
 #include <mmc.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #define AVB_BOOTARGS	"avb_bootargs"
diff --git a/cmd/axi.c b/cmd/axi.c
index 68e8a06ae9e..8a3a5f68669 100644
--- a/cmd/axi.c
+++ b/cmd/axi.c
@@ -19,6 +19,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 /* Currently selected AXI bus device */
 static struct udevice *axi_cur_bus;
diff --git a/cmd/bcb.c b/cmd/bcb.c
index d145856d14f..e95111796c7 100644
--- a/cmd/bcb.c
+++ b/cmd/bcb.c
@@ -14,6 +14,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 enum bcb_cmd {
diff --git a/cmd/bind.c b/cmd/bind.c
index 91202fbd4a9..795b33cd84d 100644
--- a/cmd/bind.c
+++ b/cmd/bind.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <command.h>
 #include <dm.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <dm/device-internal.h>
diff --git a/cmd/blkcache.c b/cmd/blkcache.c
index 632f73a58c0..680bcd700a3 100644
--- a/cmd/blkcache.c
+++ b/cmd/blkcache.c
@@ -11,6 +11,7 @@
 #include <part.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/kernel.h>
 
 static int blkc_show(struct cmd_tbl *cmdtp, int flag,
 		     int argc, char *const argv[])
diff --git a/cmd/bmp.c b/cmd/bmp.c
index a4c8c3f5c06..d2ea39ed67a 100644
--- a/cmd/bmp.c
+++ b/cmd/bmp.c
@@ -23,6 +23,7 @@
 #include <video.h>
 #include <vsprintf.h>
 #include <asm/byteorder.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 static int bmp_info (ulong addr);
diff --git a/cmd/bootcount.c b/cmd/bootcount.c
index a1ad62ad419..d96e5099d24 100644
--- a/cmd/bootcount.c
+++ b/cmd/bootcount.c
@@ -4,6 +4,7 @@
 #include <command.h>
 #include <bootcount.h>
 #include <stdio.h>
+#include <linux/kernel.h>
 
 static int do_bootcount_print(struct cmd_tbl *cmdtp, int flag, int argc,
 			      char *const argv[])
diff --git a/cmd/bootm.c b/cmd/bootm.c
index 35c862768a1..2189593b589 100644
--- a/cmd/bootm.c
+++ b/cmd/bootm.c
@@ -23,6 +23,7 @@
 #include <linux/ctype.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <u-boot/zlib.h>
 #include <mapmem.h>
diff --git a/cmd/bootstage.c b/cmd/bootstage.c
index 3cf4138e2d4..3649e749cd9 100644
--- a/cmd/bootstage.c
+++ b/cmd/bootstage.c
@@ -8,6 +8,7 @@
 #include <command.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 static int do_bootstage_report(struct cmd_tbl *cmdtp, int flag, int argc,
diff --git a/cmd/clk.c b/cmd/clk.c
index 5946d527d35..a2bfce12aed 100644
--- a/cmd/clk.c
+++ b/cmd/clk.c
@@ -13,6 +13,7 @@
 #include <linux/clk-provider.h>
 #endif
 #include <stdio.h>
+#include <linux/kernel.h>
 
 #if defined(CONFIG_DM) && defined(CONFIG_CLK)
 static void show_clks(struct udevice *dev, int depth, int last_flag)
diff --git a/cmd/conitrace.c b/cmd/conitrace.c
index 0050831accf..50efdcd2695 100644
--- a/cmd/conitrace.c
+++ b/cmd/conitrace.c
@@ -7,6 +7,7 @@
  */
 #include <common.h>
 #include <command.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <linux/delay.h>
 
diff --git a/cmd/cpu.c b/cmd/cpu.c
index 4066f764292..a4b1ee5b577 100644
--- a/cmd/cpu.c
+++ b/cmd/cpu.c
@@ -13,6 +13,7 @@
 #include <errno.h>
 #include <stdio.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 static const char *cpu_feature_name[CPU_FEAT_COUNT] = {
 	"L1 cache",
diff --git a/cmd/cros_ec.c b/cmd/cros_ec.c
index 38f89dd05f6..7f089d7644f 100644
--- a/cmd/cros_ec.c
+++ b/cmd/cros_ec.c
@@ -16,6 +16,7 @@
 #include <vsprintf.h>
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 /* Note: depends on enum ec_current_image */
diff --git a/cmd/demo.c b/cmd/demo.c
index 4285ea0dfeb..a9dfb609514 100644
--- a/cmd/demo.c
+++ b/cmd/demo.c
@@ -13,6 +13,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/io.h>
+#include <linux/kernel.h>
 
 struct udevice *demo_dev;
 
diff --git a/cmd/dm.c b/cmd/dm.c
index 1dd19fe45b5..d606a8447c4 100644
--- a/cmd/dm.c
+++ b/cmd/dm.c
@@ -15,6 +15,7 @@
 #include <asm/io.h>
 #include <dm/root.h>
 #include <dm/util.h>
+#include <linux/kernel.h>
 
 static int do_dm_dump_all(struct cmd_tbl *cmdtp, int flag, int argc,
 			  char *const argv[])
diff --git a/cmd/eeprom.c b/cmd/eeprom.c
index 5d6df466c1c..d5b1ae536bb 100644
--- a/cmd/eeprom.c
+++ b/cmd/eeprom.c
@@ -25,6 +25,7 @@
 #include <eeprom.h>
 #include <i2c.h>
 #include <eeprom_layout.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/delay.h>
diff --git a/cmd/efi.c b/cmd/efi.c
index 762d4c1c380..dd48101ae89 100644
--- a/cmd/efi.c
+++ b/cmd/efi.c
@@ -14,6 +14,7 @@
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 static const char *const type_name[] = {
diff --git a/cmd/efidebug.c b/cmd/efidebug.c
index 185300cb0d8..f207e71b09e 100644
--- a/cmd/efidebug.c
+++ b/cmd/efidebug.c
@@ -18,6 +18,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/ctype.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #define BS systab.boottime
diff --git a/cmd/elf.c b/cmd/elf.c
index 3eaf1fe137d..325fb19d8fc 100644
--- a/cmd/elf.c
+++ b/cmd/elf.c
@@ -22,6 +22,7 @@
 #include <linux/linkage.h>
 #endif
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 /* Allow ports to override the default behavior */
diff --git a/cmd/ethsw.c b/cmd/ethsw.c
index 83a229720de..a9f43c0b09e 100644
--- a/cmd/ethsw.c
+++ b/cmd/ethsw.c
@@ -15,6 +15,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 static const char *ethsw_name;
diff --git a/cmd/fdt.c b/cmd/fdt.c
index ba44460ea39..8caff3e45ae 100644
--- a/cmd/fdt.c
+++ b/cmd/fdt.c
@@ -14,6 +14,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/ctype.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/types.h>
 #include <asm/global_data.h>
diff --git a/cmd/fpga.c b/cmd/fpga.c
index b3ec2b25568..d7e20a622d2 100644
--- a/cmd/fpga.c
+++ b/cmd/fpga.c
@@ -18,6 +18,7 @@
 #include <malloc.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 static long do_fpga_get_device(char *arg)
diff --git a/cmd/host.c b/cmd/host.c
index b06bbc922c9..50d953f7ff3 100644
--- a/cmd/host.c
+++ b/cmd/host.c
@@ -13,6 +13,7 @@
 #include <vsprintf.h>
 #include <dm/device_compat.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 static int host_curr_device = -1;
 
diff --git a/cmd/i2c.c b/cmd/i2c.c
index b8f587a26fa..f21ed9ee354 100644
--- a/cmd/i2c.c
+++ b/cmd/i2c.c
@@ -81,6 +81,7 @@
 #include <linux/compiler.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
 
diff --git a/cmd/ini.c b/cmd/ini.c
index 0c25c7ae5fe..7c3849bd50b 100644
--- a/cmd/ini.c
+++ b/cmd/ini.c
@@ -17,6 +17,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/ctype.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #ifdef CONFIG_INI_MAX_LINE
diff --git a/cmd/io.c b/cmd/io.c
index d16bb4f8c61..62141846bab 100644
--- a/cmd/io.c
+++ b/cmd/io.c
@@ -12,6 +12,7 @@
 #include <display_options.h>
 #include <vsprintf.h>
 #include <asm/io.h>
+#include <linux/kernel.h>
 
 /* Display values from last command */
 static ulong last_addr, last_size;
diff --git a/cmd/itest.c b/cmd/itest.c
index 0d0e1521953..5824a7f18d4 100644
--- a/cmd/itest.c
+++ b/cmd/itest.c
@@ -18,6 +18,7 @@
 #include <mapmem.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include <asm/io.h>
diff --git a/cmd/load.c b/cmd/load.c
index b2db540e8d1..c550f7643a9 100644
--- a/cmd/load.c
+++ b/cmd/load.c
@@ -24,6 +24,7 @@
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/cmd/log.c b/cmd/log.c
index 88efad8a9f9..d9c76ccdd2b 100644
--- a/cmd/log.c
+++ b/cmd/log.c
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 static char log_fmt_chars[LOGF_COUNT] = "clFLfm";
diff --git a/cmd/mem.c b/cmd/mem.c
index 2189318f237..b7b28565a6a 100644
--- a/cmd/mem.c
+++ b/cmd/mem.c
@@ -32,6 +32,7 @@
 #include <linux/compiler.h>
 #include <linux/ctype.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/cmd/mii.c b/cmd/mii.c
index 6afb9971794..aa7bb2b9f60 100644
--- a/cmd/mii.c
+++ b/cmd/mii.c
@@ -13,6 +13,7 @@
 #include <miiphy.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 typedef struct _MII_field_desc_t {
diff --git a/cmd/mmc.c b/cmd/mmc.c
index 72db2ea1fe6..c3fe18a5907 100644
--- a/cmd/mmc.c
+++ b/cmd/mmc.c
@@ -17,6 +17,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 static int curr_device = -1;
diff --git a/cmd/mtd.c b/cmd/mtd.c
index 70ba0d01c71..24144546f9a 100644
--- a/cmd/mtd.c
+++ b/cmd/mtd.c
@@ -19,6 +19,7 @@
 #include <dm/devres.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include <linux/ctype.h>
diff --git a/cmd/mvebu/bubt.c b/cmd/mvebu/bubt.c
index 45b1bd9c009..992e6106256 100644
--- a/cmd/mvebu/bubt.c
+++ b/cmd/mvebu/bubt.c
@@ -16,6 +16,7 @@
 #include <errno.h>
 #include <dm.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include <spi_flash.h>
diff --git a/cmd/nand.c b/cmd/nand.c
index f52343c42cd..f2f29a326fe 100644
--- a/cmd/nand.c
+++ b/cmd/nand.c
@@ -26,6 +26,7 @@
 #include <vsprintf.h>
 #include <asm/cache.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/mtd/mtd.h>
 #include <command.h>
 #include <console.h>
diff --git a/cmd/nvedit.c b/cmd/nvedit.c
index e450bb14a54..2fbbe52371b 100644
--- a/cmd/nvedit.c
+++ b/cmd/nvedit.c
@@ -40,6 +40,7 @@
 #include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
diff --git a/cmd/onenand.c b/cmd/onenand.c
index c71b8b98b9d..252636012c1 100644
--- a/cmd/onenand.c
+++ b/cmd/onenand.c
@@ -14,6 +14,7 @@
 #include <malloc.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/cmd/osd.c b/cmd/osd.c
index 6cccd8968c1..a7527f8a73d 100644
--- a/cmd/osd.c
+++ b/cmd/osd.c
@@ -18,6 +18,7 @@
 #include <malloc.h>
 #include <vsprintf.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 /* Container for selected OSD device */
diff --git a/cmd/part.c b/cmd/part.c
index 796fb65bacc..69bac982440 100644
--- a/cmd/part.c
+++ b/cmd/part.c
@@ -20,6 +20,7 @@
 #include <command.h>
 #include <env.h>
 #include <part.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/string.h>
diff --git a/cmd/pci.c b/cmd/pci.c
index ead55d46c21..1ce1a7a3627 100644
--- a/cmd/pci.c
+++ b/cmd/pci.c
@@ -25,6 +25,7 @@
 #include <asm/io.h>
 #include <pci.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 struct pci_reg_info {
diff --git a/cmd/pinmux.c b/cmd/pinmux.c
index 84cbf564e8a..1ca963501e1 100644
--- a/cmd/pinmux.c
+++ b/cmd/pinmux.c
@@ -11,6 +11,7 @@
 #include <dm/pinctrl.h>
 #include <dm/uclass-internal.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #define LIMIT_DEVNAME	30
diff --git a/cmd/pmc.c b/cmd/pmc.c
index 753d7b8fbf0..b73d68b6301 100644
--- a/cmd/pmc.c
+++ b/cmd/pmc.c
@@ -9,6 +9,7 @@
 #include <command.h>
 #include <dm.h>
 #include <stdio.h>
+#include <linux/kernel.h>
 #include <power/acpi_pmc.h>
 
 static int get_pmc_dev(struct udevice **devp)
diff --git a/cmd/pmic.c b/cmd/pmic.c
index 8e7956724f6..b26b1310558 100644
--- a/cmd/pmic.c
+++ b/cmd/pmic.c
@@ -11,6 +11,7 @@
 #include <vsprintf.h>
 #include <dm/uclass-internal.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <power/pmic.h>
 
 #define LIMIT_DEV	32
diff --git a/cmd/pxe.c b/cmd/pxe.c
index 8804faa170a..43b074ab976 100644
--- a/cmd/pxe.c
+++ b/cmd/pxe.c
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #include "pxe_utils.h"
 
diff --git a/cmd/pxe_utils.c b/cmd/pxe_utils.c
index af6071ed68a..86f280bb105 100644
--- a/cmd/pxe_utils.c
+++ b/cmd/pxe_utils.c
@@ -16,6 +16,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/ctype.h>
 #include <errno.h>
diff --git a/cmd/pxe_utils.h b/cmd/pxe_utils.h
index b5a7d278011..1a25ca4e88e 100644
--- a/cmd/pxe_utils.h
+++ b/cmd/pxe_utils.h
@@ -3,6 +3,7 @@
 #ifndef __PXE_UTILS_H
 #define __PXE_UTILS_H
 
+#include <stdbool.h>
 #include <linux/list.h>
 
 /*
diff --git a/cmd/qfw.c b/cmd/qfw.c
index 0cb6b85504d..ca60a05f6b1 100644
--- a/cmd/qfw.c
+++ b/cmd/qfw.c
@@ -10,6 +10,7 @@
 #include <qfw.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/kernel.h>
 
 /*
  * This function prepares kernel for zboot. It loads kernel data
diff --git a/cmd/regulator.c b/cmd/regulator.c
index e492da4f03c..e4968b7b372 100644
--- a/cmd/regulator.c
+++ b/cmd/regulator.c
@@ -11,6 +11,7 @@
 #include <vsprintf.h>
 #include <dm/uclass-internal.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include <power/regulator.h>
diff --git a/cmd/remoteproc.c b/cmd/remoteproc.c
index fbb40095aa6..48f0e4684ce 100644
--- a/cmd/remoteproc.c
+++ b/cmd/remoteproc.c
@@ -11,6 +11,7 @@
 #include <remoteproc.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 /**
diff --git a/cmd/rtc.c b/cmd/rtc.c
index 66d18b5973f..78af8534e4a 100644
--- a/cmd/rtc.c
+++ b/cmd/rtc.c
@@ -10,6 +10,7 @@
 #include <rtc.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #define MAX_RTC_BYTES 32
diff --git a/cmd/sb.c b/cmd/sb.c
index 16e37c18cb5..c1819d14c2b 100644
--- a/cmd/sb.c
+++ b/cmd/sb.c
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/state.h>
+#include <linux/kernel.h>
 
 static int do_sb_handoff(struct cmd_tbl *cmdtp, int flag, int argc,
 			 char *const argv[])
diff --git a/cmd/sf.c b/cmd/sf.c
index c6a69422ebd..d57da5f8b0b 100644
--- a/cmd/sf.c
+++ b/cmd/sf.c
@@ -21,6 +21,7 @@
 #include <vsprintf.h>
 #include <asm/cache.h>
 #include <jffs2/jffs2.h>
+#include <linux/kernel.h>
 #include <linux/mtd/mtd.h>
 #include <linux/string.h>
 
diff --git a/cmd/sound.c b/cmd/sound.c
index c01ee4bd4c9..d3f3aecfc66 100644
--- a/cmd/sound.c
+++ b/cmd/sound.c
@@ -12,6 +12,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/cmd/spl.c b/cmd/spl.c
index 20e783337e8..136bb0ceea1 100644
--- a/cmd/spl.c
+++ b/cmd/spl.c
@@ -13,6 +13,7 @@
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/cmd/test.c b/cmd/test.c
index e95b8cb4406..d16f83ef120 100644
--- a/cmd/test.c
+++ b/cmd/test.c
@@ -9,6 +9,7 @@
 #include <fs.h>
 #include <log.h>
 #include <vsprintf.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #define OP_INVALID	0
diff --git a/cmd/tlv_eeprom.c b/cmd/tlv_eeprom.c
index ca315dad0cc..da052a9845b 100644
--- a/cmd/tlv_eeprom.c
+++ b/cmd/tlv_eeprom.c
@@ -22,6 +22,7 @@
 #include <asm/global_data.h>
 #include <linux/ctype.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
 
diff --git a/cmd/tpm-v1.c b/cmd/tpm-v1.c
index 00d589fac07..0c96b10f06c 100644
--- a/cmd/tpm-v1.c
+++ b/cmd/tpm-v1.c
@@ -12,6 +12,7 @@
 #include <asm/unaligned.h>
 #include <tpm-common.h>
 #include <tpm-v1.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "tpm-user-utils.h"
 
diff --git a/cmd/tpm-v2.c b/cmd/tpm-v2.c
index 56c5aca12c8..2be09f547d5 100644
--- a/cmd/tpm-v2.c
+++ b/cmd/tpm-v2.c
@@ -14,6 +14,7 @@
 #include <tpm-v2.h>
 #include <vsprintf.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "tpm-user-utils.h"
 
diff --git a/cmd/tpm_test.c b/cmd/tpm_test.c
index 39d1ad2b4af..3a345877a25 100644
--- a/cmd/tpm_test.c
+++ b/cmd/tpm_test.c
@@ -10,6 +10,7 @@
 #include <stdio.h>
 #include <time.h>
 #include <tpm-v1.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include "tpm-user-utils.h"
 
diff --git a/cmd/trace.c b/cmd/trace.c
index 0de1ac02ae2..46b498700e9 100644
--- a/cmd/trace.c
+++ b/cmd/trace.c
@@ -11,6 +11,7 @@
 #include <trace.h>
 #include <vsprintf.h>
 #include <asm/io.h>
+#include <linux/kernel.h>
 
 static int get_args(int argc, char *const argv[], char **buff,
 		    size_t *buff_ptr, size_t *buff_size)
diff --git a/cmd/ubi.c b/cmd/ubi.c
index 54955f5ef2f..80c175eec51 100644
--- a/cmd/ubi.c
+++ b/cmd/ubi.c
@@ -23,6 +23,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <dm/devres.h>
+#include <linux/kernel.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 #include <linux/err.h>
diff --git a/cmd/x86/fsp.c b/cmd/x86/fsp.c
index ef49b530b55..933fe8af406 100644
--- a/cmd/x86/fsp.c
+++ b/cmd/x86/fsp.c
@@ -8,6 +8,7 @@
 #include <stdio.h>
 #include <asm/fsp/fsp_support.h>
 #include <asm/global_data.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/cmd/x86/hob.c b/cmd/x86/hob.c
index 37f54052165..ed1c42f4934 100644
--- a/cmd/x86/hob.c
+++ b/cmd/x86/hob.c
@@ -10,6 +10,7 @@
 #include <uuid.h>
 #include <asm/global_data.h>
 #include <asm/hob.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/cmd/x86/mtrr.c b/cmd/x86/mtrr.c
index 2f2e205d710..a766eca7856 100644
--- a/cmd/x86/mtrr.c
+++ b/cmd/x86/mtrr.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <command.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/msr.h>
diff --git a/cmd/ximg.c b/cmd/ximg.c
index 11acfaab4d9..68f3d14c5b7 100644
--- a/cmd/ximg.c
+++ b/cmd/ximg.c
@@ -28,6 +28,7 @@
 #include <asm/byteorder.h>
 #include <asm/cache.h>
 #include <asm/io.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #ifndef CONFIG_SYS_XIMG_LEN
diff --git a/common/android_ab.c b/common/android_ab.c
index 4c58f7a75c8..5b0cb0b1d75 100644
--- a/common/android_ab.c
+++ b/common/android_ab.c
@@ -12,6 +12,7 @@
 #include <memalign.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
 #include <u-boot/crc.h>
diff --git a/common/autoboot.c b/common/autoboot.c
index 4ba7e25588a..55bb2ee7adf 100644
--- a/common/autoboot.c
+++ b/common/autoboot.c
@@ -18,6 +18,7 @@
 #include <memalign.h>
 #include <menu.h>
 #include <post.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <vsprintf.h>
diff --git a/common/avb_verify.c b/common/avb_verify.c
index 230d576835d..4c825e8553b 100644
--- a/common/avb_verify.c
+++ b/common/avb_verify.c
@@ -14,6 +14,7 @@
 #include <stdio.h>
 #include <tee.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <tee/optee_ta_avb.h>
 
diff --git a/common/bloblist.c b/common/bloblist.c
index 20a29c82bb5..234c40e741a 100644
--- a/common/bloblist.c
+++ b/common/bloblist.c
@@ -11,6 +11,7 @@
 #include <spl.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
 
diff --git a/common/board_f.c b/common/board_f.c
index 4ad67042769..c342404bc0d 100644
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -57,6 +57,7 @@
 #include <asm/u-boot.h>
 #include <dm/root.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 /*
diff --git a/common/board_r.c b/common/board_r.c
index 0c8be80d76e..1fd3ff02162 100644
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -27,6 +27,7 @@
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <u-boot/crc.h>
 /* TODO: can we just include all these headers whether needed or not? */
 #if defined(CONFIG_CMD_BEDBUG)
diff --git a/common/bootm.c b/common/bootm.c
index d1687238f2a..08570826e22 100644
--- a/common/bootm.c
+++ b/common/bootm.c
@@ -27,6 +27,7 @@
 #endif
 #include <asm/u-boot.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #else
 #include "mkimage.h"
diff --git a/common/bootm_os.c b/common/bootm_os.c
index 2496a3cc624..16c8a78722a 100644
--- a/common/bootm_os.c
+++ b/common/bootm_os.c
@@ -18,6 +18,7 @@
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <malloc.h>
 #include <mapmem.h>
diff --git a/common/bootstage.c b/common/bootstage.c
index 9eaa65b009f..ddb78a5dcea 100644
--- a/common/bootstage.c
+++ b/common/bootstage.c
@@ -16,6 +16,7 @@
 #include <malloc.h>
 #include <sort.h>
 #include <spl.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
diff --git a/common/bouncebuf.c b/common/bouncebuf.c
index 519ca264992..8051c016942 100644
--- a/common/bouncebuf.c
+++ b/common/bouncebuf.c
@@ -13,6 +13,7 @@
 #include <bouncebuf.h>
 #include <asm/cache.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 static int addr_aligned(struct bounce_buffer *state)
diff --git a/common/cli.c b/common/cli.c
index 88053b58701..a83c606ee9e 100644
--- a/common/cli.c
+++ b/common/cli.c
@@ -18,6 +18,7 @@
 #include <fdtdec.h>
 #include <hang.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/string.h>
diff --git a/common/cli_hush.c b/common/cli_hush.c
index 34facc8397e..828b10db860 100644
--- a/common/cli_hush.c
+++ b/common/cli_hush.c
@@ -90,6 +90,7 @@
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #endif
 #ifndef __U_BOOT__
diff --git a/common/console.c b/common/console.c
index cbede53f04f..f7ddc1dcafc 100644
--- a/common/console.c
+++ b/common/console.c
@@ -16,6 +16,7 @@
 #include <mapmem.h>
 #include <os.h>
 #include <serial.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdio_dev.h>
 #include <exports.h>
diff --git a/common/dfu.c b/common/dfu.c
index 75fd3e088ef..13a3591b038 100644
--- a/common/dfu.c
+++ b/common/dfu.c
@@ -13,6 +13,7 @@
 #include <common.h>
 #include <command.h>
 #include <log.h>
+#include <stdbool.h>
 #include <time.h>
 #include <watchdog.h>
 #include <dfu.h>
diff --git a/common/dlmalloc.c b/common/dlmalloc.c
index 801d8633bae..0f9e0d94378 100644
--- a/common/dlmalloc.c
+++ b/common/dlmalloc.c
@@ -3,6 +3,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #if CONFIG_IS_ENABLED(UNIT_TEST)
diff --git a/common/edid.c b/common/edid.c
index b047c724630..a1b266e9c18 100644
--- a/common/edid.c
+++ b/common/edid.c
@@ -17,6 +17,7 @@
 #include <stdio.h>
 #include <linux/ctype.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 int edid_check_info(struct edid1_info *edid_info)
diff --git a/common/eeprom/eeprom_field.c b/common/eeprom/eeprom_field.c
index d67b0f4f0b8..7fd2a2fa4fa 100644
--- a/common/eeprom/eeprom_field.c
+++ b/common/eeprom/eeprom_field.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/string.h>
diff --git a/common/fdt_support.c b/common/fdt_support.c
index d506d580914..230e599a44c 100644
--- a/common/fdt_support.c
+++ b/common/fdt_support.c
@@ -15,6 +15,7 @@
 #include <stdio_dev.h>
 #include <vsprintf.h>
 #include <linux/ctype.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/types.h>
 #include <asm/global_data.h>
diff --git a/common/hash.c b/common/hash.c
index e44fdedc2fa..91b2fc41eb5 100644
--- a/common/hash.c
+++ b/common/hash.c
@@ -23,6 +23,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
 #else
diff --git a/common/image-android-dt.c b/common/image-android-dt.c
index 74dcbdd1608..456c4c584f0 100644
--- a/common/image-android-dt.c
+++ b/common/image-android-dt.c
@@ -7,6 +7,7 @@
 #include <image-android-dt.h>
 #include <dt_table.h>
 #include <common.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <linux/libfdt.h>
 #include <mapmem.h>
diff --git a/common/image-android.c b/common/image-android.c
index 1615f2c415d..a4dea76bde5 100644
--- a/common/image-android.c
+++ b/common/image-android.c
@@ -14,6 +14,7 @@
 #include <asm/unaligned.h>
 #include <mapmem.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <linux/string.h>
 
diff --git a/common/image-cipher.c b/common/image-cipher.c
index d9a1230f26f..7a9892b930c 100644
--- a/common/image-cipher.c
+++ b/common/image-cipher.c
@@ -12,6 +12,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 DECLARE_GLOBAL_DATA_PTR;
 #endif /* !USE_HOSdTCC*/
diff --git a/common/image-fit-sig.c b/common/image-fit-sig.c
index e65e27f5109..52e82777e3d 100644
--- a/common/image-fit-sig.c
+++ b/common/image-fit-sig.c
@@ -13,6 +13,7 @@
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 DECLARE_GLOBAL_DATA_PTR;
 #endif /* !USE_HOSTCC*/
diff --git a/common/image-fit.c b/common/image-fit.c
index bc12b3fe0e6..a0683072b43 100644
--- a/common/image-fit.c
+++ b/common/image-fit.c
@@ -14,6 +14,7 @@
 #include <linux/libfdt.h>
 #include <u-boot/crc.h>
 #else
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/compiler.h>
diff --git a/common/image-sig.c b/common/image-sig.c
index 6cb5bedc8a9..aef02638d79 100644
--- a/common/image-sig.c
+++ b/common/image-sig.c
@@ -13,6 +13,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <asm/global_data.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 DECLARE_GLOBAL_DATA_PTR;
 #endif /* !USE_HOSTCC*/
diff --git a/common/image.c b/common/image.c
index 565a5ebeed5..341807059ee 100644
--- a/common/image.c
+++ b/common/image.c
@@ -19,6 +19,7 @@
 #include <vsprintf.h>
 #include <asm/cache.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
 #include <watchdog.h>
diff --git a/common/init/board_init.c b/common/init/board_init.c
index 319d59b5164..d3059c46bdc 100644
--- a/common/init/board_init.c
+++ b/common/init/board_init.c
@@ -10,6 +10,7 @@
 #include <bootstage.h>
 #include <init.h>
 #include <asm/global_data.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/common/iotrace.c b/common/iotrace.c
index 63d0cca3a00..d342e317d63 100644
--- a/common/iotrace.c
+++ b/common/iotrace.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <mapmem.h>
+#include <stdbool.h>
 #include <time.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/common/lcd.c b/common/lcd.c
index f71477c2963..b4352229c5b 100644
--- a/common/lcd.c
+++ b/common/lcd.c
@@ -18,6 +18,7 @@
 #include <asm/cache.h>
 #include <init.h>
 #include <asm/global_data.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/types.h>
 #include <stdio_dev.h>
diff --git a/common/lcd_console.c b/common/lcd_console.c
index 6c70b88e10e..fe2ef2f5b9e 100644
--- a/common/lcd_console.c
+++ b/common/lcd_console.c
@@ -17,6 +17,7 @@
 #include <bmp_logo.h>
 #endif
 #include <vsprintf.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 static struct console_t cons;
diff --git a/common/log.c b/common/log.c
index 79e23aacece..c8d13365caa 100644
--- a/common/log.c
+++ b/common/log.c
@@ -14,6 +14,7 @@
 #include <asm/global_data.h>
 #include <dm/uclass.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/common/malloc_simple.c b/common/malloc_simple.c
index 805b044515f..b8b9d7608cd 100644
--- a/common/malloc_simple.c
+++ b/common/malloc_simple.c
@@ -13,6 +13,7 @@
 #include <mapmem.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/common/spl/spl.c b/common/spl/spl.c
index 671bda67ed7..51d777f4ee7 100644
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -25,6 +25,7 @@
 #include <nand.h>
 #include <fat.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
 #include <version.h>
diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c
index 4d588a85c8f..7a65035ba86 100644
--- a/common/spl/spl_fit.c
+++ b/common/spl/spl_fit.c
@@ -13,6 +13,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <spl.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
diff --git a/common/spl/spl_sata.c b/common/spl/spl_sata.c
index 599243f1823..33311c2813a 100644
--- a/common/spl/spl_sata.c
+++ b/common/spl/spl_sata.c
@@ -18,6 +18,7 @@
 #include <fat.h>
 #include <image.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #ifndef CONFIG_SYS_SATA_FAT_BOOT_PARTITION
 #define CONFIG_SYS_SATA_FAT_BOOT_PARTITION	1
diff --git a/common/spl/spl_spi.c b/common/spl/spl_spi.c
index 1121813abf0..0974e9e6f5d 100644
--- a/common/spl/spl_spi.c
+++ b/common/spl/spl_spi.c
@@ -18,6 +18,7 @@
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/common/splash.c b/common/splash.c
index 174f82486eb..575003e6561 100644
--- a/common/splash.c
+++ b/common/splash.c
@@ -28,6 +28,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/errno.h>
+#include <linux/kernel.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 9c5c285b76e..be7e90c3880 100644
--- a/common/splash_source.c
+++ b/common/splash_source.c
@@ -24,6 +24,7 @@
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/common/update.c b/common/update.c
index ab92824c70f..f5041c6171a 100644
--- a/common/update.c
+++ b/common/update.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <image.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/errno.h>
diff --git a/common/usb.c b/common/usb.c
index 16b51e8f4c7..98e7582c2a2 100644
--- a/common/usb.c
+++ b/common/usb.c
@@ -31,6 +31,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <memalign.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/processor.h>
 #include <linux/compiler.h>
diff --git a/common/usb_hub.c b/common/usb_hub.c
index 46d074f0b55..5abbb1b0a40 100644
--- a/common/usb_hub.c
+++ b/common/usb_hub.c
@@ -37,6 +37,7 @@
 #include <linux/ctype.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/list.h>
 #include <asm/byteorder.h>
 #ifdef CONFIG_SANDBOX
diff --git a/common/usb_kbd.c b/common/usb_kbd.c
index 3fafbda40fd..b2967330b69 100644
--- a/common/usb_kbd.c
+++ b/common/usb_kbd.c
@@ -20,6 +20,7 @@
 #include <watchdog.h>
 #include <asm/byteorder.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include <usb.h>
diff --git a/common/xyzModem.c b/common/xyzModem.c
index 46dbf7c7ee6..732548f4f2d 100644
--- a/common/xyzModem.c
+++ b/common/xyzModem.c
@@ -22,6 +22,7 @@
  *==========================================================================
  */
 #include <common.h>
+#include <stdbool.h>
 #include <time.h>
 #include <vsprintf.h>
 #include <xyzModem.h>
diff --git a/disk/part_dos.c b/disk/part_dos.c
index 4c4e5dfe11c..55d5955f738 100644
--- a/disk/part_dos.c
+++ b/disk/part_dos.c
@@ -20,6 +20,7 @@
 #include <memalign.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/kernel.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 f062bc383ea..611df0bcf6c 100644
--- a/disk/part_efi.c
+++ b/disk/part_efi.c
@@ -28,6 +28,7 @@
 #include <linux/compiler.h>
 #include <linux/ctype.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
diff --git a/drivers/adc/adc-uclass.c b/drivers/adc/adc-uclass.c
index fa88040126f..f4d108477d7 100644
--- a/drivers/adc/adc-uclass.c
+++ b/drivers/adc/adc-uclass.c
@@ -8,6 +8,7 @@
 #include <errno.h>
 #include <div64.h>
 #include <dm.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <dm/lists.h>
 #include <dm/device-internal.h>
diff --git a/drivers/adc/meson-saradc.c b/drivers/adc/meson-saradc.c
index 785d37c238f..cf2d0c14408 100644
--- a/drivers/adc/meson-saradc.c
+++ b/drivers/adc/meson-saradc.c
@@ -18,6 +18,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/math64.h>
 #include <linux/bitfield.h>
 #include <linux/printk.h>
diff --git a/drivers/adc/stm32-adc-core.c b/drivers/adc/stm32-adc-core.c
index a40de83fd5b..0e624ea222e 100644
--- a/drivers/adc/stm32-adc-core.c
+++ b/drivers/adc/stm32-adc-core.c
@@ -11,6 +11,7 @@
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <power/regulator.h>
 #include "stm32-adc-core.h"
 
diff --git a/drivers/adc/stm32-adc.c b/drivers/adc/stm32-adc.c
index 431dfa4c435..8c1229a383d 100644
--- a/drivers/adc/stm32-adc.c
+++ b/drivers/adc/stm32-adc.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <adc.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index e31e280f541..1424708b59c 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -16,6 +16,7 @@
 #include <time.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include <command.h>
diff --git a/drivers/ata/fsl_sata.c b/drivers/ata/fsl_sata.c
index cdc4c678d7a..83395ef22c6 100644
--- a/drivers/ata/fsl_sata.c
+++ b/drivers/ata/fsl_sata.c
@@ -23,6 +23,7 @@
 #include <sata.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "fsl_sata.h"
 
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index 849b6892ba8..b459ac5aa3b 100644
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -52,6 +52,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/io.h>
+#include <linux/kernel.h>
 #include <linux/mbus.h>
 #include <linux/string.h>
 
diff --git a/drivers/axi/axi-emul-uclass.c b/drivers/axi/axi-emul-uclass.c
index fb56b824513..e4ba71f21f1 100644
--- a/drivers/axi/axi-emul-uclass.c
+++ b/drivers/axi/axi-emul-uclass.c
@@ -11,6 +11,7 @@
 #include <dm/device-internal.h>
 #include <asm/axi.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 int axi_sandbox_get_emul(struct udevice *bus, ulong address,
 			 enum axi_size_t size, struct udevice **emulp)
diff --git a/drivers/axi/sandbox_store.c b/drivers/axi/sandbox_store.c
index 72a4191946e..7342230eb7f 100644
--- a/drivers/axi/sandbox_store.c
+++ b/drivers/axi/sandbox_store.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 /**
  * struct sandbox_store_priv - Private data structure of a AXI store device
diff --git a/drivers/bios_emulator/atibios.c b/drivers/bios_emulator/atibios.c
index d49839542a5..b57d512ebb7 100644
--- a/drivers/bios_emulator/atibios.c
+++ b/drivers/bios_emulator/atibios.c
@@ -51,6 +51,7 @@
 #include <errno.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vbe.h>
 #include <linux/delay.h>
diff --git a/drivers/bios_emulator/x86emu/prim_ops.c b/drivers/bios_emulator/x86emu/prim_ops.c
index 5f6c795fb7f..7fe968cb817 100644
--- a/drivers/bios_emulator/x86emu/prim_ops.c
+++ b/drivers/bios_emulator/x86emu/prim_ops.c
@@ -98,6 +98,7 @@
 ****************************************************************************/
 
 #include <common.h>
+#include <linux/kernel.h>
 
 #define PRIM_OPS_NO_REDEFINE_ASM
 #include "x86emu/x86emui.h"
diff --git a/drivers/board/board-uclass.c b/drivers/board/board-uclass.c
index 57a28f065bf..7a83862563c 100644
--- a/drivers/board/board-uclass.c
+++ b/drivers/board/board-uclass.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <board.h>
+#include <stdbool.h>
 #include <linux/errno.h>
 
 int board_get(struct udevice **devp)
diff --git a/drivers/board/gazerbeam.c b/drivers/board/gazerbeam.c
index 7be676fff58..8c0a70d15b6 100644
--- a/drivers/board/gazerbeam.c
+++ b/drivers/board/gazerbeam.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <asm/gpio.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #include "gazerbeam.h"
 
diff --git a/drivers/board/sandbox.c b/drivers/board/sandbox.c
index 5de82750418..0ed52a77396 100644
--- a/drivers/board/sandbox.c
+++ b/drivers/board/sandbox.c
@@ -9,6 +9,7 @@
 #include <board.h>
 #include <vsprintf.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #include "sandbox.h"
 
diff --git a/drivers/bootcount/bootcount.c b/drivers/bootcount/bootcount.c
index 0a2fb50efea..82de6f72069 100644
--- a/drivers/bootcount/bootcount.c
+++ b/drivers/bootcount/bootcount.c
@@ -9,6 +9,7 @@
 #include <asm/cache.h>
 #include <linux/compiler.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #if !defined(CONFIG_DM_BOOTCOUNT)
 /* Now implement the generic default functions */
diff --git a/drivers/clk/altera/clk-agilex.c b/drivers/clk/altera/clk-agilex.c
index e6c01dd7b32..358201e3d98 100644
--- a/drivers/clk/altera/clk-agilex.c
+++ b/drivers/clk/altera/clk-agilex.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <clk-uclass.h>
diff --git a/drivers/clk/altera/clk-arria10.c b/drivers/clk/altera/clk-arria10.c
index 85300e61178..53e28ed76d0 100644
--- a/drivers/clk/altera/clk-arria10.c
+++ b/drivers/clk/altera/clk-arria10.c
@@ -15,6 +15,7 @@
 #include <dm/util.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include <asm/arch/clock_manager.h>
diff --git a/drivers/clk/analogbits/wrpll-cln28hpc.c b/drivers/clk/analogbits/wrpll-cln28hpc.c
index 291a23d93f7..66464300377 100644
--- a/drivers/clk/analogbits/wrpll-cln28hpc.c
+++ b/drivers/clk/analogbits/wrpll-cln28hpc.c
@@ -24,6 +24,7 @@
 #include <linux/bug.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/log2.h>
 #include <linux/math64.h>
 #include <linux/clk/analogbits-wrpll-cln28hpc.h>
diff --git a/drivers/clk/aspeed/clk_ast2500.c b/drivers/clk/aspeed/clk_ast2500.c
index e837e0cd19a..038898abbb0 100644
--- a/drivers/clk/aspeed/clk_ast2500.c
+++ b/drivers/clk/aspeed/clk_ast2500.c
@@ -15,6 +15,7 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 /*
  * MAC Clock Delay settings, taken from Aspeed SDK
diff --git a/drivers/clk/at91/clk-generated.c b/drivers/clk/at91/clk-generated.c
index a65cadee372..4948f02c42f 100644
--- a/drivers/clk/at91/clk-generated.c
+++ b/drivers/clk/at91/clk-generated.c
@@ -12,6 +12,7 @@
 #include <asm/global_data.h>
 #include <linux/err.h>
 #include <linux/io.h>
+#include <linux/kernel.h>
 #include <mach/at91_pmc.h>
 #include "pmc.h"
 
diff --git a/drivers/clk/at91/clk-usb.c b/drivers/clk/at91/clk-usb.c
index 416a5007f68..3b5fedd9bbe 100644
--- a/drivers/clk/at91/clk-usb.c
+++ b/drivers/clk/at91/clk-usb.c
@@ -11,6 +11,7 @@
 #include <dm/device.h>
 #include <linux/err.h>
 #include <linux/io.h>
+#include <linux/kernel.h>
 #include <mach/at91_pmc.h>
 #include "pmc.h"
 
diff --git a/drivers/clk/at91/pmc.c b/drivers/clk/at91/pmc.c
index 91e57b38777..4b22c819229 100644
--- a/drivers/clk/at91/pmc.c
+++ b/drivers/clk/at91/pmc.c
@@ -8,6 +8,7 @@
 #include <clk-uclass.h>
 #include <dm.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 #include <dm/lists.h>
 #include <dm/util.h>
diff --git a/drivers/clk/clk-divider.c b/drivers/clk/clk-divider.c
index d2039512b21..fb5029c40a3 100644
--- a/drivers/clk/clk-divider.c
+++ b/drivers/clk/clk-divider.c
@@ -22,6 +22,7 @@
 #include <linux/clk-provider.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/log2.h>
 #include <div64.h>
 #include <clk.h>
diff --git a/drivers/clk/clk-hsdk-cgu.c b/drivers/clk/clk-hsdk-cgu.c
index 6f4cd1ecf2a..c2b33b41f84 100644
--- a/drivers/clk/clk-hsdk-cgu.c
+++ b/drivers/clk/clk-hsdk-cgu.c
@@ -20,6 +20,7 @@
 #include <linux/errno.h>
 #include <linux/io.h>
 #include <asm/arcregs.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 
 #include <dt-bindings/clock/snps,hsdk-cgu.h>
diff --git a/drivers/clk/clk-ti-sci.c b/drivers/clk/clk-ti-sci.c
index 0f31ee73d9e..45ce1995d03 100644
--- a/drivers/clk/clk-ti-sci.c
+++ b/drivers/clk/clk-ti-sci.c
@@ -17,6 +17,7 @@
 #include <dm/device_compat.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/soc/ti/ti_sci_protocol.h>
 #include <k3-avs.h>
 
diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
index 5dac14c185e..f2d0981e191 100644
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <clk-uclass.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <dm/device.h>
 #include <dm/uclass.h>
diff --git a/drivers/clk/clk_sandbox.c b/drivers/clk/clk_sandbox.c
index d1e2c0dab31..ad68c617407 100644
--- a/drivers/clk/clk_sandbox.c
+++ b/drivers/clk/clk_sandbox.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <asm/clk.h>
 #include <linux/errno.h>
 
diff --git a/drivers/clk/clk_sandbox_ccf.c b/drivers/clk/clk_sandbox_ccf.c
index b282735c1d6..b528c635552 100644
--- a/drivers/clk/clk_sandbox_ccf.c
+++ b/drivers/clk/clk_sandbox_ccf.c
@@ -18,6 +18,7 @@
 #include <sandbox-clk.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 /*
  * Sandbox implementation of CCF primitives necessary for clk-uclass testing
diff --git a/drivers/clk/clk_stm32f.c b/drivers/clk/clk_stm32f.c
index 4d0eadf7e4f..b0d5699e080 100644
--- a/drivers/clk/clk_stm32f.c
+++ b/drivers/clk/clk_stm32f.c
@@ -11,6 +11,7 @@
 #include <stm32_rcc.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/clk/clk_stm32mp1.c b/drivers/clk/clk_stm32mp1.c
index e7e57ad73a9..a57f3f81f73 100644
--- a/drivers/clk/clk_stm32mp1.c
+++ b/drivers/clk/clk_stm32mp1.c
@@ -23,6 +23,7 @@
 #include <asm/arch/sys_proto.h>
 #include <dt-bindings/clock/stm32mp1-clks.h>
 #include <dt-bindings/clock/stm32mp1-clksrc.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/clk/clk_versal.c b/drivers/clk/clk_versal.c
index b73dcc2980d..de309923b10 100644
--- a/drivers/clk/clk_versal.c
+++ b/drivers/clk/clk_versal.c
@@ -20,6 +20,7 @@
 #include <zynqmp_firmware.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #define MAX_PARENT			100
diff --git a/drivers/clk/clk_zynq.c b/drivers/clk/clk_zynq.c
index 2c8b851295c..e20b668fd84 100644
--- a/drivers/clk/clk_zynq.c
+++ b/drivers/clk/clk_zynq.c
@@ -21,6 +21,7 @@
 #include <asm/arch/hardware.h>
 #include <asm/arch/sys_proto.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 /* Register bitfield defines */
 #define PLLCTRL_FBDIV_MASK	0x7f000
diff --git a/drivers/clk/clk_zynqmp.c b/drivers/clk/clk_zynqmp.c
index 3ebf6223c06..0fb220022ca 100644
--- a/drivers/clk/clk_zynqmp.c
+++ b/drivers/clk/clk_zynqmp.c
@@ -17,6 +17,7 @@
 #include <dm.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 static const resource_size_t zynqmp_crf_apb_clkc_base = 0xfd1a0020;
 static const resource_size_t zynqmp_crl_apb_clkc_base = 0xff5e0020;
diff --git a/drivers/clk/imx/clk-composite-8m.c b/drivers/clk/imx/clk-composite-8m.c
index 64756ed9e64..d03e48bfb3c 100644
--- a/drivers/clk/imx/clk-composite-8m.c
+++ b/drivers/clk/imx/clk-composite-8m.c
@@ -13,6 +13,7 @@
 #include <linux/clk-provider.h>
 #include <clk.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include "clk.h"
 #include <linux/err.h>
 
diff --git a/drivers/clk/imx/clk-gate2.c b/drivers/clk/imx/clk-gate2.c
index 0e3678acc63..f1b06731bce 100644
--- a/drivers/clk/imx/clk-gate2.c
+++ b/drivers/clk/imx/clk-gate2.c
@@ -23,6 +23,7 @@
 #include <linux/clk-provider.h>
 #include <clk.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include "clk.h"
 #include <linux/err.h>
 
diff --git a/drivers/clk/imx/clk-imx6q.c b/drivers/clk/imx/clk-imx6q.c
index 709c2883da5..ddfa3deccbd 100644
--- a/drivers/clk/imx/clk-imx6q.c
+++ b/drivers/clk/imx/clk-imx6q.c
@@ -13,6 +13,7 @@
 #include <asm/arch/imx-regs.h>
 #include <dt-bindings/clock/imx6qdl-clock.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #include "clk.h"
 
diff --git a/drivers/clk/imx/clk-imx8.c b/drivers/clk/imx/clk-imx8.c
index 63fd42a2946..8b09554d3f4 100644
--- a/drivers/clk/imx/clk-imx8.c
+++ b/drivers/clk/imx/clk-imx8.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/arch/sci/sci.h>
 #include <asm/arch/clock.h>
diff --git a/drivers/clk/imx/clk-imx8.h b/drivers/clk/imx/clk-imx8.h
index 68ad6755e80..7a1433d2af6 100644
--- a/drivers/clk/imx/clk-imx8.h
+++ b/drivers/clk/imx/clk-imx8.h
@@ -4,6 +4,7 @@
  * Peng Fan <peng.fan@nxp.com>
  */
 
+#include <stdbool.h>
 struct imx8_clks {
 	ulong id;
 	const char *name;
diff --git a/drivers/clk/imx/clk-imx8mm.c b/drivers/clk/imx/clk-imx8mm.c
index 081d8aee01b..02a006dd58e 100644
--- a/drivers/clk/imx/clk-imx8mm.c
+++ b/drivers/clk/imx/clk-imx8mm.c
@@ -13,6 +13,7 @@
 #include <asm/arch/imx-regs.h>
 #include <dt-bindings/clock/imx8mm-clock.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #include "clk.h"
 
diff --git a/drivers/clk/imx/clk-imx8mn.c b/drivers/clk/imx/clk-imx8mn.c
index c35689bdea4..e8286e5e164 100644
--- a/drivers/clk/imx/clk-imx8mn.c
+++ b/drivers/clk/imx/clk-imx8mn.c
@@ -13,6 +13,7 @@
 #include <asm/arch/imx-regs.h>
 #include <dt-bindings/clock/imx8mn-clock.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #include "clk.h"
 
diff --git a/drivers/clk/imx/clk-imx8mp.c b/drivers/clk/imx/clk-imx8mp.c
index 883a29a4f31..b6a6ad73a68 100644
--- a/drivers/clk/imx/clk-imx8mp.c
+++ b/drivers/clk/imx/clk-imx8mp.c
@@ -13,6 +13,7 @@
 #include <asm/arch/imx-regs.h>
 #include <dt-bindings/clock/imx8mp-clock.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #include "clk.h"
 
diff --git a/drivers/clk/imx/clk-imx8qm.c b/drivers/clk/imx/clk-imx8qm.c
index 1a818694d25..e21102c319d 100644
--- a/drivers/clk/imx/clk-imx8qm.c
+++ b/drivers/clk/imx/clk-imx8qm.c
@@ -15,6 +15,7 @@
 #include <dt-bindings/soc/imx_rsrc.h>
 #include <misc.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #include "clk-imx8.h"
 
diff --git a/drivers/clk/imx/clk-imx8qxp.c b/drivers/clk/imx/clk-imx8qxp.c
index 755d8518f64..d061f11a756 100644
--- a/drivers/clk/imx/clk-imx8qxp.c
+++ b/drivers/clk/imx/clk-imx8qxp.c
@@ -15,6 +15,7 @@
 #include <dt-bindings/soc/imx_rsrc.h>
 #include <misc.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #include "clk-imx8.h"
 
diff --git a/drivers/clk/imx/clk-imxrt1020.c b/drivers/clk/imx/clk-imxrt1020.c
index 6bf82fee4eb..898dfe31084 100644
--- a/drivers/clk/imx/clk-imxrt1020.c
+++ b/drivers/clk/imx/clk-imxrt1020.c
@@ -12,6 +12,7 @@
 #include <asm/arch/imx-regs.h>
 #include <dt-bindings/clock/imxrt1020-clock.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #include "clk.h"
 
diff --git a/drivers/clk/imx/clk-imxrt1050.c b/drivers/clk/imx/clk-imxrt1050.c
index 4127fa75236..fc022f54a75 100644
--- a/drivers/clk/imx/clk-imxrt1050.c
+++ b/drivers/clk/imx/clk-imxrt1050.c
@@ -13,6 +13,7 @@
 #include <asm/arch/imx-regs.h>
 #include <dt-bindings/clock/imxrt1050-clock.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #include "clk.h"
 
diff --git a/drivers/clk/imx/clk-pfd.c b/drivers/clk/imx/clk-pfd.c
index 08f1234aab2..9b2fce7174a 100644
--- a/drivers/clk/imx/clk-pfd.c
+++ b/drivers/clk/imx/clk-pfd.c
@@ -24,6 +24,7 @@
 #include <div64.h>
 #include <clk.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include "clk.h"
 #include <linux/err.h>
 
diff --git a/drivers/clk/imx/clk-pll14xx.c b/drivers/clk/imx/clk-pll14xx.c
index a9b56b79027..147bf315980 100644
--- a/drivers/clk/imx/clk-pll14xx.c
+++ b/drivers/clk/imx/clk-pll14xx.c
@@ -19,6 +19,7 @@
 #include <linux/iopoll.h>
 #include <clk.h>
 #include <div64.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 
 #include "clk.h"
diff --git a/drivers/clk/imx/clk-pllv3.c b/drivers/clk/imx/clk-pllv3.c
index a0193e18519..ec690a24981 100644
--- a/drivers/clk/imx/clk-pllv3.c
+++ b/drivers/clk/imx/clk-pllv3.c
@@ -14,6 +14,7 @@
 #include <dm/uclass.h>
 #include <clk.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include "clk.h"
 #include <linux/err.h>
 
diff --git a/drivers/clk/imx/clk.h b/drivers/clk/imx/clk.h
index 60f287046b9..04b7bb78dae 100644
--- a/drivers/clk/imx/clk.h
+++ b/drivers/clk/imx/clk.h
@@ -7,6 +7,7 @@
 #define __MACH_IMX_CLK_H
 
 #include <linux/clk-provider.h>
+#include <linux/kernel.h>
 
 enum imx_pllv3_type {
 	IMX_PLLV3_GENERIC,
diff --git a/drivers/clk/kendryte/clk.c b/drivers/clk/kendryte/clk.c
index 5128cca1060..e8f764d792b 100644
--- a/drivers/clk/kendryte/clk.c
+++ b/drivers/clk/kendryte/clk.c
@@ -4,6 +4,7 @@
  */
 #include <kendryte/clk.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #include <asm/io.h>
 #include <dt-bindings/clock/k210-sysctl.h>
diff --git a/drivers/clk/kendryte/pll.c b/drivers/clk/kendryte/pll.c
index d439134ed24..b350a67820f 100644
--- a/drivers/clk/kendryte/pll.c
+++ b/drivers/clk/kendryte/pll.c
@@ -5,6 +5,7 @@
 #define LOG_CATEGORY UCLASS_CLK
 #include <kendryte/pll.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #include <asm/io.h>
 /* For DIV_ROUND_DOWN_ULL, defined in linux/kernel.h */
diff --git a/drivers/clk/mediatek/clk-mtk.h b/drivers/clk/mediatek/clk-mtk.h
index 95a23d14a8e..57a76e69432 100644
--- a/drivers/clk/mediatek/clk-mtk.h
+++ b/drivers/clk/mediatek/clk-mtk.h
@@ -8,6 +8,7 @@
 #define __DRV_CLK_MTK_H
 
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 #define CLK_XTAL			0
 #define MHZ				(1000 * 1000)
 
diff --git a/drivers/clk/meson/axg.c b/drivers/clk/meson/axg.c
index 99b4da09417..ddf20ab3d8c 100644
--- a/drivers/clk/meson/axg.c
+++ b/drivers/clk/meson/axg.c
@@ -17,6 +17,7 @@
 #include <dt-bindings/clock/axg-clkc.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include "clk_meson.h"
 #include <linux/err.h>
 
diff --git a/drivers/clk/meson/gxbb.c b/drivers/clk/meson/gxbb.c
index d66b23c2a90..62e8e35d654 100644
--- a/drivers/clk/meson/gxbb.c
+++ b/drivers/clk/meson/gxbb.c
@@ -17,6 +17,7 @@
 #include <dt-bindings/clock/gxbb-clkc.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include "clk_meson.h"
 #include <linux/err.h>
 
diff --git a/drivers/clk/mpc83xx_clk.c b/drivers/clk/mpc83xx_clk.c
index f892074d9d6..a72cbeb9723 100644
--- a/drivers/clk/mpc83xx_clk.c
+++ b/drivers/clk/mpc83xx_clk.c
@@ -18,6 +18,7 @@
 #include <asm/arch/soc.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #include "mpc83xx_clk.h"
 
diff --git a/drivers/clk/mtmips/clk-mt7628.c b/drivers/clk/mtmips/clk-mt7628.c
index f013c77df28..12ae5a92354 100644
--- a/drivers/clk/mtmips/clk-mt7628.c
+++ b/drivers/clk/mtmips/clk-mt7628.c
@@ -12,6 +12,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/io.h>
+#include <linux/kernel.h>
 
 /* SYSCFG0 */
 #define XTAL_40M_SEL			BIT(6)
diff --git a/drivers/clk/mvebu/armada-37xx-periph.c b/drivers/clk/mvebu/armada-37xx-periph.c
index dd2b0b9914b..6f279939c51 100644
--- a/drivers/clk/mvebu/armada-37xx-periph.c
+++ b/drivers/clk/mvebu/armada-37xx-periph.c
@@ -19,6 +19,7 @@
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #define TBG_SEL		0x0
diff --git a/drivers/clk/renesas/clk-rcar-gen3.c b/drivers/clk/renesas/clk-rcar-gen3.c
index be230d1d923..c4f5a63b7a3 100644
--- a/drivers/clk/renesas/clk-rcar-gen3.c
+++ b/drivers/clk/renesas/clk-rcar-gen3.c
@@ -21,6 +21,7 @@
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #include <dt-bindings/clock/renesas-cpg-mssr.h>
 
diff --git a/drivers/clk/renesas/r8a774a1-cpg-mssr.c b/drivers/clk/renesas/r8a774a1-cpg-mssr.c
index 8935667736f..f409e666a97 100644
--- a/drivers/clk/renesas/r8a774a1-cpg-mssr.c
+++ b/drivers/clk/renesas/r8a774a1-cpg-mssr.c
@@ -13,6 +13,7 @@
 #include <common.h>
 #include <clk-uclass.h>
 #include <dm.h>
+#include <linux/kernel.h>
 
 #include <dt-bindings/clock/r8a774a1-cpg-mssr.h>
 
diff --git a/drivers/clk/renesas/r8a7790-cpg-mssr.c b/drivers/clk/renesas/r8a7790-cpg-mssr.c
index 7451f53ba39..9eb30d9c9fb 100644
--- a/drivers/clk/renesas/r8a7790-cpg-mssr.c
+++ b/drivers/clk/renesas/r8a7790-cpg-mssr.c
@@ -13,6 +13,7 @@
 #include <clk-uclass.h>
 #include <dm.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 
 #include <dt-bindings/clock/r8a7790-cpg-mssr.h>
 
diff --git a/drivers/clk/renesas/r8a7791-cpg-mssr.c b/drivers/clk/renesas/r8a7791-cpg-mssr.c
index 25fd4896094..7ddac6d20ad 100644
--- a/drivers/clk/renesas/r8a7791-cpg-mssr.c
+++ b/drivers/clk/renesas/r8a7791-cpg-mssr.c
@@ -18,6 +18,7 @@
 #include <clk-uclass.h>
 #include <dm.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 
 #include <dt-bindings/clock/r8a7791-cpg-mssr.h>
 
diff --git a/drivers/clk/renesas/r8a7792-cpg-mssr.c b/drivers/clk/renesas/r8a7792-cpg-mssr.c
index d47ab99e882..0d43004bfc4 100644
--- a/drivers/clk/renesas/r8a7792-cpg-mssr.c
+++ b/drivers/clk/renesas/r8a7792-cpg-mssr.c
@@ -13,6 +13,7 @@
 #include <clk-uclass.h>
 #include <dm.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 
 #include <dt-bindings/clock/r8a7792-cpg-mssr.h>
 
diff --git a/drivers/clk/renesas/r8a7794-cpg-mssr.c b/drivers/clk/renesas/r8a7794-cpg-mssr.c
index 7093e0d42cb..eda0ae0f9d9 100644
--- a/drivers/clk/renesas/r8a7794-cpg-mssr.c
+++ b/drivers/clk/renesas/r8a7794-cpg-mssr.c
@@ -13,6 +13,7 @@
 #include <clk-uclass.h>
 #include <dm.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 
 #include <dt-bindings/clock/r8a7794-cpg-mssr.h>
 
diff --git a/drivers/clk/renesas/r8a7795-cpg-mssr.c b/drivers/clk/renesas/r8a7795-cpg-mssr.c
index dcd96ad0177..89794d2cf6c 100644
--- a/drivers/clk/renesas/r8a7795-cpg-mssr.c
+++ b/drivers/clk/renesas/r8a7795-cpg-mssr.c
@@ -13,6 +13,7 @@
 #include <clk-uclass.h>
 #include <dm.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 
 #include <dt-bindings/clock/r8a7795-cpg-mssr.h>
 
diff --git a/drivers/clk/renesas/r8a7796-cpg-mssr.c b/drivers/clk/renesas/r8a7796-cpg-mssr.c
index 89dc141239d..029bd54b796 100644
--- a/drivers/clk/renesas/r8a7796-cpg-mssr.c
+++ b/drivers/clk/renesas/r8a7796-cpg-mssr.c
@@ -19,6 +19,7 @@
 #include <clk-uclass.h>
 #include <dm.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 
 #include <dt-bindings/clock/r8a7796-cpg-mssr.h>
 
diff --git a/drivers/clk/renesas/r8a77965-cpg-mssr.c b/drivers/clk/renesas/r8a77965-cpg-mssr.c
index 6ed88295c98..5962cb03d63 100644
--- a/drivers/clk/renesas/r8a77965-cpg-mssr.c
+++ b/drivers/clk/renesas/r8a77965-cpg-mssr.c
@@ -14,6 +14,7 @@
 #include <clk-uclass.h>
 #include <dm.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 
 #include <dt-bindings/clock/r8a77965-cpg-mssr.h>
 
diff --git a/drivers/clk/renesas/r8a77970-cpg-mssr.c b/drivers/clk/renesas/r8a77970-cpg-mssr.c
index df071201718..ec246abf387 100644
--- a/drivers/clk/renesas/r8a77970-cpg-mssr.c
+++ b/drivers/clk/renesas/r8a77970-cpg-mssr.c
@@ -14,6 +14,7 @@
 #include <clk-uclass.h>
 #include <dm.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 
 #include <dt-bindings/clock/r8a77970-cpg-mssr.h>
 
diff --git a/drivers/clk/renesas/r8a77980-cpg-mssr.c b/drivers/clk/renesas/r8a77980-cpg-mssr.c
index c8d7a9469ba..0c2050d1b28 100644
--- a/drivers/clk/renesas/r8a77980-cpg-mssr.c
+++ b/drivers/clk/renesas/r8a77980-cpg-mssr.c
@@ -14,6 +14,7 @@
 #include <clk-uclass.h>
 #include <dm.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 
 #include <dt-bindings/clock/r8a77980-cpg-mssr.h>
 
diff --git a/drivers/clk/renesas/r8a77990-cpg-mssr.c b/drivers/clk/renesas/r8a77990-cpg-mssr.c
index 357e7b534da..e3f62e1bc73 100644
--- a/drivers/clk/renesas/r8a77990-cpg-mssr.c
+++ b/drivers/clk/renesas/r8a77990-cpg-mssr.c
@@ -14,6 +14,7 @@
 #include <clk-uclass.h>
 #include <dm.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 
 #include <dt-bindings/clock/r8a77990-cpg-mssr.h>
 
diff --git a/drivers/clk/renesas/r8a77995-cpg-mssr.c b/drivers/clk/renesas/r8a77995-cpg-mssr.c
index d62aeba635b..25bec5ff1a7 100644
--- a/drivers/clk/renesas/r8a77995-cpg-mssr.c
+++ b/drivers/clk/renesas/r8a77995-cpg-mssr.c
@@ -14,6 +14,7 @@
 #include <clk-uclass.h>
 #include <dm.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 
 #include <dt-bindings/clock/r8a77995-cpg-mssr.h>
 
diff --git a/drivers/clk/renesas/rcar-gen3-cpg.h b/drivers/clk/renesas/rcar-gen3-cpg.h
index 3beae7d8250..102d6955354 100644
--- a/drivers/clk/renesas/rcar-gen3-cpg.h
+++ b/drivers/clk/renesas/rcar-gen3-cpg.h
@@ -11,6 +11,7 @@
 #ifndef __CLK_RENESAS_RCAR_GEN3_CPG_H__
 #define __CLK_RENESAS_RCAR_GEN3_CPG_H__
 
+#include <stdbool.h>
 enum rcar_gen3_clk_types {
 	CLK_TYPE_GEN3_MAIN = CLK_TYPE_CUSTOM,
 	CLK_TYPE_GEN3_PLL0,
diff --git a/drivers/clk/renesas/renesas-cpg-mssr.c b/drivers/clk/renesas/renesas-cpg-mssr.c
index e3e5d9640c9..544ea258747 100644
--- a/drivers/clk/renesas/renesas-cpg-mssr.c
+++ b/drivers/clk/renesas/renesas-cpg-mssr.c
@@ -14,6 +14,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
+#include <stdbool.h>
 #include <wait_bit.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
diff --git a/drivers/clk/renesas/renesas-cpg-mssr.h b/drivers/clk/renesas/renesas-cpg-mssr.h
index b669dec594f..70f6fb825c4 100644
--- a/drivers/clk/renesas/renesas-cpg-mssr.h
+++ b/drivers/clk/renesas/renesas-cpg-mssr.h
@@ -13,6 +13,7 @@
 #ifndef __DRIVERS_CLK_RENESAS_CPG_MSSR__
 #define __DRIVERS_CLK_RENESAS_CPG_MSSR__
 
+#include <stdbool.h>
 #include <linux/bitops.h>
 struct cpg_mssr_info {
 	const struct cpg_core_clk	*core_clk;
diff --git a/drivers/clk/rockchip/clk_px30.c b/drivers/clk/rockchip/clk_px30.c
index 8fc3b6e572f..6e99191007d 100644
--- a/drivers/clk/rockchip/clk_px30.c
+++ b/drivers/clk/rockchip/clk_px30.c
@@ -22,6 +22,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/clk/rockchip/clk_rk3036.c b/drivers/clk/rockchip/clk_rk3036.c
index 80aa7c2f39a..ec60627ddeb 100644
--- a/drivers/clk/rockchip/clk_rk3036.c
+++ b/drivers/clk/rockchip/clk_rk3036.c
@@ -18,6 +18,7 @@
 #include <dt-bindings/clock/rk3036-cru.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/log2.h>
 #include <linux/stringify.h>
 
diff --git a/drivers/clk/rockchip/clk_rk3128.c b/drivers/clk/rockchip/clk_rk3128.c
index b9c896460f0..4dcb85f5109 100644
--- a/drivers/clk/rockchip/clk_rk3128.c
+++ b/drivers/clk/rockchip/clk_rk3128.c
@@ -20,6 +20,7 @@
 #include <dt-bindings/clock/rk3128-cru.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/log2.h>
 
 enum {
diff --git a/drivers/clk/rockchip/clk_rk3188.c b/drivers/clk/rockchip/clk_rk3188.c
index b77b92e4c5b..7cee0c594f7 100644
--- a/drivers/clk/rockchip/clk_rk3188.c
+++ b/drivers/clk/rockchip/clk_rk3188.c
@@ -25,6 +25,7 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/log2.h>
 #include <linux/stringify.h>
 
diff --git a/drivers/clk/rockchip/clk_rk322x.c b/drivers/clk/rockchip/clk_rk322x.c
index 780fd7e725b..f632dff1a71 100644
--- a/drivers/clk/rockchip/clk_rk322x.c
+++ b/drivers/clk/rockchip/clk_rk322x.c
@@ -19,6 +19,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/log2.h>
 #include <linux/string.h>
 #include <linux/stringify.h>
diff --git a/drivers/clk/rockchip/clk_rk3288.c b/drivers/clk/rockchip/clk_rk3288.c
index da40f74d424..ed6b4656e23 100644
--- a/drivers/clk/rockchip/clk_rk3288.c
+++ b/drivers/clk/rockchip/clk_rk3288.c
@@ -29,6 +29,7 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/log2.h>
 #include <linux/string.h>
 #include <linux/stringify.h>
diff --git a/drivers/clk/rockchip/clk_rk3308.c b/drivers/clk/rockchip/clk_rk3308.c
index 7106685bb50..151b6be5ee9 100644
--- a/drivers/clk/rockchip/clk_rk3308.c
+++ b/drivers/clk/rockchip/clk_rk3308.c
@@ -21,6 +21,7 @@
 #include <dt-bindings/clock/rk3308-cru.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/clk/rockchip/clk_rk3328.c b/drivers/clk/rockchip/clk_rk3328.c
index 6c7626ab154..5879541f3ce 100644
--- a/drivers/clk/rockchip/clk_rk3328.c
+++ b/drivers/clk/rockchip/clk_rk3328.c
@@ -22,6 +22,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 struct pll_div {
diff --git a/drivers/clk/rockchip/clk_rk3368.c b/drivers/clk/rockchip/clk_rk3368.c
index 0d677f55ee1..c391ad02100 100644
--- a/drivers/clk/rockchip/clk_rk3368.c
+++ b/drivers/clk/rockchip/clk_rk3368.c
@@ -23,6 +23,7 @@
 #include <dt-bindings/clock/rk3368-cru.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include <linux/stringify.h>
diff --git a/drivers/clk/rockchip/clk_rk3399.c b/drivers/clk/rockchip/clk_rk3399.c
index 016633c1382..1078a4c67b7 100644
--- a/drivers/clk/rockchip/clk_rk3399.c
+++ b/drivers/clk/rockchip/clk_rk3399.c
@@ -24,6 +24,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/clk/rockchip/clk_rv1108.c b/drivers/clk/rockchip/clk_rv1108.c
index 4297934b981..fcc4ba6d94a 100644
--- a/drivers/clk/rockchip/clk_rv1108.c
+++ b/drivers/clk/rockchip/clk_rv1108.c
@@ -22,6 +22,7 @@
 #include <dt-bindings/clock/rv1108-cru.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/stringify.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/clk/sifive/fu540-prci.c b/drivers/clk/sifive/fu540-prci.c
index 0aa4ac5eebd..140433da805 100644
--- a/drivers/clk/sifive/fu540-prci.c
+++ b/drivers/clk/sifive/fu540-prci.c
@@ -38,6 +38,7 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include <linux/math64.h>
diff --git a/drivers/clk/sunxi/clk_a10.c b/drivers/clk/sunxi/clk_a10.c
index 67507c5ab1d..797878eefa9 100644
--- a/drivers/clk/sunxi/clk_a10.c
+++ b/drivers/clk/sunxi/clk_a10.c
@@ -12,6 +12,7 @@
 #include <dt-bindings/clock/sun4i-a10-ccu.h>
 #include <dt-bindings/reset/sun4i-a10-ccu.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 
 static struct ccu_clk_gate a10_gates[] = {
 	[CLK_AHB_OTG]		= GATE(0x060, BIT(0)),
diff --git a/drivers/clk/sunxi/clk_a10s.c b/drivers/clk/sunxi/clk_a10s.c
index d11a4b5f038..24c20cf11f7 100644
--- a/drivers/clk/sunxi/clk_a10s.c
+++ b/drivers/clk/sunxi/clk_a10s.c
@@ -12,6 +12,7 @@
 #include <dt-bindings/clock/sun5i-ccu.h>
 #include <dt-bindings/reset/sun5i-ccu.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 
 static struct ccu_clk_gate a10s_gates[] = {
 	[CLK_AHB_OTG]		= GATE(0x060, BIT(0)),
diff --git a/drivers/clk/sunxi/clk_a23.c b/drivers/clk/sunxi/clk_a23.c
index 4d562bfe427..312288eef68 100644
--- a/drivers/clk/sunxi/clk_a23.c
+++ b/drivers/clk/sunxi/clk_a23.c
@@ -12,6 +12,7 @@
 #include <dt-bindings/clock/sun8i-a23-a33-ccu.h>
 #include <dt-bindings/reset/sun8i-a23-a33-ccu.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 
 static struct ccu_clk_gate a23_gates[] = {
 	[CLK_BUS_MMC0]		= GATE(0x060, BIT(8)),
diff --git a/drivers/clk/sunxi/clk_a31.c b/drivers/clk/sunxi/clk_a31.c
index 4a9454eebe7..a3b3528abae 100644
--- a/drivers/clk/sunxi/clk_a31.c
+++ b/drivers/clk/sunxi/clk_a31.c
@@ -12,6 +12,7 @@
 #include <dt-bindings/clock/sun6i-a31-ccu.h>
 #include <dt-bindings/reset/sun6i-a31-ccu.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 
 static struct ccu_clk_gate a31_gates[] = {
 	[CLK_AHB1_MMC0]		= GATE(0x060, BIT(8)),
diff --git a/drivers/clk/sunxi/clk_a64.c b/drivers/clk/sunxi/clk_a64.c
index d96cb1aac1c..68660cc7ae4 100644
--- a/drivers/clk/sunxi/clk_a64.c
+++ b/drivers/clk/sunxi/clk_a64.c
@@ -12,6 +12,7 @@
 #include <dt-bindings/clock/sun50i-a64-ccu.h>
 #include <dt-bindings/reset/sun50i-a64-ccu.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 
 static const struct ccu_clk_gate a64_gates[] = {
 	[CLK_BUS_MMC0]		= GATE(0x060, BIT(8)),
diff --git a/drivers/clk/sunxi/clk_a80.c b/drivers/clk/sunxi/clk_a80.c
index 80d7407037e..ea38c819ea7 100644
--- a/drivers/clk/sunxi/clk_a80.c
+++ b/drivers/clk/sunxi/clk_a80.c
@@ -12,6 +12,7 @@
 #include <dt-bindings/clock/sun9i-a80-ccu.h>
 #include <dt-bindings/reset/sun9i-a80-ccu.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 
 static const struct ccu_clk_gate a80_gates[] = {
 	[CLK_SPI0]		= GATE(0x430, BIT(31)),
diff --git a/drivers/clk/sunxi/clk_a83t.c b/drivers/clk/sunxi/clk_a83t.c
index d6f23ddc778..ac82f22c746 100644
--- a/drivers/clk/sunxi/clk_a83t.c
+++ b/drivers/clk/sunxi/clk_a83t.c
@@ -12,6 +12,7 @@
 #include <dt-bindings/clock/sun8i-a83t-ccu.h>
 #include <dt-bindings/reset/sun8i-a83t-ccu.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 
 static struct ccu_clk_gate a83t_gates[] = {
 	[CLK_BUS_MMC0]		= GATE(0x060, BIT(8)),
diff --git a/drivers/clk/sunxi/clk_h3.c b/drivers/clk/sunxi/clk_h3.c
index 7e844f4ff16..052fd008f59 100644
--- a/drivers/clk/sunxi/clk_h3.c
+++ b/drivers/clk/sunxi/clk_h3.c
@@ -12,6 +12,7 @@
 #include <dt-bindings/clock/sun8i-h3-ccu.h>
 #include <dt-bindings/reset/sun8i-h3-ccu.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 
 static struct ccu_clk_gate h3_gates[] = {
 	[CLK_BUS_MMC0]		= GATE(0x060, BIT(8)),
diff --git a/drivers/clk/sunxi/clk_h6.c b/drivers/clk/sunxi/clk_h6.c
index a1cb8952d39..944aa4c55c4 100644
--- a/drivers/clk/sunxi/clk_h6.c
+++ b/drivers/clk/sunxi/clk_h6.c
@@ -12,6 +12,7 @@
 #include <dt-bindings/clock/sun50i-h6-ccu.h>
 #include <dt-bindings/reset/sun50i-h6-ccu.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 
 static struct ccu_clk_gate h6_gates[] = {
 	[CLK_BUS_MMC0]		= GATE(0x84c, BIT(0)),
diff --git a/drivers/clk/sunxi/clk_r40.c b/drivers/clk/sunxi/clk_r40.c
index ac360b2bebd..1d19c805ade 100644
--- a/drivers/clk/sunxi/clk_r40.c
+++ b/drivers/clk/sunxi/clk_r40.c
@@ -12,6 +12,7 @@
 #include <dt-bindings/clock/sun8i-r40-ccu.h>
 #include <dt-bindings/reset/sun8i-r40-ccu.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 
 static struct ccu_clk_gate r40_gates[] = {
 	[CLK_BUS_MMC0]		= GATE(0x060, BIT(8)),
diff --git a/drivers/clk/sunxi/clk_v3s.c b/drivers/clk/sunxi/clk_v3s.c
index b79446cc4fd..19673e43cf0 100644
--- a/drivers/clk/sunxi/clk_v3s.c
+++ b/drivers/clk/sunxi/clk_v3s.c
@@ -12,6 +12,7 @@
 #include <dt-bindings/clock/sun8i-v3s-ccu.h>
 #include <dt-bindings/reset/sun8i-v3s-ccu.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 
 static struct ccu_clk_gate v3s_gates[] = {
 	[CLK_BUS_MMC0]		= GATE(0x060, BIT(8)),
diff --git a/drivers/clk/uniphier/clk-uniphier-core.c b/drivers/clk/uniphier/clk-uniphier-core.c
index 13f2b76c890..72335f271b8 100644
--- a/drivers/clk/uniphier/clk-uniphier-core.c
+++ b/drivers/clk/uniphier/clk-uniphier-core.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <clk-uclass.h>
 #include <dm.h>
+#include <stdbool.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/bug.h>
diff --git a/drivers/core/device-remove.c b/drivers/core/device-remove.c
index 3de629d24df..0263284fc3f 100644
--- a/drivers/core/device-remove.c
+++ b/drivers/core/device-remove.c
@@ -12,6 +12,7 @@
 #include <errno.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 #include <dm/device.h>
 #include <dm/device-internal.h>
diff --git a/drivers/core/device.c b/drivers/core/device.c
index ac6ce92bc0f..8198750cd69 100644
--- a/drivers/core/device.c
+++ b/drivers/core/device.c
@@ -30,6 +30,7 @@
 #include <dm/util.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/list.h>
 #include <power-domain.h>
 #include <linux/printk.h>
diff --git a/drivers/core/lists.c b/drivers/core/lists.c
index dcc1e4a4f95..dfb5e1de77a 100644
--- a/drivers/core/lists.c
+++ b/drivers/core/lists.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <errno.h>
 #include <log.h>
+#include <stdbool.h>
 #include <dm/device.h>
 #include <dm/device-internal.h>
 #include <dm/lists.h>
diff --git a/drivers/core/of_access.c b/drivers/core/of_access.c
index ad9bd7dd5a2..0ecc90890da 100644
--- a/drivers/core/of_access.c
+++ b/drivers/core/of_access.c
@@ -26,6 +26,7 @@
 #include <asm/global_data.h>
 #include <linux/bug.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <dm/of_access.h>
 #include <linux/ctype.h>
diff --git a/drivers/core/of_addr.c b/drivers/core/of_addr.c
index 4fd4ee0c889..a245194db43 100644
--- a/drivers/core/of_addr.c
+++ b/drivers/core/of_addr.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <linux/bug.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <dm/of_access.h>
 #include <dm/of_addr.h>
diff --git a/drivers/core/read.c b/drivers/core/read.c
index ecd812566ce..b84c9be2461 100644
--- a/drivers/core/read.c
+++ b/drivers/core/read.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 #include <dm/of_access.h>
 #include <mapmem.h>
diff --git a/drivers/core/root.c b/drivers/core/root.c
index 2d0deea9f78..6eb934c4095 100644
--- a/drivers/core/root.c
+++ b/drivers/core/root.c
@@ -13,6 +13,7 @@
 #include <malloc.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <dm/acpi.h>
 #include <dm/device.h>
diff --git a/drivers/core/simple-bus.c b/drivers/core/simple-bus.c
index 7cc1d46009f..aa888b2e0c4 100644
--- a/drivers/core/simple-bus.c
+++ b/drivers/core/simple-bus.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <linux/kernel.h>
 
 struct simple_bus_plat {
 	u32 base;
diff --git a/drivers/core/syscon-uclass.c b/drivers/core/syscon-uclass.c
index 11ac1b17733..d8d26d772c7 100644
--- a/drivers/core/syscon-uclass.c
+++ b/drivers/core/syscon-uclass.c
@@ -16,6 +16,7 @@
 #include <dm/root.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 /*
  * Caution:
diff --git a/drivers/core/uclass.c b/drivers/core/uclass.c
index 3fae359866f..242d9f4b30d 100644
--- a/drivers/core/uclass.c
+++ b/drivers/core/uclass.c
@@ -13,6 +13,7 @@
 #include <errno.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 #include <dm/device.h>
 #include <dm/device-internal.h>
diff --git a/drivers/cpu/mpc83xx_cpu.c b/drivers/cpu/mpc83xx_cpu.c
index 126ae6cf7ae..6f6feee5f2d 100644
--- a/drivers/cpu/mpc83xx_cpu.c
+++ b/drivers/cpu/mpc83xx_cpu.c
@@ -10,6 +10,7 @@
 #include <cpu.h>
 #include <dm.h>
 #include <log.h>
+#include <stdbool.h>
 #include <vsprintf.h>
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
diff --git a/drivers/crypto/fsl/desc_constr.h b/drivers/crypto/fsl/desc_constr.h
index 7d6546fd9c0..a11ce812d19 100644
--- a/drivers/crypto/fsl/desc_constr.h
+++ b/drivers/crypto/fsl/desc_constr.h
@@ -9,6 +9,7 @@
 
 #include <stdio.h>
 #include <linux/compat.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "desc.h"
 
diff --git a/drivers/crypto/fsl/error.c b/drivers/crypto/fsl/error.c
index 9138de69e8a..a83efe585e6 100644
--- a/drivers/crypto/fsl/error.c
+++ b/drivers/crypto/fsl/error.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <vsprintf.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "desc.h"
 #include "jr.h"
diff --git a/drivers/crypto/fsl/fsl_blob.c b/drivers/crypto/fsl/fsl_blob.c
index 5bc0f3d5f22..3cf03106174 100644
--- a/drivers/crypto/fsl/fsl_blob.c
+++ b/drivers/crypto/fsl/fsl_blob.c
@@ -13,6 +13,7 @@
 #include <stdio.h>
 #include <asm/cache.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include "jobdesc.h"
 #include "desc.h"
 #include "jr.h"
diff --git a/drivers/crypto/fsl/fsl_hash.c b/drivers/crypto/fsl/fsl_hash.c
index 80640248c37..5bd6604e777 100644
--- a/drivers/crypto/fsl/fsl_hash.c
+++ b/drivers/crypto/fsl/fsl_hash.c
@@ -10,6 +10,7 @@
 #include <malloc.h>
 #include <memalign.h>
 #include <stdio.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "jobdesc.h"
 #include "desc.h"
diff --git a/drivers/crypto/fsl/jobdesc.c b/drivers/crypto/fsl/jobdesc.c
index e85c2dd01d9..40f06e8f81b 100644
--- a/drivers/crypto/fsl/jobdesc.c
+++ b/drivers/crypto/fsl/jobdesc.c
@@ -11,6 +11,7 @@
 #include <cpu_func.h>
 #include <fsl_sec.h>
 #include <stdio.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "desc_constr.h"
 #include "jobdesc.h"
diff --git a/drivers/crypto/fsl/sec.c b/drivers/crypto/fsl/sec.c
index b2a1e822feb..4e52852d64b 100644
--- a/drivers/crypto/fsl/sec.c
+++ b/drivers/crypto/fsl/sec.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/kernel.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/crypto/rsa_mod_exp/mod_exp_uclass.c b/drivers/crypto/rsa_mod_exp/mod_exp_uclass.c
index 8997980caca..6826011fb31 100644
--- a/drivers/crypto/rsa_mod_exp/mod_exp_uclass.c
+++ b/drivers/crypto/rsa_mod_exp/mod_exp_uclass.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
 #include <u-boot/rsa-mod-exp.h>
diff --git a/drivers/ddr/altera/sdram_gen5.c b/drivers/ddr/altera/sdram_gen5.c
index bc20fa09645..723436cadca 100644
--- a/drivers/ddr/altera/sdram_gen5.c
+++ b/drivers/ddr/altera/sdram_gen5.c
@@ -20,6 +20,7 @@
 #include <asm/io.h>
 #include <dm/device_compat.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include "sequencer.h"
diff --git a/drivers/ddr/altera/sdram_s10.c b/drivers/ddr/altera/sdram_s10.c
index 4c913e9b5b6..8fe96ee2465 100644
--- a/drivers/ddr/altera/sdram_s10.c
+++ b/drivers/ddr/altera/sdram_s10.c
@@ -18,6 +18,7 @@
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 #include "sdram_s10.h"
 #include <wait_bit.h>
 #include <asm/arch/firewall.h>
diff --git a/drivers/ddr/altera/sdram_soc64.c b/drivers/ddr/altera/sdram_soc64.c
index 778528bf863..67fc9c14e3f 100644
--- a/drivers/ddr/altera/sdram_soc64.c
+++ b/drivers/ddr/altera/sdram_soc64.c
@@ -20,6 +20,7 @@
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "sdram_soc64.h"
 #include <wait_bit.h>
diff --git a/drivers/ddr/altera/sequencer.c b/drivers/ddr/altera/sequencer.c
index 8d62f02660d..aad40ad398d 100644
--- a/drivers/ddr/altera/sequencer.c
+++ b/drivers/ddr/altera/sequencer.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <hang.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "sequencer.h"
 
diff --git a/drivers/ddr/altera/sequencer.h b/drivers/ddr/altera/sequencer.h
index c72a683ffef..b655c25688d 100644
--- a/drivers/ddr/altera/sequencer.h
+++ b/drivers/ddr/altera/sequencer.h
@@ -6,6 +6,7 @@
 #ifndef _SEQUENCER_H_
 #define _SEQUENCER_H_
 
+#include <stdbool.h>
 #define RW_MGR_NUM_DM_PER_WRITE_GROUP (seq->rwcfg->mem_data_mask_width \
 	/ seq->rwcfg->mem_if_write_dqs_width)
 #define RW_MGR_NUM_TRUE_DM_PER_WRITE_GROUP ( \
diff --git a/drivers/ddr/fsl/ctrl_regs.c b/drivers/ddr/fsl/ctrl_regs.c
index c3409703ea9..e6f85dcf623 100644
--- a/drivers/ddr/fsl/ctrl_regs.c
+++ b/drivers/ddr/fsl/ctrl_regs.c
@@ -24,6 +24,7 @@
 #include <asm/arch/clock.h>
 #endif
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 /*
diff --git a/drivers/ddr/fsl/ddr1_dimm_params.c b/drivers/ddr/fsl/ddr1_dimm_params.c
index 698324073db..36669152046 100644
--- a/drivers/ddr/fsl/ddr1_dimm_params.c
+++ b/drivers/ddr/fsl/ddr1_dimm_params.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <stdio.h>
 #include <asm/bitops.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include <fsl_ddr.h>
diff --git a/drivers/ddr/fsl/ddr2_dimm_params.c b/drivers/ddr/fsl/ddr2_dimm_params.c
index 95a250c33f4..c654b1fd1f1 100644
--- a/drivers/ddr/fsl/ddr2_dimm_params.c
+++ b/drivers/ddr/fsl/ddr2_dimm_params.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <stdio.h>
 #include <asm/bitops.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include <fsl_ddr.h>
diff --git a/drivers/ddr/fsl/ddr4_dimm_params.c b/drivers/ddr/fsl/ddr4_dimm_params.c
index cc6c034747f..fca5b433eb1 100644
--- a/drivers/ddr/fsl/ddr4_dimm_params.c
+++ b/drivers/ddr/fsl/ddr4_dimm_params.c
@@ -13,6 +13,7 @@
 #include <common.h>
 #include <fsl_ddr_sdram.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <linux/bug.h>
 #include <linux/string.h>
diff --git a/drivers/ddr/fsl/interactive.c b/drivers/ddr/fsl/interactive.c
index e3a7670e3d1..c7d99077d86 100644
--- a/drivers/ddr/fsl/interactive.c
+++ b/drivers/ddr/fsl/interactive.c
@@ -22,6 +22,7 @@
 #include <linux/ctype.h>
 #include <asm/types.h>
 #include <asm/io.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include <fsl_ddr_sdram.h>
diff --git a/drivers/ddr/fsl/lc_common_dimm_params.c b/drivers/ddr/fsl/lc_common_dimm_params.c
index d6a2ad99c42..cb56229fae2 100644
--- a/drivers/ddr/fsl/lc_common_dimm_params.c
+++ b/drivers/ddr/fsl/lc_common_dimm_params.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <stdio.h>
 #include <asm/bitops.h>
+#include <linux/kernel.h>
 
 #include <fsl_ddr.h>
 
diff --git a/drivers/ddr/fsl/main.c b/drivers/ddr/fsl/main.c
index 92a29568342..56c0de2004c 100644
--- a/drivers/ddr/fsl/main.c
+++ b/drivers/ddr/fsl/main.c
@@ -20,6 +20,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/bitops.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 /*
diff --git a/drivers/ddr/fsl/util.c b/drivers/ddr/fsl/util.c
index daf78f0d1ba..45d641ec60f 100644
--- a/drivers/ddr/fsl/util.c
+++ b/drivers/ddr/fsl/util.c
@@ -8,6 +8,7 @@
 #include <asm/fsl_law.h>
 #endif
 #include <div64.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
diff --git a/drivers/ddr/imx/imx8m/helper.c b/drivers/ddr/imx/imx8m/helper.c
index 8903ff146fc..fca733ee3b2 100644
--- a/drivers/ddr/imx/imx8m/helper.c
+++ b/drivers/ddr/imx/imx8m/helper.c
@@ -15,6 +15,7 @@
 #include <asm/arch/ddr.h>
 #include <asm/arch/lpddr4_define.h>
 #include <asm/sections.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/ddr/marvell/axp/ddr3_spd.c b/drivers/ddr/marvell/axp/ddr3_spd.c
index f96d2bdaeb9..d58d4961658 100644
--- a/drivers/ddr/marvell/axp/ddr3_spd.c
+++ b/drivers/ddr/marvell/axp/ddr3_spd.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include "ddr3_init.h"
diff --git a/drivers/demo/demo-shape.c b/drivers/demo/demo-shape.c
index f35bc3e1492..1be18905890 100644
--- a/drivers/demo/demo-shape.c
+++ b/drivers/demo/demo-shape.c
@@ -15,6 +15,7 @@
 #include <asm/io.h>
 #include <asm/gpio.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/dfu/dfu.c b/drivers/dfu/dfu.c
index 4cc2be16bb3..b9d1dcbc1d2 100644
--- a/drivers/dfu/dfu.c
+++ b/drivers/dfu/dfu.c
@@ -18,6 +18,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/errno.h>
+#include <linux/kernel.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 94989c2ba23..4431e34c10e 100644
--- a/drivers/dfu/dfu_mmc.c
+++ b/drivers/dfu/dfu_mmc.c
@@ -19,6 +19,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/dfu/dfu_mtd.c b/drivers/dfu/dfu_mtd.c
index b93d9987374..7e5623674ca 100644
--- a/drivers/dfu/dfu_mtd.c
+++ b/drivers/dfu/dfu_mtd.c
@@ -15,6 +15,7 @@
 #include <jffs2/load_kernel.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 static bool mtd_is_aligned_with_block_size(struct mtd_info *mtd, u64 size)
diff --git a/drivers/dma/apbh_dma.c b/drivers/dma/apbh_dma.c
index 8a7ef5013e8..697db0d7201 100644
--- a/drivers/dma/apbh_dma.c
+++ b/drivers/dma/apbh_dma.c
@@ -14,6 +14,7 @@
 #include <cpu_func.h>
 #include <stdio.h>
 #include <asm/cache.h>
+#include <linux/kernel.h>
 #include <linux/list.h>
 #include <linux/string.h>
 
diff --git a/drivers/dma/bcm6348-iudma.c b/drivers/dma/bcm6348-iudma.c
index e1130f8f9fb..e6fc0ac5ffb 100644
--- a/drivers/dma/bcm6348-iudma.c
+++ b/drivers/dma/bcm6348-iudma.c
@@ -25,6 +25,7 @@
 #include <memalign.h>
 #include <net.h>
 #include <reset.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/drivers/dma/dma-uclass.c b/drivers/dma/dma-uclass.c
index cc872831b5f..8a6fd825b13 100644
--- a/drivers/dma/dma-uclass.c
+++ b/drivers/dma/dma-uclass.c
@@ -20,6 +20,7 @@
 #include <dt-structs.h>
 #include <errno.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 
 #ifdef CONFIG_DMA_CHANNELS
diff --git a/drivers/dma/fsl_dma.c b/drivers/dma/fsl_dma.c
index a9d28779ebd..e46544c877b 100644
--- a/drivers/dma/fsl_dma.c
+++ b/drivers/dma/fsl_dma.c
@@ -13,6 +13,7 @@
 #include <asm/io.h>
 #include <asm/fsl_dma.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 /* Controller can only transfer 2^26 - 1 bytes at a time */
 #define FSL_DMA_MAX_SIZE	(0x3ffffff)
diff --git a/drivers/dma/sandbox-dma-test.c b/drivers/dma/sandbox-dma-test.c
index 9a6904cd634..460197ed67a 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 <stdbool.h>
 #include <vsprintf.h>
 #include <dm/read.h>
 #include <dma-uclass.h>
diff --git a/drivers/dma/ti/k3-udma.c b/drivers/dma/ti/k3-udma.c
index 0b6de5bbbcc..4d50dbc76e5 100644
--- a/drivers/dma/ti/k3-udma.c
+++ b/drivers/dma/ti/k3-udma.c
@@ -27,6 +27,7 @@
 #include <linux/bitmap.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/soc/ti/k3-navss-ringacc.h>
 #include <linux/soc/ti/cppi5.h>
diff --git a/drivers/fastboot/fb_getvar.c b/drivers/fastboot/fb_getvar.c
index b8f4938f9d5..5c188e1b5b5 100644
--- a/drivers/fastboot/fb_getvar.c
+++ b/drivers/fastboot/fb_getvar.c
@@ -14,6 +14,7 @@
 #include <version.h>
 #include <vsprintf.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/fastboot/fb_mmc.c b/drivers/fastboot/fb_mmc.c
index 37cef1890f2..5615dffa6d8 100644
--- a/drivers/fastboot/fb_mmc.c
+++ b/drivers/fastboot/fb_mmc.c
@@ -21,6 +21,7 @@
 #include <linux/compat.h>
 #include <android_image.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/firmware/firmware-zynqmp.c b/drivers/firmware/firmware-zynqmp.c
index 01d5ac72f8f..0a815ec736a 100644
--- a/drivers/firmware/firmware-zynqmp.c
+++ b/drivers/firmware/firmware-zynqmp.c
@@ -14,6 +14,7 @@
 #include <asm/cache.h>
 #include <asm/ptrace.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #if defined(CONFIG_ZYNQMP_IPI)
 #include <mailbox.h>
diff --git a/drivers/firmware/ti_sci.c b/drivers/firmware/ti_sci.c
index d2e1be9c994..e156d549268 100644
--- a/drivers/firmware/ti_sci.c
+++ b/drivers/firmware/ti_sci.c
@@ -20,6 +20,7 @@
 #include <linux/compat.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/soc/ti/k3-sec-proxy.h>
 #include <linux/soc/ti/ti_sci_protocol.h>
 #include <linux/string.h>
diff --git a/drivers/fpga/altera.c b/drivers/fpga/altera.c
index 9908630c2d4..4ce9a0581ad 100644
--- a/drivers/fpga/altera.c
+++ b/drivers/fpga/altera.c
@@ -17,6 +17,7 @@
 #include <stdio.h>
 #include <stratixII.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 /* Define FPGA_DEBUG to 1 to get debug printf's */
 #define FPGA_DEBUG	0
diff --git a/drivers/fpga/cyclon2.c b/drivers/fpga/cyclon2.c
index a163f722515..de0880ff3d8 100644
--- a/drivers/fpga/cyclon2.c
+++ b/drivers/fpga/cyclon2.c
@@ -8,6 +8,7 @@
 #include <common.h>		/* core U-Boot definitions */
 #include <altera.h>
 #include <ACEX1K.h>		/* ACEX device family */
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <linux/delay.h>
diff --git a/drivers/fpga/socfpga.c b/drivers/fpga/socfpga.c
index 685957626be..357c74675d1 100644
--- a/drivers/fpga/socfpga.c
+++ b/drivers/fpga/socfpga.c
@@ -10,6 +10,7 @@
 #include <asm/arch/fpga_manager.h>
 #include <asm/arch/reset_manager.h>
 #include <asm/arch/system_manager.h>
+#include <linux/kernel.h>
 
 /* Timeout count */
 #define FPGA_TIMEOUT_CNT		0x1000000
diff --git a/drivers/fpga/socfpga_arria10.c b/drivers/fpga/socfpga_arria10.c
index cd70cd922f3..360f064dbae 100644
--- a/drivers/fpga/socfpga_arria10.c
+++ b/drivers/fpga/socfpga_arria10.c
@@ -4,6 +4,7 @@
  */
 #include <image.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <asm/global_data.h>
diff --git a/drivers/fpga/spartan3.c b/drivers/fpga/spartan3.c
index 95a361b0e86..7374bb6f6b9 100644
--- a/drivers/fpga/spartan3.c
+++ b/drivers/fpga/spartan3.c
@@ -11,6 +11,8 @@
 
 #include <common.h>		/* core U-Boot definitions */
 #include <spartan3.h>		/* Spartan-II device family */
+#include <stdbool.h>
+#include <stdio.h>
 #include <time.h>
 
 /* Define FPGA_DEBUG to get debug printf's */
diff --git a/drivers/fpga/stratix10.c b/drivers/fpga/stratix10.c
index e4a513171eb..3477ddbfd6b 100644
--- a/drivers/fpga/stratix10.c
+++ b/drivers/fpga/stratix10.c
@@ -11,6 +11,7 @@
 #include <asm/arch/mailbox_s10.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #define RECONFIG_STATUS_POLL_RESP_TIMEOUT_MS		60000
diff --git a/drivers/fpga/versalpl.c b/drivers/fpga/versalpl.c
index 7738cfaf103..eeaa8e0a335 100644
--- a/drivers/fpga/versalpl.c
+++ b/drivers/fpga/versalpl.c
@@ -13,6 +13,7 @@
 #include <versalpl.h>
 #include <zynqmp_firmware.h>
 #include <asm/cache.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 static ulong versal_align_dma_buffer(ulong *buf, u32 len)
diff --git a/drivers/fpga/zynqmppl.c b/drivers/fpga/zynqmppl.c
index fd92b47d67a..9d3eb848266 100644
--- a/drivers/fpga/zynqmppl.c
+++ b/drivers/fpga/zynqmppl.c
@@ -15,6 +15,7 @@
 #include <zynqmp_firmware.h>
 #include <asm/cache.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <asm/arch/sys_proto.h>
 #include <memalign.h>
diff --git a/drivers/fpga/zynqpl.c b/drivers/fpga/zynqpl.c
index 14de9c11d54..c887f3ddca6 100644
--- a/drivers/fpga/zynqpl.c
+++ b/drivers/fpga/zynqpl.c
@@ -17,6 +17,7 @@
 #include <fs.h>
 #include <zynqpl.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/sys_proto.h>
diff --git a/drivers/gpio/at91_gpio.c b/drivers/gpio/at91_gpio.c
index d738a04033a..f808f5114b7 100644
--- a/drivers/gpio/at91_gpio.c
+++ b/drivers/gpio/at91_gpio.c
@@ -12,6 +12,7 @@
 #include <clk.h>
 #include <dm.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/io.h>
 #include <linux/sizes.h>
diff --git a/drivers/gpio/bcm6345_gpio.c b/drivers/gpio/bcm6345_gpio.c
index 5eaad77dcb6..9b0f551b950 100644
--- a/drivers/gpio/bcm6345_gpio.c
+++ b/drivers/gpio/bcm6345_gpio.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
+#include <stdbool.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
diff --git a/drivers/gpio/gpio-rcar.c b/drivers/gpio/gpio-rcar.c
index 2e80196905d..a940b9969c1 100644
--- a/drivers/gpio/gpio-rcar.c
+++ b/drivers/gpio/gpio-rcar.c
@@ -7,6 +7,7 @@
 #include <clk.h>
 #include <dm.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 #include <dm/device_compat.h>
 #include <dm/pinctrl.h>
diff --git a/drivers/gpio/gpio-rza1.c b/drivers/gpio/gpio-rza1.c
index 6407727b453..13f525823ec 100644
--- a/drivers/gpio/gpio-rza1.c
+++ b/drivers/gpio/gpio-rza1.c
@@ -7,6 +7,7 @@
 #include <clk.h>
 #include <dm.h>
 #include <errno.h>
+#include <stdbool.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 44ba2ac2b3c..68320c1e27c 100644
--- a/drivers/gpio/gpio-uclass.c
+++ b/drivers/gpio/gpio-uclass.c
@@ -23,6 +23,7 @@
 #include <linux/bug.h>
 #include <linux/ctype.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/gpio/intel_ich6_gpio.c b/drivers/gpio/intel_ich6_gpio.c
index b3df925c756..be371fdcc30 100644
--- a/drivers/gpio/intel_ich6_gpio.c
+++ b/drivers/gpio/intel_ich6_gpio.c
@@ -33,6 +33,7 @@
 #include <log.h>
 #include <pch.h>
 #include <pci.h>
+#include <stdbool.h>
 #include <asm/cpu.h>
 #include <asm/global_data.h>
 #include <asm/gpio.h>
diff --git a/drivers/gpio/iproc_gpio.c b/drivers/gpio/iproc_gpio.c
index 50eb95d2522..9672342bca3 100644
--- a/drivers/gpio/iproc_gpio.c
+++ b/drivers/gpio/iproc_gpio.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <errno.h>
+#include <stdbool.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <dm.h>
diff --git a/drivers/gpio/mscc_sgpio.c b/drivers/gpio/mscc_sgpio.c
index 0133e14bb73..9b7bb4b0602 100644
--- a/drivers/gpio/mscc_sgpio.c
+++ b/drivers/gpio/mscc_sgpio.c
@@ -18,6 +18,7 @@
 #include <linux/bitops.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #define MSCC_SGPIOS_PER_BANK	32
 #define MSCC_SGPIO_BANK_DEPTH	4
diff --git a/drivers/gpio/mxc_gpio.c b/drivers/gpio/mxc_gpio.c
index fd64a7abadf..212516001fc 100644
--- a/drivers/gpio/mxc_gpio.c
+++ b/drivers/gpio/mxc_gpio.c
@@ -15,6 +15,7 @@
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 enum mxc_gpio_direction {
diff --git a/drivers/gpio/mxs_gpio.c b/drivers/gpio/mxs_gpio.c
index 310e04dd33e..7a290fba0f7 100644
--- a/drivers/gpio/mxs_gpio.c
+++ b/drivers/gpio/mxs_gpio.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
diff --git a/drivers/gpio/pca953x.c b/drivers/gpio/pca953x.c
index adb2079e083..c3a79b931b8 100644
--- a/drivers/gpio/pca953x.c
+++ b/drivers/gpio/pca953x.c
@@ -14,6 +14,7 @@
 #include <pca953x.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/kernel.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 1f7563531e7..a3ae0c49b98 100644
--- a/drivers/gpio/pca953x_gpio.c
+++ b/drivers/gpio/pca953x_gpio.c
@@ -31,6 +31,7 @@
 #include <dt-bindings/gpio/gpio.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #define PCA953X_INPUT           0
diff --git a/drivers/gpio/pm8916_gpio.c b/drivers/gpio/pm8916_gpio.c
index de150c44a54..62fb3a39d3e 100644
--- a/drivers/gpio/pm8916_gpio.c
+++ b/drivers/gpio/pm8916_gpio.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <stdbool.h>
 #include <linux/errno.h>
 #include <power/pmic.h>
 #include <spmi/spmi.h>
diff --git a/drivers/gpio/rk_gpio.c b/drivers/gpio/rk_gpio.c
index 29ef2dc2c85..fa79bacbd07 100644
--- a/drivers/gpio/rk_gpio.c
+++ b/drivers/gpio/rk_gpio.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <stdbool.h>
 #include <syscon.h>
 #include <vsprintf.h>
 #include <linux/errno.h>
diff --git a/drivers/gpio/sh_pfc.c b/drivers/gpio/sh_pfc.c
index 0653171af48..693aa873ba2 100644
--- a/drivers/gpio/sh_pfc.c
+++ b/drivers/gpio/sh_pfc.c
@@ -17,6 +17,7 @@
 #include <sh_pfc.h>
 #include <linux/bitops.h>
 #include <linux/bug.h>
+#include <linux/kernel.h>
 
 static struct pinmux_info *gpioc;
 
diff --git a/drivers/gpio/sifive-gpio.c b/drivers/gpio/sifive-gpio.c
index 76e3c702e21..51c3ce610a1 100644
--- a/drivers/gpio/sifive-gpio.c
+++ b/drivers/gpio/sifive-gpio.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <stdbool.h>
 #include <vsprintf.h>
 #include <asm/arch/gpio.h>
 #include <asm/io.h>
diff --git a/drivers/gpio/tca642x.c b/drivers/gpio/tca642x.c
index 9929eed5d1b..8b2057607bc 100644
--- a/drivers/gpio/tca642x.c
+++ b/drivers/gpio/tca642x.c
@@ -26,6 +26,7 @@
 #include <stdio.h>
 #include <tca642x.h>
 #include <vsprintf.h>
+#include <linux/kernel.h>
 
 /* tca642x register address definitions */
 struct tca642x_bank_info tca642x_regs[] = {
diff --git a/drivers/gpio/tegra186_gpio.c b/drivers/gpio/tegra186_gpio.c
index cf973e2d7f2..affabbbf9a6 100644
--- a/drivers/gpio/tegra186_gpio.c
+++ b/drivers/gpio/tegra186_gpio.c
@@ -15,6 +15,7 @@
 #include <dm/device-internal.h>
 #include <dt-bindings/gpio/gpio.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include "tegra186_gpio_priv.h"
 
 struct tegra186_gpio_port_data {
diff --git a/drivers/i2c/at91_i2c.c b/drivers/i2c/at91_i2c.c
index b825599dba5..c656db55706 100644
--- a/drivers/i2c/at91_i2c.c
+++ b/drivers/i2c/at91_i2c.c
@@ -17,6 +17,7 @@
 #include <i2c.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <mach/clk.h>
 
 #include "at91_i2c.h"
diff --git a/drivers/i2c/cros_ec_ldo.c b/drivers/i2c/cros_ec_ldo.c
index 13b9973b543..e894a1a3eb2 100644
--- a/drivers/i2c/cros_ec_ldo.c
+++ b/drivers/i2c/cros_ec_ldo.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <i2c.h>
 #include <log.h>
+#include <stdbool.h>
 #include <linux/errno.h>
 #include <power/tps65090.h>
 
diff --git a/drivers/i2c/designware_i2c.c b/drivers/i2c/designware_i2c.c
index e32bfbc2c29..5aad1a29977 100644
--- a/drivers/i2c/designware_i2c.c
+++ b/drivers/i2c/designware_i2c.c
@@ -17,6 +17,7 @@
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include "designware_i2c.h"
 #include <dm/device_compat.h>
 #include <linux/err.h>
diff --git a/drivers/i2c/designware_i2c.h b/drivers/i2c/designware_i2c.h
index 18acf4e841b..0f34cc8b5ab 100644
--- a/drivers/i2c/designware_i2c.h
+++ b/drivers/i2c/designware_i2c.h
@@ -10,6 +10,7 @@
 #include <clk.h>
 #include <i2c.h>
 #include <reset.h>
+#include <stdbool.h>
 #include <linux/bitops.h>
 
 struct i2c_regs {
diff --git a/drivers/i2c/designware_i2c_pci.c b/drivers/i2c/designware_i2c_pci.c
index 50649710aae..5f2084acda8 100644
--- a/drivers/i2c/designware_i2c_pci.c
+++ b/drivers/i2c/designware_i2c_pci.c
@@ -17,6 +17,7 @@
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include "designware_i2c.h"
 
 enum {
diff --git a/drivers/i2c/exynos_hs_i2c.c b/drivers/i2c/exynos_hs_i2c.c
index c334755a276..f34c7112529 100644
--- a/drivers/i2c/exynos_hs_i2c.c
+++ b/drivers/i2c/exynos_hs_i2c.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/arch/clk.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/pinmux.h>
diff --git a/drivers/i2c/fsl_i2c.c b/drivers/i2c/fsl_i2c.c
index dad4a5549c1..10cc55ce834 100644
--- a/drivers/i2c/fsl_i2c.c
+++ b/drivers/i2c/fsl_i2c.c
@@ -20,6 +20,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 /* The maximum number of microseconds we will wait until another master has
diff --git a/drivers/i2c/i2c-cdns.c b/drivers/i2c/i2c-cdns.c
index abbfdcbcc5c..a5781bcfec2 100644
--- a/drivers/i2c/i2c-cdns.c
+++ b/drivers/i2c/i2c-cdns.c
@@ -13,6 +13,7 @@
 #include <stdio.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/types.h>
 #include <linux/io.h>
 #include <linux/errno.h>
diff --git a/drivers/i2c/i2c-gpio.c b/drivers/i2c/i2c-gpio.c
index c29e5d7def0..7e47bed9f4b 100644
--- a/drivers/i2c/i2c-gpio.c
+++ b/drivers/i2c/i2c-gpio.c
@@ -14,6 +14,7 @@
 #include <asm/gpio.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 
 #define DEFAULT_UDELAY	5
diff --git a/drivers/i2c/i2c-uclass.c b/drivers/i2c/i2c-uclass.c
index 9e2d5dd0b12..f5a1890d5c9 100644
--- a/drivers/i2c/i2c-uclass.c
+++ b/drivers/i2c/i2c-uclass.c
@@ -19,6 +19,7 @@
 #endif
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #define I2C_MAX_OFFSET_LEN	4
diff --git a/drivers/i2c/i2c-uniphier-f.c b/drivers/i2c/i2c-uniphier-f.c
index a110fe9e8d9..c78378fa183 100644
--- a/drivers/i2c/i2c-uniphier-f.c
+++ b/drivers/i2c/i2c-uniphier-f.c
@@ -5,6 +5,7 @@
  *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  */
 
+#include <stdbool.h>
 #include <dm/device_compat.h>
 #include <linux/errno.h>
 #include <linux/io.h>
diff --git a/drivers/i2c/i2c-uniphier.c b/drivers/i2c/i2c-uniphier.c
index e7f44e14e9c..c1f1eb0325b 100644
--- a/drivers/i2c/i2c-uniphier.c
+++ b/drivers/i2c/i2c-uniphier.c
@@ -5,6 +5,7 @@
  *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  */
 
+#include <stdbool.h>
 #include <dm/device_compat.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/i2c/ihs_i2c.c b/drivers/i2c/ihs_i2c.c
index 31e8cc5d8eb..5550da80622 100644
--- a/drivers/i2c/ihs_i2c.c
+++ b/drivers/i2c/ihs_i2c.c
@@ -18,6 +18,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #ifdef CONFIG_DM_I2C
diff --git a/drivers/i2c/imx_lpi2c.c b/drivers/i2c/imx_lpi2c.c
index f7186639d18..aa5c65728cd 100644
--- a/drivers/i2c/imx_lpi2c.c
+++ b/drivers/i2c/imx_lpi2c.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <errno.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <asm/io.h>
diff --git a/drivers/i2c/meson_i2c.c b/drivers/i2c/meson_i2c.c
index 051b238e166..3e4b10aff54 100644
--- a/drivers/i2c/meson_i2c.c
+++ b/drivers/i2c/meson_i2c.c
@@ -13,6 +13,7 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #define I2C_TIMEOUT_MS		100
 
diff --git a/drivers/i2c/mxc_i2c.c b/drivers/i2c/mxc_i2c.c
index 683b45bd8fd..dfa84836f53 100644
--- a/drivers/i2c/mxc_i2c.c
+++ b/drivers/i2c/mxc_i2c.c
@@ -32,6 +32,7 @@
 #include <dm.h>
 #include <dm/pinctrl.h>
 #include <fdtdec.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/i2c/nx_i2c.c b/drivers/i2c/nx_i2c.c
index 738796788af..54a7bc85f69 100644
--- a/drivers/i2c/nx_i2c.c
+++ b/drivers/i2c/nx_i2c.c
@@ -10,6 +10,7 @@
 #include <asm/arch/nx_gpio.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #define I2C_WRITE       0
 #define I2C_READ        1
diff --git a/drivers/i2c/rcar_iic.c b/drivers/i2c/rcar_iic.c
index dd0e921725b..6899a68a847 100644
--- a/drivers/i2c/rcar_iic.c
+++ b/drivers/i2c/rcar_iic.c
@@ -17,6 +17,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 struct rcar_iic_priv {
 	void __iomem		*base;
diff --git a/drivers/i2c/rk_i2c.c b/drivers/i2c/rk_i2c.c
index 98a0aee9b0e..e430a790df0 100644
--- a/drivers/i2c/rk_i2c.c
+++ b/drivers/i2c/rk_i2c.c
@@ -20,6 +20,7 @@
 #include <dm/pinctrl.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 
 /* i2c timerout */
diff --git a/drivers/i2c/s3c24x0_i2c.c b/drivers/i2c/s3c24x0_i2c.c
index ae3084d549d..6cc63b528dd 100644
--- a/drivers/i2c/s3c24x0_i2c.c
+++ b/drivers/i2c/s3c24x0_i2c.c
@@ -16,6 +16,7 @@
 #else
 #include <asm/arch/s3c24x0_cpu.h>
 #endif
+#include <stdbool.h>
 #include <time.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/i2c/s3c24x0_i2c.h b/drivers/i2c/s3c24x0_i2c.h
index ec8f1acaef5..7a37b8071b6 100644
--- a/drivers/i2c/s3c24x0_i2c.h
+++ b/drivers/i2c/s3c24x0_i2c.h
@@ -6,6 +6,7 @@
 #ifndef _S3C24X0_I2C_H
 #define _S3C24X0_I2C_H
 
+#include <stdbool.h>
 struct s3c24x0_i2c {
 	u32	iiccon;
 	u32	iicstat;
diff --git a/drivers/i2c/sandbox_i2c.c b/drivers/i2c/sandbox_i2c.c
index 2afd17f92fc..10dee15a667 100644
--- a/drivers/i2c/sandbox_i2c.c
+++ b/drivers/i2c/sandbox_i2c.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <i2c.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/test.h>
 #include <dm/acpi.h>
 #include <dm/lists.h>
diff --git a/drivers/i2c/stm32f7_i2c.c b/drivers/i2c/stm32f7_i2c.c
index a353f063ed9..94c0cf6f342 100644
--- a/drivers/i2c/stm32f7_i2c.c
+++ b/drivers/i2c/stm32f7_i2c.c
@@ -15,6 +15,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/i2c/tegra186_bpmp_i2c.c b/drivers/i2c/tegra186_bpmp_i2c.c
index 188821bb878..c9446ed783f 100644
--- a/drivers/i2c/tegra186_bpmp_i2c.c
+++ b/drivers/i2c/tegra186_bpmp_i2c.c
@@ -12,6 +12,7 @@
 #include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/i2c/tegra_i2c.c b/drivers/i2c/tegra_i2c.c
index 03687b7532b..5b05290224a 100644
--- a/drivers/i2c/tegra_i2c.c
+++ b/drivers/i2c/tegra_i2c.c
@@ -22,6 +22,7 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/input/cros_ec_keyb.c b/drivers/input/cros_ec_keyb.c
index 60f89562fad..dea52314542 100644
--- a/drivers/input/cros_ec_keyb.c
+++ b/drivers/input/cros_ec_keyb.c
@@ -13,6 +13,7 @@
 #include <keyboard.h>
 #include <key_matrix.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio_dev.h>
 #include <linux/errno.h>
 #include <linux/string.h>
diff --git a/drivers/input/i8042.c b/drivers/input/i8042.c
index e90a38ad97b..c7661b5ab7d 100644
--- a/drivers/input/i8042.c
+++ b/drivers/input/i8042.c
@@ -14,6 +14,7 @@
 #include <input.h>
 #include <keyboard.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/u-boot.h>
diff --git a/drivers/input/input.c b/drivers/input/input.c
index 37dae11d97a..4b54df8a871 100644
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -19,6 +19,7 @@
 #endif
 #include <time.h>
 #include <linux/input.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 enum {
diff --git a/drivers/led/led_bcm6328.c b/drivers/led/led_bcm6328.c
index 4a07bcc8a70..84f9a4ceca6 100644
--- a/drivers/led/led_bcm6328.c
+++ b/drivers/led/led_bcm6328.c
@@ -8,6 +8,7 @@
 #include <errno.h>
 #include <led.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <dm/lists.h>
 #include <linux/errno.h>
diff --git a/drivers/led/led_bcm6358.c b/drivers/led/led_bcm6358.c
index 019a84813ac..f8fdfcc23de 100644
--- a/drivers/led/led_bcm6358.c
+++ b/drivers/led/led_bcm6358.c
@@ -8,6 +8,7 @@
 #include <errno.h>
 #include <led.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <dm/lists.h>
 #include <linux/delay.h>
diff --git a/drivers/led/led_bcm6858.c b/drivers/led/led_bcm6858.c
index c0f5a1a7bb6..b44232773b6 100644
--- a/drivers/led/led_bcm6858.c
+++ b/drivers/led/led_bcm6858.c
@@ -16,6 +16,7 @@
 #include <dm/lists.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #define LEDS_MAX		32
 #define LEDS_WAIT		100
diff --git a/drivers/mailbox/k3-sec-proxy.c b/drivers/mailbox/k3-sec-proxy.c
index d9516bd59e4..c2c77b64244 100644
--- a/drivers/mailbox/k3-sec-proxy.c
+++ b/drivers/mailbox/k3-sec-proxy.c
@@ -14,6 +14,7 @@
 #include <asm/io.h>
 #include <dm/device_compat.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/types.h>
 #include <linux/bitops.h>
 #include <linux/soc/ti/k3-sec-proxy.h>
diff --git a/drivers/mailbox/sandbox-mbox.c b/drivers/mailbox/sandbox-mbox.c
index 4dd5371fc19..27d2b7b9976 100644
--- a/drivers/mailbox/sandbox-mbox.c
+++ b/drivers/mailbox/sandbox-mbox.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <mailbox-uclass.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <asm/mbox.h>
 #include <linux/errno.h>
diff --git a/drivers/misc/atsha204a-i2c.c b/drivers/misc/atsha204a-i2c.c
index 5262c005a04..2df8d1070c0 100644
--- a/drivers/misc/atsha204a-i2c.c
+++ b/drivers/misc/atsha204a-i2c.c
@@ -16,6 +16,7 @@
 #include <errno.h>
 #include <atsha204a-i2c.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/misc/cros_ec.c b/drivers/misc/cros_ec.c
index a3ae33acd05..7979989e1a6 100644
--- a/drivers/misc/cros_ec.c
+++ b/drivers/misc/cros_ec.c
@@ -34,6 +34,7 @@
 #include <dm/device-internal.h>
 #include <dm/of_extra.h>
 #include <dm/uclass-internal.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #ifdef DEBUG_TRACE
diff --git a/drivers/misc/cros_ec_i2c.c b/drivers/misc/cros_ec_i2c.c
index 782ee703eb6..2118afee76a 100644
--- a/drivers/misc/cros_ec_i2c.c
+++ b/drivers/misc/cros_ec_i2c.c
@@ -19,6 +19,7 @@
 #include <log.h>
 #include <stdio.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #ifdef DEBUG_TRACE
diff --git a/drivers/misc/cros_ec_sandbox.c b/drivers/misc/cros_ec_sandbox.c
index 5a5af51eb39..b3282243243 100644
--- a/drivers/misc/cros_ec_sandbox.c
+++ b/drivers/misc/cros_ec_sandbox.c
@@ -16,6 +16,7 @@
 #include <stdio.h>
 #include <time.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <u-boot/sha256.h>
 #include <spi.h>
diff --git a/drivers/misc/cros_ec_spi.c b/drivers/misc/cros_ec_spi.c
index bb7b8c1b1de..3c3db889d61 100644
--- a/drivers/misc/cros_ec_spi.c
+++ b/drivers/misc/cros_ec_spi.c
@@ -21,6 +21,7 @@
 #include <stdio.h>
 #include <time.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 int cros_ec_spi_packet(struct udevice *udev, int out_bytes, int in_bytes)
diff --git a/drivers/misc/ds4510.c b/drivers/misc/ds4510.c
index 4cf609bdad4..8d3a690aa1b 100644
--- a/drivers/misc/ds4510.c
+++ b/drivers/misc/ds4510.c
@@ -14,6 +14,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "ds4510.h"
 
diff --git a/drivers/misc/fsl_ifc.c b/drivers/misc/fsl_ifc.c
index a0e979e09e1..1716cf21299 100644
--- a/drivers/misc/fsl_ifc.c
+++ b/drivers/misc/fsl_ifc.c
@@ -9,6 +9,7 @@
 #include <part.h>
 #include <stdio.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 #ifdef CONFIG_TFABOOT
 struct ifc_regs ifc_cfg_default_boot[CONFIG_SYS_FSL_IFC_BANK_COUNT] = {
diff --git a/drivers/misc/fsl_iim.c b/drivers/misc/fsl_iim.c
index be6d03444d5..07c7a492081 100644
--- a/drivers/misc/fsl_iim.c
+++ b/drivers/misc/fsl_iim.c
@@ -18,6 +18,7 @@
 #if defined(CONFIG_MX51) || defined(CONFIG_MX53)
 #include <asm/arch/clock.h>
 #endif
+#include <linux/kernel.h>
 
 /* FSL IIM-specific constants */
 #define STAT_BUSY		0x80
diff --git a/drivers/misc/gdsys_ioep.c b/drivers/misc/gdsys_ioep.c
index 22afebd9ab0..ebcd4d91e89 100644
--- a/drivers/misc/gdsys_ioep.c
+++ b/drivers/misc/gdsys_ioep.c
@@ -16,6 +16,7 @@
 #include <log.h>
 #include <misc.h>
 #include <regmap.h>
+#include <stdbool.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 
diff --git a/drivers/misc/gdsys_rxaui_ctrl.c b/drivers/misc/gdsys_rxaui_ctrl.c
index c56abce4d4c..7cc350d3cc9 100644
--- a/drivers/misc/gdsys_rxaui_ctrl.c
+++ b/drivers/misc/gdsys_rxaui_ctrl.c
@@ -11,6 +11,7 @@
 #include <dm.h>
 #include <regmap.h>
 #include <misc.h>
+#include <stdbool.h>
 
 struct gdsys_rxaui_ctrl_regs {
 	u16 gen_cnt;
diff --git a/drivers/misc/gpio_led.c b/drivers/misc/gpio_led.c
index acf3ec8c017..68f46fd59d9 100644
--- a/drivers/misc/gpio_led.c
+++ b/drivers/misc/gpio_led.c
@@ -9,6 +9,7 @@
 #include <status_led.h>
 #include <stdio.h>
 #include <asm/gpio.h>
+#include <linux/kernel.h>
 
 #ifndef CONFIG_GPIO_LED_INVERTED_TABLE
 #define CONFIG_GPIO_LED_INVERTED_TABLE {}
diff --git a/drivers/misc/i2c_eeprom_emul.c b/drivers/misc/i2c_eeprom_emul.c
index 9f0d89673d9..e7f9ccdf848 100644
--- a/drivers/misc/i2c_eeprom_emul.c
+++ b/drivers/misc/i2c_eeprom_emul.c
@@ -13,6 +13,7 @@
 #include <malloc.h>
 #include <asm/test.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #ifdef DEBUG
diff --git a/drivers/misc/ihs_fpga.c b/drivers/misc/ihs_fpga.c
index 9dbb857101d..fd9c0f937ff 100644
--- a/drivers/misc/ihs_fpga.c
+++ b/drivers/misc/ihs_fpga.c
@@ -13,6 +13,7 @@
 #include <dm.h>
 #include <log.h>
 #include <regmap.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/gpio.h>
 #include <linux/bitops.h>
diff --git a/drivers/misc/irq-uclass.c b/drivers/misc/irq-uclass.c
index 6b6813e1fc5..3795f5eaa1b 100644
--- a/drivers/misc/irq-uclass.c
+++ b/drivers/misc/irq-uclass.c
@@ -11,6 +11,7 @@
 #include <dt-structs.h>
 #include <irq.h>
 #include <log.h>
+#include <stdbool.h>
 #include <dm/device-internal.h>
 #include <linux/errno.h>
 
diff --git a/drivers/misc/irq_sandbox.c b/drivers/misc/irq_sandbox.c
index 14366febd38..625aa140651 100644
--- a/drivers/misc/irq_sandbox.c
+++ b/drivers/misc/irq_sandbox.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <dm.h>
 #include <irq.h>
+#include <stdbool.h>
 #include <acpi/acpi_device.h>
 #include <asm/test.h>
 #include <linux/errno.h>
diff --git a/drivers/misc/misc-uclass.c b/drivers/misc/misc-uclass.c
index c0db58b8967..11ecfc44839 100644
--- a/drivers/misc/misc-uclass.c
+++ b/drivers/misc/misc-uclass.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <misc.h>
+#include <stdbool.h>
 #include <linux/errno.h>
 
 /*
diff --git a/drivers/misc/misc_sandbox.c b/drivers/misc/misc_sandbox.c
index 4e3e8a4a364..0149e8d9a79 100644
--- a/drivers/misc/misc_sandbox.c
+++ b/drivers/misc/misc_sandbox.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <misc.h>
+#include <stdbool.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 
diff --git a/drivers/misc/mpc83xx_serdes.c b/drivers/misc/mpc83xx_serdes.c
index 925e6ec3ab8..0f182de1568 100644
--- a/drivers/misc/mpc83xx_serdes.c
+++ b/drivers/misc/mpc83xx_serdes.c
@@ -14,6 +14,7 @@
 #include <log.h>
 #include <mapmem.h>
 #include <misc.h>
+#include <stdbool.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/string.h>
diff --git a/drivers/misc/mxc_ocotp.c b/drivers/misc/mxc_ocotp.c
index 5d7a74afe2c..cce6cb72c5e 100644
--- a/drivers/misc/mxc_ocotp.c
+++ b/drivers/misc/mxc_ocotp.c
@@ -13,6 +13,7 @@
 
 #include <common.h>
 #include <fuse.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
@@ -20,6 +21,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/mach-imx/sys_proto.h>
+#include <linux/kernel.h>
 
 #define BO_CTRL_WR_UNLOCK		16
 #define BM_CTRL_WR_UNLOCK		0xffff0000
diff --git a/drivers/misc/mxs_ocotp.c b/drivers/misc/mxs_ocotp.c
index fa185612b2c..ede9d9e7423 100644
--- a/drivers/misc/mxs_ocotp.c
+++ b/drivers/misc/mxs_ocotp.c
@@ -13,6 +13,7 @@
 
 #include <common.h>
 #include <fuse.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/misc/p2sb-uclass.c b/drivers/misc/p2sb-uclass.c
index 149f3d28ebf..eea0e0f528f 100644
--- a/drivers/misc/p2sb-uclass.c
+++ b/drivers/misc/p2sb-uclass.c
@@ -16,6 +16,7 @@
 #include <asm/io.h>
 #include <dm/uclass-internal.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #define PCR_COMMON_IOSF_1_0	1
 
diff --git a/drivers/misc/p2sb_emul.c b/drivers/misc/p2sb_emul.c
index 3c17f6de3f6..ae68cd9c71a 100644
--- a/drivers/misc/p2sb_emul.c
+++ b/drivers/misc/p2sb_emul.c
@@ -17,6 +17,7 @@
 #include <asm/test.h>
 #include <p2sb.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 /**
  * struct p2sb_emul_platdata - platform data for this device
diff --git a/drivers/misc/pwrseq-uclass.c b/drivers/misc/pwrseq-uclass.c
index 220567ee279..8ad5c1b5a6b 100644
--- a/drivers/misc/pwrseq-uclass.c
+++ b/drivers/misc/pwrseq-uclass.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <dm.h>
 #include <pwrseq.h>
+#include <stdbool.h>
 #include <linux/errno.h>
 
 int pwrseq_set_power(struct udevice *dev, bool enable)
diff --git a/drivers/misc/qfw.c b/drivers/misc/qfw.c
index c5629183f86..cd845a71bf6 100644
--- a/drivers/misc/qfw.c
+++ b/drivers/misc/qfw.c
@@ -15,6 +15,7 @@
 #include <asm/tables.h>
 #endif
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/list.h>
 #include <linux/string.h>
 
diff --git a/drivers/misc/rockchip-efuse.c b/drivers/misc/rockchip-efuse.c
index d5c1a62ba64..ad825e940f1 100644
--- a/drivers/misc/rockchip-efuse.c
+++ b/drivers/misc/rockchip-efuse.c
@@ -15,6 +15,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <misc.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #define RK3399_A_SHIFT          16
diff --git a/drivers/misc/rockchip-otp.c b/drivers/misc/rockchip-otp.c
index a8563a305d0..6f438c41df5 100644
--- a/drivers/misc/rockchip-otp.c
+++ b/drivers/misc/rockchip-otp.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/io.h>
 #include <command.h>
diff --git a/drivers/misc/spltest_sandbox.c b/drivers/misc/spltest_sandbox.c
index 8a5e6b1975e..1bb4120a06d 100644
--- a/drivers/misc/spltest_sandbox.c
+++ b/drivers/misc/spltest_sandbox.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <dt-structs.h>
 #include <stdio.h>
+#include <linux/kernel.h>
 
 static int sandbox_spl_probe(struct udevice *dev)
 {
diff --git a/drivers/misc/swap_case.c b/drivers/misc/swap_case.c
index 64f29f86baa..fa3ed8671c2 100644
--- a/drivers/misc/swap_case.c
+++ b/drivers/misc/swap_case.c
@@ -14,6 +14,7 @@
 #include <asm/test.h>
 #include <linux/ctype.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 /**
  * struct swap_case_platdata - platform data for this device
diff --git a/drivers/misc/tegra186_bpmp.c b/drivers/misc/tegra186_bpmp.c
index 24ff0cd120d..96913285927 100644
--- a/drivers/misc/tegra186_bpmp.c
+++ b/drivers/misc/tegra186_bpmp.c
@@ -18,6 +18,7 @@
 #include <linux/bitops.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/misc/vexpress_config.c b/drivers/misc/vexpress_config.c
index 2b1d19a14a7..3a74ffcadda 100644
--- a/drivers/misc/vexpress_config.c
+++ b/drivers/misc/vexpress_config.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <dm/read.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
diff --git a/drivers/mmc/bcm2835_sdhost.c b/drivers/mmc/bcm2835_sdhost.c
index 97ca2ce029a..315a829f205 100644
--- a/drivers/mmc/bcm2835_sdhost.c
+++ b/drivers/mmc/bcm2835_sdhost.c
@@ -46,6 +46,7 @@
 #include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/iopoll.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <mach/gpio.h>
 #include <power/regulator.h>
diff --git a/drivers/mmc/dw_mmc.c b/drivers/mmc/dw_mmc.c
index 95f3cf1d946..ade5dbe4721 100644
--- a/drivers/mmc/dw_mmc.c
+++ b/drivers/mmc/dw_mmc.c
@@ -20,6 +20,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <power/regulator.h>
 
 #define PAGE_SIZE 4096
diff --git a/drivers/mmc/exynos_dw_mmc.c b/drivers/mmc/exynos_dw_mmc.c
index f54413aa9e5..9fcb416b042 100644
--- a/drivers/mmc/exynos_dw_mmc.c
+++ b/drivers/mmc/exynos_dw_mmc.c
@@ -10,6 +10,7 @@
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <malloc.h>
 #include <errno.h>
diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c
index c73ec572f14..0fb2d505c15 100644
--- a/drivers/mmc/fsl_esdhc.c
+++ b/drivers/mmc/fsl_esdhc.c
@@ -32,6 +32,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/mmc/fsl_esdhc_imx.c b/drivers/mmc/fsl_esdhc_imx.c
index 2e667abf414..995fa6fefd8 100644
--- a/drivers/mmc/fsl_esdhc_imx.c
+++ b/drivers/mmc/fsl_esdhc_imx.c
@@ -30,6 +30,7 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include <power/regulator.h>
diff --git a/drivers/mmc/fsl_esdhc_spl.c b/drivers/mmc/fsl_esdhc_spl.c
index 4c725436de4..3359d67fafa 100644
--- a/drivers/mmc/fsl_esdhc_spl.c
+++ b/drivers/mmc/fsl_esdhc_spl.c
@@ -9,6 +9,7 @@
 #include <mmc.h>
 #include <malloc.h>
 #include <stdio.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 /*
diff --git a/drivers/mmc/ftsdc010_mci.h b/drivers/mmc/ftsdc010_mci.h
index 782d92be2f5..2c487b4176d 100644
--- a/drivers/mmc/ftsdc010_mci.h
+++ b/drivers/mmc/ftsdc010_mci.h
@@ -6,6 +6,7 @@
  * Macpaul Lin, Andes Technology Corporation <macpaul@andestech.com>
  */
 #include <mmc.h>
+#include <stdbool.h>
 
 #ifndef __FTSDC010_MCI_H
 #define __FTSDC010_MCI_H
diff --git a/drivers/mmc/gen_atmel_mci.c b/drivers/mmc/gen_atmel_mci.c
index 19ba2b51182..4b1869ae65c 100644
--- a/drivers/mmc/gen_atmel_mci.c
+++ b/drivers/mmc/gen_atmel_mci.c
@@ -23,6 +23,7 @@
 #include <asm/byteorder.h>
 #include <asm/arch/clk.h>
 #include <asm/arch/hardware.h>
+#include <linux/kernel.h>
 #include "atmel_mci.h"
 
 #ifndef CONFIG_SYS_MMC_CLK_OD
diff --git a/drivers/mmc/hi6220_dw_mmc.c b/drivers/mmc/hi6220_dw_mmc.c
index 61c209cb0a7..b3a8c5d50d8 100644
--- a/drivers/mmc/hi6220_dw_mmc.c
+++ b/drivers/mmc/hi6220_dw_mmc.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <fdtdec.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/mmc/jz_mmc.c b/drivers/mmc/jz_mmc.c
index 608e5623976..c8c7127cbe8 100644
--- a/drivers/mmc/jz_mmc.c
+++ b/drivers/mmc/jz_mmc.c
@@ -17,6 +17,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <mach/jz4780.h>
 #include <wait_bit.h>
 
diff --git a/drivers/mmc/meson_gx_mmc.c b/drivers/mmc/meson_gx_mmc.c
index b804a0c8364..2df20418be3 100644
--- a/drivers/mmc/meson_gx_mmc.c
+++ b/drivers/mmc/meson_gx_mmc.c
@@ -17,6 +17,7 @@
 #include <asm/arch/sd_emmc.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/log2.h>
 #include <linux/string.h>
 
diff --git a/drivers/mmc/mmc-uclass.c b/drivers/mmc/mmc-uclass.c
index cdc93c756c0..da06aa9e7b6 100644
--- a/drivers/mmc/mmc-uclass.c
+++ b/drivers/mmc/mmc-uclass.c
@@ -15,6 +15,7 @@
 #include <dm/lists.h>
 #include <linux/compat.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include "mmc_private.h"
 
 int dm_mmc_get_b_max(struct udevice *dev, void *dst, lbaint_t blkcnt)
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index 93220596896..e38950dd6e0 100644
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@ -24,6 +24,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include <power/regulator.h>
diff --git a/drivers/mmc/mmc_spi.c b/drivers/mmc/mmc_spi.c
index 0581adb0841..ac8a127029c 100644
--- a/drivers/mmc/mmc_spi.c
+++ b/drivers/mmc/mmc_spi.c
@@ -12,6 +12,7 @@
 #include <malloc.h>
 #include <part.h>
 #include <mmc.h>
+#include <stdbool.h>
 #include <stdlib.h>
 #include <vsprintf.h>
 #include <linux/bitops.h>
diff --git a/drivers/mmc/mmc_write.c b/drivers/mmc/mmc_write.c
index 68d872fd142..93eb1404def 100644
--- a/drivers/mmc/mmc_write.c
+++ b/drivers/mmc/mmc_write.c
@@ -13,6 +13,7 @@
 #include <part.h>
 #include <div64.h>
 #include <stdio.h>
+#include <linux/kernel.h>
 #include <linux/math64.h>
 #include "mmc_private.h"
 
diff --git a/drivers/mmc/mtk-sd.c b/drivers/mmc/mtk-sd.c
index 2ec53e853a9..b6632a32d36 100644
--- a/drivers/mmc/mtk-sd.c
+++ b/drivers/mmc/mtk-sd.c
@@ -21,6 +21,7 @@
 #include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/iopoll.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 
 /* MSDC_CFG */
diff --git a/drivers/mmc/mxsmmc.c b/drivers/mmc/mxsmmc.c
index a54e1e12835..615ed6b1700 100644
--- a/drivers/mmc/mxsmmc.c
+++ b/drivers/mmc/mxsmmc.c
@@ -35,6 +35,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/mach-imx/dma.h>
 #include <bouncebuf.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #define	MXSMMC_MAX_TIMEOUT	10000
diff --git a/drivers/mmc/nexell_dw_mmc.c b/drivers/mmc/nexell_dw_mmc.c
index e5df2920242..35704e74d6b 100644
--- a/drivers/mmc/nexell_dw_mmc.c
+++ b/drivers/mmc/nexell_dw_mmc.c
@@ -11,6 +11,7 @@
 #include <dt-structs.h>
 #include <dwmmc.h>
 #include <log.h>
+#include <stdbool.h>
 #include <syscon.h>
 #include <asm/arch/reset.h>
 #include <asm/arch/clk.h>
diff --git a/drivers/mmc/omap_hsmmc.c b/drivers/mmc/omap_hsmmc.c
index 606c4a5c1c6..4de6bb1d972 100644
--- a/drivers/mmc/omap_hsmmc.c
+++ b/drivers/mmc/omap_hsmmc.c
@@ -58,6 +58,7 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <power/regulator.h>
 #include <thermal.h>
 
diff --git a/drivers/mmc/pxa_mmc_gen.c b/drivers/mmc/pxa_mmc_gen.c
index 854d346a746..5a4652e2461 100644
--- a/drivers/mmc/pxa_mmc_gen.c
+++ b/drivers/mmc/pxa_mmc_gen.c
@@ -19,6 +19,7 @@
 #include <dm/platform_data/pxa_mmc_gen.h>
 #include <malloc.h>
 #include <mmc.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 /* PXAMMC Generic default config for various CPUs */
diff --git a/drivers/mmc/renesas-sdhi.c b/drivers/mmc/renesas-sdhi.c
index 4e8d2a9e509..1c4ce0ff02a 100644
--- a/drivers/mmc/renesas-sdhi.c
+++ b/drivers/mmc/renesas-sdhi.c
@@ -19,6 +19,7 @@
 #include <linux/dma-direction.h>
 #include <linux/errno.h>
 #include <linux/io.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <power/regulator.h>
 #include <asm/unaligned.h>
diff --git a/drivers/mmc/rpmb.c b/drivers/mmc/rpmb.c
index 93fdf72f344..b07a10c0f78 100644
--- a/drivers/mmc/rpmb.c
+++ b/drivers/mmc/rpmb.c
@@ -13,6 +13,7 @@
 #include <memalign.h>
 #include <mmc.h>
 #include <sdhci.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <linux/errno.h>
 #include <linux/string.h>
diff --git a/drivers/mmc/sandbox_mmc.c b/drivers/mmc/sandbox_mmc.c
index d4780271fc3..58c79a8821b 100644
--- a/drivers/mmc/sandbox_mmc.c
+++ b/drivers/mmc/sandbox_mmc.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <mmc.h>
 #include <asm/test.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 struct sandbox_mmc_plat {
diff --git a/drivers/mmc/sdhci-cadence.c b/drivers/mmc/sdhci-cadence.c
index 96901bce72d..fd5b77351a2 100644
--- a/drivers/mmc/sdhci-cadence.c
+++ b/drivers/mmc/sdhci-cadence.c
@@ -14,6 +14,7 @@
 #include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/iopoll.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <linux/libfdt.h>
 #include <mmc.h>
diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c
index b7add7f0312..023eede0121 100644
--- a/drivers/mmc/sdhci.c
+++ b/drivers/mmc/sdhci.c
@@ -24,6 +24,7 @@
 #include <linux/dma-mapping.h>
 #include <phys2bus.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/mmc/sh_mmcif.c b/drivers/mmc/sh_mmcif.c
index e9ff31b4afe..ede46d1b6ac 100644
--- a/drivers/mmc/sh_mmcif.c
+++ b/drivers/mmc/sh_mmcif.c
@@ -22,6 +22,7 @@
 #include <linux/errno.h>
 #include <linux/compat.h>
 #include <linux/io.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <linux/string.h>
 #include "sh_mmcif.h"
diff --git a/drivers/mmc/snps_dw_mmc.c b/drivers/mmc/snps_dw_mmc.c
index f123d3fe222..5572afa1e48 100644
--- a/drivers/mmc/snps_dw_mmc.c
+++ b/drivers/mmc/snps_dw_mmc.c
@@ -15,6 +15,7 @@
 #include <fdtdec.h>
 #include <dm/device_compat.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <linux/err.h>
 #include <malloc.h>
diff --git a/drivers/mmc/stm32_sdmmc2.c b/drivers/mmc/stm32_sdmmc2.c
index f46c9a8e5bf..62f9c7a6f5d 100644
--- a/drivers/mmc/stm32_sdmmc2.c
+++ b/drivers/mmc/stm32_sdmmc2.c
@@ -17,6 +17,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <mmc.h>
 #include <reset.h>
diff --git a/drivers/mmc/sunxi_mmc.c b/drivers/mmc/sunxi_mmc.c
index 7164db122fa..b562595e2f3 100644
--- a/drivers/mmc/sunxi_mmc.c
+++ b/drivers/mmc/sunxi_mmc.c
@@ -15,6 +15,7 @@
 #include <mmc.h>
 #include <clk.h>
 #include <reset.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <asm/io.h>
diff --git a/drivers/mmc/tmio-common.c b/drivers/mmc/tmio-common.c
index ff563cf9773..5e8076fcd97 100644
--- a/drivers/mmc/tmio-common.c
+++ b/drivers/mmc/tmio-common.c
@@ -18,6 +18,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/errno.h>
 #include <linux/io.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <power/regulator.h>
 #include <asm/unaligned.h>
diff --git a/drivers/mmc/tmio-common.h b/drivers/mmc/tmio-common.h
index 9062300c64f..4160cbe0f5c 100644
--- a/drivers/mmc/tmio-common.h
+++ b/drivers/mmc/tmio-common.h
@@ -7,6 +7,7 @@
 #ifndef __TMIO_COMMON_H__
 #define __TMIO_COMMON_H__
 
+#include <stdbool.h>
 #include <linux/bitops.h>
 #define TMIO_SD_CMD			0x000	/* command */
 #define   TMIO_SD_CMD_NOSTOP		BIT(14)	/* No automatic CMD12 issue */
diff --git a/drivers/mmc/uniphier-sd.c b/drivers/mmc/uniphier-sd.c
index 4dbe71fa2e1..088e1d9a900 100644
--- a/drivers/mmc/uniphier-sd.c
+++ b/drivers/mmc/uniphier-sd.c
@@ -14,6 +14,7 @@
 #include <linux/compat.h>
 #include <linux/dma-direction.h>
 #include <linux/io.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <power/regulator.h>
 #include <asm/unaligned.h>
diff --git a/drivers/mmc/xenon_sdhci.c b/drivers/mmc/xenon_sdhci.c
index 355b4eecb09..46c8db49547 100644
--- a/drivers/mmc/xenon_sdhci.c
+++ b/drivers/mmc/xenon_sdhci.c
@@ -17,6 +17,7 @@
 #include <common.h>
 #include <dm.h>
 #include <fdtdec.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c
index 252f49fb4c6..9fed43f05a0 100644
--- a/drivers/mtd/cfi_flash.c
+++ b/drivers/mtd/cfi_flash.c
@@ -38,6 +38,7 @@
 #include <env_internal.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <mtd/cfi_flash.h>
 #include <watchdog.h>
diff --git a/drivers/mtd/hbmc-am654.c b/drivers/mtd/hbmc-am654.c
index 1583efd267d..848c5ede413 100644
--- a/drivers/mtd/hbmc-am654.c
+++ b/drivers/mtd/hbmc-am654.c
@@ -4,6 +4,7 @@
 // Author: Vignesh Raghavendra <vigneshr@ti.com>
 
 #include <common.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <dm.h>
 #include <regmap.h>
diff --git a/drivers/mtd/jedec_flash.c b/drivers/mtd/jedec_flash.c
index 790373dac8f..9456c9abbc3 100644
--- a/drivers/mtd/jedec_flash.c
+++ b/drivers/mtd/jedec_flash.c
@@ -18,6 +18,7 @@
 #include <asm/processor.h>
 #include <asm/io.h>
 #include <asm/byteorder.h>
+#include <linux/kernel.h>
 
 #define P_ID_AMD_STD CFI_CMDSET_AMD_LEGACY
 
diff --git a/drivers/mtd/nand/bbt.c b/drivers/mtd/nand/bbt.c
index 51d7efd2200..b2f2154dab6 100644
--- a/drivers/mtd/nand/bbt.c
+++ b/drivers/mtd/nand/bbt.c
@@ -13,6 +13,7 @@
 #include <dm/devres.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/mtd/nand.h>
 #ifndef __UBOOT__
 #include <linux/slab.h>
diff --git a/drivers/mtd/nand/core.c b/drivers/mtd/nand/core.c
index 1d9d13dfe1e..57e296f59cf 100644
--- a/drivers/mtd/nand/core.c
+++ b/drivers/mtd/nand/core.c
@@ -14,6 +14,7 @@
 #include <linux/compat.h>
 #include <linux/module.h>
 #endif
+#include <stdbool.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/mtd/nand.h>
diff --git a/drivers/mtd/nand/raw/arasan_nfc.c b/drivers/mtd/nand/raw/arasan_nfc.c
index 978174ffa8d..c604db376c1 100644
--- a/drivers/mtd/nand/raw/arasan_nfc.c
+++ b/drivers/mtd/nand/raw/arasan_nfc.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
diff --git a/drivers/mtd/nand/raw/brcmnand/bcm63158_nand.c b/drivers/mtd/nand/raw/brcmnand/bcm63158_nand.c
index 89c981096ba..acfe2ba0bd2 100644
--- a/drivers/mtd/nand/raw/brcmnand/bcm63158_nand.c
+++ b/drivers/mtd/nand/raw/brcmnand/bcm63158_nand.c
@@ -10,6 +10,7 @@
 #include <linux/io.h>
 #include <linux/ioport.h>
 #include <dm.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 
 #include "brcmnand.h"
diff --git a/drivers/mtd/nand/raw/brcmnand/bcm6368_nand.c b/drivers/mtd/nand/raw/brcmnand/bcm6368_nand.c
index 3223d9aacff..4c886e1533f 100644
--- a/drivers/mtd/nand/raw/brcmnand/bcm6368_nand.c
+++ b/drivers/mtd/nand/raw/brcmnand/bcm6368_nand.c
@@ -9,6 +9,7 @@
 #include <linux/io.h>
 #include <linux/ioport.h>
 #include <dm.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 
 #include "brcmnand.h"
diff --git a/drivers/mtd/nand/raw/brcmnand/bcm68360_nand.c b/drivers/mtd/nand/raw/brcmnand/bcm68360_nand.c
index b8e7b6b2921..a649b1a8963 100644
--- a/drivers/mtd/nand/raw/brcmnand/bcm68360_nand.c
+++ b/drivers/mtd/nand/raw/brcmnand/bcm68360_nand.c
@@ -9,6 +9,7 @@
 #include <linux/io.h>
 #include <linux/ioport.h>
 #include <dm.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 
 #include "brcmnand.h"
diff --git a/drivers/mtd/nand/raw/brcmnand/bcm6838_nand.c b/drivers/mtd/nand/raw/brcmnand/bcm6838_nand.c
index 071b16c217a..25bfe253f29 100644
--- a/drivers/mtd/nand/raw/brcmnand/bcm6838_nand.c
+++ b/drivers/mtd/nand/raw/brcmnand/bcm6838_nand.c
@@ -10,6 +10,7 @@
 #include <linux/io.h>
 #include <linux/ioport.h>
 #include <dm.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 
 #include "brcmnand.h"
diff --git a/drivers/mtd/nand/raw/brcmnand/bcm6858_nand.c b/drivers/mtd/nand/raw/brcmnand/bcm6858_nand.c
index e9d23377d47..926c59eb148 100644
--- a/drivers/mtd/nand/raw/brcmnand/bcm6858_nand.c
+++ b/drivers/mtd/nand/raw/brcmnand/bcm6858_nand.c
@@ -10,6 +10,7 @@
 #include <linux/io.h>
 #include <linux/ioport.h>
 #include <dm.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 
 #include "brcmnand.h"
diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand.c b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
index cefe65654c5..b90f26978ff 100644
--- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c
+++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
@@ -27,6 +27,7 @@
 #include <linux/ioport.h>
 #include <linux/completion.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/log2.h>
 #include <asm/processor.h>
 #include <dm.h>
diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand.h b/drivers/mtd/nand/raw/brcmnand/brcmnand.h
index 6946a62b067..2a48dfea90c 100644
--- a/drivers/mtd/nand/raw/brcmnand/brcmnand.h
+++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.h
@@ -3,6 +3,7 @@
 #ifndef __BRCMNAND_H__
 #define __BRCMNAND_H__
 
+#include <stdbool.h>
 #include <linux/types.h>
 #include <linux/io.h>
 
diff --git a/drivers/mtd/nand/raw/davinci_nand.c b/drivers/mtd/nand/raw/davinci_nand.c
index 6c4eb58abb6..c00fc65b6a0 100644
--- a/drivers/mtd/nand/raw/davinci_nand.c
+++ b/drivers/mtd/nand/raw/davinci_nand.c
@@ -35,6 +35,7 @@
 #include <dm/uclass.h>
 #include <asm/ti-common/davinci_nand.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 
 /* Definitions for 4-bit hardware ECC */
diff --git a/drivers/mtd/nand/raw/denali.c b/drivers/mtd/nand/raw/denali.c
index ca99aa88b3d..0e84f37784d 100644
--- a/drivers/mtd/nand/raw/denali.c
+++ b/drivers/mtd/nand/raw/denali.c
@@ -21,6 +21,7 @@
 #include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/io.h>
+#include <linux/kernel.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/rawnand.h>
 #include <linux/string.h>
diff --git a/drivers/mtd/nand/raw/denali_spl.c b/drivers/mtd/nand/raw/denali_spl.c
index 504f773e4de..ed077fd06bc 100644
--- a/drivers/mtd/nand/raw/denali_spl.c
+++ b/drivers/mtd/nand/raw/denali_spl.c
@@ -10,6 +10,7 @@
 #include <asm/unaligned.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/mtd/rawnand.h>
 #include <linux/string.h>
 #include "denali.h"
diff --git a/drivers/mtd/nand/raw/fsl_elbc_nand.c b/drivers/mtd/nand/raw/fsl_elbc_nand.c
index 99749f9e50a..eb95cb00303 100644
--- a/drivers/mtd/nand/raw/fsl_elbc_nand.c
+++ b/drivers/mtd/nand/raw/fsl_elbc_nand.c
@@ -14,6 +14,7 @@
 #include <stdio.h>
 #include <time.h>
 #include <dm/devres.h>
+#include <linux/kernel.h>
 
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/rawnand.h>
diff --git a/drivers/mtd/nand/raw/fsl_ifc_nand.c b/drivers/mtd/nand/raw/fsl_ifc_nand.c
index 33c80d03209..291dda8fb48 100644
--- a/drivers/mtd/nand/raw/fsl_ifc_nand.c
+++ b/drivers/mtd/nand/raw/fsl_ifc_nand.c
@@ -13,6 +13,7 @@
 #include <stdio.h>
 #include <time.h>
 #include <dm/devres.h>
+#include <linux/kernel.h>
 
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/rawnand.h>
diff --git a/drivers/mtd/nand/raw/fsmc_nand.c b/drivers/mtd/nand/raw/fsmc_nand.c
index 0991a398f45..5994c321cac 100644
--- a/drivers/mtd/nand/raw/fsmc_nand.c
+++ b/drivers/mtd/nand/raw/fsmc_nand.c
@@ -15,6 +15,7 @@
 #include <linux/bitops.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/fsmc_nand.h>
 #include <asm/arch/hardware.h>
diff --git a/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c b/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c
index cfa2510b038..368ce3e54ed 100644
--- a/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c
+++ b/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c
@@ -27,6 +27,7 @@
 #include <nand.h>
 #include <asm/arch/clk.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/mtd/nand/raw/lpc32xx_nand_slc.c b/drivers/mtd/nand/raw/lpc32xx_nand_slc.c
index 5e8e76c3e5f..07a44a565ad 100644
--- a/drivers/mtd/nand/raw/lpc32xx_nand_slc.c
+++ b/drivers/mtd/nand/raw/lpc32xx_nand_slc.c
@@ -14,6 +14,7 @@
 #include <log.h>
 #include <nand.h>
 #include <linux/bug.h>
+#include <linux/kernel.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/errno.h>
 #include <asm/io.h>
diff --git a/drivers/mtd/nand/raw/mxc_nand.c b/drivers/mtd/nand/raw/mxc_nand.c
index a90d30bd100..f012f7329c9 100644
--- a/drivers/mtd/nand/raw/mxc_nand.c
+++ b/drivers/mtd/nand/raw/mxc_nand.c
@@ -16,6 +16,7 @@
 #include <asm/arch/imx-regs.h>
 #endif
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include "mxc_nand.h"
 
diff --git a/drivers/mtd/nand/raw/mxc_nand_spl.c b/drivers/mtd/nand/raw/mxc_nand_spl.c
index ad01cdce260..c3e136899f9 100644
--- a/drivers/mtd/nand/raw/mxc_nand_spl.c
+++ b/drivers/mtd/nand/raw/mxc_nand_spl.c
@@ -16,6 +16,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/io.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include "mxc_nand.h"
 
 #if defined(MXC_NFC_V1) || defined(MXC_NFC_V2_1)
diff --git a/drivers/mtd/nand/raw/mxs_nand.c b/drivers/mtd/nand/raw/mxs_nand.c
index d59528e27fd..8ab4dab32c0 100644
--- a/drivers/mtd/nand/raw/mxs_nand.c
+++ b/drivers/mtd/nand/raw/mxs_nand.c
@@ -18,6 +18,7 @@
 #include <dm.h>
 #include <stdio.h>
 #include <asm/cache.h>
+#include <linux/kernel.h>
 #include <linux/mtd/rawnand.h>
 #include <linux/sizes.h>
 #include <linux/string.h>
diff --git a/drivers/mtd/nand/raw/nand_base.c b/drivers/mtd/nand/raw/nand_base.c
index a6b3504facd..115f5a771be 100644
--- a/drivers/mtd/nand/raw/nand_base.c
+++ b/drivers/mtd/nand/raw/nand_base.c
@@ -43,6 +43,7 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/compat.h>
+#include <linux/kernel.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
diff --git a/drivers/mtd/nand/raw/nand_bbt.c b/drivers/mtd/nand/raw/nand_bbt.c
index 336a341f0a0..36ca2230269 100644
--- a/drivers/mtd/nand/raw/nand_bbt.c
+++ b/drivers/mtd/nand/raw/nand_bbt.c
@@ -65,6 +65,7 @@
 #include <linux/bug.h>
 #include <linux/compat.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/bbm.h>
 #include <linux/mtd/rawnand.h>
diff --git a/drivers/mtd/nand/raw/nand_bch.c b/drivers/mtd/nand/raw/nand_bch.c
index 94e03e9ba5e..eaca67da1b8 100644
--- a/drivers/mtd/nand/raw/nand_bch.c
+++ b/drivers/mtd/nand/raw/nand_bch.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <dm/devres.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 /*#include <asm/io.h>*/
diff --git a/drivers/mtd/nand/raw/nand_spl_loaders.c b/drivers/mtd/nand/raw/nand_spl_loaders.c
index f297205bc79..75ded89893a 100644
--- a/drivers/mtd/nand/raw/nand_spl_loaders.c
+++ b/drivers/mtd/nand/raw/nand_spl_loaders.c
@@ -1,3 +1,4 @@
+#include <linux/kernel.h>
 #include <linux/string.h>
 int nand_spl_load_image(uint32_t offs, unsigned int size, void *dst)
 {
diff --git a/drivers/mtd/nand/raw/nand_util.c b/drivers/mtd/nand/raw/nand_util.c
index 162f6fe1f0c..f753970d9e7 100644
--- a/drivers/mtd/nand/raw/nand_util.c
+++ b/drivers/mtd/nand/raw/nand_util.c
@@ -28,6 +28,7 @@
 #include <div64.h>
 #include <asm/cache.h>
 #include <dm/devres.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include <linux/errno.h>
diff --git a/drivers/mtd/nand/raw/pxa3xx_nand.c b/drivers/mtd/nand/raw/pxa3xx_nand.c
index e222fb994b0..8678866d3dd 100644
--- a/drivers/mtd/nand/raw/pxa3xx_nand.c
+++ b/drivers/mtd/nand/raw/pxa3xx_nand.c
@@ -21,6 +21,7 @@
 #include <linux/errno.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
+#include <linux/kernel.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/rawnand.h>
 #include <linux/printk.h>
diff --git a/drivers/mtd/nand/raw/pxa3xx_nand.h b/drivers/mtd/nand/raw/pxa3xx_nand.h
index 8f24ae6d18a..d7304d0b34e 100644
--- a/drivers/mtd/nand/raw/pxa3xx_nand.h
+++ b/drivers/mtd/nand/raw/pxa3xx_nand.h
@@ -1,6 +1,7 @@
 #ifndef __ASM_ARCH_PXA3XX_NAND_H
 #define __ASM_ARCH_PXA3XX_NAND_H
 
+#include <stdbool.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 
diff --git a/drivers/mtd/nand/raw/stm32_fmc2_nand.c b/drivers/mtd/nand/raw/stm32_fmc2_nand.c
index 2e41efcb5fb..21b5c859467 100644
--- a/drivers/mtd/nand/raw/stm32_fmc2_nand.c
+++ b/drivers/mtd/nand/raw/stm32_fmc2_nand.c
@@ -16,6 +16,7 @@
 #include <linux/errno.h>
 #include <linux/iopoll.h>
 #include <linux/ioport.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 
 /* Bad block marker length */
diff --git a/drivers/mtd/nand/raw/sunxi_nand_spl.c b/drivers/mtd/nand/raw/sunxi_nand_spl.c
index 9b54d007f8e..e24bd384c26 100644
--- a/drivers/mtd/nand/raw/sunxi_nand_spl.c
+++ b/drivers/mtd/nand/raw/sunxi_nand_spl.c
@@ -14,6 +14,7 @@
 #include <linux/ctype.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 /* registers */
diff --git a/drivers/mtd/nand/raw/vf610_nfc.c b/drivers/mtd/nand/raw/vf610_nfc.c
index ceec8c81e94..49cf29a7abe 100644
--- a/drivers/mtd/nand/raw/vf610_nfc.c
+++ b/drivers/mtd/nand/raw/vf610_nfc.c
@@ -27,6 +27,7 @@
 #include <time.h>
 #include <dm/device_compat.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/mtd/nand/raw/zynq_nand.c b/drivers/mtd/nand/raw/zynq_nand.c
index 47435cfdccc..6af6b7bd844 100644
--- a/drivers/mtd/nand/raw/zynq_nand.c
+++ b/drivers/mtd/nand/raw/zynq_nand.c
@@ -15,6 +15,7 @@
 #include <linux/errno.h>
 #include <nand.h>
 #include <linux/ioport.h>
+#include <linux/kernel.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
diff --git a/drivers/mtd/onenand/onenand_base.c b/drivers/mtd/onenand/onenand_base.c
index 7e5aaac2372..f576aea331c 100644
--- a/drivers/mtd/onenand/onenand_base.c
+++ b/drivers/mtd/onenand/onenand_base.c
@@ -27,6 +27,7 @@
 #include <dm/devres.h>
 #include <linux/bitops.h>
 #include <linux/compat.h>
+#include <linux/kernel.h>
 #include <linux/mtd/mtd.h>
 #include <linux/printk.h>
 #include <linux/string.h>
diff --git a/drivers/mtd/onenand/onenand_spl.c b/drivers/mtd/onenand/onenand_spl.c
index 463ec9b8d50..69c529e658d 100644
--- a/drivers/mtd/onenand/onenand_spl.c
+++ b/drivers/mtd/onenand/onenand_spl.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 #include <linux/mtd/onenand_regs.h>
 #include <onenand_uboot.h>
 #include <linux/string.h>
diff --git a/drivers/mtd/renesas_rpc_hf.c b/drivers/mtd/renesas_rpc_hf.c
index cef18a95a42..0531db38831 100644
--- a/drivers/mtd/renesas_rpc_hf.c
+++ b/drivers/mtd/renesas_rpc_hf.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/mtd/spi/sandbox.c b/drivers/mtd/spi/sandbox.c
index 0ab3596a2a1..424c74d74fd 100644
--- a/drivers/mtd/spi/sandbox.c
+++ b/drivers/mtd/spi/sandbox.c
@@ -18,6 +18,7 @@
 #include <os.h>
 #include <stdio.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include <spi_flash.h>
diff --git a/drivers/mtd/spi/sf_dataflash.c b/drivers/mtd/spi/sf_dataflash.c
index c65d62e7cdb..558cf39ba67 100644
--- a/drivers/mtd/spi/sf_dataflash.c
+++ b/drivers/mtd/spi/sf_dataflash.c
@@ -21,6 +21,7 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/math64.h>
 #include <linux/string.h>
 
diff --git a/drivers/mtd/spi/sf_mtd.c b/drivers/mtd/spi/sf_mtd.c
index 5f80e115f4d..cf9d79c9557 100644
--- a/drivers/mtd/spi/sf_mtd.c
+++ b/drivers/mtd/spi/sf_mtd.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <flash.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/errno.h>
diff --git a/drivers/mtd/spi/spi-nor-core.c b/drivers/mtd/spi/spi-nor-core.c
index 007c27129b4..62b9a78be3f 100644
--- a/drivers/mtd/spi/spi-nor-core.c
+++ b/drivers/mtd/spi/spi-nor-core.c
@@ -19,6 +19,7 @@
 #include <linux/bitops.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/log2.h>
 #include <linux/math64.h>
 #include <linux/printk.h>
diff --git a/drivers/mtd/spi/spi-nor-tiny.c b/drivers/mtd/spi/spi-nor-tiny.c
index c9777324019..dead5679e89 100644
--- a/drivers/mtd/spi/spi-nor-tiny.c
+++ b/drivers/mtd/spi/spi-nor-tiny.c
@@ -16,6 +16,7 @@
 #include <dm/device_compat.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/log2.h>
 #include <linux/math64.h>
 #include <linux/printk.h>
diff --git a/drivers/mtd/st_smi.c b/drivers/mtd/st_smi.c
index a6c1a0e1c78..6488897b438 100644
--- a/drivers/mtd/st_smi.c
+++ b/drivers/mtd/st_smi.c
@@ -11,6 +11,7 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/mtd/st_smi.h>
 
 #include <asm/io.h>
diff --git a/drivers/mtd/ubi/debug.c b/drivers/mtd/ubi/debug.c
index 213061847d7..705a05ae77d 100644
--- a/drivers/mtd/ubi/debug.c
+++ b/drivers/mtd/ubi/debug.c
@@ -11,6 +11,7 @@
 #include <ubi_uboot.h>
 #include <vsprintf.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include "ubi.h"
diff --git a/drivers/mtd/ubi/eba.c b/drivers/mtd/ubi/eba.c
index 23a72d6a325..7f797c517b2 100644
--- a/drivers/mtd/ubi/eba.c
+++ b/drivers/mtd/ubi/eba.c
@@ -37,6 +37,7 @@
 #else
 #include <ubi_uboot.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #endif
 
diff --git a/drivers/mtd/ubi/fastmap-wl.c b/drivers/mtd/ubi/fastmap-wl.c
index df5fab00e1a..4a0f8a3db98 100644
--- a/drivers/mtd/ubi/fastmap-wl.c
+++ b/drivers/mtd/ubi/fastmap-wl.c
@@ -7,6 +7,7 @@
  */
 
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 /**
  * update_fastmap_work_fn - calls ubi_update_fastmap from a work queue
diff --git a/drivers/mtd/ubi/fastmap.c b/drivers/mtd/ubi/fastmap.c
index 6812b122d65..38983fb7356 100644
--- a/drivers/mtd/ubi/fastmap.c
+++ b/drivers/mtd/ubi/fastmap.c
@@ -18,6 +18,7 @@
 #include <ubi_uboot.h>
 #include <linux/bug.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #endif
 
diff --git a/drivers/mtd/ubi/io.c b/drivers/mtd/ubi/io.c
index f88bafd35d3..e5dafaf5ff6 100644
--- a/drivers/mtd/ubi/io.c
+++ b/drivers/mtd/ubi/io.c
@@ -84,6 +84,7 @@
 #include <hexdump.h>
 #include <ubi_uboot.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #endif
 
diff --git a/drivers/mtd/ubi/misc.c b/drivers/mtd/ubi/misc.c
index b9bad95cf6f..6574760288d 100644
--- a/drivers/mtd/ubi/misc.c
+++ b/drivers/mtd/ubi/misc.c
@@ -11,6 +11,7 @@
 #include <malloc.h>
 #include <ubi_uboot.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include "ubi.h"
 
 /**
diff --git a/drivers/mtd/ubi/ubi.h b/drivers/mtd/ubi/ubi.h
index d91c9effd07..2314ca7df1f 100644
--- a/drivers/mtd/ubi/ubi.h
+++ b/drivers/mtd/ubi/ubi.h
@@ -29,6 +29,7 @@
 #else
 #include <ubi_uboot.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #endif
 #include <linux/mtd/mtd.h>
diff --git a/drivers/mtd/ubi/upd.c b/drivers/mtd/ubi/upd.c
index 96ecaf60c04..fff703a0f6c 100644
--- a/drivers/mtd/ubi/upd.c
+++ b/drivers/mtd/ubi/upd.c
@@ -33,6 +33,7 @@
 #include <div64.h>
 #include <ubi_uboot.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #endif
 #include <linux/err.h>
diff --git a/drivers/mtd/ubi/vmt.c b/drivers/mtd/ubi/vmt.c
index 806abc9122e..c9d28bb4d52 100644
--- a/drivers/mtd/ubi/vmt.c
+++ b/drivers/mtd/ubi/vmt.c
@@ -21,6 +21,7 @@
 #include <ubi_uboot.h>
 #include <vsprintf.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #endif
 #include <linux/math64.h>
diff --git a/drivers/mtd/ubi/vtbl.c b/drivers/mtd/ubi/vtbl.c
index 91c0589bb62..b8e07872716 100644
--- a/drivers/mtd/ubi/vtbl.c
+++ b/drivers/mtd/ubi/vtbl.c
@@ -57,6 +57,7 @@
 #include <ubi_uboot.h>
 #include <linux/bug.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #endif
 
diff --git a/drivers/mtd/ubispl/ubispl.c b/drivers/mtd/ubispl/ubispl.c
index 96afa7dec11..2a1ad2ca157 100644
--- a/drivers/mtd/ubispl/ubispl.c
+++ b/drivers/mtd/ubispl/ubispl.c
@@ -11,6 +11,7 @@
 #include <errno.h>
 #include <linux/bug.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
 #include <ubispl.h>
diff --git a/drivers/net/armada100_fec.h b/drivers/net/armada100_fec.h
index e6f286cfd38..b0e6d02b4af 100644
--- a/drivers/net/armada100_fec.h
+++ b/drivers/net/armada100_fec.h
@@ -12,6 +12,7 @@
 #ifndef __ARMADA100_FEC_H__
 #define __ARMADA100_FEC_H__
 
+#include <linux/kernel.h>
 #define PORT_NUM		0x0
 
 /* RX & TX descriptor command */
diff --git a/drivers/net/ax88180.c b/drivers/net/ax88180.c
index 5783c42aa23..fada006f84b 100644
--- a/drivers/net/ax88180.c
+++ b/drivers/net/ax88180.c
@@ -45,6 +45,7 @@
 #include <stdio.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/mii.h>
 #include <linux/string.h>
 #include "ax88180.h"
diff --git a/drivers/net/bcm-sf2-eth-gmac.c b/drivers/net/bcm-sf2-eth-gmac.c
index 67c8498f0f6..8540b13951b 100644
--- a/drivers/net/bcm-sf2-eth-gmac.c
+++ b/drivers/net/bcm-sf2-eth-gmac.c
@@ -9,6 +9,7 @@
 #include <linux/printk.h>
 #endif
 #include <stdio.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #endif
 
diff --git a/drivers/net/bcm-sf2-eth.h b/drivers/net/bcm-sf2-eth.h
index f4dbb4e1952..4f81e0431c1 100644
--- a/drivers/net/bcm-sf2-eth.h
+++ b/drivers/net/bcm-sf2-eth.h
@@ -7,6 +7,7 @@
 #define _BCM_SF2_ETH_H_
 
 #include <phy.h>
+#include <stdbool.h>
 
 #define RX_BUF_SIZE	2048
 /* RX_BUF_NUM must be power of 2 */
diff --git a/drivers/net/bcm6348-eth.c b/drivers/net/bcm6348-eth.c
index eeea3dc579f..afb81ab187b 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 <stdbool.h>
 #include <vsprintf.h>
 #include <wait_bit.h>
 #include <asm/io.h>
diff --git a/drivers/net/bcm6368-eth.c b/drivers/net/bcm6368-eth.c
index 0e6d266f103..3f18c5c5225 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 <stdbool.h>
 #include <vsprintf.h>
 #include <wait_bit.h>
 #include <asm/io.h>
diff --git a/drivers/net/bcmgenet.c b/drivers/net/bcmgenet.c
index cd3dac49e7e..ca7888af89c 100644
--- a/drivers/net/bcmgenet.c
+++ b/drivers/net/bcmgenet.c
@@ -35,6 +35,7 @@
 #include <dm/ofnode.h>
 #include <linux/errno.h>
 #include <linux/iopoll.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <asm/dma-mapping.h>
 #include <wait_bit.h>
diff --git a/drivers/net/dc2114x.c b/drivers/net/dc2114x.c
index 8bc75baf97f..3f45aebcd03 100644
--- a/drivers/net/dc2114x.c
+++ b/drivers/net/dc2114x.c
@@ -13,6 +13,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #define SROM_DLEVEL	0
diff --git a/drivers/net/dnet.c b/drivers/net/dnet.c
index 485e6c0cdcc..675eb88c3d9 100644
--- a/drivers/net/dnet.c
+++ b/drivers/net/dnet.c
@@ -14,6 +14,7 @@
 #include <vsprintf.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #ifndef CONFIG_DNET_AUTONEG_TIMEOUT
diff --git a/drivers/net/dwc_eth_qos.c b/drivers/net/dwc_eth_qos.c
index c5e22aff5c0..5eb593e9eda 100644
--- a/drivers/net/dwc_eth_qos.c
+++ b/drivers/net/dwc_eth_qos.c
@@ -52,6 +52,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c
index 1705dde9d2c..3d87e05c5b2 100644
--- a/drivers/net/e1000.c
+++ b/drivers/net/e1000.c
@@ -44,6 +44,7 @@ tested on both gig copper and gig fiber boards
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "e1000.h"
 #include <asm/cache.h>
diff --git a/drivers/net/e1000.h b/drivers/net/e1000.h
index 641502ea928..2adfd38f273 100644
--- a/drivers/net/e1000.h
+++ b/drivers/net/e1000.h
@@ -18,6 +18,7 @@
 #ifndef _E1000_HW_H_
 #define _E1000_HW_H_
 
+#include <stdbool.h>
 #include <stdio.h>
 #include <linux/list.h>
 #include <malloc.h>
diff --git a/drivers/net/e1000_spi.c b/drivers/net/e1000_spi.c
index 7e37ade1e9c..8200d428615 100644
--- a/drivers/net/e1000_spi.c
+++ b/drivers/net/e1000_spi.c
@@ -4,6 +4,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "e1000.h"
 #include <malloc.h>
diff --git a/drivers/net/eepro100.c b/drivers/net/eepro100.c
index 3d7decd126a..d152063008b 100644
--- a/drivers/net/eepro100.c
+++ b/drivers/net/eepro100.c
@@ -17,6 +17,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 /* Ethernet chip registers. */
diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c
index 669f3af7aee..bdf14afcd75 100644
--- a/drivers/net/fec_mxc.c
+++ b/drivers/net/fec_mxc.c
@@ -24,6 +24,7 @@
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <power/regulator.h>
 
diff --git a/drivers/net/fm/eth.c b/drivers/net/fm/eth.c
index c451b136ae3..0728ad6cacf 100644
--- a/drivers/net/fm/eth.c
+++ b/drivers/net/fm/eth.c
@@ -29,6 +29,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include "fm.h"
diff --git a/drivers/net/fm/init.c b/drivers/net/fm/init.c
index 1829517d024..de4db412704 100644
--- a/drivers/net/fm/init.c
+++ b/drivers/net/fm/init.c
@@ -16,6 +16,7 @@
 #endif
 #include <asm/u-boot.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include "fm.h"
diff --git a/drivers/net/fsl-mc/dpio/qbman_private.h b/drivers/net/fsl-mc/dpio/qbman_private.h
index 6180896d3d4..cb520363278 100644
--- a/drivers/net/fsl-mc/dpio/qbman_private.h
+++ b/drivers/net/fsl-mc/dpio/qbman_private.h
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <asm/u-boot.h>
 #include <linux/bug.h>
+#include <linux/kernel.h>
 #include <linux/types.h>
 #include <asm/atomic.h>
 #include <malloc.h>
diff --git a/drivers/net/fsl-mc/mc.c b/drivers/net/fsl-mc/mc.c
index d2f8869a340..3a82f4f065f 100644
--- a/drivers/net/fsl-mc/mc.c
+++ b/drivers/net/fsl-mc/mc.c
@@ -19,6 +19,7 @@
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <net.h>
 #include <fdt_support.h>
diff --git a/drivers/net/fsl_enetc.c b/drivers/net/fsl_enetc.c
index 7b9730a8446..a6c6e578193 100644
--- a/drivers/net/fsl_enetc.c
+++ b/drivers/net/fsl_enetc.c
@@ -19,6 +19,7 @@
 #include <linux/bug.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include "fsl_enetc.h"
diff --git a/drivers/net/ftgmac100.c b/drivers/net/ftgmac100.c
index af58d04da23..5a057ebb46b 100644
--- a/drivers/net/ftgmac100.c
+++ b/drivers/net/ftgmac100.c
@@ -27,6 +27,7 @@
 #include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/iopoll.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 
 #include "ftgmac100.h"
diff --git a/drivers/net/ftmac110.c b/drivers/net/ftmac110.c
index 2ff318cb9a9..e7c7a5e885a 100644
--- a/drivers/net/ftmac110.c
+++ b/drivers/net/ftmac110.c
@@ -19,6 +19,7 @@
 #include <linux/errno.h>
 #include <asm/io.h>
 #include <linux/dma-mapping.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #if defined(CONFIG_MII) || defined(CONFIG_CMD_MII)
diff --git a/drivers/net/gmac_rockchip.c b/drivers/net/gmac_rockchip.c
index 8aed219d9ed..55ce931cd2d 100644
--- a/drivers/net/gmac_rockchip.c
+++ b/drivers/net/gmac_rockchip.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <net.h>
 #include <phy.h>
+#include <stdbool.h>
 #include <syscon.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/net/ks8851_mll.c b/drivers/net/ks8851_mll.c
index f357fec5cc9..86a97cdf573 100644
--- a/drivers/net/ks8851_mll.c
+++ b/drivers/net/ks8851_mll.c
@@ -16,6 +16,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #include "ks8851_mll.h"
 
diff --git a/drivers/net/lan91c96.c b/drivers/net/lan91c96.c
index 7c26c60ff2b..559273e6760 100644
--- a/drivers/net/lan91c96.c
+++ b/drivers/net/lan91c96.c
@@ -53,6 +53,7 @@
 #include <vsprintf.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "lan91c96.h"
 #include <net.h>
diff --git a/drivers/net/ldpaa_eth/ldpaa_eth.c b/drivers/net/ldpaa_eth/ldpaa_eth.c
index 5da5582200d..4b62225968f 100644
--- a/drivers/net/ldpaa_eth/ldpaa_eth.c
+++ b/drivers/net/ldpaa_eth/ldpaa_eth.c
@@ -24,6 +24,7 @@
 #include <fsl-mc/fsl_dpmac.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include <fsl-mc/ldpaa_wriop.h>
diff --git a/drivers/net/ldpaa_eth/ldpaa_eth.h b/drivers/net/ldpaa_eth/ldpaa_eth.h
index e90513e56f9..2b3d31f7043 100644
--- a/drivers/net/ldpaa_eth/ldpaa_eth.h
+++ b/drivers/net/ldpaa_eth/ldpaa_eth.h
@@ -7,6 +7,7 @@
 #ifndef __LDPAA_ETH_H
 #define __LDPAA_ETH_H
 
+#include <stdbool.h>
 #include <linux/netdevice.h>
 #include <fsl-mc/fsl_mc.h>
 #include <fsl-mc/fsl_dpaa_fd.h>
diff --git a/drivers/net/lpc32xx_eth.c b/drivers/net/lpc32xx_eth.c
index a43623a1adf..dd7b2e5a007 100644
--- a/drivers/net/lpc32xx_eth.c
+++ b/drivers/net/lpc32xx_eth.c
@@ -21,6 +21,7 @@
 #include <asm/byteorder.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/config.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 /*
diff --git a/drivers/net/macb.c b/drivers/net/macb.c
index 3d6b2fa8eb4..783a90cb1fa 100644
--- a/drivers/net/macb.c
+++ b/drivers/net/macb.c
@@ -12,6 +12,7 @@
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 /*
diff --git a/drivers/net/mcfmii.c b/drivers/net/mcfmii.c
index 0e906e85670..21e558ee816 100644
--- a/drivers/net/mcfmii.c
+++ b/drivers/net/mcfmii.c
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #ifdef CONFIG_MCF547x_8x
diff --git a/drivers/net/mpc8xx_fec.c b/drivers/net/mpc8xx_fec.c
index 63e18789184..64918248131 100644
--- a/drivers/net/mpc8xx_fec.c
+++ b/drivers/net/mpc8xx_fec.c
@@ -18,6 +18,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include <phy.h>
diff --git a/drivers/net/mscc_eswitch/jr2_switch.c b/drivers/net/mscc_eswitch/jr2_switch.c
index 0e0a4d7037c..1aff591e3a4 100644
--- a/drivers/net/mscc_eswitch/jr2_switch.c
+++ b/drivers/net/mscc_eswitch/jr2_switch.c
@@ -19,6 +19,7 @@
 #include <miiphy.h>
 #include <net.h>
 #include <wait_bit.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/net/mscc_eswitch/luton_switch.c b/drivers/net/mscc_eswitch/luton_switch.c
index 6ceb250688a..afc6260577e 100644
--- a/drivers/net/mscc_eswitch/luton_switch.c
+++ b/drivers/net/mscc_eswitch/luton_switch.c
@@ -18,6 +18,7 @@
 #include <miiphy.h>
 #include <net.h>
 #include <wait_bit.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include "mscc_xfer.h"
diff --git a/drivers/net/mscc_eswitch/mscc_xfer.c b/drivers/net/mscc_eswitch/mscc_xfer.c
index a2827b5377e..55abd5a984e 100644
--- a/drivers/net/mscc_eswitch/mscc_xfer.c
+++ b/drivers/net/mscc_eswitch/mscc_xfer.c
@@ -4,6 +4,7 @@
  */
 
 #include <log.h>
+#include <stdbool.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/net/mscc_eswitch/mscc_xfer.h b/drivers/net/mscc_eswitch/mscc_xfer.h
index c880a4e7e6a..df507e518cf 100644
--- a/drivers/net/mscc_eswitch/mscc_xfer.h
+++ b/drivers/net/mscc_eswitch/mscc_xfer.h
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <stdbool.h>
 
 enum mscc_regs_qs {
 	MSCC_QS_XTR_RD,
diff --git a/drivers/net/mscc_eswitch/ocelot_switch.c b/drivers/net/mscc_eswitch/ocelot_switch.c
index b787524af16..170393c03f7 100644
--- a/drivers/net/mscc_eswitch/ocelot_switch.c
+++ b/drivers/net/mscc_eswitch/ocelot_switch.c
@@ -18,6 +18,7 @@
 #include <miiphy.h>
 #include <net.h>
 #include <wait_bit.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/net/mscc_eswitch/serval_switch.c b/drivers/net/mscc_eswitch/serval_switch.c
index 9b6e5d8743d..8f5c43660bd 100644
--- a/drivers/net/mscc_eswitch/serval_switch.c
+++ b/drivers/net/mscc_eswitch/serval_switch.c
@@ -18,6 +18,7 @@
 #include <miiphy.h>
 #include <net.h>
 #include <wait_bit.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/net/mscc_eswitch/servalt_switch.c b/drivers/net/mscc_eswitch/servalt_switch.c
index eecf6153245..f393ea7f504 100644
--- a/drivers/net/mscc_eswitch/servalt_switch.c
+++ b/drivers/net/mscc_eswitch/servalt_switch.c
@@ -18,6 +18,7 @@
 #include <miiphy.h>
 #include <net.h>
 #include <wait_bit.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/net/mtk_eth.c b/drivers/net/mtk_eth.c
index 8cf78422f7d..f2f070548d4 100644
--- a/drivers/net/mtk_eth.c
+++ b/drivers/net/mtk_eth.c
@@ -28,6 +28,7 @@
 #include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/ioport.h>
+#include <linux/kernel.h>
 #include <linux/mdio.h>
 #include <linux/mii.h>
 #include <linux/printk.h>
diff --git a/drivers/net/mvgbe.h b/drivers/net/mvgbe.h
index 44541c0a85e..4376efbfbc0 100644
--- a/drivers/net/mvgbe.h
+++ b/drivers/net/mvgbe.h
@@ -19,6 +19,7 @@
 #endif
 
 /* Constants */
+#include <linux/kernel.h>
 #define INT_CAUSE_UNMASK_ALL		0x0007ffff
 #define INT_CAUSE_UNMASK_ALL_EXT	0x0011ffff
 #define MRU_MASK			0xfff1ffff
diff --git a/drivers/net/mvneta.c b/drivers/net/mvneta.c
index ce7cf045f73..f001ae73208 100644
--- a/drivers/net/mvneta.c
+++ b/drivers/net/mvneta.c
@@ -37,6 +37,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
 #include <linux/compat.h>
+#include <linux/kernel.h>
 #include <linux/mbus.h>
 #include <asm-generic/gpio.h>
 #include <linux/string.h>
diff --git a/drivers/net/mvpp2.c b/drivers/net/mvpp2.c
index 9baa1004bf3..2d53a5cc5a8 100644
--- a/drivers/net/mvpp2.c
+++ b/drivers/net/mvpp2.c
@@ -40,6 +40,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
 #include <linux/compat.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <linux/mbus.h>
 #include <asm-generic/gpio.h>
diff --git a/drivers/net/ne2000.c b/drivers/net/ne2000.c
index 85da482b8ff..828bc957fca 100644
--- a/drivers/net/ne2000.c
+++ b/drivers/net/ne2000.c
@@ -76,6 +76,7 @@ Add SNMP
 #include <command.h>
 #include <stdio.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 
 /* NE2000 base header file */
 #include "ne2000_base.h"
diff --git a/drivers/net/ne2000_base.c b/drivers/net/ne2000_base.c
index 7ed8721bc80..34600b822ba 100644
--- a/drivers/net/ne2000_base.c
+++ b/drivers/net/ne2000_base.c
@@ -78,6 +78,7 @@ Add SNMP
 #include <log.h>
 #include <net.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <asm/u-boot.h>
diff --git a/drivers/net/ne2000_base.h b/drivers/net/ne2000_base.h
index 21c1a8c15b5..0d289444b3e 100644
--- a/drivers/net/ne2000_base.h
+++ b/drivers/net/ne2000_base.h
@@ -106,6 +106,7 @@ are GPL, so this is, of course, GPL.
 #endif
 
 /* timeout for tx/rx in s */
+#include <stdbool.h>
 #include <stdio.h>
 #include <linux/delay.h>
 #define TOUT 5
diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c
index b4bbd9429fd..701fc73c91e 100644
--- a/drivers/net/netconsole.c
+++ b/drivers/net/netconsole.c
@@ -11,6 +11,7 @@
 #include <stdio_dev.h>
 #include <net.h>
 #include <vsprintf.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #ifndef CONFIG_NETCONSOLE_BUFFER_SIZE
diff --git a/drivers/net/pch_gbe.h b/drivers/net/pch_gbe.h
index 7e0fdbfd5a3..57d54d4b0d5 100644
--- a/drivers/net/pch_gbe.h
+++ b/drivers/net/pch_gbe.h
@@ -9,6 +9,7 @@
 #ifndef _PCH_GBE_H_
 #define _PCH_GBE_H_
 
+#include <linux/kernel.h>
 #define PCH_GBE_TIMEOUT		(3 * CONFIG_SYS_HZ)
 
 #define PCH_GBE_DESC_NUM	4
diff --git a/drivers/net/pfe_eth/pfe_mdio.c b/drivers/net/pfe_eth/pfe_mdio.c
index 08536dea67e..429ca879112 100644
--- a/drivers/net/pfe_eth/pfe_mdio.c
+++ b/drivers/net/pfe_eth/pfe_mdio.c
@@ -13,6 +13,7 @@
 #include <net.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <net/pfe_eth/pfe_eth.h>
 
 extern struct gemac_s gem_info[];
diff --git a/drivers/net/phy/aquantia.c b/drivers/net/phy/aquantia.c
index 1395af5444d..cfd2424ff11 100644
--- a/drivers/net/phy/aquantia.c
+++ b/drivers/net/phy/aquantia.c
@@ -15,6 +15,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
 #include <malloc.h>
diff --git a/drivers/net/phy/atheros.c b/drivers/net/phy/atheros.c
index 7577ebdbe83..dab348ccf9c 100644
--- a/drivers/net/phy/atheros.c
+++ b/drivers/net/phy/atheros.c
@@ -8,6 +8,7 @@
  */
 #include <common.h>
 #include <phy.h>
+#include <stdbool.h>
 #include <dm/device_compat.h>
 #include <linux/bitfield.h>
 #include <linux/bitops.h>
diff --git a/drivers/net/phy/dp83867.c b/drivers/net/phy/dp83867.c
index 9f07045007c..3951cb00f41 100644
--- a/drivers/net/phy/dp83867.c
+++ b/drivers/net/phy/dp83867.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <log.h>
 #include <phy.h>
+#include <stdbool.h>
 #include <dm/devres.h>
 #include <linux/bitops.h>
 #include <linux/compat.h>
diff --git a/drivers/net/phy/micrel_ksz90x1.c b/drivers/net/phy/micrel_ksz90x1.c
index 4c0b2f4af85..2b7bbc8f419 100644
--- a/drivers/net/phy/micrel_ksz90x1.c
+++ b/drivers/net/phy/micrel_ksz90x1.c
@@ -15,6 +15,7 @@
 #include <micrel.h>
 #include <phy.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 /*
  * KSZ9021 - KSZ9031 common
diff --git a/drivers/net/phy/mscc.c b/drivers/net/phy/mscc.c
index f0d37d1b81f..08214ccc2f6 100644
--- a/drivers/net/phy/mscc.c
+++ b/drivers/net/phy/mscc.c
@@ -17,6 +17,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 
 /* Microsemi PHY ID's */
diff --git a/drivers/net/phy/mv88e61xx.c b/drivers/net/phy/mv88e61xx.c
index 927edb62a2e..7e3c76923cb 100644
--- a/drivers/net/phy/mv88e61xx.c
+++ b/drivers/net/phy/mv88e61xx.c
@@ -31,6 +31,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/drivers/net/phy/ncsi.c b/drivers/net/phy/ncsi.c
index 9f68d14bf53..ed557355b91 100644
--- a/drivers/net/phy/ncsi.c
+++ b/drivers/net/phy/ncsi.c
@@ -11,6 +11,7 @@
 #include <phy.h>
 #include <stdio.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <net/ncsi.h>
 #include <net/ncsi-pkt.h>
diff --git a/drivers/net/ravb.c b/drivers/net/ravb.c
index d9d376c09ec..4fb1c7b5f6b 100644
--- a/drivers/net/ravb.c
+++ b/drivers/net/ravb.c
@@ -23,6 +23,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/mii.h>
 #include <wait_bit.h>
 #include <asm/io.h>
diff --git a/drivers/net/rtl8139.c b/drivers/net/rtl8139.c
index 7c0bb2372d3..db9f75de48a 100644
--- a/drivers/net/rtl8139.c
+++ b/drivers/net/rtl8139.c
@@ -83,6 +83,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/types.h>
 
diff --git a/drivers/net/rtl8169.c b/drivers/net/rtl8169.c
index 9cc5cc8acf9..f3d6ea89b99 100644
--- a/drivers/net/rtl8169.c
+++ b/drivers/net/rtl8169.c
@@ -58,6 +58,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/net/sandbox.c b/drivers/net/sandbox.c
index 37eeaab4e82..6e119f77b29 100644
--- a/drivers/net/sandbox.c
+++ b/drivers/net/sandbox.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <net.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <asm/eth.h>
diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c
index 69f895f720b..3a1a7fee4bc 100644
--- a/drivers/net/sh_eth.c
+++ b/drivers/net/sh_eth.c
@@ -25,6 +25,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/io.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #ifdef CONFIG_DM_ETH
diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
index 8b1aae24467..2f3b8fa8079 100644
--- a/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.c
@@ -16,6 +16,7 @@
 #include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/types.h>
 
diff --git a/drivers/net/sni_ave.c b/drivers/net/sni_ave.c
index eb422f33b70..21096bd6d32 100644
--- a/drivers/net/sni_ave.c
+++ b/drivers/net/sni_ave.c
@@ -25,6 +25,7 @@
 #include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/iopoll.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/net/sun8i_emac.c b/drivers/net/sun8i_emac.c
index 8b94322ae74..3216360db15 100644
--- a/drivers/net/sun8i_emac.c
+++ b/drivers/net/sun8i_emac.c
@@ -37,6 +37,7 @@
 #include <asm-generic/gpio.h>
 #endif
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #define MDIO_CMD_MII_BUSY		BIT(0)
diff --git a/drivers/net/ti/am65-cpsw-nuss.c b/drivers/net/ti/am65-cpsw-nuss.c
index 14956af4580..950d1ca2122 100644
--- a/drivers/net/ti/am65-cpsw-nuss.c
+++ b/drivers/net/ti/am65-cpsw-nuss.c
@@ -24,6 +24,7 @@
 #include <power-domain.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/soc/ti/ti-udma.h>
 
diff --git a/drivers/net/ti/cpsw.c b/drivers/net/ti/cpsw.c
index 02dd3bc984f..52155df2c54 100644
--- a/drivers/net/ti/cpsw.c
+++ b/drivers/net/ti/cpsw.c
@@ -26,6 +26,7 @@
 #include <phy.h>
 #include <asm/arch/cpu.h>
 #include <dm.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/net/ti/davinci_emac.c b/drivers/net/ti/davinci_emac.c
index 272127903f5..f909ee7aa38 100644
--- a/drivers/net/ti/davinci_emac.c
+++ b/drivers/net/ti/davinci_emac.c
@@ -36,6 +36,7 @@
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "davinci_emac.h"
 
diff --git a/drivers/net/ti/davinci_emac.h b/drivers/net/ti/davinci_emac.h
index 695855b4d54..d235275772e 100644
--- a/drivers/net/ti/davinci_emac.h
+++ b/drivers/net/ti/davinci_emac.h
@@ -9,6 +9,7 @@
 #ifndef _DAVINCI_EMAC_H_
 #define _DAVINCI_EMAC_H_
 /* Ethernet Min/Max packet size */
+#include <linux/kernel.h>
 #define EMAC_MIN_ETHERNET_PKT_SIZE	60
 #define EMAC_MAX_ETHERNET_PKT_SIZE	1518
 /* Buffer size (should be aligned on 32 byte and cache line) */
diff --git a/drivers/net/ti/keystone_net.c b/drivers/net/ti/keystone_net.c
index a6062e33638..af67ec4a1c8 100644
--- a/drivers/net/ti/keystone_net.c
+++ b/drivers/net/ti/keystone_net.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <command.h>
 #include <console.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
diff --git a/drivers/net/tsec.c b/drivers/net/tsec.c
index afcb170be32..2f9ff5ec07f 100644
--- a/drivers/net/tsec.c
+++ b/drivers/net/tsec.c
@@ -23,6 +23,7 @@
 #include <linux/errno.h>
 #include <asm/processor.h>
 #include <asm/io.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #ifndef CONFIG_DM_ETH
diff --git a/drivers/net/zynq_gem.c b/drivers/net/zynq_gem.c
index 8e3a96c51ef..f31ce696ff0 100644
--- a/drivers/net/zynq_gem.c
+++ b/drivers/net/zynq_gem.c
@@ -32,6 +32,7 @@
 #include <linux/bitops.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 /* Bit/mask specification */
diff --git a/drivers/nvme/nvme.c b/drivers/nvme/nvme.c
index 47a401cc96f..95c1d5065b3 100644
--- a/drivers/nvme/nvme.c
+++ b/drivers/nvme/nvme.c
@@ -19,6 +19,7 @@
 #include <dm/device-internal.h>
 #include <linux/compat.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "nvme.h"
 
diff --git a/drivers/nvme/nvme.h b/drivers/nvme/nvme.h
index 0e8cb221a7a..c2914e2cb05 100644
--- a/drivers/nvme/nvme.h
+++ b/drivers/nvme/nvme.h
@@ -8,6 +8,7 @@
 #define __DRIVER_NVME_H__
 
 #include <asm/io.h>
+#include <linux/kernel.h>
 
 struct nvme_id_power_state {
 	__le16			max_power;	/* centiwatts */
diff --git a/drivers/pch/pch-uclass.c b/drivers/pch/pch-uclass.c
index be9b89539f0..9bc45b5ddc9 100644
--- a/drivers/pch/pch-uclass.c
+++ b/drivers/pch/pch-uclass.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <pch.h>
+#include <stdbool.h>
 #include <linux/errno.h>
 
 int pch_get_spi_base(struct udevice *dev, ulong *sbasep)
diff --git a/drivers/pch/pch7.c b/drivers/pch/pch7.c
index 8fc6388593f..9eb985225c8 100644
--- a/drivers/pch/pch7.c
+++ b/drivers/pch/pch7.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <log.h>
 #include <pch.h>
+#include <stdbool.h>
 #include <linux/errno.h>
 
 #define GPIO_BASE	0x44
diff --git a/drivers/pch/sandbox_pch.c b/drivers/pch/sandbox_pch.c
index c9317f1fda2..28dfc03d793 100644
--- a/drivers/pch/sandbox_pch.c
+++ b/drivers/pch/sandbox_pch.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <dm.h>
 #include <pch.h>
+#include <stdbool.h>
 #include <linux/errno.h>
 
 struct sandbox_pch_priv {
diff --git a/drivers/pci/fsl_pci_init.c b/drivers/pci/fsl_pci_init.c
index 4c77a694ada..612f20714d3 100644
--- a/drivers/pci/fsl_pci_init.c
+++ b/drivers/pci/fsl_pci_init.c
@@ -13,6 +13,7 @@
 #include <asm/fsl_serdes.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/pci/pci-aardvark.c b/drivers/pci/pci-aardvark.c
index f2c2eb3870f..b39a6d715b7 100644
--- a/drivers/pci/pci-aardvark.c
+++ b/drivers/pci/pci-aardvark.c
@@ -27,6 +27,7 @@
 #include <common.h>
 #include <dm.h>
 #include <pci.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/io.h>
 #include <asm-generic/gpio.h>
diff --git a/drivers/pci/pci-rcar-gen3.c b/drivers/pci/pci-rcar-gen3.c
index 9a990a06324..e630a2a6300 100644
--- a/drivers/pci/pci-rcar-gen3.c
+++ b/drivers/pci/pci-rcar-gen3.c
@@ -24,6 +24,7 @@
 #include <wait_bit.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #define PCIECAR			0x000010
 #define PCIECCTLR		0x000018
diff --git a/drivers/pci/pci-uclass.c b/drivers/pci/pci-uclass.c
index 3cd87c7fc65..1d05207b77d 100644
--- a/drivers/pci/pci-uclass.c
+++ b/drivers/pci/pci-uclass.c
@@ -23,6 +23,7 @@
 #endif
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include "pci_internal.h"
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 4eac485f278..dea11138003 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -21,6 +21,7 @@
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 
 #include <command.h>
 #include <env.h>
diff --git a/drivers/pci/pci_auto.c b/drivers/pci/pci_auto.c
index e0e325755e1..7a9ef884c78 100644
--- a/drivers/pci/pci_auto.c
+++ b/drivers/pci/pci_auto.c
@@ -12,6 +12,7 @@
 #include <errno.h>
 #include <log.h>
 #include <pci.h>
+#include <stdbool.h>
 #include <stdio.h>
 
 /* the user can define CONFIG_SYS_PCI_CACHE_LINE_SIZE to avoid problems */
diff --git a/drivers/pci/pci_auto_common.c b/drivers/pci/pci_auto_common.c
index c0a53dcc929..7b756b7583a 100644
--- a/drivers/pci/pci_auto_common.c
+++ b/drivers/pci/pci_auto_common.c
@@ -16,6 +16,7 @@
 #include <errno.h>
 #include <log.h>
 #include <pci.h>
+#include <linux/kernel.h>
 
 void pciauto_region_init(struct pci_region *res)
 {
diff --git a/drivers/pci/pci_auto_old.c b/drivers/pci/pci_auto_old.c
index 8b67cfa92b4..b32f7ea1f83 100644
--- a/drivers/pci/pci_auto_old.c
+++ b/drivers/pci/pci_auto_old.c
@@ -11,6 +11,7 @@
 #include <errno.h>
 #include <log.h>
 #include <pci.h>
+#include <linux/kernel.h>
 
 /*
  * Do not change this file. Instead, convert your board to use CONFIG_DM_PCI
diff --git a/drivers/pci/pci_gt64120.c b/drivers/pci/pci_gt64120.c
index 80f11fedd16..bcadf4e4d88 100644
--- a/drivers/pci/pci_gt64120.c
+++ b/drivers/pci/pci_gt64120.c
@@ -14,6 +14,7 @@
 #include <log.h>
 #include <pci.h>
 #include <pci_gt64120.h>
+#include <linux/kernel.h>
 
 #include <asm/io.h>
 
diff --git a/drivers/pci/pci_msc01.c b/drivers/pci/pci_msc01.c
index 04838200a8d..ae312534c87 100644
--- a/drivers/pci/pci_msc01.c
+++ b/drivers/pci/pci_msc01.c
@@ -10,6 +10,7 @@
 #include <pci.h>
 #include <pci_msc01.h>
 #include <asm/io.h>
+#include <linux/kernel.h>
 
 #define PCI_ACCESS_READ  0
 #define PCI_ACCESS_WRITE 1
diff --git a/drivers/pci/pci_mvebu.c b/drivers/pci/pci_mvebu.c
index 57edb22d819..157924001ab 100644
--- a/drivers/pci/pci_mvebu.c
+++ b/drivers/pci/pci_mvebu.c
@@ -26,6 +26,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/ioport.h>
+#include <linux/kernel.h>
 #include <linux/mbus.h>
 #include <linux/printk.h>
 
diff --git a/drivers/pci/pci_rom.c b/drivers/pci/pci_rom.c
index 85ad27322f9..7bc1a7f4def 100644
--- a/drivers/pci/pci_rom.c
+++ b/drivers/pci/pci_rom.c
@@ -42,6 +42,7 @@
 #include <acpi/acpi_s3.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/screen_info.h>
 #include <linux/string.h>
 
diff --git a/drivers/pci/pci_tegra.c b/drivers/pci/pci_tegra.c
index 5f8cde34bdf..28b6aa026b1 100644
--- a/drivers/pci/pci_tegra.c
+++ b/drivers/pci/pci_tegra.c
@@ -21,6 +21,7 @@
 #include <pci_tegra.h>
 #include <power-domain.h>
 #include <reset.h>
+#include <stdbool.h>
 #include <time.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/pci/pcie_brcmstb.c b/drivers/pci/pcie_brcmstb.c
index 10a19bdc950..3f207f0de11 100644
--- a/drivers/pci/pcie_brcmstb.c
+++ b/drivers/pci/pcie_brcmstb.c
@@ -21,6 +21,7 @@
 #include <asm/io.h>
 #include <linux/bitfield.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/log2.h>
 #include <linux/iopoll.h>
 
diff --git a/drivers/pci/pcie_dw_mvebu.c b/drivers/pci/pcie_dw_mvebu.c
index 287736cd88c..7eb4461ce26 100644
--- a/drivers/pci/pcie_dw_mvebu.c
+++ b/drivers/pci/pcie_dw_mvebu.c
@@ -21,6 +21,7 @@
 #include <asm-generic/gpio.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/pci/pcie_dw_ti.c b/drivers/pci/pcie_dw_ti.c
index 00b9a2418ab..cc968fe2a3f 100644
--- a/drivers/pci/pcie_dw_ti.c
+++ b/drivers/pci/pcie_dw_ti.c
@@ -21,6 +21,7 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/pci/pcie_ecam_generic.c b/drivers/pci/pcie_ecam_generic.c
index 6e18d5ba552..4039284f539 100644
--- a/drivers/pci/pcie_ecam_generic.c
+++ b/drivers/pci/pcie_ecam_generic.c
@@ -11,6 +11,7 @@
 #include <dm.h>
 #include <pci.h>
 #include <asm/global_data.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 
 #include <asm/io.h>
diff --git a/drivers/pci/pcie_fsl.c b/drivers/pci/pcie_fsl.c
index 055c454599d..2c9448c463c 100644
--- a/drivers/pci/pcie_fsl.c
+++ b/drivers/pci/pcie_fsl.c
@@ -18,6 +18,7 @@
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include "pcie_fsl.h"
 #include <dm/device_compat.h>
diff --git a/drivers/pci/pcie_fsl.h b/drivers/pci/pcie_fsl.h
index dc8368d5592..381185133d8 100644
--- a/drivers/pci/pcie_fsl.h
+++ b/drivers/pci/pcie_fsl.h
@@ -10,6 +10,7 @@
 #define _PCIE_FSL_H_
 
 /* GPEX CSR */
+#include <stdbool.h>
 #define CSR_CLASSCODE			0x474
 
 #ifdef CONFIG_SYS_FSL_PCI_VER_3_X
diff --git a/drivers/pci/pcie_imx.c b/drivers/pci/pcie_imx.c
index 928f624da9a..07c0695409c 100644
--- a/drivers/pci/pcie_imx.c
+++ b/drivers/pci/pcie_imx.c
@@ -23,6 +23,7 @@
 #include <dm.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <errno.h>
 #include <asm/arch/sys_proto.h>
diff --git a/drivers/pci/pcie_intel_fpga.c b/drivers/pci/pcie_intel_fpga.c
index bc937532642..9af0b8a105f 100644
--- a/drivers/pci/pcie_intel_fpga.c
+++ b/drivers/pci/pcie_intel_fpga.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <dm.h>
 #include <pci.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm/device_compat.h>
diff --git a/drivers/pci/pcie_layerscape.h b/drivers/pci/pcie_layerscape.h
index 593798e3e3c..a0a1bc3172f 100644
--- a/drivers/pci/pcie_layerscape.h
+++ b/drivers/pci/pcie_layerscape.h
@@ -9,6 +9,7 @@
 #define _PCIE_LAYERSCAPE_H_
 #include <pci.h>
 #include <dm.h>
+#include <stdbool.h>
 #include <linux/sizes.h>
 
 #ifndef CONFIG_SYS_PCI_MEMORY_BUS
diff --git a/drivers/pci/pcie_layerscape_ep.c b/drivers/pci/pcie_layerscape_ep.c
index 680455fb31f..3993c60d1ad 100644
--- a/drivers/pci/pcie_layerscape_ep.c
+++ b/drivers/pci/pcie_layerscape_ep.c
@@ -14,6 +14,7 @@
 #include <pci_ep.h>
 #include <asm/io.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <linux/log2.h>
 #include "pcie_layerscape.h"
diff --git a/drivers/pci/pcie_layerscape_fixup_common.c b/drivers/pci/pcie_layerscape_fixup_common.c
index 05b5f76cf2c..d4d5bba8523 100644
--- a/drivers/pci/pcie_layerscape_fixup_common.c
+++ b/drivers/pci/pcie_layerscape_fixup_common.c
@@ -13,6 +13,7 @@
 #include <asm/arch/soc.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <linux/string.h>
 #include "pcie_layerscape_fixup_common.h"
diff --git a/drivers/pci/pcie_layerscape_gen4.c b/drivers/pci/pcie_layerscape_gen4.c
index dcb991596b0..7046960c77a 100644
--- a/drivers/pci/pcie_layerscape_gen4.c
+++ b/drivers/pci/pcie_layerscape_gen4.c
@@ -17,6 +17,7 @@
 #include <malloc.h>
 #include <dm.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 
 #include "pcie_layerscape_gen4.h"
diff --git a/drivers/pci/pcie_layerscape_gen4.h b/drivers/pci/pcie_layerscape_gen4.h
index d298a2b8109..8fcc03afba2 100644
--- a/drivers/pci/pcie_layerscape_gen4.h
+++ b/drivers/pci/pcie_layerscape_gen4.h
@@ -10,6 +10,7 @@
 #define _PCIE_LAYERSCAPE_GEN4_H_
 #include <pci.h>
 #include <dm.h>
+#include <stdbool.h>
 #include <linux/bitops.h>
 
 #ifndef CONFIG_SYS_PCI_MEMORY_SIZE
diff --git a/drivers/pci/pcie_xilinx.c b/drivers/pci/pcie_xilinx.c
index 442a21c1115..1bce36bc95e 100644
--- a/drivers/pci/pcie_xilinx.c
+++ b/drivers/pci/pcie_xilinx.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <dm.h>
 #include <pci.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
diff --git a/drivers/pci_endpoint/pci_ep-uclass.c b/drivers/pci_endpoint/pci_ep-uclass.c
index aba38c3fe79..8e672e812d1 100644
--- a/drivers/pci_endpoint/pci_ep-uclass.c
+++ b/drivers/pci_endpoint/pci_ep-uclass.c
@@ -14,6 +14,7 @@
 #include <errno.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/log2.h>
 #include <pci_ep.h>
 
diff --git a/drivers/pci_endpoint/pcie-cadence-ep.c b/drivers/pci_endpoint/pcie-cadence-ep.c
index 44cce69a9aa..66c7dece310 100644
--- a/drivers/pci_endpoint/pcie-cadence-ep.c
+++ b/drivers/pci_endpoint/pcie-cadence-ep.c
@@ -10,6 +10,7 @@
 #include <pci_ep.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <linux/log2.h>
 #include "pcie-cadence.h"
diff --git a/drivers/phy/marvell/comphy_a3700.c b/drivers/phy/marvell/comphy_a3700.c
index b106fd3e132..696b36d40c9 100644
--- a/drivers/phy/marvell/comphy_a3700.c
+++ b/drivers/phy/marvell/comphy_a3700.c
@@ -12,6 +12,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 
 #include "comphy_a3700.h"
 
diff --git a/drivers/phy/marvell/comphy_cp110.c b/drivers/phy/marvell/comphy_cp110.c
index 90d2d283c0e..532ae928a8c 100644
--- a/drivers/phy/marvell/comphy_cp110.c
+++ b/drivers/phy/marvell/comphy_cp110.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <fdtdec.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/phy/phy-stm32-usbphyc.c b/drivers/phy/phy-stm32-usbphyc.c
index c66d185cc82..4b7cd602c26 100644
--- a/drivers/phy/phy-stm32-usbphyc.c
+++ b/drivers/phy/phy-stm32-usbphyc.c
@@ -11,6 +11,7 @@
 #include <generic-phy.h>
 #include <log.h>
 #include <reset.h>
+#include <stdbool.h>
 #include <syscon.h>
 #include <usb.h>
 #include <asm/io.h>
diff --git a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
index 93d3696b133..008f1f629a8 100644
--- a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
+++ b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <clk.h>
 #include <dm.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 #include <dm/device_compat.h>
 #include <dm/lists.h>
diff --git a/drivers/phy/rockchip/phy-rockchip-typec.c b/drivers/phy/rockchip/phy-rockchip-typec.c
index f018a95497d..00a0e4d4313 100644
--- a/drivers/phy/rockchip/phy-rockchip-typec.c
+++ b/drivers/phy/rockchip/phy-rockchip-typec.c
@@ -22,6 +22,7 @@
 #include <linux/errno.h>
 #include <linux/iopoll.h>
 #include <asm/arch-rockchip/clock.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/phy/sandbox-phy.c b/drivers/phy/sandbox-phy.c
index 5b867a6294e..467575d6e84 100644
--- a/drivers/phy/sandbox-phy.c
+++ b/drivers/phy/sandbox-phy.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <generic-phy.h>
+#include <stdbool.h>
 #include <linux/errno.h>
 
 struct sandbox_phy_priv {
diff --git a/drivers/phy/sti_usb_phy.c b/drivers/phy/sti_usb_phy.c
index 03a4d61434e..91ba53f8bdb 100644
--- a/drivers/phy/sti_usb_phy.c
+++ b/drivers/phy/sti_usb_phy.c
@@ -14,6 +14,7 @@
 #include <fdtdec.h>
 #include <generic-phy.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <regmap.h>
 #include <reset-uclass.h>
diff --git a/drivers/pinctrl/aspeed/pinctrl_ast2500.c b/drivers/pinctrl/aspeed/pinctrl_ast2500.c
index 3f57aabea1d..040247c68a1 100644
--- a/drivers/pinctrl/aspeed/pinctrl_ast2500.c
+++ b/drivers/pinctrl/aspeed/pinctrl_ast2500.c
@@ -12,6 +12,7 @@
 #include <asm/arch/scu_ast2500.h>
 #include <dm/pinctrl.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 /*
  * This driver works with very simple configuration that has the same name
diff --git a/drivers/pinctrl/ath79/pinctrl_ar933x.c b/drivers/pinctrl/ath79/pinctrl_ar933x.c
index 9f8ecf49ca4..dce17402440 100644
--- a/drivers/pinctrl/ath79/pinctrl_ar933x.c
+++ b/drivers/pinctrl/ath79/pinctrl_ar933x.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <dm/pinctrl.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <mach/ar71xx_regs.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/pinctrl/ath79/pinctrl_qca953x.c b/drivers/pinctrl/ath79/pinctrl_qca953x.c
index 409ab041173..1e11eb863ca 100644
--- a/drivers/pinctrl/ath79/pinctrl_qca953x.c
+++ b/drivers/pinctrl/ath79/pinctrl_qca953x.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <dm/pinctrl.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <mach/ar71xx_regs.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/pinctrl/exynos/pinctrl-exynos7420.c b/drivers/pinctrl/exynos/pinctrl-exynos7420.c
index 7f1aeeda940..18de9f7762c 100644
--- a/drivers/pinctrl/exynos/pinctrl-exynos7420.c
+++ b/drivers/pinctrl/exynos/pinctrl-exynos7420.c
@@ -14,6 +14,7 @@
 #include <fdtdec.h>
 #include <asm/arch/pinmux.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include "pinctrl-exynos.h"
 
 #define	GPD1_OFFSET	0xc0
diff --git a/drivers/pinctrl/intel/pinctrl_apl.c b/drivers/pinctrl/intel/pinctrl_apl.c
index 7624a9974fe..ee8430b1629 100644
--- a/drivers/pinctrl/intel/pinctrl_apl.c
+++ b/drivers/pinctrl/intel/pinctrl_apl.c
@@ -16,6 +16,7 @@
 #include <asm/intel_pinctrl.h>
 #include <asm-generic/gpio.h>
 #include <asm/intel_pinctrl_defs.h>
+#include <linux/kernel.h>
 
 /**
  * struct apl_gpio_platdata - platform data for each device
diff --git a/drivers/pinctrl/mediatek/pinctrl-mt7622.c b/drivers/pinctrl/mediatek/pinctrl-mt7622.c
index 1aa323c009a..4f2a44f6dc5 100644
--- a/drivers/pinctrl/mediatek/pinctrl-mt7622.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mt7622.c
@@ -5,6 +5,7 @@
  */
 
 #include <dm.h>
+#include <linux/kernel.h>
 
 #include "pinctrl-mtk-common.h"
 
diff --git a/drivers/pinctrl/mediatek/pinctrl-mt7623.c b/drivers/pinctrl/mediatek/pinctrl-mt7623.c
index 0f5dcb2c639..5bbbbc784f4 100644
--- a/drivers/pinctrl/mediatek/pinctrl-mt7623.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mt7623.c
@@ -5,6 +5,7 @@
  */
 
 #include <dm.h>
+#include <linux/kernel.h>
 
 #include "pinctrl-mtk-common.h"
 
diff --git a/drivers/pinctrl/mediatek/pinctrl-mt7629.c b/drivers/pinctrl/mediatek/pinctrl-mt7629.c
index 37640dd2b6d..058754caf27 100644
--- a/drivers/pinctrl/mediatek/pinctrl-mt7629.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mt7629.c
@@ -5,6 +5,7 @@
  */
 
 #include <dm.h>
+#include <linux/kernel.h>
 
 #include "pinctrl-mtk-common.h"
 
diff --git a/drivers/pinctrl/mediatek/pinctrl-mt8512.c b/drivers/pinctrl/mediatek/pinctrl-mt8512.c
index af43754a4d3..d3af578afdf 100644
--- a/drivers/pinctrl/mediatek/pinctrl-mt8512.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mt8512.c
@@ -5,6 +5,7 @@
  */
 
 #include <dm.h>
+#include <linux/kernel.h>
 
 #include "pinctrl-mtk-common.h"
 
diff --git a/drivers/pinctrl/mediatek/pinctrl-mt8516.c b/drivers/pinctrl/mediatek/pinctrl-mt8516.c
index 62e339e9310..1aabf11f08d 100644
--- a/drivers/pinctrl/mediatek/pinctrl-mt8516.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mt8516.c
@@ -5,6 +5,7 @@
  */
 
 #include <dm.h>
+#include <linux/kernel.h>
 
 #include "pinctrl-mtk-common.h"
 
diff --git a/drivers/pinctrl/mediatek/pinctrl-mt8518.c b/drivers/pinctrl/mediatek/pinctrl-mt8518.c
index 91427aed4b9..c8797773d44 100644
--- a/drivers/pinctrl/mediatek/pinctrl-mt8518.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mt8518.c
@@ -5,6 +5,7 @@
  */
 
 #include <dm.h>
+#include <linux/kernel.h>
 
 #include "pinctrl-mtk-common.h"
 
diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
index 9227e5948c8..362c7d47726 100644
--- a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
@@ -13,6 +13,7 @@
 #include <asm-generic/gpio.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #include "pinctrl-mtk-common.h"
 
diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common.h b/drivers/pinctrl/mediatek/pinctrl-mtk-common.h
index 5e51a9a90c1..def643c5d5b 100644
--- a/drivers/pinctrl/mediatek/pinctrl-mtk-common.h
+++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common.h
@@ -6,6 +6,7 @@
 #ifndef __PINCTRL_MEDIATEK_H__
 #define __PINCTRL_MEDIATEK_H__
 
+#include <linux/kernel.h>
 #define MTK_PINCTRL_V0 0x0
 #define MTK_PINCTRL_V1 0x1
 
diff --git a/drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c b/drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c
index 0ed4b50b458..26a9f1e0ebf 100644
--- a/drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c
+++ b/drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c
@@ -12,6 +12,7 @@
 #include <dm/pinctrl.h>
 #include <linux/errno.h>
 #include <linux/io.h>
+#include <linux/kernel.h>
 #include "pinctrl-meson-axg.h"
 
 static int meson_axg_pmx_get_bank(struct udevice *dev, unsigned int pin,
diff --git a/drivers/pinctrl/meson/pinctrl-meson-axg.c b/drivers/pinctrl/meson/pinctrl-meson-axg.c
index 8f23c8cef1d..a2bed97accf 100644
--- a/drivers/pinctrl/meson/pinctrl-meson-axg.c
+++ b/drivers/pinctrl/meson/pinctrl-meson-axg.c
@@ -11,6 +11,7 @@
 #include <dm.h>
 #include <dm/pinctrl.h>
 #include <dt-bindings/gpio/meson-axg-gpio.h>
+#include <linux/kernel.h>
 
 #include "pinctrl-meson-axg.h"
 
diff --git a/drivers/pinctrl/meson/pinctrl-meson-g12a.c b/drivers/pinctrl/meson/pinctrl-meson-g12a.c
index 115e8b5616d..2a38e321496 100644
--- a/drivers/pinctrl/meson/pinctrl-meson-g12a.c
+++ b/drivers/pinctrl/meson/pinctrl-meson-g12a.c
@@ -12,6 +12,7 @@
 #include <dm.h>
 #include <dm/pinctrl.h>
 #include <dt-bindings/gpio/meson-g12a-gpio.h>
+#include <linux/kernel.h>
 
 #include "pinctrl-meson-axg.h"
 
diff --git a/drivers/pinctrl/meson/pinctrl-meson-gx-pmx.c b/drivers/pinctrl/meson/pinctrl-meson-gx-pmx.c
index 90c5e164896..3d896cc1303 100644
--- a/drivers/pinctrl/meson/pinctrl-meson-gx-pmx.c
+++ b/drivers/pinctrl/meson/pinctrl-meson-gx-pmx.c
@@ -11,6 +11,7 @@
 #include <dm/pinctrl.h>
 #include <linux/bitops.h>
 #include <linux/io.h>
+#include <linux/kernel.h>
 #include "pinctrl-meson-gx.h"
 
 static void meson_gx_pinmux_disable_other_groups(struct meson_pinctrl *priv,
diff --git a/drivers/pinctrl/meson/pinctrl-meson-gxbb.c b/drivers/pinctrl/meson/pinctrl-meson-gxbb.c
index 9e2e1511645..cb755d6cfc5 100644
--- a/drivers/pinctrl/meson/pinctrl-meson-gxbb.c
+++ b/drivers/pinctrl/meson/pinctrl-meson-gxbb.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <dm/pinctrl.h>
 #include <dt-bindings/gpio/meson-gxbb-gpio.h>
+#include <linux/kernel.h>
 
 #include "pinctrl-meson-gx.h"
 
diff --git a/drivers/pinctrl/meson/pinctrl-meson-gxl.c b/drivers/pinctrl/meson/pinctrl-meson-gxl.c
index 5acc21b9c2e..f28f07bce1a 100644
--- a/drivers/pinctrl/meson/pinctrl-meson-gxl.c
+++ b/drivers/pinctrl/meson/pinctrl-meson-gxl.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <dm/pinctrl.h>
 #include <dt-bindings/gpio/meson-gxl-gpio.h>
+#include <linux/kernel.h>
 
 #include "pinctrl-meson-gx.h"
 
diff --git a/drivers/pinctrl/meson/pinctrl-meson.h b/drivers/pinctrl/meson/pinctrl-meson.h
index 98010cdaf96..eb33d93f506 100644
--- a/drivers/pinctrl/meson/pinctrl-meson.h
+++ b/drivers/pinctrl/meson/pinctrl-meson.h
@@ -6,6 +6,7 @@
 #ifndef __PINCTRL_MESON_H__
 #define __PINCTRL_MESON_H__
 
+#include <linux/kernel.h>
 #include <linux/types.h>
 
 struct meson_pmx_group {
diff --git a/drivers/pinctrl/mscc/pinctrl-jr2.c b/drivers/pinctrl/mscc/pinctrl-jr2.c
index 72a9470854e..8bb7ba593e2 100644
--- a/drivers/pinctrl/mscc/pinctrl-jr2.c
+++ b/drivers/pinctrl/mscc/pinctrl-jr2.c
@@ -18,6 +18,7 @@
 #include <linux/io.h>
 #include <asm/gpio.h>
 #include <asm/system.h>
+#include <linux/kernel.h>
 #include "mscc-common.h"
 
 enum {
diff --git a/drivers/pinctrl/mscc/pinctrl-luton.c b/drivers/pinctrl/mscc/pinctrl-luton.c
index 17fbc53c257..4be36449d37 100644
--- a/drivers/pinctrl/mscc/pinctrl-luton.c
+++ b/drivers/pinctrl/mscc/pinctrl-luton.c
@@ -19,6 +19,7 @@
 #include <linux/io.h>
 #include <asm/gpio.h>
 #include <asm/system.h>
+#include <linux/kernel.h>
 #include "mscc-common.h"
 
 enum {
diff --git a/drivers/pinctrl/mscc/pinctrl-ocelot.c b/drivers/pinctrl/mscc/pinctrl-ocelot.c
index 49e026bc98b..39b95cbb710 100644
--- a/drivers/pinctrl/mscc/pinctrl-ocelot.c
+++ b/drivers/pinctrl/mscc/pinctrl-ocelot.c
@@ -20,6 +20,7 @@
 #include <errno.h>
 #include <fdtdec.h>
 #include <linux/io.h>
+#include <linux/kernel.h>
 #include "mscc-common.h"
 
 enum {
diff --git a/drivers/pinctrl/mscc/pinctrl-serval.c b/drivers/pinctrl/mscc/pinctrl-serval.c
index d59f08d4eb7..c9104a6e7bc 100644
--- a/drivers/pinctrl/mscc/pinctrl-serval.c
+++ b/drivers/pinctrl/mscc/pinctrl-serval.c
@@ -18,6 +18,7 @@
 #include <linux/io.h>
 #include <asm/gpio.h>
 #include <asm/system.h>
+#include <linux/kernel.h>
 #include "mscc-common.h"
 
 enum {
diff --git a/drivers/pinctrl/mscc/pinctrl-servalt.c b/drivers/pinctrl/mscc/pinctrl-servalt.c
index 592b7c547b7..55eb7821da1 100644
--- a/drivers/pinctrl/mscc/pinctrl-servalt.c
+++ b/drivers/pinctrl/mscc/pinctrl-servalt.c
@@ -18,6 +18,7 @@
 #include <linux/io.h>
 #include <asm/gpio.h>
 #include <asm/system.h>
+#include <linux/kernel.h>
 #include "mscc-common.h"
 
 enum {
diff --git a/drivers/pinctrl/mtmips/pinctrl-mt7628.c b/drivers/pinctrl/mtmips/pinctrl-mt7628.c
index 2e043509cf8..4ea1e853f78 100644
--- a/drivers/pinctrl/mtmips/pinctrl-mt7628.c
+++ b/drivers/pinctrl/mtmips/pinctrl-mt7628.c
@@ -12,6 +12,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/io.h>
+#include <linux/kernel.h>
 
 #include "pinctrl-mtmips-common.h"
 
diff --git a/drivers/pinctrl/mtmips/pinctrl-mtmips-common.h b/drivers/pinctrl/mtmips/pinctrl-mtmips-common.h
index b51d8f009c0..25ca19ff6ab 100644
--- a/drivers/pinctrl/mtmips/pinctrl-mtmips-common.h
+++ b/drivers/pinctrl/mtmips/pinctrl-mtmips-common.h
@@ -9,6 +9,7 @@
 #define _PINCTRL_MTMIPS_COMMON_H_
 
 #include <common.h>
+#include <linux/kernel.h>
 
 struct mtmips_pmx_func {
 	const char *name;
diff --git a/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c b/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c
index c52b8f5df33..52b6c9242ae 100644
--- a/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c
+++ b/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c
@@ -37,6 +37,7 @@
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <linux/printk.h>
 #include <linux/string.h>
diff --git a/drivers/pinctrl/nexell/pinctrl-s5pxx18.c b/drivers/pinctrl/nexell/pinctrl-s5pxx18.c
index 5bb012b197f..08a97ae378b 100644
--- a/drivers/pinctrl/nexell/pinctrl-s5pxx18.c
+++ b/drivers/pinctrl/nexell/pinctrl-s5pxx18.c
@@ -14,6 +14,7 @@
 #include <dm/pinctrl.h>
 #include <dm/root.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include "pinctrl-nexell.h"
 #include "pinctrl-s5pxx18.h"
 
diff --git a/drivers/pinctrl/pinctrl-at91-pio4.c b/drivers/pinctrl/pinctrl-at91-pio4.c
index 49eb9078f15..02f8d94f12d 100644
--- a/drivers/pinctrl/pinctrl-at91-pio4.c
+++ b/drivers/pinctrl/pinctrl-at91-pio4.c
@@ -15,6 +15,7 @@
 #include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/err.h>
+#include <linux/kernel.h>
 #include <mach/atmel_pio4.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/pinctrl/pinctrl-at91.c b/drivers/pinctrl/pinctrl-at91.c
index aa5d05d93e9..819c5723fa5 100644
--- a/drivers/pinctrl/pinctrl-at91.c
+++ b/drivers/pinctrl/pinctrl-at91.c
@@ -16,6 +16,7 @@
 #include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/err.h>
+#include <linux/kernel.h>
 #include <mach/at91_pio.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/pinctrl/pinctrl-generic.c b/drivers/pinctrl/pinctrl-generic.c
index 45b3ad5d793..a8a78020d0a 100644
--- a/drivers/pinctrl/pinctrl-generic.c
+++ b/drivers/pinctrl/pinctrl-generic.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <stdbool.h>
 #include <dm/device_compat.h>
 #include <linux/compat.h>
 #include <dm/pinctrl.h>
diff --git a/drivers/pinctrl/pinctrl-sandbox.c b/drivers/pinctrl/pinctrl-sandbox.c
index 28db1116387..6b6ad35b351 100644
--- a/drivers/pinctrl/pinctrl-sandbox.c
+++ b/drivers/pinctrl/pinctrl-sandbox.c
@@ -11,6 +11,7 @@
 #include <vsprintf.h>
 #include <dm/pinctrl.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 static const char * const sandbox_pins[] = {
diff --git a/drivers/pinctrl/pinctrl-single.c b/drivers/pinctrl/pinctrl-single.c
index e4a05f5cce6..24387e59f1e 100644
--- a/drivers/pinctrl/pinctrl-single.c
+++ b/drivers/pinctrl/pinctrl-single.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <stdbool.h>
 #include <dm/device_compat.h>
 #include <dm/pinctrl.h>
 #include <linux/errno.h>
diff --git a/drivers/pinctrl/pinctrl-sti.c b/drivers/pinctrl/pinctrl-sti.c
index f6444181671..7549253e061 100644
--- a/drivers/pinctrl/pinctrl-sti.c
+++ b/drivers/pinctrl/pinctrl-sti.c
@@ -18,6 +18,7 @@
 #include <dm/pinctrl.h>
 #include <linux/bug.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <linux/printk.h>
 
diff --git a/drivers/pinctrl/pinctrl-stmfx.c b/drivers/pinctrl/pinctrl-stmfx.c
index bdf852c5f02..b72374cd09c 100644
--- a/drivers/pinctrl/pinctrl-stmfx.c
+++ b/drivers/pinctrl/pinctrl-stmfx.c
@@ -19,6 +19,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <power/regulator.h>
 
diff --git a/drivers/pinctrl/pinctrl_pic32.c b/drivers/pinctrl/pinctrl_pic32.c
index 6f2b34f2813..939760d5bb1 100644
--- a/drivers/pinctrl/pinctrl_pic32.c
+++ b/drivers/pinctrl/pinctrl_pic32.c
@@ -14,6 +14,7 @@
 #include <dm/pinctrl.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <mach/pic32.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/pinctrl/pinctrl_stm32.c b/drivers/pinctrl/pinctrl_stm32.c
index faec68c3b2e..98cf5b5aa5b 100644
--- a/drivers/pinctrl/pinctrl_stm32.c
+++ b/drivers/pinctrl/pinctrl_stm32.c
@@ -14,6 +14,7 @@
 #include <linux/bitops.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <linux/printk.h>
 
diff --git a/drivers/pinctrl/renesas/pfc-r7s72100.c b/drivers/pinctrl/renesas/pfc-r7s72100.c
index db4dea11104..91d220fe475 100644
--- a/drivers/pinctrl/renesas/pfc-r7s72100.c
+++ b/drivers/pinctrl/renesas/pfc-r7s72100.c
@@ -15,6 +15,7 @@
 #include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/err.h>
+#include <linux/kernel.h>
 
 #define P(bank)			(0x0000 + (bank) * 4)
 #define PSR(bank)		(0x0100 + (bank) * 4)
diff --git a/drivers/pinctrl/renesas/pfc.c b/drivers/pinctrl/renesas/pfc.c
index 1a7e686a465..5d7486574cc 100644
--- a/drivers/pinctrl/renesas/pfc.c
+++ b/drivers/pinctrl/renesas/pfc.c
@@ -22,6 +22,7 @@
 #include <linux/bug.h>
 #include <linux/errno.h>
 #include <linux/io.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 
 #include "sh_pfc.h"
diff --git a/drivers/pinctrl/renesas/sh_pfc.h b/drivers/pinctrl/renesas/sh_pfc.h
index 81c01799482..feea8a45ff6 100644
--- a/drivers/pinctrl/renesas/sh_pfc.h
+++ b/drivers/pinctrl/renesas/sh_pfc.h
@@ -11,6 +11,7 @@
 #ifndef __SH_PFC_H
 #define __SH_PFC_H
 
+#include <linux/kernel.h>
 #include <linux/stringify.h>
 
 enum {
diff --git a/drivers/pinctrl/rockchip/pinctrl-px30.c b/drivers/pinctrl/rockchip/pinctrl-px30.c
index bf1ee07c5fe..bbe50160722 100644
--- a/drivers/pinctrl/rockchip/pinctrl-px30.c
+++ b/drivers/pinctrl/rockchip/pinctrl-px30.c
@@ -11,6 +11,7 @@
 #include <syscon.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #include "pinctrl-rockchip.h"
 
diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3036.c b/drivers/pinctrl/rockchip/pinctrl-rk3036.c
index 11d4e784d02..77bd12e4c79 100644
--- a/drivers/pinctrl/rockchip/pinctrl-rk3036.c
+++ b/drivers/pinctrl/rockchip/pinctrl-rk3036.c
@@ -10,6 +10,7 @@
 #include <syscon.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #include "pinctrl-rockchip.h"
 
diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3128.c b/drivers/pinctrl/rockchip/pinctrl-rk3128.c
index 445dbf85d4f..dc44f784080 100644
--- a/drivers/pinctrl/rockchip/pinctrl-rk3128.c
+++ b/drivers/pinctrl/rockchip/pinctrl-rk3128.c
@@ -10,6 +10,7 @@
 #include <syscon.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #include "pinctrl-rockchip.h"
 
diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3188.c b/drivers/pinctrl/rockchip/pinctrl-rk3188.c
index c4ff4e58531..4b919e9cffc 100644
--- a/drivers/pinctrl/rockchip/pinctrl-rk3188.c
+++ b/drivers/pinctrl/rockchip/pinctrl-rk3188.c
@@ -10,6 +10,7 @@
 #include <regmap.h>
 #include <syscon.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #include "pinctrl-rockchip.h"
 
diff --git a/drivers/pinctrl/rockchip/pinctrl-rk322x.c b/drivers/pinctrl/rockchip/pinctrl-rk322x.c
index 3e925837ee8..2ae92e258b7 100644
--- a/drivers/pinctrl/rockchip/pinctrl-rk322x.c
+++ b/drivers/pinctrl/rockchip/pinctrl-rk322x.c
@@ -11,6 +11,7 @@
 #include <syscon.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #include "pinctrl-rockchip.h"
 
diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3288.c b/drivers/pinctrl/rockchip/pinctrl-rk3288.c
index e8cdca1bd28..8c22a56b620 100644
--- a/drivers/pinctrl/rockchip/pinctrl-rk3288.c
+++ b/drivers/pinctrl/rockchip/pinctrl-rk3288.c
@@ -10,6 +10,7 @@
 #include <regmap.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #include "pinctrl-rockchip.h"
 
diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3308.c b/drivers/pinctrl/rockchip/pinctrl-rk3308.c
index 088617de5db..afd9bd3e85d 100644
--- a/drivers/pinctrl/rockchip/pinctrl-rk3308.c
+++ b/drivers/pinctrl/rockchip/pinctrl-rk3308.c
@@ -11,6 +11,7 @@
 #include <syscon.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #include "pinctrl-rockchip.h"
 
diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3328.c b/drivers/pinctrl/rockchip/pinctrl-rk3328.c
index 342d67d06d9..42075627f96 100644
--- a/drivers/pinctrl/rockchip/pinctrl-rk3328.c
+++ b/drivers/pinctrl/rockchip/pinctrl-rk3328.c
@@ -11,6 +11,7 @@
 #include <syscon.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #include "pinctrl-rockchip.h"
 
diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3368.c b/drivers/pinctrl/rockchip/pinctrl-rk3368.c
index d66b62d9136..5fbc0635964 100644
--- a/drivers/pinctrl/rockchip/pinctrl-rk3368.c
+++ b/drivers/pinctrl/rockchip/pinctrl-rk3368.c
@@ -10,6 +10,7 @@
 #include <regmap.h>
 #include <syscon.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #include "pinctrl-rockchip.h"
 
diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3399.c b/drivers/pinctrl/rockchip/pinctrl-rk3399.c
index ec33f89bb82..084941c6706 100644
--- a/drivers/pinctrl/rockchip/pinctrl-rk3399.c
+++ b/drivers/pinctrl/rockchip/pinctrl-rk3399.c
@@ -11,6 +11,7 @@
 #include <syscon.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #include "pinctrl-rockchip.h"
 
diff --git a/drivers/pinctrl/rockchip/pinctrl-rockchip-core.c b/drivers/pinctrl/rockchip/pinctrl-rockchip-core.c
index 389d584078f..f36e49f36a4 100644
--- a/drivers/pinctrl/rockchip/pinctrl-rockchip-core.c
+++ b/drivers/pinctrl/rockchip/pinctrl-rockchip-core.c
@@ -13,6 +13,7 @@
 #include <fdtdec.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <linux/string.h>
 
diff --git a/drivers/pinctrl/rockchip/pinctrl-rockchip.h b/drivers/pinctrl/rockchip/pinctrl-rockchip.h
index d969c200826..5231e646521 100644
--- a/drivers/pinctrl/rockchip/pinctrl-rockchip.h
+++ b/drivers/pinctrl/rockchip/pinctrl-rockchip.h
@@ -6,6 +6,7 @@
 #ifndef __DRIVERS_PINCTRL_ROCKCHIP_H
 #define __DRIVERS_PINCTRL_ROCKCHIP_H
 
+#include <stdbool.h>
 #include <linux/bitops.h>
 #include <linux/types.h>
 
diff --git a/drivers/pinctrl/rockchip/pinctrl-rv1108.c b/drivers/pinctrl/rockchip/pinctrl-rv1108.c
index c0fb962ef05..42db3375d04 100644
--- a/drivers/pinctrl/rockchip/pinctrl-rv1108.c
+++ b/drivers/pinctrl/rockchip/pinctrl-rv1108.c
@@ -11,6 +11,7 @@
 #include <syscon.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #include "pinctrl-rockchip.h"
 
diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c
index 5efaa2f66b0..a1d41cc48ff 100644
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <dm/pinctrl.h>
+#include <linux/kernel.h>
 
 #include "pinctrl-uniphier.h"
 
diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c
index d3c5833c993..7bd359f95af 100644
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <dm/pinctrl.h>
+#include <linux/kernel.h>
 
 #include "pinctrl-uniphier.h"
 
diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c
index bf1a9e9e989..ddea6ab9d04 100644
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <dm/pinctrl.h>
+#include <linux/kernel.h>
 
 #include "pinctrl-uniphier.h"
 
diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c
index f22c046804a..4f9692ac1b6 100644
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <dm/pinctrl.h>
+#include <linux/kernel.h>
 
 #include "pinctrl-uniphier.h"
 
diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c
index 8bae163a8e9..93a57eac769 100644
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <dm/pinctrl.h>
+#include <linux/kernel.h>
 
 #include "pinctrl-uniphier.h"
 
diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c
index 1f4931bcf0d..48a6f854f91 100644
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <dm/pinctrl.h>
+#include <linux/kernel.h>
 
 #include "pinctrl-uniphier.h"
 
diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-pxs2.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-pxs2.c
index 038a7dd7be0..7f9387c25ff 100644
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier-pxs2.c
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-pxs2.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <dm/pinctrl.h>
+#include <linux/kernel.h>
 
 #include "pinctrl-uniphier.h"
 
diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-pxs3.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-pxs3.c
index 452d76d721d..a929ef38a98 100644
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier-pxs3.c
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-pxs3.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <dm/pinctrl.h>
+#include <linux/kernel.h>
 
 #include "pinctrl-uniphier.h"
 
diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-sld8.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-sld8.c
index 1e38ba16f93..3bb9c292078 100644
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier-sld8.c
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-sld8.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <dm/pinctrl.h>
+#include <linux/kernel.h>
 
 #include "pinctrl-uniphier.h"
 
diff --git a/drivers/power/acpi_pmc/acpi-pmc-uclass.c b/drivers/power/acpi_pmc/acpi-pmc-uclass.c
index d713dc81f0a..f13e27f34cb 100644
--- a/drivers/power/acpi_pmc/acpi-pmc-uclass.c
+++ b/drivers/power/acpi_pmc/acpi-pmc-uclass.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <acpi/acpi_s3.h>
 #ifdef CONFIG_X86
diff --git a/drivers/power/acpi_pmc/pmc_emul.c b/drivers/power/acpi_pmc/pmc_emul.c
index 93ba847e2ec..de6afccea12 100644
--- a/drivers/power/acpi_pmc/pmc_emul.c
+++ b/drivers/power/acpi_pmc/pmc_emul.c
@@ -12,6 +12,7 @@
 #include <pci.h>
 #include <asm/test.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <power/acpi_pmc.h>
 
 /**
diff --git a/drivers/power/axp809.c b/drivers/power/axp809.c
index fd85b734145..7999ab593a8 100644
--- a/drivers/power/axp809.c
+++ b/drivers/power/axp809.c
@@ -13,6 +13,7 @@
 #include <common.h>
 #include <command.h>
 #include <errno.h>
+#include <stdbool.h>
 #include <asm/arch/gpio.h>
 #include <asm/arch/pmic_bus.h>
 #include <axp_pmic.h>
diff --git a/drivers/power/axp818.c b/drivers/power/axp818.c
index bfdc3d93caf..340472d75c7 100644
--- a/drivers/power/axp818.c
+++ b/drivers/power/axp818.c
@@ -13,6 +13,7 @@
 #include <common.h>
 #include <command.h>
 #include <errno.h>
+#include <stdbool.h>
 #include <asm/arch/gpio.h>
 #include <asm/arch/pmic_bus.h>
 #include <axp_pmic.h>
diff --git a/drivers/power/domain/imx8-power-domain-legacy.c b/drivers/power/domain/imx8-power-domain-legacy.c
index 37167b33460..2b07855fb11 100644
--- a/drivers/power/domain/imx8-power-domain-legacy.c
+++ b/drivers/power/domain/imx8-power-domain-legacy.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <power-domain-uclass.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/power/domain/meson-ee-pwrc.c b/drivers/power/domain/meson-ee-pwrc.c
index 7e131d32553..f6082f2a4c0 100644
--- a/drivers/power/domain/meson-ee-pwrc.c
+++ b/drivers/power/domain/meson-ee-pwrc.c
@@ -19,6 +19,7 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 /* AO Offsets */
 
diff --git a/drivers/power/domain/power-domain-uclass.c b/drivers/power/domain/power-domain-uclass.c
index cf9227572f9..2ea42860794 100644
--- a/drivers/power/domain/power-domain-uclass.c
+++ b/drivers/power/domain/power-domain-uclass.c
@@ -9,6 +9,7 @@
 #include <malloc.h>
 #include <power-domain.h>
 #include <power-domain-uclass.h>
+#include <stdbool.h>
 #include <dm/device-internal.h>
 #include <linux/errno.h>
 
diff --git a/drivers/power/domain/sandbox-power-domain.c b/drivers/power/domain/sandbox-power-domain.c
index 373db61ba0f..c58b80e63a0 100644
--- a/drivers/power/domain/sandbox-power-domain.c
+++ b/drivers/power/domain/sandbox-power-domain.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <power-domain-uclass.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <asm/power-domain.h>
 #include <linux/errno.h>
diff --git a/drivers/power/domain/tegra186-power-domain.c b/drivers/power/domain/tegra186-power-domain.c
index 707735cf851..3649858e0f2 100644
--- a/drivers/power/domain/tegra186-power-domain.c
+++ b/drivers/power/domain/tegra186-power-domain.c
@@ -9,6 +9,7 @@
 #include <malloc.h>
 #include <misc.h>
 #include <power-domain-uclass.h>
+#include <stdbool.h>
 #include <asm/arch-tegra/bpmp_abi.h>
 #include <linux/bitops.h>
 
diff --git a/drivers/power/fuel_gauge/fg_max17042.c b/drivers/power/fuel_gauge/fg_max17042.c
index 89a170aea60..a0614e229a1 100644
--- a/drivers/power/fuel_gauge/fg_max17042.c
+++ b/drivers/power/fuel_gauge/fg_max17042.c
@@ -9,6 +9,7 @@
 #include <stdio.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <power/pmic.h>
 #include <power/max17042_fg.h>
 #include <i2c.h>
diff --git a/drivers/power/pmic/da9063.c b/drivers/power/pmic/da9063.c
index b88e79f4314..13b7503aedb 100644
--- a/drivers/power/pmic/da9063.c
+++ b/drivers/power/pmic/da9063.c
@@ -11,6 +11,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/pmic/i2c_pmic_emul.c b/drivers/power/pmic/i2c_pmic_emul.c
index 1a044ea5b17..ce68fdb043a 100644
--- a/drivers/power/pmic/i2c_pmic_emul.c
+++ b/drivers/power/pmic/i2c_pmic_emul.c
@@ -10,6 +10,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
diff --git a/drivers/power/pmic/rk8xx.c b/drivers/power/pmic/rk8xx.c
index 991a94b41ab..db0968ac0f5 100644
--- a/drivers/power/pmic/rk8xx.c
+++ b/drivers/power/pmic/rk8xx.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <stdio.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <power/rk8xx_pmic.h>
 #include <power/pmic.h>
 
diff --git a/drivers/power/regulator/act8846.c b/drivers/power/regulator/act8846.c
index 0140231214a..175966293c2 100644
--- a/drivers/power/regulator/act8846.c
+++ b/drivers/power/regulator/act8846.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
+#include <stdbool.h>
 #include <linux/errno.h>
 #include <power/act8846_pmic.h>
 #include <power/pmic.h>
diff --git a/drivers/power/regulator/as3722_regulator.c b/drivers/power/regulator/as3722_regulator.c
index da25e58dec9..55b61cd7a9f 100644
--- a/drivers/power/regulator/as3722_regulator.c
+++ b/drivers/power/regulator/as3722_regulator.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
+#include <stdbool.h>
 #include <linux/errno.h>
 #include <power/as3722.h>
 #include <power/pmic.h>
diff --git a/drivers/power/regulator/bd71837.c b/drivers/power/regulator/bd71837.c
index 7ebba28a992..2a74bfcc79e 100644
--- a/drivers/power/regulator/bd71837.c
+++ b/drivers/power/regulator/bd71837.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include <power/bd71837.h>
diff --git a/drivers/power/regulator/da9063.c b/drivers/power/regulator/da9063.c
index ae069e602a3..bfe77d6814a 100644
--- a/drivers/power/regulator/da9063.c
+++ b/drivers/power/regulator/da9063.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <power/da9063_pmic.h>
 #include <power/pmic.h>
diff --git a/drivers/power/regulator/fan53555.c b/drivers/power/regulator/fan53555.c
index fa8dc96f9da..93aa04f7aee 100644
--- a/drivers/power/regulator/fan53555.c
+++ b/drivers/power/regulator/fan53555.c
@@ -13,6 +13,7 @@
 #include <asm/gpio.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <power/fan53555.h>
 #include <power/pmic.h>
diff --git a/drivers/power/regulator/fixed.c b/drivers/power/regulator/fixed.c
index 78245de90a6..97cae59bff0 100644
--- a/drivers/power/regulator/fixed.c
+++ b/drivers/power/regulator/fixed.c
@@ -9,6 +9,7 @@
 #include <errno.h>
 #include <dm.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/gpio.h>
 #include <linux/errno.h>
 #include <power/pmic.h>
diff --git a/drivers/power/regulator/gpio-regulator.c b/drivers/power/regulator/gpio-regulator.c
index bc862179a80..2f344e45dfe 100644
--- a/drivers/power/regulator/gpio-regulator.c
+++ b/drivers/power/regulator/gpio-regulator.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/gpio.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
diff --git a/drivers/power/regulator/lp873x_regulator.c b/drivers/power/regulator/lp873x_regulator.c
index c47a4a9a778..38bf4f53b27 100644
--- a/drivers/power/regulator/lp873x_regulator.c
+++ b/drivers/power/regulator/lp873x_regulator.c
@@ -11,6 +11,7 @@
 #include <errno.h>
 #include <dm.h>
 #include <i2c.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <linux/errno.h>
 #include <power/pmic.h>
diff --git a/drivers/power/regulator/lp87565_regulator.c b/drivers/power/regulator/lp87565_regulator.c
index 2275a7367b0..96b0f36c415 100644
--- a/drivers/power/regulator/lp87565_regulator.c
+++ b/drivers/power/regulator/lp87565_regulator.c
@@ -12,6 +12,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <linux/errno.h>
 #include <power/pmic.h>
diff --git a/drivers/power/regulator/max77686.c b/drivers/power/regulator/max77686.c
index bcbe257f53f..e4c099fb8b4 100644
--- a/drivers/power/regulator/max77686.c
+++ b/drivers/power/regulator/max77686.c
@@ -12,6 +12,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/regulator/palmas_regulator.c b/drivers/power/regulator/palmas_regulator.c
index 9f1ae1d246f..5eeed77b29e 100644
--- a/drivers/power/regulator/palmas_regulator.c
+++ b/drivers/power/regulator/palmas_regulator.c
@@ -11,6 +11,7 @@
 #include <errno.h>
 #include <dm.h>
 #include <i2c.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <linux/errno.h>
 #include <linux/string.h>
diff --git a/drivers/power/regulator/pfuze100.c b/drivers/power/regulator/pfuze100.c
index b874d58961c..1f9eab05cbe 100644
--- a/drivers/power/regulator/pfuze100.c
+++ b/drivers/power/regulator/pfuze100.c
@@ -12,6 +12,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/regulator/pwm_regulator.c b/drivers/power/regulator/pwm_regulator.c
index 451ce106e4f..9bf65e9685f 100644
--- a/drivers/power/regulator/pwm_regulator.c
+++ b/drivers/power/regulator/pwm_regulator.c
@@ -12,6 +12,7 @@
 #include <errno.h>
 #include <log.h>
 #include <pwm.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <dm/device_compat.h>
diff --git a/drivers/power/regulator/regulator-uclass.c b/drivers/power/regulator/regulator-uclass.c
index 704a33d057a..251fc78bc89 100644
--- a/drivers/power/regulator/regulator-uclass.c
+++ b/drivers/power/regulator/regulator-uclass.c
@@ -12,6 +12,7 @@
 #include <dm/uclass-internal.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/regulator/regulator_common.c b/drivers/power/regulator/regulator_common.c
index ace87764092..c9ab95c9d5a 100644
--- a/drivers/power/regulator/regulator_common.c
+++ b/drivers/power/regulator/regulator_common.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/gpio.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/power/regulator/regulator_common.h b/drivers/power/regulator/regulator_common.h
index 946401f5e24..0d3d05c40b3 100644
--- a/drivers/power/regulator/regulator_common.h
+++ b/drivers/power/regulator/regulator_common.h
@@ -7,6 +7,8 @@
 #ifndef _REGULATOR_COMMON_H
 #define _REGULATOR_COMMON_H
 
+#include <stdbool.h>
+
 struct regulator_common_platdata {
 	struct gpio_desc gpio; /* GPIO for regulator enable control */
 	unsigned int startup_delay_us;
diff --git a/drivers/power/regulator/rk8xx.c b/drivers/power/regulator/rk8xx.c
index 03e6ffcc978..e6b0bbac7cf 100644
--- a/drivers/power/regulator/rk8xx.c
+++ b/drivers/power/regulator/rk8xx.c
@@ -13,6 +13,7 @@
 #include <errno.h>
 #include <log.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <power/rk8xx_pmic.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/regulator/s2mps11_regulator.c b/drivers/power/regulator/s2mps11_regulator.c
index ffbc06d9b79..728a67bf8d4 100644
--- a/drivers/power/regulator/s2mps11_regulator.c
+++ b/drivers/power/regulator/s2mps11_regulator.c
@@ -11,6 +11,7 @@
 #include <i2c.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/regulator/s5m8767.c b/drivers/power/regulator/s5m8767.c
index 7e1d08b8d11..6d4f8caa3bb 100644
--- a/drivers/power/regulator/s5m8767.c
+++ b/drivers/power/regulator/s5m8767.c
@@ -8,6 +8,7 @@
 #include <errno.h>
 #include <dm.h>
 #include <i2c.h>
+#include <stdbool.h>
 #include <linux/errno.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/regulator/sandbox.c b/drivers/power/regulator/sandbox.c
index 88c6f3ca3b2..196092c7260 100644
--- a/drivers/power/regulator/sandbox.c
+++ b/drivers/power/regulator/sandbox.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/regulator/stpmic1.c b/drivers/power/regulator/stpmic1.c
index 38cd18b0d4f..119e8d3ffbb 100644
--- a/drivers/power/regulator/stpmic1.c
+++ b/drivers/power/regulator/stpmic1.c
@@ -9,6 +9,7 @@
 #include <errno.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/stpmic1.h>
diff --git a/drivers/power/regulator/tps62360_regulator.c b/drivers/power/regulator/tps62360_regulator.c
index 5d7d3d43ed5..44c26e868d3 100644
--- a/drivers/power/regulator/tps62360_regulator.c
+++ b/drivers/power/regulator/tps62360_regulator.c
@@ -9,6 +9,7 @@
 #include <i2c.h>
 #include <dm/device_compat.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <power/regulator.h>
 
 #define TPS62360_REG_SET0	0
diff --git a/drivers/power/regulator/tps65090_regulator.c b/drivers/power/regulator/tps65090_regulator.c
index 95db2d60e50..cbab544e2bc 100644
--- a/drivers/power/regulator/tps65090_regulator.c
+++ b/drivers/power/regulator/tps65090_regulator.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
+#include <stdbool.h>
 #include <time.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/power/regulator/tps65910_regulator.c b/drivers/power/regulator/tps65910_regulator.c
index a2bd9c6c18a..bc9ec2dcb27 100644
--- a/drivers/power/regulator/tps65910_regulator.c
+++ b/drivers/power/regulator/tps65910_regulator.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <log.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/regulator/tps65941_regulator.c b/drivers/power/regulator/tps65941_regulator.c
index 535d88a7e19..1767a72ac0d 100644
--- a/drivers/power/regulator/tps65941_regulator.c
+++ b/drivers/power/regulator/tps65941_regulator.c
@@ -12,6 +12,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/power/tps6586x.c b/drivers/power/tps6586x.c
index acf0d5cfa4f..ac9d0986040 100644
--- a/drivers/power/tps6586x.c
+++ b/drivers/power/tps6586x.c
@@ -11,6 +11,7 @@
 #include <i2c.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 static struct udevice *tps6586x_dev;
 
diff --git a/drivers/pwm/exynos_pwm.c b/drivers/pwm/exynos_pwm.c
index 5417e95ef7b..59a07e593b9 100644
--- a/drivers/pwm/exynos_pwm.c
+++ b/drivers/pwm/exynos_pwm.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <log.h>
 #include <pwm.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <asm/arch/clk.h>
 #include <asm/arch/clock.h>
diff --git a/drivers/pwm/pwm-imx.c b/drivers/pwm/pwm-imx.c
index 77a1907fd3b..70bf5851e54 100644
--- a/drivers/pwm/pwm-imx.c
+++ b/drivers/pwm/pwm-imx.c
@@ -11,6 +11,7 @@
 #include <dm.h>
 #include <log.h>
 #include <pwm.h>
+#include <stdbool.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/io.h>
 #include "pwm-imx-util.h"
diff --git a/drivers/pwm/pwm-mtk.c b/drivers/pwm/pwm-mtk.c
index 1459e7fa673..9b997ec88f7 100644
--- a/drivers/pwm/pwm-mtk.c
+++ b/drivers/pwm/pwm-mtk.c
@@ -15,6 +15,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/io.h>
+#include <linux/kernel.h>
 
 /* PWM registers and bits definitions */
 #define PWMCON			0x00
diff --git a/drivers/pwm/pwm-sifive.c b/drivers/pwm/pwm-sifive.c
index 866b243c004..cf3c723aceb 100644
--- a/drivers/pwm/pwm-sifive.c
+++ b/drivers/pwm/pwm-sifive.c
@@ -21,6 +21,7 @@
 #include <asm/global_data.h>
 #include <linux/errno.h>
 #include <linux/io.h>
+#include <linux/kernel.h>
 #include <linux/log2.h>
 #include <linux/bitfield.h>
 
diff --git a/drivers/pwm/pwm-uclass.c b/drivers/pwm/pwm-uclass.c
index ab2df85e3ea..e3bfcc837dc 100644
--- a/drivers/pwm/pwm-uclass.c
+++ b/drivers/pwm/pwm-uclass.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <pwm.h>
+#include <stdbool.h>
 #include <linux/errno.h>
 
 int pwm_set_invert(struct udevice *dev, uint channel, bool polarity)
diff --git a/drivers/pwm/rk_pwm.c b/drivers/pwm/rk_pwm.c
index 04c16ff36d8..afe48071047 100644
--- a/drivers/pwm/rk_pwm.c
+++ b/drivers/pwm/rk_pwm.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <pwm.h>
 #include <regmap.h>
+#include <stdbool.h>
 #include <syscon.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/pwm/sandbox_pwm.c b/drivers/pwm/sandbox_pwm.c
index 0e267064b14..44e7f235650 100644
--- a/drivers/pwm/sandbox_pwm.c
+++ b/drivers/pwm/sandbox_pwm.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <pwm.h>
+#include <stdbool.h>
 #include <asm/test.h>
 #include <linux/errno.h>
 
diff --git a/drivers/pwm/sunxi_pwm.c b/drivers/pwm/sunxi_pwm.c
index d3e714a6ab3..55472103fcc 100644
--- a/drivers/pwm/sunxi_pwm.c
+++ b/drivers/pwm/sunxi_pwm.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <pwm.h>
 #include <regmap.h>
+#include <stdbool.h>
 #include <syscon.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/pwm/tegra_pwm.c b/drivers/pwm/tegra_pwm.c
index 2cfb3787dc4..11378bb2e3b 100644
--- a/drivers/pwm/tegra_pwm.c
+++ b/drivers/pwm/tegra_pwm.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <log.h>
 #include <pwm.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/pwm.h>
diff --git a/drivers/qe/uec.c b/drivers/qe/uec.c
index 49adc58165d..cb11e99faf8 100644
--- a/drivers/qe/uec.c
+++ b/drivers/qe/uec.c
@@ -16,6 +16,7 @@
 #include <linux/errno.h>
 #include <asm/io.h>
 #include <linux/immap_qe.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "uccf.h"
 #include "uec.h"
diff --git a/drivers/qe/uec_phy.c b/drivers/qe/uec_phy.c
index c9beb852def..ff9ed5d01ae 100644
--- a/drivers/qe/uec_phy.c
+++ b/drivers/qe/uec_phy.c
@@ -17,6 +17,7 @@
 #include <linux/errno.h>
 #include <linux/immap_qe.h>
 #include <asm/io.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "uccf.h"
 #include "uec.h"
diff --git a/drivers/ram/k3-j721e/lpddr4_if.h b/drivers/ram/k3-j721e/lpddr4_if.h
index 66ec3c5a27f..56a1c926985 100644
--- a/drivers/ram/k3-j721e/lpddr4_if.h
+++ b/drivers/ram/k3-j721e/lpddr4_if.h
@@ -13,6 +13,7 @@
 #ifndef LPDDR4_IF_H
 #define LPDDR4_IF_H
 
+#include <stdbool.h>
 #include <linux/types.h>
 
 /** @defgroup ConfigInfo  Configuration and Hardware Operation Information
diff --git a/drivers/ram/k3-j721e/lpddr4_sanity.h b/drivers/ram/k3-j721e/lpddr4_sanity.h
index 84050d72c4a..1ee052bffb9 100644
--- a/drivers/ram/k3-j721e/lpddr4_sanity.h
+++ b/drivers/ram/k3-j721e/lpddr4_sanity.h
@@ -21,6 +21,7 @@
 #define LPDDR4_SANITY_H
 
 #include <errno.h>
+#include <stdbool.h>
 #include <linux/errno.h>
 #include <linux/types.h>
 #include "lpddr4_if.h"
diff --git a/drivers/ram/k3-j721e/lpddr4_structs_if.h b/drivers/ram/k3-j721e/lpddr4_structs_if.h
index dc6dd3570e0..c3a308e2af6 100644
--- a/drivers/ram/k3-j721e/lpddr4_structs_if.h
+++ b/drivers/ram/k3-j721e/lpddr4_structs_if.h
@@ -12,6 +12,7 @@
 #ifndef LPDDR4_STRUCTS_IF_H
 #define LPDDR4_STRUCTS_IF_H
 
+#include <stdbool.h>
 #include <linux/types.h>
 #include "lpddr4_if.h"
 
diff --git a/drivers/ram/rockchip/dmc-rk3368.c b/drivers/ram/rockchip/dmc-rk3368.c
index 1c3d95d7d63..9f13363e634 100644
--- a/drivers/ram/rockchip/dmc-rk3368.c
+++ b/drivers/ram/rockchip/dmc-rk3368.c
@@ -26,6 +26,7 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 
 struct dram_info {
diff --git a/drivers/ram/rockchip/sdram_px30.c b/drivers/ram/rockchip/sdram_px30.c
index fd5763d0a0d..a4f8980bfd7 100644
--- a/drivers/ram/rockchip/sdram_px30.c
+++ b/drivers/ram/rockchip/sdram_px30.c
@@ -18,6 +18,7 @@
 #include <asm/arch-rockchip/sdram.h>
 #include <asm/arch-rockchip/sdram_px30.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 
 struct dram_info {
 #ifdef CONFIG_TPL_BUILD
diff --git a/drivers/ram/rockchip/sdram_rk3188.c b/drivers/ram/rockchip/sdram_rk3188.c
index a8db0e34122..cfa6d0ebf19 100644
--- a/drivers/ram/rockchip/sdram_rk3188.c
+++ b/drivers/ram/rockchip/sdram_rk3188.c
@@ -29,6 +29,7 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 struct chan_info {
diff --git a/drivers/ram/rockchip/sdram_rk322x.c b/drivers/ram/rockchip/sdram_rk322x.c
index 92fe235be5a..89b4fc2acb6 100644
--- a/drivers/ram/rockchip/sdram_rk322x.c
+++ b/drivers/ram/rockchip/sdram_rk322x.c
@@ -25,6 +25,7 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/ram/rockchip/sdram_rk3288.c b/drivers/ram/rockchip/sdram_rk3288.c
index 4f48da4b4e5..80abe9c9b20 100644
--- a/drivers/ram/rockchip/sdram_rk3288.c
+++ b/drivers/ram/rockchip/sdram_rk3288.c
@@ -29,6 +29,7 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <power/regulator.h>
 #include <power/rk8xx_pmic.h>
diff --git a/drivers/ram/rockchip/sdram_rk3328.c b/drivers/ram/rockchip/sdram_rk3328.c
index e61972e322c..827d52e7a5c 100644
--- a/drivers/ram/rockchip/sdram_rk3328.c
+++ b/drivers/ram/rockchip/sdram_rk3328.c
@@ -21,6 +21,7 @@
 #include <asm/arch-rockchip/sdram_rk3328.h>
 #include <asm/arch-rockchip/uart.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 struct dram_info {
diff --git a/drivers/ram/rockchip/sdram_rk3399.c b/drivers/ram/rockchip/sdram_rk3399.c
index 45c20b7cfa3..690b8c3f3b2 100644
--- a/drivers/ram/rockchip/sdram_rk3399.c
+++ b/drivers/ram/rockchip/sdram_rk3399.c
@@ -27,6 +27,7 @@
 #include <linux/err.h>
 #include <time.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #define PRESET_SGRF_HOLD(n)	((0x1 << (6 + 16)) | ((n) << 6))
 #define PRESET_GPIO0_HOLD(n)	((0x1 << (7 + 16)) | ((n) << 7))
diff --git a/drivers/ram/stm32mp1/stm32mp1_ddr.c b/drivers/ram/stm32mp1/stm32mp1_ddr.c
index 6742aa6a986..d122dadd6dc 100644
--- a/drivers/ram/stm32mp1/stm32mp1_ddr.c
+++ b/drivers/ram/stm32mp1/stm32mp1_ddr.c
@@ -17,6 +17,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/iopoll.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include "stm32mp1_ddr.h"
diff --git a/drivers/ram/stm32mp1/stm32mp1_ddr.h b/drivers/ram/stm32mp1/stm32mp1_ddr.h
index 4998f044394..5f15196b2da 100644
--- a/drivers/ram/stm32mp1/stm32mp1_ddr.h
+++ b/drivers/ram/stm32mp1/stm32mp1_ddr.h
@@ -6,6 +6,7 @@
 #ifndef _RAM_STM32MP1_DDR_H
 #define _RAM_STM32MP1_DDR_H
 
+#include <stdbool.h>
 enum stm32mp1_ddr_interact_step {
 	STEP_DDR_RESET,
 	STEP_CTL_INIT,
diff --git a/drivers/ram/stm32mp1/stm32mp1_interactive.c b/drivers/ram/stm32mp1/stm32mp1_interactive.c
index 34c9af7214b..d45071d3ed3 100644
--- a/drivers/ram/stm32mp1/stm32mp1_interactive.c
+++ b/drivers/ram/stm32mp1/stm32mp1_interactive.c
@@ -16,6 +16,7 @@
 #include <time.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "stm32mp1_ddr.h"
 #include "stm32mp1_tests.h"
diff --git a/drivers/ram/stm32mp1/stm32mp1_ram.c b/drivers/ram/stm32mp1/stm32mp1_ram.c
index 347ff769e40..8b49730e633 100644
--- a/drivers/ram/stm32mp1/stm32mp1_ram.c
+++ b/drivers/ram/stm32mp1/stm32mp1_ram.c
@@ -14,6 +14,7 @@
 #include <syscon.h>
 #include <asm/io.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.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 02ee683303d..00bdbe6762a 100644
--- a/drivers/ram/stm32mp1/stm32mp1_tests.c
+++ b/drivers/ram/stm32mp1/stm32mp1_tests.c
@@ -12,6 +12,7 @@
 #include <watchdog.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <linux/kernel.h>
 #include <linux/log2.h>
 #include <linux/string.h>
 #include "stm32mp1_tests.h"
diff --git a/drivers/ram/stm32mp1/stm32mp1_tuning.c b/drivers/ram/stm32mp1/stm32mp1_tuning.c
index 822c890031a..8da11d0629a 100644
--- a/drivers/ram/stm32mp1/stm32mp1_tuning.c
+++ b/drivers/ram/stm32mp1/stm32mp1_tuning.c
@@ -15,6 +15,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/iopoll.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/remoteproc/rproc-elf-loader.c b/drivers/remoteproc/rproc-elf-loader.c
index d4064a311b5..bb82de08da7 100644
--- a/drivers/remoteproc/rproc-elf-loader.c
+++ b/drivers/remoteproc/rproc-elf-loader.c
@@ -12,6 +12,7 @@
 #include <dm/device_compat.h>
 #include <linux/compat.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/remoteproc/rproc-uclass.c b/drivers/remoteproc/rproc-uclass.c
index 950dc3f9b11..e7513240ec5 100644
--- a/drivers/remoteproc/rproc-uclass.c
+++ b/drivers/remoteproc/rproc-uclass.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <remoteproc.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm/device-internal.h>
diff --git a/drivers/remoteproc/ti_k3_dsp_rproc.c b/drivers/remoteproc/ti_k3_dsp_rproc.c
index 722b9432491..a341ef84e8a 100644
--- a/drivers/remoteproc/ti_k3_dsp_rproc.c
+++ b/drivers/remoteproc/ti_k3_dsp_rproc.c
@@ -20,6 +20,7 @@
 #include <dm/device_compat.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <linux/soc/ti/ti_sci_protocol.h>
 #include <linux/string.h>
diff --git a/drivers/reset/ast2500-reset.c b/drivers/reset/ast2500-reset.c
index beb5cd8fa8c..d1e687bc135 100644
--- a/drivers/reset/ast2500-reset.c
+++ b/drivers/reset/ast2500-reset.c
@@ -9,6 +9,7 @@
 #include <misc.h>
 #include <reset.h>
 #include <reset-uclass.h>
+#include <stdbool.h>
 #include <wdt.h>
 #include <asm/io.h>
 #include <asm/arch/scu_ast2500.h>
diff --git a/drivers/reset/reset-hsdk.c b/drivers/reset/reset-hsdk.c
index 531e2cfb5fa..c9cfa6bc7d3 100644
--- a/drivers/reset/reset-hsdk.c
+++ b/drivers/reset/reset-hsdk.c
@@ -14,6 +14,7 @@
 #include <linux/errno.h>
 #include <linux/iopoll.h>
 #include <reset-uclass.h>
+#include <linux/kernel.h>
 
 struct hsdk_rst {
 	void __iomem		*regs_ctl;
diff --git a/drivers/reset/reset-meson.c b/drivers/reset/reset-meson.c
index 8322a48a8ae..ee53df94eca 100644
--- a/drivers/reset/reset-meson.c
+++ b/drivers/reset/reset-meson.c
@@ -12,6 +12,7 @@
 #include <malloc.h>
 #include <reset-uclass.h>
 #include <regmap.h>
+#include <stdbool.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 
diff --git a/drivers/reset/reset-socfpga.c b/drivers/reset/reset-socfpga.c
index f01b1e53e98..370353e6cba 100644
--- a/drivers/reset/reset-socfpga.c
+++ b/drivers/reset/reset-socfpga.c
@@ -16,6 +16,7 @@
 #include <dm.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <dm/lists.h>
diff --git a/drivers/reset/sandbox-reset.c b/drivers/reset/sandbox-reset.c
index a6936e81877..142724856e6 100644
--- a/drivers/reset/sandbox-reset.c
+++ b/drivers/reset/sandbox-reset.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <reset-uclass.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <asm/reset.h>
 #include <linux/errno.h>
diff --git a/drivers/reset/sti-reset.c b/drivers/reset/sti-reset.c
index 75d972a5fa2..d80e985711e 100644
--- a/drivers/reset/sti-reset.c
+++ b/drivers/reset/sti-reset.c
@@ -17,6 +17,7 @@
 #include <dt-bindings/reset/stih407-resets.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/rng/rockchip_rng.c b/drivers/rng/rockchip_rng.c
index efc1980e449..35f999c447d 100644
--- a/drivers/rng/rockchip_rng.c
+++ b/drivers/rng/rockchip_rng.c
@@ -9,6 +9,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/iopoll.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <rng.h>
 
diff --git a/drivers/rtc/ds1374.c b/drivers/rtc/ds1374.c
index 5ca0e32b50c..dc8e370a402 100644
--- a/drivers/rtc/ds1374.c
+++ b/drivers/rtc/ds1374.c
@@ -17,6 +17,7 @@
 #include <command.h>
 #include <rtc.h>
 #include <i2c.h>
+#include <stdbool.h>
 #include <stdio.h>
 
 /*---------------------------------------------------------------------*/
diff --git a/drivers/rtc/i2c_rtc_emul.c b/drivers/rtc/i2c_rtc_emul.c
index a78dc78cfcc..93b9ecc18db 100644
--- a/drivers/rtc/i2c_rtc_emul.c
+++ b/drivers/rtc/i2c_rtc_emul.c
@@ -19,6 +19,7 @@
 #include <log.h>
 #include <os.h>
 #include <rtc.h>
+#include <stdbool.h>
 #include <asm/rtc.h>
 #include <asm/test.h>
 #include <linux/string.h>
diff --git a/drivers/rtc/rv3029.c b/drivers/rtc/rv3029.c
index ffed37ad5aa..bda19d6853f 100644
--- a/drivers/rtc/rv3029.c
+++ b/drivers/rtc/rv3029.c
@@ -20,6 +20,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #define RTC_RV3029_PAGE_LEN             7
 
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
index ad7ca9e8784..0a68ef4a187 100644
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -18,6 +18,7 @@
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #if !defined(CONFIG_DM_SCSI)
diff --git a/drivers/serial/altera_jtag_uart.c b/drivers/serial/altera_jtag_uart.c
index 6b20d3d487b..bd2b65b028f 100644
--- a/drivers/serial/altera_jtag_uart.c
+++ b/drivers/serial/altera_jtag_uart.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <serial.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
diff --git a/drivers/serial/altera_uart.c b/drivers/serial/altera_uart.c
index ea9eb206a10..3d309885c2c 100644
--- a/drivers/serial/altera_uart.c
+++ b/drivers/serial/altera_uart.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <serial.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
diff --git a/drivers/serial/arm_dcc.c b/drivers/serial/arm_dcc.c
index 270f61cc074..a8faa58f271 100644
--- a/drivers/serial/arm_dcc.c
+++ b/drivers/serial/arm_dcc.c
@@ -18,6 +18,7 @@
 #include <common.h>
 #include <dm.h>
 #include <serial.h>
+#include <stdbool.h>
 #include <linux/errno.h>
 
 #if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_V7A) || defined(CONFIG_CPU_V7R)
diff --git a/drivers/serial/atmel_usart.c b/drivers/serial/atmel_usart.c
index f6e14cc9021..84bf36f3be5 100644
--- a/drivers/serial/atmel_usart.c
+++ b/drivers/serial/atmel_usart.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <watchdog.h>
 #include <serial.h>
 #include <debug_uart.h>
diff --git a/drivers/serial/lpc32xx_hsuart.c b/drivers/serial/lpc32xx_hsuart.c
index 598ae08c668..49ca3ff1320 100644
--- a/drivers/serial/lpc32xx_hsuart.c
+++ b/drivers/serial/lpc32xx_hsuart.c
@@ -7,6 +7,7 @@
 #include <clock_legacy.h>
 #include <dm.h>
 #include <serial.h>
+#include <stdbool.h>
 #include <dm/platform_data/lpc32xx_hsuart.h>
 #include <linux/errno.h>
 
diff --git a/drivers/serial/ns16550.c b/drivers/serial/ns16550.c
index 603a8cb5977..b0b69cf96f7 100644
--- a/drivers/serial/ns16550.c
+++ b/drivers/serial/ns16550.c
@@ -17,6 +17,7 @@
 #include <asm/global_data.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/types.h>
 #include <asm/io.h>
 
diff --git a/drivers/serial/sandbox.c b/drivers/serial/sandbox.c
index aef4c75d388..c811524e357 100644
--- a/drivers/serial/sandbox.c
+++ b/drivers/serial/sandbox.c
@@ -21,6 +21,7 @@
 #include <linux/compiler.h>
 #include <asm/state.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/serial/serial-uclass.c b/drivers/serial/serial-uclass.c
index 5033298f95a..5176a7395b7 100644
--- a/drivers/serial/serial-uclass.c
+++ b/drivers/serial/serial-uclass.c
@@ -20,6 +20,7 @@
 #include <dm/of_access.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/serial/serial.c b/drivers/serial/serial.c
index 6e10e5ec846..c3235135b5b 100644
--- a/drivers/serial/serial.c
+++ b/drivers/serial/serial.c
@@ -17,6 +17,7 @@
 #include <errno.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/serial/serial_ar933x.c b/drivers/serial/serial_ar933x.c
index a16d6a6eca6..fdcd62705ad 100644
--- a/drivers/serial/serial_ar933x.c
+++ b/drivers/serial/serial_ar933x.c
@@ -15,6 +15,7 @@
 #include <dm/pinctrl.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <mach/ar71xx_regs.h>
 
 #define AR933X_UART_DATA_REG            0x00
diff --git a/drivers/serial/serial_arc.c b/drivers/serial/serial_arc.c
index c1be34960ec..4205ffdd0df 100644
--- a/drivers/serial/serial_arc.c
+++ b/drivers/serial/serial_arc.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <dm.h>
 #include <serial.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/serial/serial_bcm283x_mu.c b/drivers/serial/serial_bcm283x_mu.c
index d9ebb273ddc..6e54e4ca72f 100644
--- a/drivers/serial/serial_bcm283x_mu.c
+++ b/drivers/serial/serial_bcm283x_mu.c
@@ -17,6 +17,7 @@
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
+#include <stdbool.h>
 #include <watchdog.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
diff --git a/drivers/serial/serial_bcm283x_pl011.c b/drivers/serial/serial_bcm283x_pl011.c
index efb6eb60b35..f2a35e4b4d0 100644
--- a/drivers/serial/serial_bcm283x_pl011.c
+++ b/drivers/serial/serial_bcm283x_pl011.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <stdbool.h>
 #include <asm/gpio.h>
 #include <dm/pinctrl.h>
 #include <dm/platform_data/serial_pl01x.h>
diff --git a/drivers/serial/serial_bcm6345.c b/drivers/serial/serial_bcm6345.c
index 309cbf63af9..a90bfc7f5ed 100644
--- a/drivers/serial/serial_bcm6345.c
+++ b/drivers/serial/serial_bcm6345.c
@@ -12,6 +12,7 @@
 #include <errno.h>
 #include <malloc.h>
 #include <serial.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <asm/types.h>
 #include <linux/errno.h>
diff --git a/drivers/serial/serial_cortina.c b/drivers/serial/serial_cortina.c
index c0beba19f58..001fca79f98 100644
--- a/drivers/serial/serial_cortina.c
+++ b/drivers/serial/serial_cortina.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
+#include <stdbool.h>
 #include <watchdog.h>
 #include <asm/io.h>
 #include <serial.h>
diff --git a/drivers/serial/serial_efi.c b/drivers/serial/serial_efi.c
index df3a0901024..4739c5a20e8 100644
--- a/drivers/serial/serial_efi.c
+++ b/drivers/serial/serial_efi.c
@@ -12,6 +12,7 @@
 #include <errno.h>
 #include <fdtdec.h>
 #include <log.h>
+#include <stdbool.h>
 #include <linux/compiler.h>
 #include <asm/io.h>
 #include <serial.h>
diff --git a/drivers/serial/serial_linflexuart.c b/drivers/serial/serial_linflexuart.c
index d9be526ffe2..b9b947a930a 100644
--- a/drivers/serial/serial_linflexuart.c
+++ b/drivers/serial/serial_linflexuart.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
+#include <stdbool.h>
 #include <watchdog.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/serial/serial_lpuart.c b/drivers/serial/serial_lpuart.c
index 1017981f97c..45ae154b633 100644
--- a/drivers/serial/serial_lpuart.c
+++ b/drivers/serial/serial_lpuart.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <fsl_lpuart.h>
 #include <log.h>
+#include <stdbool.h>
 #include <watchdog.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/serial/serial_mcf.c b/drivers/serial/serial_mcf.c
index 2d2f07e369b..f1670a0eddd 100644
--- a/drivers/serial/serial_mcf.c
+++ b/drivers/serial/serial_mcf.c
@@ -17,6 +17,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 #include <dm/platform_data/serial_coldfire.h>
 #include <serial.h>
diff --git a/drivers/serial/serial_meson.c b/drivers/serial/serial_meson.c
index 80141642af8..63875c626cd 100644
--- a/drivers/serial/serial_meson.c
+++ b/drivers/serial/serial_meson.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <fdtdec.h>
+#include <stdbool.h>
 #include <linux/bitops.h>
 #include <linux/compiler.h>
 #include <serial.h>
diff --git a/drivers/serial/serial_mpc8xx.c b/drivers/serial/serial_mpc8xx.c
index 0978930dcd4..ba87240d74c 100644
--- a/drivers/serial/serial_mpc8xx.c
+++ b/drivers/serial/serial_mpc8xx.c
@@ -8,6 +8,7 @@
 #include <command.h>
 #include <dm.h>
 #include <serial.h>
+#include <stdbool.h>
 #include <watchdog.h>
 #include <asm/cpm_8xx.h>
 #include <asm/global_data.h>
diff --git a/drivers/serial/serial_msm.c b/drivers/serial/serial_msm.c
index 0809f1ff8a9..a86563e8d8f 100644
--- a/drivers/serial/serial_msm.c
+++ b/drivers/serial/serial_msm.c
@@ -14,6 +14,7 @@
 #include <errno.h>
 #include <malloc.h>
 #include <serial.h>
+#include <stdbool.h>
 #include <watchdog.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/serial/serial_mtk.c b/drivers/serial/serial_mtk.c
index 74b5cc880c1..c028d760f2f 100644
--- a/drivers/serial/serial_mtk.c
+++ b/drivers/serial/serial_mtk.c
@@ -19,6 +19,7 @@
 #include <asm/types.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 
 struct mtk_serial_regs {
diff --git a/drivers/serial/serial_mvebu_a3700.c b/drivers/serial/serial_mvebu_a3700.c
index 7e4cd6c4b49..a5674e6b13b 100644
--- a/drivers/serial/serial_mvebu_a3700.c
+++ b/drivers/serial/serial_mvebu_a3700.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <dm.h>
 #include <serial.h>
+#include <stdbool.h>
 #include <asm/io.h>
 
 struct mvebu_platdata {
diff --git a/drivers/serial/serial_mxc.c b/drivers/serial/serial_mxc.c
index 1c08f3ec795..d13dbeb3cef 100644
--- a/drivers/serial/serial_mxc.c
+++ b/drivers/serial/serial_mxc.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
+#include <stdbool.h>
 #include <watchdog.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/clock.h>
diff --git a/drivers/serial/serial_nulldev.c b/drivers/serial/serial_nulldev.c
index c92ae698088..f7ce9f5b511 100644
--- a/drivers/serial/serial_nulldev.c
+++ b/drivers/serial/serial_nulldev.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <dm.h>
 #include <serial.h>
+#include <stdbool.h>
 #include <linux/errno.h>
 
 static int nulldev_serial_setbrg(struct udevice *dev, int baudrate)
diff --git a/drivers/serial/serial_owl.c b/drivers/serial/serial_owl.c
index d721e24e4bf..4ac5d78753b 100644
--- a/drivers/serial/serial_owl.c
+++ b/drivers/serial/serial_owl.c
@@ -12,6 +12,7 @@
 #include <errno.h>
 #include <fdtdec.h>
 #include <serial.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <asm/types.h>
 #include <linux/bitops.h>
diff --git a/drivers/serial/serial_pic32.c b/drivers/serial/serial_pic32.c
index 8e420fb764b..f1473d6cffa 100644
--- a/drivers/serial/serial_pic32.c
+++ b/drivers/serial/serial_pic32.c
@@ -12,6 +12,7 @@
 #include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <mach/pic32.h>
 #include <dt-bindings/clock/microchip,clock.h>
 
diff --git a/drivers/serial/serial_pl01x.c b/drivers/serial/serial_pl01x.c
index a472e8ca5de..1f4e54628fa 100644
--- a/drivers/serial/serial_pl01x.c
+++ b/drivers/serial/serial_pl01x.c
@@ -11,6 +11,7 @@
 /* Simple U-Boot driver for the PrimeCell PL010/PL011 UARTs */
 
 #include <common.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
 /* For get_bus_freq() */
diff --git a/drivers/serial/serial_pl01x_internal.h b/drivers/serial/serial_pl01x_internal.h
index c5c706b153e..a2d696e6c27 100644
--- a/drivers/serial/serial_pl01x_internal.h
+++ b/drivers/serial/serial_pl01x_internal.h
@@ -18,6 +18,7 @@
  * We can use a combined structure for PL010 and PL011, because they overlap
  * only in common registers.
  */
+#include <stdbool.h>
 struct pl01x_regs {
 	u32	dr;		/* 0x00 Data register */
 	u32	ecr;		/* 0x04 Error clear register (Write) */
diff --git a/drivers/serial/serial_pxa.c b/drivers/serial/serial_pxa.c
index e20f0c87540..459ce781712 100644
--- a/drivers/serial/serial_pxa.c
+++ b/drivers/serial/serial_pxa.c
@@ -21,6 +21,7 @@
 
 #include <common.h>
 #include <hang.h>
+#include <stdbool.h>
 #include <vsprintf.h>
 #include <asm/arch/pxa-regs.h>
 #include <asm/arch/regs-uart.h>
diff --git a/drivers/serial/serial_s5p.c b/drivers/serial/serial_s5p.c
index 1a939628a5a..0e800633452 100644
--- a/drivers/serial/serial_s5p.c
+++ b/drivers/serial/serial_s5p.c
@@ -11,6 +11,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <fdtdec.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 #include <linux/compiler.h>
 #include <asm/io.h>
diff --git a/drivers/serial/serial_sh.c b/drivers/serial/serial_sh.c
index e596c042ca6..e87f1d0ecfe 100644
--- a/drivers/serial/serial_sh.c
+++ b/drivers/serial/serial_sh.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <clk.h>
 #include <dm.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/processor.h>
diff --git a/drivers/serial/serial_sti_asc.c b/drivers/serial/serial_sti_asc.c
index 0cb53d7ae3f..d3d1b74478a 100644
--- a/drivers/serial/serial_sti_asc.c
+++ b/drivers/serial/serial_sti_asc.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <log.h>
 #include <serial.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
diff --git a/drivers/serial/serial_stm32.c b/drivers/serial/serial_stm32.c
index 5cd4c815cfd..c5d8d3f3dde 100644
--- a/drivers/serial/serial_stm32.c
+++ b/drivers/serial/serial_stm32.c
@@ -16,6 +16,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include "serial_stm32.h"
 #include <dm/device_compat.h>
 
diff --git a/drivers/serial/serial_stm32.h b/drivers/serial/serial_stm32.h
index 57376518880..0c541ead06e 100644
--- a/drivers/serial/serial_stm32.h
+++ b/drivers/serial/serial_stm32.h
@@ -7,6 +7,7 @@
 #ifndef _SERIAL_STM32_
 #define _SERIAL_STM32_
 
+#include <stdbool.h>
 #include <linux/bitops.h>
 #define CR1_OFFSET(x)	(x ? 0x0c : 0x00)
 #define CR3_OFFSET(x)	(x ? 0x14 : 0x08)
diff --git a/drivers/serial/serial_uniphier.c b/drivers/serial/serial_uniphier.c
index 4004cb8d48a..95d378ec28f 100644
--- a/drivers/serial/serial_uniphier.c
+++ b/drivers/serial/serial_uniphier.c
@@ -11,6 +11,7 @@
 #include <linux/bitops.h>
 #include <linux/bug.h>
 #include <linux/io.h>
+#include <linux/kernel.h>
 #include <linux/serial_reg.h>
 #include <linux/sizes.h>
 #include <linux/errno.h>
diff --git a/drivers/serial/serial_xuartlite.c b/drivers/serial/serial_xuartlite.c
index fd9e227557f..f91be0c220a 100644
--- a/drivers/serial/serial_xuartlite.c
+++ b/drivers/serial/serial_xuartlite.c
@@ -10,6 +10,7 @@
 #include <config.h>
 #include <common.h>
 #include <dm.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/compiler.h>
diff --git a/drivers/serial/usbtty.c b/drivers/serial/usbtty.c
index f0b64809560..4e2e09edd3f 100644
--- a/drivers/serial/usbtty.c
+++ b/drivers/serial/usbtty.c
@@ -14,6 +14,7 @@
 #include <serial.h>
 #include <stdio_dev.h>
 #include <asm/unaligned.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "usbtty.h"
 #include "usb_cdc_acm.h"
diff --git a/drivers/smem/msm_smem.c b/drivers/smem/msm_smem.c
index ba9d108173c..3a5ee3bbce0 100644
--- a/drivers/smem/msm_smem.c
+++ b/drivers/smem/msm_smem.c
@@ -20,6 +20,7 @@
 #include <linux/ioport.h>
 #include <linux/io.h>
 #include <smem.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/soc/soc-uclass.c b/drivers/soc/soc-uclass.c
index 29d586e0bcd..417a682e649 100644
--- a/drivers/soc/soc-uclass.c
+++ b/drivers/soc/soc-uclass.c
@@ -8,6 +8,7 @@
 #include <soc.h>
 #include <dm.h>
 #include <errno.h>
+#include <stdbool.h>
 #include <dm/lists.h>
 #include <dm/root.h>
 #include <linux/errno.h>
diff --git a/drivers/soc/ti/k3-navss-ringacc.c b/drivers/soc/ti/k3-navss-ringacc.c
index 21c4b3fe194..c9a8b1ed019 100644
--- a/drivers/soc/ti/k3-navss-ringacc.c
+++ b/drivers/soc/ti/k3-navss-ringacc.c
@@ -22,6 +22,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/soc/ti/k3-navss-ringacc.h>
 #include <linux/soc/ti/ti_sci_protocol.h>
diff --git a/drivers/soc/ti/keystone_serdes.c b/drivers/soc/ti/keystone_serdes.c
index c121fec52d4..68fa28a6f80 100644
--- a/drivers/soc/ti/keystone_serdes.c
+++ b/drivers/soc/ti/keystone_serdes.c
@@ -12,6 +12,7 @@
 #include <asm/ti-common/keystone_serdes.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #define SERDES_CMU_REGS(x)		(0x0000 + (0x0c00 * (x)))
 #define SERDES_LANE_REGS(x)		(0x0200 + (0x200 * (x)))
diff --git a/drivers/sound/da7219.c b/drivers/sound/da7219.c
index 41aa338b55f..e9d56b1f869 100644
--- a/drivers/sound/da7219.c
+++ b/drivers/sound/da7219.c
@@ -21,6 +21,7 @@
 #include <dt-bindings/sound/nhlt.h>
 #include <dm/acpi.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #define DA7219_ACPI_HID		"DLGS7219"
 
diff --git a/drivers/sound/max98088.c b/drivers/sound/max98088.c
index 6c2caf3f77f..d1d560ae6da 100644
--- a/drivers/sound/max98088.c
+++ b/drivers/sound/max98088.c
@@ -18,6 +18,7 @@
 #include <sound.h>
 #include <asm/gpio.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include "maxim_codec.h"
 #include "max98088.h"
 
diff --git a/drivers/sound/max98095.c b/drivers/sound/max98095.c
index db52ccdea3b..18632511499 100644
--- a/drivers/sound/max98095.c
+++ b/drivers/sound/max98095.c
@@ -17,6 +17,7 @@
 #include <sound.h>
 #include <asm/gpio.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include "i2s.h"
 #include "max98095.h"
 
diff --git a/drivers/sound/max98357a.c b/drivers/sound/max98357a.c
index 8fbcf80abcb..318dfe76e39 100644
--- a/drivers/sound/max98357a.c
+++ b/drivers/sound/max98357a.c
@@ -21,6 +21,7 @@
 #include <dt-bindings/sound/nhlt.h>
 #include <dm/acpi.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 struct max98357a_priv {
 	struct gpio_desc sdmode_gpio;
diff --git a/drivers/sound/rockchip_i2s.c b/drivers/sound/rockchip_i2s.c
index a20c8e78b88..37fb5a5d340 100644
--- a/drivers/sound/rockchip_i2s.c
+++ b/drivers/sound/rockchip_i2s.c
@@ -15,6 +15,7 @@
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 struct rk_i2s_regs {
 	u32 txcr;		/* I2S_TXCR, 0x00 */
diff --git a/drivers/sound/rt5677.c b/drivers/sound/rt5677.c
index bfe78ff6b4f..3eb99f31a4a 100644
--- a/drivers/sound/rt5677.c
+++ b/drivers/sound/rt5677.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include "rt5677.h"
 #include <log.h>
 
diff --git a/drivers/sound/sandbox.c b/drivers/sound/sandbox.c
index 1c30f06350f..b1c1fca004f 100644
--- a/drivers/sound/sandbox.c
+++ b/drivers/sound/sandbox.c
@@ -11,6 +11,7 @@
 #include <i2s.h>
 #include <log.h>
 #include <sound.h>
+#include <stdbool.h>
 #include <asm/sdl.h>
 #include <linux/errno.h>
 
diff --git a/drivers/sound/tegra_ahub.c b/drivers/sound/tegra_ahub.c
index cb27be0a7cb..345d9746f25 100644
--- a/drivers/sound/tegra_ahub.c
+++ b/drivers/sound/tegra_ahub.c
@@ -12,6 +12,7 @@
 #include <i2s.h>
 #include <log.h>
 #include <misc.h>
+#include <stdbool.h>
 #include <time.h>
 #include <asm/io.h>
 #include <asm/arch-tegra/tegra_ahub.h>
diff --git a/drivers/sound/wm8994.c b/drivers/sound/wm8994.c
index c37c787549d..e8ec0517d15 100644
--- a/drivers/sound/wm8994.c
+++ b/drivers/sound/wm8994.c
@@ -18,6 +18,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/sound.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include "wm8994.h"
 #include "wm8994_registers.h"
 
diff --git a/drivers/spi/atcspi200_spi.c b/drivers/spi/atcspi200_spi.c
index aed5f64eabb..ab60a47945d 100644
--- a/drivers/spi/atcspi200_spi.c
+++ b/drivers/spi/atcspi200_spi.c
@@ -16,6 +16,7 @@
 #include <asm/io.h>
 #include <dm.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/spi/atmel-quadspi.c b/drivers/spi/atmel-quadspi.c
index f270eea61e8..c69d7154cb5 100644
--- a/drivers/spi/atmel-quadspi.c
+++ b/drivers/spi/atmel-quadspi.c
@@ -24,6 +24,7 @@
 #include <linux/io.h>
 #include <linux/iopoll.h>
 #include <linux/ioport.h>
+#include <linux/kernel.h>
 #include <mach/clk.h>
 #include <spi.h>
 #include <spi-mem.h>
diff --git a/drivers/spi/atmel_spi.c b/drivers/spi/atmel_spi.c
index 1a95cfb9f65..5e4ae989c18 100644
--- a/drivers/spi/atmel_spi.c
+++ b/drivers/spi/atmel_spi.c
@@ -18,6 +18,7 @@
 #endif
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 
 /*
diff --git a/drivers/spi/bcm63xx_hsspi.c b/drivers/spi/bcm63xx_hsspi.c
index f45214fbda4..6e2c476d281 100644
--- a/drivers/spi/bcm63xx_hsspi.c
+++ b/drivers/spi/bcm63xx_hsspi.c
@@ -19,6 +19,7 @@
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #define HSSPI_PP			0
 
diff --git a/drivers/spi/bcmstb_spi.c b/drivers/spi/bcmstb_spi.c
index 539abcfd953..27ed0203add 100644
--- a/drivers/spi/bcmstb_spi.c
+++ b/drivers/spi/bcmstb_spi.c
@@ -5,6 +5,7 @@
  * Author: Thomas Fitzsimmons <fitzsim@fitzsim.org>
  */
 
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/spi/cadence_qspi.h b/drivers/spi/cadence_qspi.h
index ae459c74a19..0ecd461b79a 100644
--- a/drivers/spi/cadence_qspi.h
+++ b/drivers/spi/cadence_qspi.h
@@ -8,6 +8,7 @@
 #define __CADENCE_QSPI_H__
 
 #include <reset.h>
+#include <stdbool.h>
 
 #define CQSPI_IS_ADDR(cmd_len)		(cmd_len > 1 ? 1 : 0)
 
diff --git a/drivers/spi/cadence_qspi_apb.c b/drivers/spi/cadence_qspi_apb.c
index d97b299a93c..dc066f17e3d 100644
--- a/drivers/spi/cadence_qspi_apb.c
+++ b/drivers/spi/cadence_qspi_apb.c
@@ -38,6 +38,7 @@
 #include <spi.h>
 #include <spi-mem.h>
 #include <malloc.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "cadence_qspi.h"
 
diff --git a/drivers/spi/davinci_spi.c b/drivers/spi/davinci_spi.c
index 7058ba9acf5..4ea77a15051 100644
--- a/drivers/spi/davinci_spi.c
+++ b/drivers/spi/davinci_spi.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <spi.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/spi/designware_spi.c b/drivers/spi/designware_spi.c
index f6c63435147..a960c61f350 100644
--- a/drivers/spi/designware_spi.c
+++ b/drivers/spi/designware_spi.c
@@ -26,6 +26,7 @@
 #include <linux/errno.h>
 #include <linux/iopoll.h>
 #include <asm/io.h>
+#include <linux/kernel.h>
 
 /* Register offsets */
 #define DW_SPI_CTRL0			0x00
diff --git a/drivers/spi/exynos_spi.c b/drivers/spi/exynos_spi.c
index cec59208395..400269fa39d 100644
--- a/drivers/spi/exynos_spi.c
+++ b/drivers/spi/exynos_spi.c
@@ -22,6 +22,7 @@
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/spi/fsl_dspi.c b/drivers/spi/fsl_dspi.c
index 190b60b3c4f..b5f7d3e08a7 100644
--- a/drivers/spi/fsl_dspi.c
+++ b/drivers/spi/fsl_dspi.c
@@ -11,6 +11,7 @@
 
 #include <asm/global_data.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/math64.h>
 #include <common.h>
 #include <dm.h>
diff --git a/drivers/spi/fsl_espi.c b/drivers/spi/fsl_espi.c
index fb82228c92b..ec500d86184 100644
--- a/drivers/spi/fsl_espi.c
+++ b/drivers/spi/fsl_espi.c
@@ -15,6 +15,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include <malloc.h>
diff --git a/drivers/spi/fsl_qspi.c b/drivers/spi/fsl_qspi.c
index 195808c4066..314d3f89484 100644
--- a/drivers/spi/fsl_qspi.c
+++ b/drivers/spi/fsl_qspi.c
@@ -30,6 +30,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <linux/sizes.h>
 #include <linux/iopoll.h>
diff --git a/drivers/spi/ich.c b/drivers/spi/ich.c
index 51d283c5e6f..bf6cd061b53 100644
--- a/drivers/spi/ich.c
+++ b/drivers/spi/ich.c
@@ -30,6 +30,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <linux/string.h>
 
diff --git a/drivers/spi/kirkwood_spi.c b/drivers/spi/kirkwood_spi.c
index 3659e5e8ade..a127135323d 100644
--- a/drivers/spi/kirkwood_spi.c
+++ b/drivers/spi/kirkwood_spi.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <spi.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/soc.h>
diff --git a/drivers/spi/meson_spifc.c b/drivers/spi/meson_spifc.c
index 08b3859678f..f61bcd5e2de 100644
--- a/drivers/spi/meson_spifc.c
+++ b/drivers/spi/meson_spifc.c
@@ -18,6 +18,7 @@
 #include <linux/bitfield.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 /* register map */
diff --git a/drivers/spi/mpc8xxx_spi.c b/drivers/spi/mpc8xxx_spi.c
index eedb29216cb..f5ceeaac97d 100644
--- a/drivers/spi/mpc8xxx_spi.c
+++ b/drivers/spi/mpc8xxx_spi.c
@@ -19,6 +19,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 enum {
 	SPI_EV_NE = BIT(31 - 22),	/* Receiver Not Empty */
diff --git a/drivers/spi/mscc_bb_spi.c b/drivers/spi/mscc_bb_spi.c
index 0454410ee9b..0e6e1bf0143 100644
--- a/drivers/spi/mscc_bb_spi.c
+++ b/drivers/spi/mscc_bb_spi.c
@@ -12,6 +12,7 @@
 #include <malloc.h>
 #include <spi.h>
 #include <dm.h>
+#include <stdbool.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
diff --git a/drivers/spi/mt7621_spi.c b/drivers/spi/mt7621_spi.c
index 581a9bd44c4..f4b5ad89245 100644
--- a/drivers/spi/mt7621_spi.c
+++ b/drivers/spi/mt7621_spi.c
@@ -18,6 +18,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/io.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 
 #define MT7621_RX_FIFO_LEN	32
diff --git a/drivers/spi/mvebu_a3700_spi.c b/drivers/spi/mvebu_a3700_spi.c
index 502f5153cc4..f3e28d0ed69 100644
--- a/drivers/spi/mvebu_a3700_spi.c
+++ b/drivers/spi/mvebu_a3700_spi.c
@@ -16,6 +16,7 @@
 #include <asm/io.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/spi/mxc_spi.c b/drivers/spi/mxc_spi.c
index 00e3b596227..db1673fa57d 100644
--- a/drivers/spi/mxc_spi.c
+++ b/drivers/spi/mxc_spi.c
@@ -20,6 +20,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/clock.h>
 #include <asm/mach-imx/spi.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/spi/mxs_spi.c b/drivers/spi/mxs_spi.c
index 8c541dc03e6..abc7f014d7d 100644
--- a/drivers/spi/mxs_spi.c
+++ b/drivers/spi/mxs_spi.c
@@ -30,6 +30,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/mach-imx/dma.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #define	MXS_SPI_MAX_TIMEOUT	1000000
diff --git a/drivers/spi/pic32_spi.c b/drivers/spi/pic32_spi.c
index 222c30a1ebd..e1fc5257839 100644
--- a/drivers/spi/pic32_spi.c
+++ b/drivers/spi/pic32_spi.c
@@ -18,6 +18,7 @@
 #include <malloc.h>
 #include <spi.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #include <asm/types.h>
 #include <asm/io.h>
diff --git a/drivers/spi/pl022_spi.c b/drivers/spi/pl022_spi.c
index 236de5b54a3..5618ab21638 100644
--- a/drivers/spi/pl022_spi.c
+++ b/drivers/spi/pl022_spi.c
@@ -17,6 +17,7 @@
 #include <linux/errno.h>
 #include <linux/io.h>
 #include <spi.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 
 #define SSP_CR0		0x000
diff --git a/drivers/spi/renesas_rpc_spi.c b/drivers/spi/renesas_rpc_spi.c
index 9090667bf0f..95fcb5723f2 100644
--- a/drivers/spi/renesas_rpc_spi.c
+++ b/drivers/spi/renesas_rpc_spi.c
@@ -19,6 +19,7 @@
 #include <linux/errno.h>
 #include <spi.h>
 #include <wait_bit.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #define RPC_CMNCR		0x0000	/* R/W */
diff --git a/drivers/spi/rk_spi.c b/drivers/spi/rk_spi.c
index c5363c24190..ec998eda082 100644
--- a/drivers/spi/rk_spi.c
+++ b/drivers/spi/rk_spi.c
@@ -24,6 +24,7 @@
 #include <asm/arch-rockchip/clock.h>
 #include <asm/arch-rockchip/periph.h>
 #include <dm/pinctrl.h>
+#include <linux/kernel.h>
 #include "rk_spi.h"
 
 /* Change to 1 to output registers at the start of each transaction */
diff --git a/drivers/spi/sh_qspi.c b/drivers/spi/sh_qspi.c
index 49f3fdb6928..bf3a7bf919c 100644
--- a/drivers/spi/sh_qspi.c
+++ b/drivers/spi/sh_qspi.c
@@ -15,6 +15,7 @@
 #include <asm/arch/rmobile.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 
 /* SH QSPI register bit masks <REG>_<BIT> */
 #define SPCR_MSTR	0x08
diff --git a/drivers/spi/spi-mem-nodm.c b/drivers/spi/spi-mem-nodm.c
index 42a6126dd7b..6cc908dcdf8 100644
--- a/drivers/spi/spi-mem-nodm.c
+++ b/drivers/spi/spi-mem-nodm.c
@@ -8,6 +8,7 @@
 #include <spi.h>
 #include <spi-mem.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 int spi_mem_exec_op(struct spi_slave *slave,
diff --git a/drivers/spi/spi-mem.c b/drivers/spi/spi-mem.c
index 5580b34f34f..4081a50eaaf 100644
--- a/drivers/spi/spi-mem.c
+++ b/drivers/spi/spi-mem.c
@@ -17,6 +17,7 @@
 #include <spi.h>
 #include <spi-mem.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #endif
 
diff --git a/drivers/spi/spi-sifive.c b/drivers/spi/spi-sifive.c
index bfc02ec1dc3..cf94407759e 100644
--- a/drivers/spi/spi-sifive.c
+++ b/drivers/spi/spi-sifive.c
@@ -16,6 +16,7 @@
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/log2.h>
 #include <clk.h>
 #include <linux/string.h>
diff --git a/drivers/spi/spi-sunxi.c b/drivers/spi/spi-sunxi.c
index c19a24a1c64..80c406d7b36 100644
--- a/drivers/spi/spi-sunxi.c
+++ b/drivers/spi/spi-sunxi.c
@@ -32,6 +32,7 @@
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #include <asm/bitops.h>
 #include <asm/gpio.h>
diff --git a/drivers/spi/spi-uclass.c b/drivers/spi/spi-uclass.c
index c59ae3ff9b3..6d397f2ebd2 100644
--- a/drivers/spi/spi-uclass.c
+++ b/drivers/spi/spi-uclass.c
@@ -16,6 +16,7 @@
 #include <dm/lists.h>
 #include <dm/util.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/spi/stm32_qspi.c b/drivers/spi/stm32_qspi.c
index 34bfd99bead..e18e599e3b0 100644
--- a/drivers/spi/stm32_qspi.c
+++ b/drivers/spi/stm32_qspi.c
@@ -18,6 +18,7 @@
 #include <linux/errno.h>
 #include <linux/iopoll.h>
 #include <linux/ioport.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/sizes.h>
 
diff --git a/drivers/spi/stm32_spi.c b/drivers/spi/stm32_spi.c
index d37404f0c8c..635ead98dbd 100644
--- a/drivers/spi/stm32_spi.c
+++ b/drivers/spi/stm32_spi.c
@@ -16,6 +16,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 
 #include <asm/io.h>
diff --git a/drivers/spi/uniphier_spi.c b/drivers/spi/uniphier_spi.c
index 742554a09ab..22cf974a905 100644
--- a/drivers/spi/uniphier_spi.c
+++ b/drivers/spi/uniphier_spi.c
@@ -18,6 +18,7 @@
 #include <linux/io.h>
 #include <spi.h>
 #include <wait_bit.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/spi/zynqmp_gqspi.c b/drivers/spi/zynqmp_gqspi.c
index 1386dc86ed6..de988f4e975 100644
--- a/drivers/spi/zynqmp_gqspi.c
+++ b/drivers/spi/zynqmp_gqspi.c
@@ -24,6 +24,7 @@
 #include <linux/bitops.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #define GQSPI_GFIFO_STRT_MODE_MASK	BIT(29)
diff --git a/drivers/spmi/spmi-msm.c b/drivers/spmi/spmi-msm.c
index d06fc34c697..9212449a7ee 100644
--- a/drivers/spmi/spmi-msm.c
+++ b/drivers/spmi/spmi-msm.c
@@ -11,6 +11,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <fdtdec.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/spmi/spmi-sandbox.c b/drivers/spmi/spmi-sandbox.c
index f1e0d691503..e2f6fc17e71 100644
--- a/drivers/spmi/spmi-sandbox.c
+++ b/drivers/spmi/spmi-sandbox.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
+#include <stdbool.h>
 #include <linux/errno.h>
 #include <spmi/spmi.h>
 #include <asm/gpio.h>
diff --git a/drivers/sysreset/sysreset_mpc83xx.c b/drivers/sysreset/sysreset_mpc83xx.c
index f2b2fc89c61..0027efd4864 100644
--- a/drivers/sysreset/sysreset_mpc83xx.c
+++ b/drivers/sysreset/sysreset_mpc83xx.c
@@ -15,6 +15,7 @@
 #include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #include "sysreset_mpc83xx.h"
 
diff --git a/drivers/tee/broadcom/chimp_optee.c b/drivers/tee/broadcom/chimp_optee.c
index a92fd9c9562..545bb3fe222 100644
--- a/drivers/tee/broadcom/chimp_optee.c
+++ b/drivers/tee/broadcom/chimp_optee.c
@@ -8,6 +8,7 @@
 #include <tee.h>
 #include <broadcom/chimp.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #ifdef CONFIG_CHIMP_OPTEE
 
diff --git a/drivers/tee/optee/core.c b/drivers/tee/optee/core.c
index c1460999cbe..fb656bed92f 100644
--- a/drivers/tee/optee/core.c
+++ b/drivers/tee/optee/core.c
@@ -12,6 +12,7 @@
 #include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/io.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include "optee_smc.h"
diff --git a/drivers/tee/optee/optee_smc.h b/drivers/tee/optee/optee_smc.h
index 4d643b2599d..ba8a43d5c09 100644
--- a/drivers/tee/optee/optee_smc.h
+++ b/drivers/tee/optee/optee_smc.h
@@ -6,6 +6,7 @@
 #ifndef OPTEE_SMC_H
 #define OPTEE_SMC_H
 
+#include <stdbool.h>
 #include <linux/arm-smccc.h>
 #include <linux/bitops.h>
 
diff --git a/drivers/tee/optee/rpmb.c b/drivers/tee/optee/rpmb.c
index 0804fc963cf..a9ea53854fc 100644
--- a/drivers/tee/optee/rpmb.c
+++ b/drivers/tee/optee/rpmb.c
@@ -9,6 +9,7 @@
 #include <tee.h>
 #include <mmc.h>
 #include <dm/device_compat.h>
+#include <linux/kernel.h>
 
 #include "optee_msg.h"
 #include "optee_private.h"
diff --git a/drivers/tee/sandbox.c b/drivers/tee/sandbox.c
index 14df3ce0130..3a5d106f956 100644
--- a/drivers/tee/sandbox.c
+++ b/drivers/tee/sandbox.c
@@ -8,6 +8,7 @@
 #include <stdio.h>
 #include <tee.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <tee/optee_ta_avb.h>
 
diff --git a/drivers/tee/tee-uclass.c b/drivers/tee/tee-uclass.c
index f42cc1becb8..1dc806db89b 100644
--- a/drivers/tee/tee-uclass.c
+++ b/drivers/tee/tee-uclass.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <tee.h>
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
diff --git a/drivers/thermal/imx_scu_thermal.c b/drivers/thermal/imx_scu_thermal.c
index 17c92ae0635..6b822f18854 100644
--- a/drivers/thermal/imx_scu_thermal.c
+++ b/drivers/thermal/imx_scu_thermal.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <thermal.h>
 #include <asm/global_data.h>
diff --git a/drivers/thermal/imx_tmu.c b/drivers/thermal/imx_tmu.c
index 279ea5a322e..8a67d9aa58c 100644
--- a/drivers/thermal/imx_tmu.c
+++ b/drivers/thermal/imx_tmu.c
@@ -6,6 +6,7 @@
 
 #include <config.h>
 #include <common.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/timer/sandbox_timer.c b/drivers/timer/sandbox_timer.c
index 2120b02d444..fd047248530 100644
--- a/drivers/timer/sandbox_timer.c
+++ b/drivers/timer/sandbox_timer.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <errno.h>
 #include <time.h>
diff --git a/drivers/timer/timer-uclass.c b/drivers/timer/timer-uclass.c
index 01b3a42f3e0..7dea5b32637 100644
--- a/drivers/timer/timer-uclass.c
+++ b/drivers/timer/timer-uclass.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <init.h>
 #include <asm/global_data.h>
diff --git a/drivers/timer/tsc_timer.c b/drivers/timer/tsc_timer.c
index 78dd3559173..e3cb7e4fe7e 100644
--- a/drivers/timer/tsc_timer.c
+++ b/drivers/timer/tsc_timer.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <bootstage.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
 #include <malloc.h>
@@ -23,6 +24,7 @@
 #include <asm/u-boot-x86.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 
 #define MAX_NUM_FREQS	9
 
diff --git a/drivers/tpm/cr50_i2c.c b/drivers/tpm/cr50_i2c.c
index 9ba0466f929..6fbde9f2553 100644
--- a/drivers/tpm/cr50_i2c.c
+++ b/drivers/tpm/cr50_i2c.c
@@ -23,6 +23,7 @@
 #include <asm/arch/pm.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 enum {
diff --git a/drivers/tpm/tpm2_tis_sandbox.c b/drivers/tpm/tpm2_tis_sandbox.c
index 6b61dbb88b5..f9d1205d321 100644
--- a/drivers/tpm/tpm2_tis_sandbox.c
+++ b/drivers/tpm/tpm2_tis_sandbox.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <tpm-v2.h>
 #include <vsprintf.h>
diff --git a/drivers/tpm/tpm2_tis_spi.c b/drivers/tpm/tpm2_tis_spi.c
index 6303187180f..48b59f8c36f 100644
--- a/drivers/tpm/tpm2_tis_spi.c
+++ b/drivers/tpm/tpm2_tis_spi.c
@@ -26,6 +26,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/compiler.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/types.h>
 #include <linux/unaligned/be_byteshift.h>
diff --git a/drivers/tpm/tpm_tis_lpc.c b/drivers/tpm/tpm_tis_lpc.c
index e6eec6bca9e..9b81ec98aa8 100644
--- a/drivers/tpm/tpm_tis_lpc.c
+++ b/drivers/tpm/tpm_tis_lpc.c
@@ -22,6 +22,7 @@
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #define PREFIX "lpc_tpm: "
diff --git a/drivers/tpm/tpm_tis_sandbox.c b/drivers/tpm/tpm_tis_sandbox.c
index da31ec3ff56..433b21d49e7 100644
--- a/drivers/tpm/tpm_tis_sandbox.c
+++ b/drivers/tpm/tpm_tis_sandbox.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <display_options.h>
 #include <dm.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <tpm-v1.h>
 #include <vsprintf.h>
diff --git a/drivers/tpm/tpm_tis_st33zp24_i2c.c b/drivers/tpm/tpm_tis_st33zp24_i2c.c
index b5c706b7ccf..2759c86e182 100644
--- a/drivers/tpm/tpm_tis_st33zp24_i2c.c
+++ b/drivers/tpm/tpm_tis_st33zp24_i2c.c
@@ -23,6 +23,7 @@
 #include <vsprintf.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/types.h>
 #include <asm/unaligned.h>
diff --git a/drivers/tpm/tpm_tis_st33zp24_spi.c b/drivers/tpm/tpm_tis_st33zp24_spi.c
index 33f7392431f..c1da351ae49 100644
--- a/drivers/tpm/tpm_tis_st33zp24_spi.c
+++ b/drivers/tpm/tpm_tis_st33zp24_spi.c
@@ -23,6 +23,7 @@
 #include <vsprintf.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/types.h>
 #include <asm/unaligned.h>
diff --git a/drivers/ufs/ufs.c b/drivers/ufs/ufs.c
index 9f4b4555269..17c223ed76b 100644
--- a/drivers/ufs/ufs.c
+++ b/drivers/ufs/ufs.c
@@ -24,6 +24,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include <linux/dma-mapping.h>
diff --git a/drivers/ufs/ufs.h b/drivers/ufs/ufs.h
index e0bde937768..89fa47eddef 100644
--- a/drivers/ufs/ufs.h
+++ b/drivers/ufs/ufs.h
@@ -2,6 +2,7 @@
 #ifndef __UFS_H
 #define __UFS_H
 
+#include <stdbool.h>
 #include <asm/io.h>
 #include <dm.h>
 
diff --git a/drivers/usb/cdns3/cdns3-ti.c b/drivers/usb/cdns3/cdns3-ti.c
index 5130b4c70d2..370856c9bfe 100644
--- a/drivers/usb/cdns3/cdns3-ti.c
+++ b/drivers/usb/cdns3/cdns3-ti.c
@@ -13,6 +13,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/io.h>
+#include <linux/kernel.h>
 #include <linux/usb/otg.h>
 #include <malloc.h>
 
diff --git a/drivers/usb/cdns3/core.h b/drivers/usb/cdns3/core.h
index 0668d646fc4..70cc3866643 100644
--- a/drivers/usb/cdns3/core.h
+++ b/drivers/usb/cdns3/core.h
@@ -8,6 +8,7 @@
  * Authors: Peter Chen <peter.chen@nxp.com>
  *          Pawel Laszczak <pawell@cadence.com>
  */
+#include <stdbool.h>
 #include <linux/compiler.h>
 #include <linux/types.h>
 #include <linux/usb/otg.h>
diff --git a/drivers/usb/cdns3/ep0.c b/drivers/usb/cdns3/ep0.c
index 7be5c8de4e2..f41d4a162cc 100644
--- a/drivers/usb/cdns3/ep0.c
+++ b/drivers/usb/cdns3/ep0.c
@@ -17,6 +17,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/usb/composite.h>
 #include <linux/iopoll.h>
 
diff --git a/drivers/usb/cdns3/gadget.c b/drivers/usb/cdns3/gadget.c
index e42b82d0c2b..a04e5fd6101 100644
--- a/drivers/usb/cdns3/gadget.c
+++ b/drivers/usb/cdns3/gadget.c
@@ -64,6 +64,7 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include <linux/usb/gadget.h>
diff --git a/drivers/usb/cdns3/gadget.h b/drivers/usb/cdns3/gadget.h
index 8803fa48bd3..42216fdc259 100644
--- a/drivers/usb/cdns3/gadget.h
+++ b/drivers/usb/cdns3/gadget.h
@@ -12,6 +12,7 @@
 #ifndef __LINUX_CDNS3_GADGET
 #define __LINUX_CDNS3_GADGET
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 #include <linux/usb/gadget.h>
 
 /*
diff --git a/drivers/usb/common/common.c b/drivers/usb/common/common.c
index 5a8d24da821..7ac83b6dece 100644
--- a/drivers/usb/common/common.c
+++ b/drivers/usb/common/common.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <dm.h>
 #include <asm/global_data.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include <linux/usb/otg.h>
diff --git a/drivers/usb/common/fsl-dt-fixup.c b/drivers/usb/common/fsl-dt-fixup.c
index a279c28bdad..0299e5adb0c 100644
--- a/drivers/usb/common/fsl-dt-fixup.c
+++ b/drivers/usb/common/fsl-dt-fixup.c
@@ -19,6 +19,7 @@
 #include <fdt_support.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #ifndef CONFIG_USB_MAX_CONTROLLER_COUNT
diff --git a/drivers/usb/common/fsl-errata.c b/drivers/usb/common/fsl-errata.c
index 297a05baf3e..ad20ef34059 100644
--- a/drivers/usb/common/fsl-errata.c
+++ b/drivers/usb/common/fsl-errata.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <hwconfig.h>
 #include <fsl_errata.h>
+#include <stdbool.h>
 #include <asm/u-boot.h>
 #include<fsl_usb.h>
 #if defined(CONFIG_FSL_LSCH2) || defined(CONFIG_FSL_LSCH3) || \
diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
index f79f9c93166..9889a6c9e81 100644
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -27,6 +27,7 @@
 #include <linux/ioport.h>
 #include <dm.h>
 #include <generic-phy.h>
+#include <linux/kernel.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
 
diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
index fa338119de6..e4c6042bee8 100644
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@ -24,6 +24,7 @@
 #include <linux/delay.h>
 #include <linux/dma-mapping.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/list.h>
 #include <linux/printk.h>
 #include <linux/string.h>
diff --git a/drivers/usb/dwc3/gadget.h b/drivers/usb/dwc3/gadget.h
index 7806ce59a27..2f2eb18b99f 100644
--- a/drivers/usb/dwc3/gadget.h
+++ b/drivers/usb/dwc3/gadget.h
@@ -18,6 +18,7 @@
 #ifndef __DRIVERS_USB_DWC3_GADGET_H
 #define __DRIVERS_USB_DWC3_GADGET_H
 
+#include <linux/kernel.h>
 #include <linux/list.h>
 #include <linux/usb/gadget.h>
 #include "io.h"
diff --git a/drivers/usb/dwc3/io.h b/drivers/usb/dwc3/io.h
index 2407f826c16..f5268d752c3 100644
--- a/drivers/usb/dwc3/io.h
+++ b/drivers/usb/dwc3/io.h
@@ -19,6 +19,7 @@
 
 #include <cpu_func.h>
 #include <asm/io.h>
+#include <linux/kernel.h>
 
 #define	CACHELINE_SIZE		CONFIG_SYS_CACHELINE_SIZE
 static inline u32 dwc3_readl(void __iomem *base, u32 offset)
diff --git a/drivers/usb/emul/sandbox_flash.c b/drivers/usb/emul/sandbox_flash.c
index e63720f2550..f7090195c14 100644
--- a/drivers/usb/emul/sandbox_flash.c
+++ b/drivers/usb/emul/sandbox_flash.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <os.h>
 #include <scsi.h>
+#include <stdbool.h>
 #include <usb.h>
 #include <linux/errno.h>
 #include <linux/string.h>
diff --git a/drivers/usb/emul/sandbox_keyb.c b/drivers/usb/emul/sandbox_keyb.c
index 1c8de6d37fe..68e5f12f35d 100644
--- a/drivers/usb/emul/sandbox_keyb.c
+++ b/drivers/usb/emul/sandbox_keyb.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <os.h>
 #include <scsi.h>
+#include <stdbool.h>
 #include <usb.h>
 #include <linux/errno.h>
 #include <linux/string.h>
diff --git a/drivers/usb/emul/usb-emul-uclass.c b/drivers/usb/emul/usb-emul-uclass.c
index 6b309592f6b..8d24556c2c4 100644
--- a/drivers/usb/emul/usb-emul-uclass.c
+++ b/drivers/usb/emul/usb-emul-uclass.c
@@ -10,6 +10,7 @@
 #include <usb.h>
 #include <dm/device-internal.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 static int copy_to_unicode(char *buff, int length, const char *str)
diff --git a/drivers/usb/eth/lan7x.c b/drivers/usb/eth/lan7x.c
index c3c1ebb1cb6..503d36c8d9f 100644
--- a/drivers/usb/eth/lan7x.c
+++ b/drivers/usb/eth/lan7x.c
@@ -14,6 +14,7 @@
 #include <vsprintf.h>
 #include <linux/errno.h>
 #include <linux/ethtool.h>
+#include <linux/kernel.h>
 #include <linux/mii.h>
 #include <linux/string.h>
 #include "usb_ether.h"
diff --git a/drivers/usb/eth/lan7x.h b/drivers/usb/eth/lan7x.h
index feec7427a41..57c8293a895 100644
--- a/drivers/usb/eth/lan7x.h
+++ b/drivers/usb/eth/lan7x.h
@@ -4,6 +4,7 @@
  */
 
 #include <console.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <watchdog.h>
diff --git a/drivers/usb/eth/mcs7830.c b/drivers/usb/eth/mcs7830.c
index 02a241414ff..f223d96559f 100644
--- a/drivers/usb/eth/mcs7830.c
+++ b/drivers/usb/eth/mcs7830.c
@@ -18,6 +18,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/mii.h>
 #include <malloc.h>
 #include <memalign.h>
diff --git a/drivers/usb/eth/r8152.c b/drivers/usb/eth/r8152.c
index da0b285077a..f7c46fbc25f 100644
--- a/drivers/usb/eth/r8152.c
+++ b/drivers/usb/eth/r8152.c
@@ -17,6 +17,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/mii.h>
 #include <linux/bitops.h>
 #include <linux/string.h>
diff --git a/drivers/usb/eth/r8152.h b/drivers/usb/eth/r8152.h
index 10e0da8eb10..378eb8c8124 100644
--- a/drivers/usb/eth/r8152.h
+++ b/drivers/usb/eth/r8152.h
@@ -8,6 +8,7 @@
 #define _RTL8152_ETH_H
 
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 #define R8152_BASE_NAME		"r8152"
 
 #define PLA_IDR			0xc000
diff --git a/drivers/usb/eth/r8152_fw.c b/drivers/usb/eth/r8152_fw.c
index 7e9b13de044..2211dc9489e 100644
--- a/drivers/usb/eth/r8152_fw.c
+++ b/drivers/usb/eth/r8152_fw.c
@@ -9,6 +9,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include "usb_ether.h"
 #include "r8152.h"
 
diff --git a/drivers/usb/eth/smsc95xx.c b/drivers/usb/eth/smsc95xx.c
index 435224c7197..48216025448 100644
--- a/drivers/usb/eth/smsc95xx.c
+++ b/drivers/usb/eth/smsc95xx.c
@@ -21,6 +21,7 @@
 #include <asm/unaligned.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/mii.h>
 #include <linux/string.h>
 #include "usb_ether.h"
diff --git a/drivers/usb/eth/usb_ether.c b/drivers/usb/eth/usb_ether.c
index 54bb0118228..ce86d2cd255 100644
--- a/drivers/usb/eth/usb_ether.c
+++ b/drivers/usb/eth/usb_ether.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <net.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <usb.h>
 #include <asm/cache.h>
diff --git a/drivers/usb/gadget/at91_udc.c b/drivers/usb/gadget/at91_udc.c
index 64682355daa..e5a8872f715 100644
--- a/drivers/usb/gadget/at91_udc.c
+++ b/drivers/usb/gadget/at91_udc.c
@@ -22,6 +22,7 @@
 #include <asm/io.h>
 #include <asm/gpio.h>
 #include <asm/hardware.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include <mach/at91_matrix.h>
diff --git a/drivers/usb/gadget/at91_udc.h b/drivers/usb/gadget/at91_udc.h
index 668b8c4a7c6..2b2e73420ad 100644
--- a/drivers/usb/gadget/at91_udc.h
+++ b/drivers/usb/gadget/at91_udc.h
@@ -13,6 +13,7 @@
  * Based on AT91RM9200 datasheet revision E.
  */
 
+#include <linux/kernel.h>
 #define AT91_UDP_FRM_NUM	0x00		/* Frame Number Register */
 #define     AT91_UDP_NUM	(0x7ff <<  0)	/* Frame Number */
 #define     AT91_UDP_FRM_ERR	(1     << 16)	/* Frame Error */
diff --git a/drivers/usb/gadget/atmel_usba_udc.c b/drivers/usb/gadget/atmel_usba_udc.c
index a586e16347d..03bbe1edb62 100644
--- a/drivers/usb/gadget/atmel_usba_udc.c
+++ b/drivers/usb/gadget/atmel_usba_udc.c
@@ -8,6 +8,7 @@
  */
 
 #include <common.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
diff --git a/drivers/usb/gadget/atmel_usba_udc.h b/drivers/usb/gadget/atmel_usba_udc.h
index f6cb48c1cff..b0692e27954 100644
--- a/drivers/usb/gadget/atmel_usba_udc.h
+++ b/drivers/usb/gadget/atmel_usba_udc.h
@@ -11,6 +11,7 @@
 #define __LINUX_USB_GADGET_USBA_UDC_H__
 
 /* USB register offsets */
+#include <linux/kernel.h>
 #define USBA_CTRL				0x0000
 #define USBA_FNUM				0x0004
 #define USBA_INT_ENB				0x0010
diff --git a/drivers/usb/gadget/ci_udc.c b/drivers/usb/gadget/ci_udc.c
index e119fd6a033..5f92c484b93 100644
--- a/drivers/usb/gadget/ci_udc.c
+++ b/drivers/usb/gadget/ci_udc.c
@@ -20,6 +20,7 @@
 #include <linux/errno.h>
 #include <asm/io.h>
 #include <asm/unaligned.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/types.h>
 #include <linux/usb/ch9.h>
diff --git a/drivers/usb/gadget/ci_udc.h b/drivers/usb/gadget/ci_udc.h
index 95cc07992b4..c5ef74d74f8 100644
--- a/drivers/usb/gadget/ci_udc.h
+++ b/drivers/usb/gadget/ci_udc.h
@@ -6,6 +6,7 @@
 #ifndef __GADGET__CI_UDC_H__
 #define __GADGET__CI_UDC_H__
 
+#include <stdbool.h>
 #define NUM_ENDPOINTS		6
 
 #ifdef CONFIG_CI_UDC_HAS_HOSTPC
diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
index d5b3d1d40e4..30c26a64105 100644
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@ -12,6 +12,7 @@
 #include <linux/bitops.h>
 #include <linux/bug.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/usb/composite.h>
 
diff --git a/drivers/usb/gadget/designware_udc.c b/drivers/usb/gadget/designware_udc.c
index d4b94a7cfce..82d07349e47 100644
--- a/drivers/usb/gadget/designware_udc.c
+++ b/drivers/usb/gadget/designware_udc.c
@@ -11,6 +11,7 @@
 #include <serial.h>
 #include <asm/io.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include <env.h>
diff --git a/drivers/usb/gadget/dwc2_udc_otg.c b/drivers/usb/gadget/dwc2_udc_otg.c
index 867f31be7b4..04a6b7129bb 100644
--- a/drivers/usb/gadget/dwc2_udc_otg.c
+++ b/drivers/usb/gadget/dwc2_udc_otg.c
@@ -29,6 +29,7 @@
 #include <dm/devres.h>
 #include <linux/bug.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c b/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c
index 6b6fe0a5040..ceb3a09840d 100644
--- a/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c
+++ b/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c
@@ -23,6 +23,7 @@
 #include <stdio.h>
 #include <linux/bug.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 static u8 clear_feature_num;
diff --git a/drivers/usb/gadget/ep0.c b/drivers/usb/gadget/ep0.c
index 6fabee24ce9..7b1bc4e38db 100644
--- a/drivers/usb/gadget/ep0.c
+++ b/drivers/usb/gadget/ep0.c
@@ -39,6 +39,7 @@
 #include <common.h>
 #include <serial.h>
 #include <usbdevice.h>
+#include <linux/kernel.h>
 
 #if 0
 #define dbg_ep0(lvl,fmt,args...) serial_printf("[%s] %s:%d: "fmt"\n",__FILE__,__FUNCTION__,__LINE__,##args)
diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c
index d6089258476..8a85f00c9d3 100644
--- a/drivers/usb/gadget/ether.c
+++ b/drivers/usb/gadget/ether.c
@@ -17,6 +17,7 @@
 #include <vsprintf.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/netdevice.h>
 #include <linux/printk.h>
 #include <linux/string.h>
diff --git a/drivers/usb/gadget/f_dfu.c b/drivers/usb/gadget/f_dfu.c
index a1f13b6ec22..281c0f29f2a 100644
--- a/drivers/usb/gadget/f_dfu.c
+++ b/drivers/usb/gadget/f_dfu.c
@@ -21,6 +21,7 @@
 #include <malloc.h>
 #include <stdio.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include <linux/usb/ch9.h>
diff --git a/drivers/usb/gadget/f_fastboot.c b/drivers/usb/gadget/f_fastboot.c
index 40648ef38bd..1e17b8df3fa 100644
--- a/drivers/usb/gadget/f_fastboot.c
+++ b/drivers/usb/gadget/f_fastboot.c
@@ -19,6 +19,7 @@
 #include <malloc.h>
 #include <stdio.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include <linux/usb/ch9.h>
diff --git a/drivers/usb/gadget/f_mass_storage.c b/drivers/usb/gadget/f_mass_storage.c
index e0b898db214..12ca77299f6 100644
--- a/drivers/usb/gadget/f_mass_storage.c
+++ b/drivers/usb/gadget/f_mass_storage.c
@@ -251,6 +251,7 @@
 #include <dm/devres.h>
 #include <linux/bug.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include <linux/err.h>
diff --git a/drivers/usb/gadget/f_rockusb.c b/drivers/usb/gadget/f_rockusb.c
index a852707525a..e6aa089aa77 100644
--- a/drivers/usb/gadget/f_rockusb.c
+++ b/drivers/usb/gadget/f_rockusb.c
@@ -15,6 +15,7 @@
 #include <part.h>
 #include <stdio.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
diff --git a/drivers/usb/gadget/f_sdp.c b/drivers/usb/gadget/f_sdp.c
index fde5c2c690e..5eb6474072c 100644
--- a/drivers/usb/gadget/f_sdp.c
+++ b/drivers/usb/gadget/f_sdp.c
@@ -24,6 +24,7 @@
 #include <malloc.h>
 #include <stdio.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/usb/gadget/f_thor.c b/drivers/usb/gadget/f_thor.c
index 4a70bdcc5c3..667f1e19c36 100644
--- a/drivers/usb/gadget/f_thor.c
+++ b/drivers/usb/gadget/f_thor.c
@@ -27,6 +27,7 @@
 #include <vsprintf.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include <linux/usb/ch9.h>
diff --git a/drivers/usb/gadget/fotg210.c b/drivers/usb/gadget/fotg210.c
index ff9e98a7566..66952aab4fb 100644
--- a/drivers/usb/gadget/fotg210.c
+++ b/drivers/usb/gadget/fotg210.c
@@ -18,6 +18,7 @@
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/types.h>
 #include <linux/usb/ch9.h>
diff --git a/drivers/usb/gadget/g_dnl.c b/drivers/usb/gadget/g_dnl.c
index 1a0160b5836..9397f915a44 100644
--- a/drivers/usb/gadget/g_dnl.c
+++ b/drivers/usb/gadget/g_dnl.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <linux/errno.h>
 #include <linux/string.h>
diff --git a/drivers/usb/gadget/pxa25x_udc.c b/drivers/usb/gadget/pxa25x_udc.c
index 3e35e0fa45f..71c918a64e4 100644
--- a/drivers/usb/gadget/pxa25x_udc.c
+++ b/drivers/usb/gadget/pxa25x_udc.c
@@ -33,6 +33,7 @@
 #include <asm/arch/pxa.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include <linux/usb/ch9.h>
diff --git a/drivers/usb/gadget/pxa27x_udc.c b/drivers/usb/gadget/pxa27x_udc.c
index 7c67c2e3b3e..03a067888e4 100644
--- a/drivers/usb/gadget/pxa27x_udc.c
+++ b/drivers/usb/gadget/pxa27x_udc.c
@@ -15,6 +15,7 @@
 #include <asm/io.h>
 #include <usbdevice.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <usb/pxa27x_udc.h>
 #include <usb/udc.h>
 
diff --git a/drivers/usb/gadget/rndis.c b/drivers/usb/gadget/rndis.c
index 92c01adb75d..78f4b345e73 100644
--- a/drivers/usb/gadget/rndis.c
+++ b/drivers/usb/gadget/rndis.c
@@ -22,6 +22,7 @@
 #include <log.h>
 #include <net.h>
 #include <malloc.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/types.h>
 #include <linux/list.h>
diff --git a/drivers/usb/gadget/udc/udc-core.c b/drivers/usb/gadget/udc/udc-core.c
index 74d66fd77b2..1e428b3c5e5 100644
--- a/drivers/usb/gadget/udc/udc-core.c
+++ b/drivers/usb/gadget/udc/udc-core.c
@@ -24,6 +24,7 @@
 #include <dm.h>
 #include <dm/device-internal.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
 
diff --git a/drivers/usb/gadget/udc/udc-uclass.c b/drivers/usb/gadget/udc/udc-uclass.c
index 7fa4aae4d2b..c27271905fa 100644
--- a/drivers/usb/gadget/udc/udc-uclass.c
+++ b/drivers/usb/gadget/udc/udc-uclass.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <dm/device-internal.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/usb/gadget.h>
 
diff --git a/drivers/usb/gadget/usbstring.c b/drivers/usb/gadget/usbstring.c
index 2870052fec3..1a5917e0cc5 100644
--- a/drivers/usb/gadget/usbstring.c
+++ b/drivers/usb/gadget/usbstring.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
diff --git a/drivers/usb/host/dwc2.c b/drivers/usb/host/dwc2.c
index b8c92f52b2f..1095df170c7 100644
--- a/drivers/usb/host/dwc2.c
+++ b/drivers/usb/host/dwc2.c
@@ -24,6 +24,7 @@
 #include <dm/device_compat.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <power/regulator.h>
 #include <reset.h>
diff --git a/drivers/usb/host/dwc3-sti-glue.c b/drivers/usb/host/dwc3-sti-glue.c
index 779fd25880c..ceaf2aa2473 100644
--- a/drivers/usb/host/dwc3-sti-glue.c
+++ b/drivers/usb/host/dwc3-sti-glue.c
@@ -18,6 +18,7 @@
 #include <syscon.h>
 #include <usb.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 
 #include <linux/usb/dwc3.h>
diff --git a/drivers/usb/host/ehci-faraday.c b/drivers/usb/host/ehci-faraday.c
index fe28aec8a85..df81d5605a4 100644
--- a/drivers/usb/host/ehci-faraday.c
+++ b/drivers/usb/host/ehci-faraday.c
@@ -12,6 +12,7 @@
 #include <asm/io.h>
 #include <usb.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <usb/fusbh200.h>
 #include <usb/fotg210.h>
 
diff --git a/drivers/usb/host/ehci-fsl.c b/drivers/usb/host/ehci-fsl.c
index b929eb9781b..c9303bfba2a 100644
--- a/drivers/usb/host/ehci-fsl.c
+++ b/drivers/usb/host/ehci-fsl.c
@@ -18,6 +18,7 @@
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <usb/ehci-ci.h>
 #include <hwconfig.h>
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index 4ef54a53d83..05fe83c399c 100644
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -25,6 +25,7 @@
 #include <linux/compiler.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include "ehci.h"
diff --git a/drivers/usb/host/ehci-msm.c b/drivers/usb/host/ehci-msm.c
index 458472b7b2e..4c4d0a48bc1 100644
--- a/drivers/usb/host/ehci-msm.c
+++ b/drivers/usb/host/ehci-msm.c
@@ -13,6 +13,7 @@
 #include <stdio.h>
 #include <usb.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <usb/ehci-ci.h>
 #include <usb/ulpi.h>
 #include <wait_bit.h>
diff --git a/drivers/usb/host/ehci-mx6.c b/drivers/usb/host/ehci-mx6.c
index 7ca106520db..bb96c11f355 100644
--- a/drivers/usb/host/ehci-mx6.c
+++ b/drivers/usb/host/ehci-mx6.c
@@ -14,6 +14,7 @@
 #include <linux/compiler.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <usb/ehci-ci.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
diff --git a/drivers/usb/host/ehci-mxs.c b/drivers/usb/host/ehci-mxs.c
index 7698c7761fe..f951e5d3a82 100644
--- a/drivers/usb/host/ehci-mxs.c
+++ b/drivers/usb/host/ehci-mxs.c
@@ -13,6 +13,7 @@
 #include <errno.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #include "ehci.h"
 
diff --git a/drivers/usb/host/ehci-rmobile.c b/drivers/usb/host/ehci-rmobile.c
index 72ae211d627..8e826163aa8 100644
--- a/drivers/usb/host/ehci-rmobile.c
+++ b/drivers/usb/host/ehci-rmobile.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <asm/arch/ehci-rmobile.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include "ehci.h"
 
 #if defined(CONFIG_R8A7740)
diff --git a/drivers/usb/host/ehci-tegra.c b/drivers/usb/host/ehci-tegra.c
index d71e455446f..605a0a1dc80 100644
--- a/drivers/usb/host/ehci-tegra.c
+++ b/drivers/usb/host/ehci-tegra.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/usb/host/ehci-vf.c b/drivers/usb/host/ehci-vf.c
index 3f140521c9c..816d105087e 100644
--- a/drivers/usb/host/ehci-vf.c
+++ b/drivers/usb/host/ehci-vf.c
@@ -22,6 +22,7 @@
 #include <asm/mach-imx/regs-usbphy.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <usb/ehci-ci.h>
 #include <linux/libfdt.h>
diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c
index 3b204efdd69..ecdd64c48cd 100644
--- a/drivers/usb/host/ohci-hcd.c
+++ b/drivers/usb/host/ohci-hcd.c
@@ -36,6 +36,7 @@
 #include <asm/cache.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #if defined(CONFIG_PCI_OHCI)
diff --git a/drivers/usb/host/r8a66597-hcd.c b/drivers/usb/host/r8a66597-hcd.c
index f977b3336f0..66c20c103c0 100644
--- a/drivers/usb/host/r8a66597-hcd.c
+++ b/drivers/usb/host/r8a66597-hcd.c
@@ -16,6 +16,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/iopoll.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <power/regulator.h>
 
diff --git a/drivers/usb/host/sl811-hcd.c b/drivers/usb/host/sl811-hcd.c
index c87b02f9747..0b786e1d13e 100644
--- a/drivers/usb/host/sl811-hcd.c
+++ b/drivers/usb/host/sl811-hcd.c
@@ -24,6 +24,7 @@
 #include <time.h>
 #include <usb.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "sl811.h"
 
diff --git a/drivers/usb/host/usb-sandbox.c b/drivers/usb/host/usb-sandbox.c
index beb62ebc0c2..090cb2ae84e 100644
--- a/drivers/usb/host/usb-sandbox.c
+++ b/drivers/usb/host/usb-sandbox.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <stdbool.h>
 #include <usb.h>
 #include <dm/root.h>
 
diff --git a/drivers/usb/host/usb-uclass.c b/drivers/usb/host/usb-uclass.c
index 1104fb2d040..940baa549d3 100644
--- a/drivers/usb/host/usb-uclass.c
+++ b/drivers/usb/host/usb-uclass.c
@@ -11,6 +11,7 @@
 #include <errno.h>
 #include <log.h>
 #include <memalign.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <usb.h>
 #include <vsprintf.h>
diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c
index 5418ce40642..16ddd0ab6cd 100644
--- a/drivers/usb/host/xhci-mem.c
+++ b/drivers/usb/host/xhci-mem.c
@@ -24,6 +24,7 @@
 #include <asm/cache.h>
 #include <linux/bug.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include <usb/xhci.h>
diff --git a/drivers/usb/host/xhci-rcar.c b/drivers/usb/host/xhci-rcar.c
index 28eea930cc2..a343d4d098c 100644
--- a/drivers/usb/host/xhci-rcar.c
+++ b/drivers/usb/host/xhci-rcar.c
@@ -16,6 +16,7 @@
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #include <usb/xhci.h>
 #include "xhci-rcar-r8a779x_usb3_v3.h"
diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
index 853f4c85089..221a2dbfd08 100644
--- a/drivers/usb/host/xhci-ring.c
+++ b/drivers/usb/host/xhci-ring.c
@@ -23,6 +23,7 @@
 #include <asm/unaligned.h>
 #include <linux/bug.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #include <usb/xhci.h>
 
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index f8601dc8363..90b9c9e0bb3 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -34,6 +34,7 @@
 #include <linux/bug.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <usb/xhci.h>
 
diff --git a/drivers/usb/musb-new/mt85xx.c b/drivers/usb/musb-new/mt85xx.c
index c5b994d906b..6bf1909f1ad 100644
--- a/drivers/usb/musb-new/mt85xx.c
+++ b/drivers/usb/musb-new/mt85xx.c
@@ -17,6 +17,7 @@
 #include <dm/root.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include <linux/usb/musb.h>
diff --git a/drivers/usb/musb-new/musb_core.h b/drivers/usb/musb-new/musb_core.h
index 821d0e06f61..91b1ec33045 100644
--- a/drivers/usb/musb-new/musb_core.h
+++ b/drivers/usb/musb-new/musb_core.h
@@ -21,6 +21,7 @@
 #include <linux/usb/otg.h>
 #else
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #endif
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
diff --git a/drivers/usb/musb-new/musb_dma.h b/drivers/usb/musb-new/musb_dma.h
index 5f99356ca79..5ad64ed3436 100644
--- a/drivers/usb/musb-new/musb_dma.h
+++ b/drivers/usb/musb-new/musb_dma.h
@@ -10,6 +10,7 @@
 #ifndef __MUSB_DMA_H__
 #define __MUSB_DMA_H__
 
+#include <stdbool.h>
 struct musb_hw_ep;
 
 /*
diff --git a/drivers/usb/musb-new/musb_gadget.h b/drivers/usb/musb-new/musb_gadget.h
index 7cb7a5cd6dc..4ae18f910fc 100644
--- a/drivers/usb/musb-new/musb_gadget.h
+++ b/drivers/usb/musb-new/musb_gadget.h
@@ -10,6 +10,7 @@
 #ifndef __MUSB_GADGET_H
 #define __MUSB_GADGET_H
 
+#include <linux/kernel.h>
 #include <linux/list.h>
 #ifdef __UBOOT__
 #include <asm/byteorder.h>
diff --git a/drivers/usb/musb-new/pic32.c b/drivers/usb/musb-new/pic32.c
index ca1c8d57867..e9554bc5328 100644
--- a/drivers/usb/musb-new/pic32.c
+++ b/drivers/usb/musb-new/pic32.c
@@ -16,6 +16,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/usb/musb.h>
 #include "linux-compat.h"
diff --git a/drivers/usb/musb-new/sunxi.c b/drivers/usb/musb-new/sunxi.c
index 1ab74d4be39..b49954fe146 100644
--- a/drivers/usb/musb-new/sunxi.c
+++ b/drivers/usb/musb-new/sunxi.c
@@ -34,6 +34,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include <linux/usb/musb.h>
diff --git a/drivers/usb/musb/musb_hcd.c b/drivers/usb/musb/musb_hcd.c
index 99514419e5f..8942ed31fc4 100644
--- a/drivers/usb/musb/musb_hcd.c
+++ b/drivers/usb/musb/musb_hcd.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <usb.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "musb_hcd.h"
 
diff --git a/drivers/usb/musb/musb_udc.c b/drivers/usb/musb/musb_udc.c
index d901f8777c2..56a92cc613a 100644
--- a/drivers/usb/musb/musb_udc.c
+++ b/drivers/usb/musb/musb_udc.c
@@ -42,6 +42,7 @@
 #include <serial.h>
 #include <usbdevice.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <usb/udc.h>
 #include "../gadget/ep0.h"
 #include "musb_core.h"
diff --git a/drivers/usb/phy/rockchip_usb2_phy.c b/drivers/usb/phy/rockchip_usb2_phy.c
index 93caa821a1d..d1d92ddfe7a 100644
--- a/drivers/usb/phy/rockchip_usb2_phy.c
+++ b/drivers/usb/phy/rockchip_usb2_phy.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 
 #include "../gadget/dwc2_udc_otg_priv.h"
 
diff --git a/drivers/video/am335x-fb.c b/drivers/video/am335x-fb.c
index 4d74e96e2a3..1e96f5bd35d 100644
--- a/drivers/video/am335x-fb.c
+++ b/drivers/video/am335x-fb.c
@@ -27,6 +27,7 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include "am335x-fb.h"
diff --git a/drivers/video/ati_radeon_fb.c b/drivers/video/ati_radeon_fb.c
index 6ac6d0e69ac..acee5ae3535 100644
--- a/drivers/video/ati_radeon_fb.c
+++ b/drivers/video/ati_radeon_fb.c
@@ -18,6 +18,7 @@
 #include <common.h>
 #include <stdio.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include <command.h>
diff --git a/drivers/video/atmel_hlcdfb.c b/drivers/video/atmel_hlcdfb.c
index bee082508b6..1891ec0117a 100644
--- a/drivers/video/atmel_hlcdfb.c
+++ b/drivers/video/atmel_hlcdfb.c
@@ -24,6 +24,7 @@
 #include <atmel_hlcdc.h>
 #include <linux/bug.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #if defined(CONFIG_LCD_LOGO)
 #include <bmp_logo.h>
diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c
index 20b9ba661c2..c734a44ba80 100644
--- a/drivers/video/atmel_lcdfb.c
+++ b/drivers/video/atmel_lcdfb.c
@@ -11,6 +11,7 @@
 #include <fdtdec.h>
 #include <log.h>
 #include <part.h>
+#include <stdbool.h>
 #include <video.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/video/backlight_gpio.c b/drivers/video/backlight_gpio.c
index 67fed7f224a..b72d6df8891 100644
--- a/drivers/video/backlight_gpio.c
+++ b/drivers/video/backlight_gpio.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <backlight.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/gpio.h>
 
 struct gpio_backlight_priv {
diff --git a/drivers/video/bcm2835.c b/drivers/video/bcm2835.c
index 7d2a452fd6f..c949246a987 100644
--- a/drivers/video/bcm2835.c
+++ b/drivers/video/bcm2835.c
@@ -11,6 +11,7 @@
 #include <asm/arch/msg.h>
 #include <asm/cache.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 static int bcm2835_video_probe(struct udevice *dev)
 {
diff --git a/drivers/video/bridge/video-bridge-uclass.c b/drivers/video/bridge/video-bridge-uclass.c
index d606342d847..960f9384042 100644
--- a/drivers/video/bridge/video-bridge-uclass.c
+++ b/drivers/video/bridge/video-bridge-uclass.c
@@ -9,6 +9,7 @@
 #include <errno.h>
 #include <edid.h>
 #include <log.h>
+#include <stdbool.h>
 #include <video_bridge.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/video/broadwell_igd.c b/drivers/video/broadwell_igd.c
index 77a4dc15830..430e4fd7da1 100644
--- a/drivers/video/broadwell_igd.c
+++ b/drivers/video/broadwell_igd.c
@@ -25,6 +25,7 @@
 #include <asm/arch/pch.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include "i915_reg.h"
 
 struct broadwell_igd_priv {
diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c
index 5edef8924e8..db64e18d13b 100644
--- a/drivers/video/cfb_console.c
+++ b/drivers/video/cfb_console.c
@@ -79,6 +79,7 @@
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/compiler.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #if defined(CONFIG_VIDEO_MXS)
diff --git a/drivers/video/console_truetype.c b/drivers/video/console_truetype.c
index 17e040bc926..01fcc03456b 100644
--- a/drivers/video/console_truetype.c
+++ b/drivers/video/console_truetype.c
@@ -10,6 +10,7 @@
 #include <video.h>
 #include <video_console.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 /* Functions needed by stb_truetype.h */
diff --git a/drivers/video/da8xx-fb.c b/drivers/video/da8xx-fb.c
index 27234e7adee..d9909e17867 100644
--- a/drivers/video/da8xx-fb.c
+++ b/drivers/video/da8xx-fb.c
@@ -16,6 +16,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <memalign.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <video_fb.h>
 #include <asm/global_data.h>
diff --git a/drivers/video/display-uclass.c b/drivers/video/display-uclass.c
index 8b49a7ba028..8b9131590fe 100644
--- a/drivers/video/display-uclass.c
+++ b/drivers/video/display-uclass.c
@@ -8,6 +8,7 @@
 #include <display.h>
 #include <edid.h>
 #include <errno.h>
+#include <stdbool.h>
 #include <linux/errno.h>
 
 int display_read_edid(struct udevice *dev, u8 *buf, int buf_size)
diff --git a/drivers/video/dw_hdmi.c b/drivers/video/dw_hdmi.c
index b2868413144..3f61c5ef02b 100644
--- a/drivers/video/dw_hdmi.c
+++ b/drivers/video/dw_hdmi.c
@@ -13,6 +13,7 @@
 #include <i2c.h>
 #include <media_bus_format.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "dw_hdmi.h"
 
diff --git a/drivers/video/dw_mipi_dsi.c b/drivers/video/dw_mipi_dsi.c
index 1a2d2b3b7f5..343732e2be0 100644
--- a/drivers/video/dw_mipi_dsi.c
+++ b/drivers/video/dw_mipi_dsi.c
@@ -25,6 +25,7 @@
 #include <linux/errno.h>
 #include <linux/iopoll.h>
 #include <video_bridge.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #define HWVER_131			0x31333100	/* IP version 1.31 */
diff --git a/drivers/video/exynos/exynos_fb.c b/drivers/video/exynos/exynos_fb.c
index 42ec0494fa0..a266b78b24a 100644
--- a/drivers/video/exynos/exynos_fb.c
+++ b/drivers/video/exynos/exynos_fb.c
@@ -13,6 +13,7 @@
 #include <dm.h>
 #include <fdtdec.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/libfdt.h>
diff --git a/drivers/video/exynos/exynos_mipi_dsi_common.c b/drivers/video/exynos/exynos_mipi_dsi_common.c
index 26e5d24314b..cf284dc2470 100644
--- a/drivers/video/exynos/exynos_mipi_dsi_common.c
+++ b/drivers/video/exynos/exynos_mipi_dsi_common.c
@@ -14,6 +14,7 @@
 #include <asm/arch/dsim.h>
 #include <asm/arch/mipi_dsim.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #include "exynos_mipi_dsi_lowlevel.h"
 
diff --git a/drivers/video/fsl_dcu_fb.c b/drivers/video/fsl_dcu_fb.c
index a8404dd2711..fc4d42d40e9 100644
--- a/drivers/video/fsl_dcu_fb.c
+++ b/drivers/video/fsl_dcu_fb.c
@@ -21,6 +21,7 @@
 #include <malloc.h>
 #include <video.h>
 #include <video_fb.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "videomodes.h"
 
diff --git a/drivers/video/fsl_diu_fb.c b/drivers/video/fsl_diu_fb.c
index 19dc648c7ea..068fc449f1c 100644
--- a/drivers/video/fsl_diu_fb.c
+++ b/drivers/video/fsl_diu_fb.c
@@ -13,6 +13,7 @@
 #include <vsprintf.h>
 #include <asm/io.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include "videomodes.h"
diff --git a/drivers/video/hitachi_tx18d42vm_lcd.c b/drivers/video/hitachi_tx18d42vm_lcd.c
index fd51761485d..284c6527474 100644
--- a/drivers/video/hitachi_tx18d42vm_lcd.c
+++ b/drivers/video/hitachi_tx18d42vm_lcd.c
@@ -10,6 +10,7 @@
 #include <stdio.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #include <asm/gpio.h>
 #include <errno.h>
diff --git a/drivers/video/ihs_video_out.c b/drivers/video/ihs_video_out.c
index dcbfbde688f..5b1413699f9 100644
--- a/drivers/video/ihs_video_out.c
+++ b/drivers/video/ihs_video_out.c
@@ -17,6 +17,7 @@
 #include <video_osd.h>
 #include <asm/gpio.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 static const uint MAX_X_CHARS = 53;
diff --git a/drivers/video/imx/ipu.h b/drivers/video/imx/ipu.h
index 1e02c7ab6d5..85d9efe5324 100644
--- a/drivers/video/imx/ipu.h
+++ b/drivers/video/imx/ipu.h
@@ -13,6 +13,7 @@
 #ifndef __ASM_ARCH_IPU_H__
 #define __ASM_ARCH_IPU_H__
 
+#include <stdbool.h>
 #include <linux/types.h>
 #include <ipu_pixfmt.h>
 
diff --git a/drivers/video/imx/mxc_ipuv3_fb.c b/drivers/video/imx/mxc_ipuv3_fb.c
index 356d410bea3..e6838a7c7e6 100644
--- a/drivers/video/imx/mxc_ipuv3_fb.c
+++ b/drivers/video/imx/mxc_ipuv3_fb.c
@@ -17,6 +17,7 @@
 #include <asm/cache.h>
 #include <linux/errno.h>
 #include <asm/global_data.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/list.h>
 #include <linux/fb.h>
diff --git a/drivers/video/ivybridge_igd.c b/drivers/video/ivybridge_igd.c
index 47aa55ebdfc..40a8cd1fa59 100644
--- a/drivers/video/ivybridge_igd.c
+++ b/drivers/video/ivybridge_igd.c
@@ -22,6 +22,7 @@
 #include <asm/arch/sandybridge.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/video/ld9040.c b/drivers/video/ld9040.c
index a36bc2f06cb..3ff30eece44 100644
--- a/drivers/video/ld9040.c
+++ b/drivers/video/ld9040.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <spi.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 
 static const unsigned char SEQ_USER_SETTING[] = {
 	0xF0, 0x5A, 0x5A
diff --git a/drivers/video/lg4573.c b/drivers/video/lg4573.c
index 7d4ddca1573..b47756bb13d 100644
--- a/drivers/video/lg4573.c
+++ b/drivers/video/lg4573.c
@@ -18,6 +18,7 @@
 #include <asm/gpio.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #define PWR_ON_DELAY_MSECS  120
diff --git a/drivers/video/logicore_dp_tx.c b/drivers/video/logicore_dp_tx.c
index 938455c0e4a..fe806fd7e56 100644
--- a/drivers/video/logicore_dp_tx.c
+++ b/drivers/video/logicore_dp_tx.c
@@ -14,6 +14,7 @@
 #include <display.h>
 #include <dm.h>
 #include <errno.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/video/logicore_dp_tx.h b/drivers/video/logicore_dp_tx.h
index d8d82b2b13f..b760cad12cc 100644
--- a/drivers/video/logicore_dp_tx.h
+++ b/drivers/video/logicore_dp_tx.h
@@ -34,6 +34,7 @@
  * This is a stripped down version of struct main_stream_attributes that
  * contains only the parameters that are not set by cfg_msa_recalculate()
  */
+#include <stdbool.h>
 struct logicore_dp_tx_msa {
 	u32 pixel_clock_hz;
 	u32 bits_per_color;
diff --git a/drivers/video/mali_dp.c b/drivers/video/mali_dp.c
index 44841a9f929..1b58b355264 100644
--- a/drivers/video/mali_dp.c
+++ b/drivers/video/mali_dp.c
@@ -22,6 +22,7 @@
 #include <dm/device_compat.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <linux/string.h>
 
diff --git a/drivers/video/meson/meson_dw_hdmi.c b/drivers/video/meson/meson_dw_hdmi.c
index 0fa1178415a..6a2b439afb6 100644
--- a/drivers/video/meson/meson_dw_hdmi.c
+++ b/drivers/video/meson/meson_dw_hdmi.c
@@ -15,6 +15,7 @@
 #include <dm/uclass-internal.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <power/regulator.h>
 #include <clk.h>
diff --git a/drivers/video/meson/meson_plane.c b/drivers/video/meson/meson_plane.c
index b367276f237..58dd5500ad6 100644
--- a/drivers/video/meson/meson_plane.c
+++ b/drivers/video/meson/meson_plane.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <linux/bitfield.h>
 #include <linux/bitops.h>
diff --git a/drivers/video/meson/meson_vclk.c b/drivers/video/meson/meson_vclk.c
index e096b437a38..dee5c90bd27 100644
--- a/drivers/video/meson/meson_vclk.c
+++ b/drivers/video/meson/meson_vclk.c
@@ -11,6 +11,7 @@
 #include <edid.h>
 #include <stdio.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include "meson_vpu.h"
 #include <log.h>
diff --git a/drivers/video/meson/meson_venc.c b/drivers/video/meson/meson_venc.c
index ce64865d591..166eaab4df1 100644
--- a/drivers/video/meson/meson_venc.c
+++ b/drivers/video/meson/meson_venc.c
@@ -11,6 +11,7 @@
 #include <edid.h>
 #include <fdtdec.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <linux/string.h>
 #include "meson_vpu.h"
diff --git a/drivers/video/meson/meson_vpu.c b/drivers/video/meson/meson_vpu.c
index 9acc2eab356..543eef8d205 100644
--- a/drivers/video/meson/meson_vpu.c
+++ b/drivers/video/meson/meson_vpu.c
@@ -16,6 +16,7 @@
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <asm/arch/mem.h>
 #include <dm/device-internal.h>
diff --git a/drivers/video/meson/meson_vpu.h b/drivers/video/meson/meson_vpu.h
index d9588c3775c..0a29e23093c 100644
--- a/drivers/video/meson/meson_vpu.h
+++ b/drivers/video/meson/meson_vpu.h
@@ -9,6 +9,7 @@
 #ifndef __MESON_VPU_H__
 #define __MESON_VPU_H__
 
+#include <stdbool.h>
 #include <video.h>
 #include "meson_registers.h"
 
diff --git a/drivers/video/meson/meson_vpu_init.c b/drivers/video/meson/meson_vpu_init.c
index c9808e1c631..3f13c55ee28 100644
--- a/drivers/video/meson/meson_vpu_init.c
+++ b/drivers/video/meson/meson_vpu_init.c
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
 
diff --git a/drivers/video/mipi_dsi.c b/drivers/video/mipi_dsi.c
index 7f9e2c8357f..405db2ca49a 100644
--- a/drivers/video/mipi_dsi.c
+++ b/drivers/video/mipi_dsi.c
@@ -38,6 +38,7 @@
 #include <dm.h>
 #include <mipi_display.h>
 #include <mipi_dsi.h>
+#include <stdbool.h>
 #include <dm/devres.h>
 #include <linux/errno.h>
 #include <linux/string.h>
diff --git a/drivers/video/mvebu_lcd.c b/drivers/video/mvebu_lcd.c
index 142ae235599..22483f18299 100644
--- a/drivers/video/mvebu_lcd.c
+++ b/drivers/video/mvebu_lcd.c
@@ -13,6 +13,7 @@
 #include <dm/device_compat.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/mbus.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
diff --git a/drivers/video/mxsfb.c b/drivers/video/mxsfb.c
index bb1eb377827..7a1fbed877a 100644
--- a/drivers/video/mxsfb.c
+++ b/drivers/video/mxsfb.c
@@ -19,6 +19,7 @@
 #include <malloc.h>
 #include <video.h>
 #include <video_fb.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include <asm/arch/clock.h>
diff --git a/drivers/video/nexell/s5pxx18_dp_lvds.c b/drivers/video/nexell/s5pxx18_dp_lvds.c
index cc95de13f51..72be625604b 100644
--- a/drivers/video/nexell/s5pxx18_dp_lvds.c
+++ b/drivers/video/nexell/s5pxx18_dp_lvds.c
@@ -8,6 +8,8 @@
 #include <config.h>
 #include <common.h>
 #include <errno.h>
+#include <stdbool.h>
+#include <stdio.h>
 #include <linux/errno.h>
 
 #include <asm/arch/nexell.h>
diff --git a/drivers/video/nexell/s5pxx18_dp_mipi.c b/drivers/video/nexell/s5pxx18_dp_mipi.c
index 0eb1ebb377a..2515add4fe7 100644
--- a/drivers/video/nexell/s5pxx18_dp_mipi.c
+++ b/drivers/video/nexell/s5pxx18_dp_mipi.c
@@ -8,6 +8,7 @@
 #include <config.h>
 #include <common.h>
 #include <errno.h>
+#include <stdbool.h>
 #include <linux/errno.h>
 
 #include <asm/arch/nexell.h>
diff --git a/drivers/video/nexell/s5pxx18_dp_rgb.c b/drivers/video/nexell/s5pxx18_dp_rgb.c
index 44e8edb02a2..349542c71b4 100644
--- a/drivers/video/nexell/s5pxx18_dp_rgb.c
+++ b/drivers/video/nexell/s5pxx18_dp_rgb.c
@@ -8,6 +8,8 @@
 #include <config.h>
 #include <common.h>
 #include <errno.h>
+#include <stdbool.h>
+#include <stdio.h>
 
 #include <asm/arch/display.h>
 
diff --git a/drivers/video/nexell/soc/s5pxx18_soc_disptop_clk.c b/drivers/video/nexell/soc/s5pxx18_soc_disptop_clk.c
index 02361ba4110..263133e7317 100644
--- a/drivers/video/nexell/soc/s5pxx18_soc_disptop_clk.c
+++ b/drivers/video/nexell/soc/s5pxx18_soc_disptop_clk.c
@@ -5,6 +5,7 @@
  * Author: junghyun, kim <jhkim@nexell.co.kr>
  */
 
+#include <stdbool.h>
 #include <linux/types.h>
 #include <linux/io.h>
 
diff --git a/drivers/video/nexell/soc/s5pxx18_soc_lvds.c b/drivers/video/nexell/soc/s5pxx18_soc_lvds.c
index 18c101bda7b..1c2fb6711cb 100644
--- a/drivers/video/nexell/soc/s5pxx18_soc_lvds.c
+++ b/drivers/video/nexell/soc/s5pxx18_soc_lvds.c
@@ -5,6 +5,7 @@
  * Author: junghyun, kim <jhkim@nexell.co.kr>
  */
 
+#include <stdbool.h>
 #include <linux/types.h>
 #include <linux/io.h>
 
diff --git a/drivers/video/orisetech_otm8009a.c b/drivers/video/orisetech_otm8009a.c
index b6a8527533c..8bff8e75cb8 100644
--- a/drivers/video/orisetech_otm8009a.c
+++ b/drivers/video/orisetech_otm8009a.c
@@ -16,6 +16,7 @@
 #include <dm/device_compat.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <power/regulator.h>
 
diff --git a/drivers/video/pwm_backlight.c b/drivers/video/pwm_backlight.c
index 6aacb067ad3..45b2bc17a7a 100644
--- a/drivers/video/pwm_backlight.c
+++ b/drivers/video/pwm_backlight.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <pwm.h>
+#include <stdbool.h>
 #include <asm/gpio.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/video/raydium-rm68200.c b/drivers/video/raydium-rm68200.c
index d31cbb4c34a..33852ec5b4c 100644
--- a/drivers/video/raydium-rm68200.c
+++ b/drivers/video/raydium-rm68200.c
@@ -16,6 +16,7 @@
 #include <dm/device_compat.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <power/regulator.h>
 
diff --git a/drivers/video/rockchip/rk3288_hdmi.c b/drivers/video/rockchip/rk3288_hdmi.c
index f835f4d517a..c1331a81fae 100644
--- a/drivers/video/rockchip/rk3288_hdmi.c
+++ b/drivers/video/rockchip/rk3288_hdmi.c
@@ -18,6 +18,7 @@
 #include <asm/arch-rockchip/clock.h>
 #include <asm/arch-rockchip/hardware.h>
 #include <asm/arch-rockchip/grf_rk3288.h>
+#include <linux/kernel.h>
 #include <power/regulator.h>
 #include "rk_hdmi.h"
 
diff --git a/drivers/video/rockchip/rk3288_vop.c b/drivers/video/rockchip/rk3288_vop.c
index d1bf82c5b27..e1f7850040b 100644
--- a/drivers/video/rockchip/rk3288_vop.c
+++ b/drivers/video/rockchip/rk3288_vop.c
@@ -17,6 +17,7 @@
 #include <asm/arch-rockchip/grf_rk3288.h>
 #include <asm/arch-rockchip/hardware.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include "rk_vop.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/video/rockchip/rk3399_hdmi.c b/drivers/video/rockchip/rk3399_hdmi.c
index a62be983275..d72c82ad031 100644
--- a/drivers/video/rockchip/rk3399_hdmi.c
+++ b/drivers/video/rockchip/rk3399_hdmi.c
@@ -16,6 +16,7 @@
 #include <asm/arch-rockchip/clock.h>
 #include <asm/arch-rockchip/hardware.h>
 #include <asm/arch-rockchip/grf_rk3399.h>
+#include <linux/kernel.h>
 #include <power/regulator.h>
 #include "rk_hdmi.h"
 
diff --git a/drivers/video/rockchip/rk3399_vop.c b/drivers/video/rockchip/rk3399_vop.c
index fe424d51f73..db1fb8093d7 100644
--- a/drivers/video/rockchip/rk3399_vop.c
+++ b/drivers/video/rockchip/rk3399_vop.c
@@ -14,6 +14,7 @@
 #include <asm/arch-rockchip/hardware.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <linux/kernel.h>
 #include "rk_vop.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/video/rockchip/rk_edp.c b/drivers/video/rockchip/rk_edp.c
index d6478d4f398..49fe635229d 100644
--- a/drivers/video/rockchip/rk_edp.c
+++ b/drivers/video/rockchip/rk_edp.c
@@ -25,6 +25,7 @@
 #include <dt-bindings/clock/rk3288-cru.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #define MAX_CR_LOOP 5
diff --git a/drivers/video/s6e8ax0.c b/drivers/video/s6e8ax0.c
index 497258f3de9..c3a8d43c004 100644
--- a/drivers/video/s6e8ax0.c
+++ b/drivers/video/s6e8ax0.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <asm/arch/mipi_dsim.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 
 #include "exynos/exynos_mipi_dsi_lowlevel.h"
 #include "exynos/exynos_mipi_dsi_common.h"
diff --git a/drivers/video/scf0403_lcd.c b/drivers/video/scf0403_lcd.c
index dcf0504ae56..0d5de4c4dda 100644
--- a/drivers/video/scf0403_lcd.c
+++ b/drivers/video/scf0403_lcd.c
@@ -19,6 +19,7 @@
 #include <asm/gpio.h>
 #include <spi.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 
 struct scf0403_cmd {
 	u16 cmd;
diff --git a/drivers/video/ssd2828.c b/drivers/video/ssd2828.c
index 84479b3ded9..a620a579fd7 100644
--- a/drivers/video/ssd2828.c
+++ b/drivers/video/ssd2828.c
@@ -16,6 +16,7 @@
 #include <asm/arch/gpio.h>
 #include <asm/gpio.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 
 #include "videomodes.h"
 #include "ssd2828.h"
diff --git a/drivers/video/stm32/stm32_dsi.c b/drivers/video/stm32/stm32_dsi.c
index 617d900343c..f58aa885f32 100644
--- a/drivers/video/stm32/stm32_dsi.c
+++ b/drivers/video/stm32/stm32_dsi.c
@@ -27,6 +27,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/iopoll.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <power/regulator.h>
 
diff --git a/drivers/video/stm32/stm32_ltdc.c b/drivers/video/stm32/stm32_ltdc.c
index 3767792a399..a763f13fe15 100644
--- a/drivers/video/stm32/stm32_ltdc.c
+++ b/drivers/video/stm32/stm32_ltdc.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <panel.h>
 #include <reset.h>
+#include <stdbool.h>
 #include <video.h>
 #include <video_bridge.h>
 #include <asm/global_data.h>
diff --git a/drivers/video/sunxi/lcdc.c b/drivers/video/sunxi/lcdc.c
index 73033c3b858..8814bc36814 100644
--- a/drivers/video/sunxi/lcdc.c
+++ b/drivers/video/sunxi/lcdc.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdbool.h>
 #include <linux/delay.h>
 
 #include <asm/arch/clock.h>
diff --git a/drivers/video/sunxi/sunxi_de2.c b/drivers/video/sunxi/sunxi_de2.c
index c323e0b0d5a..a5d85507057 100644
--- a/drivers/video/sunxi/sunxi_de2.c
+++ b/drivers/video/sunxi/sunxi_de2.c
@@ -14,6 +14,7 @@
 #include <fdt_support.h>
 #include <log.h>
 #include <part.h>
+#include <stdbool.h>
 #include <video.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/video/sunxi/sunxi_display.c b/drivers/video/sunxi/sunxi_display.c
index 9e59da06bf4..6c25910f67d 100644
--- a/drivers/video/sunxi/sunxi_display.c
+++ b/drivers/video/sunxi/sunxi_display.c
@@ -15,6 +15,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include <asm/arch/clock.h>
diff --git a/drivers/video/sunxi/sunxi_dw_hdmi.c b/drivers/video/sunxi/sunxi_dw_hdmi.c
index 418b429ce0e..b601328b6b3 100644
--- a/drivers/video/sunxi/sunxi_dw_hdmi.c
+++ b/drivers/video/sunxi/sunxi_dw_hdmi.c
@@ -18,6 +18,7 @@
 #include <asm/arch/lcdc.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 
 struct sunxi_dw_hdmi_priv {
 	struct dw_hdmi hdmi;
diff --git a/drivers/video/tegra.c b/drivers/video/tegra.c
index f10c509345d..2bacfa86dad 100644
--- a/drivers/video/tegra.c
+++ b/drivers/video/tegra.c
@@ -18,6 +18,7 @@
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #include <asm/arch/clock.h>
 #include <asm/arch/funcmux.h>
diff --git a/drivers/video/tegra124/display.c b/drivers/video/tegra124/display.c
index c16110f1191..bb2f46be558 100644
--- a/drivers/video/tegra124/display.c
+++ b/drivers/video/tegra124/display.c
@@ -26,6 +26,7 @@
 #include <dm/uclass-internal.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include "displayport.h"
 
 /* return in 1000ths of a Hertz */
diff --git a/drivers/video/tegra124/dp.c b/drivers/video/tegra124/dp.c
index 52b06f32ea8..ed1f9022bab 100644
--- a/drivers/video/tegra124/dp.c
+++ b/drivers/video/tegra124/dp.c
@@ -17,6 +17,7 @@
 #include <asm/arch-tegra/dc.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "display.h"
 #include "edid.h"
diff --git a/drivers/video/vidconsole-uclass.c b/drivers/video/vidconsole-uclass.c
index 7262cc0a65c..204828d594a 100644
--- a/drivers/video/vidconsole-uclass.c
+++ b/drivers/video/vidconsole-uclass.c
@@ -18,6 +18,7 @@
 #include <vsprintf.h>
 #include <linux/ctype.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 /*
diff --git a/drivers/video/video-uclass.c b/drivers/video/video-uclass.c
index 722a9c8765a..dcbe2480084 100644
--- a/drivers/video/video-uclass.c
+++ b/drivers/video/video-uclass.c
@@ -25,6 +25,7 @@
 #include <asm/sdl.h>
 #endif
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 /*
diff --git a/drivers/video/video_bmp.c b/drivers/video/video_bmp.c
index e854e3a3bfe..c83f41631b6 100644
--- a/drivers/video/video_bmp.c
+++ b/drivers/video/video_bmp.c
@@ -14,6 +14,7 @@
 #include <watchdog.h>
 #include <asm/unaligned.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #ifdef CONFIG_VIDEO_BMP_RLE8
 #define BMP_RLE8_ESCAPE		0
diff --git a/drivers/virtio/virtio_net.c b/drivers/virtio/virtio_net.c
index 277d4832fbb..d20ea6325f4 100644
--- a/drivers/virtio/virtio_net.c
+++ b/drivers/virtio/virtio_net.c
@@ -11,6 +11,7 @@
 #include <virtio.h>
 #include <virtio_ring.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "virtio_net.h"
 
diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c
index 76dc7d3a762..a5dbb0dd7f8 100644
--- a/drivers/virtio/virtio_ring.c
+++ b/drivers/virtio/virtio_ring.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <virtio_types.h>
 #include <virtio.h>
diff --git a/drivers/virtio/virtio_rng.c b/drivers/virtio/virtio_rng.c
index 111f8de2855..dadaaa449ce 100644
--- a/drivers/virtio/virtio_rng.c
+++ b/drivers/virtio/virtio_rng.c
@@ -10,6 +10,7 @@
 #include <virtio_types.h>
 #include <virtio.h>
 #include <virtio_ring.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #define BUFFER_SIZE	16UL
diff --git a/drivers/w1/mxc_w1.c b/drivers/w1/mxc_w1.c
index 92b18606c82..44047ea2bfe 100644
--- a/drivers/w1/mxc_w1.c
+++ b/drivers/w1/mxc_w1.c
@@ -17,6 +17,7 @@
  * Martin Fuzzey <martin.fuzzey@flowbird.group>
  */
 
+#include <stdbool.h>
 #include <asm/arch/clock.h>
 #include <common.h>
 #include <dm.h>
diff --git a/drivers/w1/w1-gpio.c b/drivers/w1/w1-gpio.c
index ba3dd688e6e..b54f169adfb 100644
--- a/drivers/w1/w1-gpio.c
+++ b/drivers/w1/w1-gpio.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <w1.h>
 #include <linux/delay.h>
diff --git a/drivers/w1/w1-uclass.c b/drivers/w1/w1-uclass.c
index a40beaefd67..9b9913a90d0 100644
--- a/drivers/w1/w1-uclass.c
+++ b/drivers/w1/w1-uclass.c
@@ -13,6 +13,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <w1.h>
 #include <w1-eeprom.h>
diff --git a/drivers/watchdog/ast_wdt.c b/drivers/watchdog/ast_wdt.c
index 7e11465a570..0f858b181c3 100644
--- a/drivers/watchdog/ast_wdt.c
+++ b/drivers/watchdog/ast_wdt.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <asm/arch/wdt.h>
 #include <linux/err.h>
+#include <linux/kernel.h>
 
 #define WDT_AST2500	2500
 #define WDT_AST2400	2400
diff --git a/drivers/watchdog/at91sam9_wdt.c b/drivers/watchdog/at91sam9_wdt.c
index c116a011263..ad602a8eb34 100644
--- a/drivers/watchdog/at91sam9_wdt.c
+++ b/drivers/watchdog/at91sam9_wdt.c
@@ -25,6 +25,7 @@
 #include <errno.h>
 #include <wdt.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/watchdog/cdns_wdt.c b/drivers/watchdog/cdns_wdt.c
index 2abd5524f61..a7f9095e2cd 100644
--- a/drivers/watchdog/cdns_wdt.c
+++ b/drivers/watchdog/cdns_wdt.c
@@ -15,6 +15,7 @@
 #include <dm/device_compat.h>
 #include <linux/err.h>
 #include <linux/io.h>
+#include <linux/kernel.h>
 
 struct cdns_regs {
 	u32 zmr;	/* WD Zero mode register, offset - 0x0 */
diff --git a/drivers/watchdog/designware_wdt.c b/drivers/watchdog/designware_wdt.c
index b2d17f6e335..06783650bed 100644
--- a/drivers/watchdog/designware_wdt.c
+++ b/drivers/watchdog/designware_wdt.c
@@ -12,6 +12,7 @@
 #include <asm/utils.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #define DW_WDT_CR	0x00
 #define DW_WDT_TORR	0x04
diff --git a/drivers/watchdog/imx_watchdog.c b/drivers/watchdog/imx_watchdog.c
index e17d9217cc0..d36b8b14931 100644
--- a/drivers/watchdog/imx_watchdog.c
+++ b/drivers/watchdog/imx_watchdog.c
@@ -18,6 +18,7 @@
 #include <fsl_wdog.h>
 #include <div64.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #define TIMEOUT_MAX	128000
 #define TIMEOUT_MIN	500
diff --git a/drivers/watchdog/tangier_wdt.c b/drivers/watchdog/tangier_wdt.c
index 358a9b90fdd..050e97f392a 100644
--- a/drivers/watchdog/tangier_wdt.c
+++ b/drivers/watchdog/tangier_wdt.c
@@ -8,6 +8,7 @@
 #include <wdt.h>
 #include <div64.h>
 #include <asm/scu.h>
+#include <linux/kernel.h>
 
 /* Hardware timeout in seconds */
 #define WDT_PRETIMEOUT		15
diff --git a/drivers/watchdog/xilinx_wwdt.c b/drivers/watchdog/xilinx_wwdt.c
index a486e032624..b688ebf0938 100644
--- a/drivers/watchdog/xilinx_wwdt.c
+++ b/drivers/watchdog/xilinx_wwdt.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <dm.h>
 #include <regmap.h>
+#include <stdbool.h>
 #include <wdt.h>
 #include <linux/compat.h>
 #include <linux/errno.h>
diff --git a/env/common.c b/env/common.c
index b8ac49cf499..7b0a7b38e24 100644
--- a/env/common.c
+++ b/env/common.c
@@ -14,6 +14,7 @@
 #include <env_internal.h>
 #include <log.h>
 #include <sort.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
diff --git a/env/env.c b/env/env.c
index 60c0295affb..e1a36b658fc 100644
--- a/env/env.c
+++ b/env/env.c
@@ -13,6 +13,7 @@
 #include <linux/bitops.h>
 #include <linux/bug.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/env/flags.c b/env/flags.c
index df4aed26b2c..8cd03336a3f 100644
--- a/env/flags.c
+++ b/env/flags.c
@@ -5,6 +5,7 @@
  */
 
 #include <env.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/ctype.h>
 
diff --git a/env/mmc.c b/env/mmc.c
index 361197916f7..d6a6f48ef81 100644
--- a/env/mmc.c
+++ b/env/mmc.c
@@ -10,6 +10,7 @@
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include <command.h>
diff --git a/env/nand.c b/env/nand.c
index 730baf0095c..18d43c0503a 100644
--- a/env/nand.c
+++ b/env/nand.c
@@ -20,6 +20,7 @@
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/stddef.h>
 #include <malloc.h>
 #include <memalign.h>
diff --git a/env/sata.c b/env/sata.c
index 56109397d53..a4af49ed8e2 100644
--- a/env/sata.c
+++ b/env/sata.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <stdio.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #include <command.h>
 #include <env.h>
diff --git a/env/sf.c b/env/sf.c
index 4bf67dcc8a9..6f874f43986 100644
--- a/env/sf.c
+++ b/env/sf.c
@@ -24,6 +24,7 @@
 #include <asm/global_data.h>
 #include <dm/device-internal.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <u-boot/crc.h>
 
 #ifndef CONFIG_SPL_BUILD
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index f1e185b2a9e..6216761b565 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -8,6 +8,7 @@
 #include "btrfs.h"
 #include <malloc.h>
 #include <stdio.h>
+#include <linux/kernel.h>
 
 u64 btrfs_lookup_inode_ref(struct btrfs_root *root, u64 inr,
 			   struct btrfs_inode_ref *refp, char *name)
diff --git a/fs/btrfs/subvolume.c b/fs/btrfs/subvolume.c
index 72f9b01d3b3..bc488183cd3 100644
--- a/fs/btrfs/subvolume.c
+++ b/fs/btrfs/subvolume.c
@@ -8,7 +8,7 @@
 #include "btrfs.h"
 #include <malloc.h>
 #include <stdio.h>
-
+#include <linux/kernel.h>
 static int get_subvol_name(u64 subvolid, char *name, int max_len)
 {
 	struct btrfs_root_ref rref;
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index 0b6def086ea..41f2193d51c 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -11,6 +11,7 @@
 #include <part.h>
 #include <stdio.h>
 #include <linux/compat.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "btrfs.h"
 
diff --git a/fs/cbfs/cbfs.c b/fs/cbfs/cbfs.c
index 1b27320a760..3f489910180 100644
--- a/fs/cbfs/cbfs.c
+++ b/fs/cbfs/cbfs.c
@@ -7,6 +7,7 @@
 #include <cbfs.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <asm/byteorder.h>
 #include <linux/errno.h>
 #include <linux/string.h>
diff --git a/fs/ext4/ext4_common.c b/fs/ext4/ext4_common.c
index c3ca193a190..8d1cec27cb7 100644
--- a/fs/ext4/ext4_common.c
+++ b/fs/ext4/ext4_common.c
@@ -29,6 +29,7 @@
 #include <stddef.h>
 #include <stdio.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/stat.h>
 #include <linux/string.h>
 #include <linux/time.h>
diff --git a/fs/ext4/ext4_write.c b/fs/ext4/ext4_write.c
index a38e0edd6a7..933e8b19b1b 100644
--- a/fs/ext4/ext4_write.c
+++ b/fs/ext4/ext4_write.c
@@ -29,6 +29,7 @@
 #include <part.h>
 #include <stdio.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/stat.h>
 #include <div64.h>
 #include <linux/string.h>
diff --git a/fs/fat/fat.c b/fs/fat/fat.c
index 6b8cf4ff02c..b68c378a703 100644
--- a/fs/fat/fat.c
+++ b/fs/fat/fat.c
@@ -24,6 +24,7 @@
 #include <linux/compiler.h>
 #include <linux/ctype.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 /*
diff --git a/fs/fat/fat_write.c b/fs/fat/fat_write.c
index 42ddb285789..7da31936542 100644
--- a/fs/fat/fat_write.c
+++ b/fs/fat/fat_write.c
@@ -18,6 +18,7 @@
 #include <linux/ctype.h>
 #include <div64.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/math64.h>
 #include <linux/string.h>
 #include "fat.c"
diff --git a/fs/fs.c b/fs/fs.c
index 092e1725050..a407714df3f 100644
--- a/fs/fs.c
+++ b/fs/fs.c
@@ -26,6 +26,7 @@
 #include <asm/io.h>
 #include <div64.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/math64.h>
 #include <efi_loader.h>
 #include <linux/string.h>
diff --git a/fs/fs_internal.c b/fs/fs_internal.c
index 37223573a7c..b626ffaecbe 100644
--- a/fs/fs_internal.c
+++ b/fs/fs_internal.c
@@ -12,6 +12,7 @@
 #include <part.h>
 #include <memalign.h>
 #include <stdio.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 int fs_devread(struct blk_desc *blk, struct disk_partition *partition,
diff --git a/fs/jffs2/compr_lzo.c b/fs/jffs2/compr_lzo.c
index e648ec4fb2e..da9a17ecaf6 100644
--- a/fs/jffs2/compr_lzo.c
+++ b/fs/jffs2/compr_lzo.c
@@ -67,6 +67,7 @@
 
 
 #include <config.h>
+#include <linux/kernel.h>
 #include <linux/stddef.h>
 #include <jffs2/jffs2.h>
 #include <jffs2/compr_rubin.h>
diff --git a/fs/jffs2/jffs2_1pass.c b/fs/jffs2/jffs2_1pass.c
index af3a0fc48aa..40e8ff66377 100644
--- a/fs/jffs2/jffs2_1pass.c
+++ b/fs/jffs2/jffs2_1pass.c
@@ -118,6 +118,7 @@
 #include <div64.h>
 #include <stdio.h>
 #include <linux/compiler.h>
+#include <linux/kernel.h>
 #include <linux/stat.h>
 #include <linux/string.h>
 #include <linux/time.h>
diff --git a/fs/ubifs/debug.c b/fs/ubifs/debug.c
index 07196c52e4f..a20407688cd 100644
--- a/fs/ubifs/debug.c
+++ b/fs/ubifs/debug.c
@@ -21,6 +21,7 @@
 #include <vsprintf.h>
 #include <dm/devres.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/fs/ubifs/io.c b/fs/ubifs/io.c
index 4ef1381fc7d..5a0fa3aa4e4 100644
--- a/fs/ubifs/io.c
+++ b/fs/ubifs/io.c
@@ -69,6 +69,7 @@
 #include <linux/compat.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #endif
 #include "ubifs.h"
diff --git a/fs/ubifs/key.h b/fs/ubifs/key.h
index f5b19525621..6677ff06a26 100644
--- a/fs/ubifs/key.h
+++ b/fs/ubifs/key.h
@@ -33,6 +33,7 @@
  * reserved for "." and "..". %2 is reserved for "end of readdir" marker. This
  * function makes sure the reserved values are not used.
  */
+#include <linux/kernel.h>
 #include <linux/string.h>
 static inline uint32_t key_mask_hash(uint32_t hash)
 {
diff --git a/fs/ubifs/log.c b/fs/ubifs/log.c
index 6e43a9c62b4..01edae8ff45 100644
--- a/fs/ubifs/log.c
+++ b/fs/ubifs/log.c
@@ -20,6 +20,7 @@
 #include <dm/devres.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #endif
 #include "ubifs.h"
diff --git a/fs/ubifs/lprops.c b/fs/ubifs/lprops.c
index b5ddde857c3..2e4678cfaa8 100644
--- a/fs/ubifs/lprops.c
+++ b/fs/ubifs/lprops.c
@@ -21,6 +21,7 @@
 #include <malloc.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #endif
 #include "ubifs.h"
diff --git a/fs/ubifs/lpt_commit.c b/fs/ubifs/lpt_commit.c
index 7c5f5d9a246..2f0d1c6eb51 100644
--- a/fs/ubifs/lpt_commit.c
+++ b/fs/ubifs/lpt_commit.c
@@ -24,6 +24,7 @@
 #include <linux/compat.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include "crc16.h"
diff --git a/fs/ubifs/misc.h b/fs/ubifs/misc.h
index 449bcfccbb4..a54e4928fc0 100644
--- a/fs/ubifs/misc.h
+++ b/fs/ubifs/misc.h
@@ -21,6 +21,7 @@
  *
  * This helper function returns %1 if @znode is dirty and %0 otherwise.
  */
+#include <linux/kernel.h>
 static inline int ubifs_zn_dirty(const struct ubifs_znode *znode)
 {
 	return !!test_bit(DIRTY_ZNODE, &znode->flags);
diff --git a/fs/ubifs/orphan.c b/fs/ubifs/orphan.c
index 1d7b8b6a181..a7df0364a17 100644
--- a/fs/ubifs/orphan.c
+++ b/fs/ubifs/orphan.c
@@ -11,6 +11,7 @@
 #include <dm/devres.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include "ubifs.h"
 
 /*
diff --git a/fs/ubifs/recovery.c b/fs/ubifs/recovery.c
index 8d342766221..24c66ce1688 100644
--- a/fs/ubifs/recovery.c
+++ b/fs/ubifs/recovery.c
@@ -44,6 +44,7 @@
 #else
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #endif
 #include "ubifs.h"
diff --git a/fs/ubifs/replay.c b/fs/ubifs/replay.c
index 248a8065925..845a270ce51 100644
--- a/fs/ubifs/replay.c
+++ b/fs/ubifs/replay.c
@@ -26,6 +26,7 @@
 #include <linux/compat.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #endif
 #include "ubifs.h"
diff --git a/fs/ubifs/scan.c b/fs/ubifs/scan.c
index 9332a61ff34..218cbfade10 100644
--- a/fs/ubifs/scan.c
+++ b/fs/ubifs/scan.c
@@ -21,6 +21,7 @@
 #include <dm/devres.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #endif
 #include "ubifs.h"
 
diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c
index 8f219ba8533..9c37fa2254c 100644
--- a/fs/ubifs/super.c
+++ b/fs/ubifs/super.c
@@ -37,6 +37,7 @@
 #include <linux/bitops.h>
 #include <linux/bug.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/log2.h>
 #include <linux/printk.h>
 #include <linux/stat.h>
diff --git a/fs/ubifs/tnc.c b/fs/ubifs/tnc.c
index 72bcd422746..b9174c8798f 100644
--- a/fs/ubifs/tnc.c
+++ b/fs/ubifs/tnc.c
@@ -30,6 +30,7 @@
 #include <linux/compat.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/stat.h>
 #include <linux/string.h>
 #endif
diff --git a/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h
index efa7a69cb6d..c8a33fa36ed 100644
--- a/fs/ubifs/ubifs.h
+++ b/fs/ubifs/ubifs.h
@@ -35,6 +35,7 @@
 #include <asm-generic/atomic-long.h>
 #include <ubi_uboot.h>
 #include <ubifs_uboot.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 
 #include <linux/ctype.h>
diff --git a/fs/zfs/zfs.c b/fs/zfs/zfs.c
index b63022aae32..0bc872175e5 100644
--- a/fs/zfs/zfs.c
+++ b/fs/zfs/zfs.c
@@ -14,6 +14,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <stdio.h>
+#include <linux/kernel.h>
 #include <linux/stat.h>
 #include <linux/string.h>
 #include <linux/time.h>
diff --git a/include/acpi/acpi_device.h b/include/acpi/acpi_device.h
index 11461e168d3..1c6aceb20af 100644
--- a/include/acpi/acpi_device.h
+++ b/include/acpi/acpi_device.h
@@ -11,6 +11,7 @@
 
 #include <i2c.h>
 #include <spi.h>
+#include <stdbool.h>
 #include <linux/bitops.h>
 
 struct acpi_ctx;
diff --git a/include/acpi/acpigen.h b/include/acpi/acpigen.h
index 228ac9c404b..3dfdc962510 100644
--- a/include/acpi/acpigen.h
+++ b/include/acpi/acpigen.h
@@ -10,6 +10,7 @@
 #ifndef __ACPI_ACPIGEN_H
 #define __ACPI_ACPIGEN_H
 
+#include <stdbool.h>
 #include <linux/types.h>
 
 struct acpi_ctx;
diff --git a/include/adc.h b/include/adc.h
index 5841dfb54b9..6596059df85 100644
--- a/include/adc.h
+++ b/include/adc.h
@@ -7,6 +7,8 @@
 #ifndef _ADC_H_
 #define _ADC_H_
 
+#include <stdbool.h>
+
 /* ADC_CHANNEL() - ADC channel bit mask, to select only required channels */
 #define ADC_CHANNEL(x)		(1 << x)
 
diff --git a/include/ahci.h b/include/ahci.h
index fb96dd88611..a6f32010ca2 100644
--- a/include/ahci.h
+++ b/include/ahci.h
@@ -7,6 +7,7 @@
 #ifndef _AHCI_H_
 #define _AHCI_H_
 
+#include <compiler.h>
 #include <pci.h>
 
 #define AHCI_PCI_BAR		0x24
diff --git a/include/asm-generic/gpio.h b/include/asm-generic/gpio.h
index a57dd2665ce..acbe791c84b 100644
--- a/include/asm-generic/gpio.h
+++ b/include/asm-generic/gpio.h
@@ -7,6 +7,7 @@
 #ifndef _ASM_GENERIC_GPIO_H_
 #define _ASM_GENERIC_GPIO_H_
 
+#include <stdbool.h>
 #include <dm/ofnode.h>
 #include <linux/bitops.h>
 
diff --git a/include/atsha204a-i2c.h b/include/atsha204a-i2c.h
index 344fd8ace7d..5c1ab65eef7 100644
--- a/include/atsha204a-i2c.h
+++ b/include/atsha204a-i2c.h
@@ -12,6 +12,7 @@
 #ifndef _ATSHA204_I2C_H_
 #define _ATSHA204_I2C_H_
 
+#include <stdbool.h>
 enum atsha204a_zone
 {
 	ATSHA204A_ZONE_CONFIG	= 0,
diff --git a/include/avb_verify.h b/include/avb_verify.h
index a8d7090f794..8aebe75ac91 100644
--- a/include/avb_verify.h
+++ b/include/avb_verify.h
@@ -98,4 +98,5 @@ static inline int get_boot_device(AvbOps *ops)
 	return -1;
 }
 
+#include <stdbool.h>
 #endif /* _AVB_VERIFY_H */
diff --git a/include/bmp_layout.h b/include/bmp_layout.h
index a5c9498dc9f..556f5db3c46 100644
--- a/include/bmp_layout.h
+++ b/include/bmp_layout.h
@@ -10,6 +10,8 @@
 #ifndef _BMP_H_
 #define _BMP_H_
 
+#include <compiler.h>
+
 struct __packed bmp_color_table_entry {
 	__u8	blue;
 	__u8	green;
diff --git a/include/board.h b/include/board.h
index 755a888e338..d9f7aafb49b 100644
--- a/include/board.h
+++ b/include/board.h
@@ -4,6 +4,7 @@
  * Mario Six,  Guntermann & Drunck GmbH, mario.six at gdsys.cc
  */
 
+#include <stdbool.h>
 #include <linux/errno.h>
 struct udevice;
 
diff --git a/include/bootstage.h b/include/bootstage.h
index 00c85fb86aa..670f785c89e 100644
--- a/include/bootstage.h
+++ b/include/bootstage.h
@@ -11,6 +11,8 @@
 #ifndef _BOOTSTAGE_H
 #define _BOOTSTAGE_H
 
+#include <stdbool.h>
+
 /* Flags for each bootstage record */
 enum bootstage_flags {
 	BOOTSTAGEF_ERROR	= 1 << 0,	/* Error record */
diff --git a/include/cli.h b/include/cli.h
index 06355767f6d..8a0b02cf1da 100644
--- a/include/cli.h
+++ b/include/cli.h
@@ -7,6 +7,7 @@
 #ifndef __CLI_H
 #define __CLI_H
 
+#include <stdbool.h>
 #include <time.h>
 
 /**
diff --git a/include/clk.h b/include/clk.h
index a62e2efa2ca..c28f6747146 100644
--- a/include/clk.h
+++ b/include/clk.h
@@ -8,6 +8,7 @@
 #ifndef _CLK_H_
 #define _CLK_H_
 
+#include <stdbool.h>
 #include <dm/ofnode.h>
 #include <linux/err.h>
 #include <linux/errno.h>
diff --git a/include/command.h b/include/command.h
index b9b5ec1afa0..bc7786dd4a4 100644
--- a/include/command.h
+++ b/include/command.h
@@ -12,6 +12,8 @@
 
 #include <env.h>
 #include <linker_lists.h>
+#include <stdbool.h>
+#include <linux/kernel.h>
 
 #ifndef NULL
 #define NULL	0
diff --git a/include/common.h b/include/common.h
index 4fa613216ef..868576038a7 100644
--- a/include/common.h
+++ b/include/common.h
@@ -15,7 +15,6 @@
 #ifndef __ASSEMBLY__		/* put C only stuff in this section */
 #include <config.h>
 #include <linux/types.h>
-#include <linux/kernel.h>
 #endif	/* __ASSEMBLY__ */
 
 /* Pull in stuff for the build system */
diff --git a/include/cpsw.h b/include/cpsw.h
index 786f8b385b7..9a237d9abe8 100644
--- a/include/cpsw.h
+++ b/include/cpsw.h
@@ -16,6 +16,7 @@
 #ifndef _CPSW_H_
 #define _CPSW_H_
 
+#include <stdbool.h>
 #include <dm/ofnode.h>
 
 /* reg offset */
diff --git a/include/cros_ec.h b/include/cros_ec.h
index f4b9b7a5c26..ceb3916ae89 100644
--- a/include/cros_ec.h
+++ b/include/cros_ec.h
@@ -13,6 +13,7 @@
 #include <cros_ec_message.h>
 #include <asm/gpio.h>
 #include <dm/of_extra.h>
+#include <linux/kernel.h>
 
 /* Our configuration information */
 struct cros_ec_dev {
diff --git a/include/crypto/pkcs7_parser.h b/include/crypto/pkcs7_parser.h
index 2c45cce5234..053ba7826a3 100644
--- a/include/crypto/pkcs7_parser.h
+++ b/include/crypto/pkcs7_parser.h
@@ -8,6 +8,7 @@
 #ifndef _PKCS7_PARSER_H
 #define _PKCS7_PARSER_H
 
+#include <stdbool.h>
 #include <linux/oid_registry.h>
 #include <crypto/pkcs7.h>
 #include <crypto/x509_parser.h>
diff --git a/include/crypto/public_key.h b/include/crypto/public_key.h
index 3ba90fcc348..2ef675b57e0 100644
--- a/include/crypto/public_key.h
+++ b/include/crypto/public_key.h
@@ -11,6 +11,7 @@
 #define _LINUX_PUBLIC_KEY_H
 
 #ifdef __UBOOT__
+#include <stdbool.h>
 #include <linux/types.h>
 #else
 #include <linux/keyctl.h>
diff --git a/include/crypto/x509_parser.h b/include/crypto/x509_parser.h
index 4cbdc1d6612..b793cbde735 100644
--- a/include/crypto/x509_parser.h
+++ b/include/crypto/x509_parser.h
@@ -8,6 +8,7 @@
 #ifndef _X509_PARSER_H
 #define _X509_PARSER_H
 
+#include <stdbool.h>
 #include <linux/time.h>
 #include <crypto/public_key.h>
 #include <keys/asymmetric-type.h>
diff --git a/include/dfu.h b/include/dfu.h
index 475b2a254d6..764b7757289 100644
--- a/include/dfu.h
+++ b/include/dfu.h
@@ -11,6 +11,7 @@
 #define __DFU_ENTITY_H_
 
 #include <common.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <linux/errno.h>
 #include <linux/list.h>
diff --git a/include/display.h b/include/display.h
index 66294616ea2..2c8aca4e48b 100644
--- a/include/display.h
+++ b/include/display.h
@@ -6,6 +6,8 @@
 #ifndef _DISPLAY_H
 #define _DISPLAY_H
 
+#include <stdbool.h>
+
 struct udevice;
 struct display_timing;
 
diff --git a/include/display_options.h b/include/display_options.h
index 990ea844ec2..00246955121 100644
--- a/include/display_options.h
+++ b/include/display_options.h
@@ -9,6 +9,8 @@
 #ifndef __DISPLAY_OPTIONS_H
 #define __DISPLAY_OPTIONS_H
 
+#include <stdbool.h>
+
 /**
  * print_size() - Print a size with a suffix
  *
diff --git a/include/div64.h b/include/div64.h
index 8b92d2b1834..823caf6bf2d 100644
--- a/include/div64.h
+++ b/include/div64.h
@@ -20,6 +20,7 @@
  *       beware of side effects!
  */
 
+#include <stdbool.h>
 #include <linux/types.h>
 #include <linux/compiler.h>
 
diff --git a/include/dm/device-internal.h b/include/dm/device-internal.h
index c29134976aa..07857cf1be7 100644
--- a/include/dm/device-internal.h
+++ b/include/dm/device-internal.h
@@ -10,6 +10,7 @@
 #ifndef _DM_DEVICE_INTERNAL_H
 #define _DM_DEVICE_INTERNAL_H
 
+#include <stdbool.h>
 #include <asm/global_data.h>
 #include <dm/ofnode.h>
 
diff --git a/include/dm/device.h b/include/dm/device.h
index 953706cf525..90fb96599b2 100644
--- a/include/dm/device.h
+++ b/include/dm/device.h
@@ -10,6 +10,7 @@
 #ifndef _DM_DEVICE_H
 #define _DM_DEVICE_H
 
+#include <stdbool.h>
 #include <dm/ofnode.h>
 #include <dm/uclass-id.h>
 #include <fdtdec.h>
diff --git a/include/dm/devres.h b/include/dm/devres.h
index 17bb1ee8dad..daeefd7ea3e 100644
--- a/include/dm/devres.h
+++ b/include/dm/devres.h
@@ -12,6 +12,7 @@
 #define _DM_DEVRES_H
 
 #include <linux/compat.h>
+#include <linux/kernel.h>
 
 struct udevice;
 
diff --git a/include/dm/lists.h b/include/dm/lists.h
index 810e244d9ef..85e9a5dd695 100644
--- a/include/dm/lists.h
+++ b/include/dm/lists.h
@@ -9,6 +9,7 @@
 #ifndef _DM_LISTS_H_
 #define _DM_LISTS_H_
 
+#include <stdbool.h>
 #include <dm/ofnode.h>
 #include <dm/uclass-id.h>
 
diff --git a/include/dm/of.h b/include/dm/of.h
index a64822f7e91..3d6e23a9340 100644
--- a/include/dm/of.h
+++ b/include/dm/of.h
@@ -7,6 +7,7 @@
 #ifndef _DM_OF_H
 #define _DM_OF_H
 
+#include <stdbool.h>
 #include <asm/u-boot.h>
 #include <asm/global_data.h>
 #include <linux/string.h>
diff --git a/include/dm/of_access.h b/include/dm/of_access.h
index f95a00d0655..6f01196b76c 100644
--- a/include/dm/of_access.h
+++ b/include/dm/of_access.h
@@ -17,6 +17,7 @@
 #ifndef _DM_OF_ACCESS_H
 #define _DM_OF_ACCESS_H
 
+#include <stdbool.h>
 #include <dm/of.h>
 
 /**
diff --git a/include/dm/ofnode.h b/include/dm/ofnode.h
index 8df2facf998..cc700d2b658 100644
--- a/include/dm/ofnode.h
+++ b/include/dm/ofnode.h
@@ -9,6 +9,7 @@
 
 /* TODO(sjg at chromium.org): Drop fdtdec.h include */
 #include <fdtdec.h>
+#include <stdbool.h>
 #include <dm/of.h>
 
 /* Enable checks to protect against invalid calls */
diff --git a/include/dm/platform_data/serial_bcm283x_mu.h b/include/dm/platform_data/serial_bcm283x_mu.h
index 37f5174dbf2..661988b37f1 100644
--- a/include/dm/platform_data/serial_bcm283x_mu.h
+++ b/include/dm/platform_data/serial_bcm283x_mu.h
@@ -14,6 +14,7 @@
  *
  * @base: Register base address
  */
+#include <stdbool.h>
 struct bcm283x_mu_serial_platdata {
 	unsigned long base;
 	unsigned int clock;
diff --git a/include/dm/platform_data/serial_mxc.h b/include/dm/platform_data/serial_mxc.h
index 86cd3bcf628..b2c6c5b08cb 100644
--- a/include/dm/platform_data/serial_mxc.h
+++ b/include/dm/platform_data/serial_mxc.h
@@ -7,6 +7,7 @@
 #define __serial_mxc_h
 
 /* Information about a serial port */
+#include <stdbool.h>
 struct mxc_serial_platdata {
 	struct mxc_uart *reg;  /* address of registers in physical memory */
 	bool use_dte;
diff --git a/include/dm/platform_data/serial_pl01x.h b/include/dm/platform_data/serial_pl01x.h
index 77d96c49f03..1d30e02c349 100644
--- a/include/dm/platform_data/serial_pl01x.h
+++ b/include/dm/platform_data/serial_pl01x.h
@@ -6,6 +6,7 @@
 #ifndef __serial_pl01x_h
 #define __serial_pl01x_h
 
+#include <stdbool.h>
 enum pl01x_type {
 	TYPE_PL010,
 	TYPE_PL011,
diff --git a/include/dm/read.h b/include/dm/read.h
index b1a61085440..0143ab8ccc0 100644
--- a/include/dm/read.h
+++ b/include/dm/read.h
@@ -9,6 +9,7 @@
 #ifndef _DM_READ_H
 #define _DM_READ_H
 
+#include <stdbool.h>
 #include <linux/errno.h>
 
 #include <dm/fdtaddr.h>
diff --git a/include/dm/root.h b/include/dm/root.h
index c8d629ba9bf..f2c73555671 100644
--- a/include/dm/root.h
+++ b/include/dm/root.h
@@ -9,6 +9,7 @@
 #ifndef _DM_ROOT_H_
 #define _DM_ROOT_H_
 
+#include <stdbool.h>
 struct udevice;
 
 /**
diff --git a/include/dm/uclass-internal.h b/include/dm/uclass-internal.h
index 6e3f15c2b08..0583f1ab57f 100644
--- a/include/dm/uclass-internal.h
+++ b/include/dm/uclass-internal.h
@@ -9,6 +9,7 @@
 #ifndef _DM_UCLASS_INTERNAL_H
 #define _DM_UCLASS_INTERNAL_H
 
+#include <stdbool.h>
 #include <dm/ofnode.h>
 
 /**
diff --git a/include/dw_hdmi.h b/include/dw_hdmi.h
index 8acae3839fb..4c4024ef19f 100644
--- a/include/dw_hdmi.h
+++ b/include/dw_hdmi.h
@@ -10,6 +10,7 @@
 #define _DW_HDMI_H
 
 #include <edid.h>
+#include <stdbool.h>
 
 #define HDMI_EDID_BLOCK_SIZE            128
 
diff --git a/include/dwmmc.h b/include/dwmmc.h
index d8a8355a0ad..46a9ca25bec 100644
--- a/include/dwmmc.h
+++ b/include/dwmmc.h
@@ -7,6 +7,7 @@
 #ifndef __DWMMC_HW_H
 #define __DWMMC_HW_H
 
+#include <stdbool.h>
 #include <asm/cache.h>
 #include <asm/io.h>
 #include <mmc.h>
diff --git a/include/edid.h b/include/edid.h
index 2562733061c..9a0612bf072 100644
--- a/include/edid.h
+++ b/include/edid.h
@@ -12,6 +12,7 @@
 #ifndef __EDID_H_
 #define __EDID_H_
 
+#include <stdbool.h>
 #include <linux/types.h>
 
 /* Size of the EDID data */
diff --git a/include/efi.h b/include/efi.h
index 0c99e1707d0..155dbc339cb 100644
--- a/include/efi.h
+++ b/include/efi.h
@@ -17,6 +17,7 @@
 #define _EFI_H
 
 #include <stdarg.h>
+#include <stdbool.h>
 #include <vsprintf.h>
 #include <linux/linkage.h>
 #include <linux/string.h>
diff --git a/include/efi_api.h b/include/efi_api.h
index 5744f6aed86..268d980b11f 100644
--- a/include/efi_api.h
+++ b/include/efi_api.h
@@ -19,6 +19,7 @@
 #include <efi.h>
 #include <charset.h>
 #include <pe.h>
+#include <stdbool.h>
 
 #ifdef CONFIG_EFI_LOADER
 #include <asm/setjmp.h>
diff --git a/include/efi_selftest.h b/include/efi_selftest.h
index 1515fdaa02b..25e5f56121e 100644
--- a/include/efi_selftest.h
+++ b/include/efi_selftest.h
@@ -13,6 +13,7 @@
 #include <efi_api.h>
 #include <efi_loader.h>
 #include <linker_lists.h>
+#include <stdbool.h>
 
 #define EFI_ST_SUCCESS 0
 #define EFI_ST_FAILURE 1
diff --git a/include/efi_variable.h b/include/efi_variable.h
index 2c629e4dca9..9a6fd808ce2 100644
--- a/include/efi_variable.h
+++ b/include/efi_variable.h
@@ -6,6 +6,7 @@
 #ifndef _EFI_VARIABLE_H
 #define _EFI_VARIABLE_H
 
+#include <stdbool.h>
 #include <linux/bitops.h>
 
 #define EFI_VARIABLE_READ_ONLY BIT(31)
diff --git a/include/exception.h b/include/exception.h
index 7f4638e4252..53bde10a62b 100644
--- a/include/exception.h
+++ b/include/exception.h
@@ -6,6 +6,7 @@
  */
 
 #include <command.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 static int do_exception(struct cmd_tbl *cmdtp, int flag, int argc,
diff --git a/include/fdtdec.h b/include/fdtdec.h
index 138c1e9b590..258a171dc7e 100644
--- a/include/fdtdec.h
+++ b/include/fdtdec.h
@@ -14,6 +14,7 @@
  * changes to support FDT are minimized.
  */
 
+#include <stdbool.h>
 #include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <pci.h>
diff --git a/include/fsl-mc/fsl_dpaa_fd.h b/include/fsl-mc/fsl_dpaa_fd.h
index 159756f71af..5c092af15c8 100644
--- a/include/fsl-mc/fsl_dpaa_fd.h
+++ b/include/fsl-mc/fsl_dpaa_fd.h
@@ -10,6 +10,7 @@
  * is impractical to define One True Struct, because the resulting encoding
  * routines (lots of read-modify-writes) would be worst-case performance whether
  * or not circumstances required them.) */
+#include <linux/kernel.h>
 struct dpaa_fd {
 	union {
 		u32 words[8];
diff --git a/include/fsl_ddr_sdram.h b/include/fsl_ddr_sdram.h
index 43face5c435..9d6e181987b 100644
--- a/include/fsl_ddr_sdram.h
+++ b/include/fsl_ddr_sdram.h
@@ -12,6 +12,7 @@
  */
 #include <ddr_spd.h>
 #include <fsl_ddrc_version.h>
+#include <stdbool.h>
 #include <asm/u-boot.h>
 
 #define SDRAM_TYPE_DDR1		2
diff --git a/include/fsl_errata.h b/include/fsl_errata.h
index 95ac2e3e10c..3123ceaaed5 100644
--- a/include/fsl_errata.h
+++ b/include/fsl_errata.h
@@ -14,6 +14,7 @@
 #elif defined(CONFIG_FSL_LAYERSCAPE)
 #include <asm/arch/soc.h>
 #endif
+#include <stdbool.h>
 #include <asm/u-boot.h>
 
 
diff --git a/include/fsl_usb.h b/include/fsl_usb.h
index c0f076b06da..5e3a935e9d8 100644
--- a/include/fsl_usb.h
+++ b/include/fsl_usb.h
@@ -52,6 +52,7 @@ struct ccsr_usb_phy {
 #define CONFIG_SYS_FSL_USB_PLLPRG2_MFI_INTERNAL_CLK (6 << 16)
 #define CONFIG_SYS_FSL_USB_INTERNAL_SOC_CLK_EN (1 << 20)
 #endif
+#include <stdbool.h>
 #define CONFIG_SYS_FSL_USB_PLLPRG2_REF_DIV (1 << 4)
 #define CONFIG_SYS_FSL_USB_PLLPRG2_MFI (5 << 16)
 #define CONFIG_SYS_FSL_USB_PLLPRG2_PLL_EN (1 << 21)
diff --git a/include/g_dnl.h b/include/g_dnl.h
index 836ee602c8d..7f78438f1ce 100644
--- a/include/g_dnl.h
+++ b/include/g_dnl.h
@@ -7,6 +7,7 @@
 #ifndef __G_DOWNLOAD_H_
 #define __G_DOWNLOAD_H_
 
+#include <stdbool.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
 #include <linux/usb/composite.h>
diff --git a/include/generic-phy.h b/include/generic-phy.h
index 5ab34cda03d..9312711a2b3 100644
--- a/include/generic-phy.h
+++ b/include/generic-phy.h
@@ -7,6 +7,7 @@
 #ifndef __GENERIC_PHY_H
 #define __GENERIC_PHY_H
 
+#include <stdbool.h>
 #include <dm/ofnode.h>
 
 struct ofnode_phandle_args;
diff --git a/include/hexdump.h b/include/hexdump.h
index f7b76ff7121..12dd4ad0462 100644
--- a/include/hexdump.h
+++ b/include/hexdump.h
@@ -7,6 +7,7 @@
 #ifndef HEXDUMP_H
 #define HEXDUMP_H
 
+#include <stdbool.h>
 #include <linux/ctype.h>
 #include <linux/types.h>
 
diff --git a/include/i2c.h b/include/i2c.h
index 7ea6b9a14cb..b8ee77d98bc 100644
--- a/include/i2c.h
+++ b/include/i2c.h
@@ -17,6 +17,7 @@
 #define _I2C_H_
 
 #include <linker_lists.h>
+#include <stdbool.h>
 #include <stdio.h>
 
 /*
diff --git a/include/image-android-dt.h b/include/image-android-dt.h
index 9a3aa8fa30f..0764eabcb4b 100644
--- a/include/image-android-dt.h
+++ b/include/image-android-dt.h
@@ -7,6 +7,7 @@
 #ifndef IMAGE_ANDROID_DT_H
 #define IMAGE_ANDROID_DT_H
 
+#include <stdbool.h>
 #include <linux/types.h>
 
 bool android_dt_check_header(ulong hdr_addr);
diff --git a/include/image-sparse.h b/include/image-sparse.h
index 0572dbd0a28..42b28bb6146 100644
--- a/include/image-sparse.h
+++ b/include/image-sparse.h
@@ -6,6 +6,7 @@
 #include <compiler.h>
 #include <part.h>
 #include <sparse_format.h>
+#include <linux/kernel.h>
 
 #define ROUNDUP(x, y)	(((x) + ((y) - 1)) & ~((y) - 1))
 
diff --git a/include/input.h b/include/input.h
index 3285a3ffa28..973d13f53b9 100644
--- a/include/input.h
+++ b/include/input.h
@@ -8,6 +8,7 @@
 #ifndef _INPUT_H
 #define _INPUT_H
 
+#include <stdbool.h>
 enum {
 	INPUT_MAX_MODIFIERS	= 4,
 	INPUT_BUFFER_LEN	= 16,
diff --git a/include/irq.h b/include/irq.h
index 8527e4dd797..150d7ce20c2 100644
--- a/include/irq.h
+++ b/include/irq.h
@@ -8,6 +8,7 @@
 #ifndef __irq_H
 #define __irq_H
 
+#include <stdbool.h>
 struct acpi_irq;
 struct ofnode_phandle_args;
 
diff --git a/include/kendryte/bypass.h b/include/kendryte/bypass.h
index a081cbd12ff..2f0b17d7061 100644
--- a/include/kendryte/bypass.h
+++ b/include/kendryte/bypass.h
@@ -6,6 +6,7 @@
 #define K210_BYPASS_H
 
 #include <clk.h>
+#include <linux/kernel.h>
 
 struct k210_bypass {
 	struct clk clk;
diff --git a/include/kendryte/pll.h b/include/kendryte/pll.h
index c8e3200799e..083f388c128 100644
--- a/include/kendryte/pll.h
+++ b/include/kendryte/pll.h
@@ -6,6 +6,7 @@
 #define K210_PLL_H
 
 #include <clk.h>
+#include <linux/kernel.h>
 #include <test/export.h>
 
 #define K210_PLL_CLKR GENMASK(3, 0)
diff --git a/include/keys/asymmetric-type.h b/include/keys/asymmetric-type.h
index 47d83917df2..2e8b0224b83 100644
--- a/include/keys/asymmetric-type.h
+++ b/include/keys/asymmetric-type.h
@@ -85,4 +85,5 @@ extern struct key *find_asymmetric_key(struct key *keyring,
  * The payload is at the discretion of the subtype.
  */
 
+#include <stdbool.h>
 #endif /* _KEYS_ASYMMETRIC_TYPE_H */
diff --git a/include/lcd.h b/include/lcd.h
index 9a4c0da5bac..08086008694 100644
--- a/include/lcd.h
+++ b/include/lcd.h
@@ -11,6 +11,7 @@
 
 #ifndef _LCD_H_
 #define _LCD_H_
+#include <compiler.h>
 #include <lcd_console.h>
 #if defined(CONFIG_CMD_BMP) || defined(CONFIG_SPLASH_SCREEN)
 #include <bmp_layout.h>
diff --git a/include/linux/err.h b/include/linux/err.h
index 5ede82432d2..3fc5a323e8f 100644
--- a/include/linux/err.h
+++ b/include/linux/err.h
@@ -1,12 +1,12 @@
 #ifndef _LINUX_ERR_H
 #define _LINUX_ERR_H
 
+#include <stdbool.h>
 #include <linux/compiler.h>
 #include <linux/compat.h>
 
 #include <linux/errno.h>
 
-
 /*
  * Kernel pointers have redundant information, so we can use a
  * scheme where we can return either an error code or a dentry
diff --git a/include/linux/list.h b/include/linux/list.h
index f62afa092c6..d06f1416605 100644
--- a/include/linux/list.h
+++ b/include/linux/list.h
@@ -1,6 +1,7 @@
 #ifndef _LINUX_LIST_H
 #define _LINUX_LIST_H
 
+#include <linux/kernel.h>
 #include <linux/stddef.h>
 #include <linux/poison.h>
 
diff --git a/include/linux/log2.h b/include/linux/log2.h
index d4e32ecfc64..123bb99447f 100644
--- a/include/linux/log2.h
+++ b/include/linux/log2.h
@@ -13,6 +13,7 @@
 #ifndef _LINUX_LOG2_H
 #define _LINUX_LOG2_H
 
+#include <stdbool.h>
 #include <linux/types.h>
 #include <linux/bitops.h>
 
diff --git a/include/linux/soc/ti/cppi5.h b/include/linux/soc/ti/cppi5.h
index 3a55c3ec46f..7447881eb26 100644
--- a/include/linux/soc/ti/cppi5.h
+++ b/include/linux/soc/ti/cppi5.h
@@ -9,6 +9,7 @@
 #define __TI_CPPI5_H__
 
 #include <hexdump.h>
+#include <stdbool.h>
 #include <linux/bitops.h>
 #include <linux/bug.h>
 #include <linux/printk.h>
diff --git a/include/linux/soc/ti/ti_sci_protocol.h b/include/linux/soc/ti/ti_sci_protocol.h
index 0d02ca82aef..1ae73240c80 100644
--- a/include/linux/soc/ti/ti_sci_protocol.h
+++ b/include/linux/soc/ti/ti_sci_protocol.h
@@ -20,6 +20,7 @@
  * @firmware_revision:	Firmware revision (not usually used).
  * @firmware_description: Firmware description (not usually used).
  */
+#include <stdbool.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 struct ti_sci_version_info {
diff --git a/include/linux/types.h b/include/linux/types.h
index baa2c491ea5..c9e582edd43 100644
--- a/include/linux/types.h
+++ b/include/linux/types.h
@@ -3,7 +3,6 @@
 
 #include <linux/posix_types.h>
 #include <asm/types.h>
-#include <stdbool.h>
 
 #ifndef __KERNEL_STRICT_NAMES
 
diff --git a/include/log.h b/include/log.h
index 2859ce1f2e7..2e64a8eab61 100644
--- a/include/log.h
+++ b/include/log.h
@@ -9,6 +9,7 @@
 #ifndef __LOG_H
 #define __LOG_H
 
+#include <stdbool.h>
 #include <stdio.h>
 #include <linker_lists.h>
 #include <dm/uclass-id.h>
diff --git a/include/memalign.h b/include/memalign.h
index 44f4a86241a..cb0dcf39b41 100644
--- a/include/memalign.h
+++ b/include/memalign.h
@@ -13,6 +13,7 @@
 #ifndef __ASSEMBLY__
 #include <asm/cache.h>
 #include <malloc.h>
+#include <linux/kernel.h>
 
 /*
  * The ALLOC_CACHE_ALIGN_BUFFER macro is used to allocate a buffer on the
diff --git a/include/membuff.h b/include/membuff.h
index c992067133b..d05656ad963 100644
--- a/include/membuff.h
+++ b/include/membuff.h
@@ -9,6 +9,8 @@
 #ifndef _MEMBUFF_H
 #define _MEMBUFF_H
 
+#include <stdbool.h>
+
 /**
  * @struct membuff: holds the state of a membuff - it is used for input and
  * output buffers. The buffer extends from @start to (@start + @size - 1).
diff --git a/include/mipi_dsi.h b/include/mipi_dsi.h
index 33eae9fb6d0..2abbbfa949b 100644
--- a/include/mipi_dsi.h
+++ b/include/mipi_dsi.h
@@ -16,6 +16,7 @@
 #define MIPI_DSI_H
 
 #include <mipi_display.h>
+#include <stdbool.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 
diff --git a/include/misc.h b/include/misc.h
index 82ec2ce7936..b1c8d307d27 100644
--- a/include/misc.h
+++ b/include/misc.h
@@ -6,6 +6,7 @@
 #ifndef _MISC_H_
 #define _MISC_H_
 
+#include <stdbool.h>
 struct udevice;
 
 /**
diff --git a/include/mmc.h b/include/mmc.h
index c1562a61ea5..d319f46e355 100644
--- a/include/mmc.h
+++ b/include/mmc.h
@@ -9,6 +9,7 @@
 #ifndef _MMC_H_
 #define _MMC_H_
 
+#include <stdbool.h>
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/list.h>
diff --git a/include/mvebu/comphy.h b/include/mvebu/comphy.h
index cde7a022af1..4a007ccb0f5 100644
--- a/include/mvebu/comphy.h
+++ b/include/mvebu/comphy.h
@@ -6,6 +6,7 @@
 #ifndef _MVEBU_COMPHY_H_
 #define _MVEBU_COMPHY_H_
 
+#include <stdbool.h>
 #include <dt-bindings/comphy/comphy_data.h>
 
 struct comphy_map {
diff --git a/include/mxs_nand.h b/include/mxs_nand.h
index c0cefaca90b..92af891c187 100644
--- a/include/mxs_nand.h
+++ b/include/mxs_nand.h
@@ -7,6 +7,7 @@
  * Stefan Agner <stefan.agner@toradex.com>
  */
 
+#include <stdbool.h>
 #include <linux/mtd/mtd.h>
 #include <asm/cache.h>
 #include <nand.h>
diff --git a/include/net.h b/include/net.h
index bf6e2f05227..035dcb520cc 100644
--- a/include/net.h
+++ b/include/net.h
@@ -12,6 +12,7 @@
 #ifndef __NET_H__
 #define __NET_H__
 
+#include <stdbool.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
 #include <linux/types.h>
diff --git a/include/net/ncsi.h b/include/net/ncsi.h
index 2800c842b72..40563028c25 100644
--- a/include/net/ncsi.h
+++ b/include/net/ncsi.h
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <phy.h>
+#include <stdbool.h>
 
 bool ncsi_active(void);
 void ncsi_receive(struct ethernet_hdr *et, struct ip_udp_hdr *ip,
diff --git a/include/net/pcap.h b/include/net/pcap.h
index 512ba982f10..db9b2c4f69f 100644
--- a/include/net/pcap.h
+++ b/include/net/pcap.h
@@ -12,6 +12,7 @@
  *
  * @return	0 on success, -ERROR on error
  */
+#include <stdbool.h>
 int pcap_init(phys_addr_t paddr, unsigned long size);
 
 /**
diff --git a/include/os.h b/include/os.h
index 1874ae674f2..22ecb2adfb3 100644
--- a/include/os.h
+++ b/include/os.h
@@ -11,6 +11,7 @@
 #ifndef __OS_H__
 #define __OS_H__
 
+#include <stdbool.h>
 #include <linux/types.h>
 
 struct rtc_time;
diff --git a/include/p2sb.h b/include/p2sb.h
index 93e1155dca6..a0f34496dd7 100644
--- a/include/p2sb.h
+++ b/include/p2sb.h
@@ -8,6 +8,7 @@
 #define __p2sb_h
 
 /* Port Id lives in bits 23:16 and register offset lives in 15:0 of address */
+#include <stdbool.h>
 #define PCR_PORTID_SHIFT	16
 
 /**
diff --git a/include/pch.h b/include/pch.h
index 620566819ce..aefd2b69f5c 100644
--- a/include/pch.h
+++ b/include/pch.h
@@ -7,6 +7,7 @@
 #ifndef __pch_h
 #define __pch_h
 
+#include <stdbool.h>
 #include <linux/bitops.h>
 #define PCH_RCBA		0xf0
 
diff --git a/include/pci.h b/include/pci.h
index 3686137d97a..eb8981969a6 100644
--- a/include/pci.h
+++ b/include/pci.h
@@ -10,6 +10,8 @@
 #ifndef _PCI_H
 #define _PCI_H
 
+#include <stdbool.h>
+
 #define PCI_CFG_SPACE_SIZE	256
 #define PCI_CFG_SPACE_EXP_SIZE	4096
 
diff --git a/include/phy-sun4i-usb.h b/include/phy-sun4i-usb.h
index b0a45b20580..33058b1662d 100644
--- a/include/phy-sun4i-usb.h
+++ b/include/phy-sun4i-usb.h
@@ -13,6 +13,7 @@
  * @phy:	USB PHY port to detect ID pin
  * @return 0 if OK, or a negative error code
  */
+#include <stdbool.h>
 int sun4i_usb_phy_id_detect(struct phy *phy);
 
 /**
diff --git a/include/phy.h b/include/phy.h
index fedd1460919..4cb2117a96a 100644
--- a/include/phy.h
+++ b/include/phy.h
@@ -10,6 +10,7 @@
 #define _PHY_H
 
 #include <dm.h>
+#include <stdbool.h>
 #include <linux/errno.h>
 #include <linux/list.h>
 #include <linux/mii.h>
diff --git a/include/phy_interface.h b/include/phy_interface.h
index b19fd50cd7a..c933b38f7ff 100644
--- a/include/phy_interface.h
+++ b/include/phy_interface.h
@@ -10,6 +10,8 @@
 #ifndef _PHY_INTERFACE_H
 #define _PHY_INTERFACE_H
 
+#include <stdbool.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 typedef enum {
 	PHY_INTERFACE_MODE_MII,
diff --git a/include/power/acpi_pmc.h b/include/power/acpi_pmc.h
index 5fbf7451369..2993edcdb54 100644
--- a/include/power/acpi_pmc.h
+++ b/include/power/acpi_pmc.h
@@ -196,4 +196,5 @@ int pmc_gpe_init(struct udevice *dev);
 
 #endif /* !__ACPI__ */
 
+#include <stdbool.h>
 #endif
diff --git a/include/power/regulator.h b/include/power/regulator.h
index d9eb9cae2b7..6f5b8b058df 100644
--- a/include/power/regulator.h
+++ b/include/power/regulator.h
@@ -7,6 +7,7 @@
 #ifndef _INCLUDE_REGULATOR_H_
 #define _INCLUDE_REGULATOR_H_
 
+#include <stdbool.h>
 struct udevice;
 
 /**
diff --git a/include/pwm.h b/include/pwm.h
index f9959706ceb..1791afec551 100644
--- a/include/pwm.h
+++ b/include/pwm.h
@@ -10,6 +10,7 @@
 #ifndef _pwm_h_
 #define _pwm_h_
 
+#include <stdbool.h>
 struct udevice;
 
 /* struct pwm_ops: Operations for the PWM uclass */
diff --git a/include/pwrseq.h b/include/pwrseq.h
index fbf6376d24c..ff208ad25e7 100644
--- a/include/pwrseq.h
+++ b/include/pwrseq.h
@@ -6,6 +6,7 @@
 #ifndef __pwrseq_h
 #define __pwrseq_h
 
+#include <stdbool.h>
 struct pwrseq_ops {
 	int (*set_power)(struct udevice *dev, bool enable);
 };
diff --git a/include/qfw.h b/include/qfw.h
index cea8e11d443..cb56ea58192 100644
--- a/include/qfw.h
+++ b/include/qfw.h
@@ -6,6 +6,7 @@
 #ifndef __FW_CFG__
 #define __FW_CFG__
 
+#include <stdbool.h>
 #include <linux/list.h>
 
 enum qemu_fwcfg_items {
diff --git a/include/remoteproc.h b/include/remoteproc.h
index 92de5604a80..c8c286e27f1 100644
--- a/include/remoteproc.h
+++ b/include/remoteproc.h
@@ -13,6 +13,7 @@
  * initialization *will* be eventually removed once all necessary
  * platforms have moved to dm/fdt.
  */
+#include <stdbool.h>
 #include <dm/platdata.h>	/* For platform data support - non dt world */
 #include <linux/errno.h>
 
diff --git a/include/reset.h b/include/reset.h
index 4fac4e6a202..dcb7563488c 100644
--- a/include/reset.h
+++ b/include/reset.h
@@ -6,6 +6,7 @@
 #ifndef _RESET_H
 #define _RESET_H
 
+#include <stdbool.h>
 #include <dm/ofnode.h>
 #include <linux/errno.h>
 
diff --git a/include/rtc.h b/include/rtc.h
index 1efc0db3de6..5033fde5ac8 100644
--- a/include/rtc.h
+++ b/include/rtc.h
@@ -13,6 +13,7 @@
 /* bcd<->bin functions are needed by almost all the RTC drivers, let's include
  * it there instead of in evey single driver */
 
+#include <stdbool.h>
 #include <bcd.h>
 #include <rtc_def.h>
 
diff --git a/include/samsung/exynos5-dt-types.h b/include/samsung/exynos5-dt-types.h
index 8fe08fe2118..791f9dca196 100644
--- a/include/samsung/exynos5-dt-types.h
+++ b/include/samsung/exynos5-dt-types.h
@@ -1,6 +1,7 @@
 #ifndef _EXYNOS5_DT_H_
 #define _EXYNOS5_DT_H_
 
+#include <stdbool.h>
 enum {
 	EXYNOS5_BOARD_GENERIC,
 
diff --git a/include/scsi.h b/include/scsi.h
index 61619e89a7f..1f427c61101 100644
--- a/include/scsi.h
+++ b/include/scsi.h
@@ -6,6 +6,7 @@
  #ifndef _SCSI_H
  #define _SCSI_H
 
+#include <stdbool.h>
 #include <asm/cache.h>
 #include <linux/dma-direction.h>
 
diff --git a/include/sdhci.h b/include/sdhci.h
index 94fc3ed56ac..c47dda8dae3 100644
--- a/include/sdhci.h
+++ b/include/sdhci.h
@@ -9,6 +9,7 @@
 #ifndef __SDHCI_HW_H
 #define __SDHCI_HW_H
 
+#include <stdbool.h>
 #include <linux/bitops.h>
 #include <linux/types.h>
 #include <asm/io.h>
diff --git a/include/serial.h b/include/serial.h
index c590637b1f3..ead8bb95b1a 100644
--- a/include/serial.h
+++ b/include/serial.h
@@ -1,6 +1,7 @@
 #ifndef __SERIAL_H__
 #define __SERIAL_H__
 
+#include <stdbool.h>
 #include <post.h>
 
 struct serial_device {
diff --git a/include/spi-mem.h b/include/spi-mem.h
index da495777bba..a373b19bf33 100644
--- a/include/spi-mem.h
+++ b/include/spi-mem.h
@@ -15,6 +15,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <spi.h>
+#include <stdbool.h>
 #include <linux/errno.h>
 
 #define SPI_MEM_OP_CMD(__opcode, __buswidth)			\
diff --git a/include/spi_flash.h b/include/spi_flash.h
index 8cab4f27088..6e74f9102c8 100644
--- a/include/spi_flash.h
+++ b/include/spi_flash.h
@@ -10,6 +10,7 @@
 #define _SPI_FLASH_H_
 
 #include <dm.h>	/* Because we dereference struct udevice here */
+#include <stdbool.h>
 #include <stdio.h>
 #include <linux/errno.h>
 #include <linux/string.h>
diff --git a/include/spl.h b/include/spl.h
index 580e4e024fd..c57a047e94a 100644
--- a/include/spl.h
+++ b/include/spl.h
@@ -587,4 +587,5 @@ void spl_perform_fixups(struct spl_image_info *spl_image);
 struct image_header *spl_get_load_buffer(ssize_t offset, size_t size);
 
 void spl_save_restore_data(void);
+#include <stdbool.h>
 #endif
diff --git a/include/stm32_rcc.h b/include/stm32_rcc.h
index a09a09ff955..dc3039d11ac 100644
--- a/include/stm32_rcc.h
+++ b/include/stm32_rcc.h
@@ -7,6 +7,7 @@
 #ifndef __STM32_RCC_H_
 #define __STM32_RCC_H_
 
+#include <stdbool.h>
 #define AHB_PSC_1			0
 #define AHB_PSC_2			0x8
 #define AHB_PSC_4			0x9
diff --git a/include/tee.h b/include/tee.h
index 99367b258e2..a73ec5a48c2 100644
--- a/include/tee.h
+++ b/include/tee.h
@@ -6,6 +6,7 @@
 #ifndef __TEE_H
 #define __TEE_H
 
+#include <stdbool.h>
 #include <linux/bitops.h>
 #include <linux/list.h>
 
diff --git a/include/test/ut.h b/include/test/ut.h
index 51a896e8e79..73fd6e50168 100644
--- a/include/test/ut.h
+++ b/include/test/ut.h
@@ -11,6 +11,7 @@
 #include <command.h>
 #include <hexdump.h>
 #include <linux/err.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 struct unit_test_state;
diff --git a/include/tlv_eeprom.h b/include/tlv_eeprom.h
index 99cefa61dfa..f523d972d06 100644
--- a/include/tlv_eeprom.h
+++ b/include/tlv_eeprom.h
@@ -8,6 +8,7 @@
 #define __TLV_EEPROM_H_
 
 #include <compiler.h>
+#include <stdbool.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 
diff --git a/include/usb.h b/include/usb.h
index fa9e09607e2..89b219486c2 100644
--- a/include/usb.h
+++ b/include/usb.h
@@ -12,6 +12,7 @@
 #define _USB_H_
 
 #include <fdtdec.h>
+#include <stdbool.h>
 #include <usb_defs.h>
 #include <linux/usb/ch9.h>
 #include <asm/cache.h>
diff --git a/include/usb/dwc2_udc.h b/include/usb/dwc2_udc.h
index a2af381a667..1d8c624d375 100644
--- a/include/usb/dwc2_udc.h
+++ b/include/usb/dwc2_udc.h
@@ -8,6 +8,7 @@
 #ifndef __DWC2_USB_GADGET
 #define __DWC2_USB_GADGET
 
+#include <stdbool.h>
 #include <dm/ofnode.h>
 
 #define PHY0_SLEEP              (1 << 5)
diff --git a/include/usb/xhci.h b/include/usb/xhci.h
index 7d34103fd5c..8d9c7917cb8 100644
--- a/include/usb/xhci.h
+++ b/include/usb/xhci.h
@@ -17,9 +17,11 @@
 #define HOST_XHCI_H_
 
 #include <reset.h>
+#include <stdbool.h>
 #include <asm/types.h>
 #include <asm/cache.h>
 #include <asm/io.h>
+#include <linux/kernel.h>
 #include <linux/list.h>
 #include <linux/compat.h>
 
diff --git a/include/usb_defs.h b/include/usb_defs.h
index 6dd2c997f9b..e31ebc5c28c 100644
--- a/include/usb_defs.h
+++ b/include/usb_defs.h
@@ -11,6 +11,7 @@
 /* USB constants */
 
 /* Device and/or Interface Class codes */
+#include <stdbool.h>
 #define USB_CLASS_PER_INTERFACE  0	/* for DeviceClass */
 #define USB_CLASS_AUDIO          1
 #define USB_CLASS_COMM           2
diff --git a/include/vbe.h b/include/vbe.h
index f420f493ee1..6e71610b8a8 100644
--- a/include/vbe.h
+++ b/include/vbe.h
@@ -11,6 +11,7 @@
 #define _VBE_H
 
 /* these structs are for input from and output to OF */
+#include <stdbool.h>
 struct __packed vbe_screen_info {
 	u8 display_type;	/* 0=NONE, 1= analog, 2=digital */
 	u16 screen_width;
diff --git a/include/video.h b/include/video.h
index 1a0ffd80379..03e342c6405 100644
--- a/include/video.h
+++ b/include/video.h
@@ -243,6 +243,7 @@ static inline int video_sync_copy(struct udevice *dev, void *from, void *to)
 }
 #endif
 
+#include <stdbool.h>
 #endif /* CONFIG_DM_VIDEO */
 
 #ifndef CONFIG_DM_VIDEO
diff --git a/include/video_bridge.h b/include/video_bridge.h
index 22e93dbb53b..b47cae66459 100644
--- a/include/video_bridge.h
+++ b/include/video_bridge.h
@@ -7,6 +7,7 @@
 #ifndef __VIDEO_BRIDGE
 #define __VIDEO_BRIDGE
 
+#include <stdbool.h>
 #include <asm/gpio.h>
 
 /**
diff --git a/include/virtio.h b/include/virtio.h
index 6a2932e391f..fb8528de283 100644
--- a/include/virtio.h
+++ b/include/virtio.h
@@ -21,6 +21,7 @@
 #define __VIRTIO_H__
 
 #include <compiler.h>
+#include <stdbool.h>
 #include <linux/bitops.h>
 #include <linux/bug.h>
 #include <linux/typecheck.h>
diff --git a/include/virtio_ring.h b/include/virtio_ring.h
index 6fc0593b14b..fff2d180d1b 100644
--- a/include/virtio_ring.h
+++ b/include/virtio_ring.h
@@ -9,6 +9,7 @@
 #ifndef _LINUX_VIRTIO_RING_H
 #define _LINUX_VIRTIO_RING_H
 
+#include <stdbool.h>
 #include <virtio_types.h>
 
 /* This marks a buffer as continuing via the next field */
diff --git a/include/w1.h b/include/w1.h
index b958b1c92c2..4c95ef29426 100644
--- a/include/w1.h
+++ b/include/w1.h
@@ -9,6 +9,7 @@
 #define __W1_H
 
 #include <dm.h>
+#include <stdbool.h>
 
 #define W1_FAMILY_DS24B33	0x23
 #define W1_FAMILY_DS2431	0x2d
diff --git a/include/wait_bit.h b/include/wait_bit.h
index a9bf4d90a8f..96a97bc327e 100644
--- a/include/wait_bit.h
+++ b/include/wait_bit.h
@@ -10,6 +10,7 @@
 
 #include <console.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <watchdog.h>
diff --git a/include/xyzModem.h b/include/xyzModem.h
index a8911b6bf57..eb0be111c14 100644
--- a/include/xyzModem.h
+++ b/include/xyzModem.h
@@ -25,6 +25,7 @@
 #ifndef _XYZMODEM_H_
 #define _XYZMODEM_H_
 
+#include <stdbool.h>
 #include <linux/delay.h>
 
 #define xyzModem_xmodem 1
diff --git a/lib/acpi/acpi_device.c b/lib/acpi/acpi_device.c
index 9e31a69c20f..b2cbf909361 100644
--- a/lib/acpi/acpi_device.c
+++ b/lib/acpi/acpi_device.c
@@ -18,6 +18,7 @@
 #include <asm-generic/gpio.h>
 #include <dm/acpi.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 /**
diff --git a/lib/acpi/acpi_table.c b/lib/acpi/acpi_table.c
index 0f6cb8728cd..f0b49c96e7f 100644
--- a/lib/acpi/acpi_table.c
+++ b/lib/acpi/acpi_table.c
@@ -16,6 +16,7 @@
 #include <asm/global_data.h>
 #include <dm/acpi.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 int acpi_create_dmar(struct acpi_dmar *dmar, enum dmar_flags flags)
diff --git a/lib/acpi/acpigen.c b/lib/acpi/acpigen.c
index f119de2bca6..3b04aa992e1 100644
--- a/lib/acpi/acpigen.c
+++ b/lib/acpi/acpigen.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <stdbool.h>
 #include <uuid.h>
 #include <acpi/acpigen.h>
 #include <acpi/acpi_device.h>
diff --git a/lib/aes/aes-decrypt.c b/lib/aes/aes-decrypt.c
index 3b01d1c8cbb..de67f0f32a7 100644
--- a/lib/aes/aes-decrypt.c
+++ b/lib/aes/aes-decrypt.c
@@ -8,6 +8,7 @@
 #include <malloc.h>
 #include <stdio.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #endif
 #include <image.h>
diff --git a/lib/bch.c b/lib/bch.c
index 578f4191309..0f68568c60b 100644
--- a/lib/bch.c
+++ b/lib/bch.c
@@ -60,6 +60,7 @@
 #include <ubi_uboot.h>
 #include <dm/devres.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include <linux/bitops.h>
diff --git a/lib/crypto/asymmetric_type.c b/lib/crypto/asymmetric_type.c
index 46d0dd468e5..d0dd2529536 100644
--- a/lib/crypto/asymmetric_type.c
+++ b/lib/crypto/asymmetric_type.c
@@ -19,6 +19,7 @@
 #include <linux/ctype.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #else
diff --git a/lib/display_options.c b/lib/display_options.c
index 826668505ca..8dcbd75e914 100644
--- a/lib/display_options.c
+++ b/lib/display_options.c
@@ -14,6 +14,7 @@
 #include <vsprintf.h>
 #include <linux/ctype.h>
 #include <asm/io.h>
+#include <linux/kernel.h>
 
 char *display_options_get_banner_priv(bool newlines, const char *build_tag,
 				      char *buf, int size)
diff --git a/lib/efi/efi_stub.c b/lib/efi/efi_stub.c
index ef8b80a4625..42b24139dbe 100644
--- a/lib/efi/efi_stub.c
+++ b/lib/efi/efi_stub.c
@@ -21,6 +21,7 @@
 #include <asm/io.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/types.h>
 
diff --git a/lib/efi_loader/efi_acpi.c b/lib/efi_loader/efi_acpi.c
index 585b2d2b636..87a02d59b9c 100644
--- a/lib/efi_loader/efi_acpi.c
+++ b/lib/efi_loader/efi_acpi.c
@@ -9,6 +9,7 @@
 #include <efi_loader.h>
 #include <log.h>
 #include <acpi/acpi_table.h>
+#include <linux/kernel.h>
 
 static const efi_guid_t acpi_guid = EFI_ACPI_TABLE_GUID;
 
diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c
index 66421a9c999..00dee3e57ae 100644
--- a/lib/efi_loader/efi_boottime.c
+++ b/lib/efi_loader/efi_boottime.c
@@ -16,6 +16,7 @@
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 #include <linux/libfdt_env.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
diff --git a/lib/efi_loader/efi_console.c b/lib/efi_loader/efi_console.c
index 088e3eacb82..ae0ee7ee909 100644
--- a/lib/efi_loader/efi_console.c
+++ b/lib/efi_loader/efi_console.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <charset.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <dm/device.h>
diff --git a/lib/efi_loader/efi_device_path.c b/lib/efi_loader/efi_device_path.c
index d4820fa5f0b..68e344ee344 100644
--- a/lib/efi_loader/efi_device_path.c
+++ b/lib/efi_loader/efi_device_path.c
@@ -19,6 +19,7 @@
 #include <vsprintf.h>
 #include <asm-generic/unaligned.h>
 #include <linux/compat.h> /* U16_MAX */
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #ifdef CONFIG_SANDBOX
diff --git a/lib/efi_loader/efi_device_path_to_text.c b/lib/efi_loader/efi_device_path_to_text.c
index b0f213d72b9..b923ff34848 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 <stdbool.h>
 #include <vsprintf.h>
 #include <linux/string.h>
 
diff --git a/lib/efi_loader/efi_device_path_utilities.c b/lib/efi_loader/efi_device_path_utilities.c
index 94015329c8c..405e87f3a01 100644
--- a/lib/efi_loader/efi_device_path_utilities.c
+++ b/lib/efi_loader/efi_device_path_utilities.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <efi_loader.h>
+#include <stdbool.h>
 
 const efi_guid_t efi_guid_device_path_utilities_protocol =
 		EFI_DEVICE_PATH_UTILITIES_PROTOCOL_GUID;
diff --git a/lib/efi_loader/efi_disk.c b/lib/efi_loader/efi_disk.c
index ecbd14817ad..43704826fb7 100644
--- a/lib/efi_loader/efi_disk.c
+++ b/lib/efi_loader/efi_disk.c
@@ -16,6 +16,7 @@
 #include <part.h>
 #include <malloc.h>
 #include <vsprintf.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 struct efi_system_partition efi_system_partition;
diff --git a/lib/efi_loader/efi_file.c b/lib/efi_loader/efi_file.c
index 0226e65ef54..023a91a3708 100644
--- a/lib/efi_loader/efi_file.c
+++ b/lib/efi_loader/efi_file.c
@@ -14,6 +14,7 @@
 #include <fs.h>
 #include <part.h>
 #include <stdio.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 /* GUID for file system information */
diff --git a/lib/efi_loader/efi_gop.c b/lib/efi_loader/efi_gop.c
index 44ffed05c69..42d985b2586 100644
--- a/lib/efi_loader/efi_gop.c
+++ b/lib/efi_loader/efi_gop.c
@@ -14,6 +14,7 @@
 #include <stdio.h>
 #include <video.h>
 #include <asm/global_data.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/lib/efi_loader/efi_hii.c b/lib/efi_loader/efi_hii.c
index 92ae7e44e0a..05ad9926098 100644
--- a/lib/efi_loader/efi_hii.c
+++ b/lib/efi_loader/efi_hii.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <efi_loader.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <asm/unaligned.h>
 #include <linux/string.h>
 
diff --git a/lib/efi_loader/efi_image_loader.c b/lib/efi_loader/efi_image_loader.c
index eec1e2aeab1..44cf7916637 100644
--- a/lib/efi_loader/efi_image_loader.c
+++ b/lib/efi_loader/efi_image_loader.c
@@ -16,6 +16,7 @@
 #include <stdio.h>
 #include <crypto/pkcs7_parser.h>
 #include <linux/err.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 const efi_guid_t efi_global_variable_guid = EFI_GLOBAL_VARIABLE_GUID;
diff --git a/lib/efi_loader/efi_load_initrd.c b/lib/efi_loader/efi_load_initrd.c
index 800ff9fc41a..37265417250 100644
--- a/lib/efi_loader/efi_load_initrd.c
+++ b/lib/efi_loader/efi_load_initrd.c
@@ -11,6 +11,7 @@
 #include <fs.h>
 #include <efi_loader.h>
 #include <efi_load_initrd.h>
+#include <stdbool.h>
 #include <linux/string.h>
 
 static const efi_guid_t efi_guid_load_file2_protocol =
diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c
index 9b7bfc8fc29..b774358333a 100644
--- a/lib/efi_loader/efi_memory.c
+++ b/lib/efi_loader/efi_memory.c
@@ -15,6 +15,7 @@
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 #include <linux/list_sort.h>
 #include <linux/sizes.h>
 
diff --git a/lib/efi_loader/efi_net.c b/lib/efi_loader/efi_net.c
index 51c1bd2f606..5c29d00b451 100644
--- a/lib/efi_loader/efi_net.c
+++ b/lib/efi_loader/efi_net.c
@@ -20,6 +20,7 @@
 #include <malloc.h>
 #include <net.h>
 #include <stdio.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 static const efi_guid_t efi_net_guid = EFI_SIMPLE_NETWORK_PROTOCOL_GUID;
diff --git a/lib/efi_loader/efi_runtime.c b/lib/efi_loader/efi_runtime.c
index 5b6ab297cbb..93bbd270234 100644
--- a/lib/efi_loader/efi_runtime.c
+++ b/lib/efi_loader/efi_runtime.c
@@ -16,6 +16,7 @@
 #include <rtc.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
 
diff --git a/lib/efi_loader/efi_signature.c b/lib/efi_loader/efi_signature.c
index 18392920575..0d3b46d7a63 100644
--- a/lib/efi_loader/efi_signature.c
+++ b/lib/efi_loader/efi_signature.c
@@ -10,6 +10,7 @@
 #include <image.h>
 #include <hexdump.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <crypto/pkcs7_parser.h>
 #include <linux/compat.h>
 #include <linux/oid_registry.h>
diff --git a/lib/efi_loader/efi_smbios.c b/lib/efi_loader/efi_smbios.c
index 719d3e8880a..b77ac76935a 100644
--- a/lib/efi_loader/efi_smbios.c
+++ b/lib/efi_loader/efi_smbios.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <mapmem.h>
 #include <smbios.h>
+#include <linux/kernel.h>
 
 static const efi_guid_t smbios_guid = SMBIOS_TABLE_GUID;
 
diff --git a/lib/efi_loader/efi_unicode_collation.c b/lib/efi_loader/efi_unicode_collation.c
index e002ed6a392..caa65f06d73 100644
--- a/lib/efi_loader/efi_unicode_collation.c
+++ b/lib/efi_loader/efi_unicode_collation.c
@@ -10,6 +10,7 @@
 #include <cp1250.h>
 #include <cp437.h>
 #include <efi_loader.h>
+#include <stdbool.h>
 #include <linux/string.h>
 
 /* Characters that may not be used in FAT 8.3 file names */
diff --git a/lib/efi_loader/efi_var_common.c b/lib/efi_loader/efi_var_common.c
index 0b491ed472d..57b27fdc960 100644
--- a/lib/efi_loader/efi_var_common.c
+++ b/lib/efi_loader/efi_var_common.c
@@ -9,6 +9,7 @@
 #include <efi_loader.h>
 #include <efi_variable.h>
 #include <stdio.h>
+#include <linux/kernel.h>
 
 enum efi_secure_mode {
 	EFI_MODE_SETUP,
diff --git a/lib/efi_loader/efi_var_file.c b/lib/efi_loader/efi_var_file.c
index 67bfef93e1a..3929355b64e 100644
--- a/lib/efi_loader/efi_var_file.c
+++ b/lib/efi_loader/efi_var_file.c
@@ -16,6 +16,7 @@
 #include <efi_loader.h>
 #include <efi_variable.h>
 #include <vsprintf.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
 
diff --git a/lib/efi_loader/efi_var_mem.c b/lib/efi_loader/efi_var_mem.c
index a42970ffde1..a8f7dddfc52 100644
--- a/lib/efi_loader/efi_var_mem.c
+++ b/lib/efi_loader/efi_var_mem.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <efi_loader.h>
 #include <efi_variable.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
 
diff --git a/lib/efi_loader/efi_variable.c b/lib/efi_loader/efi_variable.c
index 7093e33d282..d4b56d05ae6 100644
--- a/lib/efi_loader/efi_variable.c
+++ b/lib/efi_loader/efi_variable.c
@@ -17,6 +17,7 @@
 #include <malloc.h>
 #include <rtc.h>
 #include <search.h>
+#include <stdbool.h>
 #include <uuid.h>
 #include <crypto/pkcs7_parser.h>
 #include <linux/compat.h>
diff --git a/lib/efi_loader/efi_variable_tee.c b/lib/efi_loader/efi_variable_tee.c
index 9f0dbcd79e7..792aed9c6b3 100644
--- a/lib/efi_loader/efi_variable_tee.c
+++ b/lib/efi_loader/efi_variable_tee.c
@@ -11,6 +11,7 @@
 #include <efi_api.h>
 #include <efi_loader.h>
 #include <efi_variable.h>
+#include <stdbool.h>
 #include <tee.h>
 #include <malloc.h>
 #include <mm_communication.h>
diff --git a/lib/efi_selftest/efi_selftest_loaded_image.c b/lib/efi_selftest/efi_selftest_loaded_image.c
index 01f6dee2ea6..f10c9348b90 100644
--- a/lib/efi_selftest/efi_selftest_loaded_image.c
+++ b/lib/efi_selftest/efi_selftest_loaded_image.c
@@ -8,6 +8,7 @@
  */
 
 #include <efi_selftest.h>
+#include <stdbool.h>
 #include <linux/string.h>
 
 static efi_guid_t loaded_image_protocol_guid =
diff --git a/lib/efi_selftest/efi_selftest_memory.c b/lib/efi_selftest/efi_selftest_memory.c
index 2efb6e42aa2..31ca3f3beb6 100644
--- a/lib/efi_selftest/efi_selftest_memory.c
+++ b/lib/efi_selftest/efi_selftest_memory.c
@@ -11,6 +11,7 @@
  */
 
 #include <efi_selftest.h>
+#include <stdbool.h>
 #include <linux/string.h>
 
 #define EFI_ST_NUM_PAGES 8
diff --git a/lib/efi_selftest/efi_selftest_set_virtual_address_map.c b/lib/efi_selftest/efi_selftest_set_virtual_address_map.c
index b9045fe1143..6a22d99e834 100644
--- a/lib/efi_selftest/efi_selftest_set_virtual_address_map.c
+++ b/lib/efi_selftest/efi_selftest_set_virtual_address_map.c
@@ -9,6 +9,7 @@
  */
 
 #include <efi_selftest.h>
+#include <stdbool.h>
 #include <linux/string.h>
 
 static const struct efi_boot_services *boottime;
diff --git a/lib/efi_selftest/efi_selftest_textinputex.c b/lib/efi_selftest/efi_selftest_textinputex.c
index de44224ce1c..2b0b3cfd722 100644
--- a/lib/efi_selftest/efi_selftest_textinputex.c
+++ b/lib/efi_selftest/efi_selftest_textinputex.c
@@ -13,6 +13,7 @@
  */
 
 #include <efi_selftest.h>
+#include <stdbool.h>
 
 static const efi_guid_t text_input_ex_protocol_guid =
 		EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL_GUID;
diff --git a/lib/efi_selftest/efi_selftest_unicode_collation.c b/lib/efi_selftest/efi_selftest_unicode_collation.c
index 75294307d9f..b3f7c623e8b 100644
--- a/lib/efi_selftest/efi_selftest_unicode_collation.c
+++ b/lib/efi_selftest/efi_selftest_unicode_collation.c
@@ -8,6 +8,7 @@
  */
 
 #include <efi_selftest.h>
+#include <stdbool.h>
 
 static const efi_guid_t unicode_collation_protocol_guid =
 	EFI_UNICODE_COLLATION_PROTOCOL2_GUID;
diff --git a/lib/efi_selftest/efi_selftest_watchdog.c b/lib/efi_selftest/efi_selftest_watchdog.c
index cbc6761721c..666c0309be1 100644
--- a/lib/efi_selftest/efi_selftest_watchdog.c
+++ b/lib/efi_selftest/efi_selftest_watchdog.c
@@ -17,6 +17,7 @@
  */
 
 #include <efi_selftest.h>
+#include <stdbool.h>
 
 /*
  * This is the communication structure for the notification function.
diff --git a/lib/elf.c b/lib/elf.c
index 7b24ca685a4..623e46867cd 100644
--- a/lib/elf.c
+++ b/lib/elf.c
@@ -16,6 +16,7 @@
 #include <asm/e820.h>
 #include <linux/linkage.h>
 #endif
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 /*
diff --git a/lib/errno_str.c b/lib/errno_str.c
index d342ed70b60..fb6868f2ff1 100644
--- a/lib/errno_str.c
+++ b/lib/errno_str.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <errno.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #define ERRNO_MSG(errno, msg)	msg
 #define SAME_AS(x)		(const char *)&errno_message[x]
diff --git a/lib/fdtdec.c b/lib/fdtdec.c
index 3ac889ba730..ee8ae8d2764 100644
--- a/lib/fdtdec.c
+++ b/lib/fdtdec.c
@@ -24,6 +24,7 @@
 #include <gzip.h>
 #include <mapmem.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <serial.h>
 #include <asm/global_data.h>
diff --git a/lib/fdtdec_test.c b/lib/fdtdec_test.c
index 50e773260ef..15c60ee08cf 100644
--- a/lib/fdtdec_test.c
+++ b/lib/fdtdec_test.c
@@ -11,6 +11,7 @@
 #include <fdtdec.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <malloc.h>
 #include <os.h>
diff --git a/lib/hexdump.c b/lib/hexdump.c
index 28561056228..74940dd0249 100644
--- a/lib/hexdump.c
+++ b/lib/hexdump.c
@@ -14,6 +14,7 @@
 #include <vsprintf.h>
 #include <linux/ctype.h>
 #include <linux/compat.h>
+#include <linux/kernel.h>
 #include <linux/log2.h>
 #include <asm/unaligned.h>
 
diff --git a/lib/image-sparse.c b/lib/image-sparse.c
index 5f985a0aa5c..24741b8d8ec 100644
--- a/lib/image-sparse.c
+++ b/lib/image-sparse.c
@@ -45,6 +45,7 @@
 #include <sparse_format.h>
 #include <stdio.h>
 #include <asm/cache.h>
+#include <linux/kernel.h>
 
 #include <linux/math64.h>
 
diff --git a/lib/libavb/avb_sysdeps.h b/lib/libavb/avb_sysdeps.h
index f52428cc622..85ff8e1de3e 100644
--- a/lib/libavb/avb_sysdeps.h
+++ b/lib/libavb/avb_sysdeps.h
@@ -20,6 +20,7 @@ extern "C" {
  * must be present.
  */
 #include <common.h>
+#include <stdbool.h>
 
 /* If you don't have gcc or clang, these attribute macros may need to
  * be adjusted.
diff --git a/lib/lmb.c b/lib/lmb.c
index b0b93839c28..4568adb1a95 100644
--- a/lib/lmb.c
+++ b/lib/lmb.c
@@ -13,6 +13,7 @@
 #include <malloc.h>
 #include <stdio.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 #define LMB_ALLOC_ANYWHERE	0
 
diff --git a/lib/lzma/LzmaTools.c b/lib/lzma/LzmaTools.c
index 521258e623f..5ce03bbbb75 100644
--- a/lib/lzma/LzmaTools.c
+++ b/lib/lzma/LzmaTools.c
@@ -21,6 +21,7 @@
 #include <common.h>
 #include <log.h>
 #include <watchdog.h>
+#include <linux/kernel.h>
 
 #ifdef CONFIG_LZMA
 
diff --git a/lib/lzo/lzo1x_decompress.c b/lib/lzo/lzo1x_decompress.c
index 48800c91ccf..393f31566bd 100644
--- a/lib/lzo/lzo1x_decompress.c
+++ b/lib/lzo/lzo1x_decompress.c
@@ -12,6 +12,8 @@
  */
 
 #include <common.h>
+#include <stdbool.h>
+#include <linux/kernel.h>
 #include <linux/lzo.h>
 #include <asm/byteorder.h>
 #include <asm/unaligned.h>
diff --git a/lib/membuff.c b/lib/membuff.c
index 6abac4114f9..94f6e25e826 100644
--- a/lib/membuff.c
+++ b/lib/membuff.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "membuff.h"
 
diff --git a/lib/of_live.c b/lib/of_live.c
index fd83a6ba420..208f6ada571 100644
--- a/lib/of_live.c
+++ b/lib/of_live.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <log.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <of_live.h>
 #include <malloc.h>
diff --git a/lib/smbios.c b/lib/smbios.c
index 489a0d61ee2..73cd07b599e 100644
--- a/lib/smbios.c
+++ b/lib/smbios.c
@@ -17,6 +17,7 @@
 #include <dm.h>
 #include <dm/uclass-internal.h>
 #endif
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 /**
diff --git a/lib/time.c b/lib/time.c
index 1a2a1166cf8..733beb7dcc2 100644
--- a/lib/time.c
+++ b/lib/time.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <bootstage.h>
+#include <compiler.h>
 #include <dm.h>
 #include <errno.h>
 #include <init.h>
diff --git a/lib/tiny-printf.c b/lib/tiny-printf.c
index 60a0619aafc..9e16f535063 100644
--- a/lib/tiny-printf.c
+++ b/lib/tiny-printf.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <stdarg.h>
 #include <serial.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/ctype.h>
diff --git a/lib/tpm-v1.c b/lib/tpm-v1.c
index e7221dd8f2e..c3f9dde9e86 100644
--- a/lib/tpm-v1.c
+++ b/lib/tpm-v1.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <log.h>
 #include <asm/unaligned.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <u-boot/sha1.h>
 #include <tpm-common.h>
diff --git a/lib/tpm-v2.c b/lib/tpm-v2.c
index 594ccb6c234..d278acfb436 100644
--- a/lib/tpm-v2.c
+++ b/lib/tpm-v2.c
@@ -9,6 +9,7 @@
 #include <tpm-common.h>
 #include <tpm-v2.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "tpm-utils.h"
 
diff --git a/lib/trace.c b/lib/trace.c
index 8ab4258b35a..8f666133caa 100644
--- a/lib/trace.c
+++ b/lib/trace.c
@@ -13,6 +13,7 @@
 #include <asm/io.h>
 #include <asm/sections.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/lib/uuid.c b/lib/uuid.c
index 3a6cd7e87fd..3111318808c 100644
--- a/lib/uuid.c
+++ b/lib/uuid.c
@@ -18,6 +18,7 @@
 #include <part_efi.h>
 #include <malloc.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 /*
diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index 7be3127c2a1..c8f663cf4da 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -25,6 +25,7 @@
 #include <linux/ctype.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/types.h>
 #include <linux/string.h>
 
diff --git a/net/arp.c b/net/arp.c
index 2a4449489ff..aaf5d3c27fd 100644
--- a/net/arp.c
+++ b/net/arp.c
@@ -13,6 +13,7 @@
 #include <env.h>
 #include <log.h>
 #include <net.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <vsprintf.h>
diff --git a/net/bootp.c b/net/bootp.c
index 6e9f2fc57d1..6fde55fe862 100644
--- a/net/bootp.c
+++ b/net/bootp.c
@@ -21,6 +21,7 @@
 #include <uuid.h>
 #include <vsprintf.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <net/tftp.h>
 #include "bootp.h"
diff --git a/net/eth-uclass.c b/net/eth-uclass.c
index a20b896170c..05f35cdfb5f 100644
--- a/net/eth-uclass.c
+++ b/net/eth-uclass.c
@@ -11,6 +11,7 @@
 #include <env.h>
 #include <log.h>
 #include <net.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
diff --git a/net/eth_legacy.c b/net/eth_legacy.c
index d42e7e705b6..c5522f974c7 100644
--- a/net/eth_legacy.c
+++ b/net/eth_legacy.c
@@ -18,6 +18,7 @@
 #include <asm/u-boot.h>
 #include <linux/bug.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <net/pcap.h>
 #include "eth_internal.h"
diff --git a/net/fastboot.c b/net/fastboot.c
index 93b4863d476..b6006ddd2a9 100644
--- a/net/fastboot.c
+++ b/net/fastboot.c
@@ -9,6 +9,7 @@
 #include <net.h>
 #include <stdio.h>
 #include <time.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include <net/fastboot.h>
diff --git a/net/mdio-mux-uclass.c b/net/mdio-mux-uclass.c
index 1325484e0d9..5766c33ebbd 100644
--- a/net/mdio-mux-uclass.c
+++ b/net/mdio-mux-uclass.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <log.h>
 #include <miiphy.h>
+#include <stdbool.h>
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
 #include <dm/lists.h>
diff --git a/net/net.c b/net/net.c
index 8fb5c25c00d..1689f00c002 100644
--- a/net/net.c
+++ b/net/net.c
@@ -97,6 +97,7 @@
 #include <image.h>
 #include <log.h>
 #include <net.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <vsprintf.h>
diff --git a/net/pcap.c b/net/pcap.c
index 907aa1cda09..4ddc55801d7 100644
--- a/net/pcap.c
+++ b/net/pcap.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <net.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <linux/errno.h>
 #include <linux/string.h>
diff --git a/net/tftp.c b/net/tftp.c
index 1f35649c5c8..be1ff2cd9d4 100644
--- a/net/tftp.c
+++ b/net/tftp.c
@@ -20,6 +20,7 @@
 #include <time.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <net/tftp.h>
 #include "bootp.h"
diff --git a/post/drivers/memory.c b/post/drivers/memory.c
index 05dbfc144c8..e8cded75223 100644
--- a/post/drivers/memory.c
+++ b/post/drivers/memory.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 /* Memory test
  *
diff --git a/post/lib_powerpc/andi.c b/post/lib_powerpc/andi.c
index d4f60aa7388..cea61eb87a6 100644
--- a/post/lib_powerpc/andi.c
+++ b/post/lib_powerpc/andi.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <irq_func.h>
+#include <linux/kernel.h>
 
 /*
  * CPU test
diff --git a/post/lib_powerpc/cmp.c b/post/lib_powerpc/cmp.c
index e70869774ce..bcfd1892991 100644
--- a/post/lib_powerpc/cmp.c
+++ b/post/lib_powerpc/cmp.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <irq_func.h>
+#include <linux/kernel.h>
 
 /*
  * CPU test
diff --git a/post/lib_powerpc/cmpi.c b/post/lib_powerpc/cmpi.c
index 85a9b0ad36b..29a65895306 100644
--- a/post/lib_powerpc/cmpi.c
+++ b/post/lib_powerpc/cmpi.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <irq_func.h>
+#include <linux/kernel.h>
 
 /*
  * CPU test
diff --git a/post/lib_powerpc/cr.c b/post/lib_powerpc/cr.c
index 56ed355dde7..1c1c1e3700b 100644
--- a/post/lib_powerpc/cr.c
+++ b/post/lib_powerpc/cr.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <irq_func.h>
+#include <linux/kernel.h>
 
 /*
  * CPU test
diff --git a/post/lib_powerpc/fpu/mul-subnormal-single-1.c b/post/lib_powerpc/fpu/mul-subnormal-single-1.c
index cb61c9114d7..2517a4f0af5 100644
--- a/post/lib_powerpc/fpu/mul-subnormal-single-1.c
+++ b/post/lib_powerpc/fpu/mul-subnormal-single-1.c
@@ -10,6 +10,7 @@
  */
 
 #include <common.h>
+#include <linux/kernel.h>
 
 #include <post.h>
 
diff --git a/post/lib_powerpc/load.c b/post/lib_powerpc/load.c
index 5269563b1e1..19f88d07d7f 100644
--- a/post/lib_powerpc/load.c
+++ b/post/lib_powerpc/load.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <irq_func.h>
+#include <linux/kernel.h>
 
 /*
  * CPU test
diff --git a/post/lib_powerpc/multi.c b/post/lib_powerpc/multi.c
index 31134a9f1b5..29c102d70ee 100644
--- a/post/lib_powerpc/multi.c
+++ b/post/lib_powerpc/multi.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <irq_func.h>
 #include <log.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 /*
diff --git a/post/lib_powerpc/rlwimi.c b/post/lib_powerpc/rlwimi.c
index 7b4dc79fb17..be63f960ed6 100644
--- a/post/lib_powerpc/rlwimi.c
+++ b/post/lib_powerpc/rlwimi.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <irq_func.h>
+#include <linux/kernel.h>
 
 /*
  * CPU test
diff --git a/post/lib_powerpc/rlwinm.c b/post/lib_powerpc/rlwinm.c
index 8a03e9b9bcb..13577f858e1 100644
--- a/post/lib_powerpc/rlwinm.c
+++ b/post/lib_powerpc/rlwinm.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <irq_func.h>
+#include <linux/kernel.h>
 
 /*
  * CPU test
diff --git a/post/lib_powerpc/rlwnm.c b/post/lib_powerpc/rlwnm.c
index e2beb4e4171..2a3525466c3 100644
--- a/post/lib_powerpc/rlwnm.c
+++ b/post/lib_powerpc/rlwnm.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <irq_func.h>
+#include <linux/kernel.h>
 
 /*
  * CPU test
diff --git a/post/lib_powerpc/srawi.c b/post/lib_powerpc/srawi.c
index d4a8fabc425..22a747b63ea 100644
--- a/post/lib_powerpc/srawi.c
+++ b/post/lib_powerpc/srawi.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <irq_func.h>
+#include <linux/kernel.h>
 
 /*
  * CPU test
diff --git a/post/lib_powerpc/store.c b/post/lib_powerpc/store.c
index 8e278fee885..a8bf67ea9e2 100644
--- a/post/lib_powerpc/store.c
+++ b/post/lib_powerpc/store.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <irq_func.h>
+#include <linux/kernel.h>
 
 /*
  * CPU test
diff --git a/post/lib_powerpc/three.c b/post/lib_powerpc/three.c
index fc6f1f5674a..a4f7262698c 100644
--- a/post/lib_powerpc/three.c
+++ b/post/lib_powerpc/three.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <irq_func.h>
+#include <linux/kernel.h>
 
 /*
  * CPU test
diff --git a/post/lib_powerpc/threei.c b/post/lib_powerpc/threei.c
index f49c85e6b9d..74d6a3f2999 100644
--- a/post/lib_powerpc/threei.c
+++ b/post/lib_powerpc/threei.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <irq_func.h>
+#include <linux/kernel.h>
 
 /*
  * CPU test
diff --git a/post/lib_powerpc/threex.c b/post/lib_powerpc/threex.c
index 6bc5a54706b..e8c6959bf90 100644
--- a/post/lib_powerpc/threex.c
+++ b/post/lib_powerpc/threex.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <irq_func.h>
+#include <linux/kernel.h>
 
 /*
  * CPU test
diff --git a/post/lib_powerpc/two.c b/post/lib_powerpc/two.c
index fa376c76b1b..a576452f6f2 100644
--- a/post/lib_powerpc/two.c
+++ b/post/lib_powerpc/two.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <irq_func.h>
+#include <linux/kernel.h>
 
 /*
  * CPU test
diff --git a/post/lib_powerpc/twox.c b/post/lib_powerpc/twox.c
index 5c36012a9b7..4e53fff2774 100644
--- a/post/lib_powerpc/twox.c
+++ b/post/lib_powerpc/twox.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <irq_func.h>
+#include <linux/kernel.h>
 
 /*
  * CPU test
diff --git a/post/post.c b/post/post.c
index dee7ff1ce14..758e4ecba19 100644
--- a/post/post.c
+++ b/post/post.c
@@ -18,6 +18,7 @@
 #include <div64.h>
 #include <post.h>
 #include <asm/global_data.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #ifdef CONFIG_SYS_POST_HOTKEYS_GPIO
diff --git a/post/tests.c b/post/tests.c
index 5c019b643df..3b9af1cdc54 100644
--- a/post/tests.c
+++ b/post/tests.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <linux/kernel.h>
 
 #include <post.h>
 
diff --git a/test/bloblist.c b/test/bloblist.c
index 19b8f65b81b..fed3e60d211 100644
--- a/test/bloblist.c
+++ b/test/bloblist.c
@@ -9,6 +9,7 @@
 #include <mapmem.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <test/suites.h>
 #include <test/test.h>
 #include <test/ut.h>
diff --git a/test/cmd_ut.c b/test/cmd_ut.c
index a1cbbe2e405..be9f0781a93 100644
--- a/test/cmd_ut.c
+++ b/test/cmd_ut.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <command.h>
 #include <stdio.h>
+#include <linux/kernel.h>
 #include <test/suites.h>
 #include <test/test.h>
 
diff --git a/test/dm/acpi.c b/test/dm/acpi.c
index 6890c51859d..aebaea81df2 100644
--- a/test/dm/acpi.c
+++ b/test/dm/acpi.c
@@ -21,6 +21,7 @@
 #include <dm/acpi.h>
 #include <dm/test.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <test/ut.h>
 #include "acpi.h"
 
diff --git a/test/dm/acpi_dp.c b/test/dm/acpi_dp.c
index 8f4ec5fccb2..ce9c5e9abb0 100644
--- a/test/dm/acpi_dp.c
+++ b/test/dm/acpi_dp.c
@@ -15,6 +15,7 @@
 #include <dm/acpi.h>
 #include <dm/test.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <test/ut.h>
 #include "acpi.h"
 
diff --git a/test/dm/acpigen.c b/test/dm/acpigen.c
index 094af174526..8c9afe82194 100644
--- a/test/dm/acpigen.c
+++ b/test/dm/acpigen.c
@@ -19,6 +19,7 @@
 #include <dm/test.h>
 #include <dm/uclass-internal.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <test/ut.h>
 #include "acpi.h"
 
diff --git a/test/dm/axi.c b/test/dm/axi.c
index e1155a51dd7..0706a733b74 100644
--- a/test/dm/axi.c
+++ b/test/dm/axi.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <log.h>
 #include <dm/test.h>
+#include <linux/kernel.h>
 #include <test/ut.h>
 #include <asm/axi.h>
 
diff --git a/test/dm/board.c b/test/dm/board.c
index 5472c65fad6..8196e4a4c48 100644
--- a/test/dm/board.c
+++ b/test/dm/board.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <stdbool.h>
 #include <dm/test.h>
 #include <board.h>
 #include <test/ut.h>
diff --git a/test/dm/core.c b/test/dm/core.c
index c357e56efea..461098c0a2a 100644
--- a/test/dm/core.c
+++ b/test/dm/core.c
@@ -19,6 +19,7 @@
 #include <dm/test.h>
 #include <dm/uclass-internal.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <test/ut.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/test/dm/gpio.c b/test/dm/gpio.c
index 4bcd91a03a6..7972e6aba67 100644
--- a/test/dm/gpio.c
+++ b/test/dm/gpio.c
@@ -14,6 +14,7 @@
 #include <dm/util.h>
 #include <asm/gpio.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <test/ut.h>
 
 /* Test that sandbox GPIOs work correctly */
diff --git a/test/dm/i2s.c b/test/dm/i2s.c
index 49ebc3523c0..76d3d34eaa0 100644
--- a/test/dm/i2s.c
+++ b/test/dm/i2s.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <i2s.h>
 #include <dm/test.h>
+#include <linux/kernel.h>
 #include <test/ut.h>
 #include <asm/test.h>
 
diff --git a/test/dm/k210_pll.c b/test/dm/k210_pll.c
index 94740ce0926..076dc770b87 100644
--- a/test/dm/k210_pll.c
+++ b/test/dm/k210_pll.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 /* For DIV_ROUND_DOWN_ULL, defined in linux/kernel.h */
 #include <div64.h>
 #include <dm/test.h>
diff --git a/test/dm/misc.c b/test/dm/misc.c
index 26fd6acecb9..6fff38e978a 100644
--- a/test/dm/misc.c
+++ b/test/dm/misc.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <stdbool.h>
 #include <dm/test.h>
 #include <misc.h>
 #include <test/ut.h>
diff --git a/test/dm/panel.c b/test/dm/panel.c
index 7e4ebd6d81e..907257042ed 100644
--- a/test/dm/panel.c
+++ b/test/dm/panel.c
@@ -10,6 +10,7 @@
 #include <backlight.h>
 #include <dm.h>
 #include <panel.h>
+#include <stdbool.h>
 #include <video.h>
 #include <asm/gpio.h>
 #include <asm/test.h>
diff --git a/test/dm/regulator.c b/test/dm/regulator.c
index 2ba90755a7d..2d6f88cf04f 100644
--- a/test/dm/regulator.c
+++ b/test/dm/regulator.c
@@ -18,6 +18,7 @@
 #include <dm/test.h>
 #include <dm/uclass-internal.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/sandbox_pmic.h>
diff --git a/test/dm/remoteproc.c b/test/dm/remoteproc.c
index 6b72fa0c2b9..bfeadad8996 100644
--- a/test/dm/remoteproc.c
+++ b/test/dm/remoteproc.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <dm/test.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <test/ut.h>
 /**
  * dm_test_remoteproc_base() - test the operations after initializations
diff --git a/test/dm/rtc.c b/test/dm/rtc.c
index d6f7ce6ae44..2ef74cd98dd 100644
--- a/test/dm/rtc.c
+++ b/test/dm/rtc.c
@@ -10,6 +10,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <rtc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/io.h>
 #include <asm/rtc.h>
diff --git a/test/dm/test-main.c b/test/dm/test-main.c
index 4c6b17db75e..8745ce917c5 100644
--- a/test/dm/test-main.c
+++ b/test/dm/test-main.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/state.h>
diff --git a/test/lib/test_aes.c b/test/lib/test_aes.c
index d287aedbdd1..2ba300e4a54 100644
--- a/test/lib/test_aes.c
+++ b/test/lib/test_aes.c
@@ -11,6 +11,7 @@
 #include <rand.h>
 #include <stdio.h>
 #include <uboot_aes.h>
+#include <linux/kernel.h>
 #include <test/lib.h>
 #include <test/test.h>
 #include <test/ut.h>
diff --git a/test/optee/cmd_ut_optee.c b/test/optee/cmd_ut_optee.c
index 9153d715918..7ad13a930a2 100644
--- a/test/optee/cmd_ut_optee.c
+++ b/test/optee/cmd_ut_optee.c
@@ -9,6 +9,7 @@
 #include <fdt_support.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <linux/errno.h>
 #include <tee/optee.h>
 
diff --git a/test/str_ut.c b/test/str_ut.c
index ef1205dbbd0..990f356227c 100644
--- a/test/str_ut.c
+++ b/test/str_ut.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <vsprintf.h>
+#include <linux/kernel.h>
 #include <test/suites.h>
 #include <test/test.h>
 #include <test/ut.h>
diff --git a/test/time_ut.c b/test/time_ut.c
index 1670c5d2184..456186e08e9 100644
--- a/test/time_ut.c
+++ b/test/time_ut.c
@@ -11,6 +11,7 @@
 #include <time.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 static int test_get_timer(void)
 {
diff --git a/test/unicode_ut.c b/test/unicode_ut.c
index ace35c18a42..cfea5a9798a 100644
--- a/test/unicode_ut.c
+++ b/test/unicode_ut.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <vsprintf.h>
+#include <linux/kernel.h>
 #include <test/test.h>
 #include <test/suites.h>
 #include <test/ut.h>
-- 
2.28.0.163.g6104cc2f0b6-goog

^ permalink raw reply related	[flat|nested] 35+ messages in thread

* [PATCH 13/16] common: Drop linux/types.h from common header
  2020-08-02 22:59 [PATCH 00/16] common: Drop remaining includes in common.h Simon Glass
                   ` (11 preceding siblings ...)
  2020-08-02 22:59 ` [PATCH 12/16] common: Drop linux/kernel.h " Simon Glass
@ 2020-08-02 22:59 ` Simon Glass
  2020-08-02 22:59 ` [PATCH 14/16] common: Move the build-system includes to a separate file Simon Glass
                   ` (3 subsequent siblings)
  16 siblings, 0 replies; 35+ messages in thread
From: Simon Glass @ 2020-08-02 22:59 UTC (permalink / raw)
  To: u-boot

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

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

 api/api_display.c                                             | 1 +
 api/api_private.h                                             | 1 +
 api/api_storage.c                                             | 1 +
 arch/arc/include/asm/sections.h                               | 1 +
 arch/arc/include/asm/u-boot-arc.h                             | 1 +
 arch/arc/lib/bootm.c                                          | 2 ++
 arch/arc/lib/cache.c                                          | 1 +
 arch/arc/lib/cpu.c                                            | 1 +
 arch/arc/lib/relocate.c                                       | 1 +
 arch/arc/lib/reset.c                                          | 2 ++
 arch/arm/cpu/arm1136/mx31/generic.c                           | 1 +
 arch/arm/cpu/arm1136/mx35/generic.c                           | 1 +
 arch/arm/cpu/arm720t/interrupts.c                             | 1 +
 arch/arm/cpu/arm920t/ep93xx/cpu.c                             | 1 +
 arch/arm/cpu/arm920t/ep93xx/led.c                             | 1 +
 arch/arm/cpu/arm920t/ep93xx/speed.c                           | 1 +
 arch/arm/cpu/arm926ejs/armada100/cpu.c                        | 1 +
 arch/arm/cpu/arm926ejs/armada100/dram.c                       | 1 +
 arch/arm/cpu/arm926ejs/armada100/timer.c                      | 1 +
 arch/arm/cpu/arm926ejs/cache.c                                | 1 +
 arch/arm/cpu/arm926ejs/mx25/generic.c                         | 1 +
 arch/arm/cpu/arm926ejs/mx25/reset.c                           | 1 +
 arch/arm/cpu/arm926ejs/mx27/generic.c                         | 1 +
 arch/arm/cpu/arm926ejs/mx27/reset.c                           | 1 +
 arch/arm/cpu/arm926ejs/mx27/timer.c                           | 1 +
 arch/arm/cpu/arm926ejs/mxs/clock.c                            | 1 +
 arch/arm/cpu/arm926ejs/mxs/iomux.c                            | 1 +
 arch/arm/cpu/arm926ejs/mxs/mxs.c                              | 2 ++
 arch/arm/cpu/arm926ejs/mxs/mxs_init.h                         | 1 +
 arch/arm/cpu/arm926ejs/mxs/spl_boot.c                         | 1 +
 arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c                     | 2 ++
 arch/arm/cpu/arm926ejs/mxs/spl_power_init.c                   | 2 ++
 arch/arm/cpu/arm926ejs/mxs/timer.c                            | 1 +
 arch/arm/cpu/arm926ejs/spear/cpu.c                            | 1 +
 arch/arm/cpu/arm926ejs/spear/reset.c                          | 1 +
 arch/arm/cpu/arm926ejs/spear/spear600.c                       | 1 +
 arch/arm/cpu/arm926ejs/spear/spl.c                            | 1 +
 .../cpu/arm926ejs/spear/spr600_mt47h128m8_3_266_cl5_async.c   | 1 +
 .../arm/cpu/arm926ejs/spear/spr600_mt47h32m16_333_cl5_psync.c | 1 +
 .../cpu/arm926ejs/spear/spr600_mt47h32m16_37e_166_cl4_sync.c  | 1 +
 .../cpu/arm926ejs/spear/spr600_mt47h64m16_3_333_cl5_psync.c   | 1 +
 arch/arm/cpu/arm926ejs/spear/spr_misc.c                       | 1 +
 arch/arm/cpu/arm926ejs/spear/timer.c                          | 1 +
 arch/arm/cpu/arm946es/cpu.c                                   | 1 +
 arch/arm/cpu/armv7/arch_timer.c                               | 1 +
 arch/arm/cpu/armv7/bcm235xx/clk-bsc.c                         | 1 +
 arch/arm/cpu/armv7/bcm235xx/clk-core.c                        | 2 ++
 arch/arm/cpu/armv7/bcm235xx/clk-core.h                        | 1 +
 arch/arm/cpu/armv7/bcm235xx/clk-sdio.c                        | 1 +
 arch/arm/cpu/armv7/bcm235xx/clk-usb-otg.c                     | 1 +
 arch/arm/cpu/armv7/bcm281xx/clk-bsc.c                         | 1 +
 arch/arm/cpu/armv7/bcm281xx/clk-core.c                        | 2 ++
 arch/arm/cpu/armv7/bcm281xx/clk-core.h                        | 1 +
 arch/arm/cpu/armv7/bcm281xx/clk-sdio.c                        | 1 +
 arch/arm/cpu/armv7/bcm281xx/clk-usb-otg.c                     | 1 +
 arch/arm/cpu/armv7/bcm281xx/reset.c                           | 1 +
 arch/arm/cpu/armv7/bcmcygnus/reset.c                          | 1 +
 arch/arm/cpu/armv7/bcmnsp/reset.c                             | 1 +
 arch/arm/cpu/armv7/cache_v7.c                                 | 1 +
 arch/arm/cpu/armv7/cp15.c                                     | 2 ++
 arch/arm/cpu/armv7/cpu.c                                      | 1 +
 arch/arm/cpu/armv7/exception_level.c                          | 1 +
 arch/arm/cpu/armv7/iproc-common/armpll.c                      | 1 +
 arch/arm/cpu/armv7/iproc-common/timer.c                       | 1 +
 arch/arm/cpu/armv7/kona-common/clk-stubs.c                    | 1 +
 arch/arm/cpu/armv7/ls102xa/clock.c                            | 2 ++
 arch/arm/cpu/armv7/ls102xa/cpu.c                              | 2 ++
 arch/arm/cpu/armv7/ls102xa/fdt.c                              | 2 ++
 arch/arm/cpu/armv7/ls102xa/fsl_epu.c                          | 1 +
 arch/arm/cpu/armv7/ls102xa/fsl_ls1_serdes.c                   | 2 ++
 arch/arm/cpu/armv7/ls102xa/fsl_ls1_serdes.h                   | 1 +
 arch/arm/cpu/armv7/ls102xa/ls102xa_psci.c                     | 2 ++
 arch/arm/cpu/armv7/ls102xa/ls102xa_serdes.c                   | 1 +
 arch/arm/cpu/armv7/ls102xa/soc.c                              | 2 ++
 arch/arm/cpu/armv7/ls102xa/spl.c                              | 1 +
 arch/arm/cpu/armv7/ls102xa/timer.c                            | 1 +
 arch/arm/cpu/armv7/mpu_v7r.c                                  | 1 +
 arch/arm/cpu/armv7/psci-common.c                              | 1 +
 arch/arm/cpu/armv7/s5p-common/cpu_info.c                      | 1 +
 arch/arm/cpu/armv7/s5p-common/pwm.c                           | 1 +
 arch/arm/cpu/armv7/s5p-common/sromc.c                         | 1 +
 arch/arm/cpu/armv7/s5p-common/timer.c                         | 1 +
 arch/arm/cpu/armv7/s5p4418/cpu.c                              | 1 +
 arch/arm/cpu/armv7/stv0991/reset.c                            | 1 +
 arch/arm/cpu/armv7/stv0991/timer.c                            | 1 +
 arch/arm/cpu/armv7/sunxi/psci.c                               | 1 +
 arch/arm/cpu/armv7/sunxi/timer.c                              | 1 +
 arch/arm/cpu/armv7/syslib.c                                   | 1 +
 arch/arm/cpu/armv7/vf610/generic.c                            | 2 ++
 arch/arm/cpu/armv7/vf610/timer.c                              | 1 +
 arch/arm/cpu/armv7/virt-v7.c                                  | 2 ++
 arch/arm/cpu/armv7m/cache.c                                   | 1 +
 arch/arm/cpu/armv7m/cpu.c                                     | 1 +
 arch/arm/cpu/armv7m/mpu.c                                     | 1 +
 arch/arm/cpu/armv7m/systick-timer.c                           | 1 +
 arch/arm/cpu/armv8/cache_v8.c                                 | 3 +++
 arch/arm/cpu/armv8/cpu.c                                      | 2 ++
 arch/arm/cpu/armv8/exception_level.c                          | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/cpu.c                       | 2 ++
 arch/arm/cpu/armv8/fsl-layerscape/cpu.h                       | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/fdt.c                       | 2 ++
 arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_serdes.c          | 2 ++
 arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c           | 2 ++
 arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c          | 2 ++
 arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c           | 2 ++
 arch/arm/cpu/armv8/fsl-layerscape/icid.c                      | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/ls1012a_serdes.c            | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/ls1028_ids.c                | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/ls1028a_serdes.c            | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/ls1043a_serdes.c            | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/ls1046a_serdes.c            | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/ls1088a_serdes.c            | 3 +++
 arch/arm/cpu/armv8/fsl-layerscape/ls2080a_serdes.c            | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/lx2160a_serdes.c            | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/mp.c                        | 2 ++
 arch/arm/cpu/armv8/fsl-layerscape/ppa.c                       | 2 ++
 arch/arm/cpu/armv8/fsl-layerscape/soc.c                       | 2 ++
 arch/arm/cpu/armv8/fsl-layerscape/spl.c                       | 2 ++
 arch/arm/cpu/armv8/fwcall.c                                   | 1 +
 arch/arm/cpu/armv8/generic_timer.c                            | 1 +
 arch/arm/cpu/armv8/hisilicon/pinmux.c                         | 1 +
 arch/arm/cpu/armv8/s32v234/cpu.c                              | 1 +
 arch/arm/cpu/armv8/s32v234/cpu.h                              | 1 +
 arch/arm/cpu/armv8/s32v234/generic.c                          | 1 +
 arch/arm/cpu/armv8/sec_firmware.c                             | 3 +++
 arch/arm/cpu/armv8/spl_data.c                                 | 1 +
 arch/arm/cpu/pxa/cache.c                                      | 1 +
 arch/arm/cpu/pxa/cpuinfo.c                                    | 1 +
 arch/arm/cpu/pxa/pxa2xx.c                                     | 1 +
 arch/arm/cpu/sa1100/cpu.c                                     | 1 +
 arch/arm/cpu/sa1100/timer.c                                   | 1 +
 arch/arm/include/asm/arch-am33xx/clk_synthesizer.h            | 1 +
 arch/arm/include/asm/arch-am33xx/clock.h                      | 1 +
 arch/arm/include/asm/arch-am33xx/ddr_defs.h                   | 1 +
 arch/arm/include/asm/arch-am33xx/sys_proto.h                  | 1 +
 arch/arm/include/asm/arch-armada100/cpu.h                     | 1 +
 arch/arm/include/asm/arch-armada100/spi.h                     | 1 +
 arch/arm/include/asm/arch-armada100/utmi-armada100.h          | 1 +
 arch/arm/include/asm/arch-armv7/globaltimer.h                 | 1 +
 arch/arm/include/asm/arch-armv7/sysctrl.h                     | 1 +
 arch/arm/include/asm/arch-armv7/systimer.h                    | 1 +
 arch/arm/include/asm/arch-armv7/wdt.h                         | 1 +
 arch/arm/include/asm/arch-aspeed/scu_ast2500.h                | 1 +
 arch/arm/include/asm/arch-aspeed/sdram_ast2500.h              | 1 +
 arch/arm/include/asm/arch-aspeed/timer.h                      | 1 +
 arch/arm/include/asm/arch-aspeed/wdt.h                        | 1 +
 arch/arm/include/asm/arch-ep93xx/ep93xx.h                     | 1 +
 arch/arm/include/asm/arch-fsl-layerscape/clock.h              | 1 +
 arch/arm/include/asm/arch-fsl-layerscape/cpu.h                | 1 +
 arch/arm/include/asm/arch-fsl-layerscape/fsl_portals.h        | 1 +
 arch/arm/include/asm/arch-fsl-layerscape/fsl_serdes.h         | 1 +
 arch/arm/include/asm/arch-fsl-layerscape/gpio.h               | 1 +
 arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h        | 1 +
 arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h        | 1 +
 arch/arm/include/asm/arch-fsl-layerscape/mp.h                 | 1 +
 arch/arm/include/asm/arch-hi6220/dwmmc.h                      | 1 +
 arch/arm/include/asm/arch-hi6220/gpio.h                       | 1 +
 arch/arm/include/asm/arch-hi6220/hi6220_regs_alwayson.h       | 1 +
 arch/arm/include/asm/arch-hi6220/pinmux.h                     | 1 +
 arch/arm/include/asm/arch-imx/cpu.h                           | 1 +
 arch/arm/include/asm/arch-imx8/clock.h                        | 1 +
 arch/arm/include/asm/arch-imx8/gpio.h                         | 1 +
 arch/arm/include/asm/arch-imx8/image.h                        | 1 +
 arch/arm/include/asm/arch-imx8/iomux.h                        | 1 +
 arch/arm/include/asm/arch-imx8/sci/rpc.h                      | 1 +
 arch/arm/include/asm/arch-imx8/sci/sci.h                      | 1 +
 arch/arm/include/asm/arch-imx8/sci/svc/misc/api.h             | 1 +
 arch/arm/include/asm/arch-imx8/sci/svc/pm/api.h               | 1 +
 arch/arm/include/asm/arch-imx8/sci/svc/rm/api.h               | 1 +
 arch/arm/include/asm/arch-imx8/sci/svc/seco/api.h             | 1 +
 arch/arm/include/asm/arch-imx8m/clock.h                       | 1 +
 arch/arm/include/asm/arch-imx8m/clock_imx8mm.h                | 1 +
 arch/arm/include/asm/arch-imx8m/ddr.h                         | 1 +
 arch/arm/include/asm/arch-imxrt/gpio.h                        | 1 +
 arch/arm/include/asm/arch-lpc32xx/dma.h                       | 1 +
 arch/arm/include/asm/arch-lpc32xx/gpio.h                      | 1 +
 arch/arm/include/asm/arch-lpc32xx/i2c.h                       | 1 +
 arch/arm/include/asm/arch-lpc32xx/mux.h                       | 1 +
 arch/arm/include/asm/arch-ls102xa/clock.h                     | 1 +
 arch/arm/include/asm/arch-ls102xa/fsl_serdes.h                | 1 +
 arch/arm/include/asm/arch-ls102xa/immap_ls102xa.h             | 1 +
 arch/arm/include/asm/arch-ls102xa/ls102xa_stream_id.h         | 1 +
 arch/arm/include/asm/arch-mediatek/reset.h                    | 1 +
 arch/arm/include/asm/arch-meson/clock-gx.h                    | 1 +
 arch/arm/include/asm/arch-meson/sm.h                          | 1 +
 arch/arm/include/asm/arch-mvebu/spi.h                         | 1 +
 arch/arm/include/asm/arch-mx27/gpio.h                         | 1 +
 arch/arm/include/asm/arch-mx27/imx-regs.h                     | 1 +
 arch/arm/include/asm/arch-mx27/regs-rtc.h                     | 1 +
 arch/arm/include/asm/arch-mx31/clock.h                        | 1 +
 arch/arm/include/asm/arch-mx31/sys_proto.h                    | 1 +
 arch/arm/include/asm/arch-mx35/clock.h                        | 1 +
 arch/arm/include/asm/arch-mx35/sys_proto.h                    | 1 +
 arch/arm/include/asm/arch-mx5/clock.h                         | 1 +
 arch/arm/include/asm/arch-mx5/crm_regs.h                      | 1 +
 arch/arm/include/asm/arch-mx6/crm_regs.h                      | 1 +
 arch/arm/include/asm/arch-mx6/mx6-ddr.h                       | 1 +
 arch/arm/include/asm/arch-mx6/mxc_hdmi.h                      | 1 +
 arch/arm/include/asm/arch-mx6/sys_proto.h                     | 1 +
 arch/arm/include/asm/arch-mx7/clock.h                         | 1 +
 arch/arm/include/asm/arch-mx7/clock_slice.h                   | 1 +
 arch/arm/include/asm/arch-mx7/crm_regs.h                      | 1 +
 arch/arm/include/asm/arch-mx7/imx-regs.h                      | 1 +
 arch/arm/include/asm/arch-mx7/mx7-ddr.h                       | 1 +
 arch/arm/include/asm/arch-mx7ulp/clock.h                      | 1 +
 arch/arm/include/asm/arch-mx7ulp/gpio.h                       | 1 +
 arch/arm/include/asm/arch-mx7ulp/pcc.h                        | 1 +
 arch/arm/include/asm/arch-mx7ulp/scg.h                        | 1 +
 arch/arm/include/asm/arch-mxs/clock.h                         | 1 +
 arch/arm/include/asm/arch-mxs/regs-clkctrl-mx23.h             | 1 +
 arch/arm/include/asm/arch-mxs/regs-clkctrl-mx28.h             | 1 +
 arch/arm/include/asm/arch-mxs/regs-digctl.h                   | 1 +
 arch/arm/include/asm/arch-mxs/regs-pinctrl.h                  | 1 +
 arch/arm/include/asm/arch-mxs/regs-power-mx23.h               | 1 +
 arch/arm/include/asm/arch-mxs/regs-power-mx28.h               | 1 +
 arch/arm/include/asm/arch-mxs/regs-ssp.h                      | 1 +
 arch/arm/include/asm/arch-mxs/regs-usb.h                      | 1 +
 arch/arm/include/asm/arch-mxs/sys_proto.h                     | 1 +
 arch/arm/include/asm/arch-omap3/dma.h                         | 1 +
 arch/arm/include/asm/arch-omap3/dss.h                         | 1 +
 arch/arm/include/asm/arch-omap3/mem.h                         | 1 +
 arch/arm/include/asm/arch-omap3/musb.h                        | 1 +
 arch/arm/include/asm/arch-omap3/sys_proto.h                   | 1 +
 arch/arm/include/asm/arch-omap4/clock.h                       | 1 +
 arch/arm/include/asm/arch-omap4/sys_proto.h                   | 1 +
 arch/arm/include/asm/arch-omap5/dra7xx_iodelay.h              | 1 +
 arch/arm/include/asm/arch-omap5/sys_proto.h                   | 1 +
 arch/arm/include/asm/arch-pxa/pxa.h                           | 1 +
 arch/arm/include/asm/arch-pxa/regs-mmc.h                      | 1 +
 arch/arm/include/asm/arch-pxa/regs-uart.h                     | 1 +
 arch/arm/include/asm/arch-pxa/regs-usb.h                      | 1 +
 arch/arm/include/asm/arch-rk3308/cru_rk3308.h                 | 1 +
 arch/arm/include/asm/arch-rockchip/bootrom.h                  | 1 +
 arch/arm/include/asm/arch-rockchip/clock.h                    | 2 ++
 arch/arm/include/asm/arch-rockchip/cpu_rk3288.h               | 1 +
 arch/arm/include/asm/arch-rockchip/cru_px30.h                 | 1 +
 arch/arm/include/asm/arch-rockchip/cru_rk3036.h               | 1 +
 arch/arm/include/asm/arch-rockchip/cru_rk3128.h               | 1 +
 arch/arm/include/asm/arch-rockchip/cru_rk3188.h               | 1 +
 arch/arm/include/asm/arch-rockchip/cru_rk322x.h               | 1 +
 arch/arm/include/asm/arch-rockchip/cru_rk3288.h               | 1 +
 arch/arm/include/asm/arch-rockchip/cru_rk3328.h               | 1 +
 arch/arm/include/asm/arch-rockchip/cru_rk3399.h               | 1 +
 arch/arm/include/asm/arch-rockchip/cru_rv1108.h               | 1 +
 arch/arm/include/asm/arch-rockchip/ddr_rk3188.h               | 1 +
 arch/arm/include/asm/arch-rockchip/ddr_rk3288.h               | 1 +
 arch/arm/include/asm/arch-rockchip/ddr_rk3368.h               | 1 +
 arch/arm/include/asm/arch-rockchip/edp_rk3288.h               | 1 +
 arch/arm/include/asm/arch-rockchip/f_rockusb.h                | 1 +
 arch/arm/include/asm/arch-rockchip/gpio.h                     | 1 +
 arch/arm/include/asm/arch-rockchip/grf_rk3188.h               | 1 +
 arch/arm/include/asm/arch-rockchip/grf_rk3288.h               | 1 +
 arch/arm/include/asm/arch-rockchip/grf_rk3328.h               | 1 +
 arch/arm/include/asm/arch-rockchip/grf_rk3368.h               | 1 +
 arch/arm/include/asm/arch-rockchip/grf_rk3399.h               | 1 +
 arch/arm/include/asm/arch-rockchip/grf_rv1108.h               | 1 +
 arch/arm/include/asm/arch-rockchip/i2c.h                      | 1 +
 arch/arm/include/asm/arch-rockchip/misc.h                     | 1 +
 arch/arm/include/asm/arch-rockchip/pmu_rk3188.h               | 1 +
 arch/arm/include/asm/arch-rockchip/pmu_rk3288.h               | 1 +
 arch/arm/include/asm/arch-rockchip/pmu_rk3399.h               | 1 +
 arch/arm/include/asm/arch-rockchip/sdram.h                    | 1 +
 arch/arm/include/asm/arch-rockchip/sdram_common.h             | 1 +
 arch/arm/include/asm/arch-rockchip/sdram_msch.h               | 1 +
 arch/arm/include/asm/arch-rockchip/sdram_pctl_px30.h          | 2 ++
 arch/arm/include/asm/arch-rockchip/sdram_phy_px30.h           | 2 ++
 arch/arm/include/asm/arch-rockchip/sdram_px30.h               | 1 +
 arch/arm/include/asm/arch-rockchip/sdram_rk3036.h             | 1 +
 arch/arm/include/asm/arch-rockchip/sdram_rk322x.h             | 1 +
 arch/arm/include/asm/arch-rockchip/sdram_rk3288.h             | 1 +
 arch/arm/include/asm/arch-rockchip/sdram_rk3328.h             | 1 +
 arch/arm/include/asm/arch-rockchip/sdram_rk3399.h             | 1 +
 arch/arm/include/asm/arch-rockchip/timer.h                    | 1 +
 arch/arm/include/asm/arch-rockchip/vop_rk3288.h               | 1 +
 arch/arm/include/asm/arch-s32v234/lpddr2.h                    | 1 +
 arch/arm/include/asm/arch-spear/gpio.h                        | 1 +
 arch/arm/include/asm/arch-spear/spr_defs.h                    | 1 +
 arch/arm/include/asm/arch-spear/spr_emi.h                     | 1 +
 arch/arm/include/asm/arch-spear/spr_gpt.h                     | 1 +
 arch/arm/include/asm/arch-spear/spr_misc.h                    | 1 +
 arch/arm/include/asm/arch-spear/spr_ssp.h                     | 1 +
 arch/arm/include/asm/arch-spear/spr_syscntl.h                 | 1 +
 arch/arm/include/asm/arch-stm32/gpio.h                        | 1 +
 arch/arm/include/asm/arch-stm32f4/stm32.h                     | 1 +
 arch/arm/include/asm/arch-stm32f4/stm32_pwr.h                 | 1 +
 arch/arm/include/asm/arch-stm32f7/stm32.h                     | 1 +
 arch/arm/include/asm/arch-stm32f7/stm32_pwr.h                 | 1 +
 arch/arm/include/asm/arch-stm32f7/syscfg.h                    | 1 +
 arch/arm/include/asm/arch-stv0991/gpio.h                      | 1 +
 arch/arm/include/asm/arch-stv0991/stv0991_cgu.h               | 1 +
 arch/arm/include/asm/arch-stv0991/stv0991_creg.h              | 1 +
 arch/arm/include/asm/arch-stv0991/stv0991_gpt.h               | 1 +
 arch/arm/include/asm/arch-stv0991/stv0991_wdru.h              | 1 +
 arch/arm/include/asm/arch-sunxi/ccu.h                         | 1 +
 arch/arm/include/asm/arch-sunxi/clock_sun4i.h                 | 1 +
 arch/arm/include/asm/arch-sunxi/clock_sun50i_h6.h             | 1 +
 arch/arm/include/asm/arch-sunxi/clock_sun6i.h                 | 1 +
 arch/arm/include/asm/arch-sunxi/clock_sun8i_a83t.h            | 1 +
 arch/arm/include/asm/arch-sunxi/clock_sun9i.h                 | 1 +
 arch/arm/include/asm/arch-sunxi/cpucfg.h                      | 1 +
 arch/arm/include/asm/arch-sunxi/display.h                     | 1 +
 arch/arm/include/asm/arch-sunxi/display2.h                    | 1 +
 arch/arm/include/asm/arch-sunxi/dma_sun4i.h                   | 1 +
 arch/arm/include/asm/arch-sunxi/dram_sun4i.h                  | 1 +
 arch/arm/include/asm/arch-sunxi/dram_sun50i_h6.h              | 1 +
 arch/arm/include/asm/arch-sunxi/dram_sun6i.h                  | 1 +
 arch/arm/include/asm/arch-sunxi/dram_sun8i_a23.h              | 1 +
 arch/arm/include/asm/arch-sunxi/dram_sun8i_a33.h              | 1 +
 arch/arm/include/asm/arch-sunxi/dram_sun8i_a83t.h             | 1 +
 arch/arm/include/asm/arch-sunxi/dram_sun9i.h                  | 1 +
 arch/arm/include/asm/arch-sunxi/dram_sunxi_dw.h               | 1 +
 arch/arm/include/asm/arch-sunxi/lcdc.h                        | 1 +
 arch/arm/include/asm/arch-sunxi/prcm.h                        | 1 +
 arch/arm/include/asm/arch-sunxi/pwm.h                         | 1 +
 arch/arm/include/asm/arch-sunxi/rsb.h                         | 1 +
 arch/arm/include/asm/arch-sunxi/spl.h                         | 1 +
 arch/arm/include/asm/arch-sunxi/tve.h                         | 1 +
 arch/arm/include/asm/arch-sunxi/tzpc.h                        | 1 +
 arch/arm/include/asm/arch-sunxi/watchdog.h                    | 1 +
 arch/arm/include/asm/arch-tegra/apb_misc.h                    | 1 +
 arch/arm/include/asm/arch-tegra/bpmp_abi.h                    | 1 +
 arch/arm/include/asm/arch-tegra/cboot.h                       | 1 +
 arch/arm/include/asm/arch-tegra/clk_rst.h                     | 1 +
 arch/arm/include/asm/arch-tegra/clock.h                       | 1 +
 arch/arm/include/asm/arch-tegra/dc.h                          | 1 +
 arch/arm/include/asm/arch-tegra/fuse.h                        | 1 +
 arch/arm/include/asm/arch-tegra/gpio.h                        | 1 +
 arch/arm/include/asm/arch-tegra/ivc.h                         | 1 +
 arch/arm/include/asm/arch-tegra/pmc.h                         | 1 +
 arch/arm/include/asm/arch-tegra/pwm.h                         | 1 +
 arch/arm/include/asm/arch-tegra/scu.h                         | 1 +
 arch/arm/include/asm/arch-tegra/tegra_ahub.h                  | 1 +
 arch/arm/include/asm/arch-tegra/tegra_i2s.h                   | 1 +
 arch/arm/include/asm/arch-tegra/uart.h                        | 1 +
 arch/arm/include/asm/arch-tegra/usb.h                         | 1 +
 arch/arm/include/asm/arch-tegra/warmboot.h                    | 1 +
 arch/arm/include/asm/arch-tegra114/flow.h                     | 1 +
 arch/arm/include/asm/arch-tegra114/gp_padctrl.h               | 1 +
 arch/arm/include/asm/arch-tegra114/mc.h                       | 1 +
 arch/arm/include/asm/arch-tegra114/sysctr.h                   | 1 +
 arch/arm/include/asm/arch-tegra124/ahb.h                      | 1 +
 arch/arm/include/asm/arch-tegra124/clock.h                    | 1 +
 arch/arm/include/asm/arch-tegra124/flow.h                     | 1 +
 arch/arm/include/asm/arch-tegra124/gp_padctrl.h               | 1 +
 arch/arm/include/asm/arch-tegra124/gpio.h                     | 1 +
 arch/arm/include/asm/arch-tegra124/mc.h                       | 1 +
 arch/arm/include/asm/arch-tegra124/sysctr.h                   | 1 +
 arch/arm/include/asm/arch-tegra20/display.h                   | 1 +
 arch/arm/include/asm/arch-tegra20/flow.h                      | 1 +
 arch/arm/include/asm/arch-tegra20/gp_padctrl.h                | 1 +
 arch/arm/include/asm/arch-tegra20/gpio.h                      | 1 +
 arch/arm/include/asm/arch-tegra20/mc.h                        | 1 +
 arch/arm/include/asm/arch-tegra20/sdram_param.h               | 1 +
 arch/arm/include/asm/arch-tegra210/ahb.h                      | 1 +
 arch/arm/include/asm/arch-tegra210/flow.h                     | 1 +
 arch/arm/include/asm/arch-tegra210/gp_padctrl.h               | 1 +
 arch/arm/include/asm/arch-tegra210/gpio.h                     | 1 +
 arch/arm/include/asm/arch-tegra210/mc.h                       | 1 +
 arch/arm/include/asm/arch-tegra210/sysctr.h                   | 1 +
 arch/arm/include/asm/arch-tegra30/flow.h                      | 1 +
 arch/arm/include/asm/arch-tegra30/gp_padctrl.h                | 1 +
 arch/arm/include/asm/arch-tegra30/gpio.h                      | 1 +
 arch/arm/include/asm/arch-tegra30/mc.h                        | 1 +
 arch/arm/include/asm/arch-vf610/clock.h                       | 1 +
 arch/arm/include/asm/arch-vf610/ddrmc-vf610.h                 | 1 +
 arch/arm/include/asm/arch-vf610/gpio.h                        | 1 +
 arch/arm/include/asm/armv7_mpu.h                              | 1 +
 arch/arm/include/asm/armv7m.h                                 | 1 +
 arch/arm/include/asm/armv8/mmu.h                              | 2 ++
 arch/arm/include/asm/armv8/sec_firmware.h                     | 1 +
 arch/arm/include/asm/bootm.h                                  | 1 +
 arch/arm/include/asm/ehci-omap.h                              | 1 +
 arch/arm/include/asm/handoff.h                                | 1 +
 arch/arm/include/asm/io.h                                     | 1 +
 arch/arm/include/asm/iproc-common/iproc_sdhci.h               | 1 +
 arch/arm/include/asm/kona-common/kona_sdhci.h                 | 1 +
 arch/arm/include/asm/mach-imx/dma.h                           | 1 +
 arch/arm/include/asm/mach-imx/gpio.h                          | 1 +
 arch/arm/include/asm/mach-imx/hab.h                           | 1 +
 arch/arm/include/asm/mach-imx/imx-nandbcb.h                   | 1 +
 arch/arm/include/asm/mach-imx/module_fuse.h                   | 1 +
 arch/arm/include/asm/mach-imx/mxc_i2c.h                       | 1 +
 arch/arm/include/asm/mach-imx/rdc-sema.h                      | 1 +
 arch/arm/include/asm/mach-imx/regs-apbh.h                     | 1 +
 arch/arm/include/asm/mach-imx/regs-bch.h                      | 1 +
 arch/arm/include/asm/mach-imx/regs-gpmi.h                     | 1 +
 arch/arm/include/asm/mach-imx/regs-lcdif.h                    | 1 +
 arch/arm/include/asm/mach-imx/sys_proto.h                     | 1 +
 arch/arm/include/asm/mach-imx/syscounter.h                    | 1 +
 arch/arm/include/asm/mach-imx/video.h                         | 1 +
 arch/arm/include/asm/omap_gpio.h                              | 1 +
 arch/arm/include/asm/omap_i2c.h                               | 1 +
 arch/arm/include/asm/omap_mmc.h                               | 1 +
 arch/arm/include/asm/omap_musb.h                              | 1 +
 arch/arm/include/asm/omap_sec_common.h                        | 1 +
 arch/arm/include/asm/secure.h                                 | 1 +
 arch/arm/include/asm/setjmp.h                                 | 1 +
 arch/arm/include/asm/setup.h                                  | 1 +
 arch/arm/include/asm/system.h                                 | 1 +
 arch/arm/include/asm/ti-common/davinci_nand.h                 | 1 +
 arch/arm/include/asm/ti-common/keystone_nav.h                 | 1 +
 arch/arm/include/asm/ti-common/keystone_net.h                 | 1 +
 arch/arm/include/asm/ti-common/keystone_serdes.h              | 1 +
 arch/arm/include/asm/ti-common/sys_proto.h                    | 1 +
 arch/arm/include/asm/ti-common/ti-edma3.h                     | 2 ++
 arch/arm/include/asm/u-boot-arm.h                             | 1 +
 arch/arm/include/asm/utils.h                                  | 1 +
 arch/arm/lib/bootm-fdt.c                                      | 1 +
 arch/arm/lib/bootm.c                                          | 2 ++
 arch/arm/lib/cache-cp15.c                                     | 2 ++
 arch/arm/lib/cache.c                                          | 2 ++
 arch/arm/lib/cmd_boot.c                                       | 1 +
 arch/arm/lib/eabi_compat.c                                    | 1 +
 arch/arm/lib/gic-v3-its.c                                     | 1 +
 arch/arm/lib/image.c                                          | 2 ++
 arch/arm/lib/interrupts.c                                     | 1 +
 arch/arm/lib/interrupts_64.c                                  | 2 ++
 arch/arm/lib/reloc_aarch64_efi.c                              | 1 +
 arch/arm/lib/reloc_arm_efi.c                                  | 1 +
 arch/arm/lib/reset.c                                          | 1 +
 arch/arm/lib/semihosting.c                                    | 1 +
 arch/arm/lib/spl.c                                            | 2 ++
 arch/arm/lib/zimage.c                                         | 2 ++
 arch/arm/mach-aspeed/ast2500/sdram_ast2500.c                  | 1 +
 arch/arm/mach-aspeed/ast_wdt.c                                | 1 +
 arch/arm/mach-at91/arm920t/clock.c                            | 1 +
 arch/arm/mach-at91/arm920t/reset.c                            | 1 +
 arch/arm/mach-at91/arm920t/timer.c                            | 1 +
 arch/arm/mach-at91/arm926ejs/clock.c                          | 1 +
 arch/arm/mach-at91/arm926ejs/cpu.c                            | 1 +
 arch/arm/mach-at91/arm926ejs/eflash.c                         | 1 +
 arch/arm/mach-at91/arm926ejs/reset.c                          | 1 +
 arch/arm/mach-at91/arm926ejs/timer.c                          | 1 +
 arch/arm/mach-at91/armv7/clock.c                              | 1 +
 arch/arm/mach-at91/armv7/cpu.c                                | 1 +
 arch/arm/mach-at91/armv7/reset.c                              | 1 +
 arch/arm/mach-at91/armv7/timer.c                              | 1 +
 arch/arm/mach-at91/atmel_sfr.c                                | 1 +
 arch/arm/mach-at91/clock.c                                    | 1 +
 arch/arm/mach-at91/include/mach/at91_common.h                 | 1 +
 arch/arm/mach-at91/include/mach/at91_dbu.h                    | 1 +
 arch/arm/mach-at91/include/mach/at91_eefc.h                   | 1 +
 arch/arm/mach-at91/include/mach/at91_emac.h                   | 1 +
 arch/arm/mach-at91/include/mach/at91_gpbr.h                   | 1 +
 arch/arm/mach-at91/include/mach/at91_matrix.h                 | 1 +
 arch/arm/mach-at91/include/mach/at91_mc.h                     | 1 +
 arch/arm/mach-at91/include/mach/at91_pdc.h                    | 1 +
 arch/arm/mach-at91/include/mach/at91_pio.h                    | 1 +
 arch/arm/mach-at91/include/mach/at91_pit.h                    | 1 +
 arch/arm/mach-at91/include/mach/at91_rstc.h                   | 1 +
 arch/arm/mach-at91/include/mach/at91_rtt.h                    | 1 +
 arch/arm/mach-at91/include/mach/at91_sfr.h                    | 1 +
 arch/arm/mach-at91/include/mach/at91_spi.h                    | 1 +
 arch/arm/mach-at91/include/mach/at91_st.h                     | 1 +
 arch/arm/mach-at91/include/mach/at91_tc.h                     | 1 +
 arch/arm/mach-at91/include/mach/at91_wdt.h                    | 2 ++
 arch/arm/mach-at91/include/mach/at91sam9260_matrix.h          | 1 +
 arch/arm/mach-at91/include/mach/at91sam9261_matrix.h          | 1 +
 arch/arm/mach-at91/include/mach/at91sam9263_matrix.h          | 1 +
 arch/arm/mach-at91/include/mach/at91sam9_sdramc.h             | 1 +
 arch/arm/mach-at91/include/mach/at91sam9_smc.h                | 1 +
 arch/arm/mach-at91/include/mach/at91sam9g45_matrix.h          | 1 +
 arch/arm/mach-at91/include/mach/at91sam9rl_matrix.h           | 1 +
 arch/arm/mach-at91/include/mach/at91sam9x5_matrix.h           | 1 +
 arch/arm/mach-at91/include/mach/atmel_mpddrc.h                | 1 +
 arch/arm/mach-at91/include/mach/atmel_pio4.h                  | 1 +
 arch/arm/mach-at91/include/mach/atmel_sdhci.h                 | 1 +
 arch/arm/mach-at91/include/mach/atmel_serial.h                | 1 +
 arch/arm/mach-at91/include/mach/clk.h                         | 1 +
 arch/arm/mach-at91/include/mach/gpio.h                        | 1 +
 arch/arm/mach-at91/include/mach/sama5_matrix.h                | 1 +
 arch/arm/mach-at91/include/mach/sama5d2_smc.h                 | 1 +
 arch/arm/mach-at91/include/mach/sama5d3_smc.h                 | 1 +
 arch/arm/mach-at91/mpddrc.c                                   | 1 +
 arch/arm/mach-at91/spl.c                                      | 1 +
 arch/arm/mach-at91/spl_at91.c                                 | 2 ++
 arch/arm/mach-at91/spl_atmel.c                                | 2 ++
 arch/arm/mach-bcm283x/include/mach/gpio.h                     | 1 +
 arch/arm/mach-bcm283x/include/mach/mbox.h                     | 2 ++
 arch/arm/mach-bcm283x/include/mach/msg.h                      | 1 +
 arch/arm/mach-bcm283x/include/mach/sdhci.h                    | 1 +
 arch/arm/mach-bcm283x/include/mach/wdog.h                     | 1 +
 arch/arm/mach-bcm283x/init.c                                  | 1 +
 arch/arm/mach-bcm283x/mbox.c                                  | 1 +
 arch/arm/mach-bcm283x/msg.c                                   | 1 +
 arch/arm/mach-bcm283x/reset.c                                 | 1 +
 arch/arm/mach-bcmstb/include/mach/timer.h                     | 1 +
 arch/arm/mach-davinci/include/mach/davinci_misc.h             | 1 +
 arch/arm/mach-davinci/include/mach/dm365_lowlevel.h           | 1 +
 arch/arm/mach-davinci/include/mach/sdmmc_defs.h               | 1 +
 arch/arm/mach-davinci/include/mach/timer_defs.h               | 1 +
 arch/arm/mach-davinci/misc.c                                  | 1 +
 arch/arm/mach-davinci/spl.c                                   | 1 +
 arch/arm/mach-davinci/timer.c                                 | 1 +
 arch/arm/mach-exynos/clock.c                                  | 1 +
 arch/arm/mach-exynos/clock_init.h                             | 1 +
 arch/arm/mach-exynos/clock_init_exynos5.c                     | 1 +
 arch/arm/mach-exynos/common_setup.h                           | 1 +
 arch/arm/mach-exynos/dmc_common.c                             | 1 +
 arch/arm/mach-exynos/dmc_init_ddr3.c                          | 1 +
 arch/arm/mach-exynos/exynos5_setup.h                          | 1 +
 arch/arm/mach-exynos/include/mach/mmc.h                       | 1 +
 arch/arm/mach-exynos/include/mach/power.h                     | 1 +
 arch/arm/mach-exynos/include/mach/spl.h                       | 2 ++
 arch/arm/mach-exynos/include/mach/sromc.h                     | 1 +
 arch/arm/mach-exynos/include/mach/sys_proto.h                 | 1 +
 arch/arm/mach-exynos/include/mach/tmu.h                       | 1 +
 arch/arm/mach-exynos/lowlevel_init.c                          | 1 +
 arch/arm/mach-exynos/pinmux.c                                 | 1 +
 arch/arm/mach-exynos/power.c                                  | 1 +
 arch/arm/mach-exynos/soc.c                                    | 1 +
 arch/arm/mach-exynos/spl_boot.c                               | 1 +
 arch/arm/mach-imx/cache.c                                     | 1 +
 arch/arm/mach-imx/cmd_dek.c                                   | 1 +
 arch/arm/mach-imx/cmd_nandbcb.c                               | 2 ++
 arch/arm/mach-imx/cpu.c                                       | 1 +
 arch/arm/mach-imx/ddrmc-vf610-calibration.c                   | 1 +
 arch/arm/mach-imx/hab.c                                       | 1 +
 arch/arm/mach-imx/i2c-mxv7.c                                  | 1 +
 arch/arm/mach-imx/imx8/ahab.c                                 | 2 ++
 arch/arm/mach-imx/imx8/clock.c                                | 1 +
 arch/arm/mach-imx/imx8/cpu.c                                  | 3 +++
 arch/arm/mach-imx/imx8/fdt.c                                  | 1 +
 arch/arm/mach-imx/imx8/image.c                                | 1 +
 arch/arm/mach-imx/imx8/iomux.c                                | 1 +
 arch/arm/mach-imx/imx8/misc.c                                 | 1 +
 arch/arm/mach-imx/imx8/parse-container.c                      | 1 +
 arch/arm/mach-imx/imx8/snvs_security_sc.c                     | 1 +
 arch/arm/mach-imx/imx8m/clock_imx8mm.c                        | 2 ++
 arch/arm/mach-imx/imx8m/clock_imx8mq.c                        | 2 ++
 arch/arm/mach-imx/imx8m/clock_slice.c                         | 3 +++
 arch/arm/mach-imx/imx8m/soc.c                                 | 3 +++
 arch/arm/mach-imx/imx_bootaux.c                               | 1 +
 arch/arm/mach-imx/init.c                                      | 1 +
 arch/arm/mach-imx/iomux-v3.c                                  | 1 +
 arch/arm/mach-imx/mac.c                                       | 1 +
 arch/arm/mach-imx/misc.c                                      | 1 +
 arch/arm/mach-imx/mmc_env.c                                   | 2 ++
 arch/arm/mach-imx/mmdc_size.c                                 | 1 +
 arch/arm/mach-imx/mx5/clock.c                                 | 2 ++
 arch/arm/mach-imx/mx5/soc.c                                   | 2 ++
 arch/arm/mach-imx/mx6/clock.c                                 | 2 ++
 arch/arm/mach-imx/mx6/ddr.c                                   | 1 +
 arch/arm/mach-imx/mx6/module_fuse.c                           | 1 +
 arch/arm/mach-imx/mx6/mp.c                                    | 1 +
 arch/arm/mach-imx/mx6/opos6ul.c                               | 2 ++
 arch/arm/mach-imx/mx6/soc.c                                   | 2 ++
 arch/arm/mach-imx/mx7/clock.c                                 | 1 +
 arch/arm/mach-imx/mx7/clock_slice.c                           | 2 ++
 arch/arm/mach-imx/mx7/psci-mx7.c                              | 1 +
 arch/arm/mach-imx/mx7/snvs.c                                  | 1 +
 arch/arm/mach-imx/mx7/soc.c                                   | 3 +++
 arch/arm/mach-imx/mx7ulp/clock.c                              | 1 +
 arch/arm/mach-imx/mx7ulp/iomux.c                              | 1 +
 arch/arm/mach-imx/mx7ulp/pcc.c                                | 2 ++
 arch/arm/mach-imx/mx7ulp/scg.c                                | 1 +
 arch/arm/mach-imx/mx7ulp/soc.c                                | 2 ++
 arch/arm/mach-imx/rdc-sema.c                                  | 1 +
 arch/arm/mach-imx/spl.c                                       | 2 ++
 arch/arm/mach-imx/spl_imx_romapi.c                            | 1 +
 arch/arm/mach-imx/syscounter.c                                | 1 +
 arch/arm/mach-imx/timer.c                                     | 1 +
 arch/arm/mach-ipq40xx/clock-ipq4019.c                         | 1 +
 arch/arm/mach-ipq40xx/pinctrl-snapdragon.c                    | 1 +
 arch/arm/mach-k3/am6_init.c                                   | 1 +
 arch/arm/mach-k3/common.c                                     | 2 ++
 arch/arm/mach-k3/common.h                                     | 1 +
 arch/arm/mach-k3/include/mach/sys_proto.h                     | 1 +
 arch/arm/mach-k3/j721e_init.c                                 | 1 +
 arch/arm/mach-k3/security.c                                   | 1 +
 arch/arm/mach-k3/sysfw-loader.c                               | 1 +
 arch/arm/mach-keystone/clock.c                                | 2 ++
 arch/arm/mach-keystone/cmd_mon.c                              | 1 +
 arch/arm/mach-keystone/ddr3.c                                 | 1 +
 arch/arm/mach-keystone/ddr3_spd.c                             | 1 +
 arch/arm/mach-keystone/include/mach/clock_defs.h              | 1 +
 arch/arm/mach-keystone/include/mach/ddr3.h                    | 1 +
 arch/arm/mach-keystone/include/mach/hardware-k2g.h            | 1 +
 arch/arm/mach-keystone/include/mach/hardware.h                | 1 +
 arch/arm/mach-keystone/include/mach/mon.h                     | 1 +
 arch/arm/mach-keystone/include/mach/msmc.h                    | 1 +
 arch/arm/mach-keystone/include/mach/mux-k2g.h                 | 1 +
 arch/arm/mach-keystone/include/mach/psc_defs.h                | 1 +
 arch/arm/mach-keystone/init.c                                 | 1 +
 arch/arm/mach-keystone/keystone.c                             | 1 +
 arch/arm/mach-keystone/mon.c                                  | 1 +
 arch/arm/mach-keystone/msmc.c                                 | 1 +
 arch/arm/mach-keystone/psc.c                                  | 1 +
 arch/arm/mach-kirkwood/cache.c                                | 1 +
 arch/arm/mach-kirkwood/cpu.c                                  | 1 +
 arch/arm/mach-kirkwood/include/mach/cpu.h                     | 1 +
 arch/arm/mach-kirkwood/mpp.c                                  | 1 +
 arch/arm/mach-lpc32xx/clk.c                                   | 1 +
 arch/arm/mach-lpc32xx/cpu.c                                   | 1 +
 arch/arm/mach-lpc32xx/devices.c                               | 1 +
 arch/arm/mach-lpc32xx/dram.c                                  | 1 +
 arch/arm/mach-lpc32xx/timer.c                                 | 1 +
 arch/arm/mach-mediatek/mt7622/init.c                          | 1 +
 arch/arm/mach-mediatek/mt7623/init.c                          | 2 ++
 arch/arm/mach-mediatek/mt7623/preloader.h                     | 1 +
 arch/arm/mach-mediatek/mt7629/init.c                          | 2 ++
 arch/arm/mach-mediatek/mt8512/init.c                          | 1 +
 arch/arm/mach-mediatek/mt8516/init.c                          | 1 +
 arch/arm/mach-mediatek/mt8518/init.c                          | 1 +
 arch/arm/mach-mediatek/spl.c                                  | 1 +
 arch/arm/mach-meson/board-axg.c                               | 1 +
 arch/arm/mach-meson/board-common.c                            | 2 ++
 arch/arm/mach-meson/board-g12a.c                              | 1 +
 arch/arm/mach-meson/board-gx.c                                | 1 +
 arch/arm/mach-meson/board-info.c                              | 1 +
 arch/arm/mach-meson/sm.c                                      | 1 +
 arch/arm/mach-mvebu/arm64-common.c                            | 2 ++
 arch/arm/mach-mvebu/armada3700/cpu.c                          | 1 +
 arch/arm/mach-mvebu/armada8k/cpu.c                            | 1 +
 arch/arm/mach-mvebu/cpu.c                                     | 2 ++
 arch/arm/mach-mvebu/dram.c                                    | 1 +
 arch/arm/mach-mvebu/efuse.c                                   | 1 +
 arch/arm/mach-mvebu/gpio.c                                    | 1 +
 arch/arm/mach-mvebu/include/mach/cpu.h                        | 1 +
 arch/arm/mach-mvebu/include/mach/efuse.h                      | 1 +
 arch/arm/mach-mvebu/mbus.c                                    | 2 ++
 arch/arm/mach-mvebu/serdes/a38x/ctrl_pex.c                    | 2 ++
 arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec-38x.c     | 1 +
 arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec.c         | 1 +
 arch/arm/mach-mvebu/serdes/a38x/seq_exec.c                    | 1 +
 arch/arm/mach-mvebu/serdes/a38x/seq_exec.h                    | 1 +
 arch/arm/mach-mvebu/serdes/a38x/sys_env_lib.c                 | 1 +
 arch/arm/mach-mvebu/serdes/axp/high_speed_env_lib.c           | 2 ++
 arch/arm/mach-mvebu/serdes/axp/high_speed_env_spec.c          | 1 +
 arch/arm/mach-mvebu/spl.c                                     | 1 +
 arch/arm/mach-nexell/clock.c                                  | 2 ++
 arch/arm/mach-nexell/cmd_boot_linux.c                         | 1 +
 arch/arm/mach-nexell/include/mach/display.h                   | 1 +
 arch/arm/mach-nexell/include/mach/display_dev.h               | 1 +
 arch/arm/mach-nexell/include/mach/mipi_display.h              | 1 +
 arch/arm/mach-nexell/include/mach/reset.h                     | 1 +
 arch/arm/mach-nexell/include/mach/sec_reg.h                   | 1 +
 arch/arm/mach-nexell/include/mach/tieoff.h                    | 1 +
 arch/arm/mach-nexell/nx_sec_reg.c                             | 1 +
 arch/arm/mach-nexell/reset.c                                  | 1 +
 arch/arm/mach-nexell/tieoff.c                                 | 2 ++
 arch/arm/mach-nexell/timer.c                                  | 2 ++
 arch/arm/mach-omap2/abb.c                                     | 2 ++
 arch/arm/mach-omap2/am33xx/board.c                            | 2 ++
 arch/arm/mach-omap2/am33xx/clk_synthesizer.c                  | 1 +
 arch/arm/mach-omap2/am33xx/clock.c                            | 2 ++
 arch/arm/mach-omap2/am33xx/clock_am33xx.c                     | 2 ++
 arch/arm/mach-omap2/am33xx/clock_am43xx.c                     | 1 +
 arch/arm/mach-omap2/am33xx/clock_ti814x.c                     | 1 +
 arch/arm/mach-omap2/am33xx/clock_ti816x.c                     | 1 +
 arch/arm/mach-omap2/am33xx/ddr.c                              | 1 +
 arch/arm/mach-omap2/am33xx/emif4.c                            | 1 +
 arch/arm/mach-omap2/am33xx/mux.c                              | 1 +
 arch/arm/mach-omap2/am33xx/sys_info.c                         | 1 +
 arch/arm/mach-omap2/boot-common.c                             | 2 ++
 arch/arm/mach-omap2/clocks-common.c                           | 2 ++
 arch/arm/mach-omap2/emif-common.c                             | 2 ++
 arch/arm/mach-omap2/fdt-common.c                              | 1 +
 arch/arm/mach-omap2/hwinit-common.c                           | 2 ++
 arch/arm/mach-omap2/mem-common.c                              | 1 +
 arch/arm/mach-omap2/omap-cache.c                              | 1 +
 arch/arm/mach-omap2/omap3/am35x_musb.c                        | 1 +
 arch/arm/mach-omap2/omap3/board.c                             | 2 ++
 arch/arm/mach-omap2/omap3/boot.c                              | 1 +
 arch/arm/mach-omap2/omap3/clock.c                             | 1 +
 arch/arm/mach-omap2/omap3/emac.c                              | 1 +
 arch/arm/mach-omap2/omap3/emif4.c                             | 1 +
 arch/arm/mach-omap2/omap3/sdrc.c                              | 1 +
 arch/arm/mach-omap2/omap3/sys_info.c                          | 2 ++
 arch/arm/mach-omap2/omap4/boot.c                              | 1 +
 arch/arm/mach-omap2/omap4/emif.c                              | 1 +
 arch/arm/mach-omap2/omap4/hw_data.c                           | 1 +
 arch/arm/mach-omap2/omap4/hwinit.c                            | 1 +
 arch/arm/mach-omap2/omap4/sdram_elpida.c                      | 2 ++
 arch/arm/mach-omap2/omap5/abb.c                               | 1 +
 arch/arm/mach-omap2/omap5/boot.c                              | 1 +
 arch/arm/mach-omap2/omap5/dra7xx_iodelay.c                    | 1 +
 arch/arm/mach-omap2/omap5/emif.c                              | 1 +
 arch/arm/mach-omap2/omap5/fdt.c                               | 1 +
 arch/arm/mach-omap2/omap5/hw_data.c                           | 2 ++
 arch/arm/mach-omap2/omap5/hwinit.c                            | 2 ++
 arch/arm/mach-omap2/omap5/prcm-regs.c                         | 1 +
 arch/arm/mach-omap2/omap5/sdram.c                             | 2 ++
 arch/arm/mach-omap2/pipe3-phy.c                               | 2 ++
 arch/arm/mach-omap2/pipe3-phy.h                               | 2 ++
 arch/arm/mach-omap2/reset.c                                   | 2 ++
 arch/arm/mach-omap2/sata.c                                    | 2 ++
 arch/arm/mach-omap2/sec-common.c                              | 1 +
 arch/arm/mach-omap2/sysinfo-common.c                          | 1 +
 arch/arm/mach-omap2/timer.c                                   | 1 +
 arch/arm/mach-omap2/utils.c                                   | 2 ++
 arch/arm/mach-omap2/vc.c                                      | 1 +
 arch/arm/mach-orion5x/cpu.c                                   | 1 +
 arch/arm/mach-orion5x/dram.c                                  | 1 +
 arch/arm/mach-orion5x/include/mach/cpu.h                      | 1 +
 arch/arm/mach-orion5x/timer.c                                 | 1 +
 arch/arm/mach-owl/soc.c                                       | 1 +
 arch/arm/mach-rmobile/cpu_info-r8a7740.c                      | 1 +
 arch/arm/mach-rmobile/cpu_info-rcar.c                         | 1 +
 arch/arm/mach-rmobile/cpu_info-sh73a0.c                       | 1 +
 arch/arm/mach-rmobile/cpu_info.c                              | 1 +
 arch/arm/mach-rmobile/include/mach/ehci-rmobile.h             | 1 +
 arch/arm/mach-rmobile/include/mach/rcar-mstp.h                | 1 +
 arch/arm/mach-rmobile/include/mach/rmobile.h                  | 1 +
 arch/arm/mach-rmobile/timer.c                                 | 1 +
 arch/arm/mach-rockchip/board.c                                | 2 ++
 arch/arm/mach-rockchip/boot_mode.c                            | 1 +
 arch/arm/mach-rockchip/bootrom.c                              | 1 +
 arch/arm/mach-rockchip/misc.c                                 | 1 +
 arch/arm/mach-rockchip/px30-board-tpl.c                       | 1 +
 arch/arm/mach-rockchip/px30/px30.c                            | 1 +
 arch/arm/mach-rockchip/px30/syscon_px30.c                     | 1 +
 arch/arm/mach-rockchip/rk3036-board-spl.c                     | 1 +
 arch/arm/mach-rockchip/rk3036/sdram_rk3036.c                  | 1 +
 arch/arm/mach-rockchip/rk3188/rk3188.c                        | 1 +
 arch/arm/mach-rockchip/rk3188/syscon_rk3188.c                 | 1 +
 arch/arm/mach-rockchip/rk3288/rk3288.c                        | 2 ++
 arch/arm/mach-rockchip/rk3288/syscon_rk3288.c                 | 1 +
 arch/arm/mach-rockchip/rk3308/rk3308.c                        | 2 ++
 arch/arm/mach-rockchip/rk3368/rk3368.c                        | 1 +
 arch/arm/mach-rockchip/rk3368/syscon_rk3368.c                 | 1 +
 arch/arm/mach-rockchip/rk3399/rk3399.c                        | 2 ++
 arch/arm/mach-rockchip/rk3399/syscon_rk3399.c                 | 1 +
 arch/arm/mach-rockchip/sdram.c                                | 1 +
 arch/arm/mach-rockchip/spl-boot-order.c                       | 2 ++
 arch/arm/mach-rockchip/spl.c                                  | 2 ++
 arch/arm/mach-rockchip/tpl.c                                  | 2 ++
 arch/arm/mach-s5pc1xx/clock.c                                 | 1 +
 arch/arm/mach-s5pc1xx/include/mach/gpio.h                     | 1 +
 arch/arm/mach-s5pc1xx/include/mach/mmc.h                      | 1 +
 arch/arm/mach-s5pc1xx/include/mach/sromc.h                    | 1 +
 arch/arm/mach-s5pc1xx/include/mach/sys_proto.h                | 1 +
 arch/arm/mach-snapdragon/clock-apq8016.c                      | 1 +
 arch/arm/mach-snapdragon/clock-apq8096.c                      | 1 +
 arch/arm/mach-snapdragon/clock-snapdragon.c                   | 1 +
 arch/arm/mach-snapdragon/clock-snapdragon.h                   | 1 +
 arch/arm/mach-snapdragon/dram.c                               | 2 ++
 arch/arm/mach-snapdragon/include/mach/misc.h                  | 1 +
 arch/arm/mach-snapdragon/misc.c                               | 1 +
 arch/arm/mach-snapdragon/pinctrl-snapdragon.c                 | 1 +
 arch/arm/mach-socfpga/clock_manager.c                         | 1 +
 arch/arm/mach-socfpga/clock_manager_agilex.c                  | 1 +
 arch/arm/mach-socfpga/clock_manager_arria10.c                 | 1 +
 arch/arm/mach-socfpga/clock_manager_gen5.c                    | 1 +
 arch/arm/mach-socfpga/clock_manager_s10.c                     | 1 +
 arch/arm/mach-socfpga/firewall.c                              | 1 +
 arch/arm/mach-socfpga/freeze_controller.c                     | 1 +
 arch/arm/mach-socfpga/include/mach/clock_manager.h            | 4 ++--
 arch/arm/mach-socfpga/include/mach/clock_manager_gen5.h       | 1 +
 arch/arm/mach-socfpga/include/mach/clock_manager_s10.h        | 1 +
 arch/arm/mach-socfpga/include/mach/firewall.h                 | 1 +
 arch/arm/mach-socfpga/include/mach/fpga_manager.h             | 1 +
 arch/arm/mach-socfpga/include/mach/fpga_manager_arria10.h     | 1 +
 arch/arm/mach-socfpga/include/mach/fpga_manager_gen5.h        | 1 +
 arch/arm/mach-socfpga/include/mach/freeze_controller.h        | 1 +
 arch/arm/mach-socfpga/include/mach/mailbox_s10.h              | 1 +
 arch/arm/mach-socfpga/include/mach/misc.h                     | 1 +
 arch/arm/mach-socfpga/include/mach/nic301.h                   | 1 +
 arch/arm/mach-socfpga/include/mach/reset_manager.h            | 1 +
 arch/arm/mach-socfpga/include/mach/scan_manager.h             | 1 +
 arch/arm/mach-socfpga/include/mach/scu.h                      | 1 +
 arch/arm/mach-socfpga/include/mach/sdram_arria10.h            | 1 +
 arch/arm/mach-socfpga/include/mach/sdram_gen5.h               | 1 +
 arch/arm/mach-socfpga/include/mach/system_manager.h           | 1 +
 arch/arm/mach-socfpga/include/mach/system_manager_gen5.h      | 1 +
 arch/arm/mach-socfpga/include/mach/system_manager_soc64.h     | 1 +
 arch/arm/mach-socfpga/include/mach/timer.h                    | 1 +
 arch/arm/mach-socfpga/mailbox_s10.c                           | 1 +
 arch/arm/mach-socfpga/misc.c                                  | 1 +
 arch/arm/mach-socfpga/misc_arria10.c                          | 1 +
 arch/arm/mach-socfpga/misc_gen5.c                             | 2 ++
 arch/arm/mach-socfpga/misc_s10.c                              | 1 +
 arch/arm/mach-socfpga/pinmux_arria10.c                        | 1 +
 arch/arm/mach-socfpga/reset_manager_arria10.c                 | 1 +
 arch/arm/mach-socfpga/reset_manager_gen5.c                    | 1 +
 arch/arm/mach-socfpga/reset_manager_s10.c                     | 1 +
 arch/arm/mach-socfpga/scan_manager.c                          | 1 +
 arch/arm/mach-socfpga/spl_a10.c                               | 1 +
 arch/arm/mach-socfpga/spl_agilex.c                            | 1 +
 arch/arm/mach-socfpga/spl_gen5.c                              | 1 +
 arch/arm/mach-socfpga/spl_s10.c                               | 1 +
 arch/arm/mach-socfpga/system_manager_gen5.c                   | 1 +
 arch/arm/mach-socfpga/system_manager_s10.c                    | 1 +
 arch/arm/mach-socfpga/wrap_pinmux_config.c                    | 1 +
 arch/arm/mach-socfpga/wrap_pinmux_config_s10.c                | 1 +
 arch/arm/mach-socfpga/wrap_pll_config_s10.c                   | 1 +
 arch/arm/mach-socfpga/wrap_sdram_config.c                     | 1 +
 arch/arm/mach-stm32mp/bsec.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               | 2 ++
 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                                   | 2 ++
 arch/arm/mach-stm32mp/dram_init.c                             | 1 +
 arch/arm/mach-stm32mp/fdt.c                                   | 2 ++
 arch/arm/mach-stm32mp/include/mach/gpio.h                     | 1 +
 arch/arm/mach-stm32mp/include/mach/stm32mp1_smc.h             | 1 +
 arch/arm/mach-stm32mp/include/mach/sys_proto.h                | 1 +
 arch/arm/mach-stm32mp/psci.c                                  | 1 +
 arch/arm/mach-stm32mp/pwr_regulator.c                         | 2 ++
 arch/arm/mach-stm32mp/spl.c                                   | 2 ++
 arch/arm/mach-sunxi/board.c                                   | 1 +
 arch/arm/mach-sunxi/clock.c                                   | 2 ++
 arch/arm/mach-sunxi/clock_sun4i.c                             | 1 +
 arch/arm/mach-sunxi/clock_sun50i_h6.c                         | 1 +
 arch/arm/mach-sunxi/clock_sun6i.c                             | 1 +
 arch/arm/mach-sunxi/clock_sun8i_a83t.c                        | 1 +
 arch/arm/mach-sunxi/clock_sun9i.c                             | 1 +
 arch/arm/mach-sunxi/cpu_info.c                                | 1 +
 arch/arm/mach-sunxi/dram_helpers.c                            | 1 +
 arch/arm/mach-sunxi/dram_sun4i.c                              | 2 ++
 arch/arm/mach-sunxi/dram_sun50i_h6.c                          | 1 +
 arch/arm/mach-sunxi/dram_sun6i.c                              | 1 +
 arch/arm/mach-sunxi/dram_sun8i_a23.c                          | 1 +
 arch/arm/mach-sunxi/dram_sun8i_a33.c                          | 1 +
 arch/arm/mach-sunxi/dram_sun8i_a83t.c                         | 1 +
 arch/arm/mach-sunxi/dram_sun9i.c                              | 1 +
 arch/arm/mach-sunxi/dram_sunxi_dw.c                           | 2 ++
 arch/arm/mach-sunxi/dram_timings/ddr2_v3s.c                   | 1 +
 arch/arm/mach-sunxi/dram_timings/ddr3_1333.c                  | 1 +
 arch/arm/mach-sunxi/dram_timings/h6_ddr3_1333.c               | 1 +
 arch/arm/mach-sunxi/dram_timings/h6_lpddr3.c                  | 1 +
 arch/arm/mach-sunxi/dram_timings/lpddr3_stock.c               | 1 +
 arch/arm/mach-sunxi/p2wi.c                                    | 1 +
 arch/arm/mach-sunxi/pinmux.c                                  | 1 +
 arch/arm/mach-sunxi/pmic_bus.c                                | 1 +
 arch/arm/mach-sunxi/prcm.c                                    | 1 +
 arch/arm/mach-sunxi/rsb.c                                     | 1 +
 arch/arm/mach-sunxi/spl_spi_sunxi.c                           | 1 +
 arch/arm/mach-tegra/ap.c                                      | 1 +
 arch/arm/mach-tegra/board.c                                   | 2 ++
 arch/arm/mach-tegra/board2.c                                  | 2 ++
 arch/arm/mach-tegra/cache.c                                   | 1 +
 arch/arm/mach-tegra/cboot.c                                   | 2 ++
 arch/arm/mach-tegra/clock.c                                   | 3 +++
 arch/arm/mach-tegra/cpu.c                                     | 1 +
 arch/arm/mach-tegra/ivc.c                                     | 1 +
 arch/arm/mach-tegra/pinmux-common.c                           | 1 +
 arch/arm/mach-tegra/pmc.c                                     | 1 +
 arch/arm/mach-tegra/spl.c                                     | 1 +
 arch/arm/mach-tegra/tegra114/clock.c                          | 1 +
 arch/arm/mach-tegra/tegra114/cpu.c                            | 1 +
 arch/arm/mach-tegra/tegra124/clock.c                          | 1 +
 arch/arm/mach-tegra/tegra124/cpu.c                            | 1 +
 arch/arm/mach-tegra/tegra124/psci.c                           | 1 +
 arch/arm/mach-tegra/tegra124/xusb-padctl.c                    | 1 +
 arch/arm/mach-tegra/tegra20/clock.c                           | 1 +
 arch/arm/mach-tegra/tegra20/cpu.c                             | 1 +
 arch/arm/mach-tegra/tegra20/crypto.c                          | 1 +
 arch/arm/mach-tegra/tegra20/crypto.h                          | 1 +
 arch/arm/mach-tegra/tegra20/emc.c                             | 1 +
 arch/arm/mach-tegra/tegra20/warmboot.c                        | 1 +
 arch/arm/mach-tegra/tegra20/warmboot_avp.c                    | 1 +
 arch/arm/mach-tegra/tegra210/clock.c                          | 1 +
 arch/arm/mach-tegra/tegra210/xusb-padctl.c                    | 1 +
 arch/arm/mach-tegra/tegra30/clock.c                           | 1 +
 arch/arm/mach-tegra/tegra30/cpu.c                             | 1 +
 arch/arm/mach-tegra/xusb-padctl-common.c                      | 1 +
 arch/arm/mach-tegra/xusb-padctl-common.h                      | 1 +
 arch/arm/mach-u8500/cpuinfo.c                                 | 1 +
 arch/arm/mach-uniphier/arm32/cache-uniphier.c                 | 2 ++
 arch/arm/mach-uniphier/arm32/psci.c                           | 1 +
 arch/arm/mach-uniphier/base-address.c                         | 1 +
 arch/arm/mach-uniphier/board_init.c                           | 1 +
 arch/arm/mach-uniphier/boot-device/boot-device-ld11.c         | 1 +
 arch/arm/mach-uniphier/boot-device/boot-device-pxs2.c         | 1 +
 arch/arm/mach-uniphier/boot-device/boot-device-pxs3.c         | 1 +
 arch/arm/mach-uniphier/boot-device/boot-device.c              | 2 ++
 arch/arm/mach-uniphier/boot-device/boot-device.h              | 1 +
 arch/arm/mach-uniphier/clk/clk-dram-ld4.c                     | 1 +
 arch/arm/mach-uniphier/clk/clk-dram-pro5.c                    | 1 +
 arch/arm/mach-uniphier/clk/clk-dram-pxs2.c                    | 1 +
 arch/arm/mach-uniphier/clk/clk-early-ld4.c                    | 1 +
 arch/arm/mach-uniphier/clk/clk-ld11.c                         | 1 +
 arch/arm/mach-uniphier/clk/clk-ld20.c                         | 1 +
 arch/arm/mach-uniphier/clk/clk-pro4.c                         | 1 +
 arch/arm/mach-uniphier/clk/clk-pro5.c                         | 1 +
 arch/arm/mach-uniphier/clk/clk-pxs2.c                         | 1 +
 arch/arm/mach-uniphier/clk/clk-pxs3.c                         | 1 +
 arch/arm/mach-uniphier/clk/dpll-ld4.c                         | 1 +
 arch/arm/mach-uniphier/clk/dpll-pro4.c                        | 1 +
 arch/arm/mach-uniphier/clk/dpll-sld8.c                        | 1 +
 arch/arm/mach-uniphier/clk/dpll-tail.c                        | 1 +
 arch/arm/mach-uniphier/clk/pll-base-ld20.c                    | 2 ++
 arch/arm/mach-uniphier/clk/pll-ld4.c                          | 1 +
 arch/arm/mach-uniphier/clk/pll-pro4.c                         | 1 +
 arch/arm/mach-uniphier/debug-uart/debug-uart-ld6b.c           | 1 +
 arch/arm/mach-uniphier/debug-uart/debug-uart-pro4.c           | 1 +
 arch/arm/mach-uniphier/debug-uart/debug-uart-pro5.c           | 1 +
 arch/arm/mach-uniphier/debug-uart/debug-uart-pxs2.c           | 1 +
 arch/arm/mach-uniphier/debug-uart/debug-uart.c                | 2 ++
 arch/arm/mach-uniphier/debug.h                                | 1 +
 arch/arm/mach-uniphier/dram/cmd_ddrmphy.c                     | 2 ++
 arch/arm/mach-uniphier/dram/cmd_ddrphy.c                      | 2 ++
 arch/arm/mach-uniphier/dram/ddrphy-ld4.c                      | 2 ++
 arch/arm/mach-uniphier/dram/ddrphy-training.c                 | 2 ++
 arch/arm/mach-uniphier/dram/umc-ld4.c                         | 2 ++
 arch/arm/mach-uniphier/dram/umc-pro4.c                        | 2 ++
 arch/arm/mach-uniphier/dram/umc-pxs2.c                        | 2 ++
 arch/arm/mach-uniphier/dram/umc-sld8.c                        | 2 ++
 arch/arm/mach-uniphier/dram_init.c                            | 2 ++
 arch/arm/mach-uniphier/memconf.c                              | 1 +
 arch/arm/mach-uniphier/micro-support-card.c                   | 2 ++
 arch/arm/mach-uniphier/mmc-boot-mode.c                        | 1 +
 arch/arm/mach-uniphier/reset.c                                | 1 +
 arch/arm/mach-uniphier/sc-regs.h                              | 1 +
 arch/arm/mach-uniphier/sc64-regs.h                            | 1 +
 arch/arm/mach-uniphier/sg-regs.h                              | 1 +
 arch/arm/mach-versal/include/mach/hardware.h                  | 1 +
 arch/arm/mach-versal/include/mach/sys_proto.h                 | 1 +
 arch/arm/mach-versal/mp.c                                     | 1 +
 arch/arm/mach-versatile/timer.c                               | 1 +
 arch/arm/mach-zynq/clk.c                                      | 1 +
 arch/arm/mach-zynq/cpu.c                                      | 1 +
 arch/arm/mach-zynq/ddrc.c                                     | 1 +
 arch/arm/mach-zynq/include/mach/hardware.h                    | 1 +
 arch/arm/mach-zynq/include/mach/sys_proto.h                   | 1 +
 arch/arm/mach-zynq/ps7_spl_init.c                             | 1 +
 arch/arm/mach-zynq/slcr.c                                     | 1 +
 arch/arm/mach-zynq/spl.c                                      | 1 +
 arch/arm/mach-zynq/timer.c                                    | 1 +
 arch/arm/mach-zynqmp-r5/cpu.c                                 | 1 +
 arch/arm/mach-zynqmp/clk.c                                    | 1 +
 arch/arm/mach-zynqmp/cpu.c                                    | 1 +
 arch/arm/mach-zynqmp/handoff.c                                | 1 +
 arch/arm/mach-zynqmp/include/mach/hardware.h                  | 1 +
 arch/arm/mach-zynqmp/include/mach/sys_proto.h                 | 1 +
 arch/arm/mach-zynqmp/mp.c                                     | 1 +
 arch/arm/mach-zynqmp/psu_spl_init.c                           | 2 ++
 arch/arm/mach-zynqmp/spl.c                                    | 1 +
 arch/m68k/cpu/mcf5227x/cpu.c                                  | 1 +
 arch/m68k/cpu/mcf5227x/speed.c                                | 1 +
 arch/m68k/cpu/mcf523x/cpu.c                                   | 1 +
 arch/m68k/cpu/mcf52x2/cpu.c                                   | 1 +
 arch/m68k/cpu/mcf52x2/cpu.h                                   | 1 +
 arch/m68k/cpu/mcf52x2/cpu_init.c                              | 1 +
 arch/m68k/cpu/mcf532x/cpu.c                                   | 1 +
 arch/m68k/cpu/mcf532x/cpu_init.c                              | 1 +
 arch/m68k/cpu/mcf532x/speed.c                                 | 1 +
 arch/m68k/cpu/mcf5445x/cpu.c                                  | 1 +
 arch/m68k/cpu/mcf5445x/cpu_init.c                             | 1 +
 arch/m68k/cpu/mcf5445x/pci.c                                  | 1 +
 arch/m68k/cpu/mcf5445x/speed.c                                | 1 +
 arch/m68k/cpu/mcf547x_8x/cpu.c                                | 1 +
 arch/m68k/cpu/mcf547x_8x/cpu_init.c                           | 1 +
 arch/m68k/cpu/mcf547x_8x/pci.c                                | 1 +
 arch/m68k/cpu/mcf547x_8x/slicetimer.c                         | 1 +
 arch/m68k/include/asm/coldfire/ata.h                          | 1 +
 arch/m68k/include/asm/coldfire/crossbar.h                     | 1 +
 arch/m68k/include/asm/coldfire/dspi.h                         | 1 +
 arch/m68k/include/asm/coldfire/edma.h                         | 1 +
 arch/m68k/include/asm/coldfire/eport.h                        | 1 +
 arch/m68k/include/asm/coldfire/flexbus.h                      | 1 +
 arch/m68k/include/asm/coldfire/flexcan.h                      | 1 +
 arch/m68k/include/asm/coldfire/intctrl.h                      | 1 +
 arch/m68k/include/asm/coldfire/lcd.h                          | 1 +
 arch/m68k/include/asm/coldfire/mdha.h                         | 1 +
 arch/m68k/include/asm/coldfire/pwm.h                          | 1 +
 arch/m68k/include/asm/coldfire/qspi.h                         | 1 +
 arch/m68k/include/asm/coldfire/rng.h                          | 1 +
 arch/m68k/include/asm/coldfire/skha.h                         | 1 +
 arch/m68k/include/asm/coldfire/ssi.h                          | 1 +
 arch/m68k/include/asm/fec.h                                   | 1 +
 arch/m68k/include/asm/fsl_mcdmafec.h                          | 1 +
 arch/m68k/include/asm/immap_520x.h                            | 1 +
 arch/m68k/include/asm/immap_5227x.h                           | 1 +
 arch/m68k/include/asm/immap_5235.h                            | 1 +
 arch/m68k/include/asm/immap_5272.h                            | 1 +
 arch/m68k/include/asm/immap_5275.h                            | 1 +
 arch/m68k/include/asm/immap_5282.h                            | 1 +
 arch/m68k/include/asm/immap_5301x.h                           | 1 +
 arch/m68k/include/asm/immap_5307.h                            | 1 +
 arch/m68k/include/asm/immap_5329.h                            | 1 +
 arch/m68k/include/asm/immap_5441x.h                           | 1 +
 arch/m68k/include/asm/immap_5445x.h                           | 1 +
 arch/m68k/include/asm/immap_547x_8x.h                         | 1 +
 arch/m68k/include/asm/io.h                                    | 1 +
 arch/m68k/include/asm/m5282.h                                 | 1 +
 arch/m68k/include/asm/ptrace.h                                | 1 +
 arch/m68k/include/asm/rtc.h                                   | 1 +
 arch/m68k/include/asm/timer.h                                 | 1 +
 arch/m68k/include/asm/uart.h                                  | 1 +
 arch/m68k/lib/bdinfo.c                                        | 1 +
 arch/m68k/lib/bootm.c                                         | 1 +
 arch/m68k/lib/cache.c                                         | 2 ++
 arch/m68k/lib/fec.c                                           | 1 +
 arch/m68k/lib/time.c                                          | 1 +
 arch/m68k/lib/traps.c                                         | 1 +
 arch/microblaze/cpu/cache.c                                   | 1 +
 arch/microblaze/cpu/interrupts.c                              | 1 +
 arch/microblaze/cpu/spl.c                                     | 1 +
 arch/microblaze/cpu/timer.c                                   | 1 +
 arch/microblaze/lib/bootm.c                                   | 1 +
 arch/mips/cpu/cpu.c                                           | 1 +
 arch/mips/cpu/time.c                                          | 1 +
 arch/mips/include/asm/cacheops.h                              | 1 +
 arch/mips/include/asm/io.h                                    | 1 +
 arch/mips/include/asm/mach-generic/ioremap.h                  | 1 +
 arch/mips/include/asm/mipsregs.h                              | 1 +
 arch/mips/include/asm/pgtable-bits.h                          | 1 +
 arch/mips/include/asm/sections.h                              | 1 +
 arch/mips/lib/boot.c                                          | 1 +
 arch/mips/lib/bootm.c                                         | 1 +
 arch/mips/lib/cache.c                                         | 3 +++
 arch/mips/lib/reloc.c                                         | 1 +
 arch/mips/lib/traps.c                                         | 1 +
 arch/mips/mach-ath79/ar933x/clk.c                             | 2 ++
 arch/mips/mach-ath79/ar933x/ddr.c                             | 1 +
 arch/mips/mach-ath79/ar934x/clk.c                             | 2 ++
 arch/mips/mach-ath79/ar934x/ddr.c                             | 1 +
 arch/mips/mach-ath79/cpu.c                                    | 1 +
 arch/mips/mach-ath79/qca953x/clk.c                            | 2 ++
 arch/mips/mach-ath79/qca953x/ddr.c                            | 1 +
 arch/mips/mach-ath79/qca956x/clk.c                            | 2 ++
 arch/mips/mach-ath79/qca956x/ddr.c                            | 1 +
 arch/mips/mach-ath79/reset.c                                  | 1 +
 arch/mips/mach-bmips/include/ioremap.h                        | 1 +
 arch/mips/mach-jz47xx/include/mach/jz4780.h                   | 2 ++
 arch/mips/mach-jz47xx/include/mach/jz4780_dram.h              | 1 +
 arch/mips/mach-jz47xx/jz4780/gpio.c                           | 1 +
 arch/mips/mach-jz47xx/jz4780/jz4780.c                         | 1 +
 arch/mips/mach-jz47xx/jz4780/pll.c                            | 2 ++
 arch/mips/mach-jz47xx/jz4780/reset.c                          | 1 +
 arch/mips/mach-jz47xx/jz4780/sdram.c                          | 2 ++
 arch/mips/mach-jz47xx/jz4780/timer.c                          | 2 ++
 arch/mips/mach-mscc/gpio.c                                    | 1 +
 arch/mips/mach-mscc/include/ioremap.h                         | 1 +
 arch/mips/mach-mscc/include/mach/common.h                     | 1 +
 arch/mips/mach-mscc/include/mach/ddr.h                        | 2 ++
 arch/mips/mach-mscc/include/mach/jr2/jr2.h                    | 1 +
 arch/mips/mach-mscc/include/mach/luton/luton.h                | 1 +
 arch/mips/mach-mscc/include/mach/ocelot/ocelot.h              | 1 +
 arch/mips/mach-mscc/include/mach/serval/serval.h              | 1 +
 arch/mips/mach-mscc/include/mach/servalt/servalt.h            | 1 +
 arch/mips/mach-mscc/include/mach/tlb.h                        | 1 +
 arch/mips/mach-mscc/phy.c                                     | 1 +
 arch/mips/mach-mscc/reset.c                                   | 1 +
 arch/mips/mach-mtmips/ddr_cal.c                               | 3 +++
 arch/mips/mach-mtmips/ddr_init.c                              | 2 ++
 arch/mips/mach-mtmips/include/mach/ddr.h                      | 1 +
 arch/mips/mach-mtmips/mt7628/ddr.c                            | 2 ++
 arch/mips/mach-mtmips/mt7628/init.c                           | 1 +
 arch/mips/mach-mtmips/mt7628/serial.c                         | 1 +
 arch/mips/mach-mtmips/spl.c                                   | 1 +
 arch/mips/mach-octeon/cache.c                                 | 1 +
 arch/mips/mach-octeon/clock.c                                 | 1 +
 arch/mips/mach-octeon/cpu.c                                   | 1 +
 arch/mips/mach-octeon/dram.c                                  | 1 +
 arch/mips/mach-octeon/include/ioremap.h                       | 1 +
 arch/mips/mach-pic32/cpu.c                                    | 2 ++
 arch/mips/mach-pic32/include/mach/ddr.h                       | 1 +
 arch/mips/mach-pic32/include/mach/pic32.h                     | 2 ++
 arch/mips/mach-pic32/reset.c                                  | 1 +
 arch/nds32/cpu/n1213/ag101/timer.c                            | 1 +
 arch/nds32/include/asm/bootm.h                                | 1 +
 arch/nds32/include/asm/io.h                                   | 1 +
 arch/nds32/include/asm/setup.h                                | 1 +
 arch/nds32/lib/boot.c                                         | 1 +
 arch/nds32/lib/bootm.c                                        | 1 +
 arch/nios2/cpu/interrupts.c                                   | 1 +
 arch/nios2/include/asm/dma-mapping.h                          | 1 +
 arch/nios2/include/asm/global_data.h                          | 1 +
 arch/nios2/include/asm/io.h                                   | 1 +
 arch/nios2/lib/bootm.c                                        | 1 +
 arch/powerpc/cpu/mpc83xx/arbiter/arbiter.h                    | 1 +
 arch/powerpc/cpu/mpc83xx/cpu.c                                | 1 +
 arch/powerpc/cpu/mpc83xx/cpu_init.c                           | 1 +
 arch/powerpc/cpu/mpc83xx/ecc.c                                | 2 ++
 arch/powerpc/cpu/mpc83xx/fdt.c                                | 1 +
 arch/powerpc/cpu/mpc83xx/initreg/initreg.h                    | 1 +
 arch/powerpc/cpu/mpc83xx/interrupts.c                         | 1 +
 arch/powerpc/cpu/mpc83xx/pci.c                                | 1 +
 arch/powerpc/cpu/mpc83xx/pcie.c                               | 1 +
 arch/powerpc/cpu/mpc83xx/qe_io.c                              | 1 +
 arch/powerpc/cpu/mpc83xx/spd_sdram.c                          | 1 +
 arch/powerpc/cpu/mpc83xx/speed.c                              | 1 +
 arch/powerpc/cpu/mpc83xx/spl_minimal.c                        | 1 +
 arch/powerpc/cpu/mpc83xx/traps.c                              | 1 +
 arch/powerpc/cpu/mpc85xx/b4860_serdes.c                       | 1 +
 arch/powerpc/cpu/mpc85xx/bsc9132_serdes.c                     | 1 +
 arch/powerpc/cpu/mpc85xx/c29x_serdes.c                        | 1 +
 arch/powerpc/cpu/mpc85xx/cmd_errata.c                         | 2 ++
 arch/powerpc/cpu/mpc85xx/commproc.c                           | 1 +
 arch/powerpc/cpu/mpc85xx/cpu.c                                | 2 ++
 arch/powerpc/cpu/mpc85xx/cpu_init.c                           | 2 ++
 arch/powerpc/cpu/mpc85xx/cpu_init_early.c                     | 1 +
 arch/powerpc/cpu/mpc85xx/ether_fcc.c                          | 1 +
 arch/powerpc/cpu/mpc85xx/fdt.c                                | 2 ++
 arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c                | 2 ++
 arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.h                | 1 +
 arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c                 | 1 +
 arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.h                 | 1 +
 arch/powerpc/cpu/mpc85xx/interrupts.c                         | 2 ++
 arch/powerpc/cpu/mpc85xx/liodn.c                              | 1 +
 arch/powerpc/cpu/mpc85xx/mp.c                                 | 1 +
 arch/powerpc/cpu/mpc85xx/mp.h                                 | 1 +
 arch/powerpc/cpu/mpc85xx/mpc8536_serdes.c                     | 1 +
 arch/powerpc/cpu/mpc85xx/mpc8544_serdes.c                     | 1 +
 arch/powerpc/cpu/mpc85xx/mpc8548_serdes.c                     | 1 +
 arch/powerpc/cpu/mpc85xx/mpc8568_serdes.c                     | 1 +
 arch/powerpc/cpu/mpc85xx/mpc8569_serdes.c                     | 1 +
 arch/powerpc/cpu/mpc85xx/mpc8572_serdes.c                     | 1 +
 arch/powerpc/cpu/mpc85xx/p1010_serdes.c                       | 1 +
 arch/powerpc/cpu/mpc85xx/p1021_serdes.c                       | 1 +
 arch/powerpc/cpu/mpc85xx/p1022_serdes.c                       | 1 +
 arch/powerpc/cpu/mpc85xx/p1023_serdes.c                       | 1 +
 arch/powerpc/cpu/mpc85xx/p2020_serdes.c                       | 1 +
 arch/powerpc/cpu/mpc85xx/p2041_serdes.c                       | 1 +
 arch/powerpc/cpu/mpc85xx/p3041_serdes.c                       | 1 +
 arch/powerpc/cpu/mpc85xx/p4080_serdes.c                       | 1 +
 arch/powerpc/cpu/mpc85xx/p5020_serdes.c                       | 1 +
 arch/powerpc/cpu/mpc85xx/p5040_serdes.c                       | 1 +
 arch/powerpc/cpu/mpc85xx/pci.c                                | 1 +
 arch/powerpc/cpu/mpc85xx/portals.c                            | 1 +
 arch/powerpc/cpu/mpc85xx/qe_io.c                              | 1 +
 arch/powerpc/cpu/mpc85xx/serial_scc.c                         | 2 ++
 arch/powerpc/cpu/mpc85xx/speed.c                              | 1 +
 arch/powerpc/cpu/mpc85xx/spl_minimal.c                        | 1 +
 arch/powerpc/cpu/mpc85xx/t1024_serdes.c                       | 1 +
 arch/powerpc/cpu/mpc85xx/t1040_serdes.c                       | 1 +
 arch/powerpc/cpu/mpc85xx/t2080_serdes.c                       | 1 +
 arch/powerpc/cpu/mpc85xx/t4240_serdes.c                       | 1 +
 arch/powerpc/cpu/mpc85xx/tlb.c                                | 2 ++
 arch/powerpc/cpu/mpc85xx/traps.c                              | 1 +
 arch/powerpc/cpu/mpc86xx/cpu.c                                | 1 +
 arch/powerpc/cpu/mpc86xx/fdt.c                                | 1 +
 arch/powerpc/cpu/mpc86xx/interrupts.c                         | 1 +
 arch/powerpc/cpu/mpc86xx/mp.c                                 | 1 +
 arch/powerpc/cpu/mpc86xx/mpc8610_serdes.c                     | 1 +
 arch/powerpc/cpu/mpc86xx/mpc8641_serdes.c                     | 1 +
 arch/powerpc/cpu/mpc86xx/speed.c                              | 1 +
 arch/powerpc/cpu/mpc86xx/traps.c                              | 1 +
 arch/powerpc/cpu/mpc8xx/cpu.c                                 | 2 ++
 arch/powerpc/cpu/mpc8xx/cpu_init.c                            | 2 ++
 arch/powerpc/cpu/mpc8xx/immap.c                               | 2 ++
 arch/powerpc/cpu/mpc8xx/interrupts.c                          | 2 ++
 arch/powerpc/cpu/mpc8xx/speed.c                               | 2 ++
 arch/powerpc/cpu/mpc8xx/traps.c                               | 1 +
 arch/powerpc/cpu/mpc8xxx/cpu.c                                | 2 ++
 arch/powerpc/cpu/mpc8xxx/fdt.c                                | 1 +
 arch/powerpc/cpu/mpc8xxx/fsl_lbc.c                            | 1 +
 arch/powerpc/cpu/mpc8xxx/fsl_pamu.c                           | 1 +
 arch/powerpc/cpu/mpc8xxx/law.c                                | 1 +
 arch/powerpc/cpu/mpc8xxx/pamu_table.c                         | 1 +
 arch/powerpc/cpu/mpc8xxx/srio.c                               | 1 +
 arch/powerpc/include/asm/arch-mpc83xx/gpio.h                  | 1 +
 arch/powerpc/include/asm/arch-mpc85xx/gpio.h                  | 1 +
 arch/powerpc/include/asm/cache.h                              | 1 +
 arch/powerpc/include/asm/cpm_85xx.h                           | 1 +
 arch/powerpc/include/asm/cpm_8xx.h                            | 1 +
 arch/powerpc/include/asm/fsl_dma.h                            | 1 +
 arch/powerpc/include/asm/fsl_i2c.h                            | 2 ++
 arch/powerpc/include/asm/fsl_law.h                            | 1 +
 arch/powerpc/include/asm/fsl_lbc.h                            | 1 +
 arch/powerpc/include/asm/fsl_mpc83xx_serdes.h                 | 1 +
 arch/powerpc/include/asm/fsl_pamu.h                           | 1 +
 arch/powerpc/include/asm/fsl_pci.h                            | 1 +
 arch/powerpc/include/asm/fsl_portals.h                        | 1 +
 arch/powerpc/include/asm/fsl_serdes.h                         | 1 +
 arch/powerpc/include/asm/global_data.h                        | 2 +-
 arch/powerpc/include/asm/immap_86xx.h                         | 1 +
 arch/powerpc/include/asm/immap_8xx.h                          | 1 +
 arch/powerpc/include/asm/io.h                                 | 2 ++
 arch/powerpc/include/asm/iopin_8xx.h                          | 1 +
 arch/powerpc/include/asm/mmu.h                                | 1 +
 arch/powerpc/include/asm/mp.h                                 | 1 +
 arch/powerpc/include/asm/ppc.h                                | 1 +
 arch/powerpc/lib/bdinfo.c                                     | 2 ++
 arch/powerpc/lib/bootm.c                                      | 1 +
 arch/powerpc/lib/cache.c                                      | 1 +
 arch/powerpc/lib/interrupts.c                                 | 1 +
 arch/powerpc/lib/spl.c                                        | 1 +
 arch/powerpc/lib/stack.c                                      | 1 +
 arch/powerpc/lib/time.c                                       | 1 +
 arch/riscv/cpu/cpu.c                                          | 1 +
 arch/riscv/cpu/fu540/cache.c                                  | 1 +
 arch/riscv/cpu/fu540/dram.c                                   | 1 +
 arch/riscv/cpu/generic/dram.c                                 | 1 +
 arch/riscv/include/asm/global_data.h                          | 1 +
 arch/riscv/include/asm/io.h                                   | 1 +
 arch/riscv/include/asm/ptrace.h                               | 1 +
 arch/riscv/include/asm/smp.h                                  | 1 +
 arch/riscv/lib/andes_plic.c                                   | 2 ++
 arch/riscv/lib/andes_plmt.c                                   | 2 ++
 arch/riscv/lib/boot.c                                         | 1 +
 arch/riscv/lib/bootm.c                                        | 2 ++
 arch/riscv/lib/fdt_fixup.c                                    | 1 +
 arch/riscv/lib/image.c                                        | 1 +
 arch/riscv/lib/interrupts.c                                   | 1 +
 arch/riscv/lib/rdtime.c                                       | 2 ++
 arch/riscv/lib/reloc_riscv_efi.c                              | 1 +
 arch/riscv/lib/sbi.c                                          | 1 +
 arch/riscv/lib/sbi_ipi.c                                      | 1 +
 arch/riscv/lib/sifive_clint.c                                 | 2 ++
 arch/riscv/lib/smp.c                                          | 1 +
 arch/riscv/lib/spl.c                                          | 2 ++
 arch/sandbox/cpu/cpu.c                                        | 1 +
 arch/sandbox/cpu/sdl.c                                        | 1 +
 arch/sandbox/cpu/spl.c                                        | 1 +
 arch/sandbox/cpu/start.c                                      | 1 +
 arch/sandbox/cpu/state.c                                      | 1 +
 arch/sandbox/include/asm/axi.h                                | 1 +
 arch/sandbox/include/asm/clk.h                                | 1 +
 arch/sandbox/include/asm/eth.h                                | 1 +
 arch/sandbox/include/asm/global_data.h                        | 1 +
 arch/sandbox/include/asm/gpio.h                               | 1 +
 arch/sandbox/include/asm/handoff.h                            | 1 +
 arch/sandbox/include/asm/io.h                                 | 1 +
 arch/sandbox/include/asm/mbox.h                               | 1 +
 arch/sandbox/include/asm/sdl.h                                | 1 +
 arch/sandbox/include/asm/sections.h                           | 1 +
 arch/sandbox/include/asm/setjmp.h                             | 1 +
 arch/sandbox/include/asm/state.h                              | 1 +
 arch/sandbox/include/asm/test.h                               | 1 +
 arch/sandbox/include/asm/u-boot-sandbox.h                     | 1 +
 arch/sandbox/lib/bootm.c                                      | 2 ++
 arch/sandbox/lib/pci_io.c                                     | 1 +
 arch/sh/cpu/sh4/cache.c                                       | 1 +
 arch/sh/include/asm/pci.h                                     | 1 +
 arch/sh/include/asm/string.h                                  | 1 +
 arch/sh/lib/board.c                                           | 1 +
 arch/sh/lib/time_sh2.c                                        | 1 +
 arch/sh/lib/zimageboot.c                                      | 1 +
 arch/x86/cpu/acpi_gpe.c                                       | 1 +
 arch/x86/cpu/apollolake/cpu_spl.c                             | 1 +
 arch/x86/cpu/apollolake/fsp_bindings.c                        | 1 +
 arch/x86/cpu/apollolake/fsp_s.c                               | 2 ++
 arch/x86/cpu/apollolake/hostbridge.c                          | 1 +
 arch/x86/cpu/apollolake/lpc.c                                 | 1 +
 arch/x86/cpu/apollolake/pmc.c                                 | 2 ++
 arch/x86/cpu/apollolake/punit.c                               | 1 +
 arch/x86/cpu/apollolake/spl.c                                 | 1 +
 arch/x86/cpu/apollolake/uart.c                                | 1 +
 arch/x86/cpu/baytrail/acpi.c                                  | 1 +
 arch/x86/cpu/baytrail/cpu.c                                   | 1 +
 arch/x86/cpu/baytrail/early_uart.c                            | 1 +
 arch/x86/cpu/baytrail/fsp_configs.c                           | 1 +
 arch/x86/cpu/braswell/early_uart.c                            | 1 +
 arch/x86/cpu/braswell/fsp_configs.c                           | 1 +
 arch/x86/cpu/broadwell/adsp.c                                 | 1 +
 arch/x86/cpu/broadwell/cpu_full.c                             | 2 ++
 arch/x86/cpu/broadwell/iobp.c                                 | 1 +
 arch/x86/cpu/broadwell/lpc.c                                  | 1 +
 arch/x86/cpu/broadwell/me.c                                   | 1 +
 arch/x86/cpu/broadwell/northbridge.c                          | 2 ++
 arch/x86/cpu/broadwell/pch.c                                  | 2 ++
 arch/x86/cpu/broadwell/pinctrl_broadwell.c                    | 2 ++
 arch/x86/cpu/broadwell/refcode.c                              | 2 ++
 arch/x86/cpu/broadwell/sata.c                                 | 1 +
 arch/x86/cpu/broadwell/sdram.c                                | 1 +
 arch/x86/cpu/coreboot/coreboot.c                              | 1 +
 arch/x86/cpu/coreboot/sdram.c                                 | 1 +
 arch/x86/cpu/coreboot/tables.c                                | 2 ++
 arch/x86/cpu/coreboot/timestamp.c                             | 2 ++
 arch/x86/cpu/cpu.c                                            | 2 ++
 arch/x86/cpu/efi/payload.c                                    | 1 +
 arch/x86/cpu/efi/sdram.c                                      | 1 +
 arch/x86/cpu/i386/cpu.c                                       | 3 +++
 arch/x86/cpu/i386/interrupt.c                                 | 2 ++
 arch/x86/cpu/intel_common/cpu.c                               | 1 +
 arch/x86/cpu/intel_common/fast_spi.c                          | 1 +
 arch/x86/cpu/intel_common/itss.c                              | 2 ++
 arch/x86/cpu/intel_common/lpc.c                               | 2 ++
 arch/x86/cpu/intel_common/microcode.c                         | 1 +
 arch/x86/cpu/intel_common/mrc.c                               | 2 ++
 arch/x86/cpu/intel_common/p2sb.c                              | 2 ++
 arch/x86/cpu/intel_common/pch.c                               | 1 +
 arch/x86/cpu/intel_common/report_platform.c                   | 1 +
 arch/x86/cpu/ioapic.c                                         | 1 +
 arch/x86/cpu/irq.c                                            | 1 +
 arch/x86/cpu/ivybridge/bd82x6x.c                              | 1 +
 arch/x86/cpu/ivybridge/cpu.c                                  | 1 +
 arch/x86/cpu/ivybridge/early_me.c                             | 1 +
 arch/x86/cpu/ivybridge/lpc.c                                  | 1 +
 arch/x86/cpu/ivybridge/model_206ax.c                          | 2 ++
 arch/x86/cpu/ivybridge/northbridge.c                          | 1 +
 arch/x86/cpu/ivybridge/sata.c                                 | 1 +
 arch/x86/cpu/ivybridge/sdram.c                                | 1 +
 arch/x86/cpu/mp_init.c                                        | 2 ++
 arch/x86/cpu/mtrr.c                                           | 1 +
 arch/x86/cpu/pci.c                                            | 1 +
 arch/x86/cpu/qemu/dram.c                                      | 1 +
 arch/x86/cpu/qemu/qemu.c                                      | 1 +
 arch/x86/cpu/quark/acpi.c                                     | 1 +
 arch/x86/cpu/quark/dram.c                                     | 1 +
 arch/x86/cpu/quark/hte.c                                      | 1 +
 arch/x86/cpu/quark/hte.h                                      | 1 +
 arch/x86/cpu/quark/mrc.c                                      | 1 +
 arch/x86/cpu/quark/mrc_util.c                                 | 1 +
 arch/x86/cpu/quark/mrc_util.h                                 | 1 +
 arch/x86/cpu/quark/msg_port.c                                 | 1 +
 arch/x86/cpu/quark/quark.c                                    | 1 +
 arch/x86/cpu/quark/smc.c                                      | 1 +
 arch/x86/cpu/quark/smc.h                                      | 1 +
 arch/x86/cpu/queensbay/tnc.c                                  | 1 +
 arch/x86/cpu/slimbootloader/sdram.c                           | 1 +
 arch/x86/cpu/tangier/acpi.c                                   | 1 +
 arch/x86/cpu/tangier/pinmux.c                                 | 3 +++
 arch/x86/cpu/tangier/sdram.c                                  | 1 +
 arch/x86/include/asm/acpi_nhlt.h                              | 1 +
 arch/x86/include/asm/acpi_table.h                             | 1 +
 arch/x86/include/asm/arch-apollolake/fsp/fsp_m_upd.h          | 2 ++
 arch/x86/include/asm/arch-apollolake/fsp/fsp_s_upd.h          | 2 ++
 arch/x86/include/asm/arch-apollolake/fsp_bindings.h           | 1 +
 arch/x86/include/asm/arch-apollolake/global_nvs.h             | 2 ++
 arch/x86/include/asm/arch-apollolake/lpc.h                    | 1 +
 arch/x86/include/asm/arch-apollolake/uart.h                   | 1 +
 arch/x86/include/asm/arch-baytrail/fsp/fsp_vpd.h              | 2 ++
 arch/x86/include/asm/arch-baytrail/global_nvs.h               | 2 ++
 arch/x86/include/asm/arch-braswell/fsp/fsp_vpd.h              | 2 ++
 arch/x86/include/asm/arch-broadwell/gpio.h                    | 1 +
 arch/x86/include/asm/arch-broadwell/me.h                      | 2 ++
 arch/x86/include/asm/arch-broadwell/pch.h                     | 1 +
 arch/x86/include/asm/arch-broadwell/pei_data.h                | 2 ++
 arch/x86/include/asm/arch-broadwell/pm.h                      | 1 +
 arch/x86/include/asm/arch-coreboot/sysinfo.h                  | 1 +
 arch/x86/include/asm/arch-coreboot/timestamp.h                | 1 +
 arch/x86/include/asm/arch-ivybridge/fsp/fsp_configs.h         | 1 +
 arch/x86/include/asm/arch-ivybridge/me.h                      | 2 ++
 arch/x86/include/asm/arch-ivybridge/model_206ax.h             | 1 +
 arch/x86/include/asm/arch-ivybridge/pch.h                     | 1 +
 arch/x86/include/asm/arch-ivybridge/pei_data.h                | 2 ++
 arch/x86/include/asm/arch-qemu/qemu.h                         | 1 +
 arch/x86/include/asm/arch-quark/global_nvs.h                  | 2 ++
 arch/x86/include/asm/arch-quark/mrc.h                         | 1 +
 arch/x86/include/asm/arch-quark/msg_port.h                    | 1 +
 arch/x86/include/asm/arch-quark/quark.h                       | 1 +
 arch/x86/include/asm/arch-queensbay/fsp/fsp_vpd.h             | 2 ++
 arch/x86/include/asm/arch-queensbay/tnc.h                     | 1 +
 arch/x86/include/asm/arch-slimbootloader/slimbootloader.h     | 1 +
 arch/x86/include/asm/arch-tangier/global_nvs.h                | 2 ++
 arch/x86/include/asm/bootm.h                                  | 1 +
 arch/x86/include/asm/coreboot_tables.h                        | 2 ++
 arch/x86/include/asm/cpu.h                                    | 1 +
 arch/x86/include/asm/cpu_common.h                             | 1 +
 arch/x86/include/asm/early_cmos.h                             | 1 +
 arch/x86/include/asm/fast_spi.h                               | 1 +
 arch/x86/include/asm/fsp/fsp_api.h                            | 1 +
 arch/x86/include/asm/fsp/fsp_azalia.h                         | 2 ++
 arch/x86/include/asm/fsp/fsp_fv.h                             | 1 +
 arch/x86/include/asm/fsp/fsp_hob.h                            | 2 ++
 arch/x86/include/asm/fsp/fsp_infoheader.h                     | 2 ++
 arch/x86/include/asm/fsp/fsp_support.h                        | 1 +
 arch/x86/include/asm/fsp1/fsp_api.h                           | 1 +
 arch/x86/include/asm/fsp1/fsp_ffs.h                           | 2 ++
 arch/x86/include/asm/fsp1/fsp_support.h                       | 1 +
 arch/x86/include/asm/fsp2/fsp_api.h                           | 2 ++
 arch/x86/include/asm/fsp2/fsp_internal.h                      | 1 +
 arch/x86/include/asm/global_data.h                            | 2 ++
 arch/x86/include/asm/gpio.h                                   | 1 +
 arch/x86/include/asm/handoff.h                                | 2 ++
 arch/x86/include/asm/hob.h                                    | 1 +
 arch/x86/include/asm/intel_pinctrl.h                          | 1 +
 arch/x86/include/asm/io.h                                     | 1 +
 arch/x86/include/asm/ioapic.h                                 | 1 +
 arch/x86/include/asm/irq.h                                    | 1 +
 arch/x86/include/asm/me_common.h                              | 1 +
 arch/x86/include/asm/microcode.h                              | 1 +
 arch/x86/include/asm/mpspec.h                                 | 1 +
 arch/x86/include/asm/mrc_common.h                             | 1 +
 arch/x86/include/asm/mrccache.h                               | 1 +
 arch/x86/include/asm/mtrr.h                                   | 2 ++
 arch/x86/include/asm/pch_common.h                             | 1 +
 arch/x86/include/asm/pci.h                                    | 1 +
 arch/x86/include/asm/pirq_routing.h                           | 2 ++
 arch/x86/include/asm/pnp_def.h                                | 1 +
 arch/x86/include/asm/processor.h                              | 1 +
 arch/x86/include/asm/scu.h                                    | 1 +
 arch/x86/include/asm/sfi.h                                    | 1 +
 arch/x86/include/asm/sipi.h                                   | 2 ++
 arch/x86/include/asm/speedstep.h                              | 1 +
 arch/x86/include/asm/spl.h                                    | 1 +
 arch/x86/include/asm/tables.h                                 | 1 +
 arch/x86/include/asm/u-boot-x86.h                             | 1 +
 arch/x86/include/asm/zimage.h                                 | 1 +
 arch/x86/lib/acpi.c                                           | 1 +
 arch/x86/lib/acpi_nhlt.c                                      | 1 +
 arch/x86/lib/acpi_table.c                                     | 2 ++
 arch/x86/lib/bios.c                                           | 1 +
 arch/x86/lib/bios.h                                           | 3 +++
 arch/x86/lib/bios_interrupts.c                                | 1 +
 arch/x86/lib/bootm.c                                          | 1 +
 arch/x86/lib/cmd_boot.c                                       | 1 +
 arch/x86/lib/coreboot_table.c                                 | 1 +
 arch/x86/lib/div64.c                                          | 2 ++
 arch/x86/lib/e820.c                                           | 1 +
 arch/x86/lib/early_cmos.c                                     | 1 +
 arch/x86/lib/fsp/fsp_common.c                                 | 1 +
 arch/x86/lib/fsp/fsp_dram.c                                   | 1 +
 arch/x86/lib/fsp/fsp_graphics.c                               | 1 +
 arch/x86/lib/fsp/fsp_support.c                                | 1 +
 arch/x86/lib/fsp1/fsp_dram.c                                  | 1 +
 arch/x86/lib/fsp1/fsp_support.c                               | 1 +
 arch/x86/lib/fsp2/fsp_dram.c                                  | 1 +
 arch/x86/lib/fsp2/fsp_init.c                                  | 1 +
 arch/x86/lib/fsp2/fsp_meminit.c                               | 1 +
 arch/x86/lib/fsp2/fsp_silicon_init.c                          | 1 +
 arch/x86/lib/fsp2/fsp_support.c                               | 2 ++
 arch/x86/lib/hob.c                                            | 1 +
 arch/x86/lib/i8254.c                                          | 1 +
 arch/x86/lib/i8259.c                                          | 1 +
 arch/x86/lib/interrupts.c                                     | 1 +
 arch/x86/lib/mpspec.c                                         | 3 +++
 arch/x86/lib/mrccache.c                                       | 1 +
 arch/x86/lib/physmem.c                                        | 1 +
 arch/x86/lib/pinctrl_ich6.c                                   | 1 +
 arch/x86/lib/pirq_routing.c                                   | 2 ++
 arch/x86/lib/pmu.c                                            | 1 +
 arch/x86/lib/ramtest.c                                        | 1 +
 arch/x86/lib/relocate.c                                       | 1 +
 arch/x86/lib/scu.c                                            | 1 +
 arch/x86/lib/sfi.c                                            | 1 +
 arch/x86/lib/spl.c                                            | 2 ++
 arch/x86/lib/tables.c                                         | 1 +
 arch/x86/lib/tpl.c                                            | 2 ++
 arch/x86/lib/zimage.c                                         | 1 +
 arch/xtensa/cpu/cpu.c                                         | 1 +
 arch/xtensa/include/asm/ldscript.h                            | 1 +
 arch/xtensa/lib/bootm.c                                       | 1 +
 arch/xtensa/lib/cache.c                                       | 1 +
 arch/xtensa/lib/relocate.c                                    | 1 +
 arch/xtensa/lib/time.c                                        | 1 +
 board/AndesTech/adp-ae3xx/adp-ae3xx.c                         | 1 +
 board/AndesTech/adp-ag101p/adp-ag101p.c                       | 1 +
 board/AndesTech/ax25-ae350/ax25-ae350.c                       | 1 +
 board/Arcturus/ucp1020/cmd_arc.c                              | 1 +
 board/Arcturus/ucp1020/ddr.c                                  | 1 +
 board/Arcturus/ucp1020/spl.c                                  | 1 +
 board/Arcturus/ucp1020/spl_minimal.c                          | 1 +
 board/Arcturus/ucp1020/ucp1020.c                              | 1 +
 board/BuR/brppt1/board.c                                      | 1 +
 board/BuR/brppt2/board.c                                      | 1 +
 board/BuR/brsmarc1/board.c                                    | 1 +
 board/BuR/brxre1/board.c                                      | 1 +
 board/BuR/common/br_resetc.c                                  | 2 ++
 board/BuR/common/br_resetc.h                                  | 1 +
 board/BuR/common/bur_common.h                                 | 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/mox_sp.h                              | 1 +
 board/CZ.NIC/turris_mox/turris_mox.c                          | 1 +
 board/CZ.NIC/turris_omnia/turris_omnia.c                      | 2 ++
 board/LaCie/common/common.c                                   | 1 +
 board/LaCie/common/common.h                                   | 1 +
 board/LaCie/edminiv2/edminiv2.c                               | 1 +
 board/LaCie/net2big_v2/net2big_v2.c                           | 1 +
 board/LaCie/netspace_v2/netspace_v2.c                         | 1 +
 board/Marvell/aspenite/aspenite.c                             | 1 +
 board/Marvell/db-88f6281-bp/db-88f6281-bp.c                   | 1 +
 board/Marvell/db-88f6820-amc/db-88f6820-amc.c                 | 1 +
 board/Marvell/db-88f6820-gp/db-88f6820-gp.c                   | 1 +
 board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c                   | 1 +
 board/Marvell/dreamplug/dreamplug.c                           | 1 +
 board/Marvell/gplugd/gplugd.c                                 | 1 +
 board/Marvell/guruplug/guruplug.c                             | 1 +
 board/Marvell/mvebu_armada-37xx/board.c                       | 1 +
 board/Marvell/mvebu_armada-8k/board.c                         | 1 +
 board/Marvell/openrd/openrd.c                                 | 1 +
 board/Marvell/sheevaplug/sheevaplug.c                         | 1 +
 board/Seagate/dockstar/dockstar.c                             | 1 +
 board/Seagate/goflexhome/goflexhome.c                         | 1 +
 board/Seagate/nas220/nas220.c                                 | 1 +
 board/Synology/ds109/ds109.c                                  | 1 +
 board/Synology/ds109/ds109.h                                  | 1 +
 board/Synology/ds414/cmd_syno.c                               | 1 +
 board/Synology/ds414/ds414.c                                  | 1 +
 board/abilis/tb100/tb100.c                                    | 1 +
 board/advantech/dms-ba16/dms-ba16.c                           | 1 +
 board/advantech/imx8qm_rom7720_a1/imx8qm_rom7720_a1.c         | 1 +
 board/advantech/imx8qm_rom7720_a1/spl.c                       | 1 +
 board/advantech/som-db5800-som-6867/som-db5800-som-6867.c     | 1 +
 board/alliedtelesis/SBx81LIFKW/sbx81lifkw.c                   | 1 +
 board/alliedtelesis/SBx81LIFXCAT/sbx81lifxcat.c               | 1 +
 board/alliedtelesis/x530/x530.c                               | 1 +
 board/altera/arria5-socdk/qts/pinmux_config.h                 | 1 +
 board/altera/arria5-socdk/qts/sdram_config.h                  | 1 +
 board/altera/cyclone5-socdk/qts/pinmux_config.h               | 1 +
 board/altera/cyclone5-socdk/qts/sdram_config.h                | 1 +
 board/amazon/kc1/kc1.c                                        | 1 +
 board/amlogic/odroid-n2/odroid-n2.c                           | 1 +
 board/amlogic/p200/p200.c                                     | 1 +
 board/amlogic/p201/p201.c                                     | 1 +
 board/amlogic/p212/p212.c                                     | 1 +
 board/amlogic/q200/q200.c                                     | 1 +
 board/aries/mcvevk/qts/pinmux_config.h                        | 1 +
 board/aries/mcvevk/qts/sdram_config.h                         | 1 +
 board/aristainetos/aristainetos.c                             | 1 +
 board/armadeus/apf27/apf27.c                                  | 1 +
 board/armltd/integrator/integrator.c                          | 1 +
 board/armltd/integrator/pci.c                                 | 1 +
 board/armltd/integrator/timer.c                               | 1 +
 board/armltd/vexpress/vexpress_common.c                       | 1 +
 board/armltd/vexpress/vexpress_tc2.c                          | 1 +
 board/armltd/vexpress64/pcie.c                                | 1 +
 board/armltd/vexpress64/vexpress64.c                          | 2 ++
 board/astro/mcf5373l/fpga.c                                   | 1 +
 board/astro/mcf5373l/mcf5373l.c                               | 1 +
 board/atmark-techno/armadillo-800eva/armadillo-800eva.c       | 1 +
 board/atmel/at91rm9200ek/at91rm9200ek.c                       | 1 +
 board/atmel/at91sam9261ek/at91sam9261ek.c                     | 1 +
 board/atmel/at91sam9263ek/at91sam9263ek.c                     | 1 +
 board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c               | 1 +
 board/atmel/at91sam9n12ek/at91sam9n12ek.c                     | 1 +
 board/atmel/at91sam9rlek/at91sam9rlek.c                       | 1 +
 board/atmel/common/board.c                                    | 1 +
 board/atmel/common/mac-spi-nor.c                              | 1 +
 board/atmel/common/video_display.c                            | 1 +
 board/atmel/sama5d27_som1_ek/sama5d27_som1_ek.c               | 1 +
 board/atmel/sama5d27_wlsom1_ek/sama5d27_wlsom1_ek.c           | 1 +
 board/atmel/sama5d2_icp/sama5d2_icp.c                         | 1 +
 board/atmel/sama5d2_xplained/sama5d2_xplained.c               | 1 +
 board/atmel/sama5d3_xplained/sama5d3_xplained.c               | 1 +
 board/atmel/sama5d3xek/sama5d3xek.c                           | 1 +
 board/atmel/sama5d4_xplained/sama5d4_xplained.c               | 1 +
 board/atmel/sama5d4ek/sama5d4ek.c                             | 1 +
 board/avionic-design/common/tamonten-ng.c                     | 1 +
 board/bachmann/ot1200/ot1200.c                                | 1 +
 board/bachmann/ot1200/ot1200_spl.c                            | 1 +
 board/barco/platinum/spl_picon.c                              | 1 +
 board/barco/platinum/spl_titanium.c                           | 1 +
 board/beacon/beacon-rzg2m/beacon-rzg2m.c                      | 1 +
 board/beacon/imx8mm/spl.c                                     | 1 +
 board/beckhoff/mx53cx9020/mx53cx9020.c                        | 1 +
 board/beckhoff/mx53cx9020/mx53cx9020_video.c                  | 1 +
 board/bluegiga/apx4devkit/apx4devkit.c                        | 1 +
 board/bluegiga/apx4devkit/spl_boot.c                          | 1 +
 board/bluewater/gurnard/gurnard.c                             | 1 +
 board/bosch/shc/board.c                                       | 1 +
 board/bosch/shc/board.h                                       | 1 +
 board/boundary/nitrogen6x/nitrogen6x.c                        | 1 +
 board/broadcom/bcm_ep/board.c                                 | 1 +
 board/broadcom/bcmns2/northstar2.c                            | 1 +
 board/broadcom/bcmns3/ns3.c                                   | 1 +
 board/bticino/mamoj/spl.c                                     | 1 +
 board/buffalo/lsxl/lsxl.c                                     | 1 +
 board/cadence/xtfpga/xtfpga.c                                 | 1 +
 board/cavium/thunderx/atf.c                                   | 1 +
 board/cavium/thunderx/thunderx.c                              | 1 +
 board/ccv/xpress/spl.c                                        | 1 +
 board/ccv/xpress/xpress.c                                     | 1 +
 board/cirrus/edb93xx/edb93xx.c                                | 1 +
 board/cloudengines/pogo_e02/pogo_e02.c                        | 1 +
 board/cobra5272/flash.c                                       | 1 +
 board/compulab/cl-som-imx7/cl-som-imx7.c                      | 1 +
 board/compulab/cl-som-imx7/spl.c                              | 1 +
 board/compulab/cm_fx6/cm_fx6.c                                | 1 +
 board/compulab/cm_fx6/spl.c                                   | 1 +
 board/compulab/cm_t335/cm_t335.c                              | 1 +
 board/compulab/cm_t43/cm_t43.c                                | 1 +
 board/compulab/cm_t43/spl.c                                   | 1 +
 board/compulab/common/common.c                                | 2 ++
 board/compulab/common/common.h                                | 1 +
 board/compulab/common/eeprom.c                                | 1 +
 board/compulab/common/eeprom.h                                | 1 +
 board/compulab/common/omap3_display.c                         | 1 +
 board/compulab/common/omap3_smc911x.c                         | 1 +
 board/congatec/cgtqmx6eval/cgtqmx6eval.c                      | 2 ++
 board/congatec/conga-qeval20-qa3-e3845/conga-qeval20-qa3.c    | 1 +
 board/corscience/tricorder/led.c                              | 1 +
 board/corscience/tricorder/tricorder-eeprom.c                 | 2 ++
 board/corscience/tricorder/tricorder-eeprom.h                 | 2 ++
 board/corscience/tricorder/tricorder.c                        | 1 +
 board/cortina/presidio-asic/presidio.c                        | 1 +
 board/creative/xfi3/spl_boot.c                                | 1 +
 board/creative/xfi3/xfi3.c                                    | 1 +
 board/cssi/MCR3000/MCR3000.c                                  | 2 ++
 board/cssi/MCR3000/nand.c                                     | 1 +
 board/d-link/dns325/dns325.c                                  | 1 +
 board/davinci/da8xxevm/da850evm.c                             | 1 +
 board/davinci/da8xxevm/omapl138_lcdk.c                        | 1 +
 board/devboards/dbm-soc1/qts/pinmux_config.h                  | 1 +
 board/devboards/dbm-soc1/qts/sdram_config.h                   | 1 +
 board/dhelectronics/dh_imx6/dh_imx6.c                         | 1 +
 board/dhelectronics/dh_imx6/dh_imx6_spl.c                     | 1 +
 board/dhelectronics/dh_stm32mp1/board.c                       | 2 ++
 board/ebv/socrates/qts/pinmux_config.h                        | 1 +
 board/ebv/socrates/qts/sdram_config.h                         | 1 +
 board/eets/pdu001/board.c                                     | 1 +
 board/eets/pdu001/board.h                                     | 1 +
 board/eets/pdu001/mux.c                                       | 1 +
 board/egnite/ethernut5/ethernut5_pwrman.c                     | 1 +
 board/el/el6x/el6x.c                                          | 1 +
 board/embest/mx6boards/mx6boards.c                            | 1 +
 board/emulation/qemu-arm/qemu-arm.c                           | 1 +
 board/emulation/qemu-riscv/qemu-riscv.c                       | 1 +
 board/engicam/common/board.c                                  | 1 +
 board/engicam/common/spl.c                                    | 1 +
 board/engicam/imx6q/imx6q.c                                   | 1 +
 board/esd/meesc/meesc.c                                       | 1 +
 board/esd/vme8349/caddy.c                                     | 1 +
 board/esd/vme8349/caddy.h                                     | 1 +
 board/esd/vme8349/pci.c                                       | 1 +
 board/esd/vme8349/vme8349.c                                   | 1 +
 board/freescale/common/arm_sleep.c                            | 2 ++
 board/freescale/common/cadmus.c                               | 1 +
 board/freescale/common/cds_pci_ft.c                           | 1 +
 board/freescale/common/cmd_esbc_validate.c                    | 1 +
 board/freescale/common/dcu_sii9022a.c                         | 1 +
 board/freescale/common/diu_ch7301.c                           | 1 +
 board/freescale/common/emc2305.c                              | 1 +
 board/freescale/common/emc2305.h                              | 1 +
 board/freescale/common/fman.c                                 | 1 +
 board/freescale/common/fman.h                                 | 1 +
 board/freescale/common/fsl_chain_of_trust.c                   | 2 ++
 board/freescale/common/fsl_validate.c                         | 2 ++
 board/freescale/common/ics307_clk.c                           | 1 +
 board/freescale/common/idt8t49n222a_serdes_clk.h              | 1 +
 board/freescale/common/ls102xa_stream_id.c                    | 1 +
 board/freescale/common/mc34vr500.c                            | 1 +
 board/freescale/common/mpc85xx_sleep.c                        | 2 ++
 board/freescale/common/ngpixis.c                              | 1 +
 board/freescale/common/ngpixis.h                              | 1 +
 board/freescale/common/ns_access.c                            | 1 +
 board/freescale/common/pfuze.c                                | 1 +
 board/freescale/common/pfuze.h                                | 1 +
 board/freescale/common/pixis.c                                | 1 +
 board/freescale/common/pixis.h                                | 1 +
 board/freescale/common/pq-mds-pib.c                           | 1 +
 board/freescale/common/qixis.c                                | 2 ++
 board/freescale/common/qixis.h                                | 1 +
 board/freescale/common/sdhc_boot.c                            | 1 +
 board/freescale/common/sgmii_riser.c                          | 1 +
 board/freescale/common/spl.h                                  | 1 +
 board/freescale/common/sys_eeprom.c                           | 2 ++
 board/freescale/common/vid.c                                  | 2 ++
 board/freescale/common/vid.h                                  | 1 +
 board/freescale/corenet_ds/corenet_ds.c                       | 1 +
 board/freescale/corenet_ds/ddr.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/imx8mm_evk/spl.c                              | 1 +
 board/freescale/imx8mn_evk/spl.c                              | 1 +
 board/freescale/imx8mp_evk/spl.c                              | 1 +
 board/freescale/imx8mq_evk/spl.c                              | 1 +
 board/freescale/imx8qm_mek/imx8qm_mek.c                       | 2 ++
 board/freescale/imx8qm_mek/spl.c                              | 1 +
 board/freescale/imx8qxp_mek/imx8qxp_mek.c                     | 2 ++
 board/freescale/imx8qxp_mek/spl.c                             | 1 +
 board/freescale/imxrt1020-evk/imxrt1020-evk.c                 | 1 +
 board/freescale/imxrt1050-evk/imxrt1050-evk.c                 | 1 +
 board/freescale/ls1012afrdm/ls1012afrdm.c                     | 1 +
 board/freescale/ls1012aqds/eth.c                              | 1 +
 board/freescale/ls1012aqds/ls1012aqds.c                       | 2 ++
 board/freescale/ls1012ardb/eth.c                              | 1 +
 board/freescale/ls1012ardb/ls1012ardb.c                       | 1 +
 board/freescale/ls1021aiot/ls1021aiot.c                       | 1 +
 board/freescale/ls1021aqds/dcu.c                              | 1 +
 board/freescale/ls1021aqds/ddr.c                              | 2 ++
 board/freescale/ls1021aqds/ddr.h                              | 1 +
 board/freescale/ls1021aqds/eth.c                              | 1 +
 board/freescale/ls1021aqds/ls1021aqds.c                       | 2 ++
 board/freescale/ls1021atsn/ls1021atsn.c                       | 1 +
 board/freescale/ls1021atwr/ls1021atwr.c                       | 2 ++
 board/freescale/ls1028a/ls1028a.c                             | 2 ++
 board/freescale/ls1043aqds/ddr.c                              | 1 +
 board/freescale/ls1043aqds/ddr.h                              | 1 +
 board/freescale/ls1043aqds/eth.c                              | 1 +
 board/freescale/ls1043aqds/ls1043aqds.c                       | 2 ++
 board/freescale/ls1043ardb/cpld.c                             | 1 +
 board/freescale/ls1043ardb/cpld.h                             | 1 +
 board/freescale/ls1043ardb/ddr.c                              | 1 +
 board/freescale/ls1043ardb/ddr.h                              | 1 +
 board/freescale/ls1043ardb/eth.c                              | 1 +
 board/freescale/ls1043ardb/ls1043ardb.c                       | 1 +
 board/freescale/ls1046afrwy/eth.c                             | 1 +
 board/freescale/ls1046afrwy/ls1046afrwy.c                     | 1 +
 board/freescale/ls1046aqds/ddr.c                              | 1 +
 board/freescale/ls1046aqds/ddr.h                              | 1 +
 board/freescale/ls1046aqds/eth.c                              | 1 +
 board/freescale/ls1046aqds/ls1046aqds.c                       | 2 ++
 board/freescale/ls1046ardb/cpld.c                             | 1 +
 board/freescale/ls1046ardb/cpld.h                             | 1 +
 board/freescale/ls1046ardb/ddr.c                              | 1 +
 board/freescale/ls1046ardb/ddr.h                              | 1 +
 board/freescale/ls1046ardb/eth.c                              | 1 +
 board/freescale/ls1046ardb/ls1046ardb.c                       | 1 +
 board/freescale/ls1088a/ddr.c                                 | 1 +
 board/freescale/ls1088a/ddr.h                                 | 1 +
 board/freescale/ls1088a/eth_ls1088aqds.c                      | 3 +++
 board/freescale/ls1088a/eth_ls1088ardb.c                      | 1 +
 board/freescale/ls1088a/ls1088a.c                             | 3 +++
 board/freescale/ls2080a/ddr.c                                 | 1 +
 board/freescale/ls2080a/ddr.h                                 | 1 +
 board/freescale/ls2080a/ls2080a.c                             | 1 +
 board/freescale/ls2080aqds/ddr.c                              | 1 +
 board/freescale/ls2080aqds/ddr.h                              | 1 +
 board/freescale/ls2080aqds/eth.c                              | 3 +++
 board/freescale/ls2080aqds/ls2080aqds.c                       | 2 ++
 board/freescale/ls2080ardb/ddr.c                              | 1 +
 board/freescale/ls2080ardb/ddr.h                              | 1 +
 board/freescale/ls2080ardb/eth_ls2080rdb.c                    | 1 +
 board/freescale/ls2080ardb/ls2080ardb.c                       | 2 ++
 board/freescale/lx2160a/eth_lx2160aqds.c                      | 2 ++
 board/freescale/lx2160a/eth_lx2160ardb.c                      | 1 +
 board/freescale/lx2160a/lx2160a.c                             | 2 ++
 board/freescale/m5208evbe/m5208evbe.c                         | 1 +
 board/freescale/m52277evb/m52277evb.c                         | 1 +
 board/freescale/m5235evb/m5235evb.c                           | 1 +
 board/freescale/m5249evb/m5249evb.c                           | 1 +
 board/freescale/m5253demo/flash.c                             | 1 +
 board/freescale/m5253demo/m5253demo.c                         | 1 +
 board/freescale/m5282evb/m5282evb.c                           | 1 +
 board/freescale/m53017evb/m53017evb.c                         | 1 +
 board/freescale/m5329evb/m5329evb.c                           | 1 +
 board/freescale/m5329evb/nand.c                               | 1 +
 board/freescale/m5373evb/m5373evb.c                           | 1 +
 board/freescale/m5373evb/nand.c                               | 1 +
 board/freescale/m54418twr/m54418twr.c                         | 1 +
 board/freescale/m54451evb/m54451evb.c                         | 1 +
 board/freescale/m54455evb/m54455evb.c                         | 1 +
 board/freescale/m547xevb/m547xevb.c                           | 1 +
 board/freescale/m548xevb/m548xevb.c                           | 1 +
 board/freescale/mpc8308rdb/mpc8308rdb.c                       | 1 +
 board/freescale/mpc8308rdb/sdram.c                            | 1 +
 board/freescale/mpc8313erdb/mpc8313erdb.c                     | 1 +
 board/freescale/mpc8313erdb/sdram.c                           | 1 +
 board/freescale/mpc8315erdb/mpc8315erdb.c                     | 1 +
 board/freescale/mpc8315erdb/sdram.c                           | 1 +
 board/freescale/mpc8323erdb/mpc8323erdb.c                     | 1 +
 board/freescale/mpc832xemds/mpc832xemds.c                     | 1 +
 board/freescale/mpc8349emds/ddr.c                             | 1 +
 board/freescale/mpc8349emds/mpc8349emds.c                     | 1 +
 board/freescale/mpc8349emds/pci.c                             | 1 +
 board/freescale/mpc8349itx/mpc8349itx.c                       | 1 +
 board/freescale/mpc8349itx/pci.c                              | 1 +
 board/freescale/mpc837xemds/mpc837xemds.c                     | 2 ++
 board/freescale/mpc837xemds/pci.c                             | 1 +
 board/freescale/mpc837xerdb/mpc837xerdb.c                     | 2 ++
 board/freescale/mpc837xerdb/pci.c                             | 1 +
 board/freescale/mpc8541cds/mpc8541cds.c                       | 1 +
 board/freescale/mpc8544ds/mpc8544ds.c                         | 1 +
 board/freescale/mpc8548cds/mpc8548cds.c                       | 1 +
 board/freescale/mpc8555cds/mpc8555cds.c                       | 1 +
 board/freescale/mpc8568mds/bcsr.c                             | 1 +
 board/freescale/mpc8568mds/mpc8568mds.c                       | 1 +
 board/freescale/mpc8569mds/bcsr.c                             | 1 +
 board/freescale/mpc8569mds/mpc8569mds.c                       | 2 ++
 board/freescale/mpc8572ds/ddr.c                               | 1 +
 board/freescale/mpc8572ds/mpc8572ds.c                         | 2 ++
 board/freescale/mpc8610hpcd/mpc8610hpcd.c                     | 2 ++
 board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c                 | 1 +
 board/freescale/mpc8641hpcn/ddr.c                             | 1 +
 board/freescale/mpc8641hpcn/mpc8641hpcn.c                     | 2 ++
 board/freescale/mx23evk/spl_boot.c                            | 1 +
 board/freescale/mx28evk/iomux.c                               | 1 +
 board/freescale/mx51evk/mx51evk.c                             | 1 +
 board/freescale/mx53ard/mx53ard.c                             | 1 +
 board/freescale/mx53evk/mx53evk.c                             | 1 +
 board/freescale/mx53loco/mx53loco.c                           | 1 +
 board/freescale/mx53smd/mx53smd.c                             | 1 +
 board/freescale/mx6memcal/spl.c                               | 1 +
 board/freescale/mx6qarm2/mx6qarm2.c                           | 1 +
 board/freescale/mx6sabreauto/mx6sabreauto.c                   | 1 +
 board/freescale/mx6sabresd/mx6sabresd.c                       | 1 +
 board/freescale/mx6slevk/mx6slevk.c                           | 1 +
 board/freescale/mx6sllevk/mx6sllevk.c                         | 1 +
 board/freescale/mx6sxsabreauto/mx6sxsabreauto.c               | 1 +
 board/freescale/mx6sxsabresd/mx6sxsabresd.c                   | 1 +
 board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c             | 1 +
 board/freescale/p1010rdb/ddr.c                                | 1 +
 board/freescale/p1010rdb/p1010rdb.c                           | 2 ++
 board/freescale/p1010rdb/spl.c                                | 1 +
 board/freescale/p1010rdb/spl_minimal.c                        | 1 +
 board/freescale/p1023rdb/p1023rdb.c                           | 1 +
 board/freescale/p1_p2_rdb_pc/ddr.c                            | 1 +
 board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c                   | 1 +
 board/freescale/p1_p2_rdb_pc/spl.c                            | 1 +
 board/freescale/p1_p2_rdb_pc/spl_minimal.c                    | 1 +
 board/freescale/p2041rdb/cpld.c                               | 1 +
 board/freescale/p2041rdb/cpld.h                               | 1 +
 board/freescale/p2041rdb/ddr.c                                | 1 +
 board/freescale/p2041rdb/eth.c                                | 1 +
 board/freescale/p2041rdb/p2041rdb.c                           | 1 +
 board/freescale/qemu-ppce500/qemu-ppce500.c                   | 1 +
 board/freescale/s32v234evb/clock.c                            | 1 +
 board/freescale/s32v234evb/lpddr2.c                           | 1 +
 board/freescale/t102xrdb/cpld.c                               | 1 +
 board/freescale/t102xrdb/cpld.h                               | 1 +
 board/freescale/t102xrdb/ddr.c                                | 2 ++
 board/freescale/t102xrdb/eth_t102xrdb.c                       | 1 +
 board/freescale/t102xrdb/spl.c                                | 2 ++
 board/freescale/t102xrdb/t102xrdb.c                           | 2 ++
 board/freescale/t102xrdb/t102xrdb.h                           | 1 +
 board/freescale/t104xrdb/cpld.c                               | 1 +
 board/freescale/t104xrdb/cpld.h                               | 1 +
 board/freescale/t104xrdb/ddr.c                                | 2 ++
 board/freescale/t104xrdb/ddr.h                                | 1 +
 board/freescale/t104xrdb/diu.c                                | 1 +
 board/freescale/t104xrdb/spl.c                                | 1 +
 board/freescale/t104xrdb/t104xrdb.c                           | 2 ++
 board/freescale/t208xqds/ddr.c                                | 1 +
 board/freescale/t208xqds/ddr.h                                | 1 +
 board/freescale/t208xqds/eth_t208xqds.c                       | 1 +
 board/freescale/t208xqds/spl.c                                | 1 +
 board/freescale/t208xqds/t208xqds.c                           | 1 +
 board/freescale/t208xrdb/cpld.c                               | 1 +
 board/freescale/t208xrdb/cpld.h                               | 1 +
 board/freescale/t208xrdb/ddr.c                                | 1 +
 board/freescale/t208xrdb/ddr.h                                | 1 +
 board/freescale/t208xrdb/eth_t208xrdb.c                       | 1 +
 board/freescale/t208xrdb/spl.c                                | 1 +
 board/freescale/t208xrdb/t208xrdb.c                           | 1 +
 board/freescale/t4rdb/cpld.c                                  | 1 +
 board/freescale/t4rdb/cpld.h                                  | 1 +
 board/freescale/t4rdb/ddr.c                                   | 1 +
 board/freescale/t4rdb/ddr.h                                   | 1 +
 board/freescale/t4rdb/eth.c                                   | 1 +
 board/freescale/t4rdb/spl.c                                   | 1 +
 board/freescale/t4rdb/t4240rdb.c                              | 1 +
 board/friendlyarm/nanopi2/board.c                             | 1 +
 board/friendlyarm/nanopi2/hwrev.c                             | 1 +
 board/friendlyarm/nanopi2/hwrev.h                             | 1 +
 board/gardena/smart-gateway-mt7688/board.c                    | 2 ++
 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/gsc.h                              | 1 +
 board/gateworks/gw_ventana/gw_ventana.c                       | 1 +
 board/gateworks/gw_ventana/gw_ventana_spl.c                   | 1 +
 board/gateworks/gw_ventana/ventana_eeprom.h                   | 1 +
 board/gdsys/a38x/controlcenterdc.c                            | 1 +
 board/gdsys/a38x/dt_helpers.c                                 | 1 +
 board/gdsys/a38x/dt_helpers.h                                 | 1 +
 board/gdsys/a38x/hre.c                                        | 2 ++
 board/gdsys/a38x/hre.h                                        | 1 +
 board/gdsys/a38x/hydra.c                                      | 2 ++
 board/gdsys/a38x/hydra.h                                      | 1 +
 board/gdsys/a38x/ihs_phys.c                                   | 2 ++
 board/gdsys/a38x/ihs_phys.h                                   | 1 +
 board/gdsys/a38x/keyprogram.c                                 | 1 +
 board/gdsys/a38x/spl.c                                        | 1 +
 board/gdsys/common/cmd_ioloop.c                               | 2 ++
 board/gdsys/common/dp501.c                                    | 1 +
 board/gdsys/common/dp501.h                                    | 1 +
 board/gdsys/common/fanctrl.h                                  | 1 +
 board/gdsys/common/ihs_mdio.c                                 | 1 +
 board/gdsys/common/ihs_mdio.h                                 | 1 +
 board/gdsys/common/ioep-fpga.c                                | 1 +
 board/gdsys/common/mclink.h                                   | 1 +
 board/gdsys/common/osd.c                                      | 1 +
 board/gdsys/common/osd_cmd.c                                  | 1 +
 board/gdsys/common/phy.c                                      | 1 +
 board/gdsys/mpc8308/hrcon.c                                   | 2 ++
 board/gdsys/mpc8308/mpc8308.c                                 | 1 +
 board/gdsys/mpc8308/mpc8308.h                                 | 1 +
 board/gdsys/mpc8308/strider.c                                 | 2 ++
 board/gdsys/p1022/controlcenterd-id.c                         | 2 ++
 board/gdsys/p1022/controlcenterd.c                            | 1 +
 board/gdsys/p1022/ddr.c                                       | 1 +
 board/gdsys/p1022/diu.c                                       | 1 +
 board/gdsys/p1022/sdhc_boot.c                                 | 1 +
 board/ge/bx50v3/bx50v3.c                                      | 2 ++
 board/ge/common/ge_common.c                                   | 1 +
 board/ge/common/vpd_reader.c                                  | 1 +
 board/ge/common/vpd_reader.h                                  | 1 +
 board/ge/mx53ppd/mx53ppd.c                                    | 1 +
 board/ge/mx53ppd/mx53ppd_video.c                              | 1 +
 board/google/imx8mq_phanbell/spl.c                            | 1 +
 board/grinn/chiliboard/board.c                                | 1 +
 board/grinn/liteboard/board.c                                 | 1 +
 board/highbank/ahci.c                                         | 1 +
 board/highbank/highbank.c                                     | 2 ++
 board/hisilicon/hikey/hikey.c                                 | 1 +
 board/hisilicon/hikey960/hikey960.c                           | 1 +
 board/hisilicon/poplar/poplar.c                               | 1 +
 board/ids/ids8313/ids8313.c                                   | 1 +
 board/imgtec/boston/checkboard.c                              | 1 +
 board/imgtec/boston/ddr.c                                     | 1 +
 board/imgtec/ci20/ci20.c                                      | 2 ++
 board/imgtec/malta/malta.c                                    | 2 ++
 board/imgtec/malta/superio.c                                  | 1 +
 board/intel/edison/edison.c                                   | 1 +
 board/intel/galileo/galileo.c                                 | 1 +
 board/inversepath/usbarmory/usbarmory.c                       | 1 +
 board/iomega/iconnect/iconnect.c                              | 1 +
 board/is1/qts/pinmux_config.h                                 | 1 +
 board/is1/qts/sdram_config.h                                  | 1 +
 board/isee/igep003x/board.c                                   | 1 +
 board/isee/igep00x0/igep00x0.c                                | 1 +
 board/k+p/kp_imx53/kp_id_rev.c                                | 1 +
 board/k+p/kp_imx53/kp_id_rev.h                                | 2 ++
 board/k+p/kp_imx53/kp_imx53.c                                 | 1 +
 board/k+p/kp_imx6q_tpc/kp_imx6q_tpc_spl.c                     | 1 +
 board/keymile/common/common.c                                 | 1 +
 board/keymile/common/common.h                                 | 1 +
 board/keymile/common/qrio.c                                   | 2 ++
 board/keymile/common/qrio.h                                   | 1 +
 board/keymile/km83xx/km83xx.c                                 | 2 ++
 board/keymile/km83xx/km83xx_i2c.c                             | 1 +
 board/keymile/km_arm/fpga_config.c                            | 1 +
 board/keymile/km_arm/km_arm.c                                 | 1 +
 board/keymile/kmp204x/kmp204x.c                               | 1 +
 board/keymile/kmp204x/pci.c                                   | 1 +
 board/keymile/secu1/qts/pinmux_config.h                       | 1 +
 board/keymile/secu1/qts/sdram_config.h                        | 1 +
 board/keymile/secu1/socfpga.c                                 | 1 +
 board/kmc/kzm9g/kzm9g.c                                       | 1 +
 board/kobol/helios4/helios4.c                                 | 1 +
 board/kosagi/novena/novena.c                                  | 1 +
 board/kosagi/novena/novena_spl.c                              | 1 +
 board/kosagi/novena/video.c                                   | 1 +
 board/laird/wb50n/wb50n.c                                     | 1 +
 board/lego/ev3/legoev3.c                                      | 1 +
 board/lg/sniper/sniper.c                                      | 1 +
 board/liebherr/display5/display5.c                            | 2 ++
 board/liebherr/display5/spl.c                                 | 1 +
 board/liebherr/mccmon6/spl.c                                  | 1 +
 board/liebherr/xea/spl_xea.c                                  | 1 +
 board/liebherr/xea/xea.c                                      | 1 +
 board/logicpd/am3517evm/am3517evm.c                           | 1 +
 board/logicpd/imx6/imx6logic.c                                | 1 +
 board/logicpd/omap3som/omap3logic.c                           | 1 +
 board/menlo/m53menlo/m53menlo.c                               | 1 +
 board/microchip/pic32mzda/pic32mzda.c                         | 1 +
 board/mini-box/picosam9g45/picosam9g45.c                      | 1 +
 board/mpc8308_p1m/sdram.c                                     | 1 +
 board/mscc/common/spi.c                                       | 1 +
 board/mscc/jr2/jr2.c                                          | 2 ++
 board/mscc/luton/luton.c                                      | 1 +
 board/mscc/serval/serval.c                                    | 1 +
 board/netgear/dgnd3700v2/dgnd3700v2.c                         | 1 +
 board/nokia/rx51/rx51.c                                       | 1 +
 board/nokia/rx51/rx51.h                                       | 1 +
 board/nokia/rx51/tag_omap.h                                   | 1 +
 board/nvidia/cardhu/cardhu.c                                  | 1 +
 board/nvidia/dalmore/dalmore.c                                | 1 +
 board/nvidia/e2220-1170/e2220-1170.c                          | 1 +
 board/nvidia/p2371-0000/p2371-0000.c                          | 1 +
 board/nvidia/p2371-2180/p2371-2180.c                          | 1 +
 board/nvidia/p2571/p2571.c                                    | 1 +
 board/nvidia/p2771-0000/p2771-0000.c                          | 1 +
 board/nvidia/p3450-0000/p3450-0000.c                          | 1 +
 board/nvidia/venice2/as3722_init.c                            | 1 +
 board/olimex/mx23_olinuxino/spl_boot.c                        | 1 +
 board/phytec/pcl063/pcl063.c                                  | 1 +
 board/phytec/pcl063/spl.c                                     | 1 +
 board/phytec/pcm052/pcm052.c                                  | 1 +
 board/phytec/pcm058/pcm058.c                                  | 1 +
 board/phytec/pfla02/pfla02.c                                  | 1 +
 board/phytec/phycore_rk3288/phycore-rk3288.c                  | 1 +
 board/phytec/phycore_rk3288/som.h                             | 1 +
 board/phytium/durian/durian.c                                 | 1 +
 board/pine64/pinebook-pro-rk3399/pinebook-pro-rk3399.c        | 1 +
 board/pine64/rockpro64_rk3399/rockpro64-rk3399.c              | 1 +
 board/ppcag/bg0900/spl_boot.c                                 | 1 +
 board/qca/ap121/ap121.c                                       | 1 +
 board/qca/ap143/ap143.c                                       | 1 +
 board/qca/ap152/ap152.c                                       | 1 +
 board/qemu-mips/qemu-mips.c                                   | 1 +
 board/qualcomm/dragonboard410c/dragonboard410c.c              | 1 +
 board/qualcomm/dragonboard820c/dragonboard820c.c              | 1 +
 board/raidsonic/ib62x0/ib62x0.c                               | 1 +
 board/raspberrypi/rpi/rpi.c                                   | 2 ++
 board/renesas/alt/alt.c                                       | 1 +
 board/renesas/alt/alt_spl.c                                   | 1 +
 board/renesas/alt/qos.c                                       | 1 +
 board/renesas/blanche/blanche.c                               | 1 +
 board/renesas/blanche/qos.c                                   | 1 +
 board/renesas/condor/condor.c                                 | 1 +
 board/renesas/draak/draak.c                                   | 1 +
 board/renesas/eagle/eagle.c                                   | 1 +
 board/renesas/ebisu/ebisu.c                                   | 1 +
 board/renesas/gose/gose.c                                     | 1 +
 board/renesas/gose/gose_spl.c                                 | 1 +
 board/renesas/gose/qos.c                                      | 1 +
 board/renesas/grpeach/grpeach.c                               | 1 +
 board/renesas/koelsch/koelsch.c                               | 1 +
 board/renesas/koelsch/koelsch_spl.c                           | 1 +
 board/renesas/koelsch/qos.c                                   | 1 +
 board/renesas/lager/lager.c                                   | 1 +
 board/renesas/lager/lager_spl.c                               | 1 +
 board/renesas/lager/qos.c                                     | 1 +
 board/renesas/porter/porter.c                                 | 1 +
 board/renesas/porter/porter_spl.c                             | 1 +
 board/renesas/porter/qos.c                                    | 1 +
 board/renesas/rcar-common/gen3-spl.c                          | 1 +
 board/renesas/salvator-x/salvator-x.c                         | 1 +
 board/renesas/sh7757lcr/sh7757lcr.c                           | 1 +
 board/renesas/sh7763rdp/sh7763rdp.c                           | 1 +
 board/renesas/silk/qos.c                                      | 1 +
 board/renesas/silk/silk.c                                     | 1 +
 board/renesas/silk/silk_spl.c                                 | 1 +
 board/renesas/stout/cpld.c                                    | 1 +
 board/renesas/stout/qos.c                                     | 1 +
 board/renesas/stout/stout.c                                   | 1 +
 board/renesas/stout/stout_spl.c                               | 1 +
 board/renesas/ulcb/cpld.c                                     | 1 +
 board/renesas/ulcb/ulcb.c                                     | 1 +
 board/rockchip/tinker_rk3288/tinker-rk3288.c                  | 1 +
 board/samsung/arndale/arndale.c                               | 1 +
 board/samsung/common/board.c                                  | 2 ++
 board/samsung/common/exynos5-dt-types.c                       | 2 ++
 board/samsung/common/exynos5-dt.c                             | 1 +
 board/samsung/common/misc.c                                   | 1 +
 board/samsung/goni/goni.c                                     | 1 +
 board/samsung/origen/origen.c                                 | 1 +
 board/samsung/smdkc100/smdkc100.c                             | 1 +
 board/samsung/smdkv310/smdkv310.c                             | 1 +
 board/samsung/trats/trats.c                                   | 1 +
 board/samsung/trats2/trats2.c                                 | 1 +
 board/samsung/universal_c210/universal.c                      | 1 +
 board/sandbox/sandbox.c                                       | 1 +
 board/sandisk/sansa_fuze_plus/sfp.c                           | 1 +
 board/sandisk/sansa_fuze_plus/spl_boot.c                      | 1 +
 board/sbc8349/sbc8349.c                                       | 1 +
 board/sbc8548/ddr.c                                           | 2 ++
 board/sbc8548/sbc8548.c                                       | 1 +
 board/sbc8641d/sbc8641d.c                                     | 1 +
 board/schulercontrol/sc_sps_1/spl_boot.c                      | 1 +
 board/seco/mx6quq7/mx6quq7.c                                  | 1 +
 board/seeed/linkit-smart-7688/board.c                         | 1 +
 board/siemens/capricorn/board.c                               | 2 ++
 board/siemens/capricorn/spl.c                                 | 1 +
 board/siemens/common/factoryset.c                             | 1 +
 board/siemens/common/factoryset.h                             | 1 +
 board/siemens/corvus/board.c                                  | 1 +
 board/siemens/draco/board.c                                   | 1 +
 board/siemens/pxm2/board.c                                    | 1 +
 board/siemens/rut/board.c                                     | 2 ++
 board/sifive/fu540/fu540.c                                    | 1 +
 board/sifive/fu540/spl.c                                      | 1 +
 board/sks-kinkel/sksimx6/sksimx6.c                            | 1 +
 board/socrates/nand.c                                         | 1 +
 board/socrates/sdram.c                                        | 2 ++
 board/socrates/socrates.c                                     | 1 +
 board/softing/vining_2000/vining_2000.c                       | 2 ++
 board/softing/vining_fpga/qts/pinmux_config.h                 | 1 +
 board/softing/vining_fpga/qts/sdram_config.h                  | 1 +
 board/softing/vining_fpga/socfpga.c                           | 1 +
 board/solidrun/clearfog/clearfog.c                            | 2 ++
 board/solidrun/common/tlv_data.c                              | 2 ++
 board/solidrun/mx6cuboxi/mx6cuboxi.c                          | 2 ++
 board/spear/spear300/spear300.c                               | 1 +
 board/spear/spear310/spear310.c                               | 1 +
 board/spear/spear320/spear320.c                               | 1 +
 board/spear/spear600/spear600.c                               | 1 +
 board/spear/x600/fpga.c                                       | 1 +
 board/sr1500/qts/pinmux_config.h                              | 1 +
 board/sr1500/qts/sdram_config.h                               | 1 +
 board/st/common/stm32mp_dfu.c                                 | 2 ++
 board/st/common/stpmic1.c                                     | 1 +
 board/st/common/stpmic1.h                                     | 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/stm32f746-disco/stm32f746-disco.c                    | 1 +
 board/st/stm32h743-disco/stm32h743-disco.c                    | 1 +
 board/st/stm32h743-eval/stm32h743-eval.c                      | 1 +
 board/st/stm32mp1/spl.c                                       | 1 +
 board/st/stm32mp1/stm32mp1.c                                  | 2 ++
 board/st/stv0991/stv0991.c                                    | 1 +
 board/sunxi/board.c                                           | 1 +
 board/synopsys/axs10x/axs10x.c                                | 2 ++
 board/synopsys/emsdp/emsdp.c                                  | 1 +
 board/synopsys/hsdk/clk-lib.c                                 | 1 +
 board/synopsys/hsdk/clk-lib.h                                 | 1 +
 board/synopsys/hsdk/env-lib.h                                 | 1 +
 board/synopsys/hsdk/hsdk.c                                    | 3 +++
 board/synopsys/iot_devkit/iot_devkit.c                        | 1 +
 board/sysam/amcore/amcore.c                                   | 1 +
 board/sysam/stmark2/stmark2.c                                 | 1 +
 board/tbs/tbs2910/tbs2910.c                                   | 1 +
 board/tcl/sl50/board.c                                        | 1 +
 board/technexion/pico-imx6/pico-imx6.c                        | 1 +
 board/technexion/pico-imx6/spl.c                              | 1 +
 board/technexion/pico-imx6ul/pico-imx6ul.c                    | 1 +
 board/technexion/pico-imx6ul/spl.c                            | 1 +
 board/technexion/pico-imx7d/spl.c                             | 2 ++
 board/technexion/pico-imx8mq/spl.c                            | 1 +
 board/technologic/ts4600/iomux.c                              | 1 +
 board/technologic/ts4800/ts4800.c                             | 1 +
 board/technologic/ts4800/ts4800.h                             | 1 +
 board/terasic/de0-nano-soc/qts/pinmux_config.h                | 1 +
 board/terasic/de0-nano-soc/qts/sdram_config.h                 | 1 +
 board/terasic/de1-soc/qts/pinmux_config.h                     | 1 +
 board/terasic/de1-soc/qts/sdram_config.h                      | 1 +
 board/terasic/de1-soc/socfpga.c                               | 1 +
 board/terasic/de10-nano/qts/pinmux_config.h                   | 1 +
 board/terasic/de10-nano/qts/sdram_config.h                    | 1 +
 board/terasic/sockit/qts/pinmux_config.h                      | 1 +
 board/terasic/sockit/qts/sdram_config.h                       | 1 +
 board/theadorable/fpga.c                                      | 1 +
 board/theadorable/theadorable.c                               | 1 +
 board/theobroma-systems/puma_rk3399/puma-rk3399.c             | 1 +
 board/ti/am335x/board.c                                       | 1 +
 board/ti/am43xx/board.c                                       | 2 ++
 board/ti/am57xx/board.c                                       | 2 ++
 board/ti/am65x/evm.c                                          | 1 +
 board/ti/beagle/beagle.c                                      | 1 +
 board/ti/common/board_detect.c                                | 3 +++
 board/ti/common/board_detect.h                                | 2 ++
 board/ti/dra7xx/evm.c                                         | 1 +
 board/ti/evm/evm.c                                            | 1 +
 board/ti/evm/evm.h                                            | 1 +
 board/ti/j721e/evm.c                                          | 2 ++
 board/ti/ks2_evm/board.c                                      | 2 ++
 board/ti/ks2_evm/board_k2e.c                                  | 1 +
 board/ti/ks2_evm/board_k2g.c                                  | 1 +
 board/ti/ks2_evm/board_k2hk.c                                 | 1 +
 board/ti/ks2_evm/board_k2l.c                                  | 1 +
 board/ti/ks2_evm/ddr3_k2e.c                                   | 1 +
 board/ti/ks2_evm/ddr3_k2g.c                                   | 1 +
 board/ti/ks2_evm/ddr3_k2hk.c                                  | 1 +
 board/ti/ks2_evm/ddr3_k2l.c                                   | 1 +
 board/ti/omap5_uevm/evm.c                                     | 1 +
 board/ti/panda/panda.c                                        | 1 +
 board/ti/sdp4430/sdp.c                                        | 1 +
 board/ti/ti816x/evm.c                                         | 1 +
 board/timll/devkit3250/devkit3250_spl.c                       | 1 +
 board/timll/devkit8000/devkit8000.c                           | 1 +
 board/toradex/apalis-imx8/apalis-imx8.c                       | 1 +
 board/toradex/apalis-tk1/apalis-tk1.c                         | 1 +
 board/toradex/apalis-tk1/as3722_init.c                        | 1 +
 board/toradex/apalis_imx6/apalis_imx6.c                       | 1 +
 board/toradex/apalis_imx6/pf0100.c                            | 1 +
 board/toradex/apalis_t30/apalis_t30.c                         | 1 +
 board/toradex/colibri-imx8x/colibri-imx8x.c                   | 1 +
 board/toradex/colibri_imx6/colibri_imx6.c                     | 1 +
 board/toradex/colibri_imx6/pf0100.c                           | 1 +
 board/toradex/colibri_imx7/colibri_imx7.c                     | 1 +
 board/toradex/colibri_t20/colibri_t20.c                       | 1 +
 board/toradex/colibri_vf/colibri_vf.c                         | 1 +
 board/toradex/common/tdx-cfg-block.c                          | 2 ++
 board/toradex/common/tdx-common.c                             | 1 +
 board/toradex/verdin-imx8mm/spl.c                             | 1 +
 board/tplink/wdr4300/wdr4300.c                                | 1 +
 board/tqc/tqm834x/pci.c                                       | 1 +
 board/tqc/tqm834x/tqm834x.c                                   | 1 +
 board/tqc/tqma6/tqma6.c                                       | 2 ++
 board/udoo/neo/neo.c                                          | 1 +
 board/udoo/udoo.c                                             | 1 +
 board/udoo/udoo_spl.c                                         | 1 +
 board/variscite/dart_6ul/spl.c                                | 1 +
 board/varisys/common/sys_eeprom.c                             | 2 ++
 board/varisys/cyrus/cyrus.c                                   | 1 +
 board/varisys/cyrus/ddr.c                                     | 1 +
 board/ve8313/ve8313.c                                         | 1 +
 board/vscom/baltos/board.c                                    | 1 +
 board/vscom/baltos/board.h                                    | 1 +
 board/wandboard/spl.c                                         | 1 +
 board/wandboard/wandboard.c                                   | 2 ++
 board/work-microwave/work_92105/work_92105_display.c          | 1 +
 board/work-microwave/work_92105/work_92105_spl.c              | 1 +
 board/xes/common/actl_nand.c                                  | 1 +
 board/xes/common/fsl_8xxx_clk.c                               | 1 +
 board/xes/common/fsl_8xxx_misc.c                              | 1 +
 board/xes/common/fsl_8xxx_misc.h                              | 1 +
 board/xes/common/fsl_8xxx_pci.c                               | 1 +
 board/xes/xpedite517x/ddr.c                                   | 1 +
 board/xes/xpedite520x/ddr.c                                   | 1 +
 board/xes/xpedite537x/ddr.c                                   | 1 +
 board/xes/xpedite550x/ddr.c                                   | 1 +
 board/xilinx/common/board.c                                   | 1 +
 board/xilinx/microblaze-generic/microblaze-generic.c          | 1 +
 board/xilinx/versal/board.c                                   | 1 +
 board/xilinx/zynq/bootimg.c                                   | 1 +
 board/xilinx/zynq/cmds.c                                      | 2 ++
 board/xilinx/zynqmp/cmds.c                                    | 1 +
 board/xilinx/zynqmp/pm_cfg_obj.h                              | 1 +
 board/xilinx/zynqmp/tap_delays.c                              | 1 +
 board/xilinx/zynqmp/zynqmp.c                                  | 2 ++
 board/zyxel/nsa310s/nsa310s.c                                 | 1 +
 cmd/abootimg.c                                                | 1 +
 cmd/acpi.c                                                    | 1 +
 cmd/adtimg.c                                                  | 1 +
 cmd/aes.c                                                     | 1 +
 cmd/armflash.c                                                | 1 +
 cmd/avb.c                                                     | 2 ++
 cmd/axi.c                                                     | 1 +
 cmd/bcb.c                                                     | 1 +
 cmd/bdinfo.c                                                  | 2 ++
 cmd/bedbug.c                                                  | 1 +
 cmd/binop.c                                                   | 1 +
 cmd/blk_common.c                                              | 1 +
 cmd/blob.c                                                    | 2 ++
 cmd/bmp.c                                                     | 2 ++
 cmd/boot.c                                                    | 1 +
 cmd/bootefi.c                                                 | 1 +
 cmd/booti.c                                                   | 1 +
 cmd/bootm.c                                                   | 1 +
 cmd/bootstage.c                                               | 1 +
 cmd/bootz.c                                                   | 2 ++
 cmd/cache.c                                                   | 1 +
 cmd/cbfs.c                                                    | 1 +
 cmd/clk.c                                                     | 2 ++
 cmd/cpu.c                                                     | 1 +
 cmd/cramfs.c                                                  | 1 +
 cmd/cros_ec.c                                                 | 1 +
 cmd/demo.c                                                    | 1 +
 cmd/disk.c                                                    | 1 +
 cmd/eeprom.c                                                  | 2 ++
 cmd/efi.c                                                     | 2 ++
 cmd/efidebug.c                                                | 1 +
 cmd/elf.c                                                     | 1 +
 cmd/fastboot.c                                                | 1 +
 cmd/fat.c                                                     | 1 +
 cmd/flash.c                                                   | 1 +
 cmd/fpga.c                                                    | 1 +
 cmd/fpgad.c                                                   | 1 +
 cmd/fuse.c                                                    | 1 +
 cmd/gpio.c                                                    | 2 ++
 cmd/gpt.c                                                     | 2 ++
 cmd/i2c.c                                                     | 2 ++
 cmd/ini.c                                                     | 1 +
 cmd/io.c                                                      | 1 +
 cmd/iotrace.c                                                 | 1 +
 cmd/itest.c                                                   | 1 +
 cmd/jffs2.c                                                   | 1 +
 cmd/legacy-mtd-utils.c                                        | 1 +
 cmd/legacy-mtd-utils.h                                        | 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                                                     | 2 ++
 cmd/mii.c                                                     | 2 ++
 cmd/misc.c                                                    | 1 +
 cmd/mmc.c                                                     | 2 ++
 cmd/mtd.c                                                     | 2 ++
 cmd/mtdparts.c                                                | 1 +
 cmd/mvebu/bubt.c                                              | 1 +
 cmd/nand.c                                                    | 1 +
 cmd/net.c                                                     | 1 +
 cmd/nvedit.c                                                  | 2 ++
 cmd/nvedit_efi.c                                              | 2 ++
 cmd/onenand.c                                                 | 1 +
 cmd/osd.c                                                     | 1 +
 cmd/pcap.c                                                    | 1 +
 cmd/pci.c                                                     | 2 ++
 cmd/pmic.c                                                    | 1 +
 cmd/pxe_utils.c                                               | 2 ++
 cmd/pxe_utils.h                                               | 1 +
 cmd/qfw.c                                                     | 1 +
 cmd/read.c                                                    | 1 +
 cmd/regulator.c                                               | 1 +
 cmd/reiser.c                                                  | 1 +
 cmd/remoteproc.c                                              | 1 +
 cmd/rng.c                                                     | 1 +
 cmd/rtc.c                                                     | 1 +
 cmd/setexpr.c                                                 | 1 +
 cmd/sf.c                                                      | 2 ++
 cmd/source.c                                                  | 1 +
 cmd/spi.c                                                     | 1 +
 cmd/ti/ddr3.c                                                 | 1 +
 cmd/time.c                                                    | 1 +
 cmd/tlv_eeprom.c                                              | 2 ++
 cmd/tpm-common.c                                              | 1 +
 cmd/tpm-user-utils.h                                          | 1 +
 cmd/tpm-v1.c                                                  | 1 +
 cmd/tpm-v2.c                                                  | 1 +
 cmd/tpm_test.c                                                | 1 +
 cmd/trace.c                                                   | 1 +
 cmd/tsi148.c                                                  | 1 +
 cmd/ubi.c                                                     | 2 ++
 cmd/ubifs.c                                                   | 1 +
 cmd/universe.c                                                | 1 +
 cmd/unlz4.c                                                   | 1 +
 cmd/usb.c                                                     | 1 +
 cmd/usb_mass_storage.c                                        | 1 +
 cmd/version.c                                                 | 1 +
 cmd/w1.c                                                      | 1 +
 cmd/wdt.c                                                     | 1 +
 cmd/wol.c                                                     | 1 +
 cmd/x86/fsp.c                                                 | 1 +
 cmd/x86/hob.c                                                 | 1 +
 cmd/x86/mtrr.c                                                | 1 +
 cmd/ximg.c                                                    | 1 +
 cmd/yaffs2.c                                                  | 1 +
 cmd/zfs.c                                                     | 1 +
 common/android_ab.c                                           | 2 ++
 common/autoboot.c                                             | 1 +
 common/avb_verify.c                                           | 2 ++
 common/bloblist.c                                             | 2 ++
 common/board_f.c                                              | 3 +++
 common/board_info.c                                           | 1 +
 common/board_r.c                                              | 2 ++
 common/bootm.c                                                | 3 +++
 common/bootm_os.c                                             | 3 +++
 common/bootretry.c                                            | 1 +
 common/bootstage.c                                            | 1 +
 common/bouncebuf.c                                            | 1 +
 common/cli.c                                                  | 1 +
 common/cli_hush.c                                             | 1 +
 common/cli_readline.c                                         | 1 +
 common/command.c                                              | 1 +
 common/common_fit.c                                           | 1 +
 common/console.c                                              | 1 +
 common/ddr_spd.c                                              | 1 +
 common/dlmalloc.c                                             | 1 +
 common/edid.c                                                 | 2 ++
 common/eeprom/eeprom_layout.c                                 | 1 +
 common/fdt_region.c                                           | 1 +
 common/fdt_support.c                                          | 1 +
 common/flash.c                                                | 1 +
 common/hash.c                                                 | 2 ++
 common/hwconfig.c                                             | 1 +
 common/image-android-dt.c                                     | 1 +
 common/image-android.c                                        | 2 ++
 common/image-cipher.c                                         | 1 +
 common/image-fdt.c                                            | 2 ++
 common/image-fit-sig.c                                        | 2 ++
 common/image-fit.c                                            | 1 +
 common/image-sig.c                                            | 1 +
 common/image.c                                                | 2 ++
 common/init/board_init.c                                      | 2 ++
 common/iotrace.c                                              | 1 +
 common/lcd.c                                                  | 1 +
 common/lcd_console.c                                          | 2 ++
 common/lcd_console_rotation.c                                 | 1 +
 common/lcd_simplefb.c                                         | 1 +
 common/log.c                                                  | 1 +
 common/log_syslog.c                                           | 1 +
 common/malloc_simple.c                                        | 1 +
 common/memsize.c                                              | 1 +
 common/s_record.c                                             | 1 +
 common/spl/spl.c                                              | 3 +++
 common/spl/spl_atf.c                                          | 2 ++
 common/spl/spl_bootrom.c                                      | 1 +
 common/spl/spl_ext.c                                          | 1 +
 common/spl/spl_fat.c                                          | 1 +
 common/spl/spl_fit.c                                          | 2 ++
 common/spl/spl_legacy.c                                       | 1 +
 common/spl/spl_mmc.c                                          | 2 ++
 common/spl/spl_nand.c                                         | 2 ++
 common/spl/spl_net.c                                          | 1 +
 common/spl/spl_nor.c                                          | 2 ++
 common/spl/spl_opensbi.c                                      | 1 +
 common/spl/spl_ram.c                                          | 1 +
 common/spl/spl_sata.c                                         | 1 +
 common/spl/spl_spi.c                                          | 2 ++
 common/spl/spl_ymodem.c                                       | 1 +
 common/splash.c                                               | 2 ++
 common/splash_source.c                                        | 2 ++
 common/stdio.c                                                | 1 +
 common/update.c                                               | 1 +
 common/usb.c                                                  | 2 ++
 common/usb_hub.c                                              | 3 +++
 common/usb_kbd.c                                              | 1 +
 common/usb_storage.c                                          | 1 +
 common/xyzModem.c                                             | 1 +
 disk/part.c                                                   | 1 +
 disk/part_amiga.c                                             | 1 +
 disk/part_amiga.h                                             | 1 +
 disk/part_dos.c                                               | 1 +
 disk/part_efi.c                                               | 1 +
 disk/part_iso.c                                               | 1 +
 disk/part_mac.c                                               | 1 +
 disk/part_mac.h                                               | 1 +
 drivers/adc/meson-saradc.c                                    | 2 ++
 drivers/adc/rockchip-saradc.c                                 | 1 +
 drivers/adc/stm32-adc-core.c                                  | 1 +
 drivers/adc/stm32-adc-core.h                                  | 1 +
 drivers/adc/stm32-adc.c                                       | 2 ++
 drivers/ata/ahci.c                                            | 2 ++
 drivers/ata/ahci_mvebu.c                                      | 2 ++
 drivers/ata/ahci_sunxi.c                                      | 1 +
 drivers/ata/dwc_ahci.c                                        | 1 +
 drivers/ata/dwc_ahsata.c                                      | 2 ++
 drivers/ata/fsl_sata.c                                        | 2 ++
 drivers/ata/fsl_sata.h                                        | 1 +
 drivers/ata/libata.c                                          | 1 +
 drivers/ata/mvsata_ide.c                                      | 1 +
 drivers/ata/sata.c                                            | 1 +
 drivers/ata/sata_ceva.c                                       | 1 +
 drivers/ata/sata_mv.c                                         | 1 +
 drivers/ata/sata_sandbox.c                                    | 1 +
 drivers/ata/sata_sil.c                                        | 1 +
 drivers/ata/sata_sil.h                                        | 1 +
 drivers/ata/sata_sil3114.c                                    | 1 +
 drivers/axi/axi-emul-uclass.c                                 | 1 +
 drivers/axi/axi-uclass.c                                      | 1 +
 drivers/axi/axi_sandbox.c                                     | 1 +
 drivers/axi/ihs_axi.c                                         | 1 +
 drivers/axi/sandbox_store.c                                   | 1 +
 drivers/bios_emulator/atibios.c                               | 1 +
 drivers/bios_emulator/besys.c                                 | 1 +
 drivers/bios_emulator/bios.c                                  | 1 +
 drivers/bios_emulator/biosemu.c                               | 1 +
 drivers/bios_emulator/include/biosemu.h                       | 1 +
 drivers/bios_emulator/include/x86emu/debug.h                  | 1 +
 drivers/bios_emulator/include/x86emu/decode.h                 | 1 +
 drivers/bios_emulator/include/x86emu/ops.h                    | 1 +
 drivers/bios_emulator/include/x86emu/prim_ops.h               | 1 +
 drivers/bios_emulator/include/x86emu/regs.h                   | 1 +
 drivers/bios_emulator/x86emu/debug.c                          | 1 +
 drivers/bios_emulator/x86emu/decode.c                         | 1 +
 drivers/bios_emulator/x86emu/ops.c                            | 1 +
 drivers/bios_emulator/x86emu/ops2.c                           | 1 +
 drivers/bios_emulator/x86emu/prim_ops.c                       | 1 +
 drivers/bios_emulator/x86emu/sys.c                            | 1 +
 drivers/block/blk-uclass.c                                    | 2 ++
 drivers/block/blk_legacy.c                                    | 2 ++
 drivers/block/ide.c                                           | 2 ++
 drivers/block/sandbox.c                                       | 1 +
 drivers/board/board-uclass.c                                  | 1 +
 drivers/board/sandbox.c                                       | 2 ++
 drivers/bootcount/bootcount-uclass.c                          | 1 +
 drivers/bootcount/bootcount.c                                 | 3 +++
 drivers/bootcount/bootcount_at91.c                            | 1 +
 drivers/bootcount/bootcount_davinci.c                         | 1 +
 drivers/bootcount/bootcount_env.c                             | 1 +
 drivers/bootcount/bootcount_ext.c                             | 1 +
 drivers/bootcount/bootcount_i2c.c                             | 1 +
 drivers/bootcount/bootcount_ram.c                             | 1 +
 drivers/bootcount/i2c-eeprom.c                                | 1 +
 drivers/bootcount/rtc.c                                       | 1 +
 drivers/bus/uniphier-system-bus.c                             | 1 +
 drivers/cache/cache-l2x0.c                                    | 1 +
 drivers/cache/cache-ncore.c                                   | 2 ++
 drivers/cache/cache-v5l2.c                                    | 2 ++
 drivers/clk/altera/clk-agilex.c                               | 2 ++
 drivers/clk/altera/clk-agilex.h                               | 1 +
 drivers/clk/altera/clk-arria10.c                              | 2 ++
 drivers/clk/analogbits/wrpll-cln28hpc.c                       | 1 +
 drivers/clk/aspeed/clk_ast2500.c                              | 2 ++
 drivers/clk/at91/clk-generated.c                              | 1 +
 drivers/clk/at91/clk-h32mx.c                                  | 1 +
 drivers/clk/at91/clk-main.c                                   | 1 +
 drivers/clk/at91/clk-master.c                                 | 1 +
 drivers/clk/at91/clk-peripheral.c                             | 1 +
 drivers/clk/at91/clk-plla.c                                   | 1 +
 drivers/clk/at91/clk-plladiv.c                                | 1 +
 drivers/clk/at91/clk-slow.c                                   | 1 +
 drivers/clk/at91/clk-system.c                                 | 1 +
 drivers/clk/at91/clk-usb.c                                    | 1 +
 drivers/clk/at91/clk-utmi.c                                   | 1 +
 drivers/clk/clk-cdce9xx.c                                     | 1 +
 drivers/clk/clk-composite.c                                   | 1 +
 drivers/clk/clk-divider.c                                     | 3 +++
 drivers/clk/clk-fixed-factor.c                                | 1 +
 drivers/clk/clk-gate.c                                        | 2 ++
 drivers/clk/clk-hsdk-cgu.c                                    | 3 +++
 drivers/clk/clk-mux.c                                         | 2 ++
 drivers/clk/clk-ti-sci.c                                      | 1 +
 drivers/clk/clk-uclass.c                                      | 2 ++
 drivers/clk/clk.c                                             | 1 +
 drivers/clk/clk_bcm6345.c                                     | 1 +
 drivers/clk/clk_boston.c                                      | 1 +
 drivers/clk/clk_fixed_factor.c                                | 1 +
 drivers/clk/clk_fixed_rate.c                                  | 1 +
 drivers/clk/clk_pic32.c                                       | 2 ++
 drivers/clk/clk_sandbox.c                                     | 1 +
 drivers/clk/clk_sandbox_ccf.c                                 | 3 +++
 drivers/clk/clk_sandbox_test.c                                | 1 +
 drivers/clk/clk_stm32f.c                                      | 2 ++
 drivers/clk/clk_stm32h7.c                                     | 1 +
 drivers/clk/clk_stm32mp1.c                                    | 3 +++
 drivers/clk/clk_versal.c                                      | 1 +
 drivers/clk/clk_vexpress_osc.c                                | 1 +
 drivers/clk/clk_zynq.c                                        | 2 ++
 drivers/clk/clk_zynqmp.c                                      | 2 ++
 drivers/clk/exynos/clk-exynos7420.c                           | 1 +
 drivers/clk/exynos/clk-pll.c                                  | 1 +
 drivers/clk/ics8n3qv01.c                                      | 1 +
 drivers/clk/imx/clk-composite-8m.c                            | 2 ++
 drivers/clk/imx/clk-gate2.c                                   | 2 ++
 drivers/clk/imx/clk-imx6q.c                                   | 2 ++
 drivers/clk/imx/clk-imx8.c                                    | 2 ++
 drivers/clk/imx/clk-imx8.h                                    | 1 +
 drivers/clk/imx/clk-imx8mm.c                                  | 3 +++
 drivers/clk/imx/clk-imx8mn.c                                  | 3 +++
 drivers/clk/imx/clk-imx8mp.c                                  | 3 +++
 drivers/clk/imx/clk-imx8qm.c                                  | 2 ++
 drivers/clk/imx/clk-imx8qxp.c                                 | 2 ++
 drivers/clk/imx/clk-imxrt1020.c                               | 2 ++
 drivers/clk/imx/clk-imxrt1050.c                               | 2 ++
 drivers/clk/imx/clk-pfd.c                                     | 2 ++
 drivers/clk/imx/clk-pll14xx.c                                 | 3 +++
 drivers/clk/imx/clk-pllv3.c                                   | 3 +++
 drivers/clk/imx/clk.h                                         | 2 ++
 drivers/clk/intel/clk_intel.c                                 | 1 +
 drivers/clk/kendryte/bypass.c                                 | 1 +
 drivers/clk/kendryte/clk.c                                    | 2 ++
 drivers/clk/kendryte/pll.c                                    | 3 +++
 drivers/clk/mediatek/clk-mt7622.c                             | 1 +
 drivers/clk/mediatek/clk-mt7623.c                             | 1 +
 drivers/clk/mediatek/clk-mt7629.c                             | 1 +
 drivers/clk/mediatek/clk-mtk.c                                | 2 ++
 drivers/clk/mediatek/clk-mtk.h                                | 2 ++
 drivers/clk/meson/axg.c                                       | 2 ++
 drivers/clk/meson/clk_meson.h                                 | 1 +
 drivers/clk/meson/g12a.c                                      | 2 ++
 drivers/clk/meson/gxbb.c                                      | 2 ++
 drivers/clk/mpc83xx_clk.c                                     | 2 ++
 drivers/clk/mpc83xx_clk.h                                     | 1 +
 drivers/clk/mtmips/clk-mt7628.c                               | 2 ++
 drivers/clk/mvebu/armada-37xx-periph.c                        | 3 +++
 drivers/clk/mvebu/armada-37xx-tbg.c                           | 2 ++
 drivers/clk/owl/clk_owl.c                                     | 1 +
 drivers/clk/owl/clk_owl.h                                     | 1 +
 drivers/clk/renesas/clk-rcar-gen2.c                           | 1 +
 drivers/clk/renesas/clk-rcar-gen3.c                           | 1 +
 drivers/clk/renesas/r8a774a1-cpg-mssr.c                       | 1 +
 drivers/clk/renesas/r8a7790-cpg-mssr.c                        | 1 +
 drivers/clk/renesas/r8a7791-cpg-mssr.c                        | 1 +
 drivers/clk/renesas/r8a7792-cpg-mssr.c                        | 1 +
 drivers/clk/renesas/r8a7794-cpg-mssr.c                        | 1 +
 drivers/clk/renesas/r8a7795-cpg-mssr.c                        | 1 +
 drivers/clk/renesas/r8a7796-cpg-mssr.c                        | 1 +
 drivers/clk/renesas/r8a77965-cpg-mssr.c                       | 1 +
 drivers/clk/renesas/r8a77970-cpg-mssr.c                       | 1 +
 drivers/clk/renesas/r8a77980-cpg-mssr.c                       | 1 +
 drivers/clk/renesas/r8a77990-cpg-mssr.c                       | 1 +
 drivers/clk/renesas/r8a77995-cpg-mssr.c                       | 1 +
 drivers/clk/renesas/rcar-gen2-cpg.h                           | 1 +
 drivers/clk/renesas/rcar-gen3-cpg.h                           | 2 ++
 drivers/clk/renesas/renesas-cpg-mssr.c                        | 2 ++
 drivers/clk/renesas/renesas-cpg-mssr.h                        | 2 ++
 drivers/clk/rockchip/clk_pll.c                                | 2 ++
 drivers/clk/rockchip/clk_px30.c                               | 1 +
 drivers/clk/rockchip/clk_rk3036.c                             | 1 +
 drivers/clk/rockchip/clk_rk3128.c                             | 1 +
 drivers/clk/rockchip/clk_rk3188.c                             | 2 ++
 drivers/clk/rockchip/clk_rk322x.c                             | 1 +
 drivers/clk/rockchip/clk_rk3288.c                             | 2 ++
 drivers/clk/rockchip/clk_rk3308.c                             | 1 +
 drivers/clk/rockchip/clk_rk3328.c                             | 1 +
 drivers/clk/rockchip/clk_rk3368.c                             | 1 +
 drivers/clk/rockchip/clk_rk3399.c                             | 1 +
 drivers/clk/rockchip/clk_rv1108.c                             | 1 +
 drivers/clk/sifive/fu540-prci.c                               | 2 ++
 drivers/clk/sunxi/clk_a10.c                                   | 1 +
 drivers/clk/sunxi/clk_a10s.c                                  | 1 +
 drivers/clk/sunxi/clk_a23.c                                   | 1 +
 drivers/clk/sunxi/clk_a31.c                                   | 1 +
 drivers/clk/sunxi/clk_a64.c                                   | 1 +
 drivers/clk/sunxi/clk_a80.c                                   | 1 +
 drivers/clk/sunxi/clk_a83t.c                                  | 1 +
 drivers/clk/sunxi/clk_h3.c                                    | 1 +
 drivers/clk/sunxi/clk_h6.c                                    | 1 +
 drivers/clk/sunxi/clk_r40.c                                   | 1 +
 drivers/clk/sunxi/clk_sunxi.c                                 | 2 ++
 drivers/clk/sunxi/clk_v3s.c                                   | 1 +
 drivers/clk/tegra/tegra-car-clk.c                             | 1 +
 drivers/clk/tegra/tegra186-clk.c                              | 1 +
 drivers/clk/uniphier/clk-uniphier-core.c                      | 2 ++
 drivers/core/acpi.c                                           | 1 +
 drivers/core/device-remove.c                                  | 1 +
 drivers/core/device.c                                         | 2 ++
 drivers/core/devres.c                                         | 2 ++
 drivers/core/dump.c                                           | 1 +
 drivers/core/fdtaddr.c                                        | 1 +
 drivers/core/of_access.c                                      | 2 ++
 drivers/core/of_addr.c                                        | 1 +
 drivers/core/of_extra.c                                       | 1 +
 drivers/core/ofnode.c                                         | 2 ++
 drivers/core/read.c                                           | 1 +
 drivers/core/regmap.c                                         | 1 +
 drivers/core/root.c                                           | 3 +++
 drivers/core/simple-bus.c                                     | 1 +
 drivers/core/syscon-uclass.c                                  | 1 +
 drivers/core/uclass.c                                         | 1 +
 drivers/cpu/bmips_cpu.c                                       | 2 ++
 drivers/cpu/imx8_cpu.c                                        | 1 +
 drivers/cpu/mpc83xx_cpu.c                                     | 1 +
 drivers/cpu/riscv_cpu.c                                       | 1 +
 drivers/crypto/ace_sha.h                                      | 1 +
 drivers/crypto/fsl/desc.h                                     | 2 ++
 drivers/crypto/fsl/desc_constr.h                              | 1 +
 drivers/crypto/fsl/error.c                                    | 1 +
 drivers/crypto/fsl/fsl_blob.c                                 | 1 +
 drivers/crypto/fsl/fsl_hash.c                                 | 1 +
 drivers/crypto/fsl/fsl_hash.h                                 | 1 +
 drivers/crypto/fsl/fsl_rsa.c                                  | 1 +
 drivers/crypto/fsl/jobdesc.c                                  | 1 +
 drivers/crypto/fsl/jobdesc.h                                  | 1 +
 drivers/crypto/fsl/jr.c                                       | 2 ++
 drivers/crypto/fsl/jr.h                                       | 2 ++
 drivers/crypto/fsl/rng.c                                      | 1 +
 drivers/crypto/fsl/rsa_caam.h                                 | 1 +
 drivers/crypto/fsl/sec.c                                      | 2 ++
 drivers/crypto/rsa_mod_exp/mod_exp_sw.c                       | 1 +
 drivers/crypto/rsa_mod_exp/mod_exp_uclass.c                   | 1 +
 drivers/ddr/altera/sdram_agilex.c                             | 1 +
 drivers/ddr/altera/sdram_arria10.c                            | 1 +
 drivers/ddr/altera/sdram_gen5.c                               | 1 +
 drivers/ddr/altera/sdram_s10.c                                | 1 +
 drivers/ddr/altera/sdram_soc64.c                              | 2 ++
 drivers/ddr/altera/sdram_soc64.h                              | 2 ++
 drivers/ddr/altera/sequencer.c                                | 2 ++
 drivers/ddr/altera/sequencer.h                                | 1 +
 drivers/ddr/fsl/arm_ddr_gen3.c                                | 2 ++
 drivers/ddr/fsl/ctrl_regs.c                                   | 3 +++
 drivers/ddr/fsl/ddr3_dimm_params.c                            | 1 +
 drivers/ddr/fsl/ddr4_dimm_params.c                            | 1 +
 drivers/ddr/fsl/fsl_ddr_gen4.c                                | 2 ++
 drivers/ddr/fsl/fsl_mmdc.c                                    | 1 +
 drivers/ddr/fsl/interactive.c                                 | 1 +
 drivers/ddr/fsl/main.c                                        | 3 +++
 drivers/ddr/fsl/mpc85xx_ddr_gen1.c                            | 1 +
 drivers/ddr/fsl/mpc85xx_ddr_gen2.c                            | 2 ++
 drivers/ddr/fsl/mpc85xx_ddr_gen3.c                            | 2 ++
 drivers/ddr/fsl/mpc86xx_ddr.c                                 | 1 +
 drivers/ddr/fsl/options.c                                     | 2 ++
 drivers/ddr/fsl/util.c                                        | 2 ++
 drivers/ddr/imx/imx8m/ddr_init.c                              | 1 +
 drivers/ddr/imx/imx8m/ddrphy_csr.c                            | 1 +
 drivers/ddr/imx/imx8m/ddrphy_utils.c                          | 1 +
 drivers/ddr/imx/imx8m/helper.c                                | 1 +
 drivers/ddr/marvell/a38x/ddr3_logging_def.h                   | 1 +
 drivers/ddr/marvell/a38x/ddr3_patterns_64bit.h                | 1 +
 drivers/ddr/marvell/a38x/ddr3_training_hw_algo.h              | 1 +
 drivers/ddr/marvell/a38x/ddr3_training_ip_centralization.h    | 1 +
 drivers/ddr/marvell/a38x/ddr3_training_ip_db.h                | 1 +
 drivers/ddr/marvell/a38x/ddr3_training_ip_pbs.h               | 1 +
 drivers/ddr/marvell/a38x/ddr3_training_leveling.h             | 1 +
 drivers/ddr/marvell/a38x/ddr_ml_wrapper.h                     | 1 +
 drivers/ddr/marvell/a38x/mv_ddr_common.h                      | 1 +
 drivers/ddr/marvell/a38x/seq_exec.h                           | 1 +
 drivers/ddr/marvell/a38x/xor.h                                | 1 +
 drivers/ddr/marvell/axp/ddr3_dfs.c                            | 1 +
 drivers/ddr/marvell/axp/ddr3_dqs.c                            | 1 +
 drivers/ddr/marvell/axp/ddr3_hw_training.c                    | 1 +
 drivers/ddr/marvell/axp/ddr3_init.c                           | 2 ++
 drivers/ddr/marvell/axp/ddr3_patterns_64bit.h                 | 1 +
 drivers/ddr/marvell/axp/ddr3_pbs.c                            | 1 +
 drivers/ddr/marvell/axp/ddr3_read_leveling.c                  | 1 +
 drivers/ddr/marvell/axp/ddr3_sdram.c                          | 1 +
 drivers/ddr/marvell/axp/ddr3_spd.c                            | 1 +
 drivers/ddr/marvell/axp/ddr3_write_leveling.c                 | 1 +
 drivers/ddr/marvell/axp/xor.c                                 | 1 +
 drivers/ddr/microchip/ddr2.c                                  | 2 ++
 drivers/ddr/microchip/ddr2_regs.h                             | 1 +
 drivers/demo/demo-shape.c                                     | 1 +
 drivers/demo/demo-simple.c                                    | 1 +
 drivers/dfu/dfu.c                                             | 3 +++
 drivers/dfu/dfu_mmc.c                                         | 1 +
 drivers/dfu/dfu_mtd.c                                         | 2 ++
 drivers/dfu/dfu_nand.c                                        | 1 +
 drivers/dfu/dfu_ram.c                                         | 1 +
 drivers/dfu/dfu_sf.c                                          | 1 +
 drivers/dfu/dfu_tftp.c                                        | 1 +
 drivers/dfu/dfu_virt.c                                        | 2 ++
 drivers/dma/MCD_dmaApi.c                                      | 1 +
 drivers/dma/MCD_tasks.c                                       | 1 +
 drivers/dma/MCD_tasksInit.c                                   | 1 +
 drivers/dma/apbh_dma.c                                        | 1 +
 drivers/dma/bcm6348-iudma.c                                   | 2 ++
 drivers/dma/dma-uclass.c                                      | 1 +
 drivers/dma/fsl_dma.c                                         | 1 +
 drivers/dma/keystone_nav.c                                    | 1 +
 drivers/dma/keystone_nav_cfg.c                                | 1 +
 drivers/dma/lpc32xx_dma.c                                     | 1 +
 drivers/dma/sandbox-dma-test.c                                | 1 +
 drivers/dma/ti-edma3.c                                        | 1 +
 drivers/dma/ti/k3-psil.c                                      | 1 +
 drivers/dma/ti/k3-udma.c                                      | 3 +++
 drivers/fastboot/fb_command.c                                 | 1 +
 drivers/fastboot/fb_common.c                                  | 2 ++
 drivers/fastboot/fb_getvar.c                                  | 1 +
 drivers/fastboot/fb_mmc.c                                     | 1 +
 drivers/fastboot/fb_nand.c                                    | 2 ++
 drivers/firmware/firmware-zynqmp.c                            | 1 +
 drivers/firmware/ti_sci.c                                     | 2 ++
 drivers/firmware/ti_sci.h                                     | 2 ++
 drivers/fpga/ACEX1K.c                                         | 1 +
 drivers/fpga/altera.c                                         | 1 +
 drivers/fpga/cyclon2.c                                        | 1 +
 drivers/fpga/fpga.c                                           | 2 ++
 drivers/fpga/lattice.c                                        | 1 +
 drivers/fpga/socfpga.c                                        | 1 +
 drivers/fpga/socfpga_arria10.c                                | 1 +
 drivers/fpga/socfpga_gen5.c                                   | 1 +
 drivers/fpga/spartan2.c                                       | 1 +
 drivers/fpga/spartan3.c                                       | 1 +
 drivers/fpga/stratix10.c                                      | 1 +
 drivers/fpga/stratixII.c                                      | 1 +
 drivers/fpga/stratixv.c                                       | 1 +
 drivers/fpga/versalpl.c                                       | 1 +
 drivers/fpga/virtex2.c                                        | 1 +
 drivers/fpga/xilinx.c                                         | 1 +
 drivers/fpga/zynqmppl.c                                       | 2 ++
 drivers/fpga/zynqpl.c                                         | 1 +
 drivers/gpio/74x164_gpio.c                                    | 1 +
 drivers/gpio/adi_gpio2.c                                      | 1 +
 drivers/gpio/altera_pio.c                                     | 1 +
 drivers/gpio/at91_gpio.c                                      | 1 +
 drivers/gpio/atmel_pio4.c                                     | 1 +
 drivers/gpio/axp_gpio.c                                       | 1 +
 drivers/gpio/bcm2835_gpio.c                                   | 1 +
 drivers/gpio/bcm6345_gpio.c                                   | 1 +
 drivers/gpio/cortina_gpio.c                                   | 1 +
 drivers/gpio/da8xx_gpio.h                                     | 1 +
 drivers/gpio/db8500_gpio.c                                    | 2 ++
 drivers/gpio/dwapb_gpio.c                                     | 1 +
 drivers/gpio/gpio-rcar.c                                      | 2 ++
 drivers/gpio/gpio-rza1.c                                      | 1 +
 drivers/gpio/gpio-uclass.c                                    | 2 ++
 drivers/gpio/gpio-uniphier.c                                  | 2 ++
 drivers/gpio/hi6220_gpio.c                                    | 1 +
 drivers/gpio/hsdk-creg-gpio.c                                 | 1 +
 drivers/gpio/imx_rgpio2p.c                                    | 1 +
 drivers/gpio/intel_broadwell_gpio.c                           | 1 +
 drivers/gpio/intel_gpio.c                                     | 1 +
 drivers/gpio/intel_ich6_gpio.c                                | 1 +
 drivers/gpio/iproc_gpio.c                                     | 2 ++
 drivers/gpio/kona_gpio.c                                      | 1 +
 drivers/gpio/kw_gpio.c                                        | 1 +
 drivers/gpio/mpc83xx_spisel_boot.c                            | 2 ++
 drivers/gpio/mpc8xxx_gpio.c                                   | 2 ++
 drivers/gpio/mscc_sgpio.c                                     | 2 ++
 drivers/gpio/msm_gpio.c                                       | 1 +
 drivers/gpio/mt7621_gpio.c                                    | 2 ++
 drivers/gpio/mvebu_gpio.c                                     | 1 +
 drivers/gpio/mvgpio.c                                         | 1 +
 drivers/gpio/mvgpio.h                                         | 1 +
 drivers/gpio/mvmfp.c                                          | 1 +
 drivers/gpio/mxc_gpio.c                                       | 1 +
 drivers/gpio/mxs_gpio.c                                       | 1 +
 drivers/gpio/nx_gpio.c                                        | 1 +
 drivers/gpio/omap_gpio.c                                      | 1 +
 drivers/gpio/pca953x.c                                        | 1 +
 drivers/gpio/pca953x_gpio.c                                   | 1 +
 drivers/gpio/pca9698.c                                        | 1 +
 drivers/gpio/pcf8575_gpio.c                                   | 1 +
 drivers/gpio/pm8916_gpio.c                                    | 1 +
 drivers/gpio/rk_gpio.c                                        | 1 +
 drivers/gpio/s5p_gpio.c                                       | 1 +
 drivers/gpio/sandbox.c                                        | 1 +
 drivers/gpio/sh_pfc.c                                         | 1 +
 drivers/gpio/sifive-gpio.c                                    | 2 ++
 drivers/gpio/spear_gpio.c                                     | 1 +
 drivers/gpio/stm32_gpio.c                                     | 1 +
 drivers/gpio/sunxi_gpio.c                                     | 1 +
 drivers/gpio/tca642x.c                                        | 1 +
 drivers/gpio/tegra186_gpio.c                                  | 2 ++
 drivers/gpio/tegra_gpio.c                                     | 1 +
 drivers/gpio/vybrid_gpio.c                                    | 1 +
 drivers/gpio/xilinx_gpio.c                                    | 1 +
 drivers/gpio/zynq_gpio.c                                      | 1 +
 drivers/hwspinlock/hwspinlock-uclass.c                        | 1 +
 drivers/hwspinlock/stm32_hwspinlock.c                         | 1 +
 drivers/i2c/ast_i2c.c                                         | 2 ++
 drivers/i2c/ast_i2c.h                                         | 1 +
 drivers/i2c/at91_i2c.c                                        | 2 ++
 drivers/i2c/at91_i2c.h                                        | 1 +
 drivers/i2c/cros_ec_ldo.c                                     | 1 +
 drivers/i2c/davinci_i2c.c                                     | 1 +
 drivers/i2c/davinci_i2c.h                                     | 1 +
 drivers/i2c/designware_i2c.c                                  | 2 ++
 drivers/i2c/designware_i2c.h                                  | 1 +
 drivers/i2c/designware_i2c_pci.c                              | 2 ++
 drivers/i2c/exynos_hs_i2c.c                                   | 1 +
 drivers/i2c/fsl_i2c.c                                         | 1 +
 drivers/i2c/i2c-cdns.c                                        | 2 ++
 drivers/i2c/i2c-cortina.c                                     | 1 +
 drivers/i2c/i2c-cortina.h                                     | 1 +
 drivers/i2c/i2c-gpio.c                                        | 2 ++
 drivers/i2c/i2c-uclass.c                                      | 1 +
 drivers/i2c/i2c-uniphier-f.c                                  | 1 +
 drivers/i2c/i2c-uniphier.c                                    | 1 +
 drivers/i2c/i2c-versatile.c                                   | 1 +
 drivers/i2c/i2c_core.c                                        | 2 ++
 drivers/i2c/ihs_i2c.c                                         | 2 ++
 drivers/i2c/imx_lpi2c.c                                       | 2 ++
 drivers/i2c/intel_i2c.c                                       | 1 +
 drivers/i2c/iproc_i2c.c                                       | 2 ++
 drivers/i2c/kona_i2c.c                                        | 1 +
 drivers/i2c/lpc32xx_i2c.c                                     | 1 +
 drivers/i2c/meson_i2c.c                                       | 2 ++
 drivers/i2c/muxes/i2c-arb-gpio-challenge.c                    | 1 +
 drivers/i2c/muxes/i2c-mux-gpio.c                              | 1 +
 drivers/i2c/muxes/i2c-mux-uclass.c                            | 1 +
 drivers/i2c/muxes/pca954x.c                                   | 1 +
 drivers/i2c/mv_i2c.c                                          | 2 ++
 drivers/i2c/mvtwsi.c                                          | 1 +
 drivers/i2c/mxc_i2c.c                                         | 2 ++
 drivers/i2c/nx_i2c.c                                          | 1 +
 drivers/i2c/octeon_i2c.c                                      | 2 ++
 drivers/i2c/omap24xx_i2c.c                                    | 2 ++
 drivers/i2c/rcar_i2c.c                                        | 2 ++
 drivers/i2c/rcar_iic.c                                        | 2 ++
 drivers/i2c/rk_i2c.c                                          | 2 ++
 drivers/i2c/s3c24x0_i2c.c                                     | 1 +
 drivers/i2c/s3c24x0_i2c.h                                     | 1 +
 drivers/i2c/sh_i2c.c                                          | 1 +
 drivers/i2c/soft_i2c.c                                        | 1 +
 drivers/i2c/stm32f7_i2c.c                                     | 2 ++
 drivers/i2c/tegra186_bpmp_i2c.c                               | 1 +
 drivers/i2c/tegra_i2c.c                                       | 2 ++
 drivers/i2c/xilinx_xiic.c                                     | 2 ++
 drivers/input/input.c                                         | 2 ++
 drivers/input/key_matrix.c                                    | 1 +
 drivers/input/tegra-kbc.c                                     | 1 +
 drivers/input/twl4030.c                                       | 1 +
 drivers/input/twl6030.c                                       | 1 +
 drivers/led/led_bcm6328.c                                     | 2 ++
 drivers/led/led_bcm6358.c                                     | 2 ++
 drivers/led/led_bcm6858.c                                     | 2 ++
 drivers/mailbox/k3-sec-proxy.c                                | 1 +
 drivers/mailbox/mailbox-uclass.c                              | 1 +
 drivers/mailbox/sandbox-mbox-test.c                           | 1 +
 drivers/mailbox/sandbox-mbox.c                                | 1 +
 drivers/mailbox/stm32-ipcc.c                                  | 2 ++
 drivers/mailbox/tegra-hsp.c                                   | 1 +
 drivers/mailbox/zynqmp-ipi.c                                  | 2 ++
 drivers/misc/ali512x.c                                        | 1 +
 drivers/misc/altera_sysid.c                                   | 1 +
 drivers/misc/atsha204a-i2c.c                                  | 1 +
 drivers/misc/cbmem_console.c                                  | 2 ++
 drivers/misc/cros_ec.c                                        | 2 ++
 drivers/misc/cros_ec_i2c.c                                    | 2 ++
 drivers/misc/cros_ec_lpc.c                                    | 1 +
 drivers/misc/cros_ec_sandbox.c                                | 2 ++
 drivers/misc/cros_ec_spi.c                                    | 1 +
 drivers/misc/ds4510.c                                         | 1 +
 drivers/misc/fs_loader.c                                      | 1 +
 drivers/misc/fsl_devdis.c                                     | 2 ++
 drivers/misc/fsl_ifc.c                                        | 1 +
 drivers/misc/fsl_iim.c                                        | 1 +
 drivers/misc/fsl_portals.c                                    | 2 ++
 drivers/misc/fsl_sec_mon.c                                    | 1 +
 drivers/misc/gdsys_ioep.c                                     | 1 +
 drivers/misc/gdsys_ioep.h                                     | 2 ++
 drivers/misc/gdsys_rxaui_ctrl.c                               | 1 +
 drivers/misc/i2c_eeprom.c                                     | 1 +
 drivers/misc/i2c_eeprom_emul.c                                | 1 +
 drivers/misc/ihs_fpga.c                                       | 1 +
 drivers/misc/ihs_fpga.h                                       | 1 +
 drivers/misc/imx8/fuse.c                                      | 1 +
 drivers/misc/imx8/scu.c                                       | 1 +
 drivers/misc/imx8/scu_api.c                                   | 1 +
 drivers/misc/irq-uclass.c                                     | 1 +
 drivers/misc/irq_sandbox.c                                    | 1 +
 drivers/misc/jz4780_efuse.c                                   | 2 ++
 drivers/misc/k3_avs.c                                         | 1 +
 drivers/misc/k3_esm.c                                         | 2 ++
 drivers/misc/microchip_flexcom.c                              | 1 +
 drivers/misc/misc_sandbox.c                                   | 1 +
 drivers/misc/mpc83xx_serdes.c                                 | 1 +
 drivers/misc/mpc83xx_serdes.h                                 | 1 +
 drivers/misc/mxc_ocotp.c                                      | 1 +
 drivers/misc/mxs_ocotp.c                                      | 1 +
 drivers/misc/p2sb-uclass.c                                    | 2 ++
 drivers/misc/p2sb_emul.c                                      | 1 +
 drivers/misc/p2sb_sandbox.c                                   | 1 +
 drivers/misc/pca9551_led.c                                    | 1 +
 drivers/misc/qfw.c                                            | 2 ++
 drivers/misc/rockchip-efuse.c                                 | 2 ++
 drivers/misc/rockchip-otp.c                                   | 2 ++
 drivers/misc/sandbox_adder.c                                  | 1 +
 drivers/misc/sifive-otp.c                                     | 2 ++
 drivers/misc/smsc_lpc47m.c                                    | 1 +
 drivers/misc/smsc_sio1007.c                                   | 1 +
 drivers/misc/spltest_sandbox.c                                | 1 +
 drivers/misc/status_led.c                                     | 1 +
 drivers/misc/stm32_rcc.c                                      | 1 +
 drivers/misc/stm32mp_fuse.c                                   | 1 +
 drivers/misc/swap_case.c                                      | 1 +
 drivers/misc/tegra186_bpmp.c                                  | 1 +
 drivers/misc/vexpress_config.c                                | 1 +
 drivers/misc/winbond_w83627.c                                 | 1 +
 drivers/mmc/am654_sdhci.c                                     | 2 ++
 drivers/mmc/arm_pl180_mmci.h                                  | 1 +
 drivers/mmc/aspeed_sdhci.c                                    | 1 +
 drivers/mmc/atmel_sdhci.c                                     | 1 +
 drivers/mmc/bcm2835_sdhci.c                                   | 1 +
 drivers/mmc/bcm2835_sdhost.c                                  | 3 +++
 drivers/mmc/ca_dw_mmc.c                                       | 2 ++
 drivers/mmc/davinci_mmc.c                                     | 1 +
 drivers/mmc/dw_mmc.c                                          | 1 +
 drivers/mmc/exynos_dw_mmc.c                                   | 1 +
 drivers/mmc/fsl_esdhc.c                                       | 3 +++
 drivers/mmc/fsl_esdhc_imx.c                                   | 2 ++
 drivers/mmc/fsl_esdhc_spl.c                                   | 1 +
 drivers/mmc/ftsdc010_mci.c                                    | 3 +++
 drivers/mmc/ftsdc010_mci.h                                    | 2 ++
 drivers/mmc/gen_atmel_mci.c                                   | 1 +
 drivers/mmc/hi6220_dw_mmc.c                                   | 1 +
 drivers/mmc/iproc_sdhci.c                                     | 1 +
 drivers/mmc/jz_mmc.c                                          | 2 ++
 drivers/mmc/kona_sdhci.c                                      | 1 +
 drivers/mmc/meson_gx_mmc.c                                    | 2 ++
 drivers/mmc/mmc-uclass.c                                      | 2 ++
 drivers/mmc/mmc.c                                             | 3 +++
 drivers/mmc/mmc_boot.c                                        | 1 +
 drivers/mmc/mmc_private.h                                     | 1 +
 drivers/mmc/mmc_spi.c                                         | 1 +
 drivers/mmc/mmc_write.c                                       | 1 +
 drivers/mmc/msm_sdhci.c                                       | 1 +
 drivers/mmc/mtk-sd.c                                          | 2 ++
 drivers/mmc/mv_sdhci.c                                        | 2 ++
 drivers/mmc/mvebu_mmc.c                                       | 1 +
 drivers/mmc/mxcmmc.c                                          | 1 +
 drivers/mmc/mxsmmc.c                                          | 1 +
 drivers/mmc/nexell_dw_mmc.c                                   | 1 +
 drivers/mmc/omap_hsmmc.c                                      | 3 +++
 drivers/mmc/pic32_sdhci.c                                     | 1 +
 drivers/mmc/pxa_mmc_gen.c                                     | 1 +
 drivers/mmc/renesas-sdhi.c                                    | 2 ++
 drivers/mmc/rockchip_dw_mmc.c                                 | 2 ++
 drivers/mmc/s5p_sdhci.c                                       | 1 +
 drivers/mmc/sandbox_mmc.c                                     | 1 +
 drivers/mmc/sdhci-cadence.c                                   | 2 ++
 drivers/mmc/sdhci.c                                           | 2 ++
 drivers/mmc/sh_mmcif.c                                        | 1 +
 drivers/mmc/sh_mmcif.h                                        | 1 +
 drivers/mmc/sh_sdhi.c                                         | 2 ++
 drivers/mmc/snps_dw_mmc.c                                     | 1 +
 drivers/mmc/socfpga_dw_mmc.c                                  | 1 +
 drivers/mmc/stm32_sdmmc2.c                                    | 2 ++
 drivers/mmc/sunxi_mmc.c                                       | 1 +
 drivers/mmc/tangier_sdhci.c                                   | 1 +
 drivers/mmc/tegra_mmc.c                                       | 1 +
 drivers/mmc/tmio-common.c                                     | 2 ++
 drivers/mmc/tmio-common.h                                     | 2 ++
 drivers/mmc/uniphier-sd.c                                     | 1 +
 drivers/mmc/xenon_sdhci.c                                     | 1 +
 drivers/mmc/zynq_sdhci.c                                      | 1 +
 drivers/mtd/altera_qspi.c                                     | 1 +
 drivers/mtd/cfi_flash.c                                       | 2 ++
 drivers/mtd/cfi_mtd.c                                         | 1 +
 drivers/mtd/hbmc-am654.c                                      | 2 ++
 drivers/mtd/jedec_flash.c                                     | 1 +
 drivers/mtd/mtd_uboot.c                                       | 1 +
 drivers/mtd/mtdcore.c                                         | 2 ++
 drivers/mtd/mtdpart.c                                         | 1 +
 drivers/mtd/mw_eeprom.c                                       | 1 +
 drivers/mtd/nand/raw/am335x_spl_bch.c                         | 2 ++
 drivers/mtd/nand/raw/arasan_nfc.c                             | 3 +++
 drivers/mtd/nand/raw/atmel_nand.c                             | 2 ++
 drivers/mtd/nand/raw/atmel_nand_ecc.h                         | 1 +
 drivers/mtd/nand/raw/brcmnand/bcm63158_nand.c                 | 3 +++
 drivers/mtd/nand/raw/brcmnand/bcm6368_nand.c                  | 3 +++
 drivers/mtd/nand/raw/brcmnand/bcm68360_nand.c                 | 3 +++
 drivers/mtd/nand/raw/brcmnand/bcm6838_nand.c                  | 3 +++
 drivers/mtd/nand/raw/brcmnand/bcm6858_nand.c                  | 3 +++
 drivers/mtd/nand/raw/brcmnand/brcmnand.c                      | 3 +++
 drivers/mtd/nand/raw/brcmnand/brcmnand.h                      | 1 +
 drivers/mtd/nand/raw/brcmnand/brcmnand_compat.c               | 1 +
 drivers/mtd/nand/raw/brcmnand/brcmnand_compat.h               | 1 +
 drivers/mtd/nand/raw/davinci_nand.c                           | 2 ++
 drivers/mtd/nand/raw/denali.c                                 | 1 +
 drivers/mtd/nand/raw/denali.h                                 | 1 +
 drivers/mtd/nand/raw/denali_spl.c                             | 2 ++
 drivers/mtd/nand/raw/fsl_elbc_nand.c                          | 2 ++
 drivers/mtd/nand/raw/fsl_elbc_spl.c                           | 1 +
 drivers/mtd/nand/raw/fsl_ifc_nand.c                           | 2 ++
 drivers/mtd/nand/raw/fsl_ifc_spl.c                            | 1 +
 drivers/mtd/nand/raw/fsl_upm.c                                | 2 ++
 drivers/mtd/nand/raw/fsmc_nand.c                              | 2 ++
 drivers/mtd/nand/raw/kb9202_nand.c                            | 1 +
 drivers/mtd/nand/raw/kirkwood_nand.c                          | 1 +
 drivers/mtd/nand/raw/kmeter1_nand.c                           | 1 +
 drivers/mtd/nand/raw/lpc32xx_nand_mlc.c                       | 2 ++
 drivers/mtd/nand/raw/lpc32xx_nand_slc.c                       | 2 ++
 drivers/mtd/nand/raw/mxc_nand.c                               | 2 ++
 drivers/mtd/nand/raw/mxc_nand.h                               | 1 +
 drivers/mtd/nand/raw/mxc_nand_spl.c                           | 1 +
 drivers/mtd/nand/raw/mxs_nand.c                               | 1 +
 drivers/mtd/nand/raw/mxs_nand_spl.c                           | 1 +
 drivers/mtd/nand/raw/nand.c                                   | 2 ++
 drivers/mtd/nand/raw/nand_base.c                              | 2 ++
 drivers/mtd/nand/raw/nand_bbt.c                               | 1 +
 drivers/mtd/nand/raw/nand_ecc.c                               | 1 +
 drivers/mtd/nand/raw/nand_spl_loaders.c                       | 1 +
 drivers/mtd/nand/raw/nand_spl_simple.c                        | 2 ++
 drivers/mtd/nand/raw/nand_util.c                              | 1 +
 drivers/mtd/nand/raw/omap_elm.c                               | 1 +
 drivers/mtd/nand/raw/omap_gpmc.c                              | 2 ++
 drivers/mtd/nand/raw/pxa3xx_nand.c                            | 1 +
 drivers/mtd/nand/raw/pxa3xx_nand.h                            | 1 +
 drivers/mtd/nand/raw/stm32_fmc2_nand.c                        | 3 +++
 drivers/mtd/nand/raw/sunxi_nand.c                             | 3 +++
 drivers/mtd/nand/raw/sunxi_nand_spl.c                         | 2 ++
 drivers/mtd/nand/raw/tegra_nand.c                             | 1 +
 drivers/mtd/nand/raw/tegra_nand.h                             | 1 +
 drivers/mtd/nand/raw/vf610_nfc.c                              | 2 ++
 drivers/mtd/nand/raw/zynq_nand.c                              | 3 +++
 drivers/mtd/nand/spi/core.c                                   | 2 ++
 drivers/mtd/nand/spi/gigadevice.c                             | 1 +
 drivers/mtd/nand/spi/macronix.c                               | 1 +
 drivers/mtd/nand/spi/micron.c                                 | 1 +
 drivers/mtd/nand/spi/toshiba.c                                | 1 +
 drivers/mtd/nand/spi/winbond.c                                | 1 +
 drivers/mtd/onenand/onenand_base.c                            | 2 ++
 drivers/mtd/onenand/onenand_bbt.c                             | 1 +
 drivers/mtd/onenand/onenand_spl.c                             | 1 +
 drivers/mtd/onenand/samsung.c                                 | 2 ++
 drivers/mtd/pic32_flash.c                                     | 2 ++
 drivers/mtd/renesas_rpc_hf.c                                  | 2 ++
 drivers/mtd/spi/fsl_espi_spl.c                                | 1 +
 drivers/mtd/spi/sandbox.c                                     | 1 +
 drivers/mtd/spi/sf-uclass.c                                   | 1 +
 drivers/mtd/spi/sf_dataflash.c                                | 1 +
 drivers/mtd/spi/sf_mtd.c                                      | 1 +
 drivers/mtd/spi/sf_probe.c                                    | 1 +
 drivers/mtd/spi/spi-nor-core.c                                | 2 ++
 drivers/mtd/spi/spi-nor-tiny.c                                | 2 ++
 drivers/mtd/st_smi.c                                          | 1 +
 drivers/mtd/stm32_flash.c                                     | 1 +
 drivers/mtd/stm32_flash.h                                     | 1 +
 drivers/mtd/ubi/attach.c                                      | 1 +
 drivers/mtd/ubi/build.c                                       | 2 ++
 drivers/mtd/ubi/crc32table.h                                  | 1 +
 drivers/mtd/ubi/debug.c                                       | 1 +
 drivers/mtd/ubi/eba.c                                         | 1 +
 drivers/mtd/ubi/fastmap.c                                     | 1 +
 drivers/mtd/ubi/io.c                                          | 1 +
 drivers/mtd/ubi/misc.c                                        | 1 +
 drivers/mtd/ubi/ubi-media.h                                   | 2 ++
 drivers/mtd/ubi/upd.c                                         | 1 +
 drivers/mtd/ubi/vmt.c                                         | 1 +
 drivers/mtd/ubi/vtbl.c                                        | 1 +
 drivers/mtd/ubispl/ubispl.c                                   | 1 +
 drivers/net/ag7xxx.c                                          | 2 ++
 drivers/net/altera_tse.c                                      | 1 +
 drivers/net/altera_tse.h                                      | 2 ++
 drivers/net/armada100_fec.h                                   | 1 +
 drivers/net/at91_emac.c                                       | 1 +
 drivers/net/ax88796.c                                         | 1 +
 drivers/net/ax88796.h                                         | 1 +
 drivers/net/bcm-sf2-eth-gmac.c                                | 2 ++
 drivers/net/bcm-sf2-eth-gmac.h                                | 1 +
 drivers/net/bcm-sf2-eth.c                                     | 1 +
 drivers/net/bcm-sf2-eth.h                                     | 1 +
 drivers/net/bcm6348-eth.c                                     | 2 ++
 drivers/net/bcm6368-eth.c                                     | 2 ++
 drivers/net/bcmgenet.c                                        | 1 +
 drivers/net/calxedaxgmac.c                                    | 1 +
 drivers/net/cs8900.c                                          | 1 +
 drivers/net/cs8900.h                                          | 1 +
 drivers/net/dc2114x.c                                         | 2 ++
 drivers/net/designware.c                                      | 1 +
 drivers/net/designware.h                                      | 1 +
 drivers/net/dm9000x.c                                         | 1 +
 drivers/net/dnet.c                                            | 1 +
 drivers/net/dnet.h                                            | 1 +
 drivers/net/dwc_eth_qos.c                                     | 3 +++
 drivers/net/dwmac_socfpga.c                                   | 1 +
 drivers/net/e1000.c                                           | 2 ++
 drivers/net/e1000.h                                           | 1 +
 drivers/net/e1000_spi.c                                       | 2 ++
 drivers/net/eepro100.c                                        | 2 ++
 drivers/net/ep93xx_eth.h                                      | 1 +
 drivers/net/ethoc.c                                           | 2 ++
 drivers/net/fec_mxc.c                                         | 2 ++
 drivers/net/fec_mxc.h                                         | 1 +
 drivers/net/fm/b4860.c                                        | 1 +
 drivers/net/fm/eth.c                                          | 2 ++
 drivers/net/fm/fdt.c                                          | 1 +
 drivers/net/fm/fm.c                                           | 1 +
 drivers/net/fm/fm.h                                           | 1 +
 drivers/net/fm/init.c                                         | 1 +
 drivers/net/fm/ls1043.c                                       | 1 +
 drivers/net/fm/ls1046.c                                       | 1 +
 drivers/net/fm/memac_phy.c                                    | 1 +
 drivers/net/fm/p1023.c                                        | 1 +
 drivers/net/fm/p4080.c                                        | 1 +
 drivers/net/fm/p5020.c                                        | 1 +
 drivers/net/fm/p5040.c                                        | 1 +
 drivers/net/fm/t1024.c                                        | 2 ++
 drivers/net/fm/t1040.c                                        | 1 +
 drivers/net/fm/t2080.c                                        | 2 ++
 drivers/net/fm/t4240.c                                        | 2 ++
 drivers/net/fm/tgec_phy.c                                     | 1 +
 drivers/net/fsl-mc/dpbp.c                                     | 1 +
 drivers/net/fsl-mc/dpio/dpio.c                                | 1 +
 drivers/net/fsl-mc/dpio/qbman_portal.c                        | 1 +
 drivers/net/fsl-mc/dpio/qbman_sys.h                           | 2 ++
 drivers/net/fsl-mc/dpmac.c                                    | 1 +
 drivers/net/fsl-mc/dpmng.c                                    | 1 +
 drivers/net/fsl-mc/dpni.c                                     | 1 +
 drivers/net/fsl-mc/dprc.c                                     | 1 +
 drivers/net/fsl-mc/dpsparser.c                                | 1 +
 drivers/net/fsl-mc/fsl_dpmng_cmd.h                            | 1 +
 drivers/net/fsl-mc/mc.c                                       | 3 +++
 drivers/net/fsl-mc/mc_sys.c                                   | 1 +
 drivers/net/fsl_enetc.c                                       | 2 ++
 drivers/net/fsl_enetc.h                                       | 1 +
 drivers/net/fsl_enetc_mdio.c                                  | 1 +
 drivers/net/fsl_ls_mdio.c                                     | 1 +
 drivers/net/fsl_mcdmafec.c                                    | 1 +
 drivers/net/fsl_mdio.c                                        | 2 ++
 drivers/net/ftgmac100.c                                       | 1 +
 drivers/net/ftmac100.c                                        | 1 +
 drivers/net/ftmac110.c                                        | 2 ++
 drivers/net/ftmac110.h                                        | 1 +
 drivers/net/gmac_rockchip.c                                   | 1 +
 drivers/net/higmacv300.c                                      | 2 ++
 drivers/net/ks8851_mll.c                                      | 1 +
 drivers/net/lan91c96.c                                        | 1 +
 drivers/net/ldpaa_eth/ldpaa_eth.c                             | 1 +
 drivers/net/ldpaa_eth/ldpaa_eth.h                             | 2 ++
 drivers/net/ldpaa_eth/ldpaa_wriop.c                           | 1 +
 drivers/net/ldpaa_eth/ls1088a.c                               | 2 ++
 drivers/net/ldpaa_eth/ls2080a.c                               | 2 ++
 drivers/net/ldpaa_eth/lx2160a.c                               | 2 ++
 drivers/net/lpc32xx_eth.c                                     | 1 +
 drivers/net/macb.c                                            | 3 +++
 drivers/net/mcffec.c                                          | 1 +
 drivers/net/mcfmii.c                                          | 1 +
 drivers/net/mdio_mux_i2creg.c                                 | 1 +
 drivers/net/mdio_mux_sandbox.c                                | 1 +
 drivers/net/mdio_sandbox.c                                    | 1 +
 drivers/net/mpc8xx_fec.c                                      | 2 ++
 drivers/net/mscc_eswitch/jr2_switch.c                         | 2 ++
 drivers/net/mscc_eswitch/luton_switch.c                       | 2 ++
 drivers/net/mscc_eswitch/mscc_mac_table.c                     | 2 ++
 drivers/net/mscc_eswitch/mscc_mac_table.h                     | 1 +
 drivers/net/mscc_eswitch/mscc_miim.c                          | 1 +
 drivers/net/mscc_eswitch/mscc_miim.h                          | 2 ++
 drivers/net/mscc_eswitch/mscc_xfer.c                          | 2 ++
 drivers/net/mscc_eswitch/mscc_xfer.h                          | 2 ++
 drivers/net/mscc_eswitch/ocelot_switch.c                      | 2 ++
 drivers/net/mscc_eswitch/serval_switch.c                      | 2 ++
 drivers/net/mscc_eswitch/servalt_switch.c                     | 2 ++
 drivers/net/mt7628-eth.c                                      | 3 +++
 drivers/net/mtk_eth.c                                         | 2 ++
 drivers/net/mvgbe.c                                           | 2 ++
 drivers/net/mvgbe.h                                           | 1 +
 drivers/net/mvmdio.c                                          | 1 +
 drivers/net/mvneta.c                                          | 2 ++
 drivers/net/mvpp2.c                                           | 3 +++
 drivers/net/natsemi.c                                         | 1 +
 drivers/net/ne2000.c                                          | 1 +
 drivers/net/ne2000.h                                          | 1 +
 drivers/net/ne2000_base.c                                     | 1 +
 drivers/net/ne2000_base.h                                     | 1 +
 drivers/net/netconsole.c                                      | 1 +
 drivers/net/ns8382x.c                                         | 1 +
 drivers/net/pch_gbe.c                                         | 1 +
 drivers/net/pch_gbe.h                                         | 1 +
 drivers/net/pcnet.c                                           | 2 ++
 drivers/net/pfe_eth/pfe_cmd.c                                 | 1 +
 drivers/net/pfe_eth/pfe_driver.c                              | 1 +
 drivers/net/pfe_eth/pfe_eth.c                                 | 1 +
 drivers/net/pfe_eth/pfe_firmware.c                            | 1 +
 drivers/net/pfe_eth/pfe_hw.c                                  | 1 +
 drivers/net/pfe_eth/pfe_mdio.c                                | 1 +
 drivers/net/phy/aquantia.c                                    | 2 ++
 drivers/net/phy/atheros.c                                     | 1 +
 drivers/net/phy/b53.c                                         | 1 +
 drivers/net/phy/broadcom.c                                    | 1 +
 drivers/net/phy/cortina.c                                     | 1 +
 drivers/net/phy/dp83867.c                                     | 1 +
 drivers/net/phy/fixed.c                                       | 1 +
 drivers/net/phy/generic_10g.c                                 | 1 +
 drivers/net/phy/marvell.c                                     | 1 +
 drivers/net/phy/micrel_ksz90x1.c                              | 1 +
 drivers/net/phy/miiphybb.c                                    | 1 +
 drivers/net/phy/mscc.c                                        | 2 ++
 drivers/net/phy/mv88e61xx.c                                   | 2 ++
 drivers/net/phy/mv88e6352.c                                   | 1 +
 drivers/net/phy/ncsi.c                                        | 2 ++
 drivers/net/phy/phy.c                                         | 3 +++
 drivers/net/phy/realtek.c                                     | 1 +
 drivers/net/phy/teranetics.c                                  | 1 +
 drivers/net/phy/vitesse.c                                     | 1 +
 drivers/net/phy/xilinx_gmii2rgmii.c                           | 1 +
 drivers/net/phy/xilinx_phy.c                                  | 1 +
 drivers/net/pic32_eth.c                                       | 2 ++
 drivers/net/pic32_eth.h                                       | 1 +
 drivers/net/pic32_mdio.c                                      | 1 +
 drivers/net/ravb.c                                            | 2 ++
 drivers/net/rtl8169.c                                         | 1 +
 drivers/net/sandbox-raw-bus.c                                 | 1 +
 drivers/net/sandbox-raw.c                                     | 1 +
 drivers/net/sandbox.c                                         | 1 +
 drivers/net/sh_eth.c                                          | 2 ++
 drivers/net/sh_eth.h                                          | 2 ++
 drivers/net/smc91111.c                                        | 1 +
 drivers/net/smc911x.c                                         | 1 +
 drivers/net/sni_ave.c                                         | 2 ++
 drivers/net/sun8i_emac.c                                      | 2 ++
 drivers/net/sunxi_emac.c                                      | 1 +
 drivers/net/ti/am65-cpsw-nuss.c                               | 2 ++
 drivers/net/ti/cpsw-common.c                                  | 1 +
 drivers/net/ti/cpsw.c                                         | 2 ++
 drivers/net/ti/cpsw_mdio.c                                    | 1 +
 drivers/net/ti/cpsw_mdio.h                                    | 1 +
 drivers/net/ti/davinci_emac.c                                 | 1 +
 drivers/net/ti/davinci_emac.h                                 | 1 +
 drivers/net/ti/keystone_net.c                                 | 1 +
 drivers/net/tsec.c                                            | 2 ++
 drivers/net/uli526x.c                                         | 1 +
 drivers/net/vsc7385.c                                         | 1 +
 drivers/net/vsc9953.c                                         | 1 +
 drivers/net/xilinx_axi_emac.c                                 | 1 +
 drivers/net/xilinx_emaclite.c                                 | 2 ++
 drivers/net/zynq_gem.c                                        | 3 +++
 drivers/nvme/nvme.c                                           | 3 +++
 drivers/nvme/nvme.h                                           | 2 ++
 drivers/nvme/nvme_show.c                                      | 1 +
 drivers/pch/pch-uclass.c                                      | 1 +
 drivers/pch/pch7.c                                            | 1 +
 drivers/pch/pch9.c                                            | 1 +
 drivers/pch/sandbox_pch.c                                     | 1 +
 drivers/pci/fsl_pci_init.c                                    | 1 +
 drivers/pci/pci-aardvark.c                                    | 1 +
 drivers/pci/pci-emul-uclass.c                                 | 1 +
 drivers/pci/pci-rcar-gen2.c                                   | 1 +
 drivers/pci/pci-rcar-gen3.c                                   | 1 +
 drivers/pci/pci-uclass.c                                      | 2 ++
 drivers/pci/pci.c                                             | 2 ++
 drivers/pci/pci_auto.c                                        | 1 +
 drivers/pci/pci_auto_common.c                                 | 1 +
 drivers/pci/pci_auto_old.c                                    | 1 +
 drivers/pci/pci_common.c                                      | 2 ++
 drivers/pci/pci_compat.c                                      | 1 +
 drivers/pci/pci_gt64120.c                                     | 1 +
 drivers/pci/pci_indirect.c                                    | 1 +
 drivers/pci/pci_mpc85xx.c                                     | 2 ++
 drivers/pci/pci_msc01.c                                       | 1 +
 drivers/pci/pci_mvebu.c                                       | 3 +++
 drivers/pci/pci_rom.c                                         | 3 +++
 drivers/pci/pci_sandbox.c                                     | 1 +
 drivers/pci/pci_sh7751.c                                      | 1 +
 drivers/pci/pci_sh7780.c                                      | 1 +
 drivers/pci/pci_tegra.c                                       | 2 ++
 drivers/pci/pci_x86.c                                         | 1 +
 drivers/pci/pcie_brcmstb.c                                    | 3 +++
 drivers/pci/pcie_dw_mvebu.c                                   | 1 +
 drivers/pci/pcie_dw_ti.c                                      | 3 +++
 drivers/pci/pcie_ecam_generic.c                               | 2 ++
 drivers/pci/pcie_fsl.c                                        | 2 ++
 drivers/pci/pcie_fsl.h                                        | 2 ++
 drivers/pci/pcie_imx.c                                        | 3 +++
 drivers/pci/pcie_intel_fpga.c                                 | 2 ++
 drivers/pci/pcie_layerscape.c                                 | 1 +
 drivers/pci/pcie_layerscape.h                                 | 2 ++
 drivers/pci/pcie_layerscape_ep.c                              | 2 ++
 drivers/pci/pcie_layerscape_fixup.c                           | 1 +
 drivers/pci/pcie_layerscape_fixup_common.c                    | 1 +
 drivers/pci/pcie_layerscape_gen4.c                            | 2 ++
 drivers/pci/pcie_layerscape_gen4.h                            | 2 ++
 drivers/pci/pcie_layerscape_gen4_fixup.c                      | 1 +
 drivers/pci/pcie_layerscape_rc.c                              | 1 +
 drivers/pci/pcie_mediatek.c                                   | 2 ++
 drivers/pci/pcie_phytium.c                                    | 1 +
 drivers/pci/pcie_rockchip.c                                   | 1 +
 drivers/pci/pcie_xilinx.c                                     | 1 +
 drivers/pci_endpoint/pci_ep-uclass.c                          | 1 +
 drivers/pci_endpoint/pcie-cadence-ep.c                        | 2 ++
 drivers/pci_endpoint/pcie-cadence.h                           | 2 ++
 drivers/pci_endpoint/sandbox-pci_ep.c                         | 1 +
 drivers/phy/allwinner/phy-sun4i-usb.c                         | 3 +++
 drivers/phy/bcm6318-usbh-phy.c                                | 1 +
 drivers/phy/bcm6348-usbh-phy.c                                | 1 +
 drivers/phy/bcm6358-usbh-phy.c                                | 1 +
 drivers/phy/bcm6368-usbh-phy.c                                | 2 ++
 drivers/phy/keystone-usb-phy.c                                | 2 ++
 drivers/phy/marvell/comphy_a3700.c                            | 1 +
 drivers/phy/marvell/comphy_core.c                             | 2 ++
 drivers/phy/marvell/comphy_core.h                             | 2 ++
 drivers/phy/marvell/comphy_cp110.c                            | 2 ++
 drivers/phy/marvell/comphy_mux.c                              | 2 ++
 drivers/phy/meson-g12a-usb3-pcie.c                            | 1 +
 drivers/phy/meson-gxbb-usb2.c                                 | 1 +
 drivers/phy/meson-gxl-usb2.c                                  | 1 +
 drivers/phy/meson-gxl-usb3.c                                  | 1 +
 drivers/phy/msm8916-usbh-phy.c                                | 2 ++
 drivers/phy/mt76x8-usb-phy.c                                  | 2 ++
 drivers/phy/omap-usb2-phy.c                                   | 2 ++
 drivers/phy/phy-mtk-tphy.c                                    | 2 ++
 drivers/phy/phy-rcar-gen2.c                                   | 1 +
 drivers/phy/phy-stm32-usbphyc.c                               | 1 +
 drivers/phy/phy-ti-am654.c                                    | 1 +
 drivers/phy/rockchip/phy-rockchip-inno-usb2.c                 | 1 +
 drivers/phy/rockchip/phy-rockchip-pcie.c                      | 1 +
 drivers/phy/rockchip/phy-rockchip-typec.c                     | 3 +++
 drivers/phy/sti_usb_phy.c                                     | 2 ++
 drivers/phy/ti-pipe3-phy.c                                    | 2 ++
 drivers/pinctrl/aspeed/pinctrl_ast2500.c                      | 1 +
 drivers/pinctrl/ath79/pinctrl_ar933x.c                        | 2 ++
 drivers/pinctrl/ath79/pinctrl_qca953x.c                       | 2 ++
 drivers/pinctrl/broadcom/pinctrl-bcm283x.c                    | 1 +
 drivers/pinctrl/broadcom/pinctrl-bcm6838.c                    | 1 +
 drivers/pinctrl/exynos/pinctrl-exynos.c                       | 1 +
 drivers/pinctrl/exynos/pinctrl-exynos7420.c                   | 1 +
 drivers/pinctrl/intel/pinctrl.c                               | 1 +
 drivers/pinctrl/mediatek/pinctrl-mtk-common.c                 | 1 +
 drivers/pinctrl/mediatek/pinctrl-mtk-common.h                 | 2 ++
 drivers/pinctrl/meson/pinctrl-meson-axg.c                     | 1 +
 drivers/pinctrl/meson/pinctrl-meson-g12a.c                    | 1 +
 drivers/pinctrl/meson/pinctrl-meson-gx-pmx.c                  | 2 ++
 drivers/pinctrl/meson/pinctrl-meson-gxbb.c                    | 1 +
 drivers/pinctrl/meson/pinctrl-meson-gxl.c                     | 1 +
 drivers/pinctrl/meson/pinctrl-meson.c                         | 1 +
 drivers/pinctrl/meson/pinctrl-meson.h                         | 1 +
 drivers/pinctrl/mscc/mscc-common.c                            | 1 +
 drivers/pinctrl/mscc/mscc-common.h                            | 1 +
 drivers/pinctrl/mtmips/pinctrl-mt7628.c                       | 2 ++
 drivers/pinctrl/mtmips/pinctrl-mtmips-common.c                | 1 +
 drivers/pinctrl/mtmips/pinctrl-mtmips-common.h                | 2 ++
 drivers/pinctrl/mvebu/pinctrl-armada-37xx.c                   | 2 ++
 drivers/pinctrl/mvebu/pinctrl-mvebu.c                         | 1 +
 drivers/pinctrl/mvebu/pinctrl-mvebu.h                         | 1 +
 drivers/pinctrl/nexell/pinctrl-nexell.c                       | 1 +
 drivers/pinctrl/nexell/pinctrl-nexell.h                       | 1 +
 drivers/pinctrl/nexell/pinctrl-s5pxx18.c                      | 2 ++
 drivers/pinctrl/nxp/pinctrl-imx.c                             | 1 +
 drivers/pinctrl/nxp/pinctrl-imx.h                             | 2 ++
 drivers/pinctrl/nxp/pinctrl-imx5.c                            | 1 +
 drivers/pinctrl/nxp/pinctrl-imx6.c                            | 1 +
 drivers/pinctrl/nxp/pinctrl-imx7.c                            | 1 +
 drivers/pinctrl/nxp/pinctrl-imx7ulp.c                         | 1 +
 drivers/pinctrl/nxp/pinctrl-imx8.c                            | 1 +
 drivers/pinctrl/nxp/pinctrl-imx8m.c                           | 1 +
 drivers/pinctrl/nxp/pinctrl-imxrt.c                           | 1 +
 drivers/pinctrl/nxp/pinctrl-mxs.c                             | 2 ++
 drivers/pinctrl/nxp/pinctrl-mxs.h                             | 2 ++
 drivers/pinctrl/nxp/pinctrl-scu.c                             | 1 +
 drivers/pinctrl/nxp/pinctrl-vf610.c                           | 1 +
 drivers/pinctrl/pinctrl-at91-pio4.c                           | 1 +
 drivers/pinctrl/pinctrl-at91.c                                | 2 ++
 drivers/pinctrl/pinctrl-generic.c                             | 1 +
 drivers/pinctrl/pinctrl-single.c                              | 1 +
 drivers/pinctrl/pinctrl-sti.c                                 | 1 +
 drivers/pinctrl/pinctrl-stmfx.c                               | 1 +
 drivers/pinctrl/pinctrl-uclass.c                              | 2 ++
 drivers/pinctrl/pinctrl_pic32.c                               | 2 ++
 drivers/pinctrl/pinctrl_stm32.c                               | 1 +
 drivers/pinctrl/renesas/pfc-r7s72100.c                        | 2 ++
 drivers/pinctrl/renesas/pfc-r8a7790.c                         | 1 +
 drivers/pinctrl/renesas/pfc-r8a7791.c                         | 1 +
 drivers/pinctrl/renesas/pfc-r8a7792.c                         | 1 +
 drivers/pinctrl/renesas/pfc-r8a7794.c                         | 1 +
 drivers/pinctrl/renesas/pfc-r8a7795.c                         | 1 +
 drivers/pinctrl/renesas/pfc-r8a7796.c                         | 1 +
 drivers/pinctrl/renesas/pfc-r8a77965.c                        | 1 +
 drivers/pinctrl/renesas/pfc-r8a77970.c                        | 1 +
 drivers/pinctrl/renesas/pfc-r8a77980.c                        | 1 +
 drivers/pinctrl/renesas/pfc-r8a77990.c                        | 1 +
 drivers/pinctrl/renesas/pfc-r8a77995.c                        | 1 +
 drivers/pinctrl/renesas/pfc.c                                 | 3 +++
 drivers/pinctrl/renesas/sh_pfc.h                              | 2 ++
 drivers/pinctrl/rockchip/pinctrl-px30.c                       | 1 +
 drivers/pinctrl/rockchip/pinctrl-rk3036.c                     | 1 +
 drivers/pinctrl/rockchip/pinctrl-rk3128.c                     | 1 +
 drivers/pinctrl/rockchip/pinctrl-rk3188.c                     | 1 +
 drivers/pinctrl/rockchip/pinctrl-rk322x.c                     | 1 +
 drivers/pinctrl/rockchip/pinctrl-rk3288.c                     | 1 +
 drivers/pinctrl/rockchip/pinctrl-rk3308.c                     | 1 +
 drivers/pinctrl/rockchip/pinctrl-rk3328.c                     | 1 +
 drivers/pinctrl/rockchip/pinctrl-rk3368.c                     | 1 +
 drivers/pinctrl/rockchip/pinctrl-rk3399.c                     | 1 +
 drivers/pinctrl/rockchip/pinctrl-rockchip-core.c              | 2 ++
 drivers/pinctrl/rockchip/pinctrl-rv1108.c                     | 1 +
 drivers/pinctrl/uniphier/pinctrl-uniphier-core.c              | 2 ++
 drivers/pinctrl/uniphier/pinctrl-uniphier.h                   | 1 +
 drivers/power/acpi_pmc/acpi-pmc-uclass.c                      | 1 +
 drivers/power/acpi_pmc/pmc_emul.c                             | 1 +
 drivers/power/acpi_pmc/sandbox.c                              | 1 +
 drivers/power/axp152.c                                        | 1 +
 drivers/power/axp209.c                                        | 1 +
 drivers/power/axp221.c                                        | 1 +
 drivers/power/axp809.c                                        | 1 +
 drivers/power/axp818.c                                        | 1 +
 drivers/power/domain/bcm6328-power-domain.c                   | 1 +
 drivers/power/domain/imx8-power-domain.c                      | 1 +
 drivers/power/domain/meson-ee-pwrc.c                          | 2 ++
 drivers/power/domain/meson-gx-pwrc-vpu.c                      | 1 +
 drivers/power/domain/mtk-power-domain.c                       | 2 ++
 drivers/power/domain/ti-sci-power-domain.c                    | 1 +
 drivers/power/exynos-tmu.c                                    | 1 +
 drivers/power/fuel_gauge/fg_max17042.c                        | 1 +
 drivers/power/mfd/fg_max77693.c                               | 1 +
 drivers/power/mt6323.c                                        | 1 +
 drivers/power/palmas.c                                        | 1 +
 drivers/power/pmic/act8846.c                                  | 1 +
 drivers/power/pmic/as3722.c                                   | 1 +
 drivers/power/pmic/as3722_gpio.c                              | 1 +
 drivers/power/pmic/bd71837.c                                  | 1 +
 drivers/power/pmic/da9063.c                                   | 2 ++
 drivers/power/pmic/fan53555.c                                 | 1 +
 drivers/power/pmic/i2c_pmic_emul.c                            | 1 +
 drivers/power/pmic/lp873x.c                                   | 1 +
 drivers/power/pmic/lp87565.c                                  | 1 +
 drivers/power/pmic/max77686.c                                 | 1 +
 drivers/power/pmic/max8997.c                                  | 1 +
 drivers/power/pmic/max8998.c                                  | 1 +
 drivers/power/pmic/mc34708.c                                  | 1 +
 drivers/power/pmic/palmas.c                                   | 1 +
 drivers/power/pmic/pca9450.c                                  | 1 +
 drivers/power/pmic/pfuze100.c                                 | 1 +
 drivers/power/pmic/pm8916.c                                   | 1 +
 drivers/power/pmic/pmic-uclass.c                              | 1 +
 drivers/power/pmic/pmic_hi6553.c                              | 1 +
 drivers/power/pmic/pmic_max8997.c                             | 1 +
 drivers/power/pmic/pmic_tps65217.c                            | 1 +
 drivers/power/pmic/pmic_tps65218.c                            | 1 +
 drivers/power/pmic/pmic_tps65910.c                            | 1 +
 drivers/power/pmic/pmic_tps65910_dm.c                         | 1 +
 drivers/power/pmic/rk8xx.c                                    | 1 +
 drivers/power/pmic/rn5t567.c                                  | 1 +
 drivers/power/pmic/s2mps11.c                                  | 1 +
 drivers/power/pmic/s5m8767.c                                  | 1 +
 drivers/power/pmic/sandbox.c                                  | 1 +
 drivers/power/pmic/stpmic1.c                                  | 1 +
 drivers/power/pmic/tps65090.c                                 | 1 +
 drivers/power/pmic/tps65941.c                                 | 1 +
 drivers/power/power_fsl.c                                     | 1 +
 drivers/power/regulator/act8846.c                             | 1 +
 drivers/power/regulator/as3722_regulator.c                    | 1 +
 drivers/power/regulator/bd71837.c                             | 2 ++
 drivers/power/regulator/da9063.c                              | 2 ++
 drivers/power/regulator/fan53555.c                            | 2 ++
 drivers/power/regulator/gpio-regulator.c                      | 1 +
 drivers/power/regulator/max77686.c                            | 1 +
 drivers/power/regulator/palmas_regulator.c                    | 1 +
 drivers/power/regulator/pbias_regulator.c                     | 2 ++
 drivers/power/regulator/pfuze100.c                            | 1 +
 drivers/power/regulator/regulator-uclass.c                    | 1 +
 drivers/power/regulator/rk8xx.c                               | 2 ++
 drivers/power/regulator/s2mps11_regulator.c                   | 2 ++
 drivers/power/regulator/sandbox.c                             | 2 ++
 drivers/power/regulator/stm32-vrefbuf.c                       | 3 +++
 drivers/power/regulator/stpmic1.c                             | 2 ++
 drivers/power/regulator/tps62360_regulator.c                  | 1 +
 drivers/power/regulator/tps65090_regulator.c                  | 1 +
 drivers/power/regulator/tps65910_regulator.c                  | 2 ++
 drivers/power/sy8106a.c                                       | 1 +
 drivers/power/tps6586x.c                                      | 1 +
 drivers/power/twl4030.c                                       | 1 +
 drivers/power/twl6030.c                                       | 1 +
 drivers/pwm/exynos_pwm.c                                      | 1 +
 drivers/pwm/pwm-imx.c                                         | 1 +
 drivers/pwm/pwm-mtk.c                                         | 3 +++
 drivers/pwm/pwm-sifive.c                                      | 3 +++
 drivers/pwm/pwm-uclass.c                                      | 1 +
 drivers/pwm/rk_pwm.c                                          | 1 +
 drivers/pwm/sandbox_pwm.c                                     | 1 +
 drivers/pwm/sunxi_pwm.c                                       | 1 +
 drivers/pwm/tegra_pwm.c                                       | 1 +
 drivers/qe/qe.c                                               | 2 ++
 drivers/qe/uccf.c                                             | 1 +
 drivers/qe/uec.c                                              | 1 +
 drivers/qe/uec_phy.c                                          | 1 +
 drivers/qe/uec_phy.h                                          | 1 +
 drivers/ram/bmips_ram.c                                       | 2 ++
 drivers/ram/imxrt_sdram.c                                     | 1 +
 drivers/ram/k3-am654-ddrss.c                                  | 2 ++
 drivers/ram/k3-am654-ddrss.h                                  | 1 +
 drivers/ram/k3-j721e/cps_drv_lpddr4.h                         | 1 +
 drivers/ram/k3-j721e/k3-j721e-ddrss.c                         | 2 ++
 drivers/ram/k3-j721e/lpddr4_private.h                         | 1 +
 drivers/ram/mediatek/ddr3-mt7629.c                            | 1 +
 drivers/ram/mpc83xx_sdram.c                                   | 1 +
 drivers/ram/rockchip/dmc-rk3368.c                             | 2 ++
 drivers/ram/rockchip/sdram_common.c                           | 2 ++
 drivers/ram/rockchip/sdram_pctl_px30.c                        | 2 ++
 drivers/ram/rockchip/sdram_phy_px30.c                         | 2 ++
 drivers/ram/rockchip/sdram_px30.c                             | 2 ++
 drivers/ram/rockchip/sdram_rk3128.c                           | 1 +
 drivers/ram/rockchip/sdram_rk3188.c                           | 2 ++
 drivers/ram/rockchip/sdram_rk3288.c                           | 2 ++
 drivers/ram/rockchip/sdram_rk3308.c                           | 1 +
 drivers/ram/rockchip/sdram_rk3328.c                           | 2 ++
 drivers/ram/rockchip/sdram_rk3399.c                           | 3 +++
 drivers/ram/sifive/fu540_ddr.c                                | 1 +
 drivers/ram/stm32_sdram.c                                     | 1 +
 drivers/ram/stm32mp1/stm32mp1_ddr.c                           | 3 +++
 drivers/ram/stm32mp1/stm32mp1_ddr.h                           | 1 +
 drivers/ram/stm32mp1/stm32mp1_ddr_regs.h                      | 1 +
 drivers/ram/stm32mp1/stm32mp1_interactive.c                   | 2 ++
 drivers/ram/stm32mp1/stm32mp1_ram.c                           | 3 +++
 drivers/ram/stm32mp1/stm32mp1_tests.c                         | 2 ++
 drivers/ram/stm32mp1/stm32mp1_tuning.c                        | 2 ++
 drivers/remoteproc/k3_system_controller.c                     | 2 ++
 drivers/remoteproc/rproc-elf-loader.c                         | 2 ++
 drivers/remoteproc/rproc-uclass.c                             | 1 +
 drivers/remoteproc/sandbox_testproc.c                         | 1 +
 drivers/remoteproc/stm32_copro.c                              | 2 ++
 drivers/remoteproc/ti_k3_arm64_rproc.c                        | 1 +
 drivers/remoteproc/ti_k3_dsp_rproc.c                          | 3 +++
 drivers/remoteproc/ti_k3_r5f_rproc.c                          | 3 +++
 drivers/remoteproc/ti_power_proc.c                            | 1 +
 drivers/remoteproc/ti_sci_proc.h                              | 1 +
 drivers/reset/ast2500-reset.c                                 | 1 +
 drivers/reset/reset-bcm6345.c                                 | 1 +
 drivers/reset/reset-hisilicon.c                               | 2 ++
 drivers/reset/reset-hsdk.c                                    | 2 ++
 drivers/reset/reset-imx7.c                                    | 2 ++
 drivers/reset/reset-mediatek.c                                | 1 +
 drivers/reset/reset-meson.c                                   | 1 +
 drivers/reset/reset-mtmips.c                                  | 1 +
 drivers/reset/reset-rockchip.c                                | 2 ++
 drivers/reset/reset-socfpga.c                                 | 2 ++
 drivers/reset/reset-sunxi.c                                   | 2 ++
 drivers/reset/reset-syscon.c                                  | 2 ++
 drivers/reset/reset-ti-sci.c                                  | 2 ++
 drivers/reset/reset-uniphier.c                                | 2 ++
 drivers/reset/sti-reset.c                                     | 3 +++
 drivers/rng/meson-rng.c                                       | 1 +
 drivers/rng/rng-uclass.c                                      | 1 +
 drivers/rng/rockchip_rng.c                                    | 1 +
 drivers/rng/sandbox_rng.c                                     | 1 +
 drivers/rng/stm32mp1_rng.c                                    | 1 +
 drivers/rtc/at91sam9_rtt.c                                    | 1 +
 drivers/rtc/ds1306.c                                          | 1 +
 drivers/rtc/ds1307.c                                          | 1 +
 drivers/rtc/ds1337.c                                          | 1 +
 drivers/rtc/ds1374.c                                          | 1 +
 drivers/rtc/ds1556.c                                          | 1 +
 drivers/rtc/ds164x.c                                          | 1 +
 drivers/rtc/ds174x.c                                          | 1 +
 drivers/rtc/ds3231.c                                          | 1 +
 drivers/rtc/ds3232.c                                          | 1 +
 drivers/rtc/i2c_rtc_emul.c                                    | 1 +
 drivers/rtc/imxdi.c                                           | 2 ++
 drivers/rtc/isl1208.c                                         | 1 +
 drivers/rtc/m41t11.c                                          | 1 +
 drivers/rtc/m41t60.c                                          | 1 +
 drivers/rtc/m41t62.c                                          | 1 +
 drivers/rtc/m41t94.c                                          | 1 +
 drivers/rtc/m48t35ax.c                                        | 1 +
 drivers/rtc/max6900.c                                         | 1 +
 drivers/rtc/mc13xxx-rtc.c                                     | 1 +
 drivers/rtc/mc146818.c                                        | 1 +
 drivers/rtc/mk48t59.c                                         | 1 +
 drivers/rtc/mvrtc.c                                           | 1 +
 drivers/rtc/mvrtc.h                                           | 1 +
 drivers/rtc/mx27rtc.c                                         | 1 +
 drivers/rtc/mxsrtc.c                                          | 1 +
 drivers/rtc/pcf2127.c                                         | 1 +
 drivers/rtc/pcf8563.c                                         | 1 +
 drivers/rtc/pt7c4338.c                                        | 1 +
 drivers/rtc/rtc-uclass.c                                      | 1 +
 drivers/rtc/rv3029.c                                          | 1 +
 drivers/rtc/rv8803.c                                          | 1 +
 drivers/rtc/rx8010sj.c                                        | 1 +
 drivers/rtc/rx8025.c                                          | 1 +
 drivers/rtc/s35392a.c                                         | 1 +
 drivers/rtc/s3c24x0_rtc.c                                     | 1 +
 drivers/rtc/sandbox_rtc.c                                     | 1 +
 drivers/rtc/stm32_rtc.c                                       | 1 +
 drivers/rtc/x1205.c                                           | 1 +
 drivers/scsi/scsi.c                                           | 2 ++
 drivers/serial/altera_jtag_uart.c                             | 1 +
 drivers/serial/altera_uart.c                                  | 1 +
 drivers/serial/atmel_usart.c                                  | 2 ++
 drivers/serial/atmel_usart.h                                  | 1 +
 drivers/serial/lpc32xx_hsuart.c                               | 1 +
 drivers/serial/ns16550.c                                      | 1 +
 drivers/serial/sandbox.c                                      | 2 ++
 drivers/serial/serial-uclass.c                                | 1 +
 drivers/serial/serial.c                                       | 1 +
 drivers/serial/serial_ar933x.c                                | 2 ++
 drivers/serial/serial_arc.c                                   | 1 +
 drivers/serial/serial_bcm283x_mu.c                            | 1 +
 drivers/serial/serial_bcm6345.c                               | 2 ++
 drivers/serial/serial_cortina.c                               | 2 ++
 drivers/serial/serial_efi.c                                   | 1 +
 drivers/serial/serial_linflexuart.c                           | 1 +
 drivers/serial/serial_lpuart.c                                | 2 ++
 drivers/serial/serial_mcf.c                                   | 1 +
 drivers/serial/serial_meson.c                                 | 1 +
 drivers/serial/serial_mpc8xx.c                                | 2 ++
 drivers/serial/serial_msm.c                                   | 1 +
 drivers/serial/serial_mtk.c                                   | 2 ++
 drivers/serial/serial_mvebu_a3700.c                           | 1 +
 drivers/serial/serial_mxc.c                                   | 2 ++
 drivers/serial/serial_ns16550.c                               | 1 +
 drivers/serial/serial_omap.c                                  | 1 +
 drivers/serial/serial_pic32.c                                 | 3 +++
 drivers/serial/serial_pl01x.c                                 | 1 +
 drivers/serial/serial_pl01x_internal.h                        | 1 +
 drivers/serial/serial_pxa.c                                   | 2 ++
 drivers/serial/serial_s5p.c                                   | 1 +
 drivers/serial/serial_sh.c                                    | 1 +
 drivers/serial/serial_sifive.c                                | 2 ++
 drivers/serial/serial_sti_asc.c                               | 1 +
 drivers/serial/serial_stm32.c                                 | 2 ++
 drivers/serial/serial_stm32.h                                 | 1 +
 drivers/serial/serial_uniphier.c                              | 3 +++
 drivers/serial/serial_zynq.c                                  | 2 ++
 drivers/serial/usbtty.c                                       | 1 +
 drivers/smem/msm_smem.c                                       | 2 ++
 drivers/smem/sandbox_smem.c                                   | 1 +
 drivers/smem/smem-uclass.c                                    | 1 +
 drivers/soc/soc_ti_k3.c                                       | 1 +
 drivers/soc/ti/k3-navss-ringacc.c                             | 3 +++
 drivers/soc/ti/keystone_serdes.c                              | 1 +
 drivers/sound/broadwell_i2s.c                                 | 1 +
 drivers/sound/broadwell_i2s.h                                 | 1 +
 drivers/sound/broadwell_sound.c                               | 1 +
 drivers/sound/codec-uclass.c                                  | 1 +
 drivers/sound/da7219.c                                        | 1 +
 drivers/sound/hda_codec.c                                     | 1 +
 drivers/sound/i2s-uclass.c                                    | 1 +
 drivers/sound/ivybridge_sound.c                               | 1 +
 drivers/sound/max98088.c                                      | 1 +
 drivers/sound/max98090.c                                      | 1 +
 drivers/sound/max98095.c                                      | 1 +
 drivers/sound/max98357a.c                                     | 1 +
 drivers/sound/rockchip_i2s.c                                  | 1 +
 drivers/sound/rockchip_sound.c                                | 1 +
 drivers/sound/rt5677.c                                        | 1 +
 drivers/sound/samsung-i2s.c                                   | 1 +
 drivers/sound/samsung_sound.c                                 | 1 +
 drivers/sound/sandbox.c                                       | 1 +
 drivers/sound/sound-uclass.c                                  | 1 +
 drivers/sound/sound.c                                         | 1 +
 drivers/sound/tegra_ahub.c                                    | 1 +
 drivers/sound/tegra_i2s.c                                     | 1 +
 drivers/sound/tegra_i2s_priv.h                                | 1 +
 drivers/sound/tegra_sound.c                                   | 1 +
 drivers/sound/wm8994.c                                        | 1 +
 drivers/spi/altera_spi.c                                      | 1 +
 drivers/spi/atcspi200_spi.c                                   | 1 +
 drivers/spi/ath79_spi.c                                       | 1 +
 drivers/spi/atmel-quadspi.c                                   | 3 +++
 drivers/spi/atmel_spi.c                                       | 1 +
 drivers/spi/bcm63xx_hsspi.c                                   | 2 ++
 drivers/spi/bcm63xx_spi.c                                     | 2 ++
 drivers/spi/bcmstb_spi.c                                      | 1 +
 drivers/spi/cadence_qspi.c                                    | 1 +
 drivers/spi/cadence_qspi.h                                    | 1 +
 drivers/spi/cadence_qspi_apb.c                                | 1 +
 drivers/spi/cf_spi.c                                          | 1 +
 drivers/spi/davinci_spi.c                                     | 1 +
 drivers/spi/designware_spi.c                                  | 3 +++
 drivers/spi/exynos_spi.c                                      | 1 +
 drivers/spi/fsl_dspi.c                                        | 2 ++
 drivers/spi/fsl_espi.c                                        | 1 +
 drivers/spi/fsl_qspi.c                                        | 3 +++
 drivers/spi/ich.c                                             | 2 ++
 drivers/spi/ich.h                                             | 2 ++
 drivers/spi/kirkwood_spi.c                                    | 1 +
 drivers/spi/meson_spifc.c                                     | 2 ++
 drivers/spi/mpc8xx_spi.c                                      | 2 ++
 drivers/spi/mpc8xxx_spi.c                                     | 2 ++
 drivers/spi/mscc_bb_spi.c                                     | 2 ++
 drivers/spi/mt7621_spi.c                                      | 2 ++
 drivers/spi/mtk_snfi_spi.c                                    | 2 ++
 drivers/spi/mvebu_a3700_spi.c                                 | 1 +
 drivers/spi/mxc_spi.c                                         | 2 ++
 drivers/spi/mxs_spi.c                                         | 1 +
 drivers/spi/nxp_fspi.c                                        | 3 +++
 drivers/spi/omap3_spi.c                                       | 1 +
 drivers/spi/pic32_spi.c                                       | 1 +
 drivers/spi/pl022_spi.c                                       | 2 ++
 drivers/spi/renesas_rpc_spi.c                                 | 2 ++
 drivers/spi/rk_spi.c                                          | 2 ++
 drivers/spi/rk_spi.h                                          | 1 +
 drivers/spi/sandbox_spi.c                                     | 2 ++
 drivers/spi/sh_qspi.c                                         | 1 +
 drivers/spi/soft_spi.c                                        | 1 +
 drivers/spi/spi-mem-nodm.c                                    | 1 +
 drivers/spi/spi-mem.c                                         | 2 ++
 drivers/spi/spi-sifive.c                                      | 1 +
 drivers/spi/spi-sunxi.c                                       | 2 ++
 drivers/spi/spi-uclass.c                                      | 2 ++
 drivers/spi/spi.c                                             | 1 +
 drivers/spi/stm32_qspi.c                                      | 3 +++
 drivers/spi/stm32_spi.c                                       | 3 +++
 drivers/spi/tegra114_spi.c                                    | 1 +
 drivers/spi/tegra20_sflash.c                                  | 1 +
 drivers/spi/tegra20_slink.c                                   | 1 +
 drivers/spi/tegra210_qspi.c                                   | 1 +
 drivers/spi/tegra_spi.h                                       | 1 +
 drivers/spi/ti_qspi.c                                         | 2 ++
 drivers/spi/uniphier_spi.c                                    | 2 ++
 drivers/spi/xilinx_spi.c                                      | 1 +
 drivers/spi/zynq_qspi.c                                       | 1 +
 drivers/spi/zynq_spi.c                                        | 1 +
 drivers/spi/zynqmp_gqspi.c                                    | 1 +
 drivers/spmi/spmi-msm.c                                       | 1 +
 drivers/spmi/spmi-sandbox.c                                   | 1 +
 drivers/spmi/spmi-uclass.c                                    | 1 +
 drivers/sysreset/sysreset-uclass.c                            | 1 +
 drivers/sysreset/sysreset_ast.c                               | 1 +
 drivers/sysreset/sysreset_mpc83xx.c                           | 2 ++
 drivers/sysreset/sysreset_octeon.c                            | 1 +
 drivers/sysreset/sysreset_socfpga.c                           | 1 +
 drivers/sysreset/sysreset_sti.c                               | 2 ++
 drivers/sysreset/sysreset_syscon.c                            | 1 +
 drivers/sysreset/sysreset_x86.c                               | 1 +
 drivers/tee/broadcom/chimp_optee.c                            | 1 +
 drivers/tee/optee/core.c                                      | 2 ++
 drivers/tee/optee/optee_private.h                             | 1 +
 drivers/tee/optee/optee_smc.h                                 | 1 +
 drivers/tee/optee/rpmb.c                                      | 1 +
 drivers/tee/sandbox.c                                         | 1 +
 drivers/tee/tee-uclass.c                                      | 1 +
 drivers/thermal/imx_scu_thermal.c                             | 1 +
 drivers/thermal/imx_thermal.c                                 | 1 +
 drivers/thermal/imx_tmu.c                                     | 2 ++
 drivers/thermal/ti-bandgap.c                                  | 1 +
 drivers/timer/ag101p_timer.c                                  | 1 +
 drivers/timer/altera_timer.c                                  | 1 +
 drivers/timer/arc_timer.c                                     | 1 +
 drivers/timer/atcpit100_timer.c                               | 1 +
 drivers/timer/atmel_pit_timer.c                               | 1 +
 drivers/timer/cadence-ttc.c                                   | 1 +
 drivers/timer/mpc83xx_timer.c                                 | 1 +
 drivers/timer/mtk_timer.c                                     | 2 ++
 drivers/timer/nomadik-mtu-timer.c                             | 1 +
 drivers/timer/rockchip_timer.c                                | 1 +
 drivers/timer/sti-timer.c                                     | 1 +
 drivers/timer/stm32_timer.c                                   | 1 +
 drivers/timer/timer-uclass.c                                  | 1 +
 drivers/timer/tsc_timer.c                                     | 2 ++
 drivers/tpm/cr50_i2c.c                                        | 2 ++
 drivers/tpm/tpm-uclass.c                                      | 1 +
 drivers/tpm/tpm2_ftpm_tee.c                                   | 1 +
 drivers/tpm/tpm2_ftpm_tee.h                                   | 1 +
 drivers/tpm/tpm2_tis_sandbox.c                                | 1 +
 drivers/tpm/tpm2_tis_spi.c                                    | 1 +
 drivers/tpm/tpm_atmel_twi.c                                   | 1 +
 drivers/tpm/tpm_internal.h                                    | 1 +
 drivers/tpm/tpm_tis.h                                         | 1 +
 drivers/tpm/tpm_tis_lpc.c                                     | 1 +
 drivers/tpm/tpm_tis_sandbox.c                                 | 2 ++
 drivers/ufs/cdns-platform.c                                   | 1 +
 drivers/ufs/ti-j721e-ufs.c                                    | 2 ++
 drivers/ufs/ufs.c                                             | 2 ++
 drivers/ufs/ufs.h                                             | 2 ++
 drivers/usb/cdns3/cdns3-ti.c                                  | 2 ++
 drivers/usb/cdns3/core.h                                      | 1 +
 drivers/usb/cdns3/drd.c                                       | 2 ++
 drivers/usb/cdns3/ep0.c                                       | 3 +++
 drivers/usb/cdns3/gadget.c                                    | 3 +++
 drivers/usb/cdns3/gadget.h                                    | 2 ++
 drivers/usb/common/fsl-dt-fixup.c                             | 1 +
 drivers/usb/common/fsl-errata.c                               | 1 +
 drivers/usb/dwc3/core.c                                       | 1 +
 drivers/usb/dwc3/core.h                                       | 2 ++
 drivers/usb/dwc3/dwc3-generic.c                               | 1 +
 drivers/usb/dwc3/dwc3-omap.c                                  | 2 ++
 drivers/usb/dwc3/dwc3-uniphier.c                              | 2 ++
 drivers/usb/dwc3/ep0.c                                        | 2 ++
 drivers/usb/dwc3/gadget.c                                     | 2 ++
 drivers/usb/dwc3/gadget.h                                     | 1 +
 drivers/usb/dwc3/io.h                                         | 2 ++
 drivers/usb/dwc3/linux-compat.h                               | 1 +
 drivers/usb/dwc3/samsung_usb_phy.c                            | 1 +
 drivers/usb/dwc3/ti_usb_phy.c                                 | 2 ++
 drivers/usb/emul/sandbox_flash.c                              | 2 ++
 drivers/usb/emul/sandbox_keyb.c                               | 1 +
 drivers/usb/emul/usb-emul-uclass.c                            | 2 ++
 drivers/usb/eth/asix.c                                        | 1 +
 drivers/usb/eth/asix88179.c                                   | 1 +
 drivers/usb/eth/lan75xx.c                                     | 1 +
 drivers/usb/eth/lan78xx.c                                     | 1 +
 drivers/usb/eth/lan7x.c                                       | 1 +
 drivers/usb/eth/lan7x.h                                       | 1 +
 drivers/usb/eth/mcs7830.c                                     | 2 ++
 drivers/usb/eth/r8152.c                                       | 2 ++
 drivers/usb/eth/r8152.h                                       | 2 ++
 drivers/usb/eth/r8152_fw.c                                    | 1 +
 drivers/usb/eth/smsc95xx.c                                    | 1 +
 drivers/usb/eth/usb_ether.c                                   | 1 +
 drivers/usb/gadget/at91_udc.c                                 | 2 ++
 drivers/usb/gadget/at91_udc.h                                 | 2 ++
 drivers/usb/gadget/atmel_usba_udc.c                           | 1 +
 drivers/usb/gadget/atmel_usba_udc.h                           | 1 +
 drivers/usb/gadget/bcm_udc_otg.h                              | 1 +
 drivers/usb/gadget/ci_udc.c                                   | 2 ++
 drivers/usb/gadget/ci_udc.h                                   | 1 +
 drivers/usb/gadget/composite.c                                | 2 ++
 drivers/usb/gadget/config.c                                   | 1 +
 drivers/usb/gadget/core.c                                     | 1 +
 drivers/usb/gadget/designware_udc.c                           | 1 +
 drivers/usb/gadget/dwc2_udc_otg.c                             | 3 +++
 drivers/usb/gadget/dwc2_udc_otg_priv.h                        | 1 +
 drivers/usb/gadget/dwc2_udc_otg_regs.h                        | 1 +
 drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c                    | 1 +
 drivers/usb/gadget/epautoconf.c                               | 1 +
 drivers/usb/gadget/ether.c                                    | 1 +
 drivers/usb/gadget/f_dfu.c                                    | 1 +
 drivers/usb/gadget/f_dfu.h                                    | 2 ++
 drivers/usb/gadget/f_mass_storage.c                           | 1 +
 drivers/usb/gadget/f_rockusb.c                                | 2 ++
 drivers/usb/gadget/f_sdp.c                                    | 3 +++
 drivers/usb/gadget/f_thor.c                                   | 1 +
 drivers/usb/gadget/f_thor.h                                   | 1 +
 drivers/usb/gadget/fotg210.c                                  | 1 +
 drivers/usb/gadget/g_dnl.c                                    | 1 +
 drivers/usb/gadget/ndis.h                                     | 1 +
 drivers/usb/gadget/pxa25x_udc.c                               | 1 +
 drivers/usb/gadget/pxa27x_udc.c                               | 1 +
 drivers/usb/gadget/storage_common.c                           | 1 +
 drivers/usb/gadget/usbstring.c                                | 1 +
 drivers/usb/host/dwc2.c                                       | 2 ++
 drivers/usb/host/dwc2.h                                       | 1 +
 drivers/usb/host/dwc3-sti-glue.c                              | 1 +
 drivers/usb/host/ehci-armada100.c                             | 1 +
 drivers/usb/host/ehci-atmel.c                                 | 1 +
 drivers/usb/host/ehci-exynos.c                                | 1 +
 drivers/usb/host/ehci-faraday.c                               | 2 ++
 drivers/usb/host/ehci-fsl.c                                   | 1 +
 drivers/usb/host/ehci-generic.c                               | 1 +
 drivers/usb/host/ehci-hcd.c                                   | 2 ++
 drivers/usb/host/ehci-marvell.c                               | 1 +
 drivers/usb/host/ehci-msm.c                                   | 1 +
 drivers/usb/host/ehci-mx5.c                                   | 2 ++
 drivers/usb/host/ehci-mx6.c                                   | 2 ++
 drivers/usb/host/ehci-mxc.c                                   | 1 +
 drivers/usb/host/ehci-mxs.c                                   | 2 ++
 drivers/usb/host/ehci-omap.c                                  | 1 +
 drivers/usb/host/ehci-pci.c                                   | 1 +
 drivers/usb/host/ehci-rmobile.c                               | 1 +
 drivers/usb/host/ehci-spear.c                                 | 1 +
 drivers/usb/host/ehci-tegra.c                                 | 1 +
 drivers/usb/host/ehci-vct.c                                   | 1 +
 drivers/usb/host/ehci-vf.c                                    | 2 ++
 drivers/usb/host/ehci-zynq.c                                  | 1 +
 drivers/usb/host/ehci.h                                       | 1 +
 drivers/usb/host/ohci-hcd.c                                   | 2 ++
 drivers/usb/host/ohci-lpc32xx.c                               | 1 +
 drivers/usb/host/ohci.h                                       | 1 +
 drivers/usb/host/r8a66597-hcd.c                               | 1 +
 drivers/usb/host/r8a66597.h                                   | 1 +
 drivers/usb/host/sl811-hcd.c                                  | 2 ++
 drivers/usb/host/usb-sandbox.c                                | 1 +
 drivers/usb/host/usb-uclass.c                                 | 1 +
 drivers/usb/host/xhci-brcm.c                                  | 1 +
 drivers/usb/host/xhci-dwc3.c                                  | 1 +
 drivers/usb/host/xhci-exynos5.c                               | 1 +
 drivers/usb/host/xhci-fsl.c                                   | 2 ++
 drivers/usb/host/xhci-mem.c                                   | 2 ++
 drivers/usb/host/xhci-mtk.c                                   | 2 ++
 drivers/usb/host/xhci-mvebu.c                                 | 2 ++
 drivers/usb/host/xhci-omap.c                                  | 1 +
 drivers/usb/host/xhci-pci.c                                   | 1 +
 drivers/usb/host/xhci-rcar-r8a779x_usb3_v3.h                  | 1 +
 drivers/usb/host/xhci-rcar.c                                  | 2 ++
 drivers/usb/host/xhci-ring.c                                  | 2 ++
 drivers/usb/host/xhci.c                                       | 2 ++
 drivers/usb/musb-new/am35x.c                                  | 2 ++
 drivers/usb/musb-new/da8xx.c                                  | 2 ++
 drivers/usb/musb-new/mt85xx.c                                 | 2 ++
 drivers/usb/musb-new/musb_core.c                              | 3 +++
 drivers/usb/musb-new/musb_core.h                              | 3 +++
 drivers/usb/musb-new/musb_dma.h                               | 2 ++
 drivers/usb/musb-new/musb_dsps.c                              | 2 ++
 drivers/usb/musb-new/musb_gadget.c                            | 2 ++
 drivers/usb/musb-new/musb_gadget.h                            | 1 +
 drivers/usb/musb-new/musb_gadget_ep0.c                        | 2 ++
 drivers/usb/musb-new/musb_host.c                              | 3 +++
 drivers/usb/musb-new/musb_io.h                                | 2 ++
 drivers/usb/musb-new/musb_regs.h                              | 2 ++
 drivers/usb/musb-new/musb_uboot.c                             | 2 ++
 drivers/usb/musb-new/omap2430.c                               | 1 +
 drivers/usb/musb-new/pic32.c                                  | 2 ++
 drivers/usb/musb-new/sunxi.c                                  | 3 +++
 drivers/usb/musb-new/ti-musb.c                                | 1 +
 drivers/usb/musb-new/usb-compat.h                             | 1 +
 drivers/usb/musb/am35x.c                                      | 1 +
 drivers/usb/musb/am35x.h                                      | 1 +
 drivers/usb/musb/musb_core.c                                  | 1 +
 drivers/usb/musb/musb_core.h                                  | 1 +
 drivers/usb/musb/musb_hcd.c                                   | 2 ++
 drivers/usb/musb/musb_udc.c                                   | 1 +
 drivers/usb/musb/omap3.c                                      | 1 +
 drivers/usb/musb/omap3.h                                      | 1 +
 drivers/usb/phy/omap_usb_phy.c                                | 1 +
 drivers/usb/phy/rockchip_usb2_phy.c                           | 1 +
 drivers/usb/phy/twl4030.c                                     | 1 +
 drivers/usb/ulpi/omap-ulpi-viewport.c                         | 1 +
 drivers/usb/ulpi/ulpi-viewport.c                              | 1 +
 drivers/usb/ulpi/ulpi.c                                       | 1 +
 drivers/video/am335x-fb.c                                     | 2 ++
 drivers/video/anx9804.c                                       | 1 +
 drivers/video/anx9804.h                                       | 1 +
 drivers/video/ati_radeon_fb.c                                 | 1 +
 drivers/video/ati_radeon_fb.h                                 | 1 +
 drivers/video/atmel_hlcdfb.c                                  | 1 +
 drivers/video/atmel_lcdfb.c                                   | 1 +
 drivers/video/bcm2835.c                                       | 1 +
 drivers/video/bridge/anx6345.c                                | 1 +
 drivers/video/bridge/ps862x.c                                 | 1 +
 drivers/video/bridge/video-bridge-uclass.c                    | 1 +
 drivers/video/broadwell_igd.c                                 | 2 ++
 drivers/video/bus_vcxk.c                                      | 1 +
 drivers/video/cfb_console.c                                   | 2 ++
 drivers/video/console_normal.c                                | 1 +
 drivers/video/console_rotate.c                                | 1 +
 drivers/video/console_truetype.c                              | 1 +
 drivers/video/da8xx-fb.c                                      | 1 +
 drivers/video/display-uclass.c                                | 1 +
 drivers/video/dw_hdmi.c                                       | 2 ++
 drivers/video/dw_mipi_dsi.c                                   | 3 +++
 drivers/video/efi.c                                           | 1 +
 drivers/video/exynos/exynos_dp.c                              | 1 +
 drivers/video/exynos/exynos_dp_lowlevel.c                     | 1 +
 drivers/video/exynos/exynos_dp_lowlevel.h                     | 1 +
 drivers/video/exynos/exynos_fb.c                              | 1 +
 drivers/video/exynos/exynos_mipi_dsi_common.c                 | 1 +
 drivers/video/exynos/exynos_mipi_dsi_lowlevel.c               | 1 +
 drivers/video/formike.c                                       | 1 +
 drivers/video/fsl_dcu_fb.c                                    | 1 +
 drivers/video/fsl_diu_fb.c                                    | 1 +
 drivers/video/hitachi_tx18d42vm_lcd.c                         | 1 +
 drivers/video/ihs_video_out.c                                 | 1 +
 drivers/video/imx/ipu_common.c                                | 1 +
 drivers/video/imx/ipu_regs.h                                  | 1 +
 drivers/video/imx/mxc_ipuv3_fb.c                              | 1 +
 drivers/video/ivybridge_igd.c                                 | 1 +
 drivers/video/lg4573.c                                        | 1 +
 drivers/video/logicore_dp_tx.c                                | 1 +
 drivers/video/logicore_dp_tx.h                                | 1 +
 drivers/video/logicore_dp_tx_regif.h                          | 1 +
 drivers/video/mali_dp.c                                       | 1 +
 drivers/video/mb862xx.c                                       | 1 +
 drivers/video/meson/meson_canvas.c                            | 1 +
 drivers/video/meson/meson_dw_hdmi.c                           | 3 +++
 drivers/video/meson/meson_plane.c                             | 1 +
 drivers/video/meson/meson_registers.h                         | 1 +
 drivers/video/meson/meson_vclk.c                              | 2 ++
 drivers/video/meson/meson_venc.c                              | 1 +
 drivers/video/meson/meson_vpu.c                               | 1 +
 drivers/video/meson/meson_vpu.h                               | 2 ++
 drivers/video/meson/meson_vpu_init.c                          | 1 +
 drivers/video/mipi_dsi.c                                      | 1 +
 drivers/video/mvebu_lcd.c                                     | 1 +
 drivers/video/mx3fb.c                                         | 1 +
 drivers/video/mxsfb.c                                         | 2 ++
 drivers/video/nexell/s5pxx18_dp.c                             | 1 +
 drivers/video/nexell/s5pxx18_dp_hdmi.c                        | 1 +
 drivers/video/nexell/s5pxx18_dp_lvds.c                        | 1 +
 drivers/video/nexell/s5pxx18_dp_mipi.c                        | 2 ++
 drivers/video/nexell/soc/s5pxx18_soc_lvds.h                   | 1 +
 drivers/video/nexell/soc/s5pxx18_soc_mipi.h                   | 1 +
 drivers/video/nexell_display.c                                | 2 ++
 drivers/video/omap3_dss.c                                     | 1 +
 drivers/video/orisetech_otm8009a.c                            | 1 +
 drivers/video/pwm_backlight.c                                 | 1 +
 drivers/video/pxa_lcd.c                                       | 1 +
 drivers/video/raydium-rm68200.c                               | 1 +
 drivers/video/rockchip/rk3288_vop.c                           | 1 +
 drivers/video/rockchip/rk3399_vop.c                           | 1 +
 drivers/video/rockchip/rk_edp.c                               | 2 ++
 drivers/video/rockchip/rk_hdmi.c                              | 1 +
 drivers/video/rockchip/rk_hdmi.h                              | 1 +
 drivers/video/rockchip/rk_lvds.c                              | 2 ++
 drivers/video/rockchip/rk_mipi.c                              | 1 +
 drivers/video/rockchip/rk_mipi.h                              | 1 +
 drivers/video/rockchip/rk_vop.c                               | 1 +
 drivers/video/rockchip/rk_vop.h                               | 1 +
 drivers/video/sandbox_osd.c                                   | 1 +
 drivers/video/scf0403_lcd.c                                   | 1 +
 drivers/video/ssd2828.c                                       | 1 +
 drivers/video/stb_truetype.h                                  | 1 +
 drivers/video/stm32/stm32_dsi.c                               | 2 ++
 drivers/video/stm32/stm32_ltdc.c                              | 2 ++
 drivers/video/sunxi/lcdc.c                                    | 1 +
 drivers/video/sunxi/sunxi_de2.c                               | 1 +
 drivers/video/sunxi/sunxi_display.c                           | 2 ++
 drivers/video/sunxi/sunxi_dw_hdmi.c                           | 1 +
 drivers/video/sunxi/sunxi_lcd.c                               | 1 +
 drivers/video/tda19988.c                                      | 1 +
 drivers/video/tegra.c                                         | 1 +
 drivers/video/tegra124/display.c                              | 1 +
 drivers/video/tegra124/displayport.h                          | 1 +
 drivers/video/tegra124/dp.c                                   | 2 ++
 drivers/video/tegra124/sor.c                                  | 2 ++
 drivers/video/tegra124/sor.h                                  | 1 +
 drivers/video/vesa.c                                          | 1 +
 drivers/video/vidconsole-uclass.c                             | 1 +
 drivers/video/video-uclass.c                                  | 2 ++
 drivers/video/video_bmp.c                                     | 3 +++
 drivers/video/video_osd-uclass.c                              | 1 +
 drivers/virtio/virtio-uclass.c                                | 1 +
 drivers/virtio/virtio_blk.c                                   | 1 +
 drivers/virtio/virtio_blk.h                                   | 1 +
 drivers/virtio/virtio_mmio.c                                  | 2 ++
 drivers/virtio/virtio_mmio.h                                  | 2 ++
 drivers/virtio/virtio_net.c                                   | 2 ++
 drivers/virtio/virtio_net.h                                   | 1 +
 drivers/virtio/virtio_pci.h                                   | 1 +
 drivers/virtio/virtio_pci_legacy.c                            | 2 ++
 drivers/virtio/virtio_pci_modern.c                            | 2 ++
 drivers/virtio/virtio_ring.c                                  | 1 +
 drivers/virtio/virtio_rng.c                                   | 1 +
 drivers/virtio/virtio_sandbox.c                               | 1 +
 drivers/w1-eeprom/ds24xxx.c                                   | 1 +
 drivers/w1-eeprom/ds2502.c                                    | 1 +
 drivers/w1-eeprom/eep_sandbox.c                               | 1 +
 drivers/w1-eeprom/w1-eeprom-uclass.c                          | 1 +
 drivers/w1/mxc_w1.c                                           | 1 +
 drivers/w1/w1-gpio.c                                          | 1 +
 drivers/w1/w1-uclass.c                                        | 1 +
 drivers/watchdog/armada-37xx-wdt.c                            | 2 ++
 drivers/watchdog/ast_wdt.c                                    | 1 +
 drivers/watchdog/at91sam9_wdt.c                               | 1 +
 drivers/watchdog/bcm6345_wdt.c                                | 2 ++
 drivers/watchdog/cdns_wdt.c                                   | 2 ++
 drivers/watchdog/cortina_wdt.c                                | 2 ++
 drivers/watchdog/designware_wdt.c                             | 2 ++
 drivers/watchdog/imx_watchdog.c                               | 3 +++
 drivers/watchdog/mpc8xx_wdt.c                                 | 2 ++
 drivers/watchdog/mt7621_wdt.c                                 | 2 ++
 drivers/watchdog/mtk_wdt.c                                    | 2 ++
 drivers/watchdog/omap_wdt.c                                   | 1 +
 drivers/watchdog/orion_wdt.c                                  | 3 +++
 drivers/watchdog/sandbox_wdt.c                                | 1 +
 drivers/watchdog/sbsa_gwdt.c                                  | 2 ++
 drivers/watchdog/sp805_wdt.c                                  | 2 ++
 drivers/watchdog/stm32mp_wdt.c                                | 1 +
 drivers/watchdog/tangier_wdt.c                                | 1 +
 drivers/watchdog/ulp_wdog.c                                   | 1 +
 drivers/watchdog/wdt-uclass.c                                 | 1 +
 drivers/watchdog/xilinx_tb_wdt.c                              | 2 ++
 drivers/watchdog/xilinx_wwdt.c                                | 1 +
 env/common.c                                                  | 1 +
 env/eeprom.c                                                  | 1 +
 env/env.c                                                     | 3 +++
 env/ext4.c                                                    | 2 ++
 env/fat.c                                                     | 2 ++
 env/flags.c                                                   | 1 +
 env/flash.c                                                   | 1 +
 env/mmc.c                                                     | 2 ++
 env/nand.c                                                    | 1 +
 env/nowhere.c                                                 | 1 +
 env/nvram.c                                                   | 1 +
 env/onenand.c                                                 | 1 +
 env/remote.c                                                  | 1 +
 env/sata.c                                                    | 2 ++
 env/sf.c                                                      | 2 ++
 examples/api/glue.c                                           | 1 +
 examples/api/glue.h                                           | 1 +
 examples/standalone/atmel_df_pow2.c                           | 1 +
 examples/standalone/sched.c                                   | 1 +
 fs/btrfs/btrfs.c                                              | 1 +
 fs/btrfs/btrfs.h                                              | 1 +
 fs/btrfs/btrfs_tree.h                                         | 1 +
 fs/btrfs/ctree.h                                              | 1 +
 fs/btrfs/subvolume.c                                          | 1 +
 fs/btrfs/super.c                                              | 1 +
 fs/cbfs/cbfs.c                                                | 1 +
 fs/cramfs/cramfs.c                                            | 1 +
 fs/ext4/dev.c                                                 | 1 +
 fs/ext4/ext4_common.c                                         | 1 +
 fs/ext4/ext4_common.h                                         | 1 +
 fs/ext4/ext4_journal.c                                        | 1 +
 fs/ext4/ext4_journal.h                                        | 1 +
 fs/ext4/ext4_write.c                                          | 2 ++
 fs/ext4/ext4fs.c                                              | 1 +
 fs/fat/fat.c                                                  | 1 +
 fs/fat/fat_write.c                                            | 1 +
 fs/fs.c                                                       | 2 ++
 fs/fs_internal.c                                              | 1 +
 fs/jffs2/compr_lzo.c                                          | 1 +
 fs/jffs2/compr_rtime.c                                        | 1 +
 fs/jffs2/compr_rubin.c                                        | 1 +
 fs/jffs2/jffs2_1pass.c                                        | 1 +
 fs/jffs2/jffs2_private.h                                      | 1 +
 fs/jffs2/summary.h                                            | 1 +
 fs/reiserfs/mode_string.c                                     | 1 +
 fs/reiserfs/reiserfs.c                                        | 1 +
 fs/reiserfs/reiserfs_private.h                                | 1 +
 fs/sandbox/sandboxfs.c                                        | 1 +
 fs/ubifs/debug.c                                              | 1 +
 fs/ubifs/debug.h                                              | 1 +
 fs/ubifs/io.c                                                 | 1 +
 fs/ubifs/key.h                                                | 1 +
 fs/ubifs/lprops.c                                             | 1 +
 fs/ubifs/lpt_commit.c                                         | 1 +
 fs/ubifs/misc.h                                               | 1 +
 fs/ubifs/orphan.c                                             | 1 +
 fs/ubifs/recovery.c                                           | 1 +
 fs/ubifs/replay.c                                             | 1 +
 fs/ubifs/scan.c                                               | 1 +
 fs/ubifs/super.c                                              | 1 +
 fs/ubifs/tnc.c                                                | 1 +
 fs/ubifs/tnc_misc.c                                           | 1 +
 fs/ubifs/ubifs-media.h                                        | 2 ++
 fs/ubifs/ubifs.c                                              | 1 +
 fs/ubifs/ubifs.h                                              | 1 +
 fs/yaffs2/yaffs_uboot_glue.c                                  | 1 +
 fs/yaffs2/yaffsfs.c                                           | 1 +
 fs/yaffs2/ydirectenv.h                                        | 1 +
 fs/zfs/zfs.c                                                  | 1 +
 fs/zfs/zfs_fletcher.c                                         | 1 +
 fs/zfs/zfs_lzjb.c                                             | 1 +
 fs/zfs/zfs_sha256.c                                           | 1 +
 include/ACEX1K.h                                              | 1 +
 include/MCD_dma.h                                             | 3 +++
 include/acpi/acpi_device.h                                    | 1 +
 include/acpi/acpi_s3.h                                        | 1 +
 include/acpi/acpi_table.h                                     | 2 ++
 include/ahci.h                                                | 1 +
 include/ali512x.h                                             | 1 +
 include/altera.h                                              | 1 +
 include/android_bootloader_message.h                          | 1 +
 include/api_public.h                                          | 1 +
 include/asm-generic/global_data.h                             | 1 +
 include/asm-generic/gpio.h                                    | 1 +
 include/asm-generic/int-ll64.h                                | 1 +
 include/asm-generic/io.h                                      | 1 +
 include/ata.h                                                 | 1 +
 include/atf_common.h                                          | 1 +
 include/atmel_hlcdc.h                                         | 1 +
 include/atmel_lcd.h                                           | 3 +++
 include/atmel_mci.h                                           | 1 +
 include/atsha204a-i2c.h                                       | 1 +
 include/audio_codec.h                                         | 1 +
 include/autoboot.h                                            | 2 ++
 include/avb_verify.h                                          | 1 +
 include/axi.h                                                 | 1 +
 include/binman.h                                              | 1 +
 include/blk.h                                                 | 1 +
 include/bloblist.h                                            | 1 +
 include/board.h                                               | 1 +
 include/bootcount.h                                           | 1 +
 include/bootm.h                                               | 1 +
 include/bootstage.h                                           | 1 +
 include/broadcom/chimp.h                                      | 1 +
 include/btrfs.h                                               | 1 +
 include/bus_vcxk.h                                            | 1 +
 include/cache.h                                               | 2 ++
 include/capitalization.h                                      | 1 +
 include/cavium/atf.h                                          | 1 +
 include/cbfs.h                                                | 1 +
 include/cli.h                                                 | 1 +
 include/clk-uclass.h                                          | 1 +
 include/command.h                                             | 1 +
 include/common.h                                              | 1 -
 include/cpsw.h                                                | 1 +
 include/cpu.h                                                 | 1 +
 include/cramfs/cramfs_fs.h                                    | 1 +
 include/cros_ec.h                                             | 1 +
 include/crypto/pkcs7.h                                        | 1 +
 include/crypto/pkcs7_parser.h                                 | 1 +
 include/crypto/x509_parser.h                                  | 1 +
 include/ddr_spd.h                                             | 1 +
 include/dfu.h                                                 | 1 +
 include/display.h                                             | 1 +
 include/display_options.h                                     | 1 +
 include/dm/device-internal.h                                  | 1 +
 include/dm/device.h                                           | 1 +
 include/dm/devres.h                                           | 1 +
 include/dm/of.h                                               | 1 +
 include/dm/of_access.h                                        | 1 +
 include/dm/of_addr.h                                          | 1 +
 include/dm/of_extra.h                                         | 1 +
 include/dm/ofnode.h                                           | 1 +
 include/dm/pci.h                                              | 1 +
 include/dm/pinctrl.h                                          | 1 +
 include/dm/platdata.h                                         | 1 +
 include/dm/platform_data/fsl_espi.h                           | 1 +
 include/dm/platform_data/net_ethoc.h                          | 1 +
 include/dm/platform_data/spi_coldfire.h                       | 1 +
 include/dm/platform_data/spi_davinci.h                        | 1 +
 include/dm/read.h                                             | 1 +
 include/dm/root.h                                             | 1 +
 include/dm/test.h                                             | 1 +
 include/dm/uclass.h                                           | 1 +
 include/dm9000.h                                              | 1 +
 include/dma-uclass.h                                          | 1 +
 include/dw_hdmi.h                                             | 1 +
 include/dwc3-uboot.h                                          | 1 +
 include/dwmmc.h                                               | 1 +
 include/ec_commands.h                                         | 2 ++
 include/edid.h                                                | 1 +
 include/eeprom.h                                              | 4 +++-
 include/eeprom_layout.h                                       | 1 +
 include/efi_api.h                                             | 2 ++
 include/efi_loader.h                                          | 2 ++
 include/efi_selftest.h                                        | 1 +
 include/efi_variable.h                                        | 1 +
 include/env_default.h                                         | 1 +
 include/env_internal.h                                        | 1 +
 include/ethsw.h                                               | 1 +
 include/exports.h                                             | 1 +
 include/ext4fs.h                                              | 1 +
 include/ext_common.h                                          | 1 +
 include/exynos_lcd.h                                          | 1 +
 include/fastboot-internal.h                                   | 1 +
 include/fastboot.h                                            | 1 +
 include/fat.h                                                 | 1 +
 include/fb_mmc.h                                              | 1 +
 include/fb_nand.h                                             | 1 +
 include/fdt_support.h                                         | 1 +
 include/fdtdec.h                                              | 1 +
 include/fis.h                                                 | 1 +
 include/flash.h                                               | 1 +
 include/fs.h                                                  | 1 +
 include/fs_loader.h                                           | 1 +
 include/fsl-mc/fsl_dpaa_fd.h                                  | 1 +
 include/fsl-mc/fsl_dpbp.h                                     | 1 +
 include/fsl-mc/fsl_dpio.h                                     | 1 +
 include/fsl-mc/fsl_dpmac.h                                    | 1 +
 include/fsl-mc/fsl_dpmng.h                                    | 1 +
 include/fsl-mc/fsl_dpni.h                                     | 1 +
 include/fsl-mc/fsl_dprc.h                                     | 1 +
 include/fsl-mc/fsl_dpsparser.h                                | 1 +
 include/fsl-mc/fsl_mc.h                                       | 2 ++
 include/fsl-mc/fsl_mc_cmd.h                                   | 2 ++
 include/fsl-mc/fsl_mc_sys.h                                   | 1 +
 include/fsl-mc/fsl_qbman_base.h                               | 1 +
 include/fsl-mc/fsl_qbman_portal.h                             | 1 +
 include/fsl-mc/ldpaa_wriop.h                                  | 1 +
 include/fsl_csu.h                                             | 1 +
 include/fsl_ddr.h                                             | 1 +
 include/fsl_ddr_sdram.h                                       | 1 +
 include/fsl_devdis.h                                          | 1 +
 include/fsl_diu_fb.h                                          | 1 +
 include/fsl_dspi.h                                            | 1 +
 include/fsl_errata.h                                          | 1 +
 include/fsl_esdhc.h                                           | 1 +
 include/fsl_esdhc_imx.h                                       | 1 +
 include/fsl_ifc.h                                             | 1 +
 include/fsl_immap.h                                           | 1 +
 include/fsl_lpuart.h                                          | 1 +
 include/fsl_mdio.h                                            | 2 ++
 include/fsl_memac.h                                           | 1 +
 include/fsl_mmdc.h                                            | 1 +
 include/fsl_qbman.h                                           | 2 ++
 include/fsl_sec.h                                             | 1 +
 include/fsl_sec_mon.h                                         | 1 +
 include/fsl_sfp.h                                             | 1 +
 include/fsl_tgec.h                                            | 1 +
 include/fsl_usb.h                                             | 1 +
 include/fsl_wdog.h                                            | 1 +
 include/fuse.h                                                | 1 +
 include/gdsys_fpga.h                                          | 1 +
 include/gzip.h                                                | 1 +
 include/hash.h                                                | 1 +
 include/hda_codec.h                                           | 1 +
 include/hw_sha.h                                              | 1 +
 include/i2c.h                                                 | 1 +
 include/i2c_eeprom.h                                          | 1 +
 include/i2s.h                                                 | 1 +
 include/ide.h                                                 | 1 +
 include/imx8image.h                                           | 2 ++
 include/imx_lpi2c.h                                           | 1 +
 include/imximage.h                                            | 1 +
 include/input.h                                               | 1 +
 include/ioports.h                                             | 1 +
 include/ipu_pixfmt.h                                          | 1 +
 include/irq.h                                                 | 1 +
 include/jffs2/jffs2_1pass.h                                   | 1 +
 include/jffs2/load_kernel.h                                   | 1 +
 include/k3-avs.h                                              | 2 ++
 include/kendryte/bypass.h                                     | 1 +
 include/kendryte/clk.h                                        | 1 +
 include/kendryte/pll.h                                        | 2 ++
 include/key_matrix.h                                          | 1 +
 include/keys/asymmetric-type.h                                | 1 +
 include/lattice.h                                             | 1 +
 include/lcd.h                                                 | 1 +
 include/lcd_console.h                                         | 1 +
 include/lcdvideo.h                                            | 1 +
 include/libata.h                                              | 1 +
 include/linux/mtd/omap_gpmc.h                                 | 2 ++
 include/linux/soc/ti/cppi5.h                                  | 3 +++
 include/linux/soc/ti/k3-navss-ringacc.h                       | 1 +
 include/linux/soc/ti/k3-sec-proxy.h                           | 1 +
 include/linux/soc/ti/ti-udma.h                                | 1 +
 include/linux/soc/ti/ti_sci_protocol.h                        | 2 ++
 include/lmb.h                                                 | 1 +
 include/lynxkdi.h                                             | 1 +
 include/lz4.h                                                 | 1 +
 include/mailbox.h                                             | 1 +
 include/malloc.h                                              | 1 +
 include/mapmem.h                                              | 1 +
 include/mc9sdz60.h                                            | 1 +
 include/memalign.h                                            | 1 +
 include/miiphy.h                                              | 1 +
 include/mipi_dsi.h                                            | 1 +
 include/mm_communication.h                                    | 1 +
 include/mmc.h                                                 | 1 +
 include/mpc86xx.h                                             | 1 +
 include/mtd/cfi_flash.h                                       | 1 +
 include/mtd/ubi-user.h                                        | 1 +
 include/mv88e6352.h                                           | 1 +
 include/mvebu/comphy.h                                        | 1 +
 include/mvebu_mmc.h                                           | 1 +
 include/mvmfp.h                                               | 1 +
 include/mxs_nand.h                                            | 1 +
 include/nand.h                                                | 1 +
 include/net/ncsi-pkt.h                                        | 1 +
 include/net/pcap.h                                            | 1 +
 include/net/pfe_eth/pfe/cbus/bmu.h                            | 1 +
 include/net/pfe_eth/pfe/cbus/class_csr.h                      | 1 +
 include/net/pfe_eth/pfe/cbus/gpi.h                            | 1 +
 include/net/pfe_eth/pfe/cbus/tmu_csr.h                        | 1 +
 include/net/pfe_eth/pfe/pfe_hw.h                              | 1 +
 include/net/pfe_eth/pfe_driver.h                              | 2 ++
 include/net/tftp.h                                            | 1 +
 include/netdev.h                                              | 1 +
 include/nvme.h                                                | 1 +
 include/opensbi.h                                             | 1 +
 include/p2sb.h                                                | 1 +
 include/palmas.h                                              | 1 +
 include/part.h                                                | 1 +
 include/part_efi.h                                            | 2 ++
 include/pca953x.h                                             | 1 +
 include/pca9698.h                                             | 1 +
 include/pch.h                                                 | 1 +
 include/pci.h                                                 | 1 +
 include/pci_ep.h                                              | 1 +
 include/pci_rom.h                                             | 1 +
 include/pe.h                                                  | 1 +
 include/phy.h                                                 | 1 +
 include/physmem.h                                             | 1 +
 include/post.h                                                | 1 +
 include/power/acpi_pmc.h                                      | 1 +
 include/power/as3722.h                                        | 1 +
 include/power/battery.h                                       | 1 +
 include/power/fg_battery_cell_params.h                        | 1 +
 include/power/hi6553_pmic.h                                   | 1 +
 include/power/max77686_pmic.h                                 | 1 +
 include/power/mc34vr500_pmic.h                                | 1 +
 include/power/pmic.h                                          | 1 +
 include/power/regulator.h                                     | 1 +
 include/power/rk8xx_pmic.h                                    | 1 +
 include/power/s5m8767.h                                       | 1 +
 include/power/tps65217.h                                      | 1 +
 include/power/tps65218.h                                      | 1 +
 include/power/tps65910_pmic.h                                 | 1 +
 include/pwm.h                                                 | 1 +
 include/pxa_lcd.h                                             | 1 +
 include/qfw.h                                                 | 2 ++
 include/ram.h                                                 | 1 +
 include/regmap.h                                              | 1 +
 include/remoteproc.h                                          | 1 +
 include/rng.h                                                 | 2 ++
 include/rtc.h                                                 | 1 +
 include/s_record.h                                            | 1 +
 include/samsung/misc.h                                        | 1 +
 include/sandbox-clk.h                                         | 2 ++
 include/sandboxfs.h                                           | 1 +
 include/sandboxtee.h                                          | 1 +
 include/sata.h                                                | 1 +
 include/sdhci.h                                               | 1 +
 include/search.h                                              | 1 +
 include/serial.h                                              | 1 +
 include/sja1000.h                                             | 1 +
 include/smbios.h                                              | 2 ++
 include/smem.h                                                | 1 +
 include/smsc_lpc47m.h                                         | 1 +
 include/sort.h                                                | 1 +
 include/sound.h                                               | 1 +
 include/spi-mem.h                                             | 1 +
 include/spi.h                                                 | 1 +
 include/spl.h                                                 | 1 +
 include/spl_gpio.h                                            | 1 +
 include/splash.h                                              | 1 +
 include/spmi/spmi.h                                           | 1 +
 include/stm32_rcc.h                                           | 1 +
 include/stratixII.h                                           | 1 +
 include/syscon.h                                              | 1 +
 include/sysreset.h                                            | 1 +
 include/tables_csum.h                                         | 1 +
 include/tca642x.h                                             | 1 +
 include/tee.h                                                 | 1 +
 include/tee/optee.h                                           | 1 +
 include/tegra-kbc.h                                           | 1 +
 include/test/ut.h                                             | 1 +
 include/timer.h                                               | 1 +
 include/tlv_eeprom.h                                          | 1 +
 include/tpm-common.h                                          | 1 +
 include/tpm-v1.h                                              | 2 ++
 include/tpm-v2.h                                              | 1 +
 include/trace.h                                               | 1 +
 include/tsec.h                                                | 2 ++
 include/twl4030.h                                             | 1 +
 include/twl6030.h                                             | 1 +
 include/u-boot/aes.h                                          | 1 +
 include/u-boot/crc.h                                          | 1 +
 include/u-boot/rsa-checksum.h                                 | 1 +
 include/u-boot/rsa-mod-exp.h                                  | 1 +
 include/u-boot/rsa.h                                          | 1 +
 include/u-boot/sha1.h                                         | 1 +
 include/u-boot/sha256.h                                       | 1 +
 include/u-boot/sha512.h                                       | 1 +
 include/u-boot/zlib.h                                         | 1 +
 include/ubifs_uboot.h                                         | 1 +
 include/ubispl.h                                              | 1 +
 include/uboot_aes.h                                           | 1 +
 include/usb.h                                                 | 1 +
 include/usb/designware_udc.h                                  | 1 +
 include/usb/dwc2_udc.h                                        | 1 +
 include/usb/ehci-ci.h                                         | 1 +
 include/usb/fotg210.h                                         | 1 +
 include/usb/fusbh200.h                                        | 1 +
 include/usb/ulpi.h                                            | 1 +
 include/usb/xhci.h                                            | 1 +
 include/usb_ether.h                                           | 1 +
 include/usb_mass_storage.h                                    | 1 +
 include/usbdevice.h                                           | 1 +
 include/uuid.h                                                | 1 +
 include/vbe.h                                                 | 2 ++
 include/video.h                                               | 1 +
 include/video_bridge.h                                        | 1 +
 include/video_console.h                                       | 1 +
 include/video_osd.h                                           | 1 +
 include/virtio.h                                              | 1 +
 include/virtio_ring.h                                         | 1 +
 include/vxworks.h                                             | 1 +
 include/w1-eeprom.h                                           | 1 +
 include/w1.h                                                  | 1 +
 include/wait_bit.h                                            | 1 +
 include/wdt.h                                                 | 1 +
 include/winbond_w83627.h                                      | 1 +
 include/xilinx.h                                              | 1 +
 include/zfs/dmu_objset.h                                      | 1 +
 include/zfs/dnode.h                                           | 1 +
 include/zfs/dsl_dataset.h                                     | 1 +
 include/zfs/dsl_dir.h                                         | 1 +
 include/zfs/sa_impl.h                                         | 1 +
 include/zfs/spa.h                                             | 1 +
 include/zfs/uberblock_impl.h                                  | 1 +
 include/zfs/vdev_impl.h                                       | 1 +
 include/zfs/zap_impl.h                                        | 1 +
 include/zfs/zap_leaf.h                                        | 1 +
 include/zfs/zfs.h                                             | 1 +
 include/zfs/zfs_acl.h                                         | 1 +
 include/zfs/zfs_znode.h                                       | 1 +
 include/zfs/zil.h                                             | 1 +
 include/zfs/zio.h                                             | 1 +
 include/zfs/zio_checksum.h                                    | 1 +
 include/zfs_common.h                                          | 1 +
 include/zynq_bootimg.h                                        | 1 +
 include/zynqmp_firmware.h                                     | 1 +
 include/zynqmp_tap_delay.h                                    | 1 +
 include/zynqpl.h                                              | 1 +
 lib/acpi/acpi_device.c                                        | 2 ++
 lib/acpi/acpi_dp.c                                            | 1 +
 lib/acpi/acpi_table.c                                         | 1 +
 lib/acpi/acpigen.c                                            | 1 +
 lib/addr_map.c                                                | 1 +
 lib/aes.c                                                     | 1 +
 lib/aes/aes-decrypt.c                                         | 1 +
 lib/asn1_decoder.c                                            | 1 +
 lib/at91/at91.c                                               | 1 +
 lib/bch.c                                                     | 1 +
 lib/charset.c                                                 | 1 +
 lib/crc16.c                                                   | 1 +
 lib/crc32.c                                                   | 1 +
 lib/crc32c.c                                                  | 1 +
 lib/crypto/asymmetric_type.c                                  | 2 ++
 lib/crypto/pkcs7_parser.c                                     | 2 ++
 lib/crypto/pkcs7_verify.c                                     | 1 +
 lib/crypto/public_key.c                                       | 1 +
 lib/crypto/rsa_helper.c                                       | 1 +
 lib/crypto/x509_cert_parser.c                                 | 1 +
 lib/crypto/x509_public_key.c                                  | 2 ++
 lib/dhry/cmd_dhry.c                                           | 1 +
 lib/display_options.c                                         | 2 ++
 lib/div64.c                                                   | 1 +
 lib/efi/efi_info.c                                            | 1 +
 lib/efi/efi_stub.c                                            | 2 ++
 lib/efi_driver/efi_block_device.c                             | 1 +
 lib/efi_driver/efi_uclass.c                                   | 1 +
 lib/efi_loader/efi_acpi.c                                     | 1 +
 lib/efi_loader/efi_bootmgr.c                                  | 1 +
 lib/efi_loader/efi_boottime.c                                 | 2 ++
 lib/efi_loader/efi_console.c                                  | 1 +
 lib/efi_loader/efi_device_path.c                              | 2 ++
 lib/efi_loader/efi_device_path_to_text.c                      | 1 +
 lib/efi_loader/efi_device_path_utilities.c                    | 1 +
 lib/efi_loader/efi_disk.c                                     | 2 ++
 lib/efi_loader/efi_file.c                                     | 1 +
 lib/efi_loader/efi_freestanding.c                             | 1 +
 lib/efi_loader/efi_gop.c                                      | 1 +
 lib/efi_loader/efi_hii.c                                      | 1 +
 lib/efi_loader/efi_hii_config.c                               | 1 +
 lib/efi_loader/efi_image_loader.c                             | 3 +++
 lib/efi_loader/efi_load_initrd.c                              | 1 +
 lib/efi_loader/efi_memory.c                                   | 3 +++
 lib/efi_loader/efi_net.c                                      | 2 ++
 lib/efi_loader/efi_rng.c                                      | 2 ++
 lib/efi_loader/efi_root_node.c                                | 1 +
 lib/efi_loader/efi_runtime.c                                  | 3 +++
 lib/efi_loader/efi_setup.c                                    | 1 +
 lib/efi_loader/efi_signature.c                                | 1 +
 lib/efi_loader/efi_smbios.c                                   | 1 +
 lib/efi_loader/efi_unicode_collation.c                        | 1 +
 lib/efi_loader/efi_var_common.c                               | 2 ++
 lib/efi_loader/efi_var_file.c                                 | 1 +
 lib/efi_loader/efi_var_mem.c                                  | 2 ++
 lib/efi_loader/efi_variable.c                                 | 1 +
 lib/efi_loader/efi_variable_tee.c                             | 1 +
 lib/efi_loader/helloworld.c                                   | 1 +
 lib/efi_selftest/efi_selftest.c                               | 1 +
 lib/efi_selftest/efi_selftest_bitblt.c                        | 1 +
 lib/efi_selftest/efi_selftest_block_device.c                  | 1 +
 lib/efi_selftest/efi_selftest_config_table.c                  | 1 +
 lib/efi_selftest/efi_selftest_console.c                       | 1 +
 lib/efi_selftest/efi_selftest_controllers.c                   | 1 +
 lib/efi_selftest/efi_selftest_crc32.c                         | 1 +
 lib/efi_selftest/efi_selftest_devicepath.c                    | 2 ++
 lib/efi_selftest/efi_selftest_event_groups.c                  | 1 +
 lib/efi_selftest/efi_selftest_exception.c                     | 1 +
 lib/efi_selftest/efi_selftest_fdt.c                           | 1 +
 lib/efi_selftest/efi_selftest_gop.c                           | 1 +
 lib/efi_selftest/efi_selftest_hii.c                           | 1 +
 lib/efi_selftest/efi_selftest_hii_data.c                      | 1 +
 lib/efi_selftest/efi_selftest_load_initrd.c                   | 1 +
 lib/efi_selftest/efi_selftest_loadimage.c                     | 2 ++
 lib/efi_selftest/efi_selftest_manageprotocols.c               | 1 +
 lib/efi_selftest/efi_selftest_mem.c                           | 1 +
 lib/efi_selftest/efi_selftest_memory.c                        | 1 +
 lib/efi_selftest/efi_selftest_miniapp_exit.c                  | 1 +
 lib/efi_selftest/efi_selftest_rng.c                           | 1 +
 lib/efi_selftest/efi_selftest_set_virtual_address_map.c       | 1 +
 lib/efi_selftest/efi_selftest_snp.c                           | 2 ++
 lib/efi_selftest/efi_selftest_startimage_exit.c               | 1 +
 lib/efi_selftest/efi_selftest_startimage_return.c             | 1 +
 lib/efi_selftest/efi_selftest_textinputex.c                   | 1 +
 lib/efi_selftest/efi_selftest_textoutput.c                    | 1 +
 lib/efi_selftest/efi_selftest_unaligned.c                     | 1 +
 lib/efi_selftest/efi_selftest_unicode_collation.c             | 1 +
 lib/efi_selftest/efi_selftest_util.c                          | 1 +
 lib/efi_selftest/efi_selftest_variables.c                     | 1 +
 lib/efi_selftest/efi_selftest_variables_runtime.c             | 1 +
 lib/efi_selftest/efi_selftest_watchdog.c                      | 1 +
 lib/elf.c                                                     | 1 +
 lib/fdtdec.c                                                  | 3 +++
 lib/fdtdec_test.c                                             | 1 +
 lib/gunzip.c                                                  | 2 ++
 lib/hashtable.c                                               | 1 +
 lib/hexdump.c                                                 | 2 ++
 lib/image-sparse.c                                            | 1 +
 lib/libavb/avb_sysdeps.h                                      | 1 +
 lib/libavb/avb_sysdeps_posix.c                                | 1 +
 lib/linux_compat.c                                            | 1 +
 lib/linux_string.c                                            | 1 +
 lib/lmb.c                                                     | 2 ++
 lib/lz4.c                                                     | 1 +
 lib/lzma/LzmaDec.c                                            | 1 +
 lib/lzma/LzmaTools.c                                          | 1 +
 lib/lzma/Types.h                                              | 1 +
 lib/lzo/lzo1x_decompress.c                                    | 1 +
 lib/lzo/lzodefs.h                                             | 1 +
 lib/membuff.c                                                 | 2 ++
 lib/net_utils.c                                               | 1 +
 lib/of_live.c                                                 | 2 ++
 lib/oid_registry.c                                            | 1 +
 lib/optee/optee.c                                             | 1 +
 lib/physmem.c                                                 | 2 ++
 lib/rsa/rsa-checksum.c                                        | 1 +
 lib/rsa/rsa-keyprop.c                                         | 1 +
 lib/rsa/rsa-mod-exp.c                                         | 1 +
 lib/rsa/rsa-verify.c                                          | 1 +
 lib/sha1.c                                                    | 1 +
 lib/sha256.c                                                  | 1 +
 lib/sha512.c                                                  | 1 +
 lib/smbios.c                                                  | 1 +
 lib/strto.c                                                   | 1 +
 lib/tables_csum.c                                             | 1 +
 lib/time.c                                                    | 1 +
 lib/tiny-printf.c                                             | 1 +
 lib/tizen/tizen.c                                             | 1 +
 lib/tpm-common.c                                              | 1 +
 lib/tpm-utils.h                                               | 1 +
 lib/tpm-v1.c                                                  | 1 +
 lib/tpm-v2.c                                                  | 1 +
 lib/trace.c                                                   | 1 +
 lib/uuid.c                                                    | 1 +
 lib/vsprintf.c                                                | 1 +
 lib/xxhash.c                                                  | 1 +
 lib/zstd/zstd_opt.h                                           | 1 +
 net/arp.c                                                     | 1 +
 net/arp.h                                                     | 1 +
 net/bootp.c                                                   | 2 ++
 net/bootp.h                                                   | 1 +
 net/cdp.c                                                     | 1 +
 net/cdp.h                                                     | 1 +
 net/dns.c                                                     | 1 +
 net/dns.h                                                     | 1 +
 net/eth-uclass.c                                              | 1 +
 net/eth_common.c                                              | 1 +
 net/eth_internal.h                                            | 1 +
 net/eth_legacy.c                                              | 1 +
 net/fastboot.c                                                | 3 +++
 net/mdio-mux-uclass.c                                         | 1 +
 net/mdio-uclass.c                                             | 1 +
 net/net.c                                                     | 1 +
 net/nfs.c                                                     | 1 +
 net/nfs.h                                                     | 1 +
 net/pcap.c                                                    | 1 +
 net/rarp.c                                                    | 1 +
 net/sntp.c                                                    | 1 +
 net/sntp.h                                                    | 1 +
 net/tftp.c                                                    | 2 ++
 net/wol.c                                                     | 1 +
 net/wol.h                                                     | 1 +
 post/cpu/mpc83xx/ecc.c                                        | 1 +
 post/drivers/flash.c                                          | 1 +
 post/drivers/memory.c                                         | 1 +
 post/drivers/rtc.c                                            | 1 +
 post/lib_powerpc/andi.c                                       | 1 +
 post/lib_powerpc/b.c                                          | 1 +
 post/lib_powerpc/cmp.c                                        | 1 +
 post/lib_powerpc/cmpi.c                                       | 1 +
 post/lib_powerpc/cpu.c                                        | 1 +
 post/lib_powerpc/cr.c                                         | 1 +
 post/lib_powerpc/load.c                                       | 1 +
 post/lib_powerpc/multi.c                                      | 1 +
 post/lib_powerpc/rlwimi.c                                     | 1 +
 post/lib_powerpc/rlwinm.c                                     | 1 +
 post/lib_powerpc/rlwnm.c                                      | 1 +
 post/lib_powerpc/srawi.c                                      | 1 +
 post/lib_powerpc/store.c                                      | 1 +
 post/lib_powerpc/string.c                                     | 1 +
 post/lib_powerpc/three.c                                      | 1 +
 post/lib_powerpc/threei.c                                     | 1 +
 post/lib_powerpc/threex.c                                     | 1 +
 post/lib_powerpc/two.c                                        | 1 +
 post/lib_powerpc/twox.c                                       | 1 +
 post/post.c                                                   | 2 ++
 test/bloblist.c                                               | 1 +
 test/cmd/mem_search.c                                         | 1 +
 test/compression.c                                            | 1 +
 test/dm/acpi.c                                                | 2 ++
 test/dm/acpi.h                                                | 1 +
 test/dm/acpi_dp.c                                             | 1 +
 test/dm/acpigen.c                                             | 1 +
 test/dm/audio.c                                               | 1 +
 test/dm/axi.c                                                 | 1 +
 test/dm/bootcount.c                                           | 1 +
 test/dm/clk.c                                                 | 1 +
 test/dm/core.c                                                | 1 +
 test/dm/devres.c                                              | 1 +
 test/dm/dma.c                                                 | 1 +
 test/dm/dsi_host.c                                            | 1 +
 test/dm/fdtdec.c                                              | 1 +
 test/dm/gpio.c                                                | 1 +
 test/dm/i2c.c                                                 | 1 +
 test/dm/i2s.c                                                 | 1 +
 test/dm/k210_pll.c                                            | 1 +
 test/dm/mailbox.c                                             | 1 +
 test/dm/mdio.c                                                | 1 +
 test/dm/mdio_mux.c                                            | 1 +
 test/dm/misc.c                                                | 1 +
 test/dm/ofnode.c                                              | 1 +
 test/dm/osd.c                                                 | 1 +
 test/dm/panel.c                                               | 1 +
 test/dm/pch.c                                                 | 1 +
 test/dm/pci.c                                                 | 1 +
 test/dm/pmic.c                                                | 1 +
 test/dm/power-domain.c                                        | 1 +
 test/dm/regmap.c                                              | 1 +
 test/dm/regulator.c                                           | 1 +
 test/dm/remoteproc.c                                          | 1 +
 test/dm/reset.c                                               | 1 +
 test/dm/rtc.c                                                 | 1 +
 test/dm/serial.c                                              | 1 +
 test/dm/sf.c                                                  | 1 +
 test/dm/smem.c                                                | 1 +
 test/dm/syscon-reset.c                                        | 1 +
 test/dm/tee.c                                                 | 1 +
 test/dm/test-fdt.c                                            | 1 +
 test/dm/video.c                                               | 1 +
 test/dm/virtio.c                                              | 1 +
 test/dm/wdt.c                                                 | 1 +
 test/env/hashtable.c                                          | 1 +
 test/lib/hexdump.c                                            | 1 +
 test/lib/lmb.c                                                | 1 +
 test/lib/string.c                                             | 1 +
 test/lib/test_aes.c                                           | 1 +
 test/optee/cmd_ut_optee.c                                     | 1 +
 test/overlay/cmd_ut_overlay.c                                 | 1 +
 test/print_ut.c                                               | 1 +
 test/stdint/int-types.c                                       | 1 +
 test/str_ut.c                                                 | 2 ++
 test/time_ut.c                                                | 1 +
 test/unicode_ut.c                                             | 1 +
 test/ut.c                                                     | 1 +
 4662 files changed, 5730 insertions(+), 5 deletions(-)

diff --git a/api/api_display.c b/api/api_display.c
index 4f2cdd7330e..499a75d9e04 100644
--- a/api/api_display.c
+++ b/api/api_display.c
@@ -8,6 +8,7 @@
 #include <lcd.h>
 #include <log.h>
 #include <video_font.h> /* Get font width and height */
+#include <linux/types.h>
 
 /* lcd.h needs BMP_LOGO_HEIGHT to calculate CONSOLE_ROWS */
 #if defined(CONFIG_LCD_LOGO) && !defined(CONFIG_LCD_INFO_BELOW_LOGO)
diff --git a/api/api_private.h b/api/api_private.h
index 07fd50ad3a3..11499e45d33 100644
--- a/api/api_private.h
+++ b/api/api_private.h
@@ -8,6 +8,7 @@
 #ifndef _API_PRIVATE_H_
 #define _API_PRIVATE_H_
 
+#include <linux/types.h>
 void	api_init(void);
 void	platform_set_mr(struct sys_info *, unsigned long, unsigned long, int);
 int	platform_sys_info(struct sys_info *);
diff --git a/api/api_storage.c b/api/api_storage.c
index d4474d7d55c..49a1637d4d3 100644
--- a/api/api_storage.c
+++ b/api/api_storage.c
@@ -10,6 +10,7 @@
 #include <api_public.h>
 #include <part.h>
 #include <stdio.h>
+#include <linux/types.h>
 
 #if defined(CONFIG_CMD_USB) && defined(CONFIG_USB_STORAGE)
 #include <usb.h>
diff --git a/arch/arc/include/asm/sections.h b/arch/arc/include/asm/sections.h
index 1c9c9db1386..62cbe9b7904 100644
--- a/arch/arc/include/asm/sections.h
+++ b/arch/arc/include/asm/sections.h
@@ -7,6 +7,7 @@
 #define __ASM_ARC_SECTIONS_H
 
 #include <asm-generic/sections.h>
+#include <linux/types.h>
 
 extern ulong __ivt_start;
 extern ulong __ivt_end;
diff --git a/arch/arc/include/asm/u-boot-arc.h b/arch/arc/include/asm/u-boot-arc.h
index dd2c0949c68..17e55876996 100644
--- a/arch/arc/include/asm/u-boot-arc.h
+++ b/arch/arc/include/asm/u-boot-arc.h
@@ -6,6 +6,7 @@
 #ifndef __ASM_ARC_U_BOOT_ARC_H__
 #define __ASM_ARC_U_BOOT_ARC_H__
 
+#include <linux/types.h>
 int arch_early_init_r(void);
 
 void	board_init_f_r_trampoline(ulong) __attribute__ ((noreturn));
diff --git a/arch/arc/lib/bootm.c b/arch/arc/lib/bootm.c
index cf2f269882f..4289b6e134f 100644
--- a/arch/arc/lib/bootm.c
+++ b/arch/arc/lib/bootm.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <bootstage.h>
+#include <compiler.h>
 #include <env.h>
 #include <image.h>
 #include <irq_func.h>
@@ -14,6 +15,7 @@
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arc/lib/cache.c b/arch/arc/lib/cache.c
index 1bdffd052e4..fa58e5216ab 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 <stdbool.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
diff --git a/arch/arc/lib/cpu.c b/arch/arc/lib/cpu.c
index b8d9ab5ab6d..b2ebe0ff455 100644
--- a/arch/arc/lib/cpu.c
+++ b/arch/arc/lib/cpu.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <init.h>
 #include <malloc.h>
 #include <stdbool.h>
diff --git a/arch/arc/lib/relocate.c b/arch/arc/lib/relocate.c
index a1663c1eb39..f55ff930a87 100644
--- a/arch/arc/lib/relocate.c
+++ b/arch/arc/lib/relocate.c
@@ -9,6 +9,7 @@
 #include <asm-generic/sections.h>
 #include <asm/global_data.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 extern ulong __image_copy_start;
 extern ulong __ivt_start;
diff --git a/arch/arc/lib/reset.c b/arch/arc/lib/reset.c
index 4869fa936bf..13fa8849ac8 100644
--- a/arch/arc/lib/reset.c
+++ b/arch/arc/lib/reset.c
@@ -5,8 +5,10 @@
 
 #include <command.h>
 #include <common.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <stdio.h>
+#include <linux/types.h>
 
 __weak void reset_cpu(ulong addr)
 {
diff --git a/arch/arm/cpu/arm1136/mx31/generic.c b/arch/arm/cpu/arm1136/mx31/generic.c
index c6814a82d76..095f2dad226 100644
--- a/arch/arm/cpu/arm1136/mx31/generic.c
+++ b/arch/arm/cpu/arm1136/mx31/generic.c
@@ -12,6 +12,7 @@
 #include <asm/arch/clock.h>
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 
 static u32 mx31_decode_pll(u32 reg, u32 infreq)
diff --git a/arch/arm/cpu/arm1136/mx35/generic.c b/arch/arm/cpu/arm1136/mx35/generic.c
index a001dee838d..160787d8af3 100644
--- a/arch/arm/cpu/arm1136/mx35/generic.c
+++ b/arch/arm/cpu/arm1136/mx35/generic.c
@@ -15,6 +15,7 @@
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <asm/arch/imx-regs.h>
diff --git a/arch/arm/cpu/arm720t/interrupts.c b/arch/arm/cpu/arm720t/interrupts.c
index f0fc58deadb..ed5313ce469 100644
--- a/arch/arm/cpu/arm720t/interrupts.c
+++ b/arch/arm/cpu/arm720t/interrupts.c
@@ -10,6 +10,7 @@
  */
 
 #include <common.h>
+#include <linux/types.h>
 
 #if defined(CONFIG_ARCH_TEGRA)
 static ulong timestamp;
diff --git a/arch/arm/cpu/arm920t/ep93xx/cpu.c b/arch/arm/cpu/arm920t/ep93xx/cpu.c
index c9ea4e46a87..a53d4c6d1f3 100644
--- a/arch/arm/cpu/arm920t/ep93xx/cpu.c
+++ b/arch/arm/cpu/arm920t/ep93xx/cpu.c
@@ -12,6 +12,7 @@
 #include <cpu_func.h>
 #include <asm/arch/ep93xx.h>
 #include <asm/io.h>
+#include <linux/types.h>
 
 /* We reset the CPU by generating a 1-->0 transition on DeviceCfg bit 31. */
 extern void reset_cpu(ulong addr)
diff --git a/arch/arm/cpu/arm920t/ep93xx/led.c b/arch/arm/cpu/arm920t/ep93xx/led.c
index 862663acbab..6eadb157e6e 100644
--- a/arch/arm/cpu/arm920t/ep93xx/led.c
+++ b/arch/arm/cpu/arm920t/ep93xx/led.c
@@ -7,6 +7,7 @@
 #include <asm/arch/ep93xx.h>
 #include <config.h>
 #include <status_led.h>
+#include <linux/types.h>
 
 static uint8_t saved_state[2] = {CONFIG_LED_STATUS_OFF, CONFIG_LED_STATUS_OFF};
 static uint32_t gpio_pin[2] = {1 << CONFIG_LED_STATUS_GREEN,
diff --git a/arch/arm/cpu/arm920t/ep93xx/speed.c b/arch/arm/cpu/arm920t/ep93xx/speed.c
index 51e9dda0550..69832d7138a 100644
--- a/arch/arm/cpu/arm920t/ep93xx/speed.c
+++ b/arch/arm/cpu/arm920t/ep93xx/speed.c
@@ -9,6 +9,7 @@
 #include <asm/arch/ep93xx.h>
 #include <asm/io.h>
 #include <div64.h>
+#include <linux/types.h>
 
 /*
  * CONFIG_SYS_CLK_FREQ should be defined as the input frequency of the PLL.
diff --git a/arch/arm/cpu/arm926ejs/armada100/cpu.c b/arch/arm/cpu/arm926ejs/armada100/cpu.c
index 5c178ae6170..6ef6a6919e3 100644
--- a/arch/arm/cpu/arm926ejs/armada100/cpu.c
+++ b/arch/arm/cpu/arm926ejs/armada100/cpu.c
@@ -12,6 +12,7 @@
 #include <stdio.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/armada100.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 
 #define UARTCLK14745KHZ	(APBC_APBCLK | APBC_FNCLK | APBC_FNCLKSEL(1))
diff --git a/arch/arm/cpu/arm926ejs/armada100/dram.c b/arch/arm/cpu/arm926ejs/armada100/dram.c
index 56bda678d67..bdd75b6d547 100644
--- a/arch/arm/cpu/arm926ejs/armada100/dram.c
+++ b/arch/arm/cpu/arm926ejs/armada100/dram.c
@@ -12,6 +12,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/armada100.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/cpu/arm926ejs/armada100/timer.c b/arch/arm/cpu/arm926ejs/armada100/timer.c
index ec73393d0fc..54289331a7e 100644
--- a/arch/arm/cpu/arm926ejs/armada100/timer.c
+++ b/arch/arm/cpu/arm926ejs/armada100/timer.c
@@ -14,6 +14,7 @@
 #include <asm/arch/armada100.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 /*
  * Timer registers
diff --git a/arch/arm/cpu/arm926ejs/cache.c b/arch/arm/cpu/arm926ejs/cache.c
index acab9bccc01..67d80774ae4 100644
--- a/arch/arm/cpu/arm926ejs/cache.c
+++ b/arch/arm/cpu/arm926ejs/cache.c
@@ -3,6 +3,7 @@
  * (C) Copyright 2011
  * Ilya Yanok, EmCraft Systems
  */
+#include <compiler.h>
 #include <cpu_func.h>
 #include <asm/cache.h>
 #include <linux/types.h>
diff --git a/arch/arm/cpu/arm926ejs/mx25/generic.c b/arch/arm/cpu/arm926ejs/mx25/generic.c
index 71e143b8a92..f22b37df3ca 100644
--- a/arch/arm/cpu/arm926ejs/mx25/generic.c
+++ b/arch/arm/cpu/arm926ejs/mx25/generic.c
@@ -24,6 +24,7 @@
 #include <asm/arch/clock.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_FSL_ESDHC_IMX
 #include <fsl_esdhc_imx.h>
diff --git a/arch/arm/cpu/arm926ejs/mx25/reset.c b/arch/arm/cpu/arm926ejs/mx25/reset.c
index 38df1c94022..6148adbaa4e 100644
--- a/arch/arm/cpu/arm926ejs/mx25/reset.c
+++ b/arch/arm/cpu/arm926ejs/mx25/reset.c
@@ -19,6 +19,7 @@
 #include <cpu_func.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
+#include <linux/types.h>
 
 /*
  * Reset the cpu by setting up the watchdog timer and let it time out
diff --git a/arch/arm/cpu/arm926ejs/mx27/generic.c b/arch/arm/cpu/arm926ejs/mx27/generic.c
index 376ab2eaeac..7d080b9bdde 100644
--- a/arch/arm/cpu/arm926ejs/mx27/generic.c
+++ b/arch/arm/cpu/arm926ejs/mx27/generic.c
@@ -20,6 +20,7 @@
 #endif
 #include <asm/u-boot.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 /*
  *  get the system pll clock in Hz
diff --git a/arch/arm/cpu/arm926ejs/mx27/reset.c b/arch/arm/cpu/arm926ejs/mx27/reset.c
index 320b0a65e70..bcfb8834210 100644
--- a/arch/arm/cpu/arm926ejs/mx27/reset.c
+++ b/arch/arm/cpu/arm926ejs/mx27/reset.c
@@ -19,6 +19,7 @@
 #include <cpu_func.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
+#include <linux/types.h>
 
 /*
  * Reset the cpu by setting up the watchdog timer and let it time out
diff --git a/arch/arm/cpu/arm926ejs/mx27/timer.c b/arch/arm/cpu/arm926ejs/mx27/timer.c
index 4fd6a805968..d486585f8a4 100644
--- a/arch/arm/cpu/arm926ejs/mx27/timer.c
+++ b/arch/arm/cpu/arm926ejs/mx27/timer.c
@@ -24,6 +24,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/ptrace.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 /* General purpose timers bitfields */
 #define GPTCR_SWR		(1 << 15)	/* Software reset	*/
diff --git a/arch/arm/cpu/arm926ejs/mxs/clock.c b/arch/arm/cpu/arm926ejs/mxs/clock.c
index 4e1cf3a1e32..52208774ce0 100644
--- a/arch/arm/cpu/arm926ejs/mxs/clock.c
+++ b/arch/arm/cpu/arm926ejs/mxs/clock.c
@@ -15,6 +15,7 @@
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
+#include <linux/types.h>
 
 /*
  * The PLL frequency is 480MHz and XTAL frequency is 24MHz
diff --git a/arch/arm/cpu/arm926ejs/mxs/iomux.c b/arch/arm/cpu/arm926ejs/mxs/iomux.c
index 381264b8a18..4c80dd5d36a 100644
--- a/arch/arm/cpu/arm926ejs/mxs/iomux.c
+++ b/arch/arm/cpu/arm926ejs/mxs/iomux.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
diff --git a/arch/arm/cpu/arm926ejs/mxs/mxs.c b/arch/arm/cpu/arm926ejs/mxs/mxs.c
index 84d67228631..1094477aeb3 100644
--- a/arch/arm/cpu/arm926ejs/mxs/mxs.c
+++ b/arch/arm/cpu/arm926ejs/mxs/mxs.c
@@ -11,6 +11,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <hang.h>
 #include <init.h>
@@ -29,6 +30,7 @@
 #include <asm/arch/sys_proto.h>
 #include <linux/compiler.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/cpu/arm926ejs/mxs/mxs_init.h b/arch/arm/cpu/arm926ejs/mxs/mxs_init.h
index 062deb7793f..31836d7d8d1 100644
--- a/arch/arm/cpu/arm926ejs/mxs/mxs_init.h
+++ b/arch/arm/cpu/arm926ejs/mxs/mxs_init.h
@@ -9,6 +9,7 @@
 #ifndef	__M28_INIT_H__
 #define	__M28_INIT_H__
 
+#include <linux/types.h>
 void early_delay(int delay);
 
 void mxs_power_init(void);
diff --git a/arch/arm/cpu/arm926ejs/mxs/spl_boot.c b/arch/arm/cpu/arm926ejs/mxs/spl_boot.c
index 88386dbb20f..3fe7d79b905 100644
--- a/arch/arm/cpu/arm926ejs/mxs/spl_boot.c
+++ b/arch/arm/cpu/arm926ejs/mxs/spl_boot.c
@@ -20,6 +20,7 @@
 #include <linux/compiler.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "mxs_init.h"
 
diff --git a/arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c b/arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c
index 4d2d988c287..ff46c86b620 100644
--- a/arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c
+++ b/arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <config.h>
 #include <init.h>
 #include <log.h>
@@ -15,6 +16,7 @@
 #include <asm/arch/sys_proto.h>
 #include <linux/compiler.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include "mxs_init.h"
 
diff --git a/arch/arm/cpu/arm926ejs/mxs/spl_power_init.c b/arch/arm/cpu/arm926ejs/mxs/spl_power_init.c
index f57e1bb96c8..dcab4c12093 100644
--- a/arch/arm/cpu/arm926ejs/mxs/spl_power_init.c
+++ b/arch/arm/cpu/arm926ejs/mxs/spl_power_init.c
@@ -7,12 +7,14 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <config.h>
 #include <hang.h>
 #include <log.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include "mxs_init.h"
 
diff --git a/arch/arm/cpu/arm926ejs/mxs/timer.c b/arch/arm/cpu/arm926ejs/mxs/timer.c
index 3dff3d768d1..58b1d041585 100644
--- a/arch/arm/cpu/arm926ejs/mxs/timer.c
+++ b/arch/arm/cpu/arm926ejs/mxs/timer.c
@@ -17,6 +17,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 /* Maximum fixed count */
 #if defined(CONFIG_MX23)
diff --git a/arch/arm/cpu/arm926ejs/spear/cpu.c b/arch/arm/cpu/arm926ejs/spear/cpu.c
index 1c5f3af1bda..b82551bc56d 100644
--- a/arch/arm/cpu/arm926ejs/spear/cpu.c
+++ b/arch/arm/cpu/arm926ejs/spear/cpu.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/spr_misc.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
 
diff --git a/arch/arm/cpu/arm926ejs/spear/reset.c b/arch/arm/cpu/arm926ejs/spear/reset.c
index 7c3ba8b2dbd..38dfa023497 100644
--- a/arch/arm/cpu/arm926ejs/spear/reset.c
+++ b/arch/arm/cpu/arm926ejs/spear/reset.c
@@ -11,6 +11,7 @@
 #include <asm/arch/hardware.h>
 #include <asm/arch/spr_syscntl.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 void reset_cpu(ulong ignored)
 {
diff --git a/arch/arm/cpu/arm926ejs/spear/spear600.c b/arch/arm/cpu/arm926ejs/spear/spear600.c
index 2b036215d1c..ca5c770f42a 100644
--- a/arch/arm/cpu/arm926ejs/spear/spear600.c
+++ b/arch/arm/cpu/arm926ejs/spear/spear600.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <asm/arch/spr_misc.h>
 #include <asm/arch/spr_defs.h>
+#include <asm/types.h>
 
 void spear_late_init(void)
 {
diff --git a/arch/arm/cpu/arm926ejs/spear/spl.c b/arch/arm/cpu/arm926ejs/spear/spl.c
index fa4beced986..00670b35559 100644
--- a/arch/arm/cpu/arm926ejs/spear/spl.c
+++ b/arch/arm/cpu/arm926ejs/spear/spl.c
@@ -19,6 +19,7 @@
 #include <asm/arch/spr_syscntl.h>
 #include <asm/u-boot.h>
 #include <linux/mtd/st_smi.h>
+#include <linux/types.h>
 
 /* Reserve some space to store the BootROM's stack pointer during SPL operation.
  * The BSS cannot be used for this purpose because it will be zeroed after
diff --git a/arch/arm/cpu/arm926ejs/spear/spr600_mt47h128m8_3_266_cl5_async.c b/arch/arm/cpu/arm926ejs/spear/spr600_mt47h128m8_3_266_cl5_async.c
index 79ab2a70dc5..9b761c8d1f6 100644
--- a/arch/arm/cpu/arm926ejs/spear/spr600_mt47h128m8_3_266_cl5_async.c
+++ b/arch/arm/cpu/arm926ejs/spear/spr600_mt47h128m8_3_266_cl5_async.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <asm/types.h>
 
 #if (CONFIG_DDR_PLL2)
 
diff --git a/arch/arm/cpu/arm926ejs/spear/spr600_mt47h32m16_333_cl5_psync.c b/arch/arm/cpu/arm926ejs/spear/spr600_mt47h32m16_333_cl5_psync.c
index 121b6360778..2e6bb0c8a69 100644
--- a/arch/arm/cpu/arm926ejs/spear/spr600_mt47h32m16_333_cl5_psync.c
+++ b/arch/arm/cpu/arm926ejs/spear/spr600_mt47h32m16_333_cl5_psync.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <asm/types.h>
 
 #if (CONFIG_DDR_PLL2 || CONFIG_DDR_2HCLK)
 
diff --git a/arch/arm/cpu/arm926ejs/spear/spr600_mt47h32m16_37e_166_cl4_sync.c b/arch/arm/cpu/arm926ejs/spear/spr600_mt47h32m16_37e_166_cl4_sync.c
index 64c8bab9bfa..d0473d0d680 100644
--- a/arch/arm/cpu/arm926ejs/spear/spr600_mt47h32m16_37e_166_cl4_sync.c
+++ b/arch/arm/cpu/arm926ejs/spear/spr600_mt47h32m16_37e_166_cl4_sync.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <asm/types.h>
 
 #if (CONFIG_DDR_HCLK)
 
diff --git a/arch/arm/cpu/arm926ejs/spear/spr600_mt47h64m16_3_333_cl5_psync.c b/arch/arm/cpu/arm926ejs/spear/spr600_mt47h64m16_3_333_cl5_psync.c
index 87654663fcf..0bcedb19758 100644
--- a/arch/arm/cpu/arm926ejs/spear/spr600_mt47h64m16_3_333_cl5_psync.c
+++ b/arch/arm/cpu/arm926ejs/spear/spr600_mt47h64m16_3_333_cl5_psync.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <asm/types.h>
 
 #if (CONFIG_DDR_PLL2 || CONFIG_DDR_2HCLK)
 
diff --git a/arch/arm/cpu/arm926ejs/spear/spr_misc.c b/arch/arm/cpu/arm926ejs/spear/spr_misc.c
index b111d6126b6..378439fdec6 100644
--- a/arch/arm/cpu/arm926ejs/spear/spr_misc.c
+++ b/arch/arm/cpu/arm926ejs/spear/spr_misc.c
@@ -21,6 +21,7 @@
 #include <asm/arch/spr_emi.h>
 #include <asm/arch/spr_defs.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define CPU		0
 #define DDR		1
diff --git a/arch/arm/cpu/arm926ejs/spear/timer.c b/arch/arm/cpu/arm926ejs/spear/timer.c
index b42baa71506..b5b7814d130 100644
--- a/arch/arm/cpu/arm926ejs/spear/timer.c
+++ b/arch/arm/cpu/arm926ejs/spear/timer.c
@@ -14,6 +14,7 @@
 #include <asm/arch/spr_misc.h>
 #include <asm/ptrace.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 #define GPT_RESOLUTION	(CONFIG_SPEAR_HZ_CLOCK / CONFIG_SPEAR_HZ)
 #define READ_TIMER()	(readl(&gpt_regs_p->count) & GPT_FREE_RUNNING)
diff --git a/arch/arm/cpu/arm946es/cpu.c b/arch/arm/cpu/arm946es/cpu.c
index fb0ea5e817f..cb8adf58ece 100644
--- a/arch/arm/cpu/arm946es/cpu.c
+++ b/arch/arm/cpu/arm946es/cpu.c
@@ -18,6 +18,7 @@
 #include <irq_func.h>
 #include <asm/system.h>
 #include <asm/io.h>
+#include <linux/types.h>
 
 static void cache_flush(void);
 
diff --git a/arch/arm/cpu/armv7/arch_timer.c b/arch/arm/cpu/armv7/arch_timer.c
index d96406f7626..774c5ad52c3 100644
--- a/arch/arm/cpu/armv7/arch_timer.c
+++ b/arch/arm/cpu/armv7/arch_timer.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <div64.h>
 #include <bootstage.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/cpu/armv7/bcm235xx/clk-bsc.c b/arch/arm/cpu/armv7/bcm235xx/clk-bsc.c
index c8a8e358f74..40eda46d954 100644
--- a/arch/arm/cpu/armv7/bcm235xx/clk-bsc.c
+++ b/arch/arm/cpu/armv7/bcm235xx/clk-bsc.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <stdio.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <asm/arch/sysmap.h>
 #include <asm/kona-common/clk.h>
diff --git a/arch/arm/cpu/armv7/bcm235xx/clk-core.c b/arch/arm/cpu/armv7/bcm235xx/clk-core.c
index 098c5afb731..059a2464c1b 100644
--- a/arch/arm/cpu/armv7/bcm235xx/clk-core.c
+++ b/arch/arm/cpu/armv7/bcm235xx/clk-core.c
@@ -11,8 +11,10 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <bitfield.h>
diff --git a/arch/arm/cpu/armv7/bcm235xx/clk-core.h b/arch/arm/cpu/armv7/bcm235xx/clk-core.h
index 6dfc4afb006..e654d4a7aec 100644
--- a/arch/arm/cpu/armv7/bcm235xx/clk-core.h
+++ b/arch/arm/cpu/armv7/bcm235xx/clk-core.h
@@ -4,6 +4,7 @@
  */
 
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 #include <linux/stddef.h>
 #include <linux/stringify.h>
diff --git a/arch/arm/cpu/armv7/bcm235xx/clk-sdio.c b/arch/arm/cpu/armv7/bcm235xx/clk-sdio.c
index c21a23c2abe..301e24f359c 100644
--- a/arch/arm/cpu/armv7/bcm235xx/clk-sdio.c
+++ b/arch/arm/cpu/armv7/bcm235xx/clk-sdio.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <stdio.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <asm/arch/sysmap.h>
 #include <asm/kona-common/clk.h>
diff --git a/arch/arm/cpu/armv7/bcm235xx/clk-usb-otg.c b/arch/arm/cpu/armv7/bcm235xx/clk-usb-otg.c
index f065560d2d0..99a45c6f870 100644
--- a/arch/arm/cpu/armv7/bcm235xx/clk-usb-otg.c
+++ b/arch/arm/cpu/armv7/bcm235xx/clk-usb-otg.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <asm/arch/sysmap.h>
 #include "clk-core.h"
diff --git a/arch/arm/cpu/armv7/bcm281xx/clk-bsc.c b/arch/arm/cpu/armv7/bcm281xx/clk-bsc.c
index c8a8e358f74..40eda46d954 100644
--- a/arch/arm/cpu/armv7/bcm281xx/clk-bsc.c
+++ b/arch/arm/cpu/armv7/bcm281xx/clk-bsc.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <stdio.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <asm/arch/sysmap.h>
 #include <asm/kona-common/clk.h>
diff --git a/arch/arm/cpu/armv7/bcm281xx/clk-core.c b/arch/arm/cpu/armv7/bcm281xx/clk-core.c
index 2fb195bf8f9..17530c8b739 100644
--- a/arch/arm/cpu/armv7/bcm281xx/clk-core.c
+++ b/arch/arm/cpu/armv7/bcm281xx/clk-core.c
@@ -11,8 +11,10 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <bitfield.h>
diff --git a/arch/arm/cpu/armv7/bcm281xx/clk-core.h b/arch/arm/cpu/armv7/bcm281xx/clk-core.h
index 74780012e24..1ce30b3e092 100644
--- a/arch/arm/cpu/armv7/bcm281xx/clk-core.h
+++ b/arch/arm/cpu/armv7/bcm281xx/clk-core.h
@@ -4,6 +4,7 @@
  */
 
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 #include <linux/stddef.h>
 #include <linux/stringify.h>
diff --git a/arch/arm/cpu/armv7/bcm281xx/clk-sdio.c b/arch/arm/cpu/armv7/bcm281xx/clk-sdio.c
index c21a23c2abe..301e24f359c 100644
--- a/arch/arm/cpu/armv7/bcm281xx/clk-sdio.c
+++ b/arch/arm/cpu/armv7/bcm281xx/clk-sdio.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <stdio.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <asm/arch/sysmap.h>
 #include <asm/kona-common/clk.h>
diff --git a/arch/arm/cpu/armv7/bcm281xx/clk-usb-otg.c b/arch/arm/cpu/armv7/bcm281xx/clk-usb-otg.c
index f065560d2d0..99a45c6f870 100644
--- a/arch/arm/cpu/armv7/bcm281xx/clk-usb-otg.c
+++ b/arch/arm/cpu/armv7/bcm281xx/clk-usb-otg.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <asm/arch/sysmap.h>
 #include "clk-core.h"
diff --git a/arch/arm/cpu/armv7/bcm281xx/reset.c b/arch/arm/cpu/armv7/bcm281xx/reset.c
index fda5a9527ec..281d2e46eee 100644
--- a/arch/arm/cpu/armv7/bcm281xx/reset.c
+++ b/arch/arm/cpu/armv7/bcm281xx/reset.c
@@ -7,6 +7,7 @@
 #include <cpu_func.h>
 #include <asm/io.h>
 #include <asm/arch/sysmap.h>
+#include <linux/types.h>
 
 #define EN_MASK		0x08000000	/* Enable timer */
 #define SRSTEN_MASK	0x04000000	/* Enable soft reset */
diff --git a/arch/arm/cpu/armv7/bcmcygnus/reset.c b/arch/arm/cpu/armv7/bcmcygnus/reset.c
index 3bfed34533b..023cbd64299 100644
--- a/arch/arm/cpu/armv7/bcmcygnus/reset.c
+++ b/arch/arm/cpu/armv7/bcmcygnus/reset.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <asm/io.h>
+#include <linux/types.h>
 
 #define CRMU_MAIL_BOX1		0x03024028
 #define CRMU_SOFT_RESET_CMD	0xFFFFFFFF
diff --git a/arch/arm/cpu/armv7/bcmnsp/reset.c b/arch/arm/cpu/armv7/bcmnsp/reset.c
index 675f99fe998..547defa92b4 100644
--- a/arch/arm/cpu/armv7/bcmnsp/reset.c
+++ b/arch/arm/cpu/armv7/bcmnsp/reset.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <asm/io.h>
+#include <linux/types.h>
 
 #define CRU_RESET_OFFSET	0x1803F184
 
diff --git a/arch/arm/cpu/armv7/cache_v7.c b/arch/arm/cpu/armv7/cache_v7.c
index 146cf526089..a19aea275db 100644
--- a/arch/arm/cpu/armv7/cache_v7.c
+++ b/arch/arm/cpu/armv7/cache_v7.c
@@ -4,6 +4,7 @@
  * Texas Instruments, <www.ti.com>
  * Aneesh V <aneesh@ti.com>
  */
+#include <compiler.h>
 #include <cpu_func.h>
 #include <asm/cache.h>
 #include <linux/types.h>
diff --git a/arch/arm/cpu/armv7/cp15.c b/arch/arm/cpu/armv7/cp15.c
index 0ac4e7ba8c8..482d1969a96 100644
--- a/arch/arm/cpu/armv7/cp15.c
+++ b/arch/arm/cpu/armv7/cp15.c
@@ -9,9 +9,11 @@
 
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <asm/system.h>
 #include <asm/cache.h>
 #include <asm/armv7.h>
+#include <asm/types.h>
 #include <linux/compiler.h>
 
 void __weak v7_arch_cp15_set_l2aux_ctrl(u32 l2actlr, u32 cpu_midr,
diff --git a/arch/arm/cpu/armv7/cpu.c b/arch/arm/cpu/armv7/cpu.c
index 8d1f91cd439..43b33f1585f 100644
--- a/arch/arm/cpu/armv7/cpu.c
+++ b/arch/arm/cpu/armv7/cpu.c
@@ -16,6 +16,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <irq_func.h>
 #include <asm/system.h>
diff --git a/arch/arm/cpu/armv7/exception_level.c b/arch/arm/cpu/armv7/exception_level.c
index 5845cca9a33..08e558817f6 100644
--- a/arch/arm/cpu/armv7/exception_level.c
+++ b/arch/arm/cpu/armv7/exception_level.c
@@ -16,6 +16,7 @@
 #include <asm/armv7.h>
 #include <asm/secure.h>
 #include <asm/setjmp.h>
+#include <linux/types.h>
 
 /**
  * entry_non_secure() - entry point when switching to non-secure mode
diff --git a/arch/arm/cpu/armv7/iproc-common/armpll.c b/arch/arm/cpu/armv7/iproc-common/armpll.c
index 2ac598cee7b..89a5e37d39b 100644
--- a/arch/arm/cpu/armv7/iproc-common/armpll.c
+++ b/arch/arm/cpu/armv7/iproc-common/armpll.c
@@ -8,6 +8,7 @@
 #include <asm/io.h>
 #include <asm/iproc-common/armpll.h>
 #include <asm/iproc-common/sysmap.h>
+#include <linux/types.h>
 
 #define NELEMS(x)	(sizeof(x) / sizeof(x[0]))
 
diff --git a/arch/arm/cpu/armv7/iproc-common/timer.c b/arch/arm/cpu/armv7/iproc-common/timer.c
index a4255a44c00..057071b5681 100644
--- a/arch/arm/cpu/armv7/iproc-common/timer.c
+++ b/arch/arm/cpu/armv7/iproc-common/timer.c
@@ -11,6 +11,7 @@
 #include <asm/iproc-common/timer.h>
 #include <asm/iproc-common/sysmap.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 static inline uint64_t timer_global_read(void)
 {
diff --git a/arch/arm/cpu/armv7/kona-common/clk-stubs.c b/arch/arm/cpu/armv7/kona-common/clk-stubs.c
index 19aa6c07358..634937d5b21 100644
--- a/arch/arm/cpu/armv7/kona-common/clk-stubs.c
+++ b/arch/arm/cpu/armv7/kona-common/clk-stubs.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <compiler.h>
+#include <asm/types.h>
 
 /*
  * These weak functions are available to kona architectures that don't
diff --git a/arch/arm/cpu/armv7/ls102xa/clock.c b/arch/arm/cpu/armv7/ls102xa/clock.c
index b7c2ec6b5d2..c8206ce7bd8 100644
--- a/arch/arm/cpu/armv7/ls102xa/clock.c
+++ b/arch/arm/cpu/armv7/ls102xa/clock.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <clock_legacy.h>
+#include <compiler.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
@@ -12,6 +13,7 @@
 #include <asm/arch/clock.h>
 #include <fsl_ifc.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/cpu/armv7/ls102xa/cpu.c b/arch/arm/cpu/armv7/ls102xa/cpu.c
index 5e922953c96..4548feca08c 100644
--- a/arch/arm/cpu/armv7/ls102xa/cpu.c
+++ b/arch/arm/cpu/armv7/ls102xa/cpu.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <init.h>
 #include <net.h>
@@ -23,6 +24,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include "fsl_epu.h"
 
diff --git a/arch/arm/cpu/armv7/ls102xa/fdt.c b/arch/arm/cpu/armv7/ls102xa/fdt.c
index aef54ebf3c8..a70bbc1be1a 100644
--- a/arch/arm/cpu/armv7/ls102xa/fdt.c
+++ b/arch/arm/cpu/armv7/ls102xa/fdt.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <clock_legacy.h>
+#include <compiler.h>
 #include <net.h>
 #include <stdio.h>
 #include <vsprintf.h>
@@ -25,6 +26,7 @@
 #include <fsl_sec.h>
 #include <dm.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/cpu/armv7/ls102xa/fsl_epu.c b/arch/arm/cpu/armv7/ls102xa/fsl_epu.c
index e31a4fb6c31..c6c6fb4e411 100644
--- a/arch/arm/cpu/armv7/ls102xa/fsl_epu.c
+++ b/arch/arm/cpu/armv7/ls102xa/fsl_epu.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <asm/io.h>
+#include <asm/types.h>
 
 #include "fsl_epu.h"
 
diff --git a/arch/arm/cpu/armv7/ls102xa/fsl_ls1_serdes.c b/arch/arm/cpu/armv7/ls102xa/fsl_ls1_serdes.c
index 2683b59a2a0..bf789cd6208 100644
--- a/arch/arm/cpu/armv7/ls102xa/fsl_ls1_serdes.c
+++ b/arch/arm/cpu/armv7/ls102xa/fsl_ls1_serdes.c
@@ -4,9 +4,11 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <stdio.h>
 #include <asm/arch/fsl_serdes.h>
 #include <asm/arch/immap_ls102xa.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <asm/io.h>
 #include "fsl_ls1_serdes.h"
diff --git a/arch/arm/cpu/armv7/ls102xa/fsl_ls1_serdes.h b/arch/arm/cpu/armv7/ls102xa/fsl_ls1_serdes.h
index 7382aef8ee3..6500f183c45 100644
--- a/arch/arm/cpu/armv7/ls102xa/fsl_ls1_serdes.h
+++ b/arch/arm/cpu/armv7/ls102xa/fsl_ls1_serdes.h
@@ -6,6 +6,7 @@
 #ifndef __FSL_LS1_SERDES_H
 #define __FSL_LS1_SERDES_H
 
+#include <asm/types.h>
 int is_serdes_prtcl_valid(int serdes, u32 prtcl);
 int serdes_lane_enabled(int lane);
 #endif /* __FSL_LS1_SERDES_H */
diff --git a/arch/arm/cpu/armv7/ls102xa/ls102xa_psci.c b/arch/arm/cpu/armv7/ls102xa/ls102xa_psci.c
index 4a4b3c6f232..e1c417926bb 100644
--- a/arch/arm/cpu/armv7/ls102xa/ls102xa_psci.c
+++ b/arch/arm/cpu/armv7/ls102xa/ls102xa_psci.c
@@ -5,12 +5,14 @@
  * This file implements LS102X platform PSCI SYSTEM-SUSPEND function
  */
 
+#include <compiler.h>
 #include <config.h>
 #include <cpu_func.h>
 #include <asm/io.h>
 #include <asm/psci.h>
 #include <asm/arch/immap_ls102xa.h>
 #include <fsl_immap.h>
+#include <asm/types.h>
 #include "fsl_epu.h"
 
 #define __secure __attribute__((section("._secure.text")))
diff --git a/arch/arm/cpu/armv7/ls102xa/ls102xa_serdes.c b/arch/arm/cpu/armv7/ls102xa/ls102xa_serdes.c
index 3d313b1ad76..c29f7563b33 100644
--- a/arch/arm/cpu/armv7/ls102xa/ls102xa_serdes.c
+++ b/arch/arm/cpu/armv7/ls102xa/ls102xa_serdes.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <asm/arch/fsl_serdes.h>
 #include <asm/arch/immap_ls102xa.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 
 static u8 serdes_cfg_tbl[][SRDS_MAX_LANES] = {
diff --git a/arch/arm/cpu/armv7/ls102xa/soc.c b/arch/arm/cpu/armv7/ls102xa/soc.c
index caba26abcbe..35b627e789c 100644
--- a/arch/arm/cpu/armv7/ls102xa/soc.c
+++ b/arch/arm/cpu/armv7/ls102xa/soc.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <log.h>
 #include <asm/arch/clock.h>
 #include <asm/io.h>
@@ -13,6 +14,7 @@
 #include <asm/arch/ls102xa_stream_id.h>
 #include <fsl_csu.h>
 #include <fsl_ddr_sdram.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/kernel.h>
 
diff --git a/arch/arm/cpu/armv7/ls102xa/spl.c b/arch/arm/cpu/armv7/ls102xa/spl.c
index 308536c3362..03a879a44c6 100644
--- a/arch/arm/cpu/armv7/ls102xa/spl.c
+++ b/arch/arm/cpu/armv7/ls102xa/spl.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <spl.h>
+#include <asm/types.h>
 
 u32 spl_boot_device(void)
 {
diff --git a/arch/arm/cpu/armv7/ls102xa/timer.c b/arch/arm/cpu/armv7/ls102xa/timer.c
index d79bf105f13..02f96ac2ea5 100644
--- a/arch/arm/cpu/armv7/ls102xa/timer.c
+++ b/arch/arm/cpu/armv7/ls102xa/timer.c
@@ -12,6 +12,7 @@
 #include <asm/arch/immap_ls102xa.h>
 #include <asm/arch/clock.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/cpu/armv7/mpu_v7r.c b/arch/arm/cpu/armv7/mpu_v7r.c
index 57ab640e263..eba9d3f86dd 100644
--- a/arch/arm/cpu/armv7/mpu_v7r.c
+++ b/arch/arm/cpu/armv7/mpu_v7r.c
@@ -12,6 +12,7 @@
 #include <asm/armv7.h>
 #include <asm/system.h>
 #include <asm/barriers.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/compiler.h>
 
diff --git a/arch/arm/cpu/armv7/psci-common.c b/arch/arm/cpu/armv7/psci-common.c
index a328b2bc0e8..ce7d339eb20 100644
--- a/arch/arm/cpu/armv7/psci-common.c
+++ b/arch/arm/cpu/armv7/psci-common.c
@@ -22,6 +22,7 @@
 #include <asm/macro.h>
 #include <asm/psci.h>
 #include <asm/secure.h>
+#include <asm/types.h>
 #include <linux/linkage.h>
 
 static u32 psci_target_pc[CONFIG_ARMV7_PSCI_NR_CPUS] __secure_data = { 0 };
diff --git a/arch/arm/cpu/armv7/s5p-common/cpu_info.c b/arch/arm/cpu/armv7/s5p-common/cpu_info.c
index 0a00762ee06..1c5a2745e83 100644
--- a/arch/arm/cpu/armv7/s5p-common/cpu_info.c
+++ b/arch/arm/cpu/armv7/s5p-common/cpu_info.c
@@ -11,6 +11,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clk.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/cpu/armv7/s5p-common/pwm.c b/arch/arm/cpu/armv7/s5p-common/pwm.c
index 67c9208084d..8a48dc11eb1 100644
--- a/arch/arm/cpu/armv7/s5p-common/pwm.c
+++ b/arch/arm/cpu/armv7/s5p-common/pwm.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <asm/arch/pwm.h>
 #include <asm/arch/clk.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 
 int pwm_enable(int pwm_id)
diff --git a/arch/arm/cpu/armv7/s5p-common/sromc.c b/arch/arm/cpu/armv7/s5p-common/sromc.c
index 0fc170936ae..0aed9e947e6 100644
--- a/arch/arm/cpu/armv7/s5p-common/sromc.c
+++ b/arch/arm/cpu/armv7/s5p-common/sromc.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <asm/io.h>
 #include <asm/arch/sromc.h>
+#include <asm/types.h>
 
 /*
  * s5p_config_sromc() - select the proper SROMC Bank and configure the
diff --git a/arch/arm/cpu/armv7/s5p-common/timer.c b/arch/arm/cpu/armv7/s5p-common/timer.c
index 777a119438a..46d45d78c1a 100644
--- a/arch/arm/cpu/armv7/s5p-common/timer.c
+++ b/arch/arm/cpu/armv7/s5p-common/timer.c
@@ -16,6 +16,7 @@
 #include <asm/arch/clk.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 /* Use the old PWM interface for now */
 #undef CONFIG_DM_PWM
diff --git a/arch/arm/cpu/armv7/s5p4418/cpu.c b/arch/arm/cpu/armv7/s5p4418/cpu.c
index 3c71a37a74b..699918d0625 100644
--- a/arch/arm/cpu/armv7/s5p4418/cpu.c
+++ b/arch/arm/cpu/armv7/s5p4418/cpu.c
@@ -17,6 +17,7 @@
 #include <asm/arch/tieoff.h>
 #include <cpu_func.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/cpu/armv7/stv0991/reset.c b/arch/arm/cpu/armv7/stv0991/reset.c
index 1be1dc486d4..58098d296e5 100644
--- a/arch/arm/cpu/armv7/stv0991/reset.c
+++ b/arch/arm/cpu/armv7/stv0991/reset.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <asm/arch/stv0991_wdru.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 void reset_cpu(ulong ignored)
 {
 	puts("System is going to reboot ...\n");
diff --git a/arch/arm/cpu/armv7/stv0991/timer.c b/arch/arm/cpu/armv7/stv0991/timer.c
index 07033acb5c1..aad61d72add 100644
--- a/arch/arm/cpu/armv7/stv0991/timer.c
+++ b/arch/arm/cpu/armv7/stv0991/timer.c
@@ -13,6 +13,7 @@
 #include <asm/arch-stv0991/stv0991_cgu.h>
 #include <asm/arch-stv0991/stv0991_gpt.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 static struct stv0991_cgu_regs *const stv0991_cgu_regs = \
 				(struct stv0991_cgu_regs *) (CGU_BASE_ADDR);
diff --git a/arch/arm/cpu/armv7/sunxi/psci.c b/arch/arm/cpu/armv7/sunxi/psci.c
index 5f21529bf2e..8f6532e344d 100644
--- a/arch/arm/cpu/armv7/sunxi/psci.c
+++ b/arch/arm/cpu/armv7/sunxi/psci.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <stdbool.h>
 #include <asm/cache.h>
+#include <asm/types.h>
 
 #include <asm/arch/cpu.h>
 #include <asm/arch/cpucfg.h>
diff --git a/arch/arm/cpu/armv7/sunxi/timer.c b/arch/arm/cpu/armv7/sunxi/timer.c
index b7585996369..29193cf3ed6 100644
--- a/arch/arm/cpu/armv7/sunxi/timer.c
+++ b/arch/arm/cpu/armv7/sunxi/timer.c
@@ -12,6 +12,7 @@
 #include <asm/io.h>
 #include <asm/arch/timer.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/cpu/armv7/syslib.c b/arch/arm/cpu/armv7/syslib.c
index 7e29636972d..7e0b7b0da98 100644
--- a/arch/arm/cpu/armv7/syslib.c
+++ b/arch/arm/cpu/armv7/syslib.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <asm/io.h>
+#include <asm/types.h>
 
 /************************************************************
  * sdelay() - simple spin loop.  Will be constant time as
diff --git a/arch/arm/cpu/armv7/vf610/generic.c b/arch/arm/cpu/armv7/vf610/generic.c
index 93418ce9a8c..80e22fcd624 100644
--- a/arch/arm/cpu/armv7/vf610/generic.c
+++ b/arch/arm/cpu/armv7/vf610/generic.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <clock_legacy.h>
 #include <command.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <init.h>
 #include <net.h>
@@ -22,6 +23,7 @@
 #ifdef CONFIG_FSL_ESDHC_IMX
 #include <fsl_esdhc_imx.h>
 #endif
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <linux/string.h>
diff --git a/arch/arm/cpu/armv7/vf610/timer.c b/arch/arm/cpu/armv7/vf610/timer.c
index a9c1a8fcebc..1afa86b558c 100644
--- a/arch/arm/cpu/armv7/vf610/timer.c
+++ b/arch/arm/cpu/armv7/vf610/timer.c
@@ -12,6 +12,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/clock.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 static struct pit_reg *cur_pit = (struct pit_reg *)PIT_BASE_ADDR;
 
diff --git a/arch/arm/cpu/armv7/virt-v7.c b/arch/arm/cpu/armv7/virt-v7.c
index cf0954cb9b3..7aadb18cf1b 100644
--- a/arch/arm/cpu/armv7/virt-v7.c
+++ b/arch/arm/cpu/armv7/virt-v7.c
@@ -9,6 +9,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <stdio.h>
 #include <asm/armv7.h>
@@ -18,6 +19,7 @@
 #include <asm/secure.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static unsigned int read_id_pfr1(void)
 {
diff --git a/arch/arm/cpu/armv7m/cache.c b/arch/arm/cpu/armv7m/cache.c
index abed2e36df4..d81c0b12154 100644
--- a/arch/arm/cpu/armv7m/cache.c
+++ b/arch/arm/cpu/armv7m/cache.c
@@ -14,6 +14,7 @@
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 /* Cache maintenance operation registers */
 
diff --git a/arch/arm/cpu/armv7m/cpu.c b/arch/arm/cpu/armv7m/cpu.c
index 1d1c629c44c..ae8504fe5b2 100644
--- a/arch/arm/cpu/armv7m/cpu.c
+++ b/arch/arm/cpu/armv7m/cpu.c
@@ -13,6 +13,7 @@
 #include <asm/io.h>
 #include <asm/armv7m.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 /*
  * This is called right before passing control to
diff --git a/arch/arm/cpu/armv7m/mpu.c b/arch/arm/cpu/armv7m/mpu.c
index 81e7492f1c8..cdd4b7d2518 100644
--- a/arch/arm/cpu/armv7m/mpu.c
+++ b/arch/arm/cpu/armv7m/mpu.c
@@ -8,6 +8,7 @@
 #include <asm/armv7m.h>
 #include <asm/armv7_mpu.h>
 #include <asm/io.h>
+#include <linux/types.h>
 
 #define V7M_MPU_CTRL_ENABLE		BIT(0)
 #define V7M_MPU_CTRL_DISABLE		(0 << 0)
diff --git a/arch/arm/cpu/armv7m/systick-timer.c b/arch/arm/cpu/armv7m/systick-timer.c
index 556eaf8c74a..cc1e13d74d2 100644
--- a/arch/arm/cpu/armv7m/systick-timer.c
+++ b/arch/arm/cpu/armv7m/systick-timer.c
@@ -27,6 +27,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/cpu/armv8/cache_v8.c b/arch/arm/cpu/armv8/cache_v8.c
index 8add6ac333b..b128367e82f 100644
--- a/arch/arm/cpu/armv8/cache_v8.c
+++ b/arch/arm/cpu/armv8/cache_v8.c
@@ -8,9 +8,11 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <hang.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/cache.h>
@@ -19,6 +21,7 @@
 #include <asm/armv8/mmu.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/cpu/armv8/cpu.c b/arch/arm/cpu/armv8/cpu.c
index 8c0a492a3fa..ae6453a3130 100644
--- a/arch/arm/cpu/armv8/cpu.c
+++ b/arch/arm/cpu/armv8/cpu.c
@@ -12,6 +12,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <irq_func.h>
 #include <asm/cache.h>
@@ -20,6 +21,7 @@
 #include <asm/u-boot.h>
 #include <linux/compiler.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /*
  * sdelay() - simple spin loop.
diff --git a/arch/arm/cpu/armv8/exception_level.c b/arch/arm/cpu/armv8/exception_level.c
index b11936548fb..edb7ef89a6c 100644
--- a/arch/arm/cpu/armv8/exception_level.c
+++ b/arch/arm/cpu/armv8/exception_level.c
@@ -14,6 +14,7 @@
 #include <log.h>
 #include <asm/cache.h>
 #include <asm/setjmp.h>
+#include <linux/types.h>
 
 /**
  * entry_non_secure() - entry point when switching to non-secure mode
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
index 38ff2ce207d..56c076b70a9 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <env.h>
 #include <fsl_ddr_sdram.h>
@@ -44,6 +45,7 @@
 #include <fsl_qbman.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_TFABOOT
 #include <env_internal.h>
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/cpu.h b/arch/arm/cpu/armv8/fsl-layerscape/cpu.h
index dca5fd0f7dc..99f48597e2e 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/cpu.h
+++ b/arch/arm/cpu/armv8/fsl-layerscape/cpu.h
@@ -3,6 +3,7 @@
  * Copyright 2014-2015, Freescale Semiconductor
  */
 
+#include <asm/types.h>
 int fsl_qoriq_core_to_cluster(unsigned int core);
 u32 initiator_type(u32 cluster, int init_id);
 u32 cpu_mask(void);
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/fdt.c b/arch/arm/cpu/armv8/fsl-layerscape/fdt.c
index 09750dc2e88..9ef6ca33b47 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/fdt.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/fdt.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <clock_legacy.h>
+#include <compiler.h>
 #include <efi_loader.h>
 #include <log.h>
 #include <stdio.h>
@@ -34,6 +35,7 @@
 #include <asm/arch/speed.h>
 #include <fsl_qbman.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 int fdt_fixup_phy_connection(void *blob, int offset, phy_interface_t phyc)
 {
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_serdes.c b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_serdes.c
index 86b2d335ab0..88f80433ab4 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_serdes.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_serdes.c
@@ -4,9 +4,11 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <log.h>
 #include <stdio.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/arch/fsl_serdes.h>
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c
index dce6cac4f7a..467856d3ab8 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <clock_legacy.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <stdio.h>
 #include <asm/global_data.h>
@@ -16,6 +17,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/soc.h>
 #include <fsl_ifc.h>
+#include <linux/types.h>
 #include "cpu.h"
 
 DECLARE_GLOBAL_DATA_PTR;
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 f79328394c9..806ac73b1a6 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c
@@ -5,12 +5,14 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <env.h>
 #include <log.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c
index 36182fcf97a..9543f32771f 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <clock_legacy.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <stdio.h>
 #include <asm/global_data.h>
@@ -19,6 +20,7 @@
 #include <asm/arch-fsl-layerscape/immap_lsch3.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/soc.h>
+#include <linux/types.h>
 #include "cpu.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/icid.c b/arch/arm/cpu/armv8/fsl-layerscape/icid.c
index 5c378da0636..f4801173466 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/icid.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/icid.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls1012a_serdes.c b/arch/arm/cpu/armv8/fsl-layerscape/ls1012a_serdes.c
index 33d9a64e680..3db03fc450e 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/ls1012a_serdes.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/ls1012a_serdes.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <asm/arch/fsl_serdes.h>
 #include <asm/arch/immap_lsch2.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 
 struct serdes_config {
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls1028_ids.c b/arch/arm/cpu/armv8/fsl-layerscape/ls1028_ids.c
index 4d12ffae1bd..57c3652e376 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/ls1028_ids.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/ls1028_ids.c
@@ -11,6 +11,7 @@
 #include <asm/arch-fsl-layerscape/fsl_portals.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 struct icid_id_table icid_tbl[] = {
 	SET_USB_ICID(1, "snps,dwc3", FSL_USB1_STREAM_ID),
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls1028a_serdes.c b/arch/arm/cpu/armv8/fsl-layerscape/ls1028a_serdes.c
index 1079dd8b95f..0785c3999a2 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/ls1028a_serdes.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/ls1028a_serdes.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <asm/arch/fsl_serdes.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 
 struct serdes_config {
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls1043a_serdes.c b/arch/arm/cpu/armv8/fsl-layerscape/ls1043a_serdes.c
index 8a9ef8fef93..f3c5341d1aa 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/ls1043a_serdes.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/ls1043a_serdes.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <asm/arch/fsl_serdes.h>
 #include <asm/arch/immap_lsch2.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 
 struct serdes_config {
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls1046a_serdes.c b/arch/arm/cpu/armv8/fsl-layerscape/ls1046a_serdes.c
index 0c1c40d04b3..0a5bd79ed10 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/ls1046a_serdes.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/ls1046a_serdes.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <asm/arch/fsl_serdes.h>
 #include <asm/arch/immap_lsch2.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 
 struct serdes_config {
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls1088a_serdes.c b/arch/arm/cpu/armv8/fsl-layerscape/ls1088a_serdes.c
index fb7680fdc5f..4fdbb796069 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/ls1088a_serdes.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/ls1088a_serdes.c
@@ -4,9 +4,12 @@
  */
 
 #include <common.h>
+#include <compiler.h>
+#include <stdbool.h>
 #include <asm/arch/fsl_serdes.h>
 #include <asm/arch/soc.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 
 struct serdes_config {
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls2080a_serdes.c b/arch/arm/cpu/armv8/fsl-layerscape/ls2080a_serdes.c
index b21da530dcf..fea83f0cce1 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/ls2080a_serdes.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/ls2080a_serdes.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <asm/arch/fsl_serdes.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 
 struct serdes_config {
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/lx2160a_serdes.c b/arch/arm/cpu/armv8/fsl-layerscape/lx2160a_serdes.c
index 67c8f665146..6b2b0b4d79a 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/lx2160a_serdes.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/lx2160a_serdes.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <asm/arch/fsl_serdes.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 
 struct serdes_config {
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/mp.c b/arch/arm/cpu/armv8/fsl-layerscape/mp.c
index 0bccb38998c..396c2ba78dd 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/mp.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/mp.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <image.h>
 #include <log.h>
@@ -19,6 +20,7 @@
 #include <linux/delay.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "cpu.h"
 #include <asm/arch-fsl-layerscape/soc.h>
 #include <efi_loader.h>
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ppa.c b/arch/arm/cpu/armv8/fsl-layerscape/ppa.c
index 4aaeda367bf..3b5298b708b 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/ppa.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/ppa.c
@@ -3,6 +3,7 @@
  * Copyright 2016 NXP Semiconductor, Inc.
  */
 #include <common.h>
+#include <compiler.h>
 #include <log.h>
 #include <malloc.h>
 #include <config.h>
@@ -26,6 +27,7 @@
 #endif
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_SYS_LS_PPA_FW_IN_NAND
 #include <nand.h>
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/soc.c b/arch/arm/cpu/armv8/fsl-layerscape/soc.c
index 1bd6f2111c5..b53c06f35fa 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/soc.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/soc.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <clock_legacy.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <env.h>
 #include <fsl_immap.h>
@@ -44,6 +45,7 @@
 #if defined(CONFIG_TFABOOT) || defined(CONFIG_GIC_V3_ITS)
 DECLARE_GLOBAL_DATA_PTR;
 #endif
+#include <linux/types.h>
 
 #ifdef CONFIG_GIC_V3_ITS
 int ls_gic_rd_tables_init(void *blob)
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/spl.c b/arch/arm/cpu/armv8/fsl-layerscape/spl.c
index 5ba5db3223a..a30b3547cc4 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/spl.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/spl.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <clock_legacy.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <env.h>
 #include <image.h>
@@ -22,6 +23,7 @@
 #include <asm/arch/soc.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/cpu/armv8/fwcall.c b/arch/arm/cpu/armv8/fwcall.c
index 8085a0351f3..d57680892c9 100644
--- a/arch/arm/cpu/armv8/fwcall.c
+++ b/arch/arm/cpu/armv8/fwcall.c
@@ -14,6 +14,7 @@
 #include <asm/psci.h>
 #include <asm/ptrace.h>
 #include <asm/system.h>
+#include <asm/types.h>
 
 /*
  * Issue the hypervisor call
diff --git a/arch/arm/cpu/armv8/generic_timer.c b/arch/arm/cpu/armv8/generic_timer.c
index f27a74b9d09..2f7fbc20e49 100644
--- a/arch/arm/cpu/armv8/generic_timer.c
+++ b/arch/arm/cpu/armv8/generic_timer.c
@@ -11,6 +11,7 @@
 #include <asm/global_data.h>
 #include <asm/system.h>
 #include <linux/bitops.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/cpu/armv8/hisilicon/pinmux.c b/arch/arm/cpu/armv8/hisilicon/pinmux.c
index 5183e00a44c..4d90ea1130f 100644
--- a/arch/arm/cpu/armv8/hisilicon/pinmux.c
+++ b/arch/arm/cpu/armv8/hisilicon/pinmux.c
@@ -10,6 +10,7 @@
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <asm/arch/pinmux.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 
 struct hi6220_pinmux0_regs *pmx0 =
diff --git a/arch/arm/cpu/armv8/s32v234/cpu.c b/arch/arm/cpu/armv8/s32v234/cpu.c
index c58fb38e531..e3d151d3210 100644
--- a/arch/arm/cpu/armv8/s32v234/cpu.c
+++ b/arch/arm/cpu/armv8/s32v234/cpu.c
@@ -13,6 +13,7 @@
 #include <asm/armv8/mmu.h>
 #include <asm/io.h>
 #include <asm/arch/mc_me_regs.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include "cpu.h"
diff --git a/arch/arm/cpu/armv8/s32v234/cpu.h b/arch/arm/cpu/armv8/s32v234/cpu.h
index 11c3a6b435e..a066661d90a 100644
--- a/arch/arm/cpu/armv8/s32v234/cpu.h
+++ b/arch/arm/cpu/armv8/s32v234/cpu.h
@@ -3,5 +3,6 @@
  * (C) Copyright 2014-2016, Freescale Semiconductor, Inc.
  */
 
+#include <asm/types.h>
 u32 cpu_mask(void);
 int cpu_numcores(void);
diff --git a/arch/arm/cpu/armv8/s32v234/generic.c b/arch/arm/cpu/armv8/s32v234/generic.c
index 575dbb1f609..0f43135b206 100644
--- a/arch/arm/cpu/armv8/s32v234/generic.c
+++ b/arch/arm/cpu/armv8/s32v234/generic.c
@@ -21,6 +21,7 @@
 #include <errno.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 u32 get_cpu_rev(void)
 {
diff --git a/arch/arm/cpu/armv8/sec_firmware.c b/arch/arm/cpu/armv8/sec_firmware.c
index 1b273db4f98..a2a7e52a975 100644
--- a/arch/arm/cpu/armv8/sec_firmware.c
+++ b/arch/arm/cpu/armv8/sec_firmware.c
@@ -4,11 +4,13 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <errno.h>
 #include <fdt_support.h>
 #include <image.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
@@ -21,6 +23,7 @@
 #include <asm/macro.h>
 #include <asm/armv8/sec_firmware.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 extern void c_runtime_cpu_setup(void);
diff --git a/arch/arm/cpu/armv8/spl_data.c b/arch/arm/cpu/armv8/spl_data.c
index f8f9fe2e026..864b2ebe7a7 100644
--- a/arch/arm/cpu/armv8/spl_data.c
+++ b/arch/arm/cpu/armv8/spl_data.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <spl.h>
+#include <asm/types.h>
 #include <linux/string.h>
 
 char __data_save_start[0] __section(.__data_save_start);
diff --git a/arch/arm/cpu/pxa/cache.c b/arch/arm/cpu/pxa/cache.c
index a2ec5e28c7d..97b6b3a0fd6 100644
--- a/arch/arm/cpu/pxa/cache.c
+++ b/arch/arm/cpu/pxa/cache.c
@@ -3,6 +3,7 @@
  * (C) Copyright 2016 Vasily Khoruzhick <anarsoul@gmail.com>
  */
 
+#include <compiler.h>
 #include <cpu_func.h>
 #include <asm/cache.h>
 #include <linux/types.h>
diff --git a/arch/arm/cpu/pxa/cpuinfo.c b/arch/arm/cpu/pxa/cpuinfo.c
index ff56c3a82be..e54d06210d5 100644
--- a/arch/arm/cpu/pxa/cpuinfo.c
+++ b/arch/arm/cpu/pxa/cpuinfo.c
@@ -12,6 +12,7 @@
 #include <errno.h>
 #include <linux/compiler.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_CPU_PXA25X
 #if ((CONFIG_SYS_INIT_SP_ADDR) != 0xfffff800)
diff --git a/arch/arm/cpu/pxa/pxa2xx.c b/arch/arm/cpu/pxa/pxa2xx.c
index 9a8b2361ad9..4bcef607c23 100644
--- a/arch/arm/cpu/pxa/pxa2xx.c
+++ b/arch/arm/cpu/pxa/pxa2xx.c
@@ -19,6 +19,7 @@
 #include <asm/system.h>
 #include <command.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 /* Flush I/D-cache */
 static void cache_flush(void)
diff --git a/arch/arm/cpu/sa1100/cpu.c b/arch/arm/cpu/sa1100/cpu.c
index 91e100af1b6..f264d1b5601 100644
--- a/arch/arm/cpu/sa1100/cpu.c
+++ b/arch/arm/cpu/sa1100/cpu.c
@@ -19,6 +19,7 @@
 #include <irq_func.h>
 #include <asm/system.h>
 #include <asm/io.h>
+#include <linux/types.h>
 
 static void cache_flush(void);
 
diff --git a/arch/arm/cpu/sa1100/timer.c b/arch/arm/cpu/sa1100/timer.c
index 5d597dd1ab4..e3227d7c25c 100644
--- a/arch/arm/cpu/sa1100/timer.c
+++ b/arch/arm/cpu/sa1100/timer.c
@@ -13,6 +13,7 @@
 #include <SA-1100.h>
 #include <time.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 static ulong get_timer_masked (void)
 {
diff --git a/arch/arm/include/asm/arch-am33xx/clk_synthesizer.h b/arch/arm/include/asm/arch-am33xx/clk_synthesizer.h
index 7bcafba6f0b..6d09b53fb93 100644
--- a/arch/arm/include/asm/arch-am33xx/clk_synthesizer.h
+++ b/arch/arm/include/asm/arch-am33xx/clk_synthesizer.h
@@ -10,6 +10,7 @@
 #ifndef __CLK_SYNTHESIZER_H
 #define __CLK_SYNTHESIZER_H
 
+#include <asm/types.h>
 #define CLK_SYNTHESIZER_ID_REG		0x0
 #define CLK_SYNTHESIZER_XCSEL		0x05
 #define CLK_SYNTHESIZER_MUX_REG		0x14
diff --git a/arch/arm/include/asm/arch-am33xx/clock.h b/arch/arm/include/asm/arch-am33xx/clock.h
index dc7a9b188d3..a5b14ca4563 100644
--- a/arch/arm/include/asm/arch-am33xx/clock.h
+++ b/arch/arm/include/asm/arch-am33xx/clock.h
@@ -12,6 +12,7 @@
 
 #include <asm/arch/clocks_am33xx.h>
 #include <asm/arch/hardware.h>
+#include <linux/types.h>
 
 #if defined(CONFIG_TI816X) || defined(CONFIG_TI814X)
 #include <asm/arch/clock_ti81xx.h>
diff --git a/arch/arm/include/asm/arch-am33xx/ddr_defs.h b/arch/arm/include/asm/arch-am33xx/ddr_defs.h
index 15a5b641ffa..4fd111ef700 100644
--- a/arch/arm/include/asm/arch-am33xx/ddr_defs.h
+++ b/arch/arm/include/asm/arch-am33xx/ddr_defs.h
@@ -12,6 +12,7 @@
 
 #include <asm/arch/hardware.h>
 #include <asm/emif.h>
+#include <asm/types.h>
 
 /* AM335X EMIF Register values */
 #define VTP_CTRL_READY		(0x1 << 5)
diff --git a/arch/arm/include/asm/arch-am33xx/sys_proto.h b/arch/arm/include/asm/arch-am33xx/sys_proto.h
index be17aad29ee..46fef0da51f 100644
--- a/arch/arm/include/asm/arch-am33xx/sys_proto.h
+++ b/arch/arm/include/asm/arch-am33xx/sys_proto.h
@@ -11,6 +11,7 @@
 #define _SYS_PROTO_H_
 #include <linux/mtd/omap_gpmc.h>
 #include <asm/arch/cpu.h>
+#include <linux/types.h>
 
 u32 get_cpu_rev(void);
 u32 get_sysboot_value(void);
diff --git a/arch/arm/include/asm/arch-armada100/cpu.h b/arch/arm/include/asm/arch-armada100/cpu.h
index cd5e5051d51..1565e101832 100644
--- a/arch/arm/include/asm/arch-armada100/cpu.h
+++ b/arch/arm/include/asm/arch-armada100/cpu.h
@@ -10,6 +10,7 @@
 
 #include <asm/io.h>
 #include <asm/system.h>
+#include <asm/types.h>
 
 /*
  * Main Power Management (MPMU) Registers
diff --git a/arch/arm/include/asm/arch-armada100/spi.h b/arch/arm/include/asm/arch-armada100/spi.h
index 873ba6e91c9..4a4dcd95f94 100644
--- a/arch/arm/include/asm/arch-armada100/spi.h
+++ b/arch/arm/include/asm/arch-armada100/spi.h
@@ -12,6 +12,7 @@
 #define __ARMADA100_SPI_H_
 
 #include <asm/arch/armada100.h>
+#include <asm/types.h>
 
 #define CAT_BASE_ADDR(x)	ARMD1_SSP ## x ## _BASE
 #define SSP_REG_BASE(x)		CAT_BASE_ADDR(x)
diff --git a/arch/arm/include/asm/arch-armada100/utmi-armada100.h b/arch/arm/include/asm/arch-armada100/utmi-armada100.h
index 28147f42acf..8511b875ea6 100644
--- a/arch/arm/include/asm/arch-armada100/utmi-armada100.h
+++ b/arch/arm/include/asm/arch-armada100/utmi-armada100.h
@@ -11,6 +11,7 @@
 #ifndef __UTMI_ARMADA100__
 #define __UTMI_ARMADA100__
 
+#include <asm/types.h>
 #define UTMI_PHY_BASE		0xD4206000
 
 /* utmi_ctrl - bits */
diff --git a/arch/arm/include/asm/arch-armv7/globaltimer.h b/arch/arm/include/asm/arch-armv7/globaltimer.h
index 2d9cf77980c..a4e8eaa4f96 100644
--- a/arch/arm/include/asm/arch-armv7/globaltimer.h
+++ b/arch/arm/include/asm/arch-armv7/globaltimer.h
@@ -6,6 +6,7 @@
 #ifndef _GLOBALTIMER_H_
 #define _GLOBALTIMER_H_
 
+#include <asm/types.h>
 struct globaltimer {
 	u32 cnt_l; /* 0x00 */
 	u32 cnt_h;
diff --git a/arch/arm/include/asm/arch-armv7/sysctrl.h b/arch/arm/include/asm/arch-armv7/sysctrl.h
index fc72fac8d87..e7e660362cf 100644
--- a/arch/arm/include/asm/arch-armv7/sysctrl.h
+++ b/arch/arm/include/asm/arch-armv7/sysctrl.h
@@ -7,6 +7,7 @@
 #define _SYSCTRL_H_
 
 /* System controller (SP810) register definitions */
+#include <asm/types.h>
 #define SP810_TIMER0_ENSEL	(1 << 15)
 #define SP810_TIMER1_ENSEL	(1 << 17)
 #define SP810_TIMER2_ENSEL	(1 << 19)
diff --git a/arch/arm/include/asm/arch-armv7/systimer.h b/arch/arm/include/asm/arch-armv7/systimer.h
index 04c41304581..4b9a29b0b4c 100644
--- a/arch/arm/include/asm/arch-armv7/systimer.h
+++ b/arch/arm/include/asm/arch-armv7/systimer.h
@@ -7,6 +7,7 @@
 #define _SYSTIMER_H_
 
 /* AMBA timer register base address */
+#include <asm/types.h>
 #define SYSTIMER_BASE		0x10011000
 
 #define SYSHZ_CLOCK		1000000		/* Timers -> 1Mhz */
diff --git a/arch/arm/include/asm/arch-armv7/wdt.h b/arch/arm/include/asm/arch-armv7/wdt.h
index e3fa16ffab5..593ec779490 100644
--- a/arch/arm/include/asm/arch-armv7/wdt.h
+++ b/arch/arm/include/asm/arch-armv7/wdt.h
@@ -7,6 +7,7 @@
 #define _WDT_H_
 
 /* Watchdog timer (SP805) register base address */
+#include <asm/types.h>
 #define WDT_BASE	0x100E5000
 
 #define WDT_EN		0x2
diff --git a/arch/arm/include/asm/arch-aspeed/scu_ast2500.h b/arch/arm/include/asm/arch-aspeed/scu_ast2500.h
index 8db4901cc9b..c2a1e122f9b 100644
--- a/arch/arm/include/asm/arch-aspeed/scu_ast2500.h
+++ b/arch/arm/include/asm/arch-aspeed/scu_ast2500.h
@@ -141,6 +141,7 @@
 
 #ifndef __ASSEMBLY__
 
+#include <asm/types.h>
 struct ast2500_clk_priv {
 	struct ast2500_scu *scu;
 };
diff --git a/arch/arm/include/asm/arch-aspeed/sdram_ast2500.h b/arch/arm/include/asm/arch-aspeed/sdram_ast2500.h
index 0bc551fbecf..e66dff74e6b 100644
--- a/arch/arm/include/asm/arch-aspeed/sdram_ast2500.h
+++ b/arch/arm/include/asm/arch-aspeed/sdram_ast2500.h
@@ -97,6 +97,7 @@
 
 #ifndef __ASSEMBLY__
 
+#include <asm/types.h>
 struct ast2500_sdrammc_regs {
 	u32 protection_key;
 	u32 config;
diff --git a/arch/arm/include/asm/arch-aspeed/timer.h b/arch/arm/include/asm/arch-aspeed/timer.h
index ff24e2f86e3..332c0f850b2 100644
--- a/arch/arm/include/asm/arch-aspeed/timer.h
+++ b/arch/arm/include/asm/arch-aspeed/timer.h
@@ -28,6 +28,7 @@
  * it this just one device.
  */
 
+#include <asm/types.h>
 struct ast_timer_counter {
 	u32 status;
 	u32 reload_val;
diff --git a/arch/arm/include/asm/arch-aspeed/wdt.h b/arch/arm/include/asm/arch-aspeed/wdt.h
index fb04d41d3cb..f71fcaad969 100644
--- a/arch/arm/include/asm/arch-aspeed/wdt.h
+++ b/arch/arm/include/asm/arch-aspeed/wdt.h
@@ -67,6 +67,7 @@
 	 WDT_RESET_ADC | WDT_RESET_GPIO | WDT_RESET_MISC)
 
 #ifndef __ASSEMBLY__
+#include <linux/types.h>
 struct ast_wdt {
 	u32 counter_status;
 	u32 counter_reload_val;
diff --git a/arch/arm/include/asm/arch-ep93xx/ep93xx.h b/arch/arm/include/asm/arch-ep93xx/ep93xx.h
index 272b64480d1..4f7561a74fe 100644
--- a/arch/arm/include/asm/arch-ep93xx/ep93xx.h
+++ b/arch/arm/include/asm/arch-ep93xx/ep93xx.h
@@ -31,6 +31,7 @@
 #define DMA_BASE			(EP93XX_AHB_BASE | DMA_OFFSET)
 
 #ifndef __ASSEMBLY__
+#include <linux/types.h>
 struct dma_channel {
 	uint32_t control;
 	uint32_t interrupt;
diff --git a/arch/arm/include/asm/arch-fsl-layerscape/clock.h b/arch/arm/include/asm/arch-fsl-layerscape/clock.h
index 41272e44bf3..6720f939d46 100644
--- a/arch/arm/include/asm/arch-fsl-layerscape/clock.h
+++ b/arch/arm/include/asm/arch-fsl-layerscape/clock.h
@@ -9,6 +9,7 @@
 #define __ASM_ARCH_FSL_LAYERSCAPE_CLOCK_H_
 
 #include <asm/u-boot.h>
+#include <linux/types.h>
 enum mxc_clock {
 	MXC_ARM_CLK = 0,
 	MXC_BUS_CLK,
diff --git a/arch/arm/include/asm/arch-fsl-layerscape/cpu.h b/arch/arm/include/asm/arch-fsl-layerscape/cpu.h
index 7759acdb8f6..6ef62fb8eea 100644
--- a/arch/arm/include/asm/arch-fsl-layerscape/cpu.h
+++ b/arch/arm/include/asm/arch-fsl-layerscape/cpu.h
@@ -17,6 +17,7 @@
 #define CONFIG_SYS_FSL_IFC_SIZE1	0x10000000
 #define CONFIG_SYS_FSL_IFC_SIZE1_1	0x400000
 #endif
+#include <asm/types.h>
 #define CONFIG_SYS_FSL_DRAM_BASE1	0x80000000
 #define CONFIG_SYS_FSL_DRAM_SIZE1	0x80000000
 #define CONFIG_SYS_FSL_QSPI_BASE2	0x400000000
diff --git a/arch/arm/include/asm/arch-fsl-layerscape/fsl_portals.h b/arch/arm/include/asm/arch-fsl-layerscape/fsl_portals.h
index 1577e935a60..7713a515023 100644
--- a/arch/arm/include/asm/arch-fsl-layerscape/fsl_portals.h
+++ b/arch/arm/include/asm/arch-fsl-layerscape/fsl_portals.h
@@ -6,6 +6,7 @@
 #ifndef _FSL_PORTALS_H_
 #define _FSL_PORTALS_H_
 
+#include <asm/types.h>
 struct qportal_info {
 	u16	dicid;	/* DQRR ICID */
 	u16	ficid;	/* frame data ICID */
diff --git a/arch/arm/include/asm/arch-fsl-layerscape/fsl_serdes.h b/arch/arm/include/asm/arch-fsl-layerscape/fsl_serdes.h
index 8f436517569..86ef17b6283 100644
--- a/arch/arm/include/asm/arch-fsl-layerscape/fsl_serdes.h
+++ b/arch/arm/include/asm/arch-fsl-layerscape/fsl_serdes.h
@@ -8,6 +8,7 @@
 #define __FSL_SERDES_H__
 
 #include <config.h>
+#include <asm/types.h>
 
 #ifdef CONFIG_FSL_LSCH3
 enum srds_prtcl {
diff --git a/arch/arm/include/asm/arch-fsl-layerscape/gpio.h b/arch/arm/include/asm/arch-fsl-layerscape/gpio.h
index 7ae5eee8b66..0b959b00fd1 100644
--- a/arch/arm/include/asm/arch-fsl-layerscape/gpio.h
+++ b/arch/arm/include/asm/arch-fsl-layerscape/gpio.h
@@ -13,6 +13,7 @@
 #ifndef __ASM_ARCH_MX85XX_GPIO_H
 #define __ASM_ARCH_MX85XX_GPIO_H
 
+#include <linux/types.h>
 struct mpc8xxx_gpio_plat {
 	ulong addr;
 	ulong size;
diff --git a/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h b/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h
index ae0504652bf..6a0081d46db 100644
--- a/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h
+++ b/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h
@@ -10,6 +10,7 @@
 #ifndef __ASSEMBLY__
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
+#include <linux/types.h>
 #endif
 
 #define CONFIG_SYS_IMMR				0x01000000
diff --git a/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h b/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h
index baa9fa8529c..73d50e08926 100644
--- a/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h
+++ b/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h
@@ -292,6 +292,7 @@
 #define TP_INIT_PER_CLUSTER     4
 /* This is chassis generation 3 */
 #ifndef __ASSEMBLY__
+#include <asm/types.h>
 struct sys_info {
 	unsigned long freq_processor[CONFIG_MAX_CPUS];
 	/* frequency of platform PLL */
diff --git a/arch/arm/include/asm/arch-fsl-layerscape/mp.h b/arch/arm/include/asm/arch-fsl-layerscape/mp.h
index faac8f11286..ad70074d18d 100644
--- a/arch/arm/include/asm/arch-fsl-layerscape/mp.h
+++ b/arch/arm/include/asm/arch-fsl-layerscape/mp.h
@@ -32,6 +32,7 @@
 
 #define id_to_core(x)	((x & 3) | (x >> 6))
 #ifndef __ASSEMBLY__
+#include <linux/types.h>
 extern u64 __real_cntfrq;
 extern void *secondary_boot_addr;
 extern void *secondary_boot_code_start;
diff --git a/arch/arm/include/asm/arch-hi6220/dwmmc.h b/arch/arm/include/asm/arch-hi6220/dwmmc.h
index cf51c178c3f..ae61e7109f6 100644
--- a/arch/arm/include/asm/arch-hi6220/dwmmc.h
+++ b/arch/arm/include/asm/arch-hi6220/dwmmc.h
@@ -4,4 +4,5 @@
  * Peter Griffin <peter.griffin@linaro.org>
  */
 
+#include <asm/types.h>
 int hi6220_dwmci_add_port(int index, u32 regbase, int bus_width);
diff --git a/arch/arm/include/asm/arch-hi6220/gpio.h b/arch/arm/include/asm/arch-hi6220/gpio.h
index c5ee359a3a1..c02a1fcb992 100644
--- a/arch/arm/include/asm/arch-hi6220/gpio.h
+++ b/arch/arm/include/asm/arch-hi6220/gpio.h
@@ -7,6 +7,7 @@
 #ifndef _HI6220_GPIO_H_
 #define _HI6220_GPIO_H_
 
+#include <linux/types.h>
 #define HI6220_GPIO_BASE(bank)	(((bank < 4) ? 0xf8011000 : \
 				0xf7020000 - 0x4000) + (0x1000 * bank))
 
diff --git a/arch/arm/include/asm/arch-hi6220/hi6220_regs_alwayson.h b/arch/arm/include/asm/arch-hi6220/hi6220_regs_alwayson.h
index 4b9a0d44acb..d719169c77f 100644
--- a/arch/arm/include/asm/arch-hi6220/hi6220_regs_alwayson.h
+++ b/arch/arm/include/asm/arch-hi6220/hi6220_regs_alwayson.h
@@ -7,6 +7,7 @@
 #ifndef __HI6220_ALWAYSON_H__
 #define __HI6220_ALWAYSON_H__
 
+#include <asm/types.h>
 #define ALWAYSON_CTRL_BASE			0xF7800000
 
 struct alwayson_sc_regs {
diff --git a/arch/arm/include/asm/arch-hi6220/pinmux.h b/arch/arm/include/asm/arch-hi6220/pinmux.h
index b4a9957e807..2673c1acc99 100644
--- a/arch/arm/include/asm/arch-hi6220/pinmux.h
+++ b/arch/arm/include/asm/arch-hi6220/pinmux.h
@@ -57,6 +57,7 @@
 /* maybe more registers, but highest used is 123 */
 #define REG_NUM 123
 
+#include <linux/types.h>
 struct hi6220_pinmux0_regs {
 	uint32_t	iomg[REG_NUM];
 };
diff --git a/arch/arm/include/asm/arch-imx/cpu.h b/arch/arm/include/asm/arch-imx/cpu.h
index 75ff991248c..4e95c8a7a12 100644
--- a/arch/arm/include/asm/arch-imx/cpu.h
+++ b/arch/arm/include/asm/arch-imx/cpu.h
@@ -3,6 +3,7 @@
  * (C) Copyright 2014 Freescale Semiconductor, Inc.
  */
 
+#include <linux/types.h>
 #define MXC_CPU_MX23		0x23
 #define MXC_CPU_MX25		0x25
 #define MXC_CPU_MX27		0x27
diff --git a/arch/arm/include/asm/arch-imx8/clock.h b/arch/arm/include/asm/arch-imx8/clock.h
index bea157171fb..ce2d65a69d6 100644
--- a/arch/arm/include/asm/arch-imx8/clock.h
+++ b/arch/arm/include/asm/arch-imx8/clock.h
@@ -7,6 +7,7 @@
 #define __ASM_ARCH_IMX8_CLOCK_H__
 
 /* Mainly for compatible to imx common code. */
+#include <asm/types.h>
 enum mxc_clock {
 	MXC_ARM_CLK = 0,
 	MXC_AHB_CLK,
diff --git a/arch/arm/include/asm/arch-imx8/gpio.h b/arch/arm/include/asm/arch-imx8/gpio.h
index 24cfde3c297..3ba211b0a61 100644
--- a/arch/arm/include/asm/arch-imx8/gpio.h
+++ b/arch/arm/include/asm/arch-imx8/gpio.h
@@ -18,4 +18,5 @@ struct gpio_regs {
 /* IMX8 the GPIO index is from 0 not 1 */
 #define IMX_GPIO_NR(port, index)		(((port) * 32) + ((index) & 31))
 
+#include <asm/types.h>
 #endif /* __ASM_ARCH_IMX8_GPIO_H */
diff --git a/arch/arm/include/asm/arch-imx8/image.h b/arch/arm/include/asm/arch-imx8/image.h
index c1e5700859d..1c6e05b49eb 100644
--- a/arch/arm/include/asm/arch-imx8/image.h
+++ b/arch/arm/include/asm/arch-imx8/image.h
@@ -6,6 +6,7 @@
 #ifndef __CONTAINER_HEADER_H_
 #define __CONTAINER_HEADER_H_
 
+#include <compiler.h>
 #include <linux/sizes.h>
 #include <linux/types.h>
 
diff --git a/arch/arm/include/asm/arch-imx8/iomux.h b/arch/arm/include/asm/arch-imx8/iomux.h
index 3acef1ea6ba..c7cab5770d3 100644
--- a/arch/arm/include/asm/arch-imx8/iomux.h
+++ b/arch/arm/include/asm/arch-imx8/iomux.h
@@ -7,6 +7,7 @@
 #define __ASM_ARCH_IMX8_IOMUX_H__
 
 #ifndef __ASSEMBLY__
+#include <asm/types.h>
 #include <linux/bitops.h>
 #endif
 
diff --git a/arch/arm/include/asm/arch-imx8/sci/rpc.h b/arch/arm/include/asm/arch-imx8/sci/rpc.h
index 9f55904f442..04dd413aa04 100644
--- a/arch/arm/include/asm/arch-imx8/sci/rpc.h
+++ b/arch/arm/include/asm/arch-imx8/sci/rpc.h
@@ -10,6 +10,7 @@
 /* Note: Check SCFW API Released DOC before you want to modify something */
 /* Defines */
 
+#include <asm/types.h>
 #define SCFW_API_VERSION_MAJOR  1U
 #define SCFW_API_VERSION_MINOR  15U
 
diff --git a/arch/arm/include/asm/arch-imx8/sci/sci.h b/arch/arm/include/asm/arch-imx8/sci/sci.h
index 1c29209b399..ff7be2184f3 100644
--- a/arch/arm/include/asm/arch-imx8/sci/sci.h
+++ b/arch/arm/include/asm/arch-imx8/sci/sci.h
@@ -16,6 +16,7 @@
 #include <asm/arch/sci/rpc.h>
 #include <dt-bindings/soc/imx_rsrc.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 static inline int sc_err_to_linux(sc_err_t err)
 {
diff --git a/arch/arm/include/asm/arch-imx8/sci/svc/misc/api.h b/arch/arm/include/asm/arch-imx8/sci/svc/misc/api.h
index 3629eb68d7a..4fb7c01f9c4 100644
--- a/arch/arm/include/asm/arch-imx8/sci/svc/misc/api.h
+++ b/arch/arm/include/asm/arch-imx8/sci/svc/misc/api.h
@@ -7,6 +7,7 @@
 #define SC_MISC_API_H
 
 /* Defines for sc_misc_boot_status_t */
+#include <asm/types.h>
 #define SC_MISC_BOOT_STATUS_SUCCESS	0U	/* Success */
 #define SC_MISC_BOOT_STATUS_SECURITY	1U	/* Security violation */
 
diff --git a/arch/arm/include/asm/arch-imx8/sci/svc/pm/api.h b/arch/arm/include/asm/arch-imx8/sci/svc/pm/api.h
index 9008b85c6f6..ca80fd3927f 100644
--- a/arch/arm/include/asm/arch-imx8/sci/svc/pm/api.h
+++ b/arch/arm/include/asm/arch-imx8/sci/svc/pm/api.h
@@ -7,6 +7,7 @@
 #define SC_PM_API_H
 
 /* Defines for sc_pm_power_mode_t */
+#include <asm/types.h>
 #define SC_PM_PW_MODE_OFF	0U /* Power off */
 #define SC_PM_PW_MODE_STBY	1U /* Power in standby */
 #define SC_PM_PW_MODE_LP	2U /* Power in low-power */
diff --git a/arch/arm/include/asm/arch-imx8/sci/svc/rm/api.h b/arch/arm/include/asm/arch-imx8/sci/svc/rm/api.h
index ed303881e73..4783682e4de 100644
--- a/arch/arm/include/asm/arch-imx8/sci/svc/rm/api.h
+++ b/arch/arm/include/asm/arch-imx8/sci/svc/rm/api.h
@@ -7,6 +7,7 @@
 #define SC_RM_API_H
 
 #include <asm/arch/sci/types.h>
+#include <asm/types.h>
 
 /* Defines for type widths */
 #define SC_RM_PARTITION_W   5U      /* Width of sc_rm_pt_t */
diff --git a/arch/arm/include/asm/arch-imx8/sci/svc/seco/api.h b/arch/arm/include/asm/arch-imx8/sci/svc/seco/api.h
index 3ed05842d99..524f857bfb7 100644
--- a/arch/arm/include/asm/arch-imx8/sci/svc/seco/api.h
+++ b/arch/arm/include/asm/arch-imx8/sci/svc/seco/api.h
@@ -9,6 +9,7 @@
 /* Includes */
 
 #include <asm/arch/sci/types.h>
+#include <asm/types.h>
 
 /* Defines */
 #define SC_SECO_AUTH_CONTAINER          0U   /* Authenticate container */
diff --git a/arch/arm/include/asm/arch-imx8m/clock.h b/arch/arm/include/asm/arch-imx8m/clock.h
index 848a93ec3f2..2bb81f2bddf 100644
--- a/arch/arm/include/asm/arch-imx8m/clock.h
+++ b/arch/arm/include/asm/arch-imx8m/clock.h
@@ -7,6 +7,7 @@
 
 #include <stdbool.h>
 #include <linux/bitops.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_IMX8MQ
 #include <asm/arch/clock_imx8mq.h>
diff --git a/arch/arm/include/asm/arch-imx8m/clock_imx8mm.h b/arch/arm/include/asm/arch-imx8m/clock_imx8mm.h
index 63b14b9ca58..c2f530bf090 100644
--- a/arch/arm/include/asm/arch-imx8m/clock_imx8mm.h
+++ b/arch/arm/include/asm/arch-imx8m/clock_imx8mm.h
@@ -9,6 +9,7 @@
 #define _ASM_ARCH_IMX8MM_CLOCK_H
 
 #ifndef __ASSEMBLY__
+#include <asm/types.h>
 #include <linux/bitops.h>
 #endif
 
diff --git a/arch/arm/include/asm/arch-imx8m/ddr.h b/arch/arm/include/asm/arch-imx8m/ddr.h
index 0f1e832c038..790e9d9dfb2 100644
--- a/arch/arm/include/asm/arch-imx8m/ddr.h
+++ b/arch/arm/include/asm/arch-imx8m/ddr.h
@@ -9,6 +9,7 @@
 #include <asm/io.h>
 #include <asm/types.h>
 #include <asm/arch/ddr.h>
+#include <linux/types.h>
 
 #define DDRC_DDR_SS_GPR0		0x3d000000
 #define DDRC_IPS_BASE_ADDR_0		0x3f400000
diff --git a/arch/arm/include/asm/arch-imxrt/gpio.h b/arch/arm/include/asm/arch-imxrt/gpio.h
index da31a7438aa..1752bd23fe8 100644
--- a/arch/arm/include/asm/arch-imxrt/gpio.h
+++ b/arch/arm/include/asm/arch-imxrt/gpio.h
@@ -16,4 +16,5 @@ struct gpio_regs {
 };
 #endif
 
+#include <asm/types.h>
 #endif /* __ASM_ARCH_GPIO_H__ */
diff --git a/arch/arm/include/asm/arch-lpc32xx/dma.h b/arch/arm/include/asm/arch-lpc32xx/dma.h
index d69e3c4664d..f480f7c7cd8 100644
--- a/arch/arm/include/asm/arch-lpc32xx/dma.h
+++ b/arch/arm/include/asm/arch-lpc32xx/dma.h
@@ -12,6 +12,7 @@
 #define _LPC32XX_DMA_H
 
 /*
+#include <asm/types.h>
  * DMA linked list structure used with a channel's LLI register;
  * refer to UM10326, "LPC32x0 and LPC32x0/01 User manual" - Rev. 3
  * tables 84, 85, 86 & 87 for details.
diff --git a/arch/arm/include/asm/arch-lpc32xx/gpio.h b/arch/arm/include/asm/arch-lpc32xx/gpio.h
index 93e7a887521..332ae6f8850 100644
--- a/arch/arm/include/asm/arch-lpc32xx/gpio.h
+++ b/arch/arm/include/asm/arch-lpc32xx/gpio.h
@@ -10,6 +10,7 @@
  * GPIO Register map for LPC32xx
  */
 
+#include <asm/types.h>
 struct gpio_regs {
 	u32 p3_inp_state;
 	u32 p3_outp_set;
diff --git a/arch/arm/include/asm/arch-lpc32xx/i2c.h b/arch/arm/include/asm/arch-lpc32xx/i2c.h
index f39b14001b6..3f9ef1096d3 100644
--- a/arch/arm/include/asm/arch-lpc32xx/i2c.h
+++ b/arch/arm/include/asm/arch-lpc32xx/i2c.h
@@ -2,6 +2,7 @@
 #define _LPC32XX_I2C_H
 
 #include <asm/types.h>
+#include <linux/types.h>
 
 /* i2c register set */
 struct lpc32xx_i2c_base {
diff --git a/arch/arm/include/asm/arch-lpc32xx/mux.h b/arch/arm/include/asm/arch-lpc32xx/mux.h
index d661e8236f3..aff08caae19 100644
--- a/arch/arm/include/asm/arch-lpc32xx/mux.h
+++ b/arch/arm/include/asm/arch-lpc32xx/mux.h
@@ -10,6 +10,7 @@
  * MUX register map for LPC32xx
  */
 
+#include <asm/types.h>
 struct mux_regs {
 	u32 reserved1[10];
 	u32 p2_mux_set;
diff --git a/arch/arm/include/asm/arch-ls102xa/clock.h b/arch/arm/include/asm/arch-ls102xa/clock.h
index bfb58d75455..53b002f7c95 100644
--- a/arch/arm/include/asm/arch-ls102xa/clock.h
+++ b/arch/arm/include/asm/arch-ls102xa/clock.h
@@ -8,6 +8,7 @@
 #define __ASM_ARCH_LS102XA_CLOCK_H_
 
 #include <asm/u-boot.h>
+#include <linux/types.h>
 enum mxc_clock {
 	MXC_ARM_CLK = 0,
 	MXC_UART_CLK,
diff --git a/arch/arm/include/asm/arch-ls102xa/fsl_serdes.h b/arch/arm/include/asm/arch-ls102xa/fsl_serdes.h
index d99a6f318f8..b418a906f9c 100644
--- a/arch/arm/include/asm/arch-ls102xa/fsl_serdes.h
+++ b/arch/arm/include/asm/arch-ls102xa/fsl_serdes.h
@@ -7,6 +7,7 @@
 #define __FSL_SERDES_H
 
 #include <config.h>
+#include <asm/types.h>
 
 enum srds_prtcl {
 	/*
diff --git a/arch/arm/include/asm/arch-ls102xa/immap_ls102xa.h b/arch/arm/include/asm/arch-ls102xa/immap_ls102xa.h
index 4bae3f4ed5d..bdc43d34b1d 100644
--- a/arch/arm/include/asm/arch-ls102xa/immap_ls102xa.h
+++ b/arch/arm/include/asm/arch-ls102xa/immap_ls102xa.h
@@ -7,6 +7,7 @@
 #define __ASM_ARCH_LS102XA_IMMAP_H_
 #include <fsl_immap.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 #define SVR_MAJ(svr)		(((svr) >>  4) & 0xf)
 #define SVR_MIN(svr)		(((svr) >>  0) & 0xf)
diff --git a/arch/arm/include/asm/arch-ls102xa/ls102xa_stream_id.h b/arch/arm/include/asm/arch-ls102xa/ls102xa_stream_id.h
index 93b0a26091e..06df4c59043 100644
--- a/arch/arm/include/asm/arch-ls102xa/ls102xa_stream_id.h
+++ b/arch/arm/include/asm/arch-ls102xa/ls102xa_stream_id.h
@@ -7,6 +7,7 @@
 #define __FSL_LS102XA_STREAM_ID_H_
 
 #include <fsl_sec.h>
+#include <linux/types.h>
 
 #define SET_LIODN_ENTRY_1(name, idA, off, compatoff) \
 	{ .compat = name, \
diff --git a/arch/arm/include/asm/arch-mediatek/reset.h b/arch/arm/include/asm/arch-mediatek/reset.h
index 9704666d24e..83fe9d5fbc2 100644
--- a/arch/arm/include/asm/arch-mediatek/reset.h
+++ b/arch/arm/include/asm/arch-mediatek/reset.h
@@ -7,6 +7,7 @@
 #define __MEDIATEK_RESET_H
 
 #include <dm.h>
+#include <asm/types.h>
 
 int mediatek_reset_bind(struct udevice *pdev, u32 regofs, u32 num_regs);
 
diff --git a/arch/arm/include/asm/arch-meson/clock-gx.h b/arch/arm/include/asm/arch-meson/clock-gx.h
index 13a2e7688fc..2a9bd52102a 100644
--- a/arch/arm/include/asm/arch-meson/clock-gx.h
+++ b/arch/arm/include/asm/arch-meson/clock-gx.h
@@ -13,6 +13,7 @@
  * Those offsets must be multiplied by 4 before adding them to the base address
  * to get the right value
  */
+#include <linux/types.h>
 #define SCR				0x2C /* 0x0b offset in data sheet */
 #define TIMEOUT_VALUE			0x3c /* 0x0f offset in data sheet */
 
diff --git a/arch/arm/include/asm/arch-meson/sm.h b/arch/arm/include/asm/arch-meson/sm.h
index f3ae46a6d6b..53a93347c18 100644
--- a/arch/arm/include/asm/arch-meson/sm.h
+++ b/arch/arm/include/asm/arch-meson/sm.h
@@ -6,6 +6,7 @@
 #ifndef __MESON_SM_H__
 #define __MESON_SM_H__
 
+#include <linux/types.h>
 ssize_t meson_sm_read_efuse(uintptr_t offset, void *buffer, size_t size);
 
 #define SM_SERIAL_SIZE	12
diff --git a/arch/arm/include/asm/arch-mvebu/spi.h b/arch/arm/include/asm/arch-mvebu/spi.h
index 58b6c32c4d8..7c0d55bfe6c 100644
--- a/arch/arm/include/asm/arch-mvebu/spi.h
+++ b/arch/arm/include/asm/arch-mvebu/spi.h
@@ -11,6 +11,7 @@
 #define __KW_SPI_H__
 
 /* SPI Registers on kirkwood SOC */
+#include <asm/types.h>
 struct kwspi_registers {
 	u32 ctrl;	/* 0x10600 */
 	u32 cfg;	/* 0x10604 */
diff --git a/arch/arm/include/asm/arch-mx27/gpio.h b/arch/arm/include/asm/arch-mx27/gpio.h
index 9f342eb7f71..fcc57071ce9 100644
--- a/arch/arm/include/asm/arch-mx27/gpio.h
+++ b/arch/arm/include/asm/arch-mx27/gpio.h
@@ -9,6 +9,7 @@
 #define __ASM_ARCH_MX27_GPIO_H
 
 /* GPIO registers */
+#include <asm/types.h>
 struct gpio_regs {
 	u32 gpio_dir; /* DDIR */
 	u32 ocr1;
diff --git a/arch/arm/include/asm/arch-mx27/imx-regs.h b/arch/arm/include/asm/arch-mx27/imx-regs.h
index d39f6b03508..dd2773a8878 100644
--- a/arch/arm/include/asm/arch-mx27/imx-regs.h
+++ b/arch/arm/include/asm/arch-mx27/imx-regs.h
@@ -11,6 +11,7 @@
 
 #ifndef __ASSEMBLY__
 
+#include <asm/types.h>
 extern void imx_gpio_mode (int gpio_mode);
 
 #ifdef CONFIG_MXC_UART
diff --git a/arch/arm/include/asm/arch-mx27/regs-rtc.h b/arch/arm/include/asm/arch-mx27/regs-rtc.h
index 8434f4c1cb1..ee7a8c29008 100644
--- a/arch/arm/include/asm/arch-mx27/regs-rtc.h
+++ b/arch/arm/include/asm/arch-mx27/regs-rtc.h
@@ -9,6 +9,7 @@
 #define __MX27_REGS_RTC_H__
 
 #ifndef	__ASSEMBLY__
+#include <asm/types.h>
 struct rtc_regs {
 	u32 hourmin;
 	u32 seconds;
diff --git a/arch/arm/include/asm/arch-mx31/clock.h b/arch/arm/include/asm/arch-mx31/clock.h
index e99e115f79e..5b084dc359b 100644
--- a/arch/arm/include/asm/arch-mx31/clock.h
+++ b/arch/arm/include/asm/arch-mx31/clock.h
@@ -7,6 +7,7 @@
 #ifndef __ASM_ARCH_CLOCK_H
 #define __ASM_ARCH_CLOCK_H
 
+#include <asm/types.h>
 #define MXC_HCLK	CONFIG_MX31_HCLK_FREQ
 
 #define MXC_CLK32	CONFIG_MX31_CLK32
diff --git a/arch/arm/include/asm/arch-mx31/sys_proto.h b/arch/arm/include/asm/arch-mx31/sys_proto.h
index a530afcbc91..72ce987ab20 100644
--- a/arch/arm/include/asm/arch-mx31/sys_proto.h
+++ b/arch/arm/include/asm/arch-mx31/sys_proto.h
@@ -8,6 +8,7 @@
 #define _MX31_SYS_PROTO_H_
 
 #include <asm/mach-imx/sys_proto.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 
 struct mxc_weimcs {
diff --git a/arch/arm/include/asm/arch-mx35/clock.h b/arch/arm/include/asm/arch-mx35/clock.h
index cb0b53a69f4..e2b0f661cc7 100644
--- a/arch/arm/include/asm/arch-mx35/clock.h
+++ b/arch/arm/include/asm/arch-mx35/clock.h
@@ -19,6 +19,7 @@
 #define MXC_CLK32	32768
 #endif
 
+#include <asm/types.h>
 enum mxc_clock {
 	MXC_ARM_CLK,
 	MXC_AHB_CLK,
diff --git a/arch/arm/include/asm/arch-mx35/sys_proto.h b/arch/arm/include/asm/arch-mx35/sys_proto.h
index 6e8b84128bc..20b18d058cb 100644
--- a/arch/arm/include/asm/arch-mx35/sys_proto.h
+++ b/arch/arm/include/asm/arch-mx35/sys_proto.h
@@ -8,6 +8,7 @@
 #define _MX35_SYS_PROTO_H_
 
 #include <asm/mach-imx/sys_proto.h>
+#include <asm/types.h>
 
 void mx3_setup_sdram_bank(u32 start_address, u32 ddr2_config, u32 row,
 			  u32 col, u32 dsize, u32 refresh);
diff --git a/arch/arm/include/asm/arch-mx5/clock.h b/arch/arm/include/asm/arch-mx5/clock.h
index 86aeb5d5610..ad6b56c9bab 100644
--- a/arch/arm/include/asm/arch-mx5/clock.h
+++ b/arch/arm/include/asm/arch-mx5/clock.h
@@ -20,6 +20,7 @@
 #endif
 
 #include <stdbool.h>
+#include <asm/types.h>
 enum mxc_clock {
 	MXC_ARM_CLK = 0,
 	MXC_AHB_CLK,
diff --git a/arch/arm/include/asm/arch-mx5/crm_regs.h b/arch/arm/include/asm/arch-mx5/crm_regs.h
index 9d54ab7fb07..913318e314f 100644
--- a/arch/arm/include/asm/arch-mx5/crm_regs.h
+++ b/arch/arm/include/asm/arch-mx5/crm_regs.h
@@ -6,6 +6,7 @@
 #ifndef __ARCH_ARM_MACH_MX51_CRM_REGS_H__
 #define __ARCH_ARM_MACH_MX51_CRM_REGS_H__
 
+#include <asm/types.h>
 #define MXC_CCM_BASE	CCM_BASE_ADDR
 
 /* DPLL register mapping structure */
diff --git a/arch/arm/include/asm/arch-mx6/crm_regs.h b/arch/arm/include/asm/arch-mx6/crm_regs.h
index 4174f244afa..3bbd049dd91 100644
--- a/arch/arm/include/asm/arch-mx6/crm_regs.h
+++ b/arch/arm/include/asm/arch-mx6/crm_regs.h
@@ -18,6 +18,7 @@
 #define PMU_MISC2		0x020C8170
 
 #ifndef __ASSEMBLY__
+#include <asm/types.h>
 struct mxc_ccm_reg {
 	u32 ccr;	/* 0x0000 */
 	u32 ccdr;
diff --git a/arch/arm/include/asm/arch-mx6/mx6-ddr.h b/arch/arm/include/asm/arch-mx6/mx6-ddr.h
index dbc97b25df8..069dd7ce8fc 100644
--- a/arch/arm/include/asm/arch-mx6/mx6-ddr.h
+++ b/arch/arm/include/asm/arch-mx6/mx6-ddr.h
@@ -23,6 +23,7 @@
 #else
 #error "Please select cpu"
 #endif	/* CONFIG_MX6SL */
+#include <asm/types.h>
 #endif	/* CONFIG_MX6UL */
 #endif	/* CONFIG_MX6SX */
 #endif	/* CONFIG_MX6DL or CONFIG_MX6S */
diff --git a/arch/arm/include/asm/arch-mx6/mxc_hdmi.h b/arch/arm/include/asm/arch-mx6/mxc_hdmi.h
index 71ad0e307c4..5009609022e 100644
--- a/arch/arm/include/asm/arch-mx6/mxc_hdmi.h
+++ b/arch/arm/include/asm/arch-mx6/mxc_hdmi.h
@@ -14,6 +14,7 @@ void imx_setup_hdmi(void);
 /*
  * Hdmi controller registers
  */
+#include <asm/types.h>
 struct hdmi_regs {
 	/*Identification Registers */
 	u8 design_id;			/* 0x000 */
diff --git a/arch/arm/include/asm/arch-mx6/sys_proto.h b/arch/arm/include/asm/arch-mx6/sys_proto.h
index 1e5fa1a75eb..eddce1aeba9 100644
--- a/arch/arm/include/asm/arch-mx6/sys_proto.h
+++ b/arch/arm/include/asm/arch-mx6/sys_proto.h
@@ -9,6 +9,7 @@
 
 #include <asm/mach-imx/sys_proto.h>
 #include <asm/arch/iomux.h>
+#include <asm/types.h>
 
 #define USBPHY_PWD		0x00000000
 
diff --git a/arch/arm/include/asm/arch-mx7/clock.h b/arch/arm/include/asm/arch-mx7/clock.h
index 48c7c3367a5..cf0b0ce9654 100644
--- a/arch/arm/include/asm/arch-mx7/clock.h
+++ b/arch/arm/include/asm/arch-mx7/clock.h
@@ -10,6 +10,7 @@
 #define _ASM_ARCH_CLOCK_H
 
 #include <asm/arch/crm_regs.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_SYS_MX7_HCLK
 #define MXC_HCLK	CONFIG_SYS_MX7_HCLK
diff --git a/arch/arm/include/asm/arch-mx7/clock_slice.h b/arch/arm/include/asm/arch-mx7/clock_slice.h
index 1eac3bec5cb..d7910a8d96c 100644
--- a/arch/arm/include/asm/arch-mx7/clock_slice.h
+++ b/arch/arm/include/asm/arch-mx7/clock_slice.h
@@ -10,6 +10,7 @@
 #define _ASM_ARCH_CLOCK_SLICE_H
 
 #include <stdbool.h>
+#include <asm/types.h>
 enum root_pre_div {
 	CLK_ROOT_PRE_DIV1 = 0,
 	CLK_ROOT_PRE_DIV2,
diff --git a/arch/arm/include/asm/arch-mx7/crm_regs.h b/arch/arm/include/asm/arch-mx7/crm_regs.h
index f3515fab031..7c72f294e63 100644
--- a/arch/arm/include/asm/arch-mx7/crm_regs.h
+++ b/arch/arm/include/asm/arch-mx7/crm_regs.h
@@ -20,6 +20,7 @@
 
 #ifndef __ASSEMBLY__
 
+#include <linux/types.h>
 struct mxc_ccm_ccgr {
 	uint32_t ccgr;
 	uint32_t ccgr_set;
diff --git a/arch/arm/include/asm/arch-mx7/imx-regs.h b/arch/arm/include/asm/arch-mx7/imx-regs.h
index f37419c07f1..f3b0a3f9be5 100644
--- a/arch/arm/include/asm/arch-mx7/imx-regs.h
+++ b/arch/arm/include/asm/arch-mx7/imx-regs.h
@@ -226,6 +226,7 @@
 #include <asm/mach-imx/regs-lcdif.h>
 #include <asm/types.h>
 #include <linux/bitops.h>
+#include <linux/types.h>
 
 extern void imx_get_mac_from_fuse(int dev_id, unsigned char *mac);
 
diff --git a/arch/arm/include/asm/arch-mx7/mx7-ddr.h b/arch/arm/include/asm/arch-mx7/mx7-ddr.h
index bea5dd8ec5e..8a4d21ed819 100644
--- a/arch/arm/include/asm/arch-mx7/mx7-ddr.h
+++ b/arch/arm/include/asm/arch-mx7/mx7-ddr.h
@@ -11,6 +11,7 @@
 #define __ASM_ARCH_MX7_DDR_H__
 
 #ifndef __ASSEMBLY__
+#include <asm/types.h>
 #include <linux/bitops.h>
 #endif
 
diff --git a/arch/arm/include/asm/arch-mx7ulp/clock.h b/arch/arm/include/asm/arch-mx7ulp/clock.h
index 92d4463dff5..5025fa39cfd 100644
--- a/arch/arm/include/asm/arch-mx7ulp/clock.h
+++ b/arch/arm/include/asm/arch-mx7ulp/clock.h
@@ -8,6 +8,7 @@
 
 #include <asm/arch/pcc.h>
 #include <asm/arch/scg.h>
+#include <asm/types.h>
 
 /* Mainly for compatible to imx common code. */
 enum mxc_clock {
diff --git a/arch/arm/include/asm/arch-mx7ulp/gpio.h b/arch/arm/include/asm/arch-mx7ulp/gpio.h
index 7c625609bac..b20b8ba26b9 100644
--- a/arch/arm/include/asm/arch-mx7ulp/gpio.h
+++ b/arch/arm/include/asm/arch-mx7ulp/gpio.h
@@ -6,6 +6,7 @@
 #ifndef __ASM_ARCH_MX7ULP_GPIO_H
 #define __ASM_ARCH_MX7ULP_GPIO_H
 
+#include <asm/types.h>
 struct gpio_regs {
 	u32 gpio_pdor;
 	u32 gpio_psor;
diff --git a/arch/arm/include/asm/arch-mx7ulp/pcc.h b/arch/arm/include/asm/arch-mx7ulp/pcc.h
index 25d10fb7d1a..c1e12009a2e 100644
--- a/arch/arm/include/asm/arch-mx7ulp/pcc.h
+++ b/arch/arm/include/asm/arch-mx7ulp/pcc.h
@@ -8,6 +8,7 @@
 
 #include <stdbool.h>
 #include <asm/arch/scg.h>
+#include <asm/types.h>
 
 /* PCC2 */
 
diff --git a/arch/arm/include/asm/arch-mx7ulp/scg.h b/arch/arm/include/asm/arch-mx7ulp/scg.h
index b4d92d1ed44..0be3ae1dc27 100644
--- a/arch/arm/include/asm/arch-mx7ulp/scg.h
+++ b/arch/arm/include/asm/arch-mx7ulp/scg.h
@@ -8,6 +8,7 @@
 
 #include <stdbool.h>
 #include <stdio.h>
+#include <asm/types.h>
 
 #ifdef CONFIG_CLK_DEBUG
 #define clk_debug(fmt, args...)	printf(fmt, ##args)
diff --git a/arch/arm/include/asm/arch-mxs/clock.h b/arch/arm/include/asm/arch-mxs/clock.h
index ee56d10fec2..bfaa72ce3f2 100644
--- a/arch/arm/include/asm/arch-mxs/clock.h
+++ b/arch/arm/include/asm/arch-mxs/clock.h
@@ -9,6 +9,7 @@
 #ifndef __CLOCK_H__
 #define __CLOCK_H__
 
+#include <linux/types.h>
 enum mxc_clock {
 	MXC_ARM_CLK = 0,
 	MXC_AHB_CLK,
diff --git a/arch/arm/include/asm/arch-mxs/regs-clkctrl-mx23.h b/arch/arm/include/asm/arch-mxs/regs-clkctrl-mx23.h
index 50fdc9cd032..96976ed0a4a 100644
--- a/arch/arm/include/asm/arch-mxs/regs-clkctrl-mx23.h
+++ b/arch/arm/include/asm/arch-mxs/regs-clkctrl-mx23.h
@@ -15,6 +15,7 @@
 #include <asm/mach-imx/regs-common.h>
 
 #ifndef	__ASSEMBLY__
+#include <linux/types.h>
 struct mxs_clkctrl_regs {
 	mxs_reg_32(hw_clkctrl_pll0ctrl0)	/* 0x00 */
 	uint32_t	hw_clkctrl_pll0ctrl1;	/* 0x10 */
diff --git a/arch/arm/include/asm/arch-mxs/regs-clkctrl-mx28.h b/arch/arm/include/asm/arch-mxs/regs-clkctrl-mx28.h
index caef9e4b1fc..494757fe622 100644
--- a/arch/arm/include/asm/arch-mxs/regs-clkctrl-mx28.h
+++ b/arch/arm/include/asm/arch-mxs/regs-clkctrl-mx28.h
@@ -15,6 +15,7 @@
 #include <asm/mach-imx/regs-common.h>
 
 #ifndef	__ASSEMBLY__
+#include <linux/types.h>
 struct mxs_clkctrl_regs {
 	mxs_reg_32(hw_clkctrl_pll0ctrl0)	/* 0x00 */
 	uint32_t	hw_clkctrl_pll0ctrl1;	/* 0x10 */
diff --git a/arch/arm/include/asm/arch-mxs/regs-digctl.h b/arch/arm/include/asm/arch-mxs/regs-digctl.h
index 219f58ba75f..63735af5ec3 100644
--- a/arch/arm/include/asm/arch-mxs/regs-digctl.h
+++ b/arch/arm/include/asm/arch-mxs/regs-digctl.h
@@ -11,6 +11,7 @@
 #include <asm/mach-imx/regs-common.h>
 
 #ifndef	__ASSEMBLY__
+#include <linux/types.h>
 struct mxs_digctl_regs {
 	mxs_reg_32(hw_digctl_ctrl)				/* 0x000 */
 	mxs_reg_32(hw_digctl_status)				/* 0x010 */
diff --git a/arch/arm/include/asm/arch-mxs/regs-pinctrl.h b/arch/arm/include/asm/arch-mxs/regs-pinctrl.h
index 134d436ee92..d06b3b83914 100644
--- a/arch/arm/include/asm/arch-mxs/regs-pinctrl.h
+++ b/arch/arm/include/asm/arch-mxs/regs-pinctrl.h
@@ -15,6 +15,7 @@
 #include <asm/mach-imx/regs-common.h>
 
 #ifndef	__ASSEMBLY__
+#include <linux/types.h>
 struct mxs_pinctrl_regs {
 	mxs_reg_32(hw_pinctrl_ctrl)		/* 0x0 */
 
diff --git a/arch/arm/include/asm/arch-mxs/regs-power-mx23.h b/arch/arm/include/asm/arch-mxs/regs-power-mx23.h
index a0dc7810230..9cfb7223b99 100644
--- a/arch/arm/include/asm/arch-mxs/regs-power-mx23.h
+++ b/arch/arm/include/asm/arch-mxs/regs-power-mx23.h
@@ -11,6 +11,7 @@
 #include <asm/mach-imx/regs-common.h>
 
 #ifndef	__ASSEMBLY__
+#include <linux/types.h>
 struct mxs_power_regs {
 	mxs_reg_32(hw_power_ctrl)
 	mxs_reg_32(hw_power_5vctrl)
diff --git a/arch/arm/include/asm/arch-mxs/regs-power-mx28.h b/arch/arm/include/asm/arch-mxs/regs-power-mx28.h
index 39250c506d0..7ceb576e6f5 100644
--- a/arch/arm/include/asm/arch-mxs/regs-power-mx28.h
+++ b/arch/arm/include/asm/arch-mxs/regs-power-mx28.h
@@ -11,6 +11,7 @@
 #include <asm/mach-imx/regs-common.h>
 
 #ifndef	__ASSEMBLY__
+#include <linux/types.h>
 struct mxs_power_regs {
 	mxs_reg_32(hw_power_ctrl)
 	mxs_reg_32(hw_power_5vctrl)
diff --git a/arch/arm/include/asm/arch-mxs/regs-ssp.h b/arch/arm/include/asm/arch-mxs/regs-ssp.h
index eeb7e7f44c0..947a3624c2f 100644
--- a/arch/arm/include/asm/arch-mxs/regs-ssp.h
+++ b/arch/arm/include/asm/arch-mxs/regs-ssp.h
@@ -86,6 +86,7 @@ static inline int mxs_ssp_clock_by_bus(unsigned int clock)
 #endif
 }
 
+#include <linux/types.h>
 static inline struct mxs_ssp_regs *mxs_ssp_regs_by_bus(unsigned int port)
 {
 	switch (port) {
diff --git a/arch/arm/include/asm/arch-mxs/regs-usb.h b/arch/arm/include/asm/arch-mxs/regs-usb.h
index 8d5168dd8ea..d21c26428b0 100644
--- a/arch/arm/include/asm/arch-mxs/regs-usb.h
+++ b/arch/arm/include/asm/arch-mxs/regs-usb.h
@@ -9,6 +9,7 @@
 #ifndef __REGS_USB_H__
 #define __REGS_USB_H__
 
+#include <linux/types.h>
 struct mxs_usb_regs {
 	uint32_t		hw_usbctrl_id;			/* 0x000 */
 	uint32_t		hw_usbctrl_hwgeneral;		/* 0x004 */
diff --git a/arch/arm/include/asm/arch-mxs/sys_proto.h b/arch/arm/include/asm/arch-mxs/sys_proto.h
index 85374e2b87c..5ade99aa5dc 100644
--- a/arch/arm/include/asm/arch-mxs/sys_proto.h
+++ b/arch/arm/include/asm/arch-mxs/sys_proto.h
@@ -11,6 +11,7 @@
 
 #include <asm/mach-imx/sys_proto.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 int mxsmmc_initialize(struct bd_info *bis, int id, int (*wp)(int),
 		      int (*cd)(int));
diff --git a/arch/arm/include/asm/arch-omap3/dma.h b/arch/arm/include/asm/arch-omap3/dma.h
index d26e490d2db..2df9d075870 100644
--- a/arch/arm/include/asm/arch-omap3/dma.h
+++ b/arch/arm/include/asm/arch-omap3/dma.h
@@ -7,6 +7,7 @@
  */
 
 /* Functions */
+#include <linux/types.h>
 void omap3_dma_init(void);
 int omap3_dma_conf_transfer(uint32_t chan, uint32_t *src, uint32_t *dst,
 		uint32_t sze);
diff --git a/arch/arm/include/asm/arch-omap3/dss.h b/arch/arm/include/asm/arch-omap3/dss.h
index 8bf6b4895fc..c16156b749e 100644
--- a/arch/arm/include/asm/arch-omap3/dss.h
+++ b/arch/arm/include/asm/arch-omap3/dss.h
@@ -29,6 +29,7 @@
 #define DSS_H
 
 /* DSS Base Registers */
+#include <asm/types.h>
 #define OMAP3_DSS_BASE		0x48050000
 #define OMAP3_DISPC_BASE	0x48050400
 #define OMAP3_VENC_BASE		0x48050C00
diff --git a/arch/arm/include/asm/arch-omap3/mem.h b/arch/arm/include/asm/arch-omap3/mem.h
index 7adc134a752..a09b5a2ca79 100644
--- a/arch/arm/include/asm/arch-omap3/mem.h
+++ b/arch/arm/include/asm/arch-omap3/mem.h
@@ -12,6 +12,7 @@
 #define CS1		0x1 /* mirror CS1 regs appear offset 0x30 from CS0 */
 
 #ifndef __ASSEMBLY__
+#include <asm/types.h>
 enum {
 	STACKED = 0,
 	IP_DDR = 1,
diff --git a/arch/arm/include/asm/arch-omap3/musb.h b/arch/arm/include/asm/arch-omap3/musb.h
index cb3f5d89daa..58a5616ee08 100644
--- a/arch/arm/include/asm/arch-omap3/musb.h
+++ b/arch/arm/include/asm/arch-omap3/musb.h
@@ -6,6 +6,7 @@
 
 #ifndef __ASM_ARCH_OMAP3_MUSB_H
 #define __ASM_ARCH_OMAP3_MUSB_H
+#include <asm/types.h>
 void am35x_musb_reset(struct udevice *dev);
 void am35x_musb_phy_power(struct udevice *dev, u8 on);
 void am35x_musb_clear_irq(struct udevice *dev);
diff --git a/arch/arm/include/asm/arch-omap3/sys_proto.h b/arch/arm/include/asm/arch-omap3/sys_proto.h
index 32ac0335158..7fc9b09337a 100644
--- a/arch/arm/include/asm/arch-omap3/sys_proto.h
+++ b/arch/arm/include/asm/arch-omap3/sys_proto.h
@@ -8,6 +8,7 @@
 #define _SYS_PROTO_H_
 #include <linux/mtd/omap_gpmc.h>
 #include <asm/omap_common.h>
+#include <linux/types.h>
 
 typedef struct {
 	u32 mtype;
diff --git a/arch/arm/include/asm/arch-omap4/clock.h b/arch/arm/include/asm/arch-omap4/clock.h
index 0a626fe647a..d2e14ff8962 100644
--- a/arch/arm/include/asm/arch-omap4/clock.h
+++ b/arch/arm/include/asm/arch-omap4/clock.h
@@ -8,6 +8,7 @@
 #ifndef _CLOCKS_OMAP4_H_
 #define _CLOCKS_OMAP4_H_
 #include <asm/omap_common.h>
+#include <asm/types.h>
 
 /*
  * Assuming a maximum of 1.5 GHz ARM speed and a minimum of 2 cycles per
diff --git a/arch/arm/include/asm/arch-omap4/sys_proto.h b/arch/arm/include/asm/arch-omap4/sys_proto.h
index b2a68876585..51bc1b82948 100644
--- a/arch/arm/include/asm/arch-omap4/sys_proto.h
+++ b/arch/arm/include/asm/arch-omap4/sys_proto.h
@@ -11,6 +11,7 @@
 #include <asm/arch/clock.h>
 #include <asm/io.h>
 #include <asm/omap_common.h>
+#include <asm/types.h>
 #include <linux/mtd/omap_gpmc.h>
 #include <asm/arch/mux_omap4.h>
 #include <asm/ti-common/sys_proto.h>
diff --git a/arch/arm/include/asm/arch-omap5/dra7xx_iodelay.h b/arch/arm/include/asm/arch-omap5/dra7xx_iodelay.h
index ea2f113f98d..bdfc026dc05 100644
--- a/arch/arm/include/asm/arch-omap5/dra7xx_iodelay.h
+++ b/arch/arm/include/asm/arch-omap5/dra7xx_iodelay.h
@@ -10,6 +10,7 @@
 #define _DRA7_IODELAY_H_
 
 #include <asm/arch/sys_proto.h>
+#include <asm/types.h>
 
 /* CONFIG_REG_0 */
 #define CFG_REG_0_OFFSET		0xC
diff --git a/arch/arm/include/asm/arch-omap5/sys_proto.h b/arch/arm/include/asm/arch-omap5/sys_proto.h
index 80b0c93b5eb..069515e253d 100644
--- a/arch/arm/include/asm/arch-omap5/sys_proto.h
+++ b/arch/arm/include/asm/arch-omap5/sys_proto.h
@@ -14,6 +14,7 @@
 #include <linux/mtd/omap_gpmc.h>
 #include <asm/arch/clock.h>
 #include <asm/ti-common/sys_proto.h>
+#include <linux/types.h>
 
 /*
  * Structure for Iodelay configuration registers.
diff --git a/arch/arm/include/asm/arch-pxa/pxa.h b/arch/arm/include/asm/arch-pxa/pxa.h
index 428a848e157..7fd0ebad5c0 100644
--- a/arch/arm/include/asm/arch-pxa/pxa.h
+++ b/arch/arm/include/asm/arch-pxa/pxa.h
@@ -8,6 +8,7 @@
 #ifndef	__PXA_H__
 #define	__PXA_H__
 
+#include <linux/types.h>
 #define PXA255_A0	0x00000106
 #define PXA250_C0	0x00000105
 #define PXA250_B2	0x00000104
diff --git a/arch/arm/include/asm/arch-pxa/regs-mmc.h b/arch/arm/include/asm/arch-pxa/regs-mmc.h
index 6d9a736d9c0..7ed111cf99a 100644
--- a/arch/arm/include/asm/arch-pxa/regs-mmc.h
+++ b/arch/arm/include/asm/arch-pxa/regs-mmc.h
@@ -6,6 +6,7 @@
 #ifndef __REGS_MMC_H__
 #define __REGS_MMC_H__
 
+#include <linux/types.h>
 #define MMC0_BASE	0x41100000
 #define MMC1_BASE	0x42000000
 
diff --git a/arch/arm/include/asm/arch-pxa/regs-uart.h b/arch/arm/include/asm/arch-pxa/regs-uart.h
index bdd0a4757b5..fc7690ee4f3 100644
--- a/arch/arm/include/asm/arch-pxa/regs-uart.h
+++ b/arch/arm/include/asm/arch-pxa/regs-uart.h
@@ -6,6 +6,7 @@
 #ifndef	__REGS_UART_H__
 #define	__REGS_UART_H__
 
+#include <linux/types.h>
 #define	FFUART_BASE		0x40100000
 #define	BTUART_BASE		0x40200000
 #define	STUART_BASE		0x40700000
diff --git a/arch/arm/include/asm/arch-pxa/regs-usb.h b/arch/arm/include/asm/arch-pxa/regs-usb.h
index e46887c9ed4..60e56458087 100644
--- a/arch/arm/include/asm/arch-pxa/regs-usb.h
+++ b/arch/arm/include/asm/arch-pxa/regs-usb.h
@@ -8,6 +8,7 @@
 #ifndef __REGS_USB_H__
 #define __REGS_USB_H__
 
+#include <linux/types.h>
 struct pxa25x_udc_regs {
 	/* UDC Control Register */
 	uint32_t	udccr; /* 0x000 */
diff --git a/arch/arm/include/asm/arch-rk3308/cru_rk3308.h b/arch/arm/include/asm/arch-rk3308/cru_rk3308.h
index 08af4f547dd..d8feb8bff4e 100644
--- a/arch/arm/include/asm/arch-rk3308/cru_rk3308.h
+++ b/arch/arm/include/asm/arch-rk3308/cru_rk3308.h
@@ -6,6 +6,7 @@
 #define _ASM_ARCH_CRU_RK3308_H
 
 #include <linux/kernel.h>
+#include <linux/types.h>
 #define MHz		1000000
 #define OSC_HZ		(24 * MHz)
 
diff --git a/arch/arm/include/asm/arch-rockchip/bootrom.h b/arch/arm/include/asm/arch-rockchip/bootrom.h
index 0da78f30b61..a1937c251f1 100644
--- a/arch/arm/include/asm/arch-rockchip/bootrom.h
+++ b/arch/arm/include/asm/arch-rockchip/bootrom.h
@@ -11,6 +11,7 @@
  * Saved Stack pointer address.
  * Access might be needed in some special cases.
  */
+#include <asm/types.h>
 extern u32 SAVE_SP_ADDR;
 
 /**
diff --git a/arch/arm/include/asm/arch-rockchip/clock.h b/arch/arm/include/asm/arch-rockchip/clock.h
index 2b47b7a9d26..f05d88bc0a6 100644
--- a/arch/arm/include/asm/arch-rockchip/clock.h
+++ b/arch/arm/include/asm/arch-rockchip/clock.h
@@ -6,7 +6,9 @@
 #ifndef _ASM_ARCH_CLOCK_H
 #define _ASM_ARCH_CLOCK_H
 
+#include <compiler.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 struct udevice;
 
diff --git a/arch/arm/include/asm/arch-rockchip/cpu_rk3288.h b/arch/arm/include/asm/arch-rockchip/cpu_rk3288.h
index 3536f444946..0180290cad4 100644
--- a/arch/arm/include/asm/arch-rockchip/cpu_rk3288.h
+++ b/arch/arm/include/asm/arch-rockchip/cpu_rk3288.h
@@ -8,6 +8,7 @@
 
 #include <stdbool.h>
 #include <asm/io.h>
+#include <asm/types.h>
 
 #define ROCKCHIP_CPU_MASK       0xffff0000
 #define ROCKCHIP_CPU_RK3288     0x32880000
diff --git a/arch/arm/include/asm/arch-rockchip/cru_px30.h b/arch/arm/include/asm/arch-rockchip/cru_px30.h
index c76d5751ef5..3c58db1d263 100644
--- a/arch/arm/include/asm/arch-rockchip/cru_px30.h
+++ b/arch/arm/include/asm/arch-rockchip/cru_px30.h
@@ -6,6 +6,7 @@
 #define _ASM_ARCH_CRU_PX30_H
 
 #include <linux/kernel.h>
+#include <linux/types.h>
 #define MHz		1000000
 #define KHz		1000
 #define OSC_HZ		(24 * MHz)
diff --git a/arch/arm/include/asm/arch-rockchip/cru_rk3036.h b/arch/arm/include/asm/arch-rockchip/cru_rk3036.h
index c580bf12034..ac62de5b9f1 100644
--- a/arch/arm/include/asm/arch-rockchip/cru_rk3036.h
+++ b/arch/arm/include/asm/arch-rockchip/cru_rk3036.h
@@ -6,6 +6,7 @@
 #define _ASM_ARCH_CRU_RK3036_H
 
 #include <linux/kernel.h>
+#include <linux/types.h>
 #define OSC_HZ		(24 * 1000 * 1000)
 
 #define APLL_HZ		(600 * 1000000)
diff --git a/arch/arm/include/asm/arch-rockchip/cru_rk3128.h b/arch/arm/include/asm/arch-rockchip/cru_rk3128.h
index e7dec3c7c9e..63c697b9839 100644
--- a/arch/arm/include/asm/arch-rockchip/cru_rk3128.h
+++ b/arch/arm/include/asm/arch-rockchip/cru_rk3128.h
@@ -7,6 +7,7 @@
 #define _ASM_ARCH_CRU_RK3128_H
 
 #ifndef __ASSEMBLY__
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/kernel.h>
 #endif
diff --git a/arch/arm/include/asm/arch-rockchip/cru_rk3188.h b/arch/arm/include/asm/arch-rockchip/cru_rk3188.h
index 97268b8777e..62120dc2589 100644
--- a/arch/arm/include/asm/arch-rockchip/cru_rk3188.h
+++ b/arch/arm/include/asm/arch-rockchip/cru_rk3188.h
@@ -7,6 +7,7 @@
 
 #include <stdbool.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #define OSC_HZ		(24 * 1000 * 1000)
 
 #define APLL_HZ		(1608 * 1000000)
diff --git a/arch/arm/include/asm/arch-rockchip/cru_rk322x.h b/arch/arm/include/asm/arch-rockchip/cru_rk322x.h
index ca4d727a6a7..706fca369b0 100644
--- a/arch/arm/include/asm/arch-rockchip/cru_rk322x.h
+++ b/arch/arm/include/asm/arch-rockchip/cru_rk322x.h
@@ -6,6 +6,7 @@
 #define _ASM_ARCH_CRU_RK322X_H
 
 #include <linux/kernel.h>
+#include <linux/types.h>
 #define MHz		1000000
 #define OSC_HZ		(24 * MHz)
 
diff --git a/arch/arm/include/asm/arch-rockchip/cru_rk3288.h b/arch/arm/include/asm/arch-rockchip/cru_rk3288.h
index 7affb2f0644..82ba61abcbe 100644
--- a/arch/arm/include/asm/arch-rockchip/cru_rk3288.h
+++ b/arch/arm/include/asm/arch-rockchip/cru_rk3288.h
@@ -9,6 +9,7 @@
 #define _ASM_ARCH_CRU_RK3288_H
 
 #include <linux/kernel.h>
+#include <linux/types.h>
 #define OSC_HZ		(24 * 1000 * 1000)
 
 #define APLL_HZ		(1800 * 1000000)
diff --git a/arch/arm/include/asm/arch-rockchip/cru_rk3328.h b/arch/arm/include/asm/arch-rockchip/cru_rk3328.h
index 2cd984ad009..5a95a0173c5 100644
--- a/arch/arm/include/asm/arch-rockchip/cru_rk3328.h
+++ b/arch/arm/include/asm/arch-rockchip/cru_rk3328.h
@@ -7,6 +7,7 @@
 #define __ASM_ARCH_CRU_RK3328_H_
 
 #include <linux/kernel.h>
+#include <linux/types.h>
 struct rk3328_clk_priv {
 	struct rk3328_cru *cru;
 	ulong rate;
diff --git a/arch/arm/include/asm/arch-rockchip/cru_rk3399.h b/arch/arm/include/asm/arch-rockchip/cru_rk3399.h
index fdeb3735770..97e44815621 100644
--- a/arch/arm/include/asm/arch-rockchip/cru_rk3399.h
+++ b/arch/arm/include/asm/arch-rockchip/cru_rk3399.h
@@ -7,6 +7,7 @@
 #define __ASM_ARCH_CRU_RK3399_H_
 
 /* Private data for the clock driver - used by rockchip_get_cru() */
+#include <asm/types.h>
 #include <linux/kernel.h>
 struct rk3399_clk_priv {
 	struct rockchip_cru *cru;
diff --git a/arch/arm/include/asm/arch-rockchip/cru_rv1108.h b/arch/arm/include/asm/arch-rockchip/cru_rv1108.h
index 4499b453b68..3a69195ce51 100644
--- a/arch/arm/include/asm/arch-rockchip/cru_rv1108.h
+++ b/arch/arm/include/asm/arch-rockchip/cru_rv1108.h
@@ -9,6 +9,7 @@
 #ifndef __ASSEMBLY__
 #include <linux/bitops.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #endif
 
 #define OSC_HZ		(24 * 1000 * 1000)
diff --git a/arch/arm/include/asm/arch-rockchip/ddr_rk3188.h b/arch/arm/include/asm/arch-rockchip/ddr_rk3188.h
index c60655fcae0..be3d9d4d36b 100644
--- a/arch/arm/include/asm/arch-rockchip/ddr_rk3188.h
+++ b/arch/arm/include/asm/arch-rockchip/ddr_rk3188.h
@@ -7,6 +7,7 @@
 #define _ASM_ARCH_DDR_RK3188_H
 
 #include <asm/arch-rockchip/ddr_rk3288.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 
 /*
diff --git a/arch/arm/include/asm/arch-rockchip/ddr_rk3288.h b/arch/arm/include/asm/arch-rockchip/ddr_rk3288.h
index ea3b6f48d90..312bdbc6de5 100644
--- a/arch/arm/include/asm/arch-rockchip/ddr_rk3288.h
+++ b/arch/arm/include/asm/arch-rockchip/ddr_rk3288.h
@@ -6,6 +6,7 @@
 #ifndef _ASM_ARCH_DDR_RK3288_H
 #define _ASM_ARCH_DDR_RK3288_H
 
+#include <asm/types.h>
 #include <linux/kernel.h>
 struct rk3288_ddr_pctl {
 	u32 scfg;
diff --git a/arch/arm/include/asm/arch-rockchip/ddr_rk3368.h b/arch/arm/include/asm/arch-rockchip/ddr_rk3368.h
index a03d3318e02..7ee787c526b 100644
--- a/arch/arm/include/asm/arch-rockchip/ddr_rk3368.h
+++ b/arch/arm/include/asm/arch-rockchip/ddr_rk3368.h
@@ -7,6 +7,7 @@
 #define __ASM_ARCH_DDR_RK3368_H__
 
 #ifndef __ASSEMBLY__
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/kernel.h>
 #endif
diff --git a/arch/arm/include/asm/arch-rockchip/edp_rk3288.h b/arch/arm/include/asm/arch-rockchip/edp_rk3288.h
index 97383fce190..d51094f1bfc 100644
--- a/arch/arm/include/asm/arch-rockchip/edp_rk3288.h
+++ b/arch/arm/include/asm/arch-rockchip/edp_rk3288.h
@@ -7,6 +7,7 @@
 #ifndef _ASM_ARCH_EDP_H
 #define _ASM_ARCH_EDP_H
 
+#include <asm/types.h>
 #include <linux/kernel.h>
 struct rk3288_edp {
 	u8	res0[0x10];
diff --git a/arch/arm/include/asm/arch-rockchip/f_rockusb.h b/arch/arm/include/asm/arch-rockchip/f_rockusb.h
index 9772321023b..46bcbf7fce4 100644
--- a/arch/arm/include/asm/arch-rockchip/f_rockusb.h
+++ b/arch/arm/include/asm/arch-rockchip/f_rockusb.h
@@ -8,6 +8,7 @@
 #ifndef _F_ROCKUSB_H_
 #define _F_ROCKUSB_H_
 #include <blk.h>
+#include <linux/types.h>
 
 #define ROCKUSB_VERSION		"0.1"
 
diff --git a/arch/arm/include/asm/arch-rockchip/gpio.h b/arch/arm/include/asm/arch-rockchip/gpio.h
index 0ec09d40b4e..810b292329c 100644
--- a/arch/arm/include/asm/arch-rockchip/gpio.h
+++ b/arch/arm/include/asm/arch-rockchip/gpio.h
@@ -6,6 +6,7 @@
 #ifndef _ASM_ARCH_GPIO_H
 #define _ASM_ARCH_GPIO_H
 
+#include <asm/types.h>
 #include <linux/kernel.h>
 struct rockchip_gpio_regs {
 	u32 swport_dr;
diff --git a/arch/arm/include/asm/arch-rockchip/grf_rk3188.h b/arch/arm/include/asm/arch-rockchip/grf_rk3188.h
index 8e80749a76e..6899f652408 100644
--- a/arch/arm/include/asm/arch-rockchip/grf_rk3188.h
+++ b/arch/arm/include/asm/arch-rockchip/grf_rk3188.h
@@ -6,6 +6,7 @@
 #ifndef _ASM_ARCH_GRF_RK3188_H
 #define _ASM_ARCH_GRF_RK3188_H
 
+#include <asm/types.h>
 #include <linux/kernel.h>
 struct rk3188_grf_gpio_lh {
 	u32 l;
diff --git a/arch/arm/include/asm/arch-rockchip/grf_rk3288.h b/arch/arm/include/asm/arch-rockchip/grf_rk3288.h
index 894d3a40b09..f30e3c05dc0 100644
--- a/arch/arm/include/asm/arch-rockchip/grf_rk3288.h
+++ b/arch/arm/include/asm/arch-rockchip/grf_rk3288.h
@@ -7,6 +7,7 @@
 #ifndef _ASM_ARCH_GRF_RK3288_H
 #define _ASM_ARCH_GRF_RK3288_H
 
+#include <asm/types.h>
 struct rk3288_grf_gpio_lh {
 	u32 l;
 	u32 h;
diff --git a/arch/arm/include/asm/arch-rockchip/grf_rk3328.h b/arch/arm/include/asm/arch-rockchip/grf_rk3328.h
index 663a3fa52e3..312f6f4193c 100644
--- a/arch/arm/include/asm/arch-rockchip/grf_rk3328.h
+++ b/arch/arm/include/asm/arch-rockchip/grf_rk3328.h
@@ -6,6 +6,7 @@
 #ifndef __SOC_ROCKCHIP_RK3328_GRF_H__
 #define __SOC_ROCKCHIP_RK3328_GRF_H__
 
+#include <asm/types.h>
 #include <linux/kernel.h>
 struct rk3328_grf_regs {
 	u32 gpio0a_iomux;
diff --git a/arch/arm/include/asm/arch-rockchip/grf_rk3368.h b/arch/arm/include/asm/arch-rockchip/grf_rk3368.h
index 8e4b3ec481c..62fd8792cfa 100644
--- a/arch/arm/include/asm/arch-rockchip/grf_rk3368.h
+++ b/arch/arm/include/asm/arch-rockchip/grf_rk3368.h
@@ -7,6 +7,7 @@
 #define _ASM_ARCH_GRF_RK3368_H
 
 #ifndef __ASSEMBLY__
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/kernel.h>
 #endif
diff --git a/arch/arm/include/asm/arch-rockchip/grf_rk3399.h b/arch/arm/include/asm/arch-rockchip/grf_rk3399.h
index 0a7249560f2..7d7708576ed 100644
--- a/arch/arm/include/asm/arch-rockchip/grf_rk3399.h
+++ b/arch/arm/include/asm/arch-rockchip/grf_rk3399.h
@@ -6,6 +6,7 @@
 #ifndef __SOC_ROCKCHIP_RK3399_GRF_H__
 #define __SOC_ROCKCHIP_RK3399_GRF_H__
 
+#include <asm/types.h>
 #include <linux/kernel.h>
 struct rk3399_grf_regs {
 	u32 reserved[0x800];
diff --git a/arch/arm/include/asm/arch-rockchip/grf_rv1108.h b/arch/arm/include/asm/arch-rockchip/grf_rv1108.h
index aefbe9b56e1..470e91c2970 100644
--- a/arch/arm/include/asm/arch-rockchip/grf_rv1108.h
+++ b/arch/arm/include/asm/arch-rockchip/grf_rv1108.h
@@ -5,6 +5,7 @@
 #ifndef _ASM_ARCH_GRF_RV1108_H
 #define _ASM_ARCH_GRF_RV1108_H
 
+#include <asm/types.h>
 #include <linux/kernel.h>
 struct rv1108_grf {
 	u32 reserved[4];
diff --git a/arch/arm/include/asm/arch-rockchip/i2c.h b/arch/arm/include/asm/arch-rockchip/i2c.h
index b0e1936f608..4da43237214 100644
--- a/arch/arm/include/asm/arch-rockchip/i2c.h
+++ b/arch/arm/include/asm/arch-rockchip/i2c.h
@@ -7,6 +7,7 @@
 #ifndef __ASM_ARCH_I2C_H
 #define __ASM_ARCH_I2C_H
 
+#include <asm/types.h>
 struct i2c_regs {
 	u32 con;
 	u32 clkdiv;
diff --git a/arch/arm/include/asm/arch-rockchip/misc.h b/arch/arm/include/asm/arch-rockchip/misc.h
index b6b03c934ed..8689e3dadac 100644
--- a/arch/arm/include/asm/arch-rockchip/misc.h
+++ b/arch/arm/include/asm/arch-rockchip/misc.h
@@ -6,6 +6,7 @@
  *      Rohan Garg <rohan.garg@collabora.com>
  */
 
+#include <asm/types.h>
 int rockchip_cpuid_from_efuse(const u32 cpuid_offset,
 			      const u32 cpuid_length,
 			      u8 *cpuid);
diff --git a/arch/arm/include/asm/arch-rockchip/pmu_rk3188.h b/arch/arm/include/asm/arch-rockchip/pmu_rk3188.h
index 6227dc0ed5a..24de34758fb 100644
--- a/arch/arm/include/asm/arch-rockchip/pmu_rk3188.h
+++ b/arch/arm/include/asm/arch-rockchip/pmu_rk3188.h
@@ -6,6 +6,7 @@
 #ifndef _ASM_ARCH_PMU_RK3188_H
 #define _ASM_ARCH_PMU_RK3188_H
 
+#include <asm/types.h>
 #include <linux/kernel.h>
 struct rk3188_pmu {
 	u32 wakeup_cfg[2];
diff --git a/arch/arm/include/asm/arch-rockchip/pmu_rk3288.h b/arch/arm/include/asm/arch-rockchip/pmu_rk3288.h
index 1b50cd5326e..7574eb975c3 100644
--- a/arch/arm/include/asm/arch-rockchip/pmu_rk3288.h
+++ b/arch/arm/include/asm/arch-rockchip/pmu_rk3288.h
@@ -8,6 +8,7 @@
 #ifndef _ASM_ARCH_PMU_RK3288_H
 #define _ASM_ARCH_PMU_RK3288_H
 
+#include <asm/types.h>
 #include <linux/kernel.h>
 struct rk3288_pmu {
 	u32 wakeup_cfg[2];
diff --git a/arch/arm/include/asm/arch-rockchip/pmu_rk3399.h b/arch/arm/include/asm/arch-rockchip/pmu_rk3399.h
index 350559d5054..0408683765c 100644
--- a/arch/arm/include/asm/arch-rockchip/pmu_rk3399.h
+++ b/arch/arm/include/asm/arch-rockchip/pmu_rk3399.h
@@ -7,6 +7,7 @@
 #ifndef __SOC_ROCKCHIP_RK3399_PMU_H__
 #define __SOC_ROCKCHIP_RK3399_PMU_H__
 
+#include <asm/types.h>
 #include <linux/kernel.h>
 struct rk3399_pmu_regs {
 	u32 pmu_wakeup_cfg[5];
diff --git a/arch/arm/include/asm/arch-rockchip/sdram.h b/arch/arm/include/asm/arch-rockchip/sdram.h
index cf2a7b7d105..e02fea9f4fa 100644
--- a/arch/arm/include/asm/arch-rockchip/sdram.h
+++ b/arch/arm/include/asm/arch-rockchip/sdram.h
@@ -6,6 +6,7 @@
 #ifndef _ASM_ARCH_SDRAM_H
 #define _ASM_ARCH_SDRAM_H
 
+#include <linux/types.h>
 enum {
 	DDR4 = 0,
 	DDR3 = 0x3,
diff --git a/arch/arm/include/asm/arch-rockchip/sdram_common.h b/arch/arm/include/asm/arch-rockchip/sdram_common.h
index 5efa6e9445d..6d8c93092f3 100644
--- a/arch/arm/include/asm/arch-rockchip/sdram_common.h
+++ b/arch/arm/include/asm/arch-rockchip/sdram_common.h
@@ -10,6 +10,7 @@
 #define MHZ		(1000 * 1000)
 #endif
 
+#include <asm/types.h>
 #define PATTERN		(0x5aa5f00f)
 
 #define MIN(a, b)	(((a) > (b)) ? (b) : (a))
diff --git a/arch/arm/include/asm/arch-rockchip/sdram_msch.h b/arch/arm/include/asm/arch-rockchip/sdram_msch.h
index cfb3d9cc869..9ae4d271592 100644
--- a/arch/arm/include/asm/arch-rockchip/sdram_msch.h
+++ b/arch/arm/include/asm/arch-rockchip/sdram_msch.h
@@ -6,6 +6,7 @@
 #ifndef _ASM_ARCH_SDRAM_MSCH_H
 #define _ASM_ARCH_SDRAM_MSCH_H
 
+#include <asm/types.h>
 union noc_ddrtiminga0 {
 	u32 d32;
 	struct {
diff --git a/arch/arm/include/asm/arch-rockchip/sdram_pctl_px30.h b/arch/arm/include/asm/arch-rockchip/sdram_pctl_px30.h
index 3a3657789f6..e48a6b87f73 100644
--- a/arch/arm/include/asm/arch-rockchip/sdram_pctl_px30.h
+++ b/arch/arm/include/asm/arch-rockchip/sdram_pctl_px30.h
@@ -8,6 +8,8 @@
 #include <asm/arch-rockchip/sdram_common.h>
 
 #ifndef __ASSEMBLY__
+#include <compiler.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #endif
 
diff --git a/arch/arm/include/asm/arch-rockchip/sdram_phy_px30.h b/arch/arm/include/asm/arch-rockchip/sdram_phy_px30.h
index a033a185388..548f076ef76 100644
--- a/arch/arm/include/asm/arch-rockchip/sdram_phy_px30.h
+++ b/arch/arm/include/asm/arch-rockchip/sdram_phy_px30.h
@@ -9,6 +9,8 @@
 #include <asm/arch-rockchip/sdram_phy_ron_rtt_px30.h>
 
 #ifndef __ASSEMBLY__
+#include <compiler.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #endif
 
diff --git a/arch/arm/include/asm/arch-rockchip/sdram_px30.h b/arch/arm/include/asm/arch-rockchip/sdram_px30.h
index 2ab8e97ae1d..2a4353976f1 100644
--- a/arch/arm/include/asm/arch-rockchip/sdram_px30.h
+++ b/arch/arm/include/asm/arch-rockchip/sdram_px30.h
@@ -10,6 +10,7 @@
 #include <asm/arch-rockchip/sdram_pctl_px30.h>
 #include <asm/arch-rockchip/sdram_phy_px30.h>
 #include <asm/arch-rockchip/sdram_phy_ron_rtt_px30.h>
+#include <asm/types.h>
 
 #define SR_IDLE				93
 #define PD_IDLE				13
diff --git a/arch/arm/include/asm/arch-rockchip/sdram_rk3036.h b/arch/arm/include/asm/arch-rockchip/sdram_rk3036.h
index 7f89d7f9211..85a9f54e6d6 100644
--- a/arch/arm/include/asm/arch-rockchip/sdram_rk3036.h
+++ b/arch/arm/include/asm/arch-rockchip/sdram_rk3036.h
@@ -6,6 +6,7 @@
 #define _ASM_ARCH_SDRAM_RK3036_H
 
 #include <linux/kernel.h>
+#include <linux/types.h>
 struct rk3036_ddr_pctl {
 	u32 scfg;
 	u32 sctl;
diff --git a/arch/arm/include/asm/arch-rockchip/sdram_rk322x.h b/arch/arm/include/asm/arch-rockchip/sdram_rk322x.h
index 2aaf66c1ab0..60c68f751a5 100644
--- a/arch/arm/include/asm/arch-rockchip/sdram_rk322x.h
+++ b/arch/arm/include/asm/arch-rockchip/sdram_rk322x.h
@@ -6,6 +6,7 @@
 #define _ASM_ARCH_SDRAM_RK322X_H
 
 #ifndef __ASSEMBLY__
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/kernel.h>
 #endif
diff --git a/arch/arm/include/asm/arch-rockchip/sdram_rk3288.h b/arch/arm/include/asm/arch-rockchip/sdram_rk3288.h
index 9dede806843..75a465c3c0d 100644
--- a/arch/arm/include/asm/arch-rockchip/sdram_rk3288.h
+++ b/arch/arm/include/asm/arch-rockchip/sdram_rk3288.h
@@ -8,6 +8,7 @@
 #ifndef _ASM_ARCH_RK3288_SDRAM_H__
 #define _ASM_ARCH_RK3288_SDRAM_H__
 
+#include <asm/types.h>
 #include <linux/kernel.h>
 struct rk3288_sdram_channel {
 	/*
diff --git a/arch/arm/include/asm/arch-rockchip/sdram_rk3328.h b/arch/arm/include/asm/arch-rockchip/sdram_rk3328.h
index 10923505d6e..cfb07c646af 100644
--- a/arch/arm/include/asm/arch-rockchip/sdram_rk3328.h
+++ b/arch/arm/include/asm/arch-rockchip/sdram_rk3328.h
@@ -10,6 +10,7 @@
 #include <asm/arch-rockchip/sdram_pctl_px30.h>
 #include <asm/arch-rockchip/sdram_phy_px30.h>
 #include <asm/arch-rockchip/sdram_phy_ron_rtt_px30.h>
+#include <asm/types.h>
 
 #define SR_IDLE		93
 #define PD_IDLE		13
diff --git a/arch/arm/include/asm/arch-rockchip/sdram_rk3399.h b/arch/arm/include/asm/arch-rockchip/sdram_rk3399.h
index c76372ee826..6123cd2b9a5 100644
--- a/arch/arm/include/asm/arch-rockchip/sdram_rk3399.h
+++ b/arch/arm/include/asm/arch-rockchip/sdram_rk3399.h
@@ -8,6 +8,7 @@
 #include <asm/arch-rockchip/sdram_common.h>
 #include <asm/arch-rockchip/sdram_msch.h>
 #ifndef __ASSEMBLY__
+#include <asm/types.h>
 #include <linux/bitops.h>
 #endif
 
diff --git a/arch/arm/include/asm/arch-rockchip/timer.h b/arch/arm/include/asm/arch-rockchip/timer.h
index 77b54220447..befe0b66b40 100644
--- a/arch/arm/include/asm/arch-rockchip/timer.h
+++ b/arch/arm/include/asm/arch-rockchip/timer.h
@@ -6,6 +6,7 @@
 #ifndef __ASM_ARCH_TIMER_H
 #define __ASM_ARCH_TIMER_H
 
+#include <asm/types.h>
 struct rk_timer {
 	u32 timer_load_count0;
 	u32 timer_load_count1;
diff --git a/arch/arm/include/asm/arch-rockchip/vop_rk3288.h b/arch/arm/include/asm/arch-rockchip/vop_rk3288.h
index c1aab4219e4..5e6fa4f32d7 100644
--- a/arch/arm/include/asm/arch-rockchip/vop_rk3288.h
+++ b/arch/arm/include/asm/arch-rockchip/vop_rk3288.h
@@ -7,6 +7,7 @@
 #ifndef _ASM_ARCH_VOP_RK3288_H
 #define _ASM_ARCH_VOP_RK3288_H
 
+#include <asm/types.h>
 #include <linux/kernel.h>
 struct rk3288_vop {
 	u32 reg_cfg_done;
diff --git a/arch/arm/include/asm/arch-s32v234/lpddr2.h b/arch/arm/include/asm/arch-s32v234/lpddr2.h
index c5efee5b75d..6b215738ec2 100644
--- a/arch/arm/include/asm/arch-s32v234/lpddr2.h
+++ b/arch/arm/include/asm/arch-s32v234/lpddr2.h
@@ -7,6 +7,7 @@
 #define __ARCH_ARM_MACH_S32V234_LPDDR2_H__
 
 /* definitions for LPDDR2 PAD values */
+#include <linux/types.h>
 #define LPDDR2_CLK0_PAD	\
 	(SIUL2_MSCR_DDR_SEL_LPDDR2 | SIUL2_MSCR_DDR_INPUT_DIFF_DDR | SIUL2_MSCR_DDR_ODT_120ohm |\
 	 SIUL2_MSCR_DSE_48ohm | SIUL2_MSCR_PUS_100K_UP | SIUL2_MSCR_CRPOINT_TRIM_1 |			\
diff --git a/arch/arm/include/asm/arch-spear/gpio.h b/arch/arm/include/asm/arch-spear/gpio.h
index 4c8c40b1c99..69a1fd0d9e2 100644
--- a/arch/arm/include/asm/arch-spear/gpio.h
+++ b/arch/arm/include/asm/arch-spear/gpio.h
@@ -7,6 +7,7 @@
 #ifndef __ASM_ARCH_SPEAR_GPIO_H
 #define __ASM_ARCH_SPEAR_GPIO_H
 
+#include <asm/types.h>
 enum gpio_direction {
 	GPIO_DIRECTION_IN,
 	GPIO_DIRECTION_OUT,
diff --git a/arch/arm/include/asm/arch-spear/spr_defs.h b/arch/arm/include/asm/arch-spear/spr_defs.h
index d09e7eb63a4..1a37dd72efa 100644
--- a/arch/arm/include/asm/arch-spear/spr_defs.h
+++ b/arch/arm/include/asm/arch-spear/spr_defs.h
@@ -7,6 +7,7 @@
 #ifndef __SPR_DEFS_H__
 #define __SPR_DEFS_H__
 
+#include <linux/types.h>
 extern int spear_board_init(ulong);
 extern void setfreq(unsigned int, unsigned int);
 extern unsigned int setfreq_sz;
diff --git a/arch/arm/include/asm/arch-spear/spr_emi.h b/arch/arm/include/asm/arch-spear/spr_emi.h
index 7b1cf35d3ab..1667929de29 100644
--- a/arch/arm/include/asm/arch-spear/spr_emi.h
+++ b/arch/arm/include/asm/arch-spear/spr_emi.h
@@ -34,4 +34,5 @@ struct emi_regs {
 
 #endif
 
+#include <asm/types.h>
 #endif
diff --git a/arch/arm/include/asm/arch-spear/spr_gpt.h b/arch/arm/include/asm/arch-spear/spr_gpt.h
index dced0a17a62..cb63e314b57 100644
--- a/arch/arm/include/asm/arch-spear/spr_gpt.h
+++ b/arch/arm/include/asm/arch-spear/spr_gpt.h
@@ -7,6 +7,7 @@
 #ifndef _SPR_GPT_H
 #define _SPR_GPT_H
 
+#include <asm/types.h>
 struct gpt_regs {
 	u8 reserved[0x80];
 	u32 control;
diff --git a/arch/arm/include/asm/arch-spear/spr_misc.h b/arch/arm/include/asm/arch-spear/spr_misc.h
index 01711193519..a177d69c7fb 100644
--- a/arch/arm/include/asm/arch-spear/spr_misc.h
+++ b/arch/arm/include/asm/arch-spear/spr_misc.h
@@ -7,6 +7,7 @@
 #ifndef _SPR_MISC_H
 #define _SPR_MISC_H
 
+#include <linux/types.h>
 struct misc_regs {
 	u32 auto_cfg_reg;	/* 0x0 */
 	u32 armdbg_ctr_reg;	/* 0x4 */
diff --git a/arch/arm/include/asm/arch-spear/spr_ssp.h b/arch/arm/include/asm/arch-spear/spr_ssp.h
index 088d34b405e..48344f6b9f2 100644
--- a/arch/arm/include/asm/arch-spear/spr_ssp.h
+++ b/arch/arm/include/asm/arch-spear/spr_ssp.h
@@ -6,6 +6,7 @@
 #ifndef _SPR_SSP_H
 #define _SPR_SSP_H
 
+#include <asm/types.h>
 struct ssp_regs {
 	u32 sspcr0;
 	u32 sspcr1;
diff --git a/arch/arm/include/asm/arch-spear/spr_syscntl.h b/arch/arm/include/asm/arch-spear/spr_syscntl.h
index 6a83d87d134..d4b259e3fae 100644
--- a/arch/arm/include/asm/arch-spear/spr_syscntl.h
+++ b/arch/arm/include/asm/arch-spear/spr_syscntl.h
@@ -7,6 +7,7 @@
 #ifndef __SYSCTRL_H
 #define __SYSCTRL_H
 
+#include <asm/types.h>
 struct syscntl_regs {
 	u32 scctrl;
 	u32 scsysstat;
diff --git a/arch/arm/include/asm/arch-stm32/gpio.h b/arch/arm/include/asm/arch-stm32/gpio.h
index 570e80a6ba8..1b4f560ba70 100644
--- a/arch/arm/include/asm/arch-stm32/gpio.h
+++ b/arch/arm/include/asm/arch-stm32/gpio.h
@@ -7,6 +7,7 @@
 #ifndef _GPIO_H_
 #define _GPIO_H_
 
+#include <asm/types.h>
 #define STM32_GPIOS_PER_BANK		16
 
 enum stm32_gpio_port {
diff --git a/arch/arm/include/asm/arch-stm32f4/stm32.h b/arch/arm/include/asm/arch-stm32f4/stm32.h
index 2094bd73212..74ee7130fb8 100644
--- a/arch/arm/include/asm/arch-stm32f4/stm32.h
+++ b/arch/arm/include/asm/arch-stm32f4/stm32.h
@@ -11,6 +11,7 @@
 #define _MACH_STM32_H_
 
 #include <asm/arch-stm32/stm32f.h>
+#include <asm/types.h>
 
 /*
  * Peripheral memory map
diff --git a/arch/arm/include/asm/arch-stm32f4/stm32_pwr.h b/arch/arm/include/asm/arch-stm32f4/stm32_pwr.h
index 8af6de220d8..a199b4ec53e 100644
--- a/arch/arm/include/asm/arch-stm32f4/stm32_pwr.h
+++ b/arch/arm/include/asm/arch-stm32f4/stm32_pwr.h
@@ -8,6 +8,7 @@
 #define __STM32_PWR_H_
 
 #ifndef __ASSEMBLY__
+#include <asm/types.h>
 #include <linux/bitops.h>
 #endif
 
diff --git a/arch/arm/include/asm/arch-stm32f7/stm32.h b/arch/arm/include/asm/arch-stm32f7/stm32.h
index 3451e74a3d0..83893393f40 100644
--- a/arch/arm/include/asm/arch-stm32f7/stm32.h
+++ b/arch/arm/include/asm/arch-stm32f7/stm32.h
@@ -8,6 +8,7 @@
 #define _ASM_ARCH_HARDWARE_H
 
 #include <asm/arch-stm32/stm32f.h>
+#include <asm/types.h>
 
 static const u32 sect_sz_kb[CONFIG_SYS_MAX_FLASH_SECT] = {
 	[0 ... 3] =	32 * 1024,
diff --git a/arch/arm/include/asm/arch-stm32f7/stm32_pwr.h b/arch/arm/include/asm/arch-stm32f7/stm32_pwr.h
index 02faaeb663c..fe244e7ed5c 100644
--- a/arch/arm/include/asm/arch-stm32f7/stm32_pwr.h
+++ b/arch/arm/include/asm/arch-stm32f7/stm32_pwr.h
@@ -8,6 +8,7 @@
 #define __STM32_PWR_H_
 
 #ifndef __ASSEMBLY__
+#include <asm/types.h>
 #include <linux/bitops.h>
 #endif
 
diff --git a/arch/arm/include/asm/arch-stm32f7/syscfg.h b/arch/arm/include/asm/arch-stm32f7/syscfg.h
index 985ae2544de..c1f7ebeb7b9 100644
--- a/arch/arm/include/asm/arch-stm32f7/syscfg.h
+++ b/arch/arm/include/asm/arch-stm32f7/syscfg.h
@@ -8,6 +8,7 @@
 #define _STM32_SYSCFG_H
 
 #ifndef __ASSEMBLY__
+#include <asm/types.h>
 #include <linux/bitops.h>
 #endif
 
diff --git a/arch/arm/include/asm/arch-stv0991/gpio.h b/arch/arm/include/asm/arch-stv0991/gpio.h
index b27f4078582..0dd9f8f0fdf 100644
--- a/arch/arm/include/asm/arch-stv0991/gpio.h
+++ b/arch/arm/include/asm/arch-stv0991/gpio.h
@@ -7,6 +7,7 @@
 #ifndef __ASM_ARCH_STV0991_GPIO_H
 #define __ASM_ARCH_STV0991_GPIO_H
 
+#include <asm/types.h>
 enum gpio_direction {
 	GPIO_DIRECTION_IN,
 	GPIO_DIRECTION_OUT,
diff --git a/arch/arm/include/asm/arch-stv0991/stv0991_cgu.h b/arch/arm/include/asm/arch-stv0991/stv0991_cgu.h
index df9dd54e5a8..81c80dc2afb 100644
--- a/arch/arm/include/asm/arch-stv0991/stv0991_cgu.h
+++ b/arch/arm/include/asm/arch-stv0991/stv0991_cgu.h
@@ -7,6 +7,7 @@
 #ifndef _STV0991_CGU_H
 #define _STV0991_CGU_H
 
+#include <asm/types.h>
 struct stv0991_cgu_regs {
 	u32 cpu_freq;		/* offset 0x0 */
 	u32 icn2_freq;		/* offset 0x4 */
diff --git a/arch/arm/include/asm/arch-stv0991/stv0991_creg.h b/arch/arm/include/asm/arch-stv0991/stv0991_creg.h
index 4d444a6df16..ed6ebbfbff9 100644
--- a/arch/arm/include/asm/arch-stv0991/stv0991_creg.h
+++ b/arch/arm/include/asm/arch-stv0991/stv0991_creg.h
@@ -7,6 +7,7 @@
 #ifndef _STV0991_CREG_H
 #define _STV0991_CREG_H
 
+#include <asm/types.h>
 struct stv0991_creg {
 	u32 version;		/* offset 0x0 */
 	u32 hdpctl;		/* offset 0x4 */
diff --git a/arch/arm/include/asm/arch-stv0991/stv0991_gpt.h b/arch/arm/include/asm/arch-stv0991/stv0991_gpt.h
index cd27472ad7e..0dbc88db1d8 100644
--- a/arch/arm/include/asm/arch-stv0991/stv0991_gpt.h
+++ b/arch/arm/include/asm/arch-stv0991/stv0991_gpt.h
@@ -8,6 +8,7 @@
 #define _STV0991_GPT_H
 
 #include <asm/arch-stv0991/hardware.h>
+#include <asm/types.h>
 
 struct gpt_regs {
 	u32 cr1;
diff --git a/arch/arm/include/asm/arch-stv0991/stv0991_wdru.h b/arch/arm/include/asm/arch-stv0991/stv0991_wdru.h
index 8cb8a8a6137..b90fa1cd5a2 100644
--- a/arch/arm/include/asm/arch-stv0991/stv0991_wdru.h
+++ b/arch/arm/include/asm/arch-stv0991/stv0991_wdru.h
@@ -7,6 +7,7 @@
 #ifndef _STV0991_WD_RST_H
 #define _STV0991_WD_RST_H
 #include <asm/arch-stv0991/hardware.h>
+#include <asm/types.h>
 
 struct stv0991_wd_ru {
 	u32 wdru_config;
diff --git a/arch/arm/include/asm/arch-sunxi/ccu.h b/arch/arm/include/asm/arch-sunxi/ccu.h
index cac5c5faf05..161fbd0eabe 100644
--- a/arch/arm/include/asm/arch-sunxi/ccu.h
+++ b/arch/arm/include/asm/arch-sunxi/ccu.h
@@ -9,6 +9,7 @@
 
 #ifndef __ASSEMBLY__
 #include <linux/bitops.h>
+#include <linux/types.h>
 #endif
 
 /**
diff --git a/arch/arm/include/asm/arch-sunxi/clock_sun4i.h b/arch/arm/include/asm/arch-sunxi/clock_sun4i.h
index 2cec91cb20e..67d84f60bb6 100644
--- a/arch/arm/include/asm/arch-sunxi/clock_sun4i.h
+++ b/arch/arm/include/asm/arch-sunxi/clock_sun4i.h
@@ -352,6 +352,7 @@ struct sunxi_ccm_reg {
 #define CCM_DE_CTRL_GATE		(1 << 31)
 
 #ifndef __ASSEMBLY__
+#include <asm/types.h>
 void clock_set_pll1(unsigned int hz);
 void clock_set_pll3(unsigned int hz);
 unsigned int clock_get_pll3(void);
diff --git a/arch/arm/include/asm/arch-sunxi/clock_sun50i_h6.h b/arch/arm/include/asm/arch-sunxi/clock_sun50i_h6.h
index 426069fc69a..1c4a8bc589f 100644
--- a/arch/arm/include/asm/arch-sunxi/clock_sun50i_h6.h
+++ b/arch/arm/include/asm/arch-sunxi/clock_sun50i_h6.h
@@ -10,6 +10,7 @@
 #define _SUNXI_CLOCK_SUN50I_H6_H
 
 #ifndef __ASSEMBLY__
+#include <asm/types.h>
 #include <linux/bitops.h>
 #endif
 
diff --git a/arch/arm/include/asm/arch-sunxi/clock_sun6i.h b/arch/arm/include/asm/arch-sunxi/clock_sun6i.h
index 3c3ebfd3a20..cf2f5bfcee9 100644
--- a/arch/arm/include/asm/arch-sunxi/clock_sun6i.h
+++ b/arch/arm/include/asm/arch-sunxi/clock_sun6i.h
@@ -519,6 +519,7 @@ struct sunxi_ccm_reg {
 #define CCM_SEC_SWITCH_PLL_NONSEC	(1 << 0)
 
 #ifndef __ASSEMBLY__
+#include <asm/types.h>
 void clock_set_pll1(unsigned int hz);
 void clock_set_pll3(unsigned int hz);
 void clock_set_pll3_factors(int m, int n);
diff --git a/arch/arm/include/asm/arch-sunxi/clock_sun8i_a83t.h b/arch/arm/include/asm/arch-sunxi/clock_sun8i_a83t.h
index 14df3cc8f46..7c6f14f49cd 100644
--- a/arch/arm/include/asm/arch-sunxi/clock_sun8i_a83t.h
+++ b/arch/arm/include/asm/arch-sunxi/clock_sun8i_a83t.h
@@ -297,6 +297,7 @@ struct sunxi_ccm_reg {
 
 
 #ifndef __ASSEMBLY__
+#include <asm/types.h>
 void clock_set_pll1(unsigned int hz);
 void clock_set_pll5(unsigned int clk);
 unsigned int clock_get_pll6(void);
diff --git a/arch/arm/include/asm/arch-sunxi/clock_sun9i.h b/arch/arm/include/asm/arch-sunxi/clock_sun9i.h
index fe6b8ba2732..6b990940d6a 100644
--- a/arch/arm/include/asm/arch-sunxi/clock_sun9i.h
+++ b/arch/arm/include/asm/arch-sunxi/clock_sun9i.h
@@ -9,6 +9,7 @@
 #define _SUNXI_CLOCK_SUN9I_H
 
 #ifndef __ASSEMBLY__
+#include <asm/types.h>
 #include <linux/bitops.h>
 #endif
 
diff --git a/arch/arm/include/asm/arch-sunxi/cpucfg.h b/arch/arm/include/asm/arch-sunxi/cpucfg.h
index 4aaebe0a976..a5911e77a7a 100644
--- a/arch/arm/include/asm/arch-sunxi/cpucfg.h
+++ b/arch/arm/include/asm/arch-sunxi/cpucfg.h
@@ -13,6 +13,7 @@
 
 #ifndef __ASSEMBLY__
 
+#include <compiler.h>
 struct __packed sunxi_cpucfg_cpu {
 	u32 rst;		/* base + 0x0 */
 	u32 ctrl;		/* base + 0x4 */
diff --git a/arch/arm/include/asm/arch-sunxi/display.h b/arch/arm/include/asm/arch-sunxi/display.h
index 525f9cb839d..87a9237cc7f 100644
--- a/arch/arm/include/asm/arch-sunxi/display.h
+++ b/arch/arm/include/asm/arch-sunxi/display.h
@@ -8,6 +8,7 @@
 #ifndef _SUNXI_DISPLAY_H
 #define _SUNXI_DISPLAY_H
 
+#include <asm/types.h>
 struct sunxi_de_fe_reg {
 	u32 enable;			/* 0x000 */
 	u32 frame_ctrl;			/* 0x004 */
diff --git a/arch/arm/include/asm/arch-sunxi/display2.h b/arch/arm/include/asm/arch-sunxi/display2.h
index 7202d2756cf..d7912aa8c7f 100644
--- a/arch/arm/include/asm/arch-sunxi/display2.h
+++ b/arch/arm/include/asm/arch-sunxi/display2.h
@@ -13,6 +13,7 @@
 #define _SUNXI_DISPLAY2_H
 
 /* internal clock settings */
+#include <asm/types.h>
 struct de_clk {
 	u32 gate_cfg;
 	u32 bus_cfg;
diff --git a/arch/arm/include/asm/arch-sunxi/dma_sun4i.h b/arch/arm/include/asm/arch-sunxi/dma_sun4i.h
index 309dc4f7cfd..bcf4ecf3c51 100644
--- a/arch/arm/include/asm/arch-sunxi/dma_sun4i.h
+++ b/arch/arm/include/asm/arch-sunxi/dma_sun4i.h
@@ -6,6 +6,7 @@
 #ifndef _SUNXI_DMA_SUN4I_H
 #define _SUNXI_DMA_SUN4I_H
 
+#include <asm/types.h>
 struct sunxi_dma_cfg
 {
 	u32 ctl;		/* 0x00 Control */
diff --git a/arch/arm/include/asm/arch-sunxi/dram_sun4i.h b/arch/arm/include/asm/arch-sunxi/dram_sun4i.h
index 69c6600e981..8881a9721f1 100644
--- a/arch/arm/include/asm/arch-sunxi/dram_sun4i.h
+++ b/arch/arm/include/asm/arch-sunxi/dram_sun4i.h
@@ -11,6 +11,7 @@
 #ifndef _SUNXI_DRAM_SUN4I_H
 #define _SUNXI_DRAM_SUN4I_H
 
+#include <asm/types.h>
 struct sunxi_dram_reg {
 	u32 ccr;		/* 0x00 controller configuration register */
 	u32 dcr;		/* 0x04 dram configuration register */
diff --git a/arch/arm/include/asm/arch-sunxi/dram_sun50i_h6.h b/arch/arm/include/asm/arch-sunxi/dram_sun50i_h6.h
index ddaa238c279..a524ac72d27 100644
--- a/arch/arm/include/asm/arch-sunxi/dram_sun50i_h6.h
+++ b/arch/arm/include/asm/arch-sunxi/dram_sun50i_h6.h
@@ -11,6 +11,7 @@
 
 #include <stdbool.h>
 #ifndef __ASSEMBLY__
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/kernel.h>
 #endif
diff --git a/arch/arm/include/asm/arch-sunxi/dram_sun6i.h b/arch/arm/include/asm/arch-sunxi/dram_sun6i.h
index b66d58cd73b..b5392faa689 100644
--- a/arch/arm/include/asm/arch-sunxi/dram_sun6i.h
+++ b/arch/arm/include/asm/arch-sunxi/dram_sun6i.h
@@ -14,6 +14,7 @@
 #define _SUNXI_DRAM_SUN6I_H
 
 #ifndef __ASSEMBLY__
+#include <asm/types.h>
 #include <linux/bitops.h>
 #endif
 
diff --git a/arch/arm/include/asm/arch-sunxi/dram_sun8i_a23.h b/arch/arm/include/asm/arch-sunxi/dram_sun8i_a23.h
index ca98597f1f8..611f881467e 100644
--- a/arch/arm/include/asm/arch-sunxi/dram_sun8i_a23.h
+++ b/arch/arm/include/asm/arch-sunxi/dram_sun8i_a23.h
@@ -13,6 +13,7 @@
 #ifndef _SUNXI_DRAM_SUN8I_H
 #define _SUNXI_DRAM_SUN8I_H
 
+#include <asm/types.h>
 struct dram_para {
 	u32 clock;
 	u32 type;
diff --git a/arch/arm/include/asm/arch-sunxi/dram_sun8i_a33.h b/arch/arm/include/asm/arch-sunxi/dram_sun8i_a33.h
index 3f65306cc68..d66d933db3b 100644
--- a/arch/arm/include/asm/arch-sunxi/dram_sun8i_a33.h
+++ b/arch/arm/include/asm/arch-sunxi/dram_sun8i_a33.h
@@ -12,6 +12,7 @@
 #define _SUNXI_DRAM_SUN8I_A33_H
 
 #ifndef __ASSEMBLY__
+#include <asm/types.h>
 #include <linux/bitops.h>
 #endif
 
diff --git a/arch/arm/include/asm/arch-sunxi/dram_sun8i_a83t.h b/arch/arm/include/asm/arch-sunxi/dram_sun8i_a83t.h
index 2a879963547..afc128ce80f 100644
--- a/arch/arm/include/asm/arch-sunxi/dram_sun8i_a83t.h
+++ b/arch/arm/include/asm/arch-sunxi/dram_sun8i_a83t.h
@@ -12,6 +12,7 @@
 #define _SUNXI_DRAM_SUN8I_A83T_H
 
 #ifndef __ASSEMBLY__
+#include <asm/types.h>
 #include <linux/bitops.h>
 #endif
 
diff --git a/arch/arm/include/asm/arch-sunxi/dram_sun9i.h b/arch/arm/include/asm/arch-sunxi/dram_sun9i.h
index 41df5fe5b6f..21f8f661371 100644
--- a/arch/arm/include/asm/arch-sunxi/dram_sun9i.h
+++ b/arch/arm/include/asm/arch-sunxi/dram_sun9i.h
@@ -12,6 +12,7 @@
 #define _SUNXI_DRAM_SUN9I_H
 
 #ifndef __ASSEMBLY__
+#include <asm/types.h>
 #include <linux/bitops.h>
 #endif
 
diff --git a/arch/arm/include/asm/arch-sunxi/dram_sunxi_dw.h b/arch/arm/include/asm/arch-sunxi/dram_sunxi_dw.h
index 3420f939f24..8fc2c12c6e4 100644
--- a/arch/arm/include/asm/arch-sunxi/dram_sunxi_dw.h
+++ b/arch/arm/include/asm/arch-sunxi/dram_sunxi_dw.h
@@ -14,6 +14,7 @@
 
 #include <linux/bitops.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 struct sunxi_mctl_com_reg {
 	u32 cr;			/* 0x00 control register */
diff --git a/arch/arm/include/asm/arch-sunxi/lcdc.h b/arch/arm/include/asm/arch-sunxi/lcdc.h
index 7fca301df96..a971de33205 100644
--- a/arch/arm/include/asm/arch-sunxi/lcdc.h
+++ b/arch/arm/include/asm/arch-sunxi/lcdc.h
@@ -11,6 +11,7 @@
 
 #include <fdtdec.h>
 #include <stdbool.h>
+#include <asm/types.h>
 
 struct sunxi_lcdc_reg {
 	u32 ctrl;			/* 0x00 */
diff --git a/arch/arm/include/asm/arch-sunxi/prcm.h b/arch/arm/include/asm/arch-sunxi/prcm.h
index 767d1ff98d7..43a7a532ea9 100644
--- a/arch/arm/include/asm/arch-sunxi/prcm.h
+++ b/arch/arm/include/asm/arch-sunxi/prcm.h
@@ -200,6 +200,7 @@
 #define PRCM_SEC_SWITCH_PWR_GATE_NONSEC (0x1 << 2)
 
 #ifndef __ASSEMBLY__
+#include <asm/types.h>
 #include <linux/compiler.h>
 
 struct sunxi_prcm_reg {
diff --git a/arch/arm/include/asm/arch-sunxi/pwm.h b/arch/arm/include/asm/arch-sunxi/pwm.h
index b89bddd2e89..15e8381b5ac 100644
--- a/arch/arm/include/asm/arch-sunxi/pwm.h
+++ b/arch/arm/include/asm/arch-sunxi/pwm.h
@@ -7,6 +7,7 @@
 #define _SUNXI_PWM_H
 
 #ifndef __ASSEMBLY__
+#include <asm/types.h>
 #include <linux/bitops.h>
 #endif
 
diff --git a/arch/arm/include/asm/arch-sunxi/rsb.h b/arch/arm/include/asm/arch-sunxi/rsb.h
index 8c64a995f25..1fab543dce4 100644
--- a/arch/arm/include/asm/arch-sunxi/rsb.h
+++ b/arch/arm/include/asm/arch-sunxi/rsb.h
@@ -12,6 +12,7 @@
 #define __SUNXI_RSB_H
 
 #include <asm/io.h>
+#include <asm/types.h>
 
 struct sunxi_rsb_reg {
 	u32 ctrl;	/* 0x00 */
diff --git a/arch/arm/include/asm/arch-sunxi/spl.h b/arch/arm/include/asm/arch-sunxi/spl.h
index 8c916e8c752..de1a9c21d3f 100644
--- a/arch/arm/include/asm/arch-sunxi/spl.h
+++ b/arch/arm/include/asm/arch-sunxi/spl.h
@@ -7,6 +7,7 @@
 #ifndef	_ASM_ARCH_SPL_H_
 #define	_ASM_ARCH_SPL_H_
 
+#include <linux/types.h>
 #define BOOT0_MAGIC		"eGON.BT0"
 #define SPL_SIGNATURE		"SPL" /* marks "sunxi" SPL header */
 #define SPL_MAJOR_BITS		3
diff --git a/arch/arm/include/asm/arch-sunxi/tve.h b/arch/arm/include/asm/arch-sunxi/tve.h
index 46cd87e79e8..109e46bf455 100644
--- a/arch/arm/include/asm/arch-sunxi/tve.h
+++ b/arch/arm/include/asm/arch-sunxi/tve.h
@@ -9,6 +9,7 @@
 #ifndef _TVE_H
 #define _TVE_H
 
+#include <asm/types.h>
 enum tve_mode {
 	tve_mode_vga,
 	tve_mode_composite_pal,
diff --git a/arch/arm/include/asm/arch-sunxi/tzpc.h b/arch/arm/include/asm/arch-sunxi/tzpc.h
index 7a6fcaebdb5..6a94083ae03 100644
--- a/arch/arm/include/asm/arch-sunxi/tzpc.h
+++ b/arch/arm/include/asm/arch-sunxi/tzpc.h
@@ -7,6 +7,7 @@
 #define _SUNXI_TZPC_H
 
 #ifndef __ASSEMBLY__
+#include <asm/types.h>
 struct sunxi_tzpc {
 	u32 r0size;		/* 0x00 Size of secure RAM region */
 	u32 decport0_status;	/* 0x04 Status of decode protection port 0 */
diff --git a/arch/arm/include/asm/arch-sunxi/watchdog.h b/arch/arm/include/asm/arch-sunxi/watchdog.h
index 38e2ef2aca3..c30bb276ae9 100644
--- a/arch/arm/include/asm/arch-sunxi/watchdog.h
+++ b/arch/arm/include/asm/arch-sunxi/watchdog.h
@@ -9,6 +9,7 @@
 #ifndef _SUNXI_WATCHDOG_H_
 #define _SUNXI_WATCHDOG_H_
 
+#include <asm/types.h>
 #define WDT_CTRL_RESTART	(0x1 << 0)
 #define WDT_CTRL_KEY		(0x0a57 << 1)
 
diff --git a/arch/arm/include/asm/arch-tegra/apb_misc.h b/arch/arm/include/asm/arch-tegra/apb_misc.h
index d438966afbe..af98f984c9f 100644
--- a/arch/arm/include/asm/arch-tegra/apb_misc.h
+++ b/arch/arm/include/asm/arch-tegra/apb_misc.h
@@ -7,6 +7,7 @@
 #define _GP_PADCTRL_H_
 
 /* APB_MISC_PP registers */
+#include <asm/types.h>
 struct apb_misc_pp_ctlr {
 	u32	reserved0[2];
 	u32	strapping_opt_a;/* 0x08: APB_MISC_PP_STRAPPING_OPT_A */
diff --git a/arch/arm/include/asm/arch-tegra/bpmp_abi.h b/arch/arm/include/asm/arch-tegra/bpmp_abi.h
index 373da526ed6..599982a5f02 100644
--- a/arch/arm/include/asm/arch-tegra/bpmp_abi.h
+++ b/arch/arm/include/asm/arch-tegra/bpmp_abi.h
@@ -73,6 +73,7 @@
  *
  * @todo document the flags
  */
+#include <linux/types.h>
 struct mrq_request {
 	/** @brief MRQ number of the request */
 	uint32_t mrq;
diff --git a/arch/arm/include/asm/arch-tegra/cboot.h b/arch/arm/include/asm/arch-tegra/cboot.h
index d89e784f2d2..03ba29859bd 100644
--- a/arch/arm/include/asm/arch-tegra/cboot.h
+++ b/arch/arm/include/asm/arch-tegra/cboot.h
@@ -8,6 +8,7 @@
 
 #include <net.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_ARM64
 
diff --git a/arch/arm/include/asm/arch-tegra/clk_rst.h b/arch/arm/include/asm/arch-tegra/clk_rst.h
index 2359e142fb7..7771dc5cbee 100644
--- a/arch/arm/include/asm/arch-tegra/clk_rst.h
+++ b/arch/arm/include/asm/arch-tegra/clk_rst.h
@@ -8,6 +8,7 @@
 #define _TEGRA_CLK_RST_H_
 
 /* PLL registers - there are several PLLs in the clock controller */
+#include <linux/types.h>
 struct clk_pll {
 	uint pll_base;		/* the control register */
 	/* pll_out[0] is output A control, pll_out[1] is output B control */
diff --git a/arch/arm/include/asm/arch-tegra/clock.h b/arch/arm/include/asm/arch-tegra/clock.h
index 630287c1b78..cd35095cb10 100644
--- a/arch/arm/include/asm/arch-tegra/clock.h
+++ b/arch/arm/include/asm/arch-tegra/clock.h
@@ -8,6 +8,7 @@
 #ifndef _TEGRA_CLOCK_H_
 #define _TEGRA_CLOCK_H_
 
+#include <linux/types.h>
 struct udevice;
 
 /* Set of oscillator frequencies supported in the internal API. */
diff --git a/arch/arm/include/asm/arch-tegra/dc.h b/arch/arm/include/asm/arch-tegra/dc.h
index 6444af2993a..d8a079e3221 100644
--- a/arch/arm/include/asm/arch-tegra/dc.h
+++ b/arch/arm/include/asm/arch-tegra/dc.h
@@ -9,6 +9,7 @@
 
 #ifndef __ASSEMBLY__
 #include <linux/bitops.h>
+#include <linux/types.h>
 #endif
 
 /* Register definitions for the Tegra display controller */
diff --git a/arch/arm/include/asm/arch-tegra/fuse.h b/arch/arm/include/asm/arch-tegra/fuse.h
index 5b8e0bd8d16..e2412d0676f 100644
--- a/arch/arm/include/asm/arch-tegra/fuse.h
+++ b/arch/arm/include/asm/arch-tegra/fuse.h
@@ -8,6 +8,7 @@
 #define _FUSE_H_
 
 /* FUSE registers */
+#include <asm/types.h>
 struct fuse_regs {
 	u32 reserved0[64];		/* 0x00 - 0xFC: */
 	u32 production_mode;		/* 0x100: FUSE_PRODUCTION_MODE */
diff --git a/arch/arm/include/asm/arch-tegra/gpio.h b/arch/arm/include/asm/arch-tegra/gpio.h
index fe7b3a50e0d..15384670c95 100644
--- a/arch/arm/include/asm/arch-tegra/gpio.h
+++ b/arch/arm/include/asm/arch-tegra/gpio.h
@@ -6,6 +6,7 @@
 #ifndef _TEGRA_GPIO_H_
 #define _TEGRA_GPIO_H_
 
+#include <asm/types.h>
 #include <dt-bindings/gpio/tegra-gpio.h>
 
 #define TEGRA_GPIOS_PER_PORT	8
diff --git a/arch/arm/include/asm/arch-tegra/ivc.h b/arch/arm/include/asm/arch-tegra/ivc.h
index 52c10b8fab3..4f0e6a1300a 100644
--- a/arch/arm/include/asm/arch-tegra/ivc.h
+++ b/arch/arm/include/asm/arch-tegra/ivc.h
@@ -28,6 +28,7 @@
  */
 
 /**
+#include <linux/types.h>
  * struct tegra_ivc - In-memory shared memory layout.
  *
  * This is described in detail in ivc.c.
diff --git a/arch/arm/include/asm/arch-tegra/pmc.h b/arch/arm/include/asm/arch-tegra/pmc.h
index e1f5a738135..e4ab21552a8 100644
--- a/arch/arm/include/asm/arch-tegra/pmc.h
+++ b/arch/arm/include/asm/arch-tegra/pmc.h
@@ -9,6 +9,7 @@
 
 #ifndef __ASSEMBLY__
 #include <linux/bitops.h>
+#include <linux/types.h>
 #endif
 
 /* Power Management Controller (APBDEV_PMC_) registers */
diff --git a/arch/arm/include/asm/arch-tegra/pwm.h b/arch/arm/include/asm/arch-tegra/pwm.h
index eebd104de9d..77de1478293 100644
--- a/arch/arm/include/asm/arch-tegra/pwm.h
+++ b/arch/arm/include/asm/arch-tegra/pwm.h
@@ -9,6 +9,7 @@
 #define __ASM_ARCH_TEGRA_PWM_H
 
 /* This is a single PWM channel */
+#include <linux/types.h>
 struct pwm_ctlr {
 	uint control;		/* Control register */
 	uint reserved[3];	/* Space space */
diff --git a/arch/arm/include/asm/arch-tegra/scu.h b/arch/arm/include/asm/arch-tegra/scu.h
index afe076419cf..942f644cc3b 100644
--- a/arch/arm/include/asm/arch-tegra/scu.h
+++ b/arch/arm/include/asm/arch-tegra/scu.h
@@ -8,6 +8,7 @@
 #define _SCU_H_
 
 /* ARM Snoop Control Unit (SCU) registers */
+#include <linux/types.h>
 struct scu_ctlr {
 	uint scu_ctrl;		/* SCU Control Register, offset 00 */
 	uint scu_cfg;		/* SCU Config Register, offset 04 */
diff --git a/arch/arm/include/asm/arch-tegra/tegra_ahub.h b/arch/arm/include/asm/arch-tegra/tegra_ahub.h
index 96d542a91ca..36de87033e7 100644
--- a/arch/arm/include/asm/arch-tegra/tegra_ahub.h
+++ b/arch/arm/include/asm/arch-tegra/tegra_ahub.h
@@ -14,6 +14,7 @@
  * Each TX CIF transmits data into the XBAR. Each RX CIF can receive audio
  * transmitted by a particular TX CIF.
  */
+#include <asm/types.h>
 struct xbar_regs {
 	u32 apbif_rx0;		/* AUDIO_APBIF_RX0, offset 0x00 */
 	u32 apbif_rx1;		/* AUDIO_APBIF_RX1, offset 0x04 */
diff --git a/arch/arm/include/asm/arch-tegra/tegra_i2s.h b/arch/arm/include/asm/arch-tegra/tegra_i2s.h
index 9319383f7c1..55bd31acc7e 100644
--- a/arch/arm/include/asm/arch-tegra/tegra_i2s.h
+++ b/arch/arm/include/asm/arch-tegra/tegra_i2s.h
@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0 */
 /*
  * tegra_i2s.h - Definitions for Tegra124 I2S driver.
+#include <asm/types.h>
  * Note, some structures (ex, CIF) are different in Tegra114.
  *
  * NVIDIA Tegra I2S controller
diff --git a/arch/arm/include/asm/arch-tegra/uart.h b/arch/arm/include/asm/arch-tegra/uart.h
index 24f0bdd51b8..01404dd12fd 100644
--- a/arch/arm/include/asm/arch-tegra/uart.h
+++ b/arch/arm/include/asm/arch-tegra/uart.h
@@ -8,6 +8,7 @@
 #define _UART_H_
 
 /* UART registers */
+#include <linux/types.h>
 struct uart_ctlr {
 	uint uart_thr_dlab_0;		/* UART_THR_DLAB_0_0, offset 00 */
 	uint uart_ier_dlab_0;		/* UART_IER_DLAB_0_0, offset 04 */
diff --git a/arch/arm/include/asm/arch-tegra/usb.h b/arch/arm/include/asm/arch-tegra/usb.h
index 6e6ea1443cb..9fc96dc251b 100644
--- a/arch/arm/include/asm/arch-tegra/usb.h
+++ b/arch/arm/include/asm/arch-tegra/usb.h
@@ -8,6 +8,7 @@
 #define _TEGRA_USB_H_
 
 /* USB Controller (USBx_CONTROLLER_) regs */
+#include <linux/types.h>
 struct usb_ctlr {
 	/* 0x000 */
 	uint id;
diff --git a/arch/arm/include/asm/arch-tegra/warmboot.h b/arch/arm/include/asm/arch-tegra/warmboot.h
index 3f02073ee49..0c2f0a56c25 100644
--- a/arch/arm/include/asm/arch-tegra/warmboot.h
+++ b/arch/arm/include/asm/arch-tegra/warmboot.h
@@ -7,6 +7,7 @@
 #ifndef _WARM_BOOT_H_
 #define _WARM_BOOT_H_
 
+#include <asm/types.h>
 #define STRAP_OPT_A_RAM_CODE_SHIFT	4
 #define STRAP_OPT_A_RAM_CODE_MASK	(0xf << STRAP_OPT_A_RAM_CODE_SHIFT)
 
diff --git a/arch/arm/include/asm/arch-tegra114/flow.h b/arch/arm/include/asm/arch-tegra114/flow.h
index 4f0fc3b7fb3..4c5fcfbb4d3 100644
--- a/arch/arm/include/asm/arch-tegra114/flow.h
+++ b/arch/arm/include/asm/arch-tegra114/flow.h
@@ -6,6 +6,7 @@
 #ifndef _TEGRA114_FLOW_H_
 #define _TEGRA114_FLOW_H_
 
+#include <asm/types.h>
 struct flow_ctlr {
 	u32 halt_cpu_events;
 	u32 halt_cop_events;
diff --git a/arch/arm/include/asm/arch-tegra114/gp_padctrl.h b/arch/arm/include/asm/arch-tegra114/gp_padctrl.h
index 69b35a1411e..9a09456dc58 100644
--- a/arch/arm/include/asm/arch-tegra114/gp_padctrl.h
+++ b/arch/arm/include/asm/arch-tegra114/gp_padctrl.h
@@ -7,6 +7,7 @@
 #define _TEGRA114_GP_PADCTRL_H_
 
 #include <asm/arch-tegra/gp_padctrl.h>
+#include <asm/types.h>
 
 /* APB_MISC_GP and padctrl registers */
 struct apb_misc_gp_ctlr {
diff --git a/arch/arm/include/asm/arch-tegra114/mc.h b/arch/arm/include/asm/arch-tegra114/mc.h
index 3930bab571f..7d60efe4383 100644
--- a/arch/arm/include/asm/arch-tegra114/mc.h
+++ b/arch/arm/include/asm/arch-tegra114/mc.h
@@ -10,6 +10,7 @@
 /**
  * Defines the memory controller registers we need/care about
  */
+#include <asm/types.h>
 struct mc_ctlr {
 	u32 reserved0[4];			/* offset 0x00 - 0x0C */
 	u32 mc_smmu_config;			/* offset 0x10 */
diff --git a/arch/arm/include/asm/arch-tegra114/sysctr.h b/arch/arm/include/asm/arch-tegra114/sysctr.h
index 228f423bed0..67731bbc05f 100644
--- a/arch/arm/include/asm/arch-tegra114/sysctr.h
+++ b/arch/arm/include/asm/arch-tegra114/sysctr.h
@@ -6,6 +6,7 @@
 #ifndef _TEGRA114_SYSCTR_H_
 #define _TEGRA114_SYSCTR_H_
 
+#include <asm/types.h>
 struct sysctr_ctlr {
 	u32 cntcr;		/* 0x00: SYSCTR0_CNTCR Counter Control */
 	u32 cntsr;		/* 0x04: SYSCTR0_CNTSR Counter Status */
diff --git a/arch/arm/include/asm/arch-tegra124/ahb.h b/arch/arm/include/asm/arch-tegra124/ahb.h
index d88cdfecea4..5180925d6fd 100644
--- a/arch/arm/include/asm/arch-tegra124/ahb.h
+++ b/arch/arm/include/asm/arch-tegra124/ahb.h
@@ -7,6 +7,7 @@
 #ifndef _TEGRA124_AHB_H_
 #define _TEGRA124_AHB_H_
 
+#include <asm/types.h>
 struct ahb_ctlr {
 	u32 reserved0;			/* 00h */
 	u32 arbitration_disable;	/* _ARBITRATION_DISABLE_0,	04h */
diff --git a/arch/arm/include/asm/arch-tegra124/clock.h b/arch/arm/include/asm/arch-tegra124/clock.h
index 3f54d362777..7c24026cce4 100644
--- a/arch/arm/include/asm/arch-tegra124/clock.h
+++ b/arch/arm/include/asm/arch-tegra124/clock.h
@@ -10,6 +10,7 @@
 #define _TEGRA124_CLOCK_H_
 
 #include <asm/arch-tegra/clock.h>
+#include <asm/types.h>
 
 /* CLK_RST_CONTROLLER_OSC_CTRL_0 */
 #define OSC_FREQ_SHIFT          28
diff --git a/arch/arm/include/asm/arch-tegra124/flow.h b/arch/arm/include/asm/arch-tegra124/flow.h
index ebcb22f1cb9..8b060acd756 100644
--- a/arch/arm/include/asm/arch-tegra124/flow.h
+++ b/arch/arm/include/asm/arch-tegra124/flow.h
@@ -8,6 +8,7 @@
 #define _TEGRA124_FLOW_H_
 
 #ifndef __ASSEMBLY__
+#include <asm/types.h>
 #include <linux/bitops.h>
 #endif
 
diff --git a/arch/arm/include/asm/arch-tegra124/gp_padctrl.h b/arch/arm/include/asm/arch-tegra124/gp_padctrl.h
index 750a2dc649a..85628af19f7 100644
--- a/arch/arm/include/asm/arch-tegra124/gp_padctrl.h
+++ b/arch/arm/include/asm/arch-tegra124/gp_padctrl.h
@@ -8,6 +8,7 @@
 #define _TEGRA124_GP_PADCTRL_H_
 
 #include <asm/arch-tegra/gp_padctrl.h>
+#include <asm/types.h>
 
 /* APB_MISC_GP and padctrl registers */
 struct apb_misc_gp_ctlr {
diff --git a/arch/arm/include/asm/arch-tegra124/gpio.h b/arch/arm/include/asm/arch-tegra124/gpio.h
index e5ea2815afa..2ec69bb57eb 100644
--- a/arch/arm/include/asm/arch-tegra124/gpio.h
+++ b/arch/arm/include/asm/arch-tegra124/gpio.h
@@ -15,6 +15,7 @@
 #define TEGRA_GPIO_BANKS	8	/* number of banks */
 
 #include <asm/arch-tegra/gpio.h>
+#include <linux/types.h>
 
 /* GPIO Controller registers for a single bank */
 struct gpio_ctlr_bank {
diff --git a/arch/arm/include/asm/arch-tegra124/mc.h b/arch/arm/include/asm/arch-tegra124/mc.h
index 617e55af20e..26b44574f66 100644
--- a/arch/arm/include/asm/arch-tegra124/mc.h
+++ b/arch/arm/include/asm/arch-tegra124/mc.h
@@ -9,6 +9,7 @@
 /**
  * Defines the memory controller registers we need/care about
  */
+#include <asm/types.h>
 struct mc_ctlr {
 	u32 reserved0[4];			/* offset 0x00 - 0x0C */
 	u32 mc_smmu_config;			/* offset 0x10 */
diff --git a/arch/arm/include/asm/arch-tegra124/sysctr.h b/arch/arm/include/asm/arch-tegra124/sysctr.h
index 6567104d083..f5b3ab565ff 100644
--- a/arch/arm/include/asm/arch-tegra124/sysctr.h
+++ b/arch/arm/include/asm/arch-tegra124/sysctr.h
@@ -7,6 +7,7 @@
 #ifndef _TEGRA124_SYSCTR_H_
 #define _TEGRA124_SYSCTR_H_
 
+#include <asm/types.h>
 struct sysctr_ctlr {
 	u32 cntcr;		/* 0x00: SYSCTR0_CNTCR Counter Control */
 	u32 cntsr;		/* 0x04: SYSCTR0_CNTSR Counter Status */
diff --git a/arch/arm/include/asm/arch-tegra20/display.h b/arch/arm/include/asm/arch-tegra20/display.h
index e7b3cffd466..26b0fa9d766 100644
--- a/arch/arm/include/asm/arch-tegra20/display.h
+++ b/arch/arm/include/asm/arch-tegra20/display.h
@@ -8,6 +8,7 @@
 #define __ASM_ARCH_TEGRA_DISPLAY_H
 
 #include <asm/arch-tegra/dc.h>
+#include <asm/types.h>
 
 /* This holds information about a window which can be displayed */
 struct disp_ctl_win {
diff --git a/arch/arm/include/asm/arch-tegra20/flow.h b/arch/arm/include/asm/arch-tegra20/flow.h
index 33be841ddbd..3bf0d0d1aa2 100644
--- a/arch/arm/include/asm/arch-tegra20/flow.h
+++ b/arch/arm/include/asm/arch-tegra20/flow.h
@@ -7,6 +7,7 @@
 #ifndef _FLOW_H_
 #define _FLOW_H_
 
+#include <asm/types.h>
 struct flow_ctlr {
 	u32	halt_cpu_events;
 	u32	halt_cop_events;
diff --git a/arch/arm/include/asm/arch-tegra20/gp_padctrl.h b/arch/arm/include/asm/arch-tegra20/gp_padctrl.h
index dd2ee126550..ab06bfb4cba 100644
--- a/arch/arm/include/asm/arch-tegra20/gp_padctrl.h
+++ b/arch/arm/include/asm/arch-tegra20/gp_padctrl.h
@@ -8,6 +8,7 @@
 #define _TEGRA20_GP_PADCTRL_H_
 
 #include <asm/arch-tegra/gp_padctrl.h>
+#include <asm/types.h>
 
 /* APB_MISC_GP and padctrl registers */
 struct apb_misc_gp_ctlr {
diff --git a/arch/arm/include/asm/arch-tegra20/gpio.h b/arch/arm/include/asm/arch-tegra20/gpio.h
index 6818c28723b..fb203d21468 100644
--- a/arch/arm/include/asm/arch-tegra20/gpio.h
+++ b/arch/arm/include/asm/arch-tegra20/gpio.h
@@ -15,6 +15,7 @@
 #define TEGRA_GPIO_BANKS	7	/* number of banks */
 
 #include <asm/arch-tegra/gpio.h>
+#include <linux/types.h>
 
 /* GPIO Controller registers for a single bank */
 struct gpio_ctlr_bank {
diff --git a/arch/arm/include/asm/arch-tegra20/mc.h b/arch/arm/include/asm/arch-tegra20/mc.h
index 71283e4e21e..67c5742e082 100644
--- a/arch/arm/include/asm/arch-tegra20/mc.h
+++ b/arch/arm/include/asm/arch-tegra20/mc.h
@@ -10,6 +10,7 @@
 /**
  * Defines the memory controller registers we need/care about
  */
+#include <asm/types.h>
 struct mc_ctlr {
 	u32 reserved0[3];			/* offset 0x00 - 0x08 */
 	u32 mc_emem_cfg;			/* offset 0x0C */
diff --git a/arch/arm/include/asm/arch-tegra20/sdram_param.h b/arch/arm/include/asm/arch-tegra20/sdram_param.h
index 3d1405fa3ba..75c1182a869 100644
--- a/arch/arm/include/asm/arch-tegra20/sdram_param.h
+++ b/arch/arm/include/asm/arch-tegra20/sdram_param.h
@@ -11,6 +11,7 @@
  * Defines the number of 32-bit words provided in each set of SDRAM parameters
  * for arbitration configuration data.
  */
+#include <asm/types.h>
 #define BCT_SDRAM_ARB_CONFIG_WORDS 27
 
 enum memory_type {
diff --git a/arch/arm/include/asm/arch-tegra210/ahb.h b/arch/arm/include/asm/arch-tegra210/ahb.h
index 8ecd6d9bae2..7b4a8994d8b 100644
--- a/arch/arm/include/asm/arch-tegra210/ahb.h
+++ b/arch/arm/include/asm/arch-tegra210/ahb.h
@@ -7,6 +7,7 @@
 #ifndef _TEGRA210_AHB_H_
 #define _TEGRA210_AHB_H_
 
+#include <asm/types.h>
 struct ahb_ctlr {
 	u32 reserved0;			/* 00h */
 	u32 arbitration_disable;	/* _ARBITRATION_DISABLE_0,	04h */
diff --git a/arch/arm/include/asm/arch-tegra210/flow.h b/arch/arm/include/asm/arch-tegra210/flow.h
index ef0be19e587..73ee94ef738 100644
--- a/arch/arm/include/asm/arch-tegra210/flow.h
+++ b/arch/arm/include/asm/arch-tegra210/flow.h
@@ -7,6 +7,7 @@
 #ifndef _TEGRA210_FLOW_H_
 #define _TEGRA210_FLOW_H_
 
+#include <asm/types.h>
 struct flow_ctlr {
 	u32 halt_cpu_events;	/* offset 0x00 */
 	u32 halt_cop_events;	/* offset 0x04 */
diff --git a/arch/arm/include/asm/arch-tegra210/gp_padctrl.h b/arch/arm/include/asm/arch-tegra210/gp_padctrl.h
index e9ff9037526..92a315f34fd 100644
--- a/arch/arm/include/asm/arch-tegra210/gp_padctrl.h
+++ b/arch/arm/include/asm/arch-tegra210/gp_padctrl.h
@@ -8,6 +8,7 @@
 #define _TEGRA210_GP_PADCTRL_H_
 
 #include <asm/arch-tegra/gp_padctrl.h>
+#include <asm/types.h>
 
 /* APB_MISC_GP and padctrl registers */
 struct apb_misc_gp_ctlr {
diff --git a/arch/arm/include/asm/arch-tegra210/gpio.h b/arch/arm/include/asm/arch-tegra210/gpio.h
index cb91b10bed8..9a3b5be72ee 100644
--- a/arch/arm/include/asm/arch-tegra210/gpio.h
+++ b/arch/arm/include/asm/arch-tegra210/gpio.h
@@ -15,6 +15,7 @@
 #define TEGRA_GPIO_BANKS	8	/* number of banks */
 
 #include <asm/arch-tegra/gpio.h>
+#include <linux/types.h>
 
 /* GPIO Controller registers for a single bank */
 struct gpio_ctlr_bank {
diff --git a/arch/arm/include/asm/arch-tegra210/mc.h b/arch/arm/include/asm/arch-tegra210/mc.h
index 5a2a5681d7a..a80e36c011f 100644
--- a/arch/arm/include/asm/arch-tegra210/mc.h
+++ b/arch/arm/include/asm/arch-tegra210/mc.h
@@ -9,6 +9,7 @@
 /**
  * Defines the memory controller registers we need/care about
  */
+#include <asm/types.h>
 struct mc_ctlr {
 	u32 reserved0[4];			/* offset 0x00 - 0x0C */
 	u32 mc_smmu_config;			/* offset 0x10 */
diff --git a/arch/arm/include/asm/arch-tegra210/sysctr.h b/arch/arm/include/asm/arch-tegra210/sysctr.h
index cb1c4997fac..8ada6e5c60c 100644
--- a/arch/arm/include/asm/arch-tegra210/sysctr.h
+++ b/arch/arm/include/asm/arch-tegra210/sysctr.h
@@ -7,6 +7,7 @@
 #ifndef _TEGRA210_SYSCTR_H_
 #define _TEGRA210_SYSCTR_H_
 
+#include <asm/types.h>
 struct sysctr_ctlr {
 	u32 cntcr;		/* 0x00: SYSCTR0_CNTCR Counter Control */
 	u32 cntsr;		/* 0x04: SYSCTR0_CNTSR Counter Status */
diff --git a/arch/arm/include/asm/arch-tegra30/flow.h b/arch/arm/include/asm/arch-tegra30/flow.h
index f3e947e9eee..3924b418040 100644
--- a/arch/arm/include/asm/arch-tegra30/flow.h
+++ b/arch/arm/include/asm/arch-tegra30/flow.h
@@ -6,6 +6,7 @@
 #ifndef _TEGRA30_FLOW_H_
 #define _TEGRA30_FLOW_H_
 
+#include <asm/types.h>
 struct flow_ctlr {
 	u32 halt_cpu_events;
 	u32 halt_cop_events;
diff --git a/arch/arm/include/asm/arch-tegra30/gp_padctrl.h b/arch/arm/include/asm/arch-tegra30/gp_padctrl.h
index 4ff785de8ea..65e811ababa 100644
--- a/arch/arm/include/asm/arch-tegra30/gp_padctrl.h
+++ b/arch/arm/include/asm/arch-tegra30/gp_padctrl.h
@@ -7,6 +7,7 @@
 #define _TEGRA30_GP_PADCTRL_H_
 
 #include <asm/arch-tegra/gp_padctrl.h>
+#include <asm/types.h>
 
 /* APB_MISC_GP and padctrl registers */
 struct apb_misc_gp_ctlr {
diff --git a/arch/arm/include/asm/arch-tegra30/gpio.h b/arch/arm/include/asm/arch-tegra30/gpio.h
index 1dd2e426ba6..5289e33fd92 100644
--- a/arch/arm/include/asm/arch-tegra30/gpio.h
+++ b/arch/arm/include/asm/arch-tegra30/gpio.h
@@ -14,6 +14,7 @@
 #define TEGRA_GPIO_BANKS	8	/* number of banks */
 
 #include <asm/arch-tegra/gpio.h>
+#include <linux/types.h>
 
 /* GPIO Controller registers for a single bank */
 struct gpio_ctlr_bank {
diff --git a/arch/arm/include/asm/arch-tegra30/mc.h b/arch/arm/include/asm/arch-tegra30/mc.h
index bbb0fe77bc4..9643ed81f90 100644
--- a/arch/arm/include/asm/arch-tegra30/mc.h
+++ b/arch/arm/include/asm/arch-tegra30/mc.h
@@ -10,6 +10,7 @@
 /**
  * Defines the memory controller registers we need/care about
  */
+#include <asm/types.h>
 struct mc_ctlr {
 	u32 reserved0[4];			/* offset 0x00 - 0x0C */
 	u32 mc_smmu_config;			/* offset 0x10 */
diff --git a/arch/arm/include/asm/arch-vf610/clock.h b/arch/arm/include/asm/arch-vf610/clock.h
index ec9786ce4fe..6cdad57e78f 100644
--- a/arch/arm/include/asm/arch-vf610/clock.h
+++ b/arch/arm/include/asm/arch-vf610/clock.h
@@ -6,6 +6,7 @@
 #ifndef __ASM_ARCH_CLOCK_H
 #define __ASM_ARCH_CLOCK_H
 
+#include <asm/types.h>
 enum mxc_clock {
 	MXC_ARM_CLK = 0,
 	MXC_BUS_CLK,
diff --git a/arch/arm/include/asm/arch-vf610/ddrmc-vf610.h b/arch/arm/include/asm/arch-vf610/ddrmc-vf610.h
index 03e3cecb95a..8adfbefd0c8 100644
--- a/arch/arm/include/asm/arch-vf610/ddrmc-vf610.h
+++ b/arch/arm/include/asm/arch-vf610/ddrmc-vf610.h
@@ -11,6 +11,7 @@
 #define __ASM_ARCH_VF610_DDRMC_H
 
 #include <asm/arch/iomux-vf610.h>
+#include <asm/types.h>
 
 struct ddr3_jedec_timings {
 	u8 tinit;
diff --git a/arch/arm/include/asm/arch-vf610/gpio.h b/arch/arm/include/asm/arch-vf610/gpio.h
index 9bfdf168730..07ae0e4f64f 100644
--- a/arch/arm/include/asm/arch-vf610/gpio.h
+++ b/arch/arm/include/asm/arch-vf610/gpio.h
@@ -7,6 +7,7 @@
 #ifndef __ASM_ARCH_VF610_GPIO_H
 #define __ASM_ARCH_VF610_GPIO_H
 
+#include <asm/types.h>
 #define VYBRID_GPIO_COUNT		32
 #define VF610_GPIO_DIRECTION_IN	0x0
 #define VF610_GPIO_DIRECTION_OUT	0x1
diff --git a/arch/arm/include/asm/armv7_mpu.h b/arch/arm/include/asm/armv7_mpu.h
index 16b9d0d1aeb..bbad00406cd 100644
--- a/arch/arm/include/asm/armv7_mpu.h
+++ b/arch/arm/include/asm/armv7_mpu.h
@@ -9,6 +9,7 @@
 
 #ifndef __ASSEMBLY__
 #include <linux/bitops.h>
+#include <linux/types.h>
 #endif
 
 #ifdef CONFIG_CPU_V7M
diff --git a/arch/arm/include/asm/armv7m.h b/arch/arm/include/asm/armv7m.h
index ad67b4fa34e..c8411475eb2 100644
--- a/arch/arm/include/asm/armv7m.h
+++ b/arch/arm/include/asm/armv7m.h
@@ -23,6 +23,7 @@
 #define V7M_SCB_VTOR		0x08
 
 #if !defined(__ASSEMBLY__)
+#include <linux/types.h>
 struct v7m_scb {
 	uint32_t cpuid;		/* CPUID Base Register */
 	uint32_t icsr;		/* Interrupt Control and State Register */
diff --git a/arch/arm/include/asm/armv8/mmu.h b/arch/arm/include/asm/armv8/mmu.h
index fc97c551146..5af66bea144 100644
--- a/arch/arm/include/asm/armv8/mmu.h
+++ b/arch/arm/include/asm/armv8/mmu.h
@@ -104,6 +104,8 @@
 #define TCR_EL3_RSVD		(1 << 31 | 1 << 23)
 
 #ifndef __ASSEMBLY__
+#include <linux/types.h>
+
 static inline void set_ttbr_tcr_mair(int el, u64 table, u64 tcr, u64 attr)
 {
 	asm volatile("dsb sy");
diff --git a/arch/arm/include/asm/armv8/sec_firmware.h b/arch/arm/include/asm/armv8/sec_firmware.h
index 9c010953f5f..b83f93f4415 100644
--- a/arch/arm/include/asm/armv8/sec_firmware.h
+++ b/arch/arm/include/asm/armv8/sec_firmware.h
@@ -7,6 +7,7 @@
 #define __SEC_FIRMWARE_H_
 
 #include <stdbool.h>
+#include <linux/types.h>
 
 #define PSCI_INVALID_VER		0xffffffff
 #define SEC_JR3_OFFSET			0x40000
diff --git a/arch/arm/include/asm/bootm.h b/arch/arm/include/asm/bootm.h
index a2131ca07c5..5a41f0e52cc 100644
--- a/arch/arm/include/asm/bootm.h
+++ b/arch/arm/include/asm/bootm.h
@@ -8,6 +8,7 @@
 #ifndef ARM_BOOTM_H
 #define ARM_BOOTM_H
 
+#include <asm/types.h>
 extern void udc_disconnect(void);
 
 #if defined(CONFIG_SETUP_MEMORY_TAGS) || \
diff --git a/arch/arm/include/asm/ehci-omap.h b/arch/arm/include/asm/ehci-omap.h
index f970bba9375..fc8b619ecdb 100644
--- a/arch/arm/include/asm/ehci-omap.h
+++ b/arch/arm/include/asm/ehci-omap.h
@@ -11,6 +11,7 @@
 #ifndef _OMAP_COMMON_EHCI_H_
 #define _OMAP_COMMON_EHCI_H_
 
+#include <asm/types.h>
 enum usbhs_omap_port_mode {
 	OMAP_USBHS_PORT_MODE_UNUSED,
 	OMAP_EHCI_PORT_MODE_PHY,
diff --git a/arch/arm/include/asm/handoff.h b/arch/arm/include/asm/handoff.h
index 0790d2ab1e2..e1e1708b241 100644
--- a/arch/arm/include/asm/handoff.h
+++ b/arch/arm/include/asm/handoff.h
@@ -10,6 +10,7 @@
 #define __asm_handoff_h
 
 /**
+#include <linux/types.h>
  * struct arch_spl_handoff - architecture-specific handoff info
  *
  * @usable_ram_top: Value returned by board_get_usable_ram_top() in SPL
diff --git a/arch/arm/include/asm/io.h b/arch/arm/include/asm/io.h
index c53224bb2b8..d4b64375b8f 100644
--- a/arch/arm/include/asm/io.h
+++ b/arch/arm/include/asm/io.h
@@ -30,6 +30,7 @@
 #if 0	/* XXX###XXX */
 #include <asm/arch/hardware.h>
 #endif	/* XXX###XXX */
+#include <compiler.h>
 #include <linux/string.h>
 
 static inline void sync(void)
diff --git a/arch/arm/include/asm/iproc-common/iproc_sdhci.h b/arch/arm/include/asm/iproc-common/iproc_sdhci.h
index 4e299217fcf..7c4f35d23bc 100644
--- a/arch/arm/include/asm/iproc-common/iproc_sdhci.h
+++ b/arch/arm/include/asm/iproc-common/iproc_sdhci.h
@@ -7,6 +7,7 @@
 #ifndef __IPROC_SDHCI_H
 #define __IPROC_SDHCI_H
 
+#include <asm/types.h>
 int iproc_sdhci_init(int dev_index, u32 quirks);
 
 #endif
diff --git a/arch/arm/include/asm/kona-common/kona_sdhci.h b/arch/arm/include/asm/kona-common/kona_sdhci.h
index 22db651a4eb..f8887ceb4c9 100644
--- a/arch/arm/include/asm/kona-common/kona_sdhci.h
+++ b/arch/arm/include/asm/kona-common/kona_sdhci.h
@@ -6,6 +6,7 @@
 #ifndef __KONA_SDHCI_H
 #define __KONA_SDHCI_H
 
+#include <asm/types.h>
 int kona_sdhci_init(int dev_index, u32 min_clk, u32 quirks);
 
 #endif
diff --git a/arch/arm/include/asm/mach-imx/dma.h b/arch/arm/include/asm/mach-imx/dma.h
index 55eb84cb8e7..c4f76e93291 100644
--- a/arch/arm/include/asm/mach-imx/dma.h
+++ b/arch/arm/include/asm/mach-imx/dma.h
@@ -14,6 +14,7 @@
 #define __DMA_H__
 
 #include <asm/cache.h>
+#include <asm/types.h>
 #include <linux/list.h>
 #include <linux/compiler.h>
 
diff --git a/arch/arm/include/asm/mach-imx/gpio.h b/arch/arm/include/asm/mach-imx/gpio.h
index 1b7c9cd5249..fa6d2e0e7f4 100644
--- a/arch/arm/include/asm/mach-imx/gpio.h
+++ b/arch/arm/include/asm/mach-imx/gpio.h
@@ -9,6 +9,7 @@
 #define __ASM_ARCH_IMX_GPIO_H
 
 #if !(defined(__KERNEL_STRICT_NAMES) || defined(__ASSEMBLY__))
+#include <asm/types.h>
 /* GPIO registers */
 struct gpio_regs {
 	u32 gpio_dr;	/* data */
diff --git a/arch/arm/include/asm/mach-imx/hab.h b/arch/arm/include/asm/mach-imx/hab.h
index f89f750169b..41e20929019 100644
--- a/arch/arm/include/asm/mach-imx/hab.h
+++ b/arch/arm/include/asm/mach-imx/hab.h
@@ -7,6 +7,7 @@
 #ifndef __SECURE_MX6Q_H__
 #define __SECURE_MX6Q_H__
 
+#include <compiler.h>
 #include <stdbool.h>
 #include <linux/types.h>
 #include <linux/compiler.h>
diff --git a/arch/arm/include/asm/mach-imx/imx-nandbcb.h b/arch/arm/include/asm/mach-imx/imx-nandbcb.h
index 74c9031d4e7..4b3f4a53578 100644
--- a/arch/arm/include/asm/mach-imx/imx-nandbcb.h
+++ b/arch/arm/include/asm/mach-imx/imx-nandbcb.h
@@ -7,6 +7,7 @@
 #ifndef _IMX_NAND_BCB_H_
 #define _IMX_NAND_BCB_H_
 
+#include <asm/types.h>
 #define FCB_FINGERPRINT		0x20424346      /* 'FCB' */
 #define FCB_VERSION_1		0x01000000
 #define FCB_FINGERPRINT_OFF	0x4		/* FCB fingerprint offset*/
diff --git a/arch/arm/include/asm/mach-imx/module_fuse.h b/arch/arm/include/asm/mach-imx/module_fuse.h
index a46fc3f1f8e..781e62d6147 100644
--- a/arch/arm/include/asm/mach-imx/module_fuse.h
+++ b/arch/arm/include/asm/mach-imx/module_fuse.h
@@ -6,6 +6,7 @@
 #ifndef __MODULE_FUSE_H__
 #define __MODULE_FUSE_H__
 
+#include <linux/types.h>
 enum fuse_module_type {
 	MODULE_TSC,
 	MODULE_ADC1,
diff --git a/arch/arm/include/asm/mach-imx/mxc_i2c.h b/arch/arm/include/asm/mach-imx/mxc_i2c.h
index 81fd9814447..9a934c517b5 100644
--- a/arch/arm/include/asm/mach-imx/mxc_i2c.h
+++ b/arch/arm/include/asm/mach-imx/mxc_i2c.h
@@ -9,6 +9,7 @@
 #if CONFIG_IS_ENABLED(CLK)
 #include <clk.h>
 #endif
+#include <linux/types.h>
 
 struct i2c_pin_ctrl {
 	iomux_v3_cfg_t i2c_mode;
diff --git a/arch/arm/include/asm/mach-imx/rdc-sema.h b/arch/arm/include/asm/mach-imx/rdc-sema.h
index 70d6a76a9d7..7b4d1fdf952 100644
--- a/arch/arm/include/asm/mach-imx/rdc-sema.h
+++ b/arch/arm/include/asm/mach-imx/rdc-sema.h
@@ -13,6 +13,7 @@
  *      d3      d2      d1       d0    | master id  |  peri id
  *   d[x] means domain[x], x can be [3 - 0].
  */
+#include <asm/types.h>
 typedef u32 rdc_peri_cfg_t;
 typedef u32 rdc_ma_cfg_t;
 
diff --git a/arch/arm/include/asm/mach-imx/regs-apbh.h b/arch/arm/include/asm/mach-imx/regs-apbh.h
index 94c330c7f92..917e72e35ad 100644
--- a/arch/arm/include/asm/mach-imx/regs-apbh.h
+++ b/arch/arm/include/asm/mach-imx/regs-apbh.h
@@ -237,6 +237,7 @@ struct mxs_apbh_regs {
 };
 #endif
 
+#include <linux/types.h>
 #endif
 
 #define	APBH_CTRL0_SFTRST				(1 << 31)
diff --git a/arch/arm/include/asm/mach-imx/regs-bch.h b/arch/arm/include/asm/mach-imx/regs-bch.h
index 5a149002e2a..37b2e97f8e0 100644
--- a/arch/arm/include/asm/mach-imx/regs-bch.h
+++ b/arch/arm/include/asm/mach-imx/regs-bch.h
@@ -17,6 +17,7 @@
 #include <asm/mach-imx/regs-common.h>
 
 #ifndef	__ASSEMBLY__
+#include <linux/types.h>
 struct mxs_bch_regs {
 	mxs_reg_32(hw_bch_ctrl)
 	mxs_reg_32(hw_bch_status0)
diff --git a/arch/arm/include/asm/mach-imx/regs-gpmi.h b/arch/arm/include/asm/mach-imx/regs-gpmi.h
index 33daa53c45d..6723caef6a1 100644
--- a/arch/arm/include/asm/mach-imx/regs-gpmi.h
+++ b/arch/arm/include/asm/mach-imx/regs-gpmi.h
@@ -15,6 +15,7 @@
 #include <asm/mach-imx/regs-common.h>
 
 #ifndef	__ASSEMBLY__
+#include <linux/types.h>
 struct mxs_gpmi_regs {
 	mxs_reg_32(hw_gpmi_ctrl0)
 	mxs_reg_32(hw_gpmi_compare)
diff --git a/arch/arm/include/asm/mach-imx/regs-lcdif.h b/arch/arm/include/asm/mach-imx/regs-lcdif.h
index 58746387966..67b961931a6 100644
--- a/arch/arm/include/asm/mach-imx/regs-lcdif.h
+++ b/arch/arm/include/asm/mach-imx/regs-lcdif.h
@@ -14,6 +14,7 @@
 
 #ifndef	__ASSEMBLY__
 #include <asm/mach-imx/regs-common.h>
+#include <linux/types.h>
 
 struct mxs_lcdif_regs {
 	mxs_reg_32(hw_lcdif_ctrl)		/* 0x00 */
diff --git a/arch/arm/include/asm/mach-imx/sys_proto.h b/arch/arm/include/asm/mach-imx/sys_proto.h
index ae33d6a9a49..5c87a0fcf1a 100644
--- a/arch/arm/include/asm/mach-imx/sys_proto.h
+++ b/arch/arm/include/asm/mach-imx/sys_proto.h
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <asm/mach-imx/regs-common.h>
 #include <asm/mach-imx/module_fuse.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include "../arch-imx/cpu.h"
diff --git a/arch/arm/include/asm/mach-imx/syscounter.h b/arch/arm/include/asm/mach-imx/syscounter.h
index a2cae1edb81..a291b8ebec3 100644
--- a/arch/arm/include/asm/mach-imx/syscounter.h
+++ b/arch/arm/include/asm/mach-imx/syscounter.h
@@ -7,6 +7,7 @@
 #define _ASM_ARCH_SYSTEM_COUNTER_H
 
 /* System Counter */
+#include <asm/types.h>
 struct sctr_regs {
 	u32 cntcr;
 	u32 cntsr;
diff --git a/arch/arm/include/asm/mach-imx/video.h b/arch/arm/include/asm/mach-imx/video.h
index 1fdc2de662a..e31c68d12b9 100644
--- a/arch/arm/include/asm/mach-imx/video.h
+++ b/arch/arm/include/asm/mach-imx/video.h
@@ -5,6 +5,7 @@
 
 #include <linux/fb.h>
 #include <ipu_pixfmt.h>
+#include <linux/types.h>
 
 struct display_info_t {
 	int	bus;
diff --git a/arch/arm/include/asm/omap_gpio.h b/arch/arm/include/asm/omap_gpio.h
index 151afa8f44c..c25032453a8 100644
--- a/arch/arm/include/asm/omap_gpio.h
+++ b/arch/arm/include/asm/omap_gpio.h
@@ -21,6 +21,7 @@
 #define _GPIO_H
 
 #include <asm/arch/cpu.h>
+#include <linux/types.h>
 
 #if CONFIG_IS_ENABLED(DM_GPIO)
 
diff --git a/arch/arm/include/asm/omap_i2c.h b/arch/arm/include/asm/omap_i2c.h
index a6975401dab..582d9c43867 100644
--- a/arch/arm/include/asm/omap_i2c.h
+++ b/arch/arm/include/asm/omap_i2c.h
@@ -14,6 +14,7 @@ struct omap_i2c_platdata {
 
 #endif
 
+#include <linux/types.h>
 enum {
 	OMAP_I2C_REV_V1 = 0,
 	OMAP_I2C_REV_V2 = 1,
diff --git a/arch/arm/include/asm/omap_mmc.h b/arch/arm/include/asm/omap_mmc.h
index 7933ad5a867..fbc83164a2b 100644
--- a/arch/arm/include/asm/omap_mmc.h
+++ b/arch/arm/include/asm/omap_mmc.h
@@ -28,6 +28,7 @@
 #include <mmc.h>
 #ifndef __ASSEMBLY__
 #include <linux/bitops.h>
+#include <linux/types.h>
 #endif
 
 struct hsmmc {
diff --git a/arch/arm/include/asm/omap_musb.h b/arch/arm/include/asm/omap_musb.h
index b40ea005bec..feedd2725af 100644
--- a/arch/arm/include/asm/omap_musb.h
+++ b/arch/arm/include/asm/omap_musb.h
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
 /*
+#include <asm/types.h>
  * Board data structure for musb gadget on OMAPs
  *
  * Copyright (C) 2012, Ilya Yanok <ilya.yanok@gmail.com>
diff --git a/arch/arm/include/asm/omap_sec_common.h b/arch/arm/include/asm/omap_sec_common.h
index 30f0a9f5cbc..3331dcb55c6 100644
--- a/arch/arm/include/asm/omap_sec_common.h
+++ b/arch/arm/include/asm/omap_sec_common.h
@@ -13,6 +13,7 @@
  * the variable argument list into the format expected by the ROM code before
  * triggering the actual low-level smc entry.
  */
+#include <linux/types.h>
 u32 secure_rom_call(u32 service, u32 proc_id, u32 flag, ...);
 
 /*
diff --git a/arch/arm/include/asm/secure.h b/arch/arm/include/asm/secure.h
index 64e5582c1f2..ce332e6558f 100644
--- a/arch/arm/include/asm/secure.h
+++ b/arch/arm/include/asm/secure.h
@@ -9,6 +9,7 @@
 
 #ifndef __ASSEMBLY__
 
+#include <asm/types.h>
 typedef struct secure_svc_tbl {
 	u32	id;
 #ifdef CONFIG_ARMV8_PSCI
diff --git a/arch/arm/include/asm/setjmp.h b/arch/arm/include/asm/setjmp.h
index 662bec86321..1e86def1de6 100644
--- a/arch/arm/include/asm/setjmp.h
+++ b/arch/arm/include/asm/setjmp.h
@@ -9,6 +9,7 @@
 
 /*
  * This really should be opaque, but the EFI implementation wrongly
+#include <asm/types.h>
  * assumes that a 'struct jmp_buf_data' is defined.
  */
 struct jmp_buf_data {
diff --git a/arch/arm/include/asm/setup.h b/arch/arm/include/asm/setup.h
index 3a4e902af14..a4e3c69c6b9 100644
--- a/arch/arm/include/asm/setup.h
+++ b/arch/arm/include/asm/setup.h
@@ -13,6 +13,7 @@
  *
  * NOTE:
  *  This file contains two ways to pass information from the boot
+#include <asm/types.h>
  *  loader to the kernel. The old struct param_struct is deprecated,
  *  but it will be kept in the kernel for 5 years from now
  *  (2001). This will allow boot loaders to convert to the new struct
diff --git a/arch/arm/include/asm/system.h b/arch/arm/include/asm/system.h
index ce552944b70..2d5084b6d16 100644
--- a/arch/arm/include/asm/system.h
+++ b/arch/arm/include/asm/system.h
@@ -109,6 +109,7 @@
 
 #ifndef __ASSEMBLY__
 
+#include <linux/types.h>
 struct pt_regs;
 
 u64 get_page_table_size(void);
diff --git a/arch/arm/include/asm/ti-common/davinci_nand.h b/arch/arm/include/asm/ti-common/davinci_nand.h
index 28842c3b155..dffcd9250ba 100644
--- a/arch/arm/include/asm/ti-common/davinci_nand.h
+++ b/arch/arm/include/asm/ti-common/davinci_nand.h
@@ -11,6 +11,7 @@
 
 #include <linux/mtd/rawnand.h>
 #include <asm/arch/hardware.h>
+#include <linux/types.h>
 
 #define NAND_READ_START  	0x00
 #define NAND_READ_END    	0x30
diff --git a/arch/arm/include/asm/ti-common/keystone_nav.h b/arch/arm/include/asm/ti-common/keystone_nav.h
index e577514428a..b61b8a64183 100644
--- a/arch/arm/include/asm/ti-common/keystone_nav.h
+++ b/arch/arm/include/asm/ti-common/keystone_nav.h
@@ -11,6 +11,7 @@
 
 #include <asm/arch/hardware.h>
 #include <asm/io.h>
+#include <asm/types.h>
 
 #define QM_OK                    0
 #define QM_ERR                  -1
diff --git a/arch/arm/include/asm/ti-common/keystone_net.h b/arch/arm/include/asm/ti-common/keystone_net.h
index 0852ce80a64..90884643c39 100644
--- a/arch/arm/include/asm/ti-common/keystone_net.h
+++ b/arch/arm/include/asm/ti-common/keystone_net.h
@@ -13,6 +13,7 @@
 #include <phy.h>
 #ifndef __ASSEMBLY__
 #include <linux/bitops.h>
+#include <linux/types.h>
 #endif
 
 /* EMAC */
diff --git a/arch/arm/include/asm/ti-common/keystone_serdes.h b/arch/arm/include/asm/ti-common/keystone_serdes.h
index 623438856d5..a3ca1eff2c3 100644
--- a/arch/arm/include/asm/ti-common/keystone_serdes.h
+++ b/arch/arm/include/asm/ti-common/keystone_serdes.h
@@ -10,6 +10,7 @@
 #define __TI_KEYSTONE_SERDES_H__
 
 /* SERDES Reference clock */
+#include <asm/types.h>
 enum ks2_serdes_clock {
 	SERDES_CLOCK_100M,		/* 100 MHz */
 	SERDES_CLOCK_122P88M,		/* 122.88 MHz */
diff --git a/arch/arm/include/asm/ti-common/sys_proto.h b/arch/arm/include/asm/ti-common/sys_proto.h
index a96a8382fb6..f3db16e54d6 100644
--- a/arch/arm/include/asm/ti-common/sys_proto.h
+++ b/arch/arm/include/asm/ti-common/sys_proto.h
@@ -7,6 +7,7 @@
 #define _TI_COMMON_SYS_PROTO_H_
 
 #include <asm/global_data.h>
+#include <asm/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/include/asm/ti-common/ti-edma3.h b/arch/arm/include/asm/ti-common/ti-edma3.h
index 9abdbc88e40..d5b98815a68 100644
--- a/arch/arm/include/asm/ti-common/ti-edma3.h
+++ b/arch/arm/include/asm/ti-common/ti-edma3.h
@@ -10,7 +10,9 @@
 #define _EDMA3_H_
 
 #ifndef __ASSEMBLY__
+#include <compiler.h>
 #include <linux/bitops.h>
+#include <linux/types.h>
 #endif
 #include <linux/stddef.h>
 
diff --git a/arch/arm/include/asm/u-boot-arm.h b/arch/arm/include/asm/u-boot-arm.h
index 0b93cc48c50..afb55b48818 100644
--- a/arch/arm/include/asm/u-boot-arm.h
+++ b/arch/arm/include/asm/u-boot-arm.h
@@ -15,6 +15,7 @@
 #ifndef __ASSEMBLY__
 
 /* for the following variables, see start.S */
+#include <linux/types.h>
 extern ulong IRQ_STACK_START;	/* top of IRQ stack */
 extern ulong FIQ_STACK_START;	/* top of FIQ stack */
 extern ulong _datarel_start_ofs;
diff --git a/arch/arm/include/asm/utils.h b/arch/arm/include/asm/utils.h
index eee60c50e99..481cbd64ff8 100644
--- a/arch/arm/include/asm/utils.h
+++ b/arch/arm/include/asm/utils.h
@@ -7,6 +7,7 @@
 #ifndef _UTILS_H_
 #define _UTILS_H_
 
+#include <asm/types.h>
 static inline s32 log_2_n_round_up(u32 n)
 {
 	s32 log2n = -1;
diff --git a/arch/arm/lib/bootm-fdt.c b/arch/arm/lib/bootm-fdt.c
index 72a86f7defe..e21cf6c1a50 100644
--- a/arch/arm/lib/bootm-fdt.c
+++ b/arch/arm/lib/bootm-fdt.c
@@ -15,6 +15,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <fdt_support.h>
 #ifdef CONFIG_ARMV7_NONSEC
 #include <asm/armv7.h>
diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c
index a11fe7ed31e..40ce3c7a04b 100644
--- a/arch/arm/lib/bootm.c
+++ b/arch/arm/lib/bootm.c
@@ -14,6 +14,7 @@
 #include <common.h>
 #include <bootstage.h>
 #include <command.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <dm.h>
 #include <hang.h>
@@ -28,6 +29,7 @@
 #include <env.h>
 #include <image.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <u-boot/zlib.h>
 #include <asm/byteorder.h>
 #include <linux/libfdt.h>
diff --git a/arch/arm/lib/cache-cp15.c b/arch/arm/lib/cache-cp15.c
index 39d51859ed7..b7f9baa74ac 100644
--- a/arch/arm/lib/cache-cp15.c
+++ b/arch/arm/lib/cache-cp15.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <log.h>
 #include <stdio.h>
@@ -15,6 +16,7 @@
 #include <linux/compiler.h>
 #include <asm/armv7_mpu.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #if !(CONFIG_IS_ENABLED(SYS_ICACHE_OFF) && CONFIG_IS_ENABLED(SYS_DCACHE_OFF))
 
diff --git a/arch/arm/lib/cache.c b/arch/arm/lib/cache.c
index 6509052ddcf..870d4c7d659 100644
--- a/arch/arm/lib/cache.c
+++ b/arch/arm/lib/cache.c
@@ -7,6 +7,7 @@
 /* for now: just dummy functions to satisfy the linker */
 
 #include <common.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <log.h>
 #include <malloc.h>
@@ -14,6 +15,7 @@
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/lib/cmd_boot.c b/arch/arm/lib/cmd_boot.c
index c905ecc4bd9..00d58816dca 100644
--- a/arch/arm/lib/cmd_boot.c
+++ b/arch/arm/lib/cmd_boot.c
@@ -19,6 +19,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <linux/types.h>
 
 /*
  * ARMv7M does not support ARM instruction mode. However, the
diff --git a/arch/arm/lib/eabi_compat.c b/arch/arm/lib/eabi_compat.c
index 9e2912ffe39..3e13dbb6ab6 100644
--- a/arch/arm/lib/eabi_compat.c
+++ b/arch/arm/lib/eabi_compat.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <stdio.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 int raise (int signum)
 {
diff --git a/arch/arm/lib/gic-v3-its.c b/arch/arm/lib/gic-v3-its.c
index 4fc9f9b7833..6b884ac375a 100644
--- a/arch/arm/lib/gic-v3-its.c
+++ b/arch/arm/lib/gic-v3-its.c
@@ -14,6 +14,7 @@
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/sizes.h>
+#include <linux/types.h>
 
 static u32 lpi_id_bits;
 
diff --git a/arch/arm/lib/image.c b/arch/arm/lib/image.c
index 5dfa8eff31a..47776bd7ba8 100644
--- a/arch/arm/lib/image.c
+++ b/arch/arm/lib/image.c
@@ -7,12 +7,14 @@
 #include <common.h>
 #include <image.h>
 #include <mapmem.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/kernel.h>
 #include <linux/sizes.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/lib/interrupts.c b/arch/arm/lib/interrupts.c
index af65144f7a7..fafe4b04d9b 100644
--- a/arch/arm/lib/interrupts.c
+++ b/arch/arm/lib/interrupts.c
@@ -27,6 +27,7 @@
 #include <asm/proc-armv/ptrace.h>
 #include <asm/ptrace.h>
 #include <asm/u-boot-arm.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/lib/interrupts_64.c b/arch/arm/lib/interrupts_64.c
index 9e8d8eb6f1a..9c228333d30 100644
--- a/arch/arm/lib/interrupts_64.c
+++ b/arch/arm/lib/interrupts_64.c
@@ -5,11 +5,13 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/ptrace.h>
 #include <irq_func.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/compiler.h>
 #include <efi_loader.h>
diff --git a/arch/arm/lib/reloc_aarch64_efi.c b/arch/arm/lib/reloc_aarch64_efi.c
index 1aa57dbc80d..5aab6acec5a 100644
--- a/arch/arm/lib/reloc_aarch64_efi.c
+++ b/arch/arm/lib/reloc_aarch64_efi.c
@@ -35,6 +35,7 @@
 */
 
 #include <efi.h>
+#include <linux/types.h>
 
 #include <elf.h>
 
diff --git a/arch/arm/lib/reloc_arm_efi.c b/arch/arm/lib/reloc_arm_efi.c
index 9103c035c54..bf07a63c487 100644
--- a/arch/arm/lib/reloc_arm_efi.c
+++ b/arch/arm/lib/reloc_arm_efi.c
@@ -13,6 +13,7 @@
 
 #include <efi.h>
 #include <elf.h>
+#include <linux/types.h>
 
 efi_status_t EFIAPI _relocate(long ldbase, Elf32_Dyn *dyn)
 {
diff --git a/arch/arm/lib/reset.c b/arch/arm/lib/reset.c
index 109ed120482..904eeaaf26e 100644
--- a/arch/arm/lib/reset.c
+++ b/arch/arm/lib/reset.c
@@ -22,6 +22,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <irq_func.h>
 #include <asm/u-boot.h>
diff --git a/arch/arm/lib/semihosting.c b/arch/arm/lib/semihosting.c
index 8b09d87cb16..685351c59f9 100644
--- a/arch/arm/lib/semihosting.c
+++ b/arch/arm/lib/semihosting.c
@@ -18,6 +18,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define SYSOPEN		0x01
 #define SYSCLOSE	0x02
diff --git a/arch/arm/lib/spl.c b/arch/arm/lib/spl.c
index 2dbbc53c516..66cafd41800 100644
--- a/arch/arm/lib/spl.c
+++ b/arch/arm/lib/spl.c
@@ -8,6 +8,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <config.h>
 #include <init.h>
 #include <log.h>
@@ -18,6 +19,7 @@
 #include <asm/u-boot.h>
 #include <linux/compiler.h>
 #include <asm/mach-types.h>
+#include <linux/types.h>
 
 #ifndef CONFIG_SPL_DM
 /* Pointer to as well as the global data structure for SPL */
diff --git a/arch/arm/lib/zimage.c b/arch/arm/lib/zimage.c
index b5155c2a914..08f55927db5 100644
--- a/arch/arm/lib/zimage.c
+++ b/arch/arm/lib/zimage.c
@@ -7,8 +7,10 @@
  * Copyright (C) 2012 Marek Vasut <marek.vasut@gmail.com>
  */
 #include <common.h>
+#include <compiler.h>
 #include <image.h>
 #include <stdio.h>
+#include <linux/types.h>
 
 #define	LINUX_ARM_ZIMAGE_MAGIC	0x016f2818
 #define	BAREBOX_IMAGE_MAGIC	0x00786f62
diff --git a/arch/arm/mach-aspeed/ast2500/sdram_ast2500.c b/arch/arm/mach-aspeed/ast2500/sdram_ast2500.c
index 9eefeef5fb3..e6618d4c76e 100644
--- a/arch/arm/mach-aspeed/ast2500/sdram_ast2500.c
+++ b/arch/arm/mach-aspeed/ast2500/sdram_ast2500.c
@@ -22,6 +22,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <dt-bindings/clock/ast2500-scu.h>
+#include <linux/types.h>
 
 /* These configuration parameters are taken from Aspeed SDK */
 #define DDR4_MR46_MODE		0x08000000
diff --git a/arch/arm/mach-aspeed/ast_wdt.c b/arch/arm/mach-aspeed/ast_wdt.c
index 5bc442ef33c..461d20303e3 100644
--- a/arch/arm/mach-aspeed/ast_wdt.c
+++ b/arch/arm/mach-aspeed/ast_wdt.c
@@ -7,6 +7,7 @@
 #include <asm/io.h>
 #include <asm/arch/wdt.h>
 #include <linux/err.h>
+#include <linux/types.h>
 
 u32 ast_reset_mode_from_flags(ulong flags)
 {
diff --git a/arch/arm/mach-at91/arm920t/clock.c b/arch/arm/mach-at91/arm920t/clock.c
index 57cb159d1f6..b73864c6977 100644
--- a/arch/arm/mach-at91/arm920t/clock.c
+++ b/arch/arm/mach-at91/arm920t/clock.c
@@ -15,6 +15,7 @@
 #include <asm/arch/hardware.h>
 #include <asm/arch/at91_pmc.h>
 #include <asm/arch/clk.h>
+#include <linux/types.h>
 
 #if !defined(CONFIG_AT91FAMILY)
 # error You need to define CONFIG_AT91FAMILY in your board config!
diff --git a/arch/arm/mach-at91/arm920t/reset.c b/arch/arm/mach-at91/arm920t/reset.c
index d92bc57d669..a264b2b1c54 100644
--- a/arch/arm/mach-at91/arm920t/reset.c
+++ b/arch/arm/mach-at91/arm920t/reset.c
@@ -18,6 +18,7 @@
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/at91_st.h>
+#include <linux/types.h>
 
 void  __attribute__((weak)) board_reset(void)
 {
diff --git a/arch/arm/mach-at91/arm920t/timer.c b/arch/arm/mach-at91/arm920t/timer.c
index c400e878135..fa0e582f062 100644
--- a/arch/arm/mach-at91/arm920t/timer.c
+++ b/arch/arm/mach-at91/arm920t/timer.c
@@ -18,6 +18,7 @@
 #include <time.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
diff --git a/arch/arm/mach-at91/arm926ejs/clock.c b/arch/arm/mach-at91/arm926ejs/clock.c
index 97e45fffd1d..6a742766d4e 100644
--- a/arch/arm/mach-at91/arm926ejs/clock.c
+++ b/arch/arm/mach-at91/arm926ejs/clock.c
@@ -15,6 +15,7 @@
 #include <asm/arch/hardware.h>
 #include <asm/arch/at91_pmc.h>
 #include <asm/arch/clk.h>
+#include <linux/types.h>
 
 #if !defined(CONFIG_AT91FAMILY)
 # error You need to define CONFIG_AT91FAMILY in your board config!
diff --git a/arch/arm/mach-at91/arm926ejs/cpu.c b/arch/arm/mach-at91/arm926ejs/cpu.c
index 9fb8b98944a..f64aa14a6b2 100644
--- a/arch/arm/mach-at91/arm926ejs/cpu.c
+++ b/arch/arm/mach-at91/arm926ejs/cpu.c
@@ -16,6 +16,7 @@
 #include <asm/arch/at91_gpbr.h>
 #include <asm/arch/clk.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 #ifndef CONFIG_SYS_AT91_MAIN_CLOCK
 #define CONFIG_SYS_AT91_MAIN_CLOCK 0
diff --git a/arch/arm/mach-at91/arm926ejs/eflash.c b/arch/arm/mach-at91/arm926ejs/eflash.c
index ca52791d5bc..9a727b5c163 100644
--- a/arch/arm/mach-at91/arm926ejs/eflash.c
+++ b/arch/arm/mach-at91/arm926ejs/eflash.c
@@ -52,6 +52,7 @@
 #include <asm/arch/at91_common.h>
 #include <asm/arch/at91_eefc.h>
 #include <asm/arch/at91_dbu.h>
+#include <linux/types.h>
 
 /* checks to detect configuration errors */
 #if CONFIG_SYS_MAX_FLASH_BANKS!=1
diff --git a/arch/arm/mach-at91/arm926ejs/reset.c b/arch/arm/mach-at91/arm926ejs/reset.c
index 56fbbd991e5..6a604d2432c 100644
--- a/arch/arm/mach-at91/arm926ejs/reset.c
+++ b/arch/arm/mach-at91/arm926ejs/reset.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/at91_rstc.h>
+#include <linux/types.h>
 
 /* Reset the cpu by telling the reset controller to do so */
 void reset_cpu(ulong ignored)
diff --git a/arch/arm/mach-at91/arm926ejs/timer.c b/arch/arm/mach-at91/arm926ejs/timer.c
index a8cf0e4bd79..b479feeca4d 100644
--- a/arch/arm/mach-at91/arm926ejs/timer.c
+++ b/arch/arm/mach-at91/arm926ejs/timer.c
@@ -14,6 +14,7 @@
 #include <asm/arch/at91_pit.h>
 #include <asm/arch/clk.h>
 #include <div64.h>
+#include <linux/types.h>
 
 #if !defined(CONFIG_AT91FAMILY)
 # error You need to define CONFIG_AT91FAMILY in your board config!
diff --git a/arch/arm/mach-at91/armv7/clock.c b/arch/arm/mach-at91/armv7/clock.c
index 7fab52d1e7e..984b9033e41 100644
--- a/arch/arm/mach-at91/armv7/clock.c
+++ b/arch/arm/mach-at91/armv7/clock.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/io.h>
diff --git a/arch/arm/mach-at91/armv7/cpu.c b/arch/arm/mach-at91/armv7/cpu.c
index b40834bcbe3..04815b01054 100644
--- a/arch/arm/mach-at91/armv7/cpu.c
+++ b/arch/arm/mach-at91/armv7/cpu.c
@@ -19,6 +19,7 @@
 #include <asm/arch/at91_gpbr.h>
 #include <asm/arch/clk.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 #ifndef CONFIG_SYS_AT91_MAIN_CLOCK
 #define CONFIG_SYS_AT91_MAIN_CLOCK 0
diff --git a/arch/arm/mach-at91/armv7/reset.c b/arch/arm/mach-at91/armv7/reset.c
index 8f4c81d1afd..08e0e69359d 100644
--- a/arch/arm/mach-at91/armv7/reset.c
+++ b/arch/arm/mach-at91/armv7/reset.c
@@ -13,6 +13,7 @@
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/at91_rstc.h>
+#include <linux/types.h>
 
 /* Reset the cpu by telling the reset controller to do so */
 void reset_cpu(ulong ignored)
diff --git a/arch/arm/mach-at91/armv7/timer.c b/arch/arm/mach-at91/armv7/timer.c
index 1f54c5dcad9..edb9eefe71e 100644
--- a/arch/arm/mach-at91/armv7/timer.c
+++ b/arch/arm/mach-at91/armv7/timer.c
@@ -17,6 +17,7 @@
 #include <asm/arch/at91_pit.h>
 #include <asm/arch/clk.h>
 #include <div64.h>
+#include <linux/types.h>
 
 #if !defined(CONFIG_AT91FAMILY)
 # error You need to define CONFIG_AT91FAMILY in your board config!
diff --git a/arch/arm/mach-at91/atmel_sfr.c b/arch/arm/mach-at91/atmel_sfr.c
index c2677c51c0c..a80afaa90a1 100644
--- a/arch/arm/mach-at91/atmel_sfr.c
+++ b/arch/arm/mach-at91/atmel_sfr.c
@@ -9,6 +9,7 @@
 #include <asm/hardware.h>
 #include <asm/io.h>
 #include <asm/arch/at91_sfr.h>
+#include <asm/types.h>
 
 #if defined(CONFIG_SAMA5D2) || defined(CONFIG_SAMA5D4)
 void redirect_int_from_saic_to_aic(void)
diff --git a/arch/arm/mach-at91/clock.c b/arch/arm/mach-at91/clock.c
index f9723bd145e..714ff6b0d31 100644
--- a/arch/arm/mach-at91/clock.c
+++ b/arch/arm/mach-at91/clock.c
@@ -13,6 +13,7 @@
 #include <asm/arch/hardware.h>
 #include <asm/arch/at91_pmc.h>
 #include <asm/arch/at91_wdt.h>
+#include <linux/types.h>
 
 #define EN_UPLL_TIMEOUT		500
 
diff --git a/arch/arm/mach-at91/include/mach/at91_common.h b/arch/arm/mach-at91/include/mach/at91_common.h
index f3551832f3a..a226f7eea72 100644
--- a/arch/arm/mach-at91/include/mach/at91_common.h
+++ b/arch/arm/mach-at91/include/mach/at91_common.h
@@ -9,6 +9,7 @@
 #define AT91_COMMON_H
 
 #include <stdbool.h>
+#include <asm/types.h>
 void at91_can_hw_init(void);
 void at91_gmac_hw_init(void);
 void at91_macb_hw_init(void);
diff --git a/arch/arm/mach-at91/include/mach/at91_dbu.h b/arch/arm/mach-at91/include/mach/at91_dbu.h
index 91bb686bc10..5592cb903ce 100644
--- a/arch/arm/mach-at91/include/mach/at91_dbu.h
+++ b/arch/arm/mach-at91/include/mach/at91_dbu.h
@@ -12,6 +12,7 @@
 
 #ifndef __ASSEMBLY__
 
+#include <asm/types.h>
 typedef struct at91_dbu {
 	u32	cr;	/* Control Register WO */
 	u32	mr;	/* Mode Register  RW */
diff --git a/arch/arm/mach-at91/include/mach/at91_eefc.h b/arch/arm/mach-at91/include/mach/at91_eefc.h
index e7bb2bfecba..6c38f51e980 100644
--- a/arch/arm/mach-at91/include/mach/at91_eefc.h
+++ b/arch/arm/mach-at91/include/mach/at91_eefc.h
@@ -12,6 +12,7 @@
 
 #ifndef __ASSEMBLY__
 
+#include <asm/types.h>
 typedef struct at91_eefc {
 	u32	fmr;	/* Flash Mode Register RW */
 	u32	fcr;	/* Flash Command Register WO */
diff --git a/arch/arm/mach-at91/include/mach/at91_emac.h b/arch/arm/mach-at91/include/mach/at91_emac.h
index 44b943be3dc..397ed032d44 100644
--- a/arch/arm/mach-at91/include/mach/at91_emac.h
+++ b/arch/arm/mach-at91/include/mach/at91_emac.h
@@ -8,6 +8,7 @@
 #ifndef AT91_H
 #define AT91_H
 
+#include <asm/types.h>
 typedef struct at91_emac {
 	u32	 ctl;
 	u32	 cfg;
diff --git a/arch/arm/mach-at91/include/mach/at91_gpbr.h b/arch/arm/mach-at91/include/mach/at91_gpbr.h
index ac1bb1cf01a..576685a2920 100644
--- a/arch/arm/mach-at91/include/mach/at91_gpbr.h
+++ b/arch/arm/mach-at91/include/mach/at91_gpbr.h
@@ -32,6 +32,7 @@
 
 #ifndef __ASSEMBLY__
 
+#include <asm/types.h>
 typedef struct at91_gpbr {
 	u32 reg[4];
 } at91_gpbr_t;
diff --git a/arch/arm/mach-at91/include/mach/at91_matrix.h b/arch/arm/mach-at91/include/mach/at91_matrix.h
index d98fcf51051..a7c9281356f 100644
--- a/arch/arm/mach-at91/include/mach/at91_matrix.h
+++ b/arch/arm/mach-at91/include/mach/at91_matrix.h
@@ -23,6 +23,7 @@
 #define AT91_ASM_MATRIX_MCFG	ATMEL_BASE_MATRIX
 
 #else
+#include <asm/types.h>
 #if defined(CONFIG_AT91SAM9260) || defined(CONFIG_AT91SAM9G20)
 #define AT91_MATRIX_MASTERS	6
 #define AT91_MATRIX_SLAVES	5
diff --git a/arch/arm/mach-at91/include/mach/at91_mc.h b/arch/arm/mach-at91/include/mach/at91_mc.h
index 18b0e163c09..4d7dd361b14 100644
--- a/arch/arm/mach-at91/include/mach/at91_mc.h
+++ b/arch/arm/mach-at91/include/mach/at91_mc.h
@@ -15,6 +15,7 @@
 
 #ifndef __ASSEMBLY__
 
+#include <asm/types.h>
 typedef struct at91_ebi {
 	u32 	csa;		/* 0x00 Chip Select Assignment Register */
 	u32	cfgr;		/* 0x04 Configuration Register */
diff --git a/arch/arm/mach-at91/include/mach/at91_pdc.h b/arch/arm/mach-at91/include/mach/at91_pdc.h
index a855a7177ac..16115b2e81b 100644
--- a/arch/arm/mach-at91/include/mach/at91_pdc.h
+++ b/arch/arm/mach-at91/include/mach/at91_pdc.h
@@ -6,6 +6,7 @@
 #ifndef AT91_PDC_H
 #define AT91_PDC_H
 
+#include <asm/types.h>
 typedef struct at91_pdc {
 	u32	rpr;		/* 0x100 Receive Pointer Register */
 	u32	rcr;		/* 0x104 Receive Counter Register */
diff --git a/arch/arm/mach-at91/include/mach/at91_pio.h b/arch/arm/mach-at91/include/mach/at91_pio.h
index f51e47e55d5..60e36e753e8 100644
--- a/arch/arm/mach-at91/include/mach/at91_pio.h
+++ b/arch/arm/mach-at91/include/mach/at91_pio.h
@@ -35,6 +35,7 @@
 
 #ifndef __ASSEMBLY__
 
+#include <asm/types.h>
 typedef struct at91_port {
 	u32	per;		/* 0x00 PIO Enable Register */
 	u32	pdr;		/* 0x04 PIO Disable Register */
diff --git a/arch/arm/mach-at91/include/mach/at91_pit.h b/arch/arm/mach-at91/include/mach/at91_pit.h
index dfaf2e02608..bed0304a47f 100644
--- a/arch/arm/mach-at91/include/mach/at91_pit.h
+++ b/arch/arm/mach-at91/include/mach/at91_pit.h
@@ -12,6 +12,7 @@
 #ifndef AT91_PIT_H
 #define AT91_PIT_H
 
+#include <asm/types.h>
 typedef struct at91_pit {
 	u32	mr;	/* 0x00 Mode Register */
 	u32	sr;	/* 0x04 Status Register */
diff --git a/arch/arm/mach-at91/include/mach/at91_rstc.h b/arch/arm/mach-at91/include/mach/at91_rstc.h
index 11ffe4454a6..c1846de3ae1 100644
--- a/arch/arm/mach-at91/include/mach/at91_rstc.h
+++ b/arch/arm/mach-at91/include/mach/at91_rstc.h
@@ -18,6 +18,7 @@
 
 #ifndef __ASSEMBLY__
 
+#include <asm/types.h>
 typedef struct at91_rstc {
 	u32	cr;	/* Reset Controller Control Register */
 	u32	sr;	/* Reset Controller Status Register */
diff --git a/arch/arm/mach-at91/include/mach/at91_rtt.h b/arch/arm/mach-at91/include/mach/at91_rtt.h
index ba88c441e33..3d39328873f 100644
--- a/arch/arm/mach-at91/include/mach/at91_rtt.h
+++ b/arch/arm/mach-at91/include/mach/at91_rtt.h
@@ -12,6 +12,7 @@
 
 #ifndef __ASSEMBLY__
 
+#include <asm/types.h>
 typedef struct at91_rtt {
 	u32	mr;	/* Mode Register   RW 0x00008000 */
 	u32	ar;	/* Alarm Register  RW 0xFFFFFFFF */
diff --git a/arch/arm/mach-at91/include/mach/at91_sfr.h b/arch/arm/mach-at91/include/mach/at91_sfr.h
index 4517df41bce..1044f6b77a9 100644
--- a/arch/arm/mach-at91/include/mach/at91_sfr.h
+++ b/arch/arm/mach-at91/include/mach/at91_sfr.h
@@ -9,6 +9,7 @@
 #ifndef __AT91_SFR_H
 #define __AT91_SFR_H
 
+#include <asm/types.h>
 #include <linux/bitops.h>
 struct atmel_sfr {
 	u32 reserved1;	/* 0x00 */
diff --git a/arch/arm/mach-at91/include/mach/at91_spi.h b/arch/arm/mach-at91/include/mach/at91_spi.h
index ce7bbf276d0..4f1f5fca3ba 100644
--- a/arch/arm/mach-at91/include/mach/at91_spi.h
+++ b/arch/arm/mach-at91/include/mach/at91_spi.h
@@ -13,6 +13,7 @@
 #define AT91_SPI_H
 
 #include <asm/arch/at91_pdc.h>
+#include <asm/types.h>
 
 typedef struct at91_spi {
 	u32		cr;		/* 0x00 Control Register */
diff --git a/arch/arm/mach-at91/include/mach/at91_st.h b/arch/arm/mach-at91/include/mach/at91_st.h
index ec4658a3917..24f5bad6017 100644
--- a/arch/arm/mach-at91/include/mach/at91_st.h
+++ b/arch/arm/mach-at91/include/mach/at91_st.h
@@ -6,6 +6,7 @@
 #ifndef AT91_ST_H
 #define AT91_ST_H
 
+#include <asm/types.h>
 typedef struct at91_st {
 
 	u32	cr;
diff --git a/arch/arm/mach-at91/include/mach/at91_tc.h b/arch/arm/mach-at91/include/mach/at91_tc.h
index eb6950ab28c..0ddc0103429 100644
--- a/arch/arm/mach-at91/include/mach/at91_tc.h
+++ b/arch/arm/mach-at91/include/mach/at91_tc.h
@@ -6,6 +6,7 @@
 #ifndef AT91_TC_H
 #define AT91_TC_H
 
+#include <asm/types.h>
 typedef struct at91_tcc {
 	u32		ccr;	/* 0x00 Channel Control Register */
 	u32		cmr;	/* 0x04 Channel Mode Register */
diff --git a/arch/arm/mach-at91/include/mach/at91_wdt.h b/arch/arm/mach-at91/include/mach/at91_wdt.h
index 8ef8e007d77..1f1d81ef1ca 100644
--- a/arch/arm/mach-at91/include/mach/at91_wdt.h
+++ b/arch/arm/mach-at91/include/mach/at91_wdt.h
@@ -19,6 +19,8 @@
 
 #else
 
+#include <compiler.h>
+#include <asm/types.h>
 typedef struct at91_wdt {
 	u32	cr;
 	u32	mr;
diff --git a/arch/arm/mach-at91/include/mach/at91sam9260_matrix.h b/arch/arm/mach-at91/include/mach/at91sam9260_matrix.h
index 7271129f6be..bb39119d55f 100644
--- a/arch/arm/mach-at91/include/mach/at91sam9260_matrix.h
+++ b/arch/arm/mach-at91/include/mach/at91sam9260_matrix.h
@@ -14,6 +14,7 @@
 #ifndef __ASSEMBLY__
 
 /*
+#include <asm/types.h>
  * This struct defines access to the matrix' maximum of
  * 16 masters and 16 slaves.
  * However, on the AT91SAM9260/9G20/9XE there exist only
diff --git a/arch/arm/mach-at91/include/mach/at91sam9261_matrix.h b/arch/arm/mach-at91/include/mach/at91sam9261_matrix.h
index b856759b1db..d2f3345b4bd 100644
--- a/arch/arm/mach-at91/include/mach/at91sam9261_matrix.h
+++ b/arch/arm/mach-at91/include/mach/at91sam9261_matrix.h
@@ -13,6 +13,7 @@
 
 #ifndef __ASSEMBLY__
 
+#include <asm/types.h>
 struct at91_matrix {
 	u32	mcfg;	/* Master Configuration Registers */
 	u32	scfg[5];	/* Slave Configuration Registers */
diff --git a/arch/arm/mach-at91/include/mach/at91sam9263_matrix.h b/arch/arm/mach-at91/include/mach/at91sam9263_matrix.h
index f08d2eb1fac..fd2aaad5a17 100644
--- a/arch/arm/mach-at91/include/mach/at91sam9263_matrix.h
+++ b/arch/arm/mach-at91/include/mach/at91sam9263_matrix.h
@@ -14,6 +14,7 @@
 #ifndef __ASSEMBLY__
 
 /*
+#include <asm/types.h>
  * This struct defines access to the matrix' maximum of
  * 16 masters and 16 slaves.
  * Note: not all masters/slaves are available
diff --git a/arch/arm/mach-at91/include/mach/at91sam9_sdramc.h b/arch/arm/mach-at91/include/mach/at91sam9_sdramc.h
index 64abf70c5b4..9feabe9252f 100644
--- a/arch/arm/mach-at91/include/mach/at91sam9_sdramc.h
+++ b/arch/arm/mach-at91/include/mach/at91sam9_sdramc.h
@@ -25,6 +25,7 @@
 #define AT91_ASM_SDRAMC_MDR	(ATMEL_BASE_SDRAMC + 0x24)
 
 #else
+#include <asm/types.h>
 struct sdramc_reg {
 	u32	mr;
 	u32	tr;
diff --git a/arch/arm/mach-at91/include/mach/at91sam9_smc.h b/arch/arm/mach-at91/include/mach/at91sam9_smc.h
index 404ffaad442..f4045b1173e 100644
--- a/arch/arm/mach-at91/include/mach/at91sam9_smc.h
+++ b/arch/arm/mach-at91/include/mach/at91sam9_smc.h
@@ -24,6 +24,7 @@
 #define AT91_ASM_SMC_MODE0	(ATMEL_BASE_SMC + 0x0C)
 
 #else
+#include <asm/types.h>
 
 typedef struct	at91_cs {
 	u32	setup;		/* 0x00 SMC Setup Register */
diff --git a/arch/arm/mach-at91/include/mach/at91sam9g45_matrix.h b/arch/arm/mach-at91/include/mach/at91sam9g45_matrix.h
index 62d4901bc1c..fde18a212e8 100644
--- a/arch/arm/mach-at91/include/mach/at91sam9g45_matrix.h
+++ b/arch/arm/mach-at91/include/mach/at91sam9g45_matrix.h
@@ -13,6 +13,7 @@
 
 #ifndef __ASSEMBLY__
 
+#include <asm/types.h>
 struct at91_matrix {
 	u32	mcfg[16];
 	u32	scfg[16];
diff --git a/arch/arm/mach-at91/include/mach/at91sam9rl_matrix.h b/arch/arm/mach-at91/include/mach/at91sam9rl_matrix.h
index 295f768b552..b798c181b46 100644
--- a/arch/arm/mach-at91/include/mach/at91sam9rl_matrix.h
+++ b/arch/arm/mach-at91/include/mach/at91sam9rl_matrix.h
@@ -16,6 +16,7 @@
 
 #ifndef __ASSEMBLY__
 
+#include <asm/types.h>
 struct at91_matrix {
 	u32	mcfg[16];	/* Master Configuration Registers */
 	u32	scfg[16];	/* Slave Configuration Registers */
diff --git a/arch/arm/mach-at91/include/mach/at91sam9x5_matrix.h b/arch/arm/mach-at91/include/mach/at91sam9x5_matrix.h
index 8288090d5a1..ddb6b1aec89 100644
--- a/arch/arm/mach-at91/include/mach/at91sam9x5_matrix.h
+++ b/arch/arm/mach-at91/include/mach/at91sam9x5_matrix.h
@@ -14,6 +14,7 @@
 #ifndef __ASSEMBLY__
 
 /* AT91SAM9N12 Matrix definition is a subset of AT91SAM9X5. */
+#include <asm/types.h>
 struct at91_matrix {
 	u32	mcfg[16];
 	u32	scfg[16];
diff --git a/arch/arm/mach-at91/include/mach/atmel_mpddrc.h b/arch/arm/mach-at91/include/mach/atmel_mpddrc.h
index 40ec87e2ff9..d68c93cdd3c 100644
--- a/arch/arm/mach-at91/include/mach/atmel_mpddrc.h
+++ b/arch/arm/mach-at91/include/mach/atmel_mpddrc.h
@@ -10,6 +10,7 @@
 #ifndef __ATMEL_MPDDRC_H__
 #define __ATMEL_MPDDRC_H__
 
+#include <asm/types.h>
 struct atmel_mpddrc_config {
 	u32 mr;
 	u32 rtr;
diff --git a/arch/arm/mach-at91/include/mach/atmel_pio4.h b/arch/arm/mach-at91/include/mach/atmel_pio4.h
index f348b05bc85..c87ca43d9f9 100644
--- a/arch/arm/mach-at91/include/mach/atmel_pio4.h
+++ b/arch/arm/mach-at91/include/mach/atmel_pio4.h
@@ -9,6 +9,7 @@
 
 #ifndef __ASSEMBLY__
 
+#include <asm/types.h>
 #include <linux/bitops.h>
 struct atmel_pio4_port {
 	u32 mskr;		/* 0x00 PIO Mask Register */
diff --git a/arch/arm/mach-at91/include/mach/atmel_sdhci.h b/arch/arm/mach-at91/include/mach/atmel_sdhci.h
index 48b6bd22368..5c237a0a687 100644
--- a/arch/arm/mach-at91/include/mach/atmel_sdhci.h
+++ b/arch/arm/mach-at91/include/mach/atmel_sdhci.h
@@ -7,6 +7,7 @@
 #ifndef __ATMEL_SDHCI_H
 #define __ATMEL_SDHCI_H
 
+#include <asm/types.h>
 int atmel_sdhci_init(void *regbase, u32 id);
 
 #endif
diff --git a/arch/arm/mach-at91/include/mach/atmel_serial.h b/arch/arm/mach-at91/include/mach/atmel_serial.h
index c53a509ff8b..6f348225645 100644
--- a/arch/arm/mach-at91/include/mach/atmel_serial.h
+++ b/arch/arm/mach-at91/include/mach/atmel_serial.h
@@ -7,6 +7,7 @@
 #define _ATMEL_SERIAL_H
 
 /* Information about a serial port */
+#include <linux/types.h>
 struct atmel_serial_platdata {
 	uint32_t base_addr;
 };
diff --git a/arch/arm/mach-at91/include/mach/clk.h b/arch/arm/mach-at91/include/mach/clk.h
index c1d92739e47..f6ceea2b2b2 100644
--- a/arch/arm/mach-at91/include/mach/clk.h
+++ b/arch/arm/mach-at91/include/mach/clk.h
@@ -11,6 +11,7 @@
 #include <asm/arch/hardware.h>
 #include <asm/arch/at91_pmc.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 
 #define GCK_CSS_SLOW_CLK	0
 #define GCK_CSS_MAIN_CLK	1
diff --git a/arch/arm/mach-at91/include/mach/gpio.h b/arch/arm/mach-at91/include/mach/gpio.h
index 575c6436ad3..1cbe1fcba16 100644
--- a/arch/arm/mach-at91/include/mach/gpio.h
+++ b/arch/arm/mach-at91/include/mach/gpio.h
@@ -12,6 +12,7 @@
 #include <linux/errno.h>
 #include <asm/arch/at91_pio.h>
 #include <asm/arch/hardware.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_ATMEL_LEGACY
 
diff --git a/arch/arm/mach-at91/include/mach/sama5_matrix.h b/arch/arm/mach-at91/include/mach/sama5_matrix.h
index 2a92d701610..8f315efdb10 100644
--- a/arch/arm/mach-at91/include/mach/sama5_matrix.h
+++ b/arch/arm/mach-at91/include/mach/sama5_matrix.h
@@ -9,6 +9,7 @@
 #ifndef __SAMA5_MATRIX_H
 #define __SAMA5_MATRIX_H
 
+#include <asm/types.h>
 struct atmel_matrix {
 	u32 mcfg[16];	/* 0x00 ~ 0x3c: Master Configuration Register */
 	u32 scfg[16];	/* 0x40 ~ 0x7c: Slave Configuration Register */
diff --git a/arch/arm/mach-at91/include/mach/sama5d2_smc.h b/arch/arm/mach-at91/include/mach/sama5d2_smc.h
index 928a078f5f4..03f04af9302 100644
--- a/arch/arm/mach-at91/include/mach/sama5d2_smc.h
+++ b/arch/arm/mach-at91/include/mach/sama5d2_smc.h
@@ -16,6 +16,7 @@
 #define AT91_ASM_SMC_TIMINGS0	(ATMEL_BASE_SMC + 0x70c)
 #define AT91_ASM_SMC_MODE0	(ATMEL_BASE_SMC + 0x710)
 #else
+#include <asm/types.h>
 struct at91_cs {
 	u32	setup;		/* 0x600 SMC Setup Register */
 	u32	pulse;		/* 0x604 SMC Pulse Register */
diff --git a/arch/arm/mach-at91/include/mach/sama5d3_smc.h b/arch/arm/mach-at91/include/mach/sama5d3_smc.h
index 547e7b72f4a..9c2b8461b70 100644
--- a/arch/arm/mach-at91/include/mach/sama5d3_smc.h
+++ b/arch/arm/mach-at91/include/mach/sama5d3_smc.h
@@ -16,6 +16,7 @@
 #define AT91_ASM_SMC_TIMINGS0	(ATMEL_BASE_SMC + 0x60c)
 #define AT91_ASM_SMC_MODE0	(ATMEL_BASE_SMC + 0x610)
 #else
+#include <asm/types.h>
 struct at91_cs {
 	u32	setup;		/* 0x600 SMC Setup Register */
 	u32	pulse;		/* 0x604 SMC Pulse Register */
diff --git a/arch/arm/mach-at91/mpddrc.c b/arch/arm/mach-at91/mpddrc.c
index 5422c05456e..a2bcf4924c8 100644
--- a/arch/arm/mach-at91/mpddrc.c
+++ b/arch/arm/mach-at91/mpddrc.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <asm/arch/atmel_mpddrc.h>
 #include <asm/arch/at91_common.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 #define SAMA5D3_MPDDRC_VERSION		0x140
diff --git a/arch/arm/mach-at91/spl.c b/arch/arm/mach-at91/spl.c
index 217fcfa6689..32e154922be 100644
--- a/arch/arm/mach-at91/spl.c
+++ b/arch/arm/mach-at91/spl.c
@@ -12,6 +12,7 @@
 #include <asm/arch/at91_wdt.h>
 #include <asm/arch/clk.h>
 #include <spl.h>
+#include <asm/types.h>
 
 #if !defined(CONFIG_WDT_AT91)
 void at91_disable_wdt(void)
diff --git a/arch/arm/mach-at91/spl_at91.c b/arch/arm/mach-at91/spl_at91.c
index d0c73253924..e3b85d3c541 100644
--- a/arch/arm/mach-at91/spl_at91.c
+++ b/arch/arm/mach-at91/spl_at91.c
@@ -9,6 +9,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <hang.h>
 #include <init.h>
 #include <log.h>
@@ -21,6 +22,7 @@
 #include <asm/arch/at91_wdt.h>
 #include <asm/arch/clk.h>
 #include <spl.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-at91/spl_atmel.c b/arch/arm/mach-at91/spl_atmel.c
index 526379fae1a..0a3777176bb 100644
--- a/arch/arm/mach-at91/spl_atmel.c
+++ b/arch/arm/mach-at91/spl_atmel.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <hang.h>
 #include <init.h>
 #include <log.h>
@@ -17,6 +18,7 @@
 #include <asm/arch/clk.h>
 #include <spl.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 static void switch_to_main_crystal_osc(void)
 {
diff --git a/arch/arm/mach-bcm283x/include/mach/gpio.h b/arch/arm/mach-bcm283x/include/mach/gpio.h
index 3263de9a352..840388815a1 100644
--- a/arch/arm/mach-bcm283x/include/mach/gpio.h
+++ b/arch/arm/mach-bcm283x/include/mach/gpio.h
@@ -8,6 +8,7 @@
 #ifndef _BCM2835_GPIO_H_
 #define _BCM2835_GPIO_H_
 
+#include <asm/types.h>
 #define BCM2835_GPIO_COUNT		54
 
 #define BCM2835_GPIO_FSEL_MASK		0x7
diff --git a/arch/arm/mach-bcm283x/include/mach/mbox.h b/arch/arm/mach-bcm283x/include/mach/mbox.h
index 70029eefded..61586eb8591 100644
--- a/arch/arm/mach-bcm283x/include/mach/mbox.h
+++ b/arch/arm/mach-bcm283x/include/mach/mbox.h
@@ -6,7 +6,9 @@
 #ifndef _BCM2835_MBOX_H
 #define _BCM2835_MBOX_H
 
+#include <compiler.h>
 #include <asm/arch/base.h>
+#include <asm/types.h>
 #include <linux/compiler.h>
 #include <linux/string.h>
 
diff --git a/arch/arm/mach-bcm283x/include/mach/msg.h b/arch/arm/mach-bcm283x/include/mach/msg.h
index e45c1bf010f..483fb5b0e14 100644
--- a/arch/arm/mach-bcm283x/include/mach/msg.h
+++ b/arch/arm/mach-bcm283x/include/mach/msg.h
@@ -12,6 +12,7 @@
  * @module: ID of module to power on (BCM2835_MBOX_POWER_DEVID_...)
  * @return 0 if OK, -EIO on error
  */
+#include <linux/types.h>
 int bcm2835_power_on_module(u32 module);
 
 /**
diff --git a/arch/arm/mach-bcm283x/include/mach/sdhci.h b/arch/arm/mach-bcm283x/include/mach/sdhci.h
index 73236906870..481dc091439 100644
--- a/arch/arm/mach-bcm283x/include/mach/sdhci.h
+++ b/arch/arm/mach-bcm283x/include/mach/sdhci.h
@@ -7,6 +7,7 @@
 #define _BCM2835_SDHCI_H_
 
 #include <asm/arch/base.h>
+#include <asm/types.h>
 
 #define BCM2835_SDHCI_PHYSADDR ({ BUG_ON(!rpi_bcm283x_base); \
 				  rpi_bcm283x_base + 0x00300000; })
diff --git a/arch/arm/mach-bcm283x/include/mach/wdog.h b/arch/arm/mach-bcm283x/include/mach/wdog.h
index 99426667205..2d8d7e0b0a3 100644
--- a/arch/arm/mach-bcm283x/include/mach/wdog.h
+++ b/arch/arm/mach-bcm283x/include/mach/wdog.h
@@ -7,6 +7,7 @@
 #define _BCM2835_WDOG_H
 
 #include <asm/arch/base.h>
+#include <asm/types.h>
 
 #define BCM2835_WDOG_PHYSADDR ({ BUG_ON(!rpi_bcm283x_base); \
 				 rpi_bcm283x_base + 0x00100000; })
diff --git a/arch/arm/mach-bcm283x/init.c b/arch/arm/mach-bcm283x/init.c
index c80c77e0fcc..70e1e22ebdc 100644
--- a/arch/arm/mach-bcm283x/init.c
+++ b/arch/arm/mach-bcm283x/init.c
@@ -13,6 +13,7 @@
 #include <asm/u-boot.h>
 #include <dm/device.h>
 #include <fdt_support.h>
+#include <linux/types.h>
 
 #define BCM2711_RPI4_PCIE_XHCI_MMIO_PHYS	0x600000000UL
 #define BCM2711_RPI4_PCIE_XHCI_MMIO_SIZE	0x800000UL
diff --git a/arch/arm/mach-bcm283x/mbox.c b/arch/arm/mach-bcm283x/mbox.c
index 0c8cf78c188..8d036a18755 100644
--- a/arch/arm/mach-bcm283x/mbox.c
+++ b/arch/arm/mach-bcm283x/mbox.c
@@ -14,6 +14,7 @@
 #include <asm/arch/mbox.h>
 #include <phys2bus.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #define TIMEOUT 1000 /* ms */
 
diff --git a/arch/arm/mach-bcm283x/msg.c b/arch/arm/mach-bcm283x/msg.c
index 3c3eac9025b..57411b9d600 100644
--- a/arch/arm/mach-bcm283x/msg.c
+++ b/arch/arm/mach-bcm283x/msg.c
@@ -10,6 +10,7 @@
 #include <asm/arch/mbox.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 struct msg_set_power_state {
 	struct bcm2835_mbox_hdr hdr;
diff --git a/arch/arm/mach-bcm283x/reset.c b/arch/arm/mach-bcm283x/reset.c
index 2b4ccd47279..0d39bbdcf46 100644
--- a/arch/arm/mach-bcm283x/reset.c
+++ b/arch/arm/mach-bcm283x/reset.c
@@ -12,6 +12,7 @@
 #include <asm/arch/base.h>
 #include <asm/arch/wdog.h>
 #include <efi_loader.h>
+#include <linux/types.h>
 
 #define RESET_TIMEOUT 10
 
diff --git a/arch/arm/mach-bcmstb/include/mach/timer.h b/arch/arm/mach-bcmstb/include/mach/timer.h
index 039dd664c2c..8767a4602f6 100644
--- a/arch/arm/mach-bcmstb/include/mach/timer.h
+++ b/arch/arm/mach-bcmstb/include/mach/timer.h
@@ -8,6 +8,7 @@
 #ifndef _BCMSTB_TIMER_H
 #define _BCMSTB_TIMER_H
 
+#include <linux/types.h>
 uint64_t get_ticks(void);
 
 #endif /* _BCMSTB_TIMER_H */
diff --git a/arch/arm/mach-davinci/include/mach/davinci_misc.h b/arch/arm/mach-davinci/include/mach/davinci_misc.h
index 41b2c6648ec..711fb4b3d14 100644
--- a/arch/arm/mach-davinci/include/mach/davinci_misc.h
+++ b/arch/arm/mach-davinci/include/mach/davinci_misc.h
@@ -8,6 +8,7 @@
 
 #include <asm/arch/hardware.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 /* pin muxer definitions */
 #define PIN_MUX_NUM_FIELDS	8	/* Per register */
diff --git a/arch/arm/mach-davinci/include/mach/dm365_lowlevel.h b/arch/arm/mach-davinci/include/mach/dm365_lowlevel.h
index eb1488e7442..000e32f0574 100644
--- a/arch/arm/mach-davinci/include/mach/dm365_lowlevel.h
+++ b/arch/arm/mach-davinci/include/mach/dm365_lowlevel.h
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <asm/arch/hardware.h>
 #include <asm/io.h>
+#include <linux/types.h>
 
 void dm365_waitloop(unsigned long loopcnt);
 int dm365_pll1_init(unsigned long pllmult, unsigned long prediv);
diff --git a/arch/arm/mach-davinci/include/mach/sdmmc_defs.h b/arch/arm/mach-davinci/include/mach/sdmmc_defs.h
index e1851c5ae4e..6c28974f68d 100644
--- a/arch/arm/mach-davinci/include/mach/sdmmc_defs.h
+++ b/arch/arm/mach-davinci/include/mach/sdmmc_defs.h
@@ -10,6 +10,7 @@
 
 #include <asm/arch/hardware.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 /* MMC Control Reg fields */
 #define MMCCTL_DATRST		(1 << 0)
diff --git a/arch/arm/mach-davinci/include/mach/timer_defs.h b/arch/arm/mach-davinci/include/mach/timer_defs.h
index 110e67e454c..f880b7ef927 100644
--- a/arch/arm/mach-davinci/include/mach/timer_defs.h
+++ b/arch/arm/mach-davinci/include/mach/timer_defs.h
@@ -6,6 +6,7 @@
 #ifndef _TIMER_DEFS_H_
 #define _TIMER_DEFS_H_
 
+#include <linux/types.h>
 struct davinci_timer {
 	u_int32_t	pid12;
 	u_int32_t	emumgt;
diff --git a/arch/arm/mach-davinci/misc.c b/arch/arm/mach-davinci/misc.c
index 6ae7ab2887a..e19a300f390 100644
--- a/arch/arm/mach-davinci/misc.c
+++ b/arch/arm/mach-davinci/misc.c
@@ -20,6 +20,7 @@
 #include <asm/io.h>
 #include <asm/arch/davinci_misc.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-davinci/spl.c b/arch/arm/mach-davinci/spl.c
index 9e14284ab02..a9732fc5264 100644
--- a/arch/arm/mach-davinci/spl.c
+++ b/arch/arm/mach-davinci/spl.c
@@ -17,6 +17,7 @@
 #include <malloc.h>
 #include <spi_flash.h>
 #include <mmc.h>
+#include <linux/types.h>
 
 #ifndef CONFIG_SPL_LIBCOMMON_SUPPORT
 void puts(const char *str)
diff --git a/arch/arm/mach-davinci/timer.c b/arch/arm/mach-davinci/timer.c
index 43e0574901e..562363af34f 100644
--- a/arch/arm/mach-davinci/timer.c
+++ b/arch/arm/mach-davinci/timer.c
@@ -28,6 +28,7 @@
 #include <asm/arch/timer_defs.h>
 #include <div64.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-exynos/clock.c b/arch/arm/mach-exynos/clock.c
index 33995ff4ec6..bd570b9e341 100644
--- a/arch/arm/mach-exynos/clock.c
+++ b/arch/arm/mach-exynos/clock.c
@@ -13,6 +13,7 @@
 #include <asm/arch/clk.h>
 #include <asm/arch/periph.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #define PLL_DIV_1024	1024
 #define PLL_DIV_65535	65535
diff --git a/arch/arm/mach-exynos/clock_init.h b/arch/arm/mach-exynos/clock_init.h
index a4d3fdae851..6d0fe3a5bcc 100644
--- a/arch/arm/mach-exynos/clock_init.h
+++ b/arch/arm/mach-exynos/clock_init.h
@@ -8,6 +8,7 @@
 #ifndef __EXYNOS_CLOCK_INIT_H
 #define __EXYNOS_CLOCK_INIT_H
 
+#include <linux/types.h>
 enum {
 #ifdef CONFIG_EXYNOS5420
 	MEM_TIMINGS_MSR_COUNT	= 5,
diff --git a/arch/arm/mach-exynos/clock_init_exynos5.c b/arch/arm/mach-exynos/clock_init_exynos5.c
index cf83ef9391a..c5e2380e516 100644
--- a/arch/arm/mach-exynos/clock_init_exynos5.c
+++ b/arch/arm/mach-exynos/clock_init_exynos5.c
@@ -12,6 +12,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/spl.h>
 #include <asm/arch/dwmmc.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 
 #include "clock_init.h"
diff --git a/arch/arm/mach-exynos/common_setup.h b/arch/arm/mach-exynos/common_setup.h
index 4e3702b9285..afae76531a9 100644
--- a/arch/arm/mach-exynos/common_setup.h
+++ b/arch/arm/mach-exynos/common_setup.h
@@ -24,6 +24,7 @@
  */
 
 #include <asm/arch/system.h>
+#include <linux/types.h>
 
 #define DMC_OFFSET	0x10000
 
diff --git a/arch/arm/mach-exynos/dmc_common.c b/arch/arm/mach-exynos/dmc_common.c
index 44923dd5520..880e9fc2b66 100644
--- a/arch/arm/mach-exynos/dmc_common.c
+++ b/arch/arm/mach-exynos/dmc_common.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <asm/arch/spl.h>
+#include <linux/types.h>
 
 #include "clock_init.h"
 #include "common_setup.h"
diff --git a/arch/arm/mach-exynos/dmc_init_ddr3.c b/arch/arm/mach-exynos/dmc_init_ddr3.c
index 2cf3c2fa06a..0c0b68391b6 100644
--- a/arch/arm/mach-exynos/dmc_init_ddr3.c
+++ b/arch/arm/mach-exynos/dmc_init_ddr3.c
@@ -14,6 +14,7 @@
 #include <asm/arch/dmc.h>
 #include <asm/arch/power.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include "common_setup.h"
 #include "exynos5_setup.h"
 #include "clock_init.h"
diff --git a/arch/arm/mach-exynos/exynos5_setup.h b/arch/arm/mach-exynos/exynos5_setup.h
index bf4cca9e193..7bb31e917dc 100644
--- a/arch/arm/mach-exynos/exynos5_setup.h
+++ b/arch/arm/mach-exynos/exynos5_setup.h
@@ -10,6 +10,7 @@
 
 #include <config.h>
 #include <asm/arch/dmc.h>
+#include <linux/types.h>
 
 #define NOT_AVAILABLE		0
 #define DATA_MASK		0xFFFFF
diff --git a/arch/arm/mach-exynos/include/mach/mmc.h b/arch/arm/mach-exynos/include/mach/mmc.h
index eece44ea1aa..88e23b1138e 100644
--- a/arch/arm/mach-exynos/include/mach/mmc.h
+++ b/arch/arm/mach-exynos/include/mach/mmc.h
@@ -7,6 +7,7 @@
 #ifndef __ASM_ARCH_MMC_H_
 #define __ASM_ARCH_MMC_H_
 
+#include <asm/types.h>
 #define S5P_MMC_DEV_OFFSET	0x10000
 
 #define SDHCI_CONTROL2		0x80
diff --git a/arch/arm/mach-exynos/include/mach/power.h b/arch/arm/mach-exynos/include/mach/power.h
index a3d8974dcb5..27960c619b5 100644
--- a/arch/arm/mach-exynos/include/mach/power.h
+++ b/arch/arm/mach-exynos/include/mach/power.h
@@ -8,6 +8,7 @@
 #define __ASM_ARM_ARCH_POWER_H_
 
 #ifndef __ASSEMBLY__
+#include <linux/types.h>
 struct exynos4_power {
 	unsigned int	om_stat;
 	unsigned char	res1[0x8];
diff --git a/arch/arm/mach-exynos/include/mach/spl.h b/arch/arm/mach-exynos/include/mach/spl.h
index 9d642461bd6..7675d4dc724 100644
--- a/arch/arm/mach-exynos/include/mach/spl.h
+++ b/arch/arm/mach-exynos/include/mach/spl.h
@@ -11,6 +11,8 @@
 
 #ifndef __ASSEMBLY__
 /* Parameters of early board initialization in SPL */
+#include <compiler.h>
+#include <asm/types.h>
 struct spl_machine_param {
 	/* Add fields as and when required */
 	u32		signature;
diff --git a/arch/arm/mach-exynos/include/mach/sromc.h b/arch/arm/mach-exynos/include/mach/sromc.h
index 15c9ccc723d..81776988961 100644
--- a/arch/arm/mach-exynos/include/mach/sromc.h
+++ b/arch/arm/mach-exynos/include/mach/sromc.h
@@ -24,6 +24,7 @@
 #define SROMC_BC_PMC(x)  (x << 0)  /* normal(1data)page mode configuration */
 
 #ifndef __ASSEMBLY__
+#include <asm/types.h>
 struct s5p_sromc {
 	unsigned int	bw;
 	unsigned int	bc[4];
diff --git a/arch/arm/mach-exynos/include/mach/sys_proto.h b/arch/arm/mach-exynos/include/mach/sys_proto.h
index 53d53bc6b6d..23c8b643e2c 100644
--- a/arch/arm/mach-exynos/include/mach/sys_proto.h
+++ b/arch/arm/mach-exynos/include/mach/sys_proto.h
@@ -7,6 +7,7 @@
 #ifndef _SYS_PROTO_H_
 #define _SYS_PROTO_H_
 
+#include <asm/types.h>
 u32 get_device_type(void);
 void invalidate_dcache(u32);
 void l2_cache_disable(void);
diff --git a/arch/arm/mach-exynos/include/mach/tmu.h b/arch/arm/mach-exynos/include/mach/tmu.h
index cad35694f64..b301f17b874 100644
--- a/arch/arm/mach-exynos/include/mach/tmu.h
+++ b/arch/arm/mach-exynos/include/mach/tmu.h
@@ -20,6 +20,7 @@
 #ifndef __ASM_ARCH_TMU_H
 #define __ASM_ARCH_TMU_H
 
+#include <asm/types.h>
 struct exynos5_tmu_reg {
 	u32 triminfo;
 	u32 rsvd1[4];
diff --git a/arch/arm/mach-exynos/lowlevel_init.c b/arch/arm/mach-exynos/lowlevel_init.c
index 7a2fe744527..a94483ce9a0 100644
--- a/arch/arm/mach-exynos/lowlevel_init.c
+++ b/arch/arm/mach-exynos/lowlevel_init.c
@@ -37,6 +37,7 @@
 #include <asm/arch/system.h>
 #include <asm/armv7.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 #include "common_setup.h"
 #include "exynos5_setup.h"
 
diff --git a/arch/arm/mach-exynos/pinmux.c b/arch/arm/mach-exynos/pinmux.c
index 5d7738ae5ba..5a818ac2b1e 100644
--- a/arch/arm/mach-exynos/pinmux.c
+++ b/arch/arm/mach-exynos/pinmux.c
@@ -10,6 +10,7 @@
 #include <asm/gpio.h>
 #include <asm/arch/pinmux.h>
 #include <asm/arch/sromc.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 
 static void exynos5_uart_config(int peripheral)
diff --git a/arch/arm/mach-exynos/power.c b/arch/arm/mach-exynos/power.c
index f2a6c00dd62..b36c395bebc 100644
--- a/arch/arm/mach-exynos/power.c
+++ b/arch/arm/mach-exynos/power.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <asm/io.h>
 #include <asm/arch/power.h>
+#include <linux/types.h>
 
 static void exynos4_mipi_phy_control(unsigned int dev_index,
 					unsigned int enable)
diff --git a/arch/arm/mach-exynos/soc.c b/arch/arm/mach-exynos/soc.c
index 810fa348eea..388d50ff64d 100644
--- a/arch/arm/mach-exynos/soc.c
+++ b/arch/arm/mach-exynos/soc.c
@@ -9,6 +9,7 @@
 #include <asm/cache.h>
 #include <asm/io.h>
 #include <asm/system.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_TARGET_ESPRESSO7420
 /*
diff --git a/arch/arm/mach-exynos/spl_boot.c b/arch/arm/mach-exynos/spl_boot.c
index 3ed5d10f1ae..4c19cce1a47 100644
--- a/arch/arm/mach-exynos/spl_boot.c
+++ b/arch/arm/mach-exynos/spl_boot.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <asm/global_data.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include <asm/cache.h>
 #include <asm/arch/clock.h>
diff --git a/arch/arm/mach-imx/cache.c b/arch/arm/mach-imx/cache.c
index ce49253d0b4..c35720502bc 100644
--- a/arch/arm/mach-imx/cache.c
+++ b/arch/arm/mach-imx/cache.c
@@ -11,6 +11,7 @@
 #include <asm/pl310.h>
 #include <asm/io.h>
 #include <asm/mach-imx/sys_proto.h>
+#include <asm/types.h>
 
 static void enable_ca7_smp(void)
 {
diff --git a/arch/arm/mach-imx/cmd_dek.c b/arch/arm/mach-imx/cmd_dek.c
index a8199497a91..62a9afe8b10 100644
--- a/arch/arm/mach-imx/cmd_dek.c
+++ b/arch/arm/mach-imx/cmd_dek.c
@@ -15,6 +15,7 @@
 #include <fsl_sec.h>
 #include <asm/arch/clock.h>
 #include <mapmem.h>
+#include <linux/types.h>
 
 /**
 * blob_dek() - Encapsulate the DEK as a blob using CAM's Key
diff --git a/arch/arm/mach-imx/cmd_nandbcb.c b/arch/arm/mach-imx/cmd_nandbcb.c
index 9165140e494..882e71aee4c 100644
--- a/arch/arm/mach-imx/cmd_nandbcb.c
+++ b/arch/arm/mach-imx/cmd_nandbcb.c
@@ -16,6 +16,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <nand.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <dm/devres.h>
@@ -23,6 +24,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <asm/io.h>
 #include <jffs2/jffs2.h>
diff --git a/arch/arm/mach-imx/cpu.c b/arch/arm/mach-imx/cpu.c
index 837bd7e3a45..8988c60ca94 100644
--- a/arch/arm/mach-imx/cpu.c
+++ b/arch/arm/mach-imx/cpu.c
@@ -25,6 +25,7 @@
 #include <ipu_pixfmt.h>
 #include <thermal.h>
 #include <sata.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_FSL_ESDHC_IMX
 #include <fsl_esdhc_imx.h>
diff --git a/arch/arm/mach-imx/ddrmc-vf610-calibration.c b/arch/arm/mach-imx/ddrmc-vf610-calibration.c
index cd7e95e61d0..fbe3bfd07f2 100644
--- a/arch/arm/mach-imx/ddrmc-vf610-calibration.c
+++ b/arch/arm/mach-imx/ddrmc-vf610-calibration.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
+#include <asm/types.h>
 #include <linux/bitmap.h>
 
 #include "ddrmc-vf610-calibration.h"
diff --git a/arch/arm/mach-imx/hab.c b/arch/arm/mach-imx/hab.c
index b576b032ec6..73ae2b12a02 100644
--- a/arch/arm/mach-imx/hab.c
+++ b/arch/arm/mach-imx/hab.c
@@ -18,6 +18,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/mach-imx/hab.h>
+#include <linux/types.h>
 
 #define ALIGN_SIZE		0x1000
 #define MX6DQ_PU_IROM_MMU_EN_VAR	0x009024a8
diff --git a/arch/arm/mach-imx/i2c-mxv7.c b/arch/arm/mach-imx/i2c-mxv7.c
index 1e1b14c1272..963946769b8 100644
--- a/arch/arm/mach-imx/i2c-mxv7.c
+++ b/arch/arm/mach-imx/i2c-mxv7.c
@@ -15,6 +15,7 @@
 #include <asm/mach-imx/mxc_i2c.h>
 #include <watchdog.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 int force_idle_bus(void *priv)
 {
diff --git a/arch/arm/mach-imx/imx8/ahab.c b/arch/arm/mach-imx/imx8/ahab.c
index f3c370914c6..d779b476ece 100644
--- a/arch/arm/mach-imx/imx8/ahab.c
+++ b/arch/arm/mach-imx/imx8/ahab.c
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <errno.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
@@ -21,6 +22,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-imx/imx8/clock.c b/arch/arm/mach-imx/imx8/clock.c
index 9288282dfb0..96a7d8bdcf3 100644
--- a/arch/arm/mach-imx/imx8/clock.c
+++ b/arch/arm/mach-imx/imx8/clock.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <asm/arch/clock.h>
 
diff --git a/arch/arm/mach-imx/imx8/cpu.c b/arch/arm/mach-imx/imx8/cpu.c
index 55a424f6e2f..cab3177e03a 100644
--- a/arch/arm/mach-imx/imx8/cpu.c
+++ b/arch/arm/mach-imx/imx8/cpu.c
@@ -5,14 +5,17 @@
 
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <cpu.h>
 #include <cpu_func.h>
 #include <dm.h>
 #include <init.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <dm/device-internal.h>
 #include <dm/lists.h>
diff --git a/arch/arm/mach-imx/imx8/fdt.c b/arch/arm/mach-imx/imx8/fdt.c
index eee6e529cdc..4ffdc5e5727 100644
--- a/arch/arm/mach-imx/imx8/fdt.c
+++ b/arch/arm/mach-imx/imx8/fdt.c
@@ -10,6 +10,7 @@
 #include <asm/arch/sci/sci.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <dm/ofnode.h>
 #include <fdt_support.h>
diff --git a/arch/arm/mach-imx/imx8/image.c b/arch/arm/mach-imx/imx8/image.c
index 4258abecd08..d685c9f5e7d 100644
--- a/arch/arm/mach-imx/imx8/image.c
+++ b/arch/arm/mach-imx/imx8/image.c
@@ -18,6 +18,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define MMC_DEV		0
 #define QSPI_DEV	1
diff --git a/arch/arm/mach-imx/imx8/iomux.c b/arch/arm/mach-imx/imx8/iomux.c
index 0f4f0cac107..4c00622c381 100644
--- a/arch/arm/mach-imx/imx8/iomux.c
+++ b/arch/arm/mach-imx/imx8/iomux.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/sci/sci.h>
+#include <asm/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-imx/imx8/misc.c b/arch/arm/mach-imx/imx8/misc.c
index e83c0517fca..29566ad7c78 100644
--- a/arch/arm/mach-imx/imx8/misc.c
+++ b/arch/arm/mach-imx/imx8/misc.c
@@ -6,6 +6,7 @@
 #include <asm/mach-imx/sys_proto.h>
 #include <imx_sip.h>
 #include <linux/arm-smccc.h>
+#include <linux/types.h>
 
 int sc_pm_setup_uart(sc_rsrc_t uart_rsrc, sc_pm_clock_rate_t clk_rate)
 {
diff --git a/arch/arm/mach-imx/imx8/parse-container.c b/arch/arm/mach-imx/imx8/parse-container.c
index a5332358ca5..ba254516c2d 100644
--- a/arch/arm/mach-imx/imx8/parse-container.c
+++ b/arch/arm/mach-imx/imx8/parse-container.c
@@ -13,6 +13,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define SEC_SECURE_RAM_BASE		0x31800000UL
 #define SEC_SECURE_RAM_END_BASE		(SEC_SECURE_RAM_BASE + 0xFFFFUL)
diff --git a/arch/arm/mach-imx/imx8/snvs_security_sc.c b/arch/arm/mach-imx/imx8/snvs_security_sc.c
index 086e89b0e5c..cb815395314 100644
--- a/arch/arm/mach-imx/imx8/snvs_security_sc.c
+++ b/arch/arm/mach-imx/imx8/snvs_security_sc.c
@@ -21,6 +21,7 @@
 #include <asm/arch-imx8/imx8-pins.h>
 #include <asm/arch-imx8/snvs_security_sc.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 
diff --git a/arch/arm/mach-imx/imx8m/clock_imx8mm.c b/arch/arm/mach-imx/imx8m/clock_imx8mm.c
index ac4d0766dab..20f450c440b 100644
--- a/arch/arm/mach-imx/imx8m/clock_imx8mm.c
+++ b/arch/arm/mach-imx/imx8m/clock_imx8mm.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
@@ -18,6 +19,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-imx/imx8m/clock_imx8mq.c b/arch/arm/mach-imx/imx8m/clock_imx8mq.c
index 95a1dbb7180..9b1956cf378 100644
--- a/arch/arm/mach-imx/imx8m/clock_imx8mq.c
+++ b/arch/arm/mach-imx/imx8m/clock_imx8mq.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
@@ -17,6 +18,7 @@
 #include <linux/errno.h>
 #include <linux/iopoll.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 static struct anamix_pll *ana_pll = (struct anamix_pll *)ANATOP_BASE_ADDR;
 
diff --git a/arch/arm/mach-imx/imx8m/clock_slice.c b/arch/arm/mach-imx/imx8m/clock_slice.c
index 4074e1e4c52..ff8bd35cf9a 100644
--- a/arch/arm/mach-imx/imx8m/clock_slice.c
+++ b/arch/arm/mach-imx/imx8m/clock_slice.c
@@ -6,10 +6,13 @@
  */
 
 #include <common.h>
+#include <compiler.h>
+#include <stdbool.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/io.h>
 #include <errno.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 
diff --git a/arch/arm/mach-imx/imx8m/soc.c b/arch/arm/mach-imx/imx8m/soc.c
index f05760771be..9c7e0b1247f 100644
--- a/arch/arm/mach-imx/imx8m/soc.c
+++ b/arch/arm/mach-imx/imx8m/soc.c
@@ -6,9 +6,11 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <init.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/arch/imx-regs.h>
@@ -35,6 +37,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-imx/imx_bootaux.c b/arch/arm/mach-imx/imx_bootaux.c
index 02fa1d7b62b..e24f430e3c4 100644
--- a/arch/arm/mach-imx/imx_bootaux.c
+++ b/arch/arm/mach-imx/imx_bootaux.c
@@ -16,6 +16,7 @@
 #include <linux/compiler.h>
 #include <cpu_func.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 int arch_auxiliary_core_up(u32 core_id, ulong addr)
 {
diff --git a/arch/arm/mach-imx/init.c b/arch/arm/mach-imx/init.c
index 693b7244299..be9aac6e221 100644
--- a/arch/arm/mach-imx/init.c
+++ b/arch/arm/mach-imx/init.c
@@ -9,6 +9,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/mach-imx/boot_mode.h>
 #include <asm/arch/crm_regs.h>
+#include <asm/types.h>
 
 void init_aips(void)
 {
diff --git a/arch/arm/mach-imx/iomux-v3.c b/arch/arm/mach-imx/iomux-v3.c
index 18131a20f43..219dd98a549 100644
--- a/arch/arm/mach-imx/iomux-v3.c
+++ b/arch/arm/mach-imx/iomux-v3.c
@@ -12,6 +12,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/mach-imx/sys_proto.h>
+#include <asm/types.h>
 
 static void *base = (void *)IOMUXC_BASE_ADDR;
 
diff --git a/arch/arm/mach-imx/mac.c b/arch/arm/mach-imx/mac.c
index b23315cf90e..d054f2e37f0 100644
--- a/arch/arm/mach-imx/mac.c
+++ b/arch/arm/mach-imx/mac.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
 #include <errno.h>
+#include <linux/types.h>
 
 struct imx_mac_fuse {
 	u32 mac_addr0;
diff --git a/arch/arm/mach-imx/misc.c b/arch/arm/mach-imx/misc.c
index e30e87d3aa0..9360a727c47 100644
--- a/arch/arm/mach-imx/misc.c
+++ b/arch/arm/mach-imx/misc.c
@@ -13,6 +13,7 @@
 #include <linux/errno.h>
 #include <asm/io.h>
 #include <asm/mach-imx/regs-common.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-imx/mmc_env.c b/arch/arm/mach-imx/mmc_env.c
index 9c822f721c6..9ad2cf4dc8f 100644
--- a/arch/arm/mach-imx/mmc_env.c
+++ b/arch/arm/mach-imx/mmc_env.c
@@ -4,10 +4,12 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/io.h>
 #include <asm/mach-imx/boot_mode.h>
+#include <linux/types.h>
 
 __weak int board_mmc_get_env_dev(int devno)
 {
diff --git a/arch/arm/mach-imx/mmdc_size.c b/arch/arm/mach-imx/mmdc_size.c
index 1a094726aad..05d71b236bc 100644
--- a/arch/arm/mach-imx/mmdc_size.c
+++ b/arch/arm/mach-imx/mmdc_size.c
@@ -2,6 +2,7 @@
 
 #include <common.h>
 #include <asm/io.h>
+#include <asm/types.h>
 
 #if defined(CONFIG_MX53)
 #define MEMCTL_BASE	ESDCTL_BASE_ADDR
diff --git a/arch/arm/mach-imx/mx5/clock.c b/arch/arm/mach-imx/mx5/clock.c
index adc7dbee7d3..0b4fa84db79 100644
--- a/arch/arm/mach-imx/mx5/clock.c
+++ b/arch/arm/mach-imx/mx5/clock.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <command.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/io.h>
 #include <linux/errno.h>
@@ -19,6 +20,7 @@
 #include <asm/arch/sys_proto.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 enum pll_clocks {
 	PLL1_CLOCK = 0,
diff --git a/arch/arm/mach-imx/mx5/soc.c b/arch/arm/mach-imx/mx5/soc.c
index c61fcce3eb4..d4431a44fc6 100644
--- a/arch/arm/mach-imx/mx5/soc.c
+++ b/arch/arm/mach-imx/mx5/soc.c
@@ -7,11 +7,13 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/cache.h>
+#include <asm/types.h>
 
 #include <linux/errno.h>
 #include <asm/io.h>
diff --git a/arch/arm/mach-imx/mx6/clock.c b/arch/arm/mach-imx/mx6/clock.c
index 7e066d39b2d..4fdcb7b3f5a 100644
--- a/arch/arm/mach-imx/mx6/clock.c
+++ b/arch/arm/mach-imx/mx6/clock.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <div64.h>
 #include <log.h>
 #include <stdbool.h>
@@ -16,6 +17,7 @@
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/types.h>
 
 enum pll_clocks {
 	PLL_SYS,	/* System PLL */
diff --git a/arch/arm/mach-imx/mx6/ddr.c b/arch/arm/mach-imx/mx6/ddr.c
index d5230d516a1..c02bcabc744 100644
--- a/arch/arm/mach-imx/mx6/ddr.c
+++ b/arch/arm/mach-imx/mx6/ddr.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <hang.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
diff --git a/arch/arm/mach-imx/mx6/module_fuse.c b/arch/arm/mach-imx/mx6/module_fuse.c
index c1731a82856..c162b9c528a 100644
--- a/arch/arm/mach-imx/mx6/module_fuse.c
+++ b/arch/arm/mach-imx/mx6/module_fuse.c
@@ -14,6 +14,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static struct fuse_entry_desc mx6_fuse_descs[] = {
 #if defined(CONFIG_MX6ULL)
diff --git a/arch/arm/mach-imx/mx6/mp.c b/arch/arm/mach-imx/mx6/mp.c
index d28d55d4be5..1791bd29466 100644
--- a/arch/arm/mach-imx/mx6/mp.c
+++ b/arch/arm/mach-imx/mx6/mp.c
@@ -14,6 +14,7 @@
 #include <linux/errno.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/imx-regs.h>
+#include <linux/types.h>
 
 #define MAX_CPUS 4
 static struct src *src = (struct src *)SRC_BASE_ADDR;
diff --git a/arch/arm/mach-imx/mx6/opos6ul.c b/arch/arm/mach-imx/mx6/opos6ul.c
index 67b8c65963d..d7398f7ace7 100644
--- a/arch/arm/mach-imx/mx6/opos6ul.c
+++ b/arch/arm/mach-imx/mx6/opos6ul.c
@@ -3,6 +3,7 @@
  * Copyright (C) 2018 Armadeus Systems
  */
 
+#include <compiler.h>
 #include <init.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/crm_regs.h>
@@ -13,6 +14,7 @@
 #include <common.h>
 #include <env.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-imx/mx6/soc.c b/arch/arm/mach-imx/mx6/soc.c
index 51d1cbc24de..99240f02b9c 100644
--- a/arch/arm/mach-imx/mx6/soc.c
+++ b/arch/arm/mach-imx/mx6/soc.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <init.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
@@ -27,6 +28,7 @@
 #include <imx_thermal.h>
 #include <mmc.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 struct scu_regs {
 	u32	ctrl;
diff --git a/arch/arm/mach-imx/mx7/clock.c b/arch/arm/mach-imx/mx7/clock.c
index b2d566737a4..6f6dbc9faba 100644
--- a/arch/arm/mach-imx/mx7/clock.c
+++ b/arch/arm/mach-imx/mx7/clock.c
@@ -20,6 +20,7 @@
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/types.h>
 
 struct mxc_ccm_anatop_reg *ccm_anatop = (struct mxc_ccm_anatop_reg *)
 					 ANATOP_BASE_ADDR;
diff --git a/arch/arm/mach-imx/mx7/clock_slice.c b/arch/arm/mach-imx/mx7/clock_slice.c
index c5aea2bffd6..b7ad9e4a406 100644
--- a/arch/arm/mach-imx/mx7/clock_slice.c
+++ b/arch/arm/mach-imx/mx7/clock_slice.c
@@ -8,8 +8,10 @@
 
 #include <common.h>
 #include <div64.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/crm_regs.h>
diff --git a/arch/arm/mach-imx/mx7/psci-mx7.c b/arch/arm/mach-imx/mx7/psci-mx7.c
index 214e4043f44..0b93af39977 100644
--- a/arch/arm/mach-imx/mx7/psci-mx7.c
+++ b/arch/arm/mach-imx/mx7/psci-mx7.c
@@ -13,6 +13,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/armv7.h>
 #include <asm/gic.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <common.h>
 #include <fsl_wdog.h>
diff --git a/arch/arm/mach-imx/mx7/snvs.c b/arch/arm/mach-imx/mx7/snvs.c
index 359bbbb41c7..acc3356c3be 100644
--- a/arch/arm/mach-imx/mx7/snvs.c
+++ b/arch/arm/mach-imx/mx7/snvs.c
@@ -5,6 +5,7 @@
 
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 
 #define SNVS_HPCOMR		0x04
diff --git a/arch/arm/mach-imx/mx7/soc.c b/arch/arm/mach-imx/mx7/soc.c
index e97aa8ebe75..652807cee6b 100644
--- a/arch/arm/mach-imx/mx7/soc.c
+++ b/arch/arm/mach-imx/mx7/soc.c
@@ -4,7 +4,9 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <init.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/clock.h>
@@ -19,6 +21,7 @@
 #include <imx_thermal.h>
 #include <fsl_sec.h>
 #include <asm/setup.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
diff --git a/arch/arm/mach-imx/mx7ulp/clock.c b/arch/arm/mach-imx/mx7ulp/clock.c
index c7dfa798b45..0b39cf14dba 100644
--- a/arch/arm/mach-imx/mx7ulp/clock.c
+++ b/arch/arm/mach-imx/mx7ulp/clock.c
@@ -14,6 +14,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/sys_proto.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-imx/mx7ulp/iomux.c b/arch/arm/mach-imx/mx7ulp/iomux.c
index 05ddeed2a64..24a31d648c4 100644
--- a/arch/arm/mach-imx/mx7ulp/iomux.c
+++ b/arch/arm/mach-imx/mx7ulp/iomux.c
@@ -7,6 +7,7 @@
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux.h>
+#include <asm/types.h>
 
 static void *base = (void *)IOMUXC_BASE_ADDR;
 
diff --git a/arch/arm/mach-imx/mx7ulp/pcc.c b/arch/arm/mach-imx/mx7ulp/pcc.c
index 9d06260bdfa..61dfd6b01e0 100644
--- a/arch/arm/mach-imx/mx7ulp/pcc.c
+++ b/arch/arm/mach-imx/mx7ulp/pcc.c
@@ -6,12 +6,14 @@
 #include <common.h>
 #include <div64.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/io.h>
 #include <errno.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/pcc.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 
diff --git a/arch/arm/mach-imx/mx7ulp/scg.c b/arch/arm/mach-imx/mx7ulp/scg.c
index bc837aae33a..c9be289706d 100644
--- a/arch/arm/mach-imx/mx7ulp/scg.c
+++ b/arch/arm/mach-imx/mx7ulp/scg.c
@@ -13,6 +13,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/pcc.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 
diff --git a/arch/arm/mach-imx/mx7ulp/soc.c b/arch/arm/mach-imx/mx7ulp/soc.c
index 79a4ef3cbf8..d4570d64d60 100644
--- a/arch/arm/mach-imx/mx7ulp/soc.c
+++ b/arch/arm/mach-imx/mx7ulp/soc.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <init.h>
 #include <log.h>
@@ -18,6 +19,7 @@
 #include <asm/mach-imx/hab.h>
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
+#include <linux/types.h>
 
 #define PMC0_BASE_ADDR		0x410a1000
 #define PMC0_CTRL		0x28
diff --git a/arch/arm/mach-imx/rdc-sema.c b/arch/arm/mach-imx/rdc-sema.c
index e683673753e..d184406cd13 100644
--- a/arch/arm/mach-imx/rdc-sema.c
+++ b/arch/arm/mach-imx/rdc-sema.c
@@ -7,6 +7,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/mach-imx/rdc-sema.h>
 #include <asm/arch/imx-rdc.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 
 /*
diff --git a/arch/arm/mach-imx/spl.c b/arch/arm/mach-imx/spl.c
index 8e712607044..ba68395217b 100644
--- a/arch/arm/mach-imx/spl.c
+++ b/arch/arm/mach-imx/spl.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <hang.h>
 #include <init.h>
 #include <log.h>
@@ -22,6 +23,7 @@
 #include <g_dnl.h>
 #include <asm/u-boot.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-imx/spl_imx_romapi.c b/arch/arm/mach-imx/spl_imx_romapi.c
index 336b3da6264..07b76565392 100644
--- a/arch/arm/mach-imx/spl_imx_romapi.c
+++ b/arch/arm/mach-imx/spl_imx_romapi.c
@@ -13,6 +13,7 @@
 #include <linux/libfdt.h>
 #include <spl.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <asm/arch/sys_proto.h>
 
diff --git a/arch/arm/mach-imx/syscounter.c b/arch/arm/mach-imx/syscounter.c
index 6dfed365d29..33572b943a7 100644
--- a/arch/arm/mach-imx/syscounter.c
+++ b/arch/arm/mach-imx/syscounter.c
@@ -15,6 +15,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/mach-imx/syscounter.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-imx/timer.c b/arch/arm/mach-imx/timer.c
index fa1941aec42..569c05fad25 100644
--- a/arch/arm/mach-imx/timer.c
+++ b/arch/arm/mach-imx/timer.c
@@ -14,6 +14,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/types.h>
 
 /* General purpose timers registers */
 struct mxc_gpt {
diff --git a/arch/arm/mach-ipq40xx/clock-ipq4019.c b/arch/arm/mach-ipq40xx/clock-ipq4019.c
index dae070f0ed6..a15a6871ce4 100644
--- a/arch/arm/mach-ipq40xx/clock-ipq4019.c
+++ b/arch/arm/mach-ipq40xx/clock-ipq4019.c
@@ -13,6 +13,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 struct msm_clk_priv {
 	phys_addr_t base;
diff --git a/arch/arm/mach-ipq40xx/pinctrl-snapdragon.c b/arch/arm/mach-ipq40xx/pinctrl-snapdragon.c
index 9f73a62d7a1..c18b87d923a 100644
--- a/arch/arm/mach-ipq40xx/pinctrl-snapdragon.c
+++ b/arch/arm/mach-ipq40xx/pinctrl-snapdragon.c
@@ -18,6 +18,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include "pinctrl-snapdragon.h"
 
 struct msm_pinctrl_priv {
diff --git a/arch/arm/mach-k3/am6_init.c b/arch/arm/mach-k3/am6_init.c
index bda150df9cf..9bed725f8c5 100644
--- a/arch/arm/mach-k3/am6_init.c
+++ b/arch/arm/mach-k3/am6_init.c
@@ -16,6 +16,7 @@
 #include <asm/arch/sysfw-loader.h>
 #include <asm/arch/sys_proto.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include "common.h"
 #include <dm.h>
 #include <dm/uclass-internal.h>
diff --git a/arch/arm/mach-k3/common.c b/arch/arm/mach-k3/common.c
index ef1f3b3209b..f21184b6790 100644
--- a/arch/arm/mach-k3/common.c
+++ b/arch/arm/mach-k3/common.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <image.h>
 #include <init.h>
@@ -18,6 +19,7 @@
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "common.h"
 #include <dm.h>
 #include <remoteproc.h>
diff --git a/arch/arm/mach-k3/common.h b/arch/arm/mach-k3/common.h
index ba344c5bc9d..df0d17f34a1 100644
--- a/arch/arm/mach-k3/common.h
+++ b/arch/arm/mach-k3/common.h
@@ -7,6 +7,7 @@
  */
 
 #include <asm/armv7_mpu.h>
+#include <linux/types.h>
 
 struct fwl_data {
 	const char *name;
diff --git a/arch/arm/mach-k3/include/mach/sys_proto.h b/arch/arm/mach-k3/include/mach/sys_proto.h
index 3c825aa3d1f..62cf760a419 100644
--- a/arch/arm/mach-k3/include/mach/sys_proto.h
+++ b/arch/arm/mach-k3/include/mach/sys_proto.h
@@ -7,6 +7,7 @@
 #ifndef _SYS_PROTO_H_
 #define _SYS_PROTO_H_
 
+#include <asm/types.h>
 void sdelay(unsigned long loops);
 u32 wait_on_value(u32 read_bit_mask, u32 match_value, void *read_addr,
 		  u32 bound);
diff --git a/arch/arm/mach-k3/j721e_init.c b/arch/arm/mach-k3/j721e_init.c
index a835309daf1..00fdae69065 100644
--- a/arch/arm/mach-k3/j721e_init.c
+++ b/arch/arm/mach-k3/j721e_init.c
@@ -16,6 +16,7 @@
 #include <asm/arch/hardware.h>
 #include <asm/arch/sysfw-loader.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include "common.h"
 #include <asm/arch/sys_proto.h>
 #include <linux/soc/ti/ti_sci_protocol.h>
diff --git a/arch/arm/mach-k3/security.c b/arch/arm/mach-k3/security.c
index f4aef0a025b..7655c9a3205 100644
--- a/arch/arm/mach-k3/security.c
+++ b/arch/arm/mach-k3/security.c
@@ -16,6 +16,7 @@
 #include <asm/cache.h>
 #include <linux/kernel.h>
 #include <linux/soc/ti/ti_sci_protocol.h>
+#include <linux/types.h>
 #include <mach/spl.h>
 #include <spl.h>
 #include <asm/arch/sys_proto.h>
diff --git a/arch/arm/mach-k3/sysfw-loader.c b/arch/arm/mach-k3/sysfw-loader.c
index 39a9da1698d..134fec61ab7 100644
--- a/arch/arm/mach-k3/sysfw-loader.c
+++ b/arch/arm/mach-k3/sysfw-loader.c
@@ -23,6 +23,7 @@
 #include <dfu.h>
 #include <dm/uclass-internal.h>
 #include <spi_flash.h>
+#include <linux/types.h>
 
 #include <asm/arch/sys_proto.h>
 #include "common.h"
diff --git a/arch/arm/mach-keystone/clock.c b/arch/arm/mach-keystone/clock.c
index 0c59515d2eb..69a7c010dc1 100644
--- a/arch/arm/mach-keystone/clock.c
+++ b/arch/arm/mach-keystone/clock.c
@@ -7,8 +7,10 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/clock_defs.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 
 /* DEV and ARM speed definitions as specified in DEVSPEED register */
diff --git a/arch/arm/mach-keystone/cmd_mon.c b/arch/arm/mach-keystone/cmd_mon.c
index 5887a89ff11..42935007dc0 100644
--- a/arch/arm/mach-keystone/cmd_mon.c
+++ b/arch/arm/mach-keystone/cmd_mon.c
@@ -11,6 +11,7 @@
 #include <image.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <mach/mon.h>
diff --git a/arch/arm/mach-keystone/ddr3.c b/arch/arm/mach-keystone/ddr3.c
index 99c394cd91d..a589935c222 100644
--- a/arch/arm/mach-keystone/ddr3.c
+++ b/arch/arm/mach-keystone/ddr3.c
@@ -15,6 +15,7 @@
 #include <asm/arch/msmc.h>
 #include <asm/arch/ddr3.h>
 #include <asm/arch/psc_defs.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 #include <asm/ti-common/ti-edma3.h>
diff --git a/arch/arm/mach-keystone/ddr3_spd.c b/arch/arm/mach-keystone/ddr3_spd.c
index a7aa7f36521..85dcac05d3e 100644
--- a/arch/arm/mach-keystone/ddr3_spd.c
+++ b/arch/arm/mach-keystone/ddr3_spd.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <log.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/string.h>
 
 #include <i2c.h>
diff --git a/arch/arm/mach-keystone/include/mach/clock_defs.h b/arch/arm/mach-keystone/include/mach/clock_defs.h
index 336b103dc8c..ced9265d0a9 100644
--- a/arch/arm/mach-keystone/include/mach/clock_defs.h
+++ b/arch/arm/mach-keystone/include/mach/clock_defs.h
@@ -10,6 +10,7 @@
 
 #include <asm/arch/hardware.h>
 #ifndef __ASSEMBLY__
+#include <asm/types.h>
 #include <linux/bitops.h>
 #endif
 
diff --git a/arch/arm/mach-keystone/include/mach/ddr3.h b/arch/arm/mach-keystone/include/mach/ddr3.h
index cb28068db7d..4d68f562814 100644
--- a/arch/arm/mach-keystone/include/mach/ddr3.h
+++ b/arch/arm/mach-keystone/include/mach/ddr3.h
@@ -10,6 +10,7 @@
 #define _DDR3_H_
 
 #include <asm/arch/hardware.h>
+#include <asm/types.h>
 
 struct ddr3_phy_config {
 	unsigned int pllcr;
diff --git a/arch/arm/mach-keystone/include/mach/hardware-k2g.h b/arch/arm/mach-keystone/include/mach/hardware-k2g.h
index 971c081bb3c..8361d459df9 100644
--- a/arch/arm/mach-keystone/include/mach/hardware-k2g.h
+++ b/arch/arm/mach-keystone/include/mach/hardware-k2g.h
@@ -103,6 +103,7 @@
 #define MAX_SYSCLK	4
 
 #ifndef __ASSEMBLY__
+#include <asm/types.h>
 static inline u8 get_sysclk_index(void)
 {
 	u32 dev_stat = __raw_readl(KS2_DEVSTAT);
diff --git a/arch/arm/mach-keystone/include/mach/hardware.h b/arch/arm/mach-keystone/include/mach/hardware.h
index 0c5dc6a7395..4044ae65a0c 100644
--- a/arch/arm/mach-keystone/include/mach/hardware.h
+++ b/arch/arm/mach-keystone/include/mach/hardware.h
@@ -11,6 +11,7 @@
 #include <config.h>
 
 #ifndef __ASSEMBLY__
+#include <asm/types.h>
 #include <linux/bitops.h>
 
 #include <linux/sizes.h>
diff --git a/arch/arm/mach-keystone/include/mach/mon.h b/arch/arm/mach-keystone/include/mach/mon.h
index e1bef216d99..d23d31d6b74 100644
--- a/arch/arm/mach-keystone/include/mach/mon.h
+++ b/arch/arm/mach-keystone/include/mach/mon.h
@@ -9,6 +9,7 @@
 #ifndef _MACH_MON_H_
 #define _MACH_MON_H_
 
+#include <asm/types.h>
 int mon_install(u32 addr, u32 dpsc, u32 freq, u32 bm_addr);
 int mon_power_on(int core_id, void *ep);
 int mon_power_off(int core_id);
diff --git a/arch/arm/mach-keystone/include/mach/msmc.h b/arch/arm/mach-keystone/include/mach/msmc.h
index 3fe09ea5968..d4a9303bd38 100644
--- a/arch/arm/mach-keystone/include/mach/msmc.h
+++ b/arch/arm/mach-keystone/include/mach/msmc.h
@@ -10,6 +10,7 @@
 #define _MSMC_H_
 
 #include <asm/arch/hardware.h>
+#include <asm/types.h>
 
 enum mpax_seg_size {
 	MPAX_SEG_4K = 0x0b,
diff --git a/arch/arm/mach-keystone/include/mach/mux-k2g.h b/arch/arm/mach-keystone/include/mach/mux-k2g.h
index 67d47f81721..8030ccfabb0 100644
--- a/arch/arm/mach-keystone/include/mach/mux-k2g.h
+++ b/arch/arm/mach-keystone/include/mach/mux-k2g.h
@@ -11,6 +11,7 @@
 
 #include <common.h>
 #include <asm/io.h>
+#include <asm/types.h>
 
 #define K2G_PADCFG_REG	(KS2_DEVICE_STATE_CTRL_BASE + 0x1000)
 
diff --git a/arch/arm/mach-keystone/include/mach/psc_defs.h b/arch/arm/mach-keystone/include/mach/psc_defs.h
index 0864b37a531..1966adb0fe3 100644
--- a/arch/arm/mach-keystone/include/mach/psc_defs.h
+++ b/arch/arm/mach-keystone/include/mach/psc_defs.h
@@ -8,6 +8,7 @@
 
 #include <stdbool.h>
 #include <asm/arch/hardware.h>
+#include <asm/types.h>
 
 /*
  * FILE PURPOSE: Local Power Sleep Controller definitions
diff --git a/arch/arm/mach-keystone/init.c b/arch/arm/mach-keystone/init.c
index 880698c5f77..d3386b06d53 100644
--- a/arch/arm/mach-keystone/init.c
+++ b/arch/arm/mach-keystone/init.c
@@ -19,6 +19,7 @@
 #include <asm/arch/psc_defs.h>
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
+#include <linux/types.h>
 
 #define MAX_PCI_PORTS		2
 enum pci_mode	{
diff --git a/arch/arm/mach-keystone/keystone.c b/arch/arm/mach-keystone/keystone.c
index a74c4d995b1..e8b805acb60 100644
--- a/arch/arm/mach-keystone/keystone.c
+++ b/arch/arm/mach-keystone/keystone.c
@@ -14,6 +14,7 @@
 #include <asm/io.h>
 #include <asm/arch/psc_defs.h>
 #include <asm/arch/hardware.h>
+#include <asm/types.h>
 
 /**
  * cpu_to_bus - swap bytes of the 32-bit data if the device is BE
diff --git a/arch/arm/mach-keystone/mon.c b/arch/arm/mach-keystone/mon.c
index af038dec7ae..f92078964a5 100644
--- a/arch/arm/mach-keystone/mon.c
+++ b/arch/arm/mach-keystone/mon.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <command.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <mach/mon.h>
 #include <spl.h>
 asm(".arch_extension sec\n\t");
diff --git a/arch/arm/mach-keystone/msmc.c b/arch/arm/mach-keystone/msmc.c
index f5cadfbf669..ba9e16d0f0c 100644
--- a/arch/arm/mach-keystone/msmc.c
+++ b/arch/arm/mach-keystone/msmc.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <asm/arch/msmc.h>
+#include <asm/types.h>
 
 struct mpax {
 	u32	mpaxl;
diff --git a/arch/arm/mach-keystone/psc.c b/arch/arm/mach-keystone/psc.c
index 6005cbaeca8..f47b08e4bbe 100644
--- a/arch/arm/mach-keystone/psc.c
+++ b/arch/arm/mach-keystone/psc.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <stdbool.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/io.h>
diff --git a/arch/arm/mach-kirkwood/cache.c b/arch/arm/mach-kirkwood/cache.c
index 009b7deeca6..13ee22afdc0 100644
--- a/arch/arm/mach-kirkwood/cache.c
+++ b/arch/arm/mach-kirkwood/cache.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <asm/arch/cpu.h>
 #include <asm/cache.h>
+#include <asm/types.h>
 
 #define FEROCEON_EXTRA_FEATURE_L2C_EN (1<<22)
 
diff --git a/arch/arm/mach-kirkwood/cpu.c b/arch/arm/mach-kirkwood/cpu.c
index 48d4327be76..5bdc2d9b56d 100644
--- a/arch/arm/mach-kirkwood/cpu.c
+++ b/arch/arm/mach-kirkwood/cpu.c
@@ -20,6 +20,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
 #include <mvebu_mmc.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/kernel.h>
 
diff --git a/arch/arm/mach-kirkwood/include/mach/cpu.h b/arch/arm/mach-kirkwood/include/mach/cpu.h
index ea42182cf9c..ade2ccc8289 100644
--- a/arch/arm/mach-kirkwood/include/mach/cpu.h
+++ b/arch/arm/mach-kirkwood/include/mach/cpu.h
@@ -25,6 +25,7 @@
 #define SYSRST_CNT_1SEC_VAL		(25*1000000)
 #define KW_REG_MPP_OUT_DRV_REG		(KW_MPP_BASE + 0xE0)
 
+#include <asm/types.h>
 enum memory_bank {
 	BANK0,
 	BANK1,
diff --git a/arch/arm/mach-kirkwood/mpp.c b/arch/arm/mach-kirkwood/mpp.c
index 4fdad99cade..9525de119cd 100644
--- a/arch/arm/mach-kirkwood/mpp.c
+++ b/arch/arm/mach-kirkwood/mpp.c
@@ -15,6 +15,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
 #include <asm/arch/mpp.h>
+#include <asm/types.h>
 
 static u32 kirkwood_variant(void)
 {
diff --git a/arch/arm/mach-lpc32xx/clk.c b/arch/arm/mach-lpc32xx/clk.c
index cb2344d79fe..d6060800f16 100644
--- a/arch/arm/mach-lpc32xx/clk.c
+++ b/arch/arm/mach-lpc32xx/clk.c
@@ -9,6 +9,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/clk.h>
 #include <asm/io.h>
+#include <asm/types.h>
 
 static struct clk_pm_regs *clk = (struct clk_pm_regs *)CLK_PM_BASE;
 
diff --git a/arch/arm/mach-lpc32xx/cpu.c b/arch/arm/mach-lpc32xx/cpu.c
index cdc069639d5..65cb6110430 100644
--- a/arch/arm/mach-lpc32xx/cpu.c
+++ b/arch/arm/mach-lpc32xx/cpu.c
@@ -15,6 +15,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/io.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 static struct clk_pm_regs *clk = (struct clk_pm_regs *)CLK_PM_BASE;
 static struct wdt_regs  *wdt = (struct wdt_regs *)WDT_BASE;
diff --git a/arch/arm/mach-lpc32xx/devices.c b/arch/arm/mach-lpc32xx/devices.c
index 7e7646a2e15..545236b57b6 100644
--- a/arch/arm/mach-lpc32xx/devices.c
+++ b/arch/arm/mach-lpc32xx/devices.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <ns16550.h>
 #include <dm/platform_data/lpc32xx_hsuart.h>
+#include <linux/types.h>
 
 #include <asm/arch/clk.h>
 #include <asm/arch/uart.h>
diff --git a/arch/arm/mach-lpc32xx/dram.c b/arch/arm/mach-lpc32xx/dram.c
index 16022379235..495458af540 100644
--- a/arch/arm/mach-lpc32xx/dram.c
+++ b/arch/arm/mach-lpc32xx/dram.c
@@ -18,6 +18,7 @@
 #include <asm/arch/emc.h>
 #include <asm/io.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 static struct clk_pm_regs *clk = (struct clk_pm_regs *)CLK_PM_BASE;
 static struct emc_regs *emc = (struct emc_regs *)EMC_BASE;
diff --git a/arch/arm/mach-lpc32xx/timer.c b/arch/arm/mach-lpc32xx/timer.c
index 90183e3014e..cf5d3de1b58 100644
--- a/arch/arm/mach-lpc32xx/timer.c
+++ b/arch/arm/mach-lpc32xx/timer.c
@@ -11,6 +11,7 @@
 #include <asm/arch/timer.h>
 #include <asm/io.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 static struct timer_regs  *timer0 = (struct timer_regs *)TIMER0_BASE;
 static struct timer_regs  *timer1 = (struct timer_regs *)TIMER1_BASE;
diff --git a/arch/arm/mach-mediatek/mt7622/init.c b/arch/arm/mach-mediatek/mt7622/init.c
index ff07936be34..2ae23c64924 100644
--- a/arch/arm/mach-mediatek/mt7622/init.c
+++ b/arch/arm/mach-mediatek/mt7622/init.c
@@ -10,6 +10,7 @@
 #include <stdio.h>
 #include <asm/armv8/mmu.h>
 #include <asm/cache.h>
+#include <linux/types.h>
 
 int print_cpuinfo(void)
 {
diff --git a/arch/arm/mach-mediatek/mt7623/init.c b/arch/arm/mach-mediatek/mt7623/init.c
index fa7a05291bc..78813545eee 100644
--- a/arch/arm/mach-mediatek/mt7623/init.c
+++ b/arch/arm/mach-mediatek/mt7623/init.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <init.h>
 #include <stdio.h>
 #include <asm/global_data.h>
@@ -11,6 +12,7 @@
 #include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <asm/arch/misc.h>
+#include <linux/types.h>
 
 #include "preloader.h"
 
diff --git a/arch/arm/mach-mediatek/mt7623/preloader.h b/arch/arm/mach-mediatek/mt7623/preloader.h
index 2d2c71ad4c4..a696bf12b88 100644
--- a/arch/arm/mach-mediatek/mt7623/preloader.h
+++ b/arch/arm/mach-mediatek/mt7623/preloader.h
@@ -6,6 +6,7 @@
 #ifndef __PRELOADER_H_
 #define __PRELOADER_H_
 
+#include <asm/types.h>
 enum forbidden_mode {
 	F_FACTORY_MODE = 0x0001
 };
diff --git a/arch/arm/mach-mediatek/mt7629/init.c b/arch/arm/mach-mediatek/mt7629/init.c
index a643810d245..cddc82d26e4 100644
--- a/arch/arm/mach-mediatek/mt7629/init.c
+++ b/arch/arm/mach-mediatek/mt7629/init.c
@@ -6,6 +6,7 @@
 
 #include <clk.h>
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <fdtdec.h>
 #include <init.h>
@@ -15,6 +16,7 @@
 #include <asm/arch/misc.h>
 #include <asm/global_data.h>
 #include <asm/sections.h>
+#include <asm/types.h>
 #include <dm/uclass.h>
 #include <linux/bitops.h>
 #include <linux/io.h>
diff --git a/arch/arm/mach-mediatek/mt8512/init.c b/arch/arm/mach-mediatek/mt8512/init.c
index 5a126d317c1..2519e25e1b3 100644
--- a/arch/arm/mach-mediatek/mt8512/init.c
+++ b/arch/arm/mach-mediatek/mt8512/init.c
@@ -22,6 +22,7 @@
 #include <asm/u-boot.h>
 #include <dm/uclass.h>
 #include <dt-bindings/clock/mt8512-clk.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-mediatek/mt8516/init.c b/arch/arm/mach-mediatek/mt8516/init.c
index 11fe96f54f3..dec7d8588cd 100644
--- a/arch/arm/mach-mediatek/mt8516/init.c
+++ b/arch/arm/mach-mediatek/mt8516/init.c
@@ -22,6 +22,7 @@
 #include <dm/uclass.h>
 #include <dt-bindings/clock/mt8516-clk.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-mediatek/mt8518/init.c b/arch/arm/mach-mediatek/mt8518/init.c
index dce53612e46..74ba95d9964 100644
--- a/arch/arm/mach-mediatek/mt8518/init.c
+++ b/arch/arm/mach-mediatek/mt8518/init.c
@@ -22,6 +22,7 @@
 #include <asm/u-boot.h>
 #include <dm/uclass.h>
 #include <dt-bindings/clock/mt8518-clk.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-mediatek/spl.c b/arch/arm/mach-mediatek/spl.c
index 927175c5a31..6b963597687 100644
--- a/arch/arm/mach-mediatek/spl.c
+++ b/arch/arm/mach-mediatek/spl.c
@@ -9,6 +9,7 @@
 #include <hang.h>
 #include <init.h>
 #include <spl.h>
+#include <linux/types.h>
 
 #include "init.h"
 
diff --git a/arch/arm/mach-meson/board-axg.c b/arch/arm/mach-meson/board-axg.c
index 7e07465d254..3507cda0c44 100644
--- a/arch/arm/mach-meson/board-axg.c
+++ b/arch/arm/mach-meson/board-axg.c
@@ -15,6 +15,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/armv8/mmu.h>
+#include <asm/types.h>
 #include <linux/sizes.h>
 #include <phy.h>
 
diff --git a/arch/arm/mach-meson/board-common.c b/arch/arm/mach-meson/board-common.c
index cdae5f98770..fb92a9c46d6 100644
--- a/arch/arm/mach-meson/board-common.c
+++ b/arch/arm/mach-meson/board-common.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <init.h>
 #include <net.h>
@@ -22,6 +23,7 @@
 #include <asm/armv8/mmu.h>
 #include <asm/unaligned.h>
 #include <efi_loader.h>
+#include <linux/types.h>
 #include <u-boot/crc.h>
 
 #if CONFIG_IS_ENABLED(FASTBOOT)
diff --git a/arch/arm/mach-meson/board-g12a.c b/arch/arm/mach-meson/board-g12a.c
index 250a9617c0d..b40b5641490 100644
--- a/arch/arm/mach-meson/board-g12a.c
+++ b/arch/arm/mach-meson/board-g12a.c
@@ -17,6 +17,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/armv8/mmu.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/sizes.h>
diff --git a/arch/arm/mach-meson/board-gx.c b/arch/arm/mach-meson/board-gx.c
index b38811fb951..47c1279a548 100644
--- a/arch/arm/mach-meson/board-gx.c
+++ b/arch/arm/mach-meson/board-gx.c
@@ -16,6 +16,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/armv8/mmu.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/sizes.h>
diff --git a/arch/arm/mach-meson/board-info.c b/arch/arm/mach-meson/board-info.c
index 94c523c17fd..226254038de 100644
--- a/arch/arm/mach-meson/board-info.c
+++ b/arch/arm/mach-meson/board-info.c
@@ -10,6 +10,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm.h>
+#include <asm/types.h>
 #include <linux/bitfield.h>
 #include <regmap.h>
 #include <syscon.h>
diff --git a/arch/arm/mach-meson/sm.c b/arch/arm/mach-meson/sm.c
index 62feaccfce0..76c62ec6f1b 100644
--- a/arch/arm/mach-meson/sm.c
+++ b/arch/arm/mach-meson/sm.c
@@ -24,6 +24,7 @@
 #include <regmap.h>
 #include <syscon.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define FN_GET_SHARE_MEM_INPUT_BASE	0x82000020
 #define FN_GET_SHARE_MEM_OUTPUT_BASE	0x82000021
diff --git a/arch/arm/mach-mvebu/arm64-common.c b/arch/arm/mach-mvebu/arm64-common.c
index 513dcbf9878..640506ece30 100644
--- a/arch/arm/mach-mvebu/arm64-common.c
+++ b/arch/arm/mach-mvebu/arm64-common.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <fdtdec.h>
 #include <init.h>
@@ -20,6 +21,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
 #include <asm/armv8/mmu.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-mvebu/armada3700/cpu.c b/arch/arm/mach-mvebu/armada3700/cpu.c
index a6b92cf8fb8..67ef64deb67 100644
--- a/arch/arm/mach-mvebu/armada3700/cpu.c
+++ b/arch/arm/mach-mvebu/armada3700/cpu.c
@@ -22,6 +22,7 @@
 #include <asm/armv8/mmu.h>
 #include <sort.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /* Armada 3700 */
 #define MVEBU_GPIO_NB_REG_BASE		(MVEBU_REGISTER(0x13800))
diff --git a/arch/arm/mach-mvebu/armada8k/cpu.c b/arch/arm/mach-mvebu/armada8k/cpu.c
index 529dac90595..81959bb51f0 100644
--- a/arch/arm/mach-mvebu/armada8k/cpu.c
+++ b/arch/arm/mach-mvebu/armada8k/cpu.c
@@ -13,6 +13,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
 #include <asm/armv8/mmu.h>
+#include <linux/types.h>
 
 /* Armada 7k/8k */
 #define MVEBU_RFU_BASE			(MVEBU_REGISTER(0x6f0000))
diff --git a/arch/arm/mach-mvebu/cpu.c b/arch/arm/mach-mvebu/cpu.c
index 53c44ede7db..56ef4f3309d 100644
--- a/arch/arm/mach-mvebu/cpu.c
+++ b/arch/arm/mach-mvebu/cpu.c
@@ -5,9 +5,11 @@
 
 #include <common.h>
 #include <ahci.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <init.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/arch/arm/mach-mvebu/dram.c b/arch/arm/mach-mvebu/dram.c
index eb84ad9333c..e6af9ff06e7 100644
--- a/arch/arm/mach-mvebu/dram.c
+++ b/arch/arm/mach-mvebu/dram.c
@@ -13,6 +13,7 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 
 #if defined(CONFIG_ARCH_MVEBU)
diff --git a/arch/arm/mach-mvebu/efuse.c b/arch/arm/mach-mvebu/efuse.c
index 8ada3cf93e7..322e2e3db38 100644
--- a/arch/arm/mach-mvebu/efuse.c
+++ b/arch/arm/mach-mvebu/efuse.c
@@ -10,6 +10,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/efuse.h>
 #include <asm/arch/soc.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/arch/arm/mach-mvebu/gpio.c b/arch/arm/mach-mvebu/gpio.c
index 1d1e3df8ba9..97e5c11865a 100644
--- a/arch/arm/mach-mvebu/gpio.c
+++ b/arch/arm/mach-mvebu/gpio.c
@@ -9,6 +9,7 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <asm/types.h>
 
 /*
  * mvebu_config_gpio - GPIO configuration
diff --git a/arch/arm/mach-mvebu/include/mach/cpu.h b/arch/arm/mach-mvebu/include/mach/cpu.h
index c3f8ad85065..a58a0d706de 100644
--- a/arch/arm/mach-mvebu/include/mach/cpu.h
+++ b/arch/arm/mach-mvebu/include/mach/cpu.h
@@ -15,6 +15,7 @@
 #define MVEBU_REG_PCIE_DEVID		(MVEBU_REG_PCIE_BASE + 0x00)
 #define MVEBU_REG_PCIE_REVID		(MVEBU_REG_PCIE_BASE + 0x08)
 
+#include <asm/types.h>
 enum memory_bank {
 	BANK0,
 	BANK1,
diff --git a/arch/arm/mach-mvebu/include/mach/efuse.h b/arch/arm/mach-mvebu/include/mach/efuse.h
index bbc5844d849..c965b62dcd7 100644
--- a/arch/arm/mach-mvebu/include/mach/efuse.h
+++ b/arch/arm/mach-mvebu/include/mach/efuse.h
@@ -7,6 +7,7 @@
 #define _MVEBU_EFUSE_H
 
 #include <common.h>
+#include <asm/types.h>
 
 struct efuse_val {
 	union {
diff --git a/arch/arm/mach-mvebu/mbus.c b/arch/arm/mach-mvebu/mbus.c
index e754f122b1c..cd51e38aed6 100644
--- a/arch/arm/mach-mvebu/mbus.c
+++ b/arch/arm/mach-mvebu/mbus.c
@@ -30,6 +30,8 @@
  * This driver:
  *
  * - Reads out the SDRAM address decoding windows at initialization
+#include <compiler.h>
+#include <linux/types.h>
  *   time, and fills the mbus_dram_info structure with these
  *   informations. The exported function mv_mbus_dram_info() allow
  *   device drivers to get those informations related to the SDRAM
diff --git a/arch/arm/mach-mvebu/serdes/a38x/ctrl_pex.c b/arch/arm/mach-mvebu/serdes/a38x/ctrl_pex.c
index adef3331a7c..4768d0537d7 100644
--- a/arch/arm/mach-mvebu/serdes/a38x/ctrl_pex.c
+++ b/arch/arm/mach-mvebu/serdes/a38x/ctrl_pex.c
@@ -4,10 +4,12 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <spl.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 
diff --git a/arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec-38x.c b/arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec-38x.c
index 98354da9b27..b774e62f856 100644
--- a/arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec-38x.c
+++ b/arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec-38x.c
@@ -9,6 +9,7 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <asm/types.h>
 
 #include "high_speed_env_spec.h"
 #include "sys_env_lib.h"
diff --git a/arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec.c b/arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec.c
index e4bec786429..5457868c18e 100644
--- a/arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec.c
+++ b/arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec.c
@@ -9,6 +9,7 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 #include "high_speed_env_spec.h"
diff --git a/arch/arm/mach-mvebu/serdes/a38x/seq_exec.c b/arch/arm/mach-mvebu/serdes/a38x/seq_exec.c
index a8f491b5b41..d4157b1ea72 100644
--- a/arch/arm/mach-mvebu/serdes/a38x/seq_exec.c
+++ b/arch/arm/mach-mvebu/serdes/a38x/seq_exec.c
@@ -9,6 +9,7 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 #include "seq_exec.h"
diff --git a/arch/arm/mach-mvebu/serdes/a38x/seq_exec.h b/arch/arm/mach-mvebu/serdes/a38x/seq_exec.h
index fe0cb8f75df..71b3a75fb83 100644
--- a/arch/arm/mach-mvebu/serdes/a38x/seq_exec.h
+++ b/arch/arm/mach-mvebu/serdes/a38x/seq_exec.h
@@ -6,6 +6,7 @@
 #ifndef _SEQ_EXEC_H
 #define _SEQ_EXEC_H
 
+#include <asm/types.h>
 #define NA			0xff
 #define DEFAULT_PARAM		0
 #define MV_BOARD_TCLK_ERROR	0xffffffff
diff --git a/arch/arm/mach-mvebu/serdes/a38x/sys_env_lib.c b/arch/arm/mach-mvebu/serdes/a38x/sys_env_lib.c
index 1be86bc4ae1..71a1e61f382 100644
--- a/arch/arm/mach-mvebu/serdes/a38x/sys_env_lib.c
+++ b/arch/arm/mach-mvebu/serdes/a38x/sys_env_lib.c
@@ -9,6 +9,7 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <asm/types.h>
 
 #include "seq_exec.h"
 #include "sys_env_lib.h"
diff --git a/arch/arm/mach-mvebu/serdes/axp/high_speed_env_lib.c b/arch/arm/mach-mvebu/serdes/axp/high_speed_env_lib.c
index 3ebda4ec684..85f4b90706e 100644
--- a/arch/arm/mach-mvebu/serdes/axp/high_speed_env_lib.c
+++ b/arch/arm/mach-mvebu/serdes/axp/high_speed_env_lib.c
@@ -4,11 +4,13 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <i2c.h>
 #include <spl.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 
diff --git a/arch/arm/mach-mvebu/serdes/axp/high_speed_env_spec.c b/arch/arm/mach-mvebu/serdes/axp/high_speed_env_spec.c
index 539d237623a..b4a69374b43 100644
--- a/arch/arm/mach-mvebu/serdes/axp/high_speed_env_spec.c
+++ b/arch/arm/mach-mvebu/serdes/axp/high_speed_env_spec.c
@@ -8,6 +8,7 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <asm/types.h>
 
 #include "high_speed_env_spec.h"
 
diff --git a/arch/arm/mach-mvebu/spl.c b/arch/arm/mach-mvebu/spl.c
index 16ebb7a59e5..b97401c26ac 100644
--- a/arch/arm/mach-mvebu/spl.c
+++ b/arch/arm/mach-mvebu/spl.c
@@ -15,6 +15,7 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <linux/types.h>
 
 static u32 get_boot_device(void)
 {
diff --git a/arch/arm/mach-nexell/clock.c b/arch/arm/mach-nexell/clock.c
index cd66248cd65..56e2540fdd8 100644
--- a/arch/arm/mach-nexell/clock.c
+++ b/arch/arm/mach-nexell/clock.c
@@ -6,7 +6,9 @@
 
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <vsprintf.h>
+#include <asm/types.h>
 #include <linux/err.h>
 #include <asm/io.h>
 #include <asm/arch/nexell.h>
diff --git a/arch/arm/mach-nexell/cmd_boot_linux.c b/arch/arm/mach-nexell/cmd_boot_linux.c
index f2dedfe1625..03815a9c09c 100644
--- a/arch/arm/mach-nexell/cmd_boot_linux.c
+++ b/arch/arm/mach-nexell/cmd_boot_linux.c
@@ -11,6 +11,7 @@
 #include <errno.h>
 #include <image.h>
 #include <fdt_support.h>
+#include <linux/types.h>
 
 #if !defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_CLI_FRAMEWORK)
 
diff --git a/arch/arm/mach-nexell/include/mach/display.h b/arch/arm/mach-nexell/include/mach/display.h
index b167e63a5a4..192341278b1 100644
--- a/arch/arm/mach-nexell/include/mach/display.h
+++ b/arch/arm/mach-nexell/include/mach/display.h
@@ -60,6 +60,7 @@
 #define	DPC_PADCLKSEL_VCLK2		1	/* VCLK2 */
 
 /* display sync info for DPC */
+#include <linux/types.h>
 struct dp_sync_info {
 	int interlace;
 	int h_active_len;
diff --git a/arch/arm/mach-nexell/include/mach/display_dev.h b/arch/arm/mach-nexell/include/mach/display_dev.h
index 77eb614768c..ed5b1a641ee 100644
--- a/arch/arm/mach-nexell/include/mach/display_dev.h
+++ b/arch/arm/mach-nexell/include/mach/display_dev.h
@@ -14,6 +14,7 @@
 #include <lcd.h>
 #endif
 
+#include <linux/types.h>
 struct nx_display_dev {
 #if defined CONFIG_VIDEO || defined CONFIG_DM_VIDEO
 	GraphicDevice graphic_device;
diff --git a/arch/arm/mach-nexell/include/mach/mipi_display.h b/arch/arm/mach-nexell/include/mach/mipi_display.h
index f3fdec64647..a1cfde27388 100644
--- a/arch/arm/mach-nexell/include/mach/mipi_display.h
+++ b/arch/arm/mach-nexell/include/mach/mipi_display.h
@@ -12,6 +12,7 @@
 #define MIPI_DISPLAY_H
 
 /* MIPI DSI Processor-to-Peripheral transaction types */
+#include <linux/types.h>
 enum {
 	MIPI_DSI_V_SYNC_START				= 0x01,
 	MIPI_DSI_V_SYNC_END				= 0x11,
diff --git a/arch/arm/mach-nexell/include/mach/reset.h b/arch/arm/mach-nexell/include/mach/reset.h
index e1301d4e53d..a533e42fa03 100644
--- a/arch/arm/mach-nexell/include/mach/reset.h
+++ b/arch/arm/mach-nexell/include/mach/reset.h
@@ -7,6 +7,7 @@
 #ifndef __NEXELL_RESET__
 #define __NEXELL_RESET__
 
+#include <asm/types.h>
 #define NUMBER_OF_RESET_MODULE_PIN      69
 
 enum rstcon {
diff --git a/arch/arm/mach-nexell/include/mach/sec_reg.h b/arch/arm/mach-nexell/include/mach/sec_reg.h
index e3ae5ac1bb4..f8396c460fd 100644
--- a/arch/arm/mach-nexell/include/mach/sec_reg.h
+++ b/arch/arm/mach-nexell/include/mach/sec_reg.h
@@ -4,6 +4,7 @@
  * Youngbok, Park <park@nexell.co.kr>
  */
 
+#include <compiler.h>
 #define NEXELL_L2C_SEC_ID	0
 #define NEXELL_MALI_SEC_ID	2
 #define NEXELL_MIPI_SEC_ID	4
diff --git a/arch/arm/mach-nexell/include/mach/tieoff.h b/arch/arm/mach-nexell/include/mach/tieoff.h
index 70e9652b6dc..598ffdd1801 100644
--- a/arch/arm/mach-nexell/include/mach/tieoff.h
+++ b/arch/arm/mach-nexell/include/mach/tieoff.h
@@ -7,6 +7,7 @@
 #ifndef _NEXELL_TIEOFF_H
 #define _NEXELL_TIEOFF_H
 
+#include <asm/types.h>
 void nx_tieoff_set(u32 tieoff_index, u32 tieoff_value);
 u32 nx_tieoff_get(u32 tieoff_index);
 
diff --git a/arch/arm/mach-nexell/nx_sec_reg.c b/arch/arm/mach-nexell/nx_sec_reg.c
index 3d3dd9fd8b6..09d2eed48ae 100644
--- a/arch/arm/mach-nexell/nx_sec_reg.c
+++ b/arch/arm/mach-nexell/nx_sec_reg.c
@@ -4,6 +4,7 @@
  * Youngbok, Park <park@nexell.co.kr>
  */
 
+#include <compiler.h>
 #include <linux/types.h>
 #include <asm/io.h>
 #include <asm/arch/nexell.h>
diff --git a/arch/arm/mach-nexell/reset.c b/arch/arm/mach-nexell/reset.c
index 1f732a3d373..97155d8ffd0 100644
--- a/arch/arm/mach-nexell/reset.c
+++ b/arch/arm/mach-nexell/reset.c
@@ -12,6 +12,7 @@
 #include <asm/io.h>
 #include <asm/arch/nexell.h>
 #include <asm/arch/reset.h>
+#include <asm/types.h>
 
 struct	nx_rstcon_registerset {
 	u32	regrst[(NUMBER_OF_RESET_MODULE_PIN + 31) >> 5];
diff --git a/arch/arm/mach-nexell/tieoff.c b/arch/arm/mach-nexell/tieoff.c
index 5a4744c296a..2c2db9f6ce6 100644
--- a/arch/arm/mach-nexell/tieoff.c
+++ b/arch/arm/mach-nexell/tieoff.c
@@ -5,12 +5,14 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <asm/arch/nexell.h>
 #include <asm/arch/clk.h>
 #include <asm/arch/reset.h>
 #include <asm/arch/nx_gpio.h>
 #include <asm/arch/tieoff.h>
 #include <asm/arch/sec_reg.h>
+#include <asm/types.h>
 
 #define	NX_PIN_FN_SIZE	4
 #define TIEOFF_REG_NUM 33
diff --git a/arch/arm/mach-nexell/timer.c b/arch/arm/mach-nexell/timer.c
index 2f98bd7fa4a..1119ce74645 100644
--- a/arch/arm/mach-nexell/timer.c
+++ b/arch/arm/mach-nexell/timer.c
@@ -5,8 +5,10 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <log.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include <asm/io.h>
 #include <asm/arch/nexell.h>
diff --git a/arch/arm/mach-omap2/abb.c b/arch/arm/mach-omap2/abb.c
index 24775bdc41c..c3487f83b75 100644
--- a/arch/arm/mach-omap2/abb.c
+++ b/arch/arm/mach-omap2/abb.c
@@ -9,11 +9,13 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <stdio.h>
 #include <asm/omap_common.h>
 #include <asm/arch/clock.h>
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/kernel.h>
 
diff --git a/arch/arm/mach-omap2/am33xx/board.c b/arch/arm/mach-omap2/am33xx/board.c
index 0b0372e22ca..ce399663191 100644
--- a/arch/arm/mach-omap2/am33xx/board.c
+++ b/arch/arm/mach-omap2/am33xx/board.c
@@ -8,6 +8,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <debug_uart.h>
 #include <errno.h>
@@ -38,6 +39,7 @@
 #include <linux/errno.h>
 #include <linux/compiler.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
 #include <linux/usb/musb.h>
diff --git a/arch/arm/mach-omap2/am33xx/clk_synthesizer.c b/arch/arm/mach-omap2/am33xx/clk_synthesizer.c
index b2493d8179b..ac97bfa69c0 100644
--- a/arch/arm/mach-omap2/am33xx/clk_synthesizer.c
+++ b/arch/arm/mach-omap2/am33xx/clk_synthesizer.c
@@ -12,6 +12,7 @@
 #include <stdio.h>
 #include <asm/arch/clk_synthesizer.h>
 #include <i2c.h>
+#include <asm/types.h>
 
 /**
  * clk_synthesizer_reg_read - Read register from synthesizer.
diff --git a/arch/arm/mach-omap2/am33xx/clock.c b/arch/arm/mach-omap2/am33xx/clock.c
index 4339817b556..d665da8856f 100644
--- a/arch/arm/mach-omap2/am33xx/clock.c
+++ b/arch/arm/mach-omap2/am33xx/clock.c
@@ -8,6 +8,7 @@
  * Copyright (C) 2013, Texas Instruments, Incorporated - http://www.ti.com/
  */
 #include <common.h>
+#include <compiler.h>
 #include <hang.h>
 #include <init.h>
 #include <log.h>
@@ -17,6 +18,7 @@
 #include <asm/arch/hardware.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/io.h>
+#include <asm/types.h>
 
 static void setup_post_dividers(const struct dpll_regs *dpll_regs,
 			 const struct dpll_params *params)
diff --git a/arch/arm/mach-omap2/am33xx/clock_am33xx.c b/arch/arm/mach-omap2/am33xx/clock_am33xx.c
index b5136f8f46c..5a483a9e3d0 100644
--- a/arch/arm/mach-omap2/am33xx/clock_am33xx.c
+++ b/arch/arm/mach-omap2/am33xx/clock_am33xx.c
@@ -8,12 +8,14 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <stdio.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/hardware.h>
 #include <asm/io.h>
+#include <asm/types.h>
 
 #define OSC	(V_OSCK/1000000)
 
diff --git a/arch/arm/mach-omap2/am33xx/clock_am43xx.c b/arch/arm/mach-omap2/am33xx/clock_am43xx.c
index b98bb9989c0..ef4b79f272d 100644
--- a/arch/arm/mach-omap2/am33xx/clock_am43xx.c
+++ b/arch/arm/mach-omap2/am33xx/clock_am43xx.c
@@ -14,6 +14,7 @@
 #include <asm/arch/hardware.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/io.h>
+#include <asm/types.h>
 
 struct cm_perpll *const cmper = (struct cm_perpll *)CM_PER;
 struct cm_wkuppll *const cmwkup = (struct cm_wkuppll *)CM_WKUP;
diff --git a/arch/arm/mach-omap2/am33xx/clock_ti814x.c b/arch/arm/mach-omap2/am33xx/clock_ti814x.c
index 27abaff48fc..8e2c224bf7e 100644
--- a/arch/arm/mach-omap2/am33xx/clock_ti814x.c
+++ b/arch/arm/mach-omap2/am33xx/clock_ti814x.c
@@ -12,6 +12,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/hardware.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 /* PRCM */
diff --git a/arch/arm/mach-omap2/am33xx/clock_ti816x.c b/arch/arm/mach-omap2/am33xx/clock_ti816x.c
index ec4cc753812..c551a5d7cc6 100644
--- a/arch/arm/mach-omap2/am33xx/clock_ti816x.c
+++ b/arch/arm/mach-omap2/am33xx/clock_ti816x.c
@@ -27,6 +27,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/hardware.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 
 #include <asm/emif.h>
diff --git a/arch/arm/mach-omap2/am33xx/ddr.c b/arch/arm/mach-omap2/am33xx/ddr.c
index 4caa2d62ab2..cb30d65bca7 100644
--- a/arch/arm/mach-omap2/am33xx/ddr.c
+++ b/arch/arm/mach-omap2/am33xx/ddr.c
@@ -13,6 +13,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/io.h>
 #include <asm/emif.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 /**
diff --git a/arch/arm/mach-omap2/am33xx/emif4.c b/arch/arm/mach-omap2/am33xx/emif4.c
index a5fdb0433dc..1d5fb534088 100644
--- a/arch/arm/mach-omap2/am33xx/emif4.c
+++ b/arch/arm/mach-omap2/am33xx/emif4.c
@@ -8,6 +8,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/ddr_defs.h>
 #include <asm/arch/hardware.h>
diff --git a/arch/arm/mach-omap2/am33xx/mux.c b/arch/arm/mach-omap2/am33xx/mux.c
index aad3ec85569..06534cb1db4 100644
--- a/arch/arm/mach-omap2/am33xx/mux.c
+++ b/arch/arm/mach-omap2/am33xx/mux.c
@@ -14,6 +14,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <asm/arch/mux.h>
 #include <asm/arch/hardware.h>
 #include <asm/io.h>
diff --git a/arch/arm/mach-omap2/am33xx/sys_info.c b/arch/arm/mach-omap2/am33xx/sys_info.c
index 86078f856ed..ba81baa914c 100644
--- a/arch/arm/mach-omap2/am33xx/sys_info.c
+++ b/arch/arm/mach-omap2/am33xx/sys_info.c
@@ -19,6 +19,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/clock.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include <power/tps65910.h>
 #include <linux/compiler.h>
 
diff --git a/arch/arm/mach-omap2/boot-common.c b/arch/arm/mach-omap2/boot-common.c
index b8fba785a96..8049f786c3f 100644
--- a/arch/arm/mach-omap2/boot-common.c
+++ b/arch/arm/mach-omap2/boot-common.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <ahci.h>
+#include <compiler.h>
 #include <log.h>
 #include <spl.h>
 #include <asm/global_data.h>
@@ -19,6 +20,7 @@
 #include <watchdog.h>
 #include <scsi.h>
 #include <i2c.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-omap2/clocks-common.c b/arch/arm/mach-omap2/clocks-common.c
index a151358f6e0..bf31d893c57 100644
--- a/arch/arm/mach-omap2/clocks-common.c
+++ b/arch/arm/mach-omap2/clocks-common.c
@@ -13,6 +13,7 @@
  *	Rajendra Nayak <rnayak@ti.com>
  */
 #include <common.h>
+#include <compiler.h>
 #include <hang.h>
 #include <i2c.h>
 #include <init.h>
@@ -22,6 +23,7 @@
 #include <asm/gpio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/types.h>
 #include <asm/utils.h>
 #include <asm/omap_gpio.h>
 #include <asm/emif.h>
diff --git a/arch/arm/mach-omap2/emif-common.c b/arch/arm/mach-omap2/emif-common.c
index 15c13463f90..bfd2c158486 100644
--- a/arch/arm/mach-omap2/emif-common.c
+++ b/arch/arm/mach-omap2/emif-common.c
@@ -9,6 +9,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <hang.h>
 #include <init.h>
 #include <log.h>
@@ -20,6 +21,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/omap_common.h>
 #include <asm/omap_sec_common.h>
+#include <asm/types.h>
 #include <asm/utils.h>
 #include <linux/compiler.h>
 #include <asm/ti-common/ti-edma3.h>
diff --git a/arch/arm/mach-omap2/fdt-common.c b/arch/arm/mach-omap2/fdt-common.c
index e1d3a72ec6d..4efccd0d7fc 100644
--- a/arch/arm/mach-omap2/fdt-common.c
+++ b/arch/arm/mach-omap2/fdt-common.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <log.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
diff --git a/arch/arm/mach-omap2/hwinit-common.c b/arch/arm/mach-omap2/hwinit-common.c
index c7e912c2da0..d3fb5865022 100644
--- a/arch/arm/mach-omap2/hwinit-common.c
+++ b/arch/arm/mach-omap2/hwinit-common.c
@@ -11,6 +11,7 @@
  *	Steve Sakoman	<steve@sakoman.com>
  */
 #include <common.h>
+#include <compiler.h>
 #include <debug_uart.h>
 #include <fdtdec.h>
 #include <init.h>
@@ -25,6 +26,7 @@
 #include <linux/compiler.h>
 #include <asm/system.h>
 #include <dm/root.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-omap2/mem-common.c b/arch/arm/mach-omap2/mem-common.c
index 50d5f3e9eba..2a15692f681 100644
--- a/arch/arm/mach-omap2/mem-common.c
+++ b/arch/arm/mach-omap2/mem-common.c
@@ -18,6 +18,7 @@
 #include <asm/arch/mem.h>
 #include <asm/arch/sys_proto.h>
 #include <command.h>
+#include <asm/types.h>
 #include <linux/mtd/omap_gpmc.h>
 #include <jffs2/load_kernel.h>
 
diff --git a/arch/arm/mach-omap2/omap-cache.c b/arch/arm/mach-omap2/omap-cache.c
index 5034404801a..a07e138b110 100644
--- a/arch/arm/mach-omap2/omap-cache.c
+++ b/arch/arm/mach-omap2/omap-cache.c
@@ -16,6 +16,7 @@
 #include <log.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-omap2/omap3/am35x_musb.c b/arch/arm/mach-omap2/omap3/am35x_musb.c
index 23b55d8d705..902caa1b6b9 100644
--- a/arch/arm/mach-omap2/omap3/am35x_musb.c
+++ b/arch/arm/mach-omap2/omap3/am35x_musb.c
@@ -15,6 +15,7 @@
 #include <time.h>
 #include <asm/io.h>
 #include <asm/arch/am35x_def.h>
+#include <asm/types.h>
 
 void am35x_musb_reset(struct udevice *dev)
 {
diff --git a/arch/arm/mach-omap2/omap3/board.c b/arch/arm/mach-omap2/omap3/board.c
index 272a4c9ed95..7ab738f9cb2 100644
--- a/arch/arm/mach-omap2/omap3/board.c
+++ b/arch/arm/mach-omap2/omap3/board.c
@@ -17,6 +17,7 @@
  */
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <dm.h>
 #include <init.h>
 #include <spl.h>
@@ -31,6 +32,7 @@
 #include <asm/u-boot.h>
 #include <linux/compiler.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /* Declarations */
 extern omap3_sysinfo sysinfo;
diff --git a/arch/arm/mach-omap2/omap3/boot.c b/arch/arm/mach-omap2/omap3/boot.c
index ea26115b711..5544b87894a 100644
--- a/arch/arm/mach-omap2/omap3/boot.c
+++ b/arch/arm/mach-omap2/omap3/boot.c
@@ -9,6 +9,7 @@
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
 #include <spl.h>
+#include <asm/types.h>
 
 static u32 boot_devices[] = {
 	BOOT_DEVICE_ONENAND,
diff --git a/arch/arm/mach-omap2/omap3/clock.c b/arch/arm/mach-omap2/omap3/clock.c
index 71f73492c6c..2cb751269cc 100644
--- a/arch/arm/mach-omap2/omap3/clock.c
+++ b/arch/arm/mach-omap2/omap3/clock.c
@@ -18,6 +18,7 @@
 #include <asm/arch/mem.h>
 #include <asm/arch/sys_proto.h>
 #include <command.h>
+#include <asm/types.h>
 
 /******************************************************************************
  * get_sys_clk_speed() - determine reference oscillator speed
diff --git a/arch/arm/mach-omap2/omap3/emac.c b/arch/arm/mach-omap2/omap3/emac.c
index 4c102dadf42..d96acfed2e5 100644
--- a/arch/arm/mach-omap2/omap3/emac.c
+++ b/arch/arm/mach-omap2/omap3/emac.c
@@ -10,6 +10,7 @@
 #include <net.h>
 #include <asm/io.h>
 #include <asm/arch/am35x_def.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 
 /*
diff --git a/arch/arm/mach-omap2/omap3/emif4.c b/arch/arm/mach-omap2/omap3/emif4.c
index dd99aeb63bd..6c18a77c100 100644
--- a/arch/arm/mach-omap2/omap3/emif4.c
+++ b/arch/arm/mach-omap2/omap3/emif4.c
@@ -16,6 +16,7 @@
 #include <asm/arch/mem.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/emif4.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-omap2/omap3/sdrc.c b/arch/arm/mach-omap2/omap3/sdrc.c
index 78456f03f98..f24a5525aa5 100644
--- a/arch/arm/mach-omap2/omap3/sdrc.c
+++ b/arch/arm/mach-omap2/omap3/sdrc.c
@@ -27,6 +27,7 @@
 #include <asm/io.h>
 #include <asm/arch/mem.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-omap2/omap3/sys_info.c b/arch/arm/mach-omap2/omap3/sys_info.c
index 5ed2c6bdeee..526d3d60dba 100644
--- a/arch/arm/mach-omap2/omap3/sys_info.c
+++ b/arch/arm/mach-omap2/omap3/sys_info.c
@@ -12,12 +12,14 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/mem.h>	/* get mem tables */
 #include <asm/arch/sys_proto.h>
 #include <asm/bootm.h>
 #include <asm/omap_common.h>
+#include <asm/types.h>
 
 #include <i2c.h>
 #include <linux/compiler.h>
diff --git a/arch/arm/mach-omap2/omap4/boot.c b/arch/arm/mach-omap2/omap4/boot.c
index 90b5380ae39..95f57366b52 100644
--- a/arch/arm/mach-omap2/omap4/boot.c
+++ b/arch/arm/mach-omap2/omap4/boot.c
@@ -10,6 +10,7 @@
 #include <asm/omap_common.h>
 #include <asm/arch/sys_proto.h>
 #include <spl.h>
+#include <asm/types.h>
 
 static u32 boot_devices[] = {
 	BOOT_DEVICE_MMC2,
diff --git a/arch/arm/mach-omap2/omap4/emif.c b/arch/arm/mach-omap2/omap4/emif.c
index 35a51645be7..6fe3fa4e40a 100644
--- a/arch/arm/mach-omap2/omap4/emif.c
+++ b/arch/arm/mach-omap2/omap4/emif.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <asm/emif.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/types.h>
 #include <asm/utils.h>
 
 #ifndef CONFIG_SYS_EMIF_PRECALCULATED_TIMING_REGS
diff --git a/arch/arm/mach-omap2/omap4/hw_data.c b/arch/arm/mach-omap2/omap4/hw_data.c
index 5f15e086c64..91608d9fed9 100644
--- a/arch/arm/mach-omap2/omap4/hw_data.c
+++ b/arch/arm/mach-omap2/omap4/hw_data.c
@@ -16,6 +16,7 @@
 #include <asm/arch/clock.h>
 #include <asm/omap_gpio.h>
 #include <asm/io.h>
+#include <asm/types.h>
 
 struct prcm_regs const **prcm =
 			(struct prcm_regs const **) OMAP_SRAM_SCRATCH_PRCM_PTR;
diff --git a/arch/arm/mach-omap2/omap4/hwinit.c b/arch/arm/mach-omap2/omap4/hwinit.c
index 27dfa9142dc..efb4d6a8048 100644
--- a/arch/arm/mach-omap2/omap4/hwinit.c
+++ b/arch/arm/mach-omap2/omap4/hwinit.c
@@ -19,6 +19,7 @@
 #include <asm/emif.h>
 #include <asm/arch/gpio.h>
 #include <asm/omap_common.h>
+#include <linux/types.h>
 
 u32 *const omap_si_rev = (u32 *)OMAP_SRAM_SCRATCH_OMAP_REV;
 
diff --git a/arch/arm/mach-omap2/omap4/sdram_elpida.c b/arch/arm/mach-omap2/omap4/sdram_elpida.c
index 2a18cf0215d..a775494e407 100644
--- a/arch/arm/mach-omap2/omap4/sdram_elpida.c
+++ b/arch/arm/mach-omap2/omap4/sdram_elpida.c
@@ -10,8 +10,10 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <asm/emif.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/types.h>
 
 /*
  * This file provides details of the LPDDR2 SDRAM parts used on OMAP4430
diff --git a/arch/arm/mach-omap2/omap5/abb.c b/arch/arm/mach-omap2/omap5/abb.c
index 2f9f8e65d03..730ab832db5 100644
--- a/arch/arm/mach-omap2/omap5/abb.c
+++ b/arch/arm/mach-omap2/omap5/abb.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <asm/omap_common.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 
 /*
diff --git a/arch/arm/mach-omap2/omap5/boot.c b/arch/arm/mach-omap2/omap5/boot.c
index 15d6836c6ea..bbc9a90fe69 100644
--- a/arch/arm/mach-omap2/omap5/boot.c
+++ b/arch/arm/mach-omap2/omap5/boot.c
@@ -9,6 +9,7 @@
 #include <asm/io.h>
 #include <asm/omap_common.h>
 #include <spl.h>
+#include <asm/types.h>
 
 static u32 boot_devices[] = {
 #if defined(CONFIG_DRA7XX)
diff --git a/arch/arm/mach-omap2/omap5/dra7xx_iodelay.c b/arch/arm/mach-omap2/omap5/dra7xx_iodelay.c
index c5d51aabfc9..509f6617c59 100644
--- a/arch/arm/mach-omap2/omap5/dra7xx_iodelay.c
+++ b/arch/arm/mach-omap2/omap5/dra7xx_iodelay.c
@@ -10,6 +10,7 @@
 #include <hang.h>
 #include <log.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <asm/utils.h>
 #include <asm/arch/dra7xx_iodelay.h>
 #include <asm/arch/omap.h>
diff --git a/arch/arm/mach-omap2/omap5/emif.c b/arch/arm/mach-omap2/omap5/emif.c
index 2de36b6feca..5348921c060 100644
--- a/arch/arm/mach-omap2/omap5/emif.c
+++ b/arch/arm/mach-omap2/omap5/emif.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <asm/emif.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/types.h>
 #include <asm/utils.h>
 
 #ifndef CONFIG_SYS_EMIF_PRECALCULATED_TIMING_REGS
diff --git a/arch/arm/mach-omap2/omap5/fdt.c b/arch/arm/mach-omap2/omap5/fdt.c
index af9717801e4..c1321f6dc1f 100644
--- a/arch/arm/mach-omap2/omap5/fdt.c
+++ b/arch/arm/mach-omap2/omap5/fdt.c
@@ -12,6 +12,7 @@
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <malloc.h>
+#include <linux/types.h>
 
 #include <asm/omap_common.h>
 #include <asm/arch-omap5/sys_proto.h>
diff --git a/arch/arm/mach-omap2/omap5/hw_data.c b/arch/arm/mach-omap2/omap5/hw_data.c
index d9c447c0e8d..171155ddef6 100644
--- a/arch/arm/mach-omap2/omap5/hw_data.c
+++ b/arch/arm/mach-omap2/omap5/hw_data.c
@@ -9,6 +9,7 @@
  * Sricharan R <r.sricharan@ti.com>
  */
 #include <common.h>
+#include <compiler.h>
 #include <palmas.h>
 #include <stdio.h>
 #include <asm/arch/omap.h>
@@ -18,6 +19,7 @@
 #include <asm/omap_gpio.h>
 #include <asm/io.h>
 #include <asm/emif.h>
+#include <asm/types.h>
 
 struct prcm_regs const **prcm =
 			(struct prcm_regs const **) OMAP_SRAM_SCRATCH_PRCM_PTR;
diff --git a/arch/arm/mach-omap2/omap5/hwinit.c b/arch/arm/mach-omap2/omap5/hwinit.c
index 47ac8656bfe..9773bc29e7d 100644
--- a/arch/arm/mach-omap2/omap5/hwinit.c
+++ b/arch/arm/mach-omap2/omap5/hwinit.c
@@ -12,6 +12,7 @@
  *	Sricharan	<r.sricharan@ti.com>
  */
 #include <common.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <palmas.h>
 #include <asm/armv7.h>
@@ -24,6 +25,7 @@
 #include <asm/arch/gpio.h>
 #include <asm/emif.h>
 #include <asm/omap_common.h>
+#include <linux/types.h>
 
 u32 *const omap_si_rev = (u32 *)OMAP_SRAM_SCRATCH_OMAP_REV;
 
diff --git a/arch/arm/mach-omap2/omap5/prcm-regs.c b/arch/arm/mach-omap2/omap5/prcm-regs.c
index b5baebc0692..3e8086dddb1 100644
--- a/arch/arm/mach-omap2/omap5/prcm-regs.c
+++ b/arch/arm/mach-omap2/omap5/prcm-regs.c
@@ -11,6 +11,7 @@
 
 #include <asm/omap_common.h>
 #include <asm/io.h>
+#include <asm/types.h>
 
 struct prcm_regs const omap5_es1_prcm = {
 	/* cm1.ckgen */
diff --git a/arch/arm/mach-omap2/omap5/sdram.c b/arch/arm/mach-omap2/omap5/sdram.c
index f6c8eb9f1bd..4306ea3a63f 100644
--- a/arch/arm/mach-omap2/omap5/sdram.c
+++ b/arch/arm/mach-omap2/omap5/sdram.c
@@ -11,9 +11,11 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <stdio.h>
 #include <asm/emif.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 
 /*
diff --git a/arch/arm/mach-omap2/pipe3-phy.c b/arch/arm/mach-omap2/pipe3-phy.c
index fb64961db4b..f6e50f92e9f 100644
--- a/arch/arm/mach-omap2/pipe3-phy.c
+++ b/arch/arm/mach-omap2/pipe3-phy.c
@@ -7,11 +7,13 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <sata.h>
 #include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/arch/arm/mach-omap2/pipe3-phy.h b/arch/arm/mach-omap2/pipe3-phy.h
index 182bdcd4c81..3999d7b60f5 100644
--- a/arch/arm/mach-omap2/pipe3-phy.h
+++ b/arch/arm/mach-omap2/pipe3-phy.h
@@ -9,6 +9,8 @@
 #ifndef __OMAP_PIPE3_PHY_H
 #define __OMAP_PIPE3_PHY_H
 
+#include <compiler.h>
+#include <asm/types.h>
 struct pipe3_dpll_params {
 	u16     m;
 	u8      n;
diff --git a/arch/arm/mach-omap2/reset.c b/arch/arm/mach-omap2/reset.c
index 2bbd5fcb9b8..194e01163aa 100644
--- a/arch/arm/mach-omap2/reset.c
+++ b/arch/arm/mach-omap2/reset.c
@@ -8,10 +8,12 @@
  *
  * Sricharan R <r.sricharan@ti.com>
  */
+#include <compiler.h>
 #include <config.h>
 #include <cpu_func.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
+#include <asm/types.h>
 #include <linux/compiler.h>
 
 void __weak reset_cpu(unsigned long ignored)
diff --git a/arch/arm/mach-omap2/sata.c b/arch/arm/mach-omap2/sata.c
index 4672dc534c5..636cfb42ace 100644
--- a/arch/arm/mach-omap2/sata.c
+++ b/arch/arm/mach-omap2/sata.c
@@ -8,11 +8,13 @@
 
 #include <common.h>
 #include <ahci.h>
+#include <compiler.h>
 #include <scsi.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/sata.h>
 #include <sata.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include "pipe3-phy.h"
 
 static struct pipe3_dpll_map dpll_map_sata[] = {
diff --git a/arch/arm/mach-omap2/sec-common.c b/arch/arm/mach-omap2/sec-common.c
index 8dcaa1ac6c9..d0cf68e30be 100644
--- a/arch/arm/mach-omap2/sec-common.c
+++ b/arch/arm/mach-omap2/sec-common.c
@@ -24,6 +24,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <asm/arch/sys_proto.h>
 #include <asm/cache.h>
diff --git a/arch/arm/mach-omap2/sysinfo-common.c b/arch/arm/mach-omap2/sysinfo-common.c
index 49bc3a634fb..6bce3a1c7ce 100644
--- a/arch/arm/mach-omap2/sysinfo-common.c
+++ b/arch/arm/mach-omap2/sysinfo-common.c
@@ -9,6 +9,7 @@
 #include <asm/arch/omap.h>
 #include <asm/io.h>
 #include <asm/omap_common.h>
+#include <asm/types.h>
 
 /**
  * Tell if device is GP/HS/EMU/TST.
diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c
index 82b10f6b248..c5565a741eb 100644
--- a/arch/arm/mach-omap2/timer.c
+++ b/arch/arm/mach-omap2/timer.c
@@ -23,6 +23,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/clock.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-omap2/utils.c b/arch/arm/mach-omap2/utils.c
index 4ee409521ef..be082cf2c97 100644
--- a/arch/arm/mach-omap2/utils.c
+++ b/arch/arm/mach-omap2/utils.c
@@ -4,6 +4,7 @@
  * Aneesh V <aneesh@ti.com>
  */
 #include <common.h>
+#include <compiler.h>
 #include <env.h>
 #include <part.h>
 #include <stdio.h>
@@ -11,6 +12,7 @@
 #include <asm/setup.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/omap_common.h>
+#include <asm/types.h>
 #include <linux/printk.h>
 
 static void do_cancel_out(u32 *num, u32 *den, u32 factor)
diff --git a/arch/arm/mach-omap2/vc.c b/arch/arm/mach-omap2/vc.c
index 5888bc86752..b72c7823716 100644
--- a/arch/arm/mach-omap2/vc.c
+++ b/arch/arm/mach-omap2/vc.c
@@ -19,6 +19,7 @@
 #include <asm/omap_common.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/clock.h>
+#include <asm/types.h>
 
 /* Register defines and masks for VC IP Block */
 /* PRM_VC_CFG_I2C_MODE */
diff --git a/arch/arm/mach-orion5x/cpu.c b/arch/arm/mach-orion5x/cpu.c
index 81f3bd37ea3..f050a30d983 100644
--- a/arch/arm/mach-orion5x/cpu.c
+++ b/arch/arm/mach-orion5x/cpu.c
@@ -17,6 +17,7 @@
 #include <vsprintf.h>
 #include <asm/cache.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <u-boot/md5.h>
 #include <asm/arch/cpu.h>
diff --git a/arch/arm/mach-orion5x/dram.c b/arch/arm/mach-orion5x/dram.c
index 5e6f51de5c4..7d0deed662b 100644
--- a/arch/arm/mach-orion5x/dram.c
+++ b/arch/arm/mach-orion5x/dram.c
@@ -13,6 +13,7 @@
 #include <init.h>
 #include <asm/arch/cpu.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-orion5x/include/mach/cpu.h b/arch/arm/mach-orion5x/include/mach/cpu.h
index c3ff89669e4..6118f42313f 100644
--- a/arch/arm/mach-orion5x/include/mach/cpu.h
+++ b/arch/arm/mach-orion5x/include/mach/cpu.h
@@ -21,6 +21,7 @@
 #define ORION5XGBE_PORT_SERIAL_CONTROL1_REG(_x)	\
 		((_x ? ORION5X_EGIGA0_BASE : ORION5X_EGIGA1_BASE) + 0x44c)
 
+#include <asm/types.h>
 enum memory_bank {
 	BANK0,
 	BANK1,
diff --git a/arch/arm/mach-orion5x/timer.c b/arch/arm/mach-orion5x/timer.c
index 0adf3dcc648..3f9f0f9b625 100644
--- a/arch/arm/mach-orion5x/timer.c
+++ b/arch/arm/mach-orion5x/timer.c
@@ -13,6 +13,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 #define UBOOT_CNTR	0	/* counter to use for uboot timer */
 
diff --git a/arch/arm/mach-owl/soc.c b/arch/arm/mach-owl/soc.c
index 34b05223c0c..838cc2ff573 100644
--- a/arch/arm/mach-owl/soc.c
+++ b/arch/arm/mach-owl/soc.c
@@ -17,6 +17,7 @@
 #include <asm/io.h>
 #include <asm/mach-types.h>
 #include <asm/psci.h>
+#include <linux/types.h>
 
 #define DMM_INTERLEAVE_PER_CH_CFG	0xe0290028
 
diff --git a/arch/arm/mach-rmobile/cpu_info-r8a7740.c b/arch/arm/mach-rmobile/cpu_info-r8a7740.c
index dcbe25f37ab..16a5a8ae29a 100644
--- a/arch/arm/mach-rmobile/cpu_info-r8a7740.c
+++ b/arch/arm/mach-rmobile/cpu_info-r8a7740.c
@@ -5,6 +5,7 @@
  */
 #include <common.h>
 #include <asm/io.h>
+#include <asm/types.h>
 
 u32 rmobile_get_cpu_type(void)
 {
diff --git a/arch/arm/mach-rmobile/cpu_info-rcar.c b/arch/arm/mach-rmobile/cpu_info-rcar.c
index ce9312f9d82..724d3c67d59 100644
--- a/arch/arm/mach-rmobile/cpu_info-rcar.c
+++ b/arch/arm/mach-rmobile/cpu_info-rcar.c
@@ -6,6 +6,7 @@
  */
 #include <common.h>
 #include <asm/io.h>
+#include <asm/types.h>
 
 #define PRR_MASK		0x7fff
 #define R8A7796_REV_1_0		0x5200
diff --git a/arch/arm/mach-rmobile/cpu_info-sh73a0.c b/arch/arm/mach-rmobile/cpu_info-sh73a0.c
index 0c7ee8acf5a..7f01201629b 100644
--- a/arch/arm/mach-rmobile/cpu_info-sh73a0.c
+++ b/arch/arm/mach-rmobile/cpu_info-sh73a0.c
@@ -5,6 +5,7 @@
  */
 #include <common.h>
 #include <asm/io.h>
+#include <asm/types.h>
 
 u32 rmobile_get_cpu_type(void)
 {
diff --git a/arch/arm/mach-rmobile/cpu_info.c b/arch/arm/mach-rmobile/cpu_info.c
index 1380dc61eb2..44e39e248b2 100644
--- a/arch/arm/mach-rmobile/cpu_info.c
+++ b/arch/arm/mach-rmobile/cpu_info.c
@@ -10,6 +10,7 @@
 #include <init.h>
 #include <asm/io.h>
 #include <env.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/ctype.h>
 #include <linux/kernel.h>
diff --git a/arch/arm/mach-rmobile/include/mach/ehci-rmobile.h b/arch/arm/mach-rmobile/include/mach/ehci-rmobile.h
index ca8c5f37063..641872cbbcd 100644
--- a/arch/arm/mach-rmobile/include/mach/ehci-rmobile.h
+++ b/arch/arm/mach-rmobile/include/mach/ehci-rmobile.h
@@ -8,6 +8,7 @@
 #define __EHCI_RMOBILE_H__
 
 /* Register offset */
+#include <asm/types.h>
 #define OHCI_OFFSET	0x00
 #define OHCI_SIZE	0x1000
 #define EHCI_OFFSET	0x1000
diff --git a/arch/arm/mach-rmobile/include/mach/rcar-mstp.h b/arch/arm/mach-rmobile/include/mach/rcar-mstp.h
index f2f8ce95992..f408b1e76e3 100644
--- a/arch/arm/mach-rmobile/include/mach/rcar-mstp.h
+++ b/arch/arm/mach-rmobile/include/mach/rcar-mstp.h
@@ -9,6 +9,7 @@
 #ifndef __ASM_ARCH_RCAR_MSTP_H
 #define __ASM_ARCH_RCAR_MSTP_H
 
+#include <asm/types.h>
 #define mstp_setbits(type, addr, saddr, set) \
 		out_##type((saddr), in_##type(addr) | (set))
 #define mstp_clrbits(type, addr, saddr, clear) \
diff --git a/arch/arm/mach-rmobile/include/mach/rmobile.h b/arch/arm/mach-rmobile/include/mach/rmobile.h
index a50249dc963..e41004eb437 100644
--- a/arch/arm/mach-rmobile/include/mach/rmobile.h
+++ b/arch/arm/mach-rmobile/include/mach/rmobile.h
@@ -41,6 +41,7 @@
 #define RMOBILE_CPU_TYPE_R8A77995	0x58
 
 #ifndef __ASSEMBLY__
+#include <asm/types.h>
 u32 rmobile_get_cpu_type(void);
 u32 rmobile_get_cpu_rev_integer(void);
 u32 rmobile_get_cpu_rev_fraction(void);
diff --git a/arch/arm/mach-rmobile/timer.c b/arch/arm/mach-rmobile/timer.c
index ba06535e4c2..d911dbea51f 100644
--- a/arch/arm/mach-rmobile/timer.c
+++ b/arch/arm/mach-rmobile/timer.c
@@ -12,6 +12,7 @@
 #include <asm/arch-armv7/globaltimer.h>
 #include <asm/arch/rmobile.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 static struct globaltimer *global_timer = \
 		(struct globaltimer *)GLOBAL_TIMER_BASE_ADDR;
diff --git a/arch/arm/mach-rockchip/board.c b/arch/arm/mach-rockchip/board.c
index e6e6fc5fbe4..4d4978f6bb6 100644
--- a/arch/arm/mach-rockchip/board.c
+++ b/arch/arm/mach-rockchip/board.c
@@ -4,6 +4,7 @@
  */
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <dm.h>
 #include <init.h>
@@ -19,6 +20,7 @@
 #include <asm/arch-rockchip/clock.h>
 #include <asm/arch-rockchip/periph.h>
 #include <asm/arch-rockchip/misc.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <linux/string.h>
diff --git a/arch/arm/mach-rockchip/boot_mode.c b/arch/arm/mach-rockchip/boot_mode.c
index 69e64fb39c3..3c52b94e0d0 100644
--- a/arch/arm/mach-rockchip/boot_mode.c
+++ b/arch/arm/mach-rockchip/boot_mode.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <adc.h>
 #include <command.h>
+#include <compiler.h>
 #include <env.h>
 #include <log.h>
 #include <stdbool.h>
diff --git a/arch/arm/mach-rockchip/bootrom.c b/arch/arm/mach-rockchip/bootrom.c
index 24ba39537cd..3a557e0a101 100644
--- a/arch/arm/mach-rockchip/bootrom.c
+++ b/arch/arm/mach-rockchip/bootrom.c
@@ -13,6 +13,7 @@
 #include <asm/io.h>
 #include <asm/setjmp.h>
 #include <asm/system.h>
+#include <asm/types.h>
 
 /*
  * Force the jmp_buf to the data-section, as .bss will not be valid
diff --git a/arch/arm/mach-rockchip/misc.c b/arch/arm/mach-rockchip/misc.c
index 82a106e786e..17a0579bddc 100644
--- a/arch/arm/mach-rockchip/misc.c
+++ b/arch/arm/mach-rockchip/misc.c
@@ -16,6 +16,7 @@
 #include <log.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <asm/types.h>
 #include <dm/uclass-internal.h>
 #include <misc.h>
 #include <linux/string.h>
diff --git a/arch/arm/mach-rockchip/px30-board-tpl.c b/arch/arm/mach-rockchip/px30-board-tpl.c
index 085e6506201..bb9aac92e5b 100644
--- a/arch/arm/mach-rockchip/px30-board-tpl.c
+++ b/arch/arm/mach-rockchip/px30-board-tpl.c
@@ -13,6 +13,7 @@
 #include <asm/io.h>
 #include <asm/arch-rockchip/bootrom.h>
 #include <asm/arch-rockchip/sdram_px30.h>
+#include <linux/types.h>
 
 #define TIMER_LOAD_COUNT0	0x00
 #define TIMER_LOAD_COUNT1	0x04
diff --git a/arch/arm/mach-rockchip/px30/px30.c b/arch/arm/mach-rockchip/px30/px30.c
index f11424d105b..228af5b1115 100644
--- a/arch/arm/mach-rockchip/px30/px30.c
+++ b/arch/arm/mach-rockchip/px30/px30.c
@@ -13,6 +13,7 @@
 #include <asm/arch-rockchip/uart.h>
 #include <asm/arch-rockchip/clock.h>
 #include <asm/arch-rockchip/cru_px30.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <dt-bindings/clock/px30-cru.h>
 
diff --git a/arch/arm/mach-rockchip/px30/syscon_px30.c b/arch/arm/mach-rockchip/px30/syscon_px30.c
index 4672bdbf009..ce387f007e8 100644
--- a/arch/arm/mach-rockchip/px30/syscon_px30.c
+++ b/arch/arm/mach-rockchip/px30/syscon_px30.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <syscon.h>
 #include <asm/arch-rockchip/clock.h>
+#include <linux/types.h>
 
 static const struct udevice_id px30_syscon_ids[] = {
 	{ .compatible = "rockchip,px30-pmu", .data = ROCKCHIP_SYSCON_PMU },
diff --git a/arch/arm/mach-rockchip/rk3036-board-spl.c b/arch/arm/mach-rockchip/rk3036-board-spl.c
index 964e981b863..1fbbab9a71c 100644
--- a/arch/arm/mach-rockchip/rk3036-board-spl.c
+++ b/arch/arm/mach-rockchip/rk3036-board-spl.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <asm/arch-rockchip/bootrom.h>
 #include <asm/arch-rockchip/sdram_rk3036.h>
+#include <linux/types.h>
 
 #define TIMER_LOAD_COUNT_L	0x00
 #define TIMER_LOAD_COUNT_H	0x04
diff --git a/arch/arm/mach-rockchip/rk3036/sdram_rk3036.c b/arch/arm/mach-rockchip/rk3036/sdram_rk3036.c
index 6ae254e99af..38f6f2cba37 100644
--- a/arch/arm/mach-rockchip/rk3036/sdram_rk3036.c
+++ b/arch/arm/mach-rockchip/rk3036/sdram_rk3036.c
@@ -12,6 +12,7 @@
 #include <asm/arch-rockchip/sdram_rk3036.h>
 #include <asm/arch-rockchip/uart.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 /*
  * we can not fit the code to access the device tree in SPL
diff --git a/arch/arm/mach-rockchip/rk3188/rk3188.c b/arch/arm/mach-rockchip/rk3188/rk3188.c
index 1a6750d39b1..b3e2b5400e5 100644
--- a/arch/arm/mach-rockchip/rk3188/rk3188.c
+++ b/arch/arm/mach-rockchip/rk3188/rk3188.c
@@ -3,6 +3,7 @@
  * (C) Copyright 2019 Rockchip Electronics Co., Ltd
  */
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <hang.h>
 #include <init.h>
diff --git a/arch/arm/mach-rockchip/rk3188/syscon_rk3188.c b/arch/arm/mach-rockchip/rk3188/syscon_rk3188.c
index ea7d7b5b1ac..81677f9485a 100644
--- a/arch/arm/mach-rockchip/rk3188/syscon_rk3188.c
+++ b/arch/arm/mach-rockchip/rk3188/syscon_rk3188.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <syscon.h>
 #include <asm/arch-rockchip/clock.h>
+#include <linux/types.h>
 
 static const struct udevice_id rk3188_syscon_ids[] = {
 	{ .compatible = "rockchip,rk3188-noc", .data = ROCKCHIP_SYSCON_NOC },
diff --git a/arch/arm/mach-rockchip/rk3288/rk3288.c b/arch/arm/mach-rockchip/rk3288/rk3288.c
index 1589ab1b2c7..37d9fa02037 100644
--- a/arch/arm/mach-rockchip/rk3288/rk3288.c
+++ b/arch/arm/mach-rockchip/rk3288/rk3288.c
@@ -4,6 +4,7 @@
  */
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <dm.h>
 #include <env.h>
 #include <clk.h>
@@ -25,6 +26,7 @@
 #include <asm/u-boot.h>
 #include <linux/err.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-rockchip/rk3288/syscon_rk3288.c b/arch/arm/mach-rockchip/rk3288/syscon_rk3288.c
index e3da0a01947..c4142ef75ad 100644
--- a/arch/arm/mach-rockchip/rk3288/syscon_rk3288.c
+++ b/arch/arm/mach-rockchip/rk3288/syscon_rk3288.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <syscon.h>
 #include <asm/arch-rockchip/clock.h>
+#include <linux/types.h>
 
 static const struct udevice_id rk3288_syscon_ids[] = {
 	{ .compatible = "rockchip,rk3288-noc", .data = ROCKCHIP_SYSCON_NOC },
diff --git a/arch/arm/mach-rockchip/rk3308/rk3308.c b/arch/arm/mach-rockchip/rk3308/rk3308.c
index c50da1365d5..69b1df1146c 100644
--- a/arch/arm/mach-rockchip/rk3308/rk3308.c
+++ b/arch/arm/mach-rockchip/rk3308/rk3308.c
@@ -3,6 +3,7 @@
  *Copyright (c) 2018 Rockchip Electronics Co., Ltd
  */
 #include <common.h>
+#include <compiler.h>
 #include <init.h>
 #include <malloc.h>
 #include <stdio.h>
@@ -12,6 +13,7 @@
 #include <asm/arch-rockchip/hardware.h>
 #include <asm/gpio.h>
 #include <debug_uart.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
 
diff --git a/arch/arm/mach-rockchip/rk3368/rk3368.c b/arch/arm/mach-rockchip/rk3368/rk3368.c
index fef8bfc476a..be91ea1e63a 100644
--- a/arch/arm/mach-rockchip/rk3368/rk3368.c
+++ b/arch/arm/mach-rockchip/rk3368/rk3368.c
@@ -18,6 +18,7 @@
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-rockchip/rk3368/syscon_rk3368.c b/arch/arm/mach-rockchip/rk3368/syscon_rk3368.c
index cba0dda3e80..2b02387cc4a 100644
--- a/arch/arm/mach-rockchip/rk3368/syscon_rk3368.c
+++ b/arch/arm/mach-rockchip/rk3368/syscon_rk3368.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <syscon.h>
 #include <asm/arch-rockchip/clock.h>
+#include <linux/types.h>
 
 static const struct udevice_id rk3368_syscon_ids[] = {
 	{ .compatible = "rockchip,rk3368-grf",
diff --git a/arch/arm/mach-rockchip/rk3399/rk3399.c b/arch/arm/mach-rockchip/rk3399/rk3399.c
index f2ad3f5ec13..7d93be2e4c0 100644
--- a/arch/arm/mach-rockchip/rk3399/rk3399.c
+++ b/arch/arm/mach-rockchip/rk3399/rk3399.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <fdt_support.h>
 #include <init.h>
 #include <log.h>
@@ -18,6 +19,7 @@
 #include <asm/arch-rockchip/gpio.h>
 #include <asm/arch-rockchip/grf_rk3399.h>
 #include <asm/arch-rockchip/hardware.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/kernel.h>
diff --git a/arch/arm/mach-rockchip/rk3399/syscon_rk3399.c b/arch/arm/mach-rockchip/rk3399/syscon_rk3399.c
index 690cbe7f278..296998a11bc 100644
--- a/arch/arm/mach-rockchip/rk3399/syscon_rk3399.c
+++ b/arch/arm/mach-rockchip/rk3399/syscon_rk3399.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <syscon.h>
 #include <asm/arch-rockchip/clock.h>
+#include <linux/types.h>
 
 static const struct udevice_id rk3399_syscon_ids[] = {
 	{ .compatible = "rockchip,rk3399-grf", .data = ROCKCHIP_SYSCON_GRF },
diff --git a/arch/arm/mach-rockchip/sdram.c b/arch/arm/mach-rockchip/sdram.c
index d9cf3255914..15b521f8918 100644
--- a/arch/arm/mach-rockchip/sdram.c
+++ b/arch/arm/mach-rockchip/sdram.c
@@ -14,6 +14,7 @@
 #include <asm/u-boot.h>
 #include <dm/uclass-internal.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-rockchip/spl-boot-order.c b/arch/arm/mach-rockchip/spl-boot-order.c
index 57ea84a9346..f67fbe23a3b 100644
--- a/arch/arm/mach-rockchip/spl-boot-order.c
+++ b/arch/arm/mach-rockchip/spl-boot-order.c
@@ -4,11 +4,13 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
 #include <mmc.h>
 #include <spl.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 
diff --git a/arch/arm/mach-rockchip/spl.c b/arch/arm/mach-rockchip/spl.c
index 345e61058d7..4589c14b904 100644
--- a/arch/arm/mach-rockchip/spl.c
+++ b/arch/arm/mach-rockchip/spl.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <debug_uart.h>
 #include <dm.h>
 #include <hang.h>
@@ -19,6 +20,7 @@
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-rockchip/tpl.c b/arch/arm/mach-rockchip/tpl.c
index df052b82f2f..37f7c493a23 100644
--- a/arch/arm/mach-rockchip/tpl.c
+++ b/arch/arm/mach-rockchip/tpl.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <debug_uart.h>
 #include <dm.h>
 #include <hang.h>
@@ -16,6 +17,7 @@
 #include <asm/io.h>
 #include <asm/arch-rockchip/bootrom.h>
 #include <linux/bitops.h>
+#include <linux/types.h>
 
 #define TIMER_LOAD_COUNT_L	0x00
 #define TIMER_LOAD_COUNT_H	0x04
diff --git a/arch/arm/mach-s5pc1xx/clock.c b/arch/arm/mach-s5pc1xx/clock.c
index e8809aa8ce2..28e8130ed6a 100644
--- a/arch/arm/mach-s5pc1xx/clock.c
+++ b/arch/arm/mach-s5pc1xx/clock.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/clk.h>
+#include <linux/types.h>
 
 #define CLK_M	0
 #define CLK_D	1
diff --git a/arch/arm/mach-s5pc1xx/include/mach/gpio.h b/arch/arm/mach-s5pc1xx/include/mach/gpio.h
index c8dfbdd642a..93e1f0c5320 100644
--- a/arch/arm/mach-s5pc1xx/include/mach/gpio.h
+++ b/arch/arm/mach-s5pc1xx/include/mach/gpio.h
@@ -8,6 +8,7 @@
 #define __ASM_ARCH_GPIO_H
 
 #ifndef __ASSEMBLY__
+#include <asm/types.h>
 struct s5p_gpio_bank {
 	unsigned int	con;
 	unsigned int	dat;
diff --git a/arch/arm/mach-s5pc1xx/include/mach/mmc.h b/arch/arm/mach-s5pc1xx/include/mach/mmc.h
index 70787908600..e32a3c9f9d8 100644
--- a/arch/arm/mach-s5pc1xx/include/mach/mmc.h
+++ b/arch/arm/mach-s5pc1xx/include/mach/mmc.h
@@ -7,6 +7,7 @@
 #ifndef __ASM_ARCH_MMC_H_
 #define __ASM_ARCH_MMC_H_
 
+#include <asm/types.h>
 #define S5P_MMC_DEV_OFFSET	0x100000
 
 #define SDHCI_CONTROL2		0x80
diff --git a/arch/arm/mach-s5pc1xx/include/mach/sromc.h b/arch/arm/mach-s5pc1xx/include/mach/sromc.h
index 45de4a799d3..cd484edb4ca 100644
--- a/arch/arm/mach-s5pc1xx/include/mach/sromc.h
+++ b/arch/arm/mach-s5pc1xx/include/mach/sromc.h
@@ -27,6 +27,7 @@
 #define SMC_BC_PMC(x)  (x << 0)  /* normal(1data)page mode configuration */
 
 #ifndef __ASSEMBLY__
+#include <asm/types.h>
 struct s5p_sromc {
 	unsigned int	bw;
 	unsigned int	bc[6];
diff --git a/arch/arm/mach-s5pc1xx/include/mach/sys_proto.h b/arch/arm/mach-s5pc1xx/include/mach/sys_proto.h
index 89de400043a..d3f6735c8e7 100644
--- a/arch/arm/mach-s5pc1xx/include/mach/sys_proto.h
+++ b/arch/arm/mach-s5pc1xx/include/mach/sys_proto.h
@@ -7,6 +7,7 @@
 #ifndef _SYS_PROTO_H_
 #define _SYS_PROTO_H_
 
+#include <asm/types.h>
 u32 get_device_type(void);
 
 #endif
diff --git a/arch/arm/mach-snapdragon/clock-apq8016.c b/arch/arm/mach-snapdragon/clock-apq8016.c
index 6e4a0ccb90a..8a5e0d5f557 100644
--- a/arch/arm/mach-snapdragon/clock-apq8016.c
+++ b/arch/arm/mach-snapdragon/clock-apq8016.c
@@ -13,6 +13,7 @@
 #include <errno.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
+#include <linux/types.h>
 #include "clock-snapdragon.h"
 
 /* GPLL0 clock control registers */
diff --git a/arch/arm/mach-snapdragon/clock-apq8096.c b/arch/arm/mach-snapdragon/clock-apq8096.c
index e5011be8f2e..c0116b434d5 100644
--- a/arch/arm/mach-snapdragon/clock-apq8096.c
+++ b/arch/arm/mach-snapdragon/clock-apq8096.c
@@ -13,6 +13,7 @@
 #include <errno.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
+#include <linux/types.h>
 #include "clock-snapdragon.h"
 
 /* GPLL0 clock control registers */
diff --git a/arch/arm/mach-snapdragon/clock-snapdragon.c b/arch/arm/mach-snapdragon/clock-snapdragon.c
index 78e30ea5bab..efc3d9493fb 100644
--- a/arch/arm/mach-snapdragon/clock-snapdragon.c
+++ b/arch/arm/mach-snapdragon/clock-snapdragon.c
@@ -14,6 +14,7 @@
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include "clock-snapdragon.h"
 
 /* CBCR register fields */
diff --git a/arch/arm/mach-snapdragon/clock-snapdragon.h b/arch/arm/mach-snapdragon/clock-snapdragon.h
index 58fab40a2e4..32f247a1aaa 100644
--- a/arch/arm/mach-snapdragon/clock-snapdragon.h
+++ b/arch/arm/mach-snapdragon/clock-snapdragon.h
@@ -7,6 +7,7 @@
 #ifndef _CLOCK_SNAPDRAGON_H
 #define _CLOCK_SNAPDRAGON_H
 
+#include <linux/types.h>
 #define CFG_CLK_SRC_CXO   (0 << 8)
 #define CFG_CLK_SRC_GPLL0 (1 << 8)
 #define CFG_CLK_SRC_MASK  (7 << 8)
diff --git a/arch/arm/mach-snapdragon/dram.c b/arch/arm/mach-snapdragon/dram.c
index df7148fee11..c168dd23e2d 100644
--- a/arch/arm/mach-snapdragon/dram.c
+++ b/arch/arm/mach-snapdragon/dram.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
 #include <part.h>
@@ -15,6 +16,7 @@
 #include <stdio.h>
 #include <asm/arch/dram.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #define SMEM_USABLE_RAM_PARTITION_TABLE 402
 #define RAM_PART_NAME_LENGTH            16
diff --git a/arch/arm/mach-snapdragon/include/mach/misc.h b/arch/arm/mach-snapdragon/include/mach/misc.h
index c60e3e47247..5f7d74ba123 100644
--- a/arch/arm/mach-snapdragon/include/mach/misc.h
+++ b/arch/arm/mach-snapdragon/include/mach/misc.h
@@ -7,6 +7,7 @@
 #ifndef MISC_H
 #define MISC_H
 
+#include <asm/types.h>
 u32 msm_board_serial(void);
 void msm_generate_mac_addr(u8 *mac);
 
diff --git a/arch/arm/mach-snapdragon/misc.c b/arch/arm/mach-snapdragon/misc.c
index 03515f6d2bf..1af4734bfb7 100644
--- a/arch/arm/mach-snapdragon/misc.c
+++ b/arch/arm/mach-snapdragon/misc.c
@@ -10,6 +10,7 @@
 #include <mmc.h>
 #include <vsprintf.h>
 #include <asm/arch/misc.h>
+#include <asm/types.h>
 
 /* UNSTUFF_BITS macro taken from Linux Kernel: drivers/mmc/core/sd.c */
 #define UNSTUFF_BITS(resp, start, size) \
diff --git a/arch/arm/mach-snapdragon/pinctrl-snapdragon.c b/arch/arm/mach-snapdragon/pinctrl-snapdragon.c
index 1587d38cbfb..92d46702fa3 100644
--- a/arch/arm/mach-snapdragon/pinctrl-snapdragon.c
+++ b/arch/arm/mach-snapdragon/pinctrl-snapdragon.c
@@ -14,6 +14,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include "pinctrl-snapdragon.h"
 
 struct msm_pinctrl_priv {
diff --git a/arch/arm/mach-socfpga/clock_manager.c b/arch/arm/mach-socfpga/clock_manager.c
index 017af139bc9..f8c63355bf8 100644
--- a/arch/arm/mach-socfpga/clock_manager.c
+++ b/arch/arm/mach-socfpga/clock_manager.c
@@ -10,6 +10,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock_manager.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-socfpga/clock_manager_agilex.c b/arch/arm/mach-socfpga/clock_manager_agilex.c
index 9c229de4b92..7b525ab3089 100644
--- a/arch/arm/mach-socfpga/clock_manager_agilex.c
+++ b/arch/arm/mach-socfpga/clock_manager_agilex.c
@@ -16,6 +16,7 @@
 #include <asm/io.h>
 #include <dt-bindings/clock/agilex-clock.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-socfpga/clock_manager_arria10.c b/arch/arm/mach-socfpga/clock_manager_arria10.c
index 9d84871d463..b86eaeb8e3d 100644
--- a/arch/arm/mach-socfpga/clock_manager_arria10.c
+++ b/arch/arm/mach-socfpga/clock_manager_arria10.c
@@ -16,6 +16,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_SPL_BUILD
 
diff --git a/arch/arm/mach-socfpga/clock_manager_gen5.c b/arch/arm/mach-socfpga/clock_manager_gen5.c
index 85a3d1926c1..9c3de1657dd 100644
--- a/arch/arm/mach-socfpga/clock_manager_gen5.c
+++ b/arch/arm/mach-socfpga/clock_manager_gen5.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <asm/arch/clock_manager.h>
 #include <wait_bit.h>
+#include <linux/types.h>
 
 /*
  * function to write the bypass register which requires a poll of the
diff --git a/arch/arm/mach-socfpga/clock_manager_s10.c b/arch/arm/mach-socfpga/clock_manager_s10.c
index 6355a312833..35ea1b382ef 100644
--- a/arch/arm/mach-socfpga/clock_manager_s10.c
+++ b/arch/arm/mach-socfpga/clock_manager_s10.c
@@ -11,6 +11,7 @@
 #include <asm/arch/clock_manager.h>
 #include <asm/arch/handoff_s10.h>
 #include <asm/arch/system_manager.h>
+#include <asm/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-socfpga/firewall.c b/arch/arm/mach-socfpga/firewall.c
index ed411c62c9c..b3e9e01a137 100644
--- a/arch/arm/mach-socfpga/firewall.c
+++ b/arch/arm/mach-socfpga/firewall.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <asm/arch/firewall.h>
 #include <asm/arch/system_manager.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 
 static void firewall_l4_per_disable(void)
diff --git a/arch/arm/mach-socfpga/freeze_controller.c b/arch/arm/mach-socfpga/freeze_controller.c
index e994d38ba62..23930fbb704 100644
--- a/arch/arm/mach-socfpga/freeze_controller.c
+++ b/arch/arm/mach-socfpga/freeze_controller.c
@@ -11,6 +11,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 static const struct socfpga_freeze_controller *freeze_controller_base =
 		(void *)(SOCFPGA_SYSMGR_ADDRESS + SYSMGR_FRZCTRL_ADDRESS);
diff --git a/arch/arm/mach-socfpga/include/mach/clock_manager.h b/arch/arm/mach-socfpga/include/mach/clock_manager.h
index 1f734bcd65e..51e3d83c6dc 100644
--- a/arch/arm/mach-socfpga/include/mach/clock_manager.h
+++ b/arch/arm/mach-socfpga/include/mach/clock_manager.h
@@ -6,9 +6,9 @@
 #ifndef _CLOCK_MANAGER_H_
 #define _CLOCK_MANAGER_H_
 
-phys_addr_t socfpga_get_clkmgr_addr(void);
-
 #ifndef __ASSEMBLY__
+#include <asm/types.h>
+phys_addr_t socfpga_get_clkmgr_addr(void);
 void cm_wait_for_lock(u32 mask);
 int cm_wait_for_fsm(void);
 void cm_print_clock_quick_summary(void);
diff --git a/arch/arm/mach-socfpga/include/mach/clock_manager_gen5.h b/arch/arm/mach-socfpga/include/mach/clock_manager_gen5.h
index 5c9abe619b9..2f60680d952 100644
--- a/arch/arm/mach-socfpga/include/mach/clock_manager_gen5.h
+++ b/arch/arm/mach-socfpga/include/mach/clock_manager_gen5.h
@@ -8,6 +8,7 @@
 
 #ifndef __ASSEMBLY__
 
+#include <asm/types.h>
 #include <linux/bitops.h>
 
 struct cm_config {
diff --git a/arch/arm/mach-socfpga/include/mach/clock_manager_s10.h b/arch/arm/mach-socfpga/include/mach/clock_manager_s10.h
index cb7923baef8..2d09fc194e2 100644
--- a/arch/arm/mach-socfpga/include/mach/clock_manager_s10.h
+++ b/arch/arm/mach-socfpga/include/mach/clock_manager_s10.h
@@ -8,6 +8,7 @@
 #define	_CLOCK_MANAGER_S10_
 
 #include <asm/arch/clock_manager_soc64.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 
 /* Clock speed accessors */
diff --git a/arch/arm/mach-socfpga/include/mach/firewall.h b/arch/arm/mach-socfpga/include/mach/firewall.h
index adab65bc968..f7ff82d3e8a 100644
--- a/arch/arm/mach-socfpga/include/mach/firewall.h
+++ b/arch/arm/mach-socfpga/include/mach/firewall.h
@@ -7,6 +7,7 @@
 #ifndef	_FIREWALL_H_
 #define	_FIREWALL_H_
 
+#include <asm/types.h>
 #include <linux/bitops.h>
 
 struct socfpga_firwall_l4_per {
diff --git a/arch/arm/mach-socfpga/include/mach/fpga_manager.h b/arch/arm/mach-socfpga/include/mach/fpga_manager.h
index 481b66bbd86..3f33e35cb28 100644
--- a/arch/arm/mach-socfpga/include/mach/fpga_manager.h
+++ b/arch/arm/mach-socfpga/include/mach/fpga_manager.h
@@ -24,6 +24,7 @@
 #ifndef __ASSEMBLY__
 
 /* Common prototypes */
+#include <linux/types.h>
 int fpgamgr_get_mode(void);
 int fpgamgr_poll_fpga_ready(void);
 void fpgamgr_program_write(const void *rbf_data, size_t rbf_size);
diff --git a/arch/arm/mach-socfpga/include/mach/fpga_manager_arria10.h b/arch/arm/mach-socfpga/include/mach/fpga_manager_arria10.h
index 048708202cc..edb5d4644f7 100644
--- a/arch/arm/mach-socfpga/include/mach/fpga_manager_arria10.h
+++ b/arch/arm/mach-socfpga/include/mach/fpga_manager_arria10.h
@@ -62,6 +62,7 @@
 #define FPGA_SOCFPGA_A10_RBF_CORE		0x8001
 #ifndef __ASSEMBLY__
 
+#include <linux/types.h>
 struct socfpga_fpga_manager {
 	u32  _pad_0x0_0x7[2];
 	u32  dclkcnt;
diff --git a/arch/arm/mach-socfpga/include/mach/fpga_manager_gen5.h b/arch/arm/mach-socfpga/include/mach/fpga_manager_gen5.h
index e08c0056286..9519544ec89 100644
--- a/arch/arm/mach-socfpga/include/mach/fpga_manager_gen5.h
+++ b/arch/arm/mach-socfpga/include/mach/fpga_manager_gen5.h
@@ -34,6 +34,7 @@
 
 #ifndef __ASSEMBLY__
 
+#include <asm/types.h>
 struct socfpga_fpga_manager {
 	/* FPGA Manager Module */
 	u32	stat;			/* 0x00 */
diff --git a/arch/arm/mach-socfpga/include/mach/freeze_controller.h b/arch/arm/mach-socfpga/include/mach/freeze_controller.h
index 80846a67f19..65119929ee5 100644
--- a/arch/arm/mach-socfpga/include/mach/freeze_controller.h
+++ b/arch/arm/mach-socfpga/include/mach/freeze_controller.h
@@ -6,6 +6,7 @@
 #ifndef	_FREEZE_CONTROLLER_H_
 #define	_FREEZE_CONTROLLER_H_
 
+#include <asm/types.h>
 struct socfpga_freeze_controller {
 	u32	vioctrl;
 	u32	padding[3];
diff --git a/arch/arm/mach-socfpga/include/mach/mailbox_s10.h b/arch/arm/mach-socfpga/include/mach/mailbox_s10.h
index 55707ab9c58..e8fa9d1f0b9 100644
--- a/arch/arm/mach-socfpga/include/mach/mailbox_s10.h
+++ b/arch/arm/mach-socfpga/include/mach/mailbox_s10.h
@@ -8,6 +8,7 @@
 #define _MAILBOX_S10_H_
 
 /* user define Uboot ID */
+#include <asm/types.h>
 #include <linux/bitops.h>
 #define MBOX_CLIENT_ID_UBOOT	0xB
 #define MBOX_ID_UBOOT		0x1
diff --git a/arch/arm/mach-socfpga/include/mach/misc.h b/arch/arm/mach-socfpga/include/mach/misc.h
index 32bca6775e2..ac023b89bbc 100644
--- a/arch/arm/mach-socfpga/include/mach/misc.h
+++ b/arch/arm/mach-socfpga/include/mach/misc.h
@@ -8,6 +8,7 @@
 
 #include <stdbool.h>
 #include <asm/sections.h>
+#include <asm/types.h>
 
 void dwmac_deassert_reset(const unsigned int of_reset_id, const u32 phymode);
 
diff --git a/arch/arm/mach-socfpga/include/mach/nic301.h b/arch/arm/mach-socfpga/include/mach/nic301.h
index 20bebb8c81c..0489e5fe1ad 100644
--- a/arch/arm/mach-socfpga/include/mach/nic301.h
+++ b/arch/arm/mach-socfpga/include/mach/nic301.h
@@ -6,6 +6,7 @@
 #ifndef	_NIC301_REGISTERS_H_
 #define	_NIC301_REGISTERS_H_
 
+#include <asm/types.h>
 struct nic301_registers {
 	u32	remap;				/* 0x0 */
 	/* Security Register Group */
diff --git a/arch/arm/mach-socfpga/include/mach/reset_manager.h b/arch/arm/mach-socfpga/include/mach/reset_manager.h
index 7844ad14cb6..3af2c1f9e02 100644
--- a/arch/arm/mach-socfpga/include/mach/reset_manager.h
+++ b/arch/arm/mach-socfpga/include/mach/reset_manager.h
@@ -6,6 +6,7 @@
 #ifndef _RESET_MANAGER_H_
 #define _RESET_MANAGER_H_
 
+#include <linux/types.h>
 phys_addr_t socfpga_get_rstmgr_addr(void);
 
 void reset_cpu(ulong addr);
diff --git a/arch/arm/mach-socfpga/include/mach/scan_manager.h b/arch/arm/mach-socfpga/include/mach/scan_manager.h
index 4d8d649be06..7d369aa1b5b 100644
--- a/arch/arm/mach-socfpga/include/mach/scan_manager.h
+++ b/arch/arm/mach-socfpga/include/mach/scan_manager.h
@@ -6,6 +6,7 @@
 #ifndef	_SCAN_MANAGER_H_
 #define	_SCAN_MANAGER_H_
 
+#include <asm/types.h>
 struct socfpga_scan_manager {
 	u32	stat;
 	u32	en;
diff --git a/arch/arm/mach-socfpga/include/mach/scu.h b/arch/arm/mach-socfpga/include/mach/scu.h
index b684a550192..7891318486a 100644
--- a/arch/arm/mach-socfpga/include/mach/scu.h
+++ b/arch/arm/mach-socfpga/include/mach/scu.h
@@ -6,6 +6,7 @@
 #ifndef __SOCFPGA_SCU_H__
 #define __SOCFPGA_SCU_H__
 
+#include <asm/types.h>
 struct scu_registers {
 	u32	ctrl;			/* 0x00 */
 	u32	cfg;
diff --git a/arch/arm/mach-socfpga/include/mach/sdram_arria10.h b/arch/arm/mach-socfpga/include/mach/sdram_arria10.h
index ff05994ccc3..1af29b11cf7 100644
--- a/arch/arm/mach-socfpga/include/mach/sdram_arria10.h
+++ b/arch/arm/mach-socfpga/include/mach/sdram_arria10.h
@@ -7,6 +7,7 @@
 #define _SOCFPGA_SDRAM_ARRIA10_H_
 
 #ifndef __ASSEMBLY__
+#include <asm/types.h>
 #include <linux/bitops.h>
 int ddr_calibration_sequence(void);
 
diff --git a/arch/arm/mach-socfpga/include/mach/sdram_gen5.h b/arch/arm/mach-socfpga/include/mach/sdram_gen5.h
index 8818a6b967f..05627eeed5e 100644
--- a/arch/arm/mach-socfpga/include/mach/sdram_gen5.h
+++ b/arch/arm/mach-socfpga/include/mach/sdram_gen5.h
@@ -7,6 +7,7 @@
 
 #ifndef __ASSEMBLY__
 
+#include <asm/types.h>
 const struct socfpga_sdram_config *socfpga_get_sdram_config(void);
 
 void socfpga_get_seq_ac_init(const u32 **init, unsigned int *nelem);
diff --git a/arch/arm/mach-socfpga/include/mach/system_manager.h b/arch/arm/mach-socfpga/include/mach/system_manager.h
index f8169547172..45ea62a7067 100644
--- a/arch/arm/mach-socfpga/include/mach/system_manager.h
+++ b/arch/arm/mach-socfpga/include/mach/system_manager.h
@@ -6,6 +6,7 @@
 #ifndef _SYSTEM_MANAGER_H_
 #define _SYSTEM_MANAGER_H_
 
+#include <asm/types.h>
 phys_addr_t socfpga_get_sysmgr_addr(void);
 
 #if defined(CONFIG_TARGET_SOCFPGA_STRATIX10) || \
diff --git a/arch/arm/mach-socfpga/include/mach/system_manager_gen5.h b/arch/arm/mach-socfpga/include/mach/system_manager_gen5.h
index 90cb465d137..3dce656ccb4 100644
--- a/arch/arm/mach-socfpga/include/mach/system_manager_gen5.h
+++ b/arch/arm/mach-socfpga/include/mach/system_manager_gen5.h
@@ -8,6 +8,7 @@
 
 #ifndef __ASSEMBLY__
 
+#include <asm/types.h>
 void sysmgr_pinmux_init(void);
 void sysmgr_config_warmrstcfgio(int enable);
 
diff --git a/arch/arm/mach-socfpga/include/mach/system_manager_soc64.h b/arch/arm/mach-socfpga/include/mach/system_manager_soc64.h
index c90f63a754c..b6ae059a8cf 100644
--- a/arch/arm/mach-socfpga/include/mach/system_manager_soc64.h
+++ b/arch/arm/mach-socfpga/include/mach/system_manager_soc64.h
@@ -6,6 +6,7 @@
 #ifndef _SYSTEM_MANAGER_SOC64_H_
 #define _SYSTEM_MANAGER_SOC64_H_
 
+#include <asm/types.h>
 #include <linux/bitops.h>
 void sysmgr_pinmux_init(void);
 void populate_sysmgr_fpgaintf_module(void);
diff --git a/arch/arm/mach-socfpga/include/mach/timer.h b/arch/arm/mach-socfpga/include/mach/timer.h
index 82596e412e3..b853f208d73 100644
--- a/arch/arm/mach-socfpga/include/mach/timer.h
+++ b/arch/arm/mach-socfpga/include/mach/timer.h
@@ -6,6 +6,7 @@
 #ifndef _SOCFPGA_TIMER_H_
 #define _SOCFPGA_TIMER_H_
 
+#include <asm/types.h>
 struct socfpga_timer {
 	u32	load_val;
 	u32	curr_val;
diff --git a/arch/arm/mach-socfpga/mailbox_s10.c b/arch/arm/mach-socfpga/mailbox_s10.c
index 85df32968d8..46f94423726 100644
--- a/arch/arm/mach-socfpga/mailbox_s10.c
+++ b/arch/arm/mach-socfpga/mailbox_s10.c
@@ -13,6 +13,7 @@
 #include <asm/arch/mailbox_s10.h>
 #include <asm/arch/system_manager.h>
 #include <asm/secure.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-socfpga/misc.c b/arch/arm/mach-socfpga/misc.c
index 5a5f1a82779..6266b9d5535 100644
--- a/arch/arm/mach-socfpga/misc.c
+++ b/arch/arm/mach-socfpga/misc.c
@@ -14,6 +14,7 @@
 #include <asm/io.h>
 #include <errno.h>
 #include <fdtdec.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <linux/libfdt.h>
diff --git a/arch/arm/mach-socfpga/misc_arria10.c b/arch/arm/mach-socfpga/misc_arria10.c
index 980f0d97e88..999e4784cad 100644
--- a/arch/arm/mach-socfpga/misc_arria10.c
+++ b/arch/arm/mach-socfpga/misc_arria10.c
@@ -22,6 +22,7 @@
 #include <asm/arch/nic301.h>
 #include <asm/io.h>
 #include <asm/pl310.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 
 #define PINMUX_UART0_TX_SHARED_IO_OFFSET_Q1_3	0x08
diff --git a/arch/arm/mach-socfpga/misc_gen5.c b/arch/arm/mach-socfpga/misc_gen5.c
index 51e3568a1dd..93057bbb38d 100644
--- a/arch/arm/mach-socfpga/misc_gen5.c
+++ b/arch/arm/mach-socfpga/misc_gen5.c
@@ -6,12 +6,14 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <init.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <env.h>
 #include <errno.h>
 #include <fdtdec.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
diff --git a/arch/arm/mach-socfpga/misc_s10.c b/arch/arm/mach-socfpga/misc_s10.c
index 9fea8e042aa..dc39387aebb 100644
--- a/arch/arm/mach-socfpga/misc_s10.c
+++ b/arch/arm/mach-socfpga/misc_s10.c
@@ -21,6 +21,7 @@
 #include <asm/arch/system_manager.h>
 #include <asm/arch/misc.h>
 #include <asm/pl310.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
diff --git a/arch/arm/mach-socfpga/pinmux_arria10.c b/arch/arm/mach-socfpga/pinmux_arria10.c
index aee51c039c9..bcb715c355b 100644
--- a/arch/arm/mach-socfpga/pinmux_arria10.c
+++ b/arch/arm/mach-socfpga/pinmux_arria10.c
@@ -8,6 +8,7 @@
 #include <asm/io.h>
 #include <common.h>
 #include <fdtdec.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 
diff --git a/arch/arm/mach-socfpga/reset_manager_arria10.c b/arch/arm/mach-socfpga/reset_manager_arria10.c
index 461c4592800..150e71858df 100644
--- a/arch/arm/mach-socfpga/reset_manager_arria10.c
+++ b/arch/arm/mach-socfpga/reset_manager_arria10.c
@@ -13,6 +13,7 @@
 #include <errno.h>
 #include <fdtdec.h>
 #include <wait_bit.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-socfpga/reset_manager_gen5.c b/arch/arm/mach-socfpga/reset_manager_gen5.c
index e37325f2ac5..7ca52b82917 100644
--- a/arch/arm/mach-socfpga/reset_manager_gen5.c
+++ b/arch/arm/mach-socfpga/reset_manager_gen5.c
@@ -11,6 +11,7 @@
 #include <asm/arch/fpga_manager.h>
 #include <asm/arch/reset_manager.h>
 #include <asm/arch/system_manager.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 
 /* Assert or de-assert SoCFPGA reset manager reset. */
diff --git a/arch/arm/mach-socfpga/reset_manager_s10.c b/arch/arm/mach-socfpga/reset_manager_s10.c
index 81e4c67fba6..a9179940e57 100644
--- a/arch/arm/mach-socfpga/reset_manager_s10.c
+++ b/arch/arm/mach-socfpga/reset_manager_s10.c
@@ -9,6 +9,7 @@
 #include <asm/io.h>
 #include <asm/arch/reset_manager.h>
 #include <asm/arch/system_manager.h>
+#include <asm/types.h>
 #include <dt-bindings/reset/altr,rst-mgr-s10.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-socfpga/scan_manager.c b/arch/arm/mach-socfpga/scan_manager.c
index d5601739ef6..85c113f5051 100644
--- a/arch/arm/mach-socfpga/scan_manager.c
+++ b/arch/arm/mach-socfpga/scan_manager.c
@@ -9,6 +9,7 @@
 #include <asm/arch/freeze_controller.h>
 #include <asm/arch/scan_manager.h>
 #include <asm/arch/system_manager.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 
diff --git a/arch/arm/mach-socfpga/spl_a10.c b/arch/arm/mach-socfpga/spl_a10.c
index daf75addde7..cda0ba5be50 100644
--- a/arch/arm/mach-socfpga/spl_a10.c
+++ b/arch/arm/mach-socfpga/spl_a10.c
@@ -31,6 +31,7 @@
 #include <asm/arch/fpga_manager.h>
 #include <mmc.h>
 #include <memalign.h>
+#include <linux/types.h>
 
 #define FPGA_BUFSIZ	16 * 1024
 
diff --git a/arch/arm/mach-socfpga/spl_agilex.c b/arch/arm/mach-socfpga/spl_agilex.c
index 9871d1b6c8b..0364f5a5d0f 100644
--- a/arch/arm/mach-socfpga/spl_agilex.c
+++ b/arch/arm/mach-socfpga/spl_agilex.c
@@ -22,6 +22,7 @@
 #include <asm/arch/system_manager.h>
 #include <watchdog.h>
 #include <dm/uclass.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-socfpga/spl_gen5.c b/arch/arm/mach-socfpga/spl_gen5.c
index 2cffc2ef778..54f2674b399 100644
--- a/arch/arm/mach-socfpga/spl_gen5.c
+++ b/arch/arm/mach-socfpga/spl_gen5.c
@@ -27,6 +27,7 @@
 #include <watchdog.h>
 #include <dm/uclass.h>
 #include <linux/bitops.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-socfpga/spl_s10.c b/arch/arm/mach-socfpga/spl_s10.c
index cbffa669936..93d20391773 100644
--- a/arch/arm/mach-socfpga/spl_s10.c
+++ b/arch/arm/mach-socfpga/spl_s10.c
@@ -23,6 +23,7 @@
 #include <asm/arch/system_manager.h>
 #include <watchdog.h>
 #include <dm/uclass.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-socfpga/system_manager_gen5.c b/arch/arm/mach-socfpga/system_manager_gen5.c
index 09caebb3c88..ce95062ea80 100644
--- a/arch/arm/mach-socfpga/system_manager_gen5.c
+++ b/arch/arm/mach-socfpga/system_manager_gen5.c
@@ -7,6 +7,7 @@
 #include <asm/io.h>
 #include <asm/arch/system_manager.h>
 #include <asm/arch/fpga_manager.h>
+#include <asm/types.h>
 
 /*
  * Populate the value for SYSMGR.FPGAINTF.MODULE based on pinmux setting.
diff --git a/arch/arm/mach-socfpga/system_manager_s10.c b/arch/arm/mach-socfpga/system_manager_s10.c
index c123cc96445..dba1b95ba81 100644
--- a/arch/arm/mach-socfpga/system_manager_s10.c
+++ b/arch/arm/mach-socfpga/system_manager_s10.c
@@ -8,6 +8,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/system_manager.h>
+#include <asm/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-socfpga/wrap_pinmux_config.c b/arch/arm/mach-socfpga/wrap_pinmux_config.c
index f5a425db559..b4c1a5cd83a 100644
--- a/arch/arm/mach-socfpga/wrap_pinmux_config.c
+++ b/arch/arm/mach-socfpga/wrap_pinmux_config.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <errno.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 
 /* Board-specific header. */
diff --git a/arch/arm/mach-socfpga/wrap_pinmux_config_s10.c b/arch/arm/mach-socfpga/wrap_pinmux_config_s10.c
index 8f3688dd19f..877c7a21c7f 100644
--- a/arch/arm/mach-socfpga/wrap_pinmux_config_s10.c
+++ b/arch/arm/mach-socfpga/wrap_pinmux_config_s10.c
@@ -8,6 +8,7 @@
 #include <errno.h>
 #include <asm/io.h>
 #include <asm/arch/handoff_s10.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 
 static void sysmgr_pinmux_handoff_read(void *handoff_address,
diff --git a/arch/arm/mach-socfpga/wrap_pll_config_s10.c b/arch/arm/mach-socfpga/wrap_pll_config_s10.c
index 3da85791a1f..bd754ced8c5 100644
--- a/arch/arm/mach-socfpga/wrap_pll_config_s10.c
+++ b/arch/arm/mach-socfpga/wrap_pll_config_s10.c
@@ -9,6 +9,7 @@
 #include <asm/io.h>
 #include <asm/arch/handoff_s10.h>
 #include <asm/arch/system_manager.h>
+#include <asm/types.h>
 
 const struct cm_config * const cm_get_default_config(void)
 {
diff --git a/arch/arm/mach-socfpga/wrap_sdram_config.c b/arch/arm/mach-socfpga/wrap_sdram_config.c
index 50fec073b48..3fe77f55cfa 100644
--- a/arch/arm/mach-socfpga/wrap_sdram_config.c
+++ b/arch/arm/mach-socfpga/wrap_sdram_config.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <errno.h>
 #include <asm/arch/sdram.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 
 /* Board-specific header. */
diff --git a/arch/arm/mach-stm32mp/bsec.c b/arch/arm/mach-stm32mp/bsec.c
index 6b5a5c64cb4..ba2c8aaab87 100644
--- a/arch/arm/mach-stm32mp/bsec.c
+++ b/arch/arm/mach-stm32mp/bsec.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <asm/arch/bsec.h>
 #include <asm/arch/stm32mp1_smc.h>
+#include <asm/types.h>
 #include <linux/arm-smccc.h>
 #include <linux/errno.h>
 #include <linux/iopoll.h>
diff --git a/arch/arm/mach-stm32mp/cmd_stm32key.c b/arch/arm/mach-stm32mp/cmd_stm32key.c
index a5c94d331e6..6260099af16 100644
--- a/arch/arm/mach-stm32mp/cmd_stm32key.c
+++ b/arch/arm/mach-stm32mp/cmd_stm32key.c
@@ -14,6 +14,7 @@
 #include <dm/uclass.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define STM32_OTP_HASH_KEY_START 24
 #define STM32_OTP_HASH_KEY_SIZE 8
diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c b/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c
index df38f622210..5378f5e1b57 100644
--- a/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c
+++ b/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c
@@ -13,6 +13,7 @@
 #include <asm/arch/stm32prog.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "stm32prog.h"
 
 struct stm32prog_data *stm32prog_data;
diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c
index 74b2ba277b3..9e61f3dfc19 100644
--- a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c
+++ b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c
@@ -10,6 +10,7 @@
 #include <misc.h>
 #include <mmc.h>
 #include <part.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/arch/stm32mp1_smc.h>
@@ -25,6 +26,7 @@
 #include <linux/printk.h>
 #include <linux/sizes.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "stm32prog.h"
 
diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.h b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.h
index 46f014cb77f..29e524ef36f 100644
--- a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.h
+++ b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.h
@@ -9,6 +9,7 @@
 #include <stdbool.h>
 #include <vsprintf.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 /* - phase defines ------------------------------------------------*/
 #define PHASE_FLASHLAYOUT	0x00
diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_serial.c b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_serial.c
index 55485302012..b90b7149d8d 100644
--- a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_serial.c
+++ b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_serial.c
@@ -13,6 +13,7 @@
 #include <vsprintf.h>
 #include <watchdog.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <dm/lists.h>
 #include <dm/device-internal.h>
 #include <linux/delay.h>
diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_usb.c b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_usb.c
index a170fdfee94..8afdaffc240 100644
--- a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_usb.c
+++ b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_usb.c
@@ -15,6 +15,7 @@
 #include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "stm32prog.h"
 
 static int stm32prog_set_phase(struct stm32prog_data *data, u8 phase,
diff --git a/arch/arm/mach-stm32mp/cpu.c b/arch/arm/mach-stm32mp/cpu.c
index 50959da323e..c9b475d4a5e 100644
--- a/arch/arm/mach-stm32mp/cpu.c
+++ b/arch/arm/mach-stm32mp/cpu.c
@@ -4,6 +4,7 @@
  */
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <debug_uart.h>
 #include <env.h>
@@ -25,6 +26,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 /* RCC register */
 #define RCC_TZCR		(STM32_RCC_BASE + 0x00)
diff --git a/arch/arm/mach-stm32mp/dram_init.c b/arch/arm/mach-stm32mp/dram_init.c
index 77fd34148d7..8da8490fa50 100644
--- a/arch/arm/mach-stm32mp/dram_init.c
+++ b/arch/arm/mach-stm32mp/dram_init.c
@@ -13,6 +13,7 @@
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-stm32mp/fdt.c b/arch/arm/mach-stm32mp/fdt.c
index e83885440b4..61d633d31b4 100644
--- a/arch/arm/mach-stm32mp/fdt.c
+++ b/arch/arm/mach-stm32mp/fdt.c
@@ -7,9 +7,11 @@
 #include <fdtdec.h>
 #include <fdt_support.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <tee.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <dt-bindings/pinctrl/stm32-pinfunc.h>
 #include <linux/io.h>
diff --git a/arch/arm/mach-stm32mp/include/mach/gpio.h b/arch/arm/mach-stm32mp/include/mach/gpio.h
index 5ca76d21ff1..ba383e82c3a 100644
--- a/arch/arm/mach-stm32mp/include/mach/gpio.h
+++ b/arch/arm/mach-stm32mp/include/mach/gpio.h
@@ -7,6 +7,7 @@
 #ifndef _STM32_GPIO_H_
 #define _STM32_GPIO_H_
 #include <asm/gpio.h>
+#include <asm/types.h>
 
 #define STM32_GPIOS_PER_BANK		16
 
diff --git a/arch/arm/mach-stm32mp/include/mach/stm32mp1_smc.h b/arch/arm/mach-stm32mp/include/mach/stm32mp1_smc.h
index fbc082703dc..353ec1b7587 100644
--- a/arch/arm/mach-stm32mp/include/mach/stm32mp1_smc.h
+++ b/arch/arm/mach-stm32mp/include/mach/stm32mp1_smc.h
@@ -6,6 +6,7 @@
 #ifndef __STM32MP1_SMC_H__
 #define __STM32MP1_SMC_H__
 
+#include <asm/types.h>
 #include <linux/arm-smccc.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
diff --git a/arch/arm/mach-stm32mp/include/mach/sys_proto.h b/arch/arm/mach-stm32mp/include/mach/sys_proto.h
index 4149d3a1337..ffb2ea2019d 100644
--- a/arch/arm/mach-stm32mp/include/mach/sys_proto.h
+++ b/arch/arm/mach-stm32mp/include/mach/sys_proto.h
@@ -4,6 +4,7 @@
  */
 
 /* ID = Device Version (bit31:16) + Device Part Number (RPN) (bit7:0) */
+#include <asm/types.h>
 #define CPU_STM32MP157Cxx	0x05000000
 #define CPU_STM32MP157Axx	0x05000001
 #define CPU_STM32MP153Cxx	0x05000024
diff --git a/arch/arm/mach-stm32mp/psci.c b/arch/arm/mach-stm32mp/psci.c
index 155aa79cd5e..beca18d6fbc 100644
--- a/arch/arm/mach-stm32mp/psci.c
+++ b/arch/arm/mach-stm32mp/psci.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <asm/psci.h>
 #include <asm/secure.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 
 #define BOOT_API_A7_CORE0_MAGIC_NUMBER	0xCA7FACE0
diff --git a/arch/arm/mach-stm32mp/pwr_regulator.c b/arch/arm/mach-stm32mp/pwr_regulator.c
index 954603f6745..f478c3b8b00 100644
--- a/arch/arm/mach-stm32mp/pwr_regulator.c
+++ b/arch/arm/mach-stm32mp/pwr_regulator.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
+#include <stdbool.h>
 #include <syscon.h>
 #include <time.h>
 #include <asm/io.h>
@@ -13,6 +14,7 @@
 #include <linux/bitops.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 
diff --git a/arch/arm/mach-stm32mp/spl.c b/arch/arm/mach-stm32mp/spl.c
index d2aae1a69f1..5e6aef9c390 100644
--- a/arch/arm/mach-stm32mp/spl.c
+++ b/arch/arm/mach-stm32mp/spl.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <dm.h>
 #include <hang.h>
@@ -18,6 +19,7 @@
 #include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <linux/libfdt.h>
+#include <linux/types.h>
 
 u32 spl_boot_device(void)
 {
diff --git a/arch/arm/mach-sunxi/board.c b/arch/arm/mach-sunxi/board.c
index d7e77f95747..68332d27fe7 100644
--- a/arch/arm/mach-sunxi/board.c
+++ b/arch/arm/mach-sunxi/board.c
@@ -29,6 +29,7 @@
 #include <asm/arch/tzpc.h>
 #include <asm/arch/mmc.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 #include <linux/compiler.h>
 
diff --git a/arch/arm/mach-sunxi/clock.c b/arch/arm/mach-sunxi/clock.c
index f591affebf7..e804cacf186 100644
--- a/arch/arm/mach-sunxi/clock.c
+++ b/arch/arm/mach-sunxi/clock.c
@@ -8,12 +8,14 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/gpio.h>
 #include <asm/arch/prcm.h>
 #include <asm/arch/gtbus.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/types.h>
 
 __weak void clock_init_sec(void)
 {
diff --git a/arch/arm/mach-sunxi/clock_sun4i.c b/arch/arm/mach-sunxi/clock_sun4i.c
index 7799c5750d3..4646d4cff59 100644
--- a/arch/arm/mach-sunxi/clock_sun4i.c
+++ b/arch/arm/mach-sunxi/clock_sun4i.c
@@ -16,6 +16,7 @@
 #include <asm/arch/gpio.h>
 #include <asm/arch/sys_proto.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_SPL_BUILD
 void clock_init_safe(void)
diff --git a/arch/arm/mach-sunxi/clock_sun50i_h6.c b/arch/arm/mach-sunxi/clock_sun50i_h6.c
index ba8a26eb0d3..10fe7748f03 100644
--- a/arch/arm/mach-sunxi/clock_sun50i_h6.c
+++ b/arch/arm/mach-sunxi/clock_sun50i_h6.c
@@ -2,6 +2,7 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/clock.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_SPL_BUILD
 void clock_init_safe(void)
diff --git a/arch/arm/mach-sunxi/clock_sun6i.c b/arch/arm/mach-sunxi/clock_sun6i.c
index 529fdd7754e..5e79a1a2e57 100644
--- a/arch/arm/mach-sunxi/clock_sun6i.c
+++ b/arch/arm/mach-sunxi/clock_sun6i.c
@@ -17,6 +17,7 @@
 #include <asm/arch/sys_proto.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_SPL_BUILD
 void clock_init_safe(void)
diff --git a/arch/arm/mach-sunxi/clock_sun8i_a83t.c b/arch/arm/mach-sunxi/clock_sun8i_a83t.c
index 31e4281529a..c29cf314023 100644
--- a/arch/arm/mach-sunxi/clock_sun8i_a83t.c
+++ b/arch/arm/mach-sunxi/clock_sun8i_a83t.c
@@ -15,6 +15,7 @@
 #include <asm/arch/prcm.h>
 #include <asm/arch/sys_proto.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_SPL_BUILD
 void clock_init_safe(void)
diff --git a/arch/arm/mach-sunxi/clock_sun9i.c b/arch/arm/mach-sunxi/clock_sun9i.c
index 8ba4802f3b3..1765ac31eb7 100644
--- a/arch/arm/mach-sunxi/clock_sun9i.c
+++ b/arch/arm/mach-sunxi/clock_sun9i.c
@@ -14,6 +14,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/prcm.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/types.h>
 
 
 #ifdef CONFIG_SPL_BUILD
diff --git a/arch/arm/mach-sunxi/cpu_info.c b/arch/arm/mach-sunxi/cpu_info.c
index 5a7d03dce89..1e10defc075 100644
--- a/arch/arm/mach-sunxi/cpu_info.c
+++ b/arch/arm/mach-sunxi/cpu_info.c
@@ -14,6 +14,7 @@
 #include <axp_pmic.h>
 #include <errno.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_MACH_SUN6I
 int sunxi_get_ss_bonding_id(void)
diff --git a/arch/arm/mach-sunxi/dram_helpers.c b/arch/arm/mach-sunxi/dram_helpers.c
index ffadaa42570..cc61d5747aa 100644
--- a/arch/arm/mach-sunxi/dram_helpers.c
+++ b/arch/arm/mach-sunxi/dram_helpers.c
@@ -12,6 +12,7 @@
 #include <asm/barriers.h>
 #include <asm/io.h>
 #include <asm/arch/dram.h>
+#include <linux/types.h>
 
 /*
  * Wait up to 1s for value to be set in given part of reg.
diff --git a/arch/arm/mach-sunxi/dram_sun4i.c b/arch/arm/mach-sunxi/dram_sun4i.c
index 6c406f11156..d51fd207001 100644
--- a/arch/arm/mach-sunxi/dram_sun4i.c
+++ b/arch/arm/mach-sunxi/dram_sun4i.c
@@ -22,12 +22,14 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdbool.h>
 #include <vsprintf.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/dram.h>
 #include <asm/arch/timer.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
 
diff --git a/arch/arm/mach-sunxi/dram_sun50i_h6.c b/arch/arm/mach-sunxi/dram_sun50i_h6.c
index ea47fa86478..ec351079037 100644
--- a/arch/arm/mach-sunxi/dram_sun50i_h6.c
+++ b/arch/arm/mach-sunxi/dram_sun50i_h6.c
@@ -14,6 +14,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/dram.h>
 #include <asm/arch/cpu.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/kconfig.h>
diff --git a/arch/arm/mach-sunxi/dram_sun6i.c b/arch/arm/mach-sunxi/dram_sun6i.c
index 53f8ac068ae..ba310e1192f 100644
--- a/arch/arm/mach-sunxi/dram_sun6i.c
+++ b/arch/arm/mach-sunxi/dram_sun6i.c
@@ -18,6 +18,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/dram.h>
 #include <asm/arch/prcm.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 #define DRAM_CLK (CONFIG_DRAM_CLK * 1000000)
diff --git a/arch/arm/mach-sunxi/dram_sun8i_a23.c b/arch/arm/mach-sunxi/dram_sun8i_a23.c
index 3ed97b59a32..25084956ebb 100644
--- a/arch/arm/mach-sunxi/dram_sun8i_a23.c
+++ b/arch/arm/mach-sunxi/dram_sun8i_a23.c
@@ -26,6 +26,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/dram.h>
 #include <asm/arch/prcm.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 static const struct dram_para dram_para = {
diff --git a/arch/arm/mach-sunxi/dram_sun8i_a33.c b/arch/arm/mach-sunxi/dram_sun8i_a33.c
index 5b993afe3ef..c2ea86ffd62 100644
--- a/arch/arm/mach-sunxi/dram_sun8i_a33.c
+++ b/arch/arm/mach-sunxi/dram_sun8i_a33.c
@@ -14,6 +14,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/dram.h>
 #include <asm/arch/prcm.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
diff --git a/arch/arm/mach-sunxi/dram_sun8i_a83t.c b/arch/arm/mach-sunxi/dram_sun8i_a83t.c
index bf627921440..93c90ccbb0f 100644
--- a/arch/arm/mach-sunxi/dram_sun8i_a83t.c
+++ b/arch/arm/mach-sunxi/dram_sun8i_a83t.c
@@ -14,6 +14,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/dram.h>
 #include <asm/arch/prcm.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
diff --git a/arch/arm/mach-sunxi/dram_sun9i.c b/arch/arm/mach-sunxi/dram_sun9i.c
index e2ab5d2fafb..b499b841649 100644
--- a/arch/arm/mach-sunxi/dram_sun9i.c
+++ b/arch/arm/mach-sunxi/dram_sun9i.c
@@ -21,6 +21,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/dram.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/types.h>
 
 #define DRAM_CLK (CONFIG_DRAM_CLK * 1000000)
 
diff --git a/arch/arm/mach-sunxi/dram_sunxi_dw.c b/arch/arm/mach-sunxi/dram_sunxi_dw.c
index 3fa8509efb9..6147d0f745f 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 <stdbool.h>
 #include <vsprintf.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
@@ -19,6 +20,7 @@
 #include <linux/delay.h>
 #include <linux/kconfig.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 static void mctl_phy_init(u32 val)
 {
diff --git a/arch/arm/mach-sunxi/dram_timings/ddr2_v3s.c b/arch/arm/mach-sunxi/dram_timings/ddr2_v3s.c
index 14ee586e147..eef6e0b66da 100644
--- a/arch/arm/mach-sunxi/dram_timings/ddr2_v3s.c
+++ b/arch/arm/mach-sunxi/dram_timings/ddr2_v3s.c
@@ -2,6 +2,7 @@
 #include <asm/arch/dram.h>
 #include <asm/arch/cpu.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 void mctl_set_timing_params(uint16_t socid, struct dram_para *para)
 {
diff --git a/arch/arm/mach-sunxi/dram_timings/ddr3_1333.c b/arch/arm/mach-sunxi/dram_timings/ddr3_1333.c
index a297d469a90..d2fb7203822 100644
--- a/arch/arm/mach-sunxi/dram_timings/ddr3_1333.c
+++ b/arch/arm/mach-sunxi/dram_timings/ddr3_1333.c
@@ -2,6 +2,7 @@
 #include <asm/arch/dram.h>
 #include <asm/arch/cpu.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 void mctl_set_timing_params(uint16_t socid, struct dram_para *para)
 {
diff --git a/arch/arm/mach-sunxi/dram_timings/h6_ddr3_1333.c b/arch/arm/mach-sunxi/dram_timings/h6_ddr3_1333.c
index 6160518efee..bceae65edb0 100644
--- a/arch/arm/mach-sunxi/dram_timings/h6_ddr3_1333.c
+++ b/arch/arm/mach-sunxi/dram_timings/h6_ddr3_1333.c
@@ -22,6 +22,7 @@
 #include <common.h>
 #include <asm/arch/dram.h>
 #include <asm/arch/cpu.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 
 /*
diff --git a/arch/arm/mach-sunxi/dram_timings/h6_lpddr3.c b/arch/arm/mach-sunxi/dram_timings/h6_lpddr3.c
index 497c59d8ae2..641abdbd9db 100644
--- a/arch/arm/mach-sunxi/dram_timings/h6_lpddr3.c
+++ b/arch/arm/mach-sunxi/dram_timings/h6_lpddr3.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <asm/arch/dram.h>
 #include <asm/arch/cpu.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 
 static u32 mr_lpddr3[12] = {
diff --git a/arch/arm/mach-sunxi/dram_timings/lpddr3_stock.c b/arch/arm/mach-sunxi/dram_timings/lpddr3_stock.c
index 6378bbc22a3..071628657c0 100644
--- a/arch/arm/mach-sunxi/dram_timings/lpddr3_stock.c
+++ b/arch/arm/mach-sunxi/dram_timings/lpddr3_stock.c
@@ -2,6 +2,7 @@
 #include <asm/arch/dram.h>
 #include <asm/arch/cpu.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 void mctl_set_timing_params(uint16_t socid, struct dram_para *para)
 {
diff --git a/arch/arm/mach-sunxi/p2wi.c b/arch/arm/mach-sunxi/p2wi.c
index 550b37b3663..f8fc04c96eb 100644
--- a/arch/arm/mach-sunxi/p2wi.c
+++ b/arch/arm/mach-sunxi/p2wi.c
@@ -23,6 +23,7 @@
 #include <asm/arch/prcm.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 
 void p2wi_init(void)
diff --git a/arch/arm/mach-sunxi/pinmux.c b/arch/arm/mach-sunxi/pinmux.c
index 642483f06c5..ab8fc812635 100644
--- a/arch/arm/mach-sunxi/pinmux.c
+++ b/arch/arm/mach-sunxi/pinmux.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <asm/io.h>
 #include <asm/arch/gpio.h>
+#include <asm/types.h>
 
 void sunxi_gpio_set_cfgbank(struct sunxi_gpio *pio, int bank_offset, u32 val)
 {
diff --git a/arch/arm/mach-sunxi/pmic_bus.c b/arch/arm/mach-sunxi/pmic_bus.c
index dea42de833f..0e23f7fa2f0 100644
--- a/arch/arm/mach-sunxi/pmic_bus.c
+++ b/arch/arm/mach-sunxi/pmic_bus.c
@@ -13,6 +13,7 @@
 #include <asm/arch/rsb.h>
 #include <i2c.h>
 #include <asm/arch/pmic_bus.h>
+#include <asm/types.h>
 
 #define AXP152_I2C_ADDR			0x30
 
diff --git a/arch/arm/mach-sunxi/prcm.c b/arch/arm/mach-sunxi/prcm.c
index 71a2e44918e..4970022fe5b 100644
--- a/arch/arm/mach-sunxi/prcm.c
+++ b/arch/arm/mach-sunxi/prcm.c
@@ -19,6 +19,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/prcm.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/types.h>
 
 /* APB0 clock gate and reset bit offsets are the same. */
 void prcm_apb0_enable(u32 flags)
diff --git a/arch/arm/mach-sunxi/rsb.c b/arch/arm/mach-sunxi/rsb.c
index 2ec63f5a568..781f22053ea 100644
--- a/arch/arm/mach-sunxi/rsb.c
+++ b/arch/arm/mach-sunxi/rsb.c
@@ -15,6 +15,7 @@
 #include <asm/arch/gpio.h>
 #include <asm/arch/prcm.h>
 #include <asm/arch/rsb.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 
 static int rsb_set_device_mode(void);
diff --git a/arch/arm/mach-sunxi/spl_spi_sunxi.c b/arch/arm/mach-sunxi/spl_spi_sunxi.c
index f9e1f27363f..aa8416d3e6a 100644
--- a/arch/arm/mach-sunxi/spl_spi_sunxi.c
+++ b/arch/arm/mach-sunxi/spl_spi_sunxi.c
@@ -13,6 +13,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_SPL_OS_BOOT
 #error CONFIG_SPL_OS_BOOT is not supported yet
diff --git a/arch/arm/mach-tegra/ap.c b/arch/arm/mach-tegra/ap.c
index f8a1b36ed93..6e4fae24bc9 100644
--- a/arch/arm/mach-tegra/ap.c
+++ b/arch/arm/mach-tegra/ap.c
@@ -21,6 +21,7 @@
 #include <asm/arch-tegra/scu.h>
 #include <asm/arch-tegra/tegra.h>
 #include <asm/arch-tegra/warmboot.h>
+#include <linux/types.h>
 
 int tegra_get_chip(void)
 {
diff --git a/arch/arm/mach-tegra/board.c b/arch/arm/mach-tegra/board.c
index cd0eb258bf9..8d5d5e25f80 100644
--- a/arch/arm/mach-tegra/board.c
+++ b/arch/arm/mach-tegra/board.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <ns16550.h>
 #include <spl.h>
+#include <stdbool.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
@@ -31,6 +32,7 @@
 #include <asm/arch-tegra/sys_proto.h>
 #include <asm/arch-tegra/warmboot.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 void save_boot_params_ret(void);
 
diff --git a/arch/arm/mach-tegra/board2.c b/arch/arm/mach-tegra/board2.c
index 819dabd90ea..3a48f01eb82 100644
--- a/arch/arm/mach-tegra/board2.c
+++ b/arch/arm/mach-tegra/board2.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <env.h>
 #include <errno.h>
@@ -39,6 +40,7 @@
 #include <asm/arch/emc.h>
 #endif
 #include <asm/u-boot.h>
+#include <linux/types.h>
 #include "emc.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-tegra/cache.c b/arch/arm/mach-tegra/cache.c
index d7063490e22..bea1013f891 100644
--- a/arch/arm/mach-tegra/cache.c
+++ b/arch/arm/mach-tegra/cache.c
@@ -11,6 +11,7 @@
 #if IS_ENABLED(CONFIG_TEGRA_GP_PADCTRL)
 #include <asm/arch/gp_padctrl.h>
 #endif
+#include <asm/types.h>
 
 #ifndef CONFIG_ARM64
 void config_cache(void)
diff --git a/arch/arm/mach-tegra/cboot.c b/arch/arm/mach-tegra/cboot.c
index 8760abbe9d4..6523daa48ee 100644
--- a/arch/arm/mach-tegra/cboot.c
+++ b/arch/arm/mach-tegra/cboot.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <net.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -21,6 +22,7 @@
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <linux/ctype.h>
 #include <linux/sizes.h>
diff --git a/arch/arm/mach-tegra/clock.c b/arch/arm/mach-tegra/clock.c
index 567ba52ee88..17b88423ddd 100644
--- a/arch/arm/mach-tegra/clock.c
+++ b/arch/arm/mach-tegra/clock.c
@@ -6,10 +6,12 @@
 /* Tegra SoC common clock control functions */
 
 #include <common.h>
+#include <compiler.h>
 #include <div64.h>
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <asm/io.h>
@@ -22,6 +24,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 /*
  * This is our record of the current clock rate of each clock. We don't
diff --git a/arch/arm/mach-tegra/cpu.c b/arch/arm/mach-tegra/cpu.c
index 216e307ccb2..22a04e30aee 100644
--- a/arch/arm/mach-tegra/cpu.c
+++ b/arch/arm/mach-tegra/cpu.c
@@ -15,6 +15,7 @@
 #include <asm/arch-tegra/pmc.h>
 #include <asm/arch-tegra/scu.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 #include "cpu.h"
 
 int get_num_cpus(void)
diff --git a/arch/arm/mach-tegra/ivc.c b/arch/arm/mach-tegra/ivc.c
index 216673e4367..2e75b8bd059 100644
--- a/arch/arm/mach-tegra/ivc.c
+++ b/arch/arm/mach-tegra/ivc.c
@@ -10,6 +10,7 @@
 #include <linux/bug.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 #define TEGRA_IVC_ALIGN 64
 
diff --git a/arch/arm/mach-tegra/pinmux-common.c b/arch/arm/mach-tegra/pinmux-common.c
index 64c397fa497..67645261907 100644
--- a/arch/arm/mach-tegra/pinmux-common.c
+++ b/arch/arm/mach-tegra/pinmux-common.c
@@ -9,6 +9,7 @@
 #include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/pinmux.h>
+#include <asm/types.h>
 
 /* return 1 if a pingrp is in range */
 #define pmux_pingrp_isvalid(pin) (((pin) >= 0) && ((pin) < PMUX_PINGRP_COUNT))
diff --git a/arch/arm/mach-tegra/pmc.c b/arch/arm/mach-tegra/pmc.c
index f4747484f29..225ff46d660 100644
--- a/arch/arm/mach-tegra/pmc.c
+++ b/arch/arm/mach-tegra/pmc.c
@@ -9,6 +9,7 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <linux/types.h>
 
 #include <linux/arm-smccc.h>
 
diff --git a/arch/arm/mach-tegra/spl.c b/arch/arm/mach-tegra/spl.c
index ed897efc5f0..15e8031efe1 100644
--- a/arch/arm/mach-tegra/spl.c
+++ b/arch/arm/mach-tegra/spl.c
@@ -9,6 +9,7 @@
 #include <debug_uart.h>
 #include <log.h>
 #include <spl.h>
+#include <asm/types.h>
 
 #include <asm/io.h>
 #include <asm/arch/clock.h>
diff --git a/arch/arm/mach-tegra/tegra114/clock.c b/arch/arm/mach-tegra/tegra114/clock.c
index 53d958e82dd..10265cc5737 100644
--- a/arch/arm/mach-tegra/tegra114/clock.c
+++ b/arch/arm/mach-tegra/tegra114/clock.c
@@ -19,6 +19,7 @@
 #include <div64.h>
 #include <fdtdec.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 /*
  * Clock types that we can use as a source. The Tegra114 has muxes for the
diff --git a/arch/arm/mach-tegra/tegra114/cpu.c b/arch/arm/mach-tegra/tegra114/cpu.c
index 7e529130ad5..04c11747ea9 100644
--- a/arch/arm/mach-tegra/tegra114/cpu.c
+++ b/arch/arm/mach-tegra/tegra114/cpu.c
@@ -14,6 +14,7 @@
 #include <asm/arch/tegra.h>
 #include <asm/arch-tegra/clk_rst.h>
 #include <asm/arch-tegra/pmc.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include "../cpu.h"
 
diff --git a/arch/arm/mach-tegra/tegra124/clock.c b/arch/arm/mach-tegra/tegra124/clock.c
index edca9c3fdc3..6ae99246965 100644
--- a/arch/arm/mach-tegra/tegra124/clock.c
+++ b/arch/arm/mach-tegra/tegra124/clock.c
@@ -20,6 +20,7 @@
 #include <div64.h>
 #include <fdtdec.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 /*
  * Clock types that we can use as a source. The Tegra124 has muxes for the
diff --git a/arch/arm/mach-tegra/tegra124/cpu.c b/arch/arm/mach-tegra/tegra124/cpu.c
index 2fce060037a..0adc4ccb233 100644
--- a/arch/arm/mach-tegra/tegra124/cpu.c
+++ b/arch/arm/mach-tegra/tegra124/cpu.c
@@ -16,6 +16,7 @@
 #include <asm/arch-tegra/clk_rst.h>
 #include <asm/arch-tegra/pmc.h>
 #include <asm/arch-tegra/ap.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include "../cpu.h"
 
diff --git a/arch/arm/mach-tegra/tegra124/psci.c b/arch/arm/mach-tegra/tegra124/psci.c
index ab102a62261..98e556b3169 100644
--- a/arch/arm/mach-tegra/tegra124/psci.c
+++ b/arch/arm/mach-tegra/tegra124/psci.c
@@ -11,6 +11,7 @@
 #include <asm/arch/powergate.h>
 #include <asm/arch-tegra/ap.h>
 #include <asm/arch-tegra/pmc.h>
+#include <asm/types.h>
 
 static void park_cpu(void)
 {
diff --git a/arch/arm/mach-tegra/tegra124/xusb-padctl.c b/arch/arm/mach-tegra/tegra124/xusb-padctl.c
index 52398eba3fa..a4b7b1e25ed 100644
--- a/arch/arm/mach-tegra/tegra124/xusb-padctl.c
+++ b/arch/arm/mach-tegra/tegra124/xusb-padctl.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <time.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <dm/of_access.h>
 #include <dm/ofnode.h>
 #include <linux/delay.h>
diff --git a/arch/arm/mach-tegra/tegra20/clock.c b/arch/arm/mach-tegra/tegra20/clock.c
index c8db06cf66c..2bc7f9338ee 100644
--- a/arch/arm/mach-tegra/tegra20/clock.c
+++ b/arch/arm/mach-tegra/tegra20/clock.c
@@ -22,6 +22,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 /*
  * Clock types that we can use as a source. The Tegra20 has muxes for the
diff --git a/arch/arm/mach-tegra/tegra20/cpu.c b/arch/arm/mach-tegra/tegra20/cpu.c
index e5b60598f7f..9d182acc45f 100644
--- a/arch/arm/mach-tegra/tegra20/cpu.c
+++ b/arch/arm/mach-tegra/tegra20/cpu.c
@@ -7,6 +7,7 @@
 #include <asm/io.h>
 #include <asm/arch/tegra.h>
 #include <asm/arch-tegra/pmc.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include "../cpu.h"
 
diff --git a/arch/arm/mach-tegra/tegra20/crypto.c b/arch/arm/mach-tegra/tegra20/crypto.c
index 1efaa5c3ecd..e151daa2b27 100644
--- a/arch/arm/mach-tegra/tegra20/crypto.c
+++ b/arch/arm/mach-tegra/tegra20/crypto.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include "crypto.h"
 #include "uboot_aes.h"
diff --git a/arch/arm/mach-tegra/tegra20/crypto.h b/arch/arm/mach-tegra/tegra20/crypto.h
index a773d03fc74..ecd11272c58 100644
--- a/arch/arm/mach-tegra/tegra20/crypto.h
+++ b/arch/arm/mach-tegra/tegra20/crypto.h
@@ -14,6 +14,7 @@
  * \param length	Size of source data
  * \param signature	Destination address for signature, AES_KEY_LENGTH bytes
  */
+#include <asm/types.h>
 int sign_data_block(u8 *source, unsigned length, u8 *signature);
 
 #endif /* #ifndef _CRYPTO_H_ */
diff --git a/arch/arm/mach-tegra/tegra20/emc.c b/arch/arm/mach-tegra/tegra20/emc.c
index 58abf790bd1..116393fcc06 100644
--- a/arch/arm/mach-tegra/tegra20/emc.c
+++ b/arch/arm/mach-tegra/tegra20/emc.c
@@ -13,6 +13,7 @@
 #include <asm/arch/emc.h>
 #include <asm/arch/tegra.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /*
  * The EMC registers have shadow registers.  When the EMC clock is updated
diff --git a/arch/arm/mach-tegra/tegra20/warmboot.c b/arch/arm/mach-tegra/tegra20/warmboot.c
index f0050a4f821..404b93dffd3 100644
--- a/arch/arm/mach-tegra/tegra20/warmboot.c
+++ b/arch/arm/mach-tegra/tegra20/warmboot.c
@@ -8,6 +8,7 @@
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/emc.h>
diff --git a/arch/arm/mach-tegra/tegra20/warmboot_avp.c b/arch/arm/mach-tegra/tegra20/warmboot_avp.c
index be801d108e3..10ed02bd32f 100644
--- a/arch/arm/mach-tegra/tegra20/warmboot_avp.c
+++ b/arch/arm/mach-tegra/tegra20/warmboot_avp.c
@@ -15,6 +15,7 @@
 #include <asm/arch-tegra/clk_rst.h>
 #include <asm/arch-tegra/pmc.h>
 #include <asm/arch-tegra/warmboot.h>
+#include <asm/types.h>
 #include "warmboot_avp.h"
 
 #define DEBUG_RESET_CORESIGHT
diff --git a/arch/arm/mach-tegra/tegra210/clock.c b/arch/arm/mach-tegra/tegra210/clock.c
index 48f7e354108..5597016b8d3 100644
--- a/arch/arm/mach-tegra/tegra210/clock.c
+++ b/arch/arm/mach-tegra/tegra210/clock.c
@@ -24,6 +24,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 /*
  * Clock types that we can use as a source. The Tegra210 has muxes for the
diff --git a/arch/arm/mach-tegra/tegra210/xusb-padctl.c b/arch/arm/mach-tegra/tegra210/xusb-padctl.c
index 78cea2b9193..9b4bff7c97e 100644
--- a/arch/arm/mach-tegra/tegra210/xusb-padctl.c
+++ b/arch/arm/mach-tegra/tegra210/xusb-padctl.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <time.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <dm/of_access.h>
 #include <dm/ofnode.h>
 #include <linux/delay.h>
diff --git a/arch/arm/mach-tegra/tegra30/clock.c b/arch/arm/mach-tegra/tegra30/clock.c
index b35f02eedd4..a256a068625 100644
--- a/arch/arm/mach-tegra/tegra30/clock.c
+++ b/arch/arm/mach-tegra/tegra30/clock.c
@@ -21,6 +21,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 /*
  * Clock types that we can use as a source. The Tegra30 has muxes for the
diff --git a/arch/arm/mach-tegra/tegra30/cpu.c b/arch/arm/mach-tegra/tegra30/cpu.c
index 651edd27ee8..bb2e711d63e 100644
--- a/arch/arm/mach-tegra/tegra30/cpu.c
+++ b/arch/arm/mach-tegra/tegra30/cpu.c
@@ -13,6 +13,7 @@
 #include <asm/arch-tegra/pmc.h>
 #include <asm/arch-tegra/tegra_i2c.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 #include "../cpu.h"
 
 /* Tegra30-specific CPU init code */
diff --git a/arch/arm/mach-tegra/xusb-padctl-common.c b/arch/arm/mach-tegra/xusb-padctl-common.c
index 94a271311ce..d22f1d48759 100644
--- a/arch/arm/mach-tegra/xusb-padctl-common.c
+++ b/arch/arm/mach-tegra/xusb-padctl-common.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <errno.h>
 #include <log.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
diff --git a/arch/arm/mach-tegra/xusb-padctl-common.h b/arch/arm/mach-tegra/xusb-padctl-common.h
index e3fd613f2be..1899f5aee5d 100644
--- a/arch/arm/mach-tegra/xusb-padctl-common.h
+++ b/arch/arm/mach-tegra/xusb-padctl-common.h
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <fdtdec.h>
+#include <asm/types.h>
 #include <dm/ofnode.h>
 
 #include <asm/io.h>
diff --git a/arch/arm/mach-u8500/cpuinfo.c b/arch/arm/mach-u8500/cpuinfo.c
index bc3fd036035..9c386005aad 100644
--- a/arch/arm/mach-u8500/cpuinfo.c
+++ b/arch/arm/mach-u8500/cpuinfo.c
@@ -7,6 +7,7 @@
 #include <init.h>
 #include <stdio.h>
 #include <asm/io.h>
+#include <asm/types.h>
 
 #define U8500_BOOTROM_BASE	0x90000000
 #define U8500_ASIC_ID_LOC_V2	(U8500_BOOTROM_BASE + 0x1DBF4)
diff --git a/arch/arm/mach-uniphier/arm32/cache-uniphier.c b/arch/arm/mach-uniphier/arm32/cache-uniphier.c
index cde2a8124fe..78b1ad98adf 100644
--- a/arch/arm/mach-uniphier/arm32/cache-uniphier.c
+++ b/arch/arm/mach-uniphier/arm32/cache-uniphier.c
@@ -5,7 +5,9 @@
  *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  */
 
+#include <compiler.h>
 #include <cpu_func.h>
+#include <asm/types.h>
 #include <linux/io.h>
 #include <linux/kernel.h>
 #include <asm/armv7.h>
diff --git a/arch/arm/mach-uniphier/arm32/psci.c b/arch/arm/mach-uniphier/arm32/psci.c
index a4d260aeced..e099c91bb6a 100644
--- a/arch/arm/mach-uniphier/arm32/psci.c
+++ b/arch/arm/mach-uniphier/arm32/psci.c
@@ -16,6 +16,7 @@
 #include <asm/psci.h>
 #include <asm/secure.h>
 #include <asm/system.h>
+#include <linux/types.h>
 
 #include "../debug.h"
 #include "../soc-info.h"
diff --git a/arch/arm/mach-uniphier/base-address.c b/arch/arm/mach-uniphier/base-address.c
index 1ba55eb7ebb..344209f63da 100644
--- a/arch/arm/mach-uniphier/base-address.c
+++ b/arch/arm/mach-uniphier/base-address.c
@@ -3,6 +3,7 @@
 // Copyright (C) 2019 Socionext Inc.
 //   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
 
+#include <compiler.h>
 #include <dm/of.h>
 #include <fdt_support.h>
 #include <linux/errno.h>
diff --git a/arch/arm/mach-uniphier/board_init.c b/arch/arm/mach-uniphier/board_init.c
index b112b4c8cad..2cc9c539e8e 100644
--- a/arch/arm/mach-uniphier/board_init.c
+++ b/arch/arm/mach-uniphier/board_init.c
@@ -5,6 +5,7 @@
  *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  */
 
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <linux/io.h>
diff --git a/arch/arm/mach-uniphier/boot-device/boot-device-ld11.c b/arch/arm/mach-uniphier/boot-device/boot-device-ld11.c
index 4689ed79fdc..85539ea4aa6 100644
--- a/arch/arm/mach-uniphier/boot-device/boot-device-ld11.c
+++ b/arch/arm/mach-uniphier/boot-device/boot-device-ld11.c
@@ -5,6 +5,7 @@
  */
 
 #include <spl.h>
+#include <asm/types.h>
 #include <linux/io.h>
 #include <linux/kernel.h>
 
diff --git a/arch/arm/mach-uniphier/boot-device/boot-device-pxs2.c b/arch/arm/mach-uniphier/boot-device/boot-device-pxs2.c
index 677470cdc64..e0724021b91 100644
--- a/arch/arm/mach-uniphier/boot-device/boot-device-pxs2.c
+++ b/arch/arm/mach-uniphier/boot-device/boot-device-pxs2.c
@@ -5,6 +5,7 @@
  */
 
 #include <spl.h>
+#include <asm/types.h>
 #include <linux/io.h>
 #include <linux/kernel.h>
 
diff --git a/arch/arm/mach-uniphier/boot-device/boot-device-pxs3.c b/arch/arm/mach-uniphier/boot-device/boot-device-pxs3.c
index 68880993127..9076f55039c 100644
--- a/arch/arm/mach-uniphier/boot-device/boot-device-pxs3.c
+++ b/arch/arm/mach-uniphier/boot-device/boot-device-pxs3.c
@@ -5,6 +5,7 @@
  */
 
 #include <spl.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/io.h>
 #include <linux/kernel.h>
diff --git a/arch/arm/mach-uniphier/boot-device/boot-device.c b/arch/arm/mach-uniphier/boot-device/boot-device.c
index 1e6bc8433f7..fc7404e1f3e 100644
--- a/arch/arm/mach-uniphier/boot-device/boot-device.c
+++ b/arch/arm/mach-uniphier/boot-device/boot-device.c
@@ -6,7 +6,9 @@
 
 #include <command.h>
 #include <spl.h>
+#include <stdbool.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/bug.h>
 #include <linux/errno.h>
diff --git a/arch/arm/mach-uniphier/boot-device/boot-device.h b/arch/arm/mach-uniphier/boot-device/boot-device.h
index bbb634316b3..43ec1094760 100644
--- a/arch/arm/mach-uniphier/boot-device/boot-device.h
+++ b/arch/arm/mach-uniphier/boot-device/boot-device.h
@@ -7,6 +7,7 @@
 #ifndef _UNIPHIER_BOOT_DEVICE_H_
 #define _UNIPHIER_BOOT_DEVICE_H_
 
+#include <asm/types.h>
 struct uniphier_boot_device {
 	unsigned int boot_device;
 	const char *desc;
diff --git a/arch/arm/mach-uniphier/clk/clk-dram-ld4.c b/arch/arm/mach-uniphier/clk/clk-dram-ld4.c
index 3b721eaf234..004a32f29a8 100644
--- a/arch/arm/mach-uniphier/clk/clk-dram-ld4.c
+++ b/arch/arm/mach-uniphier/clk/clk-dram-ld4.c
@@ -5,6 +5,7 @@
  */
 
 #include <spl.h>
+#include <asm/types.h>
 #include <linux/io.h>
 
 #include "../init.h"
diff --git a/arch/arm/mach-uniphier/clk/clk-dram-pro5.c b/arch/arm/mach-uniphier/clk/clk-dram-pro5.c
index 808d1ebfe19..43e215d3ded 100644
--- a/arch/arm/mach-uniphier/clk/clk-dram-pro5.c
+++ b/arch/arm/mach-uniphier/clk/clk-dram-pro5.c
@@ -3,6 +3,7 @@
  * Copyright (C) 2015-2017 Socionext Inc.
  */
 
+#include <asm/types.h>
 #include <linux/io.h>
 
 #include "../init.h"
diff --git a/arch/arm/mach-uniphier/clk/clk-dram-pxs2.c b/arch/arm/mach-uniphier/clk/clk-dram-pxs2.c
index 75d3e70d6aa..27629be7656 100644
--- a/arch/arm/mach-uniphier/clk/clk-dram-pxs2.c
+++ b/arch/arm/mach-uniphier/clk/clk-dram-pxs2.c
@@ -4,6 +4,7 @@
  */
 
 #include <spl.h>
+#include <asm/types.h>
 #include <linux/io.h>
 
 #include "../init.h"
diff --git a/arch/arm/mach-uniphier/clk/clk-early-ld4.c b/arch/arm/mach-uniphier/clk/clk-early-ld4.c
index 25b72d8926c..1ba584d09be 100644
--- a/arch/arm/mach-uniphier/clk/clk-early-ld4.c
+++ b/arch/arm/mach-uniphier/clk/clk-early-ld4.c
@@ -5,6 +5,7 @@
  */
 
 #include <spl.h>
+#include <asm/types.h>
 #include <linux/io.h>
 
 #include "../init.h"
diff --git a/arch/arm/mach-uniphier/clk/clk-ld11.c b/arch/arm/mach-uniphier/clk/clk-ld11.c
index d241a65382f..cf2205c9a1f 100644
--- a/arch/arm/mach-uniphier/clk/clk-ld11.c
+++ b/arch/arm/mach-uniphier/clk/clk-ld11.c
@@ -3,6 +3,7 @@
  * Copyright (C) 2016 Socionext Inc.
  */
 
+#include <compiler.h>
 #include <spl.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/arch/arm/mach-uniphier/clk/clk-ld20.c b/arch/arm/mach-uniphier/clk/clk-ld20.c
index 397b2d7384f..1d077dd0f1d 100644
--- a/arch/arm/mach-uniphier/clk/clk-ld20.c
+++ b/arch/arm/mach-uniphier/clk/clk-ld20.c
@@ -3,6 +3,7 @@
  * Copyright (C) 2017 Socionext Inc.
  */
 
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/io.h>
 
diff --git a/arch/arm/mach-uniphier/clk/clk-pro4.c b/arch/arm/mach-uniphier/clk/clk-pro4.c
index 798128b3024..34d6d90fe68 100644
--- a/arch/arm/mach-uniphier/clk/clk-pro4.c
+++ b/arch/arm/mach-uniphier/clk/clk-pro4.c
@@ -5,6 +5,7 @@
  *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  */
 
+#include <asm/types.h>
 #include <linux/io.h>
 
 #include "../init.h"
diff --git a/arch/arm/mach-uniphier/clk/clk-pro5.c b/arch/arm/mach-uniphier/clk/clk-pro5.c
index 36006fd256c..821689b12db 100644
--- a/arch/arm/mach-uniphier/clk/clk-pro5.c
+++ b/arch/arm/mach-uniphier/clk/clk-pro5.c
@@ -3,6 +3,7 @@
  * Copyright (C) 2015 Masahiro Yamada <yamada.masahiro@socionext.com>
  */
 
+#include <asm/types.h>
 #include <linux/io.h>
 
 #include "../init.h"
diff --git a/arch/arm/mach-uniphier/clk/clk-pxs2.c b/arch/arm/mach-uniphier/clk/clk-pxs2.c
index c2a75ce0001..e1b867ac3b0 100644
--- a/arch/arm/mach-uniphier/clk/clk-pxs2.c
+++ b/arch/arm/mach-uniphier/clk/clk-pxs2.c
@@ -3,6 +3,7 @@
  * Copyright (C) 2015 Masahiro Yamada <yamada.masahiro@socionext.com>
  */
 
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/io.h>
 
diff --git a/arch/arm/mach-uniphier/clk/clk-pxs3.c b/arch/arm/mach-uniphier/clk/clk-pxs3.c
index 33b9c5b73d1..0d6f6a5c666 100644
--- a/arch/arm/mach-uniphier/clk/clk-pxs3.c
+++ b/arch/arm/mach-uniphier/clk/clk-pxs3.c
@@ -3,6 +3,7 @@
  * Copyright (C) 2017 Socionext Inc.
  */
 
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/io.h>
 
diff --git a/arch/arm/mach-uniphier/clk/dpll-ld4.c b/arch/arm/mach-uniphier/clk/dpll-ld4.c
index fcdd2fddab3..082eeea9c67 100644
--- a/arch/arm/mach-uniphier/clk/dpll-ld4.c
+++ b/arch/arm/mach-uniphier/clk/dpll-ld4.c
@@ -4,6 +4,7 @@
  * Copyright (C) 2015-2016 Socionext Inc.
  */
 
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/arch/arm/mach-uniphier/clk/dpll-pro4.c b/arch/arm/mach-uniphier/clk/dpll-pro4.c
index b5ba17af136..4d38440d397 100644
--- a/arch/arm/mach-uniphier/clk/dpll-pro4.c
+++ b/arch/arm/mach-uniphier/clk/dpll-pro4.c
@@ -4,6 +4,7 @@
  * Copyright (C) 2015-2016 Socionext Inc.
  */
 
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/arch/arm/mach-uniphier/clk/dpll-sld8.c b/arch/arm/mach-uniphier/clk/dpll-sld8.c
index 1ac52d11f34..526b1c4cbbd 100644
--- a/arch/arm/mach-uniphier/clk/dpll-sld8.c
+++ b/arch/arm/mach-uniphier/clk/dpll-sld8.c
@@ -4,6 +4,7 @@
  * Copyright (C) 2015-2016 Socionext Inc.
  */
 
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/io.h>
 
diff --git a/arch/arm/mach-uniphier/clk/dpll-tail.c b/arch/arm/mach-uniphier/clk/dpll-tail.c
index 6ba5a367274..ac99313e8c0 100644
--- a/arch/arm/mach-uniphier/clk/dpll-tail.c
+++ b/arch/arm/mach-uniphier/clk/dpll-tail.c
@@ -5,6 +5,7 @@
  *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  */
 
+#include <asm/types.h>
 #include <linux/io.h>
 
 #include "../sc-regs.h"
diff --git a/arch/arm/mach-uniphier/clk/pll-base-ld20.c b/arch/arm/mach-uniphier/clk/pll-base-ld20.c
index ea96d739c53..8b5b53da439 100644
--- a/arch/arm/mach-uniphier/clk/pll-base-ld20.c
+++ b/arch/arm/mach-uniphier/clk/pll-base-ld20.c
@@ -4,6 +4,8 @@
  *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  */
 
+#include <compiler.h>
+#include <asm/types.h>
 #include <linux/bitfield.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/arch/arm/mach-uniphier/clk/pll-ld4.c b/arch/arm/mach-uniphier/clk/pll-ld4.c
index c66031bdd05..91eab0d0565 100644
--- a/arch/arm/mach-uniphier/clk/pll-ld4.c
+++ b/arch/arm/mach-uniphier/clk/pll-ld4.c
@@ -4,6 +4,7 @@
  * Copyright (C) 2015-2016 Socionext Inc.
  */
 
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/io.h>
 
diff --git a/arch/arm/mach-uniphier/clk/pll-pro4.c b/arch/arm/mach-uniphier/clk/pll-pro4.c
index b7dc3e261f8..4b27bead1cf 100644
--- a/arch/arm/mach-uniphier/clk/pll-pro4.c
+++ b/arch/arm/mach-uniphier/clk/pll-pro4.c
@@ -4,6 +4,7 @@
  * Copyright (C) 2015-2016 Socionext Inc.
  */
 
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/io.h>
 
diff --git a/arch/arm/mach-uniphier/debug-uart/debug-uart-ld6b.c b/arch/arm/mach-uniphier/debug-uart/debug-uart-ld6b.c
index f64ff39c9e6..77b6143b8d3 100644
--- a/arch/arm/mach-uniphier/debug-uart/debug-uart-ld6b.c
+++ b/arch/arm/mach-uniphier/debug-uart/debug-uart-ld6b.c
@@ -4,6 +4,7 @@
  */
 
 #include <config.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 #include <linux/io.h>
 
diff --git a/arch/arm/mach-uniphier/debug-uart/debug-uart-pro4.c b/arch/arm/mach-uniphier/debug-uart/debug-uart-pro4.c
index 79c6c101e22..66a0d3226e4 100644
--- a/arch/arm/mach-uniphier/debug-uart/debug-uart-pro4.c
+++ b/arch/arm/mach-uniphier/debug-uart/debug-uart-pro4.c
@@ -4,6 +4,7 @@
  */
 
 #include <config.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 #include <linux/io.h>
 
diff --git a/arch/arm/mach-uniphier/debug-uart/debug-uart-pro5.c b/arch/arm/mach-uniphier/debug-uart/debug-uart-pro5.c
index ef3b383ee43..347e91871a2 100644
--- a/arch/arm/mach-uniphier/debug-uart/debug-uart-pro5.c
+++ b/arch/arm/mach-uniphier/debug-uart/debug-uart-pro5.c
@@ -4,6 +4,7 @@
  */
 
 #include <config.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 #include <linux/io.h>
 
diff --git a/arch/arm/mach-uniphier/debug-uart/debug-uart-pxs2.c b/arch/arm/mach-uniphier/debug-uart/debug-uart-pxs2.c
index ee8caad1d45..5a6674e5cbb 100644
--- a/arch/arm/mach-uniphier/debug-uart/debug-uart-pxs2.c
+++ b/arch/arm/mach-uniphier/debug-uart/debug-uart-pxs2.c
@@ -4,6 +4,7 @@
  */
 
 #include <config.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 #include <linux/io.h>
 
diff --git a/arch/arm/mach-uniphier/debug-uart/debug-uart.c b/arch/arm/mach-uniphier/debug-uart/debug-uart.c
index d116d46812d..cbe61e614a4 100644
--- a/arch/arm/mach-uniphier/debug-uart/debug-uart.c
+++ b/arch/arm/mach-uniphier/debug-uart/debug-uart.c
@@ -3,7 +3,9 @@
  * Copyright (C) 2016 Masahiro Yamada <yamada.masahiro@socionext.com>
  */
 
+#include <compiler.h>
 #include <debug_uart.h>
+#include <asm/types.h>
 #include <linux/io.h>
 #include <linux/serial_reg.h>
 
diff --git a/arch/arm/mach-uniphier/debug.h b/arch/arm/mach-uniphier/debug.h
index 466dc9b03bf..7f699fdb6c7 100644
--- a/arch/arm/mach-uniphier/debug.h
+++ b/arch/arm/mach-uniphier/debug.h
@@ -7,6 +7,7 @@
 #ifndef __DEBUG_H__
 #define __DEBUG_H__
 
+#include <compiler.h>
 #include <linux/io.h>
 #include <linux/serial_reg.h>
 
diff --git a/arch/arm/mach-uniphier/dram/cmd_ddrmphy.c b/arch/arm/mach-uniphier/dram/cmd_ddrmphy.c
index be4ce3265bb..d36bc4834b5 100644
--- a/arch/arm/mach-uniphier/dram/cmd_ddrmphy.c
+++ b/arch/arm/mach-uniphier/dram/cmd_ddrmphy.c
@@ -5,11 +5,13 @@
  */
 
 #include <command.h>
+#include <compiler.h>
 #include <stdio.h>
 #include <linux/io.h>
 #include <linux/printk.h>
 #include <linux/sizes.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "../soc-info.h"
 #include "ddrmphy-regs.h"
diff --git a/arch/arm/mach-uniphier/dram/cmd_ddrphy.c b/arch/arm/mach-uniphier/dram/cmd_ddrphy.c
index 3ccafe20638..0d4f88327c8 100644
--- a/arch/arm/mach-uniphier/dram/cmd_ddrphy.c
+++ b/arch/arm/mach-uniphier/dram/cmd_ddrphy.c
@@ -6,11 +6,13 @@
  */
 
 #include <command.h>
+#include <compiler.h>
 #include <stdio.h>
 #include <linux/io.h>
 #include <linux/printk.h>
 #include <linux/sizes.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "../soc-info.h"
 #include "ddrphy-regs.h"
diff --git a/arch/arm/mach-uniphier/dram/ddrphy-ld4.c b/arch/arm/mach-uniphier/dram/ddrphy-ld4.c
index 747bc64403d..a5ee11da47d 100644
--- a/arch/arm/mach-uniphier/dram/ddrphy-ld4.c
+++ b/arch/arm/mach-uniphier/dram/ddrphy-ld4.c
@@ -4,7 +4,9 @@
  * Copyright (C) 2015-2016 Socionext Inc.
  */
 
+#include <compiler.h>
 #include <stdbool.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/io.h>
diff --git a/arch/arm/mach-uniphier/dram/ddrphy-training.c b/arch/arm/mach-uniphier/dram/ddrphy-training.c
index 1decdf1cbff..afe70f00bb1 100644
--- a/arch/arm/mach-uniphier/dram/ddrphy-training.c
+++ b/arch/arm/mach-uniphier/dram/ddrphy-training.c
@@ -4,6 +4,7 @@
  * Copyright (C) 2015-2016 Socionext Inc.
  */
 
+#include <compiler.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
@@ -11,6 +12,7 @@
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <time.h>
+#include <linux/types.h>
 
 #include "ddrphy-init.h"
 #include "ddrphy-regs.h"
diff --git a/arch/arm/mach-uniphier/dram/umc-ld4.c b/arch/arm/mach-uniphier/dram/umc-ld4.c
index 5b840aa0ea1..ad493df603e 100644
--- a/arch/arm/mach-uniphier/dram/umc-ld4.c
+++ b/arch/arm/mach-uniphier/dram/umc-ld4.c
@@ -5,7 +5,9 @@
  *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  */
 
+#include <compiler.h>
 #include <stdbool.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <linux/io.h>
diff --git a/arch/arm/mach-uniphier/dram/umc-pro4.c b/arch/arm/mach-uniphier/dram/umc-pro4.c
index e1a98e59c05..e4e7fae9ba2 100644
--- a/arch/arm/mach-uniphier/dram/umc-pro4.c
+++ b/arch/arm/mach-uniphier/dram/umc-pro4.c
@@ -5,7 +5,9 @@
  *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  */
 
+#include <compiler.h>
 #include <stdbool.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <linux/io.h>
diff --git a/arch/arm/mach-uniphier/dram/umc-pxs2.c b/arch/arm/mach-uniphier/dram/umc-pxs2.c
index 0af7ea38621..733550a1b61 100644
--- a/arch/arm/mach-uniphier/dram/umc-pxs2.c
+++ b/arch/arm/mach-uniphier/dram/umc-pxs2.c
@@ -7,6 +7,8 @@
  * Copyright (C) 2015 Socionext Inc.
  */
 
+#include <compiler.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/arch/arm/mach-uniphier/dram/umc-sld8.c b/arch/arm/mach-uniphier/dram/umc-sld8.c
index 28b366ebdea..60ea309e964 100644
--- a/arch/arm/mach-uniphier/dram/umc-sld8.c
+++ b/arch/arm/mach-uniphier/dram/umc-sld8.c
@@ -5,7 +5,9 @@
  *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  */
 
+#include <compiler.h>
 #include <stdbool.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <linux/io.h>
diff --git a/arch/arm/mach-uniphier/dram_init.c b/arch/arm/mach-uniphier/dram_init.c
index 7f2753190c2..b71ba75d33c 100644
--- a/arch/arm/mach-uniphier/dram_init.c
+++ b/arch/arm/mach-uniphier/dram_init.c
@@ -6,6 +6,8 @@
  */
 
 #include <init.h>
+#include <stdbool.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/kernel.h>
diff --git a/arch/arm/mach-uniphier/memconf.c b/arch/arm/mach-uniphier/memconf.c
index 7a79340a92c..7fd798445b7 100644
--- a/arch/arm/mach-uniphier/memconf.c
+++ b/arch/arm/mach-uniphier/memconf.c
@@ -5,6 +5,7 @@
  *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  */
 
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <linux/io.h>
diff --git a/arch/arm/mach-uniphier/micro-support-card.c b/arch/arm/mach-uniphier/micro-support-card.c
index 07ce46bd9dd..7d2e08fd6eb 100644
--- a/arch/arm/mach-uniphier/micro-support-card.c
+++ b/arch/arm/mach-uniphier/micro-support-card.c
@@ -5,10 +5,12 @@
  *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  */
 
+#include <compiler.h>
 #include <dm.h>
 #include <fdt_support.h>
 #include <stdbool.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/ctype.h>
 #include <linux/delay.h>
 #include <linux/io.h>
diff --git a/arch/arm/mach-uniphier/mmc-boot-mode.c b/arch/arm/mach-uniphier/mmc-boot-mode.c
index e47e5df6480..264a3c2a00c 100644
--- a/arch/arm/mach-uniphier/mmc-boot-mode.c
+++ b/arch/arm/mach-uniphier/mmc-boot-mode.c
@@ -6,6 +6,7 @@
 
 #include <mmc.h>
 #include <spl.h>
+#include <asm/types.h>
 
 u32 spl_mmc_boot_mode(const u32 boot_device)
 {
diff --git a/arch/arm/mach-uniphier/reset.c b/arch/arm/mach-uniphier/reset.c
index 5fffd23e9a5..a065935af32 100644
--- a/arch/arm/mach-uniphier/reset.c
+++ b/arch/arm/mach-uniphier/reset.c
@@ -6,6 +6,7 @@
  */
 
 #include <cpu_func.h>
+#include <asm/types.h>
 #include <linux/io.h>
 #include <asm/secure.h>
 
diff --git a/arch/arm/mach-uniphier/sc-regs.h b/arch/arm/mach-uniphier/sc-regs.h
index e43116e064b..c6ce432c597 100644
--- a/arch/arm/mach-uniphier/sc-regs.h
+++ b/arch/arm/mach-uniphier/sc-regs.h
@@ -11,6 +11,7 @@
 #define ARCH_SC_REGS_H
 
 #ifndef __ASSEMBLY__
+#include <compiler.h>
 #include <linux/compiler.h>
 #define sc_base			((void __iomem *)SC_BASE)
 #endif
diff --git a/arch/arm/mach-uniphier/sc64-regs.h b/arch/arm/mach-uniphier/sc64-regs.h
index fdcca232b61..ee34465aa48 100644
--- a/arch/arm/mach-uniphier/sc64-regs.h
+++ b/arch/arm/mach-uniphier/sc64-regs.h
@@ -10,6 +10,7 @@
 #define SC64_REGS_H
 
 #ifndef __ASSEMBLY__
+#include <compiler.h>
 #include <linux/compiler.h>
 extern void __iomem *sc_base;
 #endif
diff --git a/arch/arm/mach-uniphier/sg-regs.h b/arch/arm/mach-uniphier/sg-regs.h
index f47d1019498..7a876bcbfe7 100644
--- a/arch/arm/mach-uniphier/sg-regs.h
+++ b/arch/arm/mach-uniphier/sg-regs.h
@@ -11,6 +11,7 @@
 #define UNIPHIER_SG_REGS_H
 
 #ifndef __ASSEMBLY__
+#include <compiler.h>
 #include <linux/compiler.h>
 #ifdef CONFIG_ARCH_UNIPHIER_V8_MULTI
 extern void __iomem *sg_base;
diff --git a/arch/arm/mach-versal/include/mach/hardware.h b/arch/arm/mach-versal/include/mach/hardware.h
index 9af5afd3f3f..64b858e79db 100644
--- a/arch/arm/mach-versal/include/mach/hardware.h
+++ b/arch/arm/mach-versal/include/mach/hardware.h
@@ -4,6 +4,7 @@
  */
 
 #ifndef __ASSEMBLY__
+#include <asm/types.h>
 #include <linux/bitops.h>
 #endif
 
diff --git a/arch/arm/mach-versal/include/mach/sys_proto.h b/arch/arm/mach-versal/include/mach/sys_proto.h
index 31af049a21c..1f4dc80d8fd 100644
--- a/arch/arm/mach-versal/include/mach/sys_proto.h
+++ b/arch/arm/mach-versal/include/mach/sys_proto.h
@@ -3,6 +3,7 @@
  * Copyright 2016 - 2018 Xilinx, Inc.
  */
 
+#include <asm/types.h>
 enum {
 	TCM_LOCK,
 	TCM_SPLIT,
diff --git a/arch/arm/mach-versal/mp.c b/arch/arm/mach-versal/mp.c
index 001c3e9518a..0eada1838d4 100644
--- a/arch/arm/mach-versal/mp.c
+++ b/arch/arm/mach-versal/mp.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/types.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-versatile/timer.c b/arch/arm/mach-versatile/timer.c
index a0babce7baa..108a86d8919 100644
--- a/arch/arm/mach-versatile/timer.c
+++ b/arch/arm/mach-versatile/timer.c
@@ -19,6 +19,7 @@
  */
 
 #include <common.h>
+#include <linux/types.h>
 
 #define TIMER_ENABLE	(1 << 7)
 #define TIMER_MODE_MSK	(1 << 6)
diff --git a/arch/arm/mach-zynq/clk.c b/arch/arm/mach-zynq/clk.c
index 188f3803cad..401b06faf34 100644
--- a/arch/arm/mach-zynq/clk.c
+++ b/arch/arm/mach-zynq/clk.c
@@ -13,6 +13,7 @@
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-zynq/cpu.c b/arch/arm/mach-zynq/cpu.c
index d7933afee41..8c7d482a091 100644
--- a/arch/arm/mach-zynq/cpu.c
+++ b/arch/arm/mach-zynq/cpu.c
@@ -16,6 +16,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #define ZYNQ_SILICON_VER_MASK	0xF0000000
 #define ZYNQ_SILICON_VER_SHIFT	28
diff --git a/arch/arm/mach-zynq/ddrc.c b/arch/arm/mach-zynq/ddrc.c
index f601c927f1a..bca7d3d62df 100644
--- a/arch/arm/mach-zynq/ddrc.c
+++ b/arch/arm/mach-zynq/ddrc.c
@@ -9,6 +9,7 @@
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/hardware.h>
+#include <asm/types.h>
 #include <linux/string.h>
 
 #ifndef CONFIG_ZYNQ_DDRC_INIT
diff --git a/arch/arm/mach-zynq/include/mach/hardware.h b/arch/arm/mach-zynq/include/mach/hardware.h
index 89eb565c941..9b9c1e8f2dc 100644
--- a/arch/arm/mach-zynq/include/mach/hardware.h
+++ b/arch/arm/mach-zynq/include/mach/hardware.h
@@ -6,6 +6,7 @@
 #ifndef _ASM_ARCH_HARDWARE_H
 #define _ASM_ARCH_HARDWARE_H
 
+#include <asm/types.h>
 #define ZYNQ_SYS_CTRL_BASEADDR		0xF8000000
 #define ZYNQ_DEV_CFG_APB_BASEADDR	0xF8007000
 #define ZYNQ_SCU_BASEADDR		0xF8F00000
diff --git a/arch/arm/mach-zynq/include/mach/sys_proto.h b/arch/arm/mach-zynq/include/mach/sys_proto.h
index 1dc16d479ea..3451517793b 100644
--- a/arch/arm/mach-zynq/include/mach/sys_proto.h
+++ b/arch/arm/mach-zynq/include/mach/sys_proto.h
@@ -6,6 +6,7 @@
 #ifndef _SYS_PROTO_H_
 #define _SYS_PROTO_H_
 
+#include <asm/types.h>
 extern void zynq_slcr_lock(void);
 extern void zynq_slcr_unlock(void);
 extern void zynq_slcr_cpu_reset(void);
diff --git a/arch/arm/mach-zynq/ps7_spl_init.c b/arch/arm/mach-zynq/ps7_spl_init.c
index 4c38724d4d7..35314960cfa 100644
--- a/arch/arm/mach-zynq/ps7_spl_init.c
+++ b/arch/arm/mach-zynq/ps7_spl_init.c
@@ -4,6 +4,7 @@
  * (c) Copyright 2016 Topic Embedded Products.
  */
 
+#include <compiler.h>
 #include <asm/io.h>
 #include <asm/spl.h>
 #include <asm/arch/sys_proto.h>
diff --git a/arch/arm/mach-zynq/slcr.c b/arch/arm/mach-zynq/slcr.c
index 67df265ba96..30d6aee8bd1 100644
--- a/arch/arm/mach-zynq/slcr.c
+++ b/arch/arm/mach-zynq/slcr.c
@@ -8,6 +8,7 @@
 #include <malloc.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
 
diff --git a/arch/arm/mach-zynq/spl.c b/arch/arm/mach-zynq/spl.c
index 9c3ec9a0c3f..a5582083f22 100644
--- a/arch/arm/mach-zynq/spl.c
+++ b/arch/arm/mach-zynq/spl.c
@@ -13,6 +13,7 @@
 #include <asm/u-boot.h>
 #include <generated/dt.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <asm/io.h>
 #include <asm/spl.h>
diff --git a/arch/arm/mach-zynq/timer.c b/arch/arm/mach-zynq/timer.c
index 08cb4406cc3..1854ee35108 100644
--- a/arch/arm/mach-zynq/timer.c
+++ b/arch/arm/mach-zynq/timer.c
@@ -38,6 +38,7 @@
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/clk.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-zynqmp-r5/cpu.c b/arch/arm/mach-zynqmp-r5/cpu.c
index a16c2216a29..7eff158a1cf 100644
--- a/arch/arm/mach-zynqmp-r5/cpu.c
+++ b/arch/arm/mach-zynqmp-r5/cpu.c
@@ -9,6 +9,7 @@
 #include <asm/armv7_mpu.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-zynqmp/clk.c b/arch/arm/mach-zynqmp/clk.c
index 83dfd4f1bd8..122f427e59e 100644
--- a/arch/arm/mach-zynqmp/clk.c
+++ b/arch/arm/mach-zynqmp/clk.c
@@ -11,6 +11,7 @@
 #include <asm/arch/hardware.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-zynqmp/cpu.c b/arch/arm/mach-zynqmp/cpu.c
index 892cfb239a0..881080c2a9e 100644
--- a/arch/arm/mach-zynqmp/cpu.c
+++ b/arch/arm/mach-zynqmp/cpu.c
@@ -19,6 +19,7 @@
 #include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define ZYNQ_SILICON_VER_MASK	0xF000
 #define ZYNQ_SILICON_VER_SHIFT	12
diff --git a/arch/arm/mach-zynqmp/handoff.c b/arch/arm/mach-zynqmp/handoff.c
index 64e5320acc6..0318de61a79 100644
--- a/arch/arm/mach-zynqmp/handoff.c
+++ b/arch/arm/mach-zynqmp/handoff.c
@@ -9,6 +9,7 @@
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/types.h>
 
 /*
  * atfhandoffparams
diff --git a/arch/arm/mach-zynqmp/include/mach/hardware.h b/arch/arm/mach-zynqmp/include/mach/hardware.h
index c5ba42124b0..682b4e32601 100644
--- a/arch/arm/mach-zynqmp/include/mach/hardware.h
+++ b/arch/arm/mach-zynqmp/include/mach/hardware.h
@@ -8,6 +8,7 @@
 #define _ASM_ARCH_HARDWARE_H
 
 #ifndef __ASSEMBLY__
+#include <asm/types.h>
 #include <linux/bitops.h>
 #endif
 
diff --git a/arch/arm/mach-zynqmp/include/mach/sys_proto.h b/arch/arm/mach-zynqmp/include/mach/sys_proto.h
index 05c81769d63..f874db3f923 100644
--- a/arch/arm/mach-zynqmp/include/mach/sys_proto.h
+++ b/arch/arm/mach-zynqmp/include/mach/sys_proto.h
@@ -8,6 +8,7 @@
 #define _ASM_ARCH_SYS_PROTO_H
 
 #include <stdbool.h>
+#include <linux/types.h>
 #define PAYLOAD_ARG_CNT		5
 
 #define ZYNQMP_CSU_SILICON_VER_MASK	0xF
diff --git a/arch/arm/mach-zynqmp/mp.c b/arch/arm/mach-zynqmp/mp.c
index b31da25933e..258cf27323c 100644
--- a/arch/arm/mach-zynqmp/mp.c
+++ b/arch/arm/mach-zynqmp/mp.c
@@ -13,6 +13,7 @@
 #include <asm/arch/hardware.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 
diff --git a/arch/arm/mach-zynqmp/psu_spl_init.c b/arch/arm/mach-zynqmp/psu_spl_init.c
index 5c5c7d136e7..ddda997165e 100644
--- a/arch/arm/mach-zynqmp/psu_spl_init.c
+++ b/arch/arm/mach-zynqmp/psu_spl_init.c
@@ -5,8 +5,10 @@
  * Michal Simek <michal.simek@xilinx.com>
  */
 #include <common.h>
+#include <compiler.h>
 #include <asm/io.h>
 #include <asm/arch/psu_init_gpl.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 #define PSU_MASK_POLL_TIME 1100000
diff --git a/arch/arm/mach-zynqmp/spl.c b/arch/arm/mach-zynqmp/spl.c
index e8c2ae57774..8817dd4ae97 100644
--- a/arch/arm/mach-zynqmp/spl.c
+++ b/arch/arm/mach-zynqmp/spl.c
@@ -13,6 +13,7 @@
 #include <stdio.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 #include <asm/io.h>
 #include <asm/spl.h>
diff --git a/arch/m68k/cpu/mcf5227x/cpu.c b/arch/m68k/cpu/mcf5227x/cpu.c
index e4c7041c421..b9a6cd51cbf 100644
--- a/arch/m68k/cpu/mcf5227x/cpu.c
+++ b/arch/m68k/cpu/mcf5227x/cpu.c
@@ -15,6 +15,7 @@
 #include <watchdog.h>
 #include <command.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 #include <asm/immap.h>
diff --git a/arch/m68k/cpu/mcf5227x/speed.c b/arch/m68k/cpu/mcf5227x/speed.c
index fa9d5cb7887..13f2fa553f8 100644
--- a/arch/m68k/cpu/mcf5227x/speed.c
+++ b/arch/m68k/cpu/mcf5227x/speed.c
@@ -9,6 +9,7 @@
 #include <clock_legacy.h>
 #include <asm/global_data.h>
 #include <asm/processor.h>
+#include <asm/types.h>
 
 #include <asm/immap.h>
 #include <asm/io.h>
diff --git a/arch/m68k/cpu/mcf523x/cpu.c b/arch/m68k/cpu/mcf523x/cpu.c
index bf3acb8f893..499b6dbc35f 100644
--- a/arch/m68k/cpu/mcf523x/cpu.c
+++ b/arch/m68k/cpu/mcf523x/cpu.c
@@ -17,6 +17,7 @@
 #include <command.h>
 #include <netdev.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 
 #include <asm/immap.h>
diff --git a/arch/m68k/cpu/mcf52x2/cpu.c b/arch/m68k/cpu/mcf52x2/cpu.c
index 82f5b3c2f80..823221c0ea9 100644
--- a/arch/m68k/cpu/mcf52x2/cpu.c
+++ b/arch/m68k/cpu/mcf52x2/cpu.c
@@ -26,6 +26,7 @@
 #include <netdev.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 #include "cpu.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/m68k/cpu/mcf52x2/cpu.h b/arch/m68k/cpu/mcf52x2/cpu.h
index 9bba7810e05..2d24333afef 100644
--- a/arch/m68k/cpu/mcf52x2/cpu.h
+++ b/arch/m68k/cpu/mcf52x2/cpu.h
@@ -9,6 +9,7 @@
 #define _CPU_H_
 
 #include <command.h>
+#include <compiler.h>
 
 /* Use this to create board specific reset functions */
 void board_reset(void) __attribute__((__weak__));
diff --git a/arch/m68k/cpu/mcf52x2/cpu_init.c b/arch/m68k/cpu/mcf52x2/cpu_init.c
index b564e75dbd0..9a83e853809 100644
--- a/arch/m68k/cpu/mcf52x2/cpu_init.c
+++ b/arch/m68k/cpu/mcf52x2/cpu_init.c
@@ -23,6 +23,7 @@
 #include <watchdog.h>
 #include <asm/immap.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 
 #if defined(CONFIG_CMD_NET)
diff --git a/arch/m68k/cpu/mcf532x/cpu.c b/arch/m68k/cpu/mcf532x/cpu.c
index 776543f06a9..20ed945a407 100644
--- a/arch/m68k/cpu/mcf532x/cpu.c
+++ b/arch/m68k/cpu/mcf532x/cpu.c
@@ -17,6 +17,7 @@
 #include <command.h>
 #include <netdev.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 
diff --git a/arch/m68k/cpu/mcf532x/cpu_init.c b/arch/m68k/cpu/mcf532x/cpu_init.c
index f7d371e37a1..f9dcb7d4b61 100644
--- a/arch/m68k/cpu/mcf532x/cpu_init.c
+++ b/arch/m68k/cpu/mcf532x/cpu_init.c
@@ -14,6 +14,7 @@
 #include <watchdog.h>
 #include <asm/immap.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 
 #if defined(CONFIG_MCFFEC)
diff --git a/arch/m68k/cpu/mcf532x/speed.c b/arch/m68k/cpu/mcf532x/speed.c
index e2985792d96..065938701e3 100644
--- a/arch/m68k/cpu/mcf532x/speed.c
+++ b/arch/m68k/cpu/mcf532x/speed.c
@@ -12,6 +12,7 @@
 #include <clock_legacy.h>
 #include <asm/global_data.h>
 #include <asm/processor.h>
+#include <asm/types.h>
 
 #include <asm/immap.h>
 #include <asm/io.h>
diff --git a/arch/m68k/cpu/mcf5445x/cpu.c b/arch/m68k/cpu/mcf5445x/cpu.c
index aa9af8a5a2a..70bf764abb2 100644
--- a/arch/m68k/cpu/mcf5445x/cpu.c
+++ b/arch/m68k/cpu/mcf5445x/cpu.c
@@ -17,6 +17,7 @@
 #include <command.h>
 #include <netdev.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 
diff --git a/arch/m68k/cpu/mcf5445x/cpu_init.c b/arch/m68k/cpu/mcf5445x/cpu_init.c
index 7610e03fa5f..10c9f635c26 100644
--- a/arch/m68k/cpu/mcf5445x/cpu_init.c
+++ b/arch/m68k/cpu/mcf5445x/cpu_init.c
@@ -16,6 +16,7 @@
 #include <asm/processor.h>
 #include <asm/rtc.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/compiler.h>
 
diff --git a/arch/m68k/cpu/mcf5445x/pci.c b/arch/m68k/cpu/mcf5445x/pci.c
index af02c4934c9..9868ece5cc2 100644
--- a/arch/m68k/cpu/mcf5445x/pci.c
+++ b/arch/m68k/cpu/mcf5445x/pci.c
@@ -11,6 +11,7 @@
 #include <pci.h>
 #include <asm/io.h>
 #include <asm/immap.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 #if defined(CONFIG_PCI)
diff --git a/arch/m68k/cpu/mcf5445x/speed.c b/arch/m68k/cpu/mcf5445x/speed.c
index a0b9af8866b..b2e373f9e1a 100644
--- a/arch/m68k/cpu/mcf5445x/speed.c
+++ b/arch/m68k/cpu/mcf5445x/speed.c
@@ -9,6 +9,7 @@
 #include <clock_legacy.h>
 #include <asm/global_data.h>
 #include <asm/processor.h>
+#include <asm/types.h>
 
 #include <asm/immap.h>
 #include <asm/io.h>
diff --git a/arch/m68k/cpu/mcf547x_8x/cpu.c b/arch/m68k/cpu/mcf547x_8x/cpu.c
index e1a7f360e77..b99e16a213e 100644
--- a/arch/m68k/cpu/mcf547x_8x/cpu.c
+++ b/arch/m68k/cpu/mcf547x_8x/cpu.c
@@ -17,6 +17,7 @@
 #include <command.h>
 #include <netdev.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 
 #include <asm/immap.h>
diff --git a/arch/m68k/cpu/mcf547x_8x/cpu_init.c b/arch/m68k/cpu/mcf547x_8x/cpu_init.c
index 20443e81835..ac8b4df3b63 100644
--- a/arch/m68k/cpu/mcf547x_8x/cpu_init.c
+++ b/arch/m68k/cpu/mcf547x_8x/cpu_init.c
@@ -14,6 +14,7 @@
 #include <init.h>
 #include <asm/immap.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 
 #if defined(CONFIG_CMD_NET)
diff --git a/arch/m68k/cpu/mcf547x_8x/pci.c b/arch/m68k/cpu/mcf547x_8x/pci.c
index 74ba68124f1..d83ad111cef 100644
--- a/arch/m68k/cpu/mcf547x_8x/pci.c
+++ b/arch/m68k/cpu/mcf547x_8x/pci.c
@@ -11,6 +11,7 @@
 #include <pci.h>
 #include <asm/io.h>
 #include <asm/immap.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 #if defined(CONFIG_PCI)
diff --git a/arch/m68k/cpu/mcf547x_8x/slicetimer.c b/arch/m68k/cpu/mcf547x_8x/slicetimer.c
index 49f246b62e1..9439f51ebfe 100644
--- a/arch/m68k/cpu/mcf547x_8x/slicetimer.c
+++ b/arch/m68k/cpu/mcf547x_8x/slicetimer.c
@@ -10,6 +10,7 @@
 #include <time.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 #include <asm/timer.h>
 #include <asm/immap.h>
diff --git a/arch/m68k/include/asm/coldfire/ata.h b/arch/m68k/include/asm/coldfire/ata.h
index d85c052c2eb..6cc7b373303 100644
--- a/arch/m68k/include/asm/coldfire/ata.h
+++ b/arch/m68k/include/asm/coldfire/ata.h
@@ -10,6 +10,7 @@
 #define __ATA_H__
 
 /* ATA */
+#include <asm/types.h>
 typedef struct atac {
 	/* PIO */
 	u8 toff;		/* 0x00 */
diff --git a/arch/m68k/include/asm/coldfire/crossbar.h b/arch/m68k/include/asm/coldfire/crossbar.h
index e26da133725..eb1dd3ee013 100644
--- a/arch/m68k/include/asm/coldfire/crossbar.h
+++ b/arch/m68k/include/asm/coldfire/crossbar.h
@@ -12,6 +12,7 @@
 /*********************************************************************
 * Cross-bar switch (XBS)
 *********************************************************************/
+#include <asm/types.h>
 typedef struct xbs {
 	u32 prs1;		/* 0x100 Priority Register Slave 1 */
 	u32 res1[3];		/* 0x104 - 0F */
diff --git a/arch/m68k/include/asm/coldfire/dspi.h b/arch/m68k/include/asm/coldfire/dspi.h
index ddd8f338054..5c08bcb6f1c 100644
--- a/arch/m68k/include/asm/coldfire/dspi.h
+++ b/arch/m68k/include/asm/coldfire/dspi.h
@@ -10,6 +10,7 @@
 #define __DSPI_H__
 
 /* DMA Serial Peripheral Interface (DSPI) */
+#include <asm/types.h>
 typedef struct dspi {
 	u32 mcr;	/* 0x00 */
 	u32 resv0;	/* 0x04 */
diff --git a/arch/m68k/include/asm/coldfire/edma.h b/arch/m68k/include/asm/coldfire/edma.h
index a89d02ab210..8d86e30e573 100644
--- a/arch/m68k/include/asm/coldfire/edma.h
+++ b/arch/m68k/include/asm/coldfire/edma.h
@@ -14,6 +14,7 @@
 *********************************************************************/
 
 /* eDMA module registers */
+#include <asm/types.h>
 typedef struct edma_ctrl {
 	u32 cr;			/* 0x00 Control Register */
 	u32 es;			/* 0x04 Error Status Register */
diff --git a/arch/m68k/include/asm/coldfire/eport.h b/arch/m68k/include/asm/coldfire/eport.h
index 0e64bef5ed6..c8f67c6bd66 100644
--- a/arch/m68k/include/asm/coldfire/eport.h
+++ b/arch/m68k/include/asm/coldfire/eport.h
@@ -10,6 +10,7 @@
 #define __EPORT_H__
 
 /* Edge Port Module (EPORT) */
+#include <asm/types.h>
 typedef struct eport {
 #ifdef CONFIG_MCF547x_8x
 	u16 par;	/* 0x00 */
diff --git a/arch/m68k/include/asm/coldfire/flexbus.h b/arch/m68k/include/asm/coldfire/flexbus.h
index c47787a87e7..0be751bec13 100644
--- a/arch/m68k/include/asm/coldfire/flexbus.h
+++ b/arch/m68k/include/asm/coldfire/flexbus.h
@@ -91,6 +91,7 @@ typedef struct fbcs {
 } fbcs_t;
 #endif
 
+#include <asm/types.h>
 #define FBCS_CSAR_BA(x)			((x) & 0xFFFF0000)
 
 #define FBCS_CSMR_BAM(x)		(((x) & 0xFFFF) << 16)
diff --git a/arch/m68k/include/asm/coldfire/flexcan.h b/arch/m68k/include/asm/coldfire/flexcan.h
index 7d8e9e269b6..6604e3502d3 100644
--- a/arch/m68k/include/asm/coldfire/flexcan.h
+++ b/arch/m68k/include/asm/coldfire/flexcan.h
@@ -10,6 +10,7 @@
 #define __FLEXCAN_H__
 
 /* FlexCan Message Buffer */
+#include <asm/types.h>
 typedef struct can_msgbuf_ctrl {
 #ifdef CONFIG_M5282
 	u8 tmstamp;		/* 0x00 Timestamp */
diff --git a/arch/m68k/include/asm/coldfire/intctrl.h b/arch/m68k/include/asm/coldfire/intctrl.h
index 7b42e65bc82..1f80a593446 100644
--- a/arch/m68k/include/asm/coldfire/intctrl.h
+++ b/arch/m68k/include/asm/coldfire/intctrl.h
@@ -15,6 +15,7 @@
 #	define	CONFIG_SYS_CF_INTC_REG1
 #endif
 
+#include <asm/types.h>
 typedef struct int0_ctrl {
 	/* Interrupt Controller 0 */
 	u32 iprh0;		/* 0x00 Pending High */
diff --git a/arch/m68k/include/asm/coldfire/lcd.h b/arch/m68k/include/asm/coldfire/lcd.h
index a347bed8382..e3124fc8b4f 100644
--- a/arch/m68k/include/asm/coldfire/lcd.h
+++ b/arch/m68k/include/asm/coldfire/lcd.h
@@ -10,6 +10,7 @@
 #define __LCDC_H__
 
 /* LCD module registers */
+#include <asm/types.h>
 typedef struct lcd_ctrl {
 	u32 ssar;		/* 0x00 Screen Start Address Register */
 	u32 sr;			/* 0x04 LCD Size Register */
diff --git a/arch/m68k/include/asm/coldfire/mdha.h b/arch/m68k/include/asm/coldfire/mdha.h
index be3dae972ab..647a246b9eb 100644
--- a/arch/m68k/include/asm/coldfire/mdha.h
+++ b/arch/m68k/include/asm/coldfire/mdha.h
@@ -10,6 +10,7 @@
 #define __MDHA_H__
 
 /* Message Digest Hardware Accelerator */
+#include <asm/types.h>
 typedef struct mdha_ctrl {
 	u32 mr;			/* 0x00 MDHA Mode */
 	u32 cr;			/* 0x04 Control */
diff --git a/arch/m68k/include/asm/coldfire/pwm.h b/arch/m68k/include/asm/coldfire/pwm.h
index 1b83acfe37b..570d110b737 100644
--- a/arch/m68k/include/asm/coldfire/pwm.h
+++ b/arch/m68k/include/asm/coldfire/pwm.h
@@ -10,6 +10,7 @@
 #define __ATA_H__
 
 /* Pulse Width Modulation (PWM) */
+#include <asm/types.h>
 typedef struct pwm_ctrl {
 #ifdef CONFIG_M5272
 	u8 cr0;
diff --git a/arch/m68k/include/asm/coldfire/qspi.h b/arch/m68k/include/asm/coldfire/qspi.h
index dd4565ae96e..13d7b9d364b 100644
--- a/arch/m68k/include/asm/coldfire/qspi.h
+++ b/arch/m68k/include/asm/coldfire/qspi.h
@@ -10,6 +10,7 @@
 #define __QSPI_H__
 
 /* QSPI module registers */
+#include <asm/types.h>
 typedef struct qspi_ctrl {
 	u16 mr;			/* 0x00 Mode */
 	u16 res1;
diff --git a/arch/m68k/include/asm/coldfire/rng.h b/arch/m68k/include/asm/coldfire/rng.h
index 88124e36e2e..2b3b8d26dc2 100644
--- a/arch/m68k/include/asm/coldfire/rng.h
+++ b/arch/m68k/include/asm/coldfire/rng.h
@@ -10,6 +10,7 @@
 #define __RNG_H__
 
 /* Random Number Generator */
+#include <asm/types.h>
 typedef struct rng_ctrl {
 	u32 cr;			/* 0x00 Control */
 	u32 sr;			/* 0x04 Status */
diff --git a/arch/m68k/include/asm/coldfire/skha.h b/arch/m68k/include/asm/coldfire/skha.h
index 3b48dc970c9..d6168e186da 100644
--- a/arch/m68k/include/asm/coldfire/skha.h
+++ b/arch/m68k/include/asm/coldfire/skha.h
@@ -9,6 +9,7 @@
 #ifndef __SKHA_H__
 #define __SKHA_H__
 
+#include <asm/types.h>
 typedef struct skha_ctrl {
 	u32 mr;			/* 0x00 Mode */
 	u32 cr;			/* 0x04 Control */
diff --git a/arch/m68k/include/asm/coldfire/ssi.h b/arch/m68k/include/asm/coldfire/ssi.h
index 900d6bdcf65..01167cb5caa 100644
--- a/arch/m68k/include/asm/coldfire/ssi.h
+++ b/arch/m68k/include/asm/coldfire/ssi.h
@@ -9,6 +9,7 @@
 #ifndef __SSI_H__
 #define __SSI_H__
 
+#include <asm/types.h>
 typedef struct ssi {
 	u32 tx0;
 	u32 tx1;
diff --git a/arch/m68k/include/asm/fec.h b/arch/m68k/include/asm/fec.h
index cdb8119d3ea..7f1c34ebd15 100644
--- a/arch/m68k/include/asm/fec.h
+++ b/arch/m68k/include/asm/fec.h
@@ -15,6 +15,7 @@
 #define	fec_h
 
 #include <phy.h>
+#include <linux/types.h>
 
 /* Buffer descriptors used FEC.
 */
diff --git a/arch/m68k/include/asm/fsl_mcdmafec.h b/arch/m68k/include/asm/fsl_mcdmafec.h
index de6c548fafd..fdc4fd7daf7 100644
--- a/arch/m68k/include/asm/fsl_mcdmafec.h
+++ b/arch/m68k/include/asm/fsl_mcdmafec.h
@@ -11,6 +11,7 @@
 
 /* Re-use of the definitions */
 #include <asm/fec.h>
+#include <linux/types.h>
 
 typedef struct fecdma {
 	u32 rsvd0;		/* 0x000 */
diff --git a/arch/m68k/include/asm/immap_520x.h b/arch/m68k/include/asm/immap_520x.h
index bb1237453ff..f4db2666d48 100644
--- a/arch/m68k/include/asm/immap_520x.h
+++ b/arch/m68k/include/asm/immap_520x.h
@@ -42,6 +42,7 @@
 #include <asm/coldfire/flexbus.h>
 #include <asm/coldfire/intctrl.h>
 #include <asm/coldfire/qspi.h>
+#include <asm/types.h>
 
 /* System Controller Module */
 typedef struct scm1 {
diff --git a/arch/m68k/include/asm/immap_5227x.h b/arch/m68k/include/asm/immap_5227x.h
index 710d6f5c0dd..e75f4c2d253 100644
--- a/arch/m68k/include/asm/immap_5227x.h
+++ b/arch/m68k/include/asm/immap_5227x.h
@@ -59,6 +59,7 @@
 #include <asm/coldfire/lcd.h>
 #include <asm/coldfire/pwm.h>
 #include <asm/coldfire/ssi.h>
+#include <asm/types.h>
 
 /* Reset Controller Module (RCM) */
 typedef struct rcm {
diff --git a/arch/m68k/include/asm/immap_5235.h b/arch/m68k/include/asm/immap_5235.h
index 27d905ef941..3fbca550209 100644
--- a/arch/m68k/include/asm/immap_5235.h
+++ b/arch/m68k/include/asm/immap_5235.h
@@ -54,6 +54,7 @@
 #include <asm/coldfire/qspi.h>
 #include <asm/coldfire/rng.h>
 #include <asm/coldfire/skha.h>
+#include <asm/types.h>
 
 /* System Control Module register */
 typedef struct scm_ctrl {
diff --git a/arch/m68k/include/asm/immap_5272.h b/arch/m68k/include/asm/immap_5272.h
index cd7b67256cf..9b6d5cd04ad 100644
--- a/arch/m68k/include/asm/immap_5272.h
+++ b/arch/m68k/include/asm/immap_5272.h
@@ -28,6 +28,7 @@
 #define MMAP_USB	(CONFIG_SYS_MBAR + 0x00001000)
 
 #include <asm/coldfire/pwm.h>
+#include <linux/types.h>
 
 /* System configuration registers */
 typedef struct sys_ctrl {
diff --git a/arch/m68k/include/asm/immap_5275.h b/arch/m68k/include/asm/immap_5275.h
index 8b1a08b4f24..90a39a83b2f 100644
--- a/arch/m68k/include/asm/immap_5275.h
+++ b/arch/m68k/include/asm/immap_5275.h
@@ -57,6 +57,7 @@
 #include <asm/coldfire/qspi.h>
 #include <asm/coldfire/rng.h>
 #include <asm/coldfire/skha.h>
+#include <asm/types.h>
 
 /* System configuration registers
 */
diff --git a/arch/m68k/include/asm/immap_5282.h b/arch/m68k/include/asm/immap_5282.h
index d7c68f5749a..20c551de131 100644
--- a/arch/m68k/include/asm/immap_5282.h
+++ b/arch/m68k/include/asm/immap_5282.h
@@ -50,6 +50,7 @@
 #include <asm/coldfire/flexcan.h>
 #include <asm/coldfire/intctrl.h>
 #include <asm/coldfire/qspi.h>
+#include <linux/types.h>
 
 /* System Control Module */
 typedef struct scm_ctrl {
diff --git a/arch/m68k/include/asm/immap_5301x.h b/arch/m68k/include/asm/immap_5301x.h
index 29e60863bfd..3500a09e0e1 100644
--- a/arch/m68k/include/asm/immap_5301x.h
+++ b/arch/m68k/include/asm/immap_5301x.h
@@ -59,6 +59,7 @@
 #include <asm/coldfire/ssi.h>
 #include <asm/coldfire/rng.h>
 #include <asm/rtc.h>
+#include <asm/types.h>
 
 /* System Controller Module */
 typedef struct scm1 {
diff --git a/arch/m68k/include/asm/immap_5307.h b/arch/m68k/include/asm/immap_5307.h
index e041e7e0afb..b01a1e6243d 100644
--- a/arch/m68k/include/asm/immap_5307.h
+++ b/arch/m68k/include/asm/immap_5307.h
@@ -7,6 +7,7 @@
 #ifndef __IMMAP_5307__
 #define __IMMAP_5307__
 
+#include <asm/types.h>
 #define MMAP_SIM	(CONFIG_SYS_MBAR + 0x00000000)
 #define MMAP_INTC	(CONFIG_SYS_MBAR + 0x00000040)
 #define MMAP_CSM	(CONFIG_SYS_MBAR + 0x00000080)
diff --git a/arch/m68k/include/asm/immap_5329.h b/arch/m68k/include/asm/immap_5329.h
index dbf3a2260ee..460d2c2fdf0 100644
--- a/arch/m68k/include/asm/immap_5329.h
+++ b/arch/m68k/include/asm/immap_5329.h
@@ -63,6 +63,7 @@
 #include <asm/coldfire/pwm.h>
 #include <asm/coldfire/ssi.h>
 #include <asm/coldfire/skha.h>
+#include <asm/types.h>
 
 /* System control module registers */
 typedef struct scm1_ctrl {
diff --git a/arch/m68k/include/asm/immap_5441x.h b/arch/m68k/include/asm/immap_5441x.h
index 708d0db755a..c4e61b75171 100644
--- a/arch/m68k/include/asm/immap_5441x.h
+++ b/arch/m68k/include/asm/immap_5441x.h
@@ -84,6 +84,7 @@
 #include <asm/coldfire/flexcan.h>
 #include <asm/coldfire/intctrl.h>
 #include <asm/coldfire/ssi.h>
+#include <asm/types.h>
 
 /* Serial Boot Facility (SBF) */
 typedef struct sbf {
diff --git a/arch/m68k/include/asm/immap_5445x.h b/arch/m68k/include/asm/immap_5445x.h
index 3111d00d3ee..76e8d2dc0a9 100644
--- a/arch/m68k/include/asm/immap_5445x.h
+++ b/arch/m68k/include/asm/immap_5445x.h
@@ -60,6 +60,7 @@
 #include <asm/coldfire/flexbus.h>
 #include <asm/coldfire/intctrl.h>
 #include <asm/coldfire/ssi.h>
+#include <asm/types.h>
 
 /* Watchdog Timer Modules (WTM) */
 typedef struct wtm {
diff --git a/arch/m68k/include/asm/immap_547x_8x.h b/arch/m68k/include/asm/immap_547x_8x.h
index 5e1345684de..8dee82e9e50 100644
--- a/arch/m68k/include/asm/immap_547x_8x.h
+++ b/arch/m68k/include/asm/immap_547x_8x.h
@@ -45,6 +45,7 @@
 #include <asm/coldfire/flexbus.h>
 #include <asm/coldfire/flexcan.h>
 #include <asm/coldfire/intctrl.h>
+#include <asm/types.h>
 
 typedef struct siu {
 	u32 mbar;		/* 0x00 */
diff --git a/arch/m68k/include/asm/io.h b/arch/m68k/include/asm/io.h
index 35ad4a1c044..95fcddb075e 100644
--- a/arch/m68k/include/asm/io.h
+++ b/arch/m68k/include/asm/io.h
@@ -10,6 +10,7 @@
 #define __ASM_M68K_IO_H__
 
 #include <asm/byteorder.h>
+#include <asm/types.h>
 
 #ifndef _IO_BASE
 #define _IO_BASE 0
diff --git a/arch/m68k/include/asm/m5282.h b/arch/m68k/include/asm/m5282.h
index 0c91cf491e2..261f49fdf20 100644
--- a/arch/m68k/include/asm/m5282.h
+++ b/arch/m68k/include/asm/m5282.h
@@ -11,6 +11,7 @@
 * PLL Clock Module
 *********************************************************************/
 /* Bit definitions and macros for PLL_SYNCR */
+#include <linux/types.h>
 #define PLL_SYNCR_LOLRE			(0x8000)
 #define PLL_SYNCR_MFD2			(0x4000)
 #define PLL_SYNCR_MFD1			(0x2000)
diff --git a/arch/m68k/include/asm/ptrace.h b/arch/m68k/include/asm/ptrace.h
index d419824806c..a17708195ea 100644
--- a/arch/m68k/include/asm/ptrace.h
+++ b/arch/m68k/include/asm/ptrace.h
@@ -9,6 +9,7 @@
  */
 #ifndef __ASSEMBLY__
 
+#include <linux/types.h>
 struct pt_regs {
 	ulong d0;
 	ulong d1;
diff --git a/arch/m68k/include/asm/rtc.h b/arch/m68k/include/asm/rtc.h
index 1fb492c76e1..544fa821571 100644
--- a/arch/m68k/include/asm/rtc.h
+++ b/arch/m68k/include/asm/rtc.h
@@ -10,6 +10,7 @@
 #define __MCFRTC_H__
 
 /* Real time Clock */
+#include <asm/types.h>
 typedef struct rtc_ctrl {
 	u32 hourmin;		/* 0x00 Hours and Minutes Counter Register */
 	u32 seconds;		/* 0x04 Seconds Counter Register */
diff --git a/arch/m68k/include/asm/timer.h b/arch/m68k/include/asm/timer.h
index 982d71a542e..47b75989633 100644
--- a/arch/m68k/include/asm/timer.h
+++ b/arch/m68k/include/asm/timer.h
@@ -12,6 +12,7 @@
 /****************************************************************************/
 
 /****************************************************************************/
+#include <asm/types.h>
 /* Timer structure */
 /****************************************************************************/
 /* DMA Timer module registers */
diff --git a/arch/m68k/include/asm/uart.h b/arch/m68k/include/asm/uart.h
index e4a9650a03c..2a41f7e507e 100644
--- a/arch/m68k/include/asm/uart.h
+++ b/arch/m68k/include/asm/uart.h
@@ -12,6 +12,7 @@
 /****************************************************************************/
 
 /* UART module registers */
+#include <asm/types.h>
 /* Register read/write struct */
 typedef struct uart {
 	u8 umr;			/* 0x00 Mode Register */
diff --git a/arch/m68k/lib/bdinfo.c b/arch/m68k/lib/bdinfo.c
index da4ad9049bd..e24e7424400 100644
--- a/arch/m68k/lib/bdinfo.c
+++ b/arch/m68k/lib/bdinfo.c
@@ -10,6 +10,7 @@
 #include <init.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/m68k/lib/bootm.c b/arch/m68k/lib/bootm.c
index 20ff33f7532..c70b24944e6 100644
--- a/arch/m68k/lib/bootm.c
+++ b/arch/m68k/lib/bootm.c
@@ -14,6 +14,7 @@
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 #include <u-boot/zlib.h>
 #include <bzlib.h>
 #include <watchdog.h>
diff --git a/arch/m68k/lib/cache.c b/arch/m68k/lib/cache.c
index 22048d12d70..afd8e3531d7 100644
--- a/arch/m68k/lib/cache.c
+++ b/arch/m68k/lib/cache.c
@@ -5,10 +5,12 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <asm/immap.h>
 #include <asm/cache.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 volatile int *cf_icache_status = (int *)ICACHE_STATUS;
 volatile int *cf_dcache_status = (int *)DCACHE_STATUS;
diff --git a/arch/m68k/lib/fec.c b/arch/m68k/lib/fec.c
index 4f013238928..053ced25452 100644
--- a/arch/m68k/lib/fec.c
+++ b/arch/m68k/lib/fec.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
diff --git a/arch/m68k/lib/time.c b/arch/m68k/lib/time.c
index cbe29e72a86..36056d25ebb 100644
--- a/arch/m68k/lib/time.c
+++ b/arch/m68k/lib/time.c
@@ -12,6 +12,7 @@
 #include <time.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 #include <asm/timer.h>
 #include <asm/immap.h>
diff --git a/arch/m68k/lib/traps.c b/arch/m68k/lib/traps.c
index 3591bb22f09..60b8fa20b94 100644
--- a/arch/m68k/lib/traps.c
+++ b/arch/m68k/lib/traps.c
@@ -15,6 +15,7 @@
 #include <asm/processor.h>
 #include <asm/ptrace.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 
 extern void _exc_handler(void);
diff --git a/arch/microblaze/cpu/cache.c b/arch/microblaze/cpu/cache.c
index aa832d6be6d..20dea1abbee 100644
--- a/arch/microblaze/cpu/cache.c
+++ b/arch/microblaze/cpu/cache.c
@@ -9,6 +9,7 @@
 #include <cpu_func.h>
 #include <asm/asm.h>
 #include <asm/cache.h>
+#include <linux/types.h>
 
 int dcache_status(void)
 {
diff --git a/arch/microblaze/cpu/interrupts.c b/arch/microblaze/cpu/interrupts.c
index e86f0cda9df..56ac0c50a87 100644
--- a/arch/microblaze/cpu/interrupts.c
+++ b/arch/microblaze/cpu/interrupts.c
@@ -17,6 +17,7 @@
 #include <asm/global_data.h>
 #include <asm/microblaze_intc.h>
 #include <asm/asm.h>
+#include <asm/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/microblaze/cpu/spl.c b/arch/microblaze/cpu/spl.c
index 9f25c2f3952..87eea372539 100644
--- a/arch/microblaze/cpu/spl.c
+++ b/arch/microblaze/cpu/spl.c
@@ -13,6 +13,7 @@
 #include <stdbool.h>
 #include <asm/io.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 bool boot_linux;
 
diff --git a/arch/microblaze/cpu/timer.c b/arch/microblaze/cpu/timer.c
index eb53f0edcdd..fc22d56aa4a 100644
--- a/arch/microblaze/cpu/timer.c
+++ b/arch/microblaze/cpu/timer.c
@@ -16,6 +16,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/microblaze/lib/bootm.c b/arch/microblaze/lib/bootm.c
index f8835b591c6..09fc6438b8b 100644
--- a/arch/microblaze/lib/bootm.c
+++ b/arch/microblaze/lib/bootm.c
@@ -21,6 +21,7 @@
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 #include <u-boot/zlib.h>
 #include <asm/byteorder.h>
 
diff --git a/arch/mips/cpu/cpu.c b/arch/mips/cpu/cpu.c
index 7d5c9fd83ae..bfce17fd36c 100644
--- a/arch/mips/cpu/cpu.c
+++ b/arch/mips/cpu/cpu.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <init.h>
 #include <linux/compiler.h>
 #include <asm/cache.h>
diff --git a/arch/mips/cpu/time.c b/arch/mips/cpu/time.c
index aab92ec859b..764b74ce970 100644
--- a/arch/mips/cpu/time.c
+++ b/arch/mips/cpu/time.c
@@ -8,6 +8,7 @@
 #include <compiler.h>
 #include <time.h>
 #include <asm/mipsregs.h>
+#include <linux/types.h>
 
 unsigned long notrace timer_read_counter(void)
 {
diff --git a/arch/mips/include/asm/cacheops.h b/arch/mips/include/asm/cacheops.h
index 641e2ad58de..abb3c5018ea 100644
--- a/arch/mips/include/asm/cacheops.h
+++ b/arch/mips/include/asm/cacheops.h
@@ -12,6 +12,7 @@
 
 #ifndef __ASSEMBLY__
 
+#include <linux/types.h>
 static inline void mips_cache(int op, const volatile void *addr)
 {
 #ifdef __GCC_HAVE_BUILTIN_MIPS_CACHE
diff --git a/arch/mips/include/asm/io.h b/arch/mips/include/asm/io.h
index 836cd436872..71f6d2da990 100644
--- a/arch/mips/include/asm/io.h
+++ b/arch/mips/include/asm/io.h
@@ -9,6 +9,7 @@
 #ifndef _ASM_IO_H
 #define _ASM_IO_H
 
+#include <compiler.h>
 #include <linux/bug.h>
 #include <linux/compiler.h>
 #include <linux/string.h>
diff --git a/arch/mips/include/asm/mach-generic/ioremap.h b/arch/mips/include/asm/mach-generic/ioremap.h
index d6258f5bce5..a9cfee53c15 100644
--- a/arch/mips/include/asm/mach-generic/ioremap.h
+++ b/arch/mips/include/asm/mach-generic/ioremap.h
@@ -2,6 +2,7 @@
 #ifndef __ASM_MACH_GENERIC_IOREMAP_H
 #define __ASM_MACH_GENERIC_IOREMAP_H
 
+#include <compiler.h>
 #include <linux/types.h>
 
 /*
diff --git a/arch/mips/include/asm/mipsregs.h b/arch/mips/include/asm/mipsregs.h
index e65485b4fff..fecd7e7de40 100644
--- a/arch/mips/include/asm/mipsregs.h
+++ b/arch/mips/include/asm/mipsregs.h
@@ -32,6 +32,7 @@
 #else
 #define _ULCAST_ (unsigned long)
 #define _U64CAST_ (u64)
+#include <asm/types.h>
 #endif
 
 /*
diff --git a/arch/mips/include/asm/pgtable-bits.h b/arch/mips/include/asm/pgtable-bits.h
index 481d2ef6c2f..1d20cde07ed 100644
--- a/arch/mips/include/asm/pgtable-bits.h
+++ b/arch/mips/include/asm/pgtable-bits.h
@@ -146,6 +146,7 @@
 #define _PAGE_READ		(cpu_has_rixi ? 0 : (1 << _PAGE_READ_SHIFT))
 #define _PAGE_NO_READ_SHIFT	_PAGE_READ_SHIFT
 #define _PAGE_NO_READ		(cpu_has_rixi ? (1 << _PAGE_READ_SHIFT) : 0)
+#include <linux/types.h>
 #endif	/* defined(CONFIG_CPU_MIPSR2) || defined(CONFIG_CPU_MIPSR6) */
 
 #if defined(_PAGE_NO_READ_SHIFT)
diff --git a/arch/mips/include/asm/sections.h b/arch/mips/include/asm/sections.h
index 93c30e9724f..1b1897510af 100644
--- a/arch/mips/include/asm/sections.h
+++ b/arch/mips/include/asm/sections.h
@@ -7,6 +7,7 @@
 #define __ASM_MIPS_SECTIONS_H
 
 #include <asm-generic/sections.h>
+#include <linux/types.h>
 
 /**
  * __rel_start: Relocation data generated by the mips-relocs tool
diff --git a/arch/mips/lib/boot.c b/arch/mips/lib/boot.c
index 53e8cccad47..a6655c6188e 100644
--- a/arch/mips/lib/boot.c
+++ b/arch/mips/lib/boot.c
@@ -8,6 +8,7 @@
 #include <cpu_func.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/mips/lib/bootm.c b/arch/mips/lib/bootm.c
index 8745ee351e5..471cc48539c 100644
--- a/arch/mips/lib/bootm.c
+++ b/arch/mips/lib/bootm.c
@@ -17,6 +17,7 @@
 #include <asm/io.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/mips/lib/cache.c b/arch/mips/lib/cache.c
index 7be0b559561..9cdac4f5245 100644
--- a/arch/mips/lib/cache.c
+++ b/arch/mips/lib/cache.c
@@ -5,7 +5,9 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <cpu_func.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/cache.h>
 #include <asm/cacheops.h>
@@ -16,6 +18,7 @@
 #include <asm/system.h>
 #include <linux/bug.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/mips/lib/reloc.c b/arch/mips/lib/reloc.c
index d6ea2f5730d..edb6b611377 100644
--- a/arch/mips/lib/reloc.c
+++ b/arch/mips/lib/reloc.c
@@ -35,6 +35,7 @@
 #include <asm/sections.h>
 #include <linux/bitops.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /**
  * read_uint() - Read an unsigned integer from the buffer
diff --git a/arch/mips/lib/traps.c b/arch/mips/lib/traps.c
index 8b16ee056e3..c20fed9b438 100644
--- a/arch/mips/lib/traps.c
+++ b/arch/mips/lib/traps.c
@@ -23,6 +23,7 @@
 #include <asm/system.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/mips/mach-ath79/ar933x/clk.c b/arch/mips/mach-ath79/ar933x/clk.c
index 6b3cbdd0e57..b0d5cc8bbfb 100644
--- a/arch/mips/mach-ath79/ar933x/clk.c
+++ b/arch/mips/mach-ath79/ar933x/clk.c
@@ -5,11 +5,13 @@
 
 #include <common.h>
 #include <clock_legacy.h>
+#include <compiler.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/addrspace.h>
 #include <asm/types.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 #include <mach/ar71xx_regs.h>
 #include <mach/ath79.h>
 
diff --git a/arch/mips/mach-ath79/ar933x/ddr.c b/arch/mips/mach-ath79/ar933x/ddr.c
index 09166ecf8f0..3ab0199fe10 100644
--- a/arch/mips/mach-ath79/ar933x/ddr.c
+++ b/arch/mips/mach-ath79/ar933x/ddr.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <asm/io.h>
 #include <asm/addrspace.h>
 #include <asm/types.h>
diff --git a/arch/mips/mach-ath79/ar934x/clk.c b/arch/mips/mach-ath79/ar934x/clk.c
index 5ce5ea5ba46..69f20939a74 100644
--- a/arch/mips/mach-ath79/ar934x/clk.c
+++ b/arch/mips/mach-ath79/ar934x/clk.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <clock_legacy.h>
 #include <command.h>
+#include <compiler.h>
 #include <hang.h>
 #include <stdio.h>
 #include <asm/global_data.h>
@@ -16,6 +17,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include <mach/ar71xx_regs.h>
 #include <mach/ath79.h>
 #include <wait_bit.h>
diff --git a/arch/mips/mach-ath79/ar934x/ddr.c b/arch/mips/mach-ath79/ar934x/ddr.c
index 9df48b97ef4..e626ffa7254 100644
--- a/arch/mips/mach-ath79/ar934x/ddr.c
+++ b/arch/mips/mach-ath79/ar934x/ddr.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/addrspace.h>
diff --git a/arch/mips/mach-ath79/cpu.c b/arch/mips/mach-ath79/cpu.c
index 55d051f8cb9..d18b239d1b0 100644
--- a/arch/mips/mach-ath79/cpu.c
+++ b/arch/mips/mach-ath79/cpu.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <init.h>
 #include <stdio.h>
 #include <asm/global_data.h>
diff --git a/arch/mips/mach-ath79/qca953x/clk.c b/arch/mips/mach-ath79/qca953x/clk.c
index 6e8a4c0d194..f1177cdfc3d 100644
--- a/arch/mips/mach-ath79/qca953x/clk.c
+++ b/arch/mips/mach-ath79/qca953x/clk.c
@@ -5,11 +5,13 @@
 
 #include <common.h>
 #include <clock_legacy.h>
+#include <compiler.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/addrspace.h>
 #include <asm/types.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 #include <mach/ar71xx_regs.h>
 #include <mach/ath79.h>
 
diff --git a/arch/mips/mach-ath79/qca953x/ddr.c b/arch/mips/mach-ath79/qca953x/ddr.c
index 78f2370e09c..36a9eeb18bd 100644
--- a/arch/mips/mach-ath79/qca953x/ddr.c
+++ b/arch/mips/mach-ath79/qca953x/ddr.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <asm/io.h>
 #include <asm/addrspace.h>
 #include <asm/types.h>
diff --git a/arch/mips/mach-ath79/qca956x/clk.c b/arch/mips/mach-ath79/qca956x/clk.c
index 996f846c480..7374c98e59a 100644
--- a/arch/mips/mach-ath79/qca956x/clk.c
+++ b/arch/mips/mach-ath79/qca956x/clk.c
@@ -5,12 +5,14 @@
 
 #include <common.h>
 #include <clock_legacy.h>
+#include <compiler.h>
 #include <log.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/addrspace.h>
 #include <asm/types.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 #include <mach/ar71xx_regs.h>
 #include <mach/ath79.h>
 #include <wait_bit.h>
diff --git a/arch/mips/mach-ath79/qca956x/ddr.c b/arch/mips/mach-ath79/qca956x/ddr.c
index f9cf8daa224..8231c142de3 100644
--- a/arch/mips/mach-ath79/qca956x/ddr.c
+++ b/arch/mips/mach-ath79/qca956x/ddr.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/addrspace.h>
diff --git a/arch/mips/mach-ath79/reset.c b/arch/mips/mach-ath79/reset.c
index 6ecde8a39ff..d4d6b02808c 100644
--- a/arch/mips/mach-ath79/reset.c
+++ b/arch/mips/mach-ath79/reset.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <stdio.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/arch/mips/mach-bmips/include/ioremap.h b/arch/mips/mach-bmips/include/ioremap.h
index 99ea03e6a70..fea55d8287a 100644
--- a/arch/mips/mach-bmips/include/ioremap.h
+++ b/arch/mips/mach-bmips/include/ioremap.h
@@ -2,6 +2,7 @@
 #ifndef __ASM_MACH_BMIPS_IOREMAP_H
 #define __ASM_MACH_BMIPS_IOREMAP_H
 
+#include <compiler.h>
 #include <linux/types.h>
 
 /*
diff --git a/arch/mips/mach-jz47xx/include/mach/jz4780.h b/arch/mips/mach-jz47xx/include/mach/jz4780.h
index 4422e503ed2..6f75b38901f 100644
--- a/arch/mips/mach-jz47xx/include/mach/jz4780.h
+++ b/arch/mips/mach-jz47xx/include/mach/jz4780.h
@@ -82,6 +82,8 @@
 
 #ifndef __ASSEMBLY__
 
+#include <compiler.h>
+#include <linux/types.h>
 u32 sdram_size(int bank);
 
 const u32 jz4780_clk_get_efuse_clk(void);
diff --git a/arch/mips/mach-jz47xx/include/mach/jz4780_dram.h b/arch/mips/mach-jz47xx/include/mach/jz4780_dram.h
index 61cc1489889..4ac0d61f5d1 100644
--- a/arch/mips/mach-jz47xx/include/mach/jz4780_dram.h
+++ b/arch/mips/mach-jz47xx/include/mach/jz4780_dram.h
@@ -12,6 +12,7 @@
 /*
  * DDR
  */
+#include <asm/types.h>
 #include <linux/bitops.h>
 #define DDRC_ST				0x0
 #define DDRC_CFG			0x4
diff --git a/arch/mips/mach-jz47xx/jz4780/gpio.c b/arch/mips/mach-jz47xx/jz4780/gpio.c
index d4884e7fa9f..1787de5fe4c 100644
--- a/arch/mips/mach-jz47xx/jz4780/gpio.c
+++ b/arch/mips/mach-jz47xx/jz4780/gpio.c
@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0+
 
+#include <compiler.h>
 #include <config.h>
 #include <common.h>
 #include <asm/io.h>
diff --git a/arch/mips/mach-jz47xx/jz4780/jz4780.c b/arch/mips/mach-jz47xx/jz4780/jz4780.c
index 496016724d7..034aa7593d3 100644
--- a/arch/mips/mach-jz47xx/jz4780/jz4780.c
+++ b/arch/mips/mach-jz47xx/jz4780/jz4780.c
@@ -18,6 +18,7 @@
 #include <asm/sections.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <mach/jz4780.h>
 #include <mach/jz4780_dram.h>
 #include <mmc.h>
diff --git a/arch/mips/mach-jz47xx/jz4780/pll.c b/arch/mips/mach-jz47xx/jz4780/pll.c
index ac76a507355..e839db78df8 100644
--- a/arch/mips/mach-jz47xx/jz4780/pll.c
+++ b/arch/mips/mach-jz47xx/jz4780/pll.c
@@ -6,10 +6,12 @@
  * Author: Paul Burton <paul.burton@imgtec.com>
  */
 
+#include <compiler.h>
 #include <config.h>
 #include <common.h>
 #include <stdio.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
diff --git a/arch/mips/mach-jz47xx/jz4780/reset.c b/arch/mips/mach-jz47xx/jz4780/reset.c
index bf6addccb5d..ef0f77b43c8 100644
--- a/arch/mips/mach-jz47xx/jz4780/reset.c
+++ b/arch/mips/mach-jz47xx/jz4780/reset.c
@@ -6,6 +6,7 @@
  * Author: Paul Burton <paul.burton@imgtec.com>
  */
 
+#include <compiler.h>
 #include <config.h>
 #include <common.h>
 #include <asm/io.h>
diff --git a/arch/mips/mach-jz47xx/jz4780/sdram.c b/arch/mips/mach-jz47xx/jz4780/sdram.c
index 690f3c5601d..c0d69aa455e 100644
--- a/arch/mips/mach-jz47xx/jz4780/sdram.c
+++ b/arch/mips/mach-jz47xx/jz4780/sdram.c
@@ -10,9 +10,11 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <hang.h>
 #include <init.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <mach/jz4780.h>
diff --git a/arch/mips/mach-jz47xx/jz4780/timer.c b/arch/mips/mach-jz47xx/jz4780/timer.c
index 82bb9e8c3bf..aadbe040921 100644
--- a/arch/mips/mach-jz47xx/jz4780/timer.c
+++ b/arch/mips/mach-jz47xx/jz4780/timer.c
@@ -6,6 +6,7 @@
  * Author: Paul Burton <paul.burton@imgtec.com>
  */
 
+#include <compiler.h>
 #include <config.h>
 #include <common.h>
 #include <div64.h>
@@ -16,6 +17,7 @@
 #include <asm/mipsregs.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 #include <mach/jz4780.h>
 
 #define TCU_TSR		0x1C	/* Timer Stop Register */
diff --git a/arch/mips/mach-mscc/gpio.c b/arch/mips/mach-mscc/gpio.c
index d6b4c5d7684..cbc74dd6602 100644
--- a/arch/mips/mach-mscc/gpio.c
+++ b/arch/mips/mach-mscc/gpio.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 
 void mscc_gpio_set_alternate(int gpio, int mode)
diff --git a/arch/mips/mach-mscc/include/ioremap.h b/arch/mips/mach-mscc/include/ioremap.h
index 9024364a57f..d5fc97ba8fa 100644
--- a/arch/mips/mach-mscc/include/ioremap.h
+++ b/arch/mips/mach-mscc/include/ioremap.h
@@ -6,6 +6,7 @@
 #ifndef __ASM_MACH_MSCC_IOREMAP_H
 #define __ASM_MACH_MSCC_IOREMAP_H
 
+#include <compiler.h>
 #include <linux/types.h>
 #include <mach/common.h>
 
diff --git a/arch/mips/mach-mscc/include/mach/common.h b/arch/mips/mach-mscc/include/mach/common.h
index 8f9a9c280b4..e701d325d1c 100644
--- a/arch/mips/mach-mscc/include/mach/common.h
+++ b/arch/mips/mach-mscc/include/mach/common.h
@@ -45,6 +45,7 @@
 /* Common utility functions */
 
 /*
+#include <asm/types.h>
  * Perform a number of NOP instructions, blocks of 8 instructions.
  * The (inlined) function will not affect cache or processor state.
  */
diff --git a/arch/mips/mach-mscc/include/mach/ddr.h b/arch/mips/mach-mscc/include/mach/ddr.h
index 8c1f14773ec..d4461d74e30 100644
--- a/arch/mips/mach-mscc/include/mach/ddr.h
+++ b/arch/mips/mach-mscc/include/mach/ddr.h
@@ -6,10 +6,12 @@
 #ifndef __ASM_MACH_DDR_H
 #define __ASM_MACH_DDR_H
 
+#include <compiler.h>
 #include <stdbool.h>
 #include <asm/cacheops.h>
 #include <asm/io.h>
 #include <asm/reboot.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <mach/common.h>
 
diff --git a/arch/mips/mach-mscc/include/mach/jr2/jr2.h b/arch/mips/mach-mscc/include/mach/jr2/jr2.h
index 67244f63fad..121d44b2d6e 100644
--- a/arch/mips/mach-mscc/include/mach/jr2/jr2.h
+++ b/arch/mips/mach-mscc/include/mach/jr2/jr2.h
@@ -8,6 +8,7 @@
 #ifndef _MSCC_JR2_H_
 #define _MSCC_JR2_H_
 
+#include <compiler.h>
 #include <linux/bitops.h>
 #include <dm.h>
 
diff --git a/arch/mips/mach-mscc/include/mach/luton/luton.h b/arch/mips/mach-mscc/include/mach/luton/luton.h
index 19f02ede666..b6c9dd43489 100644
--- a/arch/mips/mach-mscc/include/mach/luton/luton.h
+++ b/arch/mips/mach-mscc/include/mach/luton/luton.h
@@ -8,6 +8,7 @@
 #ifndef _MSCC_OCELOT_H_
 #define _MSCC_OCELOT_H_
 
+#include <compiler.h>
 #include <linux/bitops.h>
 #include <dm.h>
 
diff --git a/arch/mips/mach-mscc/include/mach/ocelot/ocelot.h b/arch/mips/mach-mscc/include/mach/ocelot/ocelot.h
index 2cb2135d374..c45507759ee 100644
--- a/arch/mips/mach-mscc/include/mach/ocelot/ocelot.h
+++ b/arch/mips/mach-mscc/include/mach/ocelot/ocelot.h
@@ -8,6 +8,7 @@
 #ifndef _MSCC_OCELOT_H_
 #define _MSCC_OCELOT_H_
 
+#include <compiler.h>
 #include <linux/bitops.h>
 #include <dm.h>
 
diff --git a/arch/mips/mach-mscc/include/mach/serval/serval.h b/arch/mips/mach-mscc/include/mach/serval/serval.h
index 763d18fe629..3397441caca 100644
--- a/arch/mips/mach-mscc/include/mach/serval/serval.h
+++ b/arch/mips/mach-mscc/include/mach/serval/serval.h
@@ -8,6 +8,7 @@
 #ifndef _MSCC_SERVAL_H_
 #define _MSCC_SERVAL_H_
 
+#include <compiler.h>
 #include <linux/bitops.h>
 #include <dm.h>
 
diff --git a/arch/mips/mach-mscc/include/mach/servalt/servalt.h b/arch/mips/mach-mscc/include/mach/servalt/servalt.h
index 9015bc7dad9..e5948997c1c 100644
--- a/arch/mips/mach-mscc/include/mach/servalt/servalt.h
+++ b/arch/mips/mach-mscc/include/mach/servalt/servalt.h
@@ -8,6 +8,7 @@
 #ifndef _MSCC_SERVALT_H_
 #define _MSCC_SERVALT_H_
 
+#include <compiler.h>
 #include <linux/bitops.h>
 #include <dm.h>
 
diff --git a/arch/mips/mach-mscc/include/mach/tlb.h b/arch/mips/mach-mscc/include/mach/tlb.h
index ebd8ad0dc1a..18266b14dc6 100644
--- a/arch/mips/mach-mscc/include/mach/tlb.h
+++ b/arch/mips/mach-mscc/include/mach/tlb.h
@@ -7,6 +7,7 @@
 #define __ASM_MACH_TLB_H
 
 #include <asm/mipsregs.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <mach/common.h>
 #include <linux/sizes.h>
diff --git a/arch/mips/mach-mscc/phy.c b/arch/mips/mach-mscc/phy.c
index 83d3e5bdd28..acfe6bb131b 100644
--- a/arch/mips/mach-mscc/phy.c
+++ b/arch/mips/mach-mscc/phy.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <log.h>
 #include <asm/io.h>
+#include <asm/types.h>
 
 int mscc_phy_rd_wr(u8 read,
 		   u32 miimdev,
diff --git a/arch/mips/mach-mscc/reset.c b/arch/mips/mach-mscc/reset.c
index a1214573b51..6bd5da4ef67 100644
--- a/arch/mips/mach-mscc/reset.c
+++ b/arch/mips/mach-mscc/reset.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <asm/types.h>
 
 #include <asm/sections.h>
 #include <asm/io.h>
diff --git a/arch/mips/mach-mtmips/ddr_cal.c b/arch/mips/mach-mtmips/ddr_cal.c
index 1f2f12879b2..1b0cd2fc6d8 100644
--- a/arch/mips/mach-mtmips/ddr_cal.c
+++ b/arch/mips/mach-mtmips/ddr_cal.c
@@ -6,9 +6,12 @@
  */
 
 #include <common.h>
+#include <compiler.h>
+#include <stdbool.h>
 #include <asm/addrspace.h>
 #include <asm/cacheops.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/io.h>
 #include <linux/kernel.h>
diff --git a/arch/mips/mach-mtmips/ddr_init.c b/arch/mips/mach-mtmips/ddr_init.c
index 6c6d0933f2e..290355f538e 100644
--- a/arch/mips/mach-mtmips/ddr_init.c
+++ b/arch/mips/mach-mtmips/ddr_init.c
@@ -6,10 +6,12 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/io.h>
 #include <linux/sizes.h>
+#include <linux/types.h>
 #include <mach/ddr.h>
 #include <mach/mc.h>
 
diff --git a/arch/mips/mach-mtmips/include/mach/ddr.h b/arch/mips/mach-mtmips/include/mach/ddr.h
index f92198137b1..e0ecb42726e 100644
--- a/arch/mips/mach-mtmips/include/mach/ddr.h
+++ b/arch/mips/mach-mtmips/include/mach/ddr.h
@@ -8,6 +8,7 @@
 #ifndef _MTMIPS_DDR_H_
 #define _MTMIPS_DDR_H_
 
+#include <compiler.h>
 #include <linux/io.h>
 #include <linux/types.h>
 
diff --git a/arch/mips/mach-mtmips/mt7628/ddr.c b/arch/mips/mach-mtmips/mt7628/ddr.c
index b091f2ecffc..c63f7bcb4e4 100644
--- a/arch/mips/mach-mtmips/mt7628/ddr.c
+++ b/arch/mips/mach-mtmips/mt7628/ddr.c
@@ -6,8 +6,10 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <asm/addrspace.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/sizes.h>
diff --git a/arch/mips/mach-mtmips/mt7628/init.c b/arch/mips/mach-mtmips/mt7628/init.c
index 8bf918b3f25..4c2623a360f 100644
--- a/arch/mips/mach-mtmips/mt7628/init.c
+++ b/arch/mips/mach-mtmips/mt7628/init.c
@@ -15,6 +15,7 @@
 #include <dm/uclass.h>
 #include <dt-bindings/clock/mt7628-clk.h>
 #include <linux/io.h>
+#include <linux/types.h>
 #include "mt7628.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/mips/mach-mtmips/mt7628/serial.c b/arch/mips/mach-mtmips/mt7628/serial.c
index a7d324792d7..17793927ed7 100644
--- a/arch/mips/mach-mtmips/mt7628/serial.c
+++ b/arch/mips/mach-mtmips/mt7628/serial.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <asm/io.h>
 #include "mt7628.h"
 
diff --git a/arch/mips/mach-mtmips/spl.c b/arch/mips/mach-mtmips/spl.c
index 95201b8d7ab..2cb2ecf0e59 100644
--- a/arch/mips/mach-mtmips/spl.c
+++ b/arch/mips/mach-mtmips/spl.c
@@ -11,6 +11,7 @@
 #include <asm/sections.h>
 #include <linux/libfdt.h>
 #include <linux/sizes.h>
+#include <linux/types.h>
 #include <mach/serial.h>
 
 void __noreturn board_init_f(ulong dummy)
diff --git a/arch/mips/mach-octeon/cache.c b/arch/mips/mach-octeon/cache.c
index 9a88bb97c73..8ccaa2a7f3f 100644
--- a/arch/mips/mach-octeon/cache.c
+++ b/arch/mips/mach-octeon/cache.c
@@ -4,6 +4,7 @@
  */
 
 #include <cpu_func.h>
+#include <linux/types.h>
 
 /*
  * The Octeon platform is cache coherent and cache flushes and invalidates
diff --git a/arch/mips/mach-octeon/clock.c b/arch/mips/mach-octeon/clock.c
index 05a312b2298..eb341b1ac38 100644
--- a/arch/mips/mach-octeon/clock.c
+++ b/arch/mips/mach-octeon/clock.c
@@ -6,6 +6,7 @@
 #include <compiler.h>
 #include <time.h>
 #include <asm/global_data.h>
+#include <linux/types.h>
 #include <mach/clock.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/mips/mach-octeon/cpu.c b/arch/mips/mach-octeon/cpu.c
index 1831f1dfa8c..5ac8b5047e2 100644
--- a/arch/mips/mach-octeon/cpu.c
+++ b/arch/mips/mach-octeon/cpu.c
@@ -3,6 +3,7 @@
  * Copyright (C) 2020 Marvell International Ltd.
  */
 
+#include <compiler.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/bitfield.h>
diff --git a/arch/mips/mach-octeon/dram.c b/arch/mips/mach-octeon/dram.c
index 331394b34a6..da3dc4746e5 100644
--- a/arch/mips/mach-octeon/dram.c
+++ b/arch/mips/mach-octeon/dram.c
@@ -8,6 +8,7 @@
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/compat.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/mips/mach-octeon/include/ioremap.h b/arch/mips/mach-octeon/include/ioremap.h
index 59b75008a25..43b24122084 100644
--- a/arch/mips/mach-octeon/include/ioremap.h
+++ b/arch/mips/mach-octeon/include/ioremap.h
@@ -2,6 +2,7 @@
 #ifndef __ASM_MACH_OCTEON_IOREMAP_H
 #define __ASM_MACH_OCTEON_IOREMAP_H
 
+#include <compiler.h>
 #include <linux/types.h>
 
 /*
diff --git a/arch/mips/mach-pic32/cpu.c b/arch/mips/mach-pic32/cpu.c
index bc76152ed3d..739ecec666c 100644
--- a/arch/mips/mach-pic32/cpu.c
+++ b/arch/mips/mach-pic32/cpu.c
@@ -6,11 +6,13 @@
  */
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <dm.h>
 #include <init.h>
 #include <malloc.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <linux/types.h>
 #include <mach/pic32.h>
 #include <mach/ddr.h>
 #include <dt-bindings/clock/microchip,clock.h>
diff --git a/arch/mips/mach-pic32/include/mach/ddr.h b/arch/mips/mach-pic32/include/mach/ddr.h
index 1b2391e0160..fe15bb1504e 100644
--- a/arch/mips/mach-pic32/include/mach/ddr.h
+++ b/arch/mips/mach-pic32/include/mach/ddr.h
@@ -8,6 +8,7 @@
 #define __MICROCHIP_PIC32_DDR_H
 
 /* called by dram_init() function */
+#include <asm/types.h>
 void ddr2_phy_init(void);
 void ddr2_ctrl_init(void);
 phys_size_t ddr2_calculate_size(void);
diff --git a/arch/mips/mach-pic32/include/mach/pic32.h b/arch/mips/mach-pic32/include/mach/pic32.h
index 69015334b94..1fdfec5aa54 100644
--- a/arch/mips/mach-pic32/include/mach/pic32.h
+++ b/arch/mips/mach-pic32/include/mach/pic32.h
@@ -7,7 +7,9 @@
 #ifndef __PIC32_REGS_H__
 #define __PIC32_REGS_H__
 
+#include <compiler.h>
 #include <asm/io.h>
+#include <asm/types.h>
 
 /* System Configuration */
 #define PIC32_CFG_BASE		0x1f800000
diff --git a/arch/mips/mach-pic32/reset.c b/arch/mips/mach-pic32/reset.c
index 8071b13f7b4..8c33ff7faf9 100644
--- a/arch/mips/mach-pic32/reset.c
+++ b/arch/mips/mach-pic32/reset.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <asm/io.h>
 #include <mach/pic32.h>
 
diff --git a/arch/nds32/cpu/n1213/ag101/timer.c b/arch/nds32/cpu/n1213/ag101/timer.c
index 7fef69cd213..c516e270ca2 100644
--- a/arch/nds32/cpu/n1213/ag101/timer.c
+++ b/arch/nds32/cpu/n1213/ag101/timer.c
@@ -68,6 +68,7 @@ int timer_init(void)
 /*
  * reset time
  */
+#include <linux/types.h>
 void reset_timer_masked(void)
 {
 	struct fttmr010 *tmr = (struct fttmr010 *)CONFIG_FTTMR010_BASE;
diff --git a/arch/nds32/include/asm/bootm.h b/arch/nds32/include/asm/bootm.h
index 804f8581b6e..aa8009fc8b7 100644
--- a/arch/nds32/include/asm/bootm.h
+++ b/arch/nds32/include/asm/bootm.h
@@ -9,6 +9,7 @@
 #define NDS32_BOOTM_H
 
 #include <asm/setup.h>
+#include <asm/types.h>
 
 extern void udc_disconnect(void);
 
diff --git a/arch/nds32/include/asm/io.h b/arch/nds32/include/asm/io.h
index fdfc574afc0..6555d3605b7 100644
--- a/arch/nds32/include/asm/io.h
+++ b/arch/nds32/include/asm/io.h
@@ -71,6 +71,7 @@ static inline phys_addr_t map_to_sysmem(const void *ptr)
 #define __arch_putw(v, a)		(*(unsigned short *)(a) = (v))
 #define __arch_putl(v, a)		(*(unsigned int *)(a) = (v))
 
+#include <compiler.h>
 extern void __raw_writesb(unsigned int addr, const void *data, int bytelen);
 extern void __raw_writesw(unsigned int addr, const void *data, int wordlen);
 extern void __raw_writesl(unsigned int addr, const void *data, int longlen);
diff --git a/arch/nds32/include/asm/setup.h b/arch/nds32/include/asm/setup.h
index 8217bbf6fe0..fcaa43a8247 100644
--- a/arch/nds32/include/asm/setup.h
+++ b/arch/nds32/include/asm/setup.h
@@ -13,6 +13,7 @@
 #ifndef __ASMNDS32_SETUP_H
 #define __ASMNDS32_SETUP_H
 
+#include <asm/types.h>
 #define COMMAND_LINE_SIZE 256
 
 /* The list ends with an ATAG_NONE node. */
diff --git a/arch/nds32/lib/boot.c b/arch/nds32/lib/boot.c
index 9411285fe23..9e3d2191b4b 100644
--- a/arch/nds32/lib/boot.c
+++ b/arch/nds32/lib/boot.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <command.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 unsigned long do_go_exec(ulong (*entry)(int, char * const []),
 			 int argc, char *const argv[])
diff --git a/arch/nds32/lib/bootm.c b/arch/nds32/lib/bootm.c
index 5532d515b73..47e8f90c417 100644
--- a/arch/nds32/lib/bootm.c
+++ b/arch/nds32/lib/bootm.c
@@ -17,6 +17,7 @@
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <u-boot/zlib.h>
 #include <asm/byteorder.h>
 #include <asm/bootm.h>
diff --git a/arch/nios2/cpu/interrupts.c b/arch/nios2/cpu/interrupts.c
index 90cabb67571..fe40eaaa02e 100644
--- a/arch/nios2/cpu/interrupts.c
+++ b/arch/nios2/cpu/interrupts.c
@@ -14,6 +14,7 @@
 #include <asm/types.h>
 #include <asm/io.h>
 #include <asm/ptrace.h>
+#include <linux/types.h>
 
 /*************************************************************************/
 struct	irq_action {
diff --git a/arch/nios2/include/asm/dma-mapping.h b/arch/nios2/include/asm/dma-mapping.h
index 65f67bc1f44..1dd7aa96e40 100644
--- a/arch/nios2/include/asm/dma-mapping.h
+++ b/arch/nios2/include/asm/dma-mapping.h
@@ -3,6 +3,7 @@
 
 #include <memalign.h>
 #include <asm/io.h>
+#include <linux/types.h>
 
 /*
  * dma_alloc_coherent() return cache-line aligned allocation which is mapped
diff --git a/arch/nios2/include/asm/global_data.h b/arch/nios2/include/asm/global_data.h
index 1a0e7d25fa3..4c9b6db070a 100644
--- a/arch/nios2/include/asm/global_data.h
+++ b/arch/nios2/include/asm/global_data.h
@@ -7,6 +7,7 @@
 #define __ASM_NIOS2_GLOBALDATA_H_
 
 /* Architecture-specific global data */
+#include <asm/types.h>
 struct arch_global_data {
 	u32 dcache_line_size;
 	u32 icache_line_size;
diff --git a/arch/nios2/include/asm/io.h b/arch/nios2/include/asm/io.h
index b22134cf29c..1e989c1e657 100644
--- a/arch/nios2/include/asm/io.h
+++ b/arch/nios2/include/asm/io.h
@@ -8,6 +8,7 @@
 #define __ASM_NIOS2_IO_H_
 
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <linux/string.h>
 
 static inline void sync(void)
diff --git a/arch/nios2/lib/bootm.c b/arch/nios2/lib/bootm.c
index 59099a4d5ea..d1be89a9917 100644
--- a/arch/nios2/lib/bootm.c
+++ b/arch/nios2/lib/bootm.c
@@ -11,6 +11,7 @@
 #include <irq_func.h>
 #include <log.h>
 #include <vsprintf.h>
+#include <linux/types.h>
 
 #define NIOS_MAGIC 0x534f494e /* enable command line and initrd passing */
 
diff --git a/arch/powerpc/cpu/mpc83xx/arbiter/arbiter.h b/arch/powerpc/cpu/mpc83xx/arbiter/arbiter.h
index 10a47e49876..b0740019e46 100644
--- a/arch/powerpc/cpu/mpc83xx/arbiter/arbiter.h
+++ b/arch/powerpc/cpu/mpc83xx/arbiter/arbiter.h
@@ -1,3 +1,4 @@
+#include <linux/types.h>
 	const __be32 acr_mask =
 #ifndef CONFIG_ACR_PIPE_DEP_UNSET
 		ACR_PIPE_DEP |
diff --git a/arch/powerpc/cpu/mpc83xx/cpu.c b/arch/powerpc/cpu/mpc83xx/cpu.c
index cdbf1e22636..a0b3d226b42 100644
--- a/arch/powerpc/cpu/mpc83xx/cpu.c
+++ b/arch/powerpc/cpu/mpc83xx/cpu.c
@@ -32,6 +32,7 @@
 #include <linux/immap_qe.h>
 #include <asm/io.h>
 #endif
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/powerpc/cpu/mpc83xx/cpu_init.c b/arch/powerpc/cpu/mpc83xx/cpu_init.c
index 8d242792987..0f1302e9eb6 100644
--- a/arch/powerpc/cpu/mpc83xx/cpu_init.c
+++ b/arch/powerpc/cpu/mpc83xx/cpu_init.c
@@ -16,6 +16,7 @@
 #endif
 #include <linux/delay.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include "lblaw/lblaw.h"
 #include "elbc/elbc.h"
diff --git a/arch/powerpc/cpu/mpc83xx/ecc.c b/arch/powerpc/cpu/mpc83xx/ecc.c
index 2d9c8f24882..49f718298c2 100644
--- a/arch/powerpc/cpu/mpc83xx/ecc.c
+++ b/arch/powerpc/cpu/mpc83xx/ecc.c
@@ -7,11 +7,13 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <irq_func.h>
 #include <mpc83xx.h>
 #include <command.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
 
diff --git a/arch/powerpc/cpu/mpc83xx/fdt.c b/arch/powerpc/cpu/mpc83xx/fdt.c
index f658f98d5d6..8d47b3df766 100644
--- a/arch/powerpc/cpu/mpc83xx/fdt.c
+++ b/arch/powerpc/cpu/mpc83xx/fdt.c
@@ -13,6 +13,7 @@
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <asm/processor.h>
+#include <linux/types.h>
 
 extern void ft_qe_setup(void *blob);
 
diff --git a/arch/powerpc/cpu/mpc83xx/initreg/initreg.h b/arch/powerpc/cpu/mpc83xx/initreg/initreg.h
index 63aa5c94669..1d4984bfc30 100644
--- a/arch/powerpc/cpu/mpc83xx/initreg/initreg.h
+++ b/arch/powerpc/cpu/mpc83xx/initreg/initreg.h
@@ -1,3 +1,4 @@
+#include <linux/types.h>
 #define SPCR_PCIHPE_MASK	0x10000000
 #define SPCR_PCIPR_MASK		0x03000000
 #define SPCR_OPT_MASK		0x00800000
diff --git a/arch/powerpc/cpu/mpc83xx/interrupts.c b/arch/powerpc/cpu/mpc83xx/interrupts.c
index 2f463f87f7c..678d1db05cf 100644
--- a/arch/powerpc/cpu/mpc83xx/interrupts.c
+++ b/arch/powerpc/cpu/mpc83xx/interrupts.c
@@ -14,6 +14,7 @@
 #include <asm/processor.h>
 #include <asm/ptrace.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/powerpc/cpu/mpc83xx/pci.c b/arch/powerpc/cpu/mpc83xx/pci.c
index 17882bce7d2..4a7fb160b5d 100644
--- a/arch/powerpc/cpu/mpc83xx/pci.c
+++ b/arch/powerpc/cpu/mpc83xx/pci.c
@@ -12,6 +12,7 @@
 #include <stdio.h>
 #include <asm/bitops.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 
diff --git a/arch/powerpc/cpu/mpc83xx/pcie.c b/arch/powerpc/cpu/mpc83xx/pcie.c
index 31883daa469..dc4fd57266c 100644
--- a/arch/powerpc/cpu/mpc83xx/pcie.c
+++ b/arch/powerpc/cpu/mpc83xx/pcie.c
@@ -13,6 +13,7 @@
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
diff --git a/arch/powerpc/cpu/mpc83xx/qe_io.c b/arch/powerpc/cpu/mpc83xx/qe_io.c
index 88aa6895511..d111def6f1d 100644
--- a/arch/powerpc/cpu/mpc83xx/qe_io.c
+++ b/arch/powerpc/cpu/mpc83xx/qe_io.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <asm/io.h>
 #include <asm/immap_83xx.h>
diff --git a/arch/powerpc/cpu/mpc83xx/spd_sdram.c b/arch/powerpc/cpu/mpc83xx/spd_sdram.c
index b258f7f98a5..7e10d7cb464 100644
--- a/arch/powerpc/cpu/mpc83xx/spd_sdram.c
+++ b/arch/powerpc/cpu/mpc83xx/spd_sdram.c
@@ -170,6 +170,7 @@ long int spd_sdram()
 
 	/* Read SPD parameters with I2C */
 	CONFIG_SYS_READ_SPD(SPD_EEPROM_ADDRESS, SPD_EEPROM_OFFSET,
+#include <linux/types.h>
 		SPD_EEPROM_ADDR_LEN, (uchar *) &spd, sizeof(spd));
 #ifdef SPD_DEBUG
 	spd_debug(&spd);
diff --git a/arch/powerpc/cpu/mpc83xx/speed.c b/arch/powerpc/cpu/mpc83xx/speed.c
index 2f1355dfec9..6b620677075 100644
--- a/arch/powerpc/cpu/mpc83xx/speed.c
+++ b/arch/powerpc/cpu/mpc83xx/speed.c
@@ -505,6 +505,7 @@ int get_clocks(void)
  * get_bus_freq
  * return system bus freq in Hz
  *********************************************/
+#include <linux/types.h>
 ulong get_bus_freq(ulong dummy)
 {
 	return gd->arch.csb_clk;
diff --git a/arch/powerpc/cpu/mpc83xx/spl_minimal.c b/arch/powerpc/cpu/mpc83xx/spl_minimal.c
index f0d8330d3ac..b01448e45ff 100644
--- a/arch/powerpc/cpu/mpc83xx/spl_minimal.c
+++ b/arch/powerpc/cpu/mpc83xx/spl_minimal.c
@@ -11,6 +11,7 @@
 #include <time.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 #include "lblaw/lblaw.h"
 #include "elbc/elbc.h"
diff --git a/arch/powerpc/cpu/mpc83xx/traps.c b/arch/powerpc/cpu/mpc83xx/traps.c
index b51bc729ca7..ed53fcb412d 100644
--- a/arch/powerpc/cpu/mpc83xx/traps.c
+++ b/arch/powerpc/cpu/mpc83xx/traps.c
@@ -21,6 +21,7 @@
 #include <asm/processor.h>
 #include <asm/mpc8349_pci.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/powerpc/cpu/mpc85xx/b4860_serdes.c b/arch/powerpc/cpu/mpc85xx/b4860_serdes.c
index ec18f298747..fef017c5158 100644
--- a/arch/powerpc/cpu/mpc85xx/b4860_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/b4860_serdes.c
@@ -7,6 +7,7 @@
 #include <asm/fsl_serdes.h>
 #include <asm/processor.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 #include "fsl_corenet2_serdes.h"
 
diff --git a/arch/powerpc/cpu/mpc85xx/bsc9132_serdes.c b/arch/powerpc/cpu/mpc85xx/bsc9132_serdes.c
index f5c9d1d8175..9a446535ed8 100644
--- a/arch/powerpc/cpu/mpc85xx/bsc9132_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/bsc9132_serdes.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 
 #define SRDS1_MAX_LANES		4
diff --git a/arch/powerpc/cpu/mpc85xx/c29x_serdes.c b/arch/powerpc/cpu/mpc85xx/c29x_serdes.c
index 8c61fd471bc..8bff23cbbf8 100644
--- a/arch/powerpc/cpu/mpc85xx/c29x_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/c29x_serdes.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 
 #define SRDS1_MAX_LANES		4
diff --git a/arch/powerpc/cpu/mpc85xx/cmd_errata.c b/arch/powerpc/cpu/mpc85xx/cmd_errata.c
index 59fdc8860d9..6bfdddd1bd4 100644
--- a/arch/powerpc/cpu/mpc85xx/cmd_errata.c
+++ b/arch/powerpc/cpu/mpc85xx/cmd_errata.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <init.h>
 #include <stdio.h>
 #include <asm/u-boot.h>
@@ -13,6 +14,7 @@
 #include <asm/processor.h>
 #include <fsl_usb.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include "fsl_corenet_serdes.h"
 
 #ifdef CONFIG_SYS_FSL_ERRATUM_A004849
diff --git a/arch/powerpc/cpu/mpc85xx/commproc.c b/arch/powerpc/cpu/mpc85xx/commproc.c
index 79ad806dbdf..9c6b8b75993 100644
--- a/arch/powerpc/cpu/mpc85xx/commproc.c
+++ b/arch/powerpc/cpu/mpc85xx/commproc.c
@@ -27,6 +27,7 @@
 #include <asm/cpm_85xx.h>
 #include <asm/global_data.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/powerpc/cpu/mpc85xx/cpu.c b/arch/powerpc/cpu/mpc85xx/cpu.c
index da578d6c900..f61ad7c740b 100644
--- a/arch/powerpc/cpu/mpc85xx/cpu.c
+++ b/arch/powerpc/cpu/mpc85xx/cpu.c
@@ -8,6 +8,7 @@
  * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
  */
 
+#include <compiler.h>
 #include <config.h>
 #include <common.h>
 #include <cpu_func.h>
@@ -35,6 +36,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init.c b/arch/powerpc/cpu/mpc85xx/cpu_init.c
index 96d00883574..faa36693c04 100644
--- a/arch/powerpc/cpu/mpc85xx/cpu_init.c
+++ b/arch/powerpc/cpu/mpc85xx/cpu_init.c
@@ -10,6 +10,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <display_options.h>
 #include <env.h>
 #include <init.h>
@@ -40,6 +41,7 @@
 #include <linux/compiler.h>
 #include <linux/delay.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "mp.h"
 #ifdef CONFIG_CHAIN_OF_TRUST
 #include <fsl_validate.h>
diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init_early.c b/arch/powerpc/cpu/mpc85xx/cpu_init_early.c
index 4195ecc5c98..867fe124292 100644
--- a/arch/powerpc/cpu/mpc85xx/cpu_init_early.c
+++ b/arch/powerpc/cpu/mpc85xx/cpu_init_early.c
@@ -10,6 +10,7 @@
 #include <asm/mmu.h>
 #include <asm/fsl_law.h>
 #include <asm/io.h>
+#include <asm/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/powerpc/cpu/mpc85xx/ether_fcc.c b/arch/powerpc/cpu/mpc85xx/ether_fcc.c
index df1981cc7ae..f2b108038ce 100644
--- a/arch/powerpc/cpu/mpc85xx/ether_fcc.c
+++ b/arch/powerpc/cpu/mpc85xx/ether_fcc.c
@@ -15,6 +15,7 @@
  * Basic ET HW initialization and packet RX/TX routines
  *
  * This code will not perform the IO port configuration. This should be
+#include <linux/types.h>
  * done in the iop_conf_t structure specific for the board.
  *
  * TODO:
diff --git a/arch/powerpc/cpu/mpc85xx/fdt.c b/arch/powerpc/cpu/mpc85xx/fdt.c
index 4864a6809a4..184ff257d49 100644
--- a/arch/powerpc/cpu/mpc85xx/fdt.c
+++ b/arch/powerpc/cpu/mpc85xx/fdt.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <clock_legacy.h>
+#include <compiler.h>
 #include <env.h>
 #include <log.h>
 #include <stdio.h>
@@ -31,6 +32,7 @@
 #include <fsl_fman.h>
 #endif
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c b/arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c
index accc10983b2..5ccd8dd1c29 100644
--- a/arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <log.h>
 #include <stdio.h>
 #include <asm/fsl_serdes.h>
@@ -11,6 +12,7 @@
 #include <asm/io.h>
 #include <asm/processor.h>
 #include <asm/fsl_law.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.h b/arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.h
index 4e2d4442746..76118b45cc1 100644
--- a/arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.h
+++ b/arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.h
@@ -6,6 +6,7 @@
 #ifndef __FSL_CORENET2_SERDES_H
 #define __FSL_CORENET2_SERDES_H
 
+#include <asm/types.h>
 int is_serdes_prtcl_valid(int serdes, u32 prtcl);
 int serdes_lane_enabled(int lane);
 #endif /* __FSL_CORENET2_SERDES_H */
diff --git a/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c b/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c
index a24e5feb932..91c95b39f9d 100644
--- a/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c
@@ -21,6 +21,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include "fsl_corenet_serdes.h"
 
 /*
diff --git a/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.h b/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.h
index e95dc485814..705632eaa39 100644
--- a/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.h
+++ b/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.h
@@ -8,6 +8,7 @@
 #ifndef __FSL_CORENET_SERDES_H
 #define __FSL_CORENET_SERDES_H
 
+#include <linux/types.h>
 enum srds_bank {
 	FSL_SRDS_BANK_1  = 0,
 	FSL_SRDS_BANK_2  = 1,
diff --git a/arch/powerpc/cpu/mpc85xx/interrupts.c b/arch/powerpc/cpu/mpc85xx/interrupts.c
index cfb2c7bf0ad..adcea19777c 100644
--- a/arch/powerpc/cpu/mpc85xx/interrupts.c
+++ b/arch/powerpc/cpu/mpc85xx/interrupts.c
@@ -11,6 +11,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <irq_func.h>
 #include <log.h>
 #include <time.h>
@@ -23,6 +24,7 @@
 #endif
 #include <asm/ptrace.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 void interrupt_init_cpu(unsigned *decrementer_count)
 {
diff --git a/arch/powerpc/cpu/mpc85xx/liodn.c b/arch/powerpc/cpu/mpc85xx/liodn.c
index 5be3e08f040..b38a771a70e 100644
--- a/arch/powerpc/cpu/mpc85xx/liodn.c
+++ b/arch/powerpc/cpu/mpc85xx/liodn.c
@@ -11,6 +11,7 @@
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <asm/immap_85xx.h>
 #include <asm/io.h>
diff --git a/arch/powerpc/cpu/mpc85xx/mp.c b/arch/powerpc/cpu/mpc85xx/mp.c
index 31ce76c01dd..56fc046a264 100644
--- a/arch/powerpc/cpu/mpc85xx/mp.c
+++ b/arch/powerpc/cpu/mpc85xx/mp.c
@@ -21,6 +21,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "mp.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/powerpc/cpu/mpc85xx/mp.h b/arch/powerpc/cpu/mpc85xx/mp.h
index ad9950bcf59..d8cd535b066 100644
--- a/arch/powerpc/cpu/mpc85xx/mp.h
+++ b/arch/powerpc/cpu/mpc85xx/mp.h
@@ -2,6 +2,7 @@
 #define __MPC85XX_MP_H_
 
 #include <asm/mp.h>
+#include <asm/types.h>
 
 phys_addr_t get_spin_phys_addr(void);
 u32 get_my_id(void);
diff --git a/arch/powerpc/cpu/mpc85xx/mpc8536_serdes.c b/arch/powerpc/cpu/mpc85xx/mpc8536_serdes.c
index d87150df761..557238c0183 100644
--- a/arch/powerpc/cpu/mpc85xx/mpc8536_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/mpc8536_serdes.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/kernel.h>
 
diff --git a/arch/powerpc/cpu/mpc85xx/mpc8544_serdes.c b/arch/powerpc/cpu/mpc85xx/mpc8544_serdes.c
index 0a472d0fd15..6913d669897 100644
--- a/arch/powerpc/cpu/mpc85xx/mpc8544_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/mpc8544_serdes.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/kernel.h>
 
diff --git a/arch/powerpc/cpu/mpc85xx/mpc8548_serdes.c b/arch/powerpc/cpu/mpc85xx/mpc8548_serdes.c
index ae291188f91..9f426b2f103 100644
--- a/arch/powerpc/cpu/mpc85xx/mpc8548_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/mpc8548_serdes.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/kernel.h>
 
diff --git a/arch/powerpc/cpu/mpc85xx/mpc8568_serdes.c b/arch/powerpc/cpu/mpc85xx/mpc8568_serdes.c
index 06c47826325..089785f71e4 100644
--- a/arch/powerpc/cpu/mpc85xx/mpc8568_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/mpc8568_serdes.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/kernel.h>
 
diff --git a/arch/powerpc/cpu/mpc85xx/mpc8569_serdes.c b/arch/powerpc/cpu/mpc85xx/mpc8569_serdes.c
index b5c9d829b7b..7b1880b6aa0 100644
--- a/arch/powerpc/cpu/mpc85xx/mpc8569_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/mpc8569_serdes.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/kernel.h>
 
diff --git a/arch/powerpc/cpu/mpc85xx/mpc8572_serdes.c b/arch/powerpc/cpu/mpc85xx/mpc8572_serdes.c
index f9976cce09d..7f946540208 100644
--- a/arch/powerpc/cpu/mpc85xx/mpc8572_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/mpc8572_serdes.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/kernel.h>
 
diff --git a/arch/powerpc/cpu/mpc85xx/p1010_serdes.c b/arch/powerpc/cpu/mpc85xx/p1010_serdes.c
index 7eac3017052..c10fc0804f7 100644
--- a/arch/powerpc/cpu/mpc85xx/p1010_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/p1010_serdes.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/kernel.h>
 
diff --git a/arch/powerpc/cpu/mpc85xx/p1021_serdes.c b/arch/powerpc/cpu/mpc85xx/p1021_serdes.c
index 01e0830d655..81429d6ed2c 100644
--- a/arch/powerpc/cpu/mpc85xx/p1021_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/p1021_serdes.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
diff --git a/arch/powerpc/cpu/mpc85xx/p1022_serdes.c b/arch/powerpc/cpu/mpc85xx/p1022_serdes.c
index 7632fdbaf09..3fd6ed04b7b 100644
--- a/arch/powerpc/cpu/mpc85xx/p1022_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/p1022_serdes.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/kernel.h>
 
diff --git a/arch/powerpc/cpu/mpc85xx/p1023_serdes.c b/arch/powerpc/cpu/mpc85xx/p1023_serdes.c
index fbb2573d2c7..8143bd1217a 100644
--- a/arch/powerpc/cpu/mpc85xx/p1023_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/p1023_serdes.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/kernel.h>
 
diff --git a/arch/powerpc/cpu/mpc85xx/p2020_serdes.c b/arch/powerpc/cpu/mpc85xx/p2020_serdes.c
index f1a60827f8a..d02473f23de 100644
--- a/arch/powerpc/cpu/mpc85xx/p2020_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/p2020_serdes.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/kernel.h>
 
diff --git a/arch/powerpc/cpu/mpc85xx/p2041_serdes.c b/arch/powerpc/cpu/mpc85xx/p2041_serdes.c
index 1825720d6f2..6a93417dc5b 100644
--- a/arch/powerpc/cpu/mpc85xx/p2041_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/p2041_serdes.c
@@ -7,6 +7,7 @@
 #include <asm/fsl_serdes.h>
 #include <asm/processor.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/kernel.h>
 #include "fsl_corenet_serdes.h"
diff --git a/arch/powerpc/cpu/mpc85xx/p3041_serdes.c b/arch/powerpc/cpu/mpc85xx/p3041_serdes.c
index 9dbf8463d88..e0b767888bb 100644
--- a/arch/powerpc/cpu/mpc85xx/p3041_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/p3041_serdes.c
@@ -7,6 +7,7 @@
 #include <asm/fsl_serdes.h>
 #include <asm/processor.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/kernel.h>
 #include "fsl_corenet_serdes.h"
diff --git a/arch/powerpc/cpu/mpc85xx/p4080_serdes.c b/arch/powerpc/cpu/mpc85xx/p4080_serdes.c
index feb7d6ddb7a..749145a5ac3 100644
--- a/arch/powerpc/cpu/mpc85xx/p4080_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/p4080_serdes.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <asm/u-boot.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include "fsl_corenet_serdes.h"
 
 static u8 serdes_cfg_tbl[][SRDS_MAX_LANES] = {
diff --git a/arch/powerpc/cpu/mpc85xx/p5020_serdes.c b/arch/powerpc/cpu/mpc85xx/p5020_serdes.c
index 9dbf8463d88..e0b767888bb 100644
--- a/arch/powerpc/cpu/mpc85xx/p5020_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/p5020_serdes.c
@@ -7,6 +7,7 @@
 #include <asm/fsl_serdes.h>
 #include <asm/processor.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/kernel.h>
 #include "fsl_corenet_serdes.h"
diff --git a/arch/powerpc/cpu/mpc85xx/p5040_serdes.c b/arch/powerpc/cpu/mpc85xx/p5040_serdes.c
index 5bb7ec0a09a..8e6fc7e7dd5 100644
--- a/arch/powerpc/cpu/mpc85xx/p5040_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/p5040_serdes.c
@@ -7,6 +7,7 @@
 #include <asm/fsl_serdes.h>
 #include <asm/processor.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/kernel.h>
 #include "fsl_corenet_serdes.h"
diff --git a/arch/powerpc/cpu/mpc85xx/pci.c b/arch/powerpc/cpu/mpc85xx/pci.c
index 5cfdb0e0d2e..a1707d01de0 100644
--- a/arch/powerpc/cpu/mpc85xx/pci.c
+++ b/arch/powerpc/cpu/mpc85xx/pci.c
@@ -12,6 +12,7 @@
 #include <stdio.h>
 #include <asm/bitops.h>
 #include <asm/cpm_85xx.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <pci.h>
 
diff --git a/arch/powerpc/cpu/mpc85xx/portals.c b/arch/powerpc/cpu/mpc85xx/portals.c
index add179be385..34994e31c62 100644
--- a/arch/powerpc/cpu/mpc85xx/portals.c
+++ b/arch/powerpc/cpu/mpc85xx/portals.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <asm/types.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <linux/string.h>
diff --git a/arch/powerpc/cpu/mpc85xx/qe_io.c b/arch/powerpc/cpu/mpc85xx/qe_io.c
index fb75fa105ba..f3b365d8607 100644
--- a/arch/powerpc/cpu/mpc85xx/qe_io.c
+++ b/arch/powerpc/cpu/mpc85xx/qe_io.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
diff --git a/arch/powerpc/cpu/mpc85xx/serial_scc.c b/arch/powerpc/cpu/mpc85xx/serial_scc.c
index a2505d1ffc1..858f93d5dd8 100644
--- a/arch/powerpc/cpu/mpc85xx/serial_scc.c
+++ b/arch/powerpc/cpu/mpc85xx/serial_scc.c
@@ -16,10 +16,12 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <asm/cpm_85xx.h>
 #include <serial.h>
 #include <asm/global_data.h>
 #include <linux/compiler.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/powerpc/cpu/mpc85xx/speed.c b/arch/powerpc/cpu/mpc85xx/speed.c
index 2e354897863..47e32ae6461 100644
--- a/arch/powerpc/cpu/mpc85xx/speed.c
+++ b/arch/powerpc/cpu/mpc85xx/speed.c
@@ -18,6 +18,7 @@
 #include <linux/compiler.h>
 #include <asm/processor.h>
 #include <asm/io.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/powerpc/cpu/mpc85xx/spl_minimal.c b/arch/powerpc/cpu/mpc85xx/spl_minimal.c
index 723f6ecef62..b6bd0438452 100644
--- a/arch/powerpc/cpu/mpc85xx/spl_minimal.c
+++ b/arch/powerpc/cpu/mpc85xx/spl_minimal.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/powerpc/cpu/mpc85xx/t1024_serdes.c b/arch/powerpc/cpu/mpc85xx/t1024_serdes.c
index b1e1761688d..86daf910b25 100644
--- a/arch/powerpc/cpu/mpc85xx/t1024_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/t1024_serdes.c
@@ -7,6 +7,7 @@
 #include <asm/fsl_serdes.h>
 #include <asm/processor.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/kernel.h>
 
diff --git a/arch/powerpc/cpu/mpc85xx/t1040_serdes.c b/arch/powerpc/cpu/mpc85xx/t1040_serdes.c
index dc3b660109e..4ceb2752f3a 100644
--- a/arch/powerpc/cpu/mpc85xx/t1040_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/t1040_serdes.c
@@ -7,6 +7,7 @@
 #include <asm/fsl_serdes.h>
 #include <asm/processor.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/kernel.h>
 
diff --git a/arch/powerpc/cpu/mpc85xx/t2080_serdes.c b/arch/powerpc/cpu/mpc85xx/t2080_serdes.c
index 60c59984508..5bf64b1adcc 100644
--- a/arch/powerpc/cpu/mpc85xx/t2080_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/t2080_serdes.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <asm/fsl_serdes.h>
 #include <asm/processor.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/kernel.h>
 #include "fsl_corenet2_serdes.h"
diff --git a/arch/powerpc/cpu/mpc85xx/t4240_serdes.c b/arch/powerpc/cpu/mpc85xx/t4240_serdes.c
index e6b59e13313..d3b3822eb69 100644
--- a/arch/powerpc/cpu/mpc85xx/t4240_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/t4240_serdes.c
@@ -7,6 +7,7 @@
 #include <asm/fsl_serdes.h>
 #include <asm/processor.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/kernel.h>
 #include "fsl_corenet2_serdes.h"
diff --git a/arch/powerpc/cpu/mpc85xx/tlb.c b/arch/powerpc/cpu/mpc85xx/tlb.c
index 56cbec484fc..9e529f62dec 100644
--- a/arch/powerpc/cpu/mpc85xx/tlb.c
+++ b/arch/powerpc/cpu/mpc85xx/tlb.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <display_options.h>
 #include <stdio.h>
 #include <asm/bitops.h>
@@ -18,6 +19,7 @@
 #include <addr_map.h>
 #endif
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include <linux/log2.h>
 
diff --git a/arch/powerpc/cpu/mpc85xx/traps.c b/arch/powerpc/cpu/mpc85xx/traps.c
index ba564dedcfd..3d9892577ed 100644
--- a/arch/powerpc/cpu/mpc85xx/traps.c
+++ b/arch/powerpc/cpu/mpc85xx/traps.c
@@ -30,6 +30,7 @@
 #include <kgdb.h>
 #include <asm/processor.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/powerpc/cpu/mpc86xx/cpu.c b/arch/powerpc/cpu/mpc86xx/cpu.c
index 8db7fe91e25..a6031c6dc2f 100644
--- a/arch/powerpc/cpu/mpc86xx/cpu.c
+++ b/arch/powerpc/cpu/mpc86xx/cpu.c
@@ -22,6 +22,7 @@
 #include <asm/ppc.h>
 #include <asm/u-boot.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/powerpc/cpu/mpc86xx/fdt.c b/arch/powerpc/cpu/mpc86xx/fdt.c
index be6292dd6a3..5b1fbb4ea44 100644
--- a/arch/powerpc/cpu/mpc86xx/fdt.c
+++ b/arch/powerpc/cpu/mpc86xx/fdt.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
diff --git a/arch/powerpc/cpu/mpc86xx/interrupts.c b/arch/powerpc/cpu/mpc86xx/interrupts.c
index 7ae5b7d0b3a..9ca5ee8e756 100644
--- a/arch/powerpc/cpu/mpc86xx/interrupts.c
+++ b/arch/powerpc/cpu/mpc86xx/interrupts.c
@@ -27,6 +27,7 @@
 #endif
 #include <asm/ptrace.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 void interrupt_init_cpu(unsigned *decrementer_count)
 {
diff --git a/arch/powerpc/cpu/mpc86xx/mp.c b/arch/powerpc/cpu/mpc86xx/mp.c
index d6256e8b375..7bfaeb39d33 100644
--- a/arch/powerpc/cpu/mpc86xx/mp.c
+++ b/arch/powerpc/cpu/mpc86xx/mp.c
@@ -14,6 +14,7 @@
 #include <asm/io.h>
 #include <asm/mp.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/powerpc/cpu/mpc86xx/mpc8610_serdes.c b/arch/powerpc/cpu/mpc86xx/mpc8610_serdes.c
index e91ebe4b1db..ec34a717d8b 100644
--- a/arch/powerpc/cpu/mpc86xx/mpc8610_serdes.c
+++ b/arch/powerpc/cpu/mpc86xx/mpc8610_serdes.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <asm/immap_86xx.h>
 #include <asm/fsl_serdes.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 
 #define SRDS1_MAX_LANES		4
diff --git a/arch/powerpc/cpu/mpc86xx/mpc8641_serdes.c b/arch/powerpc/cpu/mpc86xx/mpc8641_serdes.c
index 232f85c2ad9..4983d8cd837 100644
--- a/arch/powerpc/cpu/mpc86xx/mpc8641_serdes.c
+++ b/arch/powerpc/cpu/mpc86xx/mpc8641_serdes.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <asm/immap_86xx.h>
 #include <asm/fsl_serdes.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 
 #define SRDS1_MAX_LANES		4
diff --git a/arch/powerpc/cpu/mpc86xx/speed.c b/arch/powerpc/cpu/mpc86xx/speed.c
index 770a9449197..64f229df72e 100644
--- a/arch/powerpc/cpu/mpc86xx/speed.c
+++ b/arch/powerpc/cpu/mpc86xx/speed.c
@@ -15,6 +15,7 @@
 #include <asm/processor.h>
 #include <asm/io.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/powerpc/cpu/mpc86xx/traps.c b/arch/powerpc/cpu/mpc86xx/traps.c
index d9728d0df33..ddf181c39ea 100644
--- a/arch/powerpc/cpu/mpc86xx/traps.c
+++ b/arch/powerpc/cpu/mpc86xx/traps.c
@@ -23,6 +23,7 @@
 #include <kgdb.h>
 #include <asm/processor.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/powerpc/cpu/mpc8xx/cpu.c b/arch/powerpc/cpu/mpc8xx/cpu.c
index 926a163eeea..dbd7e867dc2 100644
--- a/arch/powerpc/cpu/mpc8xx/cpu.c
+++ b/arch/powerpc/cpu/mpc8xx/cpu.c
@@ -17,6 +17,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <display_options.h>
 #include <net.h>
@@ -33,6 +34,7 @@
 #include <asm/u-boot.h>
 #include <linux/compiler.h>
 #include <asm/io.h>
+#include <linux/types.h>
 
 #if defined(CONFIG_OF_LIBFDT)
 #include <linux/libfdt.h>
diff --git a/arch/powerpc/cpu/mpc8xx/cpu_init.c b/arch/powerpc/cpu/mpc8xx/cpu_init.c
index fdba3d2c42c..7c9423b88f6 100644
--- a/arch/powerpc/cpu/mpc8xx/cpu_init.c
+++ b/arch/powerpc/cpu/mpc8xx/cpu_init.c
@@ -5,9 +5,11 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <init.h>
 #include <watchdog.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 #include <mpc8xx.h>
 #include <asm/cpm_8xx.h>
diff --git a/arch/powerpc/cpu/mpc8xx/immap.c b/arch/powerpc/cpu/mpc8xx/immap.c
index 1c65409ee30..692bcaee628 100644
--- a/arch/powerpc/cpu/mpc8xx/immap.c
+++ b/arch/powerpc/cpu/mpc8xx/immap.c
@@ -10,10 +10,12 @@
 
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 #include <asm/immap_8xx.h>
 #include <asm/cpm_8xx.h>
diff --git a/arch/powerpc/cpu/mpc8xx/interrupts.c b/arch/powerpc/cpu/mpc8xx/interrupts.c
index e0f3936f1bc..781fd85171a 100644
--- a/arch/powerpc/cpu/mpc8xx/interrupts.c
+++ b/arch/powerpc/cpu/mpc8xx/interrupts.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <irq_func.h>
 #include <mpc8xx.h>
 #include <mpc8xx_irq.h>
@@ -15,6 +16,7 @@
 #include <asm/io.h>
 #include <asm/ptrace.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 /************************************************************************/
 
diff --git a/arch/powerpc/cpu/mpc8xx/speed.c b/arch/powerpc/cpu/mpc8xx/speed.c
index ad3d3f9101c..26d12563bd0 100644
--- a/arch/powerpc/cpu/mpc8xx/speed.c
+++ b/arch/powerpc/cpu/mpc8xx/speed.c
@@ -6,10 +6,12 @@
 
 #include <common.h>
 #include <clock_legacy.h>
+#include <compiler.h>
 #include <mpc8xx.h>
 #include <asm/global_data.h>
 #include <asm/processor.h>
 #include <asm/io.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/powerpc/cpu/mpc8xx/traps.c b/arch/powerpc/cpu/mpc8xx/traps.c
index 55c69225e37..f8531ee7d36 100644
--- a/arch/powerpc/cpu/mpc8xx/traps.c
+++ b/arch/powerpc/cpu/mpc8xx/traps.c
@@ -22,6 +22,7 @@
 #include <command.h>
 #include <asm/processor.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 /* Returns 0 if exception not found and fixup otherwise.  */
 extern unsigned long search_exception_table(unsigned long);
diff --git a/arch/powerpc/cpu/mpc8xxx/cpu.c b/arch/powerpc/cpu/mpc8xxx/cpu.c
index e9ff1d2aaf9..8a4a42be4f4 100644
--- a/arch/powerpc/cpu/mpc8xxx/cpu.c
+++ b/arch/powerpc/cpu/mpc8xxx/cpu.c
@@ -7,6 +7,7 @@
  * cpu specific common code for 85xx/86xx processors.
  */
 
+#include <compiler.h>
 #include <config.h>
 #include <common.h>
 #include <command.h>
@@ -22,6 +23,7 @@
 #include <vsc9953.h>
 #include <asm/u-boot.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/powerpc/cpu/mpc8xxx/fdt.c b/arch/powerpc/cpu/mpc8xxx/fdt.c
index 0bd2dbe8f97..15f7b712e40 100644
--- a/arch/powerpc/cpu/mpc8xxx/fdt.c
+++ b/arch/powerpc/cpu/mpc8xxx/fdt.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
diff --git a/arch/powerpc/cpu/mpc8xxx/fsl_lbc.c b/arch/powerpc/cpu/mpc8xxx/fsl_lbc.c
index 75c2d7629ce..d77f649cabb 100644
--- a/arch/powerpc/cpu/mpc8xxx/fsl_lbc.c
+++ b/arch/powerpc/cpu/mpc8xxx/fsl_lbc.c
@@ -9,6 +9,7 @@
 #include <stdio.h>
 #include <asm/fsl_lbc.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_MPC83xx
 #include "../mpc83xx/elbc/elbc.h"
diff --git a/arch/powerpc/cpu/mpc8xxx/fsl_pamu.c b/arch/powerpc/cpu/mpc8xxx/fsl_pamu.c
index bc1b38da541..697031cd2ef 100644
--- a/arch/powerpc/cpu/mpc8xxx/fsl_pamu.c
+++ b/arch/powerpc/cpu/mpc8xxx/fsl_pamu.c
@@ -14,6 +14,7 @@
 #include <asm/fsl_pamu.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 struct paace *ppaact;
 struct paace *sec;
diff --git a/arch/powerpc/cpu/mpc8xxx/law.c b/arch/powerpc/cpu/mpc8xxx/law.c
index ddb53e6db65..427210a6c68 100644
--- a/arch/powerpc/cpu/mpc8xxx/law.c
+++ b/arch/powerpc/cpu/mpc8xxx/law.c
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <asm/bitops.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/compiler.h>
 #include <asm/fsl_law.h>
diff --git a/arch/powerpc/cpu/mpc8xxx/pamu_table.c b/arch/powerpc/cpu/mpc8xxx/pamu_table.c
index bf559d0f833..21b92a390b0 100644
--- a/arch/powerpc/cpu/mpc8xxx/pamu_table.c
+++ b/arch/powerpc/cpu/mpc8xxx/pamu_table.c
@@ -8,6 +8,7 @@
 #include <asm/fsl_pamu.h>
 #include <asm/global_data.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/powerpc/cpu/mpc8xxx/srio.c b/arch/powerpc/cpu/mpc8xxx/srio.c
index 3548acdb256..8d4761f38a2 100644
--- a/arch/powerpc/cpu/mpc8xxx/srio.c
+++ b/arch/powerpc/cpu/mpc8xxx/srio.c
@@ -11,6 +11,7 @@
 #include <asm/fsl_law.h>
 #include <asm/fsl_serdes.h>
 #include <asm/fsl_srio.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/arch/powerpc/include/asm/arch-mpc83xx/gpio.h b/arch/powerpc/include/asm/arch-mpc83xx/gpio.h
index 8a6896e6229..7450468304f 100644
--- a/arch/powerpc/include/asm/arch-mpc83xx/gpio.h
+++ b/arch/powerpc/include/asm/arch-mpc83xx/gpio.h
@@ -16,6 +16,7 @@
 #define MPC83XX_GPIO_CTRLRS 0
 #endif
 
+#include <linux/types.h>
 #define MAX_NUM_GPIOS (32 * MPC83XX_GPIO_CTRLRS)
 
 struct mpc8xxx_gpio_plat {
diff --git a/arch/powerpc/include/asm/arch-mpc85xx/gpio.h b/arch/powerpc/include/asm/arch-mpc85xx/gpio.h
index c7086a8361e..12da481f745 100644
--- a/arch/powerpc/include/asm/arch-mpc85xx/gpio.h
+++ b/arch/powerpc/include/asm/arch-mpc85xx/gpio.h
@@ -17,6 +17,7 @@
 #include <asm/mpc85xx_gpio.h>
 #endif
 
+#include <linux/types.h>
 struct mpc8xxx_gpio_plat {
 	ulong addr;
 	unsigned long size;
diff --git a/arch/powerpc/include/asm/cache.h b/arch/powerpc/include/asm/cache.h
index 445a366807d..b7c223b35c6 100644
--- a/arch/powerpc/include/asm/cache.h
+++ b/arch/powerpc/include/asm/cache.h
@@ -55,6 +55,7 @@ extern void invalidate_icache(void);
 #ifdef CONFIG_SYS_INIT_RAM_LOCK
 extern void unlock_ram_in_cache(void);
 #endif /* CONFIG_SYS_INIT_RAM_LOCK */
+#include <linux/types.h>
 #endif /* __ASSEMBLY__ */
 
 #if defined(__KERNEL__) && !defined(__ASSEMBLY__)
diff --git a/arch/powerpc/include/asm/cpm_85xx.h b/arch/powerpc/include/asm/cpm_85xx.h
index b46e20e5ce8..d9dd28d2fce 100644
--- a/arch/powerpc/include/asm/cpm_85xx.h
+++ b/arch/powerpc/include/asm/cpm_85xx.h
@@ -6,6 +6,7 @@
  * MPC8260 Communication Processor Module.
  * Copyright (c) 1999 Dan Malek (dmalek at jlc.net)
  *
+#include <linux/types.h>
  * This file contains structures and information for the communication
  * processor channels found in the dual port RAM or parameter RAM.
  * All CPM control and status is available through the MPC8260 internal
diff --git a/arch/powerpc/include/asm/cpm_8xx.h b/arch/powerpc/include/asm/cpm_8xx.h
index 85903d21088..5d804b23133 100644
--- a/arch/powerpc/include/asm/cpm_8xx.h
+++ b/arch/powerpc/include/asm/cpm_8xx.h
@@ -5,6 +5,7 @@
  * (C) Copyright 2000-2006
  * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
  *
+#include <linux/types.h>
  * This file contains structures and information for the communication
  * processor channels.  Some CPM control and status is available
  * through the MPC8xx internal memory map.  See immap.h for details.
diff --git a/arch/powerpc/include/asm/fsl_dma.h b/arch/powerpc/include/asm/fsl_dma.h
index 727f4a7e92c..9e0cdf8028b 100644
--- a/arch/powerpc/include/asm/fsl_dma.h
+++ b/arch/powerpc/include/asm/fsl_dma.h
@@ -9,6 +9,7 @@
 #define _ASM_FSL_DMA_H_
 
 #include <asm/types.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_MPC83xx
 typedef struct fsl_dma {
diff --git a/arch/powerpc/include/asm/fsl_i2c.h b/arch/powerpc/include/asm/fsl_i2c.h
index 73105fa8e48..55226a3c059 100644
--- a/arch/powerpc/include/asm/fsl_i2c.h
+++ b/arch/powerpc/include/asm/fsl_i2c.h
@@ -13,8 +13,10 @@
 #ifndef _ASM_FSL_I2C_H_
 #define _ASM_FSL_I2C_H_
 
+#include <compiler.h>
 #include <asm/types.h>
 #include <linux/compiler.h>
+#include <linux/types.h>
 
 typedef struct fsl_i2c_base {
 
diff --git a/arch/powerpc/include/asm/fsl_law.h b/arch/powerpc/include/asm/fsl_law.h
index 888640df6f8..7dde8dcf412 100644
--- a/arch/powerpc/include/asm/fsl_law.h
+++ b/arch/powerpc/include/asm/fsl_law.h
@@ -7,6 +7,7 @@
 #define _FSL_LAW_H_
 
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/log2.h>
 
 #define LAW_EN	0x80000000
diff --git a/arch/powerpc/include/asm/fsl_lbc.h b/arch/powerpc/include/asm/fsl_lbc.h
index bf352d9a561..c3a0ee5424c 100644
--- a/arch/powerpc/include/asm/fsl_lbc.h
+++ b/arch/powerpc/include/asm/fsl_lbc.h
@@ -465,6 +465,7 @@ void lbc_sdram_init(void);
 
 #ifndef __ASSEMBLY__
 #include <asm/io.h>
+#include <linux/types.h>
 
 extern void print_lbc_regs(void);
 extern void init_early_memctl_regs(void);
diff --git a/arch/powerpc/include/asm/fsl_mpc83xx_serdes.h b/arch/powerpc/include/asm/fsl_mpc83xx_serdes.h
index a02b5992654..67f47076768 100644
--- a/arch/powerpc/include/asm/fsl_mpc83xx_serdes.h
+++ b/arch/powerpc/include/asm/fsl_mpc83xx_serdes.h
@@ -23,4 +23,5 @@ extern void fsl_setup_serdes(u32 offset, char proto, u32 rfcks, char vdd);
 
 #endif /* !CONFIG_MPC83XX_SERDES */
 
+#include <asm/types.h>
 #endif /* __FSL_MPC83XX_SERDES_H */
diff --git a/arch/powerpc/include/asm/fsl_pamu.h b/arch/powerpc/include/asm/fsl_pamu.h
index 07e822b796e..cd711fb8613 100644
--- a/arch/powerpc/include/asm/fsl_pamu.h
+++ b/arch/powerpc/include/asm/fsl_pamu.h
@@ -6,6 +6,7 @@
 #ifndef __PAMU_H
 #define __PAMU_H
 
+#include <linux/types.h>
 #define CONFIG_NUM_PAMU		16
 #define NUM_PPAACT_ENTRIES	512
 #define NUM_SPAACT_ENTRIES	256
diff --git a/arch/powerpc/include/asm/fsl_pci.h b/arch/powerpc/include/asm/fsl_pci.h
index 508834829b9..5ebad5c7e5e 100644
--- a/arch/powerpc/include/asm/fsl_pci.h
+++ b/arch/powerpc/include/asm/fsl_pci.h
@@ -9,6 +9,7 @@
 #include <asm/fsl_law.h>
 #include <asm/fsl_serdes.h>
 #include <pci.h>
+#include <asm/types.h>
 
 #define PEX_IP_BLK_REV_2_2	0x02080202
 #define PEX_IP_BLK_REV_2_3	0x02080203
diff --git a/arch/powerpc/include/asm/fsl_portals.h b/arch/powerpc/include/asm/fsl_portals.h
index b1fd6bd5cef..f277b20260e 100644
--- a/arch/powerpc/include/asm/fsl_portals.h
+++ b/arch/powerpc/include/asm/fsl_portals.h
@@ -7,6 +7,7 @@
 #define _FSL_PORTALS_H_
 
 /* entries must be in order and contiguous */
+#include <asm/types.h>
 enum fsl_dpaa_dev {
 	FSL_HW_PORTAL_SEC,
 #ifdef CONFIG_SYS_DPAA_FMAN
diff --git a/arch/powerpc/include/asm/fsl_serdes.h b/arch/powerpc/include/asm/fsl_serdes.h
index ddde4f80c63..8588006b7af 100644
--- a/arch/powerpc/include/asm/fsl_serdes.h
+++ b/arch/powerpc/include/asm/fsl_serdes.h
@@ -7,6 +7,7 @@
 #define __FSL_SERDES_H
 
 #include <config.h>
+#include <asm/types.h>
 
 enum srds_prtcl {
 	/*
diff --git a/arch/powerpc/include/asm/global_data.h b/arch/powerpc/include/asm/global_data.h
index 192a02d347e..04e0c38b848 100644
--- a/arch/powerpc/include/asm/global_data.h
+++ b/arch/powerpc/include/asm/global_data.h
@@ -9,7 +9,7 @@
 #define __ASM_GBL_DATA_H
 
 #include "config.h"
-#include "asm/types.h"
+#include "linux/types.h"
 
 /* Architecture-specific global data */
 struct arch_global_data {
diff --git a/arch/powerpc/include/asm/immap_86xx.h b/arch/powerpc/include/asm/immap_86xx.h
index 1fbc63a5ceb..0e3433555c8 100644
--- a/arch/powerpc/include/asm/immap_86xx.h
+++ b/arch/powerpc/include/asm/immap_86xx.h
@@ -15,6 +15,7 @@
 #include <asm/fsl_dma.h>
 #include <asm/fsl_lbc.h>
 #include <asm/fsl_i2c.h>
+#include <linux/types.h>
 
 /* Local-Access Registers and MCM Registers(0x0000-0x2000) */
 typedef struct ccsr_local_mcm {
diff --git a/arch/powerpc/include/asm/immap_8xx.h b/arch/powerpc/include/asm/immap_8xx.h
index 3999a02b9c7..6f9f9a250c7 100644
--- a/arch/powerpc/include/asm/immap_8xx.h
+++ b/arch/powerpc/include/asm/immap_8xx.h
@@ -14,6 +14,7 @@
 
 /* System configuration registers.
 */
+#include <linux/types.h>
 typedef	struct sys_conf {
 	uint	sc_siumcr;
 	uint	sc_sypcr;
diff --git a/arch/powerpc/include/asm/io.h b/arch/powerpc/include/asm/io.h
index ccc5e664cf4..e8d86574a5d 100644
--- a/arch/powerpc/include/asm/io.h
+++ b/arch/powerpc/include/asm/io.h
@@ -7,7 +7,9 @@
 #ifndef _PPC_IO_H
 #define _PPC_IO_H
 
+#include <compiler.h>
 #include <asm/byteorder.h>
+#include <asm/types.h>
 #include <linux/string.h>
 
 #ifdef CONFIG_ADDR_MAP
diff --git a/arch/powerpc/include/asm/iopin_8xx.h b/arch/powerpc/include/asm/iopin_8xx.h
index a41b3323325..82d5a180272 100644
--- a/arch/powerpc/include/asm/iopin_8xx.h
+++ b/arch/powerpc/include/asm/iopin_8xx.h
@@ -8,6 +8,7 @@
 #ifndef _ASM_IOPIN_8XX_H_
 #define _ASM_IOPIN_8XX_H_
 
+#include <compiler.h>
 #include <linux/types.h>
 #include <asm/immap_8xx.h>
 #include <asm/io.h>
diff --git a/arch/powerpc/include/asm/mmu.h b/arch/powerpc/include/asm/mmu.h
index 353dc4e8748..901ed9329df 100644
--- a/arch/powerpc/include/asm/mmu.h
+++ b/arch/powerpc/include/asm/mmu.h
@@ -8,6 +8,7 @@
 #ifndef __ASSEMBLY__
 /* Hardware Page Table Entry */
 #include <linux/bitops.h>
+#include <linux/types.h>
 typedef struct _PTE {
 #ifdef CONFIG_PPC64BRIDGE
 	unsigned long long vsid:52;
diff --git a/arch/powerpc/include/asm/mp.h b/arch/powerpc/include/asm/mp.h
index 8dacd2781d4..619053cd01f 100644
--- a/arch/powerpc/include/asm/mp.h
+++ b/arch/powerpc/include/asm/mp.h
@@ -7,6 +7,7 @@
 #define _ASM_MP_H_
 
 #include <lmb.h>
+#include <asm/types.h>
 
 void setup_mp(void);
 void cpu_mp_lmb_reserve(struct lmb *lmb);
diff --git a/arch/powerpc/include/asm/ppc.h b/arch/powerpc/include/asm/ppc.h
index 661e7b5989a..507ece4724d 100644
--- a/arch/powerpc/include/asm/ppc.h
+++ b/arch/powerpc/include/asm/ppc.h
@@ -39,6 +39,7 @@
 
 #include <asm/processor.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 static inline uint get_immr(void)
 {
diff --git a/arch/powerpc/lib/bdinfo.c b/arch/powerpc/lib/bdinfo.c
index 8174d282b53..98af5d092ca 100644
--- a/arch/powerpc/lib/bdinfo.c
+++ b/arch/powerpc/lib/bdinfo.c
@@ -7,10 +7,12 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <init.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/powerpc/lib/bootm.c b/arch/powerpc/lib/bootm.c
index f283c1a9a47..6ff9eae7535 100644
--- a/arch/powerpc/lib/bootm.c
+++ b/arch/powerpc/lib/bootm.c
@@ -22,6 +22,7 @@
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include <u-boot/zlib.h>
 #include <bzlib.h>
 #include <asm/byteorder.h>
diff --git a/arch/powerpc/lib/cache.c b/arch/powerpc/lib/cache.c
index 3c3c470bbbd..86fff84f978 100644
--- a/arch/powerpc/lib/cache.c
+++ b/arch/powerpc/lib/cache.c
@@ -8,6 +8,7 @@
 #include <cpu_func.h>
 #include <asm/cache.h>
 #include <watchdog.h>
+#include <linux/types.h>
 
 void flush_cache(ulong start_addr, ulong size)
 {
diff --git a/arch/powerpc/lib/interrupts.c b/arch/powerpc/lib/interrupts.c
index c232a1412c8..23eb50ac744 100644
--- a/arch/powerpc/lib/interrupts.c
+++ b/arch/powerpc/lib/interrupts.c
@@ -17,6 +17,7 @@
 #include <status_led.h>
 #endif
 #include <asm/ptrace.h>
+#include <linux/types.h>
 
 #ifndef CONFIG_MPC83XX_TIMER
 #ifndef CONFIG_SYS_WATCHDOG_FREQ
diff --git a/arch/powerpc/lib/spl.c b/arch/powerpc/lib/spl.c
index d4a6057527c..d01b6843689 100644
--- a/arch/powerpc/lib/spl.c
+++ b/arch/powerpc/lib/spl.c
@@ -8,6 +8,7 @@
 #include <spl.h>
 #include <image.h>
 #include <linux/compiler.h>
+#include <linux/types.h>
 
 /*
  * This function jumps to an image with argument. Normally an FDT or ATAGS
diff --git a/arch/powerpc/lib/stack.c b/arch/powerpc/lib/stack.c
index f2a4652e081..438b70c82b1 100644
--- a/arch/powerpc/lib/stack.c
+++ b/arch/powerpc/lib/stack.c
@@ -13,6 +13,7 @@
 #include <common.h>
 #include <init.h>
 #include <asm/global_data.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/powerpc/lib/time.c b/arch/powerpc/lib/time.c
index d27432c23af..702766a788a 100644
--- a/arch/powerpc/lib/time.c
+++ b/arch/powerpc/lib/time.c
@@ -9,6 +9,7 @@
 #include <time.h>
 #include <asm/io.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 /* ------------------------------------------------------------------------- */
 
diff --git a/arch/riscv/cpu/cpu.c b/arch/riscv/cpu/cpu.c
index 5d5b1d523ac..d7bf45a5f97 100644
--- a/arch/riscv/cpu/cpu.c
+++ b/arch/riscv/cpu/cpu.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <stdbool.h>
 #include <asm/encoding.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <dm/uclass-internal.h>
 #include <linux/bitops.h>
diff --git a/arch/riscv/cpu/fu540/cache.c b/arch/riscv/cpu/fu540/cache.c
index 6d602158dd2..f0b8e55e20e 100644
--- a/arch/riscv/cpu/fu540/cache.c
+++ b/arch/riscv/cpu/fu540/cache.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 
 /* Register offsets */
diff --git a/arch/riscv/cpu/fu540/dram.c b/arch/riscv/cpu/fu540/dram.c
index 26118ea4c82..4c63f86f279 100644
--- a/arch/riscv/cpu/fu540/dram.c
+++ b/arch/riscv/cpu/fu540/dram.c
@@ -9,6 +9,7 @@
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/sizes.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/riscv/cpu/generic/dram.c b/arch/riscv/cpu/generic/dram.c
index 26118ea4c82..4c63f86f279 100644
--- a/arch/riscv/cpu/generic/dram.c
+++ b/arch/riscv/cpu/generic/dram.c
@@ -9,6 +9,7 @@
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/sizes.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/riscv/include/asm/global_data.h b/arch/riscv/include/asm/global_data.h
index 2eb14815bcf..73d76c362dd 100644
--- a/arch/riscv/include/asm/global_data.h
+++ b/arch/riscv/include/asm/global_data.h
@@ -13,6 +13,7 @@
 #include <asm/smp.h>
 #include <asm/u-boot.h>
 #include <compiler.h>
+#include <linux/types.h>
 
 /* Architecture-specific global data */
 struct arch_global_data {
diff --git a/arch/riscv/include/asm/io.h b/arch/riscv/include/asm/io.h
index acf5a96449c..f823f1fb18b 100644
--- a/arch/riscv/include/asm/io.h
+++ b/arch/riscv/include/asm/io.h
@@ -68,6 +68,7 @@ static inline phys_addr_t map_to_sysmem(const void *ptr)
 #define __iormb()	rmb()
 #define __iowmb()	wmb()
 
+#include <compiler.h>
 static inline void writeb(u8 val, volatile void __iomem *addr)
 {
 	__iowmb();
diff --git a/arch/riscv/include/asm/ptrace.h b/arch/riscv/include/asm/ptrace.h
index 651078fcfda..19984e34de8 100644
--- a/arch/riscv/include/asm/ptrace.h
+++ b/arch/riscv/include/asm/ptrace.h
@@ -9,6 +9,7 @@
 #ifndef __ASM_RISCV_PTRACE_H
 #define __ASM_RISCV_PTRACE_H
 
+#include <linux/types.h>
 struct pt_regs {
 	unsigned long sepc;
 	unsigned long ra;
diff --git a/arch/riscv/include/asm/smp.h b/arch/riscv/include/asm/smp.h
index 1b428856b26..0cbe7bf24ee 100644
--- a/arch/riscv/include/asm/smp.h
+++ b/arch/riscv/include/asm/smp.h
@@ -7,6 +7,7 @@
 #ifndef _ASM_RISCV_SMP_H
 #define _ASM_RISCV_SMP_H
 
+#include <linux/types.h>
 /**
  * struct ipi_data - Inter-processor interrupt (IPI) data structure
  *
diff --git a/arch/riscv/lib/andes_plic.c b/arch/riscv/lib/andes_plic.c
index f892548a6c5..14ba884483a 100644
--- a/arch/riscv/lib/andes_plic.c
+++ b/arch/riscv/lib/andes_plic.c
@@ -8,6 +8,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <asm/global_data.h>
 #include <dm/device-internal.h>
@@ -21,6 +22,7 @@
 #include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /* pending register */
 #define PENDING_REG(base, hart)	((ulong)(base) + 0x1000 + ((hart) / 4) * 4)
diff --git a/arch/riscv/lib/andes_plmt.c b/arch/riscv/lib/andes_plmt.c
index c453d9042c8..a38d6cfe38c 100644
--- a/arch/riscv/lib/andes_plmt.c
+++ b/arch/riscv/lib/andes_plmt.c
@@ -8,6 +8,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <regmap.h>
 #include <syscon.h>
@@ -15,6 +16,7 @@
 #include <asm/io.h>
 #include <asm/syscon.h>
 #include <linux/err.h>
+#include <linux/types.h>
 
 /* mtime register */
 #define MTIME_REG(base)			((ulong)(base))
diff --git a/arch/riscv/lib/boot.c b/arch/riscv/lib/boot.c
index 83c96799e91..24c97063c9d 100644
--- a/arch/riscv/lib/boot.c
+++ b/arch/riscv/lib/boot.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <command.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 unsigned long do_go_exec(ulong (*entry)(int, char * const []),
 			 int argc, char *const argv[])
diff --git a/arch/riscv/lib/bootm.c b/arch/riscv/lib/bootm.c
index 8bd6fd0c89d..b2c251cbcf5 100644
--- a/arch/riscv/lib/bootm.c
+++ b/arch/riscv/lib/bootm.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <bootstage.h>
 #include <command.h>
+#include <compiler.h>
 #include <dm.h>
 #include <fdt_support.h>
 #include <hang.h>
@@ -23,6 +24,7 @@
 #include <asm/smp.h>
 #include <dm/device.h>
 #include <dm/root.h>
+#include <linux/types.h>
 #include <u-boot/zlib.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/riscv/lib/fdt_fixup.c b/arch/riscv/lib/fdt_fixup.c
index 932243596cc..b5bed42991b 100644
--- a/arch/riscv/lib/fdt_fixup.c
+++ b/arch/riscv/lib/fdt_fixup.c
@@ -13,6 +13,7 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
 
diff --git a/arch/riscv/lib/image.c b/arch/riscv/lib/image.c
index 2f78b25807a..8cca200416f 100644
--- a/arch/riscv/lib/image.c
+++ b/arch/riscv/lib/image.c
@@ -16,6 +16,7 @@
 #include <linux/errno.h>
 #include <linux/sizes.h>
 #include <linux/stddef.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/riscv/lib/interrupts.c b/arch/riscv/lib/interrupts.c
index 7b5a0743cce..cb0706410fd 100644
--- a/arch/riscv/lib/interrupts.c
+++ b/arch/riscv/lib/interrupts.c
@@ -17,6 +17,7 @@
 #include <asm/system.h>
 #include <asm/encoding.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 static void show_regs(struct pt_regs *regs)
 {
diff --git a/arch/riscv/lib/rdtime.c b/arch/riscv/lib/rdtime.c
index e128d7fce69..f05977019d6 100644
--- a/arch/riscv/lib/rdtime.c
+++ b/arch/riscv/lib/rdtime.c
@@ -4,10 +4,12 @@
  * Copyright (C) 2018, Bin Meng <bmeng.cn@gmail.com>
  *
  * The riscv_get_time() API implementation that is using the
+#include <asm/types.h>
  * standard rdtime instruction.
  */
 
 #include <common.h>
+#include <linux/types.h>
 
 /* Implement the API required by RISC-V timer driver */
 int riscv_get_time(u64 *time)
diff --git a/arch/riscv/lib/reloc_riscv_efi.c b/arch/riscv/lib/reloc_riscv_efi.c
index c1039dd165d..0520ddd6e38 100644
--- a/arch/riscv/lib/reloc_riscv_efi.c
+++ b/arch/riscv/lib/reloc_riscv_efi.c
@@ -37,6 +37,7 @@
 */
 
 #include <efi.h>
+#include <linux/types.h>
 
 #include <elf.h>
 
diff --git a/arch/riscv/lib/sbi.c b/arch/riscv/lib/sbi.c
index 984499960a1..a3b56a1dbd3 100644
--- a/arch/riscv/lib/sbi.c
+++ b/arch/riscv/lib/sbi.c
@@ -11,6 +11,7 @@
 #include <asm/encoding.h>
 #include <asm/sbi.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 struct sbiret sbi_ecall(int ext, int fid, unsigned long arg0,
 			unsigned long arg1, unsigned long arg2,
diff --git a/arch/riscv/lib/sbi_ipi.c b/arch/riscv/lib/sbi_ipi.c
index d02e2b4c488..fe5eeaad1d5 100644
--- a/arch/riscv/lib/sbi_ipi.c
+++ b/arch/riscv/lib/sbi_ipi.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <asm/encoding.h>
 #include <asm/sbi.h>
+#include <linux/types.h>
 
 int riscv_init_ipi(void)
 {
diff --git a/arch/riscv/lib/sifive_clint.c b/arch/riscv/lib/sifive_clint.c
index 97b7169a02c..a22229643bd 100644
--- a/arch/riscv/lib/sifive_clint.c
+++ b/arch/riscv/lib/sifive_clint.c
@@ -8,6 +8,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <regmap.h>
 #include <syscon.h>
@@ -15,6 +16,7 @@
 #include <asm/io.h>
 #include <asm/syscon.h>
 #include <linux/err.h>
+#include <linux/types.h>
 
 /* MSIP registers */
 #define MSIP_REG(base, hart)		((ulong)(base) + (hart) * 4)
diff --git a/arch/riscv/lib/smp.c b/arch/riscv/lib/smp.c
index 09dd439b59a..a229a84fc9d 100644
--- a/arch/riscv/lib/smp.c
+++ b/arch/riscv/lib/smp.c
@@ -12,6 +12,7 @@
 #include <asm/smp.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/riscv/lib/spl.c b/arch/riscv/lib/spl.c
index fce60935fb6..6d3700245c3 100644
--- a/arch/riscv/lib/spl.c
+++ b/arch/riscv/lib/spl.c
@@ -4,6 +4,7 @@
  * Lukas Auer <lukas.auer@aisec.fraunhofer.de>
  */
 #include <common.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <hang.h>
 #include <init.h>
@@ -12,6 +13,7 @@
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/smp.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/sandbox/cpu/cpu.c b/arch/sandbox/cpu/cpu.c
index 8b5323fc815..ca35019903e 100644
--- a/arch/sandbox/cpu/cpu.c
+++ b/arch/sandbox/cpu/cpu.c
@@ -22,6 +22,7 @@
 #include <asm/setjmp.h>
 #include <asm/state.h>
 #include <dm/root.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/sandbox/cpu/sdl.c b/arch/sandbox/cpu/sdl.c
index c1c9bb68e0a..e37bf3addbd 100644
--- a/arch/sandbox/cpu/sdl.c
+++ b/arch/sandbox/cpu/sdl.c
@@ -12,6 +12,7 @@
 #include <SDL2/SDL.h>
 #include <asm/state.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /**
  * struct buf_info - a data buffer holding audio data
diff --git a/arch/sandbox/cpu/spl.c b/arch/sandbox/cpu/spl.c
index 52cabd7ff12..e4fe62a1c43 100644
--- a/arch/sandbox/cpu/spl.c
+++ b/arch/sandbox/cpu/spl.c
@@ -16,6 +16,7 @@
 #include <asm/state.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/sandbox/cpu/start.c b/arch/sandbox/cpu/start.c
index 5533100bdec..c9dbcf763d7 100644
--- a/arch/sandbox/cpu/start.c
+++ b/arch/sandbox/cpu/start.c
@@ -23,6 +23,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/sandbox/cpu/state.c b/arch/sandbox/cpu/state.c
index 849dfbd1d66..d99a8d27c82 100644
--- a/arch/sandbox/cpu/state.c
+++ b/arch/sandbox/cpu/state.c
@@ -14,6 +14,7 @@
 #include <asm/state.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /* Main state record for the sandbox */
 static struct sandbox_state main_state;
diff --git a/arch/sandbox/include/asm/axi.h b/arch/sandbox/include/asm/axi.h
index d483f7b65a0..b533a46dc8f 100644
--- a/arch/sandbox/include/asm/axi.h
+++ b/arch/sandbox/include/asm/axi.h
@@ -7,6 +7,7 @@
 #ifndef __asm_axi_h
 #define __asm_axi_h
 
+#include <linux/types.h>
 #define axi_emul_get_ops(dev)	((struct axi_emul_ops *)(dev)->driver->ops)
 
 /**
diff --git a/arch/sandbox/include/asm/clk.h b/arch/sandbox/include/asm/clk.h
index c184c4bffcf..9e6b96700a2 100644
--- a/arch/sandbox/include/asm/clk.h
+++ b/arch/sandbox/include/asm/clk.h
@@ -7,6 +7,7 @@
 #define __SANDBOX_CLK_H
 
 #include <common.h>
+#include <linux/types.h>
 
 struct udevice;
 
diff --git a/arch/sandbox/include/asm/eth.h b/arch/sandbox/include/asm/eth.h
index 8c3c957b56f..62bbd9afea0 100644
--- a/arch/sandbox/include/asm/eth.h
+++ b/arch/sandbox/include/asm/eth.h
@@ -11,6 +11,7 @@
 
 #include <net.h>
 #include <stdbool.h>
+#include <linux/types.h>
 
 void sandbox_eth_disable_response(int index, bool disable);
 
diff --git a/arch/sandbox/include/asm/global_data.h b/arch/sandbox/include/asm/global_data.h
index f95ddb058a2..00a53e570b3 100644
--- a/arch/sandbox/include/asm/global_data.h
+++ b/arch/sandbox/include/asm/global_data.h
@@ -10,6 +10,7 @@
 #define __ASM_GBL_DATA_H
 
 /* Architecture-specific global data */
+#include <linux/types.h>
 struct arch_global_data {
 	uint8_t		*ram_buf;	/* emulated RAM buffer */
 	void		*text_base;	/* pointer to base of text region */
diff --git a/arch/sandbox/include/asm/gpio.h b/arch/sandbox/include/asm/gpio.h
index df4ba4fb5f3..967fe9ad213 100644
--- a/arch/sandbox/include/asm/gpio.h
+++ b/arch/sandbox/include/asm/gpio.h
@@ -22,6 +22,7 @@
  * NOTE: DO NOT use the functions in this file except in test code!
  */
 #include <asm-generic/gpio.h>
+#include <linux/types.h>
 
 /**
  * Return the simulated value of a GPIO (used only in sandbox test code)
diff --git a/arch/sandbox/include/asm/handoff.h b/arch/sandbox/include/asm/handoff.h
index be4e7b0fae2..f8a72cd87a5 100644
--- a/arch/sandbox/include/asm/handoff.h
+++ b/arch/sandbox/include/asm/handoff.h
@@ -9,6 +9,7 @@
 #ifndef __handoff_h
 #define __handoff_h
 
+#include <linux/types.h>
 #define TEST_HANDOFF_MAGIC	0x14f93c7b
 
 struct arch_spl_handoff {
diff --git a/arch/sandbox/include/asm/io.h b/arch/sandbox/include/asm/io.h
index ad6c29a4e26..e671262b5d6 100644
--- a/arch/sandbox/include/asm/io.h
+++ b/arch/sandbox/include/asm/io.h
@@ -6,6 +6,7 @@
 #ifndef __SANDBOX_ASM_IO_H
 #define __SANDBOX_ASM_IO_H
 
+#include <linux/types.h>
 enum sandboxio_size_t {
 	SB_SIZE_8,
 	SB_SIZE_16,
diff --git a/arch/sandbox/include/asm/mbox.h b/arch/sandbox/include/asm/mbox.h
index 70f36d7afef..c3b8a9f14ad 100644
--- a/arch/sandbox/include/asm/mbox.h
+++ b/arch/sandbox/include/asm/mbox.h
@@ -7,6 +7,7 @@
 #define __SANDBOX_MBOX_H
 
 #include <common.h>
+#include <linux/types.h>
 
 #define SANDBOX_MBOX_PING_XOR 0x12345678
 
diff --git a/arch/sandbox/include/asm/sdl.h b/arch/sandbox/include/asm/sdl.h
index a14e0a8f8a2..75904d9fad2 100644
--- a/arch/sandbox/include/asm/sdl.h
+++ b/arch/sandbox/include/asm/sdl.h
@@ -9,6 +9,7 @@
 #include <errno.h>
 #include <stdbool.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_SANDBOX_SDL
 
diff --git a/arch/sandbox/include/asm/sections.h b/arch/sandbox/include/asm/sections.h
index fbc1bd11a34..32667b7cf16 100644
--- a/arch/sandbox/include/asm/sections.h
+++ b/arch/sandbox/include/asm/sections.h
@@ -10,6 +10,7 @@
 #define __SANDBOX_SECTIONS_H
 
 #include <asm-generic/sections.h>
+#include <linux/types.h>
 
 struct sandbox_cmdline_option;
 
diff --git a/arch/sandbox/include/asm/setjmp.h b/arch/sandbox/include/asm/setjmp.h
index 001c7ea322d..27168ca1850 100644
--- a/arch/sandbox/include/asm/setjmp.h
+++ b/arch/sandbox/include/asm/setjmp.h
@@ -7,6 +7,7 @@
 #ifndef _SETJMP_H_
 #define _SETJMP_H_
 
+#include <linux/types.h>
 struct jmp_buf_data {
 	/*
 	 * We're not sure how long this should be:
diff --git a/arch/sandbox/include/asm/state.h b/arch/sandbox/include/asm/state.h
index 1bfad305f1a..0a0322c3977 100644
--- a/arch/sandbox/include/asm/state.h
+++ b/arch/sandbox/include/asm/state.h
@@ -11,6 +11,7 @@
 #include <stdbool.h>
 #include <linux/list.h>
 #include <linux/stringify.h>
+#include <linux/types.h>
 
 /**
  * Selects the behavior of the serial terminal.
diff --git a/arch/sandbox/include/asm/test.h b/arch/sandbox/include/asm/test.h
index 6ac8c1a8288..1be290ea710 100644
--- a/arch/sandbox/include/asm/test.h
+++ b/arch/sandbox/include/asm/test.h
@@ -10,6 +10,7 @@
 
 /* The sandbox driver always permits an I2C device with this address */
 #include <stdbool.h>
+#include <linux/types.h>
 #define SANDBOX_I2C_TEST_ADDR		0x59
 
 #define SANDBOX_PCI_VENDOR_ID		0x1234
diff --git a/arch/sandbox/include/asm/u-boot-sandbox.h b/arch/sandbox/include/asm/u-boot-sandbox.h
index 798d0030773..9433e5258e5 100644
--- a/arch/sandbox/include/asm/u-boot-sandbox.h
+++ b/arch/sandbox/include/asm/u-boot-sandbox.h
@@ -15,6 +15,7 @@
 #define _U_BOOT_SANDBOX_H_
 
 /* board/.../... */
+#include <asm/types.h>
 int board_init(void);
 
 /* start.c */
diff --git a/arch/sandbox/lib/bootm.c b/arch/sandbox/lib/bootm.c
index d9378f019c0..116ec10ae26 100644
--- a/arch/sandbox/lib/bootm.c
+++ b/arch/sandbox/lib/bootm.c
@@ -6,10 +6,12 @@
 
 #include <common.h>
 #include <bootstage.h>
+#include <compiler.h>
 #include <image.h>
 #include <stdio.h>
 #include <asm/io.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define	LINUX_ARM_ZIMAGE_MAGIC	0x016f2818
 
diff --git a/arch/sandbox/lib/pci_io.c b/arch/sandbox/lib/pci_io.c
index b7ce34aa1ea..c01428928fd 100644
--- a/arch/sandbox/lib/pci_io.c
+++ b/arch/sandbox/lib/pci_io.c
@@ -15,6 +15,7 @@
 #include <asm/io.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 int pci_map_physmem(phys_addr_t paddr, unsigned long *lenp,
 		    struct udevice **devp, void **ptrp)
diff --git a/arch/sh/cpu/sh4/cache.c b/arch/sh/cpu/sh4/cache.c
index 0f7dfdd3cf7..037d24f4ab3 100644
--- a/arch/sh/cpu/sh4/cache.c
+++ b/arch/sh/cpu/sh4/cache.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <asm/processor.h>
 #include <asm/system.h>
+#include <asm/types.h>
 
 #define CACHE_VALID       1
 #define CACHE_UPDATED     2
diff --git a/arch/sh/include/asm/pci.h b/arch/sh/include/asm/pci.h
index 5d79d0ec58e..dfa6184e0b9 100644
--- a/arch/sh/include/asm/pci.h
+++ b/arch/sh/include/asm/pci.h
@@ -18,6 +18,7 @@ int pci_sh7780_init(struct pci_controller *hose);
 #else
 #error "Not support PCI."
 #endif
+#include <asm/types.h>
 
 int pci_sh4_init(struct pci_controller *hose);
 /* PCI dword read for sh4 */
diff --git a/arch/sh/include/asm/string.h b/arch/sh/include/asm/string.h
index 999febcb6b7..cc1f28af19d 100644
--- a/arch/sh/include/asm/string.h
+++ b/arch/sh/include/asm/string.h
@@ -130,4 +130,5 @@ extern int strcasecmp(const char *, const char *);
 #define __HAVE_ARCH_STRTOK      1
 
 #endif /* KERNEL */
+#include <linux/types.h>
 #endif /* __ASM_SH_STRING_H */
diff --git a/arch/sh/lib/board.c b/arch/sh/lib/board.c
index f43213a50e9..105f204a70b 100644
--- a/arch/sh/lib/board.c
+++ b/arch/sh/lib/board.c
@@ -7,6 +7,7 @@
 #include <init.h>
 #include <asm/global_data.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/sh/lib/time_sh2.c b/arch/sh/lib/time_sh2.c
index 5484c543c6c..5788c552abd 100644
--- a/arch/sh/lib/time_sh2.c
+++ b/arch/sh/lib/time_sh2.c
@@ -13,6 +13,7 @@
 #include <asm/io.h>
 #include <asm/processor.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 #define CMT_CMCSR_INIT	0x0001	/* PCLK/32 */
 #define CMT_CMCSR_CALIB 0x0000
diff --git a/arch/sh/lib/zimageboot.c b/arch/sh/lib/zimageboot.c
index 8567d390376..20eab6bbbff 100644
--- a/arch/sh/lib/zimageboot.c
+++ b/arch/sh/lib/zimageboot.c
@@ -17,6 +17,7 @@
 #include <asm/io.h>
 #include <asm/zimage.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 int do_sh_zimageboot(struct cmd_tbl *cmdtp, int flag, int argc,
 		     char *const argv[])
diff --git a/arch/x86/cpu/acpi_gpe.c b/arch/x86/cpu/acpi_gpe.c
index 5610d543723..1b51b44e8c6 100644
--- a/arch/x86/cpu/acpi_gpe.c
+++ b/arch/x86/cpu/acpi_gpe.c
@@ -15,6 +15,7 @@
 #include <dt-bindings/interrupt-controller/x86-irq.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /**
  * struct acpi_gpe_priv - private driver information
diff --git a/arch/x86/cpu/apollolake/cpu_spl.c b/arch/x86/cpu/apollolake/cpu_spl.c
index 786d65311c8..db82b150f6d 100644
--- a/arch/x86/cpu/apollolake/cpu_spl.c
+++ b/arch/x86/cpu/apollolake/cpu_spl.c
@@ -36,6 +36,7 @@
 #include <asm/fsp2/fsp_api.h>
 #include <asm/u-boot.h>
 #include <linux/sizes.h>
+#include <linux/types.h>
 #include <power/acpi_pmc.h>
 
 /* Define this here to avoid referencing any drivers for the debug UART 1 */
diff --git a/arch/x86/cpu/apollolake/fsp_bindings.c b/arch/x86/cpu/apollolake/fsp_bindings.c
index c710db39942..e75fd7f354f 100644
--- a/arch/x86/cpu/apollolake/fsp_bindings.c
+++ b/arch/x86/cpu/apollolake/fsp_bindings.c
@@ -10,6 +10,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /**
  * read_u8_prop() - Read an u8 property from devicetree (scalar or array)
diff --git a/arch/x86/cpu/apollolake/fsp_s.c b/arch/x86/cpu/apollolake/fsp_s.c
index 433dcf08c77..5876edaa007 100644
--- a/arch/x86/cpu/apollolake/fsp_s.c
+++ b/arch/x86/cpu/apollolake/fsp_s.c
@@ -13,6 +13,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <p2sb.h>
+#include <stdbool.h>
 #include <acpi/acpi_s3.h>
 #include <asm/global_data.h>
 #include <asm/intel_pinctrl.h>
@@ -30,6 +31,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #define PCH_P2SB_E0		0xe0
 #define HIDE_BIT		BIT(0)
diff --git a/arch/x86/cpu/apollolake/hostbridge.c b/arch/x86/cpu/apollolake/hostbridge.c
index 99f1b441312..4477e580fbb 100644
--- a/arch/x86/cpu/apollolake/hostbridge.c
+++ b/arch/x86/cpu/apollolake/hostbridge.c
@@ -13,6 +13,7 @@
 #include <asm/pci.h>
 #include <asm/arch/systemagent.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 /**
  * struct apl_hostbridge_platdata - platform data for hostbridge
diff --git a/arch/x86/cpu/apollolake/lpc.c b/arch/x86/cpu/apollolake/lpc.c
index 07a64502061..4c12d80b38b 100644
--- a/arch/x86/cpu/apollolake/lpc.c
+++ b/arch/x86/cpu/apollolake/lpc.c
@@ -16,6 +16,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/log2.h>
+#include <linux/types.h>
 
 void lpc_enable_fixed_io_ranges(uint io_enables)
 {
diff --git a/arch/x86/cpu/apollolake/pmc.c b/arch/x86/cpu/apollolake/pmc.c
index 8adc33bfd30..96b3845a297 100644
--- a/arch/x86/cpu/apollolake/pmc.c
+++ b/arch/x86/cpu/apollolake/pmc.c
@@ -13,12 +13,14 @@
 #include <dm.h>
 #include <log.h>
 #include <spl.h>
+#include <stdbool.h>
 #include <acpi/acpi_s3.h>
 #include <asm/io.h>
 #include <asm/pci.h>
 #include <linux/bitops.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <power/acpi_pmc.h>
 
 #define GPIO_GPE_CFG		0x1050
diff --git a/arch/x86/cpu/apollolake/punit.c b/arch/x86/cpu/apollolake/punit.c
index 632309f6901..ecc2fe1ca20 100644
--- a/arch/x86/cpu/apollolake/punit.c
+++ b/arch/x86/cpu/apollolake/punit.c
@@ -16,6 +16,7 @@
 #include <asm/arch/systemagent.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 /*
  * Punit Initialisation code. This all isn't documented, but
diff --git a/arch/x86/cpu/apollolake/spl.c b/arch/x86/cpu/apollolake/spl.c
index 618b20add16..a8cd253deec 100644
--- a/arch/x86/cpu/apollolake/spl.c
+++ b/arch/x86/cpu/apollolake/spl.c
@@ -22,6 +22,7 @@
 #include <dm/uclass-internal.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /* This reads the next phase from mapped SPI flash */
 static int rom_load_image(struct spl_image_info *spl_image,
diff --git a/arch/x86/cpu/apollolake/uart.c b/arch/x86/cpu/apollolake/uart.c
index 2a201022945..8c031445b95 100644
--- a/arch/x86/cpu/apollolake/uart.c
+++ b/arch/x86/cpu/apollolake/uart.c
@@ -17,6 +17,7 @@
 #include <asm/pci.h>
 #include <asm/lpss.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 /* Low-power Subsystem (LPSS) clock register */
 enum {
diff --git a/arch/x86/cpu/baytrail/acpi.c b/arch/x86/cpu/baytrail/acpi.c
index e6c721a16ba..fe7139e6509 100644
--- a/arch/x86/cpu/baytrail/acpi.c
+++ b/arch/x86/cpu/baytrail/acpi.c
@@ -13,6 +13,7 @@
 #include <asm/tables.h>
 #include <asm/arch/global_nvs.h>
 #include <asm/arch/iomap.h>
+#include <asm/types.h>
 #include <dm/uclass-internal.h>
 #include <linux/string.h>
 
diff --git a/arch/x86/cpu/baytrail/cpu.c b/arch/x86/cpu/baytrail/cpu.c
index 309a50a1161..8cc19c02e2b 100644
--- a/arch/x86/cpu/baytrail/cpu.c
+++ b/arch/x86/cpu/baytrail/cpu.c
@@ -17,6 +17,7 @@
 #include <asm/lapic.h>
 #include <asm/msr.h>
 #include <asm/turbo.h>
+#include <linux/types.h>
 
 #define BYT_PRV_CLK			0x800
 #define BYT_PRV_CLK_EN			(1 << 0)
diff --git a/arch/x86/cpu/baytrail/early_uart.c b/arch/x86/cpu/baytrail/early_uart.c
index e8ed6ea447b..88fcbcfabff 100644
--- a/arch/x86/cpu/baytrail/early_uart.c
+++ b/arch/x86/cpu/baytrail/early_uart.c
@@ -7,6 +7,7 @@
 #include <errno.h>
 #include <asm/io.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 #define PCI_DEV_CONFIG(segbus, dev, fn) ( \
 		(((segbus) & 0xfff) << 20) | \
diff --git a/arch/x86/cpu/baytrail/fsp_configs.c b/arch/x86/cpu/baytrail/fsp_configs.c
index fb3f946c45f..da89f6db4c1 100644
--- a/arch/x86/cpu/baytrail/fsp_configs.c
+++ b/arch/x86/cpu/baytrail/fsp_configs.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <fdtdec.h>
 #include <log.h>
 #include <asm/fsp1/fsp_support.h>
diff --git a/arch/x86/cpu/braswell/early_uart.c b/arch/x86/cpu/braswell/early_uart.c
index f6f3e9d8a80..ebbe8c384aa 100644
--- a/arch/x86/cpu/braswell/early_uart.c
+++ b/arch/x86/cpu/braswell/early_uart.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <asm/io.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 #define PCI_DEV_CONFIG(segbus, dev, fn) ( \
 		(((segbus) & 0xfff) << 20) | \
diff --git a/arch/x86/cpu/braswell/fsp_configs.c b/arch/x86/cpu/braswell/fsp_configs.c
index 243298fd571..70a9fa004a7 100644
--- a/arch/x86/cpu/braswell/fsp_configs.c
+++ b/arch/x86/cpu/braswell/fsp_configs.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <fdtdec.h>
 #include <log.h>
 #include <asm/fsp1/fsp_support.h>
diff --git a/arch/x86/cpu/broadwell/adsp.c b/arch/x86/cpu/broadwell/adsp.c
index beab06dee95..b7a615fc37e 100644
--- a/arch/x86/cpu/broadwell/adsp.c
+++ b/arch/x86/cpu/broadwell/adsp.c
@@ -20,6 +20,7 @@
 #include <asm/arch/adsp.h>
 #include <asm/arch/pch.h>
 #include <asm/arch/rcb.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 
 enum pci_type_t {
diff --git a/arch/x86/cpu/broadwell/cpu_full.c b/arch/x86/cpu/broadwell/cpu_full.c
index f4b930225bd..0f2da4ff3aa 100644
--- a/arch/x86/cpu/broadwell/cpu_full.c
+++ b/arch/x86/cpu/broadwell/cpu_full.c
@@ -10,6 +10,7 @@
 #include <cpu.h>
 #include <init.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/cpu.h>
 #include <asm/cpu_x86.h>
 #include <asm/cpu_common.h>
@@ -25,6 +26,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 struct cpu_broadwell_priv {
 	bool ht_disabled;
diff --git a/arch/x86/cpu/broadwell/iobp.c b/arch/x86/cpu/broadwell/iobp.c
index 68c57f4f18a..68c41695eb5 100644
--- a/arch/x86/cpu/broadwell/iobp.c
+++ b/arch/x86/cpu/broadwell/iobp.c
@@ -12,6 +12,7 @@
 #include <asm/intel_regs.h>
 #include <asm/io.h>
 #include <asm/arch/pch.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 
diff --git a/arch/x86/cpu/broadwell/lpc.c b/arch/x86/cpu/broadwell/lpc.c
index d2638a4e7a6..280eeb6c745 100644
--- a/arch/x86/cpu/broadwell/lpc.c
+++ b/arch/x86/cpu/broadwell/lpc.c
@@ -15,6 +15,7 @@
 #include <asm/lpc_common.h>
 #include <asm/arch/pch.h>
 #include <asm/arch/spi.h>
+#include <asm/types.h>
 
 static void set_spi_speed(void)
 {
diff --git a/arch/x86/cpu/broadwell/me.c b/arch/x86/cpu/broadwell/me.c
index 89b7bd15082..397cba6d343 100644
--- a/arch/x86/cpu/broadwell/me.c
+++ b/arch/x86/cpu/broadwell/me.c
@@ -12,6 +12,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static inline void me_read_dword_ptr(struct udevice *dev, void *ptr, int offset)
 {
diff --git a/arch/x86/cpu/broadwell/northbridge.c b/arch/x86/cpu/broadwell/northbridge.c
index 4b0dd46f7fe..2d851ed4fe8 100644
--- a/arch/x86/cpu/broadwell/northbridge.c
+++ b/arch/x86/cpu/broadwell/northbridge.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <stdio.h>
 #include <asm/global_data.h>
@@ -13,6 +14,7 @@
 #include <asm/arch/pch.h>
 #include <asm/arch/pei_data.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 __weak asmlinkage void sdram_console_tx_byte(unsigned char byte)
 {
diff --git a/arch/x86/cpu/broadwell/pch.c b/arch/x86/cpu/broadwell/pch.c
index f7f975983e6..b834c8471b9 100644
--- a/arch/x86/cpu/broadwell/pch.c
+++ b/arch/x86/cpu/broadwell/pch.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <log.h>
 #include <pch.h>
+#include <stdbool.h>
 #include <asm/cpu.h>
 #include <asm/global_data.h>
 #include <asm/gpio.h>
@@ -28,6 +29,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #define BIOS_CTRL	0xdc
 
diff --git a/arch/x86/cpu/broadwell/pinctrl_broadwell.c b/arch/x86/cpu/broadwell/pinctrl_broadwell.c
index 0bb28739fdc..60453956e50 100644
--- a/arch/x86/cpu/broadwell/pinctrl_broadwell.c
+++ b/arch/x86/cpu/broadwell/pinctrl_broadwell.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <pch.h>
 #include <pci.h>
+#include <stdbool.h>
 #include <asm/cpu.h>
 #include <asm/global_data.h>
 #include <asm/gpio.h>
@@ -22,6 +23,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/broadwell/refcode.c b/arch/x86/cpu/broadwell/refcode.c
index f6f6250dfbd..1cb588df7e7 100644
--- a/arch/x86/cpu/broadwell/refcode.c
+++ b/arch/x86/cpu/broadwell/refcode.c
@@ -1,6 +1,8 @@
 // SPDX-License-Identifier: GPL-2.0
 /*
  * Read a coreboot rmodule and execute it.
+#include <compiler.h>
+#include <linux/types.h>
  * The rmodule_header struct is from coreboot.
  *
  * Copyright (c) 2016 Google, Inc
diff --git a/arch/x86/cpu/broadwell/sata.c b/arch/x86/cpu/broadwell/sata.c
index 27d6bf706e2..2bdb1ffae22 100644
--- a/arch/x86/cpu/broadwell/sata.c
+++ b/arch/x86/cpu/broadwell/sata.c
@@ -17,6 +17,7 @@
 #include <asm/pch_common.h>
 #include <asm/arch/pch.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 struct sata_platdata {
 	int port_map;
diff --git a/arch/x86/cpu/broadwell/sdram.c b/arch/x86/cpu/broadwell/sdram.c
index d606d4e1932..fd3de2a91ca 100644
--- a/arch/x86/cpu/broadwell/sdram.c
+++ b/arch/x86/cpu/broadwell/sdram.c
@@ -28,6 +28,7 @@
 #include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 ulong board_get_usable_ram_top(ulong total_size)
 {
diff --git a/arch/x86/cpu/coreboot/coreboot.c b/arch/x86/cpu/coreboot/coreboot.c
index 748b8dabe71..17e5c858a9f 100644
--- a/arch/x86/cpu/coreboot/coreboot.c
+++ b/arch/x86/cpu/coreboot/coreboot.c
@@ -17,6 +17,7 @@
 #include <asm/mtrr.h>
 #include <asm/arch/sysinfo.h>
 #include <asm/arch/timestamp.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/x86/cpu/coreboot/sdram.c b/arch/x86/cpu/coreboot/sdram.c
index e2dfbc1937b..df88cfbf829 100644
--- a/arch/x86/cpu/coreboot/sdram.c
+++ b/arch/x86/cpu/coreboot/sdram.c
@@ -14,6 +14,7 @@
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/coreboot/tables.c b/arch/x86/cpu/coreboot/tables.c
index f0c350605e1..68d2805a7bc 100644
--- a/arch/x86/cpu/coreboot/tables.c
+++ b/arch/x86/cpu/coreboot/tables.c
@@ -7,10 +7,12 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <net.h>
 #include <asm/arch/sysinfo.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/coreboot/timestamp.c b/arch/x86/cpu/coreboot/timestamp.c
index 86e1f9693ee..3290403e91f 100644
--- a/arch/x86/cpu/coreboot/timestamp.c
+++ b/arch/x86/cpu/coreboot/timestamp.c
@@ -7,10 +7,12 @@
 
 #include <common.h>
 #include <bootstage.h>
+#include <compiler.h>
 #include <asm/arch/timestamp.h>
 #include <asm/arch/sysinfo.h>
 #include <asm/u-boot.h>
 #include <linux/compiler.h>
+#include <linux/types.h>
 
 struct timestamp_entry {
 	uint32_t	entry_id;
diff --git a/arch/x86/cpu/cpu.c b/arch/x86/cpu/cpu.c
index c1e9be4eda8..578f1118122 100644
--- a/arch/x86/cpu/cpu.c
+++ b/arch/x86/cpu/cpu.c
@@ -21,6 +21,7 @@
 #include <common.h>
 #include <bootstage.h>
 #include <command.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <dm.h>
 #include <errno.h>
@@ -52,6 +53,7 @@
 #include <linux/compiler.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/efi/payload.c b/arch/x86/cpu/efi/payload.c
index 41f51a21ff6..6e84e11e0cf 100644
--- a/arch/x86/cpu/efi/payload.c
+++ b/arch/x86/cpu/efi/payload.c
@@ -20,6 +20,7 @@
 #include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/efi/sdram.c b/arch/x86/cpu/efi/sdram.c
index 2b164f72de9..0a7cfe0c93e 100644
--- a/arch/x86/cpu/efi/sdram.c
+++ b/arch/x86/cpu/efi/sdram.c
@@ -9,6 +9,7 @@
 #include <asm/global_data.h>
 #include <asm/u-boot-x86.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/i386/cpu.c b/arch/x86/cpu/i386/cpu.c
index f1b56a3a215..f58b5d7ee2d 100644
--- a/arch/x86/cpu/i386/cpu.c
+++ b/arch/x86/cpu/i386/cpu.c
@@ -19,11 +19,13 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <init.h>
 #include <log.h>
 #include <malloc.h>
 #include <spl.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/control_regs.h>
 #include <asm/coreboot_tables.h>
@@ -37,6 +39,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/i386/interrupt.c b/arch/x86/cpu/i386/interrupt.c
index fc9853d225e..75cef38741f 100644
--- a/arch/x86/cpu/i386/interrupt.c
+++ b/arch/x86/cpu/i386/interrupt.c
@@ -11,6 +11,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <efi_loader.h>
 #include <hang.h>
@@ -28,6 +29,7 @@
 #include <asm/ptrace.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/intel_common/cpu.c b/arch/x86/cpu/intel_common/cpu.c
index b5d907126af..0f7129fb87e 100644
--- a/arch/x86/cpu/intel_common/cpu.c
+++ b/arch/x86/cpu/intel_common/cpu.c
@@ -25,6 +25,7 @@
 #include <asm/post.h>
 #include <asm/microcode.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/intel_common/fast_spi.c b/arch/x86/cpu/intel_common/fast_spi.c
index 5d3944dee2c..bb594645019 100644
--- a/arch/x86/cpu/intel_common/fast_spi.c
+++ b/arch/x86/cpu/intel_common/fast_spi.c
@@ -8,6 +8,7 @@
 #include <asm/cpu_common.h>
 #include <asm/fast_spi.h>
 #include <asm/pci.h>
+#include <linux/types.h>
 
 /*
  * Returns bios_start and fills in size of the BIOS region.
diff --git a/arch/x86/cpu/intel_common/itss.c b/arch/x86/cpu/intel_common/itss.c
index 732a4b4c4f4..0c20b5598f5 100644
--- a/arch/x86/cpu/intel_common/itss.c
+++ b/arch/x86/cpu/intel_common/itss.c
@@ -17,11 +17,13 @@
 #include <malloc.h>
 #include <p2sb.h>
 #include <spl.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 #include <asm/itss.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 struct itss_platdata {
 #if CONFIG_IS_ENABLED(OF_PLATDATA)
diff --git a/arch/x86/cpu/intel_common/lpc.c b/arch/x86/cpu/intel_common/lpc.c
index 7eaea5c77c8..d6885b68303 100644
--- a/arch/x86/cpu/intel_common/lpc.c
+++ b/arch/x86/cpu/intel_common/lpc.c
@@ -9,6 +9,7 @@
 #include <fdtdec.h>
 #include <pch.h>
 #include <pci.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 #include <asm/intel_regs.h>
 #include <asm/io.h>
@@ -16,6 +17,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/intel_common/microcode.c b/arch/x86/cpu/intel_common/microcode.c
index 157350a8949..aeb23d2941e 100644
--- a/arch/x86/cpu/intel_common/microcode.c
+++ b/arch/x86/cpu/intel_common/microcode.c
@@ -19,6 +19,7 @@
 #include <asm/msr.h>
 #include <asm/msr-index.h>
 #include <asm/processor.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/intel_common/mrc.c b/arch/x86/cpu/intel_common/mrc.c
index 8770546702b..16ce0127656 100644
--- a/arch/x86/cpu/intel_common/mrc.c
+++ b/arch/x86/cpu/intel_common/mrc.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <init.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <syscon.h>
 #include <time.h>
@@ -23,6 +24,7 @@
 #include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 static const char *const ecc_decoder[] = {
 	"inactive",
diff --git a/arch/x86/cpu/intel_common/p2sb.c b/arch/x86/cpu/intel_common/p2sb.c
index 53e2f21df96..7a505b29fed 100644
--- a/arch/x86/cpu/intel_common/p2sb.c
+++ b/arch/x86/cpu/intel_common/p2sb.c
@@ -13,10 +13,12 @@
 #include <log.h>
 #include <p2sb.h>
 #include <spl.h>
+#include <stdbool.h>
 #include <asm/pci.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #define PCH_P2SB_E0		0xe0
 #define HIDE_BIT		BIT(0)
diff --git a/arch/x86/cpu/intel_common/pch.c b/arch/x86/cpu/intel_common/pch.c
index af82b64a13c..c30ba15855b 100644
--- a/arch/x86/cpu/intel_common/pch.c
+++ b/arch/x86/cpu/intel_common/pch.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <dm.h>
 #include <asm/pch_common.h>
+#include <asm/types.h>
 
 u32 pch_common_sir_read(struct udevice *dev, int idx)
 {
diff --git a/arch/x86/cpu/intel_common/report_platform.c b/arch/x86/cpu/intel_common/report_platform.c
index 9502b145490..28284ff2f7d 100644
--- a/arch/x86/cpu/intel_common/report_platform.c
+++ b/arch/x86/cpu/intel_common/report_platform.c
@@ -13,6 +13,7 @@
 #include <asm/arch/pch.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static void report_cpu_info(void)
 {
diff --git a/arch/x86/cpu/ioapic.c b/arch/x86/cpu/ioapic.c
index 4f99de6ece2..749ab1a22c3 100644
--- a/arch/x86/cpu/ioapic.c
+++ b/arch/x86/cpu/ioapic.c
@@ -8,6 +8,7 @@
 #include <asm/io.h>
 #include <asm/ioapic.h>
 #include <asm/lapic.h>
+#include <asm/types.h>
 
 u32 io_apic_read(u32 reg)
 {
diff --git a/arch/x86/cpu/irq.c b/arch/x86/cpu/irq.c
index 920a799ec8e..6755e8bb89b 100644
--- a/arch/x86/cpu/irq.c
+++ b/arch/x86/cpu/irq.c
@@ -19,6 +19,7 @@
 #include <asm/pirq_routing.h>
 #include <asm/tables.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/ivybridge/bd82x6x.c b/arch/x86/cpu/ivybridge/bd82x6x.c
index 7df278ddbc4..0bc6f83665a 100644
--- a/arch/x86/cpu/ivybridge/bd82x6x.c
+++ b/arch/x86/cpu/ivybridge/bd82x6x.c
@@ -24,6 +24,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/ivybridge/cpu.c b/arch/x86/cpu/ivybridge/cpu.c
index b819bec8030..59daf5e6011 100644
--- a/arch/x86/cpu/ivybridge/cpu.c
+++ b/arch/x86/cpu/ivybridge/cpu.c
@@ -37,6 +37,7 @@
 #include <asm/arch/sandybridge.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/ivybridge/early_me.c b/arch/x86/cpu/ivybridge/early_me.c
index 9758c9a653d..143a0cda416 100644
--- a/arch/x86/cpu/ivybridge/early_me.c
+++ b/arch/x86/cpu/ivybridge/early_me.c
@@ -19,6 +19,7 @@
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 static const char *const me_ack_values[] = {
 	[ME_HFS_ACK_NO_DID]	= "No DID Ack received",
diff --git a/arch/x86/cpu/ivybridge/lpc.c b/arch/x86/cpu/ivybridge/lpc.c
index 57c84435982..a901a21456f 100644
--- a/arch/x86/cpu/ivybridge/lpc.c
+++ b/arch/x86/cpu/ivybridge/lpc.c
@@ -23,6 +23,7 @@
 #include <asm/arch/pch.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/ivybridge/model_206ax.c b/arch/x86/cpu/ivybridge/model_206ax.c
index 087754a1dd9..e4313a1811f 100644
--- a/arch/x86/cpu/ivybridge/model_206ax.c
+++ b/arch/x86/cpu/ivybridge/model_206ax.c
@@ -12,6 +12,7 @@
 #include <fdtdec.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <asm/cpu.h>
 #include <asm/cpu_common.h>
 #include <asm/cpu_x86.h>
@@ -25,6 +26,7 @@
 #include <asm/arch/model_206ax.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/ivybridge/northbridge.c b/arch/x86/cpu/ivybridge/northbridge.c
index 994f8a4ff6a..a0c4b29b664 100644
--- a/arch/x86/cpu/ivybridge/northbridge.c
+++ b/arch/x86/cpu/ivybridge/northbridge.c
@@ -19,6 +19,7 @@
 #include <asm/arch/pch.h>
 #include <asm/arch/model_206ax.h>
 #include <asm/arch/sandybridge.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/x86/cpu/ivybridge/sata.c b/arch/x86/cpu/ivybridge/sata.c
index 40cb0415868..b74f7a796d7 100644
--- a/arch/x86/cpu/ivybridge/sata.c
+++ b/arch/x86/cpu/ivybridge/sata.c
@@ -15,6 +15,7 @@
 #include <asm/pci.h>
 #include <asm/arch/pch.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/ivybridge/sdram.c b/arch/x86/cpu/ivybridge/sdram.c
index 78511e908e0..82074879575 100644
--- a/arch/x86/cpu/ivybridge/sdram.c
+++ b/arch/x86/cpu/ivybridge/sdram.c
@@ -40,6 +40,7 @@
 #include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/mp_init.c b/arch/x86/cpu/mp_init.c
index 7bf3935ba94..7225c3392bb 100644
--- a/arch/x86/cpu/mp_init.c
+++ b/arch/x86/cpu/mp_init.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <cpu.h>
 #include <dm.h>
 #include <errno.h>
@@ -35,6 +36,7 @@
 #include <linux/kernel.h>
 #include <linux/linkage.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/mtrr.c b/arch/x86/cpu/mtrr.c
index da1f08eff81..cbc289888dc 100644
--- a/arch/x86/cpu/mtrr.c
+++ b/arch/x86/cpu/mtrr.c
@@ -27,6 +27,7 @@
 #include <asm/msr.h>
 #include <asm/mtrr.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/pci.c b/arch/x86/cpu/pci.c
index d4f9290ca73..04877094ad1 100644
--- a/arch/x86/cpu/pci.c
+++ b/arch/x86/cpu/pci.c
@@ -16,6 +16,7 @@
 #include <pci.h>
 #include <asm/io.h>
 #include <asm/pci.h>
+#include <linux/types.h>
 
 int pci_x86_read_config(pci_dev_t bdf, uint offset, ulong *valuep,
 			enum pci_size_t size)
diff --git a/arch/x86/cpu/qemu/dram.c b/arch/x86/cpu/qemu/dram.c
index aeb40f767e5..85c7b62a1f1 100644
--- a/arch/x86/cpu/qemu/dram.c
+++ b/arch/x86/cpu/qemu/dram.c
@@ -9,6 +9,7 @@
 #include <asm/post.h>
 #include <asm/arch/qemu.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/qemu/qemu.c b/arch/x86/cpu/qemu/qemu.c
index a38c4d3f01d..2ff1d79882b 100644
--- a/arch/x86/cpu/qemu/qemu.c
+++ b/arch/x86/cpu/qemu/qemu.c
@@ -15,6 +15,7 @@
 #include <asm/arch/device.h>
 #include <asm/arch/qemu.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 static bool i440fx;
 
diff --git a/arch/x86/cpu/quark/acpi.c b/arch/x86/cpu/quark/acpi.c
index 655f2a1ce6a..013b1d943b1 100644
--- a/arch/x86/cpu/quark/acpi.c
+++ b/arch/x86/cpu/quark/acpi.c
@@ -9,6 +9,7 @@
 #include <asm/tables.h>
 #include <asm/arch/global_nvs.h>
 #include <asm/arch/iomap.h>
+#include <asm/types.h>
 #include <linux/string.h>
 
 void acpi_create_fadt(struct acpi_fadt *fadt, struct acpi_facs *facs,
diff --git a/arch/x86/cpu/quark/dram.c b/arch/x86/cpu/quark/dram.c
index b91d4603b69..38289905387 100644
--- a/arch/x86/cpu/quark/dram.c
+++ b/arch/x86/cpu/quark/dram.c
@@ -21,6 +21,7 @@
 #include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/quark/hte.c b/arch/x86/cpu/quark/hte.c
index df14779357d..489208d0b9b 100644
--- a/arch/x86/cpu/quark/hte.c
+++ b/arch/x86/cpu/quark/hte.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <asm/arch/mrc.h>
 #include <asm/arch/msg_port.h>
+#include <asm/types.h>
 #include "mrc_util.h"
 #include "hte.h"
 
diff --git a/arch/x86/cpu/quark/hte.h b/arch/x86/cpu/quark/hte.h
index b4ea488f30f..322b556c22c 100644
--- a/arch/x86/cpu/quark/hte.h
+++ b/arch/x86/cpu/quark/hte.h
@@ -10,6 +10,7 @@
 #ifndef _HTE_H_
 #define _HTE_H_
 
+#include <asm/types.h>
 enum {
 	MRC_MEM_INIT,
 	MRC_MEM_TEST
diff --git a/arch/x86/cpu/quark/mrc.c b/arch/x86/cpu/quark/mrc.c
index cc29f72e745..af00b7b77fd 100644
--- a/arch/x86/cpu/quark/mrc.c
+++ b/arch/x86/cpu/quark/mrc.c
@@ -12,6 +12,7 @@
  *
  * These functions are generic and should work for any Quark-based board.
  *
+#include <linux/types.h>
  * MRC requires two data structures to be passed in which are initialized by
  * mrc_adjust_params().
  *
diff --git a/arch/x86/cpu/quark/mrc_util.c b/arch/x86/cpu/quark/mrc_util.c
index 6660568899f..1bec77beca1 100644
--- a/arch/x86/cpu/quark/mrc_util.c
+++ b/arch/x86/cpu/quark/mrc_util.c
@@ -15,6 +15,7 @@
 #include <asm/arch/msg_port.h>
 #include <asm/arch/quark.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 #include "mrc_util.h"
 #include "hte.h"
 #include "smc.h"
diff --git a/arch/x86/cpu/quark/mrc_util.h b/arch/x86/cpu/quark/mrc_util.h
index f4e3e87b6c3..89d2f6351fd 100644
--- a/arch/x86/cpu/quark/mrc_util.h
+++ b/arch/x86/cpu/quark/mrc_util.h
@@ -12,6 +12,7 @@
 
 #include <log.h>
 #include <stdbool.h>
+#include <linux/types.h>
 
 /* Turn on this macro to enable MRC debugging output */
 #undef  MRC_DEBUG
diff --git a/arch/x86/cpu/quark/msg_port.c b/arch/x86/cpu/quark/msg_port.c
index d4f8c082ffc..f270eb7bb83 100644
--- a/arch/x86/cpu/quark/msg_port.c
+++ b/arch/x86/cpu/quark/msg_port.c
@@ -7,6 +7,7 @@
 #include <asm/arch/device.h>
 #include <asm/arch/msg_port.h>
 #include <asm/arch/quark.h>
+#include <asm/types.h>
 
 void msg_port_setup(int op, int port, int reg)
 {
diff --git a/arch/x86/cpu/quark/quark.c b/arch/x86/cpu/quark/quark.c
index 44529b6c2ec..2b91d69c34e 100644
--- a/arch/x86/cpu/quark/quark.c
+++ b/arch/x86/cpu/quark/quark.c
@@ -18,6 +18,7 @@
 #include <asm/arch/device.h>
 #include <asm/arch/msg_port.h>
 #include <asm/arch/quark.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 
diff --git a/arch/x86/cpu/quark/smc.c b/arch/x86/cpu/quark/smc.c
index 584f2cfbaac..ae42b381243 100644
--- a/arch/x86/cpu/quark/smc.c
+++ b/arch/x86/cpu/quark/smc.c
@@ -15,6 +15,7 @@
 #include <asm/arch/msg_port.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "mrc_util.h"
 #include "hte.h"
 #include "smc.h"
diff --git a/arch/x86/cpu/quark/smc.h b/arch/x86/cpu/quark/smc.h
index eee27564c87..5c4917ee0b4 100644
--- a/arch/x86/cpu/quark/smc.h
+++ b/arch/x86/cpu/quark/smc.h
@@ -13,6 +13,7 @@
 /* System Memory Controller Register Defines */
 
 /* Memory Controller Message Bus Registers Offsets */
+#include <linux/types.h>
 #define DRP			0x00
 #define DTR0			0x01
 #define DTR1			0x02
diff --git a/arch/x86/cpu/queensbay/tnc.c b/arch/x86/cpu/queensbay/tnc.c
index 5601422d496..9573b9b5bea 100644
--- a/arch/x86/cpu/queensbay/tnc.c
+++ b/arch/x86/cpu/queensbay/tnc.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <dm.h>
 #include <init.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <dm/device-internal.h>
 #include <pci.h>
diff --git a/arch/x86/cpu/slimbootloader/sdram.c b/arch/x86/cpu/slimbootloader/sdram.c
index 381a88124ff..0306e3b9616 100644
--- a/arch/x86/cpu/slimbootloader/sdram.c
+++ b/arch/x86/cpu/slimbootloader/sdram.c
@@ -12,6 +12,7 @@
 #include <linux/sizes.h>
 #include <asm/e820.h>
 #include <asm/arch/slimbootloader.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/tangier/acpi.c b/arch/x86/cpu/tangier/acpi.c
index 8aa5efdcab9..404c891de63 100644
--- a/arch/x86/cpu/tangier/acpi.c
+++ b/arch/x86/cpu/tangier/acpi.c
@@ -15,6 +15,7 @@
 #include <asm/tables.h>
 #include <asm/arch/global_nvs.h>
 #include <asm/arch/iomap.h>
+#include <asm/types.h>
 #include <dm/uclass-internal.h>
 #include <linux/string.h>
 
diff --git a/arch/x86/cpu/tangier/pinmux.c b/arch/x86/cpu/tangier/pinmux.c
index 41ad198a060..42c68278820 100644
--- a/arch/x86/cpu/tangier/pinmux.c
+++ b/arch/x86/cpu/tangier/pinmux.c
@@ -4,8 +4,10 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
+#include <stdbool.h>
 #include <dm/pinctrl.h>
 #include <dm/read.h>
 #include <regmap.h>
@@ -16,6 +18,7 @@
 #include <linux/io.h>
 #include <linux/kernel.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 #define BUFCFG_OFFSET				0x100
 
diff --git a/arch/x86/cpu/tangier/sdram.c b/arch/x86/cpu/tangier/sdram.c
index 9605d776c4d..728722139d4 100644
--- a/arch/x86/cpu/tangier/sdram.c
+++ b/arch/x86/cpu/tangier/sdram.c
@@ -9,6 +9,7 @@
 #include <asm/e820.h>
 #include <asm/global_data.h>
 #include <asm/sfi.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
diff --git a/arch/x86/include/asm/acpi_nhlt.h b/arch/x86/include/asm/acpi_nhlt.h
index 47203213818..cf28370aa16 100644
--- a/arch/x86/include/asm/acpi_nhlt.h
+++ b/arch/x86/include/asm/acpi_nhlt.h
@@ -8,6 +8,7 @@
 #ifndef _NHLT_H_
 #define _NHLT_H_
 
+#include <linux/types.h>
 struct acpi_ctx;
 struct nhlt;
 struct nhlt_endpoint;
diff --git a/arch/x86/include/asm/acpi_table.h b/arch/x86/include/asm/acpi_table.h
index 733085c1785..199d7314060 100644
--- a/arch/x86/include/asm/acpi_table.h
+++ b/arch/x86/include/asm/acpi_table.h
@@ -9,6 +9,7 @@
 #ifndef __ASM_ACPI_TABLE_H__
 #define __ASM_ACPI_TABLE_H__
 
+#include <linux/types.h>
 struct acpi_facs;
 struct acpi_fadt;
 struct acpi_global_nvs;
diff --git a/arch/x86/include/asm/arch-apollolake/fsp/fsp_m_upd.h b/arch/x86/include/asm/arch-apollolake/fsp/fsp_m_upd.h
index 5275b75f3b0..b8db24661e1 100644
--- a/arch/x86/include/asm/arch-apollolake/fsp/fsp_m_upd.h
+++ b/arch/x86/include/asm/arch-apollolake/fsp/fsp_m_upd.h
@@ -8,7 +8,9 @@
 #define	__ASM_ARCH_FSP_M_UDP_H
 
 #ifndef __ASSEMBLY__
+#include <compiler.h>
 #include <asm/fsp2/fsp_api.h>
+#include <asm/types.h>
 
 #define FSP_DRAM_CHANNELS	4
 
diff --git a/arch/x86/include/asm/arch-apollolake/fsp/fsp_s_upd.h b/arch/x86/include/asm/arch-apollolake/fsp/fsp_s_upd.h
index 451a7a254a4..85da4af7bc3 100644
--- a/arch/x86/include/asm/arch-apollolake/fsp/fsp_s_upd.h
+++ b/arch/x86/include/asm/arch-apollolake/fsp/fsp_s_upd.h
@@ -7,7 +7,9 @@
 #define __ASM_ARCH_FSP_S_UDP_H
 
 #ifndef __ASSEMBLY__
+#include <compiler.h>
 #include <asm/fsp2/fsp_api.h>
+#include <asm/types.h>
 
 /**
  * struct fsp_s_config - FSP-S configuration
diff --git a/arch/x86/include/asm/arch-apollolake/fsp_bindings.h b/arch/x86/include/asm/arch-apollolake/fsp_bindings.h
index b0510534c8a..b6c2d2f73f9 100644
--- a/arch/x86/include/asm/arch-apollolake/fsp_bindings.h
+++ b/arch/x86/include/asm/arch-apollolake/fsp_bindings.h
@@ -10,6 +10,7 @@
 #include <asm/arch/fsp/fsp_m_upd.h>
 #include <asm/arch/fsp/fsp_s_upd.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #define ARRAY_SIZE_OF_MEMBER(s, m) (ARRAY_SIZE((((s *)0)->m)))
 #define SIZE_OF_MEMBER(s, m) (sizeof((((s *)0)->m)))
diff --git a/arch/x86/include/asm/arch-apollolake/global_nvs.h b/arch/x86/include/asm/arch-apollolake/global_nvs.h
index fe62194b02e..917d34621b9 100644
--- a/arch/x86/include/asm/arch-apollolake/global_nvs.h
+++ b/arch/x86/include/asm/arch-apollolake/global_nvs.h
@@ -10,6 +10,8 @@
 #ifndef _GLOBAL_NVS_H_
 #define _GLOBAL_NVS_H_
 
+#include <compiler.h>
+#include <asm/types.h>
 struct __packed acpi_global_nvs {
 	/* Miscellaneous */
 	u8	pcnt; /* 0x00 - Processor Count */
diff --git a/arch/x86/include/asm/arch-apollolake/lpc.h b/arch/x86/include/asm/arch-apollolake/lpc.h
index 977b7eccd88..c22e6903b8e 100644
--- a/arch/x86/include/asm/arch-apollolake/lpc.h
+++ b/arch/x86/include/asm/arch-apollolake/lpc.h
@@ -8,6 +8,7 @@
 #define _ASM_ARCH_LPC_H
 
 #include <linux/bitops.h>
+#include <linux/types.h>
 #define LPC_SERIRQ_CTL			0x64
 #define  LPC_SCNT_EN			BIT(7)
 #define  LPC_SCNT_MODE			BIT(6)
diff --git a/arch/x86/include/asm/arch-apollolake/uart.h b/arch/x86/include/asm/arch-apollolake/uart.h
index d4fffe6525c..35e5d24b6f3 100644
--- a/arch/x86/include/asm/arch-apollolake/uart.h
+++ b/arch/x86/include/asm/arch-apollolake/uart.h
@@ -15,6 +15,7 @@
  * The UART won't actually work unless the GPIO settings are correct and the
  * signals actually exit the SoC. See board_debug_uart_init() for that.
  */
+#include <linux/types.h>
 int apl_uart_init(pci_dev_t bdf, ulong base);
 
 #endif
diff --git a/arch/x86/include/asm/arch-baytrail/fsp/fsp_vpd.h b/arch/x86/include/asm/arch-baytrail/fsp/fsp_vpd.h
index c6544ea409c..b561fb38e93 100644
--- a/arch/x86/include/asm/arch-baytrail/fsp/fsp_vpd.h
+++ b/arch/x86/include/asm/arch-baytrail/fsp/fsp_vpd.h
@@ -7,6 +7,8 @@
 #ifndef __FSP_VPD_H
 #define __FSP_VPD_H
 
+#include <compiler.h>
+#include <linux/types.h>
 struct memory_down_data {
 	uint8_t enable_memory_down;
 	uint8_t dram_speed;
diff --git a/arch/x86/include/asm/arch-baytrail/global_nvs.h b/arch/x86/include/asm/arch-baytrail/global_nvs.h
index 1072e3ddf40..777591b72c2 100644
--- a/arch/x86/include/asm/arch-baytrail/global_nvs.h
+++ b/arch/x86/include/asm/arch-baytrail/global_nvs.h
@@ -6,6 +6,8 @@
 #ifndef _GLOBAL_NVS_H_
 #define _GLOBAL_NVS_H_
 
+#include <compiler.h>
+#include <asm/types.h>
 struct __packed acpi_global_nvs {
 	u8	pcnt;		/* processor count */
 	u8	iuart_en;	/* internal UART enabled */
diff --git a/arch/x86/include/asm/arch-braswell/fsp/fsp_vpd.h b/arch/x86/include/asm/arch-braswell/fsp/fsp_vpd.h
index f2260ae90e8..eec075154d1 100644
--- a/arch/x86/include/asm/arch-braswell/fsp/fsp_vpd.h
+++ b/arch/x86/include/asm/arch-braswell/fsp/fsp_vpd.h
@@ -7,7 +7,9 @@
 #ifndef __FSP_VPD_H__
 #define __FSP_VPD_H__
 
+#include <compiler.h>
 #include <stddef.h>
+#include <asm/types.h>
 
 struct __packed memory_upd {
 	u64 signature;				/* Offset 0x0020 */
diff --git a/arch/x86/include/asm/arch-broadwell/gpio.h b/arch/x86/include/asm/arch-broadwell/gpio.h
index b5dd5ab4e7f..33cb942bcc8 100644
--- a/arch/x86/include/asm/arch-broadwell/gpio.h
+++ b/arch/x86/include/asm/arch-broadwell/gpio.h
@@ -9,6 +9,7 @@
 #define __ASM_ARCH_GPIO
 
 #include <linux/kernel.h>
+#include <linux/types.h>
 #define GPIO_PER_BANK	32
 #define GPIO_BANKS	3
 
diff --git a/arch/x86/include/asm/arch-broadwell/me.h b/arch/x86/include/asm/arch-broadwell/me.h
index 58f16ba54c5..ceaa0f2bd31 100644
--- a/arch/x86/include/asm/arch-broadwell/me.h
+++ b/arch/x86/include/asm/arch-broadwell/me.h
@@ -8,7 +8,9 @@
 #ifndef _asm_arch_me_h
 #define _asm_arch_me_h
 
+#include <compiler.h>
 #include <asm/me_common.h>
+#include <asm/types.h>
 
 #define  ME_INIT_STATUS_SUCCESS_OTHER 3 /* SEE ME9 BWG */
 
diff --git a/arch/x86/include/asm/arch-broadwell/pch.h b/arch/x86/include/asm/arch-broadwell/pch.h
index 6b6f10ec6c8..9e991c35cc6 100644
--- a/arch/x86/include/asm/arch-broadwell/pch.h
+++ b/arch/x86/include/asm/arch-broadwell/pch.h
@@ -7,6 +7,7 @@
 #define __ASM_ARCH_PCH_H
 
 #include <stdbool.h>
+#include <asm/types.h>
 
 #define PMBASE			0x40
 #define ACPI_CNTL		0x44
diff --git a/arch/x86/include/asm/arch-broadwell/pei_data.h b/arch/x86/include/asm/arch-broadwell/pei_data.h
index 4442beac5e4..5eee0502bba 100644
--- a/arch/x86/include/asm/arch-broadwell/pei_data.h
+++ b/arch/x86/include/asm/arch-broadwell/pei_data.h
@@ -8,7 +8,9 @@
 #ifndef ASM_ARCH_PEI_DATA_H
 #define ASM_ARCH_PEI_DATA_H
 
+#include <compiler.h>
 #include <linux/linkage.h>
+#include <linux/types.h>
 
 #define PEI_VERSION 22
 
diff --git a/arch/x86/include/asm/arch-broadwell/pm.h b/arch/x86/include/asm/arch-broadwell/pm.h
index df350808379..6a14ebecaae 100644
--- a/arch/x86/include/asm/arch-broadwell/pm.h
+++ b/arch/x86/include/asm/arch-broadwell/pm.h
@@ -8,6 +8,7 @@
 #ifndef __ASM_ARCH_PM_H
 #define __ASM_ARCH_PM_H
 
+#include <linux/types.h>
 #define PM1_STS			0x00
 #define  WAK_STS		(1 << 15)
 #define  PCIEXPWAK_STS		(1 << 14)
diff --git a/arch/x86/include/asm/arch-coreboot/sysinfo.h b/arch/x86/include/asm/arch-coreboot/sysinfo.h
index 419ec529335..f9096ba7c18 100644
--- a/arch/x86/include/asm/arch-coreboot/sysinfo.h
+++ b/arch/x86/include/asm/arch-coreboot/sysinfo.h
@@ -9,6 +9,7 @@
 #define _COREBOOT_SYSINFO_H
 
 #include <asm/coreboot_tables.h>
+#include <asm/types.h>
 
 /* Maximum number of memory range definitions */
 #define SYSINFO_MAX_MEM_RANGES	32
diff --git a/arch/x86/include/asm/arch-coreboot/timestamp.h b/arch/x86/include/asm/arch-coreboot/timestamp.h
index 85d42c02c46..d6db2ea0e5d 100644
--- a/arch/x86/include/asm/arch-coreboot/timestamp.h
+++ b/arch/x86/include/asm/arch-coreboot/timestamp.h
@@ -8,6 +8,7 @@
 #ifndef __COREBOOT_TIMESTAMP_H__
 #define __COREBOOT_TIMESTAMP_H__
 
+#include <linux/types.h>
 enum timestamp_id {
 	/* coreboot specific timestamp IDs */
 	TS_START_ROMSTAGE = 1,
diff --git a/arch/x86/include/asm/arch-ivybridge/fsp/fsp_configs.h b/arch/x86/include/asm/arch-ivybridge/fsp/fsp_configs.h
index ae9105b6ef1..2c290b5d293 100644
--- a/arch/x86/include/asm/arch-ivybridge/fsp/fsp_configs.h
+++ b/arch/x86/include/asm/arch-ivybridge/fsp/fsp_configs.h
@@ -6,6 +6,7 @@
 #ifndef __FSP_CONFIGS_H__
 #define __FSP_CONFIGS_H__
 
+#include <asm/types.h>
 struct platform_config {
 	u8 enable_ht;
 	u8 enable_turbo;
diff --git a/arch/x86/include/asm/arch-ivybridge/me.h b/arch/x86/include/asm/arch-ivybridge/me.h
index 518c308d59b..c832b029304 100644
--- a/arch/x86/include/asm/arch-ivybridge/me.h
+++ b/arch/x86/include/asm/arch-ivybridge/me.h
@@ -8,7 +8,9 @@
 #ifndef _ASM_INTEL_ME_H
 #define _ASM_INTEL_ME_H
 
+#include <compiler.h>
 #include <asm/me_common.h>
+#include <asm/types.h>
 
 struct __packed mbp_fw_version_name {
 	u32 major_version:16;
diff --git a/arch/x86/include/asm/arch-ivybridge/model_206ax.h b/arch/x86/include/asm/arch-ivybridge/model_206ax.h
index d2d28746974..3df4b37bb58 100644
--- a/arch/x86/include/asm/arch-ivybridge/model_206ax.h
+++ b/arch/x86/include/asm/arch-ivybridge/model_206ax.h
@@ -9,6 +9,7 @@
 #define _ASM_ARCH_MODEL_206AX_H
 
 #include <stdbool.h>
+#include <asm/types.h>
 #define  CPUID_VMX			(1 << 5)
 #define  CPUID_SMX			(1 << 6)
 #define MSR_FEATURE_CONFIG		0x13c
diff --git a/arch/x86/include/asm/arch-ivybridge/pch.h b/arch/x86/include/asm/arch-ivybridge/pch.h
index 8018bc097d0..8630ec581e1 100644
--- a/arch/x86/include/asm/arch-ivybridge/pch.h
+++ b/arch/x86/include/asm/arch-ivybridge/pch.h
@@ -12,6 +12,7 @@
 #define _ASM_ARCH_PCH_H
 
 #include <pci.h>
+#include <asm/types.h>
 
 /* PCH types */
 #define PCH_TYPE_CPT	0x1c /* CougarPoint */
diff --git a/arch/x86/include/asm/arch-ivybridge/pei_data.h b/arch/x86/include/asm/arch-ivybridge/pei_data.h
index b8da21bed7b..6b7fd6ce460 100644
--- a/arch/x86/include/asm/arch-ivybridge/pei_data.h
+++ b/arch/x86/include/asm/arch-ivybridge/pei_data.h
@@ -6,7 +6,9 @@
 #ifndef ASM_ARCH_PEI_DATA_H
 #define ASM_ARCH_PEI_DATA_H
 
+#include <compiler.h>
 #include <linux/linkage.h>
+#include <linux/types.h>
 
 struct pch_usb3_controller_settings {
 	/* 0: Disable, 1: Enable, 2: Auto, 3: Smart Auto */
diff --git a/arch/x86/include/asm/arch-qemu/qemu.h b/arch/x86/include/asm/arch-qemu/qemu.h
index 061735b2985..8b0df2998b0 100644
--- a/arch/x86/include/asm/arch-qemu/qemu.h
+++ b/arch/x86/include/asm/arch-qemu/qemu.h
@@ -7,6 +7,7 @@
 #define _ARCH_QEMU_H_
 
 /* Programmable Attribute Map (PAM) Registers */
+#include <asm/types.h>
 #define I440FX_PAM		0x59
 #define Q35_PAM			0x90
 #define PAM_NUM			7
diff --git a/arch/x86/include/asm/arch-quark/global_nvs.h b/arch/x86/include/asm/arch-quark/global_nvs.h
index 6e99e6737dd..45c35dcaade 100644
--- a/arch/x86/include/asm/arch-quark/global_nvs.h
+++ b/arch/x86/include/asm/arch-quark/global_nvs.h
@@ -6,6 +6,8 @@
 #ifndef _GLOBAL_NVS_H_
 #define _GLOBAL_NVS_H_
 
+#include <compiler.h>
+#include <asm/types.h>
 struct __packed acpi_global_nvs {
 	u8	pcnt;		/* processor count */
 
diff --git a/arch/x86/include/asm/arch-quark/mrc.h b/arch/x86/include/asm/arch-quark/mrc.h
index 2353426cd6d..e817dba55c6 100644
--- a/arch/x86/include/asm/arch-quark/mrc.h
+++ b/arch/x86/include/asm/arch-quark/mrc.h
@@ -10,6 +10,7 @@
 #ifndef _MRC_H_
 #define _MRC_H_
 
+#include <linux/types.h>
 #define MRC_VERSION	0x0111
 
 /* architectural definitions */
diff --git a/arch/x86/include/asm/arch-quark/msg_port.h b/arch/x86/include/asm/arch-quark/msg_port.h
index 9527fdad3fd..093e8c7a14a 100644
--- a/arch/x86/include/asm/arch-quark/msg_port.h
+++ b/arch/x86/include/asm/arch-quark/msg_port.h
@@ -41,6 +41,7 @@
  * @port:   port number on the message bus
  * @reg:    register number within a port
  */
+#include <asm/types.h>
 void msg_port_setup(int op, int port, int reg);
 
 /**
diff --git a/arch/x86/include/asm/arch-quark/quark.h b/arch/x86/include/asm/arch-quark/quark.h
index feca1983ba8..7a42db59b1a 100644
--- a/arch/x86/include/asm/arch-quark/quark.h
+++ b/arch/x86/include/asm/arch-quark/quark.h
@@ -72,6 +72,7 @@
 #ifndef __ASSEMBLY__
 
 /* variable range MTRR usage */
+#include <asm/types.h>
 enum {
 	MTRR_VAR_ROM,
 	MTRR_VAR_ESRAM,
diff --git a/arch/x86/include/asm/arch-queensbay/fsp/fsp_vpd.h b/arch/x86/include/asm/arch-queensbay/fsp/fsp_vpd.h
index 7572fc7e40f..fe793efce94 100644
--- a/arch/x86/include/asm/arch-queensbay/fsp/fsp_vpd.h
+++ b/arch/x86/include/asm/arch-queensbay/fsp/fsp_vpd.h
@@ -9,6 +9,8 @@
 #ifndef __VPDHEADER_H__
 #define __VPDHEADER_H__
 
+#include <compiler.h>
+#include <asm/types.h>
 struct __packed upd_region {
 	u64	sign;			/* Offset 0x0000 */
 	u64	reserved;		/* Offset 0x0008 */
diff --git a/arch/x86/include/asm/arch-queensbay/tnc.h b/arch/x86/include/asm/arch-queensbay/tnc.h
index 8d151509ab9..70d810959a7 100644
--- a/arch/x86/include/asm/arch-queensbay/tnc.h
+++ b/arch/x86/include/asm/arch-queensbay/tnc.h
@@ -7,6 +7,7 @@
 #define _X86_ARCH_TNC_H_
 
 /* IGD Function Disable Register */
+#include <asm/types.h>
 #define IGD_FD		0xc4
 #define FUNC_DISABLE	0x00000001
 
diff --git a/arch/x86/include/asm/arch-slimbootloader/slimbootloader.h b/arch/x86/include/asm/arch-slimbootloader/slimbootloader.h
index 05dd1b2b447..05c683445ec 100644
--- a/arch/x86/include/asm/arch-slimbootloader/slimbootloader.h
+++ b/arch/x86/include/asm/arch-slimbootloader/slimbootloader.h
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <asm/hob.h>
+#include <asm/types.h>
 
 /**
  * A GUID to get MemoryMap info hob which is provided by Slim Bootloader
diff --git a/arch/x86/include/asm/arch-tangier/global_nvs.h b/arch/x86/include/asm/arch-tangier/global_nvs.h
index a7811a331a1..31794b9d3c1 100644
--- a/arch/x86/include/asm/arch-tangier/global_nvs.h
+++ b/arch/x86/include/asm/arch-tangier/global_nvs.h
@@ -8,6 +8,8 @@
 #ifndef _GLOBAL_NVS_H_
 #define _GLOBAL_NVS_H_
 
+#include <compiler.h>
+#include <asm/types.h>
 struct __packed acpi_global_nvs {
 	u8	pcnt;		/* processor count */
 
diff --git a/arch/x86/include/asm/bootm.h b/arch/x86/include/asm/bootm.h
index 231d11340ca..61e66b51db6 100644
--- a/arch/x86/include/asm/bootm.h
+++ b/arch/x86/include/asm/bootm.h
@@ -7,6 +7,7 @@
 #define ARM_BOOTM_H
 
 #include <stdbool.h>
+#include <linux/types.h>
 void bootm_announce_and_cleanup(void);
 
 /**
diff --git a/arch/x86/include/asm/coreboot_tables.h b/arch/x86/include/asm/coreboot_tables.h
index 7e1576768be..5db5f8d00c5 100644
--- a/arch/x86/include/asm/coreboot_tables.h
+++ b/arch/x86/include/asm/coreboot_tables.h
@@ -8,6 +8,8 @@
 #ifndef _COREBOOT_TABLES_H
 #define _COREBOOT_TABLES_H
 
+#include <compiler.h>
+#include <linux/types.h>
 struct memory_area;
 
 struct cbuint64 {
diff --git a/arch/x86/include/asm/cpu.h b/arch/x86/include/asm/cpu.h
index 21a05dab7de..a0ecce304cf 100644
--- a/arch/x86/include/asm/cpu.h
+++ b/arch/x86/include/asm/cpu.h
@@ -10,6 +10,7 @@
 #ifndef _ASM_CPU_H
 #define _ASM_CPU_H
 
+#include <linux/types.h>
 enum {
 	X86_VENDOR_INVALID = 0,
 	X86_VENDOR_INTEL,
diff --git a/arch/x86/include/asm/cpu_common.h b/arch/x86/include/asm/cpu_common.h
index 67d150b8d91..526d3fbcbab 100644
--- a/arch/x86/include/asm/cpu_common.h
+++ b/arch/x86/include/asm/cpu_common.h
@@ -9,6 +9,7 @@
 #define __ASM_CPU_COMMON_H
 
 #include <stdbool.h>
+#include <linux/types.h>
 
 /* Standard Intel bus clock is fixed at 100MHz */
 enum {
diff --git a/arch/x86/include/asm/early_cmos.h b/arch/x86/include/asm/early_cmos.h
index 543a9e69f03..42dca5a0787 100644
--- a/arch/x86/include/asm/early_cmos.h
+++ b/arch/x86/include/asm/early_cmos.h
@@ -7,6 +7,7 @@
 #define __EARLY_CMOS_H
 
 /* CMOS actually resides in the RTC SRAM */
+#include <asm/types.h>
 #define CMOS_IO_PORT	0x70
 
 /**
diff --git a/arch/x86/include/asm/fast_spi.h b/arch/x86/include/asm/fast_spi.h
index ed436a89113..0a059bf0b1e 100644
--- a/arch/x86/include/asm/fast_spi.h
+++ b/arch/x86/include/asm/fast_spi.h
@@ -9,6 +9,7 @@
 #include <pci.h>
 #include <linux/bitops.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 /* Register offsets from the MMIO region base (PCI_BASE_ADDRESS_0) */
 struct fast_spi_regs {
diff --git a/arch/x86/include/asm/fsp/fsp_api.h b/arch/x86/include/asm/fsp/fsp_api.h
index 4941e2d74f0..1a0d3f8ffa5 100644
--- a/arch/x86/include/asm/fsp/fsp_api.h
+++ b/arch/x86/include/asm/fsp/fsp_api.h
@@ -6,6 +6,7 @@
 #ifndef __ASM_FSP_API_H
 #define __ASM_FSP_API_H
 
+#include <asm/types.h>
 #include <linux/linkage.h>
 
 enum fsp_phase {
diff --git a/arch/x86/include/asm/fsp/fsp_azalia.h b/arch/x86/include/asm/fsp/fsp_azalia.h
index e59180bdae2..9b71c79f7b5 100644
--- a/arch/x86/include/asm/fsp/fsp_azalia.h
+++ b/arch/x86/include/asm/fsp/fsp_azalia.h
@@ -7,6 +7,8 @@
 #ifndef _FSP_AZALIA_H_
 #define _FSP_AZALIA_H_
 
+#include <compiler.h>
+#include <asm/types.h>
 struct __packed azalia_verb_table_header {
 	u32 vendor_device_id;
 	u16 sub_system_id;
diff --git a/arch/x86/include/asm/fsp/fsp_fv.h b/arch/x86/include/asm/fsp/fsp_fv.h
index 7492c87c34a..862627f137f 100644
--- a/arch/x86/include/asm/fsp/fsp_fv.h
+++ b/arch/x86/include/asm/fsp/fsp_fv.h
@@ -8,6 +8,7 @@
 #define __FSP_FV___
 
 #include <efi.h>
+#include <asm/types.h>
 
 /* Value of EFI_FV_FILE_ATTRIBUTES */
 #define EFI_FV_FILE_ATTR_ALIGNMENT	0x0000001F
diff --git a/arch/x86/include/asm/fsp/fsp_hob.h b/arch/x86/include/asm/fsp/fsp_hob.h
index d248520e972..d2eeecf2e39 100644
--- a/arch/x86/include/asm/fsp/fsp_hob.h
+++ b/arch/x86/include/asm/fsp/fsp_hob.h
@@ -7,7 +7,9 @@
 #ifndef __FSP_HOB_H__
 #define __FSP_HOB_H__
 
+#include <compiler.h>
 #include <asm/hob.h>
+#include <asm/types.h>
 
 enum pixel_format {
 	pixel_rgbx_8bpc,	/* RGB 8 bit per color */
diff --git a/arch/x86/include/asm/fsp/fsp_infoheader.h b/arch/x86/include/asm/fsp/fsp_infoheader.h
index e72c052ed1e..691c135ae35 100644
--- a/arch/x86/include/asm/fsp/fsp_infoheader.h
+++ b/arch/x86/include/asm/fsp/fsp_infoheader.h
@@ -7,6 +7,8 @@
 #ifndef _FSP_HEADER_H_
 #define _FSP_HEADER_H_
 
+#include <compiler.h>
+#include <asm/types.h>
 #define FSP_HEADER_OFF	0x94	/* Fixed FSP header offset in the FSP image */
 
 struct __packed fsp_header {
diff --git a/arch/x86/include/asm/fsp/fsp_support.h b/arch/x86/include/asm/fsp/fsp_support.h
index 29e511415cd..8d1fc0ef296 100644
--- a/arch/x86/include/asm/fsp/fsp_support.h
+++ b/arch/x86/include/asm/fsp/fsp_support.h
@@ -14,6 +14,7 @@
 #include <asm/fsp/fsp_types.h>
 #include <asm/fsp_arch.h>
 #include <asm/fsp/fsp_azalia.h>
+#include <asm/types.h>
 
 #define FSP_LOWMEM_BASE		0x100000UL
 #define FSP_HIGHMEM_BASE	0x100000000ULL
diff --git a/arch/x86/include/asm/fsp1/fsp_api.h b/arch/x86/include/asm/fsp1/fsp_api.h
index 524da5feb75..e4881d6a93d 100644
--- a/arch/x86/include/asm/fsp1/fsp_api.h
+++ b/arch/x86/include/asm/fsp1/fsp_api.h
@@ -7,6 +7,7 @@
 #ifndef __FSP1_API_H__
 #define __FSP1_API_H__
 
+#include <asm/types.h>
 #include <linux/linkage.h>
 #include <asm/fsp/fsp_api.h>
 /*
diff --git a/arch/x86/include/asm/fsp1/fsp_ffs.h b/arch/x86/include/asm/fsp1/fsp_ffs.h
index b7558e5a17f..6447ab96a70 100644
--- a/arch/x86/include/asm/fsp1/fsp_ffs.h
+++ b/arch/x86/include/asm/fsp1/fsp_ffs.h
@@ -8,6 +8,8 @@
 #define __FSP_FFS_H__
 
 /* Used to verify the integrity of the file */
+#include <compiler.h>
+#include <asm/types.h>
 union __packed ffs_integrity {
 	struct {
 		/*
diff --git a/arch/x86/include/asm/fsp1/fsp_support.h b/arch/x86/include/asm/fsp1/fsp_support.h
index a44a5504a4f..cec7db49811 100644
--- a/arch/x86/include/asm/fsp1/fsp_support.h
+++ b/arch/x86/include/asm/fsp1/fsp_support.h
@@ -8,6 +8,7 @@
 #define __FSP1_SUPPORT_H__
 
 #include <asm/fsp/fsp_support.h>
+#include <asm/types.h>
 #include "fsp_ffs.h"
 
 /**
diff --git a/arch/x86/include/asm/fsp2/fsp_api.h b/arch/x86/include/asm/fsp2/fsp_api.h
index 16ffb1922cd..28f4b97ae01 100644
--- a/arch/x86/include/asm/fsp2/fsp_api.h
+++ b/arch/x86/include/asm/fsp2/fsp_api.h
@@ -9,8 +9,10 @@
 #ifndef __ASM_FSP2_API_H
 #define __ASM_FSP2_API_H
 
+#include <compiler.h>
 #include <stdbool.h>
 #include <asm/fsp/fsp_api.h>
+#include <asm/types.h>
 
 struct fspm_upd;
 struct fsps_upd;
diff --git a/arch/x86/include/asm/fsp2/fsp_internal.h b/arch/x86/include/asm/fsp2/fsp_internal.h
index 720d677c05d..6ab78bf053b 100644
--- a/arch/x86/include/asm/fsp2/fsp_internal.h
+++ b/arch/x86/include/asm/fsp2/fsp_internal.h
@@ -9,6 +9,7 @@
 #define __ASM_FSP_INTERNAL_H
 
 #include <stdbool.h>
+#include <linux/types.h>
 struct binman_entry;
 struct fsp_header;
 struct fspm_upd;
diff --git a/arch/x86/include/asm/global_data.h b/arch/x86/include/asm/global_data.h
index 7fcd21ee2d5..8987df975c9 100644
--- a/arch/x86/include/asm/global_data.h
+++ b/arch/x86/include/asm/global_data.h
@@ -9,9 +9,11 @@
 
 #ifndef __ASSEMBLY__
 
+#include <compiler.h>
 #include <stdbool.h>
 #include <asm/processor.h>
 #include <asm/mrccache.h>
+#include <linux/types.h>
 
 enum pei_boot_mode_t {
 	PEI_BOOT_NONE = 0,
diff --git a/arch/x86/include/asm/gpio.h b/arch/x86/include/asm/gpio.h
index 58e4d7b831e..7810aee155f 100644
--- a/arch/x86/include/asm/gpio.h
+++ b/arch/x86/include/asm/gpio.h
@@ -7,6 +7,7 @@
 #define _X86_GPIO_H_
 
 #include <asm-generic/gpio.h>
+#include <linux/types.h>
 
 struct ich6_bank_platdata {
 	uint16_t base_addr;
diff --git a/arch/x86/include/asm/handoff.h b/arch/x86/include/asm/handoff.h
index aec49b9b815..5f6691939eb 100644
--- a/arch/x86/include/asm/handoff.h
+++ b/arch/x86/include/asm/handoff.h
@@ -9,6 +9,8 @@
 #ifndef __x86_asm_handoff_h
 #define __x86_asm_handoff_h
 
+#include <linux/types.h>
+
 /**
  * struct arch_spl_handoff - architecture-specific handoff info
  *
diff --git a/arch/x86/include/asm/hob.h b/arch/x86/include/asm/hob.h
index a58f422de72..4860179a33f 100644
--- a/arch/x86/include/asm/hob.h
+++ b/arch/x86/include/asm/hob.h
@@ -10,6 +10,7 @@
 #include <efi.h>
 #include <efi_loader.h>
 #include <stdbool.h>
+#include <linux/types.h>
 
 /* Type of HOB Header */
 #define HOB_TYPE_MEM_ALLOC	0x0002
diff --git a/arch/x86/include/asm/intel_pinctrl.h b/arch/x86/include/asm/intel_pinctrl.h
index bae5d22b883..060e5b5f9be 100644
--- a/arch/x86/include/asm/intel_pinctrl.h
+++ b/arch/x86/include/asm/intel_pinctrl.h
@@ -12,6 +12,7 @@
 #include <stdbool.h>
 #include <dm/pinctrl.h>
 #include <linux/bitops.h>
+#include <linux/types.h>
 
 /**
  * struct pad_config - config for a pad
diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h
index f0119c47b85..7d6d6ded999 100644
--- a/arch/x86/include/asm/io.h
+++ b/arch/x86/include/asm/io.h
@@ -9,6 +9,7 @@
 
 #include <compiler.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /*
  * This file contains the definitions for the x86 IO instructions
diff --git a/arch/x86/include/asm/ioapic.h b/arch/x86/include/asm/ioapic.h
index 9e004e9b5b0..c4106c9b721 100644
--- a/arch/x86/include/asm/ioapic.h
+++ b/arch/x86/include/asm/ioapic.h
@@ -8,6 +8,7 @@
 #ifndef __ASM_IOAPIC_H
 #define __ASM_IOAPIC_H
 
+#include <asm/types.h>
 #define IO_APIC_ADDR		0xfec00000
 
 /* Direct addressed register */
diff --git a/arch/x86/include/asm/irq.h b/arch/x86/include/asm/irq.h
index 2f5de45dff1..81cacd59908 100644
--- a/arch/x86/include/asm/irq.h
+++ b/arch/x86/include/asm/irq.h
@@ -7,6 +7,7 @@
 #define _ARCH_IRQ_H_
 
 #include <stdbool.h>
+#include <asm/types.h>
 #include <dt-bindings/interrupt-router/intel-irq.h>
 
 /**
diff --git a/arch/x86/include/asm/me_common.h b/arch/x86/include/asm/me_common.h
index 56e328846cf..44f99b32b6a 100644
--- a/arch/x86/include/asm/me_common.h
+++ b/arch/x86/include/asm/me_common.h
@@ -12,6 +12,7 @@
 #ifndef __ASM_ME_COMMON_H
 #define __ASM_ME_COMMON_H
 
+#include <compiler.h>
 #include <linux/compiler.h>
 #include <linux/string.h>
 #include <linux/types.h>
diff --git a/arch/x86/include/asm/microcode.h b/arch/x86/include/asm/microcode.h
index 4ab75049315..5598cefb0be 100644
--- a/arch/x86/include/asm/microcode.h
+++ b/arch/x86/include/asm/microcode.h
@@ -9,6 +9,7 @@
 #ifndef __ASSEMBLY__
 
 /* This is a declaration for ucode_base in start.S */
+#include <asm/types.h>
 extern u32 ucode_base;
 extern u32 ucode_size;
 
diff --git a/arch/x86/include/asm/mpspec.h b/arch/x86/include/asm/mpspec.h
index a25f8f03a12..377f94b204e 100644
--- a/arch/x86/include/asm/mpspec.h
+++ b/arch/x86/include/asm/mpspec.h
@@ -13,6 +13,7 @@
  * Intel MultiProcessor Specification 1.4
  */
 
+#include <linux/types.h>
 #define MPSPEC_V14	4
 
 #define MPF_SIGNATURE	"_MP_"
diff --git a/arch/x86/include/asm/mrc_common.h b/arch/x86/include/asm/mrc_common.h
index f060389f789..ec5f7ab84f9 100644
--- a/arch/x86/include/asm/mrc_common.h
+++ b/arch/x86/include/asm/mrc_common.h
@@ -8,6 +8,7 @@
 
 #include <stdbool.h>
 #include <linux/linkage.h>
+#include <linux/types.h>
 
 /**
  * mrc_common_init() - Set up SDRAM
diff --git a/arch/x86/include/asm/mrccache.h b/arch/x86/include/asm/mrccache.h
index 8b104a2f0b8..2f41e003dba 100644
--- a/arch/x86/include/asm/mrccache.h
+++ b/arch/x86/include/asm/mrccache.h
@@ -8,6 +8,7 @@
 #define _ASM_MRCCACHE_H
 
 #include <compiler.h>
+#include <asm/types.h>
 
 #define MRC_DATA_ALIGN		0x100
 #define MRC_DATA_SIGNATURE	(('M' << 0) | ('R' << 8) | \
diff --git a/arch/x86/include/asm/mtrr.h b/arch/x86/include/asm/mtrr.h
index 73edb4d86d3..cb5abbcc908 100644
--- a/arch/x86/include/asm/mtrr.h
+++ b/arch/x86/include/asm/mtrr.h
@@ -60,6 +60,8 @@
 
 #if !defined(__ASSEMBLY__)
 
+#include <linux/types.h>
+
 /**
  * Information about the previous MTRR state, set up by mtrr_open()
  *
diff --git a/arch/x86/include/asm/pch_common.h b/arch/x86/include/asm/pch_common.h
index c4614d3f42c..713630de1bd 100644
--- a/arch/x86/include/asm/pch_common.h
+++ b/arch/x86/include/asm/pch_common.h
@@ -7,6 +7,7 @@
 #define __asm_pch_common_h
 
 /* Common Intel SATA registers */
+#include <asm/types.h>
 #define SATA_SIRI		0xa0 /* SATA Indexed Register Index */
 #define SATA_SIRD		0xa4 /* SATA Indexed Register Data */
 #define SATA_SP			0xd0 /* Scratchpad */
diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h
index 2a720735728..1a5319185de 100644
--- a/arch/x86/include/asm/pci.h
+++ b/arch/x86/include/asm/pci.h
@@ -28,6 +28,7 @@
  * @size:	Access size
  * @return 0 if OK, -ve on error
  */
+#include <linux/types.h>
 int pci_x86_read_config(pci_dev_t bdf, uint offset, ulong *valuep,
 			enum pci_size_t size);
 
diff --git a/arch/x86/include/asm/pirq_routing.h b/arch/x86/include/asm/pirq_routing.h
index 895fa793ef4..679ed750e2a 100644
--- a/arch/x86/include/asm/pirq_routing.h
+++ b/arch/x86/include/asm/pirq_routing.h
@@ -18,7 +18,9 @@
  *
  * CAUTION: If you change this, PIRQ routing will not work correctly.
  */
+#include <compiler.h>
 #include <stdbool.h>
+#include <asm/types.h>
 #define MAX_INTX_ENTRIES	4
 
 #define PIRQ_SIGNATURE		\
diff --git a/arch/x86/include/asm/pnp_def.h b/arch/x86/include/asm/pnp_def.h
index 0345d195c69..560f26098d6 100644
--- a/arch/x86/include/asm/pnp_def.h
+++ b/arch/x86/include/asm/pnp_def.h
@@ -10,6 +10,7 @@
 #define _ASM_PNP_DEF_H_
 
 #include <asm/io.h>
+#include <linux/types.h>
 
 #define PNP_IDX_EN   0x30
 #define PNP_IDX_IO0  0x60
diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
index d7b68367861..3eb16fd11d6 100644
--- a/arch/x86/include/asm/processor.h
+++ b/arch/x86/include/asm/processor.h
@@ -41,6 +41,7 @@
 
 #ifndef __ASSEMBLY__
 
+#include <linux/types.h>
 static inline __attribute__((always_inline)) void cpu_hlt(void)
 {
 	asm("hlt");
diff --git a/arch/x86/include/asm/scu.h b/arch/x86/include/asm/scu.h
index f5ec5a19d9d..75c2cbae6b7 100644
--- a/arch/x86/include/asm/scu.h
+++ b/arch/x86/include/asm/scu.h
@@ -6,6 +6,7 @@
 #define _X86_ASM_SCU_IPC_H_
 
 /* IPC defines the following message types */
+#include <asm/types.h>
 #define IPCMSG_INDIRECT_READ	0x02
 #define IPCMSG_INDIRECT_WRITE	0x05
 #define IPCMSG_WARM_RESET	0xf0
diff --git a/arch/x86/include/asm/sfi.h b/arch/x86/include/asm/sfi.h
index 09d47008120..6725ea69b2e 100644
--- a/arch/x86/include/asm/sfi.h
+++ b/arch/x86/include/asm/sfi.h
@@ -6,6 +6,7 @@
 #ifndef _LINUX_SFI_H
 #define _LINUX_SFI_H
 
+#include <compiler.h>
 #include <errno.h>
 #include <linux/types.h>
 
diff --git a/arch/x86/include/asm/sipi.h b/arch/x86/include/asm/sipi.h
index 24834225287..9e11f20e030 100644
--- a/arch/x86/include/asm/sipi.h
+++ b/arch/x86/include/asm/sipi.h
@@ -13,6 +13,8 @@
 #ifndef __ASSEMBLY__
 
 /**
+#include <compiler.h>
+#include <asm/types.h>
  * struct sipi_params_16bit - 16-bit SIPI entry-point parameters
  *
  * These are set up in the same space as the SIPI 16-bit code so that each AP
diff --git a/arch/x86/include/asm/speedstep.h b/arch/x86/include/asm/speedstep.h
index 43bfabffcc9..513e4107c82 100644
--- a/arch/x86/include/asm/speedstep.h
+++ b/arch/x86/include/asm/speedstep.h
@@ -10,6 +10,7 @@
 #define _ASM_SPEEDSTEP_H
 
 /* Magic value used to locate speedstep configuration in the device tree */
+#include <linux/types.h>
 #define SPEEDSTEP_APIC_MAGIC 0xACAC
 
 /* MWAIT coordination I/O base address. This must match
diff --git a/arch/x86/include/asm/spl.h b/arch/x86/include/asm/spl.h
index cc6cac08f23..8d844f664d9 100644
--- a/arch/x86/include/asm/spl.h
+++ b/arch/x86/include/asm/spl.h
@@ -7,6 +7,7 @@
 #ifndef __asm_spl_h
 #define __asm_spl_h
 
+#include <linux/types.h>
 #define CONFIG_SPL_BOARD_LOAD_IMAGE
 
 enum {
diff --git a/arch/x86/include/asm/tables.h b/arch/x86/include/asm/tables.h
index f7c72ed3db0..92ccaf4c7f5 100644
--- a/arch/x86/include/asm/tables.h
+++ b/arch/x86/include/asm/tables.h
@@ -7,6 +7,7 @@
 #define _X86_TABLES_H_
 
 #include <tables_csum.h>
+#include <linux/types.h>
 
 #define ROM_TABLE_ADDR	CONFIG_ROM_TABLE_ADDR
 #define ROM_TABLE_END	(CONFIG_ROM_TABLE_ADDR + CONFIG_ROM_TABLE_SIZE - 1)
diff --git a/arch/x86/include/asm/u-boot-x86.h b/arch/x86/include/asm/u-boot-x86.h
index d732661f6d4..114a8cf5582 100644
--- a/arch/x86/include/asm/u-boot-x86.h
+++ b/arch/x86/include/asm/u-boot-x86.h
@@ -7,6 +7,7 @@
 #ifndef _U_BOOT_I386_H_
 #define _U_BOOT_I386_H_	1
 
+#include <linux/types.h>
 struct global_data;
 
 extern char gdt_rom[];
diff --git a/arch/x86/include/asm/zimage.h b/arch/x86/include/asm/zimage.h
index 80e128ccf36..df232e336f6 100644
--- a/arch/x86/include/asm/zimage.h
+++ b/arch/x86/include/asm/zimage.h
@@ -9,6 +9,7 @@
 
 #include <asm/bootparam.h>
 #include <asm/e820.h>
+#include <linux/types.h>
 
 /* linux i386 zImage/bzImage header. Offsets relative to
  * the start of the image */
diff --git a/arch/x86/lib/acpi.c b/arch/x86/lib/acpi.c
index ffdc9e8257e..166a3f4256e 100644
--- a/arch/x86/lib/acpi.c
+++ b/arch/x86/lib/acpi.c
@@ -9,6 +9,7 @@
 #include <asm/io.h>
 #include <asm/tables.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static struct acpi_rsdp *acpi_valid_rsdp(struct acpi_rsdp *rsdp)
 {
diff --git a/arch/x86/lib/acpi_nhlt.c b/arch/x86/lib/acpi_nhlt.c
index f21d3e32b57..041248e7c8f 100644
--- a/arch/x86/lib/acpi_nhlt.c
+++ b/arch/x86/lib/acpi_nhlt.c
@@ -20,6 +20,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define NHLT_RID		1
 #define NHLT_SSID		1
diff --git a/arch/x86/lib/acpi_table.c b/arch/x86/lib/acpi_table.c
index db184006830..6fb12c03d24 100644
--- a/arch/x86/lib/acpi_table.c
+++ b/arch/x86/lib/acpi_table.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <cpu.h>
 #include <dm.h>
 #include <log.h>
@@ -29,6 +30,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /*
  * IASL compiles the dsdt entries and writes the hex values
diff --git a/arch/x86/lib/bios.c b/arch/x86/lib/bios.c
index a4499972c32..5a8daa1d322 100644
--- a/arch/x86/lib/bios.c
+++ b/arch/x86/lib/bios.c
@@ -18,6 +18,7 @@
 #include <asm/io.h>
 #include <asm/post.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "bios.h"
 
 /* Interrupt handlers for each interrupt the ROM can call */
diff --git a/arch/x86/lib/bios.h b/arch/x86/lib/bios.h
index 2e51b9fbf67..4c44c0fc905 100644
--- a/arch/x86/lib/bios.h
+++ b/arch/x86/lib/bios.h
@@ -19,6 +19,9 @@
 
 #else
 
+#include <compiler.h>
+#include <linux/types.h>
+
 /* Convert a symbol address to our real mode area */
 #define PTR_TO_REAL_MODE(sym)\
 	(void *)(REALMODE_BASE + ((char *)&(sym) - (char *)&asm_realmode_code))
diff --git a/arch/x86/lib/bios_interrupts.c b/arch/x86/lib/bios_interrupts.c
index 2582ac1b840..dcdb0e9690b 100644
--- a/arch/x86/lib/bios_interrupts.c
+++ b/arch/x86/lib/bios_interrupts.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <stdio.h>
 #include <asm/pci.h>
+#include <asm/types.h>
 #include "bios_emul.h"
 
 /* errors go in AH. Just set these up so that word assigns will work */
diff --git a/arch/x86/lib/bootm.c b/arch/x86/lib/bootm.c
index 0b20cdc16ab..302d2c1b5c9 100644
--- a/arch/x86/lib/bootm.c
+++ b/arch/x86/lib/bootm.c
@@ -22,6 +22,7 @@
 #include <fdt_support.h>
 #include <image.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <u-boot/zlib.h>
 #include <asm/bootparam.h>
 #include <asm/cpu.h>
diff --git a/arch/x86/lib/cmd_boot.c b/arch/x86/lib/cmd_boot.c
index b128b43cebe..fa26fe80652 100644
--- a/arch/x86/lib/cmd_boot.c
+++ b/arch/x86/lib/cmd_boot.c
@@ -20,6 +20,7 @@
 #include <asm/global_data.h>
 #include <asm/u-boot-x86.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/lib/coreboot_table.c b/arch/x86/lib/coreboot_table.c
index f4736ecfc45..b98b9d8b2df 100644
--- a/arch/x86/lib/coreboot_table.c
+++ b/arch/x86/lib/coreboot_table.c
@@ -13,6 +13,7 @@
 #include <asm/global_data.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/lib/div64.c b/arch/x86/lib/div64.c
index 2bea205f60f..a8a3d36f511 100644
--- a/arch/x86/lib/div64.c
+++ b/arch/x86/lib/div64.c
@@ -7,6 +7,8 @@
  */
 
 #include <common.h>
+#include <asm/types.h>
+#include <linux/stddef.h>
 
 union overlay64 {
 	u64 longw;
diff --git a/arch/x86/lib/e820.c b/arch/x86/lib/e820.c
index 066bf9b154b..4cc55c1c2f3 100644
--- a/arch/x86/lib/e820.c
+++ b/arch/x86/lib/e820.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <efi_loader.h>
 #include <asm/e820.h>
 #include <asm/global_data.h>
diff --git a/arch/x86/lib/early_cmos.c b/arch/x86/lib/early_cmos.c
index f7b3bb2a8e1..821abe160a4 100644
--- a/arch/x86/lib/early_cmos.c
+++ b/arch/x86/lib/early_cmos.c
@@ -13,6 +13,7 @@
 #include <common.h>
 #include <asm/early_cmos.h>
 #include <asm/io.h>
+#include <asm/types.h>
 
 u8 cmos_read8(u8 addr)
 {
diff --git a/arch/x86/lib/fsp/fsp_common.c b/arch/x86/lib/fsp/fsp_common.c
index c7775cc33c0..cbbda284209 100644
--- a/arch/x86/lib/fsp/fsp_common.c
+++ b/arch/x86/lib/fsp/fsp_common.c
@@ -19,6 +19,7 @@
 #include <asm/post.h>
 #include <asm/processor.h>
 #include <asm/fsp/fsp_support.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
 
diff --git a/arch/x86/lib/fsp/fsp_dram.c b/arch/x86/lib/fsp/fsp_dram.c
index 70aa7bbf885..05520d8f69b 100644
--- a/arch/x86/lib/fsp/fsp_dram.c
+++ b/arch/x86/lib/fsp/fsp_dram.c
@@ -15,6 +15,7 @@
 #include <asm/post.h>
 #include <asm/u-boot.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/lib/fsp/fsp_graphics.c b/arch/x86/lib/fsp/fsp_graphics.c
index 6e4368d4184..292af2abe90 100644
--- a/arch/x86/lib/fsp/fsp_graphics.c
+++ b/arch/x86/lib/fsp/fsp_graphics.c
@@ -13,6 +13,7 @@
 #include <asm/fsp/fsp_support.h>
 #include <asm/global_data.h>
 #include <asm/mtrr.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/x86/lib/fsp/fsp_support.c b/arch/x86/lib/fsp/fsp_support.c
index fd4d98ef627..8afdb1b287b 100644
--- a/arch/x86/lib/fsp/fsp_support.c
+++ b/arch/x86/lib/fsp/fsp_support.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <asm/fsp/fsp_support.h>
 #include <asm/post.h>
+#include <asm/types.h>
 
 u32 fsp_get_usable_lowmem_top(const void *hob_list)
 {
diff --git a/arch/x86/lib/fsp1/fsp_dram.c b/arch/x86/lib/fsp1/fsp_dram.c
index 74181a78b69..98a048ee2a6 100644
--- a/arch/x86/lib/fsp1/fsp_dram.c
+++ b/arch/x86/lib/fsp1/fsp_dram.c
@@ -8,6 +8,7 @@
 #include <asm/fsp/fsp_support.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 int dram_init(void)
 {
diff --git a/arch/x86/lib/fsp1/fsp_support.c b/arch/x86/lib/fsp1/fsp_support.c
index acaaf55bcc7..2bd60cf1469 100644
--- a/arch/x86/lib/fsp1/fsp_support.c
+++ b/arch/x86/lib/fsp1/fsp_support.c
@@ -9,6 +9,7 @@
 #include <vsprintf.h>
 #include <asm/fsp1/fsp_support.h>
 #include <asm/post.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
 
diff --git a/arch/x86/lib/fsp2/fsp_dram.c b/arch/x86/lib/fsp2/fsp_dram.c
index 693f3cf0323..4c204c84e05 100644
--- a/arch/x86/lib/fsp2/fsp_dram.c
+++ b/arch/x86/lib/fsp2/fsp_dram.c
@@ -19,6 +19,7 @@
 #include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <linux/sizes.h>
+#include <linux/types.h>
 
 int dram_init(void)
 {
diff --git a/arch/x86/lib/fsp2/fsp_init.c b/arch/x86/lib/fsp2/fsp_init.c
index eef321d6208..07bbf6cc06f 100644
--- a/arch/x86/lib/fsp2/fsp_init.c
+++ b/arch/x86/lib/fsp2/fsp_init.c
@@ -19,6 +19,7 @@
 #include <dm/uclass-internal.h>
 #include <asm/fsp2/fsp_internal.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 int arch_cpu_init_dm(void)
 {
diff --git a/arch/x86/lib/fsp2/fsp_meminit.c b/arch/x86/lib/fsp2/fsp_meminit.c
index 509483dcad3..13fa0558315 100644
--- a/arch/x86/lib/fsp2/fsp_meminit.c
+++ b/arch/x86/lib/fsp2/fsp_meminit.c
@@ -23,6 +23,7 @@
 #include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static int prepare_mrc_cache_type(enum mrc_type_t type,
 				  struct mrc_data_container **cachep)
diff --git a/arch/x86/lib/fsp2/fsp_silicon_init.c b/arch/x86/lib/fsp2/fsp_silicon_init.c
index 4ab49c5fe6f..326808dd6d6 100644
--- a/arch/x86/lib/fsp2/fsp_silicon_init.c
+++ b/arch/x86/lib/fsp2/fsp_silicon_init.c
@@ -21,6 +21,7 @@
 #include <asm/global_data.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 int fsp_silicon_init(bool s3wake, bool use_spi_flash)
 {
diff --git a/arch/x86/lib/fsp2/fsp_support.c b/arch/x86/lib/fsp2/fsp_support.c
index f597f752213..8c6445b2ebd 100644
--- a/arch/x86/lib/fsp2/fsp_support.c
+++ b/arch/x86/lib/fsp2/fsp_support.c
@@ -8,12 +8,14 @@
 #include <dm.h>
 #include <log.h>
 #include <spi_flash.h>
+#include <stdbool.h>
 #include <asm/fsp/fsp_support.h>
 #include <asm/fsp2/fsp_internal.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /* The amount of the FSP header to probe to obtain what we need */
 #define PROBE_BUF_SIZE 0x180
diff --git a/arch/x86/lib/hob.c b/arch/x86/lib/hob.c
index f2c47240ee8..5c10b655a6f 100644
--- a/arch/x86/lib/hob.c
+++ b/arch/x86/lib/hob.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <asm/hob.h>
+#include <linux/types.h>
 
 /**
  * Returns the next instance of a HOB type from the starting HOB.
diff --git a/arch/x86/lib/i8254.c b/arch/x86/lib/i8254.c
index 33c63233ad0..2010cfe6f94 100644
--- a/arch/x86/lib/i8254.c
+++ b/arch/x86/lib/i8254.c
@@ -9,6 +9,7 @@
 #include <asm/i8254.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #define TIMER1_VALUE		18	/* 15.6us */
 #define BEEP_FREQUENCY_HZ	440
diff --git a/arch/x86/lib/i8259.c b/arch/x86/lib/i8259.c
index c002d103aef..cb396b8ac3e 100644
--- a/arch/x86/lib/i8259.c
+++ b/arch/x86/lib/i8259.c
@@ -20,6 +20,7 @@
 #include <asm/i8259.h>
 #include <asm/ibmpc.h>
 #include <asm/interrupt.h>
+#include <asm/types.h>
 
 int i8259_init(void)
 {
diff --git a/arch/x86/lib/interrupts.c b/arch/x86/lib/interrupts.c
index a3fcade2ffd..ab9c49fc435 100644
--- a/arch/x86/lib/interrupts.c
+++ b/arch/x86/lib/interrupts.c
@@ -35,6 +35,7 @@
 #include <stdio.h>
 #include <asm/interrupt.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 #if !CONFIG_IS_ENABLED(X86_64)
 
diff --git a/arch/x86/lib/mpspec.c b/arch/x86/lib/mpspec.c
index 17568a03d5c..2dc658cdb37 100644
--- a/arch/x86/lib/mpspec.c
+++ b/arch/x86/lib/mpspec.c
@@ -6,11 +6,13 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <cpu.h>
 #include <dm.h>
 #include <errno.h>
 #include <fdtdec.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/cpu.h>
 #include <asm/global_data.h>
 #include <asm/irq.h>
@@ -22,6 +24,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/lib/mrccache.c b/arch/x86/lib/mrccache.c
index 63aace5d4fb..e6742b65cfb 100644
--- a/arch/x86/lib/mrccache.c
+++ b/arch/x86/lib/mrccache.c
@@ -23,6 +23,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/lib/physmem.c b/arch/x86/lib/physmem.c
index 71039589dfd..6409d5c1c11 100644
--- a/arch/x86/lib/physmem.c
+++ b/arch/x86/lib/physmem.c
@@ -16,6 +16,7 @@
 #include <linux/compiler.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/lib/pinctrl_ich6.c b/arch/x86/lib/pinctrl_ich6.c
index 53228cd2848..2cace9c5b42 100644
--- a/arch/x86/lib/pinctrl_ich6.c
+++ b/arch/x86/lib/pinctrl_ich6.c
@@ -18,6 +18,7 @@
 #include <asm/pci.h>
 #include <dm/pinctrl.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/lib/pirq_routing.c b/arch/x86/lib/pirq_routing.c
index 3b5ee3837f8..d6b435efd6d 100644
--- a/arch/x86/lib/pirq_routing.c
+++ b/arch/x86/lib/pirq_routing.c
@@ -8,12 +8,14 @@
 #include <common.h>
 #include <log.h>
 #include <pci.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/pci.h>
 #include <asm/pirq_routing.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/lib/pmu.c b/arch/x86/lib/pmu.c
index 314d9f0ecee..ce054cc4cee 100644
--- a/arch/x86/lib/pmu.c
+++ b/arch/x86/lib/pmu.c
@@ -10,6 +10,7 @@
 #include <syscon.h>
 #include <asm/cpu.h>
 #include <asm/pmu.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/io.h>
diff --git a/arch/x86/lib/ramtest.c b/arch/x86/lib/ramtest.c
index 3cae664e49c..bbe24ad46ca 100644
--- a/arch/x86/lib/ramtest.c
+++ b/arch/x86/lib/ramtest.c
@@ -9,6 +9,7 @@
 #include <vsprintf.h>
 #include <asm/io.h>
 #include <asm/post.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 
 static void write_phys(unsigned long addr, u32 value)
diff --git a/arch/x86/lib/relocate.c b/arch/x86/lib/relocate.c
index e31565a589e..6f587034556 100644
--- a/arch/x86/lib/relocate.c
+++ b/arch/x86/lib/relocate.c
@@ -24,6 +24,7 @@
 #include <asm/sections.h>
 #include <elf.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/lib/scu.c b/arch/x86/lib/scu.c
index 792b87c2f1b..c476d12c149 100644
--- a/arch/x86/lib/scu.c
+++ b/arch/x86/lib/scu.c
@@ -16,6 +16,7 @@
 #include <syscon.h>
 #include <asm/cpu.h>
 #include <asm/scu.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/arch/x86/lib/sfi.c b/arch/x86/lib/sfi.c
index b85a1b17e84..cbba94c8bb2 100644
--- a/arch/x86/lib/sfi.c
+++ b/arch/x86/lib/sfi.c
@@ -23,6 +23,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 struct table_info {
 	u32 base;
diff --git a/arch/x86/lib/spl.c b/arch/x86/lib/spl.c
index 4efd96a6ba0..bcc099f4b6c 100644
--- a/arch/x86/lib/spl.c
+++ b/arch/x86/lib/spl.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <debug_uart.h>
 #include <dm.h>
@@ -28,6 +29,7 @@
 #include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/lib/tables.c b/arch/x86/lib/tables.c
index 6fd0ded397d..7409eb3b819 100644
--- a/arch/x86/lib/tables.c
+++ b/arch/x86/lib/tables.c
@@ -16,6 +16,7 @@
 #include <asm/coreboot_tables.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /**
  * Function prototype to write a specific configuration table
diff --git a/arch/x86/lib/tpl.c b/arch/x86/lib/tpl.c
index 3213b2749ec..a4459dfeecd 100644
--- a/arch/x86/lib/tpl.c
+++ b/arch/x86/lib/tpl.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <debug_uart.h>
 #include <dm.h>
 #include <hang.h>
@@ -20,6 +21,7 @@
 #include <asm-generic/sections.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/lib/zimage.c b/arch/x86/lib/zimage.c
index 5e413200268..f0c97b6cf89 100644
--- a/arch/x86/lib/zimage.c
+++ b/arch/x86/lib/zimage.c
@@ -34,6 +34,7 @@
 #include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /*
  * Memory lay-out:
diff --git a/arch/xtensa/cpu/cpu.c b/arch/xtensa/cpu/cpu.c
index 16f44774a3e..60a0cb1357a 100644
--- a/arch/xtensa/cpu/cpu.c
+++ b/arch/xtensa/cpu/cpu.c
@@ -19,6 +19,7 @@
 #include <asm/cache.h>
 #include <asm/string.h>
 #include <asm/misc.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/xtensa/include/asm/ldscript.h b/arch/xtensa/include/asm/ldscript.h
index 08f5d0135ed..fdf38c225d0 100644
--- a/arch/xtensa/include/asm/ldscript.h
+++ b/arch/xtensa/include/asm/ldscript.h
@@ -8,6 +8,7 @@
 #define _XTENSA_LDSCRIPT_H
 
 /*
+#include <linux/kernel.h>
  * This linker script is pre-processed with CPP to avoid hard-coding
  * addresses that depend on the Xtensa core configuration, because
  * this FPGA board can be used with a huge variety of Xtensa cores.
diff --git a/arch/xtensa/lib/bootm.c b/arch/xtensa/lib/bootm.c
index 0299534728c..00b5e0a4656 100644
--- a/arch/xtensa/lib/bootm.c
+++ b/arch/xtensa/lib/bootm.c
@@ -13,6 +13,7 @@
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <u-boot/zlib.h>
 #include <asm/byteorder.h>
 #include <asm/addrspace.h>
diff --git a/arch/xtensa/lib/cache.c b/arch/xtensa/lib/cache.c
index 4e0c0acc3bb..f0f7ea2d330 100644
--- a/arch/xtensa/lib/cache.c
+++ b/arch/xtensa/lib/cache.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <asm/cache.h>
+#include <linux/types.h>
 
 /*
  * We currently run always with caches enabled when running from memory.
diff --git a/arch/xtensa/lib/relocate.c b/arch/xtensa/lib/relocate.c
index ffe39d4a03c..7fc9cf76f6e 100644
--- a/arch/xtensa/lib/relocate.c
+++ b/arch/xtensa/lib/relocate.c
@@ -7,6 +7,7 @@
 #include <asm/sections.h>
 #include <asm/string.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 int clear_bss(void)
 {
diff --git a/arch/xtensa/lib/time.c b/arch/xtensa/lib/time.c
index 3a02c384934..af37eddd51d 100644
--- a/arch/xtensa/lib/time.c
+++ b/arch/xtensa/lib/time.c
@@ -8,6 +8,7 @@
 #include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/stringify.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/AndesTech/adp-ae3xx/adp-ae3xx.c b/board/AndesTech/adp-ae3xx/adp-ae3xx.c
index 69611c78832..49ca9a835bd 100644
--- a/board/AndesTech/adp-ae3xx/adp-ae3xx.c
+++ b/board/AndesTech/adp-ae3xx/adp-ae3xx.c
@@ -18,6 +18,7 @@
 #include <asm/u-boot.h>
 #include <linux/io.h>
 #include <faraday/ftsmc020.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/AndesTech/adp-ag101p/adp-ag101p.c b/board/AndesTech/adp-ag101p/adp-ag101p.c
index 9ba4f732223..2d88db3186f 100644
--- a/board/AndesTech/adp-ag101p/adp-ag101p.c
+++ b/board/AndesTech/adp-ag101p/adp-ag101p.c
@@ -18,6 +18,7 @@
 #include <linux/io.h>
 #include <asm/io.h>
 #include <asm/mach-types.h>
+#include <linux/types.h>
 
 #include <faraday/ftsmc020.h>
 
diff --git a/board/AndesTech/ax25-ae350/ax25-ae350.c b/board/AndesTech/ax25-ae350/ax25-ae350.c
index b75e968ee1d..4575e8929ef 100644
--- a/board/AndesTech/ax25-ae350/ax25-ae350.c
+++ b/board/AndesTech/ax25-ae350/ax25-ae350.c
@@ -21,6 +21,7 @@
 #include <dm.h>
 #include <spl.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/Arcturus/ucp1020/cmd_arc.c b/board/Arcturus/ucp1020/cmd_arc.c
index 2cd51d0aa87..f0b0ac1494c 100644
--- a/board/Arcturus/ucp1020/cmd_arc.c
+++ b/board/Arcturus/ucp1020/cmd_arc.c
@@ -22,6 +22,7 @@
 #include <asm/io.h>
 #include <linux/string.h>
 #include <linux/stringify.h>
+#include <linux/types.h>
 
 static ulong fwenv_addr[MAX_FWENV_ADDR];
 const char mystrerr[] = "ERROR: Failed to save factory info";
diff --git a/board/Arcturus/ucp1020/ddr.c b/board/Arcturus/ucp1020/ddr.c
index ff56fe7df50..ba65dc51afd 100644
--- a/board/Arcturus/ucp1020/ddr.c
+++ b/board/Arcturus/ucp1020/ddr.c
@@ -19,6 +19,7 @@
 #include <asm/fsl_law.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_SYS_DDR_RAW_TIMING
 #if defined(CONFIG_UCP1020) || defined(CONFIG_UCP1020T1)
diff --git a/board/Arcturus/ucp1020/spl.c b/board/Arcturus/ucp1020/spl.c
index 9a6b465bf96..8cbe9006254 100644
--- a/board/Arcturus/ucp1020/spl.c
+++ b/board/Arcturus/ucp1020/spl.c
@@ -24,6 +24,7 @@
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/Arcturus/ucp1020/spl_minimal.c b/board/Arcturus/ucp1020/spl_minimal.c
index 718139688bf..f938e345ac1 100644
--- a/board/Arcturus/ucp1020/spl_minimal.c
+++ b/board/Arcturus/ucp1020/spl_minimal.c
@@ -17,6 +17,7 @@
 #include <asm/fsl_law.h>
 #include <fsl_ddr_sdram.h>
 #include <asm/global_data.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/Arcturus/ucp1020/ucp1020.c b/board/Arcturus/ucp1020/ucp1020.c
index ccd5f8ae1e4..ce10bdaab69 100644
--- a/board/Arcturus/ucp1020/ucp1020.c
+++ b/board/Arcturus/ucp1020/ucp1020.c
@@ -44,6 +44,7 @@
 #include <asm/fsl_lbc.h>
 #include <asm/mp.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "ucp1020.h"
 
 void spi_set_speed(struct spi_slave *slave, uint hz)
diff --git a/board/BuR/brppt1/board.c b/board/BuR/brppt1/board.c
index 2c4feb98ae9..80b6f2eefc7 100644
--- a/board/BuR/brppt1/board.c
+++ b/board/BuR/brppt1/board.c
@@ -30,6 +30,7 @@
 #include <asm/gpio.h>
 #include <i2c.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 #include <power/tps65217.h>
 #include "../common/bur_common.h"
 #include <watchdog.h>
diff --git a/board/BuR/brppt2/board.c b/board/BuR/brppt2/board.c
index be5474832a0..d0da60d9539 100644
--- a/board/BuR/brppt2/board.c
+++ b/board/BuR/brppt2/board.c
@@ -26,6 +26,7 @@
 #include <asm/io.h>
 #include <asm/gpio.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 #define USBHUB_RSTN	IMX_GPIO_NR(1, 16)
 #define BKLT_EN		IMX_GPIO_NR(1, 15)
diff --git a/board/BuR/brsmarc1/board.c b/board/BuR/brsmarc1/board.c
index a069bd4cbf6..240ecb17056 100644
--- a/board/BuR/brsmarc1/board.c
+++ b/board/BuR/brsmarc1/board.c
@@ -24,6 +24,7 @@
 #include <asm/io.h>
 #include <asm/gpio.h>
 #include <asm/emif.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <power/tps65217.h>
 #include "../common/bur_common.h"
diff --git a/board/BuR/brxre1/board.c b/board/BuR/brxre1/board.c
index 9c2e080d6d3..f2b4c43ed90 100644
--- a/board/BuR/brxre1/board.c
+++ b/board/BuR/brxre1/board.c
@@ -28,6 +28,7 @@
 #include <asm/emif.h>
 #include <asm/gpio.h>
 #include <dm.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <power/tps65217.h>
 #include "../common/bur_common.h"
diff --git a/board/BuR/common/br_resetc.c b/board/BuR/common/br_resetc.c
index 6bbea816a0e..b6f7cf38fd4 100644
--- a/board/BuR/common/br_resetc.c
+++ b/board/BuR/common/br_resetc.c
@@ -6,10 +6,12 @@
  * B&R Industrial Automation GmbH - http://www.br-automation.com/ *
  */
 #include <common.h>
+#include <compiler.h>
 #include <env.h>
 #include <errno.h>
 #include <i2c.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <dm/uclass.h>
 #include <linux/delay.h>
 #include "br_resetc.h"
diff --git a/board/BuR/common/br_resetc.h b/board/BuR/common/br_resetc.h
index ba0689bf205..66aa12798b2 100644
--- a/board/BuR/common/br_resetc.h
+++ b/board/BuR/common/br_resetc.h
@@ -8,6 +8,7 @@
 #ifndef __CONFIG_BRRESETC_H__
 #define __CONFIG_BRRESETC_H__
 #include <common.h>
+#include <asm/types.h>
 
 int br_resetc_regget(u8 reg, u8 *dst);
 int br_resetc_regset(u8 reg, u8 val);
diff --git a/board/BuR/common/bur_common.h b/board/BuR/common/bur_common.h
index 4db630668e2..a76f17d0ef7 100644
--- a/board/BuR/common/bur_common.h
+++ b/board/BuR/common/bur_common.h
@@ -17,6 +17,7 @@
 int load_lcdtiming(struct am335x_lcdpanel *panel);
 #endif
 
+#include <asm/types.h>
 void br_summaryscreen(void);
 void pmicsetup(u32 mpupll, unsigned int bus);
 void enable_uart0_pin_mux(void);
diff --git a/board/BuR/common/common.c b/board/BuR/common/common.c
index 9b96b0c30b9..2456501b7ab 100644
--- a/board/BuR/common/common.c
+++ b/board/BuR/common/common.c
@@ -18,6 +18,7 @@
 #include <lcd.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
diff --git a/board/BuS/eb_cpu5282/eb_cpu5282.c b/board/BuS/eb_cpu5282/eb_cpu5282.c
index 863372e06e0..2d816927482 100644
--- a/board/BuS/eb_cpu5282/eb_cpu5282.c
+++ b/board/BuS/eb_cpu5282/eb_cpu5282.c
@@ -13,6 +13,7 @@
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "asm/m5282.h"
 #include <bmp_layout.h>
 #include <env.h>
diff --git a/board/CZ.NIC/turris_mox/mox_sp.c b/board/CZ.NIC/turris_mox/mox_sp.c
index c15f8ee5b51..4521e703ed8 100644
--- a/board/CZ.NIC/turris_mox/mox_sp.c
+++ b/board/CZ.NIC/turris_mox/mox_sp.c
@@ -10,6 +10,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #define RWTM_BASE		(MVEBU_REGISTER(0xb0000))
 #define RWTM_CMD_PARAM(i)	(size_t)(RWTM_BASE + (i) * 4)
diff --git a/board/CZ.NIC/turris_mox/mox_sp.h b/board/CZ.NIC/turris_mox/mox_sp.h
index 49a4ed80ea6..45e7f24a607 100644
--- a/board/CZ.NIC/turris_mox/mox_sp.h
+++ b/board/CZ.NIC/turris_mox/mox_sp.h
@@ -7,6 +7,7 @@
 #define _BOARD_CZNIC_TURRIS_MOX_MOX_SP_H_
 
 #include <common.h>
+#include <asm/types.h>
 
 const char *mox_sp_get_ecdsa_public_key(void);
 int mbox_sp_get_board_info(u64 *sn, u8 *mac1, u8 *mac2, int *bv,
diff --git a/board/CZ.NIC/turris_mox/turris_mox.c b/board/CZ.NIC/turris_mox/turris_mox.c
index 0c7926b5624..b34bde8a294 100644
--- a/board/CZ.NIC/turris_mox/turris_mox.c
+++ b/board/CZ.NIC/turris_mox/turris_mox.c
@@ -25,6 +25,7 @@
 #include <linux/libfdt.h>
 #include <linux/string.h>
 #include <miiphy.h>
+#include <linux/types.h>
 #include <mvebu/comphy.h>
 #include <spi.h>
 
diff --git a/board/CZ.NIC/turris_omnia/turris_omnia.c b/board/CZ.NIC/turris_omnia/turris_omnia.c
index 9e3013d2615..c61eb802624 100644
--- a/board/CZ.NIC/turris_omnia/turris_omnia.c
+++ b/board/CZ.NIC/turris_omnia/turris_omnia.c
@@ -15,6 +15,7 @@
 #include <miiphy.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
@@ -28,6 +29,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <u-boot/crc.h>
 # include <atsha204a-i2c.h>
 
diff --git a/board/LaCie/common/common.c b/board/LaCie/common/common.c
index 325bc9b3bf7..395c10758cb 100644
--- a/board/LaCie/common/common.c
+++ b/board/LaCie/common/common.c
@@ -7,6 +7,7 @@
 #include <i2c.h>
 #include <miiphy.h>
 #include <stdio.h>
+#include <linux/types.h>
 
 #if defined(CONFIG_CMD_NET) && defined(CONFIG_RESET_PHY_R)
 
diff --git a/board/LaCie/common/common.h b/board/LaCie/common/common.h
index bf75d0a0978..43cb59c8ff7 100644
--- a/board/LaCie/common/common.h
+++ b/board/LaCie/common/common.h
@@ -14,4 +14,5 @@ void mv_phy_88e1318_init(const char *name, u16 phyaddr);
 int lacie_read_mac_address(uchar *mac);
 #endif
 
+#include <linux/types.h>
 #endif /* _LACIE_COMMON_H */
diff --git a/board/LaCie/edminiv2/edminiv2.c b/board/LaCie/edminiv2/edminiv2.c
index 1e13f506b5a..122f51d45fe 100644
--- a/board/LaCie/edminiv2/edminiv2.c
+++ b/board/LaCie/edminiv2/edminiv2.c
@@ -12,6 +12,7 @@
 #include <net.h>
 #include <asm/arch/orion5x.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include "../common/common.h"
 #include <spl.h>
diff --git a/board/LaCie/net2big_v2/net2big_v2.c b/board/LaCie/net2big_v2/net2big_v2.c
index fb1128bb61d..a83d7fa3b49 100644
--- a/board/LaCie/net2big_v2/net2big_v2.c
+++ b/board/LaCie/net2big_v2/net2big_v2.c
@@ -23,6 +23,7 @@
 #include <asm/arch/gpio.h>
 #include <asm/u-boot.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include "net2big_v2.h"
 #include "../common/common.h"
diff --git a/board/LaCie/netspace_v2/netspace_v2.c b/board/LaCie/netspace_v2/netspace_v2.c
index 3246e5d0dc0..32325bb465d 100644
--- a/board/LaCie/netspace_v2/netspace_v2.c
+++ b/board/LaCie/netspace_v2/netspace_v2.c
@@ -20,6 +20,7 @@
 #include <asm/arch/mpp.h>
 #include <asm/arch/gpio.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 #include "netspace_v2.h"
 #include "../common/common.h"
diff --git a/board/Marvell/aspenite/aspenite.c b/board/Marvell/aspenite/aspenite.c
index 78ba8f4b61c..9eb440230c7 100644
--- a/board/Marvell/aspenite/aspenite.c
+++ b/board/Marvell/aspenite/aspenite.c
@@ -14,6 +14,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/mfp.h>
 #include <asm/arch/armada100.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/Marvell/db-88f6281-bp/db-88f6281-bp.c b/board/Marvell/db-88f6281-bp/db-88f6281-bp.c
index 43cbe2416d6..d7c7d67dbb0 100644
--- a/board/Marvell/db-88f6281-bp/db-88f6281-bp.c
+++ b/board/Marvell/db-88f6281-bp/db-88f6281-bp.c
@@ -4,6 +4,7 @@
 #include <init.h>
 #include <net.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/io.h>
diff --git a/board/Marvell/db-88f6820-amc/db-88f6820-amc.c b/board/Marvell/db-88f6820-amc/db-88f6820-amc.c
index 0fa0820d7be..b49121e426d 100644
--- a/board/Marvell/db-88f6820-amc/db-88f6820-amc.c
+++ b/board/Marvell/db-88f6820-amc/db-88f6820-amc.c
@@ -14,6 +14,7 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/kernel.h>
diff --git a/board/Marvell/db-88f6820-gp/db-88f6820-gp.c b/board/Marvell/db-88f6820-gp/db-88f6820-gp.c
index b18ac9c2d0b..ef9f3aa7ed2 100644
--- a/board/Marvell/db-88f6820-gp/db-88f6820-gp.c
+++ b/board/Marvell/db-88f6820-gp/db-88f6820-gp.c
@@ -14,6 +14,7 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/kernel.h>
diff --git a/board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c b/board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c
index 39a1a52f704..8a8167503dd 100644
--- a/board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c
+++ b/board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c
@@ -13,6 +13,7 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
 
diff --git a/board/Marvell/dreamplug/dreamplug.c b/board/Marvell/dreamplug/dreamplug.c
index 8605f5324f4..85e37940fd3 100644
--- a/board/Marvell/dreamplug/dreamplug.c
+++ b/board/Marvell/dreamplug/dreamplug.c
@@ -17,6 +17,7 @@
 #include <asm/arch/soc.h>
 #include <asm/arch/mpp.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include "dreamplug.h"
 
diff --git a/board/Marvell/gplugd/gplugd.c b/board/Marvell/gplugd/gplugd.c
index 8909fba8837..7de585f74c5 100644
--- a/board/Marvell/gplugd/gplugd.c
+++ b/board/Marvell/gplugd/gplugd.c
@@ -23,6 +23,7 @@
 #include <asm/gpio.h>
 #include <miiphy.h>
 #include <asm/mach-types.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 
diff --git a/board/Marvell/guruplug/guruplug.c b/board/Marvell/guruplug/guruplug.c
index dba94106f53..71aa35f9d7f 100644
--- a/board/Marvell/guruplug/guruplug.c
+++ b/board/Marvell/guruplug/guruplug.c
@@ -15,6 +15,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
 #include <asm/arch/mpp.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include "guruplug.h"
 
diff --git a/board/Marvell/mvebu_armada-37xx/board.c b/board/Marvell/mvebu_armada-37xx/board.c
index eb0fe5b3727..cd73b0e9b9a 100644
--- a/board/Marvell/mvebu_armada-37xx/board.c
+++ b/board/Marvell/mvebu_armada-37xx/board.c
@@ -13,6 +13,7 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/board/Marvell/mvebu_armada-8k/board.c b/board/Marvell/mvebu_armada-8k/board.c
index e407238562f..4a45480ccf5 100644
--- a/board/Marvell/mvebu_armada-8k/board.c
+++ b/board/Marvell/mvebu_armada-8k/board.c
@@ -12,6 +12,7 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/board/Marvell/openrd/openrd.c b/board/Marvell/openrd/openrd.c
index a451db9bff8..89a9b2c1a8b 100644
--- a/board/Marvell/openrd/openrd.c
+++ b/board/Marvell/openrd/openrd.c
@@ -20,6 +20,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
 #include <asm/arch/mpp.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include "openrd.h"
 
diff --git a/board/Marvell/sheevaplug/sheevaplug.c b/board/Marvell/sheevaplug/sheevaplug.c
index 0211323e679..f6ff65c0b4d 100644
--- a/board/Marvell/sheevaplug/sheevaplug.c
+++ b/board/Marvell/sheevaplug/sheevaplug.c
@@ -15,6 +15,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
 #include <asm/arch/mpp.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include "sheevaplug.h"
 
diff --git a/board/Seagate/dockstar/dockstar.c b/board/Seagate/dockstar/dockstar.c
index 22ef37d567f..2bf380988d2 100644
--- a/board/Seagate/dockstar/dockstar.c
+++ b/board/Seagate/dockstar/dockstar.c
@@ -20,6 +20,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/mach-types.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include "dockstar.h"
 
diff --git a/board/Seagate/goflexhome/goflexhome.c b/board/Seagate/goflexhome/goflexhome.c
index b11d5becb1f..1c19b72ad27 100644
--- a/board/Seagate/goflexhome/goflexhome.c
+++ b/board/Seagate/goflexhome/goflexhome.c
@@ -23,6 +23,7 @@
 #include <asm/arch/mpp.h>
 #include <asm/arch/cpu.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/Seagate/nas220/nas220.c b/board/Seagate/nas220/nas220.c
index b448acfb4b2..0673248d039 100644
--- a/board/Seagate/nas220/nas220.c
+++ b/board/Seagate/nas220/nas220.c
@@ -19,6 +19,7 @@
 #include <asm/arch/mpp.h>
 #include <asm/arch/cpu.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/Synology/ds109/ds109.c b/board/Synology/ds109/ds109.c
index 91d6ba52a66..e8d7de58dab 100644
--- a/board/Synology/ds109/ds109.c
+++ b/board/Synology/ds109/ds109.c
@@ -15,6 +15,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
 #include <asm/arch/mpp.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
diff --git a/board/Synology/ds109/ds109.h b/board/Synology/ds109/ds109.h
index cc6ef991f39..a91c90683fa 100644
--- a/board/Synology/ds109/ds109.h
+++ b/board/Synology/ds109/ds109.h
@@ -8,6 +8,7 @@
 #ifndef __DS109_H
 #define __DS109_H
 
+#include <asm/types.h>
 #define DS109_OE_LOW			(0)
 #define DS109_OE_HIGH			(0)
 #define DS109_OE_VAL_LOW		((1 << 22)|(1 << 23))
diff --git a/board/Synology/ds414/cmd_syno.c b/board/Synology/ds414/cmd_syno.c
index f6a434d08c9..39e28291d75 100644
--- a/board/Synology/ds414/cmd_syno.c
+++ b/board/Synology/ds414/cmd_syno.c
@@ -16,6 +16,7 @@
 #include <vsprintf.h>
 #include <linux/mtd/mtd.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <asm/io.h>
 #include "../drivers/ddr/marvell/axp/ddr3_init.h"
diff --git a/board/Synology/ds414/ds414.c b/board/Synology/ds414/ds414.c
index b2e9bc4ae39..d43373f7674 100644
--- a/board/Synology/ds414/ds414.c
+++ b/board/Synology/ds414/ds414.c
@@ -12,6 +12,7 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/kernel.h>
diff --git a/board/abilis/tb100/tb100.c b/board/abilis/tb100/tb100.c
index 9ef7ed6e7f4..44fe5f6910f 100644
--- a/board/abilis/tb100/tb100.c
+++ b/board/abilis/tb100/tb100.c
@@ -9,6 +9,7 @@
 #include <netdev.h>
 #include <asm/io.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 void reset_cpu(ulong addr)
 {
diff --git a/board/advantech/dms-ba16/dms-ba16.c b/board/advantech/dms-ba16/dms-ba16.c
index 42bfa740f1b..80f86e669bc 100644
--- a/board/advantech/dms-ba16/dms-ba16.c
+++ b/board/advantech/dms-ba16/dms-ba16.c
@@ -33,6 +33,7 @@
 #include <input.h>
 #include <pwm.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 DECLARE_GLOBAL_DATA_PTR;
 
 #define NC_PAD_CTRL (PAD_CTL_PUS_100K_UP |	\
diff --git a/board/advantech/imx8qm_rom7720_a1/imx8qm_rom7720_a1.c b/board/advantech/imx8qm_rom7720_a1/imx8qm_rom7720_a1.c
index 3394126b7ae..6e4330bd322 100644
--- a/board/advantech/imx8qm_rom7720_a1/imx8qm_rom7720_a1.c
+++ b/board/advantech/imx8qm_rom7720_a1/imx8qm_rom7720_a1.c
@@ -22,6 +22,7 @@
 #include <asm/arch/imx8-pins.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/advantech/imx8qm_rom7720_a1/spl.c b/board/advantech/imx8qm_rom7720_a1/spl.c
index 8776a94ff07..4ef3609e4d4 100644
--- a/board/advantech/imx8qm_rom7720_a1/spl.c
+++ b/board/advantech/imx8qm_rom7720_a1/spl.c
@@ -14,6 +14,7 @@
 #include <asm/u-boot.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <asm/io.h>
 #include <asm/gpio.h>
diff --git a/board/advantech/som-db5800-som-6867/som-db5800-som-6867.c b/board/advantech/som-db5800-som-6867/som-db5800-som-6867.c
index c2eda4ff44b..b7362d9f0ff 100644
--- a/board/advantech/som-db5800-som-6867/som-db5800-som-6867.c
+++ b/board/advantech/som-db5800-som-6867/som-db5800-som-6867.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <init.h>
 #include <asm/fsp1/fsp_support.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 
 /* ALC262 Verb Table - 10EC0262 */
diff --git a/board/alliedtelesis/SBx81LIFKW/sbx81lifkw.c b/board/alliedtelesis/SBx81LIFKW/sbx81lifkw.c
index b8ed9f513c6..a11e2a2ae9e 100644
--- a/board/alliedtelesis/SBx81LIFKW/sbx81lifkw.c
+++ b/board/alliedtelesis/SBx81LIFKW/sbx81lifkw.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <net.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/board/alliedtelesis/SBx81LIFXCAT/sbx81lifxcat.c b/board/alliedtelesis/SBx81LIFXCAT/sbx81lifxcat.c
index 3a91decbb76..18b48d905cd 100644
--- a/board/alliedtelesis/SBx81LIFXCAT/sbx81lifxcat.c
+++ b/board/alliedtelesis/SBx81LIFXCAT/sbx81lifxcat.c
@@ -11,6 +11,7 @@
 #include <netdev.h>
 #include <led.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/io.h>
diff --git a/board/alliedtelesis/x530/x530.c b/board/alliedtelesis/x530/x530.c
index 112dbd0bea5..39a24de9923 100644
--- a/board/alliedtelesis/x530/x530.c
+++ b/board/alliedtelesis/x530/x530.c
@@ -13,6 +13,7 @@
 #include <wdt.h>
 #include <asm/global_data.h>
 #include <asm/gpio.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
diff --git a/board/altera/arria5-socdk/qts/pinmux_config.h b/board/altera/arria5-socdk/qts/pinmux_config.h
index 78a03258249..a80d9429007 100644
--- a/board/altera/arria5-socdk/qts/pinmux_config.h
+++ b/board/altera/arria5-socdk/qts/pinmux_config.h
@@ -6,6 +6,7 @@
 #ifndef __SOCFPGA_PINMUX_CONFIG_H__
 #define __SOCFPGA_PINMUX_CONFIG_H__
 
+#include <asm/types.h>
 const u8 sys_mgr_init_table[] = {
 	0, /* EMACIO0 */
 	2, /* EMACIO1 */
diff --git a/board/altera/arria5-socdk/qts/sdram_config.h b/board/altera/arria5-socdk/qts/sdram_config.h
index 927a7a4f8e0..3519c3a204a 100644
--- a/board/altera/arria5-socdk/qts/sdram_config.h
+++ b/board/altera/arria5-socdk/qts/sdram_config.h
@@ -7,6 +7,7 @@
 #define __SOCFPGA_SDRAM_CONFIG_H__
 
 /* SDRAM configuration */
+#include <asm/types.h>
 #define CONFIG_HPS_SDR_CTRLCFG_CPORTRDWR_CPORTRDWR		0x5A56A
 #define CONFIG_HPS_SDR_CTRLCFG_CPORTRMAP_CPORTRMAP		0xB00088
 #define CONFIG_HPS_SDR_CTRLCFG_CPORTWIDTH_CPORTWIDTH		0x44555
diff --git a/board/altera/cyclone5-socdk/qts/pinmux_config.h b/board/altera/cyclone5-socdk/qts/pinmux_config.h
index ec64ae17a16..1426db42bea 100644
--- a/board/altera/cyclone5-socdk/qts/pinmux_config.h
+++ b/board/altera/cyclone5-socdk/qts/pinmux_config.h
@@ -6,6 +6,7 @@
 #ifndef __SOCFPGA_PINMUX_CONFIG_H__
 #define __SOCFPGA_PINMUX_CONFIG_H__
 
+#include <asm/types.h>
 const u8 sys_mgr_init_table[] = {
 	0, /* EMACIO0 */
 	2, /* EMACIO1 */
diff --git a/board/altera/cyclone5-socdk/qts/sdram_config.h b/board/altera/cyclone5-socdk/qts/sdram_config.h
index 8adbfec11f9..3607260e25f 100644
--- a/board/altera/cyclone5-socdk/qts/sdram_config.h
+++ b/board/altera/cyclone5-socdk/qts/sdram_config.h
@@ -7,6 +7,7 @@
 #define __SOCFPGA_SDRAM_CONFIG_H__
 
 /* SDRAM configuration */
+#include <asm/types.h>
 #define CONFIG_HPS_SDR_CTRLCFG_CPORTRDWR_CPORTRDWR		0x5A56A
 #define CONFIG_HPS_SDR_CTRLCFG_CPORTRMAP_CPORTRMAP		0xB00088
 #define CONFIG_HPS_SDR_CTRLCFG_CPORTWIDTH_CPORTWIDTH		0x44555
diff --git a/board/amazon/kc1/kc1.c b/board/amazon/kc1/kc1.c
index a1b179d1a3c..783a0a18e12 100644
--- a/board/amazon/kc1/kc1.c
+++ b/board/amazon/kc1/kc1.c
@@ -10,6 +10,7 @@
 #include <env.h>
 #include <init.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/ctype.h>
 #include <linux/usb/musb.h>
diff --git a/board/amlogic/odroid-n2/odroid-n2.c b/board/amlogic/odroid-n2/odroid-n2.c
index 005e4bebf13..c7a174080ef 100644
--- a/board/amlogic/odroid-n2/odroid-n2.c
+++ b/board/amlogic/odroid-n2/odroid-n2.c
@@ -13,6 +13,7 @@
 #include <asm/io.h>
 #include <asm/arch/sm.h>
 #include <asm/arch/eth.h>
+#include <linux/types.h>
 
 #define EFUSE_MAC_OFFSET	20
 #define EFUSE_MAC_SIZE		12
diff --git a/board/amlogic/p200/p200.c b/board/amlogic/p200/p200.c
index 8f1bf8bfda4..dfa0d0f834a 100644
--- a/board/amlogic/p200/p200.c
+++ b/board/amlogic/p200/p200.c
@@ -13,6 +13,7 @@
 #include <asm/arch/sm.h>
 #include <asm/arch/eth.h>
 #include <asm/arch/mem.h>
+#include <linux/types.h>
 
 #define EFUSE_SN_OFFSET		20
 #define EFUSE_SN_SIZE		16
diff --git a/board/amlogic/p201/p201.c b/board/amlogic/p201/p201.c
index 597bb71cbf7..27e1caae024 100644
--- a/board/amlogic/p201/p201.c
+++ b/board/amlogic/p201/p201.c
@@ -13,6 +13,7 @@
 #include <asm/arch/sm.h>
 #include <asm/arch/eth.h>
 #include <asm/arch/mem.h>
+#include <linux/types.h>
 
 #define EFUSE_SN_OFFSET		20
 #define EFUSE_SN_SIZE		16
diff --git a/board/amlogic/p212/p212.c b/board/amlogic/p212/p212.c
index fbc49e95651..8ce9ff70aa9 100644
--- a/board/amlogic/p212/p212.c
+++ b/board/amlogic/p212/p212.c
@@ -14,6 +14,7 @@
 #include <asm/arch/sm.h>
 #include <asm/arch/eth.h>
 #include <asm/arch/mem.h>
+#include <linux/types.h>
 
 #define EFUSE_SN_OFFSET		20
 #define EFUSE_SN_SIZE		16
diff --git a/board/amlogic/q200/q200.c b/board/amlogic/q200/q200.c
index 62e6fa3d199..8cd367cb384 100644
--- a/board/amlogic/q200/q200.c
+++ b/board/amlogic/q200/q200.c
@@ -14,6 +14,7 @@
 #include <asm/arch/mem.h>
 #include <asm/arch/sm.h>
 #include <asm/arch/eth.h>
+#include <linux/types.h>
 
 #define EFUSE_SN_OFFSET		20
 #define EFUSE_SN_SIZE		16
diff --git a/board/aries/mcvevk/qts/pinmux_config.h b/board/aries/mcvevk/qts/pinmux_config.h
index 85f892ae473..c4b8c501b23 100644
--- a/board/aries/mcvevk/qts/pinmux_config.h
+++ b/board/aries/mcvevk/qts/pinmux_config.h
@@ -6,6 +6,7 @@
 #ifndef __SOCFPGA_PINMUX_CONFIG_H__
 #define __SOCFPGA_PINMUX_CONFIG_H__
 
+#include <asm/types.h>
 const u8 sys_mgr_init_table[] = {
 	3, /* EMACIO0 */
 	3, /* EMACIO1 */
diff --git a/board/aries/mcvevk/qts/sdram_config.h b/board/aries/mcvevk/qts/sdram_config.h
index fd72926a89e..9275164f148 100644
--- a/board/aries/mcvevk/qts/sdram_config.h
+++ b/board/aries/mcvevk/qts/sdram_config.h
@@ -7,6 +7,7 @@
 #define __SOCFPGA_SDRAM_CONFIG_H__
 
 /* SDRAM configuration */
+#include <asm/types.h>
 #define CONFIG_HPS_SDR_CTRLCFG_CPORTRDWR_CPORTRDWR		0x5A56A
 #define CONFIG_HPS_SDR_CTRLCFG_CPORTRMAP_CPORTRMAP		0xB00088
 #define CONFIG_HPS_SDR_CTRLCFG_CPORTWIDTH_CPORTWIDTH		0x44555
diff --git a/board/aristainetos/aristainetos.c b/board/aristainetos/aristainetos.c
index dcc8df0be14..433238c64b5 100644
--- a/board/aristainetos/aristainetos.c
+++ b/board/aristainetos/aristainetos.c
@@ -39,6 +39,7 @@
 #include <led.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/da9063_pmic.h>
diff --git a/board/armadeus/apf27/apf27.c b/board/armadeus/apf27/apf27.c
index 67f0941a640..3199d123161 100644
--- a/board/armadeus/apf27/apf27.c
+++ b/board/armadeus/apf27/apf27.c
@@ -21,6 +21,7 @@
 #include <asm/gpio.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include <u-boot/crc.h>
 #include "apf27.h"
 #include "fpga.h"
diff --git a/board/armltd/integrator/integrator.c b/board/armltd/integrator/integrator.c
index a85ac69962b..7c1e02645ce 100644
--- a/board/armltd/integrator/integrator.c
+++ b/board/armltd/integrator/integrator.c
@@ -27,6 +27,7 @@
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <dm/platform_data/serial_pl01x.h>
 #include "arm-ebi.h"
diff --git a/board/armltd/integrator/pci.c b/board/armltd/integrator/pci.c
index 28efc33f1f4..5f03a81e348 100644
--- a/board/armltd/integrator/pci.c
+++ b/board/armltd/integrator/pci.c
@@ -24,6 +24,7 @@
 #include <log.h>
 #include <pci.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/bug.h>
 #include <linux/delay.h>
 #include "integrator-sc.h"
diff --git a/board/armltd/integrator/timer.c b/board/armltd/integrator/timer.c
index 53d1c0ec303..102c413b511 100644
--- a/board/armltd/integrator/timer.c
+++ b/board/armltd/integrator/timer.c
@@ -20,6 +20,7 @@
 #include <div64.h>
 #include <time.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_ARCH_CINTEGRATOR
 #define DIV_CLOCK_INIT	1
diff --git a/board/armltd/vexpress/vexpress_common.c b/board/armltd/vexpress/vexpress_common.c
index ee9f61f2b7a..013a70a3cb9 100644
--- a/board/armltd/vexpress/vexpress_common.c
+++ b/board/armltd/vexpress/vexpress_common.c
@@ -33,6 +33,7 @@
 #include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "../drivers/mmc/arm_pl180_mmci.h"
 
 static struct systimer *systimer_base = (struct systimer *)V2M_TIMER01;
diff --git a/board/armltd/vexpress/vexpress_tc2.c b/board/armltd/vexpress/vexpress_tc2.c
index 75f9d820349..cbb0a4e51fe 100644
--- a/board/armltd/vexpress/vexpress_tc2.c
+++ b/board/armltd/vexpress/vexpress_tc2.c
@@ -10,6 +10,7 @@
 #include <stdio.h>
 #include <asm/armv7.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <common.h>
 #include <linux/libfdt.h>
diff --git a/board/armltd/vexpress64/pcie.c b/board/armltd/vexpress64/pcie.c
index 1ad320df3a9..ad10f5ce5ed 100644
--- a/board/armltd/vexpress64/pcie.c
+++ b/board/armltd/vexpress64/pcie.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <stdio.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <pci_ids.h>
 #include <linux/delay.h>
diff --git a/board/armltd/vexpress64/vexpress64.c b/board/armltd/vexpress64/vexpress64.c
index 2a44828d6e6..300cb44f8e9 100644
--- a/board/armltd/vexpress64/vexpress64.c
+++ b/board/armltd/vexpress64/vexpress64.c
@@ -5,6 +5,7 @@
  * Sharma Bhupesh <bhupesh.sharma@freescale.com>
  */
 #include <common.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <dm.h>
 #include <init.h>
@@ -19,6 +20,7 @@
 #include <linux/compiler.h>
 #include <dm/platform_data/serial_pl01x.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "pcie.h"
 #include <asm/armv8/mmu.h>
 
diff --git a/board/astro/mcf5373l/fpga.c b/board/astro/mcf5373l/fpga.c
index 871700ebfe8..91ae8c528d6 100644
--- a/board/astro/mcf5373l/fpga.c
+++ b/board/astro/mcf5373l/fpga.c
@@ -23,6 +23,7 @@
 #include <command.h>
 #include <asm/immap_5329.h>
 #include <asm/io.h>
+#include <linux/types.h>
 #include "fpga.h"
 
 int altera_pre_fn(int cookie)
diff --git a/board/astro/mcf5373l/mcf5373l.c b/board/astro/mcf5373l/mcf5373l.c
index 3eabf924c4a..38616036bb7 100644
--- a/board/astro/mcf5373l/mcf5373l.c
+++ b/board/astro/mcf5373l/mcf5373l.c
@@ -16,6 +16,7 @@
 #include <asm/m5329.h>
 #include <asm/immap_5329.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 /* needed for astro bus: */
diff --git a/board/atmark-techno/armadillo-800eva/armadillo-800eva.c b/board/atmark-techno/armadillo-800eva/armadillo-800eva.c
index 9520be30529..a097db7d472 100644
--- a/board/atmark-techno/armadillo-800eva/armadillo-800eva.c
+++ b/board/atmark-techno/armadillo-800eva/armadillo-800eva.c
@@ -32,6 +32,7 @@
 #include <asm/gpio.h>
 #include <asm/arch/rmobile.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 #define s_init_wait(cnt) \
 		({	\
diff --git a/board/atmel/at91rm9200ek/at91rm9200ek.c b/board/atmel/at91rm9200ek/at91rm9200ek.c
index 5838e36c7a4..a085c1b448e 100644
--- a/board/atmel/at91rm9200ek/at91rm9200ek.c
+++ b/board/atmel/at91rm9200ek/at91rm9200ek.c
@@ -19,6 +19,7 @@
 #include <asm/arch/at91_pio.h>
 #include <asm/arch/at91_common.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/atmel/at91sam9261ek/at91sam9261ek.c b/board/atmel/at91sam9261ek/at91sam9261ek.c
index 3a36a23a4d3..728909cc7a1 100644
--- a/board/atmel/at91sam9261ek/at91sam9261ek.c
+++ b/board/atmel/at91sam9261ek/at91sam9261ek.c
@@ -26,6 +26,7 @@
 #endif
 #include <asm/mach-types.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/atmel/at91sam9263ek/at91sam9263ek.c b/board/atmel/at91sam9263ek/at91sam9263ek.c
index 5960c1862ce..423612fc9dc 100644
--- a/board/atmel/at91sam9263ek/at91sam9263ek.c
+++ b/board/atmel/at91sam9263ek/at91sam9263ek.c
@@ -26,6 +26,7 @@
 #include <lcd.h>
 #include <atmel_lcdc.h>
 #include <asm/mach-types.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c b/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c
index 7f728125c06..44a09095749 100644
--- a/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c
+++ b/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c
@@ -23,6 +23,7 @@
 #include <linux/mtd/rawnand.h>
 #include <atmel_lcdc.h>
 #include <asm/mach-types.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/atmel/at91sam9n12ek/at91sam9n12ek.c b/board/atmel/at91sam9n12ek/at91sam9n12ek.c
index 75d5ffa88ae..5e87553df02 100644
--- a/board/atmel/at91sam9n12ek/at91sam9n12ek.c
+++ b/board/atmel/at91sam9n12ek/at91sam9n12ek.c
@@ -21,6 +21,7 @@
 #include <atmel_hlcdc.h>
 #include <netdev.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_LCD_INFO
 #include <nand.h>
diff --git a/board/atmel/at91sam9rlek/at91sam9rlek.c b/board/atmel/at91sam9rlek/at91sam9rlek.c
index 6f3debe3f37..498a44340ad 100644
--- a/board/atmel/at91sam9rlek/at91sam9rlek.c
+++ b/board/atmel/at91sam9rlek/at91sam9rlek.c
@@ -20,6 +20,7 @@
 #include <asm/arch/clk.h>
 #include <asm/arch/gpio.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 #include <lcd.h>
 #include <atmel_lcdc.h>
diff --git a/board/atmel/common/board.c b/board/atmel/common/board.c
index 44abbfabb07..ba509fc5622 100644
--- a/board/atmel/common/board.c
+++ b/board/atmel/common/board.c
@@ -10,6 +10,7 @@
 #include <vsprintf.h>
 #include <w1.h>
 #include <w1-eeprom.h>
+#include <asm/types.h>
 #include <dm/device-internal.h>
 
 #define AT91_PDA_EEPROM_ID_OFFSET		15
diff --git a/board/atmel/common/mac-spi-nor.c b/board/atmel/common/mac-spi-nor.c
index 67bfd3785b7..e631b98a6d4 100644
--- a/board/atmel/common/mac-spi-nor.c
+++ b/board/atmel/common/mac-spi-nor.c
@@ -13,6 +13,7 @@
 #include <linux/mtd/spi-nor.h>
 #include <netdev.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define ETH_ADDR_SIZE			6
 
diff --git a/board/atmel/common/video_display.c b/board/atmel/common/video_display.c
index b3f876c6e58..c3c0b481f44 100644
--- a/board/atmel/common/video_display.c
+++ b/board/atmel/common/video_display.c
@@ -18,6 +18,7 @@
 #include <asm/arch/clk.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/atmel/sama5d27_som1_ek/sama5d27_som1_ek.c b/board/atmel/sama5d27_som1_ek/sama5d27_som1_ek.c
index 0f8ce6d29c0..b68cb88342c 100644
--- a/board/atmel/sama5d27_som1_ek/sama5d27_som1_ek.c
+++ b/board/atmel/sama5d27_som1_ek/sama5d27_som1_ek.c
@@ -16,6 +16,7 @@
 #include <asm/arch/clk.h>
 #include <asm/arch/gpio.h>
 #include <asm/arch/sama5d2.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 
 extern void at91_pda_detect(void);
diff --git a/board/atmel/sama5d27_wlsom1_ek/sama5d27_wlsom1_ek.c b/board/atmel/sama5d27_wlsom1_ek/sama5d27_wlsom1_ek.c
index b8d02c4639b..05e45c22bd3 100644
--- a/board/atmel/sama5d27_wlsom1_ek/sama5d27_wlsom1_ek.c
+++ b/board/atmel/sama5d27_wlsom1_ek/sama5d27_wlsom1_ek.c
@@ -17,6 +17,7 @@
 #include <asm/arch/clk.h>
 #include <asm/arch/gpio.h>
 #include <asm/arch/sama5d2.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 
 extern void at91_pda_detect(void);
diff --git a/board/atmel/sama5d2_icp/sama5d2_icp.c b/board/atmel/sama5d2_icp/sama5d2_icp.c
index 889a09fd855..6fa433732e3 100644
--- a/board/atmel/sama5d2_icp/sama5d2_icp.c
+++ b/board/atmel/sama5d2_icp/sama5d2_icp.c
@@ -16,6 +16,7 @@
 #include <asm/arch/clk.h>
 #include <asm/arch/gpio.h>
 #include <asm/arch/sama5d2.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/atmel/sama5d2_xplained/sama5d2_xplained.c b/board/atmel/sama5d2_xplained/sama5d2_xplained.c
index 4dbd9d63e2c..b1ceb835896 100644
--- a/board/atmel/sama5d2_xplained/sama5d2_xplained.c
+++ b/board/atmel/sama5d2_xplained/sama5d2_xplained.c
@@ -16,6 +16,7 @@
 #include <asm/arch/clk.h>
 #include <asm/arch/gpio.h>
 #include <asm/arch/sama5d2.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 
 extern void at91_pda_detect(void);
diff --git a/board/atmel/sama5d3_xplained/sama5d3_xplained.c b/board/atmel/sama5d3_xplained/sama5d3_xplained.c
index 8956abfced4..2ac5f917fbd 100644
--- a/board/atmel/sama5d3_xplained/sama5d3_xplained.c
+++ b/board/atmel/sama5d3_xplained/sama5d3_xplained.c
@@ -17,6 +17,7 @@
 #include <spl.h>
 #include <asm/arch/atmel_mpddrc.h>
 #include <asm/arch/at91_wdt.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/atmel/sama5d3xek/sama5d3xek.c b/board/atmel/sama5d3xek/sama5d3xek.c
index 9e1caafb952..9387809635d 100644
--- a/board/atmel/sama5d3xek/sama5d3xek.c
+++ b/board/atmel/sama5d3xek/sama5d3xek.c
@@ -15,6 +15,7 @@
 #include <asm/arch/clk.h>
 #include <debug_uart.h>
 #include <env.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/ctype.h>
 #include <spl.h>
diff --git a/board/atmel/sama5d4_xplained/sama5d4_xplained.c b/board/atmel/sama5d4_xplained/sama5d4_xplained.c
index f021276c6df..89e4b6b005b 100644
--- a/board/atmel/sama5d4_xplained/sama5d4_xplained.c
+++ b/board/atmel/sama5d4_xplained/sama5d4_xplained.c
@@ -16,6 +16,7 @@
 #include <asm/arch/sama5d3_smc.h>
 #include <asm/arch/sama5d4.h>
 #include <debug_uart.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/atmel/sama5d4ek/sama5d4ek.c b/board/atmel/sama5d4ek/sama5d4ek.c
index 8f4a91cbaed..faed89b23e8 100644
--- a/board/atmel/sama5d4ek/sama5d4ek.c
+++ b/board/atmel/sama5d4ek/sama5d4ek.c
@@ -16,6 +16,7 @@
 #include <asm/arch/sama5d3_smc.h>
 #include <asm/arch/sama5d4.h>
 #include <debug_uart.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/avionic-design/common/tamonten-ng.c b/board/avionic-design/common/tamonten-ng.c
index 1b509835d76..af6c2bd93cc 100644
--- a/board/avionic-design/common/tamonten-ng.c
+++ b/board/avionic-design/common/tamonten-ng.c
@@ -12,6 +12,7 @@
 #include <asm/arch/gpio.h>
 #include <asm/gpio.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include "pinmux-config-tamonten-ng.h"
 #include <i2c.h>
 
diff --git a/board/bachmann/ot1200/ot1200.c b/board/bachmann/ot1200/ot1200.c
index 47b592117d5..acf108a89db 100644
--- a/board/bachmann/ot1200/ot1200.c
+++ b/board/bachmann/ot1200/ot1200.c
@@ -32,6 +32,7 @@
 #include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/bachmann/ot1200/ot1200_spl.c b/board/bachmann/ot1200/ot1200_spl.c
index 297d5a72b0e..f0abb977bdc 100644
--- a/board/bachmann/ot1200/ot1200_spl.c
+++ b/board/bachmann/ot1200/ot1200_spl.c
@@ -8,6 +8,7 @@
 #include <spl.h>
 #include <asm/arch/mx6-ddr.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 /* Configure MX6Q/DUAL mmdc DDR io registers */
 static struct mx6dq_iomux_ddr_regs ot1200_ddr_ioregs = {
diff --git a/board/barco/platinum/spl_picon.c b/board/barco/platinum/spl_picon.c
index a023ddca33c..8796620914f 100644
--- a/board/barco/platinum/spl_picon.c
+++ b/board/barco/platinum/spl_picon.c
@@ -20,6 +20,7 @@
 #include <spl.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "platinum.h"
 
diff --git a/board/barco/platinum/spl_titanium.c b/board/barco/platinum/spl_titanium.c
index 0395d197448..aa63037eb08 100644
--- a/board/barco/platinum/spl_titanium.c
+++ b/board/barco/platinum/spl_titanium.c
@@ -20,6 +20,7 @@
 #include <spl.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "platinum.h"
 
diff --git a/board/beacon/beacon-rzg2m/beacon-rzg2m.c b/board/beacon/beacon-rzg2m/beacon-rzg2m.c
index cd362db58a9..4aa2322fde5 100644
--- a/board/beacon/beacon-rzg2m/beacon-rzg2m.c
+++ b/board/beacon/beacon-rzg2m/beacon-rzg2m.c
@@ -9,6 +9,7 @@
 #include <asm/arch/rcar-mstp.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/beacon/imx8mm/spl.c b/board/beacon/imx8mm/spl.c
index 8ea6fe9d733..4af0a31d086 100644
--- a/board/beacon/imx8mm/spl.c
+++ b/board/beacon/imx8mm/spl.c
@@ -19,6 +19,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <dm/uclass.h>
 #include <dm/device.h>
diff --git a/board/beckhoff/mx53cx9020/mx53cx9020.c b/board/beckhoff/mx53cx9020/mx53cx9020.c
index 4a8bc4a78dc..ca34a7ed1bb 100644
--- a/board/beckhoff/mx53cx9020/mx53cx9020.c
+++ b/board/beckhoff/mx53cx9020/mx53cx9020.c
@@ -21,6 +21,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 enum LED_GPIOS {
 	GPIO_SD1_CD = IMX_GPIO_NR(1, 1),
diff --git a/board/beckhoff/mx53cx9020/mx53cx9020_video.c b/board/beckhoff/mx53cx9020/mx53cx9020_video.c
index 3be2cd5f0ff..d4a9fa12fdc 100644
--- a/board/beckhoff/mx53cx9020/mx53cx9020_video.c
+++ b/board/beckhoff/mx53cx9020/mx53cx9020_video.c
@@ -12,6 +12,7 @@
 #include <asm/gpio.h>
 #include <asm/mach-imx/video.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #define CX9020_DVI_PWD	IMX_GPIO_NR(6, 1)
 
diff --git a/board/bluegiga/apx4devkit/apx4devkit.c b/board/bluegiga/apx4devkit/apx4devkit.c
index 2d4437fbfe0..d1694954759 100644
--- a/board/bluegiga/apx4devkit/apx4devkit.c
+++ b/board/bluegiga/apx4devkit/apx4devkit.c
@@ -27,6 +27,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/sys_proto.h>
 #include <env.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <linux/mii.h>
diff --git a/board/bluegiga/apx4devkit/spl_boot.c b/board/bluegiga/apx4devkit/spl_boot.c
index d8ee1d0a63e..ececbcc8911 100644
--- a/board/bluegiga/apx4devkit/spl_boot.c
+++ b/board/bluegiga/apx4devkit/spl_boot.c
@@ -21,6 +21,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #define	MUX_CONFIG_SSP0	(MXS_PAD_3V3 | MXS_PAD_8MA | MXS_PAD_PULLUP)
 #define	MUX_CONFIG_GPMI	(MXS_PAD_3V3 | MXS_PAD_4MA | MXS_PAD_NOPULL)
diff --git a/board/bluewater/gurnard/gurnard.c b/board/bluewater/gurnard/gurnard.c
index da597bbfb0a..ff4d61fe23d 100644
--- a/board/bluewater/gurnard/gurnard.c
+++ b/board/bluewater/gurnard/gurnard.c
@@ -39,6 +39,7 @@
 #include <dm/uclass-internal.h>
 #include <linux/delay.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_GURNARD_SPLASH
 #include "splash_logo.h"
diff --git a/board/bosch/shc/board.c b/board/bosch/shc/board.c
index ac8665fc77b..9213cefa2b6 100644
--- a/board/bosch/shc/board.c
+++ b/board/bosch/shc/board.c
@@ -40,6 +40,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <power/tps65217.h>
 #include <env_internal.h>
 #include <watchdog.h>
diff --git a/board/bosch/shc/board.h b/board/bosch/shc/board.h
index 997595bf42b..bdbd6d1260a 100644
--- a/board/bosch/shc/board.h
+++ b/board/bosch/shc/board.h
@@ -15,6 +15,7 @@
 #define _BOARD_H_
 
 /* Definition to control the GPIOs (for LEDs and Reset) */
+#include <linux/types.h>
 #define GPIO_TO_PIN(bank, gpio) (32 * (bank) + (gpio))
 
 static inline int board_is_b_sample(void)
diff --git a/board/boundary/nitrogen6x/nitrogen6x.c b/board/boundary/nitrogen6x/nitrogen6x.c
index c5a522aea25..761a64812d4 100644
--- a/board/boundary/nitrogen6x/nitrogen6x.c
+++ b/board/boundary/nitrogen6x/nitrogen6x.c
@@ -40,6 +40,7 @@
 #include <netdev.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <usb/ehci-ci.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/broadcom/bcm_ep/board.c b/board/broadcom/bcm_ep/board.c
index 3776d00b8d8..9efa3158ab7 100644
--- a/board/broadcom/bcm_ep/board.c
+++ b/board/broadcom/bcm_ep/board.c
@@ -16,6 +16,7 @@
 #include <asm/system.h>
 #include <asm/iproc-common/armpll.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/broadcom/bcmns2/northstar2.c b/board/broadcom/bcmns2/northstar2.c
index 4ced6609086..de7c88292a0 100644
--- a/board/broadcom/bcmns2/northstar2.c
+++ b/board/broadcom/bcmns2/northstar2.c
@@ -10,6 +10,7 @@
 #include <asm/system.h>
 #include <asm/armv8/mmu.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 static struct mm_region ns2_mem_map[] = {
 	{
diff --git a/board/broadcom/bcmns3/ns3.c b/board/broadcom/bcmns3/ns3.c
index ac9ca20f8ad..711fee16f7a 100644
--- a/board/broadcom/bcmns3/ns3.c
+++ b/board/broadcom/bcmns3/ns3.c
@@ -14,6 +14,7 @@
 #include <asm/arch-bcmns3/bl33_info.h>
 #include <dt-bindings/memory/bcm-ns3-mc.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 /* Default reset-level = 3 and strap-val = 0 */
 #define L3_RESET	30
diff --git a/board/bticino/mamoj/spl.c b/board/bticino/mamoj/spl.c
index f033b6d19ec..889dbf6c69e 100644
--- a/board/bticino/mamoj/spl.c
+++ b/board/bticino/mamoj/spl.c
@@ -12,6 +12,7 @@
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 #include <asm/io.h>
 #include <linux/sizes.h>
diff --git a/board/buffalo/lsxl/lsxl.c b/board/buffalo/lsxl/lsxl.c
index e1670a4265d..55a52e55198 100644
--- a/board/buffalo/lsxl/lsxl.c
+++ b/board/buffalo/lsxl/lsxl.c
@@ -28,6 +28,7 @@
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 #include "lsxl.h"
 
diff --git a/board/cadence/xtfpga/xtfpga.c b/board/cadence/xtfpga/xtfpga.c
index f0b20c518c0..c90b93849bd 100644
--- a/board/cadence/xtfpga/xtfpga.c
+++ b/board/cadence/xtfpga/xtfpga.c
@@ -10,6 +10,7 @@
 #include <init.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <asm/types.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 1c91cfe5f06..eabb753e97f 100644
--- a/board/cavium/thunderx/atf.c
+++ b/board/cavium/thunderx/atf.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <asm/ptrace.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <asm/system.h>
 #include <cavium/thunderx_svc.h>
diff --git a/board/cavium/thunderx/thunderx.c b/board/cavium/thunderx/thunderx.c
index 71444324f31..2aa5b716c41 100644
--- a/board/cavium/thunderx/thunderx.c
+++ b/board/cavium/thunderx/thunderx.c
@@ -14,6 +14,7 @@
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/compiler.h>
+#include <linux/types.h>
 
 #include <cavium/atf.h>
 #include <asm/armv8/mmu.h>
diff --git a/board/ccv/xpress/spl.c b/board/ccv/xpress/spl.c
index 357945eea1a..a82fa821c77 100644
--- a/board/ccv/xpress/spl.c
+++ b/board/ccv/xpress/spl.c
@@ -12,6 +12,7 @@
 #include <asm/arch/mx6-ddr.h>
 #include <asm/arch/crm_regs.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 /* Configuration for IM IME1G16D3EEBG-15EI, 64M x 16 -> 128MiB */
 
diff --git a/board/ccv/xpress/xpress.c b/board/ccv/xpress/xpress.c
index dfc71ba91be..060b8372b78 100644
--- a/board/ccv/xpress/xpress.c
+++ b/board/ccv/xpress/xpress.c
@@ -27,6 +27,7 @@
 #include <mmc.h>
 #include <netdev.h>
 #include <usb.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/board/cirrus/edb93xx/edb93xx.c b/board/cirrus/edb93xx/edb93xx.c
index d33861f229c..6b4dc61de28 100644
--- a/board/cirrus/edb93xx/edb93xx.c
+++ b/board/cirrus/edb93xx/edb93xx.c
@@ -27,6 +27,7 @@
 #include <asm/mach-types.h>
 #include <asm/arch/ep93xx.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/cloudengines/pogo_e02/pogo_e02.c b/board/cloudengines/pogo_e02/pogo_e02.c
index 631ba5b7af7..11abac2a70a 100644
--- a/board/cloudengines/pogo_e02/pogo_e02.c
+++ b/board/cloudengines/pogo_e02/pogo_e02.c
@@ -19,6 +19,7 @@
 #include <asm/arch/soc.h>
 #include <asm/arch/mpp.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include "pogo_e02.h"
 
diff --git a/board/cobra5272/flash.c b/board/cobra5272/flash.c
index f1874e35ff4..09a2a14b67f 100644
--- a/board/cobra5272/flash.c
+++ b/board/cobra5272/flash.c
@@ -14,6 +14,7 @@
 #include <vsprintf.h>
 #include <linux/delay.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define PHYS_FLASH_1 CONFIG_SYS_FLASH_BASE
 #define FLASH_BANK_SIZE 0x200000
diff --git a/board/compulab/cl-som-imx7/cl-som-imx7.c b/board/compulab/cl-som-imx7/cl-som-imx7.c
index 28f4859f649..1846c9bf4cf 100644
--- a/board/compulab/cl-som-imx7/cl-som-imx7.c
+++ b/board/compulab/cl-som-imx7/cl-som-imx7.c
@@ -20,6 +20,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/pfuze3000_pmic.h>
 #include <asm/mach-imx/mxc_i2c.h>
diff --git a/board/compulab/cl-som-imx7/spl.c b/board/compulab/cl-som-imx7/spl.c
index d75951615be..b00d7c9052f 100644
--- a/board/compulab/cl-som-imx7/spl.c
+++ b/board/compulab/cl-som-imx7/spl.c
@@ -19,6 +19,7 @@
 #include <asm/arch-mx7/mx7-ddr.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "common.h"
 
 #ifdef CONFIG_FSL_ESDHC_IMX
diff --git a/board/compulab/cm_fx6/cm_fx6.c b/board/compulab/cm_fx6/cm_fx6.c
index b3862fcf3a7..b7401748899 100644
--- a/board/compulab/cm_fx6/cm_fx6.c
+++ b/board/compulab/cm_fx6/cm_fx6.c
@@ -42,6 +42,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "common.h"
 #include "../common/eeprom.h"
 #include "../common/common.h"
diff --git a/board/compulab/cm_fx6/spl.c b/board/compulab/cm_fx6/spl.c
index a66e6016237..e0f995762e5 100644
--- a/board/compulab/cm_fx6/spl.c
+++ b/board/compulab/cm_fx6/spl.c
@@ -24,6 +24,7 @@
 #include <fsl_esdhc_imx.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 #include "common.h"
 
 enum ddr_config {
diff --git a/board/compulab/cm_t335/cm_t335.c b/board/compulab/cm_t335/cm_t335.c
index 26ba6711c93..ee9f93a735a 100644
--- a/board/compulab/cm_t335/cm_t335.c
+++ b/board/compulab/cm_t335/cm_t335.c
@@ -18,6 +18,7 @@
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/hardware_am33xx.h>
diff --git a/board/compulab/cm_t43/cm_t43.c b/board/compulab/cm_t43/cm_t43.c
index c035f364310..4a1afd3727b 100644
--- a/board/compulab/cm_t43/cm_t43.c
+++ b/board/compulab/cm_t43/cm_t43.c
@@ -15,6 +15,7 @@
 #include <asm/emif.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/tps65218.h>
 #include "board.h"
diff --git a/board/compulab/cm_t43/spl.c b/board/compulab/cm_t43/spl.c
index 14a37b0f568..6665ee1f840 100644
--- a/board/compulab/cm_t43/spl.c
+++ b/board/compulab/cm_t43/spl.c
@@ -11,6 +11,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/ddr_defs.h>
 #include <asm/gpio.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 #include <power/pmic.h>
 #include <power/tps65218.h>
diff --git a/board/compulab/common/common.c b/board/compulab/common/common.c
index 7021e73b082..cae98d2597f 100644
--- a/board/compulab/common/common.c
+++ b/board/compulab/common/common.c
@@ -6,11 +6,13 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <malloc.h>
 #include <stdio.h>
 #include <asm/bootm.h>
 #include <asm/gpio.h>
 #include <asm/setup.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 #include "common.h"
diff --git a/board/compulab/common/common.h b/board/compulab/common/common.h
index 17cfbb6f27a..cc3c9dace24 100644
--- a/board/compulab/common/common.h
+++ b/board/compulab/common/common.h
@@ -8,6 +8,7 @@
 #ifndef _CL_COMMON_
 #define _CL_COMMON_
 
+#include <asm/types.h>
 #include <linux/errno.h>
 
 void cl_print_pcb_info(void);
diff --git a/board/compulab/common/eeprom.c b/board/compulab/common/eeprom.c
index cc190103c4c..7b772b0c104 100644
--- a/board/compulab/common/eeprom.c
+++ b/board/compulab/common/eeprom.c
@@ -17,6 +17,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "eeprom.h"
 
 #ifndef CONFIG_SYS_I2C_EEPROM_ADDR
diff --git a/board/compulab/common/eeprom.h b/board/compulab/common/eeprom.h
index 5e5aa41074d..373087a86ce 100644
--- a/board/compulab/common/eeprom.h
+++ b/board/compulab/common/eeprom.h
@@ -10,6 +10,7 @@
 #define _EEPROM_
 #include <errno.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_SYS_I2C
 int cl_eeprom_read_mac_addr(uchar *buf, uint eeprom_bus);
diff --git a/board/compulab/common/omap3_display.c b/board/compulab/common/omap3_display.c
index 61641aa8375..1af06666603 100644
--- a/board/compulab/common/omap3_display.c
+++ b/board/compulab/common/omap3_display.c
@@ -20,6 +20,7 @@
 #include <asm/arch-omap3/dss.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 enum display_type {
 	NONE,
diff --git a/board/compulab/common/omap3_smc911x.c b/board/compulab/common/omap3_smc911x.c
index a6a03bc5823..f5d92553fb9 100644
--- a/board/compulab/common/omap3_smc911x.c
+++ b/board/compulab/common/omap3_smc911x.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <netdev.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 #include <asm/io.h>
diff --git a/board/congatec/cgtqmx6eval/cgtqmx6eval.c b/board/congatec/cgtqmx6eval/cgtqmx6eval.c
index 6b37c27fabc..f56875734e9 100644
--- a/board/congatec/cgtqmx6eval/cgtqmx6eval.c
+++ b/board/congatec/cgtqmx6eval/cgtqmx6eval.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <init.h>
 #include <net.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
@@ -34,6 +35,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/pfuze100_pmic.h>
 #include <linux/fb.h>
diff --git a/board/congatec/conga-qeval20-qa3-e3845/conga-qeval20-qa3.c b/board/congatec/conga-qeval20-qa3-e3845/conga-qeval20-qa3.c
index f43a027fa39..f22b0ef13bf 100644
--- a/board/congatec/conga-qeval20-qa3-e3845/conga-qeval20-qa3.c
+++ b/board/congatec/conga-qeval20-qa3-e3845/conga-qeval20-qa3.c
@@ -11,6 +11,7 @@
 #include <asm/gpio.h>
 #include <asm/ibmpc.h>
 #include <asm/pnp_def.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 
 int board_early_init_f(void)
diff --git a/board/corscience/tricorder/led.c b/board/corscience/tricorder/led.c
index d876dd7b9f5..80387cd8116 100644
--- a/board/corscience/tricorder/led.c
+++ b/board/corscience/tricorder/led.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/gpio.h>
+#include <linux/types.h>
 
 #define TRICORDER_STATUS_LED_YELLOW 42
 #define TRICORDER_STATUS_LED_GREEN  43
diff --git a/board/corscience/tricorder/tricorder-eeprom.c b/board/corscience/tricorder/tricorder-eeprom.c
index e239eeea145..6444c096fbf 100644
--- a/board/corscience/tricorder/tricorder-eeprom.c
+++ b/board/corscience/tricorder/tricorder-eeprom.c
@@ -6,6 +6,7 @@
  */
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <display_options.h>
 #include <eeprom.h>
 #include <i2c.h>
@@ -13,6 +14,7 @@
 #include <vsprintf.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <u-boot/crc.h>
 
 #include "tricorder-eeprom.h"
diff --git a/board/corscience/tricorder/tricorder-eeprom.h b/board/corscience/tricorder/tricorder-eeprom.h
index 7107b02a2c1..4906d241f09 100644
--- a/board/corscience/tricorder/tricorder-eeprom.h
+++ b/board/corscience/tricorder/tricorder-eeprom.h
@@ -7,7 +7,9 @@
 #ifndef TRICORDER_EEPROM_H_
 #define TRICORDER_EEPROM_H_
 
+#include <compiler.h>
 #include <linux/compiler.h>
+#include <linux/types.h>
 
 #define TRICORDER_EEPROM_MAGIC 0xc2a94f52
 #define TRICORDER_EEPROM_VERSION 1
diff --git a/board/corscience/tricorder/tricorder.c b/board/corscience/tricorder/tricorder.c
index 08b8e7f4d04..2d918acbe04 100644
--- a/board/corscience/tricorder/tricorder.c
+++ b/board/corscience/tricorder/tricorder.c
@@ -25,6 +25,7 @@
 #include <asm/arch/mem.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "tricorder.h"
 #include "tricorder-eeprom.h"
 
diff --git a/board/cortina/presidio-asic/presidio.c b/board/cortina/presidio-asic/presidio.c
index 4fe6251e009..fd4189d90fd 100644
--- a/board/cortina/presidio-asic/presidio.c
+++ b/board/cortina/presidio-asic/presidio.c
@@ -19,6 +19,7 @@
 #include <asm/psci.h>
 #include <cpu_func.h>
 #include <asm/armv8/mmu.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/creative/xfi3/spl_boot.c b/board/creative/xfi3/spl_boot.c
index dd31156e445..b88ddcefe2e 100644
--- a/board/creative/xfi3/spl_boot.c
+++ b/board/creative/xfi3/spl_boot.c
@@ -13,6 +13,7 @@
 #include <asm/arch/sys_proto.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define	MUX_CONFIG_EMI	(MXS_PAD_1V8 | MXS_PAD_12MA | MXS_PAD_PULLUP)
 #define	MUX_CONFIG_SSP	(MXS_PAD_3V3 | MXS_PAD_8MA | MXS_PAD_PULLUP)
diff --git a/board/creative/xfi3/xfi3.c b/board/creative/xfi3/xfi3.c
index 825a613aee4..ce5ff83e084 100644
--- a/board/creative/xfi3/xfi3.c
+++ b/board/creative/xfi3/xfi3.c
@@ -24,6 +24,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/cssi/MCR3000/MCR3000.c b/board/cssi/MCR3000/MCR3000.c
index 3bcbfd5a794..489ff297b4a 100644
--- a/board/cssi/MCR3000/MCR3000.c
+++ b/board/cssi/MCR3000/MCR3000.c
@@ -8,6 +8,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <env.h>
 #include <hwconfig.h>
 #include <init.h>
@@ -22,6 +23,7 @@
 #include <wdt.h>
 #include <linux/delay.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/cssi/MCR3000/nand.c b/board/cssi/MCR3000/nand.c
index 15a10bffadc..383ac4e1e73 100644
--- a/board/cssi/MCR3000/nand.c
+++ b/board/cssi/MCR3000/nand.c
@@ -5,6 +5,7 @@
  * Christophe Leroy <christophe.leroy@c-s.fr>
  */
 
+#include <compiler.h>
 #include <config.h>
 #include <common.h>
 #include <nand.h>
diff --git a/board/d-link/dns325/dns325.c b/board/d-link/dns325/dns325.c
index e22235a16da..45f2ebb8413 100644
--- a/board/d-link/dns325/dns325.c
+++ b/board/d-link/dns325/dns325.c
@@ -21,6 +21,7 @@
 #include <asm/arch/mpp.h>
 #include <asm/arch/gpio.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include "dns325.h"
 
diff --git a/board/davinci/da8xxevm/da850evm.c b/board/davinci/da8xxevm/da850evm.c
index 8cc118cde5a..cfb6d0ffdff 100644
--- a/board/davinci/da8xxevm/da850evm.c
+++ b/board/davinci/da8xxevm/da850evm.c
@@ -32,6 +32,7 @@
 #include <asm/gpio.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_MMC_DAVINCI
 #include <mmc.h>
diff --git a/board/davinci/da8xxevm/omapl138_lcdk.c b/board/davinci/da8xxevm/omapl138_lcdk.c
index 30182d02805..559ad93c9ef 100644
--- a/board/davinci/da8xxevm/omapl138_lcdk.c
+++ b/board/davinci/da8xxevm/omapl138_lcdk.c
@@ -31,6 +31,7 @@
 #endif
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/devboards/dbm-soc1/qts/pinmux_config.h b/board/devboards/dbm-soc1/qts/pinmux_config.h
index 3f34b131f33..90473c1828e 100644
--- a/board/devboards/dbm-soc1/qts/pinmux_config.h
+++ b/board/devboards/dbm-soc1/qts/pinmux_config.h
@@ -6,6 +6,7 @@
 #ifndef __SOCFPGA_PINMUX_CONFIG_H__
 #define __SOCFPGA_PINMUX_CONFIG_H__
 
+#include <asm/types.h>
 const u8 sys_mgr_init_table[] = {
 	0, /* EMACIO0 */
 	2, /* EMACIO1 */
diff --git a/board/devboards/dbm-soc1/qts/sdram_config.h b/board/devboards/dbm-soc1/qts/sdram_config.h
index 2022969bed9..ba77e006161 100644
--- a/board/devboards/dbm-soc1/qts/sdram_config.h
+++ b/board/devboards/dbm-soc1/qts/sdram_config.h
@@ -7,6 +7,7 @@
 #define __SOCFPGA_SDRAM_CONFIG_H__
 
 /* SDRAM configuration */
+#include <asm/types.h>
 #define CONFIG_HPS_SDR_CTRLCFG_CPORTRDWR_CPORTRDWR		0x5A56A
 #define CONFIG_HPS_SDR_CTRLCFG_CPORTRMAP_CPORTRMAP		0xB00088
 #define CONFIG_HPS_SDR_CTRLCFG_CPORTWIDTH_CPORTWIDTH		0x44555
diff --git a/board/dhelectronics/dh_imx6/dh_imx6.c b/board/dhelectronics/dh_imx6/dh_imx6.c
index 8e05de356a2..ab3a0867965 100644
--- a/board/dhelectronics/dh_imx6/dh_imx6.c
+++ b/board/dhelectronics/dh_imx6/dh_imx6.c
@@ -14,6 +14,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <dm/device-internal.h>
 #include <asm/arch/clock.h>
diff --git a/board/dhelectronics/dh_imx6/dh_imx6_spl.c b/board/dhelectronics/dh_imx6/dh_imx6_spl.c
index fdf915fead4..d289f0917cb 100644
--- a/board/dhelectronics/dh_imx6/dh_imx6_spl.c
+++ b/board/dhelectronics/dh_imx6/dh_imx6_spl.c
@@ -29,6 +29,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define ENET_PAD_CTRL							\
 	(PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm |	\
diff --git a/board/dhelectronics/dh_stm32mp1/board.c b/board/dhelectronics/dh_stm32mp1/board.c
index 17dfb85bfd9..366dcf578f1 100644
--- a/board/dhelectronics/dh_stm32mp1/board.c
+++ b/board/dhelectronics/dh_stm32mp1/board.c
@@ -7,6 +7,7 @@
 #include <adc.h>
 #include <log.h>
 #include <net.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/arch/stm32.h>
@@ -42,6 +43,7 @@
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <power/regulator.h>
 #include <remoteproc.h>
 #include <reset.h>
diff --git a/board/ebv/socrates/qts/pinmux_config.h b/board/ebv/socrates/qts/pinmux_config.h
index 41b634315bf..950b72aa617 100644
--- a/board/ebv/socrates/qts/pinmux_config.h
+++ b/board/ebv/socrates/qts/pinmux_config.h
@@ -6,6 +6,7 @@
 #ifndef __SOCFPGA_PINMUX_CONFIG_H__
 #define __SOCFPGA_PINMUX_CONFIG_H__
 
+#include <asm/types.h>
 const u8 sys_mgr_init_table[] = {
 	0, /* EMACIO0 */
 	2, /* EMACIO1 */
diff --git a/board/ebv/socrates/qts/sdram_config.h b/board/ebv/socrates/qts/sdram_config.h
index 2f8465bf77c..1bf1e8708ea 100644
--- a/board/ebv/socrates/qts/sdram_config.h
+++ b/board/ebv/socrates/qts/sdram_config.h
@@ -7,6 +7,7 @@
 #define __SOCFPGA_SDRAM_CONFIG_H__
 
 /* SDRAM configuration */
+#include <asm/types.h>
 #define CONFIG_HPS_SDR_CTRLCFG_CPORTRDWR_CPORTRDWR		0x5A56A
 #define CONFIG_HPS_SDR_CTRLCFG_CPORTRMAP_CPORTRMAP		0xB00088
 #define CONFIG_HPS_SDR_CTRLCFG_CPORTWIDTH_CPORTWIDTH		0x44555
diff --git a/board/eets/pdu001/board.c b/board/eets/pdu001/board.c
index adbd0847c4b..c07722a686e 100644
--- a/board/eets/pdu001/board.c
+++ b/board/eets/pdu001/board.c
@@ -20,6 +20,7 @@
 #include <watchdog.h>
 #include <debug_uart.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <dm/ofnode.h>
 #include <power/pmic.h>
diff --git a/board/eets/pdu001/board.h b/board/eets/pdu001/board.h
index bfea96e5f02..034a24ac67c 100644
--- a/board/eets/pdu001/board.h
+++ b/board/eets/pdu001/board.h
@@ -25,6 +25,7 @@
  * However we relay on the ROM to configure the pins of MMC0 (eMMC) as well
  * as MMC1 (microSD card-cage) since these are our boot devices.
  */
+#include <asm/types.h>
 void enable_uart0_pin_mux(void);
 void enable_uart1_pin_mux(void);
 void enable_uart2_pin_mux(void);
diff --git a/board/eets/pdu001/mux.c b/board/eets/pdu001/mux.c
index f0f9e262ebd..4466775c811 100644
--- a/board/eets/pdu001/mux.c
+++ b/board/eets/pdu001/mux.c
@@ -13,6 +13,7 @@
 #include <asm/arch/hardware.h>
 #include <asm/arch/mux.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include "board.h"
 
 static struct module_pin_mux uart0_pin_mux[] = {
diff --git a/board/egnite/ethernut5/ethernut5_pwrman.c b/board/egnite/ethernut5/ethernut5_pwrman.c
index ad5285f8ca9..93a8f1c9a77 100644
--- a/board/egnite/ethernut5/ethernut5_pwrman.c
+++ b/board/egnite/ethernut5/ethernut5_pwrman.c
@@ -20,6 +20,7 @@
  * which allows to manually deal with the PMC.
  *
  * Two distinct registers are provided by the PMC for enabling
+#include <asm/types.h>
  * and disabling specific features. This avoids the often seen
  * read-modify-write cycle or shadow register requirement.
  * Additional registers are available to query the board
diff --git a/board/el/el6x/el6x.c b/board/el/el6x/el6x.c
index 952ec9dae10..e5ff2dab705 100644
--- a/board/el/el6x/el6x.c
+++ b/board/el/el6x/el6x.c
@@ -35,6 +35,7 @@
 #include <input.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/pfuze100_pmic.h>
 #include <asm/arch/mx6-ddr.h>
diff --git a/board/embest/mx6boards/mx6boards.c b/board/embest/mx6boards/mx6boards.c
index b6d29adc5f4..e4ae166ea5b 100644
--- a/board/embest/mx6boards/mx6boards.c
+++ b/board/embest/mx6boards/mx6boards.c
@@ -43,6 +43,7 @@
 #include <ipu_pixfmt.h>
 #include <asm/io.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/emulation/qemu-arm/qemu-arm.c b/board/emulation/qemu-arm/qemu-arm.c
index 820194fc887..9436aa9f886 100644
--- a/board/emulation/qemu-arm/qemu-arm.c
+++ b/board/emulation/qemu-arm/qemu-arm.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <virtio_types.h>
 #include <virtio.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
 
diff --git a/board/emulation/qemu-riscv/qemu-riscv.c b/board/emulation/qemu-riscv/qemu-riscv.c
index 575367e1de7..4825b0fecbb 100644
--- a/board/emulation/qemu-riscv/qemu-riscv.c
+++ b/board/emulation/qemu-riscv/qemu-riscv.c
@@ -14,6 +14,7 @@
 #include <virtio_types.h>
 #include <virtio.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 int board_init(void)
 {
diff --git a/board/engicam/common/board.c b/board/engicam/common/board.c
index eab67c0aa95..d291f491a7c 100644
--- a/board/engicam/common/board.c
+++ b/board/engicam/common/board.c
@@ -18,6 +18,7 @@
 #include <asm/arch/sys_proto.h>
 #include <watchdog.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <linux/string.h>
diff --git a/board/engicam/common/spl.c b/board/engicam/common/spl.c
index 965123a82c0..6b5660513b9 100644
--- a/board/engicam/common/spl.c
+++ b/board/engicam/common/spl.c
@@ -14,6 +14,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <asm/io.h>
 #include <asm/gpio.h>
diff --git a/board/engicam/imx6q/imx6q.c b/board/engicam/imx6q/imx6q.c
index 3405c7a09e4..eb8322a7848 100644
--- a/board/engicam/imx6q/imx6q.c
+++ b/board/engicam/imx6q/imx6q.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include <asm/io.h>
 #include <asm/gpio.h>
diff --git a/board/esd/meesc/meesc.c b/board/esd/meesc/meesc.c
index 6ddaed412ed..9936733ee4d 100644
--- a/board/esd/meesc/meesc.c
+++ b/board/esd/meesc/meesc.c
@@ -31,6 +31,7 @@
 #include <netdev.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/esd/vme8349/caddy.c b/board/esd/vme8349/caddy.c
index 7ced22e8430..67538bf8a00 100644
--- a/board/esd/vme8349/caddy.c
+++ b/board/esd/vme8349/caddy.c
@@ -18,6 +18,7 @@
 #include <asm/mmu.h>
 #include <asm/io.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "caddy.h"
 
diff --git a/board/esd/vme8349/caddy.h b/board/esd/vme8349/caddy.h
index 8e3033ba20e..3d0df1e1c0e 100644
--- a/board/esd/vme8349/caddy.h
+++ b/board/esd/vme8349/caddy.h
@@ -9,6 +9,7 @@
 #ifndef __CADDY_H__
 #define __CADDY_H__
 
+#include <linux/types.h>
 #define CMD_SIZE	1024
 #define ANSWER_SIZE	1024
 #define CADDY_MAGIC	"esd vme8349 V1.0"
diff --git a/board/esd/vme8349/pci.c b/board/esd/vme8349/pci.c
index dea5e1690a2..e3b2464076e 100644
--- a/board/esd/vme8349/pci.c
+++ b/board/esd/vme8349/pci.c
@@ -19,6 +19,7 @@
 #include <pci.h>
 #include <i2c.h>
 #include <asm/fsl_i2c.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include "vme8349pin.h"
 
diff --git a/board/esd/vme8349/vme8349.c b/board/esd/vme8349/vme8349.c
index f7934b0f016..f107a22f1e0 100644
--- a/board/esd/vme8349/vme8349.c
+++ b/board/esd/vme8349/vme8349.c
@@ -32,6 +32,7 @@
 #include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/common/arm_sleep.c b/board/freescale/common/arm_sleep.c
index ddcab9f9eef..2e51b43de3c 100644
--- a/board/freescale/common/arm_sleep.c
+++ b/board/freescale/common/arm_sleep.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <log.h>
 #include <stdbool.h>
 #include <asm/global_data.h>
@@ -14,6 +15,7 @@
 #include <asm/secure.h>
 #endif
 #include <asm/armv7.h>
+#include <asm/types.h>
 
 #if defined(CONFIG_ARCH_LS1021A)
 #include <asm/arch/immap_ls102xa.h>
diff --git a/board/freescale/common/cadmus.c b/board/freescale/common/cadmus.c
index 7e7394f333e..2b5b62e5bc0 100644
--- a/board/freescale/common/cadmus.c
+++ b/board/freescale/common/cadmus.c
@@ -5,6 +5,7 @@
 
 
 #include <common.h>
+#include <linux/types.h>
 
 
 /*
diff --git a/board/freescale/common/cds_pci_ft.c b/board/freescale/common/cds_pci_ft.c
index 6b3690610d9..c5d673c2db9 100644
--- a/board/freescale/common/cds_pci_ft.c
+++ b/board/freescale/common/cds_pci_ft.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
diff --git a/board/freescale/common/cmd_esbc_validate.c b/board/freescale/common/cmd_esbc_validate.c
index 72b58360c27..1a77528a5ed 100644
--- a/board/freescale/common/cmd_esbc_validate.c
+++ b/board/freescale/common/cmd_esbc_validate.c
@@ -9,6 +9,7 @@
 #include <fsl_validate.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/types.h>
 
 int do_esbc_halt(struct cmd_tbl *cmdtp, int flag, int argc,
 		 char *const argv[])
diff --git a/board/freescale/common/dcu_sii9022a.c b/board/freescale/common/dcu_sii9022a.c
index dc0f27bfe71..3170444c8f5 100644
--- a/board/freescale/common/dcu_sii9022a.c
+++ b/board/freescale/common/dcu_sii9022a.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <fsl_dcu_fb.h>
 #include <i2c.h>
+#include <asm/types.h>
 #include <linux/fb.h>
 
 #define PIXEL_CLK_LSB_REG		0x00
diff --git a/board/freescale/common/diu_ch7301.c b/board/freescale/common/diu_ch7301.c
index cd6264b354f..8305a5c6af6 100644
--- a/board/freescale/common/diu_ch7301.c
+++ b/board/freescale/common/diu_ch7301.c
@@ -13,6 +13,7 @@
 #include <stdio.h>
 #include <stdio_dev.h>
 #include <i2c.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 #define I2C_DVI_INPUT_DATA_FORMAT_REG		0x1F
diff --git a/board/freescale/common/emc2305.c b/board/freescale/common/emc2305.c
index b8f2bbd2b5a..82544d4f55a 100644
--- a/board/freescale/common/emc2305.c
+++ b/board/freescale/common/emc2305.c
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <asm/types.h>
 
 #include "emc2305.h"
 
diff --git a/board/freescale/common/emc2305.h b/board/freescale/common/emc2305.h
index eddf5371384..5608f72f510 100644
--- a/board/freescale/common/emc2305.h
+++ b/board/freescale/common/emc2305.h
@@ -8,6 +8,7 @@
 #ifndef __EMC2305_H_
 #define __EMC2305_H_
 
+#include <asm/types.h>
 #define I2C_EMC2305_CONF		0x20
 #define I2C_EMC2305_FAN1		0x30
 #define I2C_EMC2305_FAN2		0x40
diff --git a/board/freescale/common/fman.c b/board/freescale/common/fman.c
index 358303108d8..af45f3429a7 100644
--- a/board/freescale/common/fman.c
+++ b/board/freescale/common/fman.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <asm/types.h>
 #include <linux/libfdt.h>
 #include <linux/libfdt_env.h>
 #include <fdt_support.h>
diff --git a/board/freescale/common/fman.h b/board/freescale/common/fman.h
index 16afc34b03e..976a09f1e14 100644
--- a/board/freescale/common/fman.h
+++ b/board/freescale/common/fman.h
@@ -6,6 +6,7 @@
 #ifndef __FMAN_BOARD_HELPER__
 #define __FMAN_BOARD_HELPER__
 
+#include <asm/types.h>
 int fdt_set_phy_handle(void *fdt, char *compat, phys_addr_t addr,
 			const char *alias);
 
diff --git a/board/freescale/common/fsl_chain_of_trust.c b/board/freescale/common/fsl_chain_of_trust.c
index 7567ea2c1c2..dd8dcba4157 100644
--- a/board/freescale/common/fsl_chain_of_trust.c
+++ b/board/freescale/common/fsl_chain_of_trust.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <env.h>
 #include <fsl_validate.h>
@@ -12,6 +13,7 @@
 #include <log.h>
 #include <stdio.h>
 #include <dm/root.h>
+#include <linux/types.h>
 
 #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_FRAMEWORK)
 #include <spl.h>
diff --git a/board/freescale/common/fsl_validate.c b/board/freescale/common/fsl_validate.c
index a228c82bc8e..7b962025c60 100644
--- a/board/freescale/common/fsl_validate.c
+++ b/board/freescale/common/fsl_validate.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <flash.h>
 #include <fsl_validate.h>
@@ -17,6 +18,7 @@
 #include <vsprintf.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <u-boot/rsa-mod-exp.h>
 #include <hash.h>
 #include <fsl_secboot_err.h>
diff --git a/board/freescale/common/ics307_clk.c b/board/freescale/common/ics307_clk.c
index 7a74239fb3a..2cd8adf24cb 100644
--- a/board/freescale/common/ics307_clk.c
+++ b/board/freescale/common/ics307_clk.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <log.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 
 #include "ics307_clk.h"
diff --git a/board/freescale/common/idt8t49n222a_serdes_clk.h b/board/freescale/common/idt8t49n222a_serdes_clk.h
index b1528e32669..4e21403e914 100644
--- a/board/freescale/common/idt8t49n222a_serdes_clk.h
+++ b/board/freescale/common/idt8t49n222a_serdes_clk.h
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <i2c.h>
+#include <asm/types.h>
 #include "qixis.h"
 #include "../b4860qds/b4860qds_qixis.h"
 #include <errno.h>
diff --git a/board/freescale/common/ls102xa_stream_id.c b/board/freescale/common/ls102xa_stream_id.c
index a6ee87da9f5..f1f86e5cc29 100644
--- a/board/freescale/common/ls102xa_stream_id.c
+++ b/board/freescale/common/ls102xa_stream_id.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <asm/io.h>
 #include <asm/arch/ls102xa_stream_id.h>
+#include <linux/types.h>
 
 void ls102xa_config_smmu_stream_id(struct smmu_stream_id *id, uint32_t num)
 {
diff --git a/board/freescale/common/mc34vr500.c b/board/freescale/common/mc34vr500.c
index d96d1e2293f..12ad0057c23 100644
--- a/board/freescale/common/mc34vr500.c
+++ b/board/freescale/common/mc34vr500.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <stdio.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/mc34vr500_pmic.h>
 
diff --git a/board/freescale/common/mpc85xx_sleep.c b/board/freescale/common/mpc85xx_sleep.c
index bfaf8eb2d6f..f2daa50150b 100644
--- a/board/freescale/common/mpc85xx_sleep.c
+++ b/board/freescale/common/mpc85xx_sleep.c
@@ -4,10 +4,12 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <log.h>
 #include <stdbool.h>
 #include <asm/global_data.h>
 #include <asm/immap_85xx.h>
+#include <asm/types.h>
 #include "sleep.h"
 #ifdef CONFIG_U_QE
 #include <fsl_qe.h>
diff --git a/board/freescale/common/ngpixis.c b/board/freescale/common/ngpixis.c
index 6938c2c2ead..45d61caaae2 100644
--- a/board/freescale/common/ngpixis.c
+++ b/board/freescale/common/ngpixis.c
@@ -34,6 +34,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/string.h>
 
 #include "ngpixis.h"
diff --git a/board/freescale/common/ngpixis.h b/board/freescale/common/ngpixis.h
index 7a20ee015fa..7342220bc04 100644
--- a/board/freescale/common/ngpixis.h
+++ b/board/freescale/common/ngpixis.h
@@ -10,6 +10,7 @@
 /* ngPIXIS register set. Hopefully, this won't change too much over time.
  * Feel free to add board-specific #ifdefs where necessary.
  */
+#include <asm/types.h>
 typedef struct ngpixis {
 	u8 id;
 	u8 arch;
diff --git a/board/freescale/common/ns_access.c b/board/freescale/common/ns_access.c
index 64eeb1159e7..16fb8d44add 100644
--- a/board/freescale/common/ns_access.c
+++ b/board/freescale/common/ns_access.c
@@ -11,6 +11,7 @@
 #include <asm/arch/ns_access.h>
 #include <asm/arch/fsl_serdes.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_ARCH_LS1021A
 static struct csu_ns_dev ns_dev[] = {
diff --git a/board/freescale/common/pfuze.c b/board/freescale/common/pfuze.c
index 2011738fe21..95a21e1cb9b 100644
--- a/board/freescale/common/pfuze.c
+++ b/board/freescale/common/pfuze.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <errno.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <power/pmic.h>
 #include <power/pfuze100_pmic.h>
diff --git a/board/freescale/common/pfuze.h b/board/freescale/common/pfuze.h
index 45b49afaeb7..8cb94f8885c 100644
--- a/board/freescale/common/pfuze.h
+++ b/board/freescale/common/pfuze.h
@@ -14,4 +14,5 @@ struct pmic *pfuze_common_init(unsigned char i2cbus);
 int pfuze_mode_init(struct pmic *p, u32 mode);
 #endif
 
+#include <asm/types.h>
 #endif
diff --git a/board/freescale/common/pixis.c b/board/freescale/common/pixis.c
index 2d232958c5b..3dc5a3bf3ca 100644
--- a/board/freescale/common/pixis.c
+++ b/board/freescale/common/pixis.c
@@ -10,6 +10,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/string.h>
 
 #define pixis_base (u8 *)PIXIS_BASE
diff --git a/board/freescale/common/pixis.h b/board/freescale/common/pixis.h
index 40053c45bb7..78a2cd926e7 100644
--- a/board/freescale/common/pixis.h
+++ b/board/freescale/common/pixis.h
@@ -160,6 +160,7 @@ typedef struct pixis {
 #endif
 
 /* Pointer to the PIXIS register set */
+#include <asm/types.h>
 #define pixis ((pixis_t *)PIXIS_BASE)
 
 #endif	/* __PIXIS_H_ */
diff --git a/board/freescale/common/pq-mds-pib.c b/board/freescale/common/pq-mds-pib.c
index 10e1dfe43f9..8143f042c5b 100644
--- a/board/freescale/common/pq-mds-pib.c
+++ b/board/freescale/common/pq-mds-pib.c
@@ -12,6 +12,7 @@
 #include <i2c.h>
 #include <stdio.h>
 #include <asm/io.h>
+#include <asm/types.h>
 
 #include "pq-mds-pib.h"
 
diff --git a/board/freescale/common/qixis.c b/board/freescale/common/qixis.c
index ee42a53dae1..07e1d0ef18e 100644
--- a/board/freescale/common/qixis.c
+++ b/board/freescale/common/qixis.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <stdio.h>
 #include <asm/io.h>
 #include <linux/compiler.h>
@@ -16,6 +17,7 @@
 #include <linux/string.h>
 #include <linux/time.h>
 #include <i2c.h>
+#include <linux/types.h>
 #include "qixis.h"
 
 #ifndef QIXIS_LBMAP_BRDCFG_REG
diff --git a/board/freescale/common/qixis.h b/board/freescale/common/qixis.h
index 93638d24524..339980cbf01 100644
--- a/board/freescale/common/qixis.h
+++ b/board/freescale/common/qixis.h
@@ -10,6 +10,7 @@
 #ifndef __QIXIS_H_
 #define __QIXIS_H_
 
+#include <asm/types.h>
 struct qixis {
 	u8 id;      /* ID value uniquely identifying each QDS board type */
 	u8 arch;    /* Board version information */
diff --git a/board/freescale/common/sdhc_boot.c b/board/freescale/common/sdhc_boot.c
index a1c7a94a90e..903c6535097 100644
--- a/board/freescale/common/sdhc_boot.c
+++ b/board/freescale/common/sdhc_boot.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <mmc.h>
 #include <malloc.h>
+#include <asm/types.h>
 
 /*
  * The environment variables are written to just after the u-boot image
diff --git a/board/freescale/common/sgmii_riser.c b/board/freescale/common/sgmii_riser.c
index 5e486a98e84..2f689b7783e 100644
--- a/board/freescale/common/sgmii_riser.c
+++ b/board/freescale/common/sgmii_riser.c
@@ -21,6 +21,7 @@
 #include <tsec.h>
 #include <fdt_support.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 void fsl_sgmii_riser_init(struct tsec_info_struct *tsec_info, int num)
 {
diff --git a/board/freescale/common/spl.h b/board/freescale/common/spl.h
index d4689d3d726..b0e7abf76cb 100644
--- a/board/freescale/common/spl.h
+++ b/board/freescale/common/spl.h
@@ -6,6 +6,7 @@
 #ifndef __FREESCALE_BOARD_SPL_H
 #define __FREESCALE_BOARD_SPL_H
 
+#include <linux/types.h>
 void fsl_spi_spl_load_image(uint32_t offs, unsigned int size, void *vdst);
 void fsl_spi_boot(void) __noreturn;
 
diff --git a/board/freescale/common/sys_eeprom.c b/board/freescale/common/sys_eeprom.c
index f04bec05a41..3eeabf616d4 100644
--- a/board/freescale/common/sys_eeprom.c
+++ b/board/freescale/common/sys_eeprom.c
@@ -8,11 +8,13 @@
 
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <env.h>
 #include <i2c.h>
 #include <init.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <asm/types.h>
 #include <linux/ctype.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
diff --git a/board/freescale/common/vid.c b/board/freescale/common/vid.c
index ebcb26b574c..3645a406fb8 100644
--- a/board/freescale/common/vid.c
+++ b/board/freescale/common/vid.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <env.h>
 #include <i2c.h>
 #include <irq_func.h>
@@ -22,6 +23,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include "vid.h"
 
 int __weak i2c_multiplexer_select_vid_channel(u8 channel)
diff --git a/board/freescale/common/vid.h b/board/freescale/common/vid.h
index 99778e9a934..a74f517c098 100644
--- a/board/freescale/common/vid.h
+++ b/board/freescale/common/vid.h
@@ -6,6 +6,7 @@
 #ifndef __VID_H_
 #define __VID_H_
 
+#include <linux/types.h>
 #define IR36021_LOOP1_MANUAL_ID_OFFSET	0x6A
 #define IR36021_LOOP1_VOUT_OFFSET	0x9A
 #define IR36021_MFR_ID_OFFSET		0x92
diff --git a/board/freescale/corenet_ds/corenet_ds.c b/board/freescale/corenet_ds/corenet_ds.c
index a6b93bab4e8..89dac9f46c8 100644
--- a/board/freescale/corenet_ds/corenet_ds.c
+++ b/board/freescale/corenet_ds/corenet_ds.c
@@ -12,6 +12,7 @@
 #include <netdev.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/compiler.h>
 #include <asm/mmu.h>
diff --git a/board/freescale/corenet_ds/ddr.c b/board/freescale/corenet_ds/ddr.c
index 282346cd45c..10c26362305 100644
--- a/board/freescale/corenet_ds/ddr.c
+++ b/board/freescale/corenet_ds/ddr.c
@@ -17,6 +17,7 @@
 #include <asm/fsl_law.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/corenet_ds/eth_hydra.c b/board/freescale/corenet_ds/eth_hydra.c
index f7c337d677a..e38c1d59dca 100644
--- a/board/freescale/corenet_ds/eth_hydra.c
+++ b/board/freescale/corenet_ds/eth_hydra.c
@@ -58,6 +58,7 @@
 #include <malloc.h>
 #include <fdt_support.h>
 #include <fsl_dtsec.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
 
diff --git a/board/freescale/corenet_ds/eth_p4080.c b/board/freescale/corenet_ds/eth_p4080.c
index 30b7912c270..64066851c6b 100644
--- a/board/freescale/corenet_ds/eth_p4080.c
+++ b/board/freescale/corenet_ds/eth_p4080.c
@@ -26,6 +26,7 @@
 #include <phy.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 #include "../common/ngpixis.h"
 #include "../common/fman.h"
diff --git a/board/freescale/corenet_ds/eth_superhydra.c b/board/freescale/corenet_ds/eth_superhydra.c
index bda97fbd6bd..71b95e5cd72 100644
--- a/board/freescale/corenet_ds/eth_superhydra.c
+++ b/board/freescale/corenet_ds/eth_superhydra.c
@@ -59,6 +59,7 @@
 #include <malloc.h>
 #include <fdt_support.h>
 #include <fsl_dtsec.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
 
diff --git a/board/freescale/imx8mm_evk/spl.c b/board/freescale/imx8mm_evk/spl.c
index a27d99820d0..227f92c4312 100644
--- a/board/freescale/imx8mm_evk/spl.c
+++ b/board/freescale/imx8mm_evk/spl.c
@@ -24,6 +24,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <dm/uclass.h>
 #include <dm/device.h>
diff --git a/board/freescale/imx8mn_evk/spl.c b/board/freescale/imx8mn_evk/spl.c
index 67523c404c6..f5c7ecfb9a6 100644
--- a/board/freescale/imx8mn_evk/spl.c
+++ b/board/freescale/imx8mn_evk/spl.c
@@ -24,6 +24,7 @@
 #include <asm/u-boot.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <dm/uclass.h>
 #include <dm/device.h>
diff --git a/board/freescale/imx8mp_evk/spl.c b/board/freescale/imx8mp_evk/spl.c
index 61988cb6ea1..9014d652d1e 100644
--- a/board/freescale/imx8mp_evk/spl.c
+++ b/board/freescale/imx8mp_evk/spl.c
@@ -22,6 +22,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/mach-imx/boot_mode.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 
 #include <power/pca9450.h>
diff --git a/board/freescale/imx8mq_evk/spl.c b/board/freescale/imx8mq_evk/spl.c
index ccb8f44f115..929470cf285 100644
--- a/board/freescale/imx8mq_evk/spl.c
+++ b/board/freescale/imx8mq_evk/spl.c
@@ -29,6 +29,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/pfuze100_pmic.h>
 #include <spl.h>
diff --git a/board/freescale/imx8qm_mek/imx8qm_mek.c b/board/freescale/imx8qm_mek/imx8qm_mek.c
index 3aa6c2d7a23..fac21ec5af3 100644
--- a/board/freescale/imx8qm_mek/imx8qm_mek.c
+++ b/board/freescale/imx8qm_mek/imx8qm_mek.c
@@ -8,6 +8,7 @@
 #include <env.h>
 #include <errno.h>
 #include <init.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
@@ -22,6 +23,7 @@
 #include <asm/arch/iomux.h>
 #include <asm/arch/sys_proto.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/imx8qm_mek/spl.c b/board/freescale/imx8qm_mek/spl.c
index b46ddffda06..ecd48c6f824 100644
--- a/board/freescale/imx8qm_mek/spl.c
+++ b/board/freescale/imx8qm_mek/spl.c
@@ -20,6 +20,7 @@
 #include <dm/lists.h>
 #include <asm/arch/sys_proto.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/imx8qxp_mek/imx8qxp_mek.c b/board/freescale/imx8qxp_mek/imx8qxp_mek.c
index f0220b13100..5e0bb68402f 100644
--- a/board/freescale/imx8qxp_mek/imx8qxp_mek.c
+++ b/board/freescale/imx8qxp_mek/imx8qxp_mek.c
@@ -8,6 +8,7 @@
 #include <env.h>
 #include <errno.h>
 #include <init.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
@@ -25,6 +26,7 @@
 #include <asm/arch/iomux.h>
 #include <asm/arch/sys_proto.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/imx8qxp_mek/spl.c b/board/freescale/imx8qxp_mek/spl.c
index 1cc32eade56..a87e8946943 100644
--- a/board/freescale/imx8qxp_mek/spl.c
+++ b/board/freescale/imx8qxp_mek/spl.c
@@ -26,6 +26,7 @@
 #include <asm/arch/sys_proto.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/imxrt1020-evk/imxrt1020-evk.c b/board/freescale/imxrt1020-evk/imxrt1020-evk.c
index 81695fc27d0..00a5425390a 100644
--- a/board/freescale/imxrt1020-evk/imxrt1020-evk.c
+++ b/board/freescale/imxrt1020-evk/imxrt1020-evk.c
@@ -13,6 +13,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/armv7m.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/imxrt1050-evk/imxrt1050-evk.c b/board/freescale/imxrt1050-evk/imxrt1050-evk.c
index 1b56414c020..1c59b34b1d0 100644
--- a/board/freescale/imxrt1050-evk/imxrt1050-evk.c
+++ b/board/freescale/imxrt1050-evk/imxrt1050-evk.c
@@ -13,6 +13,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/armv7m.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/ls1012afrdm/ls1012afrdm.c b/board/freescale/ls1012afrdm/ls1012afrdm.c
index 3100aee2715..6fb630ab64c 100644
--- a/board/freescale/ls1012afrdm/ls1012afrdm.c
+++ b/board/freescale/ls1012afrdm/ls1012afrdm.c
@@ -25,6 +25,7 @@
 #include <netdev.h>
 #include <fsl_sec.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/ls1012aqds/eth.c b/board/freescale/ls1012aqds/eth.c
index 35d7bfcb2ff..a0b44735dd8 100644
--- a/board/freescale/ls1012aqds/eth.c
+++ b/board/freescale/ls1012aqds/eth.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <stdio.h>
 #include <vsprintf.h>
diff --git a/board/freescale/ls1012aqds/ls1012aqds.c b/board/freescale/ls1012aqds/ls1012aqds.c
index 50e04204c68..4bb80717636 100644
--- a/board/freescale/ls1012aqds/ls1012aqds.c
+++ b/board/freescale/ls1012aqds/ls1012aqds.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <i2c.h>
 #include <fdt_support.h>
 #include <stdio.h>
@@ -32,6 +33,7 @@
 #include <fsl_sec.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "../common/qixis.h"
 #include "ls1012aqds_qixis.h"
 #include "ls1012aqds_pfe.h"
diff --git a/board/freescale/ls1012ardb/eth.c b/board/freescale/ls1012ardb/eth.c
index 7d4d4017e92..d208686ffc8 100644
--- a/board/freescale/ls1012ardb/eth.c
+++ b/board/freescale/ls1012ardb/eth.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <net.h>
 #include <stdio.h>
diff --git a/board/freescale/ls1012ardb/ls1012ardb.c b/board/freescale/ls1012ardb/ls1012ardb.c
index 8cc986ab01a..7c38a8b8ccf 100644
--- a/board/freescale/ls1012ardb/ls1012ardb.c
+++ b/board/freescale/ls1012ardb/ls1012ardb.c
@@ -33,6 +33,7 @@
 #include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/ls1021aiot/ls1021aiot.c b/board/freescale/ls1021aiot/ls1021aiot.c
index 66c701e1e35..988b0bad937 100644
--- a/board/freescale/ls1021aiot/ls1021aiot.c
+++ b/board/freescale/ls1021aiot/ls1021aiot.c
@@ -18,6 +18,7 @@
 #include <linux/delay.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <asm/arch/ls102xa_devdis.h>
 #include <asm/arch/ls102xa_soc.h>
diff --git a/board/freescale/ls1021aqds/dcu.c b/board/freescale/ls1021aqds/dcu.c
index 7f0ae42e92b..175ce7ce5ba 100644
--- a/board/freescale/ls1021aqds/dcu.c
+++ b/board/freescale/ls1021aqds/dcu.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <fsl_dcu_fb.h>
 #include <i2c.h>
+#include <asm/types.h>
 #include <linux/string.h>
 #include "div64.h"
 #include "../common/diu_ch7301.h"
diff --git a/board/freescale/ls1021aqds/ddr.c b/board/freescale/ls1021aqds/ddr.c
index 232449b1b50..677ad39394b 100644
--- a/board/freescale/ls1021aqds/ddr.c
+++ b/board/freescale/ls1021aqds/ddr.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
 #include <init.h>
@@ -16,6 +17,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "ddr.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/ls1021aqds/ddr.h b/board/freescale/ls1021aqds/ddr.h
index 58a88384367..b7233dd7a2a 100644
--- a/board/freescale/ls1021aqds/ddr.h
+++ b/board/freescale/ls1021aqds/ddr.h
@@ -6,6 +6,7 @@
 #ifndef __DDR_H__
 #define __DDR_H__
 
+#include <asm/types.h>
 void erratum_a008850_post(void);
 
 struct board_specific_parameters {
diff --git a/board/freescale/ls1021aqds/eth.c b/board/freescale/ls1021aqds/eth.c
index 786935b8b33..bda159bfb7b 100644
--- a/board/freescale/ls1021aqds/eth.c
+++ b/board/freescale/ls1021aqds/eth.c
@@ -21,6 +21,7 @@
 #include <fsl_mdio.h>
 #include <tsec.h>
 #include <malloc.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
 
diff --git a/board/freescale/ls1021aqds/ls1021aqds.c b/board/freescale/ls1021aqds/ls1021aqds.c
index c13ec412700..21c82e4ce53 100644
--- a/board/freescale/ls1021aqds/ls1021aqds.c
+++ b/board/freescale/ls1021aqds/ls1021aqds.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <clock_legacy.h>
+#include <compiler.h>
 #include <fdt_support.h>
 #include <i2c.h>
 #include <init.h>
@@ -29,6 +30,7 @@
 #include <asm/u-boot.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "../common/sleep.h"
 #include "../common/qixis.h"
 #include "ls1021aqds_qixis.h"
diff --git a/board/freescale/ls1021atsn/ls1021atsn.c b/board/freescale/ls1021atsn/ls1021atsn.c
index 4ad4f1eb07a..72228133e9b 100644
--- a/board/freescale/ls1021atsn/ls1021atsn.c
+++ b/board/freescale/ls1021atsn/ls1021atsn.c
@@ -16,6 +16,7 @@
 #include <linux/delay.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "../common/sleep.h"
 #include <fsl_validate.h>
 #include <fsl_immap.h>
diff --git a/board/freescale/ls1021atwr/ls1021atwr.c b/board/freescale/ls1021atwr/ls1021atwr.c
index 8c21393a6e5..38eebc268a6 100644
--- a/board/freescale/ls1021atwr/ls1021atwr.c
+++ b/board/freescale/ls1021atwr/ls1021atwr.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <clock_legacy.h>
 #include <command.h>
+#include <compiler.h>
 #include <fdt_support.h>
 #include <i2c.h>
 #include <init.h>
@@ -34,6 +35,7 @@
 #include <linux/delay.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "../common/sleep.h"
 #ifdef CONFIG_U_QE
 #include <fsl_qe.h>
diff --git a/board/freescale/ls1028a/ls1028a.c b/board/freescale/ls1028a/ls1028a.c
index 220d0b0befa..bb60b980add 100644
--- a/board/freescale/ls1028a/ls1028a.c
+++ b/board/freescale/ls1028a/ls1028a.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <display_options.h>
 #include <init.h>
 #include <malloc.h>
@@ -27,6 +28,7 @@
 #endif
 #include <fsl_immap.h>
 #include <netdev.h>
+#include <linux/types.h>
 
 #include <fdtdec.h>
 #include <miiphy.h>
diff --git a/board/freescale/ls1043aqds/ddr.c b/board/freescale/ls1043aqds/ddr.c
index 234403ed12a..20980bd5c14 100644
--- a/board/freescale/ls1043aqds/ddr.c
+++ b/board/freescale/ls1043aqds/ddr.c
@@ -15,6 +15,7 @@
 #include <asm/arch/clock.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 #include "ddr.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/ls1043aqds/ddr.h b/board/freescale/ls1043aqds/ddr.h
index 65b0250d370..4e5f0b42611 100644
--- a/board/freescale/ls1043aqds/ddr.h
+++ b/board/freescale/ls1043aqds/ddr.h
@@ -6,6 +6,7 @@
 #ifndef __DDR_H__
 #define __DDR_H__
 
+#include <asm/types.h>
 extern void erratum_a008850_post(void);
 
 struct board_specific_parameters {
diff --git a/board/freescale/ls1043aqds/eth.c b/board/freescale/ls1043aqds/eth.c
index ba56512ec96..0355a6aa89f 100644
--- a/board/freescale/ls1043aqds/eth.c
+++ b/board/freescale/ls1043aqds/eth.c
@@ -14,6 +14,7 @@
 #include <fm_eth.h>
 #include <fsl_mdio.h>
 #include <fsl_dtsec.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <malloc.h>
diff --git a/board/freescale/ls1043aqds/ls1043aqds.c b/board/freescale/ls1043aqds/ls1043aqds.c
index 6b377d0d997..8db0d0e510c 100644
--- a/board/freescale/ls1043aqds/ls1043aqds.c
+++ b/board/freescale/ls1043aqds/ls1043aqds.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <i2c.h>
 #include <fdt_support.h>
 #include <fsl_ddr_sdram.h>
@@ -30,6 +31,7 @@
 #include <fsl_esdhc.h>
 #include <fsl_ifc.h>
 #include <spl.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 
 #include "../common/qixis.h"
diff --git a/board/freescale/ls1043ardb/cpld.c b/board/freescale/ls1043ardb/cpld.c
index c230dcdca5d..52ab566f056 100644
--- a/board/freescale/ls1043ardb/cpld.c
+++ b/board/freescale/ls1043ardb/cpld.c
@@ -9,6 +9,7 @@
 #include <command.h>
 #include <stdio.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/string.h>
 #include "cpld.h"
 
diff --git a/board/freescale/ls1043ardb/cpld.h b/board/freescale/ls1043ardb/cpld.h
index 2e757b557f4..dce9682e42b 100644
--- a/board/freescale/ls1043ardb/cpld.h
+++ b/board/freescale/ls1043ardb/cpld.h
@@ -9,6 +9,7 @@
 /*
  * CPLD register set of LS1043ARDB board-specific.
  */
+#include <asm/types.h>
 struct cpld_data {
 	u8 cpld_ver;		/* 0x0 - CPLD Major Revision Register */
 	u8 cpld_ver_sub;	/* 0x1 - CPLD Minor Revision Register */
diff --git a/board/freescale/ls1043ardb/ddr.c b/board/freescale/ls1043ardb/ddr.c
index 1ffde4b246b..c3ab9d04217 100644
--- a/board/freescale/ls1043ardb/ddr.c
+++ b/board/freescale/ls1043ardb/ddr.c
@@ -10,6 +10,7 @@
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "ddr.h"
 #include <log.h>
 #include <vsprintf.h>
diff --git a/board/freescale/ls1043ardb/ddr.h b/board/freescale/ls1043ardb/ddr.h
index 85ed920ca6d..373ce08afac 100644
--- a/board/freescale/ls1043ardb/ddr.h
+++ b/board/freescale/ls1043ardb/ddr.h
@@ -6,6 +6,7 @@
 #ifndef __DDR_H__
 #define __DDR_H__
 
+#include <asm/types.h>
 extern void erratum_a008850_post(void);
 
 struct board_specific_parameters {
diff --git a/board/freescale/ls1043ardb/eth.c b/board/freescale/ls1043ardb/eth.c
index a89978bbd7d..8e1e6f46c3b 100644
--- a/board/freescale/ls1043ardb/eth.c
+++ b/board/freescale/ls1043ardb/eth.c
@@ -11,6 +11,7 @@
 #include <fsl_dtsec.h>
 #include <fsl_mdio.h>
 #include <malloc.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 
 #include "../common/fman.h"
diff --git a/board/freescale/ls1043ardb/ls1043ardb.c b/board/freescale/ls1043ardb/ls1043ardb.c
index 86309266a04..1e38cdee765 100644
--- a/board/freescale/ls1043ardb/ls1043ardb.c
+++ b/board/freescale/ls1043ardb/ls1043ardb.c
@@ -22,6 +22,7 @@
 #include <fsl_esdhc.h>
 #include <fsl_ifc.h>
 #include <fsl_sec.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include "cpld.h"
 #ifdef CONFIG_U_QE
diff --git a/board/freescale/ls1046afrwy/eth.c b/board/freescale/ls1046afrwy/eth.c
index 278856f56d7..eb869a1d4ad 100644
--- a/board/freescale/ls1046afrwy/eth.c
+++ b/board/freescale/ls1046afrwy/eth.c
@@ -12,6 +12,7 @@
 #include <fsl_dtsec.h>
 #include <fsl_mdio.h>
 #include <malloc.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
 
diff --git a/board/freescale/ls1046afrwy/ls1046afrwy.c b/board/freescale/ls1046afrwy/ls1046afrwy.c
index 550c901a76b..34b601bc64e 100644
--- a/board/freescale/ls1046afrwy/ls1046afrwy.c
+++ b/board/freescale/ls1046afrwy/ls1046afrwy.c
@@ -24,6 +24,7 @@
 #include <fsl_sec.h>
 #include <fsl_dspi.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 #define LS1046A_PORSR1_REG 0x1EE0000
 #define BOOT_SRC_SD        0x20000000
diff --git a/board/freescale/ls1046aqds/ddr.c b/board/freescale/ls1046aqds/ddr.c
index a182861ce65..3bba578b1a6 100644
--- a/board/freescale/ls1046aqds/ddr.c
+++ b/board/freescale/ls1046aqds/ddr.c
@@ -15,6 +15,7 @@
 #include <asm/arch/clock.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 #include "ddr.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/ls1046aqds/ddr.h b/board/freescale/ls1046aqds/ddr.h
index e55446f2b29..de38f96c1a9 100644
--- a/board/freescale/ls1046aqds/ddr.h
+++ b/board/freescale/ls1046aqds/ddr.h
@@ -6,6 +6,7 @@
 #ifndef __DDR_H__
 #define __DDR_H__
 
+#include <asm/types.h>
 void erratum_a008850_post(void);
 
 struct board_specific_parameters {
diff --git a/board/freescale/ls1046aqds/eth.c b/board/freescale/ls1046aqds/eth.c
index 1977b08eca2..7293d5eadeb 100644
--- a/board/freescale/ls1046aqds/eth.c
+++ b/board/freescale/ls1046aqds/eth.c
@@ -17,6 +17,7 @@
 #include <fsl_dtsec.h>
 #include <malloc.h>
 #include <asm/arch/fsl_serdes.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 
 #include "../common/qixis.h"
diff --git a/board/freescale/ls1046aqds/ls1046aqds.c b/board/freescale/ls1046aqds/ls1046aqds.c
index 1d06c3038a6..facc92ff437 100644
--- a/board/freescale/ls1046aqds/ls1046aqds.c
+++ b/board/freescale/ls1046aqds/ls1046aqds.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <i2c.h>
 #include <fdt_support.h>
 #include <fsl_ddr_sdram.h>
@@ -31,6 +32,7 @@
 #include <fsl_ifc.h>
 #include <fsl_sec.h>
 #include <spl.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 
 #include "../common/vid.h"
diff --git a/board/freescale/ls1046ardb/cpld.c b/board/freescale/ls1046ardb/cpld.c
index 1f6fcc116e5..7f84bc06fbc 100644
--- a/board/freescale/ls1046ardb/cpld.c
+++ b/board/freescale/ls1046ardb/cpld.c
@@ -10,6 +10,7 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/string.h>
 #include "cpld.h"
 
diff --git a/board/freescale/ls1046ardb/cpld.h b/board/freescale/ls1046ardb/cpld.h
index 765962c89ae..7d2509e8cbe 100644
--- a/board/freescale/ls1046ardb/cpld.h
+++ b/board/freescale/ls1046ardb/cpld.h
@@ -11,6 +11,7 @@
  * CPLD Revision:  V2.1
  */
 #include <stdbool.h>
+#include <asm/types.h>
 struct cpld_data {
 	u8 cpld_ver;		/* 0x0 - CPLD Major Revision Register */
 	u8 cpld_ver_sub;	/* 0x1 - CPLD Minor Revision Register */
diff --git a/board/freescale/ls1046ardb/ddr.c b/board/freescale/ls1046ardb/ddr.c
index 3b4129701b0..ca45bd91029 100644
--- a/board/freescale/ls1046ardb/ddr.c
+++ b/board/freescale/ls1046ardb/ddr.c
@@ -10,6 +10,7 @@
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 #include "ddr.h"
 #ifdef CONFIG_FSL_DEEP_SLEEP
 #include <fsl_sleep.h>
diff --git a/board/freescale/ls1046ardb/ddr.h b/board/freescale/ls1046ardb/ddr.h
index 05baef232ab..47f5bb0c380 100644
--- a/board/freescale/ls1046ardb/ddr.h
+++ b/board/freescale/ls1046ardb/ddr.h
@@ -6,6 +6,7 @@
 #ifndef __DDR_H__
 #define __DDR_H__
 
+#include <asm/types.h>
 void erratum_a008850_post(void);
 
 struct board_specific_parameters {
diff --git a/board/freescale/ls1046ardb/eth.c b/board/freescale/ls1046ardb/eth.c
index 6d05c964bd0..4f1cc233c0f 100644
--- a/board/freescale/ls1046ardb/eth.c
+++ b/board/freescale/ls1046ardb/eth.c
@@ -12,6 +12,7 @@
 #include <fsl_dtsec.h>
 #include <fsl_mdio.h>
 #include <malloc.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
 
diff --git a/board/freescale/ls1046ardb/ls1046ardb.c b/board/freescale/ls1046ardb/ls1046ardb.c
index d2f88ea9d06..69d1edfa61e 100644
--- a/board/freescale/ls1046ardb/ls1046ardb.c
+++ b/board/freescale/ls1046ardb/ls1046ardb.c
@@ -23,6 +23,7 @@
 #include <fm_eth.h>
 #include <fsl_csu.h>
 #include <fsl_esdhc.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <power/mc34vr500_pmic.h>
 #include "cpld.h"
diff --git a/board/freescale/ls1088a/ddr.c b/board/freescale/ls1088a/ddr.c
index bd8c0511e83..d85888d4858 100644
--- a/board/freescale/ls1088a/ddr.c
+++ b/board/freescale/ls1088a/ddr.c
@@ -13,6 +13,7 @@
 #include <asm/arch/clock.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 #include "ddr.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/ls1088a/ddr.h b/board/freescale/ls1088a/ddr.h
index b35c4ae2dad..5c50bbf9439 100644
--- a/board/freescale/ls1088a/ddr.h
+++ b/board/freescale/ls1088a/ddr.h
@@ -5,6 +5,7 @@
 
 #ifndef __LS1088A_DDR_H__
 #define __LS1088A_DDR_H__
+#include <asm/types.h>
 struct board_specific_parameters {
 	u32 n_ranks;
 	u32 datarate_mhz_high;
diff --git a/board/freescale/ls1088a/eth_ls1088aqds.c b/board/freescale/ls1088a/eth_ls1088aqds.c
index fe0a890bb0c..52a7d65f65b 100644
--- a/board/freescale/ls1088a/eth_ls1088aqds.c
+++ b/board/freescale/ls1088a/eth_ls1088aqds.c
@@ -5,10 +5,12 @@
 
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <env.h>
 #include <log.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/io.h>
@@ -26,6 +28,7 @@
 #include <linux/delay.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "../common/qixis.h"
 
diff --git a/board/freescale/ls1088a/eth_ls1088ardb.c b/board/freescale/ls1088a/eth_ls1088ardb.c
index 6898dfc6f39..349a092e177 100644
--- a/board/freescale/ls1088a/eth_ls1088ardb.c
+++ b/board/freescale/ls1088a/eth_ls1088ardb.c
@@ -16,6 +16,7 @@
 #include <asm/io.h>
 #include <exports.h>
 #include <asm/arch/fsl_serdes.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <fsl-mc/fsl_mc.h>
 #include <fsl-mc/ldpaa_wriop.h>
diff --git a/board/freescale/ls1088a/ls1088a.c b/board/freescale/ls1088a/ls1088a.c
index b35266de231..852748ce32d 100644
--- a/board/freescale/ls1088a/ls1088a.c
+++ b/board/freescale/ls1088a/ls1088a.c
@@ -3,6 +3,7 @@
  * Copyright 2017-2018 NXP
  */
 #include <common.h>
+#include <compiler.h>
 #include <display_options.h>
 #include <env.h>
 #include <i2c.h>
@@ -14,6 +15,7 @@
 #include <fsl_ifc.h>
 #include <fsl_ddr.h>
 #include <fsl_sec.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
@@ -31,6 +33,7 @@
 #include <asm/arch/soc.h>
 #include <asm/arch-fsl-layerscape/fsl_icid.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "../common/qixis.h"
 #include "ls1088a_qixis.h"
diff --git a/board/freescale/ls2080a/ddr.c b/board/freescale/ls2080a/ddr.c
index 5a28549d190..c1b5c3532ec 100644
--- a/board/freescale/ls2080a/ddr.c
+++ b/board/freescale/ls2080a/ddr.c
@@ -14,6 +14,7 @@
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "ddr.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/ls2080a/ddr.h b/board/freescale/ls2080a/ddr.h
index d21b9265586..6152099c49d 100644
--- a/board/freescale/ls2080a/ddr.h
+++ b/board/freescale/ls2080a/ddr.h
@@ -5,6 +5,7 @@
 
 #ifndef __DDR_H__
 #define __DDR_H__
+#include <asm/types.h>
 struct board_specific_parameters {
 	u32 n_ranks;
 	u32 datarate_mhz_high;
diff --git a/board/freescale/ls2080a/ls2080a.c b/board/freescale/ls2080a/ls2080a.c
index b2fb47eaaa5..44e925ee446 100644
--- a/board/freescale/ls2080a/ls2080a.c
+++ b/board/freescale/ls2080a/ls2080a.c
@@ -20,6 +20,7 @@
 #include <fsl-mc/fsl_mc.h>
 #include <env_internal.h>
 #include <asm/arch/soc.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/ls2080aqds/ddr.c b/board/freescale/ls2080aqds/ddr.c
index 81003a98857..5a0c711e2cb 100644
--- a/board/freescale/ls2080aqds/ddr.c
+++ b/board/freescale/ls2080aqds/ddr.c
@@ -13,6 +13,7 @@
 #include <asm/arch/clock.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 #include "ddr.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/ls2080aqds/ddr.h b/board/freescale/ls2080aqds/ddr.h
index b5d790a4a05..a65f7e07183 100644
--- a/board/freescale/ls2080aqds/ddr.h
+++ b/board/freescale/ls2080aqds/ddr.h
@@ -5,6 +5,7 @@
 
 #ifndef __DDR_H__
 #define __DDR_H__
+#include <asm/types.h>
 struct board_specific_parameters {
 	u32 n_ranks;
 	u32 datarate_mhz_high;
diff --git a/board/freescale/ls2080aqds/eth.c b/board/freescale/ls2080aqds/eth.c
index 167bd1475c9..a7a2eaaf4b0 100644
--- a/board/freescale/ls2080aqds/eth.c
+++ b/board/freescale/ls2080aqds/eth.c
@@ -4,10 +4,12 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <env.h>
 #include <log.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/io.h>
@@ -24,6 +26,7 @@
 #include <linux/delay.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "../common/qixis.h"
 
diff --git a/board/freescale/ls2080aqds/ls2080aqds.c b/board/freescale/ls2080aqds/ls2080aqds.c
index 8a44ea36003..63addf576d6 100644
--- a/board/freescale/ls2080aqds/ls2080aqds.c
+++ b/board/freescale/ls2080aqds/ls2080aqds.c
@@ -3,6 +3,7 @@
  * Copyright 2015 Freescale Semiconductor
  */
 #include <common.h>
+#include <compiler.h>
 #include <display_options.h>
 #include <env.h>
 #include <init.h>
@@ -28,6 +29,7 @@
 #include <asm/arch/ppa.h>
 #include <asm/arch-fsl-layerscape/fsl_icid.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 
 #include "../common/qixis.h"
diff --git a/board/freescale/ls2080ardb/ddr.c b/board/freescale/ls2080ardb/ddr.c
index d1f36840aa1..3b9f83f482c 100644
--- a/board/freescale/ls2080ardb/ddr.c
+++ b/board/freescale/ls2080ardb/ddr.c
@@ -13,6 +13,7 @@
 #include <asm/arch/clock.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 #include "ddr.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/ls2080ardb/ddr.h b/board/freescale/ls2080ardb/ddr.h
index c5f2a95211b..584821d6b8d 100644
--- a/board/freescale/ls2080ardb/ddr.h
+++ b/board/freescale/ls2080ardb/ddr.h
@@ -5,6 +5,7 @@
 
 #ifndef __DDR_H__
 #define __DDR_H__
+#include <asm/types.h>
 struct board_specific_parameters {
 	u32 n_ranks;
 	u32 datarate_mhz_high;
diff --git a/board/freescale/ls2080ardb/eth_ls2080rdb.c b/board/freescale/ls2080ardb/eth_ls2080rdb.c
index b4f718b1ae6..6624c3d6374 100644
--- a/board/freescale/ls2080ardb/eth_ls2080rdb.c
+++ b/board/freescale/ls2080ardb/eth_ls2080rdb.c
@@ -18,6 +18,7 @@
 #include <asm/io.h>
 #include <exports.h>
 #include <asm/arch/fsl_serdes.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <fsl-mc/fsl_mc.h>
 #include <fsl-mc/ldpaa_wriop.h>
diff --git a/board/freescale/ls2080ardb/ls2080ardb.c b/board/freescale/ls2080ardb/ls2080ardb.c
index a69f207c213..c4a5a8902ce 100644
--- a/board/freescale/ls2080ardb/ls2080ardb.c
+++ b/board/freescale/ls2080ardb/ls2080ardb.c
@@ -4,6 +4,7 @@
  * Copyright 2017 NXP
  */
 #include <common.h>
+#include <compiler.h>
 #include <display_options.h>
 #include <env.h>
 #include <init.h>
@@ -29,6 +30,7 @@
 #include <asm/arch/ppa.h>
 #include <fsl_sec.h>
 #include <asm/arch-fsl-layerscape/fsl_icid.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_FSL_QIXIS
 #include "../common/qixis.h"
diff --git a/board/freescale/lx2160a/eth_lx2160aqds.c b/board/freescale/lx2160a/eth_lx2160aqds.c
index 74b31f9a877..1901366fc4f 100644
--- a/board/freescale/lx2160a/eth_lx2160aqds.c
+++ b/board/freescale/lx2160a/eth_lx2160aqds.c
@@ -17,6 +17,7 @@
 #include <miiphy.h>
 #include <phy.h>
 #include <fm_eth.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
@@ -29,6 +30,7 @@
 #include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "../common/qixis.h"
 
diff --git a/board/freescale/lx2160a/eth_lx2160ardb.c b/board/freescale/lx2160a/eth_lx2160ardb.c
index 6c25108c8e3..96d99291033 100644
--- a/board/freescale/lx2160a/eth_lx2160ardb.c
+++ b/board/freescale/lx2160a/eth_lx2160ardb.c
@@ -20,6 +20,7 @@
 #include <asm/io.h>
 #include <exports.h>
 #include <asm/arch/fsl_serdes.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <fsl-mc/fsl_mc.h>
 #include <fsl-mc/ldpaa_wriop.h>
diff --git a/board/freescale/lx2160a/lx2160a.c b/board/freescale/lx2160a/lx2160a.c
index 55a7e9b6f0b..d6bd5b715f3 100644
--- a/board/freescale/lx2160a/lx2160a.c
+++ b/board/freescale/lx2160a/lx2160a.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <clock_legacy.h>
+#include <compiler.h>
 #include <display_options.h>
 #include <dm.h>
 #include <init.h>
@@ -34,6 +35,7 @@
 #include <asm/arch/fsl_serdes.h>
 #include <asm/arch/soc.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "../common/qixis.h"
 #include "../common/vid.h"
 #include <fsl_immap.h>
diff --git a/board/freescale/m5208evbe/m5208evbe.c b/board/freescale/m5208evbe/m5208evbe.c
index 594728a2dd6..4a2d4b347c2 100644
--- a/board/freescale/m5208evbe/m5208evbe.c
+++ b/board/freescale/m5208evbe/m5208evbe.c
@@ -14,6 +14,7 @@
 #include <asm/global_data.h>
 #include <asm/immap.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/m52277evb/m52277evb.c b/board/freescale/m52277evb/m52277evb.c
index 1ecdfb39312..c366205fd99 100644
--- a/board/freescale/m52277evb/m52277evb.c
+++ b/board/freescale/m52277evb/m52277evb.c
@@ -13,6 +13,7 @@
 #include <asm/global_data.h>
 #include <asm/immap.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/m5235evb/m5235evb.c b/board/freescale/m5235evb/m5235evb.c
index 6050d5c621d..a9995a88535 100644
--- a/board/freescale/m5235evb/m5235evb.c
+++ b/board/freescale/m5235evb/m5235evb.c
@@ -14,6 +14,7 @@
 #include <asm/global_data.h>
 #include <asm/immap.h>
 #include <asm/io.h>
+#include <asm/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/m5249evb/m5249evb.c b/board/freescale/m5249evb/m5249evb.c
index 9cb08d85cc7..a02aceb2066 100644
--- a/board/freescale/m5249evb/m5249evb.c
+++ b/board/freescale/m5249evb/m5249evb.c
@@ -12,6 +12,7 @@
 #include <asm/global_data.h>
 #include <asm/immap.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/m5253demo/flash.c b/board/freescale/m5253demo/flash.c
index 025e9dbcf52..2bc65a4313d 100644
--- a/board/freescale/m5253demo/flash.c
+++ b/board/freescale/m5253demo/flash.c
@@ -13,6 +13,7 @@
 #include <irq_func.h>
 #include <stdio.h>
 #include <time.h>
+#include <linux/types.h>
 
 #include <asm/immap.h>
 
diff --git a/board/freescale/m5253demo/m5253demo.c b/board/freescale/m5253demo/m5253demo.c
index 90c79a60f83..c834170c3f1 100644
--- a/board/freescale/m5253demo/m5253demo.c
+++ b/board/freescale/m5253demo/m5253demo.c
@@ -15,6 +15,7 @@
 #include <asm/immap.h>
 #include <netdev.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 
diff --git a/board/freescale/m5282evb/m5282evb.c b/board/freescale/m5282evb/m5282evb.c
index e1ea9b3a58f..e7ed2a46f2e 100644
--- a/board/freescale/m5282evb/m5282evb.c
+++ b/board/freescale/m5282evb/m5282evb.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <asm/global_data.h>
 #include <asm/immap.h>
+#include <asm/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/m53017evb/m53017evb.c b/board/freescale/m53017evb/m53017evb.c
index e1c5dca7004..f7cebcbbc72 100644
--- a/board/freescale/m53017evb/m53017evb.c
+++ b/board/freescale/m53017evb/m53017evb.c
@@ -14,6 +14,7 @@
 #include <asm/global_data.h>
 #include <asm/immap.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/m5329evb/m5329evb.c b/board/freescale/m5329evb/m5329evb.c
index ccbcbeb342e..55d21de1b97 100644
--- a/board/freescale/m5329evb/m5329evb.c
+++ b/board/freescale/m5329evb/m5329evb.c
@@ -14,6 +14,7 @@
 #include <asm/global_data.h>
 #include <asm/immap.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/m5329evb/nand.c b/board/freescale/m5329evb/nand.c
index 58b8ee51d37..ad004fbc25b 100644
--- a/board/freescale/m5329evb/nand.c
+++ b/board/freescale/m5329evb/nand.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <asm/io.h>
 #include <asm/immap.h>
+#include <linux/types.h>
 
 #if defined(CONFIG_CMD_NAND)
 #include <nand.h>
diff --git a/board/freescale/m5373evb/m5373evb.c b/board/freescale/m5373evb/m5373evb.c
index bd65509ac60..dc0f24d3567 100644
--- a/board/freescale/m5373evb/m5373evb.c
+++ b/board/freescale/m5373evb/m5373evb.c
@@ -14,6 +14,7 @@
 #include <asm/global_data.h>
 #include <asm/immap.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/m5373evb/nand.c b/board/freescale/m5373evb/nand.c
index 4c30d510018..b706cbc5c75 100644
--- a/board/freescale/m5373evb/nand.c
+++ b/board/freescale/m5373evb/nand.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <asm/io.h>
 #include <asm/immap.h>
+#include <linux/types.h>
 
 #if defined(CONFIG_CMD_NAND)
 #include <nand.h>
diff --git a/board/freescale/m54418twr/m54418twr.c b/board/freescale/m54418twr/m54418twr.c
index b931b869326..ee695091ce6 100644
--- a/board/freescale/m54418twr/m54418twr.c
+++ b/board/freescale/m54418twr/m54418twr.c
@@ -13,6 +13,7 @@
 #include <asm/immap.h>
 #include <mmc.h>
 #include <fsl_esdhc_imx.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/m54451evb/m54451evb.c b/board/freescale/m54451evb/m54451evb.c
index deaf62530a1..84c1f01bca0 100644
--- a/board/freescale/m54451evb/m54451evb.c
+++ b/board/freescale/m54451evb/m54451evb.c
@@ -14,6 +14,7 @@
 #include <asm/global_data.h>
 #include <asm/immap.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/m54455evb/m54455evb.c b/board/freescale/m54455evb/m54455evb.c
index 64ff296ad80..045fbac3cac 100644
--- a/board/freescale/m54455evb/m54455evb.c
+++ b/board/freescale/m54455evb/m54455evb.c
@@ -15,6 +15,7 @@
 #include <asm/immap.h>
 #include <asm/io.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/m547xevb/m547xevb.c b/board/freescale/m547xevb/m547xevb.c
index 255a42baeee..cb9bb1636a4 100644
--- a/board/freescale/m547xevb/m547xevb.c
+++ b/board/freescale/m547xevb/m547xevb.c
@@ -15,6 +15,7 @@
 #include <asm/global_data.h>
 #include <asm/immap.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/m548xevb/m548xevb.c b/board/freescale/m548xevb/m548xevb.c
index 9228ccbb06f..cb049269de4 100644
--- a/board/freescale/m548xevb/m548xevb.c
+++ b/board/freescale/m548xevb/m548xevb.c
@@ -15,6 +15,7 @@
 #include <asm/global_data.h>
 #include <asm/immap.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/mpc8308rdb/mpc8308rdb.c b/board/freescale/mpc8308rdb/mpc8308rdb.c
index 08507351d2f..b0e650c3dc1 100644
--- a/board/freescale/mpc8308rdb/mpc8308rdb.c
+++ b/board/freescale/mpc8308rdb/mpc8308rdb.c
@@ -11,6 +11,7 @@
 #include <net.h>
 #include <spi.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
diff --git a/board/freescale/mpc8308rdb/sdram.c b/board/freescale/mpc8308rdb/sdram.c
index 10605ae79a7..32b948fee23 100644
--- a/board/freescale/mpc8308rdb/sdram.c
+++ b/board/freescale/mpc8308rdb/sdram.c
@@ -15,6 +15,7 @@
 #include <init.h>
 #include <mpc83xx.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 
 #include <asm/bitops.h>
diff --git a/board/freescale/mpc8313erdb/mpc8313erdb.c b/board/freescale/mpc8313erdb/mpc8313erdb.c
index 36297b81a3a..fba8054f850 100644
--- a/board/freescale/mpc8313erdb/mpc8313erdb.c
+++ b/board/freescale/mpc8313erdb/mpc8313erdb.c
@@ -23,6 +23,7 @@
 #endif
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/mpc8313erdb/sdram.c b/board/freescale/mpc8313erdb/sdram.c
index 5c69e201afd..d0f1cbdcfe4 100644
--- a/board/freescale/mpc8313erdb/sdram.c
+++ b/board/freescale/mpc8313erdb/sdram.c
@@ -13,6 +13,7 @@
 #include <spd_sdram.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 
diff --git a/board/freescale/mpc8315erdb/mpc8315erdb.c b/board/freescale/mpc8315erdb/mpc8315erdb.c
index a4e769934aa..86419c399aa 100644
--- a/board/freescale/mpc8315erdb/mpc8315erdb.c
+++ b/board/freescale/mpc8315erdb/mpc8315erdb.c
@@ -23,6 +23,7 @@
 #include <asm/io.h>
 #include <ns16550.h>
 #include <nand.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/mpc8315erdb/sdram.c b/board/freescale/mpc8315erdb/sdram.c
index 84abf2c3501..63c3cac0820 100644
--- a/board/freescale/mpc8315erdb/sdram.c
+++ b/board/freescale/mpc8315erdb/sdram.c
@@ -13,6 +13,7 @@
 #include <spd_sdram.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 
diff --git a/board/freescale/mpc8323erdb/mpc8323erdb.c b/board/freescale/mpc8323erdb/mpc8323erdb.c
index e2f56ae31d6..a18d8783ed9 100644
--- a/board/freescale/mpc8323erdb/mpc8323erdb.c
+++ b/board/freescale/mpc8323erdb/mpc8323erdb.c
@@ -27,6 +27,7 @@
 #include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <u-boot/crc.h>
 #if defined(CONFIG_PCI)
 #include <pci.h>
diff --git a/board/freescale/mpc832xemds/mpc832xemds.c b/board/freescale/mpc832xemds/mpc832xemds.c
index 92fd0336a76..f183a450d23 100644
--- a/board/freescale/mpc832xemds/mpc832xemds.c
+++ b/board/freescale/mpc832xemds/mpc832xemds.c
@@ -25,6 +25,7 @@
 #if defined(CONFIG_PQ_MDS_PIB)
 #include "../common/pq-mds-pib.h"
 #endif
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/board/freescale/mpc8349emds/ddr.c b/board/freescale/mpc8349emds/ddr.c
index f4dfea8315f..52d2b8f55fe 100644
--- a/board/freescale/mpc8349emds/ddr.c
+++ b/board/freescale/mpc8349emds/ddr.c
@@ -7,6 +7,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
diff --git a/board/freescale/mpc8349emds/mpc8349emds.c b/board/freescale/mpc8349emds/mpc8349emds.c
index b864a1cd4f6..35375842dc0 100644
--- a/board/freescale/mpc8349emds/mpc8349emds.c
+++ b/board/freescale/mpc8349emds/mpc8349emds.c
@@ -24,6 +24,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #if defined(CONFIG_OF_LIBFDT)
 #include <linux/libfdt.h>
diff --git a/board/freescale/mpc8349emds/pci.c b/board/freescale/mpc8349emds/pci.c
index 254ed2a79d1..271942ccecd 100644
--- a/board/freescale/mpc8349emds/pci.c
+++ b/board/freescale/mpc8349emds/pci.c
@@ -12,6 +12,7 @@
 #include <pci.h>
 #include <i2c.h>
 #include <asm/fsl_i2c.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 static struct pci_region pci1_regions[] = {
diff --git a/board/freescale/mpc8349itx/mpc8349itx.c b/board/freescale/mpc8349itx/mpc8349itx.c
index aa97625c0f5..7d73d8a2c44 100644
--- a/board/freescale/mpc8349itx/mpc8349itx.c
+++ b/board/freescale/mpc8349itx/mpc8349itx.c
@@ -28,6 +28,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "../../../arch/powerpc/cpu/mpc83xx/hrcw/hrcw.h"
 #include "../../../arch/powerpc/cpu/mpc83xx/elbc/elbc.h"
diff --git a/board/freescale/mpc8349itx/pci.c b/board/freescale/mpc8349itx/pci.c
index a09b6586882..0924e7c13e7 100644
--- a/board/freescale/mpc8349itx/pci.c
+++ b/board/freescale/mpc8349itx/pci.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 #include <asm/mmu.h>
diff --git a/board/freescale/mpc837xemds/mpc837xemds.c b/board/freescale/mpc837xemds/mpc837xemds.c
index 49eb2874d86..ee17a3b5aa8 100644
--- a/board/freescale/mpc837xemds/mpc837xemds.c
+++ b/board/freescale/mpc837xemds/mpc837xemds.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <hwconfig.h>
 #include <i2c.h>
 #include <init.h>
@@ -16,6 +17,7 @@
 #include <asm/fsl_mpc83xx_serdes.h>
 #include <spd_sdram.h>
 #include <tsec.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/board/freescale/mpc837xemds/pci.c b/board/freescale/mpc837xemds/pci.c
index 06cb3a6553b..dacdb8bb04b 100644
--- a/board/freescale/mpc837xemds/pci.c
+++ b/board/freescale/mpc837xemds/pci.c
@@ -14,6 +14,7 @@
 #include <fdt_support.h>
 #include <asm/fsl_i2c.h>
 #include <asm/fsl_mpc83xx_serdes.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
diff --git a/board/freescale/mpc837xerdb/mpc837xerdb.c b/board/freescale/mpc837xerdb/mpc837xerdb.c
index 5f3f747ee9a..0c0a6016ddd 100644
--- a/board/freescale/mpc837xerdb/mpc837xerdb.c
+++ b/board/freescale/mpc837xerdb/mpc837xerdb.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <env.h>
 #include <hwconfig.h>
 #include <i2c.h>
@@ -22,6 +23,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/mpc837xerdb/pci.c b/board/freescale/mpc837xerdb/pci.c
index dccf8c5551b..7306957f50f 100644
--- a/board/freescale/mpc837xerdb/pci.c
+++ b/board/freescale/mpc837xerdb/pci.c
@@ -8,6 +8,7 @@
 #include <mpc83xx.h>
 #include <pci.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 static struct pci_region pci_regions[] = {
diff --git a/board/freescale/mpc8541cds/mpc8541cds.c b/board/freescale/mpc8541cds/mpc8541cds.c
index ed71fa4d384..01ecadbae37 100644
--- a/board/freescale/mpc8541cds/mpc8541cds.c
+++ b/board/freescale/mpc8541cds/mpc8541cds.c
@@ -21,6 +21,7 @@
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
+#include <linux/types.h>
 
 #include "../common/cadmus.h"
 #include "../common/eeprom.h"
diff --git a/board/freescale/mpc8544ds/mpc8544ds.c b/board/freescale/mpc8544ds/mpc8544ds.c
index a495e081800..eccf7c198d4 100644
--- a/board/freescale/mpc8544ds/mpc8544ds.c
+++ b/board/freescale/mpc8544ds/mpc8544ds.c
@@ -23,6 +23,7 @@
 #include <fsl_mdio.h>
 #include <tsec.h>
 #include <netdev.h>
+#include <linux/types.h>
 
 #include "../common/sgmii_riser.h"
 
diff --git a/board/freescale/mpc8548cds/mpc8548cds.c b/board/freescale/mpc8548cds/mpc8548cds.c
index 08ac02b4923..03e6b25e79f 100644
--- a/board/freescale/mpc8548cds/mpc8548cds.c
+++ b/board/freescale/mpc8548cds/mpc8548cds.c
@@ -26,6 +26,7 @@
 #include <tsec.h>
 #include <fsl_mdio.h>
 #include <netdev.h>
+#include <linux/types.h>
 
 #include "../common/cadmus.h"
 #include "../common/eeprom.h"
diff --git a/board/freescale/mpc8555cds/mpc8555cds.c b/board/freescale/mpc8555cds/mpc8555cds.c
index e3c96ae162f..d170c04a433 100644
--- a/board/freescale/mpc8555cds/mpc8555cds.c
+++ b/board/freescale/mpc8555cds/mpc8555cds.c
@@ -19,6 +19,7 @@
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
+#include <linux/types.h>
 
 #include "../common/cadmus.h"
 #include "../common/eeprom.h"
diff --git a/board/freescale/mpc8568mds/bcsr.c b/board/freescale/mpc8568mds/bcsr.c
index b1e638af5ae..cbdccebb570 100644
--- a/board/freescale/mpc8568mds/bcsr.c
+++ b/board/freescale/mpc8568mds/bcsr.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <flash.h>
 #include <asm/io.h>
+#include <linux/types.h>
 
 #include "bcsr.h"
 
diff --git a/board/freescale/mpc8568mds/mpc8568mds.c b/board/freescale/mpc8568mds/mpc8568mds.c
index 8ea51e1f236..74530c2e55f 100644
--- a/board/freescale/mpc8568mds/mpc8568mds.c
+++ b/board/freescale/mpc8568mds/mpc8568mds.c
@@ -25,6 +25,7 @@
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
+#include <linux/types.h>
 
 #include "bcsr.h"
 
diff --git a/board/freescale/mpc8569mds/bcsr.c b/board/freescale/mpc8569mds/bcsr.c
index 9ed00f6e5b1..0e373244ad0 100644
--- a/board/freescale/mpc8569mds/bcsr.c
+++ b/board/freescale/mpc8569mds/bcsr.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <flash.h>
 #include <asm/io.h>
+#include <asm/types.h>
 
 #include "bcsr.h"
 
diff --git a/board/freescale/mpc8569mds/mpc8569mds.c b/board/freescale/mpc8569mds/mpc8569mds.c
index 012fd54c3fe..fd1f0e1a72f 100644
--- a/board/freescale/mpc8569mds/mpc8569mds.c
+++ b/board/freescale/mpc8569mds/mpc8569mds.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <console.h>
 #include <flash.h>
 #include <hwconfig.h>
@@ -31,6 +32,7 @@
 #include <fsl_esdhc.h>
 #include <phy.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "bcsr.h"
 #if defined(CONFIG_PQ_MDS_PIB)
diff --git a/board/freescale/mpc8572ds/ddr.c b/board/freescale/mpc8572ds/ddr.c
index 0c4b7d7d621..ee8d806f51c 100644
--- a/board/freescale/mpc8572ds/ddr.c
+++ b/board/freescale/mpc8572ds/ddr.c
@@ -7,6 +7,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
diff --git a/board/freescale/mpc8572ds/mpc8572ds.c b/board/freescale/mpc8572ds/mpc8572ds.c
index c62862f1db0..da93076dd0f 100644
--- a/board/freescale/mpc8572ds/mpc8572ds.c
+++ b/board/freescale/mpc8572ds/mpc8572ds.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <env.h>
 #include <image.h>
 #include <init.h>
@@ -28,6 +29,7 @@
 #include <tsec.h>
 #include <fsl_mdio.h>
 #include <netdev.h>
+#include <linux/types.h>
 
 #include "../common/sgmii_riser.h"
 
diff --git a/board/freescale/mpc8610hpcd/mpc8610hpcd.c b/board/freescale/mpc8610hpcd/mpc8610hpcd.c
index d696e23bc53..687189e4005 100644
--- a/board/freescale/mpc8610hpcd/mpc8610hpcd.c
+++ b/board/freescale/mpc8610hpcd/mpc8610hpcd.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <init.h>
 #include <log.h>
 #include <net.h>
@@ -24,6 +25,7 @@
 #include <fdt_support.h>
 #include <spd_sdram.h>
 #include <netdev.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c b/board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c
index cabb8bab335..e6c3058d784 100644
--- a/board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c
+++ b/board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c
@@ -14,6 +14,7 @@
 #include <stdio.h>
 #include <asm/io.h>
 #include <fsl_diu_fb.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
 #include "../common/pixis.h"
diff --git a/board/freescale/mpc8641hpcn/ddr.c b/board/freescale/mpc8641hpcn/ddr.c
index 8ccac70a30b..66f6ed6c304 100644
--- a/board/freescale/mpc8641hpcn/ddr.c
+++ b/board/freescale/mpc8641hpcn/ddr.c
@@ -7,6 +7,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
diff --git a/board/freescale/mpc8641hpcn/mpc8641hpcn.c b/board/freescale/mpc8641hpcn/mpc8641hpcn.c
index 209c354dda4..450ec18bf20 100644
--- a/board/freescale/mpc8641hpcn/mpc8641hpcn.c
+++ b/board/freescale/mpc8641hpcn/mpc8641hpcn.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <init.h>
 #include <log.h>
 #include <net.h>
@@ -21,6 +22,7 @@
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <netdev.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/mx23evk/spl_boot.c b/board/freescale/mx23evk/spl_boot.c
index b7c67cc6883..c640fed717d 100644
--- a/board/freescale/mx23evk/spl_boot.c
+++ b/board/freescale/mx23evk/spl_boot.c
@@ -13,6 +13,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #define	MUX_CONFIG_SSP1	(MXS_PAD_8MA | MXS_PAD_PULLUP)
 #define	MUX_CONFIG_EMI	(MXS_PAD_3V3 | MXS_PAD_12MA | MXS_PAD_PULLUP)
diff --git a/board/freescale/mx28evk/iomux.c b/board/freescale/mx28evk/iomux.c
index 9a3f88abd36..876325e2792 100644
--- a/board/freescale/mx28evk/iomux.c
+++ b/board/freescale/mx28evk/iomux.c
@@ -13,6 +13,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #define	MUX_CONFIG_SSP0	(MXS_PAD_3V3 | MXS_PAD_8MA | MXS_PAD_PULLUP)
 #define	MUX_CONFIG_GPMI	(MXS_PAD_3V3 | MXS_PAD_4MA | MXS_PAD_NOPULL)
diff --git a/board/freescale/mx51evk/mx51evk.c b/board/freescale/mx51evk/mx51evk.c
index d096948d4d3..aa45e3c7438 100644
--- a/board/freescale/mx51evk/mx51evk.c
+++ b/board/freescale/mx51evk/mx51evk.c
@@ -11,6 +11,7 @@
 #include <asm/gpio.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux-mx51.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/board/freescale/mx53ard/mx53ard.c b/board/freescale/mx53ard/mx53ard.c
index 325f1763976..1460be1fbfe 100644
--- a/board/freescale/mx53ard/mx53ard.c
+++ b/board/freescale/mx53ard/mx53ard.c
@@ -14,6 +14,7 @@
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/iomux-mx53.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <netdev.h>
diff --git a/board/freescale/mx53evk/mx53evk.c b/board/freescale/mx53evk/mx53evk.c
index 1e43ea9cece..36c7d1e86ee 100644
--- a/board/freescale/mx53evk/mx53evk.c
+++ b/board/freescale/mx53evk/mx53evk.c
@@ -13,6 +13,7 @@
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/iomux-mx53.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <asm/mach-imx/boot_mode.h>
diff --git a/board/freescale/mx53loco/mx53loco.c b/board/freescale/mx53loco/mx53loco.c
index 02c6f76d3ab..7c5196a2139 100644
--- a/board/freescale/mx53loco/mx53loco.c
+++ b/board/freescale/mx53loco/mx53loco.c
@@ -17,6 +17,7 @@
 #include <asm/arch/iomux-mx53.h>
 #include <asm/arch/clock.h>
 #include <env.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <asm/mach-imx/mx5_video.h>
diff --git a/board/freescale/mx53smd/mx53smd.c b/board/freescale/mx53smd/mx53smd.c
index 24807f62916..feafcd2c181 100644
--- a/board/freescale/mx53smd/mx53smd.c
+++ b/board/freescale/mx53smd/mx53smd.c
@@ -13,6 +13,7 @@
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/iomux-mx53.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <netdev.h>
diff --git a/board/freescale/mx6memcal/spl.c b/board/freescale/mx6memcal/spl.c
index b7dd87abacb..c4b1ff7e6c3 100644
--- a/board/freescale/mx6memcal/spl.c
+++ b/board/freescale/mx6memcal/spl.c
@@ -19,6 +19,7 @@
 #include <spl.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/mx6qarm2/mx6qarm2.c b/board/freescale/mx6qarm2/mx6qarm2.c
index d2f659d5732..212d3eda9dc 100644
--- a/board/freescale/mx6qarm2/mx6qarm2.c
+++ b/board/freescale/mx6qarm2/mx6qarm2.c
@@ -12,6 +12,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/mx6-pins.h>
 #include <asm/arch/clock.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
diff --git a/board/freescale/mx6sabreauto/mx6sabreauto.c b/board/freescale/mx6sabreauto/mx6sabreauto.c
index 2944220a936..1598f802125 100644
--- a/board/freescale/mx6sabreauto/mx6sabreauto.c
+++ b/board/freescale/mx6sabreauto/mx6sabreauto.c
@@ -36,6 +36,7 @@
 #include <pca953x.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/pfuze100_pmic.h>
 #include "../common/pfuze.h"
diff --git a/board/freescale/mx6sabresd/mx6sabresd.c b/board/freescale/mx6sabresd/mx6sabresd.c
index 6f85ba27724..532be2c8e46 100644
--- a/board/freescale/mx6sabresd/mx6sabresd.c
+++ b/board/freescale/mx6sabresd/mx6sabresd.c
@@ -34,6 +34,7 @@
 #include <input.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/pfuze100_pmic.h>
 #include "../common/pfuze.h"
diff --git a/board/freescale/mx6slevk/mx6slevk.c b/board/freescale/mx6slevk/mx6slevk.c
index da48f7cd674..35f45309a50 100644
--- a/board/freescale/mx6slevk/mx6slevk.c
+++ b/board/freescale/mx6slevk/mx6slevk.c
@@ -29,6 +29,7 @@
 #include <i2c.h>
 #include <mmc.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/pfuze100_pmic.h>
 #include "../common/pfuze.h"
diff --git a/board/freescale/mx6sllevk/mx6sllevk.c b/board/freescale/mx6sllevk/mx6sllevk.c
index 9a696e79929..6a0f7955ecb 100644
--- a/board/freescale/mx6sllevk/mx6sllevk.c
+++ b/board/freescale/mx6sllevk/mx6sllevk.c
@@ -17,6 +17,7 @@
 #include <asm/mach-imx/boot_mode.h>
 #include <asm/io.h>
 #include <common.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
diff --git a/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c b/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c
index 3e0e733bde3..5e2347a9848 100644
--- a/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c
+++ b/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c
@@ -19,6 +19,7 @@
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/mach-imx/boot_mode.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/board/freescale/mx6sxsabresd/mx6sxsabresd.c b/board/freescale/mx6sxsabresd/mx6sxsabresd.c
index 965a3808e73..6423a813ea9 100644
--- a/board/freescale/mx6sxsabresd/mx6sxsabresd.c
+++ b/board/freescale/mx6sxsabresd/mx6sxsabresd.c
@@ -7,6 +7,7 @@
 
 #include <init.h>
 #include <net.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/crm_regs.h>
diff --git a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
index 044d1e97457..751f2aff877 100644
--- a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
+++ b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
@@ -32,6 +32,7 @@
 #include <mmc.h>
 #include <netdev.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/pfuze3000_pmic.h>
 #include "../common/pfuze.h"
diff --git a/board/freescale/p1010rdb/ddr.c b/board/freescale/p1010rdb/ddr.c
index 38c274275bf..cb26005bc43 100644
--- a/board/freescale/p1010rdb/ddr.c
+++ b/board/freescale/p1010rdb/ddr.c
@@ -16,6 +16,7 @@
 #include <asm/fsl_law.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/p1010rdb/p1010rdb.c b/board/freescale/p1010rdb/p1010rdb.c
index a57b564f5ef..397155a9330 100644
--- a/board/freescale/p1010rdb/p1010rdb.c
+++ b/board/freescale/p1010rdb/p1010rdb.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <image.h>
 #include <init.h>
 #include <net.h>
@@ -32,6 +33,7 @@
 #include <hwconfig.h>
 #include <i2c.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/p1010rdb/spl.c b/board/freescale/p1010rdb/spl.c
index a11ec6b0c98..6bfa092f5f3 100644
--- a/board/freescale/p1010rdb/spl.c
+++ b/board/freescale/p1010rdb/spl.c
@@ -19,6 +19,7 @@
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "../common/spl.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/p1010rdb/spl_minimal.c b/board/freescale/p1010rdb/spl_minimal.c
index 4d72665dbb7..aaf58e11ff3 100644
--- a/board/freescale/p1010rdb/spl_minimal.c
+++ b/board/freescale/p1010rdb/spl_minimal.c
@@ -14,6 +14,7 @@
 #include <fsl_ddr_sdram.h>
 #include <asm/fsl_law.h>
 #include <asm/global_data.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/p1023rdb/p1023rdb.c b/board/freescale/p1023rdb/p1023rdb.c
index e7862d18498..8479487b8ae 100644
--- a/board/freescale/p1023rdb/p1023rdb.c
+++ b/board/freescale/p1023rdb/p1023rdb.c
@@ -34,6 +34,7 @@
 #include <miiphy.h>
 #include <phy.h>
 #include <fsl_dtsec.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/p1_p2_rdb_pc/ddr.c b/board/freescale/p1_p2_rdb_pc/ddr.c
index 90ce75a70e3..fa16cbfc1d6 100644
--- a/board/freescale/p1_p2_rdb_pc/ddr.c
+++ b/board/freescale/p1_p2_rdb_pc/ddr.c
@@ -15,6 +15,7 @@
 #include <asm/fsl_law.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_SYS_DDR_RAW_TIMING
 #if	defined(CONFIG_P1020RDB_PROTO) || \
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 7fec510c8ca..9a9cefed14e 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
@@ -27,6 +27,7 @@
 #include <asm/fsl_lbc.h>
 #include <asm/mp.h>
 #include <miiphy.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/board/freescale/p1_p2_rdb_pc/spl.c b/board/freescale/p1_p2_rdb_pc/spl.c
index f69f7fced31..fef2910f4b5 100644
--- a/board/freescale/p1_p2_rdb_pc/spl.c
+++ b/board/freescale/p1_p2_rdb_pc/spl.c
@@ -20,6 +20,7 @@
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "../common/spl.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/p1_p2_rdb_pc/spl_minimal.c b/board/freescale/p1_p2_rdb_pc/spl_minimal.c
index 3079e21d1c1..7f1fbf7a03a 100644
--- a/board/freescale/p1_p2_rdb_pc/spl_minimal.c
+++ b/board/freescale/p1_p2_rdb_pc/spl_minimal.c
@@ -13,6 +13,7 @@
 #include <asm/fsl_law.h>
 #include <fsl_ddr_sdram.h>
 #include <asm/global_data.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/p2041rdb/cpld.c b/board/freescale/p2041rdb/cpld.c
index 4e1254dd134..c668fce0233 100644
--- a/board/freescale/p2041rdb/cpld.c
+++ b/board/freescale/p2041rdb/cpld.c
@@ -16,6 +16,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/string.h>
 
 #include "cpld.h"
diff --git a/board/freescale/p2041rdb/cpld.h b/board/freescale/p2041rdb/cpld.h
index 8c90c1ccf32..b4733fd64f5 100644
--- a/board/freescale/p2041rdb/cpld.h
+++ b/board/freescale/p2041rdb/cpld.h
@@ -10,6 +10,7 @@
 /*
  * CPLD register set. Feel free to add board-specific #ifdefs where necessary.
  */
+#include <asm/types.h>
 typedef struct cpld_data {
 	u8 cpld_ver;		/* 0x0 - CPLD Major Revision Register */
 	u8 cpld_ver_sub;	/* 0x1 - CPLD Minor Revision Register */
diff --git a/board/freescale/p2041rdb/ddr.c b/board/freescale/p2041rdb/ddr.c
index 83dccf90370..a3311abb93e 100644
--- a/board/freescale/p2041rdb/ddr.c
+++ b/board/freescale/p2041rdb/ddr.c
@@ -17,6 +17,7 @@
 #include <asm/fsl_law.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/p2041rdb/eth.c b/board/freescale/p2041rdb/eth.c
index 94b05020050..ce855e8c277 100644
--- a/board/freescale/p2041rdb/eth.c
+++ b/board/freescale/p2041rdb/eth.c
@@ -22,6 +22,7 @@
 #include <fsl_mdio.h>
 #include <malloc.h>
 #include <fsl_dtsec.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 
 #include "cpld.h"
diff --git a/board/freescale/p2041rdb/p2041rdb.c b/board/freescale/p2041rdb/p2041rdb.c
index ca2a8eb9597..afeffb8b66a 100644
--- a/board/freescale/p2041rdb/p2041rdb.c
+++ b/board/freescale/p2041rdb/p2041rdb.c
@@ -12,6 +12,7 @@
 #include <netdev.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/compiler.h>
 #include <asm/mmu.h>
diff --git a/board/freescale/qemu-ppce500/qemu-ppce500.c b/board/freescale/qemu-ppce500/qemu-ppce500.c
index 5c84b404e0e..a98bce8773c 100644
--- a/board/freescale/qemu-ppce500/qemu-ppce500.c
+++ b/board/freescale/qemu-ppce500/qemu-ppce500.c
@@ -28,6 +28,7 @@
 #include <errno.h>
 #include <malloc.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/s32v234evb/clock.c b/board/freescale/s32v234evb/clock.c
index 21c619fa1ad..49159b293b6 100644
--- a/board/freescale/s32v234evb/clock.c
+++ b/board/freescale/s32v234evb/clock.c
@@ -8,6 +8,7 @@
 #include <asm/arch/mc_cgm_regs.h>
 #include <asm/arch/mc_me_regs.h>
 #include <asm/arch/clock.h>
+#include <linux/types.h>
 
 /*
  * Select the clock reference for required pll.
diff --git a/board/freescale/s32v234evb/lpddr2.c b/board/freescale/s32v234evb/lpddr2.c
index b3775d3763e..d41bc10bd15 100644
--- a/board/freescale/s32v234evb/lpddr2.c
+++ b/board/freescale/s32v234evb/lpddr2.c
@@ -8,6 +8,7 @@
 #include <asm/arch/siul.h>
 #include <asm/arch/lpddr2.h>
 #include <asm/arch/mmdc.h>
+#include <linux/types.h>
 
 volatile int mscr_offset_ck0;
 
diff --git a/board/freescale/t102xrdb/cpld.c b/board/freescale/t102xrdb/cpld.c
index 601afbc336d..1b794fbffce 100644
--- a/board/freescale/t102xrdb/cpld.c
+++ b/board/freescale/t102xrdb/cpld.c
@@ -11,6 +11,7 @@
 #include <command.h>
 #include <stdio.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/string.h>
 #include "cpld.h"
 
diff --git a/board/freescale/t102xrdb/cpld.h b/board/freescale/t102xrdb/cpld.h
index c05f536806f..969c20ed1d1 100644
--- a/board/freescale/t102xrdb/cpld.h
+++ b/board/freescale/t102xrdb/cpld.h
@@ -4,6 +4,7 @@
  *
  */
 
+#include <asm/types.h>
 struct cpld_data {
 	u8 cpld_ver;		/* 0x00 - CPLD Major Revision Register */
 	u8 cpld_ver_sub;	/* 0x01 - CPLD Minor Revision Register */
diff --git a/board/freescale/t102xrdb/ddr.c b/board/freescale/t102xrdb/ddr.c
index 856619af2f0..ef98e4ea8b6 100644
--- a/board/freescale/t102xrdb/ddr.c
+++ b/board/freescale/t102xrdb/ddr.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <i2c.h>
 #include <hwconfig.h>
 #include <init.h>
@@ -19,6 +20,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/t102xrdb/eth_t102xrdb.c b/board/freescale/t102xrdb/eth_t102xrdb.c
index 95d49e26f44..a7dd0182aca 100644
--- a/board/freescale/t102xrdb/eth_t102xrdb.c
+++ b/board/freescale/t102xrdb/eth_t102xrdb.c
@@ -25,6 +25,7 @@
 #include <phy.h>
 #include <fsl_dtsec.h>
 #include <asm/fsl_serdes.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include "../common/fman.h"
 
diff --git a/board/freescale/t102xrdb/spl.c b/board/freescale/t102xrdb/spl.c
index 1d8da111668..1bb7f4f7eee 100644
--- a/board/freescale/t102xrdb/spl.c
+++ b/board/freescale/t102xrdb/spl.c
@@ -4,6 +4,7 @@
 
 #include <common.h>
 #include <clock_legacy.h>
+#include <compiler.h>
 #include <console.h>
 #include <env_internal.h>
 #include <init.h>
@@ -18,6 +19,7 @@
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "../common/sleep.h"
 #include "../common/spl.h"
 
diff --git a/board/freescale/t102xrdb/t102xrdb.c b/board/freescale/t102xrdb/t102xrdb.c
index cdecfb08706..f570973609c 100644
--- a/board/freescale/t102xrdb/t102xrdb.c
+++ b/board/freescale/t102xrdb/t102xrdb.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <env.h>
 #include <fdt_support.h>
 #include <i2c.h>
@@ -14,6 +15,7 @@
 #include <netdev.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/compiler.h>
 #include <asm/mmu.h>
diff --git a/board/freescale/t102xrdb/t102xrdb.h b/board/freescale/t102xrdb/t102xrdb.h
index a567ae18dab..b81eebbbc1f 100644
--- a/board/freescale/t102xrdb/t102xrdb.h
+++ b/board/freescale/t102xrdb/t102xrdb.h
@@ -6,6 +6,7 @@
 #ifndef __T1024_RDB_H__
 #define __T1024_RDB_H__
 
+#include <asm/types.h>
 #include <asm/u-boot.h>
 void fdt_fixup_board_enet(void *blob);
 void pci_of_setup(void *blob, struct bd_info *bd);
diff --git a/board/freescale/t104xrdb/cpld.c b/board/freescale/t104xrdb/cpld.c
index c2dfb17a1cf..0a8e1a64e3b 100644
--- a/board/freescale/t104xrdb/cpld.c
+++ b/board/freescale/t104xrdb/cpld.c
@@ -14,6 +14,7 @@
 #include <command.h>
 #include <stdio.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/string.h>
 
 #include "cpld.h"
diff --git a/board/freescale/t104xrdb/cpld.h b/board/freescale/t104xrdb/cpld.h
index a816aef10a4..70015ebc481 100644
--- a/board/freescale/t104xrdb/cpld.h
+++ b/board/freescale/t104xrdb/cpld.h
@@ -9,6 +9,7 @@
 /*
  * CPLD register set. Feel free to add board-specific #ifdefs where necessary.
  */
+#include <asm/types.h>
 struct cpld_data {
 	u8 cpld_ver;		/* 0x00 - CPLD Major Revision Register */
 	u8 cpld_ver_sub;	/* 0x01 - CPLD Minor Revision Register */
diff --git a/board/freescale/t104xrdb/ddr.c b/board/freescale/t104xrdb/ddr.c
index 55493e4bb14..6c68604de0f 100644
--- a/board/freescale/t104xrdb/ddr.c
+++ b/board/freescale/t104xrdb/ddr.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <i2c.h>
 #include <hwconfig.h>
 #include <init.h>
@@ -18,6 +19,7 @@
 #include <asm/mpc85xx_gpio.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 #include "ddr.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/t104xrdb/ddr.h b/board/freescale/t104xrdb/ddr.h
index f9d667f6174..496fe3a8b12 100644
--- a/board/freescale/t104xrdb/ddr.h
+++ b/board/freescale/t104xrdb/ddr.h
@@ -5,6 +5,7 @@
 
 #ifndef __DDR_H__
 #define __DDR_H__
+#include <asm/types.h>
 struct board_specific_parameters {
 	u32 n_ranks;
 	u32 datarate_mhz_high;
diff --git a/board/freescale/t104xrdb/diu.c b/board/freescale/t104xrdb/diu.c
index fe5a1de57d9..43d82619b0c 100644
--- a/board/freescale/t104xrdb/diu.c
+++ b/board/freescale/t104xrdb/diu.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <command.h>
 #include <fsl_diu_fb.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/ctype.h>
 #include <video_fb.h>
diff --git a/board/freescale/t104xrdb/spl.c b/board/freescale/t104xrdb/spl.c
index 4a3f02d10fc..e1a348ed9bd 100644
--- a/board/freescale/t104xrdb/spl.c
+++ b/board/freescale/t104xrdb/spl.c
@@ -18,6 +18,7 @@
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "../common/sleep.h"
 #include "../common/spl.h"
 
diff --git a/board/freescale/t104xrdb/t104xrdb.c b/board/freescale/t104xrdb/t104xrdb.c
index 292c31246c4..9360fdc4d1d 100644
--- a/board/freescale/t104xrdb/t104xrdb.c
+++ b/board/freescale/t104xrdb/t104xrdb.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <env.h>
 #include <fdt_support.h>
 #include <hwconfig.h>
@@ -14,6 +15,7 @@
 #include <netdev.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/compiler.h>
 #include <asm/mmu.h>
diff --git a/board/freescale/t208xqds/ddr.c b/board/freescale/t208xqds/ddr.c
index 49a9b75a4fb..0d7ad4e9db7 100644
--- a/board/freescale/t208xqds/ddr.c
+++ b/board/freescale/t208xqds/ddr.c
@@ -16,6 +16,7 @@
 #include <fsl_ddr_dimm_params.h>
 #include <asm/fsl_law.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 #include "ddr.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/t208xqds/ddr.h b/board/freescale/t208xqds/ddr.h
index 9dd39813bf0..609790c10d3 100644
--- a/board/freescale/t208xqds/ddr.h
+++ b/board/freescale/t208xqds/ddr.h
@@ -5,6 +5,7 @@
 
 #ifndef __DDR_H__
 #define __DDR_H__
+#include <asm/types.h>
 struct board_specific_parameters {
 	u32 n_ranks;
 	u32 datarate_mhz_high;
diff --git a/board/freescale/t208xqds/eth_t208xqds.c b/board/freescale/t208xqds/eth_t208xqds.c
index c2fcbfeedf6..35371cb4f24 100644
--- a/board/freescale/t208xqds/eth_t208xqds.c
+++ b/board/freescale/t208xqds/eth_t208xqds.c
@@ -29,6 +29,7 @@
 #include <fsl_dtsec.h>
 #include <asm/fsl_serdes.h>
 #include <hwconfig.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
 #include "../common/qixis.h"
diff --git a/board/freescale/t208xqds/spl.c b/board/freescale/t208xqds/spl.c
index 7902b746d56..2e7b2e20a44 100644
--- a/board/freescale/t208xqds/spl.c
+++ b/board/freescale/t208xqds/spl.c
@@ -18,6 +18,7 @@
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "../common/qixis.h"
 #include "t208xqds_qixis.h"
 #include "../common/spl.h"
diff --git a/board/freescale/t208xqds/t208xqds.c b/board/freescale/t208xqds/t208xqds.c
index c25b0a72ce5..a20242a0b6c 100644
--- a/board/freescale/t208xqds/t208xqds.c
+++ b/board/freescale/t208xqds/t208xqds.c
@@ -15,6 +15,7 @@
 #include <netdev.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/compiler.h>
 #include <asm/mmu.h>
diff --git a/board/freescale/t208xrdb/cpld.c b/board/freescale/t208xrdb/cpld.c
index cf39623b7ae..5d5ba5dbbd7 100644
--- a/board/freescale/t208xrdb/cpld.c
+++ b/board/freescale/t208xrdb/cpld.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <command.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/string.h>
 #include "cpld.h"
 
diff --git a/board/freescale/t208xrdb/cpld.h b/board/freescale/t208xrdb/cpld.h
index bd6c203742e..39530084aa9 100644
--- a/board/freescale/t208xrdb/cpld.h
+++ b/board/freescale/t208xrdb/cpld.h
@@ -6,6 +6,7 @@
 /*
  * CPLD register set of T2080RDB board-specific.
  */
+#include <asm/types.h>
 struct cpld_data {
 	u8 chip_id1;		/* 0x00 - Chip ID1 register */
 	u8 chip_id2;		/* 0x01 - Chip ID2 register */
diff --git a/board/freescale/t208xrdb/ddr.c b/board/freescale/t208xrdb/ddr.c
index ace941da31b..be9ee0a8419 100644
--- a/board/freescale/t208xrdb/ddr.c
+++ b/board/freescale/t208xrdb/ddr.c
@@ -16,6 +16,7 @@
 #include <fsl_ddr_dimm_params.h>
 #include <asm/fsl_law.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 #include "ddr.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/t208xrdb/ddr.h b/board/freescale/t208xrdb/ddr.h
index c00f1781667..7d23c361af3 100644
--- a/board/freescale/t208xrdb/ddr.h
+++ b/board/freescale/t208xrdb/ddr.h
@@ -5,6 +5,7 @@
 
 #ifndef __DDR_H__
 #define __DDR_H__
+#include <asm/types.h>
 struct board_specific_parameters {
 	u32 n_ranks;
 	u32 datarate_mhz_high;
diff --git a/board/freescale/t208xrdb/eth_t208xrdb.c b/board/freescale/t208xrdb/eth_t208xrdb.c
index fda113f0156..91d52c66b39 100644
--- a/board/freescale/t208xrdb/eth_t208xrdb.c
+++ b/board/freescale/t208xrdb/eth_t208xrdb.c
@@ -25,6 +25,7 @@
 #include <phy.h>
 #include <fsl_dtsec.h>
 #include <asm/fsl_serdes.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 
 int board_eth_init(struct bd_info *bis)
diff --git a/board/freescale/t208xrdb/spl.c b/board/freescale/t208xrdb/spl.c
index 8ef46a09c95..dcf61b455df 100644
--- a/board/freescale/t208xrdb/spl.c
+++ b/board/freescale/t208xrdb/spl.c
@@ -18,6 +18,7 @@
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "../common/spl.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/t208xrdb/t208xrdb.c b/board/freescale/t208xrdb/t208xrdb.c
index bc5152810ef..248912a6a65 100644
--- a/board/freescale/t208xrdb/t208xrdb.c
+++ b/board/freescale/t208xrdb/t208xrdb.c
@@ -13,6 +13,7 @@
 #include <netdev.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/compiler.h>
 #include <asm/mmu.h>
diff --git a/board/freescale/t4rdb/cpld.c b/board/freescale/t4rdb/cpld.c
index 023b39852a7..ab8354bff60 100644
--- a/board/freescale/t4rdb/cpld.c
+++ b/board/freescale/t4rdb/cpld.c
@@ -18,6 +18,7 @@
 #include <command.h>
 #include <stdio.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/string.h>
 
 #include "cpld.h"
diff --git a/board/freescale/t4rdb/cpld.h b/board/freescale/t4rdb/cpld.h
index dc3f9f3c26c..7bbd32ba811 100644
--- a/board/freescale/t4rdb/cpld.h
+++ b/board/freescale/t4rdb/cpld.h
@@ -11,6 +11,7 @@
 /*
  * CPLD register set. Feel free to add board-specific #ifdefs where necessary.
  */
+#include <asm/types.h>
 struct cpld_data {
 	u8 chip_id1;	/* 0x00 - CPLD Chip ID1 Register */
 	u8 chip_id2;	/* 0x01 - CPLD Chip ID2 Register */
diff --git a/board/freescale/t4rdb/ddr.c b/board/freescale/t4rdb/ddr.c
index d478a89e216..9a219a9680d 100644
--- a/board/freescale/t4rdb/ddr.c
+++ b/board/freescale/t4rdb/ddr.c
@@ -16,6 +16,7 @@
 #include <fsl_ddr_dimm_params.h>
 #include <asm/fsl_law.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 #include "ddr.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/t4rdb/ddr.h b/board/freescale/t4rdb/ddr.h
index 74a27796114..0fb8d6faa61 100644
--- a/board/freescale/t4rdb/ddr.h
+++ b/board/freescale/t4rdb/ddr.h
@@ -5,6 +5,7 @@
 
 #ifndef __DDR_H__
 #define __DDR_H__
+#include <asm/types.h>
 struct board_specific_parameters {
 	u32 n_ranks;
 	u32 datarate_mhz_high;
diff --git a/board/freescale/t4rdb/eth.c b/board/freescale/t4rdb/eth.c
index def5e6c8b32..9b09087d732 100644
--- a/board/freescale/t4rdb/eth.c
+++ b/board/freescale/t4rdb/eth.c
@@ -28,6 +28,7 @@
 #include <fsl_dtsec.h>
 #include <asm/fsl_serdes.h>
 #include <hwconfig.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 
 #include "../common/fman.h"
diff --git a/board/freescale/t4rdb/spl.c b/board/freescale/t4rdb/spl.c
index 8ae19d00685..c7da9612d75 100644
--- a/board/freescale/t4rdb/spl.c
+++ b/board/freescale/t4rdb/spl.c
@@ -21,6 +21,7 @@
 #include <i2c.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "t4rdb.h"
 
diff --git a/board/freescale/t4rdb/t4240rdb.c b/board/freescale/t4rdb/t4240rdb.c
index 3cd6eb8e8bb..3afcfc4e302 100644
--- a/board/freescale/t4rdb/t4240rdb.c
+++ b/board/freescale/t4rdb/t4240rdb.c
@@ -13,6 +13,7 @@
 #include <netdev.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/compiler.h>
 #include <asm/mmu.h>
diff --git a/board/friendlyarm/nanopi2/board.c b/board/friendlyarm/nanopi2/board.c
index c9c9beb86c7..7e300bcf2a6 100644
--- a/board/friendlyarm/nanopi2/board.c
+++ b/board/friendlyarm/nanopi2/board.c
@@ -15,6 +15,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include <asm/arch/nexell.h>
 #include <asm/arch/nx_gpio.h>
diff --git a/board/friendlyarm/nanopi2/hwrev.c b/board/friendlyarm/nanopi2/hwrev.c
index b1e23a48a80..61a07dc6547 100644
--- a/board/friendlyarm/nanopi2/hwrev.c
+++ b/board/friendlyarm/nanopi2/hwrev.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <i2c.h>
 #include <asm/io.h>
+#include <asm/types.h>
 
 #include <asm/arch/nexell.h>
 #include <asm/arch/nx_gpio.h>
diff --git a/board/friendlyarm/nanopi2/hwrev.h b/board/friendlyarm/nanopi2/hwrev.h
index 1b1a828afb3..7bb43bbfe4a 100644
--- a/board/friendlyarm/nanopi2/hwrev.h
+++ b/board/friendlyarm/nanopi2/hwrev.h
@@ -7,6 +7,7 @@
 #ifndef __BD_HW_REV_H__
 #define __BD_HW_REV_H__
 
+#include <asm/types.h>
 extern void bd_hwrev_init(void);
 extern void bd_base_rev_init(void);
 extern u32 get_board_rev(void);
diff --git a/board/gardena/smart-gateway-mt7688/board.c b/board/gardena/smart-gateway-mt7688/board.c
index 75677b11dd2..03a69882e30 100644
--- a/board/gardena/smart-gateway-mt7688/board.c
+++ b/board/gardena/smart-gateway-mt7688/board.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <env.h>
 #include <env_internal.h>
 #include <flash.h>
@@ -18,6 +19,7 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <asm/types.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 8e3c3e1ad7a..66ee4f1edcd 100644
--- a/board/gateworks/gw_ventana/common.c
+++ b/board/gateworks/gw_ventana/common.c
@@ -20,6 +20,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/ltc3676_pmic.h>
 #include <power/pfuze100_pmic.h>
diff --git a/board/gateworks/gw_ventana/eeprom.c b/board/gateworks/gw_ventana/eeprom.c
index 7d6509be77b..aeec4d2955e 100644
--- a/board/gateworks/gw_ventana/eeprom.c
+++ b/board/gateworks/gw_ventana/eeprom.c
@@ -14,6 +14,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/bitops.h>
+#include <asm/types.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 d98fa4bf2ee..d00cdf644f3 100644
--- a/board/gateworks/gw_ventana/gsc.c
+++ b/board/gateworks/gw_ventana/gsc.c
@@ -16,6 +16,7 @@
 #include <i2c.h>
 #include <linux/ctype.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "ventana_eeprom.h"
 #include "gsc.h"
diff --git a/board/gateworks/gw_ventana/gsc.h b/board/gateworks/gw_ventana/gsc.h
index 6dcaafadf37..51128416ab9 100644
--- a/board/gateworks/gw_ventana/gsc.h
+++ b/board/gateworks/gw_ventana/gsc.h
@@ -8,6 +8,7 @@
 #ifndef __ASSEMBLY__
 
 /* i2c slave addresses */
+#include <linux/types.h>
 #define GSC_SC_ADDR		0x20
 #define GSC_RTC_ADDR		0x68
 #define GSC_HWMON_ADDR		0x29
diff --git a/board/gateworks/gw_ventana/gw_ventana.c b/board/gateworks/gw_ventana/gw_ventana.c
index fe6a7efe3e3..bcb7d0edbd2 100644
--- a/board/gateworks/gw_ventana/gw_ventana.c
+++ b/board/gateworks/gw_ventana/gw_ventana.c
@@ -44,6 +44,7 @@
 #include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/ltc3676_pmic.h>
 #include <power/pfuze100_pmic.h>
diff --git a/board/gateworks/gw_ventana/gw_ventana_spl.c b/board/gateworks/gw_ventana/gw_ventana_spl.c
index 8cb3b479b70..766c5d51f41 100644
--- a/board/gateworks/gw_ventana/gw_ventana_spl.c
+++ b/board/gateworks/gw_ventana/gw_ventana_spl.c
@@ -22,6 +22,7 @@
 #include <i2c.h>
 #include <spl.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 #include "gsc.h"
 #include "common.h"
diff --git a/board/gateworks/gw_ventana/ventana_eeprom.h b/board/gateworks/gw_ventana/ventana_eeprom.h
index 4fa085b320c..61bfeb2b490 100644
--- a/board/gateworks/gw_ventana/ventana_eeprom.h
+++ b/board/gateworks/gw_ventana/ventana_eeprom.h
@@ -6,6 +6,7 @@
 #ifndef _VENTANA_EEPROM_
 #define _VENTANA_EEPROM_
 
+#include <asm/types.h>
 struct ventana_board_info {
 	u8 mac0[6];          /* 0x00: MAC1 */
 	u8 mac1[6];          /* 0x06: MAC2 */
diff --git a/board/gdsys/a38x/controlcenterdc.c b/board/gdsys/a38x/controlcenterdc.c
index 241a36f7a59..ba967b5d7da 100644
--- a/board/gdsys/a38x/controlcenterdc.c
+++ b/board/gdsys/a38x/controlcenterdc.c
@@ -20,6 +20,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include "../drivers/ddr/marvell/a38x/ddr3_init.h"
 #include "../arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec.h"
diff --git a/board/gdsys/a38x/dt_helpers.c b/board/gdsys/a38x/dt_helpers.c
index 23525b7ed52..0ff146c1713 100644
--- a/board/gdsys/a38x/dt_helpers.c
+++ b/board/gdsys/a38x/dt_helpers.c
@@ -10,6 +10,7 @@
 #include <stdbool.h>
 #include <asm-generic/gpio.h>
 #include <dm.h>
+#include <linux/types.h>
 
 int fdt_disable_by_ofname(void *rw_fdt_blob, char *ofname)
 {
diff --git a/board/gdsys/a38x/dt_helpers.h b/board/gdsys/a38x/dt_helpers.h
index 30dbf298b69..bdd19c9c271 100644
--- a/board/gdsys/a38x/dt_helpers.h
+++ b/board/gdsys/a38x/dt_helpers.h
@@ -8,6 +8,7 @@
 #define __DT_HELPERS_H
 
 #include <stdbool.h>
+#include <linux/types.h>
 int fdt_disable_by_ofname(void *rw_fdt_blob, char *ofname);
 bool dm_i2c_simple_probe(struct udevice *bus, uint chip_addr);
 int request_gpio_by_name(struct gpio_desc *gpio, const char *gpio_dev_name,
diff --git a/board/gdsys/a38x/hre.c b/board/gdsys/a38x/hre.c
index 93d8045d53b..aaa5b2bdb0f 100644
--- a/board/gdsys/a38x/hre.c
+++ b/board/gdsys/a38x/hre.c
@@ -10,10 +10,12 @@
 #include <fs.h>
 #include <i2c.h>
 #include <mmc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <tpm-v1.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <u-boot/crc.h>
 #include <u-boot/sha1.h>
 #include <asm/byteorder.h>
diff --git a/board/gdsys/a38x/hre.h b/board/gdsys/a38x/hre.h
index 154a02761dc..b4b6f3c04e1 100644
--- a/board/gdsys/a38x/hre.h
+++ b/board/gdsys/a38x/hre.h
@@ -8,6 +8,7 @@
 #define __HRE_H
 
 #include <stdbool.h>
+#include <linux/types.h>
 struct key_program {
 	uint32_t magic;
 	uint32_t code_crc;
diff --git a/board/gdsys/a38x/hydra.c b/board/gdsys/a38x/hydra.c
index bd66cd52b86..902b3714ec2 100644
--- a/board/gdsys/a38x/hydra.c
+++ b/board/gdsys/a38x/hydra.c
@@ -1,9 +1,11 @@
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <console.h> /* ctrlc */
 #include <pci.h>
 #include <stdio.h>
 #include <asm/io.h>
+#include <linux/types.h>
 
 #include "hydra.h"
 
diff --git a/board/gdsys/a38x/hydra.h b/board/gdsys/a38x/hydra.h
index 26562a560a0..8aec2cf513b 100644
--- a/board/gdsys/a38x/hydra.h
+++ b/board/gdsys/a38x/hydra.h
@@ -1,3 +1,4 @@
+#include <linux/types.h>
 struct ihs_fpga {
 	u32 reflection_low;		/* 0x0000 */
 	u32 versions;			/* 0x0004 */
diff --git a/board/gdsys/a38x/ihs_phys.c b/board/gdsys/a38x/ihs_phys.c
index c784421a701..ddbeb22d7d4 100644
--- a/board/gdsys/a38x/ihs_phys.c
+++ b/board/gdsys/a38x/ihs_phys.c
@@ -1,6 +1,7 @@
 #include <common.h>
 #include <dm.h>
 #include <miiphy.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm-generic/gpio.h>
@@ -9,6 +10,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "ihs_phys.h"
 #include "dt_helpers.h"
diff --git a/board/gdsys/a38x/ihs_phys.h b/board/gdsys/a38x/ihs_phys.h
index c4bec4d46c0..37ec758ffd3 100644
--- a/board/gdsys/a38x/ihs_phys.h
+++ b/board/gdsys/a38x/ihs_phys.h
@@ -1,2 +1,3 @@
+#include <linux/types.h>
 uint calculate_octo_phy_mask(void);
 int init_octo_phys(uint octo_phy_mask);
diff --git a/board/gdsys/a38x/keyprogram.c b/board/gdsys/a38x/keyprogram.c
index be41844dcf1..70ed70eaeef 100644
--- a/board/gdsys/a38x/keyprogram.c
+++ b/board/gdsys/a38x/keyprogram.c
@@ -13,6 +13,7 @@
 #include <linux/ctype.h>
 #include <asm/unaligned.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "hre.h"
 
diff --git a/board/gdsys/a38x/spl.c b/board/gdsys/a38x/spl.c
index a06acd64f9f..552c60a8edb 100644
--- a/board/gdsys/a38x/spl.c
+++ b/board/gdsys/a38x/spl.c
@@ -8,6 +8,7 @@
 #include <config.h>
 #include <stdio.h>
 #include <asm/arch/cpu.h>
+#include <asm/types.h>
 
 void spl_board_init(void)
 {
diff --git a/board/gdsys/common/cmd_ioloop.c b/board/gdsys/common/cmd_ioloop.c
index 881f2cc7bf2..5a3ffa21735 100644
--- a/board/gdsys/common/cmd_ioloop.c
+++ b/board/gdsys/common/cmd_ioloop.c
@@ -6,12 +6,14 @@
 
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <console.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <gdsys_fpga.h>
 
diff --git a/board/gdsys/common/dp501.c b/board/gdsys/common/dp501.c
index 55be6bc2957..38938cc767c 100644
--- a/board/gdsys/common/dp501.c
+++ b/board/gdsys/common/dp501.c
@@ -23,6 +23,7 @@ int dp501_i2c[] = CONFIG_SYS_DP501_I2C;
 int dp501_base[] = CONFIG_SYS_DP501_BASE;
 #endif
 
+#include <linux/types.h>
 static void dp501_setbits(u8 addr, u8 reg, u8 mask)
 {
 	u8 val;
diff --git a/board/gdsys/common/dp501.h b/board/gdsys/common/dp501.h
index 9f3238638f1..3eb8b113459 100644
--- a/board/gdsys/common/dp501.h
+++ b/board/gdsys/common/dp501.h
@@ -25,6 +25,7 @@
 #define _DP501_H_
 
 #include <stdbool.h>
+#include <asm/types.h>
 void dp501_powerup(u8 addr);
 void dp501_powerdown(u8 addr);
 int dp501_probe(unsigned screen, bool power);
diff --git a/board/gdsys/common/fanctrl.h b/board/gdsys/common/fanctrl.h
index ab7e58def5a..e246b5d304f 100644
--- a/board/gdsys/common/fanctrl.h
+++ b/board/gdsys/common/fanctrl.h
@@ -7,6 +7,7 @@
 #ifndef _FANCTRL_H_
 #define _FANCTRL_H_
 
+#include <asm/types.h>
 void init_fan_controller(u8 addr);
 
 #endif
diff --git a/board/gdsys/common/ihs_mdio.c b/board/gdsys/common/ihs_mdio.c
index ea91d767d5b..6dc057ccca8 100644
--- a/board/gdsys/common/ihs_mdio.c
+++ b/board/gdsys/common/ihs_mdio.c
@@ -8,6 +8,7 @@
 #include <stdio.h>
 #include <linux/delay.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <miiphy.h>
 #ifdef CONFIG_GDSYS_LEGACY_DRIVERS
diff --git a/board/gdsys/common/ihs_mdio.h b/board/gdsys/common/ihs_mdio.h
index d0a4b0d7a88..7fd07f6c974 100644
--- a/board/gdsys/common/ihs_mdio.h
+++ b/board/gdsys/common/ihs_mdio.h
@@ -7,6 +7,7 @@
 #ifndef _IHS_MDIO_H_
 #define _IHS_MDIO_H_
 
+#include <asm/types.h>
 struct ihs_mdio_info {
 #ifdef CONFIG_GDSYS_LEGACY_DRIVERS
 	u32 fpga;
diff --git a/board/gdsys/common/ioep-fpga.c b/board/gdsys/common/ioep-fpga.c
index 115f10c30c7..d8d6df75643 100644
--- a/board/gdsys/common/ioep-fpga.c
+++ b/board/gdsys/common/ioep-fpga.c
@@ -384,6 +384,7 @@ static int get_features(unsigned int fpga, struct fpga_features *features)
 	u16 raw_extended_features;
 #endif
 
+#include <asm/types.h>
 	memset(features, 0, sizeof(struct fpga_features));
 
 	FPGA_GET_REG(fpga, fpga_features, &raw_features);
diff --git a/board/gdsys/common/mclink.h b/board/gdsys/common/mclink.h
index 4dc40588924..6baf8e1d0f5 100644
--- a/board/gdsys/common/mclink.h
+++ b/board/gdsys/common/mclink.h
@@ -7,6 +7,7 @@
 #ifndef _MCLINK_H_
 #define _MCLINK_H_
 
+#include <asm/types.h>
 int mclink_probe(void);
 int mclink_send(u8 slave, u16 addr, u16 data);
 int mclink_receive(u8 slave, u16 addr, u16 *data);
diff --git a/board/gdsys/common/osd.c b/board/gdsys/common/osd.c
index a43031d513d..d435d1e23c8 100644
--- a/board/gdsys/common/osd.c
+++ b/board/gdsys/common/osd.c
@@ -67,6 +67,7 @@
 
 unsigned int base_width;
 unsigned int base_height;
+#include <linux/types.h>
 size_t bufsize;
 u16 *buf;
 
diff --git a/board/gdsys/common/osd_cmd.c b/board/gdsys/common/osd_cmd.c
index e306d7e82fe..cca6cb02c54 100644
--- a/board/gdsys/common/osd_cmd.c
+++ b/board/gdsys/common/osd_cmd.c
@@ -18,6 +18,7 @@
 #include <malloc.h>
 #include <vsprintf.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static int do_osd_write(struct cmd_tbl *cmdtp, int flag, int argc,
 			char *const argv[])
diff --git a/board/gdsys/common/phy.c b/board/gdsys/common/phy.c
index cfa681c2e19..d3fd3541440 100644
--- a/board/gdsys/common/phy.c
+++ b/board/gdsys/common/phy.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <stdio.h>
 #include <time.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 
 #include <miiphy.h>
diff --git a/board/gdsys/mpc8308/hrcon.c b/board/gdsys/mpc8308/hrcon.c
index 1d21d13e4c9..177cfb29d9c 100644
--- a/board/gdsys/mpc8308/hrcon.c
+++ b/board/gdsys/mpc8308/hrcon.c
@@ -11,6 +11,7 @@
 #include <i2c.h>
 #include <init.h>
 #include <spi.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
@@ -26,6 +27,7 @@
 #include <asm/fsl_serdes.h>
 #include <asm/fsl_mpc83xx_serdes.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "mpc8308.h"
 
diff --git a/board/gdsys/mpc8308/mpc8308.c b/board/gdsys/mpc8308/mpc8308.c
index 0f90f8ad327..702f8084f9b 100644
--- a/board/gdsys/mpc8308/mpc8308.c
+++ b/board/gdsys/mpc8308/mpc8308.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 #include "mpc8308.h"
 #include <gdsys_fpga.h>
diff --git a/board/gdsys/mpc8308/mpc8308.h b/board/gdsys/mpc8308/mpc8308.h
index 1e4f24fb2ae..dfd3160f145 100644
--- a/board/gdsys/mpc8308/mpc8308.h
+++ b/board/gdsys/mpc8308/mpc8308.h
@@ -1,6 +1,7 @@
 #ifndef __MPC8308_H_
 #define __MPC8308_H_
 
+#include <asm/types.h>
 void setbits_gpio0_out(u32 mask);
 void clrbits_gpio0_out(u32 mask);
 
diff --git a/board/gdsys/mpc8308/strider.c b/board/gdsys/mpc8308/strider.c
index 5df68fdd6ca..f0d23ff538a 100644
--- a/board/gdsys/mpc8308/strider.c
+++ b/board/gdsys/mpc8308/strider.c
@@ -11,6 +11,7 @@
 #include <i2c.h>
 #include <init.h>
 #include <spi.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
@@ -26,6 +27,7 @@
 #include <asm/fsl_serdes.h>
 #include <asm/fsl_mpc83xx_serdes.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "mpc8308.h"
 
diff --git a/board/gdsys/p1022/controlcenterd-id.c b/board/gdsys/p1022/controlcenterd-id.c
index 713cb6456e8..56b63d6b23f 100644
--- a/board/gdsys/p1022/controlcenterd-id.c
+++ b/board/gdsys/p1022/controlcenterd-id.c
@@ -4,6 +4,8 @@
  * Reinhard Pfau, Guntermann & Drunck GmbH, reinhard.pfau at gdsys.cc
  */
 
+#include <stdbool.h>
+#include <linux/types.h>
 /* TODO: some more #ifdef's to avoid unneeded code for stage 1 / stage 2 */
 
 #ifdef CCDM_ID_DEBUG
diff --git a/board/gdsys/p1022/controlcenterd.c b/board/gdsys/p1022/controlcenterd.c
index 619e8073253..4161f55c897 100644
--- a/board/gdsys/p1022/controlcenterd.c
+++ b/board/gdsys/p1022/controlcenterd.c
@@ -37,6 +37,7 @@
 #include <fsl_ddr_sdram.h>
 #include <asm/fsl_serdes.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
diff --git a/board/gdsys/p1022/ddr.c b/board/gdsys/p1022/ddr.c
index 1ed8b9ff283..9b4c97987d1 100644
--- a/board/gdsys/p1022/ddr.c
+++ b/board/gdsys/p1022/ddr.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <stdio.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
diff --git a/board/gdsys/p1022/diu.c b/board/gdsys/p1022/diu.c
index 8af03534c81..574e522f6ea 100644
--- a/board/gdsys/p1022/diu.c
+++ b/board/gdsys/p1022/diu.c
@@ -11,6 +11,7 @@
 #include <command.h>
 #include <log.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/ctype.h>
 #include <asm/io.h>
diff --git a/board/gdsys/p1022/sdhc_boot.c b/board/gdsys/p1022/sdhc_boot.c
index 6a4a6ef6af2..2211c7b7f5e 100644
--- a/board/gdsys/p1022/sdhc_boot.c
+++ b/board/gdsys/p1022/sdhc_boot.c
@@ -23,6 +23,7 @@
 #include <common.h>
 #include <mmc.h>
 #include <malloc.h>
+#include <asm/types.h>
 
 /*
  * The environment variables are written to just after the u-boot image
diff --git a/board/ge/bx50v3/bx50v3.c b/board/ge/bx50v3/bx50v3.c
index a4ade1a9419..387229691dc 100644
--- a/board/ge/bx50v3/bx50v3.c
+++ b/board/ge/bx50v3/bx50v3.c
@@ -7,6 +7,7 @@
 
 #include <image.h>
 #include <init.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/arch/clock.h>
@@ -34,6 +35,7 @@
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <power/regulator.h>
 #include <power/da9063_pmic.h>
 #include <input.h>
diff --git a/board/ge/common/ge_common.c b/board/ge/common/ge_common.c
index 4885c997929..6fd4e87f677 100644
--- a/board/ge/common/ge_common.c
+++ b/board/ge/common/ge_common.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <env.h>
+#include <asm/types.h>
 #include <dm/uclass.h>
 #include <rtc.h>
 #include <linux/errno.h>
diff --git a/board/ge/common/vpd_reader.c b/board/ge/common/vpd_reader.c
index cdf96802d9e..0937a4b3a8d 100644
--- a/board/ge/common/vpd_reader.c
+++ b/board/ge/common/vpd_reader.c
@@ -12,6 +12,7 @@
 #include <dm/uclass.h>
 #include <linux/bch.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include "vpd_reader.h"
 
 /* BCH configuration */
diff --git a/board/ge/common/vpd_reader.h b/board/ge/common/vpd_reader.h
index 2c1028bfbe2..d3ee4f9e301 100644
--- a/board/ge/common/vpd_reader.h
+++ b/board/ge/common/vpd_reader.h
@@ -3,6 +3,7 @@
  * Copyright 2016 General Electric Company
  */
 
+#include <linux/types.h>
 struct vpd_cache;
 
 /*
diff --git a/board/ge/mx53ppd/mx53ppd.c b/board/ge/mx53ppd/mx53ppd.c
index bf813303ed4..8959b61d6af 100644
--- a/board/ge/mx53ppd/mx53ppd.c
+++ b/board/ge/mx53ppd/mx53ppd.c
@@ -32,6 +32,7 @@
 #include <fsl_esdhc_imx.h>
 #include <asm/gpio.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <dialog_pmic.h>
 #include <fsl_pmic.h>
diff --git a/board/ge/mx53ppd/mx53ppd_video.c b/board/ge/mx53ppd/mx53ppd_video.c
index cf56983925f..792f5896e10 100644
--- a/board/ge/mx53ppd/mx53ppd_video.c
+++ b/board/ge/mx53ppd/mx53ppd_video.c
@@ -21,6 +21,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/io.h>
 #include <panel.h>
+#include <linux/types.h>
 
 static int detect_lcd(struct display_info_t const *dev)
 {
diff --git a/board/google/imx8mq_phanbell/spl.c b/board/google/imx8mq_phanbell/spl.c
index d309a72a52d..379ee57c651 100644
--- a/board/google/imx8mq_phanbell/spl.c
+++ b/board/google/imx8mq_phanbell/spl.c
@@ -29,6 +29,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/grinn/chiliboard/board.c b/board/grinn/chiliboard/board.c
index 7c86fe864df..7594d70a3bf 100644
--- a/board/grinn/chiliboard/board.c
+++ b/board/grinn/chiliboard/board.c
@@ -26,6 +26,7 @@
 #include <spl.h>
 #include <watchdog.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/grinn/liteboard/board.c b/board/grinn/liteboard/board.c
index 986fbd6ef37..449a323847b 100644
--- a/board/grinn/liteboard/board.c
+++ b/board/grinn/liteboard/board.c
@@ -34,6 +34,7 @@
 #include <netdev.h>
 #include <spl.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/highbank/ahci.c b/board/highbank/ahci.c
index 9c057278ace..f2dd9a01e27 100644
--- a/board/highbank/ahci.c
+++ b/board/highbank/ahci.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <ahci.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 #define CPHY_MAP(dev, addr) ((((dev) & 0x1f) << 7) | (((addr) >> 9) & 0x7f))
diff --git a/board/highbank/highbank.c b/board/highbank/highbank.c
index 144193f4455..bf7859d2a7a 100644
--- a/board/highbank/highbank.c
+++ b/board/highbank/highbank.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <ahci.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <env.h>
 #include <fdt_support.h>
@@ -15,6 +16,7 @@
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 #include <linux/sizes.h>
 #include <asm/io.h>
diff --git a/board/hisilicon/hikey/hikey.c b/board/hisilicon/hikey/hikey.c
index 5525ec91872..bc6c559a789 100644
--- a/board/hisilicon/hikey/hikey.c
+++ b/board/hisilicon/hikey/hikey.c
@@ -19,6 +19,7 @@
 #include <asm/io.h>
 #include <usb.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 #include <power/hi6553_pmic.h>
 #include <asm-generic/gpio.h>
 #include <asm/arch/dwmmc.h>
diff --git a/board/hisilicon/hikey960/hikey960.c b/board/hisilicon/hikey960/hikey960.c
index 256b951586e..4e2f932208f 100644
--- a/board/hisilicon/hikey960/hikey960.c
+++ b/board/hisilicon/hikey960/hikey960.c
@@ -20,6 +20,7 @@
 #include <linux/arm-smccc.h>
 #include <linux/delay.h>
 #include <linux/psci.h>
+#include <linux/types.h>
 
 #define PMIC_REG_TO_BUS_ADDR(x) (x << 2)
 #define PMIC_VSEL_MASK		0x7
diff --git a/board/hisilicon/poplar/poplar.c b/board/hisilicon/poplar/poplar.c
index 9137b800f7f..7db5de0ce98 100644
--- a/board/hisilicon/poplar/poplar.c
+++ b/board/hisilicon/poplar/poplar.c
@@ -19,6 +19,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/ids/ids8313/ids8313.c b/board/ids/ids8313/ids8313.c
index 7ceb6d3d04b..c801278fa1f 100644
--- a/board/ids/ids8313/ids8313.c
+++ b/board/ids/ids8313/ids8313.c
@@ -19,6 +19,7 @@
 #include <stdio.h>
 #include <asm/bitops.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/board/imgtec/boston/checkboard.c b/board/imgtec/boston/checkboard.c
index 9d3a90282a0..a8462ab0ae3 100644
--- a/board/imgtec/boston/checkboard.c
+++ b/board/imgtec/boston/checkboard.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <init.h>
 #include <stdio.h>
+#include <linux/types.h>
 
 #include <asm/io.h>
 #include <asm/mipsregs.h>
diff --git a/board/imgtec/boston/ddr.c b/board/imgtec/boston/ddr.c
index 6ece140774e..5ceb7eb68df 100644
--- a/board/imgtec/boston/ddr.c
+++ b/board/imgtec/boston/ddr.c
@@ -8,6 +8,7 @@
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include <asm/io.h>
 
diff --git a/board/imgtec/ci20/ci20.c b/board/imgtec/ci20/ci20.c
index 11f140f172e..8aa910998c3 100644
--- a/board/imgtec/ci20/ci20.c
+++ b/board/imgtec/ci20/ci20.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <env.h>
 #include <init.h>
 #include <net.h>
@@ -15,6 +16,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/board/imgtec/malta/malta.c b/board/imgtec/malta/malta.c
index dd64f9dffa9..3b60400be7e 100644
--- a/board/imgtec/malta/malta.c
+++ b/board/imgtec/malta/malta.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <ide.h>
 #include <init.h>
 #include <net.h>
@@ -20,6 +21,7 @@
 #include <linux/delay.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <asm/addrspace.h>
 #include <asm/io.h>
diff --git a/board/imgtec/malta/superio.c b/board/imgtec/malta/superio.c
index cb5e0589a71..c5550f1b599 100644
--- a/board/imgtec/malta/superio.c
+++ b/board/imgtec/malta/superio.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 
 #define SIO_CONF_PORT		0x3f0
diff --git a/board/intel/edison/edison.c b/board/intel/edison/edison.c
index 755162070cd..e9fdad0c6fc 100644
--- a/board/intel/edison/edison.c
+++ b/board/intel/edison/edison.c
@@ -9,6 +9,7 @@
 #include <mmc.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <u-boot/md5.h>
 #include <usb.h>
diff --git a/board/intel/galileo/galileo.c b/board/intel/galileo/galileo.c
index 720350d0f7f..c4b0e97bb9f 100644
--- a/board/intel/galileo/galileo.c
+++ b/board/intel/galileo/galileo.c
@@ -7,6 +7,7 @@
 #include <asm/io.h>
 #include <asm/arch/device.h>
 #include <asm/arch/quark.h>
+#include <asm/types.h>
 
 /*
  * Intel Galileo gen2 board uses GPIO Resume Well bank pin0 as the PERST# pin.
diff --git a/board/inversepath/usbarmory/usbarmory.c b/board/inversepath/usbarmory/usbarmory.c
index 1028f97ff3a..bd35784d26a 100644
--- a/board/inversepath/usbarmory/usbarmory.c
+++ b/board/inversepath/usbarmory/usbarmory.c
@@ -27,6 +27,7 @@
 #include <fsl_esdhc_imx.h>
 #include <asm/gpio.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/iomega/iconnect/iconnect.c b/board/iomega/iconnect/iconnect.c
index 1bafcb977e1..15b1b093925 100644
--- a/board/iomega/iconnect/iconnect.c
+++ b/board/iomega/iconnect/iconnect.c
@@ -12,6 +12,7 @@
 #include <asm/arch/soc.h>
 #include <asm/arch/mpp.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include "iconnect.h"
 
diff --git a/board/is1/qts/pinmux_config.h b/board/is1/qts/pinmux_config.h
index bf79975b918..3deeac12a5e 100644
--- a/board/is1/qts/pinmux_config.h
+++ b/board/is1/qts/pinmux_config.h
@@ -6,6 +6,7 @@
 #ifndef __SOCFPGA_PINMUX_CONFIG_H__
 #define __SOCFPGA_PINMUX_CONFIG_H__
 
+#include <asm/types.h>
 const u8 sys_mgr_init_table[] = {
 	0, /* EMACIO0 */
 	2, /* EMACIO1 */
diff --git a/board/is1/qts/sdram_config.h b/board/is1/qts/sdram_config.h
index 2573171abeb..c45660729d0 100644
--- a/board/is1/qts/sdram_config.h
+++ b/board/is1/qts/sdram_config.h
@@ -7,6 +7,7 @@
 #define __SOCFPGA_SDRAM_CONFIG_H__
 
 /* SDRAM configuration */
+#include <asm/types.h>
 #define CONFIG_HPS_SDR_CTRLCFG_CPORTRDWR_CPORTRDWR		0x5A56A
 #define CONFIG_HPS_SDR_CTRLCFG_CPORTRMAP_CPORTRMAP		0xB00088
 #define CONFIG_HPS_SDR_CTRLCFG_CPORTWIDTH_CPORTWIDTH		0x44555
diff --git a/board/isee/igep003x/board.c b/board/isee/igep003x/board.c
index 2f53925a9cf..2e0bf59d31a 100644
--- a/board/isee/igep003x/board.c
+++ b/board/isee/igep003x/board.c
@@ -34,6 +34,7 @@
 #include <asm/u-boot.h>
 #include <jffs2/load_kernel.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include "board.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/isee/igep00x0/igep00x0.c b/board/isee/igep00x0/igep00x0.c
index 3167b5c097f..91e8ead3d95 100644
--- a/board/isee/igep00x0/igep00x0.c
+++ b/board/isee/igep00x0/igep00x0.c
@@ -21,6 +21,7 @@
 #include <asm/arch/mmc_host_def.h>
 #include <asm/arch/mux.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
diff --git a/board/k+p/kp_imx53/kp_id_rev.c b/board/k+p/kp_imx53/kp_id_rev.c
index 387c2271046..eca81f8b2b0 100644
--- a/board/k+p/kp_imx53/kp_id_rev.c
+++ b/board/k+p/kp_imx53/kp_id_rev.c
@@ -15,6 +15,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "kp_id_rev.h"
 #include <net.h>
 
diff --git a/board/k+p/kp_imx53/kp_id_rev.h b/board/k+p/kp_imx53/kp_id_rev.h
index aa64173926c..6fe29fdefed 100644
--- a/board/k+p/kp_imx53/kp_id_rev.h
+++ b/board/k+p/kp_imx53/kp_id_rev.h
@@ -12,6 +12,8 @@
 #ifndef __KP_ID_REV_H_
 #define __KP_ID_REV_H_
 
+#include <compiler.h>
+#include <asm/types.h>
 struct id_eeprom {
 	u8 hrcw_primary[0x20];
 	u8 mac[6];              /* 0x20 ... 0x25 */
diff --git a/board/k+p/kp_imx53/kp_imx53.c b/board/k+p/kp_imx53/kp_imx53.c
index 662fd1f24b2..9265ffa8ccb 100644
--- a/board/k+p/kp_imx53/kp_imx53.c
+++ b/board/k+p/kp_imx53/kp_imx53.c
@@ -17,6 +17,7 @@
 #include <asm/arch/clock.h>
 #include <asm/gpio.h>
 #include <env.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <power/pmic.h>
 #include <fsl_pmic.h>
diff --git a/board/k+p/kp_imx6q_tpc/kp_imx6q_tpc_spl.c b/board/k+p/kp_imx6q_tpc/kp_imx6q_tpc_spl.c
index bee4c398585..b51f4355386 100644
--- a/board/k+p/kp_imx6q_tpc/kp_imx6q_tpc_spl.c
+++ b/board/k+p/kp_imx6q_tpc/kp_imx6q_tpc_spl.c
@@ -21,6 +21,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/keymile/common/common.c b/board/keymile/common/common.c
index d87c0ac8f15..df6f15142a9 100644
--- a/board/keymile/common/common.c
+++ b/board/keymile/common/common.c
@@ -23,6 +23,7 @@
 #include <linux/ctype.h>
 #include <linux/delay.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #if defined(CONFIG_POST)
 #include "post.h"
diff --git a/board/keymile/common/common.h b/board/keymile/common/common.h
index 8251de4db8f..fa7796fc639 100644
--- a/board/keymile/common/common.h
+++ b/board/keymile/common/common.h
@@ -7,6 +7,7 @@
 #ifndef __KEYMILE_COMMON_H
 #define __KEYMILE_COMMON_H
 
+#include <asm/types.h>
 #define WRG_RESET	0x80
 #define H_OPORTS_14	0x40
 #define WRG_LED		0x02
diff --git a/board/keymile/common/qrio.c b/board/keymile/common/qrio.c
index 4efcc1adee5..32d960e14cc 100644
--- a/board/keymile/common/qrio.c
+++ b/board/keymile/common/qrio.c
@@ -5,7 +5,9 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <stdbool.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
 
diff --git a/board/keymile/common/qrio.h b/board/keymile/common/qrio.h
index ead6efcca51..3317594c450 100644
--- a/board/keymile/common/qrio.h
+++ b/board/keymile/common/qrio.h
@@ -9,6 +9,7 @@
 
 /* QRIO GPIO ports */
 #include <stdbool.h>
+#include <asm/types.h>
 #define QRIO_GPIO_A		0x40
 #define QRIO_GPIO_B		0x60
 
diff --git a/board/keymile/km83xx/km83xx.c b/board/keymile/km83xx/km83xx.c
index afa53808a06..2551bcdb498 100644
--- a/board/keymile/km83xx/km83xx.c
+++ b/board/keymile/km83xx/km83xx.c
@@ -14,6 +14,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <env.h>
 #include <fdt_support.h>
 #include <init.h>
@@ -33,6 +34,7 @@
 #include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <post.h>
+#include <linux/types.h>
 
 #include "../common/common.h"
 
diff --git a/board/keymile/km83xx/km83xx_i2c.c b/board/keymile/km83xx/km83xx_i2c.c
index 55c993481c2..e0887940a34 100644
--- a/board/keymile/km83xx/km83xx_i2c.c
+++ b/board/keymile/km83xx/km83xx_i2c.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <linux/ctype.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 #include "../common/common.h"
 
 static void i2c_write_start_seq(void)
diff --git a/board/keymile/km_arm/fpga_config.c b/board/keymile/km_arm/fpga_config.c
index 2e60221f228..ae528a719fb 100644
--- a/board/keymile/km_arm/fpga_config.c
+++ b/board/keymile/km_arm/fpga_config.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <i2c.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 
diff --git a/board/keymile/km_arm/km_arm.c b/board/keymile/km_arm/km_arm.c
index bd833e54faf..79498acf062 100644
--- a/board/keymile/km_arm/km_arm.c
+++ b/board/keymile/km_arm/km_arm.c
@@ -29,6 +29,7 @@
 #include <asm/arch/mpp.h>
 #include <asm/u-boot.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include "../common/common.h"
 
diff --git a/board/keymile/kmp204x/kmp204x.c b/board/keymile/kmp204x/kmp204x.c
index ffb31b8a0c0..d03035e6ec7 100644
--- a/board/keymile/kmp204x/kmp204x.c
+++ b/board/keymile/kmp204x/kmp204x.c
@@ -27,6 +27,7 @@
 #include <asm/fsl_portals.h>
 #include <asm/fsl_liodn.h>
 #include <fm_eth.h>
+#include <linux/types.h>
 
 #include "../common/common.h"
 #include "../common/qrio.h"
diff --git a/board/keymile/kmp204x/pci.c b/board/keymile/kmp204x/pci.c
index 7f92d6b322d..630a4e42442 100644
--- a/board/keymile/kmp204x/pci.c
+++ b/board/keymile/kmp204x/pci.c
@@ -13,6 +13,7 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include <asm/fsl_pci.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
diff --git a/board/keymile/secu1/qts/pinmux_config.h b/board/keymile/secu1/qts/pinmux_config.h
index a9406060edc..e14c0956e38 100644
--- a/board/keymile/secu1/qts/pinmux_config.h
+++ b/board/keymile/secu1/qts/pinmux_config.h
@@ -6,6 +6,7 @@
 #ifndef __SOCFPGA_PINMUX_CONFIG_H__
 #define __SOCFPGA_PINMUX_CONFIG_H__
 
+#include <asm/types.h>
 const u8 sys_mgr_init_table[] = {
 	3, /* EMACIO0 */
 	3, /* EMACIO1 */
diff --git a/board/keymile/secu1/qts/sdram_config.h b/board/keymile/secu1/qts/sdram_config.h
index b0ff86ef381..740573887ee 100644
--- a/board/keymile/secu1/qts/sdram_config.h
+++ b/board/keymile/secu1/qts/sdram_config.h
@@ -8,6 +8,7 @@
 #define __SOCFPGA_SDRAM_CONFIG_H__
 
 /* SDRAM configuration */
+#include <asm/types.h>
 #define CONFIG_HPS_SDR_CTRLCFG_CPORTRDWR_CPORTRDWR		0x5A56A
 #define CONFIG_HPS_SDR_CTRLCFG_CPORTRMAP_CPORTRMAP		0xB00088
 #define CONFIG_HPS_SDR_CTRLCFG_CPORTWIDTH_CPORTWIDTH		0x44555
diff --git a/board/keymile/secu1/socfpga.c b/board/keymile/secu1/socfpga.c
index 4afaf0dec72..2ce7396ceb9 100644
--- a/board/keymile/secu1/socfpga.c
+++ b/board/keymile/secu1/socfpga.c
@@ -6,6 +6,7 @@
 #include <i2c.h>
 #include <stdio.h>
 #include <asm/gpio.h>
+#include <linux/types.h>
 
 #include "../common/common.h"
 
diff --git a/board/kmc/kzm9g/kzm9g.c b/board/kmc/kzm9g/kzm9g.c
index 5b0c198940a..bd41389fe95 100644
--- a/board/kmc/kzm9g/kzm9g.c
+++ b/board/kmc/kzm9g/kzm9g.c
@@ -15,6 +15,7 @@
 #include <netdev.h>
 #include <i2c.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/kobol/helios4/helios4.c b/board/kobol/helios4/helios4.c
index 4dd326402e8..98c6447ba64 100644
--- a/board/kobol/helios4/helios4.c
+++ b/board/kobol/helios4/helios4.c
@@ -15,6 +15,7 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/kernel.h>
 
diff --git a/board/kosagi/novena/novena.c b/board/kosagi/novena/novena.c
index 23b4ba25f78..572bd512673 100644
--- a/board/kosagi/novena/novena.c
+++ b/board/kosagi/novena/novena.c
@@ -42,6 +42,7 @@
 #include <mmc.h>
 #include <netdev.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/pfuze100_pmic.h>
 #include <stdio_dev.h>
diff --git a/board/kosagi/novena/novena_spl.c b/board/kosagi/novena/novena_spl.c
index f79a2d46a69..4aa78fb7b38 100644
--- a/board/kosagi/novena/novena_spl.c
+++ b/board/kosagi/novena/novena_spl.c
@@ -26,6 +26,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include <asm/arch/mx6-ddr.h>
 
diff --git a/board/kosagi/novena/video.c b/board/kosagi/novena/video.c
index f90a9f990c3..c06a4eac506 100644
--- a/board/kosagi/novena/video.c
+++ b/board/kosagi/novena/video.c
@@ -33,6 +33,7 @@
 #include <malloc.h>
 #include <stdio_dev.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include "novena.h"
 
diff --git a/board/laird/wb50n/wb50n.c b/board/laird/wb50n/wb50n.c
index 13ac53ab21a..830e0a51c1c 100644
--- a/board/laird/wb50n/wb50n.c
+++ b/board/laird/wb50n/wb50n.c
@@ -20,6 +20,7 @@
 #include <spl.h>
 #include <asm/arch/atmel_mpddrc.h>
 #include <asm/arch/at91_wdt.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
 
diff --git a/board/lego/ev3/legoev3.c b/board/lego/ev3/legoev3.c
index 92c13c67ab2..7930c74be54 100644
--- a/board/lego/ev3/legoev3.c
+++ b/board/lego/ev3/legoev3.c
@@ -23,6 +23,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/davinci_misc.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <hwconfig.h>
diff --git a/board/lg/sniper/sniper.c b/board/lg/sniper/sniper.c
index 3de18af2a1d..6653ced5be5 100644
--- a/board/lg/sniper/sniper.c
+++ b/board/lg/sniper/sniper.c
@@ -11,6 +11,7 @@
 #include <env.h>
 #include <init.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/ctype.h>
 #include <linux/usb/musb.h>
diff --git a/board/liebherr/display5/display5.c b/board/liebherr/display5/display5.c
index e6ab33c74ac..f9c4fc643c1 100644
--- a/board/liebherr/display5/display5.c
+++ b/board/liebherr/display5/display5.c
@@ -9,6 +9,7 @@
 #include <fdt_support.h>
 #include <init.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
@@ -27,6 +28,7 @@
 #include <miiphy.h>
 #include <netdev.h>
 #include <i2c.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
diff --git a/board/liebherr/display5/spl.c b/board/liebherr/display5/spl.c
index 1580b8d3cf9..1d403eaa947 100644
--- a/board/liebherr/display5/spl.c
+++ b/board/liebherr/display5/spl.c
@@ -23,6 +23,7 @@
 #include <asm/arch/mx6-ddr.h>
 #include <asm/arch/mx6-pins.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "asm/arch/crm_regs.h"
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/liebherr/mccmon6/spl.c b/board/liebherr/mccmon6/spl.c
index 1da59eb0668..c412fb5c434 100644
--- a/board/liebherr/mccmon6/spl.c
+++ b/board/liebherr/mccmon6/spl.c
@@ -27,6 +27,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <asm/arch/mx6-ddr.h>
 /*
diff --git a/board/liebherr/xea/spl_xea.c b/board/liebherr/xea/spl_xea.c
index 00c1c078f90..a70e2828d49 100644
--- a/board/liebherr/xea/spl_xea.c
+++ b/board/liebherr/xea/spl_xea.c
@@ -18,6 +18,7 @@
 #include <asm/arch/iomux-mx28.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 
 #define	MUX_CONFIG_LCD	(MXS_PAD_3V3 | MXS_PAD_4MA | MXS_PAD_NOPULL)
diff --git a/board/liebherr/xea/xea.c b/board/liebherr/xea/xea.c
index 7dd6cc34156..8bee42a5be2 100644
--- a/board/liebherr/xea/xea.c
+++ b/board/liebherr/xea/xea.c
@@ -34,6 +34,7 @@
 #include <errno.h>
 #include <usb.h>
 #include <serial.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_SPL_BUILD
 #include <spl.h>
diff --git a/board/logicpd/am3517evm/am3517evm.c b/board/logicpd/am3517evm/am3517evm.c
index e0e57868546..4c259189fd3 100644
--- a/board/logicpd/am3517evm/am3517evm.c
+++ b/board/logicpd/am3517evm/am3517evm.c
@@ -26,6 +26,7 @@
 #include <asm/arch/mmc_host_def.h>
 #include <asm/arch/musb.h>
 #include <asm/mach-types.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
diff --git a/board/logicpd/imx6/imx6logic.c b/board/logicpd/imx6/imx6logic.c
index 823d42c953f..20de0f1b04f 100644
--- a/board/logicpd/imx6/imx6logic.c
+++ b/board/logicpd/imx6/imx6logic.c
@@ -30,6 +30,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/mach-imx/boot_mode.h>
 #include <asm/mach-imx/iomux-v3.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/logicpd/omap3som/omap3logic.c b/board/logicpd/omap3som/omap3logic.c
index e5a9ffdda55..32e66ebaa0c 100644
--- a/board/logicpd/omap3som/omap3logic.c
+++ b/board/logicpd/omap3som/omap3logic.c
@@ -29,6 +29,7 @@
 #include <asm/gpio.h>
 #include <asm/omap_mmc.h>
 #include <asm/mach-types.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/mtd/rawnand.h>
 #include <asm/omap_musb.h>
diff --git a/board/menlo/m53menlo/m53menlo.c b/board/menlo/m53menlo/m53menlo.c
index 0a81b060b23..3ab935a3358 100644
--- a/board/menlo/m53menlo/m53menlo.c
+++ b/board/menlo/m53menlo/m53menlo.c
@@ -39,6 +39,7 @@
 #include <splash.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <usb/ehci-ci.h>
 #include <video_console.h>
 
diff --git a/board/microchip/pic32mzda/pic32mzda.c b/board/microchip/pic32mzda/pic32mzda.c
index 96bb8c8f425..25e73bd9506 100644
--- a/board/microchip/pic32mzda/pic32mzda.c
+++ b/board/microchip/pic32mzda/pic32mzda.c
@@ -14,6 +14,7 @@
 #include <malloc.h>
 #include <stdio.h>
 #include <dt-bindings/clock/microchip,clock.h>
+#include <linux/types.h>
 #include <mach/pic32.h>
 
 #ifdef CONFIG_DISPLAY_BOARDINFO
diff --git a/board/mini-box/picosam9g45/picosam9g45.c b/board/mini-box/picosam9g45/picosam9g45.c
index d4af394670c..380114a99a5 100644
--- a/board/mini-box/picosam9g45/picosam9g45.c
+++ b/board/mini-box/picosam9g45/picosam9g45.c
@@ -31,6 +31,7 @@
 #endif
 #include <netdev.h>
 #include <asm/mach-types.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/mpc8308_p1m/sdram.c b/board/mpc8308_p1m/sdram.c
index 62a2d8a53af..e44936b0327 100644
--- a/board/mpc8308_p1m/sdram.c
+++ b/board/mpc8308_p1m/sdram.c
@@ -11,6 +11,7 @@
 #include <init.h>
 #include <mpc83xx.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 
 #include <asm/bitops.h>
 #include <asm/io.h>
diff --git a/board/mscc/common/spi.c b/board/mscc/common/spi.c
index b1a71f4c292..78b9b962db1 100644
--- a/board/mscc/common/spi.c
+++ b/board/mscc/common/spi.c
@@ -7,6 +7,7 @@
 #include <stdbool.h>
 #include <asm/io.h>
 #include <spi.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 
 void external_cs_manage(struct udevice *dev, bool enable)
diff --git a/board/mscc/jr2/jr2.c b/board/mscc/jr2/jr2.c
index c61e44ee8b4..8698954cbe0 100644
--- a/board/mscc/jr2/jr2.c
+++ b/board/mscc/jr2/jr2.c
@@ -4,12 +4,14 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <image.h>
 #include <init.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <led.h>
 #include <miiphy.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/board/mscc/luton/luton.c b/board/mscc/luton/luton.c
index 584062c9ee9..b276ef3c6c0 100644
--- a/board/mscc/luton/luton.c
+++ b/board/mscc/luton/luton.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <led.h>
 #include <miiphy.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
 
diff --git a/board/mscc/serval/serval.c b/board/mscc/serval/serval.c
index d7b42d177a7..7e250ac77ec 100644
--- a/board/mscc/serval/serval.c
+++ b/board/mscc/serval/serval.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <led.h>
 #include <miiphy.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
 
diff --git a/board/netgear/dgnd3700v2/dgnd3700v2.c b/board/netgear/dgnd3700v2/dgnd3700v2.c
index cfc3529c348..cb7d902d007 100644
--- a/board/netgear/dgnd3700v2/dgnd3700v2.c
+++ b/board/netgear/dgnd3700v2/dgnd3700v2.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <init.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
diff --git a/board/nokia/rx51/rx51.c b/board/nokia/rx51/rx51.c
index 6d9f8c988bf..23f63c7d72f 100644
--- a/board/nokia/rx51/rx51.c
+++ b/board/nokia/rx51/rx51.c
@@ -39,6 +39,7 @@
 #include <asm/arch/mux.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/mmc_host_def.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
 
diff --git a/board/nokia/rx51/rx51.h b/board/nokia/rx51/rx51.h
index fa1b42bf21e..41d8b32e2ec 100644
--- a/board/nokia/rx51/rx51.h
+++ b/board/nokia/rx51/rx51.h
@@ -13,6 +13,7 @@
 #define _RX51_H_
 
 /* Needed for ROM SMC call */
+#include <asm/types.h>
 struct emu_hal_params_rx51 {
 	u32 num_params;
 	u32 param1;
diff --git a/board/nokia/rx51/tag_omap.h b/board/nokia/rx51/tag_omap.h
index b99d6b7de17..24ad4729781 100644
--- a/board/nokia/rx51/tag_omap.h
+++ b/board/nokia/rx51/tag_omap.h
@@ -15,6 +15,7 @@
  *  Code copied from maemo kernel 2.6.28 file
  *  arch/arm/plat-omap/include/mach/board.h
  *
+#include <asm/types.h>
  *  Information structures for board-specific data
  *
  *  Copyright (C) 2004	Nokia Corporation
diff --git a/board/nvidia/cardhu/cardhu.c b/board/nvidia/cardhu/cardhu.c
index 1fe5f851731..3d27d75c7b4 100644
--- a/board/nvidia/cardhu/cardhu.c
+++ b/board/nvidia/cardhu/cardhu.c
@@ -13,6 +13,7 @@
 #include <asm/gpio.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include "pinmux-config-cardhu.h"
 #include <i2c.h>
 
diff --git a/board/nvidia/dalmore/dalmore.c b/board/nvidia/dalmore/dalmore.c
index ac8df9c3806..e3b53f89d65 100644
--- a/board/nvidia/dalmore/dalmore.c
+++ b/board/nvidia/dalmore/dalmore.c
@@ -10,6 +10,7 @@
 #include <asm/arch/pinmux.h>
 #include <asm/arch/gp_padctrl.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include "pinmux-config-dalmore.h"
 #include <i2c.h>
 
diff --git a/board/nvidia/e2220-1170/e2220-1170.c b/board/nvidia/e2220-1170/e2220-1170.c
index 4c59b61e5da..b6747ed093f 100644
--- a/board/nvidia/e2220-1170/e2220-1170.c
+++ b/board/nvidia/e2220-1170/e2220-1170.c
@@ -10,6 +10,7 @@
 #include <stdio.h>
 #include <asm/arch/gpio.h>
 #include <asm/arch/pinmux.h>
+#include <linux/types.h>
 #include "../p2571/max77620_init.h"
 
 void pin_mux_mmc(void)
diff --git a/board/nvidia/p2371-0000/p2371-0000.c b/board/nvidia/p2371-0000/p2371-0000.c
index 4c59b61e5da..b6747ed093f 100644
--- a/board/nvidia/p2371-0000/p2371-0000.c
+++ b/board/nvidia/p2371-0000/p2371-0000.c
@@ -10,6 +10,7 @@
 #include <stdio.h>
 #include <asm/arch/gpio.h>
 #include <asm/arch/pinmux.h>
+#include <linux/types.h>
 #include "../p2571/max77620_init.h"
 
 void pin_mux_mmc(void)
diff --git a/board/nvidia/p2371-2180/p2371-2180.c b/board/nvidia/p2371-2180/p2371-2180.c
index 7cc163a467e..ce3cfad6071 100644
--- a/board/nvidia/p2371-2180/p2371-2180.c
+++ b/board/nvidia/p2371-2180/p2371-2180.c
@@ -19,6 +19,7 @@
 #include <asm/arch/pinmux.h>
 #include <asm/arch-tegra/cboot.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "../p2571/max77620_init.h"
 
 void pin_mux_mmc(void)
diff --git a/board/nvidia/p2571/p2571.c b/board/nvidia/p2571/p2571.c
index e8760ca5172..ca148425a8e 100644
--- a/board/nvidia/p2571/p2571.c
+++ b/board/nvidia/p2571/p2571.c
@@ -11,6 +11,7 @@
 #include <asm/arch/gpio.h>
 #include <asm/arch/pinmux.h>
 #include <asm/gpio.h>
+#include <linux/types.h>
 #include "max77620_init.h"
 
 void pin_mux_mmc(void)
diff --git a/board/nvidia/p2771-0000/p2771-0000.c b/board/nvidia/p2771-0000/p2771-0000.c
index b5925f30932..9d60f4bb919 100644
--- a/board/nvidia/p2771-0000/p2771-0000.c
+++ b/board/nvidia/p2771-0000/p2771-0000.c
@@ -15,6 +15,7 @@
 #include <linux/libfdt.h>
 #include <asm/arch-tegra/cboot.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "../p2571/max77620_init.h"
 
 void pin_mux_mmc(void)
diff --git a/board/nvidia/p3450-0000/p3450-0000.c b/board/nvidia/p3450-0000/p3450-0000.c
index 868bab22ef4..bb8f86581f9 100644
--- a/board/nvidia/p3450-0000/p3450-0000.c
+++ b/board/nvidia/p3450-0000/p3450-0000.c
@@ -18,6 +18,7 @@
 #include <asm/arch/gpio.h>
 #include <asm/arch/pinmux.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "../p2571/max77620_init.h"
 
 void pin_mux_mmc(void)
diff --git a/board/nvidia/venice2/as3722_init.c b/board/nvidia/venice2/as3722_init.c
index ba676547d3e..7b2daed843a 100644
--- a/board/nvidia/venice2/as3722_init.c
+++ b/board/nvidia/venice2/as3722_init.c
@@ -9,6 +9,7 @@
 #include <asm/io.h>
 #include <asm/arch-tegra/tegra_i2c.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 #include "as3722_init.h"
 
 /* AS3722-PMIC-specific early init code - get CPU rails up, etc */
diff --git a/board/olimex/mx23_olinuxino/spl_boot.c b/board/olimex/mx23_olinuxino/spl_boot.c
index 31d148b885b..d7b0e3aeb0e 100644
--- a/board/olimex/mx23_olinuxino/spl_boot.c
+++ b/board/olimex/mx23_olinuxino/spl_boot.c
@@ -12,6 +12,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #define	MUX_CONFIG_EMI	(MXS_PAD_3V3 | MXS_PAD_12MA | MXS_PAD_PULLUP)
 #define	MUX_CONFIG_SSP	(MXS_PAD_8MA | MXS_PAD_PULLUP)
diff --git a/board/phytec/pcl063/pcl063.c b/board/phytec/pcl063/pcl063.c
index 8ac6eb01caa..ca8f6b1947d 100644
--- a/board/phytec/pcl063/pcl063.c
+++ b/board/phytec/pcl063/pcl063.c
@@ -16,6 +16,7 @@
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/mach-imx/mxc_i2c.h>
 #include <fsl_esdhc_imx.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <miiphy.h>
diff --git a/board/phytec/pcl063/spl.c b/board/phytec/pcl063/spl.c
index 662f3d7e12d..7242cdc0d8b 100644
--- a/board/phytec/pcl063/spl.c
+++ b/board/phytec/pcl063/spl.c
@@ -18,6 +18,7 @@
 #include <asm/arch/sys_proto.h>
 #include <fsl_esdhc_imx.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 /* Configuration for Micron MT41K256M16TW-107 IT:P, 32M x 16 x 8 -> 256MiB */
 
diff --git a/board/phytec/pcm052/pcm052.c b/board/phytec/pcm052/pcm052.c
index ab2513ed071..b83c2502533 100644
--- a/board/phytec/pcm052/pcm052.c
+++ b/board/phytec/pcm052/pcm052.c
@@ -19,6 +19,7 @@
 #include <env.h>
 #include <led.h>
 #include <miiphy.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
 
diff --git a/board/phytec/pcm058/pcm058.c b/board/phytec/pcm058/pcm058.c
index 41a391ef0ef..7b54d3dda65 100644
--- a/board/phytec/pcm058/pcm058.c
+++ b/board/phytec/pcm058/pcm058.c
@@ -21,6 +21,7 @@
 #include <dm.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/phytec/pfla02/pfla02.c b/board/phytec/pfla02/pfla02.c
index 97986b67f1c..37e60188c10 100644
--- a/board/phytec/pfla02/pfla02.c
+++ b/board/phytec/pfla02/pfla02.c
@@ -36,6 +36,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/sections.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/phytec/phycore_rk3288/phycore-rk3288.c b/board/phytec/phycore_rk3288/phycore-rk3288.c
index 141707c7b9a..920f9041766 100644
--- a/board/phytec/phycore_rk3288/phycore-rk3288.c
+++ b/board/phytec/phycore_rk3288/phycore-rk3288.c
@@ -19,6 +19,7 @@
 #include <i2c_eeprom.h>
 #include <netdev.h>
 #include <linux/bitops.h>
+#include <linux/types.h>
 #include "som.h"
 #include <power/regulator.h>
 #include <power/rk8xx_pmic.h>
diff --git a/board/phytec/phycore_rk3288/som.h b/board/phytec/phycore_rk3288/som.h
index f627264f5f6..74604c8ec6c 100644
--- a/board/phytec/phycore_rk3288/som.h
+++ b/board/phytec/phycore_rk3288/som.h
@@ -5,6 +5,7 @@
  */
 
 /*
+#include <compiler.h>
  * rk3288_som struct represents the eeprom layout for PHYTEC RK3288 based SoMs
  */
 struct rk3288_som {
diff --git a/board/phytium/durian/durian.c b/board/phytium/durian/durian.c
index ce0cbdb9c4a..e5ce66feb9d 100644
--- a/board/phytium/durian/durian.c
+++ b/board/phytium/durian/durian.c
@@ -20,6 +20,7 @@
 #include <linux/arm-smccc.h>
 #include <linux/kernel.h>
 #include <scsi.h>
+#include <linux/types.h>
 #include "cpu.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/pine64/pinebook-pro-rk3399/pinebook-pro-rk3399.c b/board/pine64/pinebook-pro-rk3399/pinebook-pro-rk3399.c
index 4ad780767ea..dfbd96e876f 100644
--- a/board/pine64/pinebook-pro-rk3399/pinebook-pro-rk3399.c
+++ b/board/pine64/pinebook-pro-rk3399/pinebook-pro-rk3399.c
@@ -12,6 +12,7 @@
 #include <asm/arch-rockchip/grf_rk3399.h>
 #include <asm/arch-rockchip/hardware.h>
 #include <asm/arch-rockchip/misc.h>
+#include <asm/types.h>
 #include <linux/printk.h>
 #include <power/regulator.h>
 
diff --git a/board/pine64/rockpro64_rk3399/rockpro64-rk3399.c b/board/pine64/rockpro64_rk3399/rockpro64-rk3399.c
index d79084614f1..2215d659d7d 100644
--- a/board/pine64/rockpro64_rk3399/rockpro64-rk3399.c
+++ b/board/pine64/rockpro64_rk3399/rockpro64-rk3399.c
@@ -12,6 +12,7 @@
 #include <asm/arch-rockchip/grf_rk3399.h>
 #include <asm/arch-rockchip/hardware.h>
 #include <asm/arch-rockchip/misc.h>
+#include <asm/types.h>
 
 #define GRF_IO_VSEL_BT565_SHIFT 0
 #define PMUGRF_CON0_VSEL_SHIFT 8
diff --git a/board/ppcag/bg0900/spl_boot.c b/board/ppcag/bg0900/spl_boot.c
index 7809c844df7..41ae7b9bdfd 100644
--- a/board/ppcag/bg0900/spl_boot.c
+++ b/board/ppcag/bg0900/spl_boot.c
@@ -12,6 +12,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #define	MUX_CONFIG_GPMI	(MXS_PAD_3V3 | MXS_PAD_4MA | MXS_PAD_NOPULL)
 #define	MUX_CONFIG_ENET	(MXS_PAD_3V3 | MXS_PAD_8MA | MXS_PAD_PULLUP)
diff --git a/board/qca/ap121/ap121.c b/board/qca/ap121/ap121.c
index 60a2e19143d..15a1da2d6e1 100644
--- a/board/qca/ap121/ap121.c
+++ b/board/qca/ap121/ap121.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <init.h>
 #include <asm/io.h>
 #include <asm/addrspace.h>
diff --git a/board/qca/ap143/ap143.c b/board/qca/ap143/ap143.c
index ac65054136c..fa1e2d49332 100644
--- a/board/qca/ap143/ap143.c
+++ b/board/qca/ap143/ap143.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <init.h>
 #include <asm/io.h>
 #include <asm/addrspace.h>
diff --git a/board/qca/ap152/ap152.c b/board/qca/ap152/ap152.c
index 1064705d262..f21b7a2c44b 100644
--- a/board/qca/ap152/ap152.c
+++ b/board/qca/ap152/ap152.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <init.h>
 #include <asm/io.h>
 #include <asm/addrspace.h>
diff --git a/board/qemu-mips/qemu-mips.c b/board/qemu-mips/qemu-mips.c
index 7d00176ffe6..06eb3c071c4 100644
--- a/board/qemu-mips/qemu-mips.c
+++ b/board/qemu-mips/qemu-mips.c
@@ -13,6 +13,7 @@
 #include <asm/mipsregs.h>
 #include <asm/io.h>
 #include <netdev.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/qualcomm/dragonboard410c/dragonboard410c.c b/board/qualcomm/dragonboard410c/dragonboard410c.c
index ebb7ddb1fb7..b24fcf6077b 100644
--- a/board/qualcomm/dragonboard410c/dragonboard410c.c
+++ b/board/qualcomm/dragonboard410c/dragonboard410c.c
@@ -23,6 +23,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/qualcomm/dragonboard820c/dragonboard820c.c b/board/qualcomm/dragonboard820c/dragonboard820c.c
index ad8db681bd1..169458d100e 100644
--- a/board/qualcomm/dragonboard820c/dragonboard820c.c
+++ b/board/qualcomm/dragonboard820c/dragonboard820c.c
@@ -22,6 +22,7 @@
 #include <linux/bitops.h>
 #include <asm/psci.h>
 #include <asm/gpio.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/raidsonic/ib62x0/ib62x0.c b/board/raidsonic/ib62x0/ib62x0.c
index afbfdd997a1..760963396ff 100644
--- a/board/raidsonic/ib62x0/ib62x0.c
+++ b/board/raidsonic/ib62x0/ib62x0.c
@@ -14,6 +14,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
 #include <asm/arch/mpp.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include "ib62x0.h"
 
diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c
index c074726f1ae..7ab2965724c 100644
--- a/board/raspberrypi/rpi/rpi.c
+++ b/board/raspberrypi/rpi/rpi.c
@@ -14,6 +14,7 @@
 #include <lcd.h>
 #include <memalign.h>
 #include <mmc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/gpio.h>
@@ -29,6 +30,7 @@
 #include <watchdog.h>
 #include <dm/pinctrl.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/renesas/alt/alt.c b/board/renesas/alt/alt.c
index 97379858e4f..caf5bb4d48e 100644
--- a/board/renesas/alt/alt.c
+++ b/board/renesas/alt/alt.c
@@ -32,6 +32,7 @@
 #include <miiphy.h>
 #include <i2c.h>
 #include <div64.h>
+#include <linux/types.h>
 #include "qos.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/renesas/alt/alt_spl.c b/board/renesas/alt/alt_spl.c
index 44a8d6c720e..77d62706215 100644
--- a/board/renesas/alt/alt_spl.c
+++ b/board/renesas/alt/alt_spl.c
@@ -21,6 +21,7 @@
 #include <asm/arch/rmobile.h>
 #include <asm/arch/rcar-mstp.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include <spl.h>
 
diff --git a/board/renesas/alt/qos.c b/board/renesas/alt/qos.c
index 2f657505ceb..ae77996d9b5 100644
--- a/board/renesas/alt/qos.c
+++ b/board/renesas/alt/qos.c
@@ -11,6 +11,7 @@
 #include <asm/mach-types.h>
 #include <asm/io.h>
 #include <asm/arch/rmobile.h>
+#include <asm/types.h>
 
 #if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT)
 /* QoS version 0.311 for ES1 and version 0.321 for ES2 */
diff --git a/board/renesas/blanche/blanche.c b/board/renesas/blanche/blanche.c
index 79bd867c953..af0fefe93d4 100644
--- a/board/renesas/blanche/blanche.c
+++ b/board/renesas/blanche/blanche.c
@@ -34,6 +34,7 @@
 #include <mmc.h>
 #include <netdev.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include "qos.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/renesas/blanche/qos.c b/board/renesas/blanche/qos.c
index e3ad83ee0c2..98bf0fbc74f 100644
--- a/board/renesas/blanche/qos.c
+++ b/board/renesas/blanche/qos.c
@@ -10,6 +10,7 @@
 #include <asm/mach-types.h>
 #include <asm/io.h>
 #include <asm/arch/rmobile.h>
+#include <asm/types.h>
 
 #if defined(CONFIG_RMOBILE_EXTRAM_BOOT)
 enum {
diff --git a/board/renesas/condor/condor.c b/board/renesas/condor/condor.c
index f9c3f324f83..9946d4e5ab8 100644
--- a/board/renesas/condor/condor.c
+++ b/board/renesas/condor/condor.c
@@ -17,6 +17,7 @@
 #include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/renesas/draak/draak.c b/board/renesas/draak/draak.c
index 643bfce33ad..58689756c6d 100644
--- a/board/renesas/draak/draak.c
+++ b/board/renesas/draak/draak.c
@@ -29,6 +29,7 @@
 #include <asm/arch/sh_sdhi.h>
 #include <i2c.h>
 #include <mmc.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/renesas/eagle/eagle.c b/board/renesas/eagle/eagle.c
index a6602a52506..b02d3c077fc 100644
--- a/board/renesas/eagle/eagle.c
+++ b/board/renesas/eagle/eagle.c
@@ -28,6 +28,7 @@
 #include <asm/arch/sh_sdhi.h>
 #include <i2c.h>
 #include <mmc.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/renesas/ebisu/ebisu.c b/board/renesas/ebisu/ebisu.c
index a01ae27e5b2..e06ad5c8afb 100644
--- a/board/renesas/ebisu/ebisu.c
+++ b/board/renesas/ebisu/ebisu.c
@@ -28,6 +28,7 @@
 #include <asm/arch/sh_sdhi.h>
 #include <i2c.h>
 #include <mmc.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/renesas/gose/gose.c b/board/renesas/gose/gose.c
index 5841da94fc1..37a25eb5b7b 100644
--- a/board/renesas/gose/gose.c
+++ b/board/renesas/gose/gose.c
@@ -30,6 +30,7 @@
 #include <netdev.h>
 #include <miiphy.h>
 #include <i2c.h>
+#include <linux/types.h>
 #include "qos.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/renesas/gose/gose_spl.c b/board/renesas/gose/gose_spl.c
index d4708c691b9..916a7880420 100644
--- a/board/renesas/gose/gose_spl.c
+++ b/board/renesas/gose/gose_spl.c
@@ -21,6 +21,7 @@
 #include <asm/arch/rmobile.h>
 #include <asm/arch/rcar-mstp.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include <spl.h>
 
diff --git a/board/renesas/gose/qos.c b/board/renesas/gose/qos.c
index 1c4ebfc6a8a..97c9eaf0fc1 100644
--- a/board/renesas/gose/qos.c
+++ b/board/renesas/gose/qos.c
@@ -11,6 +11,7 @@
 #include <asm/mach-types.h>
 #include <asm/io.h>
 #include <asm/arch/rmobile.h>
+#include <asm/types.h>
 
 #if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT)
 /* QoS version 0.311 */
diff --git a/board/renesas/grpeach/grpeach.c b/board/renesas/grpeach/grpeach.c
index ef9a12bdc8b..7e5e0dccdc2 100644
--- a/board/renesas/grpeach/grpeach.c
+++ b/board/renesas/grpeach/grpeach.c
@@ -12,6 +12,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #define RZA1_WDT_BASE	0xfcfe0000
 #define WTCSR		0x00
diff --git a/board/renesas/koelsch/koelsch.c b/board/renesas/koelsch/koelsch.c
index e20fed98631..8374c30fbd8 100644
--- a/board/renesas/koelsch/koelsch.c
+++ b/board/renesas/koelsch/koelsch.c
@@ -32,6 +32,7 @@
 #include <miiphy.h>
 #include <i2c.h>
 #include <div64.h>
+#include <linux/types.h>
 #include "qos.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/renesas/koelsch/koelsch_spl.c b/board/renesas/koelsch/koelsch_spl.c
index a690022f97b..ca510511a56 100644
--- a/board/renesas/koelsch/koelsch_spl.c
+++ b/board/renesas/koelsch/koelsch_spl.c
@@ -21,6 +21,7 @@
 #include <asm/arch/rmobile.h>
 #include <asm/arch/rcar-mstp.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include <spl.h>
 
diff --git a/board/renesas/koelsch/qos.c b/board/renesas/koelsch/qos.c
index f884e5fe650..f46c69ee4aa 100644
--- a/board/renesas/koelsch/qos.c
+++ b/board/renesas/koelsch/qos.c
@@ -11,6 +11,7 @@
 #include <asm/mach-types.h>
 #include <asm/io.h>
 #include <asm/arch/rmobile.h>
+#include <asm/types.h>
 
 /* QoS version 0.240 for ES1 and version 0.411 for ES2 */
 #if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT)
diff --git a/board/renesas/lager/lager.c b/board/renesas/lager/lager.c
index 636a7b27747..a292c06442a 100644
--- a/board/renesas/lager/lager.c
+++ b/board/renesas/lager/lager.c
@@ -34,6 +34,7 @@
 #include <miiphy.h>
 #include <i2c.h>
 #include <mmc.h>
+#include <linux/types.h>
 #include "qos.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/renesas/lager/lager_spl.c b/board/renesas/lager/lager_spl.c
index 7cb30ba7212..8f0734e8a28 100644
--- a/board/renesas/lager/lager_spl.c
+++ b/board/renesas/lager/lager_spl.c
@@ -21,6 +21,7 @@
 #include <asm/arch/rmobile.h>
 #include <asm/arch/rcar-mstp.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include <spl.h>
 
diff --git a/board/renesas/lager/qos.c b/board/renesas/lager/qos.c
index f01ca2fac71..bb5933c2a34 100644
--- a/board/renesas/lager/qos.c
+++ b/board/renesas/lager/qos.c
@@ -10,6 +10,7 @@
 #include <asm/mach-types.h>
 #include <asm/io.h>
 #include <asm/arch/rmobile.h>
+#include <asm/types.h>
 
 /* QoS version 0.955 for ES1 and version 0.973 for ES2 */
 #if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT)
diff --git a/board/renesas/porter/porter.c b/board/renesas/porter/porter.c
index 368cf9550a3..a465cc17d85 100644
--- a/board/renesas/porter/porter.c
+++ b/board/renesas/porter/porter.c
@@ -32,6 +32,7 @@
 #include <miiphy.h>
 #include <i2c.h>
 #include <div64.h>
+#include <linux/types.h>
 #include "qos.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/renesas/porter/porter_spl.c b/board/renesas/porter/porter_spl.c
index d2a93fc5456..a007a566da5 100644
--- a/board/renesas/porter/porter_spl.c
+++ b/board/renesas/porter/porter_spl.c
@@ -21,6 +21,7 @@
 #include <asm/arch/rmobile.h>
 #include <asm/arch/rcar-mstp.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include <spl.h>
 
diff --git a/board/renesas/porter/qos.c b/board/renesas/porter/qos.c
index bca54f7f74c..564f8430fb6 100644
--- a/board/renesas/porter/qos.c
+++ b/board/renesas/porter/qos.c
@@ -12,6 +12,7 @@
 #include <asm/mach-types.h>
 #include <asm/io.h>
 #include <asm/arch/rmobile.h>
+#include <asm/types.h>
 
 /* QoS version 0.240 for ES1 and version 0.334 for ES2 */
 #if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT)
diff --git a/board/renesas/rcar-common/gen3-spl.c b/board/renesas/rcar-common/gen3-spl.c
index aecc053dc10..ca0131a4f65 100644
--- a/board/renesas/rcar-common/gen3-spl.c
+++ b/board/renesas/rcar-common/gen3-spl.c
@@ -14,6 +14,7 @@
 #include <spl.h>
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
+#include <linux/types.h>
 
 #define RCAR_CNTC_BASE	0xE6080000
 #define CNTCR_EN	BIT(0)
diff --git a/board/renesas/salvator-x/salvator-x.c b/board/renesas/salvator-x/salvator-x.c
index 8da12ea9010..ca00590867c 100644
--- a/board/renesas/salvator-x/salvator-x.c
+++ b/board/renesas/salvator-x/salvator-x.c
@@ -31,6 +31,7 @@
 #include <i2c.h>
 #include <mmc.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/renesas/sh7757lcr/sh7757lcr.c b/board/renesas/sh7757lcr/sh7757lcr.c
index fca730212f0..aef42e031fe 100644
--- a/board/renesas/sh7757lcr/sh7757lcr.c
+++ b/board/renesas/sh7757lcr/sh7757lcr.c
@@ -19,6 +19,7 @@
 #include <spi_flash.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 int checkboard(void)
 {
diff --git a/board/renesas/sh7763rdp/sh7763rdp.c b/board/renesas/sh7763rdp/sh7763rdp.c
index fbef959c52a..3ef56ea34e6 100644
--- a/board/renesas/sh7763rdp/sh7763rdp.c
+++ b/board/renesas/sh7763rdp/sh7763rdp.c
@@ -13,6 +13,7 @@
 #include <asm/io.h>
 #include <asm/processor.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 #define CPU_CMDREG	0xB1000006
 #define PDCR        0xffef0006
diff --git a/board/renesas/silk/qos.c b/board/renesas/silk/qos.c
index 43a29898657..a153673d1b0 100644
--- a/board/renesas/silk/qos.c
+++ b/board/renesas/silk/qos.c
@@ -12,6 +12,7 @@
 #include <asm/mach-types.h>
 #include <asm/io.h>
 #include <asm/arch/rmobile.h>
+#include <asm/types.h>
 
 #if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT)
 /* QoS version 0.11 */
diff --git a/board/renesas/silk/silk.c b/board/renesas/silk/silk.c
index c2667bb9c8a..fb672943840 100644
--- a/board/renesas/silk/silk.c
+++ b/board/renesas/silk/silk.c
@@ -33,6 +33,7 @@
 #include <miiphy.h>
 #include <i2c.h>
 #include <div64.h>
+#include <linux/types.h>
 #include "qos.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/renesas/silk/silk_spl.c b/board/renesas/silk/silk_spl.c
index b80c6b421ab..a43c7e97334 100644
--- a/board/renesas/silk/silk_spl.c
+++ b/board/renesas/silk/silk_spl.c
@@ -21,6 +21,7 @@
 #include <asm/arch/rmobile.h>
 #include <asm/arch/rcar-mstp.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include <spl.h>
 
diff --git a/board/renesas/stout/cpld.c b/board/renesas/stout/cpld.c
index 71a3f5dd39c..27bfcbf2f96 100644
--- a/board/renesas/stout/cpld.c
+++ b/board/renesas/stout/cpld.c
@@ -15,6 +15,7 @@
 #include <asm/io.h>
 #include <asm/gpio.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "cpld.h"
 
 #define SCLK			(92 + 24)
diff --git a/board/renesas/stout/qos.c b/board/renesas/stout/qos.c
index c2f0b853871..3b09740ac55 100644
--- a/board/renesas/stout/qos.c
+++ b/board/renesas/stout/qos.c
@@ -12,6 +12,7 @@
 #include <asm/mach-types.h>
 #include <asm/io.h>
 #include <asm/arch/rmobile.h>
+#include <asm/types.h>
 
 /* QoS version 0.955 for ES1 and version 0.973 for ES2 */
 #if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT)
diff --git a/board/renesas/stout/stout.c b/board/renesas/stout/stout.c
index 163137a65c6..a8b4a020c2e 100644
--- a/board/renesas/stout/stout.c
+++ b/board/renesas/stout/stout.c
@@ -15,6 +15,7 @@
 #include <netdev.h>
 #include <dm.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <dm/platform_data/serial_sh.h>
 #include <env_internal.h>
diff --git a/board/renesas/stout/stout_spl.c b/board/renesas/stout/stout_spl.c
index 10efd09139f..738443ea380 100644
--- a/board/renesas/stout/stout_spl.c
+++ b/board/renesas/stout/stout_spl.c
@@ -21,6 +21,7 @@
 #include <asm/arch/rmobile.h>
 #include <asm/arch/rcar-mstp.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include <spl.h>
 
diff --git a/board/renesas/ulcb/cpld.c b/board/renesas/ulcb/cpld.c
index 30f96966b57..e281d491006 100644
--- a/board/renesas/ulcb/cpld.c
+++ b/board/renesas/ulcb/cpld.c
@@ -14,6 +14,7 @@
 #include <asm/io.h>
 #include <dm.h>
 #include <errno.h>
+#include <asm/types.h>
 #include <linux/err.h>
 #include <sysreset.h>
 #include <linux/errno.h>
diff --git a/board/renesas/ulcb/ulcb.c b/board/renesas/ulcb/ulcb.c
index 0bec9954c36..538dc4ecbab 100644
--- a/board/renesas/ulcb/ulcb.c
+++ b/board/renesas/ulcb/ulcb.c
@@ -13,6 +13,7 @@
 #include <netdev.h>
 #include <dm.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <dm/platform_data/serial_sh.h>
 #include <asm/processor.h>
diff --git a/board/rockchip/tinker_rk3288/tinker-rk3288.c b/board/rockchip/tinker_rk3288/tinker-rk3288.c
index f85209c6498..c1418e4593c 100644
--- a/board/rockchip/tinker_rk3288/tinker-rk3288.c
+++ b/board/rockchip/tinker_rk3288/tinker-rk3288.c
@@ -13,6 +13,7 @@
 #include <netdev.h>
 #include <asm/arch-rockchip/bootrom.h>
 #include <asm/io.h>
+#include <asm/types.h>
 
 static int get_ethaddr_from_eeprom(u8 *addr)
 {
diff --git a/board/samsung/arndale/arndale.c b/board/samsung/arndale/arndale.c
index fa568f76c66..f715df30a46 100644
--- a/board/samsung/arndale/arndale.c
+++ b/board/samsung/arndale/arndale.c
@@ -14,6 +14,7 @@
 #include <asm/arch/pinmux.h>
 #include <asm/arch/dwmmc.h>
 #include <asm/arch/power.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/samsung/common/board.c b/board/samsung/common/board.c
index e79f5ddd2c9..fd727330f20 100644
--- a/board/samsung/common/board.c
+++ b/board/samsung/common/board.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <cros_ec.h>
 #include <env.h>
 #include <errno.h>
@@ -38,6 +39,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <samsung/misc.h>
 #include <dm/pinctrl.h>
 #include <dm.h>
diff --git a/board/samsung/common/exynos5-dt-types.c b/board/samsung/common/exynos5-dt-types.c
index 026fc4abf11..50b36c1b440 100644
--- a/board/samsung/common/exynos5-dt-types.c
+++ b/board/samsung/common/exynos5-dt-types.c
@@ -9,7 +9,9 @@
 #include <dm.h>
 #include <errno.h>
 #include <fdtdec.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
 #include <power/pmic.h>
diff --git a/board/samsung/common/exynos5-dt.c b/board/samsung/common/exynos5-dt.c
index 1783983ab11..f6e0c2020f7 100644
--- a/board/samsung/common/exynos5-dt.c
+++ b/board/samsung/common/exynos5-dt.c
@@ -29,6 +29,7 @@
 #include <asm/arch/sromc.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/max77686_pmic.h>
 #include <power/regulator.h>
diff --git a/board/samsung/common/misc.c b/board/samsung/common/misc.c
index 30a00892e0c..80a3109823a 100644
--- a/board/samsung/common/misc.c
+++ b/board/samsung/common/misc.c
@@ -15,6 +15,7 @@
 #include <linux/delay.h>
 #include <linux/kernel.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 #include <samsung/misc.h>
 #include <errno.h>
 #include <version.h>
diff --git a/board/samsung/goni/goni.c b/board/samsung/goni/goni.c
index 183579c4e3e..c4661ad4347 100644
--- a/board/samsung/goni/goni.c
+++ b/board/samsung/goni/goni.c
@@ -13,6 +13,7 @@
 #include <asm/gpio.h>
 #include <asm/arch/mmc.h>
 #include <dm.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/board/samsung/origen/origen.c b/board/samsung/origen/origen.c
index e17454ad77d..1e0da03f8b6 100644
--- a/board/samsung/origen/origen.c
+++ b/board/samsung/origen/origen.c
@@ -11,6 +11,7 @@
 #include <asm/arch/periph.h>
 #include <asm/arch/pinmux.h>
 #include <usb.h>
+#include <asm/types.h>
 
 u32 get_board_rev(void)
 {
diff --git a/board/samsung/smdkc100/smdkc100.c b/board/samsung/smdkc100/smdkc100.c
index 38cfde4f136..35de29370ad 100644
--- a/board/samsung/smdkc100/smdkc100.c
+++ b/board/samsung/smdkc100/smdkc100.c
@@ -15,6 +15,7 @@
 #include <asm/arch/sromc.h>
 #include <netdev.h>
 #include <asm/mach-types.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/samsung/smdkv310/smdkv310.c b/board/samsung/smdkv310/smdkv310.c
index 58b71df0817..2f921acb0ae 100644
--- a/board/samsung/smdkv310/smdkv310.c
+++ b/board/samsung/smdkv310/smdkv310.c
@@ -17,6 +17,7 @@
 #include <asm/arch/periph.h>
 #include <asm/arch/pinmux.h>
 #include <asm/arch/sromc.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/samsung/trats/trats.c b/board/samsung/trats/trats.c
index 18f311da979..f7862d9d62d 100644
--- a/board/samsung/trats/trats.c
+++ b/board/samsung/trats/trats.c
@@ -20,6 +20,7 @@
 #include <asm/arch/mipi_dsim.h>
 #include <asm/arch/watchdog.h>
 #include <asm/arch/power.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <power/pmic.h>
diff --git a/board/samsung/trats2/trats2.c b/board/samsung/trats2/trats2.c
index 6b008943da1..6ea1dfd9819 100644
--- a/board/samsung/trats2/trats2.c
+++ b/board/samsung/trats2/trats2.c
@@ -14,6 +14,7 @@
 #include <asm/arch/pinmux.h>
 #include <asm/arch/power.h>
 #include <asm/arch/mipi_dsim.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <power/pmic.h>
diff --git a/board/samsung/universal_c210/universal.c b/board/samsung/universal_c210/universal.c
index 15d866abcc7..e511593b4c3 100644
--- a/board/samsung/universal_c210/universal.c
+++ b/board/samsung/universal_c210/universal.c
@@ -18,6 +18,7 @@
 #include <asm/arch/pinmux.h>
 #include <asm/arch/watchdog.h>
 #include <ld9040.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/board/sandbox/sandbox.c b/board/sandbox/sandbox.c
index deee7b147df..6fbcc28e221 100644
--- a/board/sandbox/sandbox.c
+++ b/board/sandbox/sandbox.c
@@ -19,6 +19,7 @@
 #include <asm/u-boot-sandbox.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 /*
  * Pointer to initial global data area
diff --git a/board/sandisk/sansa_fuze_plus/sfp.c b/board/sandisk/sansa_fuze_plus/sfp.c
index 689cd799dd3..6caf53c532b 100644
--- a/board/sandisk/sansa_fuze_plus/sfp.c
+++ b/board/sandisk/sansa_fuze_plus/sfp.c
@@ -24,6 +24,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/sandisk/sansa_fuze_plus/spl_boot.c b/board/sandisk/sansa_fuze_plus/spl_boot.c
index 59464877fbf..9c526865fba 100644
--- a/board/sandisk/sansa_fuze_plus/spl_boot.c
+++ b/board/sandisk/sansa_fuze_plus/spl_boot.c
@@ -13,6 +13,7 @@
 #include <asm/arch/sys_proto.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define	MUX_CONFIG_EMI	(MXS_PAD_1V8 | MXS_PAD_12MA | MXS_PAD_PULLUP)
 #define	MUX_CONFIG_SSP	(MXS_PAD_3V3 | MXS_PAD_4MA | MXS_PAD_PULLUP)
diff --git a/board/sbc8349/sbc8349.c b/board/sbc8349/sbc8349.c
index a0cfa407694..33005611ed5 100644
--- a/board/sbc8349/sbc8349.c
+++ b/board/sbc8349/sbc8349.c
@@ -24,6 +24,7 @@
 #endif
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/sbc8548/ddr.c b/board/sbc8548/ddr.c
index 0c96e96d6c4..62eca8a72ad 100644
--- a/board/sbc8548/ddr.c
+++ b/board/sbc8548/ddr.c
@@ -4,10 +4,12 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <i2c.h>
 #include <stdio.h>
 #include <linux/delay.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
diff --git a/board/sbc8548/sbc8548.c b/board/sbc8548/sbc8548.c
index 7780b53a204..20f3e7d229c 100644
--- a/board/sbc8548/sbc8548.c
+++ b/board/sbc8548/sbc8548.c
@@ -29,6 +29,7 @@
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
+#include <linux/types.h>
 
 void local_bus_init(void);
 
diff --git a/board/sbc8641d/sbc8641d.c b/board/sbc8641d/sbc8641d.c
index cc17f80d07d..ad1502c9297 100644
--- a/board/sbc8641d/sbc8641d.c
+++ b/board/sbc8641d/sbc8641d.c
@@ -26,6 +26,7 @@
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/schulercontrol/sc_sps_1/spl_boot.c b/board/schulercontrol/sc_sps_1/spl_boot.c
index a58fde351a1..dbd1833bdd3 100644
--- a/board/schulercontrol/sc_sps_1/spl_boot.c
+++ b/board/schulercontrol/sc_sps_1/spl_boot.c
@@ -13,6 +13,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #define	MUX_CONFIG_LED	(MXS_PAD_3V3 | MXS_PAD_4MA | MXS_PAD_NOPULL)
 #define	MUX_CONFIG_SSP0	(MXS_PAD_3V3 | MXS_PAD_12MA | MXS_PAD_PULLUP)
diff --git a/board/seco/mx6quq7/mx6quq7.c b/board/seco/mx6quq7/mx6quq7.c
index e022e057b64..87577514dce 100644
--- a/board/seco/mx6quq7/mx6quq7.c
+++ b/board/seco/mx6quq7/mx6quq7.c
@@ -34,6 +34,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/mach-imx/mxc_i2c.h>
 #include <i2c.h>
+#include <linux/types.h>
 
 #include "../common/mx6.h"
 
diff --git a/board/seeed/linkit-smart-7688/board.c b/board/seeed/linkit-smart-7688/board.c
index bf7c69ea838..2653fac73c6 100644
--- a/board/seeed/linkit-smart-7688/board.c
+++ b/board/seeed/linkit-smart-7688/board.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <init.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
diff --git a/board/siemens/capricorn/board.c b/board/siemens/capricorn/board.c
index 433fba067b9..641f0c29ba9 100644
--- a/board/siemens/capricorn/board.c
+++ b/board/siemens/capricorn/board.c
@@ -7,6 +7,7 @@
  */
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <dm.h>
 #include <env.h>
 #include <errno.h>
@@ -33,6 +34,7 @@
 #include <linux/delay.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "../common/factoryset.h"
 
 #define GPIO_PAD_CTRL \
diff --git a/board/siemens/capricorn/spl.c b/board/siemens/capricorn/spl.c
index d81764832de..115ab4753df 100644
--- a/board/siemens/capricorn/spl.c
+++ b/board/siemens/capricorn/spl.c
@@ -16,6 +16,7 @@
 #include <dm/uclass-internal.h>
 #include <dm/device-internal.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/siemens/common/factoryset.c b/board/siemens/common/factoryset.c
index d60ef4e87cd..dbd09292d00 100644
--- a/board/siemens/common/factoryset.c
+++ b/board/siemens/common/factoryset.c
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
  *
+#include <linux/types.h>
  * Read FactorySet information from EEPROM into global structure.
  * (C) Copyright 2013 Siemens Schweiz AG
  */
diff --git a/board/siemens/common/factoryset.h b/board/siemens/common/factoryset.h
index 261a2176879..fb9da221a1b 100644
--- a/board/siemens/common/factoryset.h
+++ b/board/siemens/common/factoryset.h
@@ -7,6 +7,7 @@
 #ifndef __FACTORYSET_H
 #define __FACTORYSET_H
 
+#include <linux/types.h>
 #define MAX_STRING_LENGTH	32
 
 struct factorysetcontainer {
diff --git a/board/siemens/corvus/board.c b/board/siemens/corvus/board.c
index fbccbb0f6da..88631131cd9 100644
--- a/board/siemens/corvus/board.c
+++ b/board/siemens/corvus/board.c
@@ -31,6 +31,7 @@
 #include <netdev.h>
 #endif
 #include <spi.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 
 #ifdef CONFIG_USB_GADGET_ATMEL_USBA
diff --git a/board/siemens/draco/board.c b/board/siemens/draco/board.c
index 7fa7d632ae2..159901231c5 100644
--- a/board/siemens/draco/board.c
+++ b/board/siemens/draco/board.c
@@ -39,6 +39,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include "board.h"
 #include "../common/factoryset.h"
 #include <nand.h>
diff --git a/board/siemens/pxm2/board.c b/board/siemens/pxm2/board.c
index 18b397c61d4..55dac4a7b92 100644
--- a/board/siemens/pxm2/board.c
+++ b/board/siemens/pxm2/board.c
@@ -32,6 +32,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "../../../drivers/video/da8xx-fb.h"
 #include <asm/io.h>
 #include <asm/emif.h>
diff --git a/board/siemens/rut/board.c b/board/siemens/rut/board.c
index 7be23e97967..4311877aff3 100644
--- a/board/siemens/rut/board.c
+++ b/board/siemens/rut/board.c
@@ -18,6 +18,7 @@
 #include <net.h>
 #include <spi.h>
 #include <spl.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/arch/cpu.h>
@@ -36,6 +37,7 @@
 #include <cpsw.h>
 #include <video.h>
 #include <watchdog.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
diff --git a/board/sifive/fu540/fu540.c b/board/sifive/fu540/fu540.c
index 93bcecd6ac9..f85cbad1594 100644
--- a/board/sifive/fu540/fu540.c
+++ b/board/sifive/fu540/fu540.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <asm/types.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 4e2662a46c6..06e4680b161 100644
--- a/board/sifive/fu540/spl.c
+++ b/board/sifive/fu540/spl.c
@@ -15,6 +15,7 @@
 #include <asm/gpio.h>
 #include <asm/arch/gpio.h>
 #include <asm/arch/spl.h>
+#include <linux/types.h>
 
 #define GEM_PHY_RESET	SIFIVE_GENERIC_GPIO_NR(0, 12)
 
diff --git a/board/sks-kinkel/sksimx6/sksimx6.c b/board/sks-kinkel/sksimx6/sksimx6.c
index 15c75959e6a..ffea5a53ce2 100644
--- a/board/sks-kinkel/sksimx6/sksimx6.c
+++ b/board/sks-kinkel/sksimx6/sksimx6.c
@@ -29,6 +29,7 @@
 #include <miiphy.h>
 #include <micrel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <common.h>
 #include <malloc.h>
diff --git a/board/socrates/nand.c b/board/socrates/nand.c
index 3fca5d063ca..c82806b0ef5 100644
--- a/board/socrates/nand.c
+++ b/board/socrates/nand.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <stdio.h>
+#include <linux/types.h>
 
 #if defined(CONFIG_SYS_NAND_BASE)
 #include <nand.h>
diff --git a/board/socrates/sdram.c b/board/socrates/sdram.c
index d358a209a4a..4775684dd61 100644
--- a/board/socrates/sdram.c
+++ b/board/socrates/sdram.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <init.h>
 #include <asm/processor.h>
 #include <asm/immap_85xx.h>
@@ -13,6 +14,7 @@
 #include <asm/mmu.h>
 #include <spd_sdram.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 
 #if !defined(CONFIG_SPD_EEPROM)
diff --git a/board/socrates/socrates.c b/board/socrates/socrates.c
index 96cde5afcbe..96a59b92697 100644
--- a/board/socrates/socrates.c
+++ b/board/socrates/socrates.c
@@ -30,6 +30,7 @@
 #include <i2c.h>
 #include <mb862xx.h>
 #include <video_fb.h>
+#include <linux/types.h>
 #include "upm_table.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/softing/vining_2000/vining_2000.c b/board/softing/vining_2000/vining_2000.c
index d72aee47ca9..74e646ad781 100644
--- a/board/softing/vining_2000/vining_2000.c
+++ b/board/softing/vining_2000/vining_2000.c
@@ -6,6 +6,7 @@
  * Author: Christoph Fritz <chf.fritz@googlemail.com>
  */
 
+#include <compiler.h>
 #include <init.h>
 #include <net.h>
 #include <stdio.h>
@@ -34,6 +35,7 @@
 #include <miiphy.h>
 #include <netdev.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/pfuze100_pmic.h>
 #include <usb.h>
diff --git a/board/softing/vining_fpga/qts/pinmux_config.h b/board/softing/vining_fpga/qts/pinmux_config.h
index f73ccbbabee..42c807cebc8 100644
--- a/board/softing/vining_fpga/qts/pinmux_config.h
+++ b/board/softing/vining_fpga/qts/pinmux_config.h
@@ -6,6 +6,7 @@
 #ifndef __SOCFPGA_PINMUX_CONFIG_H__
 #define __SOCFPGA_PINMUX_CONFIG_H__
 
+#include <asm/types.h>
 const u8 sys_mgr_init_table[] = {
 	0, /* EMACIO0 */
 	2, /* EMACIO1 */
diff --git a/board/softing/vining_fpga/qts/sdram_config.h b/board/softing/vining_fpga/qts/sdram_config.h
index ec067eb473d..22e0e4d5e28 100644
--- a/board/softing/vining_fpga/qts/sdram_config.h
+++ b/board/softing/vining_fpga/qts/sdram_config.h
@@ -7,6 +7,7 @@
 #define __SOCFPGA_SDRAM_CONFIG_H__
 
 /* SDRAM configuration */
+#include <asm/types.h>
 #define CONFIG_HPS_SDR_CTRLCFG_CPORTRDWR_CPORTRDWR		0x5A56A
 #define CONFIG_HPS_SDR_CTRLCFG_CPORTRMAP_CPORTRMAP		0xB00088
 #define CONFIG_HPS_SDR_CTRLCFG_CPORTWIDTH_CPORTWIDTH		0x44555
diff --git a/board/softing/vining_fpga/socfpga.c b/board/softing/vining_fpga/socfpga.c
index c89c7994d50..a66ef693077 100644
--- a/board/softing/vining_fpga/socfpga.c
+++ b/board/softing/vining_fpga/socfpga.c
@@ -19,6 +19,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/solidrun/clearfog/clearfog.c b/board/solidrun/clearfog/clearfog.c
index 83e789b99f7..4c762b39c83 100644
--- a/board/solidrun/clearfog/clearfog.c
+++ b/board/solidrun/clearfog/clearfog.c
@@ -10,11 +10,13 @@
 #include <miiphy.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/board/solidrun/common/tlv_data.c b/board/solidrun/common/tlv_data.c
index 315faeb6140..ab1106949ec 100644
--- a/board/solidrun/common/tlv_data.c
+++ b/board/solidrun/common/tlv_data.c
@@ -5,7 +5,9 @@
 
 #include <common.h>
 #include <compiler.h>
+#include <stdbool.h>
 #include <tlv_eeprom.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include "tlv_data.h"
diff --git a/board/solidrun/mx6cuboxi/mx6cuboxi.c b/board/solidrun/mx6cuboxi/mx6cuboxi.c
index b523a06b29f..bdb018aecd5 100644
--- a/board/solidrun/mx6cuboxi/mx6cuboxi.c
+++ b/board/solidrun/mx6cuboxi/mx6cuboxi.c
@@ -17,6 +17,7 @@
 #include <image.h>
 #include <init.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/arch/clock.h>
@@ -43,6 +44,7 @@
 #include <usb.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <usb/ehci-ci.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/spear/spear300/spear300.c b/board/spear/spear300/spear300.c
index 1fe825182f3..a29c59c2d8d 100644
--- a/board/spear/spear300/spear300.c
+++ b/board/spear/spear300/spear300.c
@@ -10,6 +10,7 @@
 #include <netdev.h>
 #include <nand.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/mtd/fsmc_nand.h>
 #include <asm/mach-types.h>
diff --git a/board/spear/spear310/spear310.c b/board/spear/spear310/spear310.c
index 721b1dd4aa5..06a697b9a40 100644
--- a/board/spear/spear310/spear310.c
+++ b/board/spear/spear310/spear310.c
@@ -11,6 +11,7 @@
 #include <netdev.h>
 #include <nand.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/mtd/fsmc_nand.h>
 #include <asm/mach-types.h>
diff --git a/board/spear/spear320/spear320.c b/board/spear/spear320/spear320.c
index f726f8fccf0..23fc12cdfa4 100644
--- a/board/spear/spear320/spear320.c
+++ b/board/spear/spear320/spear320.c
@@ -11,6 +11,7 @@
 #include <netdev.h>
 #include <nand.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/mtd/fsmc_nand.h>
 #include <asm/mach-types.h>
diff --git a/board/spear/spear600/spear600.c b/board/spear/spear600/spear600.c
index 0c01f1fbf9e..101c8f15c09 100644
--- a/board/spear/spear600/spear600.c
+++ b/board/spear/spear600/spear600.c
@@ -10,6 +10,7 @@
 #include <netdev.h>
 #include <nand.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/mtd/fsmc_nand.h>
 #include <asm/mach-types.h>
diff --git a/board/spear/x600/fpga.c b/board/spear/x600/fpga.c
index 5140694b9e8..f8f3581c730 100644
--- a/board/spear/x600/fpga.c
+++ b/board/spear/x600/fpga.c
@@ -12,6 +12,7 @@
 #include <asm/arch/hardware.h>
 #include <asm/arch/spr_misc.h>
 #include <asm/arch/spr_ssp.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 /*
diff --git a/board/sr1500/qts/pinmux_config.h b/board/sr1500/qts/pinmux_config.h
index a8b8dbadeff..65857d10a1b 100644
--- a/board/sr1500/qts/pinmux_config.h
+++ b/board/sr1500/qts/pinmux_config.h
@@ -6,6 +6,7 @@
 #ifndef __SOCFPGA_PINMUX_CONFIG_H__
 #define __SOCFPGA_PINMUX_CONFIG_H__
 
+#include <asm/types.h>
 const u8 sys_mgr_init_table[] = {
 	0, /* EMACIO0 */
 	2, /* EMACIO1 */
diff --git a/board/sr1500/qts/sdram_config.h b/board/sr1500/qts/sdram_config.h
index d25354bb49c..711a71ba9b3 100644
--- a/board/sr1500/qts/sdram_config.h
+++ b/board/sr1500/qts/sdram_config.h
@@ -7,6 +7,7 @@
 #define __SOCFPGA_SDRAM_CONFIG_H__
 
 /* SDRAM configuration */
+#include <asm/types.h>
 #define CONFIG_HPS_SDR_CTRLCFG_CPORTRDWR_CPORTRDWR		0x5A56A
 #define CONFIG_HPS_SDR_CTRLCFG_CPORTRMAP_CPORTRMAP		0xB00088
 #define CONFIG_HPS_SDR_CTRLCFG_CPORTWIDTH_CPORTWIDTH		0x44555
diff --git a/board/st/common/stm32mp_dfu.c b/board/st/common/stm32mp_dfu.c
index 21d21dafd8e..faf90a30efd 100644
--- a/board/st/common/stm32mp_dfu.c
+++ b/board/st/common/stm32mp_dfu.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <blk.h>
+#include <compiler.h>
 #include <dfu.h>
 #include <env.h>
 #include <memalign.h>
@@ -15,6 +16,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/arch/stm32prog.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
diff --git a/board/st/common/stpmic1.c b/board/st/common/stpmic1.c
index 7aa85851738..d7c8890eb3f 100644
--- a/board/st/common/stpmic1.c
+++ b/board/st/common/stpmic1.c
@@ -9,6 +9,7 @@
 #include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/ddr.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <power/pmic.h>
diff --git a/board/st/common/stpmic1.h b/board/st/common/stpmic1.h
index b17d6f16338..6d172aae467 100644
--- a/board/st/common/stpmic1.h
+++ b/board/st/common/stpmic1.h
@@ -3,4 +3,5 @@
  * Copyright (C) 2020, STMicroelectronics - All Rights Reserved
  */
 
+#include <asm/types.h>
 void stpmic1_init(u32 voltage_mv);
diff --git a/board/st/stm32f429-discovery/stm32f429-discovery.c b/board/st/stm32f429-discovery/stm32f429-discovery.c
index 205979d96f1..b0be9663dd9 100644
--- a/board/st/stm32f429-discovery/stm32f429-discovery.c
+++ b/board/st/stm32f429-discovery/stm32f429-discovery.c
@@ -19,6 +19,7 @@
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #include <asm/io.h>
 #include <asm/arch/stm32.h>
diff --git a/board/st/stm32f429-evaluation/stm32f429-evaluation.c b/board/st/stm32f429-evaluation/stm32f429-evaluation.c
index 396cc61a458..393fe404c74 100644
--- a/board/st/stm32f429-evaluation/stm32f429-evaluation.c
+++ b/board/st/stm32f429-evaluation/stm32f429-evaluation.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
 
diff --git a/board/st/stm32f469-discovery/stm32f469-discovery.c b/board/st/stm32f469-discovery/stm32f469-discovery.c
index b70fd39ff30..54242d9a971 100644
--- a/board/st/stm32f469-discovery/stm32f469-discovery.c
+++ b/board/st/stm32f469-discovery/stm32f469-discovery.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
 
diff --git a/board/st/stm32f746-disco/stm32f746-disco.c b/board/st/stm32f746-disco/stm32f746-disco.c
index cf553ff5b6a..e1625f88a5b 100644
--- a/board/st/stm32f746-disco/stm32f746-disco.c
+++ b/board/st/stm32f746-disco/stm32f746-disco.c
@@ -27,6 +27,7 @@
 #include <asm/gpio.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/st/stm32h743-disco/stm32h743-disco.c b/board/st/stm32h743-disco/stm32h743-disco.c
index ec87fc3e5ef..ad55fe3b871 100644
--- a/board/st/stm32h743-disco/stm32h743-disco.c
+++ b/board/st/stm32h743-disco/stm32h743-disco.c
@@ -9,6 +9,7 @@
 #include <init.h>
 #include <log.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
 
diff --git a/board/st/stm32h743-eval/stm32h743-eval.c b/board/st/stm32h743-eval/stm32h743-eval.c
index ec87fc3e5ef..ad55fe3b871 100644
--- a/board/st/stm32h743-eval/stm32h743-eval.c
+++ b/board/st/stm32h743-eval/stm32h743-eval.c
@@ -9,6 +9,7 @@
 #include <init.h>
 #include <log.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
 
diff --git a/board/st/stm32mp1/spl.c b/board/st/stm32mp1/spl.c
index a6a41780c96..d6c8bddad85 100644
--- a/board/st/stm32mp1/spl.c
+++ b/board/st/stm32mp1/spl.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include "../common/stpmic1.h"
diff --git a/board/st/stm32mp1/stm32mp1.c b/board/st/stm32mp1/stm32mp1.c
index 0938906fcb1..ad9fb68cd2d 100644
--- a/board/st/stm32mp1/stm32mp1.c
+++ b/board/st/stm32mp1/stm32mp1.c
@@ -26,6 +26,7 @@
 #include <phy.h>
 #include <remoteproc.h>
 #include <reset.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <syscon.h>
 #include <usb.h>
@@ -46,6 +47,7 @@
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <power/regulator.h>
 #include <usb/dwc2_udc.h>
 
diff --git a/board/st/stv0991/stv0991.c b/board/st/stv0991/stv0991.c
index bd2d56d6d59..8e44c8e2ad7 100644
--- a/board/st/stv0991/stv0991.c
+++ b/board/st/stv0991/stv0991.c
@@ -18,6 +18,7 @@
 #include <netdev.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <dm/platform_data/serial_pl01x.h>
 
diff --git a/board/sunxi/board.c b/board/sunxi/board.c
index f49984238f1..fb547d30455 100644
--- a/board/sunxi/board.c
+++ b/board/sunxi/board.c
@@ -36,6 +36,7 @@
 #include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <u-boot/crc.h>
 #ifndef CONFIG_ARM64
 #include <asm/armv7.h>
diff --git a/board/synopsys/axs10x/axs10x.c b/board/synopsys/axs10x/axs10x.c
index 8faaf8045c1..7fb1ff2722e 100644
--- a/board/synopsys/axs10x/axs10x.c
+++ b/board/synopsys/axs10x/axs10x.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <dwmmc.h>
 #include <init.h>
@@ -11,6 +12,7 @@
 #include <stdio.h>
 #include <asm/arcregs.h>
 #include <asm/global_data.h>
+#include <linux/types.h>
 #include "axs10x.h"
 #include <asm/cache.h>
 
diff --git a/board/synopsys/emsdp/emsdp.c b/board/synopsys/emsdp/emsdp.c
index 995514eab58..db9d2514389 100644
--- a/board/synopsys/emsdp/emsdp.c
+++ b/board/synopsys/emsdp/emsdp.c
@@ -14,6 +14,7 @@
 #include <linux/bitops.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <asm/arcregs.h>
 
diff --git a/board/synopsys/hsdk/clk-lib.c b/board/synopsys/hsdk/clk-lib.c
index 295e80afe72..d8da3ceed3f 100644
--- a/board/synopsys/hsdk/clk-lib.c
+++ b/board/synopsys/hsdk/clk-lib.c
@@ -11,6 +11,7 @@
 #include <dm/device.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 #include "clk-lib.h"
 
diff --git a/board/synopsys/hsdk/clk-lib.h b/board/synopsys/hsdk/clk-lib.h
index 970bcd4a17e..3d48ac5485f 100644
--- a/board/synopsys/hsdk/clk-lib.h
+++ b/board/synopsys/hsdk/clk-lib.h
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <linux/bitops.h>
+#include <linux/types.h>
 
 enum clk_ctl_ops {
 	CLK_SET		= BIT(0), /* set frequency */
diff --git a/board/synopsys/hsdk/env-lib.h b/board/synopsys/hsdk/env-lib.h
index b745442775c..545a19a0552 100644
--- a/board/synopsys/hsdk/env-lib.h
+++ b/board/synopsys/hsdk/env-lib.h
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <config.h>
 #include <stdbool.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 
 enum env_type {
diff --git a/board/synopsys/hsdk/hsdk.c b/board/synopsys/hsdk/hsdk.c
index 0812126a98d..9b21315eedb 100644
--- a/board/synopsys/hsdk/hsdk.c
+++ b/board/synopsys/hsdk/hsdk.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <config.h>
 #include <cpu_func.h>
 #include <env.h>
@@ -13,6 +14,7 @@
 #include <init.h>
 #include <irq_func.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/cache.h>
@@ -29,6 +31,7 @@
 #include <malloc.h>
 #include <usb.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "clk-lib.h"
 #include "env-lib.h"
diff --git a/board/synopsys/iot_devkit/iot_devkit.c b/board/synopsys/iot_devkit/iot_devkit.c
index 50af75fb7e2..96b01e7ff1e 100644
--- a/board/synopsys/iot_devkit/iot_devkit.c
+++ b/board/synopsys/iot_devkit/iot_devkit.c
@@ -14,6 +14,7 @@
 #include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <fdtdec.h>
+#include <linux/types.h>
 
 #include <asm/arcregs.h>
 
diff --git a/board/sysam/amcore/amcore.c b/board/sysam/amcore/amcore.c
index 183a78d9ed7..4936f6d9daa 100644
--- a/board/sysam/amcore/amcore.c
+++ b/board/sysam/amcore/amcore.c
@@ -14,6 +14,7 @@
 #include <asm/immap.h>
 #include <asm/io.h>
 #include <dm.h>
+#include <asm/types.h>
 #include <dm/platform_data/serial_coldfire.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/sysam/stmark2/stmark2.c b/board/sysam/stmark2/stmark2.c
index 4c75bd6a5be..d17bd83e020 100644
--- a/board/sysam/stmark2/stmark2.c
+++ b/board/sysam/stmark2/stmark2.c
@@ -14,6 +14,7 @@
 #include <asm/immap.h>
 #include <mmc.h>
 #include <fsl_esdhc.h>
+#include <asm/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/tbs/tbs2910/tbs2910.c b/board/tbs/tbs2910/tbs2910.c
index 5871e68bfb1..26ea977878c 100644
--- a/board/tbs/tbs2910/tbs2910.c
+++ b/board/tbs/tbs2910/tbs2910.c
@@ -24,6 +24,7 @@
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 DECLARE_GLOBAL_DATA_PTR;
 
 #define UART_PAD_CTRL  (PAD_CTL_PUS_100K_UP |			\
diff --git a/board/tcl/sl50/board.c b/board/tcl/sl50/board.c
index 7adaea5d587..0f846e1eb24 100644
--- a/board/tcl/sl50/board.c
+++ b/board/tcl/sl50/board.c
@@ -32,6 +32,7 @@
 #include <miiphy.h>
 #include <cpsw.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 #include <power/tps65217.h>
 #include <power/tps65910.h>
 #include <env_internal.h>
diff --git a/board/technexion/pico-imx6/pico-imx6.c b/board/technexion/pico-imx6/pico-imx6.c
index 24e8376d786..05ff535cbfe 100644
--- a/board/technexion/pico-imx6/pico-imx6.c
+++ b/board/technexion/pico-imx6/pico-imx6.c
@@ -30,6 +30,7 @@
 #include <miiphy.h>
 #include <netdev.h>
 #include <phy.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/technexion/pico-imx6/spl.c b/board/technexion/pico-imx6/spl.c
index dd5e154e671..32f7fa24e63 100644
--- a/board/technexion/pico-imx6/spl.c
+++ b/board/technexion/pico-imx6/spl.c
@@ -26,6 +26,7 @@
 #include <asm/arch/sys_proto.h>
 #include <spl.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #if defined(CONFIG_SPL_BUILD)
 #include <asm/arch/mx6-ddr.h>
diff --git a/board/technexion/pico-imx6ul/pico-imx6ul.c b/board/technexion/pico-imx6ul/pico-imx6ul.c
index 5ba16bcba58..0793efd80ef 100644
--- a/board/technexion/pico-imx6ul/pico-imx6ul.c
+++ b/board/technexion/pico-imx6ul/pico-imx6ul.c
@@ -21,6 +21,7 @@
 #include <common.h>
 #include <miiphy.h>
 #include <netdev.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/board/technexion/pico-imx6ul/spl.c b/board/technexion/pico-imx6ul/spl.c
index 55d19728af3..989c6919e7a 100644
--- a/board/technexion/pico-imx6ul/spl.c
+++ b/board/technexion/pico-imx6ul/spl.c
@@ -21,6 +21,7 @@
 #include <linux/libfdt.h>
 #include <spl.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #if defined(CONFIG_SPL_BUILD)
 
diff --git a/board/technexion/pico-imx7d/spl.c b/board/technexion/pico-imx7d/spl.c
index 50604f196f2..811e84de968 100644
--- a/board/technexion/pico-imx7d/spl.c
+++ b/board/technexion/pico-imx7d/spl.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <init.h>
+#include <stdbool.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/crm_regs.h>
@@ -21,6 +22,7 @@
 #include <asm/u-boot.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #if defined(CONFIG_SPL_BUILD)
 
diff --git a/board/technexion/pico-imx8mq/spl.c b/board/technexion/pico-imx8mq/spl.c
index e2d557732f6..f5ed05f234e 100644
--- a/board/technexion/pico-imx8mq/spl.c
+++ b/board/technexion/pico-imx8mq/spl.c
@@ -25,6 +25,7 @@
 #include <spl.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "lpddr4_timing.h"
 
diff --git a/board/technologic/ts4600/iomux.c b/board/technologic/ts4600/iomux.c
index 5ef69154254..0ba85499142 100644
--- a/board/technologic/ts4600/iomux.c
+++ b/board/technologic/ts4600/iomux.c
@@ -20,6 +20,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #define	MUX_CONFIG_SSP0	(MXS_PAD_3V3 | MXS_PAD_8MA | MXS_PAD_PULLUP)
 #define	MUX_CONFIG_EMI	(MXS_PAD_3V3 | MXS_PAD_12MA | MXS_PAD_NOPULL)
diff --git a/board/technologic/ts4800/ts4800.c b/board/technologic/ts4800/ts4800.c
index c2a28ccf63b..72e3091c1b8 100644
--- a/board/technologic/ts4800/ts4800.c
+++ b/board/technologic/ts4800/ts4800.c
@@ -29,6 +29,7 @@
 #include <fsl_esdhc_imx.h>
 #include <mc13892.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include <malloc.h>
 #include <netdev.h>
diff --git a/board/technologic/ts4800/ts4800.h b/board/technologic/ts4800/ts4800.h
index 25644f523ac..df3813e363b 100644
--- a/board/technologic/ts4800/ts4800.h
+++ b/board/technologic/ts4800/ts4800.h
@@ -6,6 +6,7 @@
 #ifndef _TS4800_H
 #define _TS4800_H
 
+#include <asm/types.h>
 #define TS4800_SYSCON_BASE 0xb0010000
 
 struct ts4800_wtd_regs {
diff --git a/board/terasic/de0-nano-soc/qts/pinmux_config.h b/board/terasic/de0-nano-soc/qts/pinmux_config.h
index 3058ee3a594..f9fb07b5e05 100644
--- a/board/terasic/de0-nano-soc/qts/pinmux_config.h
+++ b/board/terasic/de0-nano-soc/qts/pinmux_config.h
@@ -7,6 +7,7 @@
 #define __SOCFPGA_PINMUX_CONFIG_H__
 
 /* pin MUX configuration data */
+#include <asm/types.h>
 const u8 sys_mgr_init_table[] = {
 	0, /* EMACIO0 */
 	2, /* EMACIO1 */
diff --git a/board/terasic/de0-nano-soc/qts/sdram_config.h b/board/terasic/de0-nano-soc/qts/sdram_config.h
index 0504dd688f9..b9363d87e68 100644
--- a/board/terasic/de0-nano-soc/qts/sdram_config.h
+++ b/board/terasic/de0-nano-soc/qts/sdram_config.h
@@ -5,6 +5,7 @@
 #ifndef __SDRAM_CONFIG_H
 #define __SDRAM_CONFIG_H
 
+#include <asm/types.h>
 #define CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_MEMTYPE			2
 #define CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_MEMBL			8
 #define CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_ADDRORDER		0
diff --git a/board/terasic/de1-soc/qts/pinmux_config.h b/board/terasic/de1-soc/qts/pinmux_config.h
index c75635005cc..f5bf0567b00 100644
--- a/board/terasic/de1-soc/qts/pinmux_config.h
+++ b/board/terasic/de1-soc/qts/pinmux_config.h
@@ -6,6 +6,7 @@
 #ifndef __SOCFPGA_PINMUX_CONFIG_H__
 #define __SOCFPGA_PINMUX_CONFIG_H__
 
+#include <asm/types.h>
 const u8 sys_mgr_init_table[] = {
 	0, /* EMACIO0 */
 	2, /* EMACIO1 */
diff --git a/board/terasic/de1-soc/qts/sdram_config.h b/board/terasic/de1-soc/qts/sdram_config.h
index c60426f2ff6..550bd50f7a6 100644
--- a/board/terasic/de1-soc/qts/sdram_config.h
+++ b/board/terasic/de1-soc/qts/sdram_config.h
@@ -7,6 +7,7 @@
 #define __SOCFPGA_SDRAM_CONFIG_H__
 
 /* SDRAM configuration */
+#include <asm/types.h>
 #define CONFIG_HPS_SDR_CTRLCFG_CPORTRDWR_CPORTRDWR		0x5A56A
 #define CONFIG_HPS_SDR_CTRLCFG_CPORTRMAP_CPORTRMAP		0xB00088
 #define CONFIG_HPS_SDR_CTRLCFG_CPORTWIDTH_CPORTWIDTH		0x44555
diff --git a/board/terasic/de1-soc/socfpga.c b/board/terasic/de1-soc/socfpga.c
index 22fbee40aba..2e516ed53be 100644
--- a/board/terasic/de1-soc/socfpga.c
+++ b/board/terasic/de1-soc/socfpga.c
@@ -4,6 +4,7 @@
  */
 #include <common.h>
 #include <spl.h>
+#include <asm/types.h>
 
 void board_boot_order(u32 *spl_boot_list)
 {
diff --git a/board/terasic/de10-nano/qts/pinmux_config.h b/board/terasic/de10-nano/qts/pinmux_config.h
index 6a9c4150296..ca5b3e746a6 100644
--- a/board/terasic/de10-nano/qts/pinmux_config.h
+++ b/board/terasic/de10-nano/qts/pinmux_config.h
@@ -6,6 +6,7 @@
 #ifndef __SOCFPGA_PINMUX_CONFIG_H__
 #define __SOCFPGA_PINMUX_CONFIG_H__
 
+#include <asm/types.h>
 const u8 sys_mgr_init_table[] = {
 	0, /* EMACIO0 */
 	2, /* EMACIO1 */
diff --git a/board/terasic/de10-nano/qts/sdram_config.h b/board/terasic/de10-nano/qts/sdram_config.h
index 26910ef348b..2fa5e537b1a 100644
--- a/board/terasic/de10-nano/qts/sdram_config.h
+++ b/board/terasic/de10-nano/qts/sdram_config.h
@@ -7,6 +7,7 @@
 #define __SOCFPGA_SDRAM_CONFIG_H__
 
 /* SDRAM configuration */
+#include <asm/types.h>
 #define CONFIG_HPS_SDR_CTRLCFG_CPORTRDWR_CPORTRDWR		0x5A56A
 #define CONFIG_HPS_SDR_CTRLCFG_CPORTRMAP_CPORTRMAP		0xB00088
 #define CONFIG_HPS_SDR_CTRLCFG_CPORTWIDTH_CPORTWIDTH		0x44555
diff --git a/board/terasic/sockit/qts/pinmux_config.h b/board/terasic/sockit/qts/pinmux_config.h
index f8e458f3dd4..896358352d0 100644
--- a/board/terasic/sockit/qts/pinmux_config.h
+++ b/board/terasic/sockit/qts/pinmux_config.h
@@ -6,6 +6,7 @@
 #ifndef __SOCFPGA_PINMUX_CONFIG_H__
 #define __SOCFPGA_PINMUX_CONFIG_H__
 
+#include <asm/types.h>
 const u8 sys_mgr_init_table[] = {
 	0, /* EMACIO0 */
 	2, /* EMACIO1 */
diff --git a/board/terasic/sockit/qts/sdram_config.h b/board/terasic/sockit/qts/sdram_config.h
index 96cc3570341..e5965d734b1 100644
--- a/board/terasic/sockit/qts/sdram_config.h
+++ b/board/terasic/sockit/qts/sdram_config.h
@@ -7,6 +7,7 @@
 #define __SOCFPGA_SDRAM_CONFIG_H__
 
 /* SDRAM configuration */
+#include <asm/types.h>
 #define CONFIG_HPS_SDR_CTRLCFG_CPORTRDWR_CPORTRDWR		0x5A56A
 #define CONFIG_HPS_SDR_CTRLCFG_CPORTRMAP_CPORTRMAP		0xB00088
 #define CONFIG_HPS_SDR_CTRLCFG_CPORTWIDTH_CPORTWIDTH		0x44555
diff --git a/board/theadorable/fpga.c b/board/theadorable/fpga.c
index 5a34244ea05..6e12e4f9c08 100644
--- a/board/theadorable/fpga.c
+++ b/board/theadorable/fpga.c
@@ -16,6 +16,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "theadorable.h"
 
 /*
diff --git a/board/theadorable/theadorable.c b/board/theadorable/theadorable.c
index 2f3df520928..909bc6f39ba 100644
--- a/board/theadorable/theadorable.c
+++ b/board/theadorable/theadorable.c
@@ -27,6 +27,7 @@
 #ifdef CONFIG_NET
 #include <netdev.h>
 #endif
+#include <linux/types.h>
 #include <u-boot/crc.h>
 #include "theadorable.h"
 
diff --git a/board/theobroma-systems/puma_rk3399/puma-rk3399.c b/board/theobroma-systems/puma_rk3399/puma-rk3399.c
index 7edfd2a2b92..71bfb3677bf 100644
--- a/board/theobroma-systems/puma_rk3399/puma-rk3399.c
+++ b/board/theobroma-systems/puma_rk3399/puma-rk3399.c
@@ -12,6 +12,7 @@
 #include <spl.h>
 #include <syscon.h>
 #include <vsprintf.h>
+#include <asm/types.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 21f90e0e7e8..13c84de23b9 100644
--- a/board/ti/am335x/board.c
+++ b/board/ti/am335x/board.c
@@ -45,6 +45,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <power/tps65217.h>
 #include <power/tps65910.h>
 #include <env_internal.h>
diff --git a/board/ti/am43xx/board.c b/board/ti/am43xx/board.c
index e3e13421cd3..8d2652dfcdc 100644
--- a/board/ti/am43xx/board.c
+++ b/board/ti/am43xx/board.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <eeprom.h>
 #include <image.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
@@ -32,6 +33,7 @@
 #include <asm/omap_common.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "../common/board_detect.h"
 #include "board.h"
 #include <power/pmic.h>
diff --git a/board/ti/am57xx/board.c b/board/ti/am57xx/board.c
index 4458ddec325..62d1265643a 100644
--- a/board/ti/am57xx/board.c
+++ b/board/ti/am57xx/board.c
@@ -17,6 +17,7 @@
 #include <palmas.h>
 #include <sata.h>
 #include <serial.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <usb.h>
 #include <errno.h>
@@ -39,6 +40,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <linux/usb/gadget.h>
 #include <dwc3-uboot.h>
 #include <dwc3-omap-uboot.h>
diff --git a/board/ti/am65x/evm.c b/board/ti/am65x/evm.c
index c34726ac983..f9a0f795989 100644
--- a/board/ti/am65x/evm.c
+++ b/board/ti/am65x/evm.c
@@ -28,6 +28,7 @@
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "../common/board_detect.h"
 
diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c
index 15b0d5149f8..331bb6e2279 100644
--- a/board/ti/beagle/beagle.c
+++ b/board/ti/beagle/beagle.c
@@ -39,6 +39,7 @@
 #include <asm/omap_musb.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
 #include <linux/usb/musb.h>
diff --git a/board/ti/common/board_detect.c b/board/ti/common/board_detect.c
index 18b8a967106..1687997abac 100644
--- a/board/ti/common/board_detect.c
+++ b/board/ti/common/board_detect.c
@@ -8,9 +8,11 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <eeprom.h>
 #include <log.h>
 #include <net.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/arch/hardware.h>
@@ -25,6 +27,7 @@
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "board_detect.h"
 
diff --git a/board/ti/common/board_detect.h b/board/ti/common/board_detect.h
index a74b9468bca..20d3f3d9098 100644
--- a/board/ti/common/board_detect.h
+++ b/board/ti/common/board_detect.h
@@ -9,7 +9,9 @@
 #define __BOARD_DETECT_H
 
 /* TI EEPROM MAGIC Header identifier */
+#include <compiler.h>
 #include <stdbool.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #define TI_EEPROM_HEADER_MAGIC	0xEE3355AA
 #define TI_DEAD_EEPROM_MAGIC	0xADEAD12C
diff --git a/board/ti/dra7xx/evm.c b/board/ti/dra7xx/evm.c
index baf47edc304..956de9d619c 100644
--- a/board/ti/dra7xx/evm.c
+++ b/board/ti/dra7xx/evm.c
@@ -27,6 +27,7 @@
 #include <linux/string.h>
 #include <asm/gpio.h>
 #include <usb.h>
+#include <linux/types.h>
 #include <linux/usb/gadget.h>
 #include <asm/omap_common.h>
 #include <asm/omap_sec_common.h>
diff --git a/board/ti/evm/evm.c b/board/ti/evm/evm.c
index 2716c4d4c08..85d9b3397a1 100644
--- a/board/ti/evm/evm.c
+++ b/board/ti/evm/evm.c
@@ -30,6 +30,7 @@
 #include <twl4030.h>
 #include <asm/mach-types.h>
 #include <asm/omap_musb.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/mtd/rawnand.h>
diff --git a/board/ti/evm/evm.h b/board/ti/evm/evm.h
index 09b08b490ae..a9542c92299 100644
--- a/board/ti/evm/evm.h
+++ b/board/ti/evm/evm.h
@@ -6,6 +6,7 @@
 #ifndef _EVM_H_
 #define _EVM_H_
 
+#include <asm/types.h>
 const omap3_sysinfo sysinfo = {
 	DDR_DISCRETE,
 	"OMAP3 EVM board",
diff --git a/board/ti/j721e/evm.c b/board/ti/j721e/evm.c
index 81810f50a06..a4b0c1a2b21 100644
--- a/board/ti/j721e/evm.c
+++ b/board/ti/j721e/evm.c
@@ -14,6 +14,7 @@
 #include <init.h>
 #include <log.h>
 #include <net.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/arch/sys_proto.h>
@@ -30,6 +31,7 @@
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "../common/board_detect.h"
 
diff --git a/board/ti/ks2_evm/board.c b/board/ti/ks2_evm/board.c
index 449073b6b7a..de120c48dcf 100644
--- a/board/ti/ks2_evm/board.c
+++ b/board/ti/ks2_evm/board.c
@@ -7,12 +7,14 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "board.h"
 #include <env.h>
 #include <hang.h>
diff --git a/board/ti/ks2_evm/board_k2e.c b/board/ti/ks2_evm/board_k2e.c
index b5258b66e10..8d0032e55ca 100644
--- a/board/ti/ks2_evm/board_k2e.c
+++ b/board/ti/ks2_evm/board_k2e.c
@@ -12,6 +12,7 @@
 #include <asm/arch/ddr3.h>
 #include <asm/arch/hardware.h>
 #include <asm/ti-common/keystone_net.h>
+#include <asm/types.h>
 #include <linux/string.h>
 
 unsigned int get_external_clk(u32 clk)
diff --git a/board/ti/ks2_evm/board_k2g.c b/board/ti/ks2_evm/board_k2g.c
index eb115a818f4..23c6e93ab5f 100644
--- a/board/ti/ks2_evm/board_k2g.c
+++ b/board/ti/ks2_evm/board_k2g.c
@@ -24,6 +24,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "mux-k2g.h"
 #include "../common/board_detect.h"
 
diff --git a/board/ti/ks2_evm/board_k2hk.c b/board/ti/ks2_evm/board_k2hk.c
index 6a9935c7ef5..3648db6af0c 100644
--- a/board/ti/ks2_evm/board_k2hk.c
+++ b/board/ti/ks2_evm/board_k2hk.c
@@ -12,6 +12,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/hardware.h>
 #include <asm/ti-common/keystone_net.h>
+#include <asm/types.h>
 #include <linux/string.h>
 
 unsigned int external_clk[ext_clk_count] = {
diff --git a/board/ti/ks2_evm/board_k2l.c b/board/ti/ks2_evm/board_k2l.c
index 459530ecb9d..2d9da4e3a7d 100644
--- a/board/ti/ks2_evm/board_k2l.c
+++ b/board/ti/ks2_evm/board_k2l.c
@@ -12,6 +12,7 @@
 #include <asm/arch/ddr3.h>
 #include <asm/arch/hardware.h>
 #include <asm/ti-common/keystone_net.h>
+#include <asm/types.h>
 #include <linux/string.h>
 
 unsigned int get_external_clk(u32 clk)
diff --git a/board/ti/ks2_evm/ddr3_k2e.c b/board/ti/ks2_evm/ddr3_k2e.c
index 85e70fc6776..b1065f53d30 100644
--- a/board/ti/ks2_evm/ddr3_k2e.c
+++ b/board/ti/ks2_evm/ddr3_k2e.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include "ddr3_cfg.h"
 #include <asm/arch/ddr3.h>
 
diff --git a/board/ti/ks2_evm/ddr3_k2g.c b/board/ti/ks2_evm/ddr3_k2g.c
index 563c5e9950c..a8a306d61cc 100644
--- a/board/ti/ks2_evm/ddr3_k2g.c
+++ b/board/ti/ks2_evm/ddr3_k2g.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <asm/types.h>
 #include "ddr3_cfg.h"
 #include <asm/arch/ddr3.h>
 #include <asm/arch/hardware.h>
diff --git a/board/ti/ks2_evm/ddr3_k2hk.c b/board/ti/ks2_evm/ddr3_k2hk.c
index 03bae4bf91e..eee64753bb9 100644
--- a/board/ti/ks2_evm/ddr3_k2hk.c
+++ b/board/ti/ks2_evm/ddr3_k2hk.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include "ddr3_cfg.h"
 #include <asm/arch/ddr3.h>
 #include <asm/arch/hardware.h>
diff --git a/board/ti/ks2_evm/ddr3_k2l.c b/board/ti/ks2_evm/ddr3_k2l.c
index 36babcc5e11..62daa49d32e 100644
--- a/board/ti/ks2_evm/ddr3_k2l.c
+++ b/board/ti/ks2_evm/ddr3_k2l.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include "ddr3_cfg.h"
 #include <asm/arch/ddr3.h>
 
diff --git a/board/ti/omap5_uevm/evm.c b/board/ti/omap5_uevm/evm.c
index dd9217f0fba..0d551b1b4e9 100644
--- a/board/ti/omap5_uevm/evm.c
+++ b/board/ti/omap5_uevm/evm.c
@@ -17,6 +17,7 @@
 #include <tca642x.h>
 #include <usb.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/board/ti/panda/panda.c b/board/ti/panda/panda.c
index c36690eec17..0a64a309822 100644
--- a/board/ti/panda/panda.c
+++ b/board/ti/panda/panda.c
@@ -18,6 +18,7 @@
 #include <asm/gpio.h>
 #include <env.h>
 #include <twl6030.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 
 #include "panda_mux_data.h"
diff --git a/board/ti/sdp4430/sdp.c b/board/ti/sdp4430/sdp.c
index fe12d6e8913..ed9b50cc700 100644
--- a/board/ti/sdp4430/sdp.c
+++ b/board/ti/sdp4430/sdp.c
@@ -13,6 +13,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/mmc_host_def.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 
 #include "sdp4430_mux_data.h"
diff --git a/board/ti/ti816x/evm.c b/board/ti/ti816x/evm.c
index 2689e48c8ce..8cc91def5e4 100644
--- a/board/ti/ti816x/evm.c
+++ b/board/ti/ti816x/evm.c
@@ -24,6 +24,7 @@
 #include <asm/arch/mem.h>
 #include <asm/arch/mux.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/timll/devkit3250/devkit3250_spl.c b/board/timll/devkit3250/devkit3250_spl.c
index 47af78ae0b1..327103087fb 100644
--- a/board/timll/devkit3250/devkit3250_spl.c
+++ b/board/timll/devkit3250/devkit3250_spl.c
@@ -12,6 +12,7 @@
 #include <asm/arch/emc.h>
 #include <asm/arch-lpc32xx/gpio.h>
 #include <spl.h>
+#include <asm/types.h>
 
 static struct gpio_regs *gpio = (struct gpio_regs *)GPIO_BASE;
 
diff --git a/board/timll/devkit8000/devkit8000.c b/board/timll/devkit8000/devkit8000.c
index 4c05c9a8b7f..f9b35733f50 100644
--- a/board/timll/devkit8000/devkit8000.c
+++ b/board/timll/devkit8000/devkit8000.c
@@ -31,6 +31,7 @@
 #include <asm/arch/mem.h>
 #include <asm/mach-types.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 #include "devkit8000.h"
 #include <asm/gpio.h>
 #ifdef CONFIG_DRIVER_DM9000
diff --git a/board/toradex/apalis-imx8/apalis-imx8.c b/board/toradex/apalis-imx8/apalis-imx8.c
index cae2b789bc7..0789e836225 100644
--- a/board/toradex/apalis-imx8/apalis-imx8.c
+++ b/board/toradex/apalis-imx8/apalis-imx8.c
@@ -10,6 +10,7 @@
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include <asm/arch/clock.h>
 #include <asm/arch/imx8-pins.h>
diff --git a/board/toradex/apalis-tk1/apalis-tk1.c b/board/toradex/apalis-tk1/apalis-tk1.c
index 023c93c0929..eebba48f015 100644
--- a/board/toradex/apalis-tk1/apalis-tk1.c
+++ b/board/toradex/apalis-tk1/apalis-tk1.c
@@ -16,6 +16,7 @@
 #include <asm/arch/pinmux.h>
 #include <env_internal.h>
 #include <pci_tegra.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/board/toradex/apalis-tk1/as3722_init.c b/board/toradex/apalis-tk1/as3722_init.c
index 68169f55480..dea80ed4a8a 100644
--- a/board/toradex/apalis-tk1/as3722_init.c
+++ b/board/toradex/apalis-tk1/as3722_init.c
@@ -8,6 +8,7 @@
 #include <asm/io.h>
 #include <asm/arch-tegra/tegra_i2c.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 #include "as3722_init.h"
 
 /* AS3722-PMIC-specific early init code - get CPU rails up, etc */
diff --git a/board/toradex/apalis_imx6/apalis_imx6.c b/board/toradex/apalis_imx6/apalis_imx6.c
index 6b319c043a6..b075b620585 100644
--- a/board/toradex/apalis_imx6/apalis_imx6.c
+++ b/board/toradex/apalis_imx6/apalis_imx6.c
@@ -20,6 +20,7 @@
 #include <linux/delay.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <ahci.h>
 #include <asm/arch/clock.h>
diff --git a/board/toradex/apalis_imx6/pf0100.c b/board/toradex/apalis_imx6/pf0100.c
index 9247a780544..5961d6179d2 100644
--- a/board/toradex/apalis_imx6/pf0100.c
+++ b/board/toradex/apalis_imx6/pf0100.c
@@ -18,6 +18,7 @@
 #include <asm/mach-imx/iomux-v3.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include "pf0100_otp.inc"
 #include "pf0100.h"
diff --git a/board/toradex/apalis_t30/apalis_t30.c b/board/toradex/apalis_t30/apalis_t30.c
index 49fb5d7a370..7fefc2fd1c4 100644
--- a/board/toradex/apalis_t30/apalis_t30.c
+++ b/board/toradex/apalis_t30/apalis_t30.c
@@ -18,6 +18,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <pci_tegra.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
diff --git a/board/toradex/colibri-imx8x/colibri-imx8x.c b/board/toradex/colibri-imx8x/colibri-imx8x.c
index 1a2a23337cf..b9df96df053 100644
--- a/board/toradex/colibri-imx8x/colibri-imx8x.c
+++ b/board/toradex/colibri-imx8x/colibri-imx8x.c
@@ -10,6 +10,7 @@
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include <asm/arch/clock.h>
 #include <asm/arch/imx8-pins.h>
diff --git a/board/toradex/colibri_imx6/colibri_imx6.c b/board/toradex/colibri_imx6/colibri_imx6.c
index 99342e820e9..6b001c5450d 100644
--- a/board/toradex/colibri_imx6/colibri_imx6.c
+++ b/board/toradex/colibri_imx6/colibri_imx6.c
@@ -20,6 +20,7 @@
 #include <linux/delay.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <asm/arch/clock.h>
 #include <asm/arch/crm_regs.h>
diff --git a/board/toradex/colibri_imx6/pf0100.c b/board/toradex/colibri_imx6/pf0100.c
index d1bd0566b2a..31e4620edb3 100644
--- a/board/toradex/colibri_imx6/pf0100.c
+++ b/board/toradex/colibri_imx6/pf0100.c
@@ -18,6 +18,7 @@
 #include <asm/mach-imx/iomux-v3.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include "pf0100_otp.inc"
 #include "pf0100.h"
diff --git a/board/toradex/colibri_imx7/colibri_imx7.c b/board/toradex/colibri_imx7/colibri_imx7.c
index 7bb691350be..9d802277b47 100644
--- a/board/toradex/colibri_imx7/colibri_imx7.c
+++ b/board/toradex/colibri_imx7/colibri_imx7.c
@@ -32,6 +32,7 @@
 #include <miiphy.h>
 #include <mtd_node.h>
 #include <netdev.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/rn5t567_pmic.h>
 #include <usb.h>
diff --git a/board/toradex/colibri_t20/colibri_t20.c b/board/toradex/colibri_t20/colibri_t20.c
index f809260aa21..b4f32a33545 100644
--- a/board/toradex/colibri_t20/colibri_t20.c
+++ b/board/toradex/colibri_t20/colibri_t20.c
@@ -18,6 +18,7 @@
 #include <asm/io.h>
 #include <i2c.h>
 #include <nand.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include "../common/tdx-common.h"
diff --git a/board/toradex/colibri_vf/colibri_vf.c b/board/toradex/colibri_vf/colibri_vf.c
index 6361ffedb1f..9b966da7429 100644
--- a/board/toradex/colibri_vf/colibri_vf.c
+++ b/board/toradex/colibri_vf/colibri_vf.c
@@ -10,6 +10,7 @@
 #include <init.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/kernel.h>
 
diff --git a/board/toradex/common/tdx-cfg-block.c b/board/toradex/common/tdx-cfg-block.c
index ff52ddffb19..8442aba8751 100644
--- a/board/toradex/common/tdx-cfg-block.c
+++ b/board/toradex/common/tdx-cfg-block.c
@@ -4,12 +4,14 @@
  */
 
 #include <common.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "tdx-cfg-block.h"
 #include <command.h>
 #include <asm/cache.h>
diff --git a/board/toradex/common/tdx-common.c b/board/toradex/common/tdx-common.c
index c04a888f935..0fa75352abe 100644
--- a/board/toradex/common/tdx-common.c
+++ b/board/toradex/common/tdx-common.c
@@ -9,6 +9,7 @@
 #include <init.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <linux/string.h>
diff --git a/board/toradex/verdin-imx8mm/spl.c b/board/toradex/verdin-imx8mm/spl.c
index bce63c0574d..8f6d77f206a 100644
--- a/board/toradex/verdin-imx8mm/spl.c
+++ b/board/toradex/verdin-imx8mm/spl.c
@@ -27,6 +27,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <power/bd71837.h>
 #include <power/pmic.h>
 #include <spl.h>
diff --git a/board/tplink/wdr4300/wdr4300.c b/board/tplink/wdr4300/wdr4300.c
index 9134d6bf6d4..9124ec7964a 100644
--- a/board/tplink/wdr4300/wdr4300.c
+++ b/board/tplink/wdr4300/wdr4300.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <init.h>
 #include <asm/io.h>
 #include <asm/addrspace.h>
diff --git a/board/tqc/tqm834x/pci.c b/board/tqc/tqm834x/pci.c
index 92bda607652..c2d8e276546 100644
--- a/board/tqc/tqm834x/pci.c
+++ b/board/tqc/tqm834x/pci.c
@@ -13,6 +13,7 @@
 #include <pci.h>
 #include <i2c.h>
 #include <asm/fsl_i2c.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 static struct pci_region pci1_regions[] = {
diff --git a/board/tqc/tqm834x/tqm834x.c b/board/tqc/tqm834x/tqm834x.c
index 98a04ff9067..1515b03f2da 100644
--- a/board/tqc/tqm834x/tqm834x.c
+++ b/board/tqc/tqm834x/tqm834x.c
@@ -20,6 +20,7 @@
 #include <flash.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 #include <mtd/cfi_flash.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/tqc/tqma6/tqma6.c b/board/tqc/tqma6/tqma6.c
index 1b2855c9896..4681690d7f3 100644
--- a/board/tqc/tqma6/tqma6.c
+++ b/board/tqc/tqma6/tqma6.c
@@ -7,6 +7,7 @@
  * Author: Markus Niebel <markus.niebel@tq-group.com>
  */
 
+#include <compiler.h>
 #include <init.h>
 #include <stdio.h>
 #include <vsprintf.h>
@@ -30,6 +31,7 @@
 #include <linux/libfdt.h>
 #include <i2c.h>
 #include <mmc.h>
+#include <linux/types.h>
 #include <power/pfuze100_pmic.h>
 #include <power/pmic.h>
 #include <spi_flash.h>
diff --git a/board/udoo/neo/neo.c b/board/udoo/neo/neo.c
index 4c004a75553..a263843f4aa 100644
--- a/board/udoo/neo/neo.c
+++ b/board/udoo/neo/neo.c
@@ -37,6 +37,7 @@
 #include <miiphy.h>
 #include <netdev.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/pfuze3000_pmic.h>
 #include <malloc.h>
diff --git a/board/udoo/udoo.c b/board/udoo/udoo.c
index c0cd357845e..37bbd497bab 100644
--- a/board/udoo/udoo.c
+++ b/board/udoo/udoo.c
@@ -29,6 +29,7 @@
 #include <micrel.h>
 #include <miiphy.h>
 #include <netdev.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/udoo/udoo_spl.c b/board/udoo/udoo_spl.c
index 9ef9db18cd0..6b865a6147d 100644
--- a/board/udoo/udoo_spl.c
+++ b/board/udoo/udoo_spl.c
@@ -24,6 +24,7 @@
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
 #include <spl.h>
+#include <linux/types.h>
 
 #if defined(CONFIG_SPL_BUILD)
 #include <asm/arch/mx6-ddr.h>
diff --git a/board/variscite/dart_6ul/spl.c b/board/variscite/dart_6ul/spl.c
index bf4c6bd573e..0efa57b8543 100644
--- a/board/variscite/dart_6ul/spl.c
+++ b/board/variscite/dart_6ul/spl.c
@@ -17,6 +17,7 @@
 #include <asm/u-boot.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define UART_PAD_CTRL  (PAD_CTL_PKE | PAD_CTL_PUE |		\
 	PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED |		\
diff --git a/board/varisys/common/sys_eeprom.c b/board/varisys/common/sys_eeprom.c
index d285b0f36cd..ec850a8c1de 100644
--- a/board/varisys/common/sys_eeprom.c
+++ b/board/varisys/common/sys_eeprom.c
@@ -12,10 +12,12 @@
 
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <env.h>
 #include <i2c.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <asm/types.h>
 #include <linux/ctype.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
diff --git a/board/varisys/cyrus/cyrus.c b/board/varisys/cyrus/cyrus.c
index a7721274aed..c7b17a9caf2 100644
--- a/board/varisys/cyrus/cyrus.c
+++ b/board/varisys/cyrus/cyrus.c
@@ -11,6 +11,7 @@
 #include <init.h>
 #include <netdev.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/compiler.h>
 #include <asm/mmu.h>
diff --git a/board/varisys/cyrus/ddr.c b/board/varisys/cyrus/ddr.c
index 48b5058e7b4..4aaf145ecab 100644
--- a/board/varisys/cyrus/ddr.c
+++ b/board/varisys/cyrus/ddr.c
@@ -16,6 +16,7 @@
 #include <fsl_ddr_dimm_params.h>
 #include <asm/fsl_law.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/ve8313/ve8313.c b/board/ve8313/ve8313.c
index 34422424bee..b034550f615 100644
--- a/board/ve8313/ve8313.c
+++ b/board/ve8313/ve8313.c
@@ -13,6 +13,7 @@
 #include <init.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
diff --git a/board/vscom/baltos/board.c b/board/vscom/baltos/board.c
index a7ba5393183..e4c742a98cb 100644
--- a/board/vscom/baltos/board.c
+++ b/board/vscom/baltos/board.c
@@ -37,6 +37,7 @@
 #include <miiphy.h>
 #include <cpsw.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <power/tps65910.h>
 #include <watchdog.h>
 #include "board.h"
diff --git a/board/vscom/baltos/board.h b/board/vscom/baltos/board.h
index 630c9bba73b..93768571bb2 100644
--- a/board/vscom/baltos/board.h
+++ b/board/vscom/baltos/board.h
@@ -10,6 +10,7 @@
 #ifndef _BOARD_H_
 #define _BOARD_H_
 
+#include <linux/types.h>
 typedef struct _BSP_VS_HWPARAM    // v1.0
 {
 	uint32_t Magic;
diff --git a/board/wandboard/spl.c b/board/wandboard/spl.c
index e6ba3561217..7c0680bfa47 100644
--- a/board/wandboard/spl.c
+++ b/board/wandboard/spl.c
@@ -24,6 +24,7 @@
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
 #include <spl.h>
+#include <linux/types.h>
 
 #include <asm/arch/mx6-ddr.h>
 /*
diff --git a/board/wandboard/wandboard.c b/board/wandboard/wandboard.c
index 3a883d5019a..d170f01a58b 100644
--- a/board/wandboard/wandboard.c
+++ b/board/wandboard/wandboard.c
@@ -10,6 +10,7 @@
 #include <image.h>
 #include <init.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/crm_regs.h>
@@ -38,6 +39,7 @@
 #include <phy.h>
 #include <i2c.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/pfuze100_pmic.h>
 
diff --git a/board/work-microwave/work_92105/work_92105_display.c b/board/work-microwave/work_92105/work_92105_display.c
index 53d5d3c5a83..77fa813600b 100644
--- a/board/work-microwave/work_92105/work_92105_display.c
+++ b/board/work-microwave/work_92105/work_92105_display.c
@@ -25,6 +25,7 @@
 #include <vsprintf.h>
 #include <linux/delay.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /*
  * GPO 15 in port 3 is gpio 3*32+15 = 111
diff --git a/board/work-microwave/work_92105/work_92105_spl.c b/board/work-microwave/work_92105/work_92105_spl.c
index a31553a2d25..69a324bb288 100644
--- a/board/work-microwave/work_92105/work_92105_spl.c
+++ b/board/work-microwave/work_92105/work_92105_spl.c
@@ -13,6 +13,7 @@
 #include <asm/arch/emc.h>
 #include <asm/gpio.h>
 #include <spl.h>
+#include <asm/types.h>
 #include "work_92105_display.h"
 
 struct emc_dram_settings dram_64mb = {
diff --git a/board/xes/common/actl_nand.c b/board/xes/common/actl_nand.c
index 4e52838c909..2ae209eb7aa 100644
--- a/board/xes/common/actl_nand.c
+++ b/board/xes/common/actl_nand.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <nand.h>
 #include <asm/io.h>
+#include <linux/types.h>
 
 /*
  * Hardware specific access to control-lines
diff --git a/board/xes/common/fsl_8xxx_clk.c b/board/xes/common/fsl_8xxx_clk.c
index abd86694f30..2d27301d7c8 100644
--- a/board/xes/common/fsl_8xxx_clk.c
+++ b/board/xes/common/fsl_8xxx_clk.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <asm/io.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 /*
  * Return SYSCLK input frequency - 50 MHz or 66 MHz depending on POR config
diff --git a/board/xes/common/fsl_8xxx_misc.c b/board/xes/common/fsl_8xxx_misc.c
index fe6858e0d29..28a31c0dec7 100644
--- a/board/xes/common/fsl_8xxx_misc.c
+++ b/board/xes/common/fsl_8xxx_misc.c
@@ -21,6 +21,7 @@ int board_flash_wp_on(void)
 	return 0;
 }
 #endif
+#include <linux/types.h>
 
 /*
  * Return a board's derivative model number.  For example:
diff --git a/board/xes/common/fsl_8xxx_misc.h b/board/xes/common/fsl_8xxx_misc.h
index 6e4858f15c3..2bcc765726b 100644
--- a/board/xes/common/fsl_8xxx_misc.h
+++ b/board/xes/common/fsl_8xxx_misc.h
@@ -6,6 +6,7 @@
 #ifndef __FSL_8XXX_MISC_H___
 #define __FSL_8XXX_MISC_H___
 
+#include <linux/types.h>
 uint get_board_derivative(void);
 
 #endif /* __FSL_8XXX_MISC_H__ */
diff --git a/board/xes/common/fsl_8xxx_pci.c b/board/xes/common/fsl_8xxx_pci.c
index 6c6db6c2fcf..d3190c7ae3d 100644
--- a/board/xes/common/fsl_8xxx_pci.c
+++ b/board/xes/common/fsl_8xxx_pci.c
@@ -15,6 +15,7 @@
 #include <linux/compiler.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
+#include <linux/types.h>
 
 
 #ifdef CONFIG_PCI1
diff --git a/board/xes/xpedite517x/ddr.c b/board/xes/xpedite517x/ddr.c
index 2be421efd51..4a568133081 100644
--- a/board/xes/xpedite517x/ddr.c
+++ b/board/xes/xpedite517x/ddr.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <asm/u-boot.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 void get_spd(ddr2_spd_eeprom_t *spd, u8 i2c_address)
 {
diff --git a/board/xes/xpedite520x/ddr.c b/board/xes/xpedite520x/ddr.c
index c142bec406e..e96dc89fda9 100644
--- a/board/xes/xpedite520x/ddr.c
+++ b/board/xes/xpedite520x/ddr.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <i2c.h>
+#include <linux/types.h>
 
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
diff --git a/board/xes/xpedite537x/ddr.c b/board/xes/xpedite537x/ddr.c
index 90498fb7045..2accc90e9fa 100644
--- a/board/xes/xpedite537x/ddr.c
+++ b/board/xes/xpedite537x/ddr.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <asm/u-boot.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
diff --git a/board/xes/xpedite550x/ddr.c b/board/xes/xpedite550x/ddr.c
index 419b25d6ad4..6c37becadea 100644
--- a/board/xes/xpedite550x/ddr.c
+++ b/board/xes/xpedite550x/ddr.c
@@ -8,6 +8,7 @@
 #include <i2c.h>
 #include <stdio.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
diff --git a/board/xilinx/common/board.c b/board/xilinx/common/board.c
index 19de01caf0c..79b8f2f0136 100644
--- a/board/xilinx/common/board.c
+++ b/board/xilinx/common/board.c
@@ -14,6 +14,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/sizes.h>
+#include <linux/types.h>
 #include "board.h"
 
 int zynq_board_read_rom_ethaddr(unsigned char *ethaddr)
diff --git a/board/xilinx/microblaze-generic/microblaze-generic.c b/board/xilinx/microblaze-generic/microblaze-generic.c
index 7e21ffc1958..e5e23ebd1f2 100644
--- a/board/xilinx/microblaze-generic/microblaze-generic.c
+++ b/board/xilinx/microblaze-generic/microblaze-generic.c
@@ -22,6 +22,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/sizes.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/xilinx/versal/board.c b/board/xilinx/versal/board.c
index d58e5fc53c0..a465c2f57f4 100644
--- a/board/xilinx/versal/board.c
+++ b/board/xilinx/versal/board.c
@@ -25,6 +25,7 @@
 #include <versalpl.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "../common/board.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/xilinx/zynq/bootimg.c b/board/xilinx/zynq/bootimg.c
index 332500bdc72..5decf572fc0 100644
--- a/board/xilinx/zynq/bootimg.c
+++ b/board/xilinx/zynq/bootimg.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/types.h>
 #include <linux/string.h>
 #include <u-boot/md5.h>
 #include <zynq_bootimg.h>
diff --git a/board/xilinx/zynq/cmds.c b/board/xilinx/zynq/cmds.c
index 04afdb693e8..e0aead98bba 100644
--- a/board/xilinx/zynq/cmds.c
+++ b/board/xilinx/zynq/cmds.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <command.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
@@ -17,6 +18,7 @@
 #include <linux/bitops.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <u-boot/md5.h>
 #include <u-boot/rsa.h>
 #include <u-boot/rsa-mod-exp.h>
diff --git a/board/xilinx/zynqmp/cmds.c b/board/xilinx/zynqmp/cmds.c
index 52498147aef..a4d4d72c2b4 100644
--- a/board/xilinx/zynqmp/cmds.c
+++ b/board/xilinx/zynqmp/cmds.c
@@ -17,6 +17,7 @@
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 static int do_zynqmp_verify_secure(struct cmd_tbl *cmdtp, int flag, int argc,
 				   char *const argv[])
diff --git a/board/xilinx/zynqmp/pm_cfg_obj.h b/board/xilinx/zynqmp/pm_cfg_obj.h
index 86e785490ce..acbad46b532 100644
--- a/board/xilinx/zynqmp/pm_cfg_obj.h
+++ b/board/xilinx/zynqmp/pm_cfg_obj.h
@@ -5,5 +5,6 @@
  * Declaration of PMU config object binary blob linked in at build time.
  */
 
+#include <asm/types.h>
 extern const u32 zynqmp_pm_cfg_obj[];
 extern const int zynqmp_pm_cfg_obj_size;
diff --git a/board/xilinx/zynqmp/tap_delays.c b/board/xilinx/zynqmp/tap_delays.c
index 5fde0aed7db..041521c6dad 100644
--- a/board/xilinx/zynqmp/tap_delays.c
+++ b/board/xilinx/zynqmp/tap_delays.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 #define SD_DLL_CTRL			0xFF180358
diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c
index 91eb35436b6..6e22c209063 100644
--- a/board/xilinx/zynqmp/zynqmp.c
+++ b/board/xilinx/zynqmp/zynqmp.c
@@ -16,6 +16,7 @@
 #include <ahci.h>
 #include <scsi.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <wdt.h>
@@ -41,6 +42,7 @@
 #include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "../common/board.h"
 
 #include "pm_cfg_obj.h"
diff --git a/board/zyxel/nsa310s/nsa310s.c b/board/zyxel/nsa310s/nsa310s.c
index ad36ee23471..391ef07afe4 100644
--- a/board/zyxel/nsa310s/nsa310s.c
+++ b/board/zyxel/nsa310s/nsa310s.c
@@ -15,6 +15,7 @@
 #include <asm/arch/mpp.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include "nsa310s.h"
 
diff --git a/cmd/abootimg.c b/cmd/abootimg.c
index 3c6de9a8e80..1b1a4b3a262 100644
--- a/cmd/abootimg.c
+++ b/cmd/abootimg.c
@@ -13,6 +13,7 @@
 #include <vsprintf.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define abootimg_addr() \
 	(_abootimg_addr == -1 ? image_load_addr : _abootimg_addr)
diff --git a/cmd/acpi.c b/cmd/acpi.c
index c47cfdfd95b..93c3f8f7a11 100644
--- a/cmd/acpi.c
+++ b/cmd/acpi.c
@@ -16,6 +16,7 @@
 #include <dm/acpi.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/cmd/adtimg.c b/cmd/adtimg.c
index ea6230ba1f0..f3728aa386d 100644
--- a/cmd/adtimg.c
+++ b/cmd/adtimg.c
@@ -13,6 +13,7 @@
 #include <vsprintf.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define OPT_INDEX	"--index"
 
diff --git a/cmd/aes.c b/cmd/aes.c
index b4a3dcc74c6..24d97a75882 100644
--- a/cmd/aes.c
+++ b/cmd/aes.c
@@ -15,6 +15,7 @@
 #include <mapmem.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 u32 aes_get_key_len(char *command)
 {
diff --git a/cmd/armflash.c b/cmd/armflash.c
index e76838c55c2..8436980125f 100644
--- a/cmd/armflash.c
+++ b/cmd/armflash.c
@@ -13,6 +13,7 @@
 #include <vsprintf.h>
 #include <asm/io.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define MAX_REGIONS 4
 #define MAX_IMAGES 32
diff --git a/cmd/avb.c b/cmd/avb.c
index 08711e3240a..7434b4b0d69 100644
--- a/cmd/avb.c
+++ b/cmd/avb.c
@@ -11,10 +11,12 @@
 #include <image.h>
 #include <malloc.h>
 #include <mmc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define AVB_BOOTARGS	"avb_bootargs"
 static struct AvbOps *avb_ops;
diff --git a/cmd/axi.c b/cmd/axi.c
index 8a3a5f68669..8d268ad6105 100644
--- a/cmd/axi.c
+++ b/cmd/axi.c
@@ -20,6 +20,7 @@
 #include <vsprintf.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 /* Currently selected AXI bus device */
 static struct udevice *axi_cur_bus;
diff --git a/cmd/bcb.c b/cmd/bcb.c
index e95111796c7..f6be4fa357b 100644
--- a/cmd/bcb.c
+++ b/cmd/bcb.c
@@ -16,6 +16,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 enum bcb_cmd {
 	BCB_CMD_LOAD,
diff --git a/cmd/bdinfo.c b/cmd/bdinfo.c
index a1b3f4be9b2..afeaba5ddc4 100644
--- a/cmd/bdinfo.c
+++ b/cmd/bdinfo.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <env.h>
 #include <net.h>
 #include <stdio.h>
@@ -16,6 +17,7 @@
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/cmd/bedbug.c b/cmd/bedbug.c
index 87296e2db05..e252460b5f0 100644
--- a/cmd/bedbug.c
+++ b/cmd/bedbug.c
@@ -15,6 +15,7 @@
 #include <bedbug/bedbug.h>
 #include <bedbug/regs.h>
 #include <bedbug/ppc.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/cmd/binop.c b/cmd/binop.c
index 9fde726b5cb..9710f9569e9 100644
--- a/cmd/binop.c
+++ b/cmd/binop.c
@@ -10,6 +10,7 @@
 #include <vsprintf.h>
 #include <linux/ctype.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 enum {
 	OP_ID_XOR,
diff --git a/cmd/blk_common.c b/cmd/blk_common.c
index 4bf7a582b52..9f6b936d9e3 100644
--- a/cmd/blk_common.c
+++ b/cmd/blk_common.c
@@ -14,6 +14,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 int blk_common_cmd(int argc, char *const argv[], enum if_type if_type,
 		   int *cur_devnump)
diff --git a/cmd/blob.c b/cmd/blob.c
index d4ee6966e97..27878e99639 100644
--- a/cmd/blob.c
+++ b/cmd/blob.c
@@ -6,11 +6,13 @@
 
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <malloc.h>
 #include <vsprintf.h>
 #include <asm/byteorder.h>
 #include <linux/compiler.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /**
  * blob_decap() - Decapsulate the data as a blob
diff --git a/cmd/bmp.c b/cmd/bmp.c
index d2ea39ed67a..0c2f916be14 100644
--- a/cmd/bmp.c
+++ b/cmd/bmp.c
@@ -19,12 +19,14 @@
 #include <malloc.h>
 #include <mapmem.h>
 #include <splash.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <video.h>
 #include <vsprintf.h>
 #include <asm/byteorder.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static int bmp_info (ulong addr);
 
diff --git a/cmd/boot.c b/cmd/boot.c
index 8b079b31714..179ddc6a1e8 100644
--- a/cmd/boot.c
+++ b/cmd/boot.c
@@ -11,6 +11,7 @@
 #include <command.h>
 #include <net.h>
 #include <vsprintf.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_CMD_GO
 
diff --git a/cmd/bootefi.c b/cmd/bootefi.c
index 05ff48dc5f1..ce9a1f53e9c 100644
--- a/cmd/bootefi.c
+++ b/cmd/bootefi.c
@@ -28,6 +28,7 @@
 #include <asm-generic/sections.h>
 #include <linux/linkage.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/cmd/booti.c b/cmd/booti.c
index 405152c80eb..baf7d7f80b6 100644
--- a/cmd/booti.c
+++ b/cmd/booti.c
@@ -19,6 +19,7 @@
 #include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 /*
diff --git a/cmd/bootm.c b/cmd/bootm.c
index 2189593b589..6351b4e659c 100644
--- a/cmd/bootm.c
+++ b/cmd/bootm.c
@@ -25,6 +25,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <u-boot/zlib.h>
 #include <mapmem.h>
 
diff --git a/cmd/bootstage.c b/cmd/bootstage.c
index 3649e749cd9..c0783bcb478 100644
--- a/cmd/bootstage.c
+++ b/cmd/bootstage.c
@@ -10,6 +10,7 @@
 #include <vsprintf.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static int do_bootstage_report(struct cmd_tbl *cmdtp, int flag, int argc,
 			       char *const argv[])
diff --git a/cmd/bootz.c b/cmd/bootz.c
index 534113695c1..b4cf1eb83d0 100644
--- a/cmd/bootz.c
+++ b/cmd/bootz.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <bootm.h>
 #include <command.h>
+#include <compiler.h>
 #include <image.h>
 #include <irq_func.h>
 #include <lmb.h>
@@ -15,6 +16,7 @@
 #include <vsprintf.h>
 #include <asm/u-boot.h>
 #include <linux/compiler.h>
+#include <linux/types.h>
 
 int __weak bootz_setup(ulong image, ulong *start, ulong *end)
 {
diff --git a/cmd/cache.c b/cmd/cache.c
index 19890c2566c..fab3091bd2d 100644
--- a/cmd/cache.c
+++ b/cmd/cache.c
@@ -9,6 +9,7 @@
  */
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <stdio.h>
 #include <linux/compiler.h>
diff --git a/cmd/cbfs.c b/cmd/cbfs.c
index 8f7a10751f7..a0a0e6b107a 100644
--- a/cmd/cbfs.c
+++ b/cmd/cbfs.c
@@ -12,6 +12,7 @@
 #include <cbfs.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/types.h>
 
 static int do_cbfs_init(struct cmd_tbl *cmdtp, int flag, int argc,
 			char *const argv[])
diff --git a/cmd/clk.c b/cmd/clk.c
index a2bfce12aed..d51b987dde5 100644
--- a/cmd/clk.c
+++ b/cmd/clk.c
@@ -12,7 +12,9 @@
 #include <dm/device-internal.h>
 #include <linux/clk-provider.h>
 #endif
+#include <compiler.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 
 #if defined(CONFIG_DM) && defined(CONFIG_CLK)
diff --git a/cmd/cpu.c b/cmd/cpu.c
index a4b1ee5b577..cd502ef528c 100644
--- a/cmd/cpu.c
+++ b/cmd/cpu.c
@@ -11,6 +11,7 @@
 #include <display_options.h>
 #include <dm.h>
 #include <errno.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
diff --git a/cmd/cramfs.c b/cmd/cramfs.c
index b34a4dde079..46071763771 100644
--- a/cmd/cramfs.c
+++ b/cmd/cramfs.c
@@ -24,6 +24,7 @@
 #include <jffs2/load_kernel.h>
 #include <cramfs/cramfs_fs.h>
 #include <asm/io.h>
+#include <linux/types.h>
 
 /* enable/disable debugging messages */
 #define	DEBUG_CRAMFS
diff --git a/cmd/cros_ec.c b/cmd/cros_ec.c
index 7f089d7644f..8e0f63eadb4 100644
--- a/cmd/cros_ec.c
+++ b/cmd/cros_ec.c
@@ -18,6 +18,7 @@
 #include <dm/uclass-internal.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /* Note: depends on enum ec_current_image */
 static const char * const ec_current_image_name[] = {"unknown", "RO", "RW"};
diff --git a/cmd/demo.c b/cmd/demo.c
index a9dfb609514..f050ff2c727 100644
--- a/cmd/demo.c
+++ b/cmd/demo.c
@@ -14,6 +14,7 @@
 #include <vsprintf.h>
 #include <asm/io.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 struct udevice *demo_dev;
 
diff --git a/cmd/disk.c b/cmd/disk.c
index fcb19ee02e4..80a23385b19 100644
--- a/cmd/disk.c
+++ b/cmd/disk.c
@@ -12,6 +12,7 @@
 #include <part.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/types.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 d5b1ae536bb..49e35e678cc 100644
--- a/cmd/eeprom.c
+++ b/cmd/eeprom.c
@@ -20,6 +20,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <config.h>
 #include <command.h>
 #include <eeprom.h>
@@ -30,6 +31,7 @@
 #include <vsprintf.h>
 #include <linux/delay.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #ifndef	CONFIG_SYS_I2C_SPEED
 #define	CONFIG_SYS_I2C_SPEED	50000
diff --git a/cmd/efi.c b/cmd/efi.c
index dd48101ae89..fba91a3d935 100644
--- a/cmd/efi.c
+++ b/cmd/efi.c
@@ -11,11 +11,13 @@
 #include <log.h>
 #include <malloc.h>
 #include <sort.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static const char *const type_name[] = {
 	"reserved",
diff --git a/cmd/efidebug.c b/cmd/efidebug.c
index f207e71b09e..d75b88296f9 100644
--- a/cmd/efidebug.c
+++ b/cmd/efidebug.c
@@ -20,6 +20,7 @@
 #include <linux/ctype.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define BS systab.boottime
 
diff --git a/cmd/elf.c b/cmd/elf.c
index 325fb19d8fc..2fc1977cad6 100644
--- a/cmd/elf.c
+++ b/cmd/elf.c
@@ -24,6 +24,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /* Allow ports to override the default behavior */
 static unsigned long do_bootelf_exec(ulong (*entry)(int, char * const[]),
diff --git a/cmd/fastboot.c b/cmd/fastboot.c
index 0a6cfe45309..aa1710d4ee2 100644
--- a/cmd/fastboot.c
+++ b/cmd/fastboot.c
@@ -19,6 +19,7 @@
 #include <linux/printk.h>
 #include <linux/string.h>
 #include <linux/stringify.h>
+#include <linux/types.h>
 
 static int do_fastboot_udp(int argc, char *const argv[],
 			   uintptr_t buf_addr, size_t buf_size)
diff --git a/cmd/fat.c b/cmd/fat.c
index e3bee99ec9b..b916b99c797 100644
--- a/cmd/fat.c
+++ b/cmd/fat.c
@@ -16,6 +16,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/cache.h>
+#include <linux/types.h>
 
 int do_fat_size(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 {
diff --git a/cmd/flash.c b/cmd/flash.c
index 56995822cb7..8d70c4d9a9d 100644
--- a/cmd/flash.c
+++ b/cmd/flash.c
@@ -14,6 +14,7 @@
 #include <uuid.h>
 #include <vsprintf.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #if defined(CONFIG_CMD_MTDPARTS)
 #include <jffs2/jffs2.h>
diff --git a/cmd/fpga.c b/cmd/fpga.c
index d7e20a622d2..31630c2701c 100644
--- a/cmd/fpga.c
+++ b/cmd/fpga.c
@@ -20,6 +20,7 @@
 #include <vsprintf.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static long do_fpga_get_device(char *arg)
 {
diff --git a/cmd/fpgad.c b/cmd/fpgad.c
index 96901b684a6..77be4e1e767 100644
--- a/cmd/fpgad.c
+++ b/cmd/fpgad.c
@@ -13,6 +13,7 @@
 #include <console.h>
 #include <display_options.h>
 #include <vsprintf.h>
+#include <linux/types.h>
 
 #include <gdsys_fpga.h>
 
diff --git a/cmd/fuse.c b/cmd/fuse.c
index b75676e641e..50f0d25e1e1 100644
--- a/cmd/fuse.c
+++ b/cmd/fuse.c
@@ -14,6 +14,7 @@
 #include <fuse.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 
diff --git a/cmd/gpio.c b/cmd/gpio.c
index 570c17d5bac..b614c75e2b5 100644
--- a/cmd/gpio.c
+++ b/cmd/gpio.c
@@ -8,10 +8,12 @@
 
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <errno.h>
 #include <dm.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/gpio.h>
diff --git a/cmd/gpt.c b/cmd/gpt.c
index 11ad5f7de46..7f60bf6f1f5 100644
--- a/cmd/gpt.c
+++ b/cmd/gpt.c
@@ -19,6 +19,7 @@
 #include <part.h>
 #include <part_efi.h>
 #include <exports.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <uuid.h>
 #include <vsprintf.h>
@@ -31,6 +32,7 @@
 #include <linux/sizes.h>
 #include <stdlib.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static LIST_HEAD(disk_partitions);
 
diff --git a/cmd/i2c.c b/cmd/i2c.c
index f21ed9ee354..5735ea3fdd4 100644
--- a/cmd/i2c.c
+++ b/cmd/i2c.c
@@ -68,6 +68,7 @@
 #include <bootretry.h>
 #include <cli.h>
 #include <command.h>
+#include <compiler.h>
 #include <console.h>
 #include <dm.h>
 #include <edid.h>
@@ -83,6 +84,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <u-boot/crc.h>
 
 /* Display values from last command.
diff --git a/cmd/ini.c b/cmd/ini.c
index 7c3849bd50b..54315adce79 100644
--- a/cmd/ini.c
+++ b/cmd/ini.c
@@ -19,6 +19,7 @@
 #include <linux/ctype.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_INI_MAX_LINE
 #define MAX_LINE CONFIG_INI_MAX_LINE
diff --git a/cmd/io.c b/cmd/io.c
index 62141846bab..af23f3fc628 100644
--- a/cmd/io.c
+++ b/cmd/io.c
@@ -13,6 +13,7 @@
 #include <vsprintf.h>
 #include <asm/io.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 /* Display values from last command */
 static ulong last_addr, last_size;
diff --git a/cmd/iotrace.c b/cmd/iotrace.c
index f6db7ad48ea..05cea98612a 100644
--- a/cmd/iotrace.c
+++ b/cmd/iotrace.c
@@ -8,6 +8,7 @@
 #include <iotrace.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/types.h>
 
 static void do_print_stats(void)
 {
diff --git a/cmd/itest.c b/cmd/itest.c
index 5824a7f18d4..12565244688 100644
--- a/cmd/itest.c
+++ b/cmd/itest.c
@@ -18,6 +18,7 @@
 #include <mapmem.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
 
diff --git a/cmd/jffs2.c b/cmd/jffs2.c
index b2dba80cf2c..5c59964feaa 100644
--- a/cmd/jffs2.c
+++ b/cmd/jffs2.c
@@ -84,6 +84,7 @@
 #include <linux/ctype.h>
 #include <cramfs/cramfs_fs.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #if defined(CONFIG_CMD_NAND)
 #include <linux/mtd/rawnand.h>
diff --git a/cmd/legacy-mtd-utils.c b/cmd/legacy-mtd-utils.c
index 2918ee6d28d..def89fa0fc8 100644
--- a/cmd/legacy-mtd-utils.c
+++ b/cmd/legacy-mtd-utils.c
@@ -8,6 +8,7 @@
 #include <linux/mtd/partitions.h>
 #include <linux/string.h>
 #include <mtd.h>
+#include <linux/types.h>
 
 static int get_part(const char *partname, int *idx, loff_t *off, loff_t *size,
 	     loff_t *maxsize, int devtype)
diff --git a/cmd/legacy-mtd-utils.h b/cmd/legacy-mtd-utils.h
index ac441d5558a..a158439b9c0 100644
--- a/cmd/legacy-mtd-utils.h
+++ b/cmd/legacy-mtd-utils.h
@@ -3,6 +3,7 @@
 #ifndef __LEGACY_MTD_UTILS_H
 #define __LEGACY_MTD_UTILS_H
 
+#include <linux/types.h>
 int mtd_arg_off(const char *arg, int *idx, loff_t *off, loff_t *size,
 		loff_t *maxsize, int devtype, uint64_t chipsize);
 int mtd_arg_off_size(int argc, char *const argv[], int *idx, loff_t *off,
diff --git a/cmd/legacy_led.c b/cmd/legacy_led.c
index d70f6d11462..2a1a6b669e3 100644
--- a/cmd/legacy_led.c
+++ b/cmd/legacy_led.c
@@ -10,6 +10,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <config.h>
 #include <command.h>
 #include <status_led.h>
diff --git a/cmd/load.c b/cmd/load.c
index c550f7643a9..dec8612d2d1 100644
--- a/cmd/load.c
+++ b/cmd/load.c
@@ -26,6 +26,7 @@
 #include <linux/delay.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/cmd/log.c b/cmd/log.c
index d9c76ccdd2b..1ef1422d6b8 100644
--- a/cmd/log.c
+++ b/cmd/log.c
@@ -13,6 +13,7 @@
 #include <asm/global_data.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static char log_fmt_chars[LOGF_COUNT] = "clFLfm";
 
diff --git a/cmd/lzmadec.c b/cmd/lzmadec.c
index 1452a7ac558..5b13d385ffa 100644
--- a/cmd/lzmadec.c
+++ b/cmd/lzmadec.c
@@ -16,6 +16,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/io.h>
+#include <linux/types.h>
 
 #include <lzma/LzmaTools.h>
 
diff --git a/cmd/md5sum.c b/cmd/md5sum.c
index 2fb8d7b2759..26e7acddd5a 100644
--- a/cmd/md5sum.c
+++ b/cmd/md5sum.c
@@ -15,6 +15,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <u-boot/md5.h>
 #include <asm/io.h>
 
diff --git a/cmd/mdio.c b/cmd/mdio.c
index 9f2b6e23179..b45a745a413 100644
--- a/cmd/mdio.c
+++ b/cmd/mdio.c
@@ -15,6 +15,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static char last_op[2];
 static uint last_data;
diff --git a/cmd/mem.c b/cmd/mem.c
index b7b28565a6a..206fc263c01 100644
--- a/cmd/mem.c
+++ b/cmd/mem.c
@@ -22,6 +22,7 @@
 #include <log.h>
 #include <mapmem.h>
 #include <rand.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <vsprintf.h>
@@ -34,6 +35,7 @@
 #include <linux/delay.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/cmd/mii.c b/cmd/mii.c
index aa7bb2b9f60..813a75e4c13 100644
--- a/cmd/mii.c
+++ b/cmd/mii.c
@@ -11,10 +11,12 @@
 #include <common.h>
 #include <command.h>
 #include <miiphy.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 typedef struct _MII_field_desc_t {
 	ushort hi;
diff --git a/cmd/misc.c b/cmd/misc.c
index 65bc67f6da0..09e161a0ccf 100644
--- a/cmd/misc.c
+++ b/cmd/misc.c
@@ -15,6 +15,7 @@
 #include <vsprintf.h>
 #include <linux/delay.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static int do_sleep(struct cmd_tbl *cmdtp, int flag, int argc,
 		    char *const argv[])
diff --git a/cmd/mmc.c b/cmd/mmc.c
index c3fe18a5907..aaf8ddb6afc 100644
--- a/cmd/mmc.c
+++ b/cmd/mmc.c
@@ -14,8 +14,10 @@
 #include <part.h>
 #include <sparse_format.h>
 #include <image-sparse.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
diff --git a/cmd/mtd.c b/cmd/mtd.c
index 24144546f9a..b619cf5fd61 100644
--- a/cmd/mtd.c
+++ b/cmd/mtd.c
@@ -14,6 +14,7 @@
 #include <malloc.h>
 #include <mapmem.h>
 #include <mtd.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <dm/devres.h>
@@ -21,6 +22,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <linux/ctype.h>
 
diff --git a/cmd/mtdparts.c b/cmd/mtdparts.c
index f18a6e70f10..2a97f61e50a 100644
--- a/cmd/mtdparts.c
+++ b/cmd/mtdparts.c
@@ -84,6 +84,7 @@
 #include <linux/err.h>
 #include <linux/mtd/mtd.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #if defined(CONFIG_CMD_NAND)
 #include <linux/mtd/rawnand.h>
diff --git a/cmd/mvebu/bubt.c b/cmd/mvebu/bubt.c
index 992e6106256..fefd133cc1e 100644
--- a/cmd/mvebu/bubt.c
+++ b/cmd/mvebu/bubt.c
@@ -18,6 +18,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <spi_flash.h>
 #include <spi.h>
diff --git a/cmd/nand.c b/cmd/nand.c
index f2f29a326fe..a7d6505bfb5 100644
--- a/cmd/nand.c
+++ b/cmd/nand.c
@@ -37,6 +37,7 @@
 #include <jffs2/jffs2.h>
 #include <nand.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "legacy-mtd-utils.h"
 
diff --git a/cmd/net.c b/cmd/net.c
index 691cef17368..d1f71def5e3 100644
--- a/cmd/net.c
+++ b/cmd/net.c
@@ -16,6 +16,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/string.h>
+#include <linux/types.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 2fbbe52371b..7279154c273 100644
--- a/cmd/nvedit.c
+++ b/cmd/nvedit.c
@@ -35,6 +35,7 @@
 #include <errno.h>
 #include <malloc.h>
 #include <mapmem.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
@@ -43,6 +44,7 @@
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <u-boot/crc.h>
 #include <watchdog.h>
 #include <linux/stddef.h>
diff --git a/cmd/nvedit_efi.c b/cmd/nvedit_efi.c
index 91214c93e22..c8f3015e062 100644
--- a/cmd/nvedit_efi.c
+++ b/cmd/nvedit_efi.c
@@ -16,11 +16,13 @@
 #include <malloc.h>
 #include <mapmem.h>
 #include <rtc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <uuid.h>
 #include <vsprintf.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /*
  * From efi_variable.c,
diff --git a/cmd/onenand.c b/cmd/onenand.c
index 252636012c1..05bdf2b95ca 100644
--- a/cmd/onenand.c
+++ b/cmd/onenand.c
@@ -17,6 +17,7 @@
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <linux/compat.h>
 #include <linux/mtd/mtd.h>
diff --git a/cmd/osd.c b/cmd/osd.c
index a7527f8a73d..d5bbfef3a94 100644
--- a/cmd/osd.c
+++ b/cmd/osd.c
@@ -20,6 +20,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /* Container for selected OSD device */
 static struct udevice *osd_cur;
diff --git a/cmd/pcap.c b/cmd/pcap.c
index b5a3b3c0444..2a03d8ffb16 100644
--- a/cmd/pcap.c
+++ b/cmd/pcap.c
@@ -8,6 +8,7 @@
 #include <command.h>
 #include <net.h>
 #include <vsprintf.h>
+#include <asm/types.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 1ce1a7a3627..9a063a91dbc 100644
--- a/cmd/pci.c
+++ b/cmd/pci.c
@@ -19,6 +19,7 @@
 #include <console.h>
 #include <dm.h>
 #include <init.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/processor.h>
@@ -27,6 +28,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 struct pci_reg_info {
 	const char *name;
diff --git a/cmd/pmic.c b/cmd/pmic.c
index b26b1310558..3fd6245ae31 100644
--- a/cmd/pmic.c
+++ b/cmd/pmic.c
@@ -12,6 +12,7 @@
 #include <dm/uclass-internal.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 
 #define LIMIT_DEV	32
diff --git a/cmd/pxe_utils.c b/cmd/pxe_utils.c
index 86f280bb105..1b26bf4f55a 100644
--- a/cmd/pxe_utils.c
+++ b/cmd/pxe_utils.c
@@ -13,6 +13,7 @@
 #include <mapmem.h>
 #include <lcd.h>
 #include <net.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/errno.h>
@@ -21,6 +22,7 @@
 #include <linux/ctype.h>
 #include <errno.h>
 #include <linux/list.h>
+#include <linux/types.h>
 
 #include <splash.h>
 #include <asm/io.h>
diff --git a/cmd/pxe_utils.h b/cmd/pxe_utils.h
index 1a25ca4e88e..8976a392a8a 100644
--- a/cmd/pxe_utils.h
+++ b/cmd/pxe_utils.h
@@ -5,6 +5,7 @@
 
 #include <stdbool.h>
 #include <linux/list.h>
+#include <linux/types.h>
 
 /*
  * A note on the pxe file parser.
diff --git a/cmd/qfw.c b/cmd/qfw.c
index ca60a05f6b1..d45ba93e2b6 100644
--- a/cmd/qfw.c
+++ b/cmd/qfw.c
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 /*
  * This function prepares kernel for zboot. It loads kernel data
diff --git a/cmd/read.c b/cmd/read.c
index 254925c1f78..61dd5ceb13f 100644
--- a/cmd/read.c
+++ b/cmd/read.c
@@ -13,6 +13,7 @@
 #include <part.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/types.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 e4968b7b372..98286a4dfc7 100644
--- a/cmd/regulator.c
+++ b/cmd/regulator.c
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <errno.h>
 #include <dm.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <dm/uclass-internal.h>
diff --git a/cmd/reiser.c b/cmd/reiser.c
index 8a2f976a213..4bf069f7425 100644
--- a/cmd/reiser.c
+++ b/cmd/reiser.c
@@ -18,6 +18,7 @@
 #include <asm/byteorder.h>
 #include <reiserfs.h>
 #include <part.h>
+#include <linux/types.h>
 
 #if !CONFIG_IS_ENABLED(DOS_PARTITION)
 #error DOS partition support must be selected
diff --git a/cmd/remoteproc.c b/cmd/remoteproc.c
index 48f0e4684ce..fff69866805 100644
--- a/cmd/remoteproc.c
+++ b/cmd/remoteproc.c
@@ -13,6 +13,7 @@
 #include <vsprintf.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /**
  * print_remoteproc_list() - print all the remote processor devices
diff --git a/cmd/rng.c b/cmd/rng.c
index 92d7c0de639..f498c35fdb3 100644
--- a/cmd/rng.c
+++ b/cmd/rng.c
@@ -12,6 +12,7 @@
 #include <rng.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/types.h>
 
 static int do_rng(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 {
diff --git a/cmd/rtc.c b/cmd/rtc.c
index 78af8534e4a..db7341d5a61 100644
--- a/cmd/rtc.c
+++ b/cmd/rtc.c
@@ -10,6 +10,7 @@
 #include <rtc.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
 
diff --git a/cmd/setexpr.c b/cmd/setexpr.c
index 9aefaeb1413..03beb0c1f53 100644
--- a/cmd/setexpr.c
+++ b/cmd/setexpr.c
@@ -17,6 +17,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static ulong get_arg(char *s, int w)
 {
diff --git a/cmd/sf.c b/cmd/sf.c
index d57da5f8b0b..f85f60774ae 100644
--- a/cmd/sf.c
+++ b/cmd/sf.c
@@ -16,6 +16,7 @@
 #include <mapmem.h>
 #include <spi.h>
 #include <spi_flash.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <vsprintf.h>
@@ -24,6 +25,7 @@
 #include <linux/kernel.h>
 #include <linux/mtd/mtd.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <asm/io.h>
 #include <dm/device-internal.h>
diff --git a/cmd/source.c b/cmd/source.c
index d5488a903ef..d980d3ca62a 100644
--- a/cmd/source.c
+++ b/cmd/source.c
@@ -25,6 +25,7 @@
 #include <vsprintf.h>
 #include <asm/byteorder.h>
 #include <asm/io.h>
+#include <linux/types.h>
 
 #if defined(CONFIG_FIT)
 /**
diff --git a/cmd/spi.c b/cmd/spi.c
index 2079ed0e1be..9698e0d042a 100644
--- a/cmd/spi.c
+++ b/cmd/spi.c
@@ -17,6 +17,7 @@
 #include <vsprintf.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /*-----------------------------------------------------------------------
  * Definitions
diff --git a/cmd/ti/ddr3.c b/cmd/ti/ddr3.c
index c036df8a1f8..903d6235050 100644
--- a/cmd/ti/ddr3.c
+++ b/cmd/ti/ddr3.c
@@ -17,6 +17,7 @@
 #include <common.h>
 #include <command.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/cmd/time.c b/cmd/time.c
index 7d4345bbf74..4672fe9d375 100644
--- a/cmd/time.c
+++ b/cmd/time.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <command.h>
 #include <stdio.h>
+#include <linux/types.h>
 
 static void report_time(ulong cycles)
 {
diff --git a/cmd/tlv_eeprom.c b/cmd/tlv_eeprom.c
index da052a9845b..7944e8daa3b 100644
--- a/cmd/tlv_eeprom.c
+++ b/cmd/tlv_eeprom.c
@@ -17,6 +17,7 @@
 #include <env.h>
 #include <init.h>
 #include <net.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
@@ -24,6 +25,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <u-boot/crc.h>
 
 #include "tlv_eeprom.h"
diff --git a/cmd/tpm-common.c b/cmd/tpm-common.c
index 2df4dc06920..6296c9d9da7 100644
--- a/cmd/tpm-common.c
+++ b/cmd/tpm-common.c
@@ -13,6 +13,7 @@
 #include <asm/unaligned.h>
 #include <linux/string.h>
 #include <tpm-common.h>
+#include <linux/types.h>
 #include "tpm-user-utils.h"
 
 static struct udevice *tpm_dev;
diff --git a/cmd/tpm-user-utils.h b/cmd/tpm-user-utils.h
index 358ddff5761..7a763d2b4cc 100644
--- a/cmd/tpm-user-utils.h
+++ b/cmd/tpm-user-utils.h
@@ -7,6 +7,7 @@
 #ifndef __TPM_USER_UTILS_H
 #define __TPM_USER_UTILS_H
 
+#include <linux/types.h>
 void print_byte_string(u8 *data, size_t count);
 void *parse_byte_string(char *bytes, u8 *data, size_t *count_ptr);
 int report_return_code(int return_code);
diff --git a/cmd/tpm-v1.c b/cmd/tpm-v1.c
index 0c96b10f06c..495c17ef12b 100644
--- a/cmd/tpm-v1.c
+++ b/cmd/tpm-v1.c
@@ -14,6 +14,7 @@
 #include <tpm-v1.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "tpm-user-utils.h"
 
 static int do_tpm_startup(struct cmd_tbl *cmdtp, int flag, int argc,
diff --git a/cmd/tpm-v2.c b/cmd/tpm-v2.c
index 2be09f547d5..d7201df3a29 100644
--- a/cmd/tpm-v2.c
+++ b/cmd/tpm-v2.c
@@ -16,6 +16,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "tpm-user-utils.h"
 
 static int do_tpm2_startup(struct cmd_tbl *cmdtp, int flag, int argc,
diff --git a/cmd/tpm_test.c b/cmd/tpm_test.c
index 3a345877a25..5d4aafa67cb 100644
--- a/cmd/tpm_test.c
+++ b/cmd/tpm_test.c
@@ -12,6 +12,7 @@
 #include <tpm-v1.h>
 #include <linux/kernel.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 #include "tpm-user-utils.h"
 
 /* Prints error and returns on failure */
diff --git a/cmd/trace.c b/cmd/trace.c
index 46b498700e9..063012082fe 100644
--- a/cmd/trace.c
+++ b/cmd/trace.c
@@ -12,6 +12,7 @@
 #include <vsprintf.h>
 #include <asm/io.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 static int get_args(int argc, char *const argv[], char **buff,
 		    size_t *buff_ptr, size_t *buff_size)
diff --git a/cmd/tsi148.c b/cmd/tsi148.c
index 17f7f192f96..928eedc08c9 100644
--- a/cmd/tsi148.c
+++ b/cmd/tsi148.c
@@ -16,6 +16,7 @@
 #include <asm/io.h>
 #include <pci.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <tsi148.h>
 
diff --git a/cmd/ubi.c b/cmd/ubi.c
index 80c175eec51..d8f54fdc828 100644
--- a/cmd/ubi.c
+++ b/cmd/ubi.c
@@ -20,6 +20,7 @@
 #include <mtd.h>
 #include <nand.h>
 #include <onenand_uboot.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <dm/devres.h>
@@ -31,6 +32,7 @@
 #include <linux/errno.h>
 #include <jffs2/load_kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #undef ubi_msg
 #define ubi_msg(fmt, ...) printf("UBI: " fmt "\n", ##__VA_ARGS__)
diff --git a/cmd/ubifs.c b/cmd/ubifs.c
index 191199c0762..0f1aebde0f2 100644
--- a/cmd/ubifs.c
+++ b/cmd/ubifs.c
@@ -18,6 +18,7 @@
 #include <stdio.h>
 #include <ubifs_uboot.h>
 #include <vsprintf.h>
+#include <asm/types.h>
 
 static int ubifs_initialized;
 static int ubifs_mounted;
diff --git a/cmd/universe.c b/cmd/universe.c
index b1eeff7a660..39eaf9af9ab 100644
--- a/cmd/universe.c
+++ b/cmd/universe.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <pci.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <universe.h>
 
diff --git a/cmd/unlz4.c b/cmd/unlz4.c
index a885c93dc4b..3c3d928243a 100644
--- a/cmd/unlz4.c
+++ b/cmd/unlz4.c
@@ -10,6 +10,7 @@
 #include <lz4.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/types.h>
 
 static int do_unlz4(struct cmd_tbl *cmdtp, int flag, int argc,
 		    char *const argv[])
diff --git a/cmd/usb.c b/cmd/usb.c
index 6a6d20096ad..27cf810ade8 100644
--- a/cmd/usb.c
+++ b/cmd/usb.c
@@ -25,6 +25,7 @@
 #include <part.h>
 #include <usb.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_USB_STORAGE
 static int usb_stor_curr_dev = -1; /* current device */
diff --git a/cmd/usb_mass_storage.c b/cmd/usb_mass_storage.c
index 36a905cd771..24979bd97d7 100644
--- a/cmd/usb_mass_storage.c
+++ b/cmd/usb_mass_storage.c
@@ -23,6 +23,7 @@
 #include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static int ums_read_sector(struct ums *ums_dev,
 			   ulong start, lbaint_t blkcnt, void *buf)
diff --git a/cmd/version.c b/cmd/version.c
index dcd91f09fa1..874fd68e186 100644
--- a/cmd/version.c
+++ b/cmd/version.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <display_options.h>
 #include <stdio.h>
 #include <version.h>
diff --git a/cmd/w1.c b/cmd/w1.c
index 7c13d83553a..b7cf0323234 100644
--- a/cmd/w1.c
+++ b/cmd/w1.c
@@ -10,6 +10,7 @@
 #include <vsprintf.h>
 #include <w1.h>
 #include <w1-eeprom.h>
+#include <asm/types.h>
 #include <dm/device-internal.h>
 #include <linux/string.h>
 
diff --git a/cmd/wdt.c b/cmd/wdt.c
index c9c7a610efd..0a8ef782811 100644
--- a/cmd/wdt.c
+++ b/cmd/wdt.c
@@ -12,6 +12,7 @@
 #include <vsprintf.h>
 #include <wdt.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 static struct udevice *currdev;
 
diff --git a/cmd/wol.c b/cmd/wol.c
index 61a9d95e0eb..48359adb6e9 100644
--- a/cmd/wol.c
+++ b/cmd/wol.c
@@ -11,6 +11,7 @@
 #include <command.h>
 #include <net.h>
 #include <vsprintf.h>
+#include <linux/types.h>
 
 #if defined(CONFIG_CMD_WOL)
 void wol_set_timeout(ulong);
diff --git a/cmd/x86/fsp.c b/cmd/x86/fsp.c
index 933fe8af406..d7129894836 100644
--- a/cmd/x86/fsp.c
+++ b/cmd/x86/fsp.c
@@ -9,6 +9,7 @@
 #include <asm/fsp/fsp_support.h>
 #include <asm/global_data.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/cmd/x86/hob.c b/cmd/x86/hob.c
index ed1c42f4934..fcb3dee2e60 100644
--- a/cmd/x86/hob.c
+++ b/cmd/x86/hob.c
@@ -11,6 +11,7 @@
 #include <asm/global_data.h>
 #include <asm/hob.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/cmd/x86/mtrr.c b/cmd/x86/mtrr.c
index a766eca7856..cccdc3afbfc 100644
--- a/cmd/x86/mtrr.c
+++ b/cmd/x86/mtrr.c
@@ -13,6 +13,7 @@
 #include <asm/mp.h>
 #include <asm/mtrr.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static const char *const mtrr_type_name[MTRR_TYPE_COUNT] = {
 	"Uncacheable",
diff --git a/cmd/ximg.c b/cmd/ximg.c
index 68f3d14c5b7..f9032bea3e1 100644
--- a/cmd/ximg.c
+++ b/cmd/ximg.c
@@ -30,6 +30,7 @@
 #include <asm/io.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #ifndef CONFIG_SYS_XIMG_LEN
 /* use 8MByte as default max gunzip size */
diff --git a/cmd/yaffs2.c b/cmd/yaffs2.c
index 29b52f7ceda..fe9a2bb6c95 100644
--- a/cmd/yaffs2.c
+++ b/cmd/yaffs2.c
@@ -17,6 +17,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <config.h>
 #include <command.h>
diff --git a/cmd/zfs.c b/cmd/zfs.c
index dde1c097c63..5c59d44337b 100644
--- a/cmd/zfs.c
+++ b/cmd/zfs.c
@@ -22,6 +22,7 @@
 #include <linux/stat.h>
 #include <malloc.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #if defined(CONFIG_CMD_USB) && defined(CONFIG_USB_STORAGE)
 #include <usb.h>
diff --git a/common/android_ab.c b/common/android_ab.c
index 5b0cb0b1d75..6e85b0f67c2 100644
--- a/common/android_ab.c
+++ b/common/android_ab.c
@@ -10,10 +10,12 @@
 #include <malloc.h>
 #include <part.h>
 #include <memalign.h>
+#include <stdbool.h>
 #include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <u-boot/crc.h>
 #include <u-boot/crc.h>
 
diff --git a/common/autoboot.c b/common/autoboot.c
index 55bb2ee7adf..1b0ab9ced76 100644
--- a/common/autoboot.c
+++ b/common/autoboot.c
@@ -25,6 +25,7 @@
 #include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <u-boot/sha256.h>
 #include <bootcount.h>
 
diff --git a/common/avb_verify.c b/common/avb_verify.c
index 4c825e8553b..75a6c1f0ff0 100644
--- a/common/avb_verify.c
+++ b/common/avb_verify.c
@@ -11,11 +11,13 @@
 #include <image.h>
 #include <malloc.h>
 #include <part.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <tee.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <tee/optee_ta_avb.h>
 
 static const unsigned char avb_root_pub[1032] = {
diff --git a/common/bloblist.c b/common/bloblist.c
index 234c40e741a..186815a9310 100644
--- a/common/bloblist.c
+++ b/common/bloblist.c
@@ -9,10 +9,12 @@
 #include <log.h>
 #include <mapmem.h>
 #include <spl.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <u-boot/crc.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/common/board_f.c b/common/board_f.c
index c342404bc0d..18685762900 100644
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -13,6 +13,7 @@
 #include <bloblist.h>
 #include <bootstage.h>
 #include <clock_legacy.h>
+#include <compiler.h>
 #include <console.h>
 #include <cpu.h>
 #include <cpu_func.h>
@@ -38,6 +39,7 @@
 #include <spl.h>
 #endif
 #include <status_led.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <sysreset.h>
 #include <timer.h>
@@ -59,6 +61,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /*
  * Pointer to initial global data area
diff --git a/common/board_info.c b/common/board_info.c
index bfa5324e821..3e9ee4b9604 100644
--- a/common/board_info.c
+++ b/common/board_info.c
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0+
 
 #include <common.h>
+#include <compiler.h>
 #include <init.h>
 #include <stdio.h>
 #include <asm/global_data.h>
diff --git a/common/board_r.c b/common/board_r.c
index 1fd3ff02162..b963dec2aa2 100644
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <api.h>
 #include <bootstage.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <display_options.h>
 #include <exports.h>
@@ -28,6 +29,7 @@
 #include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include <u-boot/crc.h>
 /* TODO: can we just include all these headers whether needed or not? */
 #if defined(CONFIG_CMD_BEDBUG)
diff --git a/common/bootm.c b/common/bootm.c
index 08570826e22..d5bd80f9a09 100644
--- a/common/bootm.c
+++ b/common/bootm.c
@@ -7,6 +7,7 @@
 #ifndef USE_HOSTCC
 #include <common.h>
 #include <bootstage.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <env.h>
 #include <errno.h>
@@ -17,6 +18,7 @@
 #include <malloc.h>
 #include <mapmem.h>
 #include <net.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/cache.h>
@@ -29,6 +31,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #else
 #include "mkimage.h"
 #endif
diff --git a/common/bootm_os.c b/common/bootm_os.c
index 16c8a78722a..d76533dd0b5 100644
--- a/common/bootm_os.c
+++ b/common/bootm_os.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <bootm.h>
 #include <bootstage.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <efi_loader.h>
 #include <env.h>
@@ -14,6 +15,7 @@
 #include <image.h>
 #include <lmb.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
@@ -24,6 +26,7 @@
 #include <mapmem.h>
 #include <vxworks.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <tee/optee.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/common/bootretry.c b/common/bootretry.c
index 41d52a7b9c1..6f4fb4b2afd 100644
--- a/common/bootretry.c
+++ b/common/bootretry.c
@@ -14,6 +14,7 @@
 #include <vsprintf.h>
 #include <watchdog.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #ifndef CONFIG_BOOT_RETRY_MIN
 #define CONFIG_BOOT_RETRY_MIN CONFIG_BOOT_RETRY_TIME
diff --git a/common/bootstage.c b/common/bootstage.c
index ddb78a5dcea..721003a3a42 100644
--- a/common/bootstage.c
+++ b/common/bootstage.c
@@ -24,6 +24,7 @@
 #include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/common/bouncebuf.c b/common/bouncebuf.c
index 8051c016942..39b27d6540d 100644
--- a/common/bouncebuf.c
+++ b/common/bouncebuf.c
@@ -15,6 +15,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static int addr_aligned(struct bounce_buffer *state)
 {
diff --git a/common/cli.c b/common/cli.c
index a83c606ee9e..f1bc0f621c4 100644
--- a/common/cli.c
+++ b/common/cli.c
@@ -13,6 +13,7 @@
 #include <cli.h>
 #include <cli_hush.h>
 #include <command.h>
+#include <compiler.h>
 #include <console.h>
 #include <env.h>
 #include <fdtdec.h>
diff --git a/common/cli_hush.c b/common/cli_hush.c
index 828b10db860..a6b6c5e5ee6 100644
--- a/common/cli_hush.c
+++ b/common/cli_hush.c
@@ -92,6 +92,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #endif
 #ifndef __U_BOOT__
 #include <ctype.h>     /* isalpha, isdigit */
diff --git a/common/cli_readline.c b/common/cli_readline.c
index 78c1faad8f7..066b9089f1f 100644
--- a/common/cli_readline.c
+++ b/common/cli_readline.c
@@ -17,6 +17,7 @@
 #include <watchdog.h>
 #include <asm/global_data.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/common/command.c b/common/command.c
index dfad65d735c..528d353aca4 100644
--- a/common/command.c
+++ b/common/command.c
@@ -19,6 +19,7 @@
 #include <asm/global_data.h>
 #include <linux/ctype.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /*
  * Use puts() instead of printf() to avoid printf buffer overflow
diff --git a/common/common_fit.c b/common/common_fit.c
index 8872b83646a..0db92f48320 100644
--- a/common/common_fit.c
+++ b/common/common_fit.c
@@ -12,6 +12,7 @@
 #include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 ulong fdt_getprop_u32(const void *fdt, int node, const char *prop)
 {
diff --git a/common/console.c b/common/console.c
index f7ddc1dcafc..2bac3aa0fa2 100644
--- a/common/console.c
+++ b/common/console.c
@@ -26,6 +26,7 @@
 #include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/common/ddr_spd.c b/common/ddr_spd.c
index 241549bd485..ad94e54b73b 100644
--- a/common/ddr_spd.c
+++ b/common/ddr_spd.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <ddr_spd.h>
 #include <stdio.h>
+#include <linux/types.h>
 
 /* used for ddr1 and ddr2 spd */
 static int
diff --git a/common/dlmalloc.c b/common/dlmalloc.c
index 0f9e0d94378..be4c1b273df 100644
--- a/common/dlmalloc.c
+++ b/common/dlmalloc.c
@@ -5,6 +5,7 @@
 #include <asm/global_data.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #if CONFIG_IS_ENABLED(UNIT_TEST)
 #define DEBUG
diff --git a/common/edid.c b/common/edid.c
index a1b266e9c18..a6c6170f2e3 100644
--- a/common/edid.c
+++ b/common/edid.c
@@ -14,11 +14,13 @@
 #include <errno.h>
 #include <fdtdec.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <linux/ctype.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 int edid_check_info(struct edid1_info *edid_info)
 {
diff --git a/common/eeprom/eeprom_layout.c b/common/eeprom/eeprom_layout.c
index cfe457c7444..d2f87f4f251 100644
--- a/common/eeprom/eeprom_layout.c
+++ b/common/eeprom/eeprom_layout.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <stdio.h>
 #include <linux/kernel.h>
 #include <eeprom_layout.h>
diff --git a/common/fdt_region.c b/common/fdt_region.c
index cb9bf08ce75..065fbd31050 100644
--- a/common/fdt_region.c
+++ b/common/fdt_region.c
@@ -9,6 +9,7 @@
 #include <linux/libfdt_env.h>
 #include <fdt_region.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #ifndef USE_HOSTCC
 #include <fdt.h>
diff --git a/common/fdt_support.c b/common/fdt_support.c
index 230e599a44c..e78999f6daf 100644
--- a/common/fdt_support.c
+++ b/common/fdt_support.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <mapmem.h>
 #include <net.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdio_dev.h>
 #include <vsprintf.h>
diff --git a/common/flash.c b/common/flash.c
index c01cb28b92f..18b6f89b0c3 100644
--- a/common/flash.c
+++ b/common/flash.c
@@ -12,6 +12,7 @@
 #include <stdio.h>
 #include <uuid.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <mtd/cfi_flash.h>
 
diff --git a/common/hash.c b/common/hash.c
index 91b2fc41eb5..a37172be8be 100644
--- a/common/hash.c
+++ b/common/hash.c
@@ -17,6 +17,7 @@
 #include <malloc.h>
 #include <mapmem.h>
 #include <hw_sha.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/cache.h>
@@ -25,6 +26,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <u-boot/crc.h>
 #else
 #include "mkimage.h"
diff --git a/common/hwconfig.c b/common/hwconfig.c
index 26a561c365b..1ecb5596cfa 100644
--- a/common/hwconfig.c
+++ b/common/hwconfig.c
@@ -56,6 +56,7 @@ next:
 
 		arg_end = strpbrk(str, stopchs);
 		if (!arg_end)
+#include <linux/kernel.h>
 			*arglen = min(maxlen, strlen(str)) - optlen - 1;
 		else
 			*arglen = arg_end - end - 1;
diff --git a/common/image-android-dt.c b/common/image-android-dt.c
index 456c4c584f0..eb1150552cb 100644
--- a/common/image-android-dt.c
+++ b/common/image-android-dt.c
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <linux/libfdt.h>
 #include <mapmem.h>
+#include <linux/types.h>
 
 /**
  * Check if image header is correct.
diff --git a/common/image-android.c b/common/image-android.c
index a4dea76bde5..fd115c7a3b4 100644
--- a/common/image-android.c
+++ b/common/image-android.c
@@ -10,6 +10,7 @@
 #include <android_image.h>
 #include <malloc.h>
 #include <errno.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/unaligned.h>
 #include <mapmem.h>
@@ -17,6 +18,7 @@
 #include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define ANDROID_IMAGE_DEFAULT_KERNEL_ADDR	0x10008000
 
diff --git a/common/image-cipher.c b/common/image-cipher.c
index 7a9892b930c..6ac263af8ab 100644
--- a/common/image-cipher.c
+++ b/common/image-cipher.c
@@ -14,6 +14,7 @@
 #include <asm/global_data.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 DECLARE_GLOBAL_DATA_PTR;
 #endif /* !USE_HOSdTCC*/
 #include <image.h>
diff --git a/common/image-fdt.c b/common/image-fdt.c
index c05495ee36c..c44bad2f65f 100644
--- a/common/image-fdt.c
+++ b/common/image-fdt.c
@@ -9,6 +9,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <fdt_support.h>
 #include <fdtdec.h>
 #include <env.h>
@@ -25,6 +26,7 @@
 #include <mapmem.h>
 #include <asm/io.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <tee/optee.h>
 
 #ifndef CONFIG_SYS_FDT_PAD
diff --git a/common/image-fit-sig.c b/common/image-fit-sig.c
index 52e82777e3d..8272fbd6734 100644
--- a/common/image-fit-sig.c
+++ b/common/image-fit-sig.c
@@ -10,11 +10,13 @@
 #include <common.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 DECLARE_GLOBAL_DATA_PTR;
 #endif /* !USE_HOSTCC*/
 #include <fdt_region.h>
diff --git a/common/image-fit.c b/common/image-fit.c
index a0683072b43..f7a5bb95ec4 100644
--- a/common/image-fit.c
+++ b/common/image-fit.c
@@ -28,6 +28,7 @@
 #include <malloc.h>
 #include <asm/global_data.h>
 #include <linux/string.h>
+#include <linux/types.h>
 DECLARE_GLOBAL_DATA_PTR;
 #endif /* !USE_HOSTCC*/
 
diff --git a/common/image-sig.c b/common/image-sig.c
index aef02638d79..a177b26b96b 100644
--- a/common/image-sig.c
+++ b/common/image-sig.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
diff --git a/common/image.c b/common/image.c
index 341807059ee..5e01da53031 100644
--- a/common/image.c
+++ b/common/image.c
@@ -15,12 +15,14 @@
 #include <lmb.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/cache.h>
 #include <asm/u-boot.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <u-boot/crc.h>
 #include <watchdog.h>
 
diff --git a/common/init/board_init.c b/common/init/board_init.c
index d3059c46bdc..93f618f69a5 100644
--- a/common/init/board_init.c
+++ b/common/init/board_init.c
@@ -8,10 +8,12 @@
 
 #include <common.h>
 #include <bootstage.h>
+#include <compiler.h>
 #include <init.h>
 #include <asm/global_data.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/common/iotrace.c b/common/iotrace.c
index d342e317d63..ebc7c29d3f0 100644
--- a/common/iotrace.c
+++ b/common/iotrace.c
@@ -12,6 +12,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/bug.h>
+#include <linux/types.h>
 #include <u-boot/crc.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/common/lcd.c b/common/lcd.c
index b4352229c5b..4f38de6863f 100644
--- a/common/lcd.c
+++ b/common/lcd.c
@@ -7,6 +7,7 @@
  */
 
 /* #define DEBUG */
+#include <compiler.h>
 #include <config.h>
 #include <common.h>
 #include <command.h>
diff --git a/common/lcd_console.c b/common/lcd_console.c
index fe2ef2f5b9e..3ce4d980671 100644
--- a/common/lcd_console.c
+++ b/common/lcd_console.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <lcd.h>
 #include <log.h>
 #include <serial.h>
@@ -19,6 +20,7 @@
 #include <vsprintf.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static struct console_t cons;
 
diff --git a/common/lcd_console_rotation.c b/common/lcd_console_rotation.c
index 8fc333d4e32..8bbaafa4d8c 100644
--- a/common/lcd_console_rotation.c
+++ b/common/lcd_console_rotation.c
@@ -8,6 +8,7 @@
 #include <lcd.h>
 #include <stdio.h>
 #include <video_font.h>		/* Get font data, width and height */
+#include <linux/types.h>
 
 static void lcd_putc_xy90(struct console_t *pcons, ushort x, ushort y, char c)
 {
diff --git a/common/lcd_simplefb.c b/common/lcd_simplefb.c
index 7a2f0056fd4..4c4ec25a47c 100644
--- a/common/lcd_simplefb.c
+++ b/common/lcd_simplefb.c
@@ -14,6 +14,7 @@
 #include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <video.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/common/log.c b/common/log.c
index c8d13365caa..1d42fb34b1b 100644
--- a/common/log.c
+++ b/common/log.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <stdarg.h>
+#include <stdbool.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <dm/uclass.h>
diff --git a/common/log_syslog.c b/common/log_syslog.c
index 21c10511df1..af2a78d4f95 100644
--- a/common/log_syslog.c
+++ b/common/log_syslog.c
@@ -12,6 +12,7 @@
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/common/malloc_simple.c b/common/malloc_simple.c
index b8b9d7608cd..fc436f3e112 100644
--- a/common/malloc_simple.c
+++ b/common/malloc_simple.c
@@ -15,6 +15,7 @@
 #include <asm/io.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/common/memsize.c b/common/memsize.c
index d5d13d51bf1..30a090ce5d3 100644
--- a/common/memsize.c
+++ b/common/memsize.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <init.h>
 #include <asm/global_data.h>
 
diff --git a/common/s_record.c b/common/s_record.c
index 2b7651fcffc..07fad02961e 100644
--- a/common/s_record.c
+++ b/common/s_record.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <s_record.h>
+#include <linux/types.h>
 
 static int hex1_bin (char  c);
 static int hex2_bin (char *s);
diff --git a/common/spl/spl.c b/common/spl/spl.c
index 51d777f4ee7..8d8f5c019e5 100644
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -10,6 +10,7 @@
 #include <bloblist.h>
 #include <binman_sym.h>
 #include <bootstage.h>
+#include <compiler.h>
 #include <dm.h>
 #include <handoff.h>
 #include <hang.h>
@@ -18,6 +19,7 @@
 #include <log.h>
 #include <serial.h>
 #include <spl.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
@@ -27,6 +29,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <u-boot/crc.h>
 #include <version.h>
 #include <image.h>
diff --git a/common/spl/spl_atf.c b/common/spl/spl_atf.c
index 6c3e839e855..cbb6194fb0a 100644
--- a/common/spl/spl_atf.c
+++ b/common/spl/spl_atf.c
@@ -11,6 +11,7 @@
 
 #include <common.h>
 #include <atf_common.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <errno.h>
 #include <image.h>
@@ -18,6 +19,7 @@
 #include <spl.h>
 #include <asm/cache.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static struct bl2_to_bl31_params_mem bl31_params_mem;
 static struct bl31_params *bl2_to_bl31_params;
diff --git a/common/spl/spl_bootrom.c b/common/spl/spl_bootrom.c
index 0eefd39a519..cef23ca2a59 100644
--- a/common/spl/spl_bootrom.c
+++ b/common/spl/spl_bootrom.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <spl.h>
 
 __weak int board_return_to_bootrom(struct spl_image_info *spl_image,
diff --git a/common/spl/spl_ext.c b/common/spl/spl_ext.c
index 4f152270da7..6b37653d558 100644
--- a/common/spl/spl_ext.c
+++ b/common/spl/spl_ext.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <image.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 int spl_load_image_ext(struct spl_image_info *spl_image,
 		       struct blk_desc *block_dev, int partition,
diff --git a/common/spl/spl_fat.c b/common/spl/spl_fat.c
index f31fdee02ba..8ed7567f0f2 100644
--- a/common/spl/spl_fat.c
+++ b/common/spl/spl_fat.c
@@ -19,6 +19,7 @@
 #include <image.h>
 #include <linux/errno.h>
 #include <linux/libfdt.h>
+#include <linux/types.h>
 
 static int fat_registered;
 
diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c
index 7a65035ba86..9afde9abefb 100644
--- a/common/spl/spl_fit.c
+++ b/common/spl/spl_fit.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <errno.h>
 #include <board.h>
 #include <fpga.h>
@@ -21,6 +22,7 @@
 #include <linux/libfdt.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/common/spl/spl_legacy.c b/common/spl/spl_legacy.c
index d8ca3e9873b..390fa72b7cf 100644
--- a/common/spl/spl_legacy.c
+++ b/common/spl/spl_legacy.c
@@ -10,6 +10,7 @@
 #include <spl.h>
 #include <stdio.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #include <lzma/LzmaTypes.h>
 #include <lzma/LzmaDec.h>
diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c
index 897ea3fbfa6..2c6ccb20bf9 100644
--- a/common/spl/spl_mmc.c
+++ b/common/spl/spl_mmc.c
@@ -6,6 +6,7 @@
  * Aneesh V <aneesh@ti.com>
  */
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
 #include <part.h>
@@ -18,6 +19,7 @@
 #include <mmc.h>
 #include <image.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 static int mmc_load_legacy(struct spl_image_info *spl_image, struct mmc *mmc,
 			   ulong sector, struct image_header *header)
diff --git a/common/spl/spl_nand.c b/common/spl/spl_nand.c
index 15101f39423..6fb7001c281 100644
--- a/common/spl/spl_nand.c
+++ b/common/spl/spl_nand.c
@@ -4,6 +4,7 @@
  * Corscience GmbH & Co. KG - Simon Schwarz <schwarz@corscience.de>
  */
 #include <common.h>
+#include <compiler.h>
 #include <config.h>
 #include <fdt_support.h>
 #include <image.h>
@@ -14,6 +15,7 @@
 #include <nand.h>
 #include <linux/libfdt_env.h>
 #include <fdt.h>
+#include <linux/types.h>
 
 uint32_t __weak spl_nand_get_uboot_raw_page(void)
 {
diff --git a/common/spl/spl_net.c b/common/spl/spl_net.c
index b4a0a56b701..102d64cd50f 100644
--- a/common/spl/spl_net.c
+++ b/common/spl/spl_net.c
@@ -17,6 +17,7 @@
 #include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #if defined(CONFIG_SPL_ETH_SUPPORT) || defined(CONFIG_SPL_USB_ETHER)
 static ulong spl_net_load_read(struct spl_load_info *load, ulong sector,
diff --git a/common/spl/spl_nor.c b/common/spl/spl_nor.c
index a198577a2bd..3201b09720c 100644
--- a/common/spl/spl_nor.c
+++ b/common/spl/spl_nor.c
@@ -4,11 +4,13 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <image.h>
 #include <log.h>
 #include <spl.h>
 #include <stdio.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static ulong spl_nor_load_read(struct spl_load_info *load, ulong sector,
 			       ulong count, void *buf)
diff --git a/common/spl/spl_opensbi.c b/common/spl/spl_opensbi.c
index 086759d63f2..e75d94b6df7 100644
--- a/common/spl/spl_opensbi.c
+++ b/common/spl/spl_opensbi.c
@@ -17,6 +17,7 @@
 #include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/common/spl/spl_ram.c b/common/spl/spl_ram.c
index 7ea0a32b0d7..e993c643f20 100644
--- a/common/spl/spl_ram.c
+++ b/common/spl/spl_ram.c
@@ -17,6 +17,7 @@
 #include <spl.h>
 #include <linux/libfdt.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #ifndef CONFIG_SPL_LOAD_FIT_ADDRESS
 # define CONFIG_SPL_LOAD_FIT_ADDRESS	0
diff --git a/common/spl/spl_sata.c b/common/spl/spl_sata.c
index 33311c2813a..029c23e9101 100644
--- a/common/spl/spl_sata.c
+++ b/common/spl/spl_sata.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <spl.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <sata.h>
 #include <scsi.h>
diff --git a/common/spl/spl_spi.c b/common/spl/spl_spi.c
index 0974e9e6f5d..8ca3d99af6a 100644
--- a/common/spl/spl_spi.c
+++ b/common/spl/spl_spi.c
@@ -9,6 +9,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <image.h>
 #include <log.h>
 #include <spi.h>
@@ -19,6 +20,7 @@
 #include <asm/global_data.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/common/spl/spl_ymodem.c b/common/spl/spl_ymodem.c
index f9c7c2b04fc..f197a96ca40 100644
--- a/common/spl/spl_ymodem.c
+++ b/common/spl/spl_ymodem.c
@@ -19,6 +19,7 @@
 #include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define BUF_SIZE 1024
 
diff --git a/common/splash.c b/common/splash.c
index 575003e6561..e6d177ec9b5 100644
--- a/common/splash.c
+++ b/common/splash.c
@@ -21,6 +21,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <display_options.h>
 #include <env.h>
 #include <splash.h>
@@ -30,6 +31,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static struct splash_location default_splash_locations[] = {
 	{
diff --git a/common/splash_source.c b/common/splash_source.c
index be7e90c3880..33989d876b3 100644
--- a/common/splash_source.c
+++ b/common/splash_source.c
@@ -19,6 +19,7 @@
 #include <spi.h>
 #include <spi_flash.h>
 #include <splash.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <usb.h>
 #include <vsprintf.h>
@@ -26,6 +27,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/common/stdio.c b/common/stdio.c
index 634ab9203af..413c4880df1 100644
--- a/common/stdio.c
+++ b/common/stdio.c
@@ -23,6 +23,7 @@
 #include <asm/global_data.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #if defined(CONFIG_SYS_I2C)
 #include <i2c.h>
diff --git a/common/update.c b/common/update.c
index f5041c6171a..4520519c667 100644
--- a/common/update.c
+++ b/common/update.c
@@ -15,6 +15,7 @@
 #include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #if !(defined(CONFIG_FIT) && defined(CONFIG_OF_LIBFDT))
 #error "CONFIG_FIT and CONFIG_OF_LIBFDT are required for auto-update feature"
diff --git a/common/usb.c b/common/usb.c
index 98e7582c2a2..73bfe24dc3c 100644
--- a/common/usb.c
+++ b/common/usb.c
@@ -27,6 +27,7 @@
  */
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
 #include <malloc.h>
@@ -43,6 +44,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define USB_BUFSIZ	512
 
diff --git a/common/usb_hub.c b/common/usb_hub.c
index 5abbb1b0a40..921e8b7cdbf 100644
--- a/common/usb_hub.c
+++ b/common/usb_hub.c
@@ -23,16 +23,19 @@
 
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <dm.h>
 #include <env.h>
 #include <errno.h>
 #include <log.h>
 #include <malloc.h>
 #include <memalign.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <vsprintf.h>
 #include <asm/processor.h>
+#include <asm/types.h>
 #include <asm/unaligned.h>
 #include <linux/ctype.h>
 #include <linux/delay.h>
diff --git a/common/usb_kbd.c b/common/usb_kbd.c
index b2967330b69..c5236eacb36 100644
--- a/common/usb_kbd.c
+++ b/common/usb_kbd.c
@@ -22,6 +22,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <usb.h>
 
diff --git a/common/usb_storage.c b/common/usb_storage.c
index d46e9288c05..34f57cf26bd 100644
--- a/common/usb_storage.c
+++ b/common/usb_storage.c
@@ -50,6 +50,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <part.h>
 #include <usb.h>
diff --git a/common/xyzModem.c b/common/xyzModem.c
index 732548f4f2d..8868f0e2311 100644
--- a/common/xyzModem.c
+++ b/common/xyzModem.c
@@ -27,6 +27,7 @@
 #include <vsprintf.h>
 #include <xyzModem.h>
 #include <stdarg.h>
+#include <linux/types.h>
 #include <u-boot/crc.h>
 #include <watchdog.h>
 
diff --git a/disk/part.c b/disk/part.c
index 58fd9b89e64..2e5af829d84 100644
--- a/disk/part.c
+++ b/disk/part.c
@@ -18,6 +18,7 @@
 #include <vsprintf.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #undef	PART_DEBUG
 
diff --git a/disk/part_amiga.c b/disk/part_amiga.c
index 40ae1466788..22d248dafb0 100644
--- a/disk/part_amiga.c
+++ b/disk/part_amiga.c
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "part_amiga.h"
 #include <part.h>
 
diff --git a/disk/part_amiga.h b/disk/part_amiga.h
index 42f5eb0f941..3c519ac420a 100644
--- a/disk/part_amiga.h
+++ b/disk/part_amiga.h
@@ -8,6 +8,7 @@
 #ifndef _DISK_PART_AMIGA_H
 #define _DISK_PART_AMIGA_H
 #include <common.h>
+#include <asm/types.h>
 
 #if CONFIG_IS_ENABLED(ISO_PARTITION)
 /* Make the buffers bigger if ISO partition support is enabled -- CD-ROMS
diff --git a/disk/part_dos.c b/disk/part_dos.c
index 55d5955f738..e2619a3b7f7 100644
--- a/disk/part_dos.c
+++ b/disk/part_dos.c
@@ -22,6 +22,7 @@
 #include <vsprintf.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "part_dos.h"
 #include <part.h>
 
diff --git a/disk/part_efi.c b/disk/part_efi.c
index 611df0bcf6c..a842e0fecd9 100644
--- a/disk/part_efi.c
+++ b/disk/part_efi.c
@@ -31,6 +31,7 @@
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <u-boot/crc.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/disk/part_iso.c b/disk/part_iso.c
index accb95da3bc..82074226fe5 100644
--- a/disk/part_iso.c
+++ b/disk/part_iso.c
@@ -12,6 +12,7 @@
 #include <asm/cache.h>
 #include <asm/unaligned.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "part_iso.h"
 
 #ifdef CONFIG_HAVE_BLOCK_DEVICE
diff --git a/disk/part_mac.c b/disk/part_mac.c
index 2d9aa380168..f5f5f510214 100644
--- a/disk/part_mac.c
+++ b/disk/part_mac.c
@@ -18,6 +18,7 @@
 #include <memalign.h>
 #include <ide.h>
 #include <stdio.h>
+#include <linux/types.h>
 #include "part_mac.h"
 #include <part.h>
 
diff --git a/disk/part_mac.h b/disk/part_mac.h
index 5f396c94089..884494b1acd 100644
--- a/disk/part_mac.h
+++ b/disk/part_mac.h
@@ -7,6 +7,7 @@
 /*
  * See also Linux sources, fs/partitions/mac.h
  *
+#include <linux/types.h>
  * This file describes structures and values related to the standard
  * Apple SCSI disk partitioning scheme. For more information see:
  * http://developer.apple.com/techpubs/mac/Devices/Devices-126.html#MARKER-14-92
diff --git a/drivers/adc/meson-saradc.c b/drivers/adc/meson-saradc.c
index cf2d0c14408..4148d532239 100644
--- a/drivers/adc/meson-saradc.c
+++ b/drivers/adc/meson-saradc.c
@@ -13,6 +13,7 @@
 #include <dm.h>
 #include <regmap.h>
 #include <errno.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
@@ -22,6 +23,7 @@
 #include <linux/math64.h>
 #include <linux/bitfield.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 #define MESON_SAR_ADC_REG0					0x00
 	#define MESON_SAR_ADC_REG0_PANEL_DETECT			BIT(31)
diff --git a/drivers/adc/rockchip-saradc.c b/drivers/adc/rockchip-saradc.c
index 26e037509cd..307a263d36e 100644
--- a/drivers/adc/rockchip-saradc.c
+++ b/drivers/adc/rockchip-saradc.c
@@ -15,6 +15,7 @@
 #include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 #define SARADC_CTRL_CHN_MASK		GENMASK(2, 0)
 #define SARADC_CTRL_POWER_CTRL		BIT(3)
diff --git a/drivers/adc/stm32-adc-core.c b/drivers/adc/stm32-adc-core.c
index 0e624ea222e..54a59c8061d 100644
--- a/drivers/adc/stm32-adc-core.c
+++ b/drivers/adc/stm32-adc-core.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
diff --git a/drivers/adc/stm32-adc-core.h b/drivers/adc/stm32-adc-core.h
index ba0e10e6cc2..59bf366e253 100644
--- a/drivers/adc/stm32-adc-core.h
+++ b/drivers/adc/stm32-adc-core.h
@@ -28,6 +28,7 @@
 
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <dm.h>
 
 /**
diff --git a/drivers/adc/stm32-adc.c b/drivers/adc/stm32-adc.c
index 8c1229a383d..03bd983b3ce 100644
--- a/drivers/adc/stm32-adc.c
+++ b/drivers/adc/stm32-adc.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <adc.h>
+#include <compiler.h>
 #include <stdbool.h>
 #include <asm/io.h>
 #include <dm/device_compat.h>
@@ -15,6 +16,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/iopoll.h>
+#include <linux/types.h>
 #include "stm32-adc-core.h"
 
 /* STM32H7 - Registers for each ADC instance */
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index 1424708b59c..847d5a60f29 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -10,6 +10,7 @@
  */
 #include <common.h>
 #include <blk.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <log.h>
 #include <stdio.h>
@@ -18,6 +19,7 @@
 #include <linux/delay.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <command.h>
 #include <dm.h>
diff --git a/drivers/ata/ahci_mvebu.c b/drivers/ata/ahci_mvebu.c
index 8be1826d405..58e2ef2904c 100644
--- a/drivers/ata/ahci_mvebu.c
+++ b/drivers/ata/ahci_mvebu.c
@@ -5,8 +5,10 @@
 
 #include <common.h>
 #include <ahci.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
+#include <linux/types.h>
 
 /*
  * Dummy implementation that can be overwritten by a board
diff --git a/drivers/ata/ahci_sunxi.c b/drivers/ata/ahci_sunxi.c
index f584317ab23..f282b88c4ba 100644
--- a/drivers/ata/ahci_sunxi.c
+++ b/drivers/ata/ahci_sunxi.c
@@ -9,6 +9,7 @@
 #include <asm/gpio.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #define AHCI_PHYCS0R 0x00c0
 #define AHCI_PHYCS1R 0x00c4
diff --git a/drivers/ata/dwc_ahci.c b/drivers/ata/dwc_ahci.c
index 5f37fc92784..557232491e7 100644
--- a/drivers/ata/dwc_ahci.c
+++ b/drivers/ata/dwc_ahci.c
@@ -17,6 +17,7 @@
 #include <asm/io.h>
 #include <generic-phy.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 struct dwc_ahci_priv {
 	void *base;
diff --git a/drivers/ata/dwc_ahsata.c b/drivers/ata/dwc_ahsata.c
index 90db0d21014..069c5c5d188 100644
--- a/drivers/ata/dwc_ahsata.c
+++ b/drivers/ata/dwc_ahsata.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <ahci.h>
 #include <blk.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <dm.h>
 #include <dwc_ahsata.h>
@@ -28,6 +29,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "dwc_ahsata_priv.h"
 
 struct sata_port_regs {
diff --git a/drivers/ata/fsl_sata.c b/drivers/ata/fsl_sata.c
index 83395ef22c6..a0fbe5c9fdc 100644
--- a/drivers/ata/fsl_sata.c
+++ b/drivers/ata/fsl_sata.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <blk.h>
 #include <command.h>
+#include <compiler.h>
 #include <console.h>
 #include <cpu_func.h>
 #include <log.h>
@@ -25,6 +26,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "fsl_sata.h"
 
 #if CONFIG_IS_ENABLED(BLK)
diff --git a/drivers/ata/fsl_sata.h b/drivers/ata/fsl_sata.h
index 5b9daa79e02..cf57e69c1b0 100644
--- a/drivers/ata/fsl_sata.h
+++ b/drivers/ata/fsl_sata.h
@@ -8,6 +8,7 @@
 #ifndef __FSL_SATA_H__
 #define __FSL_SATA_H__
 
+#include <linux/types.h>
 #define SATA_HC_MAX_NUM		4 /* Max host controller numbers */
 #define SATA_HC_MAX_CMD		16 /* Max command queue depth per host controller */
 #define SATA_HC_MAX_PORT	16 /* Max port number per host controller */
diff --git a/drivers/ata/libata.c b/drivers/ata/libata.c
index c830ef49025..3af7034708a 100644
--- a/drivers/ata/libata.c
+++ b/drivers/ata/libata.c
@@ -9,6 +9,7 @@
 #include <compiler.h>
 #include <libata.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/string.h>
 
 u64 ata_id_n_sectors(u16 *id)
diff --git a/drivers/ata/mvsata_ide.c b/drivers/ata/mvsata_ide.c
index 41f9a91617d..b312570387c 100644
--- a/drivers/ata/mvsata_ide.c
+++ b/drivers/ata/mvsata_ide.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 #if defined(CONFIG_ARCH_ORION5X)
diff --git a/drivers/ata/sata.c b/drivers/ata/sata.c
index 453338e944b..4c2446e6cf6 100644
--- a/drivers/ata/sata.c
+++ b/drivers/ata/sata.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <ahci.h>
 #include <blk.h>
+#include <compiler.h>
 #include <dm.h>
 #include <part.h>
 #include <sata.h>
diff --git a/drivers/ata/sata_ceva.c b/drivers/ata/sata_ceva.c
index cd10d228964..dd644006282 100644
--- a/drivers/ata/sata_ceva.c
+++ b/drivers/ata/sata_ceva.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <linux/ioport.h>
+#include <linux/types.h>
 
 /* Vendor Specific Register Offsets */
 #define AHCI_VEND_PCFG  0xA4
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index b459ac5aa3b..c5e8bd264a6 100644
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -55,6 +55,7 @@
 #include <linux/kernel.h>
 #include <linux/mbus.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <asm/arch/soc.h>
 #if defined(CONFIG_ARCH_KIRKWOOD)
diff --git a/drivers/ata/sata_sandbox.c b/drivers/ata/sata_sandbox.c
index e64cc4a5c10..721fbabfb17 100644
--- a/drivers/ata/sata_sandbox.c
+++ b/drivers/ata/sata_sandbox.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <blk.h>
+#include <linux/types.h>
 
 int init_sata(int dev)
 {
diff --git a/drivers/ata/sata_sil.c b/drivers/ata/sata_sil.c
index 54a9141808b..2f7b9189bab 100644
--- a/drivers/ata/sata_sil.c
+++ b/drivers/ata/sata_sil.c
@@ -22,6 +22,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #if CONFIG_IS_ENABLED(BLK)
 #include <dm.h>
diff --git a/drivers/ata/sata_sil.h b/drivers/ata/sata_sil.h
index a300c0c3887..a26bdf209cc 100644
--- a/drivers/ata/sata_sil.h
+++ b/drivers/ata/sata_sil.h
@@ -8,6 +8,7 @@
 #ifndef SATA_SIL3132_H
 #define SATA_SIL3132_H
 
+#include <linux/types.h>
 #define READ_CMD	0
 #define WRITE_CMD	1
 
diff --git a/drivers/ata/sata_sil3114.c b/drivers/ata/sata_sil3114.c
index 4d3a680f17f..56cee31754b 100644
--- a/drivers/ata/sata_sil3114.c
+++ b/drivers/ata/sata_sil3114.c
@@ -20,6 +20,7 @@
 #include <sata.h>
 #include <libata.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 #include "sata_sil3114.h"
 
 /* Convert sectorsize to wordsize */
diff --git a/drivers/axi/axi-emul-uclass.c b/drivers/axi/axi-emul-uclass.c
index e4ba71f21f1..7b4ee9c9248 100644
--- a/drivers/axi/axi-emul-uclass.c
+++ b/drivers/axi/axi-emul-uclass.c
@@ -12,6 +12,7 @@
 #include <asm/axi.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 int axi_sandbox_get_emul(struct udevice *bus, ulong address,
 			 enum axi_size_t size, struct udevice **emulp)
diff --git a/drivers/axi/axi-uclass.c b/drivers/axi/axi-uclass.c
index 3d642e71078..e0667957bf3 100644
--- a/drivers/axi/axi-uclass.c
+++ b/drivers/axi/axi-uclass.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <axi.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 int axi_read(struct udevice *dev, ulong address, void *data,
 	     enum axi_size_t size)
diff --git a/drivers/axi/axi_sandbox.c b/drivers/axi/axi_sandbox.c
index 41f62065e8e..9ac065df1b9 100644
--- a/drivers/axi/axi_sandbox.c
+++ b/drivers/axi/axi_sandbox.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <asm/axi.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 /*
  * This driver implements a AXI bus for the sandbox architecture for testing
diff --git a/drivers/axi/ihs_axi.c b/drivers/axi/ihs_axi.c
index 0e4cbab9762..0b9eaf842fb 100644
--- a/drivers/axi/ihs_axi.c
+++ b/drivers/axi/ihs_axi.c
@@ -15,6 +15,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 /**
  * struct ihs_axi_regs - Structure for the register map of a IHS AXI device
diff --git a/drivers/axi/sandbox_store.c b/drivers/axi/sandbox_store.c
index 7342230eb7f..14eaddf2a77 100644
--- a/drivers/axi/sandbox_store.c
+++ b/drivers/axi/sandbox_store.c
@@ -11,6 +11,7 @@
 #include <malloc.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 /**
  * struct sandbox_store_priv - Private data structure of a AXI store device
diff --git a/drivers/bios_emulator/atibios.c b/drivers/bios_emulator/atibios.c
index b57d512ebb7..1444ffe446a 100644
--- a/drivers/bios_emulator/atibios.c
+++ b/drivers/bios_emulator/atibios.c
@@ -57,6 +57,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "biosemui.h"
 
 /* Length of the BIOS image */
diff --git a/drivers/bios_emulator/besys.c b/drivers/bios_emulator/besys.c
index a8475b13886..d78a128372a 100644
--- a/drivers/bios_emulator/besys.c
+++ b/drivers/bios_emulator/besys.c
@@ -51,6 +51,7 @@
 #include <common.h>
 #include <stdio.h>
 #include <asm/io.h>
+#include <linux/types.h>
 #include "biosemui.h"
 
 /*------------------------- Global Variables ------------------------------*/
diff --git a/drivers/bios_emulator/bios.c b/drivers/bios_emulator/bios.c
index af27582275b..ff942c39a0d 100644
--- a/drivers/bios_emulator/bios.c
+++ b/drivers/bios_emulator/bios.c
@@ -45,6 +45,7 @@
 #include <common.h>
 #include <stdio.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include "biosemui.h"
 
 /*----------------------------- Implementation ----------------------------*/
diff --git a/drivers/bios_emulator/biosemu.c b/drivers/bios_emulator/biosemu.c
index ca083a4d646..b73723337fc 100644
--- a/drivers/bios_emulator/biosemu.c
+++ b/drivers/bios_emulator/biosemu.c
@@ -49,6 +49,7 @@
 #include <common.h>
 #include <stdio.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "biosemui.h"
 
 BE_sysEnv _BE_env = {{0}};
diff --git a/drivers/bios_emulator/include/biosemu.h b/drivers/bios_emulator/include/biosemu.h
index 124d79d80e1..2857cb9bf39 100644
--- a/drivers/bios_emulator/include/biosemu.h
+++ b/drivers/bios_emulator/include/biosemu.h
@@ -44,6 +44,7 @@
 #define __BIOSEMU_H
 
 #include <bios_emul.h>
+#include <linux/types.h>
 
 #ifdef __KERNEL__
 #include "x86emu.h"
diff --git a/drivers/bios_emulator/include/x86emu/debug.h b/drivers/bios_emulator/include/x86emu/debug.h
index e80c89d763d..b09d30cea55 100644
--- a/drivers/bios_emulator/include/x86emu/debug.h
+++ b/drivers/bios_emulator/include/x86emu/debug.h
@@ -40,6 +40,7 @@
 #define __X86EMU_DEBUG_H
 
 #include <stdio.h>
+#include <linux/types.h>
 
 /*---------------------- Macros and type definitions ----------------------*/
 
diff --git a/drivers/bios_emulator/include/x86emu/decode.h b/drivers/bios_emulator/include/x86emu/decode.h
index 77769f0094c..5d4b47fd542 100644
--- a/drivers/bios_emulator/include/x86emu/decode.h
+++ b/drivers/bios_emulator/include/x86emu/decode.h
@@ -32,6 +32,7 @@
 * Environment:  Any
 * Developer:    Kendall Bennett
 *
+#include <linux/types.h>
 * Description:  Header file for instruction decoding logic.
 *
 ****************************************************************************/
diff --git a/drivers/bios_emulator/include/x86emu/ops.h b/drivers/bios_emulator/include/x86emu/ops.h
index a4f2316ba0d..eea9f306065 100644
--- a/drivers/bios_emulator/include/x86emu/ops.h
+++ b/drivers/bios_emulator/include/x86emu/ops.h
@@ -39,6 +39,7 @@
 #ifndef __X86EMU_OPS_H
 #define __X86EMU_OPS_H
 
+#include <asm/types.h>
 extern void (*x86emu_optab[0x100])(u8 op1);
 extern void (*x86emu_optab2[0x100])(u8 op2);
 
diff --git a/drivers/bios_emulator/include/x86emu/prim_ops.h b/drivers/bios_emulator/include/x86emu/prim_ops.h
index 2291e8488a5..4a1e24e44a4 100644
--- a/drivers/bios_emulator/include/x86emu/prim_ops.h
+++ b/drivers/bios_emulator/include/x86emu/prim_ops.h
@@ -43,6 +43,7 @@
 extern "C" {                        /* Use "C" linkage when in C++ mode */
 #endif
 
+#include <asm/types.h>
 u16     aaa_word (u16 d);
 u16     aas_word (u16 d);
 u16     aad_word (u16 d);
diff --git a/drivers/bios_emulator/include/x86emu/regs.h b/drivers/bios_emulator/include/x86emu/regs.h
index 4b4c5908923..d92ed8e8f04 100644
--- a/drivers/bios_emulator/include/x86emu/regs.h
+++ b/drivers/bios_emulator/include/x86emu/regs.h
@@ -41,6 +41,7 @@
 
 /*---------------------- Macros and type definitions ----------------------*/
 
+#include <asm/types.h>
 #include <linux/printk.h>
 #pragma pack(1)
 
diff --git a/drivers/bios_emulator/x86emu/debug.c b/drivers/bios_emulator/x86emu/debug.c
index 0ada5b693b1..3314927eae6 100644
--- a/drivers/bios_emulator/x86emu/debug.c
+++ b/drivers/bios_emulator/x86emu/debug.c
@@ -43,6 +43,7 @@
 #include <linux/ctype.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "x86emu/x86emui.h"
 
 /*----------------------------- Implementation ----------------------------*/
diff --git a/drivers/bios_emulator/x86emu/decode.c b/drivers/bios_emulator/x86emu/decode.c
index e2028eaf083..a2aa9c16cd4 100644
--- a/drivers/bios_emulator/x86emu/decode.c
+++ b/drivers/bios_emulator/x86emu/decode.c
@@ -33,6 +33,7 @@
 * Developer:	Kendall Bennett
 *
 * Description:	This file includes subroutines which are related to
+#include <linux/types.h>
 *		instruction decoding and accessess of immediate data via IP.  etc.
 *
 ****************************************************************************/
diff --git a/drivers/bios_emulator/x86emu/ops.c b/drivers/bios_emulator/x86emu/ops.c
index 9c8c1eecdda..a0ce26c5967 100644
--- a/drivers/bios_emulator/x86emu/ops.c
+++ b/drivers/bios_emulator/x86emu/ops.c
@@ -35,6 +35,7 @@
 * Developer:	Kendall Bennett
 *
 * Description:	This file includes subroutines to implement the decoding
+#include <linux/types.h>
 *		and emulation of all the x86 processor instructions.
 *
 * There are approximately 250 subroutines in here, which correspond
diff --git a/drivers/bios_emulator/x86emu/ops2.c b/drivers/bios_emulator/x86emu/ops2.c
index 6cd1ac39825..a933d8db7d0 100644
--- a/drivers/bios_emulator/x86emu/ops2.c
+++ b/drivers/bios_emulator/x86emu/ops2.c
@@ -37,6 +37,7 @@
 *
 * Description:	This file includes subroutines to implement the decoding
 *		and emulation of all the x86 extended two-byte processor
+#include <linux/types.h>
 *		instructions.
 *
 ****************************************************************************/
diff --git a/drivers/bios_emulator/x86emu/prim_ops.c b/drivers/bios_emulator/x86emu/prim_ops.c
index 7fe968cb817..a54d68e2ef9 100644
--- a/drivers/bios_emulator/x86emu/prim_ops.c
+++ b/drivers/bios_emulator/x86emu/prim_ops.c
@@ -58,6 +58,7 @@
 * 1   1	  0	0     1
 * 1   1	  1	1     1
 *
+#include <asm/types.h>
 * Construction of table for cout:
 *
 * ab
diff --git a/drivers/bios_emulator/x86emu/sys.c b/drivers/bios_emulator/x86emu/sys.c
index 53891960c0c..f34da2e238b 100644
--- a/drivers/bios_emulator/x86emu/sys.c
+++ b/drivers/bios_emulator/x86emu/sys.c
@@ -40,6 +40,7 @@
 ****************************************************************************/
 
 #include <common.h>
+#include <asm/types.h>
 #include <linux/printk.h>
 #include "x86emu/x86emui.h"
 
diff --git a/drivers/block/blk-uclass.c b/drivers/block/blk-uclass.c
index 5d7d3d616ee..d648677fe1d 100644
--- a/drivers/block/blk-uclass.c
+++ b/drivers/block/blk-uclass.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <part.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <dm/device-internal.h>
@@ -18,6 +19,7 @@
 #include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static const char *if_typename_str[IF_TYPE_COUNT] = {
 	[IF_TYPE_IDE]		= "ide",
diff --git a/drivers/block/blk_legacy.c b/drivers/block/blk_legacy.c
index c1a78f72a36..6ceeb52c808 100644
--- a/drivers/block/blk_legacy.c
+++ b/drivers/block/blk_legacy.c
@@ -7,10 +7,12 @@
 #include <common.h>
 #include <blk.h>
 #include <part.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 struct blk_driver *blk_driver_lookup_type(int if_type)
 {
diff --git a/drivers/block/ide.c b/drivers/block/ide.c
index c7b37bfe11b..6db3ccb3cf3 100644
--- a/drivers/block/ide.c
+++ b/drivers/block/ide.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <ata.h>
 #include <blk.h>
+#include <compiler.h>
 #include <dm.h>
 #include <ide.h>
 #include <log.h>
@@ -17,6 +18,7 @@
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #ifdef __PPC__
 # define EIEIO		__asm__ volatile ("eieio")
diff --git a/drivers/block/sandbox.c b/drivers/block/sandbox.c
index 08c9b6a3b36..8c471ea24b1 100644
--- a/drivers/block/sandbox.c
+++ b/drivers/block/sandbox.c
@@ -18,6 +18,7 @@
 #include <linux/errno.h>
 #include <dm/device-internal.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/board/board-uclass.c b/drivers/board/board-uclass.c
index 7a83862563c..efcb7e29691 100644
--- a/drivers/board/board-uclass.c
+++ b/drivers/board/board-uclass.c
@@ -9,6 +9,7 @@
 #include <board.h>
 #include <stdbool.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 int board_get(struct udevice **devp)
 {
diff --git a/drivers/board/sandbox.c b/drivers/board/sandbox.c
index 0ed52a77396..722e322f302 100644
--- a/drivers/board/sandbox.c
+++ b/drivers/board/sandbox.c
@@ -7,9 +7,11 @@
 #include <common.h>
 #include <dm.h>
 #include <board.h>
+#include <stdbool.h>
 #include <vsprintf.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include "sandbox.h"
 
diff --git a/drivers/bootcount/bootcount-uclass.c b/drivers/bootcount/bootcount-uclass.c
index 81ca0027ebd..58ba6ef87d4 100644
--- a/drivers/bootcount/bootcount-uclass.c
+++ b/drivers/bootcount/bootcount-uclass.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 int dm_bootcount_get(struct udevice *dev, u32 *bootcount)
 {
diff --git a/drivers/bootcount/bootcount.c b/drivers/bootcount/bootcount.c
index 82de6f72069..093dfd8caae 100644
--- a/drivers/bootcount/bootcount.c
+++ b/drivers/bootcount/bootcount.c
@@ -5,11 +5,14 @@
  */
 
 #include <bootcount.h>
+#include <compiler.h>
 #include <cpu_func.h>
+#include <stdbool.h>
 #include <asm/cache.h>
 #include <linux/compiler.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #if !defined(CONFIG_DM_BOOTCOUNT)
 /* Now implement the generic default functions */
diff --git a/drivers/bootcount/bootcount_at91.c b/drivers/bootcount/bootcount_at91.c
index c4ab5ceafab..571d2c26ccd 100644
--- a/drivers/bootcount/bootcount_at91.c
+++ b/drivers/bootcount/bootcount_at91.c
@@ -4,6 +4,7 @@
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/at91_gpbr.h>
+#include <linux/types.h>
 
 /*
  * We combine the CONFIG_SYS_BOOTCOUNT_MAGIC and bootcount in one 32-bit
diff --git a/drivers/bootcount/bootcount_davinci.c b/drivers/bootcount/bootcount_davinci.c
index 6326957d7b0..279ac660f5d 100644
--- a/drivers/bootcount/bootcount_davinci.c
+++ b/drivers/bootcount/bootcount_davinci.c
@@ -10,6 +10,7 @@
 
 #include <bootcount.h>
 #include <asm/davinci_rtc.h>
+#include <linux/types.h>
 
 void bootcount_store(ulong a)
 {
diff --git a/drivers/bootcount/bootcount_env.c b/drivers/bootcount/bootcount_env.c
index b75c9002b2c..7a3e091d5cc 100644
--- a/drivers/bootcount/bootcount_env.c
+++ b/drivers/bootcount/bootcount_env.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <env.h>
+#include <linux/types.h>
 
 void bootcount_store(ulong a)
 {
diff --git a/drivers/bootcount/bootcount_ext.c b/drivers/bootcount/bootcount_ext.c
index 44f97a1054f..f20e6632dcc 100644
--- a/drivers/bootcount/bootcount_ext.c
+++ b/drivers/bootcount/bootcount_ext.c
@@ -7,6 +7,7 @@
 #include <fs.h>
 #include <mapmem.h>
 #include <stdio.h>
+#include <linux/types.h>
 
 #define BC_MAGIC	0xbd
 #define BC_VERSION	1
diff --git a/drivers/bootcount/bootcount_i2c.c b/drivers/bootcount/bootcount_i2c.c
index 6f8d12e8fdd..d0ffe56516d 100644
--- a/drivers/bootcount/bootcount_i2c.c
+++ b/drivers/bootcount/bootcount_i2c.c
@@ -8,6 +8,7 @@
 #include <stdio.h>
 #include <linux/compiler.h>
 #include <i2c.h>
+#include <linux/types.h>
 
 #define BC_MAGIC	0xbc
 
diff --git a/drivers/bootcount/bootcount_ram.c b/drivers/bootcount/bootcount_ram.c
index a34d154b310..9e47ee73802 100644
--- a/drivers/bootcount/bootcount_ram.c
+++ b/drivers/bootcount/bootcount_ram.c
@@ -10,6 +10,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/bootcount/i2c-eeprom.c b/drivers/bootcount/i2c-eeprom.c
index 141713c3d52..ab1ef70986b 100644
--- a/drivers/bootcount/i2c-eeprom.c
+++ b/drivers/bootcount/i2c-eeprom.c
@@ -10,6 +10,7 @@
 #include <i2c_eeprom.h>
 #include <log.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 static const u8 bootcount_magic = 0xbc;
 
diff --git a/drivers/bootcount/rtc.c b/drivers/bootcount/rtc.c
index c6b30cd1483..c3da933565e 100644
--- a/drivers/bootcount/rtc.c
+++ b/drivers/bootcount/rtc.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <log.h>
 #include <rtc.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 
 static const u8 bootcount_magic = 0xbc;
diff --git a/drivers/bus/uniphier-system-bus.c b/drivers/bus/uniphier-system-bus.c
index ea08d66a070..0fbbe3b5a51 100644
--- a/drivers/bus/uniphier-system-bus.c
+++ b/drivers/bus/uniphier-system-bus.c
@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include <compiler.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/io.h>
diff --git a/drivers/cache/cache-l2x0.c b/drivers/cache/cache-l2x0.c
index a1556fbf174..5a61ab2c5a2 100644
--- a/drivers/cache/cache-l2x0.c
+++ b/drivers/cache/cache-l2x0.c
@@ -5,6 +5,7 @@
 #include <common.h>
 #include <command.h>
 #include <dm.h>
+#include <asm/types.h>
 
 #include <asm/io.h>
 #include <asm/pl310.h>
diff --git a/drivers/cache/cache-ncore.c b/drivers/cache/cache-ncore.c
index 279e3c2801b..24d92e8b04f 100644
--- a/drivers/cache/cache-ncore.c
+++ b/drivers/cache/cache-ncore.c
@@ -3,11 +3,13 @@
  * Copyright (C) 2019 Intel Corporation <www.intel.com>
  *
  */
+#include <compiler.h>
 #include <dm.h>
 #include <hang.h>
 #include <stdio.h>
 #include <wait_bit.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #include <asm/io.h>
 #include <linux/bitops.h>
diff --git a/drivers/cache/cache-v5l2.c b/drivers/cache/cache-v5l2.c
index 298eadb4af1..5ecb565c1b2 100644
--- a/drivers/cache/cache-v5l2.c
+++ b/drivers/cache/cache-v5l2.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <command.h>
 #include <cache.h>
+#include <compiler.h>
 #include <dm.h>
 #include <hang.h>
 #include <stdio.h>
@@ -15,6 +16,7 @@
 #include <dm/ofnode.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 struct l2cache {
 	volatile u64	configure;
diff --git a/drivers/clk/altera/clk-agilex.c b/drivers/clk/altera/clk-agilex.c
index 358201e3d98..e3ec96a47e9 100644
--- a/drivers/clk/altera/clk-agilex.c
+++ b/drivers/clk/altera/clk-agilex.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <log.h>
 #include <stdbool.h>
 #include <asm/global_data.h>
@@ -15,6 +16,7 @@
 #include <dt-bindings/clock/agilex-clock.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #include <asm/arch/clock_manager.h>
 
diff --git a/drivers/clk/altera/clk-agilex.h b/drivers/clk/altera/clk-agilex.h
index cd68ebc4387..2df7844963c 100644
--- a/drivers/clk/altera/clk-agilex.h
+++ b/drivers/clk/altera/clk-agilex.h
@@ -7,6 +7,7 @@
 #define	_CLK_AGILEX_
 
 #ifndef __ASSEMBLY__
+#include <asm/types.h>
 #include <linux/bitops.h>
 #endif
 
diff --git a/drivers/clk/altera/clk-arria10.c b/drivers/clk/altera/clk-arria10.c
index 53e28ed76d0..5c195bdb1b2 100644
--- a/drivers/clk/altera/clk-arria10.c
+++ b/drivers/clk/altera/clk-arria10.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <clk-uclass.h>
@@ -17,6 +18,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <asm/arch/clock_manager.h>
 
diff --git a/drivers/clk/analogbits/wrpll-cln28hpc.c b/drivers/clk/analogbits/wrpll-cln28hpc.c
index 66464300377..ba746ed7e38 100644
--- a/drivers/clk/analogbits/wrpll-cln28hpc.c
+++ b/drivers/clk/analogbits/wrpll-cln28hpc.c
@@ -7,6 +7,7 @@
  * This library supports configuration parsing and reprogramming of
  * the CLN28HPC variant of the Analog Bits Wide Range PLL.  The
  * intention is for this library to be reusable for any device that
+#include <asm/types.h>
  * integrates this PLL; thus the register structure and programming
  * details are expected to be provided by a separate IP block driver.
  *
diff --git a/drivers/clk/aspeed/clk_ast2500.c b/drivers/clk/aspeed/clk_ast2500.c
index 038898abbb0..b1f5e2668d8 100644
--- a/drivers/clk/aspeed/clk_ast2500.c
+++ b/drivers/clk/aspeed/clk_ast2500.c
@@ -7,6 +7,7 @@
 #include <clk-uclass.h>
 #include <dm.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/scu_ast2500.h>
@@ -16,6 +17,7 @@
 #include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 /*
  * MAC Clock Delay settings, taken from Aspeed SDK
diff --git a/drivers/clk/at91/clk-generated.c b/drivers/clk/at91/clk-generated.c
index 4948f02c42f..86e026ca1ab 100644
--- a/drivers/clk/at91/clk-generated.c
+++ b/drivers/clk/at91/clk-generated.c
@@ -13,6 +13,7 @@
 #include <linux/err.h>
 #include <linux/io.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include <mach/at91_pmc.h>
 #include "pmc.h"
 
diff --git a/drivers/clk/at91/clk-h32mx.c b/drivers/clk/at91/clk-h32mx.c
index b27aeacc7e9..94aea636e52 100644
--- a/drivers/clk/at91/clk-h32mx.c
+++ b/drivers/clk/at91/clk-h32mx.c
@@ -11,6 +11,7 @@
 #include <dm/device_compat.h>
 #include <dm/util.h>
 #include <linux/io.h>
+#include <linux/types.h>
 #include <mach/at91_pmc.h>
 #include "pmc.h"
 
diff --git a/drivers/clk/at91/clk-main.c b/drivers/clk/at91/clk-main.c
index 85ec506de12..cff796e5477 100644
--- a/drivers/clk/at91/clk-main.c
+++ b/drivers/clk/at91/clk-main.c
@@ -10,6 +10,7 @@
 #include <asm/global_data.h>
 #include <linux/errno.h>
 #include <linux/io.h>
+#include <linux/types.h>
 #include <mach/at91_pmc.h>
 #include "pmc.h"
 
diff --git a/drivers/clk/at91/clk-master.c b/drivers/clk/at91/clk-master.c
index 87a7d1ea8f2..9bb88576b64 100644
--- a/drivers/clk/at91/clk-master.c
+++ b/drivers/clk/at91/clk-master.c
@@ -8,6 +8,7 @@
 #include <clk-uclass.h>
 #include <dm.h>
 #include <asm/global_data.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/clk/at91/clk-peripheral.c b/drivers/clk/at91/clk-peripheral.c
index cd9d5e77c02..0bf2132abfe 100644
--- a/drivers/clk/at91/clk-peripheral.c
+++ b/drivers/clk/at91/clk-peripheral.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <malloc.h>
 #include <linux/io.h>
+#include <linux/types.h>
 #include <mach/at91_pmc.h>
 #include "pmc.h"
 
diff --git a/drivers/clk/at91/clk-plla.c b/drivers/clk/at91/clk-plla.c
index ae7df40f20d..8715732764d 100644
--- a/drivers/clk/at91/clk-plla.c
+++ b/drivers/clk/at91/clk-plla.c
@@ -10,6 +10,7 @@
 #include <asm/global_data.h>
 #include <linux/errno.h>
 #include <linux/io.h>
+#include <linux/types.h>
 #include <mach/at91_pmc.h>
 #include "pmc.h"
 
diff --git a/drivers/clk/at91/clk-plladiv.c b/drivers/clk/at91/clk-plladiv.c
index 7c074327e27..5b8d5a80513 100644
--- a/drivers/clk/at91/clk-plladiv.c
+++ b/drivers/clk/at91/clk-plladiv.c
@@ -9,6 +9,7 @@
 #include <dm/device.h>
 #include <linux/errno.h>
 #include <linux/io.h>
+#include <linux/types.h>
 #include <mach/at91_pmc.h>
 #include "pmc.h"
 
diff --git a/drivers/clk/at91/clk-slow.c b/drivers/clk/at91/clk-slow.c
index 1f8665768b0..0a45ab50781 100644
--- a/drivers/clk/at91/clk-slow.c
+++ b/drivers/clk/at91/clk-slow.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <clk-uclass.h>
 #include <dm.h>
+#include <linux/types.h>
 
 static int at91_slow_clk_enable(struct clk *clk)
 {
diff --git a/drivers/clk/at91/clk-system.c b/drivers/clk/at91/clk-system.c
index 8e1a5f75774..4a27be6a692 100644
--- a/drivers/clk/at91/clk-system.c
+++ b/drivers/clk/at91/clk-system.c
@@ -10,6 +10,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/io.h>
+#include <linux/types.h>
 #include <mach/at91_pmc.h>
 #include "pmc.h"
 
diff --git a/drivers/clk/at91/clk-usb.c b/drivers/clk/at91/clk-usb.c
index 3b5fedd9bbe..ea77ae0e3cf 100644
--- a/drivers/clk/at91/clk-usb.c
+++ b/drivers/clk/at91/clk-usb.c
@@ -12,6 +12,7 @@
 #include <linux/err.h>
 #include <linux/io.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include <mach/at91_pmc.h>
 #include "pmc.h"
 
diff --git a/drivers/clk/at91/clk-utmi.c b/drivers/clk/at91/clk-utmi.c
index 99a1ae86535..60f461ce7f6 100644
--- a/drivers/clk/at91/clk-utmi.c
+++ b/drivers/clk/at91/clk-utmi.c
@@ -11,6 +11,7 @@
 #include <syscon.h>
 #include <linux/errno.h>
 #include <linux/io.h>
+#include <linux/types.h>
 #include <mach/at91_pmc.h>
 #include <mach/at91_sfr.h>
 #include "pmc.h"
diff --git a/drivers/clk/clk-cdce9xx.c b/drivers/clk/clk-cdce9xx.c
index a6e49a7765e..6782f9e14bc 100644
--- a/drivers/clk/clk-cdce9xx.c
+++ b/drivers/clk/clk-cdce9xx.c
@@ -16,6 +16,7 @@
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #define MAX_NUMBER_OF_PLLS		4
 #define MAX_NUMER_OF_OUTPUTS		9
diff --git a/drivers/clk/clk-composite.c b/drivers/clk/clk-composite.c
index 62d404d791d..f31cdf246a1 100644
--- a/drivers/clk/clk-composite.c
+++ b/drivers/clk/clk-composite.c
@@ -14,6 +14,7 @@
 #include <clk.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #include "clk.h"
 
diff --git a/drivers/clk/clk-divider.c b/drivers/clk/clk-divider.c
index fb5029c40a3..749d56aecec 100644
--- a/drivers/clk/clk-divider.c
+++ b/drivers/clk/clk-divider.c
@@ -10,6 +10,8 @@
  */
 
 #include <common.h>
+#include <compiler.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <malloc.h>
 #include <clk-uclass.h>
@@ -27,6 +29,7 @@
 #include <div64.h>
 #include <clk.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 #include "clk.h"
 
 #define UBOOT_DM_CLK_CCF_DIVIDER "ccf_clk_divider"
diff --git a/drivers/clk/clk-fixed-factor.c b/drivers/clk/clk-fixed-factor.c
index c181c0b6ea5..0197debd9c3 100644
--- a/drivers/clk/clk-fixed-factor.c
+++ b/drivers/clk/clk-fixed-factor.c
@@ -14,6 +14,7 @@
 #include <div64.h>
 #include <clk.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include "clk.h"
 #include <linux/err.h>
 
diff --git a/drivers/clk/clk-gate.c b/drivers/clk/clk-gate.c
index 221db043abc..0d42326a046 100644
--- a/drivers/clk/clk-gate.c
+++ b/drivers/clk/clk-gate.c
@@ -8,9 +8,11 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <asm/io.h>
 #include <malloc.h>
 #include <clk-uclass.h>
+#include <asm/types.h>
 #include <dm/device.h>
 #include <dm/devres.h>
 #include <linux/bitops.h>
diff --git a/drivers/clk/clk-hsdk-cgu.c b/drivers/clk/clk-hsdk-cgu.c
index c2b33b41f84..ac2cb5a86f1 100644
--- a/drivers/clk/clk-hsdk-cgu.c
+++ b/drivers/clk/clk-hsdk-cgu.c
@@ -11,9 +11,11 @@
 
 #include <common.h>
 #include <clk-uclass.h>
+#include <compiler.h>
 #include <div64.h>
 #include <dm.h>
 #include <log.h>
+#include <stdbool.h>
 #include <linux/bitops.h>
 #include <linux/bug.h>
 #include <linux/delay.h>
@@ -22,6 +24,7 @@
 #include <asm/arcregs.h>
 #include <linux/kernel.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 #include <dt-bindings/clock/snps,hsdk-cgu.h>
 
diff --git a/drivers/clk/clk-mux.c b/drivers/clk/clk-mux.c
index cba7113f3b6..7c6d35643bd 100644
--- a/drivers/clk/clk-mux.c
+++ b/drivers/clk/clk-mux.c
@@ -22,10 +22,12 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <stdio.h>
 #include <asm/io.h>
 #include <malloc.h>
 #include <clk-uclass.h>
+#include <asm/types.h>
 #include <dm/device.h>
 #include <dm/devres.h>
 #include <linux/bitops.h>
diff --git a/drivers/clk/clk-ti-sci.c b/drivers/clk/clk-ti-sci.c
index 45ce1995d03..76f6bd70169 100644
--- a/drivers/clk/clk-ti-sci.c
+++ b/drivers/clk/clk-ti-sci.c
@@ -20,6 +20,7 @@
 #include <linux/kernel.h>
 #include <linux/soc/ti/ti_sci_protocol.h>
 #include <k3-avs.h>
+#include <linux/types.h>
 
 /**
  * struct ti_sci_clk_data - clock controller information structure
diff --git a/drivers/clk/clk-uclass.c b/drivers/clk/clk-uclass.c
index 090d0f21693..a1bee1b91dd 100644
--- a/drivers/clk/clk-uclass.c
+++ b/drivers/clk/clk-uclass.c
@@ -14,6 +14,7 @@
 #include <errno.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <dm/devres.h>
@@ -22,6 +23,7 @@
 #include <linux/clk-provider.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 static inline const struct clk_ops *clk_dev_ops(struct udevice *dev)
 {
diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
index f2d0981e191..305e2f085dc 100644
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@ -15,6 +15,7 @@
 #include <dm/device-internal.h>
 #include <clk.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 int clk_register(struct clk *clk, const char *drv_name,
 		 const char *name, const char *parent_name)
diff --git a/drivers/clk/clk_bcm6345.c b/drivers/clk/clk_bcm6345.c
index a03cee546c7..27fd147fc1b 100644
--- a/drivers/clk/clk_bcm6345.c
+++ b/drivers/clk/clk_bcm6345.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <clk-uclass.h>
+#include <compiler.h>
 #include <dm.h>
 #include <errno.h>
 #include <asm/io.h>
diff --git a/drivers/clk/clk_boston.c b/drivers/clk/clk_boston.c
index c97d457062c..ec1159e6c82 100644
--- a/drivers/clk/clk_boston.c
+++ b/drivers/clk/clk_boston.c
@@ -12,6 +12,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 struct clk_boston {
 	struct regmap *regmap;
diff --git a/drivers/clk/clk_fixed_factor.c b/drivers/clk/clk_fixed_factor.c
index cf9c4ae367f..d73c1acc570 100644
--- a/drivers/clk/clk_fixed_factor.c
+++ b/drivers/clk/clk_fixed_factor.c
@@ -10,6 +10,7 @@
 #include <div64.h>
 #include <dm.h>
 #include <linux/err.h>
+#include <linux/types.h>
 
 struct clk_fixed_factor {
 	struct clk parent;
diff --git a/drivers/clk/clk_fixed_rate.c b/drivers/clk/clk_fixed_rate.c
index 2c20eddb0b5..8303d8da010 100644
--- a/drivers/clk/clk_fixed_rate.c
+++ b/drivers/clk/clk_fixed_rate.c
@@ -7,6 +7,7 @@
 #include <clk-uclass.h>
 #include <dm.h>
 #include <linux/clk-provider.h>
+#include <linux/types.h>
 
 static ulong clk_fixed_rate_get_rate(struct clk *clk)
 {
diff --git a/drivers/clk/clk_pic32.c b/drivers/clk/clk_pic32.c
index c9b047914a4..6c46a6ab323 100644
--- a/drivers/clk/clk_pic32.c
+++ b/drivers/clk/clk_pic32.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <clk-uclass.h>
+#include <compiler.h>
 #include <dm.h>
 #include <div64.h>
 #include <stdio.h>
@@ -18,6 +19,7 @@
 #include <linux/bitops.h>
 #include <linux/bug.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <mach/pic32.h>
 #include <dt-bindings/clock/microchip,clock.h>
 
diff --git a/drivers/clk/clk_sandbox.c b/drivers/clk/clk_sandbox.c
index ad68c617407..4cca81b9fd7 100644
--- a/drivers/clk/clk_sandbox.c
+++ b/drivers/clk/clk_sandbox.c
@@ -11,6 +11,7 @@
 #include <stdbool.h>
 #include <asm/clk.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 struct sandbox_clk_priv {
 	bool probed;
diff --git a/drivers/clk/clk_sandbox_ccf.c b/drivers/clk/clk_sandbox_ccf.c
index b528c635552..3f5a823d8d2 100644
--- a/drivers/clk/clk_sandbox_ccf.c
+++ b/drivers/clk/clk_sandbox_ccf.c
@@ -7,9 +7,11 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <clk.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <asm/clk.h>
 #include <clk-uclass.h>
 #include <dm/devres.h>
@@ -19,6 +21,7 @@
 #include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 /*
  * Sandbox implementation of CCF primitives necessary for clk-uclass testing
diff --git a/drivers/clk/clk_sandbox_test.c b/drivers/clk/clk_sandbox_test.c
index 6eef29f9dc3..ac4c13dc9a5 100644
--- a/drivers/clk/clk_sandbox_test.c
+++ b/drivers/clk/clk_sandbox_test.c
@@ -11,6 +11,7 @@
 #include <dm/device_compat.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 struct sandbox_clk_test {
 	struct clk clks[SANDBOX_CLK_TEST_NON_DEVM_COUNT];
diff --git a/drivers/clk/clk_stm32f.c b/drivers/clk/clk_stm32f.c
index b0d5699e080..e923559ef3c 100644
--- a/drivers/clk/clk_stm32f.c
+++ b/drivers/clk/clk_stm32f.c
@@ -8,12 +8,14 @@
 #include <clk-uclass.h>
 #include <dm.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stm32_rcc.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <asm/io.h>
 #include <asm/arch/stm32.h>
diff --git a/drivers/clk/clk_stm32h7.c b/drivers/clk/clk_stm32h7.c
index d97a211423c..e43ff595d68 100644
--- a/drivers/clk/clk_stm32h7.c
+++ b/drivers/clk/clk_stm32h7.c
@@ -15,6 +15,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 #include <dt-bindings/clock/stm32h7-clks.h>
 
diff --git a/drivers/clk/clk_stm32mp1.c b/drivers/clk/clk_stm32mp1.c
index a57f3f81f73..2d4a4ec308f 100644
--- a/drivers/clk/clk_stm32mp1.c
+++ b/drivers/clk/clk_stm32mp1.c
@@ -5,12 +5,14 @@
 
 #include <common.h>
 #include <clk-uclass.h>
+#include <compiler.h>
 #include <div64.h>
 #include <dm.h>
 #include <init.h>
 #include <log.h>
 #include <regmap.h>
 #include <spl.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <syscon.h>
 #include <time.h>
@@ -25,6 +27,7 @@
 #include <dt-bindings/clock/stm32mp1-clksrc.h>
 #include <linux/kernel.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/clk/clk_versal.c b/drivers/clk/clk_versal.c
index de309923b10..58f8decceda 100644
--- a/drivers/clk/clk_versal.c
+++ b/drivers/clk/clk_versal.c
@@ -22,6 +22,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define MAX_PARENT			100
 #define MAX_NODES			6
diff --git a/drivers/clk/clk_vexpress_osc.c b/drivers/clk/clk_vexpress_osc.c
index 950c72d573a..6fd8450c5bf 100644
--- a/drivers/clk/clk_vexpress_osc.c
+++ b/drivers/clk/clk_vexpress_osc.c
@@ -15,6 +15,7 @@
 #include <misc.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #define CLK_FUNCTION		BIT(20)
 
diff --git a/drivers/clk/clk_zynq.c b/drivers/clk/clk_zynq.c
index e20b668fd84..0dde3c435aa 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 <stdbool.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <dm/device_compat.h>
@@ -22,6 +23,7 @@
 #include <asm/arch/sys_proto.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 /* Register bitfield defines */
 #define PLLCTRL_FBDIV_MASK	0x7f000
diff --git a/drivers/clk/clk_zynqmp.c b/drivers/clk/clk_zynqmp.c
index 0fb220022ca..5975b11dd59 100644
--- a/drivers/clk/clk_zynqmp.c
+++ b/drivers/clk/clk_zynqmp.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
@@ -18,6 +19,7 @@
 #include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 static const resource_size_t zynqmp_crf_apb_clkc_base = 0xfd1a0020;
 static const resource_size_t zynqmp_crl_apb_clkc_base = 0xff5e0020;
diff --git a/drivers/clk/exynos/clk-exynos7420.c b/drivers/clk/exynos/clk-exynos7420.c
index d86f84acef1..4b8cd3700ff 100644
--- a/drivers/clk/exynos/clk-exynos7420.c
+++ b/drivers/clk/exynos/clk-exynos7420.c
@@ -12,6 +12,7 @@
 #include <asm/io.h>
 #include <dt-bindings/clock/exynos7420-clk.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include "clk-pll.h"
 
 #define DIVIDER(reg, shift, mask)	\
diff --git a/drivers/clk/exynos/clk-pll.c b/drivers/clk/exynos/clk-pll.c
index 407fc71d415..3ede604f59e 100644
--- a/drivers/clk/exynos/clk-pll.c
+++ b/drivers/clk/exynos/clk-pll.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <asm/io.h>
 #include <div64.h>
+#include <linux/types.h>
 
 #define PLL145X_MDIV_SHIFT	16
 #define PLL145X_MDIV_MASK	0x3ff
diff --git a/drivers/clk/ics8n3qv01.c b/drivers/clk/ics8n3qv01.c
index 7d551b7c8d8..bc2fd15a512 100644
--- a/drivers/clk/ics8n3qv01.c
+++ b/drivers/clk/ics8n3qv01.c
@@ -16,6 +16,7 @@
 #include <log.h>
 #include <stdio.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 const long long ICS8N3QV01_FREF = 114285000;
 const long long ICS8N3QV01_FREF_LL = 114285000LL;
diff --git a/drivers/clk/imx/clk-composite-8m.c b/drivers/clk/imx/clk-composite-8m.c
index d03e48bfb3c..8a8e2d5a858 100644
--- a/drivers/clk/imx/clk-composite-8m.c
+++ b/drivers/clk/imx/clk-composite-8m.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <log.h>
 #include <asm/io.h>
 #include <malloc.h>
@@ -14,6 +15,7 @@
 #include <clk.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include "clk.h"
 #include <linux/err.h>
 
diff --git a/drivers/clk/imx/clk-gate2.c b/drivers/clk/imx/clk-gate2.c
index f1b06731bce..12e7864f678 100644
--- a/drivers/clk/imx/clk-gate2.c
+++ b/drivers/clk/imx/clk-gate2.c
@@ -15,6 +15,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <asm/io.h>
 #include <malloc.h>
 #include <clk-uclass.h>
@@ -24,6 +25,7 @@
 #include <clk.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include "clk.h"
 #include <linux/err.h>
 
diff --git a/drivers/clk/imx/clk-imx6q.c b/drivers/clk/imx/clk-imx6q.c
index ddfa3deccbd..ccc4adf2e5e 100644
--- a/drivers/clk/imx/clk-imx6q.c
+++ b/drivers/clk/imx/clk-imx6q.c
@@ -8,12 +8,14 @@
 #include <clk-uclass.h>
 #include <dm.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <dt-bindings/clock/imx6qdl-clock.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include "clk.h"
 
diff --git a/drivers/clk/imx/clk-imx8.c b/drivers/clk/imx/clk-imx8.c
index 8b09554d3f4..4692dc7f39f 100644
--- a/drivers/clk/imx/clk-imx8.c
+++ b/drivers/clk/imx/clk-imx8.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <clk-uclass.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
 #include <malloc.h>
@@ -17,6 +18,7 @@
 #include <dt-bindings/soc/imx_rsrc.h>
 #include <misc.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #include "clk-imx8.h"
 
diff --git a/drivers/clk/imx/clk-imx8.h b/drivers/clk/imx/clk-imx8.h
index 7a1433d2af6..cbf88f98816 100644
--- a/drivers/clk/imx/clk-imx8.h
+++ b/drivers/clk/imx/clk-imx8.h
@@ -5,6 +5,7 @@
  */
 
 #include <stdbool.h>
+#include <linux/types.h>
 struct imx8_clks {
 	ulong id;
 	const char *name;
diff --git a/drivers/clk/imx/clk-imx8mm.c b/drivers/clk/imx/clk-imx8mm.c
index 02a006dd58e..386180b96e3 100644
--- a/drivers/clk/imx/clk-imx8mm.c
+++ b/drivers/clk/imx/clk-imx8mm.c
@@ -7,13 +7,16 @@
 #include <common.h>
 #include <clk.h>
 #include <clk-uclass.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <dt-bindings/clock/imx8mm-clock.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include "clk.h"
 
diff --git a/drivers/clk/imx/clk-imx8mn.c b/drivers/clk/imx/clk-imx8mn.c
index e8286e5e164..ab0b3eb2d22 100644
--- a/drivers/clk/imx/clk-imx8mn.c
+++ b/drivers/clk/imx/clk-imx8mn.c
@@ -7,13 +7,16 @@
 #include <common.h>
 #include <clk.h>
 #include <clk-uclass.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <dt-bindings/clock/imx8mn-clock.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include "clk.h"
 
diff --git a/drivers/clk/imx/clk-imx8mp.c b/drivers/clk/imx/clk-imx8mp.c
index b6a6ad73a68..cb0eb4113e7 100644
--- a/drivers/clk/imx/clk-imx8mp.c
+++ b/drivers/clk/imx/clk-imx8mp.c
@@ -7,13 +7,16 @@
 #include <common.h>
 #include <clk.h>
 #include <clk-uclass.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <dt-bindings/clock/imx8mp-clock.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include "clk.h"
 
diff --git a/drivers/clk/imx/clk-imx8qm.c b/drivers/clk/imx/clk-imx8qm.c
index e21102c319d..38d9e110f9a 100644
--- a/drivers/clk/imx/clk-imx8qm.c
+++ b/drivers/clk/imx/clk-imx8qm.c
@@ -8,6 +8,7 @@
 #include <clk-uclass.h>
 #include <dm.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/arch/sci/sci.h>
 #include <asm/arch/clock.h>
@@ -16,6 +17,7 @@
 #include <misc.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include "clk-imx8.h"
 
diff --git a/drivers/clk/imx/clk-imx8qxp.c b/drivers/clk/imx/clk-imx8qxp.c
index d061f11a756..0fd8b1c6106 100644
--- a/drivers/clk/imx/clk-imx8qxp.c
+++ b/drivers/clk/imx/clk-imx8qxp.c
@@ -8,6 +8,7 @@
 #include <clk-uclass.h>
 #include <dm.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/arch/sci/sci.h>
 #include <asm/arch/clock.h>
@@ -16,6 +17,7 @@
 #include <misc.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include "clk-imx8.h"
 
diff --git a/drivers/clk/imx/clk-imxrt1020.c b/drivers/clk/imx/clk-imxrt1020.c
index 898dfe31084..d337f73d1fa 100644
--- a/drivers/clk/imx/clk-imxrt1020.c
+++ b/drivers/clk/imx/clk-imxrt1020.c
@@ -8,11 +8,13 @@
 #include <clk.h>
 #include <clk-uclass.h>
 #include <dm.h>
+#include <stdbool.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <dt-bindings/clock/imxrt1020-clock.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include "clk.h"
 
diff --git a/drivers/clk/imx/clk-imxrt1050.c b/drivers/clk/imx/clk-imxrt1050.c
index fc022f54a75..bfc66dafac3 100644
--- a/drivers/clk/imx/clk-imxrt1050.c
+++ b/drivers/clk/imx/clk-imxrt1050.c
@@ -9,11 +9,13 @@
 #include <clk-uclass.h>
 #include <dm.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <dt-bindings/clock/imxrt1050-clock.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include "clk.h"
 
diff --git a/drivers/clk/imx/clk-pfd.c b/drivers/clk/imx/clk-pfd.c
index 9b2fce7174a..2e2514d26a3 100644
--- a/drivers/clk/imx/clk-pfd.c
+++ b/drivers/clk/imx/clk-pfd.c
@@ -15,9 +15,11 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <asm/io.h>
 #include <malloc.h>
 #include <clk-uclass.h>
+#include <asm/types.h>
 #include <dm/device.h>
 #include <dm/devres.h>
 #include <linux/clk-provider.h>
diff --git a/drivers/clk/imx/clk-pll14xx.c b/drivers/clk/imx/clk-pll14xx.c
index 147bf315980..d091597c760 100644
--- a/drivers/clk/imx/clk-pll14xx.c
+++ b/drivers/clk/imx/clk-pll14xx.c
@@ -6,6 +6,8 @@
  */
 
 #include <common.h>
+#include <compiler.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <malloc.h>
 #include <clk-uclass.h>
@@ -21,6 +23,7 @@
 #include <div64.h>
 #include <linux/kernel.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 #include "clk.h"
 
diff --git a/drivers/clk/imx/clk-pllv3.c b/drivers/clk/imx/clk-pllv3.c
index ec690a24981..8cb02c172a2 100644
--- a/drivers/clk/imx/clk-pllv3.c
+++ b/drivers/clk/imx/clk-pllv3.c
@@ -5,6 +5,8 @@
  */
 
 #include <common.h>
+#include <compiler.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <div64.h>
 #include <malloc.h>
@@ -15,6 +17,7 @@
 #include <clk.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include "clk.h"
 #include <linux/err.h>
 
diff --git a/drivers/clk/imx/clk.h b/drivers/clk/imx/clk.h
index 04b7bb78dae..3eb2769da30 100644
--- a/drivers/clk/imx/clk.h
+++ b/drivers/clk/imx/clk.h
@@ -6,6 +6,8 @@
 #ifndef __MACH_IMX_CLK_H
 #define __MACH_IMX_CLK_H
 
+#include <compiler.h>
+#include <asm/types.h>
 #include <linux/clk-provider.h>
 #include <linux/kernel.h>
 
diff --git a/drivers/clk/intel/clk_intel.c b/drivers/clk/intel/clk_intel.c
index 371898f2744..cfea9780bd5 100644
--- a/drivers/clk/intel/clk_intel.c
+++ b/drivers/clk/intel/clk_intel.c
@@ -9,6 +9,7 @@
 #include <clk-uclass.h>
 #include <dt-bindings/clock/intel-clock.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 static ulong intel_clk_get_rate(struct clk *clk)
 {
diff --git a/drivers/clk/kendryte/bypass.c b/drivers/clk/kendryte/bypass.c
index 0d8eb1ce331..99f02980f4a 100644
--- a/drivers/clk/kendryte/bypass.c
+++ b/drivers/clk/kendryte/bypass.c
@@ -6,6 +6,7 @@
 #define LOG_CATEGORY UCLASS_CLK
 #include <kendryte/bypass.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #include <clk-uclass.h>
 #include <linux/clk-provider.h>
diff --git a/drivers/clk/kendryte/clk.c b/drivers/clk/kendryte/clk.c
index e8f764d792b..a08a7ae32f6 100644
--- a/drivers/clk/kendryte/clk.c
+++ b/drivers/clk/kendryte/clk.c
@@ -2,9 +2,11 @@
 /*
  * Copyright (C) 2019-20 Sean Anderson <seanga2@gmail.com>
  */
+#include <stdbool.h>
 #include <kendryte/clk.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include <asm/io.h>
 #include <dt-bindings/clock/k210-sysctl.h>
diff --git a/drivers/clk/kendryte/pll.c b/drivers/clk/kendryte/pll.c
index b350a67820f..9eeeb5cbe91 100644
--- a/drivers/clk/kendryte/pll.c
+++ b/drivers/clk/kendryte/pll.c
@@ -3,9 +3,12 @@
  * Copyright (C) 2019-20 Sean Anderson <seanga2@gmail.com>
  */
 #define LOG_CATEGORY UCLASS_CLK
+#include <compiler.h>
+#include <stdbool.h>
 #include <kendryte/pll.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include <asm/io.h>
 /* For DIV_ROUND_DOWN_ULL, defined in linux/kernel.h */
diff --git a/drivers/clk/mediatek/clk-mt7622.c b/drivers/clk/mediatek/clk-mt7622.c
index 3462b49c69d..6db187b5970 100644
--- a/drivers/clk/mediatek/clk-mt7622.c
+++ b/drivers/clk/mediatek/clk-mt7622.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
 #include <asm/arch-mediatek/reset.h>
diff --git a/drivers/clk/mediatek/clk-mt7623.c b/drivers/clk/mediatek/clk-mt7623.c
index 042031dd70f..3ae28639087 100644
--- a/drivers/clk/mediatek/clk-mt7623.c
+++ b/drivers/clk/mediatek/clk-mt7623.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
 #include <asm/arch-mediatek/reset.h>
diff --git a/drivers/clk/mediatek/clk-mt7629.c b/drivers/clk/mediatek/clk-mt7629.c
index 94b83a53281..249d97b4670 100644
--- a/drivers/clk/mediatek/clk-mt7629.c
+++ b/drivers/clk/mediatek/clk-mt7629.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
 #include <asm/arch-mediatek/reset.h>
diff --git a/drivers/clk/mediatek/clk-mtk.c b/drivers/clk/mediatek/clk-mtk.c
index e4217bd9627..0c1d347ad87 100644
--- a/drivers/clk/mediatek/clk-mtk.c
+++ b/drivers/clk/mediatek/clk-mtk.c
@@ -8,12 +8,14 @@
 
 #include <common.h>
 #include <clk-uclass.h>
+#include <compiler.h>
 #include <div64.h>
 #include <dm.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #include "clk-mtk.h"
 
diff --git a/drivers/clk/mediatek/clk-mtk.h b/drivers/clk/mediatek/clk-mtk.h
index 57a76e69432..6f7000b268d 100644
--- a/drivers/clk/mediatek/clk-mtk.h
+++ b/drivers/clk/mediatek/clk-mtk.h
@@ -7,6 +7,8 @@
 #ifndef __DRV_CLK_MTK_H
 #define __DRV_CLK_MTK_H
 
+#include <compiler.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/kernel.h>
 #define CLK_XTAL			0
diff --git a/drivers/clk/meson/axg.c b/drivers/clk/meson/axg.c
index ddf20ab3d8c..4be6b6dab91 100644
--- a/drivers/clk/meson/axg.c
+++ b/drivers/clk/meson/axg.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/arch/clock-axg.h>
 #include <asm/io.h>
 #include <clk-uclass.h>
@@ -18,6 +19,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include "clk_meson.h"
 #include <linux/err.h>
 
diff --git a/drivers/clk/meson/clk_meson.h b/drivers/clk/meson/clk_meson.h
index ef72a416c15..154ec71347f 100644
--- a/drivers/clk/meson/clk_meson.h
+++ b/drivers/clk/meson/clk_meson.h
@@ -10,6 +10,7 @@
 
 /* Gate Structure */
 
+#include <asm/types.h>
 #include <linux/bitops.h>
 struct meson_gate {
 	unsigned int reg;
diff --git a/drivers/clk/meson/g12a.c b/drivers/clk/meson/g12a.c
index ba9ec818de6..599d6dc57ce 100644
--- a/drivers/clk/meson/g12a.c
+++ b/drivers/clk/meson/g12a.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/arch/clock-g12a.h>
 #include <asm/io.h>
 #include <clk-uclass.h>
@@ -20,6 +21,7 @@
 #include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include "clk_meson.h"
 
 /* This driver support only basic clock tree operations :
diff --git a/drivers/clk/meson/gxbb.c b/drivers/clk/meson/gxbb.c
index 62e8e35d654..af4668e3e42 100644
--- a/drivers/clk/meson/gxbb.c
+++ b/drivers/clk/meson/gxbb.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/arch/clock-gx.h>
 #include <asm/io.h>
 #include <clk-uclass.h>
@@ -18,6 +19,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include "clk_meson.h"
 #include <linux/err.h>
 
diff --git a/drivers/clk/mpc83xx_clk.c b/drivers/clk/mpc83xx_clk.c
index a72cbeb9723..a6d366c8cab 100644
--- a/drivers/clk/mpc83xx_clk.c
+++ b/drivers/clk/mpc83xx_clk.c
@@ -10,6 +10,7 @@
 #include <command.h>
 #include <dm.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
@@ -19,6 +20,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include "mpc83xx_clk.h"
 
diff --git a/drivers/clk/mpc83xx_clk.h b/drivers/clk/mpc83xx_clk.h
index b03b35a8784..b1d32ce8411 100644
--- a/drivers/clk/mpc83xx_clk.h
+++ b/drivers/clk/mpc83xx_clk.h
@@ -5,6 +5,7 @@
  */
 
 /**
+#include <linux/types.h>
  * enum ratio - Description of a core clock ratio
  * @RAT_UNK:      Unknown ratio
  * @RAT_BYP:      Bypass
diff --git a/drivers/clk/mtmips/clk-mt7628.c b/drivers/clk/mtmips/clk-mt7628.c
index 12ae5a92354..ce39cf0b254 100644
--- a/drivers/clk/mtmips/clk-mt7628.c
+++ b/drivers/clk/mtmips/clk-mt7628.c
@@ -7,12 +7,14 @@
 
 #include <common.h>
 #include <clk-uclass.h>
+#include <compiler.h>
 #include <dm.h>
 #include <dt-bindings/clock/mt7628-clk.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 /* SYSCFG0 */
 #define XTAL_40M_SEL			BIT(6)
diff --git a/drivers/clk/mvebu/armada-37xx-periph.c b/drivers/clk/mvebu/armada-37xx-periph.c
index 6f279939c51..9d45436b833 100644
--- a/drivers/clk/mvebu/armada-37xx-periph.c
+++ b/drivers/clk/mvebu/armada-37xx-periph.c
@@ -9,10 +9,12 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <malloc.h>
 #include <clk-uclass.h>
 #include <clk.h>
 #include <dm.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
@@ -21,6 +23,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define TBG_SEL		0x0
 #define DIV_SEL0	0x4
diff --git a/drivers/clk/mvebu/armada-37xx-tbg.c b/drivers/clk/mvebu/armada-37xx-tbg.c
index 512a1f5824f..d6fa702b24e 100644
--- a/drivers/clk/mvebu/armada-37xx-tbg.c
+++ b/drivers/clk/mvebu/armada-37xx-tbg.c
@@ -11,12 +11,14 @@
 #include <common.h>
 #include <clk-uclass.h>
 #include <clk.h>
+#include <compiler.h>
 #include <dm.h>
 #include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <dm/device_compat.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #define NUM_TBG	    4
 
diff --git a/drivers/clk/owl/clk_owl.c b/drivers/clk/owl/clk_owl.c
index d596c0cf161..eb262e4673d 100644
--- a/drivers/clk/owl/clk_owl.c
+++ b/drivers/clk/owl/clk_owl.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include "clk_owl.h"
 #include <asm/io.h>
diff --git a/drivers/clk/owl/clk_owl.h b/drivers/clk/owl/clk_owl.h
index a01f81a6a7b..e755b5c5695 100644
--- a/drivers/clk/owl/clk_owl.h
+++ b/drivers/clk/owl/clk_owl.h
@@ -12,6 +12,7 @@
 
 #include <clk-uclass.h>
 #ifndef __ASSEMBLY__
+#include <asm/types.h>
 #include <linux/bitops.h>
 #endif
 
diff --git a/drivers/clk/renesas/clk-rcar-gen2.c b/drivers/clk/renesas/clk-rcar-gen2.c
index 52d7bba0cff..943bd6cb4fe 100644
--- a/drivers/clk/renesas/clk-rcar-gen2.c
+++ b/drivers/clk/renesas/clk-rcar-gen2.c
@@ -20,6 +20,7 @@
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <dt-bindings/clock/renesas-cpg-mssr.h>
 
diff --git a/drivers/clk/renesas/clk-rcar-gen3.c b/drivers/clk/renesas/clk-rcar-gen3.c
index c4f5a63b7a3..542f2888f85 100644
--- a/drivers/clk/renesas/clk-rcar-gen3.c
+++ b/drivers/clk/renesas/clk-rcar-gen3.c
@@ -22,6 +22,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include <dt-bindings/clock/renesas-cpg-mssr.h>
 
diff --git a/drivers/clk/renesas/r8a774a1-cpg-mssr.c b/drivers/clk/renesas/r8a774a1-cpg-mssr.c
index f409e666a97..2f9fc8202d1 100644
--- a/drivers/clk/renesas/r8a774a1-cpg-mssr.c
+++ b/drivers/clk/renesas/r8a774a1-cpg-mssr.c
@@ -14,6 +14,7 @@
 #include <clk-uclass.h>
 #include <dm.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include <dt-bindings/clock/r8a774a1-cpg-mssr.h>
 
diff --git a/drivers/clk/renesas/r8a7790-cpg-mssr.c b/drivers/clk/renesas/r8a7790-cpg-mssr.c
index 9eb30d9c9fb..db22f3d05af 100644
--- a/drivers/clk/renesas/r8a7790-cpg-mssr.c
+++ b/drivers/clk/renesas/r8a7790-cpg-mssr.c
@@ -14,6 +14,7 @@
 #include <dm.h>
 #include <linux/bitops.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include <dt-bindings/clock/r8a7790-cpg-mssr.h>
 
diff --git a/drivers/clk/renesas/r8a7791-cpg-mssr.c b/drivers/clk/renesas/r8a7791-cpg-mssr.c
index 7ddac6d20ad..4da13cab158 100644
--- a/drivers/clk/renesas/r8a7791-cpg-mssr.c
+++ b/drivers/clk/renesas/r8a7791-cpg-mssr.c
@@ -19,6 +19,7 @@
 #include <dm.h>
 #include <linux/bitops.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include <dt-bindings/clock/r8a7791-cpg-mssr.h>
 
diff --git a/drivers/clk/renesas/r8a7792-cpg-mssr.c b/drivers/clk/renesas/r8a7792-cpg-mssr.c
index 0d43004bfc4..9372b8a4111 100644
--- a/drivers/clk/renesas/r8a7792-cpg-mssr.c
+++ b/drivers/clk/renesas/r8a7792-cpg-mssr.c
@@ -14,6 +14,7 @@
 #include <dm.h>
 #include <linux/bitops.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include <dt-bindings/clock/r8a7792-cpg-mssr.h>
 
diff --git a/drivers/clk/renesas/r8a7794-cpg-mssr.c b/drivers/clk/renesas/r8a7794-cpg-mssr.c
index eda0ae0f9d9..d8bdc32773f 100644
--- a/drivers/clk/renesas/r8a7794-cpg-mssr.c
+++ b/drivers/clk/renesas/r8a7794-cpg-mssr.c
@@ -14,6 +14,7 @@
 #include <dm.h>
 #include <linux/bitops.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include <dt-bindings/clock/r8a7794-cpg-mssr.h>
 
diff --git a/drivers/clk/renesas/r8a7795-cpg-mssr.c b/drivers/clk/renesas/r8a7795-cpg-mssr.c
index 89794d2cf6c..8ebd256c372 100644
--- a/drivers/clk/renesas/r8a7795-cpg-mssr.c
+++ b/drivers/clk/renesas/r8a7795-cpg-mssr.c
@@ -14,6 +14,7 @@
 #include <dm.h>
 #include <linux/bitops.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include <dt-bindings/clock/r8a7795-cpg-mssr.h>
 
diff --git a/drivers/clk/renesas/r8a7796-cpg-mssr.c b/drivers/clk/renesas/r8a7796-cpg-mssr.c
index 029bd54b796..88bd46a0ab2 100644
--- a/drivers/clk/renesas/r8a7796-cpg-mssr.c
+++ b/drivers/clk/renesas/r8a7796-cpg-mssr.c
@@ -20,6 +20,7 @@
 #include <dm.h>
 #include <linux/bitops.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include <dt-bindings/clock/r8a7796-cpg-mssr.h>
 
diff --git a/drivers/clk/renesas/r8a77965-cpg-mssr.c b/drivers/clk/renesas/r8a77965-cpg-mssr.c
index 5962cb03d63..ab62e101c03 100644
--- a/drivers/clk/renesas/r8a77965-cpg-mssr.c
+++ b/drivers/clk/renesas/r8a77965-cpg-mssr.c
@@ -15,6 +15,7 @@
 #include <dm.h>
 #include <linux/bitops.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include <dt-bindings/clock/r8a77965-cpg-mssr.h>
 
diff --git a/drivers/clk/renesas/r8a77970-cpg-mssr.c b/drivers/clk/renesas/r8a77970-cpg-mssr.c
index ec246abf387..dffb663347d 100644
--- a/drivers/clk/renesas/r8a77970-cpg-mssr.c
+++ b/drivers/clk/renesas/r8a77970-cpg-mssr.c
@@ -15,6 +15,7 @@
 #include <dm.h>
 #include <linux/bitops.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include <dt-bindings/clock/r8a77970-cpg-mssr.h>
 
diff --git a/drivers/clk/renesas/r8a77980-cpg-mssr.c b/drivers/clk/renesas/r8a77980-cpg-mssr.c
index 0c2050d1b28..41b71fe81ab 100644
--- a/drivers/clk/renesas/r8a77980-cpg-mssr.c
+++ b/drivers/clk/renesas/r8a77980-cpg-mssr.c
@@ -15,6 +15,7 @@
 #include <dm.h>
 #include <linux/bitops.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include <dt-bindings/clock/r8a77980-cpg-mssr.h>
 
diff --git a/drivers/clk/renesas/r8a77990-cpg-mssr.c b/drivers/clk/renesas/r8a77990-cpg-mssr.c
index e3f62e1bc73..11962516979 100644
--- a/drivers/clk/renesas/r8a77990-cpg-mssr.c
+++ b/drivers/clk/renesas/r8a77990-cpg-mssr.c
@@ -15,6 +15,7 @@
 #include <dm.h>
 #include <linux/bitops.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include <dt-bindings/clock/r8a77990-cpg-mssr.h>
 
diff --git a/drivers/clk/renesas/r8a77995-cpg-mssr.c b/drivers/clk/renesas/r8a77995-cpg-mssr.c
index 25bec5ff1a7..24f6c5b7bb9 100644
--- a/drivers/clk/renesas/r8a77995-cpg-mssr.c
+++ b/drivers/clk/renesas/r8a77995-cpg-mssr.c
@@ -15,6 +15,7 @@
 #include <dm.h>
 #include <linux/bitops.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include <dt-bindings/clock/r8a77995-cpg-mssr.h>
 
diff --git a/drivers/clk/renesas/rcar-gen2-cpg.h b/drivers/clk/renesas/rcar-gen2-cpg.h
index 913c9326203..626fb43654b 100644
--- a/drivers/clk/renesas/rcar-gen2-cpg.h
+++ b/drivers/clk/renesas/rcar-gen2-cpg.h
@@ -11,6 +11,7 @@
 #ifndef __CLK_RENESAS_RCAR_GEN2_CPG_H__
 #define __CLK_RENESAS_RCAR_GEN2_CPG_H__
 
+#include <compiler.h>
 enum rcar_gen2_clk_types {
 	CLK_TYPE_GEN2_MAIN = CLK_TYPE_CUSTOM,
 	CLK_TYPE_GEN2_PLL0,
diff --git a/drivers/clk/renesas/rcar-gen3-cpg.h b/drivers/clk/renesas/rcar-gen3-cpg.h
index 102d6955354..95933d11eef 100644
--- a/drivers/clk/renesas/rcar-gen3-cpg.h
+++ b/drivers/clk/renesas/rcar-gen3-cpg.h
@@ -11,7 +11,9 @@
 #ifndef __CLK_RENESAS_RCAR_GEN3_CPG_H__
 #define __CLK_RENESAS_RCAR_GEN3_CPG_H__
 
+#include <compiler.h>
 #include <stdbool.h>
+#include <asm/types.h>
 enum rcar_gen3_clk_types {
 	CLK_TYPE_GEN3_MAIN = CLK_TYPE_CUSTOM,
 	CLK_TYPE_GEN3_PLL0,
diff --git a/drivers/clk/renesas/renesas-cpg-mssr.c b/drivers/clk/renesas/renesas-cpg-mssr.c
index 544ea258747..162eb7b32eb 100644
--- a/drivers/clk/renesas/renesas-cpg-mssr.c
+++ b/drivers/clk/renesas/renesas-cpg-mssr.c
@@ -11,12 +11,14 @@
  */
 #include <common.h>
 #include <clk-uclass.h>
+#include <compiler.h>
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
 #include <stdbool.h>
 #include <wait_bit.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 
diff --git a/drivers/clk/renesas/renesas-cpg-mssr.h b/drivers/clk/renesas/renesas-cpg-mssr.h
index 70f6fb825c4..81ea356cdfb 100644
--- a/drivers/clk/renesas/renesas-cpg-mssr.h
+++ b/drivers/clk/renesas/renesas-cpg-mssr.h
@@ -13,7 +13,9 @@
 #ifndef __DRIVERS_CLK_RENESAS_CPG_MSSR__
 #define __DRIVERS_CLK_RENESAS_CPG_MSSR__
 
+#include <compiler.h>
 #include <stdbool.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 struct cpg_mssr_info {
 	const struct cpg_core_clk	*core_clk;
diff --git a/drivers/clk/rockchip/clk_pll.c b/drivers/clk/rockchip/clk_pll.c
index 65da88b5109..f55c0147261 100644
--- a/drivers/clk/rockchip/clk_pll.c
+++ b/drivers/clk/rockchip/clk_pll.c
@@ -5,6 +5,7 @@
  #include <common.h>
 #include <bitfield.h>
 #include <clk-uclass.h>
+#include <compiler.h>
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
@@ -15,6 +16,7 @@
 #include <div64.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 static struct rockchip_pll_rate_table rockchip_auto_table;
 
diff --git a/drivers/clk/rockchip/clk_px30.c b/drivers/clk/rockchip/clk_px30.c
index 6e99191007d..cef0f7b2c9a 100644
--- a/drivers/clk/rockchip/clk_px30.c
+++ b/drivers/clk/rockchip/clk_px30.c
@@ -23,6 +23,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/clk/rockchip/clk_rk3036.c b/drivers/clk/rockchip/clk_rk3036.c
index ec60627ddeb..0ce397b9b9e 100644
--- a/drivers/clk/rockchip/clk_rk3036.c
+++ b/drivers/clk/rockchip/clk_rk3036.c
@@ -21,6 +21,7 @@
 #include <linux/kernel.h>
 #include <linux/log2.h>
 #include <linux/stringify.h>
+#include <linux/types.h>
 
 enum {
 	VCO_MAX_HZ	= 2400U * 1000000,
diff --git a/drivers/clk/rockchip/clk_rk3128.c b/drivers/clk/rockchip/clk_rk3128.c
index 4dcb85f5109..5a182c2c9db 100644
--- a/drivers/clk/rockchip/clk_rk3128.c
+++ b/drivers/clk/rockchip/clk_rk3128.c
@@ -22,6 +22,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/log2.h>
+#include <linux/types.h>
 
 enum {
 	VCO_MAX_HZ	= 2400U * 1000000,
diff --git a/drivers/clk/rockchip/clk_rk3188.c b/drivers/clk/rockchip/clk_rk3188.c
index 7cee0c594f7..3ebcaaffcfd 100644
--- a/drivers/clk/rockchip/clk_rk3188.c
+++ b/drivers/clk/rockchip/clk_rk3188.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <mapmem.h>
+#include <stdbool.h>
 #include <syscon.h>
 #include <asm/io.h>
 #include <asm/arch-rockchip/clock.h>
@@ -28,6 +29,7 @@
 #include <linux/kernel.h>
 #include <linux/log2.h>
 #include <linux/stringify.h>
+#include <linux/types.h>
 
 enum rk3188_clk_type {
 	RK3188_CRU,
diff --git a/drivers/clk/rockchip/clk_rk322x.c b/drivers/clk/rockchip/clk_rk322x.c
index f632dff1a71..b078da27892 100644
--- a/drivers/clk/rockchip/clk_rk322x.c
+++ b/drivers/clk/rockchip/clk_rk322x.c
@@ -23,6 +23,7 @@
 #include <linux/log2.h>
 #include <linux/string.h>
 #include <linux/stringify.h>
+#include <linux/types.h>
 
 enum {
 	VCO_MAX_HZ	= 3200U * 1000000,
diff --git a/drivers/clk/rockchip/clk_rk3288.c b/drivers/clk/rockchip/clk_rk3288.c
index ed6b4656e23..a6e145862ff 100644
--- a/drivers/clk/rockchip/clk_rk3288.c
+++ b/drivers/clk/rockchip/clk_rk3288.c
@@ -13,6 +13,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <mapmem.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <syscon.h>
 #include <asm/global_data.h>
@@ -33,6 +34,7 @@
 #include <linux/log2.h>
 #include <linux/string.h>
 #include <linux/stringify.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/clk/rockchip/clk_rk3308.c b/drivers/clk/rockchip/clk_rk3308.c
index 151b6be5ee9..fb5b7d3ad95 100644
--- a/drivers/clk/rockchip/clk_rk3308.c
+++ b/drivers/clk/rockchip/clk_rk3308.c
@@ -22,6 +22,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/clk/rockchip/clk_rk3328.c b/drivers/clk/rockchip/clk_rk3328.c
index 5879541f3ce..8d831e1bf83 100644
--- a/drivers/clk/rockchip/clk_rk3328.c
+++ b/drivers/clk/rockchip/clk_rk3328.c
@@ -24,6 +24,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 struct pll_div {
 	u32 refdiv;
diff --git a/drivers/clk/rockchip/clk_rk3368.c b/drivers/clk/rockchip/clk_rk3368.c
index c391ad02100..2e40ca98d33 100644
--- a/drivers/clk/rockchip/clk_rk3368.c
+++ b/drivers/clk/rockchip/clk_rk3368.c
@@ -27,6 +27,7 @@
 #include <linux/printk.h>
 #include <linux/string.h>
 #include <linux/stringify.h>
+#include <linux/types.h>
 
 #if CONFIG_IS_ENABLED(OF_PLATDATA)
 struct rk3368_clk_plat {
diff --git a/drivers/clk/rockchip/clk_rk3399.c b/drivers/clk/rockchip/clk_rk3399.c
index 1078a4c67b7..3efe5e139a9 100644
--- a/drivers/clk/rockchip/clk_rk3399.c
+++ b/drivers/clk/rockchip/clk_rk3399.c
@@ -27,6 +27,7 @@
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #if CONFIG_IS_ENABLED(OF_PLATDATA)
 struct rk3399_clk_plat {
diff --git a/drivers/clk/rockchip/clk_rv1108.c b/drivers/clk/rockchip/clk_rv1108.c
index fcc4ba6d94a..c2708cb48fe 100644
--- a/drivers/clk/rockchip/clk_rv1108.c
+++ b/drivers/clk/rockchip/clk_rv1108.c
@@ -24,6 +24,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/stringify.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/clk/sifive/fu540-prci.c b/drivers/clk/sifive/fu540-prci.c
index 140433da805..e43f478a6f4 100644
--- a/drivers/clk/sifive/fu540-prci.c
+++ b/drivers/clk/sifive/fu540-prci.c
@@ -29,6 +29,7 @@
  */
 
 #include <common.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <clk-uclass.h>
 #include <clk.h>
@@ -40,6 +41,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <linux/math64.h>
 #include <linux/clk/analogbits-wrpll-cln28hpc.h>
diff --git a/drivers/clk/sunxi/clk_a10.c b/drivers/clk/sunxi/clk_a10.c
index 797878eefa9..91e6f10e802 100644
--- a/drivers/clk/sunxi/clk_a10.c
+++ b/drivers/clk/sunxi/clk_a10.c
@@ -13,6 +13,7 @@
 #include <dt-bindings/reset/sun4i-a10-ccu.h>
 #include <linux/bitops.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 static struct ccu_clk_gate a10_gates[] = {
 	[CLK_AHB_OTG]		= GATE(0x060, BIT(0)),
diff --git a/drivers/clk/sunxi/clk_a10s.c b/drivers/clk/sunxi/clk_a10s.c
index 24c20cf11f7..4b6bfd89892 100644
--- a/drivers/clk/sunxi/clk_a10s.c
+++ b/drivers/clk/sunxi/clk_a10s.c
@@ -13,6 +13,7 @@
 #include <dt-bindings/reset/sun5i-ccu.h>
 #include <linux/bitops.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 static struct ccu_clk_gate a10s_gates[] = {
 	[CLK_AHB_OTG]		= GATE(0x060, BIT(0)),
diff --git a/drivers/clk/sunxi/clk_a23.c b/drivers/clk/sunxi/clk_a23.c
index 312288eef68..7afd0b796bc 100644
--- a/drivers/clk/sunxi/clk_a23.c
+++ b/drivers/clk/sunxi/clk_a23.c
@@ -13,6 +13,7 @@
 #include <dt-bindings/reset/sun8i-a23-a33-ccu.h>
 #include <linux/bitops.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 static struct ccu_clk_gate a23_gates[] = {
 	[CLK_BUS_MMC0]		= GATE(0x060, BIT(8)),
diff --git a/drivers/clk/sunxi/clk_a31.c b/drivers/clk/sunxi/clk_a31.c
index a3b3528abae..ec0592b5ef2 100644
--- a/drivers/clk/sunxi/clk_a31.c
+++ b/drivers/clk/sunxi/clk_a31.c
@@ -13,6 +13,7 @@
 #include <dt-bindings/reset/sun6i-a31-ccu.h>
 #include <linux/bitops.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 static struct ccu_clk_gate a31_gates[] = {
 	[CLK_AHB1_MMC0]		= GATE(0x060, BIT(8)),
diff --git a/drivers/clk/sunxi/clk_a64.c b/drivers/clk/sunxi/clk_a64.c
index 68660cc7ae4..0b974aa07a1 100644
--- a/drivers/clk/sunxi/clk_a64.c
+++ b/drivers/clk/sunxi/clk_a64.c
@@ -13,6 +13,7 @@
 #include <dt-bindings/reset/sun50i-a64-ccu.h>
 #include <linux/bitops.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 static const struct ccu_clk_gate a64_gates[] = {
 	[CLK_BUS_MMC0]		= GATE(0x060, BIT(8)),
diff --git a/drivers/clk/sunxi/clk_a80.c b/drivers/clk/sunxi/clk_a80.c
index ea38c819ea7..4e41418ac46 100644
--- a/drivers/clk/sunxi/clk_a80.c
+++ b/drivers/clk/sunxi/clk_a80.c
@@ -13,6 +13,7 @@
 #include <dt-bindings/reset/sun9i-a80-ccu.h>
 #include <linux/bitops.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 static const struct ccu_clk_gate a80_gates[] = {
 	[CLK_SPI0]		= GATE(0x430, BIT(31)),
diff --git a/drivers/clk/sunxi/clk_a83t.c b/drivers/clk/sunxi/clk_a83t.c
index ac82f22c746..0799ec622d0 100644
--- a/drivers/clk/sunxi/clk_a83t.c
+++ b/drivers/clk/sunxi/clk_a83t.c
@@ -13,6 +13,7 @@
 #include <dt-bindings/reset/sun8i-a83t-ccu.h>
 #include <linux/bitops.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 static struct ccu_clk_gate a83t_gates[] = {
 	[CLK_BUS_MMC0]		= GATE(0x060, BIT(8)),
diff --git a/drivers/clk/sunxi/clk_h3.c b/drivers/clk/sunxi/clk_h3.c
index 052fd008f59..bdc7c30c6b3 100644
--- a/drivers/clk/sunxi/clk_h3.c
+++ b/drivers/clk/sunxi/clk_h3.c
@@ -13,6 +13,7 @@
 #include <dt-bindings/reset/sun8i-h3-ccu.h>
 #include <linux/bitops.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 static struct ccu_clk_gate h3_gates[] = {
 	[CLK_BUS_MMC0]		= GATE(0x060, BIT(8)),
diff --git a/drivers/clk/sunxi/clk_h6.c b/drivers/clk/sunxi/clk_h6.c
index 944aa4c55c4..2c519561f79 100644
--- a/drivers/clk/sunxi/clk_h6.c
+++ b/drivers/clk/sunxi/clk_h6.c
@@ -13,6 +13,7 @@
 #include <dt-bindings/reset/sun50i-h6-ccu.h>
 #include <linux/bitops.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 static struct ccu_clk_gate h6_gates[] = {
 	[CLK_BUS_MMC0]		= GATE(0x84c, BIT(0)),
diff --git a/drivers/clk/sunxi/clk_r40.c b/drivers/clk/sunxi/clk_r40.c
index 1d19c805ade..60ccab43040 100644
--- a/drivers/clk/sunxi/clk_r40.c
+++ b/drivers/clk/sunxi/clk_r40.c
@@ -13,6 +13,7 @@
 #include <dt-bindings/reset/sun8i-r40-ccu.h>
 #include <linux/bitops.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 static struct ccu_clk_gate r40_gates[] = {
 	[CLK_BUS_MMC0]		= GATE(0x060, BIT(8)),
diff --git a/drivers/clk/sunxi/clk_sunxi.c b/drivers/clk/sunxi/clk_sunxi.c
index 1b70f15ab9a..1126dbec05f 100644
--- a/drivers/clk/sunxi/clk_sunxi.c
+++ b/drivers/clk/sunxi/clk_sunxi.c
@@ -10,9 +10,11 @@
 #include <errno.h>
 #include <log.h>
 #include <reset.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/ccu.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/log2.h>
diff --git a/drivers/clk/sunxi/clk_v3s.c b/drivers/clk/sunxi/clk_v3s.c
index 19673e43cf0..29ca566164d 100644
--- a/drivers/clk/sunxi/clk_v3s.c
+++ b/drivers/clk/sunxi/clk_v3s.c
@@ -13,6 +13,7 @@
 #include <dt-bindings/reset/sun8i-v3s-ccu.h>
 #include <linux/bitops.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 static struct ccu_clk_gate v3s_gates[] = {
 	[CLK_BUS_MMC0]		= GATE(0x060, BIT(8)),
diff --git a/drivers/clk/tegra/tegra-car-clk.c b/drivers/clk/tegra/tegra-car-clk.c
index d6abf0d6c11..8086116d081 100644
--- a/drivers/clk/tegra/tegra-car-clk.c
+++ b/drivers/clk/tegra/tegra-car-clk.c
@@ -11,6 +11,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch-tegra/clk_rst.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 static int tegra_car_clk_request(struct clk *clk)
 {
diff --git a/drivers/clk/tegra/tegra186-clk.c b/drivers/clk/tegra/tegra186-clk.c
index 5a98a3f3f0e..c1197e7d82d 100644
--- a/drivers/clk/tegra/tegra186-clk.c
+++ b/drivers/clk/tegra/tegra186-clk.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <misc.h>
 #include <asm/arch-tegra/bpmp_abi.h>
+#include <linux/types.h>
 
 static ulong tegra186_clk_get_rate(struct clk *clk)
 {
diff --git a/drivers/clk/uniphier/clk-uniphier-core.c b/drivers/clk/uniphier/clk-uniphier-core.c
index 72335f271b8..65f6945271c 100644
--- a/drivers/clk/uniphier/clk-uniphier-core.c
+++ b/drivers/clk/uniphier/clk-uniphier-core.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <clk-uclass.h>
+#include <compiler.h>
 #include <dm.h>
 #include <stdbool.h>
 #include <dm/device_compat.h>
@@ -14,6 +15,7 @@
 #include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/sizes.h>
+#include <linux/types.h>
 
 #include "clk-uniphier.h"
 
diff --git a/drivers/core/acpi.c b/drivers/core/acpi.c
index 356cf0862a5..6654275a1c9 100644
--- a/drivers/core/acpi.c
+++ b/drivers/core/acpi.c
@@ -15,6 +15,7 @@
 #include <malloc.h>
 #include <stdio.h>
 #include <acpi/acpi_device.h>
+#include <asm/types.h>
 #include <dm/acpi.h>
 #include <dm/device-internal.h>
 #include <dm/root.h>
diff --git a/drivers/core/device-remove.c b/drivers/core/device-remove.c
index 0263284fc3f..2f1d0a29b35 100644
--- a/drivers/core/device-remove.c
+++ b/drivers/core/device-remove.c
@@ -21,6 +21,7 @@
 #include <dm/util.h>
 #include <power-domain.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 int device_chld_unbind(struct udevice *dev, struct driver *drv)
 {
diff --git a/drivers/core/device.c b/drivers/core/device.c
index 8198750cd69..8b47af6eee5 100644
--- a/drivers/core/device.c
+++ b/drivers/core/device.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <clk.h>
@@ -35,6 +36,7 @@
 #include <power-domain.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/core/devres.c b/drivers/core/devres.c
index 9507ecb9a80..eda7dd37ac4 100644
--- a/drivers/core/devres.c
+++ b/drivers/core/devres.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <linux/compat.h>
 #include <linux/errno.h>
@@ -21,6 +22,7 @@
 #include <dm/devres.h>
 #include <dm/root.h>
 #include <dm/util.h>
+#include <linux/types.h>
 
 /** enum devres_phase - Shows where resource was allocated
  *
diff --git a/drivers/core/dump.c b/drivers/core/dump.c
index 3b707eb4933..588ba2b9c02 100644
--- a/drivers/core/dump.c
+++ b/drivers/core/dump.c
@@ -10,6 +10,7 @@
 #include <dm/root.h>
 #include <dm/util.h>
 #include <dm/uclass-internal.h>
+#include <linux/types.h>
 
 static void show_devices(struct udevice *dev, int depth, int last_flag)
 {
diff --git a/drivers/core/fdtaddr.c b/drivers/core/fdtaddr.c
index 0cb78d64c5e..ed7a7587df1 100644
--- a/drivers/core/fdtaddr.c
+++ b/drivers/core/fdtaddr.c
@@ -15,6 +15,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm/device-internal.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/core/of_access.c b/drivers/core/of_access.c
index 0ecc90890da..21a51625959 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 <stdbool.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <linux/bug.h>
@@ -33,6 +34,7 @@
 #include <linux/err.h>
 #include <linux/ioport.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/core/of_addr.c b/drivers/core/of_addr.c
index a245194db43..52ac82238b0 100644
--- a/drivers/core/of_addr.c
+++ b/drivers/core/of_addr.c
@@ -18,6 +18,7 @@
 #include <linux/ioport.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /* Max address size we deal with */
 #define OF_MAX_ADDR_CELLS	4
diff --git a/drivers/core/of_extra.c b/drivers/core/of_extra.c
index f2efc0c8ad9..87e304a78e4 100644
--- a/drivers/core/of_extra.c
+++ b/drivers/core/of_extra.c
@@ -13,6 +13,7 @@
 #include <dm/of_extra.h>
 #include <dm/ofnode.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 int ofnode_read_fmap_entry(ofnode node, struct fmap_entry *entry)
 {
diff --git a/drivers/core/ofnode.c b/drivers/core/ofnode.c
index d68be142e68..cb05a7348b1 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 <stdbool.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
@@ -20,6 +21,7 @@
 #include <linux/err.h>
 #include <linux/ioport.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 int ofnode_read_u32(ofnode node, const char *propname, u32 *outp)
 {
diff --git a/drivers/core/read.c b/drivers/core/read.c
index b84c9be2461..f069029136b 100644
--- a/drivers/core/read.c
+++ b/drivers/core/read.c
@@ -13,6 +13,7 @@
 #include <asm/types.h>
 #include <asm/io.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 int dev_read_u32(const struct udevice *dev, const char *propname, u32 *outp)
 {
diff --git a/drivers/core/regmap.c b/drivers/core/regmap.c
index 37fff77dc09..b9ab9051845 100644
--- a/drivers/core/regmap.c
+++ b/drivers/core/regmap.c
@@ -17,6 +17,7 @@
 #include <asm/io.h>
 #include <dm/of_addr.h>
 #include <linux/ioport.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/core/root.c b/drivers/core/root.c
index 6eb934c4095..719c9dcb2a9 100644
--- a/drivers/core/root.c
+++ b/drivers/core/root.c
@@ -7,10 +7,12 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <errno.h>
 #include <fdtdec.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
@@ -28,6 +30,7 @@
 #include <dm/util.h>
 #include <linux/list.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/core/simple-bus.c b/drivers/core/simple-bus.c
index aa888b2e0c4..ea98ee17a2f 100644
--- a/drivers/core/simple-bus.c
+++ b/drivers/core/simple-bus.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 
 struct simple_bus_plat {
diff --git a/drivers/core/syscon-uclass.c b/drivers/core/syscon-uclass.c
index d8d26d772c7..3ab4345455a 100644
--- a/drivers/core/syscon-uclass.c
+++ b/drivers/core/syscon-uclass.c
@@ -17,6 +17,7 @@
 #include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 /*
  * Caution:
diff --git a/drivers/core/uclass.c b/drivers/core/uclass.c
index 242d9f4b30d..54c3fc9b1c8 100644
--- a/drivers/core/uclass.c
+++ b/drivers/core/uclass.c
@@ -23,6 +23,7 @@
 #include <dm/util.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/cpu/bmips_cpu.c b/drivers/cpu/bmips_cpu.c
index 44110e1d8ec..f47a20e7212 100644
--- a/drivers/cpu/bmips_cpu.c
+++ b/drivers/cpu/bmips_cpu.c
@@ -8,6 +8,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <cpu.h>
 #include <display_options.h>
 #include <dm.h>
@@ -18,6 +19,7 @@
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #define REV_CHIPID_SHIFT		16
 #define REV_CHIPID_MASK			(0xffff << REV_CHIPID_SHIFT)
diff --git a/drivers/cpu/imx8_cpu.c b/drivers/cpu/imx8_cpu.c
index 0c660f81227..75a00515047 100644
--- a/drivers/cpu/imx8_cpu.c
+++ b/drivers/cpu/imx8_cpu.c
@@ -18,6 +18,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/cpu/mpc83xx_cpu.c b/drivers/cpu/mpc83xx_cpu.c
index 6f6feee5f2d..856f79b2efe 100644
--- a/drivers/cpu/mpc83xx_cpu.c
+++ b/drivers/cpu/mpc83xx_cpu.c
@@ -15,6 +15,7 @@
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #include "mpc83xx_cpu.h"
 
diff --git a/drivers/cpu/riscv_cpu.c b/drivers/cpu/riscv_cpu.c
index 2fd18901dd4..e2f0a28fcaf 100644
--- a/drivers/cpu/riscv_cpu.c
+++ b/drivers/cpu/riscv_cpu.c
@@ -11,6 +11,7 @@
 #include <errno.h>
 #include <log.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <dm/device-internal.h>
 #include <dm/lists.h>
 #include <linux/bitops.h>
diff --git a/drivers/crypto/ace_sha.h b/drivers/crypto/ace_sha.h
index a671b925b6e..7101b4d415b 100644
--- a/drivers/crypto/ace_sha.h
+++ b/drivers/crypto/ace_sha.h
@@ -8,6 +8,7 @@
 #ifndef __ACE_SHA_H
 #define __ACE_SHA_H
 
+#include <linux/types.h>
 struct exynos_ace_sfr {
 	unsigned int	fc_intstat;	/* base + 0 */
 	unsigned int	fc_intenset;
diff --git a/drivers/crypto/fsl/desc.h b/drivers/crypto/fsl/desc.h
index 3589e6ea024..35f1b1ddaa3 100644
--- a/drivers/crypto/fsl/desc.h
+++ b/drivers/crypto/fsl/desc.h
@@ -1,6 +1,8 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * CAAM descriptor composition header
+#include <compiler.h>
+#include <linux/types.h>
  * Definitions to support CAAM descriptor instruction generation
  *
  * Copyright 2008-2014 Freescale Semiconductor, Inc.
diff --git a/drivers/crypto/fsl/desc_constr.h b/drivers/crypto/fsl/desc_constr.h
index a11ce812d19..0e14ca510d0 100644
--- a/drivers/crypto/fsl/desc_constr.h
+++ b/drivers/crypto/fsl/desc_constr.h
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
 /*
+#include <linux/types.h>
  * caam descriptor construction helper functions
  *
  * Copyright 2008-2014 Freescale Semiconductor, Inc.
diff --git a/drivers/crypto/fsl/error.c b/drivers/crypto/fsl/error.c
index a83efe585e6..f23649bf6f2 100644
--- a/drivers/crypto/fsl/error.c
+++ b/drivers/crypto/fsl/error.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <vsprintf.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include "desc.h"
diff --git a/drivers/crypto/fsl/fsl_blob.c b/drivers/crypto/fsl/fsl_blob.c
index 3cf03106174..e62f4c81833 100644
--- a/drivers/crypto/fsl/fsl_blob.c
+++ b/drivers/crypto/fsl/fsl_blob.c
@@ -14,6 +14,7 @@
 #include <asm/cache.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include "jobdesc.h"
 #include "desc.h"
 #include "jr.h"
diff --git a/drivers/crypto/fsl/fsl_hash.c b/drivers/crypto/fsl/fsl_hash.c
index 5bd6604e777..cdd067582ae 100644
--- a/drivers/crypto/fsl/fsl_hash.c
+++ b/drivers/crypto/fsl/fsl_hash.c
@@ -12,6 +12,7 @@
 #include <stdio.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "jobdesc.h"
 #include "desc.h"
 #include "jr.h"
diff --git a/drivers/crypto/fsl/fsl_hash.h b/drivers/crypto/fsl/fsl_hash.h
index 82057c83c35..6890536bcc9 100644
--- a/drivers/crypto/fsl/fsl_hash.h
+++ b/drivers/crypto/fsl/fsl_hash.h
@@ -9,6 +9,7 @@
 
 #include <fsl_sec.h>
 #include <hash.h>
+#include <linux/types.h>
 #include "jr.h"
 
 /* We support at most 32 Scatter/Gather Entries.*/
diff --git a/drivers/crypto/fsl/fsl_rsa.c b/drivers/crypto/fsl/fsl_rsa.c
index 2658f8c0434..a26d68932c9 100644
--- a/drivers/crypto/fsl/fsl_rsa.c
+++ b/drivers/crypto/fsl/fsl_rsa.c
@@ -11,6 +11,7 @@
 #include <asm/types.h>
 #include <malloc.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include "jobdesc.h"
 #include "desc.h"
 #include "jr.h"
diff --git a/drivers/crypto/fsl/jobdesc.c b/drivers/crypto/fsl/jobdesc.c
index 40f06e8f81b..359f127561b 100644
--- a/drivers/crypto/fsl/jobdesc.c
+++ b/drivers/crypto/fsl/jobdesc.c
@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
+#include <linux/types.h>
  * SEC Descriptor Construction Library
  * Basic job descriptor construction
  *
diff --git a/drivers/crypto/fsl/jobdesc.h b/drivers/crypto/fsl/jobdesc.h
index c4501abd26b..7aa4cb2f58f 100644
--- a/drivers/crypto/fsl/jobdesc.h
+++ b/drivers/crypto/fsl/jobdesc.h
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <asm/io.h>
+#include <linux/types.h>
 #include "rsa_caam.h"
 
 #define KEY_IDNFR_SZ_BYTES		16
diff --git a/drivers/crypto/fsl/jr.c b/drivers/crypto/fsl/jr.c
index 9ac4817d448..fda540388bd 100644
--- a/drivers/crypto/fsl/jr.c
+++ b/drivers/crypto/fsl/jr.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <stdio.h>
 #include <linux/errno.h>
@@ -13,6 +14,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "fsl_sec.h"
 #include "jr.h"
 #include "jobdesc.h"
diff --git a/drivers/crypto/fsl/jr.h b/drivers/crypto/fsl/jr.h
index ffd3a192738..1006ce12d55 100644
--- a/drivers/crypto/fsl/jr.h
+++ b/drivers/crypto/fsl/jr.h
@@ -7,7 +7,9 @@
 #ifndef __JR_H
 #define __JR_H
 
+#include <compiler.h>
 #include <linux/compiler.h>
+#include <linux/types.h>
 
 #define JR_SIZE 4
 /* Timeout currently defined as 90 sec */
diff --git a/drivers/crypto/fsl/rng.c b/drivers/crypto/fsl/rng.c
index 77f8e8a055f..19c6f9d5b91 100644
--- a/drivers/crypto/fsl/rng.c
+++ b/drivers/crypto/fsl/rng.c
@@ -14,6 +14,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "desc_constr.h"
 #include "jobdesc.h"
 #include "jr.h"
diff --git a/drivers/crypto/fsl/rsa_caam.h b/drivers/crypto/fsl/rsa_caam.h
index 9a6a8afa4aa..8e39607b932 100644
--- a/drivers/crypto/fsl/rsa_caam.h
+++ b/drivers/crypto/fsl/rsa_caam.h
@@ -7,6 +7,7 @@
 #define __RSA_CAAM_H
 
 #include <common.h>
+#include <linux/types.h>
 
 /**
  * struct pk_in_params - holder for input to PKHA block in CAAM
diff --git a/drivers/crypto/fsl/sec.c b/drivers/crypto/fsl/sec.c
index 4e52852d64b..32cfafea679 100644
--- a/drivers/crypto/fsl/sec.c
+++ b/drivers/crypto/fsl/sec.c
@@ -4,8 +4,10 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
diff --git a/drivers/crypto/rsa_mod_exp/mod_exp_sw.c b/drivers/crypto/rsa_mod_exp/mod_exp_sw.c
index 4ce85b32244..359470e1cc4 100644
--- a/drivers/crypto/rsa_mod_exp/mod_exp_sw.c
+++ b/drivers/crypto/rsa_mod_exp/mod_exp_sw.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <linux/types.h>
 #include <u-boot/rsa-mod-exp.h>
 
 static int mod_exp_sw(struct udevice *dev, const uint8_t *sig, uint32_t sig_len,
diff --git a/drivers/crypto/rsa_mod_exp/mod_exp_uclass.c b/drivers/crypto/rsa_mod_exp/mod_exp_uclass.c
index 6826011fb31..4fee492f090 100644
--- a/drivers/crypto/rsa_mod_exp/mod_exp_uclass.c
+++ b/drivers/crypto/rsa_mod_exp/mod_exp_uclass.c
@@ -9,6 +9,7 @@
 #include <stdbool.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <u-boot/rsa-mod-exp.h>
 #include <errno.h>
 #include <fdtdec.h>
diff --git a/drivers/ddr/altera/sdram_agilex.c b/drivers/ddr/altera/sdram_agilex.c
index 8cc648bc98e..539fdf90afa 100644
--- a/drivers/ddr/altera/sdram_agilex.c
+++ b/drivers/ddr/altera/sdram_agilex.c
@@ -15,6 +15,7 @@
 #include <reset.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
 #include "sdram_soc64.h"
diff --git a/drivers/ddr/altera/sdram_arria10.c b/drivers/ddr/altera/sdram_arria10.c
index 7d51bfd83c5..23ca7bcc160 100644
--- a/drivers/ddr/altera/sdram_arria10.c
+++ b/drivers/ddr/altera/sdram_arria10.c
@@ -21,6 +21,7 @@
 #include <asm/arch/misc.h>
 #include <asm/arch/reset_manager.h>
 #include <asm/arch/sdram.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/ddr/altera/sdram_gen5.c b/drivers/ddr/altera/sdram_gen5.c
index 723436cadca..30adfe61cdc 100644
--- a/drivers/ddr/altera/sdram_gen5.c
+++ b/drivers/ddr/altera/sdram_gen5.c
@@ -18,6 +18,7 @@
 #include <asm/arch/system_manager.h>
 #include <asm/bitops.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <dm/device_compat.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
diff --git a/drivers/ddr/altera/sdram_s10.c b/drivers/ddr/altera/sdram_s10.c
index 8fe96ee2465..e0c4b87514c 100644
--- a/drivers/ddr/altera/sdram_s10.c
+++ b/drivers/ddr/altera/sdram_s10.c
@@ -17,6 +17,7 @@
 #include <reset.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/kernel.h>
 #include "sdram_s10.h"
diff --git a/drivers/ddr/altera/sdram_soc64.c b/drivers/ddr/altera/sdram_soc64.c
index 67fc9c14e3f..b4823503c01 100644
--- a/drivers/ddr/altera/sdram_soc64.c
+++ b/drivers/ddr/altera/sdram_soc64.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <dm.h>
 #include <errno.h>
@@ -18,6 +19,7 @@
 #include <stdio.h>
 #include <time.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
diff --git a/drivers/ddr/altera/sdram_soc64.h b/drivers/ddr/altera/sdram_soc64.h
index 4a830e7ec18..d7a5a57b0e2 100644
--- a/drivers/ddr/altera/sdram_soc64.h
+++ b/drivers/ddr/altera/sdram_soc64.h
@@ -7,6 +7,8 @@
 #define	_SDRAM_SOC64_H_
 
 #include <common.h>
+#include <compiler.h>
+#include <asm/types.h>
 #include <linux/sizes.h>
 
 struct altera_sdram_priv {
diff --git a/drivers/ddr/altera/sequencer.c b/drivers/ddr/altera/sequencer.c
index aad40ad398d..861e0282f9f 100644
--- a/drivers/ddr/altera/sequencer.c
+++ b/drivers/ddr/altera/sequencer.c
@@ -5,10 +5,12 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <asm/arch/sdram.h>
 #include <errno.h>
 #include <hang.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
diff --git a/drivers/ddr/altera/sequencer.h b/drivers/ddr/altera/sequencer.h
index b655c25688d..72236531cce 100644
--- a/drivers/ddr/altera/sequencer.h
+++ b/drivers/ddr/altera/sequencer.h
@@ -7,6 +7,7 @@
 #define _SEQUENCER_H_
 
 #include <stdbool.h>
+#include <linux/types.h>
 #define RW_MGR_NUM_DM_PER_WRITE_GROUP (seq->rwcfg->mem_data_mask_width \
 	/ seq->rwcfg->mem_if_write_dqs_width)
 #define RW_MGR_NUM_TRUE_DM_PER_WRITE_GROUP ( \
diff --git a/drivers/ddr/fsl/arm_ddr_gen3.c b/drivers/ddr/fsl/arm_ddr_gen3.c
index 2f503b1a101..bd35b6a345e 100644
--- a/drivers/ddr/fsl/arm_ddr_gen3.c
+++ b/drivers/ddr/fsl/arm_ddr_gen3.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <log.h>
 #include <stdio.h>
 #include <asm/io.h>
@@ -14,6 +15,7 @@
 #include <fsl_immap.h>
 #include <fsl_ddr.h>
 #include <asm/arch/clock.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 
diff --git a/drivers/ddr/fsl/ctrl_regs.c b/drivers/ddr/fsl/ctrl_regs.c
index e6f85dcf623..2405ce77938 100644
--- a/drivers/ddr/fsl/ctrl_regs.c
+++ b/drivers/ddr/fsl/ctrl_regs.c
@@ -11,11 +11,13 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <fsl_ddr_sdram.h>
 #include <fsl_errata.h>
 #include <fsl_ddr.h>
 #include <fsl_immap.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/bitops.h>
 #include <asm/io.h>
@@ -23,6 +25,7 @@
 	defined(CONFIG_ARM)
 #include <asm/arch/clock.h>
 #endif
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
diff --git a/drivers/ddr/fsl/ddr3_dimm_params.c b/drivers/ddr/fsl/ddr3_dimm_params.c
index b3e42519e86..6833b981ce8 100644
--- a/drivers/ddr/fsl/ddr3_dimm_params.c
+++ b/drivers/ddr/fsl/ddr3_dimm_params.c
@@ -12,6 +12,7 @@
 #include <fsl_ddr_sdram.h>
 #include <log.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/string.h>
 
 #include <fsl_ddr.h>
diff --git a/drivers/ddr/fsl/ddr4_dimm_params.c b/drivers/ddr/fsl/ddr4_dimm_params.c
index fca5b433eb1..251facdb858 100644
--- a/drivers/ddr/fsl/ddr4_dimm_params.c
+++ b/drivers/ddr/fsl/ddr4_dimm_params.c
@@ -15,6 +15,7 @@
 #include <log.h>
 #include <stdbool.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/bug.h>
 #include <linux/string.h>
 
diff --git a/drivers/ddr/fsl/fsl_ddr_gen4.c b/drivers/ddr/fsl/fsl_ddr_gen4.c
index fceae90414c..314418ece04 100644
--- a/drivers/ddr/fsl/fsl_ddr_gen4.c
+++ b/drivers/ddr/fsl/fsl_ddr_gen4.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <env.h>
 #include <log.h>
 #include <stdio.h>
@@ -17,6 +18,7 @@
 	defined(CONFIG_ARM)
 #include <asm/arch/clock.h>
 #endif
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 
diff --git a/drivers/ddr/fsl/fsl_mmdc.c b/drivers/ddr/fsl/fsl_mmdc.c
index b88c65cd2e4..51c078f0008 100644
--- a/drivers/ddr/fsl/fsl_mmdc.c
+++ b/drivers/ddr/fsl/fsl_mmdc.c
@@ -11,6 +11,7 @@
 #include <fsl_mmdc.h>
 #include <stdio.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 static void set_wait_for_bits_clear(void *ptr, u32 value, u32 bits)
diff --git a/drivers/ddr/fsl/interactive.c b/drivers/ddr/fsl/interactive.c
index c7d99077d86..f8209d3aa86 100644
--- a/drivers/ddr/fsl/interactive.c
+++ b/drivers/ddr/fsl/interactive.c
@@ -24,6 +24,7 @@
 #include <asm/io.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr.h>
diff --git a/drivers/ddr/fsl/main.c b/drivers/ddr/fsl/main.c
index 56c0de2004c..45c50331b36 100644
--- a/drivers/ddr/fsl/main.c
+++ b/drivers/ddr/fsl/main.c
@@ -10,6 +10,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <display_options.h>
 #include <dm.h>
 #include <i2c.h>
@@ -17,11 +18,13 @@
 #include <fsl_ddr.h>
 #include <init.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/bitops.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /*
  * CONFIG_SYS_FSL_DDR_SDRAM_BASE_PHY is the physical address from the view
diff --git a/drivers/ddr/fsl/mpc85xx_ddr_gen1.c b/drivers/ddr/fsl/mpc85xx_ddr_gen1.c
index 091d7582f95..e9b829af512 100644
--- a/drivers/ddr/fsl/mpc85xx_ddr_gen1.c
+++ b/drivers/ddr/fsl/mpc85xx_ddr_gen1.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <log.h>
 #include <stdio.h>
 #include <asm/io.h>
diff --git a/drivers/ddr/fsl/mpc85xx_ddr_gen2.c b/drivers/ddr/fsl/mpc85xx_ddr_gen2.c
index 7fc264aa936..91c4e6fb4cc 100644
--- a/drivers/ddr/fsl/mpc85xx_ddr_gen2.c
+++ b/drivers/ddr/fsl/mpc85xx_ddr_gen2.c
@@ -4,12 +4,14 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <stdio.h>
 #include <asm/io.h>
 #include <asm/processor.h>
 #include <fsl_ddr_sdram.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 #if (CONFIG_CHIP_SELECTS_PER_CTRL > 4)
 #error Invalid setting for CONFIG_CHIP_SELECTS_PER_CTRL
diff --git a/drivers/ddr/fsl/mpc85xx_ddr_gen3.c b/drivers/ddr/fsl/mpc85xx_ddr_gen3.c
index cbe434a1a6a..b7ee440ef97 100644
--- a/drivers/ddr/fsl/mpc85xx_ddr_gen3.c
+++ b/drivers/ddr/fsl/mpc85xx_ddr_gen3.c
@@ -4,11 +4,13 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <log.h>
 #include <stdio.h>
 #include <asm/io.h>
 #include <fsl_ddr_sdram.h>
 #include <asm/processor.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 
diff --git a/drivers/ddr/fsl/mpc86xx_ddr.c b/drivers/ddr/fsl/mpc86xx_ddr.c
index a57cfec5b8c..2793e2b1bac 100644
--- a/drivers/ddr/fsl/mpc86xx_ddr.c
+++ b/drivers/ddr/fsl/mpc86xx_ddr.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <log.h>
 #include <stdio.h>
 #include <asm/io.h>
diff --git a/drivers/ddr/fsl/options.c b/drivers/ddr/fsl/options.c
index 87d720afcbb..4e65c4f4089 100644
--- a/drivers/ddr/fsl/options.c
+++ b/drivers/ddr/fsl/options.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <env.h>
 #include <hwconfig.h>
 #include <fsl_ddr_sdram.h>
@@ -12,6 +13,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 #include <fsl_ddr.h>
 #if defined(CONFIG_FSL_LSCH2) || defined(CONFIG_FSL_LSCH3) || \
diff --git a/drivers/ddr/fsl/util.c b/drivers/ddr/fsl/util.c
index 45d641ec60f..ab1a2d76b90 100644
--- a/drivers/ddr/fsl/util.c
+++ b/drivers/ddr/fsl/util.c
@@ -7,11 +7,13 @@
 #ifdef CONFIG_PPC
 #include <asm/fsl_law.h>
 #endif
+#include <compiler.h>
 #include <div64.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 #include <fsl_ddr.h>
 #include <fsl_immap.h>
diff --git a/drivers/ddr/imx/imx8m/ddr_init.c b/drivers/ddr/imx/imx8m/ddr_init.c
index 99a67edfb0a..45a6878cb51 100644
--- a/drivers/ddr/imx/imx8m/ddr_init.c
+++ b/drivers/ddr/imx/imx8m/ddr_init.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <errno.h>
 #include <log.h>
 #include <asm/io.h>
diff --git a/drivers/ddr/imx/imx8m/ddrphy_csr.c b/drivers/ddr/imx/imx8m/ddrphy_csr.c
index 67dd4e7059f..7cbd0ba8200 100644
--- a/drivers/ddr/imx/imx8m/ddrphy_csr.c
+++ b/drivers/ddr/imx/imx8m/ddrphy_csr.c
@@ -5,6 +5,7 @@
 
 #include <linux/kernel.h>
 #include <asm/arch/ddr.h>
+#include <linux/types.h>
 
 /* ddr phy trained csr */
 struct dram_cfg_param ddrphy_trained_csr[] = {
diff --git a/drivers/ddr/imx/imx8m/ddrphy_utils.c b/drivers/ddr/imx/imx8m/ddrphy_utils.c
index 20ae47bfb52..fcb634b3f0c 100644
--- a/drivers/ddr/imx/imx8m/ddrphy_utils.c
+++ b/drivers/ddr/imx/imx8m/ddrphy_utils.c
@@ -12,6 +12,7 @@
 #include <asm/arch/ddr.h>
 #include <asm/arch/lpddr4_define.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/types.h>
 
 static unsigned int g_cdd_rr_max[4];
 static unsigned int g_cdd_rw_max[4];
diff --git a/drivers/ddr/imx/imx8m/helper.c b/drivers/ddr/imx/imx8m/helper.c
index fca733ee3b2..cd6d0c37204 100644
--- a/drivers/ddr/imx/imx8m/helper.c
+++ b/drivers/ddr/imx/imx8m/helper.c
@@ -15,6 +15,7 @@
 #include <asm/arch/ddr.h>
 #include <asm/arch/lpddr4_define.h>
 #include <asm/sections.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/ddr/marvell/a38x/ddr3_logging_def.h b/drivers/ddr/marvell/a38x/ddr3_logging_def.h
index ad9da1cfffb..9c34054a797 100644
--- a/drivers/ddr/marvell/a38x/ddr3_logging_def.h
+++ b/drivers/ddr/marvell/a38x/ddr3_logging_def.h
@@ -71,6 +71,7 @@
 	if (level >= debug_training_access)	\
 		printf s
 #endif
+#include <asm/types.h>
 #endif
 
 
diff --git a/drivers/ddr/marvell/a38x/ddr3_patterns_64bit.h b/drivers/ddr/marvell/a38x/ddr3_patterns_64bit.h
index 1e2260b8710..39fa8525819 100644
--- a/drivers/ddr/marvell/a38x/ddr3_patterns_64bit.h
+++ b/drivers/ddr/marvell/a38x/ddr3_patterns_64bit.h
@@ -6,6 +6,7 @@
 #ifndef __DDR3_PATTERNS_64_H
 #define __DDR3_PATTERNS_64_H
 
+#include <asm/types.h>
 #define FAB_OPT		21
 /*
  * Patterns Declerations
diff --git a/drivers/ddr/marvell/a38x/ddr3_training_hw_algo.h b/drivers/ddr/marvell/a38x/ddr3_training_hw_algo.h
index fe0436668e9..6dba8575281 100644
--- a/drivers/ddr/marvell/a38x/ddr3_training_hw_algo.h
+++ b/drivers/ddr/marvell/a38x/ddr3_training_hw_algo.h
@@ -6,6 +6,7 @@
 #ifndef _DDR3_TRAINING_HW_ALGO_H_
 #define _DDR3_TRAINING_HW_ALGO_H_
 
+#include <asm/types.h>
 int ddr3_tip_vref(u32 dev_num);
 int ddr3_tip_write_additional_odt_setting(u32 dev_num, u32 if_id);
 int ddr3_tip_cmd_addr_init_delay(u32 dev_num, u32 adll_tap);
diff --git a/drivers/ddr/marvell/a38x/ddr3_training_ip_centralization.h b/drivers/ddr/marvell/a38x/ddr3_training_ip_centralization.h
index 392842a102d..319fe1eebe6 100644
--- a/drivers/ddr/marvell/a38x/ddr3_training_ip_centralization.h
+++ b/drivers/ddr/marvell/a38x/ddr3_training_ip_centralization.h
@@ -6,6 +6,7 @@
 #ifndef _DDR3_TRAINING_IP_CENTRALIZATION_H
 #define _DDR3_TRAINING_IP_CENTRALIZATION_H
 
+#include <asm/types.h>
 int ddr3_tip_centralization_tx(u32 dev_num);
 int ddr3_tip_centralization_rx(u32 dev_num);
 int ddr3_tip_print_centralization_result(u32 dev_num);
diff --git a/drivers/ddr/marvell/a38x/ddr3_training_ip_db.h b/drivers/ddr/marvell/a38x/ddr3_training_ip_db.h
index e28b7ecee15..a1cb285a2cf 100644
--- a/drivers/ddr/marvell/a38x/ddr3_training_ip_db.h
+++ b/drivers/ddr/marvell/a38x/ddr3_training_ip_db.h
@@ -6,6 +6,7 @@
 #ifndef _DDR3_TRAINING_IP_DB_H_
 #define _DDR3_TRAINING_IP_DB_H_
 
+#include <asm/types.h>
 enum hws_pattern {
 	PATTERN_PBS1,
 	PATTERN_PBS2,
diff --git a/drivers/ddr/marvell/a38x/ddr3_training_ip_pbs.h b/drivers/ddr/marvell/a38x/ddr3_training_ip_pbs.h
index 323c67aa591..1a8d9d1ad89 100644
--- a/drivers/ddr/marvell/a38x/ddr3_training_ip_pbs.h
+++ b/drivers/ddr/marvell/a38x/ddr3_training_ip_pbs.h
@@ -6,6 +6,7 @@
 #ifndef _DDR3_TRAINING_IP_PBS_H_
 #define _DDR3_TRAINING_IP_PBS_H_
 
+#include <asm/types.h>
 enum {
 	EBA_CONFIG,
 	EEBA_CONFIG,
diff --git a/drivers/ddr/marvell/a38x/ddr3_training_leveling.h b/drivers/ddr/marvell/a38x/ddr3_training_leveling.h
index 6719fb83f51..73851570e0a 100644
--- a/drivers/ddr/marvell/a38x/ddr3_training_leveling.h
+++ b/drivers/ddr/marvell/a38x/ddr3_training_leveling.h
@@ -6,6 +6,7 @@
 #ifndef _DDR3_TRAINING_LEVELING_H_
 #define _DDR3_TRAINING_LEVELING_H_
 
+#include <asm/types.h>
 #define MAX_DQ_READ_LEVELING_DELAY 15
 
 int ddr3_tip_print_wl_supp_result(u32 dev_num);
diff --git a/drivers/ddr/marvell/a38x/ddr_ml_wrapper.h b/drivers/ddr/marvell/a38x/ddr_ml_wrapper.h
index 688cbbeefc5..88beb5c8312 100644
--- a/drivers/ddr/marvell/a38x/ddr_ml_wrapper.h
+++ b/drivers/ddr/marvell/a38x/ddr_ml_wrapper.h
@@ -13,6 +13,7 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <asm/types.h>
 
 #if defined(CONFIG_ARMADA_38X) || defined(CONFIG_ARMADA_39X)
 #define INTER_REGS_BASE	SOC_REGS_PHY_BASE
diff --git a/drivers/ddr/marvell/a38x/mv_ddr_common.h b/drivers/ddr/marvell/a38x/mv_ddr_common.h
index 321a390c0d3..109d3e17090 100644
--- a/drivers/ddr/marvell/a38x/mv_ddr_common.h
+++ b/drivers/ddr/marvell/a38x/mv_ddr_common.h
@@ -6,6 +6,7 @@
 #ifndef _MV_DDR_COMMON_H
 #define _MV_DDR_COMMON_H
 
+#include <linux/types.h>
 extern const char mv_ddr_build_message[];
 extern const char mv_ddr_version_string[];
 
diff --git a/drivers/ddr/marvell/a38x/seq_exec.h b/drivers/ddr/marvell/a38x/seq_exec.h
index fe0cb8f75df..71b3a75fb83 100644
--- a/drivers/ddr/marvell/a38x/seq_exec.h
+++ b/drivers/ddr/marvell/a38x/seq_exec.h
@@ -6,6 +6,7 @@
 #ifndef _SEQ_EXEC_H
 #define _SEQ_EXEC_H
 
+#include <asm/types.h>
 #define NA			0xff
 #define DEFAULT_PARAM		0
 #define MV_BOARD_TCLK_ERROR	0xffffffff
diff --git a/drivers/ddr/marvell/a38x/xor.h b/drivers/ddr/marvell/a38x/xor.h
index 1e026503693..59a7bafa5ab 100644
--- a/drivers/ddr/marvell/a38x/xor.h
+++ b/drivers/ddr/marvell/a38x/xor.h
@@ -6,6 +6,7 @@
 #ifndef _XOR_H
 #define _XOR_H
 
+#include <asm/types.h>
 #define SRAM_BASE		0x40000000
 
 #define MV_XOR_MAX_UNIT		2	/* XOR unit == XOR engine */
diff --git a/drivers/ddr/marvell/axp/ddr3_dfs.c b/drivers/ddr/marvell/axp/ddr3_dfs.c
index 86abdf70db7..e118b44e4d0 100644
--- a/drivers/ddr/marvell/axp/ddr3_dfs.c
+++ b/drivers/ddr/marvell/axp/ddr3_dfs.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 #include "ddr3_hw_training.h"
diff --git a/drivers/ddr/marvell/axp/ddr3_dqs.c b/drivers/ddr/marvell/axp/ddr3_dqs.c
index 33187fbc64f..0f662d1fab4 100644
--- a/drivers/ddr/marvell/axp/ddr3_dqs.c
+++ b/drivers/ddr/marvell/axp/ddr3_dqs.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <asm/types.h>
 
 #include "ddr3_hw_training.h"
 
diff --git a/drivers/ddr/marvell/axp/ddr3_hw_training.c b/drivers/ddr/marvell/axp/ddr3_hw_training.c
index cc36f29ff86..a4771fbd46d 100644
--- a/drivers/ddr/marvell/axp/ddr3_hw_training.c
+++ b/drivers/ddr/marvell/axp/ddr3_hw_training.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 
diff --git a/drivers/ddr/marvell/axp/ddr3_init.c b/drivers/ddr/marvell/axp/ddr3_init.c
index f934957a0f3..b30a43ee680 100644
--- a/drivers/ddr/marvell/axp/ddr3_init.c
+++ b/drivers/ddr/marvell/axp/ddr3_init.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <i2c.h>
 #include <log.h>
 #include <spl.h>
@@ -11,6 +12,7 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 #include "ddr3_init.h"
diff --git a/drivers/ddr/marvell/axp/ddr3_patterns_64bit.h b/drivers/ddr/marvell/axp/ddr3_patterns_64bit.h
index 00dc9e3559a..b5b91cd0f0b 100644
--- a/drivers/ddr/marvell/axp/ddr3_patterns_64bit.h
+++ b/drivers/ddr/marvell/axp/ddr3_patterns_64bit.h
@@ -10,6 +10,7 @@
  * Patterns Declerations
  */
 
+#include <asm/types.h>
 u32 wl_sup_pattern[LEN_WL_SUP_PATTERN] __aligned(32) = {
 	0x04030201, 0x08070605, 0x0c0b0a09, 0x100f0e0d,
 	0x14131211, 0x18171615, 0x1c1b1a19, 0x201f1e1d,
diff --git a/drivers/ddr/marvell/axp/ddr3_pbs.c b/drivers/ddr/marvell/axp/ddr3_pbs.c
index dd7905dd7f4..adcdc91b939 100644
--- a/drivers/ddr/marvell/axp/ddr3_pbs.c
+++ b/drivers/ddr/marvell/axp/ddr3_pbs.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 
diff --git a/drivers/ddr/marvell/axp/ddr3_read_leveling.c b/drivers/ddr/marvell/axp/ddr3_read_leveling.c
index 03dae99107a..3d4992f9160 100644
--- a/drivers/ddr/marvell/axp/ddr3_read_leveling.c
+++ b/drivers/ddr/marvell/axp/ddr3_read_leveling.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <asm/types.h>
 
 #include "ddr3_hw_training.h"
 
diff --git a/drivers/ddr/marvell/axp/ddr3_sdram.c b/drivers/ddr/marvell/axp/ddr3_sdram.c
index 3a266c6de45..3fb1f89a090 100644
--- a/drivers/ddr/marvell/axp/ddr3_sdram.c
+++ b/drivers/ddr/marvell/axp/ddr3_sdram.c
@@ -9,6 +9,7 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <asm/types.h>
 
 #include "ddr3_hw_training.h"
 #include "xor.h"
diff --git a/drivers/ddr/marvell/axp/ddr3_spd.c b/drivers/ddr/marvell/axp/ddr3_spd.c
index d58d4961658..f35df5a7e95 100644
--- a/drivers/ddr/marvell/axp/ddr3_spd.c
+++ b/drivers/ddr/marvell/axp/ddr3_spd.c
@@ -12,6 +12,7 @@
 #include <asm/arch/soc.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "ddr3_init.h"
 
diff --git a/drivers/ddr/marvell/axp/ddr3_write_leveling.c b/drivers/ddr/marvell/axp/ddr3_write_leveling.c
index 8c875287b4c..c3c0a87ac45 100644
--- a/drivers/ddr/marvell/axp/ddr3_write_leveling.c
+++ b/drivers/ddr/marvell/axp/ddr3_write_leveling.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 
diff --git a/drivers/ddr/marvell/axp/xor.c b/drivers/ddr/marvell/axp/xor.c
index 17bfe6a7bf3..9c323685dc8 100644
--- a/drivers/ddr/marvell/axp/xor.c
+++ b/drivers/ddr/marvell/axp/xor.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <asm/types.h>
 
 #include "xor.h"
 #include "xor_regs.h"
diff --git a/drivers/ddr/microchip/ddr2.c b/drivers/ddr/microchip/ddr2.c
index 90ebf4642d5..0dd725c4ac1 100644
--- a/drivers/ddr/microchip/ddr2.c
+++ b/drivers/ddr/microchip/ddr2.c
@@ -4,8 +4,10 @@
  *
  */
 #include <common.h>
+#include <compiler.h>
 #include <stdio.h>
 #include <wait_bit.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 #include <linux/bitops.h>
 #include <mach/pic32.h>
diff --git a/drivers/ddr/microchip/ddr2_regs.h b/drivers/ddr/microchip/ddr2_regs.h
index 0734585dc2f..5c3b70fc3ce 100644
--- a/drivers/ddr/microchip/ddr2_regs.h
+++ b/drivers/ddr/microchip/ddr2_regs.h
@@ -7,6 +7,7 @@
 #ifndef __MICROCHIP_DDR2_REGS_H
 #define __MICROCHIP_DDR2_REGS_H
 
+#include <asm/types.h>
 #include <linux/bitops.h>
 
 /* DDR2 Controller */
diff --git a/drivers/demo/demo-shape.c b/drivers/demo/demo-shape.c
index 1be18905890..d9e61029e39 100644
--- a/drivers/demo/demo-shape.c
+++ b/drivers/demo/demo-shape.c
@@ -16,6 +16,7 @@
 #include <asm/gpio.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/demo/demo-simple.c b/drivers/demo/demo-simple.c
index 325f653877f..e02dde63d6c 100644
--- a/drivers/demo/demo-simple.c
+++ b/drivers/demo/demo-simple.c
@@ -12,6 +12,7 @@
 #include <mapmem.h>
 #include <stdio.h>
 #include <asm/io.h>
+#include <linux/types.h>
 
 static int simple_hello(struct udevice *dev, int ch)
 {
diff --git a/drivers/dfu/dfu.c b/drivers/dfu/dfu.c
index b9d1dcbc1d2..7df96cd136f 100644
--- a/drivers/dfu/dfu.c
+++ b/drivers/dfu/dfu.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <env.h>
 #include <errno.h>
 #include <log.h>
@@ -15,6 +16,7 @@
 #include <fat.h>
 #include <dfu.h>
 #include <hash.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/errno.h>
@@ -23,6 +25,7 @@
 #include <linux/compiler.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static LIST_HEAD(dfu_list);
 static int dfu_alt_num;
diff --git a/drivers/dfu/dfu_mmc.c b/drivers/dfu/dfu_mmc.c
index 4431e34c10e..e4894c5968d 100644
--- a/drivers/dfu/dfu_mmc.c
+++ b/drivers/dfu/dfu_mmc.c
@@ -22,6 +22,7 @@
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static unsigned char *dfu_file_buf;
 static u64 dfu_file_buf_len;
diff --git a/drivers/dfu/dfu_mtd.c b/drivers/dfu/dfu_mtd.c
index 7e5623674ca..9b850560721 100644
--- a/drivers/dfu/dfu_mtd.c
+++ b/drivers/dfu/dfu_mtd.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <dfu.h>
 #include <mtd.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <jffs2/load_kernel.h>
@@ -17,6 +18,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static bool mtd_is_aligned_with_block_size(struct mtd_info *mtd, u64 size)
 {
diff --git a/drivers/dfu/dfu_nand.c b/drivers/dfu/dfu_nand.c
index 848a9d81d11..e4bcdde8668 100644
--- a/drivers/dfu/dfu_nand.c
+++ b/drivers/dfu/dfu_nand.c
@@ -21,6 +21,7 @@
 #include <jffs2/load_kernel.h>
 #include <nand.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static int nand_block_op(enum dfu_op op, struct dfu_entity *dfu,
 			u64 offset, void *buf, long *len)
diff --git a/drivers/dfu/dfu_ram.c b/drivers/dfu/dfu_ram.c
index 55c3dc9eb19..ac07730b84c 100644
--- a/drivers/dfu/dfu_ram.c
+++ b/drivers/dfu/dfu_ram.c
@@ -16,6 +16,7 @@
 #include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static int dfu_transfer_medium_ram(enum dfu_op op, struct dfu_entity *dfu,
 				   u64 offset, void *buf, long *len)
diff --git a/drivers/dfu/dfu_sf.c b/drivers/dfu/dfu_sf.c
index 3d0a4f98971..af4a90a8b42 100644
--- a/drivers/dfu/dfu_sf.c
+++ b/drivers/dfu/dfu_sf.c
@@ -17,6 +17,7 @@
 #include <linux/errno.h>
 #include <linux/mtd/mtd.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static int dfu_get_medium_size_sf(struct dfu_entity *dfu, u64 *size)
 {
diff --git a/drivers/dfu/dfu_tftp.c b/drivers/dfu/dfu_tftp.c
index 61efb11a545..d90a1a2f38e 100644
--- a/drivers/dfu/dfu_tftp.c
+++ b/drivers/dfu/dfu_tftp.c
@@ -12,6 +12,7 @@
 #include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 int dfu_tftp_write(char *dfu_entity_name, unsigned int addr, unsigned int len,
 		   char *interface, char *devstring)
diff --git a/drivers/dfu/dfu_virt.c b/drivers/dfu/dfu_virt.c
index 4d9a56bbf5c..7b47c1eed26 100644
--- a/drivers/dfu/dfu_virt.c
+++ b/drivers/dfu/dfu_virt.c
@@ -3,11 +3,13 @@
  * Copyright (C) 2019, STMicroelectronics - All Rights Reserved
  */
 #include <common.h>
+#include <compiler.h>
 #include <dfu.h>
 #include <errno.h>
 #include <log.h>
 #include <malloc.h>
 #include <vsprintf.h>
+#include <linux/types.h>
 
 int __weak dfu_write_medium_virt(struct dfu_entity *dfu, u64 offset,
 				 void *buf, long *len)
diff --git a/drivers/dma/MCD_dmaApi.c b/drivers/dma/MCD_dmaApi.c
index d3c79e122cb..feee0a5421a 100644
--- a/drivers/dma/MCD_dmaApi.c
+++ b/drivers/dma/MCD_dmaApi.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <stdio.h>
+#include <asm/types.h>
 
 #include <MCD_dma.h>
 #include <MCD_tasksInit.h>
diff --git a/drivers/dma/MCD_tasks.c b/drivers/dma/MCD_tasks.c
index 453d95413da..9d320ea1dcd 100644
--- a/drivers/dma/MCD_tasks.c
+++ b/drivers/dma/MCD_tasks.c
@@ -3,6 +3,7 @@
  * Copyright (C) 2004-2007 Freescale Semiconductor, Inc.
  */
 
+#include <asm/types.h>
 /* Contains task code and structures for Multi-channel DMA */
 
 #include <common.h>
diff --git a/drivers/dma/MCD_tasksInit.c b/drivers/dma/MCD_tasksInit.c
index 079cd0af3c0..20ad4c241ca 100644
--- a/drivers/dma/MCD_tasksInit.c
+++ b/drivers/dma/MCD_tasksInit.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <asm/types.h>
 
 /* Functions for initializing variable tables of different types of tasks. */
 
diff --git a/drivers/dma/apbh_dma.c b/drivers/dma/apbh_dma.c
index 697db0d7201..967c614c852 100644
--- a/drivers/dma/apbh_dma.c
+++ b/drivers/dma/apbh_dma.c
@@ -17,6 +17,7 @@
 #include <linux/kernel.h>
 #include <linux/list.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <common.h>
 #include <malloc.h>
diff --git a/drivers/dma/bcm6348-iudma.c b/drivers/dma/bcm6348-iudma.c
index e6fc0ac5ffb..43b93b26b33 100644
--- a/drivers/dma/bcm6348-iudma.c
+++ b/drivers/dma/bcm6348-iudma.c
@@ -17,6 +17,7 @@
 
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <dm.h>
 #include <dma-uclass.h>
@@ -31,6 +32,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 #define DMA_RX_DESC	6
 #define DMA_TX_DESC	1
diff --git a/drivers/dma/dma-uclass.c b/drivers/dma/dma-uclass.c
index 8a6fd825b13..62f3d60465c 100644
--- a/drivers/dma/dma-uclass.c
+++ b/drivers/dma/dma-uclass.c
@@ -22,6 +22,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_DMA_CHANNELS
 static inline struct dma_ops *dma_dev_ops(struct udevice *dev)
diff --git a/drivers/dma/fsl_dma.c b/drivers/dma/fsl_dma.c
index e46544c877b..e230c49d26a 100644
--- a/drivers/dma/fsl_dma.c
+++ b/drivers/dma/fsl_dma.c
@@ -14,6 +14,7 @@
 #include <asm/fsl_dma.h>
 #include <asm/u-boot.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 /* Controller can only transfer 2^26 - 1 bytes at a time */
 #define FSL_DMA_MAX_SIZE	(0x3ffffff)
diff --git a/drivers/dma/keystone_nav.c b/drivers/dma/keystone_nav.c
index 72b0a7736fc..7dedd52698e 100644
--- a/drivers/dma/keystone_nav.c
+++ b/drivers/dma/keystone_nav.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <asm/io.h>
 #include <asm/ti-common/keystone_nav.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 
diff --git a/drivers/dma/keystone_nav_cfg.c b/drivers/dma/keystone_nav_cfg.c
index 9a64801cf9b..cd84b42b954 100644
--- a/drivers/dma/keystone_nav_cfg.c
+++ b/drivers/dma/keystone_nav_cfg.c
@@ -7,6 +7,7 @@
  */
 
 #include <asm/ti-common/keystone_nav.h>
+#include <asm/types.h>
 
 #ifdef CONFIG_KSNAV_PKTDMA_NETCP
 /* NETCP Pktdma */
diff --git a/drivers/dma/lpc32xx_dma.c b/drivers/dma/lpc32xx_dma.c
index 7078d3e7c6a..996fc1bdc85 100644
--- a/drivers/dma/lpc32xx_dma.c
+++ b/drivers/dma/lpc32xx_dma.c
@@ -16,6 +16,7 @@
 #include <asm/arch/clk.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/dma/sandbox-dma-test.c b/drivers/dma/sandbox-dma-test.c
index 460197ed67a..b5a37c74d5a 100644
--- a/drivers/dma/sandbox-dma-test.c
+++ b/drivers/dma/sandbox-dma-test.c
@@ -20,6 +20,7 @@
 #include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define SANDBOX_DMA_CH_CNT 3
 #define SANDBOX_DMA_BUF_SIZE 1024
diff --git a/drivers/dma/ti-edma3.c b/drivers/dma/ti-edma3.c
index aba4efc15c2..878dbdfe59e 100644
--- a/drivers/dma/ti-edma3.c
+++ b/drivers/dma/ti-edma3.c
@@ -17,6 +17,7 @@
 #include <asm/ti-common/ti-edma3.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define EDMA3_SL_BASE(slot)			(0x4000 + ((slot) << 5))
 #define EDMA3_SL_MAX_NUM			512
diff --git a/drivers/dma/ti/k3-psil.c b/drivers/dma/ti/k3-psil.c
index 56da1e605c3..783a413b387 100644
--- a/drivers/dma/ti/k3-psil.c
+++ b/drivers/dma/ti/k3-psil.c
@@ -4,6 +4,7 @@
  *  Author: Peter Ujfalusi <peter.ujfalusi@ti.com>
  */
 
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/err.h>
diff --git a/drivers/dma/ti/k3-udma.c b/drivers/dma/ti/k3-udma.c
index 4d50dbc76e5..1f4b16782a6 100644
--- a/drivers/dma/ti/k3-udma.c
+++ b/drivers/dma/ti/k3-udma.c
@@ -6,8 +6,10 @@
 #define pr_fmt(fmt) "udma: " fmt
 
 #include <common.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/cache.h>
@@ -34,6 +36,7 @@
 #include <linux/soc/ti/ti-udma.h>
 #include <linux/soc/ti/ti_sci_protocol.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "k3-udma-hwdef.h"
 #include "k3-psil-priv.h"
diff --git a/drivers/fastboot/fb_command.c b/drivers/fastboot/fb_command.c
index 966c0024579..b3db6a84aa1 100644
--- a/drivers/fastboot/fb_command.c
+++ b/drivers/fastboot/fb_command.c
@@ -15,6 +15,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <vsprintf.h>
+#include <asm/types.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/fastboot/fb_common.c b/drivers/fastboot/fb_common.c
index 74a5bce22f7..3a4d020e3fa 100644
--- a/drivers/fastboot/fb_common.c
+++ b/drivers/fastboot/fb_common.c
@@ -12,11 +12,13 @@
 
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <env.h>
 #include <fastboot.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <net/fastboot.h>
diff --git a/drivers/fastboot/fb_getvar.c b/drivers/fastboot/fb_getvar.c
index 5c188e1b5b5..ee9df2e102a 100644
--- a/drivers/fastboot/fb_getvar.c
+++ b/drivers/fastboot/fb_getvar.c
@@ -17,6 +17,7 @@
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static void getvar_version(char *var_parameter, char *response);
 static void getvar_version_bootloader(char *var_parameter, char *response);
diff --git a/drivers/fastboot/fb_mmc.c b/drivers/fastboot/fb_mmc.c
index 5615dffa6d8..185fd81d495 100644
--- a/drivers/fastboot/fb_mmc.c
+++ b/drivers/fastboot/fb_mmc.c
@@ -24,6 +24,7 @@
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define FASTBOOT_MAX_BLK_WRITE 16384
 
diff --git a/drivers/fastboot/fb_nand.c b/drivers/fastboot/fb_nand.c
index 074aa2aeb2b..1b89d25d3a6 100644
--- a/drivers/fastboot/fb_nand.c
+++ b/drivers/fastboot/fb_nand.c
@@ -4,6 +4,7 @@
  * Copyright 2015 Free Electrons.
  */
 
+#include <compiler.h>
 #include <config.h>
 #include <common.h>
 #include <blk.h>
@@ -12,6 +13,7 @@
 #include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <fastboot.h>
 #include <image-sparse.h>
diff --git a/drivers/firmware/firmware-zynqmp.c b/drivers/firmware/firmware-zynqmp.c
index 0a815ec736a..4082675ad91 100644
--- a/drivers/firmware/firmware-zynqmp.c
+++ b/drivers/firmware/firmware-zynqmp.c
@@ -15,6 +15,7 @@
 #include <asm/ptrace.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #if defined(CONFIG_ZYNQMP_IPI)
 #include <mailbox.h>
diff --git a/drivers/firmware/ti_sci.c b/drivers/firmware/ti_sci.c
index e156d549268..17e739463a8 100644
--- a/drivers/firmware/ti_sci.c
+++ b/drivers/firmware/ti_sci.c
@@ -13,6 +13,7 @@
 #include <log.h>
 #include <mailbox.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <dm/device.h>
 #include <dm/device_compat.h>
 #include <dm/devres.h>
@@ -24,6 +25,7 @@
 #include <linux/soc/ti/k3-sec-proxy.h>
 #include <linux/soc/ti/ti_sci_protocol.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "ti_sci.h"
 
diff --git a/drivers/firmware/ti_sci.h b/drivers/firmware/ti_sci.h
index 327bb820f3a..341f727f0b7 100644
--- a/drivers/firmware/ti_sci.h
+++ b/drivers/firmware/ti_sci.h
@@ -15,6 +15,8 @@
 #define __TI_SCI_H
 
 /* Generic Messages */
+#include <compiler.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #define TI_SCI_MSG_ENABLE_WDT		0x0000
 #define TI_SCI_MSG_WAKE_RESET		0x0001
diff --git a/drivers/fpga/ACEX1K.c b/drivers/fpga/ACEX1K.c
index 6c5097d94c7..6cbcf1aa1bc 100644
--- a/drivers/fpga/ACEX1K.c
+++ b/drivers/fpga/ACEX1K.c
@@ -12,6 +12,7 @@
 #include <ACEX1K.h>		/* ACEX device family */
 #include <time.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 /* Define FPGA_DEBUG to get debug printf's */
 #ifdef	FPGA_DEBUG
diff --git a/drivers/fpga/altera.c b/drivers/fpga/altera.c
index 4ce9a0581ad..f63fc0b2ed6 100644
--- a/drivers/fpga/altera.c
+++ b/drivers/fpga/altera.c
@@ -18,6 +18,7 @@
 #include <stratixII.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 /* Define FPGA_DEBUG to 1 to get debug printf's */
 #define FPGA_DEBUG	0
diff --git a/drivers/fpga/cyclon2.c b/drivers/fpga/cyclon2.c
index de0880ff3d8..d85c6601ee2 100644
--- a/drivers/fpga/cyclon2.c
+++ b/drivers/fpga/cyclon2.c
@@ -12,6 +12,7 @@
 #include <stdio.h>
 #include <time.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 /* Define FPGA_DEBUG to get debug printf's */
 #ifdef	FPGA_DEBUG
diff --git a/drivers/fpga/fpga.c b/drivers/fpga/fpga.c
index 1d76e123212..b4ee5235b41 100644
--- a/drivers/fpga/fpga.c
+++ b/drivers/fpga/fpga.c
@@ -6,6 +6,7 @@
 
 /* Generic FPGA support */
 #include <common.h>             /* core U-Boot definitions */
+#include <compiler.h>
 #include <init.h>
 #include <log.h>
 #include <stdio.h>
@@ -14,6 +15,7 @@
 #include <lattice.h>
 #include <dm/device_compat.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /* Local definitions */
 #ifndef CONFIG_MAX_FPGA_DEVICES
diff --git a/drivers/fpga/lattice.c b/drivers/fpga/lattice.c
index cbdf00d3a2e..b88d5c222ba 100644
--- a/drivers/fpga/lattice.c
+++ b/drivers/fpga/lattice.c
@@ -17,6 +17,7 @@
 #include <lattice.h>
 #include <stdio.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 static lattice_board_specific_func *pfns;
 static const char *fpga_image;
diff --git a/drivers/fpga/socfpga.c b/drivers/fpga/socfpga.c
index 357c74675d1..75e5d9479f1 100644
--- a/drivers/fpga/socfpga.c
+++ b/drivers/fpga/socfpga.c
@@ -11,6 +11,7 @@
 #include <asm/arch/reset_manager.h>
 #include <asm/arch/system_manager.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 /* Timeout count */
 #define FPGA_TIMEOUT_CNT		0x1000000
diff --git a/drivers/fpga/socfpga_arria10.c b/drivers/fpga/socfpga_arria10.c
index 360f064dbae..ab02d9d783d 100644
--- a/drivers/fpga/socfpga_arria10.c
+++ b/drivers/fpga/socfpga_arria10.c
@@ -26,6 +26,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define CFGWDTH_32	1
 #define MIN_BITSTREAM_SIZECHECK	230
diff --git a/drivers/fpga/socfpga_gen5.c b/drivers/fpga/socfpga_gen5.c
index 1edd494a5b0..9e7b6232560 100644
--- a/drivers/fpga/socfpga_gen5.c
+++ b/drivers/fpga/socfpga_gen5.c
@@ -11,6 +11,7 @@
 #include <asm/arch/fpga_manager.h>
 #include <asm/arch/reset_manager.h>
 #include <asm/arch/system_manager.h>
+#include <linux/types.h>
 
 #define FPGA_TIMEOUT_CNT	0x1000000
 
diff --git a/drivers/fpga/spartan2.c b/drivers/fpga/spartan2.c
index 355104f77d9..4f131ade668 100644
--- a/drivers/fpga/spartan2.c
+++ b/drivers/fpga/spartan2.c
@@ -7,6 +7,7 @@
 #include <common.h>		/* core U-Boot definitions */
 #include <spartan2.h>		/* Spartan-II device family */
 #include <time.h>
+#include <linux/types.h>
 
 /* Define FPGA_DEBUG to get debug printf's */
 #ifdef	FPGA_DEBUG
diff --git a/drivers/fpga/spartan3.c b/drivers/fpga/spartan3.c
index 7374bb6f6b9..6975f6c3554 100644
--- a/drivers/fpga/spartan3.c
+++ b/drivers/fpga/spartan3.c
@@ -14,6 +14,7 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
+#include <linux/types.h>
 
 /* Define FPGA_DEBUG to get debug printf's */
 #ifdef	FPGA_DEBUG
diff --git a/drivers/fpga/stratix10.c b/drivers/fpga/stratix10.c
index 3477ddbfd6b..cf3214d8240 100644
--- a/drivers/fpga/stratix10.c
+++ b/drivers/fpga/stratix10.c
@@ -13,6 +13,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define RECONFIG_STATUS_POLL_RESP_TIMEOUT_MS		60000
 #define RECONFIG_STATUS_INTERVAL_DELAY_US		1000000
diff --git a/drivers/fpga/stratixII.c b/drivers/fpga/stratixII.c
index b450a81072e..d0b5645e121 100644
--- a/drivers/fpga/stratixII.c
+++ b/drivers/fpga/stratixII.c
@@ -7,6 +7,7 @@
 #include <common.h>		/* core U-Boot definitions */
 #include <altera.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 int StratixII_ps_fpp_load (Altera_desc * desc, void *buf, size_t bsize,
 			   int isSerial, int isSecure);
diff --git a/drivers/fpga/stratixv.c b/drivers/fpga/stratixv.c
index 403865c1e37..5becb528dc0 100644
--- a/drivers/fpga/stratixv.c
+++ b/drivers/fpga/stratixv.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 /* Write the RBF data to FPGA via SPI */
 static int program_write(int spi_bus, int spi_dev, const void *rbf_data,
diff --git a/drivers/fpga/versalpl.c b/drivers/fpga/versalpl.c
index eeaa8e0a335..94d4788ffbf 100644
--- a/drivers/fpga/versalpl.c
+++ b/drivers/fpga/versalpl.c
@@ -15,6 +15,7 @@
 #include <asm/cache.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static ulong versal_align_dma_buffer(ulong *buf, u32 len)
 {
diff --git a/drivers/fpga/virtex2.c b/drivers/fpga/virtex2.c
index c6449cfc60f..e234c63eb3b 100644
--- a/drivers/fpga/virtex2.c
+++ b/drivers/fpga/virtex2.c
@@ -18,6 +18,7 @@
 #include <time.h>
 #include <virtex2.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 #if 0
 #define FPGA_DEBUG
diff --git a/drivers/fpga/xilinx.c b/drivers/fpga/xilinx.c
index 30259607410..dc1d1c5fa09 100644
--- a/drivers/fpga/xilinx.c
+++ b/drivers/fpga/xilinx.c
@@ -20,6 +20,7 @@
 #include <spartan3.h>
 #include <zynqpl.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /* Local Static Functions */
 static int xilinx_validate(xilinx_desc *desc, char *fn);
diff --git a/drivers/fpga/zynqmppl.c b/drivers/fpga/zynqmppl.c
index 9d3eb848266..3a84e7f26ef 100644
--- a/drivers/fpga/zynqmppl.c
+++ b/drivers/fpga/zynqmppl.c
@@ -10,6 +10,7 @@
 #include <compiler.h>
 #include <cpu_func.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <zynqmppl.h>
 #include <zynqmp_firmware.h>
@@ -19,6 +20,7 @@
 #include <linux/sizes.h>
 #include <asm/arch/sys_proto.h>
 #include <memalign.h>
+#include <linux/types.h>
 
 #define DUMMY_WORD	0xffffffff
 
diff --git a/drivers/fpga/zynqpl.c b/drivers/fpga/zynqpl.c
index c887f3ddca6..6bb1e44fab1 100644
--- a/drivers/fpga/zynqpl.c
+++ b/drivers/fpga/zynqpl.c
@@ -21,6 +21,7 @@
 #include <linux/sizes.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/types.h>
 
 #define DEVCFG_CTRL_PCFG_PROG_B		0x40000000
 #define DEVCFG_CTRL_PCFG_AES_EFUSE_MASK	0x00001000
diff --git a/drivers/gpio/74x164_gpio.c b/drivers/gpio/74x164_gpio.c
index a6d360a04e1..860c62903ea 100644
--- a/drivers/gpio/74x164_gpio.c
+++ b/drivers/gpio/74x164_gpio.c
@@ -22,6 +22,7 @@
 #include <spi.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/gpio/adi_gpio2.c b/drivers/gpio/adi_gpio2.c
index fc508093d6f..11c6b709e46 100644
--- a/drivers/gpio/adi_gpio2.c
+++ b/drivers/gpio/adi_gpio2.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <malloc.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/bug.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
diff --git a/drivers/gpio/altera_pio.c b/drivers/gpio/altera_pio.c
index e52124dbd50..3609cc29380 100644
--- a/drivers/gpio/altera_pio.c
+++ b/drivers/gpio/altera_pio.c
@@ -12,6 +12,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
+#include <asm/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/gpio/at91_gpio.c b/drivers/gpio/at91_gpio.c
index f808f5114b7..c1cfd0e1c11 100644
--- a/drivers/gpio/at91_gpio.c
+++ b/drivers/gpio/at91_gpio.c
@@ -19,6 +19,7 @@
 #include <asm/gpio.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/at91_pio.h>
+#include <linux/types.h>
 
 #define GPIO_PER_BANK	32
 
diff --git a/drivers/gpio/atmel_pio4.c b/drivers/gpio/atmel_pio4.c
index 9b291ae976a..e9925e815d4 100644
--- a/drivers/gpio/atmel_pio4.c
+++ b/drivers/gpio/atmel_pio4.c
@@ -16,6 +16,7 @@
 #include <asm/gpio.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <mach/gpio.h>
 #include <mach/atmel_pio4.h>
 
diff --git a/drivers/gpio/axp_gpio.c b/drivers/gpio/axp_gpio.c
index 76008670e0b..31f15a47129 100644
--- a/drivers/gpio/axp_gpio.c
+++ b/drivers/gpio/axp_gpio.c
@@ -11,6 +11,7 @@
 #include <asm/gpio.h>
 #include <axp_pmic.h>
 #include <dm.h>
+#include <asm/types.h>
 #include <dm/device-internal.h>
 #include <dm/lists.h>
 #include <dm/root.h>
diff --git a/drivers/gpio/bcm2835_gpio.c b/drivers/gpio/bcm2835_gpio.c
index c7d120246fc..f66554912c9 100644
--- a/drivers/gpio/bcm2835_gpio.c
+++ b/drivers/gpio/bcm2835_gpio.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <asm/types.h>
 #include <dm/pinctrl.h>
 #include <errno.h>
 #include <asm/gpio.h>
diff --git a/drivers/gpio/bcm6345_gpio.c b/drivers/gpio/bcm6345_gpio.c
index 9b0f551b950..9f13543682c 100644
--- a/drivers/gpio/bcm6345_gpio.c
+++ b/drivers/gpio/bcm6345_gpio.c
@@ -8,6 +8,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <errno.h>
 #include <stdbool.h>
diff --git a/drivers/gpio/cortina_gpio.c b/drivers/gpio/cortina_gpio.c
index 3b093c87568..5e7ca9de4a8 100644
--- a/drivers/gpio/cortina_gpio.c
+++ b/drivers/gpio/cortina_gpio.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
 #include <asm/io.h>
diff --git a/drivers/gpio/da8xx_gpio.h b/drivers/gpio/da8xx_gpio.h
index 849e8d2dcf3..81e0ab63028 100644
--- a/drivers/gpio/da8xx_gpio.h
+++ b/drivers/gpio/da8xx_gpio.h
@@ -3,6 +3,7 @@
 #ifndef _GPIO_DA8XX_DEFS_H_
 #define _GPIO_DA8XX_DEFS_H_
 
+#include <linux/types.h>
 struct davinci_gpio {
 	unsigned int dir;
 	unsigned int out_data;
diff --git a/drivers/gpio/db8500_gpio.c b/drivers/gpio/db8500_gpio.c
index 4e79571aa4e..18ab33b8060 100644
--- a/drivers/gpio/db8500_gpio.c
+++ b/drivers/gpio/db8500_gpio.c
@@ -17,8 +17,10 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <stdio.h>
 #include <asm/io.h>
+#include <linux/types.h>
 
 #include <asm/arch/db8500_gpio.h>
 #include <asm/arch/db8500_pincfg.h>
diff --git a/drivers/gpio/dwapb_gpio.c b/drivers/gpio/dwapb_gpio.c
index 3ab3b399c6b..4dc347a2315 100644
--- a/drivers/gpio/dwapb_gpio.c
+++ b/drivers/gpio/dwapb_gpio.c
@@ -12,6 +12,7 @@
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <dm.h>
+#include <asm/types.h>
 #include <dm/device-internal.h>
 #include <dm/device_compat.h>
 #include <dm/devres.h>
diff --git a/drivers/gpio/gpio-rcar.c b/drivers/gpio/gpio-rcar.c
index a940b9969c1..b7328856688 100644
--- a/drivers/gpio/gpio-rcar.c
+++ b/drivers/gpio/gpio-rcar.c
@@ -5,10 +5,12 @@
 
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <dm.h>
 #include <malloc.h>
 #include <stdbool.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <dm/device_compat.h>
 #include <dm/pinctrl.h>
 #include <errno.h>
diff --git a/drivers/gpio/gpio-rza1.c b/drivers/gpio/gpio-rza1.c
index 13f525823ec..86fa2534787 100644
--- a/drivers/gpio/gpio-rza1.c
+++ b/drivers/gpio/gpio-rza1.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <dm.h>
 #include <errno.h>
 #include <stdbool.h>
diff --git a/drivers/gpio/gpio-uclass.c b/drivers/gpio/gpio-uclass.c
index 68320c1e27c..7714fe9375e 100644
--- a/drivers/gpio/gpio-uclass.c
+++ b/drivers/gpio/gpio-uclass.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <log.h>
 #include <stdarg.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
@@ -25,6 +26,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/gpio/gpio-uniphier.c b/drivers/gpio/gpio-uniphier.c
index 54a38da0f10..f693700c9db 100644
--- a/drivers/gpio/gpio-uniphier.c
+++ b/drivers/gpio/gpio-uniphier.c
@@ -5,7 +5,9 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/io.h>
 #include <linux/sizes.h>
diff --git a/drivers/gpio/hi6220_gpio.c b/drivers/gpio/hi6220_gpio.c
index eb369195c8d..f41af01fd97 100644
--- a/drivers/gpio/hi6220_gpio.c
+++ b/drivers/gpio/hi6220_gpio.c
@@ -10,6 +10,7 @@
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <errno.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/string.h>
diff --git a/drivers/gpio/hsdk-creg-gpio.c b/drivers/gpio/hsdk-creg-gpio.c
index 82ce0a813ba..75c686e4deb 100644
--- a/drivers/gpio/hsdk-creg-gpio.c
+++ b/drivers/gpio/hsdk-creg-gpio.c
@@ -15,6 +15,7 @@
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
diff --git a/drivers/gpio/imx_rgpio2p.c b/drivers/gpio/imx_rgpio2p.c
index fe171af18c5..807f06c9c4b 100644
--- a/drivers/gpio/imx_rgpio2p.c
+++ b/drivers/gpio/imx_rgpio2p.c
@@ -13,6 +13,7 @@
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <malloc.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 
diff --git a/drivers/gpio/intel_broadwell_gpio.c b/drivers/gpio/intel_broadwell_gpio.c
index 4fc345c755e..af68d1161ef 100644
--- a/drivers/gpio/intel_broadwell_gpio.c
+++ b/drivers/gpio/intel_broadwell_gpio.c
@@ -19,6 +19,7 @@
 #include <asm/arch/gpio.h>
 #include <dt-bindings/gpio/x86-gpio.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/gpio/intel_gpio.c b/drivers/gpio/intel_gpio.c
index 360ec685249..6075f23d184 100644
--- a/drivers/gpio/intel_gpio.c
+++ b/drivers/gpio/intel_gpio.c
@@ -24,6 +24,7 @@
 #include <dt-bindings/gpio/x86-gpio.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static int intel_gpio_direction_input(struct udevice *dev, uint offset)
 {
diff --git a/drivers/gpio/intel_ich6_gpio.c b/drivers/gpio/intel_ich6_gpio.c
index be371fdcc30..4b57a34eae4 100644
--- a/drivers/gpio/intel_ich6_gpio.c
+++ b/drivers/gpio/intel_ich6_gpio.c
@@ -40,6 +40,7 @@
 #include <asm/io.h>
 #include <asm/pci.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/gpio/iproc_gpio.c b/drivers/gpio/iproc_gpio.c
index 9672342bca3..06b5809c245 100644
--- a/drivers/gpio/iproc_gpio.c
+++ b/drivers/gpio/iproc_gpio.c
@@ -4,11 +4,13 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <errno.h>
 #include <stdbool.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <dm.h>
+#include <asm/types.h>
 #include <dm/device_compat.h>
 #include <dm/devres.h>
 #include <dm/pinctrl.h>
diff --git a/drivers/gpio/kona_gpio.c b/drivers/gpio/kona_gpio.c
index 9b8e6240f5a..a9acb52f032 100644
--- a/drivers/gpio/kona_gpio.c
+++ b/drivers/gpio/kona_gpio.c
@@ -8,6 +8,7 @@
 #include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/sysmap.h>
+#include <asm/types.h>
 
 #define GPIO_BASE				(void *)GPIO2_BASE_ADDR
 
diff --git a/drivers/gpio/kw_gpio.c b/drivers/gpio/kw_gpio.c
index 39a73ccfb74..e341e86201a 100644
--- a/drivers/gpio/kw_gpio.c
+++ b/drivers/gpio/kw_gpio.c
@@ -7,6 +7,7 @@
 
 /*
  * Based on (mostly copied from) plat-orion based Linux 2.6 kernel driver.
+#include <asm/types.h>
  * Removed orion_gpiochip struct and kernel level irq handling.
  *
  * Dieter Kiermaier dk-arm-linux at gmx.de
diff --git a/drivers/gpio/mpc83xx_spisel_boot.c b/drivers/gpio/mpc83xx_spisel_boot.c
index 34705769cbf..9b57c699a58 100644
--- a/drivers/gpio/mpc83xx_spisel_boot.c
+++ b/drivers/gpio/mpc83xx_spisel_boot.c
@@ -6,12 +6,14 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <mapmem.h>
 #include <vsprintf.h>
 #include <asm/gpio.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 struct mpc83xx_spisel_boot {
 	u32 __iomem *spi_cs;
diff --git a/drivers/gpio/mpc8xxx_gpio.c b/drivers/gpio/mpc8xxx_gpio.c
index 6959f1c5d62..d4c8e8857be 100644
--- a/drivers/gpio/mpc8xxx_gpio.c
+++ b/drivers/gpio/mpc8xxx_gpio.c
@@ -9,12 +9,14 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <mapmem.h>
 #include <vsprintf.h>
 #include <asm/gpio.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 struct ccsr_gpio {
 	u32	gpdir;
diff --git a/drivers/gpio/mscc_sgpio.c b/drivers/gpio/mscc_sgpio.c
index 9b7bb4b0602..10b4e6046ae 100644
--- a/drivers/gpio/mscc_sgpio.c
+++ b/drivers/gpio/mscc_sgpio.c
@@ -8,6 +8,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
 #include <asm/gpio.h>
@@ -19,6 +20,7 @@
 #include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #define MSCC_SGPIOS_PER_BANK	32
 #define MSCC_SGPIO_BANK_DEPTH	4
diff --git a/drivers/gpio/msm_gpio.c b/drivers/gpio/msm_gpio.c
index d0877485085..f7a9ee9c22e 100644
--- a/drivers/gpio/msm_gpio.c
+++ b/drivers/gpio/msm_gpio.c
@@ -11,6 +11,7 @@
 #include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/gpio/mt7621_gpio.c b/drivers/gpio/mt7621_gpio.c
index e569c67a615..a6c58d7906f 100644
--- a/drivers/gpio/mt7621_gpio.c
+++ b/drivers/gpio/mt7621_gpio.c
@@ -8,10 +8,12 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <errno.h>
 #include <fdtdec.h>
 #include <malloc.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/io.h>
diff --git a/drivers/gpio/mvebu_gpio.c b/drivers/gpio/mvebu_gpio.c
index 65eaa71c201..06910e0a7da 100644
--- a/drivers/gpio/mvebu_gpio.c
+++ b/drivers/gpio/mvebu_gpio.c
@@ -8,6 +8,7 @@
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <errno.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 
 #define MVEBU_GPIOS_PER_BANK	32
diff --git a/drivers/gpio/mvgpio.c b/drivers/gpio/mvgpio.c
index bf1842ccf7e..7072064092e 100644
--- a/drivers/gpio/mvgpio.c
+++ b/drivers/gpio/mvgpio.c
@@ -12,6 +12,7 @@
 #include <malloc.h>
 #include <stdio.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include "mvgpio.h"
 #include <asm/gpio.h>
diff --git a/drivers/gpio/mvgpio.h b/drivers/gpio/mvgpio.h
index d68c48e6373..c8857b1ef92 100644
--- a/drivers/gpio/mvgpio.h
+++ b/drivers/gpio/mvgpio.h
@@ -12,6 +12,7 @@
 #define __MVGPIO_H__
 
 #include <common.h>
+#include <asm/types.h>
 
 /*
  * GPIO Register map for Marvell SOCs
diff --git a/drivers/gpio/mvmfp.c b/drivers/gpio/mvmfp.c
index 511042c1990..fc7cbebde8e 100644
--- a/drivers/gpio/mvmfp.c
+++ b/drivers/gpio/mvmfp.c
@@ -9,6 +9,7 @@
 #include <asm/io.h>
 #include <mvmfp.h>
 #include <asm/arch/mfp.h>
+#include <asm/types.h>
 
 /*
  * mfp_config
diff --git a/drivers/gpio/mxc_gpio.c b/drivers/gpio/mxc_gpio.c
index 212516001fc..dc6a042cbd7 100644
--- a/drivers/gpio/mxc_gpio.c
+++ b/drivers/gpio/mxc_gpio.c
@@ -14,6 +14,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
diff --git a/drivers/gpio/mxs_gpio.c b/drivers/gpio/mxs_gpio.c
index 7a290fba0f7..597f5c8604d 100644
--- a/drivers/gpio/mxs_gpio.c
+++ b/drivers/gpio/mxs_gpio.c
@@ -19,6 +19,7 @@
 #include <asm/arch/iomux.h>
 #include <asm/arch/imx-regs.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #if	defined(CONFIG_MX23)
 #define	PINCTRL_BANKS		3
diff --git a/drivers/gpio/nx_gpio.c b/drivers/gpio/nx_gpio.c
index 5ec73c43599..71e8f06a8a9 100644
--- a/drivers/gpio/nx_gpio.c
+++ b/drivers/gpio/nx_gpio.c
@@ -10,6 +10,7 @@
 #include <malloc.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
+#include <asm/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/gpio/omap_gpio.c b/drivers/gpio/omap_gpio.c
index 8d9cee05067..fb0046b39e3 100644
--- a/drivers/gpio/omap_gpio.c
+++ b/drivers/gpio/omap_gpio.c
@@ -25,6 +25,7 @@
 #include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <malloc.h>
 #include <linux/string.h>
diff --git a/drivers/gpio/pca953x.c b/drivers/gpio/pca953x.c
index c3a79b931b8..31f3621d617 100644
--- a/drivers/gpio/pca953x.c
+++ b/drivers/gpio/pca953x.c
@@ -15,6 +15,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/kernel.h>
+#include <linux/types.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 a3ae0c49b98..a3218d15006 100644
--- a/drivers/gpio/pca953x_gpio.c
+++ b/drivers/gpio/pca953x_gpio.c
@@ -33,6 +33,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define PCA953X_INPUT           0
 #define PCA953X_OUTPUT          1
diff --git a/drivers/gpio/pca9698.c b/drivers/gpio/pca9698.c
index 11274c78101..3f53c804304 100644
--- a/drivers/gpio/pca9698.c
+++ b/drivers/gpio/pca9698.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <i2c.h>
 #include <malloc.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <pca9698.h>
 
diff --git a/drivers/gpio/pcf8575_gpio.c b/drivers/gpio/pcf8575_gpio.c
index 7eeacd77c2a..5e79ac4bd3a 100644
--- a/drivers/gpio/pcf8575_gpio.c
+++ b/drivers/gpio/pcf8575_gpio.c
@@ -30,6 +30,7 @@
 #include <stdio.h>
 #include <asm-generic/gpio.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/gpio/pm8916_gpio.c b/drivers/gpio/pm8916_gpio.c
index 62fb3a39d3e..d28375e9e4e 100644
--- a/drivers/gpio/pm8916_gpio.c
+++ b/drivers/gpio/pm8916_gpio.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <stdbool.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <spmi/spmi.h>
 #include <asm/io.h>
diff --git a/drivers/gpio/rk_gpio.c b/drivers/gpio/rk_gpio.c
index fa79bacbd07..f3f77e24be8 100644
--- a/drivers/gpio/rk_gpio.c
+++ b/drivers/gpio/rk_gpio.c
@@ -19,6 +19,7 @@
 #include <dm/pinctrl.h>
 #include <dt-bindings/clock/rk3288-cru.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 enum {
 	ROCKCHIP_GPIOS_PER_BANK		= 32,
diff --git a/drivers/gpio/s5p_gpio.c b/drivers/gpio/s5p_gpio.c
index 0d87c6be7f2..ff9131d4eca 100644
--- a/drivers/gpio/s5p_gpio.c
+++ b/drivers/gpio/s5p_gpio.c
@@ -15,6 +15,7 @@
 #include <asm/gpio.h>
 #include <dm/device-internal.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/gpio/sandbox.c b/drivers/gpio/sandbox.c
index acbc6495c83..e0b620109a4 100644
--- a/drivers/gpio/sandbox.c
+++ b/drivers/gpio/sandbox.c
@@ -20,6 +20,7 @@
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/gpio/sandbox-gpio.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 
 struct gpio_state {
diff --git a/drivers/gpio/sh_pfc.c b/drivers/gpio/sh_pfc.c
index 693aa873ba2..e9d320af3db 100644
--- a/drivers/gpio/sh_pfc.c
+++ b/drivers/gpio/sh_pfc.c
@@ -10,6 +10,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <log.h>
 #include <malloc.h>
 #include <asm/bitops.h>
diff --git a/drivers/gpio/sifive-gpio.c b/drivers/gpio/sifive-gpio.c
index 51c3ce610a1..cc54c0d70d4 100644
--- a/drivers/gpio/sifive-gpio.c
+++ b/drivers/gpio/sifive-gpio.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <stdbool.h>
 #include <vsprintf.h>
@@ -16,6 +17,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static int sifive_gpio_probe(struct udevice *dev)
 {
diff --git a/drivers/gpio/spear_gpio.c b/drivers/gpio/spear_gpio.c
index 2aed08781d7..2f66dfc8fd4 100644
--- a/drivers/gpio/spear_gpio.c
+++ b/drivers/gpio/spear_gpio.c
@@ -13,6 +13,7 @@
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <errno.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 
 static int gpio_direction(unsigned gpio,
diff --git a/drivers/gpio/stm32_gpio.c b/drivers/gpio/stm32_gpio.c
index 5bff27f75b5..16a2bb8054e 100644
--- a/drivers/gpio/stm32_gpio.c
+++ b/drivers/gpio/stm32_gpio.c
@@ -17,6 +17,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/io.h>
+#include <linux/types.h>
 
 #define MODE_BITS(gpio_pin)		((gpio_pin) * 2)
 #define MODE_BITS_MASK			3
diff --git a/drivers/gpio/sunxi_gpio.c b/drivers/gpio/sunxi_gpio.c
index d7ba86cc151..74002e53c4d 100644
--- a/drivers/gpio/sunxi_gpio.c
+++ b/drivers/gpio/sunxi_gpio.c
@@ -22,6 +22,7 @@
 #include <dt-bindings/gpio/gpio.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define SUNXI_GPIOS_PER_BANK	SUNXI_GPIO_A_NR
 
diff --git a/drivers/gpio/tca642x.c b/drivers/gpio/tca642x.c
index 8b2057607bc..6b038e4553d 100644
--- a/drivers/gpio/tca642x.c
+++ b/drivers/gpio/tca642x.c
@@ -27,6 +27,7 @@
 #include <tca642x.h>
 #include <vsprintf.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 /* tca642x register address definitions */
 struct tca642x_bank_info tca642x_regs[] = {
diff --git a/drivers/gpio/tegra186_gpio.c b/drivers/gpio/tegra186_gpio.c
index affabbbf9a6..19d4e5b18e9 100644
--- a/drivers/gpio/tegra186_gpio.c
+++ b/drivers/gpio/tegra186_gpio.c
@@ -9,6 +9,7 @@
 #include <malloc.h>
 #include <errno.h>
 #include <fdtdec.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <asm/bitops.h>
 #include <asm/gpio.h>
@@ -16,6 +17,7 @@
 #include <dt-bindings/gpio/gpio.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include "tegra186_gpio_priv.h"
 
 struct tegra186_gpio_port_data {
diff --git a/drivers/gpio/tegra_gpio.c b/drivers/gpio/tegra_gpio.c
index c002e6864dd..fdc20e66c4b 100644
--- a/drivers/gpio/tegra_gpio.c
+++ b/drivers/gpio/tegra_gpio.c
@@ -23,6 +23,7 @@
 #include <dm/device-internal.h>
 #include <dt-bindings/gpio/gpio.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 static const int CONFIG_SFIO = 0;
 static const int CONFIG_GPIO = 1;
diff --git a/drivers/gpio/vybrid_gpio.c b/drivers/gpio/vybrid_gpio.c
index 99f5d07cca0..11fbc6191a1 100644
--- a/drivers/gpio/vybrid_gpio.c
+++ b/drivers/gpio/vybrid_gpio.c
@@ -13,6 +13,7 @@
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/io.h>
 #include <malloc.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/gpio/xilinx_gpio.c b/drivers/gpio/xilinx_gpio.c
index 2fb39ca0382..32b1e3e8d9f 100644
--- a/drivers/gpio/xilinx_gpio.c
+++ b/drivers/gpio/xilinx_gpio.c
@@ -15,6 +15,7 @@
 #include <dm.h>
 #include <dt-bindings/gpio/gpio.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define XILINX_GPIO_MAX_BANK	2
 
diff --git a/drivers/gpio/zynq_gpio.c b/drivers/gpio/zynq_gpio.c
index 91b8cd945e3..8754749c1b9 100644
--- a/drivers/gpio/zynq_gpio.c
+++ b/drivers/gpio/zynq_gpio.c
@@ -17,6 +17,7 @@
 #include <dm.h>
 #include <fdtdec.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /* Maximum banks */
 #define ZYNQ_GPIO_MAX_BANK	4
diff --git a/drivers/hwspinlock/hwspinlock-uclass.c b/drivers/hwspinlock/hwspinlock-uclass.c
index 14bfc6ae1b6..b61fd98909c 100644
--- a/drivers/hwspinlock/hwspinlock-uclass.c
+++ b/drivers/hwspinlock/hwspinlock-uclass.c
@@ -14,6 +14,7 @@
 #include <dm/device_compat.h>
 #include <linux/compat.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 static inline const struct hwspinlock_ops *
 hwspinlock_dev_ops(struct udevice *dev)
diff --git a/drivers/hwspinlock/stm32_hwspinlock.c b/drivers/hwspinlock/stm32_hwspinlock.c
index ea54063c19b..50851fcddea 100644
--- a/drivers/hwspinlock/stm32_hwspinlock.c
+++ b/drivers/hwspinlock/stm32_hwspinlock.c
@@ -9,6 +9,7 @@
 #include <hwspinlock.h>
 #include <malloc.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 
diff --git a/drivers/i2c/ast_i2c.c b/drivers/i2c/ast_i2c.c
index f0d830e5636..8cf49b16aeb 100644
--- a/drivers/i2c/ast_i2c.c
+++ b/drivers/i2c/ast_i2c.c
@@ -12,11 +12,13 @@
 #include <fdtdec.h>
 #include <i2c.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <asm/arch/scu_ast2500.h>
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #include "ast_i2c.h"
 
diff --git a/drivers/i2c/ast_i2c.h b/drivers/i2c/ast_i2c.h
index 928785989e7..fc6df80a889 100644
--- a/drivers/i2c/ast_i2c.h
+++ b/drivers/i2c/ast_i2c.h
@@ -7,6 +7,7 @@
 #ifndef __AST_I2C_H_
 #define __AST_I2C_H_
 
+#include <asm/types.h>
 struct ast_i2c_regs {
 	u32 fcr;
 	u32 cactcr1;
diff --git a/drivers/i2c/at91_i2c.c b/drivers/i2c/at91_i2c.c
index c656db55706..515a433492d 100644
--- a/drivers/i2c/at91_i2c.c
+++ b/drivers/i2c/at91_i2c.c
@@ -6,6 +6,7 @@
  */
 
 #include <malloc.h>
+#include <stdbool.h>
 #include <time.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
@@ -18,6 +19,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include <mach/clk.h>
 
 #include "at91_i2c.h"
diff --git a/drivers/i2c/at91_i2c.h b/drivers/i2c/at91_i2c.h
index 3915af83723..f4b8c40464b 100644
--- a/drivers/i2c/at91_i2c.h
+++ b/drivers/i2c/at91_i2c.h
@@ -2,6 +2,7 @@
 #define _AT91_I2C_H
 
 #include <linux/bitops.h>
+#include <linux/types.h>
 #define	TWI_CR_START		BIT(0)	/* Send a Start Condition */
 #define	TWI_CR_MSEN		BIT(2)	/* Master Transfer Enable */
 #define	TWI_CR_STOP		BIT(1)	/* Send a Stop Condition */
diff --git a/drivers/i2c/cros_ec_ldo.c b/drivers/i2c/cros_ec_ldo.c
index e894a1a3eb2..943470ce708 100644
--- a/drivers/i2c/cros_ec_ldo.c
+++ b/drivers/i2c/cros_ec_ldo.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <stdbool.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <power/tps65090.h>
 
 static int cros_ec_ldo_set_bus_speed(struct udevice *dev, unsigned int speed)
diff --git a/drivers/i2c/davinci_i2c.c b/drivers/i2c/davinci_i2c.c
index 694172106c1..4b1c1cfaf03 100644
--- a/drivers/i2c/davinci_i2c.c
+++ b/drivers/i2c/davinci_i2c.c
@@ -8,6 +8,7 @@
  * --------------------------------------------------------
  *
  * NOTE: This driver should be converted to driver model before June 2017.
+#include <linux/types.h>
  * Please see doc/driver-model/i2c-howto.rst for instructions.
  */
 
diff --git a/drivers/i2c/davinci_i2c.h b/drivers/i2c/davinci_i2c.h
index 57377ce9416..c645a427499 100644
--- a/drivers/i2c/davinci_i2c.h
+++ b/drivers/i2c/davinci_i2c.h
@@ -8,6 +8,7 @@
 #ifndef _DAVINCI_I2C_H_
 #define _DAVINCI_I2C_H_
 
+#include <asm/types.h>
 #define I2C_WRITE		0
 #define I2C_READ		1
 
diff --git a/drivers/i2c/designware_i2c.c b/drivers/i2c/designware_i2c.c
index 5aad1a29977..69b36b0fc4d 100644
--- a/drivers/i2c/designware_i2c.c
+++ b/drivers/i2c/designware_i2c.c
@@ -12,12 +12,14 @@
 #include <malloc.h>
 #include <pci.h>
 #include <reset.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include "designware_i2c.h"
 #include <dm/device_compat.h>
 #include <linux/err.h>
diff --git a/drivers/i2c/designware_i2c.h b/drivers/i2c/designware_i2c.h
index 0f34cc8b5ab..b07c1fd6511 100644
--- a/drivers/i2c/designware_i2c.h
+++ b/drivers/i2c/designware_i2c.h
@@ -11,6 +11,7 @@
 #include <i2c.h>
 #include <reset.h>
 #include <stdbool.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 
 struct i2c_regs {
diff --git a/drivers/i2c/designware_i2c_pci.c b/drivers/i2c/designware_i2c_pci.c
index 5f2084acda8..fd69e3cb862 100644
--- a/drivers/i2c/designware_i2c_pci.c
+++ b/drivers/i2c/designware_i2c_pci.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
 #include <spl.h>
@@ -18,6 +19,7 @@
 #include <dm/uclass-internal.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include "designware_i2c.h"
 
 enum {
diff --git a/drivers/i2c/exynos_hs_i2c.c b/drivers/i2c/exynos_hs_i2c.c
index f34c7112529..4be5c667d44 100644
--- a/drivers/i2c/exynos_hs_i2c.c
+++ b/drivers/i2c/exynos_hs_i2c.c
@@ -17,6 +17,7 @@
 #include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include "s3c24x0_i2c.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/i2c/fsl_i2c.c b/drivers/i2c/fsl_i2c.c
index 10cc55ce834..77c5f7274a2 100644
--- a/drivers/i2c/fsl_i2c.c
+++ b/drivers/i2c/fsl_i2c.c
@@ -22,6 +22,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /* The maximum number of microseconds we will wait until another master has
  * released the bus.  If not defined in the board header file, then use a
diff --git a/drivers/i2c/i2c-cdns.c b/drivers/i2c/i2c-cdns.c
index a5781bcfec2..0482f6a0102 100644
--- a/drivers/i2c/i2c-cdns.c
+++ b/drivers/i2c/i2c-cdns.c
@@ -8,8 +8,10 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/drivers/i2c/i2c-cortina.c b/drivers/i2c/i2c-cortina.c
index aa7f3a0264e..bad6a4159bf 100644
--- a/drivers/i2c/i2c-cortina.c
+++ b/drivers/i2c/i2c-cortina.c
@@ -13,6 +13,7 @@
 #include <dm.h>
 #include <mapmem.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include "i2c-cortina.h"
 
 static void set_speed(struct i2c_regs *regs, int i2c_spd)
diff --git a/drivers/i2c/i2c-cortina.h b/drivers/i2c/i2c-cortina.h
index 7e406b580ea..3d14a35a7a0 100644
--- a/drivers/i2c/i2c-cortina.h
+++ b/drivers/i2c/i2c-cortina.h
@@ -84,4 +84,5 @@ struct ca_i2c {
 #define I2C_STOPDET_TO		(CONFIG_SYS_HZ / 500)
 #define I2C_BYTE_TO_BB		(10)
 
+#include <asm/types.h>
 #endif							/* __CA_I2C_H_ */
diff --git a/drivers/i2c/i2c-gpio.c b/drivers/i2c/i2c-gpio.c
index 7e47bed9f4b..98166401666 100644
--- a/drivers/i2c/i2c-gpio.c
+++ b/drivers/i2c/i2c-gpio.c
@@ -10,12 +10,14 @@
 #include <dm.h>
 #include <i2c.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 #define DEFAULT_UDELAY	5
 #define RETRIES		0
diff --git a/drivers/i2c/i2c-uclass.c b/drivers/i2c/i2c-uclass.c
index f5a1890d5c9..12123e6a853 100644
--- a/drivers/i2c/i2c-uclass.c
+++ b/drivers/i2c/i2c-uclass.c
@@ -21,6 +21,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define I2C_MAX_OFFSET_LEN	4
 
diff --git a/drivers/i2c/i2c-uniphier-f.c b/drivers/i2c/i2c-uniphier-f.c
index c78378fa183..1288d03c6be 100644
--- a/drivers/i2c/i2c-uniphier-f.c
+++ b/drivers/i2c/i2c-uniphier-f.c
@@ -5,6 +5,7 @@
  *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  */
 
+#include <compiler.h>
 #include <stdbool.h>
 #include <dm/device_compat.h>
 #include <linux/errno.h>
diff --git a/drivers/i2c/i2c-uniphier.c b/drivers/i2c/i2c-uniphier.c
index c1f1eb0325b..273fcbea8c9 100644
--- a/drivers/i2c/i2c-uniphier.c
+++ b/drivers/i2c/i2c-uniphier.c
@@ -5,6 +5,7 @@
  *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  */
 
+#include <compiler.h>
 #include <stdbool.h>
 #include <dm/device_compat.h>
 #include <linux/delay.h>
diff --git a/drivers/i2c/i2c-versatile.c b/drivers/i2c/i2c-versatile.c
index f78b12a560c..98f6dd0c8f5 100644
--- a/drivers/i2c/i2c-versatile.c
+++ b/drivers/i2c/i2c-versatile.c
@@ -15,6 +15,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/io.h>
+#include <linux/types.h>
 
 #define I2C_CONTROL_REG		0x00
 #define I2C_SET_REG		0x00
diff --git a/drivers/i2c/i2c_core.c b/drivers/i2c/i2c_core.c
index 40096e95aa0..acecc4783c4 100644
--- a/drivers/i2c/i2c_core.c
+++ b/drivers/i2c/i2c_core.c
@@ -8,10 +8,12 @@
  * Multibus/multiadapter I2C core functions (wrappers)
  */
 #include <common.h>
+#include <compiler.h>
 #include <i2c.h>
 #include <linker_lists.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <linux/types.h>
 
 struct i2c_adapter *i2c_get_adapter(int index)
 {
diff --git a/drivers/i2c/ihs_i2c.c b/drivers/i2c/ihs_i2c.c
index 5550da80622..af4e79d907f 100644
--- a/drivers/i2c/ihs_i2c.c
+++ b/drivers/i2c/ihs_i2c.c
@@ -13,6 +13,7 @@
 #include <gdsys_fpga.h>
 #endif
 #include <log.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 #include <asm/unaligned.h>
 #include <linux/bitops.h>
@@ -20,6 +21,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_DM_I2C
 struct ihs_i2c_priv {
diff --git a/drivers/i2c/imx_lpi2c.c b/drivers/i2c/imx_lpi2c.c
index aa5c65728cd..e3465f7bce3 100644
--- a/drivers/i2c/imx_lpi2c.c
+++ b/drivers/i2c/imx_lpi2c.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <errno.h>
 #include <log.h>
 #include <stdbool.h>
@@ -19,6 +20,7 @@
 #include <i2c.h>
 #include <dm/device_compat.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #define LPI2C_FIFO_SIZE 4
 #define LPI2C_NACK_TOUT_MS 1
diff --git a/drivers/i2c/intel_i2c.c b/drivers/i2c/intel_i2c.c
index cbda069131a..5b65dae7175 100644
--- a/drivers/i2c/intel_i2c.c
+++ b/drivers/i2c/intel_i2c.c
@@ -18,6 +18,7 @@
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /* PCI Configuration Space (D31:F3): SMBus */
 #define SMB_BASE		0x20
diff --git a/drivers/i2c/iproc_i2c.c b/drivers/i2c/iproc_i2c.c
index b5d865d66ba..802f9dbb83d 100644
--- a/drivers/i2c/iproc_i2c.c
+++ b/drivers/i2c/iproc_i2c.c
@@ -4,6 +4,7 @@
  *
  */
 
+#include <compiler.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <common.h>
@@ -11,6 +12,7 @@
 #include <dm.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 #include "errno.h"
 #include <i2c.h>
 #include "iproc_i2c.h"
diff --git a/drivers/i2c/kona_i2c.c b/drivers/i2c/kona_i2c.c
index e2632a6e36c..d163b3e730c 100644
--- a/drivers/i2c/kona_i2c.c
+++ b/drivers/i2c/kona_i2c.c
@@ -3,6 +3,7 @@
  * Copyright 2013 Broadcom Corporation.
  *
  * NOTE: This driver should be converted to driver model before June 2017.
+#include <linux/types.h>
  * Please see doc/driver-model/i2c-howto.rst for instructions.
  */
 
diff --git a/drivers/i2c/lpc32xx_i2c.c b/drivers/i2c/lpc32xx_i2c.c
index 8aef939981f..6abf1ceea09 100644
--- a/drivers/i2c/lpc32xx_i2c.c
+++ b/drivers/i2c/lpc32xx_i2c.c
@@ -16,6 +16,7 @@
 #include <dm.h>
 #include <mapmem.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /*
  * Provide default speed and slave if target did not
diff --git a/drivers/i2c/meson_i2c.c b/drivers/i2c/meson_i2c.c
index 3e4b10aff54..6238167633e 100644
--- a/drivers/i2c/meson_i2c.c
+++ b/drivers/i2c/meson_i2c.c
@@ -4,6 +4,7 @@
  */
 #include <common.h>
 #include <log.h>
+#include <stdbool.h>
 #include <time.h>
 #include <asm/io.h>
 #include <clk.h>
@@ -14,6 +15,7 @@
 #include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #define I2C_TIMEOUT_MS		100
 
diff --git a/drivers/i2c/muxes/i2c-arb-gpio-challenge.c b/drivers/i2c/muxes/i2c-arb-gpio-challenge.c
index 2b9e0ba585a..73a23b61c43 100644
--- a/drivers/i2c/muxes/i2c-arb-gpio-challenge.c
+++ b/drivers/i2c/muxes/i2c-arb-gpio-challenge.c
@@ -16,6 +16,7 @@
 #include <asm/gpio.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/i2c/muxes/i2c-mux-gpio.c b/drivers/i2c/muxes/i2c-mux-gpio.c
index 52da26ab182..c9b07a68dc4 100644
--- a/drivers/i2c/muxes/i2c-mux-gpio.c
+++ b/drivers/i2c/muxes/i2c-mux-gpio.c
@@ -19,6 +19,7 @@
 #include <i2c.h>
 #include <linux/errno.h>
 #include <linux/libfdt.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/i2c/muxes/i2c-mux-uclass.c b/drivers/i2c/muxes/i2c-mux-uclass.c
index 1af7b68e205..2d8db8a3caf 100644
--- a/drivers/i2c/muxes/i2c-mux-uclass.c
+++ b/drivers/i2c/muxes/i2c-mux-uclass.c
@@ -14,6 +14,7 @@
 #include <dm/root.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /**
  * struct i2c_mux: Information the uclass stores about an I2C mux
diff --git a/drivers/i2c/muxes/pca954x.c b/drivers/i2c/muxes/pca954x.c
index 3140a1abb6c..ceb6516cbc4 100644
--- a/drivers/i2c/muxes/pca954x.c
+++ b/drivers/i2c/muxes/pca954x.c
@@ -13,6 +13,7 @@
 #include <malloc.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #include <asm-generic/gpio.h>
 
diff --git a/drivers/i2c/mv_i2c.c b/drivers/i2c/mv_i2c.c
index 37d04bf11e9..853372595ce 100644
--- a/drivers/i2c/mv_i2c.c
+++ b/drivers/i2c/mv_i2c.c
@@ -17,6 +17,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <i2c.h>
 #include <log.h>
@@ -25,6 +26,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "mv_i2c.h"
 
 /* All transfers are described by this data structure */
diff --git a/drivers/i2c/mvtwsi.c b/drivers/i2c/mvtwsi.c
index 775f0240346..03fc42aef7b 100644
--- a/drivers/i2c/mvtwsi.c
+++ b/drivers/i2c/mvtwsi.c
@@ -21,6 +21,7 @@
 #include <dm.h>
 #endif
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/i2c/mxc_i2c.c b/drivers/i2c/mxc_i2c.c
index dfa84836f53..1fa1187ba3e 100644
--- a/drivers/i2c/mxc_i2c.c
+++ b/drivers/i2c/mxc_i2c.c
@@ -16,6 +16,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <asm/arch/clock.h>
@@ -33,6 +34,7 @@
 #include <dm/pinctrl.h>
 #include <fdtdec.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/i2c/nx_i2c.c b/drivers/i2c/nx_i2c.c
index 54a7bc85f69..9d14fabeb45 100644
--- a/drivers/i2c/nx_i2c.c
+++ b/drivers/i2c/nx_i2c.c
@@ -11,6 +11,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #define I2C_WRITE       0
 #define I2C_READ        1
diff --git a/drivers/i2c/octeon_i2c.c b/drivers/i2c/octeon_i2c.c
index 19b7622b418..2a152e37264 100644
--- a/drivers/i2c/octeon_i2c.c
+++ b/drivers/i2c/octeon_i2c.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <dm.h>
 #include <i2c.h>
 #include <pci_ids.h>
@@ -14,6 +15,7 @@
 #include <linux/compat.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #define TWSI_SW_TWSI		0x00
 #define TWSI_TWSI_SW		0x08
diff --git a/drivers/i2c/omap24xx_i2c.c b/drivers/i2c/omap24xx_i2c.c
index b8cfc69c6cc..9ca8d2ef283 100644
--- a/drivers/i2c/omap24xx_i2c.c
+++ b/drivers/i2c/omap24xx_i2c.c
@@ -39,6 +39,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <i2c.h>
 #include <log.h>
@@ -46,6 +47,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 #include <asm/io.h>
 #include <asm/omap_i2c.h>
diff --git a/drivers/i2c/rcar_i2c.c b/drivers/i2c/rcar_i2c.c
index 1fe207e7bc8..a3adefddff6 100644
--- a/drivers/i2c/rcar_i2c.c
+++ b/drivers/i2c/rcar_i2c.c
@@ -13,6 +13,7 @@
 
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <dm.h>
 #include <i2c.h>
 #include <asm/io.h>
@@ -21,6 +22,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #define RCAR_I2C_ICSCR			0x00 /* slave ctrl */
 #define RCAR_I2C_ICMCR			0x04 /* master ctrl */
diff --git a/drivers/i2c/rcar_iic.c b/drivers/i2c/rcar_iic.c
index 6899a68a847..37d86c9d950 100644
--- a/drivers/i2c/rcar_iic.c
+++ b/drivers/i2c/rcar_iic.c
@@ -11,6 +11,7 @@
 
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <dm.h>
 #include <i2c.h>
 #include <asm/io.h>
@@ -18,6 +19,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 struct rcar_iic_priv {
 	void __iomem		*base;
diff --git a/drivers/i2c/rk_i2c.c b/drivers/i2c/rk_i2c.c
index e430a790df0..b5ecf2fa776 100644
--- a/drivers/i2c/rk_i2c.c
+++ b/drivers/i2c/rk_i2c.c
@@ -12,6 +12,7 @@
 #include <errno.h>
 #include <i2c.h>
 #include <log.h>
+#include <stdbool.h>
 #include <time.h>
 #include <asm/io.h>
 #include <asm/arch-rockchip/clock.h>
@@ -22,6 +23,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/sizes.h>
+#include <linux/types.h>
 
 /* i2c timerout */
 #define I2C_TIMEOUT_MS		100
diff --git a/drivers/i2c/s3c24x0_i2c.c b/drivers/i2c/s3c24x0_i2c.c
index 6cc63b528dd..c7c489f68c9 100644
--- a/drivers/i2c/s3c24x0_i2c.c
+++ b/drivers/i2c/s3c24x0_i2c.c
@@ -22,6 +22,7 @@
 #include <asm/io.h>
 #include <i2c.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include "s3c24x0_i2c.h"
 
 #ifndef CONFIG_SYS_I2C_S3C24X0_SLAVE
diff --git a/drivers/i2c/s3c24x0_i2c.h b/drivers/i2c/s3c24x0_i2c.h
index 7a37b8071b6..cf438dfb3bd 100644
--- a/drivers/i2c/s3c24x0_i2c.h
+++ b/drivers/i2c/s3c24x0_i2c.h
@@ -7,6 +7,7 @@
 #define _S3C24X0_I2C_H
 
 #include <stdbool.h>
+#include <asm/types.h>
 struct s3c24x0_i2c {
 	u32	iiccon;
 	u32	iicstat;
diff --git a/drivers/i2c/sh_i2c.c b/drivers/i2c/sh_i2c.c
index 26a87006698..e664080d616 100644
--- a/drivers/i2c/sh_i2c.c
+++ b/drivers/i2c/sh_i2c.c
@@ -4,6 +4,7 @@
  * Copyright (C) 2011, 2013 Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
  *
  * NOTE: This driver should be converted to driver model before June 2017.
+#include <linux/types.h>
  * Please see doc/driver-model/i2c-howto.rst for instructions.
  */
 
diff --git a/drivers/i2c/soft_i2c.c b/drivers/i2c/soft_i2c.c
index db69c18cb6d..26f00766c08 100644
--- a/drivers/i2c/soft_i2c.c
+++ b/drivers/i2c/soft_i2c.c
@@ -12,6 +12,7 @@
  * Neil Russell.
  *
  * NOTE: This driver should be converted to driver model before June 2017.
+#include <linux/types.h>
  * Please see doc/driver-model/i2c-howto.rst for instructions.
  */
 
diff --git a/drivers/i2c/stm32f7_i2c.c b/drivers/i2c/stm32f7_i2c.c
index 94c0cf6f342..9de35125ce9 100644
--- a/drivers/i2c/stm32f7_i2c.c
+++ b/drivers/i2c/stm32f7_i2c.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <regmap.h>
 #include <reset.h>
+#include <stdbool.h>
 #include <syscon.h>
 #include <time.h>
 #include <linux/bitops.h>
@@ -18,6 +19,7 @@
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <dm/device.h>
 #include <linux/err.h>
diff --git a/drivers/i2c/tegra186_bpmp_i2c.c b/drivers/i2c/tegra186_bpmp_i2c.c
index c9446ed783f..a87e3b40ad5 100644
--- a/drivers/i2c/tegra186_bpmp_i2c.c
+++ b/drivers/i2c/tegra186_bpmp_i2c.c
@@ -14,6 +14,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/i2c/tegra_i2c.c b/drivers/i2c/tegra_i2c.c
index 5b05290224a..007ce2ef302 100644
--- a/drivers/i2c/tegra_i2c.c
+++ b/drivers/i2c/tegra_i2c.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <i2c.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <clk.h>
 #include <reset.h>
@@ -25,6 +26,7 @@
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 enum i2c_type {
 	TYPE_114,
diff --git a/drivers/i2c/xilinx_xiic.c b/drivers/i2c/xilinx_xiic.c
index aa86c630885..8771ffc4bad 100644
--- a/drivers/i2c/xilinx_xiic.c
+++ b/drivers/i2c/xilinx_xiic.c
@@ -11,12 +11,14 @@
 
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <dm.h>
 #include <i2c.h>
 #include <wait_bit.h>
 #include <asm/io.h>
 #include <dm/device_compat.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 struct xilinx_xiic_priv {
 	void __iomem		*base;
diff --git a/drivers/input/input.c b/drivers/input/input.c
index 4b54df8a871..afb94f84391 100644
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -12,6 +12,7 @@
 #include <env.h>
 #include <errno.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio_dev.h>
 #include <input.h>
 #ifdef CONFIG_DM_KEYBOARD
@@ -21,6 +22,7 @@
 #include <linux/input.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 enum {
 	/* These correspond to the lights on the keyboard */
diff --git a/drivers/input/key_matrix.c b/drivers/input/key_matrix.c
index 4742d575984..732adad2676 100644
--- a/drivers/input/key_matrix.c
+++ b/drivers/input/key_matrix.c
@@ -13,6 +13,7 @@
 #include <malloc.h>
 #include <linux/input.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /**
  * Determine if the current keypress configuration can cause key ghosting
diff --git a/drivers/input/tegra-kbc.c b/drivers/input/tegra-kbc.c
index af289c8badb..9bb1cd5e55b 100644
--- a/drivers/input/tegra-kbc.c
+++ b/drivers/input/tegra-kbc.c
@@ -18,6 +18,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/funcmux.h>
 #include <asm/arch-tegra/timer.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/input.h>
diff --git a/drivers/input/twl4030.c b/drivers/input/twl4030.c
index 3a1c46b3046..045de57abe9 100644
--- a/drivers/input/twl4030.c
+++ b/drivers/input/twl4030.c
@@ -6,6 +6,7 @@
  */
 
 #include <twl4030.h>
+#include <asm/types.h>
 
 int twl4030_input_power_button(void)
 {
diff --git a/drivers/input/twl6030.c b/drivers/input/twl6030.c
index 76bd3488fc6..2515ebffab6 100644
--- a/drivers/input/twl6030.c
+++ b/drivers/input/twl6030.c
@@ -6,6 +6,7 @@
  */
 
 #include <twl6030.h>
+#include <asm/types.h>
 
 int twl6030_input_power_button(void)
 {
diff --git a/drivers/led/led_bcm6328.c b/drivers/led/led_bcm6328.c
index 84f9a4ceca6..4888d0d3412 100644
--- a/drivers/led/led_bcm6328.c
+++ b/drivers/led/led_bcm6328.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <errno.h>
 #include <led.h>
@@ -12,6 +13,7 @@
 #include <asm/io.h>
 #include <dm/lists.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #define LEDS_MAX			24
 
diff --git a/drivers/led/led_bcm6358.c b/drivers/led/led_bcm6358.c
index f8fdfcc23de..d52badc0951 100644
--- a/drivers/led/led_bcm6358.c
+++ b/drivers/led/led_bcm6358.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <errno.h>
 #include <led.h>
@@ -13,6 +14,7 @@
 #include <dm/lists.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #define LEDS_MAX		32
 #define LEDS_WAIT		100
diff --git a/drivers/led/led_bcm6858.c b/drivers/led/led_bcm6858.c
index b44232773b6..ec5bd532e00 100644
--- a/drivers/led/led_bcm6858.c
+++ b/drivers/led/led_bcm6858.c
@@ -8,11 +8,13 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <errno.h>
 #include <led.h>
 #include <log.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <dm/lists.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
diff --git a/drivers/mailbox/k3-sec-proxy.c b/drivers/mailbox/k3-sec-proxy.c
index c2c77b64244..1259fa4fb5b 100644
--- a/drivers/mailbox/k3-sec-proxy.c
+++ b/drivers/mailbox/k3-sec-proxy.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <log.h>
 #include <malloc.h>
 #include <stdio.h>
diff --git a/drivers/mailbox/mailbox-uclass.c b/drivers/mailbox/mailbox-uclass.c
index 233fa4f715f..e081e808ab4 100644
--- a/drivers/mailbox/mailbox-uclass.c
+++ b/drivers/mailbox/mailbox-uclass.c
@@ -11,6 +11,7 @@
 #include <malloc.h>
 #include <time.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 static inline struct mbox_ops *mbox_dev_ops(struct udevice *dev)
 {
diff --git a/drivers/mailbox/sandbox-mbox-test.c b/drivers/mailbox/sandbox-mbox-test.c
index faca8fcc441..0fd650c7812 100644
--- a/drivers/mailbox/sandbox-mbox-test.c
+++ b/drivers/mailbox/sandbox-mbox-test.c
@@ -8,6 +8,7 @@
 #include <mailbox.h>
 #include <malloc.h>
 #include <asm/io.h>
+#include <linux/types.h>
 
 struct sandbox_mbox_test {
 	struct mbox_chan chan;
diff --git a/drivers/mailbox/sandbox-mbox.c b/drivers/mailbox/sandbox-mbox.c
index 27d2b7b9976..0336d0dc4bd 100644
--- a/drivers/mailbox/sandbox-mbox.c
+++ b/drivers/mailbox/sandbox-mbox.c
@@ -12,6 +12,7 @@
 #include <asm/io.h>
 #include <asm/mbox.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #define SANDBOX_MBOX_CHANNELS 2
 
diff --git a/drivers/mailbox/stm32-ipcc.c b/drivers/mailbox/stm32-ipcc.c
index 0c72f5e7c3d..c5ec800abf7 100644
--- a/drivers/mailbox/stm32-ipcc.c
+++ b/drivers/mailbox/stm32-ipcc.c
@@ -5,11 +5,13 @@
 
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
 #include <mailbox-uclass.h>
 #include <malloc.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
diff --git a/drivers/mailbox/tegra-hsp.c b/drivers/mailbox/tegra-hsp.c
index 4b71e3ca7ef..7f287370a85 100644
--- a/drivers/mailbox/tegra-hsp.c
+++ b/drivers/mailbox/tegra-hsp.c
@@ -12,6 +12,7 @@
 #include <dt-bindings/mailbox/tegra186-hsp.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #define TEGRA_HSP_INT_DIMENSIONING		0x380
 #define TEGRA_HSP_INT_DIMENSIONING_NSI_SHIFT	16
diff --git a/drivers/mailbox/zynqmp-ipi.c b/drivers/mailbox/zynqmp-ipi.c
index ef8c93fa460..864a64c3cc2 100644
--- a/drivers/mailbox/zynqmp-ipi.c
+++ b/drivers/mailbox/zynqmp-ipi.c
@@ -6,12 +6,14 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <log.h>
 #include <asm/io.h>
 #include <dm.h>
 #include <mailbox-uclass.h>
 #include <dm/device_compat.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <mach/sys_proto.h>
 #include <linux/ioport.h>
 #include <linux/io.h>
diff --git a/drivers/misc/ali512x.c b/drivers/misc/ali512x.c
index e714e28bdc3..ee9a156c1a2 100644
--- a/drivers/misc/ali512x.c
+++ b/drivers/misc/ali512x.c
@@ -14,6 +14,7 @@
  */
 
 #include <config.h>
+#include <asm/types.h>
 
 #include <common.h>
 #include <asm/io.h>
diff --git a/drivers/misc/altera_sysid.c b/drivers/misc/altera_sysid.c
index 600315be5ea..2769b3953aa 100644
--- a/drivers/misc/altera_sysid.c
+++ b/drivers/misc/altera_sysid.c
@@ -12,6 +12,7 @@
 #include <stdio.h>
 #include <linux/time.h>
 #include <asm/io.h>
+#include <linux/types.h>
 
 struct altera_sysid_regs {
 	u32	id;		/* The system build id */
diff --git a/drivers/misc/atsha204a-i2c.c b/drivers/misc/atsha204a-i2c.c
index 2df8d1070c0..c2aa6d15330 100644
--- a/drivers/misc/atsha204a-i2c.c
+++ b/drivers/misc/atsha204a-i2c.c
@@ -21,6 +21,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <u-boot/crc.h>
 
 #define ATSHA204A_TWLO			60
diff --git a/drivers/misc/cbmem_console.c b/drivers/misc/cbmem_console.c
index dfa99175d3d..bdc62cba787 100644
--- a/drivers/misc/cbmem_console.c
+++ b/drivers/misc/cbmem_console.c
@@ -4,10 +4,12 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <console.h>
 #ifndef CONFIG_SYS_COREBOOT
 #error This driver requires coreboot
 #endif
+#include <asm/types.h>
 #include <linux/string.h>
 
 #include <asm/arch/sysinfo.h>
diff --git a/drivers/misc/cros_ec.c b/drivers/misc/cros_ec.c
index 7979989e1a6..21ea2242c65 100644
--- a/drivers/misc/cros_ec.c
+++ b/drivers/misc/cros_ec.c
@@ -25,6 +25,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <spi.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <linux/delay.h>
@@ -36,6 +37,7 @@
 #include <dm/uclass-internal.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #ifdef DEBUG_TRACE
 #define debug_trace(fmt, b...)	debug(fmt, #b)
diff --git a/drivers/misc/cros_ec_i2c.c b/drivers/misc/cros_ec_i2c.c
index 2118afee76a..2a37b8e4bb6 100644
--- a/drivers/misc/cros_ec_i2c.c
+++ b/drivers/misc/cros_ec_i2c.c
@@ -13,6 +13,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <i2c.h>
 #include <cros_ec.h>
@@ -21,6 +22,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #ifdef DEBUG_TRACE
 #define debug_trace(fmt, b...)	debug(fmt, #b)
diff --git a/drivers/misc/cros_ec_lpc.c b/drivers/misc/cros_ec_lpc.c
index 6c9c9593a7c..722fc59040d 100644
--- a/drivers/misc/cros_ec_lpc.c
+++ b/drivers/misc/cros_ec_lpc.c
@@ -21,6 +21,7 @@
 #include <time.h>
 #include <asm/io.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #ifdef DEBUG_TRACE
 #define debug_trace(fmt, b...)	debug(fmt, ##b)
diff --git a/drivers/misc/cros_ec_sandbox.c b/drivers/misc/cros_ec_sandbox.c
index b3282243243..1fba1abfb92 100644
--- a/drivers/misc/cros_ec_sandbox.c
+++ b/drivers/misc/cros_ec_sandbox.c
@@ -13,11 +13,13 @@
 #include <hash.h>
 #include <log.h>
 #include <os.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <u-boot/sha256.h>
 #include <spi.h>
 #include <asm/malloc.h>
diff --git a/drivers/misc/cros_ec_spi.c b/drivers/misc/cros_ec_spi.c
index 3c3db889d61..532c48ef8b8 100644
--- a/drivers/misc/cros_ec_spi.c
+++ b/drivers/misc/cros_ec_spi.c
@@ -23,6 +23,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 int cros_ec_spi_packet(struct udevice *udev, int out_bytes, int in_bytes)
 {
diff --git a/drivers/misc/ds4510.c b/drivers/misc/ds4510.c
index 8d3a690aa1b..ad024bbd7be 100644
--- a/drivers/misc/ds4510.c
+++ b/drivers/misc/ds4510.c
@@ -16,6 +16,7 @@
 #include <linux/delay.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "ds4510.h"
 
 enum {
diff --git a/drivers/misc/fs_loader.c b/drivers/misc/fs_loader.c
index a4d048afd7f..d03279a4c4d 100644
--- a/drivers/misc/fs_loader.c
+++ b/drivers/misc/fs_loader.c
@@ -17,6 +17,7 @@
 #include <mapmem.h>
 #include <malloc.h>
 #include <spl.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/misc/fsl_devdis.c b/drivers/misc/fsl_devdis.c
index abd20b4d61f..9c7f4ab314c 100644
--- a/drivers/misc/fsl_devdis.c
+++ b/drivers/misc/fsl_devdis.c
@@ -4,12 +4,14 @@
  * Author: Zhuoyu Zhang <Zhuoyu.Zhang@freescale.com>
  */
 #include <common.h>
+#include <compiler.h>
 #include <asm/io.h>
 #include <asm/arch-ls102xa/immap_ls102xa.h>
 #include <asm/arch-ls102xa/config.h>
 #include <linux/compiler.h>
 #include <hwconfig.h>
 #include <fsl_devdis.h>
+#include <linux/types.h>
 
 void device_disable(const struct devdis_table *tbl, uint32_t num)
 {
diff --git a/drivers/misc/fsl_ifc.c b/drivers/misc/fsl_ifc.c
index 1716cf21299..7e633fd7748 100644
--- a/drivers/misc/fsl_ifc.c
+++ b/drivers/misc/fsl_ifc.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <fsl_ifc.h>
 #include <part.h>
 #include <stdio.h>
diff --git a/drivers/misc/fsl_iim.c b/drivers/misc/fsl_iim.c
index 07c7a492081..6b781d73509 100644
--- a/drivers/misc/fsl_iim.c
+++ b/drivers/misc/fsl_iim.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <fuse.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/io.h>
diff --git a/drivers/misc/fsl_portals.c b/drivers/misc/fsl_portals.c
index ed1e2cf420d..c04c3478528 100644
--- a/drivers/misc/fsl_portals.c
+++ b/drivers/misc/fsl_portals.c
@@ -5,9 +5,11 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <log.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
diff --git a/drivers/misc/fsl_sec_mon.c b/drivers/misc/fsl_sec_mon.c
index 62691068bb4..ae7e8e671a1 100644
--- a/drivers/misc/fsl_sec_mon.c
+++ b/drivers/misc/fsl_sec_mon.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <fsl_sec_mon.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 
diff --git a/drivers/misc/gdsys_ioep.c b/drivers/misc/gdsys_ioep.c
index ebcd4d91e89..f0f4311436e 100644
--- a/drivers/misc/gdsys_ioep.c
+++ b/drivers/misc/gdsys_ioep.c
@@ -19,6 +19,7 @@
 #include <stdbool.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "gdsys_ioep.h"
 
diff --git a/drivers/misc/gdsys_ioep.h b/drivers/misc/gdsys_ioep.h
index f195388edaf..2f90ca75201 100644
--- a/drivers/misc/gdsys_ioep.h
+++ b/drivers/misc/gdsys_ioep.h
@@ -8,6 +8,8 @@
 #define __GDSYS_IOEP_H_
 
 /**
+#include <compiler.h>
+#include <asm/types.h>
  * struct io_generic_packet - header structure for GDSYS IOEP packets
  * @target_address:     Target protocol address of the packet.
  * @source_address:     Source protocol address of the packet.
diff --git a/drivers/misc/gdsys_rxaui_ctrl.c b/drivers/misc/gdsys_rxaui_ctrl.c
index 7cc350d3cc9..f30da6a7e6a 100644
--- a/drivers/misc/gdsys_rxaui_ctrl.c
+++ b/drivers/misc/gdsys_rxaui_ctrl.c
@@ -12,6 +12,7 @@
 #include <regmap.h>
 #include <misc.h>
 #include <stdbool.h>
+#include <asm/types.h>
 
 struct gdsys_rxaui_ctrl_regs {
 	u16 gen_cnt;
diff --git a/drivers/misc/i2c_eeprom.c b/drivers/misc/i2c_eeprom.c
index 0e1ba165f91..8af5842ab96 100644
--- a/drivers/misc/i2c_eeprom.c
+++ b/drivers/misc/i2c_eeprom.c
@@ -13,6 +13,7 @@
 #include <dm/device-internal.h>
 #include <i2c.h>
 #include <i2c_eeprom.h>
+#include <linux/types.h>
 
 struct i2c_eeprom_drv_data {
 	u32 size; /* size in bytes */
diff --git a/drivers/misc/i2c_eeprom_emul.c b/drivers/misc/i2c_eeprom_emul.c
index e7f9ccdf848..e2a90268304 100644
--- a/drivers/misc/i2c_eeprom_emul.c
+++ b/drivers/misc/i2c_eeprom_emul.c
@@ -15,6 +15,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #ifdef DEBUG
 #define debug_buffer print_buffer
diff --git a/drivers/misc/ihs_fpga.c b/drivers/misc/ihs_fpga.c
index fd9c0f937ff..29e875d7ef0 100644
--- a/drivers/misc/ihs_fpga.c
+++ b/drivers/misc/ihs_fpga.c
@@ -20,6 +20,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "ihs_fpga.h"
 
diff --git a/drivers/misc/ihs_fpga.h b/drivers/misc/ihs_fpga.h
index efb5dabb9c9..9541bbec12e 100644
--- a/drivers/misc/ihs_fpga.h
+++ b/drivers/misc/ihs_fpga.h
@@ -5,6 +5,7 @@
  */
 
 /**
+#include <asm/types.h>
  * struct ihs_fpga_regs - IHS FPGA register map structure
  * @reflection_low:	  Lower reflection register
  * @versions:		  PCB versions register
diff --git a/drivers/misc/imx8/fuse.c b/drivers/misc/imx8/fuse.c
index c3a7d3a40b3..b786c2f669f 100644
--- a/drivers/misc/imx8/fuse.c
+++ b/drivers/misc/imx8/fuse.c
@@ -11,6 +11,7 @@
 #include <asm/arch/sci/sci.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <linux/arm-smccc.h>
 #include <linux/errno.h>
 
diff --git a/drivers/misc/imx8/scu.c b/drivers/misc/imx8/scu.c
index 74cab629482..f87adb65cc9 100644
--- a/drivers/misc/imx8/scu.c
+++ b/drivers/misc/imx8/scu.c
@@ -11,6 +11,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm.h>
+#include <asm/types.h>
 #include <dm/lists.h>
 #include <dm/root.h>
 #include <dm/device-internal.h>
diff --git a/drivers/misc/imx8/scu_api.c b/drivers/misc/imx8/scu_api.c
index bc0d8f7ae5c..6164085b3c5 100644
--- a/drivers/misc/imx8/scu_api.c
+++ b/drivers/misc/imx8/scu_api.c
@@ -14,6 +14,7 @@
 #include <dm.h>
 #include <asm/arch/sci/sci.h>
 #include <misc.h>
+#include <asm/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/misc/irq-uclass.c b/drivers/misc/irq-uclass.c
index 3795f5eaa1b..ed9f04c7847 100644
--- a/drivers/misc/irq-uclass.c
+++ b/drivers/misc/irq-uclass.c
@@ -14,6 +14,7 @@
 #include <stdbool.h>
 #include <dm/device-internal.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 int irq_route_pmc_gpio_gpe(struct udevice *dev, uint pmc_gpe_num)
 {
diff --git a/drivers/misc/irq_sandbox.c b/drivers/misc/irq_sandbox.c
index 625aa140651..a1ec1197f0b 100644
--- a/drivers/misc/irq_sandbox.c
+++ b/drivers/misc/irq_sandbox.c
@@ -12,6 +12,7 @@
 #include <acpi/acpi_device.h>
 #include <asm/test.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 /**
  * struct sandbox_irq_priv - private data for this driver
diff --git a/drivers/misc/jz4780_efuse.c b/drivers/misc/jz4780_efuse.c
index 1fba3271db6..d1151495d96 100644
--- a/drivers/misc/jz4780_efuse.c
+++ b/drivers/misc/jz4780_efuse.c
@@ -7,10 +7,12 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <asm/io.h>
 #include <asm/unaligned.h>
 #include <errno.h>
 #include <linux/bitops.h>
+#include <linux/types.h>
 #include <mach/jz4780.h>
 #include <wait_bit.h>
 
diff --git a/drivers/misc/k3_avs.c b/drivers/misc/k3_avs.c
index 621ce8b28d9..b951026fc23 100644
--- a/drivers/misc/k3_avs.c
+++ b/drivers/misc/k3_avs.c
@@ -18,6 +18,7 @@
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <power/regulator.h>
 
 #define AM6_VTM_DEVINFO(i)	(priv->base + 0x100 + 0x20 * (i))
diff --git a/drivers/misc/k3_esm.c b/drivers/misc/k3_esm.c
index 82aa2545c08..1974c9f3a78 100644
--- a/drivers/misc/k3_esm.c
+++ b/drivers/misc/k3_esm.c
@@ -8,9 +8,11 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <errno.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
diff --git a/drivers/misc/microchip_flexcom.c b/drivers/misc/microchip_flexcom.c
index 0886fbdd865..fae073303d5 100644
--- a/drivers/misc/microchip_flexcom.c
+++ b/drivers/misc/microchip_flexcom.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <misc.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/err.h>
 #include <linux/errno.h>
 
diff --git a/drivers/misc/misc_sandbox.c b/drivers/misc/misc_sandbox.c
index 0149e8d9a79..2703ac4f117 100644
--- a/drivers/misc/misc_sandbox.c
+++ b/drivers/misc/misc_sandbox.c
@@ -10,6 +10,7 @@
 #include <stdbool.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 struct misc_sandbox_priv {
 	u8 mem[128];
diff --git a/drivers/misc/mpc83xx_serdes.c b/drivers/misc/mpc83xx_serdes.c
index 0f182de1568..f74004e75b7 100644
--- a/drivers/misc/mpc83xx_serdes.c
+++ b/drivers/misc/mpc83xx_serdes.c
@@ -15,6 +15,7 @@
 #include <mapmem.h>
 #include <misc.h>
 #include <stdbool.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/string.h>
diff --git a/drivers/misc/mpc83xx_serdes.h b/drivers/misc/mpc83xx_serdes.h
index 2a13c5892bf..1a2e094d217 100644
--- a/drivers/misc/mpc83xx_serdes.h
+++ b/drivers/misc/mpc83xx_serdes.h
@@ -5,6 +5,7 @@
  */
 
 /**
+#include <asm/types.h>
  * enum srdscr0_mask - Bit masks for SRDSCR0 (SerDes Control Register 0)
  * @SRDSCR0_DPPA:       Bitmask for the DPPA (diff pk-pk swing for lane A)
  *			field of the SRCSCR0
diff --git a/drivers/misc/mxc_ocotp.c b/drivers/misc/mxc_ocotp.c
index cce6cb72c5e..a3fa6066599 100644
--- a/drivers/misc/mxc_ocotp.c
+++ b/drivers/misc/mxc_ocotp.c
@@ -15,6 +15,7 @@
 #include <fuse.h>
 #include <stdbool.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/io.h>
diff --git a/drivers/misc/mxs_ocotp.c b/drivers/misc/mxs_ocotp.c
index ede9d9e7423..982cdb66cc1 100644
--- a/drivers/misc/mxs_ocotp.c
+++ b/drivers/misc/mxs_ocotp.c
@@ -21,6 +21,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/types.h>
 
 #define MXS_OCOTP_TIMEOUT	100000
 
diff --git a/drivers/misc/p2sb-uclass.c b/drivers/misc/p2sb-uclass.c
index eea0e0f528f..4d3a3966088 100644
--- a/drivers/misc/p2sb-uclass.c
+++ b/drivers/misc/p2sb-uclass.c
@@ -13,10 +13,12 @@
 #include <mapmem.h>
 #include <p2sb.h>
 #include <spl.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <dm/uclass-internal.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #define PCR_COMMON_IOSF_1_0	1
 
diff --git a/drivers/misc/p2sb_emul.c b/drivers/misc/p2sb_emul.c
index ae68cd9c71a..5a74d6acbe0 100644
--- a/drivers/misc/p2sb_emul.c
+++ b/drivers/misc/p2sb_emul.c
@@ -18,6 +18,7 @@
 #include <p2sb.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 /**
  * struct p2sb_emul_platdata - platform data for this device
diff --git a/drivers/misc/p2sb_sandbox.c b/drivers/misc/p2sb_sandbox.c
index ce50a9732ee..546fa748256 100644
--- a/drivers/misc/p2sb_sandbox.c
+++ b/drivers/misc/p2sb_sandbox.c
@@ -11,6 +11,7 @@
 #include <dm.h>
 #include <asm/io.h>
 #include <p2sb.h>
+#include <linux/types.h>
 
 struct sandbox_p2sb_priv {
 	ulong base;
diff --git a/drivers/misc/pca9551_led.c b/drivers/misc/pca9551_led.c
index 312192fd62d..f3807397fa4 100644
--- a/drivers/misc/pca9551_led.c
+++ b/drivers/misc/pca9551_led.c
@@ -7,6 +7,7 @@
 #include <errno.h>
 #include <i2c.h>
 #include <status_led.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 
 #ifndef CONFIG_PCA9551_I2C_ADDR
diff --git a/drivers/misc/qfw.c b/drivers/misc/qfw.c
index cd845a71bf6..0669a8d7348 100644
--- a/drivers/misc/qfw.c
+++ b/drivers/misc/qfw.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <qfw.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/io.h>
 #ifdef CONFIG_GENERATE_ACPI_TABLE
@@ -18,6 +19,7 @@
 #include <linux/kernel.h>
 #include <linux/list.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static bool fwcfg_present;
 static bool fwcfg_dma_present;
diff --git a/drivers/misc/rockchip-efuse.c b/drivers/misc/rockchip-efuse.c
index ad825e940f1..41239004174 100644
--- a/drivers/misc/rockchip-efuse.c
+++ b/drivers/misc/rockchip-efuse.c
@@ -7,11 +7,13 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <stdio.h>
 #include <asm/io.h>
 #include <command.h>
 #include <display_options.h>
 #include <dm.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <misc.h>
diff --git a/drivers/misc/rockchip-otp.c b/drivers/misc/rockchip-otp.c
index 6f438c41df5..585a90f61dc 100644
--- a/drivers/misc/rockchip-otp.c
+++ b/drivers/misc/rockchip-otp.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <asm/io.h>
@@ -13,6 +14,7 @@
 #include <linux/delay.h>
 #include <misc.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 /* OTP Register Offsets */
 #define OTPC_SBPI_CTRL			0x0020
diff --git a/drivers/misc/sandbox_adder.c b/drivers/misc/sandbox_adder.c
index df262e62555..4f53d6b0230 100644
--- a/drivers/misc/sandbox_adder.c
+++ b/drivers/misc/sandbox_adder.c
@@ -13,6 +13,7 @@
 #include <misc.h>
 #include <p2sb.h>
 #include <asm/io.h>
+#include <linux/types.h>
 
 struct sandbox_adder_priv {
 	ulong base;
diff --git a/drivers/misc/sifive-otp.c b/drivers/misc/sifive-otp.c
index 97cb40b542c..0a94658a7fd 100644
--- a/drivers/misc/sifive-otp.c
+++ b/drivers/misc/sifive-otp.c
@@ -18,7 +18,9 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <dm/device.h>
 #include <dm/read.h>
 #include <linux/bitops.h>
diff --git a/drivers/misc/smsc_lpc47m.c b/drivers/misc/smsc_lpc47m.c
index bda064f1365..e6ee39d5c93 100644
--- a/drivers/misc/smsc_lpc47m.c
+++ b/drivers/misc/smsc_lpc47m.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <asm/io.h>
 #include <asm/pnp_def.h>
+#include <linux/types.h>
 
 static void pnp_enter_conf_state(u16 dev)
 {
diff --git a/drivers/misc/smsc_sio1007.c b/drivers/misc/smsc_sio1007.c
index 9fe6a18f59e..01a97dd5cce 100644
--- a/drivers/misc/smsc_sio1007.c
+++ b/drivers/misc/smsc_sio1007.c
@@ -7,6 +7,7 @@
 #include <asm/io.h>
 #include <errno.h>
 #include <smsc_sio1007.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 
 static inline u8 sio1007_read(int port, int reg)
diff --git a/drivers/misc/spltest_sandbox.c b/drivers/misc/spltest_sandbox.c
index 1bb4120a06d..511dd9970de 100644
--- a/drivers/misc/spltest_sandbox.c
+++ b/drivers/misc/spltest_sandbox.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <dt-structs.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <linux/kernel.h>
 
diff --git a/drivers/misc/status_led.c b/drivers/misc/status_led.c
index a6e9c03a02e..6720886e14e 100644
--- a/drivers/misc/status_led.c
+++ b/drivers/misc/status_led.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <status_led.h>
+#include <linux/types.h>
 
 /*
  * The purpose of this code is to signal the operational status of a
diff --git a/drivers/misc/stm32_rcc.c b/drivers/misc/stm32_rcc.c
index 9a03679d21a..d5e6f801623 100644
--- a/drivers/misc/stm32_rcc.c
+++ b/drivers/misc/stm32_rcc.c
@@ -13,6 +13,7 @@
 #include <dm/device_compat.h>
 #include <dm/lists.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 struct stm32_rcc_clk stm32_rcc_clk_f42x = {
 	.drv_name = "stm32fx_rcc_clock",
diff --git a/drivers/misc/stm32mp_fuse.c b/drivers/misc/stm32mp_fuse.c
index 2d8c43b123f..1e2d8df75dc 100644
--- a/drivers/misc/stm32mp_fuse.c
+++ b/drivers/misc/stm32mp_fuse.c
@@ -9,6 +9,7 @@
 #include <misc.h>
 #include <errno.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <dm/device.h>
 #include <dm/uclass.h>
 #include <linux/errno.h>
diff --git a/drivers/misc/swap_case.c b/drivers/misc/swap_case.c
index fa3ed8671c2..566e076eb50 100644
--- a/drivers/misc/swap_case.c
+++ b/drivers/misc/swap_case.c
@@ -15,6 +15,7 @@
 #include <linux/ctype.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 /**
  * struct swap_case_platdata - platform data for this device
diff --git a/drivers/misc/tegra186_bpmp.c b/drivers/misc/tegra186_bpmp.c
index 96913285927..dad726a1b47 100644
--- a/drivers/misc/tegra186_bpmp.c
+++ b/drivers/misc/tegra186_bpmp.c
@@ -21,6 +21,7 @@
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define BPMP_IVC_FRAME_COUNT 1
 #define BPMP_IVC_FRAME_SIZE 128
diff --git a/drivers/misc/vexpress_config.c b/drivers/misc/vexpress_config.c
index 3a74ffcadda..f72780f96b8 100644
--- a/drivers/misc/vexpress_config.c
+++ b/drivers/misc/vexpress_config.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <malloc.h>
 #include <stdbool.h>
+#include <asm/types.h>
 #include <dm/read.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
diff --git a/drivers/misc/winbond_w83627.c b/drivers/misc/winbond_w83627.c
index 3838b3f74f4..c3c331bc1cf 100644
--- a/drivers/misc/winbond_w83627.c
+++ b/drivers/misc/winbond_w83627.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <asm/io.h>
 #include <asm/pnp_def.h>
+#include <linux/types.h>
 
 #define WINBOND_ENTRY_KEY	0x87
 #define WINBOND_EXIT_KEY	0xaa
diff --git a/drivers/mmc/am654_sdhci.c b/drivers/mmc/am654_sdhci.c
index a8d1e9d7bbb..430a4d6d6cc 100644
--- a/drivers/mmc/am654_sdhci.c
+++ b/drivers/mmc/am654_sdhci.c
@@ -12,11 +12,13 @@
 #include <power-domain.h>
 #include <regmap.h>
 #include <sdhci.h>
+#include <stdbool.h>
 #include <time.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 /* CTL_CFG Registers */
 #define CTL_CFG_2		0x14
diff --git a/drivers/mmc/arm_pl180_mmci.h b/drivers/mmc/arm_pl180_mmci.h
index 61ee96a112d..c068dc086cc 100644
--- a/drivers/mmc/arm_pl180_mmci.h
+++ b/drivers/mmc/arm_pl180_mmci.h
@@ -12,6 +12,7 @@
 #ifndef __ARM_PL180_MMCI_H__
 #define __ARM_PL180_MMCI_H__
 
+#include <asm/types.h>
 /* need definition of struct mmc_config */
 #include <mmc.h>
 
diff --git a/drivers/mmc/aspeed_sdhci.c b/drivers/mmc/aspeed_sdhci.c
index 543c65a8e35..c48cfae42e0 100644
--- a/drivers/mmc/aspeed_sdhci.c
+++ b/drivers/mmc/aspeed_sdhci.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <malloc.h>
 #include <sdhci.h>
+#include <asm/types.h>
 #include <linux/err.h>
 
 struct aspeed_sdhci_plat {
diff --git a/drivers/mmc/atmel_sdhci.c b/drivers/mmc/atmel_sdhci.c
index cb838a398a6..0022aebf829 100644
--- a/drivers/mmc/atmel_sdhci.c
+++ b/drivers/mmc/atmel_sdhci.c
@@ -12,6 +12,7 @@
 #include <stdio.h>
 #include <asm/arch/clk.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 
 #define ATMEL_SDHC_MIN_FREQ	400000
diff --git a/drivers/mmc/bcm2835_sdhci.c b/drivers/mmc/bcm2835_sdhci.c
index ac1a421cd3e..05756170d3b 100644
--- a/drivers/mmc/bcm2835_sdhci.c
+++ b/drivers/mmc/bcm2835_sdhci.c
@@ -46,6 +46,7 @@
 #include <asm/arch/msg.h>
 #include <asm/arch/mbox.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <mach/sdhci.h>
 #include <mach/timer.h>
 
diff --git a/drivers/mmc/bcm2835_sdhost.c b/drivers/mmc/bcm2835_sdhost.c
index 315a829f205..12029be39a0 100644
--- a/drivers/mmc/bcm2835_sdhost.c
+++ b/drivers/mmc/bcm2835_sdhost.c
@@ -31,8 +31,10 @@
  */
 #include <clk.h>
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <mmc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <asm/arch/msg.h>
@@ -48,6 +50,7 @@
 #include <linux/iopoll.h>
 #include <linux/kernel.h>
 #include <linux/sizes.h>
+#include <linux/types.h>
 #include <mach/gpio.h>
 #include <power/regulator.h>
 
diff --git a/drivers/mmc/ca_dw_mmc.c b/drivers/mmc/ca_dw_mmc.c
index fcb2700a7a8..745829790dc 100644
--- a/drivers/mmc/ca_dw_mmc.c
+++ b/drivers/mmc/ca_dw_mmc.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dwmmc.h>
 #include <fdtdec.h>
 #include <asm/global_data.h>
@@ -15,6 +16,7 @@
 #include <dm.h>
 #include <mapmem.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define SD_CLK_SEL_MASK (0x3)
 #define SD_DLL_DEFAULT  (0x143000)
diff --git a/drivers/mmc/davinci_mmc.c b/drivers/mmc/davinci_mmc.c
index f8dc47bc239..1f0177b26ba 100644
--- a/drivers/mmc/davinci_mmc.c
+++ b/drivers/mmc/davinci_mmc.c
@@ -21,6 +21,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define WATCHDOG_COUNT		(100000)
 
diff --git a/drivers/mmc/dw_mmc.c b/drivers/mmc/dw_mmc.c
index ade5dbe4721..7d461bc315e 100644
--- a/drivers/mmc/dw_mmc.c
+++ b/drivers/mmc/dw_mmc.c
@@ -21,6 +21,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include <power/regulator.h>
 
 #define PAGE_SIZE 4096
diff --git a/drivers/mmc/exynos_dw_mmc.c b/drivers/mmc/exynos_dw_mmc.c
index 9fcb416b042..3a764d50e1d 100644
--- a/drivers/mmc/exynos_dw_mmc.c
+++ b/drivers/mmc/exynos_dw_mmc.c
@@ -20,6 +20,7 @@
 #include <asm/arch/power.h>
 #include <asm/gpio.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 #define	DWMMC_MAX_CH_NUM		4
 #define	DWMMC_MAX_FREQ			52000000
diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c
index 0fb2d505c15..da7c0cce8a4 100644
--- a/drivers/mmc/fsl_esdhc.c
+++ b/drivers/mmc/fsl_esdhc.c
@@ -9,6 +9,7 @@
  * Kyle Harris, Nexus Technologies, Inc. kharris at nexus-tech.net
  */
 
+#include <compiler.h>
 #include <config.h>
 #include <common.h>
 #include <command.h>
@@ -20,6 +21,7 @@
 #include <malloc.h>
 #include <fsl_esdhc.h>
 #include <fdt_support.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <vsprintf.h>
@@ -33,6 +35,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/mmc/fsl_esdhc_imx.c b/drivers/mmc/fsl_esdhc_imx.c
index 995fa6fefd8..67f333ebf0a 100644
--- a/drivers/mmc/fsl_esdhc_imx.c
+++ b/drivers/mmc/fsl_esdhc_imx.c
@@ -10,6 +10,7 @@
  * Kyle Harris, Nexus Technologies, Inc. kharris at nexus-tech.net
  */
 
+#include <compiler.h>
 #include <config.h>
 #include <common.h>
 #include <command.h>
@@ -33,6 +34,7 @@
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <power/regulator.h>
 #include <malloc.h>
 #include <fsl_esdhc_imx.h>
diff --git a/drivers/mmc/fsl_esdhc_spl.c b/drivers/mmc/fsl_esdhc_spl.c
index 3359d67fafa..0f17058e9f1 100644
--- a/drivers/mmc/fsl_esdhc_spl.c
+++ b/drivers/mmc/fsl_esdhc_spl.c
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /*
  * The environment variables are written to just after the u-boot image
diff --git a/drivers/mmc/ftsdc010_mci.c b/drivers/mmc/ftsdc010_mci.c
index cc0348d4663..da81fb6343d 100644
--- a/drivers/mmc/ftsdc010_mci.c
+++ b/drivers/mmc/ftsdc010_mci.c
@@ -11,10 +11,12 @@
 
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <log.h>
 #include <malloc.h>
 #include <part.h>
 #include <mmc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <asm/global_data.h>
@@ -24,6 +26,7 @@
 #include <asm/byteorder.h>
 #include <faraday/ftsdc010.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "ftsdc010_mci.h"
 #include <dm.h>
 #include <dt-structs.h>
diff --git a/drivers/mmc/ftsdc010_mci.h b/drivers/mmc/ftsdc010_mci.h
index 2c487b4176d..885ec8f8e1b 100644
--- a/drivers/mmc/ftsdc010_mci.h
+++ b/drivers/mmc/ftsdc010_mci.h
@@ -5,8 +5,10 @@
  * Copyright (C) 2011 Andes Technology Corporation
  * Macpaul Lin, Andes Technology Corporation <macpaul@andestech.com>
  */
+#include <compiler.h>
 #include <mmc.h>
 #include <stdbool.h>
+#include <linux/types.h>
 
 #ifndef __FTSDC010_MCI_H
 #define __FTSDC010_MCI_H
diff --git a/drivers/mmc/gen_atmel_mci.c b/drivers/mmc/gen_atmel_mci.c
index 4b1869ae65c..799d17e5871 100644
--- a/drivers/mmc/gen_atmel_mci.c
+++ b/drivers/mmc/gen_atmel_mci.c
@@ -24,6 +24,7 @@
 #include <asm/arch/clk.h>
 #include <asm/arch/hardware.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include "atmel_mci.h"
 
 #ifndef CONFIG_SYS_MMC_CLK_OD
diff --git a/drivers/mmc/hi6220_dw_mmc.c b/drivers/mmc/hi6220_dw_mmc.c
index b3a8c5d50d8..f1b94b8958f 100644
--- a/drivers/mmc/hi6220_dw_mmc.c
+++ b/drivers/mmc/hi6220_dw_mmc.c
@@ -12,6 +12,7 @@
 #include <malloc.h>
 #include <stdbool.h>
 #include <asm/global_data.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/mmc/iproc_sdhci.c b/drivers/mmc/iproc_sdhci.c
index 216538d435a..60b6cd0bfdc 100644
--- a/drivers/mmc/iproc_sdhci.c
+++ b/drivers/mmc/iproc_sdhci.c
@@ -11,6 +11,7 @@
 #include <sdhci.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/string.h>
diff --git a/drivers/mmc/jz_mmc.c b/drivers/mmc/jz_mmc.c
index c8c7127cbe8..495f1edd5b5 100644
--- a/drivers/mmc/jz_mmc.c
+++ b/drivers/mmc/jz_mmc.c
@@ -7,10 +7,12 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <malloc.h>
 #include <mmc.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <asm/unaligned.h>
 #include <errno.h>
 #include <dm/device_compat.h>
diff --git a/drivers/mmc/kona_sdhci.c b/drivers/mmc/kona_sdhci.c
index dc7a203f1f0..9f79851f80a 100644
--- a/drivers/mmc/kona_sdhci.c
+++ b/drivers/mmc/kona_sdhci.c
@@ -7,6 +7,7 @@
 #include <malloc.h>
 #include <sdhci.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/kona-common/clk.h>
diff --git a/drivers/mmc/meson_gx_mmc.c b/drivers/mmc/meson_gx_mmc.c
index 2df20418be3..883932f5c89 100644
--- a/drivers/mmc/meson_gx_mmc.c
+++ b/drivers/mmc/meson_gx_mmc.c
@@ -11,6 +11,7 @@
 #include <malloc.h>
 #include <pwrseq.h>
 #include <mmc.h>
+#include <stdbool.h>
 #include <time.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
@@ -20,6 +21,7 @@
 #include <linux/kernel.h>
 #include <linux/log2.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static inline void *get_regbase(const struct mmc *mmc)
 {
diff --git a/drivers/mmc/mmc-uclass.c b/drivers/mmc/mmc-uclass.c
index da06aa9e7b6..1463a375947 100644
--- a/drivers/mmc/mmc-uclass.c
+++ b/drivers/mmc/mmc-uclass.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <mmc.h>
 #include <dm.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <dm/device-internal.h>
 #include <dm/device_compat.h>
@@ -16,6 +17,7 @@
 #include <linux/compat.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include "mmc_private.h"
 
 int dm_mmc_get_b_max(struct udevice *dev, void *dst, lbaint_t blkcnt)
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index e38950dd6e0..fb2964fb5b6 100644
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@ -7,12 +7,14 @@
  * Based vaguely on the Linux code
  */
 
+#include <compiler.h>
 #include <config.h>
 #include <common.h>
 #include <blk.h>
 #include <command.h>
 #include <dm.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <vsprintf.h>
@@ -27,6 +29,7 @@
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <power/regulator.h>
 #include <malloc.h>
 #include <memalign.h>
diff --git a/drivers/mmc/mmc_boot.c b/drivers/mmc/mmc_boot.c
index 0a74b1fb776..546f7c975a8 100644
--- a/drivers/mmc/mmc_boot.c
+++ b/drivers/mmc/mmc_boot.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <log.h>
 #include <mmc.h>
+#include <asm/types.h>
 #include "mmc_private.h"
 
 /*
diff --git a/drivers/mmc/mmc_private.h b/drivers/mmc/mmc_private.h
index a0900e8cadd..df6b1e8178f 100644
--- a/drivers/mmc/mmc_private.h
+++ b/drivers/mmc/mmc_private.h
@@ -11,6 +11,7 @@
 #define _MMC_PRIVATE_H_
 
 #include <mmc.h>
+#include <linux/types.h>
 
 int mmc_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd, struct mmc_data *data);
 int mmc_send_status(struct mmc *mmc, unsigned int *status);
diff --git a/drivers/mmc/mmc_spi.c b/drivers/mmc/mmc_spi.c
index ac8a127029c..15584710c32 100644
--- a/drivers/mmc/mmc_spi.c
+++ b/drivers/mmc/mmc_spi.c
@@ -18,6 +18,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <u-boot/crc.h>
 #include <linux/crc7.h>
 #include <asm/byteorder.h>
diff --git a/drivers/mmc/mmc_write.c b/drivers/mmc/mmc_write.c
index 93eb1404def..963627ab1ce 100644
--- a/drivers/mmc/mmc_write.c
+++ b/drivers/mmc/mmc_write.c
@@ -15,6 +15,7 @@
 #include <stdio.h>
 #include <linux/kernel.h>
 #include <linux/math64.h>
+#include <linux/types.h>
 #include "mmc_private.h"
 
 static ulong mmc_erase_t(struct mmc *mmc, ulong start, lbaint_t blkcnt)
diff --git a/drivers/mmc/msm_sdhci.c b/drivers/mmc/msm_sdhci.c
index 0ac7529f01a..49446cb5a65 100644
--- a/drivers/mmc/msm_sdhci.c
+++ b/drivers/mmc/msm_sdhci.c
@@ -19,6 +19,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /* Non-standard registers needed for SDHCI startup */
 #define SDCC_MCI_POWER   0x0
diff --git a/drivers/mmc/mtk-sd.c b/drivers/mmc/mtk-sd.c
index b6632a32d36..178fe1af43d 100644
--- a/drivers/mmc/mtk-sd.c
+++ b/drivers/mmc/mtk-sd.c
@@ -8,6 +8,7 @@
 
 #include <clk.h>
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <mmc.h>
 #include <errno.h>
@@ -23,6 +24,7 @@
 #include <linux/iopoll.h>
 #include <linux/kernel.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 /* MSDC_CFG */
 #define MSDC_CFG_HS400_CK_MODE_EXT	BIT(22)
diff --git a/drivers/mmc/mv_sdhci.c b/drivers/mmc/mv_sdhci.c
index f3e44f53cb4..d8515c6e6f1 100644
--- a/drivers/mmc/mv_sdhci.c
+++ b/drivers/mmc/mv_sdhci.c
@@ -4,11 +4,13 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <malloc.h>
 #include <sdhci.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/mbus.h>
 #include <linux/string.h>
diff --git a/drivers/mmc/mvebu_mmc.c b/drivers/mmc/mvebu_mmc.c
index 3a967ac7720..c6df83fb02e 100644
--- a/drivers/mmc/mvebu_mmc.c
+++ b/drivers/mmc/mvebu_mmc.c
@@ -22,6 +22,7 @@
 #include <mvebu_mmc.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/mmc/mxcmmc.c b/drivers/mmc/mxcmmc.c
index 01d57d4c778..ef8ef632563 100644
--- a/drivers/mmc/mxcmmc.c
+++ b/drivers/mmc/mxcmmc.c
@@ -25,6 +25,7 @@
 #include <mmc.h>
 #include <stdio.h>
 #include <time.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <asm/io.h>
diff --git a/drivers/mmc/mxsmmc.c b/drivers/mmc/mxsmmc.c
index 615ed6b1700..177a4bbc297 100644
--- a/drivers/mmc/mxsmmc.c
+++ b/drivers/mmc/mxsmmc.c
@@ -37,6 +37,7 @@
 #include <bouncebuf.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define	MXSMMC_MAX_TIMEOUT	10000
 #define MXSMMC_SMALL_TRANSFER	512
diff --git a/drivers/mmc/nexell_dw_mmc.c b/drivers/mmc/nexell_dw_mmc.c
index 35704e74d6b..b721264c7a1 100644
--- a/drivers/mmc/nexell_dw_mmc.c
+++ b/drivers/mmc/nexell_dw_mmc.c
@@ -16,6 +16,7 @@
 #include <asm/arch/reset.h>
 #include <asm/arch/clk.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #define DWMCI_CLKSEL			0x09C
 #define DWMCI_SHIFT_0			0x0
diff --git a/drivers/mmc/omap_hsmmc.c b/drivers/mmc/omap_hsmmc.c
index 4de6bb1d972..f12af49257b 100644
--- a/drivers/mmc/omap_hsmmc.c
+++ b/drivers/mmc/omap_hsmmc.c
@@ -22,6 +22,7 @@
  * MA 02111-1307 USA
  */
 
+#include <compiler.h>
 #include <config.h>
 #include <common.h>
 #include <cpu_func.h>
@@ -34,6 +35,7 @@
 #if defined(CONFIG_OMAP54XX) || defined(CONFIG_OMAP44XX)
 #include <palmas.h>
 #endif
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <vsprintf.h>
@@ -59,6 +61,7 @@
 #include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include <power/regulator.h>
 #include <thermal.h>
 
diff --git a/drivers/mmc/pic32_sdhci.c b/drivers/mmc/pic32_sdhci.c
index 009bf00a7f8..9e5ddc44aa7 100644
--- a/drivers/mmc/pic32_sdhci.c
+++ b/drivers/mmc/pic32_sdhci.c
@@ -11,6 +11,7 @@
 #include <sdhci.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <mach/pic32.h>
 
diff --git a/drivers/mmc/pxa_mmc_gen.c b/drivers/mmc/pxa_mmc_gen.c
index 5a4652e2461..cc1d8c640c1 100644
--- a/drivers/mmc/pxa_mmc_gen.c
+++ b/drivers/mmc/pxa_mmc_gen.c
@@ -21,6 +21,7 @@
 #include <mmc.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /* PXAMMC Generic default config for various CPUs */
 #if defined(CONFIG_CPU_PXA25X)
diff --git a/drivers/mmc/renesas-sdhi.c b/drivers/mmc/renesas-sdhi.c
index 1c4ce0ff02a..245c5310eab 100644
--- a/drivers/mmc/renesas-sdhi.c
+++ b/drivers/mmc/renesas-sdhi.c
@@ -11,6 +11,7 @@
 #include <malloc.h>
 #include <mmc.h>
 #include <dm.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
@@ -21,6 +22,7 @@
 #include <linux/io.h>
 #include <linux/kernel.h>
 #include <linux/sizes.h>
+#include <linux/types.h>
 #include <power/regulator.h>
 #include <asm/unaligned.h>
 #include "tmio-common.h"
diff --git a/drivers/mmc/rockchip_dw_mmc.c b/drivers/mmc/rockchip_dw_mmc.c
index 6d31f9f3d30..7f1c63f8476 100644
--- a/drivers/mmc/rockchip_dw_mmc.c
+++ b/drivers/mmc/rockchip_dw_mmc.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <mapmem.h>
 #include <pwrseq.h>
+#include <stdbool.h>
 #include <syscon.h>
 #include <asm/gpio.h>
 #include <asm/arch-rockchip/clock.h>
@@ -19,6 +20,7 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 struct rockchip_mmc_plat {
 #if CONFIG_IS_ENABLED(OF_PLATDATA)
diff --git a/drivers/mmc/s5p_sdhci.c b/drivers/mmc/s5p_sdhci.c
index cf32ca80821..cabada7acc6 100644
--- a/drivers/mmc/s5p_sdhci.c
+++ b/drivers/mmc/s5p_sdhci.c
@@ -12,6 +12,7 @@
 #include <fdtdec.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <asm/gpio.h>
diff --git a/drivers/mmc/sandbox_mmc.c b/drivers/mmc/sandbox_mmc.c
index 58c79a8821b..79d7da1dc03 100644
--- a/drivers/mmc/sandbox_mmc.c
+++ b/drivers/mmc/sandbox_mmc.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <mmc.h>
 #include <asm/test.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
 
diff --git a/drivers/mmc/sdhci-cadence.c b/drivers/mmc/sdhci-cadence.c
index fd5b77351a2..239badca582 100644
--- a/drivers/mmc/sdhci-cadence.c
+++ b/drivers/mmc/sdhci-cadence.c
@@ -5,8 +5,10 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <dm/device_compat.h>
 #include <linux/bitfield.h>
 #include <linux/bitops.h>
diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c
index 023eede0121..342106afb49 100644
--- a/drivers/mmc/sdhci.c
+++ b/drivers/mmc/sdhci.c
@@ -16,6 +16,7 @@
 #include <mmc.h>
 #include <sdhci.h>
 #include <dm.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <asm/cache.h>
@@ -27,6 +28,7 @@
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static void sdhci_reset(struct sdhci_host *host, u8 mask)
 {
diff --git a/drivers/mmc/sh_mmcif.c b/drivers/mmc/sh_mmcif.c
index ede46d1b6ac..15b2b0533f1 100644
--- a/drivers/mmc/sh_mmcif.c
+++ b/drivers/mmc/sh_mmcif.c
@@ -16,6 +16,7 @@
 #include <dm.h>
 #include <malloc.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/drivers/mmc/sh_mmcif.h b/drivers/mmc/sh_mmcif.h
index 66341e51d26..4a9896cd836 100644
--- a/drivers/mmc/sh_mmcif.h
+++ b/drivers/mmc/sh_mmcif.h
@@ -8,6 +8,7 @@
 #ifndef _SH_MMCIF_H_
 #define _SH_MMCIF_H_
 
+#include <asm/types.h>
 struct sh_mmcif_regs {
 	unsigned long ce_cmd_set;
 	unsigned long reserved;
diff --git a/drivers/mmc/sh_sdhi.c b/drivers/mmc/sh_sdhi.c
index 97fb1ee48ec..c62315565d6 100644
--- a/drivers/mmc/sh_sdhi.c
+++ b/drivers/mmc/sh_sdhi.c
@@ -10,6 +10,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <log.h>
 #include <malloc.h>
 #include <mmc.h>
@@ -17,6 +18,7 @@
 #include <part.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/drivers/mmc/snps_dw_mmc.c b/drivers/mmc/snps_dw_mmc.c
index 5572afa1e48..08571ccd263 100644
--- a/drivers/mmc/snps_dw_mmc.c
+++ b/drivers/mmc/snps_dw_mmc.c
@@ -13,6 +13,7 @@
 #include <dwmmc.h>
 #include <errno.h>
 #include <fdtdec.h>
+#include <asm/types.h>
 #include <dm/device_compat.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
diff --git a/drivers/mmc/socfpga_dw_mmc.c b/drivers/mmc/socfpga_dw_mmc.c
index 9877919f4f1..72f2e193158 100644
--- a/drivers/mmc/socfpga_dw_mmc.c
+++ b/drivers/mmc/socfpga_dw_mmc.c
@@ -14,6 +14,7 @@
 #include <errno.h>
 #include <fdtdec.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <dm/device_compat.h>
 #include <linux/errno.h>
 #include <linux/libfdt.h>
diff --git a/drivers/mmc/stm32_sdmmc2.c b/drivers/mmc/stm32_sdmmc2.c
index 62f9c7a6f5d..7819b2820e7 100644
--- a/drivers/mmc/stm32_sdmmc2.c
+++ b/drivers/mmc/stm32_sdmmc2.c
@@ -11,9 +11,11 @@
 #include <fdtdec.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/bitops.h>
 #include <asm/cache.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/mmc/sunxi_mmc.c b/drivers/mmc/sunxi_mmc.c
index b562595e2f3..6e3b5ff9324 100644
--- a/drivers/mmc/sunxi_mmc.c
+++ b/drivers/mmc/sunxi_mmc.c
@@ -27,6 +27,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_DM_MMC
 struct sunxi_mmc_variant {
diff --git a/drivers/mmc/tangier_sdhci.c b/drivers/mmc/tangier_sdhci.c
index 622cc3ef1be..fe1bb77177c 100644
--- a/drivers/mmc/tangier_sdhci.c
+++ b/drivers/mmc/tangier_sdhci.c
@@ -3,6 +3,7 @@
  * Copyright (c) 2017 Intel Corporation
  */
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <dm/device.h>
 #include <linux/errno.h>
diff --git a/drivers/mmc/tegra_mmc.c b/drivers/mmc/tegra_mmc.c
index 4cf18386434..039ea551e7b 100644
--- a/drivers/mmc/tegra_mmc.c
+++ b/drivers/mmc/tegra_mmc.c
@@ -24,6 +24,7 @@
 #include <asm/arch/clock.h>
 #endif
 #include <linux/errno.h>
+#include <linux/types.h>
 
 struct tegra_mmc_plat {
 	struct mmc_config cfg;
diff --git a/drivers/mmc/tmio-common.c b/drivers/mmc/tmio-common.c
index 5e8076fcd97..be54dcf635a 100644
--- a/drivers/mmc/tmio-common.c
+++ b/drivers/mmc/tmio-common.c
@@ -10,6 +10,7 @@
 #include <fdtdec.h>
 #include <mmc.h>
 #include <dm.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 #include <dm/device_compat.h>
 #include <dm/pinctrl.h>
@@ -20,6 +21,7 @@
 #include <linux/io.h>
 #include <linux/kernel.h>
 #include <linux/sizes.h>
+#include <linux/types.h>
 #include <power/regulator.h>
 #include <asm/unaligned.h>
 
diff --git a/drivers/mmc/tmio-common.h b/drivers/mmc/tmio-common.h
index 4160cbe0f5c..f5e0b98d438 100644
--- a/drivers/mmc/tmio-common.h
+++ b/drivers/mmc/tmio-common.h
@@ -7,8 +7,10 @@
 #ifndef __TMIO_COMMON_H__
 #define __TMIO_COMMON_H__
 
+#include <compiler.h>
 #include <stdbool.h>
 #include <linux/bitops.h>
+#include <linux/types.h>
 #define TMIO_SD_CMD			0x000	/* command */
 #define   TMIO_SD_CMD_NOSTOP		BIT(14)	/* No automatic CMD12 issue */
 #define   TMIO_SD_CMD_MULTI		BIT(13)	/* multiple block transfer */
diff --git a/drivers/mmc/uniphier-sd.c b/drivers/mmc/uniphier-sd.c
index 088e1d9a900..6e6c267fcd2 100644
--- a/drivers/mmc/uniphier-sd.c
+++ b/drivers/mmc/uniphier-sd.c
@@ -16,6 +16,7 @@
 #include <linux/io.h>
 #include <linux/kernel.h>
 #include <linux/sizes.h>
+#include <linux/types.h>
 #include <power/regulator.h>
 #include <asm/unaligned.h>
 
diff --git a/drivers/mmc/xenon_sdhci.c b/drivers/mmc/xenon_sdhci.c
index 46c8db49547..a0eb9f370b0 100644
--- a/drivers/mmc/xenon_sdhci.c
+++ b/drivers/mmc/xenon_sdhci.c
@@ -28,6 +28,7 @@
 #include <sdhci.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/mmc/zynq_sdhci.c b/drivers/mmc/zynq_sdhci.c
index 923a10f11ec..d1beb3a2a57 100644
--- a/drivers/mmc/zynq_sdhci.c
+++ b/drivers/mmc/zynq_sdhci.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <fdtdec.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include "mmc_private.h"
diff --git a/drivers/mtd/altera_qspi.c b/drivers/mtd/altera_qspi.c
index 1a43ad9977a..5c33dbf1f4f 100644
--- a/drivers/mtd/altera_qspi.c
+++ b/drivers/mtd/altera_qspi.c
@@ -18,6 +18,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c
index 9fed43f05a0..c84d59ce8a1 100644
--- a/drivers/mtd/cfi_flash.c
+++ b/drivers/mtd/cfi_flash.c
@@ -17,6 +17,7 @@
 /* #define DEBUG	*/
 
 #include <common.h>
+#include <compiler.h>
 #include <console.h>
 #include <dm.h>
 #include <env.h>
@@ -40,6 +41,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <mtd/cfi_flash.h>
 #include <watchdog.h>
 
diff --git a/drivers/mtd/cfi_mtd.c b/drivers/mtd/cfi_mtd.c
index 02b4277bd23..dedb740a650 100644
--- a/drivers/mtd/cfi_mtd.c
+++ b/drivers/mtd/cfi_mtd.c
@@ -10,6 +10,7 @@
 #include <malloc.h>
 #include <vsprintf.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <linux/errno.h>
 #include <linux/mtd/mtd.h>
diff --git a/drivers/mtd/hbmc-am654.c b/drivers/mtd/hbmc-am654.c
index 848c5ede413..366d4b80e85 100644
--- a/drivers/mtd/hbmc-am654.c
+++ b/drivers/mtd/hbmc-am654.c
@@ -4,11 +4,13 @@
 // Author: Vignesh Raghavendra <vigneshr@ti.com>
 
 #include <common.h>
+#include <compiler.h>
 #include <stdbool.h>
 #include <asm/io.h>
 #include <dm.h>
 #include <regmap.h>
 #include <syscon.h>
+#include <asm/types.h>
 #include <dm/device_compat.h>
 #include <linux/errno.h>
 
diff --git a/drivers/mtd/jedec_flash.c b/drivers/mtd/jedec_flash.c
index 9456c9abbc3..0edbe6064a1 100644
--- a/drivers/mtd/jedec_flash.c
+++ b/drivers/mtd/jedec_flash.c
@@ -19,6 +19,7 @@
 #include <asm/io.h>
 #include <asm/byteorder.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #define P_ID_AMD_STD CFI_CMDSET_AMD_LEGACY
 
diff --git a/drivers/mtd/mtd_uboot.c b/drivers/mtd/mtd_uboot.c
index cdf4600cd31..70242ce382c 100644
--- a/drivers/mtd/mtd_uboot.c
+++ b/drivers/mtd/mtd_uboot.c
@@ -7,6 +7,7 @@
 #include <env.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <dm/device.h>
diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c
index b995fb8abab..de624825478 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 <stdbool.h>
 #include <vsprintf.h>
 #include <linux/bitops.h>
 #include <linux/bug.h>
@@ -35,6 +36,7 @@
 #include <ubi_uboot.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 #endif
 
 #include <linux/log2.h>
diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c
index ea31330bf11..d238788c17b 100644
--- a/drivers/mtd/mtdpart.c
+++ b/drivers/mtd/mtdpart.c
@@ -21,6 +21,7 @@
 
 #include <common.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/bug.h>
diff --git a/drivers/mtd/mw_eeprom.c b/drivers/mtd/mw_eeprom.c
index 5d1a3573241..58b8d671c91 100644
--- a/drivers/mtd/mw_eeprom.c
+++ b/drivers/mtd/mw_eeprom.c
@@ -4,6 +4,7 @@
 #include <eeprom.h>
 #include <stdio.h>
 #include <asm/ic/ssi.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 /*
diff --git a/drivers/mtd/nand/raw/am335x_spl_bch.c b/drivers/mtd/nand/raw/am335x_spl_bch.c
index b6fc5f29c7a..7b40689cc64 100644
--- a/drivers/mtd/nand/raw/am335x_spl_bch.c
+++ b/drivers/mtd/nand/raw/am335x_spl_bch.c
@@ -10,10 +10,12 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <nand.h>
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <linux/mtd/nand_ecc.h>
+#include <linux/types.h>
 
 static int nand_ecc_pos[] = CONFIG_SYS_NAND_ECCPOS;
 static struct mtd_info *mtd;
diff --git a/drivers/mtd/nand/raw/arasan_nfc.c b/drivers/mtd/nand/raw/arasan_nfc.c
index c604db376c1..e56b0603867 100644
--- a/drivers/mtd/nand/raw/arasan_nfc.c
+++ b/drivers/mtd/nand/raw/arasan_nfc.c
@@ -6,9 +6,12 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
diff --git a/drivers/mtd/nand/raw/atmel_nand.c b/drivers/mtd/nand/raw/atmel_nand.c
index 75c21ff7852..78c3ab2dc06 100644
--- a/drivers/mtd/nand/raw/atmel_nand.c
+++ b/drivers/mtd/nand/raw/atmel_nand.c
@@ -11,6 +11,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <log.h>
 #include <asm/gpio.h>
 #include <asm/arch/gpio.h>
@@ -22,6 +23,7 @@
 #include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <malloc.h>
 #include <nand.h>
diff --git a/drivers/mtd/nand/raw/atmel_nand_ecc.h b/drivers/mtd/nand/raw/atmel_nand_ecc.h
index 05eeedb3f84..1ece825186c 100644
--- a/drivers/mtd/nand/raw/atmel_nand_ecc.h
+++ b/drivers/mtd/nand/raw/atmel_nand_ecc.h
@@ -7,6 +7,7 @@
 #ifndef ATMEL_NAND_ECC_H
 #define ATMEL_NAND_ECC_H
 
+#include <asm/types.h>
 #define ATMEL_ECC_CR		0x00			/* Control register */
 #define		ATMEL_ECC_RST		(1 << 0)		/* Reset parity */
 
diff --git a/drivers/mtd/nand/raw/brcmnand/bcm63158_nand.c b/drivers/mtd/nand/raw/brcmnand/bcm63158_nand.c
index acfe2ba0bd2..f07498fe261 100644
--- a/drivers/mtd/nand/raw/brcmnand/bcm63158_nand.c
+++ b/drivers/mtd/nand/raw/brcmnand/bcm63158_nand.c
@@ -1,9 +1,12 @@
 // SPDX-License-Identifier: GPL-2.0+
 
 #include <common.h>
+#include <compiler.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <memalign.h>
 #include <nand.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/err.h>
 #include <linux/errno.h>
diff --git a/drivers/mtd/nand/raw/brcmnand/bcm6368_nand.c b/drivers/mtd/nand/raw/brcmnand/bcm6368_nand.c
index 4c886e1533f..d17b80e507a 100644
--- a/drivers/mtd/nand/raw/brcmnand/bcm6368_nand.c
+++ b/drivers/mtd/nand/raw/brcmnand/bcm6368_nand.c
@@ -1,9 +1,12 @@
 // SPDX-License-Identifier: GPL-2.0+
 
 #include <common.h>
+#include <compiler.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <memalign.h>
 #include <nand.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/io.h>
diff --git a/drivers/mtd/nand/raw/brcmnand/bcm68360_nand.c b/drivers/mtd/nand/raw/brcmnand/bcm68360_nand.c
index a649b1a8963..d93a11c0c98 100644
--- a/drivers/mtd/nand/raw/brcmnand/bcm68360_nand.c
+++ b/drivers/mtd/nand/raw/brcmnand/bcm68360_nand.c
@@ -1,9 +1,12 @@
 // SPDX-License-Identifier: GPL-2.0+
 
 #include <common.h>
+#include <compiler.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <memalign.h>
 #include <nand.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/io.h>
diff --git a/drivers/mtd/nand/raw/brcmnand/bcm6838_nand.c b/drivers/mtd/nand/raw/brcmnand/bcm6838_nand.c
index 25bfe253f29..de19a16e61c 100644
--- a/drivers/mtd/nand/raw/brcmnand/bcm6838_nand.c
+++ b/drivers/mtd/nand/raw/brcmnand/bcm6838_nand.c
@@ -1,9 +1,12 @@
 // SPDX-License-Identifier: GPL-2.0+
 
 #include <common.h>
+#include <compiler.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <memalign.h>
 #include <nand.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/err.h>
 #include <linux/errno.h>
diff --git a/drivers/mtd/nand/raw/brcmnand/bcm6858_nand.c b/drivers/mtd/nand/raw/brcmnand/bcm6858_nand.c
index 926c59eb148..2d0bbea727c 100644
--- a/drivers/mtd/nand/raw/brcmnand/bcm6858_nand.c
+++ b/drivers/mtd/nand/raw/brcmnand/bcm6858_nand.c
@@ -1,9 +1,12 @@
 // SPDX-License-Identifier: GPL-2.0+
 
 #include <common.h>
+#include <compiler.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <memalign.h>
 #include <nand.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/err.h>
 #include <linux/errno.h>
diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand.c b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
index b90f26978ff..65159d9e021 100644
--- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c
+++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
@@ -13,6 +13,8 @@
  */
 
 #include <common.h>
+#include <compiler.h>
+#include <stdbool.h>
 #include <time.h>
 #include <vsprintf.h>
 #include <asm/io.h>
@@ -32,6 +34,7 @@
 #include <asm/processor.h>
 #include <dm.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "brcmnand.h"
 #include "brcmnand_compat.h"
diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand.h b/drivers/mtd/nand/raw/brcmnand/brcmnand.h
index 2a48dfea90c..90b24f95ca0 100644
--- a/drivers/mtd/nand/raw/brcmnand/brcmnand.h
+++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.h
@@ -3,6 +3,7 @@
 #ifndef __BRCMNAND_H__
 #define __BRCMNAND_H__
 
+#include <compiler.h>
 #include <stdbool.h>
 #include <linux/types.h>
 #include <linux/io.h>
diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand_compat.c b/drivers/mtd/nand/raw/brcmnand/brcmnand_compat.c
index 9223b9260d1..4a000a59a25 100644
--- a/drivers/mtd/nand/raw/brcmnand/brcmnand_compat.c
+++ b/drivers/mtd/nand/raw/brcmnand/brcmnand_compat.c
@@ -5,6 +5,7 @@
 #include <stdarg.h>
 #include <vsprintf.h>
 #include <dm/devres.h>
+#include <linux/types.h>
 #include "brcmnand_compat.h"
 
 static char *devm_kvasprintf(struct udevice *dev, gfp_t gfp, const char *fmt,
diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand_compat.h b/drivers/mtd/nand/raw/brcmnand/brcmnand_compat.h
index 6f9bec7085c..816eae05189 100644
--- a/drivers/mtd/nand/raw/brcmnand/brcmnand_compat.h
+++ b/drivers/mtd/nand/raw/brcmnand/brcmnand_compat.h
@@ -5,6 +5,7 @@
 
 #include <clk.h>
 #include <dm.h>
+#include <linux/types.h>
 
 char *devm_kasprintf(struct udevice *dev, gfp_t gfp, const char *fmt, ...);
 
diff --git a/drivers/mtd/nand/raw/davinci_nand.c b/drivers/mtd/nand/raw/davinci_nand.c
index c00fc65b6a0..fea7147054a 100644
--- a/drivers/mtd/nand/raw/davinci_nand.c
+++ b/drivers/mtd/nand/raw/davinci_nand.c
@@ -29,6 +29,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <log.h>
 #include <asm/io.h>
 #include <nand.h>
@@ -37,6 +38,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 /* Definitions for 4-bit hardware ECC */
 #define NAND_TIMEOUT			10240
diff --git a/drivers/mtd/nand/raw/denali.c b/drivers/mtd/nand/raw/denali.c
index 0e84f37784d..92361e637bc 100644
--- a/drivers/mtd/nand/raw/denali.c
+++ b/drivers/mtd/nand/raw/denali.c
@@ -25,6 +25,7 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/rawnand.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "denali.h"
 
diff --git a/drivers/mtd/nand/raw/denali.h b/drivers/mtd/nand/raw/denali.h
index 6cd02b2e26e..afc01880998 100644
--- a/drivers/mtd/nand/raw/denali.h
+++ b/drivers/mtd/nand/raw/denali.h
@@ -7,6 +7,7 @@
 #ifndef __DENALI_H__
 #define __DENALI_H__
 
+#include <compiler.h>
 #include <linux/bitops.h>
 #include <linux/mtd/rawnand.h>
 #include <linux/types.h>
diff --git a/drivers/mtd/nand/raw/denali_spl.c b/drivers/mtd/nand/raw/denali_spl.c
index ed077fd06bc..ad164139ed5 100644
--- a/drivers/mtd/nand/raw/denali_spl.c
+++ b/drivers/mtd/nand/raw/denali_spl.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <log.h>
 #include <asm/io.h>
 #include <asm/unaligned.h>
@@ -13,6 +14,7 @@
 #include <linux/kernel.h>
 #include <linux/mtd/rawnand.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "denali.h"
 
 #define DENALI_MAP01		(1 << 26)	/* read/write pages in PIO */
diff --git a/drivers/mtd/nand/raw/fsl_elbc_nand.c b/drivers/mtd/nand/raw/fsl_elbc_nand.c
index eb95cb00303..0c0b1dec55d 100644
--- a/drivers/mtd/nand/raw/fsl_elbc_nand.c
+++ b/drivers/mtd/nand/raw/fsl_elbc_nand.c
@@ -9,12 +9,14 @@
 
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <malloc.h>
 #include <nand.h>
 #include <stdio.h>
 #include <time.h>
 #include <dm/devres.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/rawnand.h>
diff --git a/drivers/mtd/nand/raw/fsl_elbc_spl.c b/drivers/mtd/nand/raw/fsl_elbc_spl.c
index e8b9f40f3b0..0564d270e06 100644
--- a/drivers/mtd/nand/raw/fsl_elbc_spl.c
+++ b/drivers/mtd/nand/raw/fsl_elbc_spl.c
@@ -15,6 +15,7 @@
 #include <asm/io.h>
 #include <asm/fsl_lbc.h>
 #include <nand.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_MPC83xx
 #include "../../../arch/powerpc/cpu/mpc83xx/elbc/elbc.h"
diff --git a/drivers/mtd/nand/raw/fsl_ifc_nand.c b/drivers/mtd/nand/raw/fsl_ifc_nand.c
index 291dda8fb48..720f8fcbd35 100644
--- a/drivers/mtd/nand/raw/fsl_ifc_nand.c
+++ b/drivers/mtd/nand/raw/fsl_ifc_nand.c
@@ -8,12 +8,14 @@
 
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <malloc.h>
 #include <nand.h>
 #include <stdio.h>
 #include <time.h>
 #include <dm/devres.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/rawnand.h>
diff --git a/drivers/mtd/nand/raw/fsl_ifc_spl.c b/drivers/mtd/nand/raw/fsl_ifc_spl.c
index cf09fce3fbb..180fa82ddb7 100644
--- a/drivers/mtd/nand/raw/fsl_ifc_spl.c
+++ b/drivers/mtd/nand/raw/fsl_ifc_spl.c
@@ -16,6 +16,7 @@
 #ifdef CONFIG_CHAIN_OF_TRUST
 #include <fsl_validate.h>
 #endif
+#include <linux/types.h>
 
 static inline int is_blank(uchar *addr, int page_size)
 {
diff --git a/drivers/mtd/nand/raw/fsl_upm.c b/drivers/mtd/nand/raw/fsl_upm.c
index 6c86a7e7671..be9d40a07a0 100644
--- a/drivers/mtd/nand/raw/fsl_upm.c
+++ b/drivers/mtd/nand/raw/fsl_upm.c
@@ -6,6 +6,7 @@
  *                    Anton Vorontsov <avorontsov@ru.mvista.com>
  */
 
+#include <compiler.h>
 #include <config.h>
 #include <common.h>
 #include <log.h>
@@ -15,6 +16,7 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/fsl_upm.h>
 #include <nand.h>
+#include <linux/types.h>
 
 static void fsl_upm_start_pattern(struct fsl_upm *upm, u32 pat_offset)
 {
diff --git a/drivers/mtd/nand/raw/fsmc_nand.c b/drivers/mtd/nand/raw/fsmc_nand.c
index 5994c321cac..8fcf00f9107 100644
--- a/drivers/mtd/nand/raw/fsmc_nand.c
+++ b/drivers/mtd/nand/raw/fsmc_nand.c
@@ -8,6 +8,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <nand.h>
 #include <stdio.h>
 #include <time.h>
@@ -20,6 +21,7 @@
 #include <linux/mtd/fsmc_nand.h>
 #include <asm/arch/hardware.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static u32 fsmc_version;
 static struct fsmc_regs *const fsmc_regs_p = (struct fsmc_regs *)
diff --git a/drivers/mtd/nand/raw/kb9202_nand.c b/drivers/mtd/nand/raw/kb9202_nand.c
index 0f68f1cd867..4b759dd25e6 100644
--- a/drivers/mtd/nand/raw/kb9202_nand.c
+++ b/drivers/mtd/nand/raw/kb9202_nand.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <asm/arch/AT91RM9200.h>
 #include <asm/arch/hardware.h>
+#include <linux/types.h>
 
 #include <nand.h>
 
diff --git a/drivers/mtd/nand/raw/kirkwood_nand.c b/drivers/mtd/nand/raw/kirkwood_nand.c
index 0757fa840b8..6b0cd581ead 100644
--- a/drivers/mtd/nand/raw/kirkwood_nand.c
+++ b/drivers/mtd/nand/raw/kirkwood_nand.c
@@ -10,6 +10,7 @@
 #include <asm/arch/soc.h>
 #include <asm/arch/mpp.h>
 #include <nand.h>
+#include <asm/types.h>
 
 /* NAND Flash Soc registers */
 struct kwnandf_registers {
diff --git a/drivers/mtd/nand/raw/kmeter1_nand.c b/drivers/mtd/nand/raw/kmeter1_nand.c
index cf33f2863e1..c2252464ad6 100644
--- a/drivers/mtd/nand/raw/kmeter1_nand.c
+++ b/drivers/mtd/nand/raw/kmeter1_nand.c
@@ -8,6 +8,7 @@
 #include <nand.h>
 #include <asm/io.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 #define CONFIG_NAND_MODE_REG	(void *)(CONFIG_SYS_NAND_BASE + 0x20000)
 #define CONFIG_NAND_DATA_REG	(void *)(CONFIG_SYS_NAND_BASE + 0x30000)
diff --git a/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c b/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c
index 368ce3e54ed..af93baf38ba 100644
--- a/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c
+++ b/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c
@@ -13,6 +13,8 @@
  *
  * Consequently, pages with meaningful in-band data are written with
  * blank (all-ones) out-of-band data and a valid ECC, and any later
+#include <compiler.h>
+#include <linux/types.h>
  * out-of-band data write will void the ECC.
  *
  * Therefore, code which reads such late-written out-of-band data
diff --git a/drivers/mtd/nand/raw/lpc32xx_nand_slc.c b/drivers/mtd/nand/raw/lpc32xx_nand_slc.c
index 07a44a565ad..018acbdf8a0 100644
--- a/drivers/mtd/nand/raw/lpc32xx_nand_slc.c
+++ b/drivers/mtd/nand/raw/lpc32xx_nand_slc.c
@@ -11,6 +11,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <log.h>
 #include <nand.h>
 #include <linux/bug.h>
@@ -24,6 +25,7 @@
 #include <asm/arch/dma.h>
 #include <asm/arch/cpu.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 struct lpc32xx_nand_slc_regs {
 	u32 data;
diff --git a/drivers/mtd/nand/raw/mxc_nand.c b/drivers/mtd/nand/raw/mxc_nand.c
index f012f7329c9..61da84f7e79 100644
--- a/drivers/mtd/nand/raw/mxc_nand.c
+++ b/drivers/mtd/nand/raw/mxc_nand.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <log.h>
 #include <nand.h>
 #include <linux/delay.h>
@@ -18,6 +19,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 #include "mxc_nand.h"
 
 #define DRIVER_NAME "mxc_nand"
diff --git a/drivers/mtd/nand/raw/mxc_nand.h b/drivers/mtd/nand/raw/mxc_nand.h
index 1c7f3a2e227..fd008b294b6 100644
--- a/drivers/mtd/nand/raw/mxc_nand.h
+++ b/drivers/mtd/nand/raw/mxc_nand.h
@@ -43,6 +43,7 @@
 #else
 #error "MXC NFC implementation not supported"
 #endif
+#include <asm/types.h>
 #define is_mxc_nfc_3()		is_mxc_nfc_32()
 
 #if defined(MXC_NFC_V1)
diff --git a/drivers/mtd/nand/raw/mxc_nand_spl.c b/drivers/mtd/nand/raw/mxc_nand_spl.c
index c3e136899f9..22bd476479a 100644
--- a/drivers/mtd/nand/raw/mxc_nand_spl.c
+++ b/drivers/mtd/nand/raw/mxc_nand_spl.c
@@ -17,6 +17,7 @@
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include "mxc_nand.h"
 
 #if defined(MXC_NFC_V1) || defined(MXC_NFC_V2_1)
diff --git a/drivers/mtd/nand/raw/mxs_nand.c b/drivers/mtd/nand/raw/mxs_nand.c
index 8ab4dab32c0..d6e1273a74c 100644
--- a/drivers/mtd/nand/raw/mxs_nand.c
+++ b/drivers/mtd/nand/raw/mxs_nand.c
@@ -16,6 +16,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <dm.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/cache.h>
 #include <linux/kernel.h>
diff --git a/drivers/mtd/nand/raw/mxs_nand_spl.c b/drivers/mtd/nand/raw/mxs_nand_spl.c
index 0fe538e7d6d..e7e5683d90f 100644
--- a/drivers/mtd/nand/raw/mxs_nand_spl.c
+++ b/drivers/mtd/nand/raw/mxs_nand_spl.c
@@ -17,6 +17,7 @@
 #include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static struct mtd_info *mtd;
 static struct nand_chip nand_chip;
diff --git a/drivers/mtd/nand/raw/nand.c b/drivers/mtd/nand/raw/nand.c
index 486c1b4a8bd..b43f3f5d9ca 100644
--- a/drivers/mtd/nand/raw/nand.c
+++ b/drivers/mtd/nand/raw/nand.c
@@ -6,11 +6,13 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <nand.h>
 #include <errno.h>
 #include <vsprintf.h>
 #include <linux/errno.h>
 #include <linux/mtd/concat.h>
+#include <linux/types.h>
 
 #ifndef CONFIG_SYS_NAND_BASE_LIST
 #define CONFIG_SYS_NAND_BASE_LIST { CONFIG_SYS_NAND_BASE }
diff --git a/drivers/mtd/nand/raw/nand_base.c b/drivers/mtd/nand/raw/nand_base.c
index 115f5a771be..79e872b0ca1 100644
--- a/drivers/mtd/nand/raw/nand_base.c
+++ b/drivers/mtd/nand/raw/nand_base.c
@@ -34,6 +34,7 @@
 #endif
 #include <log.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <time.h>
 #include <watchdog.h>
 #include <asm/global_data.h>
@@ -55,6 +56,7 @@
 #include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /* Define default oob placement schemes for large and small page devices */
 #ifndef CONFIG_SYS_NAND_DRIVER_ECC_LAYOUT
diff --git a/drivers/mtd/nand/raw/nand_bbt.c b/drivers/mtd/nand/raw/nand_bbt.c
index 36ca2230269..429a96eb6bf 100644
--- a/drivers/mtd/nand/raw/nand_bbt.c
+++ b/drivers/mtd/nand/raw/nand_bbt.c
@@ -72,6 +72,7 @@
 #include <linux/bitops.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define BBT_BLOCK_GOOD		0x00
 #define BBT_BLOCK_WORN		0x01
diff --git a/drivers/mtd/nand/raw/nand_ecc.c b/drivers/mtd/nand/raw/nand_ecc.c
index 2bc329be1a3..d31fd2d0c4b 100644
--- a/drivers/mtd/nand/raw/nand_ecc.c
+++ b/drivers/mtd/nand/raw/nand_ecc.c
@@ -23,6 +23,7 @@
  */
 
 #include <common.h>
+#include <linux/types.h>
 
 #include <linux/errno.h>
 #include <linux/mtd/mtd.h>
diff --git a/drivers/mtd/nand/raw/nand_spl_loaders.c b/drivers/mtd/nand/raw/nand_spl_loaders.c
index 75ded89893a..08797e0d40a 100644
--- a/drivers/mtd/nand/raw/nand_spl_loaders.c
+++ b/drivers/mtd/nand/raw/nand_spl_loaders.c
@@ -1,5 +1,6 @@
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 int nand_spl_load_image(uint32_t offs, unsigned int size, void *dst)
 {
 	unsigned int block, lastblock;
diff --git a/drivers/mtd/nand/raw/nand_spl_simple.c b/drivers/mtd/nand/raw/nand_spl_simple.c
index 09e053541a9..1f1261fd948 100644
--- a/drivers/mtd/nand/raw/nand_spl_simple.c
+++ b/drivers/mtd/nand/raw/nand_spl_simple.c
@@ -5,9 +5,11 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <nand.h>
 #include <asm/io.h>
 #include <linux/mtd/nand_ecc.h>
+#include <linux/types.h>
 
 static int nand_ecc_pos[] = CONFIG_SYS_NAND_ECCPOS;
 static struct mtd_info *mtd;
diff --git a/drivers/mtd/nand/raw/nand_util.c b/drivers/mtd/nand/raw/nand_util.c
index f753970d9e7..95169503c2c 100644
--- a/drivers/mtd/nand/raw/nand_util.c
+++ b/drivers/mtd/nand/raw/nand_util.c
@@ -30,6 +30,7 @@
 #include <dm/devres.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <linux/errno.h>
 #include <linux/mtd/mtd.h>
diff --git a/drivers/mtd/nand/raw/omap_elm.c b/drivers/mtd/nand/raw/omap_elm.c
index 87368743a9a..87dd2feccd5 100644
--- a/drivers/mtd/nand/raw/omap_elm.c
+++ b/drivers/mtd/nand/raw/omap_elm.c
@@ -15,6 +15,7 @@
 #include <common.h>
 #include <stdio.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/mtd/omap_elm.h>
 #include <asm/arch/hardware.h>
diff --git a/drivers/mtd/nand/raw/omap_gpmc.c b/drivers/mtd/nand/raw/omap_gpmc.c
index 2863b1de1b6..f83cee14212 100644
--- a/drivers/mtd/nand/raw/omap_gpmc.c
+++ b/drivers/mtd/nand/raw/omap_gpmc.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <log.h>
 #include <stdio.h>
 #include <asm/io.h>
@@ -17,6 +18,7 @@
 #include <nand.h>
 #include <linux/mtd/omap_elm.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define BADBLOCK_MARKER_LENGTH	2
 #define SECTOR_BYTES		512
diff --git a/drivers/mtd/nand/raw/pxa3xx_nand.c b/drivers/mtd/nand/raw/pxa3xx_nand.c
index 8678866d3dd..7287cc32f43 100644
--- a/drivers/mtd/nand/raw/pxa3xx_nand.c
+++ b/drivers/mtd/nand/raw/pxa3xx_nand.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <malloc.h>
 #include <fdtdec.h>
 #include <nand.h>
diff --git a/drivers/mtd/nand/raw/pxa3xx_nand.h b/drivers/mtd/nand/raw/pxa3xx_nand.h
index d7304d0b34e..5d8c886855f 100644
--- a/drivers/mtd/nand/raw/pxa3xx_nand.h
+++ b/drivers/mtd/nand/raw/pxa3xx_nand.h
@@ -4,6 +4,7 @@
 #include <stdbool.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
+#include <linux/types.h>
 
 struct pxa3xx_nand_timing {
 	unsigned int	tCH;  /* Enable signal hold time */
diff --git a/drivers/mtd/nand/raw/stm32_fmc2_nand.c b/drivers/mtd/nand/raw/stm32_fmc2_nand.c
index 21b5c859467..33135f24408 100644
--- a/drivers/mtd/nand/raw/stm32_fmc2_nand.c
+++ b/drivers/mtd/nand/raw/stm32_fmc2_nand.c
@@ -6,10 +6,13 @@
 
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
 #include <nand.h>
 #include <reset.h>
+#include <stdbool.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/err.h>
diff --git a/drivers/mtd/nand/raw/sunxi_nand.c b/drivers/mtd/nand/raw/sunxi_nand.c
index 025f18ad49d..4d17d138619 100644
--- a/drivers/mtd/nand/raw/sunxi_nand.c
+++ b/drivers/mtd/nand/raw/sunxi_nand.c
@@ -25,10 +25,12 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <fdtdec.h>
 #include <malloc.h>
 #include <memalign.h>
 #include <nand.h>
+#include <stdbool.h>
 #include <time.h>
 #include <asm/global_data.h>
 #include <dm/device_compat.h>
@@ -39,6 +41,7 @@
 #include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <linux/kernel.h>
 #include <linux/mtd/mtd.h>
diff --git a/drivers/mtd/nand/raw/sunxi_nand_spl.c b/drivers/mtd/nand/raw/sunxi_nand_spl.c
index e24bd384c26..7ad486c5dbd 100644
--- a/drivers/mtd/nand/raw/sunxi_nand_spl.c
+++ b/drivers/mtd/nand/raw/sunxi_nand_spl.c
@@ -4,6 +4,7 @@
  * Copyright (c) 2015, AW-SOM Technologies <www.aw-som.com>
  */
 
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/io.h>
@@ -16,6 +17,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /* registers */
 #define NFC_CTL                    0x00000000
diff --git a/drivers/mtd/nand/raw/tegra_nand.c b/drivers/mtd/nand/raw/tegra_nand.c
index ace59249b9e..c8a31f29688 100644
--- a/drivers/mtd/nand/raw/tegra_nand.c
+++ b/drivers/mtd/nand/raw/tegra_nand.c
@@ -26,6 +26,7 @@
 #include <dm.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "tegra_nand.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/mtd/nand/raw/tegra_nand.h b/drivers/mtd/nand/raw/tegra_nand.h
index 77401606617..e65a36851ca 100644
--- a/drivers/mtd/nand/raw/tegra_nand.h
+++ b/drivers/mtd/nand/raw/tegra_nand.h
@@ -4,6 +4,7 @@
  */
 
 /* register offset */
+#include <asm/types.h>
 #define COMMAND_0		0x00
 #define CMD_GO			(1 << 31)
 #define CMD_CLE			(1 << 30)
diff --git a/drivers/mtd/nand/raw/vf610_nfc.c b/drivers/mtd/nand/raw/vf610_nfc.c
index 49cf29a7abe..df86cc6b48d 100644
--- a/drivers/mtd/nand/raw/vf610_nfc.c
+++ b/drivers/mtd/nand/raw/vf610_nfc.c
@@ -22,6 +22,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <malloc.h>
 #include <stdio.h>
 #include <time.h>
@@ -30,6 +31,7 @@
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/rawnand.h>
diff --git a/drivers/mtd/nand/raw/zynq_nand.c b/drivers/mtd/nand/raw/zynq_nand.c
index 6af6b7bd844..2b177a4cf83 100644
--- a/drivers/mtd/nand/raw/zynq_nand.c
+++ b/drivers/mtd/nand/raw/zynq_nand.c
@@ -7,10 +7,13 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <nand.h>
diff --git a/drivers/mtd/nand/spi/core.c b/drivers/mtd/nand/spi/core.c
index 99622a335a3..123cb6dc123 100644
--- a/drivers/mtd/nand/spi/core.c
+++ b/drivers/mtd/nand/spi/core.c
@@ -24,6 +24,7 @@
 #include <errno.h>
 #include <spi.h>
 #include <spi-mem.h>
+#include <stdbool.h>
 #include <time.h>
 #include <vsprintf.h>
 #include <dm/device_compat.h>
@@ -34,6 +35,7 @@
 #include <linux/mtd/spinand.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #endif
 
 /* SPI NAND index visible in MTD names */
diff --git a/drivers/mtd/nand/spi/gigadevice.c b/drivers/mtd/nand/spi/gigadevice.c
index 465f18642b0..c291f02b9b5 100644
--- a/drivers/mtd/nand/spi/gigadevice.c
+++ b/drivers/mtd/nand/spi/gigadevice.c
@@ -11,6 +11,7 @@
 #include <linux/device.h>
 #include <linux/kernel.h>
 #endif
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/mtd/spinand.h>
 
diff --git a/drivers/mtd/nand/spi/macronix.c b/drivers/mtd/nand/spi/macronix.c
index 83f9daaf579..0929d2b5dc2 100644
--- a/drivers/mtd/nand/spi/macronix.c
+++ b/drivers/mtd/nand/spi/macronix.c
@@ -10,6 +10,7 @@
 #include <linux/device.h>
 #include <linux/kernel.h>
 #endif
+#include <asm/types.h>
 #include <linux/bug.h>
 #include <linux/errno.h>
 #include <linux/mtd/spinand.h>
diff --git a/drivers/mtd/nand/spi/micron.c b/drivers/mtd/nand/spi/micron.c
index 5fde4a78d23..b2978b59a11 100644
--- a/drivers/mtd/nand/spi/micron.c
+++ b/drivers/mtd/nand/spi/micron.c
@@ -11,6 +11,7 @@
 #include <linux/device.h>
 #include <linux/kernel.h>
 #endif
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/mtd/spinand.h>
diff --git a/drivers/mtd/nand/spi/toshiba.c b/drivers/mtd/nand/spi/toshiba.c
index d0b003d2957..6895f364800 100644
--- a/drivers/mtd/nand/spi/toshiba.c
+++ b/drivers/mtd/nand/spi/toshiba.c
@@ -11,6 +11,7 @@
 #include <linux/device.h>
 #include <linux/kernel.h>
 #endif
+#include <asm/types.h>
 #include <linux/bug.h>
 #include <linux/errno.h>
 #include <linux/mtd/spinand.h>
diff --git a/drivers/mtd/nand/spi/winbond.c b/drivers/mtd/nand/spi/winbond.c
index 4e1c8883b38..ac7fc3d1311 100644
--- a/drivers/mtd/nand/spi/winbond.c
+++ b/drivers/mtd/nand/spi/winbond.c
@@ -12,6 +12,7 @@
 #include <linux/device.h>
 #include <linux/kernel.h>
 #endif
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/mtd/spinand.h>
diff --git a/drivers/mtd/onenand/onenand_base.c b/drivers/mtd/onenand/onenand_base.c
index f576aea331c..80fb722e357 100644
--- a/drivers/mtd/onenand/onenand_base.c
+++ b/drivers/mtd/onenand/onenand_base.c
@@ -20,6 +20,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <log.h>
 #include <time.h>
 #include <vsprintf.h>
@@ -31,6 +32,7 @@
 #include <linux/mtd/mtd.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "linux/mtd/flashchip.h"
 #include <linux/mtd/onenand.h>
 
diff --git a/drivers/mtd/onenand/onenand_bbt.c b/drivers/mtd/onenand/onenand_bbt.c
index a698961597f..f698272d85a 100644
--- a/drivers/mtd/onenand/onenand_bbt.c
+++ b/drivers/mtd/onenand/onenand_bbt.c
@@ -23,6 +23,7 @@
 #include <malloc.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <linux/errno.h>
 
diff --git a/drivers/mtd/onenand/onenand_spl.c b/drivers/mtd/onenand/onenand_spl.c
index 69c529e658d..71593822059 100644
--- a/drivers/mtd/onenand/onenand_spl.c
+++ b/drivers/mtd/onenand/onenand_spl.c
@@ -14,6 +14,7 @@
 #include <linux/mtd/onenand_regs.h>
 #include <onenand_uboot.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /*
  * Device geometry:
diff --git a/drivers/mtd/onenand/samsung.c b/drivers/mtd/onenand/samsung.c
index be6c8e1def3..7f6f9a45026 100644
--- a/drivers/mtd/onenand/samsung.c
+++ b/drivers/mtd/onenand/samsung.c
@@ -10,6 +10,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <malloc.h>
 #include <stdio.h>
 #include <linux/compat.h>
@@ -19,6 +20,7 @@
 #include <linux/mtd/samsung_onenand.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <asm/io.h>
 #include <linux/errno.h>
diff --git a/drivers/mtd/pic32_flash.c b/drivers/mtd/pic32_flash.c
index 3daa76f949a..3c36297d046 100644
--- a/drivers/mtd/pic32_flash.c
+++ b/drivers/mtd/pic32_flash.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <dm.h>
 #include <fdt_support.h>
@@ -17,6 +18,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <mach/pic32.h>
 #include <wait_bit.h>
 
diff --git a/drivers/mtd/renesas_rpc_hf.c b/drivers/mtd/renesas_rpc_hf.c
index 0531db38831..57312eae09e 100644
--- a/drivers/mtd/renesas_rpc_hf.c
+++ b/drivers/mtd/renesas_rpc_hf.c
@@ -8,6 +8,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <malloc.h>
 #include <stdbool.h>
 #include <stdio.h>
@@ -25,6 +26,7 @@
 #include <wait_bit.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <mtd/cfi_flash.h>
 
 #define RPC_CMNCR		0x0000	/* R/W */
diff --git a/drivers/mtd/spi/fsl_espi_spl.c b/drivers/mtd/spi/fsl_espi_spl.c
index 5a3b5abd5c7..802c1f51b4d 100644
--- a/drivers/mtd/spi/fsl_espi_spl.c
+++ b/drivers/mtd/spi/fsl_espi_spl.c
@@ -10,6 +10,7 @@
 #include <malloc.h>
 #include <stdio.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define ESPI_BOOT_IMAGE_SIZE	0x48
 #define ESPI_BOOT_IMAGE_ADDR	0x50
diff --git a/drivers/mtd/spi/sandbox.c b/drivers/mtd/spi/sandbox.c
index 424c74d74fd..8d70f7a8235 100644
--- a/drivers/mtd/spi/sandbox.c
+++ b/drivers/mtd/spi/sandbox.c
@@ -20,6 +20,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <spi_flash.h>
 #include "sf_internal.h"
diff --git a/drivers/mtd/spi/sf-uclass.c b/drivers/mtd/spi/sf-uclass.c
index 354d7b47f0f..47bb546ff11 100644
--- a/drivers/mtd/spi/sf-uclass.c
+++ b/drivers/mtd/spi/sf-uclass.c
@@ -13,6 +13,7 @@
 #include <asm/global_data.h>
 #include <dm/device-internal.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "sf_internal.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/mtd/spi/sf_dataflash.c b/drivers/mtd/spi/sf_dataflash.c
index 558cf39ba67..e7e57e59d0b 100644
--- a/drivers/mtd/spi/sf_dataflash.c
+++ b/drivers/mtd/spi/sf_dataflash.c
@@ -24,6 +24,7 @@
 #include <linux/kernel.h>
 #include <linux/math64.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "sf_internal.h"
 
diff --git a/drivers/mtd/spi/sf_mtd.c b/drivers/mtd/spi/sf_mtd.c
index cf9d79c9557..6f7c7fe9e46 100644
--- a/drivers/mtd/spi/sf_mtd.c
+++ b/drivers/mtd/spi/sf_mtd.c
@@ -13,6 +13,7 @@
 #include <linux/mtd/mtd.h>
 #include <spi_flash.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static struct mtd_info sf_mtd_info;
 static bool sf_mtd_registered;
diff --git a/drivers/mtd/spi/sf_probe.c b/drivers/mtd/spi/sf_probe.c
index 8cf4acf45d6..f22e08bb978 100644
--- a/drivers/mtd/spi/sf_probe.c
+++ b/drivers/mtd/spi/sf_probe.c
@@ -17,6 +17,7 @@
 #include <stdio.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "sf_internal.h"
 
diff --git a/drivers/mtd/spi/spi-nor-core.c b/drivers/mtd/spi/spi-nor-core.c
index 62b9a78be3f..b8db3d33e0d 100644
--- a/drivers/mtd/spi/spi-nor-core.c
+++ b/drivers/mtd/spi/spi-nor-core.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <display_options.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <dm/device_compat.h>
@@ -25,6 +26,7 @@
 #include <linux/printk.h>
 #include <linux/sizes.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/spi-nor.h>
diff --git a/drivers/mtd/spi/spi-nor-tiny.c b/drivers/mtd/spi/spi-nor-tiny.c
index dead5679e89..f2d500c2cc4 100644
--- a/drivers/mtd/spi/spi-nor-tiny.c
+++ b/drivers/mtd/spi/spi-nor-tiny.c
@@ -11,6 +11,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <dm/device_compat.h>
@@ -22,6 +23,7 @@
 #include <linux/printk.h>
 #include <linux/sizes.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/spi-nor.h>
diff --git a/drivers/mtd/st_smi.c b/drivers/mtd/st_smi.c
index 6488897b438..9ed46e137b5 100644
--- a/drivers/mtd/st_smi.c
+++ b/drivers/mtd/st_smi.c
@@ -13,6 +13,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/mtd/st_smi.h>
+#include <linux/types.h>
 
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
diff --git a/drivers/mtd/stm32_flash.c b/drivers/mtd/stm32_flash.c
index 703afc7a07e..f47976a3238 100644
--- a/drivers/mtd/stm32_flash.c
+++ b/drivers/mtd/stm32_flash.c
@@ -9,6 +9,7 @@
 #include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/stm32.h>
+#include <linux/types.h>
 #include "stm32_flash.h"
 
 flash_info_t flash_info[CONFIG_SYS_MAX_FLASH_BANKS];
diff --git a/drivers/mtd/stm32_flash.h b/drivers/mtd/stm32_flash.h
index 8cb81ef68c7..d8a95006d9e 100644
--- a/drivers/mtd/stm32_flash.h
+++ b/drivers/mtd/stm32_flash.h
@@ -1,3 +1,4 @@
+#include <asm/types.h>
 struct stm32_flash_regs {
 	u32 acr;
 	u32 key;
diff --git a/drivers/mtd/ubi/attach.c b/drivers/mtd/ubi/attach.c
index 2fdf3dbc658..f3423fc2b1a 100644
--- a/drivers/mtd/ubi/attach.c
+++ b/drivers/mtd/ubi/attach.c
@@ -11,6 +11,7 @@
  * This sub-system is responsible for attaching MTD devices and it also
  * implements flash media scanning.
  *
+#include <linux/types.h>
  * The attaching information is represented by a &struct ubi_attach_info'
  * object. Information about volumes is represented by &struct ubi_ainf_volume
  * objects which are kept in volume RB-tree with root at the @volumes field.
diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c
index f0f63ae7df0..e06f79e20f2 100644
--- a/drivers/mtd/ubi/build.c
+++ b/drivers/mtd/ubi/build.c
@@ -31,12 +31,14 @@
 #include <linux/slab.h>
 #include <linux/major.h>
 #else
+#include <stdbool.h>
 #include <vsprintf.h>
 #include <linux/bug.h>
 #include <linux/errno.h>
 #include <linux/log2.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #endif
 #include <linux/err.h>
 #include <ubi_uboot.h>
diff --git a/drivers/mtd/ubi/crc32table.h b/drivers/mtd/ubi/crc32table.h
index 02ce6fd9017..3b18c183382 100644
--- a/drivers/mtd/ubi/crc32table.h
+++ b/drivers/mtd/ubi/crc32table.h
@@ -1,5 +1,6 @@
 /* this file is generated - do not edit */
 
+#include <asm/types.h>
 static const u32 crc32table_le[] = {
 tole(0x00000000L), tole(0x77073096L), tole(0xee0e612cL), tole(0x990951baL),
 tole(0x076dc419L), tole(0x706af48fL), tole(0xe963a535L), tole(0x9e6495a3L),
diff --git a/drivers/mtd/ubi/debug.c b/drivers/mtd/ubi/debug.c
index 705a05ae77d..b095abb878d 100644
--- a/drivers/mtd/ubi/debug.c
+++ b/drivers/mtd/ubi/debug.c
@@ -14,6 +14,7 @@
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "ubi.h"
 #ifndef __UBOOT__
 #include <linux/debugfs.h>
diff --git a/drivers/mtd/ubi/eba.c b/drivers/mtd/ubi/eba.c
index 7f797c517b2..0cf5a6914db 100644
--- a/drivers/mtd/ubi/eba.c
+++ b/drivers/mtd/ubi/eba.c
@@ -18,6 +18,7 @@
  * accessing a logical eraseblock it is locked for reading or writing. The
  * per-logical eraseblock locking is implemented by means of the lock tree. The
  * lock tree is an RB-tree which refers all the currently locked logical
+#include <linux/types.h>
  * eraseblocks. The lock tree elements are &struct ubi_ltree_entry objects.
  * They are indexed by (@vol_id, @lnum) pairs.
  *
diff --git a/drivers/mtd/ubi/fastmap.c b/drivers/mtd/ubi/fastmap.c
index 38983fb7356..0e01f06c849 100644
--- a/drivers/mtd/ubi/fastmap.c
+++ b/drivers/mtd/ubi/fastmap.c
@@ -20,6 +20,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #endif
 
 #include <linux/compat.h>
diff --git a/drivers/mtd/ubi/io.c b/drivers/mtd/ubi/io.c
index e5dafaf5ff6..9076707baef 100644
--- a/drivers/mtd/ubi/io.c
+++ b/drivers/mtd/ubi/io.c
@@ -66,6 +66,7 @@
  * 512-byte chunks, we have to allocate one more buffer and copy our VID header
  * to offset 448 of this buffer.
  *
+#include <linux/types.h>
  * The I/O sub-system does the following trick in order to avoid this extra
  * copy. It always allocates a @ubi->vid_hdr_alsize bytes buffer for the VID
  * header and returns a pointer to offset @ubi->vid_hdr_shift of this buffer.
diff --git a/drivers/mtd/ubi/misc.c b/drivers/mtd/ubi/misc.c
index 6574760288d..a5dcd9dd568 100644
--- a/drivers/mtd/ubi/misc.c
+++ b/drivers/mtd/ubi/misc.c
@@ -12,6 +12,7 @@
 #include <ubi_uboot.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include "ubi.h"
 
 /**
diff --git a/drivers/mtd/ubi/ubi-media.h b/drivers/mtd/ubi/ubi-media.h
index 4af85c4247b..9d0e1d7889f 100644
--- a/drivers/mtd/ubi/ubi-media.h
+++ b/drivers/mtd/ubi/ubi-media.h
@@ -11,6 +11,8 @@
 
 /*
  * This file defines the layout of UBI headers and all the other UBI on-flash
+#include <compiler.h>
+#include <linux/types.h>
  * data structures.
  */
 
diff --git a/drivers/mtd/ubi/upd.c b/drivers/mtd/ubi/upd.c
index fff703a0f6c..da5298e570b 100644
--- a/drivers/mtd/ubi/upd.c
+++ b/drivers/mtd/ubi/upd.c
@@ -32,6 +32,7 @@
 #else
 #include <div64.h>
 #include <ubi_uboot.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
diff --git a/drivers/mtd/ubi/vmt.c b/drivers/mtd/ubi/vmt.c
index c9d28bb4d52..42b40d42f13 100644
--- a/drivers/mtd/ubi/vmt.c
+++ b/drivers/mtd/ubi/vmt.c
@@ -23,6 +23,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #endif
 #include <linux/math64.h>
 
diff --git a/drivers/mtd/ubi/vtbl.c b/drivers/mtd/ubi/vtbl.c
index b8e07872716..80d291d5c86 100644
--- a/drivers/mtd/ubi/vtbl.c
+++ b/drivers/mtd/ubi/vtbl.c
@@ -59,6 +59,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #endif
 
 #include <linux/err.h>
diff --git a/drivers/mtd/ubispl/ubispl.c b/drivers/mtd/ubispl/ubispl.c
index 2a1ad2ca157..a353cecddf9 100644
--- a/drivers/mtd/ubispl/ubispl.c
+++ b/drivers/mtd/ubispl/ubispl.c
@@ -13,6 +13,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <u-boot/crc.h>
 #include <ubispl.h>
 
diff --git a/drivers/net/ag7xxx.c b/drivers/net/ag7xxx.c
index b82ea522a69..b6b6d2eef07 100644
--- a/drivers/net/ag7xxx.c
+++ b/drivers/net/ag7xxx.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <clock_legacy.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <dm.h>
 #include <errno.h>
@@ -30,6 +31,7 @@
 #include <wait_bit.h>
 #include <asm/io.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <mach/ath79.h>
 
diff --git a/drivers/net/altera_tse.c b/drivers/net/altera_tse.c
index bf17d1fb29a..ca4cfba7389 100644
--- a/drivers/net/altera_tse.c
+++ b/drivers/net/altera_tse.c
@@ -26,6 +26,7 @@
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "altera_tse.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/net/altera_tse.h b/drivers/net/altera_tse.h
index 79509b80847..497e2082f5a 100644
--- a/drivers/net/altera_tse.h
+++ b/drivers/net/altera_tse.h
@@ -11,7 +11,9 @@
 #ifndef _ALTERA_TSE_H_
 #define _ALTERA_TSE_H_
 
+#include <compiler.h>
 #include <linux/bitops.h>
+#include <linux/types.h>
 #define __packed_1_    __packed __aligned(1)
 
 /* dma type */
diff --git a/drivers/net/armada100_fec.h b/drivers/net/armada100_fec.h
index b0e6d02b4af..a0f4b9f6c3a 100644
--- a/drivers/net/armada100_fec.h
+++ b/drivers/net/armada100_fec.h
@@ -12,6 +12,7 @@
 #ifndef __ARMADA100_FEC_H__
 #define __ARMADA100_FEC_H__
 
+#include <asm/types.h>
 #include <linux/kernel.h>
 #define PORT_NUM		0x0
 
diff --git a/drivers/net/at91_emac.c b/drivers/net/at91_emac.c
index 26381a1bc6e..4113ab68448 100644
--- a/drivers/net/at91_emac.c
+++ b/drivers/net/at91_emac.c
@@ -19,6 +19,7 @@
 #include <netdev.h>
 #include <malloc.h>
 #include <miiphy.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/net/ax88796.c b/drivers/net/ax88796.c
index d161f0e09c3..75e85742aec 100644
--- a/drivers/net/ax88796.c
+++ b/drivers/net/ax88796.c
@@ -4,6 +4,7 @@
  */
 #include <common.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 #include "ax88796.h"
 
 /*
diff --git a/drivers/net/ax88796.h b/drivers/net/ax88796.h
index 51060661066..462de3ce105 100644
--- a/drivers/net/ax88796.h
+++ b/drivers/net/ax88796.h
@@ -8,6 +8,7 @@
 #ifndef __DRIVERS_AX88796L_H__
 #define __DRIVERS_AX88796L_H__
 
+#include <linux/types.h>
 #define DP_DATA		(0x10 << 1)
 #define START_PG	0x40	/* First page of TX buffer */
 #define START_PG2	0x48
diff --git a/drivers/net/bcm-sf2-eth-gmac.c b/drivers/net/bcm-sf2-eth-gmac.c
index 8540b13951b..c75564dbe71 100644
--- a/drivers/net/bcm-sf2-eth-gmac.c
+++ b/drivers/net/bcm-sf2-eth-gmac.c
@@ -8,9 +8,11 @@
 #define DEBUG
 #include <linux/printk.h>
 #endif
+#include <stdbool.h>
 #include <stdio.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #endif
 
 #include <config.h>
diff --git a/drivers/net/bcm-sf2-eth-gmac.h b/drivers/net/bcm-sf2-eth-gmac.h
index 477667f4eaa..01ebccf8525 100644
--- a/drivers/net/bcm-sf2-eth-gmac.h
+++ b/drivers/net/bcm-sf2-eth-gmac.h
@@ -6,6 +6,7 @@
 #ifndef _BCM_SF2_ETH_GMAC_H_
 #define _BCM_SF2_ETH_GMAC_H_
 
+#include <linux/types.h>
 #define BCM_SF2_ETH_MAC_NAME	"gmac"
 
 #ifndef ETHHW_PORT_INT
diff --git a/drivers/net/bcm-sf2-eth.c b/drivers/net/bcm-sf2-eth.c
index db7930fb88e..63faf4bef13 100644
--- a/drivers/net/bcm-sf2-eth.c
+++ b/drivers/net/bcm-sf2-eth.c
@@ -15,6 +15,7 @@
 #include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <phy.h>
 #include <miiphy.h>
diff --git a/drivers/net/bcm-sf2-eth.h b/drivers/net/bcm-sf2-eth.h
index 4f81e0431c1..b7bc1e4244a 100644
--- a/drivers/net/bcm-sf2-eth.h
+++ b/drivers/net/bcm-sf2-eth.h
@@ -8,6 +8,7 @@
 
 #include <phy.h>
 #include <stdbool.h>
+#include <linux/types.h>
 
 #define RX_BUF_SIZE	2048
 /* RX_BUF_NUM must be power of 2 */
diff --git a/drivers/net/bcm6348-eth.c b/drivers/net/bcm6348-eth.c
index afb81ab187b..d87677737ed 100644
--- a/drivers/net/bcm6348-eth.c
+++ b/drivers/net/bcm6348-eth.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <dm.h>
 #include <dma.h>
 #include <log.h>
@@ -22,6 +23,7 @@
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 #define ETH_RX_DESC			PKTBUFSRX
 #define ETH_MAX_MTU_SIZE		1518
diff --git a/drivers/net/bcm6368-eth.c b/drivers/net/bcm6368-eth.c
index 3f18c5c5225..d3eb8e8b6cf 100644
--- a/drivers/net/bcm6368-eth.c
+++ b/drivers/net/bcm6368-eth.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <dm.h>
 #include <dma.h>
 #include <log.h>
@@ -24,6 +25,7 @@
 #include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define ETH_PORT_STR			"brcm,enetsw-port"
 
diff --git a/drivers/net/bcmgenet.c b/drivers/net/bcmgenet.c
index ca7888af89c..5ac8054694b 100644
--- a/drivers/net/bcmgenet.c
+++ b/drivers/net/bcmgenet.c
@@ -39,6 +39,7 @@
 #include <linux/sizes.h>
 #include <asm/dma-mapping.h>
 #include <wait_bit.h>
+#include <linux/types.h>
 
 /* Register definitions derived from Linux source */
 #define SYS_REV_CTRL			0x00
diff --git a/drivers/net/calxedaxgmac.c b/drivers/net/calxedaxgmac.c
index 37c3a54761b..c24056390d8 100644
--- a/drivers/net/calxedaxgmac.c
+++ b/drivers/net/calxedaxgmac.c
@@ -15,6 +15,7 @@
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define TX_NUM_DESC			1
 #define RX_NUM_DESC			32
diff --git a/drivers/net/cs8900.c b/drivers/net/cs8900.c
index d58ae075830..78dadd9d162 100644
--- a/drivers/net/cs8900.c
+++ b/drivers/net/cs8900.c
@@ -31,6 +31,7 @@
 #include <net.h>
 #include <malloc.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 #include "cs8900.h"
 
 #undef DEBUG
diff --git a/drivers/net/cs8900.h b/drivers/net/cs8900.h
index 1a566ff7b2e..bfe1946a3ae 100644
--- a/drivers/net/cs8900.h
+++ b/drivers/net/cs8900.h
@@ -23,6 +23,7 @@
 
 #include <asm/types.h>
 #include <config.h>
+#include <linux/types.h>
 
 #define CS8900_DRIVERNAME "CS8900"
 /* although the registers are 16 bit, they are 32-bit aligned on the
diff --git a/drivers/net/dc2114x.c b/drivers/net/dc2114x.c
index 3f45aebcd03..ad14a07bdb0 100644
--- a/drivers/net/dc2114x.c
+++ b/drivers/net/dc2114x.c
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0+
 
 #include <common.h>
+#include <compiler.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/io.h>
@@ -15,6 +16,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define SROM_DLEVEL	0
 
diff --git a/drivers/net/designware.c b/drivers/net/designware.c
index ffb41e8bf1f..ca32b7e8979 100644
--- a/drivers/net/designware.c
+++ b/drivers/net/designware.c
@@ -34,6 +34,7 @@
 #include <asm/io.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <power/regulator.h>
 #include "designware.h"
 
diff --git a/drivers/net/designware.h b/drivers/net/designware.h
index ffaf5a14d07..de051c46dd8 100644
--- a/drivers/net/designware.h
+++ b/drivers/net/designware.h
@@ -9,6 +9,7 @@
 
 #include <asm/cache.h>
 #include <net.h>
+#include <linux/types.h>
 
 #if CONFIG_IS_ENABLED(DM_GPIO)
 #include <asm-generic/gpio.h>
diff --git a/drivers/net/dm9000x.c b/drivers/net/dm9000x.c
index 33cd6c72e19..d4eac00bae6 100644
--- a/drivers/net/dm9000x.c
+++ b/drivers/net/dm9000x.c
@@ -59,6 +59,7 @@ TODO: external MII is not functional, only internal at the moment.
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "dm9000x.h"
 
diff --git a/drivers/net/dnet.c b/drivers/net/dnet.c
index 675eb88c3d9..652127f9f30 100644
--- a/drivers/net/dnet.c
+++ b/drivers/net/dnet.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
diff --git a/drivers/net/dnet.h b/drivers/net/dnet.h
index fdb4fd2d391..c93c9714d09 100644
--- a/drivers/net/dnet.h
+++ b/drivers/net/dnet.h
@@ -11,6 +11,7 @@
 #ifndef __DRIVERS_DNET_H__
 #define __DRIVERS_DNET_H__
 
+#include <asm/types.h>
 #define DRIVERNAME "dnet"
 
 struct dnet_registers {
diff --git a/drivers/net/dwc_eth_qos.c b/drivers/net/dwc_eth_qos.c
index 5eb593e9eda..cca211708d7 100644
--- a/drivers/net/dwc_eth_qos.c
+++ b/drivers/net/dwc_eth_qos.c
@@ -8,6 +8,9 @@
 /*
  * This driver supports the Synopsys Designware Ethernet QOS (Quality Of
  * Service) IP block. The IP supports multiple options for bus type, clocking/
+#include <compiler.h>
+#include <stdbool.h>
+#include <linux/types.h>
  * reset structure, and feature list.
  *
  * The driver is written such that generic core logic is kept separate from
diff --git a/drivers/net/dwmac_socfpga.c b/drivers/net/dwmac_socfpga.c
index cddbd56ac7d..126ba1fe93d 100644
--- a/drivers/net/dwmac_socfpga.c
+++ b/drivers/net/dwmac_socfpga.c
@@ -13,6 +13,7 @@
 #include <regmap.h>
 #include <reset.h>
 #include <syscon.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include "designware.h"
 #include <dm/device_compat.h>
diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c
index 3d87e05c5b2..a157512cd96 100644
--- a/drivers/net/e1000.c
+++ b/drivers/net/e1000.c
@@ -39,6 +39,7 @@ tested on both gig copper and gig fiber boards
 #include <memalign.h>
 #include <net.h>
 #include <pci.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/u-boot.h>
@@ -46,6 +47,7 @@ tested on both gig copper and gig fiber boards
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "e1000.h"
 #include <asm/cache.h>
 
diff --git a/drivers/net/e1000.h b/drivers/net/e1000.h
index 2adfd38f273..75b2fff945c 100644
--- a/drivers/net/e1000.h
+++ b/drivers/net/e1000.h
@@ -12,6 +12,7 @@
 *******************************************************************************/
 
 /* e1000_hw.h
+#include <linux/types.h>
  * Structures, enums, and macros for the MAC
  */
 
diff --git a/drivers/net/e1000_spi.c b/drivers/net/e1000_spi.c
index 8200d428615..b5355adcb9f 100644
--- a/drivers/net/e1000_spi.c
+++ b/drivers/net/e1000_spi.c
@@ -1,11 +1,13 @@
 #include <common.h>
 #include <command.h>
 #include <console.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "e1000.h"
 #include <malloc.h>
 #include <linux/compiler.h>
diff --git a/drivers/net/eepro100.c b/drivers/net/eepro100.c
index d152063008b..b5c928f9425 100644
--- a/drivers/net/eepro100.c
+++ b/drivers/net/eepro100.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/io.h>
@@ -19,6 +20,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /* Ethernet chip registers. */
 #define SCB_STATUS		0	/* Rx/Command Unit Status *Word* */
diff --git a/drivers/net/ep93xx_eth.h b/drivers/net/ep93xx_eth.h
index 074fe25f347..69cd0c00c17 100644
--- a/drivers/net/ep93xx_eth.h
+++ b/drivers/net/ep93xx_eth.h
@@ -10,6 +10,7 @@
 #define _EP93XX_ETH_H
 
 #include <net.h>
+#include <linux/types.h>
 
 /**
  * #define this to dump device status and queue info during initialization and
diff --git a/drivers/net/ethoc.c b/drivers/net/ethoc.c
index c331cd9e97c..95f202e3b51 100644
--- a/drivers/net/ethoc.c
+++ b/drivers/net/ethoc.c
@@ -10,6 +10,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <dm.h>
 #include <log.h>
@@ -26,6 +27,7 @@
 #include <asm/cache.h>
 #include <wait_bit.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /* register offsets */
 #define	MODER		0x00
diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c
index bdf14afcd75..d37fc0d81d5 100644
--- a/drivers/net/fec_mxc.c
+++ b/drivers/net/fec_mxc.c
@@ -8,6 +8,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <dm.h>
 #include <env.h>
@@ -26,6 +27,7 @@
 #include <linux/delay.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <power/regulator.h>
 
 #include <asm/io.h>
diff --git a/drivers/net/fec_mxc.h b/drivers/net/fec_mxc.h
index 20e1712a077..485c270ef56 100644
--- a/drivers/net/fec_mxc.h
+++ b/drivers/net/fec_mxc.h
@@ -18,6 +18,7 @@
 
 #include <clk.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 /* Layout description of the FEC */
 struct ethernet_regs {
diff --git a/drivers/net/fm/b4860.c b/drivers/net/fm/b4860.c
index 5be0ad2ab3d..43e4bde900f 100644
--- a/drivers/net/fm/b4860.c
+++ b/drivers/net/fm/b4860.c
@@ -11,6 +11,7 @@
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
 #include <hwconfig.h>
+#include <asm/types.h>
 
 u32 port_to_devdisr[] = {
 	[FM1_DTSEC1] = FSL_CORENET_DEVDISR2_DTSEC1_1,
diff --git a/drivers/net/fm/eth.c b/drivers/net/fm/eth.c
index 0728ad6cacf..849b8c24a32 100644
--- a/drivers/net/fm/eth.c
+++ b/drivers/net/fm/eth.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <log.h>
 #include <part.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/io.h>
@@ -31,6 +32,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "fm.h"
 
diff --git a/drivers/net/fm/fdt.c b/drivers/net/fm/fdt.c
index 924632c3991..6a32f538d99 100644
--- a/drivers/net/fm/fdt.c
+++ b/drivers/net/fm/fdt.c
@@ -8,6 +8,7 @@
 #include <env.h>
 #include <fdt_support.h>
 #include <fsl_qe.h>	/* For struct qe_firmware */
+#include <linux/types.h>
 #include <u-boot/crc.h>
 
 #ifdef CONFIG_SYS_DPAA_FMAN
diff --git a/drivers/net/fm/fm.c b/drivers/net/fm/fm.c
index 964dc01884b..64e0a692810 100644
--- a/drivers/net/fm/fm.c
+++ b/drivers/net/fm/fm.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <u-boot/crc.h>
 #ifdef CONFIG_DM_ETH
 #include <dm.h>
diff --git a/drivers/net/fm/fm.h b/drivers/net/fm/fm.h
index 2379b3a11ca..b31c515fe82 100644
--- a/drivers/net/fm/fm.h
+++ b/drivers/net/fm/fm.h
@@ -10,6 +10,7 @@
 #include <phy.h>
 #include <fm_eth.h>
 #include <fsl_fman.h>
+#include <linux/types.h>
 
 /* Port ID */
 #define OH_PORT_ID_BASE		0x01
diff --git a/drivers/net/fm/init.c b/drivers/net/fm/init.c
index de4db412704..fe56b986514 100644
--- a/drivers/net/fm/init.c
+++ b/drivers/net/fm/init.c
@@ -18,6 +18,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "fm.h"
 
diff --git a/drivers/net/fm/ls1043.c b/drivers/net/fm/ls1043.c
index ba4da69423a..d476a7f14e3 100644
--- a/drivers/net/fm/ls1043.c
+++ b/drivers/net/fm/ls1043.c
@@ -7,6 +7,7 @@
 #include <fm_eth.h>
 #include <asm/io.h>
 #include <asm/arch/fsl_serdes.h>
+#include <asm/types.h>
 
 #define FSL_CHASSIS2_RCWSR13_EC1		0xe0000000 /* bits 416..418 */
 #define FSL_CHASSIS2_RCWSR13_EC1_DTSEC3_RGMII	0x00000000
diff --git a/drivers/net/fm/ls1046.c b/drivers/net/fm/ls1046.c
index 49b540bd30b..63d8804c11c 100644
--- a/drivers/net/fm/ls1046.c
+++ b/drivers/net/fm/ls1046.c
@@ -7,6 +7,7 @@
 #include <fm_eth.h>
 #include <asm/io.h>
 #include <asm/arch/fsl_serdes.h>
+#include <asm/types.h>
 
 #define FSL_CHASSIS2_RCWSR13_EC1		0xe0000000 /* bits 416..418 */
 #define FSL_CHASSIS2_RCWSR13_EC1_DTSEC3_RGMII	0x00000000
diff --git a/drivers/net/fm/memac_phy.c b/drivers/net/fm/memac_phy.c
index 79a15989ad9..85f2156efcc 100644
--- a/drivers/net/fm/memac_phy.c
+++ b/drivers/net/fm/memac_phy.c
@@ -15,6 +15,7 @@
 #include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_SYS_MEMAC_LITTLE_ENDIAN
 #define memac_out_32(a, v)	out_le32(a, v)
diff --git a/drivers/net/fm/p1023.c b/drivers/net/fm/p1023.c
index d4167e4d696..de3bc19f46a 100644
--- a/drivers/net/fm/p1023.c
+++ b/drivers/net/fm/p1023.c
@@ -8,6 +8,7 @@
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
+#include <asm/types.h>
 
 static u32 port_to_devdisr[] = {
 	[FM1_DTSEC1] = MPC85xx_DEVDISR_TSEC1,
diff --git a/drivers/net/fm/p4080.c b/drivers/net/fm/p4080.c
index b78b02d8284..255e0680f34 100644
--- a/drivers/net/fm/p4080.c
+++ b/drivers/net/fm/p4080.c
@@ -8,6 +8,7 @@
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
+#include <asm/types.h>
 
 static u32 port_to_devdisr[] = {
 	[FM1_DTSEC1] = FSL_CORENET_DEVDISR2_DTSEC1_1,
diff --git a/drivers/net/fm/p5020.c b/drivers/net/fm/p5020.c
index 81895312153..ba59775776f 100644
--- a/drivers/net/fm/p5020.c
+++ b/drivers/net/fm/p5020.c
@@ -8,6 +8,7 @@
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
+#include <asm/types.h>
 
 static u32 port_to_devdisr[] = {
 	[FM1_DTSEC1] = FSL_CORENET_DEVDISR2_DTSEC1_1,
diff --git a/drivers/net/fm/p5040.c b/drivers/net/fm/p5040.c
index 38744e7b7b3..9d1b6bd590e 100644
--- a/drivers/net/fm/p5040.c
+++ b/drivers/net/fm/p5040.c
@@ -8,6 +8,7 @@
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
+#include <asm/types.h>
 
 u32 port_to_devdisr[] = {
 	[FM1_DTSEC1] = FSL_CORENET_DEVDISR2_DTSEC1_1,
diff --git a/drivers/net/fm/t1024.c b/drivers/net/fm/t1024.c
index 6fc3b903370..405b3dec7ef 100644
--- a/drivers/net/fm/t1024.c
+++ b/drivers/net/fm/t1024.c
@@ -5,10 +5,12 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <phy.h>
 #include <fm_eth.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
+#include <asm/types.h>
 
 u32 port_to_devdisr[] = {
 	[FM1_DTSEC1] = FSL_CORENET_DEVDISR2_DTSEC1_1,
diff --git a/drivers/net/fm/t1040.c b/drivers/net/fm/t1040.c
index af4f5c56107..ee6625d9afa 100644
--- a/drivers/net/fm/t1040.c
+++ b/drivers/net/fm/t1040.c
@@ -8,6 +8,7 @@
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
+#include <asm/types.h>
 
 phy_interface_t fman_port_enet_if(enum fm_port port)
 {
diff --git a/drivers/net/fm/t2080.c b/drivers/net/fm/t2080.c
index f4d8d2d869a..b893ae0931c 100644
--- a/drivers/net/fm/t2080.c
+++ b/drivers/net/fm/t2080.c
@@ -6,10 +6,12 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <phy.h>
 #include <fm_eth.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
+#include <asm/types.h>
 
 u32 port_to_devdisr[] = {
 	[FM1_DTSEC1] = FSL_CORENET_DEVDISR2_DTSEC1_1,
diff --git a/drivers/net/fm/t4240.c b/drivers/net/fm/t4240.c
index f8e63c3d719..fbcfd1d6429 100644
--- a/drivers/net/fm/t4240.c
+++ b/drivers/net/fm/t4240.c
@@ -4,11 +4,13 @@
  *	Roy Zang <tie-fei.zang@freescale.com>
  */
 #include <common.h>
+#include <compiler.h>
 #include <phy.h>
 #include <fm_eth.h>
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
+#include <asm/types.h>
 
 u32 port_to_devdisr[] = {
 	[FM1_DTSEC1] = FSL_CORENET_DEVDISR2_DTSEC1_1,
diff --git a/drivers/net/fm/tgec_phy.c b/drivers/net/fm/tgec_phy.c
index 7afcf01916f..deef335ce17 100644
--- a/drivers/net/fm/tgec_phy.c
+++ b/drivers/net/fm/tgec_phy.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <fsl_tgec.h>
 #include <fm_eth.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
 
diff --git a/drivers/net/fsl-mc/dpbp.c b/drivers/net/fsl-mc/dpbp.c
index c609efb9abc..191fd8e4a72 100644
--- a/drivers/net/fsl-mc/dpbp.c
+++ b/drivers/net/fsl-mc/dpbp.c
@@ -8,6 +8,7 @@
 #include <fsl-mc/fsl_mc_sys.h>
 #include <fsl-mc/fsl_mc_cmd.h>
 #include <fsl-mc/fsl_dpbp.h>
+#include <linux/types.h>
 
 int dpbp_open(struct fsl_mc_io *mc_io,
 	      uint32_t cmd_flags,
diff --git a/drivers/net/fsl-mc/dpio/dpio.c b/drivers/net/fsl-mc/dpio/dpio.c
index 8884455963d..415f49ce8b1 100644
--- a/drivers/net/fsl-mc/dpio/dpio.c
+++ b/drivers/net/fsl-mc/dpio/dpio.c
@@ -7,6 +7,7 @@
 #include <fsl-mc/fsl_mc_sys.h>
 #include <fsl-mc/fsl_mc_cmd.h>
 #include <fsl-mc/fsl_dpio.h>
+#include <linux/types.h>
 
 int dpio_open(struct fsl_mc_io *mc_io,
 	      uint32_t cmd_flags,
diff --git a/drivers/net/fsl-mc/dpio/qbman_portal.c b/drivers/net/fsl-mc/dpio/qbman_portal.c
index fb325846322..56eb6a08c2a 100644
--- a/drivers/net/fsl-mc/dpio/qbman_portal.c
+++ b/drivers/net/fsl-mc/dpio/qbman_portal.c
@@ -10,6 +10,7 @@
 #include <linux/bug.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "qbman_portal.h"
 
 /* QBMan portal management command codes */
diff --git a/drivers/net/fsl-mc/dpio/qbman_sys.h b/drivers/net/fsl-mc/dpio/qbman_sys.h
index 2d94d91129d..1a94ba5912f 100644
--- a/drivers/net/fsl-mc/dpio/qbman_sys.h
+++ b/drivers/net/fsl-mc/dpio/qbman_sys.h
@@ -20,10 +20,12 @@
 
 /* Trace the 3 different classes of read/write access to QBMan. #undef as
  * required. */
+#include <compiler.h>
 #include <stdio.h>
 #include <linux/bug.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #undef QBMAN_CCSR_TRACE
 #undef QBMAN_CINH_TRACE
 #undef QBMAN_CENA_TRACE
diff --git a/drivers/net/fsl-mc/dpmac.c b/drivers/net/fsl-mc/dpmac.c
index 43a2ff43f88..dce22ac7531 100644
--- a/drivers/net/fsl-mc/dpmac.c
+++ b/drivers/net/fsl-mc/dpmac.c
@@ -10,6 +10,7 @@
 #include <fsl-mc/fsl_mc_sys.h>
 #include <fsl-mc/fsl_mc_cmd.h>
 #include <fsl-mc/fsl_dpmac.h>
+#include <linux/types.h>
 
 int dpmac_open(struct fsl_mc_io *mc_io,
 	       uint32_t cmd_flags,
diff --git a/drivers/net/fsl-mc/dpmng.c b/drivers/net/fsl-mc/dpmng.c
index 8314243f356..5ec493f5c36 100644
--- a/drivers/net/fsl-mc/dpmng.c
+++ b/drivers/net/fsl-mc/dpmng.c
@@ -4,6 +4,7 @@
 #include <fsl-mc/fsl_mc_sys.h>
 #include <fsl-mc/fsl_mc_cmd.h>
 #include <fsl-mc/fsl_dpmng.h>
+#include <linux/types.h>
 #include "fsl_dpmng_cmd.h"
 
 int mc_get_version(struct fsl_mc_io *mc_io,
diff --git a/drivers/net/fsl-mc/dpni.c b/drivers/net/fsl-mc/dpni.c
index 443e430695e..60e0e55270e 100644
--- a/drivers/net/fsl-mc/dpni.c
+++ b/drivers/net/fsl-mc/dpni.c
@@ -7,6 +7,7 @@
 #include <fsl-mc/fsl_mc_sys.h>
 #include <fsl-mc/fsl_mc_cmd.h>
 #include <fsl-mc/fsl_dpni.h>
+#include <linux/types.h>
 
 int dpni_prepare_cfg(const struct dpni_cfg	*cfg,
 		     uint8_t			*cfg_buf)
diff --git a/drivers/net/fsl-mc/dprc.c b/drivers/net/fsl-mc/dprc.c
index e0a2865ab8f..bf96188d19d 100644
--- a/drivers/net/fsl-mc/dprc.c
+++ b/drivers/net/fsl-mc/dprc.c
@@ -9,6 +9,7 @@
 #include <fsl-mc/fsl_mc_sys.h>
 #include <fsl-mc/fsl_mc_cmd.h>
 #include <fsl-mc/fsl_dprc.h>
+#include <linux/types.h>
 
 int dprc_get_container_id(struct fsl_mc_io *mc_io,
 			  uint32_t cmd_flags,
diff --git a/drivers/net/fsl-mc/dpsparser.c b/drivers/net/fsl-mc/dpsparser.c
index cfd1ba66a05..7a5e05c7cd3 100644
--- a/drivers/net/fsl-mc/dpsparser.c
+++ b/drivers/net/fsl-mc/dpsparser.c
@@ -4,6 +4,7 @@
  *
  * Copyright 2018 NXP
  */
+#include <asm/types.h>
 #include <fsl-mc/fsl_mc_sys.h>
 #include <fsl-mc/fsl_mc_cmd.h>
 #include <fsl-mc/fsl_dpsparser.h>
diff --git a/drivers/net/fsl-mc/fsl_dpmng_cmd.h b/drivers/net/fsl-mc/fsl_dpmng_cmd.h
index e18c88da097..f1ad0f3c422 100644
--- a/drivers/net/fsl-mc/fsl_dpmng_cmd.h
+++ b/drivers/net/fsl-mc/fsl_dpmng_cmd.h
@@ -6,6 +6,7 @@
 #define __FSL_DPMNG_CMD_H
 
 /* Command IDs */
+#include <linux/types.h>
 #define DPMNG_CMDID_GET_VERSION			0x8311
 
 /*                cmd, param, offset, width, type, arg_name */
diff --git a/drivers/net/fsl-mc/mc.c b/drivers/net/fsl-mc/mc.c
index 3a82f4f065f..889f6e6f2dc 100644
--- a/drivers/net/fsl-mc/mc.c
+++ b/drivers/net/fsl-mc/mc.c
@@ -5,12 +5,14 @@
  */
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <env.h>
 #include <errno.h>
 #include <image.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
@@ -34,6 +36,7 @@
 #include <fsl-mc/fsl_qbman_portal.h>
 #include <fsl-mc/ldpaa_wriop.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define MC_RAM_BASE_ADDR_ALIGNMENT  (512UL * 1024 * 1024)
 #define MC_RAM_BASE_ADDR_ALIGNMENT_MASK	(~(MC_RAM_BASE_ADDR_ALIGNMENT - 1))
diff --git a/drivers/net/fsl-mc/mc_sys.c b/drivers/net/fsl-mc/mc_sys.c
index aa50e64bced..5d379d26a9e 100644
--- a/drivers/net/fsl-mc/mc_sys.c
+++ b/drivers/net/fsl-mc/mc_sys.c
@@ -14,6 +14,7 @@
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #define MC_CMD_HDR_READ_CMDID(_hdr) \
 	((uint16_t)mc_dec((_hdr), MC_CMD_HDR_CMDID_O, MC_CMD_HDR_CMDID_S))
diff --git a/drivers/net/fsl_enetc.c b/drivers/net/fsl_enetc.c
index a6c6e578193..9f1920c3b8c 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 <stdbool.h>
 #include <vsprintf.h>
 #include <asm/cache.h>
 #include <asm/io.h>
@@ -21,6 +22,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "fsl_enetc.h"
 
diff --git a/drivers/net/fsl_enetc.h b/drivers/net/fsl_enetc.h
index 37e7e858435..f659470da37 100644
--- a/drivers/net/fsl_enetc.h
+++ b/drivers/net/fsl_enetc.h
@@ -8,6 +8,7 @@
 #define _ENETC_H
 
 #include <linux/bitops.h>
+#include <linux/types.h>
 #define enetc_dbg(dev, fmt, args...)	debug("%s:" fmt, dev->name, ##args)
 
 /* PCI function IDs */
diff --git a/drivers/net/fsl_enetc_mdio.c b/drivers/net/fsl_enetc_mdio.c
index 282c08c82f5..8a7eff48087 100644
--- a/drivers/net/fsl_enetc_mdio.c
+++ b/drivers/net/fsl_enetc_mdio.c
@@ -14,6 +14,7 @@
 #include <asm/io.h>
 #include <asm/processor.h>
 #include <miiphy.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 
 #include "fsl_enetc.h"
diff --git a/drivers/net/fsl_ls_mdio.c b/drivers/net/fsl_ls_mdio.c
index 6d8332d19ae..12978665905 100644
--- a/drivers/net/fsl_ls_mdio.c
+++ b/drivers/net/fsl_ls_mdio.c
@@ -9,6 +9,7 @@
 #include <miiphy.h>
 #include <asm/io.h>
 #include <fsl_memac.h>
+#include <asm/types.h>
 
 #ifdef CONFIG_SYS_MEMAC_LITTLE_ENDIAN
 #define memac_out_32(a, v)	out_le32(a, v)
diff --git a/drivers/net/fsl_mcdmafec.c b/drivers/net/fsl_mcdmafec.c
index 64c1e71ebbe..c55fd6ff3e2 100644
--- a/drivers/net/fsl_mcdmafec.c
+++ b/drivers/net/fsl_mcdmafec.c
@@ -27,6 +27,7 @@
 #include <asm/immap.h>
 #include <asm/fsl_mcdmafec.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "MCD_dma.h"
 
diff --git a/drivers/net/fsl_mdio.c b/drivers/net/fsl_mdio.c
index 36fa90766c2..e7e2b941d16 100644
--- a/drivers/net/fsl_mdio.c
+++ b/drivers/net/fsl_mdio.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <miiphy.h>
 #include <phy.h>
 #include <fsl_mdio.h>
@@ -14,6 +15,7 @@
 #include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_DM_MDIO
 struct tsec_mdio_priv {
diff --git a/drivers/net/ftgmac100.c b/drivers/net/ftgmac100.c
index 5a057ebb46b..e6454b975bc 100644
--- a/drivers/net/ftgmac100.c
+++ b/drivers/net/ftgmac100.c
@@ -29,6 +29,7 @@
 #include <linux/iopoll.h>
 #include <linux/kernel.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 #include "ftgmac100.h"
 
diff --git a/drivers/net/ftmac100.c b/drivers/net/ftmac100.c
index 569f1e40047..42247cbf37d 100644
--- a/drivers/net/ftmac100.c
+++ b/drivers/net/ftmac100.c
@@ -21,6 +21,7 @@
 #include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "ftmac100.h"
 #ifdef CONFIG_DM_ETH
diff --git a/drivers/net/ftmac110.c b/drivers/net/ftmac110.c
index e7c7a5e885a..ebcff74fd4e 100644
--- a/drivers/net/ftmac110.c
+++ b/drivers/net/ftmac110.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <log.h>
 #include <malloc.h>
 #include <net.h>
@@ -21,6 +22,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #if defined(CONFIG_MII) || defined(CONFIG_CMD_MII)
 #include <miiphy.h>
diff --git a/drivers/net/ftmac110.h b/drivers/net/ftmac110.h
index a792b515b44..863dff44b6a 100644
--- a/drivers/net/ftmac110.h
+++ b/drivers/net/ftmac110.h
@@ -9,6 +9,7 @@
 #ifndef _FTMAC110_H
 #define _FTMAC110_H
 
+#include <linux/types.h>
 struct ftmac110_regs {
 	uint32_t isr;    /* 0x00: Interrups Status Register */
 	uint32_t imr;    /* 0x04: Interrupt Mask Register */
diff --git a/drivers/net/gmac_rockchip.c b/drivers/net/gmac_rockchip.c
index 55ce931cd2d..6d0e1363cbd 100644
--- a/drivers/net/gmac_rockchip.c
+++ b/drivers/net/gmac_rockchip.c
@@ -31,6 +31,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "designware.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/net/higmacv300.c b/drivers/net/higmacv300.c
index 7310d6a0426..8a8b6dc6aed 100644
--- a/drivers/net/higmacv300.c
+++ b/drivers/net/higmacv300.c
@@ -3,6 +3,7 @@
  * Copyright (c) 2019, Linaro Limited
  */
 
+#include <compiler.h>
 #include <cpu_func.h>
 #include <log.h>
 #include <malloc.h>
@@ -20,6 +21,7 @@
 #include <reset.h>
 #include <wait_bit.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define STATION_ADDR_LOW		0x0000
 #define STATION_ADDR_HIGH		0x0004
diff --git a/drivers/net/ks8851_mll.c b/drivers/net/ks8851_mll.c
index 86a97cdf573..f4ca7a1df95 100644
--- a/drivers/net/ks8851_mll.c
+++ b/drivers/net/ks8851_mll.c
@@ -17,6 +17,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include "ks8851_mll.h"
 
diff --git a/drivers/net/lan91c96.c b/drivers/net/lan91c96.c
index 559273e6760..1b0470a4896 100644
--- a/drivers/net/lan91c96.c
+++ b/drivers/net/lan91c96.c
@@ -55,6 +55,7 @@
 #include <linux/delay.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "lan91c96.h"
 #include <net.h>
 #include <linux/compiler.h>
diff --git a/drivers/net/ldpaa_eth/ldpaa_eth.c b/drivers/net/ldpaa_eth/ldpaa_eth.c
index 4b62225968f..615c767362b 100644
--- a/drivers/net/ldpaa_eth/ldpaa_eth.c
+++ b/drivers/net/ldpaa_eth/ldpaa_eth.c
@@ -26,6 +26,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <fsl-mc/ldpaa_wriop.h>
 #include "ldpaa_eth.h"
diff --git a/drivers/net/ldpaa_eth/ldpaa_eth.h b/drivers/net/ldpaa_eth/ldpaa_eth.h
index 2b3d31f7043..70f984dc61e 100644
--- a/drivers/net/ldpaa_eth/ldpaa_eth.h
+++ b/drivers/net/ldpaa_eth/ldpaa_eth.h
@@ -7,6 +7,7 @@
 #ifndef __LDPAA_ETH_H
 #define __LDPAA_ETH_H
 
+#include <compiler.h>
 #include <stdbool.h>
 #include <linux/netdevice.h>
 #include <fsl-mc/fsl_mc.h>
@@ -17,6 +18,7 @@
 #include <fsl-mc/fsl_dpio.h>
 #include <fsl-mc/fsl_qbman_portal.h>
 #include <fsl-mc/fsl_mc_private.h>
+#include <linux/types.h>
 
 
 enum ldpaa_eth_type {
diff --git a/drivers/net/ldpaa_eth/ldpaa_wriop.c b/drivers/net/ldpaa_eth/ldpaa_wriop.c
index e2ad13b8975..f58bb63e3a7 100644
--- a/drivers/net/ldpaa_eth/ldpaa_wriop.c
+++ b/drivers/net/ldpaa_eth/ldpaa_wriop.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <asm/io.h>
 #include <asm/types.h>
 #include <malloc.h>
diff --git a/drivers/net/ldpaa_eth/ls1088a.c b/drivers/net/ldpaa_eth/ls1088a.c
index 54cb16e51b1..d6ac0f40b85 100644
--- a/drivers/net/ldpaa_eth/ls1088a.c
+++ b/drivers/net/ldpaa_eth/ls1088a.c
@@ -3,7 +3,9 @@
  * Copyright 2017 NXP
  */
 #include <common.h>
+#include <compiler.h>
 #include <phy.h>
+#include <asm/types.h>
 #include <fsl-mc/ldpaa_wriop.h>
 #include <asm/io.h>
 #include <asm/arch/fsl_serdes.h>
diff --git a/drivers/net/ldpaa_eth/ls2080a.c b/drivers/net/ldpaa_eth/ls2080a.c
index 49eee044f35..efe558f536e 100644
--- a/drivers/net/ldpaa_eth/ls2080a.c
+++ b/drivers/net/ldpaa_eth/ls2080a.c
@@ -3,7 +3,9 @@
  * Copyright 2015 Freescale Semiconductor, Inc.
  */
 #include <common.h>
+#include <compiler.h>
 #include <phy.h>
+#include <asm/types.h>
 #include <fsl-mc/ldpaa_wriop.h>
 #include <asm/io.h>
 #include <asm/arch/fsl_serdes.h>
diff --git a/drivers/net/ldpaa_eth/lx2160a.c b/drivers/net/ldpaa_eth/lx2160a.c
index a61508befc8..8d66a5fb914 100644
--- a/drivers/net/ldpaa_eth/lx2160a.c
+++ b/drivers/net/ldpaa_eth/lx2160a.c
@@ -3,7 +3,9 @@
  * Copyright 2018 NXP
  */
 #include <common.h>
+#include <compiler.h>
 #include <phy.h>
+#include <asm/types.h>
 #include <fsl-mc/ldpaa_wriop.h>
 #include <asm/io.h>
 #include <asm/arch/fsl_serdes.h>
diff --git a/drivers/net/lpc32xx_eth.c b/drivers/net/lpc32xx_eth.c
index dd7b2e5a007..976a69c365c 100644
--- a/drivers/net/lpc32xx_eth.c
+++ b/drivers/net/lpc32xx_eth.c
@@ -11,6 +11,7 @@
 #include <net.h>
 #include <malloc.h>
 #include <miiphy.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/io.h>
 #include <asm/u-boot.h>
diff --git a/drivers/net/macb.c b/drivers/net/macb.c
index 783a90cb1fa..836019ea917 100644
--- a/drivers/net/macb.c
+++ b/drivers/net/macb.c
@@ -4,9 +4,11 @@
  */
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <dm.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
@@ -14,6 +16,7 @@
 #include <linux/delay.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /*
  * The u-boot networking stack is a little weird.  It seems like the
diff --git a/drivers/net/mcffec.c b/drivers/net/mcffec.c
index 91ca0e03216..083f622b3f0 100644
--- a/drivers/net/mcffec.c
+++ b/drivers/net/mcffec.c
@@ -26,6 +26,7 @@
 #include <linux/errno.h>
 #include <linux/mii.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #undef	ET_DEBUG
 #undef	MII_DEBUG
diff --git a/drivers/net/mcfmii.c b/drivers/net/mcfmii.c
index 21e558ee816..30b843c1b10 100644
--- a/drivers/net/mcfmii.c
+++ b/drivers/net/mcfmii.c
@@ -13,6 +13,7 @@
 #include <linux/delay.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_MCF547x_8x
 #include <asm/fsl_mcdmafec.h>
diff --git a/drivers/net/mdio_mux_i2creg.c b/drivers/net/mdio_mux_i2creg.c
index cc02b5ffd45..5f03e7cffd9 100644
--- a/drivers/net/mdio_mux_i2creg.c
+++ b/drivers/net/mdio_mux_i2creg.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <miiphy.h>
 #include <i2c.h>
+#include <linux/types.h>
 
 /*
  * This driver is used for MDIO muxes driven by writing to a register of an I2C
diff --git a/drivers/net/mdio_mux_sandbox.c b/drivers/net/mdio_mux_sandbox.c
index c22882c6e8d..a8ef9e72cb6 100644
--- a/drivers/net/mdio_mux_sandbox.c
+++ b/drivers/net/mdio_mux_sandbox.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <miiphy.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 
 /* macros copied over from mdio_sandbox.c */
diff --git a/drivers/net/mdio_sandbox.c b/drivers/net/mdio_sandbox.c
index 2d7c845a098..9598f0be2fa 100644
--- a/drivers/net/mdio_sandbox.c
+++ b/drivers/net/mdio_sandbox.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <miiphy.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 
 #define SANDBOX_PHY_ADDR	5
diff --git a/drivers/net/mpc8xx_fec.c b/drivers/net/mpc8xx_fec.c
index 64918248131..4f6d89affe9 100644
--- a/drivers/net/mpc8xx_fec.c
+++ b/drivers/net/mpc8xx_fec.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <hang.h>
 #include <malloc.h>
 #include <net.h>
@@ -20,6 +21,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <phy.h>
 #include <linux/mii.h>
diff --git a/drivers/net/mscc_eswitch/jr2_switch.c b/drivers/net/mscc_eswitch/jr2_switch.c
index 1aff591e3a4..4b00dca3d79 100644
--- a/drivers/net/mscc_eswitch/jr2_switch.c
+++ b/drivers/net/mscc_eswitch/jr2_switch.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <config.h>
 #include <dm.h>
 #include <malloc.h>
@@ -22,6 +23,7 @@
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <dt-bindings/mscc/jr2_data.h>
 #include "mscc_xfer.h"
diff --git a/drivers/net/mscc_eswitch/luton_switch.c b/drivers/net/mscc_eswitch/luton_switch.c
index afc6260577e..81e9be4dc5d 100644
--- a/drivers/net/mscc_eswitch/luton_switch.c
+++ b/drivers/net/mscc_eswitch/luton_switch.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <config.h>
 #include <dm.h>
 #include <malloc.h>
@@ -20,6 +21,7 @@
 #include <wait_bit.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "mscc_xfer.h"
 #include "mscc_mac_table.h"
diff --git a/drivers/net/mscc_eswitch/mscc_mac_table.c b/drivers/net/mscc_eswitch/mscc_mac_table.c
index dba44318f52..49746c79318 100644
--- a/drivers/net/mscc_eswitch/mscc_mac_table.c
+++ b/drivers/net/mscc_eswitch/mscc_mac_table.c
@@ -3,6 +3,8 @@
  * Copyright (c) 2018 Microsemi Corporation
  */
 
+#include <compiler.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/io.h>
diff --git a/drivers/net/mscc_eswitch/mscc_mac_table.h b/drivers/net/mscc_eswitch/mscc_mac_table.h
index 17fed2e7925..ab01763b708 100644
--- a/drivers/net/mscc_eswitch/mscc_mac_table.h
+++ b/drivers/net/mscc_eswitch/mscc_mac_table.h
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 
 #define ETH_LEN 6
 #define MAC_VID 1
diff --git a/drivers/net/mscc_eswitch/mscc_miim.c b/drivers/net/mscc_eswitch/mscc_miim.c
index 9d59fc53ee9..34190e71a2e 100644
--- a/drivers/net/mscc_eswitch/mscc_miim.c
+++ b/drivers/net/mscc_eswitch/mscc_miim.c
@@ -6,6 +6,7 @@
 #include <miiphy.h>
 #include <vsprintf.h>
 #include <wait_bit.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include "mscc_miim.h"
diff --git a/drivers/net/mscc_eswitch/mscc_miim.h b/drivers/net/mscc_eswitch/mscc_miim.h
index feb1f40ae55..7b67476f833 100644
--- a/drivers/net/mscc_eswitch/mscc_miim.h
+++ b/drivers/net/mscc_eswitch/mscc_miim.h
@@ -6,6 +6,8 @@
 #ifndef _MSCC_MIIM_H_
 #define _MSCC_MIIM_H_
 
+#include <compiler.h>
+#include <asm/types.h>
 struct mscc_miim_dev {
 	void __iomem *regs;
 	phys_addr_t miim_base;
diff --git a/drivers/net/mscc_eswitch/mscc_xfer.c b/drivers/net/mscc_eswitch/mscc_xfer.c
index 55abd5a984e..5234447854f 100644
--- a/drivers/net/mscc_eswitch/mscc_xfer.c
+++ b/drivers/net/mscc_eswitch/mscc_xfer.c
@@ -3,12 +3,14 @@
  * Copyright (c) 2018 Microsemi Corporation
  */
 
+#include <compiler.h>
 #include <log.h>
 #include <stdbool.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/io.h>
+#include <linux/types.h>
 #include "mscc_xfer.h"
 
 #define QS_XTR_FLUSH_FLUSH		GENMASK(1, 0)
diff --git a/drivers/net/mscc_eswitch/mscc_xfer.h b/drivers/net/mscc_eswitch/mscc_xfer.h
index df507e518cf..3a46a7553e6 100644
--- a/drivers/net/mscc_eswitch/mscc_xfer.h
+++ b/drivers/net/mscc_eswitch/mscc_xfer.h
@@ -4,7 +4,9 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <stdbool.h>
+#include <linux/types.h>
 
 enum mscc_regs_qs {
 	MSCC_QS_XTR_RD,
diff --git a/drivers/net/mscc_eswitch/ocelot_switch.c b/drivers/net/mscc_eswitch/ocelot_switch.c
index 170393c03f7..71b7f21f6d0 100644
--- a/drivers/net/mscc_eswitch/ocelot_switch.c
+++ b/drivers/net/mscc_eswitch/ocelot_switch.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <config.h>
 #include <dm.h>
 #include <log.h>
@@ -21,6 +22,7 @@
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "mscc_xfer.h"
 #include "mscc_mac_table.h"
diff --git a/drivers/net/mscc_eswitch/serval_switch.c b/drivers/net/mscc_eswitch/serval_switch.c
index 8f5c43660bd..cb46a274f4d 100644
--- a/drivers/net/mscc_eswitch/serval_switch.c
+++ b/drivers/net/mscc_eswitch/serval_switch.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <config.h>
 #include <dm.h>
 #include <log.h>
@@ -21,6 +22,7 @@
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "mscc_xfer.h"
 #include "mscc_mac_table.h"
diff --git a/drivers/net/mscc_eswitch/servalt_switch.c b/drivers/net/mscc_eswitch/servalt_switch.c
index f393ea7f504..babde2feac3 100644
--- a/drivers/net/mscc_eswitch/servalt_switch.c
+++ b/drivers/net/mscc_eswitch/servalt_switch.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <config.h>
 #include <dm.h>
 #include <malloc.h>
@@ -21,6 +22,7 @@
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "mscc_xfer.h"
 #include "mscc_miim.h"
diff --git a/drivers/net/mt7628-eth.c b/drivers/net/mt7628-eth.c
index fd619361727..105f5f18ceb 100644
--- a/drivers/net/mt7628-eth.c
+++ b/drivers/net/mt7628-eth.c
@@ -14,6 +14,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <dm.h>
 #include <log.h>
@@ -21,6 +22,7 @@
 #include <miiphy.h>
 #include <net.h>
 #include <reset.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <wait_bit.h>
@@ -33,6 +35,7 @@
 #include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /* Ethernet frame engine register */
 #define PDMA_RELATED		0x0800
diff --git a/drivers/net/mtk_eth.c b/drivers/net/mtk_eth.c
index f2f070548d4..aad0c609f28 100644
--- a/drivers/net/mtk_eth.c
+++ b/drivers/net/mtk_eth.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <dm.h>
 #include <log.h>
@@ -33,6 +34,7 @@
 #include <linux/mii.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "mtk_eth.h"
 
diff --git a/drivers/net/mvgbe.c b/drivers/net/mvgbe.c
index 45f4e004c9c..ba510d89ac0 100644
--- a/drivers/net/mvgbe.c
+++ b/drivers/net/mvgbe.c
@@ -12,6 +12,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
 #include <net.h>
@@ -30,6 +31,7 @@
 #include <asm/byteorder.h>
 #include <asm/arch/cpu.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #if defined(CONFIG_ARCH_KIRKWOOD)
 #include <asm/arch/soc.h>
diff --git a/drivers/net/mvgbe.h b/drivers/net/mvgbe.h
index 4376efbfbc0..9032d323a36 100644
--- a/drivers/net/mvgbe.h
+++ b/drivers/net/mvgbe.h
@@ -19,6 +19,7 @@
 #endif
 
 /* Constants */
+#include <asm/types.h>
 #include <linux/kernel.h>
 #define INT_CAUSE_UNMASK_ALL		0x0007ffff
 #define INT_CAUSE_UNMASK_ALL_EXT	0x0011ffff
diff --git a/drivers/net/mvmdio.c b/drivers/net/mvmdio.c
index c712043dc7d..55fed6a3df6 100644
--- a/drivers/net/mvmdio.c
+++ b/drivers/net/mvmdio.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <asm/types.h>
 #include <dm/device-internal.h>
 #include <dm/lists.h>
 #include <miiphy.h>
diff --git a/drivers/net/mvneta.c b/drivers/net/mvneta.c
index f001ae73208..d47e9a1b0d0 100644
--- a/drivers/net/mvneta.c
+++ b/drivers/net/mvneta.c
@@ -13,6 +13,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <dm.h>
 #include <log.h>
@@ -41,6 +42,7 @@
 #include <linux/mbus.h>
 #include <asm-generic/gpio.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/net/mvpp2.c b/drivers/net/mvpp2.c
index 2d53a5cc5a8..65b7b7b87d6 100644
--- a/drivers/net/mvpp2.c
+++ b/drivers/net/mvpp2.c
@@ -14,8 +14,10 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <dm.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/cache.h>
@@ -47,6 +49,7 @@
 #include <fdt_support.h>
 #include <linux/mdio.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/net/natsemi.c b/drivers/net/natsemi.c
index f705a026431..f2997925ffa 100644
--- a/drivers/net/natsemi.c
+++ b/drivers/net/natsemi.c
@@ -61,6 +61,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /* defines */
 #define EEPROM_SIZE 0xb /*12 16-bit chunks, or 24 bytes*/
diff --git a/drivers/net/ne2000.c b/drivers/net/ne2000.c
index 828bc957fca..fa0a1329256 100644
--- a/drivers/net/ne2000.c
+++ b/drivers/net/ne2000.c
@@ -77,6 +77,7 @@ Add SNMP
 #include <stdio.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 /* NE2000 base header file */
 #include "ne2000_base.h"
diff --git a/drivers/net/ne2000.h b/drivers/net/ne2000.h
index 2cde6be4377..d23e186466a 100644
--- a/drivers/net/ne2000.h
+++ b/drivers/net/ne2000.h
@@ -77,6 +77,7 @@ are GPL, so this is, of course, GPL.
 #define __DRIVERS_NE2000_H__
 
 /* Enable NE2000 basic init function */
+#include <linux/types.h>
 #define NE2000_BASIC_INIT
 
 #define DP_DATA		0x10
diff --git a/drivers/net/ne2000_base.c b/drivers/net/ne2000_base.c
index 34600b822ba..1dec015ba15 100644
--- a/drivers/net/ne2000_base.c
+++ b/drivers/net/ne2000_base.c
@@ -81,6 +81,7 @@ Add SNMP
 #include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/compiler.h>
 #include <linux/string.h>
diff --git a/drivers/net/ne2000_base.h b/drivers/net/ne2000_base.h
index 0d289444b3e..70be4429823 100644
--- a/drivers/net/ne2000_base.h
+++ b/drivers/net/ne2000_base.h
@@ -108,6 +108,7 @@ are GPL, so this is, of course, GPL.
 /* timeout for tx/rx in s */
 #include <stdbool.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #define TOUT 5
 /* Ether MAC address size */
diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c
index 701fc73c91e..8a92ba3004a 100644
--- a/drivers/net/netconsole.c
+++ b/drivers/net/netconsole.c
@@ -13,6 +13,7 @@
 #include <vsprintf.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #ifndef CONFIG_NETCONSOLE_BUFFER_SIZE
 #define CONFIG_NETCONSOLE_BUFFER_SIZE 512
diff --git a/drivers/net/ns8382x.c b/drivers/net/ns8382x.c
index bb07369d32f..fc92175e9f9 100644
--- a/drivers/net/ns8382x.c
+++ b/drivers/net/ns8382x.c
@@ -62,6 +62,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /* defines */
 #define DSIZE     0x00000FFF
diff --git a/drivers/net/pch_gbe.c b/drivers/net/pch_gbe.c
index 887958fef54..3e422ff9fc8 100644
--- a/drivers/net/pch_gbe.c
+++ b/drivers/net/pch_gbe.c
@@ -19,6 +19,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "pch_gbe.h"
 
 #if !defined(CONFIG_PHYLIB)
diff --git a/drivers/net/pch_gbe.h b/drivers/net/pch_gbe.h
index 57d54d4b0d5..15e35fda4b5 100644
--- a/drivers/net/pch_gbe.h
+++ b/drivers/net/pch_gbe.h
@@ -9,6 +9,7 @@
 #ifndef _PCH_GBE_H_
 #define _PCH_GBE_H_
 
+#include <asm/types.h>
 #include <linux/kernel.h>
 #define PCH_GBE_TIMEOUT		(3 * CONFIG_SYS_HZ)
 
diff --git a/drivers/net/pcnet.c b/drivers/net/pcnet.c
index 2e7cd2b3dfc..72a8925f086 100644
--- a/drivers/net/pcnet.c
+++ b/drivers/net/pcnet.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <dm.h>
 #include <log.h>
@@ -24,6 +25,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define	PCNET_DEBUG_LEVEL	0	/* 0=off, 1=init, 2=rx/tx */
 
diff --git a/drivers/net/pfe_eth/pfe_cmd.c b/drivers/net/pfe_eth/pfe_cmd.c
index 4a189f7b280..7946120d56c 100644
--- a/drivers/net/pfe_eth/pfe_cmd.c
+++ b/drivers/net/pfe_eth/pfe_cmd.c
@@ -16,6 +16,7 @@
 #include <vsprintf.h>
 #include <linux/delay.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <net/pfe_eth/pfe_eth.h>
 
 static inline void pfe_command_help(void)
diff --git a/drivers/net/pfe_eth/pfe_driver.c b/drivers/net/pfe_eth/pfe_driver.c
index 3b777ea77ad..f12553393a5 100644
--- a/drivers/net/pfe_eth/pfe_driver.c
+++ b/drivers/net/pfe_eth/pfe_driver.c
@@ -11,6 +11,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <net/pfe_eth/pfe_eth.h>
 #include <net/pfe_eth/pfe_firmware.h>
 
diff --git a/drivers/net/pfe_eth/pfe_eth.c b/drivers/net/pfe_eth/pfe_eth.c
index f582f8c5af5..e79b1c0a89b 100644
--- a/drivers/net/pfe_eth/pfe_eth.c
+++ b/drivers/net/pfe_eth/pfe_eth.c
@@ -14,6 +14,7 @@
 #include <net.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <net/pfe_eth/pfe_eth.h>
 #include <net/pfe_eth/pfe_mdio.h>
 
diff --git a/drivers/net/pfe_eth/pfe_firmware.c b/drivers/net/pfe_eth/pfe_firmware.c
index 286594d91b9..c11eb8b8ec0 100644
--- a/drivers/net/pfe_eth/pfe_firmware.c
+++ b/drivers/net/pfe_eth/pfe_firmware.c
@@ -17,6 +17,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <net/pfe_eth/pfe_eth.h>
 #include <net/pfe_eth/pfe_firmware.h>
 #include <spi_flash.h>
diff --git a/drivers/net/pfe_eth/pfe_hw.c b/drivers/net/pfe_eth/pfe_hw.c
index fb60e605b19..93b61eadd0d 100644
--- a/drivers/net/pfe_eth/pfe_hw.c
+++ b/drivers/net/pfe_eth/pfe_hw.c
@@ -5,6 +5,7 @@
  */
 #include <log.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/string.h>
 #include <net/pfe_eth/pfe_eth.h>
diff --git a/drivers/net/pfe_eth/pfe_mdio.c b/drivers/net/pfe_eth/pfe_mdio.c
index 429ca879112..55c563c846b 100644
--- a/drivers/net/pfe_eth/pfe_mdio.c
+++ b/drivers/net/pfe_eth/pfe_mdio.c
@@ -9,6 +9,7 @@
 #include <malloc.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <asm/types.h>
 #include <dm/platform_data/pfe_dm_eth.h>
 #include <net.h>
 #include <linux/delay.h>
diff --git a/drivers/net/phy/aquantia.c b/drivers/net/phy/aquantia.c
index cfd2424ff11..5f317af8d26 100644
--- a/drivers/net/phy/aquantia.c
+++ b/drivers/net/phy/aquantia.c
@@ -11,12 +11,14 @@
 #include <log.h>
 #include <net.h>
 #include <phy.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <u-boot/crc.h>
 #include <malloc.h>
 #include <asm/byteorder.h>
diff --git a/drivers/net/phy/atheros.c b/drivers/net/phy/atheros.c
index dab348ccf9c..5ab45728de9 100644
--- a/drivers/net/phy/atheros.c
+++ b/drivers/net/phy/atheros.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <phy.h>
 #include <stdbool.h>
+#include <asm/types.h>
 #include <dm/device_compat.h>
 #include <linux/bitfield.h>
 #include <linux/bitops.h>
diff --git a/drivers/net/phy/b53.c b/drivers/net/phy/b53.c
index 1bc9b2e4e7c..94de3d80b9a 100644
--- a/drivers/net/phy/b53.c
+++ b/drivers/net/phy/b53.c
@@ -26,6 +26,7 @@
 #include <command.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c
index 91e8f6123de..f7b70f6c7b0 100644
--- a/drivers/net/phy/broadcom.c
+++ b/drivers/net/phy/broadcom.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <phy.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 /* Broadcom BCM54xx -- taken from linux sungem_phy */
diff --git a/drivers/net/phy/cortina.c b/drivers/net/phy/cortina.c
index 8ab483cdd58..b3e84a5e2a0 100644
--- a/drivers/net/phy/cortina.c
+++ b/drivers/net/phy/cortina.c
@@ -27,6 +27,7 @@
 #elif defined(CONFIG_SYS_CORTINA_FW_IN_MMC)
 #include <mmc.h>
 #endif
+#include <linux/types.h>
 
 #ifndef CONFIG_PHYLIB_10G
 #error The Cortina PHY needs 10G support
diff --git a/drivers/net/phy/dp83867.c b/drivers/net/phy/dp83867.c
index 3951cb00f41..08ff23f26ff 100644
--- a/drivers/net/phy/dp83867.c
+++ b/drivers/net/phy/dp83867.c
@@ -7,6 +7,7 @@
 #include <log.h>
 #include <phy.h>
 #include <stdbool.h>
+#include <asm/types.h>
 #include <dm/devres.h>
 #include <linux/bitops.h>
 #include <linux/compat.h>
diff --git a/drivers/net/phy/fixed.c b/drivers/net/phy/fixed.c
index 987cde1fc12..499a8c193ce 100644
--- a/drivers/net/phy/fixed.c
+++ b/drivers/net/phy/fixed.c
@@ -13,6 +13,7 @@
 #include <fdt_support.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 
diff --git a/drivers/net/phy/generic_10g.c b/drivers/net/phy/generic_10g.c
index b4384e1f781..778066a46b6 100644
--- a/drivers/net/phy/generic_10g.c
+++ b/drivers/net/phy/generic_10g.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <miiphy.h>
 #include <phy.h>
+#include <asm/types.h>
 
 int gen10g_shutdown(struct phy_device *phydev)
 {
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
index f03b5541a97..caa245f0f64 100644
--- a/drivers/net/phy/marvell.c
+++ b/drivers/net/phy/marvell.c
@@ -9,6 +9,7 @@
 #include <errno.h>
 #include <phy.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/net/phy/micrel_ksz90x1.c b/drivers/net/phy/micrel_ksz90x1.c
index 2b7bbc8f419..57753b35435 100644
--- a/drivers/net/phy/micrel_ksz90x1.c
+++ b/drivers/net/phy/micrel_ksz90x1.c
@@ -14,6 +14,7 @@
 #include <errno.h>
 #include <micrel.h>
 #include <phy.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 
diff --git a/drivers/net/phy/miiphybb.c b/drivers/net/phy/miiphybb.c
index d19a13dd62b..9c8eec99de4 100644
--- a/drivers/net/phy/miiphybb.c
+++ b/drivers/net/phy/miiphybb.c
@@ -18,6 +18,7 @@
 #include <miiphy.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <linux/string.h>
 
 #define BB_MII_RELOCATE(v,off) (v += (v?off:0))
diff --git a/drivers/net/phy/mscc.c b/drivers/net/phy/mscc.c
index 08214ccc2f6..d0ea61b4f20 100644
--- a/drivers/net/phy/mscc.c
+++ b/drivers/net/phy/mscc.c
@@ -12,8 +12,10 @@
 #include <log.h>
 #include <miiphy.h>
 #include <bitfield.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/net/phy/mv88e61xx.c b/drivers/net/phy/mv88e61xx.c
index 7e3c76923cb..69fcab12ba4 100644
--- a/drivers/net/phy/mv88e61xx.c
+++ b/drivers/net/phy/mv88e61xx.c
@@ -30,9 +30,11 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <log.h>
 #include <stdbool.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/net/phy/mv88e6352.c b/drivers/net/phy/mv88e6352.c
index c11ddf765f6..c8bb62fba9c 100644
--- a/drivers/net/phy/mv88e6352.c
+++ b/drivers/net/phy/mv88e6352.c
@@ -10,6 +10,7 @@
 #include <miiphy.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <mv88e6352.h>
diff --git a/drivers/net/phy/ncsi.c b/drivers/net/phy/ncsi.c
index ed557355b91..d3e4082b4f9 100644
--- a/drivers/net/phy/ncsi.c
+++ b/drivers/net/phy/ncsi.c
@@ -9,10 +9,12 @@
 #include <log.h>
 #include <malloc.h>
 #include <phy.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <net/ncsi.h>
 #include <net/ncsi-pkt.h>
 #include <asm/unaligned.h>
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index bda41672cc9..23d534ba4f0 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -8,6 +8,7 @@
  * Based loosely off of Linux's PHY Lib
  */
 #include <common.h>
+#include <compiler.h>
 #include <console.h>
 #include <dm.h>
 #include <log.h>
@@ -17,6 +18,7 @@
 #include <miiphy.h>
 #include <phy.h>
 #include <errno.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
@@ -25,6 +27,7 @@
 #include <linux/compiler.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/net/phy/realtek.c b/drivers/net/phy/realtek.c
index 2f9b50e168a..2963c21d307 100644
--- a/drivers/net/phy/realtek.c
+++ b/drivers/net/phy/realtek.c
@@ -8,6 +8,7 @@
  */
 #include <common.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <phy.h>
 #include <linux/delay.h>
diff --git a/drivers/net/phy/teranetics.c b/drivers/net/phy/teranetics.c
index 7b5494eea98..d1b1f4f2fc0 100644
--- a/drivers/net/phy/teranetics.c
+++ b/drivers/net/phy/teranetics.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <phy.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 #ifndef CONFIG_PHYLIB_10G
diff --git a/drivers/net/phy/vitesse.c b/drivers/net/phy/vitesse.c
index fdc67610236..9dbc1febbfa 100644
--- a/drivers/net/phy/vitesse.c
+++ b/drivers/net/phy/vitesse.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <miiphy.h>
 #include <stdio.h>
+#include <asm/types.h>
 
 /* Cicada Auxiliary Control/Status Register */
 #define MIIM_CIS82xx_AUX_CONSTAT	0x1c
diff --git a/drivers/net/phy/xilinx_gmii2rgmii.c b/drivers/net/phy/xilinx_gmii2rgmii.c
index 1a7b24f0f68..68e03dc7e91 100644
--- a/drivers/net/phy/xilinx_gmii2rgmii.c
+++ b/drivers/net/phy/xilinx_gmii2rgmii.c
@@ -11,6 +11,7 @@
 #include <phy.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/net/phy/xilinx_phy.c b/drivers/net/phy/xilinx_phy.c
index 84fb1f0fe2e..9c91e3468f9 100644
--- a/drivers/net/phy/xilinx_phy.c
+++ b/drivers/net/phy/xilinx_phy.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <phy.h>
 #include <dm.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 
 #define MII_PHY_STATUS_SPD_MASK		0x0C00
diff --git a/drivers/net/pic32_eth.c b/drivers/net/pic32_eth.c
index 3be550e64d5..cd562286db1 100644
--- a/drivers/net/pic32_eth.c
+++ b/drivers/net/pic32_eth.c
@@ -4,6 +4,7 @@
  *
  */
 #include <common.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <errno.h>
 #include <dm.h>
@@ -20,6 +21,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/mii.h>
+#include <linux/types.h>
 
 #include "pic32_eth.h"
 
diff --git a/drivers/net/pic32_eth.h b/drivers/net/pic32_eth.h
index 7b873bc7728..bea05c9cb8d 100644
--- a/drivers/net/pic32_eth.h
+++ b/drivers/net/pic32_eth.h
@@ -8,6 +8,7 @@
 #define __MICROCHIP_PIC32_ETH_H_
 
 #include <linux/bitops.h>
+#include <linux/types.h>
 #include <mach/pic32.h>
 
 /* Ethernet */
diff --git a/drivers/net/pic32_mdio.c b/drivers/net/pic32_mdio.c
index d30bceb4e53..8fda01c82c5 100644
--- a/drivers/net/pic32_mdio.c
+++ b/drivers/net/pic32_mdio.c
@@ -15,6 +15,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "pic32_eth.h"
 
 static int pic32_mdio_write(struct mii_dev *bus,
diff --git a/drivers/net/ravb.c b/drivers/net/ravb.c
index 4fb1c7b5f6b..31d9c50bab4 100644
--- a/drivers/net/ravb.c
+++ b/drivers/net/ravb.c
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <dm.h>
 #include <errno.h>
@@ -29,6 +30,7 @@
 #include <asm/io.h>
 #include <asm/gpio.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /* Registers */
 #define RAVB_REG_CCC		0x000
diff --git a/drivers/net/rtl8169.c b/drivers/net/rtl8169.c
index f3d6ea89b99..129234426f1 100644
--- a/drivers/net/rtl8169.c
+++ b/drivers/net/rtl8169.c
@@ -61,6 +61,7 @@
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #undef DEBUG_RTL8169
 #undef DEBUG_RTL8169_TX
diff --git a/drivers/net/sandbox-raw-bus.c b/drivers/net/sandbox-raw-bus.c
index 1509630b835..7b8806f91d3 100644
--- a/drivers/net/sandbox-raw-bus.c
+++ b/drivers/net/sandbox-raw-bus.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <malloc.h>
+#include <asm/types.h>
 #include <dm/device-internal.h>
 #include <dm/lists.h>
 #include <linux/errno.h>
diff --git a/drivers/net/sandbox-raw.c b/drivers/net/sandbox-raw.c
index cc358428a36..c5de9410823 100644
--- a/drivers/net/sandbox-raw.c
+++ b/drivers/net/sandbox-raw.c
@@ -16,6 +16,7 @@
 #include <net.h>
 #include <asm/global_data.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/net/sandbox.c b/drivers/net/sandbox.c
index 6e119f77b29..624aed2fc3a 100644
--- a/drivers/net/sandbox.c
+++ b/drivers/net/sandbox.c
@@ -19,6 +19,7 @@
 #include <asm/test.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c
index 3a1a7fee4bc..9d584c8934c 100644
--- a/drivers/net/sh_eth.c
+++ b/drivers/net/sh_eth.c
@@ -8,6 +8,7 @@
  * Copyright (C) 2013, 2014 Renesas Electronics Corporation
  */
 
+#include <compiler.h>
 #include <config.h>
 #include <common.h>
 #include <cpu_func.h>
@@ -27,6 +28,7 @@
 #include <asm/io.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_DM_ETH
 #include <clk.h>
diff --git a/drivers/net/sh_eth.h b/drivers/net/sh_eth.h
index d197dfdc401..8ab4643772b 100644
--- a/drivers/net/sh_eth.h
+++ b/drivers/net/sh_eth.h
@@ -7,8 +7,10 @@
  * Copyright (c) 2007 Carlos Munoz <carlos@kenati.com>
  */
 
+#include <compiler.h>
 #include <netdev.h>
 #include <asm/types.h>
+#include <linux/types.h>
 
 #define SHETHER_NAME "sh_eth"
 
diff --git a/drivers/net/smc91111.c b/drivers/net/smc91111.c
index 036642b223b..cc18c69e25a 100644
--- a/drivers/net/smc91111.c
+++ b/drivers/net/smc91111.c
@@ -57,6 +57,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "smc91111.h"
 #include <net.h>
 
diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
index 2f3b8fa8079..f6bf03efbf1 100644
--- a/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.c
@@ -10,6 +10,7 @@
 #include <malloc.h>
 #include <net.h>
 #include <miiphy.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/u-boot.h>
diff --git a/drivers/net/sni_ave.c b/drivers/net/sni_ave.c
index 21096bd6d32..ea55c5e063e 100644
--- a/drivers/net/sni_ave.c
+++ b/drivers/net/sni_ave.c
@@ -14,6 +14,7 @@
 #include <net.h>
 #include <regmap.h>
 #include <reset.h>
+#include <stdbool.h>
 #include <syscon.h>
 #include <vsprintf.h>
 #include <asm/cache.h>
@@ -28,6 +29,7 @@
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define AVE_GRST_DELAY_MSEC	40
 #define AVE_MIN_XMITSIZE	60
diff --git a/drivers/net/sun8i_emac.c b/drivers/net/sun8i_emac.c
index 3216360db15..717aefeea45 100644
--- a/drivers/net/sun8i_emac.c
+++ b/drivers/net/sun8i_emac.c
@@ -12,6 +12,7 @@
 
 #include <cpu_func.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <vsprintf.h>
@@ -39,6 +40,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define MDIO_CMD_MII_BUSY		BIT(0)
 #define MDIO_CMD_MII_WRITE		BIT(1)
diff --git a/drivers/net/sunxi_emac.c b/drivers/net/sunxi_emac.c
index 4470c741fa9..84d1c30afd4 100644
--- a/drivers/net/sunxi_emac.c
+++ b/drivers/net/sunxi_emac.c
@@ -21,6 +21,7 @@
 #include <asm/arch/gpio.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /* EMAC register  */
 struct emac_regs {
diff --git a/drivers/net/ti/am65-cpsw-nuss.c b/drivers/net/ti/am65-cpsw-nuss.c
index 950d1ca2122..f2dbd8b9f77 100644
--- a/drivers/net/ti/am65-cpsw-nuss.c
+++ b/drivers/net/ti/am65-cpsw-nuss.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/cache.h>
 #include <asm/io.h>
@@ -27,6 +28,7 @@
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/soc/ti/ti-udma.h>
+#include <linux/types.h>
 
 #include "cpsw_mdio.h"
 
diff --git a/drivers/net/ti/cpsw-common.c b/drivers/net/ti/cpsw-common.c
index 0b4adb1aa61..01facc156b5 100644
--- a/drivers/net/ti/cpsw-common.c
+++ b/drivers/net/ti/cpsw-common.c
@@ -11,6 +11,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <cpsw.h>
+#include <asm/types.h>
 #include <dm/device_compat.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
diff --git a/drivers/net/ti/cpsw.c b/drivers/net/ti/cpsw.c
index 52155df2c54..2ed2ed26021 100644
--- a/drivers/net/ti/cpsw.c
+++ b/drivers/net/ti/cpsw.c
@@ -15,6 +15,7 @@
 #include <net.h>
 #include <netdev.h>
 #include <cpsw.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/u-boot.h>
 #include <dm/device_compat.h>
@@ -29,6 +30,7 @@
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "cpsw_mdio.h"
 
diff --git a/drivers/net/ti/cpsw_mdio.c b/drivers/net/ti/cpsw_mdio.c
index 2e70477756a..94906268189 100644
--- a/drivers/net/ti/cpsw_mdio.c
+++ b/drivers/net/ti/cpsw_mdio.c
@@ -15,6 +15,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 struct cpsw_mdio_regs {
 	u32	version;
diff --git a/drivers/net/ti/cpsw_mdio.h b/drivers/net/ti/cpsw_mdio.h
index dbf4a2dcacb..f8ad72216e1 100644
--- a/drivers/net/ti/cpsw_mdio.h
+++ b/drivers/net/ti/cpsw_mdio.h
@@ -8,6 +8,7 @@
 #ifndef CPSW_MDIO_H_
 #define CPSW_MDIO_H_
 
+#include <asm/types.h>
 struct cpsw_mdio;
 
 struct mii_dev *cpsw_mdio_init(const char *name, phys_addr_t mdio_base,
diff --git a/drivers/net/ti/davinci_emac.c b/drivers/net/ti/davinci_emac.c
index f909ee7aa38..dddf78187d4 100644
--- a/drivers/net/ti/davinci_emac.c
+++ b/drivers/net/ti/davinci_emac.c
@@ -38,6 +38,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "davinci_emac.h"
 
 unsigned int	emac_dbg = 0;
diff --git a/drivers/net/ti/davinci_emac.h b/drivers/net/ti/davinci_emac.h
index d235275772e..fdc3946ee40 100644
--- a/drivers/net/ti/davinci_emac.h
+++ b/drivers/net/ti/davinci_emac.h
@@ -10,6 +10,7 @@
 #define _DAVINCI_EMAC_H_
 /* Ethernet Min/Max packet size */
 #include <linux/kernel.h>
+#include <linux/types.h>
 #define EMAC_MIN_ETHERNET_PKT_SIZE	60
 #define EMAC_MAX_ETHERNET_PKT_SIZE	1518
 /* Buffer size (should be aligned on 32 byte and cache line) */
diff --git a/drivers/net/ti/keystone_net.c b/drivers/net/ti/keystone_net.c
index af67ec4a1c8..b30fef96b38 100644
--- a/drivers/net/ti/keystone_net.c
+++ b/drivers/net/ti/keystone_net.c
@@ -15,6 +15,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 #include <dm.h>
 #include <dm/lists.h>
diff --git a/drivers/net/tsec.c b/drivers/net/tsec.c
index 2f9ff5ec07f..ab99cedaec5 100644
--- a/drivers/net/tsec.c
+++ b/drivers/net/tsec.c
@@ -7,6 +7,7 @@
  * author Andy Fleming
  */
 
+#include <compiler.h>
 #include <config.h>
 #include <common.h>
 #include <dm.h>
@@ -25,6 +26,7 @@
 #include <asm/io.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #ifndef CONFIG_DM_ETH
 /* Default initializations for TSEC controllers. */
diff --git a/drivers/net/uli526x.c b/drivers/net/uli526x.c
index 530341faa3f..01ceac63873 100644
--- a/drivers/net/uli526x.c
+++ b/drivers/net/uli526x.c
@@ -21,6 +21,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /* some kernel function compatible define */
 
diff --git a/drivers/net/vsc7385.c b/drivers/net/vsc7385.c
index ba4793122ea..be8ff7bbd0b 100644
--- a/drivers/net/vsc7385.c
+++ b/drivers/net/vsc7385.c
@@ -18,6 +18,7 @@
 #include <log.h>
 #include <stdio.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include "vsc7385.h"
diff --git a/drivers/net/vsc9953.c b/drivers/net/vsc9953.c
index 36960bf1234..10163fc62a0 100644
--- a/drivers/net/vsc9953.c
+++ b/drivers/net/vsc9953.c
@@ -22,6 +22,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 static struct vsc9953_info vsc9953_l2sw = {
 		.port[0] = VSC9953_PORT_INFO_INITIALIZER(0),
diff --git a/drivers/net/xilinx_axi_emac.c b/drivers/net/xilinx_axi_emac.c
index 0da2385a92e..fd9009d444a 100644
--- a/drivers/net/xilinx_axi_emac.c
+++ b/drivers/net/xilinx_axi_emac.c
@@ -22,6 +22,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/net/xilinx_emaclite.c b/drivers/net/xilinx_emaclite.c
index 5334b61c7aa..6c0aba0e08d 100644
--- a/drivers/net/xilinx_emaclite.c
+++ b/drivers/net/xilinx_emaclite.c
@@ -13,6 +13,7 @@
 #include <dm.h>
 #include <console.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <asm/global_data.h>
@@ -24,6 +25,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <asm/io.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/net/zynq_gem.c b/drivers/net/zynq_gem.c
index f31ce696ff0..ccb49a1fa66 100644
--- a/drivers/net/zynq_gem.c
+++ b/drivers/net/zynq_gem.c
@@ -10,6 +10,7 @@
 
 #include <clk.h>
 #include <common.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <dm.h>
 #include <log.h>
@@ -18,6 +19,7 @@
 #include <config.h>
 #include <console.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/cache.h>
 #include <asm/io.h>
@@ -34,6 +36,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /* Bit/mask specification */
 #define ZYNQ_GEM_PHYMNTNC_OP_MASK	0x40020000 /* operation mask bits */
diff --git a/drivers/nvme/nvme.c b/drivers/nvme/nvme.c
index 95c1d5065b3..9a37f3b9e62 100644
--- a/drivers/nvme/nvme.c
+++ b/drivers/nvme/nvme.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <blk.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <dm.h>
 #include <errno.h>
@@ -13,6 +14,7 @@
 #include <malloc.h>
 #include <memalign.h>
 #include <pci.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <vsprintf.h>
@@ -21,6 +23,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "nvme.h"
 
 #define NVME_Q_DEPTH		2
diff --git a/drivers/nvme/nvme.h b/drivers/nvme/nvme.h
index c2914e2cb05..cbc2fbe0395 100644
--- a/drivers/nvme/nvme.h
+++ b/drivers/nvme/nvme.h
@@ -7,8 +7,10 @@
 #ifndef __DRIVER_NVME_H__
 #define __DRIVER_NVME_H__
 
+#include <compiler.h>
 #include <asm/io.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 struct nvme_id_power_state {
 	__le16			max_power;	/* centiwatts */
diff --git a/drivers/nvme/nvme_show.c b/drivers/nvme/nvme_show.c
index 2c3d7bcfa00..531c12b3b54 100644
--- a/drivers/nvme/nvme_show.c
+++ b/drivers/nvme/nvme_show.c
@@ -10,6 +10,7 @@
 #include <memalign.h>
 #include <nvme.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include "nvme.h"
 
diff --git a/drivers/pch/pch-uclass.c b/drivers/pch/pch-uclass.c
index 9bc45b5ddc9..794fcee4dfe 100644
--- a/drivers/pch/pch-uclass.c
+++ b/drivers/pch/pch-uclass.c
@@ -9,6 +9,7 @@
 #include <pch.h>
 #include <stdbool.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 int pch_get_spi_base(struct udevice *dev, ulong *sbasep)
 {
diff --git a/drivers/pch/pch7.c b/drivers/pch/pch7.c
index 9eb985225c8..2ea566b4b06 100644
--- a/drivers/pch/pch7.c
+++ b/drivers/pch/pch7.c
@@ -9,6 +9,7 @@
 #include <pch.h>
 #include <stdbool.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #define GPIO_BASE	0x44
 #define BIOS_CTRL	0xd8
diff --git a/drivers/pch/pch9.c b/drivers/pch/pch9.c
index f36b70c53ab..6cea83e7bcf 100644
--- a/drivers/pch/pch9.c
+++ b/drivers/pch/pch9.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <pch.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #define GPIO_BASE	0x48
 #define IO_BASE		0x4c
diff --git a/drivers/pch/sandbox_pch.c b/drivers/pch/sandbox_pch.c
index 28dfc03d793..f1d28013b14 100644
--- a/drivers/pch/sandbox_pch.c
+++ b/drivers/pch/sandbox_pch.c
@@ -8,6 +8,7 @@
 #include <pch.h>
 #include <stdbool.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 struct sandbox_pch_priv {
 	bool protect;
diff --git a/drivers/pci/fsl_pci_init.c b/drivers/pci/fsl_pci_init.c
index 612f20714d3..37483e3b0e6 100644
--- a/drivers/pci/fsl_pci_init.c
+++ b/drivers/pci/fsl_pci_init.c
@@ -12,6 +12,7 @@
 #include <vsprintf.h>
 #include <asm/fsl_serdes.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
diff --git a/drivers/pci/pci-aardvark.c b/drivers/pci/pci-aardvark.c
index b39a6d715b7..d18fc96cb64 100644
--- a/drivers/pci/pci-aardvark.c
+++ b/drivers/pci/pci-aardvark.c
@@ -36,6 +36,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/ioport.h>
+#include <linux/types.h>
 
 /* PCIe core registers */
 #define PCIE_CORE_CMD_STATUS_REG				0x4
diff --git a/drivers/pci/pci-emul-uclass.c b/drivers/pci/pci-emul-uclass.c
index 1ba42693a84..1f5c011913b 100644
--- a/drivers/pci/pci-emul-uclass.c
+++ b/drivers/pci/pci-emul-uclass.c
@@ -13,6 +13,7 @@
 #include <linux/libfdt.h>
 #include <pci.h>
 #include <dm/lists.h>
+#include <linux/types.h>
 
 struct sandbox_pci_emul_priv {
 	int dev_count;
diff --git a/drivers/pci/pci-rcar-gen2.c b/drivers/pci/pci-rcar-gen2.c
index d73c171846f..cd00023ac9b 100644
--- a/drivers/pci/pci-rcar-gen2.c
+++ b/drivers/pci/pci-rcar-gen2.c
@@ -13,6 +13,7 @@
 #include <pci.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 /* AHB-PCI Bridge PCI communication registers */
 #define RCAR_AHBPCI_PCICOM_OFFSET	0x800
diff --git a/drivers/pci/pci-rcar-gen3.c b/drivers/pci/pci-rcar-gen3.c
index e630a2a6300..b23ca71c6f8 100644
--- a/drivers/pci/pci-rcar-gen3.c
+++ b/drivers/pci/pci-rcar-gen3.c
@@ -25,6 +25,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #define PCIECAR			0x000010
 #define PCIECCTLR		0x000018
diff --git a/drivers/pci/pci-uclass.c b/drivers/pci/pci-uclass.c
index 1d05207b77d..b52ac4a8af7 100644
--- a/drivers/pci/pci-uclass.c
+++ b/drivers/pci/pci-uclass.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <pci.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
@@ -26,6 +27,7 @@
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "pci_internal.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index dea11138003..8b1c3872582 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -15,6 +15,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <init.h>
 #include <log.h>
 #include <stdio.h>
@@ -22,6 +23,7 @@
 #include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include <command.h>
 #include <env.h>
diff --git a/drivers/pci/pci_auto.c b/drivers/pci/pci_auto.c
index 7a9ef884c78..e284e13ff2b 100644
--- a/drivers/pci/pci_auto.c
+++ b/drivers/pci/pci_auto.c
@@ -14,6 +14,7 @@
 #include <pci.h>
 #include <stdbool.h>
 #include <stdio.h>
+#include <asm/types.h>
 
 /* the user can define CONFIG_SYS_PCI_CACHE_LINE_SIZE to avoid problems */
 #ifndef CONFIG_SYS_PCI_CACHE_LINE_SIZE
diff --git a/drivers/pci/pci_auto_common.c b/drivers/pci/pci_auto_common.c
index 7b756b7583a..6dee803a6a4 100644
--- a/drivers/pci/pci_auto_common.c
+++ b/drivers/pci/pci_auto_common.c
@@ -16,6 +16,7 @@
 #include <errno.h>
 #include <log.h>
 #include <pci.h>
+#include <stdbool.h>
 #include <linux/kernel.h>
 
 void pciauto_region_init(struct pci_region *res)
diff --git a/drivers/pci/pci_auto_old.c b/drivers/pci/pci_auto_old.c
index b32f7ea1f83..7eac27a32b6 100644
--- a/drivers/pci/pci_auto_old.c
+++ b/drivers/pci/pci_auto_old.c
@@ -11,6 +11,7 @@
 #include <errno.h>
 #include <log.h>
 #include <pci.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 
 /*
diff --git a/drivers/pci/pci_common.c b/drivers/pci/pci_common.c
index 7ee0980bb75..4772632b280 100644
--- a/drivers/pci/pci_common.c
+++ b/drivers/pci/pci_common.c
@@ -10,6 +10,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <env.h>
 #include <errno.h>
@@ -17,6 +18,7 @@
 #include <stdio.h>
 #include <asm/io.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 const char *pci_class_str(u8 class)
 {
diff --git a/drivers/pci/pci_compat.c b/drivers/pci/pci_compat.c
index 9dddca8efe0..07178516e8b 100644
--- a/drivers/pci/pci_compat.c
+++ b/drivers/pci/pci_compat.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <pci.h>
+#include <asm/types.h>
 #include <dm/device-internal.h>
 #include <dm/lists.h>
 #include "pci_internal.h"
diff --git a/drivers/pci/pci_gt64120.c b/drivers/pci/pci_gt64120.c
index bcadf4e4d88..738569042bf 100644
--- a/drivers/pci/pci_gt64120.c
+++ b/drivers/pci/pci_gt64120.c
@@ -14,6 +14,7 @@
 #include <log.h>
 #include <pci.h>
 #include <pci_gt64120.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 
 #include <asm/io.h>
diff --git a/drivers/pci/pci_indirect.c b/drivers/pci/pci_indirect.c
index 6134c22d1bc..092ee0424b9 100644
--- a/drivers/pci/pci_indirect.c
+++ b/drivers/pci/pci_indirect.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <asm/types.h>
 
 #if !defined(__I386__) && !defined(CONFIG_DM_PCI)
 
diff --git a/drivers/pci/pci_mpc85xx.c b/drivers/pci/pci_mpc85xx.c
index d207f8e645b..c18bfec1abd 100644
--- a/drivers/pci/pci_mpc85xx.c
+++ b/drivers/pci/pci_mpc85xx.c
@@ -5,6 +5,7 @@
  *
  */
 #include <common.h>
+#include <compiler.h>
 #include <stdio.h>
 #include <asm/bitops.h>
 #include <asm/cpm_85xx.h>
@@ -12,6 +13,7 @@
 #include <dm.h>
 #include <asm/fsl_law.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 struct mpc85xx_pci_priv {
 	void __iomem		*cfg_addr;
diff --git a/drivers/pci/pci_msc01.c b/drivers/pci/pci_msc01.c
index ae312534c87..89118187dc1 100644
--- a/drivers/pci/pci_msc01.c
+++ b/drivers/pci/pci_msc01.c
@@ -10,6 +10,7 @@
 #include <pci.h>
 #include <pci_msc01.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 
 #define PCI_ACCESS_READ  0
diff --git a/drivers/pci/pci_mvebu.c b/drivers/pci/pci_mvebu.c
index 157924001ab..e7ab4efd0bd 100644
--- a/drivers/pci/pci_mvebu.c
+++ b/drivers/pci/pci_mvebu.c
@@ -10,9 +10,11 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
@@ -29,6 +31,7 @@
 #include <linux/kernel.h>
 #include <linux/mbus.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/pci/pci_rom.c b/drivers/pci/pci_rom.c
index 7bc1a7f4def..292b91c88e7 100644
--- a/drivers/pci/pci_rom.c
+++ b/drivers/pci/pci_rom.c
@@ -27,6 +27,7 @@
 #include <common.h>
 #include <bios_emul.h>
 #include <bootstage.h>
+#include <compiler.h>
 #include <dm.h>
 #include <errno.h>
 #include <init.h>
@@ -34,6 +35,7 @@
 #include <malloc.h>
 #include <pci.h>
 #include <pci_rom.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <vbe.h>
@@ -45,6 +47,7 @@
 #include <linux/kernel.h>
 #include <linux/screen_info.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/pci/pci_sandbox.c b/drivers/pci/pci_sandbox.c
index 4af0bf73034..253f47926a0 100644
--- a/drivers/pci/pci_sandbox.c
+++ b/drivers/pci/pci_sandbox.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <pci.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #define FDT_DEV_INFO_CELLS	4
 #define FDT_DEV_INFO_SIZE	(FDT_DEV_INFO_CELLS * sizeof(u32))
diff --git a/drivers/pci/pci_sh7751.c b/drivers/pci/pci_sh7751.c
index d5d1147f37d..0c7644fdfad 100644
--- a/drivers/pci/pci_sh7751.c
+++ b/drivers/pci/pci_sh7751.c
@@ -15,6 +15,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 /* Register addresses and such */
 #define SH7751_BCR1	(vu_long *)0xFF800000
diff --git a/drivers/pci/pci_sh7780.c b/drivers/pci/pci_sh7780.c
index ed0834a984e..f9a5b1127f0 100644
--- a/drivers/pci/pci_sh7780.c
+++ b/drivers/pci/pci_sh7780.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <stdio.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 #include <pci.h>
 #include <asm/processor.h>
diff --git a/drivers/pci/pci_tegra.c b/drivers/pci/pci_tegra.c
index 28b6aa026b1..c07b4390188 100644
--- a/drivers/pci/pci_tegra.c
+++ b/drivers/pci/pci_tegra.c
@@ -13,6 +13,7 @@
 
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
@@ -27,6 +28,7 @@
 #include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <asm/io.h>
 #include <asm/gpio.h>
diff --git a/drivers/pci/pci_x86.c b/drivers/pci/pci_x86.c
index 8d036930e73..15da7bafdcf 100644
--- a/drivers/pci/pci_x86.c
+++ b/drivers/pci/pci_x86.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <pci.h>
 #include <asm/pci.h>
+#include <linux/types.h>
 
 static int _pci_x86_read_config(const struct udevice *bus, pci_dev_t bdf,
 				uint offset, ulong *valuep,
diff --git a/drivers/pci/pcie_brcmstb.c b/drivers/pci/pcie_brcmstb.c
index 3f207f0de11..aef50954b18 100644
--- a/drivers/pci/pcie_brcmstb.c
+++ b/drivers/pci/pcie_brcmstb.c
@@ -13,8 +13,10 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <errno.h>
 #include <dm.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <dm/ofnode.h>
 #include <pci.h>
@@ -24,6 +26,7 @@
 #include <linux/kernel.h>
 #include <linux/log2.h>
 #include <linux/iopoll.h>
+#include <linux/types.h>
 
 /* Offset of the mandatory PCIe capability config registers */
 #define BRCM_PCIE_CAP_REGS				0x00ac
diff --git a/drivers/pci/pcie_dw_mvebu.c b/drivers/pci/pcie_dw_mvebu.c
index 7eb4461ce26..2f85d98d774 100644
--- a/drivers/pci/pcie_dw_mvebu.c
+++ b/drivers/pci/pcie_dw_mvebu.c
@@ -22,6 +22,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/pci/pcie_dw_ti.c b/drivers/pci/pcie_dw_ti.c
index cc968fe2a3f..4e45f8f5ca2 100644
--- a/drivers/pci/pcie_dw_ti.c
+++ b/drivers/pci/pcie_dw_ti.c
@@ -4,12 +4,14 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
 #include <pci.h>
 #include <generic-phy.h>
 #include <power-domain.h>
 #include <regmap.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <syscon.h>
 #include <time.h>
@@ -22,6 +24,7 @@
 #include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/pci/pcie_ecam_generic.c b/drivers/pci/pcie_ecam_generic.c
index 4039284f539..605b0cbd315 100644
--- a/drivers/pci/pcie_ecam_generic.c
+++ b/drivers/pci/pcie_ecam_generic.c
@@ -10,9 +10,11 @@
 #include <common.h>
 #include <dm.h>
 #include <pci.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 #include <linux/kernel.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 #include <asm/io.h>
 
diff --git a/drivers/pci/pcie_fsl.c b/drivers/pci/pcie_fsl.c
index 2c9448c463c..f5c5ee3c3b8 100644
--- a/drivers/pci/pcie_fsl.c
+++ b/drivers/pci/pcie_fsl.c
@@ -11,6 +11,7 @@
 #include <malloc.h>
 #include <mapmem.h>
 #include <pci.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/fsl_pci.h>
 #include <asm/fsl_serdes.h>
@@ -20,6 +21,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 #include "pcie_fsl.h"
 #include <dm/device_compat.h>
 
diff --git a/drivers/pci/pcie_fsl.h b/drivers/pci/pcie_fsl.h
index 381185133d8..6631d5d9c8c 100644
--- a/drivers/pci/pcie_fsl.h
+++ b/drivers/pci/pcie_fsl.h
@@ -10,7 +10,9 @@
 #define _PCIE_FSL_H_
 
 /* GPEX CSR */
+#include <compiler.h>
 #include <stdbool.h>
+#include <asm/types.h>
 #define CSR_CLASSCODE			0x474
 
 #ifdef CONFIG_SYS_FSL_PCI_VER_3_X
diff --git a/drivers/pci/pcie_imx.c b/drivers/pci/pcie_imx.c
index 07c0695409c..e7278809a5f 100644
--- a/drivers/pci/pcie_imx.c
+++ b/drivers/pci/pcie_imx.c
@@ -10,10 +10,12 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <init.h>
 #include <log.h>
 #include <malloc.h>
 #include <pci.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/iomux.h>
@@ -28,6 +30,7 @@
 #include <errno.h>
 #include <asm/arch/sys_proto.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define PCI_ACCESS_READ  0
 #define PCI_ACCESS_WRITE 1
diff --git a/drivers/pci/pcie_intel_fpga.c b/drivers/pci/pcie_intel_fpga.c
index 9af0b8a105f..7c118f7cdd3 100644
--- a/drivers/pci/pcie_intel_fpga.c
+++ b/drivers/pci/pcie_intel_fpga.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <pci.h>
 #include <stdbool.h>
@@ -16,6 +17,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #define RP_TX_REG0			0x2000
 #define RP_TX_CNTRL			0x2004
diff --git a/drivers/pci/pcie_layerscape.c b/drivers/pci/pcie_layerscape.c
index 9369457b8e7..099e839632b 100644
--- a/drivers/pci/pcie_layerscape.c
+++ b/drivers/pci/pcie_layerscape.c
@@ -16,6 +16,7 @@
 #include <asm/arch/clock.h>
 #endif
 #include <asm/u-boot.h>
+#include <linux/types.h>
 #include "pcie_layerscape.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/pci/pcie_layerscape.h b/drivers/pci/pcie_layerscape.h
index a0a1bc3172f..a5979baecbc 100644
--- a/drivers/pci/pcie_layerscape.h
+++ b/drivers/pci/pcie_layerscape.h
@@ -7,9 +7,11 @@
 
 #ifndef _PCIE_LAYERSCAPE_H_
 #define _PCIE_LAYERSCAPE_H_
+#include <compiler.h>
 #include <pci.h>
 #include <dm.h>
 #include <stdbool.h>
+#include <asm/types.h>
 #include <linux/sizes.h>
 
 #ifndef CONFIG_SYS_PCI_MEMORY_BUS
diff --git a/drivers/pci/pcie_layerscape_ep.c b/drivers/pci/pcie_layerscape_ep.c
index 3993c60d1ad..844ad48816f 100644
--- a/drivers/pci/pcie_layerscape_ep.c
+++ b/drivers/pci/pcie_layerscape_ep.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <stdio.h>
 #include <asm/global_data.h>
@@ -17,6 +18,7 @@
 #include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <linux/log2.h>
+#include <linux/types.h>
 #include "pcie_layerscape.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/pci/pcie_layerscape_fixup.c b/drivers/pci/pcie_layerscape_fixup.c
index 6cab1f0f99b..74ed8dbb15a 100644
--- a/drivers/pci/pcie_layerscape_fixup.c
+++ b/drivers/pci/pcie_layerscape_fixup.c
@@ -20,6 +20,7 @@
 #endif
 #include <asm/u-boot.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include "pcie_layerscape.h"
 #include "pcie_layerscape_fixup_common.h"
 
diff --git a/drivers/pci/pcie_layerscape_fixup_common.c b/drivers/pci/pcie_layerscape_fixup_common.c
index d4d5bba8523..0eed44c689d 100644
--- a/drivers/pci/pcie_layerscape_fixup_common.c
+++ b/drivers/pci/pcie_layerscape_fixup_common.c
@@ -16,6 +16,7 @@
 #include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "pcie_layerscape_fixup_common.h"
 
 void ft_pci_setup(void *blob, struct bd_info *bd)
diff --git a/drivers/pci/pcie_layerscape_gen4.c b/drivers/pci/pcie_layerscape_gen4.c
index 7046960c77a..ea68f39d50b 100644
--- a/drivers/pci/pcie_layerscape_gen4.c
+++ b/drivers/pci/pcie_layerscape_gen4.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/arch/fsl_serdes.h>
 #include <pci.h>
@@ -19,6 +20,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/sizes.h>
+#include <linux/types.h>
 
 #include "pcie_layerscape_gen4.h"
 
diff --git a/drivers/pci/pcie_layerscape_gen4.h b/drivers/pci/pcie_layerscape_gen4.h
index 8fcc03afba2..2ace295f9f5 100644
--- a/drivers/pci/pcie_layerscape_gen4.h
+++ b/drivers/pci/pcie_layerscape_gen4.h
@@ -8,9 +8,11 @@
 
 #ifndef _PCIE_LAYERSCAPE_GEN4_H_
 #define _PCIE_LAYERSCAPE_GEN4_H_
+#include <compiler.h>
 #include <pci.h>
 #include <dm.h>
 #include <stdbool.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 
 #ifndef CONFIG_SYS_PCI_MEMORY_SIZE
diff --git a/drivers/pci/pcie_layerscape_gen4_fixup.c b/drivers/pci/pcie_layerscape_gen4_fixup.c
index be70a9a8b57..7392471c26f 100644
--- a/drivers/pci/pcie_layerscape_gen4_fixup.c
+++ b/drivers/pci/pcie_layerscape_gen4_fixup.c
@@ -19,6 +19,7 @@
 #ifdef CONFIG_ARM
 #include <asm/arch/clock.h>
 #endif
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
 #include "pcie_layerscape_gen4.h"
diff --git a/drivers/pci/pcie_layerscape_rc.c b/drivers/pci/pcie_layerscape_rc.c
index 18d025d3b16..07003f9f29b 100644
--- a/drivers/pci/pcie_layerscape_rc.c
+++ b/drivers/pci/pcie_layerscape_rc.c
@@ -20,6 +20,7 @@
 #include <asm/arch/clock.h>
 #endif
 #include <linux/errno.h>
+#include <linux/types.h>
 #include "pcie_layerscape.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/pci/pcie_mediatek.c b/drivers/pci/pcie_mediatek.c
index 29d82739486..775e6a463bd 100644
--- a/drivers/pci/pcie_mediatek.c
+++ b/drivers/pci/pcie_mediatek.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <dm.h>
 #include <generic-phy.h>
 #include <log.h>
@@ -23,6 +24,7 @@
 #include <linux/iopoll.h>
 #include <linux/list.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 /* PCIe shared registers */
 #define PCIE_SYS_CFG		0x00
diff --git a/drivers/pci/pcie_phytium.c b/drivers/pci/pcie_phytium.c
index 3d91706ccf1..39c65fe074a 100644
--- a/drivers/pci/pcie_phytium.c
+++ b/drivers/pci/pcie_phytium.c
@@ -14,6 +14,7 @@
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 /**
  * struct phytium_pcie - phytium PCIe controller state
diff --git a/drivers/pci/pcie_rockchip.c b/drivers/pci/pcie_rockchip.c
index 460d74a3088..e6b90167796 100644
--- a/drivers/pci/pcie_rockchip.c
+++ b/drivers/pci/pcie_rockchip.c
@@ -20,6 +20,7 @@
 #include <pci.h>
 #include <power-domain.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <power/regulator.h>
 #include <reset.h>
 #include <syscon.h>
diff --git a/drivers/pci/pcie_xilinx.c b/drivers/pci/pcie_xilinx.c
index 1bce36bc95e..a1fd61179a7 100644
--- a/drivers/pci/pcie_xilinx.c
+++ b/drivers/pci/pcie_xilinx.c
@@ -13,6 +13,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 #include <asm/io.h>
 
diff --git a/drivers/pci_endpoint/pci_ep-uclass.c b/drivers/pci_endpoint/pci_ep-uclass.c
index 8e672e812d1..0d0912f1bc3 100644
--- a/drivers/pci_endpoint/pci_ep-uclass.c
+++ b/drivers/pci_endpoint/pci_ep-uclass.c
@@ -17,6 +17,7 @@
 #include <linux/kernel.h>
 #include <linux/log2.h>
 #include <pci_ep.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/pci_endpoint/pcie-cadence-ep.c b/drivers/pci_endpoint/pcie-cadence-ep.c
index 66c7dece310..268cda83a43 100644
--- a/drivers/pci_endpoint/pcie-cadence-ep.c
+++ b/drivers/pci_endpoint/pcie-cadence-ep.c
@@ -8,11 +8,13 @@
 #include <dm.h>
 #include <errno.h>
 #include <pci_ep.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <linux/log2.h>
+#include <linux/types.h>
 #include "pcie-cadence.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/pci_endpoint/pcie-cadence.h b/drivers/pci_endpoint/pcie-cadence.h
index 8a659c36aa2..b74e37d1cae 100644
--- a/drivers/pci_endpoint/pcie-cadence.h
+++ b/drivers/pci_endpoint/pcie-cadence.h
@@ -12,8 +12,10 @@
 #define PCIE_CADENCE_H
 
 #include <common.h>
+#include <compiler.h>
 #include <pci_ep.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 
 /*
diff --git a/drivers/pci_endpoint/sandbox-pci_ep.c b/drivers/pci_endpoint/sandbox-pci_ep.c
index 59c330066d7..f5b26de5e3a 100644
--- a/drivers/pci_endpoint/sandbox-pci_ep.c
+++ b/drivers/pci_endpoint/sandbox-pci_ep.c
@@ -11,6 +11,7 @@
 #include <asm/test.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /**
  * struct sandbox_pci_ep_priv - private data for driver
diff --git a/drivers/phy/allwinner/phy-sun4i-usb.c b/drivers/phy/allwinner/phy-sun4i-usb.c
index 17c2de2caee..89c466e10d8 100644
--- a/drivers/phy/allwinner/phy-sun4i-usb.c
+++ b/drivers/phy/allwinner/phy-sun4i-usb.c
@@ -12,8 +12,10 @@
 
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
+#include <stdbool.h>
 #include <vsprintf.h>
 #include <dm/device.h>
 #include <generic-phy.h>
@@ -29,6 +31,7 @@
 #include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define REG_ISCR			0x00
 #define REG_PHYCTL_A10			0x04
diff --git a/drivers/phy/bcm6318-usbh-phy.c b/drivers/phy/bcm6318-usbh-phy.c
index f6b7e4c1ca5..f26ff381c1a 100644
--- a/drivers/phy/bcm6318-usbh-phy.c
+++ b/drivers/phy/bcm6318-usbh-phy.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <dm.h>
 #include <generic-phy.h>
 #include <log.h>
diff --git a/drivers/phy/bcm6348-usbh-phy.c b/drivers/phy/bcm6348-usbh-phy.c
index 13031b886d4..b3f02eb5fc1 100644
--- a/drivers/phy/bcm6348-usbh-phy.c
+++ b/drivers/phy/bcm6348-usbh-phy.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <dm.h>
 #include <generic-phy.h>
 #include <log.h>
diff --git a/drivers/phy/bcm6358-usbh-phy.c b/drivers/phy/bcm6358-usbh-phy.c
index aaa32315fa7..d8b9fcec85b 100644
--- a/drivers/phy/bcm6358-usbh-phy.c
+++ b/drivers/phy/bcm6358-usbh-phy.c
@@ -8,6 +8,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <generic-phy.h>
 #include <log.h>
diff --git a/drivers/phy/bcm6368-usbh-phy.c b/drivers/phy/bcm6368-usbh-phy.c
index 3bd4d688419..eaeba233ce7 100644
--- a/drivers/phy/bcm6368-usbh-phy.c
+++ b/drivers/phy/bcm6368-usbh-phy.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <dm.h>
 #include <generic-phy.h>
 #include <log.h>
@@ -20,6 +21,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 /* USBH PLL Control register */
 #define USBH_PLL_REG		0x18
diff --git a/drivers/phy/keystone-usb-phy.c b/drivers/phy/keystone-usb-phy.c
index 2806ee50ead..f4c07430025 100644
--- a/drivers/phy/keystone-usb-phy.c
+++ b/drivers/phy/keystone-usb-phy.c
@@ -5,8 +5,10 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
+#include <asm/types.h>
 #include <dm/device.h>
 #include <generic-phy.h>
 #include <asm/io.h>
diff --git a/drivers/phy/marvell/comphy_a3700.c b/drivers/phy/marvell/comphy_a3700.c
index 696b36d40c9..6a20d1721e4 100644
--- a/drivers/phy/marvell/comphy_a3700.c
+++ b/drivers/phy/marvell/comphy_a3700.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
 
diff --git a/drivers/phy/marvell/comphy_core.c b/drivers/phy/marvell/comphy_core.c
index 99f68fff12c..f5f9d579980 100644
--- a/drivers/phy/marvell/comphy_core.c
+++ b/drivers/phy/marvell/comphy_core.c
@@ -6,11 +6,13 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <fdtdec.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <dm/device_compat.h>
 #include <linux/err.h>
 #include <linux/errno.h>
diff --git a/drivers/phy/marvell/comphy_core.h b/drivers/phy/marvell/comphy_core.h
index 58c5c2fabdc..12a19bc83cc 100644
--- a/drivers/phy/marvell/comphy_core.h
+++ b/drivers/phy/marvell/comphy_core.h
@@ -6,8 +6,10 @@
 #ifndef _COMPHY_CORE_H_
 #define _COMPHY_CORE_H_
 
+#include <compiler.h>
 #include <fdtdec.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <mvebu/comphy.h>
 
 #if defined(DEBUG)
diff --git a/drivers/phy/marvell/comphy_cp110.c b/drivers/phy/marvell/comphy_cp110.c
index 532ae928a8c..ab2163978d2 100644
--- a/drivers/phy/marvell/comphy_cp110.c
+++ b/drivers/phy/marvell/comphy_cp110.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <fdtdec.h>
 #include <log.h>
 #include <stdbool.h>
@@ -12,6 +13,7 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/printk.h>
 
diff --git a/drivers/phy/marvell/comphy_mux.c b/drivers/phy/marvell/comphy_mux.c
index 98327557a89..96ff0399b43 100644
--- a/drivers/phy/marvell/comphy_mux.c
+++ b/drivers/phy/marvell/comphy_mux.c
@@ -4,8 +4,10 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <log.h>
 #include <asm/io.h>
+#include <asm/types.h>
 
 #include "comphy_core.h"
 #include "comphy_hpipe.h"
diff --git a/drivers/phy/meson-g12a-usb3-pcie.c b/drivers/phy/meson-g12a-usb3-pcie.c
index 02feae1e2cd..f354fd58414 100644
--- a/drivers/phy/meson-g12a-usb3-pcie.c
+++ b/drivers/phy/meson-g12a-usb3-pcie.c
@@ -20,6 +20,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 #include <linux/bitops.h>
 #include <linux/compat.h>
diff --git a/drivers/phy/meson-gxbb-usb2.c b/drivers/phy/meson-gxbb-usb2.c
index 8a06bc5aadb..770422dddf1 100644
--- a/drivers/phy/meson-gxbb-usb2.c
+++ b/drivers/phy/meson-gxbb-usb2.c
@@ -14,6 +14,7 @@
 #include <generic-phy.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 #include <power/regulator.h>
 #include <regmap.h>
 #include <reset.h>
diff --git a/drivers/phy/meson-gxl-usb2.c b/drivers/phy/meson-gxl-usb2.c
index ebfde063ee8..476a6f15ecc 100644
--- a/drivers/phy/meson-gxl-usb2.c
+++ b/drivers/phy/meson-gxl-usb2.c
@@ -18,6 +18,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 #include <power/regulator.h>
 #include <clk.h>
 #include <linux/usb/otg.h>
diff --git a/drivers/phy/meson-gxl-usb3.c b/drivers/phy/meson-gxl-usb3.c
index f566ef78663..3afab512acc 100644
--- a/drivers/phy/meson-gxl-usb3.c
+++ b/drivers/phy/meson-gxl-usb3.c
@@ -18,6 +18,7 @@
 #include <clk.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 #include <linux/usb/otg.h>
 
 #include <asm/arch/usb-gx.h>
diff --git a/drivers/phy/msm8916-usbh-phy.c b/drivers/phy/msm8916-usbh-phy.c
index 5883926f087..e3e2d90da37 100644
--- a/drivers/phy/msm8916-usbh-phy.c
+++ b/drivers/phy/msm8916-usbh-phy.c
@@ -4,8 +4,10 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <generic-phy.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <usb/ehci-ci.h>
diff --git a/drivers/phy/mt76x8-usb-phy.c b/drivers/phy/mt76x8-usb-phy.c
index 8c05e5e00df..292c6e055f0 100644
--- a/drivers/phy/mt76x8-usb-phy.c
+++ b/drivers/phy/mt76x8-usb-phy.c
@@ -8,11 +8,13 @@
 
 #include <clk.h>
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <generic-phy.h>
 #include <log.h>
 #include <reset.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/phy/omap-usb2-phy.c b/drivers/phy/omap-usb2-phy.c
index df9ee140291..aec83a96d93 100644
--- a/drivers/phy/omap-usb2-phy.c
+++ b/drivers/phy/omap-usb2-phy.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
@@ -18,6 +19,7 @@
 #include <linux/bitops.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #define OMAP_USB2_CALIBRATE_FALSE_DISCONNECT	BIT(0)
 #define OMAP_USB2_DISABLE_CHG_DET		BIT(1)
diff --git a/drivers/phy/phy-mtk-tphy.c b/drivers/phy/phy-mtk-tphy.c
index 375a7575b77..745b616c2f9 100644
--- a/drivers/phy/phy-mtk-tphy.c
+++ b/drivers/phy/phy-mtk-tphy.c
@@ -7,11 +7,13 @@
 
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <dm.h>
 #include <generic-phy.h>
 #include <malloc.h>
 #include <mapmem.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <dm/device_compat.h>
 #include <dm/devres.h>
 #include <linux/bitops.h>
diff --git a/drivers/phy/phy-rcar-gen2.c b/drivers/phy/phy-rcar-gen2.c
index db32d3b1a41..16edcc9e036 100644
--- a/drivers/phy/phy-rcar-gen2.c
+++ b/drivers/phy/phy-rcar-gen2.c
@@ -16,6 +16,7 @@
 #include <syscon.h>
 #include <usb.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/drivers/phy/phy-stm32-usbphyc.c b/drivers/phy/phy-stm32-usbphyc.c
index 4b7cd602c26..e3c13c5585c 100644
--- a/drivers/phy/phy-stm32-usbphyc.c
+++ b/drivers/phy/phy-stm32-usbphyc.c
@@ -15,6 +15,7 @@
 #include <syscon.h>
 #include <usb.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/drivers/phy/phy-ti-am654.c b/drivers/phy/phy-ti-am654.c
index fa22b714540..11d5f7346d1 100644
--- a/drivers/phy/phy-ti-am654.c
+++ b/drivers/phy/phy-ti-am654.c
@@ -10,6 +10,7 @@
 #include <clk-uclass.h>
 #include <dm.h>
 #include <log.h>
+#include <asm/types.h>
 #include <dm/device.h>
 #include <dm/device_compat.h>
 #include <dm/lists.h>
diff --git a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
index 008f1f629a8..b78712bbbb5 100644
--- a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
+++ b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
@@ -22,6 +22,7 @@
 #include <linux/iopoll.h>
 #include <asm/arch-rockchip/clock.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/phy/rockchip/phy-rockchip-pcie.c b/drivers/phy/rockchip/phy-rockchip-pcie.c
index fc7801224ac..c9106f19f4f 100644
--- a/drivers/phy/rockchip/phy-rockchip-pcie.c
+++ b/drivers/phy/rockchip/phy-rockchip-pcie.c
@@ -20,6 +20,7 @@
 #include <linux/errno.h>
 #include <linux/iopoll.h>
 #include <asm/arch-rockchip/clock.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/phy/rockchip/phy-rockchip-typec.c b/drivers/phy/rockchip/phy-rockchip-typec.c
index 00a0e4d4313..682cb141d33 100644
--- a/drivers/phy/rockchip/phy-rockchip-typec.c
+++ b/drivers/phy/rockchip/phy-rockchip-typec.c
@@ -10,7 +10,9 @@
 
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <dm.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 #include <dm/device_compat.h>
 #include <dm/lists.h>
@@ -24,6 +26,7 @@
 #include <asm/arch-rockchip/clock.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/phy/sti_usb_phy.c b/drivers/phy/sti_usb_phy.c
index 91ba53f8bdb..fe352c59fe6 100644
--- a/drivers/phy/sti_usb_phy.c
+++ b/drivers/phy/sti_usb_phy.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <log.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
@@ -13,6 +14,7 @@
 #include <errno.h>
 #include <fdtdec.h>
 #include <generic-phy.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/libfdt.h>
diff --git a/drivers/phy/ti-pipe3-phy.c b/drivers/phy/ti-pipe3-phy.c
index 96a573add48..f1a5824811b 100644
--- a/drivers/phy/ti-pipe3-phy.c
+++ b/drivers/phy/ti-pipe3-phy.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <stdio.h>
 #include <asm/global_data.h>
@@ -19,6 +20,7 @@
 #include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 /* PLLCTRL Registers */
 #define PLL_STATUS              0x00000004
diff --git a/drivers/pinctrl/aspeed/pinctrl_ast2500.c b/drivers/pinctrl/aspeed/pinctrl_ast2500.c
index 040247c68a1..3ba3a67f118 100644
--- a/drivers/pinctrl/aspeed/pinctrl_ast2500.c
+++ b/drivers/pinctrl/aspeed/pinctrl_ast2500.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <asm/arch/pinctrl.h>
 #include <asm/arch/scu_ast2500.h>
+#include <asm/types.h>
 #include <dm/pinctrl.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
diff --git a/drivers/pinctrl/ath79/pinctrl_ar933x.c b/drivers/pinctrl/ath79/pinctrl_ar933x.c
index dce17402440..6fb80f2ea73 100644
--- a/drivers/pinctrl/ath79/pinctrl_ar933x.c
+++ b/drivers/pinctrl/ath79/pinctrl_ar933x.c
@@ -4,11 +4,13 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <dm/pinctrl.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
diff --git a/drivers/pinctrl/ath79/pinctrl_qca953x.c b/drivers/pinctrl/ath79/pinctrl_qca953x.c
index 1e11eb863ca..b6a9e4a0028 100644
--- a/drivers/pinctrl/ath79/pinctrl_qca953x.c
+++ b/drivers/pinctrl/ath79/pinctrl_qca953x.c
@@ -4,11 +4,13 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <dm/pinctrl.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
diff --git a/drivers/pinctrl/broadcom/pinctrl-bcm283x.c b/drivers/pinctrl/broadcom/pinctrl-bcm283x.c
index a7c928c71e3..ea1477dcbc8 100644
--- a/drivers/pinctrl/broadcom/pinctrl-bcm283x.c
+++ b/drivers/pinctrl/broadcom/pinctrl-bcm283x.c
@@ -16,6 +16,7 @@
 #include <dm.h>
 #include <log.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <dm/pinctrl.h>
 #include <dm/root.h>
 #include <dm/device-internal.h>
diff --git a/drivers/pinctrl/broadcom/pinctrl-bcm6838.c b/drivers/pinctrl/broadcom/pinctrl-bcm6838.c
index 2f871b611fd..fc17d4c6f01 100644
--- a/drivers/pinctrl/broadcom/pinctrl-bcm6838.c
+++ b/drivers/pinctrl/broadcom/pinctrl-bcm6838.c
@@ -8,6 +8,7 @@
 #include <dm/device_compat.h>
 #include <dm/pinctrl.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #define BCM6838_CMD_LOAD_MUX            0x21
 
diff --git a/drivers/pinctrl/exynos/pinctrl-exynos.c b/drivers/pinctrl/exynos/pinctrl-exynos.c
index 4a49519416c..d53eeed756e 100644
--- a/drivers/pinctrl/exynos/pinctrl-exynos.c
+++ b/drivers/pinctrl/exynos/pinctrl-exynos.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 #include "pinctrl-exynos.h"
diff --git a/drivers/pinctrl/exynos/pinctrl-exynos7420.c b/drivers/pinctrl/exynos/pinctrl-exynos7420.c
index 18de9f7762c..5f6064f3a7e 100644
--- a/drivers/pinctrl/exynos/pinctrl-exynos7420.c
+++ b/drivers/pinctrl/exynos/pinctrl-exynos7420.c
@@ -15,6 +15,7 @@
 #include <asm/arch/pinmux.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include "pinctrl-exynos.h"
 
 #define	GPD1_OFFSET	0xc0
diff --git a/drivers/pinctrl/intel/pinctrl.c b/drivers/pinctrl/intel/pinctrl.c
index aa261a8bdc5..9000a97427f 100644
--- a/drivers/pinctrl/intel/pinctrl.c
+++ b/drivers/pinctrl/intel/pinctrl.c
@@ -33,6 +33,7 @@
 #include <dt-bindings/gpio/gpio.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #define GPIO_DW_SIZE(x)			(sizeof(u32) * (x))
 #define PAD_CFG_OFFSET(x, dw_num)	((x) + GPIO_DW_SIZE(dw_num))
diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
index 362c7d47726..1672e6242d9 100644
--- a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <asm/types.h>
 #include <dm/device-internal.h>
 #include <dm/lists.h>
 #include <dm/pinctrl.h>
diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common.h b/drivers/pinctrl/mediatek/pinctrl-mtk-common.h
index def643c5d5b..5c51acfb6c2 100644
--- a/drivers/pinctrl/mediatek/pinctrl-mtk-common.h
+++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common.h
@@ -6,6 +6,8 @@
 #ifndef __PINCTRL_MEDIATEK_H__
 #define __PINCTRL_MEDIATEK_H__
 
+#include <compiler.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 #define MTK_PINCTRL_V0 0x0
 #define MTK_PINCTRL_V1 0x1
diff --git a/drivers/pinctrl/meson/pinctrl-meson-axg.c b/drivers/pinctrl/meson/pinctrl-meson-axg.c
index a2bed97accf..7987b176bc6 100644
--- a/drivers/pinctrl/meson/pinctrl-meson-axg.c
+++ b/drivers/pinctrl/meson/pinctrl-meson-axg.c
@@ -12,6 +12,7 @@
 #include <dm/pinctrl.h>
 #include <dt-bindings/gpio/meson-axg-gpio.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include "pinctrl-meson-axg.h"
 
diff --git a/drivers/pinctrl/meson/pinctrl-meson-g12a.c b/drivers/pinctrl/meson/pinctrl-meson-g12a.c
index 2a38e321496..dcdafa114b9 100644
--- a/drivers/pinctrl/meson/pinctrl-meson-g12a.c
+++ b/drivers/pinctrl/meson/pinctrl-meson-g12a.c
@@ -13,6 +13,7 @@
 #include <dm/pinctrl.h>
 #include <dt-bindings/gpio/meson-g12a-gpio.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include "pinctrl-meson-axg.h"
 
diff --git a/drivers/pinctrl/meson/pinctrl-meson-gx-pmx.c b/drivers/pinctrl/meson/pinctrl-meson-gx-pmx.c
index 3d896cc1303..1c053c4d908 100644
--- a/drivers/pinctrl/meson/pinctrl-meson-gx-pmx.c
+++ b/drivers/pinctrl/meson/pinctrl-meson-gx-pmx.c
@@ -3,11 +3,13 @@
  * (C) Copyright 2016 - Beniamino Galvani <b.galvani@gmail.com>
  */
 
+#include <compiler.h>
 #include <log.h>
 #include <vsprintf.h>
 #include <asm/gpio.h>
 #include <common.h>
 #include <dm.h>
+#include <asm/types.h>
 #include <dm/pinctrl.h>
 #include <linux/bitops.h>
 #include <linux/io.h>
diff --git a/drivers/pinctrl/meson/pinctrl-meson-gxbb.c b/drivers/pinctrl/meson/pinctrl-meson-gxbb.c
index cb755d6cfc5..f77ca812050 100644
--- a/drivers/pinctrl/meson/pinctrl-meson-gxbb.c
+++ b/drivers/pinctrl/meson/pinctrl-meson-gxbb.c
@@ -11,6 +11,7 @@
 #include <dm/pinctrl.h>
 #include <dt-bindings/gpio/meson-gxbb-gpio.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include "pinctrl-meson-gx.h"
 
diff --git a/drivers/pinctrl/meson/pinctrl-meson-gxl.c b/drivers/pinctrl/meson/pinctrl-meson-gxl.c
index f28f07bce1a..77d8edd161d 100644
--- a/drivers/pinctrl/meson/pinctrl-meson-gxl.c
+++ b/drivers/pinctrl/meson/pinctrl-meson-gxl.c
@@ -11,6 +11,7 @@
 #include <dm/pinctrl.h>
 #include <dt-bindings/gpio/meson-gxl-gpio.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include "pinctrl-meson-gx.h"
 
diff --git a/drivers/pinctrl/meson/pinctrl-meson.c b/drivers/pinctrl/meson/pinctrl-meson.c
index ad44da1e8bb..7c5922d41c7 100644
--- a/drivers/pinctrl/meson/pinctrl-meson.c
+++ b/drivers/pinctrl/meson/pinctrl-meson.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
 #include <malloc.h>
diff --git a/drivers/pinctrl/meson/pinctrl-meson.h b/drivers/pinctrl/meson/pinctrl-meson.h
index eb33d93f506..4dc963387a2 100644
--- a/drivers/pinctrl/meson/pinctrl-meson.h
+++ b/drivers/pinctrl/meson/pinctrl-meson.h
@@ -6,6 +6,7 @@
 #ifndef __PINCTRL_MESON_H__
 #define __PINCTRL_MESON_H__
 
+#include <compiler.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
 
diff --git a/drivers/pinctrl/mscc/mscc-common.c b/drivers/pinctrl/mscc/mscc-common.c
index 308f23b742d..84f154b6167 100644
--- a/drivers/pinctrl/mscc/mscc-common.c
+++ b/drivers/pinctrl/mscc/mscc-common.c
@@ -13,6 +13,7 @@
 #include <common.h>
 #include <config.h>
 #include <dm.h>
+#include <asm/types.h>
 #include <dm/device-internal.h>
 #include <dm/device_compat.h>
 #include <dm/devres.h>
diff --git a/drivers/pinctrl/mscc/mscc-common.h b/drivers/pinctrl/mscc/mscc-common.h
index 3c5c1faf840..ddd41adc2b8 100644
--- a/drivers/pinctrl/mscc/mscc-common.h
+++ b/drivers/pinctrl/mscc/mscc-common.h
@@ -7,6 +7,7 @@
  * Copyright (c) 2017 Microsemi Corporation
  */
 
+#include <compiler.h>
 #define MSCC_FUNC_PER_PIN	4
 
 enum mscc_regs_gpio {
diff --git a/drivers/pinctrl/mtmips/pinctrl-mt7628.c b/drivers/pinctrl/mtmips/pinctrl-mt7628.c
index 4ea1e853f78..49a26b9afc3 100644
--- a/drivers/pinctrl/mtmips/pinctrl-mt7628.c
+++ b/drivers/pinctrl/mtmips/pinctrl-mt7628.c
@@ -6,8 +6,10 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <dm/pinctrl.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
diff --git a/drivers/pinctrl/mtmips/pinctrl-mtmips-common.c b/drivers/pinctrl/mtmips/pinctrl-mtmips-common.c
index ad9bd0311cc..1964d8012fe 100644
--- a/drivers/pinctrl/mtmips/pinctrl-mtmips-common.c
+++ b/drivers/pinctrl/mtmips/pinctrl-mtmips-common.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <dm.h>
 #include <malloc.h>
+#include <asm/types.h>
 #include <dm/pinctrl.h>
 #include <linux/errno.h>
 #include <linux/io.h>
diff --git a/drivers/pinctrl/mtmips/pinctrl-mtmips-common.h b/drivers/pinctrl/mtmips/pinctrl-mtmips-common.h
index 25ca19ff6ab..540e4d7a85a 100644
--- a/drivers/pinctrl/mtmips/pinctrl-mtmips-common.h
+++ b/drivers/pinctrl/mtmips/pinctrl-mtmips-common.h
@@ -9,6 +9,8 @@
 #define _PINCTRL_MTMIPS_COMMON_H_
 
 #include <common.h>
+#include <compiler.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 
 struct mtmips_pmx_func {
diff --git a/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c b/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c
index 52b6c9242ae..343139533b1 100644
--- a/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c
+++ b/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c
@@ -17,6 +17,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <config.h>
 #include <dm.h>
 #include <malloc.h>
@@ -41,6 +42,7 @@
 #include <linux/libfdt.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/pinctrl/mvebu/pinctrl-mvebu.c b/drivers/pinctrl/mvebu/pinctrl-mvebu.c
index e5820375393..5f40b00daef 100644
--- a/drivers/pinctrl/mvebu/pinctrl-mvebu.c
+++ b/drivers/pinctrl/mvebu/pinctrl-mvebu.c
@@ -11,6 +11,7 @@
 #include <dm.h>
 #include <log.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <dm/pinctrl.h>
 #include <dm/root.h>
 #include <asm/system.h>
diff --git a/drivers/pinctrl/mvebu/pinctrl-mvebu.h b/drivers/pinctrl/mvebu/pinctrl-mvebu.h
index 54ad69e8ba8..5ed0b63a49b 100644
--- a/drivers/pinctrl/mvebu/pinctrl-mvebu.h
+++ b/drivers/pinctrl/mvebu/pinctrl-mvebu.h
@@ -4,6 +4,7 @@
  * https://spdx.org/licenses
  */
 
+#include <linux/types.h>
  #ifndef __PINCTRL_MVEBU_H_
  #define __PINCTRL_MVEBU_H_
 
diff --git a/drivers/pinctrl/nexell/pinctrl-nexell.c b/drivers/pinctrl/nexell/pinctrl-nexell.c
index da5ca6846cf..0e379ce98fe 100644
--- a/drivers/pinctrl/nexell/pinctrl-nexell.c
+++ b/drivers/pinctrl/nexell/pinctrl-nexell.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include "pinctrl-nexell.h"
 #include "pinctrl-s5pxx18.h"
diff --git a/drivers/pinctrl/nexell/pinctrl-nexell.h b/drivers/pinctrl/nexell/pinctrl-nexell.h
index b21eefcabef..35c870808f2 100644
--- a/drivers/pinctrl/nexell/pinctrl-nexell.h
+++ b/drivers/pinctrl/nexell/pinctrl-nexell.h
@@ -10,6 +10,7 @@
 #define __PINCTRL_NEXELL_H_
 
 /**
+#include <asm/types.h>
  * struct nexell_pin_bank_data: represent a controller pin-bank data.
  * @offset: starting offset of the pin-bank registers.
  * @nr_pins: number of pins included in this bank.
diff --git a/drivers/pinctrl/nexell/pinctrl-s5pxx18.c b/drivers/pinctrl/nexell/pinctrl-s5pxx18.c
index 08a97ae378b..93a01cb9101 100644
--- a/drivers/pinctrl/nexell/pinctrl-s5pxx18.c
+++ b/drivers/pinctrl/nexell/pinctrl-s5pxx18.c
@@ -10,11 +10,13 @@
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <dm/pinctrl.h>
 #include <dm/root.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include "pinctrl-nexell.h"
 #include "pinctrl-s5pxx18.h"
 
diff --git a/drivers/pinctrl/nxp/pinctrl-imx.c b/drivers/pinctrl/nxp/pinctrl-imx.c
index 6db7313aecd..09cdb17ea79 100644
--- a/drivers/pinctrl/nxp/pinctrl-imx.c
+++ b/drivers/pinctrl/nxp/pinctrl-imx.c
@@ -7,6 +7,7 @@
 #include <malloc.h>
 #include <mapmem.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <dm/device_compat.h>
 #include <dm/devres.h>
 #include <linux/bitops.h>
diff --git a/drivers/pinctrl/nxp/pinctrl-imx.h b/drivers/pinctrl/nxp/pinctrl-imx.h
index 947975ee72a..0cb1f03c460 100644
--- a/drivers/pinctrl/nxp/pinctrl-imx.h
+++ b/drivers/pinctrl/nxp/pinctrl-imx.h
@@ -12,6 +12,8 @@
  * @flags: flags specific for each soc
  * @mux_mask: Used when SHARE_MUX_CONF_REG flag is added
  */
+#include <compiler.h>
+#include <asm/types.h>
 struct imx_pinctrl_soc_info {
 	void __iomem *base;
 	void __iomem *input_sel_base;
diff --git a/drivers/pinctrl/nxp/pinctrl-imx5.c b/drivers/pinctrl/nxp/pinctrl-imx5.c
index 9c3423bef37..645cd2f660c 100644
--- a/drivers/pinctrl/nxp/pinctrl-imx5.c
+++ b/drivers/pinctrl/nxp/pinctrl-imx5.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <dm/pinctrl.h>
+#include <linux/types.h>
 
 #include "pinctrl-imx.h"
 
diff --git a/drivers/pinctrl/nxp/pinctrl-imx6.c b/drivers/pinctrl/nxp/pinctrl-imx6.c
index aafa3057ada..0c78cfcd533 100644
--- a/drivers/pinctrl/nxp/pinctrl-imx6.c
+++ b/drivers/pinctrl/nxp/pinctrl-imx6.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <dm/pinctrl.h>
+#include <linux/types.h>
 
 #include "pinctrl-imx.h"
 
diff --git a/drivers/pinctrl/nxp/pinctrl-imx7.c b/drivers/pinctrl/nxp/pinctrl-imx7.c
index 66b58ba472c..4b67e43aeca 100644
--- a/drivers/pinctrl/nxp/pinctrl-imx7.c
+++ b/drivers/pinctrl/nxp/pinctrl-imx7.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <dm.h>
 #include <dm/pinctrl.h>
+#include <linux/types.h>
 
 #include "pinctrl-imx.h"
 
diff --git a/drivers/pinctrl/nxp/pinctrl-imx7ulp.c b/drivers/pinctrl/nxp/pinctrl-imx7ulp.c
index 598bbfaf350..f2fcb93e7e4 100644
--- a/drivers/pinctrl/nxp/pinctrl-imx7ulp.c
+++ b/drivers/pinctrl/nxp/pinctrl-imx7ulp.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <dm.h>
 #include <dm/pinctrl.h>
+#include <linux/types.h>
 
 #include "pinctrl-imx.h"
 
diff --git a/drivers/pinctrl/nxp/pinctrl-imx8.c b/drivers/pinctrl/nxp/pinctrl-imx8.c
index 7af9506d504..8a76eafa79e 100644
--- a/drivers/pinctrl/nxp/pinctrl-imx8.c
+++ b/drivers/pinctrl/nxp/pinctrl-imx8.c
@@ -7,6 +7,7 @@
 #include <asm/global_data.h>
 #include <dm/device.h>
 #include <dm/pinctrl.h>
+#include <linux/types.h>
 
 #include "pinctrl-imx.h"
 
diff --git a/drivers/pinctrl/nxp/pinctrl-imx8m.c b/drivers/pinctrl/nxp/pinctrl-imx8m.c
index 0626fde58f1..4703c902c2c 100644
--- a/drivers/pinctrl/nxp/pinctrl-imx8m.c
+++ b/drivers/pinctrl/nxp/pinctrl-imx8m.c
@@ -5,6 +5,7 @@
 
 #include <dm/device.h>
 #include <dm/pinctrl.h>
+#include <linux/types.h>
 
 #include "pinctrl-imx.h"
 
diff --git a/drivers/pinctrl/nxp/pinctrl-imxrt.c b/drivers/pinctrl/nxp/pinctrl-imxrt.c
index 4a939419275..f06e4d0cc39 100644
--- a/drivers/pinctrl/nxp/pinctrl-imxrt.c
+++ b/drivers/pinctrl/nxp/pinctrl-imxrt.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <dm/pinctrl.h>
+#include <linux/types.h>
 
 #include "pinctrl-imx.h"
 
diff --git a/drivers/pinctrl/nxp/pinctrl-mxs.c b/drivers/pinctrl/nxp/pinctrl-mxs.c
index 6cb6977812a..5ed65fb5269 100644
--- a/drivers/pinctrl/nxp/pinctrl-mxs.c
+++ b/drivers/pinctrl/nxp/pinctrl-mxs.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <log.h>
 #include <asm/global_data.h>
 #include <dm/device_compat.h>
@@ -15,6 +16,7 @@
 #include <dm.h>
 #include <dm/pinctrl.h>
 #include <dm/read.h>
+#include <linux/types.h>
 #include "pinctrl-mxs.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/pinctrl/nxp/pinctrl-mxs.h b/drivers/pinctrl/nxp/pinctrl-mxs.h
index a398e43cbeb..62f8e139361 100644
--- a/drivers/pinctrl/nxp/pinctrl-mxs.h
+++ b/drivers/pinctrl/nxp/pinctrl-mxs.h
@@ -6,6 +6,8 @@
 #ifndef __PINCTRL_MXS_H
 #define __PINCTRL_MXS_H
 
+#include <compiler.h>
+#include <asm/types.h>
 #include <dm/pinctrl.h>
 
 #define SET	0x4
diff --git a/drivers/pinctrl/nxp/pinctrl-scu.c b/drivers/pinctrl/nxp/pinctrl-scu.c
index 81f6eb56db3..7981f24a952 100644
--- a/drivers/pinctrl/nxp/pinctrl-scu.c
+++ b/drivers/pinctrl/nxp/pinctrl-scu.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <errno.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <asm/io.h>
 #include <asm/arch/sci/sci.h>
diff --git a/drivers/pinctrl/nxp/pinctrl-vf610.c b/drivers/pinctrl/nxp/pinctrl-vf610.c
index e795b5fd8ac..eed6717122b 100644
--- a/drivers/pinctrl/nxp/pinctrl-vf610.c
+++ b/drivers/pinctrl/nxp/pinctrl-vf610.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <dm/pinctrl.h>
+#include <linux/types.h>
 
 #include "pinctrl-imx.h"
 
diff --git a/drivers/pinctrl/pinctrl-at91-pio4.c b/drivers/pinctrl/pinctrl-at91-pio4.c
index 02f8d94f12d..0d701e79eac 100644
--- a/drivers/pinctrl/pinctrl-at91-pio4.c
+++ b/drivers/pinctrl/pinctrl-at91-pio4.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <dm/pinctrl.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
diff --git a/drivers/pinctrl/pinctrl-at91.c b/drivers/pinctrl/pinctrl-at91.c
index 819c5723fa5..9b3251e957a 100644
--- a/drivers/pinctrl/pinctrl-at91.c
+++ b/drivers/pinctrl/pinctrl-at91.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 #include <dm/pinctrl.h>
 #include <asm/hardware.h>
@@ -17,6 +18,7 @@
 #include <linux/io.h>
 #include <linux/err.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include <mach/at91_pio.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/pinctrl/pinctrl-generic.c b/drivers/pinctrl/pinctrl-generic.c
index a8a78020d0a..896869e6a83 100644
--- a/drivers/pinctrl/pinctrl-generic.c
+++ b/drivers/pinctrl/pinctrl-generic.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <dm.h>
 #include <stdbool.h>
+#include <asm/types.h>
 #include <dm/device_compat.h>
 #include <linux/compat.h>
 #include <dm/pinctrl.h>
diff --git a/drivers/pinctrl/pinctrl-single.c b/drivers/pinctrl/pinctrl-single.c
index 24387e59f1e..298a8dda03e 100644
--- a/drivers/pinctrl/pinctrl-single.c
+++ b/drivers/pinctrl/pinctrl-single.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <dm.h>
 #include <stdbool.h>
+#include <asm/types.h>
 #include <dm/device_compat.h>
 #include <dm/pinctrl.h>
 #include <linux/errno.h>
diff --git a/drivers/pinctrl/pinctrl-sti.c b/drivers/pinctrl/pinctrl-sti.c
index 7549253e061..1a3c892e83a 100644
--- a/drivers/pinctrl/pinctrl-sti.c
+++ b/drivers/pinctrl/pinctrl-sti.c
@@ -15,6 +15,7 @@
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <dm/pinctrl.h>
 #include <linux/bug.h>
 #include <linux/errno.h>
diff --git a/drivers/pinctrl/pinctrl-stmfx.c b/drivers/pinctrl/pinctrl-stmfx.c
index b72374cd09c..ac6bad745e6 100644
--- a/drivers/pinctrl/pinctrl-stmfx.c
+++ b/drivers/pinctrl/pinctrl-stmfx.c
@@ -21,6 +21,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <power/regulator.h>
 
 /* STMFX pins = GPIO[15:0] + aGPIO[7:0] */
diff --git a/drivers/pinctrl/pinctrl-uclass.c b/drivers/pinctrl/pinctrl-uclass.c
index 817ea3f3323..40afc7cb0f7 100644
--- a/drivers/pinctrl/pinctrl-uclass.c
+++ b/drivers/pinctrl/pinctrl-uclass.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <dm/device_compat.h>
@@ -17,6 +18,7 @@
 #include <dm/pinctrl.h>
 #include <dm/util.h>
 #include <dm/of_access.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/pinctrl/pinctrl_pic32.c b/drivers/pinctrl/pinctrl_pic32.c
index 939760d5bb1..8789e4e6337 100644
--- a/drivers/pinctrl/pinctrl_pic32.c
+++ b/drivers/pinctrl/pinctrl_pic32.c
@@ -5,12 +5,14 @@
  * Written by Purna Chandra Mandal <purna.mandal@microchip.com>
  */
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <dm/pinctrl.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
diff --git a/drivers/pinctrl/pinctrl_stm32.c b/drivers/pinctrl/pinctrl_stm32.c
index 98cf5b5aa5b..d9f018e7853 100644
--- a/drivers/pinctrl/pinctrl_stm32.c
+++ b/drivers/pinctrl/pinctrl_stm32.c
@@ -17,6 +17,7 @@
 #include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/pinctrl/renesas/pfc-r7s72100.c b/drivers/pinctrl/renesas/pfc-r7s72100.c
index 91d220fe475..5677f4e51f5 100644
--- a/drivers/pinctrl/renesas/pfc-r7s72100.c
+++ b/drivers/pinctrl/renesas/pfc-r7s72100.c
@@ -6,9 +6,11 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <dm/lists.h>
 #include <dm/pinctrl.h>
 #include <linux/bitops.h>
diff --git a/drivers/pinctrl/renesas/pfc-r8a7790.c b/drivers/pinctrl/renesas/pfc-r8a7790.c
index 30e9a117f8d..230a5b8569c 100644
--- a/drivers/pinctrl/renesas/pfc-r8a7790.c
+++ b/drivers/pinctrl/renesas/pfc-r8a7790.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
+#include <asm/types.h>
 #include <dm/pinctrl.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
diff --git a/drivers/pinctrl/renesas/pfc-r8a7791.c b/drivers/pinctrl/renesas/pfc-r8a7791.c
index 7ae6e4081c0..722c6e677a2 100644
--- a/drivers/pinctrl/renesas/pfc-r8a7791.c
+++ b/drivers/pinctrl/renesas/pfc-r8a7791.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
+#include <asm/types.h>
 #include <dm/pinctrl.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
diff --git a/drivers/pinctrl/renesas/pfc-r8a7792.c b/drivers/pinctrl/renesas/pfc-r8a7792.c
index 1c904120937..e2babffc6aa 100644
--- a/drivers/pinctrl/renesas/pfc-r8a7792.c
+++ b/drivers/pinctrl/renesas/pfc-r8a7792.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
+#include <asm/types.h>
 #include <dm/pinctrl.h>
 #include <linux/kernel.h>
 
diff --git a/drivers/pinctrl/renesas/pfc-r8a7794.c b/drivers/pinctrl/renesas/pfc-r8a7794.c
index e59fd7656e0..c823af776a7 100644
--- a/drivers/pinctrl/renesas/pfc-r8a7794.c
+++ b/drivers/pinctrl/renesas/pfc-r8a7794.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
+#include <asm/types.h>
 #include <dm/pinctrl.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
diff --git a/drivers/pinctrl/renesas/pfc-r8a7795.c b/drivers/pinctrl/renesas/pfc-r8a7795.c
index ba17a557752..1e7e5f0d91a 100644
--- a/drivers/pinctrl/renesas/pfc-r8a7795.c
+++ b/drivers/pinctrl/renesas/pfc-r8a7795.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
+#include <asm/types.h>
 #include <dm/pinctrl.h>
 #include <linux/kernel.h>
 
diff --git a/drivers/pinctrl/renesas/pfc-r8a7796.c b/drivers/pinctrl/renesas/pfc-r8a7796.c
index a92c8ad18c1..75b68c7bde6 100644
--- a/drivers/pinctrl/renesas/pfc-r8a7796.c
+++ b/drivers/pinctrl/renesas/pfc-r8a7796.c
@@ -14,6 +14,7 @@
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
+#include <asm/types.h>
 #include <dm/pinctrl.h>
 #include <linux/kernel.h>
 
diff --git a/drivers/pinctrl/renesas/pfc-r8a77965.c b/drivers/pinctrl/renesas/pfc-r8a77965.c
index 2523904aec1..8733ca80f39 100644
--- a/drivers/pinctrl/renesas/pfc-r8a77965.c
+++ b/drivers/pinctrl/renesas/pfc-r8a77965.c
@@ -15,6 +15,7 @@
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
+#include <asm/types.h>
 #include <dm/pinctrl.h>
 #include <linux/kernel.h>
 
diff --git a/drivers/pinctrl/renesas/pfc-r8a77970.c b/drivers/pinctrl/renesas/pfc-r8a77970.c
index 9996eb9298c..808a82f56b8 100644
--- a/drivers/pinctrl/renesas/pfc-r8a77970.c
+++ b/drivers/pinctrl/renesas/pfc-r8a77970.c
@@ -15,6 +15,7 @@
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
+#include <asm/types.h>
 #include <dm/pinctrl.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
diff --git a/drivers/pinctrl/renesas/pfc-r8a77980.c b/drivers/pinctrl/renesas/pfc-r8a77980.c
index 1b04250e527..da5718ec0db 100644
--- a/drivers/pinctrl/renesas/pfc-r8a77980.c
+++ b/drivers/pinctrl/renesas/pfc-r8a77980.c
@@ -15,6 +15,7 @@
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
+#include <asm/types.h>
 #include <dm/pinctrl.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
diff --git a/drivers/pinctrl/renesas/pfc-r8a77990.c b/drivers/pinctrl/renesas/pfc-r8a77990.c
index e0bf1e4a300..e3957d2f1f9 100644
--- a/drivers/pinctrl/renesas/pfc-r8a77990.c
+++ b/drivers/pinctrl/renesas/pfc-r8a77990.c
@@ -14,6 +14,7 @@
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
+#include <asm/types.h>
 #include <dm/pinctrl.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
diff --git a/drivers/pinctrl/renesas/pfc-r8a77995.c b/drivers/pinctrl/renesas/pfc-r8a77995.c
index 724cf4ae3c9..f5701c5fc9f 100644
--- a/drivers/pinctrl/renesas/pfc-r8a77995.c
+++ b/drivers/pinctrl/renesas/pfc-r8a77995.c
@@ -14,6 +14,7 @@
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
+#include <asm/types.h>
 #include <dm/pinctrl.h>
 #include <linux/kernel.h>
 
diff --git a/drivers/pinctrl/renesas/pfc.c b/drivers/pinctrl/renesas/pfc.c
index 5d7486574cc..12d162a4d2b 100644
--- a/drivers/pinctrl/renesas/pfc.c
+++ b/drivers/pinctrl/renesas/pfc.c
@@ -12,8 +12,10 @@
 #define DRV_NAME "sh-pfc"
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <errno.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <dm/device_compat.h>
 #include <dm/devres.h>
@@ -24,6 +26,7 @@
 #include <linux/io.h>
 #include <linux/kernel.h>
 #include <linux/sizes.h>
+#include <linux/types.h>
 
 #include "sh_pfc.h"
 
diff --git a/drivers/pinctrl/renesas/sh_pfc.h b/drivers/pinctrl/renesas/sh_pfc.h
index feea8a45ff6..546d0545d42 100644
--- a/drivers/pinctrl/renesas/sh_pfc.h
+++ b/drivers/pinctrl/renesas/sh_pfc.h
@@ -11,6 +11,8 @@
 #ifndef __SH_PFC_H
 #define __SH_PFC_H
 
+#include <compiler.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 #include <linux/stringify.h>
 
diff --git a/drivers/pinctrl/rockchip/pinctrl-px30.c b/drivers/pinctrl/rockchip/pinctrl-px30.c
index bbe50160722..6896507eed7 100644
--- a/drivers/pinctrl/rockchip/pinctrl-px30.c
+++ b/drivers/pinctrl/rockchip/pinctrl-px30.c
@@ -12,6 +12,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include "pinctrl-rockchip.h"
 
diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3036.c b/drivers/pinctrl/rockchip/pinctrl-rk3036.c
index 77bd12e4c79..03a572bbe42 100644
--- a/drivers/pinctrl/rockchip/pinctrl-rk3036.c
+++ b/drivers/pinctrl/rockchip/pinctrl-rk3036.c
@@ -11,6 +11,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include "pinctrl-rockchip.h"
 
diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3128.c b/drivers/pinctrl/rockchip/pinctrl-rk3128.c
index dc44f784080..0cf6e0467a8 100644
--- a/drivers/pinctrl/rockchip/pinctrl-rk3128.c
+++ b/drivers/pinctrl/rockchip/pinctrl-rk3128.c
@@ -11,6 +11,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include "pinctrl-rockchip.h"
 
diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3188.c b/drivers/pinctrl/rockchip/pinctrl-rk3188.c
index 4b919e9cffc..393a7ad401d 100644
--- a/drivers/pinctrl/rockchip/pinctrl-rk3188.c
+++ b/drivers/pinctrl/rockchip/pinctrl-rk3188.c
@@ -11,6 +11,7 @@
 #include <syscon.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include "pinctrl-rockchip.h"
 
diff --git a/drivers/pinctrl/rockchip/pinctrl-rk322x.c b/drivers/pinctrl/rockchip/pinctrl-rk322x.c
index 2ae92e258b7..6da0afdf002 100644
--- a/drivers/pinctrl/rockchip/pinctrl-rk322x.c
+++ b/drivers/pinctrl/rockchip/pinctrl-rk322x.c
@@ -12,6 +12,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include "pinctrl-rockchip.h"
 
diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3288.c b/drivers/pinctrl/rockchip/pinctrl-rk3288.c
index 8c22a56b620..40649cb6416 100644
--- a/drivers/pinctrl/rockchip/pinctrl-rk3288.c
+++ b/drivers/pinctrl/rockchip/pinctrl-rk3288.c
@@ -11,6 +11,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include "pinctrl-rockchip.h"
 
diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3308.c b/drivers/pinctrl/rockchip/pinctrl-rk3308.c
index afd9bd3e85d..c8d1018adb4 100644
--- a/drivers/pinctrl/rockchip/pinctrl-rk3308.c
+++ b/drivers/pinctrl/rockchip/pinctrl-rk3308.c
@@ -12,6 +12,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include "pinctrl-rockchip.h"
 
diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3328.c b/drivers/pinctrl/rockchip/pinctrl-rk3328.c
index 42075627f96..816a750e065 100644
--- a/drivers/pinctrl/rockchip/pinctrl-rk3328.c
+++ b/drivers/pinctrl/rockchip/pinctrl-rk3328.c
@@ -12,6 +12,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include "pinctrl-rockchip.h"
 
diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3368.c b/drivers/pinctrl/rockchip/pinctrl-rk3368.c
index 5fbc0635964..ed7ab2bdbba 100644
--- a/drivers/pinctrl/rockchip/pinctrl-rk3368.c
+++ b/drivers/pinctrl/rockchip/pinctrl-rk3368.c
@@ -11,6 +11,7 @@
 #include <syscon.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include "pinctrl-rockchip.h"
 
diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3399.c b/drivers/pinctrl/rockchip/pinctrl-rk3399.c
index 084941c6706..13f0d20ab46 100644
--- a/drivers/pinctrl/rockchip/pinctrl-rk3399.c
+++ b/drivers/pinctrl/rockchip/pinctrl-rk3399.c
@@ -12,6 +12,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include "pinctrl-rockchip.h"
 
diff --git a/drivers/pinctrl/rockchip/pinctrl-rockchip-core.c b/drivers/pinctrl/rockchip/pinctrl-rockchip-core.c
index f36e49f36a4..3d2bb42f2ec 100644
--- a/drivers/pinctrl/rockchip/pinctrl-rockchip-core.c
+++ b/drivers/pinctrl/rockchip/pinctrl-rockchip-core.c
@@ -6,7 +6,9 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <dm/pinctrl.h>
 #include <regmap.h>
 #include <syscon.h>
diff --git a/drivers/pinctrl/rockchip/pinctrl-rv1108.c b/drivers/pinctrl/rockchip/pinctrl-rv1108.c
index 42db3375d04..0378ae61779 100644
--- a/drivers/pinctrl/rockchip/pinctrl-rv1108.c
+++ b/drivers/pinctrl/rockchip/pinctrl-rv1108.c
@@ -12,6 +12,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include "pinctrl-rockchip.h"
 
diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-core.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-core.c
index 44a1571db4f..2f0f288e6ff 100644
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier-core.c
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-core.c
@@ -6,6 +6,8 @@
 
 #include <common.h>
 #include <dm.h>
+#include <stdbool.h>
+#include <asm/types.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/bug.h>
diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier.h b/drivers/pinctrl/uniphier/pinctrl-uniphier.h
index 5951835d6e8..c82b84484a6 100644
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier.h
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier.h
@@ -7,6 +7,7 @@
 #ifndef __PINCTRL_UNIPHIER_H__
 #define __PINCTRL_UNIPHIER_H__
 
+#include <compiler.h>
 #include <linux/bitops.h>
 #include <linux/bug.h>
 #include <linux/build_bug.h>
diff --git a/drivers/power/acpi_pmc/acpi-pmc-uclass.c b/drivers/power/acpi_pmc/acpi-pmc-uclass.c
index f13e27f34cb..90699d3ef07 100644
--- a/drivers/power/acpi_pmc/acpi-pmc-uclass.c
+++ b/drivers/power/acpi_pmc/acpi-pmc-uclass.c
@@ -16,6 +16,7 @@
 #endif
 #include <asm/io.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <power/acpi_pmc.h>
 
 struct tco_regs {
diff --git a/drivers/power/acpi_pmc/pmc_emul.c b/drivers/power/acpi_pmc/pmc_emul.c
index de6afccea12..29c99c47f66 100644
--- a/drivers/power/acpi_pmc/pmc_emul.c
+++ b/drivers/power/acpi_pmc/pmc_emul.c
@@ -13,6 +13,7 @@
 #include <asm/test.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include <power/acpi_pmc.h>
 
 /**
diff --git a/drivers/power/acpi_pmc/sandbox.c b/drivers/power/acpi_pmc/sandbox.c
index 667b7a5daf5..e6f31c215b2 100644
--- a/drivers/power/acpi_pmc/sandbox.c
+++ b/drivers/power/acpi_pmc/sandbox.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <asm/io.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <power/acpi_pmc.h>
 
 #define GPIO_GPE_CFG		0x1050
diff --git a/drivers/power/axp152.c b/drivers/power/axp152.c
index bf07232b08d..3db5c75e294 100644
--- a/drivers/power/axp152.c
+++ b/drivers/power/axp152.c
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <asm/arch/pmic_bus.h>
 #include <axp_pmic.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 
 static u8 axp152_mvolt_to_target(int mvolt, int min, int max, int div)
diff --git a/drivers/power/axp209.c b/drivers/power/axp209.c
index 878ccf45906..43043fbac2f 100644
--- a/drivers/power/axp209.c
+++ b/drivers/power/axp209.c
@@ -8,6 +8,7 @@
 #include <command.h>
 #include <asm/arch/pmic_bus.h>
 #include <axp_pmic.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 
diff --git a/drivers/power/axp221.c b/drivers/power/axp221.c
index e0249796729..07751cc3038 100644
--- a/drivers/power/axp221.c
+++ b/drivers/power/axp221.c
@@ -14,6 +14,7 @@
 #include <errno.h>
 #include <asm/arch/pmic_bus.h>
 #include <axp_pmic.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 
 static u8 axp221_mvolt_to_cfg(int mvolt, int min, int max, int div)
diff --git a/drivers/power/axp809.c b/drivers/power/axp809.c
index 7999ab593a8..5ca0bb32549 100644
--- a/drivers/power/axp809.c
+++ b/drivers/power/axp809.c
@@ -17,6 +17,7 @@
 #include <asm/arch/gpio.h>
 #include <asm/arch/pmic_bus.h>
 #include <axp_pmic.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 
 static u8 axp809_mvolt_to_cfg(int mvolt, int min, int max, int div)
diff --git a/drivers/power/axp818.c b/drivers/power/axp818.c
index 340472d75c7..32c3e1df311 100644
--- a/drivers/power/axp818.c
+++ b/drivers/power/axp818.c
@@ -17,6 +17,7 @@
 #include <asm/arch/gpio.h>
 #include <asm/arch/pmic_bus.h>
 #include <axp_pmic.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 
 static u8 axp818_mvolt_to_cfg(int mvolt, int min, int max, int div)
diff --git a/drivers/power/domain/bcm6328-power-domain.c b/drivers/power/domain/bcm6328-power-domain.c
index 21933018fc4..10ce80f0317 100644
--- a/drivers/power/domain/bcm6328-power-domain.c
+++ b/drivers/power/domain/bcm6328-power-domain.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <malloc.h>
 #include <power-domain-uclass.h>
diff --git a/drivers/power/domain/imx8-power-domain.c b/drivers/power/domain/imx8-power-domain.c
index b0107dff1f8..65e4cda8599 100644
--- a/drivers/power/domain/imx8-power-domain.c
+++ b/drivers/power/domain/imx8-power-domain.c
@@ -12,6 +12,7 @@
 #include <stdio.h>
 #include <asm/arch/power-domain.h>
 #include <asm/arch/sci/sci.h>
+#include <asm/types.h>
 
 static int imx8_power_domain_request(struct power_domain *power_domain)
 {
diff --git a/drivers/power/domain/meson-ee-pwrc.c b/drivers/power/domain/meson-ee-pwrc.c
index f6082f2a4c0..a839716c7d4 100644
--- a/drivers/power/domain/meson-ee-pwrc.c
+++ b/drivers/power/domain/meson-ee-pwrc.c
@@ -10,9 +10,11 @@
 #include <malloc.h>
 #include <power-domain-uclass.h>
 #include <regmap.h>
+#include <stdbool.h>
 #include <syscon.h>
 #include <reset.h>
 #include <clk.h>
+#include <asm/types.h>
 #include <dt-bindings/power/meson-g12a-power.h>
 #include <dt-bindings/power/meson-sm1-power.h>
 #include <linux/bitops.h>
diff --git a/drivers/power/domain/meson-gx-pwrc-vpu.c b/drivers/power/domain/meson-gx-pwrc-vpu.c
index 78ac99e8d9b..aa0c9cf461b 100644
--- a/drivers/power/domain/meson-gx-pwrc-vpu.c
+++ b/drivers/power/domain/meson-gx-pwrc-vpu.c
@@ -15,6 +15,7 @@
 #include <syscon.h>
 #include <reset.h>
 #include <clk.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/err.h>
diff --git a/drivers/power/domain/mtk-power-domain.c b/drivers/power/domain/mtk-power-domain.c
index d8467ac6c26..f79fe6ea0d3 100644
--- a/drivers/power/domain/mtk-power-domain.c
+++ b/drivers/power/domain/mtk-power-domain.c
@@ -6,6 +6,7 @@
 
 #include <clk.h>
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <malloc.h>
 #include <power-domain-uclass.h>
@@ -13,6 +14,7 @@
 #include <syscon.h>
 #include <asm/io.h>
 #include <asm/processor.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/err.h>
 #include <linux/errno.h>
diff --git a/drivers/power/domain/ti-sci-power-domain.c b/drivers/power/domain/ti-sci-power-domain.c
index fd90f4926db..2bef8867ddf 100644
--- a/drivers/power/domain/ti-sci-power-domain.c
+++ b/drivers/power/domain/ti-sci-power-domain.c
@@ -19,6 +19,7 @@
 #include <linux/errno.h>
 #include <linux/soc/ti/ti_sci_protocol.h>
 #include <dt-bindings/soc/ti,sci_pm_domain.h>
+#include <linux/types.h>
 
 /**
  * struct ti_sci_power_domain_data - pm domain controller information structure
diff --git a/drivers/power/exynos-tmu.c b/drivers/power/exynos-tmu.c
index e714add9995..139cdad1da5 100644
--- a/drivers/power/exynos-tmu.c
+++ b/drivers/power/exynos-tmu.c
@@ -26,6 +26,7 @@
 #include <asm/arch/tmu.h>
 #include <asm/arch/power.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #define TRIMINFO_RELOAD		1
 #define CORE_EN			1
diff --git a/drivers/power/fuel_gauge/fg_max17042.c b/drivers/power/fuel_gauge/fg_max17042.c
index a0614e229a1..be8f129bffa 100644
--- a/drivers/power/fuel_gauge/fg_max17042.c
+++ b/drivers/power/fuel_gauge/fg_max17042.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <log.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
diff --git a/drivers/power/mfd/fg_max77693.c b/drivers/power/mfd/fg_max77693.c
index e96e5907628..c56841240f8 100644
--- a/drivers/power/mfd/fg_max77693.c
+++ b/drivers/power/mfd/fg_max77693.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <log.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <power/pmic.h>
 #include <power/max77693_fg.h>
diff --git a/drivers/power/mt6323.c b/drivers/power/mt6323.c
index 21e62755983..6ecd5f79437 100644
--- a/drivers/power/mt6323.c
+++ b/drivers/power/mt6323.c
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <stdio.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 #define PWRAP_BASE		0x1000d000
diff --git a/drivers/power/palmas.c b/drivers/power/palmas.c
index c716e4ff10d..47415f11e35 100644
--- a/drivers/power/palmas.c
+++ b/drivers/power/palmas.c
@@ -7,6 +7,7 @@
 #include <palmas.h>
 #include <stdio.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 void palmas_init_settings(void)
 {
diff --git a/drivers/power/pmic/act8846.c b/drivers/power/pmic/act8846.c
index 7bd69ccc0b4..daa27575ac9 100644
--- a/drivers/power/pmic/act8846.c
+++ b/drivers/power/pmic/act8846.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <linux/errno.h>
 #include <linux/libfdt.h>
+#include <linux/types.h>
 #include <power/act8846_pmic.h>
 #include <power/pmic.h>
 
diff --git a/drivers/power/pmic/as3722.c b/drivers/power/pmic/as3722.c
index 9152f657ff7..9286d2d372c 100644
--- a/drivers/power/pmic/as3722.c
+++ b/drivers/power/pmic/as3722.c
@@ -14,6 +14,7 @@
 #include <dm/lists.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 #include <power/as3722.h>
 #include <power/pmic.h>
 
diff --git a/drivers/power/pmic/as3722_gpio.c b/drivers/power/pmic/as3722_gpio.c
index 6b091a58b8b..e2eb914ea68 100644
--- a/drivers/power/pmic/as3722_gpio.c
+++ b/drivers/power/pmic/as3722_gpio.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <dm.h>
 #include <asm/gpio.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
 #include <power/as3722.h>
diff --git a/drivers/power/pmic/bd71837.c b/drivers/power/pmic/bd71837.c
index 35d5018a391..b8ec6248292 100644
--- a/drivers/power/pmic/bd71837.c
+++ b/drivers/power/pmic/bd71837.c
@@ -11,6 +11,7 @@
 #include <asm/global_data.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/bd71837.h>
diff --git a/drivers/power/pmic/da9063.c b/drivers/power/pmic/da9063.c
index 13b7503aedb..d92fd6b3d13 100644
--- a/drivers/power/pmic/da9063.c
+++ b/drivers/power/pmic/da9063.c
@@ -10,9 +10,11 @@
 #include <dm.h>
 #include <i2c.h>
 #include <log.h>
+#include <stdbool.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/da9063_pmic.h>
diff --git a/drivers/power/pmic/fan53555.c b/drivers/power/pmic/fan53555.c
index 256c455aa29..c28985a7890 100644
--- a/drivers/power/pmic/fan53555.c
+++ b/drivers/power/pmic/fan53555.c
@@ -12,6 +12,7 @@
 #include <i2c.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 #include <power/fan53555.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/pmic/i2c_pmic_emul.c b/drivers/power/pmic/i2c_pmic_emul.c
index ce68fdb043a..73b70cd53d0 100644
--- a/drivers/power/pmic/i2c_pmic_emul.c
+++ b/drivers/power/pmic/i2c_pmic_emul.c
@@ -14,6 +14,7 @@
 #include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/sandbox_pmic.h>
 
diff --git a/drivers/power/pmic/lp873x.c b/drivers/power/pmic/lp873x.c
index 4addcf9cbd1..b4537202a80 100644
--- a/drivers/power/pmic/lp873x.c
+++ b/drivers/power/pmic/lp873x.c
@@ -13,6 +13,7 @@
 #include <stdio.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/lp873x.h>
diff --git a/drivers/power/pmic/lp87565.c b/drivers/power/pmic/lp87565.c
index c4bf1aff78c..7e4c8c39985 100644
--- a/drivers/power/pmic/lp87565.c
+++ b/drivers/power/pmic/lp87565.c
@@ -13,6 +13,7 @@
 #include <stdio.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/lp87565.h>
diff --git a/drivers/power/pmic/max77686.c b/drivers/power/pmic/max77686.c
index 2c83aab57a8..39a25eb3fce 100644
--- a/drivers/power/pmic/max77686.c
+++ b/drivers/power/pmic/max77686.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/max77686_pmic.h>
diff --git a/drivers/power/pmic/max8997.c b/drivers/power/pmic/max8997.c
index 504a63bf743..1e23a26e8df 100644
--- a/drivers/power/pmic/max8997.c
+++ b/drivers/power/pmic/max8997.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/max8997_pmic.h>
 #include <errno.h>
diff --git a/drivers/power/pmic/max8998.c b/drivers/power/pmic/max8998.c
index d155474447f..dd80d1738c0 100644
--- a/drivers/power/pmic/max8998.c
+++ b/drivers/power/pmic/max8998.c
@@ -9,6 +9,7 @@
 #include <errno.h>
 #include <i2c.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/max8998_pmic.h>
 
diff --git a/drivers/power/pmic/mc34708.c b/drivers/power/pmic/mc34708.c
index df66038d68d..6657f2f089e 100644
--- a/drivers/power/pmic/mc34708.c
+++ b/drivers/power/pmic/mc34708.c
@@ -13,6 +13,7 @@
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/power/pmic/palmas.c b/drivers/power/pmic/palmas.c
index 0b4366a2715..a165a045486 100644
--- a/drivers/power/pmic/palmas.c
+++ b/drivers/power/pmic/palmas.c
@@ -13,6 +13,7 @@
 #include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/palmas.h>
diff --git a/drivers/power/pmic/pca9450.c b/drivers/power/pmic/pca9450.c
index 6e80c5cdc4f..31f0d474c3a 100644
--- a/drivers/power/pmic/pca9450.c
+++ b/drivers/power/pmic/pca9450.c
@@ -12,6 +12,7 @@
 #include <asm/global_data.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/pca9450.h>
diff --git a/drivers/power/pmic/pfuze100.c b/drivers/power/pmic/pfuze100.c
index 0955d46fc78..27c5b628cbe 100644
--- a/drivers/power/pmic/pfuze100.c
+++ b/drivers/power/pmic/pfuze100.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/pfuze100_pmic.h>
diff --git a/drivers/power/pmic/pm8916.c b/drivers/power/pmic/pm8916.c
index c47c89754d1..1f97cc65f81 100644
--- a/drivers/power/pmic/pm8916.c
+++ b/drivers/power/pmic/pm8916.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <spmi/spmi.h>
 
diff --git a/drivers/power/pmic/pmic-uclass.c b/drivers/power/pmic/pmic-uclass.c
index 257e514b10b..b185de39de0 100644
--- a/drivers/power/pmic/pmic-uclass.c
+++ b/drivers/power/pmic/pmic-uclass.c
@@ -15,6 +15,7 @@
 #include <dm/uclass-internal.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <linux/ctype.h>
 
diff --git a/drivers/power/pmic/pmic_hi6553.c b/drivers/power/pmic/pmic_hi6553.c
index b724fe4a69e..828be75505f 100644
--- a/drivers/power/pmic/pmic_hi6553.c
+++ b/drivers/power/pmic/pmic_hi6553.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/max8997_muic.h>
 #include <power/hi6553_pmic.h>
diff --git a/drivers/power/pmic/pmic_max8997.c b/drivers/power/pmic/pmic_max8997.c
index 6c4958208c8..1d03da3cc34 100644
--- a/drivers/power/pmic/pmic_max8997.c
+++ b/drivers/power/pmic/pmic_max8997.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <log.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <power/pmic.h>
 #include <power/max8997_pmic.h>
diff --git a/drivers/power/pmic/pmic_tps65217.c b/drivers/power/pmic/pmic_tps65217.c
index c839e318905..cf764fb9bc5 100644
--- a/drivers/power/pmic/pmic_tps65217.c
+++ b/drivers/power/pmic/pmic_tps65217.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <i2c.h>
+#include <linux/types.h>
 #include <power/tps65217.h>
 
 struct udevice *tps65217_dev __attribute__((section(".data"))) = NULL;
diff --git a/drivers/power/pmic/pmic_tps65218.c b/drivers/power/pmic/pmic_tps65218.c
index 992838de1b3..baf101a5bab 100644
--- a/drivers/power/pmic/pmic_tps65218.c
+++ b/drivers/power/pmic/pmic_tps65218.c
@@ -8,6 +8,7 @@
 #include <i2c.h>
 #include <stdio.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/tps65218.h>
 
diff --git a/drivers/power/pmic/pmic_tps65910.c b/drivers/power/pmic/pmic_tps65910.c
index 4772de11be2..cb484b60a44 100644
--- a/drivers/power/pmic/pmic_tps65910.c
+++ b/drivers/power/pmic/pmic_tps65910.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <i2c.h>
+#include <linux/types.h>
 #include <power/tps65910.h>
 
 struct udevice *tps65910_dev __attribute__((section(".data"))) = NULL;
diff --git a/drivers/power/pmic/pmic_tps65910_dm.c b/drivers/power/pmic/pmic_tps65910_dm.c
index 422fb72c38e..db25eb662f3 100644
--- a/drivers/power/pmic/pmic_tps65910_dm.c
+++ b/drivers/power/pmic/pmic_tps65910_dm.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/tps65910_pmic.h>
diff --git a/drivers/power/pmic/rk8xx.c b/drivers/power/pmic/rk8xx.c
index db0968ac0f5..5f22b5cfba1 100644
--- a/drivers/power/pmic/rk8xx.c
+++ b/drivers/power/pmic/rk8xx.c
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include <power/rk8xx_pmic.h>
 #include <power/pmic.h>
 
diff --git a/drivers/power/pmic/rn5t567.c b/drivers/power/pmic/rn5t567.c
index d9a8298ebbb..a4ac3c496ad 100644
--- a/drivers/power/pmic/rn5t567.c
+++ b/drivers/power/pmic/rn5t567.c
@@ -10,6 +10,7 @@
 #include <fdtdec.h>
 #include <log.h>
 #include <linux/libfdt.h>
+#include <linux/types.h>
 #include <power/rn5t567_pmic.h>
 #include <power/pmic.h>
 
diff --git a/drivers/power/pmic/s2mps11.c b/drivers/power/pmic/s2mps11.c
index 93c3507e8fa..79740a30a31 100644
--- a/drivers/power/pmic/s2mps11.c
+++ b/drivers/power/pmic/s2mps11.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/s2mps11.h>
 
diff --git a/drivers/power/pmic/s5m8767.c b/drivers/power/pmic/s5m8767.c
index f1fa6740660..20f709fe973 100644
--- a/drivers/power/pmic/s5m8767.c
+++ b/drivers/power/pmic/s5m8767.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/s5m8767.h>
diff --git a/drivers/power/pmic/sandbox.c b/drivers/power/pmic/sandbox.c
index 813294c7f36..68e6dfb73ed 100644
--- a/drivers/power/pmic/sandbox.c
+++ b/drivers/power/pmic/sandbox.c
@@ -11,6 +11,7 @@
 #include <i2c.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/sandbox_pmic.h>
diff --git a/drivers/power/pmic/stpmic1.c b/drivers/power/pmic/stpmic1.c
index c7cd596da08..7f3efa49c8e 100644
--- a/drivers/power/pmic/stpmic1.c
+++ b/drivers/power/pmic/stpmic1.c
@@ -14,6 +14,7 @@
 #include <dm/device_compat.h>
 #include <dm/lists.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/stpmic1.h>
 
diff --git a/drivers/power/pmic/tps65090.c b/drivers/power/pmic/tps65090.c
index 8c8ffbe2046..7a40525956b 100644
--- a/drivers/power/pmic/tps65090.c
+++ b/drivers/power/pmic/tps65090.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/tps65090.h>
 
diff --git a/drivers/power/pmic/tps65941.c b/drivers/power/pmic/tps65941.c
index a05023516ba..4a0621ac022 100644
--- a/drivers/power/pmic/tps65941.c
+++ b/drivers/power/pmic/tps65941.c
@@ -13,6 +13,7 @@
 #include <stdio.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/tps65941.h>
diff --git a/drivers/power/power_fsl.c b/drivers/power/power_fsl.c
index e26b60c6abc..c86d6e47172 100644
--- a/drivers/power/power_fsl.c
+++ b/drivers/power/power_fsl.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <spi.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <power/pmic.h>
 #include <fsl_pmic.h>
diff --git a/drivers/power/regulator/act8846.c b/drivers/power/regulator/act8846.c
index 175966293c2..dbdd358a912 100644
--- a/drivers/power/regulator/act8846.c
+++ b/drivers/power/regulator/act8846.c
@@ -12,6 +12,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <stdbool.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <power/act8846_pmic.h>
 #include <power/pmic.h>
diff --git a/drivers/power/regulator/as3722_regulator.c b/drivers/power/regulator/as3722_regulator.c
index 55b61cd7a9f..419470a457a 100644
--- a/drivers/power/regulator/as3722_regulator.c
+++ b/drivers/power/regulator/as3722_regulator.c
@@ -11,6 +11,7 @@
 #include <errno.h>
 #include <log.h>
 #include <stdbool.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <power/as3722.h>
 #include <power/pmic.h>
diff --git a/drivers/power/regulator/bd71837.c b/drivers/power/regulator/bd71837.c
index 2a74bfcc79e..68ba0da3bb7 100644
--- a/drivers/power/regulator/bd71837.c
+++ b/drivers/power/regulator/bd71837.c
@@ -8,6 +8,8 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <stdbool.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
diff --git a/drivers/power/regulator/da9063.c b/drivers/power/regulator/da9063.c
index bfe77d6814a..7e6b197be1d 100644
--- a/drivers/power/regulator/da9063.c
+++ b/drivers/power/regulator/da9063.c
@@ -6,10 +6,12 @@
 
 #include <common.h>
 #include <dm.h>
+#include <stdbool.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <power/da9063_pmic.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/regulator/fan53555.c b/drivers/power/regulator/fan53555.c
index 93aa04f7aee..74c7db93e57 100644
--- a/drivers/power/regulator/fan53555.c
+++ b/drivers/power/regulator/fan53555.c
@@ -10,7 +10,9 @@
 #include <fdtdec.h>
 #include <i2c.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/gpio.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
diff --git a/drivers/power/regulator/gpio-regulator.c b/drivers/power/regulator/gpio-regulator.c
index 2f344e45dfe..e8491a1aa04 100644
--- a/drivers/power/regulator/gpio-regulator.c
+++ b/drivers/power/regulator/gpio-regulator.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <stdbool.h>
 #include <asm/gpio.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
 #include <power/pmic.h>
diff --git a/drivers/power/regulator/max77686.c b/drivers/power/regulator/max77686.c
index e4c099fb8b4..49520ea1be2 100644
--- a/drivers/power/regulator/max77686.c
+++ b/drivers/power/regulator/max77686.c
@@ -11,6 +11,7 @@
 #include <errno.h>
 #include <dm.h>
 #include <i2c.h>
+#include <stdbool.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/printk.h>
diff --git a/drivers/power/regulator/palmas_regulator.c b/drivers/power/regulator/palmas_regulator.c
index 5eeed77b29e..5762683d84a 100644
--- a/drivers/power/regulator/palmas_regulator.c
+++ b/drivers/power/regulator/palmas_regulator.c
@@ -13,6 +13,7 @@
 #include <i2c.h>
 #include <stdbool.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <power/pmic.h>
diff --git a/drivers/power/regulator/pbias_regulator.c b/drivers/power/regulator/pbias_regulator.c
index 26598b7129f..7235bcc4568 100644
--- a/drivers/power/regulator/pbias_regulator.c
+++ b/drivers/power/regulator/pbias_regulator.c
@@ -8,10 +8,12 @@
 #include <errno.h>
 #include <dm.h>
 #include <log.h>
+#include <stdbool.h>
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <regmap.h>
diff --git a/drivers/power/regulator/pfuze100.c b/drivers/power/regulator/pfuze100.c
index 1f9eab05cbe..0d74e7c7181 100644
--- a/drivers/power/regulator/pfuze100.c
+++ b/drivers/power/regulator/pfuze100.c
@@ -11,6 +11,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <log.h>
+#include <stdbool.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
diff --git a/drivers/power/regulator/regulator-uclass.c b/drivers/power/regulator/regulator-uclass.c
index 251fc78bc89..3552c9a4c5f 100644
--- a/drivers/power/regulator/regulator-uclass.c
+++ b/drivers/power/regulator/regulator-uclass.c
@@ -8,6 +8,7 @@
 #include <errno.h>
 #include <dm.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <dm/uclass-internal.h>
 #include <linux/delay.h>
diff --git a/drivers/power/regulator/rk8xx.c b/drivers/power/regulator/rk8xx.c
index e6b0bbac7cf..f2b568f083c 100644
--- a/drivers/power/regulator/rk8xx.c
+++ b/drivers/power/regulator/rk8xx.c
@@ -12,8 +12,10 @@
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
+#include <stdbool.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include <power/rk8xx_pmic.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/regulator/s2mps11_regulator.c b/drivers/power/regulator/s2mps11_regulator.c
index 728a67bf8d4..52ed0aa77bc 100644
--- a/drivers/power/regulator/s2mps11_regulator.c
+++ b/drivers/power/regulator/s2mps11_regulator.c
@@ -9,6 +9,8 @@
 #include <errno.h>
 #include <dm.h>
 #include <i2c.h>
+#include <stdbool.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
diff --git a/drivers/power/regulator/sandbox.c b/drivers/power/regulator/sandbox.c
index 196092c7260..74ac0d7fb96 100644
--- a/drivers/power/regulator/sandbox.c
+++ b/drivers/power/regulator/sandbox.c
@@ -9,9 +9,11 @@
 #include <errno.h>
 #include <dm.h>
 #include <i2c.h>
+#include <stdbool.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/sandbox_pmic.h>
diff --git a/drivers/power/regulator/stm32-vrefbuf.c b/drivers/power/regulator/stm32-vrefbuf.c
index 73cae7c6d8e..944a6ab07c7 100644
--- a/drivers/power/regulator/stm32-vrefbuf.c
+++ b/drivers/power/regulator/stm32-vrefbuf.c
@@ -8,8 +8,11 @@
 
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <dm.h>
+#include <stdbool.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
diff --git a/drivers/power/regulator/stpmic1.c b/drivers/power/regulator/stpmic1.c
index 119e8d3ffbb..0b8a2cd12fb 100644
--- a/drivers/power/regulator/stpmic1.c
+++ b/drivers/power/regulator/stpmic1.c
@@ -7,9 +7,11 @@
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
+#include <stdbool.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/stpmic1.h>
diff --git a/drivers/power/regulator/tps62360_regulator.c b/drivers/power/regulator/tps62360_regulator.c
index 44c26e868d3..582a2e33ddd 100644
--- a/drivers/power/regulator/tps62360_regulator.c
+++ b/drivers/power/regulator/tps62360_regulator.c
@@ -10,6 +10,7 @@
 #include <dm/device_compat.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include <power/regulator.h>
 
 #define TPS62360_REG_SET0	0
diff --git a/drivers/power/regulator/tps65090_regulator.c b/drivers/power/regulator/tps65090_regulator.c
index cbab544e2bc..cc369db7ec8 100644
--- a/drivers/power/regulator/tps65090_regulator.c
+++ b/drivers/power/regulator/tps65090_regulator.c
@@ -11,6 +11,7 @@
 #include <time.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/tps65090.h>
diff --git a/drivers/power/regulator/tps65910_regulator.c b/drivers/power/regulator/tps65910_regulator.c
index bc9ec2dcb27..46a5d7749cd 100644
--- a/drivers/power/regulator/tps65910_regulator.c
+++ b/drivers/power/regulator/tps65910_regulator.c
@@ -6,9 +6,11 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <stdbool.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/tps65910_pmic.h>
diff --git a/drivers/power/sy8106a.c b/drivers/power/sy8106a.c
index 45f47939869..d4648588a69 100644
--- a/drivers/power/sy8106a.c
+++ b/drivers/power/sy8106a.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <i2c.h>
 #include <sy8106a.h>
+#include <asm/types.h>
 
 #define SY8106A_I2C_ADDR 0x65
 #define SY8106A_VOUT1_SEL 1
diff --git a/drivers/power/tps6586x.c b/drivers/power/tps6586x.c
index ac9d0986040..db0de93679f 100644
--- a/drivers/power/tps6586x.c
+++ b/drivers/power/tps6586x.c
@@ -12,6 +12,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 static struct udevice *tps6586x_dev;
 
diff --git a/drivers/power/twl4030.c b/drivers/power/twl4030.c
index c62db5f24f5..899dd200069 100644
--- a/drivers/power/twl4030.c
+++ b/drivers/power/twl4030.c
@@ -25,6 +25,7 @@
 #include <command.h>
 #include <stdio.h>
 #include <twl4030.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/printk.h>
 
diff --git a/drivers/power/twl6030.c b/drivers/power/twl6030.c
index 3f9c2550c3d..fe5f496afbf 100644
--- a/drivers/power/twl6030.c
+++ b/drivers/power/twl6030.c
@@ -5,6 +5,7 @@
  */
 #include <config.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/printk.h>
 
diff --git a/drivers/pwm/exynos_pwm.c b/drivers/pwm/exynos_pwm.c
index 59a07e593b9..3e504f342e9 100644
--- a/drivers/pwm/exynos_pwm.c
+++ b/drivers/pwm/exynos_pwm.c
@@ -13,6 +13,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/pwm.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 struct exynos_pwm_priv {
 	struct s5p_timer *regs;
diff --git a/drivers/pwm/pwm-imx.c b/drivers/pwm/pwm-imx.c
index 70bf5851e54..ce91c64156d 100644
--- a/drivers/pwm/pwm-imx.c
+++ b/drivers/pwm/pwm-imx.c
@@ -14,6 +14,7 @@
 #include <stdbool.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/io.h>
+#include <linux/types.h>
 #include "pwm-imx-util.h"
 
 int pwm_init(int pwm_id, int div, int invert)
diff --git a/drivers/pwm/pwm-mtk.c b/drivers/pwm/pwm-mtk.c
index 9b997ec88f7..5343903c257 100644
--- a/drivers/pwm/pwm-mtk.c
+++ b/drivers/pwm/pwm-mtk.c
@@ -7,15 +7,18 @@
 
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <dm.h>
 #include <pwm.h>
 #include <div64.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 /* PWM registers and bits definitions */
 #define PWMCON			0x00
diff --git a/drivers/pwm/pwm-sifive.c b/drivers/pwm/pwm-sifive.c
index cf3c723aceb..a57e662729a 100644
--- a/drivers/pwm/pwm-sifive.c
+++ b/drivers/pwm/pwm-sifive.c
@@ -14,16 +14,19 @@
 
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <div64.h>
 #include <dm.h>
 #include <pwm.h>
 #include <regmap.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/kernel.h>
 #include <linux/log2.h>
 #include <linux/bitfield.h>
+#include <linux/types.h>
 
 /* PWMCFG fields */
 #define PWM_SIFIVE_PWMCFG_SCALE         GENMASK(3, 0)
diff --git a/drivers/pwm/pwm-uclass.c b/drivers/pwm/pwm-uclass.c
index e3bfcc837dc..622e7cd4c1e 100644
--- a/drivers/pwm/pwm-uclass.c
+++ b/drivers/pwm/pwm-uclass.c
@@ -9,6 +9,7 @@
 #include <pwm.h>
 #include <stdbool.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 int pwm_set_invert(struct udevice *dev, uint channel, bool polarity)
 {
diff --git a/drivers/pwm/rk_pwm.c b/drivers/pwm/rk_pwm.c
index afe48071047..8a4e0047d8c 100644
--- a/drivers/pwm/rk_pwm.c
+++ b/drivers/pwm/rk_pwm.c
@@ -18,6 +18,7 @@
 #include <asm/arch-rockchip/pwm.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <power/regulator.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/pwm/sandbox_pwm.c b/drivers/pwm/sandbox_pwm.c
index 44e7f235650..a482fe8174c 100644
--- a/drivers/pwm/sandbox_pwm.c
+++ b/drivers/pwm/sandbox_pwm.c
@@ -11,6 +11,7 @@
 #include <stdbool.h>
 #include <asm/test.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 enum {
 	NUM_CHANNELS	= 3,
diff --git a/drivers/pwm/sunxi_pwm.c b/drivers/pwm/sunxi_pwm.c
index 55472103fcc..564b24c0564 100644
--- a/drivers/pwm/sunxi_pwm.c
+++ b/drivers/pwm/sunxi_pwm.c
@@ -16,6 +16,7 @@
 #include <asm/arch/pwm.h>
 #include <asm/arch/gpio.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <power/regulator.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/pwm/tegra_pwm.c b/drivers/pwm/tegra_pwm.c
index 11378bb2e3b..d52cf634ba9 100644
--- a/drivers/pwm/tegra_pwm.c
+++ b/drivers/pwm/tegra_pwm.c
@@ -12,6 +12,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/pwm.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 struct tegra_pwm_priv {
 	struct pwm_ctlr *regs;
diff --git a/drivers/qe/qe.c b/drivers/qe/qe.c
index 7c14fe35e58..7a71a5298db 100644
--- a/drivers/qe/qe.c
+++ b/drivers/qe/qe.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <malloc.h>
 #include <command.h>
 #include <stdio.h>
@@ -18,6 +19,7 @@
 #include <fsl_qe.h>
 #include <mmc.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <u-boot/crc.h>
 
 #ifdef CONFIG_ARCH_LS1021A
diff --git a/drivers/qe/uccf.c b/drivers/qe/uccf.c
index b4f0a0979c2..5497aae7606 100644
--- a/drivers/qe/uccf.c
+++ b/drivers/qe/uccf.c
@@ -13,6 +13,7 @@
 #include <asm/io.h>
 #include <linux/immap_qe.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "uccf.h"
 #include <fsl_qe.h>
 
diff --git a/drivers/qe/uec.c b/drivers/qe/uec.c
index cb11e99faf8..0a44c92f26d 100644
--- a/drivers/qe/uec.c
+++ b/drivers/qe/uec.c
@@ -18,6 +18,7 @@
 #include <linux/immap_qe.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "uccf.h"
 #include "uec.h"
 #include "uec_phy.h"
diff --git a/drivers/qe/uec_phy.c b/drivers/qe/uec_phy.c
index ff9ed5d01ae..49a3f1bfd59 100644
--- a/drivers/qe/uec_phy.c
+++ b/drivers/qe/uec_phy.c
@@ -13,6 +13,7 @@
 #include <net.h>
 #include <malloc.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/immap_qe.h>
diff --git a/drivers/qe/uec_phy.h b/drivers/qe/uec_phy.h
index 83a7ccd9819..9ede1faeecc 100644
--- a/drivers/qe/uec_phy.h
+++ b/drivers/qe/uec_phy.h
@@ -11,6 +11,7 @@
 #ifndef __UEC_PHY_H__
 #define __UEC_PHY_H__
 
+#include <asm/types.h>
 #define MII_end ((u32)-2)
 #define MII_read ((u32)-1)
 
diff --git a/drivers/ram/bmips_ram.c b/drivers/ram/bmips_ram.c
index 0746d677a4c..c1775d60797 100644
--- a/drivers/ram/bmips_ram.c
+++ b/drivers/ram/bmips_ram.c
@@ -8,12 +8,14 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <errno.h>
 #include <init.h>
 #include <ram.h>
 #include <asm/io.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #define SDRAM_CFG_REG		0x0
 #define SDRAM_CFG_COL_SHIFT	4
diff --git a/drivers/ram/imxrt_sdram.c b/drivers/ram/imxrt_sdram.c
index bfdf666cc43..c0b57178c07 100644
--- a/drivers/ram/imxrt_sdram.c
+++ b/drivers/ram/imxrt_sdram.c
@@ -12,6 +12,7 @@
 #include <ram.h>
 #include <vsprintf.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/err.h>
diff --git a/drivers/ram/k3-am654-ddrss.c b/drivers/ram/k3-am654-ddrss.c
index d4cc6d772e7..d2f9f12e6c4 100644
--- a/drivers/ram/k3-am654-ddrss.c
+++ b/drivers/ram/k3-am654-ddrss.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
 #include <ram.h>
@@ -16,6 +17,7 @@
 #include <power-domain.h>
 #include <dm.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/types.h>
 #include <dm/device_compat.h>
 #include <linux/errno.h>
 #include <power/regulator.h>
diff --git a/drivers/ram/k3-am654-ddrss.h b/drivers/ram/k3-am654-ddrss.h
index c87f186291e..9f2ee87b5af 100644
--- a/drivers/ram/k3-am654-ddrss.h
+++ b/drivers/ram/k3-am654-ddrss.h
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
 /*
+#include <asm/types.h>
  * AM654: DDRSS Register definitions and structures.
  *
  * Copyright (C) 2018 Texas Instruments Incorporated - http://www.ti.com/
diff --git a/drivers/ram/k3-j721e/cps_drv_lpddr4.h b/drivers/ram/k3-j721e/cps_drv_lpddr4.h
index 706a5cde01a..9da9d712064 100644
--- a/drivers/ram/k3-j721e/cps_drv_lpddr4.h
+++ b/drivers/ram/k3-j721e/cps_drv_lpddr4.h
@@ -15,6 +15,7 @@
 #include <stddef.h>
 #include <inttypes.h>
 #include <asm/io.h>
+#include <linux/types.h>
 
 /**
  *  \brief    Read a 32-bit value from memory.
diff --git a/drivers/ram/k3-j721e/k3-j721e-ddrss.c b/drivers/ram/k3-j721e/k3-j721e-ddrss.c
index bccf5a65c92..637abc4c6d4 100644
--- a/drivers/ram/k3-j721e/k3-j721e-ddrss.c
+++ b/drivers/ram/k3-j721e/k3-j721e-ddrss.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <dm.h>
 #include <hang.h>
 #include <log.h>
@@ -17,6 +18,7 @@
 #include <wait_bit.h>
 #include <dm/device_compat.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #include "lpddr4_obj_if.h"
 #include "lpddr4_if.h"
diff --git a/drivers/ram/k3-j721e/lpddr4_private.h b/drivers/ram/k3-j721e/lpddr4_private.h
index 42c923464aa..e3aa360b6cc 100644
--- a/drivers/ram/k3-j721e/lpddr4_private.h
+++ b/drivers/ram/k3-j721e/lpddr4_private.h
@@ -10,6 +10,7 @@
 #ifndef LPDDR4_PRIV_H
 #define LPDDR4_PRIV_H
 
+#include <linux/types.h>
 #define PRODUCT_ID (0x1046U)
 #define VERSION_0  (0x54d5da40U)
 #define VERSION_1  (0xc1865a1U)
diff --git a/drivers/ram/mediatek/ddr3-mt7629.c b/drivers/ram/mediatek/ddr3-mt7629.c
index a2f72b70470..f25334a0421 100644
--- a/drivers/ram/mediatek/ddr3-mt7629.c
+++ b/drivers/ram/mediatek/ddr3-mt7629.c
@@ -12,6 +12,7 @@
 #include <dm.h>
 #include <ram.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/ram/mpc83xx_sdram.c b/drivers/ram/mpc83xx_sdram.c
index 844a8a0d9fb..9eabe4b425d 100644
--- a/drivers/ram/mpc83xx_sdram.c
+++ b/drivers/ram/mpc83xx_sdram.c
@@ -13,6 +13,7 @@
 #include <asm/global_data.h>
 #include <dt-bindings/memory/mpc83xx-sdram.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/ram/rockchip/dmc-rk3368.c b/drivers/ram/rockchip/dmc-rk3368.c
index 9f13363e634..c2030101aa9 100644
--- a/drivers/ram/rockchip/dmc-rk3368.c
+++ b/drivers/ram/rockchip/dmc-rk3368.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <hang.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <dt-bindings/memory/rk3368-dmc.h>
@@ -28,6 +29,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 struct dram_info {
 	struct ram_info info;
diff --git a/drivers/ram/rockchip/sdram_common.c b/drivers/ram/rockchip/sdram_common.c
index 5dd68c97682..04f5e52223d 100644
--- a/drivers/ram/rockchip/sdram_common.c
+++ b/drivers/ram/rockchip/sdram_common.c
@@ -4,12 +4,14 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <debug_uart.h>
 #include <ram.h>
 #include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch-rockchip/sdram.h>
 #include <asm/arch-rockchip/sdram_common.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_RAM_ROCKCHIP_DEBUG
 void sdram_print_dram_type(unsigned char dramtype)
diff --git a/drivers/ram/rockchip/sdram_pctl_px30.c b/drivers/ram/rockchip/sdram_pctl_px30.c
index 331d85fba26..5256ff0a6cc 100644
--- a/drivers/ram/rockchip/sdram_pctl_px30.c
+++ b/drivers/ram/rockchip/sdram_pctl_px30.c
@@ -4,10 +4,12 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <ram.h>
 #include <asm/io.h>
 #include <asm/arch-rockchip/sdram.h>
 #include <asm/arch-rockchip/sdram_pctl_px30.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 /*
diff --git a/drivers/ram/rockchip/sdram_phy_px30.c b/drivers/ram/rockchip/sdram_phy_px30.c
index f7f6de1ba98..c81a8b8bab4 100644
--- a/drivers/ram/rockchip/sdram_phy_px30.c
+++ b/drivers/ram/rockchip/sdram_phy_px30.c
@@ -4,11 +4,13 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <ram.h>
 #include <asm/io.h>
 #include <asm/arch-rockchip/sdram.h>
 #include <asm/arch-rockchip/sdram_common.h>
 #include <asm/arch-rockchip/sdram_phy_px30.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 static void sdram_phy_dll_bypass_set(void __iomem *phy_base, u32 freq)
diff --git a/drivers/ram/rockchip/sdram_px30.c b/drivers/ram/rockchip/sdram_px30.c
index a4f8980bfd7..65587df88ba 100644
--- a/drivers/ram/rockchip/sdram_px30.c
+++ b/drivers/ram/rockchip/sdram_px30.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <debug_uart.h>
 #include <dm.h>
 #include <init.h>
@@ -17,6 +18,7 @@
 #include <asm/arch-rockchip/hardware.h>
 #include <asm/arch-rockchip/sdram.h>
 #include <asm/arch-rockchip/sdram_px30.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
 
diff --git a/drivers/ram/rockchip/sdram_rk3128.c b/drivers/ram/rockchip/sdram_rk3128.c
index 0162955aae0..265d1284794 100644
--- a/drivers/ram/rockchip/sdram_rk3128.c
+++ b/drivers/ram/rockchip/sdram_rk3128.c
@@ -11,6 +11,7 @@
 #include <asm/arch-rockchip/clock.h>
 #include <asm/arch-rockchip/grf_rk3128.h>
 #include <asm/arch-rockchip/sdram.h>
+#include <asm/types.h>
 
 struct dram_info {
 	struct ram_info info;
diff --git a/drivers/ram/rockchip/sdram_rk3188.c b/drivers/ram/rockchip/sdram_rk3188.c
index cfa6d0ebf19..3523e69ad3c 100644
--- a/drivers/ram/rockchip/sdram_rk3188.c
+++ b/drivers/ram/rockchip/sdram_rk3188.c
@@ -16,6 +16,7 @@
 #include <log.h>
 #include <ram.h>
 #include <regmap.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <syscon.h>
 #include <asm/io.h>
@@ -31,6 +32,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 struct chan_info {
 	struct rk3288_ddr_pctl *pctl;
diff --git a/drivers/ram/rockchip/sdram_rk3288.c b/drivers/ram/rockchip/sdram_rk3288.c
index 80abe9c9b20..5d931dcf756 100644
--- a/drivers/ram/rockchip/sdram_rk3288.c
+++ b/drivers/ram/rockchip/sdram_rk3288.c
@@ -16,6 +16,7 @@
 #include <log.h>
 #include <ram.h>
 #include <regmap.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <syscon.h>
 #include <asm/io.h>
@@ -31,6 +32,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <power/regulator.h>
 #include <power/rk8xx_pmic.h>
 
diff --git a/drivers/ram/rockchip/sdram_rk3308.c b/drivers/ram/rockchip/sdram_rk3308.c
index 310df79123c..4b37aa1a184 100644
--- a/drivers/ram/rockchip/sdram_rk3308.c
+++ b/drivers/ram/rockchip/sdram_rk3308.c
@@ -10,6 +10,7 @@
 #include <asm/arch/grf_rk3308.h>
 #include <asm/arch-rockchip/clock.h>
 #include <asm/arch-rockchip/sdram.h>
+#include <asm/types.h>
 
 struct dram_info {
 	struct ram_info info;
diff --git a/drivers/ram/rockchip/sdram_rk3328.c b/drivers/ram/rockchip/sdram_rk3328.c
index 827d52e7a5c..404abeba3f4 100644
--- a/drivers/ram/rockchip/sdram_rk3328.c
+++ b/drivers/ram/rockchip/sdram_rk3328.c
@@ -4,6 +4,7 @@
  */
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <debug_uart.h>
 #include <dm.h>
 #include <dt-structs.h>
@@ -20,6 +21,7 @@
 #include <asm/arch-rockchip/sdram.h>
 #include <asm/arch-rockchip/sdram_rk3328.h>
 #include <asm/arch-rockchip/uart.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
diff --git a/drivers/ram/rockchip/sdram_rk3399.c b/drivers/ram/rockchip/sdram_rk3399.c
index 690b8c3f3b2..0a4b3a10504 100644
--- a/drivers/ram/rockchip/sdram_rk3399.c
+++ b/drivers/ram/rockchip/sdram_rk3399.c
@@ -7,12 +7,14 @@
 
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <dm.h>
 #include <dt-structs.h>
 #include <init.h>
 #include <log.h>
 #include <ram.h>
 #include <regmap.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <syscon.h>
 #include <asm/io.h>
@@ -23,6 +25,7 @@
 #include <asm/arch-rockchip/hardware.h>
 #include <asm/arch-rockchip/sdram.h>
 #include <asm/arch-rockchip/sdram_rk3399.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <time.h>
diff --git a/drivers/ram/sifive/fu540_ddr.c b/drivers/ram/sifive/fu540_ddr.c
index 0270dd088db..ec05dc7f93f 100644
--- a/drivers/ram/sifive/fu540_ddr.c
+++ b/drivers/ram/sifive/fu540_ddr.c
@@ -20,6 +20,7 @@
 #include <wait_bit.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #define DENALI_CTL_0	0
 #define DENALI_CTL_21	21
diff --git a/drivers/ram/stm32_sdram.c b/drivers/ram/stm32_sdram.c
index 04fb730525d..31e410ae8a3 100644
--- a/drivers/ram/stm32_sdram.c
+++ b/drivers/ram/stm32_sdram.c
@@ -12,6 +12,7 @@
 #include <ram.h>
 #include <vsprintf.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/drivers/ram/stm32mp1/stm32mp1_ddr.c b/drivers/ram/stm32mp1/stm32mp1_ddr.c
index d122dadd6dc..329284c6d93 100644
--- a/drivers/ram/stm32mp1/stm32mp1_ddr.c
+++ b/drivers/ram/stm32mp1/stm32mp1_ddr.c
@@ -5,14 +5,17 @@
 
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <log.h>
 #include <ram.h>
 #include <reset.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <timer.h>
 #include <vsprintf.h>
 #include <asm/io.h>
 #include <asm/arch/ddr.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/ram/stm32mp1/stm32mp1_ddr.h b/drivers/ram/stm32mp1/stm32mp1_ddr.h
index 5f15196b2da..73531124946 100644
--- a/drivers/ram/stm32mp1/stm32mp1_ddr.h
+++ b/drivers/ram/stm32mp1/stm32mp1_ddr.h
@@ -7,6 +7,7 @@
 #define _RAM_STM32MP1_DDR_H
 
 #include <stdbool.h>
+#include <asm/types.h>
 enum stm32mp1_ddr_interact_step {
 	STEP_DDR_RESET,
 	STEP_CTL_INIT,
diff --git a/drivers/ram/stm32mp1/stm32mp1_ddr_regs.h b/drivers/ram/stm32mp1/stm32mp1_ddr_regs.h
index 3c8885a9657..6deae23815a 100644
--- a/drivers/ram/stm32mp1/stm32mp1_ddr_regs.h
+++ b/drivers/ram/stm32mp1/stm32mp1_ddr_regs.h
@@ -7,6 +7,7 @@
 #define _RAM_STM32MP1_DDR_REGS_H
 
 /* DDR3/LPDDR2/LPDDR3 Controller (DDRCTRL) registers */
+#include <asm/types.h>
 #include <linux/bitops.h>
 struct stm32mp1_ddrctl {
 	u32 mstr ;		/* 0x0 Master*/
diff --git a/drivers/ram/stm32mp1/stm32mp1_interactive.c b/drivers/ram/stm32mp1/stm32mp1_interactive.c
index d45071d3ed3..e49257b3955 100644
--- a/drivers/ram/stm32mp1/stm32mp1_interactive.c
+++ b/drivers/ram/stm32mp1/stm32mp1_interactive.c
@@ -12,10 +12,12 @@
 #include <malloc.h>
 #include <ram.h>
 #include <reset.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include "stm32mp1_ddr.h"
diff --git a/drivers/ram/stm32mp1/stm32mp1_ram.c b/drivers/ram/stm32mp1/stm32mp1_ram.c
index 8b49730e633..35d6b0fef2a 100644
--- a/drivers/ram/stm32mp1/stm32mp1_ram.c
+++ b/drivers/ram/stm32mp1/stm32mp1_ram.c
@@ -5,11 +5,13 @@
 
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <dm.h>
 #include <init.h>
 #include <log.h>
 #include <ram.h>
 #include <regmap.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <syscon.h>
 #include <asm/io.h>
@@ -17,6 +19,7 @@
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "stm32mp1_ddr.h"
 
 static const char *const clkname[] = {
diff --git a/drivers/ram/stm32mp1/stm32mp1_tests.c b/drivers/ram/stm32mp1/stm32mp1_tests.c
index 00bdbe6762a..e960bc833c4 100644
--- a/drivers/ram/stm32mp1/stm32mp1_tests.c
+++ b/drivers/ram/stm32mp1/stm32mp1_tests.c
@@ -7,6 +7,7 @@
 #include <init.h>
 #include <log.h>
 #include <rand.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <watchdog.h>
@@ -15,6 +16,7 @@
 #include <linux/kernel.h>
 #include <linux/log2.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "stm32mp1_tests.h"
 
 #define ADDR_INVALID	0xFFFFFFFF
diff --git a/drivers/ram/stm32mp1/stm32mp1_tuning.c b/drivers/ram/stm32mp1/stm32mp1_tuning.c
index 8da11d0629a..0ff63bca66a 100644
--- a/drivers/ram/stm32mp1/stm32mp1_tuning.c
+++ b/drivers/ram/stm32mp1/stm32mp1_tuning.c
@@ -9,9 +9,11 @@
 #include <ram.h>
 #include <rand.h>
 #include <reset.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/iopoll.h>
diff --git a/drivers/remoteproc/k3_system_controller.c b/drivers/remoteproc/k3_system_controller.c
index aa993b97392..779665ec1ac 100644
--- a/drivers/remoteproc/k3_system_controller.c
+++ b/drivers/remoteproc/k3_system_controller.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
 #include <remoteproc.h>
@@ -16,6 +17,7 @@
 #include <linux/errno.h>
 #include <linux/soc/ti/k3-sec-proxy.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define K3_MSG_R5_TO_M3_M3FW			0x8105
 #define K3_MSG_M3_TO_R5_CERT_RESULT		0x8805
diff --git a/drivers/remoteproc/rproc-elf-loader.c b/drivers/remoteproc/rproc-elf-loader.c
index bb82de08da7..00a83d61c6f 100644
--- a/drivers/remoteproc/rproc-elf-loader.c
+++ b/drivers/remoteproc/rproc-elf-loader.c
@@ -3,6 +3,7 @@
  * Copyright (C) 2019, STMicroelectronics - All Rights Reserved
  */
 #include <common.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <dm.h>
 #include <elf.h>
@@ -15,6 +16,7 @@
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /**
  * struct resource_table - firmware resource table header
diff --git a/drivers/remoteproc/rproc-uclass.c b/drivers/remoteproc/rproc-uclass.c
index e7513240ec5..a55c502d43c 100644
--- a/drivers/remoteproc/rproc-uclass.c
+++ b/drivers/remoteproc/rproc-uclass.c
@@ -20,6 +20,7 @@
 #include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/remoteproc/sandbox_testproc.c b/drivers/remoteproc/sandbox_testproc.c
index e3759eed95c..ce7cfe67523 100644
--- a/drivers/remoteproc/sandbox_testproc.c
+++ b/drivers/remoteproc/sandbox_testproc.c
@@ -12,6 +12,7 @@
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 /**
  * enum sandbox_state - different device states
diff --git a/drivers/remoteproc/stm32_copro.c b/drivers/remoteproc/stm32_copro.c
index eb437464ae1..6ff3d3d9383 100644
--- a/drivers/remoteproc/stm32_copro.c
+++ b/drivers/remoteproc/stm32_copro.c
@@ -11,12 +11,14 @@
 #include <regmap.h>
 #include <remoteproc.h>
 #include <reset.h>
+#include <stdbool.h>
 #include <syscon.h>
 #include <asm/io.h>
 #include <dm/device_compat.h>
 #include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 #define RCC_GCR_HOLD_BOOT	0
 #define RCC_GCR_RELEASE_BOOT	1
diff --git a/drivers/remoteproc/ti_k3_arm64_rproc.c b/drivers/remoteproc/ti_k3_arm64_rproc.c
index 20b02f691e3..4fec3d83418 100644
--- a/drivers/remoteproc/ti_k3_arm64_rproc.c
+++ b/drivers/remoteproc/ti_k3_arm64_rproc.c
@@ -19,6 +19,7 @@
 #include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/soc/ti/ti_sci_protocol.h>
+#include <linux/types.h>
 #include "ti_sci_proc.h"
 
 #define INVALID_ID	0xffff
diff --git a/drivers/remoteproc/ti_k3_dsp_rproc.c b/drivers/remoteproc/ti_k3_dsp_rproc.c
index a341ef84e8a..37a311f3607 100644
--- a/drivers/remoteproc/ti_k3_dsp_rproc.c
+++ b/drivers/remoteproc/ti_k3_dsp_rproc.c
@@ -8,6 +8,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
 #include <malloc.h>
@@ -15,6 +16,7 @@
 #include <errno.h>
 #include <clk.h>
 #include <reset.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <power-domain.h>
 #include <dm/device_compat.h>
@@ -24,6 +26,7 @@
 #include <linux/sizes.h>
 #include <linux/soc/ti/ti_sci_protocol.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "ti_sci_proc.h"
 
 #define KEYSTONE_RPROC_LOCAL_ADDRESS_MASK	(SZ_16M - 1)
diff --git a/drivers/remoteproc/ti_k3_r5f_rproc.c b/drivers/remoteproc/ti_k3_r5f_rproc.c
index db437c1a686..565036de619 100644
--- a/drivers/remoteproc/ti_k3_r5f_rproc.c
+++ b/drivers/remoteproc/ti_k3_r5f_rproc.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
 #include <malloc.h>
@@ -14,6 +15,7 @@
 #include <errno.h>
 #include <clk.h>
 #include <reset.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/io.h>
 #include <dm/device_compat.h>
@@ -22,6 +24,7 @@
 #include <linux/kernel.h>
 #include <linux/soc/ti/ti_sci_protocol.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "ti_sci_proc.h"
 
 /*
diff --git a/drivers/remoteproc/ti_power_proc.c b/drivers/remoteproc/ti_power_proc.c
index 84e621ca9ee..a48acc99819 100644
--- a/drivers/remoteproc/ti_power_proc.c
+++ b/drivers/remoteproc/ti_power_proc.c
@@ -14,6 +14,7 @@
 #include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <mach/psc_defs.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/remoteproc/ti_sci_proc.h b/drivers/remoteproc/ti_sci_proc.h
index 36351da63fc..88a316f692c 100644
--- a/drivers/remoteproc/ti_sci_proc.h
+++ b/drivers/remoteproc/ti_sci_proc.h
@@ -10,6 +10,7 @@
 #ifndef REMOTEPROC_TI_SCI_PROC_H
 #define REMOTEPROC_TI_SCI_PROC_H
 
+#include <asm/types.h>
 #include <linux/printk.h>
 #define TISCI_INVALID_HOST 0xff
 
diff --git a/drivers/reset/ast2500-reset.c b/drivers/reset/ast2500-reset.c
index d1e687bc135..f98eee5a787 100644
--- a/drivers/reset/ast2500-reset.c
+++ b/drivers/reset/ast2500-reset.c
@@ -14,6 +14,7 @@
 #include <asm/io.h>
 #include <asm/arch/scu_ast2500.h>
 #include <asm/arch/wdt.h>
+#include <asm/types.h>
 
 struct ast2500_reset_priv {
 	/* WDT used to perform resets. */
diff --git a/drivers/reset/reset-bcm6345.c b/drivers/reset/reset-bcm6345.c
index 69793967c42..f11843ec5d5 100644
--- a/drivers/reset/reset-bcm6345.c
+++ b/drivers/reset/reset-bcm6345.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
diff --git a/drivers/reset/reset-hisilicon.c b/drivers/reset/reset-hisilicon.c
index 2012421e417..a03365be44f 100644
--- a/drivers/reset/reset-hisilicon.c
+++ b/drivers/reset/reset-hisilicon.c
@@ -3,11 +3,13 @@
  * Copyright (c) 2019, Linaro Limited
  */
 
+#include <compiler.h>
 #include <log.h>
 #include <malloc.h>
 #include <asm/io.h>
 #include <common.h>
 #include <dm.h>
+#include <asm/types.h>
 #include <dt-bindings/reset/ti-syscon.h>
 #include <reset-uclass.h>
 #include <linux/bitops.h>
diff --git a/drivers/reset/reset-hsdk.c b/drivers/reset/reset-hsdk.c
index c9cfa6bc7d3..b730f5ccae9 100644
--- a/drivers/reset/reset-hsdk.c
+++ b/drivers/reset/reset-hsdk.c
@@ -6,10 +6,12 @@
  * Author: Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>
  */
 
+#include <compiler.h>
 #include <log.h>
 #include <asm/io.h>
 #include <common.h>
 #include <dm.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/iopoll.h>
diff --git a/drivers/reset/reset-imx7.c b/drivers/reset/reset-imx7.c
index 1ad031b9041..92369363042 100644
--- a/drivers/reset/reset-imx7.c
+++ b/drivers/reset/reset-imx7.c
@@ -3,11 +3,13 @@
  * Copyright (c) 2017, Impinj, Inc.
  */
 
+#include <compiler.h>
 #include <log.h>
 #include <malloc.h>
 #include <asm/io.h>
 #include <common.h>
 #include <dm.h>
+#include <asm/types.h>
 #include <dt-bindings/reset/imx7-reset.h>
 #include <dt-bindings/reset/imx8mq-reset.h>
 #include <reset-uclass.h>
diff --git a/drivers/reset/reset-mediatek.c b/drivers/reset/reset-mediatek.c
index 9df4c2a1c7b..4ef148824af 100644
--- a/drivers/reset/reset-mediatek.c
+++ b/drivers/reset/reset-mediatek.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <log.h>
 #include <malloc.h>
+#include <asm/types.h>
 #include <dm/lists.h>
 #include <regmap.h>
 #include <reset-uclass.h>
diff --git a/drivers/reset/reset-meson.c b/drivers/reset/reset-meson.c
index ee53df94eca..b08b2dd0a26 100644
--- a/drivers/reset/reset-meson.c
+++ b/drivers/reset/reset-meson.c
@@ -15,6 +15,7 @@
 #include <stdbool.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #define REG_COUNT	8
 #define BITS_PER_REG	32
diff --git a/drivers/reset/reset-mtmips.c b/drivers/reset/reset-mtmips.c
index 4d59a9b8ac5..4e6d5d39736 100644
--- a/drivers/reset/reset-mtmips.c
+++ b/drivers/reset/reset-mtmips.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
diff --git a/drivers/reset/reset-rockchip.c b/drivers/reset/reset-rockchip.c
index 5e8daa28913..e3b504e7c94 100644
--- a/drivers/reset/reset-rockchip.c
+++ b/drivers/reset/reset-rockchip.c
@@ -4,10 +4,12 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
 #include <malloc.h>
 #include <reset-uclass.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/io.h>
diff --git a/drivers/reset/reset-socfpga.c b/drivers/reset/reset-socfpga.c
index 370353e6cba..8f6658e17a5 100644
--- a/drivers/reset/reset-socfpga.c
+++ b/drivers/reset/reset-socfpga.c
@@ -13,12 +13,14 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
 #include <malloc.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <asm/types.h>
 #include <dm/lists.h>
 #include <dm/of_access.h>
 #include <env.h>
diff --git a/drivers/reset/reset-sunxi.c b/drivers/reset/reset-sunxi.c
index 54692cc3f5e..ca557c63a9e 100644
--- a/drivers/reset/reset-sunxi.c
+++ b/drivers/reset/reset-sunxi.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <reset-uclass.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/io.h>
 #include <dm/lists.h>
@@ -17,6 +18,7 @@
 #include <linux/errno.h>
 #include <linux/log2.h>
 #include <asm/arch/ccu.h>
+#include <linux/types.h>
 
 struct sunxi_reset_priv {
 	void *base;
diff --git a/drivers/reset/reset-syscon.c b/drivers/reset/reset-syscon.c
index 16e74dc8e94..c907acbeee9 100644
--- a/drivers/reset/reset-syscon.c
+++ b/drivers/reset/reset-syscon.c
@@ -8,10 +8,12 @@
 #include <regmap.h>
 #include <reset.h>
 #include <reset-uclass.h>
+#include <stdbool.h>
 #include <syscon.h>
 #include <linux/bitops.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 struct syscon_reset_priv {
 	struct regmap *regmap;
diff --git a/drivers/reset/reset-ti-sci.c b/drivers/reset/reset-ti-sci.c
index 4d00622eb81..b234c3c2808 100644
--- a/drivers/reset/reset-ti-sci.c
+++ b/drivers/reset/reset-ti-sci.c
@@ -14,6 +14,8 @@
 #include <log.h>
 #include <malloc.h>
 #include <reset-uclass.h>
+#include <stdbool.h>
+#include <asm/types.h>
 #include <dm/device_compat.h>
 #include <linux/err.h>
 #include <linux/errno.h>
diff --git a/drivers/reset/reset-uniphier.c b/drivers/reset/reset-uniphier.c
index b557906b890..941b2dadd4e 100644
--- a/drivers/reset/reset-uniphier.c
+++ b/drivers/reset/reset-uniphier.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
 #include <malloc.h>
@@ -14,6 +15,7 @@
 #include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/sizes.h>
+#include <linux/types.h>
 
 struct uniphier_reset_data {
 	unsigned int id;
diff --git a/drivers/reset/sti-reset.c b/drivers/reset/sti-reset.c
index d80e985711e..46b8cddd4fd 100644
--- a/drivers/reset/sti-reset.c
+++ b/drivers/reset/sti-reset.c
@@ -5,9 +5,11 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <errno.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <wait_bit.h>
 #include <dm.h>
 #include <reset-uclass.h>
@@ -19,6 +21,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/rng/meson-rng.c b/drivers/rng/meson-rng.c
index 0debe8a1068..81d10381687 100644
--- a/drivers/rng/meson-rng.c
+++ b/drivers/rng/meson-rng.c
@@ -12,6 +12,7 @@
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 struct meson_rng_platdata {
 	fdt_addr_t base;
diff --git a/drivers/rng/rng-uclass.c b/drivers/rng/rng-uclass.c
index b315401f20e..9c547686f47 100644
--- a/drivers/rng/rng-uclass.c
+++ b/drivers/rng/rng-uclass.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <rng.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 int dm_rng_read(struct udevice *dev, void *buffer, size_t size)
 {
diff --git a/drivers/rng/rockchip_rng.c b/drivers/rng/rockchip_rng.c
index 35f999c447d..b7454bd5be9 100644
--- a/drivers/rng/rockchip_rng.c
+++ b/drivers/rng/rockchip_rng.c
@@ -12,6 +12,7 @@
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <rng.h>
+#include <linux/types.h>
 
 #define RK_HW_RNG_MAX 32
 
diff --git a/drivers/rng/sandbox_rng.c b/drivers/rng/sandbox_rng.c
index a55e552177a..27ad9e8aba8 100644
--- a/drivers/rng/sandbox_rng.c
+++ b/drivers/rng/sandbox_rng.c
@@ -8,6 +8,7 @@
 #include <rand.h>
 #include <rng.h>
 #include <time.h>
+#include <linux/types.h>
 
 #include <linux/string.h>
 
diff --git a/drivers/rng/stm32mp1_rng.c b/drivers/rng/stm32mp1_rng.c
index 25cba160222..d4d6b3e48ee 100644
--- a/drivers/rng/stm32mp1_rng.c
+++ b/drivers/rng/stm32mp1_rng.c
@@ -14,6 +14,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <asm/io.h>
 #include <linux/iopoll.h>
diff --git a/drivers/rtc/at91sam9_rtt.c b/drivers/rtc/at91sam9_rtt.c
index 6f92660ef1d..12d57073f6a 100644
--- a/drivers/rtc/at91sam9_rtt.c
+++ b/drivers/rtc/at91sam9_rtt.c
@@ -26,6 +26,7 @@
 #include <asm/arch/hardware.h>
 #include <asm/arch/at91_rtt.h>
 #include <asm/arch/at91_gpbr.h>
+#include <linux/types.h>
 
 int rtc_get (struct rtc_time *tmp)
 {
diff --git a/drivers/rtc/ds1306.c b/drivers/rtc/ds1306.c
index 36d615812b2..0f1dbf636fb 100644
--- a/drivers/rtc/ds1306.c
+++ b/drivers/rtc/ds1306.c
@@ -19,6 +19,7 @@
 #include <rtc.h>
 #include <spi.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 #define	RTC_SECONDS		0x00
 #define	RTC_MINUTES		0x01
diff --git a/drivers/rtc/ds1307.c b/drivers/rtc/ds1307.c
index acdae077c40..84c1f0731c9 100644
--- a/drivers/rtc/ds1307.c
+++ b/drivers/rtc/ds1307.c
@@ -20,6 +20,7 @@
 #include <rtc.h>
 #include <i2c.h>
 #include <stdio.h>
+#include <linux/types.h>
 
 enum ds_type {
 	ds_1307,
diff --git a/drivers/rtc/ds1337.c b/drivers/rtc/ds1337.c
index 9b9a9d6a810..fc0767a034b 100644
--- a/drivers/rtc/ds1337.c
+++ b/drivers/rtc/ds1337.c
@@ -18,6 +18,7 @@
 #include <rtc.h>
 #include <i2c.h>
 #include <stdio.h>
+#include <linux/types.h>
 
 /*
  * RTC register addresses
diff --git a/drivers/rtc/ds1374.c b/drivers/rtc/ds1374.c
index dc8e370a402..2d217d33371 100644
--- a/drivers/rtc/ds1374.c
+++ b/drivers/rtc/ds1374.c
@@ -19,6 +19,7 @@
 #include <i2c.h>
 #include <stdbool.h>
 #include <stdio.h>
+#include <linux/types.h>
 
 /*---------------------------------------------------------------------*/
 #undef DEBUG_RTC
diff --git a/drivers/rtc/ds1556.c b/drivers/rtc/ds1556.c
index 27bf4281698..3834affba6a 100644
--- a/drivers/rtc/ds1556.c
+++ b/drivers/rtc/ds1556.c
@@ -19,6 +19,7 @@
 #include <command.h>
 #include <rtc.h>
 #include <stdio.h>
+#include <linux/types.h>
 
 #if defined(CONFIG_CMD_DATE)
 
diff --git a/drivers/rtc/ds164x.c b/drivers/rtc/ds164x.c
index b363908e79a..172a1ff2777 100644
--- a/drivers/rtc/ds164x.c
+++ b/drivers/rtc/ds164x.c
@@ -19,6 +19,7 @@
 #include <command.h>
 #include <rtc.h>
 #include <stdio.h>
+#include <linux/types.h>
 
 
 static uchar    rtc_read(unsigned int addr );
diff --git a/drivers/rtc/ds174x.c b/drivers/rtc/ds174x.c
index 827c06b2b47..acfc4a6914f 100644
--- a/drivers/rtc/ds174x.c
+++ b/drivers/rtc/ds174x.c
@@ -17,6 +17,7 @@
 #include <rtc.h>
 #include <stdio.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 static uchar rtc_read( unsigned int addr );
 static void  rtc_write( unsigned int addr, uchar val);
diff --git a/drivers/rtc/ds3231.c b/drivers/rtc/ds3231.c
index ebb1cc65c64..051ff55b69b 100644
--- a/drivers/rtc/ds3231.c
+++ b/drivers/rtc/ds3231.c
@@ -22,6 +22,7 @@
 #include <i2c.h>
 #include <stdio.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 /*
  * RTC register addresses
diff --git a/drivers/rtc/ds3232.c b/drivers/rtc/ds3232.c
index e6c9f878665..73b77f8d970 100644
--- a/drivers/rtc/ds3232.c
+++ b/drivers/rtc/ds3232.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <rtc.h>
+#include <asm/types.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
diff --git a/drivers/rtc/i2c_rtc_emul.c b/drivers/rtc/i2c_rtc_emul.c
index 93b9ecc18db..fb814078417 100644
--- a/drivers/rtc/i2c_rtc_emul.c
+++ b/drivers/rtc/i2c_rtc_emul.c
@@ -23,6 +23,7 @@
 #include <asm/rtc.h>
 #include <asm/test.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #ifdef DEBUG
 #define debug_buffer print_buffer
diff --git a/drivers/rtc/imxdi.c b/drivers/rtc/imxdi.c
index 55def3ac9fd..19c77ba097b 100644
--- a/drivers/rtc/imxdi.c
+++ b/drivers/rtc/imxdi.c
@@ -14,7 +14,9 @@
 
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/compat.h>
 #include <rtc.h>
 #include <linux/delay.h>
diff --git a/drivers/rtc/isl1208.c b/drivers/rtc/isl1208.c
index 47c48bfc11f..87010526148 100644
--- a/drivers/rtc/isl1208.c
+++ b/drivers/rtc/isl1208.c
@@ -17,6 +17,7 @@
 #include <rtc.h>
 #include <i2c.h>
 #include <stdio.h>
+#include <linux/types.h>
 
 /*---------------------------------------------------------------------*/
 #ifdef DEBUG_RTC
diff --git a/drivers/rtc/m41t11.c b/drivers/rtc/m41t11.c
index 469551980a9..8f618fb173a 100644
--- a/drivers/rtc/m41t11.c
+++ b/drivers/rtc/m41t11.c
@@ -17,6 +17,7 @@
 #include <rtc.h>
 #include <i2c.h>
 #include <stdio.h>
+#include <linux/types.h>
 
 /*
 	I Don't have an example config file but this
diff --git a/drivers/rtc/m41t60.c b/drivers/rtc/m41t60.c
index 05ed89bf8d6..0cfd3d61b2d 100644
--- a/drivers/rtc/m41t60.c
+++ b/drivers/rtc/m41t60.c
@@ -23,6 +23,7 @@
 #include <i2c.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/types.h>
 
 /*
  * Convert between century and "century bits" (CB1 and CB0).  These routines
diff --git a/drivers/rtc/m41t62.c b/drivers/rtc/m41t62.c
index 23ebaddf941..a3478e28bda 100644
--- a/drivers/rtc/m41t62.c
+++ b/drivers/rtc/m41t62.c
@@ -23,6 +23,7 @@
 #include <rtc.h>
 #include <i2c.h>
 #include <stdio.h>
+#include <asm/types.h>
 
 #define M41T62_REG_SSEC	0
 #define M41T62_REG_SEC	1
diff --git a/drivers/rtc/m41t94.c b/drivers/rtc/m41t94.c
index 5b665bb0133..e997fccb3a7 100644
--- a/drivers/rtc/m41t94.c
+++ b/drivers/rtc/m41t94.c
@@ -16,6 +16,7 @@
 #include <common.h>
 #include <rtc.h>
 #include <spi.h>
+#include <asm/types.h>
 
 static struct spi_slave *slave;
 
diff --git a/drivers/rtc/m48t35ax.c b/drivers/rtc/m48t35ax.c
index 1cc24cccae7..1f1dddd9bf7 100644
--- a/drivers/rtc/m48t35ax.c
+++ b/drivers/rtc/m48t35ax.c
@@ -15,6 +15,7 @@
 #include <command.h>
 #include <rtc.h>
 #include <config.h>
+#include <linux/types.h>
 
 static uchar rtc_read  (uchar reg);
 static void  rtc_write (uchar reg, uchar val);
diff --git a/drivers/rtc/max6900.c b/drivers/rtc/max6900.c
index 11928839dcf..7e7abae8977 100644
--- a/drivers/rtc/max6900.c
+++ b/drivers/rtc/max6900.c
@@ -15,6 +15,7 @@
 #include <rtc.h>
 #include <i2c.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 #ifndef	CONFIG_SYS_I2C_RTC_ADDR
 #define	CONFIG_SYS_I2C_RTC_ADDR	0x50
diff --git a/drivers/rtc/mc13xxx-rtc.c b/drivers/rtc/mc13xxx-rtc.c
index 6c2aef89758..4784e9dda18 100644
--- a/drivers/rtc/mc13xxx-rtc.c
+++ b/drivers/rtc/mc13xxx-rtc.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <rtc.h>
 #include <spi.h>
+#include <asm/types.h>
 #include <power/pmic.h>
 #include <fsl_pmic.h>
 
diff --git a/drivers/rtc/mc146818.c b/drivers/rtc/mc146818.c
index 7c25afb1819..830eec0f821 100644
--- a/drivers/rtc/mc146818.c
+++ b/drivers/rtc/mc146818.c
@@ -14,6 +14,7 @@
 #include <rtc.h>
 #include <stdio.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 #if defined(CONFIG_X86) || defined(CONFIG_MALTA)
 #include <asm/io.h>
diff --git a/drivers/rtc/mk48t59.c b/drivers/rtc/mk48t59.c
index 0fa155c14d0..2947da9f448 100644
--- a/drivers/rtc/mk48t59.c
+++ b/drivers/rtc/mk48t59.c
@@ -16,6 +16,7 @@
 #include <rtc.h>
 #include <mk48t59.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 #if defined(CONFIG_BAB7xx)
 
diff --git a/drivers/rtc/mvrtc.c b/drivers/rtc/mvrtc.c
index 6a0224cad73..80a4feb9308 100644
--- a/drivers/rtc/mvrtc.c
+++ b/drivers/rtc/mvrtc.c
@@ -14,6 +14,7 @@
 #include <rtc.h>
 #include <stdio.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include "mvrtc.h"
 
diff --git a/drivers/rtc/mvrtc.h b/drivers/rtc/mvrtc.h
index 87ff43299ca..9244ad82189 100644
--- a/drivers/rtc/mvrtc.h
+++ b/drivers/rtc/mvrtc.h
@@ -12,6 +12,7 @@
 #define _MVRTC_H_
 
 #include <asm/arch/soc.h>
+#include <asm/types.h>
 #include <linux/compiler.h>
 
 /* RTC registers */
diff --git a/drivers/rtc/mx27rtc.c b/drivers/rtc/mx27rtc.c
index 563e8a4a361..742f33e5837 100644
--- a/drivers/rtc/mx27rtc.c
+++ b/drivers/rtc/mx27rtc.c
@@ -9,6 +9,7 @@
 #include <rtc.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
+#include <linux/types.h>
 
 #define HOUR_SHIFT 8
 #define HOUR_MASK  0x1f
diff --git a/drivers/rtc/mxsrtc.c b/drivers/rtc/mxsrtc.c
index ec0c631cc49..22e438d47aa 100644
--- a/drivers/rtc/mxsrtc.c
+++ b/drivers/rtc/mxsrtc.c
@@ -12,6 +12,7 @@
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/types.h>
 
 #define	MXS_RTC_MAX_TIMEOUT	1000000
 
diff --git a/drivers/rtc/pcf2127.c b/drivers/rtc/pcf2127.c
index e4ab395f514..4a357cf7671 100644
--- a/drivers/rtc/pcf2127.c
+++ b/drivers/rtc/pcf2127.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <rtc.h>
 #include <stdio.h>
+#include <linux/types.h>
 
 #define PCF2127_REG_CTRL1	0x00
 #define PCF2127_REG_CTRL2	0x01
diff --git a/drivers/rtc/pcf8563.c b/drivers/rtc/pcf8563.c
index 79d1b71a0cf..3a910e766ef 100644
--- a/drivers/rtc/pcf8563.c
+++ b/drivers/rtc/pcf8563.c
@@ -17,6 +17,7 @@
 #include <rtc.h>
 #include <i2c.h>
 #include <stdio.h>
+#include <linux/types.h>
 
 #if !CONFIG_IS_ENABLED(DM_RTC)
 static uchar rtc_read  (uchar reg);
diff --git a/drivers/rtc/pt7c4338.c b/drivers/rtc/pt7c4338.c
index 4718229657e..6d99007558c 100644
--- a/drivers/rtc/pt7c4338.c
+++ b/drivers/rtc/pt7c4338.c
@@ -25,6 +25,7 @@
 #include <rtc.h>
 #include <i2c.h>
 #include <stdio.h>
+#include <asm/types.h>
 
 /* RTC register addresses */
 #define RTC_SEC_REG_ADDR        0x0
diff --git a/drivers/rtc/rtc-uclass.c b/drivers/rtc/rtc-uclass.c
index 1fda0cd8fbc..b4f70519fa2 100644
--- a/drivers/rtc/rtc-uclass.c
+++ b/drivers/rtc/rtc-uclass.c
@@ -9,6 +9,7 @@
 #include <errno.h>
 #include <log.h>
 #include <rtc.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 
 int dm_rtc_get(struct udevice *dev, struct rtc_time *time)
diff --git a/drivers/rtc/rv3029.c b/drivers/rtc/rv3029.c
index bda19d6853f..c241aa085be 100644
--- a/drivers/rtc/rv3029.c
+++ b/drivers/rtc/rv3029.c
@@ -21,6 +21,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #define RTC_RV3029_PAGE_LEN             7
 
diff --git a/drivers/rtc/rv8803.c b/drivers/rtc/rv8803.c
index 5e16676c04c..f04a5ba0897 100644
--- a/drivers/rtc/rv8803.c
+++ b/drivers/rtc/rv8803.c
@@ -17,6 +17,7 @@
 #include <rtc.h>
 #include <i2c.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 
 /*
diff --git a/drivers/rtc/rx8010sj.c b/drivers/rtc/rx8010sj.c
index 1da7a7d6c90..c2bbce35088 100644
--- a/drivers/rtc/rx8010sj.c
+++ b/drivers/rtc/rx8010sj.c
@@ -22,6 +22,7 @@
 #include <i2c.h>
 #include <rtc.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 
diff --git a/drivers/rtc/rx8025.c b/drivers/rtc/rx8025.c
index aaa3609be00..b92ebd263de 100644
--- a/drivers/rtc/rx8025.c
+++ b/drivers/rtc/rx8025.c
@@ -15,6 +15,7 @@
 #include <rtc.h>
 #include <stdio.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 /*---------------------------------------------------------------------*/
 #undef DEBUG_RTC
diff --git a/drivers/rtc/s35392a.c b/drivers/rtc/s35392a.c
index 3744d8445fb..cfa745529e0 100644
--- a/drivers/rtc/s35392a.c
+++ b/drivers/rtc/s35392a.c
@@ -22,6 +22,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/bitrev.h>
 #include <rtc.h>
 #include <linux/delay.h>
diff --git a/drivers/rtc/s3c24x0_rtc.c b/drivers/rtc/s3c24x0_rtc.c
index 807347a9149..e76193c45d4 100644
--- a/drivers/rtc/s3c24x0_rtc.c
+++ b/drivers/rtc/s3c24x0_rtc.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <command.h>
 #include <stdio.h>
+#include <linux/types.h>
 
 #include <asm/arch/s3c24x0_cpu.h>
 
diff --git a/drivers/rtc/sandbox_rtc.c b/drivers/rtc/sandbox_rtc.c
index 852770a49cf..a16133f9daf 100644
--- a/drivers/rtc/sandbox_rtc.c
+++ b/drivers/rtc/sandbox_rtc.c
@@ -9,6 +9,7 @@
 #include <i2c.h>
 #include <rtc.h>
 #include <asm/rtc.h>
+#include <asm/types.h>
 #include <dm/acpi.h>
 
 #define REG_COUNT 0x80
diff --git a/drivers/rtc/stm32_rtc.c b/drivers/rtc/stm32_rtc.c
index 8f9540697df..9cf16289f4f 100644
--- a/drivers/rtc/stm32_rtc.c
+++ b/drivers/rtc/stm32_rtc.c
@@ -8,6 +8,7 @@
 #include <malloc.h>
 #include <rtc.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
diff --git a/drivers/rtc/x1205.c b/drivers/rtc/x1205.c
index ce23427b174..e913210057f 100644
--- a/drivers/rtc/x1205.c
+++ b/drivers/rtc/x1205.c
@@ -22,6 +22,7 @@
 #include <log.h>
 #include <rtc.h>
 #include <i2c.h>
+#include <asm/types.h>
 
 #define CCR_SEC			0
 #define CCR_MIN			1
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
index 0a68ef4a187..5b9f1ccbdbb 100644
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -13,6 +13,7 @@
 #include <part.h>
 #include <pci.h>
 #include <scsi.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <dm/device-internal.h>
@@ -20,6 +21,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #if !defined(CONFIG_DM_SCSI)
 # ifdef CONFIG_SCSI_DEV_LIST
diff --git a/drivers/serial/altera_jtag_uart.c b/drivers/serial/altera_jtag_uart.c
index bd2b65b028f..5cfef019a38 100644
--- a/drivers/serial/altera_jtag_uart.c
+++ b/drivers/serial/altera_jtag_uart.c
@@ -10,6 +10,7 @@
 #include <serial.h>
 #include <stdbool.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 
diff --git a/drivers/serial/altera_uart.c b/drivers/serial/altera_uart.c
index 3d309885c2c..9492a3c952c 100644
--- a/drivers/serial/altera_uart.c
+++ b/drivers/serial/altera_uart.c
@@ -10,6 +10,7 @@
 #include <serial.h>
 #include <stdbool.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 
diff --git a/drivers/serial/atmel_usart.c b/drivers/serial/atmel_usart.c
index 84bf36f3be5..0add4e41dbd 100644
--- a/drivers/serial/atmel_usart.c
+++ b/drivers/serial/atmel_usart.c
@@ -2,6 +2,8 @@
 /*
  * Copyright (C) 2004-2006 Atmel Corporation
  *
+#include <compiler.h>
+#include <linux/types.h>
  * Modified to support C structur SoC access by
  * Andreas Bie?mann <biessmann@corscience.de>
  */
diff --git a/drivers/serial/atmel_usart.h b/drivers/serial/atmel_usart.h
index 8f27488158d..61c057b13ec 100644
--- a/drivers/serial/atmel_usart.h
+++ b/drivers/serial/atmel_usart.h
@@ -4,6 +4,7 @@
  *
  * Copyright (C) 2005-2006 Atmel Corporation
  *
+#include <asm/types.h>
  * Modified to support C structure SoC access by
  * Andreas Bie?mann <biessmann@corscience.de>
  */
diff --git a/drivers/serial/lpc32xx_hsuart.c b/drivers/serial/lpc32xx_hsuart.c
index 49ca3ff1320..a23f0ffaf4a 100644
--- a/drivers/serial/lpc32xx_hsuart.c
+++ b/drivers/serial/lpc32xx_hsuart.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <serial.h>
 #include <stdbool.h>
+#include <asm/types.h>
 #include <dm/platform_data/lpc32xx_hsuart.h>
 #include <linux/errno.h>
 
diff --git a/drivers/serial/ns16550.c b/drivers/serial/ns16550.c
index b0b69cf96f7..3e704de6c72 100644
--- a/drivers/serial/ns16550.c
+++ b/drivers/serial/ns16550.c
@@ -13,6 +13,7 @@
 #include <ns16550.h>
 #include <reset.h>
 #include <serial.h>
+#include <stdbool.h>
 #include <watchdog.h>
 #include <asm/global_data.h>
 #include <linux/err.h>
diff --git a/drivers/serial/sandbox.c b/drivers/serial/sandbox.c
index c811524e357..b23283e66b3 100644
--- a/drivers/serial/sandbox.c
+++ b/drivers/serial/sandbox.c
@@ -16,6 +16,7 @@
 #include <lcd.h>
 #include <os.h>
 #include <serial.h>
+#include <stdbool.h>
 #include <video.h>
 #include <asm/global_data.h>
 #include <linux/compiler.h>
@@ -23,6 +24,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/serial/serial-uclass.c b/drivers/serial/serial-uclass.c
index 5176a7395b7..2d8b5715cfb 100644
--- a/drivers/serial/serial-uclass.c
+++ b/drivers/serial/serial-uclass.c
@@ -22,6 +22,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/serial/serial.c b/drivers/serial/serial.c
index c3235135b5b..69180263985 100644
--- a/drivers/serial/serial.c
+++ b/drivers/serial/serial.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <env_internal.h>
 #include <hang.h>
 #include <serial.h>
diff --git a/drivers/serial/serial_ar933x.c b/drivers/serial/serial_ar933x.c
index fdcd62705ad..3d4b539d72c 100644
--- a/drivers/serial/serial_ar933x.c
+++ b/drivers/serial/serial_ar933x.c
@@ -5,10 +5,12 @@
 
 #include <common.h>
 #include <clock_legacy.h>
+#include <compiler.h>
 #include <dm.h>
 #include <div64.h>
 #include <errno.h>
 #include <serial.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <asm/addrspace.h>
 #include <asm/types.h>
diff --git a/drivers/serial/serial_arc.c b/drivers/serial/serial_arc.c
index 4205ffdd0df..69435a16e37 100644
--- a/drivers/serial/serial_arc.c
+++ b/drivers/serial/serial_arc.c
@@ -12,6 +12,7 @@
 #include <serial.h>
 #include <stdbool.h>
 #include <asm/global_data.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/serial/serial_bcm283x_mu.c b/drivers/serial/serial_bcm283x_mu.c
index 6e54e4ca72f..0be968c24e8 100644
--- a/drivers/serial/serial_bcm283x_mu.c
+++ b/drivers/serial/serial_bcm283x_mu.c
@@ -22,6 +22,7 @@
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <serial.h>
+#include <asm/types.h>
 #include <dm/platform_data/serial_bcm283x_mu.h>
 #include <dm/pinctrl.h>
 #include <linux/bitops.h>
diff --git a/drivers/serial/serial_bcm6345.c b/drivers/serial/serial_bcm6345.c
index a90bfc7f5ed..eb64b6acfbf 100644
--- a/drivers/serial/serial_bcm6345.c
+++ b/drivers/serial/serial_bcm6345.c
@@ -7,6 +7,7 @@
  */
 
 #include <clk.h>
+#include <compiler.h>
 #include <dm.h>
 #include <debug_uart.h>
 #include <errno.h>
@@ -16,6 +17,7 @@
 #include <asm/io.h>
 #include <asm/types.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 /* UART Control register */
 #define UART_CTL_REG			0x0
diff --git a/drivers/serial/serial_cortina.c b/drivers/serial/serial_cortina.c
index 001fca79f98..aea9f8fd771 100644
--- a/drivers/serial/serial_cortina.c
+++ b/drivers/serial/serial_cortina.c
@@ -6,12 +6,14 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <errno.h>
 #include <stdbool.h>
 #include <watchdog.h>
 #include <asm/io.h>
 #include <serial.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/compiler.h>
 #include <linux/errno.h>
diff --git a/drivers/serial/serial_efi.c b/drivers/serial/serial_efi.c
index 4739c5a20e8..e8d62ba2226 100644
--- a/drivers/serial/serial_efi.c
+++ b/drivers/serial/serial_efi.c
@@ -17,6 +17,7 @@
 #include <asm/io.h>
 #include <serial.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 /* Information about the efi console */
 struct serial_efi_priv {
diff --git a/drivers/serial/serial_linflexuart.c b/drivers/serial/serial_linflexuart.c
index b9b947a930a..408f0a7944d 100644
--- a/drivers/serial/serial_linflexuart.c
+++ b/drivers/serial/serial_linflexuart.c
@@ -15,6 +15,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/clock.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #define US1_TDRE            (1 << 7)
 #define US1_RDRF            (1 << 5)
diff --git a/drivers/serial/serial_lpuart.c b/drivers/serial/serial_lpuart.c
index 45ae154b633..239e614c3e0 100644
--- a/drivers/serial/serial_lpuart.c
+++ b/drivers/serial/serial_lpuart.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <dm.h>
 #include <fsl_lpuart.h>
 #include <log.h>
@@ -20,6 +21,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/clock.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #define US1_TDRE	(1 << 7)
 #define US1_RDRF	(1 << 5)
diff --git a/drivers/serial/serial_mcf.c b/drivers/serial/serial_mcf.c
index f1670a0eddd..f6a8aa84224 100644
--- a/drivers/serial/serial_mcf.c
+++ b/drivers/serial/serial_mcf.c
@@ -25,6 +25,7 @@
 #include <asm/immap.h>
 #include <asm/uart.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/serial/serial_meson.c b/drivers/serial/serial_meson.c
index 63875c626cd..a245d168e41 100644
--- a/drivers/serial/serial_meson.c
+++ b/drivers/serial/serial_meson.c
@@ -12,6 +12,7 @@
 #include <linux/compiler.h>
 #include <serial.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 struct meson_uart {
 	u32 wfifo;
diff --git a/drivers/serial/serial_mpc8xx.c b/drivers/serial/serial_mpc8xx.c
index ba87240d74c..9628539cccc 100644
--- a/drivers/serial/serial_mpc8xx.c
+++ b/drivers/serial/serial_mpc8xx.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <dm.h>
 #include <serial.h>
 #include <stdbool.h>
@@ -13,6 +14,7 @@
 #include <asm/cpm_8xx.h>
 #include <asm/global_data.h>
 #include <linux/compiler.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/serial/serial_msm.c b/drivers/serial/serial_msm.c
index a86563e8d8f..c1486988b6a 100644
--- a/drivers/serial/serial_msm.c
+++ b/drivers/serial/serial_msm.c
@@ -21,6 +21,7 @@
 #include <linux/compiler.h>
 #include <dm/pinctrl.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 /* Serial registers - this driver works in uartdm mode*/
 
diff --git a/drivers/serial/serial_mtk.c b/drivers/serial/serial_mtk.c
index c028d760f2f..ddd45fb2da1 100644
--- a/drivers/serial/serial_mtk.c
+++ b/drivers/serial/serial_mtk.c
@@ -8,11 +8,13 @@
 
 #include <clk.h>
 #include <common.h>
+#include <compiler.h>
 #include <div64.h>
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
 #include <serial.h>
+#include <stdbool.h>
 #include <watchdog.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/serial/serial_mvebu_a3700.c b/drivers/serial/serial_mvebu_a3700.c
index a5674e6b13b..ddb4d71324c 100644
--- a/drivers/serial/serial_mvebu_a3700.c
+++ b/drivers/serial/serial_mvebu_a3700.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <serial.h>
 #include <stdbool.h>
diff --git a/drivers/serial/serial_mxc.c b/drivers/serial/serial_mxc.c
index d13dbeb3cef..b6646d1374e 100644
--- a/drivers/serial/serial_mxc.c
+++ b/drivers/serial/serial_mxc.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <errno.h>
 #include <stdbool.h>
@@ -15,6 +16,7 @@
 #include <serial.h>
 #include <linux/compiler.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 /* UART Control Register Bit Fields.*/
 #define URXD_CHARRDY	(1<<15)
diff --git a/drivers/serial/serial_ns16550.c b/drivers/serial/serial_ns16550.c
index 1353e2f7ccb..82b3919f13d 100644
--- a/drivers/serial/serial_ns16550.c
+++ b/drivers/serial/serial_ns16550.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <clock_legacy.h>
+#include <compiler.h>
 #include <ns16550.h>
 #include <serial.h>
 #include <asm/global_data.h>
diff --git a/drivers/serial/serial_omap.c b/drivers/serial/serial_omap.c
index b661b11f0d8..8d0c372b038 100644
--- a/drivers/serial/serial_omap.c
+++ b/drivers/serial/serial_omap.c
@@ -15,6 +15,7 @@
 #include <clk.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #ifndef CONFIG_SYS_NS16550_CLK
 #define CONFIG_SYS_NS16550_CLK  0
diff --git a/drivers/serial/serial_pic32.c b/drivers/serial/serial_pic32.c
index f1473d6cffa..a7a54398fb2 100644
--- a/drivers/serial/serial_pic32.c
+++ b/drivers/serial/serial_pic32.c
@@ -5,14 +5,17 @@
  */
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <dm.h>
 #include <malloc.h>
 #include <serial.h>
+#include <stdbool.h>
 #include <wait_bit.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include <mach/pic32.h>
 #include <dt-bindings/clock/microchip,clock.h>
 
diff --git a/drivers/serial/serial_pl01x.c b/drivers/serial/serial_pl01x.c
index 1f4e54628fa..6f06b127ed9 100644
--- a/drivers/serial/serial_pl01x.c
+++ b/drivers/serial/serial_pl01x.c
@@ -11,6 +11,7 @@
 /* Simple U-Boot driver for the PrimeCell PL010/PL011 UARTs */
 
 #include <common.h>
+#include <compiler.h>
 #include <stdbool.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
diff --git a/drivers/serial/serial_pl01x_internal.h b/drivers/serial/serial_pl01x_internal.h
index a2d696e6c27..9bfa403c403 100644
--- a/drivers/serial/serial_pl01x_internal.h
+++ b/drivers/serial/serial_pl01x_internal.h
@@ -15,6 +15,7 @@
 
 #ifndef __ASSEMBLY__
 /*
+#include <asm/types.h>
  * We can use a combined structure for PL010 and PL011, because they overlap
  * only in common registers.
  */
diff --git a/drivers/serial/serial_pxa.c b/drivers/serial/serial_pxa.c
index 459ce781712..3723b2a2eb9 100644
--- a/drivers/serial/serial_pxa.c
+++ b/drivers/serial/serial_pxa.c
@@ -20,6 +20,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <hang.h>
 #include <stdbool.h>
 #include <vsprintf.h>
@@ -33,6 +34,7 @@
 #include <serial.h>
 #include <watchdog.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/serial/serial_s5p.c b/drivers/serial/serial_s5p.c
index 0e800633452..2eaafab5bb0 100644
--- a/drivers/serial/serial_s5p.c
+++ b/drivers/serial/serial_s5p.c
@@ -20,6 +20,7 @@
 #include <serial.h>
 #include <clk.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/serial/serial_sh.c b/drivers/serial/serial_sh.c
index e87f1d0ecfe..3222028de46 100644
--- a/drivers/serial/serial_sh.c
+++ b/drivers/serial/serial_sh.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <errno.h>
 #include <clk.h>
 #include <dm.h>
diff --git a/drivers/serial/serial_sifive.c b/drivers/serial/serial_sifive.c
index 39b62d30eb4..d127f6004bf 100644
--- a/drivers/serial/serial_sifive.c
+++ b/drivers/serial/serial_sifive.c
@@ -10,9 +10,11 @@
 #include <errno.h>
 #include <fdtdec.h>
 #include <log.h>
+#include <stdbool.h>
 #include <watchdog.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/compiler.h>
 #include <serial.h>
 #include <linux/err.h>
diff --git a/drivers/serial/serial_sti_asc.c b/drivers/serial/serial_sti_asc.c
index d3d1b74478a..1b72bd59a82 100644
--- a/drivers/serial/serial_sti_asc.c
+++ b/drivers/serial/serial_sti_asc.c
@@ -13,6 +13,7 @@
 #include <stdbool.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 
diff --git a/drivers/serial/serial_stm32.c b/drivers/serial/serial_stm32.c
index c5d8d3f3dde..a22f48c0b67 100644
--- a/drivers/serial/serial_stm32.c
+++ b/drivers/serial/serial_stm32.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <reset.h>
 #include <serial.h>
+#include <stdbool.h>
 #include <watchdog.h>
 #include <asm/io.h>
 #include <asm/arch/stm32.h>
@@ -17,6 +18,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include "serial_stm32.h"
 #include <dm/device_compat.h>
 
diff --git a/drivers/serial/serial_stm32.h b/drivers/serial/serial_stm32.h
index 0c541ead06e..ad2a8a19dca 100644
--- a/drivers/serial/serial_stm32.h
+++ b/drivers/serial/serial_stm32.h
@@ -8,6 +8,7 @@
 #define _SERIAL_STM32_
 
 #include <stdbool.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #define CR1_OFFSET(x)	(x ? 0x0c : 0x00)
 #define CR3_OFFSET(x)	(x ? 0x14 : 0x08)
diff --git a/drivers/serial/serial_uniphier.c b/drivers/serial/serial_uniphier.c
index 95d378ec28f..79882122beb 100644
--- a/drivers/serial/serial_uniphier.c
+++ b/drivers/serial/serial_uniphier.c
@@ -6,7 +6,10 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
+#include <stdbool.h>
+#include <asm/types.h>
 #include <linux/bitfield.h>
 #include <linux/bitops.h>
 #include <linux/bug.h>
diff --git a/drivers/serial/serial_zynq.c b/drivers/serial/serial_zynq.c
index 7fec7d5bec4..b96f8114377 100644
--- a/drivers/serial/serial_zynq.c
+++ b/drivers/serial/serial_zynq.c
@@ -11,8 +11,10 @@
 #include <errno.h>
 #include <fdtdec.h>
 #include <log.h>
+#include <stdbool.h>
 #include <watchdog.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/compiler.h>
diff --git a/drivers/serial/usbtty.c b/drivers/serial/usbtty.c
index 4e2e09edd3f..27298566423 100644
--- a/drivers/serial/usbtty.c
+++ b/drivers/serial/usbtty.c
@@ -16,6 +16,7 @@
 #include <asm/unaligned.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "usbtty.h"
 #include "usb_cdc_acm.h"
 #include "usbdescriptors.h"
diff --git a/drivers/smem/msm_smem.c b/drivers/smem/msm_smem.c
index 3a5ee3bbce0..69b008da279 100644
--- a/drivers/smem/msm_smem.c
+++ b/drivers/smem/msm_smem.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <errno.h>
 #include <dm.h>
 #include <asm/global_data.h>
@@ -22,6 +23,7 @@
 #include <smem.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/smem/sandbox_smem.c b/drivers/smem/sandbox_smem.c
index 7397e4407ad..8c31232e9c1 100644
--- a/drivers/smem/sandbox_smem.c
+++ b/drivers/smem/sandbox_smem.c
@@ -8,6 +8,7 @@
 #include <errno.h>
 #include <smem.h>
 #include <asm/test.h>
+#include <linux/types.h>
 
 static int sandbox_smem_alloc(unsigned int host,
 		unsigned int item, size_t size)
diff --git a/drivers/smem/smem-uclass.c b/drivers/smem/smem-uclass.c
index 90b1316d6dc..7a5b18921d0 100644
--- a/drivers/smem/smem-uclass.c
+++ b/drivers/smem/smem-uclass.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <smem.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 int smem_alloc(struct udevice *dev, unsigned int host,
 		unsigned int item, size_t size)
diff --git a/drivers/soc/soc_ti_k3.c b/drivers/soc/soc_ti_k3.c
index 5ffccba2e8c..ec9f598f28b 100644
--- a/drivers/soc/soc_ti_k3.c
+++ b/drivers/soc/soc_ti_k3.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <soc.h>
 #include <vsprintf.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 
 #include <asm/io.h>
diff --git a/drivers/soc/ti/k3-navss-ringacc.c b/drivers/soc/ti/k3-navss-ringacc.c
index c9a8b1ed019..81f029fa636 100644
--- a/drivers/soc/ti/k3-navss-ringacc.c
+++ b/drivers/soc/ti/k3-navss-ringacc.c
@@ -6,8 +6,10 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/cache.h>
 #include <asm/io.h>
 #include <malloc.h>
@@ -27,6 +29,7 @@
 #include <linux/soc/ti/k3-navss-ringacc.h>
 #include <linux/soc/ti/ti_sci_protocol.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define set_bit(bit, bitmap)	__set_bit(bit, bitmap)
 #define clear_bit(bit, bitmap)	__clear_bit(bit, bitmap)
diff --git a/drivers/soc/ti/keystone_serdes.c b/drivers/soc/ti/keystone_serdes.c
index 68fa28a6f80..b45aa571ffa 100644
--- a/drivers/soc/ti/keystone_serdes.c
+++ b/drivers/soc/ti/keystone_serdes.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <stdio.h>
 #include <asm/ti-common/keystone_serdes.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
diff --git a/drivers/sound/broadwell_i2s.c b/drivers/sound/broadwell_i2s.c
index 4258d607cb4..1e78b5686c4 100644
--- a/drivers/sound/broadwell_i2s.c
+++ b/drivers/sound/broadwell_i2s.c
@@ -16,6 +16,7 @@
 #include <time.h>
 #include <asm/io.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include "broadwell_i2s.h"
 
 enum {
diff --git a/drivers/sound/broadwell_i2s.h b/drivers/sound/broadwell_i2s.h
index ba87abfc6ae..683539b918e 100644
--- a/drivers/sound/broadwell_i2s.h
+++ b/drivers/sound/broadwell_i2s.h
@@ -10,6 +10,7 @@
 #ifndef __BROADWELL_I2S_H__
 #define __BROADWELL_I2S_H__
 
+#include <asm/types.h>
 enum {
 	SSP_FIFO_SIZE = 7,
 };
diff --git a/drivers/sound/broadwell_sound.c b/drivers/sound/broadwell_sound.c
index ba2a68ce56a..8f770a0e8e4 100644
--- a/drivers/sound/broadwell_sound.c
+++ b/drivers/sound/broadwell_sound.c
@@ -14,6 +14,7 @@
 #include <i2s.h>
 #include <sound.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 static int broadwell_sound_probe(struct udevice *dev)
 {
diff --git a/drivers/sound/codec-uclass.c b/drivers/sound/codec-uclass.c
index 207dc188c48..2f938c766e0 100644
--- a/drivers/sound/codec-uclass.c
+++ b/drivers/sound/codec-uclass.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <audio_codec.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 int audio_codec_set_params(struct udevice *dev, int interface, int rate,
 			   int mclk_freq, int bits_per_sample, uint channels)
diff --git a/drivers/sound/da7219.c b/drivers/sound/da7219.c
index e9d56b1f869..d98fdf5717d 100644
--- a/drivers/sound/da7219.c
+++ b/drivers/sound/da7219.c
@@ -18,6 +18,7 @@
 #include <asm/acpi_nhlt.h>
 #endif
 #include <asm-generic/gpio.h>
+#include <asm/types.h>
 #include <dt-bindings/sound/nhlt.h>
 #include <dm/acpi.h>
 #include <linux/errno.h>
diff --git a/drivers/sound/hda_codec.c b/drivers/sound/hda_codec.c
index 241b6270c4d..fcf76d2284a 100644
--- a/drivers/sound/hda_codec.c
+++ b/drivers/sound/hda_codec.c
@@ -19,6 +19,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 /**
  * struct hda_regs - HDA registers
diff --git a/drivers/sound/i2s-uclass.c b/drivers/sound/i2s-uclass.c
index e31d9933fff..94b33baec14 100644
--- a/drivers/sound/i2s-uclass.c
+++ b/drivers/sound/i2s-uclass.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <i2s.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 int i2s_tx_data(struct udevice *dev, void *data, uint data_size)
 {
diff --git a/drivers/sound/ivybridge_sound.c b/drivers/sound/ivybridge_sound.c
index a7423d46c18..a1d8c36b4e8 100644
--- a/drivers/sound/ivybridge_sound.c
+++ b/drivers/sound/ivybridge_sound.c
@@ -19,6 +19,7 @@
 #include <pch.h>
 #include <sound.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 
 static int bd82x6x_azalia_probe(struct udevice *dev)
diff --git a/drivers/sound/max98088.c b/drivers/sound/max98088.c
index d1d560ae6da..9ac35730210 100644
--- a/drivers/sound/max98088.c
+++ b/drivers/sound/max98088.c
@@ -19,6 +19,7 @@
 #include <asm/gpio.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include "maxim_codec.h"
 #include "max98088.h"
 
diff --git a/drivers/sound/max98090.c b/drivers/sound/max98090.c
index 16620c3e967..862beeccc43 100644
--- a/drivers/sound/max98090.c
+++ b/drivers/sound/max98090.c
@@ -16,6 +16,7 @@
 #include <asm/gpio.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include "maxim_codec.h"
 #include "max98090.h"
 
diff --git a/drivers/sound/max98095.c b/drivers/sound/max98095.c
index 18632511499..2119d851ffd 100644
--- a/drivers/sound/max98095.c
+++ b/drivers/sound/max98095.c
@@ -18,6 +18,7 @@
 #include <asm/gpio.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include "i2s.h"
 #include "max98095.h"
 
diff --git a/drivers/sound/max98357a.c b/drivers/sound/max98357a.c
index 318dfe76e39..6c98b1b8e9e 100644
--- a/drivers/sound/max98357a.c
+++ b/drivers/sound/max98357a.c
@@ -18,6 +18,7 @@
 #ifdef CONFIG_X86
 #include <asm/acpi_nhlt.h>
 #endif
+#include <asm/types.h>
 #include <dt-bindings/sound/nhlt.h>
 #include <dm/acpi.h>
 #include <linux/errno.h>
diff --git a/drivers/sound/rockchip_i2s.c b/drivers/sound/rockchip_i2s.c
index 37fb5a5d340..5bb51c4b1b2 100644
--- a/drivers/sound/rockchip_i2s.c
+++ b/drivers/sound/rockchip_i2s.c
@@ -16,6 +16,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 struct rk_i2s_regs {
 	u32 txcr;		/* I2S_TXCR, 0x00 */
diff --git a/drivers/sound/rockchip_sound.c b/drivers/sound/rockchip_sound.c
index ec93a44aec7..4bc11f41c99 100644
--- a/drivers/sound/rockchip_sound.c
+++ b/drivers/sound/rockchip_sound.c
@@ -17,6 +17,7 @@
 #include <asm/arch-rockchip/periph.h>
 #include <dm/pinctrl.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 static int rockchip_sound_setup(struct udevice *dev)
 {
diff --git a/drivers/sound/rt5677.c b/drivers/sound/rt5677.c
index 3eb99f31a4a..ebf754e8afb 100644
--- a/drivers/sound/rt5677.c
+++ b/drivers/sound/rt5677.c
@@ -11,6 +11,7 @@
 #include <i2c.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include "rt5677.h"
 #include <log.h>
 
diff --git a/drivers/sound/samsung-i2s.c b/drivers/sound/samsung-i2s.c
index 51cb9637bab..5b71678ef9c 100644
--- a/drivers/sound/samsung-i2s.c
+++ b/drivers/sound/samsung-i2s.c
@@ -15,6 +15,7 @@
 #include <asm/arch/i2s-regs.h>
 #include <asm/io.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #define FIC_TX2COUNT(x)		(((x) >>  24) & 0xf)
 #define FIC_TX1COUNT(x)		(((x) >>  16) & 0xf)
diff --git a/drivers/sound/samsung_sound.c b/drivers/sound/samsung_sound.c
index 16fdb22ea9e..113b73443c3 100644
--- a/drivers/sound/samsung_sound.c
+++ b/drivers/sound/samsung_sound.c
@@ -13,6 +13,7 @@
 #include <asm/gpio.h>
 #include <asm/arch/power.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 static int samsung_sound_setup(struct udevice *dev)
 {
diff --git a/drivers/sound/sandbox.c b/drivers/sound/sandbox.c
index b1c1fca004f..8528d77b60f 100644
--- a/drivers/sound/sandbox.c
+++ b/drivers/sound/sandbox.c
@@ -14,6 +14,7 @@
 #include <stdbool.h>
 #include <asm/sdl.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 struct sandbox_codec_priv {
 	int interface;
diff --git a/drivers/sound/sound-uclass.c b/drivers/sound/sound-uclass.c
index 86722d23c5c..41ab2440b63 100644
--- a/drivers/sound/sound-uclass.c
+++ b/drivers/sound/sound-uclass.c
@@ -12,6 +12,7 @@
 #include <sound.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #define SOUND_BITS_IN_BYTE 8
 
diff --git a/drivers/sound/sound.c b/drivers/sound/sound.c
index b0eab233916..80b196457b6 100644
--- a/drivers/sound/sound.c
+++ b/drivers/sound/sound.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <log.h>
 #include <sound.h>
+#include <linux/types.h>
 
 void sound_create_square_wave(uint sample_rate, unsigned short *data, int size,
 			      uint freq, uint channels)
diff --git a/drivers/sound/tegra_ahub.c b/drivers/sound/tegra_ahub.c
index 345d9746f25..c3fac7afbc7 100644
--- a/drivers/sound/tegra_ahub.c
+++ b/drivers/sound/tegra_ahub.c
@@ -18,6 +18,7 @@
 #include <asm/arch-tegra/tegra_ahub.h>
 #include <asm/arch-tegra/tegra_i2s.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include "tegra_i2s_priv.h"
 
 struct tegra_ahub_priv {
diff --git a/drivers/sound/tegra_i2s.c b/drivers/sound/tegra_i2s.c
index 7749cd47b70..d3f9b7a11f8 100644
--- a/drivers/sound/tegra_i2s.c
+++ b/drivers/sound/tegra_i2s.c
@@ -15,6 +15,7 @@
 #include <asm/io.h>
 #include <asm/arch-tegra/tegra_i2s.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include "tegra_i2s_priv.h"
 
 int tegra_i2s_set_cif_tx_ctrl(struct udevice *dev, u32 value)
diff --git a/drivers/sound/tegra_i2s_priv.h b/drivers/sound/tegra_i2s_priv.h
index 7cd3fc808c8..96469e025fe 100644
--- a/drivers/sound/tegra_i2s_priv.h
+++ b/drivers/sound/tegra_i2s_priv.h
@@ -7,6 +7,7 @@
 #ifndef __TEGRA_I2S_PRIV_H
 #define __TEGRA_I2S_PRIV_H
 
+#include <asm/types.h>
 enum {
 	/* Set i2s device (in buf) */
 	AHUB_MISCOP_SET_I2S,
diff --git a/drivers/sound/tegra_sound.c b/drivers/sound/tegra_sound.c
index d76448c7e4d..e555bae9522 100644
--- a/drivers/sound/tegra_sound.c
+++ b/drivers/sound/tegra_sound.c
@@ -15,6 +15,7 @@
 #include <sound.h>
 #include <asm/gpio.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include "tegra_i2s_priv.h"
 
 static int tegra_sound_setup(struct udevice *dev)
diff --git a/drivers/sound/wm8994.c b/drivers/sound/wm8994.c
index e8ec0517d15..bcb30696f57 100644
--- a/drivers/sound/wm8994.c
+++ b/drivers/sound/wm8994.c
@@ -19,6 +19,7 @@
 #include <asm/arch/sound.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include "wm8994.h"
 #include "wm8994_registers.h"
 
diff --git a/drivers/spi/altera_spi.c b/drivers/spi/altera_spi.c
index c9ef5a69ea9..450a60abad7 100644
--- a/drivers/spi/altera_spi.c
+++ b/drivers/spi/altera_spi.c
@@ -16,6 +16,7 @@
 #include <time.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
+#include <linux/types.h>
 
 #define ALTERA_SPI_STATUS_RRDY_MSK	BIT(7)
 #define ALTERA_SPI_CONTROL_SSO_MSK	BIT(10)
diff --git a/drivers/spi/atcspi200_spi.c b/drivers/spi/atcspi200_spi.c
index ab60a47945d..5229703e936 100644
--- a/drivers/spi/atcspi200_spi.c
+++ b/drivers/spi/atcspi200_spi.c
@@ -18,6 +18,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/spi/ath79_spi.c b/drivers/spi/ath79_spi.c
index 70bedc7fbe3..f307c44f62b 100644
--- a/drivers/spi/ath79_spi.c
+++ b/drivers/spi/ath79_spi.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <clock_legacy.h>
+#include <compiler.h>
 #include <spi.h>
 #include <dm.h>
 #include <div64.h>
diff --git a/drivers/spi/atmel-quadspi.c b/drivers/spi/atmel-quadspi.c
index c69d7154cb5..fc36a2e05c0 100644
--- a/drivers/spi/atmel-quadspi.c
+++ b/drivers/spi/atmel-quadspi.c
@@ -9,7 +9,9 @@
  * Author: Piotr Bugalski <bugalski.piotr@gmail.com>
  */
 
+#include <compiler.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <vsprintf.h>
 #include <asm/io.h>
 #include <clk.h>
@@ -25,6 +27,7 @@
 #include <linux/iopoll.h>
 #include <linux/ioport.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include <mach/clk.h>
 #include <spi.h>
 #include <spi-mem.h>
diff --git a/drivers/spi/atmel_spi.c b/drivers/spi/atmel_spi.c
index 5e4ae989c18..e5fdb323f86 100644
--- a/drivers/spi/atmel_spi.c
+++ b/drivers/spi/atmel_spi.c
@@ -20,6 +20,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 /*
  * Register definitions for the Atmel AT32/AT91 SPI Controller
diff --git a/drivers/spi/bcm63xx_hsspi.c b/drivers/spi/bcm63xx_hsspi.c
index 6e2c476d281..91acebec950 100644
--- a/drivers/spi/bcm63xx_hsspi.c
+++ b/drivers/spi/bcm63xx_hsspi.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
 #include <malloc.h>
@@ -20,6 +21,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #define HSSPI_PP			0
 
diff --git a/drivers/spi/bcm63xx_spi.c b/drivers/spi/bcm63xx_spi.c
index ac79961a14e..1dd3d6bcf5f 100644
--- a/drivers/spi/bcm63xx_spi.c
+++ b/drivers/spi/bcm63xx_spi.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
 #include <malloc.h>
@@ -18,6 +19,7 @@
 #include <wait_bit.h>
 #include <asm/io.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 /* BCM6348 SPI core */
 #define SPI_6348_CLK			0x06
diff --git a/drivers/spi/bcmstb_spi.c b/drivers/spi/bcmstb_spi.c
index 27ed0203add..bc97c29cecb 100644
--- a/drivers/spi/bcmstb_spi.c
+++ b/drivers/spi/bcmstb_spi.c
@@ -22,6 +22,7 @@
 #include <time.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/spi/cadence_qspi.c b/drivers/spi/cadence_qspi.c
index 4b77a6b4b72..0b2b38d5a9c 100644
--- a/drivers/spi/cadence_qspi.c
+++ b/drivers/spi/cadence_qspi.c
@@ -19,6 +19,7 @@
 #include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/sizes.h>
+#include <linux/types.h>
 #include "cadence_qspi.h"
 
 #define CQSPI_STIG_READ			0
diff --git a/drivers/spi/cadence_qspi.h b/drivers/spi/cadence_qspi.h
index 0ecd461b79a..f697d3d547b 100644
--- a/drivers/spi/cadence_qspi.h
+++ b/drivers/spi/cadence_qspi.h
@@ -9,6 +9,7 @@
 
 #include <reset.h>
 #include <stdbool.h>
+#include <linux/types.h>
 
 #define CQSPI_IS_ADDR(cmd_len)		(cmd_len > 1 ? 1 : 0)
 
diff --git a/drivers/spi/cadence_qspi_apb.c b/drivers/spi/cadence_qspi_apb.c
index dc066f17e3d..10c77552f87 100644
--- a/drivers/spi/cadence_qspi_apb.c
+++ b/drivers/spi/cadence_qspi_apb.c
@@ -40,6 +40,7 @@
 #include <malloc.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "cadence_qspi.h"
 
 #define CQSPI_REG_POLL_US			1 /* 1us */
diff --git a/drivers/spi/cf_spi.c b/drivers/spi/cf_spi.c
index 0a211b37707..d24348bce3c 100644
--- a/drivers/spi/cf_spi.c
+++ b/drivers/spi/cf_spi.c
@@ -25,6 +25,7 @@
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 struct coldfire_spi_priv {
 	struct dspi *regs;
diff --git a/drivers/spi/davinci_spi.c b/drivers/spi/davinci_spi.c
index 4ea77a15051..f4fb5e98d5f 100644
--- a/drivers/spi/davinci_spi.c
+++ b/drivers/spi/davinci_spi.c
@@ -22,6 +22,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 /* SPIGCR0 */
 #define SPIGCR0_SPIENA_MASK	0x1
diff --git a/drivers/spi/designware_spi.c b/drivers/spi/designware_spi.c
index a960c61f350..86b7bd8403f 100644
--- a/drivers/spi/designware_spi.c
+++ b/drivers/spi/designware_spi.c
@@ -10,7 +10,9 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm-generic/gpio.h>
 #include <clk.h>
@@ -27,6 +29,7 @@
 #include <linux/iopoll.h>
 #include <asm/io.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 /* Register offsets */
 #define DW_SPI_CTRL0			0x00
diff --git a/drivers/spi/exynos_spi.c b/drivers/spi/exynos_spi.c
index 400269fa39d..1be1c1a3849 100644
--- a/drivers/spi/exynos_spi.c
+++ b/drivers/spi/exynos_spi.c
@@ -23,6 +23,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/spi/fsl_dspi.c b/drivers/spi/fsl_dspi.c
index b5f7d3e08a7..d3c59f5818a 100644
--- a/drivers/spi/fsl_dspi.c
+++ b/drivers/spi/fsl_dspi.c
@@ -9,6 +9,7 @@
  * Haikun Wang (B53464 at freescale.com)
  */
 
+#include <compiler.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
@@ -29,6 +30,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 /* linux/include/time.h */
 #define NSEC_PER_SEC	1000000000L
diff --git a/drivers/spi/fsl_espi.c b/drivers/spi/fsl_espi.c
index ec500d86184..151525dabf3 100644
--- a/drivers/spi/fsl_espi.c
+++ b/drivers/spi/fsl_espi.c
@@ -17,6 +17,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <malloc.h>
 #include <spi.h>
diff --git a/drivers/spi/fsl_qspi.c b/drivers/spi/fsl_qspi.c
index 314d3f89484..51ad688557c 100644
--- a/drivers/spi/fsl_qspi.c
+++ b/drivers/spi/fsl_qspi.c
@@ -24,7 +24,9 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
@@ -41,6 +43,7 @@
 #include <spi.h>
 #include <spi-mem.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/spi/ich.c b/drivers/spi/ich.c
index bf6cd061b53..45e2869ba26 100644
--- a/drivers/spi/ich.c
+++ b/drivers/spi/ich.c
@@ -22,6 +22,7 @@
 #include <spi_flash.h>
 #include <spi-mem.h>
 #include <spl.h>
+#include <stdbool.h>
 #include <time.h>
 #include <asm/fast_spi.h>
 #include <asm/io.h>
@@ -33,6 +34,7 @@
 #include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "ich.h"
 
diff --git a/drivers/spi/ich.h b/drivers/spi/ich.h
index 23c7827740b..90c26854119 100644
--- a/drivers/spi/ich.h
+++ b/drivers/spi/ich.h
@@ -8,7 +8,9 @@
 #ifndef _ICH_H_
 #define _ICH_H_
 
+#include <compiler.h>
 #include <linux/bitops.h>
+#include <linux/types.h>
 struct ich7_spi_regs {
 	uint16_t spis;
 	uint16_t spic;
diff --git a/drivers/spi/kirkwood_spi.c b/drivers/spi/kirkwood_spi.c
index a127135323d..67154db6a79 100644
--- a/drivers/spi/kirkwood_spi.c
+++ b/drivers/spi/kirkwood_spi.c
@@ -20,6 +20,7 @@
 #include <asm/arch/mpp.h>
 #endif
 #include <asm/arch-mvebu/spi.h>
+#include <linux/types.h>
 
 struct mvebu_spi_dev {
 	bool			is_errata_50mhz_ac;
diff --git a/drivers/spi/meson_spifc.c b/drivers/spi/meson_spifc.c
index f61bcd5e2de..e8573f9b652 100644
--- a/drivers/spi/meson_spifc.c
+++ b/drivers/spi/meson_spifc.c
@@ -14,12 +14,14 @@
 #include <dm.h>
 #include <regmap.h>
 #include <errno.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <linux/bitfield.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /* register map */
 #define REG_CMD			0x00
diff --git a/drivers/spi/mpc8xx_spi.c b/drivers/spi/mpc8xx_spi.c
index df1489a1e02..571964fdbb3 100644
--- a/drivers/spi/mpc8xx_spi.c
+++ b/drivers/spi/mpc8xx_spi.c
@@ -17,12 +17,14 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <mpc8xx.h>
 #include <spi.h>
 #include <stdio.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #include <asm/cpm_8xx.h>
 #include <asm/io.h>
diff --git a/drivers/spi/mpc8xxx_spi.c b/drivers/spi/mpc8xxx_spi.c
index f5ceeaac97d..6ef0a6c0e41 100644
--- a/drivers/spi/mpc8xxx_spi.c
+++ b/drivers/spi/mpc8xxx_spi.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <spi.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <asm/mpc8xxx_spi.h>
@@ -20,6 +21,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 enum {
 	SPI_EV_NE = BIT(31 - 22),	/* Receiver Not Empty */
diff --git a/drivers/spi/mscc_bb_spi.c b/drivers/spi/mscc_bb_spi.c
index 0e6e1bf0143..1dd61d652a3 100644
--- a/drivers/spi/mscc_bb_spi.c
+++ b/drivers/spi/mscc_bb_spi.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
@@ -15,6 +16,7 @@
 #include <stdbool.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 
diff --git a/drivers/spi/mt7621_spi.c b/drivers/spi/mt7621_spi.c
index f4b5ad89245..f8be2980cdb 100644
--- a/drivers/spi/mt7621_spi.c
+++ b/drivers/spi/mt7621_spi.c
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
 #include <spi.h>
@@ -20,6 +21,7 @@
 #include <linux/io.h>
 #include <linux/kernel.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 #define MT7621_RX_FIFO_LEN	32
 #define MT7621_TX_FIFO_LEN	36
diff --git a/drivers/spi/mtk_snfi_spi.c b/drivers/spi/mtk_snfi_spi.c
index 07a178a8785..61b725658c1 100644
--- a/drivers/spi/mtk_snfi_spi.c
+++ b/drivers/spi/mtk_snfi_spi.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <dm.h>
 #include <errno.h>
 #include <spi.h>
@@ -20,6 +21,7 @@
 #include <linux/io.h>
 #include <linux/iopoll.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define SNFI_MAC_CTL			0x500
 #define MAC_XIO_SEL			BIT(4)
diff --git a/drivers/spi/mvebu_a3700_spi.c b/drivers/spi/mvebu_a3700_spi.c
index f3e28d0ed69..7f4033295dc 100644
--- a/drivers/spi/mvebu_a3700_spi.c
+++ b/drivers/spi/mvebu_a3700_spi.c
@@ -17,6 +17,7 @@
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/spi/mxc_spi.c b/drivers/spi/mxc_spi.c
index db1673fa57d..f5e772ba0ff 100644
--- a/drivers/spi/mxc_spi.c
+++ b/drivers/spi/mxc_spi.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
 #include <malloc.h>
@@ -23,6 +24,7 @@
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/spi/mxs_spi.c b/drivers/spi/mxs_spi.c
index abc7f014d7d..32325bec094 100644
--- a/drivers/spi/mxs_spi.c
+++ b/drivers/spi/mxs_spi.c
@@ -32,6 +32,7 @@
 #include <asm/mach-imx/dma.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define	MXS_SPI_MAX_TIMEOUT	1000000
 #define	MXS_SPI_PORT_OFFSET	0x2000
diff --git a/drivers/spi/nxp_fspi.c b/drivers/spi/nxp_fspi.c
index fc75913022b..874dac8aaeb 100644
--- a/drivers/spi/nxp_fspi.c
+++ b/drivers/spi/nxp_fspi.c
@@ -14,6 +14,9 @@
  * data lines).
  *
  * FlexSPI controller is driven by the LUT(Look-up Table) registers
+#include <compiler.h>
+#include <stdbool.h>
+#include <linux/types.h>
  * LUT registers are a look-up-table for sequences of instructions.
  * A valid sequence consists of four LUT registers.
  * Maximum 32 LUT sequences can be programmed simultaneously.
diff --git a/drivers/spi/omap3_spi.c b/drivers/spi/omap3_spi.c
index 3cee5a7fccd..0385b79702e 100644
--- a/drivers/spi/omap3_spi.c
+++ b/drivers/spi/omap3_spi.c
@@ -25,6 +25,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/spi/pic32_spi.c b/drivers/spi/pic32_spi.c
index e1fc5257839..faff7cf5b1b 100644
--- a/drivers/spi/pic32_spi.c
+++ b/drivers/spi/pic32_spi.c
@@ -19,6 +19,7 @@
 #include <spi.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include <asm/types.h>
 #include <asm/io.h>
diff --git a/drivers/spi/pl022_spi.c b/drivers/spi/pl022_spi.c
index 5618ab21638..3e50daecc4b 100644
--- a/drivers/spi/pl022_spi.c
+++ b/drivers/spi/pl022_spi.c
@@ -12,6 +12,7 @@
 #include <clk.h>
 #include <common.h>
 #include <dm.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 #include <dm/platform_data/spi_pl022.h>
 #include <linux/errno.h>
@@ -19,6 +20,7 @@
 #include <spi.h>
 #include <linux/kernel.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 #define SSP_CR0		0x000
 #define SSP_CR1		0x004
diff --git a/drivers/spi/renesas_rpc_spi.c b/drivers/spi/renesas_rpc_spi.c
index 95fcb5723f2..8566b70d82e 100644
--- a/drivers/spi/renesas_rpc_spi.c
+++ b/drivers/spi/renesas_rpc_spi.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
@@ -21,6 +22,7 @@
 #include <wait_bit.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define RPC_CMNCR		0x0000	/* R/W */
 #define RPC_CMNCR_MD		BIT(31)
diff --git a/drivers/spi/rk_spi.c b/drivers/spi/rk_spi.c
index ec998eda082..677c80253d6 100644
--- a/drivers/spi/rk_spi.c
+++ b/drivers/spi/rk_spi.c
@@ -17,6 +17,7 @@
 #include <errno.h>
 #include <log.h>
 #include <spi.h>
+#include <stdbool.h>
 #include <time.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
@@ -25,6 +26,7 @@
 #include <asm/arch-rockchip/periph.h>
 #include <dm/pinctrl.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include "rk_spi.h"
 
 /* Change to 1 to output registers at the start of each transaction */
diff --git a/drivers/spi/rk_spi.h b/drivers/spi/rk_spi.h
index 2e0d1eeb9fd..6a46fbfac7b 100644
--- a/drivers/spi/rk_spi.h
+++ b/drivers/spi/rk_spi.h
@@ -11,6 +11,7 @@
 #ifndef __RK_SPI_H
 #define __RK_SPI_H
 
+#include <asm/types.h>
 struct rockchip_spi {
 	u32 ctrlr0;
 	u32 ctrlr1;
diff --git a/drivers/spi/sandbox_spi.c b/drivers/spi/sandbox_spi.c
index 7e08bf9dc54..b97a9e27994 100644
--- a/drivers/spi/sandbox_spi.c
+++ b/drivers/spi/sandbox_spi.c
@@ -11,6 +11,7 @@
 #define LOG_CATEGORY UCLASS_SPI
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
 #include <malloc.h>
@@ -19,6 +20,7 @@
 #include <os.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/types.h>
 
 #include <linux/errno.h>
 #include <asm/spi.h>
diff --git a/drivers/spi/sh_qspi.c b/drivers/spi/sh_qspi.c
index bf3a7bf919c..f6574c23552 100644
--- a/drivers/spi/sh_qspi.c
+++ b/drivers/spi/sh_qspi.c
@@ -16,6 +16,7 @@
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 /* SH QSPI register bit masks <REG>_<BIT> */
 #define SPCR_MSTR	0x08
diff --git a/drivers/spi/soft_spi.c b/drivers/spi/soft_spi.c
index 9818ecb4c18..e363b988718 100644
--- a/drivers/spi/soft_spi.c
+++ b/drivers/spi/soft_spi.c
@@ -21,6 +21,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/spi/spi-mem-nodm.c b/drivers/spi/spi-mem-nodm.c
index 6cc908dcdf8..9c5de165d49 100644
--- a/drivers/spi/spi-mem-nodm.c
+++ b/drivers/spi/spi-mem-nodm.c
@@ -7,6 +7,7 @@
 #include <malloc.h>
 #include <spi.h>
 #include <spi-mem.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
diff --git a/drivers/spi/spi-mem.c b/drivers/spi/spi-mem.c
index 4081a50eaaf..369bf5962f7 100644
--- a/drivers/spi/spi-mem.c
+++ b/drivers/spi/spi-mem.c
@@ -13,6 +13,8 @@
 #include <linux/pm_runtime.h>
 #include "internals.h"
 #else
+#include <stdbool.h>
+#include <asm/types.h>
 #include <dm/device_compat.h>
 #include <spi.h>
 #include <spi-mem.h>
diff --git a/drivers/spi/spi-sifive.c b/drivers/spi/spi-sifive.c
index cf94407759e..9b5869b132f 100644
--- a/drivers/spi/spi-sifive.c
+++ b/drivers/spi/spi-sifive.c
@@ -20,6 +20,7 @@
 #include <linux/log2.h>
 #include <clk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define SIFIVE_SPI_MAX_CS		32
 
diff --git a/drivers/spi/spi-sunxi.c b/drivers/spi/spi-sunxi.c
index 80c406d7b36..d5ab0703ae8 100644
--- a/drivers/spi/spi-sunxi.c
+++ b/drivers/spi/spi-sunxi.c
@@ -26,6 +26,7 @@
 #include <errno.h>
 #include <fdt_support.h>
 #include <reset.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <wait_bit.h>
 #include <asm/global_data.h>
@@ -33,6 +34,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include <asm/bitops.h>
 #include <asm/gpio.h>
diff --git a/drivers/spi/spi-uclass.c b/drivers/spi/spi-uclass.c
index 6d397f2ebd2..6899b4d066e 100644
--- a/drivers/spi/spi-uclass.c
+++ b/drivers/spi/spi-uclass.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <spi.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <dm/device-internal.h>
@@ -17,6 +18,7 @@
 #include <dm/util.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 7662932d40a..bc2079a9266 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -8,6 +8,7 @@
 #include <malloc.h>
 #include <spi.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/string.h>
 
 int spi_set_wordlen(struct spi_slave *slave, unsigned int wordlen)
diff --git a/drivers/spi/stm32_qspi.c b/drivers/spi/stm32_qspi.c
index e18e599e3b0..989f254438a 100644
--- a/drivers/spi/stm32_qspi.c
+++ b/drivers/spi/stm32_qspi.c
@@ -9,9 +9,11 @@
 
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <log.h>
 #include <reset.h>
 #include <spi-mem.h>
+#include <stdbool.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
@@ -21,6 +23,7 @@
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/sizes.h>
+#include <linux/types.h>
 
 struct stm32_qspi_regs {
 	u32 cr;		/* 0x00 */
diff --git a/drivers/spi/stm32_spi.c b/drivers/spi/stm32_spi.c
index 635ead98dbd..5887aa8f61e 100644
--- a/drivers/spi/stm32_spi.c
+++ b/drivers/spi/stm32_spi.c
@@ -6,18 +6,21 @@
  */
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
 #include <malloc.h>
 #include <reset.h>
 #include <spi.h>
+#include <stdbool.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 #include <asm/io.h>
 #include <asm/gpio.h>
diff --git a/drivers/spi/tegra114_spi.c b/drivers/spi/tegra114_spi.c
index 1b7246af258..a40a468002d 100644
--- a/drivers/spi/tegra114_spi.c
+++ b/drivers/spi/tegra114_spi.c
@@ -16,6 +16,7 @@
 #include <spi.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 #include "tegra_spi.h"
 
 /* COMMAND1 */
diff --git a/drivers/spi/tegra20_sflash.c b/drivers/spi/tegra20_sflash.c
index 7be4efd35c6..34663ced764 100644
--- a/drivers/spi/tegra20_sflash.c
+++ b/drivers/spi/tegra20_sflash.c
@@ -22,6 +22,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include "tegra_spi.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/spi/tegra20_slink.c b/drivers/spi/tegra20_slink.c
index 64485de5d32..2d3616b2ce7 100644
--- a/drivers/spi/tegra20_slink.c
+++ b/drivers/spi/tegra20_slink.c
@@ -18,6 +18,7 @@
 #include <fdtdec.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 #include "tegra_spi.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/spi/tegra210_qspi.c b/drivers/spi/tegra210_qspi.c
index 19e50919f6d..08d87adb1b6 100644
--- a/drivers/spi/tegra210_qspi.c
+++ b/drivers/spi/tegra210_qspi.c
@@ -20,6 +20,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "tegra_spi.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/spi/tegra_spi.h b/drivers/spi/tegra_spi.h
index e997d668cde..93195abb1ea 100644
--- a/drivers/spi/tegra_spi.h
+++ b/drivers/spi/tegra_spi.h
@@ -3,6 +3,7 @@
  * (C) Copyright 2014 Google, Inc
  */
 
+#include <linux/types.h>
 struct tegra_spi_platdata {
 	enum periph_id periph_id;
 	int frequency;		/* Default clock frequency, -1 for none */
diff --git a/drivers/spi/ti_qspi.c b/drivers/spi/ti_qspi.c
index 9fecdb20f73..cbbe93f9d50 100644
--- a/drivers/spi/ti_qspi.c
+++ b/drivers/spi/ti_qspi.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
@@ -27,6 +28,7 @@
 #include <linux/kernel.h>
 #include <regmap.h>
 #include <syscon.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/spi/uniphier_spi.c b/drivers/spi/uniphier_spi.c
index 22cf974a905..cc4e20ce1eb 100644
--- a/drivers/spi/uniphier_spi.c
+++ b/drivers/spi/uniphier_spi.c
@@ -6,6 +6,7 @@
 
 #include <clk.h>
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
 #include <time.h>
@@ -20,6 +21,7 @@
 #include <wait_bit.h>
 #include <linux/kernel.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/spi/xilinx_spi.c b/drivers/spi/xilinx_spi.c
index 6b1cea4519e..3ccefd87a11 100644
--- a/drivers/spi/xilinx_spi.c
+++ b/drivers/spi/xilinx_spi.c
@@ -23,6 +23,7 @@
 #include <asm/io.h>
 #include <wait_bit.h>
 #include <linux/bitops.h>
+#include <linux/types.h>
 
 /*
  * [0]: http://www.xilinx.com/support/documentation
diff --git a/drivers/spi/zynq_qspi.c b/drivers/spi/zynq_qspi.c
index a95558139d8..4ae439a1238 100644
--- a/drivers/spi/zynq_qspi.c
+++ b/drivers/spi/zynq_qspi.c
@@ -18,6 +18,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/spi/zynq_spi.c b/drivers/spi/zynq_spi.c
index bbac203e0dd..bc12da9bccf 100644
--- a/drivers/spi/zynq_spi.c
+++ b/drivers/spi/zynq_spi.c
@@ -17,6 +17,7 @@
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/spi/zynqmp_gqspi.c b/drivers/spi/zynqmp_gqspi.c
index de988f4e975..aa69cb17bf9 100644
--- a/drivers/spi/zynqmp_gqspi.c
+++ b/drivers/spi/zynqmp_gqspi.c
@@ -26,6 +26,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define GQSPI_GFIFO_STRT_MODE_MASK	BIT(29)
 #define GQSPI_CONFIG_MODE_EN_MASK	(3 << 30)
diff --git a/drivers/spmi/spmi-msm.c b/drivers/spmi/spmi-msm.c
index 9212449a7ee..8f73fd7e449 100644
--- a/drivers/spmi/spmi-msm.c
+++ b/drivers/spmi/spmi-msm.c
@@ -17,6 +17,7 @@
 #include <asm/io.h>
 #include <dm/device_compat.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <spmi/spmi.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/spmi/spmi-sandbox.c b/drivers/spmi/spmi-sandbox.c
index e2f6fc17e71..d58c5684b68 100644
--- a/drivers/spmi/spmi-sandbox.c
+++ b/drivers/spmi/spmi-sandbox.c
@@ -12,6 +12,7 @@
 #include <errno.h>
 #include <stdbool.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <spmi/spmi.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
diff --git a/drivers/spmi/spmi-uclass.c b/drivers/spmi/spmi-uclass.c
index fc8252fbc91..0126f9dd75f 100644
--- a/drivers/spmi/spmi-uclass.c
+++ b/drivers/spmi/spmi-uclass.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <spmi/spmi.h>
 #include <linux/ctype.h>
 
diff --git a/drivers/sysreset/sysreset-uclass.c b/drivers/sysreset/sysreset-uclass.c
index 015b938b1b7..6453d53a979 100644
--- a/drivers/sysreset/sysreset-uclass.c
+++ b/drivers/sysreset/sysreset-uclass.c
@@ -23,6 +23,7 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 int sysreset_request(struct udevice *dev, enum sysreset_t type)
 {
diff --git a/drivers/sysreset/sysreset_ast.c b/drivers/sysreset/sysreset_ast.c
index f93eea629df..46e6565191b 100644
--- a/drivers/sysreset/sysreset_ast.c
+++ b/drivers/sysreset/sysreset_ast.c
@@ -11,6 +11,7 @@
 #include <wdt.h>
 #include <asm/io.h>
 #include <asm/arch/wdt.h>
+#include <asm/types.h>
 #include <linux/err.h>
 #include <linux/errno.h>
 
diff --git a/drivers/sysreset/sysreset_mpc83xx.c b/drivers/sysreset/sysreset_mpc83xx.c
index 0027efd4864..2620e7402e9 100644
--- a/drivers/sysreset/sysreset_mpc83xx.c
+++ b/drivers/sysreset/sysreset_mpc83xx.c
@@ -8,6 +8,7 @@
 #include <command.h>
 #include <dm.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <sysreset.h>
 #include <vsprintf.h>
@@ -16,6 +17,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include "sysreset_mpc83xx.h"
 
diff --git a/drivers/sysreset/sysreset_octeon.c b/drivers/sysreset/sysreset_octeon.c
index 963ec20dc0b..1005227c6bf 100644
--- a/drivers/sysreset/sysreset_octeon.c
+++ b/drivers/sysreset/sysreset_octeon.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <errno.h>
 #include <sysreset.h>
diff --git a/drivers/sysreset/sysreset_socfpga.c b/drivers/sysreset/sysreset_socfpga.c
index c348649cedf..8f8f6411a8a 100644
--- a/drivers/sysreset/sysreset_socfpga.c
+++ b/drivers/sysreset/sysreset_socfpga.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <errno.h>
 #include <sysreset.h>
diff --git a/drivers/sysreset/sysreset_sti.c b/drivers/sysreset/sysreset_sti.c
index 26431ee129b..b4e5c58b45a 100644
--- a/drivers/sysreset/sysreset_sti.c
+++ b/drivers/sysreset/sysreset_sti.c
@@ -5,12 +5,14 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <regmap.h>
 #include <syscon.h>
 #include <sysreset.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
diff --git a/drivers/sysreset/sysreset_syscon.c b/drivers/sysreset/sysreset_syscon.c
index e6e98b383ee..492f2c50c05 100644
--- a/drivers/sysreset/sysreset_syscon.c
+++ b/drivers/sysreset/sysreset_syscon.c
@@ -16,6 +16,7 @@
 #include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 struct syscon_reboot_priv {
 	struct regmap *regmap;
diff --git a/drivers/sysreset/sysreset_x86.c b/drivers/sysreset/sysreset_x86.c
index 0ab2b543abd..5285696780a 100644
--- a/drivers/sysreset/sysreset_x86.c
+++ b/drivers/sysreset/sysreset_x86.c
@@ -13,6 +13,7 @@
 #include <acpi/acpi_s3.h>
 #include <asm/io.h>
 #include <asm/processor.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 
 struct x86_sysreset_platdata {
diff --git a/drivers/tee/broadcom/chimp_optee.c b/drivers/tee/broadcom/chimp_optee.c
index 545bb3fe222..82c77871a0b 100644
--- a/drivers/tee/broadcom/chimp_optee.c
+++ b/drivers/tee/broadcom/chimp_optee.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <string.h>
 #include <tee.h>
+#include <asm/types.h>
 #include <broadcom/chimp.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
diff --git a/drivers/tee/optee/core.c b/drivers/tee/optee/core.c
index fb656bed92f..dd9649bd93d 100644
--- a/drivers/tee/optee/core.c
+++ b/drivers/tee/optee/core.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <tee.h>
 #include <linux/arm-smccc.h>
 #include <linux/err.h>
@@ -14,6 +15,7 @@
 #include <linux/io.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "optee_smc.h"
 #include "optee_msg.h"
diff --git a/drivers/tee/optee/optee_private.h b/drivers/tee/optee/optee_private.h
index 9442d1c176b..eca0f7821fc 100644
--- a/drivers/tee/optee/optee_private.h
+++ b/drivers/tee/optee/optee_private.h
@@ -8,6 +8,7 @@
 
 #include <tee.h>
 #include <log.h>
+#include <linux/types.h>
 
 /**
  * struct optee_private - OP-TEE driver private data
diff --git a/drivers/tee/optee/optee_smc.h b/drivers/tee/optee/optee_smc.h
index ba8a43d5c09..4fc9c0ec862 100644
--- a/drivers/tee/optee/optee_smc.h
+++ b/drivers/tee/optee/optee_smc.h
@@ -7,6 +7,7 @@
 #define OPTEE_SMC_H
 
 #include <stdbool.h>
+#include <asm/types.h>
 #include <linux/arm-smccc.h>
 #include <linux/bitops.h>
 
diff --git a/drivers/tee/optee/rpmb.c b/drivers/tee/optee/rpmb.c
index a9ea53854fc..bb8f96d1ad5 100644
--- a/drivers/tee/optee/rpmb.c
+++ b/drivers/tee/optee/rpmb.c
@@ -10,6 +10,7 @@
 #include <mmc.h>
 #include <dm/device_compat.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include "optee_msg.h"
 #include "optee_private.h"
diff --git a/drivers/tee/sandbox.c b/drivers/tee/sandbox.c
index 3a5d106f956..3b714e91c00 100644
--- a/drivers/tee/sandbox.c
+++ b/drivers/tee/sandbox.c
@@ -10,6 +10,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <tee/optee_ta_avb.h>
 
 /*
diff --git a/drivers/tee/tee-uclass.c b/drivers/tee/tee-uclass.c
index 1dc806db89b..f08b9a70f32 100644
--- a/drivers/tee/tee-uclass.c
+++ b/drivers/tee/tee-uclass.c
@@ -13,6 +13,7 @@
 #include <dm/uclass-internal.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /**
  * struct tee_uclass_priv - information of a TEE, stored by the uclass
diff --git a/drivers/thermal/imx_scu_thermal.c b/drivers/thermal/imx_scu_thermal.c
index 6b822f18854..81c0abdbcde 100644
--- a/drivers/thermal/imx_scu_thermal.c
+++ b/drivers/thermal/imx_scu_thermal.c
@@ -19,6 +19,7 @@
 #include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/thermal/imx_thermal.c b/drivers/thermal/imx_thermal.c
index 812c2ec07c3..e0ec5f60620 100644
--- a/drivers/thermal/imx_thermal.c
+++ b/drivers/thermal/imx_thermal.c
@@ -17,6 +17,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <malloc.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/math64.h>
diff --git a/drivers/thermal/imx_tmu.c b/drivers/thermal/imx_tmu.c
index 8a67d9aa58c..f0094d4521a 100644
--- a/drivers/thermal/imx_tmu.c
+++ b/drivers/thermal/imx_tmu.c
@@ -4,6 +4,7 @@
  *
  */
 
+#include <compiler.h>
 #include <config.h>
 #include <common.h>
 #include <stdbool.h>
@@ -21,6 +22,7 @@
 #include <thermal.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/thermal/ti-bandgap.c b/drivers/thermal/ti-bandgap.c
index 8b332f116c3..160557321be 100644
--- a/drivers/thermal/ti-bandgap.c
+++ b/drivers/thermal/ti-bandgap.c
@@ -20,6 +20,7 @@
 #include <asm/io.h>
 #include <dm.h>
 #include <thermal.h>
+#include <linux/types.h>
 
 #define CTRL_CORE_TEMP_SENSOR_MPU	0
 #define DRA752_ADC_START_VALUE		540
diff --git a/drivers/timer/ag101p_timer.c b/drivers/timer/ag101p_timer.c
index c011906b938..7d0eae96b75 100644
--- a/drivers/timer/ag101p_timer.c
+++ b/drivers/timer/ag101p_timer.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <timer.h>
+#include <asm/types.h>
 #include <linux/io.h>
 
 /*
diff --git a/drivers/timer/altera_timer.c b/drivers/timer/altera_timer.c
index 6cb2923e0b6..08407a48ef6 100644
--- a/drivers/timer/altera_timer.c
+++ b/drivers/timer/altera_timer.c
@@ -12,6 +12,7 @@
 #include <errno.h>
 #include <timer.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 
 /* control register */
diff --git a/drivers/timer/arc_timer.c b/drivers/timer/arc_timer.c
index 592b196cbbc..d5ce91b6df7 100644
--- a/drivers/timer/arc_timer.c
+++ b/drivers/timer/arc_timer.c
@@ -11,6 +11,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/timer/atcpit100_timer.c b/drivers/timer/atcpit100_timer.c
index 5d4ae685092..ad57a513f79 100644
--- a/drivers/timer/atcpit100_timer.c
+++ b/drivers/timer/atcpit100_timer.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <timer.h>
+#include <asm/types.h>
 #include <linux/io.h>
 
 #define REG32_TMR(x)	(*(u32 *)	((plat->regs) + (x>>2)))
diff --git a/drivers/timer/atmel_pit_timer.c b/drivers/timer/atmel_pit_timer.c
index 07459d9c26b..4f5d895a38a 100644
--- a/drivers/timer/atmel_pit_timer.c
+++ b/drivers/timer/atmel_pit_timer.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #define AT91_PIT_VALUE		0xfffff
 #define AT91_PIT_PITEN		BIT(24)		/* Timer Enabled */
diff --git a/drivers/timer/cadence-ttc.c b/drivers/timer/cadence-ttc.c
index 1ad3b5db8fe..6be6b20f173 100644
--- a/drivers/timer/cadence-ttc.c
+++ b/drivers/timer/cadence-ttc.c
@@ -13,6 +13,7 @@
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/err.h>
+#include <linux/types.h>
 
 #define CNT_CNTRL_RESET		BIT(4)
 
diff --git a/drivers/timer/mpc83xx_timer.c b/drivers/timer/mpc83xx_timer.c
index 700b4097373..33f49c129de 100644
--- a/drivers/timer/mpc83xx_timer.c
+++ b/drivers/timer/mpc83xx_timer.c
@@ -19,6 +19,7 @@
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/timer/mtk_timer.c b/drivers/timer/mtk_timer.c
index 7aec7a7d59e..9d41739dac2 100644
--- a/drivers/timer/mtk_timer.c
+++ b/drivers/timer/mtk_timer.c
@@ -8,9 +8,11 @@
 
 #include <clk.h>
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <timer.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 
diff --git a/drivers/timer/nomadik-mtu-timer.c b/drivers/timer/nomadik-mtu-timer.c
index 5d5eadc47d7..c50db9b273b 100644
--- a/drivers/timer/nomadik-mtu-timer.c
+++ b/drivers/timer/nomadik-mtu-timer.c
@@ -16,6 +16,7 @@
 #include <dm.h>
 #include <timer.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 
diff --git a/drivers/timer/rockchip_timer.c b/drivers/timer/rockchip_timer.c
index 20dddd53e4f..b49ac1b419b 100644
--- a/drivers/timer/rockchip_timer.c
+++ b/drivers/timer/rockchip_timer.c
@@ -16,6 +16,7 @@
 #include <timer.h>
 #include <asm/io.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/timer/sti-timer.c b/drivers/timer/sti-timer.c
index 2278b049354..8e43f47a307 100644
--- a/drivers/timer/sti-timer.c
+++ b/drivers/timer/sti-timer.c
@@ -10,6 +10,7 @@
 #include <timer.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #include <asm/io.h>
 #include <asm/arch-armv7/globaltimer.h>
diff --git a/drivers/timer/stm32_timer.c b/drivers/timer/stm32_timer.c
index 96749c8a64f..08d8470c278 100644
--- a/drivers/timer/stm32_timer.c
+++ b/drivers/timer/stm32_timer.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <fdtdec.h>
 #include <timer.h>
+#include <asm/types.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
diff --git a/drivers/timer/timer-uclass.c b/drivers/timer/timer-uclass.c
index 7dea5b32637..4f2d84c6420 100644
--- a/drivers/timer/timer-uclass.c
+++ b/drivers/timer/timer-uclass.c
@@ -16,6 +16,7 @@
 #include <timer.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/timer/tsc_timer.c b/drivers/timer/tsc_timer.c
index e3cb7e4fe7e..e93eced4873 100644
--- a/drivers/timer/tsc_timer.c
+++ b/drivers/timer/tsc_timer.c
@@ -12,6 +12,7 @@
 #include <dm.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <time.h>
 #include <timer.h>
 #include <vsprintf.h>
@@ -25,6 +26,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #define MAX_NUM_FREQS	9
 
diff --git a/drivers/tpm/cr50_i2c.c b/drivers/tpm/cr50_i2c.c
index 6fbde9f2553..ddb5a21e772 100644
--- a/drivers/tpm/cr50_i2c.c
+++ b/drivers/tpm/cr50_i2c.c
@@ -13,6 +13,7 @@
 #include <irq.h>
 #include <log.h>
 #include <spl.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <tpm-v2.h>
@@ -25,6 +26,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 enum {
 	TIMEOUT_INIT_MS		= 30000, /* Very long timeout for TPM init */
diff --git a/drivers/tpm/tpm-uclass.c b/drivers/tpm/tpm-uclass.c
index 23400235a4c..b52aa66d5ad 100644
--- a/drivers/tpm/tpm-uclass.c
+++ b/drivers/tpm/tpm-uclass.c
@@ -11,6 +11,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <linux/unaligned/be_byteshift.h>
 #include <tpm-v1.h>
 #include <tpm-v2.h>
diff --git a/drivers/tpm/tpm2_ftpm_tee.c b/drivers/tpm/tpm2_ftpm_tee.c
index 249cf11beff..58036c9f59b 100644
--- a/drivers/tpm/tpm2_ftpm_tee.c
+++ b/drivers/tpm/tpm2_ftpm_tee.c
@@ -21,6 +21,7 @@
 #include <vsprintf.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "tpm_tis.h"
 #include "tpm2_ftpm_tee.h"
diff --git a/drivers/tpm/tpm2_ftpm_tee.h b/drivers/tpm/tpm2_ftpm_tee.h
index 44f9598c28a..3c3b2844343 100644
--- a/drivers/tpm/tpm2_ftpm_tee.h
+++ b/drivers/tpm/tpm2_ftpm_tee.h
@@ -7,6 +7,7 @@
 #define __TPM2_FTPM_TEE_H__
 
 /* This UUID is generated with uuidgen */
+#include <asm/types.h>
 #define TA_FTPM_UUID { 0xBC50D971, 0xD4C9, 0x42C4, \
 	{0x82, 0xCB, 0x34, 0x3F, 0xB7, 0xF3, 0x78, 0x96} }
 
diff --git a/drivers/tpm/tpm2_tis_sandbox.c b/drivers/tpm/tpm2_tis_sandbox.c
index f9d1205d321..4b3853f45ce 100644
--- a/drivers/tpm/tpm2_tis_sandbox.c
+++ b/drivers/tpm/tpm2_tis_sandbox.c
@@ -15,6 +15,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <u-boot/crc.h>
 
 /* Hierarchies */
diff --git a/drivers/tpm/tpm2_tis_spi.c b/drivers/tpm/tpm2_tis_spi.c
index 48b59f8c36f..47668152401 100644
--- a/drivers/tpm/tpm2_tis_spi.c
+++ b/drivers/tpm/tpm2_tis_spi.c
@@ -18,6 +18,7 @@
 #include <fdtdec.h>
 #include <log.h>
 #include <spi.h>
+#include <stdbool.h>
 #include <time.h>
 #include <tpm-v2.h>
 #include <vsprintf.h>
diff --git a/drivers/tpm/tpm_atmel_twi.c b/drivers/tpm/tpm_atmel_twi.c
index c8b597d43cc..7cf1d494f16 100644
--- a/drivers/tpm/tpm_atmel_twi.c
+++ b/drivers/tpm/tpm_atmel_twi.c
@@ -15,6 +15,7 @@
 #include <asm/unaligned.h>
 #include <linux/delay.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "tpm_internal.h"
 
diff --git a/drivers/tpm/tpm_internal.h b/drivers/tpm/tpm_internal.h
index 787cc6bf281..b3275d0ca17 100644
--- a/drivers/tpm/tpm_internal.h
+++ b/drivers/tpm/tpm_internal.h
@@ -6,6 +6,7 @@
 #ifndef __tpm_internal_h
 #define __tpm_internal_h
 
+#include <asm/types.h>
 enum {
 	TPM_MAX_ORDINAL			= 243,
 	TPM_MAX_PROTECTED_ORDINAL	= 12,
diff --git a/drivers/tpm/tpm_tis.h b/drivers/tpm/tpm_tis.h
index 2a160fe05c9..c38fa2e544d 100644
--- a/drivers/tpm/tpm_tis.h
+++ b/drivers/tpm/tpm_tis.h
@@ -18,6 +18,7 @@
 #ifndef _TPM_TIS_I2C_H
 #define _TPM_TIS_I2C_H
 
+#include <compiler.h>
 #include <linux/compiler.h>
 #include <linux/types.h>
 
diff --git a/drivers/tpm/tpm_tis_lpc.c b/drivers/tpm/tpm_tis_lpc.c
index 9b81ec98aa8..9bc57c56ea4 100644
--- a/drivers/tpm/tpm_tis_lpc.c
+++ b/drivers/tpm/tpm_tis_lpc.c
@@ -24,6 +24,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define PREFIX "lpc_tpm: "
 
diff --git a/drivers/tpm/tpm_tis_sandbox.c b/drivers/tpm/tpm_tis_sandbox.c
index 433b21d49e7..ffdd86fbd8d 100644
--- a/drivers/tpm/tpm_tis_sandbox.c
+++ b/drivers/tpm/tpm_tis_sandbox.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <display_options.h>
 #include <dm.h>
 #include <stdbool.h>
@@ -14,6 +15,7 @@
 #include <asm/unaligned.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <u-boot/crc.h>
 
 /* TPM NVRAM location indices. */
diff --git a/drivers/ufs/cdns-platform.c b/drivers/ufs/cdns-platform.c
index 1a7bb7bed8a..52c267acbea 100644
--- a/drivers/ufs/cdns-platform.c
+++ b/drivers/ufs/cdns-platform.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <dm.h>
 #include <ufs.h>
+#include <asm/types.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/err.h>
diff --git a/drivers/ufs/ti-j721e-ufs.c b/drivers/ufs/ti-j721e-ufs.c
index d875269760c..ca9d7dbdec7 100644
--- a/drivers/ufs/ti-j721e-ufs.c
+++ b/drivers/ufs/ti-j721e-ufs.c
@@ -3,10 +3,12 @@
  * Copyright (C) 2019 Texas Instruments Incorporated - http://www.ti.com/
  */
 
+#include <compiler.h>
 #include <asm/io.h>
 #include <clk.h>
 #include <common.h>
 #include <dm.h>
+#include <asm/types.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/err.h>
diff --git a/drivers/ufs/ufs.c b/drivers/ufs/ufs.c
index 17c223ed76b..fb97c69d529 100644
--- a/drivers/ufs/ufs.c
+++ b/drivers/ufs/ufs.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <dm/device_compat.h>
@@ -26,6 +27,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <linux/dma-mapping.h>
 
diff --git a/drivers/ufs/ufs.h b/drivers/ufs/ufs.h
index 89fa47eddef..82f9e038182 100644
--- a/drivers/ufs/ufs.h
+++ b/drivers/ufs/ufs.h
@@ -2,9 +2,11 @@
 #ifndef __UFS_H
 #define __UFS_H
 
+#include <compiler.h>
 #include <stdbool.h>
 #include <asm/io.h>
 #include <dm.h>
+#include <linux/types.h>
 
 #include "unipro.h"
 
diff --git a/drivers/usb/cdns3/cdns3-ti.c b/drivers/usb/cdns3/cdns3-ti.c
index 370856c9bfe..023131b12ab 100644
--- a/drivers/usb/cdns3/cdns3-ti.c
+++ b/drivers/usb/cdns3/cdns3-ti.c
@@ -6,9 +6,11 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <asm-generic/io.h>
 #include <clk.h>
 #include <dm.h>
+#include <asm/types.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
diff --git a/drivers/usb/cdns3/core.h b/drivers/usb/cdns3/core.h
index 70cc3866643..002da7aa24e 100644
--- a/drivers/usb/cdns3/core.h
+++ b/drivers/usb/cdns3/core.h
@@ -8,6 +8,7 @@
  * Authors: Peter Chen <peter.chen@nxp.com>
  *          Pawel Laszczak <pawell@cadence.com>
  */
+#include <compiler.h>
 #include <stdbool.h>
 #include <linux/compiler.h>
 #include <linux/types.h>
diff --git a/drivers/usb/cdns3/drd.c b/drivers/usb/cdns3/drd.c
index e84fb57b2e0..09dd5f58d54 100644
--- a/drivers/usb/cdns3/drd.c
+++ b/drivers/usb/cdns3/drd.c
@@ -10,7 +10,9 @@
  *
  *
  */
+#include <compiler.h>
 #include <dm.h>
+#include <asm/types.h>
 #include <dm/device_compat.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/usb/cdns3/ep0.c b/drivers/usb/cdns3/ep0.c
index f41d4a162cc..7499a51f4a6 100644
--- a/drivers/usb/cdns3/ep0.c
+++ b/drivers/usb/cdns3/ep0.c
@@ -10,7 +10,9 @@
  *          Peter Chen <peter.chen@nxp.com>
  */
 
+#include <compiler.h>
 #include <cpu_func.h>
+#include <stdbool.h>
 #include <vsprintf.h>
 #include <asm/cache.h>
 #include <dm/device_compat.h>
@@ -18,6 +20,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include <linux/usb/composite.h>
 #include <linux/iopoll.h>
 
diff --git a/drivers/usb/cdns3/gadget.c b/drivers/usb/cdns3/gadget.c
index a04e5fd6101..f04ec8776ae 100644
--- a/drivers/usb/cdns3/gadget.c
+++ b/drivers/usb/cdns3/gadget.c
@@ -56,7 +56,9 @@
  *
  */
 
+#include <compiler.h>
 #include <dm.h>
+#include <stdbool.h>
 #include <vsprintf.h>
 #include <dm/device_compat.h>
 #include <dm/devres.h>
@@ -67,6 +69,7 @@
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <linux/usb/gadget.h>
 #include <linux/compat.h>
 #include <linux/iopoll.h>
diff --git a/drivers/usb/cdns3/gadget.h b/drivers/usb/cdns3/gadget.h
index 42216fdc259..d9cbc0603c0 100644
--- a/drivers/usb/cdns3/gadget.h
+++ b/drivers/usb/cdns3/gadget.h
@@ -11,8 +11,10 @@
  */
 #ifndef __LINUX_CDNS3_GADGET
 #define __LINUX_CDNS3_GADGET
+#include <compiler.h>
 #include <linux/bitops.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include <linux/usb/gadget.h>
 
 /*
diff --git a/drivers/usb/common/fsl-dt-fixup.c b/drivers/usb/common/fsl-dt-fixup.c
index 0299e5adb0c..99944526bcf 100644
--- a/drivers/usb/common/fsl-dt-fixup.c
+++ b/drivers/usb/common/fsl-dt-fixup.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <usb.h>
 #include <vsprintf.h>
diff --git a/drivers/usb/common/fsl-errata.c b/drivers/usb/common/fsl-errata.c
index ad20ef34059..d097154c07e 100644
--- a/drivers/usb/common/fsl-errata.c
+++ b/drivers/usb/common/fsl-errata.c
@@ -9,6 +9,7 @@
 #include <hwconfig.h>
 #include <fsl_errata.h>
 #include <stdbool.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include<fsl_usb.h>
 #if defined(CONFIG_FSL_LSCH2) || defined(CONFIG_FSL_LSCH3) || \
diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
index 9889a6c9e81..93556515a0b 100644
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -28,6 +28,7 @@
 #include <dm.h>
 #include <generic-phy.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
 
diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h
index 44533fd7fed..7eb393453b7 100644
--- a/drivers/usb/dwc3/core.h
+++ b/drivers/usb/dwc3/core.h
@@ -17,8 +17,10 @@
 #ifndef __DRIVERS_USB_DWC3_CORE_H
 #define __DRIVERS_USB_DWC3_CORE_H
 
+#include <compiler.h>
 #include <linux/bitops.h>
 #include <linux/ioport.h>
+#include <linux/types.h>
 
 #include <linux/usb/ch9.h>
 #include <linux/usb/otg.h>
diff --git a/drivers/usb/dwc3/dwc3-generic.c b/drivers/usb/dwc3/dwc3-generic.c
index 54a9ffb9d68..90dafb0963f 100644
--- a/drivers/usb/dwc3/dwc3-generic.c
+++ b/drivers/usb/dwc3/dwc3-generic.c
@@ -19,6 +19,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
 #include <malloc.h>
diff --git a/drivers/usb/dwc3/dwc3-omap.c b/drivers/usb/dwc3/dwc3-omap.c
index 2d722376efb..b62fc8afdb5 100644
--- a/drivers/usb/dwc3/dwc3-omap.c
+++ b/drivers/usb/dwc3/dwc3-omap.c
@@ -14,10 +14,12 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <malloc.h>
 #include <asm/io.h>
 #include <dm.h>
 #include <dwc3-omap-uboot.h>
+#include <asm/types.h>
 #include <dm/device_compat.h>
 #include <dm/devres.h>
 #include <linux/errno.h>
diff --git a/drivers/usb/dwc3/dwc3-uniphier.c b/drivers/usb/dwc3/dwc3-uniphier.c
index 54b52dcd66a..4f5d4c15939 100644
--- a/drivers/usb/dwc3/dwc3-uniphier.c
+++ b/drivers/usb/dwc3/dwc3-uniphier.c
@@ -6,12 +6,14 @@
  *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  */
 
+#include <compiler.h>
 #include <dm.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/sizes.h>
+#include <linux/types.h>
 
 #define UNIPHIER_PRO4_DWC3_RESET	0x40
 #define   UNIPHIER_PRO4_DWC3_RESET_XIOMMU	BIT(5)
diff --git a/drivers/usb/dwc3/ep0.c b/drivers/usb/dwc3/ep0.c
index 80de10ec125..1d4d0d612a1 100644
--- a/drivers/usb/dwc3/ep0.c
+++ b/drivers/usb/dwc3/ep0.c
@@ -13,6 +13,7 @@
  * commit c00552ebaf : Merge 3.18-rc7 into usb-next
  */
 #include <common.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <dm/device_compat.h>
 #include <linux/bug.h>
@@ -20,6 +21,7 @@
 #include <linux/kernel.h>
 #include <linux/list.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
index e4c6042bee8..0024991c8f5 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 <stdbool.h>
 #include <vsprintf.h>
 #include <dm/device_compat.h>
 #include <dm/devres.h>
@@ -28,6 +29,7 @@
 #include <linux/list.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
diff --git a/drivers/usb/dwc3/gadget.h b/drivers/usb/dwc3/gadget.h
index 2f2eb18b99f..85a144444a7 100644
--- a/drivers/usb/dwc3/gadget.h
+++ b/drivers/usb/dwc3/gadget.h
@@ -20,6 +20,7 @@
 
 #include <linux/kernel.h>
 #include <linux/list.h>
+#include <linux/types.h>
 #include <linux/usb/gadget.h>
 #include "io.h"
 
diff --git a/drivers/usb/dwc3/io.h b/drivers/usb/dwc3/io.h
index f5268d752c3..a60807d6c01 100644
--- a/drivers/usb/dwc3/io.h
+++ b/drivers/usb/dwc3/io.h
@@ -17,9 +17,11 @@
 #ifndef __DRIVERS_USB_DWC3_IO_H
 #define __DRIVERS_USB_DWC3_IO_H
 
+#include <compiler.h>
 #include <cpu_func.h>
 #include <asm/io.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #define	CACHELINE_SIZE		CONFIG_SYS_CACHELINE_SIZE
 static inline u32 dwc3_readl(void __iomem *base, u32 offset)
diff --git a/drivers/usb/dwc3/linux-compat.h b/drivers/usb/dwc3/linux-compat.h
index 92a3dc2850b..49848397f6b 100644
--- a/drivers/usb/dwc3/linux-compat.h
+++ b/drivers/usb/dwc3/linux-compat.h
@@ -12,6 +12,7 @@
 #define __DWC3_LINUX_COMPAT__
 
 #include <linux/string.h>
+#include <linux/types.h>
 #define dev_WARN(dev, format, arg...)	debug(format, ##arg)
 
 static inline size_t strlcat(char *dest, const char *src, size_t n)
diff --git a/drivers/usb/dwc3/samsung_usb_phy.c b/drivers/usb/dwc3/samsung_usb_phy.c
index abbd4136890..789968951ba 100644
--- a/drivers/usb/dwc3/samsung_usb_phy.c
+++ b/drivers/usb/dwc3/samsung_usb_phy.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <asm/arch/power.h>
 #include <asm/arch/xhci-exynos.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 void exynos5_usb3_phy_init(struct exynos_usb3_phy *phy)
diff --git a/drivers/usb/dwc3/ti_usb_phy.c b/drivers/usb/dwc3/ti_usb_phy.c
index ea512ea8ffb..1ecfda8275e 100644
--- a/drivers/usb/dwc3/ti_usb_phy.c
+++ b/drivers/usb/dwc3/ti_usb_phy.c
@@ -17,8 +17,10 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <malloc.h>
 #include <ti-usb-phy-uboot.h>
+#include <asm/types.h>
 #include <dm/device_compat.h>
 #include <dm/devres.h>
 #include <linux/bitops.h>
diff --git a/drivers/usb/emul/sandbox_flash.c b/drivers/usb/emul/sandbox_flash.c
index f7090195c14..210bbfd7c24 100644
--- a/drivers/usb/emul/sandbox_flash.c
+++ b/drivers/usb/emul/sandbox_flash.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
 #include <os.h>
@@ -13,6 +14,7 @@
 #include <usb.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /*
  * This driver emulates a flash stick using the UFI command specification and
diff --git a/drivers/usb/emul/sandbox_keyb.c b/drivers/usb/emul/sandbox_keyb.c
index 68e5f12f35d..339ada4a29d 100644
--- a/drivers/usb/emul/sandbox_keyb.c
+++ b/drivers/usb/emul/sandbox_keyb.c
@@ -13,6 +13,7 @@
 #include <usb.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /*
  * This driver emulates a USB keyboard using the USB HID specification (boot
diff --git a/drivers/usb/emul/usb-emul-uclass.c b/drivers/usb/emul/usb-emul-uclass.c
index 8d24556c2c4..97aa60189a1 100644
--- a/drivers/usb/emul/usb-emul-uclass.c
+++ b/drivers/usb/emul/usb-emul-uclass.c
@@ -7,11 +7,13 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <stdbool.h>
 #include <usb.h>
 #include <dm/device-internal.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static int copy_to_unicode(char *buff, int length, const char *str)
 {
diff --git a/drivers/usb/eth/asix.c b/drivers/usb/eth/asix.c
index de25ba12f61..a293fb714bc 100644
--- a/drivers/usb/eth/asix.c
+++ b/drivers/usb/eth/asix.c
@@ -19,6 +19,7 @@
 #include <linux/errno.h>
 #include <linux/mii.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "usb_ether.h"
 
 /* ASIX AX8817X based USB 2.0 Ethernet Devices */
diff --git a/drivers/usb/eth/asix88179.c b/drivers/usb/eth/asix88179.c
index c1c873c2c2b..c45e4a6da61 100644
--- a/drivers/usb/eth/asix88179.c
+++ b/drivers/usb/eth/asix88179.c
@@ -17,6 +17,7 @@
 #include <linux/errno.h>
 #include <linux/mii.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "usb_ether.h"
 #include <malloc.h>
 #include <memalign.h>
diff --git a/drivers/usb/eth/lan75xx.c b/drivers/usb/eth/lan75xx.c
index 7d828d75dc6..78d1fb5107b 100644
--- a/drivers/usb/eth/lan75xx.c
+++ b/drivers/usb/eth/lan75xx.c
@@ -9,6 +9,7 @@
 #include <linux/bitops.h>
 #include <linux/mii.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "usb_ether.h"
 #include "lan7x.h"
 
diff --git a/drivers/usb/eth/lan78xx.c b/drivers/usb/eth/lan78xx.c
index 194753fb278..c571f03a645 100644
--- a/drivers/usb/eth/lan78xx.c
+++ b/drivers/usb/eth/lan78xx.c
@@ -10,6 +10,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "usb_ether.h"
 #include "lan7x.h"
 
diff --git a/drivers/usb/eth/lan7x.c b/drivers/usb/eth/lan7x.c
index 503d36c8d9f..94cf1e46ba2 100644
--- a/drivers/usb/eth/lan7x.c
+++ b/drivers/usb/eth/lan7x.c
@@ -17,6 +17,7 @@
 #include <linux/kernel.h>
 #include <linux/mii.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "usb_ether.h"
 #include "lan7x.h"
 
diff --git a/drivers/usb/eth/lan7x.h b/drivers/usb/eth/lan7x.h
index 57c8293a895..9389ba35bf8 100644
--- a/drivers/usb/eth/lan7x.h
+++ b/drivers/usb/eth/lan7x.h
@@ -11,6 +11,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 /* USB Vendor Requests */
 #define USB_VENDOR_REQUEST_WRITE_REGISTER	0xA0
diff --git a/drivers/usb/eth/mcs7830.c b/drivers/usb/eth/mcs7830.c
index f223d96559f..a49e976cf10 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 <stdbool.h>
 #include <vsprintf.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
@@ -25,6 +26,7 @@
 #include <usb.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "usb_ether.h"
 
diff --git a/drivers/usb/eth/r8152.c b/drivers/usb/eth/r8152.c
index f7c46fbc25f..aeb7ba52c01 100644
--- a/drivers/usb/eth/r8152.c
+++ b/drivers/usb/eth/r8152.c
@@ -11,6 +11,7 @@
 #include <malloc.h>
 #include <memalign.h>
 #include <net.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <usb.h>
 #include <vsprintf.h>
@@ -21,6 +22,7 @@
 #include <linux/mii.h>
 #include <linux/bitops.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "usb_ether.h"
 #include "r8152.h"
 
diff --git a/drivers/usb/eth/r8152.h b/drivers/usb/eth/r8152.h
index 378eb8c8124..d6e201c757c 100644
--- a/drivers/usb/eth/r8152.h
+++ b/drivers/usb/eth/r8152.h
@@ -7,8 +7,10 @@
 #ifndef _RTL8152_ETH_H
 #define _RTL8152_ETH_H
 
+#include <stdbool.h>
 #include <linux/bitops.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #define R8152_BASE_NAME		"r8152"
 
 #define PLA_IDR			0xc000
diff --git a/drivers/usb/eth/r8152_fw.c b/drivers/usb/eth/r8152_fw.c
index 2211dc9489e..639670bfd85 100644
--- a/drivers/usb/eth/r8152_fw.c
+++ b/drivers/usb/eth/r8152_fw.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/usb/eth/smsc95xx.c b/drivers/usb/eth/smsc95xx.c
index 48216025448..1e8529fe9ee 100644
--- a/drivers/usb/eth/smsc95xx.c
+++ b/drivers/usb/eth/smsc95xx.c
@@ -24,6 +24,7 @@
 #include <linux/kernel.h>
 #include <linux/mii.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "usb_ether.h"
 
 /* SMSC LAN95xx based USB 2.0 Ethernet Devices */
diff --git a/drivers/usb/eth/usb_ether.c b/drivers/usb/eth/usb_ether.c
index ce86d2cd255..a5de82cc15b 100644
--- a/drivers/usb/eth/usb_ether.c
+++ b/drivers/usb/eth/usb_ether.c
@@ -16,6 +16,7 @@
 #include <dm/device-internal.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "usb_ether.h"
 
diff --git a/drivers/usb/gadget/at91_udc.c b/drivers/usb/gadget/at91_udc.c
index e5a8872f715..fe0f91d586b 100644
--- a/drivers/usb/gadget/at91_udc.c
+++ b/drivers/usb/gadget/at91_udc.c
@@ -14,6 +14,7 @@
 #undef	PACKET_TRACE
 
 #include <common.h>
+#include <compiler.h>
 #include <stdio.h>
 #include <dm/devres.h>
 #include <linux/bug.h>
@@ -25,6 +26,7 @@
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <mach/at91_matrix.h>
 #include <linux/list.h>
 #include <linux/usb/ch9.h>
diff --git a/drivers/usb/gadget/at91_udc.h b/drivers/usb/gadget/at91_udc.h
index 2b2e73420ad..f86e2a3ca7a 100644
--- a/drivers/usb/gadget/at91_udc.h
+++ b/drivers/usb/gadget/at91_udc.h
@@ -13,6 +13,8 @@
  * Based on AT91RM9200 datasheet revision E.
  */
 
+#include <compiler.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 #define AT91_UDP_FRM_NUM	0x00		/* Frame Number Register */
 #define     AT91_UDP_NUM	(0x7ff <<  0)	/* Frame Number */
diff --git a/drivers/usb/gadget/atmel_usba_udc.c b/drivers/usb/gadget/atmel_usba_udc.c
index 03bbe1edb62..e98d63b9fbf 100644
--- a/drivers/usb/gadget/atmel_usba_udc.c
+++ b/drivers/usb/gadget/atmel_usba_udc.c
@@ -17,6 +17,7 @@
 #include <linux/list.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
 #include <linux/usb/atmel_usba_udc.h>
diff --git a/drivers/usb/gadget/atmel_usba_udc.h b/drivers/usb/gadget/atmel_usba_udc.h
index b0692e27954..d1edf95f273 100644
--- a/drivers/usb/gadget/atmel_usba_udc.h
+++ b/drivers/usb/gadget/atmel_usba_udc.h
@@ -11,6 +11,7 @@
 #define __LINUX_USB_GADGET_USBA_UDC_H__
 
 /* USB register offsets */
+#include <asm/types.h>
 #include <linux/kernel.h>
 #define USBA_CTRL				0x0000
 #define USBA_FNUM				0x0004
diff --git a/drivers/usb/gadget/bcm_udc_otg.h b/drivers/usb/gadget/bcm_udc_otg.h
index 24cc936c6b4..52a0110bf85 100644
--- a/drivers/usb/gadget/bcm_udc_otg.h
+++ b/drivers/usb/gadget/bcm_udc_otg.h
@@ -7,6 +7,7 @@
 #define __BCM_UDC_OTG_H
 
 #include <common.h>
+#include <linux/types.h>
 
 static inline void wfld_set(uintptr_t addr, uint32_t fld_val, uint32_t fld_mask)
 {
diff --git a/drivers/usb/gadget/ci_udc.c b/drivers/usb/gadget/ci_udc.c
index 5f92c484b93..29805ca65e6 100644
--- a/drivers/usb/gadget/ci_udc.c
+++ b/drivers/usb/gadget/ci_udc.c
@@ -9,10 +9,12 @@
 
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <config.h>
 #include <cpu_func.h>
 #include <net.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/byteorder.h>
 #include <asm/cache.h>
diff --git a/drivers/usb/gadget/ci_udc.h b/drivers/usb/gadget/ci_udc.h
index c5ef74d74f8..cbd7ea893a0 100644
--- a/drivers/usb/gadget/ci_udc.h
+++ b/drivers/usb/gadget/ci_udc.h
@@ -7,6 +7,7 @@
 #define __GADGET__CI_UDC_H__
 
 #include <stdbool.h>
+#include <linux/types.h>
 #define NUM_ENDPOINTS		6
 
 #ifdef CONFIG_CI_UDC_HAS_HOSTPC
diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
index 30c26a64105..7fa79b3bfdc 100644
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@ -1,5 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
+#include <compiler.h>
+#include <linux/types.h>
  * composite.c - infrastructure for Composite USB Gadgets
  *
  * Copyright (C) 2006-2008 David Brownell
diff --git a/drivers/usb/gadget/config.c b/drivers/usb/gadget/config.c
index e96782644f3..39ec1889dae 100644
--- a/drivers/usb/gadget/config.c
+++ b/drivers/usb/gadget/config.c
@@ -9,6 +9,7 @@
  */
 
 #include <common.h>
+#include <asm/types.h>
 #include <asm/unaligned.h>
 #include <linux/errno.h>
 #include <linux/list.h>
diff --git a/drivers/usb/gadget/core.c b/drivers/usb/gadget/core.c
index 3781d25fd6d..ee8ebb37a04 100644
--- a/drivers/usb/gadget/core.c
+++ b/drivers/usb/gadget/core.c
@@ -19,6 +19,7 @@
 #include <malloc.h>
 #include <serial.h>
 #include <usbdevice.h>
+#include <asm/types.h>
 
 #define MAX_INTERFACES 2
 
diff --git a/drivers/usb/gadget/designware_udc.c b/drivers/usb/gadget/designware_udc.c
index 82d07349e47..051fed62228 100644
--- a/drivers/usb/gadget/designware_udc.c
+++ b/drivers/usb/gadget/designware_udc.c
@@ -13,6 +13,7 @@
 #include <linux/delay.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <env.h>
 #include <usbdevice.h>
diff --git a/drivers/usb/gadget/dwc2_udc_otg.c b/drivers/usb/gadget/dwc2_udc_otg.c
index 04a6b7129bb..ae0ba5778fe 100644
--- a/drivers/usb/gadget/dwc2_udc_otg.c
+++ b/drivers/usb/gadget/dwc2_udc_otg.c
@@ -19,11 +19,13 @@
 #undef DEBUG
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <dm.h>
 #include <generic-phy.h>
 #include <log.h>
 #include <malloc.h>
 #include <reset.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <dm/device_compat.h>
 #include <dm/devres.h>
@@ -32,6 +34,7 @@
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <linux/errno.h>
 #include <linux/list.h>
diff --git a/drivers/usb/gadget/dwc2_udc_otg_priv.h b/drivers/usb/gadget/dwc2_udc_otg_priv.h
index e72b22ac61e..52c0727bcae 100644
--- a/drivers/usb/gadget/dwc2_udc_otg_priv.h
+++ b/drivers/usb/gadget/dwc2_udc_otg_priv.h
@@ -7,6 +7,7 @@
 #ifndef __DWC2_UDC_OTG_PRIV__
 #define __DWC2_UDC_OTG_PRIV__
 
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/sizes.h>
 #include <linux/usb/ch9.h>
diff --git a/drivers/usb/gadget/dwc2_udc_otg_regs.h b/drivers/usb/gadget/dwc2_udc_otg_regs.h
index 2eda5c37206..62dc2b9488b 100644
--- a/drivers/usb/gadget/dwc2_udc_otg_regs.h
+++ b/drivers/usb/gadget/dwc2_udc_otg_regs.h
@@ -11,6 +11,7 @@
 #define __ASM_ARCH_REGS_USB_OTG_HS_H
 
 /* USB2.0 OTG Controller register */
+#include <asm/types.h>
 #include <linux/bitops.h>
 struct dwc2_usbotg_phy {
 	u32 phypwr;
diff --git a/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c b/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c
index ceb3a09840d..df1ef17cf9f 100644
--- a/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c
+++ b/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c
@@ -25,6 +25,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static u8 clear_feature_num;
 int clear_feature_flag;
diff --git a/drivers/usb/gadget/epautoconf.c b/drivers/usb/gadget/epautoconf.c
index caab17473df..edcd732f895 100644
--- a/drivers/usb/gadget/epautoconf.c
+++ b/drivers/usb/gadget/epautoconf.c
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <vsprintf.h>
+#include <asm/types.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 8a85f00c9d3..ff48a63efca 100644
--- a/drivers/usb/gadget/ether.c
+++ b/drivers/usb/gadget/ether.c
@@ -21,6 +21,7 @@
 #include <linux/netdevice.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/cdc.h>
 #include <linux/usb/gadget.h>
diff --git a/drivers/usb/gadget/f_dfu.c b/drivers/usb/gadget/f_dfu.c
index 281c0f29f2a..ef4c6dc878e 100644
--- a/drivers/usb/gadget/f_dfu.c
+++ b/drivers/usb/gadget/f_dfu.c
@@ -20,6 +20,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
diff --git a/drivers/usb/gadget/f_dfu.h b/drivers/usb/gadget/f_dfu.h
index a175e3f134b..ba82dab21e7 100644
--- a/drivers/usb/gadget/f_dfu.h
+++ b/drivers/usb/gadget/f_dfu.h
@@ -9,7 +9,9 @@
 #ifndef __F_DFU_H_
 #define __F_DFU_H_
 
+#include <compiler.h>
 #include <linux/compiler.h>
+#include <linux/types.h>
 #include <linux/usb/composite.h>
 
 #define DFU_CONFIG_VAL			1
diff --git a/drivers/usb/gadget/f_mass_storage.c b/drivers/usb/gadget/f_mass_storage.c
index 12ca77299f6..2f46cf8e2ae 100644
--- a/drivers/usb/gadget/f_mass_storage.c
+++ b/drivers/usb/gadget/f_mass_storage.c
@@ -21,6 +21,7 @@
  * function can indicate that LUN is removable and/or CD-ROM.  (The
  * later implies read-only access.)
  *
+#include <linux/types.h>
  * MSF is configured by specifying a fsg_config structure.  It has the
  * following fields:
  *
diff --git a/drivers/usb/gadget/f_rockusb.c b/drivers/usb/gadget/f_rockusb.c
index e6aa089aa77..d907890b581 100644
--- a/drivers/usb/gadget/f_rockusb.c
+++ b/drivers/usb/gadget/f_rockusb.c
@@ -5,6 +5,7 @@
  * Eddie Cai <eddie.cai.linux@gmail.com>
  */
 #include <command.h>
+#include <compiler.h>
 #include <config.h>
 #include <common.h>
 #include <env.h>
@@ -17,6 +18,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
 #include <linux/usb/composite.h>
diff --git a/drivers/usb/gadget/f_sdp.c b/drivers/usb/gadget/f_sdp.c
index 5eb6474072c..c2588773b89 100644
--- a/drivers/usb/gadget/f_sdp.c
+++ b/drivers/usb/gadget/f_sdp.c
@@ -16,17 +16,20 @@
  * Parts of the implementation are based on f_dfu and f_thor.
  */
 
+#include <compiler.h>
 #include <errno.h>
 #include <common.h>
 #include <console.h>
 #include <env.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
diff --git a/drivers/usb/gadget/f_thor.c b/drivers/usb/gadget/f_thor.c
index 667f1e19c36..c69a90c3697 100644
--- a/drivers/usb/gadget/f_thor.c
+++ b/drivers/usb/gadget/f_thor.c
@@ -25,6 +25,7 @@
 #include <stdio.h>
 #include <version.h>
 #include <vsprintf.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
diff --git a/drivers/usb/gadget/f_thor.h b/drivers/usb/gadget/f_thor.h
index 8ba3fa21b73..995668afc43 100644
--- a/drivers/usb/gadget/f_thor.h
+++ b/drivers/usb/gadget/f_thor.h
@@ -9,6 +9,7 @@
 #ifndef _USB_THOR_H_
 #define _USB_THOR_H_
 
+#include <compiler.h>
 #include <linux/compiler.h>
 #include <linux/sizes.h>
 
diff --git a/drivers/usb/gadget/fotg210.c b/drivers/usb/gadget/fotg210.c
index 66952aab4fb..659e667d51c 100644
--- a/drivers/usb/gadget/fotg210.c
+++ b/drivers/usb/gadget/fotg210.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <config.h>
 #include <cpu_func.h>
 #include <log.h>
diff --git a/drivers/usb/gadget/g_dnl.c b/drivers/usb/gadget/g_dnl.c
index 9397f915a44..d6c7aba7ff7 100644
--- a/drivers/usb/gadget/g_dnl.c
+++ b/drivers/usb/gadget/g_dnl.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <log.h>
 #include <malloc.h>
 #include <stdbool.h>
diff --git a/drivers/usb/gadget/ndis.h b/drivers/usb/gadget/ndis.h
index 753838f7941..7726c82d50e 100644
--- a/drivers/usb/gadget/ndis.h
+++ b/drivers/usb/gadget/ndis.h
@@ -22,6 +22,7 @@
 #define _USBGADGET_NDIS_H
 
 
+#include <linux/types.h>
 #define NDIS_STATUS_MULTICAST_FULL        0xC0010009
 #define NDIS_STATUS_MULTICAST_EXISTS      0xC001000A
 #define NDIS_STATUS_MULTICAST_NOT_FOUND   0xC001000B
diff --git a/drivers/usb/gadget/pxa25x_udc.c b/drivers/usb/gadget/pxa25x_udc.c
index 71c918a64e4..5a8880d3f9d 100644
--- a/drivers/usb/gadget/pxa25x_udc.c
+++ b/drivers/usb/gadget/pxa25x_udc.c
@@ -35,6 +35,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
diff --git a/drivers/usb/gadget/pxa27x_udc.c b/drivers/usb/gadget/pxa27x_udc.c
index 03a067888e4..966999ee540 100644
--- a/drivers/usb/gadget/pxa27x_udc.c
+++ b/drivers/usb/gadget/pxa27x_udc.c
@@ -14,6 +14,7 @@
 #include <asm/byteorder.h>
 #include <asm/io.h>
 #include <usbdevice.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
 #include <usb/pxa27x_udc.h>
diff --git a/drivers/usb/gadget/storage_common.c b/drivers/usb/gadget/storage_common.c
index 5674e8fe494..12446e9795d 100644
--- a/drivers/usb/gadget/storage_common.c
+++ b/drivers/usb/gadget/storage_common.c
@@ -42,6 +42,7 @@
 
 /*
  * When FSG_BUFFHD_STATIC_BUFFER is defined when this file is included
+#include <asm/types.h>
  * the fsg_buffhd structure's buf field will be an array of FSG_BUFLEN
  * characters rather then a pointer to void.
  */
diff --git a/drivers/usb/gadget/usbstring.c b/drivers/usb/gadget/usbstring.c
index 1a5917e0cc5..b3193c54330 100644
--- a/drivers/usb/gadget/usbstring.c
+++ b/drivers/usb/gadget/usbstring.c
@@ -10,6 +10,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
 
diff --git a/drivers/usb/host/dwc2.c b/drivers/usb/host/dwc2.c
index 1095df170c7..56fc2456fa0 100644
--- a/drivers/usb/host/dwc2.c
+++ b/drivers/usb/host/dwc2.c
@@ -14,6 +14,7 @@
 #include <malloc.h>
 #include <memalign.h>
 #include <phys2bus.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <usb.h>
@@ -26,6 +27,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <power/regulator.h>
 #include <reset.h>
 
diff --git a/drivers/usb/host/dwc2.h b/drivers/usb/host/dwc2.h
index 97a06c48f21..086712bba95 100644
--- a/drivers/usb/host/dwc2.h
+++ b/drivers/usb/host/dwc2.h
@@ -6,6 +6,7 @@
 #ifndef __DWC2_H__
 #define __DWC2_H__
 
+#include <asm/types.h>
 struct dwc2_hc_regs {
 	u32			hcchar;		/* 0x00 */
 	u32			hcsplt;
diff --git a/drivers/usb/host/dwc3-sti-glue.c b/drivers/usb/host/dwc3-sti-glue.c
index ceaf2aa2473..67a7ced589b 100644
--- a/drivers/usb/host/dwc3-sti-glue.c
+++ b/drivers/usb/host/dwc3-sti-glue.c
@@ -12,6 +12,7 @@
 #include <asm/io.h>
 #include <dm.h>
 #include <errno.h>
+#include <asm/types.h>
 #include <dm/lists.h>
 #include <regmap.h>
 #include <reset-uclass.h>
diff --git a/drivers/usb/host/ehci-armada100.c b/drivers/usb/host/ehci-armada100.c
index 2ce9f27b862..7026168a3ea 100644
--- a/drivers/usb/host/ehci-armada100.c
+++ b/drivers/usb/host/ehci-armada100.c
@@ -14,6 +14,7 @@
 #include <log.h>
 #include <asm/io.h>
 #include <usb.h>
+#include <linux/types.h>
 #include "ehci.h"
 #include <asm/arch/cpu.h>
 #include <asm/arch/armada100.h>
diff --git a/drivers/usb/host/ehci-atmel.c b/drivers/usb/host/ehci-atmel.c
index dc6eb5b9bb6..00f92a6a297 100644
--- a/drivers/usb/host/ehci-atmel.c
+++ b/drivers/usb/host/ehci-atmel.c
@@ -14,6 +14,7 @@
 #include <asm/io.h>
 #include <asm/arch/clk.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #include "ehci.h"
 
diff --git a/drivers/usb/host/ehci-exynos.c b/drivers/usb/host/ehci-exynos.c
index 9f1ec7ea926..3d79f1fae2c 100644
--- a/drivers/usb/host/ehci-exynos.c
+++ b/drivers/usb/host/ehci-exynos.c
@@ -22,6 +22,7 @@
 #include <asm/gpio.h>
 #include <linux/errno.h>
 #include <linux/compat.h>
+#include <linux/types.h>
 #include "ehci.h"
 
 /* Declare global data pointer */
diff --git a/drivers/usb/host/ehci-faraday.c b/drivers/usb/host/ehci-faraday.c
index df81d5605a4..e1a3ab0bb2e 100644
--- a/drivers/usb/host/ehci-faraday.c
+++ b/drivers/usb/host/ehci-faraday.c
@@ -7,12 +7,14 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <log.h>
 #include <stdio.h>
 #include <asm/io.h>
 #include <usb.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include <usb/fusbh200.h>
 #include <usb/fotg210.h>
 
diff --git a/drivers/usb/host/ehci-fsl.c b/drivers/usb/host/ehci-fsl.c
index c9303bfba2a..c46a466acd8 100644
--- a/drivers/usb/host/ehci-fsl.c
+++ b/drivers/usb/host/ehci-fsl.c
@@ -20,6 +20,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <usb/ehci-ci.h>
 #include <hwconfig.h>
 #include <fsl_usb.h>
diff --git a/drivers/usb/host/ehci-generic.c b/drivers/usb/host/ehci-generic.c
index b9ad1785cea..bb782665221 100644
--- a/drivers/usb/host/ehci-generic.c
+++ b/drivers/usb/host/ehci-generic.c
@@ -14,6 +14,7 @@
 #include <asm/io.h>
 #include <dm.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include "ehci.h"
 #include <power/regulator.h>
 
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index 05fe83c399c..16a34b46608 100644
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -11,6 +11,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <asm/byteorder.h>
@@ -27,6 +28,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "ehci.h"
 
diff --git a/drivers/usb/host/ehci-marvell.c b/drivers/usb/host/ehci-marvell.c
index f419a0ab24b..a9849ffae77 100644
--- a/drivers/usb/host/ehci-marvell.c
+++ b/drivers/usb/host/ehci-marvell.c
@@ -13,6 +13,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include "ehci.h"
 #include <linux/mbus.h>
 #include <asm/arch/cpu.h>
diff --git a/drivers/usb/host/ehci-msm.c b/drivers/usb/host/ehci-msm.c
index 4c4d0a48bc1..579daa92ad5 100644
--- a/drivers/usb/host/ehci-msm.c
+++ b/drivers/usb/host/ehci-msm.c
@@ -12,6 +12,7 @@
 #include <errno.h>
 #include <stdio.h>
 #include <usb.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <usb/ehci-ci.h>
diff --git a/drivers/usb/host/ehci-mx5.c b/drivers/usb/host/ehci-mx5.c
index 2b7c9cc80d7..214bd28d3c3 100644
--- a/drivers/usb/host/ehci-mx5.c
+++ b/drivers/usb/host/ehci-mx5.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <log.h>
 #include <stdio.h>
 #include <usb.h>
@@ -14,6 +15,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <usb/ehci-ci.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
diff --git a/drivers/usb/host/ehci-mx6.c b/drivers/usb/host/ehci-mx6.c
index bb96c11f355..d5e6cca9b07 100644
--- a/drivers/usb/host/ehci-mx6.c
+++ b/drivers/usb/host/ehci-mx6.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <log.h>
 #include <stdio.h>
 #include <usb.h>
@@ -15,6 +16,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include <usb/ehci-ci.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
diff --git a/drivers/usb/host/ehci-mxc.c b/drivers/usb/host/ehci-mxc.c
index 0cbc8ee75e9..f12c9e0beb9 100644
--- a/drivers/usb/host/ehci-mxc.c
+++ b/drivers/usb/host/ehci-mxc.c
@@ -10,6 +10,7 @@
 #include <asm/arch/imx-regs.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <usb/ehci-ci.h>
 #include <errno.h>
 
diff --git a/drivers/usb/host/ehci-mxs.c b/drivers/usb/host/ehci-mxs.c
index f951e5d3a82..53d1324d661 100644
--- a/drivers/usb/host/ehci-mxs.c
+++ b/drivers/usb/host/ehci-mxs.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
@@ -14,6 +15,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include "ehci.h"
 
diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c
index cc5c9406112..4f659b11fa1 100644
--- a/drivers/usb/host/ehci-omap.c
+++ b/drivers/usb/host/ehci-omap.c
@@ -16,6 +16,7 @@
 #include <time.h>
 #include <usb.h>
 #include <vsprintf.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/string.h>
diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c
index d8dbd77114a..b448f0dc551 100644
--- a/drivers/usb/host/ehci-pci.c
+++ b/drivers/usb/host/ehci-pci.c
@@ -13,6 +13,7 @@
 #include <stdio.h>
 #include <usb.h>
 #include <asm/io.h>
+#include <linux/types.h>
 
 #include "ehci.h"
 
diff --git a/drivers/usb/host/ehci-rmobile.c b/drivers/usb/host/ehci-rmobile.c
index 8e826163aa8..d0b0921dc80 100644
--- a/drivers/usb/host/ehci-rmobile.c
+++ b/drivers/usb/host/ehci-rmobile.c
@@ -12,6 +12,7 @@
 #include <asm/arch/ehci-rmobile.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include "ehci.h"
 
 #if defined(CONFIG_R8A7740)
diff --git a/drivers/usb/host/ehci-spear.c b/drivers/usb/host/ehci-spear.c
index 2e3ea349a72..7e88fac14a1 100644
--- a/drivers/usb/host/ehci-spear.c
+++ b/drivers/usb/host/ehci-spear.c
@@ -14,6 +14,7 @@
 #include <asm/io.h>
 #include <usb.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 #include "ehci.h"
 #include <asm/arch/hardware.h>
 #include <asm/arch/spr_misc.h>
diff --git a/drivers/usb/host/ehci-tegra.c b/drivers/usb/host/ehci-tegra.c
index 605a0a1dc80..608dd703ea3 100644
--- a/drivers/usb/host/ehci-tegra.c
+++ b/drivers/usb/host/ehci-tegra.c
@@ -19,6 +19,7 @@
 #include <asm/arch-tegra/clk_rst.h>
 #include <usb.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <usb/ulpi.h>
 #include <linux/libfdt.h>
 
diff --git a/drivers/usb/host/ehci-vct.c b/drivers/usb/host/ehci-vct.c
index 7167f82b481..334369638d8 100644
--- a/drivers/usb/host/ehci-vct.c
+++ b/drivers/usb/host/ehci-vct.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <usb.h>
+#include <asm/types.h>
 
 #include "ehci.h"
 
diff --git a/drivers/usb/host/ehci-vf.c b/drivers/usb/host/ehci-vf.c
index 816d105087e..a90c4df2e25 100644
--- a/drivers/usb/host/ehci-vf.c
+++ b/drivers/usb/host/ehci-vf.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
 #include <usb.h>
@@ -24,6 +25,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <usb/ehci-ci.h>
 #include <linux/libfdt.h>
 #include <fdtdec.h>
diff --git a/drivers/usb/host/ehci-zynq.c b/drivers/usb/host/ehci-zynq.c
index 918e224e761..569baf84a9e 100644
--- a/drivers/usb/host/ehci-zynq.c
+++ b/drivers/usb/host/ehci-zynq.c
@@ -13,6 +13,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/io.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <usb/ehci-ci.h>
 #include <usb/ulpi.h>
 
diff --git a/drivers/usb/host/ehci.h b/drivers/usb/host/ehci.h
index 8e0755423a9..68922d91c00 100644
--- a/drivers/usb/host/ehci.h
+++ b/drivers/usb/host/ehci.h
@@ -11,6 +11,7 @@
 #include <stdbool.h>
 #include <usb.h>
 #include <generic-phy.h>
+#include <linux/types.h>
 
 /* Section 2.2.3 - N_PORTS */
 #define MAX_HC_PORTS		15
diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c
index ecdd64c48cd..6d4f71d92e9 100644
--- a/drivers/usb/host/ohci-hcd.c
+++ b/drivers/usb/host/ohci-hcd.c
@@ -29,6 +29,7 @@
 
 #include <common.h>
 #include <cpu_func.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/byteorder.h>
 #include <dm.h>
@@ -38,6 +39,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #if defined(CONFIG_PCI_OHCI)
 # include <pci.h>
diff --git a/drivers/usb/host/ohci-lpc32xx.c b/drivers/usb/host/ohci-lpc32xx.c
index afb9e29f788..196bbbe1c99 100644
--- a/drivers/usb/host/ohci-lpc32xx.c
+++ b/drivers/usb/host/ohci-lpc32xx.c
@@ -19,6 +19,7 @@
 #include <asm/arch/i2c.h>
 #include <usb.h>
 #include <i2c.h>
+#include <asm/types.h>
 
 /* OTG I2C controller module register structures */
 struct otgi2c_regs {
diff --git a/drivers/usb/host/ohci.h b/drivers/usb/host/ohci.h
index a38cd25eb85..d4422ec452c 100644
--- a/drivers/usb/host/ohci.h
+++ b/drivers/usb/host/ohci.h
@@ -13,6 +13,7 @@
 
 #include <asm/cache.h>
 #include <asm/io.h>
+#include <asm/types.h>
 
 #ifdef CONFIG_SYS_OHCI_SWAP_REG_ACCESS
 # define ohci_readl(a) __swap_32(in_be32((u32 *)a))
diff --git a/drivers/usb/host/r8a66597-hcd.c b/drivers/usb/host/r8a66597-hcd.c
index 66c20c103c0..5b4cfff8cfd 100644
--- a/drivers/usb/host/r8a66597-hcd.c
+++ b/drivers/usb/host/r8a66597-hcd.c
@@ -18,6 +18,7 @@
 #include <linux/iopoll.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <power/regulator.h>
 
 #include "r8a66597.h"
diff --git a/drivers/usb/host/r8a66597.h b/drivers/usb/host/r8a66597.h
index b42389b9188..678712d524d 100644
--- a/drivers/usb/host/r8a66597.h
+++ b/drivers/usb/host/r8a66597.h
@@ -8,6 +8,7 @@
 #ifndef __R8A66597_H__
 #define __R8A66597_H__
 
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/string.h>
 #define SYSCFG0		0x00
diff --git a/drivers/usb/host/sl811-hcd.c b/drivers/usb/host/sl811-hcd.c
index 0b786e1d13e..9184a91c4e4 100644
--- a/drivers/usb/host/sl811-hcd.c
+++ b/drivers/usb/host/sl811-hcd.c
@@ -20,9 +20,11 @@
 
 #include <common.h>
 #include <mpc8xx.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <usb.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
diff --git a/drivers/usb/host/usb-sandbox.c b/drivers/usb/host/usb-sandbox.c
index 090cb2ae84e..78e4234da24 100644
--- a/drivers/usb/host/usb-sandbox.c
+++ b/drivers/usb/host/usb-sandbox.c
@@ -10,6 +10,7 @@
 #include <stdbool.h>
 #include <usb.h>
 #include <dm/root.h>
+#include <linux/types.h>
 
 struct sandbox_usb_ctrl {
 	int rootdev;
diff --git a/drivers/usb/host/usb-uclass.c b/drivers/usb/host/usb-uclass.c
index 940baa549d3..aa8a616acc0 100644
--- a/drivers/usb/host/usb-uclass.c
+++ b/drivers/usb/host/usb-uclass.c
@@ -20,6 +20,7 @@
 #include <dm/uclass-internal.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 extern bool usb_started; /* flag for the started/stopped USB status */
 static bool asynch_allowed;
diff --git a/drivers/usb/host/xhci-brcm.c b/drivers/usb/host/xhci-brcm.c
index 3308b7e756a..bdb30b89c26 100644
--- a/drivers/usb/host/xhci-brcm.c
+++ b/drivers/usb/host/xhci-brcm.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <fdtdec.h>
 #include <usb.h>
diff --git a/drivers/usb/host/xhci-dwc3.c b/drivers/usb/host/xhci-dwc3.c
index b96aea1e010..e10c4fdf617 100644
--- a/drivers/usb/host/xhci-dwc3.c
+++ b/drivers/usb/host/xhci-dwc3.c
@@ -17,6 +17,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <usb/xhci.h>
 #include <asm/io.h>
diff --git a/drivers/usb/host/xhci-exynos5.c b/drivers/usb/host/xhci-exynos5.c
index ee61c88e2aa..77ee798168c 100644
--- a/drivers/usb/host/xhci-exynos5.c
+++ b/drivers/usb/host/xhci-exynos5.c
@@ -29,6 +29,7 @@
 #include <asm/gpio.h>
 #include <linux/errno.h>
 #include <linux/compat.h>
+#include <linux/types.h>
 #include <linux/usb/dwc3.h>
 
 #include <usb/xhci.h>
diff --git a/drivers/usb/host/xhci-fsl.c b/drivers/usb/host/xhci-fsl.c
index 440f17f66d6..7eab30aabb9 100644
--- a/drivers/usb/host/xhci-fsl.c
+++ b/drivers/usb/host/xhci-fsl.c
@@ -8,11 +8,13 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <log.h>
 #include <stdio.h>
 #include <usb.h>
 #include <linux/errno.h>
 #include <linux/compat.h>
+#include <linux/types.h>
 #include <linux/usb/xhci-fsl.h>
 #include <linux/usb/dwc3.h>
 #include <usb/xhci.h>
diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c
index 16ddd0ab6cd..7677890d3f4 100644
--- a/drivers/usb/host/xhci-mem.c
+++ b/drivers/usb/host/xhci-mem.c
@@ -17,6 +17,7 @@
 #include <cpu_func.h>
 #include <dm.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/byteorder.h>
 #include <usb.h>
@@ -26,6 +27,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <usb/xhci.h>
 
diff --git a/drivers/usb/host/xhci-mtk.c b/drivers/usb/host/xhci-mtk.c
index 8ff71854fcd..4b6c7d278d7 100644
--- a/drivers/usb/host/xhci-mtk.c
+++ b/drivers/usb/host/xhci-mtk.c
@@ -6,6 +6,7 @@
 
 #include <clk.h>
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <dm/devres.h>
 #include <generic-phy.h>
@@ -13,6 +14,7 @@
 #include <usb.h>
 #include <linux/errno.h>
 #include <linux/compat.h>
+#include <linux/types.h>
 #include <power/regulator.h>
 #include <linux/iopoll.h>
 #include <usb/xhci.h>
diff --git a/drivers/usb/host/xhci-mvebu.c b/drivers/usb/host/xhci-mvebu.c
index bc3a9f4d018..f9d3facd1f6 100644
--- a/drivers/usb/host/xhci-mvebu.c
+++ b/drivers/usb/host/xhci-mvebu.c
@@ -6,12 +6,14 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <fdtdec.h>
 #include <log.h>
 #include <stdio.h>
 #include <usb.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <power/regulator.h>
 #include <asm/gpio.h>
 
diff --git a/drivers/usb/host/xhci-omap.c b/drivers/usb/host/xhci-omap.c
index 00b7d8571d2..a6225def286 100644
--- a/drivers/usb/host/xhci-omap.c
+++ b/drivers/usb/host/xhci-omap.c
@@ -16,6 +16,7 @@
 #include <asm/omap_common.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/types.h>
 
 #include <linux/compat.h>
 #include <linux/usb/dwc3.h>
diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c
index 9fb6d2f7635..cb957f0172f 100644
--- a/drivers/usb/host/xhci-pci.c
+++ b/drivers/usb/host/xhci-pci.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <pci.h>
 #include <usb.h>
+#include <linux/types.h>
 #include <usb/xhci.h>
 
 static void xhci_pci_init(struct udevice *dev, struct xhci_hccr **ret_hccr,
diff --git a/drivers/usb/host/xhci-rcar-r8a779x_usb3_v3.h b/drivers/usb/host/xhci-rcar-r8a779x_usb3_v3.h
index f0f48a3354c..e04dba8c7d4 100644
--- a/drivers/usb/host/xhci-rcar-r8a779x_usb3_v3.h
+++ b/drivers/usb/host/xhci-rcar-r8a779x_usb3_v3.h
@@ -48,6 +48,7 @@
 #ifndef __FIRMWARE_R8A779X_USB3_V3__
 #define __FIRMWARE_R8A779X_USB3_V3__
 
+#include <asm/types.h>
 static const u32 firmware_r8a779x_usb3_v3[] = {
 	0xf4c455aa, 0x00d20014, 0x00000000, 0x23dc00e8,
 	0x00000000, 0x1a5c2007, 0x0001ff63, 0x001eff80,
diff --git a/drivers/usb/host/xhci-rcar.c b/drivers/usb/host/xhci-rcar.c
index a343d4d098c..40ac9a6f280 100644
--- a/drivers/usb/host/xhci-rcar.c
+++ b/drivers/usb/host/xhci-rcar.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <dm.h>
 #include <fdtdec.h>
 #include <log.h>
@@ -17,6 +18,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include <usb/xhci.h>
 #include "xhci-rcar-r8a779x_usb3_v3.h"
diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
index 221a2dbfd08..71146d5b707 100644
--- a/drivers/usb/host/xhci-ring.c
+++ b/drivers/usb/host/xhci-ring.c
@@ -16,6 +16,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <asm/byteorder.h>
@@ -24,6 +25,7 @@
 #include <linux/bug.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include <usb/xhci.h>
 
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index 90b9c9e0bb3..5e08c9c3195 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -23,6 +23,7 @@
 #include <cpu_func.h>
 #include <dm.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/byteorder.h>
 #include <usb.h>
@@ -36,6 +37,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <usb/xhci.h>
 
 #ifndef CONFIG_USB_MAX_CONTROLLER_COUNT
diff --git a/drivers/usb/musb-new/am35x.c b/drivers/usb/musb-new/am35x.c
index 8d8aa779467..577774b7694 100644
--- a/drivers/usb/musb-new/am35x.c
+++ b/drivers/usb/musb-new/am35x.c
@@ -25,8 +25,10 @@
 #include <plat/usb.h>
 #else
 #include <common.h>
+#include <compiler.h>
 #include <time.h>
 #include <asm/omap_musb.h>
+#include <asm/types.h>
 #include <linux/bug.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/usb/musb-new/da8xx.c b/drivers/usb/musb-new/da8xx.c
index 8c44ed2429f..2937a7a16bc 100644
--- a/drivers/usb/musb-new/da8xx.c
+++ b/drivers/usb/musb-new/da8xx.c
@@ -14,9 +14,11 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <dm/device-internal.h>
 #include <dm/device_compat.h>
 #include <dm/lists.h>
diff --git a/drivers/usb/musb-new/mt85xx.c b/drivers/usb/musb-new/mt85xx.c
index 6bf1909f1ad..fce224afe94 100644
--- a/drivers/usb/musb-new/mt85xx.c
+++ b/drivers/usb/musb-new/mt85xx.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <clk.h>
 #include <dm.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <dm/lists.h>
 #include <dm/root.h>
@@ -20,6 +21,7 @@
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <linux/usb/musb.h>
 #include <usb.h>
 #include "linux-compat.h"
diff --git a/drivers/usb/musb-new/musb_core.c b/drivers/usb/musb-new/musb_core.c
index 0a537fc4552..1947463a778 100644
--- a/drivers/usb/musb-new/musb_core.c
+++ b/drivers/usb/musb-new/musb_core.c
@@ -80,6 +80,8 @@
 #include <linux/io.h>
 #else
 #include <common.h>
+#include <compiler.h>
+#include <stdbool.h>
 #include <usb.h>
 #include <vsprintf.h>
 #include <linux/bitops.h>
@@ -87,6 +89,7 @@
 #include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
 #include <linux/usb/musb.h>
diff --git a/drivers/usb/musb-new/musb_core.h b/drivers/usb/musb-new/musb_core.h
index 91b1ec33045..8b0372ae804 100644
--- a/drivers/usb/musb-new/musb_core.h
+++ b/drivers/usb/musb-new/musb_core.h
@@ -20,6 +20,9 @@
 #include <linux/usb.h>
 #include <linux/usb/otg.h>
 #else
+#include <compiler.h>
+#include <stdbool.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #endif
diff --git a/drivers/usb/musb-new/musb_dma.h b/drivers/usb/musb-new/musb_dma.h
index 5ad64ed3436..3a51d3a5620 100644
--- a/drivers/usb/musb-new/musb_dma.h
+++ b/drivers/usb/musb-new/musb_dma.h
@@ -10,7 +10,9 @@
 #ifndef __MUSB_DMA_H__
 #define __MUSB_DMA_H__
 
+#include <compiler.h>
 #include <stdbool.h>
+#include <linux/types.h>
 struct musb_hw_ep;
 
 /*
diff --git a/drivers/usb/musb-new/musb_dsps.c b/drivers/usb/musb-new/musb_dsps.c
index 14d8cfb70fc..292870f1ad4 100644
--- a/drivers/usb/musb-new/musb_dsps.c
+++ b/drivers/usb/musb-new/musb_dsps.c
@@ -32,9 +32,11 @@
 #include <plat/usb.h>
 #else
 #include <common.h>
+#include <compiler.h>
 #include <time.h>
 #include <vsprintf.h>
 #include <asm/omap_musb.h>
+#include <asm/types.h>
 #include <linux/errno.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 949bea72aae..39902aaa030 100644
--- a/drivers/usb/musb-new/musb_gadget.c
+++ b/drivers/usb/musb-new/musb_gadget.c
@@ -23,11 +23,13 @@
 #include <linux/slab.h>
 #else
 #include <common.h>
+#include <compiler.h>
 #include <vsprintf.h>
 #include <linux/bug.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <linux/usb/ch9.h>
 #include "linux-compat.h"
 #endif
diff --git a/drivers/usb/musb-new/musb_gadget.h b/drivers/usb/musb-new/musb_gadget.h
index 4ae18f910fc..97861130390 100644
--- a/drivers/usb/musb-new/musb_gadget.h
+++ b/drivers/usb/musb-new/musb_gadget.h
@@ -15,6 +15,7 @@
 #ifdef __UBOOT__
 #include <asm/byteorder.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
 #endif
diff --git a/drivers/usb/musb-new/musb_gadget_ep0.c b/drivers/usb/musb-new/musb_gadget_ep0.c
index 769aa25f175..bd893ac9e2c 100644
--- a/drivers/usb/musb-new/musb_gadget_ep0.c
+++ b/drivers/usb/musb-new/musb_gadget_ep0.c
@@ -19,8 +19,10 @@
 #include <linux/interrupt.h>
 #else
 #include <common.h>
+#include <compiler.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 #include "linux-compat.h"
 #include <asm/processor.h>
 #endif
diff --git a/drivers/usb/musb-new/musb_host.c b/drivers/usb/musb-new/musb_host.c
index 5fa013659c5..b7ba5cb9f6d 100644
--- a/drivers/usb/musb-new/musb_host.c
+++ b/drivers/usb/musb-new/musb_host.c
@@ -22,8 +22,11 @@
 #include <linux/dma-mapping.h>
 #else
 #include <common.h>
+#include <compiler.h>
+#include <stdbool.h>
 #include <usb.h>
 #include <linux/bug.h>
+#include <linux/types.h>
 #include "linux-compat.h"
 #include "usb-compat.h"
 #endif
diff --git a/drivers/usb/musb-new/musb_io.h b/drivers/usb/musb-new/musb_io.h
index 72a53656321..ff572712821 100644
--- a/drivers/usb/musb-new/musb_io.h
+++ b/drivers/usb/musb-new/musb_io.h
@@ -17,7 +17,9 @@
 #ifndef __UBOOT__
 #include <linux/io.h>
 #else
+#include <compiler.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #endif
 
 #if !defined(CONFIG_ARM) && !defined(CONFIG_SUPERH) \
diff --git a/drivers/usb/musb-new/musb_regs.h b/drivers/usb/musb-new/musb_regs.h
index c4d7203b851..20b00b3e1b1 100644
--- a/drivers/usb/musb-new/musb_regs.h
+++ b/drivers/usb/musb-new/musb_regs.h
@@ -94,6 +94,8 @@
 #define MUSB_CSR0_H_SETUPPKT		0x0008
 #define MUSB_CSR0_H_RXSTALL		0x0004
 
+#include <compiler.h>
+#include <asm/types.h>
 /* CSR0 bits to avoid zeroing (write zero clears, write 1 ignored) */
 #define MUSB_CSR0_P_WZC_BITS	\
 	(MUSB_CSR0_P_SENTSTALL)
diff --git a/drivers/usb/musb-new/musb_uboot.c b/drivers/usb/musb-new/musb_uboot.c
index 9d22b50b8c3..2773ffad97e 100644
--- a/drivers/usb/musb-new/musb_uboot.c
+++ b/drivers/usb/musb-new/musb_uboot.c
@@ -1,9 +1,11 @@
 #include <common.h>
 #include <console.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <watchdog.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/errno.h>
diff --git a/drivers/usb/musb-new/omap2430.c b/drivers/usb/musb-new/omap2430.c
index b609034184f..3316f7dc6ac 100644
--- a/drivers/usb/musb-new/omap2430.c
+++ b/drivers/usb/musb-new/omap2430.c
@@ -14,6 +14,7 @@
 #include <serial.h>
 #include <time.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <dm/device-internal.h>
 #include <dm/device_compat.h>
 #include <dm/lists.h>
diff --git a/drivers/usb/musb-new/pic32.c b/drivers/usb/musb-new/pic32.c
index e9554bc5328..36ad3d67ff4 100644
--- a/drivers/usb/musb-new/pic32.c
+++ b/drivers/usb/musb-new/pic32.c
@@ -10,8 +10,10 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/drivers/usb/musb-new/sunxi.c b/drivers/usb/musb-new/sunxi.c
index b49954fe146..28f6a679933 100644
--- a/drivers/usb/musb-new/sunxi.c
+++ b/drivers/usb/musb-new/sunxi.c
@@ -17,12 +17,14 @@
  */
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <dm.h>
 #include <generic-phy.h>
 #include <log.h>
 #include <malloc.h>
 #include <phy-sun4i-usb.h>
 #include <reset.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/clock.h>
@@ -37,6 +39,7 @@
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <linux/usb/musb.h>
 #include "linux-compat.h"
 #include "musb_core.h"
diff --git a/drivers/usb/musb-new/ti-musb.c b/drivers/usb/musb-new/ti-musb.c
index e4382a30969..09a74bd6b75 100644
--- a/drivers/usb/musb-new/ti-musb.c
+++ b/drivers/usb/musb-new/ti-musb.c
@@ -13,6 +13,7 @@
 #include <malloc.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
diff --git a/drivers/usb/musb-new/usb-compat.h b/drivers/usb/musb-new/usb-compat.h
index f2c18ad3a2e..72112df5f98 100644
--- a/drivers/usb/musb-new/usb-compat.h
+++ b/drivers/usb/musb-new/usb-compat.h
@@ -2,6 +2,7 @@
 #define __USB_COMPAT_H__
 
 #include <dm.h>
+#include <asm/types.h>
 #include "usb.h"
 
 struct usb_hcd {
diff --git a/drivers/usb/musb/am35x.c b/drivers/usb/musb/am35x.c
index e749ae97180..8f01e80fd84 100644
--- a/drivers/usb/musb/am35x.c
+++ b/drivers/usb/musb/am35x.c
@@ -10,6 +10,7 @@
  */
 
 #include <common.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 
diff --git a/drivers/usb/musb/am35x.h b/drivers/usb/musb/am35x.h
index 82ad94329cb..fd4383ad538 100644
--- a/drivers/usb/musb/am35x.h
+++ b/drivers/usb/musb/am35x.h
@@ -13,6 +13,7 @@
 #define __AM35X_USB_H__
 
 #include <asm/arch/am35x_def.h>
+#include <asm/types.h>
 #include "musb_core.h"
 
 /* Base address of musb wrapper */
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index 147b2eb929f..ae174d1c394 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -9,6 +9,7 @@
  */
 
 #include <common.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 
 #include "musb_core.h"
diff --git a/drivers/usb/musb/musb_core.h b/drivers/usb/musb/musb_core.h
index e5d8ac70288..167ab23bc5d 100644
--- a/drivers/usb/musb/musb_core.h
+++ b/drivers/usb/musb/musb_core.h
@@ -11,6 +11,7 @@
 
 #include <usb_defs.h>
 #include <asm/io.h>
+#include <asm/types.h>
 
 #define MUSB_EP0_FIFOSIZE	64	/* This is non-configurable */
 
diff --git a/drivers/usb/musb/musb_hcd.c b/drivers/usb/musb/musb_hcd.c
index 8942ed31fc4..2f7849d36f8 100644
--- a/drivers/usb/musb/musb_hcd.c
+++ b/drivers/usb/musb/musb_hcd.c
@@ -9,7 +9,9 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdbool.h>
 #include <usb.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
diff --git a/drivers/usb/musb/musb_udc.c b/drivers/usb/musb/musb_udc.c
index 56a92cc613a..e0714b6d873 100644
--- a/drivers/usb/musb/musb_udc.c
+++ b/drivers/usb/musb/musb_udc.c
@@ -41,6 +41,7 @@
 #include <hang.h>
 #include <serial.h>
 #include <usbdevice.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
 #include <usb/udc.h>
diff --git a/drivers/usb/musb/omap3.c b/drivers/usb/musb/omap3.c
index 080bd78523c..2e824ff31f0 100644
--- a/drivers/usb/musb/omap3.c
+++ b/drivers/usb/musb/omap3.c
@@ -20,6 +20,7 @@
 #include <asm/omap_common.h>
 #include <twl4030.h>
 #include <twl6030.h>
+#include <asm/types.h>
 #include "omap3.h"
 
 static int platform_needs_initialization = 1;
diff --git a/drivers/usb/musb/omap3.h b/drivers/usb/musb/omap3.h
index 78fdb2959bb..0adbef29848 100644
--- a/drivers/usb/musb/omap3.h
+++ b/drivers/usb/musb/omap3.h
@@ -18,6 +18,7 @@
 #define _MUSB_OMAP3_H_
 
 #include <asm/arch/cpu.h>
+#include <asm/types.h>
 #include "musb_core.h"
 
 /* Base address of MUSB registers */
diff --git a/drivers/usb/phy/omap_usb_phy.c b/drivers/usb/phy/omap_usb_phy.c
index be733f39b23..8d0bc8cb9db 100644
--- a/drivers/usb/phy/omap_usb_phy.c
+++ b/drivers/usb/phy/omap_usb_phy.c
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <usb.h>
+#include <asm/types.h>
 #include <dm/device_compat.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/usb/phy/rockchip_usb2_phy.c b/drivers/usb/phy/rockchip_usb2_phy.c
index d1d92ddfe7a..2951da46abb 100644
--- a/drivers/usb/phy/rockchip_usb2_phy.c
+++ b/drivers/usb/phy/rockchip_usb2_phy.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <hang.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
diff --git a/drivers/usb/phy/twl4030.c b/drivers/usb/phy/twl4030.c
index 9bea192fccf..db8321459c2 100644
--- a/drivers/usb/phy/twl4030.c
+++ b/drivers/usb/phy/twl4030.c
@@ -25,6 +25,7 @@
 
 #include <stdio.h>
 #include <twl4030.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 /* Defines for bits in registers */
diff --git a/drivers/usb/ulpi/omap-ulpi-viewport.c b/drivers/usb/ulpi/omap-ulpi-viewport.c
index 8b930e3fa91..0024347c6de 100644
--- a/drivers/usb/ulpi/omap-ulpi-viewport.c
+++ b/drivers/usb/ulpi/omap-ulpi-viewport.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <log.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <usb/ulpi.h>
 
diff --git a/drivers/usb/ulpi/ulpi-viewport.c b/drivers/usb/ulpi/ulpi-viewport.c
index 5a7f034da1d..85f5c7ddf5c 100644
--- a/drivers/usb/ulpi/ulpi-viewport.c
+++ b/drivers/usb/ulpi/ulpi-viewport.c
@@ -17,6 +17,7 @@
 #include <stdio.h>
 #include <asm/io.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 #include <usb/ulpi.h>
 
 /* ULPI viewport control bits */
diff --git a/drivers/usb/ulpi/ulpi.c b/drivers/usb/ulpi/ulpi.c
index d5045a17959..ecf2b016bf5 100644
--- a/drivers/usb/ulpi/ulpi.c
+++ b/drivers/usb/ulpi/ulpi.c
@@ -23,6 +23,7 @@
 #include <exports.h>
 #include <log.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <usb/ulpi.h>
 
diff --git a/drivers/video/am335x-fb.c b/drivers/video/am335x-fb.c
index 1e96f5bd35d..604ee99f83d 100644
--- a/drivers/video/am335x-fb.c
+++ b/drivers/video/am335x-fb.c
@@ -8,6 +8,8 @@
  * Wolfgang Denk's LCD-Framework (CONFIG_LCD, common/lcd.c)
  *
  * - supporting 16/24/32bit RGB/TFT raster Mode (not using palette)
+#include <stdbool.h>
+#include <linux/types.h>
  * - sets up LCD controller as in 'am335x_lcdpanel' struct given
  * - starts output DMA from gd->fb_base buffer
  */
diff --git a/drivers/video/anx9804.c b/drivers/video/anx9804.c
index 648564bc3e1..30800282b0c 100644
--- a/drivers/video/anx9804.c
+++ b/drivers/video/anx9804.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <i2c.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include "anx98xx-edp.h"
 #include "anx9804.h"
diff --git a/drivers/video/anx9804.h b/drivers/video/anx9804.h
index c0fe3b393b4..252a280ce87 100644
--- a/drivers/video/anx9804.h
+++ b/drivers/video/anx9804.h
@@ -12,6 +12,7 @@
 #ifndef _ANX9804_H
 #define _ANX9804_H
 
+#include <asm/types.h>
 #define ANX9804_DATA_RATE_1620M				0x06
 #define ANX9804_DATA_RATE_2700M				0x0a
 
diff --git a/drivers/video/ati_radeon_fb.c b/drivers/video/ati_radeon_fb.c
index acee5ae3535..d235fce538c 100644
--- a/drivers/video/ati_radeon_fb.c
+++ b/drivers/video/ati_radeon_fb.c
@@ -17,6 +17,7 @@
 
 #include <common.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
diff --git a/drivers/video/ati_radeon_fb.h b/drivers/video/ati_radeon_fb.h
index dde2067ef2e..a0e1fe5195d 100644
--- a/drivers/video/ati_radeon_fb.h
+++ b/drivers/video/ati_radeon_fb.h
@@ -9,6 +9,7 @@
  * Chip families. Must fit in the low 16 bits of a long word
  */
 #include <stdio.h>
+#include <asm/types.h>
 enum radeon_family {
 	CHIP_FAMILY_UNKNOW,
 	CHIP_FAMILY_LEGACY,
diff --git a/drivers/video/atmel_hlcdfb.c b/drivers/video/atmel_hlcdfb.c
index 1891ec0117a..2860fffba2a 100644
--- a/drivers/video/atmel_hlcdfb.c
+++ b/drivers/video/atmel_hlcdfb.c
@@ -25,6 +25,7 @@
 #include <linux/bug.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #if defined(CONFIG_LCD_LOGO)
 #include <bmp_logo.h>
diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c
index c734a44ba80..fb368dde615 100644
--- a/drivers/video/atmel_lcdfb.c
+++ b/drivers/video/atmel_lcdfb.c
@@ -22,6 +22,7 @@
 #include <atmel_lcdc.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/video/bcm2835.c b/drivers/video/bcm2835.c
index c949246a987..f2647fb3061 100644
--- a/drivers/video/bcm2835.c
+++ b/drivers/video/bcm2835.c
@@ -12,6 +12,7 @@
 #include <asm/cache.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 static int bcm2835_video_probe(struct udevice *dev)
 {
diff --git a/drivers/video/bridge/anx6345.c b/drivers/video/bridge/anx6345.c
index e7c33e6a18b..a51c0365bf9 100644
--- a/drivers/video/bridge/anx6345.c
+++ b/drivers/video/bridge/anx6345.c
@@ -13,6 +13,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "../anx98xx-edp.h"
 
 #define DP_MAX_LINK_RATE		0x001
diff --git a/drivers/video/bridge/ps862x.c b/drivers/video/bridge/ps862x.c
index b6f3e300f35..f71d4f19171 100644
--- a/drivers/video/bridge/ps862x.c
+++ b/drivers/video/bridge/ps862x.c
@@ -13,6 +13,7 @@
 #include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <power/regulator.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/video/bridge/video-bridge-uclass.c b/drivers/video/bridge/video-bridge-uclass.c
index 960f9384042..95c2d2bc1d0 100644
--- a/drivers/video/bridge/video-bridge-uclass.c
+++ b/drivers/video/bridge/video-bridge-uclass.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <stdbool.h>
 #include <video_bridge.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 
diff --git a/drivers/video/broadwell_igd.c b/drivers/video/broadwell_igd.c
index 430e4fd7da1..ca566cc5060 100644
--- a/drivers/video/broadwell_igd.c
+++ b/drivers/video/broadwell_igd.c
@@ -11,6 +11,7 @@
 #include <dm.h>
 #include <init.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <vbe.h>
@@ -26,6 +27,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include "i915_reg.h"
 
 struct broadwell_igd_priv {
diff --git a/drivers/video/bus_vcxk.c b/drivers/video/bus_vcxk.c
index 8f9b607099e..8e6a5373cdb 100644
--- a/drivers/video/bus_vcxk.c
+++ b/drivers/video/bus_vcxk.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <stdio.h>
 #include <asm/io.h>
+#include <linux/types.h>
 
 vu_char  *vcxk_bws      = ((vu_char *) (CONFIG_SYS_VCXK_BASE));
 vu_short *vcxk_bws_word = ((vu_short *)(CONFIG_SYS_VCXK_BASE));
diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c
index db64e18d13b..2265583713f 100644
--- a/drivers/video/cfb_console.c
+++ b/drivers/video/cfb_console.c
@@ -30,6 +30,8 @@
  * VIDEO_HW_RECTFILL	      - graphic driver supports hardware rectangle fill
  * VIDEO_HW_BITBLT	      - graphic driver supports hardware bit blt
  *
+#include <compiler.h>
+#include <stdbool.h>
  * Console Parameters are set by graphic drivers global struct:
  *
  * VIDEO_VISIBLE_COLS	      - x resolution
diff --git a/drivers/video/console_normal.c b/drivers/video/console_normal.c
index 5b51252aaa6..700a18c252c 100644
--- a/drivers/video/console_normal.c
+++ b/drivers/video/console_normal.c
@@ -13,6 +13,7 @@
 #include <video_console.h>
 #include <video_font.h>		/* Get font data, width and height */
 #include <linux/errno.h>
+#include <linux/types.h>
 
 static int console_normal_set_row(struct udevice *dev, uint row, int clr)
 {
diff --git a/drivers/video/console_rotate.c b/drivers/video/console_rotate.c
index 3649bd4487e..d43adbeaaf4 100644
--- a/drivers/video/console_rotate.c
+++ b/drivers/video/console_rotate.c
@@ -11,6 +11,7 @@
 #include <video_console.h>
 #include <video_font.h>		/* Get font data, width and height */
 #include <linux/errno.h>
+#include <linux/types.h>
 
 static int console_set_row_1(struct udevice *dev, uint row, int clr)
 {
diff --git a/drivers/video/console_truetype.c b/drivers/video/console_truetype.c
index 01fcc03456b..187d3b06d2c 100644
--- a/drivers/video/console_truetype.c
+++ b/drivers/video/console_truetype.c
@@ -12,6 +12,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /* Functions needed by stb_truetype.h */
 static int tt_floor(double val)
diff --git a/drivers/video/da8xx-fb.c b/drivers/video/da8xx-fb.c
index d9909e17867..6f303af3708 100644
--- a/drivers/video/da8xx-fb.c
+++ b/drivers/video/da8xx-fb.c
@@ -24,6 +24,7 @@
 #include <linux/list.h>
 #include <linux/fb.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <linux/errno.h>
 #include <asm/io.h>
diff --git a/drivers/video/display-uclass.c b/drivers/video/display-uclass.c
index 8b9131590fe..a54f12c0a98 100644
--- a/drivers/video/display-uclass.c
+++ b/drivers/video/display-uclass.c
@@ -9,6 +9,7 @@
 #include <edid.h>
 #include <errno.h>
 #include <stdbool.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 
 int display_read_edid(struct udevice *dev, u8 *buf, int buf_size)
diff --git a/drivers/video/dw_hdmi.c b/drivers/video/dw_hdmi.c
index 3f61c5ef02b..24e397f1317 100644
--- a/drivers/video/dw_hdmi.c
+++ b/drivers/video/dw_hdmi.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <fdtdec.h>
 #include <log.h>
+#include <stdbool.h>
 #include <time.h>
 #include <asm/io.h>
 #include <i2c.h>
@@ -15,6 +16,7 @@
 #include <linux/delay.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "dw_hdmi.h"
 
 struct tmds_n_cts {
diff --git a/drivers/video/dw_mipi_dsi.c b/drivers/video/dw_mipi_dsi.c
index 343732e2be0..2e4bde28dcb 100644
--- a/drivers/video/dw_mipi_dsi.c
+++ b/drivers/video/dw_mipi_dsi.c
@@ -11,10 +11,12 @@
 
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <dsi_host.h>
 #include <dm.h>
 #include <errno.h>
 #include <panel.h>
+#include <stdbool.h>
 #include <video.h>
 #include <asm/io.h>
 #include <asm/arch/gpio.h>
@@ -27,6 +29,7 @@
 #include <video_bridge.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define HWVER_131			0x31333100	/* IP version 1.31 */
 
diff --git a/drivers/video/efi.c b/drivers/video/efi.c
index aa67cf17ad0..34478f5b2bf 100644
--- a/drivers/video/efi.c
+++ b/drivers/video/efi.c
@@ -12,6 +12,7 @@
 #include <stdio.h>
 #include <vbe.h>
 #include <video.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 
 struct pixel {
diff --git a/drivers/video/exynos/exynos_dp.c b/drivers/video/exynos/exynos_dp.c
index 72333b47010..77b81143f03 100644
--- a/drivers/video/exynos/exynos_dp.c
+++ b/drivers/video/exynos/exynos_dp.c
@@ -13,6 +13,7 @@
 #include <log.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/libfdt.h>
diff --git a/drivers/video/exynos/exynos_dp_lowlevel.c b/drivers/video/exynos/exynos_dp_lowlevel.c
index c87e18f1dad..b86624ba2c8 100644
--- a/drivers/video/exynos/exynos_dp_lowlevel.c
+++ b/drivers/video/exynos/exynos_dp_lowlevel.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <log.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <asm/arch/cpu.h>
diff --git a/drivers/video/exynos/exynos_dp_lowlevel.h b/drivers/video/exynos/exynos_dp_lowlevel.h
index c3d3aec7822..04a1af857b1 100644
--- a/drivers/video/exynos/exynos_dp_lowlevel.h
+++ b/drivers/video/exynos/exynos_dp_lowlevel.h
@@ -8,6 +8,7 @@
 #ifndef _EXYNOS_EDP_LOWLEVEL_H
 #define _EXYNOS_EDP_LOWLEVEL_H
 
+#include <asm/types.h>
 void exynos_dp_enable_video_bist(struct exynos_dp *dp_regs,
 				 unsigned int enable);
 void exynos_dp_enable_video_mute(struct exynos_dp *dp_regs,
diff --git a/drivers/video/exynos/exynos_fb.c b/drivers/video/exynos/exynos_fb.c
index a266b78b24a..8ecbbadb6a5 100644
--- a/drivers/video/exynos/exynos_fb.c
+++ b/drivers/video/exynos/exynos_fb.c
@@ -31,6 +31,7 @@
 #include <asm/arch/system.h>
 #include <asm/gpio.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/video/exynos/exynos_mipi_dsi_common.c b/drivers/video/exynos/exynos_mipi_dsi_common.c
index cf284dc2470..be4ff0c286f 100644
--- a/drivers/video/exynos/exynos_mipi_dsi_common.c
+++ b/drivers/video/exynos/exynos_mipi_dsi_common.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <lcd.h>
 #include <log.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <asm/arch/dsim.h>
diff --git a/drivers/video/exynos/exynos_mipi_dsi_lowlevel.c b/drivers/video/exynos/exynos_mipi_dsi_lowlevel.c
index d7a8db62fa9..0ac3c92130e 100644
--- a/drivers/video/exynos/exynos_mipi_dsi_lowlevel.c
+++ b/drivers/video/exynos/exynos_mipi_dsi_lowlevel.c
@@ -12,6 +12,7 @@
 #include <asm/arch/mipi_dsim.h>
 #include <asm/arch/power.h>
 #include <asm/arch/cpu.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 #include "exynos_mipi_dsi_lowlevel.h"
diff --git a/drivers/video/formike.c b/drivers/video/formike.c
index 14c39b65f5c..bc332dc7205 100644
--- a/drivers/video/formike.c
+++ b/drivers/video/formike.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <spi.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 #define TAG_READ	0x80
diff --git a/drivers/video/fsl_dcu_fb.c b/drivers/video/fsl_dcu_fb.c
index fc4d42d40e9..8818522cb9e 100644
--- a/drivers/video/fsl_dcu_fb.c
+++ b/drivers/video/fsl_dcu_fb.c
@@ -23,6 +23,7 @@
 #include <video_fb.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "videomodes.h"
 
 /* Convert the X,Y resolution pair into a single number */
diff --git a/drivers/video/fsl_diu_fb.c b/drivers/video/fsl_diu_fb.c
index 068fc449f1c..4a1c9e41246 100644
--- a/drivers/video/fsl_diu_fb.c
+++ b/drivers/video/fsl_diu_fb.c
@@ -15,6 +15,7 @@
 #include <asm/u-boot.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "videomodes.h"
 #include <video_fb.h>
diff --git a/drivers/video/hitachi_tx18d42vm_lcd.c b/drivers/video/hitachi_tx18d42vm_lcd.c
index 284c6527474..bb4fa7629b4 100644
--- a/drivers/video/hitachi_tx18d42vm_lcd.c
+++ b/drivers/video/hitachi_tx18d42vm_lcd.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <malloc.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
diff --git a/drivers/video/ihs_video_out.c b/drivers/video/ihs_video_out.c
index 5b1413699f9..9167be22948 100644
--- a/drivers/video/ihs_video_out.c
+++ b/drivers/video/ihs_video_out.c
@@ -19,6 +19,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static const uint MAX_X_CHARS = 53;
 static const uint MAX_Y_CHARS = 26;
diff --git a/drivers/video/imx/ipu_common.c b/drivers/video/imx/ipu_common.c
index 2d5f47ff4ad..79dace25948 100644
--- a/drivers/video/imx/ipu_common.c
+++ b/drivers/video/imx/ipu_common.c
@@ -13,6 +13,7 @@
 /* #define DEBUG */
 #include <common.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <linux/delay.h>
 #include <linux/string.h>
diff --git a/drivers/video/imx/ipu_regs.h b/drivers/video/imx/ipu_regs.h
index 1e29f66e67b..b97826b3a17 100644
--- a/drivers/video/imx/ipu_regs.h
+++ b/drivers/video/imx/ipu_regs.h
@@ -14,6 +14,7 @@
 #define __IPU_REGS_INCLUDED__
 
 #include <stdio.h>
+#include <asm/types.h>
 #define IPU_DISP0_BASE		0x00000000
 #define IPU_MCU_T_DEFAULT	8
 #define IPU_DISP1_BASE		(IPU_MCU_T_DEFAULT << 25)
diff --git a/drivers/video/imx/mxc_ipuv3_fb.c b/drivers/video/imx/mxc_ipuv3_fb.c
index e6838a7c7e6..49967704260 100644
--- a/drivers/video/imx/mxc_ipuv3_fb.c
+++ b/drivers/video/imx/mxc_ipuv3_fb.c
@@ -25,6 +25,7 @@
 #include <asm/mach-imx/video.h>
 #include <malloc.h>
 #include <video_fb.h>
+#include <linux/types.h>
 #include "../videomodes.h"
 #include "ipu.h"
 #include "mxcfb.h"
diff --git a/drivers/video/ivybridge_igd.c b/drivers/video/ivybridge_igd.c
index 40a8cd1fa59..a6babd169b8 100644
--- a/drivers/video/ivybridge_igd.c
+++ b/drivers/video/ivybridge_igd.c
@@ -23,6 +23,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/video/lg4573.c b/drivers/video/lg4573.c
index b47756bb13d..f9e7e914c05 100644
--- a/drivers/video/lg4573.c
+++ b/drivers/video/lg4573.c
@@ -11,6 +11,7 @@
 #include <dm.h>
 #include <log.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <dm/read.h>
 #include <dm/uclass-internal.h>
 #include <errno.h>
diff --git a/drivers/video/logicore_dp_tx.c b/drivers/video/logicore_dp_tx.c
index fe806fd7e56..22dc8b1dc19 100644
--- a/drivers/video/logicore_dp_tx.c
+++ b/drivers/video/logicore_dp_tx.c
@@ -16,6 +16,7 @@
 #include <errno.h>
 #include <stdbool.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/string.h>
diff --git a/drivers/video/logicore_dp_tx.h b/drivers/video/logicore_dp_tx.h
index b760cad12cc..45c449a4860 100644
--- a/drivers/video/logicore_dp_tx.h
+++ b/drivers/video/logicore_dp_tx.h
@@ -12,6 +12,7 @@
 #define __GDSYS_LOGICORE_DP_TX_H__
 
 /*
+#include <asm/types.h>
  * struct logicore_dp_tx_msa - Main Stream Attributes (MSA)
  * @pixel_clock_hz:            The pixel clock of the stream (in Hz)
  * @bits_per_color:            Number of bits per color component
diff --git a/drivers/video/logicore_dp_tx_regif.h b/drivers/video/logicore_dp_tx_regif.h
index e1affd2b67a..e3b7f5b1c4c 100644
--- a/drivers/video/logicore_dp_tx_regif.h
+++ b/drivers/video/logicore_dp_tx_regif.h
@@ -12,6 +12,7 @@
 #ifndef __GDSYS_LOGICORE_DP_TX_REGIF_H__
 #define __GDSYS_LOGICORE_DP_TX_REGIF_H__
 
+#include <asm/types.h>
 enum {
 	/* link configuration field */
 	REG_LINK_BW_SET =		0x000,
diff --git a/drivers/video/mali_dp.c b/drivers/video/mali_dp.c
index 1b58b355264..7006564ead5 100644
--- a/drivers/video/mali_dp.c
+++ b/drivers/video/mali_dp.c
@@ -25,6 +25,7 @@
 #include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define MALIDP_CORE_ID		0x0018
 #define MALIDP_REG_BG_COLOR	0x0044
diff --git a/drivers/video/mb862xx.c b/drivers/video/mb862xx.c
index 8b736f9e737..b45e4b199ef 100644
--- a/drivers/video/mb862xx.c
+++ b/drivers/video/mb862xx.c
@@ -11,6 +11,7 @@
 
 #include <common.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 #include <asm/io.h>
diff --git a/drivers/video/meson/meson_canvas.c b/drivers/video/meson/meson_canvas.c
index eccac2f8f24..2ab288f08df 100644
--- a/drivers/video/meson/meson_canvas.c
+++ b/drivers/video/meson/meson_canvas.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <dm.h>
 #include <asm/io.h>
+#include <asm/types.h>
 
 #include "meson_vpu.h"
 
diff --git a/drivers/video/meson/meson_dw_hdmi.c b/drivers/video/meson/meson_dw_hdmi.c
index 6a2b439afb6..46db20bed3d 100644
--- a/drivers/video/meson/meson_dw_hdmi.c
+++ b/drivers/video/meson/meson_dw_hdmi.c
@@ -5,10 +5,12 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <display.h>
 #include <dm.h>
 #include <edid.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <dw_hdmi.h>
 #include <dm/device-internal.h>
@@ -17,6 +19,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 #include <power/regulator.h>
 #include <clk.h>
 #include <linux/delay.h>
diff --git a/drivers/video/meson/meson_plane.c b/drivers/video/meson/meson_plane.c
index 58dd5500ad6..22a5225d69a 100644
--- a/drivers/video/meson/meson_plane.c
+++ b/drivers/video/meson/meson_plane.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <stdbool.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/bitfield.h>
 #include <linux/bitops.h>
 
diff --git a/drivers/video/meson/meson_registers.h b/drivers/video/meson/meson_registers.h
index f6a5d1ac8ce..be17afd83c1 100644
--- a/drivers/video/meson/meson_registers.h
+++ b/drivers/video/meson/meson_registers.h
@@ -7,6 +7,7 @@
 #define __MESON_REGISTERS_H
 
 /* Shift all registers by 2 */
+#include <asm/types.h>
 #include <linux/bitops.h>
 #define _REG(reg)	((reg) << 2)
 
diff --git a/drivers/video/meson/meson_vclk.c b/drivers/video/meson/meson_vclk.c
index dee5c90bd27..1eba4a08bb6 100644
--- a/drivers/video/meson/meson_vclk.c
+++ b/drivers/video/meson/meson_vclk.c
@@ -9,7 +9,9 @@
 #include <common.h>
 #include <dm.h>
 #include <edid.h>
+#include <stdbool.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/kernel.h>
 #include <linux/printk.h>
diff --git a/drivers/video/meson/meson_venc.c b/drivers/video/meson/meson_venc.c
index 166eaab4df1..d48120858e0 100644
--- a/drivers/video/meson/meson_venc.c
+++ b/drivers/video/meson/meson_venc.c
@@ -14,6 +14,7 @@
 #include <stdbool.h>
 #include <asm/io.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "meson_vpu.h"
 
 enum {
diff --git a/drivers/video/meson/meson_vpu.c b/drivers/video/meson/meson_vpu.c
index 543eef8d205..acfcdbb4905 100644
--- a/drivers/video/meson/meson_vpu.c
+++ b/drivers/video/meson/meson_vpu.c
@@ -13,6 +13,7 @@
 #include <fdt_support.h>
 #include <log.h>
 #include <part.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
diff --git a/drivers/video/meson/meson_vpu.h b/drivers/video/meson/meson_vpu.h
index 0a29e23093c..d3cbd2c3850 100644
--- a/drivers/video/meson/meson_vpu.h
+++ b/drivers/video/meson/meson_vpu.h
@@ -9,8 +9,10 @@
 #ifndef __MESON_VPU_H__
 #define __MESON_VPU_H__
 
+#include <compiler.h>
 #include <stdbool.h>
 #include <video.h>
+#include <asm/types.h>
 #include "meson_registers.h"
 
 struct display_timing;
diff --git a/drivers/video/meson/meson_vpu_init.c b/drivers/video/meson/meson_vpu_init.c
index 3f13c55ee28..5cace830742 100644
--- a/drivers/video/meson/meson_vpu_init.c
+++ b/drivers/video/meson/meson_vpu_init.c
@@ -13,6 +13,7 @@
 #include <stdbool.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
+#include <linux/types.h>
 
 #include "meson_vpu.h"
 
diff --git a/drivers/video/mipi_dsi.c b/drivers/video/mipi_dsi.c
index 405db2ca49a..947c58351c4 100644
--- a/drivers/video/mipi_dsi.c
+++ b/drivers/video/mipi_dsi.c
@@ -42,6 +42,7 @@
 #include <dm/devres.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /**
  * DOC: dsi helpers
diff --git a/drivers/video/mvebu_lcd.c b/drivers/video/mvebu_lcd.c
index 22483f18299..4fdee74049c 100644
--- a/drivers/video/mvebu_lcd.c
+++ b/drivers/video/mvebu_lcd.c
@@ -18,6 +18,7 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <linux/types.h>
 
 #define MVEBU_LCD_WIN_CONTROL(w)	(0xf000 + ((w) << 4))
 #define MVEBU_LCD_WIN_BASE(w)		(0xf004 + ((w) << 4))
diff --git a/drivers/video/mx3fb.c b/drivers/video/mx3fb.c
index c0e0d1e5ea3..823257a74ed 100644
--- a/drivers/video/mx3fb.c
+++ b/drivers/video/mx3fb.c
@@ -14,6 +14,7 @@
 #include <vsprintf.h>
 #include <linux/delay.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/clock.h>
diff --git a/drivers/video/mxsfb.c b/drivers/video/mxsfb.c
index 7a1fbed877a..48c1b4c4a3a 100644
--- a/drivers/video/mxsfb.c
+++ b/drivers/video/mxsfb.c
@@ -6,6 +6,7 @@
  */
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <dm.h>
 #include <env.h>
 #include <log.h>
@@ -21,6 +22,7 @@
 #include <video_fb.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
diff --git a/drivers/video/nexell/s5pxx18_dp.c b/drivers/video/nexell/s5pxx18_dp.c
index e857b004d91..071dddfc46d 100644
--- a/drivers/video/nexell/s5pxx18_dp.c
+++ b/drivers/video/nexell/s5pxx18_dp.c
@@ -13,6 +13,7 @@
 #include <asm/arch/nexell.h>
 #include <asm/arch/display.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #include "soc/s5pxx18_soc_disptop.h"
 #include "soc/s5pxx18_soc_dpc.h"
diff --git a/drivers/video/nexell/s5pxx18_dp_hdmi.c b/drivers/video/nexell/s5pxx18_dp_hdmi.c
index 087cb11f916..c388bce96fa 100644
--- a/drivers/video/nexell/s5pxx18_dp_hdmi.c
+++ b/drivers/video/nexell/s5pxx18_dp_hdmi.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <log.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #include <asm/arch/nexell.h>
 #include <asm/arch/tieoff.h>
diff --git a/drivers/video/nexell/s5pxx18_dp_lvds.c b/drivers/video/nexell/s5pxx18_dp_lvds.c
index 72be625604b..a3ac95e6f4e 100644
--- a/drivers/video/nexell/s5pxx18_dp_lvds.c
+++ b/drivers/video/nexell/s5pxx18_dp_lvds.c
@@ -11,6 +11,7 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #include <asm/arch/nexell.h>
 #include <asm/arch/reset.h>
diff --git a/drivers/video/nexell/s5pxx18_dp_mipi.c b/drivers/video/nexell/s5pxx18_dp_mipi.c
index 2515add4fe7..7450d7ea556 100644
--- a/drivers/video/nexell/s5pxx18_dp_mipi.c
+++ b/drivers/video/nexell/s5pxx18_dp_mipi.c
@@ -5,11 +5,13 @@
  * Author: junghyun, kim <jhkim@nexell.co.kr>
  */
 
+#include <compiler.h>
 #include <config.h>
 #include <common.h>
 #include <errno.h>
 #include <stdbool.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #include <asm/arch/nexell.h>
 #include <asm/arch/tieoff.h>
diff --git a/drivers/video/nexell/soc/s5pxx18_soc_lvds.h b/drivers/video/nexell/soc/s5pxx18_soc_lvds.h
index 08f8e5c406f..e891f7756f4 100644
--- a/drivers/video/nexell/soc/s5pxx18_soc_lvds.h
+++ b/drivers/video/nexell/soc/s5pxx18_soc_lvds.h
@@ -14,6 +14,7 @@
  * #define NUMBER_OF_LVDS_MODULE 1
  * #define PHY_BASEADDR_LVDS_MODULE	0xC010A000
  */
+#include <asm/types.h>
 #define	PHY_BASEADDR_LVDS_LIST	\
 		{ PHY_BASEADDR_LVDS_MODULE }
 
diff --git a/drivers/video/nexell/soc/s5pxx18_soc_mipi.h b/drivers/video/nexell/soc/s5pxx18_soc_mipi.h
index 63751ca83fb..56a9dc7f26c 100644
--- a/drivers/video/nexell/soc/s5pxx18_soc_mipi.h
+++ b/drivers/video/nexell/soc/s5pxx18_soc_mipi.h
@@ -8,6 +8,7 @@
 #ifndef _S5PXX18_SOC_MIPI_H_
 #define _S5PXX18_SOC_MIPI_H_
 
+#include <linux/types.h>
 #define NUMBER_OF_MIPI_MODULE 1
 #define PHY_BASEADDR_MIPI_MODULE	0xC00D0000
 #define	PHY_BASEADDR_MIPI_LIST	\
diff --git a/drivers/video/nexell_display.c b/drivers/video/nexell_display.c
index 1592e9b46ab..7df712d10d3 100644
--- a/drivers/video/nexell_display.c
+++ b/drivers/video/nexell_display.c
@@ -7,6 +7,7 @@
  * Copyright (C) 2020  Stefan Bosch <stefan_b@posteo.net>
  */
 
+#include <compiler.h>
 #include <config.h>
 #include <common.h>
 #include <command.h>
@@ -23,6 +24,7 @@
 #include <asm/arch/display.h>
 #include <asm/arch/display_dev.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include "videomodes.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/video/omap3_dss.c b/drivers/video/omap3_dss.c
index 6efba122e78..0b98c31aa0d 100644
--- a/drivers/video/omap3_dss.c
+++ b/drivers/video/omap3_dss.c
@@ -29,6 +29,7 @@
 #include <asm/io.h>
 #include <asm/arch/dss.h>
 #include <video_fb.h>
+#include <asm/types.h>
 
 /* Configure VENC for a given Mode (NTSC / PAL) */
 void omap3_dss_venc_config(const struct venc_regs *venc_cfg,
diff --git a/drivers/video/orisetech_otm8009a.c b/drivers/video/orisetech_otm8009a.c
index 8bff8e75cb8..41e483c3702 100644
--- a/drivers/video/orisetech_otm8009a.c
+++ b/drivers/video/orisetech_otm8009a.c
@@ -18,6 +18,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <power/regulator.h>
 
 #define OTM8009A_BACKLIGHT_DEFAULT	240
diff --git a/drivers/video/pwm_backlight.c b/drivers/video/pwm_backlight.c
index 45b2bc17a7a..60052f77bc9 100644
--- a/drivers/video/pwm_backlight.c
+++ b/drivers/video/pwm_backlight.c
@@ -16,6 +16,7 @@
 #include <asm/gpio.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <power/regulator.h>
 
 /**
diff --git a/drivers/video/pxa_lcd.c b/drivers/video/pxa_lcd.c
index 79981e99707..b13a7c7b0a7 100644
--- a/drivers/video/pxa_lcd.c
+++ b/drivers/video/pxa_lcd.c
@@ -11,6 +11,7 @@
 /************************************************************************/
 
 #include <common.h>
+#include <compiler.h>
 #include <log.h>
 #include <stdio.h>
 #include <asm/arch/pxa-regs.h>
diff --git a/drivers/video/raydium-rm68200.c b/drivers/video/raydium-rm68200.c
index 33852ec5b4c..95cc0a3183f 100644
--- a/drivers/video/raydium-rm68200.c
+++ b/drivers/video/raydium-rm68200.c
@@ -18,6 +18,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <power/regulator.h>
 
 /*** Manufacturer Command Set ***/
diff --git a/drivers/video/rockchip/rk3288_vop.c b/drivers/video/rockchip/rk3288_vop.c
index e1f7850040b..dba5821654c 100644
--- a/drivers/video/rockchip/rk3288_vop.c
+++ b/drivers/video/rockchip/rk3288_vop.c
@@ -18,6 +18,7 @@
 #include <asm/arch-rockchip/hardware.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include "rk_vop.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/video/rockchip/rk3399_vop.c b/drivers/video/rockchip/rk3399_vop.c
index db1fb8093d7..492f0c0efca 100644
--- a/drivers/video/rockchip/rk3399_vop.c
+++ b/drivers/video/rockchip/rk3399_vop.c
@@ -15,6 +15,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include "rk_vop.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/video/rockchip/rk_edp.c b/drivers/video/rockchip/rk_edp.c
index 49fe635229d..45145d690b1 100644
--- a/drivers/video/rockchip/rk_edp.c
+++ b/drivers/video/rockchip/rk_edp.c
@@ -13,6 +13,7 @@
 #include <malloc.h>
 #include <panel.h>
 #include <regmap.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <syscon.h>
 #include <time.h>
@@ -27,6 +28,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define MAX_CR_LOOP 5
 #define MAX_EQ_LOOP 5
diff --git a/drivers/video/rockchip/rk_hdmi.c b/drivers/video/rockchip/rk_hdmi.c
index f27cdf8ed4b..7607a447343 100644
--- a/drivers/video/rockchip/rk_hdmi.c
+++ b/drivers/video/rockchip/rk_hdmi.c
@@ -18,6 +18,7 @@
 #include <asm/io.h>
 #include <asm/arch-rockchip/clock.h>
 #include <asm/arch-rockchip/hardware.h>
+#include <linux/types.h>
 #include "rk_hdmi.h"
 #include "rk_vop.h" /* for rk_vop_probe_regulators */
 
diff --git a/drivers/video/rockchip/rk_hdmi.h b/drivers/video/rockchip/rk_hdmi.h
index 5767ef14437..82c0ada13b6 100644
--- a/drivers/video/rockchip/rk_hdmi.h
+++ b/drivers/video/rockchip/rk_hdmi.h
@@ -6,6 +6,7 @@
 #ifndef __RK_HDMI_H__
 #define __RK_HDMI_H__
 
+#include <asm/types.h>
 struct rkhdmi_driverdata {
 	/* configuration */
 	u8 i2c_clk_high;
diff --git a/drivers/video/rockchip/rk_lvds.c b/drivers/video/rockchip/rk_lvds.c
index c9890feac0f..283905b8319 100644
--- a/drivers/video/rockchip/rk_lvds.c
+++ b/drivers/video/rockchip/rk_lvds.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <display.h>
 #include <dm.h>
 #include <edid.h>
@@ -18,6 +19,7 @@
 #include <asm/arch-rockchip/grf_rk3288.h>
 #include <asm/arch-rockchip/hardware.h>
 #include <asm/arch-rockchip/lvds_rk3288.h>
+#include <asm/types.h>
 #include <dt-bindings/clock/rk3288-cru.h>
 #include <dt-bindings/video/rk3288.h>
 #include <linux/errno.h>
diff --git a/drivers/video/rockchip/rk_mipi.c b/drivers/video/rockchip/rk_mipi.c
index 2438d44cf3f..cc4754ebbc1 100644
--- a/drivers/video/rockchip/rk_mipi.c
+++ b/drivers/video/rockchip/rk_mipi.c
@@ -13,6 +13,7 @@
 #include <regmap.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include "rk_mipi.h"
 #include <syscon.h>
 #include <asm/gpio.h>
diff --git a/drivers/video/rockchip/rk_mipi.h b/drivers/video/rockchip/rk_mipi.h
index 61920f23ad9..15cce849e52 100644
--- a/drivers/video/rockchip/rk_mipi.h
+++ b/drivers/video/rockchip/rk_mipi.h
@@ -7,6 +7,7 @@
 #ifndef __RK_MIPI_H
 #define __RK_MIPI_H
 
+#include <linux/types.h>
 struct rk_mipi_priv {
 	uintptr_t regs;
 	void *grf;
diff --git a/drivers/video/rockchip/rk_vop.c b/drivers/video/rockchip/rk_vop.c
index 41541ef8222..10122b37683 100644
--- a/drivers/video/rockchip/rk_vop.c
+++ b/drivers/video/rockchip/rk_vop.c
@@ -24,6 +24,7 @@
 #include <linux/bitops.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <power/regulator.h>
 #include "rk_vop.h"
 
diff --git a/drivers/video/rockchip/rk_vop.h b/drivers/video/rockchip/rk_vop.h
index 8fa2f389390..1ee61fad43a 100644
--- a/drivers/video/rockchip/rk_vop.h
+++ b/drivers/video/rockchip/rk_vop.h
@@ -7,6 +7,7 @@
 #define __RK_VOP_H__
 
 #include <asm/arch-rockchip/vop_rk3288.h>
+#include <asm/types.h>
 
 struct rk_vop_priv {
 	void *grf;
diff --git a/drivers/video/sandbox_osd.c b/drivers/video/sandbox_osd.c
index ab6abae520e..079a13b4831 100644
--- a/drivers/video/sandbox_osd.c
+++ b/drivers/video/sandbox_osd.c
@@ -10,6 +10,7 @@
 #include <video_osd.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "sandbox_osd.h"
 
diff --git a/drivers/video/scf0403_lcd.c b/drivers/video/scf0403_lcd.c
index 0d5de4c4dda..55d0c5b2f28 100644
--- a/drivers/video/scf0403_lcd.c
+++ b/drivers/video/scf0403_lcd.c
@@ -18,6 +18,7 @@
 #include <stdio.h>
 #include <asm/gpio.h>
 #include <spi.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
 
diff --git a/drivers/video/ssd2828.c b/drivers/video/ssd2828.c
index a620a579fd7..bea5618b770 100644
--- a/drivers/video/ssd2828.c
+++ b/drivers/video/ssd2828.c
@@ -15,6 +15,7 @@
 #include <stdio.h>
 #include <asm/arch/gpio.h>
 #include <asm/gpio.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
 
diff --git a/drivers/video/stb_truetype.h b/drivers/video/stb_truetype.h
index 93518d200ff..02e8f8330ba 100644
--- a/drivers/video/stb_truetype.h
+++ b/drivers/video/stb_truetype.h
@@ -194,6 +194,7 @@
 // NOTES
 //
 //   The system uses the raw data found in the .ttf file without changing it
+#include <linux/types.h>
 //   and without building auxiliary data structures. This is a bit inefficient
 //   on little-endian systems (the data is big-endian), but assuming you're
 //   caching the bitmaps or glyph shapes this shouldn't be a big deal.
diff --git a/drivers/video/stm32/stm32_dsi.c b/drivers/video/stm32/stm32_dsi.c
index f58aa885f32..bc1e553006e 100644
--- a/drivers/video/stm32/stm32_dsi.c
+++ b/drivers/video/stm32/stm32_dsi.c
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <dm.h>
 #include <dsi_host.h>
 #include <log.h>
@@ -21,6 +22,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/gpio.h>
+#include <asm/types.h>
 #include <dm/device-internal.h>
 #include <dm/device_compat.h>
 #include <dm/lists.h>
diff --git a/drivers/video/stm32/stm32_ltdc.c b/drivers/video/stm32/stm32_ltdc.c
index a763f13fe15..27cc8c4b4a7 100644
--- a/drivers/video/stm32/stm32_ltdc.c
+++ b/drivers/video/stm32/stm32_ltdc.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <display.h>
 #include <dm.h>
 #include <log.h>
@@ -23,6 +24,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 struct stm32_ltdc_priv {
 	void __iomem *regs;
diff --git a/drivers/video/sunxi/lcdc.c b/drivers/video/sunxi/lcdc.c
index 8814bc36814..ab236ccbc6a 100644
--- a/drivers/video/sunxi/lcdc.c
+++ b/drivers/video/sunxi/lcdc.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <log.h>
 #include <stdbool.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 #include <asm/arch/clock.h>
diff --git a/drivers/video/sunxi/sunxi_de2.c b/drivers/video/sunxi/sunxi_de2.c
index a5d85507057..9f2638a1025 100644
--- a/drivers/video/sunxi/sunxi_de2.c
+++ b/drivers/video/sunxi/sunxi_de2.c
@@ -26,6 +26,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "simplefb_common.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/video/sunxi/sunxi_display.c b/drivers/video/sunxi/sunxi_display.c
index 6c25910f67d..0f21cb01a1c 100644
--- a/drivers/video/sunxi/sunxi_display.c
+++ b/drivers/video/sunxi/sunxi_display.c
@@ -10,6 +10,7 @@
 #include <cpu_func.h>
 #include <efi_loader.h>
 #include <init.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <asm/u-boot.h>
@@ -17,6 +18,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <asm/arch/clock.h>
 #include <asm/arch/display.h>
diff --git a/drivers/video/sunxi/sunxi_dw_hdmi.c b/drivers/video/sunxi/sunxi_dw_hdmi.c
index b601328b6b3..b371bb8ce1f 100644
--- a/drivers/video/sunxi/sunxi_dw_hdmi.c
+++ b/drivers/video/sunxi/sunxi_dw_hdmi.c
@@ -19,6 +19,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 struct sunxi_dw_hdmi_priv {
 	struct dw_hdmi hdmi;
diff --git a/drivers/video/sunxi/sunxi_lcd.c b/drivers/video/sunxi/sunxi_lcd.c
index 841ef433493..63eec9fe88a 100644
--- a/drivers/video/sunxi/sunxi_lcd.c
+++ b/drivers/video/sunxi/sunxi_lcd.c
@@ -18,6 +18,7 @@
 #include <asm/arch/lcdc.h>
 #include <asm/arch/gpio.h>
 #include <asm/gpio.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 
diff --git a/drivers/video/tda19988.c b/drivers/video/tda19988.c
index bead13f2934..96861b953d9 100644
--- a/drivers/video/tda19988.c
+++ b/drivers/video/tda19988.c
@@ -10,6 +10,7 @@
 #include <display.h>
 #include <i2c.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/video/tegra.c b/drivers/video/tegra.c
index 2bacfa86dad..bce50d49bf7 100644
--- a/drivers/video/tegra.c
+++ b/drivers/video/tegra.c
@@ -17,6 +17,7 @@
 #include <asm/system.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 
diff --git a/drivers/video/tegra124/display.c b/drivers/video/tegra124/display.c
index bb2f46be558..0926a385c2b 100644
--- a/drivers/video/tegra124/display.c
+++ b/drivers/video/tegra124/display.c
@@ -27,6 +27,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include "displayport.h"
 
 /* return in 1000ths of a Hertz */
diff --git a/drivers/video/tegra124/displayport.h b/drivers/video/tegra124/displayport.h
index a3044475aeb..f87929f8162 100644
--- a/drivers/video/tegra124/displayport.h
+++ b/drivers/video/tegra124/displayport.h
@@ -6,6 +6,7 @@
 #ifndef _TEGRA_DISPLAYPORT_H
 #define _TEGRA_DISPLAYPORT_H
 
+#include <asm/types.h>
 #include <linux/drm_dp_helper.h>
 
 struct dpaux_ctlr {
diff --git a/drivers/video/tegra124/dp.c b/drivers/video/tegra124/dp.c
index ed1f9022bab..c6f7d564e6e 100644
--- a/drivers/video/tegra124/dp.c
+++ b/drivers/video/tegra124/dp.c
@@ -10,6 +10,7 @@
 #include <div64.h>
 #include <errno.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <video_bridge.h>
@@ -19,6 +20,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "display.h"
 #include "edid.h"
 #include "sor.h"
diff --git a/drivers/video/tegra124/sor.c b/drivers/video/tegra124/sor.c
index 17a1f75a9bf..6ae98651cb5 100644
--- a/drivers/video/tegra124/sor.c
+++ b/drivers/video/tegra124/sor.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <panel.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <syscon.h>
 #include <time.h>
@@ -19,6 +20,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 #include "displayport.h"
 #include "sor.h"
 #include <linux/err.h>
diff --git a/drivers/video/tegra124/sor.h b/drivers/video/tegra124/sor.h
index 2fc9a38267d..4ae14ecba31 100644
--- a/drivers/video/tegra124/sor.h
+++ b/drivers/video/tegra124/sor.h
@@ -6,6 +6,7 @@
 #ifndef _VIDEO_TEGRA124_SOR_H
 #define _VIDEO_TEGRA124_SOR_H
 
+#include <asm/types.h>
 #define SUPER_STATE0					0x1
 #define SUPER_STATE0_UPDATE_SHIFT			0
 #define SUPER_STATE0_UPDATE_DEFAULT_MASK		0x1
diff --git a/drivers/video/vesa.c b/drivers/video/vesa.c
index 9656326bdb1..a466151a85e 100644
--- a/drivers/video/vesa.c
+++ b/drivers/video/vesa.c
@@ -10,6 +10,7 @@
 #include <vbe.h>
 #include <video.h>
 #include <asm/mtrr.h>
+#include <linux/types.h>
 
 static int vesa_video_probe(struct udevice *dev)
 {
diff --git a/drivers/video/vidconsole-uclass.c b/drivers/video/vidconsole-uclass.c
index 204828d594a..e37adf3f128 100644
--- a/drivers/video/vidconsole-uclass.c
+++ b/drivers/video/vidconsole-uclass.c
@@ -20,6 +20,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /*
  * Structure to describe a console color
diff --git a/drivers/video/video-uclass.c b/drivers/video/video-uclass.c
index dcbe2480084..24a68156022 100644
--- a/drivers/video/video-uclass.c
+++ b/drivers/video/video-uclass.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <mapmem.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdio_dev.h>
 #include <time.h>
@@ -27,6 +28,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /*
  * Theory of operation:
diff --git a/drivers/video/video_bmp.c b/drivers/video/video_bmp.c
index c83f41631b6..86280235a74 100644
--- a/drivers/video/video_bmp.c
+++ b/drivers/video/video_bmp.c
@@ -5,16 +5,19 @@
 
 #include <common.h>
 #include <bmp_layout.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
 #include <mapmem.h>
 #include <splash.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <video.h>
 #include <watchdog.h>
 #include <asm/unaligned.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_VIDEO_BMP_RLE8
 #define BMP_RLE8_ESCAPE		0
diff --git a/drivers/video/video_osd-uclass.c b/drivers/video/video_osd-uclass.c
index 82136a292bf..9ac3fe6c385 100644
--- a/drivers/video/video_osd-uclass.c
+++ b/drivers/video/video_osd-uclass.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <video_osd.h>
+#include <linux/types.h>
 
 int video_osd_get_info(struct udevice *dev, struct video_osd_info *info)
 {
diff --git a/drivers/virtio/virtio-uclass.c b/drivers/virtio/virtio-uclass.c
index da0945b5c60..6bb044fa72b 100644
--- a/drivers/virtio/virtio-uclass.c
+++ b/drivers/virtio/virtio-uclass.c
@@ -22,6 +22,7 @@
 #include <virtio_types.h>
 #include <virtio.h>
 #include <vsprintf.h>
+#include <asm/types.h>
 #include <dm/lists.h>
 #include <linux/bug.h>
 #include <linux/errno.h>
diff --git a/drivers/virtio/virtio_blk.c b/drivers/virtio/virtio_blk.c
index 5117b925126..ac55e546de3 100644
--- a/drivers/virtio/virtio_blk.c
+++ b/drivers/virtio/virtio_blk.c
@@ -13,6 +13,7 @@
 #include <virtio_ring.h>
 #include <vsprintf.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include "virtio_blk.h"
 
 struct virtio_blk_priv {
diff --git a/drivers/virtio/virtio_blk.h b/drivers/virtio/virtio_blk.h
index 8d8e02fa2ea..700f42a543e 100644
--- a/drivers/virtio/virtio_blk.h
+++ b/drivers/virtio/virtio_blk.h
@@ -10,6 +10,7 @@
 #define _LINUX_VIRTIO_BLK_H
 
 /* Feature bits */
+#include <compiler.h>
 #define VIRTIO_BLK_F_SIZE_MAX	1	/* Indicates maximum segment size */
 #define VIRTIO_BLK_F_SEG_MAX	2	/* Indicates maximum # of segments */
 #define VIRTIO_BLK_F_GEOMETRY	4	/* Legacy geometry available */
diff --git a/drivers/virtio/virtio_mmio.c b/drivers/virtio/virtio_mmio.c
index 42baf5c9fd2..a824de57987 100644
--- a/drivers/virtio/virtio_mmio.c
+++ b/drivers/virtio/virtio_mmio.c
@@ -8,6 +8,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
 #include <virtio_types.h>
@@ -19,6 +20,7 @@
 #include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "virtio_mmio.h"
 
 static int virtio_mmio_get_config(struct udevice *udev, unsigned int offset,
diff --git a/drivers/virtio/virtio_mmio.h b/drivers/virtio/virtio_mmio.h
index b446674ccce..bada3353573 100644
--- a/drivers/virtio/virtio_mmio.h
+++ b/drivers/virtio/virtio_mmio.h
@@ -12,6 +12,8 @@
 /* Control registers */
 
 /* Magic value ("virt" string) - Read Only */
+#include <compiler.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #define VIRTIO_MMIO_MAGIC_VALUE		0x000
 
diff --git a/drivers/virtio/virtio_net.c b/drivers/virtio/virtio_net.c
index d20ea6325f4..8e03fb396a8 100644
--- a/drivers/virtio/virtio_net.c
+++ b/drivers/virtio/virtio_net.c
@@ -7,12 +7,14 @@
 #include <common.h>
 #include <dm.h>
 #include <net.h>
+#include <stdbool.h>
 #include <virtio_types.h>
 #include <virtio.h>
 #include <virtio_ring.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "virtio_net.h"
 
 /* Amount of buffers to keep in the RX virtqueue */
diff --git a/drivers/virtio/virtio_net.h b/drivers/virtio/virtio_net.h
index c92bae52690..07001d8c933 100644
--- a/drivers/virtio/virtio_net.h
+++ b/drivers/virtio/virtio_net.h
@@ -10,6 +10,7 @@
 #define _LINUX_VIRTIO_NET_H
 
 /* TODO: needs to be removed! */
+#include <compiler.h>
 #define ETH_ALEN				6
 
 /* The feature bitmap for virtio net */
diff --git a/drivers/virtio/virtio_pci.h b/drivers/virtio/virtio_pci.h
index cc753ed7b3d..e7952046884 100644
--- a/drivers/virtio/virtio_pci.h
+++ b/drivers/virtio/virtio_pci.h
@@ -69,6 +69,7 @@
 #endif /* VIRTIO_PCI_NO_LEGACY */
 
 /* The bit of the ISR which indicates a device configuration change */
+#include <linux/types.h>
 #define VIRTIO_PCI_ISR_CONFIG		0x2
 /* Vector value used to disable MSI for queue */
 #define VIRTIO_MSI_NO_VECTOR		0xffff
diff --git a/drivers/virtio/virtio_pci_legacy.c b/drivers/virtio/virtio_pci_legacy.c
index bef5dd1ca3c..a92068b795d 100644
--- a/drivers/virtio/virtio_pci_legacy.c
+++ b/drivers/virtio/virtio_pci_legacy.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
 #include <stdio.h>
@@ -20,6 +21,7 @@
 #include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/io.h>
+#include <linux/types.h>
 #include "virtio_pci.h"
 
 #define VIRTIO_PCI_DRV_NAME	"virtio-pci.l"
diff --git a/drivers/virtio/virtio_pci_modern.c b/drivers/virtio/virtio_pci_modern.c
index 9edb271e929..1ebb7f2e899 100644
--- a/drivers/virtio/virtio_pci_modern.c
+++ b/drivers/virtio/virtio_pci_modern.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
 #include <stdio.h>
@@ -22,6 +23,7 @@
 #include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "virtio_pci.h"
 
 #define VIRTIO_PCI_DRV_NAME	"virtio-pci.m"
diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c
index a5dbb0dd7f8..97893f49a5c 100644
--- a/drivers/virtio/virtio_ring.c
+++ b/drivers/virtio/virtio_ring.c
@@ -19,6 +19,7 @@
 #include <linux/compat.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 int virtqueue_add(struct virtqueue *vq, struct virtio_sg *sgs[],
 		  unsigned int out_sgs, unsigned int in_sgs)
diff --git a/drivers/virtio/virtio_rng.c b/drivers/virtio/virtio_rng.c
index dadaaa449ce..0d39ea057c1 100644
--- a/drivers/virtio/virtio_rng.c
+++ b/drivers/virtio/virtio_rng.c
@@ -12,6 +12,7 @@
 #include <virtio_ring.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define BUFFER_SIZE	16UL
 
diff --git a/drivers/virtio/virtio_sandbox.c b/drivers/virtio/virtio_sandbox.c
index 8fb04b8b39e..4c6c8653e74 100644
--- a/drivers/virtio/virtio_sandbox.c
+++ b/drivers/virtio/virtio_sandbox.c
@@ -16,6 +16,7 @@
 #include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/io.h>
+#include <linux/types.h>
 
 struct virtio_sandbox_priv {
 	u8 id;
diff --git a/drivers/w1-eeprom/ds24xxx.c b/drivers/w1-eeprom/ds24xxx.c
index 0967accdf00..23e7a573f5d 100644
--- a/drivers/w1-eeprom/ds24xxx.c
+++ b/drivers/w1-eeprom/ds24xxx.c
@@ -8,6 +8,7 @@
  */
 
 #include <common.h>
+#include <asm/types.h>
 #include <linux/err.h>
 #include <dm.h>
 #include <w1-eeprom.h>
diff --git a/drivers/w1-eeprom/ds2502.c b/drivers/w1-eeprom/ds2502.c
index 167351055af..c1f2055681e 100644
--- a/drivers/w1-eeprom/ds2502.c
+++ b/drivers/w1-eeprom/ds2502.c
@@ -22,6 +22,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <asm/types.h>
 #include <dm/device_compat.h>
 #include <linux/err.h>
 #include <w1-eeprom.h>
diff --git a/drivers/w1-eeprom/eep_sandbox.c b/drivers/w1-eeprom/eep_sandbox.c
index 86c02b9b915..53a46a58d51 100644
--- a/drivers/w1-eeprom/eep_sandbox.c
+++ b/drivers/w1-eeprom/eep_sandbox.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <asm/types.h>
 #include <linux/err.h>
 #include <dm.h>
 #include <w1-eeprom.h>
diff --git a/drivers/w1-eeprom/w1-eeprom-uclass.c b/drivers/w1-eeprom/w1-eeprom-uclass.c
index 07e1c12e5ce..85cf10637f6 100644
--- a/drivers/w1-eeprom/w1-eeprom-uclass.c
+++ b/drivers/w1-eeprom/w1-eeprom-uclass.c
@@ -16,6 +16,7 @@
 #include <stdio.h>
 #include <w1.h>
 #include <w1-eeprom.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 
 #include <dm/device-internal.h>
diff --git a/drivers/w1/mxc_w1.c b/drivers/w1/mxc_w1.c
index 44047ea2bfe..949d9535c45 100644
--- a/drivers/w1/mxc_w1.c
+++ b/drivers/w1/mxc_w1.c
@@ -21,6 +21,7 @@
 #include <asm/arch/clock.h>
 #include <common.h>
 #include <dm.h>
+#include <asm/types.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/drivers/w1/w1-gpio.c b/drivers/w1/w1-gpio.c
index b54f169adfb..ada30f18143 100644
--- a/drivers/w1/w1-gpio.c
+++ b/drivers/w1/w1-gpio.c
@@ -13,6 +13,7 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include <w1.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 #include <asm/gpio.h>
diff --git a/drivers/w1/w1-uclass.c b/drivers/w1/w1-uclass.c
index 9b9913a90d0..d94408234b3 100644
--- a/drivers/w1/w1-uclass.c
+++ b/drivers/w1/w1-uclass.c
@@ -17,6 +17,7 @@
 #include <stdio.h>
 #include <w1.h>
 #include <w1-eeprom.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 
 #include <dm/device-internal.h>
diff --git a/drivers/watchdog/armada-37xx-wdt.c b/drivers/watchdog/armada-37xx-wdt.c
index b845e2b2e3d..e27e0c02711 100644
--- a/drivers/watchdog/armada-37xx-wdt.c
+++ b/drivers/watchdog/armada-37xx-wdt.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <wdt.h>
 #include <asm/global_data.h>
@@ -14,6 +15,7 @@
 #include <asm/arch/soc.h>
 #include <dm/device_compat.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/watchdog/ast_wdt.c b/drivers/watchdog/ast_wdt.c
index 0f858b181c3..b483ba05c30 100644
--- a/drivers/watchdog/ast_wdt.c
+++ b/drivers/watchdog/ast_wdt.c
@@ -12,6 +12,7 @@
 #include <asm/arch/wdt.h>
 #include <linux/err.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #define WDT_AST2500	2500
 #define WDT_AST2400	2400
diff --git a/drivers/watchdog/at91sam9_wdt.c b/drivers/watchdog/at91sam9_wdt.c
index ad602a8eb34..02d020cdaab 100644
--- a/drivers/watchdog/at91sam9_wdt.c
+++ b/drivers/watchdog/at91sam9_wdt.c
@@ -26,6 +26,7 @@
 #include <wdt.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/watchdog/bcm6345_wdt.c b/drivers/watchdog/bcm6345_wdt.c
index 5999561efd2..ffdd29204ff 100644
--- a/drivers/watchdog/bcm6345_wdt.c
+++ b/drivers/watchdog/bcm6345_wdt.c
@@ -8,12 +8,14 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
 #include <wdt.h>
 #include <clk.h>
 #include <asm/io.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 /* WDT Value register */
 #define WDT_VAL_REG		0x0
diff --git a/drivers/watchdog/cdns_wdt.c b/drivers/watchdog/cdns_wdt.c
index a7f9095e2cd..34b26822e95 100644
--- a/drivers/watchdog/cdns_wdt.c
+++ b/drivers/watchdog/cdns_wdt.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <stdbool.h>
 #include <wdt.h>
 #include <clk.h>
 #include <div64.h>
@@ -16,6 +17,7 @@
 #include <linux/err.h>
 #include <linux/io.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 struct cdns_regs {
 	u32 zmr;	/* WD Zero mode register, offset - 0x0 */
diff --git a/drivers/watchdog/cortina_wdt.c b/drivers/watchdog/cortina_wdt.c
index 0f60b3a6322..a362a5c020d 100644
--- a/drivers/watchdog/cortina_wdt.c
+++ b/drivers/watchdog/cortina_wdt.c
@@ -5,12 +5,14 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <hang.h>
 #include <asm/io.h>
 #include <wdt.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #define CA_WDT_CTRL		0x00
 #define CA_WDT_PS		0x04
diff --git a/drivers/watchdog/designware_wdt.c b/drivers/watchdog/designware_wdt.c
index 06783650bed..5a3ae6001c3 100644
--- a/drivers/watchdog/designware_wdt.c
+++ b/drivers/watchdog/designware_wdt.c
@@ -5,6 +5,7 @@
 
 #include <clk.h>
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <reset.h>
 #include <wdt.h>
@@ -13,6 +14,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #define DW_WDT_CR	0x00
 #define DW_WDT_TORR	0x04
diff --git a/drivers/watchdog/imx_watchdog.c b/drivers/watchdog/imx_watchdog.c
index d36b8b14931..444796a6e2c 100644
--- a/drivers/watchdog/imx_watchdog.c
+++ b/drivers/watchdog/imx_watchdog.c
@@ -5,9 +5,11 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <dm.h>
 #include <hang.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <wdt.h>
 #include <watchdog.h>
@@ -19,6 +21,7 @@
 #include <div64.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #define TIMEOUT_MAX	128000
 #define TIMEOUT_MIN	500
diff --git a/drivers/watchdog/mpc8xx_wdt.c b/drivers/watchdog/mpc8xx_wdt.c
index d2277356cc4..9db1cab6db5 100644
--- a/drivers/watchdog/mpc8xx_wdt.c
+++ b/drivers/watchdog/mpc8xx_wdt.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <env.h>
 #include <dm.h>
 #include <wdt.h>
@@ -12,6 +13,7 @@
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 void hw_watchdog_reset(void)
 {
diff --git a/drivers/watchdog/mt7621_wdt.c b/drivers/watchdog/mt7621_wdt.c
index d033d95b6f5..f90373bdcaa 100644
--- a/drivers/watchdog/mt7621_wdt.c
+++ b/drivers/watchdog/mt7621_wdt.c
@@ -10,12 +10,14 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <wdt.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/io.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/watchdog/mtk_wdt.c b/drivers/watchdog/mtk_wdt.c
index 2a38bef43ec..41bd000a092 100644
--- a/drivers/watchdog/mtk_wdt.c
+++ b/drivers/watchdog/mtk_wdt.c
@@ -7,12 +7,14 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <hang.h>
 #include <wdt.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #define MTK_WDT_MODE			0x00
 #define MTK_WDT_LENGTH			0x04
diff --git a/drivers/watchdog/omap_wdt.c b/drivers/watchdog/omap_wdt.c
index 9d3896a5d99..8da65d78464 100644
--- a/drivers/watchdog/omap_wdt.c
+++ b/drivers/watchdog/omap_wdt.c
@@ -47,6 +47,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 /* Hardware timeout in seconds */
 #define WDT_HW_TIMEOUT 60
diff --git a/drivers/watchdog/orion_wdt.c b/drivers/watchdog/orion_wdt.c
index 804a7681107..4ec584dcf00 100644
--- a/drivers/watchdog/orion_wdt.c
+++ b/drivers/watchdog/orion_wdt.c
@@ -13,9 +13,11 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <clk.h>
 #include <log.h>
+#include <stdbool.h>
 #include <wdt.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
@@ -24,6 +26,7 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/watchdog/sandbox_wdt.c b/drivers/watchdog/sandbox_wdt.c
index e05d82789f6..729f59dcc38 100644
--- a/drivers/watchdog/sandbox_wdt.c
+++ b/drivers/watchdog/sandbox_wdt.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <wdt.h>
 #include <asm/state.h>
+#include <linux/types.h>
 
 static int sandbox_wdt_start(struct udevice *dev, u64 timeout, ulong flags)
 {
diff --git a/drivers/watchdog/sbsa_gwdt.c b/drivers/watchdog/sbsa_gwdt.c
index 1e44df1da29..cc3fbfceada 100644
--- a/drivers/watchdog/sbsa_gwdt.c
+++ b/drivers/watchdog/sbsa_gwdt.c
@@ -5,6 +5,7 @@
  * Copyright 2020 NXP
  */
 
+#include <compiler.h>
 #include <time.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
@@ -16,6 +17,7 @@
 #include <linux/err.h>
 #include <watchdog.h>
 #include <wdt.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/watchdog/sp805_wdt.c b/drivers/watchdog/sp805_wdt.c
index 0eea0ab388e..aee2fe7ad27 100644
--- a/drivers/watchdog/sp805_wdt.c
+++ b/drivers/watchdog/sp805_wdt.c
@@ -5,6 +5,7 @@
  * Copyright 2019 NXP
  */
 
+#include <compiler.h>
 #include <log.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
@@ -17,6 +18,7 @@
 #include <watchdog.h>
 #include <wdt.h>
 #include <linux/err.h>
+#include <linux/types.h>
 
 #define WDTLOAD			0x000
 #define WDTCONTROL		0x008
diff --git a/drivers/watchdog/stm32mp_wdt.c b/drivers/watchdog/stm32mp_wdt.c
index c45dbdc9bdb..cb103988b62 100644
--- a/drivers/watchdog/stm32mp_wdt.c
+++ b/drivers/watchdog/stm32mp_wdt.c
@@ -14,6 +14,7 @@
 #include <linux/errno.h>
 #include <linux/iopoll.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 /* IWDG registers */
 #define IWDG_KR		0x00	/* Key register */
diff --git a/drivers/watchdog/tangier_wdt.c b/drivers/watchdog/tangier_wdt.c
index 050e97f392a..59ec86864d8 100644
--- a/drivers/watchdog/tangier_wdt.c
+++ b/drivers/watchdog/tangier_wdt.c
@@ -9,6 +9,7 @@
 #include <div64.h>
 #include <asm/scu.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 /* Hardware timeout in seconds */
 #define WDT_PRETIMEOUT		15
diff --git a/drivers/watchdog/ulp_wdog.c b/drivers/watchdog/ulp_wdog.c
index 7533fc612c7..8630f43ed62 100644
--- a/drivers/watchdog/ulp_wdog.c
+++ b/drivers/watchdog/ulp_wdog.c
@@ -7,6 +7,7 @@
 #include <cpu_func.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
+#include <linux/types.h>
 
 /*
  * MX7ULP WDOG Register Map
diff --git a/drivers/watchdog/wdt-uclass.c b/drivers/watchdog/wdt-uclass.c
index e2791a0dba0..0b5dca24851 100644
--- a/drivers/watchdog/wdt-uclass.c
+++ b/drivers/watchdog/wdt-uclass.c
@@ -15,6 +15,7 @@
 #include <dm/device-internal.h>
 #include <dm/lists.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/watchdog/xilinx_tb_wdt.c b/drivers/watchdog/xilinx_tb_wdt.c
index 5047cd04561..a5dd4092ea2 100644
--- a/drivers/watchdog/xilinx_tb_wdt.c
+++ b/drivers/watchdog/xilinx_tb_wdt.c
@@ -11,10 +11,12 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <stdbool.h>
 #include <wdt.h>
 #include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/io.h>
+#include <linux/types.h>
 
 #define XWT_CSR0_WRS_MASK	0x00000008 /* Reset status Mask */
 #define XWT_CSR0_WDS_MASK	0x00000004 /* Timer state Mask */
diff --git a/drivers/watchdog/xilinx_wwdt.c b/drivers/watchdog/xilinx_wwdt.c
index b688ebf0938..0c8211cebf4 100644
--- a/drivers/watchdog/xilinx_wwdt.c
+++ b/drivers/watchdog/xilinx_wwdt.c
@@ -17,6 +17,7 @@
 #include <linux/compat.h>
 #include <linux/errno.h>
 #include <linux/io.h>
+#include <linux/types.h>
 
 /* Refresh Register Masks */
 #define XWT_WWREF_GWRR_MASK	BIT(0) /* Refresh and start new period */
diff --git a/env/common.c b/env/common.c
index 7b0a7b38e24..14dc646af77 100644
--- a/env/common.c
+++ b/env/common.c
@@ -24,6 +24,7 @@
 #include <errno.h>
 #include <malloc.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <u-boot/crc.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/env/eeprom.c b/env/eeprom.c
index ba168014e24..71c70ed826d 100644
--- a/env/eeprom.c
+++ b/env/eeprom.c
@@ -14,6 +14,7 @@
 #include <env_internal.h>
 #include <asm/global_data.h>
 #include <linux/stddef.h>
+#include <linux/types.h>
 #include <u-boot/crc.h>
 #if defined(CONFIG_I2C_ENV_EEPROM_BUS)
 #include <i2c.h>
diff --git a/env/env.c b/env/env.c
index e1a36b658fc..569cba36974 100644
--- a/env/env.c
+++ b/env/env.c
@@ -5,15 +5,18 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <env.h>
 #include <env_internal.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/bug.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/env/ext4.c b/env/ext4.c
index 59ed02c0ca1..6dd77d78413 100644
--- a/env/ext4.c
+++ b/env/ext4.c
@@ -19,10 +19,12 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <part.h>
 #include <stdio.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <command.h>
 #include <env.h>
diff --git a/env/fat.c b/env/fat.c
index c4c09fee02b..b65ecee620c 100644
--- a/env/fat.c
+++ b/env/fat.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <env.h>
 #include <env_internal.h>
 #include <part.h>
@@ -22,6 +23,7 @@
 #include <linux/errno.h>
 #include <linux/stddef.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_SPL_BUILD
 /* TODO(sjg at chromium.org): Figure out why this is needed */
diff --git a/env/flags.c b/env/flags.c
index 8cd03336a3f..feaddce9536 100644
--- a/env/flags.c
+++ b/env/flags.c
@@ -5,6 +5,7 @@
  */
 
 #include <env.h>
+#include <stdbool.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/ctype.h>
diff --git a/env/flash.c b/env/flash.c
index 7e355d22726..a8ee4c31616 100644
--- a/env/flash.c
+++ b/env/flash.c
@@ -22,6 +22,7 @@
 #include <search.h>
 #include <errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <u-boot/crc.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/env/mmc.c b/env/mmc.c
index d6a6f48ef81..a6ba52554ff 100644
--- a/env/mmc.c
+++ b/env/mmc.c
@@ -6,12 +6,14 @@
 /* #define DEBUG */
 
 #include <common.h>
+#include <compiler.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <command.h>
 #include <env.h>
diff --git a/env/nand.c b/env/nand.c
index 18d43c0503a..5f42b38cc7e 100644
--- a/env/nand.c
+++ b/env/nand.c
@@ -27,6 +27,7 @@
 #include <nand.h>
 #include <search.h>
 #include <errno.h>
+#include <linux/types.h>
 #include <u-boot/crc.h>
 
 #if defined(CONFIG_CMD_SAVEENV) && defined(CONFIG_CMD_NAND) && \
diff --git a/env/nowhere.c b/env/nowhere.c
index 23028661084..600e648f935 100644
--- a/env/nowhere.c
+++ b/env/nowhere.c
@@ -13,6 +13,7 @@
 #include <env_internal.h>
 #include <asm/global_data.h>
 #include <linux/stddef.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/env/nvram.c b/env/nvram.c
index 7af5c4cf4b8..3d7b7fe1524 100644
--- a/env/nvram.c
+++ b/env/nvram.c
@@ -32,6 +32,7 @@
 #include <search.h>
 #include <errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <u-boot/crc.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/env/onenand.c b/env/onenand.c
index 8ef4ca7535e..4782d70fd91 100644
--- a/env/onenand.c
+++ b/env/onenand.c
@@ -17,6 +17,7 @@
 #include <search.h>
 #include <errno.h>
 #include <onenand_uboot.h>
+#include <linux/types.h>
 
 #include <linux/compat.h>
 #include <linux/mtd/mtd.h>
diff --git a/env/remote.c b/env/remote.c
index 0d026176794..2557a046b39 100644
--- a/env/remote.c
+++ b/env/remote.c
@@ -12,6 +12,7 @@
 #include <asm/global_data.h>
 #include <linux/errno.h>
 #include <linux/stddef.h>
+#include <linux/types.h>
 #include <u-boot/crc.h>
 
 #ifdef ENV_IS_EMBEDDED
diff --git a/env/sata.c b/env/sata.c
index a4af49ed8e2..367a686865b 100644
--- a/env/sata.c
+++ b/env/sata.c
@@ -6,9 +6,11 @@
 /* #define DEBUG */
 
 #include <common.h>
+#include <compiler.h>
 #include <stdio.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include <command.h>
 #include <env.h>
diff --git a/env/sf.c b/env/sf.c
index 6f874f43986..522baec7e27 100644
--- a/env/sf.c
+++ b/env/sf.c
@@ -9,6 +9,7 @@
  * (C) Copyright 2008 Atmel Corporation
  */
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <env.h>
 #include <env_internal.h>
@@ -25,6 +26,7 @@
 #include <dm/device-internal.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include <u-boot/crc.h>
 
 #ifndef CONFIG_SPL_BUILD
diff --git a/examples/api/glue.c b/examples/api/glue.c
index c90765e8d28..aa287e8832f 100644
--- a/examples/api/glue.c
+++ b/examples/api/glue.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <env.h>
 #include <linux/string.h>
 #include <linux/types.h>
diff --git a/examples/api/glue.h b/examples/api/glue.h
index f9745604b6c..37ed9d30878 100644
--- a/examples/api/glue.h
+++ b/examples/api/glue.h
@@ -12,6 +12,7 @@
 #ifndef _API_GLUE_H_
 #define _API_GLUE_H_
 
+#include <linux/types.h>
 #define API_SEARCH_LEN		(3 * 1024 * 1024)	/* 3MB search range */
 
 #define UB_MAX_MR	5	/* max mem regions number */
diff --git a/examples/standalone/atmel_df_pow2.c b/examples/standalone/atmel_df_pow2.c
index 9e4e883d9d2..62ef34a0ce5 100644
--- a/examples/standalone/atmel_df_pow2.c
+++ b/examples/standalone/atmel_df_pow2.c
@@ -13,6 +13,7 @@
 #include <vsprintf.h>
 #include <linux/delay.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define CMD_ID    0x9f
 #define CMD_STAT  0xd7
diff --git a/examples/standalone/sched.c b/examples/standalone/sched.c
index 0d734e7c9df..d58509e095a 100644
--- a/examples/standalone/sched.c
+++ b/examples/standalone/sched.c
@@ -3,6 +3,7 @@
 #include <common.h>
 #include <exports.h>
 #include <stdio.h>
+#include <linux/types.h>
 
 /*
  * Author: Arun Dharankar <ADharankar@ATTBI.Com>
diff --git a/fs/btrfs/btrfs.c b/fs/btrfs/btrfs.c
index 9b9f9b5ffa3..6a8adfb7936 100644
--- a/fs/btrfs/btrfs.c
+++ b/fs/btrfs/btrfs.c
@@ -10,6 +10,7 @@
 #include <malloc.h>
 #include <uuid.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/time.h>
 
 struct btrfs_info btrfs_info;
diff --git a/fs/btrfs/btrfs.h b/fs/btrfs/btrfs.h
index 25a8cf6a879..0bfd8dca93c 100644
--- a/fs/btrfs/btrfs.h
+++ b/fs/btrfs/btrfs.h
@@ -9,6 +9,7 @@
 #define __BTRFS_BTRFS_H__
 
 #include <linux/rbtree.h>
+#include <linux/types.h>
 #include "conv-funcs.h"
 
 struct btrfs_info {
diff --git a/fs/btrfs/btrfs_tree.h b/fs/btrfs/btrfs_tree.h
index aa0f3d6c86d..4d70ef3af64 100644
--- a/fs/btrfs/btrfs_tree.h
+++ b/fs/btrfs/btrfs_tree.h
@@ -7,6 +7,7 @@
 #define __BTRFS_BTRFS_TREE_H__
 
 #include <common.h>
+#include <compiler.h>
 
 #define BTRFS_VOL_NAME_MAX 255
 #define BTRFS_NAME_MAX 255
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index 65c152a52fc..3c164c902e8 100644
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -11,6 +11,7 @@
 
 #include <common.h>
 #include <compiler.h>
+#include <asm/types.h>
 #include "btrfs_tree.h"
 
 #define BTRFS_MAGIC 0x4D5F53665248425FULL /* ascii _BHRfS_M, no null */
diff --git a/fs/btrfs/subvolume.c b/fs/btrfs/subvolume.c
index bc488183cd3..51fe7f9d8a9 100644
--- a/fs/btrfs/subvolume.c
+++ b/fs/btrfs/subvolume.c
@@ -9,6 +9,7 @@
 #include <malloc.h>
 #include <stdio.h>
 #include <linux/kernel.h>
+
 static int get_subvol_name(u64 subvolid, char *name, int max_len)
 {
 	struct btrfs_root_ref rref;
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index 41f2193d51c..e50ddfcba97 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -13,6 +13,7 @@
 #include <linux/compat.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "btrfs.h"
 
 #define BTRFS_SUPER_FLAG_SUPP	(BTRFS_HEADER_FLAG_WRITTEN	\
diff --git a/fs/cbfs/cbfs.c b/fs/cbfs/cbfs.c
index 3f489910180..524d8ed6cad 100644
--- a/fs/cbfs/cbfs.c
+++ b/fs/cbfs/cbfs.c
@@ -11,6 +11,7 @@
 #include <asm/byteorder.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /* Offset of master header from the start of a coreboot ROM */
 #define MASTER_HDR_OFFSET	0x38
diff --git a/fs/cramfs/cramfs.c b/fs/cramfs/cramfs.c
index 12fab86e470..76a929d7bc8 100644
--- a/fs/cramfs/cramfs.c
+++ b/fs/cramfs/cramfs.c
@@ -34,6 +34,7 @@
 #include <jffs2/load_kernel.h>
 #include <cramfs/cramfs_fs.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /* These two macros may change in future, to provide better st_ino
    semantics. */
diff --git a/fs/ext4/dev.c b/fs/ext4/dev.c
index 168443de1ff..71b42bddcb6 100644
--- a/fs/ext4/dev.c
+++ b/fs/ext4/dev.c
@@ -28,6 +28,7 @@
 #include <fs_internal.h>
 #include <ext4fs.h>
 #include <ext_common.h>
+#include <linux/types.h>
 #include "ext4_common.h"
 #include <log.h>
 
diff --git a/fs/ext4/ext4_common.c b/fs/ext4/ext4_common.c
index 8d1cec27cb7..d8f2bb7bdad 100644
--- a/fs/ext4/ext4_common.c
+++ b/fs/ext4/ext4_common.c
@@ -34,6 +34,7 @@
 #include <linux/string.h>
 #include <linux/time.h>
 #include <asm/byteorder.h>
+#include <linux/types.h>
 #include "ext4_common.h"
 
 struct ext2_data *ext4fs_root;
diff --git a/fs/ext4/ext4_common.h b/fs/ext4/ext4_common.h
index 1314cf20df8..10167278558 100644
--- a/fs/ext4/ext4_common.h
+++ b/fs/ext4/ext4_common.h
@@ -30,6 +30,7 @@
 #include "crc16.h"
 #endif
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define YES		1
 #define NO		0
diff --git a/fs/ext4/ext4_journal.c b/fs/ext4/ext4_journal.c
index ad967d39f95..75b54902c24 100644
--- a/fs/ext4/ext4_journal.c
+++ b/fs/ext4/ext4_journal.c
@@ -5,6 +5,7 @@
  * Uma Shankar <uma.shankar@samsung.com>
  * Manjunatha C Achar <a.manjunatha@samsung.com>
  *
+#include <linux/types.h>
  * Journal data structures and headers for Journaling feature of ext4
  * have been referred from JBD2 (Journaling Block device 2)
  * implementation in Linux Kernel.
diff --git a/fs/ext4/ext4_journal.h b/fs/ext4/ext4_journal.h
index 8c974cff609..bc1cfc77d1a 100644
--- a/fs/ext4/ext4_journal.h
+++ b/fs/ext4/ext4_journal.h
@@ -5,6 +5,7 @@
  * Uma Shankar <uma.shankar@samsung.com>
  * Manjunatha C Achar <a.manjunatha@samsung.com>
  *
+#include <linux/types.h>
  * Journal data structures and headers for Journaling feature of ext4
  * have been referred from JBD2 (Journaling Block device 2)
  * implementation in Linux Kernel.
diff --git a/fs/ext4/ext4_write.c b/fs/ext4/ext4_write.c
index 933e8b19b1b..e6d0d4372ad 100644
--- a/fs/ext4/ext4_write.c
+++ b/fs/ext4/ext4_write.c
@@ -27,12 +27,14 @@
 #include <malloc.h>
 #include <memalign.h>
 #include <part.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/stat.h>
 #include <div64.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "ext4_common.h"
 
 static inline void ext4fs_sb_free_inodes_inc(struct ext2_sblock *sb)
diff --git a/fs/ext4/ext4fs.c b/fs/ext4/ext4fs.c
index 8143079b8b0..a4fa61803f6 100644
--- a/fs/ext4/ext4fs.c
+++ b/fs/ext4/ext4fs.c
@@ -31,6 +31,7 @@
 #include <uuid.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "ext4_common.h"
 
 int ext4fs_symlinknest;
diff --git a/fs/fat/fat.c b/fs/fat/fat.c
index b68c378a703..95ed12ab045 100644
--- a/fs/fat/fat.c
+++ b/fs/fat/fat.c
@@ -26,6 +26,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /*
  * Convert a string to lowercase.  Converts at most 'len' characters,
diff --git a/fs/fat/fat_write.c b/fs/fat/fat_write.c
index 7da31936542..eee83fa5a6e 100644
--- a/fs/fat/fat_write.c
+++ b/fs/fat/fat_write.c
@@ -21,6 +21,7 @@
 #include <linux/kernel.h>
 #include <linux/math64.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "fat.c"
 
 static void uppercase(char *str, int len)
diff --git a/fs/fs.c b/fs/fs.c
index a407714df3f..49fd8b5cd1c 100644
--- a/fs/fs.c
+++ b/fs/fs.c
@@ -17,6 +17,7 @@
 #include <fat.h>
 #include <fs.h>
 #include <sandboxfs.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <ubifs_uboot.h>
@@ -30,6 +31,7 @@
 #include <linux/math64.h>
 #include <efi_loader.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/fs/fs_internal.c b/fs/fs_internal.c
index b626ffaecbe..8f3aa8d4f05 100644
--- a/fs/fs_internal.c
+++ b/fs/fs_internal.c
@@ -12,6 +12,7 @@
 #include <part.h>
 #include <memalign.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
 
diff --git a/fs/jffs2/compr_lzo.c b/fs/jffs2/compr_lzo.c
index da9a17ecaf6..dfc2be41cc9 100644
--- a/fs/jffs2/compr_lzo.c
+++ b/fs/jffs2/compr_lzo.c
@@ -22,6 +22,7 @@
    Original copyright notice follows:
 
    lzo1x_9x.c -- implementation of the LZO1X-999 compression algorithm
+#include <linux/types.h>
    lzo_ptr.h -- low-level pointer constructs
    lzo_swd.ch -- sliding window dictionary
    lzoconf.h -- configuration for the LZO real-time data compression library
diff --git a/fs/jffs2/compr_rtime.c b/fs/jffs2/compr_rtime.c
index 89b9f2f13eb..114880dee27 100644
--- a/fs/jffs2/compr_rtime.c
+++ b/fs/jffs2/compr_rtime.c
@@ -46,6 +46,7 @@
  */
 
 #include <config.h>
+#include <asm/types.h>
 #include <jffs2/jffs2.h>
 
 void rtime_decompress(unsigned char *data_in, unsigned char *cpage_out,
diff --git a/fs/jffs2/compr_rubin.c b/fs/jffs2/compr_rubin.c
index 9ff22177382..521ebe23e2f 100644
--- a/fs/jffs2/compr_rubin.c
+++ b/fs/jffs2/compr_rubin.c
@@ -39,6 +39,7 @@
  */
 
 #include <config.h>
+#include <asm/types.h>
 #include <jffs2/jffs2.h>
 #include <jffs2/compr_rubin.h>
 
diff --git a/fs/jffs2/jffs2_1pass.c b/fs/jffs2/jffs2_1pass.c
index 40e8ff66377..34ec95f0304 100644
--- a/fs/jffs2/jffs2_1pass.c
+++ b/fs/jffs2/jffs2_1pass.c
@@ -122,6 +122,7 @@
 #include <linux/stat.h>
 #include <linux/string.h>
 #include <linux/time.h>
+#include <linux/types.h>
 #include <u-boot/crc.h>
 #include <watchdog.h>
 #include <jffs2/jffs2.h>
diff --git a/fs/jffs2/jffs2_private.h b/fs/jffs2/jffs2_private.h
index 65d19a76f97..3f5dcd514e0 100644
--- a/fs/jffs2/jffs2_private.h
+++ b/fs/jffs2/jffs2_private.h
@@ -1,6 +1,7 @@
 #ifndef jffs2_private_h
 #define jffs2_private_h
 
+#include <asm/types.h>
 #include <jffs2/jffs2.h>
 
 
diff --git a/fs/jffs2/summary.h b/fs/jffs2/summary.h
index 834933cd158..739fc7951e7 100644
--- a/fs/jffs2/summary.h
+++ b/fs/jffs2/summary.h
@@ -13,6 +13,7 @@
 #ifndef JFFS2_SUMMARY_H
 #define JFFS2_SUMMARY_H
 
+#include <linux/types.h>
 #define BLK_STATE_ALLFF		0
 #define BLK_STATE_CLEAN		1
 #define BLK_STATE_PARTDIRTY	2
diff --git a/fs/reiserfs/mode_string.c b/fs/reiserfs/mode_string.c
index 638cf6368da..bf223858d82 100644
--- a/fs/reiserfs/mode_string.c
+++ b/fs/reiserfs/mode_string.c
@@ -12,6 +12,7 @@
 
 #include <common.h>
 #include <linux/stat.h>
+#include <linux/types.h>
 
 #if ( S_ISUID != 04000 ) || ( S_ISGID != 02000 ) || ( S_ISVTX != 01000 ) \
  || ( S_IRUSR != 00400 ) || ( S_IWUSR != 00200 ) || ( S_IXUSR != 00100 ) \
diff --git a/fs/reiserfs/reiserfs.c b/fs/reiserfs/reiserfs.c
index 37068e295b3..37ec4bfbd39 100644
--- a/fs/reiserfs/reiserfs.c
+++ b/fs/reiserfs/reiserfs.c
@@ -11,6 +11,7 @@
  */
 
 /* An implementation for the ReiserFS filesystem ported from GRUB.
+#include <linux/types.h>
  * Some parts of this code (mainly the structures and defines) are
  * from the original reiser fs code, as found in the linux kernel.
  */
diff --git a/fs/reiserfs/reiserfs_private.h b/fs/reiserfs/reiserfs_private.h
index 5936f214005..3d8f3f00b26 100644
--- a/fs/reiserfs/reiserfs_private.h
+++ b/fs/reiserfs/reiserfs_private.h
@@ -11,6 +11,7 @@
  */
 
 /* An implementation for the ReiserFS filesystem ported from GRUB.
+#include <linux/types.h>
  * Some parts of this code (mainly the structures and defines) are
  * from the original reiser fs code, as found in the linux kernel.
  */
diff --git a/fs/sandbox/sandboxfs.c b/fs/sandbox/sandboxfs.c
index 59e18d0c049..ae9c4964a55 100644
--- a/fs/sandbox/sandboxfs.c
+++ b/fs/sandbox/sandboxfs.c
@@ -9,6 +9,7 @@
 #include <os.h>
 #include <sandboxfs.h>
 #include <stdio.h>
+#include <linux/types.h>
 
 int sandbox_fs_set_blk_dev(struct blk_desc *rbdd, struct disk_partition *info)
 {
diff --git a/fs/ubifs/debug.c b/fs/ubifs/debug.c
index a20407688cd..ad73191bc25 100644
--- a/fs/ubifs/debug.c
+++ b/fs/ubifs/debug.c
@@ -24,6 +24,7 @@
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #ifndef __UBOOT__
 #include <linux/module.h>
diff --git a/fs/ubifs/debug.h b/fs/ubifs/debug.h
index 85f760e41a1..e436b0bcf61 100644
--- a/fs/ubifs/debug.h
+++ b/fs/ubifs/debug.h
@@ -13,6 +13,7 @@
 
 /* Checking helper functions */
 #include <linux/printk.h>
+#include <linux/types.h>
 typedef int (*dbg_leaf_callback)(struct ubifs_info *c,
 				 struct ubifs_zbranch *zbr, void *priv);
 typedef int (*dbg_znode_callback)(struct ubifs_info *c,
diff --git a/fs/ubifs/io.c b/fs/ubifs/io.c
index 5a0fa3aa4e4..8b5a11a6669 100644
--- a/fs/ubifs/io.c
+++ b/fs/ubifs/io.c
@@ -39,6 +39,7 @@
  * to @c->max_write_size bytes again. We do this by temporarily shrinking
  * write-buffer size (@wbuf->size).
  *
+#include <linux/types.h>
  * Write-buffers are defined by 'struct ubifs_wbuf' objects and protected by
  * mutexes defined inside these objects. Since sometimes upper-level code
  * has to lock the write-buffer (e.g. journal space reservation code), many
diff --git a/fs/ubifs/key.h b/fs/ubifs/key.h
index 6677ff06a26..ec3c927b5a9 100644
--- a/fs/ubifs/key.h
+++ b/fs/ubifs/key.h
@@ -35,6 +35,7 @@
  */
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 static inline uint32_t key_mask_hash(uint32_t hash)
 {
 	hash &= UBIFS_S_KEY_HASH_MASK;
diff --git a/fs/ubifs/lprops.c b/fs/ubifs/lprops.c
index 2e4678cfaa8..2deb6a103af 100644
--- a/fs/ubifs/lprops.c
+++ b/fs/ubifs/lprops.c
@@ -23,6 +23,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #endif
 #include "ubifs.h"
 
diff --git a/fs/ubifs/lpt_commit.c b/fs/ubifs/lpt_commit.c
index 2f0d1c6eb51..7ece2986a32 100644
--- a/fs/ubifs/lpt_commit.c
+++ b/fs/ubifs/lpt_commit.c
@@ -27,6 +27,7 @@
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "crc16.h"
 #endif
 #include "ubifs.h"
diff --git a/fs/ubifs/misc.h b/fs/ubifs/misc.h
index a54e4928fc0..57ca0922c5d 100644
--- a/fs/ubifs/misc.h
+++ b/fs/ubifs/misc.h
@@ -22,6 +22,7 @@
  * This helper function returns %1 if @znode is dirty and %0 otherwise.
  */
 #include <linux/kernel.h>
+#include <linux/types.h>
 static inline int ubifs_zn_dirty(const struct ubifs_znode *znode)
 {
 	return !!test_bit(DIRTY_ZNODE, &znode->flags);
diff --git a/fs/ubifs/orphan.c b/fs/ubifs/orphan.c
index a7df0364a17..5393c5b4528 100644
--- a/fs/ubifs/orphan.c
+++ b/fs/ubifs/orphan.c
@@ -12,6 +12,7 @@
 #include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include "ubifs.h"
 
 /*
diff --git a/fs/ubifs/recovery.c b/fs/ubifs/recovery.c
index 24c66ce1688..ec428e8e81d 100644
--- a/fs/ubifs/recovery.c
+++ b/fs/ubifs/recovery.c
@@ -12,6 +12,7 @@
  * This file implements functions needed to recover from unclean un-mounts.
  * When UBIFS is mounted, it checks a flag on the master node to determine if
  * an un-mount was completed successfully. If not, the process of mounting
+#include <linux/types.h>
  * incorporates additional checking and fixing of on-flash data structures.
  * UBIFS always cleans away all remnants of an unclean un-mount, so that
  * errors do not accumulate. However UBIFS defers recovery if it is mounted
diff --git a/fs/ubifs/replay.c b/fs/ubifs/replay.c
index 845a270ce51..d0c571aa163 100644
--- a/fs/ubifs/replay.c
+++ b/fs/ubifs/replay.c
@@ -28,6 +28,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #endif
 #include "ubifs.h"
 #include <linux/bug.h>
diff --git a/fs/ubifs/scan.c b/fs/ubifs/scan.c
index 218cbfade10..8ba7f6a2f69 100644
--- a/fs/ubifs/scan.c
+++ b/fs/ubifs/scan.c
@@ -22,6 +22,7 @@
 #include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #endif
 #include "ubifs.h"
 
diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c
index 9c37fa2254c..126701afe83 100644
--- a/fs/ubifs/super.c
+++ b/fs/ubifs/super.c
@@ -43,6 +43,7 @@
 #include <linux/stat.h>
 #include <linux/err.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "ubifs.h"
 #include <ubi_uboot.h>
 #include <linux/stringify.h>
diff --git a/fs/ubifs/tnc.c b/fs/ubifs/tnc.c
index b9174c8798f..dfb7b53a4c2 100644
--- a/fs/ubifs/tnc.c
+++ b/fs/ubifs/tnc.c
@@ -33,6 +33,7 @@
 #include <linux/kernel.h>
 #include <linux/stat.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #endif
 #include "ubifs.h"
 
diff --git a/fs/ubifs/tnc_misc.c b/fs/ubifs/tnc_misc.c
index 659ff2e2ce2..f2ad55e9fdc 100644
--- a/fs/ubifs/tnc_misc.c
+++ b/fs/ubifs/tnc_misc.c
@@ -20,6 +20,7 @@
 #include <dm/devres.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #endif
 #include "ubifs.h"
 
diff --git a/fs/ubifs/ubifs-media.h b/fs/ubifs/ubifs-media.h
index 2b5b26a01b0..a4ec288de34 100644
--- a/fs/ubifs/ubifs-media.h
+++ b/fs/ubifs/ubifs-media.h
@@ -10,6 +10,8 @@
 
 /*
  * This file describes UBIFS on-flash format and contains definitions of all the
+#include <compiler.h>
+#include <linux/types.h>
  * relevant data structures and constants.
  *
  * All UBIFS on-flash objects are stored in the form of nodes. All nodes start
diff --git a/fs/ubifs/ubifs.c b/fs/ubifs/ubifs.c
index e76839e098d..ddfa86bbc5b 100644
--- a/fs/ubifs/ubifs.c
+++ b/fs/ubifs/ubifs.c
@@ -22,6 +22,7 @@
 #include <asm/global_data.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "ubifs.h"
 #include <part.h>
 #include <dm/devres.h>
diff --git a/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h
index c8a33fa36ed..b63b1326207 100644
--- a/fs/ubifs/ubifs.h
+++ b/fs/ubifs/ubifs.h
@@ -37,6 +37,7 @@
 #include <ubifs_uboot.h>
 #include <linux/kernel.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 #include <linux/ctype.h>
 #include <linux/time.h>
diff --git a/fs/yaffs2/yaffs_uboot_glue.c b/fs/yaffs2/yaffs_uboot_glue.c
index 62f034552e5..3f42438a00b 100644
--- a/fs/yaffs2/yaffs_uboot_glue.c
+++ b/fs/yaffs2/yaffs_uboot_glue.c
@@ -27,6 +27,7 @@
 #include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <config.h>
 #include "nand.h"
diff --git a/fs/yaffs2/yaffsfs.c b/fs/yaffs2/yaffsfs.c
index 8f43d3ac085..004abbd2851 100644
--- a/fs/yaffs2/yaffsfs.c
+++ b/fs/yaffs2/yaffsfs.c
@@ -15,6 +15,7 @@
 #include <stdio.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "yaffsfs.h"
 #include "yaffs_guts.h"
 #include "yaffscfg.h"
diff --git a/fs/yaffs2/ydirectenv.h b/fs/yaffs2/ydirectenv.h
index cad7a35a4e5..b9e9ed1707e 100644
--- a/fs/yaffs2/ydirectenv.h
+++ b/fs/yaffs2/ydirectenv.h
@@ -25,6 +25,7 @@
 #include <stdio.h>
 #include <linux/compat.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "yaffs_osglue.h"
 
diff --git a/fs/zfs/zfs.c b/fs/zfs/zfs.c
index 0bc872175e5..823ac8a0156 100644
--- a/fs/zfs/zfs.c
+++ b/fs/zfs/zfs.c
@@ -20,6 +20,7 @@
 #include <linux/time.h>
 #include <linux/ctype.h>
 #include <asm/byteorder.h>
+#include <linux/types.h>
 #include "zfs_common.h"
 #include "div64.h"
 
diff --git a/fs/zfs/zfs_fletcher.c b/fs/zfs/zfs_fletcher.c
index 008a303ec79..dd23f984ded 100644
--- a/fs/zfs/zfs_fletcher.c
+++ b/fs/zfs/zfs_fletcher.c
@@ -14,6 +14,7 @@
 #include <linux/time.h>
 #include <linux/ctype.h>
 #include <asm/byteorder.h>
+#include <linux/types.h>
 #include "zfs_common.h"
 
 #include <zfs/zfs.h>
diff --git a/fs/zfs/zfs_lzjb.c b/fs/zfs/zfs_lzjb.c
index c2a9ae1ddef..9ac42ac89aa 100644
--- a/fs/zfs/zfs_lzjb.c
+++ b/fs/zfs/zfs_lzjb.c
@@ -15,6 +15,7 @@
 #include <linux/time.h>
 #include <linux/ctype.h>
 #include <asm/byteorder.h>
+#include <linux/types.h>
 #include "zfs_common.h"
 
 #include <zfs/zfs.h>
diff --git a/fs/zfs/zfs_sha256.c b/fs/zfs/zfs_sha256.c
index cb5b1c06834..104918c6069 100644
--- a/fs/zfs/zfs_sha256.c
+++ b/fs/zfs/zfs_sha256.c
@@ -14,6 +14,7 @@
 #include <linux/time.h>
 #include <linux/ctype.h>
 #include <asm/byteorder.h>
+#include <linux/types.h>
 #include "zfs_common.h"
 
 #include <zfs/zfs.h>
diff --git a/include/ACEX1K.h b/include/ACEX1K.h
index 7c5253c66cc..dee789b148b 100644
--- a/include/ACEX1K.h
+++ b/include/ACEX1K.h
@@ -11,6 +11,7 @@
 #define _ACEX1K_H_
 
 #include <altera.h>
+#include <linux/types.h>
 
 extern int ACEX1K_load(Altera_desc *desc, const void *image, size_t size);
 extern int ACEX1K_dump(Altera_desc *desc, const void *buf, size_t bsize);
diff --git a/include/MCD_dma.h b/include/MCD_dma.h
index 2f16c89044e..f67d3529fc1 100644
--- a/include/MCD_dma.h
+++ b/include/MCD_dma.h
@@ -33,6 +33,8 @@
 
 #ifndef DEFINESONLY
 
+#include <linux/types.h>
+
 /* Portability typedefs */
 #if 1
 #include "common.h"
@@ -55,6 +57,7 @@ typedef char s8;
 #ifndef u8
 typedef unsigned char u8;
 #endif
+#include <asm/types.h>
 #endif
 
 /*
diff --git a/include/acpi/acpi_device.h b/include/acpi/acpi_device.h
index 1c6aceb20af..af6b65e7f04 100644
--- a/include/acpi/acpi_device.h
+++ b/include/acpi/acpi_device.h
@@ -13,6 +13,7 @@
 #include <spi.h>
 #include <stdbool.h>
 #include <linux/bitops.h>
+#include <linux/types.h>
 
 struct acpi_ctx;
 struct gpio_desc;
diff --git a/include/acpi/acpi_s3.h b/include/acpi/acpi_s3.h
index 1dc568117bd..5b9eed4c8c9 100644
--- a/include/acpi/acpi_s3.h
+++ b/include/acpi/acpi_s3.h
@@ -37,6 +37,7 @@
 extern char __wakeup[];
 extern int __wakeup_size;
 
+#include <asm/types.h>
 enum acpi_sleep_state {
 	ACPI_S0,
 	ACPI_S1,
diff --git a/include/acpi/acpi_table.h b/include/acpi/acpi_table.h
index fe9b29f3f82..91d169b4e23 100644
--- a/include/acpi/acpi_table.h
+++ b/include/acpi/acpi_table.h
@@ -13,7 +13,9 @@
 #ifndef __ACPI_TABLE_H__
 #define __ACPI_TABLE_H__
 
+#include <compiler.h>
 #include <linux/bitops.h>
+#include <linux/types.h>
 
 #define RSDP_SIG		"RSD PTR "	/* RSDP pointer signature */
 #define OEM_ID			"U-BOOT"	/* U-Boot */
diff --git a/include/ahci.h b/include/ahci.h
index a6f32010ca2..ca457bfbf64 100644
--- a/include/ahci.h
+++ b/include/ahci.h
@@ -9,6 +9,7 @@
 
 #include <compiler.h>
 #include <pci.h>
+#include <linux/types.h>
 
 #define AHCI_PCI_BAR		0x24
 #define AHCI_MAX_SG		56 /* hardware max is 64K */
diff --git a/include/ali512x.h b/include/ali512x.h
index 6bb67009c1f..854ca60de69 100644
--- a/include/ali512x.h
+++ b/include/ali512x.h
@@ -7,6 +7,7 @@
 #ifndef __ASM_IC_ALI512X_H_
 #define __ASM_IC_ALI512X_H_
 
+#include <asm/types.h>
 # define ALI_INDEX    0x3f0
 # define ALI_DATA     0x3f1
 
diff --git a/include/altera.h b/include/altera.h
index 22d55cfd73e..1e991333c4e 100644
--- a/include/altera.h
+++ b/include/altera.h
@@ -5,6 +5,7 @@
  */
 
 #include <fpga.h>
+#include <linux/types.h>
 
 #ifndef _ALTERA_H_
 #define _ALTERA_H_
diff --git a/include/android_bootloader_message.h b/include/android_bootloader_message.h
index 286d7ab0f31..21e613bdad0 100644
--- a/include/android_bootloader_message.h
+++ b/include/android_bootloader_message.h
@@ -21,6 +21,7 @@
  * stddef.h
  */
 #include <compiler.h>
+#include <linux/types.h>
 #endif
 
 // Spaces used by misc partition are as below:
diff --git a/include/api_public.h b/include/api_public.h
index def103ce22f..38966da505f 100644
--- a/include/api_public.h
+++ b/include/api_public.h
@@ -8,6 +8,7 @@
 #ifndef _API_PUBLIC_H_
 #define _API_PUBLIC_H_
 
+#include <linux/types.h>
 #define API_EINVAL		1	/* invalid argument(s)	*/
 #define API_ENODEV		2	/* no device		*/
 #define API_ENOMEM		3	/* no memory		*/
diff --git a/include/asm-generic/global_data.h b/include/asm-generic/global_data.h
index 7a6b90d7da0..57ff3b7f12d 100644
--- a/include/asm-generic/global_data.h
+++ b/include/asm-generic/global_data.h
@@ -24,6 +24,7 @@
 #include <membuff.h>
 #include <asm/u-boot.h>
 #include <linux/list.h>
+#include <linux/types.h>
 
 typedef struct global_data {
 	struct bd_info *bd;
diff --git a/include/asm-generic/gpio.h b/include/asm-generic/gpio.h
index acbe791c84b..eb9b7086612 100644
--- a/include/asm-generic/gpio.h
+++ b/include/asm-generic/gpio.h
@@ -10,6 +10,7 @@
 #include <stdbool.h>
 #include <dm/ofnode.h>
 #include <linux/bitops.h>
+#include <linux/types.h>
 
 struct acpi_gpio;
 struct ofnode_phandle_args;
diff --git a/include/asm-generic/int-ll64.h b/include/asm-generic/int-ll64.h
index 7451718a61c..c364755102c 100644
--- a/include/asm-generic/int-ll64.h
+++ b/include/asm-generic/int-ll64.h
@@ -15,6 +15,7 @@
  * header files exported to user space
  */
 
+#include <asm/types.h>
 typedef __signed__ char __s8;
 typedef unsigned char __u8;
 
diff --git a/include/asm-generic/io.h b/include/asm-generic/io.h
index 7a2f0dba316..53972a8d75a 100644
--- a/include/asm-generic/io.h
+++ b/include/asm-generic/io.h
@@ -105,5 +105,6 @@ static inline void unmap_physmem(void *vaddr, unsigned long flags)
 }
 #endif
 
+#include <asm/types.h>
 #endif /* !__ASSEMBLY__ */
 #endif /* __ASM_GENERIC_IO_H__ */
diff --git a/include/ata.h b/include/ata.h
index 3d870c973f2..ea1af5e6604 100644
--- a/include/ata.h
+++ b/include/ata.h
@@ -14,6 +14,7 @@
 #define _ATA_H
 
 #include <libata.h>
+#include <linux/types.h>
 
 /* Register addressing depends on the hardware design; for instance,
  * 8-bit (register) and 16-bit (data) accesses might use different
diff --git a/include/atf_common.h b/include/atf_common.h
index fd5454c55b4..231406783fe 100644
--- a/include/atf_common.h
+++ b/include/atf_common.h
@@ -72,6 +72,7 @@
  * Structure used for telling the next BL how much of a particular type of
  * memory is available for its use and how much is already used.
  ******************************************************************************/
+#include <linux/types.h>
 struct aapcs64_params {
 	unsigned long arg0;
 	unsigned long arg1;
diff --git a/include/atmel_hlcdc.h b/include/atmel_hlcdc.h
index 5e339f50f26..0272d45584b 100644
--- a/include/atmel_hlcdc.h
+++ b/include/atmel_hlcdc.h
@@ -2,6 +2,7 @@
 /*
  *  Header file for AT91/AT32 MULTI LAYER LCD Controller
  *
+#include <asm/types.h>
  *  Data structure and register user interface
  *
  *  Copyright (C) 2012 Atmel Corporation
diff --git a/include/atmel_lcd.h b/include/atmel_lcd.h
index 4aa955b6b2d..8d94769d8dc 100644
--- a/include/atmel_lcd.h
+++ b/include/atmel_lcd.h
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
 /*
+#include <linux/types.h>
  * atmel_lcd.h - Atmel LCD Controller structures
  *
  * (C) Copyright 2001
@@ -9,6 +10,8 @@
 #ifndef _ATMEL_LCD_H_
 #define _ATMEL_LCD_H_
 
+#include <linux/types.h>
+
 /**
  * struct atmel_lcd_platdata - platform data for Atmel LCDs with driver model
  *
diff --git a/include/atmel_mci.h b/include/atmel_mci.h
index c7591166eeb..2f73e675e01 100644
--- a/include/atmel_mci.h
+++ b/include/atmel_mci.h
@@ -10,6 +10,7 @@ int atmel_mci_init(void *regs);
 #ifndef __ASSEMBLY__
 
 /*
+#include <asm/types.h>
  * Structure for struct SoC access.
  * Names starting with '_' are fillers.
  */
diff --git a/include/atsha204a-i2c.h b/include/atsha204a-i2c.h
index 5c1ab65eef7..b32d159993f 100644
--- a/include/atsha204a-i2c.h
+++ b/include/atsha204a-i2c.h
@@ -13,6 +13,7 @@
 #define _ATSHA204_I2C_H_
 
 #include <stdbool.h>
+#include <linux/types.h>
 enum atsha204a_zone
 {
 	ATSHA204A_ZONE_CONFIG	= 0,
diff --git a/include/audio_codec.h b/include/audio_codec.h
index 2ea4ff096e6..202f5ca3929 100644
--- a/include/audio_codec.h
+++ b/include/audio_codec.h
@@ -7,6 +7,7 @@
 #ifndef __AUDIO_CODEC_H__
 #define __AUDIO_CODEC_H__
 
+#include <linux/types.h>
 struct udevice;
 
 /*
diff --git a/include/autoboot.h b/include/autoboot.h
index ac8157e5704..398c5562652 100644
--- a/include/autoboot.h
+++ b/include/autoboot.h
@@ -11,6 +11,8 @@
 #ifndef __AUTOBOOT_H
 #define __AUTOBOOT_H
 
+#include <linux/stddef.h>
+
 #ifdef CONFIG_AUTOBOOT
 /**
  * bootdelay_process() - process the bootd delay
diff --git a/include/avb_verify.h b/include/avb_verify.h
index 8aebe75ac91..7ee137b0a73 100644
--- a/include/avb_verify.h
+++ b/include/avb_verify.h
@@ -11,6 +11,7 @@
 #include <../lib/libavb/libavb.h>
 #include <mapmem.h>
 #include <mmc.h>
+#include <linux/types.h>
 
 #define AVB_MAX_ARGS			1024
 #define VERITY_TABLE_OPT_RESTART	"restart_on_corruption"
diff --git a/include/axi.h b/include/axi.h
index 59fb0b2e458..abffd2f12b7 100644
--- a/include/axi.h
+++ b/include/axi.h
@@ -7,6 +7,7 @@
 #ifndef _AXI_H_
 #define _AXI_H_
 
+#include <linux/types.h>
 struct udevice;
 
 /**
diff --git a/include/binman.h b/include/binman.h
index e0b92075e27..4da86685daf 100644
--- a/include/binman.h
+++ b/include/binman.h
@@ -9,6 +9,7 @@
 #ifndef _BINMAN_H_
 #define _BINMAN_H_
 
+#include <asm/types.h>
 #include <dm/ofnode.h>
 
 /**
diff --git a/include/blk.h b/include/blk.h
index abcd4bedbbb..103922e2b83 100644
--- a/include/blk.h
+++ b/include/blk.h
@@ -8,6 +8,7 @@
 #define BLK_H
 
 #include <efi.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_SYS_64BIT_LBA
 typedef uint64_t lbaint_t;
diff --git a/include/bloblist.h b/include/bloblist.h
index 609ac421d66..5feb76de284 100644
--- a/include/bloblist.h
+++ b/include/bloblist.h
@@ -13,6 +13,7 @@
 #ifndef __BLOBLIST_H
 #define __BLOBLIST_H
 
+#include <linux/types.h>
 enum {
 	BLOBLIST_VERSION	= 0,
 	BLOBLIST_MAGIC		= 0xb00757a3,
diff --git a/include/board.h b/include/board.h
index d9f7aafb49b..2944eea66c5 100644
--- a/include/board.h
+++ b/include/board.h
@@ -6,6 +6,7 @@
 
 #include <stdbool.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 struct udevice;
 
 /*
diff --git a/include/bootcount.h b/include/bootcount.h
index a3ce4094854..f08339a4805 100644
--- a/include/bootcount.h
+++ b/include/bootcount.h
@@ -12,6 +12,7 @@
 #include <asm/io.h>
 #include <asm/byteorder.h>
 #include <env.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_DM_BOOTCOUNT
 
diff --git a/include/bootm.h b/include/bootm.h
index 0350c349f37..abb6ab891bf 100644
--- a/include/bootm.h
+++ b/include/bootm.h
@@ -8,6 +8,7 @@
 #define _BOOTM_H
 
 #include <image.h>
+#include <linux/types.h>
 
 struct cmd_tbl;
 
diff --git a/include/bootstage.h b/include/bootstage.h
index 670f785c89e..c08ec84447e 100644
--- a/include/bootstage.h
+++ b/include/bootstage.h
@@ -12,6 +12,7 @@
 #define _BOOTSTAGE_H
 
 #include <stdbool.h>
+#include <linux/types.h>
 
 /* Flags for each bootstage record */
 enum bootstage_flags {
diff --git a/include/broadcom/chimp.h b/include/broadcom/chimp.h
index 7f641529139..661c79a5fa7 100644
--- a/include/broadcom/chimp.h
+++ b/include/broadcom/chimp.h
@@ -7,6 +7,7 @@
 #ifndef __CHIMP_H__
 #define __CHIMP_H__
 
+#include <asm/types.h>
 #include <linux/compiler.h>
 
 /**
diff --git a/include/btrfs.h b/include/btrfs.h
index a7605e15897..ed5869ce733 100644
--- a/include/btrfs.h
+++ b/include/btrfs.h
@@ -8,6 +8,7 @@
 #ifndef __U_BOOT_BTRFS_H__
 #define __U_BOOT_BTRFS_H__
 
+#include <linux/types.h>
 struct blk_desc;
 struct disk_partition;
 
diff --git a/include/bus_vcxk.h b/include/bus_vcxk.h
index eecba407bfa..d4952af4794 100644
--- a/include/bus_vcxk.h
+++ b/include/bus_vcxk.h
@@ -7,6 +7,7 @@
 #ifndef __BUS_VCXK_H_
 #define __BUS_VCXK_H_
 
+#include <linux/types.h>
 extern int vcxk_init(unsigned long width, unsigned long height);
 extern void vcxk_setpixel(int x, int y, unsigned long color);
 extern int vcxk_acknowledge_wait(void);
diff --git a/include/cache.h b/include/cache.h
index ecb7956efd5..d142b3fc144 100644
--- a/include/cache.h
+++ b/include/cache.h
@@ -6,6 +6,8 @@
 #ifndef __CACHE_H
 #define __CACHE_H
 
+#include <asm/types.h>
+
 struct udevice;
 
 /*
diff --git a/include/capitalization.h b/include/capitalization.h
index 9d7e8d259c6..29c9e5da11b 100644
--- a/include/capitalization.h
+++ b/include/capitalization.h
@@ -3,6 +3,7 @@
  * Capitalization tables
  */
 
+#include <asm/types.h>
 struct capitalization_table {
 	u16 upper;
 	u16 lower;
diff --git a/include/cavium/atf.h b/include/cavium/atf.h
index 3cf05c43d72..3e4a48c436e 100644
--- a/include/cavium/atf.h
+++ b/include/cavium/atf.h
@@ -5,6 +5,7 @@
 #ifndef __ATF_H__
 #define __ATF_H__
 #include <cavium/atf_part.h>
+#include <linux/types.h>
 
 ssize_t atf_read_mmc(uintptr_t offset, void *buffer, size_t size);
 ssize_t atf_read_nor(uintptr_t offset, void *buffer, size_t size);
diff --git a/include/cbfs.h b/include/cbfs.h
index 5f296d6a371..44393b5e4ef 100644
--- a/include/cbfs.h
+++ b/include/cbfs.h
@@ -8,6 +8,7 @@
 
 #include <compiler.h>
 #include <linux/compiler.h>
+#include <linux/types.h>
 
 enum cbfs_result {
 	CBFS_SUCCESS = 0,
diff --git a/include/cli.h b/include/cli.h
index 8a0b02cf1da..b61bd9a13ed 100644
--- a/include/cli.h
+++ b/include/cli.h
@@ -9,6 +9,7 @@
 
 #include <stdbool.h>
 #include <time.h>
+#include <linux/types.h>
 
 /**
  * Go into the command loop
diff --git a/include/clk-uclass.h b/include/clk-uclass.h
index dac42dab368..5dbdba91d58 100644
--- a/include/clk-uclass.h
+++ b/include/clk-uclass.h
@@ -11,6 +11,7 @@
 /* See clk.h for background documentation. */
 
 #include <clk.h>
+#include <linux/types.h>
 
 struct ofnode_phandle_args;
 
diff --git a/include/command.h b/include/command.h
index bc7786dd4a4..0bd3b1ac7ec 100644
--- a/include/command.h
+++ b/include/command.h
@@ -29,6 +29,7 @@
  * Monitor Command Table
  */
 
+#include <linux/types.h>
 struct cmd_tbl {
 	char		*name;		/* Command Name			*/
 	int		maxargs;	/* maximum number of arguments	*/
diff --git a/include/common.h b/include/common.h
index 868576038a7..2e95d0ebdf5 100644
--- a/include/common.h
+++ b/include/common.h
@@ -14,7 +14,6 @@
 
 #ifndef __ASSEMBLY__		/* put C only stuff in this section */
 #include <config.h>
-#include <linux/types.h>
 #endif	/* __ASSEMBLY__ */
 
 /* Pull in stuff for the build system */
diff --git a/include/cpsw.h b/include/cpsw.h
index 9a237d9abe8..5fe2e4a4de6 100644
--- a/include/cpsw.h
+++ b/include/cpsw.h
@@ -17,6 +17,7 @@
 #define _CPSW_H_
 
 #include <stdbool.h>
+#include <asm/types.h>
 #include <dm/ofnode.h>
 
 /* reg offset */
diff --git a/include/cpu.h b/include/cpu.h
index 089e74c262b..2ac9fac92a2 100644
--- a/include/cpu.h
+++ b/include/cpu.h
@@ -7,6 +7,7 @@
 #ifndef __CPU_H
 #define __CPU_H
 
+#include <linux/types.h>
 struct udevice;
 
 /**
diff --git a/include/cramfs/cramfs_fs.h b/include/cramfs/cramfs_fs.h
index e0c14f04af5..36b28bcc4bf 100644
--- a/include/cramfs/cramfs_fs.h
+++ b/include/cramfs/cramfs_fs.h
@@ -1,6 +1,7 @@
 #ifndef __CRAMFS_H
 #define __CRAMFS_H
 
+#include <asm/types.h>
 #define CRAMFS_MAGIC		0x28cd3d45	/* some random number */
 #define CRAMFS_SIGNATURE	"Compressed ROMFS"
 
diff --git a/include/cros_ec.h b/include/cros_ec.h
index ceb3916ae89..df15d85b1d5 100644
--- a/include/cros_ec.h
+++ b/include/cros_ec.h
@@ -14,6 +14,7 @@
 #include <asm/gpio.h>
 #include <dm/of_extra.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 /* Our configuration information */
 struct cros_ec_dev {
diff --git a/include/crypto/pkcs7.h b/include/crypto/pkcs7.h
index ca35df29f6f..e36e7846079 100644
--- a/include/crypto/pkcs7.h
+++ b/include/crypto/pkcs7.h
@@ -13,6 +13,7 @@
 #include <crypto/public_key.h>
 #endif
 
+#include <linux/types.h>
 struct key;
 struct pkcs7_message;
 
diff --git a/include/crypto/pkcs7_parser.h b/include/crypto/pkcs7_parser.h
index 053ba7826a3..929ead81b06 100644
--- a/include/crypto/pkcs7_parser.h
+++ b/include/crypto/pkcs7_parser.h
@@ -13,6 +13,7 @@
 #include <crypto/pkcs7.h>
 #include <crypto/x509_parser.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 #define kenter(FMT, ...) \
 	pr_devel("==> %s("FMT")\n", __func__, ##__VA_ARGS__)
diff --git a/include/crypto/x509_parser.h b/include/crypto/x509_parser.h
index b793cbde735..381e6b9d1fa 100644
--- a/include/crypto/x509_parser.h
+++ b/include/crypto/x509_parser.h
@@ -12,6 +12,7 @@
 #include <linux/time.h>
 #include <crypto/public_key.h>
 #include <keys/asymmetric-type.h>
+#include <linux/types.h>
 
 struct x509_certificate {
 	struct x509_certificate *next;
diff --git a/include/ddr_spd.h b/include/ddr_spd.h
index fe163da43e5..15b97798634 100644
--- a/include/ddr_spd.h
+++ b/include/ddr_spd.h
@@ -10,6 +10,7 @@
  * Format from "JEDEC Standard No. 21-C,
  * Appendix D: Rev 1.0: SPD's for DDR SDRAM
  */
+#include <linux/types.h>
 typedef struct ddr1_spd_eeprom_s {
 	unsigned char info_size;   /*  0 # bytes written into serial memory */
 	unsigned char chip_size;   /*  1 Total # bytes of SPD memory device */
diff --git a/include/dfu.h b/include/dfu.h
index 764b7757289..94341137dee 100644
--- a/include/dfu.h
+++ b/include/dfu.h
@@ -17,6 +17,7 @@
 #include <linux/list.h>
 #include <mmc.h>
 #include <spi_flash.h>
+#include <linux/types.h>
 #include <linux/usb/composite.h>
 
 enum dfu_device_type {
diff --git a/include/display.h b/include/display.h
index 2c8aca4e48b..9d630eb7d8e 100644
--- a/include/display.h
+++ b/include/display.h
@@ -7,6 +7,7 @@
 #define _DISPLAY_H
 
 #include <stdbool.h>
+#include <asm/types.h>
 
 struct udevice;
 struct display_timing;
diff --git a/include/display_options.h b/include/display_options.h
index 00246955121..54187d021d4 100644
--- a/include/display_options.h
+++ b/include/display_options.h
@@ -10,6 +10,7 @@
 #define __DISPLAY_OPTIONS_H
 
 #include <stdbool.h>
+#include <linux/types.h>
 
 /**
  * print_size() - Print a size with a suffix
diff --git a/include/dm/device-internal.h b/include/dm/device-internal.h
index 07857cf1be7..141f211a3e3 100644
--- a/include/dm/device-internal.h
+++ b/include/dm/device-internal.h
@@ -13,6 +13,7 @@
 #include <stdbool.h>
 #include <asm/global_data.h>
 #include <dm/ofnode.h>
+#include <linux/types.h>
 
 struct device_node;
 struct udevice;
diff --git a/include/dm/device.h b/include/dm/device.h
index 90fb96599b2..9a98d2b3d41 100644
--- a/include/dm/device.h
+++ b/include/dm/device.h
@@ -18,6 +18,7 @@
 #include <linux/kernel.h>
 #include <linux/list.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 struct driver_info;
 
diff --git a/include/dm/devres.h b/include/dm/devres.h
index daeefd7ea3e..d2bf98f37df 100644
--- a/include/dm/devres.h
+++ b/include/dm/devres.h
@@ -13,6 +13,7 @@
 
 #include <linux/compat.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 struct udevice;
 
diff --git a/include/dm/of.h b/include/dm/of.h
index 3d6e23a9340..21666741291 100644
--- a/include/dm/of.h
+++ b/include/dm/of.h
@@ -11,6 +11,7 @@
 #include <asm/u-boot.h>
 #include <asm/global_data.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /* integer value within a device tree property which references another node */
 typedef u32 phandle;
diff --git a/include/dm/of_access.h b/include/dm/of_access.h
index 6f01196b76c..d4f5591b985 100644
--- a/include/dm/of_access.h
+++ b/include/dm/of_access.h
@@ -19,6 +19,7 @@
 
 #include <stdbool.h>
 #include <dm/of.h>
+#include <linux/types.h>
 
 /**
  * of_find_all_nodes - Get next node in global list
diff --git a/include/dm/of_addr.h b/include/dm/of_addr.h
index 3fa1ffce81a..bbe1557634d 100644
--- a/include/dm/of_addr.h
+++ b/include/dm/of_addr.h
@@ -24,6 +24,7 @@
  * @in_addr: pointer to input address
  * @return translated address or OF_BAD_ADDR on error
  */
+#include <linux/types.h>
 u64 of_translate_address(const struct device_node *no, const __be32 *in_addr);
 
 /**
diff --git a/include/dm/of_extra.h b/include/dm/of_extra.h
index ca15df21b06..763d8cf0814 100644
--- a/include/dm/of_extra.h
+++ b/include/dm/of_extra.h
@@ -8,6 +8,7 @@
 #define _DM_OF_EXTRA_H
 
 #include <dm/ofnode.h>
+#include <linux/types.h>
 
 enum fmap_compress_t {
 	FMAP_COMPRESS_NONE,
diff --git a/include/dm/ofnode.h b/include/dm/ofnode.h
index cc700d2b658..5e5da953fd7 100644
--- a/include/dm/ofnode.h
+++ b/include/dm/ofnode.h
@@ -11,6 +11,7 @@
 #include <fdtdec.h>
 #include <stdbool.h>
 #include <dm/of.h>
+#include <linux/types.h>
 
 /* Enable checks to protect against invalid calls */
 #undef OF_CHECKS
diff --git a/include/dm/pci.h b/include/dm/pci.h
index 10f9fd9e378..7d644f42d42 100644
--- a/include/dm/pci.h
+++ b/include/dm/pci.h
@@ -6,6 +6,7 @@
 #ifndef __DM_PCI_H
 #define __DM_PCI_H
 
+#include <asm/types.h>
 struct udevice;
 
 /**
diff --git a/include/dm/pinctrl.h b/include/dm/pinctrl.h
index f879901279d..0afaa8a8884 100644
--- a/include/dm/pinctrl.h
+++ b/include/dm/pinctrl.h
@@ -6,6 +6,7 @@
 #ifndef __PINCTRL_H
 #define __PINCTRL_H
 
+#include <asm/types.h>
 #include <linux/errno.h>
 #define PINNAME_SIZE	10
 #define PINMUX_SIZE	40
diff --git a/include/dm/platdata.h b/include/dm/platdata.h
index cab93b071ba..f8df68fe5f1 100644
--- a/include/dm/platdata.h
+++ b/include/dm/platdata.h
@@ -11,6 +11,7 @@
 #define _DM_PLATDATA_H
 
 #include <linker_lists.h>
+#include <linux/types.h>
 
 /**
  * struct driver_info - Information required to instantiate a device
diff --git a/include/dm/platform_data/fsl_espi.h b/include/dm/platform_data/fsl_espi.h
index 812933f51cd..869a3aa239a 100644
--- a/include/dm/platform_data/fsl_espi.h
+++ b/include/dm/platform_data/fsl_espi.h
@@ -6,6 +6,7 @@
 #ifndef __fsl_espi_h
 #define __fsl_espi_h
 
+#include <linux/types.h>
 struct fsl_espi_platdata {
 	uint flags;
 	uint speed_hz;
diff --git a/include/dm/platform_data/net_ethoc.h b/include/dm/platform_data/net_ethoc.h
index 855e9999a0a..d4d5505b294 100644
--- a/include/dm/platform_data/net_ethoc.h
+++ b/include/dm/platform_data/net_ethoc.h
@@ -7,6 +7,7 @@
 #define _ETHOC_H
 
 #include <net.h>
+#include <asm/types.h>
 
 #ifdef CONFIG_DM_ETH
 
diff --git a/include/dm/platform_data/spi_coldfire.h b/include/dm/platform_data/spi_coldfire.h
index 8ad8eaedfde..db8f518f34d 100644
--- a/include/dm/platform_data/spi_coldfire.h
+++ b/include/dm/platform_data/spi_coldfire.h
@@ -6,6 +6,7 @@
 #ifndef __spi_coldfire_h
 #define __spi_coldfire_h
 
+#include <linux/types.h>
 #define MAX_CTAR_REGS		8
 #define MAX_CTAR_FIELDS		8
 
diff --git a/include/dm/platform_data/spi_davinci.h b/include/dm/platform_data/spi_davinci.h
index fbc62c262ab..0ba7b279e4a 100644
--- a/include/dm/platform_data/spi_davinci.h
+++ b/include/dm/platform_data/spi_davinci.h
@@ -7,6 +7,7 @@
 #ifndef __spi_davinci_h
 #define __spi_davinci_h
 
+#include <asm/types.h>
 struct davinci_spi_platdata {
 	struct davinci_spi_regs *regs;
 	u8 num_cs;	   /* total no. of CS available */
diff --git a/include/dm/read.h b/include/dm/read.h
index 0143ab8ccc0..b4e036432c1 100644
--- a/include/dm/read.h
+++ b/include/dm/read.h
@@ -11,6 +11,7 @@
 
 #include <stdbool.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #include <dm/fdtaddr.h>
 #include <dm/ofnode.h>
diff --git a/include/dm/root.h b/include/dm/root.h
index f2c73555671..316fcc05bbe 100644
--- a/include/dm/root.h
+++ b/include/dm/root.h
@@ -10,6 +10,7 @@
 #define _DM_ROOT_H_
 
 #include <stdbool.h>
+#include <linux/types.h>
 struct udevice;
 
 /**
diff --git a/include/dm/test.h b/include/dm/test.h
index d39686cde28..b72c4301fbe 100644
--- a/include/dm/test.h
+++ b/include/dm/test.h
@@ -7,6 +7,7 @@
 #define __DM_TEST_H
 
 #include <dm.h>
+#include <linux/types.h>
 #include <test/test.h>
 
 /**
diff --git a/include/dm/uclass.h b/include/dm/uclass.h
index 67ff7466c86..8b8efa90339 100644
--- a/include/dm/uclass.h
+++ b/include/dm/uclass.h
@@ -13,6 +13,7 @@
 #include <dm/uclass-id.h>
 #include <linker_lists.h>
 #include <linux/list.h>
+#include <linux/types.h>
 
 /**
  * struct uclass - a U-Boot drive class, collecting together similar drivers
diff --git a/include/dm9000.h b/include/dm9000.h
index f780e513f69..ca4c277d20d 100644
--- a/include/dm9000.h
+++ b/include/dm9000.h
@@ -13,4 +13,5 @@ void dm9000_write_srom_word(int offset, u16 val);
 void dm9000_read_srom_word(int offset, u8 *to);
 #endif
 
+#include <asm/types.h>
 #endif /* __DM9000_H__ */
diff --git a/include/dma-uclass.h b/include/dma-uclass.h
index 340437acc13..5b421d01477 100644
--- a/include/dma-uclass.h
+++ b/include/dma-uclass.h
@@ -12,6 +12,7 @@
 /* See dma.h for background documentation. */
 
 #include <dma.h>
+#include <linux/types.h>
 
 struct ofnode_phandle_args;
 
diff --git a/include/dw_hdmi.h b/include/dw_hdmi.h
index 4c4024ef19f..eb91103b80a 100644
--- a/include/dw_hdmi.h
+++ b/include/dw_hdmi.h
@@ -11,6 +11,7 @@
 
 #include <edid.h>
 #include <stdbool.h>
+#include <linux/types.h>
 
 #define HDMI_EDID_BLOCK_SIZE            128
 
diff --git a/include/dwc3-uboot.h b/include/dwc3-uboot.h
index 6c583e5e7b6..8d1f642a6f4 100644
--- a/include/dwc3-uboot.h
+++ b/include/dwc3-uboot.h
@@ -10,6 +10,7 @@
 #define __DWC3_UBOOT_H_
 
 #include <generic-phy.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/usb/otg.h>
 #include <linux/usb/phy.h>
diff --git a/include/dwmmc.h b/include/dwmmc.h
index 46a9ca25bec..ab678d367a6 100644
--- a/include/dwmmc.h
+++ b/include/dwmmc.h
@@ -12,6 +12,7 @@
 #include <asm/io.h>
 #include <mmc.h>
 #include <linux/bitops.h>
+#include <linux/types.h>
 
 #define DWMCI_CTRL		0x000
 #define	DWMCI_PWREN		0x004
diff --git a/include/ec_commands.h b/include/ec_commands.h
index 444ba61e591..487bf998a13 100644
--- a/include/ec_commands.h
+++ b/include/ec_commands.h
@@ -19,6 +19,8 @@
  *      - ERR is the error code. (defined by EC_RES_ constants)
  *      - Px is the optional payload.
  *        it is not sent if the error code is not success.
+#include <compiler.h>
+#include <linux/types.h>
  *        (defined by ec_params_ and ec_response_ structures)
  *      - S is the checksum which is the sum of all payload bytes.
  *
diff --git a/include/edid.h b/include/edid.h
index 9a0612bf072..3486705b991 100644
--- a/include/edid.h
+++ b/include/edid.h
@@ -12,6 +12,7 @@
 #ifndef __EDID_H_
 #define __EDID_H_
 
+#include <compiler.h>
 #include <stdbool.h>
 #include <linux/types.h>
 
diff --git a/include/eeprom.h b/include/eeprom.h
index 06f2a471657..0934a2a8bab 100644
--- a/include/eeprom.h
+++ b/include/eeprom.h
@@ -7,6 +7,9 @@
 #ifndef __EEPROM_LEGACY_H
 #define __EEPROM_LEGACY_H
 
+#include <linux/errno.h>
+#include <linux/types.h>
+
 #if defined(CONFIG_CMD_EEPROM) || defined(CONFIG_ENV_IS_IN_EEPROM)
 void eeprom_init(int bus);
 int eeprom_read(uint dev_addr, uint offset, uchar *buffer, uint cnt);
@@ -25,5 +28,4 @@ int eeprom_write(uint dev_addr, uint offset, uchar *buffer, uint cnt);
 # define CONFIG_SYS_DEF_EEPROM_ADDR CONFIG_SYS_I2C_EEPROM_ADDR
 #endif
 
-#include <linux/errno.h>
 #endif
diff --git a/include/eeprom_layout.h b/include/eeprom_layout.h
index 730d963ab96..42eaabac1a7 100644
--- a/include/eeprom_layout.h
+++ b/include/eeprom_layout.h
@@ -9,6 +9,7 @@
 #ifndef _LAYOUT_
 #define _LAYOUT_
 
+#include <compiler.h>
 #define RESERVED_FIELDS			NULL
 #define LAYOUT_VERSION_UNRECOGNIZED	-1
 #define LAYOUT_VERSION_AUTODETECT	-2
diff --git a/include/efi_api.h b/include/efi_api.h
index 268d980b11f..2e902a2555a 100644
--- a/include/efi_api.h
+++ b/include/efi_api.h
@@ -16,10 +16,12 @@
 #ifndef _EFI_API_H
 #define _EFI_API_H
 
+#include <compiler.h>
 #include <efi.h>
 #include <charset.h>
 #include <pe.h>
 #include <stdbool.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_EFI_LOADER
 #include <asm/setjmp.h>
diff --git a/include/efi_loader.h b/include/efi_loader.h
index 98944640bee..f74ef36a8f9 100644
--- a/include/efi_loader.h
+++ b/include/efi_loader.h
@@ -15,6 +15,8 @@
 #include <efi_api.h>
 #include <image.h>
 #include <pe.h>
+#include <stdbool.h>
+#include <linux/types.h>
 
 struct blk_desc;
 
diff --git a/include/efi_selftest.h b/include/efi_selftest.h
index 25e5f56121e..d72e87ce23b 100644
--- a/include/efi_selftest.h
+++ b/include/efi_selftest.h
@@ -14,6 +14,7 @@
 #include <efi_loader.h>
 #include <linker_lists.h>
 #include <stdbool.h>
+#include <asm/types.h>
 
 #define EFI_ST_SUCCESS 0
 #define EFI_ST_FAILURE 1
diff --git a/include/efi_variable.h b/include/efi_variable.h
index 9a6fd808ce2..70155aff34a 100644
--- a/include/efi_variable.h
+++ b/include/efi_variable.h
@@ -7,6 +7,7 @@
 #define _EFI_VARIABLE_H
 
 #include <stdbool.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 
 #define EFI_VARIABLE_READ_ONLY BIT(31)
diff --git a/include/env_default.h b/include/env_default.h
index 8a0c3057f0a..cb083e99bcc 100644
--- a/include/env_default.h
+++ b/include/env_default.h
@@ -9,6 +9,7 @@
 
 #include <env_callback.h>
 #include <linux/stringify.h>
+#include <linux/types.h>
 
 #ifdef DEFAULT_ENV_INSTANCE_EMBEDDED
 env_t embedded_environment __UBOOT_ENV_SECTION__(environment) = {
diff --git a/include/env_internal.h b/include/env_internal.h
index b26dc6239c8..f700df71468 100644
--- a/include/env_internal.h
+++ b/include/env_internal.h
@@ -16,6 +16,7 @@
 #define _ENV_INTERNAL_H_
 
 #include <linux/kconfig.h>
+#include <linux/types.h>
 
 /**************************************************************************
  *
diff --git a/include/ethsw.h b/include/ethsw.h
index 04e002d39f5..2eb79e2643c 100644
--- a/include/ethsw.h
+++ b/include/ethsw.h
@@ -8,6 +8,7 @@
 #ifndef _CMD_ETHSW_H_
 #define _CMD_ETHSW_H_
 
+#include <linux/types.h>
 #define ETHSW_MAX_CMD_PARAMS 20
 #define ETHSW_CMD_PORT_ALL -1
 #define ETHSW_CMD_VLAN_ALL -1
diff --git a/include/exports.h b/include/exports.h
index 28a6713ed71..62109d06451 100644
--- a/include/exports.h
+++ b/include/exports.h
@@ -17,6 +17,7 @@
 #endif
 
 #include <irq_func.h>
+#include <linux/types.h>
 
 struct cmd_tbl;
 struct spi_slave;
diff --git a/include/ext4fs.h b/include/ext4fs.h
index cb5d9cc0a5c..59a3319b82d 100644
--- a/include/ext4fs.h
+++ b/include/ext4fs.h
@@ -4,6 +4,7 @@
  * Uma Shankar <uma.shankar@samsung.com>
  * Manjunatha C Achar <a.manjunatha@samsung.com>
  *
+#include <linux/types.h>
  * Ext4 Extent data structures are taken from  original ext4 fs code
  * as found in the linux kernel.
  *
diff --git a/include/ext_common.h b/include/ext_common.h
index 30a0c248414..1078459723e 100644
--- a/include/ext_common.h
+++ b/include/ext_common.h
@@ -5,6 +5,7 @@
  * Uma Shankar <uma.shankar@samsung.com>
  * Manjunatha C Achar <a.manjunatha@samsung.com>
  *
+#include <linux/types.h>
  * Data structures and headers for ext4 support have been taken from
  * ext2 ls load support in Uboot
  *
diff --git a/include/exynos_lcd.h b/include/exynos_lcd.h
index 484bd36334f..329ce3fb655 100644
--- a/include/exynos_lcd.h
+++ b/include/exynos_lcd.h
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
 /*
+#include <linux/types.h>
  * exynos_lcd.h - Exynos LCD Controller structures
  *
  * (C) Copyright 2001
diff --git a/include/fastboot-internal.h b/include/fastboot-internal.h
index bf2f2b3c891..5168e71d3a4 100644
--- a/include/fastboot-internal.h
+++ b/include/fastboot-internal.h
@@ -6,6 +6,7 @@
 /**
  * fastboot_buf_addr - base address of the fastboot download buffer
  */
+#include <asm/types.h>
 extern void *fastboot_buf_addr;
 
 /**
diff --git a/include/fastboot.h b/include/fastboot.h
index 1933b1d98e3..ac07238d9bb 100644
--- a/include/fastboot.h
+++ b/include/fastboot.h
@@ -12,6 +12,7 @@
 #ifndef _FASTBOOT_H_
 #define _FASTBOOT_H_
 
+#include <asm/types.h>
 #define FASTBOOT_VERSION	"0.4"
 
 /* The 64 defined bytes plus \0 */
diff --git a/include/fat.h b/include/fat.h
index 02742f92a5c..318bf658890 100644
--- a/include/fat.h
+++ b/include/fat.h
@@ -11,6 +11,7 @@
 
 #include <asm/byteorder.h>
 #include <fs.h>
+#include <linux/types.h>
 
 struct disk_partition;
 
diff --git a/include/fb_mmc.h b/include/fb_mmc.h
index 76ed7cd6be1..4ca91c82aca 100644
--- a/include/fb_mmc.h
+++ b/include/fb_mmc.h
@@ -6,6 +6,7 @@
 #ifndef _FB_MMC_H_
 #define _FB_MMC_H_
 
+#include <asm/types.h>
 struct blk_desc;
 struct disk_partition;
 
diff --git a/include/fb_nand.h b/include/fb_nand.h
index 6d7999f262f..36d4918d8eb 100644
--- a/include/fb_nand.h
+++ b/include/fb_nand.h
@@ -7,6 +7,7 @@
 #ifndef _FB_NAND_H_
 #define _FB_NAND_H_
 
+#include <asm/types.h>
 #include <jffs2/load_kernel.h>
 
 /**
diff --git a/include/fdt_support.h b/include/fdt_support.h
index 443bfe5e3a3..2a6fd6ed5d0 100644
--- a/include/fdt_support.h
+++ b/include/fdt_support.h
@@ -118,6 +118,7 @@ static inline int fdt_fixup_memory_banks(void *blob, u64 start[], u64 size[],
 }
 #endif
 
+#include <linux/types.h>
 void fdt_fixup_ethernet(void *fdt);
 int fdt_find_and_setprop(void *fdt, const char *node, const char *prop,
 			 const void *val, int len, int create);
diff --git a/include/fdtdec.h b/include/fdtdec.h
index 258a171dc7e..37f9d0f3ef0 100644
--- a/include/fdtdec.h
+++ b/include/fdtdec.h
@@ -18,6 +18,7 @@
 #include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <pci.h>
+#include <linux/types.h>
 
 /*
  * A typedef for a physical address. Note that fdt data is always big
diff --git a/include/fis.h b/include/fis.h
index 419807f1fe5..7642471f51e 100644
--- a/include/fis.h
+++ b/include/fis.h
@@ -9,6 +9,7 @@
 /*
 * Register - Host to Device FIS
 */
+#include <asm/types.h>
 typedef struct sata_fis_h2d {
 	u8 fis_type;
 	u8 pm_port_c;
diff --git a/include/flash.h b/include/flash.h
index 3bf6b22399e..3ff072da49c 100644
--- a/include/flash.h
+++ b/include/flash.h
@@ -15,6 +15,7 @@
  * FLASH Info: contains chip specific data, per FLASH bank
  */
 
+#include <linux/types.h>
 typedef struct {
 	ulong	size;			/* total bank size in bytes		*/
 	ushort	sector_count;		/* number of erase units		*/
diff --git a/include/fs.h b/include/fs.h
index b08b1f40c59..b001b190e3c 100644
--- a/include/fs.h
+++ b/include/fs.h
@@ -6,6 +6,7 @@
 #define _FS_H
 
 #include <common.h>
+#include <linux/types.h>
 
 struct cmd_tbl;
 
diff --git a/include/fs_loader.h b/include/fs_loader.h
index b728c06fcff..56b0bf64ff8 100644
--- a/include/fs_loader.h
+++ b/include/fs_loader.h
@@ -7,6 +7,7 @@
 #define _FS_LOADER_H_
 
 #include <dm.h>
+#include <linux/types.h>
 
 /**
  * struct phandle_part - A place for storing phandle of node and its partition
diff --git a/include/fsl-mc/fsl_dpaa_fd.h b/include/fsl-mc/fsl_dpaa_fd.h
index 5c092af15c8..491bd0a84fb 100644
--- a/include/fsl-mc/fsl_dpaa_fd.h
+++ b/include/fsl-mc/fsl_dpaa_fd.h
@@ -11,6 +11,7 @@
  * routines (lots of read-modify-writes) would be worst-case performance whether
  * or not circumstances required them.) */
 #include <linux/kernel.h>
+#include <linux/types.h>
 struct dpaa_fd {
 	union {
 		u32 words[8];
diff --git a/include/fsl-mc/fsl_dpbp.h b/include/fsl-mc/fsl_dpbp.h
index 2278ac952ea..12327545059 100644
--- a/include/fsl-mc/fsl_dpbp.h
+++ b/include/fsl-mc/fsl_dpbp.h
@@ -13,6 +13,7 @@
 #define __FSL_DPBP_H
 
 /* DPBP Version */
+#include <linux/types.h>
 #define DPBP_VER_MAJOR				3
 #define DPBP_VER_MINOR				3
 
diff --git a/include/fsl-mc/fsl_dpio.h b/include/fsl-mc/fsl_dpio.h
index 7788e1962e6..60702755d67 100644
--- a/include/fsl-mc/fsl_dpio.h
+++ b/include/fsl-mc/fsl_dpio.h
@@ -8,6 +8,7 @@
 #define _FSL_DPIO_H
 
 /* DPIO Version */
+#include <linux/types.h>
 #define DPIO_VER_MAJOR				4
 #define DPIO_VER_MINOR				2
 
diff --git a/include/fsl-mc/fsl_dpmac.h b/include/fsl-mc/fsl_dpmac.h
index 1cea123a316..ff42f6e9942 100644
--- a/include/fsl-mc/fsl_dpmac.h
+++ b/include/fsl-mc/fsl_dpmac.h
@@ -11,6 +11,7 @@
 #define __FSL_DPMAC_H
 
 /* DPMAC Version */
+#include <linux/types.h>
 #define DPMAC_VER_MAJOR				4
 #define DPMAC_VER_MINOR				2
 
diff --git a/include/fsl-mc/fsl_dpmng.h b/include/fsl-mc/fsl_dpmng.h
index 2148601e8a1..17d17d6324a 100644
--- a/include/fsl-mc/fsl_dpmng.h
+++ b/include/fsl-mc/fsl_dpmng.h
@@ -8,6 +8,7 @@
  * Contains general API for the Management Complex firmware
  */
 
+#include <linux/types.h>
 struct fsl_mc_io;
 
 /**
diff --git a/include/fsl-mc/fsl_dpni.h b/include/fsl-mc/fsl_dpni.h
index 96d81d99349..d1266af3471 100644
--- a/include/fsl-mc/fsl_dpni.h
+++ b/include/fsl-mc/fsl_dpni.h
@@ -7,6 +7,7 @@
 #define _FSL_DPNI_H
 
 /* DPNI Version */
+#include <linux/types.h>
 #define DPNI_VER_MAJOR				7
 #define DPNI_VER_MINOR				3
 
diff --git a/include/fsl-mc/fsl_dprc.h b/include/fsl-mc/fsl_dprc.h
index 950ecb07569..5ece93bcf27 100644
--- a/include/fsl-mc/fsl_dprc.h
+++ b/include/fsl-mc/fsl_dprc.h
@@ -9,6 +9,7 @@
 #define _FSL_DPRC_H
 
 /* DPRC Version */
+#include <linux/types.h>
 #define DPRC_VER_MAJOR				6
 #define DPRC_VER_MINOR				1
 
diff --git a/include/fsl-mc/fsl_dpsparser.h b/include/fsl-mc/fsl_dpsparser.h
index 48fb495059e..9ebdd803a67 100644
--- a/include/fsl-mc/fsl_dpsparser.h
+++ b/include/fsl-mc/fsl_dpsparser.h
@@ -8,6 +8,7 @@
 #define _FSL_DPSPARSER_H
 
 /* DPSPARSER last supported API version */
+#include <asm/types.h>
 #define DPSPARSER_VER_MAJOR				1
 #define DPSPARSER_VER_MINOR				0
 
diff --git a/include/fsl-mc/fsl_mc.h b/include/fsl-mc/fsl_mc.h
index 732b4953b5d..a7fd9bc70fe 100644
--- a/include/fsl-mc/fsl_mc.h
+++ b/include/fsl-mc/fsl_mc.h
@@ -7,8 +7,10 @@
 #define __FSL_MC_H__
 
 #include <common.h>
+#include <compiler.h>
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
+#include <linux/types.h>
 
 #define MC_CCSR_BASE_ADDR \
 	((struct mc_ccsr_registers __iomem *)0x8340000)
diff --git a/include/fsl-mc/fsl_mc_cmd.h b/include/fsl-mc/fsl_mc_cmd.h
index 591cda96851..72cfce6d8e9 100644
--- a/include/fsl-mc/fsl_mc_cmd.h
+++ b/include/fsl-mc/fsl_mc_cmd.h
@@ -5,6 +5,8 @@
 #ifndef __FSL_MC_CMD_H
 #define __FSL_MC_CMD_H
 
+#include <compiler.h>
+#include <linux/types.h>
 #define MC_CMD_NUM_OF_PARAMS	7
 
 #define MAKE_UMASK64(_width) \
diff --git a/include/fsl-mc/fsl_mc_sys.h b/include/fsl-mc/fsl_mc_sys.h
index 9fb8164f505..0f0769385eb 100644
--- a/include/fsl-mc/fsl_mc_sys.h
+++ b/include/fsl-mc/fsl_mc_sys.h
@@ -8,6 +8,7 @@
 #ifndef _FSL_MC_SYS_H
 #define _FSL_MC_SYS_H
 
+#include <compiler.h>
 #include <asm/io.h>
 
 struct mc_command;
diff --git a/include/fsl-mc/fsl_qbman_base.h b/include/fsl-mc/fsl_qbman_base.h
index 7818fc28e6e..0f75c890b59 100644
--- a/include/fsl-mc/fsl_qbman_base.h
+++ b/include/fsl-mc/fsl_qbman_base.h
@@ -10,6 +10,7 @@
  * control this QBMan instance, these values may simply be place-holders. The
  * idea is simply that we be able to distinguish between them, eg. so that SWP
  * descriptors can identify which QBMan instance they belong to. */
+#include <linux/types.h>
 struct qbman_block_desc {
 	void *ccsr_reg_bar; /* CCSR register map */
 	int irq_rerr;  /* Recoverable error interrupt line */
diff --git a/include/fsl-mc/fsl_qbman_portal.h b/include/fsl-mc/fsl_qbman_portal.h
index ee0e4aa50dd..9633090a83b 100644
--- a/include/fsl-mc/fsl_qbman_portal.h
+++ b/include/fsl-mc/fsl_qbman_portal.h
@@ -7,6 +7,7 @@
 #define _FSL_QBMAN_PORTAL_H
 
 #include <fsl-mc/fsl_qbman_base.h>
+#include <linux/types.h>
 
 /* Create and destroy a functional object representing the given QBMan portal
  * descriptor. */
diff --git a/include/fsl-mc/ldpaa_wriop.h b/include/fsl-mc/ldpaa_wriop.h
index b55c39cbb29..3f915c4990d 100644
--- a/include/fsl-mc/ldpaa_wriop.h
+++ b/include/fsl-mc/ldpaa_wriop.h
@@ -7,6 +7,7 @@
 #define __LDPAA_WRIOP_H
 
 #include <phy.h>
+#include <asm/types.h>
 
 #define DEFAULT_WRIOP_MDIO1_NAME "FSL_MDIO0"
 #define DEFAULT_WRIOP_MDIO2_NAME "FSL_MDIO1"
diff --git a/include/fsl_csu.h b/include/fsl_csu.h
index 0e59ac3c324..818e975d9fe 100644
--- a/include/fsl_csu.h
+++ b/include/fsl_csu.h
@@ -7,6 +7,7 @@
 #ifndef __FSL_CSU_H__
 #define __FSL_CSU_H__
 
+#include <linux/types.h>
 enum csu_cslx_access {
 	CSU_NS_SUP_R = 0x08,
 	CSU_NS_SUP_W = 0x80,
diff --git a/include/fsl_ddr.h b/include/fsl_ddr.h
index 025d7a1e74b..21198cdb053 100644
--- a/include/fsl_ddr.h
+++ b/include/fsl_ddr.h
@@ -9,6 +9,7 @@
 #include <fsl_ddrc_version.h>
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
+#include <asm/types.h>
 
 #include <common_timing_params.h>
 
diff --git a/include/fsl_ddr_sdram.h b/include/fsl_ddr_sdram.h
index 9d6e181987b..5d277b2a6c4 100644
--- a/include/fsl_ddr_sdram.h
+++ b/include/fsl_ddr_sdram.h
@@ -13,6 +13,7 @@
 #include <ddr_spd.h>
 #include <fsl_ddrc_version.h>
 #include <stdbool.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 
 #define SDRAM_TYPE_DDR1		2
diff --git a/include/fsl_devdis.h b/include/fsl_devdis.h
index 1f1b0333172..113db2ef787 100644
--- a/include/fsl_devdis.h
+++ b/include/fsl_devdis.h
@@ -6,6 +6,7 @@
 #ifndef __FSL_DEVDIS_H_
 #define __FSL_DEVDIS_H_
 
+#include <linux/types.h>
 struct devdis_table {
 	char name[32];
 	u32 offset;
diff --git a/include/fsl_diu_fb.h b/include/fsl_diu_fb.h
index 139851ba1a8..d7b8fad2057 100644
--- a/include/fsl_diu_fb.h
+++ b/include/fsl_diu_fb.h
@@ -7,6 +7,7 @@
  * FSL DIU Framebuffer driver
  */
 
+#include <asm/types.h>
 int fsl_diu_init(u16 xres, u16 yres, u32 pixel_format, int gamma_fix);
 
 /* Prototypes for external board-specific functions */
diff --git a/include/fsl_dspi.h b/include/fsl_dspi.h
index 4fec83549e1..d0096c050f7 100644
--- a/include/fsl_dspi.h
+++ b/include/fsl_dspi.h
@@ -12,6 +12,7 @@
 #define _FSL_DSPI_H_
 
 /* DMA Serial Peripheral Interface (DSPI) */
+#include <asm/types.h>
 struct dspi {
 	u32 mcr;	/* 0x00 */
 	u32 resv0;	/* 0x04 */
diff --git a/include/fsl_errata.h b/include/fsl_errata.h
index 3123ceaaed5..645f2c8526a 100644
--- a/include/fsl_errata.h
+++ b/include/fsl_errata.h
@@ -15,6 +15,7 @@
 #include <asm/arch/soc.h>
 #endif
 #include <stdbool.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 
 
diff --git a/include/fsl_esdhc.h b/include/fsl_esdhc.h
index e15d10c669d..4aa0013cdbb 100644
--- a/include/fsl_esdhc.h
+++ b/include/fsl_esdhc.h
@@ -12,6 +12,7 @@
 
 #include <linux/errno.h>
 #include <asm/byteorder.h>
+#include <linux/types.h>
 
 /* needed for the mmc_cfg definition */
 #include <mmc.h>
diff --git a/include/fsl_esdhc_imx.h b/include/fsl_esdhc_imx.h
index 78f0e18dde3..462a8b8040e 100644
--- a/include/fsl_esdhc_imx.h
+++ b/include/fsl_esdhc_imx.h
@@ -16,6 +16,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <asm/byteorder.h>
+#include <linux/types.h>
 
 /* needed for the mmc_cfg definition */
 #include <mmc.h>
diff --git a/include/fsl_ifc.h b/include/fsl_ifc.h
index fd915335b2c..3a5c3aad514 100644
--- a/include/fsl_ifc.h
+++ b/include/fsl_ifc.h
@@ -790,6 +790,7 @@ enum ifc_nand_fir_opcodes {
 
 #ifndef __ASSEMBLY__
 #include <asm/io.h>
+#include <linux/types.h>
 
 extern void print_ifc_regs(void);
 extern void init_early_memctl_regs(void);
diff --git a/include/fsl_immap.h b/include/fsl_immap.h
index 5297c0b3f9b..33078e72775 100644
--- a/include/fsl_immap.h
+++ b/include/fsl_immap.h
@@ -9,6 +9,7 @@
 #define __FSL_IMMAP_H
 /*
  * DDR memory controller registers
+#include <asm/types.h>
  * This structure works for mpc83xx (DDR2 and DDR3), mpc85xx, mpc86xx.
  */
 struct ccsr_ddr {
diff --git a/include/fsl_lpuart.h b/include/fsl_lpuart.h
index 511fb843672..30c40e87af7 100644
--- a/include/fsl_lpuart.h
+++ b/include/fsl_lpuart.h
@@ -33,6 +33,7 @@ struct lpuart_fsl_reg32 {
 };
 #endif
 
+#include <linux/types.h>
 struct lpuart_fsl {
 	u8 ubdh;
 	u8 ubdl;
diff --git a/include/fsl_mdio.h b/include/fsl_mdio.h
index b8fed2a0d2c..2ce849f85fa 100644
--- a/include/fsl_mdio.h
+++ b/include/fsl_mdio.h
@@ -8,8 +8,10 @@
 #ifndef __FSL_PHY_H__
 #define __FSL_PHY_H__
 
+#include <compiler.h>
 #include <net.h>
 #include <miiphy.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 
 struct tsec_mii_mng {
diff --git a/include/fsl_memac.h b/include/fsl_memac.h
index d067f1511c6..c5425842990 100644
--- a/include/fsl_memac.h
+++ b/include/fsl_memac.h
@@ -8,6 +8,7 @@
 #define __MEMAC_H__
 
 #include <phy.h>
+#include <asm/types.h>
 
 struct memac {
 	/* memac general control and status registers */
diff --git a/include/fsl_mmdc.h b/include/fsl_mmdc.h
index 05fb41f4033..9ce570f0ed6 100644
--- a/include/fsl_mmdc.h
+++ b/include/fsl_mmdc.h
@@ -7,6 +7,7 @@
 #define FSL_MMDC_H
 
 /* PHY Write Leveling Configuration and Error Status Register (MPWLGCR) */
+#include <asm/types.h>
 #define MPWLGCR_HW_WL_EN		(1 << 0)
 
 /* PHY Pre-defined Compare and CA delay-line Configuration (MPPDCMPR2) */
diff --git a/include/fsl_qbman.h b/include/fsl_qbman.h
index 4687eb9bb18..eec53003d22 100644
--- a/include/fsl_qbman.h
+++ b/include/fsl_qbman.h
@@ -5,6 +5,8 @@
 
 #ifndef __FSL_QBMAN_H__
 #define __FSL_QBMAN_H__
+#include <compiler.h>
+#include <asm/types.h>
 void fdt_fixup_qportals(void *blob);
 void fdt_fixup_bportals(void *blob);
 void inhibit_portals(void __iomem *addr, int max_portals,
diff --git a/include/fsl_sec.h b/include/fsl_sec.h
index 1c6f1eb23ec..1ad5577dc7f 100644
--- a/include/fsl_sec.h
+++ b/include/fsl_sec.h
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <asm/io.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_SYS_FSL_SEC_LE
 #define sec_in32(a)       in_le32(a)
diff --git a/include/fsl_sec_mon.h b/include/fsl_sec_mon.h
index fb838db0b53..32ef91d490d 100644
--- a/include/fsl_sec_mon.h
+++ b/include/fsl_sec_mon.h
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <asm/io.h>
+#include <asm/types.h>
 
 #ifdef CONFIG_SYS_FSL_SEC_MON_LE
 #define sec_mon_in32(a)       in_le32(a)
diff --git a/include/fsl_sfp.h b/include/fsl_sfp.h
index 613814d9057..573059e6b42 100644
--- a/include/fsl_sfp.h
+++ b/include/fsl_sfp.h
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <config.h>
 #include <asm/io.h>
+#include <asm/types.h>
 
 #ifdef CONFIG_SYS_FSL_SRK_LE
 #define srk_in32(a)       in_le32(a)
diff --git a/include/fsl_tgec.h b/include/fsl_tgec.h
index 59cd856ba09..cf27a883d8f 100644
--- a/include/fsl_tgec.h
+++ b/include/fsl_tgec.h
@@ -8,6 +8,7 @@
 #define __TGEC_H__
 
 #include <phy.h>
+#include <asm/types.h>
 
 struct tgec {
 	/* 10GEC general control and status registers */
diff --git a/include/fsl_usb.h b/include/fsl_usb.h
index 5e3a935e9d8..b465e54adac 100644
--- a/include/fsl_usb.h
+++ b/include/fsl_usb.h
@@ -53,6 +53,7 @@ struct ccsr_usb_phy {
 #define CONFIG_SYS_FSL_USB_INTERNAL_SOC_CLK_EN (1 << 20)
 #endif
 #include <stdbool.h>
+#include <asm/types.h>
 #define CONFIG_SYS_FSL_USB_PLLPRG2_REF_DIV (1 << 4)
 #define CONFIG_SYS_FSL_USB_PLLPRG2_MFI (5 << 16)
 #define CONFIG_SYS_FSL_USB_PLLPRG2_PLL_EN (1 << 21)
diff --git a/include/fsl_wdog.h b/include/fsl_wdog.h
index 655f22ed9ac..f45e700616e 100644
--- a/include/fsl_wdog.h
+++ b/include/fsl_wdog.h
@@ -3,6 +3,7 @@
  * (C) Copyright 2015 Freescale Semiconductor, Inc.
  */
 
+#include <asm/types.h>
 struct watchdog_regs {
 	u16	wcr;	/* Control */
 	u16	wsr;	/* Service */
diff --git a/include/fuse.h b/include/fuse.h
index d48dcdfa647..6bd783086a3 100644
--- a/include/fuse.h
+++ b/include/fuse.h
@@ -19,6 +19,7 @@
  *
  *   Returns: 0 on success, not 0 on failure
  */
+#include <asm/types.h>
 int fuse_read(u32 bank, u32 word, u32 *val);
 int fuse_sense(u32 bank, u32 word, u32 *val);
 int fuse_prog(u32 bank, u32 word, u32 val);
diff --git a/include/gdsys_fpga.h b/include/gdsys_fpga.h
index 6d38a83d903..d684df32be1 100644
--- a/include/gdsys_fpga.h
+++ b/include/gdsys_fpga.h
@@ -36,6 +36,7 @@ extern struct ihs_fpga *fpga_ptr[];
 		     val)
 #endif
 
+#include <linux/types.h>
 struct ihs_gpio {
 	u16 read;
 	u16 clear;
diff --git a/include/gzip.h b/include/gzip.h
index 783acbb60d2..36a35572f2b 100644
--- a/include/gzip.h
+++ b/include/gzip.h
@@ -7,6 +7,7 @@
 #ifndef __GZIP_H
 #define __GZIP_H
 
+#include <linux/types.h>
 struct blk_desc;
 
 /**
diff --git a/include/hash.h b/include/hash.h
index 97bb3ed5d9a..ec8f266a9ce 100644
--- a/include/hash.h
+++ b/include/hash.h
@@ -6,6 +6,7 @@
 #ifndef _HASH_H
 #define _HASH_H
 
+#include <linux/types.h>
 struct cmd_tbl;
 
 /*
diff --git a/include/hda_codec.h b/include/hda_codec.h
index 56de571f0f7..1cc91ba4c12 100644
--- a/include/hda_codec.h
+++ b/include/hda_codec.h
@@ -10,6 +10,7 @@
 #ifndef __HDA_CODEC_H_
 #define __HDA_CODEC_H_
 
+#include <linux/types.h>
 struct hda_regs;
 
 /**
diff --git a/include/hw_sha.h b/include/hw_sha.h
index 991e496a3cb..de60ed8cbed 100644
--- a/include/hw_sha.h
+++ b/include/hw_sha.h
@@ -7,6 +7,7 @@
 #ifndef __HW_SHA_H
 #define __HW_SHA_H
 #include <hash.h>
+#include <linux/types.h>
 
 /**
  * Computes hash value of input pbuf using h/w acceleration
diff --git a/include/i2c.h b/include/i2c.h
index b8ee77d98bc..34227ef8148 100644
--- a/include/i2c.h
+++ b/include/i2c.h
@@ -19,6 +19,7 @@
 #include <linker_lists.h>
 #include <stdbool.h>
 #include <stdio.h>
+#include <linux/types.h>
 
 /*
  * For now there are essentially two parts to this file - driver model
diff --git a/include/i2c_eeprom.h b/include/i2c_eeprom.h
index cd620d519fc..18e2ea815de 100644
--- a/include/i2c_eeprom.h
+++ b/include/i2c_eeprom.h
@@ -6,6 +6,7 @@
 #ifndef __I2C_EEPROM
 #define __I2C_EEPROM
 
+#include <linux/types.h>
 struct i2c_eeprom_ops {
 	int (*read)(struct udevice *dev, int offset, uint8_t *buf, int size);
 	int (*write)(struct udevice *dev, int offset, const uint8_t *buf,
diff --git a/include/i2s.h b/include/i2s.h
index 7760aab7c46..b5a117773c1 100644
--- a/include/i2s.h
+++ b/include/i2s.h
@@ -13,6 +13,7 @@
  * Describes the physical PCM data formating and clocking. Add new formats
  * to the end.
  */
+#include <linux/types.h>
 #define SND_SOC_DAIFMT_I2S		1 /* I2S mode */
 #define SND_SOC_DAIFMT_RIGHT_J		2 /* Right Justified mode */
 #define SND_SOC_DAIFMT_LEFT_J		3 /* Left Justified mode */
diff --git a/include/ide.h b/include/ide.h
index 1b37d67992c..37b2b4f5345 100644
--- a/include/ide.h
+++ b/include/ide.h
@@ -8,6 +8,7 @@
 #define _IDE_H
 
 #include <blk.h>
+#include <linux/types.h>
 
 #define IDE_BUS(dev)	(dev / (CONFIG_SYS_IDE_MAXDEVICE / CONFIG_SYS_IDE_MAXBUS))
 
diff --git a/include/imx8image.h b/include/imx8image.h
index 72daa6ed5d3..35b4b6f28f5 100644
--- a/include/imx8image.h
+++ b/include/imx8image.h
@@ -8,9 +8,11 @@
 #ifndef _IMX8IMAGE_H_
 #define _IMX8IMAGE_H_
 
+#include <compiler.h>
 #include <image.h>
 #include <inttypes.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "imagetool.h"
 
 #define __packed   __attribute__((packed))
diff --git a/include/imx_lpi2c.h b/include/imx_lpi2c.h
index 3ce9edaf101..5941b5363c0 100644
--- a/include/imx_lpi2c.h
+++ b/include/imx_lpi2c.h
@@ -9,6 +9,7 @@
 #define __IMX_LPI2C_H__
 
 #include <clk.h>
+#include <linux/types.h>
 
 struct imx_lpi2c_bus {
 	int index;
diff --git a/include/imximage.h b/include/imximage.h
index 1ed3284f154..6692696f107 100644
--- a/include/imximage.h
+++ b/include/imximage.h
@@ -61,6 +61,7 @@
 #define DCD_CHECK_BITS_CLR_PARAM	0x04
 
 #ifndef __ASSEMBLY__
+#include <linux/types.h>
 enum imximage_cmd {
 	CMD_INVALID,
 	CMD_IMAGE_VERSION,
diff --git a/include/input.h b/include/input.h
index 973d13f53b9..cee0762676c 100644
--- a/include/input.h
+++ b/include/input.h
@@ -9,6 +9,7 @@
 #define _INPUT_H
 
 #include <stdbool.h>
+#include <linux/types.h>
 enum {
 	INPUT_MAX_MODIFIERS	= 4,
 	INPUT_BUFFER_LEN	= 16,
diff --git a/include/ioports.h b/include/ioports.h
index 1cd3ceb37a5..ae876c9be84 100644
--- a/include/ioports.h
+++ b/include/ioports.h
@@ -5,6 +5,7 @@
  */
 
 /*
+#include <linux/types.h>
  * this structure mirrors the layout of the five port registers in
  * the internal memory map
  */
diff --git a/include/ipu_pixfmt.h b/include/ipu_pixfmt.h
index 866ead0ec71..b230a2039dd 100644
--- a/include/ipu_pixfmt.h
+++ b/include/ipu_pixfmt.h
@@ -13,6 +13,7 @@
 
 #include <linux/list.h>
 #include <linux/fb.h>
+#include <linux/types.h>
 
 /*  IPU Pixel format definitions */
 #define fourcc(a, b, c, d)\
diff --git a/include/irq.h b/include/irq.h
index 150d7ce20c2..699b97a9cd7 100644
--- a/include/irq.h
+++ b/include/irq.h
@@ -9,6 +9,7 @@
 #define __irq_H
 
 #include <stdbool.h>
+#include <linux/types.h>
 struct acpi_irq;
 struct ofnode_phandle_args;
 
diff --git a/include/jffs2/jffs2_1pass.h b/include/jffs2/jffs2_1pass.h
index 5bc3e66cd76..947202d5be9 100644
--- a/include/jffs2/jffs2_1pass.h
+++ b/include/jffs2/jffs2_1pass.h
@@ -1,3 +1,4 @@
+#include <asm/types.h>
 u32 jffs2_1pass_ls(struct part_info *part,const char *fname);
 u32 jffs2_1pass_load(char *dest, struct part_info *part,const char *fname);
 u32 jffs2_1pass_info(struct part_info *part);
diff --git a/include/jffs2/load_kernel.h b/include/jffs2/load_kernel.h
index 9346d7ee9f1..d3a3947d950 100644
--- a/include/jffs2/load_kernel.h
+++ b/include/jffs2/load_kernel.h
@@ -9,6 +9,7 @@
  * Description:   header for load kernel modules
  *-----------------------------------------------------------------------*/
 
+#include <asm/types.h>
 #include <linux/list.h>
 
 /* mtd device types */
diff --git a/include/k3-avs.h b/include/k3-avs.h
index e3c3cafbb9d..af9ad03acd3 100644
--- a/include/k3-avs.h
+++ b/include/k3-avs.h
@@ -10,6 +10,8 @@
 #ifndef _K3_AVS0_
 #define _K3_AVS0_
 
+#include <asm/types.h>
+
 #define AM6_VDD_WKUP		0
 #define AM6_VDD_MCU		1
 #define AM6_VDD_CORE		2
diff --git a/include/kendryte/bypass.h b/include/kendryte/bypass.h
index 2f0b17d7061..4ce3ef9ea3e 100644
--- a/include/kendryte/bypass.h
+++ b/include/kendryte/bypass.h
@@ -7,6 +7,7 @@
 
 #include <clk.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 struct k210_bypass {
 	struct clk clk;
diff --git a/include/kendryte/clk.h b/include/kendryte/clk.h
index 9c6245d468b..8d698a42948 100644
--- a/include/kendryte/clk.h
+++ b/include/kendryte/clk.h
@@ -7,6 +7,7 @@
 #define K210_CLK_H
 
 #define LOG_CATEGORY UCLASS_CLK
+#include <compiler.h>
 #include <linux/types.h>
 #include <linux/clk-provider.h>
 
diff --git a/include/kendryte/pll.h b/include/kendryte/pll.h
index 083f388c128..9ed84d1739b 100644
--- a/include/kendryte/pll.h
+++ b/include/kendryte/pll.h
@@ -6,6 +6,8 @@
 #define K210_PLL_H
 
 #include <clk.h>
+#include <compiler.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 #include <test/export.h>
 
diff --git a/include/key_matrix.h b/include/key_matrix.h
index 519722f2d8f..7800075837a 100644
--- a/include/key_matrix.h
+++ b/include/key_matrix.h
@@ -9,6 +9,7 @@
 #define _KEY_MATRIX_H
 
 #include <common.h>
+#include <linux/types.h>
 
 /* Information about a matrix keyboard */
 struct key_matrix {
diff --git a/include/keys/asymmetric-type.h b/include/keys/asymmetric-type.h
index 2e8b0224b83..d5314d7e251 100644
--- a/include/keys/asymmetric-type.h
+++ b/include/keys/asymmetric-type.h
@@ -49,6 +49,7 @@ enum asymmetric_payload_bits {
  * What we actually do is provide a place where binary identifiers can be
  * stashed and then compare against them when checking for an id match.
  */
+#include <linux/types.h>
 struct asymmetric_key_id {
 	unsigned short	len;
 	unsigned char	data[];
diff --git a/include/lattice.h b/include/lattice.h
index 80fafc00dcb..83a82834b3f 100644
--- a/include/lattice.h
+++ b/include/lattice.h
@@ -13,6 +13,7 @@
 #ifndef _VME_OPCODE_H
 #define _VME_OPCODE_H
 
+#include <linux/types.h>
 #define VME_VERSION_NUMBER "12.1"
 
 /* Maximum declarations. */
diff --git a/include/lcd.h b/include/lcd.h
index 08086008694..1ea207cc2c6 100644
--- a/include/lcd.h
+++ b/include/lcd.h
@@ -17,6 +17,7 @@
 #include <bmp_layout.h>
 #include <asm/byteorder.h>
 #endif
+#include <linux/types.h>
 
 int bmp_display(ulong addr, int x, int y);
 struct bmp_image *gunzip_bmp(unsigned long addr, unsigned long *lenp,
diff --git a/include/lcd_console.h b/include/lcd_console.h
index 061a6a41bbd..dbdc0dc6e0e 100644
--- a/include/lcd_console.h
+++ b/include/lcd_console.h
@@ -5,6 +5,7 @@
 
 /* By default we scroll by a single line */
 
+#include <linux/types.h>
 struct console_t {
 	short curr_col, curr_row;
 	short cols, rows;
diff --git a/include/lcdvideo.h b/include/lcdvideo.h
index f0640a53852..9946ceaed00 100644
--- a/include/lcdvideo.h
+++ b/include/lcdvideo.h
@@ -8,6 +8,7 @@
 
 /* LCD Controller Configuration Register.
 */
+#include <linux/types.h>
 #define LCCR_BNUM	((uint)0xfffe0000)
 #define LCCR_EIEN	((uint)0x00010000)
 #define LCCR_IEN	((uint)0x00008000)
diff --git a/include/libata.h b/include/libata.h
index 10e6057ef4a..94caa9ffbd7 100644
--- a/include/libata.h
+++ b/include/libata.h
@@ -10,6 +10,7 @@
 #ifndef __LIBATA_H__
 #define __LIBATA_H__
 
+#include <asm/types.h>
 enum {
 	/* various global constants */
 	ATA_MAX_DEVICES		= 2,	/* per bus/port */
diff --git a/include/linux/mtd/omap_gpmc.h b/include/linux/mtd/omap_gpmc.h
index 864b05e432a..af2d589251e 100644
--- a/include/linux/mtd/omap_gpmc.h
+++ b/include/linux/mtd/omap_gpmc.h
@@ -8,6 +8,8 @@
 #ifndef __ASM_OMAP_GPMC_H
 #define __ASM_OMAP_GPMC_H
 
+#include <linux/types.h>
+
 #define GPMC_BUF_EMPTY	0
 #define GPMC_BUF_FULL	1
 #define GPMC_MAX_SECTORS	8
diff --git a/include/linux/soc/ti/cppi5.h b/include/linux/soc/ti/cppi5.h
index 7447881eb26..48d8a103898 100644
--- a/include/linux/soc/ti/cppi5.h
+++ b/include/linux/soc/ti/cppi5.h
@@ -8,11 +8,14 @@
 #ifndef __TI_CPPI5_H__
 #define __TI_CPPI5_H__
 
+#include <compiler.h>
 #include <hexdump.h>
 #include <stdbool.h>
 #include <linux/bitops.h>
 #include <linux/bug.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 /**
  * Descriptor header, present in all types of descriptors
diff --git a/include/linux/soc/ti/k3-navss-ringacc.h b/include/linux/soc/ti/k3-navss-ringacc.h
index 9176277ff0b..a2f709a3848 100644
--- a/include/linux/soc/ti/k3-navss-ringacc.h
+++ b/include/linux/soc/ti/k3-navss-ringacc.h
@@ -8,6 +8,7 @@
 #ifndef __SOC_TI_K3_NAVSS_RINGACC_API_H_
 #define __SOC_TI_K3_NAVSS_RINGACC_API_H_
 
+#include <asm/types.h>
 #include <dm/ofnode.h>
 #include <linux/bitops.h>
 
diff --git a/include/linux/soc/ti/k3-sec-proxy.h b/include/linux/soc/ti/k3-sec-proxy.h
index f34854ceebc..19c0ffc0d69 100644
--- a/include/linux/soc/ti/k3-sec-proxy.h
+++ b/include/linux/soc/ti/k3-sec-proxy.h
@@ -11,6 +11,7 @@
 #define K3_SEC_PROXY_H
 
 /**
+#include <linux/types.h>
  * struct k3_sec_proxy_msg - Secure proxy message structure
  * @len: Length of data in the Buffer
  * @buf: Buffer pointer
diff --git a/include/linux/soc/ti/ti-udma.h b/include/linux/soc/ti/ti-udma.h
index 04e354fb2d6..fc8bc186ced 100644
--- a/include/linux/soc/ti/ti-udma.h
+++ b/include/linux/soc/ti/ti-udma.h
@@ -8,6 +8,7 @@
 #define __TI_UDMA_H
 
 /**
+#include <asm/types.h>
  * struct ti_udma_drv_packet_data - TI UDMA transfer specific data
  *
  * @pkt_type: Packet Type - specific for each DMA client HW
diff --git a/include/linux/soc/ti/ti_sci_protocol.h b/include/linux/soc/ti/ti_sci_protocol.h
index 1ae73240c80..e4239992dbc 100644
--- a/include/linux/soc/ti/ti_sci_protocol.h
+++ b/include/linux/soc/ti/ti_sci_protocol.h
@@ -12,6 +12,8 @@
 #define __TISCI_PROTOCOL_H
 
 /**
+#include <compiler.h>
+#include <asm/types.h>
  * struct ti_sci_version_info - version information structure
  * @abi_major:	Major ABI version. Change here implies risk of backward
  *		compatibility break.
diff --git a/include/lmb.h b/include/lmb.h
index 73b7a5cbe3d..971a696fffb 100644
--- a/include/lmb.h
+++ b/include/lmb.h
@@ -61,4 +61,5 @@ void arch_lmb_reserve(struct lmb *lmb);
 
 #endif /* __KERNEL__ */
 
+#include <linux/types.h>
 #endif /* _LINUX_LMB_H */
diff --git a/include/lynxkdi.h b/include/lynxkdi.h
index 38640277b29..1a2c47c295f 100644
--- a/include/lynxkdi.h
+++ b/include/lynxkdi.h
@@ -8,6 +8,7 @@
 #define __LYNXKDI_H__
 
 
+#include <linux/types.h>
 /* Boot parameter struct passed to kernel
  */
 typedef struct lynxos_bootparms_t {
diff --git a/include/lz4.h b/include/lz4.h
index 1276fb98a34..6cd82c41e9c 100644
--- a/include/lz4.h
+++ b/include/lz4.h
@@ -19,6 +19,7 @@
  *	buffer is overrun, -EEPROTO if the compressed data causes an error in
  *	the decompression algorithm
  */
+#include <linux/types.h>
 int ulz4fn(const void *src, size_t srcn, void *dst, size_t *dstn);
 
 #endif
diff --git a/include/mailbox.h b/include/mailbox.h
index 93f4715e169..56360ba286e 100644
--- a/include/mailbox.h
+++ b/include/mailbox.h
@@ -32,6 +32,7 @@
  * messages. This header file describes the API used by clients.
  */
 
+#include <linux/types.h>
 struct udevice;
 
 /**
diff --git a/include/malloc.h b/include/malloc.h
index 36f8556f9fe..b93b5b43eda 100644
--- a/include/malloc.h
+++ b/include/malloc.h
@@ -60,6 +60,7 @@
   malloc_stats();
      Prints brief summary statistics on stderr.
   mallinfo()
+#include <linux/types.h>
      Returns (by copy) a struct containing various summary statistics.
   mallopt(int parameter_number, int parameter_value)
      Changes one of the tunable parameters described below. Returns
diff --git a/include/mapmem.h b/include/mapmem.h
index 2134c8004d9..0b2f929c307 100644
--- a/include/mapmem.h
+++ b/include/mapmem.h
@@ -12,6 +12,7 @@
 /* Define a null map_sysmem() if the architecture doesn't use it */
 # ifdef CONFIG_ARCH_MAP_SYSMEM
 #include <asm/io.h>
+#include <linux/types.h>
 # else
 static inline void *map_sysmem(phys_addr_t paddr, unsigned long len)
 {
diff --git a/include/mc9sdz60.h b/include/mc9sdz60.h
index ffe376bf507..b4bbfd72da9 100644
--- a/include/mc9sdz60.h
+++ b/include/mc9sdz60.h
@@ -15,6 +15,7 @@
  * but not include/linux/mfd/mc9s08dz60/pmic.h
  *
  */
+#include <asm/types.h>
 enum mc9sdz60_reg {
 	MC9SDZ60_REG_VERSION		= 0x00,
 	/* reserved                       0x01 */
diff --git a/include/memalign.h b/include/memalign.h
index cb0dcf39b41..841cac4944b 100644
--- a/include/memalign.h
+++ b/include/memalign.h
@@ -14,6 +14,7 @@
 #include <asm/cache.h>
 #include <malloc.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 /*
  * The ALLOC_CACHE_ALIGN_BUFFER macro is used to allocate a buffer on the
diff --git a/include/miiphy.h b/include/miiphy.h
index 61c136b114c..a23215aa718 100644
--- a/include/miiphy.h
+++ b/include/miiphy.h
@@ -15,6 +15,7 @@
 #define _miiphy_h_
 
 #include <common.h>
+#include <asm/types.h>
 #include <linux/mii.h>
 #include <linux/list.h>
 #include <net.h>
diff --git a/include/mipi_dsi.h b/include/mipi_dsi.h
index 2abbbfa949b..171078a348b 100644
--- a/include/mipi_dsi.h
+++ b/include/mipi_dsi.h
@@ -19,6 +19,7 @@
 #include <stdbool.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 struct mipi_dsi_host;
 struct mipi_dsi_device;
diff --git a/include/mm_communication.h b/include/mm_communication.h
index e464cbb48e2..b77364250a9 100644
--- a/include/mm_communication.h
+++ b/include/mm_communication.h
@@ -12,6 +12,7 @@
 #define _MM_COMMUNICATION_H_
 
 #include <part_efi.h>
+#include <linux/types.h>
 
 /*
  * Interface to the pseudo Trusted Application (TA), which provides a
diff --git a/include/mmc.h b/include/mmc.h
index d319f46e355..9c9b7638665 100644
--- a/include/mmc.h
+++ b/include/mmc.h
@@ -17,6 +17,7 @@
 #include <linux/compiler.h>
 #include <linux/dma-direction.h>
 #include <part.h>
+#include <linux/types.h>
 
 struct bd_info;
 
diff --git a/include/mpc86xx.h b/include/mpc86xx.h
index 9fe47480325..62477eb908c 100644
--- a/include/mpc86xx.h
+++ b/include/mpc86xx.h
@@ -40,6 +40,7 @@
 
 #ifndef __ASSEMBLY__
 
+#include <asm/types.h>
 typedef struct {
 	unsigned long freq_processor;
 	unsigned long freq_systembus;
diff --git a/include/mtd/cfi_flash.h b/include/mtd/cfi_flash.h
index 4963c89642f..994cb1db93c 100644
--- a/include/mtd/cfi_flash.h
+++ b/include/mtd/cfi_flash.h
@@ -7,6 +7,7 @@
 #ifndef __CFI_FLASH_H__
 #define __CFI_FLASH_H__
 
+#include <asm/types.h>
 #define FLASH_CMD_CFI			0x98
 #define FLASH_CMD_READ_ID		0x90
 #define FLASH_CMD_RESET			0xff
diff --git a/include/mtd/ubi-user.h b/include/mtd/ubi-user.h
index 8d472cc0138..988398ed330 100644
--- a/include/mtd/ubi-user.h
+++ b/include/mtd/ubi-user.h
@@ -8,6 +8,7 @@
 #ifndef __UBI_USER_H__
 #define __UBI_USER_H__
 
+#include <compiler.h>
 #include <linux/types.h>
 
 /*
diff --git a/include/mv88e6352.h b/include/mv88e6352.h
index 2e810c8183e..2cc149cd00c 100644
--- a/include/mv88e6352.h
+++ b/include/mv88e6352.h
@@ -8,6 +8,7 @@
 #define __MV886352_H
 
 #include <common.h>
+#include <asm/types.h>
 
 /* PHY registers */
 #define PHY(itf)	(itf)
diff --git a/include/mvebu/comphy.h b/include/mvebu/comphy.h
index 4a007ccb0f5..063be64d422 100644
--- a/include/mvebu/comphy.h
+++ b/include/mvebu/comphy.h
@@ -7,6 +7,7 @@
 #define _MVEBU_COMPHY_H_
 
 #include <stdbool.h>
+#include <asm/types.h>
 #include <dt-bindings/comphy/comphy_data.h>
 
 struct comphy_map {
diff --git a/include/mvebu_mmc.h b/include/mvebu_mmc.h
index 790199ca5e6..84df14a5ffb 100644
--- a/include/mvebu_mmc.h
+++ b/include/mvebu_mmc.h
@@ -12,6 +12,7 @@
 
 /* needed for the mmc_cfg definition */
 #include <mmc.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 
 #define MMC_BLOCK_SIZE				512
diff --git a/include/mvmfp.h b/include/mvmfp.h
index 16f26841e20..93ca1ba35b0 100644
--- a/include/mvmfp.h
+++ b/include/mvmfp.h
@@ -47,6 +47,7 @@
  *
  * 				    offset, pull,pF, drv,dF, edge,eF ,afn,aF
  */
+#include <asm/types.h>
 #define MFP_OFFSET_MASK		MFP(0xffff,    0,    0,   0,   0,   0,   0)
 #define MFP_REG(x)		MFP(x,         0,    0,   0,   0,   0,   0)
 #define MFP_REG_GET_OFFSET(x)	((x & MFP_OFFSET_MASK) >> 16)
diff --git a/include/mxs_nand.h b/include/mxs_nand.h
index 92af891c187..e54bc9478c6 100644
--- a/include/mxs_nand.h
+++ b/include/mxs_nand.h
@@ -12,6 +12,7 @@
 #include <asm/cache.h>
 #include <nand.h>
 #include <asm/mach-imx/dma.h>
+#include <linux/types.h>
 
 /**
  * @gf_len:                   The length of Galois Field. (e.g., 13 or 14)
diff --git a/include/nand.h b/include/nand.h
index 80dd6469bc0..de36cac8bb9 100644
--- a/include/nand.h
+++ b/include/nand.h
@@ -9,6 +9,7 @@
 #define _NAND_H_
 
 #include <config.h>
+#include <linux/types.h>
 
 /*
  * All boards using a given driver must convert to self-init
diff --git a/include/net/ncsi-pkt.h b/include/net/ncsi-pkt.h
index a8e9def593f..640d8e1d789 100644
--- a/include/net/ncsi-pkt.h
+++ b/include/net/ncsi-pkt.h
@@ -6,6 +6,7 @@
 #ifndef __NCSI_PKT_H__
 #define __NCSI_PKT_H__
 
+#include <linux/types.h>
 struct ncsi_pkt_hdr {
 	unsigned char mc_id;        /* Management controller ID */
 	unsigned char revision;     /* NCSI version - 0x01      */
diff --git a/include/net/pcap.h b/include/net/pcap.h
index db9b2c4f69f..2007746e37c 100644
--- a/include/net/pcap.h
+++ b/include/net/pcap.h
@@ -13,6 +13,7 @@
  * @return	0 on success, -ERROR on error
  */
 #include <stdbool.h>
+#include <linux/types.h>
 int pcap_init(phys_addr_t paddr, unsigned long size);
 
 /**
diff --git a/include/net/pfe_eth/pfe/cbus/bmu.h b/include/net/pfe_eth/pfe/cbus/bmu.h
index 3a83e4dc1ca..5c062bef7d7 100644
--- a/include/net/pfe_eth/pfe/cbus/bmu.h
+++ b/include/net/pfe_eth/pfe/cbus/bmu.h
@@ -7,6 +7,7 @@
 #ifndef _BMU_H_
 #define _BMU_H_
 
+#include <asm/types.h>
 #define BMU_VERSION		0x000
 #define BMU_CTRL		0x004
 #define BMU_UCAST_CONFIG	0x008
diff --git a/include/net/pfe_eth/pfe/cbus/class_csr.h b/include/net/pfe_eth/pfe/cbus/class_csr.h
index 80f1f96b443..9b9f8550988 100644
--- a/include/net/pfe_eth/pfe/cbus/class_csr.h
+++ b/include/net/pfe_eth/pfe/cbus/class_csr.h
@@ -12,6 +12,7 @@
  * class_csr - block containing all the classifier control and status register.
  * Mapped on CBUS and accessible from all PE's and ARM.
  */
+#include <asm/types.h>
 #include <linux/bitops.h>
 #define CLASS_VERSION			(CLASS_CSR_BASE_ADDR + 0x000)
 #define CLASS_TX_CTRL			(CLASS_CSR_BASE_ADDR + 0x004)
diff --git a/include/net/pfe_eth/pfe/cbus/gpi.h b/include/net/pfe_eth/pfe/cbus/gpi.h
index 6b5ba5d233f..abc7e66828e 100644
--- a/include/net/pfe_eth/pfe/cbus/gpi.h
+++ b/include/net/pfe_eth/pfe/cbus/gpi.h
@@ -7,6 +7,7 @@
 #ifndef _GPI_H_
 #define _GPI_H_
 
+#include <asm/types.h>
 #define GPI_VERSION			0x00
 #define GPI_CTRL			0x04
 #define GPI_RX_CONFIG			0x08
diff --git a/include/net/pfe_eth/pfe/cbus/tmu_csr.h b/include/net/pfe_eth/pfe/cbus/tmu_csr.h
index cfe8f8ce8fc..96dbb06561c 100644
--- a/include/net/pfe_eth/pfe/cbus/tmu_csr.h
+++ b/include/net/pfe_eth/pfe/cbus/tmu_csr.h
@@ -7,6 +7,7 @@
 #ifndef _TMU_CSR_H_
 #define _TMU_CSR_H_
 
+#include <asm/types.h>
 #include <linux/bitops.h>
 #define TMU_VERSION			(TMU_CSR_BASE_ADDR + 0x000)
 #define TMU_INQ_WATERMARK		(TMU_CSR_BASE_ADDR + 0x004)
diff --git a/include/net/pfe_eth/pfe/pfe_hw.h b/include/net/pfe_eth/pfe/pfe_hw.h
index c69fc69130c..cb9099e588a 100644
--- a/include/net/pfe_eth/pfe/pfe_hw.h
+++ b/include/net/pfe_eth/pfe/pfe_hw.h
@@ -8,6 +8,7 @@
 #define _PFE_H_
 
 #include <elf.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include "cbus.h"
 
diff --git a/include/net/pfe_eth/pfe_driver.h b/include/net/pfe_eth/pfe_driver.h
index fa9f2fa65dd..a4872b76402 100644
--- a/include/net/pfe_eth/pfe_driver.h
+++ b/include/net/pfe_eth/pfe_driver.h
@@ -7,6 +7,8 @@
 #ifndef __PFE_DRIVER_H__
 #define __PFE_DRIVER_H__
 
+#include <compiler.h>
+#include <linux/types.h>
 #include <net/pfe_eth/pfe/pfe_hw.h>
 #include <dm/platform_data/pfe_dm_eth.h>
 
diff --git a/include/net/tftp.h b/include/net/tftp.h
index c411c9b2e65..5a285892d45 100644
--- a/include/net/tftp.h
+++ b/include/net/tftp.h
@@ -16,6 +16,7 @@
  */
 
 /* tftp.c */
+#include <linux/types.h>
 void tftp_start(enum proto_t protocol);	/* Begin TFTP get/put */
 
 #ifdef CONFIG_CMD_TFTPSRV
diff --git a/include/netdev.h b/include/netdev.h
index 52db3d56411..e862f4ce363 100644
--- a/include/netdev.h
+++ b/include/netdev.h
@@ -12,6 +12,7 @@
 #define _NETDEV_H_
 #include <phy_interface.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 struct udevice;
 
diff --git a/include/nvme.h b/include/nvme.h
index 2cdf8ce320c..45eeed26828 100644
--- a/include/nvme.h
+++ b/include/nvme.h
@@ -7,6 +7,7 @@
 #ifndef __NVME_H__
 #define __NVME_H__
 
+#include <asm/types.h>
 struct nvme_dev;
 
 /**
diff --git a/include/opensbi.h b/include/opensbi.h
index d812cc8ccd9..8fef4194e21 100644
--- a/include/opensbi.h
+++ b/include/opensbi.h
@@ -8,6 +8,7 @@
 #define OPENSBI_H
 
 /** Expected value of info magic ('OSBI' ascii string in hex) */
+#include <compiler.h>
 #define FW_DYNAMIC_INFO_MAGIC_VALUE		0x4942534f
 
 /** Maximum supported info version */
diff --git a/include/p2sb.h b/include/p2sb.h
index a0f34496dd7..664ecb50b5f 100644
--- a/include/p2sb.h
+++ b/include/p2sb.h
@@ -9,6 +9,7 @@
 
 /* Port Id lives in bits 23:16 and register offset lives in 15:0 of address */
 #include <stdbool.h>
+#include <linux/types.h>
 #define PCR_PORTID_SHIFT	16
 
 /**
diff --git a/include/palmas.h b/include/palmas.h
index 20c7e489c1c..67cc5d3ba27 100644
--- a/include/palmas.h
+++ b/include/palmas.h
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <i2c.h>
+#include <linux/types.h>
 
 /* I2C chip addresses, TW6035/37 */
 #define TWL603X_CHIP_P1		0x48	/* Page 1 */
diff --git a/include/part.h b/include/part.h
index 55be724d20f..8e06ca99c28 100644
--- a/include/part.h
+++ b/include/part.h
@@ -10,6 +10,7 @@
 #include <ide.h>
 #include <uuid.h>
 #include <linux/list.h>
+#include <linux/types.h>
 
 struct block_drvr {
 	char *name;
diff --git a/include/part_efi.h b/include/part_efi.h
index 1929e4400f1..983f6eb2647 100644
--- a/include/part_efi.h
+++ b/include/part_efi.h
@@ -12,7 +12,9 @@
  * http://developer.intel.com/technology/efi/efi.htm
 */
 
+#include <compiler.h>
 #include <linux/compiler.h>
+#include <linux/types.h>
 
 #ifndef _DISK_PART_EFI_H
 #define _DISK_PART_EFI_H
diff --git a/include/pca953x.h b/include/pca953x.h
index aa4401acf0d..30631a9b1f7 100644
--- a/include/pca953x.h
+++ b/include/pca953x.h
@@ -6,6 +6,7 @@
 #ifndef __PCA953X_H_
 #define __PCA953X_H_
 
+#include <linux/types.h>
 #define PCA953X_IN		0x00
 #define PCA953X_OUT		0x01
 #define PCA953X_POL		0x02
diff --git a/include/pca9698.h b/include/pca9698.h
index 48a5f756e28..a2ac8fd4e05 100644
--- a/include/pca9698.h
+++ b/include/pca9698.h
@@ -7,6 +7,7 @@
 #ifndef __PCA9698_H_
 #define __PCA9698_H_
 
+#include <asm/types.h>
 int pca9698_request(unsigned gpio, const char *label);
 void pca9698_free(unsigned gpio);
 int pca9698_direction_input(u8 addr, unsigned gpio);
diff --git a/include/pch.h b/include/pch.h
index aefd2b69f5c..f4a322f51a2 100644
--- a/include/pch.h
+++ b/include/pch.h
@@ -9,6 +9,7 @@
 
 #include <stdbool.h>
 #include <linux/bitops.h>
+#include <linux/types.h>
 #define PCH_RCBA		0xf0
 
 #define BIOS_CTRL_BIOSWE	BIT(0)
diff --git a/include/pci.h b/include/pci.h
index eb8981969a6..109c420a6b2 100644
--- a/include/pci.h
+++ b/include/pci.h
@@ -503,6 +503,7 @@
 #ifndef __ASSEMBLY__
 
 #include <dm/pci.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_SYS_PCI_64BIT
 typedef u64 pci_addr_t;
diff --git a/include/pci_ep.h b/include/pci_ep.h
index 00e8c6d8ab1..fdf620a6e29 100644
--- a/include/pci_ep.h
+++ b/include/pci_ep.h
@@ -12,6 +12,7 @@
 #define _PCI_EP_H
 
 #include <pci.h>
+#include <linux/types.h>
 
 /**
  * enum pci_interrupt_pin - PCI INTx interrupt values
diff --git a/include/pci_rom.h b/include/pci_rom.h
index 895c9627f4d..f4ece59d0f1 100644
--- a/include/pci_rom.h
+++ b/include/pci_rom.h
@@ -6,6 +6,7 @@
 #ifndef _PCI_ROM_H
 #define _PCI_ROM_H
 
+#include <linux/types.h>
 #define PCI_ROM_HDR			0xaa55
 
 struct pci_rom_header {
diff --git a/include/pe.h b/include/pe.h
index 086f2b860e9..e01a786b670 100644
--- a/include/pe.h
+++ b/include/pe.h
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
 /*
+#include <linux/types.h>
  *  Portable Executable binary format structures
  *
  *  Copyright (c) 2016 Alexander Graf
diff --git a/include/phy.h b/include/phy.h
index 4cb2117a96a..07ab2c75873 100644
--- a/include/phy.h
+++ b/include/phy.h
@@ -18,6 +18,7 @@
 #include <linux/mdio.h>
 #include <log.h>
 #include <phy_interface.h>
+#include <linux/types.h>
 
 #define PHY_FIXED_ID		0xa5a55a5a
 #define PHY_NCSI_ID            0xbeefcafe
diff --git a/include/physmem.h b/include/physmem.h
index 03d3a78b741..bfcc937c25d 100644
--- a/include/physmem.h
+++ b/include/physmem.h
@@ -18,4 +18,5 @@
  *
  * @return	The physical address of the memory which was set.
  */
+#include <asm/types.h>
 phys_addr_t arch_phys_memset(phys_addr_t s, int c, phys_size_t n);
diff --git a/include/post.h b/include/post.h
index cea1a53c4c1..2e47cef039b 100644
--- a/include/post.h
+++ b/include/post.h
@@ -13,6 +13,7 @@
 #ifndef	__ASSEMBLY__
 #include <common.h>
 #include <asm/io.h>
+#include <linux/types.h>
 
 #if defined(CONFIG_POST)
 
diff --git a/include/power/acpi_pmc.h b/include/power/acpi_pmc.h
index 2993edcdb54..3b14495ce08 100644
--- a/include/power/acpi_pmc.h
+++ b/include/power/acpi_pmc.h
@@ -197,4 +197,5 @@ int pmc_gpe_init(struct udevice *dev);
 #endif /* !__ACPI__ */
 
 #include <stdbool.h>
+#include <linux/types.h>
 #endif
diff --git a/include/power/as3722.h b/include/power/as3722.h
index f5398123f2a..59a6d8bad3b 100644
--- a/include/power/as3722.h
+++ b/include/power/as3722.h
@@ -6,6 +6,7 @@
 #ifndef __POWER_AS3722_H__
 #define __POWER_AS3722_H__
 
+#include <asm/types.h>
 struct udevice;
 
 #define AS3722_GPIO_OUTPUT_VDDH (1 << 0)
diff --git a/include/power/battery.h b/include/power/battery.h
index 1e3d59d76e6..74c63a3b16f 100644
--- a/include/power/battery.h
+++ b/include/power/battery.h
@@ -7,6 +7,7 @@
 #ifndef __POWER_BATTERY_H_
 #define __POWER_BATTERY_H_
 
+#include <linux/types.h>
 struct battery {
 	unsigned int version;
 	unsigned int state_of_chrg;
diff --git a/include/power/fg_battery_cell_params.h b/include/power/fg_battery_cell_params.h
index b8c895bbabb..2575f660cf7 100644
--- a/include/power/fg_battery_cell_params.h
+++ b/include/power/fg_battery_cell_params.h
@@ -70,4 +70,5 @@ u16 cell_character2[16] = {
 	0x0100
 };
 #endif
+#include <asm/types.h>
 #endif /* __FG_BATTERY_CELL_PARAMS_H_ */
diff --git a/include/power/hi6553_pmic.h b/include/power/hi6553_pmic.h
index d0abe207551..2ce9e521f11 100644
--- a/include/power/hi6553_pmic.h
+++ b/include/power/hi6553_pmic.h
@@ -8,6 +8,7 @@
 #define __HI6553_PMIC_H__
 
 /* Registers */
+#include <asm/types.h>
 enum {
 	HI6553_VERSION_REG = 0x000,
 	HI6553_ENABLE2_LDO1_8 = 0x029,
diff --git a/include/power/max77686_pmic.h b/include/power/max77686_pmic.h
index 82fe3509a0b..162b6e3dc88 100644
--- a/include/power/max77686_pmic.h
+++ b/include/power/max77686_pmic.h
@@ -7,6 +7,7 @@
 #ifndef __MAX77686_H_
 #define __MAX77686_H_
 
+#include <linux/types.h>
 #include <power/pmic.h>
 
 enum {
diff --git a/include/power/mc34vr500_pmic.h b/include/power/mc34vr500_pmic.h
index d2edda68905..cff0172e897 100644
--- a/include/power/mc34vr500_pmic.h
+++ b/include/power/mc34vr500_pmic.h
@@ -7,6 +7,7 @@
 #ifndef __MC34VR500_H_
 #define __MC34VR500_H_
 
+#include <linux/types.h>
 #include <power/pmic.h>
 
 #define MC34VR500_I2C_ADDR	0x08
diff --git a/include/power/pmic.h b/include/power/pmic.h
index be9de6b4de7..f88db45999c 100644
--- a/include/power/pmic.h
+++ b/include/power/pmic.h
@@ -13,6 +13,7 @@
 #include <dm/ofnode.h>
 #include <i2c.h>
 #include <linux/list.h>
+#include <linux/types.h>
 #include <power/power_chrg.h>
 
 enum { PMIC_I2C, PMIC_SPI, PMIC_NONE};
diff --git a/include/power/regulator.h b/include/power/regulator.h
index 6f5b8b058df..f46e09783a5 100644
--- a/include/power/regulator.h
+++ b/include/power/regulator.h
@@ -8,6 +8,7 @@
 #define _INCLUDE_REGULATOR_H_
 
 #include <stdbool.h>
+#include <asm/types.h>
 struct udevice;
 
 /**
diff --git a/include/power/rk8xx_pmic.h b/include/power/rk8xx_pmic.h
index 8ff0af35c57..0fa03d16b5d 100644
--- a/include/power/rk8xx_pmic.h
+++ b/include/power/rk8xx_pmic.h
@@ -7,6 +7,7 @@
 #ifndef _PMIC_RK8XX_H_
 #define _PMIC_RK8XX_H_
 
+#include <asm/types.h>
 enum {
 	REG_SECONDS			= 0x00,
 	REG_MINUTES,
diff --git a/include/power/s5m8767.h b/include/power/s5m8767.h
index f75ed5d928f..cbfbd91d214 100644
--- a/include/power/s5m8767.h
+++ b/include/power/s5m8767.h
@@ -6,6 +6,7 @@
 #ifndef __S5M8767_H_
 #define __S5M8767_H_
 
+#include <asm/types.h>
 enum s5m8767_regnum {
 	S5M8767_BUCK1 = 0,
 	S5M8767_BUCK2,
diff --git a/include/power/tps65217.h b/include/power/tps65217.h
index 669a94a6c87..2e95397b53b 100644
--- a/include/power/tps65217.h
+++ b/include/power/tps65217.h
@@ -10,6 +10,7 @@
 #define __POWER_TPS65217_H__
 
 /* I2C chip address */
+#include <linux/types.h>
 #define TPS65217_CHIP_PM			0x24
 
 /* Registers */
diff --git a/include/power/tps65218.h b/include/power/tps65218.h
index bb66c3f3ab6..3bd5c1a3688 100644
--- a/include/power/tps65218.h
+++ b/include/power/tps65218.h
@@ -8,6 +8,7 @@
 #define __POWER_TPS65218_H__
 
 #include <linux/bitops.h>
+#include <linux/types.h>
 
 /* I2C chip address */
 #define TPS65218_CHIP_PM			0x24
diff --git a/include/power/tps65910_pmic.h b/include/power/tps65910_pmic.h
index 66214786d3e..f06d9be6b29 100644
--- a/include/power/tps65910_pmic.h
+++ b/include/power/tps65910_pmic.h
@@ -6,6 +6,7 @@
 #ifndef __TPS65910_PMIC_H_
 #define __TPS65910_PMIC_H_
 
+#include <linux/types.h>
 #define TPS65910_I2C_SEL_MASK		(0x1 << 4)
 #define TPS65910_VDD_SR_MASK		(0x1 << 7)
 #define TPS65910_GAIN_SEL_MASK		(0x3 << 6)
diff --git a/include/pwm.h b/include/pwm.h
index 1791afec551..c4280439397 100644
--- a/include/pwm.h
+++ b/include/pwm.h
@@ -11,6 +11,7 @@
 #define _pwm_h_
 
 #include <stdbool.h>
+#include <linux/types.h>
 struct udevice;
 
 /* struct pwm_ops: Operations for the PWM uclass */
diff --git a/include/pxa_lcd.h b/include/pxa_lcd.h
index 11a22abca6d..a8a5f8c2da4 100644
--- a/include/pxa_lcd.h
+++ b/include/pxa_lcd.h
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
 /*
+#include <linux/types.h>
  * pxa_lcd.h - PXA LCD Controller structures
  *
  * (C) Copyright 2001
diff --git a/include/qfw.h b/include/qfw.h
index cb56ea58192..44b2d184b9b 100644
--- a/include/qfw.h
+++ b/include/qfw.h
@@ -6,8 +6,10 @@
 #ifndef __FW_CFG__
 #define __FW_CFG__
 
+#include <compiler.h>
 #include <stdbool.h>
 #include <linux/list.h>
+#include <linux/types.h>
 
 enum qemu_fwcfg_items {
 	FW_CFG_SIGNATURE	= 0x00,
diff --git a/include/ram.h b/include/ram.h
index 273d4153940..3addf70d050 100644
--- a/include/ram.h
+++ b/include/ram.h
@@ -7,6 +7,7 @@
 #ifndef __RAM_H
 #define __RAM_H
 
+#include <linux/types.h>
 struct udevice;
 
 struct ram_info {
diff --git a/include/regmap.h b/include/regmap.h
index 5a3f3dce02c..2995b132f7e 100644
--- a/include/regmap.h
+++ b/include/regmap.h
@@ -10,6 +10,7 @@
 #include <time.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 /**
  * DOC: Overview
diff --git a/include/remoteproc.h b/include/remoteproc.h
index c8c286e27f1..bc2722e3c50 100644
--- a/include/remoteproc.h
+++ b/include/remoteproc.h
@@ -16,6 +16,7 @@
 #include <stdbool.h>
 #include <dm/platdata.h>	/* For platform data support - non dt world */
 #include <linux/errno.h>
+#include <linux/types.h>
 
 /**
  * enum rproc_mem_type - What type of memory model does the rproc use
diff --git a/include/rng.h b/include/rng.h
index 37af5543631..87e26f5647e 100644
--- a/include/rng.h
+++ b/include/rng.h
@@ -6,6 +6,8 @@
 #if !defined _RNG_H_
 #define _RNG_H_
 
+#include <linux/types.h>
+
 struct udevice;
 
 /**
diff --git a/include/rtc.h b/include/rtc.h
index 5033fde5ac8..e5d29af7332 100644
--- a/include/rtc.h
+++ b/include/rtc.h
@@ -16,6 +16,7 @@
 #include <stdbool.h>
 #include <bcd.h>
 #include <rtc_def.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_DM_RTC
 
diff --git a/include/s_record.h b/include/s_record.h
index 3ece695941d..71105e261fb 100644
--- a/include/s_record.h
+++ b/include/s_record.h
@@ -75,6 +75,7 @@
  *--------------------------------------------------------------------------
  */
 
+#include <linux/types.h>
 #define SREC_START	0	/* Start Record (module name)		    */
 #define SREC_DATA2	1	/* Data  Record with 2 byte address	    */
 #define SREC_DATA3	2	/* Data  Record with 3 byte address	    */
diff --git a/include/samsung/misc.h b/include/samsung/misc.h
index 4ff28a1df0e..4bead98a6e4 100644
--- a/include/samsung/misc.h
+++ b/include/samsung/misc.h
@@ -32,6 +32,7 @@ void draw_logo(void);
 char *get_dfu_alt_system(char *interface, char *devstr);
 char *get_dfu_alt_boot(char *interface, char *devstr);
 #endif
+#include <asm/types.h>
 void set_board_type(void);
 void set_board_revision(void);
 const char *get_board_type(void);
diff --git a/include/sandbox-clk.h b/include/sandbox-clk.h
index 296cddfbb0e..eae8673594f 100644
--- a/include/sandbox-clk.h
+++ b/include/sandbox-clk.h
@@ -7,6 +7,8 @@
 #ifndef __SANDBOX_CLK_H__
 #define __SANDBOX_CLK_H__
 
+#include <compiler.h>
+#include <asm/types.h>
 #include <linux/clk-provider.h>
 
 enum {
diff --git a/include/sandboxfs.h b/include/sandboxfs.h
index 783dd5c88a7..e311117225f 100644
--- a/include/sandboxfs.h
+++ b/include/sandboxfs.h
@@ -18,6 +18,7 @@
 #ifndef __SANDBOX_FS__
 #define __SANDBOX_FS__
 
+#include <linux/types.h>
 struct blk_desc;
 struct disk_partition;
 
diff --git a/include/sandboxtee.h b/include/sandboxtee.h
index 419643a0246..fc2d1653553 100644
--- a/include/sandboxtee.h
+++ b/include/sandboxtee.h
@@ -7,6 +7,7 @@
 #define __SANDBOXTEE_H
 
 #include <search.h>
+#include <asm/types.h>
 #include <tee/optee_ta_avb.h>
 
 /**
diff --git a/include/sata.h b/include/sata.h
index d89f7a8a298..3a9591e2913 100644
--- a/include/sata.h
+++ b/include/sata.h
@@ -1,6 +1,7 @@
 #ifndef __SATA_H__
 #define __SATA_H__
 #include <part.h>
+#include <linux/types.h>
 
 #if !defined(CONFIG_DM_SCSI) && !defined(CONFIG_AHCI)
 int init_sata(int dev);
diff --git a/include/sdhci.h b/include/sdhci.h
index c47dda8dae3..291a9ca5933 100644
--- a/include/sdhci.h
+++ b/include/sdhci.h
@@ -9,6 +9,7 @@
 #ifndef __SDHCI_HW_H
 #define __SDHCI_HW_H
 
+#include <compiler.h>
 #include <stdbool.h>
 #include <linux/bitops.h>
 #include <linux/types.h>
diff --git a/include/search.h b/include/search.h
index e56843c26fd..35512ca6c6e 100644
--- a/include/search.h
+++ b/include/search.h
@@ -16,6 +16,7 @@
 
 #include <env.h>
 #include <stddef.h>
+#include <linux/types.h>
 
 #define set_errno(val) do { errno = val; } while (0)
 
diff --git a/include/serial.h b/include/serial.h
index ead8bb95b1a..18e4cb5b5bf 100644
--- a/include/serial.h
+++ b/include/serial.h
@@ -3,6 +3,7 @@
 
 #include <stdbool.h>
 #include <post.h>
+#include <linux/types.h>
 
 struct serial_device {
 	/* enough bytes to match alignment of following func pointer */
diff --git a/include/sja1000.h b/include/sja1000.h
index 6ceb6f4d48f..2ab0dfdc1b2 100644
--- a/include/sja1000.h
+++ b/include/sja1000.h
@@ -11,6 +11,7 @@
 /*
  * SJA1000 register layout in basic can mode
  */
+#include <asm/types.h>
 struct sja1000_basic_s {
 	u8 cr;
 	u8 cmr;
diff --git a/include/smbios.h b/include/smbios.h
index 97b9ddce237..6ad2234fc77 100644
--- a/include/smbios.h
+++ b/include/smbios.h
@@ -9,6 +9,8 @@
 #define _SMBIOS_H_
 
 /* SMBIOS spec version implemented */
+#include <compiler.h>
+#include <linux/types.h>
 #define SMBIOS_MAJOR_VER	3
 #define SMBIOS_MINOR_VER	0
 
diff --git a/include/smem.h b/include/smem.h
index 598799d3a0c..ea1f0e24c47 100644
--- a/include/smem.h
+++ b/include/smem.h
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
 /*
+#include <linux/types.h>
  * The shared memory system is an allocate-only heap structure that
  * consists of one of more memory areas that can be accessed by the processors
  * in the SoC.
diff --git a/include/smsc_lpc47m.h b/include/smsc_lpc47m.h
index 8a972acd4c7..7da8fcab6b5 100644
--- a/include/smsc_lpc47m.h
+++ b/include/smsc_lpc47m.h
@@ -7,6 +7,7 @@
 #define _SMSC_LPC47M_H_
 
 /* I/O address of LPC47M */
+#include <linux/types.h>
 #define LPC47M_IO_PORT	0x2e
 
 /* Logical device number */
diff --git a/include/sort.h b/include/sort.h
index 0c6b588fcb0..8489d066d5f 100644
--- a/include/sort.h
+++ b/include/sort.h
@@ -17,6 +17,7 @@
  *	  0 if element at s1 == element at s2,
  *	> 0 if element at s1 > element at s2,
  */
+#include <linux/types.h>
 void qsort(void *base, size_t nmemb, size_t size,
 	   int (*compar)(const void *s1, const void *s2));
 
diff --git a/include/sound.h b/include/sound.h
index 71bd850652e..55dd6618714 100644
--- a/include/sound.h
+++ b/include/sound.h
@@ -7,6 +7,7 @@
 #ifndef __SOUND_H__
 #define __SOUND_H__
 
+#include <linux/types.h>
 /* sound codec enum */
 enum sound_compat {
 	AUDIO_COMPAT_SPI,
diff --git a/include/spi-mem.h b/include/spi-mem.h
index a373b19bf33..8c184abacfc 100644
--- a/include/spi-mem.h
+++ b/include/spi-mem.h
@@ -16,6 +16,7 @@
 #include <errno.h>
 #include <spi.h>
 #include <stdbool.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 
 #define SPI_MEM_OP_CMD(__opcode, __buswidth)			\
diff --git a/include/spi.h b/include/spi.h
index 98ba9e796d5..0f4ead08a05 100644
--- a/include/spi.h
+++ b/include/spi.h
@@ -11,6 +11,7 @@
 
 #include <common.h>
 #include <linux/bitops.h>
+#include <linux/types.h>
 
 /* SPI mode flags */
 #define SPI_CPHA	BIT(0)	/* clock phase (1 = SPI_CLOCK_PHASE_SECOND) */
diff --git a/include/spl.h b/include/spl.h
index c57a047e94a..9cf60463b90 100644
--- a/include/spl.h
+++ b/include/spl.h
@@ -8,6 +8,7 @@
 
 #include <binman_sym.h>
 #include <linker_lists.h>
+#include <linux/types.h>
 
 /* Platform-specific defines */
 #include <linux/compiler.h>
diff --git a/include/spl_gpio.h b/include/spl_gpio.h
index e410e62914d..6a63cbab935 100644
--- a/include/spl_gpio.h
+++ b/include/spl_gpio.h
@@ -10,6 +10,7 @@
 #define __SPL_GPIO_H
 
 #include <asm/gpio.h>
+#include <linux/types.h>
 
 /*
  * The functions listed here should be implemented in the SoC GPIO driver.
diff --git a/include/splash.h b/include/splash.h
index 8b70e4a8068..bc8511cce23 100644
--- a/include/splash.h
+++ b/include/splash.h
@@ -24,6 +24,7 @@
 
 #include <errno.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 enum splash_storage {
 	SPLASH_STORAGE_NAND,
diff --git a/include/spmi/spmi.h b/include/spmi/spmi.h
index 3242e6bbd07..7e80bf610d1 100644
--- a/include/spmi/spmi.h
+++ b/include/spmi/spmi.h
@@ -2,6 +2,7 @@
 #define _SPMI_SPMI_H
 
 /**
+#include <linux/types.h>
  * struct dm_spmi_ops - SPMI device I/O interface
  *
  * Should be implemented by UCLASS_SPMI device drivers. The standard
diff --git a/include/stm32_rcc.h b/include/stm32_rcc.h
index dc3039d11ac..b5e857e5762 100644
--- a/include/stm32_rcc.h
+++ b/include/stm32_rcc.h
@@ -8,6 +8,7 @@
 #define __STM32_RCC_H_
 
 #include <stdbool.h>
+#include <asm/types.h>
 #define AHB_PSC_1			0
 #define AHB_PSC_2			0x8
 #define AHB_PSC_4			0x9
diff --git a/include/stratixII.h b/include/stratixII.h
index 3c06bb2955a..ece173305ce 100644
--- a/include/stratixII.h
+++ b/include/stratixII.h
@@ -6,6 +6,7 @@
 #ifndef _STRATIXII_H_
 #define _STRATIXII_H_
 
+#include <linux/types.h>
 extern int StratixII_load (Altera_desc * desc, void *image, size_t size);
 extern int StratixII_dump (Altera_desc * desc, void *buf, size_t bsize);
 extern int StratixII_info (Altera_desc * desc);
diff --git a/include/syscon.h b/include/syscon.h
index 3df96e32764..8b276eaa7f2 100644
--- a/include/syscon.h
+++ b/include/syscon.h
@@ -9,6 +9,7 @@
 
 #include <dm/ofnode.h>
 #include <fdtdec.h>
+#include <linux/types.h>
 
 /**
  * struct syscon_uc_info - Information stored by the syscon UCLASS_UCLASS
diff --git a/include/sysreset.h b/include/sysreset.h
index 8bb094d463b..4857aaa3ae4 100644
--- a/include/sysreset.h
+++ b/include/sysreset.h
@@ -7,6 +7,7 @@
 #ifndef __SYSRESET_H
 #define __SYSRESET_H
 
+#include <linux/types.h>
 struct udevice;
 
 enum sysreset_t {
diff --git a/include/tables_csum.h b/include/tables_csum.h
index 5f7edc419ba..5adee2f9475 100644
--- a/include/tables_csum.h
+++ b/include/tables_csum.h
@@ -6,6 +6,7 @@
 #ifndef _TABLES_CSUM_H_
 #define _TABLES_CSUM_H_
 
+#include <asm/types.h>
 static inline u8 table_compute_checksum(void *v, int len)
 {
 	u8 *bytes = v;
diff --git a/include/tca642x.h b/include/tca642x.h
index bda86c1ed88..b75d677d795 100644
--- a/include/tca642x.h
+++ b/include/tca642x.h
@@ -33,6 +33,7 @@ enum {
 };
 #endif
 
+#include <linux/types.h>
 #define TCA642X_OUT_LOW		0
 #define TCA642X_OUT_HIGH	1
 #define TCA642X_POL_NORMAL	0
diff --git a/include/tee.h b/include/tee.h
index a73ec5a48c2..b4ad18e0a88 100644
--- a/include/tee.h
+++ b/include/tee.h
@@ -9,6 +9,7 @@
 #include <stdbool.h>
 #include <linux/bitops.h>
 #include <linux/list.h>
+#include <linux/types.h>
 
 #define TEE_UUID_LEN		16
 
diff --git a/include/tee/optee.h b/include/tee/optee.h
index affa937da08..5c872b4b4f6 100644
--- a/include/tee/optee.h
+++ b/include/tee/optee.h
@@ -11,6 +11,7 @@
 
 #include <linux/errno.h>
 #include <image.h>
+#include <linux/types.h>
 
 #define OPTEE_MAGIC             0x4554504f
 #define OPTEE_VERSION           1
diff --git a/include/tegra-kbc.h b/include/tegra-kbc.h
index f331c79c9d5..cf602a004c3 100644
--- a/include/tegra-kbc.h
+++ b/include/tegra-kbc.h
@@ -8,6 +8,7 @@
 #define __include_tegra_kbc_h__
 
 #include <common.h>
+#include <asm/types.h>
 
 #define KEY_IS_MODIFIER(key) ((key) >= KEY_FIRST_MODIFIER)
 
diff --git a/include/test/ut.h b/include/test/ut.h
index 73fd6e50168..d3ec1fcc26c 100644
--- a/include/test/ut.h
+++ b/include/test/ut.h
@@ -13,6 +13,7 @@
 #include <linux/err.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 struct unit_test_state;
 
diff --git a/include/timer.h b/include/timer.h
index a49b500ce35..dc96135de02 100644
--- a/include/timer.h
+++ b/include/timer.h
@@ -13,6 +13,7 @@
  *
  * @return - 0 on success or error number
  */
+#include <asm/types.h>
 int dm_timer_init(void);
 
 /*
diff --git a/include/tlv_eeprom.h b/include/tlv_eeprom.h
index f523d972d06..0b395214525 100644
--- a/include/tlv_eeprom.h
+++ b/include/tlv_eeprom.h
@@ -9,6 +9,7 @@
 
 #include <compiler.h>
 #include <stdbool.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 
diff --git a/include/tpm-common.h b/include/tpm-common.h
index c1309a2735d..b03083408b7 100644
--- a/include/tpm-common.h
+++ b/include/tpm-common.h
@@ -8,6 +8,7 @@
 #define __TPM_COMMON_H
 
 #include <command.h>
+#include <linux/types.h>
 
 struct udevice;
 
diff --git a/include/tpm-v1.h b/include/tpm-v1.h
index 8f6cc28a9ea..4bd964558d2 100644
--- a/include/tpm-v1.h
+++ b/include/tpm-v1.h
@@ -7,8 +7,10 @@
 #ifndef __TPM_V1_H
 #define __TPM_V1_H
 
+#include <compiler.h>
 #include <tpm-common.h>
 #include <linux/bitops.h>
+#include <linux/types.h>
 
 struct udevice;
 
diff --git a/include/tpm-v2.h b/include/tpm-v2.h
index 3b2fe449007..601c0e33c8a 100644
--- a/include/tpm-v2.h
+++ b/include/tpm-v2.h
@@ -8,6 +8,7 @@
 #define __TPM_V2_H
 
 #include <tpm-common.h>
+#include <linux/types.h>
 
 #define TPM2_DIGEST_LEN		32
 
diff --git a/include/trace.h b/include/trace.h
index 606dba97689..2bb3afc2689 100644
--- a/include/trace.h
+++ b/include/trace.h
@@ -6,6 +6,7 @@
 #ifndef __TRACE_H
 #define __TRACE_H
 
+#include <linux/types.h>
 enum {
 	/*
 	 * This affects the granularity of our trace. We can bin function
diff --git a/include/tsec.h b/include/tsec.h
index 630c30b6396..474f259d93e 100644
--- a/include/tsec.h
+++ b/include/tsec.h
@@ -13,10 +13,12 @@
 #ifndef __TSEC_H
 #define __TSEC_H
 
+#include <compiler.h>
 #include <net.h>
 #include <config.h>
 #include <phy.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 #define TSEC_MDIO_REGS_OFFSET	0x520
 
diff --git a/include/twl4030.h b/include/twl4030.h
index c27ad615eeb..119242ba713 100644
--- a/include/twl4030.h
+++ b/include/twl4030.h
@@ -13,6 +13,7 @@
 
 #include <common.h>
 #include <i2c.h>
+#include <asm/types.h>
 
 /* I2C chip addresses */
 
diff --git a/include/twl6030.h b/include/twl6030.h
index 41f17de3ab5..29d8baac017 100644
--- a/include/twl6030.h
+++ b/include/twl6030.h
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <i2c.h>
+#include <asm/types.h>
 
 /* I2C chip addresses */
 #define TWL6030_CHIP_PM		0x48
diff --git a/include/u-boot/aes.h b/include/u-boot/aes.h
index ee686394509..391991c03c2 100644
--- a/include/u-boot/aes.h
+++ b/include/u-boot/aes.h
@@ -9,6 +9,7 @@
 #include <errno.h>
 #include <image.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #if IMAGE_ENABLE_ENCRYPT
 int image_aes_encrypt(struct image_cipher_info *info,
diff --git a/include/u-boot/crc.h b/include/u-boot/crc.h
index bfd477f31d2..8a007c7827f 100644
--- a/include/u-boot/crc.h
+++ b/include/u-boot/crc.h
@@ -9,6 +9,7 @@
 #define _UBOOT_CRC_H
 
 #include <compiler.h> /* 'uint*' definitions */
+#include <linux/types.h>
 
 /**
  * crc8() - Calculate and return CRC-8 of the data
diff --git a/include/u-boot/rsa-checksum.h b/include/u-boot/rsa-checksum.h
index 54e6a73744e..6d179580f08 100644
--- a/include/u-boot/rsa-checksum.h
+++ b/include/u-boot/rsa-checksum.h
@@ -8,6 +8,7 @@
 
 #include <errno.h>
 #include <image.h>
+#include <linux/types.h>
 #include <u-boot/sha1.h>
 #include <u-boot/sha256.h>
 #include <u-boot/sha512.h>
diff --git a/include/u-boot/rsa-mod-exp.h b/include/u-boot/rsa-mod-exp.h
index 1da8af1bb83..bb2b88a171d 100644
--- a/include/u-boot/rsa-mod-exp.h
+++ b/include/u-boot/rsa-mod-exp.h
@@ -8,6 +8,7 @@
 
 #include <errno.h>
 #include <image.h>
+#include <linux/types.h>
 
 /**
  * struct key_prop - holder for a public key properties
diff --git a/include/u-boot/rsa.h b/include/u-boot/rsa.h
index 6d5f50a0030..7a572c379d1 100644
--- a/include/u-boot/rsa.h
+++ b/include/u-boot/rsa.h
@@ -14,6 +14,7 @@
 #include <errno.h>
 #include <image.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 /**
  * struct rsa_public_key - holder for a public key
diff --git a/include/u-boot/sha1.h b/include/u-boot/sha1.h
index 283f1032936..fc5d257ecc7 100644
--- a/include/u-boot/sha1.h
+++ b/include/u-boot/sha1.h
@@ -18,6 +18,7 @@
 extern "C" {
 #endif
 
+#include <linux/types.h>
 #define SHA1_SUM_POS	-0x20
 #define SHA1_SUM_LEN	20
 #define SHA1_DER_LEN	15
diff --git a/include/u-boot/sha256.h b/include/u-boot/sha256.h
index 9aa1251789a..d7534c79b56 100644
--- a/include/u-boot/sha256.h
+++ b/include/u-boot/sha256.h
@@ -1,6 +1,7 @@
 #ifndef _SHA256_H
 #define _SHA256_H
 
+#include <linux/types.h>
 #define SHA256_SUM_LEN	32
 #define SHA256_DER_LEN	19
 
diff --git a/include/u-boot/sha512.h b/include/u-boot/sha512.h
index 516729d7750..8551b2ef178 100644
--- a/include/u-boot/sha512.h
+++ b/include/u-boot/sha512.h
@@ -1,6 +1,7 @@
 #ifndef _SHA512_H
 #define _SHA512_H
 
+#include <linux/types.h>
 #define SHA384_SUM_LEN          48
 #define SHA384_DER_LEN          19
 #define SHA512_SUM_LEN          64
diff --git a/include/u-boot/zlib.h b/include/u-boot/zlib.h
index e23ceb50ca0..22bead4b882 100644
--- a/include/u-boot/zlib.h
+++ b/include/u-boot/zlib.h
@@ -336,6 +336,7 @@ typedef uLong FAR uLongf;
 #endif
 
 #  ifdef VMS
+#include <linux/types.h>
 #    include <unixio.h>   /* for off_t */
 #  endif
 #  define z_off_t off_t
diff --git a/include/ubifs_uboot.h b/include/ubifs_uboot.h
index b025779d59f..ac608cf6439 100644
--- a/include/ubifs_uboot.h
+++ b/include/ubifs_uboot.h
@@ -14,6 +14,7 @@
 #ifndef __UBIFS_UBOOT_H__
 #define __UBIFS_UBOOT_H__
 
+#include <linux/types.h>
 struct blk_desc;
 struct disk_partition;
 
diff --git a/include/ubispl.h b/include/ubispl.h
index ecfe0c93c13..1493c07d57a 100644
--- a/include/ubispl.h
+++ b/include/ubispl.h
@@ -5,6 +5,7 @@
 #ifndef __UBOOT_UBISPL_H
 #define __UBOOT_UBISPL_H
 
+#include <asm/types.h>
 #define UBI_VOL_NAME_MAX	127
 
 /*
diff --git a/include/uboot_aes.h b/include/uboot_aes.h
index d2583bed992..5b0b114c8f7 100644
--- a/include/uboot_aes.h
+++ b/include/uboot_aes.h
@@ -21,6 +21,7 @@ typedef unsigned int u32;
  * in this case being AES_BLOCK_LENGTH bytes.
  */
 
+#include <asm/types.h>
 enum {
 	AES_STATECOLS	= 4,	/* columns in the state & expanded key */
 	AES128_KEYCOLS	= 4,	/* columns in a key for aes128 */
diff --git a/include/usb.h b/include/usb.h
index 89b219486c2..721cfb280d0 100644
--- a/include/usb.h
+++ b/include/usb.h
@@ -14,6 +14,7 @@
 #include <fdtdec.h>
 #include <stdbool.h>
 #include <usb_defs.h>
+#include <linux/types.h>
 #include <linux/usb/ch9.h>
 #include <asm/cache.h>
 #include <part.h>
diff --git a/include/usb/designware_udc.h b/include/usb/designware_udc.h
index f874e5c35cc..9f06dd6672e 100644
--- a/include/usb/designware_udc.h
+++ b/include/usb/designware_udc.h
@@ -17,6 +17,7 @@
  * 3.  The RX/TX FIFO
  */
 
+#include <asm/types.h>
 #define MAX_ENDPOINTS		16
 
 struct udc_endp_regs {
diff --git a/include/usb/dwc2_udc.h b/include/usb/dwc2_udc.h
index 1d8c624d375..49671c52fd0 100644
--- a/include/usb/dwc2_udc.h
+++ b/include/usb/dwc2_udc.h
@@ -10,6 +10,7 @@
 
 #include <stdbool.h>
 #include <dm/ofnode.h>
+#include <linux/types.h>
 
 #define PHY0_SLEEP              (1 << 5)
 #define DWC2_MAX_HW_ENDPOINTS	16
diff --git a/include/usb/ehci-ci.h b/include/usb/ehci-ci.h
index efb2eec5ce7..a55ab587ef7 100644
--- a/include/usb/ehci-ci.h
+++ b/include/usb/ehci-ci.h
@@ -9,6 +9,7 @@
 #define _EHCI_CI_H
 
 #include <asm/processor.h>
+#include <asm/types.h>
 
 #define CONTROL_REGISTER_W1C_MASK       0x00020000  /* W1C: PHY_CLK_VALID */
 
diff --git a/include/usb/fotg210.h b/include/usb/fotg210.h
index 292ce54e0c4..4b1228e85dc 100644
--- a/include/usb/fotg210.h
+++ b/include/usb/fotg210.h
@@ -9,6 +9,7 @@
 #ifndef _FOTG210_H
 #define _FOTG210_H
 
+#include <linux/types.h>
 struct fotg210_regs {
 	/* USB Host Controller */
 	struct {
diff --git a/include/usb/fusbh200.h b/include/usb/fusbh200.h
index 6ae1d848801..00a7ada90da 100644
--- a/include/usb/fusbh200.h
+++ b/include/usb/fusbh200.h
@@ -9,6 +9,7 @@
 #ifndef _FUSBH200_H
 #define _FUSBH200_H
 
+#include <linux/types.h>
 struct fusbh200_regs {
 	struct {
 		uint32_t data[4];
diff --git a/include/usb/ulpi.h b/include/usb/ulpi.h
index 71642d257b6..53770162964 100644
--- a/include/usb/ulpi.h
+++ b/include/usb/ulpi.h
@@ -18,6 +18,7 @@
 #ifndef __USB_ULPI_H__
 #define __USB_ULPI_H__
 
+#include <linux/types.h>
 #define ULPI_ERROR	(1 << 8) /* overflow from any register value */
 
 #ifndef CONFIG_USB_ULPI_TIMEOUT
diff --git a/include/usb/xhci.h b/include/usb/xhci.h
index 8d9c7917cb8..8e3f2f0b7a5 100644
--- a/include/usb/xhci.h
+++ b/include/usb/xhci.h
@@ -24,6 +24,7 @@
 #include <linux/kernel.h>
 #include <linux/list.h>
 #include <linux/compat.h>
+#include <linux/types.h>
 
 #define MAX_EP_CTX_NUM		31
 #define XHCI_ALIGNMENT		64
diff --git a/include/usb_ether.h b/include/usb_ether.h
index e85acadb7f5..ca11ca1eda3 100644
--- a/include/usb_ether.h
+++ b/include/usb_ether.h
@@ -7,6 +7,7 @@
 #define __USB_ETHER_H__
 
 #include <net.h>
+#include <linux/types.h>
 
 /* TODO(sjg at chromium.org): Remove @pusb_dev when all boards use CONFIG_DM_ETH */
 struct ueth_data {
diff --git a/include/usb_mass_storage.h b/include/usb_mass_storage.h
index c7b770fa3e8..163c7ce0df0 100644
--- a/include/usb_mass_storage.h
+++ b/include/usb_mass_storage.h
@@ -9,6 +9,7 @@
 
 #define SECTOR_SIZE		0x200
 #include <part.h>
+#include <linux/types.h>
 #include <linux/usb/composite.h>
 
 /* Wait at maximum 60 seconds for cable connection */
diff --git a/include/usbdevice.h b/include/usbdevice.h
index f479724e37b..3a2e651effd 100644
--- a/include/usbdevice.h
+++ b/include/usbdevice.h
@@ -18,6 +18,7 @@
 #define __USBDCORE_H__
 
 #include <common.h>
+#include <asm/types.h>
 #include "usbdescriptors.h"
 
 
diff --git a/include/uuid.h b/include/uuid.h
index 73c5a89ec7c..edcdbad06bc 100644
--- a/include/uuid.h
+++ b/include/uuid.h
@@ -6,6 +6,7 @@
 #ifndef __UUID_H__
 #define __UUID_H__
 
+#include <compiler.h>
 #include <linux/bitops.h>
 
 /* This is structure is in big-endian */
diff --git a/include/vbe.h b/include/vbe.h
index 6e71610b8a8..310935baa10 100644
--- a/include/vbe.h
+++ b/include/vbe.h
@@ -10,6 +10,8 @@
 #ifndef _VBE_H
 #define _VBE_H
 
+#include <compiler.h>
+#include <asm/types.h>
 /* these structs are for input from and output to OF */
 #include <stdbool.h>
 struct __packed vbe_screen_info {
diff --git a/include/video.h b/include/video.h
index 03e342c6405..a05beba736c 100644
--- a/include/video.h
+++ b/include/video.h
@@ -244,6 +244,7 @@ static inline int video_sync_copy(struct udevice *dev, void *from, void *to)
 #endif
 
 #include <stdbool.h>
+#include <linux/types.h>
 #endif /* CONFIG_DM_VIDEO */
 
 #ifndef CONFIG_DM_VIDEO
diff --git a/include/video_bridge.h b/include/video_bridge.h
index b47cae66459..a2788759be3 100644
--- a/include/video_bridge.h
+++ b/include/video_bridge.h
@@ -9,6 +9,7 @@
 
 #include <stdbool.h>
 #include <asm/gpio.h>
+#include <asm/types.h>
 
 /**
  * struct video_bridge_priv - uclass information for video bridges
diff --git a/include/video_console.h b/include/video_console.h
index b033dc24b39..7f8791db177 100644
--- a/include/video_console.h
+++ b/include/video_console.h
@@ -8,6 +8,7 @@
 
 #include <video.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 struct video_priv;
 
diff --git a/include/video_osd.h b/include/video_osd.h
index 01ac94b425c..b68d31219c4 100644
--- a/include/video_osd.h
+++ b/include/video_osd.h
@@ -7,6 +7,7 @@
 #ifndef _VIDEO_OSD_H_
 #define _VIDEO_OSD_H_
 
+#include <linux/types.h>
 struct video_osd_info {
 	/* The width of the OSD display in columns */
 	uint width;
diff --git a/include/virtio.h b/include/virtio.h
index fb8528de283..ccaa3914b97 100644
--- a/include/virtio.h
+++ b/include/virtio.h
@@ -25,6 +25,7 @@
 #include <linux/bitops.h>
 #include <linux/bug.h>
 #include <linux/typecheck.h>
+#include <linux/types.h>
 #define VIRTIO_ID_NET		1 /* virtio net */
 #define VIRTIO_ID_BLOCK		2 /* virtio block */
 #define VIRTIO_ID_RNG		4 /* virtio rng */
diff --git a/include/virtio_ring.h b/include/virtio_ring.h
index fff2d180d1b..1f8fa9ecbb3 100644
--- a/include/virtio_ring.h
+++ b/include/virtio_ring.h
@@ -11,6 +11,7 @@
 
 #include <stdbool.h>
 #include <virtio_types.h>
+#include <linux/types.h>
 
 /* This marks a buffer as continuing via the next field */
 #define VRING_DESC_F_NEXT		1
diff --git a/include/vxworks.h b/include/vxworks.h
index c2585e61ced..a67a5a38093 100644
--- a/include/vxworks.h
+++ b/include/vxworks.h
@@ -8,6 +8,7 @@
 #define _VXWORKS_H_
 
 #include <efi_api.h>
+#include <asm/types.h>
 
 struct bootm_headers;
 struct cmd_tbl;
diff --git a/include/w1-eeprom.h b/include/w1-eeprom.h
index 22337368b4b..53117754694 100644
--- a/include/w1-eeprom.h
+++ b/include/w1-eeprom.h
@@ -9,6 +9,7 @@
 #ifndef __W1_EEPROM_H
 #define __W1_EEPROM_H
 
+#include <asm/types.h>
 struct udevice;
 
 struct w1_eeprom_ops {
diff --git a/include/w1.h b/include/w1.h
index 4c95ef29426..36083fe773c 100644
--- a/include/w1.h
+++ b/include/w1.h
@@ -10,6 +10,7 @@
 
 #include <dm.h>
 #include <stdbool.h>
+#include <asm/types.h>
 
 #define W1_FAMILY_DS24B33	0x23
 #define W1_FAMILY_DS2431	0x2d
diff --git a/include/wait_bit.h b/include/wait_bit.h
index 96a97bc327e..c8ea1614c1e 100644
--- a/include/wait_bit.h
+++ b/include/wait_bit.h
@@ -14,6 +14,7 @@
 #include <stdio.h>
 #include <time.h>
 #include <watchdog.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/io.h>
diff --git a/include/wdt.h b/include/wdt.h
index d2ccfbc62ef..3422a539430 100644
--- a/include/wdt.h
+++ b/include/wdt.h
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <log.h>
 #include <dm/read.h>
+#include <linux/types.h>
 
 /*
  * Implement a simple watchdog uclass. Watchdog is basically a timer that
diff --git a/include/winbond_w83627.h b/include/winbond_w83627.h
index a58d8169276..139e92be095 100644
--- a/include/winbond_w83627.h
+++ b/include/winbond_w83627.h
@@ -7,6 +7,7 @@
 #define _WINBOND_W83627_H_
 
 /* I/O address of Winbond Super IO chip */
+#include <linux/types.h>
 #define WINBOND_IO_PORT		0x2e
 
 /* Logical device number */
diff --git a/include/xilinx.h b/include/xilinx.h
index ab4537becfa..eb971f01b85 100644
--- a/include/xilinx.h
+++ b/include/xilinx.h
@@ -5,6 +5,7 @@
  */
 
 #include <fpga.h>
+#include <linux/types.h>
 
 #ifndef _XILINX_H_
 #define _XILINX_H_
diff --git a/include/zfs/dmu_objset.h b/include/zfs/dmu_objset.h
index 43aa5824bd4..5392ec0c5d0 100644
--- a/include/zfs/dmu_objset.h
+++ b/include/zfs/dmu_objset.h
@@ -11,6 +11,7 @@
 #ifndef	_SYS_DMU_OBJSET_H
 #define	_SYS_DMU_OBJSET_H
 
+#include <linux/types.h>
 #include <zfs/zil.h>
 
 #define OBJSET_PHYS_SIZE	2048
diff --git a/include/zfs/dnode.h b/include/zfs/dnode.h
index f01772c2f95..13bb4496466 100644
--- a/include/zfs/dnode.h
+++ b/include/zfs/dnode.h
@@ -11,6 +11,7 @@
 #ifndef	_SYS_DNODE_H
 #define	_SYS_DNODE_H
 
+#include <linux/types.h>
 #include <zfs/spa.h>
 
 /*
diff --git a/include/zfs/dsl_dataset.h b/include/zfs/dsl_dataset.h
index b05be71aa2e..5aac34feca6 100644
--- a/include/zfs/dsl_dataset.h
+++ b/include/zfs/dsl_dataset.h
@@ -11,6 +11,7 @@
 #ifndef	_SYS_DSL_DATASET_H
 #define	_SYS_DSL_DATASET_H
 
+#include <linux/types.h>
 typedef struct dsl_dataset_phys {
 	uint64_t ds_dir_obj;
 	uint64_t ds_prev_snap_obj;
diff --git a/include/zfs/dsl_dir.h b/include/zfs/dsl_dir.h
index 7eeb0d8395b..cc804c3a4af 100644
--- a/include/zfs/dsl_dir.h
+++ b/include/zfs/dsl_dir.h
@@ -11,6 +11,7 @@
 #ifndef	_SYS_DSL_DIR_H
 #define	_SYS_DSL_DIR_H
 
+#include <linux/types.h>
 typedef struct dsl_dir_phys {
 	uint64_t dd_creation_time; /* not actually used */
 	uint64_t dd_head_dataset_obj;
diff --git a/include/zfs/sa_impl.h b/include/zfs/sa_impl.h
index 41c77b0973a..0028a2b46af 100644
--- a/include/zfs/sa_impl.h
+++ b/include/zfs/sa_impl.h
@@ -10,6 +10,7 @@
 #ifndef	_SYS_SA_IMPL_H
 #define	_SYS_SA_IMPL_H
 
+#include <linux/types.h>
 typedef struct sa_hdr_phys {
 	uint32_t sa_magic;
 	uint16_t sa_layout_info;
diff --git a/include/zfs/spa.h b/include/zfs/spa.h
index cd2ddf58e77..769085e2c30 100644
--- a/include/zfs/spa.h
+++ b/include/zfs/spa.h
@@ -14,6 +14,7 @@
 /*
  * General-purpose 32-bit and 64-bit bitfield encodings.
  */
+#include <linux/types.h>
 #define	BF32_DECODE(x, low, len)	P2PHASE((x) >> (low), 1U << (len))
 #define	BF64_DECODE(x, low, len)	P2PHASE((x) >> (low), 1ULL << (len))
 #define	BF32_ENCODE(x, low, len)	(P2PHASE((x), 1U << (len)) << (low))
diff --git a/include/zfs/uberblock_impl.h b/include/zfs/uberblock_impl.h
index 8045687ba89..97c1af93af9 100644
--- a/include/zfs/uberblock_impl.h
+++ b/include/zfs/uberblock_impl.h
@@ -11,6 +11,7 @@
 #ifndef _SYS_UBERBLOCK_IMPL_H
 #define	_SYS_UBERBLOCK_IMPL_H
 
+#include <linux/types.h>
 #define UBMAX(a, b) ((a) > (b) ? (a) : (b))
 
 /*
diff --git a/include/zfs/vdev_impl.h b/include/zfs/vdev_impl.h
index de0e802f466..7b0ed080e82 100644
--- a/include/zfs/vdev_impl.h
+++ b/include/zfs/vdev_impl.h
@@ -11,6 +11,7 @@
 #ifndef _SYS_VDEV_IMPL_H
 #define	_SYS_VDEV_IMPL_H
 
+#include <linux/types.h>
 #define	VDEV_SKIP_SIZE		(8 << 10)
 #define	VDEV_BOOT_HEADER_SIZE	(8 << 10)
 #define	VDEV_PHYS_SIZE		(112 << 10)
diff --git a/include/zfs/zap_impl.h b/include/zfs/zap_impl.h
index 6fe9fb66f23..cff7f36be37 100644
--- a/include/zfs/zap_impl.h
+++ b/include/zfs/zap_impl.h
@@ -10,6 +10,7 @@
 #ifndef	_SYS_ZAP_IMPL_H
 #define	_SYS_ZAP_IMPL_H
 
+#include <linux/types.h>
 #define	ZAP_MAGIC 0x2F52AB2ABULL
 
 #define	ZAP_HASHBITS		28
diff --git a/include/zfs/zap_leaf.h b/include/zfs/zap_leaf.h
index 2a778e2caf0..5deeae849d0 100644
--- a/include/zfs/zap_leaf.h
+++ b/include/zfs/zap_leaf.h
@@ -11,6 +11,7 @@
 #ifndef	_SYS_ZAP_LEAF_H
 #define	_SYS_ZAP_LEAF_H
 
+#include <linux/types.h>
 #define	ZAP_LEAF_MAGIC 0x2AB1EAF
 
 /* chunk size = 24 bytes */
diff --git a/include/zfs/zfs.h b/include/zfs/zfs.h
index 17b93c10c81..9a41c6d0e89 100644
--- a/include/zfs/zfs.h
+++ b/include/zfs/zfs.h
@@ -14,6 +14,7 @@
 /*
  * On-disk version number.
  */
+#include <linux/types.h>
 #define	SPA_VERSION			28ULL
 
 /*
diff --git a/include/zfs/zfs_acl.h b/include/zfs/zfs_acl.h
index d6cc408d7f1..75586393c60 100644
--- a/include/zfs/zfs_acl.h
+++ b/include/zfs/zfs_acl.h
@@ -11,6 +11,7 @@
 #ifndef	_SYS_FS_ZFS_ACL_H
 #define	_SYS_FS_ZFS_ACL_H
 
+#include <linux/types.h>
 typedef struct zfs_oldace {
 	uint32_t	z_fuid;		/* "who" */
 	uint32_t	z_access_mask;	/* access mask */
diff --git a/include/zfs/zfs_znode.h b/include/zfs/zfs_znode.h
index ed3cde61650..3df22ea7649 100644
--- a/include/zfs/zfs_znode.h
+++ b/include/zfs/zfs_znode.h
@@ -11,6 +11,7 @@
 #ifndef	_SYS_FS_ZFS_ZNODE_H
 #define	_SYS_FS_ZFS_ZNODE_H
 
+#include <linux/types.h>
 #include <zfs/zfs_acl.h>
 
 #define	MASTER_NODE_OBJ	1
diff --git a/include/zfs/zil.h b/include/zfs/zil.h
index b5bd2c8406d..6e7f32ab650 100644
--- a/include/zfs/zil.h
+++ b/include/zfs/zil.h
@@ -20,6 +20,7 @@
  * each of which contains log records (i.e., transactions) followed by
  * a log block trailer (zil_trailer_t).  The format of a log record
  * depends on the record (or transaction) type, but all records begin
+#include <linux/types.h>
  * with a common structure that defines the type, length, and txg.
  */
 
diff --git a/include/zfs/zio.h b/include/zfs/zio.h
index 959e6e936ad..590dca27810 100644
--- a/include/zfs/zio.h
+++ b/include/zfs/zio.h
@@ -10,6 +10,7 @@
 #ifndef _ZIO_H
 #define	_ZIO_H
 
+#include <linux/types.h>
 #include <zfs/spa.h>
 
 #define	ZEC_MAGIC	0x210da7ab10c7a11ULL	/* zio data bloc tail */
diff --git a/include/zfs/zio_checksum.h b/include/zfs/zio_checksum.h
index 2264374e33a..6caa8aff524 100644
--- a/include/zfs/zio_checksum.h
+++ b/include/zfs/zio_checksum.h
@@ -14,6 +14,7 @@
 /*
  * Signature for checksum functions.
  */
+#include <linux/types.h>
 typedef void zio_checksum_t(const void *data, uint64_t size,
 			    zfs_endian_t endian, zio_cksum_t *zcp);
 
diff --git a/include/zfs_common.h b/include/zfs_common.h
index cb83e59e836..3e2f81cf98c 100644
--- a/include/zfs_common.h
+++ b/include/zfs_common.h
@@ -23,6 +23,7 @@
 #define __ZFS_COMMON__
 
 #include <part.h>
+#include <linux/types.h>
 
 #define SECTOR_SIZE			0x200
 #define SECTOR_BITS			9
diff --git a/include/zynq_bootimg.h b/include/zynq_bootimg.h
index c39c0bf4593..79a4e237b4b 100644
--- a/include/zynq_bootimg.h
+++ b/include/zynq_bootimg.h
@@ -6,6 +6,7 @@
 #ifndef _ZYNQ_BOOTIMG_H_
 #define _ZYNQ_BOOTIMG_H_
 
+#include <asm/types.h>
 #define ZYNQ_MAX_PARTITION_NUMBER	0xE
 
 struct partition_hdr {
diff --git a/include/zynqmp_firmware.h b/include/zynqmp_firmware.h
index 93d771ece26..dee7bc9ae2b 100644
--- a/include/zynqmp_firmware.h
+++ b/include/zynqmp_firmware.h
@@ -8,6 +8,7 @@
 #ifndef _ZYNQMP_FIRMWARE_H_
 #define _ZYNQMP_FIRMWARE_H_
 
+#include <linux/types.h>
 enum pm_api_id {
 	PM_GET_API_VERSION = 1,
 	PM_SET_CONFIGURATION,
diff --git a/include/zynqmp_tap_delay.h b/include/zynqmp_tap_delay.h
index b07e3e06922..71da46beb04 100644
--- a/include/zynqmp_tap_delay.h
+++ b/include/zynqmp_tap_delay.h
@@ -16,4 +16,5 @@ inline void zynqmp_dll_reset(u8 deviceid) {}
 inline void arasan_zynqmp_set_tapdelay(u8 device_id, u8 uhsmode, u8 bank) {}
 #endif
 
+#include <asm/types.h>
 #endif
diff --git a/include/zynqpl.h b/include/zynqpl.h
index d7dc064585e..43a77665428 100644
--- a/include/zynqpl.h
+++ b/include/zynqpl.h
@@ -10,6 +10,7 @@
 #define _ZYNQPL_H_
 
 #include <xilinx.h>
+#include <asm/types.h>
 
 #ifdef CONFIG_CMD_ZYNQ_AES
 int zynq_decrypt_load(u32 srcaddr, u32 dstaddr, u32 srclen, u32 dstlen,
diff --git a/lib/acpi/acpi_device.c b/lib/acpi/acpi_device.c
index b2cbf909361..3af4ed3ba9c 100644
--- a/lib/acpi/acpi_device.c
+++ b/lib/acpi/acpi_device.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <irq.h>
 #include <log.h>
+#include <stdbool.h>
 #include <usb.h>
 #include <vsprintf.h>
 #include <acpi/acpigen.h>
@@ -20,6 +21,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /**
  * acpi_device_path_fill() - Find the root device and build a path from there
diff --git a/lib/acpi/acpi_dp.c b/lib/acpi/acpi_dp.c
index 87e7bc4313b..222d85e21e1 100644
--- a/lib/acpi/acpi_dp.c
+++ b/lib/acpi/acpi_dp.c
@@ -13,6 +13,7 @@
 #include <uuid.h>
 #include <acpi/acpigen.h>
 #include <acpi/acpi_dp.h>
+#include <asm/types.h>
 #include <dm/acpi.h>
 #include <linux/errno.h>
 #include <linux/string.h>
diff --git a/lib/acpi/acpi_table.c b/lib/acpi/acpi_table.c
index f0b49c96e7f..f7b0fddb727 100644
--- a/lib/acpi/acpi_table.c
+++ b/lib/acpi/acpi_table.c
@@ -18,6 +18,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 int acpi_create_dmar(struct acpi_dmar *dmar, enum dmar_flags flags)
 {
diff --git a/lib/acpi/acpigen.c b/lib/acpi/acpigen.c
index 3b04aa992e1..ba8fe34b663 100644
--- a/lib/acpi/acpigen.c
+++ b/lib/acpi/acpigen.c
@@ -19,6 +19,7 @@
 #include <dm/acpi.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 u8 *acpigen_get_current(struct acpi_ctx *ctx)
 {
diff --git a/lib/addr_map.c b/lib/addr_map.c
index 09771f3a5a5..c9cbb5c1d1a 100644
--- a/lib/addr_map.c
+++ b/lib/addr_map.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <addr_map.h>
+#include <asm/types.h>
 
 static struct {
 	phys_addr_t paddr;
diff --git a/lib/aes.c b/lib/aes.c
index 204431bcf77..05c177d1643 100644
--- a/lib/aes.c
+++ b/lib/aes.c
@@ -26,6 +26,7 @@
 #include <display_options.h>
 #include <log.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/string.h>
 #else
 #include <string.h>
diff --git a/lib/aes/aes-decrypt.c b/lib/aes/aes-decrypt.c
index de67f0f32a7..a3ddb773823 100644
--- a/lib/aes/aes-decrypt.c
+++ b/lib/aes/aes-decrypt.c
@@ -10,6 +10,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #endif
 #include <image.h>
 #include <uboot_aes.h>
diff --git a/lib/asn1_decoder.c b/lib/asn1_decoder.c
index 1191fc36487..fca637df90f 100644
--- a/lib/asn1_decoder.c
+++ b/lib/asn1_decoder.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <linux/compat.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 #else
 #include <linux/export.h>
 #endif
diff --git a/lib/at91/at91.c b/lib/at91/at91.c
index 048597690b1..ebc84810c6d 100644
--- a/lib/at91/at91.c
+++ b/lib/at91/at91.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <atmel_lcd.h>
+#include <linux/types.h>
 
 #include "atmel_logo_8bpp.h"
 #include "microchip_logo_8bpp.h"
diff --git a/lib/bch.c b/lib/bch.c
index 0f68568c60b..c80ab9972ab 100644
--- a/lib/bch.c
+++ b/lib/bch.c
@@ -11,6 +11,7 @@
  * This library provides runtime configurable encoding/decoding of binary
  * Bose-Chaudhuri-Hocquenghem (BCH) codes.
  *
+#include <linux/types.h>
  * Call init_bch to get a pointer to a newly allocated bch_control structure for
  * the given m (Galois field order), t (error correction capability) and
  * (optional) primitive polynomial parameters.
diff --git a/lib/charset.c b/lib/charset.c
index b69e111918a..c57f21e98ba 100644
--- a/lib/charset.c
+++ b/lib/charset.c
@@ -11,6 +11,7 @@
 #include <malloc.h>
 #include <stdio.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static struct capitalization_table capitalization_table[] =
 #ifdef CONFIG_EFI_UNICODE_CAPITALIZATION
diff --git a/lib/crc16.c b/lib/crc16.c
index aa6d117ae17..0c5f0c12d22 100644
--- a/lib/crc16.c
+++ b/lib/crc16.c
@@ -27,6 +27,7 @@
 #else
 #include <common.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #endif
 #include <u-boot/crc.h>
 
diff --git a/lib/crc32.c b/lib/crc32.c
index aa210cea055..85a7f1a6f61 100644
--- a/lib/crc32.c
+++ b/lib/crc32.c
@@ -15,6 +15,7 @@
 #include <common.h>
 #include <efi_loader.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #endif
 #include <compiler.h>
 #include <u-boot/crc.h>
diff --git a/lib/crc32c.c b/lib/crc32c.c
index 016b34a523b..240ca4de662 100644
--- a/lib/crc32c.c
+++ b/lib/crc32c.c
@@ -12,6 +12,7 @@
 
 #include <common.h>
 #include <compiler.h>
+#include <linux/types.h>
 
 uint32_t crc32c_cal(uint32_t crc, const char *data, int length,
 		    uint32_t *crc32c_table)
diff --git a/lib/crypto/asymmetric_type.c b/lib/crypto/asymmetric_type.c
index d0dd2529536..6d2c1f525b7 100644
--- a/lib/crypto/asymmetric_type.c
+++ b/lib/crypto/asymmetric_type.c
@@ -12,6 +12,7 @@
 #include <keys/asymmetric-subtype.h>
 #include <keys/asymmetric-parser.h>
 #endif
+#include <stdbool.h>
 #include <crypto/public_key.h>
 #ifdef __UBOOT__
 #include <linux/bug.h>
@@ -22,6 +23,7 @@
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #else
 #include <linux/seq_file.h>
 #include <linux/module.h>
diff --git a/lib/crypto/pkcs7_parser.c b/lib/crypto/pkcs7_parser.c
index 3cb13fae86d..2395a9ddb1d 100644
--- a/lib/crypto/pkcs7_parser.c
+++ b/lib/crypto/pkcs7_parser.c
@@ -8,11 +8,13 @@
 #define pr_fmt(fmt) "PKCS7: "fmt
 #ifdef __UBOOT__
 #include <log.h>
+#include <stdbool.h>
 #include <dm/devres.h>
 #include <linux/bitops.h>
 #include <linux/compat.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 #endif
 #include <linux/kernel.h>
 #ifndef __UBOOT__
diff --git a/lib/crypto/pkcs7_verify.c b/lib/crypto/pkcs7_verify.c
index 2d9113fd2e0..9bd19da21cb 100644
--- a/lib/crypto/pkcs7_verify.c
+++ b/lib/crypto/pkcs7_verify.c
@@ -18,6 +18,7 @@
 #include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <u-boot/rsa-checksum.h>
 #include <crypto/public_key.h>
 #include <crypto/pkcs7_parser.h>
diff --git a/lib/crypto/public_key.c b/lib/crypto/public_key.c
index 4b64adbe352..5fa87ce2953 100644
--- a/lib/crypto/public_key.c
+++ b/lib/crypto/public_key.c
@@ -10,6 +10,7 @@
 #define pr_fmt(fmt) "PKEY: "fmt
 #ifdef __UBOOT__
 #include <vsprintf.h>
+#include <asm/types.h>
 #include <dm/devres.h>
 #include <linux/bug.h>
 #include <linux/compat.h>
diff --git a/lib/crypto/rsa_helper.c b/lib/crypto/rsa_helper.c
index acea8b26213..e1d86e44664 100644
--- a/lib/crypto/rsa_helper.c
+++ b/lib/crypto/rsa_helper.c
@@ -17,6 +17,7 @@
 #include <crypto/internal/rsa.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 #include "rsapubkey.asn1.h"
 #ifndef __UBOOT__
 #include "rsaprivkey.asn1.h"
diff --git a/lib/crypto/x509_cert_parser.c b/lib/crypto/x509_cert_parser.c
index 909190c8af8..563fff6ad6d 100644
--- a/lib/crypto/x509_cert_parser.c
+++ b/lib/crypto/x509_cert_parser.c
@@ -19,6 +19,7 @@
 #ifdef __UBOOT__
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #endif
 #include <crypto/public_key.h>
 #ifdef __UBOOT__
diff --git a/lib/crypto/x509_public_key.c b/lib/crypto/x509_public_key.c
index f79b4ea6b0f..e42041c5360 100644
--- a/lib/crypto/x509_public_key.c
+++ b/lib/crypto/x509_public_key.c
@@ -9,12 +9,14 @@
 #ifdef __UBOOT__
 #include <common.h>
 #include <image.h>
+#include <stdbool.h>
 #include <dm/devres.h>
 #include <linux/compat.h>
 #include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #else
 #include <linux/module.h>
 #endif
diff --git a/lib/dhry/cmd_dhry.c b/lib/dhry/cmd_dhry.c
index 46f7fe89daa..8ced1e0fcf0 100644
--- a/lib/dhry/cmd_dhry.c
+++ b/lib/dhry/cmd_dhry.c
@@ -9,6 +9,7 @@
 #include <stdio.h>
 #include <time.h>
 #include <vsprintf.h>
+#include <linux/types.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 8dcbd75e914..850f5b97243 100644
--- a/lib/display_options.c
+++ b/lib/display_options.c
@@ -9,12 +9,14 @@
 #include <console.h>
 #include <display_options.h>
 #include <div64.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <version.h>
 #include <vsprintf.h>
 #include <linux/ctype.h>
 #include <asm/io.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 char *display_options_get_banner_priv(bool newlines, const char *build_tag,
 				      char *buf, int size)
diff --git a/lib/div64.c b/lib/div64.c
index 779d7521f69..32cf6ba91f6 100644
--- a/lib/div64.c
+++ b/lib/div64.c
@@ -21,6 +21,7 @@
 #include <linux/compat.h>
 #include <linux/kernel.h>
 #include <linux/math64.h>
+#include <linux/types.h>
 
 /* Not needed on 64bit architectures */
 #if BITS_PER_LONG == 32
diff --git a/lib/efi/efi_info.c b/lib/efi/efi_info.c
index 6ba042f6894..dda21a253df 100644
--- a/lib/efi/efi_info.c
+++ b/lib/efi/efi_info.c
@@ -11,6 +11,7 @@
 #include <mapmem.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 int efi_info_get(enum efi_entry_t type, void **datap, int *sizep)
 {
diff --git a/lib/efi/efi_stub.c b/lib/efi/efi_stub.c
index 42b24139dbe..d7c9fcf3004 100644
--- a/lib/efi/efi_stub.c
+++ b/lib/efi/efi_stub.c
@@ -10,12 +10,14 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <debug_uart.h>
 #include <efi.h>
 #include <efi_api.h>
 #include <errno.h>
 #include <malloc.h>
 #include <ns16550.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/cpu.h>
 #include <asm/io.h>
diff --git a/lib/efi_driver/efi_block_device.c b/lib/efi_driver/efi_block_device.c
index 54f83eee596..607642cc298 100644
--- a/lib/efi_driver/efi_block_device.c
+++ b/lib/efi_driver/efi_block_device.c
@@ -36,6 +36,7 @@
 #include <dm/device-internal.h>
 #include <dm/root.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 /*
  * EFI attributes of the udevice handled by this driver.
diff --git a/lib/efi_driver/efi_uclass.c b/lib/efi_driver/efi_uclass.c
index 15e1e67bdc9..3b203fc0c4d 100644
--- a/lib/efi_driver/efi_uclass.c
+++ b/lib/efi_driver/efi_uclass.c
@@ -21,6 +21,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <stdio.h>
+#include <linux/types.h>
 
 /**
  * check_node_type() - check node type
diff --git a/lib/efi_loader/efi_acpi.c b/lib/efi_loader/efi_acpi.c
index 87a02d59b9c..1b0118137a3 100644
--- a/lib/efi_loader/efi_acpi.c
+++ b/lib/efi_loader/efi_acpi.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <acpi/acpi_table.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 static const efi_guid_t acpi_guid = EFI_ACPI_TABLE_GUID;
 
diff --git a/lib/efi_loader/efi_bootmgr.c b/lib/efi_loader/efi_bootmgr.c
index 12706e88ab8..47075453771 100644
--- a/lib/efi_loader/efi_bootmgr.c
+++ b/lib/efi_loader/efi_bootmgr.c
@@ -15,6 +15,7 @@
 #include <efi_variable.h>
 #include <asm/unaligned.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static const struct efi_boot_services *bs;
 static const struct efi_runtime_services *rs;
diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c
index 00dee3e57ae..7e8d9d1efee 100644
--- a/lib/efi_loader/efi_boottime.c
+++ b/lib/efi_loader/efi_boottime.c
@@ -11,6 +11,7 @@
 #include <irq_func.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <vsprintf.h>
@@ -19,6 +20,7 @@
 #include <linux/kernel.h>
 #include <linux/libfdt_env.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <u-boot/crc.h>
 #include <bootm.h>
 #include <pe.h>
diff --git a/lib/efi_loader/efi_console.c b/lib/efi_loader/efi_console.c
index ae0ee7ee909..770de815378 100644
--- a/lib/efi_loader/efi_console.c
+++ b/lib/efi_loader/efi_console.c
@@ -17,6 +17,7 @@
 #include <stdio_dev.h>
 #include <video_console.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define EFI_COUT_MODE_2 2
 #define EFI_MAX_COUT_MODE 3
diff --git a/lib/efi_loader/efi_device_path.c b/lib/efi_loader/efi_device_path.c
index 68e344ee344..d117f860b59 100644
--- a/lib/efi_loader/efi_device_path.c
+++ b/lib/efi_loader/efi_device_path.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <log.h>
 #include <net.h>
+#include <stdbool.h>
 #include <usb.h>
 #include <mmc.h>
 #include <nvme.h>
@@ -21,6 +22,7 @@
 #include <linux/compat.h> /* U16_MAX */
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_SANDBOX
 const efi_guid_t efi_guid_host_dev = U_BOOT_HOST_DEV_GUID;
diff --git a/lib/efi_loader/efi_device_path_to_text.c b/lib/efi_loader/efi_device_path_to_text.c
index b923ff34848..95541355ff9 100644
--- a/lib/efi_loader/efi_device_path_to_text.c
+++ b/lib/efi_loader/efi_device_path_to_text.c
@@ -11,6 +11,7 @@
 #include <stdbool.h>
 #include <vsprintf.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define MAC_OUTPUT_LEN 22
 #define UNKNOWN_OUTPUT_LEN 23
diff --git a/lib/efi_loader/efi_device_path_utilities.c b/lib/efi_loader/efi_device_path_utilities.c
index 405e87f3a01..47aad94edb0 100644
--- a/lib/efi_loader/efi_device_path_utilities.c
+++ b/lib/efi_loader/efi_device_path_utilities.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <efi_loader.h>
 #include <stdbool.h>
+#include <linux/types.h>
 
 const efi_guid_t efi_guid_device_path_utilities_protocol =
 		EFI_DEVICE_PATH_UTILITIES_PROTOCOL_GUID;
diff --git a/lib/efi_loader/efi_disk.c b/lib/efi_loader/efi_disk.c
index 43704826fb7..dd9c82c0508 100644
--- a/lib/efi_loader/efi_disk.c
+++ b/lib/efi_loader/efi_disk.c
@@ -15,9 +15,11 @@
 #include <log.h>
 #include <part.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <vsprintf.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 struct efi_system_partition efi_system_partition;
 
diff --git a/lib/efi_loader/efi_file.c b/lib/efi_loader/efi_file.c
index 023a91a3708..9d21a80bea5 100644
--- a/lib/efi_loader/efi_file.c
+++ b/lib/efi_loader/efi_file.c
@@ -16,6 +16,7 @@
 #include <stdio.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /* GUID for file system information */
 const efi_guid_t efi_file_system_info_guid = EFI_FILE_SYSTEM_INFO_GUID;
diff --git a/lib/efi_loader/efi_freestanding.c b/lib/efi_loader/efi_freestanding.c
index 87c1633804c..ad541ff7e7b 100644
--- a/lib/efi_loader/efi_freestanding.c
+++ b/lib/efi_loader/efi_freestanding.c
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /**
  * memcmp() - compare memory areas
diff --git a/lib/efi_loader/efi_gop.c b/lib/efi_loader/efi_gop.c
index 42d985b2586..a14a9a96045 100644
--- a/lib/efi_loader/efi_gop.c
+++ b/lib/efi_loader/efi_gop.c
@@ -16,6 +16,7 @@
 #include <asm/global_data.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/lib/efi_loader/efi_hii.c b/lib/efi_loader/efi_hii.c
index 05ad9926098..fe06e12092b 100644
--- a/lib/efi_loader/efi_hii.c
+++ b/lib/efi_loader/efi_hii.c
@@ -1,5 +1,6 @@
 // SPDX-License-Identifier:     GPL-2.0+
 /*
+#include <linux/types.h>
  *  EFI Human Interface Infrastructure ... database and packages
  *
  *  Copyright (c) 2017 Leif Lindholm
diff --git a/lib/efi_loader/efi_hii_config.c b/lib/efi_loader/efi_hii_config.c
index 26ea4b9bc0a..4c5a95ef9eb 100644
--- a/lib/efi_loader/efi_hii_config.c
+++ b/lib/efi_loader/efi_hii_config.c
@@ -1,5 +1,6 @@
 // SPDX-License-Identifier:     GPL-2.0+
 /*
+#include <asm/types.h>
  *  EFI Human Interface Infrastructure ... Configuration
  *
  *  Copyright (c) 2017 Leif Lindholm
diff --git a/lib/efi_loader/efi_image_loader.c b/lib/efi_loader/efi_image_loader.c
index 44cf7916637..751bebc2a7e 100644
--- a/lib/efi_loader/efi_image_loader.c
+++ b/lib/efi_loader/efi_image_loader.c
@@ -8,16 +8,19 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <efi_loader.h>
 #include <malloc.h>
 #include <pe.h>
 #include <sort.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <crypto/pkcs7_parser.h>
 #include <linux/err.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 const efi_guid_t efi_global_variable_guid = EFI_GLOBAL_VARIABLE_GUID;
 const efi_guid_t efi_guid_device_path = EFI_DEVICE_PATH_PROTOCOL_GUID;
diff --git a/lib/efi_loader/efi_load_initrd.c b/lib/efi_loader/efi_load_initrd.c
index 37265417250..253898e7c65 100644
--- a/lib/efi_loader/efi_load_initrd.c
+++ b/lib/efi_loader/efi_load_initrd.c
@@ -13,6 +13,7 @@
 #include <efi_load_initrd.h>
 #include <stdbool.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static const efi_guid_t efi_guid_load_file2_protocol =
 		EFI_LOAD_FILE2_PROTOCOL_GUID;
diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c
index b774358333a..ce6fe582d13 100644
--- a/lib/efi_loader/efi_memory.c
+++ b/lib/efi_loader/efi_memory.c
@@ -6,10 +6,12 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <efi_loader.h>
 #include <init.h>
 #include <malloc.h>
 #include <mapmem.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <watchdog.h>
 #include <asm/cache.h>
@@ -18,6 +20,7 @@
 #include <linux/kernel.h>
 #include <linux/list_sort.h>
 #include <linux/sizes.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/lib/efi_loader/efi_net.c b/lib/efi_loader/efi_net.c
index 5c29d00b451..c884ad5fb5a 100644
--- a/lib/efi_loader/efi_net.c
+++ b/lib/efi_loader/efi_net.c
@@ -19,9 +19,11 @@
 #include <efi_loader.h>
 #include <malloc.h>
 #include <net.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static const efi_guid_t efi_net_guid = EFI_SIMPLE_NETWORK_PROTOCOL_GUID;
 static const efi_guid_t efi_pxe_base_code_protocol_guid =
diff --git a/lib/efi_loader/efi_rng.c b/lib/efi_loader/efi_rng.c
index 974a3ed7281..dec97a2107b 100644
--- a/lib/efi_loader/efi_rng.c
+++ b/lib/efi_loader/efi_rng.c
@@ -4,12 +4,14 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <efi_loader.h>
 #include <efi_rng.h>
 #include <log.h>
 #include <rng.h>
 #include <asm/global_data.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/lib/efi_loader/efi_root_node.c b/lib/efi_loader/efi_root_node.c
index 76d18fb1a4a..77d4e6c6c2e 100644
--- a/lib/efi_loader/efi_root_node.c
+++ b/lib/efi_loader/efi_root_node.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <malloc.h>
 #include <efi_loader.h>
 
diff --git a/lib/efi_loader/efi_runtime.c b/lib/efi_loader/efi_runtime.c
index 93bbd270234..954138322e1 100644
--- a/lib/efi_loader/efi_runtime.c
+++ b/lib/efi_loader/efi_runtime.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <dm.h>
 #include <elf.h>
@@ -14,10 +15,12 @@
 #include <log.h>
 #include <malloc.h>
 #include <rtc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <u-boot/crc.h>
 
 /* For manual relocation support */
diff --git a/lib/efi_loader/efi_setup.c b/lib/efi_loader/efi_setup.c
index d675b96e64f..caa1de8c2cc 100644
--- a/lib/efi_loader/efi_setup.c
+++ b/lib/efi_loader/efi_setup.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <bootm.h>
+#include <compiler.h>
 #include <efi_loader.h>
 #include <efi_variable.h>
 #include <stdio.h>
diff --git a/lib/efi_loader/efi_signature.c b/lib/efi_loader/efi_signature.c
index 0d3b46d7a63..7fc34e236d7 100644
--- a/lib/efi_loader/efi_signature.c
+++ b/lib/efi_loader/efi_signature.c
@@ -15,6 +15,7 @@
 #include <linux/compat.h>
 #include <linux/oid_registry.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <u-boot/rsa.h>
 #include <u-boot/sha256.h>
 
diff --git a/lib/efi_loader/efi_smbios.c b/lib/efi_loader/efi_smbios.c
index b77ac76935a..cad38cb5f27 100644
--- a/lib/efi_loader/efi_smbios.c
+++ b/lib/efi_loader/efi_smbios.c
@@ -11,6 +11,7 @@
 #include <mapmem.h>
 #include <smbios.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 static const efi_guid_t smbios_guid = SMBIOS_TABLE_GUID;
 
diff --git a/lib/efi_loader/efi_unicode_collation.c b/lib/efi_loader/efi_unicode_collation.c
index caa65f06d73..fcd295d638b 100644
--- a/lib/efi_loader/efi_unicode_collation.c
+++ b/lib/efi_loader/efi_unicode_collation.c
@@ -11,6 +11,7 @@
 #include <cp437.h>
 #include <efi_loader.h>
 #include <stdbool.h>
+#include <asm/types.h>
 #include <linux/string.h>
 
 /* Characters that may not be used in FAT 8.3 file names */
diff --git a/lib/efi_loader/efi_var_common.c b/lib/efi_loader/efi_var_common.c
index 57b27fdc960..59b3829ad7e 100644
--- a/lib/efi_loader/efi_var_common.c
+++ b/lib/efi_loader/efi_var_common.c
@@ -8,8 +8,10 @@
 #include <common.h>
 #include <efi_loader.h>
 #include <efi_variable.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 enum efi_secure_mode {
 	EFI_MODE_SETUP,
diff --git a/lib/efi_loader/efi_var_file.c b/lib/efi_loader/efi_var_file.c
index 3929355b64e..0846bf34f95 100644
--- a/lib/efi_loader/efi_var_file.c
+++ b/lib/efi_loader/efi_var_file.c
@@ -18,6 +18,7 @@
 #include <vsprintf.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <u-boot/crc.h>
 
 #define PART_STR_LEN 10
diff --git a/lib/efi_loader/efi_var_mem.c b/lib/efi_loader/efi_var_mem.c
index a8f7dddfc52..49b7b70c7f1 100644
--- a/lib/efi_loader/efi_var_mem.c
+++ b/lib/efi_loader/efi_var_mem.c
@@ -8,8 +8,10 @@
 #include <common.h>
 #include <efi_loader.h>
 #include <efi_variable.h>
+#include <stdbool.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <u-boot/crc.h>
 
 static struct efi_var_file __efi_runtime_data *efi_var_buf;
diff --git a/lib/efi_loader/efi_variable.c b/lib/efi_loader/efi_variable.c
index d4b56d05ae6..a1319468b77 100644
--- a/lib/efi_loader/efi_variable.c
+++ b/lib/efi_loader/efi_variable.c
@@ -22,6 +22,7 @@
 #include <crypto/pkcs7_parser.h>
 #include <linux/compat.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <u-boot/crc.h>
 #include <asm/sections.h>
 
diff --git a/lib/efi_loader/efi_variable_tee.c b/lib/efi_loader/efi_variable_tee.c
index 792aed9c6b3..816bdd49ac2 100644
--- a/lib/efi_loader/efi_variable_tee.c
+++ b/lib/efi_loader/efi_variable_tee.c
@@ -17,6 +17,7 @@
 #include <mm_communication.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static efi_uintn_t max_buffer_size;	/* comm + var + func + data */
 static efi_uintn_t max_payload_size;	/* func + data */
diff --git a/lib/efi_loader/helloworld.c b/lib/efi_loader/helloworld.c
index 2598fdfd124..4904970b023 100644
--- a/lib/efi_loader/helloworld.c
+++ b/lib/efi_loader/helloworld.c
@@ -11,6 +11,7 @@
 
 #include <common.h>
 #include <efi_api.h>
+#include <asm/types.h>
 #include <linux/string.h>
 
 static const efi_guid_t loaded_image_guid = EFI_LOADED_IMAGE_PROTOCOL_GUID;
diff --git a/lib/efi_selftest/efi_selftest.c b/lib/efi_selftest/efi_selftest.c
index 5b01610eca1..0ca03cb4a8b 100644
--- a/lib/efi_selftest/efi_selftest.c
+++ b/lib/efi_selftest/efi_selftest.c
@@ -7,6 +7,7 @@
 
 #include <efi_selftest.h>
 #include <vsprintf.h>
+#include <asm/types.h>
 
 /* Constants for test step bitmap */
 #define EFI_ST_SETUP	1
diff --git a/lib/efi_selftest/efi_selftest_bitblt.c b/lib/efi_selftest/efi_selftest_bitblt.c
index fb33150c4b2..49ad2340e5c 100644
--- a/lib/efi_selftest/efi_selftest_bitblt.c
+++ b/lib/efi_selftest/efi_selftest_bitblt.c
@@ -9,6 +9,7 @@
  */
 
 #include <efi_selftest.h>
+#include <asm/types.h>
 
 #define WIDTH	200
 #define HEIGHT	120
diff --git a/lib/efi_selftest/efi_selftest_block_device.c b/lib/efi_selftest/efi_selftest_block_device.c
index 63d340342a9..44c63dfe32a 100644
--- a/lib/efi_selftest/efi_selftest_block_device.c
+++ b/lib/efi_selftest/efi_selftest_block_device.c
@@ -15,6 +15,7 @@
 
 #include <efi_selftest.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "efi_selftest_disk_image.h"
 #include <asm/cache.h>
 
diff --git a/lib/efi_selftest/efi_selftest_config_table.c b/lib/efi_selftest/efi_selftest_config_table.c
index 6f6a8757ac5..4ecb41b3c0a 100644
--- a/lib/efi_selftest/efi_selftest_config_table.c
+++ b/lib/efi_selftest/efi_selftest_config_table.c
@@ -9,6 +9,7 @@
  */
 
 #include <efi_selftest.h>
+#include <asm/types.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
 
diff --git a/lib/efi_selftest/efi_selftest_console.c b/lib/efi_selftest/efi_selftest_console.c
index 0462c196c16..993e058c0b9 100644
--- a/lib/efi_selftest/efi_selftest_console.c
+++ b/lib/efi_selftest/efi_selftest_console.c
@@ -9,6 +9,7 @@
 #include <net.h>
 #include <stdarg.h>
 #include <vsprintf.h>
+#include <linux/types.h>
 
 struct efi_simple_text_output_protocol *con_out;
 struct efi_simple_text_input_protocol *con_in;
diff --git a/lib/efi_selftest/efi_selftest_controllers.c b/lib/efi_selftest/efi_selftest_controllers.c
index 38720bb63d3..13a08eba321 100644
--- a/lib/efi_selftest/efi_selftest_controllers.c
+++ b/lib/efi_selftest/efi_selftest_controllers.c
@@ -11,6 +11,7 @@
  */
 
 #include <efi_selftest.h>
+#include <linux/types.h>
 
 #define NUMBER_OF_CHILD_CONTROLLERS 4
 
diff --git a/lib/efi_selftest/efi_selftest_crc32.c b/lib/efi_selftest/efi_selftest_crc32.c
index 19153c759aa..48f6d328bfb 100644
--- a/lib/efi_selftest/efi_selftest_crc32.c
+++ b/lib/efi_selftest/efi_selftest_crc32.c
@@ -10,6 +10,7 @@
  */
 
 #include <efi_selftest.h>
+#include <asm/types.h>
 #include <u-boot/crc.h>
 
 const struct efi_system_table *st;
diff --git a/lib/efi_selftest/efi_selftest_devicepath.c b/lib/efi_selftest/efi_selftest_devicepath.c
index 4ce3fad8959..af0150c7cea 100644
--- a/lib/efi_selftest/efi_selftest_devicepath.c
+++ b/lib/efi_selftest/efi_selftest_devicepath.c
@@ -8,7 +8,9 @@
  * DevicePathToText
  */
 
+#include <compiler.h>
 #include <efi_selftest.h>
+#include <asm/types.h>
 
 static struct efi_boot_services *boottime;
 
diff --git a/lib/efi_selftest/efi_selftest_event_groups.c b/lib/efi_selftest/efi_selftest_event_groups.c
index 6dcde50648b..0aef2aa5e58 100644
--- a/lib/efi_selftest/efi_selftest_event_groups.c
+++ b/lib/efi_selftest/efi_selftest_event_groups.c
@@ -10,6 +10,7 @@
  */
 
 #include <efi_selftest.h>
+#include <linux/types.h>
 
 #define GROUP_SIZE 16
 
diff --git a/lib/efi_selftest/efi_selftest_exception.c b/lib/efi_selftest/efi_selftest_exception.c
index 6e900a35dc2..4bff40c7e73 100644
--- a/lib/efi_selftest/efi_selftest_exception.c
+++ b/lib/efi_selftest/efi_selftest_exception.c
@@ -11,6 +11,7 @@
  */
 
 #include <efi_selftest.h>
+#include <linux/types.h>
 /* Include containing the UEFI application */
 #include "efi_miniapp_file_image_exception.h"
 
diff --git a/lib/efi_selftest/efi_selftest_fdt.c b/lib/efi_selftest/efi_selftest_fdt.c
index db94bef0803..4633d416db6 100644
--- a/lib/efi_selftest/efi_selftest_fdt.c
+++ b/lib/efi_selftest/efi_selftest_fdt.c
@@ -13,6 +13,7 @@
 #include <efi_selftest.h>
 #include <stdio.h>
 #include <linux/libfdt.h>
+#include <linux/types.h>
 
 static const struct efi_system_table *systemtab;
 static const struct efi_boot_services *boottime;
diff --git a/lib/efi_selftest/efi_selftest_gop.c b/lib/efi_selftest/efi_selftest_gop.c
index d64294ac79d..de14dbaaeb8 100644
--- a/lib/efi_selftest/efi_selftest_gop.c
+++ b/lib/efi_selftest/efi_selftest_gop.c
@@ -8,6 +8,7 @@
  */
 
 #include <efi_selftest.h>
+#include <asm/types.h>
 
 static struct efi_boot_services *boottime;
 static efi_guid_t efi_gop_guid = EFI_GRAPHICS_OUTPUT_PROTOCOL_GUID;
diff --git a/lib/efi_selftest/efi_selftest_hii.c b/lib/efi_selftest/efi_selftest_hii.c
index f4b70f79508..9017d52c50b 100644
--- a/lib/efi_selftest/efi_selftest_hii.c
+++ b/lib/efi_selftest/efi_selftest_hii.c
@@ -8,6 +8,7 @@
  */
 
 #include <efi_selftest.h>
+#include <asm/types.h>
 #include "efi_selftest_hii_data.c"
 
 #define PRINT_TESTNAME efi_st_printf("%s:\n", __func__)
diff --git a/lib/efi_selftest/efi_selftest_hii_data.c b/lib/efi_selftest/efi_selftest_hii_data.c
index d19f0682afd..8a2d5d295a4 100644
--- a/lib/efi_selftest/efi_selftest_hii_data.c
+++ b/lib/efi_selftest/efi_selftest_hii_data.c
@@ -19,6 +19,7 @@
  */
 
 #include <efi.h>
+#include <asm/types.h>
 
 #ifdef NOT_USED
 /*
diff --git a/lib/efi_selftest/efi_selftest_load_initrd.c b/lib/efi_selftest/efi_selftest_load_initrd.c
index 144443ff685..00d50005567 100644
--- a/lib/efi_selftest/efi_selftest_load_initrd.c
+++ b/lib/efi_selftest/efi_selftest_load_initrd.c
@@ -41,6 +41,7 @@
 #include <efi_selftest.h>
 #include <efi_loader.h>
 #include <efi_load_initrd.h>
+#include <asm/types.h>
 #include <linux/string.h>
 
 static struct efi_boot_services *boottime;
diff --git a/lib/efi_selftest/efi_selftest_loadimage.c b/lib/efi_selftest/efi_selftest_loadimage.c
index f251cbc33bc..add34df4c8a 100644
--- a/lib/efi_selftest/efi_selftest_loadimage.c
+++ b/lib/efi_selftest/efi_selftest_loadimage.c
@@ -10,8 +10,10 @@
  * path and started.
  */
 
+#include <compiler.h>
 #include <efi_selftest.h>
 #include <linux/string.h>
+#include <linux/types.h>
 /* Include containing the efi_selftest_miniapp_exit.efi application */
 #include "efi_miniapp_file_image_exit.h"
 
diff --git a/lib/efi_selftest/efi_selftest_manageprotocols.c b/lib/efi_selftest/efi_selftest_manageprotocols.c
index 717774e00f3..86b3575d703 100644
--- a/lib/efi_selftest/efi_selftest_manageprotocols.c
+++ b/lib/efi_selftest/efi_selftest_manageprotocols.c
@@ -14,6 +14,7 @@
 #include <efi_selftest.h>
 #include <stdio.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /*
  * The test currently does not actually call the interface function.
diff --git a/lib/efi_selftest/efi_selftest_mem.c b/lib/efi_selftest/efi_selftest_mem.c
index c5f0d7ccfa1..fc3cb20e05a 100644
--- a/lib/efi_selftest/efi_selftest_mem.c
+++ b/lib/efi_selftest/efi_selftest_mem.c
@@ -11,6 +11,7 @@
  */
 
 #include <efi_selftest.h>
+#include <asm/types.h>
 #include <linux/string.h>
 
 static struct efi_boot_services *boottime;
diff --git a/lib/efi_selftest/efi_selftest_memory.c b/lib/efi_selftest/efi_selftest_memory.c
index 31ca3f3beb6..6e97579ba92 100644
--- a/lib/efi_selftest/efi_selftest_memory.c
+++ b/lib/efi_selftest/efi_selftest_memory.c
@@ -13,6 +13,7 @@
 #include <efi_selftest.h>
 #include <stdbool.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define EFI_ST_NUM_PAGES 8
 
diff --git a/lib/efi_selftest/efi_selftest_miniapp_exit.c b/lib/efi_selftest/efi_selftest_miniapp_exit.c
index 6b5cfb01cf7..a5ab96077f2 100644
--- a/lib/efi_selftest/efi_selftest_miniapp_exit.c
+++ b/lib/efi_selftest/efi_selftest_miniapp_exit.c
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <efi_selftest.h>
+#include <asm/types.h>
 
 static efi_guid_t loaded_image_protocol_guid = EFI_LOADED_IMAGE_PROTOCOL_GUID;
 
diff --git a/lib/efi_selftest/efi_selftest_rng.c b/lib/efi_selftest/efi_selftest_rng.c
index ecf13a41faf..646654612d9 100644
--- a/lib/efi_selftest/efi_selftest_rng.c
+++ b/lib/efi_selftest/efi_selftest_rng.c
@@ -9,6 +9,7 @@
 
 #include <efi_selftest.h>
 #include <efi_rng.h>
+#include <asm/types.h>
 #include <linux/string.h>
 
 #define RNG_LEN 9
diff --git a/lib/efi_selftest/efi_selftest_set_virtual_address_map.c b/lib/efi_selftest/efi_selftest_set_virtual_address_map.c
index 6a22d99e834..64e64d20a4e 100644
--- a/lib/efi_selftest/efi_selftest_set_virtual_address_map.c
+++ b/lib/efi_selftest/efi_selftest_set_virtual_address_map.c
@@ -11,6 +11,7 @@
 #include <efi_selftest.h>
 #include <stdbool.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static const struct efi_boot_services *boottime;
 static const struct efi_runtime_services *runtime;
diff --git a/lib/efi_selftest/efi_selftest_snp.c b/lib/efi_selftest/efi_selftest_snp.c
index 3357048c7f4..c2167c913ce 100644
--- a/lib/efi_selftest/efi_selftest_snp.c
+++ b/lib/efi_selftest/efi_selftest_snp.c
@@ -14,9 +14,11 @@
  *	 we should connect our code as controller.
  */
 
+#include <compiler.h>
 #include <efi_selftest.h>
 #include <net.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /*
  * MAC address for broadcasts
diff --git a/lib/efi_selftest/efi_selftest_startimage_exit.c b/lib/efi_selftest/efi_selftest_startimage_exit.c
index 1406dfc9172..a7d5f201be8 100644
--- a/lib/efi_selftest/efi_selftest_startimage_exit.c
+++ b/lib/efi_selftest/efi_selftest_startimage_exit.c
@@ -11,6 +11,7 @@
 
 #include <efi_selftest.h>
 #include <linux/string.h>
+#include <linux/types.h>
 /* Include containing the miniapp.efi application */
 #include "efi_miniapp_file_image_exit.h"
 
diff --git a/lib/efi_selftest/efi_selftest_startimage_return.c b/lib/efi_selftest/efi_selftest_startimage_return.c
index fabf53d983b..216890a094f 100644
--- a/lib/efi_selftest/efi_selftest_startimage_return.c
+++ b/lib/efi_selftest/efi_selftest_startimage_return.c
@@ -10,6 +10,7 @@
  */
 
 #include <efi_selftest.h>
+#include <linux/types.h>
 /* Include containing the miniapp.efi application */
 #include "efi_miniapp_file_image_return.h"
 
diff --git a/lib/efi_selftest/efi_selftest_textinputex.c b/lib/efi_selftest/efi_selftest_textinputex.c
index 2b0b3cfd722..1dee1cffb62 100644
--- a/lib/efi_selftest/efi_selftest_textinputex.c
+++ b/lib/efi_selftest/efi_selftest_textinputex.c
@@ -14,6 +14,7 @@
 
 #include <efi_selftest.h>
 #include <stdbool.h>
+#include <linux/types.h>
 
 static const efi_guid_t text_input_ex_protocol_guid =
 		EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL_GUID;
diff --git a/lib/efi_selftest/efi_selftest_textoutput.c b/lib/efi_selftest/efi_selftest_textoutput.c
index a87f65e197f..8b37957ebf3 100644
--- a/lib/efi_selftest/efi_selftest_textoutput.c
+++ b/lib/efi_selftest/efi_selftest_textoutput.c
@@ -11,6 +11,7 @@
  */
 
 #include <efi_selftest.h>
+#include <linux/types.h>
 
 /*
  * Execute unit test.
diff --git a/lib/efi_selftest/efi_selftest_unaligned.c b/lib/efi_selftest/efi_selftest_unaligned.c
index 1802948e675..3a55d57fbeb 100644
--- a/lib/efi_selftest/efi_selftest_unaligned.c
+++ b/lib/efi_selftest/efi_selftest_unaligned.c
@@ -8,6 +8,7 @@
  */
 
 #include <efi_selftest.h>
+#include <asm/types.h>
 
 struct aligned_buffer {
 	char a[8] __aligned(8);
diff --git a/lib/efi_selftest/efi_selftest_unicode_collation.c b/lib/efi_selftest/efi_selftest_unicode_collation.c
index b3f7c623e8b..b60d8a94ca5 100644
--- a/lib/efi_selftest/efi_selftest_unicode_collation.c
+++ b/lib/efi_selftest/efi_selftest_unicode_collation.c
@@ -9,6 +9,7 @@
 
 #include <efi_selftest.h>
 #include <stdbool.h>
+#include <asm/types.h>
 
 static const efi_guid_t unicode_collation_protocol_guid =
 	EFI_UNICODE_COLLATION_PROTOCOL2_GUID;
diff --git a/lib/efi_selftest/efi_selftest_util.c b/lib/efi_selftest/efi_selftest_util.c
index ea73c25220f..1f4d248eeec 100644
--- a/lib/efi_selftest/efi_selftest_util.c
+++ b/lib/efi_selftest/efi_selftest_util.c
@@ -8,6 +8,7 @@
  */
 
 #include <efi_selftest.h>
+#include <asm/types.h>
 
 struct efi_st_translate {
 	u16 code;
diff --git a/lib/efi_selftest/efi_selftest_variables.c b/lib/efi_selftest/efi_selftest_variables.c
index dfbdeb99f31..8de971ea364 100644
--- a/lib/efi_selftest/efi_selftest_variables.c
+++ b/lib/efi_selftest/efi_selftest_variables.c
@@ -9,6 +9,7 @@
  */
 
 #include <efi_selftest.h>
+#include <asm/types.h>
 #include <linux/string.h>
 
 #define EFI_ST_MAX_DATA_SIZE 16
diff --git a/lib/efi_selftest/efi_selftest_variables_runtime.c b/lib/efi_selftest/efi_selftest_variables_runtime.c
index 619da67a292..b232f07a3c4 100644
--- a/lib/efi_selftest/efi_selftest_variables_runtime.c
+++ b/lib/efi_selftest/efi_selftest_variables_runtime.c
@@ -10,6 +10,7 @@
  */
 
 #include <efi_selftest.h>
+#include <asm/types.h>
 #include <linux/string.h>
 
 #define EFI_ST_MAX_DATA_SIZE 16
diff --git a/lib/efi_selftest/efi_selftest_watchdog.c b/lib/efi_selftest/efi_selftest_watchdog.c
index 666c0309be1..97790eaa6af 100644
--- a/lib/efi_selftest/efi_selftest_watchdog.c
+++ b/lib/efi_selftest/efi_selftest_watchdog.c
@@ -18,6 +18,7 @@
 
 #include <efi_selftest.h>
 #include <stdbool.h>
+#include <linux/types.h>
 
 /*
  * This is the communication structure for the notification function.
diff --git a/lib/elf.c b/lib/elf.c
index 623e46867cd..2b681d9c0cb 100644
--- a/lib/elf.c
+++ b/lib/elf.c
@@ -18,6 +18,7 @@
 #endif
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /*
  * A very simple ELF64 loader, assumes the image is valid, returns the
diff --git a/lib/fdtdec.c b/lib/fdtdec.c
index ee8ae8d2764..655e0786e8a 100644
--- a/lib/fdtdec.c
+++ b/lib/fdtdec.c
@@ -6,6 +6,7 @@
 #ifndef USE_HOSTCC
 #include <common.h>
 #include <boot_fit.h>
+#include <compiler.h>
 #include <display_options.h>
 #include <dm.h>
 #include <hang.h>
@@ -13,6 +14,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <net.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/u-boot.h>
@@ -32,6 +34,7 @@
 #include <linux/ctype.h>
 #include <linux/lzo.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/lib/fdtdec_test.c b/lib/fdtdec_test.c
index 15c60ee08cf..a1cd2c1e9f1 100644
--- a/lib/fdtdec_test.c
+++ b/lib/fdtdec_test.c
@@ -16,6 +16,7 @@
 #include <malloc.h>
 #include <os.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /* The size of our test fdt blob */
 #define FDT_SIZE	(16 * 1024)
diff --git a/lib/gunzip.c b/lib/gunzip.c
index 60429e5dd7e..24cce8ffc7b 100644
--- a/lib/gunzip.c
+++ b/lib/gunzip.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <blk.h>
 #include <command.h>
+#include <compiler.h>
 #include <console.h>
 #include <div64.h>
 #include <gzip.h>
@@ -14,6 +15,7 @@
 #include <malloc.h>
 #include <memalign.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
 #include <watchdog.h>
diff --git a/lib/hashtable.c b/lib/hashtable.c
index c5581800d65..fdc18a06eca 100644
--- a/lib/hashtable.c
+++ b/lib/hashtable.c
@@ -19,6 +19,7 @@
 #include <stdio.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #ifdef USE_HOSTCC		/* HOST build */
 # include <string.h>
diff --git a/lib/hexdump.c b/lib/hexdump.c
index 74940dd0249..7b3fb2c5ca3 100644
--- a/lib/hexdump.c
+++ b/lib/hexdump.c
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <hexdump.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/ctype.h>
@@ -17,6 +18,7 @@
 #include <linux/kernel.h>
 #include <linux/log2.h>
 #include <asm/unaligned.h>
+#include <linux/types.h>
 
 const char hex_asc[] = "0123456789abcdef";
 const char hex_asc_upper[] = "0123456789ABCDEF";
diff --git a/lib/image-sparse.c b/lib/image-sparse.c
index 24741b8d8ec..c57fefbf508 100644
--- a/lib/image-sparse.c
+++ b/lib/image-sparse.c
@@ -46,6 +46,7 @@
 #include <stdio.h>
 #include <asm/cache.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include <linux/math64.h>
 
diff --git a/lib/libavb/avb_sysdeps.h b/lib/libavb/avb_sysdeps.h
index 85ff8e1de3e..4af0a84cf15 100644
--- a/lib/libavb/avb_sysdeps.h
+++ b/lib/libavb/avb_sysdeps.h
@@ -21,6 +21,7 @@ extern "C" {
  */
 #include <common.h>
 #include <stdbool.h>
+#include <linux/types.h>
 
 /* If you don't have gcc or clang, these attribute macros may need to
  * be adjusted.
diff --git a/lib/libavb/avb_sysdeps_posix.c b/lib/libavb/avb_sysdeps_posix.c
index 030d21fc2b9..b08161a0af9 100644
--- a/lib/libavb/avb_sysdeps_posix.c
+++ b/lib/libavb/avb_sysdeps_posix.c
@@ -10,6 +10,7 @@
 #include <stdlib.h>
 #include <vsprintf.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "avb_sysdeps.h"
 
diff --git a/lib/linux_compat.c b/lib/linux_compat.c
index 8b9b562f98e..b70290d7fda 100644
--- a/lib/linux_compat.c
+++ b/lib/linux_compat.c
@@ -5,6 +5,7 @@
 #include <asm/cache.h>
 #include <linux/compat.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 struct p_current cur = {
 	.pid = 1,
diff --git a/lib/linux_string.c b/lib/linux_string.c
index d5a5e08d98c..ee6a5856a2f 100644
--- a/lib/linux_string.c
+++ b/lib/linux_string.c
@@ -10,6 +10,7 @@
 
 #include <linux/ctype.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /**
  * skip_spaces - Removes leading whitespace from @str.
diff --git a/lib/lmb.c b/lib/lmb.c
index 4568adb1a95..e9a946e5659 100644
--- a/lib/lmb.c
+++ b/lib/lmb.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <image.h>
 #include <lmb.h>
 #include <log.h>
@@ -14,6 +15,7 @@
 #include <stdio.h>
 #include <asm/u-boot.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #define LMB_ALLOC_ANYWHERE	0
 
diff --git a/lib/lz4.c b/lib/lz4.c
index e803c087a26..628909a059c 100644
--- a/lib/lz4.c
+++ b/lib/lz4.c
@@ -9,6 +9,7 @@
 */
 
 #include <linux/string.h>
+#include <linux/types.h>
 
 /**************************************
 *  Reading and writing into memory
diff --git a/lib/lzma/LzmaDec.c b/lib/lzma/LzmaDec.c
index 4f45f80fe26..cc400b6826e 100644
--- a/lib/lzma/LzmaDec.c
+++ b/lib/lzma/LzmaDec.c
@@ -4,6 +4,7 @@
 #include <config.h>
 #include <common.h>
 #include <watchdog.h>
+#include <linux/types.h>
 #include "LzmaDec.h"
 
 #include <linux/string.h>
diff --git a/lib/lzma/LzmaTools.c b/lib/lzma/LzmaTools.c
index 5ce03bbbb75..8cb61c056ef 100644
--- a/lib/lzma/LzmaTools.c
+++ b/lib/lzma/LzmaTools.c
@@ -22,6 +22,7 @@
 #include <log.h>
 #include <watchdog.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_LZMA
 
diff --git a/lib/lzma/Types.h b/lib/lzma/Types.h
index 8afcba556eb..04d85e1d4fe 100644
--- a/lib/lzma/Types.h
+++ b/lib/lzma/Types.h
@@ -5,6 +5,7 @@
 #define __7Z_TYPES_H
 
 #include <stddef.h>
+#include <linux/types.h>
 
 #ifdef _WIN32
 #include <windows.h>
diff --git a/lib/lzo/lzo1x_decompress.c b/lib/lzo/lzo1x_decompress.c
index 393f31566bd..ca38a3e5956 100644
--- a/lib/lzo/lzo1x_decompress.c
+++ b/lib/lzo/lzo1x_decompress.c
@@ -18,6 +18,7 @@
 #include <asm/byteorder.h>
 #include <asm/unaligned.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "lzodefs.h"
 
 #define HAVE_IP(x, ip_end, ip) ((size_t)(ip_end - ip) < (x))
diff --git a/lib/lzo/lzodefs.h b/lib/lzo/lzodefs.h
index b6d482c492e..c73bb717474 100644
--- a/lib/lzo/lzodefs.h
+++ b/lib/lzo/lzodefs.h
@@ -11,6 +11,7 @@
  *  Richard Purdie <rpurdie@openedhand.com>
  */
 
+#include <linux/types.h>
 #define LZO_VERSION		0x2020
 #define LZO_VERSION_STRING	"2.02"
 #define LZO_VERSION_DATE	"Oct 17 2005"
diff --git a/lib/membuff.c b/lib/membuff.c
index 94f6e25e826..b5a271bb810 100644
--- a/lib/membuff.c
+++ b/lib/membuff.c
@@ -10,9 +10,11 @@
 #include <errno.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "membuff.h"
 
 void membuff_purge(struct membuff *mb)
diff --git a/lib/net_utils.c b/lib/net_utils.c
index eb2d52e849b..3df5a1097a1 100644
--- a/lib/net_utils.c
+++ b/lib/net_utils.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <net.h>
 #include <vsprintf.h>
+#include <linux/types.h>
 
 struct in_addr string_to_ip(const char *s)
 {
diff --git a/lib/of_live.c b/lib/of_live.c
index 208f6ada571..d2b3f3bf772 100644
--- a/lib/of_live.c
+++ b/lib/of_live.c
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdbool.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/libfdt.h>
@@ -18,6 +19,7 @@
 #include <dm/of_access.h>
 #include <linux/err.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static void *unflatten_dt_alloc(void **mem, unsigned long size,
 				unsigned long align)
diff --git a/lib/oid_registry.c b/lib/oid_registry.c
index 5846030ac13..779c28e7aca 100644
--- a/lib/oid_registry.c
+++ b/lib/oid_registry.c
@@ -8,6 +8,7 @@
 #ifdef __UBOOT__
 #include <vsprintf.h>
 #include <linux/compat.h>
+#include <linux/types.h>
 #else
 #include <linux/module.h>
 #include <linux/export.h>
diff --git a/lib/optee/optee.c b/lib/optee/optee.c
index 8493ca6c621..8377ff6f5bd 100644
--- a/lib/optee/optee.c
+++ b/lib/optee/optee.c
@@ -13,6 +13,7 @@
 #include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <tee/optee.h>
 
 #define optee_hdr_err_msg \
diff --git a/lib/physmem.c b/lib/physmem.c
index 43f034766ab..80bbc5ef5d1 100644
--- a/lib/physmem.c
+++ b/lib/physmem.c
@@ -9,11 +9,13 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <log.h>
 #include <mapmem.h>
 #include <physmem.h>
 #include <linux/compiler.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 phys_addr_t __weak arch_phys_memset(phys_addr_t s, int c, phys_size_t n)
 {
diff --git a/lib/rsa/rsa-checksum.c b/lib/rsa/rsa-checksum.c
index e60debb7df3..2e7f8c4a176 100644
--- a/lib/rsa/rsa-checksum.c
+++ b/lib/rsa/rsa-checksum.c
@@ -10,6 +10,7 @@
 #include <linux/errno.h>
 #include <asm/unaligned.h>
 #include <hash.h>
+#include <linux/types.h>
 #else
 #include "fdt_host.h"
 #endif
diff --git a/lib/rsa/rsa-keyprop.c b/lib/rsa/rsa-keyprop.c
index e5ece615245..e0347615f76 100644
--- a/lib/rsa/rsa-keyprop.c
+++ b/lib/rsa/rsa-keyprop.c
@@ -16,6 +16,7 @@
 #include <crypto/internal/rsa.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <u-boot/rsa-mod-exp.h>
 
 /**
diff --git a/lib/rsa/rsa-mod-exp.c b/lib/rsa/rsa-mod-exp.c
index d8cd3ecd88d..0f87bd3ac05 100644
--- a/lib/rsa/rsa-mod-exp.c
+++ b/lib/rsa/rsa-mod-exp.c
@@ -13,6 +13,7 @@
 #include <asm/types.h>
 #include <asm/unaligned.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #else
 #include "fdt_host.h"
 #include "mkimage.h"
diff --git a/lib/rsa/rsa-verify.c b/lib/rsa/rsa-verify.c
index c894e7a6b9b..d5eb2e92ec0 100644
--- a/lib/rsa/rsa-verify.c
+++ b/lib/rsa/rsa-verify.c
@@ -17,6 +17,7 @@
 #include <asm/unaligned.h>
 #include <dm.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #else
 #include "fdt_host.h"
 #include "mkimage.h"
diff --git a/lib/sha1.c b/lib/sha1.c
index 8154e1e1350..bc77828df3f 100644
--- a/lib/sha1.c
+++ b/lib/sha1.c
@@ -19,6 +19,7 @@
 #ifndef USE_HOSTCC
 #include <common.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #else
 #include <string.h>
 #endif /* USE_HOSTCC */
diff --git a/lib/sha256.c b/lib/sha256.c
index c1fe93de012..53ab648155b 100644
--- a/lib/sha256.c
+++ b/lib/sha256.c
@@ -8,6 +8,7 @@
 #ifndef USE_HOSTCC
 #include <common.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #else
 #include <string.h>
 #endif /* USE_HOSTCC */
diff --git a/lib/sha512.c b/lib/sha512.c
index f1e2acf0fbc..e18fd78519a 100644
--- a/lib/sha512.c
+++ b/lib/sha512.c
@@ -13,6 +13,7 @@
 #ifndef USE_HOSTCC
 #include <common.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #else
 #include <string.h>
 #endif /* USE_HOSTCC */
diff --git a/lib/smbios.c b/lib/smbios.c
index 73cd07b599e..8a133fec68e 100644
--- a/lib/smbios.c
+++ b/lib/smbios.c
@@ -19,6 +19,7 @@
 #endif
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /**
  * smbios_add_string() - add a string to the string area
diff --git a/lib/strto.c b/lib/strto.c
index 9636c797ea5..3c5b099b992 100644
--- a/lib/strto.c
+++ b/lib/strto.c
@@ -15,6 +15,7 @@
 #include <linux/ctype.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /* from lib/kstrtox.c */
 static const char *_parse_integer_fixup_radix(const char *s, unsigned int *base)
diff --git a/lib/tables_csum.c b/lib/tables_csum.c
index e2630d57d91..4b8470230a7 100644
--- a/lib/tables_csum.c
+++ b/lib/tables_csum.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <asm/types.h>
 #include <linux/ctype.h>
 
 u8 table_compute_checksum(void *v, int len)
diff --git a/lib/time.c b/lib/time.c
index 733beb7dcc2..bbda9f421ac 100644
--- a/lib/time.c
+++ b/lib/time.c
@@ -17,6 +17,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 #ifndef CONFIG_WD_PERIOD
 # define CONFIG_WD_PERIOD	(10 * 1000 * 1000)	/* 10 seconds default */
diff --git a/lib/tiny-printf.c b/lib/tiny-printf.c
index 9e16f535063..6acfd100829 100644
--- a/lib/tiny-printf.c
+++ b/lib/tiny-printf.c
@@ -15,6 +15,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/ctype.h>
+#include <linux/types.h>
 
 struct printf_info {
 	char *bf;	/* Digit buffer */
diff --git a/lib/tizen/tizen.c b/lib/tizen/tizen.c
index 916b2597569..03b2f6235a1 100644
--- a/lib/tizen/tizen.c
+++ b/lib/tizen/tizen.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <lcd.h>
 #include <libtizen.h>
+#include <linux/types.h>
 
 #include "tizen_logo_16bpp.h"
 #include "tizen_logo_16bpp_gzip.h"
diff --git a/lib/tpm-common.c b/lib/tpm-common.c
index 93bcab46112..10d4164f581 100644
--- a/lib/tpm-common.c
+++ b/lib/tpm-common.c
@@ -14,6 +14,7 @@
 #include <asm/unaligned.h>
 #include <tpm-common.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "tpm-utils.h"
 
 enum tpm_version tpm_get_version(struct udevice *dev)
diff --git a/lib/tpm-utils.h b/lib/tpm-utils.h
index d680d140884..656886fa949 100644
--- a/lib/tpm-utils.h
+++ b/lib/tpm-utils.h
@@ -7,6 +7,7 @@
 #ifndef __TPM_UTILS_H
 #define __TPM_UTILS_H
 
+#include <linux/types.h>
 #define COMMAND_BUFFER_SIZE 256
 
 /* Internal error of TPM command library */
diff --git a/lib/tpm-v1.c b/lib/tpm-v1.c
index c3f9dde9e86..772111e97db 100644
--- a/lib/tpm-v1.c
+++ b/lib/tpm-v1.c
@@ -12,6 +12,7 @@
 #include <asm/unaligned.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <u-boot/sha1.h>
 #include <tpm-common.h>
 #include <tpm-v1.h>
diff --git a/lib/tpm-v2.c b/lib/tpm-v2.c
index d278acfb436..bb868f20e56 100644
--- a/lib/tpm-v2.c
+++ b/lib/tpm-v2.c
@@ -11,6 +11,7 @@
 #include <linux/bitops.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "tpm-utils.h"
 
 u32 tpm2_startup(struct udevice *dev, enum tpm2_startup_types mode)
diff --git a/lib/trace.c b/lib/trace.c
index 8f666133caa..30bf819e7fc 100644
--- a/lib/trace.c
+++ b/lib/trace.c
@@ -15,6 +15,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/lib/uuid.c b/lib/uuid.c
index 3111318808c..d6b1f69a61d 100644
--- a/lib/uuid.c
+++ b/lib/uuid.c
@@ -20,6 +20,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /*
  * UUID - Universally Unique IDentifier - 128 bits unique number.
diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index c8f663cf4da..80cfdebbc50 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -19,6 +19,7 @@
 #include <div64.h>
 #include <hexdump.h>
 #include <stdarg.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <uuid.h>
 #include <vsprintf.h>
diff --git a/lib/xxhash.c b/lib/xxhash.c
index 2fb4dc6d02b..1f54d75381c 100644
--- a/lib/xxhash.c
+++ b/lib/xxhash.c
@@ -14,6 +14,7 @@
 #include <linux/kernel.h>
 #include <linux/compat.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <linux/xxhash.h>
 
 /*-*************************************
diff --git a/lib/zstd/zstd_opt.h b/lib/zstd/zstd_opt.h
index 25f78bdba24..0fbe8ec1294 100644
--- a/lib/zstd/zstd_opt.h
+++ b/lib/zstd/zstd_opt.h
@@ -10,6 +10,7 @@
 #define ZSTD_OPT_H_91842398743
 
 #include <linux/string.h>
+#include <linux/types.h>
 #define ZSTD_LITFREQ_ADD 2
 #define ZSTD_FREQ_DIV 4
 #define ZSTD_MAX_PRICE (1 << 30)
diff --git a/net/arp.c b/net/arp.c
index aaf5d3c27fd..95b1c0fbf0a 100644
--- a/net/arp.c
+++ b/net/arp.c
@@ -19,6 +19,7 @@
 #include <vsprintf.h>
 #include <linux/delay.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "arp.h"
 
diff --git a/net/arp.h b/net/arp.h
index 25b3c00d5c5..b5544783f76 100644
--- a/net/arp.h
+++ b/net/arp.h
@@ -13,6 +13,7 @@
 #define __ARP_H__
 
 #include <common.h>
+#include <linux/types.h>
 
 extern struct in_addr net_arp_wait_packet_ip;
 /* MAC address of waiting packet's destination */
diff --git a/net/bootp.c b/net/bootp.c
index 6fde55fe862..582755b2cae 100644
--- a/net/bootp.c
+++ b/net/bootp.c
@@ -16,6 +16,7 @@
 #include <log.h>
 #include <net.h>
 #include <rand.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <uuid.h>
@@ -23,6 +24,7 @@
 #include <linux/delay.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <net/tftp.h>
 #include "bootp.h"
 #ifdef CONFIG_LED_STATUS
diff --git a/net/bootp.h b/net/bootp.h
index 567340ec5d4..99ed7dfe994 100644
--- a/net/bootp.h
+++ b/net/bootp.h
@@ -25,6 +25,7 @@
 extern u8 *dhcp_vendorex_prep(u8 *e); /*rtn new e after add own opts. */
 extern u8 *dhcp_vendorex_proc(u8 *e); /*rtn next e if mine,else NULL  */
 #endif
+#include <asm/types.h>
 #else
 #define OPT_FIELD_SIZE 64
 #endif
diff --git a/net/cdp.c b/net/cdp.c
index ffb91a64900..98ac9782795 100644
--- a/net/cdp.c
+++ b/net/cdp.c
@@ -17,6 +17,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "cdp.h"
 
diff --git a/net/cdp.h b/net/cdp.h
index 16ccbf4b59e..476c9bf17a7 100644
--- a/net/cdp.h
+++ b/net/cdp.h
@@ -14,6 +14,7 @@
 #ifndef __CDP_H__
 #define __CDP_H__
 
+#include <linux/types.h>
 void cdp_start(void);
 /* Process a received CDP packet */
 void cdp_receive(const uchar *pkt, unsigned len);
diff --git a/net/dns.c b/net/dns.c
index c86e519c3c7..e27cf256e08 100644
--- a/net/dns.c
+++ b/net/dns.c
@@ -31,6 +31,7 @@
 #include <time.h>
 #include <asm/unaligned.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "dns.h"
 
diff --git a/net/dns.h b/net/dns.h
index 79ac76f590d..755b5c1805b 100644
--- a/net/dns.h
+++ b/net/dns.h
@@ -7,6 +7,7 @@
 #ifndef __DNS_H__
 #define __DNS_H__
 
+#include <linux/types.h>
 #define DNS_SERVICE_PORT 53
 #define DNS_TIMEOUT      10000UL
 
diff --git a/net/eth-uclass.c b/net/eth-uclass.c
index 05f35cdfb5f..4ace57fefe7 100644
--- a/net/eth-uclass.c
+++ b/net/eth-uclass.c
@@ -19,6 +19,7 @@
 #include <dm/uclass-internal.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <net/pcap.h>
 #include "eth_internal.h"
 #include <eth_phy.h>
diff --git a/net/eth_common.c b/net/eth_common.c
index 5e8276b9bce..822c6440379 100644
--- a/net/eth_common.c
+++ b/net/eth_common.c
@@ -13,6 +13,7 @@
 #include <net.h>
 #include <vsprintf.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "eth_internal.h"
 
 int eth_env_get_enetaddr_by_index(const char *base_name, int index,
diff --git a/net/eth_internal.h b/net/eth_internal.h
index faff0ef8667..444629cdd8d 100644
--- a/net/eth_internal.h
+++ b/net/eth_internal.h
@@ -9,6 +9,7 @@
 #define __ETH_INTERNAL_H
 
 /* Do init that is common to driver model and legacy networking */
+#include <linux/types.h>
 void eth_common_init(void);
 
 /**
diff --git a/net/eth_legacy.c b/net/eth_legacy.c
index c5522f974c7..2d4aa3f628a 100644
--- a/net/eth_legacy.c
+++ b/net/eth_legacy.c
@@ -20,6 +20,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <net/pcap.h>
 #include "eth_internal.h"
 
diff --git a/net/fastboot.c b/net/fastboot.c
index b6006ddd2a9..d23a225d43d 100644
--- a/net/fastboot.c
+++ b/net/fastboot.c
@@ -5,13 +5,16 @@
 
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <fastboot.h>
 #include <net.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <net/fastboot.h>
 
 /* Fastboot port # defined in spec */
diff --git a/net/mdio-mux-uclass.c b/net/mdio-mux-uclass.c
index 5766c33ebbd..ec4e9bbfc64 100644
--- a/net/mdio-mux-uclass.c
+++ b/net/mdio-mux-uclass.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <miiphy.h>
 #include <stdbool.h>
+#include <asm/types.h>
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
 #include <dm/lists.h>
diff --git a/net/mdio-uclass.c b/net/mdio-uclass.c
index 3e39a9b74f8..3e241057ca1 100644
--- a/net/mdio-uclass.c
+++ b/net/mdio-uclass.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <miiphy.h>
+#include <asm/types.h>
 #include <dm/device-internal.h>
 #include <dm/device_compat.h>
 #include <dm/uclass-internal.h>
diff --git a/net/net.c b/net/net.c
index 1689f00c002..43cc81555d9 100644
--- a/net/net.c
+++ b/net/net.c
@@ -103,6 +103,7 @@
 #include <vsprintf.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <net/fastboot.h>
 #include <net/tftp.h>
 #if defined(CONFIG_CMD_PCAP)
diff --git a/net/nfs.c b/net/nfs.c
index 76ff7d32e0b..7c305de325d 100644
--- a/net/nfs.c
+++ b/net/nfs.c
@@ -9,6 +9,7 @@
  * large portions are copied verbatim) as distributed in OSKit 0.97.  A few
  * changes were necessary to adapt the code to Etherboot and to fix several
  * inconsistencies.  Also the RPC message preparation is done "by hand" to
+#include <linux/types.h>
  * avoid adding netsprintf() which I find hard to understand and use.  */
 
 /* NOTE 2: Etherboot does not care about things beyond the kernel image, so
diff --git a/net/nfs.h b/net/nfs.h
index 68ada0efeb9..8a2d443677e 100644
--- a/net/nfs.h
+++ b/net/nfs.h
@@ -6,6 +6,7 @@
 #ifndef __NFS_H__
 #define __NFS_H__
 
+#include <linux/types.h>
 #define SUNRPC_PORT     111
 
 #define PROG_PORTMAP    100000
diff --git a/net/pcap.c b/net/pcap.c
index 4ddc55801d7..da2903b80f8 100644
--- a/net/pcap.c
+++ b/net/pcap.c
@@ -9,6 +9,7 @@
 #include <stdio.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <net/pcap.h>
 #include <time.h>
 #include <asm/io.h>
diff --git a/net/rarp.c b/net/rarp.c
index 28abc8a4bcf..cdbdb73835b 100644
--- a/net/rarp.c
+++ b/net/rarp.c
@@ -10,6 +10,7 @@
 #include <net.h>
 #include <stdio.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <net/tftp.h>
 #include "nfs.h"
 #include "bootp.h"
diff --git a/net/sntp.c b/net/sntp.c
index 9968984eece..11df1db6a10 100644
--- a/net/sntp.c
+++ b/net/sntp.c
@@ -14,6 +14,7 @@
 #include <stdio.h>
 #include <time.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "sntp.h"
 
diff --git a/net/sntp.h b/net/sntp.h
index d3cbfbc69a6..613d7a87b22 100644
--- a/net/sntp.h
+++ b/net/sntp.h
@@ -6,6 +6,7 @@
 #ifndef __SNTP_H__
 #define __SNTP_H__
 
+#include <linux/types.h>
 #define NTP_SERVICE_PORT	123
 #define SNTP_PACKET_LEN		48
 
diff --git a/net/tftp.c b/net/tftp.c
index be1ff2cd9d4..949d1227f38 100644
--- a/net/tftp.c
+++ b/net/tftp.c
@@ -16,12 +16,14 @@
 #include <log.h>
 #include <mapmem.h>
 #include <net.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <net/tftp.h>
 #include "bootp.h"
 #ifdef CONFIG_SYS_DIRECT_FLASH_TFTP
diff --git a/net/wol.c b/net/wol.c
index e985f4adc59..9a008c84974 100644
--- a/net/wol.c
+++ b/net/wol.c
@@ -8,6 +8,7 @@
 #include <env.h>
 #include <net.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "wol.h"
 
 static ulong wol_timeout = WOL_DEFAULT_TIMEOUT;
diff --git a/net/wol.h b/net/wol.h
index ebc81f24b6e..828f65367ac 100644
--- a/net/wol.h
+++ b/net/wol.h
@@ -15,6 +15,7 @@
 #define __WOL_H__
 
 #include <net.h>
+#include <linux/types.h>
 
 /**********************************************************************/
 
diff --git a/post/cpu/mpc83xx/ecc.c b/post/cpu/mpc83xx/ecc.c
index 2d2849ee4f1..a6e1dbad7a9 100644
--- a/post/cpu/mpc83xx/ecc.c
+++ b/post/cpu/mpc83xx/ecc.c
@@ -17,6 +17,7 @@
 #include <watchdog.h>
 #include <asm/io.h>
 #include <post.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 
 #if CONFIG_POST & CONFIG_SYS_POST_ECC
diff --git a/post/drivers/flash.c b/post/drivers/flash.c
index 721d48eb6b3..d1af27c654f 100644
--- a/post/drivers/flash.c
+++ b/post/drivers/flash.c
@@ -12,6 +12,7 @@
 #include <flash.h>
 #include <stdio.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #if CONFIG_POST & CONFIG_SYS_POST_FLASH
 
diff --git a/post/drivers/memory.c b/post/drivers/memory.c
index e8cded75223..19695276be4 100644
--- a/post/drivers/memory.c
+++ b/post/drivers/memory.c
@@ -9,6 +9,7 @@
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 /* Memory test
  *
diff --git a/post/drivers/rtc.c b/post/drivers/rtc.c
index 7f14670317c..dbdccacf270 100644
--- a/post/drivers/rtc.c
+++ b/post/drivers/rtc.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <time.h>
+#include <linux/types.h>
 
 /*
  * RTC test
diff --git a/post/lib_powerpc/andi.c b/post/lib_powerpc/andi.c
index cea61eb87a6..e2abcaead7b 100644
--- a/post/lib_powerpc/andi.c
+++ b/post/lib_powerpc/andi.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <irq_func.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 /*
  * CPU test
diff --git a/post/lib_powerpc/b.c b/post/lib_powerpc/b.c
index 0b02e9169e2..dba7098f30a 100644
--- a/post/lib_powerpc/b.c
+++ b/post/lib_powerpc/b.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <irq_func.h>
+#include <linux/types.h>
 
 /*
  * CPU test
diff --git a/post/lib_powerpc/cmp.c b/post/lib_powerpc/cmp.c
index bcfd1892991..508b9c08ae4 100644
--- a/post/lib_powerpc/cmp.c
+++ b/post/lib_powerpc/cmp.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <irq_func.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 /*
  * CPU test
diff --git a/post/lib_powerpc/cmpi.c b/post/lib_powerpc/cmpi.c
index 29a65895306..938c7f82698 100644
--- a/post/lib_powerpc/cmpi.c
+++ b/post/lib_powerpc/cmpi.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <irq_func.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 /*
  * CPU test
diff --git a/post/lib_powerpc/cpu.c b/post/lib_powerpc/cpu.c
index 8506fd6b715..a4b31aaa8e4 100644
--- a/post/lib_powerpc/cpu.c
+++ b/post/lib_powerpc/cpu.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <cpu_func.h>
+#include <linux/types.h>
 
 /*
  * CPU test
diff --git a/post/lib_powerpc/cr.c b/post/lib_powerpc/cr.c
index 1c1c1e3700b..370aacc6350 100644
--- a/post/lib_powerpc/cr.c
+++ b/post/lib_powerpc/cr.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <irq_func.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 /*
  * CPU test
diff --git a/post/lib_powerpc/load.c b/post/lib_powerpc/load.c
index 19f88d07d7f..589ac587bbf 100644
--- a/post/lib_powerpc/load.c
+++ b/post/lib_powerpc/load.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <irq_func.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 /*
  * CPU test
diff --git a/post/lib_powerpc/multi.c b/post/lib_powerpc/multi.c
index 29c102d70ee..c361357f424 100644
--- a/post/lib_powerpc/multi.c
+++ b/post/lib_powerpc/multi.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /*
  * CPU test
diff --git a/post/lib_powerpc/rlwimi.c b/post/lib_powerpc/rlwimi.c
index be63f960ed6..4d3b89c4fc0 100644
--- a/post/lib_powerpc/rlwimi.c
+++ b/post/lib_powerpc/rlwimi.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <irq_func.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 /*
  * CPU test
diff --git a/post/lib_powerpc/rlwinm.c b/post/lib_powerpc/rlwinm.c
index 13577f858e1..7c2f61cb0c7 100644
--- a/post/lib_powerpc/rlwinm.c
+++ b/post/lib_powerpc/rlwinm.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <irq_func.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 /*
  * CPU test
diff --git a/post/lib_powerpc/rlwnm.c b/post/lib_powerpc/rlwnm.c
index 2a3525466c3..be2fcf9350c 100644
--- a/post/lib_powerpc/rlwnm.c
+++ b/post/lib_powerpc/rlwnm.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <irq_func.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 /*
  * CPU test
diff --git a/post/lib_powerpc/srawi.c b/post/lib_powerpc/srawi.c
index 22a747b63ea..1508a77fc73 100644
--- a/post/lib_powerpc/srawi.c
+++ b/post/lib_powerpc/srawi.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <irq_func.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 /*
  * CPU test
diff --git a/post/lib_powerpc/store.c b/post/lib_powerpc/store.c
index a8bf67ea9e2..c9d872675ff 100644
--- a/post/lib_powerpc/store.c
+++ b/post/lib_powerpc/store.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <irq_func.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 /*
  * CPU test
diff --git a/post/lib_powerpc/string.c b/post/lib_powerpc/string.c
index c292f8f0f8e..b779faffbf6 100644
--- a/post/lib_powerpc/string.c
+++ b/post/lib_powerpc/string.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <irq_func.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /*
  * CPU test
diff --git a/post/lib_powerpc/three.c b/post/lib_powerpc/three.c
index a4f7262698c..382a8183563 100644
--- a/post/lib_powerpc/three.c
+++ b/post/lib_powerpc/three.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <irq_func.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 /*
  * CPU test
diff --git a/post/lib_powerpc/threei.c b/post/lib_powerpc/threei.c
index 74d6a3f2999..184ccaa1854 100644
--- a/post/lib_powerpc/threei.c
+++ b/post/lib_powerpc/threei.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <irq_func.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 /*
  * CPU test
diff --git a/post/lib_powerpc/threex.c b/post/lib_powerpc/threex.c
index e8c6959bf90..153639c8abe 100644
--- a/post/lib_powerpc/threex.c
+++ b/post/lib_powerpc/threex.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <irq_func.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 /*
  * CPU test
diff --git a/post/lib_powerpc/two.c b/post/lib_powerpc/two.c
index a576452f6f2..d0a70077fbb 100644
--- a/post/lib_powerpc/two.c
+++ b/post/lib_powerpc/two.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <irq_func.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 /*
  * CPU test
diff --git a/post/lib_powerpc/twox.c b/post/lib_powerpc/twox.c
index 4e53fff2774..934352bacd7 100644
--- a/post/lib_powerpc/twox.c
+++ b/post/lib_powerpc/twox.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <irq_func.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 /*
  * CPU test
diff --git a/post/post.c b/post/post.c
index 758e4ecba19..d86be8d5826 100644
--- a/post/post.c
+++ b/post/post.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <bootstage.h>
+#include <compiler.h>
 #include <env.h>
 #include <log.h>
 #include <malloc.h>
@@ -20,6 +21,7 @@
 #include <asm/global_data.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_SYS_POST_HOTKEYS_GPIO
 #include <asm/gpio.h>
diff --git a/test/bloblist.c b/test/bloblist.c
index fed3e60d211..474d953625b 100644
--- a/test/bloblist.c
+++ b/test/bloblist.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <mapmem.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <test/suites.h>
diff --git a/test/cmd/mem_search.c b/test/cmd/mem_search.c
index d57bfad3982..b16533248f5 100644
--- a/test/cmd/mem_search.c
+++ b/test/cmd/mem_search.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <console.h>
 #include <mapmem.h>
+#include <asm/types.h>
 #include <dm/test.h>
 #include <test/ut.h>
 
diff --git a/test/compression.c b/test/compression.c
index 4fc7b07fece..63bc09d8167 100644
--- a/test/compression.c
+++ b/test/compression.c
@@ -14,6 +14,7 @@
 #include <mapmem.h>
 #include <stdio.h>
 #include <asm/io.h>
+#include <linux/types.h>
 
 #include <u-boot/zlib.h>
 #include <bzlib.h>
diff --git a/test/dm/acpi.c b/test/dm/acpi.c
index aebaea81df2..f3c0c790ed1 100644
--- a/test/dm/acpi.c
+++ b/test/dm/acpi.c
@@ -11,6 +11,7 @@
 #include <dm.h>
 #include <malloc.h>
 #include <mapmem.h>
+#include <stdbool.h>
 #include <version.h>
 #include <tables_csum.h>
 #include <version.h>
@@ -22,6 +23,7 @@
 #include <dm/test.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include <test/ut.h>
 #include "acpi.h"
 
diff --git a/test/dm/acpi.h b/test/dm/acpi.h
index 535db56b51e..efb608354fc 100644
--- a/test/dm/acpi.h
+++ b/test/dm/acpi.h
@@ -9,6 +9,7 @@
 #ifndef __TEST_DM_ACPI_H
 #define __TEST_DM_ACPI_H
 
+#include <asm/types.h>
 #define ACPI_TEST_DEV_NAME	"ABCD"
 #define ACPI_TEST_CHILD_NAME	"EFGH"
 
diff --git a/test/dm/acpi_dp.c b/test/dm/acpi_dp.c
index ce9c5e9abb0..08edd0e76d1 100644
--- a/test/dm/acpi_dp.c
+++ b/test/dm/acpi_dp.c
@@ -16,6 +16,7 @@
 #include <dm/test.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include <test/ut.h>
 #include "acpi.h"
 
diff --git a/test/dm/acpigen.c b/test/dm/acpigen.c
index 8c9afe82194..a6cb6115ee8 100644
--- a/test/dm/acpigen.c
+++ b/test/dm/acpigen.c
@@ -20,6 +20,7 @@
 #include <dm/uclass-internal.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include <test/ut.h>
 #include "acpi.h"
 
diff --git a/test/dm/audio.c b/test/dm/audio.c
index 77c3a3625bd..efb09d39ffc 100644
--- a/test/dm/audio.c
+++ b/test/dm/audio.c
@@ -8,6 +8,7 @@
 #include <audio_codec.h>
 #include <dm.h>
 #include <dm/test.h>
+#include <linux/types.h>
 #include <test/ut.h>
 #include <asm/test.h>
 
diff --git a/test/dm/axi.c b/test/dm/axi.c
index 0706a733b74..ab99e97c6f5 100644
--- a/test/dm/axi.c
+++ b/test/dm/axi.c
@@ -8,6 +8,7 @@
 #include <axi.h>
 #include <dm.h>
 #include <log.h>
+#include <asm/types.h>
 #include <dm/test.h>
 #include <linux/kernel.h>
 #include <test/ut.h>
diff --git a/test/dm/bootcount.c b/test/dm/bootcount.c
index be0c2789070..4d49119e1ff 100644
--- a/test/dm/bootcount.c
+++ b/test/dm/bootcount.c
@@ -8,6 +8,7 @@
 #include <bootcount.h>
 #include <log.h>
 #include <asm/test.h>
+#include <asm/types.h>
 #include <dm/test.h>
 #include <test/ut.h>
 
diff --git a/test/dm/clk.c b/test/dm/clk.c
index 48fc3dd714c..35afa577a43 100644
--- a/test/dm/clk.c
+++ b/test/dm/clk.c
@@ -12,6 +12,7 @@
 #include <dm/test.h>
 #include <dm/device-internal.h>
 #include <linux/err.h>
+#include <linux/types.h>
 #include <test/ut.h>
 
 /* Base test of the clk uclass */
diff --git a/test/dm/core.c b/test/dm/core.c
index 461098c0a2a..92e4b28ca76 100644
--- a/test/dm/core.c
+++ b/test/dm/core.c
@@ -20,6 +20,7 @@
 #include <dm/uclass-internal.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include <test/ut.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/test/dm/devres.c b/test/dm/devres.c
index 550787495dc..dd104679f07 100644
--- a/test/dm/devres.c
+++ b/test/dm/devres.c
@@ -14,6 +14,7 @@
 #include <dm/devres.h>
 #include <dm/test.h>
 #include <dm/uclass-internal.h>
+#include <linux/types.h>
 #include <test/ut.h>
 
 /* Test that devm_kmalloc() allocates memory, free when device is removed */
diff --git a/test/dm/dma.c b/test/dm/dma.c
index 317ed4fe8c6..22767f61834 100644
--- a/test/dm/dma.c
+++ b/test/dm/dma.c
@@ -11,6 +11,7 @@
 #include <malloc.h>
 #include <dm/test.h>
 #include <dma.h>
+#include <linux/types.h>
 #include <test/ut.h>
 
 static int dm_test_dma_m2m(struct unit_test_state *uts)
diff --git a/test/dm/dsi_host.c b/test/dm/dsi_host.c
index 59fcd5558f0..77aa989fe94 100644
--- a/test/dm/dsi_host.c
+++ b/test/dm/dsi_host.c
@@ -9,6 +9,7 @@
 #include <dsi_host.h>
 #include <asm/state.h>
 #include <asm/test.h>
+#include <asm/types.h>
 #include <dm/test.h>
 #include <test/ut.h>
 
diff --git a/test/dm/fdtdec.c b/test/dm/fdtdec.c
index f835240de76..eee938ea81b 100644
--- a/test/dm/fdtdec.c
+++ b/test/dm/fdtdec.c
@@ -8,6 +8,7 @@
 #include <asm/global_data.h>
 #include <dm/of_extra.h>
 #include <dm/test.h>
+#include <linux/types.h>
 #include <test/ut.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/test/dm/gpio.c b/test/dm/gpio.c
index 7972e6aba67..cd2ba954d95 100644
--- a/test/dm/gpio.c
+++ b/test/dm/gpio.c
@@ -15,6 +15,7 @@
 #include <asm/gpio.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include <test/ut.h>
 
 /* Test that sandbox GPIOs work correctly */
diff --git a/test/dm/i2c.c b/test/dm/i2c.c
index fc54c7323c3..b074b37c767 100644
--- a/test/dm/i2c.c
+++ b/test/dm/i2c.c
@@ -17,6 +17,7 @@
 #include <dm/util.h>
 #include <hexdump.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <test/ut.h>
 
 static const int busnum;
diff --git a/test/dm/i2s.c b/test/dm/i2s.c
index 76d3d34eaa0..5b2d24c980b 100644
--- a/test/dm/i2s.c
+++ b/test/dm/i2s.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <i2s.h>
+#include <asm/types.h>
 #include <dm/test.h>
 #include <linux/kernel.h>
 #include <test/ut.h>
diff --git a/test/dm/k210_pll.c b/test/dm/k210_pll.c
index 076dc770b87..b72fd55883a 100644
--- a/test/dm/k210_pll.c
+++ b/test/dm/k210_pll.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 /* For DIV_ROUND_DOWN_ULL, defined in linux/kernel.h */
diff --git a/test/dm/mailbox.c b/test/dm/mailbox.c
index a511da04d1a..67149b36e4c 100644
--- a/test/dm/mailbox.c
+++ b/test/dm/mailbox.c
@@ -9,6 +9,7 @@
 #include <dm/test.h>
 #include <asm/mbox.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <test/ut.h>
 
 static int dm_test_mailbox(struct unit_test_state *uts)
diff --git a/test/dm/mdio.c b/test/dm/mdio.c
index ba1b54f27e2..9a9c58fa2a3 100644
--- a/test/dm/mdio.c
+++ b/test/dm/mdio.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <asm/types.h>
 #include <dm/test.h>
 #include <misc.h>
 #include <test/ut.h>
diff --git a/test/dm/mdio_mux.c b/test/dm/mdio_mux.c
index f962e09dbc2..732b3fa079e 100644
--- a/test/dm/mdio_mux.c
+++ b/test/dm/mdio_mux.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <asm/types.h>
 #include <dm/test.h>
 #include <misc.h>
 #include <test/ut.h>
diff --git a/test/dm/misc.c b/test/dm/misc.c
index 6fff38e978a..c5a7cc49890 100644
--- a/test/dm/misc.c
+++ b/test/dm/misc.c
@@ -9,6 +9,7 @@
 #include <stdbool.h>
 #include <dm/test.h>
 #include <misc.h>
+#include <linux/types.h>
 #include <test/ut.h>
 
 static int dm_test_misc(struct unit_test_state *uts)
diff --git a/test/dm/ofnode.c b/test/dm/ofnode.c
index 1114f34cbf8..2a07bc6dc47 100644
--- a/test/dm/ofnode.c
+++ b/test/dm/ofnode.c
@@ -3,6 +3,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <asm/types.h>
 #include <dm/of_extra.h>
 #include <dm/test.h>
 #include <test/ut.h>
diff --git a/test/dm/osd.c b/test/dm/osd.c
index e1329349b2c..d1e5b299e57 100644
--- a/test/dm/osd.c
+++ b/test/dm/osd.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <stdio.h>
 #include <dm/test.h>
+#include <linux/types.h>
 #include <test/ut.h>
 #include <video_osd.h>
 #include <asm/test.h>
diff --git a/test/dm/panel.c b/test/dm/panel.c
index 907257042ed..a7d4166cd41 100644
--- a/test/dm/panel.c
+++ b/test/dm/panel.c
@@ -15,6 +15,7 @@
 #include <asm/gpio.h>
 #include <asm/test.h>
 #include <dm/test.h>
+#include <linux/types.h>
 #include <test/ut.h>
 #include <power/regulator.h>
 
diff --git a/test/dm/pch.c b/test/dm/pch.c
index d054723627d..2652ffc0055 100644
--- a/test/dm/pch.c
+++ b/test/dm/pch.c
@@ -9,6 +9,7 @@
 #include <asm/test.h>
 #include <dm/test.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <test/ut.h>
 
 /* Test that sandbox PCH works correctly */
diff --git a/test/dm/pci.c b/test/dm/pci.c
index 41b7adb62ea..68e76aab34f 100644
--- a/test/dm/pci.c
+++ b/test/dm/pci.c
@@ -9,6 +9,7 @@
 #include <asm/test.h>
 #include <asm/u-boot.h>
 #include <dm/test.h>
+#include <linux/types.h>
 #include <test/ut.h>
 
 /* Test that sandbox PCI works correctly */
diff --git a/test/dm/pmic.c b/test/dm/pmic.c
index b582329a9c5..617b1ef18d4 100644
--- a/test/dm/pmic.c
+++ b/test/dm/pmic.c
@@ -16,6 +16,7 @@
 #include <dm/util.h>
 #include <dm/test.h>
 #include <dm/uclass-internal.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/sandbox_pmic.h>
 #include <test/ut.h>
diff --git a/test/dm/power-domain.c b/test/dm/power-domain.c
index 8baf5d09d1d..d24cb3459f0 100644
--- a/test/dm/power-domain.c
+++ b/test/dm/power-domain.c
@@ -8,6 +8,7 @@
 #include <malloc.h>
 #include <dm/test.h>
 #include <asm/power-domain.h>
+#include <linux/types.h>
 #include <test/ut.h>
 
 /* This must match the specifier for power-domains in the DT node */
diff --git a/test/dm/regmap.c b/test/dm/regmap.c
index 92d6bf7be29..c0e2df1b2b8 100644
--- a/test/dm/regmap.c
+++ b/test/dm/regmap.c
@@ -14,6 +14,7 @@
 #include <dm/test.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <test/ut.h>
 
 /* Base test of register maps */
diff --git a/test/dm/regulator.c b/test/dm/regulator.c
index 2d6f88cf04f..7a891ef3584 100644
--- a/test/dm/regulator.c
+++ b/test/dm/regulator.c
@@ -12,6 +12,7 @@
 #include <fdtdec.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <dm/device-internal.h>
 #include <dm/root.h>
 #include <dm/util.h>
diff --git a/test/dm/remoteproc.c b/test/dm/remoteproc.c
index bfeadad8996..480b424b863 100644
--- a/test/dm/remoteproc.c
+++ b/test/dm/remoteproc.c
@@ -12,6 +12,7 @@
 #include <dm/test.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include <test/ut.h>
 /**
  * dm_test_remoteproc_base() - test the operations after initializations
diff --git a/test/dm/reset.c b/test/dm/reset.c
index 871d6400a07..a5a48c8dfc7 100644
--- a/test/dm/reset.c
+++ b/test/dm/reset.c
@@ -10,6 +10,7 @@
 #include <reset.h>
 #include <dm/test.h>
 #include <asm/reset.h>
+#include <linux/types.h>
 #include <test/ut.h>
 
 /* This must match the specifier for mbox-names="test" in the DT node */
diff --git a/test/dm/rtc.c b/test/dm/rtc.c
index 2ef74cd98dd..f0716dff62d 100644
--- a/test/dm/rtc.c
+++ b/test/dm/rtc.c
@@ -15,6 +15,7 @@
 #include <asm/io.h>
 #include <asm/rtc.h>
 #include <asm/test.h>
+#include <asm/types.h>
 #include <dm/test.h>
 #include <linux/errno.h>
 #include <test/ut.h>
diff --git a/test/dm/serial.c b/test/dm/serial.c
index a9ca9689ce8..2f945a8d915 100644
--- a/test/dm/serial.c
+++ b/test/dm/serial.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <dm/test.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <test/ut.h>
 
 static int dm_test_serial(struct unit_test_state *uts)
diff --git a/test/dm/sf.c b/test/dm/sf.c
index 9e7dead684d..8d0b72abcc7 100644
--- a/test/dm/sf.c
+++ b/test/dm/sf.c
@@ -15,6 +15,7 @@
 #include <asm/test.h>
 #include <dm/test.h>
 #include <dm/util.h>
+#include <linux/types.h>
 #include <test/ut.h>
 
 /* Simple test of sandbox SPI flash */
diff --git a/test/dm/smem.c b/test/dm/smem.c
index 4099a5f66c4..ee67dd5096b 100644
--- a/test/dm/smem.c
+++ b/test/dm/smem.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <smem.h>
 #include <dm/test.h>
+#include <linux/types.h>
 #include <test/ut.h>
 
 /* Basic test of the smem uclass */
diff --git a/test/dm/syscon-reset.c b/test/dm/syscon-reset.c
index 85ac3d8ade0..97db10e6c68 100644
--- a/test/dm/syscon-reset.c
+++ b/test/dm/syscon-reset.c
@@ -10,6 +10,7 @@
 #include <reset.h>
 #include <syscon.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <test/ut.h>
 #include <asm/test.h>
 #include <linux/bitops.h>
diff --git a/test/dm/tee.c b/test/dm/tee.c
index 4a55ab287c4..9f93b38c1f6 100644
--- a/test/dm/tee.c
+++ b/test/dm/tee.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <log.h>
 #include <malloc.h>
+#include <asm/types.h>
 #include <dm/test.h>
 #include <sandboxtee.h>
 #include <tee.h>
diff --git a/test/dm/test-fdt.c b/test/dm/test-fdt.c
index 180a8c93f02..73324b4d9fe 100644
--- a/test/dm/test-fdt.c
+++ b/test/dm/test-fdt.c
@@ -21,6 +21,7 @@
 #include <dm/lists.h>
 #include <dm/of_access.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <test/ut.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/test/dm/video.c b/test/dm/video.c
index 1ab35482fea..d026ad30426 100644
--- a/test/dm/video.c
+++ b/test/dm/video.c
@@ -16,6 +16,7 @@
 #include <dm/test.h>
 #include <dm/uclass-internal.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <test/ut.h>
 
 /*
diff --git a/test/dm/virtio.c b/test/dm/virtio.c
index 191229272be..b25919d9e68 100644
--- a/test/dm/virtio.c
+++ b/test/dm/virtio.c
@@ -13,6 +13,7 @@
 #include <dm/root.h>
 #include <dm/test.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <test/ut.h>
 
 /* Basic test of the virtio uclass */
diff --git a/test/dm/wdt.c b/test/dm/wdt.c
index 1d31ec55c64..89a07f8617e 100644
--- a/test/dm/wdt.c
+++ b/test/dm/wdt.c
@@ -9,6 +9,7 @@
 #include <asm/state.h>
 #include <asm/test.h>
 #include <dm/test.h>
+#include <linux/types.h>
 #include <test/ut.h>
 
 /* Test that watchdog driver functions are called */
diff --git a/test/env/hashtable.c b/test/env/hashtable.c
index 4331eac02fe..ca677d6f795 100644
--- a/test/env/hashtable.c
+++ b/test/env/hashtable.c
@@ -10,6 +10,7 @@
 #include <search.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/types.h>
 #include <test/env.h>
 #include <test/ut.h>
 
diff --git a/test/lib/hexdump.c b/test/lib/hexdump.c
index 5dccf438866..2ed402021dd 100644
--- a/test/lib/hexdump.c
+++ b/test/lib/hexdump.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <hexdump.h>
+#include <asm/types.h>
 #include <test/lib.h>
 #include <test/test.h>
 #include <test/ut.h>
diff --git a/test/lib/lmb.c b/test/lib/lmb.c
index a0fe0f6b339..6dd142bf62e 100644
--- a/test/lib/lmb.c
+++ b/test/lib/lmb.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <dm/test.h>
+#include <linux/types.h>
 #include <test/ut.h>
 
 static int check_lmb(struct unit_test_state *uts, struct lmb *lmb,
diff --git a/test/lib/string.c b/test/lib/string.c
index 64234bef36c..20865a9a9c7 100644
--- a/test/lib/string.c
+++ b/test/lib/string.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <command.h>
 #include <log.h>
+#include <asm/types.h>
 #include <test/lib.h>
 #include <test/test.h>
 #include <test/ut.h>
diff --git a/test/lib/test_aes.c b/test/lib/test_aes.c
index 2ba300e4a54..63c3ebb7cc4 100644
--- a/test/lib/test_aes.c
+++ b/test/lib/test_aes.c
@@ -11,6 +11,7 @@
 #include <rand.h>
 #include <stdio.h>
 #include <uboot_aes.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 #include <test/lib.h>
 #include <test/test.h>
diff --git a/test/optee/cmd_ut_optee.c b/test/optee/cmd_ut_optee.c
index 7ad13a930a2..f1e40bb1d8f 100644
--- a/test/optee/cmd_ut_optee.c
+++ b/test/optee/cmd_ut_optee.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <stdbool.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <tee/optee.h>
 
diff --git a/test/overlay/cmd_ut_overlay.c b/test/overlay/cmd_ut_overlay.c
index ee8c4944e40..8f8d29fde48 100644
--- a/test/overlay/cmd_ut_overlay.c
+++ b/test/overlay/cmd_ut_overlay.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #include <linux/sizes.h>
 
diff --git a/test/print_ut.c b/test/print_ut.c
index d317cbf5562..3ce7960cb64 100644
--- a/test/print_ut.c
+++ b/test/print_ut.c
@@ -15,6 +15,7 @@
 #include <stdio.h>
 #include <version.h>
 #include <vsprintf.h>
+#include <asm/types.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/stdint/int-types.c b/test/stdint/int-types.c
index 0cde46dafa0..49091af43c1 100644
--- a/test/stdint/int-types.c
+++ b/test/stdint/int-types.c
@@ -1,5 +1,6 @@
 #include <common.h>
 #include <stdio.h>
+#include <linux/types.h>
 
 int test_types(void)
 {
diff --git a/test/str_ut.c b/test/str_ut.c
index 990f356227c..a2c2fb39253 100644
--- a/test/str_ut.c
+++ b/test/str_ut.c
@@ -4,8 +4,10 @@
  */
 
 #include <common.h>
+#include <stdbool.h>
 #include <vsprintf.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include <test/suites.h>
 #include <test/test.h>
 #include <test/ut.h>
diff --git a/test/time_ut.c b/test/time_ut.c
index 456186e08e9..3e072d19b48 100644
--- a/test/time_ut.c
+++ b/test/time_ut.c
@@ -12,6 +12,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 static int test_get_timer(void)
 {
diff --git a/test/unicode_ut.c b/test/unicode_ut.c
index cfea5a9798a..b8d83677f6b 100644
--- a/test/unicode_ut.c
+++ b/test/unicode_ut.c
@@ -13,6 +13,7 @@
 #include <malloc.h>
 #include <vsprintf.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include <test/test.h>
 #include <test/suites.h>
 #include <test/ut.h>
diff --git a/test/ut.c b/test/ut.c
index 001c89e9a4f..c98e0cde81a 100644
--- a/test/ut.c
+++ b/test/ut.c
@@ -12,6 +12,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
+#include <linux/types.h>
 #include <test/test.h>
 #include <test/ut.h>
 
-- 
2.28.0.163.g6104cc2f0b6-goog

^ permalink raw reply related	[flat|nested] 35+ messages in thread

* [PATCH 14/16] common: Move the build-system includes to a separate file
  2020-08-02 22:59 [PATCH 00/16] common: Drop remaining includes in common.h Simon Glass
                   ` (12 preceding siblings ...)
  2020-08-02 22:59 ` [PATCH 13/16] common: Drop linux/types.h " Simon Glass
@ 2020-08-02 22:59 ` Simon Glass
  2020-08-02 22:59 ` [PATCH 15/16] common: Add a comment about the current state of common.h Simon Glass
                   ` (2 subsequent siblings)
  16 siblings, 0 replies; 35+ messages in thread
From: Simon Glass @ 2020-08-02 22:59 UTC (permalink / raw)
  To: u-boot

At present common.h is used by the build system when calculating
dependencies. Move it out into a separate file so we can drop the
env_internal.h inclusion from common.

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

 arch/nds32/lib/asm-offsets.c |  1 +
 include/common.h             |  5 -----
 include/deps_internal.h      | 18 ++++++++++++++++++
 scripts/Makefile.autoconf    |  8 +++++---
 4 files changed, 24 insertions(+), 8 deletions(-)
 create mode 100644 include/deps_internal.h

diff --git a/arch/nds32/lib/asm-offsets.c b/arch/nds32/lib/asm-offsets.c
index 39e3480bd52..7412b788d79 100644
--- a/arch/nds32/lib/asm-offsets.c
+++ b/arch/nds32/lib/asm-offsets.c
@@ -10,6 +10,7 @@
  * published by the Free Software Foundation.
  */
 #include <common.h>
+#include <compiler.h>
 
 #include <linux/kbuild.h>
 
diff --git a/include/common.h b/include/common.h
index 2e95d0ebdf5..1a9a2ce0ea8 100644
--- a/include/common.h
+++ b/include/common.h
@@ -16,9 +16,4 @@
 #include <config.h>
 #endif	/* __ASSEMBLY__ */
 
-/* Pull in stuff for the build system */
-#ifdef DO_DEPS_ONLY
-# include <env_internal.h>
-#endif
-
 #endif	/* __COMMON_H_ */
diff --git a/include/deps_internal.h b/include/deps_internal.h
new file mode 100644
index 00000000000..9c3b31cc577
--- /dev/null
+++ b/include/deps_internal.h
@@ -0,0 +1,18 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Internal header file used by the build system to calculate dependences
+ *
+ * (C) Copyright 2000-2009
+ * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
+ */
+
+#ifndef __DEPS_INTERNAL
+#define __DEPS_INTERNAL
+
+#ifndef __ASSEMBLY__
+#include <config.h>
+#endif
+
+#include <env_internal.h>
+
+#endif	/* __DEPS_INTERNAL */
diff --git a/scripts/Makefile.autoconf b/scripts/Makefile.autoconf
index 0bfc1b2a629..89882e3c71a 100644
--- a/scripts/Makefile.autoconf
+++ b/scripts/Makefile.autoconf
@@ -41,8 +41,9 @@ c_flags := $(KBUILD_CFLAGS) $(KBUILD_CPPFLAGS) $(PLATFORM_CPPFLAGS) \
 
 quiet_cmd_autoconf_dep = GEN     $@
       cmd_autoconf_dep = $(CC) -x c -DDO_DEPS_ONLY -M -MP $(c_flags) \
-	-MQ include/config/auto.conf $(srctree)/include/common.h > $@ || {	\
-		rm $@; false;							\
+	-MQ include/config/auto.conf $(srctree)/include/deps_internal.h > $@ \
+	|| {								\
+		rm $@; false;						\
 	}
 include/autoconf.mk.dep: include/config.h FORCE
 	$(call cmd,autoconf_dep)
@@ -66,7 +67,8 @@ quiet_cmd_autoconf = GEN     $@
 
 quiet_cmd_u_boot_cfg = CFG     $@
       cmd_u_boot_cfg = \
-	$(CPP) $(c_flags) $2 -DDO_DEPS_ONLY -dM $(srctree)/include/common.h > $@.tmp && { \
+	$(CPP) $(c_flags) $2 -DDO_DEPS_ONLY -dM				\
+	$(srctree)/include/deps_internal.h > $@.tmp && {		\
 		grep 'define CONFIG_' $@.tmp > $@;			\
 		rm $@.tmp;						\
 	} || {								\
-- 
2.28.0.163.g6104cc2f0b6-goog

^ permalink raw reply related	[flat|nested] 35+ messages in thread

* [PATCH 15/16] common: Add a comment about the current state of common.h
  2020-08-02 22:59 [PATCH 00/16] common: Drop remaining includes in common.h Simon Glass
                   ` (13 preceding siblings ...)
  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 ` 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
  16 siblings, 0 replies; 35+ messages in thread
From: Simon Glass @ 2020-08-02 22:59 UTC (permalink / raw)
  To: u-boot

This file still includes the auto-generated config.h header. Add a comment
as to why, to help guide further work.

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

 include/common.h          |  8 ++++----
 scripts/Makefile.autoconf | 19 +++++++++++++++++++
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/include/common.h b/include/common.h
index 1a9a2ce0ea8..2669f93c978 100644
--- a/include/common.h
+++ b/include/common.h
@@ -2,17 +2,17 @@
 /*
  * Common header file for U-Boot
  *
- * This file still includes quite a few headers that should be included
- * individually as needed. Patches to remove things are welcome.
+ * This just includes the auto-generated config.h which is documented in
+ * Makefile.autoconf
  *
  * (C) Copyright 2000-2009
  * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
  */
 
 #ifndef __COMMON_H_
-#define __COMMON_H_	1
+#define __COMMON_H_
 
-#ifndef __ASSEMBLY__		/* put C only stuff in this section */
+#ifndef __ASSEMBLY__
 #include <config.h>
 #endif	/* __ASSEMBLY__ */
 
diff --git a/scripts/Makefile.autoconf b/scripts/Makefile.autoconf
index 89882e3c71a..a0f6783bc7d 100644
--- a/scripts/Makefile.autoconf
+++ b/scripts/Makefile.autoconf
@@ -99,6 +99,25 @@ tpl/include/autoconf.mk: tpl/u-boot.cfg
 
 # include/config.h
 # Prior to Kconfig, it was generated by mkconfig. Now it is created here.
+# This currently has the following contents:
+#
+#	1. #define CONFIG_BOARDDIR board/...
+#	2. #include <config_uncmd_spl.h>
+#	3. #include <configs/....h>
+#	4. #include <asm/config.h>
+#	5. #include <linux/kconfig.h>
+#	6. #include <config_fallbacks.h>
+#
+# 1 should be able to move to Kconfig
+# 2 should be removed by tidying up a few Kconfig items
+# 3 uses CONFIG_SYS_CONFIG_NAME and will go away when Kconfig migration is
+#	completed and all files in include/configs are removed
+# 4 should be removed when all CONFIG options in those files move to Kconfig
+# 5 is automatically included by the build system (see UBOOTINCLUDE) so is
+#	already unnecessary
+# 6 should be removed by tidying up a few Kconfig items
+#
+# So all of the above should eventually go away
 define filechk_config_h
 	(echo "/* Automatically generated - do not edit */";		\
 	for i in $$(echo $(CONFIG_SYS_EXTRA_OPTIONS) | sed 's/,/ /g'); do \
-- 
2.28.0.163.g6104cc2f0b6-goog

^ permalink raw reply related	[flat|nested] 35+ messages in thread

* [PATCH 16/16] Makefile: Drop linux/kconfig.h from config.h
  2020-08-02 22:59 [PATCH 00/16] common: Drop remaining includes in common.h Simon Glass
                   ` (14 preceding siblings ...)
  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 ` Simon Glass
  2020-08-19 13:08 ` [RFCv2] common: Drop remaining includes in common.h Tom Rini
  16 siblings, 0 replies; 35+ messages in thread
From: Simon Glass @ 2020-08-02 22:59 UTC (permalink / raw)
  To: u-boot

This header always included by the build system (see UBOOTINCLUDE) except
when building tools, so is unnecessary. Drop it and update the
documentation in the common.h header.

Tools generally should not make use of the board config, but a few do.
Update the Atmel pmecc tool to cope with this.

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

 scripts/Makefile.autoconf  | 8 ++------
 tools/atmel_pmecc_params.c | 1 +
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/scripts/Makefile.autoconf b/scripts/Makefile.autoconf
index a0f6783bc7d..0339cef1d91 100644
--- a/scripts/Makefile.autoconf
+++ b/scripts/Makefile.autoconf
@@ -105,17 +105,14 @@ tpl/include/autoconf.mk: tpl/u-boot.cfg
 #	2. #include <config_uncmd_spl.h>
 #	3. #include <configs/....h>
 #	4. #include <asm/config.h>
-#	5. #include <linux/kconfig.h>
-#	6. #include <config_fallbacks.h>
+#	5. #include <config_fallbacks.h>
 #
 # 1 should be able to move to Kconfig
 # 2 should be removed by tidying up a few Kconfig items
 # 3 uses CONFIG_SYS_CONFIG_NAME and will go away when Kconfig migration is
 #	completed and all files in include/configs are removed
 # 4 should be removed when all CONFIG options in those files move to Kconfig
-# 5 is automatically included by the build system (see UBOOTINCLUDE) so is
-#	already unnecessary
-# 6 should be removed by tidying up a few Kconfig items
+# 5 should be removed by tidying up a few Kconfig items
 #
 # So all of the above should eventually go away
 define filechk_config_h
@@ -128,7 +125,6 @@ define filechk_config_h
 	echo \#include \<config_uncmd_spl.h\>;				\
 	echo \#include \<configs/$(CONFIG_SYS_CONFIG_NAME).h\>;		\
 	echo \#include \<asm/config.h\>;				\
-	echo \#include \<linux/kconfig.h\>;				\
 	echo \#include \<config_fallbacks.h\>;)
 endef
 
diff --git a/tools/atmel_pmecc_params.c b/tools/atmel_pmecc_params.c
index a4ae03f0fd4..bb203427aa0 100644
--- a/tools/atmel_pmecc_params.c
+++ b/tools/atmel_pmecc_params.c
@@ -14,6 +14,7 @@
 
 #include <config.h>
 #include <stdlib.h>
+#include <linux/kconfig.h>
 
 static int pmecc_get_ecc_bytes(int cap, int sector_size)
 {
-- 
2.28.0.163.g6104cc2f0b6-goog

^ permalink raw reply related	[flat|nested] 35+ messages in thread

* [RFCv2] common: Drop remaining includes in common.h
  2020-08-02 22:59 [PATCH 00/16] common: Drop remaining includes in common.h Simon Glass
                   ` (15 preceding siblings ...)
  2020-08-02 22:59 ` [PATCH 16/16] Makefile: Drop linux/kconfig.h from config.h Simon Glass
@ 2020-08-19 13:08 ` Tom Rini
  2020-08-19 13:08   ` [RFCv2 01/16] common: Drop asm/global_data.h from common header Tom Rini
                     ` (16 more replies)
  16 siblings, 17 replies; 35+ messages in thread
From: Tom Rini @ 2020-08-19 13:08 UTC (permalink / raw)
  To: u-boot

I've picked up Simon's v1 of this series and moved it to an RFC with
this v2.  I don't intend for this series to go in as-is but rather since
I spent a good bit of time iterating over the problems of trying a
conversion (in a few places) where we only selectively add back in the
header being removed from common.h in the case of a fail to build, I
didn't want the work lost.

What I think needs to be done moving forward is even smaller series here
where we focus on removing one or two headers, but then only re-add them
where required.

Also note that this series shows a few funny issues.  The patch to
remove <linux/kernel.h> and selectively re-add it shows:
            bcm958712k     : all -4 text -4
               u-boot: add: 1/0, grow: 0/-3 bytes: 24/-28 (-4)
                 function                                   old     new   delta
                 blk_dread                                    -      24     +24
                 part_test_efi                              184     180      -4
                 is_gpt_valid                               736     724     -12
                 fs_devread                                 600     588     -12

everywhere that code is used.  I don't see why, but there's some
underlying problem exposed in the move.  I believe it's also that patch
which shows, for every big-endian platform something like:
            T4160RDB       : all -592 text -592
               u-boot: add: 2/0, grow: 1/-14 bytes: 68/-656 (-588)
                 function                                   old     new   delta
                 ___arch__swab32                              -      48     +48
                 blk_dread                                    -      12     +12
                 ext4fs_bg_get_inode_table_id                76      84      +8
                 ehci_td_buffer                             164     156      -8
                 _ehci_destroy_int_queue                    244     236      -8
                 static.ehci_update_endpt2_dev_n_port       116     104     -12
                 ext4fs_open                                200     188     -12
                 _ehci_poll_int_queue                       236     224     -12
                 usb_lowlevel_init                          916     892     -24
                 ext4fs_mount                               332     304     -28
                 fs_devread                                 572     540     -32
                 ext4fs_find_file1                          756     724     -32
                 ext4fs_iterate_dir                         848     812     -36
                 ext4fs_read_inode                          520     452     -68
                 static._ehci_create_int_queue             1000     908     -92
                 ehci_submit_async                         1632    1520    -112
                 read_allocated_block                      2532    2352    -180

and I lack hardware to see (and it looks like qemu-ppce500 can't be
given a disk atm) if the problem is that ext2/4 is broken before and
fixed now, or fixed now and broken with this patch, as that's my first
concern on seeing ___arch__swab32 show up.  But maybe it's a harmless
"no, don't inline ..." decision the compiler is now able to make.  But
very non-obvious and needing a run-time sanity check to be sure.

^ permalink raw reply	[flat|nested] 35+ messages in thread

* [RFCv2 01/16] common: Drop asm/global_data.h from common header
  2020-08-19 13:08 ` [RFCv2] common: Drop remaining includes in common.h Tom Rini
@ 2020-08-19 13:08   ` Tom Rini
  2020-08-19 13:08   ` [RFCv2 02/16] common: Drop display_options.h " Tom Rini
                     ` (15 subsequent siblings)
  16 siblings, 0 replies; 35+ messages in thread
From: Tom Rini @ 2020-08-19 13:08 UTC (permalink / raw)
  To: u-boot

From: Simon Glass <sjg@chromium.org>

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

Signed-off-by: Simon Glass <sjg@chromium.org>
---
 arch/arc/lib/bootm.c                                    | 1 +
 arch/arc/lib/cache.c                                    | 1 +
 arch/arc/lib/cpu.c                                      | 1 +
 arch/arc/lib/relocate.c                                 | 1 +
 arch/arm/cpu/arm1136/mx35/generic.c                     | 1 +
 arch/arm/cpu/arm926ejs/armada100/dram.c                 | 1 +
 arch/arm/cpu/arm926ejs/armada100/timer.c                | 1 +
 arch/arm/cpu/arm926ejs/mx25/generic.c                   | 1 +
 arch/arm/cpu/arm926ejs/mx27/timer.c                     | 1 +
 arch/arm/cpu/arm926ejs/mxs/mxs.c                        | 1 +
 arch/arm/cpu/arm926ejs/mxs/spl_boot.c                   | 1 +
 arch/arm/cpu/arm926ejs/mxs/timer.c                      | 1 +
 arch/arm/cpu/arm926ejs/spear/spr_misc.c                 | 1 +
 arch/arm/cpu/arm926ejs/spear/timer.c                    | 1 +
 arch/arm/cpu/armv7/arch_timer.c                         | 1 +
 arch/arm/cpu/armv7/ls102xa/clock.c                      | 1 +
 arch/arm/cpu/armv7/ls102xa/cpu.c                        | 1 +
 arch/arm/cpu/armv7/ls102xa/fdt.c                        | 1 +
 arch/arm/cpu/armv7/ls102xa/timer.c                      | 1 +
 arch/arm/cpu/armv7/s5p-common/cpu_info.c                | 1 +
 arch/arm/cpu/armv7/s5p-common/timer.c                   | 1 +
 arch/arm/cpu/armv7/s5p4418/cpu.c                        | 1 +
 arch/arm/cpu/armv7/stv0991/timer.c                      | 1 +
 arch/arm/cpu/armv7/sunxi/timer.c                        | 1 +
 arch/arm/cpu/armv7/vf610/generic.c                      | 1 +
 arch/arm/cpu/armv7/vf610/timer.c                        | 1 +
 arch/arm/cpu/armv7m/systick-timer.c                     | 1 +
 arch/arm/cpu/armv8/cache_v8.c                           | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/cpu.c                 | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c     | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c     | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/mp.c                  | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/ppa.c                 | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/spl.c                 | 1 +
 arch/arm/cpu/armv8/generic_timer.c                      | 1 +
 arch/arm/cpu/armv8/s32v234/generic.c                    | 1 +
 arch/arm/cpu/armv8/sec_firmware.c                       | 1 +
 arch/arm/include/asm/arch-rockchip/clock.h              | 2 ++
 arch/arm/include/asm/arch-tegra/clock.h                 | 2 ++
 arch/arm/include/asm/arch-tegra/tegra_i2c.h             | 2 ++
 arch/arm/include/asm/global_data.h                      | 3 +++
 arch/arm/include/asm/mach-imx/video.h                   | 4 +---
 arch/arm/include/asm/secure.h                           | 1 +
 arch/arm/include/asm/string.h                           | 2 --
 arch/arm/include/asm/ti-common/sys_proto.h              | 2 ++
 arch/arm/lib/bdinfo.c                                   | 1 +
 arch/arm/lib/bootm-fdt.c                                | 1 +
 arch/arm/lib/bootm.c                                    | 1 +
 arch/arm/lib/cache-cp15.c                               | 1 +
 arch/arm/lib/cache.c                                    | 1 +
 arch/arm/lib/image.c                                    | 1 +
 arch/arm/lib/interrupts.c                               | 1 +
 arch/arm/lib/interrupts_64.c                            | 1 +
 arch/arm/lib/spl.c                                      | 1 +
 arch/arm/lib/stack.c                                    | 1 +
 arch/arm/mach-aspeed/ast2500/board_common.c             | 1 +
 arch/arm/mach-aspeed/ast2500/sdram_ast2500.c            | 1 +
 arch/arm/mach-at91/arm920t/clock.c                      | 1 +
 arch/arm/mach-at91/arm920t/timer.c                      | 1 +
 arch/arm/mach-at91/arm926ejs/clock.c                    | 1 +
 arch/arm/mach-at91/arm926ejs/timer.c                    | 1 +
 arch/arm/mach-at91/armv7/clock.c                        | 1 +
 arch/arm/mach-at91/armv7/timer.c                        | 1 +
 arch/arm/mach-at91/spl_at91.c                           | 1 +
 arch/arm/mach-bcm283x/init.c                            | 1 +
 arch/arm/mach-davinci/cpu.c                             | 1 +
 arch/arm/mach-davinci/misc.c                            | 1 +
 arch/arm/mach-davinci/timer.c                           | 1 +
 arch/arm/mach-exynos/spl_boot.c                         | 1 +
 arch/arm/mach-imx/cpu.c                                 | 2 +-
 arch/arm/mach-imx/imx8/ahab.c                           | 1 +
 arch/arm/mach-imx/imx8/clock.c                          | 1 +
 arch/arm/mach-imx/imx8/cpu.c                            | 1 +
 arch/arm/mach-imx/imx8/fdt.c                            | 1 +
 arch/arm/mach-imx/imx8/iomux.c                          | 1 +
 arch/arm/mach-imx/imx8/snvs_security_sc.c               | 1 +
 arch/arm/mach-imx/imx8m/clock_imx8mm.c                  | 1 +
 arch/arm/mach-imx/imx8m/soc.c                           | 1 +
 arch/arm/mach-imx/misc.c                                | 1 +
 arch/arm/mach-imx/mx5/mx53_dram.c                       | 1 +
 arch/arm/mach-imx/mx6/litesom.c                         | 1 +
 arch/arm/mach-imx/mx6/opos6ul.c                         | 1 +
 arch/arm/mach-imx/mx7/clock.c                           | 1 +
 arch/arm/mach-imx/mx7ulp/clock.c                        | 1 +
 arch/arm/mach-imx/speed.c                               | 1 +
 arch/arm/mach-imx/spl.c                                 | 1 +
 arch/arm/mach-imx/spl_imx_romapi.c                      | 1 +
 arch/arm/mach-imx/syscounter.c                          | 1 +
 arch/arm/mach-k3/common.c                               | 1 +
 arch/arm/mach-k3/sysfw-loader.c                         | 1 +
 arch/arm/mach-mediatek/mt7623/init.c                    | 1 +
 arch/arm/mach-mediatek/mt7629/init.c                    | 1 +
 arch/arm/mach-mediatek/mt8512/init.c                    | 1 +
 arch/arm/mach-mediatek/mt8516/init.c                    | 1 +
 arch/arm/mach-mediatek/mt8518/init.c                    | 1 +
 arch/arm/mach-meson/board-axg.c                         | 1 +
 arch/arm/mach-meson/board-common.c                      | 1 +
 arch/arm/mach-meson/board-g12a.c                        | 1 +
 arch/arm/mach-meson/board-gx.c                          | 1 +
 arch/arm/mach-meson/board-info.c                        | 1 +
 arch/arm/mach-meson/sm.c                                | 1 +
 arch/arm/mach-mvebu/arm64-common.c                      | 1 +
 arch/arm/mach-mvebu/armada3700/cpu.c                    | 1 +
 arch/arm/mach-mvebu/armada8k/dram.c                     | 1 +
 arch/arm/mach-mvebu/dram.c                              | 1 +
 arch/arm/mach-mvebu/spl.c                               | 1 +
 arch/arm/mach-omap2/am33xx/board.c                      | 1 +
 arch/arm/mach-omap2/boot-common.c                       | 1 +
 arch/arm/mach-omap2/hwinit-common.c                     | 1 +
 arch/arm/mach-omap2/omap-cache.c                        | 1 +
 arch/arm/mach-omap2/omap3/am35x_musb.c                  | 1 +
 arch/arm/mach-omap2/omap3/emif4.c                       | 1 +
 arch/arm/mach-omap2/omap3/sdrc.c                        | 1 +
 arch/arm/mach-omap2/timer.c                             | 1 +
 arch/arm/mach-orion5x/dram.c                            | 1 +
 arch/arm/mach-orion5x/timer.c                           | 1 +
 arch/arm/mach-owl/soc.c                                 | 1 +
 arch/arm/mach-rmobile/memmap-gen3.c                     | 1 +
 arch/arm/mach-rockchip/board.c                          | 1 +
 arch/arm/mach-rockchip/rk3036-board-spl.c               | 1 +
 arch/arm/mach-rockchip/rk3036/rk3036.c                  | 1 +
 arch/arm/mach-rockchip/rk3128/rk3128.c                  | 1 +
 arch/arm/mach-rockchip/rk3188/rk3188.c                  | 1 +
 arch/arm/mach-rockchip/rk3288/rk3288.c                  | 1 +
 arch/arm/mach-rockchip/rk3308/rk3308.c                  | 1 +
 arch/arm/mach-rockchip/rk3328/rk3328.c                  | 1 +
 arch/arm/mach-rockchip/rk3368/rk3368.c                  | 1 +
 arch/arm/mach-rockchip/rk3399/rk3399.c                  | 1 +
 arch/arm/mach-rockchip/sdram.c                          | 1 +
 arch/arm/mach-rockchip/spl-boot-order.c                 | 1 +
 arch/arm/mach-rockchip/spl.c                            | 1 +
 arch/arm/mach-snapdragon/pinctrl-snapdragon.h           | 2 +-
 arch/arm/mach-socfpga/board.c                           | 1 +
 arch/arm/mach-socfpga/clock_manager.c                   | 1 +
 arch/arm/mach-socfpga/clock_manager_agilex.c            | 1 +
 arch/arm/mach-socfpga/clock_manager_s10.c               | 1 +
 arch/arm/mach-socfpga/mailbox_s10.c                     | 1 +
 arch/arm/mach-socfpga/misc.c                            | 1 +
 arch/arm/mach-socfpga/misc_gen5.c                       | 1 +
 arch/arm/mach-socfpga/misc_s10.c                        | 1 +
 arch/arm/mach-socfpga/mmu-arm64_s10.c                   | 1 +
 arch/arm/mach-socfpga/reset_manager_arria10.c           | 1 +
 arch/arm/mach-socfpga/reset_manager_s10.c               | 1 +
 arch/arm/mach-socfpga/spl_a10.c                         | 1 +
 arch/arm/mach-socfpga/spl_agilex.c                      | 1 +
 arch/arm/mach-socfpga/spl_gen5.c                        | 1 +
 arch/arm/mach-socfpga/spl_s10.c                         | 1 +
 arch/arm/mach-socfpga/system_manager_s10.c              | 1 +
 arch/arm/mach-stm32mp/boot_params.c                     | 1 +
 arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c         | 1 +
 arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_serial.c  | 1 +
 arch/arm/mach-stm32mp/cpu.c                             | 1 +
 arch/arm/mach-stm32mp/dram_init.c                       | 1 +
 arch/arm/mach-stm32mp/fdt.c                             | 1 +
 arch/arm/mach-stm32mp/spl.c                             | 1 +
 arch/arm/mach-tegra/board.c                             | 1 +
 arch/arm/mach-tegra/board2.c                            | 1 +
 arch/arm/mach-tegra/cboot.c                             | 1 +
 arch/arm/mach-tegra/emc.c                               | 1 +
 arch/arm/mach-tegra/pmc.c                               | 1 +
 arch/arm/mach-tegra/tegra124/xusb-padctl.c              | 1 +
 arch/arm/mach-tegra/tegra20/warmboot.c                  | 1 +
 arch/arm/mach-tegra/tegra210/xusb-padctl.c              | 1 +
 arch/arm/mach-uniphier/board_late_init.c                | 1 +
 arch/arm/mach-versal/clk.c                              | 1 +
 arch/arm/mach-versal/cpu.c                              | 1 +
 arch/arm/mach-versal/mp.c                               | 1 +
 arch/arm/mach-zynq/clk.c                                | 1 +
 arch/arm/mach-zynq/timer.c                              | 1 +
 arch/arm/mach-zynqmp-r5/cpu.c                           | 1 +
 arch/arm/mach-zynqmp/clk.c                              | 1 +
 arch/arm/mach-zynqmp/cpu.c                              | 1 +
 arch/m68k/cpu/mcf5227x/cpu.c                            | 1 +
 arch/m68k/cpu/mcf5227x/speed.c                          | 1 +
 arch/m68k/cpu/mcf523x/cpu.c                             | 1 +
 arch/m68k/cpu/mcf523x/speed.c                           | 1 +
 arch/m68k/cpu/mcf52x2/cpu.c                             | 1 +
 arch/m68k/cpu/mcf52x2/speed.c                           | 1 +
 arch/m68k/cpu/mcf530x/speed.c                           | 1 +
 arch/m68k/cpu/mcf532x/cpu.c                             | 1 +
 arch/m68k/cpu/mcf532x/speed.c                           | 1 +
 arch/m68k/cpu/mcf5445x/cpu.c                            | 1 +
 arch/m68k/cpu/mcf5445x/speed.c                          | 1 +
 arch/m68k/cpu/mcf547x_8x/cpu.c                          | 1 +
 arch/m68k/cpu/mcf547x_8x/slicetimer.c                   | 1 +
 arch/m68k/cpu/mcf547x_8x/speed.c                        | 1 +
 arch/m68k/include/asm/immap.h                           | 1 +
 arch/m68k/lib/bdinfo.c                                  | 1 +
 arch/m68k/lib/bootm.c                                   | 1 +
 arch/m68k/lib/fec.c                                     | 1 +
 arch/m68k/lib/time.c                                    | 1 +
 arch/microblaze/cpu/interrupts.c                        | 1 +
 arch/microblaze/cpu/timer.c                             | 1 +
 arch/microblaze/lib/bootm.c                             | 1 +
 arch/mips/include/asm/io.h                              | 1 +
 arch/mips/lib/boot.c                                    | 1 +
 arch/mips/lib/bootm.c                                   | 1 +
 arch/mips/lib/cache.c                                   | 1 +
 arch/mips/lib/reloc.c                                   | 1 +
 arch/mips/lib/stack.c                                   | 1 +
 arch/mips/lib/traps.c                                   | 1 +
 arch/mips/mach-ath79/ar933x/clk.c                       | 1 +
 arch/mips/mach-ath79/ar934x/clk.c                       | 1 +
 arch/mips/mach-ath79/ar934x/ddr.c                       | 1 +
 arch/mips/mach-ath79/cpu.c                              | 1 +
 arch/mips/mach-ath79/dram.c                             | 1 +
 arch/mips/mach-ath79/include/mach/ath79.h               | 1 +
 arch/mips/mach-ath79/qca953x/clk.c                      | 1 +
 arch/mips/mach-ath79/qca956x/clk.c                      | 1 +
 arch/mips/mach-ath79/qca956x/ddr.c                      | 1 +
 arch/mips/mach-bmips/dram.c                             | 1 +
 arch/mips/mach-jz47xx/jz4780/jz4780.c                   | 1 +
 arch/mips/mach-mscc/cpu.c                               | 1 +
 arch/mips/mach-mscc/dram.c                              | 1 +
 arch/mips/mach-mtmips/cpu.c                             | 1 +
 arch/mips/mach-mtmips/ddr_cal.c                         | 1 +
 arch/mips/mach-mtmips/mt7628/ddr.c                      | 1 +
 arch/mips/mach-mtmips/mt7628/init.c                     | 1 +
 arch/mips/mach-mtmips/spl.c                             | 2 +-
 arch/mips/mach-pic32/cpu.c                              | 1 +
 arch/nds32/lib/bootm.c                                  | 1 +
 arch/nios2/cpu/cpu.c                                    | 1 +
 arch/nios2/include/asm/io.h                             | 3 +++
 arch/nios2/lib/cache.c                                  | 1 +
 arch/powerpc/cpu/mpc83xx/cpu.c                          | 1 +
 arch/powerpc/cpu/mpc83xx/cpu_init.c                     | 1 +
 arch/powerpc/cpu/mpc83xx/fdt.c                          | 1 +
 arch/powerpc/cpu/mpc83xx/interrupts.c                   | 1 +
 arch/powerpc/cpu/mpc83xx/pci.c                          | 1 +
 arch/powerpc/cpu/mpc83xx/pcie.c                         | 1 +
 arch/powerpc/cpu/mpc83xx/spd_sdram.c                    | 1 +
 arch/powerpc/cpu/mpc83xx/speed.c                        | 1 +
 arch/powerpc/cpu/mpc83xx/spl_minimal.c                  | 1 +
 arch/powerpc/cpu/mpc83xx/traps.c                        | 1 +
 arch/powerpc/cpu/mpc85xx/commproc.c                     | 1 +
 arch/powerpc/cpu/mpc85xx/cpu.c                          | 1 +
 arch/powerpc/cpu/mpc85xx/cpu_init_early.c               | 1 +
 arch/powerpc/cpu/mpc85xx/fdt.c                          | 1 +
 arch/powerpc/cpu/mpc85xx/mp.c                           | 1 +
 arch/powerpc/cpu/mpc85xx/serial_scc.c                   | 1 +
 arch/powerpc/cpu/mpc85xx/speed.c                        | 1 +
 arch/powerpc/cpu/mpc85xx/tlb.c                          | 1 +
 arch/powerpc/cpu/mpc85xx/traps.c                        | 1 +
 arch/powerpc/cpu/mpc86xx/cpu.c                          | 1 +
 arch/powerpc/cpu/mpc86xx/cpu_init.c                     | 1 +
 arch/powerpc/cpu/mpc86xx/mp.c                           | 1 +
 arch/powerpc/cpu/mpc86xx/speed.c                        | 1 +
 arch/powerpc/cpu/mpc86xx/traps.c                        | 1 +
 arch/powerpc/cpu/mpc8xx/cpu.c                           | 1 +
 arch/powerpc/cpu/mpc8xx/fdt.c                           | 1 +
 arch/powerpc/cpu/mpc8xx/immap.c                         | 1 +
 arch/powerpc/cpu/mpc8xx/speed.c                         | 1 +
 arch/powerpc/cpu/mpc8xxx/cpu.c                          | 1 +
 arch/powerpc/cpu/mpc8xxx/law.c                          | 1 +
 arch/powerpc/cpu/mpc8xxx/pamu_table.c                   | 1 +
 arch/powerpc/lib/bat_rw.c                               | 1 +
 arch/powerpc/lib/bdinfo.c                               | 1 +
 arch/powerpc/lib/bootm.c                                | 1 +
 arch/powerpc/lib/stack.c                                | 1 +
 arch/riscv/cpu/fu540/cache.c                            | 1 +
 arch/riscv/cpu/fu540/dram.c                             | 1 +
 arch/riscv/cpu/generic/dram.c                           | 1 +
 arch/riscv/lib/andes_plic.c                             | 1 +
 arch/riscv/lib/andes_plmt.c                             | 1 +
 arch/riscv/lib/asm-offsets.c                            | 1 +
 arch/riscv/lib/bootm.c                                  | 1 +
 arch/riscv/lib/fdt_fixup.c                              | 1 +
 arch/riscv/lib/image.c                                  | 1 +
 arch/riscv/lib/sifive_clint.c                           | 1 +
 arch/riscv/lib/smp.c                                    | 1 +
 arch/riscv/lib/spl.c                                    | 1 +
 arch/sandbox/cpu/cpu.c                                  | 1 +
 arch/sandbox/cpu/spl.c                                  | 1 +
 arch/sandbox/cpu/start.c                                | 1 +
 arch/sh/lib/board.c                                     | 1 +
 arch/x86/cpu/apollolake/cpu_spl.c                       | 1 +
 arch/x86/cpu/apollolake/fsp_s.c                         | 1 +
 arch/x86/cpu/baytrail/fsp_configs.c                     | 1 +
 arch/x86/cpu/braswell/fsp_configs.c                     | 1 +
 arch/x86/cpu/broadwell/cpu.c                            | 1 +
 arch/x86/cpu/broadwell/cpu_from_spl.c                   | 1 +
 arch/x86/cpu/broadwell/cpu_full.c                       | 1 +
 arch/x86/cpu/broadwell/lpc.c                            | 1 +
 arch/x86/cpu/broadwell/northbridge.c                    | 1 +
 arch/x86/cpu/broadwell/pch.c                            | 1 +
 arch/x86/cpu/broadwell/pinctrl_broadwell.c              | 1 +
 arch/x86/cpu/broadwell/sata.c                           | 1 +
 arch/x86/cpu/broadwell/sdram.c                          | 1 +
 arch/x86/cpu/coreboot/coreboot.c                        | 1 +
 arch/x86/cpu/coreboot/sdram.c                           | 1 +
 arch/x86/cpu/coreboot/tables.c                          | 1 +
 arch/x86/cpu/cpu.c                                      | 1 +
 arch/x86/cpu/cpu_x86.c                                  | 1 +
 arch/x86/cpu/efi/payload.c                              | 1 +
 arch/x86/cpu/efi/sdram.c                                | 1 +
 arch/x86/cpu/i386/cpu.c                                 | 1 +
 arch/x86/cpu/i386/interrupt.c                           | 1 +
 arch/x86/cpu/intel_common/cpu.c                         | 1 +
 arch/x86/cpu/intel_common/cpu_from_spl.c                | 1 +
 arch/x86/cpu/intel_common/itss.c                        | 1 +
 arch/x86/cpu/intel_common/lpc.c                         | 1 +
 arch/x86/cpu/intel_common/microcode.c                   | 1 +
 arch/x86/cpu/intel_common/mrc.c                         | 1 +
 arch/x86/cpu/irq.c                                      | 1 +
 arch/x86/cpu/ivybridge/bd82x6x.c                        | 1 +
 arch/x86/cpu/ivybridge/cpu.c                            | 1 +
 arch/x86/cpu/ivybridge/fsp_configs.c                    | 1 +
 arch/x86/cpu/ivybridge/lpc.c                            | 1 +
 arch/x86/cpu/ivybridge/model_206ax.c                    | 1 +
 arch/x86/cpu/ivybridge/northbridge.c                    | 1 +
 arch/x86/cpu/ivybridge/sata.c                           | 1 +
 arch/x86/cpu/ivybridge/sdram_nop.c                      | 1 +
 arch/x86/cpu/mp_init.c                                  | 1 +
 arch/x86/cpu/mtrr.c                                     | 1 +
 arch/x86/cpu/qemu/dram.c                                | 1 +
 arch/x86/cpu/qemu/e820.c                                | 1 +
 arch/x86/cpu/quark/acpi.c                               | 1 +
 arch/x86/cpu/quark/dram.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/turbo.c                                    | 1 +
 arch/x86/cpu/x86_64/cpu.c                               | 1 +
 arch/x86/include/asm/cpu_common.h                       | 1 +
 arch/x86/include/asm/fast_spi.h                         | 4 +++-
 arch/x86/include/asm/io.h                               | 2 +-
 arch/x86/include/asm/mp.h                               | 2 ++
 arch/x86/lib/acpi_s3.c                                  | 1 +
 arch/x86/lib/acpi_table.c                               | 1 +
 arch/x86/lib/asm-offsets.c                              | 1 +
 arch/x86/lib/bios.c                                     | 1 +
 arch/x86/lib/bootm.c                                    | 1 +
 arch/x86/lib/cmd_boot.c                                 | 1 +
 arch/x86/lib/coreboot_table.c                           | 1 +
 arch/x86/lib/e820.c                                     | 1 +
 arch/x86/lib/fsp/fsp_common.c                           | 1 +
 arch/x86/lib/fsp/fsp_dram.c                             | 1 +
 arch/x86/lib/fsp/fsp_graphics.c                         | 1 +
 arch/x86/lib/fsp1/fsp_common.c                          | 1 +
 arch/x86/lib/fsp1/fsp_dram.c                            | 1 +
 arch/x86/lib/fsp2/fsp_dram.c                            | 1 +
 arch/x86/lib/fsp2/fsp_meminit.c                         | 1 +
 arch/x86/lib/fsp2/fsp_silicon_init.c                    | 1 +
 arch/x86/lib/fsp2/fsp_support.c                         | 1 +
 arch/x86/lib/init_helpers.c                             | 1 +
 arch/x86/lib/mpspec.c                                   | 1 +
 arch/x86/lib/mrccache.c                                 | 1 +
 arch/x86/lib/physmem.c                                  | 1 +
 arch/x86/lib/pinctrl_ich6.c                             | 1 +
 arch/x86/lib/pirq_routing.c                             | 1 +
 arch/x86/lib/relocate.c                                 | 1 +
 arch/x86/lib/spl.c                                      | 1 +
 arch/x86/lib/tables.c                                   | 1 +
 arch/x86/lib/tpl.c                                      | 1 +
 arch/xtensa/lib/bootm.c                                 | 1 +
 board/AndesTech/adp-ae3xx/adp-ae3xx.c                   | 1 +
 board/AndesTech/adp-ag101p/adp-ag101p.c                 | 1 +
 board/AndesTech/ax25-ae350/ax25-ae350.c                 | 1 +
 board/Arcturus/ucp1020/spl.c                            | 1 +
 board/BuR/brppt1/board.c                                | 1 +
 board/BuR/brppt2/board.c                                | 1 +
 board/BuR/brsmarc1/board.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/turris_mox.c                    | 1 +
 board/CZ.NIC/turris_omnia/turris_omnia.c                | 1 +
 board/CarMediaLab/flea3/flea3.c                         | 1 +
 board/LaCie/edminiv2/edminiv2.c                         | 1 +
 board/LaCie/net2big_v2/net2big_v2.c                     | 1 +
 board/LaCie/netspace_v2/netspace_v2.c                   | 1 +
 board/Marvell/aspenite/aspenite.c                       | 1 +
 board/Marvell/db-88f6281-bp/db-88f6281-bp.c             | 1 +
 board/Marvell/db-88f6720/db-88f6720.c                   | 1 +
 board/Marvell/db-88f6820-amc/db-88f6820-amc.c           | 1 +
 board/Marvell/db-88f6820-gp/db-88f6820-gp.c             | 1 +
 board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c             | 1 +
 board/Marvell/db-xc3-24g4xg/db-xc3-24g4xg.c             | 1 +
 board/Marvell/dreamplug/dreamplug.c                     | 1 +
 board/Marvell/gplugd/gplugd.c                           | 1 +
 board/Marvell/guruplug/guruplug.c                       | 1 +
 board/Marvell/mvebu_armada-37xx/board.c                 | 1 +
 board/Marvell/mvebu_armada-8k/board.c                   | 1 +
 board/Marvell/openrd/openrd.c                           | 1 +
 board/Marvell/sheevaplug/sheevaplug.c                   | 1 +
 board/Seagate/dockstar/dockstar.c                       | 1 +
 board/Seagate/goflexhome/goflexhome.c                   | 1 +
 board/Seagate/nas220/nas220.c                           | 1 +
 board/Synology/ds109/ds109.c                            | 1 +
 board/Synology/ds414/ds414.c                            | 1 +
 board/advantech/dms-ba16/dms-ba16.c                     | 1 +
 board/advantech/imx8qm_rom7720_a1/imx8qm_rom7720_a1.c   | 1 +
 board/advantech/imx8qm_rom7720_a1/spl.c                 | 1 +
 board/alliedtelesis/SBx81LIFKW/sbx81lifkw.c             | 1 +
 board/alliedtelesis/SBx81LIFXCAT/sbx81lifxcat.c         | 1 +
 board/alliedtelesis/common/gpio_hog.c                   | 1 +
 board/alliedtelesis/x530/x530.c                         | 1 +
 board/amazon/kc1/kc1.c                                  | 1 +
 board/aristainetos/aristainetos.c                       | 1 +
 board/armadeus/apf27/apf27.c                            | 1 +
 board/armltd/integrator/integrator.c                    | 1 +
 board/armltd/vexpress/vexpress_common.c                 | 1 +
 board/armltd/vexpress64/vexpress64.c                    | 1 +
 board/astro/mcf5373l/mcf5373l.c                         | 1 +
 board/atmark-techno/armadillo-800eva/armadillo-800eva.c | 1 +
 board/atmel/at91rm9200ek/at91rm9200ek.c                 | 1 +
 board/atmel/at91sam9260ek/at91sam9260ek.c               | 1 +
 board/atmel/at91sam9261ek/at91sam9261ek.c               | 1 +
 board/atmel/at91sam9263ek/at91sam9263ek.c               | 1 +
 board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c         | 1 +
 board/atmel/at91sam9n12ek/at91sam9n12ek.c               | 1 +
 board/atmel/at91sam9rlek/at91sam9rlek.c                 | 1 +
 board/atmel/at91sam9x5ek/at91sam9x5ek.c                 | 1 +
 board/atmel/common/video_display.c                      | 1 +
 board/atmel/sam9x60ek/sam9x60ek.c                       | 1 +
 board/atmel/sama5d27_som1_ek/sama5d27_som1_ek.c         | 1 +
 board/atmel/sama5d27_wlsom1_ek/sama5d27_wlsom1_ek.c     | 1 +
 board/atmel/sama5d2_icp/sama5d2_icp.c                   | 1 +
 board/atmel/sama5d2_ptc_ek/sama5d2_ptc_ek.c             | 1 +
 board/atmel/sama5d2_xplained/sama5d2_xplained.c         | 1 +
 board/atmel/sama5d3_xplained/sama5d3_xplained.c         | 1 +
 board/atmel/sama5d3xek/sama5d3xek.c                     | 1 +
 board/atmel/sama5d4_xplained/sama5d4_xplained.c         | 1 +
 board/atmel/sama5d4ek/sama5d4ek.c                       | 1 +
 board/bachmann/ot1200/ot1200.c                          | 1 +
 board/barco/platinum/platinum.c                         | 1 +
 board/barco/titanium/titanium.c                         | 1 +
 board/beacon/beacon-rzg2m/beacon-rzg2m.c                | 1 +
 board/beacon/imx8mm/imx8mm_beacon.c                     | 1 +
 board/beacon/imx8mm/spl.c                               | 1 +
 board/beckhoff/mx53cx9020/mx53cx9020.c                  | 1 +
 board/bluegiga/apx4devkit/apx4devkit.c                  | 1 +
 board/bluewater/gurnard/gurnard.c                       | 1 +
 board/bluewater/snapper9260/snapper9260.c               | 1 +
 board/bosch/guardian/board.c                            | 1 +
 board/bosch/shc/board.c                                 | 1 +
 board/boundary/nitrogen6x/nitrogen6x.c                  | 1 +
 board/broadcom/bcm23550_w1d/bcm23550_w1d.c              | 1 +
 board/broadcom/bcm28155_ap/bcm28155_ap.c                | 1 +
 board/broadcom/bcm_ep/board.c                           | 1 +
 board/broadcom/bcmns2/northstar2.c                      | 1 +
 board/broadcom/bcmns3/ns3.c                             | 1 +
 board/broadcom/bcmstb/bcmstb.c                          | 1 +
 board/bticino/mamoj/mamoj.c                             | 1 +
 board/bticino/mamoj/spl.c                               | 1 +
 board/buffalo/lsxl/lsxl.c                               | 1 +
 board/calao/usb_a9263/usb_a9263.c                       | 1 +
 board/cavium/thunderx/thunderx.c                        | 1 +
 board/ccv/xpress/xpress.c                               | 1 +
 board/cirrus/edb93xx/edb93xx.c                          | 1 +
 board/cloudengines/pogo_e02/pogo_e02.c                  | 1 +
 board/cobra5272/cobra5272.c                             | 1 +
 board/compulab/cl-som-imx7/cl-som-imx7.c                | 1 +
 board/compulab/cm_fx6/cm_fx6.c                          | 1 +
 board/compulab/cm_t335/cm_t335.c                        | 1 +
 board/compulab/cm_t43/cm_t43.c                          | 1 +
 board/congatec/cgtqmx6eval/cgtqmx6eval.c                | 1 +
 board/corscience/tricorder/tricorder.c                  | 1 +
 board/cortina/presidio-asic/presidio.c                  | 1 +
 board/creative/xfi3/xfi3.c                              | 1 +
 board/cssi/MCR3000/MCR3000.c                            | 1 +
 board/d-link/dns325/dns325.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/ea/mx7ulp_com/mx7ulp_com.c                        | 1 +
 board/eets/pdu001/board.c                               | 1 +
 board/egnite/ethernut5/ethernut5.c                      | 1 +
 board/el/el6x/el6x.c                                    | 1 +
 board/elgin/elgin_rv1108/elgin_rv1108.c                 | 1 +
 board/embest/mx6boards/mx6boards.c                      | 1 +
 board/engicam/common/board.c                            | 1 +
 board/esd/meesc/meesc.c                                 | 1 +
 board/esd/vme8349/vme8349.c                             | 1 +
 board/firefly/firefly-rk3288/firefly-rk3288.c           | 1 +
 board/freescale/common/arm_sleep.c                      | 1 +
 board/freescale/common/emc2305.c                        | 1 +
 board/freescale/common/mpc85xx_sleep.c                  | 1 +
 board/freescale/corenet_ds/corenet_ds.c                 | 1 +
 board/freescale/corenet_ds/ddr.c                        | 1 +
 board/freescale/imx8mm_evk/imx8mm_evk.c                 | 1 +
 board/freescale/imx8mm_evk/spl.c                        | 1 +
 board/freescale/imx8mn_evk/imx8mn_evk.c                 | 1 +
 board/freescale/imx8mn_evk/spl.c                        | 1 +
 board/freescale/imx8mp_evk/imx8mp_evk.c                 | 1 +
 board/freescale/imx8mp_evk/spl.c                        | 1 +
 board/freescale/imx8mq_evk/imx8mq_evk.c                 | 1 +
 board/freescale/imx8mq_evk/spl.c                        | 1 +
 board/freescale/imx8qm_mek/imx8qm_mek.c                 | 1 +
 board/freescale/imx8qm_mek/spl.c                        | 1 +
 board/freescale/imx8qxp_mek/imx8qxp_mek.c               | 1 +
 board/freescale/imx8qxp_mek/spl.c                       | 1 +
 board/freescale/imxrt1020-evk/imxrt1020-evk.c           | 1 +
 board/freescale/imxrt1050-evk/imxrt1050-evk.c           | 1 +
 board/freescale/ls1012afrdm/ls1012afrdm.c               | 1 +
 board/freescale/ls1012aqds/ls1012aqds.c                 | 1 +
 board/freescale/ls1012ardb/ls1012ardb.c                 | 1 +
 board/freescale/ls1021aiot/dcu.c                        | 1 +
 board/freescale/ls1021aiot/ls1021aiot.c                 | 1 +
 board/freescale/ls1021aqds/dcu.c                        | 1 +
 board/freescale/ls1021aqds/ddr.c                        | 1 +
 board/freescale/ls1021atsn/ls1021atsn.c                 | 1 +
 board/freescale/ls1021atwr/dcu.c                        | 1 +
 board/freescale/ls1021atwr/ls1021atwr.c                 | 1 +
 board/freescale/ls1028a/ddr.c                           | 1 +
 board/freescale/ls1028a/ls1028a.c                       | 1 +
 board/freescale/ls1043aqds/ddr.c                        | 1 +
 board/freescale/ls1043aqds/ls1043aqds.c                 | 1 +
 board/freescale/ls1043ardb/ddr.c                        | 1 +
 board/freescale/ls1043ardb/ls1043ardb.c                 | 1 +
 board/freescale/ls1046afrwy/ddr.c                       | 1 +
 board/freescale/ls1046afrwy/ls1046afrwy.c               | 1 +
 board/freescale/ls1046aqds/ddr.c                        | 1 +
 board/freescale/ls1046aqds/ls1046aqds.c                 | 1 +
 board/freescale/ls1046ardb/ddr.c                        | 1 +
 board/freescale/ls1046ardb/ls1046ardb.c                 | 1 +
 board/freescale/ls1088a/ddr.c                           | 1 +
 board/freescale/ls1088a/ls1088a.c                       | 1 +
 board/freescale/ls2080a/ddr.c                           | 1 +
 board/freescale/ls2080a/ls2080a.c                       | 1 +
 board/freescale/ls2080aqds/ddr.c                        | 1 +
 board/freescale/ls2080aqds/ls2080aqds.c                 | 1 +
 board/freescale/ls2080ardb/ddr.c                        | 1 +
 board/freescale/ls2080ardb/eth_ls2080rdb.c              | 1 +
 board/freescale/ls2080ardb/ls2080ardb.c                 | 1 +
 board/freescale/lx2160a/ddr.c                           | 1 +
 board/freescale/lx2160a/eth_lx2160aqds.c                | 1 +
 board/freescale/lx2160a/eth_lx2160ardb.c                | 1 +
 board/freescale/lx2160a/lx2160a.c                       | 1 +
 board/freescale/m5208evbe/m5208evbe.c                   | 1 +
 board/freescale/m52277evb/m52277evb.c                   | 1 +
 board/freescale/m5235evb/m5235evb.c                     | 1 +
 board/freescale/m5249evb/m5249evb.c                     | 1 +
 board/freescale/m5253demo/m5253demo.c                   | 1 +
 board/freescale/m5272c3/m5272c3.c                       | 1 +
 board/freescale/m5275evb/m5275evb.c                     | 1 +
 board/freescale/m5282evb/m5282evb.c                     | 1 +
 board/freescale/m53017evb/m53017evb.c                   | 1 +
 board/freescale/m5329evb/m5329evb.c                     | 1 +
 board/freescale/m5373evb/m5373evb.c                     | 1 +
 board/freescale/m54418twr/m54418twr.c                   | 1 +
 board/freescale/m54451evb/m54451evb.c                   | 1 +
 board/freescale/m54455evb/m54455evb.c                   | 1 +
 board/freescale/m547xevb/m547xevb.c                     | 1 +
 board/freescale/m548xevb/m548xevb.c                     | 1 +
 board/freescale/mpc8308rdb/sdram.c                      | 1 +
 board/freescale/mpc8313erdb/mpc8313erdb.c               | 1 +
 board/freescale/mpc8313erdb/sdram.c                     | 1 +
 board/freescale/mpc8315erdb/mpc8315erdb.c               | 1 +
 board/freescale/mpc8315erdb/sdram.c                     | 1 +
 board/freescale/mpc8323erdb/mpc8323erdb.c               | 1 +
 board/freescale/mpc832xemds/mpc832xemds.c               | 1 +
 board/freescale/mpc8349emds/mpc8349emds.c               | 1 +
 board/freescale/mpc8349itx/mpc8349itx.c                 | 1 +
 board/freescale/mpc837xemds/mpc837xemds.c               | 1 +
 board/freescale/mpc837xerdb/mpc837xerdb.c               | 1 +
 board/freescale/mpc8610hpcd/mpc8610hpcd.c               | 1 +
 board/freescale/mpc8641hpcn/mpc8641hpcn.c               | 1 +
 board/freescale/mx23evk/mx23evk.c                       | 1 +
 board/freescale/mx25pdk/mx25pdk.c                       | 1 +
 board/freescale/mx28evk/mx28evk.c                       | 1 +
 board/freescale/mx35pdk/mx35pdk.c                       | 1 +
 board/freescale/mx51evk/mx51evk.c                       | 1 +
 board/freescale/mx53ard/mx53ard.c                       | 1 +
 board/freescale/mx53evk/mx53evk.c                       | 1 +
 board/freescale/mx53loco/mx53loco.c                     | 1 +
 board/freescale/mx53smd/mx53smd.c                       | 1 +
 board/freescale/mx6memcal/mx6memcal.c                   | 1 +
 board/freescale/mx6memcal/spl.c                         | 1 +
 board/freescale/mx6qarm2/mx6qarm2.c                     | 1 +
 board/freescale/mx6sabreauto/mx6sabreauto.c             | 1 +
 board/freescale/mx6sabresd/mx6sabresd.c                 | 1 +
 board/freescale/mx6slevk/mx6slevk.c                     | 1 +
 board/freescale/mx6sllevk/mx6sllevk.c                   | 1 +
 board/freescale/mx6sxsabreauto/mx6sxsabreauto.c         | 1 +
 board/freescale/mx6sxsabresd/mx6sxsabresd.c             | 1 +
 board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c       | 1 +
 board/freescale/mx6ullevk/mx6ullevk.c                   | 1 +
 board/freescale/mx7dsabresd/mx7dsabresd.c               | 1 +
 board/freescale/mx7ulp_evk/mx7ulp_evk.c                 | 1 +
 board/freescale/p1010rdb/ddr.c                          | 1 +
 board/freescale/p1010rdb/p1010rdb.c                     | 1 +
 board/freescale/p1010rdb/spl.c                          | 1 +
 board/freescale/p1023rdb/p1023rdb.c                     | 1 +
 board/freescale/p1_p2_rdb_pc/spl.c                      | 1 +
 board/freescale/p2041rdb/ddr.c                          | 1 +
 board/freescale/p2041rdb/p2041rdb.c                     | 1 +
 board/freescale/qemu-ppce500/qemu-ppce500.c             | 1 +
 board/freescale/s32v234evb/s32v234evb.c                 | 1 +
 board/freescale/t102xrdb/ddr.c                          | 1 +
 board/freescale/t102xrdb/spl.c                          | 1 +
 board/freescale/t102xrdb/t102xrdb.c                     | 1 +
 board/freescale/t104xrdb/ddr.c                          | 1 +
 board/freescale/t104xrdb/spl.c                          | 1 +
 board/freescale/t104xrdb/t104xrdb.c                     | 1 +
 board/freescale/t208xqds/ddr.c                          | 1 +
 board/freescale/t208xqds/spl.c                          | 1 +
 board/freescale/t208xqds/t208xqds.c                     | 1 +
 board/freescale/t208xrdb/ddr.c                          | 1 +
 board/freescale/t208xrdb/spl.c                          | 1 +
 board/freescale/t208xrdb/t208xrdb.c                     | 1 +
 board/freescale/t4rdb/ddr.c                             | 1 +
 board/freescale/t4rdb/spl.c                             | 1 +
 board/freescale/t4rdb/t4240rdb.c                        | 1 +
 board/freescale/vf610twr/vf610twr.c                     | 1 +
 board/friendlyarm/nanopi2/board.c                       | 1 +
 board/gardena/smart-gateway-at91sam/board.c             | 1 +
 board/gateworks/gw_ventana/gw_ventana.c                 | 1 +
 board/gdsys/a38x/controlcenterdc.c                      | 1 +
 board/gdsys/a38x/hydra.c                                | 1 +
 board/gdsys/mpc8308/gazerbeam.c                         | 1 +
 board/gdsys/mpc8308/sdram.c                             | 1 +
 board/ge/bx50v3/bx50v3.c                                | 1 +
 board/ge/mx53ppd/mx53ppd.c                              | 1 +
 board/google/imx8mq_phanbell/imx8mq_phanbell.c          | 1 +
 board/google/imx8mq_phanbell/spl.c                      | 1 +
 board/google/veyron/veyron.c                            | 1 +
 board/grinn/chiliboard/board.c                          | 1 +
 board/grinn/liteboard/board.c                           | 1 +
 board/highbank/highbank.c                               | 1 +
 board/hisilicon/hikey/hikey.c                           | 1 +
 board/hisilicon/hikey960/hikey960.c                     | 1 +
 board/hisilicon/poplar/poplar.c                         | 1 +
 board/ids/ids8313/ids8313.c                             | 1 +
 board/imgtec/boston/ddr.c                               | 1 +
 board/imgtec/boston/dt.c                                | 1 +
 board/imgtec/ci20/ci20.c                                | 1 +
 board/imgtec/malta/malta.c                              | 1 +
 board/imgtec/xilfpga/xilfpga.c                          | 1 +
 board/inversepath/usbarmory/usbarmory.c                 | 1 +
 board/iomega/iconnect/iconnect.c                        | 1 +
 board/isee/igep003x/board.c                             | 1 +
 board/isee/igep00x0/common.c                            | 1 +
 board/k+p/kp_imx53/kp_imx53.c                           | 1 +
 board/k+p/kp_imx6q_tpc/kp_imx6q_tpc.c                   | 1 +
 board/k+p/kp_imx6q_tpc/kp_imx6q_tpc_spl.c               | 1 +
 board/keymile/common/common.c                           | 1 +
 board/keymile/km83xx/km83xx.c                           | 1 +
 board/keymile/km_arm/km_arm.c                           | 1 +
 board/keymile/kmp204x/ddr.c                             | 1 +
 board/kmc/kzm9g/kzm9g.c                                 | 1 +
 board/kobol/helios4/helios4.c                           | 1 +
 board/kosagi/novena/novena.c                            | 1 +
 board/l+g/vinco/vinco.c                                 | 1 +
 board/laird/wb45n/wb45n.c                               | 1 +
 board/laird/wb50n/wb50n.c                               | 1 +
 board/lego/ev3/legoev3.c                                | 1 +
 board/lg/sniper/sniper.c                                | 1 +
 board/liebherr/display5/display5.c                      | 1 +
 board/liebherr/display5/spl.c                           | 1 +
 board/liebherr/mccmon6/mccmon6.c                        | 1 +
 board/liebherr/xea/xea.c                                | 1 +
 board/logicpd/am3517evm/am3517evm.c                     | 1 +
 board/logicpd/imx6/imx6logic.c                          | 1 +
 board/logicpd/omap3som/omap3logic.c                     | 1 +
 board/maxbcm/maxbcm.c                                   | 1 +
 board/mediatek/mt7622/mt7622_rfb.c                      | 1 +
 board/mediatek/mt7623/mt7623_rfb.c                      | 1 +
 board/mediatek/mt7629/mt7629_rfb.c                      | 1 +
 board/mediatek/mt8512/mt8512.c                          | 1 +
 board/mediatek/mt8518/mt8518_ap1.c                      | 1 +
 board/menlo/m53menlo/m53menlo.c                         | 1 +
 board/mikrotik/crs3xx-98dx3236/crs3xx-98dx3236.c        | 1 +
 board/mini-box/picosam9g45/picosam9g45.c                | 1 +
 board/mpc8308_p1m/sdram.c                               | 1 +
 board/mscc/jr2/jr2.c                                    | 1 +
 board/mscc/luton/luton.c                                | 1 +
 board/mscc/ocelot/ocelot.c                              | 1 +
 board/mscc/serval/serval.c                              | 1 +
 board/mscc/servalt/servalt.c                            | 1 +
 board/nokia/rx51/rx51.c                                 | 1 +
 board/novtech/meerkat96/meerkat96.c                     | 1 +
 board/olimex/mx23_olinuxino/mx23_olinuxino.c            | 1 +
 board/phytec/pcl063/pcl063.c                            | 1 +
 board/phytec/pcm052/pcm052.c                            | 1 +
 board/phytec/pcm058/pcm058.c                            | 1 +
 board/phytec/pfla02/pfla02.c                            | 1 +
 board/phytec/phycore_am335x_r2/board.c                  | 1 +
 board/phytec/phycore_rk3288/phycore-rk3288.c            | 1 +
 board/phytium/durian/durian.c                           | 1 +
 board/ppcag/bg0900/bg0900.c                             | 1 +
 board/qemu-mips/qemu-mips.c                             | 1 +
 board/qualcomm/dragonboard410c/dragonboard410c.c        | 1 +
 board/qualcomm/dragonboard820c/dragonboard820c.c        | 1 +
 board/raidsonic/ib62x0/ib62x0.c                         | 1 +
 board/renesas/alt/alt.c                                 | 1 +
 board/renesas/blanche/blanche.c                         | 1 +
 board/renesas/condor/condor.c                           | 1 +
 board/renesas/draak/draak.c                             | 1 +
 board/renesas/eagle/eagle.c                             | 1 +
 board/renesas/ebisu/ebisu.c                             | 1 +
 board/renesas/gose/gose.c                               | 1 +
 board/renesas/grpeach/grpeach.c                         | 1 +
 board/renesas/koelsch/koelsch.c                         | 1 +
 board/renesas/lager/lager.c                             | 1 +
 board/renesas/porter/porter.c                           | 1 +
 board/renesas/rcar-common/common.c                      | 1 +
 board/renesas/salvator-x/salvator-x.c                   | 1 +
 board/renesas/silk/silk.c                               | 1 +
 board/renesas/stout/stout.c                             | 1 +
 board/renesas/ulcb/ulcb.c                               | 1 +
 board/rockchip/evb_rk3308/evb_rk3308.c                  | 1 +
 board/rockchip/evb_rv1108/evb_rv1108.c                  | 1 +
 board/ronetix/pm9261/pm9261.c                           | 1 +
 board/ronetix/pm9263/pm9263.c                           | 1 +
 board/ronetix/pm9g45/pm9g45.c                           | 1 +
 board/samsung/arndale/arndale.c                         | 1 +
 board/samsung/common/board.c                            | 1 +
 board/samsung/common/exynos5-dt-types.c                 | 1 +
 board/samsung/common/exynos5-dt.c                       | 1 +
 board/samsung/common/misc.c                             | 1 +
 board/samsung/goni/goni.c                               | 1 +
 board/samsung/odroid/odroid.c                           | 1 +
 board/samsung/smdkc100/smdkc100.c                       | 1 +
 board/samsung/smdkv310/smdkv310.c                       | 1 +
 board/samsung/universal_c210/universal.c                | 1 +
 board/sandbox/sandbox.c                                 | 1 +
 board/sandisk/sansa_fuze_plus/sfp.c                     | 1 +
 board/sbc8349/sbc8349.c                                 | 1 +
 board/sbc8641d/sbc8641d.c                               | 1 +
 board/schulercontrol/sc_sps_1/sc_sps_1.c                | 1 +
 board/seco/mx6quq7/mx6quq7.c                            | 1 +
 board/siemens/capricorn/spl.c                           | 1 +
 board/siemens/common/board.c                            | 1 +
 board/siemens/corvus/board.c                            | 1 +
 board/siemens/smartweb/smartweb.c                       | 1 +
 board/siemens/taurus/taurus.c                           | 1 +
 board/sks-kinkel/sksimx6/sksimx6.c                      | 1 +
 board/socrates/socrates.c                               | 1 +
 board/softing/vining_2000/vining_2000.c                 | 1 +
 board/softing/vining_fpga/socfpga.c                     | 1 +
 board/solidrun/clearfog/clearfog.c                      | 1 +
 board/solidrun/common/tlv_data.c                        | 1 +
 board/solidrun/mx6cuboxi/mx6cuboxi.c                    | 1 +
 board/somlabs/visionsom-6ull/visionsom-6ull.c           | 1 +
 board/st/common/stm32mp_mtdparts.c                      | 1 +
 board/st/stih410-b2260/board.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/stm32f746-disco/stm32f746-disco.c              | 1 +
 board/st/stm32h743-disco/stm32h743-disco.c              | 1 +
 board/st/stm32h743-eval/stm32h743-eval.c                | 1 +
 board/st/stm32mp1/stm32mp1.c                            | 1 +
 board/st/stv0991/stv0991.c                              | 1 +
 board/ste/stemmy/stemmy.c                               | 1 +
 board/sunxi/board.c                                     | 1 +
 board/synopsys/axs10x/axs10x.c                          | 1 +
 board/synopsys/emsdp/emsdp.c                            | 1 +
 board/synopsys/hsdk/hsdk.c                              | 1 +
 board/synopsys/iot_devkit/iot_devkit.c                  | 1 +
 board/sysam/amcore/amcore.c                             | 1 +
 board/sysam/stmark2/stmark2.c                           | 1 +
 board/syteco/zmx25/zmx25.c                              | 1 +
 board/tbs/tbs2910/tbs2910.c                             | 2 ++
 board/tcl/sl50/board.c                                  | 1 +
 board/technexion/pico-imx6/pico-imx6.c                  | 3 ++-
 board/technexion/pico-imx6ul/pico-imx6ul.c              | 1 +
 board/technexion/pico-imx7d/pico-imx7d.c                | 1 +
 board/technexion/pico-imx8mq/pico-imx8mq.c              | 1 +
 board/technexion/pico-imx8mq/spl.c                      | 1 +
 board/technexion/tao3530/tao3530.c                      | 1 +
 board/technologic/ts4600/ts4600.c                       | 1 +
 board/technologic/ts4800/ts4800.c                       | 1 +
 board/theadorable/theadorable.c                         | 1 +
 board/ti/am335x/board.c                                 | 1 +
 board/ti/am3517crane/am3517crane.c                      | 1 +
 board/ti/am43xx/board.c                                 | 1 +
 board/ti/am57xx/board.c                                 | 1 +
 board/ti/am65x/evm.c                                    | 1 +
 board/ti/beagle/beagle.c                                | 1 +
 board/ti/dra7xx/evm.c                                   | 1 +
 board/ti/evm/evm.c                                      | 1 +
 board/ti/j721e/evm.c                                    | 1 +
 board/ti/ks2_evm/board.c                                | 1 +
 board/ti/omap5_uevm/evm.c                               | 1 +
 board/ti/panda/panda.c                                  | 1 +
 board/ti/sdp4430/sdp.c                                  | 1 +
 board/ti/ti816x/evm.c                                   | 1 +
 board/timll/devkit3250/devkit3250.c                     | 1 +
 board/timll/devkit8000/devkit8000.c                     | 1 +
 board/toradex/apalis-imx8/apalis-imx8.c                 | 1 +
 board/toradex/apalis_imx6/apalis_imx6.c                 | 1 +
 board/toradex/apalis_t30/apalis_t30.c                   | 1 +
 board/toradex/colibri-imx6ull/colibri-imx6ull.c         | 1 +
 board/toradex/colibri-imx8x/colibri-imx8x.c             | 1 +
 board/toradex/colibri_imx6/colibri_imx6.c               | 1 +
 board/toradex/colibri_imx7/colibri_imx7.c               | 1 +
 board/toradex/colibri_pxa270/colibri_pxa270.c           | 1 +
 board/toradex/colibri_t20/colibri_t20.c                 | 1 +
 board/toradex/colibri_vf/colibri_vf.c                   | 1 +
 board/toradex/common/tdx-cfg-block.c                    | 1 +
 board/toradex/verdin-imx8mm/spl.c                       | 1 +
 board/toradex/verdin-imx8mm/verdin-imx8mm.c             | 1 +
 board/tqc/tqm834x/tqm834x.c                             | 1 +
 board/tqc/tqma6/tqma6.c                                 | 1 +
 board/udoo/neo/neo.c                                    | 1 +
 board/udoo/udoo.c                                       | 1 +
 board/variscite/dart_6ul/dart_6ul.c                     | 1 +
 board/varisys/cyrus/ddr.c                               | 1 +
 board/ve8313/ve8313.c                                   | 1 +
 board/vscom/baltos/board.c                              | 1 +
 board/wandboard/wandboard.c                             | 1 +
 board/warp/warp.c                                       | 1 +
 board/warp7/warp7.c                                     | 1 +
 board/work-microwave/work_92105/work_92105.c            | 1 +
 board/xes/xpedite517x/xpedite517x.c                     | 1 +
 board/xilinx/common/board.c                             | 1 +
 board/xilinx/microblaze-generic/microblaze-generic.c    | 1 +
 board/xilinx/versal/board.c                             | 1 +
 board/xilinx/zynq/board.c                               | 1 +
 board/xilinx/zynq/bootimg.c                             | 1 +
 board/xilinx/zynq/cmds.c                                | 1 +
 board/xilinx/zynqmp/zynqmp.c                            | 1 +
 board/zyxel/nsa310s/nsa310s.c                           | 1 +
 cmd/acpi.c                                              | 1 +
 cmd/bdinfo.c                                            | 1 +
 cmd/bedbug.c                                            | 1 +
 cmd/bootefi.c                                           | 1 +
 cmd/booti.c                                             | 1 +
 cmd/bootm.c                                             | 1 +
 cmd/date.c                                              | 1 +
 cmd/efi.c                                               | 1 +
 cmd/load.c                                              | 1 +
 cmd/log.c                                               | 1 +
 cmd/mem.c                                               | 1 +
 cmd/mtdparts.c                                          | 1 +
 cmd/nvedit.c                                            | 1 +
 cmd/pxe_utils.h                                         | 2 ++
 cmd/sb.c                                                | 1 +
 cmd/sound.c                                             | 1 +
 cmd/spl.c                                               | 1 +
 cmd/ti/ddr3.c                                           | 1 +
 cmd/tlv_eeprom.c                                        | 1 +
 cmd/x86/fsp.c                                           | 1 +
 cmd/x86/hob.c                                           | 1 +
 common/autoboot.c                                       | 1 +
 common/bloblist.c                                       | 1 +
 common/board_f.c                                        | 1 +
 common/board_info.c                                     | 1 +
 common/board_r.c                                        | 1 +
 common/bootm.c                                          | 1 +
 common/bootm_os.c                                       | 1 +
 common/bootstage.c                                      | 1 +
 common/cli.c                                            | 1 +
 common/cli_hush.c                                       | 1 +
 common/cli_readline.c                                   | 1 +
 common/command.c                                        | 1 +
 common/console.c                                        | 1 +
 common/dlmalloc.c                                       | 1 +
 common/exports.c                                        | 1 +
 common/hash.c                                           | 1 +
 common/hwconfig.c                                       | 1 +
 common/image-android.c                                  | 1 +
 common/image-cipher.c                                   | 1 +
 common/image-fdt.c                                      | 1 +
 common/image-fit-sig.c                                  | 1 +
 common/image-fit.c                                      | 1 +
 common/image-sig.c                                      | 1 +
 common/image.c                                          | 1 +
 common/init/board_init.c                                | 1 +
 common/init/handoff.c                                   | 1 +
 common/iotrace.c                                        | 1 +
 common/lcd.c                                            | 1 +
 common/lcd_simplefb.c                                   | 1 +
 common/log.c                                            | 1 +
 common/log_console.c                                    | 1 +
 common/log_syslog.c                                     | 1 +
 common/malloc_simple.c                                  | 1 +
 common/memsize.c                                        | 1 +
 common/spl/spl.c                                        | 1 +
 common/spl/spl_fit.c                                    | 1 +
 common/spl/spl_opensbi.c                                | 1 +
 common/spl/spl_spi.c                                    | 1 +
 common/splash_source.c                                  | 1 +
 common/stdio.c                                          | 1 +
 disk/part_efi.c                                         | 1 +
 drivers/ata/libata.c                                    | 2 ++
 drivers/ata/sata_mv.c                                   | 1 +
 drivers/bios_emulator/atibios.c                         | 1 +
 drivers/block/sandbox.c                                 | 1 +
 drivers/bootcount/bootcount_ram.c                       | 1 +
 drivers/cache/cache-v5l2.c                              | 1 +
 drivers/cache/sandbox_cache.c                           | 1 +
 drivers/clk/altera/clk-agilex.c                         | 1 +
 drivers/clk/altera/clk-arria10.c                        | 1 +
 drivers/clk/aspeed/clk_ast2500.c                        | 1 +
 drivers/clk/at91/clk-generated.c                        | 1 +
 drivers/clk/at91/clk-h32mx.c                            | 1 +
 drivers/clk/at91/clk-main.c                             | 1 +
 drivers/clk/at91/clk-master.c                           | 1 +
 drivers/clk/at91/clk-plla.c                             | 1 +
 drivers/clk/at91/clk-usb.c                              | 1 +
 drivers/clk/at91/pmc.c                                  | 1 +
 drivers/clk/clk-uclass.c                                | 1 +
 drivers/clk/clk_pic32.c                                 | 1 +
 drivers/clk/clk_stm32mp1.c                              | 1 +
 drivers/clk/clk_zynq.c                                  | 1 +
 drivers/clk/mpc83xx_clk.c                               | 1 +
 drivers/clk/renesas/clk-rcar-gen2.c                     | 1 +
 drivers/clk/renesas/clk-rcar-gen3.c                     | 1 +
 drivers/clk/rockchip/clk_px30.c                         | 1 +
 drivers/clk/rockchip/clk_rk3288.c                       | 1 +
 drivers/clk/rockchip/clk_rk3308.c                       | 1 +
 drivers/clk/rockchip/clk_rv1108.c                       | 1 +
 drivers/core/device-remove.c                            | 1 +
 drivers/core/device.c                                   | 1 +
 drivers/core/fdtaddr.c                                  | 1 +
 drivers/core/of_access.c                                | 1 +
 drivers/core/ofnode.c                                   | 1 +
 drivers/core/read.c                                     | 1 +
 drivers/core/regmap.c                                   | 1 +
 drivers/core/root.c                                     | 1 +
 drivers/core/uclass.c                                   | 1 +
 drivers/cpu/imx8_cpu.c                                  | 1 +
 drivers/cpu/riscv_cpu.c                                 | 1 +
 drivers/crypto/rsa_mod_exp/mod_exp_uclass.c             | 1 +
 drivers/ddr/altera/sdram_agilex.c                       | 1 +
 drivers/ddr/altera/sdram_arria10.c                      | 1 +
 drivers/ddr/altera/sdram_s10.c                          | 1 +
 drivers/ddr/altera/sdram_soc64.c                        | 1 +
 drivers/ddr/imx/imx8m/helper.c                          | 1 +
 drivers/demo/demo-shape.c                               | 1 +
 drivers/demo/demo-uclass.c                              | 1 +
 drivers/fpga/socfpga_arria10.c                          | 1 +
 drivers/fpga/zynqmppl.c                                 | 1 +
 drivers/gpio/74x164_gpio.c                              | 1 +
 drivers/gpio/altera_pio.c                               | 1 +
 drivers/gpio/atmel_pio4.c                               | 1 +
 drivers/gpio/da8xx_gpio.c                               | 1 +
 drivers/gpio/gpio-rcar.c                                | 1 +
 drivers/gpio/gpio-rza1.c                                | 1 +
 drivers/gpio/gpio-uclass.c                              | 1 +
 drivers/gpio/intel_broadwell_gpio.c                     | 1 +
 drivers/gpio/intel_ich6_gpio.c                          | 1 +
 drivers/gpio/msm_gpio.c                                 | 1 +
 drivers/gpio/mxs_gpio.c                                 | 1 +
 drivers/gpio/omap_gpio.c                                | 1 +
 drivers/gpio/pcf8575_gpio.c                             | 1 +
 drivers/gpio/pic32_gpio.c                               | 1 +
 drivers/gpio/s5p_gpio.c                                 | 1 +
 drivers/gpio/vybrid_gpio.c                              | 1 +
 drivers/hwspinlock/hwspinlock-uclass.c                  | 1 +
 drivers/i2c/at91_i2c.c                                  | 1 +
 drivers/i2c/cros_ec_tunnel.c                            | 1 +
 drivers/i2c/exynos_hs_i2c.c                             | 1 +
 drivers/i2c/fsl_i2c.c                                   | 1 +
 drivers/i2c/i2c-gpio.c                                  | 1 +
 drivers/i2c/i2c_core.c                                  | 1 +
 drivers/i2c/ihs_i2c.c                                   | 1 +
 drivers/i2c/iproc_i2c.c                                 | 1 +
 drivers/i2c/muxes/i2c-arb-gpio-challenge.c              | 1 +
 drivers/i2c/muxes/i2c-mux-gpio.c                        | 1 +
 drivers/i2c/muxes/pca954x.c                             | 1 +
 drivers/i2c/mvtwsi.c                                    | 1 +
 drivers/i2c/mxc_i2c.c                                   | 1 +
 drivers/i2c/s3c24x0_i2c.c                               | 1 +
 drivers/i2c/sh_i2c.c                                    | 1 +
 drivers/i2c/soft_i2c.c                                  | 1 +
 drivers/i2c/tegra186_bpmp_i2c.c                         | 1 +
 drivers/input/i8042.c                                   | 1 +
 drivers/mailbox/k3-sec-proxy.c                          | 1 +
 drivers/misc/atsha204a-i2c.c                            | 1 +
 drivers/misc/fs_loader.c                                | 1 +
 drivers/misc/imx8/fuse.c                                | 1 +
 drivers/misc/imx8/scu.c                                 | 1 +
 drivers/misc/imx8/scu_api.c                             | 1 +
 drivers/misc/tegra186_bpmp.c                            | 1 +
 drivers/mmc/atmel_sdhci.c                               | 1 +
 drivers/mmc/ca_dw_mmc.c                                 | 1 +
 drivers/mmc/exynos_dw_mmc.c                             | 1 +
 drivers/mmc/fsl_esdhc.c                                 | 1 +
 drivers/mmc/fsl_esdhc_imx.c                             | 1 +
 drivers/mmc/ftsdc010_mci.c                              | 1 +
 drivers/mmc/hi6220_dw_mmc.c                             | 1 +
 drivers/mmc/iproc_sdhci.c                               | 1 +
 drivers/mmc/jz_mmc.c                                    | 1 +
 drivers/mmc/msm_sdhci.c                                 | 1 +
 drivers/mmc/mv_sdhci.c                                  | 1 +
 drivers/mmc/mvebu_mmc.c                                 | 1 +
 drivers/mmc/omap_hsmmc.c                                | 1 +
 drivers/mmc/pic32_sdhci.c                               | 1 +
 drivers/mmc/renesas-sdhi.c                              | 1 +
 drivers/mmc/s5p_sdhci.c                                 | 1 +
 drivers/mmc/sdhci-cadence.c                             | 1 +
 drivers/mmc/sh_mmcif.c                                  | 1 +
 drivers/mmc/sh_sdhi.c                                   | 1 +
 drivers/mmc/socfpga_dw_mmc.c                            | 1 +
 drivers/mmc/sti_sdhci.c                                 | 1 +
 drivers/mmc/tmio-common.c                               | 1 +
 drivers/mmc/xenon_sdhci.c                               | 1 +
 drivers/mtd/altera_qspi.c                               | 1 +
 drivers/mtd/cfi_flash.c                                 | 1 +
 drivers/mtd/mtd_uboot.c                                 | 1 +
 drivers/mtd/nand/raw/nand_base.c                        | 1 +
 drivers/mtd/nand/raw/pxa3xx_nand.c                      | 1 +
 drivers/mtd/nand/raw/sunxi_nand.c                       | 1 +
 drivers/mtd/nand/raw/tegra_nand.c                       | 1 +
 drivers/mtd/pic32_flash.c                               | 1 +
 drivers/mtd/renesas_rpc_hf.c                            | 1 +
 drivers/mtd/spi/sf-uclass.c                             | 1 +
 drivers/net/ag7xxx.c                                    | 1 +
 drivers/net/altera_tse.c                                | 1 +
 drivers/net/dwc_eth_qos.c                               | 1 +
 drivers/net/dwmac_s700.c                                | 1 +
 drivers/net/fec_mxc.c                                   | 1 +
 drivers/net/fsl-mc/mc.c                                 | 1 +
 drivers/net/fsl_mcdmafec.c                              | 1 +
 drivers/net/ftmac100.c                                  | 1 +
 drivers/net/gmac_rockchip.c                             | 1 +
 drivers/net/ldpaa_eth/ldpaa_eth.c                       | 1 +
 drivers/net/macb.c                                      | 1 +
 drivers/net/mcffec.c                                    | 1 +
 drivers/net/mcfmii.c                                    | 1 +
 drivers/net/mpc8xx_fec.c                                | 1 +
 drivers/net/mvgbe.c                                     | 1 +
 drivers/net/mvneta.c                                    | 1 +
 drivers/net/mvpp2.c                                     | 1 +
 drivers/net/phy/fixed.c                                 | 1 +
 drivers/net/phy/miiphybb.c                              | 1 +
 drivers/net/phy/phy.c                                   | 1 +
 drivers/net/phy/xilinx_gmii2rgmii.c                     | 4 ++--
 drivers/net/pic32_eth.c                                 | 1 +
 drivers/net/ravb.c                                      | 1 +
 drivers/net/sandbox-raw.c                               | 1 +
 drivers/net/sandbox.c                                   | 1 +
 drivers/net/sh_eth.c                                    | 1 +
 drivers/net/sni_ave.c                                   | 1 +
 drivers/net/sun8i_emac.c                                | 1 +
 drivers/net/ti/cpsw-common.c                            | 1 +
 drivers/net/ti/keystone_net.c                           | 1 +
 drivers/net/xilinx_axi_emac.c                           | 1 +
 drivers/net/xilinx_emaclite.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/pci_rom.c                                   | 1 +
 drivers/pci/pcie_dw_mvebu.c                             | 1 +
 drivers/pci/pcie_dw_ti.c                                | 1 +
 drivers/pci/pcie_ecam_generic.c                         | 1 +
 drivers/pci/pcie_fsl.c                                  | 1 +
 drivers/pci/pcie_intel_fpga.c                           | 1 +
 drivers/pci/pcie_layerscape.c                           | 1 +
 drivers/pci/pcie_layerscape_ep.c                        | 1 +
 drivers/pci/pcie_layerscape_fixup_common.c              | 1 +
 drivers/pci/pcie_layerscape_gen4.c                      | 1 +
 drivers/pci/pcie_layerscape_rc.c                        | 1 +
 drivers/pci/pcie_phytium.c                              | 1 +
 drivers/pci/pcie_rockchip.c                             | 1 +
 drivers/pci/pcie_xilinx.c                               | 1 +
 drivers/pci_endpoint/pci_ep-uclass.c                    | 1 +
 drivers/pci_endpoint/pcie-cadence-ep.c                  | 1 +
 drivers/phy/marvell/comphy_a3700.c                      | 1 +
 drivers/phy/marvell/comphy_core.c                       | 1 +
 drivers/phy/marvell/comphy_cp110.c                      | 1 +
 drivers/phy/omap-usb2-phy.c                             | 1 +
 drivers/phy/rockchip/phy-rockchip-inno-usb2.c           | 1 +
 drivers/phy/rockchip/phy-rockchip-pcie.c                | 1 +
 drivers/phy/rockchip/phy-rockchip-typec.c               | 1 +
 drivers/phy/sti_usb_phy.c                               | 1 +
 drivers/phy/ti-pipe3-phy.c                              | 1 +
 drivers/pinctrl/ath79/pinctrl_ar933x.c                  | 1 +
 drivers/pinctrl/ath79/pinctrl_qca953x.c                 | 1 +
 drivers/pinctrl/exynos/pinctrl-exynos.c                 | 1 +
 drivers/pinctrl/meson/pinctrl-meson.c                   | 1 +
 drivers/pinctrl/mtmips/pinctrl-mt7628.c                 | 1 +
 drivers/pinctrl/mvebu/pinctrl-armada-37xx.c             | 1 +
 drivers/pinctrl/mvebu/pinctrl-mvebu.c                   | 1 +
 drivers/pinctrl/nxp/pinctrl-imx.c                       | 1 +
 drivers/pinctrl/nxp/pinctrl-imx8.c                      | 1 +
 drivers/pinctrl/nxp/pinctrl-mxs.c                       | 1 +
 drivers/pinctrl/pinctrl-at91-pio4.c                     | 1 +
 drivers/pinctrl/pinctrl-at91.c                          | 1 +
 drivers/pinctrl/pinctrl-sti.c                           | 1 +
 drivers/pinctrl/pinctrl-uclass.c                        | 1 +
 drivers/pinctrl/pinctrl_pic32.c                         | 1 +
 drivers/pinctrl/pinctrl_stm32.c                         | 1 +
 drivers/pinctrl/renesas/pfc-r7s72100.c                  | 1 +
 drivers/pinctrl/rockchip/pinctrl-rockchip-core.c        | 1 +
 drivers/power/domain/imx8-power-domain-legacy.c         | 1 +
 drivers/power/domain/imx8m-power-domain.c               | 1 +
 drivers/power/pmic/bd71837.c                            | 1 +
 drivers/power/pmic/mc34708.c                            | 1 +
 drivers/power/pmic/pca9450.c                            | 1 +
 drivers/power/regulator/pwm_regulator.c                 | 1 +
 drivers/pwm/pwm-sifive.c                                | 1 +
 drivers/pwm/rk_pwm.c                                    | 1 +
 drivers/pwm/sunxi_pwm.c                                 | 1 +
 drivers/qe/fdt.c                                        | 1 +
 drivers/qe/qe.c                                         | 1 +
 drivers/ram/mpc83xx_sdram.c                             | 1 +
 drivers/ram/rockchip/sdram_rk322x.c                     | 1 +
 drivers/ram/sandbox_ram.c                               | 1 +
 drivers/ram/sifive/fu540_ddr.c                          | 1 +
 drivers/ram/stm32mp1/stm32mp1_interactive.c             | 1 +
 drivers/ram/stm32mp1/stm32mp1_tests.c                   | 1 +
 drivers/remoteproc/rproc-uclass.c                       | 1 +
 drivers/remoteproc/ti_power_proc.c                      | 1 +
 drivers/reset/sti-reset.c                               | 1 +
 drivers/serial/atmel_usart.c                            | 1 +
 drivers/serial/ns16550.c                                | 1 +
 drivers/serial/sandbox.c                                | 1 +
 drivers/serial/serial-uclass.c                          | 1 +
 drivers/serial/serial.c                                 | 1 +
 drivers/serial/serial_arc.c                             | 1 +
 drivers/serial/serial_linflexuart.c                     | 1 +
 drivers/serial/serial_lpuart.c                          | 1 +
 drivers/serial/serial_mcf.c                             | 1 +
 drivers/serial/serial_mpc8xx.c                          | 1 +
 drivers/serial/serial_msm.c                             | 1 +
 drivers/serial/serial_mtk.c                             | 1 +
 drivers/serial/serial_mxc.c                             | 1 +
 drivers/serial/serial_ns16550.c                         | 1 +
 drivers/serial/serial_pic32.c                           | 1 +
 drivers/serial/serial_pl01x.c                           | 1 +
 drivers/serial/serial_pxa.c                             | 1 +
 drivers/serial/serial_s5p.c                             | 1 +
 drivers/serial/serial_sh.c                              | 1 +
 drivers/serial/serial_sifive.c                          | 1 +
 drivers/serial/serial_sti_asc.c                         | 1 +
 drivers/smem/msm_smem.c                                 | 1 +
 drivers/sound/ivybridge_sound.c                         | 1 +
 drivers/spi/atcspi200_spi.c                             | 1 +
 drivers/spi/bcmstb_spi.c                                | 1 +
 drivers/spi/cf_spi.c                                    | 1 +
 drivers/spi/davinci_spi.c                               | 1 +
 drivers/spi/exynos_spi.c                                | 1 +
 drivers/spi/fsl_dspi.c                                  | 1 +
 drivers/spi/fsl_espi.c                                  | 1 +
 drivers/spi/fsl_qspi.c                                  | 1 +
 drivers/spi/mvebu_a3700_spi.c                           | 1 +
 drivers/spi/mxc_spi.c                                   | 1 +
 drivers/spi/omap3_spi.c                                 | 1 +
 drivers/spi/pic32_spi.c                                 | 1 +
 drivers/spi/pl022_spi.c                                 | 1 +
 drivers/spi/renesas_rpc_spi.c                           | 1 +
 drivers/spi/soft_spi.c                                  | 1 +
 drivers/spi/spi-sunxi.c                                 | 1 +
 drivers/spi/spi-uclass.c                                | 1 +
 drivers/spi/tegra20_sflash.c                            | 1 +
 drivers/spi/tegra20_slink.c                             | 1 +
 drivers/spi/tegra210_qspi.c                             | 1 +
 drivers/spi/ti_qspi.c                                   | 1 +
 drivers/spi/uniphier_spi.c                              | 1 +
 drivers/spi/zynq_qspi.c                                 | 1 +
 drivers/spi/zynq_spi.c                                  | 1 +
 drivers/spi/zynqmp_gqspi.c                              | 1 +
 drivers/spmi/spmi-msm.c                                 | 1 +
 drivers/sysreset/sysreset-uclass.c                      | 1 +
 drivers/sysreset/sysreset_mpc83xx.c                     | 1 +
 drivers/sysreset/sysreset_sti.c                         | 1 +
 drivers/thermal/imx_scu_thermal.c                       | 1 +
 drivers/thermal/imx_tmu.c                               | 1 +
 drivers/timer/arc_timer.c                               | 1 +
 drivers/timer/cadence-ttc.c                             | 1 +
 drivers/timer/mpc83xx_timer.c                           | 1 +
 drivers/timer/ostm_timer.c                              | 1 +
 drivers/timer/rockchip_timer.c                          | 1 +
 drivers/timer/timer-uclass.c                            | 1 +
 drivers/timer/tsc_timer.c                               | 1 +
 drivers/tpm/tpm2_tis_spi.c                              | 1 +
 drivers/usb/common/common.c                             | 1 +
 drivers/usb/host/dwc3-sti-glue.c                        | 1 +
 drivers/usb/host/ehci-exynos.c                          | 1 +
 drivers/usb/host/ehci-fsl.c                             | 1 +
 drivers/usb/host/ehci-marvell.c                         | 1 +
 drivers/usb/host/ehci-mx5.c                             | 1 +
 drivers/usb/host/ehci-mx6.c                             | 1 +
 drivers/usb/host/ehci-vf.c                              | 1 +
 drivers/usb/host/xhci-exynos5.c                         | 1 +
 drivers/usb/musb-new/da8xx.c                            | 1 +
 drivers/usb/musb-new/omap2430.c                         | 1 +
 drivers/usb/musb-new/pic32.c                            | 1 +
 drivers/usb/musb-new/ti-musb.c                          | 1 +
 drivers/usb/phy/rockchip_usb2_phy.c                     | 1 +
 drivers/video/am335x-fb.c                               | 1 +
 drivers/video/atmel_hlcdfb.c                            | 1 +
 drivers/video/atmel_lcdfb.c                             | 1 +
 drivers/video/bridge/ps862x.c                           | 1 +
 drivers/video/broadwell_igd.c                           | 1 +
 drivers/video/cfb_console.c                             | 1 +
 drivers/video/da8xx-fb.c                                | 1 +
 drivers/video/exynos/exynos_dp.c                        | 1 +
 drivers/video/exynos/exynos_fb.c                        | 1 +
 drivers/video/exynos/exynos_mipi_dsi.c                  | 1 +
 drivers/video/fsl_dcu_fb.c                              | 1 +
 drivers/video/ivybridge_igd.c                           | 1 +
 drivers/video/mali_dp.c                                 | 1 +
 drivers/video/meson/meson_vpu.c                         | 1 +
 drivers/video/mxsfb.c                                   | 1 +
 drivers/video/rockchip/rk3288_vop.c                     | 1 +
 drivers/video/rockchip/rk3399_vop.c                     | 1 +
 drivers/video/rockchip/rk_lvds.c                        | 1 +
 drivers/video/rockchip/rk_mipi.c                        | 1 +
 drivers/video/rockchip/rk_vop.c                         | 1 +
 drivers/video/sandbox_sdl.c                             | 1 +
 drivers/video/simplefb.c                                | 1 +
 drivers/video/stm32/stm32_dsi.c                         | 1 +
 drivers/video/stm32/stm32_ltdc.c                        | 1 +
 drivers/video/sunxi/sunxi_lcd.c                         | 1 +
 drivers/video/tegra.c                                   | 1 +
 drivers/video/video-uclass.c                            | 1 +
 drivers/video/videomodes.c                              | 1 +
 drivers/watchdog/armada-37xx-wdt.c                      | 1 +
 drivers/watchdog/at91sam9_wdt.c                         | 1 +
 drivers/watchdog/mt7621_wdt.c                           | 1 +
 drivers/watchdog/orion_wdt.c                            | 1 +
 drivers/watchdog/sbsa_gwdt.c                            | 1 +
 drivers/watchdog/sp805_wdt.c                            | 1 +
 drivers/watchdog/wdt-uclass.c                           | 1 +
 drivers/xen/gnttab.c                                    | 1 +
 env/callback.c                                          | 1 +
 env/common.c                                            | 1 +
 env/eeprom.c                                            | 1 +
 env/env.c                                               | 1 +
 env/ext4.c                                              | 1 +
 env/flash.c                                             | 1 +
 env/mmc.c                                               | 1 +
 env/nand.c                                              | 1 +
 env/nowhere.c                                           | 1 +
 env/nvram.c                                             | 1 +
 env/onenand.c                                           | 1 +
 env/remote.c                                            | 1 +
 env/sf.c                                                | 1 +
 env/ubi.c                                               | 1 +
 examples/standalone/stubs.c                             | 1 +
 fs/ext4/ext4_journal.c                                  | 1 +
 fs/ext4/ext4_journal.h                                  | 1 +
 fs/ext4/ext4fs.c                                        | 2 +-
 fs/fs.c                                                 | 1 +
 fs/reiserfs/reiserfs_private.h                          | 2 ++
 fs/ubifs/ubifs.c                                        | 1 +
 include/audio_codec.h                                   | 2 ++
 include/axi.h                                           | 2 ++
 include/backlight.h                                     | 2 ++
 include/board.h                                         | 3 +++
 include/bootcount.h                                     | 1 +
 include/cache.h                                         | 2 ++
 include/common.h                                        | 1 -
 include/cpu.h                                           | 2 ++
 include/dm/device-internal.h                            | 1 +
 include/dma.h                                           | 2 ++
 include/exports.h                                       | 1 +
 include/ext_common.h                                    | 2 ++
 include/image-sparse.h                                  | 1 +
 include/init.h                                          | 7 +++----
 include/led.h                                           | 2 ++
 include/libata.h                                        | 2 --
 include/misc.h                                          | 2 ++
 include/netdev.h                                        | 2 ++
 include/pci.h                                           | 2 --
 include/power/as3722.h                                  | 2 ++
 include/power/regulator.h                               | 2 ++
 include/pwm.h                                           | 2 ++
 include/ram.h                                           | 2 ++
 include/scsi.h                                          | 2 ++
 include/soc.h                                           | 2 ++
 include/sysreset.h                                      | 2 ++
 include/tee.h                                           | 2 ++
 include/tlv_eeprom.h                                    | 2 ++
 include/tpm-common.h                                    | 2 ++
 include/tpm-v1.h                                        | 2 ++
 include/tpm-v2.h                                        | 2 ++
 include/tps6586x.h                                      | 2 ++
 include/ufs.h                                           | 3 +++
 lib/acpi/acpi_table.c                                   | 1 +
 lib/asm-offsets.c                                       | 1 +
 lib/efi/efi_app.c                                       | 1 +
 lib/efi/efi_info.c                                      | 1 +
 lib/efi_loader/efi_boottime.c                           | 1 +
 lib/efi_loader/efi_gop.c                                | 1 +
 lib/efi_loader/efi_memory.c                             | 1 +
 lib/efi_loader/efi_rng.c                                | 1 +
 lib/efi_loader/efi_runtime.c                            | 1 +
 lib/fdtdec.c                                            | 1 +
 lib/optee/optee.c                                       | 1 +
 lib/time.c                                              | 1 +
 lib/trace.c                                             | 1 +
 lib/zlib/zlib.c                                         | 1 +
 net/eth-uclass.c                                        | 1 +
 net/eth_legacy.c                                        | 1 +
 net/tftp.c                                              | 1 +
 post/drivers/memory.c                                   | 1 +
 post/post.c                                             | 1 +
 test/bloblist.c                                         | 1 +
 test/dm/acpi.c                                          | 1 +
 test/dm/blk.c                                           | 1 +
 test/dm/bus.c                                           | 1 +
 test/dm/core.c                                          | 1 +
 test/dm/fdtdec.c                                        | 1 +
 test/dm/ram.c                                           | 1 +
 test/dm/test-fdt.c                                      | 1 +
 test/dm/test-main.c                                     | 1 +
 test/log/nolog_test.c                                   | 1 +
 test/log/syslog_test.c                                  | 1 +
 test/ut.c                                               | 1 +
 1298 files changed, 1340 insertions(+), 23 deletions(-)

diff --git a/arch/arc/lib/bootm.c b/arch/arc/lib/bootm.c
index 63d6207c0477..8a8d394a5f0c 100644
--- a/arch/arc/lib/bootm.c
+++ b/arch/arc/lib/bootm.c
@@ -11,6 +11,7 @@
 #include <lmb.h>
 #include <log.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arc/lib/cache.c b/arch/arc/lib/cache.c
index 85651b219cf8..f807cd83d6b5 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 <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/compiler.h>
 #include <linux/kernel.h>
diff --git a/arch/arc/lib/cpu.c b/arch/arc/lib/cpu.c
index d66a8c867acd..07f57878ef14 100644
--- a/arch/arc/lib/cpu.c
+++ b/arch/arc/lib/cpu.c
@@ -9,6 +9,7 @@
 #include <vsprintf.h>
 #include <asm/arcregs.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <linux/bitops.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arc/lib/relocate.c b/arch/arc/lib/relocate.c
index 6882ebec6d88..7f531c95eec6 100644
--- a/arch/arc/lib/relocate.c
+++ b/arch/arc/lib/relocate.c
@@ -7,6 +7,7 @@
 #include <elf.h>
 #include <log.h>
 #include <asm-generic/sections.h>
+#include <asm/global_data.h>
 
 extern ulong __image_copy_start;
 extern ulong __ivt_start;
diff --git a/arch/arm/cpu/arm1136/mx35/generic.c b/arch/arm/cpu/arm1136/mx35/generic.c
index 10f9ce42708e..cbf76ab4feec 100644
--- a/arch/arm/cpu/arm1136/mx35/generic.c
+++ b/arch/arm/cpu/arm1136/mx35/generic.c
@@ -12,6 +12,7 @@
 #include <div64.h>
 #include <init.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <asm/arch/imx-regs.h>
diff --git a/arch/arm/cpu/arm926ejs/armada100/dram.c b/arch/arm/cpu/arm926ejs/armada100/dram.c
index da0615faf159..c97b5b1940a5 100644
--- a/arch/arm/cpu/arm926ejs/armada100/dram.c
+++ b/arch/arm/cpu/arm926ejs/armada100/dram.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/armada100.h>
 
diff --git a/arch/arm/cpu/arm926ejs/armada100/timer.c b/arch/arm/cpu/arm926ejs/armada100/timer.c
index 0f1e68c8355f..ec73393d0fc7 100644
--- a/arch/arm/cpu/arm926ejs/armada100/timer.c
+++ b/arch/arm/cpu/arm926ejs/armada100/timer.c
@@ -12,6 +12,7 @@
 #include <time.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/armada100.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 
 /*
diff --git a/arch/arm/cpu/arm926ejs/mx25/generic.c b/arch/arm/cpu/arm926ejs/mx25/generic.c
index a4528cbaf529..9cd60abcccbd 100644
--- a/arch/arm/cpu/arm926ejs/mx25/generic.c
+++ b/arch/arm/cpu/arm926ejs/mx25/generic.c
@@ -15,6 +15,7 @@
 #include <net.h>
 #include <netdev.h>
 #include <vsprintf.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch-imx/cpu.h>
 #include <asm/arch/imx-regs.h>
diff --git a/arch/arm/cpu/arm926ejs/mx27/timer.c b/arch/arm/cpu/arm926ejs/mx27/timer.c
index 408e88aa129e..4fd6a8059685 100644
--- a/arch/arm/cpu/arm926ejs/mx27/timer.c
+++ b/arch/arm/cpu/arm926ejs/mx27/timer.c
@@ -19,6 +19,7 @@
 #include <div64.h>
 #include <init.h>
 #include <time.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/ptrace.h>
diff --git a/arch/arm/cpu/arm926ejs/mxs/mxs.c b/arch/arm/cpu/arm926ejs/mxs/mxs.c
index 8243aeb2c0f6..c9362136fbf9 100644
--- a/arch/arm/cpu/arm926ejs/mxs/mxs.c
+++ b/arch/arm/cpu/arm926ejs/mxs/mxs.c
@@ -15,6 +15,7 @@
 #include <hang.h>
 #include <init.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/io.h>
diff --git a/arch/arm/cpu/arm926ejs/mxs/spl_boot.c b/arch/arm/cpu/arm926ejs/mxs/spl_boot.c
index 1501d7df0dc6..a16a15e79d83 100644
--- a/arch/arm/cpu/arm926ejs/mxs/spl_boot.c
+++ b/arch/arm/cpu/arm926ejs/mxs/spl_boot.c
@@ -11,6 +11,7 @@
 #include <init.h>
 #include <log.h>
 #include <serial.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
diff --git a/arch/arm/cpu/arm926ejs/mxs/timer.c b/arch/arm/cpu/arm926ejs/mxs/timer.c
index 5ab4ed0c5a3d..3dff3d768d1c 100644
--- a/arch/arm/cpu/arm926ejs/mxs/timer.c
+++ b/arch/arm/cpu/arm926ejs/mxs/timer.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <init.h>
 #include <time.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
diff --git a/arch/arm/cpu/arm926ejs/spear/spr_misc.c b/arch/arm/cpu/arm926ejs/spear/spr_misc.c
index 998423b6525c..044052b32f93 100644
--- a/arch/arm/cpu/arm926ejs/spear/spr_misc.c
+++ b/arch/arm/cpu/arm926ejs/spear/spr_misc.c
@@ -11,6 +11,7 @@
 #include <i2c.h>
 #include <init.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <linux/mtd/st_smi.h>
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
diff --git a/arch/arm/cpu/arm926ejs/spear/timer.c b/arch/arm/cpu/arm926ejs/spear/timer.c
index dd0f15c0ceee..b42baa71506f 100644
--- a/arch/arm/cpu/arm926ejs/spear/timer.c
+++ b/arch/arm/cpu/arm926ejs/spear/timer.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <init.h>
 #include <time.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/spr_gpt.h>
diff --git a/arch/arm/cpu/armv7/arch_timer.c b/arch/arm/cpu/armv7/arch_timer.c
index 871629c2333b..d96406f7626f 100644
--- a/arch/arm/cpu/armv7/arch_timer.c
+++ b/arch/arm/cpu/armv7/arch_timer.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <init.h>
 #include <time.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <div64.h>
 #include <bootstage.h>
diff --git a/arch/arm/cpu/armv7/ls102xa/clock.c b/arch/arm/cpu/armv7/ls102xa/clock.c
index f3bdb14c0722..940995ef5af1 100644
--- a/arch/arm/cpu/armv7/ls102xa/clock.c
+++ b/arch/arm/cpu/armv7/ls102xa/clock.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <clock_legacy.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/immap_ls102xa.h>
 #include <asm/arch/clock.h>
diff --git a/arch/arm/cpu/armv7/ls102xa/cpu.c b/arch/arm/cpu/armv7/ls102xa/cpu.c
index ce472aa9bd54..cbc8254b42a0 100644
--- a/arch/arm/cpu/armv7/ls102xa/cpu.c
+++ b/arch/arm/cpu/armv7/ls102xa/cpu.c
@@ -9,6 +9,7 @@
 #include <net.h>
 #include <vsprintf.h>
 #include <asm/arch/clock.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/immap_ls102xa.h>
 #include <asm/cache.h>
diff --git a/arch/arm/cpu/armv7/ls102xa/fdt.c b/arch/arm/cpu/armv7/ls102xa/fdt.c
index d8cb78ecc675..d1d09f936500 100644
--- a/arch/arm/cpu/armv7/ls102xa/fdt.c
+++ b/arch/arm/cpu/armv7/ls102xa/fdt.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <clock_legacy.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <asm/io.h>
diff --git a/arch/arm/cpu/armv7/ls102xa/timer.c b/arch/arm/cpu/armv7/ls102xa/timer.c
index 2a32b30999fe..d79bf105f13a 100644
--- a/arch/arm/cpu/armv7/ls102xa/timer.c
+++ b/arch/arm/cpu/armv7/ls102xa/timer.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <init.h>
 #include <time.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <div64.h>
 #include <asm/arch/immap_ls102xa.h>
diff --git a/arch/arm/cpu/armv7/s5p-common/cpu_info.c b/arch/arm/cpu/armv7/s5p-common/cpu_info.c
index 7790f087a09d..d910282e2b29 100644
--- a/arch/arm/cpu/armv7/s5p-common/cpu_info.c
+++ b/arch/arm/cpu/armv7/s5p-common/cpu_info.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <fdtdec.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clk.h>
 
diff --git a/arch/arm/cpu/armv7/s5p-common/timer.c b/arch/arm/cpu/armv7/s5p-common/timer.c
index 3064fd25d4d0..8141f40d5c09 100644
--- a/arch/arm/cpu/armv7/s5p-common/timer.c
+++ b/arch/arm/cpu/armv7/s5p-common/timer.c
@@ -10,6 +10,7 @@
 #include <div64.h>
 #include <init.h>
 #include <time.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/pwm.h>
 #include <asm/arch/clk.h>
diff --git a/arch/arm/cpu/armv7/s5p4418/cpu.c b/arch/arm/cpu/armv7/s5p4418/cpu.c
index 8add9474ad23..3c71a37a74bf 100644
--- a/arch/arm/cpu/armv7/s5p4418/cpu.c
+++ b/arch/arm/cpu/armv7/s5p4418/cpu.c
@@ -8,6 +8,7 @@
 #include <command.h>
 #include <asm/system.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/sections.h>
 #include <asm/io.h>
 #include <asm/arch/nexell.h>
diff --git a/arch/arm/cpu/armv7/stv0991/timer.c b/arch/arm/cpu/armv7/stv0991/timer.c
index 919529aa1b03..07033acb5c18 100644
--- a/arch/arm/cpu/armv7/stv0991/timer.c
+++ b/arch/arm/cpu/armv7/stv0991/timer.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <init.h>
 #include <time.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch-stv0991/hardware.h>
 #include <asm/arch-stv0991/stv0991_cgu.h>
diff --git a/arch/arm/cpu/armv7/sunxi/timer.c b/arch/arm/cpu/armv7/sunxi/timer.c
index 65b64b5ac75b..b7585996369f 100644
--- a/arch/arm/cpu/armv7/sunxi/timer.c
+++ b/arch/arm/cpu/armv7/sunxi/timer.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <init.h>
 #include <time.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/timer.h>
 #include <linux/delay.h>
diff --git a/arch/arm/cpu/armv7/vf610/generic.c b/arch/arm/cpu/armv7/vf610/generic.c
index 743bfced6438..c23ddc12b456 100644
--- a/arch/arm/cpu/armv7/vf610/generic.c
+++ b/arch/arm/cpu/armv7/vf610/generic.c
@@ -10,6 +10,7 @@
 #include <init.h>
 #include <net.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/clock.h>
diff --git a/arch/arm/cpu/armv7/vf610/timer.c b/arch/arm/cpu/armv7/vf610/timer.c
index fa8f8fae10a0..a9c1a8fcebc1 100644
--- a/arch/arm/cpu/armv7/vf610/timer.c
+++ b/arch/arm/cpu/armv7/vf610/timer.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <init.h>
 #include <time.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <div64.h>
 #include <asm/arch/imx-regs.h>
diff --git a/arch/arm/cpu/armv7m/systick-timer.c b/arch/arm/cpu/armv7m/systick-timer.c
index d2672fd40cdb..556eaf8c74ad 100644
--- a/arch/arm/cpu/armv7m/systick-timer.c
+++ b/arch/arm/cpu/armv7m/systick-timer.c
@@ -24,6 +24,7 @@
 #include <common.h>
 #include <init.h>
 #include <time.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
 
diff --git a/arch/arm/cpu/armv8/cache_v8.c b/arch/arm/cpu/armv8/cache_v8.c
index 7c31d98a6f03..15cecb5e0b34 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 <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/system.h>
 #include <asm/armv8/mmu.h>
 
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
index 8a2f4048ecb4..3654cbf3b497 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
@@ -14,6 +14,7 @@
 #include <net.h>
 #include <vsprintf.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/ptrace.h>
 #include <linux/errno.h>
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c
index c56689086de6..63d34e1ec039 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <clock_legacy.h>
 #include <cpu_func.h>
+#include <asm/global_data.h>
 #include <linux/compiler.h>
 #include <asm/io.h>
 #include <asm/processor.h>
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c
index 7f8178f72ebd..767359fa5bd6 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <clock_legacy.h>
 #include <cpu_func.h>
+#include <asm/global_data.h>
 #include <linux/compiler.h>
 #include <fsl_ifc.h>
 #include <asm/processor.h>
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/mp.c b/arch/arm/cpu/armv8/fsl-layerscape/mp.c
index bd85351705a7..5ac545f9df81 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 <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/system.h>
 #include <asm/arch/mp.h>
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ppa.c b/arch/arm/cpu/armv8/fsl-layerscape/ppa.c
index 1ddb267093cb..f26be5a25b02 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/ppa.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/ppa.c
@@ -8,6 +8,7 @@
 #include <config.h>
 #include <errno.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/system.h>
 #include <asm/types.h>
 #include <asm/arch/soc.h>
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/spl.c b/arch/arm/cpu/armv8/fsl-layerscape/spl.c
index 77724336d62c..7d594a9f7490 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/spl.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/spl.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <spl.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <fsl_ifc.h>
 #include <i2c.h>
diff --git a/arch/arm/cpu/armv8/generic_timer.c b/arch/arm/cpu/armv8/generic_timer.c
index e23629ab0bc3..f27a74b9d09b 100644
--- a/arch/arm/cpu/armv8/generic_timer.c
+++ b/arch/arm/cpu/armv8/generic_timer.c
@@ -8,6 +8,7 @@
 #include <bootstage.h>
 #include <command.h>
 #include <time.h>
+#include <asm/global_data.h>
 #include <asm/system.h>
 #include <linux/bitops.h>
 
diff --git a/arch/arm/cpu/armv8/s32v234/generic.c b/arch/arm/cpu/armv8/s32v234/generic.c
index de5a098adb8f..0fc98852228a 100644
--- a/arch/arm/cpu/armv8/s32v234/generic.c
+++ b/arch/arm/cpu/armv8/s32v234/generic.c
@@ -8,6 +8,7 @@
 #include <cpu_func.h>
 #include <init.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/clock.h>
diff --git a/arch/arm/cpu/armv8/sec_firmware.c b/arch/arm/cpu/armv8/sec_firmware.c
index bfc0fac3eff2..c6c4fcc7e073 100644
--- a/arch/arm/cpu/armv8/sec_firmware.c
+++ b/arch/arm/cpu/armv8/sec_firmware.c
@@ -10,6 +10,7 @@
 #include <image.h>
 #include <log.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/ptrace.h>
 #include <linux/kernel.h>
 #include <asm/io.h>
diff --git a/arch/arm/include/asm/arch-rockchip/clock.h b/arch/arm/include/asm/arch-rockchip/clock.h
index 22de0aef8dc0..5108180ea77f 100644
--- a/arch/arm/include/asm/arch-rockchip/clock.h
+++ b/arch/arm/include/asm/arch-rockchip/clock.h
@@ -6,6 +6,8 @@
 #ifndef _ASM_ARCH_CLOCK_H
 #define _ASM_ARCH_CLOCK_H
 
+struct udevice;
+
 /* define pll mode */
 #define RKCLK_PLL_MODE_SLOW		0
 #define RKCLK_PLL_MODE_NORMAL		1
diff --git a/arch/arm/include/asm/arch-tegra/clock.h b/arch/arm/include/asm/arch-tegra/clock.h
index 8aa90d5c0c56..1d80d9e94617 100644
--- a/arch/arm/include/asm/arch-tegra/clock.h
+++ b/arch/arm/include/asm/arch-tegra/clock.h
@@ -8,6 +8,8 @@
 #ifndef _TEGRA_CLOCK_H_
 #define _TEGRA_CLOCK_H_
 
+struct udevice;
+
 /* Set of oscillator frequencies supported in the internal API. */
 enum clock_osc_freq {
 	/* All in MHz, so 13_0 is 13.0MHz */
diff --git a/arch/arm/include/asm/arch-tegra/tegra_i2c.h b/arch/arm/include/asm/arch-tegra/tegra_i2c.h
index 5316bc47e4b3..e57b9ef9c474 100644
--- a/arch/arm/include/asm/arch-tegra/tegra_i2c.h
+++ b/arch/arm/include/asm/arch-tegra/tegra_i2c.h
@@ -10,6 +10,8 @@
 
 #include <asm/types.h>
 
+struct udevice;
+
 enum {
 	I2C_TIMEOUT_USEC = 10000,	/* Wait time for completion */
 	I2C_FIFO_DEPTH = 8,		/* I2C fifo depth */
diff --git a/arch/arm/include/asm/global_data.h b/arch/arm/include/asm/global_data.h
index 2aafc6d2062e..5a935d34e20e 100644
--- a/arch/arm/include/asm/global_data.h
+++ b/arch/arm/include/asm/global_data.h
@@ -7,6 +7,9 @@
 #ifndef	__ASM_GBL_DATA_H
 #define __ASM_GBL_DATA_H
 
+#include <asm/types.h>
+#include <linux/types.h>
+
 /* Architecture-specific global data */
 struct arch_global_data {
 #if defined(CONFIG_FSL_ESDHC) || defined(CONFIG_FSL_ESDHC_IMX)
diff --git a/arch/arm/include/asm/mach-imx/video.h b/arch/arm/include/asm/mach-imx/video.h
index d1a14ad7d348..1fdc2de662a3 100644
--- a/arch/arm/include/asm/mach-imx/video.h
+++ b/arch/arm/include/asm/mach-imx/video.h
@@ -16,9 +16,7 @@ struct display_info_t {
 	struct	fb_videomode mode;
 };
 
-#ifdef CONFIG_IMX_HDMI
-extern int detect_hdmi(struct display_info_t const *dev);
-#endif
+int detect_hdmi(struct display_info_t const *dev);
 
 #ifdef CONFIG_IMX_VIDEO_SKIP
 extern struct display_info_t const displays[];
diff --git a/arch/arm/include/asm/secure.h b/arch/arm/include/asm/secure.h
index 50582c972b7a..64e5582c1f2a 100644
--- a/arch/arm/include/asm/secure.h
+++ b/arch/arm/include/asm/secure.h
@@ -2,6 +2,7 @@
 #define __ASM_SECURE_H
 
 #include <config.h>
+#include <asm/global_data.h>
 
 #define __secure __attribute__ ((section ("._secure.text")))
 #define __secure_data __attribute__ ((section ("._secure.data")))
diff --git a/arch/arm/include/asm/string.h b/arch/arm/include/asm/string.h
index 11eaa34fab8c..cefeddd73f12 100644
--- a/arch/arm/include/asm/string.h
+++ b/arch/arm/include/asm/string.h
@@ -1,8 +1,6 @@
 #ifndef __ASM_ARM_STRING_H
 #define __ASM_ARM_STRING_H
 
-#include <config.h>
-
 /*
  * We don't do inline string functions, since the
  * optimised inline asm versions are not small.
diff --git a/arch/arm/include/asm/ti-common/sys_proto.h b/arch/arm/include/asm/ti-common/sys_proto.h
index db042a1aef2d..a96a8382fb6e 100644
--- a/arch/arm/include/asm/ti-common/sys_proto.h
+++ b/arch/arm/include/asm/ti-common/sys_proto.h
@@ -6,6 +6,8 @@
 #ifndef _TI_COMMON_SYS_PROTO_H_
 #define _TI_COMMON_SYS_PROTO_H_
 
+#include <asm/global_data.h>
+
 DECLARE_GLOBAL_DATA_PTR;
 
 #ifdef CONFIG_ARCH_OMAP2PLUS
diff --git a/arch/arm/lib/bdinfo.c b/arch/arm/lib/bdinfo.c
index 25bc6e80f476..572f7fb2429f 100644
--- a/arch/arm/lib/bdinfo.c
+++ b/arch/arm/lib/bdinfo.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/lib/bootm-fdt.c b/arch/arm/lib/bootm-fdt.c
index 02a49a8e10f9..e1970ea9f148 100644
--- a/arch/arm/lib/bootm-fdt.c
+++ b/arch/arm/lib/bootm-fdt.c
@@ -19,6 +19,7 @@
 #ifdef CONFIG_ARMV7_NONSEC
 #include <asm/armv7.h>
 #endif
+#include <asm/global_data.h>
 #include <asm/psci.h>
 #include <asm/spin_table.h>
 
diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c
index 1206e306db65..70c181e45b7e 100644
--- a/arch/arm/lib/bootm.c
+++ b/arch/arm/lib/bootm.c
@@ -19,6 +19,7 @@
 #include <hang.h>
 #include <lmb.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <dm/root.h>
 #include <env.h>
 #include <image.h>
diff --git a/arch/arm/lib/cache-cp15.c b/arch/arm/lib/cache-cp15.c
index abd81d21c73c..24050e5bdd30 100644
--- a/arch/arm/lib/cache-cp15.c
+++ b/arch/arm/lib/cache-cp15.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/system.h>
 #include <asm/cache.h>
 #include <linux/compiler.h>
diff --git a/arch/arm/lib/cache.c b/arch/arm/lib/cache.c
index ee7d14b2d31d..b494611d6e8d 100644
--- a/arch/arm/lib/cache.c
+++ b/arch/arm/lib/cache.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/lib/image.c b/arch/arm/lib/image.c
index 94590d3049ad..e394c1ad9093 100644
--- a/arch/arm/lib/image.c
+++ b/arch/arm/lib/image.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <image.h>
 #include <mapmem.h>
+#include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/sizes.h>
 
diff --git a/arch/arm/lib/interrupts.c b/arch/arm/lib/interrupts.c
index 703be5a3209c..05bb1a38b35e 100644
--- a/arch/arm/lib/interrupts.c
+++ b/arch/arm/lib/interrupts.c
@@ -22,6 +22,7 @@
 #include <cpu_func.h>
 #include <efi_loader.h>
 #include <irq_func.h>
+#include <asm/global_data.h>
 #include <asm/proc-armv/ptrace.h>
 #include <asm/ptrace.h>
 #include <asm/u-boot-arm.h>
diff --git a/arch/arm/lib/interrupts_64.c b/arch/arm/lib/interrupts_64.c
index 529948901376..c653e67db286 100644
--- a/arch/arm/lib/interrupts_64.c
+++ b/arch/arm/lib/interrupts_64.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <asm/global_data.h>
 #include <asm/ptrace.h>
 #include <irq_func.h>
 #include <linux/compiler.h>
diff --git a/arch/arm/lib/spl.c b/arch/arm/lib/spl.c
index af0c9ad6bd6c..b2b54f28fc4b 100644
--- a/arch/arm/lib/spl.c
+++ b/arch/arm/lib/spl.c
@@ -14,6 +14,7 @@
 #include <spl.h>
 #include <image.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <linux/compiler.h>
 #include <asm/mach-types.h>
 
diff --git a/arch/arm/lib/stack.c b/arch/arm/lib/stack.c
index 96a248c0a907..b03e1cfc80c9 100644
--- a/arch/arm/lib/stack.c
+++ b/arch/arm/lib/stack.c
@@ -12,6 +12,7 @@
  */
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-aspeed/ast2500/board_common.c b/arch/arm/mach-aspeed/ast2500/board_common.c
index 3482ee91efd8..aca200223129 100644
--- a/arch/arm/mach-aspeed/ast2500/board_common.c
+++ b/arch/arm/mach-aspeed/ast2500/board_common.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <ram.h>
 #include <timer.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/timer.h>
 #include <asm/arch/wdt.h>
diff --git a/arch/arm/mach-aspeed/ast2500/sdram_ast2500.c b/arch/arm/mach-aspeed/ast2500/sdram_ast2500.c
index a3adaa8a999c..cfb0374d60c8 100644
--- a/arch/arm/mach-aspeed/ast2500/sdram_ast2500.c
+++ b/arch/arm/mach-aspeed/ast2500/sdram_ast2500.c
@@ -13,6 +13,7 @@
 #include <ram.h>
 #include <regmap.h>
 #include <reset.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/scu_ast2500.h>
 #include <asm/arch/sdram_ast2500.h>
diff --git a/arch/arm/mach-at91/arm920t/clock.c b/arch/arm/mach-at91/arm920t/clock.c
index 9a57dd40891b..c7440278d8f8 100644
--- a/arch/arm/mach-at91/arm920t/clock.c
+++ b/arch/arm/mach-at91/arm920t/clock.c
@@ -8,6 +8,7 @@
  * Copyright (C) 2009 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
  */
 #include <common.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/at91_pmc.h>
diff --git a/arch/arm/mach-at91/arm920t/timer.c b/arch/arm/mach-at91/arm920t/timer.c
index dca2d2c70c77..c400e8781356 100644
--- a/arch/arm/mach-at91/arm920t/timer.c
+++ b/arch/arm/mach-at91/arm920t/timer.c
@@ -16,6 +16,7 @@
 #include <common.h>
 #include <init.h>
 #include <time.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 
 #include <asm/io.h>
diff --git a/arch/arm/mach-at91/arm926ejs/clock.c b/arch/arm/mach-at91/arm926ejs/clock.c
index 7156185a46fa..c68e0c0c3c44 100644
--- a/arch/arm/mach-at91/arm926ejs/clock.c
+++ b/arch/arm/mach-at91/arm926ejs/clock.c
@@ -8,6 +8,7 @@
  */
 
 #include <common.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/at91_pmc.h>
diff --git a/arch/arm/mach-at91/arm926ejs/timer.c b/arch/arm/mach-at91/arm926ejs/timer.c
index 42ef349966b0..a8cf0e4bd799 100644
--- a/arch/arm/mach-at91/arm926ejs/timer.c
+++ b/arch/arm/mach-at91/arm926ejs/timer.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <init.h>
 #include <time.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/at91_pit.h>
diff --git a/arch/arm/mach-at91/armv7/clock.c b/arch/arm/mach-at91/armv7/clock.c
index 39268969580b..aa6bb6bf31e0 100644
--- a/arch/arm/mach-at91/armv7/clock.c
+++ b/arch/arm/mach-at91/armv7/clock.c
@@ -10,6 +10,7 @@
  */
 
 #include <common.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/io.h>
diff --git a/arch/arm/mach-at91/armv7/timer.c b/arch/arm/mach-at91/armv7/timer.c
index a6346c01b285..1f54c5dcad98 100644
--- a/arch/arm/mach-at91/armv7/timer.c
+++ b/arch/arm/mach-at91/armv7/timer.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <init.h>
 #include <time.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/at91_pit.h>
diff --git a/arch/arm/mach-at91/spl_at91.c b/arch/arm/mach-at91/spl_at91.c
index 35a3d5185d3f..d0c732539248 100644
--- a/arch/arm/mach-at91/spl_at91.c
+++ b/arch/arm/mach-at91/spl_at91.c
@@ -12,6 +12,7 @@
 #include <hang.h>
 #include <init.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/at91_common.h>
 #include <asm/arch/at91sam9_matrix.h>
diff --git a/arch/arm/mach-bcm283x/init.c b/arch/arm/mach-bcm283x/init.c
index f2a541162370..b2708e4876ed 100644
--- a/arch/arm/mach-bcm283x/init.c
+++ b/arch/arm/mach-bcm283x/init.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <dm/device.h>
 #include <fdt_support.h>
 
diff --git a/arch/arm/mach-davinci/cpu.c b/arch/arm/mach-davinci/cpu.c
index 40dd44af67eb..aefd21dc458a 100644
--- a/arch/arm/mach-davinci/cpu.c
+++ b/arch/arm/mach-davinci/cpu.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <init.h>
 #include <asm/arch/hardware.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-davinci/misc.c b/arch/arm/mach-davinci/misc.c
index 5bfc47dae457..90b38b7e020e 100644
--- a/arch/arm/mach-davinci/misc.c
+++ b/arch/arm/mach-davinci/misc.c
@@ -15,6 +15,7 @@
 #include <log.h>
 #include <net.h>
 #include <asm/arch/hardware.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/davinci_misc.h>
 
diff --git a/arch/arm/mach-davinci/timer.c b/arch/arm/mach-davinci/timer.c
index a6681821f6dd..43e0574901ee 100644
--- a/arch/arm/mach-davinci/timer.c
+++ b/arch/arm/mach-davinci/timer.c
@@ -23,6 +23,7 @@
 #include <common.h>
 #include <init.h>
 #include <time.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/timer_defs.h>
 #include <div64.h>
diff --git a/arch/arm/mach-exynos/spl_boot.c b/arch/arm/mach-exynos/spl_boot.c
index 9c7ca49519b9..27f0dac182d3 100644
--- a/arch/arm/mach-exynos/spl_boot.c
+++ b/arch/arm/mach-exynos/spl_boot.c
@@ -7,6 +7,7 @@
 #include <config.h>
 #include <init.h>
 #include <log.h>
+#include <asm/global_data.h>
 
 #include <asm/cache.h>
 #include <asm/arch/clock.h>
diff --git a/arch/arm/mach-imx/cpu.c b/arch/arm/mach-imx/cpu.c
index fe8d5947ccea..f2e95ffac7bd 100644
--- a/arch/arm/mach-imx/cpu.c
+++ b/arch/arm/mach-imx/cpu.c
@@ -6,8 +6,8 @@
  * (C) Copyright 2009 Freescale Semiconductor, Inc.
  */
 
-#include <bootm.h>
 #include <common.h>
+#include <bootm.h>
 #include <dm.h>
 #include <init.h>
 #include <log.h>
diff --git a/arch/arm/mach-imx/imx8/ahab.c b/arch/arm/mach-imx/imx8/ahab.c
index 5dbe1d56e02f..bbcefc8e9b61 100644
--- a/arch/arm/mach-imx/imx8/ahab.c
+++ b/arch/arm/mach-imx/imx8/ahab.c
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <errno.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/sci/sci.h>
 #include <asm/mach-imx/sys_proto.h>
diff --git a/arch/arm/mach-imx/imx8/clock.c b/arch/arm/mach-imx/imx8/clock.c
index d747e1332f04..9941b57b4be5 100644
--- a/arch/arm/mach-imx/imx8/clock.c
+++ b/arch/arm/mach-imx/imx8/clock.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <asm/global_data.h>
 #include <linux/errno.h>
 #include <asm/arch/clock.h>
 
diff --git a/arch/arm/mach-imx/imx8/cpu.c b/arch/arm/mach-imx/imx8/cpu.c
index 38b2c0926f58..293c931b2ffa 100644
--- a/arch/arm/mach-imx/imx8/cpu.c
+++ b/arch/arm/mach-imx/imx8/cpu.c
@@ -11,6 +11,7 @@
 #include <init.h>
 #include <log.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <dm/device-internal.h>
 #include <dm/lists.h>
 #include <dm/uclass.h>
diff --git a/arch/arm/mach-imx/imx8/fdt.c b/arch/arm/mach-imx/imx8/fdt.c
index 3e05b972a450..a132ce2e6a3a 100644
--- a/arch/arm/mach-imx/imx8/fdt.c
+++ b/arch/arm/mach-imx/imx8/fdt.c
@@ -7,6 +7,7 @@
 #include <log.h>
 #include <asm/arch/sci/sci.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 #include <dm/ofnode.h>
 #include <fdt_support.h>
 #include <linux/libfdt.h>
diff --git a/arch/arm/mach-imx/imx8/iomux.c b/arch/arm/mach-imx/imx8/iomux.c
index b8e6f48a5f77..9c3cfbf0068c 100644
--- a/arch/arm/mach-imx/imx8/iomux.c
+++ b/arch/arm/mach-imx/imx8/iomux.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/iomux.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 564d1bfdfb20..6f9b1c99fcd2 100644
--- a/arch/arm/mach-imx/imx8/snvs_security_sc.c
+++ b/arch/arm/mach-imx/imx8/snvs_security_sc.c
@@ -18,6 +18,7 @@
 #include <asm/arch/sci/sci.h>
 #include <asm/arch-imx8/imx8-pins.h>
 #include <asm/arch-imx8/snvs_security_sc.h>
+#include <asm/global_data.h>
 
 /* Access to gd */
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-imx/imx8m/clock_imx8mm.c b/arch/arm/mach-imx/imx8m/clock_imx8mm.c
index 3610f5b2fca5..7f99c5c4b916 100644
--- a/arch/arm/mach-imx/imx8m/clock_imx8mm.c
+++ b/arch/arm/mach-imx/imx8m/clock_imx8mm.c
@@ -9,6 +9,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <div64.h>
 #include <errno.h>
diff --git a/arch/arm/mach-imx/imx8m/soc.c b/arch/arm/mach-imx/imx8m/soc.c
index 8dfc8645fc0a..3ad1352f03f2 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 <asm/arch/imx-regs.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/sys_proto.h>
diff --git a/arch/arm/mach-imx/misc.c b/arch/arm/mach-imx/misc.c
index 818f38e17ddb..d82efa7f8f0a 100644
--- a/arch/arm/mach-imx/misc.c
+++ b/arch/arm/mach-imx/misc.c
@@ -7,6 +7,7 @@
 #include <lmb.h>
 #include <log.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/io.h>
diff --git a/arch/arm/mach-imx/mx5/mx53_dram.c b/arch/arm/mach-imx/mx5/mx53_dram.c
index a7f033f3f44d..f74414419470 100644
--- a/arch/arm/mach-imx/mx5/mx53_dram.c
+++ b/arch/arm/mach-imx/mx5/mx53_dram.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-imx/mx6/litesom.c b/arch/arm/mach-imx/mx6/litesom.c
index 92176dc86158..699a3dc317f0 100644
--- a/arch/arm/mach-imx/mx6/litesom.c
+++ b/arch/arm/mach-imx/mx6/litesom.c
@@ -12,6 +12,7 @@
 #include <asm/arch/mx6ul_pins.h>
 #include <asm/arch/mx6-pins.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/mach-imx/boot_mode.h>
diff --git a/arch/arm/mach-imx/mx6/opos6ul.c b/arch/arm/mach-imx/mx6/opos6ul.c
index 4b3c59f7eef4..e9d78740a157 100644
--- a/arch/arm/mach-imx/mx6/opos6ul.c
+++ b/arch/arm/mach-imx/mx6/opos6ul.c
@@ -8,6 +8,7 @@
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <common.h>
 #include <env.h>
diff --git a/arch/arm/mach-imx/mx7/clock.c b/arch/arm/mach-imx/mx7/clock.c
index aba9461d9204..b1d7290704a4 100644
--- a/arch/arm/mach-imx/mx7/clock.c
+++ b/arch/arm/mach-imx/mx7/clock.c
@@ -11,6 +11,7 @@
 #include <command.h>
 #include <div64.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <asm/arch/imx-regs.h>
diff --git a/arch/arm/mach-imx/mx7ulp/clock.c b/arch/arm/mach-imx/mx7ulp/clock.c
index a987ff22dfd5..467832074afb 100644
--- a/arch/arm/mach-imx/mx7ulp/clock.c
+++ b/arch/arm/mach-imx/mx7ulp/clock.c
@@ -7,6 +7,7 @@
 #include <clock_legacy.h>
 #include <command.h>
 #include <div64.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <errno.h>
 #include <asm/arch/clock.h>
diff --git a/arch/arm/mach-imx/speed.c b/arch/arm/mach-imx/speed.c
index e78b1fd71b6e..b729187ec817 100644
--- a/arch/arm/mach-imx/speed.c
+++ b/arch/arm/mach-imx/speed.c
@@ -11,6 +11,7 @@
 #include <clock_legacy.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/clock.h>
+#include <asm/global_data.h>
 
 #ifdef CONFIG_FSL_ESDHC_IMX
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-imx/spl.c b/arch/arm/mach-imx/spl.c
index 76a5f7aca613..982fb47bc89d 100644
--- a/arch/arm/mach-imx/spl.c
+++ b/arch/arm/mach-imx/spl.c
@@ -10,6 +10,7 @@
 #include <hang.h>
 #include <init.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
diff --git a/arch/arm/mach-imx/spl_imx_romapi.c b/arch/arm/mach-imx/spl_imx_romapi.c
index f588a5f52160..9f4d95982e59 100644
--- a/arch/arm/mach-imx/spl_imx_romapi.c
+++ b/arch/arm/mach-imx/spl_imx_romapi.c
@@ -7,6 +7,7 @@
 #include <errno.h>
 #include <image.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <linux/libfdt.h>
 #include <spl.h>
 
diff --git a/arch/arm/mach-imx/syscounter.c b/arch/arm/mach-imx/syscounter.c
index 7da43c32e0db..6dfed365d295 100644
--- a/arch/arm/mach-imx/syscounter.c
+++ b/arch/arm/mach-imx/syscounter.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <init.h>
 #include <time.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <div64.h>
 #include <asm/arch/imx-regs.h>
diff --git a/arch/arm/mach-k3/common.c b/arch/arm/mach-k3/common.c
index 8c903f14ff87..f01aeb40c9d5 100644
--- a/arch/arm/mach-k3/common.c
+++ b/arch/arm/mach-k3/common.c
@@ -12,6 +12,7 @@
 #include <init.h>
 #include <log.h>
 #include <spl.h>
+#include <asm/global_data.h>
 #include "common.h"
 #include <dm.h>
 #include <remoteproc.h>
diff --git a/arch/arm/mach-k3/sysfw-loader.c b/arch/arm/mach-k3/sysfw-loader.c
index 78c158c63f71..91182d04b227 100644
--- a/arch/arm/mach-k3/sysfw-loader.c
+++ b/arch/arm/mach-k3/sysfw-loader.c
@@ -14,6 +14,7 @@
 #include <malloc.h>
 #include <remoteproc.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <linux/soc/ti/ti_sci_protocol.h>
 #include <g_dnl.h>
 #include <usb.h>
diff --git a/arch/arm/mach-mediatek/mt7623/init.c b/arch/arm/mach-mediatek/mt7623/init.c
index 2778e260e024..5d837e059719 100644
--- a/arch/arm/mach-mediatek/mt7623/init.c
+++ b/arch/arm/mach-mediatek/mt7623/init.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <linux/io.h>
 #include <linux/sizes.h>
 #include <asm/arch/misc.h>
diff --git a/arch/arm/mach-mediatek/mt7629/init.c b/arch/arm/mach-mediatek/mt7629/init.c
index c260413a57a1..617a77e98003 100644
--- a/arch/arm/mach-mediatek/mt7629/init.c
+++ b/arch/arm/mach-mediatek/mt7629/init.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <ram.h>
 #include <asm/arch/misc.h>
+#include <asm/global_data.h>
 #include <asm/sections.h>
 #include <dm/uclass.h>
 #include <linux/bitops.h>
diff --git a/arch/arm/mach-mediatek/mt8512/init.c b/arch/arm/mach-mediatek/mt8512/init.c
index aa779f437663..c14e7d22e6fc 100644
--- a/arch/arm/mach-mediatek/mt8512/init.c
+++ b/arch/arm/mach-mediatek/mt8512/init.c
@@ -17,6 +17,7 @@
 #include <asm/arch/misc.h>
 #include <asm/armv8/mmu.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/sections.h>
 #include <dm/uclass.h>
 #include <dt-bindings/clock/mt8512-clk.h>
diff --git a/arch/arm/mach-mediatek/mt8516/init.c b/arch/arm/mach-mediatek/mt8516/init.c
index 13be39122115..0eb65aa76b5f 100644
--- a/arch/arm/mach-mediatek/mt8516/init.c
+++ b/arch/arm/mach-mediatek/mt8516/init.c
@@ -15,6 +15,7 @@
 #include <asm/arch/misc.h>
 #include <asm/armv8/mmu.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/sections.h>
 #include <dm/uclass.h>
 #include <dt-bindings/clock/mt8516-clk.h>
diff --git a/arch/arm/mach-mediatek/mt8518/init.c b/arch/arm/mach-mediatek/mt8518/init.c
index 531a403da1b0..28b00c3dec89 100644
--- a/arch/arm/mach-mediatek/mt8518/init.c
+++ b/arch/arm/mach-mediatek/mt8518/init.c
@@ -16,6 +16,7 @@
 #include <asm/arch/misc.h>
 #include <asm/armv8/mmu.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/sections.h>
 #include <dm/uclass.h>
 #include <dt-bindings/clock/mt8518-clk.h>
diff --git a/arch/arm/mach-meson/board-axg.c b/arch/arm/mach-meson/board-axg.c
index 5e0b3f6cb5e1..9ec63141ab15 100644
--- a/arch/arm/mach-meson/board-axg.c
+++ b/arch/arm/mach-meson/board-axg.c
@@ -11,6 +11,7 @@
 #include <asm/arch/eth.h>
 #include <asm/arch/axg.h>
 #include <asm/arch/mem.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/armv8/mmu.h>
 #include <linux/sizes.h>
diff --git a/arch/arm/mach-meson/board-common.c b/arch/arm/mach-meson/board-common.c
index 0f21ec8e5375..2e1dcf0e0109 100644
--- a/arch/arm/mach-meson/board-common.c
+++ b/arch/arm/mach-meson/board-common.c
@@ -10,6 +10,7 @@
 #include <asm/arch/boot.h>
 #include <env.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/ptrace.h>
 #include <linux/libfdt.h>
 #include <linux/err.h>
diff --git a/arch/arm/mach-meson/board-g12a.c b/arch/arm/mach-meson/board-g12a.c
index 14127ca737c1..bb75d4f8ad37 100644
--- a/arch/arm/mach-meson/board-g12a.c
+++ b/arch/arm/mach-meson/board-g12a.c
@@ -13,6 +13,7 @@
 #include <asm/arch/g12a.h>
 #include <asm/arch/mem.h>
 #include <asm/arch/meson-vpu.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/armv8/mmu.h>
 #include <linux/sizes.h>
diff --git a/arch/arm/mach-meson/board-gx.c b/arch/arm/mach-meson/board-gx.c
index c4cc11f1de31..6824b846d4d4 100644
--- a/arch/arm/mach-meson/board-gx.c
+++ b/arch/arm/mach-meson/board-gx.c
@@ -12,6 +12,7 @@
 #include <asm/arch/gx.h>
 #include <asm/arch/mem.h>
 #include <asm/arch/meson-vpu.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/armv8/mmu.h>
 #include <linux/sizes.h>
diff --git a/arch/arm/mach-meson/board-info.c b/arch/arm/mach-meson/board-info.c
index 3abb27e03b45..28385488995a 100644
--- a/arch/arm/mach-meson/board-info.c
+++ b/arch/arm/mach-meson/board-info.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm.h>
 #include <linux/bitfield.h>
diff --git a/arch/arm/mach-meson/sm.c b/arch/arm/mach-meson/sm.c
index ebbb880b71ea..1a8f23cb1faa 100644
--- a/arch/arm/mach-meson/sm.c
+++ b/arch/arm/mach-meson/sm.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <asm/arch/sm.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/ptrace.h>
 #include <linux/bitops.h>
 #include <linux/err.h>
diff --git a/arch/arm/mach-mvebu/arm64-common.c b/arch/arm/mach-mvebu/arm64-common.c
index c8c065e93c3b..fa687d8abbbd 100644
--- a/arch/arm/mach-mvebu/arm64-common.c
+++ b/arch/arm/mach-mvebu/arm64-common.c
@@ -8,6 +8,7 @@
 #include <fdtdec.h>
 #include <init.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/ptrace.h>
 #include <linux/libfdt.h>
 #include <linux/sizes.h>
diff --git a/arch/arm/mach-mvebu/armada3700/cpu.c b/arch/arm/mach-mvebu/armada3700/cpu.c
index e438b4922e14..70f76c7d7074 100644
--- a/arch/arm/mach-mvebu/armada3700/cpu.c
+++ b/arch/arm/mach-mvebu/armada3700/cpu.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <fdtdec.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/libfdt.h>
 #include <asm/io.h>
diff --git a/arch/arm/mach-mvebu/armada8k/dram.c b/arch/arm/mach-mvebu/armada8k/dram.c
index 3da9fa589d27..bab375e18acc 100644
--- a/arch/arm/mach-mvebu/armada8k/dram.c
+++ b/arch/arm/mach-mvebu/armada8k/dram.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <asm/global_data.h>
 #include <asm/ptrace.h>
 #include <asm/system.h>
 #include <linux/sizes.h>
diff --git a/arch/arm/mach-mvebu/dram.c b/arch/arm/mach-mvebu/dram.c
index 6c6f8d8c5c57..349e0cc4c180 100644
--- a/arch/arm/mach-mvebu/dram.c
+++ b/arch/arm/mach-mvebu/dram.c
@@ -8,6 +8,7 @@
 #include <config.h>
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
diff --git a/arch/arm/mach-mvebu/spl.c b/arch/arm/mach-mvebu/spl.c
index f645befb2c04..16ebb7a59e55 100644
--- a/arch/arm/mach-mvebu/spl.c
+++ b/arch/arm/mach-mvebu/spl.c
@@ -11,6 +11,7 @@
 #include <init.h>
 #include <log.h>
 #include <spl.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
diff --git a/arch/arm/mach-omap2/am33xx/board.c b/arch/arm/mach-omap2/am33xx/board.c
index a7b56b6bb3de..3b17446cd5d3 100644
--- a/arch/arm/mach-omap2/am33xx/board.c
+++ b/arch/arm/mach-omap2/am33xx/board.c
@@ -25,6 +25,7 @@
 #include <asm/arch/mem.h>
 #include <asm/arch/mmc_host_def.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/emif.h>
 #include <asm/gpio.h>
diff --git a/arch/arm/mach-omap2/boot-common.c b/arch/arm/mach-omap2/boot-common.c
index cb9d7fdb1563..05efe04dc359 100644
--- a/arch/arm/mach-omap2/boot-common.c
+++ b/arch/arm/mach-omap2/boot-common.c
@@ -11,6 +11,7 @@
 #include <ahci.h>
 #include <log.h>
 #include <spl.h>
+#include <asm/global_data.h>
 #include <asm/omap_common.h>
 #include <asm/arch/omap.h>
 #include <asm/arch/mmc_host_def.h>
diff --git a/arch/arm/mach-omap2/hwinit-common.c b/arch/arm/mach-omap2/hwinit-common.c
index 7a7086776ee0..3da50f974dc0 100644
--- a/arch/arm/mach-omap2/hwinit-common.c
+++ b/arch/arm/mach-omap2/hwinit-common.c
@@ -16,6 +16,7 @@
 #include <init.h>
 #include <spl.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 #include <linux/sizes.h>
 #include <asm/emif.h>
 #include <asm/omap_common.h>
diff --git a/arch/arm/mach-omap2/omap-cache.c b/arch/arm/mach-omap2/omap-cache.c
index 502ea6987ab7..1b246f844a84 100644
--- a/arch/arm/mach-omap2/omap-cache.c
+++ b/arch/arm/mach-omap2/omap-cache.c
@@ -15,6 +15,7 @@
 #include <cpu_func.h>
 #include <log.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-omap2/omap3/am35x_musb.c b/arch/arm/mach-omap2/omap3/am35x_musb.c
index 026e5d2d130b..95e15c1a51bc 100644
--- a/arch/arm/mach-omap2/omap3/am35x_musb.c
+++ b/arch/arm/mach-omap2/omap3/am35x_musb.c
@@ -9,6 +9,7 @@
  */
 
 #include <common.h>
+#include <dm.h>
 #include <log.h>
 #include <asm/io.h>
 #include <asm/arch/am35x_def.h>
diff --git a/arch/arm/mach-omap2/omap3/emif4.c b/arch/arm/mach-omap2/omap3/emif4.c
index 4cfa13238810..df6e9ce1d6ce 100644
--- a/arch/arm/mach-omap2/omap3/emif4.c
+++ b/arch/arm/mach-omap2/omap3/emif4.c
@@ -11,6 +11,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/mem.h>
 #include <asm/arch/sys_proto.h>
diff --git a/arch/arm/mach-omap2/omap3/sdrc.c b/arch/arm/mach-omap2/omap3/sdrc.c
index 1d65ed622704..4d85b1dee991 100644
--- a/arch/arm/mach-omap2/omap3/sdrc.c
+++ b/arch/arm/mach-omap2/omap3/sdrc.c
@@ -23,6 +23,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/mem.h>
 #include <asm/arch/sys_proto.h>
diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c
index bcfba16a08e5..82b10f6b2487 100644
--- a/arch/arm/mach-omap2/timer.c
+++ b/arch/arm/mach-omap2/timer.c
@@ -18,6 +18,7 @@
 #include <common.h>
 #include <init.h>
 #include <time.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/clock.h>
diff --git a/arch/arm/mach-orion5x/dram.c b/arch/arm/mach-orion5x/dram.c
index 33f65db48ea4..c9a3750e48de 100644
--- a/arch/arm/mach-orion5x/dram.c
+++ b/arch/arm/mach-orion5x/dram.c
@@ -12,6 +12,7 @@
 #include <config.h>
 #include <init.h>
 #include <asm/arch/cpu.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-orion5x/timer.c b/arch/arm/mach-orion5x/timer.c
index 4926bb777960..0adf3dcc6483 100644
--- a/arch/arm/mach-orion5x/timer.c
+++ b/arch/arm/mach-orion5x/timer.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <init.h>
 #include <time.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/delay.h>
 
diff --git a/arch/arm/mach-owl/soc.c b/arch/arm/mach-owl/soc.c
index fd6ee7c1c0f2..4d2b9d0b0ebc 100644
--- a/arch/arm/mach-owl/soc.c
+++ b/arch/arm/mach-owl/soc.c
@@ -8,6 +8,7 @@
 #include <cpu_func.h>
 #include <init.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <linux/arm-smccc.h>
 #include <linux/psci.h>
 #include <common.h>
diff --git a/arch/arm/mach-rmobile/memmap-gen3.c b/arch/arm/mach-rmobile/memmap-gen3.c
index 578cb9bfd3f8..a68eb806b353 100644
--- a/arch/arm/mach-rmobile/memmap-gen3.c
+++ b/arch/arm/mach-rmobile/memmap-gen3.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <asm/armv8/mmu.h>
+#include <asm/global_data.h>
 
 #define GEN3_NR_REGIONS 16
 
diff --git a/arch/arm/mach-rockchip/board.c b/arch/arm/mach-rockchip/board.c
index 430c0cbf41e4..eed8f589d23e 100644
--- a/arch/arm/mach-rockchip/board.c
+++ b/arch/arm/mach-rockchip/board.c
@@ -11,6 +11,7 @@
 #include <ram.h>
 #include <syscon.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch-rockchip/boot_mode.h>
 #include <asm/arch-rockchip/clock.h>
diff --git a/arch/arm/mach-rockchip/rk3036-board-spl.c b/arch/arm/mach-rockchip/rk3036-board-spl.c
index 6eb89e15b818..964e981b8637 100644
--- a/arch/arm/mach-rockchip/rk3036-board-spl.c
+++ b/arch/arm/mach-rockchip/rk3036-board-spl.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <debug_uart.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch-rockchip/bootrom.h>
 #include <asm/arch-rockchip/sdram_rk3036.h>
diff --git a/arch/arm/mach-rockchip/rk3036/rk3036.c b/arch/arm/mach-rockchip/rk3036/rk3036.c
index e9e020ff3f58..0a072cf03a88 100644
--- a/arch/arm/mach-rockchip/rk3036/rk3036.c
+++ b/arch/arm/mach-rockchip/rk3036/rk3036.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch-rockchip/grf_rk3036.h>
 #include <asm/arch-rockchip/hardware.h>
diff --git a/arch/arm/mach-rockchip/rk3128/rk3128.c b/arch/arm/mach-rockchip/rk3128/rk3128.c
index 740bd2ba0770..01dbfa75cb2b 100644
--- a/arch/arm/mach-rockchip/rk3128/rk3128.c
+++ b/arch/arm/mach-rockchip/rk3128/rk3128.c
@@ -4,6 +4,7 @@
  */
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-rockchip/rk3188/rk3188.c b/arch/arm/mach-rockchip/rk3188/rk3188.c
index 1b2f4a475719..85dcce90330b 100644
--- a/arch/arm/mach-rockchip/rk3188/rk3188.c
+++ b/arch/arm/mach-rockchip/rk3188/rk3188.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <log.h>
 #include <syscon.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch-rockchip/bootrom.h>
 #include <asm/arch-rockchip/clock.h>
diff --git a/arch/arm/mach-rockchip/rk3288/rk3288.c b/arch/arm/mach-rockchip/rk3288/rk3288.c
index 1a4ecdf62546..bc20bc5ab909 100644
--- a/arch/arm/mach-rockchip/rk3288/rk3288.c
+++ b/arch/arm/mach-rockchip/rk3288/rk3288.c
@@ -10,6 +10,7 @@
 #include <init.h>
 #include <malloc.h>
 #include <asm/armv7.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch-rockchip/bootrom.h>
 #include <asm/arch-rockchip/clock.h>
diff --git a/arch/arm/mach-rockchip/rk3308/rk3308.c b/arch/arm/mach-rockchip/rk3308/rk3308.c
index 8e8214cf7ecb..70fe0d0ac350 100644
--- a/arch/arm/mach-rockchip/rk3308/rk3308.c
+++ b/arch/arm/mach-rockchip/rk3308/rk3308.c
@@ -5,6 +5,7 @@
 #include <common.h>
 #include <init.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/grf_rk3308.h>
 #include <asm/arch-rockchip/hardware.h>
diff --git a/arch/arm/mach-rockchip/rk3328/rk3328.c b/arch/arm/mach-rockchip/rk3328/rk3328.c
index 7c85b2663c88..ec3336cb49af 100644
--- a/arch/arm/mach-rockchip/rk3328/rk3328.c
+++ b/arch/arm/mach-rockchip/rk3328/rk3328.c
@@ -10,6 +10,7 @@
 #include <asm/arch-rockchip/grf_rk3328.h>
 #include <asm/arch-rockchip/uart.h>
 #include <asm/armv8/mmu.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-rockchip/rk3368/rk3368.c b/arch/arm/mach-rockchip/rk3368/rk3368.c
index 1c6d65a58870..9b7132d471c3 100644
--- a/arch/arm/mach-rockchip/rk3368/rk3368.c
+++ b/arch/arm/mach-rockchip/rk3368/rk3368.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <syscon.h>
 #include <asm/armv8/mmu.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch-rockchip/bootrom.h>
 #include <asm/arch-rockchip/clock.h>
diff --git a/arch/arm/mach-rockchip/rk3399/rk3399.c b/arch/arm/mach-rockchip/rk3399/rk3399.c
index c6434839719d..869d2159bea6 100644
--- a/arch/arm/mach-rockchip/rk3399/rk3399.c
+++ b/arch/arm/mach-rockchip/rk3399/rk3399.c
@@ -11,6 +11,7 @@
 #include <spl_gpio.h>
 #include <syscon.h>
 #include <asm/armv8/mmu.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch-rockchip/bootrom.h>
 #include <asm/arch-rockchip/clock.h>
diff --git a/arch/arm/mach-rockchip/sdram.c b/arch/arm/mach-rockchip/sdram.c
index 4c637b776735..ed07ece15a4d 100644
--- a/arch/arm/mach-rockchip/sdram.c
+++ b/arch/arm/mach-rockchip/sdram.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <log.h>
 #include <ram.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch-rockchip/sdram.h>
 #include <dm/uclass-internal.h>
diff --git a/arch/arm/mach-rockchip/spl-boot-order.c b/arch/arm/mach-rockchip/spl-boot-order.c
index 94673f34c9b8..e05c12e0cd33 100644
--- a/arch/arm/mach-rockchip/spl-boot-order.c
+++ b/arch/arm/mach-rockchip/spl-boot-order.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <mmc.h>
 #include <spl.h>
+#include <asm/global_data.h>
 
 #if CONFIG_IS_ENABLED(OF_LIBFDT)
 /**
diff --git a/arch/arm/mach-rockchip/spl.c b/arch/arm/mach-rockchip/spl.c
index f148d48b6a35..4b5c22dc1382 100644
--- a/arch/arm/mach-rockchip/spl.c
+++ b/arch/arm/mach-rockchip/spl.c
@@ -13,6 +13,7 @@
 #include <ram.h>
 #include <spl.h>
 #include <asm/arch-rockchip/bootrom.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
 
diff --git a/arch/arm/mach-snapdragon/pinctrl-snapdragon.h b/arch/arm/mach-snapdragon/pinctrl-snapdragon.h
index 24f8863f59b5..61d466f4d84b 100644
--- a/arch/arm/mach-snapdragon/pinctrl-snapdragon.h
+++ b/arch/arm/mach-snapdragon/pinctrl-snapdragon.h
@@ -8,7 +8,7 @@
 #ifndef _PINCTRL_SNAPDRAGON_H
 #define _PINCTRL_SNAPDRAGON_H
 
-#include <common.h>
+struct udevice;
 
 struct msm_pinctrl_data {
 	int pin_count;
diff --git a/arch/arm/mach-socfpga/board.c b/arch/arm/mach-socfpga/board.c
index 340abf9305c4..bdd5b863c459 100644
--- a/arch/arm/mach-socfpga/board.c
+++ b/arch/arm/mach-socfpga/board.c
@@ -12,6 +12,7 @@
 #include <asm/arch/reset_manager.h>
 #include <asm/arch/clock_manager.h>
 #include <asm/arch/misc.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 
 #include <usb.h>
diff --git a/arch/arm/mach-socfpga/clock_manager.c b/arch/arm/mach-socfpga/clock_manager.c
index a4a97b6a0fcf..f0b15f770cc5 100644
--- a/arch/arm/mach-socfpga/clock_manager.c
+++ b/arch/arm/mach-socfpga/clock_manager.c
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <init.h>
 #include <wait_bit.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock_manager.h>
 
diff --git a/arch/arm/mach-socfpga/clock_manager_agilex.c b/arch/arm/mach-socfpga/clock_manager_agilex.c
index 6188a8c3d2db..4bf01f3c8ae4 100644
--- a/arch/arm/mach-socfpga/clock_manager_agilex.c
+++ b/arch/arm/mach-socfpga/clock_manager_agilex.c
@@ -11,6 +11,7 @@
 #include <malloc.h>
 #include <asm/arch/clock_manager.h>
 #include <asm/arch/system_manager.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <dt-bindings/clock/agilex-clock.h>
 
diff --git a/arch/arm/mach-socfpga/clock_manager_s10.c b/arch/arm/mach-socfpga/clock_manager_s10.c
index 05e42127b57b..642dcbb0ac04 100644
--- a/arch/arm/mach-socfpga/clock_manager_s10.c
+++ b/arch/arm/mach-socfpga/clock_manager_s10.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock_manager.h>
 #include <asm/arch/handoff_s10.h>
diff --git a/arch/arm/mach-socfpga/mailbox_s10.c b/arch/arm/mach-socfpga/mailbox_s10.c
index f30e7f80a294..82dfcd124ca8 100644
--- a/arch/arm/mach-socfpga/mailbox_s10.c
+++ b/arch/arm/mach-socfpga/mailbox_s10.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <hang.h>
 #include <wait_bit.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/mailbox_s10.h>
 #include <asm/arch/system_manager.h>
diff --git a/arch/arm/mach-socfpga/misc.c b/arch/arm/mach-socfpga/misc.c
index ac2b891fadea..64a7c9d652c7 100644
--- a/arch/arm/mach-socfpga/misc.c
+++ b/arch/arm/mach-socfpga/misc.c
@@ -9,6 +9,7 @@
 #include <hang.h>
 #include <asm/cache.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <errno.h>
 #include <fdtdec.h>
diff --git a/arch/arm/mach-socfpga/misc_gen5.c b/arch/arm/mach-socfpga/misc_gen5.c
index 7209e8d6db78..4edf4f9b5c16 100644
--- a/arch/arm/mach-socfpga/misc_gen5.c
+++ b/arch/arm/mach-socfpga/misc_gen5.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <env.h>
 #include <errno.h>
diff --git a/arch/arm/mach-socfpga/misc_s10.c b/arch/arm/mach-socfpga/misc_s10.c
index 670bfa1a31fd..733856c33c16 100644
--- a/arch/arm/mach-socfpga/misc_s10.c
+++ b/arch/arm/mach-socfpga/misc_s10.c
@@ -13,6 +13,7 @@
 #include <log.h>
 #include <miiphy.h>
 #include <netdev.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/reset_manager.h>
 #include <asm/arch/system_manager.h>
diff --git a/arch/arm/mach-socfpga/mmu-arm64_s10.c b/arch/arm/mach-socfpga/mmu-arm64_s10.c
index 670ceb92ae3d..a55b7b7cf3b5 100644
--- a/arch/arm/mach-socfpga/mmu-arm64_s10.c
+++ b/arch/arm/mach-socfpga/mmu-arm64_s10.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <asm/armv8/mmu.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-socfpga/reset_manager_arria10.c b/arch/arm/mach-socfpga/reset_manager_arria10.c
index aa5299415a74..27c030801134 100644
--- a/arch/arm/mach-socfpga/reset_manager_arria10.c
+++ b/arch/arm/mach-socfpga/reset_manager_arria10.c
@@ -3,6 +3,7 @@
  * Copyright (C) 2016-2017 Intel Corporation
  */
 
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/fpga_manager.h>
 #include <asm/arch/misc.h>
diff --git a/arch/arm/mach-socfpga/reset_manager_s10.c b/arch/arm/mach-socfpga/reset_manager_s10.c
index c7430777b28e..81e4c67fba61 100644
--- a/arch/arm/mach-socfpga/reset_manager_s10.c
+++ b/arch/arm/mach-socfpga/reset_manager_s10.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/reset_manager.h>
 #include <asm/arch/system_manager.h>
diff --git a/arch/arm/mach-socfpga/spl_a10.c b/arch/arm/mach-socfpga/spl_a10.c
index 45aea4ab6cc3..92231b5ba3c6 100644
--- a/arch/arm/mach-socfpga/spl_a10.c
+++ b/arch/arm/mach-socfpga/spl_a10.c
@@ -7,6 +7,7 @@
 #include <cpu_func.h>
 #include <hang.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/pl310.h>
 #include <asm/u-boot.h>
diff --git a/arch/arm/mach-socfpga/spl_agilex.c b/arch/arm/mach-socfpga/spl_agilex.c
index bd971ecbd1dc..9871d1b6c8bc 100644
--- a/arch/arm/mach-socfpga/spl_agilex.c
+++ b/arch/arm/mach-socfpga/spl_agilex.c
@@ -6,6 +6,7 @@
 
 #include <init.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/u-boot.h>
 #include <asm/utils.h>
diff --git a/arch/arm/mach-socfpga/spl_gen5.c b/arch/arm/mach-socfpga/spl_gen5.c
index 5a7c5ef76d5d..7c716117685c 100644
--- a/arch/arm/mach-socfpga/spl_gen5.c
+++ b/arch/arm/mach-socfpga/spl_gen5.c
@@ -7,6 +7,7 @@
 #include <hang.h>
 #include <init.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/u-boot.h>
 #include <asm/utils.h>
diff --git a/arch/arm/mach-socfpga/spl_s10.c b/arch/arm/mach-socfpga/spl_s10.c
index b3c6f6afc442..cbffa6699368 100644
--- a/arch/arm/mach-socfpga/spl_s10.c
+++ b/arch/arm/mach-socfpga/spl_s10.c
@@ -7,6 +7,7 @@
 #include <hang.h>
 #include <init.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/u-boot.h>
 #include <asm/utils.h>
diff --git a/arch/arm/mach-socfpga/system_manager_s10.c b/arch/arm/mach-socfpga/system_manager_s10.c
index cdda881efd71..c123cc96445d 100644
--- a/arch/arm/mach-socfpga/system_manager_s10.c
+++ b/arch/arm/mach-socfpga/system_manager_s10.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/system_manager.h>
 
diff --git a/arch/arm/mach-stm32mp/boot_params.c b/arch/arm/mach-stm32mp/boot_params.c
index 37ee9e1612c2..c4fba9e33af3 100644
--- a/arch/arm/mach-stm32mp/boot_params.c
+++ b/arch/arm/mach-stm32mp/boot_params.c
@@ -7,6 +7,7 @@
 #include <log.h>
 #include <asm/sections.h>
 #include <asm/system.h>
+#include <linux/libfdt.h>
 
 /*
  * Force data-section, as .bss will not be valid
diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c
index ec3355d81605..74711c0c756d 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 <asm/arch/stm32mp1_smc.h>
+#include <asm/global_data.h>
 #include <dm/uclass.h>
 #include <jffs2/load_kernel.h>
 #include <linux/list.h>
diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_serial.c b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_serial.c
index 8aad4be467e7..0150d2d5412b 100644
--- a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_serial.c
+++ b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_serial.c
@@ -10,6 +10,7 @@
 #include <malloc.h>
 #include <serial.h>
 #include <watchdog.h>
+#include <asm/global_data.h>
 #include <dm/lists.h>
 #include <dm/device-internal.h>
 #include <linux/delay.h>
diff --git a/arch/arm/mach-stm32mp/cpu.c b/arch/arm/mach-stm32mp/cpu.c
index b7fcee2b3679..469c5b704e4a 100644
--- a/arch/arm/mach-stm32mp/cpu.c
+++ b/arch/arm/mach-stm32mp/cpu.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <misc.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/bsec.h>
 #include <asm/arch/stm32.h>
diff --git a/arch/arm/mach-stm32mp/dram_init.c b/arch/arm/mach-stm32mp/dram_init.c
index 0e8ce63f4a29..611e0ff0eb70 100644
--- a/arch/arm/mach-stm32mp/dram_init.c
+++ b/arch/arm/mach-stm32mp/dram_init.c
@@ -10,6 +10,7 @@
 #include <lmb.h>
 #include <log.h>
 #include <ram.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-stm32mp/fdt.c b/arch/arm/mach-stm32mp/fdt.c
index 0de1d8229122..9dbc595cc4f8 100644
--- a/arch/arm/mach-stm32mp/fdt.c
+++ b/arch/arm/mach-stm32mp/fdt.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <fdtdec.h>
 #include <fdt_support.h>
 #include <log.h>
 #include <tee.h>
diff --git a/arch/arm/mach-stm32mp/spl.c b/arch/arm/mach-stm32mp/spl.c
index e84bdad7bfc0..ab467de231ab 100644
--- a/arch/arm/mach-stm32mp/spl.c
+++ b/arch/arm/mach-stm32mp/spl.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <spl.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
 #include <linux/libfdt.h>
diff --git a/arch/arm/mach-tegra/board.c b/arch/arm/mach-tegra/board.c
index 03faacbd5772..ecdfcdde921a 100644
--- a/arch/arm/mach-tegra/board.c
+++ b/arch/arm/mach-tegra/board.c
@@ -12,6 +12,7 @@
 #include <ns16550.h>
 #include <spl.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #if IS_ENABLED(CONFIG_TEGRA_CLKRST)
 #include <asm/arch/clock.h>
diff --git a/arch/arm/mach-tegra/board2.c b/arch/arm/mach-tegra/board2.c
index 48c4f32d6f98..66376dd39a2e 100644
--- a/arch/arm/mach-tegra/board2.c
+++ b/arch/arm/mach-tegra/board2.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <ns16550.h>
 #include <usb.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch-tegra/ap.h>
 #include <asm/arch-tegra/board.h>
diff --git a/arch/arm/mach-tegra/cboot.c b/arch/arm/mach-tegra/cboot.c
index 16c4cf306ec8..bb46fb23ff79 100644
--- a/arch/arm/mach-tegra/cboot.c
+++ b/arch/arm/mach-tegra/cboot.c
@@ -14,6 +14,7 @@
 #include <net.h>
 #include <stdlib.h>
 #include <string.h>
+#include <asm/global_data.h>
 
 #include <linux/ctype.h>
 #include <linux/sizes.h>
diff --git a/arch/arm/mach-tegra/emc.c b/arch/arm/mach-tegra/emc.c
index 66628933b653..2eea14b5a744 100644
--- a/arch/arm/mach-tegra/emc.c
+++ b/arch/arm/mach-tegra/emc.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <asm/global_data.h>
 #include "emc.h"
 #include <asm/io.h>
 #include <asm/arch/clock.h>
diff --git a/arch/arm/mach-tegra/pmc.c b/arch/arm/mach-tegra/pmc.c
index cdc8493efd8e..93db63e104a1 100644
--- a/arch/arm/mach-tegra/pmc.c
+++ b/arch/arm/mach-tegra/pmc.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <log.h>
+#include <asm/global_data.h>
 
 #include <linux/arm-smccc.h>
 
diff --git a/arch/arm/mach-tegra/tegra124/xusb-padctl.c b/arch/arm/mach-tegra/tegra124/xusb-padctl.c
index 38afc3cbe6de..c95ca048d5e1 100644
--- a/arch/arm/mach-tegra/tegra124/xusb-padctl.c
+++ b/arch/arm/mach-tegra/tegra124/xusb-padctl.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <errno.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <dm/of_access.h>
 #include <dm/ofnode.h>
 #include <linux/delay.h>
diff --git a/arch/arm/mach-tegra/tegra20/warmboot.c b/arch/arm/mach-tegra/tegra20/warmboot.c
index ddde4a667726..3d3758f6e6f4 100644
--- a/arch/arm/mach-tegra/tegra20/warmboot.c
+++ b/arch/arm/mach-tegra/tegra20/warmboot.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <asm/arch/clock.h>
diff --git a/arch/arm/mach-tegra/tegra210/xusb-padctl.c b/arch/arm/mach-tegra/tegra210/xusb-padctl.c
index d160ce4c999e..c414dfd3b86f 100644
--- a/arch/arm/mach-tegra/tegra210/xusb-padctl.c
+++ b/arch/arm/mach-tegra/tegra210/xusb-padctl.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <errno.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <dm/of_access.h>
 #include <dm/ofnode.h>
 #include <linux/delay.h>
diff --git a/arch/arm/mach-uniphier/board_late_init.c b/arch/arm/mach-uniphier/board_late_init.c
index 8c5e5bb58f65..b33c4b19389b 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 <asm/global_data.h>
 #include <linux/libfdt.h>
 #include <stdio.h>
 #include <linux/printk.h>
diff --git a/arch/arm/mach-versal/clk.c b/arch/arm/mach-versal/clk.c
index b1e34796d0d1..249e050cc8d6 100644
--- a/arch/arm/mach-versal/clk.c
+++ b/arch/arm/mach-versal/clk.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <init.h>
 #include <time.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-versal/cpu.c b/arch/arm/mach-versal/cpu.c
index 61c0b663fcfe..a35aac2c02c2 100644
--- a/arch/arm/mach-versal/cpu.c
+++ b/arch/arm/mach-versal/cpu.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <asm/armv8/mmu.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/sys_proto.h>
diff --git a/arch/arm/mach-versal/mp.c b/arch/arm/mach-versal/mp.c
index 4b434b0ac3f7..c97c311d3130 100644
--- a/arch/arm/mach-versal/mp.c
+++ b/arch/arm/mach-versal/mp.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/sys_proto.h>
diff --git a/arch/arm/mach-zynq/clk.c b/arch/arm/mach-zynq/clk.c
index 1ace117fc8e5..9bab393e2112 100644
--- a/arch/arm/mach-zynq/clk.c
+++ b/arch/arm/mach-zynq/clk.c
@@ -9,6 +9,7 @@
 #include <init.h>
 #include <malloc.h>
 #include <asm/arch/clk.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-zynq/timer.c b/arch/arm/mach-zynq/timer.c
index cc0e24cbfede..08cb4406cc35 100644
--- a/arch/arm/mach-zynq/timer.c
+++ b/arch/arm/mach-zynq/timer.c
@@ -34,6 +34,7 @@
 #include <init.h>
 #include <time.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/clk.h>
diff --git a/arch/arm/mach-zynqmp-r5/cpu.c b/arch/arm/mach-zynqmp-r5/cpu.c
index b3402d718950..b95749978595 100644
--- a/arch/arm/mach-zynqmp-r5/cpu.c
+++ b/arch/arm/mach-zynqmp-r5/cpu.c
@@ -7,6 +7,7 @@
 #include <cpu_func.h>
 #include <init.h>
 #include <asm/armv7_mpu.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-zynqmp/clk.c b/arch/arm/mach-zynqmp/clk.c
index 5067b339c218..1e6e726e8792 100644
--- a/arch/arm/mach-zynqmp/clk.c
+++ b/arch/arm/mach-zynqmp/clk.c
@@ -10,6 +10,7 @@
 #include <asm/arch/clk.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-zynqmp/cpu.c b/arch/arm/mach-zynqmp/cpu.c
index 3eb8e8f44875..29743cae5aab 100644
--- a/arch/arm/mach-zynqmp/cpu.c
+++ b/arch/arm/mach-zynqmp/cpu.c
@@ -11,6 +11,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/armv8/mmu.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <zynqmp_firmware.h>
 #include <asm/cache.h>
diff --git a/arch/m68k/cpu/mcf5227x/cpu.c b/arch/m68k/cpu/mcf5227x/cpu.c
index 5ea6158c8094..a7adf64f0de0 100644
--- a/arch/m68k/cpu/mcf5227x/cpu.c
+++ b/arch/m68k/cpu/mcf5227x/cpu.c
@@ -13,6 +13,7 @@
 #include <vsprintf.h>
 #include <watchdog.h>
 #include <command.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 
 #include <asm/immap.h>
diff --git a/arch/m68k/cpu/mcf5227x/speed.c b/arch/m68k/cpu/mcf5227x/speed.c
index 207f4534807e..fa9d5cb7887c 100644
--- a/arch/m68k/cpu/mcf5227x/speed.c
+++ b/arch/m68k/cpu/mcf5227x/speed.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <clock_legacy.h>
+#include <asm/global_data.h>
 #include <asm/processor.h>
 
 #include <asm/immap.h>
diff --git a/arch/m68k/cpu/mcf523x/cpu.c b/arch/m68k/cpu/mcf523x/cpu.c
index 8664231b5a14..8d3ab6f3fb25 100644
--- a/arch/m68k/cpu/mcf523x/cpu.c
+++ b/arch/m68k/cpu/mcf523x/cpu.c
@@ -15,6 +15,7 @@
 #include <watchdog.h>
 #include <command.h>
 #include <netdev.h>
+#include <asm/global_data.h>
 
 #include <asm/immap.h>
 #include <asm/io.h>
diff --git a/arch/m68k/cpu/mcf523x/speed.c b/arch/m68k/cpu/mcf523x/speed.c
index 2f65ac23182c..f41f977d7f5f 100644
--- a/arch/m68k/cpu/mcf523x/speed.c
+++ b/arch/m68k/cpu/mcf523x/speed.c
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <clock_legacy.h>
+#include <asm/global_data.h>
 #include <asm/processor.h>
 
 #include <asm/immap.h>
diff --git a/arch/m68k/cpu/mcf52x2/cpu.c b/arch/m68k/cpu/mcf52x2/cpu.c
index 8898a7562adf..0676e3914105 100644
--- a/arch/m68k/cpu/mcf52x2/cpu.c
+++ b/arch/m68k/cpu/mcf52x2/cpu.c
@@ -19,6 +19,7 @@
 #include <vsprintf.h>
 #include <watchdog.h>
 #include <command.h>
+#include <asm/global_data.h>
 #include <asm/immap.h>
 #include <asm/io.h>
 #include <netdev.h>
diff --git a/arch/m68k/cpu/mcf52x2/speed.c b/arch/m68k/cpu/mcf52x2/speed.c
index 751c83a4fc08..045908a13d40 100644
--- a/arch/m68k/cpu/mcf52x2/speed.c
+++ b/arch/m68k/cpu/mcf52x2/speed.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <clock_legacy.h>
+#include <asm/global_data.h>
 #include <asm/processor.h>
 #include <asm/immap.h>
 #include <asm/io.h>
diff --git a/arch/m68k/cpu/mcf530x/speed.c b/arch/m68k/cpu/mcf530x/speed.c
index cf53dfeb150a..03d9abeb182b 100644
--- a/arch/m68k/cpu/mcf530x/speed.c
+++ b/arch/m68k/cpu/mcf530x/speed.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <clock_legacy.h>
+#include <asm/global_data.h>
 #include <asm/processor.h>
 #include <asm/immap.h>
 
diff --git a/arch/m68k/cpu/mcf532x/cpu.c b/arch/m68k/cpu/mcf532x/cpu.c
index f1e6f734eb44..d37dd3defb73 100644
--- a/arch/m68k/cpu/mcf532x/cpu.c
+++ b/arch/m68k/cpu/mcf532x/cpu.c
@@ -15,6 +15,7 @@
 #include <watchdog.h>
 #include <command.h>
 #include <netdev.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 
 #include <asm/immap.h>
diff --git a/arch/m68k/cpu/mcf532x/speed.c b/arch/m68k/cpu/mcf532x/speed.c
index 0f54ea4b6a8b..e2985792d96f 100644
--- a/arch/m68k/cpu/mcf532x/speed.c
+++ b/arch/m68k/cpu/mcf532x/speed.c
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <clock_legacy.h>
+#include <asm/global_data.h>
 #include <asm/processor.h>
 
 #include <asm/immap.h>
diff --git a/arch/m68k/cpu/mcf5445x/cpu.c b/arch/m68k/cpu/mcf5445x/cpu.c
index ebe15ca518c4..ac1e59168161 100644
--- a/arch/m68k/cpu/mcf5445x/cpu.c
+++ b/arch/m68k/cpu/mcf5445x/cpu.c
@@ -15,6 +15,7 @@
 #include <watchdog.h>
 #include <command.h>
 #include <netdev.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 
 #include <asm/immap.h>
diff --git a/arch/m68k/cpu/mcf5445x/speed.c b/arch/m68k/cpu/mcf5445x/speed.c
index eaa3b39bec69..a0b9af8866b3 100644
--- a/arch/m68k/cpu/mcf5445x/speed.c
+++ b/arch/m68k/cpu/mcf5445x/speed.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <clock_legacy.h>
+#include <asm/global_data.h>
 #include <asm/processor.h>
 
 #include <asm/immap.h>
diff --git a/arch/m68k/cpu/mcf547x_8x/cpu.c b/arch/m68k/cpu/mcf547x_8x/cpu.c
index e53adeb46b55..c1361e705799 100644
--- a/arch/m68k/cpu/mcf547x_8x/cpu.c
+++ b/arch/m68k/cpu/mcf547x_8x/cpu.c
@@ -15,6 +15,7 @@
 #include <watchdog.h>
 #include <command.h>
 #include <netdev.h>
+#include <asm/global_data.h>
 
 #include <asm/immap.h>
 #include <asm/io.h>
diff --git a/arch/m68k/cpu/mcf547x_8x/slicetimer.c b/arch/m68k/cpu/mcf547x_8x/slicetimer.c
index 33b4cff4ec72..dc076fc6e814 100644
--- a/arch/m68k/cpu/mcf547x_8x/slicetimer.c
+++ b/arch/m68k/cpu/mcf547x_8x/slicetimer.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <init.h>
 #include <irq_func.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 
 #include <asm/timer.h>
diff --git a/arch/m68k/cpu/mcf547x_8x/speed.c b/arch/m68k/cpu/mcf547x_8x/speed.c
index bc22560ed2cf..bbcf601f38fb 100644
--- a/arch/m68k/cpu/mcf547x_8x/speed.c
+++ b/arch/m68k/cpu/mcf547x_8x/speed.c
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <clock_legacy.h>
+#include <asm/global_data.h>
 #include <asm/processor.h>
 
 #include <asm/immap.h>
diff --git a/arch/m68k/include/asm/immap.h b/arch/m68k/include/asm/immap.h
index 9e84fb9d260c..9551e047d02a 100644
--- a/arch/m68k/include/asm/immap.h
+++ b/arch/m68k/include/asm/immap.h
@@ -30,6 +30,7 @@
 
 #define CONFIG_SYS_INTR_BASE		(MMAP_INTC0)
 #define CONFIG_SYS_NUM_IRQS		(128)
+#include <asm/global_data.h>
 #endif				/* CONFIG_M520x */
 
 #ifdef CONFIG_M52277
diff --git a/arch/m68k/lib/bdinfo.c b/arch/m68k/lib/bdinfo.c
index 404e5f19ed82..9ec56fd3418f 100644
--- a/arch/m68k/lib/bdinfo.c
+++ b/arch/m68k/lib/bdinfo.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/m68k/lib/bootm.c b/arch/m68k/lib/bootm.c
index 320451144fd3..51a6f938586d 100644
--- a/arch/m68k/lib/bootm.c
+++ b/arch/m68k/lib/bootm.c
@@ -11,6 +11,7 @@
 #include <image.h>
 #include <lmb.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <u-boot/zlib.h>
 #include <bzlib.h>
 #include <watchdog.h>
diff --git a/arch/m68k/lib/fec.c b/arch/m68k/lib/fec.c
index dde353ad17fd..eecea7a02354 100644
--- a/arch/m68k/lib/fec.c
+++ b/arch/m68k/lib/fec.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <asm/global_data.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 
diff --git a/arch/m68k/lib/time.c b/arch/m68k/lib/time.c
index a3eb6db54be7..cbe29e72a86e 100644
--- a/arch/m68k/lib/time.c
+++ b/arch/m68k/lib/time.c
@@ -10,6 +10,7 @@
 #include <init.h>
 #include <irq_func.h>
 #include <time.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 
 #include <asm/timer.h>
diff --git a/arch/microblaze/cpu/interrupts.c b/arch/microblaze/cpu/interrupts.c
index 829ae26ad274..fe65f3728fdb 100644
--- a/arch/microblaze/cpu/interrupts.c
+++ b/arch/microblaze/cpu/interrupts.c
@@ -13,6 +13,7 @@
 #include <irq_func.h>
 #include <log.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <asm/microblaze_intc.h>
 #include <asm/asm.h>
 
diff --git a/arch/microblaze/cpu/timer.c b/arch/microblaze/cpu/timer.c
index 1b4617311c57..647bdcd5ba52 100644
--- a/arch/microblaze/cpu/timer.c
+++ b/arch/microblaze/cpu/timer.c
@@ -10,6 +10,7 @@
 #include <init.h>
 #include <log.h>
 #include <time.h>
+#include <asm/global_data.h>
 #include <asm/microblaze_timer.h>
 #include <asm/microblaze_intc.h>
 #include <linux/delay.h>
diff --git a/arch/microblaze/lib/bootm.c b/arch/microblaze/lib/bootm.c
index d2ea1453be04..6695ac63c774 100644
--- a/arch/microblaze/lib/bootm.c
+++ b/arch/microblaze/lib/bootm.c
@@ -18,6 +18,7 @@
 #include <lmb.h>
 #include <log.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <u-boot/zlib.h>
 #include <asm/byteorder.h>
 
diff --git a/arch/mips/include/asm/io.h b/arch/mips/include/asm/io.h
index 7c40e415c74f..d3ad66930131 100644
--- a/arch/mips/include/asm/io.h
+++ b/arch/mips/include/asm/io.h
@@ -16,6 +16,7 @@
 #include <asm/addrspace.h>
 #include <asm/byteorder.h>
 #include <asm/cpu-features.h>
+#include <asm/global_data.h>
 #include <asm/pgtable-bits.h>
 #include <asm/processor.h>
 #include <asm/string.h>
diff --git a/arch/mips/lib/boot.c b/arch/mips/lib/boot.c
index db862f637925..d5a139ef5ec2 100644
--- a/arch/mips/lib/boot.c
+++ b/arch/mips/lib/boot.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <command.h>
 #include <cpu_func.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/mips/lib/bootm.c b/arch/mips/lib/bootm.c
index 0a13f6edb755..c28bca1bbb89 100644
--- a/arch/mips/lib/bootm.c
+++ b/arch/mips/lib/bootm.c
@@ -12,6 +12,7 @@
 #include <lmb.h>
 #include <log.h>
 #include <asm/addrspace.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/mips/lib/cache.c b/arch/mips/lib/cache.c
index cf29994a7ae8..51a8f4334750 100644
--- a/arch/mips/lib/cache.c
+++ b/arch/mips/lib/cache.c
@@ -9,6 +9,7 @@
 #include <asm/cache.h>
 #include <asm/cacheops.h>
 #include <asm/cm.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/mipsregs.h>
 #include <asm/system.h>
diff --git a/arch/mips/lib/reloc.c b/arch/mips/lib/reloc.c
index 67c8af2f35a5..c1c04bc08e86 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 <asm/global_data.h>
 #include <asm/relocs.h>
 #include <asm/sections.h>
 #include <linux/bitops.h>
diff --git a/arch/mips/lib/stack.c b/arch/mips/lib/stack.c
index 8f523fd6fb75..930d21856d90 100644
--- a/arch/mips/lib/stack.c
+++ b/arch/mips/lib/stack.c
@@ -3,6 +3,7 @@
 #include <common.h>
 #include <init.h>
 #include <log.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/mips/lib/traps.c b/arch/mips/lib/traps.c
index df8b63f383b8..7c2fdf4a1a9d 100644
--- a/arch/mips/lib/traps.c
+++ b/arch/mips/lib/traps.c
@@ -11,6 +11,7 @@
  */
 
 #include <common.h>
+#include <asm/global_data.h>
 #include <asm/ptrace.h>
 #include <cpu_func.h>
 #include <hang.h>
diff --git a/arch/mips/mach-ath79/ar933x/clk.c b/arch/mips/mach-ath79/ar933x/clk.c
index 3feb25ce71df..68d48939d7d2 100644
--- a/arch/mips/mach-ath79/ar933x/clk.c
+++ b/arch/mips/mach-ath79/ar933x/clk.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <clock_legacy.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/addrspace.h>
 #include <asm/types.h>
diff --git a/arch/mips/mach-ath79/ar934x/clk.c b/arch/mips/mach-ath79/ar934x/clk.c
index 9fa2225ed2be..6ed4057353a8 100644
--- a/arch/mips/mach-ath79/ar934x/clk.c
+++ b/arch/mips/mach-ath79/ar934x/clk.c
@@ -7,6 +7,7 @@
 #include <clock_legacy.h>
 #include <command.h>
 #include <hang.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/addrspace.h>
 #include <asm/types.h>
diff --git a/arch/mips/mach-ath79/ar934x/ddr.c b/arch/mips/mach-ath79/ar934x/ddr.c
index 218f60a96cce..9df48b97ef46 100644
--- a/arch/mips/mach-ath79/ar934x/ddr.c
+++ b/arch/mips/mach-ath79/ar934x/ddr.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/addrspace.h>
 #include <asm/types.h>
diff --git a/arch/mips/mach-ath79/cpu.c b/arch/mips/mach-ath79/cpu.c
index 31e87d620603..ed190e8f9b02 100644
--- a/arch/mips/mach-ath79/cpu.c
+++ b/arch/mips/mach-ath79/cpu.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/addrspace.h>
 #include <asm/types.h>
diff --git a/arch/mips/mach-ath79/dram.c b/arch/mips/mach-ath79/dram.c
index 1abe2a49e661..545b1199e106 100644
--- a/arch/mips/mach-ath79/dram.c
+++ b/arch/mips/mach-ath79/dram.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <linux/sizes.h>
 #include <asm/addrspace.h>
 #include <mach/ddr.h>
diff --git a/arch/mips/mach-ath79/include/mach/ath79.h b/arch/mips/mach-ath79/include/mach/ath79.h
index 0fde5079b167..2eda38885e36 100644
--- a/arch/mips/mach-ath79/include/mach/ath79.h
+++ b/arch/mips/mach-ath79/include/mach/ath79.h
@@ -11,6 +11,7 @@
 #ifndef __ASM_MACH_ATH79_H
 #define __ASM_MACH_ATH79_H
 
+#include <asm/global_data.h>
 #include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/mips/mach-ath79/qca953x/clk.c b/arch/mips/mach-ath79/qca953x/clk.c
index d450ad865233..f5438ef1c8d9 100644
--- a/arch/mips/mach-ath79/qca953x/clk.c
+++ b/arch/mips/mach-ath79/qca953x/clk.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <clock_legacy.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/addrspace.h>
 #include <asm/types.h>
diff --git a/arch/mips/mach-ath79/qca956x/clk.c b/arch/mips/mach-ath79/qca956x/clk.c
index 5adf6cd8159b..6a58dba91f3f 100644
--- a/arch/mips/mach-ath79/qca956x/clk.c
+++ b/arch/mips/mach-ath79/qca956x/clk.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <clock_legacy.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/addrspace.h>
 #include <asm/types.h>
diff --git a/arch/mips/mach-ath79/qca956x/ddr.c b/arch/mips/mach-ath79/qca956x/ddr.c
index e61a368141ba..f9cf8daa2242 100644
--- a/arch/mips/mach-ath79/qca956x/ddr.c
+++ b/arch/mips/mach-ath79/qca956x/ddr.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/addrspace.h>
 #include <asm/types.h>
diff --git a/arch/mips/mach-bmips/dram.c b/arch/mips/mach-bmips/dram.c
index a772a655d921..bba6cd6f4aaf 100644
--- a/arch/mips/mach-bmips/dram.c
+++ b/arch/mips/mach-bmips/dram.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <ram.h>
 #include <dm.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/mips/mach-jz47xx/jz4780/jz4780.c b/arch/mips/mach-jz47xx/jz4780/jz4780.c
index 26fcfc842c28..43f5651f8326 100644
--- a/arch/mips/mach-jz47xx/jz4780/jz4780.c
+++ b/arch/mips/mach-jz47xx/jz4780/jz4780.c
@@ -12,6 +12,7 @@
 #include <hang.h>
 #include <image.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/sections.h>
 #include <mach/jz4780.h>
diff --git a/arch/mips/mach-mscc/cpu.c b/arch/mips/mach-mscc/cpu.c
index b4ffd44ea441..5bc31006aa15 100644
--- a/arch/mips/mach-mscc/cpu.c
+++ b/arch/mips/mach-mscc/cpu.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <linux/bitops.h>
 
 #include <asm/io.h>
diff --git a/arch/mips/mach-mscc/dram.c b/arch/mips/mach-mscc/dram.c
index b12bac63c27d..c53a4202e0d9 100644
--- a/arch/mips/mach-mscc/dram.c
+++ b/arch/mips/mach-mscc/dram.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 
 #include <asm/io.h>
 #include <asm/types.h>
diff --git a/arch/mips/mach-mtmips/cpu.c b/arch/mips/mach-mtmips/cpu.c
index 2ddf8cb0967e..76ad4f632058 100644
--- a/arch/mips/mach-mtmips/cpu.c
+++ b/arch/mips/mach-mtmips/cpu.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <init.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/io.h>
 #include <linux/sizes.h>
diff --git a/arch/mips/mach-mtmips/ddr_cal.c b/arch/mips/mach-mtmips/ddr_cal.c
index 71a53c3c9cbf..762619a960f3 100644
--- a/arch/mips/mach-mtmips/ddr_cal.c
+++ b/arch/mips/mach-mtmips/ddr_cal.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <asm/addrspace.h>
 #include <asm/cacheops.h>
+#include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/io.h>
 #include <mach/mc.h>
diff --git a/arch/mips/mach-mtmips/mt7628/ddr.c b/arch/mips/mach-mtmips/mt7628/ddr.c
index 3df85cd144a3..b091f2ecffc7 100644
--- a/arch/mips/mach-mtmips/mt7628/ddr.c
+++ b/arch/mips/mach-mtmips/mt7628/ddr.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <asm/addrspace.h>
+#include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/sizes.h>
diff --git a/arch/mips/mach-mtmips/mt7628/init.c b/arch/mips/mach-mtmips/mt7628/init.c
index 77d1f2ea0dc5..27241050aaf5 100644
--- a/arch/mips/mach-mtmips/mt7628/init.c
+++ b/arch/mips/mach-mtmips/mt7628/init.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <clk.h>
 #include <dm.h>
+#include <asm/global_data.h>
 #include <dm/uclass.h>
 #include <dt-bindings/clock/mt7628-clk.h>
 #include <linux/io.h>
diff --git a/arch/mips/mach-mtmips/spl.c b/arch/mips/mach-mtmips/spl.c
index 38d9e9160d2e..95201b8d7ab2 100644
--- a/arch/mips/mach-mtmips/spl.c
+++ b/arch/mips/mach-mtmips/spl.c
@@ -6,10 +6,10 @@
  */
 
 #include <common.h>
-#include <fdt.h>
 #include <init.h>
 #include <spl.h>
 #include <asm/sections.h>
+#include <linux/libfdt.h>
 #include <linux/sizes.h>
 #include <mach/serial.h>
 
diff --git a/arch/mips/mach-pic32/cpu.c b/arch/mips/mach-pic32/cpu.c
index 1d8c39714411..eac2fe5f8c94 100644
--- a/arch/mips/mach-pic32/cpu.c
+++ b/arch/mips/mach-pic32/cpu.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <init.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <mach/pic32.h>
 #include <mach/ddr.h>
 #include <dt-bindings/clock/microchip,clock.h>
diff --git a/arch/nds32/lib/bootm.c b/arch/nds32/lib/bootm.c
index e552a3423005..b3b8bc290378 100644
--- a/arch/nds32/lib/bootm.c
+++ b/arch/nds32/lib/bootm.c
@@ -12,6 +12,7 @@
 #include <hang.h>
 #include <image.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <u-boot/zlib.h>
 #include <asm/byteorder.h>
 #include <asm/bootm.h>
diff --git a/arch/nios2/cpu/cpu.c b/arch/nios2/cpu/cpu.c
index e7ca9882fc58..b55c8fbc5841 100644
--- a/arch/nios2/cpu/cpu.c
+++ b/arch/nios2/cpu/cpu.c
@@ -13,6 +13,7 @@
 #include <init.h>
 #include <irq_func.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/system.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/nios2/include/asm/io.h b/arch/nios2/include/asm/io.h
index 41e6bd4ee104..817cd72e00bd 100644
--- a/arch/nios2/include/asm/io.h
+++ b/arch/nios2/include/asm/io.h
@@ -7,6 +7,8 @@
 #ifndef __ASM_NIOS2_IO_H_
 #define __ASM_NIOS2_IO_H_
 
+#include <asm/global_data.h>
+
 static inline void sync(void)
 {
 	__asm__ __volatile__ ("sync" : : : "memory");
@@ -170,5 +172,6 @@ static inline void outsl (unsigned long port, const void *src, unsigned long cou
 #define memcpy_toio(a, b, c)		memcpy((void *)(a), (b), (c))
 
 #include <asm-generic/io.h>
+#include <asm/global_data.h>
 
 #endif /* __ASM_NIOS2_IO_H_ */
diff --git a/arch/nios2/lib/cache.c b/arch/nios2/lib/cache.c
index 0b961ac67620..5864d8f0f473 100644
--- a/arch/nios2/lib/cache.c
+++ b/arch/nios2/lib/cache.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/powerpc/cpu/mpc83xx/cpu.c b/arch/powerpc/cpu/mpc83xx/cpu.c
index 843f2df649ec..8d531898bd89 100644
--- a/arch/powerpc/cpu/mpc83xx/cpu.c
+++ b/arch/powerpc/cpu/mpc83xx/cpu.c
@@ -18,6 +18,7 @@
 #include <watchdog.h>
 #include <command.h>
 #include <mpc83xx.h>
+#include <asm/global_data.h>
 #include <asm/processor.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
diff --git a/arch/powerpc/cpu/mpc83xx/cpu_init.c b/arch/powerpc/cpu/mpc83xx/cpu_init.c
index 438b14b162eb..8793639e20e8 100644
--- a/arch/powerpc/cpu/mpc83xx/cpu_init.c
+++ b/arch/powerpc/cpu/mpc83xx/cpu_init.c
@@ -7,6 +7,7 @@
 #include <asm-offsets.h>
 #include <mpc83xx.h>
 #include <ioports.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/processor.h>
 #ifdef CONFIG_USB_EHCI_FSL
diff --git a/arch/powerpc/cpu/mpc83xx/fdt.c b/arch/powerpc/cpu/mpc83xx/fdt.c
index ebdedb28889c..707838ac9abb 100644
--- a/arch/powerpc/cpu/mpc83xx/fdt.c
+++ b/arch/powerpc/cpu/mpc83xx/fdt.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <clock_legacy.h>
+#include <asm/global_data.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <asm/processor.h>
diff --git a/arch/powerpc/cpu/mpc83xx/interrupts.c b/arch/powerpc/cpu/mpc83xx/interrupts.c
index 05380674dc74..f9486678af33 100644
--- a/arch/powerpc/cpu/mpc83xx/interrupts.c
+++ b/arch/powerpc/cpu/mpc83xx/interrupts.c
@@ -10,6 +10,7 @@
 #include <command.h>
 #include <irq_func.h>
 #include <mpc83xx.h>
+#include <asm/global_data.h>
 #include <asm/processor.h>
 #include <asm/ptrace.h>
 
diff --git a/arch/powerpc/cpu/mpc83xx/pci.c b/arch/powerpc/cpu/mpc83xx/pci.c
index d057cd6351c1..5c289d002260 100644
--- a/arch/powerpc/cpu/mpc83xx/pci.c
+++ b/arch/powerpc/cpu/mpc83xx/pci.c
@@ -10,6 +10,7 @@
 #include <init.h>
 #include <pci.h>
 #include <asm/bitops.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 
 #if defined(CONFIG_OF_LIBFDT)
diff --git a/arch/powerpc/cpu/mpc83xx/pcie.c b/arch/powerpc/cpu/mpc83xx/pcie.c
index 785d4805a469..84797c871c95 100644
--- a/arch/powerpc/cpu/mpc83xx/pcie.c
+++ b/arch/powerpc/cpu/mpc83xx/pcie.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <pci.h>
 #include <mpc83xx.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/delay.h>
 
diff --git a/arch/powerpc/cpu/mpc83xx/spd_sdram.c b/arch/powerpc/cpu/mpc83xx/spd_sdram.c
index aeff007fb063..a861e8dd2ddc 100644
--- a/arch/powerpc/cpu/mpc83xx/spd_sdram.c
+++ b/arch/powerpc/cpu/mpc83xx/spd_sdram.c
@@ -24,6 +24,7 @@
 #include <asm/mmu.h>
 #include <spd_sdram.h>
 #include <asm/bitops.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/powerpc/cpu/mpc83xx/speed.c b/arch/powerpc/cpu/mpc83xx/speed.c
index 5c14aa1f32e7..58e197f12082 100644
--- a/arch/powerpc/cpu/mpc83xx/speed.c
+++ b/arch/powerpc/cpu/mpc83xx/speed.c
@@ -13,6 +13,7 @@
 #include <mpc83xx.h>
 #include <command.h>
 #include <vsprintf.h>
+#include <asm/global_data.h>
 #include <asm/processor.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/powerpc/cpu/mpc83xx/spl_minimal.c b/arch/powerpc/cpu/mpc83xx/spl_minimal.c
index 2c61f2b81dbf..00cb2bd044ef 100644
--- a/arch/powerpc/cpu/mpc83xx/spl_minimal.c
+++ b/arch/powerpc/cpu/mpc83xx/spl_minimal.c
@@ -8,6 +8,7 @@
 #include <clock_legacy.h>
 #include <mpc83xx.h>
 #include <time.h>
+#include <asm/global_data.h>
 
 #include "lblaw/lblaw.h"
 #include "elbc/elbc.h"
diff --git a/arch/powerpc/cpu/mpc83xx/traps.c b/arch/powerpc/cpu/mpc83xx/traps.c
index c3cc119d6542..74781126e947 100644
--- a/arch/powerpc/cpu/mpc83xx/traps.c
+++ b/arch/powerpc/cpu/mpc83xx/traps.c
@@ -12,6 +12,7 @@
  */
 
 #include <common.h>
+#include <asm/global_data.h>
 #include <asm/ptrace.h>
 #include <command.h>
 #include <kgdb.h>
diff --git a/arch/powerpc/cpu/mpc85xx/commproc.c b/arch/powerpc/cpu/mpc85xx/commproc.c
index 95215a0b8292..8e8427a08bbe 100644
--- a/arch/powerpc/cpu/mpc85xx/commproc.c
+++ b/arch/powerpc/cpu/mpc85xx/commproc.c
@@ -24,6 +24,7 @@
 #include <common.h>
 #include <asm-offsets.h>
 #include <asm/cpm_85xx.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/powerpc/cpu/mpc85xx/cpu.c b/arch/powerpc/cpu/mpc85xx/cpu.c
index 3ff1ef45658b..5170610f0413 100644
--- a/arch/powerpc/cpu/mpc85xx/cpu.c
+++ b/arch/powerpc/cpu/mpc85xx/cpu.c
@@ -20,6 +20,7 @@
 #include <command.h>
 #include <fsl_esdhc.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/mmu.h>
 #include <fsl_ifc.h>
diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init_early.c b/arch/powerpc/cpu/mpc85xx/cpu_init_early.c
index c519e8bd4b03..4195ecc5c98f 100644
--- a/arch/powerpc/cpu/mpc85xx/cpu_init_early.c
+++ b/arch/powerpc/cpu/mpc85xx/cpu_init_early.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <asm-offsets.h>
+#include <asm/global_data.h>
 #include <asm/processor.h>
 #include <asm/mmu.h>
 #include <asm/fsl_law.h>
diff --git a/arch/powerpc/cpu/mpc85xx/fdt.c b/arch/powerpc/cpu/mpc85xx/fdt.c
index 9569c1a64b81..08331f4c6494 100644
--- a/arch/powerpc/cpu/mpc85xx/fdt.c
+++ b/arch/powerpc/cpu/mpc85xx/fdt.c
@@ -11,6 +11,7 @@
 #include <env.h>
 #include <log.h>
 #include <time.h>
+#include <asm/global_data.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <asm/processor.h>
diff --git a/arch/powerpc/cpu/mpc85xx/mp.c b/arch/powerpc/cpu/mpc85xx/mp.c
index 8822cf29fefd..653efe09f935 100644
--- a/arch/powerpc/cpu/mpc85xx/mp.c
+++ b/arch/powerpc/cpu/mpc85xx/mp.c
@@ -7,6 +7,7 @@
 #include <cpu_func.h>
 #include <env.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/processor.h>
 #include <env.h>
 #include <ioports.h>
diff --git a/arch/powerpc/cpu/mpc85xx/serial_scc.c b/arch/powerpc/cpu/mpc85xx/serial_scc.c
index a5c418570fa2..a2505d1ffc1d 100644
--- a/arch/powerpc/cpu/mpc85xx/serial_scc.c
+++ b/arch/powerpc/cpu/mpc85xx/serial_scc.c
@@ -18,6 +18,7 @@
 #include <common.h>
 #include <asm/cpm_85xx.h>
 #include <serial.h>
+#include <asm/global_data.h>
 #include <linux/compiler.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/powerpc/cpu/mpc85xx/speed.c b/arch/powerpc/cpu/mpc85xx/speed.c
index 773ae08dd3b7..09653c70125f 100644
--- a/arch/powerpc/cpu/mpc85xx/speed.c
+++ b/arch/powerpc/cpu/mpc85xx/speed.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <ppc_asm.tmpl>
+#include <asm/global_data.h>
 #include <linux/compiler.h>
 #include <asm/processor.h>
 #include <asm/io.h>
diff --git a/arch/powerpc/cpu/mpc85xx/tlb.c b/arch/powerpc/cpu/mpc85xx/tlb.c
index 4465ae7565a4..973b6fbe4b74 100644
--- a/arch/powerpc/cpu/mpc85xx/tlb.c
+++ b/arch/powerpc/cpu/mpc85xx/tlb.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <asm/bitops.h>
+#include <asm/global_data.h>
 #include <asm/processor.h>
 #include <asm/mmu.h>
 #ifdef CONFIG_ADDR_MAP
diff --git a/arch/powerpc/cpu/mpc85xx/traps.c b/arch/powerpc/cpu/mpc85xx/traps.c
index f37a45e2694e..080451ec567c 100644
--- a/arch/powerpc/cpu/mpc85xx/traps.c
+++ b/arch/powerpc/cpu/mpc85xx/traps.c
@@ -20,6 +20,7 @@
  */
 
 #include <common.h>
+#include <asm/global_data.h>
 #include <asm/ptrace.h>
 #include <command.h>
 #include <init.h>
diff --git a/arch/powerpc/cpu/mpc86xx/cpu.c b/arch/powerpc/cpu/mpc86xx/cpu.c
index 9f5bce3992b8..98b42bff7a3b 100644
--- a/arch/powerpc/cpu/mpc86xx/cpu.c
+++ b/arch/powerpc/cpu/mpc86xx/cpu.c
@@ -13,6 +13,7 @@
 #include <watchdog.h>
 #include <command.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/mmu.h>
 #include <mpc86xx.h>
 #include <asm/fsl_law.h>
diff --git a/arch/powerpc/cpu/mpc86xx/cpu_init.c b/arch/powerpc/cpu/mpc86xx/cpu_init.c
index a17091d2ff8c..73779f862c2a 100644
--- a/arch/powerpc/cpu/mpc86xx/cpu_init.c
+++ b/arch/powerpc/cpu/mpc86xx/cpu_init.c
@@ -14,6 +14,7 @@
 #include <common.h>
 #include <init.h>
 #include <mpc86xx.h>
+#include <asm/global_data.h>
 #include <asm/mmu.h>
 #include <asm/fsl_law.h>
 #include <asm/fsl_serdes.h>
diff --git a/arch/powerpc/cpu/mpc86xx/mp.c b/arch/powerpc/cpu/mpc86xx/mp.c
index 08d11ad4f2e5..e6795e06c98b 100644
--- a/arch/powerpc/cpu/mpc86xx/mp.c
+++ b/arch/powerpc/cpu/mpc86xx/mp.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <cpu_func.h>
+#include <asm/global_data.h>
 #include <asm/processor.h>
 #include <asm/mmu.h>
 #include <ioports.h>
diff --git a/arch/powerpc/cpu/mpc86xx/speed.c b/arch/powerpc/cpu/mpc86xx/speed.c
index 500144586229..86c1709c4ca2 100644
--- a/arch/powerpc/cpu/mpc86xx/speed.c
+++ b/arch/powerpc/cpu/mpc86xx/speed.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <clock_legacy.h>
 #include <mpc86xx.h>
+#include <asm/global_data.h>
 #include <asm/processor.h>
 #include <asm/io.h>
 
diff --git a/arch/powerpc/cpu/mpc86xx/traps.c b/arch/powerpc/cpu/mpc86xx/traps.c
index c0161e3379cc..0d258b3a97f8 100644
--- a/arch/powerpc/cpu/mpc86xx/traps.c
+++ b/arch/powerpc/cpu/mpc86xx/traps.c
@@ -14,6 +14,7 @@
  */
 
 #include <common.h>
+#include <asm/global_data.h>
 #include <asm/ptrace.h>
 #include <command.h>
 #include <init.h>
diff --git a/arch/powerpc/cpu/mpc8xx/cpu.c b/arch/powerpc/cpu/mpc8xx/cpu.c
index 7c93e35003ff..893aecef21c2 100644
--- a/arch/powerpc/cpu/mpc8xx/cpu.c
+++ b/arch/powerpc/cpu/mpc8xx/cpu.c
@@ -27,6 +27,7 @@
 #include <netdev.h>
 #include <asm/cache.h>
 #include <asm/cpm_8xx.h>
+#include <asm/global_data.h>
 #include <linux/compiler.h>
 #include <asm/io.h>
 
diff --git a/arch/powerpc/cpu/mpc8xx/fdt.c b/arch/powerpc/cpu/mpc8xx/fdt.c
index 4d952a3882f0..75aef758f06f 100644
--- a/arch/powerpc/cpu/mpc8xx/fdt.c
+++ b/arch/powerpc/cpu/mpc8xx/fdt.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <time.h>
+#include <asm/global_data.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 
diff --git a/arch/powerpc/cpu/mpc8xx/immap.c b/arch/powerpc/cpu/mpc8xx/immap.c
index e5b62e9f4acf..40793c26e120 100644
--- a/arch/powerpc/cpu/mpc8xx/immap.c
+++ b/arch/powerpc/cpu/mpc8xx/immap.c
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <asm/global_data.h>
 
 #include <asm/immap_8xx.h>
 #include <asm/cpm_8xx.h>
diff --git a/arch/powerpc/cpu/mpc8xx/speed.c b/arch/powerpc/cpu/mpc8xx/speed.c
index 77d4f8e47f74..ad3d3f9101cc 100644
--- a/arch/powerpc/cpu/mpc8xx/speed.c
+++ b/arch/powerpc/cpu/mpc8xx/speed.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <clock_legacy.h>
 #include <mpc8xx.h>
+#include <asm/global_data.h>
 #include <asm/processor.h>
 #include <asm/io.h>
 
diff --git a/arch/powerpc/cpu/mpc8xxx/cpu.c b/arch/powerpc/cpu/mpc8xxx/cpu.c
index 2b24e755faa4..560488be22e7 100644
--- a/arch/powerpc/cpu/mpc8xxx/cpu.c
+++ b/arch/powerpc/cpu/mpc8xxx/cpu.c
@@ -17,6 +17,7 @@
 #include <fm_eth.h>
 #include <netdev.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <vsc9953.h>
 
diff --git a/arch/powerpc/cpu/mpc8xxx/law.c b/arch/powerpc/cpu/mpc8xxx/law.c
index e388386ad42e..cf03f4101906 100644
--- a/arch/powerpc/cpu/mpc8xxx/law.c
+++ b/arch/powerpc/cpu/mpc8xxx/law.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <asm/bitops.h>
+#include <asm/global_data.h>
 #include <linux/compiler.h>
 #include <asm/fsl_law.h>
 #include <asm/io.h>
diff --git a/arch/powerpc/cpu/mpc8xxx/pamu_table.c b/arch/powerpc/cpu/mpc8xxx/pamu_table.c
index 7dd71d2e0c4a..d917e9dfb62f 100644
--- a/arch/powerpc/cpu/mpc8xxx/pamu_table.c
+++ b/arch/powerpc/cpu/mpc8xxx/pamu_table.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <log.h>
 #include <asm/fsl_pamu.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/powerpc/lib/bat_rw.c b/arch/powerpc/lib/bat_rw.c
index ac56e3aeddba..24dd30615bd3 100644
--- a/arch/powerpc/lib/bat_rw.c
+++ b/arch/powerpc/lib/bat_rw.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <asm/global_data.h>
 #include <asm/processor.h>
 #include <asm/mmu.h>
 #include <asm/io.h>
diff --git a/arch/powerpc/lib/bdinfo.c b/arch/powerpc/lib/bdinfo.c
index 36c9c99ee6ff..39062804ccfe 100644
--- a/arch/powerpc/lib/bdinfo.c
+++ b/arch/powerpc/lib/bdinfo.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/powerpc/lib/bootm.c b/arch/powerpc/lib/bootm.c
index 8c8ed99cd341..cf3e3fd8409d 100644
--- a/arch/powerpc/lib/bootm.c
+++ b/arch/powerpc/lib/bootm.c
@@ -18,6 +18,7 @@
 #include <command.h>
 #include <image.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <u-boot/zlib.h>
 #include <bzlib.h>
 #include <asm/byteorder.h>
diff --git a/arch/powerpc/lib/stack.c b/arch/powerpc/lib/stack.c
index 5840fe63490f..f2a4652e081d 100644
--- a/arch/powerpc/lib/stack.c
+++ b/arch/powerpc/lib/stack.c
@@ -12,6 +12,7 @@
  */
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/riscv/cpu/fu540/cache.c b/arch/riscv/cpu/fu540/cache.c
index 54de14238cc6..714b405e843e 100644
--- a/arch/riscv/cpu/fu540/cache.c
+++ b/arch/riscv/cpu/fu540/cache.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
 
diff --git a/arch/riscv/cpu/fu540/dram.c b/arch/riscv/cpu/fu540/dram.c
index 1dc77efeca55..cec130ec8dc6 100644
--- a/arch/riscv/cpu/fu540/dram.c
+++ b/arch/riscv/cpu/fu540/dram.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <fdtdec.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <linux/sizes.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/riscv/cpu/generic/dram.c b/arch/riscv/cpu/generic/dram.c
index 1dc77efeca55..cec130ec8dc6 100644
--- a/arch/riscv/cpu/generic/dram.c
+++ b/arch/riscv/cpu/generic/dram.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <fdtdec.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <linux/sizes.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/riscv/lib/andes_plic.c b/arch/riscv/lib/andes_plic.c
index c2a8fe4d9e9b..5d310d137b71 100644
--- a/arch/riscv/lib/andes_plic.c
+++ b/arch/riscv/lib/andes_plic.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <asm/global_data.h>
 #include <dm/device-internal.h>
 #include <dm/lists.h>
 #include <dm/uclass-internal.h>
diff --git a/arch/riscv/lib/andes_plmt.c b/arch/riscv/lib/andes_plmt.c
index a7e90ca992c6..c453d9042c8f 100644
--- a/arch/riscv/lib/andes_plmt.c
+++ b/arch/riscv/lib/andes_plmt.c
@@ -11,6 +11,7 @@
 #include <dm.h>
 #include <regmap.h>
 #include <syscon.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/syscon.h>
 #include <linux/err.h>
diff --git a/arch/riscv/lib/asm-offsets.c b/arch/riscv/lib/asm-offsets.c
index 7301c1b98e23..f1fe089b3d8f 100644
--- a/arch/riscv/lib/asm-offsets.c
+++ b/arch/riscv/lib/asm-offsets.c
@@ -9,6 +9,7 @@
  */
 
 #include <common.h>
+#include <asm/global_data.h>
 #include <linux/kbuild.h>
 
 int main(void)
diff --git a/arch/riscv/lib/bootm.c b/arch/riscv/lib/bootm.c
index c4137ded834b..8dd18205403c 100644
--- a/arch/riscv/lib/bootm.c
+++ b/arch/riscv/lib/bootm.c
@@ -13,6 +13,7 @@
 #include <fdt_support.h>
 #include <hang.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <dm/root.h>
 #include <image.h>
 #include <asm/byteorder.h>
diff --git a/arch/riscv/lib/fdt_fixup.c b/arch/riscv/lib/fdt_fixup.c
index 5b2420243fcc..8c11b8a99e38 100644
--- a/arch/riscv/lib/fdt_fixup.c
+++ b/arch/riscv/lib/fdt_fixup.c
@@ -10,6 +10,7 @@
 #include <fdt_support.h>
 #include <log.h>
 #include <mapmem.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/riscv/lib/image.c b/arch/riscv/lib/image.c
index 91b7f1624e9f..47f2edcf7fc2 100644
--- a/arch/riscv/lib/image.c
+++ b/arch/riscv/lib/image.c
@@ -10,6 +10,7 @@
 #include <image.h>
 #include <mapmem.h>
 #include <errno.h>
+#include <asm/global_data.h>
 #include <linux/sizes.h>
 #include <linux/stddef.h>
 
diff --git a/arch/riscv/lib/sifive_clint.c b/arch/riscv/lib/sifive_clint.c
index b9a2c649cc45..97b7169a02cf 100644
--- a/arch/riscv/lib/sifive_clint.c
+++ b/arch/riscv/lib/sifive_clint.c
@@ -11,6 +11,7 @@
 #include <dm.h>
 #include <regmap.h>
 #include <syscon.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/syscon.h>
 #include <linux/err.h>
diff --git a/arch/riscv/lib/smp.c b/arch/riscv/lib/smp.c
index ac22136314f6..c79d2a28d04d 100644
--- a/arch/riscv/lib/smp.c
+++ b/arch/riscv/lib/smp.c
@@ -8,6 +8,7 @@
 #include <cpu_func.h>
 #include <dm.h>
 #include <asm/barrier.h>
+#include <asm/global_data.h>
 #include <asm/smp.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/riscv/lib/spl.c b/arch/riscv/lib/spl.c
index e24ec5a46c08..448d4da6a80a 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 <asm/global_data.h>
 #include <asm/smp.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/sandbox/cpu/cpu.c b/arch/sandbox/cpu/cpu.c
index fb857e53d592..edd48e2c1b74 100644
--- a/arch/sandbox/cpu/cpu.c
+++ b/arch/sandbox/cpu/cpu.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 #include <os.h>
diff --git a/arch/sandbox/cpu/spl.c b/arch/sandbox/cpu/spl.c
index 7ab8919eb909..17a3507406cd 100644
--- a/arch/sandbox/cpu/spl.c
+++ b/arch/sandbox/cpu/spl.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <os.h>
 #include <spl.h>
+#include <asm/global_data.h>
 #include <asm/spl.h>
 #include <asm/state.h>
 
diff --git a/arch/sandbox/cpu/start.c b/arch/sandbox/cpu/start.c
index c6a2bbe46899..c50d14eaf229 100644
--- a/arch/sandbox/cpu/start.c
+++ b/arch/sandbox/cpu/start.c
@@ -11,6 +11,7 @@
 #include <cli.h>
 #include <sort.h>
 #include <asm/getopt.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/malloc.h>
 #include <asm/sections.h>
diff --git a/arch/sh/lib/board.c b/arch/sh/lib/board.c
index a6a8f07e6f26..3fa093a02ea3 100644
--- a/arch/sh/lib/board.c
+++ b/arch/sh/lib/board.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/apollolake/cpu_spl.c b/arch/x86/cpu/apollolake/cpu_spl.c
index 9f32f2e27e12..a52bc288617d 100644
--- a/arch/x86/cpu/apollolake/cpu_spl.c
+++ b/arch/x86/cpu/apollolake/cpu_spl.c
@@ -18,6 +18,7 @@
 #include <asm/cpu_common.h>
 #include <asm/cpu_x86.h>
 #include <asm/fast_spi.h>
+#include <asm/global_data.h>
 #include <asm/intel_pinctrl.h>
 #include <asm/intel_regs.h>
 #include <asm/io.h>
diff --git a/arch/x86/cpu/apollolake/fsp_s.c b/arch/x86/cpu/apollolake/fsp_s.c
index e54b0ac10471..a4e1c511614a 100644
--- a/arch/x86/cpu/apollolake/fsp_s.c
+++ b/arch/x86/cpu/apollolake/fsp_s.c
@@ -14,6 +14,7 @@
 #include <malloc.h>
 #include <p2sb.h>
 #include <acpi/acpi_s3.h>
+#include <asm/global_data.h>
 #include <asm/intel_pinctrl.h>
 #include <asm/io.h>
 #include <asm/intel_regs.h>
diff --git a/arch/x86/cpu/baytrail/fsp_configs.c b/arch/x86/cpu/baytrail/fsp_configs.c
index 21816ce5b883..fb3f946c45f9 100644
--- a/arch/x86/cpu/baytrail/fsp_configs.c
+++ b/arch/x86/cpu/baytrail/fsp_configs.c
@@ -9,6 +9,7 @@
 #include <fdtdec.h>
 #include <log.h>
 #include <asm/fsp1/fsp_support.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/braswell/fsp_configs.c b/arch/x86/cpu/braswell/fsp_configs.c
index 9e710a940cad..243298fd5718 100644
--- a/arch/x86/cpu/braswell/fsp_configs.c
+++ b/arch/x86/cpu/braswell/fsp_configs.c
@@ -7,6 +7,7 @@
 #include <fdtdec.h>
 #include <log.h>
 #include <asm/fsp1/fsp_support.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/broadwell/cpu.c b/arch/x86/cpu/broadwell/cpu.c
index b77301118cdf..3832a97f2c73 100644
--- a/arch/x86/cpu/broadwell/cpu.c
+++ b/arch/x86/cpu/broadwell/cpu.c
@@ -13,6 +13,7 @@
 #include <asm/cpu.h>
 #include <asm/cpu_x86.h>
 #include <asm/cpu_common.h>
+#include <asm/global_data.h>
 #include <asm/intel_regs.h>
 #include <asm/lpc_common.h>
 #include <asm/msr.h>
diff --git a/arch/x86/cpu/broadwell/cpu_from_spl.c b/arch/x86/cpu/broadwell/cpu_from_spl.c
index 6567d506533f..6cede74a8299 100644
--- a/arch/x86/cpu/broadwell/cpu_from_spl.c
+++ b/arch/x86/cpu/broadwell/cpu_from_spl.c
@@ -11,6 +11,7 @@
 #include <handoff.h>
 #include <init.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/mtrr.h>
 
 int misc_init_r(void)
diff --git a/arch/x86/cpu/broadwell/cpu_full.c b/arch/x86/cpu/broadwell/cpu_full.c
index 706f68f63d65..4debddce8ada 100644
--- a/arch/x86/cpu/broadwell/cpu_full.c
+++ b/arch/x86/cpu/broadwell/cpu_full.c
@@ -13,6 +13,7 @@
 #include <asm/cpu.h>
 #include <asm/cpu_x86.h>
 #include <asm/cpu_common.h>
+#include <asm/global_data.h>
 #include <asm/intel_regs.h>
 #include <asm/msr.h>
 #include <asm/post.h>
diff --git a/arch/x86/cpu/broadwell/lpc.c b/arch/x86/cpu/broadwell/lpc.c
index 5669a028cf34..d2638a4e7a6b 100644
--- a/arch/x86/cpu/broadwell/lpc.c
+++ b/arch/x86/cpu/broadwell/lpc.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <log.h>
 #include <pch.h>
+#include <asm/global_data.h>
 #include <asm/intel_regs.h>
 #include <asm/io.h>
 #include <asm/lpc_common.h>
diff --git a/arch/x86/cpu/broadwell/northbridge.c b/arch/x86/cpu/broadwell/northbridge.c
index 4bcab785560f..141babc51c3a 100644
--- a/arch/x86/cpu/broadwell/northbridge.c
+++ b/arch/x86/cpu/broadwell/northbridge.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/mrc_common.h>
 #include <asm/arch/iomap.h>
diff --git a/arch/x86/cpu/broadwell/pch.c b/arch/x86/cpu/broadwell/pch.c
index 9bcf211af99c..f012db9debe8 100644
--- a/arch/x86/cpu/broadwell/pch.c
+++ b/arch/x86/cpu/broadwell/pch.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <pch.h>
 #include <asm/cpu.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/i8259.h>
 #include <asm/intel_regs.h>
diff --git a/arch/x86/cpu/broadwell/pinctrl_broadwell.c b/arch/x86/cpu/broadwell/pinctrl_broadwell.c
index 0ead13af62aa..85bd37101ba2 100644
--- a/arch/x86/cpu/broadwell/pinctrl_broadwell.c
+++ b/arch/x86/cpu/broadwell/pinctrl_broadwell.c
@@ -11,6 +11,7 @@
 #include <pch.h>
 #include <pci.h>
 #include <asm/cpu.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <asm/pci.h>
diff --git a/arch/x86/cpu/broadwell/sata.c b/arch/x86/cpu/broadwell/sata.c
index 641da515c8f3..27d6bf706e2f 100644
--- a/arch/x86/cpu/broadwell/sata.c
+++ b/arch/x86/cpu/broadwell/sata.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <asm/intel_regs.h>
diff --git a/arch/x86/cpu/broadwell/sdram.c b/arch/x86/cpu/broadwell/sdram.c
index 72f59a0a5734..c104a849a545 100644
--- a/arch/x86/cpu/broadwell/sdram.c
+++ b/arch/x86/cpu/broadwell/sdram.c
@@ -12,6 +12,7 @@
 #include <pci.h>
 #include <syscon.h>
 #include <asm/cpu.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/lpc_common.h>
 #include <asm/mrccache.h>
diff --git a/arch/x86/cpu/coreboot/coreboot.c b/arch/x86/cpu/coreboot/coreboot.c
index 22a93254a939..15c3ad879a00 100644
--- a/arch/x86/cpu/coreboot/coreboot.c
+++ b/arch/x86/cpu/coreboot/coreboot.c
@@ -10,6 +10,7 @@
 #include <fdtdec.h>
 #include <init.h>
 #include <usb.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/msr.h>
 #include <asm/mtrr.h>
diff --git a/arch/x86/cpu/coreboot/sdram.c b/arch/x86/cpu/coreboot/sdram.c
index 27e859885e8c..a2e47d196a2e 100644
--- a/arch/x86/cpu/coreboot/sdram.c
+++ b/arch/x86/cpu/coreboot/sdram.c
@@ -9,6 +9,7 @@
 #include <init.h>
 #include <asm/e820.h>
 #include <asm/arch/sysinfo.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/coreboot/tables.c b/arch/x86/cpu/coreboot/tables.c
index 1594b4a8b2ab..c52741ac9da6 100644
--- a/arch/x86/cpu/coreboot/tables.c
+++ b/arch/x86/cpu/coreboot/tables.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <net.h>
 #include <asm/arch/sysinfo.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/cpu.c b/arch/x86/cpu/cpu.c
index 69c14189d1f2..078607a435c1 100644
--- a/arch/x86/cpu/cpu.c
+++ b/arch/x86/cpu/cpu.c
@@ -35,6 +35,7 @@
 #include <asm/control_regs.h>
 #include <asm/coreboot_tables.h>
 #include <asm/cpu.h>
+#include <asm/global_data.h>
 #include <asm/lapic.h>
 #include <asm/microcode.h>
 #include <asm/mp.h>
diff --git a/arch/x86/cpu/cpu_x86.c b/arch/x86/cpu/cpu_x86.c
index 7e83051646cc..dc7c8116d040 100644
--- a/arch/x86/cpu/cpu_x86.c
+++ b/arch/x86/cpu/cpu_x86.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <asm/cpu.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/efi/payload.c b/arch/x86/cpu/efi/payload.c
index 71619f6f01b5..9a73b768e9b8 100644
--- a/arch/x86/cpu/efi/payload.c
+++ b/arch/x86/cpu/efi/payload.c
@@ -13,6 +13,7 @@
 #include <usb.h>
 #include <asm/bootparam.h>
 #include <asm/e820.h>
+#include <asm/global_data.h>
 #include <asm/post.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/x86/cpu/efi/sdram.c b/arch/x86/cpu/efi/sdram.c
index 3143c079adbd..af65982fd0c0 100644
--- a/arch/x86/cpu/efi/sdram.c
+++ b/arch/x86/cpu/efi/sdram.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <efi.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/u-boot-x86.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/x86/cpu/i386/cpu.c b/arch/x86/cpu/i386/cpu.c
index 8f342dd06e25..7f6b1a93e1bb 100644
--- a/arch/x86/cpu/i386/cpu.c
+++ b/arch/x86/cpu/i386/cpu.c
@@ -27,6 +27,7 @@
 #include <asm/control_regs.h>
 #include <asm/coreboot_tables.h>
 #include <asm/cpu.h>
+#include <asm/global_data.h>
 #include <asm/mp.h>
 #include <asm/msr.h>
 #include <asm/mtrr.h>
diff --git a/arch/x86/cpu/i386/interrupt.c b/arch/x86/cpu/i386/interrupt.c
index c0c4bc95fd9a..67a72146de8a 100644
--- a/arch/x86/cpu/i386/interrupt.c
+++ b/arch/x86/cpu/i386/interrupt.c
@@ -18,6 +18,7 @@
 #include <irq.h>
 #include <irq_func.h>
 #include <asm/control_regs.h>
+#include <asm/global_data.h>
 #include <asm/i8259.h>
 #include <asm/interrupt.h>
 #include <asm/io.h>
diff --git a/arch/x86/cpu/intel_common/cpu.c b/arch/x86/cpu/intel_common/cpu.c
index 509730aea965..3a4fd35cff17 100644
--- a/arch/x86/cpu/intel_common/cpu.c
+++ b/arch/x86/cpu/intel_common/cpu.c
@@ -14,6 +14,7 @@
 #include <log.h>
 #include <asm/cpu.h>
 #include <asm/cpu_common.h>
+#include <asm/global_data.h>
 #include <asm/intel_regs.h>
 #include <asm/lapic.h>
 #include <asm/lpc_common.h>
diff --git a/arch/x86/cpu/intel_common/cpu_from_spl.c b/arch/x86/cpu/intel_common/cpu_from_spl.c
index e4157c5734c5..1c0dcedb5824 100644
--- a/arch/x86/cpu/intel_common/cpu_from_spl.c
+++ b/arch/x86/cpu/intel_common/cpu_from_spl.c
@@ -9,6 +9,7 @@
 #include <handoff.h>
 #include <init.h>
 #include <asm/cpu_common.h>
+#include <asm/global_data.h>
 #include <asm/intel_regs.h>
 #include <asm/lapic.h>
 #include <asm/lpc_common.h>
diff --git a/arch/x86/cpu/intel_common/itss.c b/arch/x86/cpu/intel_common/itss.c
index fe84ebe29f78..2f47bfe20e71 100644
--- a/arch/x86/cpu/intel_common/itss.c
+++ b/arch/x86/cpu/intel_common/itss.c
@@ -17,6 +17,7 @@
 #include <malloc.h>
 #include <p2sb.h>
 #include <spl.h>
+#include <asm/global_data.h>
 #include <asm/itss.h>
 
 struct itss_platdata {
diff --git a/arch/x86/cpu/intel_common/lpc.c b/arch/x86/cpu/intel_common/lpc.c
index 3420f03ccaa2..23befbef15ff 100644
--- a/arch/x86/cpu/intel_common/lpc.c
+++ b/arch/x86/cpu/intel_common/lpc.c
@@ -9,6 +9,7 @@
 #include <fdtdec.h>
 #include <pch.h>
 #include <pci.h>
+#include <asm/global_data.h>
 #include <asm/intel_regs.h>
 #include <asm/io.h>
 #include <asm/lpc_common.h>
diff --git a/arch/x86/cpu/intel_common/microcode.c b/arch/x86/cpu/intel_common/microcode.c
index 0355d3c1da69..4d8e1d210838 100644
--- a/arch/x86/cpu/intel_common/microcode.c
+++ b/arch/x86/cpu/intel_common/microcode.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <fdtdec.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <linux/libfdt.h>
 #include <asm/cpu.h>
 #include <asm/microcode.h>
diff --git a/arch/x86/cpu/intel_common/mrc.c b/arch/x86/cpu/intel_common/mrc.c
index 73bfd123321f..a97b0b7ceb41 100644
--- a/arch/x86/cpu/intel_common/mrc.c
+++ b/arch/x86/cpu/intel_common/mrc.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <syscon.h>
 #include <asm/cpu.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/intel_regs.h>
 #include <asm/mrc_common.h>
diff --git a/arch/x86/cpu/irq.c b/arch/x86/cpu/irq.c
index 836a0e8b86e5..001c8913fadb 100644
--- a/arch/x86/cpu/irq.c
+++ b/arch/x86/cpu/irq.c
@@ -10,6 +10,7 @@
 #include <irq.h>
 #include <log.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/pci.h>
diff --git a/arch/x86/cpu/ivybridge/bd82x6x.c b/arch/x86/cpu/ivybridge/bd82x6x.c
index 5448f064fcbf..0540b021618f 100644
--- a/arch/x86/cpu/ivybridge/bd82x6x.c
+++ b/arch/x86/cpu/ivybridge/bd82x6x.c
@@ -10,6 +10,7 @@
 #include <malloc.h>
 #include <pch.h>
 #include <asm/cpu.h>
+#include <asm/global_data.h>
 #include <asm/intel_regs.h>
 #include <asm/io.h>
 #include <asm/lapic.h>
diff --git a/arch/x86/cpu/ivybridge/cpu.c b/arch/x86/cpu/ivybridge/cpu.c
index cb6eded9c98d..bddba3eddecd 100644
--- a/arch/x86/cpu/ivybridge/cpu.c
+++ b/arch/x86/cpu/ivybridge/cpu.c
@@ -20,6 +20,7 @@
 #include <pch.h>
 #include <asm/cpu.h>
 #include <asm/cpu_common.h>
+#include <asm/global_data.h>
 #include <asm/intel_regs.h>
 #include <asm/io.h>
 #include <asm/lapic.h>
diff --git a/arch/x86/cpu/ivybridge/fsp_configs.c b/arch/x86/cpu/ivybridge/fsp_configs.c
index 41d7d2a2b420..3c4ea6c267f8 100644
--- a/arch/x86/cpu/ivybridge/fsp_configs.c
+++ b/arch/x86/cpu/ivybridge/fsp_configs.c
@@ -7,6 +7,7 @@
 #include <fdtdec.h>
 #include <log.h>
 #include <asm/fsp1/fsp_support.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/ivybridge/lpc.c b/arch/x86/cpu/ivybridge/lpc.c
index 85fd2a965abd..f931d2be1b52 100644
--- a/arch/x86/cpu/ivybridge/lpc.c
+++ b/arch/x86/cpu/ivybridge/lpc.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <rtc.h>
 #include <pci.h>
+#include <asm/global_data.h>
 #include <asm/intel_regs.h>
 #include <asm/interrupt.h>
 #include <asm/io.h>
diff --git a/arch/x86/cpu/ivybridge/model_206ax.c b/arch/x86/cpu/ivybridge/model_206ax.c
index 55f7cc2b2ecc..788e589b26d7 100644
--- a/arch/x86/cpu/ivybridge/model_206ax.c
+++ b/arch/x86/cpu/ivybridge/model_206ax.c
@@ -15,6 +15,7 @@
 #include <asm/cpu.h>
 #include <asm/cpu_common.h>
 #include <asm/cpu_x86.h>
+#include <asm/global_data.h>
 #include <asm/msr.h>
 #include <asm/msr-index.h>
 #include <asm/mtrr.h>
diff --git a/arch/x86/cpu/ivybridge/northbridge.c b/arch/x86/cpu/ivybridge/northbridge.c
index b713fcb1cfe7..994f8a4ff6a5 100644
--- a/arch/x86/cpu/ivybridge/northbridge.c
+++ b/arch/x86/cpu/ivybridge/northbridge.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/msr.h>
 #include <asm/cpu.h>
 #include <asm/intel_regs.h>
diff --git a/arch/x86/cpu/ivybridge/sata.c b/arch/x86/cpu/ivybridge/sata.c
index 025b20be31bd..f47ecdffae76 100644
--- a/arch/x86/cpu/ivybridge/sata.c
+++ b/arch/x86/cpu/ivybridge/sata.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <fdtdec.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/pch_common.h>
 #include <asm/pci.h>
diff --git a/arch/x86/cpu/ivybridge/sdram_nop.c b/arch/x86/cpu/ivybridge/sdram_nop.c
index 54e6acf26211..51dfe23f94d0 100644
--- a/arch/x86/cpu/ivybridge/sdram_nop.c
+++ b/arch/x86/cpu/ivybridge/sdram_nop.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/mp_init.c b/arch/x86/cpu/mp_init.c
index d2f1ee38cf02..03bd71c261ab 100644
--- a/arch/x86/cpu/mp_init.c
+++ b/arch/x86/cpu/mp_init.c
@@ -14,6 +14,7 @@
 #include <qfw.h>
 #include <asm/atomic.h>
 #include <asm/cpu.h>
+#include <asm/global_data.h>
 #include <asm/interrupt.h>
 #include <asm/io.h>
 #include <asm/lapic.h>
diff --git a/arch/x86/cpu/mtrr.c b/arch/x86/cpu/mtrr.c
index 2468d88a80ab..44a6f5c8124e 100644
--- a/arch/x86/cpu/mtrr.c
+++ b/arch/x86/cpu/mtrr.c
@@ -20,6 +20,7 @@
 #include <cpu_func.h>
 #include <log.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/mp.h>
 #include <asm/msr.h>
diff --git a/arch/x86/cpu/qemu/dram.c b/arch/x86/cpu/qemu/dram.c
index 19d92f27d80c..c1745501294c 100644
--- a/arch/x86/cpu/qemu/dram.c
+++ b/arch/x86/cpu/qemu/dram.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/post.h>
 #include <asm/arch/qemu.h>
 
diff --git a/arch/x86/cpu/qemu/e820.c b/arch/x86/cpu/qemu/e820.c
index 0da36bddeaec..19e54c5202a9 100644
--- a/arch/x86/cpu/qemu/e820.c
+++ b/arch/x86/cpu/qemu/e820.c
@@ -11,6 +11,7 @@
 #include <malloc.h>
 #include <asm/e820.h>
 #include <asm/arch/qemu.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/quark/acpi.c b/arch/x86/cpu/quark/acpi.c
index b0406a04e92b..82b776ff65f6 100644
--- a/arch/x86/cpu/quark/acpi.c
+++ b/arch/x86/cpu/quark/acpi.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <acpi/acpi_table.h>
+#include <asm/processor.h>
 #include <asm/tables.h>
 #include <asm/arch/global_nvs.h>
 #include <asm/arch/iomap.h>
diff --git a/arch/x86/cpu/quark/dram.c b/arch/x86/cpu/quark/dram.c
index 72937139ed73..2287dce12b52 100644
--- a/arch/x86/cpu/quark/dram.c
+++ b/arch/x86/cpu/quark/dram.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/mrccache.h>
 #include <asm/mtrr.h>
 #include <asm/post.h>
diff --git a/arch/x86/cpu/slimbootloader/sdram.c b/arch/x86/cpu/slimbootloader/sdram.c
index 33e91fb6366b..36d0d4da5531 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 <asm/global_data.h>
 #include <linux/sizes.h>
 #include <asm/e820.h>
 #include <asm/arch/slimbootloader.h>
diff --git a/arch/x86/cpu/slimbootloader/serial.c b/arch/x86/cpu/slimbootloader/serial.c
index 9813f7977b53..8b84565ce62f 100644
--- a/arch/x86/cpu/slimbootloader/serial.c
+++ b/arch/x86/cpu/slimbootloader/serial.c
@@ -9,6 +9,7 @@
 #include <ns16550.h>
 #include <serial.h>
 #include <asm/arch/slimbootloader.h>
+#include <asm/global_data.h>
 
 /**
  * The serial port info hob is generated by Slim Bootloader, so eligible for
diff --git a/arch/x86/cpu/slimbootloader/slimbootloader.c b/arch/x86/cpu/slimbootloader/slimbootloader.c
index f61fe814e94a..ec5b87cfd63f 100644
--- a/arch/x86/cpu/slimbootloader/slimbootloader.c
+++ b/arch/x86/cpu/slimbootloader/slimbootloader.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <log.h>
 #include <asm/arch/slimbootloader.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/turbo.c b/arch/x86/cpu/turbo.c
index f8d85d5a339b..cbb10a003201 100644
--- a/arch/x86/cpu/turbo.c
+++ b/arch/x86/cpu/turbo.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <log.h>
 #include <asm/cpu.h>
+#include <asm/global_data.h>
 #include <asm/msr.h>
 #include <asm/processor.h>
 #include <asm/turbo.h>
diff --git a/arch/x86/cpu/x86_64/cpu.c b/arch/x86/cpu/x86_64/cpu.c
index 1b4d3971b043..740851f24f3c 100644
--- a/arch/x86/cpu/x86_64/cpu.c
+++ b/arch/x86/cpu/x86_64/cpu.c
@@ -8,6 +8,7 @@
 #include <cpu_func.h>
 #include <debug_uart.h>
 #include <init.h>
+#include <asm/global_data.h>
 
 /*
  * Global declaration of gd.
diff --git a/arch/x86/include/asm/cpu_common.h b/arch/x86/include/asm/cpu_common.h
index cdd99a90b768..4a782a22956d 100644
--- a/arch/x86/include/asm/cpu_common.h
+++ b/arch/x86/include/asm/cpu_common.h
@@ -14,6 +14,7 @@ enum {
 };
 
 struct cpu_info;
+struct udevice;
 
 /**
  * cpu_common_init() - Set up common CPU init
diff --git a/arch/x86/include/asm/fast_spi.h b/arch/x86/include/asm/fast_spi.h
index 7a81d4f05c66..82e3d8f63ef1 100644
--- a/arch/x86/include/asm/fast_spi.h
+++ b/arch/x86/include/asm/fast_spi.h
@@ -6,8 +6,10 @@
 #ifndef ASM_FAST_SPI_H
 #define ASM_FAST_SPI_H
 
-/* Register offsets from the MMIO region base (PCI_BASE_ADDRESS_0) */
+#include <pci.h>
 #include <linux/bitops.h>
+
+/* Register offsets from the MMIO region base (PCI_BASE_ADDRESS_0) */
 struct fast_spi_regs {
 	u32 bfp;
 	u32 hsfsts_ctl;
diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h
index cf6c33cbe3af..83dc09757e0c 100644
--- a/arch/x86/include/asm/io.h
+++ b/arch/x86/include/asm/io.h
@@ -7,7 +7,7 @@
 #ifndef _ASM_IO_H
 #define _ASM_IO_H
 
-#include <linux/compiler.h>
+#include <compiler.h>
 
 /*
  * This file contains the definitions for the x86 IO instructions
diff --git a/arch/x86/include/asm/mp.h b/arch/x86/include/asm/mp.h
index 5f9b8c656432..25edabbdd399 100644
--- a/arch/x86/include/asm/mp.h
+++ b/arch/x86/include/asm/mp.h
@@ -11,6 +11,8 @@
 #include <asm/atomic.h>
 #include <asm/cache.h>
 
+struct udevice;
+
 enum {
 	/* Indicates that the function should run on all CPUs */
 	MP_SELECT_ALL	= -1,
diff --git a/arch/x86/lib/acpi_s3.c b/arch/x86/lib/acpi_s3.c
index 52410a515dfa..2c70acbe7b0b 100644
--- a/arch/x86/lib/acpi_s3.c
+++ b/arch/x86/lib/acpi_s3.c
@@ -7,6 +7,7 @@
 #include <acpi/acpi_s3.h>
 #include <acpi/acpi_table.h>
 #include <asm/acpi.h>
+#include <asm/global_data.h>
 #include <asm/post.h>
 #include <linux/linkage.h>
 
diff --git a/arch/x86/lib/acpi_table.c b/arch/x86/lib/acpi_table.c
index 3a93fedfc3e9..c574f0c62304 100644
--- a/arch/x86/lib/acpi_table.c
+++ b/arch/x86/lib/acpi_table.c
@@ -10,6 +10,7 @@
 #include <cpu.h>
 #include <dm.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <dm/uclass-internal.h>
 #include <mapmem.h>
 #include <serial.h>
diff --git a/arch/x86/lib/asm-offsets.c b/arch/x86/lib/asm-offsets.c
index 47b38cd9e782..8df67db65c39 100644
--- a/arch/x86/lib/asm-offsets.c
+++ b/arch/x86/lib/asm-offsets.c
@@ -12,6 +12,7 @@
  */
 
 #include <common.h>
+#include <asm/global_data.h>
 #include <linux/kbuild.h>
 
 int main(void)
diff --git a/arch/x86/lib/bios.c b/arch/x86/lib/bios.c
index 3ab432e2623c..fbdc3b04e361 100644
--- a/arch/x86/lib/bios.c
+++ b/arch/x86/lib/bios.c
@@ -6,6 +6,7 @@
  * Copyright (C) 2009-2010 coresystems GmbH
  */
 #include <common.h>
+#include <compiler.h>
 #include <bios_emul.h>
 #include <irq_func.h>
 #include <log.h>
diff --git a/arch/x86/lib/bootm.c b/arch/x86/lib/bootm.c
index 1198a52ecac3..b255144318cd 100644
--- a/arch/x86/lib/bootm.c
+++ b/arch/x86/lib/bootm.c
@@ -12,6 +12,7 @@
 #include <command.h>
 #include <hang.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <dm/device.h>
 #include <dm/root.h>
 #include <errno.h>
diff --git a/arch/x86/lib/cmd_boot.c b/arch/x86/lib/cmd_boot.c
index baaf3d13ad4b..4facbe5f32fb 100644
--- a/arch/x86/lib/cmd_boot.c
+++ b/arch/x86/lib/cmd_boot.c
@@ -17,6 +17,7 @@
 #include <common.h>
 #include <command.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <asm/u-boot-x86.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/x86/lib/coreboot_table.c b/arch/x86/lib/coreboot_table.c
index 6cd324430121..6eab0452fda6 100644
--- a/arch/x86/lib/coreboot_table.c
+++ b/arch/x86/lib/coreboot_table.c
@@ -10,6 +10,7 @@
 #include <acpi/acpi_s3.h>
 #include <asm/coreboot_tables.h>
 #include <asm/e820.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/lib/e820.c b/arch/x86/lib/e820.c
index 1f20c5c8c6bb..12fcff123805 100644
--- a/arch/x86/lib/e820.c
+++ b/arch/x86/lib/e820.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <efi_loader.h>
 #include <asm/e820.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/lib/fsp/fsp_common.c b/arch/x86/lib/fsp/fsp_common.c
index ea5295472546..82f7d3ab5f0d 100644
--- a/arch/x86/lib/fsp/fsp_common.c
+++ b/arch/x86/lib/fsp/fsp_common.c
@@ -13,6 +13,7 @@
 #include <acpi/acpi_s3.h>
 #include <asm/cmos_layout.h>
 #include <asm/early_cmos.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/mrccache.h>
 #include <asm/post.h>
diff --git a/arch/x86/lib/fsp/fsp_dram.c b/arch/x86/lib/fsp/fsp_dram.c
index faa819fab4b7..9b796ba4f4ea 100644
--- a/arch/x86/lib/fsp/fsp_dram.c
+++ b/arch/x86/lib/fsp/fsp_dram.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <asm/fsp/fsp_support.h>
 #include <asm/e820.h>
+#include <asm/global_data.h>
 #include <asm/mrccache.h>
 #include <asm/mtrr.h>
 #include <asm/post.h>
diff --git a/arch/x86/lib/fsp/fsp_graphics.c b/arch/x86/lib/fsp/fsp_graphics.c
index e8c1e07af1cb..32995e2df60e 100644
--- a/arch/x86/lib/fsp/fsp_graphics.c
+++ b/arch/x86/lib/fsp/fsp_graphics.c
@@ -10,6 +10,7 @@
 #include <vbe.h>
 #include <video.h>
 #include <asm/fsp/fsp_support.h>
+#include <asm/global_data.h>
 #include <asm/mtrr.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/x86/lib/fsp1/fsp_common.c b/arch/x86/lib/fsp1/fsp_common.c
index da351cf097c0..20926171822d 100644
--- a/arch/x86/lib/fsp1/fsp_common.c
+++ b/arch/x86/lib/fsp1/fsp_common.c
@@ -13,6 +13,7 @@
 #include <acpi/acpi_s3.h>
 #include <asm/cmos_layout.h>
 #include <asm/early_cmos.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/mrccache.h>
 #include <asm/post.h>
diff --git a/arch/x86/lib/fsp1/fsp_dram.c b/arch/x86/lib/fsp1/fsp_dram.c
index e3f9e30f6a63..cfd9b9f48c34 100644
--- a/arch/x86/lib/fsp1/fsp_dram.c
+++ b/arch/x86/lib/fsp1/fsp_dram.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <init.h>
 #include <asm/fsp/fsp_support.h>
+#include <asm/global_data.h>
 
 int dram_init(void)
 {
diff --git a/arch/x86/lib/fsp2/fsp_dram.c b/arch/x86/lib/fsp2/fsp_dram.c
index c9f6402e6a4c..c31e2a11b7a2 100644
--- a/arch/x86/lib/fsp2/fsp_dram.c
+++ b/arch/x86/lib/fsp2/fsp_dram.c
@@ -14,6 +14,7 @@
 #include <asm/fsp/fsp_support.h>
 #include <asm/fsp2/fsp_api.h>
 #include <asm/fsp2/fsp_internal.h>
+#include <asm/global_data.h>
 #include <linux/sizes.h>
 
 int dram_init(void)
diff --git a/arch/x86/lib/fsp2/fsp_meminit.c b/arch/x86/lib/fsp2/fsp_meminit.c
index ce0b0aff76be..022e2cb64e5a 100644
--- a/arch/x86/lib/fsp2/fsp_meminit.c
+++ b/arch/x86/lib/fsp2/fsp_meminit.c
@@ -11,6 +11,7 @@
 #include <bootstage.h>
 #include <dm.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/mrccache.h>
 #include <asm/fsp/fsp_infoheader.h>
 #include <asm/fsp2/fsp_api.h>
diff --git a/arch/x86/lib/fsp2/fsp_silicon_init.c b/arch/x86/lib/fsp2/fsp_silicon_init.c
index 0f221a864fb4..f86dbfa6c63c 100644
--- a/arch/x86/lib/fsp2/fsp_silicon_init.c
+++ b/arch/x86/lib/fsp2/fsp_silicon_init.c
@@ -17,6 +17,7 @@
 #include <asm/arch/fsp/fsp_s_upd.h>
 #include <asm/fsp/fsp_infoheader.h>
 #include <asm/fsp2/fsp_internal.h>
+#include <asm/global_data.h>
 
 int fsp_silicon_init(bool s3wake, bool use_spi_flash)
 {
diff --git a/arch/x86/lib/fsp2/fsp_support.c b/arch/x86/lib/fsp2/fsp_support.c
index 3f2ca840dc95..bcdf429f06ae 100644
--- a/arch/x86/lib/fsp2/fsp_support.c
+++ b/arch/x86/lib/fsp2/fsp_support.c
@@ -10,6 +10,7 @@
 #include <spi_flash.h>
 #include <asm/fsp/fsp_support.h>
 #include <asm/fsp2/fsp_internal.h>
+#include <asm/global_data.h>
 
 /* The amount of the FSP header to probe to obtain what we need */
 #define PROBE_BUF_SIZE 0x180
diff --git a/arch/x86/lib/init_helpers.c b/arch/x86/lib/init_helpers.c
index d906b528b35b..066dc404a2d8 100644
--- a/arch/x86/lib/init_helpers.c
+++ b/arch/x86/lib/init_helpers.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <linux/errno.h>
 #include <asm/mtrr.h>
 
diff --git a/arch/x86/lib/mpspec.c b/arch/x86/lib/mpspec.c
index 1c49c41b310e..8021d8f75a4a 100644
--- a/arch/x86/lib/mpspec.c
+++ b/arch/x86/lib/mpspec.c
@@ -12,6 +12,7 @@
 #include <fdtdec.h>
 #include <log.h>
 #include <asm/cpu.h>
+#include <asm/global_data.h>
 #include <asm/irq.h>
 #include <asm/ioapic.h>
 #include <asm/lapic.h>
diff --git a/arch/x86/lib/mrccache.c b/arch/x86/lib/mrccache.c
index f181e8100cb7..b52691568012 100644
--- a/arch/x86/lib/mrccache.c
+++ b/arch/x86/lib/mrccache.c
@@ -15,6 +15,7 @@
 #include <net.h>
 #include <spi.h>
 #include <spi_flash.h>
+#include <asm/global_data.h>
 #include <asm/mrccache.h>
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
diff --git a/arch/x86/lib/physmem.c b/arch/x86/lib/physmem.c
index 4578046169a7..c11101b44ece 100644
--- a/arch/x86/lib/physmem.c
+++ b/arch/x86/lib/physmem.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <physmem.h>
 #include <asm/cpu.h>
+#include <asm/global_data.h>
 #include <linux/compiler.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/x86/lib/pinctrl_ich6.c b/arch/x86/lib/pinctrl_ich6.c
index 482599478b80..fd5e311b2916 100644
--- a/arch/x86/lib/pinctrl_ich6.c
+++ b/arch/x86/lib/pinctrl_ich6.c
@@ -11,6 +11,7 @@
 #include <pch.h>
 #include <pci.h>
 #include <asm/cpu.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <asm/pci.h>
diff --git a/arch/x86/lib/pirq_routing.c b/arch/x86/lib/pirq_routing.c
index eb6a7d96de10..caeaec9287fe 100644
--- a/arch/x86/lib/pirq_routing.c
+++ b/arch/x86/lib/pirq_routing.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <log.h>
 #include <pci.h>
+#include <asm/global_data.h>
 #include <asm/pci.h>
 #include <asm/pirq_routing.h>
 
diff --git a/arch/x86/lib/relocate.c b/arch/x86/lib/relocate.c
index ecbd0927e07c..6fe515164773 100644
--- a/arch/x86/lib/relocate.c
+++ b/arch/x86/lib/relocate.c
@@ -17,6 +17,7 @@
 #include <common.h>
 #include <log.h>
 #include <relocate.h>
+#include <asm/global_data.h>
 #include <asm/u-boot-x86.h>
 #include <asm/sections.h>
 #include <elf.h>
diff --git a/arch/x86/lib/spl.c b/arch/x86/lib/spl.c
index cf22fa2d7b5f..a220c71b5768 100644
--- a/arch/x86/lib/spl.c
+++ b/arch/x86/lib/spl.c
@@ -17,6 +17,7 @@
 #include <syscon.h>
 #include <asm/cpu.h>
 #include <asm/cpu_common.h>
+#include <asm/global_data.h>
 #include <asm/mrccache.h>
 #include <asm/mtrr.h>
 #include <asm/pci.h>
diff --git a/arch/x86/lib/tables.c b/arch/x86/lib/tables.c
index 7bad5dd30327..730552a0ea55 100644
--- a/arch/x86/lib/tables.c
+++ b/arch/x86/lib/tables.c
@@ -8,6 +8,7 @@
 #include <malloc.h>
 #include <smbios.h>
 #include <acpi/acpi_table.h>
+#include <asm/global_data.h>
 #include <asm/sfi.h>
 #include <asm/mpspec.h>
 #include <asm/tables.h>
diff --git a/arch/x86/lib/tpl.c b/arch/x86/lib/tpl.c
index 6f7eb43a1724..789472bc9a2a 100644
--- a/arch/x86/lib/tpl.c
+++ b/arch/x86/lib/tpl.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <spl.h>
 #include <asm/cpu.h>
+#include <asm/global_data.h>
 #include <asm/mtrr.h>
 #include <asm/processor.h>
 #include <asm-generic/sections.h>
diff --git a/arch/xtensa/lib/bootm.c b/arch/xtensa/lib/bootm.c
index 458eaf95c044..b51d329c670b 100644
--- a/arch/xtensa/lib/bootm.c
+++ b/arch/xtensa/lib/bootm.c
@@ -9,6 +9,7 @@
 #include <command.h>
 #include <cpu_func.h>
 #include <env.h>
+#include <asm/global_data.h>
 #include <u-boot/zlib.h>
 #include <asm/byteorder.h>
 #include <asm/addrspace.h>
diff --git a/board/AndesTech/adp-ae3xx/adp-ae3xx.c b/board/AndesTech/adp-ae3xx/adp-ae3xx.c
index b52cbd4d8615..3c4a27d63f6a 100644
--- a/board/AndesTech/adp-ae3xx/adp-ae3xx.c
+++ b/board/AndesTech/adp-ae3xx/adp-ae3xx.c
@@ -7,6 +7,7 @@
 
 #include <init.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <asm/mach-types.h>
 #include <common.h>
 #include <flash.h>
diff --git a/board/AndesTech/adp-ag101p/adp-ag101p.c b/board/AndesTech/adp-ag101p/adp-ag101p.c
index 3dd880f3d6c4..8848b7f97386 100644
--- a/board/AndesTech/adp-ag101p/adp-ag101p.c
+++ b/board/AndesTech/adp-ag101p/adp-ag101p.c
@@ -12,6 +12,7 @@
 #if defined(CONFIG_FTMAC100) && !defined(CONFIG_DM_ETH)
 #include <netdev.h>
 #endif
+#include <asm/global_data.h>
 #include <linux/io.h>
 #include <asm/io.h>
 #include <asm/mach-types.h>
diff --git a/board/AndesTech/ax25-ae350/ax25-ae350.c b/board/AndesTech/ax25-ae350/ax25-ae350.c
index 59a43e4dcc4d..d781038de285 100644
--- a/board/AndesTech/ax25-ae350/ax25-ae350.c
+++ b/board/AndesTech/ax25-ae350/ax25-ae350.c
@@ -12,6 +12,7 @@
 #if defined(CONFIG_FTMAC100) && !defined(CONFIG_DM_ETH)
 #include <netdev.h>
 #endif
+#include <asm/global_data.h>
 #include <linux/io.h>
 #include <faraday/ftsmc020.h>
 #include <fdtdec.h>
diff --git a/board/Arcturus/ucp1020/spl.c b/board/Arcturus/ucp1020/spl.c
index 5416a5b663c1..34660e59f44e 100644
--- a/board/Arcturus/ucp1020/spl.c
+++ b/board/Arcturus/ucp1020/spl.c
@@ -20,6 +20,7 @@
 #include <i2c.h>
 #include <fsl_esdhc.h>
 #include <spi_flash.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/BuR/brppt1/board.c b/board/BuR/brppt1/board.c
index 8aa03eac2838..7df37e4e66ac 100644
--- a/board/BuR/brppt1/board.c
+++ b/board/BuR/brppt1/board.c
@@ -23,6 +23,7 @@
 #include <asm/arch/gpio.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/mem.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/emif.h>
 #include <asm/gpio.h>
diff --git a/board/BuR/brppt2/board.c b/board/BuR/brppt2/board.c
index f156b552a761..e6eb403fc3d9 100644
--- a/board/BuR/brppt2/board.c
+++ b/board/BuR/brppt2/board.c
@@ -21,6 +21,7 @@
 # include <asm/arch/mx6-ddr.h>
 #endif
 #include <asm/arch/clock.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
 
diff --git a/board/BuR/brsmarc1/board.c b/board/BuR/brsmarc1/board.c
index 5b9108a89f91..738a5d2ff944 100644
--- a/board/BuR/brsmarc1/board.c
+++ b/board/BuR/brsmarc1/board.c
@@ -19,6 +19,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/mem.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
 #include <asm/emif.h>
diff --git a/board/BuR/brxre1/board.c b/board/BuR/brxre1/board.c
index 5d57e19fde03..ef692b006d51 100644
--- a/board/BuR/brxre1/board.c
+++ b/board/BuR/brxre1/board.c
@@ -21,6 +21,7 @@
 #include <asm/arch/gpio.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/mem.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/emif.h>
 #include <asm/gpio.h>
diff --git a/board/BuR/common/common.c b/board/BuR/common/common.c
index 0a5104a48f93..d2d4ea5835bb 100644
--- a/board/BuR/common/common.c
+++ b/board/BuR/common/common.c
@@ -15,6 +15,7 @@
 #include <fdtdec.h>
 #include <i2c.h>
 #include <lcd.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 #include "bur_common.h"
 
diff --git a/board/BuS/eb_cpu5282/eb_cpu5282.c b/board/BuS/eb_cpu5282/eb_cpu5282.c
index 1d05e40c209b..03a02ffd29c5 100644
--- a/board/BuS/eb_cpu5282/eb_cpu5282.c
+++ b/board/BuS/eb_cpu5282/eb_cpu5282.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <asm/global_data.h>
 #include "asm/m5282.h"
 #include <bmp_layout.h>
 #include <env.h>
diff --git a/board/CZ.NIC/turris_mox/turris_mox.c b/board/CZ.NIC/turris_mox/turris_mox.c
index 679f3eb7014c..486680a49e88 100644
--- a/board/CZ.NIC/turris_mox/turris_mox.c
+++ b/board/CZ.NIC/turris_mox/turris_mox.c
@@ -7,6 +7,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
 #include <clk.h>
diff --git a/board/CZ.NIC/turris_omnia/turris_omnia.c b/board/CZ.NIC/turris_omnia/turris_omnia.c
index 2da878d3648b..0353d58a361b 100644
--- a/board/CZ.NIC/turris_omnia/turris_omnia.c
+++ b/board/CZ.NIC/turris_omnia/turris_omnia.c
@@ -15,6 +15,7 @@
 #include <miiphy.h>
 #include <net.h>
 #include <netdev.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
diff --git a/board/CarMediaLab/flea3/flea3.c b/board/CarMediaLab/flea3/flea3.c
index 11fcecb94e57..12c5ac331f97 100644
--- a/board/CarMediaLab/flea3/flea3.c
+++ b/board/CarMediaLab/flea3/flea3.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <env.h>
 #include <linux/delay.h>
diff --git a/board/LaCie/edminiv2/edminiv2.c b/board/LaCie/edminiv2/edminiv2.c
index b5ffe8162f32..9c066a283c99 100644
--- a/board/LaCie/edminiv2/edminiv2.c
+++ b/board/LaCie/edminiv2/edminiv2.c
@@ -11,6 +11,7 @@
 #include <miiphy.h>
 #include <net.h>
 #include <asm/arch/orion5x.h>
+#include <asm/global_data.h>
 #include "../common/common.h"
 #include <spl.h>
 #include <ns16550.h>
diff --git a/board/LaCie/net2big_v2/net2big_v2.c b/board/LaCie/net2big_v2/net2big_v2.c
index e94c9a6dce96..695d6f6ed470 100644
--- a/board/LaCie/net2big_v2/net2big_v2.c
+++ b/board/LaCie/net2big_v2/net2big_v2.c
@@ -14,6 +14,7 @@
 #include <i2c.h>
 #include <init.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <asm/mach-types.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
diff --git a/board/LaCie/netspace_v2/netspace_v2.c b/board/LaCie/netspace_v2/netspace_v2.c
index 33246b201528..730eab7e7031 100644
--- a/board/LaCie/netspace_v2/netspace_v2.c
+++ b/board/LaCie/netspace_v2/netspace_v2.c
@@ -13,6 +13,7 @@
 #include <env.h>
 #include <init.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <asm/mach-types.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
diff --git a/board/Marvell/aspenite/aspenite.c b/board/Marvell/aspenite/aspenite.c
index c1406d7489cf..1f9389c0a7ab 100644
--- a/board/Marvell/aspenite/aspenite.c
+++ b/board/Marvell/aspenite/aspenite.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <init.h>
 #include <mvmfp.h>
+#include <asm/global_data.h>
 #include <asm/mach-types.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/mfp.h>
diff --git a/board/Marvell/db-88f6281-bp/db-88f6281-bp.c b/board/Marvell/db-88f6281-bp/db-88f6281-bp.c
index 62027bd6385e..08f79d4b5320 100644
--- a/board/Marvell/db-88f6281-bp/db-88f6281-bp.c
+++ b/board/Marvell/db-88f6281-bp/db-88f6281-bp.c
@@ -3,6 +3,7 @@
 #include <common.h>
 #include <init.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/io.h>
 #include <miiphy.h>
diff --git a/board/Marvell/db-88f6720/db-88f6720.c b/board/Marvell/db-88f6720/db-88f6720.c
index 271535b76376..26c30647fbb0 100644
--- a/board/Marvell/db-88f6720/db-88f6720.c
+++ b/board/Marvell/db-88f6720/db-88f6720.c
@@ -8,6 +8,7 @@
 #include <miiphy.h>
 #include <net.h>
 #include <netdev.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
diff --git a/board/Marvell/db-88f6820-amc/db-88f6820-amc.c b/board/Marvell/db-88f6820-amc/db-88f6820-amc.c
index 9cd9ea2c0689..163a1b3de9d2 100644
--- a/board/Marvell/db-88f6820-amc/db-88f6820-amc.c
+++ b/board/Marvell/db-88f6820-amc/db-88f6820-amc.c
@@ -9,6 +9,7 @@
 #include <miiphy.h>
 #include <net.h>
 #include <netdev.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
diff --git a/board/Marvell/db-88f6820-gp/db-88f6820-gp.c b/board/Marvell/db-88f6820-gp/db-88f6820-gp.c
index 2bdd55329d05..06307e582cec 100644
--- a/board/Marvell/db-88f6820-gp/db-88f6820-gp.c
+++ b/board/Marvell/db-88f6820-gp/db-88f6820-gp.c
@@ -9,6 +9,7 @@
 #include <miiphy.h>
 #include <net.h>
 #include <netdev.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
diff --git a/board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c b/board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c
index 8d1dbebdb7a6..9e1fdecfca4d 100644
--- a/board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c
+++ b/board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c
@@ -8,6 +8,7 @@
 #include <miiphy.h>
 #include <net.h>
 #include <netdev.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
diff --git a/board/Marvell/db-xc3-24g4xg/db-xc3-24g4xg.c b/board/Marvell/db-xc3-24g4xg/db-xc3-24g4xg.c
index 5f12a27002f0..0abdca1cd210 100644
--- a/board/Marvell/db-xc3-24g4xg/db-xc3-24g4xg.c
+++ b/board/Marvell/db-xc3-24g4xg/db-xc3-24g4xg.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <i2c.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <linux/bitops.h>
 #include <linux/mbus.h>
diff --git a/board/Marvell/dreamplug/dreamplug.c b/board/Marvell/dreamplug/dreamplug.c
index 7d188c327955..e1c64b52246b 100644
--- a/board/Marvell/dreamplug/dreamplug.c
+++ b/board/Marvell/dreamplug/dreamplug.c
@@ -15,6 +15,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
 #include <asm/arch/mpp.h>
+#include <asm/global_data.h>
 #include "dreamplug.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/Marvell/gplugd/gplugd.c b/board/Marvell/gplugd/gplugd.c
index 58e433fd3472..c6376cdf6a94 100644
--- a/board/Marvell/gplugd/gplugd.c
+++ b/board/Marvell/gplugd/gplugd.c
@@ -18,6 +18,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/mfp.h>
 #include <asm/arch/armada100.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <miiphy.h>
 #include <asm/mach-types.h>
diff --git a/board/Marvell/guruplug/guruplug.c b/board/Marvell/guruplug/guruplug.c
index f3981c66d20b..8e7dbb3f3f60 100644
--- a/board/Marvell/guruplug/guruplug.c
+++ b/board/Marvell/guruplug/guruplug.c
@@ -9,6 +9,7 @@
 #include <init.h>
 #include <miiphy.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <asm/mach-types.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
diff --git a/board/Marvell/mvebu_armada-37xx/board.c b/board/Marvell/mvebu_armada-37xx/board.c
index 9bea1986d4d1..73e2c3723a36 100644
--- a/board/Marvell/mvebu_armada-37xx/board.c
+++ b/board/Marvell/mvebu_armada-37xx/board.c
@@ -8,6 +8,7 @@
 #include <i2c.h>
 #include <init.h>
 #include <phy.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
diff --git a/board/Marvell/mvebu_armada-8k/board.c b/board/Marvell/mvebu_armada-8k/board.c
index 60b002463078..fa27a3521422 100644
--- a/board/Marvell/mvebu_armada-8k/board.c
+++ b/board/Marvell/mvebu_armada-8k/board.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
diff --git a/board/Marvell/openrd/openrd.c b/board/Marvell/openrd/openrd.c
index d9b5b213feab..f44ac3315ebc 100644
--- a/board/Marvell/openrd/openrd.c
+++ b/board/Marvell/openrd/openrd.c
@@ -14,6 +14,7 @@
 #include <init.h>
 #include <miiphy.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <asm/mach-types.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
diff --git a/board/Marvell/sheevaplug/sheevaplug.c b/board/Marvell/sheevaplug/sheevaplug.c
index 6311ed3b2e59..0cc7f2b39243 100644
--- a/board/Marvell/sheevaplug/sheevaplug.c
+++ b/board/Marvell/sheevaplug/sheevaplug.c
@@ -9,6 +9,7 @@
 #include <init.h>
 #include <miiphy.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <asm/mach-types.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
diff --git a/board/Seagate/dockstar/dockstar.c b/board/Seagate/dockstar/dockstar.c
index 85dd10e55a2c..380e37be5502 100644
--- a/board/Seagate/dockstar/dockstar.c
+++ b/board/Seagate/dockstar/dockstar.c
@@ -16,6 +16,7 @@
 #include <asm/arch/soc.h>
 #include <asm/arch/mpp.h>
 #include <asm/arch/cpu.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/mach-types.h>
 #include "dockstar.h"
diff --git a/board/Seagate/goflexhome/goflexhome.c b/board/Seagate/goflexhome/goflexhome.c
index de1ec544667c..4c19fa7195e8 100644
--- a/board/Seagate/goflexhome/goflexhome.c
+++ b/board/Seagate/goflexhome/goflexhome.c
@@ -16,6 +16,7 @@
 #include <init.h>
 #include <miiphy.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <asm/mach-types.h>
 #include <asm/arch/soc.h>
 #include <asm/arch/mpp.h>
diff --git a/board/Seagate/nas220/nas220.c b/board/Seagate/nas220/nas220.c
index 3a027d083a7b..cd2bbdad1cd6 100644
--- a/board/Seagate/nas220/nas220.c
+++ b/board/Seagate/nas220/nas220.c
@@ -12,6 +12,7 @@
 #include <init.h>
 #include <miiphy.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <asm/mach-types.h>
 #include <asm/arch/soc.h>
 #include <asm/arch/mpp.h>
diff --git a/board/Synology/ds109/ds109.c b/board/Synology/ds109/ds109.c
index aa2987d924f2..bf57ffff4385 100644
--- a/board/Synology/ds109/ds109.c
+++ b/board/Synology/ds109/ds109.c
@@ -9,6 +9,7 @@
 #include <init.h>
 #include <miiphy.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <asm/setup.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
diff --git a/board/Synology/ds414/ds414.c b/board/Synology/ds414/ds414.c
index 632205164ebf..9c4ce670ddfb 100644
--- a/board/Synology/ds414/ds414.c
+++ b/board/Synology/ds414/ds414.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <init.h>
 #include <miiphy.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
diff --git a/board/advantech/dms-ba16/dms-ba16.c b/board/advantech/dms-ba16/dms-ba16.c
index 20820fdf0762..07a47e9fbb04 100644
--- a/board/advantech/dms-ba16/dms-ba16.c
+++ b/board/advantech/dms-ba16/dms-ba16.c
@@ -11,6 +11,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/mx6-pins.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
diff --git a/board/advantech/imx8qm_rom7720_a1/imx8qm_rom7720_a1.c b/board/advantech/imx8qm_rom7720_a1/imx8qm_rom7720_a1.c
index ea057d27cf35..8492e7603b46 100644
--- a/board/advantech/imx8qm_rom7720_a1/imx8qm_rom7720_a1.c
+++ b/board/advantech/imx8qm_rom7720_a1/imx8qm_rom7720_a1.c
@@ -9,6 +9,7 @@
 #include <env.h>
 #include <errno.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 #include <asm/io.h>
diff --git a/board/advantech/imx8qm_rom7720_a1/spl.c b/board/advantech/imx8qm_rom7720_a1/spl.c
index a2386c9ef005..8493bb01588d 100644
--- a/board/advantech/imx8qm_rom7720_a1/spl.c
+++ b/board/advantech/imx8qm_rom7720_a1/spl.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <spl.h>
 #include <fsl_esdhc.h>
+#include <asm/global_data.h>
 
 #include <asm/io.h>
 #include <asm/gpio.h>
diff --git a/board/alliedtelesis/SBx81LIFKW/sbx81lifkw.c b/board/alliedtelesis/SBx81LIFKW/sbx81lifkw.c
index 668484b71b6a..d8b9fdfe356f 100644
--- a/board/alliedtelesis/SBx81LIFKW/sbx81lifkw.c
+++ b/board/alliedtelesis/SBx81LIFKW/sbx81lifkw.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <init.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/io.h>
diff --git a/board/alliedtelesis/SBx81LIFXCAT/sbx81lifxcat.c b/board/alliedtelesis/SBx81LIFXCAT/sbx81lifxcat.c
index e4bf507cc3f0..52b8eba92fc1 100644
--- a/board/alliedtelesis/SBx81LIFXCAT/sbx81lifxcat.c
+++ b/board/alliedtelesis/SBx81LIFXCAT/sbx81lifxcat.c
@@ -10,6 +10,7 @@
 #include <net.h>
 #include <netdev.h>
 #include <led.h>
+#include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/io.h>
 #include <asm/arch/cpu.h>
diff --git a/board/alliedtelesis/common/gpio_hog.c b/board/alliedtelesis/common/gpio_hog.c
index 1f87b3ac1b72..4aecf7e2cef7 100644
--- a/board/alliedtelesis/common/gpio_hog.c
+++ b/board/alliedtelesis/common/gpio_hog.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/alliedtelesis/x530/x530.c b/board/alliedtelesis/x530/x530.c
index c7438aeaf148..d602092d7329 100644
--- a/board/alliedtelesis/x530/x530.c
+++ b/board/alliedtelesis/x530/x530.c
@@ -10,6 +10,7 @@
 #include <i2c.h>
 #include <init.h>
 #include <wdt.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <linux/bitops.h>
 #include <linux/mbus.h>
diff --git a/board/amazon/kc1/kc1.c b/board/amazon/kc1/kc1.c
index 7d62a1d5a863..94e396134406 100644
--- a/board/amazon/kc1/kc1.c
+++ b/board/amazon/kc1/kc1.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <env.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <linux/ctype.h>
 #include <linux/usb/musb.h>
 #include <asm/omap_musb.h>
diff --git a/board/aristainetos/aristainetos.c b/board/aristainetos/aristainetos.c
index 14931120f6f6..a28f67a0b13a 100644
--- a/board/aristainetos/aristainetos.c
+++ b/board/aristainetos/aristainetos.c
@@ -16,6 +16,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/mx6-pins.h>
+#include <asm/global_data.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
 #include <asm/mach-imx/iomux-v3.h>
diff --git a/board/armadeus/apf27/apf27.c b/board/armadeus/apf27/apf27.c
index 29e0bf388d07..5e3fdd36fa21 100644
--- a/board/armadeus/apf27/apf27.c
+++ b/board/armadeus/apf27/apf27.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <hang.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <jffs2/jffs2.h>
 #include <nand.h>
 #include <netdev.h>
diff --git a/board/armltd/integrator/integrator.c b/board/armltd/integrator/integrator.c
index 19871bee1460..a730f15c7a32 100644
--- a/board/armltd/integrator/integrator.c
+++ b/board/armltd/integrator/integrator.c
@@ -24,6 +24,7 @@
 #include <init.h>
 #include <net.h>
 #include <netdev.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm/platform_data/serial_pl01x.h>
 #include "arm-ebi.h"
diff --git a/board/armltd/vexpress/vexpress_common.c b/board/armltd/vexpress/vexpress_common.c
index 70f6cd80d5ac..d34c03bf9dd5 100644
--- a/board/armltd/vexpress/vexpress_common.c
+++ b/board/armltd/vexpress/vexpress_common.c
@@ -23,6 +23,7 @@
 #include <errno.h>
 #include <net.h>
 #include <netdev.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/mach-types.h>
 #include <asm/arch/systimer.h>
diff --git a/board/armltd/vexpress64/vexpress64.c b/board/armltd/vexpress64/vexpress64.c
index 52ada0f6bce7..6bf2ed23190b 100644
--- a/board/armltd/vexpress64/vexpress64.c
+++ b/board/armltd/vexpress64/vexpress64.c
@@ -12,6 +12,7 @@
 #include <errno.h>
 #include <net.h>
 #include <netdev.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/compiler.h>
 #include <dm/platform_data/serial_pl01x.h>
diff --git a/board/astro/mcf5373l/mcf5373l.c b/board/astro/mcf5373l/mcf5373l.c
index e7c2b909300d..3e2f79a1cf4c 100644
--- a/board/astro/mcf5373l/mcf5373l.c
+++ b/board/astro/mcf5373l/mcf5373l.c
@@ -10,6 +10,7 @@
 #include <serial.h>
 #include <watchdog.h>
 #include <command.h>
+#include <asm/global_data.h>
 #include <asm/m5329.h>
 #include <asm/immap_5329.h>
 #include <asm/io.h>
diff --git a/board/atmark-techno/armadillo-800eva/armadillo-800eva.c b/board/atmark-techno/armadillo-800eva/armadillo-800eva.c
index a18fb275d9f5..1bae2832522f 100644
--- a/board/atmark-techno/armadillo-800eva/armadillo-800eva.c
+++ b/board/atmark-techno/armadillo-800eva/armadillo-800eva.c
@@ -24,6 +24,7 @@
 #include <cpu_func.h>
 #include <init.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <asm/processor.h>
 #include <asm/mach-types.h>
 #include <asm/io.h>
diff --git a/board/atmel/at91rm9200ek/at91rm9200ek.c b/board/atmel/at91rm9200ek/at91rm9200ek.c
index 8844bc754193..a314ced5e4a5 100644
--- a/board/atmel/at91rm9200ek/at91rm9200ek.c
+++ b/board/atmel/at91rm9200ek/at91rm9200ek.c
@@ -13,6 +13,7 @@
 #include <init.h>
 #include <net.h>
 #include <netdev.h>
+#include <asm/global_data.h>
 #include <asm/mach-types.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/at91_pio.h>
diff --git a/board/atmel/at91sam9260ek/at91sam9260ek.c b/board/atmel/at91sam9260ek/at91sam9260ek.c
index 42fa7627724e..38f97bce2042 100644
--- a/board/atmel/at91sam9260ek/at91sam9260ek.c
+++ b/board/atmel/at91sam9260ek/at91sam9260ek.c
@@ -9,6 +9,7 @@
 #include <debug_uart.h>
 #include <init.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/at91sam9260_matrix.h>
 #include <asm/arch/at91sam9_smc.h>
diff --git a/board/atmel/at91sam9261ek/at91sam9261ek.c b/board/atmel/at91sam9261ek/at91sam9261ek.c
index f467a4f566c9..0318eeaa94e9 100644
--- a/board/atmel/at91sam9261ek/at91sam9261ek.c
+++ b/board/atmel/at91sam9261ek/at91sam9261ek.c
@@ -9,6 +9,7 @@
 #include <debug_uart.h>
 #include <init.h>
 #include <vsprintf.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/at91sam9261.h>
 #include <asm/arch/at91sam9261_matrix.h>
diff --git a/board/atmel/at91sam9263ek/at91sam9263ek.c b/board/atmel/at91sam9263ek/at91sam9263ek.c
index be132bc185fb..3218e14e860a 100644
--- a/board/atmel/at91sam9263ek/at91sam9263ek.c
+++ b/board/atmel/at91sam9263ek/at91sam9263ek.c
@@ -11,6 +11,7 @@
 #include <init.h>
 #include <net.h>
 #include <vsprintf.h>
+#include <asm/global_data.h>
 #include <linux/sizes.h>
 #include <asm/arch/at91sam9263.h>
 #include <asm/arch/at91sam9_smc.h>
diff --git a/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c b/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c
index 8aabc5595196..8cb2808e058a 100644
--- a/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c
+++ b/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c
@@ -10,6 +10,7 @@
 #include <init.h>
 #include <net.h>
 #include <vsprintf.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clk.h>
 #include <asm/arch/at91sam9g45_matrix.h>
diff --git a/board/atmel/at91sam9n12ek/at91sam9n12ek.c b/board/atmel/at91sam9n12ek/at91sam9n12ek.c
index d7ff2e13352f..a3fc55bbc34b 100644
--- a/board/atmel/at91sam9n12ek/at91sam9n12ek.c
+++ b/board/atmel/at91sam9n12ek/at91sam9n12ek.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <net.h>
 #include <vsprintf.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/at91sam9x5_matrix.h>
 #include <asm/arch/at91sam9_smc.h>
diff --git a/board/atmel/at91sam9rlek/at91sam9rlek.c b/board/atmel/at91sam9rlek/at91sam9rlek.c
index f81dccc9cccb..f427ee658bff 100644
--- a/board/atmel/at91sam9rlek/at91sam9rlek.c
+++ b/board/atmel/at91sam9rlek/at91sam9rlek.c
@@ -9,6 +9,7 @@
 #include <debug_uart.h>
 #include <init.h>
 #include <vsprintf.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/mach-types.h>
 #include <asm/arch/at91sam9rl.h>
diff --git a/board/atmel/at91sam9x5ek/at91sam9x5ek.c b/board/atmel/at91sam9x5ek/at91sam9x5ek.c
index 2c071075bac5..e0abe4aeb08b 100644
--- a/board/atmel/at91sam9x5ek/at91sam9x5ek.c
+++ b/board/atmel/at91sam9x5ek/at91sam9x5ek.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/at91sam9x5_matrix.h>
 #include <asm/arch/at91sam9_smc.h>
diff --git a/board/atmel/common/video_display.c b/board/atmel/common/video_display.c
index 2666b0b3cd5d..a5049f4aad41 100644
--- a/board/atmel/common/video_display.c
+++ b/board/atmel/common/video_display.c
@@ -13,6 +13,7 @@
 #include <video.h>
 #include <video_console.h>
 #include <vsprintf.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clk.h>
 
diff --git a/board/atmel/sam9x60ek/sam9x60ek.c b/board/atmel/sam9x60ek/sam9x60ek.c
index fbd05c78a948..32e5a2bf23af 100644
--- a/board/atmel/sam9x60ek/sam9x60ek.c
+++ b/board/atmel/sam9x60ek/sam9x60ek.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/at91sam9_smc.h>
 #include <asm/arch/at91_common.h>
diff --git a/board/atmel/sama5d27_som1_ek/sama5d27_som1_ek.c b/board/atmel/sama5d27_som1_ek/sama5d27_som1_ek.c
index 376562cd0e7d..1b7d946b50c3 100644
--- a/board/atmel/sama5d27_som1_ek/sama5d27_som1_ek.c
+++ b/board/atmel/sama5d27_som1_ek/sama5d27_som1_ek.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <debug_uart.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/at91_common.h>
 #include <asm/arch/atmel_pio4.h>
diff --git a/board/atmel/sama5d27_wlsom1_ek/sama5d27_wlsom1_ek.c b/board/atmel/sama5d27_wlsom1_ek/sama5d27_wlsom1_ek.c
index c8c2e9581679..32d51bba7d96 100644
--- a/board/atmel/sama5d27_wlsom1_ek/sama5d27_wlsom1_ek.c
+++ b/board/atmel/sama5d27_wlsom1_ek/sama5d27_wlsom1_ek.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <debug_uart.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/at91_common.h>
 #include <asm/arch/atmel_pio4.h>
diff --git a/board/atmel/sama5d2_icp/sama5d2_icp.c b/board/atmel/sama5d2_icp/sama5d2_icp.c
index 7c34df48b871..3f33fcfc4665 100644
--- a/board/atmel/sama5d2_icp/sama5d2_icp.c
+++ b/board/atmel/sama5d2_icp/sama5d2_icp.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <debug_uart.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/at91_common.h>
 #include <asm/arch/atmel_pio4.h>
diff --git a/board/atmel/sama5d2_ptc_ek/sama5d2_ptc_ek.c b/board/atmel/sama5d2_ptc_ek/sama5d2_ptc_ek.c
index b0a23b02db2b..a6937e7d5243 100644
--- a/board/atmel/sama5d2_ptc_ek/sama5d2_ptc_ek.c
+++ b/board/atmel/sama5d2_ptc_ek/sama5d2_ptc_ek.c
@@ -11,6 +11,7 @@
 #include <init.h>
 #include <nand.h>
 #include <version.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/at91_common.h>
 #include <asm/arch/atmel_pio4.h>
diff --git a/board/atmel/sama5d2_xplained/sama5d2_xplained.c b/board/atmel/sama5d2_xplained/sama5d2_xplained.c
index 01636fb73d01..5110ec89697f 100644
--- a/board/atmel/sama5d2_xplained/sama5d2_xplained.c
+++ b/board/atmel/sama5d2_xplained/sama5d2_xplained.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <debug_uart.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/at91_common.h>
 #include <asm/arch/atmel_pio4.h>
diff --git a/board/atmel/sama5d3_xplained/sama5d3_xplained.c b/board/atmel/sama5d3_xplained/sama5d3_xplained.c
index 84c561be6fc3..db9603f58477 100644
--- a/board/atmel/sama5d3_xplained/sama5d3_xplained.c
+++ b/board/atmel/sama5d3_xplained/sama5d3_xplained.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/sama5d3_smc.h>
 #include <asm/arch/at91_common.h>
diff --git a/board/atmel/sama5d3xek/sama5d3xek.c b/board/atmel/sama5d3xek/sama5d3xek.c
index 7f6a31985920..b6f8dcd91dc0 100644
--- a/board/atmel/sama5d3xek/sama5d3xek.c
+++ b/board/atmel/sama5d3xek/sama5d3xek.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/sama5d3_smc.h>
 #include <asm/arch/at91_common.h>
diff --git a/board/atmel/sama5d4_xplained/sama5d4_xplained.c b/board/atmel/sama5d4_xplained/sama5d4_xplained.c
index 93cc183a5b47..2088b48b7ee2 100644
--- a/board/atmel/sama5d4_xplained/sama5d4_xplained.c
+++ b/board/atmel/sama5d4_xplained/sama5d4_xplained.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/at91_common.h>
 #include <asm/arch/at91_rstc.h>
diff --git a/board/atmel/sama5d4ek/sama5d4ek.c b/board/atmel/sama5d4ek/sama5d4ek.c
index 4b3883e20f85..46ec1eb32467 100644
--- a/board/atmel/sama5d4ek/sama5d4ek.c
+++ b/board/atmel/sama5d4ek/sama5d4ek.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/at91_common.h>
 #include <asm/arch/at91_rstc.h>
diff --git a/board/bachmann/ot1200/ot1200.c b/board/bachmann/ot1200/ot1200.c
index d3af634e3aba..69d1b106b072 100644
--- a/board/bachmann/ot1200/ot1200.c
+++ b/board/bachmann/ot1200/ot1200.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <init.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/barco/platinum/platinum.c b/board/barco/platinum/platinum.c
index f96106cb75ed..ec8d55288876 100644
--- a/board/barco/platinum/platinum.c
+++ b/board/barco/platinum/platinum.c
@@ -11,6 +11,7 @@
 #include <miiphy.h>
 #include <net.h>
 #include <netdev.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/barco/titanium/titanium.c b/board/barco/titanium/titanium.c
index 7a52e94c7eeb..efd1dc35ef4c 100644
--- a/board/barco/titanium/titanium.c
+++ b/board/barco/titanium/titanium.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <init.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/beacon/beacon-rzg2m/beacon-rzg2m.c b/board/beacon/beacon-rzg2m/beacon-rzg2m.c
index 86a24dd0658f..c343de510232 100644
--- a/board/beacon/beacon-rzg2m/beacon-rzg2m.c
+++ b/board/beacon/beacon-rzg2m/beacon-rzg2m.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/rcar-mstp.h>
 
diff --git a/board/beacon/imx8mm/imx8mm_beacon.c b/board/beacon/imx8mm/imx8mm_beacon.c
index c61d25fbead7..87ffebb5713d 100644
--- a/board/beacon/imx8mm/imx8mm_beacon.c
+++ b/board/beacon/imx8mm/imx8mm_beacon.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <miiphy.h>
 #include <netdev.h>
+#include <asm/global_data.h>
 
 #include <asm/arch/clock.h>
 #include <asm/arch/sys_proto.h>
diff --git a/board/beacon/imx8mm/spl.c b/board/beacon/imx8mm/spl.c
index 4ee10cf8555e..12266b22a42f 100644
--- a/board/beacon/imx8mm/spl.c
+++ b/board/beacon/imx8mm/spl.c
@@ -6,6 +6,7 @@
 #include <init.h>
 #include <log.h>
 #include <spl.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/arch/clock.h>
diff --git a/board/beckhoff/mx53cx9020/mx53cx9020.c b/board/beckhoff/mx53cx9020/mx53cx9020.c
index 617b545232a2..a3657db8266c 100644
--- a/board/beckhoff/mx53cx9020/mx53cx9020.c
+++ b/board/beckhoff/mx53cx9020/mx53cx9020.c
@@ -13,6 +13,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/iomux-mx53.h>
+#include <asm/global_data.h>
 #include <asm/mach-imx/mx5_video.h>
 #include <ACEX1K.h>
 #include <asm/gpio.h>
diff --git a/board/bluegiga/apx4devkit/apx4devkit.c b/board/bluegiga/apx4devkit/apx4devkit.c
index 739f71f5c4d1..ed0885f724c4 100644
--- a/board/bluegiga/apx4devkit/apx4devkit.c
+++ b/board/bluegiga/apx4devkit/apx4devkit.c
@@ -16,6 +16,7 @@
 #include <common.h>
 #include <init.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <asm/setup.h>
diff --git a/board/bluewater/gurnard/gurnard.c b/board/bluewater/gurnard/gurnard.c
index dc9871d44692..c5c8bcc598e6 100644
--- a/board/bluewater/gurnard/gurnard.c
+++ b/board/bluewater/gurnard/gurnard.c
@@ -19,6 +19,7 @@
 #ifndef CONFIG_DM_ETH
 #include <netdev.h>
 #endif
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <asm/mach-types.h>
diff --git a/board/bluewater/snapper9260/snapper9260.c b/board/bluewater/snapper9260/snapper9260.c
index 9b0a75ac5dfd..87fb967ea058 100644
--- a/board/bluewater/snapper9260/snapper9260.c
+++ b/board/bluewater/snapper9260/snapper9260.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <dm.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
 #include <asm/mach-types.h>
diff --git a/board/bosch/guardian/board.c b/board/bosch/guardian/board.c
index 1d8fa781545d..113838f8b723 100644
--- a/board/bosch/guardian/board.c
+++ b/board/bosch/guardian/board.c
@@ -19,6 +19,7 @@
 #include <led.h>
 #include <miiphy.h>
 #include <panel.h>
+#include <asm/global_data.h>
 #include <power/tps65217.h>
 #include <power/tps65910.h>
 #include <spl.h>
diff --git a/board/bosch/shc/board.c b/board/bosch/shc/board.c
index b8f1b56502e6..bfce291691a0 100644
--- a/board/bosch/shc/board.c
+++ b/board/bosch/shc/board.c
@@ -29,6 +29,7 @@
 #include <asm/arch/mmc_host_def.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/mem.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/emif.h>
 #include <asm/gpio.h>
diff --git a/board/boundary/nitrogen6x/nitrogen6x.c b/board/boundary/nitrogen6x/nitrogen6x.c
index 5b2d675a557e..84e14d1124fc 100644
--- a/board/boundary/nitrogen6x/nitrogen6x.c
+++ b/board/boundary/nitrogen6x/nitrogen6x.c
@@ -9,6 +9,7 @@
 #include <env.h>
 #include <init.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/broadcom/bcm23550_w1d/bcm23550_w1d.c b/board/broadcom/bcm23550_w1d/bcm23550_w1d.c
index a1e3b25c2e00..90685c072a3b 100644
--- a/board/broadcom/bcm23550_w1d/bcm23550_w1d.c
+++ b/board/broadcom/bcm23550_w1d/bcm23550_w1d.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <init.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/mach-types.h>
 #include <env.h>
diff --git a/board/broadcom/bcm28155_ap/bcm28155_ap.c b/board/broadcom/bcm28155_ap/bcm28155_ap.c
index 79ce54993dd0..43726f79bde3 100644
--- a/board/broadcom/bcm28155_ap/bcm28155_ap.c
+++ b/board/broadcom/bcm28155_ap/bcm28155_ap.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <init.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/mach-types.h>
 #include <env.h>
diff --git a/board/broadcom/bcm_ep/board.c b/board/broadcom/bcm_ep/board.c
index ad9af92b5591..6064eb43db11 100644
--- a/board/broadcom/bcm_ep/board.c
+++ b/board/broadcom/bcm_ep/board.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <net.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <config.h>
 #include <netdev.h>
diff --git a/board/broadcom/bcmns2/northstar2.c b/board/broadcom/bcmns2/northstar2.c
index 91f489aad3f2..494e457ff65b 100644
--- a/board/broadcom/bcmns2/northstar2.c
+++ b/board/broadcom/bcmns2/northstar2.c
@@ -6,6 +6,7 @@
 #include <cpu_func.h>
 #include <init.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/system.h>
 #include <asm/armv8/mmu.h>
 
diff --git a/board/broadcom/bcmns3/ns3.c b/board/broadcom/bcmns3/ns3.c
index 0357cd0e327a..40eda6d465df 100644
--- a/board/broadcom/bcmns3/ns3.c
+++ b/board/broadcom/bcmns3/ns3.c
@@ -8,6 +8,7 @@
 #include <fdt_support.h>
 #include <asm/io.h>
 #include <asm/gic-v3.h>
+#include <asm/global_data.h>
 #include <asm/system.h>
 #include <asm/armv8/mmu.h>
 #include <asm/arch-bcmns3/bl33_info.h>
diff --git a/board/broadcom/bcmstb/bcmstb.c b/board/broadcom/bcmstb/bcmstb.c
index add4285db31d..f6bdf1f5f400 100644
--- a/board/broadcom/bcmstb/bcmstb.c
+++ b/board/broadcom/bcmstb/bcmstb.c
@@ -10,6 +10,7 @@
 #include <init.h>
 #include <log.h>
 #include <time.h>
+#include <asm/global_data.h>
 #include <linux/types.h>
 #include <common.h>
 #include <env.h>
diff --git a/board/bticino/mamoj/mamoj.c b/board/bticino/mamoj/mamoj.c
index b7d37b700447..c9da42b43bf5 100644
--- a/board/bticino/mamoj/mamoj.c
+++ b/board/bticino/mamoj/mamoj.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <init.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/bticino/mamoj/spl.c b/board/bticino/mamoj/spl.c
index a9bb2a55e5de..883b7f4133b9 100644
--- a/board/bticino/mamoj/spl.c
+++ b/board/bticino/mamoj/spl.c
@@ -9,6 +9,7 @@
 #include <init.h>
 #include <serial.h>
 #include <spl.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 
 #include <asm/io.h>
diff --git a/board/buffalo/lsxl/lsxl.c b/board/buffalo/lsxl/lsxl.c
index 64daa456b3c7..34be601fdde6 100644
--- a/board/buffalo/lsxl/lsxl.c
+++ b/board/buffalo/lsxl/lsxl.c
@@ -24,6 +24,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/mpp.h>
 #include <asm/arch/gpio.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 
 #include "lsxl.h"
diff --git a/board/calao/usb_a9263/usb_a9263.c b/board/calao/usb_a9263/usb_a9263.c
index 1fcaff604558..c0a5c518ca8b 100644
--- a/board/calao/usb_a9263/usb_a9263.c
+++ b/board/calao/usb_a9263/usb_a9263.c
@@ -15,6 +15,7 @@
 #include <asm/arch/clk.h>
 #include <asm/arch/gpio.h>
 #include <asm-generic/gpio.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <net.h>
 #include <netdev.h>
diff --git a/board/cavium/thunderx/thunderx.c b/board/cavium/thunderx/thunderx.c
index f8c2913eace0..ccb6b26c91b4 100644
--- a/board/cavium/thunderx/thunderx.c
+++ b/board/cavium/thunderx/thunderx.c
@@ -10,6 +10,7 @@
 #include <malloc.h>
 #include <errno.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <linux/compiler.h>
 
 #include <cavium/atf.h>
diff --git a/board/ccv/xpress/xpress.c b/board/ccv/xpress/xpress.c
index 27beaeb101af..9f5e78ce6804 100644
--- a/board/ccv/xpress/xpress.c
+++ b/board/ccv/xpress/xpress.c
@@ -12,6 +12,7 @@
 #include <asm/arch/mx6ul_pins.h>
 #include <asm/arch/mx6-pins.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/mach-imx/boot_mode.h>
diff --git a/board/cirrus/edb93xx/edb93xx.c b/board/cirrus/edb93xx/edb93xx.c
index cbed98b0e368..7a7f62fe88e4 100644
--- a/board/cirrus/edb93xx/edb93xx.c
+++ b/board/cirrus/edb93xx/edb93xx.c
@@ -21,6 +21,7 @@
 #include <net.h>
 #include <netdev.h>
 #include <status_led.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/mach-types.h>
 #include <asm/arch/ep93xx.h>
diff --git a/board/cloudengines/pogo_e02/pogo_e02.c b/board/cloudengines/pogo_e02/pogo_e02.c
index 8df039168c99..039fd6e3dd67 100644
--- a/board/cloudengines/pogo_e02/pogo_e02.c
+++ b/board/cloudengines/pogo_e02/pogo_e02.c
@@ -17,6 +17,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
 #include <asm/arch/mpp.h>
+#include <asm/global_data.h>
 #include "pogo_e02.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/cobra5272/cobra5272.c b/board/cobra5272/cobra5272.c
index a79884cb506f..3e2418866c73 100644
--- a/board/cobra5272/cobra5272.c
+++ b/board/cobra5272/cobra5272.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/immap.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/compulab/cl-som-imx7/cl-som-imx7.c b/board/compulab/cl-som-imx7/cl-som-imx7.c
index 1eef1d550761..454c93a572f8 100644
--- a/board/compulab/cl-som-imx7/cl-som-imx7.c
+++ b/board/compulab/cl-som-imx7/cl-som-imx7.c
@@ -15,6 +15,7 @@
 #include <phy.h>
 #include <netdev.h>
 #include <fsl_esdhc_imx.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 #include <power/pmic.h>
 #include <power/pfuze3000_pmic.h>
diff --git a/board/compulab/cm_fx6/cm_fx6.c b/board/compulab/cm_fx6/cm_fx6.c
index e2712680f954..2b11b7ee189b 100644
--- a/board/compulab/cm_fx6/cm_fx6.c
+++ b/board/compulab/cm_fx6/cm_fx6.c
@@ -27,6 +27,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/mxc_hdmi.h>
+#include <asm/global_data.h>
 #include <asm/mach-imx/mxc_i2c.h>
 #include <asm/mach-imx/sata.h>
 #include <asm/mach-imx/video.h>
diff --git a/board/compulab/cm_t335/cm_t335.c b/board/compulab/cm_t335/cm_t335.c
index a9ba2b7e0023..1d4a3aceef54 100644
--- a/board/compulab/cm_t335/cm_t335.c
+++ b/board/compulab/cm_t335/cm_t335.c
@@ -14,6 +14,7 @@
 #include <net.h>
 #include <status_led.h>
 #include <cpsw.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 
 #include <asm/arch/sys_proto.h>
diff --git a/board/compulab/cm_t43/cm_t43.c b/board/compulab/cm_t43/cm_t43.c
index 4b097c8f8f7c..efdade155b57 100644
--- a/board/compulab/cm_t43/cm_t43.c
+++ b/board/compulab/cm_t43/cm_t43.c
@@ -8,6 +8,7 @@
 #include <miiphy.h>
 #include <cpsw.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/emif.h>
diff --git a/board/congatec/cgtqmx6eval/cgtqmx6eval.c b/board/congatec/cgtqmx6eval/cgtqmx6eval.c
index 9316b2c37720..6ae4a1af8921 100644
--- a/board/congatec/cgtqmx6eval/cgtqmx6eval.c
+++ b/board/congatec/cgtqmx6eval/cgtqmx6eval.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <init.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/corscience/tricorder/tricorder.c b/board/corscience/tricorder/tricorder.c
index 41675677de2a..3f4a40fd6593 100644
--- a/board/corscience/tricorder/tricorder.c
+++ b/board/corscience/tricorder/tricorder.c
@@ -14,6 +14,7 @@
 #include <malloc.h>
 #include <twl4030.h>
 #include <status_led.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
 #include <asm/arch/mmc_host_def.h>
diff --git a/board/cortina/presidio-asic/presidio.c b/board/cortina/presidio-asic/presidio.c
index 3c132f127179..5c7352226373 100644
--- a/board/cortina/presidio-asic/presidio.c
+++ b/board/cortina/presidio-asic/presidio.c
@@ -8,6 +8,7 @@
 #include <malloc.h>
 #include <errno.h>
 #include <netdev.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/compiler.h>
diff --git a/board/creative/xfi3/xfi3.c b/board/creative/xfi3/xfi3.c
index b5f0d3130745..2aa2435e49c2 100644
--- a/board/creative/xfi3/xfi3.c
+++ b/board/creative/xfi3/xfi3.c
@@ -13,6 +13,7 @@
 #include <errno.h>
 #include <init.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <asm/arch/iomux-mx23.h>
diff --git a/board/cssi/MCR3000/MCR3000.c b/board/cssi/MCR3000/MCR3000.c
index 55e955c36bbf..c20e87149493 100644
--- a/board/cssi/MCR3000/MCR3000.c
+++ b/board/cssi/MCR3000/MCR3000.c
@@ -14,6 +14,7 @@
 #include <mpc8xx.h>
 #include <fdt_support.h>
 #include <serial.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm/uclass.h>
 #include <wdt.h>
diff --git a/board/d-link/dns325/dns325.c b/board/d-link/dns325/dns325.c
index 0ae2e7d88c10..055783f63ada 100644
--- a/board/d-link/dns325/dns325.c
+++ b/board/d-link/dns325/dns325.c
@@ -19,6 +19,7 @@
 #include <asm/arch/soc.h>
 #include <asm/arch/mpp.h>
 #include <asm/arch/gpio.h>
+#include <asm/global_data.h>
 #include "dns325.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/davinci/da8xxevm/da850evm.c b/board/davinci/da8xxevm/da850evm.c
index 683e8b452ada..383a86173849 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 <asm/arch/hardware.h>
+#include <asm/global_data.h>
 #include <asm/ti-common/davinci_nand.h>
 #include <asm/arch/emac_defs.h>
 #include <asm/arch/pinmux_defs.h>
diff --git a/board/davinci/da8xxevm/omapl138_lcdk.c b/board/davinci/da8xxevm/omapl138_lcdk.c
index 6bab7b18d44e..7607e313b752 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 <asm/arch/hardware.h>
+#include <asm/global_data.h>
 #include <asm/ti-common/davinci_nand.h>
 #include <asm/io.h>
 #include <ns16550.h>
diff --git a/board/dhelectronics/dh_imx6/dh_imx6.c b/board/dhelectronics/dh_imx6/dh_imx6.c
index 9937d6b0106a..2969e90a707d 100644
--- a/board/dhelectronics/dh_imx6/dh_imx6.c
+++ b/board/dhelectronics/dh_imx6/dh_imx6.c
@@ -11,6 +11,7 @@
 #include <image.h>
 #include <init.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <dm/device-internal.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/crm_regs.h>
diff --git a/board/dhelectronics/dh_stm32mp1/board.c b/board/dhelectronics/dh_stm32mp1/board.c
index c9abe3cc6df1..33486edb4f42 100644
--- a/board/dhelectronics/dh_stm32mp1/board.c
+++ b/board/dhelectronics/dh_stm32mp1/board.c
@@ -9,6 +9,7 @@
 #include <net.h>
 #include <asm/arch/stm32.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <bootm.h>
diff --git a/board/ea/mx7ulp_com/mx7ulp_com.c b/board/ea/mx7ulp_com/mx7ulp_com.c
index a9b8a3210828..5b2d444366c7 100644
--- a/board/ea/mx7ulp_com/mx7ulp_com.c
+++ b/board/ea/mx7ulp_com/mx7ulp_com.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/mx7ulp-pins.h>
diff --git a/board/eets/pdu001/board.c b/board/eets/pdu001/board.c
index a602b623adb0..f806d1e7672a 100644
--- a/board/eets/pdu001/board.c
+++ b/board/eets/pdu001/board.c
@@ -18,6 +18,7 @@
 #include <i2c.h>
 #include <watchdog.h>
 #include <debug_uart.h>
+#include <asm/global_data.h>
 #include <dm/ofnode.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/board/egnite/ethernut5/ethernut5.c b/board/egnite/ethernut5/ethernut5.c
index 0674b3001096..559fdd2f646d 100644
--- a/board/egnite/ethernut5/ethernut5.c
+++ b/board/egnite/ethernut5/ethernut5.c
@@ -60,6 +60,7 @@
 #include <i2c.h>
 #include <mmc.h>
 #include <atmel_mci.h>
+#include <asm/global_data.h>
 
 #include <asm/arch/at91sam9260.h>
 #include <asm/arch/at91sam9260_matrix.h>
diff --git a/board/el/el6x/el6x.c b/board/el/el6x/el6x.c
index bdc0558eda21..ddac58f73d28 100644
--- a/board/el/el6x/el6x.c
+++ b/board/el/el6x/el6x.c
@@ -13,6 +13,7 @@
 #include <asm/arch/iomux.h>
 #include <asm/arch/mx6-pins.h>
 #include <env.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
diff --git a/board/elgin/elgin_rv1108/elgin_rv1108.c b/board/elgin/elgin_rv1108/elgin_rv1108.c
index 5d8f62244b03..e0057ce1e6ee 100644
--- a/board/elgin/elgin_rv1108/elgin_rv1108.c
+++ b/board/elgin/elgin_rv1108/elgin_rv1108.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <init.h>
 #include <syscon.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch-rockchip/clock.h>
 #include <asm/arch-rockchip/grf_rv1108.h>
diff --git a/board/embest/mx6boards/mx6boards.c b/board/embest/mx6boards/mx6boards.c
index 752242bd54c4..65b3942e3991 100644
--- a/board/embest/mx6boards/mx6boards.c
+++ b/board/embest/mx6boards/mx6boards.c
@@ -20,6 +20,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/mx6-pins.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
diff --git a/board/engicam/common/board.c b/board/engicam/common/board.c
index 5a2003d50988..df9149e0d6d8 100644
--- a/board/engicam/common/board.c
+++ b/board/engicam/common/board.c
@@ -16,6 +16,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
 #include <watchdog.h>
+#include <asm/global_data.h>
 
 #include "board.h"
 
diff --git a/board/esd/meesc/meesc.c b/board/esd/meesc/meesc.c
index deed3a9b84ec..eaa525eb0049 100644
--- a/board/esd/meesc/meesc.c
+++ b/board/esd/meesc/meesc.c
@@ -15,6 +15,7 @@
 #include <net.h>
 #include <serial.h>
 #include <vsprintf.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
 #include <asm/mach-types.h>
diff --git a/board/esd/vme8349/vme8349.c b/board/esd/vme8349/vme8349.c
index 8d3d26e3c703..d388fc6d4901 100644
--- a/board/esd/vme8349/vme8349.c
+++ b/board/esd/vme8349/vme8349.c
@@ -17,6 +17,7 @@
 #include <ioports.h>
 #include <mpc83xx.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <asm/mpc8349_pci.h>
 #if defined(CONFIG_OF_LIBFDT)
 #include <linux/libfdt.h>
diff --git a/board/firefly/firefly-rk3288/firefly-rk3288.c b/board/firefly/firefly-rk3288/firefly-rk3288.c
index 1965985a0f4e..410a3f9d9e3b 100644
--- a/board/firefly/firefly-rk3288/firefly-rk3288.c
+++ b/board/firefly/firefly-rk3288/firefly-rk3288.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <hang.h>
 #include <log.h>
+#include <asm/global_data.h>
 
 #ifdef CONFIG_SPL_BUILD
 static int setup_led(void)
diff --git a/board/freescale/common/arm_sleep.c b/board/freescale/common/arm_sleep.c
index bb1ef9979279..733940860f55 100644
--- a/board/freescale/common/arm_sleep.c
+++ b/board/freescale/common/arm_sleep.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #ifndef CONFIG_ARMV7_NONSEC
 #error " Deep sleep needs non-secure mode support. "
diff --git a/board/freescale/common/emc2305.c b/board/freescale/common/emc2305.c
index b1ca051db23b..07b2ec06bbcb 100644
--- a/board/freescale/common/emc2305.c
+++ b/board/freescale/common/emc2305.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <command.h>
 #include <i2c.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 
 #include "emc2305.h"
diff --git a/board/freescale/common/mpc85xx_sleep.c b/board/freescale/common/mpc85xx_sleep.c
index 6f6f4d40fcb8..d2bb173c1833 100644
--- a/board/freescale/common/mpc85xx_sleep.c
+++ b/board/freescale/common/mpc85xx_sleep.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/immap_85xx.h>
 #include "sleep.h"
 #ifdef CONFIG_U_QE
diff --git a/board/freescale/corenet_ds/corenet_ds.c b/board/freescale/corenet_ds/corenet_ds.c
index 15d11ed81abf..3a83e65f2fe5 100644
--- a/board/freescale/corenet_ds/corenet_ds.c
+++ b/board/freescale/corenet_ds/corenet_ds.c
@@ -10,6 +10,7 @@
 #include <image.h>
 #include <init.h>
 #include <netdev.h>
+#include <asm/global_data.h>
 #include <linux/compiler.h>
 #include <asm/mmu.h>
 #include <asm/processor.h>
diff --git a/board/freescale/corenet_ds/ddr.c b/board/freescale/corenet_ds/ddr.c
index 19f6e8700d5f..2c440673e7c3 100644
--- a/board/freescale/corenet_ds/ddr.c
+++ b/board/freescale/corenet_ds/ddr.c
@@ -9,6 +9,7 @@
 #include <init.h>
 #include <log.h>
 #include <vsprintf.h>
+#include <asm/global_data.h>
 #include <asm/mmu.h>
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
diff --git a/board/freescale/imx8mm_evk/imx8mm_evk.c b/board/freescale/imx8mm_evk/imx8mm_evk.c
index 6af71006966c..ab55135a9720 100644
--- a/board/freescale/imx8mm_evk/imx8mm_evk.c
+++ b/board/freescale/imx8mm_evk/imx8mm_evk.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <miiphy.h>
 #include <netdev.h>
+#include <asm/global_data.h>
 
 #include <asm/arch/clock.h>
 #include <asm/arch/sys_proto.h>
diff --git a/board/freescale/imx8mm_evk/spl.c b/board/freescale/imx8mm_evk/spl.c
index 19c8a5aa2354..64bc60651d3e 100644
--- a/board/freescale/imx8mm_evk/spl.c
+++ b/board/freescale/imx8mm_evk/spl.c
@@ -11,6 +11,7 @@
 #include <init.h>
 #include <log.h>
 #include <spl.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/arch/clock.h>
diff --git a/board/freescale/imx8mn_evk/imx8mn_evk.c b/board/freescale/imx8mn_evk/imx8mn_evk.c
index e5ca54f9ae75..9a0a0488bf4f 100644
--- a/board/freescale/imx8mn_evk/imx8mn_evk.c
+++ b/board/freescale/imx8mn_evk/imx8mn_evk.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <env.h>
 #include <init.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/imx8mn_evk/spl.c b/board/freescale/imx8mn_evk/spl.c
index dd38c1015cf4..6d5c7a5b4676 100644
--- a/board/freescale/imx8mn_evk/spl.c
+++ b/board/freescale/imx8mn_evk/spl.c
@@ -12,6 +12,7 @@
 #include <init.h>
 #include <log.h>
 #include <spl.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/arch/clock.h>
diff --git a/board/freescale/imx8mp_evk/imx8mp_evk.c b/board/freescale/imx8mp_evk/imx8mp_evk.c
index 034a349236e8..56da4d4c6a31 100644
--- a/board/freescale/imx8mp_evk/imx8mp_evk.c
+++ b/board/freescale/imx8mp_evk/imx8mp_evk.c
@@ -7,6 +7,7 @@
 #include <env.h>
 #include <errno.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm-generic/gpio.h>
 #include <asm/arch/imx8mp_pins.h>
diff --git a/board/freescale/imx8mp_evk/spl.c b/board/freescale/imx8mp_evk/spl.c
index 3214718e62b2..ebfd94dc1fa0 100644
--- a/board/freescale/imx8mp_evk/spl.c
+++ b/board/freescale/imx8mp_evk/spl.c
@@ -12,6 +12,7 @@
 #include <init.h>
 #include <log.h>
 #include <spl.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <errno.h>
 #include <asm/io.h>
diff --git a/board/freescale/imx8mq_evk/imx8mq_evk.c b/board/freescale/imx8mq_evk/imx8mq_evk.c
index 1ad670b8ccf0..93da67d77983 100644
--- a/board/freescale/imx8mq_evk/imx8mq_evk.c
+++ b/board/freescale/imx8mq_evk/imx8mq_evk.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <malloc.h>
 #include <errno.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <miiphy.h>
 #include <netdev.h>
diff --git a/board/freescale/imx8mq_evk/spl.c b/board/freescale/imx8mq_evk/spl.c
index 42183ed5aa0a..82753585f2f0 100644
--- a/board/freescale/imx8mq_evk/spl.c
+++ b/board/freescale/imx8mq_evk/spl.c
@@ -10,6 +10,7 @@
 #include <image.h>
 #include <init.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <errno.h>
 #include <asm/io.h>
diff --git a/board/freescale/imx8qm_mek/imx8qm_mek.c b/board/freescale/imx8qm_mek/imx8qm_mek.c
index fba3baa1267e..c6772206244c 100644
--- a/board/freescale/imx8qm_mek/imx8qm_mek.c
+++ b/board/freescale/imx8qm_mek/imx8qm_mek.c
@@ -8,6 +8,7 @@
 #include <env.h>
 #include <errno.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <asm/io.h>
diff --git a/board/freescale/imx8qm_mek/spl.c b/board/freescale/imx8qm_mek/spl.c
index 9dee12a2c6a2..944ba745c09f 100644
--- a/board/freescale/imx8qm_mek/spl.c
+++ b/board/freescale/imx8qm_mek/spl.c
@@ -10,6 +10,7 @@
 #include <init.h>
 #include <log.h>
 #include <spl.h>
+#include <asm/global_data.h>
 #include <dm/uclass.h>
 #include <dm/device.h>
 #include <dm/uclass-internal.h>
diff --git a/board/freescale/imx8qxp_mek/imx8qxp_mek.c b/board/freescale/imx8qxp_mek/imx8qxp_mek.c
index da55933e21b2..7179823a2235 100644
--- a/board/freescale/imx8qxp_mek/imx8qxp_mek.c
+++ b/board/freescale/imx8qxp_mek/imx8qxp_mek.c
@@ -8,6 +8,7 @@
 #include <env.h>
 #include <errno.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 #include <fsl_esdhc_imx.h>
diff --git a/board/freescale/imx8qxp_mek/spl.c b/board/freescale/imx8qxp_mek/spl.c
index 881d297cf17f..ae6b64ff6ea1 100644
--- a/board/freescale/imx8qxp_mek/spl.c
+++ b/board/freescale/imx8qxp_mek/spl.c
@@ -10,6 +10,7 @@
 #include <init.h>
 #include <log.h>
 #include <spl.h>
+#include <asm/global_data.h>
 #include <dm/uclass.h>
 #include <dm/device.h>
 #include <dm/uclass-internal.h>
diff --git a/board/freescale/imxrt1020-evk/imxrt1020-evk.c b/board/freescale/imxrt1020-evk/imxrt1020-evk.c
index 0cef6071feba..35241acd224c 100644
--- a/board/freescale/imxrt1020-evk/imxrt1020-evk.c
+++ b/board/freescale/imxrt1020-evk/imxrt1020-evk.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <ram.h>
 #include <spl.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/armv7m.h>
 
diff --git a/board/freescale/imxrt1050-evk/imxrt1050-evk.c b/board/freescale/imxrt1050-evk/imxrt1050-evk.c
index edc7fb176bbc..b8d852f097b0 100644
--- a/board/freescale/imxrt1050-evk/imxrt1050-evk.c
+++ b/board/freescale/imxrt1050-evk/imxrt1050-evk.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <ram.h>
 #include <spl.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/armv7m.h>
 
diff --git a/board/freescale/ls1012afrdm/ls1012afrdm.c b/board/freescale/ls1012afrdm/ls1012afrdm.c
index 4770eadabd79..2cd651b943fb 100644
--- a/board/freescale/ls1012afrdm/ls1012afrdm.c
+++ b/board/freescale/ls1012afrdm/ls1012afrdm.c
@@ -8,6 +8,7 @@
 #include <i2c.h>
 #include <asm/cache.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/fsl_serdes.h>
diff --git a/board/freescale/ls1012aqds/ls1012aqds.c b/board/freescale/ls1012aqds/ls1012aqds.c
index 7bea45c8ae53..b77808ea57b7 100644
--- a/board/freescale/ls1012aqds/ls1012aqds.c
+++ b/board/freescale/ls1012aqds/ls1012aqds.c
@@ -8,6 +8,7 @@
 #include <fdt_support.h>
 #include <asm/cache.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/fsl_serdes.h>
diff --git a/board/freescale/ls1012ardb/ls1012ardb.c b/board/freescale/ls1012ardb/ls1012ardb.c
index 30b43ea135ad..ed6dc9ff712f 100644
--- a/board/freescale/ls1012ardb/ls1012ardb.c
+++ b/board/freescale/ls1012ardb/ls1012ardb.c
@@ -10,6 +10,7 @@
 #include <i2c.h>
 #include <asm/cache.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/fsl_serdes.h>
diff --git a/board/freescale/ls1021aiot/dcu.c b/board/freescale/ls1021aiot/dcu.c
index 77732a6ab158..e4fbcbcaad35 100644
--- a/board/freescale/ls1021aiot/dcu.c
+++ b/board/freescale/ls1021aiot/dcu.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <fsl_dcu_fb.h>
+#include <asm/global_data.h>
 #include "div64.h"
 #include "../common/dcu_sii9022a.h"
 
diff --git a/board/freescale/ls1021aiot/ls1021aiot.c b/board/freescale/ls1021aiot/ls1021aiot.c
index 2e5cc5906665..bfe613760427 100644
--- a/board/freescale/ls1021aiot/ls1021aiot.c
+++ b/board/freescale/ls1021aiot/ls1021aiot.c
@@ -12,6 +12,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/fsl_serdes.h>
 #include <asm/arch/ls102xa_stream_id.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 
 #include <asm/arch/ls102xa_devdis.h>
diff --git a/board/freescale/ls1021aqds/dcu.c b/board/freescale/ls1021aqds/dcu.c
index b648a7872bcc..f66961ca5907 100644
--- a/board/freescale/ls1021aqds/dcu.c
+++ b/board/freescale/ls1021aqds/dcu.c
@@ -6,6 +6,7 @@
  * FSL DCU Framebuffer driver
  */
 
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <common.h>
 #include <fsl_dcu_fb.h>
diff --git a/board/freescale/ls1021aqds/ddr.c b/board/freescale/ls1021aqds/ddr.c
index f84bce95a845..66fe1519cc6d 100644
--- a/board/freescale/ls1021aqds/ddr.c
+++ b/board/freescale/ls1021aqds/ddr.c
@@ -8,6 +8,7 @@
 #include <fsl_ddr_dimm_params.h>
 #include <init.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <linux/delay.h>
diff --git a/board/freescale/ls1021atsn/ls1021atsn.c b/board/freescale/ls1021atsn/ls1021atsn.c
index 878306b2d0fc..c1acd3040c42 100644
--- a/board/freescale/ls1021atsn/ls1021atsn.c
+++ b/board/freescale/ls1021atsn/ls1021atsn.c
@@ -11,6 +11,7 @@
 #include <asm/arch/immap_ls102xa.h>
 #include <asm/arch/ls102xa_soc.h>
 #include <asm/arch/fsl_serdes.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 #include "../common/sleep.h"
 #include <fsl_validate.h>
diff --git a/board/freescale/ls1021atwr/dcu.c b/board/freescale/ls1021atwr/dcu.c
index bdf7f7645c2f..7bf283e3d66c 100644
--- a/board/freescale/ls1021atwr/dcu.c
+++ b/board/freescale/ls1021atwr/dcu.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <fsl_dcu_fb.h>
+#include <asm/global_data.h>
 #include "div64.h"
 #include "../common/dcu_sii9022a.h"
 
diff --git a/board/freescale/ls1021atwr/ls1021atwr.c b/board/freescale/ls1021atwr/ls1021atwr.c
index 2889bd8deddb..0cd38a14b830 100644
--- a/board/freescale/ls1021atwr/ls1021atwr.c
+++ b/board/freescale/ls1021atwr/ls1021atwr.c
@@ -11,6 +11,7 @@
 #include <i2c.h>
 #include <init.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/immap_ls102xa.h>
 #include <asm/arch/clock.h>
diff --git a/board/freescale/ls1028a/ddr.c b/board/freescale/ls1028a/ddr.c
index 74d3af5c359d..3e976da6b305 100644
--- a/board/freescale/ls1028a/ddr.c
+++ b/board/freescale/ls1028a/ddr.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/ls1028a/ls1028a.c b/board/freescale/ls1028a/ls1028a.c
index e37e3a3c16d4..f3c1d958b72a 100644
--- a/board/freescale/ls1028a/ls1028a.c
+++ b/board/freescale/ls1028a/ls1028a.c
@@ -9,6 +9,7 @@
 #include <errno.h>
 #include <fsl_ddr.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <hwconfig.h>
 #include <fdt_support.h>
diff --git a/board/freescale/ls1043aqds/ddr.c b/board/freescale/ls1043aqds/ddr.c
index c0fc9aadf041..23947bdb84c9 100644
--- a/board/freescale/ls1043aqds/ddr.c
+++ b/board/freescale/ls1043aqds/ddr.c
@@ -11,6 +11,7 @@
 #endif
 #include <log.h>
 #include <asm/arch/clock.h>
+#include <asm/global_data.h>
 #include "ddr.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/ls1043aqds/ls1043aqds.c b/board/freescale/ls1043aqds/ls1043aqds.c
index ef0f2e612242..44e4c61eab27 100644
--- a/board/freescale/ls1043aqds/ls1043aqds.c
+++ b/board/freescale/ls1043aqds/ls1043aqds.c
@@ -10,6 +10,7 @@
 #include <fsl_ddr_sdram.h>
 #include <init.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/fsl_serdes.h>
diff --git a/board/freescale/ls1043ardb/ddr.c b/board/freescale/ls1043ardb/ddr.c
index f16e036d0e8c..08b43ff5e4c5 100644
--- a/board/freescale/ls1043ardb/ddr.c
+++ b/board/freescale/ls1043ardb/ddr.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
+#include <asm/global_data.h>
 #include "ddr.h"
 #include <log.h>
 #include <vsprintf.h>
diff --git a/board/freescale/ls1043ardb/ls1043ardb.c b/board/freescale/ls1043ardb/ls1043ardb.c
index dc32c030ecac..beef26b084bf 100644
--- a/board/freescale/ls1043ardb/ls1043ardb.c
+++ b/board/freescale/ls1043ardb/ls1043ardb.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <i2c.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/fsl_serdes.h>
diff --git a/board/freescale/ls1046afrwy/ddr.c b/board/freescale/ls1046afrwy/ddr.c
index daf17e016934..256397b52b65 100644
--- a/board/freescale/ls1046afrwy/ddr.c
+++ b/board/freescale/ls1046afrwy/ddr.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <fsl_ddr_sdram.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/ls1046afrwy/ls1046afrwy.c b/board/freescale/ls1046afrwy/ls1046afrwy.c
index 4ebf77b1ad1f..9813a36ca07e 100644
--- a/board/freescale/ls1046afrwy/ls1046afrwy.c
+++ b/board/freescale/ls1046afrwy/ls1046afrwy.c
@@ -7,6 +7,7 @@
 #include <i2c.h>
 #include <fdt_support.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/fsl_serdes.h>
diff --git a/board/freescale/ls1046aqds/ddr.c b/board/freescale/ls1046aqds/ddr.c
index f3cfbc4c39be..9a96de271786 100644
--- a/board/freescale/ls1046aqds/ddr.c
+++ b/board/freescale/ls1046aqds/ddr.c
@@ -11,6 +11,7 @@
 #endif
 #include <log.h>
 #include <asm/arch/clock.h>
+#include <asm/global_data.h>
 #include "ddr.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/ls1046aqds/ls1046aqds.c b/board/freescale/ls1046aqds/ls1046aqds.c
index 33b10277af7c..3c96c900c320 100644
--- a/board/freescale/ls1046aqds/ls1046aqds.c
+++ b/board/freescale/ls1046aqds/ls1046aqds.c
@@ -9,6 +9,7 @@
 #include <fdt_support.h>
 #include <fsl_ddr_sdram.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/fsl_serdes.h>
diff --git a/board/freescale/ls1046ardb/ddr.c b/board/freescale/ls1046ardb/ddr.c
index 0e07df521190..befb556bd30b 100644
--- a/board/freescale/ls1046ardb/ddr.c
+++ b/board/freescale/ls1046ardb/ddr.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
+#include <asm/global_data.h>
 #include "ddr.h"
 #ifdef CONFIG_FSL_DEEP_SLEEP
 #include <fsl_sleep.h>
diff --git a/board/freescale/ls1046ardb/ls1046ardb.c b/board/freescale/ls1046ardb/ls1046ardb.c
index e107c8471b30..93ef903f2998 100644
--- a/board/freescale/ls1046ardb/ls1046ardb.c
+++ b/board/freescale/ls1046ardb/ls1046ardb.c
@@ -7,6 +7,7 @@
 #include <i2c.h>
 #include <fdt_support.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/fsl_serdes.h>
diff --git a/board/freescale/ls1088a/ddr.c b/board/freescale/ls1088a/ddr.c
index fd9549bfbc8c..995c42960178 100644
--- a/board/freescale/ls1088a/ddr.c
+++ b/board/freescale/ls1088a/ddr.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <asm/arch/soc.h>
 #include <asm/arch/clock.h>
+#include <asm/global_data.h>
 #include "ddr.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/ls1088a/ls1088a.c b/board/freescale/ls1088a/ls1088a.c
index 5d19702a05cf..2ba6a3990d90 100644
--- a/board/freescale/ls1088a/ls1088a.c
+++ b/board/freescale/ls1088a/ls1088a.c
@@ -13,6 +13,7 @@
 #include <fsl_ifc.h>
 #include <fsl_ddr.h>
 #include <fsl_sec.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <fdt_support.h>
 #include <linux/delay.h>
diff --git a/board/freescale/ls2080a/ddr.c b/board/freescale/ls2080a/ddr.c
index 229fc9cc30ea..29d7bd1c5ee6 100644
--- a/board/freescale/ls2080a/ddr.c
+++ b/board/freescale/ls2080a/ddr.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <asm/arch/soc.h>
 #include <asm/arch/clock.h>
+#include <asm/global_data.h>
 #include "ddr.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/ls2080a/ls2080a.c b/board/freescale/ls2080a/ls2080a.c
index 62da2a7af11a..48437a52e401 100644
--- a/board/freescale/ls2080a/ls2080a.c
+++ b/board/freescale/ls2080a/ls2080a.c
@@ -10,6 +10,7 @@
 #include <netdev.h>
 #include <fsl_ifc.h>
 #include <fsl_ddr.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <fdt_support.h>
 #include <linux/libfdt.h>
diff --git a/board/freescale/ls2080aqds/ddr.c b/board/freescale/ls2080aqds/ddr.c
index 3fb2c4448c24..2767d058cc96 100644
--- a/board/freescale/ls2080aqds/ddr.c
+++ b/board/freescale/ls2080aqds/ddr.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <asm/arch/soc.h>
 #include <asm/arch/clock.h>
+#include <asm/global_data.h>
 #include "ddr.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/ls2080aqds/ls2080aqds.c b/board/freescale/ls2080aqds/ls2080aqds.c
index 3eb40f5e2a21..a6f6897eb09d 100644
--- a/board/freescale/ls2080aqds/ls2080aqds.c
+++ b/board/freescale/ls2080aqds/ls2080aqds.c
@@ -10,6 +10,7 @@
 #include <netdev.h>
 #include <fsl_ifc.h>
 #include <fsl_ddr.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <fdt_support.h>
 #include <linux/libfdt.h>
diff --git a/board/freescale/ls2080ardb/ddr.c b/board/freescale/ls2080ardb/ddr.c
index 4571a228c59e..07fa84733324 100644
--- a/board/freescale/ls2080ardb/ddr.c
+++ b/board/freescale/ls2080ardb/ddr.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <asm/arch/soc.h>
 #include <asm/arch/clock.h>
+#include <asm/global_data.h>
 #include "ddr.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/ls2080ardb/eth_ls2080rdb.c b/board/freescale/ls2080ardb/eth_ls2080rdb.c
index 018d1dc6720c..21b4c16ff27c 100644
--- a/board/freescale/ls2080ardb/eth_ls2080rdb.c
+++ b/board/freescale/ls2080ardb/eth_ls2080rdb.c
@@ -13,6 +13,7 @@
 #include <miiphy.h>
 #include <phy.h>
 #include <fm_eth.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <exports.h>
 #include <asm/arch/fsl_serdes.h>
diff --git a/board/freescale/ls2080ardb/ls2080ardb.c b/board/freescale/ls2080ardb/ls2080ardb.c
index c7e9c1dacf43..26ce5a80edf7 100644
--- a/board/freescale/ls2080ardb/ls2080ardb.c
+++ b/board/freescale/ls2080ardb/ls2080ardb.c
@@ -11,6 +11,7 @@
 #include <netdev.h>
 #include <fsl_ifc.h>
 #include <fsl_ddr.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <hwconfig.h>
 #include <fdt_support.h>
diff --git a/board/freescale/lx2160a/ddr.c b/board/freescale/lx2160a/ddr.c
index cd422bf2bc5c..7ab7a9e6ca83 100644
--- a/board/freescale/lx2160a/ddr.c
+++ b/board/freescale/lx2160a/ddr.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/lx2160a/eth_lx2160aqds.c b/board/freescale/lx2160a/eth_lx2160aqds.c
index fcace0293605..437f0bc4cf68 100644
--- a/board/freescale/lx2160a/eth_lx2160aqds.c
+++ b/board/freescale/lx2160a/eth_lx2160aqds.c
@@ -17,6 +17,7 @@
 #include <miiphy.h>
 #include <phy.h>
 #include <fm_eth.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <exports.h>
 #include <asm/arch/fsl_serdes.h>
diff --git a/board/freescale/lx2160a/eth_lx2160ardb.c b/board/freescale/lx2160a/eth_lx2160ardb.c
index b448883ee143..02f36f4f5f55 100644
--- a/board/freescale/lx2160a/eth_lx2160ardb.c
+++ b/board/freescale/lx2160a/eth_lx2160ardb.c
@@ -14,6 +14,7 @@
 #include <miiphy.h>
 #include <phy.h>
 #include <fm_eth.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <exports.h>
 #include <asm/arch/fsl_serdes.h>
diff --git a/board/freescale/lx2160a/lx2160a.c b/board/freescale/lx2160a/lx2160a.c
index ace2a1927df0..efd2a5c40e17 100644
--- a/board/freescale/lx2160a/lx2160a.c
+++ b/board/freescale/lx2160a/lx2160a.c
@@ -7,6 +7,7 @@
 #include <clock_legacy.h>
 #include <dm.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <dm/platform_data/serial_pl01x.h>
 #include <i2c.h>
 #include <malloc.h>
diff --git a/board/freescale/m5208evbe/m5208evbe.c b/board/freescale/m5208evbe/m5208evbe.c
index a950030eb397..7bfb4557dd5b 100644
--- a/board/freescale/m5208evbe/m5208evbe.c
+++ b/board/freescale/m5208evbe/m5208evbe.c
@@ -10,6 +10,7 @@
 #include <config.h>
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/immap.h>
 #include <asm/io.h>
 #include <linux/delay.h>
diff --git a/board/freescale/m52277evb/m52277evb.c b/board/freescale/m52277evb/m52277evb.c
index 144e490479ed..510af33e4c3c 100644
--- a/board/freescale/m52277evb/m52277evb.c
+++ b/board/freescale/m52277evb/m52277evb.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/immap.h>
 #include <asm/io.h>
 #include <linux/delay.h>
diff --git a/board/freescale/m5235evb/m5235evb.c b/board/freescale/m5235evb/m5235evb.c
index 5d4039375530..e7c7a94036b5 100644
--- a/board/freescale/m5235evb/m5235evb.c
+++ b/board/freescale/m5235evb/m5235evb.c
@@ -10,6 +10,7 @@
 #include <config.h>
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/immap.h>
 #include <asm/io.h>
 
diff --git a/board/freescale/m5249evb/m5249evb.c b/board/freescale/m5249evb/m5249evb.c
index a89d5100586f..48c00791114d 100644
--- a/board/freescale/m5249evb/m5249evb.c
+++ b/board/freescale/m5249evb/m5249evb.c
@@ -8,6 +8,7 @@
 #include <command.h>
 #include <init.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <asm/immap.h>
 #include <linux/delay.h>
 
diff --git a/board/freescale/m5253demo/m5253demo.c b/board/freescale/m5253demo/m5253demo.c
index 9a157db60142..2a4703579dab 100644
--- a/board/freescale/m5253demo/m5253demo.c
+++ b/board/freescale/m5253demo/m5253demo.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <init.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <asm/immap.h>
 #include <netdev.h>
 #include <asm/io.h>
diff --git a/board/freescale/m5272c3/m5272c3.c b/board/freescale/m5272c3/m5272c3.c
index 1017ef0c2a53..9580cf2a0390 100644
--- a/board/freescale/m5272c3/m5272c3.c
+++ b/board/freescale/m5272c3/m5272c3.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/immap.h>
 #include <asm/io.h>
 
diff --git a/board/freescale/m5275evb/m5275evb.c b/board/freescale/m5275evb/m5275evb.c
index e65e6d0af585..1c4fb7232afb 100644
--- a/board/freescale/m5275evb/m5275evb.c
+++ b/board/freescale/m5275evb/m5275evb.c
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/immap.h>
 #include <asm/io.h>
 
diff --git a/board/freescale/m5282evb/m5282evb.c b/board/freescale/m5282evb/m5282evb.c
index 251be667d46b..e1ea9b3a58f8 100644
--- a/board/freescale/m5282evb/m5282evb.c
+++ b/board/freescale/m5282evb/m5282evb.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/immap.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/m53017evb/m53017evb.c b/board/freescale/m53017evb/m53017evb.c
index f13b6931ea25..c9f89353ce4b 100644
--- a/board/freescale/m53017evb/m53017evb.c
+++ b/board/freescale/m53017evb/m53017evb.c
@@ -10,6 +10,7 @@
 #include <config.h>
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/immap.h>
 #include <asm/io.h>
 #include <linux/delay.h>
diff --git a/board/freescale/m5329evb/m5329evb.c b/board/freescale/m5329evb/m5329evb.c
index 531894f65161..7a75b04dd0d2 100644
--- a/board/freescale/m5329evb/m5329evb.c
+++ b/board/freescale/m5329evb/m5329evb.c
@@ -10,6 +10,7 @@
 #include <config.h>
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/immap.h>
 #include <asm/io.h>
 #include <linux/delay.h>
diff --git a/board/freescale/m5373evb/m5373evb.c b/board/freescale/m5373evb/m5373evb.c
index 29ff55f15966..cfa5ca4a477c 100644
--- a/board/freescale/m5373evb/m5373evb.c
+++ b/board/freescale/m5373evb/m5373evb.c
@@ -10,6 +10,7 @@
 #include <config.h>
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/immap.h>
 #include <asm/io.h>
 #include <linux/delay.h>
diff --git a/board/freescale/m54418twr/m54418twr.c b/board/freescale/m54418twr/m54418twr.c
index a418fba1401b..ca8993197e3e 100644
--- a/board/freescale/m54418twr/m54418twr.c
+++ b/board/freescale/m54418twr/m54418twr.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <init.h>
 #include <spi.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/immap.h>
 #include <mmc.h>
diff --git a/board/freescale/m54451evb/m54451evb.c b/board/freescale/m54451evb/m54451evb.c
index 1298bd324e9f..a4ddc69166b3 100644
--- a/board/freescale/m54451evb/m54451evb.c
+++ b/board/freescale/m54451evb/m54451evb.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <init.h>
 #include <spi.h>
+#include <asm/global_data.h>
 #include <asm/immap.h>
 #include <asm/io.h>
 #include <linux/delay.h>
diff --git a/board/freescale/m54455evb/m54455evb.c b/board/freescale/m54455evb/m54455evb.c
index 286300645b4a..c749ee407e77 100644
--- a/board/freescale/m54455evb/m54455evb.c
+++ b/board/freescale/m54455evb/m54455evb.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <init.h>
 #include <pci.h>
+#include <asm/global_data.h>
 #include <asm/immap.h>
 #include <asm/io.h>
 #include <linux/delay.h>
diff --git a/board/freescale/m547xevb/m547xevb.c b/board/freescale/m547xevb/m547xevb.c
index 908a500f4b9f..1568f455e927 100644
--- a/board/freescale/m547xevb/m547xevb.c
+++ b/board/freescale/m547xevb/m547xevb.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <init.h>
 #include <pci.h>
+#include <asm/global_data.h>
 #include <asm/immap.h>
 #include <asm/io.h>
 #include <linux/delay.h>
diff --git a/board/freescale/m548xevb/m548xevb.c b/board/freescale/m548xevb/m548xevb.c
index 796b808e6f90..b62355a7ae7b 100644
--- a/board/freescale/m548xevb/m548xevb.c
+++ b/board/freescale/m548xevb/m548xevb.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <init.h>
 #include <pci.h>
+#include <asm/global_data.h>
 #include <asm/immap.h>
 #include <asm/io.h>
 #include <linux/delay.h>
diff --git a/board/freescale/mpc8308rdb/sdram.c b/board/freescale/mpc8308rdb/sdram.c
index 6e0922cd53c9..6340fd16ea9b 100644
--- a/board/freescale/mpc8308rdb/sdram.c
+++ b/board/freescale/mpc8308rdb/sdram.c
@@ -14,6 +14,7 @@
 #include <common.h>
 #include <init.h>
 #include <mpc83xx.h>
+#include <asm/global_data.h>
 
 #include <asm/bitops.h>
 #include <asm/io.h>
diff --git a/board/freescale/mpc8313erdb/mpc8313erdb.c b/board/freescale/mpc8313erdb/mpc8313erdb.c
index 65a10c345aec..f309961dca87 100644
--- a/board/freescale/mpc8313erdb/mpc8313erdb.c
+++ b/board/freescale/mpc8313erdb/mpc8313erdb.c
@@ -20,6 +20,7 @@
 #if defined(CONFIG_MPC83XX_GPIO) && !defined(CONFIG_SPL_BUILD)
 #include <asm/gpio.h>
 #endif
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/mpc8313erdb/sdram.c b/board/freescale/mpc8313erdb/sdram.c
index 99f6bcd5a933..f146ae5d43c4 100644
--- a/board/freescale/mpc8313erdb/sdram.c
+++ b/board/freescale/mpc8313erdb/sdram.c
@@ -11,6 +11,7 @@
 #include <init.h>
 #include <mpc83xx.h>
 #include <spd_sdram.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 
 #include <asm/bitops.h>
diff --git a/board/freescale/mpc8315erdb/mpc8315erdb.c b/board/freescale/mpc8315erdb/mpc8315erdb.c
index f8e4599f13f7..795162b3c0c6 100644
--- a/board/freescale/mpc8315erdb/mpc8315erdb.c
+++ b/board/freescale/mpc8315erdb/mpc8315erdb.c
@@ -11,6 +11,7 @@
 #include <i2c.h>
 #include <init.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
diff --git a/board/freescale/mpc8315erdb/sdram.c b/board/freescale/mpc8315erdb/sdram.c
index 8a828207f935..ffbb79aaec14 100644
--- a/board/freescale/mpc8315erdb/sdram.c
+++ b/board/freescale/mpc8315erdb/sdram.c
@@ -11,6 +11,7 @@
 #include <init.h>
 #include <mpc83xx.h>
 #include <spd_sdram.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 
 #include <asm/bitops.h>
diff --git a/board/freescale/mpc8323erdb/mpc8323erdb.c b/board/freescale/mpc8323erdb/mpc8323erdb.c
index 3cde715e96b7..cef3216a6fe5 100644
--- a/board/freescale/mpc8323erdb/mpc8323erdb.c
+++ b/board/freescale/mpc8323erdb/mpc8323erdb.c
@@ -19,6 +19,7 @@
 #include <i2c.h>
 #include <miiphy.h>
 #include <command.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 #include <u-boot/crc.h>
diff --git a/board/freescale/mpc832xemds/mpc832xemds.c b/board/freescale/mpc832xemds/mpc832xemds.c
index 6139cbd04091..f34758a9470a 100644
--- a/board/freescale/mpc832xemds/mpc832xemds.c
+++ b/board/freescale/mpc832xemds/mpc832xemds.c
@@ -16,6 +16,7 @@
 #if defined(CONFIG_PCI)
 #include <pci.h>
 #endif
+#include <asm/global_data.h>
 #include <asm/mmu.h>
 #if defined(CONFIG_OF_LIBFDT)
 #include <linux/libfdt.h>
diff --git a/board/freescale/mpc8349emds/mpc8349emds.c b/board/freescale/mpc8349emds/mpc8349emds.c
index 46be5ccd92cf..5f38639afd42 100644
--- a/board/freescale/mpc8349emds/mpc8349emds.c
+++ b/board/freescale/mpc8349emds/mpc8349emds.c
@@ -10,6 +10,7 @@
 #include <ioports.h>
 #include <mpc83xx.h>
 #include <asm/bitops.h>
+#include <asm/global_data.h>
 #include <asm/mpc8349_pci.h>
 #include <i2c.h>
 #include <spi.h>
diff --git a/board/freescale/mpc8349itx/mpc8349itx.c b/board/freescale/mpc8349itx/mpc8349itx.c
index a265a8380fef..5b4c290df149 100644
--- a/board/freescale/mpc8349itx/mpc8349itx.c
+++ b/board/freescale/mpc8349itx/mpc8349itx.c
@@ -18,6 +18,7 @@
 #endif
 #include <spd_sdram.h>
 #include <asm/bitops.h>
+#include <asm/global_data.h>
 #include <asm/mmu.h>
 #if defined(CONFIG_OF_LIBFDT)
 #include <linux/libfdt.h>
diff --git a/board/freescale/mpc837xemds/mpc837xemds.c b/board/freescale/mpc837xemds/mpc837xemds.c
index f515299bc9a8..71875cf8f8ec 100644
--- a/board/freescale/mpc837xemds/mpc837xemds.c
+++ b/board/freescale/mpc837xemds/mpc837xemds.c
@@ -10,6 +10,7 @@
 #include <init.h>
 #include <net.h>
 #include <asm/bitops.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/fsl_mpc83xx_serdes.h>
 #include <spd_sdram.h>
diff --git a/board/freescale/mpc837xerdb/mpc837xerdb.c b/board/freescale/mpc837xerdb/mpc837xerdb.c
index 39673ad076a3..81d31f19c4c1 100644
--- a/board/freescale/mpc837xerdb/mpc837xerdb.c
+++ b/board/freescale/mpc837xerdb/mpc837xerdb.c
@@ -11,6 +11,7 @@
 #include <i2c.h>
 #include <init.h>
 #include <asm/bitops.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/fsl_mpc83xx_serdes.h>
 #include <fdt_support.h>
diff --git a/board/freescale/mpc8610hpcd/mpc8610hpcd.c b/board/freescale/mpc8610hpcd/mpc8610hpcd.c
index 52bf4da98eaa..74b0e45b4f82 100644
--- a/board/freescale/mpc8610hpcd/mpc8610hpcd.c
+++ b/board/freescale/mpc8610hpcd/mpc8610hpcd.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <net.h>
 #include <pci.h>
+#include <asm/global_data.h>
 #include <asm/processor.h>
 #include <asm/immap_86xx.h>
 #include <asm/fsl_pci.h>
diff --git a/board/freescale/mpc8641hpcn/mpc8641hpcn.c b/board/freescale/mpc8641hpcn/mpc8641hpcn.c
index 0f9aea469b11..b30b86364d5d 100644
--- a/board/freescale/mpc8641hpcn/mpc8641hpcn.c
+++ b/board/freescale/mpc8641hpcn/mpc8641hpcn.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <net.h>
 #include <pci.h>
+#include <asm/global_data.h>
 #include <asm/processor.h>
 #include <asm/immap_86xx.h>
 #include <asm/fsl_pci.h>
diff --git a/board/freescale/mx23evk/mx23evk.c b/board/freescale/mx23evk/mx23evk.c
index 3fbac6b5cc31..605cdec218a3 100644
--- a/board/freescale/mx23evk/mx23evk.c
+++ b/board/freescale/mx23evk/mx23evk.c
@@ -13,6 +13,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/clock.h>
diff --git a/board/freescale/mx25pdk/mx25pdk.c b/board/freescale/mx25pdk/mx25pdk.c
index 1cffdd933172..3b445a46dd7b 100644
--- a/board/freescale/mx25pdk/mx25pdk.c
+++ b/board/freescale/mx25pdk/mx25pdk.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/freescale/mx28evk/mx28evk.c b/board/freescale/mx28evk/mx28evk.c
index a6b66d99ccb1..21c9cb112836 100644
--- a/board/freescale/mx28evk/mx28evk.c
+++ b/board/freescale/mx28evk/mx28evk.c
@@ -14,6 +14,7 @@
 #include <common.h>
 #include <init.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/freescale/mx35pdk/mx35pdk.c b/board/freescale/mx35pdk/mx35pdk.c
index fc024c47dbdd..4039d9f049a6 100644
--- a/board/freescale/mx35pdk/mx35pdk.c
+++ b/board/freescale/mx35pdk/mx35pdk.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <init.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/board/freescale/mx51evk/mx51evk.c b/board/freescale/mx51evk/mx51evk.c
index 4250efddde77..ac48e7668c0e 100644
--- a/board/freescale/mx51evk/mx51evk.c
+++ b/board/freescale/mx51evk/mx51evk.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/freescale/mx53ard/mx53ard.c b/board/freescale/mx53ard/mx53ard.c
index d265d3adaa64..f9ec5ca6ef35 100644
--- a/board/freescale/mx53ard/mx53ard.c
+++ b/board/freescale/mx53ard/mx53ard.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <init.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
diff --git a/board/freescale/mx53evk/mx53evk.c b/board/freescale/mx53evk/mx53evk.c
index ef6c6ec1ed6e..b006638e2c12 100644
--- a/board/freescale/mx53evk/mx53evk.c
+++ b/board/freescale/mx53evk/mx53evk.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
diff --git a/board/freescale/mx53loco/mx53loco.c b/board/freescale/mx53loco/mx53loco.c
index 1da263bb5d5f..ee54a61d874e 100644
--- a/board/freescale/mx53loco/mx53loco.c
+++ b/board/freescale/mx53loco/mx53loco.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <init.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
diff --git a/board/freescale/mx53smd/mx53smd.c b/board/freescale/mx53smd/mx53smd.c
index 7c0f98a13216..2f91a0525c4b 100644
--- a/board/freescale/mx53smd/mx53smd.c
+++ b/board/freescale/mx53smd/mx53smd.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
diff --git a/board/freescale/mx6memcal/mx6memcal.c b/board/freescale/mx6memcal/mx6memcal.c
index ea7a56369d6e..1cc744fa9ba0 100644
--- a/board/freescale/mx6memcal/mx6memcal.c
+++ b/board/freescale/mx6memcal/mx6memcal.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <init.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/mx6memcal/spl.c b/board/freescale/mx6memcal/spl.c
index c11eee51b612..c82b532f6d53 100644
--- a/board/freescale/mx6memcal/spl.c
+++ b/board/freescale/mx6memcal/spl.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/clock.h>
diff --git a/board/freescale/mx6qarm2/mx6qarm2.c b/board/freescale/mx6qarm2/mx6qarm2.c
index ddde245869af..c06fd643677d 100644
--- a/board/freescale/mx6qarm2/mx6qarm2.c
+++ b/board/freescale/mx6qarm2/mx6qarm2.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <init.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/mx6-pins.h>
diff --git a/board/freescale/mx6sabreauto/mx6sabreauto.c b/board/freescale/mx6sabreauto/mx6sabreauto.c
index c031cf8538e7..e92ef26d0ad0 100644
--- a/board/freescale/mx6sabreauto/mx6sabreauto.c
+++ b/board/freescale/mx6sabreauto/mx6sabreauto.c
@@ -9,6 +9,7 @@
 #include <image.h>
 #include <init.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/freescale/mx6sabresd/mx6sabresd.c b/board/freescale/mx6sabresd/mx6sabresd.c
index 0d343da519fd..bc28173668e2 100644
--- a/board/freescale/mx6sabresd/mx6sabresd.c
+++ b/board/freescale/mx6sabresd/mx6sabresd.c
@@ -12,6 +12,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/mx6-pins.h>
+#include <asm/global_data.h>
 #include <asm/mach-imx/spi.h>
 #include <env.h>
 #include <linux/errno.h>
diff --git a/board/freescale/mx6slevk/mx6slevk.c b/board/freescale/mx6slevk/mx6slevk.c
index 5d2f815d2348..2c90a35e2c95 100644
--- a/board/freescale/mx6slevk/mx6slevk.c
+++ b/board/freescale/mx6slevk/mx6slevk.c
@@ -14,6 +14,7 @@
 #include <asm/arch/mx6-ddr.h>
 #include <asm/arch/mx6-pins.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/mach-imx/mxc_i2c.h>
diff --git a/board/freescale/mx6sllevk/mx6sllevk.c b/board/freescale/mx6sllevk/mx6sllevk.c
index 0a36b46e9e8b..b4fddafe6402 100644
--- a/board/freescale/mx6sllevk/mx6sllevk.c
+++ b/board/freescale/mx6sllevk/mx6sllevk.c
@@ -10,6 +10,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/mx6-pins.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/mach-imx/boot_mode.h>
diff --git a/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c b/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c
index 1640f465bad3..7340a3440231 100644
--- a/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c
+++ b/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c
@@ -13,6 +13,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/mx6-pins.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/mach-imx/boot_mode.h>
diff --git a/board/freescale/mx6sxsabresd/mx6sxsabresd.c b/board/freescale/mx6sxsabresd/mx6sxsabresd.c
index 7fb8de177bcd..57fab2386415 100644
--- a/board/freescale/mx6sxsabresd/mx6sxsabresd.c
+++ b/board/freescale/mx6sxsabresd/mx6sxsabresd.c
@@ -13,6 +13,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/mx6-pins.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/io.h>
diff --git a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
index 9cb17594013e..b916ea010290 100644
--- a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
+++ b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
@@ -12,6 +12,7 @@
 #include <asm/arch/mx6ul_pins.h>
 #include <asm/arch/mx6-pins.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/mach-imx/boot_mode.h>
diff --git a/board/freescale/mx6ullevk/mx6ullevk.c b/board/freescale/mx6ullevk/mx6ullevk.c
index 3f1ecce10f88..86c11c7bd3a5 100644
--- a/board/freescale/mx6ullevk/mx6ullevk.c
+++ b/board/freescale/mx6ullevk/mx6ullevk.c
@@ -10,6 +10,7 @@
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/mx6-pins.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/mach-imx/boot_mode.h>
diff --git a/board/freescale/mx7dsabresd/mx7dsabresd.c b/board/freescale/mx7dsabresd/mx7dsabresd.c
index f12e9d4cfefe..2777ae13bce0 100644
--- a/board/freescale/mx7dsabresd/mx7dsabresd.c
+++ b/board/freescale/mx7dsabresd/mx7dsabresd.c
@@ -9,6 +9,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/mx7-pins.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/io.h>
diff --git a/board/freescale/mx7ulp_evk/mx7ulp_evk.c b/board/freescale/mx7ulp_evk/mx7ulp_evk.c
index fd21591ad6fc..01e32136532d 100644
--- a/board/freescale/mx7ulp_evk/mx7ulp_evk.c
+++ b/board/freescale/mx7ulp_evk/mx7ulp_evk.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <fdt_support.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/mx7ulp-pins.h>
diff --git a/board/freescale/p1010rdb/ddr.c b/board/freescale/p1010rdb/ddr.c
index 71f6259b60e4..2625195f81b1 100644
--- a/board/freescale/p1010rdb/ddr.c
+++ b/board/freescale/p1010rdb/ddr.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <vsprintf.h>
+#include <asm/global_data.h>
 #include <asm/mmu.h>
 #include <asm/immap_85xx.h>
 #include <asm/processor.h>
diff --git a/board/freescale/p1010rdb/p1010rdb.c b/board/freescale/p1010rdb/p1010rdb.c
index accf2f24e510..4f87f03965c6 100644
--- a/board/freescale/p1010rdb/p1010rdb.c
+++ b/board/freescale/p1010rdb/p1010rdb.c
@@ -9,6 +9,7 @@
 #include <image.h>
 #include <init.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <asm/processor.h>
 #include <asm/mmu.h>
 #include <asm/cache.h>
diff --git a/board/freescale/p1010rdb/spl.c b/board/freescale/p1010rdb/spl.c
index 4ee4573d2b52..91be63c2cf40 100644
--- a/board/freescale/p1010rdb/spl.c
+++ b/board/freescale/p1010rdb/spl.c
@@ -15,6 +15,7 @@
 #include <i2c.h>
 #include <fsl_esdhc.h>
 #include <spi_flash.h>
+#include <asm/global_data.h>
 #include "../common/spl.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/p1023rdb/p1023rdb.c b/board/freescale/p1023rdb/p1023rdb.c
index b70ff6899a22..bb4a39a3fa6c 100644
--- a/board/freescale/p1023rdb/p1023rdb.c
+++ b/board/freescale/p1023rdb/p1023rdb.c
@@ -13,6 +13,7 @@
 #include <init.h>
 #include <net.h>
 #include <pci.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/cache.h>
 #include <asm/processor.h>
diff --git a/board/freescale/p1_p2_rdb_pc/spl.c b/board/freescale/p1_p2_rdb_pc/spl.c
index e76c3e82c3a9..101c748838e5 100644
--- a/board/freescale/p1_p2_rdb_pc/spl.c
+++ b/board/freescale/p1_p2_rdb_pc/spl.c
@@ -16,6 +16,7 @@
 #include <i2c.h>
 #include <fsl_esdhc.h>
 #include <spi_flash.h>
+#include <asm/global_data.h>
 #include "../common/spl.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/p2041rdb/ddr.c b/board/freescale/p2041rdb/ddr.c
index 7a06c7af3dce..910058cefe16 100644
--- a/board/freescale/p2041rdb/ddr.c
+++ b/board/freescale/p2041rdb/ddr.c
@@ -8,6 +8,7 @@
 #include <hwconfig.h>
 #include <init.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/mmu.h>
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
diff --git a/board/freescale/p2041rdb/p2041rdb.c b/board/freescale/p2041rdb/p2041rdb.c
index 720d304fe428..4ece1e6ea0a4 100644
--- a/board/freescale/p2041rdb/p2041rdb.c
+++ b/board/freescale/p2041rdb/p2041rdb.c
@@ -10,6 +10,7 @@
 #include <image.h>
 #include <init.h>
 #include <netdev.h>
+#include <asm/global_data.h>
 #include <linux/compiler.h>
 #include <asm/mmu.h>
 #include <asm/processor.h>
diff --git a/board/freescale/qemu-ppce500/qemu-ppce500.c b/board/freescale/qemu-ppce500/qemu-ppce500.c
index 3395377b4feb..aa5774fd7974 100644
--- a/board/freescale/qemu-ppce500/qemu-ppce500.c
+++ b/board/freescale/qemu-ppce500/qemu-ppce500.c
@@ -12,6 +12,7 @@
 #include <net.h>
 #include <pci.h>
 #include <time.h>
+#include <asm/global_data.h>
 #include <asm/processor.h>
 #include <asm/mmu.h>
 #include <asm/fsl_pci.h>
diff --git a/board/freescale/s32v234evb/s32v234evb.c b/board/freescale/s32v234evb/s32v234evb.c
index f381cfc2ad08..304f5acf3be7 100644
--- a/board/freescale/s32v234evb/s32v234evb.c
+++ b/board/freescale/s32v234evb/s32v234evb.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/siul.h>
diff --git a/board/freescale/t102xrdb/ddr.c b/board/freescale/t102xrdb/ddr.c
index 3640a4795740..818c20cf1b5e 100644
--- a/board/freescale/t102xrdb/ddr.c
+++ b/board/freescale/t102xrdb/ddr.c
@@ -8,6 +8,7 @@
 #include <hwconfig.h>
 #include <init.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/mmu.h>
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
diff --git a/board/freescale/t102xrdb/spl.c b/board/freescale/t102xrdb/spl.c
index da442fcc1802..7ed42ed246ff 100644
--- a/board/freescale/t102xrdb/spl.c
+++ b/board/freescale/t102xrdb/spl.c
@@ -14,6 +14,7 @@
 #include <mmc.h>
 #include <fsl_esdhc.h>
 #include <spi_flash.h>
+#include <asm/global_data.h>
 #include "../common/sleep.h"
 #include "../common/spl.h"
 
diff --git a/board/freescale/t102xrdb/t102xrdb.c b/board/freescale/t102xrdb/t102xrdb.c
index bb775eb2d325..2770e104ee61 100644
--- a/board/freescale/t102xrdb/t102xrdb.c
+++ b/board/freescale/t102xrdb/t102xrdb.c
@@ -12,6 +12,7 @@
 #include <image.h>
 #include <init.h>
 #include <netdev.h>
+#include <asm/global_data.h>
 #include <linux/compiler.h>
 #include <asm/mmu.h>
 #include <asm/processor.h>
diff --git a/board/freescale/t104xrdb/ddr.c b/board/freescale/t104xrdb/ddr.c
index e313bf99cf22..8351f7ce9db2 100644
--- a/board/freescale/t104xrdb/ddr.c
+++ b/board/freescale/t104xrdb/ddr.c
@@ -8,6 +8,7 @@
 #include <hwconfig.h>
 #include <init.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/mmu.h>
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
diff --git a/board/freescale/t104xrdb/spl.c b/board/freescale/t104xrdb/spl.c
index f83d69ba152d..033a1054ff3c 100644
--- a/board/freescale/t104xrdb/spl.c
+++ b/board/freescale/t104xrdb/spl.c
@@ -14,6 +14,7 @@
 #include <mmc.h>
 #include <fsl_esdhc.h>
 #include <spi_flash.h>
+#include <asm/global_data.h>
 #include "../common/sleep.h"
 #include "../common/spl.h"
 
diff --git a/board/freescale/t104xrdb/t104xrdb.c b/board/freescale/t104xrdb/t104xrdb.c
index c7290e5a3426..780043483dff 100644
--- a/board/freescale/t104xrdb/t104xrdb.c
+++ b/board/freescale/t104xrdb/t104xrdb.c
@@ -12,6 +12,7 @@
 #include <init.h>
 #include <log.h>
 #include <netdev.h>
+#include <asm/global_data.h>
 #include <linux/compiler.h>
 #include <asm/mmu.h>
 #include <asm/processor.h>
diff --git a/board/freescale/t208xqds/ddr.c b/board/freescale/t208xqds/ddr.c
index 3317f99c81fb..56471b3988b9 100644
--- a/board/freescale/t208xqds/ddr.c
+++ b/board/freescale/t208xqds/ddr.c
@@ -8,6 +8,7 @@
 #include <hwconfig.h>
 #include <init.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/mmu.h>
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
diff --git a/board/freescale/t208xqds/spl.c b/board/freescale/t208xqds/spl.c
index c197884421b7..6863243b3dd6 100644
--- a/board/freescale/t208xqds/spl.c
+++ b/board/freescale/t208xqds/spl.c
@@ -14,6 +14,7 @@
 #include <mmc.h>
 #include <fsl_esdhc.h>
 #include <spi_flash.h>
+#include <asm/global_data.h>
 #include "../common/qixis.h"
 #include "t208xqds_qixis.h"
 #include "../common/spl.h"
diff --git a/board/freescale/t208xqds/t208xqds.c b/board/freescale/t208xqds/t208xqds.c
index f3af8d52925e..dedf722c6957 100644
--- a/board/freescale/t208xqds/t208xqds.c
+++ b/board/freescale/t208xqds/t208xqds.c
@@ -13,6 +13,7 @@
 #include <init.h>
 #include <log.h>
 #include <netdev.h>
+#include <asm/global_data.h>
 #include <linux/compiler.h>
 #include <asm/mmu.h>
 #include <asm/processor.h>
diff --git a/board/freescale/t208xrdb/ddr.c b/board/freescale/t208xrdb/ddr.c
index 6a09d1cd221b..1fbab36e1a20 100644
--- a/board/freescale/t208xrdb/ddr.c
+++ b/board/freescale/t208xrdb/ddr.c
@@ -8,6 +8,7 @@
 #include <hwconfig.h>
 #include <init.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/mmu.h>
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
diff --git a/board/freescale/t208xrdb/spl.c b/board/freescale/t208xrdb/spl.c
index 07aab6349cfc..cfa6789d2df0 100644
--- a/board/freescale/t208xrdb/spl.c
+++ b/board/freescale/t208xrdb/spl.c
@@ -14,6 +14,7 @@
 #include <mmc.h>
 #include <fsl_esdhc.h>
 #include <spi_flash.h>
+#include <asm/global_data.h>
 #include "../common/spl.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/t208xrdb/t208xrdb.c b/board/freescale/t208xrdb/t208xrdb.c
index d37abb7ef3bb..a18459841c62 100644
--- a/board/freescale/t208xrdb/t208xrdb.c
+++ b/board/freescale/t208xrdb/t208xrdb.c
@@ -11,6 +11,7 @@
 #include <image.h>
 #include <init.h>
 #include <netdev.h>
+#include <asm/global_data.h>
 #include <linux/compiler.h>
 #include <asm/mmu.h>
 #include <asm/processor.h>
diff --git a/board/freescale/t4rdb/ddr.c b/board/freescale/t4rdb/ddr.c
index 5b7d10c9798b..57cbde154f0e 100644
--- a/board/freescale/t4rdb/ddr.c
+++ b/board/freescale/t4rdb/ddr.c
@@ -8,6 +8,7 @@
 #include <hwconfig.h>
 #include <init.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/mmu.h>
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
diff --git a/board/freescale/t4rdb/spl.c b/board/freescale/t4rdb/spl.c
index 64d2753da81c..42db384a15d6 100644
--- a/board/freescale/t4rdb/spl.c
+++ b/board/freescale/t4rdb/spl.c
@@ -10,6 +10,7 @@
 #include <console.h>
 #include <env_internal.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/spl.h>
 #include <malloc.h>
 #include <ns16550.h>
diff --git a/board/freescale/t4rdb/t4240rdb.c b/board/freescale/t4rdb/t4240rdb.c
index 5c2a75b905e6..6ab35ca9185b 100644
--- a/board/freescale/t4rdb/t4240rdb.c
+++ b/board/freescale/t4rdb/t4240rdb.c
@@ -11,6 +11,7 @@
 #include <image.h>
 #include <init.h>
 #include <netdev.h>
+#include <asm/global_data.h>
 #include <linux/compiler.h>
 #include <asm/mmu.h>
 #include <asm/processor.h>
diff --git a/board/freescale/vf610twr/vf610twr.c b/board/freescale/vf610twr/vf610twr.c
index bd125bc17e05..98cb0140ad02 100644
--- a/board/freescale/vf610twr/vf610twr.c
+++ b/board/freescale/vf610twr/vf610twr.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux-vf610.h>
diff --git a/board/friendlyarm/nanopi2/board.c b/board/friendlyarm/nanopi2/board.c
index 68980536abe9..c0fe2d546f63 100644
--- a/board/friendlyarm/nanopi2/board.c
+++ b/board/friendlyarm/nanopi2/board.c
@@ -12,6 +12,7 @@
 #ifdef CONFIG_PWM_NX
 #include <pwm.h>
 #endif
+#include <asm/global_data.h>
 #include <asm/io.h>
 
 #include <asm/arch/nexell.h>
diff --git a/board/gardena/smart-gateway-at91sam/board.c b/board/gardena/smart-gateway-at91sam/board.c
index 45c947fcbb47..3f402cfeee8c 100644
--- a/board/gardena/smart-gateway-at91sam/board.c
+++ b/board/gardena/smart-gateway-at91sam/board.c
@@ -11,6 +11,7 @@
 #include <led.h>
 #include <asm/arch/at91_common.h>
 #include <asm/arch/clk.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/gateworks/gw_ventana/gw_ventana.c b/board/gateworks/gw_ventana/gw_ventana.c
index 9f043d815abf..bf4d6913067d 100644
--- a/board/gateworks/gw_ventana/gw_ventana.c
+++ b/board/gateworks/gw_ventana/gw_ventana.c
@@ -15,6 +15,7 @@
 #include <asm/arch/mx6-pins.h>
 #include <asm/arch/mxc_hdmi.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/mach-imx/boot_mode.h>
 #include <asm/mach-imx/sata.h>
diff --git a/board/gdsys/a38x/controlcenterdc.c b/board/gdsys/a38x/controlcenterdc.c
index a2287f9deb13..ba57a272187e 100644
--- a/board/gdsys/a38x/controlcenterdc.c
+++ b/board/gdsys/a38x/controlcenterdc.c
@@ -11,6 +11,7 @@
 #include <miiphy.h>
 #include <net.h>
 #include <tpm-v1.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm-generic/gpio.h>
diff --git a/board/gdsys/a38x/hydra.c b/board/gdsys/a38x/hydra.c
index daade6da0af4..495a97691881 100644
--- a/board/gdsys/a38x/hydra.c
+++ b/board/gdsys/a38x/hydra.c
@@ -1,6 +1,7 @@
 #include <common.h>
 #include <command.h>
 #include <console.h> /* ctrlc */
+#include <pci.h>
 #include <asm/io.h>
 
 #include "hydra.h"
diff --git a/board/gdsys/mpc8308/gazerbeam.c b/board/gdsys/mpc8308/gazerbeam.c
index c317260251e6..68a9595511c9 100644
--- a/board/gdsys/mpc8308/gazerbeam.c
+++ b/board/gdsys/mpc8308/gazerbeam.c
@@ -17,6 +17,7 @@
 #include <misc.h>
 #include <tpm-v1.h>
 #include <video_osd.h>
+#include <asm/global_data.h>
 
 #include "../common/ihs_mdio.h"
 #include "../../../drivers/board/gazerbeam.h"
diff --git a/board/gdsys/mpc8308/sdram.c b/board/gdsys/mpc8308/sdram.c
index 9695fb0a10df..bfd55f54e4e1 100644
--- a/board/gdsys/mpc8308/sdram.c
+++ b/board/gdsys/mpc8308/sdram.c
@@ -19,6 +19,7 @@
 #include <spd_sdram.h>
 
 #include <asm/bitops.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 
 #include <asm/processor.h>
diff --git a/board/ge/bx50v3/bx50v3.c b/board/ge/bx50v3/bx50v3.c
index cf76cf7a3387..be5fb0e49cc1 100644
--- a/board/ge/bx50v3/bx50v3.c
+++ b/board/ge/bx50v3/bx50v3.c
@@ -12,6 +12,7 @@
 #include <asm/arch/iomux.h>
 #include <asm/arch/mx6-pins.h>
 #include <env.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/libfdt.h>
diff --git a/board/ge/mx53ppd/mx53ppd.c b/board/ge/mx53ppd/mx53ppd.c
index 7627e9c370fb..4de82cd5cd25 100644
--- a/board/ge/mx53ppd/mx53ppd.c
+++ b/board/ge/mx53ppd/mx53ppd.c
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
diff --git a/board/google/imx8mq_phanbell/imx8mq_phanbell.c b/board/google/imx8mq_phanbell/imx8mq_phanbell.c
index 746071b4150f..d0a740dd3f40 100644
--- a/board/google/imx8mq_phanbell/imx8mq_phanbell.c
+++ b/board/google/imx8mq_phanbell/imx8mq_phanbell.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <malloc.h>
 #include <errno.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <miiphy.h>
 #include <netdev.h>
diff --git a/board/google/imx8mq_phanbell/spl.c b/board/google/imx8mq_phanbell/spl.c
index 06a3f4c1aa86..eec3f3d931b2 100644
--- a/board/google/imx8mq_phanbell/spl.c
+++ b/board/google/imx8mq_phanbell/spl.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <hang.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <errno.h>
 #include <init.h>
diff --git a/board/google/veyron/veyron.c b/board/google/veyron/veyron.c
index 391d973c0b6d..32dbcdc4d10a 100644
--- a/board/google/veyron/veyron.c
+++ b/board/google/veyron/veyron.c
@@ -9,6 +9,7 @@
 #include <init.h>
 #include <log.h>
 #include <asm/arch-rockchip/clock.h>
+#include <asm/global_data.h>
 #include <dt-bindings/clock/rk3288-cru.h>
 #include <linux/delay.h>
 #include <linux/err.h>
diff --git a/board/grinn/chiliboard/board.c b/board/grinn/chiliboard/board.c
index 8cc9278287b4..12480f5729d6 100644
--- a/board/grinn/chiliboard/board.c
+++ b/board/grinn/chiliboard/board.c
@@ -16,6 +16,7 @@
 #include <asm/arch/mux.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/emif.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <cpsw.h>
 #include <env.h>
diff --git a/board/grinn/liteboard/board.c b/board/grinn/liteboard/board.c
index 578d75aed3d1..48392c48e5cc 100644
--- a/board/grinn/liteboard/board.c
+++ b/board/grinn/liteboard/board.c
@@ -15,6 +15,7 @@
 #include <asm/arch/mx6ul_pins.h>
 #include <asm/arch/mx6-pins.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/mach-imx/boot_mode.h>
diff --git a/board/highbank/highbank.c b/board/highbank/highbank.c
index e07295c7b5c0..a790d453da04 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 <asm/global_data.h>
 
 #include <linux/sizes.h>
 #include <asm/io.h>
diff --git a/board/hisilicon/hikey/hikey.c b/board/hisilicon/hikey/hikey.c
index e89ff1a43deb..5a858dec64e4 100644
--- a/board/hisilicon/hikey/hikey.c
+++ b/board/hisilicon/hikey/hikey.c
@@ -9,6 +9,7 @@
 #include <fdt_support.h>
 #include <init.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <dm/platform_data/serial_pl01x.h>
 #include <errno.h>
 #include <malloc.h>
diff --git a/board/hisilicon/hikey960/hikey960.c b/board/hisilicon/hikey960/hikey960.c
index db485db10a95..a14b9e44fa5d 100644
--- a/board/hisilicon/hikey960/hikey960.c
+++ b/board/hisilicon/hikey960/hikey960.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <asm/cache.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/hi3660.h>
 #include <asm/armv8/mmu.h>
diff --git a/board/hisilicon/poplar/poplar.c b/board/hisilicon/poplar/poplar.c
index 371c3c33fc88..486e37f90a6e 100644
--- a/board/hisilicon/poplar/poplar.c
+++ b/board/hisilicon/poplar/poplar.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <init.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm/platform_data/serial_pl01x.h>
 #include <asm/arch/hi3798cv200.h>
diff --git a/board/ids/ids8313/ids8313.c b/board/ids/ids8313/ids8313.c
index ac35b5b0d0c1..45c77a249a9b 100644
--- a/board/ids/ids8313/ids8313.c
+++ b/board/ids/ids8313/ids8313.c
@@ -17,6 +17,7 @@
 #include <mpc83xx.h>
 #include <spi.h>
 #include <asm/bitops.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 
diff --git a/board/imgtec/boston/ddr.c b/board/imgtec/boston/ddr.c
index 241b3846687a..182f79b9182d 100644
--- a/board/imgtec/boston/ddr.c
+++ b/board/imgtec/boston/ddr.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 
 #include <asm/io.h>
 
diff --git a/board/imgtec/boston/dt.c b/board/imgtec/boston/dt.c
index 44b56416ff91..bf772ff5dec4 100644
--- a/board/imgtec/boston/dt.c
+++ b/board/imgtec/boston/dt.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <fdt_support.h>
+#include <asm/global_data.h>
 
 int ft_board_setup(void *blob, struct bd_info *bd)
 {
diff --git a/board/imgtec/ci20/ci20.c b/board/imgtec/ci20/ci20.c
index 038dbdd74f06..7ee175d40a5b 100644
--- a/board/imgtec/ci20/ci20.c
+++ b/board/imgtec/ci20/ci20.c
@@ -11,6 +11,7 @@
 #include <init.h>
 #include <net.h>
 #include <netdev.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
 #include <linux/bitops.h>
diff --git a/board/imgtec/malta/malta.c b/board/imgtec/malta/malta.c
index 252cc813c6ea..c04f727961de 100644
--- a/board/imgtec/malta/malta.c
+++ b/board/imgtec/malta/malta.c
@@ -13,6 +13,7 @@
 #include <pci_gt64120.h>
 #include <pci_msc01.h>
 #include <rtc.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 
 #include <asm/addrspace.h>
diff --git a/board/imgtec/xilfpga/xilfpga.c b/board/imgtec/xilfpga/xilfpga.c
index 0b68bbde50fc..6a836370e36d 100644
--- a/board/imgtec/xilfpga/xilfpga.c
+++ b/board/imgtec/xilfpga/xilfpga.c
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/inversepath/usbarmory/usbarmory.c b/board/inversepath/usbarmory/usbarmory.c
index 56a2a7c4a6e6..086d0522c78a 100644
--- a/board/inversepath/usbarmory/usbarmory.c
+++ b/board/inversepath/usbarmory/usbarmory.c
@@ -11,6 +11,7 @@
 #include <command.h>
 #include <fs.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
diff --git a/board/iomega/iconnect/iconnect.c b/board/iomega/iconnect/iconnect.c
index 79c794bfc896..fe4be28b13ce 100644
--- a/board/iomega/iconnect/iconnect.c
+++ b/board/iomega/iconnect/iconnect.c
@@ -11,6 +11,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
 #include <asm/arch/mpp.h>
+#include <asm/global_data.h>
 #include "iconnect.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/isee/igep003x/board.c b/board/isee/igep003x/board.c
index 9b4cb91b3418..02ae7df04db9 100644
--- a/board/isee/igep003x/board.c
+++ b/board/isee/igep003x/board.c
@@ -21,6 +21,7 @@
 #include <asm/arch/gpio.h>
 #include <asm/arch/mmc_host_def.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/emif.h>
 #include <asm/gpio.h>
diff --git a/board/isee/igep00x0/common.c b/board/isee/igep00x0/common.c
index 58c713f0f322..3fdf83e845c9 100644
--- a/board/isee/igep00x0/common.c
+++ b/board/isee/igep00x0/common.c
@@ -2,6 +2,7 @@
 
 #include <common.h>
 #include <twl4030.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/omap_mmc.h>
 #include <asm/arch/mux.h>
diff --git a/board/k+p/kp_imx53/kp_imx53.c b/board/k+p/kp_imx53/kp_imx53.c
index eb5b67d1e622..a5ee4a8a5192 100644
--- a/board/k+p/kp_imx53/kp_imx53.c
+++ b/board/k+p/kp_imx53/kp_imx53.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
diff --git a/board/k+p/kp_imx6q_tpc/kp_imx6q_tpc.c b/board/k+p/kp_imx6q_tpc/kp_imx6q_tpc.c
index e60d556b3032..110496d99505 100644
--- a/board/k+p/kp_imx6q_tpc/kp_imx6q_tpc.c
+++ b/board/k+p/kp_imx6q_tpc/kp_imx6q_tpc.c
@@ -12,6 +12,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/mx6-pins.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 #include <asm/mach-imx/boot_mode.h>
 #include <env.h>
 #include <errno.h>
diff --git a/board/k+p/kp_imx6q_tpc/kp_imx6q_tpc_spl.c b/board/k+p/kp_imx6q_tpc/kp_imx6q_tpc_spl.c
index 75fb6acfb3c3..103c4531a64c 100644
--- a/board/k+p/kp_imx6q_tpc/kp_imx6q_tpc_spl.c
+++ b/board/k+p/kp_imx6q_tpc/kp_imx6q_tpc_spl.c
@@ -13,6 +13,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/mx6-ddr.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <errno.h>
 #include <spl.h>
diff --git a/board/keymile/common/common.c b/board/keymile/common/common.c
index 03c7ce9da7d8..d85a5eac1658 100644
--- a/board/keymile/common/common.c
+++ b/board/keymile/common/common.c
@@ -15,6 +15,7 @@
 #include <cli_hush.h>
 #include <net.h>
 #include <netdev.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/ctype.h>
 #include <linux/delay.h>
diff --git a/board/keymile/km83xx/km83xx.c b/board/keymile/km83xx/km83xx.c
index 0aad452dde67..1e5c33b5fd56 100644
--- a/board/keymile/km83xx/km83xx.c
+++ b/board/keymile/km83xx/km83xx.c
@@ -22,6 +22,7 @@
 #include <mpc83xx.h>
 #include <i2c.h>
 #include <miiphy.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/mmu.h>
 #include <asm/processor.h>
diff --git a/board/keymile/km_arm/km_arm.c b/board/keymile/km_arm/km_arm.c
index 7d191ab860b5..f4235b377fc0 100644
--- a/board/keymile/km_arm/km_arm.c
+++ b/board/keymile/km_arm/km_arm.c
@@ -20,6 +20,7 @@
 #include <netdev.h>
 #include <miiphy.h>
 #include <spi.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
diff --git a/board/keymile/kmp204x/ddr.c b/board/keymile/kmp204x/ddr.c
index d9c9ddf2bac5..77a00c55c951 100644
--- a/board/keymile/kmp204x/ddr.c
+++ b/board/keymile/kmp204x/ddr.c
@@ -11,6 +11,7 @@
 #include <hwconfig.h>
 #include <init.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/mmu.h>
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
diff --git a/board/kmc/kzm9g/kzm9g.c b/board/kmc/kzm9g/kzm9g.c
index 4b406042180c..02c87a031c30 100644
--- a/board/kmc/kzm9g/kzm9g.c
+++ b/board/kmc/kzm9g/kzm9g.c
@@ -8,6 +8,7 @@
 #include <cpu_func.h>
 #include <init.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/gpio.h>
diff --git a/board/kobol/helios4/helios4.c b/board/kobol/helios4/helios4.c
index 17d2489415de..adb091ce4fd3 100644
--- a/board/kobol/helios4/helios4.c
+++ b/board/kobol/helios4/helios4.c
@@ -10,6 +10,7 @@
 #include <miiphy.h>
 #include <net.h>
 #include <netdev.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
diff --git a/board/kosagi/novena/novena.c b/board/kosagi/novena/novena.c
index b1939f8a56e2..0e1b4a0a46ce 100644
--- a/board/kosagi/novena/novena.c
+++ b/board/kosagi/novena/novena.c
@@ -10,6 +10,7 @@
 #include <eeprom.h>
 #include <init.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <dm/device-internal.h>
 #include <ahci.h>
 #include <env.h>
diff --git a/board/l+g/vinco/vinco.c b/board/l+g/vinco/vinco.c
index b1593bab5ebd..f221f05261ae 100644
--- a/board/l+g/vinco/vinco.c
+++ b/board/l+g/vinco/vinco.c
@@ -11,6 +11,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/at91_common.h>
 #include <asm/arch/at91_pmc.h>
diff --git a/board/laird/wb45n/wb45n.c b/board/laird/wb45n/wb45n.c
index df6eeb624347..5e1ef8a49ac4 100644
--- a/board/laird/wb45n/wb45n.c
+++ b/board/laird/wb45n/wb45n.c
@@ -4,6 +4,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/at91sam9x5_matrix.h>
 #include <asm/arch/at91sam9_smc.h>
diff --git a/board/laird/wb50n/wb50n.c b/board/laird/wb50n/wb50n.c
index 9cc21b2abd3c..8fa989a2a4ff 100644
--- a/board/laird/wb50n/wb50n.c
+++ b/board/laird/wb50n/wb50n.c
@@ -4,6 +4,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/at91_sfr.h>
 #include <asm/arch/sama5d3_smc.h>
diff --git a/board/lego/ev3/legoev3.c b/board/lego/ev3/legoev3.c
index 51b669a891b6..5e5c8c1198f7 100644
--- a/board/lego/ev3/legoev3.c
+++ b/board/lego/ev3/legoev3.c
@@ -19,6 +19,7 @@
 #include <spi_flash.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/pinmux_defs.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/davinci_misc.h>
 #include <linux/errno.h>
diff --git a/board/lg/sniper/sniper.c b/board/lg/sniper/sniper.c
index b08a267c52c1..15c088d73486 100644
--- a/board/lg/sniper/sniper.c
+++ b/board/lg/sniper/sniper.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <env.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <linux/ctype.h>
 #include <linux/usb/musb.h>
 #include <asm/omap_musb.h>
diff --git a/board/liebherr/display5/display5.c b/board/liebherr/display5/display5.c
index 5f447143019a..e3a59dbec009 100644
--- a/board/liebherr/display5/display5.c
+++ b/board/liebherr/display5/display5.c
@@ -9,6 +9,7 @@
 #include <fdt_support.h>
 #include <init.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/liebherr/display5/spl.c b/board/liebherr/display5/spl.c
index 23959c255731..b8658c8d6174 100644
--- a/board/liebherr/display5/spl.c
+++ b/board/liebherr/display5/spl.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <serial.h>
 #include <spl.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 #include <asm/io.h>
diff --git a/board/liebherr/mccmon6/mccmon6.c b/board/liebherr/mccmon6/mccmon6.c
index 71f75d877d2f..1b49526fba4f 100644
--- a/board/liebherr/mccmon6/mccmon6.c
+++ b/board/liebherr/mccmon6/mccmon6.c
@@ -12,6 +12,7 @@
 #include <asm/arch/iomux.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/liebherr/xea/xea.c b/board/liebherr/xea/xea.c
index 9286f4c755bc..cd11b0ada77c 100644
--- a/board/liebherr/xea/xea.c
+++ b/board/liebherr/xea/xea.c
@@ -18,6 +18,7 @@
 #include <init.h>
 #include <log.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/logicpd/am3517evm/am3517evm.c b/board/logicpd/am3517evm/am3517evm.c
index cba51f54d41d..f0141659282a 100644
--- a/board/logicpd/am3517evm/am3517evm.c
+++ b/board/logicpd/am3517evm/am3517evm.c
@@ -16,6 +16,7 @@
 #include <net.h>
 #include <ns16550.h>
 #include <serial.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/omap_musb.h>
 #include <asm/arch/am35x_def.h>
diff --git a/board/logicpd/imx6/imx6logic.c b/board/logicpd/imx6/imx6logic.c
index ba69c966869d..0d53548dcb4b 100644
--- a/board/logicpd/imx6/imx6logic.c
+++ b/board/logicpd/imx6/imx6logic.c
@@ -16,6 +16,7 @@
 #include <mmc.h>
 #include <fsl_esdhc_imx.h>
 #include <serial.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
 #include <linux/sizes.h>
diff --git a/board/logicpd/omap3som/omap3logic.c b/board/logicpd/omap3som/omap3logic.c
index 496886fea25a..2379b521904a 100644
--- a/board/logicpd/omap3som/omap3logic.c
+++ b/board/logicpd/omap3som/omap3logic.c
@@ -20,6 +20,7 @@
 #include <i2c.h>
 #include <serial.h>
 #include <twl4030.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/mmc_host_def.h>
 #include <asm/arch/mux.h>
diff --git a/board/maxbcm/maxbcm.c b/board/maxbcm/maxbcm.c
index 3c6422214f77..e92132ad19a1 100644
--- a/board/maxbcm/maxbcm.c
+++ b/board/maxbcm/maxbcm.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <init.h>
 #include <miiphy.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
diff --git a/board/mediatek/mt7622/mt7622_rfb.c b/board/mediatek/mt7622/mt7622_rfb.c
index 6a5f936635c1..0504d6177fd5 100644
--- a/board/mediatek/mt7622/mt7622_rfb.c
+++ b/board/mediatek/mt7622/mt7622_rfb.c
@@ -8,6 +8,7 @@
 #include <config.h>
 #include <env.h>
 #include <init.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/mediatek/mt7623/mt7623_rfb.c b/board/mediatek/mt7623/mt7623_rfb.c
index 984e75ccaf26..755e879085c2 100644
--- a/board/mediatek/mt7623/mt7623_rfb.c
+++ b/board/mediatek/mt7623/mt7623_rfb.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <mmc.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/mediatek/mt7629/mt7629_rfb.c b/board/mediatek/mt7629/mt7629_rfb.c
index 08468b50ea2a..d1bca6d62ef8 100644
--- a/board/mediatek/mt7629/mt7629_rfb.c
+++ b/board/mediatek/mt7629/mt7629_rfb.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/mediatek/mt8512/mt8512.c b/board/mediatek/mt8512/mt8512.c
index 4ad62b73a6c0..ac3adb801222 100644
--- a/board/mediatek/mt8512/mt8512.c
+++ b/board/mediatek/mt8512/mt8512.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <log.h>
 #include <wdt.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/mediatek/mt8518/mt8518_ap1.c b/board/mediatek/mt8518/mt8518_ap1.c
index c9acfcb1a56d..fce5de6767cd 100644
--- a/board/mediatek/mt8518/mt8518_ap1.c
+++ b/board/mediatek/mt8518/mt8518_ap1.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <init.h>
 #include <log.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/menlo/m53menlo/m53menlo.c b/board/menlo/m53menlo/m53menlo.c
index 893f62559994..c34baca602cd 100644
--- a/board/menlo/m53menlo/m53menlo.c
+++ b/board/menlo/m53menlo/m53menlo.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <init.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
diff --git a/board/mikrotik/crs3xx-98dx3236/crs3xx-98dx3236.c b/board/mikrotik/crs3xx-98dx3236/crs3xx-98dx3236.c
index 8b419ef6f7ea..315169ba661d 100644
--- a/board/mikrotik/crs3xx-98dx3236/crs3xx-98dx3236.c
+++ b/board/mikrotik/crs3xx-98dx3236/crs3xx-98dx3236.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <i2c.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <linux/bitops.h>
 #include <linux/mbus.h>
diff --git a/board/mini-box/picosam9g45/picosam9g45.c b/board/mini-box/picosam9g45/picosam9g45.c
index e8e1ac3eb195..5d6cb24966d6 100644
--- a/board/mini-box/picosam9g45/picosam9g45.c
+++ b/board/mini-box/picosam9g45/picosam9g45.c
@@ -13,6 +13,7 @@
 #include <common.h>
 #include <init.h>
 #include <vsprintf.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clk.h>
 #include <asm/arch/at91sam9g45_matrix.h>
diff --git a/board/mpc8308_p1m/sdram.c b/board/mpc8308_p1m/sdram.c
index cbf8781746eb..62a2d8a53afa 100644
--- a/board/mpc8308_p1m/sdram.c
+++ b/board/mpc8308_p1m/sdram.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <init.h>
 #include <mpc83xx.h>
+#include <asm/global_data.h>
 
 #include <asm/bitops.h>
 #include <asm/io.h>
diff --git a/board/mscc/jr2/jr2.c b/board/mscc/jr2/jr2.c
index 51700f4acffe..1cd720c7d844 100644
--- a/board/mscc/jr2/jr2.c
+++ b/board/mscc/jr2/jr2.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <image.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <led.h>
 #include <miiphy.h>
diff --git a/board/mscc/luton/luton.c b/board/mscc/luton/luton.c
index acc26157c771..038902d08a9d 100644
--- a/board/mscc/luton/luton.c
+++ b/board/mscc/luton/luton.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <image.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <led.h>
 #include <miiphy.h>
diff --git a/board/mscc/ocelot/ocelot.c b/board/mscc/ocelot/ocelot.c
index 74e8bfc43147..c462890bb853 100644
--- a/board/mscc/ocelot/ocelot.c
+++ b/board/mscc/ocelot/ocelot.c
@@ -7,6 +7,7 @@
 #include <image.h>
 #include <init.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/addrspace.h>
 #include <asm/types.h>
diff --git a/board/mscc/serval/serval.c b/board/mscc/serval/serval.c
index ed1aea55cc2f..94c1c42b79b2 100644
--- a/board/mscc/serval/serval.c
+++ b/board/mscc/serval/serval.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <image.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <led.h>
 #include <miiphy.h>
diff --git a/board/mscc/servalt/servalt.c b/board/mscc/servalt/servalt.c
index 879f5de50675..252d8e3156d5 100644
--- a/board/mscc/servalt/servalt.c
+++ b/board/mscc/servalt/servalt.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <image.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <led.h>
 
diff --git a/board/nokia/rx51/rx51.c b/board/nokia/rx51/rx51.c
index f624dbfbebc4..65be1719c2ce 100644
--- a/board/nokia/rx51/rx51.c
+++ b/board/nokia/rx51/rx51.c
@@ -29,6 +29,7 @@
 #include <twl4030.h>
 #include <i2c.h>
 #include <video_fb.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/setup.h>
 #include <asm/bitops.h>
diff --git a/board/novtech/meerkat96/meerkat96.c b/board/novtech/meerkat96/meerkat96.c
index b13e7ce3b18d..1edebe5db9be 100644
--- a/board/novtech/meerkat96/meerkat96.c
+++ b/board/novtech/meerkat96/meerkat96.c
@@ -9,6 +9,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/mx7-pins.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/io.h>
 #include <common.h>
diff --git a/board/olimex/mx23_olinuxino/mx23_olinuxino.c b/board/olimex/mx23_olinuxino/mx23_olinuxino.c
index f13fdb8d47e7..d1e189cbb6eb 100644
--- a/board/olimex/mx23_olinuxino/mx23_olinuxino.c
+++ b/board/olimex/mx23_olinuxino/mx23_olinuxino.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <asm/arch/iomux-mx23.h>
diff --git a/board/phytec/pcl063/pcl063.c b/board/phytec/pcl063/pcl063.c
index 9e6940f9c76a..b2e435f6908d 100644
--- a/board/phytec/pcl063/pcl063.c
+++ b/board/phytec/pcl063/pcl063.c
@@ -11,6 +11,7 @@
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/mx6-pins.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/mach-imx/mxc_i2c.h>
 #include <fsl_esdhc_imx.h>
diff --git a/board/phytec/pcm052/pcm052.c b/board/phytec/pcm052/pcm052.c
index b0c56a29f1f8..f9cf4abd474b 100644
--- a/board/phytec/pcm052/pcm052.c
+++ b/board/phytec/pcm052/pcm052.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux-vf610.h>
diff --git a/board/phytec/pcm058/pcm058.c b/board/phytec/pcm058/pcm058.c
index 79c666588f4e..5e5b129ef1ff 100644
--- a/board/phytec/pcm058/pcm058.c
+++ b/board/phytec/pcm058/pcm058.c
@@ -14,6 +14,7 @@
 #include <net.h>
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/mx6-ddr.h>
+#include <asm/global_data.h>
 #include <asm/mach-imx/boot_mode.h>
 #include <asm/arch/sys_proto.h>
 #include <dm.h>
diff --git a/board/phytec/pfla02/pfla02.c b/board/phytec/pfla02/pfla02.c
index 3b10cc0f9f11..076ce6711ef0 100644
--- a/board/phytec/pfla02/pfla02.c
+++ b/board/phytec/pfla02/pfla02.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <log.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/phytec/phycore_am335x_r2/board.c b/board/phytec/phycore_am335x_r2/board.c
index fb5890684714..5ca94152049f 100644
--- a/board/phytec/phycore_am335x_r2/board.c
+++ b/board/phytec/phycore_am335x_r2/board.c
@@ -17,6 +17,7 @@
 #include <asm/arch/ddr_defs.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 #include <power/tps65910.h>
 #include <jffs2/load_kernel.h>
 #include <mtd_node.h>
diff --git a/board/phytec/phycore_rk3288/phycore-rk3288.c b/board/phytec/phycore_rk3288/phycore-rk3288.c
index ecc73227a023..f588fc3b0c70 100644
--- a/board/phytec/phycore_rk3288/phycore-rk3288.c
+++ b/board/phytec/phycore_rk3288/phycore-rk3288.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <log.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <common.h>
 #include <dm.h>
diff --git a/board/phytium/durian/durian.c b/board/phytium/durian/durian.c
index b80688ae864c..8a82a4591ac2 100644
--- a/board/phytium/durian/durian.c
+++ b/board/phytium/durian/durian.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <asm/armv8/mmu.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/system.h>
 #include <asm/io.h>
 #include <linux/arm-smccc.h>
diff --git a/board/ppcag/bg0900/bg0900.c b/board/ppcag/bg0900/bg0900.c
index e8168e346824..578f5c73b6cb 100644
--- a/board/ppcag/bg0900/bg0900.c
+++ b/board/ppcag/bg0900/bg0900.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <init.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/qemu-mips/qemu-mips.c b/board/qemu-mips/qemu-mips.c
index 7553d0b00de5..f57091739ec9 100644
--- a/board/qemu-mips/qemu-mips.c
+++ b/board/qemu-mips/qemu-mips.c
@@ -8,6 +8,7 @@
 #include <command.h>
 #include <init.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <asm/mipsregs.h>
 #include <asm/io.h>
 #include <netdev.h>
diff --git a/board/qualcomm/dragonboard410c/dragonboard410c.c b/board/qualcomm/dragonboard410c/dragonboard410c.c
index 4d1dbd696dcf..646013cfc93d 100644
--- a/board/qualcomm/dragonboard410c/dragonboard410c.c
+++ b/board/qualcomm/dragonboard410c/dragonboard410c.c
@@ -13,6 +13,7 @@
 #include <net.h>
 #include <usb.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <fdt_support.h>
 #include <asm/arch/dram.h>
diff --git a/board/qualcomm/dragonboard820c/dragonboard820c.c b/board/qualcomm/dragonboard820c/dragonboard820c.c
index c1ade5ce43a6..877e34c21017 100644
--- a/board/qualcomm/dragonboard820c/dragonboard820c.c
+++ b/board/qualcomm/dragonboard820c/dragonboard820c.c
@@ -10,6 +10,7 @@
 #include <asm/arch/sysmap-apq8096.h>
 #include <env.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <linux/arm-smccc.h>
 #include <linux/psci.h>
 #include <common.h>
diff --git a/board/raidsonic/ib62x0/ib62x0.c b/board/raidsonic/ib62x0/ib62x0.c
index db1b0adc3826..f9bc07649e0a 100644
--- a/board/raidsonic/ib62x0/ib62x0.c
+++ b/board/raidsonic/ib62x0/ib62x0.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <init.h>
 #include <miiphy.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
diff --git a/board/renesas/alt/alt.c b/board/renesas/alt/alt.c
index 279ed4872165..854c47636d3f 100644
--- a/board/renesas/alt/alt.c
+++ b/board/renesas/alt/alt.c
@@ -12,6 +12,7 @@
 #include <init.h>
 #include <malloc.h>
 #include <dm.h>
+#include <asm/global_data.h>
 #include <dm/platform_data/serial_sh.h>
 #include <env_internal.h>
 #include <asm/processor.h>
diff --git a/board/renesas/blanche/blanche.c b/board/renesas/blanche/blanche.c
index 2450fca7a58b..9671382f2a3e 100644
--- a/board/renesas/blanche/blanche.c
+++ b/board/renesas/blanche/blanche.c
@@ -15,6 +15,7 @@
 #include <asm/arch/rmobile.h>
 #include <asm/arch/sh_sdhi.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <asm/mach-types.h>
diff --git a/board/renesas/condor/condor.c b/board/renesas/condor/condor.c
index 91afcdd85a84..99e7dd6e1e16 100644
--- a/board/renesas/condor/condor.c
+++ b/board/renesas/condor/condor.c
@@ -10,6 +10,7 @@
 #include <cpu_func.h>
 #include <hang.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/processor.h>
 #include <asm/mach-types.h>
 #include <asm/io.h>
diff --git a/board/renesas/draak/draak.c b/board/renesas/draak/draak.c
index c8f4b214a2d8..bc4ce95a727f 100644
--- a/board/renesas/draak/draak.c
+++ b/board/renesas/draak/draak.c
@@ -13,6 +13,7 @@
 #include <malloc.h>
 #include <netdev.h>
 #include <dm.h>
+#include <asm/global_data.h>
 #include <dm/platform_data/serial_sh.h>
 #include <asm/processor.h>
 #include <asm/mach-types.h>
diff --git a/board/renesas/eagle/eagle.c b/board/renesas/eagle/eagle.c
index 6228f22e0103..f9e553feaa70 100644
--- a/board/renesas/eagle/eagle.c
+++ b/board/renesas/eagle/eagle.c
@@ -13,6 +13,7 @@
 #include <malloc.h>
 #include <netdev.h>
 #include <dm.h>
+#include <asm/global_data.h>
 #include <dm/platform_data/serial_sh.h>
 #include <asm/processor.h>
 #include <asm/mach-types.h>
diff --git a/board/renesas/ebisu/ebisu.c b/board/renesas/ebisu/ebisu.c
index d164a36361fc..620d250284a0 100644
--- a/board/renesas/ebisu/ebisu.c
+++ b/board/renesas/ebisu/ebisu.c
@@ -13,6 +13,7 @@
 #include <malloc.h>
 #include <netdev.h>
 #include <dm.h>
+#include <asm/global_data.h>
 #include <dm/platform_data/serial_sh.h>
 #include <asm/processor.h>
 #include <asm/mach-types.h>
diff --git a/board/renesas/gose/gose.c b/board/renesas/gose/gose.c
index c6a93c25e6d2..56cdc73b1a77 100644
--- a/board/renesas/gose/gose.c
+++ b/board/renesas/gose/gose.c
@@ -12,6 +12,7 @@
 #include <init.h>
 #include <malloc.h>
 #include <dm.h>
+#include <asm/global_data.h>
 #include <dm/platform_data/serial_sh.h>
 #include <env_internal.h>
 #include <asm/processor.h>
diff --git a/board/renesas/grpeach/grpeach.c b/board/renesas/grpeach/grpeach.c
index b92e01ca9847..ac989eb29c2f 100644
--- a/board/renesas/grpeach/grpeach.c
+++ b/board/renesas/grpeach/grpeach.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
 
diff --git a/board/renesas/koelsch/koelsch.c b/board/renesas/koelsch/koelsch.c
index 1b3acc8fd1f1..b0a66ea2669e 100644
--- a/board/renesas/koelsch/koelsch.c
+++ b/board/renesas/koelsch/koelsch.c
@@ -13,6 +13,7 @@
 #include <init.h>
 #include <malloc.h>
 #include <dm.h>
+#include <asm/global_data.h>
 #include <dm/platform_data/serial_sh.h>
 #include <env_internal.h>
 #include <asm/processor.h>
diff --git a/board/renesas/lager/lager.c b/board/renesas/lager/lager.c
index 36a35a9a9cfb..add4eef3d53c 100644
--- a/board/renesas/lager/lager.c
+++ b/board/renesas/lager/lager.c
@@ -16,6 +16,7 @@
 #include <malloc.h>
 #include <netdev.h>
 #include <dm.h>
+#include <asm/global_data.h>
 #include <dm/platform_data/serial_sh.h>
 #include <asm/processor.h>
 #include <asm/mach-types.h>
diff --git a/board/renesas/porter/porter.c b/board/renesas/porter/porter.c
index 793e02cb440a..b3e4c08d74d3 100644
--- a/board/renesas/porter/porter.c
+++ b/board/renesas/porter/porter.c
@@ -13,6 +13,7 @@
 #include <init.h>
 #include <malloc.h>
 #include <dm.h>
+#include <asm/global_data.h>
 #include <dm/platform_data/serial_sh.h>
 #include <env_internal.h>
 #include <asm/processor.h>
diff --git a/board/renesas/rcar-common/common.c b/board/renesas/rcar-common/common.c
index 83dd28884705..1d645a82aafb 100644
--- a/board/renesas/rcar-common/common.c
+++ b/board/renesas/rcar-common/common.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <dm.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <dm/uclass-internal.h>
 #include <asm/arch/rmobile.h>
 #include <linux/libfdt.h>
diff --git a/board/renesas/salvator-x/salvator-x.c b/board/renesas/salvator-x/salvator-x.c
index 947bdaefa807..1d0cab8914fe 100644
--- a/board/renesas/salvator-x/salvator-x.c
+++ b/board/renesas/salvator-x/salvator-x.c
@@ -14,6 +14,7 @@
 #include <malloc.h>
 #include <netdev.h>
 #include <dm.h>
+#include <asm/global_data.h>
 #include <dm/platform_data/serial_sh.h>
 #include <asm/processor.h>
 #include <asm/mach-types.h>
diff --git a/board/renesas/silk/silk.c b/board/renesas/silk/silk.c
index 171d06f3175c..05af5f4d68b1 100644
--- a/board/renesas/silk/silk.c
+++ b/board/renesas/silk/silk.c
@@ -13,6 +13,7 @@
 #include <init.h>
 #include <malloc.h>
 #include <dm.h>
+#include <asm/global_data.h>
 #include <dm/platform_data/serial_sh.h>
 #include <env_internal.h>
 #include <asm/processor.h>
diff --git a/board/renesas/stout/stout.c b/board/renesas/stout/stout.c
index babcce9aa1c3..3fdf936ddcac 100644
--- a/board/renesas/stout/stout.c
+++ b/board/renesas/stout/stout.c
@@ -14,6 +14,7 @@
 #include <malloc.h>
 #include <netdev.h>
 #include <dm.h>
+#include <asm/global_data.h>
 #include <dm/platform_data/serial_sh.h>
 #include <env_internal.h>
 #include <asm/processor.h>
diff --git a/board/renesas/ulcb/ulcb.c b/board/renesas/ulcb/ulcb.c
index 07bc1ec71998..66aff8e11080 100644
--- a/board/renesas/ulcb/ulcb.c
+++ b/board/renesas/ulcb/ulcb.c
@@ -12,6 +12,7 @@
 #include <malloc.h>
 #include <netdev.h>
 #include <dm.h>
+#include <asm/global_data.h>
 #include <dm/platform_data/serial_sh.h>
 #include <asm/processor.h>
 #include <asm/mach-types.h>
diff --git a/board/rockchip/evb_rk3308/evb_rk3308.c b/board/rockchip/evb_rk3308/evb_rk3308.c
index 180f1fe4f00b..e0c96fd70a28 100644
--- a/board/rockchip/evb_rk3308/evb_rk3308.c
+++ b/board/rockchip/evb_rk3308/evb_rk3308.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <adc.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/rockchip/evb_rv1108/evb_rv1108.c b/board/rockchip/evb_rv1108/evb_rv1108.c
index c57913828d72..719a64162875 100644
--- a/board/rockchip/evb_rv1108/evb_rv1108.c
+++ b/board/rockchip/evb_rv1108/evb_rv1108.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <init.h>
 #include <syscon.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch-rockchip/clock.h>
 #include <asm/arch-rockchip/grf_rv1108.h>
diff --git a/board/ronetix/pm9261/pm9261.c b/board/ronetix/pm9261/pm9261.c
index 0ce6a6e44e90..5be2c5e192bb 100644
--- a/board/ronetix/pm9261/pm9261.c
+++ b/board/ronetix/pm9261/pm9261.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <init.h>
 #include <vsprintf.h>
+#include <asm/global_data.h>
 #include <linux/sizes.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
diff --git a/board/ronetix/pm9263/pm9263.c b/board/ronetix/pm9263/pm9263.c
index 62dfe6e33d75..95c0dec4db5f 100644
--- a/board/ronetix/pm9263/pm9263.c
+++ b/board/ronetix/pm9263/pm9263.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <linux/sizes.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
diff --git a/board/ronetix/pm9g45/pm9g45.c b/board/ronetix/pm9g45/pm9g45.c
index c7d22db0aba8..8d5825c7f131 100644
--- a/board/ronetix/pm9g45/pm9g45.c
+++ b/board/ronetix/pm9g45/pm9g45.c
@@ -12,6 +12,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <linux/sizes.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
diff --git a/board/samsung/arndale/arndale.c b/board/samsung/arndale/arndale.c
index 91813763cecb..2742a7f32b2a 100644
--- a/board/samsung/arndale/arndale.c
+++ b/board/samsung/arndale/arndale.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <log.h>
 #include <usb.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/arch/pinmux.h>
 #include <asm/arch/dwmmc.h>
diff --git a/board/samsung/common/board.c b/board/samsung/common/board.c
index 752d84ec05c1..9eea11f755b7 100644
--- a/board/samsung/common/board.c
+++ b/board/samsung/common/board.c
@@ -16,6 +16,7 @@
 #include <spi.h>
 #include <tmu.h>
 #include <netdev.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
 #include <asm/arch/board.h>
diff --git a/board/samsung/common/exynos5-dt-types.c b/board/samsung/common/exynos5-dt-types.c
index f1ecb7d2c396..e2d5a7c9ba77 100644
--- a/board/samsung/common/exynos5-dt-types.c
+++ b/board/samsung/common/exynos5-dt-types.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <fdtdec.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/board/samsung/common/exynos5-dt.c b/board/samsung/common/exynos5-dt.c
index 69aa2120e126..4463cdcb87b6 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 <asm/global_data.h>
 #include <asm/io.h>
 #include <errno.h>
 #include <i2c.h>
diff --git a/board/samsung/common/misc.c b/board/samsung/common/misc.c
index 837463ba78f8..7d3b9846e39f 100644
--- a/board/samsung/common/misc.c
+++ b/board/samsung/common/misc.c
@@ -9,6 +9,7 @@
 #include <env.h>
 #include <lcd.h>
 #include <libtizen.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 #include <samsung/misc.h>
 #include <errno.h>
diff --git a/board/samsung/goni/goni.c b/board/samsung/goni/goni.c
index 2f0ef22c4171..b32b82fc2dad 100644
--- a/board/samsung/goni/goni.c
+++ b/board/samsung/goni/goni.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <init.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/arch/mmc.h>
 #include <dm.h>
diff --git a/board/samsung/odroid/odroid.c b/board/samsung/odroid/odroid.c
index 7d7e722892e7..90aab62d33b0 100644
--- a/board/samsung/odroid/odroid.c
+++ b/board/samsung/odroid/odroid.c
@@ -10,6 +10,7 @@
 #include <asm/arch/power.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/gpio.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/arch/cpu.h>
 #include <dm.h>
diff --git a/board/samsung/smdkc100/smdkc100.c b/board/samsung/smdkc100/smdkc100.c
index d034f53d68b5..69ed715403fb 100644
--- a/board/samsung/smdkc100/smdkc100.c
+++ b/board/samsung/smdkc100/smdkc100.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <init.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <asm/arch/sromc.h>
diff --git a/board/samsung/smdkv310/smdkv310.c b/board/samsung/smdkv310/smdkv310.c
index 24273f1214b0..8811cbb9ad0b 100644
--- a/board/samsung/smdkv310/smdkv310.c
+++ b/board/samsung/smdkv310/smdkv310.c
@@ -7,6 +7,7 @@
 #include <init.h>
 #include <log.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <netdev.h>
diff --git a/board/samsung/universal_c210/universal.c b/board/samsung/universal_c210/universal.c
index f50da6be7245..9ef11b8471ca 100644
--- a/board/samsung/universal_c210/universal.c
+++ b/board/samsung/universal_c210/universal.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <spi.h>
 #include <lcd.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
 #include <asm/arch/adc.h>
diff --git a/board/sandbox/sandbox.c b/board/sandbox/sandbox.c
index 937ce2841114..c78e90accbc5 100644
--- a/board/sandbox/sandbox.c
+++ b/board/sandbox/sandbox.c
@@ -11,6 +11,7 @@
 #include <init.h>
 #include <led.h>
 #include <os.h>
+#include <asm/global_data.h>
 #include <asm/test.h>
 #include <asm/u-boot-sandbox.h>
 
diff --git a/board/sandisk/sansa_fuze_plus/sfp.c b/board/sandisk/sansa_fuze_plus/sfp.c
index 42004098b377..f46b02e38e59 100644
--- a/board/sandisk/sansa_fuze_plus/sfp.c
+++ b/board/sandisk/sansa_fuze_plus/sfp.c
@@ -13,6 +13,7 @@
 #include <errno.h>
 #include <init.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <asm/arch/iomux-mx23.h>
diff --git a/board/sbc8349/sbc8349.c b/board/sbc8349/sbc8349.c
index 824479c099b6..b440a0b17e97 100644
--- a/board/sbc8349/sbc8349.c
+++ b/board/sbc8349/sbc8349.c
@@ -13,6 +13,7 @@
 #include <ioports.h>
 #include <mpc83xx.h>
 #include <asm/bitops.h>
+#include <asm/global_data.h>
 #include <asm/mpc8349_pci.h>
 #include <i2c.h>
 #include <spd_sdram.h>
diff --git a/board/sbc8641d/sbc8641d.c b/board/sbc8641d/sbc8641d.c
index 34e46d4ea4c8..a67092daf47f 100644
--- a/board/sbc8641d/sbc8641d.c
+++ b/board/sbc8641d/sbc8641d.c
@@ -16,6 +16,7 @@
 #include <init.h>
 #include <log.h>
 #include <pci.h>
+#include <asm/global_data.h>
 #include <asm/processor.h>
 #include <asm/immap_86xx.h>
 #include <asm/fsl_pci.h>
diff --git a/board/schulercontrol/sc_sps_1/sc_sps_1.c b/board/schulercontrol/sc_sps_1/sc_sps_1.c
index 8011871fc8fb..3a04b1a634cc 100644
--- a/board/schulercontrol/sc_sps_1/sc_sps_1.c
+++ b/board/schulercontrol/sc_sps_1/sc_sps_1.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <init.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/seco/mx6quq7/mx6quq7.c b/board/seco/mx6quq7/mx6quq7.c
index c7e3d425eacd..a061d7d8afbc 100644
--- a/board/seco/mx6quq7/mx6quq7.c
+++ b/board/seco/mx6quq7/mx6quq7.c
@@ -13,6 +13,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/mx6-pins.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
diff --git a/board/siemens/capricorn/spl.c b/board/siemens/capricorn/spl.c
index 8435bd3863bf..8e077d73aef9 100644
--- a/board/siemens/capricorn/spl.c
+++ b/board/siemens/capricorn/spl.c
@@ -9,6 +9,7 @@
 #include <init.h>
 #include <spl.h>
 #include <dm.h>
+#include <asm/global_data.h>
 #include <dm/uclass.h>
 #include <dm/device.h>
 #include <dm/uclass-internal.h>
diff --git a/board/siemens/common/board.c b/board/siemens/common/board.c
index e0bd8590bc9d..1bdf404ac3eb 100644
--- a/board/siemens/common/board.c
+++ b/board/siemens/common/board.c
@@ -25,6 +25,7 @@
 #include <asm/arch/gpio.h>
 #include <asm/arch/mmc_host_def.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/emif.h>
 #include <asm/gpio.h>
diff --git a/board/siemens/corvus/board.c b/board/siemens/corvus/board.c
index eed055aedb36..2acd3226cf2d 100644
--- a/board/siemens/corvus/board.c
+++ b/board/siemens/corvus/board.c
@@ -14,6 +14,7 @@
 #include <dm.h>
 #include <init.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/at91sam9g45_matrix.h>
 #include <asm/arch/at91sam9_smc.h>
diff --git a/board/siemens/smartweb/smartweb.c b/board/siemens/smartweb/smartweb.c
index c6bdd9708372..d500a6214d56 100644
--- a/board/siemens/smartweb/smartweb.c
+++ b/board/siemens/smartweb/smartweb.c
@@ -19,6 +19,7 @@
 #include <dm.h>
 #include <init.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/at91sam9_sdramc.h>
 #include <asm/arch/at91sam9260_matrix.h>
diff --git a/board/siemens/taurus/taurus.c b/board/siemens/taurus/taurus.c
index 91e29f06f60f..cad16f906564 100644
--- a/board/siemens/taurus/taurus.c
+++ b/board/siemens/taurus/taurus.c
@@ -17,6 +17,7 @@
 #include <env.h>
 #include <flash.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/at91sam9260_matrix.h>
 #include <asm/arch/at91sam9_smc.h>
diff --git a/board/sks-kinkel/sksimx6/sksimx6.c b/board/sks-kinkel/sksimx6/sksimx6.c
index 9fdbeac82fd3..cec3ade96cfd 100644
--- a/board/sks-kinkel/sksimx6/sksimx6.c
+++ b/board/sks-kinkel/sksimx6/sksimx6.c
@@ -11,6 +11,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/mx6-pins.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
diff --git a/board/socrates/socrates.c b/board/socrates/socrates.c
index 25bc664328aa..0c9262d35400 100644
--- a/board/socrates/socrates.c
+++ b/board/socrates/socrates.c
@@ -16,6 +16,7 @@
 #include <init.h>
 #include <pci.h>
 #include <uuid.h>
+#include <asm/global_data.h>
 #include <asm/processor.h>
 #include <asm/immap_85xx.h>
 #include <ioports.h>
diff --git a/board/softing/vining_2000/vining_2000.c b/board/softing/vining_2000/vining_2000.c
index 4e9d351582ff..aaeeee361e54 100644
--- a/board/softing/vining_2000/vining_2000.c
+++ b/board/softing/vining_2000/vining_2000.c
@@ -14,6 +14,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/mx6-pins.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/io.h>
diff --git a/board/softing/vining_fpga/socfpga.c b/board/softing/vining_fpga/socfpga.c
index 7e311b7a1c38..aaedf0345045 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 <asm/arch/reset_manager.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
 #include <i2c.h>
diff --git a/board/solidrun/clearfog/clearfog.c b/board/solidrun/clearfog/clearfog.c
index d5535ebebecd..3a2f8b817886 100644
--- a/board/solidrun/clearfog/clearfog.c
+++ b/board/solidrun/clearfog/clearfog.c
@@ -10,6 +10,7 @@
 #include <miiphy.h>
 #include <net.h>
 #include <netdev.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
diff --git a/board/solidrun/common/tlv_data.c b/board/solidrun/common/tlv_data.c
index f08ac8975a6a..11d6e4a13807 100644
--- a/board/solidrun/common/tlv_data.c
+++ b/board/solidrun/common/tlv_data.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <tlv_eeprom.h>
 #include "tlv_data.h"
 
diff --git a/board/solidrun/mx6cuboxi/mx6cuboxi.c b/board/solidrun/mx6cuboxi/mx6cuboxi.c
index ae1c04df87da..3eadc38f6fd4 100644
--- a/board/solidrun/mx6cuboxi/mx6cuboxi.c
+++ b/board/solidrun/mx6cuboxi/mx6cuboxi.c
@@ -23,6 +23,7 @@
 #include <asm/arch/mx6-pins.h>
 #include <asm/arch/mxc_hdmi.h>
 #include <env.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
diff --git a/board/somlabs/visionsom-6ull/visionsom-6ull.c b/board/somlabs/visionsom-6ull/visionsom-6ull.c
index bc7257be405b..076c641d8a90 100644
--- a/board/somlabs/visionsom-6ull/visionsom-6ull.c
+++ b/board/somlabs/visionsom-6ull/visionsom-6ull.c
@@ -11,6 +11,7 @@
 #include <asm/arch/iomux.h>
 #include <asm/arch/mx6-pins.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/mach-imx/boot_mode.h>
 #include <asm/mach-imx/iomux-v3.h>
diff --git a/board/st/common/stm32mp_mtdparts.c b/board/st/common/stm32mp_mtdparts.c
index 9f5897f8c860..ef32df04fefc 100644
--- a/board/st/common/stm32mp_mtdparts.c
+++ b/board/st/common/stm32mp_mtdparts.c
@@ -13,6 +13,7 @@
 #include <tee.h>
 #include <asm/arch/stm32prog.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 
 #define MTDPARTS_LEN		256
 #define MTDIDS_LEN		128
diff --git a/board/st/stih410-b2260/board.c b/board/st/stih410-b2260/board.c
index b1147f2e1a70..b87468cca210 100644
--- a/board/st/stih410-b2260/board.c
+++ b/board/st/stih410-b2260/board.c
@@ -8,6 +8,7 @@
 #include <cpu_func.h>
 #include <init.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <linux/usb/otg.h>
 #include <dwc3-sti-glue.h>
 #include <dwc3-uboot.h>
diff --git a/board/st/stm32f429-discovery/stm32f429-discovery.c b/board/st/stm32f429-discovery/stm32f429-discovery.c
index ee6a90c9fdd0..9d8fc9f5a2e1 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 <asm/global_data.h>
 
 #include <asm/io.h>
 #include <asm/arch/stm32.h>
diff --git a/board/st/stm32f429-evaluation/stm32f429-evaluation.c b/board/st/stm32f429-evaluation/stm32f429-evaluation.c
index 92e3d40a1b62..35e71380b892 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 <asm/global_data.h>
 
 #include <asm/io.h>
 #include <asm/arch/stm32.h>
diff --git a/board/st/stm32f469-discovery/stm32f469-discovery.c b/board/st/stm32f469-discovery/stm32f469-discovery.c
index 85988acb2414..fcc34e7955a6 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 <asm/global_data.h>
 
 #include <asm/io.h>
 #include <asm/arch/stm32.h>
diff --git a/board/st/stm32f746-disco/stm32f746-disco.c b/board/st/stm32f746-disco/stm32f746-disco.c
index 0f728fd9f9e2..40450ca914be 100644
--- a/board/st/stm32f746-disco/stm32f746-disco.c
+++ b/board/st/stm32f746-disco/stm32f746-disco.c
@@ -17,6 +17,7 @@
 #include <splash.h>
 #include <st_logo_data.h>
 #include <video.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/armv7m.h>
 #include <asm/arch/stm32.h>
diff --git a/board/st/stm32h743-disco/stm32h743-disco.c b/board/st/stm32h743-disco/stm32h743-disco.c
index 0484c3c25049..53bf09221972 100644
--- a/board/st/stm32h743-disco/stm32h743-disco.c
+++ b/board/st/stm32h743-disco/stm32h743-disco.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <init.h>
 #include <log.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/st/stm32h743-eval/stm32h743-eval.c b/board/st/stm32h743-eval/stm32h743-eval.c
index 0484c3c25049..53bf09221972 100644
--- a/board/st/stm32h743-eval/stm32h743-eval.c
+++ b/board/st/stm32h743-eval/stm32h743-eval.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <init.h>
 #include <log.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/st/stm32mp1/stm32mp1.c b/board/st/stm32mp1/stm32mp1.c
index 3b677d339b72..87fac76af6f4 100644
--- a/board/st/stm32mp1/stm32mp1.c
+++ b/board/st/stm32mp1/stm32mp1.c
@@ -29,6 +29,7 @@
 #include <syscon.h>
 #include <usb.h>
 #include <watchdog.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
 #include <asm/arch/stm32.h>
diff --git a/board/st/stv0991/stv0991.c b/board/st/stv0991/stv0991.c
index 8c827adc2ed7..72399cf5f653 100644
--- a/board/st/stv0991/stv0991.c
+++ b/board/st/stv0991/stv0991.c
@@ -15,6 +15,7 @@
 #include <asm/arch/hardware.h>
 #include <asm/arch/gpio.h>
 #include <netdev.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm/platform_data/serial_pl01x.h>
 
diff --git a/board/ste/stemmy/stemmy.c b/board/ste/stemmy/stemmy.c
index f7834c08fc2c..b9b2a6fddc2a 100644
--- a/board/ste/stemmy/stemmy.c
+++ b/board/ste/stemmy/stemmy.c
@@ -4,6 +4,7 @@
  */
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/sunxi/board.c b/board/sunxi/board.c
index 71e2b758a3e5..87c231f38f9f 100644
--- a/board/sunxi/board.c
+++ b/board/sunxi/board.c
@@ -28,6 +28,7 @@
 #include <asm/arch/gpio.h>
 #include <asm/arch/mmc.h>
 #include <asm/arch/spl.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 #include <u-boot/crc.h>
 #ifndef CONFIG_ARM64
diff --git a/board/synopsys/axs10x/axs10x.c b/board/synopsys/axs10x/axs10x.c
index b4a1d4c5dff6..75e4d037623e 100644
--- a/board/synopsys/axs10x/axs10x.c
+++ b/board/synopsys/axs10x/axs10x.c
@@ -9,6 +9,7 @@
 #include <init.h>
 #include <malloc.h>
 #include <asm/arcregs.h>
+#include <asm/global_data.h>
 #include "axs10x.h"
 #include <asm/cache.h>
 
diff --git a/board/synopsys/emsdp/emsdp.c b/board/synopsys/emsdp/emsdp.c
index 91fa94a638ef..997120ec5e17 100644
--- a/board/synopsys/emsdp/emsdp.c
+++ b/board/synopsys/emsdp/emsdp.c
@@ -9,6 +9,7 @@
 #include <dwmmc.h>
 #include <init.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <linux/bitops.h>
 
 #include <asm/arcregs.h>
diff --git a/board/synopsys/hsdk/hsdk.c b/board/synopsys/hsdk/hsdk.c
index cd11f9dac06b..892b94bb0836 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 <asm/cache.h>
+#include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/printk.h>
diff --git a/board/synopsys/iot_devkit/iot_devkit.c b/board/synopsys/iot_devkit/iot_devkit.c
index 497ea186d3a8..c6051363c1f9 100644
--- a/board/synopsys/iot_devkit/iot_devkit.c
+++ b/board/synopsys/iot_devkit/iot_devkit.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <malloc.h>
 #include <dwmmc.h>
+#include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/libfdt.h>
 #include <fdtdec.h>
diff --git a/board/sysam/amcore/amcore.c b/board/sysam/amcore/amcore.c
index 4502005941fb..9e1b8022705e 100644
--- a/board/sysam/amcore/amcore.c
+++ b/board/sysam/amcore/amcore.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/immap.h>
 #include <asm/io.h>
 #include <dm.h>
diff --git a/board/sysam/stmark2/stmark2.c b/board/sysam/stmark2/stmark2.c
index ce8b541ccdf7..d48da48b69d6 100644
--- a/board/sysam/stmark2/stmark2.c
+++ b/board/sysam/stmark2/stmark2.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <init.h>
 #include <spi.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/immap.h>
 #include <mmc.h>
diff --git a/board/syteco/zmx25/zmx25.c b/board/syteco/zmx25/zmx25.c
index d5393d705976..2d4c5cce8920 100644
--- a/board/syteco/zmx25/zmx25.c
+++ b/board/syteco/zmx25/zmx25.c
@@ -17,6 +17,7 @@
 #include <cpu_func.h>
 #include <env.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/tbs/tbs2910/tbs2910.c b/board/tbs/tbs2910/tbs2910.c
index d32517f998a8..ac1b8231281d 100644
--- a/board/tbs/tbs2910/tbs2910.c
+++ b/board/tbs/tbs2910/tbs2910.c
@@ -3,11 +3,13 @@
  * Copyright (C) 2014 Soeren Moch <smoch@web.de>
  */
 
+#include <common.h>
 #include <init.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/mx6-pins.h>
+#include <asm/global_data.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
 #include <asm/mach-imx/iomux-v3.h>
diff --git a/board/tcl/sl50/board.c b/board/tcl/sl50/board.c
index 230481be0de6..4821925c026d 100644
--- a/board/tcl/sl50/board.c
+++ b/board/tcl/sl50/board.c
@@ -23,6 +23,7 @@
 #include <asm/arch/mmc_host_def.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/mem.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/emif.h>
 #include <asm/gpio.h>
diff --git a/board/technexion/pico-imx6/pico-imx6.c b/board/technexion/pico-imx6/pico-imx6.c
index da82244b3975..6b9c4f4373cc 100644
--- a/board/technexion/pico-imx6/pico-imx6.c
+++ b/board/technexion/pico-imx6/pico-imx6.c
@@ -6,6 +6,7 @@
  * Author: Fabio Estevam <festevam@gmail.com>
  */
 
+#include <common.h>
 #include <env.h>
 #include <init.h>
 #include <net.h>
@@ -15,6 +16,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/mx6-pins.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/arch/mxc_hdmi.h>
 #include <asm/mach-imx/video.h>
@@ -22,7 +24,6 @@
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <linux/sizes.h>
-#include <common.h>
 #include <miiphy.h>
 #include <netdev.h>
 #include <phy.h>
diff --git a/board/technexion/pico-imx6ul/pico-imx6ul.c b/board/technexion/pico-imx6ul/pico-imx6ul.c
index 5d6be26faa1c..c9f553bdfd52 100644
--- a/board/technexion/pico-imx6ul/pico-imx6ul.c
+++ b/board/technexion/pico-imx6ul/pico-imx6ul.c
@@ -13,6 +13,7 @@
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/mx6-pins.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/io.h>
diff --git a/board/technexion/pico-imx7d/pico-imx7d.c b/board/technexion/pico-imx7d/pico-imx7d.c
index a6fd49d729c4..2d749dac19a4 100644
--- a/board/technexion/pico-imx7d/pico-imx7d.c
+++ b/board/technexion/pico-imx7d/pico-imx7d.c
@@ -10,6 +10,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/mx7-pins.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/mach-imx/mxc_i2c.h>
diff --git a/board/technexion/pico-imx8mq/pico-imx8mq.c b/board/technexion/pico-imx8mq/pico-imx8mq.c
index 330de7137c3d..951e3e1985bc 100644
--- a/board/technexion/pico-imx8mq/pico-imx8mq.c
+++ b/board/technexion/pico-imx8mq/pico-imx8mq.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <malloc.h>
 #include <errno.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <miiphy.h>
 #include <netdev.h>
diff --git a/board/technexion/pico-imx8mq/spl.c b/board/technexion/pico-imx8mq/spl.c
index b181f797a77a..8b853a914e85 100644
--- a/board/technexion/pico-imx8mq/spl.c
+++ b/board/technexion/pico-imx8mq/spl.c
@@ -11,6 +11,7 @@
 #include <asm/arch/ddr.h>
 #include <asm/arch/imx8mq_pins.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/mach-imx/gpio.h>
 #include <asm/mach-imx/iomux-v3.h>
diff --git a/board/technexion/tao3530/tao3530.c b/board/technexion/tao3530/tao3530.c
index 84db131de2b8..0c9dca31e67e 100644
--- a/board/technexion/tao3530/tao3530.c
+++ b/board/technexion/tao3530/tao3530.c
@@ -9,6 +9,7 @@
 #include <malloc.h>
 #include <netdev.h>
 #include <twl4030.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/mmc_host_def.h>
 #include <asm/arch/mem.h>
diff --git a/board/technologic/ts4600/ts4600.c b/board/technologic/ts4600/ts4600.c
index 0ef306d58a27..b9cce821d96d 100644
--- a/board/technologic/ts4600/ts4600.c
+++ b/board/technologic/ts4600/ts4600.c
@@ -15,6 +15,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/technologic/ts4800/ts4800.c b/board/technologic/ts4800/ts4800.c
index fe36fb7ffab4..a309e58b27fd 100644
--- a/board/technologic/ts4800/ts4800.c
+++ b/board/technologic/ts4800/ts4800.c
@@ -10,6 +10,7 @@
 #include <init.h>
 #include <log.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/theadorable/theadorable.c b/board/theadorable/theadorable.c
index 67bc00b65b03..3c4133083f54 100644
--- a/board/theadorable/theadorable.c
+++ b/board/theadorable/theadorable.c
@@ -13,6 +13,7 @@
 #if !defined(CONFIG_SPL_BUILD)
 #include <bootcount.h>
 #endif
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
diff --git a/board/ti/am335x/board.c b/board/ti/am335x/board.c
index 984cc5e3ba52..211a9bf74467 100644
--- a/board/ti/am335x/board.c
+++ b/board/ti/am335x/board.c
@@ -27,6 +27,7 @@
 #include <asm/arch/mmc_host_def.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/mem.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/emif.h>
 #include <asm/gpio.h>
diff --git a/board/ti/am3517crane/am3517crane.c b/board/ti/am3517crane/am3517crane.c
index f32d1757db79..b1017d6c9b76 100644
--- a/board/ti/am3517crane/am3517crane.c
+++ b/board/ti/am3517crane/am3517crane.c
@@ -11,6 +11,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/mmc_host_def.h>
 #include <asm/arch/mem.h>
diff --git a/board/ti/am43xx/board.c b/board/ti/am43xx/board.c
index de4959003151..8f5bf3581f48 100644
--- a/board/ti/am43xx/board.c
+++ b/board/ti/am43xx/board.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <eeprom.h>
 #include <image.h>
+#include <asm/global_data.h>
 #include <dm/uclass.h>
 #include <env.h>
 #include <fdt_support.h>
diff --git a/board/ti/am57xx/board.c b/board/ti/am57xx/board.c
index 69dce70a6011..be09d719cbe3 100644
--- a/board/ti/am57xx/board.c
+++ b/board/ti/am57xx/board.c
@@ -19,6 +19,7 @@
 #include <serial.h>
 #include <usb.h>
 #include <errno.h>
+#include <asm/global_data.h>
 #include <asm/omap_common.h>
 #include <asm/omap_sec_common.h>
 #include <asm/emif.h>
diff --git a/board/ti/am65x/evm.c b/board/ti/am65x/evm.c
index 36063b11383d..3d44c70fe42d 100644
--- a/board/ti/am65x/evm.c
+++ b/board/ti/am65x/evm.c
@@ -15,6 +15,7 @@
 #include <net.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/hardware.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <asm/omap_common.h>
diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c
index 6bd59eb10c2e..888a95849190 100644
--- a/board/ti/beagle/beagle.c
+++ b/board/ti/beagle/beagle.c
@@ -24,6 +24,7 @@
 #include <status_led.h>
 #endif
 #include <twl4030.h>
+#include <asm/global_data.h>
 #include <linux/mtd/rawnand.h>
 #include <asm/io.h>
 #include <asm/arch/mmc_host_def.h>
diff --git a/board/ti/dra7xx/evm.c b/board/ti/dra7xx/evm.c
index 5ae179f69b98..851471cd1304 100644
--- a/board/ti/dra7xx/evm.c
+++ b/board/ti/dra7xx/evm.c
@@ -19,6 +19,7 @@
 #include <palmas.h>
 #include <sata.h>
 #include <serial.h>
+#include <asm/global_data.h>
 #include <linux/string.h>
 #include <asm/gpio.h>
 #include <usb.h>
diff --git a/board/ti/evm/evm.c b/board/ti/evm/evm.c
index ecbd843676a7..96434b3ba0f4 100644
--- a/board/ti/evm/evm.c
+++ b/board/ti/evm/evm.c
@@ -17,6 +17,7 @@
 #include <net.h>
 #include <ns16550.h>
 #include <serial.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/mem.h>
 #include <asm/arch/mux.h>
diff --git a/board/ti/j721e/evm.c b/board/ti/j721e/evm.c
index ebaa6faa931e..a6983da5b5cf 100644
--- a/board/ti/j721e/evm.c
+++ b/board/ti/j721e/evm.c
@@ -16,6 +16,7 @@
 #include <net.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/hardware.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <spl.h>
diff --git a/board/ti/ks2_evm/board.c b/board/ti/ks2_evm/board.c
index c7be54002899..9e5f08e33720 100644
--- a/board/ti/ks2_evm/board.c
+++ b/board/ti/ks2_evm/board.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <asm/global_data.h>
 #include "board.h"
 #include <env.h>
 #include <hang.h>
diff --git a/board/ti/omap5_uevm/evm.c b/board/ti/omap5_uevm/evm.c
index 88f56edc54ed..4777622156b8 100644
--- a/board/ti/omap5_uevm/evm.c
+++ b/board/ti/omap5_uevm/evm.c
@@ -15,6 +15,7 @@
 #include <serial.h>
 #include <tca642x.h>
 #include <usb.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/usb/gadget.h>
 #include <dwc3-uboot.h>
diff --git a/board/ti/panda/panda.c b/board/ti/panda/panda.c
index f718e69e85dc..fda8d5f3c838 100644
--- a/board/ti/panda/panda.c
+++ b/board/ti/panda/panda.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <net.h>
 #include <serial.h>
+#include <asm/global_data.h>
 #include <asm/mach-types.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/mmc_host_def.h>
diff --git a/board/ti/sdp4430/sdp.c b/board/ti/sdp4430/sdp.c
index 3fd973049a87..4895bfafd80a 100644
--- a/board/ti/sdp4430/sdp.c
+++ b/board/ti/sdp4430/sdp.c
@@ -12,6 +12,7 @@
 #include <serial.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/mmc_host_def.h>
+#include <asm/global_data.h>
 
 #include "sdp4430_mux_data.h"
 
diff --git a/board/ti/ti816x/evm.c b/board/ti/ti816x/evm.c
index becece1c2057..2d42af6b809d 100644
--- a/board/ti/ti816x/evm.c
+++ b/board/ti/ti816x/evm.c
@@ -12,6 +12,7 @@
 #include <net.h>
 #include <spl.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/cpu.h>
diff --git a/board/timll/devkit3250/devkit3250.c b/board/timll/devkit3250/devkit3250.c
index f4eaf15970bb..3c744b943f40 100644
--- a/board/timll/devkit3250/devkit3250.c
+++ b/board/timll/devkit3250/devkit3250.c
@@ -12,6 +12,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/emc.h>
 #include <asm/arch/wdt.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/delay.h>
 
diff --git a/board/timll/devkit8000/devkit8000.c b/board/timll/devkit8000/devkit8000.c
index 2420c28974c7..5af883180627 100644
--- a/board/timll/devkit8000/devkit8000.c
+++ b/board/timll/devkit8000/devkit8000.c
@@ -22,6 +22,7 @@
 #include <malloc.h>
 #include <ns16550.h>
 #include <twl4030.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/mmc_host_def.h>
 #include <asm/arch/mux.h>
diff --git a/board/toradex/apalis-imx8/apalis-imx8.c b/board/toradex/apalis-imx8/apalis-imx8.c
index 9263b0f51fa7..6e8594a64725 100644
--- a/board/toradex/apalis-imx8/apalis-imx8.c
+++ b/board/toradex/apalis-imx8/apalis-imx8.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <init.h>
+#include <asm/global_data.h>
 
 #include <asm/arch/clock.h>
 #include <asm/arch/imx8-pins.h>
diff --git a/board/toradex/apalis_imx6/apalis_imx6.c b/board/toradex/apalis_imx6/apalis_imx6.c
index 3961c4df9e24..17f6094687b7 100644
--- a/board/toradex/apalis_imx6/apalis_imx6.c
+++ b/board/toradex/apalis_imx6/apalis_imx6.c
@@ -12,6 +12,7 @@
 #include <image.h>
 #include <init.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 
diff --git a/board/toradex/apalis_t30/apalis_t30.c b/board/toradex/apalis_t30/apalis_t30.c
index f718dc855d4d..0396eea56b55 100644
--- a/board/toradex/apalis_t30/apalis_t30.c
+++ b/board/toradex/apalis_t30/apalis_t30.c
@@ -11,6 +11,7 @@
 #include <asm/arch/pinmux.h>
 #include <asm/arch-tegra/ap.h>
 #include <asm/arch-tegra/tegra.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <dm.h>
diff --git a/board/toradex/colibri-imx6ull/colibri-imx6ull.c b/board/toradex/colibri-imx6ull/colibri-imx6ull.c
index 89b99a0b7402..818a29f22be2 100644
--- a/board/toradex/colibri-imx6ull/colibri-imx6ull.c
+++ b/board/toradex/colibri-imx6ull/colibri-imx6ull.c
@@ -4,6 +4,7 @@
  */
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 
 #include <asm/arch/clock.h>
diff --git a/board/toradex/colibri-imx8x/colibri-imx8x.c b/board/toradex/colibri-imx8x/colibri-imx8x.c
index f981c11a37cb..9531ec64a5da 100644
--- a/board/toradex/colibri-imx8x/colibri-imx8x.c
+++ b/board/toradex/colibri-imx8x/colibri-imx8x.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <init.h>
+#include <asm/global_data.h>
 
 #include <asm/arch/clock.h>
 #include <asm/arch/imx8-pins.h>
diff --git a/board/toradex/colibri_imx6/colibri_imx6.c b/board/toradex/colibri_imx6/colibri_imx6.c
index a416b5e54b37..64a8406ec77c 100644
--- a/board/toradex/colibri_imx6/colibri_imx6.c
+++ b/board/toradex/colibri_imx6/colibri_imx6.c
@@ -12,6 +12,7 @@
 #include <env.h>
 #include <init.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 
diff --git a/board/toradex/colibri_imx7/colibri_imx7.c b/board/toradex/colibri_imx7/colibri_imx7.c
index 14df3fc42cfc..75babe1ea5fc 100644
--- a/board/toradex/colibri_imx7/colibri_imx7.c
+++ b/board/toradex/colibri_imx7/colibri_imx7.c
@@ -12,6 +12,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/mx7-pins.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/io.h>
diff --git a/board/toradex/colibri_pxa270/colibri_pxa270.c b/board/toradex/colibri_pxa270/colibri_pxa270.c
index 273a17f608d5..bc7a79f0b341 100644
--- a/board/toradex/colibri_pxa270/colibri_pxa270.c
+++ b/board/toradex/colibri_pxa270/colibri_pxa270.c
@@ -15,6 +15,7 @@
 #include <asm/arch/pxa.h>
 #include <asm/arch/regs-mmc.h>
 #include <asm/arch/regs-uart.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm/platdata.h>
 #include <dm/platform_data/pxa_mmc_gen.h>
diff --git a/board/toradex/colibri_t20/colibri_t20.c b/board/toradex/colibri_t20/colibri_t20.c
index f44ca90ce96e..73ef4d2db32c 100644
--- a/board/toradex/colibri_t20/colibri_t20.c
+++ b/board/toradex/colibri_t20/colibri_t20.c
@@ -12,6 +12,7 @@
 #include <asm/arch-tegra/ap.h>
 #include <asm/arch-tegra/board.h>
 #include <asm/arch-tegra/tegra.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <i2c.h>
diff --git a/board/toradex/colibri_vf/colibri_vf.c b/board/toradex/colibri_vf/colibri_vf.c
index 7194ede01cbe..e9c5bc063223 100644
--- a/board/toradex/colibri_vf/colibri_vf.c
+++ b/board/toradex/colibri_vf/colibri_vf.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 
 #include <asm/arch/clock.h>
 #include <asm/arch/crm_regs.h>
diff --git a/board/toradex/common/tdx-cfg-block.c b/board/toradex/common/tdx-cfg-block.c
index bf27b2fa66a0..ab561237e6f7 100644
--- a/board/toradex/common/tdx-cfg-block.c
+++ b/board/toradex/common/tdx-cfg-block.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <asm/global_data.h>
 #include "tdx-cfg-block.h"
 #include "tdx-eeprom.h"
 
diff --git a/board/toradex/verdin-imx8mm/spl.c b/board/toradex/verdin-imx8mm/spl.c
index cc78c5666bba..588da0aeba6b 100644
--- a/board/toradex/verdin-imx8mm/spl.c
+++ b/board/toradex/verdin-imx8mm/spl.c
@@ -12,6 +12,7 @@
 #include <asm/arch/ddr.h>
 #include <asm/arch/imx8mm_pins.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/mach-imx/boot_mode.h>
 #include <asm/mach-imx/iomux-v3.h>
diff --git a/board/toradex/verdin-imx8mm/verdin-imx8mm.c b/board/toradex/verdin-imx8mm/verdin-imx8mm.c
index 66950ed218b0..1161b5c31d9c 100644
--- a/board/toradex/verdin-imx8mm/verdin-imx8mm.c
+++ b/board/toradex/verdin-imx8mm/verdin-imx8mm.c
@@ -7,6 +7,7 @@
 #include <init.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <miiphy.h>
 #include <netdev.h>
diff --git a/board/tqc/tqm834x/tqm834x.c b/board/tqc/tqm834x/tqm834x.c
index c16784324c92..17b4662c167f 100644
--- a/board/tqc/tqm834x/tqm834x.c
+++ b/board/tqc/tqm834x/tqm834x.c
@@ -10,6 +10,7 @@
 #include <ioports.h>
 #include <log.h>
 #include <mpc83xx.h>
+#include <asm/global_data.h>
 #include <asm/mpc8349_pci.h>
 #include <i2c.h>
 #include <miiphy.h>
diff --git a/board/tqc/tqma6/tqma6.c b/board/tqc/tqma6/tqma6.c
index 2df901a584cb..26d557cece94 100644
--- a/board/tqc/tqma6/tqma6.c
+++ b/board/tqc/tqma6/tqma6.c
@@ -15,6 +15,7 @@
 #include <asm/arch/sys_proto.h>
 #include <env.h>
 #include <fdt_support.h>
+#include <asm/global_data.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
diff --git a/board/udoo/neo/neo.c b/board/udoo/neo/neo.c
index c6edc724405e..653ca1ca5a62 100644
--- a/board/udoo/neo/neo.c
+++ b/board/udoo/neo/neo.c
@@ -15,6 +15,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/mx6-pins.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/mach-imx/iomux-v3.h>
 #include <env.h>
diff --git a/board/udoo/udoo.c b/board/udoo/udoo.c
index 62b32ae7595c..d83f23dd3581 100644
--- a/board/udoo/udoo.c
+++ b/board/udoo/udoo.c
@@ -13,6 +13,7 @@
 #include <env.h>
 #include <malloc.h>
 #include <asm/arch/mx6-pins.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
diff --git a/board/variscite/dart_6ul/dart_6ul.c b/board/variscite/dart_6ul/dart_6ul.c
index d8e383d323e8..1c52cfd882ec 100644
--- a/board/variscite/dart_6ul/dart_6ul.c
+++ b/board/variscite/dart_6ul/dart_6ul.c
@@ -10,6 +10,7 @@
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/mx6-pins.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/mach-imx/mxc_i2c.h>
 #include <fsl_esdhc_imx.h>
diff --git a/board/varisys/cyrus/ddr.c b/board/varisys/cyrus/ddr.c
index 7949eb88c07b..184948094db0 100644
--- a/board/varisys/cyrus/ddr.c
+++ b/board/varisys/cyrus/ddr.c
@@ -8,6 +8,7 @@
 #include <hwconfig.h>
 #include <init.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/mmu.h>
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
diff --git a/board/ve8313/ve8313.c b/board/ve8313/ve8313.c
index 6cdb11047165..78d401e955eb 100644
--- a/board/ve8313/ve8313.c
+++ b/board/ve8313/ve8313.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <fdt_support.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 #include <pci.h>
diff --git a/board/vscom/baltos/board.c b/board/vscom/baltos/board.c
index afe12466df31..4175d414694b 100644
--- a/board/vscom/baltos/board.c
+++ b/board/vscom/baltos/board.c
@@ -13,6 +13,7 @@
 #include <init.h>
 #include <net.h>
 #include <serial.h>
+#include <asm/global_data.h>
 #include <linux/libfdt.h>
 #include <spl.h>
 #include <asm/arch/cpu.h>
diff --git a/board/wandboard/wandboard.c b/board/wandboard/wandboard.c
index e0e01b1a4a43..53299c87010a 100644
--- a/board/wandboard/wandboard.c
+++ b/board/wandboard/wandboard.c
@@ -17,6 +17,7 @@
 #include <asm/arch/mx6-pins.h>
 #include <asm/arch/mxc_hdmi.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/mach-imx/mxc_i2c.h>
diff --git a/board/warp/warp.c b/board/warp/warp.c
index 85da9c1bd435..0f1d038fabdf 100644
--- a/board/warp/warp.c
+++ b/board/warp/warp.c
@@ -13,6 +13,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/mx6-pins.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/mach-imx/mxc_i2c.h>
diff --git a/board/warp7/warp7.c b/board/warp7/warp7.c
index aaa7006d3b2d..0f202241dd78 100644
--- a/board/warp7/warp7.c
+++ b/board/warp7/warp7.c
@@ -10,6 +10,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/mx7-pins.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/mach-imx/hab.h>
 #include <asm/mach-imx/iomux-v3.h>
diff --git a/board/work-microwave/work_92105/work_92105.c b/board/work-microwave/work_92105/work_92105.c
index 2e0def5b64f0..bdcecff7308f 100644
--- a/board/work-microwave/work_92105/work_92105.c
+++ b/board/work-microwave/work_92105/work_92105.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/cpu.h>
diff --git a/board/xes/xpedite517x/xpedite517x.c b/board/xes/xpedite517x/xpedite517x.c
index 2c9499ab20b3..8a5b52c49527 100644
--- a/board/xes/xpedite517x/xpedite517x.c
+++ b/board/xes/xpedite517x/xpedite517x.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/processor.h>
 #include <fsl_ddr_sdram.h>
 #include <asm/mmu.h>
diff --git a/board/xilinx/common/board.c b/board/xilinx/common/board.c
index 0469e2e7ac9b..458eef45adfb 100644
--- a/board/xilinx/common/board.c
+++ b/board/xilinx/common/board.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <env.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/sections.h>
 #include <dm/uclass.h>
 #include <i2c.h>
diff --git a/board/xilinx/microblaze-generic/microblaze-generic.c b/board/xilinx/microblaze-generic/microblaze-generic.c
index 4e569e910d90..7729ce915ea3 100644
--- a/board/xilinx/microblaze-generic/microblaze-generic.c
+++ b/board/xilinx/microblaze-generic/microblaze-generic.c
@@ -15,6 +15,7 @@
 #include <env.h>
 #include <init.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <dm/lists.h>
 #include <fdtdec.h>
 #include <linux/sizes.h>
diff --git a/board/xilinx/versal/board.c b/board/xilinx/versal/board.c
index 45cf1d2d0cad..55da0df75c43 100644
--- a/board/xilinx/versal/board.c
+++ b/board/xilinx/versal/board.c
@@ -13,6 +13,7 @@
 #include <malloc.h>
 #include <time.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/sys_proto.h>
diff --git a/board/xilinx/zynq/board.c b/board/xilinx/zynq/board.c
index 2164eac8d518..09e4184e1728 100644
--- a/board/xilinx/zynq/board.c
+++ b/board/xilinx/zynq/board.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <dm/uclass.h>
 #include <env.h>
 #include <fdtdec.h>
diff --git a/board/xilinx/zynq/bootimg.c b/board/xilinx/zynq/bootimg.c
index 481f012c282d..2f55078dd768 100644
--- a/board/xilinx/zynq/bootimg.c
+++ b/board/xilinx/zynq/bootimg.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <log.h>
 #include <part.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/sys_proto.h>
diff --git a/board/xilinx/zynq/cmds.c b/board/xilinx/zynq/cmds.c
index 73e2b0eac7e5..6c697caa625b 100644
--- a/board/xilinx/zynq/cmds.c
+++ b/board/xilinx/zynq/cmds.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <command.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.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 ebb71729081d..a64174a915c9 100644
--- a/board/xilinx/zynqmp/zynqmp.c
+++ b/board/xilinx/zynqmp/zynqmp.c
@@ -22,6 +22,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/psu_init_gpl.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/ptrace.h>
 #include <dm/device.h>
diff --git a/board/zyxel/nsa310s/nsa310s.c b/board/zyxel/nsa310s/nsa310s.c
index 3f71e3da4461..cd4a7723b120 100644
--- a/board/zyxel/nsa310s/nsa310s.c
+++ b/board/zyxel/nsa310s/nsa310s.c
@@ -12,6 +12,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
 #include <asm/arch/mpp.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include "nsa310s.h"
 
diff --git a/cmd/acpi.c b/cmd/acpi.c
index 085a3a650d1a..126d6d3bc991 100644
--- a/cmd/acpi.c
+++ b/cmd/acpi.c
@@ -8,6 +8,7 @@
 #include <mapmem.h>
 #include <acpi/acpi_table.h>
 #include <asm/acpi_table.h>
+#include <asm/global_data.h>
 #include <dm/acpi.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/cmd/bdinfo.c b/cmd/bdinfo.c
index 9593b345a3d7..a940cac7eafd 100644
--- a/cmd/bdinfo.c
+++ b/cmd/bdinfo.c
@@ -13,6 +13,7 @@
 #include <net.h>
 #include <vsprintf.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/cmd/bedbug.c b/cmd/bedbug.c
index 81ce2564805d..6dc3bab74da3 100644
--- a/cmd/bedbug.c
+++ b/cmd/bedbug.c
@@ -6,6 +6,7 @@
 #include <cli.h>
 #include <command.h>
 #include <console.h>
+#include <asm/global_data.h>
 #include <asm/ptrace.h>
 #include <linux/ctype.h>
 #include <net.h>
diff --git a/cmd/bootefi.c b/cmd/bootefi.c
index fbfed54e8571..9808049548db 100644
--- a/cmd/bootefi.c
+++ b/cmd/bootefi.c
@@ -18,6 +18,7 @@
 #include <image.h>
 #include <log.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <linux/libfdt.h>
 #include <linux/libfdt_env.h>
 #include <mapmem.h>
diff --git a/cmd/booti.c b/cmd/booti.c
index 76d1255ec584..3df70ea9caaf 100644
--- a/cmd/booti.c
+++ b/cmd/booti.c
@@ -12,6 +12,7 @@
 #include <lmb.h>
 #include <log.h>
 #include <mapmem.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 e6b0e04413cd..7732b97f635d 100644
--- a/cmd/bootm.c
+++ b/cmd/bootm.c
@@ -16,6 +16,7 @@
 #include <malloc.h>
 #include <nand.h>
 #include <asm/byteorder.h>
+#include <asm/global_data.h>
 #include <linux/ctype.h>
 #include <linux/err.h>
 #include <u-boot/zlib.h>
diff --git a/cmd/date.c b/cmd/date.c
index 75a032cd2777..0e1189475313 100644
--- a/cmd/date.c
+++ b/cmd/date.c
@@ -12,6 +12,7 @@
 #include <dm.h>
 #include <rtc.h>
 #include <i2c.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/cmd/efi.c b/cmd/efi.c
index b3a3bf828215..1c0e62e4a330 100644
--- a/cmd/efi.c
+++ b/cmd/efi.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <sort.h>
+#include <asm/global_data.h>
 
 static const char *const type_name[] = {
 	"reserved",
diff --git a/cmd/load.c b/cmd/load.c
index 63a94145430a..4bd463c3a7cb 100644
--- a/cmd/load.c
+++ b/cmd/load.c
@@ -20,6 +20,7 @@
 #include <serial.h>
 #include <xyzModem.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/cmd/log.c b/cmd/log.c
index 6afe6ead251b..ccefb0cbb8cf 100644
--- a/cmd/log.c
+++ b/cmd/log.c
@@ -8,6 +8,7 @@
 #include <command.h>
 #include <dm.h>
 #include <log.h>
+#include <asm/global_data.h>
 
 static char log_fmt_chars[LOGF_COUNT] = "clFLfm";
 
diff --git a/cmd/mem.c b/cmd/mem.c
index 190e2b94a7d4..79757be9b60d 100644
--- a/cmd/mem.c
+++ b/cmd/mem.c
@@ -22,6 +22,7 @@
 #include <mapmem.h>
 #include <rand.h>
 #include <watchdog.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/compiler.h>
diff --git a/cmd/mtdparts.c b/cmd/mtdparts.c
index 5220142b9ab2..ed373a8c4dad 100644
--- a/cmd/mtdparts.c
+++ b/cmd/mtdparts.c
@@ -75,6 +75,7 @@
 #include <env.h>
 #include <log.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <jffs2/load_kernel.h>
 #include <linux/list.h>
 #include <linux/ctype.h>
diff --git a/cmd/nvedit.c b/cmd/nvedit.c
index d188c6aa6b73..91fa73fa322c 100644
--- a/cmd/nvedit.c
+++ b/cmd/nvedit.c
@@ -35,6 +35,7 @@
 #include <errno.h>
 #include <malloc.h>
 #include <mapmem.h>
+#include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <u-boot/crc.h>
 #include <watchdog.h>
diff --git a/cmd/pxe_utils.h b/cmd/pxe_utils.h
index 77d25888758f..b5a7d2780116 100644
--- a/cmd/pxe_utils.h
+++ b/cmd/pxe_utils.h
@@ -3,6 +3,8 @@
 #ifndef __PXE_UTILS_H
 #define __PXE_UTILS_H
 
+#include <linux/list.h>
+
 /*
  * A note on the pxe file parser.
  *
diff --git a/cmd/sb.c b/cmd/sb.c
index f7eb921f43e9..0d55818e3c67 100644
--- a/cmd/sb.c
+++ b/cmd/sb.c
@@ -8,6 +8,7 @@
 #include <command.h>
 #include <dm.h>
 #include <spl.h>
+#include <asm/global_data.h>
 #include <asm/state.h>
 
 static int do_sb_handoff(struct cmd_tbl *cmdtp, int flag, int argc,
diff --git a/cmd/sound.c b/cmd/sound.c
index 7fc19678ea8f..fdcde3653390 100644
--- a/cmd/sound.c
+++ b/cmd/sound.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <fdtdec.h>
 #include <sound.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/cmd/spl.c b/cmd/spl.c
index 28b40dd31e10..472703f8fe15 100644
--- a/cmd/spl.c
+++ b/cmd/spl.c
@@ -10,6 +10,7 @@
 #include <env.h>
 #include <image.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <linux/libfdt.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/cmd/ti/ddr3.c b/cmd/ti/ddr3.c
index 623b63b0f94c..6b43a7386832 100644
--- a/cmd/ti/ddr3.c
+++ b/cmd/ti/ddr3.c
@@ -14,6 +14,7 @@
 #include <asm/emif.h>
 #include <common.h>
 #include <command.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/cmd/tlv_eeprom.c b/cmd/tlv_eeprom.c
index eab0531c96b9..5099cbdd95ee 100644
--- a/cmd/tlv_eeprom.c
+++ b/cmd/tlv_eeprom.c
@@ -17,6 +17,7 @@
 #include <env.h>
 #include <init.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <linux/ctype.h>
 #include <u-boot/crc.h>
 
diff --git a/cmd/x86/fsp.c b/cmd/x86/fsp.c
index 8017eda387c2..82e4415b16eb 100644
--- a/cmd/x86/fsp.c
+++ b/cmd/x86/fsp.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <command.h>
 #include <asm/fsp/fsp_support.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/cmd/x86/hob.c b/cmd/x86/hob.c
index 6b1f7bda5b82..1b8dfa99f7b1 100644
--- a/cmd/x86/hob.c
+++ b/cmd/x86/hob.c
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <efi.h>
 #include <uuid.h>
+#include <asm/global_data.h>
 #include <asm/hob.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/common/autoboot.c b/common/autoboot.c
index 6d78716a266a..4341f5f0bb02 100644
--- a/common/autoboot.c
+++ b/common/autoboot.c
@@ -19,6 +19,7 @@
 #include <menu.h>
 #include <post.h>
 #include <time.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 #include <u-boot/sha256.h>
 #include <bootcount.h>
diff --git a/common/bloblist.c b/common/bloblist.c
index 99501951e0c0..e3c2b5fa898b 100644
--- a/common/bloblist.c
+++ b/common/bloblist.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <mapmem.h>
 #include <spl.h>
+#include <asm/global_data.h>
 #include <u-boot/crc.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/common/board_f.c b/common/board_f.c
index 3932e0c69dd1..85e147a60ee3 100644
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -49,6 +49,7 @@
 #if defined(CONFIG_MP) && defined(CONFIG_PPC)
 #include <asm/mp.h>
 #endif
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/sections.h>
 #include <dm/root.h>
diff --git a/common/board_info.c b/common/board_info.c
index a6db087f9604..b54aa30a9442 100644
--- a/common/board_info.c
+++ b/common/board_info.c
@@ -2,6 +2,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <linux/libfdt.h>
 #include <linux/compiler.h>
 
diff --git a/common/board_r.c b/common/board_r.c
index 9b2fec701a55..996cfa75eae6 100644
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -21,6 +21,7 @@
 #include <log.h>
 #include <net.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <u-boot/crc.h>
 /* TODO: can we just include all these headers whether needed or not? */
 #if defined(CONFIG_CMD_BEDBUG)
diff --git a/common/bootm.c b/common/bootm.c
index 247b600d9c66..157b0cbc7e86 100644
--- a/common/bootm.c
+++ b/common/bootm.c
@@ -18,6 +18,7 @@
 #include <mapmem.h>
 #include <net.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #if defined(CONFIG_CMD_USB)
 #include <usb.h>
diff --git a/common/bootm_os.c b/common/bootm_os.c
index e9aaddf3e615..0b6325db6605 100644
--- a/common/bootm_os.c
+++ b/common/bootm_os.c
@@ -14,6 +14,7 @@
 #include <image.h>
 #include <lmb.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <linux/libfdt.h>
 #include <malloc.h>
 #include <mapmem.h>
diff --git a/common/bootstage.c b/common/bootstage.c
index 5f87358fd854..d5b78b9f4872 100644
--- a/common/bootstage.c
+++ b/common/bootstage.c
@@ -16,6 +16,7 @@
 #include <malloc.h>
 #include <sort.h>
 #include <spl.h>
+#include <asm/global_data.h>
 #include <linux/compiler.h>
 #include <linux/libfdt.h>
 
diff --git a/common/cli.c b/common/cli.c
index 6635ab2bcf85..048eacb9ef97 100644
--- a/common/cli.c
+++ b/common/cli.c
@@ -18,6 +18,7 @@
 #include <fdtdec.h>
 #include <hang.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/common/cli_hush.c b/common/cli_hush.c
index 5b1f11907438..3fbe918ebade 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 <asm/global_data.h>
 #endif
 #ifndef __U_BOOT__
 #include <ctype.h>     /* isalpha, isdigit */
diff --git a/common/cli_readline.c b/common/cli_readline.c
index 1f1e28c6d857..c89bb136b867 100644
--- a/common/cli_readline.c
+++ b/common/cli_readline.c
@@ -14,6 +14,7 @@
 #include <command.h>
 #include <time.h>
 #include <watchdog.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/common/command.c b/common/command.c
index 2c491e20a743..6a87bb54abf6 100644
--- a/common/command.c
+++ b/common/command.c
@@ -14,6 +14,7 @@
 #include <console.h>
 #include <env.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <linux/ctype.h>
 
 /*
diff --git a/common/console.c b/common/console.c
index 8e50af1f9d22..ca23d9bc05ec 100644
--- a/common/console.c
+++ b/common/console.c
@@ -19,6 +19,7 @@
 #include <exports.h>
 #include <env_internal.h>
 #include <watchdog.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/common/dlmalloc.c b/common/dlmalloc.c
index b29a7cfd93d3..cf0270a9c115 100644
--- a/common/dlmalloc.c
+++ b/common/dlmalloc.c
@@ -1,5 +1,6 @@
 #include <common.h>
 #include <log.h>
+#include <asm/global_data.h>
 
 #if CONFIG_IS_ENABLED(UNIT_TEST)
 #define DEBUG
diff --git a/common/exports.c b/common/exports.c
index 6253b55694bf..eea47ededd49 100644
--- a/common/exports.c
+++ b/common/exports.c
@@ -4,6 +4,7 @@
 #include <malloc.h>
 #include <spi.h>
 #include <i2c.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/common/hash.c b/common/hash.c
index 05238a8ba91e..fc64002f736a 100644
--- a/common/hash.c
+++ b/common/hash.c
@@ -18,6 +18,7 @@
 #include <mapmem.h>
 #include <hw_sha.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <u-boot/crc.h>
diff --git a/common/hwconfig.c b/common/hwconfig.c
index daf3eea5f968..26a561c365b7 100644
--- a/common/hwconfig.c
+++ b/common/hwconfig.c
@@ -15,6 +15,7 @@
 #include <exports.h>
 #include <hwconfig.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <linux/types.h>
 #include <linux/string.h>
 #else
diff --git a/common/image-android.c b/common/image-android.c
index 18f7c8db03ba..d07b0e0f09b4 100644
--- a/common/image-android.c
+++ b/common/image-android.c
@@ -12,6 +12,7 @@
 #include <errno.h>
 #include <asm/unaligned.h>
 #include <mapmem.h>
+#include <linux/libfdt.h>
 
 #define ANDROID_IMAGE_DEFAULT_KERNEL_ADDR	0x10008000
 
diff --git a/common/image-cipher.c b/common/image-cipher.c
index 09869f784644..09d8512f8e59 100644
--- a/common/image-cipher.c
+++ b/common/image-cipher.c
@@ -9,6 +9,7 @@
 #else
 #include <common.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 DECLARE_GLOBAL_DATA_PTR;
 #endif /* !USE_HOSdTCC*/
 #include <image.h>
diff --git a/common/image-fdt.c b/common/image-fdt.c
index f13eefb061ea..cb7b7c3ef2c3 100644
--- a/common/image-fdt.c
+++ b/common/image-fdt.c
@@ -17,6 +17,7 @@
 #include <lmb.h>
 #include <log.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <linux/libfdt.h>
 #include <mapmem.h>
 #include <asm/io.h>
diff --git a/common/image-fit-sig.c b/common/image-fit-sig.c
index cc1967109ead..11fbdb0fb4f3 100644
--- a/common/image-fit-sig.c
+++ b/common/image-fit-sig.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <log.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 DECLARE_GLOBAL_DATA_PTR;
 #endif /* !USE_HOSTCC*/
 #include <fdt_region.h>
diff --git a/common/image-fit.c b/common/image-fit.c
index d54eff9033cc..973a37969f68 100644
--- a/common/image-fit.c
+++ b/common/image-fit.c
@@ -22,6 +22,7 @@
 #include <mapmem.h>
 #include <asm/io.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 DECLARE_GLOBAL_DATA_PTR;
 #endif /* !USE_HOSTCC*/
 
diff --git a/common/image-sig.c b/common/image-sig.c
index f3c209ae8b72..4abd3c080f78 100644
--- a/common/image-sig.c
+++ b/common/image-sig.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <log.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 DECLARE_GLOBAL_DATA_PTR;
 #endif /* !USE_HOSTCC*/
 #include <image.h>
diff --git a/common/image.c b/common/image.c
index 9d7d5c17d122..24dd06bf5530 100644
--- a/common/image.c
+++ b/common/image.c
@@ -36,6 +36,7 @@
 #include <xilinx.h>
 #endif
 
+#include <asm/global_data.h>
 #include <u-boot/md5.h>
 #include <u-boot/sha1.h>
 #include <linux/errno.h>
diff --git a/common/init/board_init.c b/common/init/board_init.c
index 8c8a5eac0571..3f183ee11326 100644
--- a/common/init/board_init.c
+++ b/common/init/board_init.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <bootstage.h>
 #include <init.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/common/init/handoff.c b/common/init/handoff.c
index e00b43e6a7bc..0e7470ad78e1 100644
--- a/common/init/handoff.c
+++ b/common/init/handoff.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <handoff.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/common/iotrace.c b/common/iotrace.c
index 7225ee440418..63d0cca3a004 100644
--- a/common/iotrace.c
+++ b/common/iotrace.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <mapmem.h>
 #include <time.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/bug.h>
 #include <u-boot/crc.h>
diff --git a/common/lcd.c b/common/lcd.c
index 02f2db3a99e5..ab5614ad0e3d 100644
--- a/common/lcd.c
+++ b/common/lcd.c
@@ -15,6 +15,7 @@
 #include <log.h>
 #include <asm/cache.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <linux/types.h>
 #include <stdio_dev.h>
 #include <lcd.h>
diff --git a/common/lcd_simplefb.c b/common/lcd_simplefb.c
index fca600691e9a..6dd7972f7093 100644
--- a/common/lcd_simplefb.c
+++ b/common/lcd_simplefb.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <lcd.h>
 #include <fdt_support.h>
+#include <asm/global_data.h>
 #include <linux/libfdt.h>
 #include <video.h>
 
diff --git a/common/log.c b/common/log.c
index 734d26de4af3..f40513dc5322 100644
--- a/common/log.c
+++ b/common/log.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <log.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <dm/uclass.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/common/log_console.c b/common/log_console.c
index bb3f8464b986..357dff29168f 100644
--- a/common/log_console.c
+++ b/common/log_console.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/common/log_syslog.c b/common/log_syslog.c
index 149ff5af310a..2477a6995d3e 100644
--- a/common/log_syslog.c
+++ b/common/log_syslog.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <log.h>
 #include <net.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/common/malloc_simple.c b/common/malloc_simple.c
index 34f0b4909387..0267fb6bec87 100644
--- a/common/malloc_simple.c
+++ b/common/malloc_simple.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <mapmem.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/common/memsize.c b/common/memsize.c
index e95c68265ab9..d5d13d51bf1f 100644
--- a/common/memsize.c
+++ b/common/memsize.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/common/spl/spl.c b/common/spl/spl.c
index 4840d1d36707..fd050cc63103 100644
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -18,6 +18,7 @@
 #include <log.h>
 #include <serial.h>
 #include <spl.h>
+#include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <nand.h>
 #include <fat.h>
diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c
index 365104fe0288..6a9f6f57e8af 100644
--- a/common/spl/spl_fit.c
+++ b/common/spl/spl_fit.c
@@ -14,6 +14,7 @@
 #include <malloc.h>
 #include <spl.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <linux/libfdt.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/common/spl/spl_opensbi.c b/common/spl/spl_opensbi.c
index 14f335f75f02..90c4a5f9704e 100644
--- a/common/spl/spl_opensbi.c
+++ b/common/spl/spl_opensbi.c
@@ -11,6 +11,7 @@
 #include <hang.h>
 #include <image.h>
 #include <spl.h>
+#include <asm/global_data.h>
 #include <asm/smp.h>
 #include <opensbi.h>
 #include <linux/libfdt.h>
diff --git a/common/spl/spl_spi.c b/common/spl/spl_spi.c
index 2744fb5d520c..6a4e03328709 100644
--- a/common/spl/spl_spi.c
+++ b/common/spl/spl_spi.c
@@ -15,6 +15,7 @@
 #include <spi_flash.h>
 #include <errno.h>
 #include <spl.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/common/splash_source.c b/common/splash_source.c
index f51ca5ddf37c..2737fc6e7ffa 100644
--- a/common/splash_source.c
+++ b/common/splash_source.c
@@ -20,6 +20,7 @@
 #include <spi_flash.h>
 #include <splash.h>
 #include <usb.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/common/stdio.c b/common/stdio.c
index 2119204b9829..1c6ad6861060 100644
--- a/common/stdio.c
+++ b/common/stdio.c
@@ -18,6 +18,7 @@
 #include <stdio_dev.h>
 #include <serial.h>
 #include <splash.h>
+#include <asm/global_data.h>
 
 #if defined(CONFIG_SYS_I2C)
 #include <i2c.h>
diff --git a/disk/part_efi.c b/disk/part_efi.c
index de3491821f08..933df460c7ba 100644
--- a/disk/part_efi.c
+++ b/disk/part_efi.c
@@ -15,6 +15,7 @@
 #include <part.h>
 #include <uuid.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/unaligned.h>
 #include <command.h>
 #include <fdtdec.h>
diff --git a/drivers/ata/libata.c b/drivers/ata/libata.c
index d41200f6c26c..47e2c5c1cc40 100644
--- a/drivers/ata/libata.c
+++ b/drivers/ata/libata.c
@@ -5,6 +5,8 @@
  *		port from the libata of linux kernel
  */
 
+#include <common.h>
+#include <compiler.h>
 #include <libata.h>
 
 u64 ata_id_n_sectors(u16 *id)
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index b2b5c699ad14..9021a00cdb6e 100644
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -38,6 +38,7 @@
 #include <dm.h>
 #include <log.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <dm/device-internal.h>
 #include <dm/lists.h>
 #include <fis.h>
diff --git a/drivers/bios_emulator/atibios.c b/drivers/bios_emulator/atibios.c
index 9c7f14e98f47..6c7cc24cbd92 100644
--- a/drivers/bios_emulator/atibios.c
+++ b/drivers/bios_emulator/atibios.c
@@ -46,6 +46,7 @@
 *		BIOS in u-boot.
 ****************************************************************************/
 #include <common.h>
+#include <compiler.h>
 #include <bios_emul.h>
 #include <errno.h>
 #include <log.h>
diff --git a/drivers/block/sandbox.c b/drivers/block/sandbox.c
index cca2237136a6..11ebdd52d77e 100644
--- a/drivers/block/sandbox.c
+++ b/drivers/block/sandbox.c
@@ -11,6 +11,7 @@
 #include <os.h>
 #include <malloc.h>
 #include <sandboxblockdev.h>
+#include <asm/global_data.h>
 #include <dm/device_compat.h>
 #include <linux/errno.h>
 #include <dm/device-internal.h>
diff --git a/drivers/bootcount/bootcount_ram.c b/drivers/bootcount/bootcount_ram.c
index 078c84d5ecab..8cc30cf40eff 100644
--- a/drivers/bootcount/bootcount_ram.c
+++ b/drivers/bootcount/bootcount_ram.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/cache/cache-v5l2.c b/drivers/cache/cache-v5l2.c
index 51c074bfe233..305a737d3b35 100644
--- a/drivers/cache/cache-v5l2.c
+++ b/drivers/cache/cache-v5l2.c
@@ -9,6 +9,7 @@
 #include <cache.h>
 #include <dm.h>
 #include <hang.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm/ofnode.h>
 #include <linux/bitops.h>
diff --git a/drivers/cache/sandbox_cache.c b/drivers/cache/sandbox_cache.c
index 9050c4cf3406..0fb767e43399 100644
--- a/drivers/cache/sandbox_cache.c
+++ b/drivers/cache/sandbox_cache.c
@@ -7,6 +7,7 @@
 #include <cache.h>
 #include <dm.h>
 #include <errno.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/clk/altera/clk-agilex.c b/drivers/clk/altera/clk-agilex.c
index 9927ada201f0..8254ce68e4d5 100644
--- a/drivers/clk/altera/clk-agilex.c
+++ b/drivers/clk/altera/clk-agilex.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <clk-uclass.h>
 #include <dm.h>
diff --git a/drivers/clk/altera/clk-arria10.c b/drivers/clk/altera/clk-arria10.c
index 732ed4d79b9f..a2f105a415f8 100644
--- a/drivers/clk/altera/clk-arria10.c
+++ b/drivers/clk/altera/clk-arria10.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <clk-uclass.h>
 #include <dm.h>
diff --git a/drivers/clk/aspeed/clk_ast2500.c b/drivers/clk/aspeed/clk_ast2500.c
index ccfeded30c56..d83e6590d6c3 100644
--- a/drivers/clk/aspeed/clk_ast2500.c
+++ b/drivers/clk/aspeed/clk_ast2500.c
@@ -7,6 +7,7 @@
 #include <clk-uclass.h>
 #include <dm.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/scu_ast2500.h>
 #include <dm/lists.h>
diff --git a/drivers/clk/at91/clk-generated.c b/drivers/clk/at91/clk-generated.c
index c0610940c3be..a65cadee3729 100644
--- a/drivers/clk/at91/clk-generated.c
+++ b/drivers/clk/at91/clk-generated.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <log.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <linux/err.h>
 #include <linux/io.h>
 #include <mach/at91_pmc.h>
diff --git a/drivers/clk/at91/clk-h32mx.c b/drivers/clk/at91/clk-h32mx.c
index 86bb71f6128b..b27aeacc7e93 100644
--- a/drivers/clk/at91/clk-h32mx.c
+++ b/drivers/clk/at91/clk-h32mx.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <clk-uclass.h>
 #include <dm.h>
+#include <asm/global_data.h>
 #include <dm/device_compat.h>
 #include <dm/util.h>
 #include <linux/io.h>
diff --git a/drivers/clk/at91/clk-main.c b/drivers/clk/at91/clk-main.c
index b31a1cb68286..c1ca09c21099 100644
--- a/drivers/clk/at91/clk-main.c
+++ b/drivers/clk/at91/clk-main.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <clk-uclass.h>
 #include <dm.h>
+#include <asm/global_data.h>
 #include <linux/io.h>
 #include <mach/at91_pmc.h>
 #include "pmc.h"
diff --git a/drivers/clk/at91/clk-master.c b/drivers/clk/at91/clk-master.c
index e078fab7b415..87a7d1ea8f28 100644
--- a/drivers/clk/at91/clk-master.c
+++ b/drivers/clk/at91/clk-master.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <clk-uclass.h>
 #include <dm.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/clk/at91/clk-plla.c b/drivers/clk/at91/clk-plla.c
index 79d725819fca..4f246afa18ae 100644
--- a/drivers/clk/at91/clk-plla.c
+++ b/drivers/clk/at91/clk-plla.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <clk-uclass.h>
 #include <dm.h>
+#include <asm/global_data.h>
 #include <linux/io.h>
 #include <mach/at91_pmc.h>
 #include "pmc.h"
diff --git a/drivers/clk/at91/clk-usb.c b/drivers/clk/at91/clk-usb.c
index af9d72436933..416a5007f685 100644
--- a/drivers/clk/at91/clk-usb.c
+++ b/drivers/clk/at91/clk-usb.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <clk-uclass.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <dm/device.h>
 #include <linux/err.h>
 #include <linux/io.h>
diff --git a/drivers/clk/at91/pmc.c b/drivers/clk/at91/pmc.c
index 54ae0d281d0a..11859db32654 100644
--- a/drivers/clk/at91/pmc.c
+++ b/drivers/clk/at91/pmc.c
@@ -8,6 +8,7 @@
 #include <clk-uclass.h>
 #include <dm.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <dm/lists.h>
 #include <dm/util.h>
 #include "pmc.h"
diff --git a/drivers/clk/clk-uclass.c b/drivers/clk/clk-uclass.c
index 934cd5787a5c..5d5573962342 100644
--- a/drivers/clk/clk-uclass.c
+++ b/drivers/clk/clk-uclass.c
@@ -14,6 +14,7 @@
 #include <errno.h>
 #include <log.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <dm/devres.h>
 #include <dm/read.h>
 #include <linux/bug.h>
diff --git a/drivers/clk/clk_pic32.c b/drivers/clk/clk_pic32.c
index dc46de2a7cf9..78daf2cbad37 100644
--- a/drivers/clk/clk_pic32.c
+++ b/drivers/clk/clk_pic32.c
@@ -10,6 +10,7 @@
 #include <div64.h>
 #include <time.h>
 #include <wait_bit.h>
+#include <asm/global_data.h>
 #include <dm/lists.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
diff --git a/drivers/clk/clk_stm32mp1.c b/drivers/clk/clk_stm32mp1.c
index c8840b9e5f11..65ffd32d08e0 100644
--- a/drivers/clk/clk_stm32mp1.c
+++ b/drivers/clk/clk_stm32mp1.c
@@ -14,6 +14,7 @@
 #include <syscon.h>
 #include <time.h>
 #include <vsprintf.h>
+#include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/io.h>
 #include <linux/iopoll.h>
diff --git a/drivers/clk/clk_zynq.c b/drivers/clk/clk_zynq.c
index a699a3664c33..b00fe1d13b0e 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 <asm/global_data.h>
 #include <dm/device_compat.h>
 #include <dm/lists.h>
 #include <errno.h>
diff --git a/drivers/clk/mpc83xx_clk.c b/drivers/clk/mpc83xx_clk.c
index 8d96ec767ac6..9ec41d7705a0 100644
--- a/drivers/clk/mpc83xx_clk.c
+++ b/drivers/clk/mpc83xx_clk.c
@@ -11,6 +11,7 @@
 #include <dm.h>
 #include <log.h>
 #include <vsprintf.h>
+#include <asm/global_data.h>
 #include <dm/lists.h>
 #include <dt-bindings/clk/mpc83xx-clk.h>
 #include <asm/arch/soc.h>
diff --git a/drivers/clk/renesas/clk-rcar-gen2.c b/drivers/clk/renesas/clk-rcar-gen2.c
index 16da10c8dd88..b423c9414b2e 100644
--- a/drivers/clk/renesas/clk-rcar-gen2.c
+++ b/drivers/clk/renesas/clk-rcar-gen2.c
@@ -15,6 +15,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 
 #include <dt-bindings/clock/renesas-cpg-mssr.h>
diff --git a/drivers/clk/renesas/clk-rcar-gen3.c b/drivers/clk/renesas/clk-rcar-gen3.c
index 30a101fe8621..3223becd753b 100644
--- a/drivers/clk/renesas/clk-rcar-gen3.c
+++ b/drivers/clk/renesas/clk-rcar-gen3.c
@@ -16,6 +16,7 @@
 #include <errno.h>
 #include <log.h>
 #include <wait_bit.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
 
diff --git a/drivers/clk/rockchip/clk_px30.c b/drivers/clk/rockchip/clk_px30.c
index 71916dbf3b11..0ef449159d92 100644
--- a/drivers/clk/rockchip/clk_px30.c
+++ b/drivers/clk/rockchip/clk_px30.c
@@ -14,6 +14,7 @@
 #include <asm/arch-rockchip/clock.h>
 #include <asm/arch-rockchip/cru_px30.h>
 #include <asm/arch-rockchip/hardware.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm/lists.h>
 #include <dt-bindings/clock/px30-cru.h>
diff --git a/drivers/clk/rockchip/clk_rk3288.c b/drivers/clk/rockchip/clk_rk3288.c
index a1dd642eefe2..be1f646c070e 100644
--- a/drivers/clk/rockchip/clk_rk3288.c
+++ b/drivers/clk/rockchip/clk_rk3288.c
@@ -14,6 +14,7 @@
 #include <malloc.h>
 #include <mapmem.h>
 #include <syscon.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch-rockchip/clock.h>
 #include <asm/arch-rockchip/cru.h>
diff --git a/drivers/clk/rockchip/clk_rk3308.c b/drivers/clk/rockchip/clk_rk3308.c
index d3633b69795f..4a72fe293750 100644
--- a/drivers/clk/rockchip/clk_rk3308.c
+++ b/drivers/clk/rockchip/clk_rk3308.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <syscon.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/cru_rk3308.h>
 #include <asm/arch-rockchip/clock.h>
diff --git a/drivers/clk/rockchip/clk_rv1108.c b/drivers/clk/rockchip/clk_rv1108.c
index aa1d98ca2a29..9e6bb9cd88db 100644
--- a/drivers/clk/rockchip/clk_rv1108.c
+++ b/drivers/clk/rockchip/clk_rv1108.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <syscon.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch-rockchip/clock.h>
 #include <asm/arch-rockchip/cru_rv1108.h>
diff --git a/drivers/core/device-remove.c b/drivers/core/device-remove.c
index efdb0f29058f..360cfa72bc14 100644
--- a/drivers/core/device-remove.c
+++ b/drivers/core/device-remove.c
@@ -12,6 +12,7 @@
 #include <errno.h>
 #include <log.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <dm/device.h>
 #include <dm/device-internal.h>
 #include <dm/uclass.h>
diff --git a/drivers/core/device.c b/drivers/core/device.c
index 355dbd147a9e..c473789edfa9 100644
--- a/drivers/core/device.c
+++ b/drivers/core/device.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <clk.h>
 #include <fdtdec.h>
diff --git a/drivers/core/fdtaddr.c b/drivers/core/fdtaddr.c
index dfcb868f6504..0cb78d64c5ee 100644
--- a/drivers/core/fdtaddr.c
+++ b/drivers/core/fdtaddr.c
@@ -12,6 +12,7 @@
 #include <dm.h>
 #include <fdt_support.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm/device-internal.h>
 
diff --git a/drivers/core/of_access.c b/drivers/core/of_access.c
index 922e78f99b82..c23763726bba 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 <asm/global_data.h>
 #include <linux/bug.h>
 #include <linux/libfdt.h>
 #include <dm/of_access.h>
diff --git a/drivers/core/ofnode.c b/drivers/core/ofnode.c
index c37afa1fe6fc..a49a54c60f98 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 <asm/global_data.h>
 #include <linux/libfdt.h>
 #include <dm/of_access.h>
 #include <dm/of_addr.h>
diff --git a/drivers/core/read.c b/drivers/core/read.c
index 8bb456bc3f01..8a31dc67c9b3 100644
--- a/drivers/core/read.c
+++ b/drivers/core/read.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <asm/global_data.h>
 #include <dm/of_access.h>
 #include <mapmem.h>
 #include <asm/types.h>
diff --git a/drivers/core/regmap.c b/drivers/core/regmap.c
index a67a237b88fa..e3f2affd1cf0 100644
--- a/drivers/core/regmap.c
+++ b/drivers/core/regmap.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <linux/libfdt.h>
 #include <malloc.h>
 #include <mapmem.h>
diff --git a/drivers/core/root.c b/drivers/core/root.c
index 0726be6b795f..b5446b1db02d 100644
--- a/drivers/core/root.c
+++ b/drivers/core/root.c
@@ -11,6 +11,7 @@
 #include <fdtdec.h>
 #include <log.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <linux/libfdt.h>
 #include <dm/acpi.h>
 #include <dm/device.h>
diff --git a/drivers/core/uclass.c b/drivers/core/uclass.c
index c3f1b73cd6b4..95c37db5ad0b 100644
--- a/drivers/core/uclass.c
+++ b/drivers/core/uclass.c
@@ -13,6 +13,7 @@
 #include <errno.h>
 #include <log.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <dm/device.h>
 #include <dm/device-internal.h>
 #include <dm/lists.h>
diff --git a/drivers/cpu/imx8_cpu.c b/drivers/cpu/imx8_cpu.c
index 502c8ebb4331..aca14157ad55 100644
--- a/drivers/cpu/imx8_cpu.c
+++ b/drivers/cpu/imx8_cpu.c
@@ -7,6 +7,7 @@
 #include <cpu.h>
 #include <dm.h>
 #include <thermal.h>
+#include <asm/global_data.h>
 #include <asm/system.h>
 #include <asm/arch/sci/sci.h>
 #include <asm/arch/sys_proto.h>
diff --git a/drivers/cpu/riscv_cpu.c b/drivers/cpu/riscv_cpu.c
index 93ce708f652b..3c7395a9f207 100644
--- a/drivers/cpu/riscv_cpu.c
+++ b/drivers/cpu/riscv_cpu.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <dm/device-internal.h>
 #include <dm/lists.h>
 #include <linux/bitops.h>
diff --git a/drivers/crypto/rsa_mod_exp/mod_exp_uclass.c b/drivers/crypto/rsa_mod_exp/mod_exp_uclass.c
index e91fe644580b..f5ae35e13254 100644
--- a/drivers/crypto/rsa_mod_exp/mod_exp_uclass.c
+++ b/drivers/crypto/rsa_mod_exp/mod_exp_uclass.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <asm/global_data.h>
 #include <u-boot/rsa-mod-exp.h>
 #include <errno.h>
 #include <fdtdec.h>
diff --git a/drivers/ddr/altera/sdram_agilex.c b/drivers/ddr/altera/sdram_agilex.c
index d6e7a175d0d5..d554df87ebac 100644
--- a/drivers/ddr/altera/sdram_agilex.c
+++ b/drivers/ddr/altera/sdram_agilex.c
@@ -13,6 +13,7 @@
 #include <log.h>
 #include <ram.h>
 #include <reset.h>
+#include <asm/global_data.h>
 #include "sdram_soc64.h"
 #include <wait_bit.h>
 #include <asm/arch/firewall.h>
diff --git a/drivers/ddr/altera/sdram_arria10.c b/drivers/ddr/altera/sdram_arria10.c
index 3c58f59f3ab6..4a8f8dea1c4d 100644
--- a/drivers/ddr/altera/sdram_arria10.c
+++ b/drivers/ddr/altera/sdram_arria10.c
@@ -13,6 +13,7 @@
 #include <wait_bit.h>
 #include <watchdog.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/fpga_manager.h>
 #include <asm/arch/misc.h>
diff --git a/drivers/ddr/altera/sdram_s10.c b/drivers/ddr/altera/sdram_s10.c
index 2945f1e1df54..6235bd959fe9 100644
--- a/drivers/ddr/altera/sdram_s10.c
+++ b/drivers/ddr/altera/sdram_s10.c
@@ -15,6 +15,7 @@
 #include <log.h>
 #include <ram.h>
 #include <reset.h>
+#include <asm/global_data.h>
 #include "sdram_s10.h"
 #include <wait_bit.h>
 #include <asm/arch/firewall.h>
diff --git a/drivers/ddr/altera/sdram_soc64.c b/drivers/ddr/altera/sdram_soc64.c
index 8cb75fe02a2a..40fcc8d2e0fc 100644
--- a/drivers/ddr/altera/sdram_soc64.c
+++ b/drivers/ddr/altera/sdram_soc64.c
@@ -15,6 +15,7 @@
 #include <log.h>
 #include <ram.h>
 #include <reset.h>
+#include <asm/global_data.h>
 #include "sdram_soc64.h"
 #include <wait_bit.h>
 #include <asm/arch/firewall.h>
diff --git a/drivers/ddr/imx/imx8m/helper.c b/drivers/ddr/imx/imx8m/helper.c
index 5ebf54f5f4af..f23904bf7124 100644
--- a/drivers/ddr/imx/imx8m/helper.c
+++ b/drivers/ddr/imx/imx8m/helper.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <log.h>
 #include <spl.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <errno.h>
 #include <asm/io.h>
diff --git a/drivers/demo/demo-shape.c b/drivers/demo/demo-shape.c
index 8686c998457a..d0c0c7365517 100644
--- a/drivers/demo/demo-shape.c
+++ b/drivers/demo/demo-shape.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <dm-demo.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
 
diff --git a/drivers/demo/demo-uclass.c b/drivers/demo/demo-uclass.c
index 6c36f03254ff..5856a9891e81 100644
--- a/drivers/demo/demo-uclass.c
+++ b/drivers/demo/demo-uclass.c
@@ -13,6 +13,7 @@
 #include <fdtdec.h>
 #include <log.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/list.h>
 
diff --git a/drivers/fpga/socfpga_arria10.c b/drivers/fpga/socfpga_arria10.c
index 44e1ac54c3f1..4bea7fd900d8 100644
--- a/drivers/fpga/socfpga_arria10.c
+++ b/drivers/fpga/socfpga_arria10.c
@@ -4,6 +4,7 @@
  */
 #include <image.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/fpga_manager.h>
 #include <asm/arch/reset_manager.h>
diff --git a/drivers/fpga/zynqmppl.c b/drivers/fpga/zynqmppl.c
index 5b103cfeaf18..328e275cd374 100644
--- a/drivers/fpga/zynqmppl.c
+++ b/drivers/fpga/zynqmppl.c
@@ -7,6 +7,7 @@
 
 #include <console.h>
 #include <common.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <log.h>
 #include <zynqmppl.h>
diff --git a/drivers/gpio/74x164_gpio.c b/drivers/gpio/74x164_gpio.c
index 64717a6780e0..045685fcd9c8 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 <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <dm/device_compat.h>
diff --git a/drivers/gpio/altera_pio.c b/drivers/gpio/altera_pio.c
index 75800d9f31c6..e52124dbd501 100644
--- a/drivers/gpio/altera_pio.c
+++ b/drivers/gpio/altera_pio.c
@@ -9,6 +9,7 @@
 #include <errno.h>
 #include <malloc.h>
 #include <fdtdec.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
 
diff --git a/drivers/gpio/atmel_pio4.c b/drivers/gpio/atmel_pio4.c
index 18f365fa4116..3256469ddc16 100644
--- a/drivers/gpio/atmel_pio4.c
+++ b/drivers/gpio/atmel_pio4.c
@@ -11,6 +11,7 @@
 #include <fdtdec.h>
 #include <malloc.h>
 #include <asm/arch/hardware.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <linux/bitops.h>
 #include <mach/gpio.h>
diff --git a/drivers/gpio/da8xx_gpio.c b/drivers/gpio/da8xx_gpio.c
index f87588851010..614c489e45df 100644
--- a/drivers/gpio/da8xx_gpio.c
+++ b/drivers/gpio/da8xx_gpio.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <fdtdec.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
 #include <dt-bindings/gpio/gpio.h>
diff --git a/drivers/gpio/gpio-rcar.c b/drivers/gpio/gpio-rcar.c
index a993fd4d7003..2e80196905db 100644
--- a/drivers/gpio/gpio-rcar.c
+++ b/drivers/gpio/gpio-rcar.c
@@ -7,6 +7,7 @@
 #include <clk.h>
 #include <dm.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <dm/device_compat.h>
 #include <dm/pinctrl.h>
 #include <errno.h>
diff --git a/drivers/gpio/gpio-rza1.c b/drivers/gpio/gpio-rza1.c
index 86804ac2f5ff..aa600e483a6c 100644
--- a/drivers/gpio/gpio-rza1.c
+++ b/drivers/gpio/gpio-rza1.c
@@ -7,6 +7,7 @@
 #include <clk.h>
 #include <dm.h>
 #include <errno.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
diff --git a/drivers/gpio/gpio-uclass.c b/drivers/gpio/gpio-uclass.c
index 9c53299b6a3b..36de7bc7cc68 100644
--- a/drivers/gpio/gpio-uclass.c
+++ b/drivers/gpio/gpio-uclass.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <dm/device-internal.h>
 #include <dm/lists.h>
 #include <dm/uclass-internal.h>
diff --git a/drivers/gpio/intel_broadwell_gpio.c b/drivers/gpio/intel_broadwell_gpio.c
index 95f8b2ba6cd9..4323f0ba7609 100644
--- a/drivers/gpio/intel_broadwell_gpio.c
+++ b/drivers/gpio/intel_broadwell_gpio.c
@@ -12,6 +12,7 @@
 #include <pci.h>
 #include <syscon.h>
 #include <asm/cpu.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <asm/pci.h>
diff --git a/drivers/gpio/intel_ich6_gpio.c b/drivers/gpio/intel_ich6_gpio.c
index 73d98fde5549..4a2757d1ac68 100644
--- a/drivers/gpio/intel_ich6_gpio.c
+++ b/drivers/gpio/intel_ich6_gpio.c
@@ -34,6 +34,7 @@
 #include <pch.h>
 #include <pci.h>
 #include <asm/cpu.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <asm/pci.h>
diff --git a/drivers/gpio/msm_gpio.c b/drivers/gpio/msm_gpio.c
index 416fb56a98d6..710994b4e127 100644
--- a/drivers/gpio/msm_gpio.c
+++ b/drivers/gpio/msm_gpio.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 
diff --git a/drivers/gpio/mxs_gpio.c b/drivers/gpio/mxs_gpio.c
index aaabb0216be0..0340786712ee 100644
--- a/drivers/gpio/mxs_gpio.c
+++ b/drivers/gpio/mxs_gpio.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <log.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <asm/io.h>
diff --git a/drivers/gpio/omap_gpio.c b/drivers/gpio/omap_gpio.c
index 6eaa0a08a26a..4200afba1212 100644
--- a/drivers/gpio/omap_gpio.c
+++ b/drivers/gpio/omap_gpio.c
@@ -20,6 +20,7 @@
 #include <common.h>
 #include <dm.h>
 #include <fdtdec.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <linux/errno.h>
diff --git a/drivers/gpio/pcf8575_gpio.c b/drivers/gpio/pcf8575_gpio.c
index 1b9a18fe5dc0..8a9214dec3ee 100644
--- a/drivers/gpio/pcf8575_gpio.c
+++ b/drivers/gpio/pcf8575_gpio.c
@@ -28,6 +28,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <asm-generic/gpio.h>
+#include <asm/global_data.h>
 #include <linux/bitops.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/gpio/pic32_gpio.c b/drivers/gpio/pic32_gpio.c
index bb1ad256fac0..50c5376e00d1 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 <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
 #include <linux/bitops.h>
diff --git a/drivers/gpio/s5p_gpio.c b/drivers/gpio/s5p_gpio.c
index c78227f4da3b..14f262739d21 100644
--- a/drivers/gpio/s5p_gpio.c
+++ b/drivers/gpio/s5p_gpio.c
@@ -10,6 +10,7 @@
 #include <fdtdec.h>
 #include <log.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
 #include <dm/device-internal.h>
diff --git a/drivers/gpio/vybrid_gpio.c b/drivers/gpio/vybrid_gpio.c
index 4efff5c36438..82ae6d889411 100644
--- a/drivers/gpio/vybrid_gpio.c
+++ b/drivers/gpio/vybrid_gpio.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <fdtdec.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/io.h>
diff --git a/drivers/hwspinlock/hwspinlock-uclass.c b/drivers/hwspinlock/hwspinlock-uclass.c
index 9da79455ed3c..fdc90c3f0e0a 100644
--- a/drivers/hwspinlock/hwspinlock-uclass.c
+++ b/drivers/hwspinlock/hwspinlock-uclass.c
@@ -8,6 +8,7 @@
 #include <errno.h>
 #include <hwspinlock.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <dm/device-internal.h>
 #include <dm/device_compat.h>
 #include <linux/compat.h>
diff --git a/drivers/i2c/at91_i2c.c b/drivers/i2c/at91_i2c.c
index 9d6c6d80e2a6..ee5dc1db96c1 100644
--- a/drivers/i2c/at91_i2c.c
+++ b/drivers/i2c/at91_i2c.c
@@ -6,6 +6,7 @@
  */
 
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <common.h>
 #include <clk.h>
diff --git a/drivers/i2c/cros_ec_tunnel.c b/drivers/i2c/cros_ec_tunnel.c
index a630817352ec..2853a984fbe3 100644
--- a/drivers/i2c/cros_ec_tunnel.c
+++ b/drivers/i2c/cros_ec_tunnel.c
@@ -9,6 +9,7 @@
 #include <cros_ec.h>
 #include <errno.h>
 #include <i2c.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/i2c/exynos_hs_i2c.c b/drivers/i2c/exynos_hs_i2c.c
index 5785adedb6d0..34d10abde067 100644
--- a/drivers/i2c/exynos_hs_i2c.c
+++ b/drivers/i2c/exynos_hs_i2c.c
@@ -13,6 +13,7 @@
 #include <asm/arch/clk.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/pinmux.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 #include "s3c24x0_i2c.h"
 
diff --git a/drivers/i2c/fsl_i2c.c b/drivers/i2c/fsl_i2c.c
index da933452f515..e7a8dcc82122 100644
--- a/drivers/i2c/fsl_i2c.c
+++ b/drivers/i2c/fsl_i2c.c
@@ -11,6 +11,7 @@
 #include <i2c.h>		/* Functional interface */
 #include <log.h>
 #include <time.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/fsl_i2c.h>	/* HW definitions */
 #include <clk.h>
diff --git a/drivers/i2c/i2c-gpio.c b/drivers/i2c/i2c-gpio.c
index cfdeadc752cd..6dc89a4e2023 100644
--- a/drivers/i2c/i2c-gpio.c
+++ b/drivers/i2c/i2c-gpio.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <linux/delay.h>
 
diff --git a/drivers/i2c/i2c_core.c b/drivers/i2c/i2c_core.c
index da50d86cc8b4..85cf75ecd922 100644
--- a/drivers/i2c/i2c_core.c
+++ b/drivers/i2c/i2c_core.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <i2c.h>
 #include <linker_lists.h>
+#include <asm/global_data.h>
 
 struct i2c_adapter *i2c_get_adapter(int index)
 {
diff --git a/drivers/i2c/ihs_i2c.c b/drivers/i2c/ihs_i2c.c
index cec38538da43..1c39b8c9dfc5 100644
--- a/drivers/i2c/ihs_i2c.c
+++ b/drivers/i2c/ihs_i2c.c
@@ -13,6 +13,7 @@
 #include <gdsys_fpga.h>
 #endif
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/unaligned.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/drivers/i2c/iproc_i2c.c b/drivers/i2c/iproc_i2c.c
index b7e9ced89831..b90c0ddba7cd 100644
--- a/drivers/i2c/iproc_i2c.c
+++ b/drivers/i2c/iproc_i2c.c
@@ -4,6 +4,7 @@
  *
  */
 
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <common.h>
 #include <config.h>
diff --git a/drivers/i2c/muxes/i2c-arb-gpio-challenge.c b/drivers/i2c/muxes/i2c-arb-gpio-challenge.c
index 584d0a4fef19..4be32a1b38ce 100644
--- a/drivers/i2c/muxes/i2c-arb-gpio-challenge.c
+++ b/drivers/i2c/muxes/i2c-arb-gpio-challenge.c
@@ -10,6 +10,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <linux/delay.h>
 
diff --git a/drivers/i2c/muxes/i2c-mux-gpio.c b/drivers/i2c/muxes/i2c-mux-gpio.c
index 83dcb4021332..52da26ab1823 100644
--- a/drivers/i2c/muxes/i2c-mux-gpio.c
+++ b/drivers/i2c/muxes/i2c-mux-gpio.c
@@ -7,6 +7,7 @@
  * Peng Fan <peng.fan@nxp.com>
  */
 
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm-generic/gpio.h>
 #include <common.h>
diff --git a/drivers/i2c/muxes/pca954x.c b/drivers/i2c/muxes/pca954x.c
index 7360e162eeb5..87e9f9cb21d7 100644
--- a/drivers/i2c/muxes/pca954x.c
+++ b/drivers/i2c/muxes/pca954x.c
@@ -11,6 +11,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 
 #include <asm-generic/gpio.h>
 
diff --git a/drivers/i2c/mvtwsi.c b/drivers/i2c/mvtwsi.c
index d3cc9b9d8384..21383ecf132f 100644
--- a/drivers/i2c/mvtwsi.c
+++ b/drivers/i2c/mvtwsi.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <i2c.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/io.h>
diff --git a/drivers/i2c/mxc_i2c.c b/drivers/i2c/mxc_i2c.c
index e3d980a9dfb4..c1204815c20e 100644
--- a/drivers/i2c/mxc_i2c.c
+++ b/drivers/i2c/mxc_i2c.c
@@ -18,6 +18,7 @@
 #include <log.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
+#include <asm/global_data.h>
 #include <dm/device_compat.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/i2c/s3c24x0_i2c.c b/drivers/i2c/s3c24x0_i2c.c
index cb45d3c100fe..43699fc24108 100644
--- a/drivers/i2c/s3c24x0_i2c.c
+++ b/drivers/i2c/s3c24x0_i2c.c
@@ -16,6 +16,7 @@
 #else
 #include <asm/arch/s3c24x0_cpu.h>
 #endif
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <i2c.h>
 #include "s3c24x0_i2c.h"
diff --git a/drivers/i2c/sh_i2c.c b/drivers/i2c/sh_i2c.c
index f857307e6a4f..26a87006698e 100644
--- a/drivers/i2c/sh_i2c.c
+++ b/drivers/i2c/sh_i2c.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <i2c.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/delay.h>
 
diff --git a/drivers/i2c/soft_i2c.c b/drivers/i2c/soft_i2c.c
index 1031066b8c41..db69c18cb6de 100644
--- a/drivers/i2c/soft_i2c.c
+++ b/drivers/i2c/soft_i2c.c
@@ -25,6 +25,7 @@
 #endif
 #endif
 #include <i2c.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 
 #if defined(CONFIG_SOFT_I2C_GPIO_SCL)
diff --git a/drivers/i2c/tegra186_bpmp_i2c.c b/drivers/i2c/tegra186_bpmp_i2c.c
index 37204718ca13..0a507079a2dc 100644
--- a/drivers/i2c/tegra186_bpmp_i2c.c
+++ b/drivers/i2c/tegra186_bpmp_i2c.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <misc.h>
 #include <asm/arch-tegra/bpmp_abi.h>
+#include <asm/global_data.h>
 #include <linux/bitops.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/input/i8042.c b/drivers/input/i8042.c
index 7beaccca2c8c..ca2978e79d5e 100644
--- a/drivers/input/i8042.c
+++ b/drivers/input/i8042.c
@@ -14,6 +14,7 @@
 #include <input.h>
 #include <keyboard.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/delay.h>
 
diff --git a/drivers/mailbox/k3-sec-proxy.c b/drivers/mailbox/k3-sec-proxy.c
index 3f9afaed3286..b9337f2db5ce 100644
--- a/drivers/mailbox/k3-sec-proxy.c
+++ b/drivers/mailbox/k3-sec-proxy.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <log.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm/device_compat.h>
 #include <linux/types.h>
diff --git a/drivers/misc/atsha204a-i2c.c b/drivers/misc/atsha204a-i2c.c
index 422ea6f3e5ab..c79c260783e8 100644
--- a/drivers/misc/atsha204a-i2c.c
+++ b/drivers/misc/atsha204a-i2c.c
@@ -16,6 +16,7 @@
 #include <errno.h>
 #include <atsha204a-i2c.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 #include <u-boot/crc.h>
 
diff --git a/drivers/misc/fs_loader.c b/drivers/misc/fs_loader.c
index 56406aa1dd2d..f6383a023985 100644
--- a/drivers/misc/fs_loader.c
+++ b/drivers/misc/fs_loader.c
@@ -11,6 +11,7 @@
 #include <fs.h>
 #include <fs_loader.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <linux/string.h>
 #include <mapmem.h>
 #include <malloc.h>
diff --git a/drivers/misc/imx8/fuse.c b/drivers/misc/imx8/fuse.c
index be181229370e..38111c525485 100644
--- a/drivers/misc/imx8/fuse.c
+++ b/drivers/misc/imx8/fuse.c
@@ -9,6 +9,7 @@
 #include <fuse.h>
 #include <asm/arch/sci/sci.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 #include <linux/arm-smccc.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/misc/imx8/scu.c b/drivers/misc/imx8/scu.c
index 223aac8518a6..fc9320fa9932 100644
--- a/drivers/misc/imx8/scu.c
+++ b/drivers/misc/imx8/scu.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm.h>
 #include <dm/lists.h>
diff --git a/drivers/misc/imx8/scu_api.c b/drivers/misc/imx8/scu_api.c
index 20b74fbb18d1..27ecce710fcb 100644
--- a/drivers/misc/imx8/scu_api.c
+++ b/drivers/misc/imx8/scu_api.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <hang.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm.h>
 #include <asm/arch/sci/sci.h>
diff --git a/drivers/misc/tegra186_bpmp.c b/drivers/misc/tegra186_bpmp.c
index 18da138507c9..1f4437226e7f 100644
--- a/drivers/misc/tegra186_bpmp.c
+++ b/drivers/misc/tegra186_bpmp.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <time.h>
+#include <asm/global_data.h>
 #include <dm/lists.h>
 #include <dm/root.h>
 #include <mailbox.h>
diff --git a/drivers/mmc/atmel_sdhci.c b/drivers/mmc/atmel_sdhci.c
index 0c53caf448c6..96cbb2a2c51b 100644
--- a/drivers/mmc/atmel_sdhci.c
+++ b/drivers/mmc/atmel_sdhci.c
@@ -10,6 +10,7 @@
 #include <malloc.h>
 #include <sdhci.h>
 #include <asm/arch/clk.h>
+#include <asm/global_data.h>
 
 #define ATMEL_SDHC_MIN_FREQ	400000
 #define ATMEL_SDHC_GCK_RATE	240000000
diff --git a/drivers/mmc/ca_dw_mmc.c b/drivers/mmc/ca_dw_mmc.c
index 198c41f451fe..562dcb8ee35e 100644
--- a/drivers/mmc/ca_dw_mmc.c
+++ b/drivers/mmc/ca_dw_mmc.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dwmmc.h>
 #include <fdtdec.h>
+#include <asm/global_data.h>
 #include <linux/libfdt.h>
 #include <malloc.h>
 #include <errno.h>
diff --git a/drivers/mmc/exynos_dw_mmc.c b/drivers/mmc/exynos_dw_mmc.c
index 435ccac59421..94af116d10ce 100644
--- a/drivers/mmc/exynos_dw_mmc.c
+++ b/drivers/mmc/exynos_dw_mmc.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dwmmc.h>
 #include <fdtdec.h>
+#include <asm/global_data.h>
 #include <linux/libfdt.h>
 #include <malloc.h>
 #include <errno.h>
diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c
index de9fe01bc5c9..0f9109a2c690 100644
--- a/drivers/mmc/fsl_esdhc.c
+++ b/drivers/mmc/fsl_esdhc.c
@@ -21,6 +21,7 @@
 #include <fsl_esdhc.h>
 #include <fdt_support.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm.h>
 #include <dm/device_compat.h>
diff --git a/drivers/mmc/fsl_esdhc_imx.c b/drivers/mmc/fsl_esdhc_imx.c
index 788677984bf5..afe4cc69dbe1 100644
--- a/drivers/mmc/fsl_esdhc_imx.c
+++ b/drivers/mmc/fsl_esdhc_imx.c
@@ -21,6 +21,7 @@
 #include <mmc.h>
 #include <part.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/drivers/mmc/ftsdc010_mci.c b/drivers/mmc/ftsdc010_mci.c
index bc0d5ffed515..71818f964d37 100644
--- a/drivers/mmc/ftsdc010_mci.c
+++ b/drivers/mmc/ftsdc010_mci.c
@@ -15,6 +15,7 @@
 #include <malloc.h>
 #include <part.h>
 #include <mmc.h>
+#include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/io.h>
 #include <linux/errno.h>
diff --git a/drivers/mmc/hi6220_dw_mmc.c b/drivers/mmc/hi6220_dw_mmc.c
index 67d6a05b3b5b..61c209cb0a7f 100644
--- a/drivers/mmc/hi6220_dw_mmc.c
+++ b/drivers/mmc/hi6220_dw_mmc.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <fdtdec.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/mmc/iproc_sdhci.c b/drivers/mmc/iproc_sdhci.c
index 9f530638e313..7eda1d606fd6 100644
--- a/drivers/mmc/iproc_sdhci.c
+++ b/drivers/mmc/iproc_sdhci.c
@@ -9,6 +9,7 @@
 #include <errno.h>
 #include <malloc.h>
 #include <sdhci.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/mmc/jz_mmc.c b/drivers/mmc/jz_mmc.c
index b33f0850738c..eec432a0df65 100644
--- a/drivers/mmc/jz_mmc.c
+++ b/drivers/mmc/jz_mmc.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <malloc.h>
 #include <mmc.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/unaligned.h>
 #include <errno.h>
diff --git a/drivers/mmc/msm_sdhci.c b/drivers/mmc/msm_sdhci.c
index 56c3e35c9e98..525c1dc90272 100644
--- a/drivers/mmc/msm_sdhci.c
+++ b/drivers/mmc/msm_sdhci.c
@@ -13,6 +13,7 @@
 #include <malloc.h>
 #include <sdhci.h>
 #include <wait_bit.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
 
diff --git a/drivers/mmc/mv_sdhci.c b/drivers/mmc/mv_sdhci.c
index 9b3dfa13e619..fa7c12837d16 100644
--- a/drivers/mmc/mv_sdhci.c
+++ b/drivers/mmc/mv_sdhci.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <malloc.h>
 #include <sdhci.h>
+#include <asm/global_data.h>
 #include <linux/mbus.h>
 
 #define MVSDH_NAME "mv_sdh"
diff --git a/drivers/mmc/mvebu_mmc.c b/drivers/mmc/mvebu_mmc.c
index 03d5150b207a..8ec1f57a1b70 100644
--- a/drivers/mmc/mvebu_mmc.c
+++ b/drivers/mmc/mvebu_mmc.c
@@ -13,6 +13,7 @@
 #include <malloc.h>
 #include <part.h>
 #include <mmc.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
diff --git a/drivers/mmc/omap_hsmmc.c b/drivers/mmc/omap_hsmmc.c
index 715eee0e3e0d..c5e575286606 100644
--- a/drivers/mmc/omap_hsmmc.c
+++ b/drivers/mmc/omap_hsmmc.c
@@ -35,6 +35,7 @@
 #include <palmas.h>
 #endif
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/mmc_host_def.h>
 #ifdef CONFIG_OMAP54XX
diff --git a/drivers/mmc/pic32_sdhci.c b/drivers/mmc/pic32_sdhci.c
index 029e0fbc2bb9..963809fb2aee 100644
--- a/drivers/mmc/pic32_sdhci.c
+++ b/drivers/mmc/pic32_sdhci.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <dm.h>
 #include <sdhci.h>
+#include <asm/global_data.h>
 #include <linux/errno.h>
 #include <mach/pic32.h>
 
diff --git a/drivers/mmc/renesas-sdhi.c b/drivers/mmc/renesas-sdhi.c
index d80b3fc28f33..83153c5c4c4d 100644
--- a/drivers/mmc/renesas-sdhi.c
+++ b/drivers/mmc/renesas-sdhi.c
@@ -11,6 +11,7 @@
 #include <malloc.h>
 #include <mmc.h>
 #include <dm.h>
+#include <asm/global_data.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/compat.h>
diff --git a/drivers/mmc/s5p_sdhci.c b/drivers/mmc/s5p_sdhci.c
index 24f599e868aa..240db8a75697 100644
--- a/drivers/mmc/s5p_sdhci.c
+++ b/drivers/mmc/s5p_sdhci.c
@@ -10,6 +10,7 @@
 #include <malloc.h>
 #include <sdhci.h>
 #include <fdtdec.h>
+#include <asm/global_data.h>
 #include <linux/libfdt.h>
 #include <asm/gpio.h>
 #include <asm/arch/mmc.h>
diff --git a/drivers/mmc/sdhci-cadence.c b/drivers/mmc/sdhci-cadence.c
index cc99bebc3058..b1e53e8d425a 100644
--- a/drivers/mmc/sdhci-cadence.c
+++ b/drivers/mmc/sdhci-cadence.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <asm/global_data.h>
 #include <dm/device_compat.h>
 #include <linux/bitfield.h>
 #include <linux/bitops.h>
diff --git a/drivers/mmc/sh_mmcif.c b/drivers/mmc/sh_mmcif.c
index ad386909e904..f7dd2aadc3e1 100644
--- a/drivers/mmc/sh_mmcif.c
+++ b/drivers/mmc/sh_mmcif.c
@@ -14,6 +14,7 @@
 #include <clk.h>
 #include <dm.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/drivers/mmc/sh_sdhi.c b/drivers/mmc/sh_sdhi.c
index 315f95cce829..a279bc69aaf3 100644
--- a/drivers/mmc/sh_sdhi.c
+++ b/drivers/mmc/sh_sdhi.c
@@ -15,6 +15,7 @@
 #include <mmc.h>
 #include <dm.h>
 #include <part.h>
+#include <asm/global_data.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/drivers/mmc/socfpga_dw_mmc.c b/drivers/mmc/socfpga_dw_mmc.c
index 0022f943bd73..16a6e3056dc2 100644
--- a/drivers/mmc/socfpga_dw_mmc.c
+++ b/drivers/mmc/socfpga_dw_mmc.c
@@ -12,6 +12,7 @@
 #include <dwmmc.h>
 #include <errno.h>
 #include <fdtdec.h>
+#include <asm/global_data.h>
 #include <dm/device_compat.h>
 #include <linux/libfdt.h>
 #include <linux/err.h>
diff --git a/drivers/mmc/sti_sdhci.c b/drivers/mmc/sti_sdhci.c
index 5578feebef72..db0b566a8b73 100644
--- a/drivers/mmc/sti_sdhci.c
+++ b/drivers/mmc/sti_sdhci.c
@@ -11,6 +11,7 @@
 #include <reset-uclass.h>
 #include <sdhci.h>
 #include <asm/arch/sdhci.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/mmc/tmio-common.c b/drivers/mmc/tmio-common.c
index c65397367662..b56f650f8a76 100644
--- a/drivers/mmc/tmio-common.c
+++ b/drivers/mmc/tmio-common.c
@@ -10,6 +10,7 @@
 #include <fdtdec.h>
 #include <mmc.h>
 #include <dm.h>
+#include <asm/global_data.h>
 #include <dm/device_compat.h>
 #include <dm/pinctrl.h>
 #include <linux/compat.h>
diff --git a/drivers/mmc/xenon_sdhci.c b/drivers/mmc/xenon_sdhci.c
index 356dd9846d6f..c3ea9d7f532a 100644
--- a/drivers/mmc/xenon_sdhci.c
+++ b/drivers/mmc/xenon_sdhci.c
@@ -17,6 +17,7 @@
 #include <common.h>
 #include <dm.h>
 #include <fdtdec.h>
+#include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
diff --git a/drivers/mtd/altera_qspi.c b/drivers/mtd/altera_qspi.c
index cd4d32959a0d..346244e1110f 100644
--- a/drivers/mtd/altera_qspi.c
+++ b/drivers/mtd/altera_qspi.c
@@ -11,6 +11,7 @@
 #include <flash.h>
 #include <log.h>
 #include <mtd.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
 
diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c
index b7289ba5394b..feb46d8cf28f 100644
--- a/drivers/mtd/cfi_flash.c
+++ b/drivers/mtd/cfi_flash.c
@@ -26,6 +26,7 @@
 #include <init.h>
 #include <irq_func.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/processor.h>
 #include <asm/io.h>
 #include <asm/byteorder.h>
diff --git a/drivers/mtd/mtd_uboot.c b/drivers/mtd/mtd_uboot.c
index 9360d4ed1720..2499cb52d8c0 100644
--- a/drivers/mtd/mtd_uboot.c
+++ b/drivers/mtd/mtd_uboot.c
@@ -7,6 +7,7 @@
 #include <env.h>
 #include <log.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <dm/device.h>
 #include <dm/uclass-internal.h>
 #include <linux/err.h>
diff --git a/drivers/mtd/nand/raw/nand_base.c b/drivers/mtd/nand/raw/nand_base.c
index 698968bc1163..ebb40f933254 100644
--- a/drivers/mtd/nand/raw/nand_base.c
+++ b/drivers/mtd/nand/raw/nand_base.c
@@ -35,6 +35,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <watchdog.h>
+#include <asm/global_data.h>
 #include <dm/devres.h>
 #include <linux/bitops.h>
 #include <linux/bug.h>
diff --git a/drivers/mtd/nand/raw/pxa3xx_nand.c b/drivers/mtd/nand/raw/pxa3xx_nand.c
index a30e82166b96..701bfead7731 100644
--- a/drivers/mtd/nand/raw/pxa3xx_nand.c
+++ b/drivers/mtd/nand/raw/pxa3xx_nand.c
@@ -10,6 +10,7 @@
 #include <malloc.h>
 #include <fdtdec.h>
 #include <nand.h>
+#include <asm/global_data.h>
 #include <dm/device_compat.h>
 #include <dm/devres.h>
 #include <linux/bitops.h>
diff --git a/drivers/mtd/nand/raw/sunxi_nand.c b/drivers/mtd/nand/raw/sunxi_nand.c
index 004b6f17a510..6d02d56aeb67 100644
--- a/drivers/mtd/nand/raw/sunxi_nand.c
+++ b/drivers/mtd/nand/raw/sunxi_nand.c
@@ -29,6 +29,7 @@
 #include <malloc.h>
 #include <memalign.h>
 #include <nand.h>
+#include <asm/global_data.h>
 #include <dm/device_compat.h>
 #include <dm/devres.h>
 #include <linux/bitops.h>
diff --git a/drivers/mtd/nand/raw/tegra_nand.c b/drivers/mtd/nand/raw/tegra_nand.c
index b9f5bdd95357..dd14c34738ad 100644
--- a/drivers/mtd/nand/raw/tegra_nand.c
+++ b/drivers/mtd/nand/raw/tegra_nand.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <memalign.h>
 #include <nand.h>
diff --git a/drivers/mtd/pic32_flash.c b/drivers/mtd/pic32_flash.c
index a58a2c4b6c31..ea0dbe9eeee5 100644
--- a/drivers/mtd/pic32_flash.c
+++ b/drivers/mtd/pic32_flash.c
@@ -12,6 +12,7 @@
 #include <flash.h>
 #include <init.h>
 #include <irq_func.h>
+#include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <mach/pic32.h>
 #include <wait_bit.h>
diff --git a/drivers/mtd/renesas_rpc_hf.c b/drivers/mtd/renesas_rpc_hf.c
index 65320c7ed980..f15228741ffe 100644
--- a/drivers/mtd/renesas_rpc_hf.c
+++ b/drivers/mtd/renesas_rpc_hf.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <clk.h>
 #include <dm.h>
diff --git a/drivers/mtd/spi/sf-uclass.c b/drivers/mtd/spi/sf-uclass.c
index 09c11439b08a..121804e32693 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 <asm/global_data.h>
 #include <dm/device-internal.h>
 #include "sf_internal.h"
 
diff --git a/drivers/net/ag7xxx.c b/drivers/net/ag7xxx.c
index ccba3947ac56..c7ea60f5acc2 100644
--- a/drivers/net/ag7xxx.c
+++ b/drivers/net/ag7xxx.c
@@ -16,6 +16,7 @@
 #include <malloc.h>
 #include <net.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/compiler.h>
 #include <linux/delay.h>
diff --git a/drivers/net/altera_tse.c b/drivers/net/altera_tse.c
index 93b26da39261..2097718057bd 100644
--- a/drivers/net/altera_tse.c
+++ b/drivers/net/altera_tse.c
@@ -18,6 +18,7 @@
 #include <miiphy.h>
 #include <net.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <linux/dma-mapping.h>
 #include <asm/io.h>
 #include "altera_tse.h"
diff --git a/drivers/net/dwc_eth_qos.c b/drivers/net/dwc_eth_qos.c
index 810a2b95b19e..1bbb7baeb945 100644
--- a/drivers/net/dwc_eth_qos.c
+++ b/drivers/net/dwc_eth_qos.c
@@ -41,6 +41,7 @@
 #include <reset.h>
 #include <wait_bit.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <eth_phy.h>
diff --git a/drivers/net/dwmac_s700.c b/drivers/net/dwmac_s700.c
index 9d3f3ac5d93a..2cf36f404940 100644
--- a/drivers/net/dwmac_s700.c
+++ b/drivers/net/dwmac_s700.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm.h>
 #include <clk.h>
diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c
index bb55be9a2679..468be69886ca 100644
--- a/drivers/net/fec_mxc.c
+++ b/drivers/net/fec_mxc.c
@@ -18,6 +18,7 @@
 #include <net.h>
 #include <netdev.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 #include <power/regulator.h>
 
diff --git a/drivers/net/fsl-mc/mc.c b/drivers/net/fsl-mc/mc.c
index 84db6be624a4..26e9523288e1 100644
--- a/drivers/net/fsl-mc/mc.c
+++ b/drivers/net/fsl-mc/mc.c
@@ -11,6 +11,7 @@
 #include <image.h>
 #include <log.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <linux/bug.h>
 #include <asm/io.h>
 #include <linux/delay.h>
diff --git a/drivers/net/fsl_mcdmafec.c b/drivers/net/fsl_mcdmafec.c
index e27f7e5321ad..f3eea57fb9a8 100644
--- a/drivers/net/fsl_mcdmafec.c
+++ b/drivers/net/fsl_mcdmafec.c
@@ -18,6 +18,7 @@
 #include <config.h>
 #include <net.h>
 #include <miiphy.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/mii.h>
 #include <asm/immap.h>
diff --git a/drivers/net/ftmac100.c b/drivers/net/ftmac100.c
index 292690de9615..d45f17eb8dda 100644
--- a/drivers/net/ftmac100.c
+++ b/drivers/net/ftmac100.c
@@ -12,6 +12,7 @@
 #include <env.h>
 #include <malloc.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/io.h>
 
diff --git a/drivers/net/gmac_rockchip.c b/drivers/net/gmac_rockchip.c
index 8d95ee15ffdd..98d7c39f9fee 100644
--- a/drivers/net/gmac_rockchip.c
+++ b/drivers/net/gmac_rockchip.c
@@ -12,6 +12,7 @@
 #include <net.h>
 #include <phy.h>
 #include <syscon.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch-rockchip/periph.h>
 #include <asm/arch-rockchip/clock.h>
diff --git a/drivers/net/ldpaa_eth/ldpaa_eth.c b/drivers/net/ldpaa_eth/ldpaa_eth.c
index 67da549fdbf8..b340c5761087 100644
--- a/drivers/net/ldpaa_eth/ldpaa_eth.c
+++ b/drivers/net/ldpaa_eth/ldpaa_eth.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/types.h>
 #include <malloc.h>
diff --git a/drivers/net/macb.c b/drivers/net/macb.c
index b80a259ff757..cda9b16cc240 100644
--- a/drivers/net/macb.c
+++ b/drivers/net/macb.c
@@ -7,6 +7,7 @@
 #include <cpu_func.h>
 #include <dm.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 
 /*
diff --git a/drivers/net/mcffec.c b/drivers/net/mcffec.c
index f94a2d8123c3..d881c5eb871b 100644
--- a/drivers/net/mcffec.c
+++ b/drivers/net/mcffec.c
@@ -18,6 +18,7 @@
 #include <net.h>
 #include <miiphy.h>
 #include <asm/fec.h>
+#include <asm/global_data.h>
 #include <asm/immap.h>
 #include <linux/delay.h>
 #include <linux/mii.h>
diff --git a/drivers/net/mcfmii.c b/drivers/net/mcfmii.c
index 393605512d98..da5075172fa2 100644
--- a/drivers/net/mcfmii.c
+++ b/drivers/net/mcfmii.c
@@ -8,6 +8,7 @@
 #include <config.h>
 #include <net.h>
 #include <netdev.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 
 #ifdef CONFIG_MCF547x_8x
diff --git a/drivers/net/mpc8xx_fec.c b/drivers/net/mpc8xx_fec.c
index 12be584638fa..282c2599d3c4 100644
--- a/drivers/net/mpc8xx_fec.c
+++ b/drivers/net/mpc8xx_fec.c
@@ -11,6 +11,7 @@
 #include <net.h>
 #include <netdev.h>
 #include <asm/cpm_8xx.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/delay.h>
 
diff --git a/drivers/net/mvgbe.c b/drivers/net/mvgbe.c
index 2f9464b961a9..bf5f6f4b6723 100644
--- a/drivers/net/mvgbe.c
+++ b/drivers/net/mvgbe.c
@@ -18,6 +18,7 @@
 #include <malloc.h>
 #include <miiphy.h>
 #include <wait_bit.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/net/mvneta.c b/drivers/net/mvneta.c
index 4c7d06ca40e5..5fd668b5e42c 100644
--- a/drivers/net/mvneta.c
+++ b/drivers/net/mvneta.c
@@ -21,6 +21,7 @@
 #include <config.h>
 #include <malloc.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm/device_compat.h>
 #include <dm/devres.h>
diff --git a/drivers/net/mvpp2.c b/drivers/net/mvpp2.c
index a5747a25abe0..37a8a7849f45 100644
--- a/drivers/net/mvpp2.c
+++ b/drivers/net/mvpp2.c
@@ -17,6 +17,7 @@
 #include <cpu_func.h>
 #include <dm.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <dm/device-internal.h>
 #include <dm/device_compat.h>
 #include <dm/devres.h>
diff --git a/drivers/net/phy/fixed.c b/drivers/net/phy/fixed.c
index 9d9f746e1dba..3228672fc4ae 100644
--- a/drivers/net/phy/fixed.c
+++ b/drivers/net/phy/fixed.c
@@ -11,6 +11,7 @@
 #include <phy.h>
 #include <dm.h>
 #include <fdt_support.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/net/phy/miiphybb.c b/drivers/net/phy/miiphybb.c
index ba97a54c0676..bb5aa3513b61 100644
--- a/drivers/net/phy/miiphybb.c
+++ b/drivers/net/phy/miiphybb.c
@@ -16,6 +16,7 @@
 #include <ioports.h>
 #include <ppc_asm.tmpl>
 #include <miiphy.h>
+#include <asm/global_data.h>
 
 #define BB_MII_RELOCATE(v,off) (v += (v?off:0))
 
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 67789897c256..f82547593864 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -17,6 +17,7 @@
 #include <miiphy.h>
 #include <phy.h>
 #include <errno.h>
+#include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/err.h>
diff --git a/drivers/net/phy/xilinx_gmii2rgmii.c b/drivers/net/phy/xilinx_gmii2rgmii.c
index e2feb17048cc..74105c0b7d6b 100644
--- a/drivers/net/phy/xilinx_gmii2rgmii.c
+++ b/drivers/net/phy/xilinx_gmii2rgmii.c
@@ -5,11 +5,11 @@
  * Copyright (C) 2018 Xilinx, Inc.
  */
 
+#include <common.h>
 #include <dm.h>
 #include <log.h>
 #include <phy.h>
-#include <config.h>
-#include <common.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/net/pic32_eth.c b/drivers/net/pic32_eth.c
index 6a2084947b03..bbc305f81dbe 100644
--- a/drivers/net/pic32_eth.c
+++ b/drivers/net/pic32_eth.c
@@ -14,6 +14,7 @@
 #include <console.h>
 #include <time.h>
 #include <wait_bit.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <linux/delay.h>
 #include <linux/mii.h>
diff --git a/drivers/net/ravb.c b/drivers/net/ravb.c
index 886f53ee8274..23d5c88a88d3 100644
--- a/drivers/net/ravb.c
+++ b/drivers/net/ravb.c
@@ -17,6 +17,7 @@
 #include <miiphy.h>
 #include <malloc.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/mii.h>
diff --git a/drivers/net/sandbox-raw.c b/drivers/net/sandbox-raw.c
index 4bd94c31031d..6dddae911b04 100644
--- a/drivers/net/sandbox-raw.c
+++ b/drivers/net/sandbox-raw.c
@@ -13,6 +13,7 @@
 #include <env.h>
 #include <malloc.h>
 #include <net.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/net/sandbox.c b/drivers/net/sandbox.c
index 4f7e3d42438c..51d80f549673 100644
--- a/drivers/net/sandbox.c
+++ b/drivers/net/sandbox.c
@@ -12,6 +12,7 @@
 #include <malloc.h>
 #include <net.h>
 #include <asm/eth.h>
+#include <asm/global_data.h>
 #include <asm/test.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c
index 4cbffb14c517..49b4a91875ab 100644
--- a/drivers/net/sh_eth.c
+++ b/drivers/net/sh_eth.c
@@ -18,6 +18,7 @@
 #include <netdev.h>
 #include <miiphy.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/io.h>
diff --git a/drivers/net/sni_ave.c b/drivers/net/sni_ave.c
index 0f7ada8c3e2c..c11a1c443eed 100644
--- a/drivers/net/sni_ave.c
+++ b/drivers/net/sni_ave.c
@@ -16,6 +16,7 @@
 #include <reset.h>
 #include <syscon.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/drivers/net/sun8i_emac.c b/drivers/net/sun8i_emac.c
index 546cc6ccb6ef..a65700020d58 100644
--- a/drivers/net/sun8i_emac.c
+++ b/drivers/net/sun8i_emac.c
@@ -13,6 +13,7 @@
 #include <cpu_func.h>
 #include <log.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/gpio.h>
diff --git a/drivers/net/ti/cpsw-common.c b/drivers/net/ti/cpsw-common.c
index ca93edb70e31..3140f2515fbf 100644
--- a/drivers/net/ti/cpsw-common.c
+++ b/drivers/net/ti/cpsw-common.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <dm.h>
 #include <fdt_support.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <cpsw.h>
 #include <dm/device_compat.h>
diff --git a/drivers/net/ti/keystone_net.c b/drivers/net/ti/keystone_net.c
index 50f0d33a83b5..c25902a7032a 100644
--- a/drivers/net/ti/keystone_net.c
+++ b/drivers/net/ti/keystone_net.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <command.h>
 #include <console.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 
 #include <dm.h>
diff --git a/drivers/net/xilinx_axi_emac.c b/drivers/net/xilinx_axi_emac.c
index 99d4d85c5270..65abc7d1834a 100644
--- a/drivers/net/xilinx_axi_emac.c
+++ b/drivers/net/xilinx_axi_emac.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <net.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <phy.h>
 #include <miiphy.h>
diff --git a/drivers/net/xilinx_emaclite.c b/drivers/net/xilinx_emaclite.c
index 64c18bae74b0..9f2327b92cd8 100644
--- a/drivers/net/xilinx_emaclite.c
+++ b/drivers/net/xilinx_emaclite.c
@@ -13,6 +13,7 @@
 #include <dm.h>
 #include <console.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <phy.h>
 #include <miiphy.h>
diff --git a/drivers/pci/fsl_pci_init.c b/drivers/pci/fsl_pci_init.c
index 1d09c5ac4f6b..e72a60c13180 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 <asm/fsl_serdes.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/pci/pci-uclass.c b/drivers/pci/pci-uclass.c
index 40cc9f1090ef..7e492b42163c 100644
--- a/drivers/pci/pci-uclass.c
+++ b/drivers/pci/pci-uclass.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <pci.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm/device-internal.h>
 #include <dm/lists.h>
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 664e8379eb55..25a755627c0c 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -17,6 +17,7 @@
 #include <common.h>
 #include <init.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 
 #include <command.h>
diff --git a/drivers/pci/pci_mvebu.c b/drivers/pci/pci_mvebu.c
index c9afe7515014..167fe026e8b9 100644
--- a/drivers/pci/pci_mvebu.c
+++ b/drivers/pci/pci_mvebu.c
@@ -13,6 +13,7 @@
 #include <dm.h>
 #include <log.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <dm/device-internal.h>
 #include <dm/lists.h>
 #include <dm/of_access.h>
diff --git a/drivers/pci/pci_rom.c b/drivers/pci/pci_rom.c
index fa29d69e859a..39284badf202 100644
--- a/drivers/pci/pci_rom.c
+++ b/drivers/pci/pci_rom.c
@@ -38,6 +38,7 @@
 #include <video.h>
 #include <video_fb.h>
 #include <acpi/acpi_s3.h>
+#include <asm/global_data.h>
 #include <linux/screen_info.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/pci/pcie_dw_mvebu.c b/drivers/pci/pcie_dw_mvebu.c
index c773f8d28d2e..33ecd25f848f 100644
--- a/drivers/pci/pcie_dw_mvebu.c
+++ b/drivers/pci/pcie_dw_mvebu.c
@@ -14,6 +14,7 @@
 #include <dm.h>
 #include <log.h>
 #include <pci.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm-generic/gpio.h>
 #include <linux/delay.h>
diff --git a/drivers/pci/pcie_dw_ti.c b/drivers/pci/pcie_dw_ti.c
index 742dd93633e6..16b2a2da7e7d 100644
--- a/drivers/pci/pcie_dw_ti.c
+++ b/drivers/pci/pcie_dw_ti.c
@@ -11,6 +11,7 @@
 #include <power-domain.h>
 #include <regmap.h>
 #include <syscon.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm-generic/gpio.h>
 #include <dm/device_compat.h>
diff --git a/drivers/pci/pcie_ecam_generic.c b/drivers/pci/pcie_ecam_generic.c
index 890b6a8fb69a..354a1454a9f0 100644
--- a/drivers/pci/pcie_ecam_generic.c
+++ b/drivers/pci/pcie_ecam_generic.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <dm.h>
 #include <pci.h>
+#include <asm/global_data.h>
 
 #include <asm/io.h>
 
diff --git a/drivers/pci/pcie_fsl.c b/drivers/pci/pcie_fsl.c
index ab33459e28e0..e431ef211edd 100644
--- a/drivers/pci/pcie_fsl.c
+++ b/drivers/pci/pcie_fsl.c
@@ -13,6 +13,7 @@
 #include <pci.h>
 #include <asm/fsl_pci.h>
 #include <asm/fsl_serdes.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/delay.h>
 #include "pcie_fsl.h"
diff --git a/drivers/pci/pcie_intel_fpga.c b/drivers/pci/pcie_intel_fpga.c
index 9f102c64c602..2aedbdd0e568 100644
--- a/drivers/pci/pcie_intel_fpga.c
+++ b/drivers/pci/pcie_intel_fpga.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <dm.h>
 #include <pci.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
diff --git a/drivers/pci/pcie_layerscape.c b/drivers/pci/pcie_layerscape.c
index 25b5272d4ed7..3c7c4ca18e8b 100644
--- a/drivers/pci/pcie_layerscape.c
+++ b/drivers/pci/pcie_layerscape.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <errno.h>
 #include <malloc.h>
diff --git a/drivers/pci/pcie_layerscape_ep.c b/drivers/pci/pcie_layerscape_ep.c
index eba230e3a5fc..6de93fac997f 100644
--- a/drivers/pci/pcie_layerscape_ep.c
+++ b/drivers/pci/pcie_layerscape_ep.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <asm/global_data.h>
 #include <dm/devres.h>
 #include <errno.h>
 #include <pci_ep.h>
diff --git a/drivers/pci/pcie_layerscape_fixup_common.c b/drivers/pci/pcie_layerscape_fixup_common.c
index fef0a75f1158..814650f1e15c 100644
--- a/drivers/pci/pcie_layerscape_fixup_common.c
+++ b/drivers/pci/pcie_layerscape_fixup_common.c
@@ -11,6 +11,7 @@
 #include <init.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/soc.h>
+#include <linux/libfdt.h>
 #include "pcie_layerscape_fixup_common.h"
 
 void ft_pci_setup(void *blob, struct bd_info *bd)
diff --git a/drivers/pci/pcie_layerscape_gen4.c b/drivers/pci/pcie_layerscape_gen4.c
index 428bfcab09f2..96c6527f806e 100644
--- a/drivers/pci/pcie_layerscape_gen4.c
+++ b/drivers/pci/pcie_layerscape_gen4.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <asm/arch/fsl_serdes.h>
 #include <pci.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <errno.h>
 #include <malloc.h>
diff --git a/drivers/pci/pcie_layerscape_rc.c b/drivers/pci/pcie_layerscape_rc.c
index 25c6ddebce07..7ae5b48bb92c 100644
--- a/drivers/pci/pcie_layerscape_rc.c
+++ b/drivers/pci/pcie_layerscape_rc.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <asm/arch/fsl_serdes.h>
 #include <pci.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <errno.h>
 #include <malloc.h>
diff --git a/drivers/pci/pcie_phytium.c b/drivers/pci/pcie_phytium.c
index 51b2171f9fa0..35ca104300bf 100644
--- a/drivers/pci/pcie_phytium.c
+++ b/drivers/pci/pcie_phytium.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <dm.h>
 #include <pci.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 
 /**
diff --git a/drivers/pci/pcie_rockchip.c b/drivers/pci/pcie_rockchip.c
index 04609f12962f..7d84be36be98 100644
--- a/drivers/pci/pcie_rockchip.c
+++ b/drivers/pci/pcie_rockchip.c
@@ -14,6 +14,7 @@
 #include <common.h>
 #include <clk.h>
 #include <dm.h>
+#include <asm/global_data.h>
 #include <dm/device_compat.h>
 #include <generic-phy.h>
 #include <pci.h>
diff --git a/drivers/pci/pcie_xilinx.c b/drivers/pci/pcie_xilinx.c
index 713ad49d0458..88660a9957a9 100644
--- a/drivers/pci/pcie_xilinx.c
+++ b/drivers/pci/pcie_xilinx.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <dm.h>
 #include <pci.h>
+#include <asm/global_data.h>
 #include <linux/bitops.h>
 
 #include <asm/io.h>
diff --git a/drivers/pci_endpoint/pci_ep-uclass.c b/drivers/pci_endpoint/pci_ep-uclass.c
index 38a5f0837690..71b6bfa63828 100644
--- a/drivers/pci_endpoint/pci_ep-uclass.c
+++ b/drivers/pci_endpoint/pci_ep-uclass.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
+#include <asm/global_data.h>
 #include <linux/log2.h>
 #include <pci_ep.h>
 
diff --git a/drivers/pci_endpoint/pcie-cadence-ep.c b/drivers/pci_endpoint/pcie-cadence-ep.c
index 74dfdde154ee..e392fae338ad 100644
--- a/drivers/pci_endpoint/pcie-cadence-ep.c
+++ b/drivers/pci_endpoint/pcie-cadence-ep.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <pci_ep.h>
+#include <asm/global_data.h>
 #include <linux/sizes.h>
 #include <linux/log2.h>
 #include "pcie-cadence.h"
diff --git a/drivers/phy/marvell/comphy_a3700.c b/drivers/phy/marvell/comphy_a3700.c
index dc188c44e0d6..e9ba4cfec228 100644
--- a/drivers/phy/marvell/comphy_a3700.c
+++ b/drivers/phy/marvell/comphy_a3700.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <fdtdec.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
diff --git a/drivers/phy/marvell/comphy_core.c b/drivers/phy/marvell/comphy_core.c
index 27bff27ff7ec..5ef6129f349d 100644
--- a/drivers/phy/marvell/comphy_core.c
+++ b/drivers/phy/marvell/comphy_core.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <dm.h>
 #include <fdtdec.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm/device_compat.h>
 #include <linux/err.h>
diff --git a/drivers/phy/marvell/comphy_cp110.c b/drivers/phy/marvell/comphy_cp110.c
index 15e80049def6..484b28745e06 100644
--- a/drivers/phy/marvell/comphy_cp110.c
+++ b/drivers/phy/marvell/comphy_cp110.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <fdtdec.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
diff --git a/drivers/phy/omap-usb2-phy.c b/drivers/phy/omap-usb2-phy.c
index adc454ddd48b..ae0968ab5b2e 100644
--- a/drivers/phy/omap-usb2-phy.c
+++ b/drivers/phy/omap-usb2-phy.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm.h>
 #include <errno.h>
diff --git a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
index c5ea6ca31f1c..29749b4c3fa3 100644
--- a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
+++ b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <clk.h>
 #include <dm.h>
+#include <asm/global_data.h>
 #include <dm/device_compat.h>
 #include <dm/lists.h>
 #include <generic-phy.h>
diff --git a/drivers/phy/rockchip/phy-rockchip-pcie.c b/drivers/phy/rockchip/phy-rockchip-pcie.c
index 83928cffe061..c3bec8263f8e 100644
--- a/drivers/phy/rockchip/phy-rockchip-pcie.c
+++ b/drivers/phy/rockchip/phy-rockchip-pcie.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <clk.h>
 #include <dm.h>
+#include <asm/global_data.h>
 #include <dm/device_compat.h>
 #include <generic-phy.h>
 #include <reset.h>
diff --git a/drivers/phy/rockchip/phy-rockchip-typec.c b/drivers/phy/rockchip/phy-rockchip-typec.c
index c9c8e1c54282..6a5dc7ee44f7 100644
--- a/drivers/phy/rockchip/phy-rockchip-typec.c
+++ b/drivers/phy/rockchip/phy-rockchip-typec.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <clk.h>
 #include <dm.h>
+#include <asm/global_data.h>
 #include <dm/device_compat.h>
 #include <dm/lists.h>
 #include <generic-phy.h>
diff --git a/drivers/phy/sti_usb_phy.c b/drivers/phy/sti_usb_phy.c
index 2a20f7601c02..c6b1dc297abc 100644
--- a/drivers/phy/sti_usb_phy.c
+++ b/drivers/phy/sti_usb_phy.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <bitfield.h>
 #include <dm.h>
diff --git a/drivers/phy/ti-pipe3-phy.c b/drivers/phy/ti-pipe3-phy.c
index 3f49851bcaba..41cee0eb740d 100644
--- a/drivers/phy/ti-pipe3-phy.c
+++ b/drivers/phy/ti-pipe3-phy.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <asm/global_data.h>
 #include <dm/device.h>
 #include <generic-phy.h>
 #include <asm/io.h>
diff --git a/drivers/pinctrl/ath79/pinctrl_ar933x.c b/drivers/pinctrl/ath79/pinctrl_ar933x.c
index 61e80818743d..b3f9f6a01fd7 100644
--- a/drivers/pinctrl/ath79/pinctrl_ar933x.c
+++ b/drivers/pinctrl/ath79/pinctrl_ar933x.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm/pinctrl.h>
 #include <mach/ar71xx_regs.h>
diff --git a/drivers/pinctrl/ath79/pinctrl_qca953x.c b/drivers/pinctrl/ath79/pinctrl_qca953x.c
index 2d5a4a3ab238..d27848c1ddd6 100644
--- a/drivers/pinctrl/ath79/pinctrl_qca953x.c
+++ b/drivers/pinctrl/ath79/pinctrl_qca953x.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm/pinctrl.h>
 #include <mach/ar71xx_regs.h>
diff --git a/drivers/pinctrl/exynos/pinctrl-exynos.c b/drivers/pinctrl/exynos/pinctrl-exynos.c
index 4cdc071d559d..cc7ef7998950 100644
--- a/drivers/pinctrl/exynos/pinctrl-exynos.c
+++ b/drivers/pinctrl/exynos/pinctrl-exynos.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include "pinctrl-exynos.h"
 
diff --git a/drivers/pinctrl/meson/pinctrl-meson.c b/drivers/pinctrl/meson/pinctrl-meson.c
index d4539b02d881..664af76d5848 100644
--- a/drivers/pinctrl/meson/pinctrl-meson.c
+++ b/drivers/pinctrl/meson/pinctrl-meson.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <log.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <dm/device-internal.h>
 #include <dm/device_compat.h>
 #include <dm/lists.h>
diff --git a/drivers/pinctrl/mtmips/pinctrl-mt7628.c b/drivers/pinctrl/mtmips/pinctrl-mt7628.c
index fc9d8b5ad10a..1b51c2292717 100644
--- a/drivers/pinctrl/mtmips/pinctrl-mt7628.c
+++ b/drivers/pinctrl/mtmips/pinctrl-mt7628.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <asm/global_data.h>
 #include <dm/pinctrl.h>
 #include <linux/bitops.h>
 #include <linux/io.h>
diff --git a/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c b/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c
index fb497803b939..1f61a84c29dc 100644
--- a/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c
+++ b/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c
@@ -20,6 +20,7 @@
 #include <config.h>
 #include <dm.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <dm/device-internal.h>
 #include <dm/device_compat.h>
 #include <dm/devres.h>
diff --git a/drivers/pinctrl/mvebu/pinctrl-mvebu.c b/drivers/pinctrl/mvebu/pinctrl-mvebu.c
index 2206e958ec70..c2b9c80586bc 100644
--- a/drivers/pinctrl/mvebu/pinctrl-mvebu.c
+++ b/drivers/pinctrl/mvebu/pinctrl-mvebu.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <dm.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <dm/pinctrl.h>
 #include <dm/root.h>
 #include <asm/system.h>
diff --git a/drivers/pinctrl/nxp/pinctrl-imx.c b/drivers/pinctrl/nxp/pinctrl-imx.c
index 48c7bde37526..1596dcc4747e 100644
--- a/drivers/pinctrl/nxp/pinctrl-imx.c
+++ b/drivers/pinctrl/nxp/pinctrl-imx.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <malloc.h>
 #include <mapmem.h>
+#include <asm/global_data.h>
 #include <dm/device_compat.h>
 #include <dm/devres.h>
 #include <linux/bitops.h>
diff --git a/drivers/pinctrl/nxp/pinctrl-imx8.c b/drivers/pinctrl/nxp/pinctrl-imx8.c
index c1b0ca438aa6..7af9506d5049 100644
--- a/drivers/pinctrl/nxp/pinctrl-imx8.c
+++ b/drivers/pinctrl/nxp/pinctrl-imx8.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <asm/global_data.h>
 #include <dm/device.h>
 #include <dm/pinctrl.h>
 
diff --git a/drivers/pinctrl/nxp/pinctrl-mxs.c b/drivers/pinctrl/nxp/pinctrl-mxs.c
index db463fc04b96..1067654e07e1 100644
--- a/drivers/pinctrl/nxp/pinctrl-mxs.c
+++ b/drivers/pinctrl/nxp/pinctrl-mxs.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <dm/device_compat.h>
 #include <dm/devres.h>
 #include <linux/io.h>
diff --git a/drivers/pinctrl/pinctrl-at91-pio4.c b/drivers/pinctrl/pinctrl-at91-pio4.c
index fdb7920b558d..d325422f8547 100644
--- a/drivers/pinctrl/pinctrl-at91-pio4.c
+++ b/drivers/pinctrl/pinctrl-at91-pio4.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <asm/global_data.h>
 #include <dm/pinctrl.h>
 #include <linux/bitops.h>
 #include <linux/io.h>
diff --git a/drivers/pinctrl/pinctrl-at91.c b/drivers/pinctrl/pinctrl-at91.c
index cd7b32ce3460..30f2bebbc78f 100644
--- a/drivers/pinctrl/pinctrl-at91.c
+++ b/drivers/pinctrl/pinctrl-at91.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <dm/pinctrl.h>
 #include <asm/hardware.h>
 #include <linux/bitops.h>
diff --git a/drivers/pinctrl/pinctrl-sti.c b/drivers/pinctrl/pinctrl-sti.c
index 8e942a828023..7d6bdc1d2bd1 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 <asm/global_data.h>
 #include <asm/io.h>
 #include <dm/pinctrl.h>
 #include <linux/bug.h>
diff --git a/drivers/pinctrl/pinctrl-uclass.c b/drivers/pinctrl/pinctrl-uclass.c
index aba881047479..79a523330536 100644
--- a/drivers/pinctrl/pinctrl-uclass.c
+++ b/drivers/pinctrl/pinctrl-uclass.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <dm/device_compat.h>
 #include <linux/libfdt.h>
 #include <linux/err.h>
diff --git a/drivers/pinctrl/pinctrl_pic32.c b/drivers/pinctrl/pinctrl_pic32.c
index 911af1297b8a..79c95034985f 100644
--- a/drivers/pinctrl/pinctrl_pic32.c
+++ b/drivers/pinctrl/pinctrl_pic32.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm/pinctrl.h>
 #include <linux/bitops.h>
diff --git a/drivers/pinctrl/pinctrl_stm32.c b/drivers/pinctrl/pinctrl_stm32.c
index 71fa29a3891f..fedab6605e9e 100644
--- a/drivers/pinctrl/pinctrl_stm32.c
+++ b/drivers/pinctrl/pinctrl_stm32.c
@@ -4,6 +4,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <asm/arch/gpio.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <dm/device_compat.h>
diff --git a/drivers/pinctrl/renesas/pfc-r7s72100.c b/drivers/pinctrl/renesas/pfc-r7s72100.c
index 9d7814a5f25d..b368336c887f 100644
--- a/drivers/pinctrl/renesas/pfc-r7s72100.c
+++ b/drivers/pinctrl/renesas/pfc-r7s72100.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <asm/global_data.h>
 #include <dm/lists.h>
 #include <dm/pinctrl.h>
 #include <linux/bitops.h>
diff --git a/drivers/pinctrl/rockchip/pinctrl-rockchip-core.c b/drivers/pinctrl/rockchip/pinctrl-rockchip-core.c
index ec1cb9b652f3..8abad950431c 100644
--- a/drivers/pinctrl/rockchip/pinctrl-rockchip-core.c
+++ b/drivers/pinctrl/rockchip/pinctrl-rockchip-core.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <dm/pinctrl.h>
 #include <regmap.h>
 #include <syscon.h>
diff --git a/drivers/power/domain/imx8-power-domain-legacy.c b/drivers/power/domain/imx8-power-domain-legacy.c
index 889b65a47ff8..961382f33e1c 100644
--- a/drivers/power/domain/imx8-power-domain-legacy.c
+++ b/drivers/power/domain/imx8-power-domain-legacy.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <power-domain-uclass.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/power-domain.h>
 #include <dm/device-internal.h>
diff --git a/drivers/power/domain/imx8m-power-domain.c b/drivers/power/domain/imx8m-power-domain.c
index 0ef460df8c2d..f6681c7b0b5c 100644
--- a/drivers/power/domain/imx8m-power-domain.c
+++ b/drivers/power/domain/imx8m-power-domain.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <malloc.h>
 #include <power-domain-uclass.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/power-domain.h>
 #include <asm/mach-imx/sys_proto.h>
diff --git a/drivers/power/pmic/bd71837.c b/drivers/power/pmic/bd71837.c
index 31c9139c646d..cb9238972f27 100644
--- a/drivers/power/pmic/bd71837.c
+++ b/drivers/power/pmic/bd71837.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/bd71837.h>
diff --git a/drivers/power/pmic/mc34708.c b/drivers/power/pmic/mc34708.c
index 66253a4a43b0..40d732224b6c 100644
--- a/drivers/power/pmic/mc34708.c
+++ b/drivers/power/pmic/mc34708.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <fsl_pmic.h>
 #include <i2c.h>
+#include <asm/global_data.h>
 #include <power/pmic.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/power/pmic/pca9450.c b/drivers/power/pmic/pca9450.c
index 0c9d9a366e8e..786baa5e2597 100644
--- a/drivers/power/pmic/pca9450.c
+++ b/drivers/power/pmic/pca9450.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/pca9450.h>
diff --git a/drivers/power/regulator/pwm_regulator.c b/drivers/power/regulator/pwm_regulator.c
index f8706227058f..185e38e32a4e 100644
--- a/drivers/power/regulator/pwm_regulator.c
+++ b/drivers/power/regulator/pwm_regulator.c
@@ -12,6 +12,7 @@
 #include <errno.h>
 #include <log.h>
 #include <pwm.h>
+#include <asm/global_data.h>
 #include <dm/device_compat.h>
 #include <power/regulator.h>
 
diff --git a/drivers/pwm/pwm-sifive.c b/drivers/pwm/pwm-sifive.c
index 77bc659fefeb..0b819cfbf788 100644
--- a/drivers/pwm/pwm-sifive.c
+++ b/drivers/pwm/pwm-sifive.c
@@ -18,6 +18,7 @@
 #include <dm.h>
 #include <pwm.h>
 #include <regmap.h>
+#include <asm/global_data.h>
 #include <linux/io.h>
 #include <linux/log2.h>
 #include <linux/bitfield.h>
diff --git a/drivers/pwm/rk_pwm.c b/drivers/pwm/rk_pwm.c
index 911da1d42614..0fb894804b57 100644
--- a/drivers/pwm/rk_pwm.c
+++ b/drivers/pwm/rk_pwm.c
@@ -12,6 +12,7 @@
 #include <pwm.h>
 #include <regmap.h>
 #include <syscon.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch-rockchip/pwm.h>
 #include <linux/bitops.h>
diff --git a/drivers/pwm/sunxi_pwm.c b/drivers/pwm/sunxi_pwm.c
index e2ae1a800919..ffcf60c55842 100644
--- a/drivers/pwm/sunxi_pwm.c
+++ b/drivers/pwm/sunxi_pwm.c
@@ -10,6 +10,7 @@
 #include <pwm.h>
 #include <regmap.h>
 #include <syscon.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/pwm.h>
 #include <asm/arch/gpio.h>
diff --git a/drivers/qe/fdt.c b/drivers/qe/fdt.c
index fd7f14955adb..6195c7c4442c 100644
--- a/drivers/qe/fdt.c
+++ b/drivers/qe/fdt.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <asm/global_data.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <fsl_qe.h>
diff --git a/drivers/qe/qe.c b/drivers/qe/qe.c
index 61ca4760c852..79dcbf049a05 100644
--- a/drivers/qe/qe.c
+++ b/drivers/qe/qe.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <malloc.h>
 #include <command.h>
+#include <asm/global_data.h>
 #include <linux/errno.h>
 #include <asm/io.h>
 #include <linux/immap_qe.h>
diff --git a/drivers/ram/mpc83xx_sdram.c b/drivers/ram/mpc83xx_sdram.c
index a226bac2cc34..2a78291deb5e 100644
--- a/drivers/ram/mpc83xx_sdram.c
+++ b/drivers/ram/mpc83xx_sdram.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <ram.h>
 #include <asm/bitops.h>
+#include <asm/global_data.h>
 #include <dt-bindings/memory/mpc83xx-sdram.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/ram/rockchip/sdram_rk322x.c b/drivers/ram/rockchip/sdram_rk322x.c
index 094693ce2474..4a24854a3df8 100644
--- a/drivers/ram/rockchip/sdram_rk322x.c
+++ b/drivers/ram/rockchip/sdram_rk322x.c
@@ -11,6 +11,7 @@
 #include <ram.h>
 #include <regmap.h>
 #include <syscon.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch-rockchip/clock.h>
 #include <asm/arch-rockchip/cru_rk322x.h>
diff --git a/drivers/ram/sandbox_ram.c b/drivers/ram/sandbox_ram.c
index be4abed0c022..910dce623e90 100644
--- a/drivers/ram/sandbox_ram.c
+++ b/drivers/ram/sandbox_ram.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <ram.h>
+#include <asm/global_data.h>
 #include <asm/test.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/ram/sifive/fu540_ddr.c b/drivers/ram/sifive/fu540_ddr.c
index 2eef1e756586..7208d350f410 100644
--- a/drivers/ram/sifive/fu540_ddr.c
+++ b/drivers/ram/sifive/fu540_ddr.c
@@ -13,6 +13,7 @@
 #include <ram.h>
 #include <regmap.h>
 #include <syscon.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <clk.h>
 #include <wait_bit.h>
diff --git a/drivers/ram/stm32mp1/stm32mp1_interactive.c b/drivers/ram/stm32mp1/stm32mp1_interactive.c
index 38390c0d552c..7b29c368126b 100644
--- a/drivers/ram/stm32mp1/stm32mp1_interactive.c
+++ b/drivers/ram/stm32mp1/stm32mp1_interactive.c
@@ -12,6 +12,7 @@
 #include <malloc.h>
 #include <ram.h>
 #include <reset.h>
+#include <asm/global_data.h>
 #include "stm32mp1_ddr.h"
 #include "stm32mp1_tests.h"
 
diff --git a/drivers/ram/stm32mp1/stm32mp1_tests.c b/drivers/ram/stm32mp1/stm32mp1_tests.c
index 952006aa1493..b0c510ad5e99 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 <watchdog.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/log2.h>
 #include "stm32mp1_tests.h"
diff --git a/drivers/remoteproc/rproc-uclass.c b/drivers/remoteproc/rproc-uclass.c
index 9640a81e5347..22779d0cb0d3 100644
--- a/drivers/remoteproc/rproc-uclass.c
+++ b/drivers/remoteproc/rproc-uclass.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <remoteproc.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm/device-internal.h>
 #include <dm.h>
diff --git a/drivers/remoteproc/ti_power_proc.c b/drivers/remoteproc/ti_power_proc.c
index 350450d1fb44..1a5dddbe0d21 100644
--- a/drivers/remoteproc/ti_power_proc.c
+++ b/drivers/remoteproc/ti_power_proc.c
@@ -10,6 +10,7 @@
 #include <fdtdec.h>
 #include <log.h>
 #include <remoteproc.h>
+#include <asm/global_data.h>
 #include <mach/psc_defs.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/reset/sti-reset.c b/drivers/reset/sti-reset.c
index ac3a99f9bffd..2fdc069ce16e 100644
--- a/drivers/reset/sti-reset.c
+++ b/drivers/reset/sti-reset.c
@@ -13,6 +13,7 @@
 #include <reset-uclass.h>
 #include <regmap.h>
 #include <syscon.h>
+#include <asm/global_data.h>
 #include <dt-bindings/reset/stih407-resets.h>
 #include <linux/bitops.h>
 
diff --git a/drivers/serial/atmel_usart.c b/drivers/serial/atmel_usart.c
index f759ea8893d1..f20659358869 100644
--- a/drivers/serial/atmel_usart.c
+++ b/drivers/serial/atmel_usart.c
@@ -13,6 +13,7 @@
 #include <watchdog.h>
 #include <serial.h>
 #include <debug_uart.h>
+#include <asm/global_data.h>
 #include <linux/compiler.h>
 #include <linux/delay.h>
 
diff --git a/drivers/serial/ns16550.c b/drivers/serial/ns16550.c
index 702109b23b6a..840d89f16fa5 100644
--- a/drivers/serial/ns16550.c
+++ b/drivers/serial/ns16550.c
@@ -14,6 +14,7 @@
 #include <reset.h>
 #include <serial.h>
 #include <watchdog.h>
+#include <asm/global_data.h>
 #include <linux/err.h>
 #include <linux/types.h>
 #include <asm/io.h>
diff --git a/drivers/serial/sandbox.c b/drivers/serial/sandbox.c
index f09d291e043c..8a7f171e0416 100644
--- a/drivers/serial/sandbox.c
+++ b/drivers/serial/sandbox.c
@@ -17,6 +17,7 @@
 #include <os.h>
 #include <serial.h>
 #include <video.h>
+#include <asm/global_data.h>
 #include <linux/compiler.h>
 #include <asm/state.h>
 
diff --git a/drivers/serial/serial-uclass.c b/drivers/serial/serial-uclass.c
index 0027625ebfd1..3dbbd2a79380 100644
--- a/drivers/serial/serial-uclass.c
+++ b/drivers/serial/serial-uclass.c
@@ -12,6 +12,7 @@
 #include <serial.h>
 #include <stdio_dev.h>
 #include <watchdog.h>
+#include <asm/global_data.h>
 #include <dm/lists.h>
 #include <dm/device-internal.h>
 #include <dm/of_access.h>
diff --git a/drivers/serial/serial.c b/drivers/serial/serial.c
index 53358acb81f2..f428ddb2ed5b 100644
--- a/drivers/serial/serial.c
+++ b/drivers/serial/serial.c
@@ -10,6 +10,7 @@
 #include <serial.h>
 #include <stdio_dev.h>
 #include <post.h>
+#include <asm/global_data.h>
 #include <linux/compiler.h>
 #include <errno.h>
 #include <linux/delay.h>
diff --git a/drivers/serial/serial_arc.c b/drivers/serial/serial_arc.c
index 04063fbe3997..c1be34960ecf 100644
--- a/drivers/serial/serial_arc.c
+++ b/drivers/serial/serial_arc.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <dm.h>
 #include <serial.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/serial/serial_linflexuart.c b/drivers/serial/serial_linflexuart.c
index 83dc96c449ca..d8482ba7047c 100644
--- a/drivers/serial/serial_linflexuart.c
+++ b/drivers/serial/serial_linflexuart.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <watchdog.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <serial.h>
 #include <linux/compiler.h>
diff --git a/drivers/serial/serial_lpuart.c b/drivers/serial/serial_lpuart.c
index 95cbe63b3d14..8631d790e6f3 100644
--- a/drivers/serial/serial_lpuart.c
+++ b/drivers/serial/serial_lpuart.c
@@ -10,6 +10,7 @@
 #include <fsl_lpuart.h>
 #include <log.h>
 #include <watchdog.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <serial.h>
 #include <dm/device_compat.h>
diff --git a/drivers/serial/serial_mcf.c b/drivers/serial/serial_mcf.c
index 402fd5343c13..6b907fe19202 100644
--- a/drivers/serial/serial_mcf.c
+++ b/drivers/serial/serial_mcf.c
@@ -17,6 +17,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <asm/global_data.h>
 #include <dm/platform_data/serial_coldfire.h>
 #include <serial.h>
 #include <linux/compiler.h>
diff --git a/drivers/serial/serial_mpc8xx.c b/drivers/serial/serial_mpc8xx.c
index 50d6e70f1773..0978930dcd4f 100644
--- a/drivers/serial/serial_mpc8xx.c
+++ b/drivers/serial/serial_mpc8xx.c
@@ -10,6 +10,7 @@
 #include <serial.h>
 #include <watchdog.h>
 #include <asm/cpm_8xx.h>
+#include <asm/global_data.h>
 #include <linux/compiler.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/serial/serial_msm.c b/drivers/serial/serial_msm.c
index c8946c3aae8d..13c7f9d809ec 100644
--- a/drivers/serial/serial_msm.c
+++ b/drivers/serial/serial_msm.c
@@ -15,6 +15,7 @@
 #include <malloc.h>
 #include <serial.h>
 #include <watchdog.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/compiler.h>
 #include <dm/pinctrl.h>
diff --git a/drivers/serial/serial_mtk.c b/drivers/serial/serial_mtk.c
index 778a04d87e0c..9715f372ecfe 100644
--- a/drivers/serial/serial_mtk.c
+++ b/drivers/serial/serial_mtk.c
@@ -14,6 +14,7 @@
 #include <log.h>
 #include <serial.h>
 #include <watchdog.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/types.h>
 #include <linux/err.h>
diff --git a/drivers/serial/serial_mxc.c b/drivers/serial/serial_mxc.c
index de6cefcd3acf..1f8eeb2cbfe1 100644
--- a/drivers/serial/serial_mxc.c
+++ b/drivers/serial/serial_mxc.c
@@ -9,6 +9,7 @@
 #include <watchdog.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/clock.h>
+#include <asm/global_data.h>
 #include <dm/platform_data/serial_mxc.h>
 #include <serial.h>
 #include <linux/compiler.h>
diff --git a/drivers/serial/serial_ns16550.c b/drivers/serial/serial_ns16550.c
index ef394b723509..1353e2f7ccb5 100644
--- a/drivers/serial/serial_ns16550.c
+++ b/drivers/serial/serial_ns16550.c
@@ -8,6 +8,7 @@
 #include <clock_legacy.h>
 #include <ns16550.h>
 #include <serial.h>
+#include <asm/global_data.h>
 #include <linux/compiler.h>
 
 #ifndef CONFIG_NS16550_MIN_FUNCTIONS
diff --git a/drivers/serial/serial_pic32.c b/drivers/serial/serial_pic32.c
index a492063e39c2..ce6c5db762f3 100644
--- a/drivers/serial/serial_pic32.c
+++ b/drivers/serial/serial_pic32.c
@@ -9,6 +9,7 @@
 #include <malloc.h>
 #include <serial.h>
 #include <wait_bit.h>
+#include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <mach/pic32.h>
 #include <dt-bindings/clock/microchip,clock.h>
diff --git a/drivers/serial/serial_pl01x.c b/drivers/serial/serial_pl01x.c
index 2772c25f1d2d..1ae5bac249a9 100644
--- a/drivers/serial/serial_pl01x.c
+++ b/drivers/serial/serial_pl01x.c
@@ -11,6 +11,7 @@
 /* Simple U-Boot driver for the PrimeCell PL010/PL011 UARTs */
 
 #include <common.h>
+#include <asm/global_data.h>
 /* For get_bus_freq() */
 #include <clock_legacy.h>
 #include <dm.h>
diff --git a/drivers/serial/serial_pxa.c b/drivers/serial/serial_pxa.c
index 6f8f7e1198ae..6fc126f404b7 100644
--- a/drivers/serial/serial_pxa.c
+++ b/drivers/serial/serial_pxa.c
@@ -23,6 +23,7 @@
 #include <hang.h>
 #include <asm/arch/pxa-regs.h>
 #include <asm/arch/regs-uart.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm.h>
 #include <dm/platform_data/serial_pxa.h>
diff --git a/drivers/serial/serial_s5p.c b/drivers/serial/serial_s5p.c
index 9bb2be21e7b8..986c5ca8107e 100644
--- a/drivers/serial/serial_s5p.c
+++ b/drivers/serial/serial_s5p.c
@@ -11,6 +11,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <fdtdec.h>
+#include <asm/global_data.h>
 #include <linux/compiler.h>
 #include <asm/io.h>
 #include <asm/arch/clk.h>
diff --git a/drivers/serial/serial_sh.c b/drivers/serial/serial_sh.c
index 13b179f03ded..d697d62d910c 100644
--- a/drivers/serial/serial_sh.c
+++ b/drivers/serial/serial_sh.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <clk.h>
 #include <dm.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/processor.h>
 #include <serial.h>
diff --git a/drivers/serial/serial_sifive.c b/drivers/serial/serial_sifive.c
index fcc47fb348fd..c3f0a3cb65d2 100644
--- a/drivers/serial/serial_sifive.c
+++ b/drivers/serial/serial_sifive.c
@@ -11,6 +11,7 @@
 #include <fdtdec.h>
 #include <log.h>
 #include <watchdog.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/compiler.h>
 #include <serial.h>
diff --git a/drivers/serial/serial_sti_asc.c b/drivers/serial/serial_sti_asc.c
index 33ff396bff7e..aa3c9efc8a0e 100644
--- a/drivers/serial/serial_sti_asc.c
+++ b/drivers/serial/serial_sti_asc.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <log.h>
 #include <serial.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
 
diff --git a/drivers/smem/msm_smem.c b/drivers/smem/msm_smem.c
index 2557269bc546..bf1696e85e01 100644
--- a/drivers/smem/msm_smem.c
+++ b/drivers/smem/msm_smem.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <errno.h>
 #include <dm.h>
+#include <asm/global_data.h>
 #include <dm/device_compat.h>
 #include <dm/devres.h>
 #include <dm/of_access.h>
diff --git a/drivers/sound/ivybridge_sound.c b/drivers/sound/ivybridge_sound.c
index bc3c1e85f8cf..a7423d46c185 100644
--- a/drivers/sound/ivybridge_sound.c
+++ b/drivers/sound/ivybridge_sound.c
@@ -18,6 +18,7 @@
 #include <log.h>
 #include <pch.h>
 #include <sound.h>
+#include <asm/global_data.h>
 #include <linux/bitops.h>
 
 static int bd82x6x_azalia_probe(struct udevice *dev)
diff --git a/drivers/spi/atcspi200_spi.c b/drivers/spi/atcspi200_spi.c
index 39c6e226ba75..9e7d40d0a81e 100644
--- a/drivers/spi/atcspi200_spi.c
+++ b/drivers/spi/atcspi200_spi.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <spi.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm.h>
 
diff --git a/drivers/spi/bcmstb_spi.c b/drivers/spi/bcmstb_spi.c
index fb1dc46b704c..f400a0f57323 100644
--- a/drivers/spi/bcmstb_spi.c
+++ b/drivers/spi/bcmstb_spi.c
@@ -5,6 +5,7 @@
  * Author: Thomas Fitzsimmons <fitzsim@fitzsim.org>
  */
 
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <command.h>
 #include <config.h>
diff --git a/drivers/spi/cf_spi.c b/drivers/spi/cf_spi.c
index 8fa6d3510756..242dc9d89095 100644
--- a/drivers/spi/cf_spi.c
+++ b/drivers/spi/cf_spi.c
@@ -16,6 +16,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <dm/platform_data/spi_coldfire.h>
 #include <spi.h>
 #include <malloc.h>
diff --git a/drivers/spi/davinci_spi.c b/drivers/spi/davinci_spi.c
index a11433db1e9a..c1b21a8cd358 100644
--- a/drivers/spi/davinci_spi.c
+++ b/drivers/spi/davinci_spi.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <spi.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
 #include <dm.h>
diff --git a/drivers/spi/exynos_spi.c b/drivers/spi/exynos_spi.c
index d338ff5a0bd1..03c03ab4874d 100644
--- a/drivers/spi/exynos_spi.c
+++ b/drivers/spi/exynos_spi.c
@@ -18,6 +18,7 @@
 #include <asm/arch/gpio.h>
 #include <asm/arch/pinmux.h>
 #include <asm/arch/spi.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/delay.h>
 
diff --git a/drivers/spi/fsl_dspi.c b/drivers/spi/fsl_dspi.c
index b22c9b3a09db..1912d676a681 100644
--- a/drivers/spi/fsl_dspi.c
+++ b/drivers/spi/fsl_dspi.c
@@ -9,6 +9,7 @@
  * Haikun Wang (B53464 at freescale.com)
  */
 
+#include <asm/global_data.h>
 #include <linux/math64.h>
 #include <common.h>
 #include <dm.h>
diff --git a/drivers/spi/fsl_espi.c b/drivers/spi/fsl_espi.c
index 5c76fd962e98..3dd98aadbaa7 100644
--- a/drivers/spi/fsl_espi.c
+++ b/drivers/spi/fsl_espi.c
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 
diff --git a/drivers/spi/fsl_qspi.c b/drivers/spi/fsl_qspi.c
index eec968e5ec12..84b4714c0507 100644
--- a/drivers/spi/fsl_qspi.c
+++ b/drivers/spi/fsl_qspi.c
@@ -25,6 +25,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/drivers/spi/mvebu_a3700_spi.c b/drivers/spi/mvebu_a3700_spi.c
index e860b9ec64be..502f5153cc43 100644
--- a/drivers/spi/mvebu_a3700_spi.c
+++ b/drivers/spi/mvebu_a3700_spi.c
@@ -12,6 +12,7 @@
 #include <spi.h>
 #include <clk.h>
 #include <wait_bit.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
diff --git a/drivers/spi/mxc_spi.c b/drivers/spi/mxc_spi.c
index e90a06a66dec..466355b0178e 100644
--- a/drivers/spi/mxc_spi.c
+++ b/drivers/spi/mxc_spi.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <spi.h>
+#include <asm/global_data.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/drivers/spi/omap3_spi.c b/drivers/spi/omap3_spi.c
index fbf9575851a9..afe80e53d2ba 100644
--- a/drivers/spi/omap3_spi.c
+++ b/drivers/spi/omap3_spi.c
@@ -20,6 +20,7 @@
 #include <dm.h>
 #include <spi.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
 
diff --git a/drivers/spi/pic32_spi.c b/drivers/spi/pic32_spi.c
index 52e9eff743c8..ffba2d84f1fd 100644
--- a/drivers/spi/pic32_spi.c
+++ b/drivers/spi/pic32_spi.c
@@ -10,6 +10,7 @@
 #include <clk.h>
 #include <dm.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/compat.h>
 #include <malloc.h>
diff --git a/drivers/spi/pl022_spi.c b/drivers/spi/pl022_spi.c
index 32bb8c8d2127..01ffaea4c346 100644
--- a/drivers/spi/pl022_spi.c
+++ b/drivers/spi/pl022_spi.c
@@ -12,6 +12,7 @@
 #include <clk.h>
 #include <common.h>
 #include <dm.h>
+#include <asm/global_data.h>
 #include <dm/platform_data/spi_pl022.h>
 #include <linux/io.h>
 #include <spi.h>
diff --git a/drivers/spi/renesas_rpc_spi.c b/drivers/spi/renesas_rpc_spi.c
index 3ea59b8fb82a..72a9e464776f 100644
--- a/drivers/spi/renesas_rpc_spi.c
+++ b/drivers/spi/renesas_rpc_spi.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <clk.h>
 #include <dm.h>
diff --git a/drivers/spi/soft_spi.c b/drivers/spi/soft_spi.c
index 153bbf8b2557..87e1e2417cea 100644
--- a/drivers/spi/soft_spi.c
+++ b/drivers/spi/soft_spi.c
@@ -16,6 +16,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <spi.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/drivers/spi/spi-sunxi.c b/drivers/spi/spi-sunxi.c
index cd2e17bfd1a2..be6ef1757a07 100644
--- a/drivers/spi/spi-sunxi.c
+++ b/drivers/spi/spi-sunxi.c
@@ -27,6 +27,7 @@
 #include <fdt_support.h>
 #include <reset.h>
 #include <wait_bit.h>
+#include <asm/global_data.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 
diff --git a/drivers/spi/spi-uclass.c b/drivers/spi/spi-uclass.c
index cffd9cf0b0e7..46b5249f5095 100644
--- a/drivers/spi/spi-uclass.c
+++ b/drivers/spi/spi-uclass.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <spi.h>
+#include <asm/global_data.h>
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
 #include <dm/lists.h>
diff --git a/drivers/spi/tegra20_sflash.c b/drivers/spi/tegra20_sflash.c
index 771744dfe438..5066f43ba614 100644
--- a/drivers/spi/tegra20_sflash.c
+++ b/drivers/spi/tegra20_sflash.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <log.h>
 #include <time.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
 #include <asm/arch/clock.h>
diff --git a/drivers/spi/tegra20_slink.c b/drivers/spi/tegra20_slink.c
index f9846ee3665e..d725a9574854 100644
--- a/drivers/spi/tegra20_slink.c
+++ b/drivers/spi/tegra20_slink.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <log.h>
 #include <time.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch-tegra/clk_rst.h>
diff --git a/drivers/spi/tegra210_qspi.c b/drivers/spi/tegra210_qspi.c
index ae16b45dcb47..293b16c6fe93 100644
--- a/drivers/spi/tegra210_qspi.c
+++ b/drivers/spi/tegra210_qspi.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <log.h>
 #include <time.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch-tegra/clk_rst.h>
diff --git a/drivers/spi/ti_qspi.c b/drivers/spi/ti_qspi.c
index 5fdbb494420f..26cd83be76ab 100644
--- a/drivers/spi/ti_qspi.c
+++ b/drivers/spi/ti_qspi.c
@@ -9,6 +9,7 @@
 #include <cpu_func.h>
 #include <log.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/omap.h>
 #include <malloc.h>
diff --git a/drivers/spi/uniphier_spi.c b/drivers/spi/uniphier_spi.c
index 114bd8abd7a6..2753d0cd2d80 100644
--- a/drivers/spi/uniphier_spi.c
+++ b/drivers/spi/uniphier_spi.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <log.h>
 #include <time.h>
+#include <asm/global_data.h>
 #include <dm/device_compat.h>
 #include <linux/bitfield.h>
 #include <linux/bitops.h>
diff --git a/drivers/spi/zynq_qspi.c b/drivers/spi/zynq_qspi.c
index 3f39ef05f2d6..1358bd103555 100644
--- a/drivers/spi/zynq_qspi.c
+++ b/drivers/spi/zynq_qspi.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <spi.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
 
diff --git a/drivers/spi/zynq_spi.c b/drivers/spi/zynq_spi.c
index 9923931e36ec..b4604a4b2020 100644
--- a/drivers/spi/zynq_spi.c
+++ b/drivers/spi/zynq_spi.c
@@ -12,6 +12,7 @@
 #include <malloc.h>
 #include <spi.h>
 #include <time.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/drivers/spi/zynqmp_gqspi.c b/drivers/spi/zynqmp_gqspi.c
index a72986be9078..cd2c7d40b86e 100644
--- a/drivers/spi/zynqmp_gqspi.c
+++ b/drivers/spi/zynqmp_gqspi.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <clk.h>
 #include <dm.h>
diff --git a/drivers/spmi/spmi-msm.c b/drivers/spmi/spmi-msm.c
index 2f430aed9cb8..6b12a96ee3c0 100644
--- a/drivers/spmi/spmi-msm.c
+++ b/drivers/spmi/spmi-msm.c
@@ -11,6 +11,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <fdtdec.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm/device_compat.h>
 #include <spmi/spmi.h>
diff --git a/drivers/sysreset/sysreset-uclass.c b/drivers/sysreset/sysreset-uclass.c
index 3f5414ed1f8a..d1b47eebac75 100644
--- a/drivers/sysreset/sysreset-uclass.c
+++ b/drivers/sysreset/sysreset-uclass.c
@@ -15,6 +15,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <regmap.h>
+#include <asm/global_data.h>
 #include <dm/device-internal.h>
 #include <dm/lists.h>
 #include <dm/root.h>
diff --git a/drivers/sysreset/sysreset_mpc83xx.c b/drivers/sysreset/sysreset_mpc83xx.c
index 456f006bc126..ddd7e26d6968 100644
--- a/drivers/sysreset/sysreset_mpc83xx.c
+++ b/drivers/sysreset/sysreset_mpc83xx.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <sysreset.h>
 #include <wait_bit.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 
 #include "sysreset_mpc83xx.h"
diff --git a/drivers/sysreset/sysreset_sti.c b/drivers/sysreset/sysreset_sti.c
index 3482d2a07875..8465a62e1855 100644
--- a/drivers/sysreset/sysreset_sti.c
+++ b/drivers/sysreset/sysreset_sti.c
@@ -9,6 +9,7 @@
 #include <regmap.h>
 #include <syscon.h>
 #include <sysreset.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
 
diff --git a/drivers/thermal/imx_scu_thermal.c b/drivers/thermal/imx_scu_thermal.c
index 83ec753802ac..dc92e6b603e9 100644
--- a/drivers/thermal/imx_scu_thermal.c
+++ b/drivers/thermal/imx_scu_thermal.c
@@ -9,6 +9,7 @@
 #include <errno.h>
 #include <log.h>
 #include <thermal.h>
+#include <asm/global_data.h>
 #include <dm/device-internal.h>
 #include <dm/device.h>
 #include <asm/arch/sci/sci.h>
diff --git a/drivers/thermal/imx_tmu.c b/drivers/thermal/imx_tmu.c
index 4ca22089b8b2..d8acfef49252 100644
--- a/drivers/thermal/imx_tmu.c
+++ b/drivers/thermal/imx_tmu.c
@@ -6,6 +6,7 @@
 
 #include <config.h>
 #include <common.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/sys_proto.h>
diff --git a/drivers/timer/arc_timer.c b/drivers/timer/arc_timer.c
index 8c574ec5af1d..c6771d15966e 100644
--- a/drivers/timer/arc_timer.c
+++ b/drivers/timer/arc_timer.c
@@ -8,6 +8,7 @@
 #include <errno.h>
 #include <timer.h>
 #include <asm/arcregs.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/timer/cadence-ttc.c b/drivers/timer/cadence-ttc.c
index e6b6dfe3765c..1ad3b5db8fe4 100644
--- a/drivers/timer/cadence-ttc.c
+++ b/drivers/timer/cadence-ttc.c
@@ -9,6 +9,7 @@
 #include <errno.h>
 #include <init.h>
 #include <timer.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/err.h>
diff --git a/drivers/timer/mpc83xx_timer.c b/drivers/timer/mpc83xx_timer.c
index ad8bb28e8b39..51ad79aa6eb2 100644
--- a/drivers/timer/mpc83xx_timer.c
+++ b/drivers/timer/mpc83xx_timer.c
@@ -14,6 +14,7 @@
 #include <time.h>
 #include <timer.h>
 #include <watchdog.h>
+#include <asm/global_data.h>
 #include <asm/ptrace.h>
 #include <linux/bitops.h>
 
diff --git a/drivers/timer/ostm_timer.c b/drivers/timer/ostm_timer.c
index bea97159ebe7..cd62d8690228 100644
--- a/drivers/timer/ostm_timer.c
+++ b/drivers/timer/ostm_timer.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm.h>
 #include <clk.h>
diff --git a/drivers/timer/rockchip_timer.c b/drivers/timer/rockchip_timer.c
index 7a5a48425277..7e7612f154ea 100644
--- a/drivers/timer/rockchip_timer.c
+++ b/drivers/timer/rockchip_timer.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <init.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <dm/ofnode.h>
 #include <mapmem.h>
 #include <asm/arch-rockchip/timer.h>
diff --git a/drivers/timer/timer-uclass.c b/drivers/timer/timer-uclass.c
index 14dde950a183..d90755a7e74f 100644
--- a/drivers/timer/timer-uclass.c
+++ b/drivers/timer/timer-uclass.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <dm.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <dm/lists.h>
 #include <dm/device-internal.h>
 #include <dm/root.h>
diff --git a/drivers/timer/tsc_timer.c b/drivers/timer/tsc_timer.c
index 93c959ff4445..b4c40fe1c2d5 100644
--- a/drivers/timer/tsc_timer.c
+++ b/drivers/timer/tsc_timer.c
@@ -14,6 +14,7 @@
 #include <time.h>
 #include <timer.h>
 #include <asm/cpu.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/i8254.h>
 #include <asm/ibmpc.h>
diff --git a/drivers/tpm/tpm2_tis_spi.c b/drivers/tpm/tpm2_tis_spi.c
index 9a8145e6ba1f..8ff6c461f19f 100644
--- a/drivers/tpm/tpm2_tis_spi.c
+++ b/drivers/tpm/tpm2_tis_spi.c
@@ -19,6 +19,7 @@
 #include <log.h>
 #include <spi.h>
 #include <tpm-v2.h>
+#include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/usb/common/common.c b/drivers/usb/common/common.c
index d4ae18693c60..400bdf72ad79 100644
--- a/drivers/usb/common/common.c
+++ b/drivers/usb/common/common.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <asm/global_data.h>
 #include <linux/usb/otg.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/phy.h>
diff --git a/drivers/usb/host/dwc3-sti-glue.c b/drivers/usb/host/dwc3-sti-glue.c
index 3e6c1429d665..febbfe5d2438 100644
--- a/drivers/usb/host/dwc3-sti-glue.c
+++ b/drivers/usb/host/dwc3-sti-glue.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm.h>
 #include <errno.h>
diff --git a/drivers/usb/host/ehci-exynos.c b/drivers/usb/host/ehci-exynos.c
index 6a37c5d982a6..9f1ec7ea9263 100644
--- a/drivers/usb/host/ehci-exynos.c
+++ b/drivers/usb/host/ehci-exynos.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <fdtdec.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 #include <malloc.h>
diff --git a/drivers/usb/host/ehci-fsl.c b/drivers/usb/host/ehci-fsl.c
index 5423d10abe77..eed67e77dc67 100644
--- a/drivers/usb/host/ehci-fsl.c
+++ b/drivers/usb/host/ehci-fsl.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <pci.h>
 #include <usb.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <usb/ehci-ci.h>
diff --git a/drivers/usb/host/ehci-marvell.c b/drivers/usb/host/ehci-marvell.c
index 62414bb11028..9f6b8a2ae5fa 100644
--- a/drivers/usb/host/ehci-marvell.c
+++ b/drivers/usb/host/ehci-marvell.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <usb.h>
 #include <linux/delay.h>
diff --git a/drivers/usb/host/ehci-mx5.c b/drivers/usb/host/ehci-mx5.c
index caafa688993f..516d64953591 100644
--- a/drivers/usb/host/ehci-mx5.c
+++ b/drivers/usb/host/ehci-mx5.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <usb.h>
 #include <errno.h>
+#include <asm/global_data.h>
 #include <linux/compiler.h>
 #include <linux/delay.h>
 #include <usb/ehci-ci.h>
diff --git a/drivers/usb/host/ehci-mx6.c b/drivers/usb/host/ehci-mx6.c
index 37b59758bb38..f9e72ba0d967 100644
--- a/drivers/usb/host/ehci-mx6.c
+++ b/drivers/usb/host/ehci-mx6.c
@@ -9,6 +9,7 @@
 #include <usb.h>
 #include <errno.h>
 #include <wait_bit.h>
+#include <asm/global_data.h>
 #include <linux/compiler.h>
 #include <linux/delay.h>
 #include <usb/ehci-ci.h>
diff --git a/drivers/usb/host/ehci-vf.c b/drivers/usb/host/ehci-vf.c
index 2768d4097499..86eac41ea667 100644
--- a/drivers/usb/host/ehci-vf.c
+++ b/drivers/usb/host/ehci-vf.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <usb.h>
 #include <errno.h>
+#include <asm/global_data.h>
 #include <linux/compiler.h>
 #include <asm/io.h>
 #include <asm-generic/gpio.h>
diff --git a/drivers/usb/host/xhci-exynos5.c b/drivers/usb/host/xhci-exynos5.c
index 6fb7a7f6e097..77c2534da44c 100644
--- a/drivers/usb/host/xhci-exynos5.c
+++ b/drivers/usb/host/xhci-exynos5.c
@@ -16,6 +16,7 @@
 #include <dm.h>
 #include <fdtdec.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 #include <malloc.h>
diff --git a/drivers/usb/musb-new/da8xx.c b/drivers/usb/musb-new/da8xx.c
index 67488ddb5049..e13a6810b8da 100644
--- a/drivers/usb/musb-new/da8xx.c
+++ b/drivers/usb/musb-new/da8xx.c
@@ -16,6 +16,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <dm/device-internal.h>
 #include <dm/device_compat.h>
 #include <dm/lists.h>
diff --git a/drivers/usb/musb-new/omap2430.c b/drivers/usb/musb-new/omap2430.c
index da63cc2c2243..fbd5f98f3685 100644
--- a/drivers/usb/musb-new/omap2430.c
+++ b/drivers/usb/musb-new/omap2430.c
@@ -12,6 +12,7 @@
 #include <dm.h>
 #include <log.h>
 #include <serial.h>
+#include <asm/global_data.h>
 #include <dm/device-internal.h>
 #include <dm/device_compat.h>
 #include <dm/lists.h>
diff --git a/drivers/usb/musb-new/pic32.c b/drivers/usb/musb-new/pic32.c
index 2fbe9bebf17e..8995e78fee49 100644
--- a/drivers/usb/musb-new/pic32.c
+++ b/drivers/usb/musb-new/pic32.c
@@ -11,6 +11,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <asm/global_data.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/drivers/usb/musb-new/ti-musb.c b/drivers/usb/musb-new/ti-musb.c
index f4f26d86b3ff..bf58f13480b5 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 <asm/global_data.h>
 #include <linux/usb/otg.h>
 #include <dm/device-internal.h>
 #include <dm/lists.h>
diff --git a/drivers/usb/phy/rockchip_usb2_phy.c b/drivers/usb/phy/rockchip_usb2_phy.c
index f1cf9160d565..93caa821a1d2 100644
--- a/drivers/usb/phy/rockchip_usb2_phy.c
+++ b/drivers/usb/phy/rockchip_usb2_phy.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <hang.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/drivers/video/am335x-fb.c b/drivers/video/am335x-fb.c
index 2707ff59c7d3..2bf4d85d021c 100644
--- a/drivers/video/am335x-fb.c
+++ b/drivers/video/am335x-fb.c
@@ -20,6 +20,7 @@
 #include <asm/arch/hardware.h>
 #include <asm/arch/omap.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/utils.h>
 #include <linux/delay.h>
diff --git a/drivers/video/atmel_hlcdfb.c b/drivers/video/atmel_hlcdfb.c
index 38def2816b2a..bfe76349fda4 100644
--- a/drivers/video/atmel_hlcdfb.c
+++ b/drivers/video/atmel_hlcdfb.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <part.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/gpio.h>
 #include <asm/arch/clk.h>
diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c
index ae8ec26468f0..e5e0aeec3502 100644
--- a/drivers/video/atmel_lcdfb.c
+++ b/drivers/video/atmel_lcdfb.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <part.h>
 #include <video.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/gpio.h>
 #include <asm/arch/clk.h>
diff --git a/drivers/video/bridge/ps862x.c b/drivers/video/bridge/ps862x.c
index 8399c6f74cf8..7e9c6da4545f 100644
--- a/drivers/video/bridge/ps862x.c
+++ b/drivers/video/bridge/ps862x.c
@@ -10,6 +10,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <video_bridge.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 #include <power/regulator.h>
 
diff --git a/drivers/video/broadwell_igd.c b/drivers/video/broadwell_igd.c
index df6a761d2dbb..416a1c07b13f 100644
--- a/drivers/video/broadwell_igd.c
+++ b/drivers/video/broadwell_igd.c
@@ -14,6 +14,7 @@
 #include <vbe.h>
 #include <video.h>
 #include <asm/cpu.h>
+#include <asm/global_data.h>
 #include <asm/intel_regs.h>
 #include <asm/io.h>
 #include <asm/mtrr.h>
diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c
index badade353ec1..3a51ad4a9d42 100644
--- a/drivers/video/cfb_console.c
+++ b/drivers/video/cfb_console.c
@@ -74,6 +74,7 @@
 #include <version.h>
 #include <malloc.h>
 #include <video.h>
+#include <asm/global_data.h>
 #include <linux/compiler.h>
 
 #if defined(CONFIG_VIDEO_MXS)
diff --git a/drivers/video/da8xx-fb.c b/drivers/video/da8xx-fb.c
index 4984dda8477d..462c318126dd 100644
--- a/drivers/video/da8xx-fb.c
+++ b/drivers/video/da8xx-fb.c
@@ -17,6 +17,7 @@
 #include <malloc.h>
 #include <memalign.h>
 #include <video_fb.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/list.h>
 #include <linux/fb.h>
diff --git a/drivers/video/exynos/exynos_dp.c b/drivers/video/exynos/exynos_dp.c
index 999ee1c14af6..36595556f137 100644
--- a/drivers/video/exynos/exynos_dp.c
+++ b/drivers/video/exynos/exynos_dp.c
@@ -11,6 +11,7 @@
 #include <display.h>
 #include <fdtdec.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 #include <malloc.h>
diff --git a/drivers/video/exynos/exynos_fb.c b/drivers/video/exynos/exynos_fb.c
index 979b90918271..26068ab056f2 100644
--- a/drivers/video/exynos/exynos_fb.c
+++ b/drivers/video/exynos/exynos_fb.c
@@ -13,6 +13,7 @@
 #include <dm.h>
 #include <fdtdec.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <linux/libfdt.h>
 #include <panel.h>
 #include <video.h>
diff --git a/drivers/video/exynos/exynos_mipi_dsi.c b/drivers/video/exynos/exynos_mipi_dsi.c
index 042aa9a5b9eb..c56eadc8237b 100644
--- a/drivers/video/exynos/exynos_mipi_dsi.c
+++ b/drivers/video/exynos/exynos_mipi_dsi.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <fdtdec.h>
+#include <asm/global_data.h>
 #include <dm/devres.h>
 #include <linux/libfdt.h>
 #include <linux/compat.h>
diff --git a/drivers/video/fsl_dcu_fb.c b/drivers/video/fsl_dcu_fb.c
index e9d05c93946a..60b97e40633e 100644
--- a/drivers/video/fsl_dcu_fb.c
+++ b/drivers/video/fsl_dcu_fb.c
@@ -8,6 +8,7 @@
 
 #include <init.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <common.h>
 #include <dm.h>
diff --git a/drivers/video/ivybridge_igd.c b/drivers/video/ivybridge_igd.c
index 2587f53ac1d4..cd742b2273cd 100644
--- a/drivers/video/ivybridge_igd.c
+++ b/drivers/video/ivybridge_igd.c
@@ -12,6 +12,7 @@
 #include <pci_rom.h>
 #include <vbe.h>
 #include <video.h>
+#include <asm/global_data.h>
 #include <asm/intel_regs.h>
 #include <asm/io.h>
 #include <asm/mtrr.h>
diff --git a/drivers/video/mali_dp.c b/drivers/video/mali_dp.c
index 1e6da0e1e25f..7f9443828b2d 100644
--- a/drivers/video/mali_dp.c
+++ b/drivers/video/mali_dp.c
@@ -13,6 +13,7 @@
 #include <display.h>
 #endif
 #include <fdtdec.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <os.h>
 #include <fdt_support.h>
diff --git a/drivers/video/meson/meson_vpu.c b/drivers/video/meson/meson_vpu.c
index 4868839ff7df..2d095c6a28eb 100644
--- a/drivers/video/meson/meson_vpu.c
+++ b/drivers/video/meson/meson_vpu.c
@@ -13,6 +13,7 @@
 #include <fdt_support.h>
 #include <log.h>
 #include <part.h>
+#include <asm/global_data.h>
 #include <linux/sizes.h>
 #include <asm/arch/mem.h>
 #include <dm/device-internal.h>
diff --git a/drivers/video/mxsfb.c b/drivers/video/mxsfb.c
index 6589a2a09d23..d84adb004bcc 100644
--- a/drivers/video/mxsfb.c
+++ b/drivers/video/mxsfb.c
@@ -10,6 +10,7 @@
 #include <env.h>
 #include <log.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <dm/device_compat.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/video/rockchip/rk3288_vop.c b/drivers/video/rockchip/rk3288_vop.c
index 68d1507cda46..d1bf82c5b27a 100644
--- a/drivers/video/rockchip/rk3288_vop.c
+++ b/drivers/video/rockchip/rk3288_vop.c
@@ -11,6 +11,7 @@
 #include <regmap.h>
 #include <syscon.h>
 #include <video.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch-rockchip/clock.h>
 #include <asm/arch-rockchip/grf_rk3288.h>
diff --git a/drivers/video/rockchip/rk3399_vop.c b/drivers/video/rockchip/rk3399_vop.c
index d5a7aa8ac1b3..fe424d51f73b 100644
--- a/drivers/video/rockchip/rk3399_vop.c
+++ b/drivers/video/rockchip/rk3399_vop.c
@@ -12,6 +12,7 @@
 #include <regmap.h>
 #include <video.h>
 #include <asm/arch-rockchip/hardware.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include "rk_vop.h"
 
diff --git a/drivers/video/rockchip/rk_lvds.c b/drivers/video/rockchip/rk_lvds.c
index 04f795a213c0..24f3caabb011 100644
--- a/drivers/video/rockchip/rk_lvds.c
+++ b/drivers/video/rockchip/rk_lvds.c
@@ -11,6 +11,7 @@
 #include <panel.h>
 #include <regmap.h>
 #include <syscon.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <asm/arch-rockchip/clock.h>
diff --git a/drivers/video/rockchip/rk_mipi.c b/drivers/video/rockchip/rk_mipi.c
index f811913ce5e2..2e235cb6c2cd 100644
--- a/drivers/video/rockchip/rk_mipi.c
+++ b/drivers/video/rockchip/rk_mipi.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <panel.h>
 #include <regmap.h>
+#include <asm/global_data.h>
 #include "rk_mipi.h"
 #include <syscon.h>
 #include <asm/gpio.h>
diff --git a/drivers/video/rockchip/rk_vop.c b/drivers/video/rockchip/rk_vop.c
index 9032eb430e7f..7e864698697a 100644
--- a/drivers/video/rockchip/rk_vop.c
+++ b/drivers/video/rockchip/rk_vop.c
@@ -13,6 +13,7 @@
 #include <regmap.h>
 #include <syscon.h>
 #include <video.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <asm/arch-rockchip/clock.h>
diff --git a/drivers/video/sandbox_sdl.c b/drivers/video/sandbox_sdl.c
index d806f35debba..48470e6f5567 100644
--- a/drivers/video/sandbox_sdl.c
+++ b/drivers/video/sandbox_sdl.c
@@ -8,6 +8,7 @@
 #include <fdtdec.h>
 #include <log.h>
 #include <video.h>
+#include <asm/global_data.h>
 #include <asm/sdl.h>
 #include <asm/state.h>
 #include <asm/u-boot-sandbox.h>
diff --git a/drivers/video/simplefb.c b/drivers/video/simplefb.c
index 0c5b40c30b8d..e7c2e184ba5c 100644
--- a/drivers/video/simplefb.c
+++ b/drivers/video/simplefb.c
@@ -9,6 +9,7 @@
 #include <fdt_support.h>
 #include <log.h>
 #include <video.h>
+#include <asm/global_data.h>
 
 static int simple_video_probe(struct udevice *dev)
 {
diff --git a/drivers/video/stm32/stm32_dsi.c b/drivers/video/stm32/stm32_dsi.c
index 283151398bbf..b09ecb73365b 100644
--- a/drivers/video/stm32/stm32_dsi.c
+++ b/drivers/video/stm32/stm32_dsi.c
@@ -18,6 +18,7 @@
 #include <reset.h>
 #include <video.h>
 #include <video_bridge.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/gpio.h>
 #include <dm/device-internal.h>
diff --git a/drivers/video/stm32/stm32_ltdc.c b/drivers/video/stm32/stm32_ltdc.c
index 2f3427a32ee6..ac031dc6c943 100644
--- a/drivers/video/stm32/stm32_ltdc.c
+++ b/drivers/video/stm32/stm32_ltdc.c
@@ -14,6 +14,7 @@
 #include <reset.h>
 #include <video.h>
 #include <video_bridge.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/gpio.h>
 #include <dm/device-internal.h>
diff --git a/drivers/video/sunxi/sunxi_lcd.c b/drivers/video/sunxi/sunxi_lcd.c
index 49bf083a8d14..10f7e2ac2346 100644
--- a/drivers/video/sunxi/sunxi_lcd.c
+++ b/drivers/video/sunxi/sunxi_lcd.c
@@ -12,6 +12,7 @@
 #include <backlight.h>
 #include <dm.h>
 #include <edid.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/lcdc.h>
diff --git a/drivers/video/tegra.c b/drivers/video/tegra.c
index 827ea13d13a5..a32478ea6277 100644
--- a/drivers/video/tegra.c
+++ b/drivers/video/tegra.c
@@ -12,6 +12,7 @@
 #include <pwm.h>
 #include <video.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <asm/system.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
diff --git a/drivers/video/video-uclass.c b/drivers/video/video-uclass.c
index 650891e49dd0..1654d02860be 100644
--- a/drivers/video/video-uclass.c
+++ b/drivers/video/video-uclass.c
@@ -14,6 +14,7 @@
 #include <video.h>
 #include <video_console.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <dm/lists.h>
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
diff --git a/drivers/video/videomodes.c b/drivers/video/videomodes.c
index 89003eea7276..ed7373eac84b 100644
--- a/drivers/video/videomodes.c
+++ b/drivers/video/videomodes.c
@@ -60,6 +60,7 @@
 #include <edid.h>
 #include <env.h>
 #include <errno.h>
+#include <fdtdec.h>
 #include <linux/ctype.h>
 
 #include "videomodes.h"
diff --git a/drivers/watchdog/armada-37xx-wdt.c b/drivers/watchdog/armada-37xx-wdt.c
index 5da8e56505fb..7af680a5c250 100644
--- a/drivers/watchdog/armada-37xx-wdt.c
+++ b/drivers/watchdog/armada-37xx-wdt.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <dm.h>
 #include <wdt.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
diff --git a/drivers/watchdog/at91sam9_wdt.c b/drivers/watchdog/at91sam9_wdt.c
index 33f5c351d5be..e64831132dc7 100644
--- a/drivers/watchdog/at91sam9_wdt.c
+++ b/drivers/watchdog/at91sam9_wdt.c
@@ -15,6 +15,7 @@
  */
 
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/at91_wdt.h>
 #include <common.h>
diff --git a/drivers/watchdog/mt7621_wdt.c b/drivers/watchdog/mt7621_wdt.c
index 1cd8866ef8d8..ff5c3243ce73 100644
--- a/drivers/watchdog/mt7621_wdt.c
+++ b/drivers/watchdog/mt7621_wdt.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <dm.h>
 #include <wdt.h>
+#include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/io.h>
 
diff --git a/drivers/watchdog/orion_wdt.c b/drivers/watchdog/orion_wdt.c
index d33e2ac3dc19..3284321299d0 100644
--- a/drivers/watchdog/orion_wdt.c
+++ b/drivers/watchdog/orion_wdt.c
@@ -17,6 +17,7 @@
 #include <clk.h>
 #include <log.h>
 #include <wdt.h>
+#include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/kernel.h>
 #include <asm/io.h>
diff --git a/drivers/watchdog/sbsa_gwdt.c b/drivers/watchdog/sbsa_gwdt.c
index 2eae431ba6c1..b837b045fa59 100644
--- a/drivers/watchdog/sbsa_gwdt.c
+++ b/drivers/watchdog/sbsa_gwdt.c
@@ -5,6 +5,7 @@
  * Copyright 2020 NXP
  */
 
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <common.h>
 #include <dm/device.h>
diff --git a/drivers/watchdog/sp805_wdt.c b/drivers/watchdog/sp805_wdt.c
index 23fef2147f8f..0eea0ab388ec 100644
--- a/drivers/watchdog/sp805_wdt.c
+++ b/drivers/watchdog/sp805_wdt.c
@@ -6,6 +6,7 @@
  */
 
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <common.h>
 #include <clk.h>
diff --git a/drivers/watchdog/wdt-uclass.c b/drivers/watchdog/wdt-uclass.c
index e632f077f342..28f7918c4673 100644
--- a/drivers/watchdog/wdt-uclass.c
+++ b/drivers/watchdog/wdt-uclass.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <time.h>
 #include <wdt.h>
+#include <asm/global_data.h>
 #include <dm/device-internal.h>
 #include <dm/lists.h>
 
diff --git a/drivers/xen/gnttab.c b/drivers/xen/gnttab.c
index becf7a79fbfc..a706dfac8ae7 100644
--- a/drivers/xen/gnttab.c
+++ b/drivers/xen/gnttab.c
@@ -19,6 +19,7 @@
 #include <log.h>
 #include <malloc.h>
 
+#include <asm/global_data.h>
 #include <asm/armv8/mmu.h>
 #include <asm/io.h>
 #include <asm/xen/system.h>
diff --git a/env/callback.c b/env/callback.c
index 4054b9ef58b3..638a02b28f78 100644
--- a/env/callback.c
+++ b/env/callback.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <env.h>
 #include <env_internal.h>
+#include <asm/global_data.h>
 
 #if defined(CONFIG_NEEDS_MANUAL_RELOC)
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/env/common.c b/env/common.c
index ed18378000f8..d6d1fa3a1f7d 100644
--- a/env/common.c
+++ b/env/common.c
@@ -14,6 +14,7 @@
 #include <env_internal.h>
 #include <log.h>
 #include <sort.h>
+#include <asm/global_data.h>
 #include <linux/stddef.h>
 #include <search.h>
 #include <errno.h>
diff --git a/env/eeprom.c b/env/eeprom.c
index e300470ad0fc..ba168014e248 100644
--- a/env/eeprom.c
+++ b/env/eeprom.c
@@ -12,6 +12,7 @@
 #include <eeprom.h>
 #include <env.h>
 #include <env_internal.h>
+#include <asm/global_data.h>
 #include <linux/stddef.h>
 #include <u-boot/crc.h>
 #if defined(CONFIG_I2C_ENV_EEPROM_BUS)
diff --git a/env/env.c b/env/env.c
index 42c7d8155e1a..51f55ec3fe87 100644
--- a/env/env.c
+++ b/env/env.c
@@ -8,6 +8,7 @@
 #include <env.h>
 #include <env_internal.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/bug.h>
 
diff --git a/env/ext4.c b/env/ext4.c
index f823b694099b..d4869a1a4577 100644
--- a/env/ext4.c
+++ b/env/ext4.c
@@ -31,6 +31,7 @@
 #include <errno.h>
 #include <ext4fs.h>
 #include <mmc.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/env/flash.c b/env/flash.c
index 722d5adf8b69..ebee9069e4e3 100644
--- a/env/flash.c
+++ b/env/flash.c
@@ -15,6 +15,7 @@
 #include <env_internal.h>
 #include <flash.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <linux/stddef.h>
 #include <malloc.h>
 #include <search.h>
diff --git a/env/mmc.c b/env/mmc.c
index ba872701b0d5..3fecdff816ba 100644
--- a/env/mmc.c
+++ b/env/mmc.c
@@ -6,6 +6,7 @@
 /* #define DEBUG */
 
 #include <common.h>
+#include <asm/global_data.h>
 
 #include <command.h>
 #include <env.h>
diff --git a/env/nand.c b/env/nand.c
index 0d7ee19bc232..be82e97d69cd 100644
--- a/env/nand.c
+++ b/env/nand.c
@@ -17,6 +17,7 @@
 #include <command.h>
 #include <env.h>
 #include <env_internal.h>
+#include <asm/global_data.h>
 #include <linux/stddef.h>
 #include <malloc.h>
 #include <memalign.h>
diff --git a/env/nowhere.c b/env/nowhere.c
index d33fdf27d0c4..23028661084c 100644
--- a/env/nowhere.c
+++ b/env/nowhere.c
@@ -11,6 +11,7 @@
 #include <command.h>
 #include <env.h>
 #include <env_internal.h>
+#include <asm/global_data.h>
 #include <linux/stddef.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/env/nvram.c b/env/nvram.c
index 7c8ea26f9682..f4126858b5b4 100644
--- a/env/nvram.c
+++ b/env/nvram.c
@@ -27,6 +27,7 @@
 #include <command.h>
 #include <env.h>
 #include <env_internal.h>
+#include <asm/global_data.h>
 #include <linux/stddef.h>
 #include <search.h>
 #include <errno.h>
diff --git a/env/onenand.c b/env/onenand.c
index a2477cef9bed..c8da3ff8114b 100644
--- a/env/onenand.c
+++ b/env/onenand.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <command.h>
 #include <env_internal.h>
+#include <asm/global_data.h>
 #include <linux/stddef.h>
 #include <malloc.h>
 #include <search.h>
diff --git a/env/remote.c b/env/remote.c
index d93a137376e3..166bebf52b5b 100644
--- a/env/remote.c
+++ b/env/remote.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <command.h>
 #include <env_internal.h>
+#include <asm/global_data.h>
 #include <linux/stddef.h>
 #include <u-boot/crc.h>
 
diff --git a/env/sf.c b/env/sf.c
index 937778aa37d5..f01d1dbcb216 100644
--- a/env/sf.c
+++ b/env/sf.c
@@ -20,6 +20,7 @@
 #include <errno.h>
 #include <uuid.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <dm/device-internal.h>
 #include <u-boot/crc.h>
 
diff --git a/env/ubi.c b/env/ubi.c
index 5502efe28b62..eb21c4f38b49 100644
--- a/env/ubi.c
+++ b/env/ubi.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <asm/global_data.h>
 
 #include <command.h>
 #include <env.h>
diff --git a/examples/standalone/stubs.c b/examples/standalone/stubs.c
index 5fb460454f23..3e326fc64052 100644
--- a/examples/standalone/stubs.c
+++ b/examples/standalone/stubs.c
@@ -1,5 +1,6 @@
 #include <common.h>
 #include <exports.h>
+#include <asm/global_data.h>
 #include <linux/compiler.h>
 
 struct cmd_tbl;
diff --git a/fs/ext4/ext4_journal.c b/fs/ext4/ext4_journal.c
index 1a340b4764c6..361baa35c921 100644
--- a/fs/ext4/ext4_journal.c
+++ b/fs/ext4/ext4_journal.c
@@ -19,6 +19,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <ext_common.h>
+#include <asm/global_data.h>
 #include "ext4_common.h"
 
 static struct revoke_blk_list *revk_blk_list;
diff --git a/fs/ext4/ext4_journal.h b/fs/ext4/ext4_journal.h
index 43fb8e766411..8c974cff609d 100644
--- a/fs/ext4/ext4_journal.h
+++ b/fs/ext4/ext4_journal.h
@@ -17,6 +17,7 @@
 #ifndef __EXT4_JRNL__
 #define __EXT4_JRNL__
 
+#include <asm/global_data.h>
 #define EXT4_FEATURE_COMPAT_HAS_JOURNAL		0x0004
 
 #define EXT2_JOURNAL_INO		8	/* Journal inode */
diff --git a/fs/ext4/ext4fs.c b/fs/ext4/ext4fs.c
index 4c89152ce4ad..691d7e29b6d7 100644
--- a/fs/ext4/ext4fs.c
+++ b/fs/ext4/ext4fs.c
@@ -24,11 +24,11 @@
 #include <blk.h>
 #include <ext_common.h>
 #include <ext4fs.h>
-#include "ext4_common.h"
 #include <div64.h>
 #include <malloc.h>
 #include <part.h>
 #include <uuid.h>
+#include "ext4_common.h"
 
 int ext4fs_symlinknest;
 struct ext_filesystem ext_fs;
diff --git a/fs/fs.c b/fs/fs.c
index 17e4bc33f762..07e5767df433 100644
--- a/fs/fs.c
+++ b/fs/fs.c
@@ -18,6 +18,7 @@
 #include <sandboxfs.h>
 #include <ubifs_uboot.h>
 #include <btrfs.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <div64.h>
 #include <linux/math64.h>
diff --git a/fs/reiserfs/reiserfs_private.h b/fs/reiserfs/reiserfs_private.h
index c8867e24fefa..5936f2140056 100644
--- a/fs/reiserfs/reiserfs_private.h
+++ b/fs/reiserfs/reiserfs_private.h
@@ -15,6 +15,8 @@
  * from the original reiser fs code, as found in the linux kernel.
  */
 
+#include <compiler.h>
+
 #ifndef __BYTE_ORDER
 #if defined(__LITTLE_ENDIAN) && !defined(__BIG_ENDIAN)
 #define __BYTE_ORDER __LITTLE_ENDIAN
diff --git a/fs/ubifs/ubifs.c b/fs/ubifs/ubifs.c
index 70beb848e1b0..d6be5c947d7e 100644
--- a/fs/ubifs/ubifs.c
+++ b/fs/ubifs/ubifs.c
@@ -17,6 +17,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <memalign.h>
+#include <asm/global_data.h>
 #include "ubifs.h"
 #include <part.h>
 #include <dm/devres.h>
diff --git a/include/audio_codec.h b/include/audio_codec.h
index 258709954693..2ea4ff096e62 100644
--- a/include/audio_codec.h
+++ b/include/audio_codec.h
@@ -7,6 +7,8 @@
 #ifndef __AUDIO_CODEC_H__
 #define __AUDIO_CODEC_H__
 
+struct udevice;
+
 /*
  * An audio codec turns digital data into sound with various parameters to
  * control its operation.
diff --git a/include/axi.h b/include/axi.h
index 3e40692cdfda..59fb0b2e4584 100644
--- a/include/axi.h
+++ b/include/axi.h
@@ -7,6 +7,8 @@
 #ifndef _AXI_H_
 #define _AXI_H_
 
+struct udevice;
+
 /**
  * enum axi_size_t - Determine size of AXI transfer
  * @AXI_SIZE_8:  AXI sransfer is 8-bit wide
diff --git a/include/backlight.h b/include/backlight.h
index ac59eb293b45..b44da50bc306 100644
--- a/include/backlight.h
+++ b/include/backlight.h
@@ -7,6 +7,8 @@
 #ifndef _BACKLIGHT_H
 #define _BACKLIGHT_H
 
+struct udevice;
+
 enum {
 	BACKLIGHT_MAX		= 100,
 	BACKLIGHT_MIN		= 0,
diff --git a/include/board.h b/include/board.h
index 678b652b0aa3..a43f35a021b0 100644
--- a/include/board.h
+++ b/include/board.h
@@ -4,6 +4,8 @@
  * Mario Six,  Guntermann & Drunck GmbH, mario.six at gdsys.cc
  */
 
+struct udevice;
+
 /*
  * This uclass encapsulates hardware methods to gather information about a
  * board or a specific device such as hard-wired GPIOs on GPIO expanders,
@@ -32,6 +34,7 @@
  */
 
 #if CONFIG_IS_ENABLED(BOARD)
+
 struct board_ops {
 	/**
 	 * detect() - Run the hardware info detection procedure for this
diff --git a/include/bootcount.h b/include/bootcount.h
index cd304039849b..bb235407e301 100644
--- a/include/bootcount.h
+++ b/include/bootcount.h
@@ -7,6 +7,7 @@
 #define _BOOTCOUNT_H__
 
 #include <common.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/byteorder.h>
 #include <env.h>
diff --git a/include/cache.h b/include/cache.h
index 32f59fd8f714..ecb7956efd5c 100644
--- a/include/cache.h
+++ b/include/cache.h
@@ -6,6 +6,8 @@
 #ifndef __CACHE_H
 #define __CACHE_H
 
+struct udevice;
+
 /*
  * Structure for the cache controller
  */
diff --git a/include/common.h b/include/common.h
index f0679ac70544..71df59bca0e5 100644
--- a/include/common.h
+++ b/include/common.h
@@ -23,7 +23,6 @@
 #include <stdio.h>
 #include <linux/kernel.h>
 #include <asm/u-boot.h> /* boot information for Linux kernel */
-#include <asm/global_data.h>	/* global data used for startup functions */
 #include <display_options.h>
 #include <vsprintf.h>
 #endif	/* __ASSEMBLY__ */
diff --git a/include/cpu.h b/include/cpu.h
index 78e88b9ed092..089e74c262b3 100644
--- a/include/cpu.h
+++ b/include/cpu.h
@@ -7,6 +7,8 @@
 #ifndef __CPU_H
 #define __CPU_H
 
+struct udevice;
+
 /**
  * struct cpu_platdata - platform data for a CPU
  * @cpu_id:	   Platform-specific way of identifying the CPU.
diff --git a/include/dm/device-internal.h b/include/dm/device-internal.h
index 5145fb4e1459..c29134976aa0 100644
--- a/include/dm/device-internal.h
+++ b/include/dm/device-internal.h
@@ -10,6 +10,7 @@
 #ifndef _DM_DEVICE_INTERNAL_H
 #define _DM_DEVICE_INTERNAL_H
 
+#include <asm/global_data.h>
 #include <dm/ofnode.h>
 
 struct device_node;
diff --git a/include/dma.h b/include/dma.h
index 6ff591977b14..a64580a61ff7 100644
--- a/include/dma.h
+++ b/include/dma.h
@@ -13,6 +13,8 @@
 #include <linux/errno.h>
 #include <linux/types.h>
 
+struct udevice;
+
 /*
  * enum dma_direction - dma transfer direction indicator
  * @DMA_MEM_TO_MEM: Memcpy mode
diff --git a/include/exports.h b/include/exports.h
index b30055409164..e89cc333e52a 100644
--- a/include/exports.h
+++ b/include/exports.h
@@ -2,6 +2,7 @@
 #define __EXPORTS_H__
 
 #include <irq_func.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 
 #ifndef __ASSEMBLY__
diff --git a/include/ext_common.h b/include/ext_common.h
index bc3324172a08..30a0c248414a 100644
--- a/include/ext_common.h
+++ b/include/ext_common.h
@@ -20,6 +20,8 @@
 #ifndef __EXT_COMMON__
 #define __EXT_COMMON__
 
+#include <compiler.h>
+
 struct cmd_tbl;
 
 #define SECTOR_SIZE		0x200
diff --git a/include/image-sparse.h b/include/image-sparse.h
index 234c237b845f..0572dbd0a283 100644
--- a/include/image-sparse.h
+++ b/include/image-sparse.h
@@ -3,6 +3,7 @@
  * Copyright 2014 Broadcom Corporation.
  */
 
+#include <compiler.h>
 #include <part.h>
 #include <sparse_format.h>
 
diff --git a/include/init.h b/include/init.h
index 0f48ccb57ad2..3b00e1d8aca9 100644
--- a/include/init.h
+++ b/include/init.h
@@ -10,16 +10,15 @@
 #ifndef __INIT_H_
 #define __INIT_H_	1
 
-#include <linux/types.h>
-
-struct global_data;
-
 #ifndef __ASSEMBLY__		/* put C only stuff in this section */
 
+#include <linux/types.h>
+
 /* Avoid using CONFIG_EFI_STUB directly as we may boot from other loaders */
 #ifdef CONFIG_EFI_STUB
 #define ll_boot_init()	false
 #else
+#include <asm/global_data.h>
 #define ll_boot_init()	(!(gd->flags & GD_FLG_SKIP_LL_INIT))
 #endif
 
diff --git a/include/led.h b/include/led.h
index 7bfdddfd6fab..02766fa56fb6 100644
--- a/include/led.h
+++ b/include/led.h
@@ -7,6 +7,8 @@
 #ifndef __LED_H
 #define __LED_H
 
+struct udevice;
+
 /**
  * struct led_uc_plat - Platform data the uclass stores about each device
  *
diff --git a/include/libata.h b/include/libata.h
index b03b29960df5..10e6057ef4a9 100644
--- a/include/libata.h
+++ b/include/libata.h
@@ -10,8 +10,6 @@
 #ifndef __LIBATA_H__
 #define __LIBATA_H__
 
-#include <common.h>
-
 enum {
 	/* various global constants */
 	ATA_MAX_DEVICES		= 2,	/* per bus/port */
diff --git a/include/misc.h b/include/misc.h
index 12d1325ee26e..82ec2ce79368 100644
--- a/include/misc.h
+++ b/include/misc.h
@@ -6,6 +6,8 @@
 #ifndef _MISC_H_
 #define _MISC_H_
 
+struct udevice;
+
 /**
  * misc_read() - Read the device to buffer, optional.
  * @dev: the device
diff --git a/include/netdev.h b/include/netdev.h
index b1eb5fc10467..0ad9f8dc3a5c 100644
--- a/include/netdev.h
+++ b/include/netdev.h
@@ -12,6 +12,8 @@
 #define _NETDEV_H_
 #include <phy_interface.h>
 
+struct udevice;
+
 /*
  * Board and CPU-specific initialization functions
  * board_eth_init() has highest priority.  cpu_eth_init() only
diff --git a/include/pci.h b/include/pci.h
index 2089db9f16f8..a98ac209eac8 100644
--- a/include/pci.h
+++ b/include/pci.h
@@ -825,9 +825,7 @@ int pci_last_busno(void);
 extern void pci_mpc85xx_init (struct pci_controller *hose);
 #endif
 
-#ifdef CONFIG_PCIE_IMX
 extern void imx_pcie_remove(void);
-#endif
 
 #if !defined(CONFIG_DM_PCI) || defined(CONFIG_DM_PCI_COMPAT)
 /**
diff --git a/include/power/as3722.h b/include/power/as3722.h
index 27828570559e..f5398123f2a9 100644
--- a/include/power/as3722.h
+++ b/include/power/as3722.h
@@ -6,6 +6,8 @@
 #ifndef __POWER_AS3722_H__
 #define __POWER_AS3722_H__
 
+struct udevice;
+
 #define AS3722_GPIO_OUTPUT_VDDH (1 << 0)
 #define AS3722_GPIO_INVERT (1 << 1)
 
diff --git a/include/power/regulator.h b/include/power/regulator.h
index 74938dd61e49..d9eb9cae2b79 100644
--- a/include/power/regulator.h
+++ b/include/power/regulator.h
@@ -7,6 +7,8 @@
 #ifndef _INCLUDE_REGULATOR_H_
 #define _INCLUDE_REGULATOR_H_
 
+struct udevice;
+
 /**
  * U-Boot Voltage/Current Regulator
  * ================================
diff --git a/include/pwm.h b/include/pwm.h
index 54ae3e64c310..f9959706ceb6 100644
--- a/include/pwm.h
+++ b/include/pwm.h
@@ -10,6 +10,8 @@
 #ifndef _pwm_h_
 #define _pwm_h_
 
+struct udevice;
+
 /* struct pwm_ops: Operations for the PWM uclass */
 struct pwm_ops {
 	/**
diff --git a/include/ram.h b/include/ram.h
index 67e22d76c930..273d41539400 100644
--- a/include/ram.h
+++ b/include/ram.h
@@ -7,6 +7,8 @@
 #ifndef __RAM_H
 #define __RAM_H
 
+struct udevice;
+
 struct ram_info {
 	phys_addr_t base;
 	size_t size;
diff --git a/include/scsi.h b/include/scsi.h
index 96cb7266762e..61619e89a7f5 100644
--- a/include/scsi.h
+++ b/include/scsi.h
@@ -9,6 +9,8 @@
 #include <asm/cache.h>
 #include <linux/dma-direction.h>
 
+struct udevice;
+
 struct scsi_cmd {
 	unsigned char		cmd[16];					/* command				   */
 	/* for request sense */
diff --git a/include/soc.h b/include/soc.h
index a55eb1b5724e..a52a300a84a6 100644
--- a/include/soc.h
+++ b/include/soc.h
@@ -9,6 +9,8 @@
 
 #define SOC_MAX_STR_SIZE	128
 
+struct udevice;
+
 /**
  * struct soc_attr - Contains SoC identify information to be used in
  *		     SoC matching. An array of these structs
diff --git a/include/sysreset.h b/include/sysreset.h
index 61295e3fcbb7..8bb094d463b3 100644
--- a/include/sysreset.h
+++ b/include/sysreset.h
@@ -7,6 +7,8 @@
 #ifndef __SYSRESET_H
 #define __SYSRESET_H
 
+struct udevice;
+
 enum sysreset_t {
 	SYSRESET_WARM,	/* Reset CPU, keep GPIOs active */
 	SYSRESET_COLD,	/* Reset CPU and GPIOs */
diff --git a/include/tee.h b/include/tee.h
index 8207d0c02afb..99367b258e29 100644
--- a/include/tee.h
+++ b/include/tee.h
@@ -7,6 +7,8 @@
 #define __TEE_H
 
 #include <linux/bitops.h>
+#include <linux/list.h>
+
 #define TEE_UUID_LEN		16
 
 #define TEE_GEN_CAP_GP          BIT(0)	/* GlobalPlatform compliant TEE */
diff --git a/include/tlv_eeprom.h b/include/tlv_eeprom.h
index 1de2fe2337ce..9f4a109dca9b 100644
--- a/include/tlv_eeprom.h
+++ b/include/tlv_eeprom.h
@@ -7,6 +7,8 @@
 #ifndef __TLV_EEPROM_H_
 #define __TLV_EEPROM_H_
 
+#include <compiler.h>
+
 /*
  *  The Definition of the TlvInfo EEPROM format can be found at onie.org or
  *  github.com/onie
diff --git a/include/tpm-common.h b/include/tpm-common.h
index e29b10b1766e..c1309a2735d1 100644
--- a/include/tpm-common.h
+++ b/include/tpm-common.h
@@ -9,6 +9,8 @@
 
 #include <command.h>
 
+struct udevice;
+
 enum tpm_duration {
 	TPM_SHORT = 0,
 	TPM_MEDIUM = 1,
diff --git a/include/tpm-v1.h b/include/tpm-v1.h
index 59ad4aecf42c..8f6cc28a9ea6 100644
--- a/include/tpm-v1.h
+++ b/include/tpm-v1.h
@@ -10,6 +10,8 @@
 #include <tpm-common.h>
 #include <linux/bitops.h>
 
+struct udevice;
+
 /* Useful constants */
 enum {
 	TPM_REQUEST_HEADER_LENGTH	= 10,
diff --git a/include/tpm-v2.h b/include/tpm-v2.h
index f6c045d35480..3b2fe4490072 100644
--- a/include/tpm-v2.h
+++ b/include/tpm-v2.h
@@ -11,6 +11,8 @@
 
 #define TPM2_DIGEST_LEN		32
 
+struct udevice;
+
 /**
  * TPM2 Structure Tags for command/response buffers.
  *
diff --git a/include/tps6586x.h b/include/tps6586x.h
index 785eb39229d0..aa4270c65e33 100644
--- a/include/tps6586x.h
+++ b/include/tps6586x.h
@@ -7,6 +7,8 @@
 #ifndef _TPS6586X_H_
 #define _TPS6586X_H_
 
+struct udevice;
+
 enum {
 	/* SM0-2 PWM/PFM Mode Selection */
 	TPS6586X_PWM_SM0	= 1 << 0,
diff --git a/include/ufs.h b/include/ufs.h
index 0592a763dd9f..bda135cf1841 100644
--- a/include/ufs.h
+++ b/include/ufs.h
@@ -1,6 +1,9 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
 #ifndef _UFS_H
 #define _UFS_H
+
+struct udevice;
+
 /**
  * ufs_probe() - initialize all devices in the UFS uclass
  *
diff --git a/lib/acpi/acpi_table.c b/lib/acpi/acpi_table.c
index acc55e7fad69..a3b0fb3bce00 100644
--- a/lib/acpi/acpi_table.c
+++ b/lib/acpi/acpi_table.c
@@ -13,6 +13,7 @@
 #include <tables_csum.h>
 #include <version.h>
 #include <acpi/acpi_table.h>
+#include <asm/global_data.h>
 #include <dm/acpi.h>
 
 int acpi_create_dmar(struct acpi_dmar *dmar, enum dmar_flags flags)
diff --git a/lib/asm-offsets.c b/lib/asm-offsets.c
index b17651ed63d8..ee592cfda1cc 100644
--- a/lib/asm-offsets.c
+++ b/lib/asm-offsets.c
@@ -13,6 +13,7 @@
 
 #include <common.h>
 #include <asm-offsets.h>
+#include <asm/global_data.h>
 
 #include <linux/kbuild.h>
 
diff --git a/lib/efi/efi_app.c b/lib/efi/efi_app.c
index b7e19c347509..907bacd716a7 100644
--- a/lib/efi/efi_app.c
+++ b/lib/efi/efi_app.c
@@ -15,6 +15,7 @@
 #include <errno.h>
 #include <init.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <linux/err.h>
 #include <linux/types.h>
 #include <efi.h>
diff --git a/lib/efi/efi_info.c b/lib/efi/efi_info.c
index 35a8a9325f84..4d78923c4d40 100644
--- a/lib/efi/efi_info.c
+++ b/lib/efi/efi_info.c
@@ -9,6 +9,7 @@
 #include <efi.h>
 #include <errno.h>
 #include <mapmem.h>
+#include <asm/global_data.h>
 
 int efi_info_get(enum efi_entry_t type, void **datap, int *sizep)
 {
diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c
index d49145fc76b6..d07e36caa3f4 100644
--- a/lib/efi_loader/efi_boottime.c
+++ b/lib/efi_loader/efi_boottime.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <time.h>
+#include <asm/global_data.h>
 #include <linux/libfdt_env.h>
 #include <u-boot/crc.h>
 #include <bootm.h>
diff --git a/lib/efi_loader/efi_gop.c b/lib/efi_loader/efi_gop.c
index 53f6d970f735..1206b2d7a2c8 100644
--- a/lib/efi_loader/efi_gop.c
+++ b/lib/efi_loader/efi_gop.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <video.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c
index 7be756e370d3..302bbcda887a 100644
--- a/lib/efi_loader/efi_memory.c
+++ b/lib/efi_loader/efi_memory.c
@@ -12,6 +12,7 @@
 #include <mapmem.h>
 #include <watchdog.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <linux/list_sort.h>
 #include <linux/sizes.h>
 
diff --git a/lib/efi_loader/efi_rng.c b/lib/efi_loader/efi_rng.c
index caef4085b077..974a3ed7281b 100644
--- a/lib/efi_loader/efi_rng.c
+++ b/lib/efi_loader/efi_rng.c
@@ -9,6 +9,7 @@
 #include <efi_rng.h>
 #include <log.h>
 #include <rng.h>
+#include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/lib/efi_loader/efi_runtime.c b/lib/efi_loader/efi_runtime.c
index 78fd8014d901..d0235c46e185 100644
--- a/lib/efi_loader/efi_runtime.c
+++ b/lib/efi_loader/efi_runtime.c
@@ -14,6 +14,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <rtc.h>
+#include <asm/global_data.h>
 #include <u-boot/crc.h>
 
 /* For manual relocation support */
diff --git a/lib/fdtdec.c b/lib/fdtdec.c
index 78576b530fd6..8fccb9e602a3 100644
--- a/lib/fdtdec.c
+++ b/lib/fdtdec.c
@@ -21,6 +21,7 @@
 #include <mapmem.h>
 #include <linux/libfdt.h>
 #include <serial.h>
+#include <asm/global_data.h>
 #include <asm/sections.h>
 #include <linux/ctype.h>
 #include <linux/lzo.h>
diff --git a/lib/optee/optee.c b/lib/optee/optee.c
index 457d4cca8a0a..ed9731680233 100644
--- a/lib/optee/optee.c
+++ b/lib/optee/optee.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <fdtdec.h>
 #include <image.h>
 #include <log.h>
 #include <malloc.h>
diff --git a/lib/time.c b/lib/time.c
index 47f8c84327d8..1a2a1166cf8a 100644
--- a/lib/time.c
+++ b/lib/time.c
@@ -13,6 +13,7 @@
 #include <timer.h>
 #include <watchdog.h>
 #include <div64.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/delay.h>
 
diff --git a/lib/trace.c b/lib/trace.c
index 831283c283d9..854e495ed715 100644
--- a/lib/trace.c
+++ b/lib/trace.c
@@ -7,6 +7,7 @@
 #include <mapmem.h>
 #include <time.h>
 #include <trace.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/sections.h>
 
diff --git a/lib/zlib/zlib.c b/lib/zlib/zlib.c
index 90e05e7d4d95..85193d1aa349 100644
--- a/lib/zlib/zlib.c
+++ b/lib/zlib/zlib.c
@@ -13,6 +13,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 
 #ifdef CONFIG_GZIP_COMPRESSED
 #define NO_DUMMY_DECL
diff --git a/net/eth-uclass.c b/net/eth-uclass.c
index 0d9b75a9a20a..9b5c3c04eccb 100644
--- a/net/eth-uclass.c
+++ b/net/eth-uclass.c
@@ -11,6 +11,7 @@
 #include <env.h>
 #include <log.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
 #include <net/pcap.h>
diff --git a/net/eth_legacy.c b/net/eth_legacy.c
index 992d1880bf3e..5e51164a8cd3 100644
--- a/net/eth_legacy.c
+++ b/net/eth_legacy.c
@@ -13,6 +13,7 @@
 #include <log.h>
 #include <net.h>
 #include <phy.h>
+#include <asm/global_data.h>
 #include <linux/bug.h>
 #include <linux/errno.h>
 #include <net/pcap.h>
diff --git a/net/tftp.c b/net/tftp.c
index 84e970bec134..239dbfcc2f15 100644
--- a/net/tftp.c
+++ b/net/tftp.c
@@ -14,6 +14,7 @@
 #include <log.h>
 #include <mapmem.h>
 #include <net.h>
+#include <asm/global_data.h>
 #include <net/tftp.h>
 #include "bootp.h"
 #ifdef CONFIG_SYS_DIRECT_FLASH_TFTP
diff --git a/post/drivers/memory.c b/post/drivers/memory.c
index e90ada3ce854..281989da6fa7 100644
--- a/post/drivers/memory.c
+++ b/post/drivers/memory.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <asm/global_data.h>
 
 /* Memory test
  *
diff --git a/post/post.c b/post/post.c
index 6687e0b75cac..c344ec5810f7 100644
--- a/post/post.c
+++ b/post/post.c
@@ -14,6 +14,7 @@
 #include <watchdog.h>
 #include <div64.h>
 #include <post.h>
+#include <asm/global_data.h>
 
 #ifdef CONFIG_SYS_POST_HOTKEYS_GPIO
 #include <asm/gpio.h>
diff --git a/test/bloblist.c b/test/bloblist.c
index 4e537ee1b9c4..b93e2713dfd3 100644
--- a/test/bloblist.c
+++ b/test/bloblist.c
@@ -7,6 +7,7 @@
 #include <bloblist.h>
 #include <log.h>
 #include <mapmem.h>
+#include <asm/global_data.h>
 #include <test/suites.h>
 #include <test/test.h>
 #include <test/ut.h>
diff --git a/test/dm/acpi.c b/test/dm/acpi.c
index 16aa1616c948..9ded00ad168f 100644
--- a/test/dm/acpi.c
+++ b/test/dm/acpi.c
@@ -17,6 +17,7 @@
 #include <acpi/acpigen.h>
 #include <acpi/acpi_device.h>
 #include <acpi/acpi_table.h>
+#include <asm/global_data.h>
 #include <dm/acpi.h>
 #include <dm/test.h>
 #include <test/ut.h>
diff --git a/test/dm/blk.c b/test/dm/blk.c
index f34c13f7511c..4eef4048de48 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 <asm/global_data.h>
 #include <asm/state.h>
 #include <dm/test.h>
 #include <test/test.h>
diff --git a/test/dm/bus.c b/test/dm/bus.c
index 865e8bd9fbed..3808305f24fe 100644
--- a/test/dm/bus.c
+++ b/test/dm/bus.c
@@ -9,6 +9,7 @@
 #include <os.h>
 #endif
 #include <dm.h>
+#include <asm/global_data.h>
 #include <dm/device.h>
 #include <dm/device-internal.h>
 #include <dm/test.h>
diff --git a/test/dm/core.c b/test/dm/core.c
index 8ed5bf73705b..6a77c4fcc83a 100644
--- a/test/dm/core.c
+++ b/test/dm/core.c
@@ -11,6 +11,7 @@
 #include <fdtdec.h>
 #include <log.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <dm/device-internal.h>
 #include <dm/root.h>
 #include <dm/util.h>
diff --git a/test/dm/fdtdec.c b/test/dm/fdtdec.c
index 716993f706fb..69badfbb08ee 100644
--- a/test/dm/fdtdec.c
+++ b/test/dm/fdtdec.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <asm/global_data.h>
 #include <dm/of_extra.h>
 #include <dm/test.h>
 #include <test/ut.h>
diff --git a/test/dm/ram.c b/test/dm/ram.c
index f01236c8cd5c..f624343138d6 100644
--- a/test/dm/ram.c
+++ b/test/dm/ram.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <dm.h>
 #include <ram.h>
+#include <asm/global_data.h>
 #include <dm/test.h>
 #include <test/test.h>
 #include <test/ut.h>
diff --git a/test/dm/test-fdt.c b/test/dm/test-fdt.c
index ac8ce99f5120..e615a18a01ed 100644
--- a/test/dm/test-fdt.c
+++ b/test/dm/test-fdt.c
@@ -9,6 +9,7 @@
 #include <fdtdec.h>
 #include <log.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm/test.h>
 #include <dm/root.h>
diff --git a/test/dm/test-main.c b/test/dm/test-main.c
index 38b7b1481a77..8dc59fc636f1 100644
--- a/test/dm/test-main.c
+++ b/test/dm/test-main.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <log.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <asm/state.h>
 #include <dm/test.h>
 #include <dm/root.h>
diff --git a/test/log/nolog_test.c b/test/log/nolog_test.c
index c418ed07c9a2..cb4fb3db9a20 100644
--- a/test/log/nolog_test.c
+++ b/test/log/nolog_test.c
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <console.h>
+#include <asm/global_data.h>
 #include <test/log.h>
 #include <test/test.h>
 #include <test/suites.h>
diff --git a/test/log/syslog_test.c b/test/log/syslog_test.c
index 120a8b2537b9..ac2df3fb7c07 100644
--- a/test/log/syslog_test.c
+++ b/test/log/syslog_test.c
@@ -11,6 +11,7 @@
 #define LOG_DEBUG
 
 #include <common.h>
+#include <asm/global_data.h>
 #include <dm/device.h>
 #include <hexdump.h>
 #include <test/log.h>
diff --git a/test/ut.c b/test/ut.c
index 95bdd66de6af..556e9694ee17 100644
--- a/test/ut.c
+++ b/test/ut.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <console.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <test/test.h>
 #include <test/ut.h>
 
-- 
2.17.1

^ permalink raw reply related	[flat|nested] 35+ messages in thread

* [RFCv2 02/16] common: Drop display_options.h from common header
  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   ` Tom Rini
  2020-08-19 13:08   ` [RFCv2 03/16] common: Drop linux/printk.h " Tom Rini
                     ` (14 subsequent siblings)
  16 siblings, 0 replies; 35+ messages in thread
From: Tom Rini @ 2020-08-19 13:08 UTC (permalink / raw)
  To: u-boot

From: Simon Glass <sjg@chromium.org>

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

Signed-off-by: Simon Glass <sjg@chromium.org>
---
 arch/arm/cpu/armv7/s5p-common/cpu_info.c      | 1 +
 arch/arm/mach-at91/arm926ejs/eflash.c         | 1 +
 arch/arm/mach-imx/hab.c                       | 1 +
 arch/powerpc/cpu/mpc85xx/cpu.c                | 1 +
 arch/powerpc/cpu/mpc85xx/cpu_init.c           | 1 +
 arch/powerpc/cpu/mpc85xx/tlb.c                | 1 +
 arch/powerpc/cpu/mpc86xx/cpu.c                | 1 +
 arch/powerpc/cpu/mpc8xx/cpu.c                 | 1 +
 arch/powerpc/cpu/mpc8xxx/law.c                | 1 +
 arch/x86/cpu/broadwell/refcode.c              | 1 +
 board/corscience/tricorder/tricorder-eeprom.c | 1 +
 board/freescale/ls1028a/ls1028a.c             | 1 +
 board/freescale/ls1088a/ls1088a.c             | 1 +
 board/freescale/ls2080a/ls2080a.c             | 1 +
 board/freescale/ls2080aqds/ls2080aqds.c       | 1 +
 board/freescale/ls2080ardb/ls2080ardb.c       | 1 +
 board/freescale/lx2160a/lx2160a.c             | 1 +
 board/freescale/mpc8541cds/mpc8541cds.c       | 1 +
 board/freescale/mpc8548cds/mpc8548cds.c       | 1 +
 board/freescale/mpc8555cds/mpc8555cds.c       | 1 +
 board/freescale/mpc8568mds/mpc8568mds.c       | 1 +
 board/gdsys/p1022/controlcenterd-id.c         | 1 +
 board/kosagi/novena/novena.c                  | 1 +
 board/sbc8548/sbc8548.c                       | 1 +
 cmd/acpi.c                                    | 1 +
 cmd/axi.c                                     | 1 +
 cmd/bcb.c                                     | 1 +
 cmd/cpu.c                                     | 1 +
 cmd/fpgad.c                                   | 1 +
 cmd/io.c                                      | 1 +
 cmd/mem.c                                     | 1 +
 cmd/mmc.c                                     | 1 +
 cmd/rtc.c                                     | 1 +
 cmd/sf.c                                      | 1 +
 cmd/version.c                                 | 1 +
 common/board_f.c                              | 1 +
 common/board_r.c                              | 1 +
 common/console.c                              | 1 +
 common/image.c                                | 1 +
 common/splash.c                               | 1 +
 drivers/core/acpi.c                           | 1 +
 drivers/cpu/bmips_cpu.c                       | 1 +
 drivers/ddr/fsl/main.c                        | 1 +
 drivers/mmc/gen_atmel_mci.c                   | 1 +
 drivers/mtd/onenand/onenand_uboot.c           | 1 +
 drivers/mtd/spi/sf_dataflash.c                | 1 +
 drivers/mtd/spi/spi-nor-core.c                | 1 +
 drivers/net/xilinx_axi_emac.c                 | 1 +
 drivers/tpm/tpm_atmel_twi.c                   | 1 +
 drivers/tpm/tpm_tis_sandbox.c                 | 1 +
 drivers/usb/gadget/pxa27x_udc.c               | 1 +
 fs/fs.c                                       | 1 +
 include/common.h                              | 1 -
 include/display_options.h                     | 1 +
 lib/aes.c                                     | 1 +
 lib/display_options.c                         | 1 +
 lib/fdtdec.c                                  | 1 +
 net/nfs.c                                     | 1 +
 net/tftp.c                                    | 1 +
 59 files changed, 58 insertions(+), 1 deletion(-)

diff --git a/arch/arm/cpu/armv7/s5p-common/cpu_info.c b/arch/arm/cpu/armv7/s5p-common/cpu_info.c
index d910282e2b29..fb2920950d42 100644
--- a/arch/arm/cpu/armv7/s5p-common/cpu_info.c
+++ b/arch/arm/cpu/armv7/s5p-common/cpu_info.c
@@ -4,6 +4,7 @@
  * Minkyu Kang <mk7.kang@samsung.com>
  */
 #include <common.h>
+#include <display_options.h>
 #include <fdtdec.h>
 #include <init.h>
 #include <asm/global_data.h>
diff --git a/arch/arm/mach-at91/arm926ejs/eflash.c b/arch/arm/mach-at91/arm926ejs/eflash.c
index 23c24936edf0..ef579e6089ce 100644
--- a/arch/arm/mach-at91/arm926ejs/eflash.c
+++ b/arch/arm/mach-at91/arm926ejs/eflash.c
@@ -43,6 +43,7 @@
  * do a read-modify-write for partially programmed pages
  */
 #include <common.h>
+#include <display_options.h>
 #include <flash.h>
 #include <log.h>
 #include <asm/io.h>
diff --git a/arch/arm/mach-imx/hab.c b/arch/arm/mach-imx/hab.c
index d0757d8b66af..7510735bf463 100644
--- a/arch/arm/mach-imx/hab.c
+++ b/arch/arm/mach-imx/hab.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <command.h>
 #include <config.h>
+#include <display_options.h>
 #include <fuse.h>
 #include <mapmem.h>
 #include <image.h>
diff --git a/arch/powerpc/cpu/mpc85xx/cpu.c b/arch/powerpc/cpu/mpc85xx/cpu.c
index 5170610f0413..d35c97801722 100644
--- a/arch/powerpc/cpu/mpc85xx/cpu.c
+++ b/arch/powerpc/cpu/mpc85xx/cpu.c
@@ -11,6 +11,7 @@
 #include <config.h>
 #include <common.h>
 #include <cpu_func.h>
+#include <display_options.h>
 #include <init.h>
 #include <irq_func.h>
 #include <log.h>
diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init.c b/arch/powerpc/cpu/mpc85xx/cpu_init.c
index e0f0f7ecda60..fcc2c7be31a9 100644
--- a/arch/powerpc/cpu/mpc85xx/cpu_init.c
+++ b/arch/powerpc/cpu/mpc85xx/cpu_init.c
@@ -10,6 +10,7 @@
  */
 
 #include <common.h>
+#include <display_options.h>
 #include <env.h>
 #include <init.h>
 #include <net.h>
diff --git a/arch/powerpc/cpu/mpc85xx/tlb.c b/arch/powerpc/cpu/mpc85xx/tlb.c
index 973b6fbe4b74..927df4e5b660 100644
--- a/arch/powerpc/cpu/mpc85xx/tlb.c
+++ b/arch/powerpc/cpu/mpc85xx/tlb.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <display_options.h>
 #include <asm/bitops.h>
 #include <asm/global_data.h>
 #include <asm/processor.h>
diff --git a/arch/powerpc/cpu/mpc86xx/cpu.c b/arch/powerpc/cpu/mpc86xx/cpu.c
index 98b42bff7a3b..051607785667 100644
--- a/arch/powerpc/cpu/mpc86xx/cpu.c
+++ b/arch/powerpc/cpu/mpc86xx/cpu.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <cpu_func.h>
+#include <display_options.h>
 #include <log.h>
 #include <time.h>
 #include <vsprintf.h>
diff --git a/arch/powerpc/cpu/mpc8xx/cpu.c b/arch/powerpc/cpu/mpc8xx/cpu.c
index 893aecef21c2..f79a06d19a2b 100644
--- a/arch/powerpc/cpu/mpc8xx/cpu.c
+++ b/arch/powerpc/cpu/mpc8xx/cpu.c
@@ -18,6 +18,7 @@
 
 #include <common.h>
 #include <cpu_func.h>
+#include <display_options.h>
 #include <net.h>
 #include <time.h>
 #include <vsprintf.h>
diff --git a/arch/powerpc/cpu/mpc8xxx/law.c b/arch/powerpc/cpu/mpc8xxx/law.c
index cf03f4101906..ff4b878aa9c1 100644
--- a/arch/powerpc/cpu/mpc8xxx/law.c
+++ b/arch/powerpc/cpu/mpc8xxx/law.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <display_options.h>
 #include <asm/bitops.h>
 #include <asm/global_data.h>
 #include <linux/compiler.h>
diff --git a/arch/x86/cpu/broadwell/refcode.c b/arch/x86/cpu/broadwell/refcode.c
index 6c04dde992d8..1e0a34de0c8b 100644
--- a/arch/x86/cpu/broadwell/refcode.c
+++ b/arch/x86/cpu/broadwell/refcode.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <display_options.h>
 #include <errno.h>
 #include <init.h>
 #include <log.h>
diff --git a/board/corscience/tricorder/tricorder-eeprom.c b/board/corscience/tricorder/tricorder-eeprom.c
index 192af304d9fb..d0b91864c27f 100644
--- a/board/corscience/tricorder/tricorder-eeprom.c
+++ b/board/corscience/tricorder/tricorder-eeprom.c
@@ -6,6 +6,7 @@
  */
 #include <common.h>
 #include <command.h>
+#include <display_options.h>
 #include <eeprom.h>
 #include <i2c.h>
 #include <u-boot/crc.h>
diff --git a/board/freescale/ls1028a/ls1028a.c b/board/freescale/ls1028a/ls1028a.c
index f3c1d958b72a..984883bb00f5 100644
--- a/board/freescale/ls1028a/ls1028a.c
+++ b/board/freescale/ls1028a/ls1028a.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <display_options.h>
 #include <init.h>
 #include <malloc.h>
 #include <errno.h>
diff --git a/board/freescale/ls1088a/ls1088a.c b/board/freescale/ls1088a/ls1088a.c
index 2ba6a3990d90..41453709eac1 100644
--- a/board/freescale/ls1088a/ls1088a.c
+++ b/board/freescale/ls1088a/ls1088a.c
@@ -3,6 +3,7 @@
  * Copyright 2017-2018 NXP
  */
 #include <common.h>
+#include <display_options.h>
 #include <env.h>
 #include <i2c.h>
 #include <init.h>
diff --git a/board/freescale/ls2080a/ls2080a.c b/board/freescale/ls2080a/ls2080a.c
index 48437a52e401..020e7bfcb5cc 100644
--- a/board/freescale/ls2080a/ls2080a.c
+++ b/board/freescale/ls2080a/ls2080a.c
@@ -3,6 +3,7 @@
  * Copyright 2014 Freescale Semiconductor
  */
 #include <common.h>
+#include <display_options.h>
 #include <init.h>
 #include <malloc.h>
 #include <errno.h>
diff --git a/board/freescale/ls2080aqds/ls2080aqds.c b/board/freescale/ls2080aqds/ls2080aqds.c
index a6f6897eb09d..3ab93388724d 100644
--- a/board/freescale/ls2080aqds/ls2080aqds.c
+++ b/board/freescale/ls2080aqds/ls2080aqds.c
@@ -3,6 +3,7 @@
  * Copyright 2015 Freescale Semiconductor
  */
 #include <common.h>
+#include <display_options.h>
 #include <env.h>
 #include <init.h>
 #include <malloc.h>
diff --git a/board/freescale/ls2080ardb/ls2080ardb.c b/board/freescale/ls2080ardb/ls2080ardb.c
index 26ce5a80edf7..a6ece49c01ea 100644
--- a/board/freescale/ls2080ardb/ls2080ardb.c
+++ b/board/freescale/ls2080ardb/ls2080ardb.c
@@ -4,6 +4,7 @@
  * Copyright 2017 NXP
  */
 #include <common.h>
+#include <display_options.h>
 #include <env.h>
 #include <init.h>
 #include <malloc.h>
diff --git a/board/freescale/lx2160a/lx2160a.c b/board/freescale/lx2160a/lx2160a.c
index efd2a5c40e17..1d781841c401 100644
--- a/board/freescale/lx2160a/lx2160a.c
+++ b/board/freescale/lx2160a/lx2160a.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <clock_legacy.h>
+#include <display_options.h>
 #include <dm.h>
 #include <init.h>
 #include <asm/global_data.h>
diff --git a/board/freescale/mpc8541cds/mpc8541cds.c b/board/freescale/mpc8541cds/mpc8541cds.c
index 5b4fbd5e304e..3986d81c62d6 100644
--- a/board/freescale/mpc8541cds/mpc8541cds.c
+++ b/board/freescale/mpc8541cds/mpc8541cds.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <display_options.h>
 #include <init.h>
 #include <pci.h>
 #include <vsprintf.h>
diff --git a/board/freescale/mpc8548cds/mpc8548cds.c b/board/freescale/mpc8548cds/mpc8548cds.c
index a1a9742bfa4a..fd51c0e8018b 100644
--- a/board/freescale/mpc8548cds/mpc8548cds.c
+++ b/board/freescale/mpc8548cds/mpc8548cds.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <display_options.h>
 #include <init.h>
 #include <net.h>
 #include <pci.h>
diff --git a/board/freescale/mpc8555cds/mpc8555cds.c b/board/freescale/mpc8555cds/mpc8555cds.c
index 3bb8e769c80a..d91763ae800c 100644
--- a/board/freescale/mpc8555cds/mpc8555cds.c
+++ b/board/freescale/mpc8555cds/mpc8555cds.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <display_options.h>
 #include <init.h>
 #include <pci.h>
 #include <vsprintf.h>
diff --git a/board/freescale/mpc8568mds/mpc8568mds.c b/board/freescale/mpc8568mds/mpc8568mds.c
index 7b379464cd59..1acdf93e4d79 100644
--- a/board/freescale/mpc8568mds/mpc8568mds.c
+++ b/board/freescale/mpc8568mds/mpc8568mds.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <display_options.h>
 #include <flash.h>
 #include <init.h>
 #include <log.h>
diff --git a/board/gdsys/p1022/controlcenterd-id.c b/board/gdsys/p1022/controlcenterd-id.c
index 1b5aa9042f57..495ef8e1f837 100644
--- a/board/gdsys/p1022/controlcenterd-id.c
+++ b/board/gdsys/p1022/controlcenterd-id.c
@@ -13,6 +13,7 @@
 #include <common.h>
 #include <bootstage.h>
 #include <command.h>
+#include <display_options.h>
 #include <dm.h>
 #include <env.h>
 #include <hang.h>
diff --git a/board/kosagi/novena/novena.c b/board/kosagi/novena/novena.c
index 0e1b4a0a46ce..815ecf55c4df 100644
--- a/board/kosagi/novena/novena.c
+++ b/board/kosagi/novena/novena.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <display_options.h>
 #include <dm.h>
 #include <eeprom.h>
 #include <init.h>
diff --git a/board/sbc8548/sbc8548.c b/board/sbc8548/sbc8548.c
index bd4b528d03f7..13a66507ffce 100644
--- a/board/sbc8548/sbc8548.c
+++ b/board/sbc8548/sbc8548.c
@@ -10,6 +10,7 @@
  */
 
 #include <common.h>
+#include <display_options.h>
 #include <init.h>
 #include <log.h>
 #include <net.h>
diff --git a/cmd/acpi.c b/cmd/acpi.c
index 126d6d3bc991..6fa61c5fb89c 100644
--- a/cmd/acpi.c
+++ b/cmd/acpi.c
@@ -5,6 +5,7 @@
  */
 #include <common.h>
 #include <command.h>
+#include <display_options.h>
 #include <mapmem.h>
 #include <acpi/acpi_table.h>
 #include <asm/acpi_table.h>
diff --git a/cmd/axi.c b/cmd/axi.c
index c9d53c049e82..36508223c34b 100644
--- a/cmd/axi.c
+++ b/cmd/axi.c
@@ -13,6 +13,7 @@
 #include <axi.h>
 #include <command.h>
 #include <console.h>
+#include <display_options.h>
 #include <dm.h>
 #include <log.h>
 
diff --git a/cmd/bcb.c b/cmd/bcb.c
index e03218066bf2..81e099fbb1b4 100644
--- a/cmd/bcb.c
+++ b/cmd/bcb.c
@@ -8,6 +8,7 @@
 #include <android_bootloader_message.h>
 #include <command.h>
 #include <common.h>
+#include <display_options.h>
 #include <log.h>
 #include <part.h>
 
diff --git a/cmd/cpu.c b/cmd/cpu.c
index ff553c16c4e4..b3dd7e57449f 100644
--- a/cmd/cpu.c
+++ b/cmd/cpu.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <command.h>
 #include <cpu.h>
+#include <display_options.h>
 #include <dm.h>
 #include <errno.h>
 
diff --git a/cmd/fpgad.c b/cmd/fpgad.c
index fb2fe63e78ab..89b34f864259 100644
--- a/cmd/fpgad.c
+++ b/cmd/fpgad.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <command.h>
 #include <console.h>
+#include <display_options.h>
 
 #include <gdsys_fpga.h>
 
diff --git a/cmd/io.c b/cmd/io.c
index c7e964153b89..dd770a20ce19 100644
--- a/cmd/io.c
+++ b/cmd/io.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <display_options.h>
 #include <asm/io.h>
 
 /* Display values from last command */
diff --git a/cmd/mem.c b/cmd/mem.c
index 79757be9b60d..aae594c5e686 100644
--- a/cmd/mem.c
+++ b/cmd/mem.c
@@ -16,6 +16,7 @@
 #include <cli.h>
 #include <command.h>
 #include <console.h>
+#include <display_options.h>
 #include <flash.h>
 #include <hash.h>
 #include <log.h>
diff --git a/cmd/mmc.c b/cmd/mmc.c
index 1529a3e05ddd..e3e75d0fc0e9 100644
--- a/cmd/mmc.c
+++ b/cmd/mmc.c
@@ -8,6 +8,7 @@
 #include <blk.h>
 #include <command.h>
 #include <console.h>
+#include <display_options.h>
 #include <memalign.h>
 #include <mmc.h>
 #include <part.h>
diff --git a/cmd/rtc.c b/cmd/rtc.c
index b4f61b2e835c..4ac49d228cb1 100644
--- a/cmd/rtc.c
+++ b/cmd/rtc.c
@@ -2,6 +2,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <display_options.h>
 #include <dm.h>
 #include <hexdump.h>
 #include <i2c.h>
diff --git a/cmd/sf.c b/cmd/sf.c
index c0d6a8f8a06f..b3ff4b5773cf 100644
--- a/cmd/sf.c
+++ b/cmd/sf.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <display_options.h>
 #include <div64.h>
 #include <dm.h>
 #include <flash.h>
diff --git a/cmd/version.c b/cmd/version.c
index 3686b8733249..2c321a92f9b2 100644
--- a/cmd/version.c
+++ b/cmd/version.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <display_options.h>
 #include <version.h>
 #include <linux/compiler.h>
 #ifdef CONFIG_SYS_COREBOOT
diff --git a/common/board_f.c b/common/board_f.c
index 85e147a60ee3..bf3015d73b17 100644
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -16,6 +16,7 @@
 #include <console.h>
 #include <cpu.h>
 #include <cpu_func.h>
+#include <display_options.h>
 #include <dm.h>
 #include <env.h>
 #include <env_internal.h>
diff --git a/common/board_r.c b/common/board_r.c
index 996cfa75eae6..1a1ac932d23e 100644
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -13,6 +13,7 @@
 #include <api.h>
 #include <bootstage.h>
 #include <cpu_func.h>
+#include <display_options.h>
 #include <exports.h>
 #include <flash.h>
 #include <hang.h>
diff --git a/common/console.c b/common/console.c
index ca23d9bc05ec..3596f684ac2e 100644
--- a/common/console.c
+++ b/common/console.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <console.h>
 #include <debug_uart.h>
+#include <display_options.h>
 #include <dm.h>
 #include <env.h>
 #include <stdarg.h>
diff --git a/common/image.c b/common/image.c
index 24dd06bf5530..d8db73c82ba5 100644
--- a/common/image.c
+++ b/common/image.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <bootstage.h>
 #include <cpu_func.h>
+#include <display_options.h>
 #include <env.h>
 #include <lmb.h>
 #include <log.h>
diff --git a/common/splash.c b/common/splash.c
index 2b9313e03f1e..e26b366cb238 100644
--- a/common/splash.c
+++ b/common/splash.c
@@ -21,6 +21,7 @@
  */
 
 #include <common.h>
+#include <display_options.h>
 #include <env.h>
 #include <splash.h>
 #include <lcd.h>
diff --git a/drivers/core/acpi.c b/drivers/core/acpi.c
index 7fe93992b5fa..99c0da500eb2 100644
--- a/drivers/core/acpi.c
+++ b/drivers/core/acpi.c
@@ -9,6 +9,7 @@
 #define LOG_CATEOGRY	LOGC_ACPI
 
 #include <common.h>
+#include <display_options.h>
 #include <dm.h>
 #include <log.h>
 #include <malloc.h>
diff --git a/drivers/cpu/bmips_cpu.c b/drivers/cpu/bmips_cpu.c
index 421cc7a9a4c7..8419adb3cc37 100644
--- a/drivers/cpu/bmips_cpu.c
+++ b/drivers/cpu/bmips_cpu.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <cpu.h>
+#include <display_options.h>
 #include <dm.h>
 #include <errno.h>
 #include <init.h>
diff --git a/drivers/ddr/fsl/main.c b/drivers/ddr/fsl/main.c
index 84139b85c33d..f5299fe31113 100644
--- a/drivers/ddr/fsl/main.c
+++ b/drivers/ddr/fsl/main.c
@@ -10,6 +10,7 @@
  */
 
 #include <common.h>
+#include <display_options.h>
 #include <dm.h>
 #include <i2c.h>
 #include <fsl_ddr_sdram.h>
diff --git a/drivers/mmc/gen_atmel_mci.c b/drivers/mmc/gen_atmel_mci.c
index 9d20e283839c..44c9f1288b35 100644
--- a/drivers/mmc/gen_atmel_mci.c
+++ b/drivers/mmc/gen_atmel_mci.c
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <clk.h>
+#include <display_options.h>
 #include <dm.h>
 #include <log.h>
 #include <mmc.h>
diff --git a/drivers/mtd/onenand/onenand_uboot.c b/drivers/mtd/onenand/onenand_uboot.c
index 6893394e0892..3a8c7b867eba 100644
--- a/drivers/mtd/onenand/onenand_uboot.c
+++ b/drivers/mtd/onenand/onenand_uboot.c
@@ -14,6 +14,7 @@
  */
 
 #include <common.h>
+#include <display_options.h>
 #include <linux/compat.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/onenand.h>
diff --git a/drivers/mtd/spi/sf_dataflash.c b/drivers/mtd/spi/sf_dataflash.c
index 27d847d42182..b1034ac2086b 100644
--- a/drivers/mtd/spi/sf_dataflash.c
+++ b/drivers/mtd/spi/sf_dataflash.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <display_options.h>
 #include <dm.h>
 #include <errno.h>
 #include <fdtdec.h>
diff --git a/drivers/mtd/spi/spi-nor-core.c b/drivers/mtd/spi/spi-nor-core.c
index 0113e70037f7..f8a292a5e19b 100644
--- a/drivers/mtd/spi/spi-nor-core.c
+++ b/drivers/mtd/spi/spi-nor-core.c
@@ -10,6 +10,7 @@
  */
 
 #include <common.h>
+#include <display_options.h>
 #include <log.h>
 #include <dm/device_compat.h>
 #include <dm/devres.h>
diff --git a/drivers/net/xilinx_axi_emac.c b/drivers/net/xilinx_axi_emac.c
index 65abc7d1834a..2a2e0585a34b 100644
--- a/drivers/net/xilinx_axi_emac.c
+++ b/drivers/net/xilinx_axi_emac.c
@@ -8,6 +8,7 @@
 #include <config.h>
 #include <common.h>
 #include <cpu_func.h>
+#include <display_options.h>
 #include <dm.h>
 #include <log.h>
 #include <net.h>
diff --git a/drivers/tpm/tpm_atmel_twi.c b/drivers/tpm/tpm_atmel_twi.c
index d9e4877c5c26..5489e728b6e2 100644
--- a/drivers/tpm/tpm_atmel_twi.c
+++ b/drivers/tpm/tpm_atmel_twi.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <display_options.h>
 #include <dm.h>
 #include <tpm-v1.h>
 #include <i2c.h>
diff --git a/drivers/tpm/tpm_tis_sandbox.c b/drivers/tpm/tpm_tis_sandbox.c
index e167d0a2fe3d..f35d69204428 100644
--- a/drivers/tpm/tpm_tis_sandbox.c
+++ b/drivers/tpm/tpm_tis_sandbox.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <display_options.h>
 #include <dm.h>
 #include <tpm-v1.h>
 #include <asm/state.h>
diff --git a/drivers/usb/gadget/pxa27x_udc.c b/drivers/usb/gadget/pxa27x_udc.c
index ba362b8f2582..7c67c2e3b3e3 100644
--- a/drivers/usb/gadget/pxa27x_udc.c
+++ b/drivers/usb/gadget/pxa27x_udc.c
@@ -9,6 +9,7 @@
 
 
 #include <common.h>
+#include <display_options.h>
 #include <asm/arch/hardware.h>
 #include <asm/byteorder.h>
 #include <asm/io.h>
diff --git a/fs/fs.c b/fs/fs.c
index 07e5767df433..8326b6976bf0 100644
--- a/fs/fs.c
+++ b/fs/fs.c
@@ -5,6 +5,7 @@
 
 #include <command.h>
 #include <config.h>
+#include <display_options.h>
 #include <errno.h>
 #include <common.h>
 #include <env.h>
diff --git a/include/common.h b/include/common.h
index 71df59bca0e5..25c317f44392 100644
--- a/include/common.h
+++ b/include/common.h
@@ -23,7 +23,6 @@
 #include <stdio.h>
 #include <linux/kernel.h>
 #include <asm/u-boot.h> /* boot information for Linux kernel */
-#include <display_options.h>
 #include <vsprintf.h>
 #endif	/* __ASSEMBLY__ */
 
diff --git a/include/display_options.h b/include/display_options.h
index a0dabca2b8a6..990ea844ec23 100644
--- a/include/display_options.h
+++ b/include/display_options.h
@@ -19,6 +19,7 @@
  * @size:	Size to print
  * @suffix	String to print after the size
  */
+#include <display_options.h>
 void print_size(uint64_t size, const char *suffix);
 
 /**
diff --git a/lib/aes.c b/lib/aes.c
index c998aecb3c74..bc6d4dfd4e09 100644
--- a/lib/aes.c
+++ b/lib/aes.c
@@ -23,6 +23,7 @@
 
 #ifndef USE_HOSTCC
 #include <common.h>
+#include <display_options.h>
 #include <log.h>
 #else
 #include <string.h>
diff --git a/lib/display_options.c b/lib/display_options.c
index ea9977cc1802..90e8ce547836 100644
--- a/lib/display_options.c
+++ b/lib/display_options.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <compiler.h>
 #include <console.h>
+#include <display_options.h>
 #include <div64.h>
 #include <version.h>
 #include <linux/ctype.h>
diff --git a/lib/fdtdec.c b/lib/fdtdec.c
index 8fccb9e602a3..c3724790a6ec 100644
--- a/lib/fdtdec.c
+++ b/lib/fdtdec.c
@@ -6,6 +6,7 @@
 #ifndef USE_HOSTCC
 #include <common.h>
 #include <boot_fit.h>
+#include <display_options.h>
 #include <dm.h>
 #include <hang.h>
 #include <init.h>
diff --git a/net/nfs.c b/net/nfs.c
index 70d0e08bde92..8a3b04adcdc6 100644
--- a/net/nfs.c
+++ b/net/nfs.c
@@ -28,6 +28,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <display_options.h>
 #include <flash.h>
 #include <image.h>
 #include <log.h>
diff --git a/net/tftp.c b/net/tftp.c
index 239dbfcc2f15..6fc8eb598ae4 100644
--- a/net/tftp.c
+++ b/net/tftp.c
@@ -7,6 +7,7 @@
  */
 #include <common.h>
 #include <command.h>
+#include <display_options.h>
 #include <efi_loader.h>
 #include <env.h>
 #include <image.h>
-- 
2.17.1

^ permalink raw reply related	[flat|nested] 35+ messages in thread

* [RFCv2 03/16] common: Drop linux/printk.h from common header
  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   ` Tom Rini
  2020-08-19 13:08   ` [RFCv2 04/16] Fix code style for time functions Tom Rini
                     ` (13 subsequent siblings)
  16 siblings, 0 replies; 35+ messages in thread
From: Tom Rini @ 2020-08-19 13:08 UTC (permalink / raw)
  To: u-boot

From: Simon Glass <sjg@chromium.org>

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

Signed-off-by: Simon Glass <sjg@chromium.org>
---
 arch/arm/lib/gic-v3-its.c                              | 1 +
 arch/arm/mach-imx/imx8/fdt.c                           | 1 +
 arch/arm/mach-k3/common.c                              | 1 +
 arch/arm/mach-meson/board-gx.c                         | 1 +
 arch/arm/mach-omap2/am33xx/board.c                     | 1 +
 arch/arm/mach-omap2/utils.c                            | 1 +
 arch/arm/mach-rockchip/boot_mode.c                     | 1 +
 arch/arm/mach-rockchip/rk3188/rk3188.c                 | 1 +
 arch/arm/mach-rockchip/rk3399/rk3399.c                 | 1 +
 arch/arm/mach-socfpga/misc.c                           | 1 +
 arch/arm/mach-stm32mp/bsec.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        | 2 ++
 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-stm32mp/include/mach/stm32mp1_smc.h      | 1 +
 arch/arm/mach-tegra/cboot.c                            | 1 +
 arch/arm/mach-tegra/ivc.c                              | 1 +
 arch/arm/mach-tegra/tegra124/xusb-padctl.c             | 1 +
 arch/arm/mach-tegra/tegra20/clock.c                    | 1 +
 arch/arm/mach-tegra/tegra210/xusb-padctl.c             | 1 +
 arch/arm/mach-tegra/tegra30/clock.c                    | 1 +
 arch/arm/mach-tegra/xusb-padctl-common.c               | 1 +
 arch/arm/mach-uniphier/boot-device/boot-device.c       | 1 +
 arch/arm/mach-uniphier/clk/dpll-ld4.c                  | 1 +
 arch/arm/mach-uniphier/clk/dpll-pro4.c                 | 1 +
 arch/arm/mach-uniphier/dram/umc-ld4.c                  | 1 +
 arch/arm/mach-uniphier/dram/umc-pro4.c                 | 1 +
 arch/arm/mach-uniphier/dram/umc-sld8.c                 | 1 +
 arch/arm/mach-uniphier/memconf.c                       | 1 +
 arch/arm/mach-uniphier/spl_board_init.c                | 1 +
 arch/riscv/lib/smp.c                                   | 1 +
 arch/x86/cpu/tangier/pinmux.c                          | 1 +
 arch/x86/cpu/tangier/sdram.c                           | 1 +
 board/dhelectronics/dh_stm32mp1/board.c                | 1 +
 board/mediatek/mt8518/mt8518_ap1.c                     | 1 +
 board/mscc/ocelot/ocelot.c                             | 1 +
 board/nvidia/jetson-tk1/jetson-tk1.c                   | 1 +
 board/pine64/pinebook-pro-rk3399/pinebook-pro-rk3399.c | 1 +
 board/samsung/common/exynos5-dt.c                      | 1 +
 board/samsung/common/misc.c                            | 1 +
 board/samsung/goni/goni.c                              | 1 +
 board/samsung/odroid/odroid.c                          | 1 +
 board/st/common/stm32mp_dfu.c                          | 1 +
 board/st/common/stm32mp_mtdparts.c                     | 1 +
 board/st/stm32mp1/stm32mp1.c                           | 1 +
 board/sunxi/board.c                                    | 1 +
 board/synopsys/hsdk/clk-lib.c                          | 1 +
 board/synopsys/hsdk/env-lib.c                          | 1 +
 board/ti/am65x/evm.c                                   | 1 +
 board/ti/common/board_detect.c                         | 1 +
 board/ti/j721e/evm.c                                   | 1 +
 board/toradex/apalis-tk1/apalis-tk1.c                  | 1 +
 cmd/adc.c                                              | 1 +
 cmd/fastboot.c                                         | 1 +
 cmd/nvedit.c                                           | 1 +
 cmd/onenand.c                                          | 1 +
 cmd/regulator.c                                        | 1 +
 cmd/thordown.c                                         | 1 +
 cmd/tpm_test.c                                         | 1 +
 cmd/usb_gadget_sdp.c                                   | 1 +
 cmd/usb_mass_storage.c                                 | 1 +
 common/dfu.c                                           | 1 +
 common/spl/spl_dfu.c                                   | 1 +
 common/spl/spl_fit.c                                   | 1 +
 common/spl/spl_opensbi.c                               | 1 +
 common/spl/spl_sdp.c                                   | 1 +
 common/update.c                                        | 1 +
 disk/part_efi.c                                        | 1 +
 drivers/adc/adc-uclass.c                               | 1 +
 drivers/adc/exynos-adc.c                               | 1 +
 drivers/adc/meson-saradc.c                             | 1 +
 drivers/adc/rockchip-saradc.c                          | 1 +
 drivers/adc/sandbox.c                                  | 1 +
 drivers/ata/dwc_ahci.c                                 | 1 +
 drivers/bios_emulator/include/x86emu/debug.h           | 1 +
 drivers/bios_emulator/include/x86emu/regs.h            | 1 +
 drivers/bios_emulator/x86emu/debug.c                   | 1 +
 drivers/bios_emulator/x86emu/decode.c                  | 1 +
 drivers/bios_emulator/x86emu/ops.c                     | 1 +
 drivers/bios_emulator/x86emu/ops2.c                    | 1 +
 drivers/bios_emulator/x86emu/sys.c                     | 1 +
 drivers/bootcount/bootcount-uclass.c                   | 1 +
 drivers/clk/analogbits/wrpll-cln28hpc.c                | 1 +
 drivers/clk/clk-divider.c                              | 1 +
 drivers/clk/clk-gate.c                                 | 1 +
 drivers/clk/clk-hsdk-cgu.c                             | 1 +
 drivers/clk/clk-mux.c                                  | 1 +
 drivers/clk/clk_boston.c                               | 1 +
 drivers/clk/clk_stm32f.c                               | 1 +
 drivers/clk/clk_stm32h7.c                              | 1 +
 drivers/clk/clk_stm32mp1.c                             | 1 +
 drivers/clk/imx/clk-pll14xx.c                          | 1 +
 drivers/clk/rockchip/clk_rk3368.c                      | 1 +
 drivers/clk/rockchip/clk_rk3399.c                      | 1 +
 drivers/core/device.c                                  | 1 +
 drivers/core/of_addr.c                                 | 1 +
 drivers/core/root.c                                    | 1 +
 drivers/dfu/dfu.c                                      | 1 +
 drivers/dfu/dfu_mmc.c                                  | 1 +
 drivers/dfu/dfu_ram.c                                  | 1 +
 drivers/dfu/dfu_tftp.c                                 | 1 +
 drivers/dma/bcm6348-iudma.c                            | 1 +
 drivers/dma/dma-uclass.c                               | 1 +
 drivers/dma/lpc32xx_dma.c                              | 1 +
 drivers/dma/sandbox-dma-test.c                         | 1 +
 drivers/dma/ti-edma3.c                                 | 1 +
 drivers/dma/ti/k3-udma.c                               | 1 +
 drivers/fastboot/fb_command.c                          | 1 +
 drivers/fastboot/fb_getvar.c                           | 1 +
 drivers/fastboot/fb_mmc.c                              | 1 +
 drivers/fastboot/fb_nand.c                             | 1 +
 drivers/i2c/i2c-gpio.c                                 | 1 +
 drivers/i2c/iproc_i2c.c                                | 1 +
 drivers/i2c/omap24xx_i2c.c                             | 1 +
 drivers/i2c/stm32f7_i2c.c                              | 1 +
 drivers/i2c/tegra_i2c.c                                | 1 +
 drivers/misc/sifive-otp.c                              | 1 +
 drivers/misc/tegra186_bpmp.c                           | 1 +
 drivers/mmc/exynos_dw_mmc.c                            | 1 +
 drivers/mmc/fsl_esdhc_imx.c                            | 1 +
 drivers/mmc/mmc.c                                      | 1 +
 drivers/mmc/mtk-sd.c                                   | 1 +
 drivers/mmc/sdhci.c                                    | 1 +
 drivers/mmc/sti_sdhci.c                                | 1 +
 drivers/mmc/stm32_sdmmc2.c                             | 1 +
 drivers/mmc/xenon_sdhci.c                              | 1 +
 drivers/mtd/mtdconcat.c                                | 1 +
 drivers/mtd/mtdcore.c                                  | 1 +
 drivers/mtd/mtdpart.c                                  | 1 +
 drivers/mtd/nand/bbt.c                                 | 1 +
 drivers/mtd/nand/core.c                                | 1 +
 drivers/mtd/nand/raw/arasan_nfc.c                      | 1 +
 drivers/mtd/nand/raw/atmel_nand.c                      | 1 +
 drivers/mtd/nand/raw/brcmnand/bcm63158_nand.c          | 1 +
 drivers/mtd/nand/raw/brcmnand/bcm6368_nand.c           | 1 +
 drivers/mtd/nand/raw/brcmnand/bcm68360_nand.c          | 1 +
 drivers/mtd/nand/raw/brcmnand/bcm6838_nand.c           | 1 +
 drivers/mtd/nand/raw/brcmnand/bcm6858_nand.c           | 1 +
 drivers/mtd/nand/raw/davinci_nand.c                    | 1 +
 drivers/mtd/nand/raw/lpc32xx_nand_mlc.c                | 1 +
 drivers/mtd/nand/raw/lpc32xx_nand_slc.c                | 1 +
 drivers/mtd/nand/raw/mxc_nand.c                        | 1 +
 drivers/mtd/nand/raw/nand_base.c                       | 1 +
 drivers/mtd/nand/raw/nand_bbt.c                        | 1 +
 drivers/mtd/nand/raw/nand_bch.c                        | 1 +
 drivers/mtd/nand/raw/pxa3xx_nand.c                     | 1 +
 drivers/mtd/nand/raw/stm32_fmc2_nand.c                 | 1 +
 drivers/mtd/nand/raw/sunxi_nand.c                      | 1 +
 drivers/mtd/nand/raw/tegra_nand.c                      | 1 +
 drivers/mtd/nand/raw/vf610_nfc.c                       | 1 +
 drivers/mtd/nand/raw/zynq_nand.c                       | 1 +
 drivers/mtd/nand/spi/core.c                            | 1 +
 drivers/mtd/onenand/onenand_base.c                     | 1 +
 drivers/mtd/onenand/onenand_bbt.c                      | 1 +
 drivers/mtd/onenand/samsung.c                          | 1 +
 drivers/mtd/spi/spi-nor-core.c                         | 1 +
 drivers/mtd/spi/spi-nor-tiny.c                         | 1 +
 drivers/mtd/ubi/attach.c                               | 1 +
 drivers/mtd/ubi/build.c                                | 1 +
 drivers/mtd/ubi/debug.c                                | 1 +
 drivers/mtd/ubi/debug.h                                | 1 +
 drivers/mtd/ubi/ubi.h                                  | 1 +
 drivers/net/bcm-sf2-eth-gmac.c                         | 1 +
 drivers/net/bcm-sf2-eth.c                              | 1 +
 drivers/net/bcm6348-eth.c                              | 1 +
 drivers/net/bcm6368-eth.c                              | 1 +
 drivers/net/designware.c                               | 1 +
 drivers/net/dwc_eth_qos.c                              | 1 +
 drivers/net/ep93xx_eth.c                               | 1 +
 drivers/net/fsl-mc/dpio/qbman_sys.h                    | 1 +
 drivers/net/ftgmac100.c                                | 1 +
 drivers/net/mscc_eswitch/jr2_switch.c                  | 1 +
 drivers/net/mscc_eswitch/ocelot_switch.c               | 1 +
 drivers/net/mscc_eswitch/serval_switch.c               | 1 +
 drivers/net/mscc_eswitch/servalt_switch.c              | 1 +
 drivers/net/mt7628-eth.c                               | 1 +
 drivers/net/mtk_eth.c                                  | 1 +
 drivers/net/mvmdio.c                                   | 1 +
 drivers/net/phy/dp83867.c                              | 1 +
 drivers/net/phy/mscc.c                                 | 1 +
 drivers/net/rtl8169.c                                  | 1 +
 drivers/net/sni_ave.c                                  | 1 +
 drivers/net/ti/am65-cpsw-nuss.c                        | 1 +
 drivers/net/ti/cpsw-common.c                           | 1 +
 drivers/net/ti/cpsw.c                                  | 1 +
 drivers/net/ti/keystone_net.c                          | 1 +
 drivers/pci/pci-uclass.c                               | 1 +
 drivers/pci/pci_mvebu.c                                | 1 +
 drivers/pci/pci_tegra.c                                | 1 +
 drivers/pci/pcie_ecam_generic.c                        | 1 +
 drivers/pci/pcie_fsl.c                                 | 1 +
 drivers/pci/pcie_mediatek.c                            | 1 +
 drivers/pci/pcie_phytium.c                             | 1 +
 drivers/pci/pcie_xilinx.c                              | 1 +
 drivers/phy/keystone-usb-phy.c                         | 1 +
 drivers/phy/marvell/comphy_cp110.c                     | 1 +
 drivers/phy/meson-g12a-usb2.c                          | 1 +
 drivers/phy/meson-g12a-usb3-pcie.c                     | 1 +
 drivers/phy/meson-gxbb-usb2.c                          | 1 +
 drivers/phy/meson-gxl-usb2.c                           | 1 +
 drivers/phy/meson-gxl-usb3.c                           | 1 +
 drivers/phy/phy-rcar-gen3.c                            | 1 +
 drivers/phy/phy-stm32-usbphyc.c                        | 1 +
 drivers/phy/phy-uclass.c                               | 1 +
 drivers/phy/sti_usb_phy.c                              | 1 +
 drivers/phy/ti-pipe3-phy.c                             | 1 +
 drivers/pinctrl/mvebu/pinctrl-armada-37xx.c            | 1 +
 drivers/pinctrl/pinctrl-sti.c                          | 1 +
 drivers/pinctrl/pinctrl_stm32.c                        | 1 +
 drivers/power/palmas.c                                 | 1 +
 drivers/power/pmic/as3722.c                            | 1 +
 drivers/power/pmic/as3722_gpio.c                       | 1 +
 drivers/power/pmic/bd71837.c                           | 1 +
 drivers/power/pmic/da9063.c                            | 1 +
 drivers/power/pmic/fan53555.c                          | 1 +
 drivers/power/pmic/i2c_pmic_emul.c                     | 1 +
 drivers/power/pmic/lp873x.c                            | 1 +
 drivers/power/pmic/lp87565.c                           | 1 +
 drivers/power/pmic/max77686.c                          | 1 +
 drivers/power/pmic/max8997.c                           | 1 +
 drivers/power/pmic/max8998.c                           | 1 +
 drivers/power/pmic/palmas.c                            | 1 +
 drivers/power/pmic/pca9450.c                           | 1 +
 drivers/power/pmic/pfuze100.c                          | 1 +
 drivers/power/pmic/pmic_tps65910_dm.c                  | 1 +
 drivers/power/pmic/s2mps11.c                           | 1 +
 drivers/power/pmic/s5m8767.c                           | 1 +
 drivers/power/pmic/sandbox.c                           | 1 +
 drivers/power/pmic/tps65090.c                          | 1 +
 drivers/power/pmic/tps65941.c                          | 1 +
 drivers/power/regulator/bd71837.c                      | 1 +
 drivers/power/regulator/fan53555.c                     | 1 +
 drivers/power/regulator/fixed.c                        | 2 ++
 drivers/power/regulator/gpio-regulator.c               | 2 ++
 drivers/power/regulator/max77686.c                     | 1 +
 drivers/power/regulator/pbias_regulator.c              | 1 +
 drivers/power/regulator/regulator_common.c             | 2 ++
 drivers/power/regulator/regulator_common.h             | 2 --
 drivers/power/regulator/s2mps11_regulator.c            | 1 +
 drivers/power/regulator/sandbox.c                      | 1 +
 drivers/power/regulator/tps65910_regulator.c           | 1 +
 drivers/power/twl4030.c                                | 1 +
 drivers/power/twl6030.c                                | 1 +
 drivers/ram/imxrt_sdram.c                              | 1 +
 drivers/ram/rockchip/dmc-rk3368.c                      | 1 +
 drivers/ram/stm32_sdram.c                              | 1 +
 drivers/ram/stm32mp1/stm32mp1_ddr.c                    | 1 +
 drivers/ram/stm32mp1/stm32mp1_ram.c                    | 1 +
 drivers/ram/stm32mp1/stm32mp1_tuning.c                 | 1 +
 drivers/remoteproc/rproc-elf-loader.c                  | 1 +
 drivers/remoteproc/rproc-uclass.c                      | 1 +
 drivers/remoteproc/sandbox_testproc.c                  | 1 +
 drivers/remoteproc/stm32_copro.c                       | 1 +
 drivers/remoteproc/ti_power_proc.c                     | 1 +
 drivers/remoteproc/ti_sci_proc.h                       | 1 +
 drivers/reset/sti-reset.c                              | 1 +
 drivers/serial/serial_mtk.c                            | 1 +
 drivers/soc/ti/k3-navss-ringacc.c                      | 1 +
 drivers/spi/atmel_spi.c                                | 1 +
 drivers/spi/fsl_dspi.c                                 | 1 +
 drivers/spi/mt7621_spi.c                               | 1 +
 drivers/spi/mxc_spi.c                                  | 1 +
 drivers/spi/pl022_spi.c                                | 1 +
 drivers/spi/stm32_qspi.c                               | 1 +
 drivers/spi/stm32_spi.c                                | 1 +
 drivers/spi/uniphier_spi.c                             | 1 +
 drivers/sysreset/sysreset_sti.c                        | 1 +
 drivers/sysreset/sysreset_syscon.c                     | 1 +
 drivers/sysreset/sysreset_watchdog.c                   | 1 +
 drivers/tpm/tpm_tis_infineon.c                         | 1 +
 drivers/usb/cdns3/gadget.c                             | 1 +
 drivers/usb/common/common.c                            | 1 +
 drivers/usb/dwc3/dwc3-generic.c                        | 1 +
 drivers/usb/dwc3/dwc3-meson-g12a.c                     | 1 +
 drivers/usb/dwc3/gadget.c                              | 1 +
 drivers/usb/eth/mcs7830.c                              | 1 +
 drivers/usb/gadget/at91_udc.c                          | 1 +
 drivers/usb/gadget/atmel_usba_udc.c                    | 1 +
 drivers/usb/gadget/dwc2_udc_otg.c                      | 1 +
 drivers/usb/gadget/ether.c                             | 1 +
 drivers/usb/gadget/f_fastboot.c                        | 1 +
 drivers/usb/gadget/f_sdp.c                             | 1 +
 drivers/usb/gadget/f_thor.c                            | 1 +
 drivers/usb/gadget/udc/udc-uclass.c                    | 1 +
 drivers/usb/host/dwc3-sti-glue.c                       | 1 +
 drivers/usb/musb-new/mt85xx.c                          | 1 +
 drivers/usb/musb-new/musb_core.c                       | 1 +
 drivers/usb/musb-new/musb_debug.h                      | 1 +
 drivers/usb/musb-new/musb_dsps.c                       | 1 +
 drivers/usb/musb-new/musb_gadget.c                     | 1 +
 drivers/usb/musb-new/musb_gadget_ep0.c                 | 1 +
 drivers/usb/musb-new/omap2430.c                        | 1 +
 drivers/usb/musb-new/sunxi.c                           | 1 +
 drivers/usb/musb-new/ti-musb.c                         | 1 +
 drivers/video/am335x-fb.c                              | 1 +
 drivers/video/meson/meson_dw_hdmi.c                    | 1 +
 drivers/video/meson/meson_vclk.c                       | 1 +
 drivers/video/stm32/stm32_dsi.c                        | 1 +
 drivers/video/stm32/stm32_ltdc.c                       | 1 +
 drivers/video/tegra124/sor.c                           | 1 +
 drivers/watchdog/stm32mp_wdt.c                         | 1 +
 env/common.c                                           | 1 +
 fs/ubifs/debug.c                                       | 1 +
 fs/ubifs/debug.h                                       | 1 +
 fs/ubifs/lpt_commit.c                                  | 1 +
 fs/ubifs/super.c                                       | 1 +
 fs/ubifs/ubifs.h                                       | 1 +
 fs/yaffs2/yaffs_uboot_glue.c                           | 1 +
 include/common.h                                       | 1 -
 include/crypto/pkcs7_parser.h                          | 1 +
 include/dm/device_compat.h                             | 1 +
 include/linux/soc/ti/cppi5.h                           | 1 +
 lib/asn1_decoder.c                                     | 1 +
 lib/bch.c                                              | 1 +
 lib/crypto/asymmetric_type.c                           | 1 +
 lib/crypto/pkcs7_parser.c                              | 1 +
 lib/crypto/pkcs7_verify.c                              | 1 +
 lib/crypto/public_key.c                                | 1 +
 lib/crypto/rsa_helper.c                                | 1 +
 lib/crypto/x509_cert_parser.c                          | 1 +
 lib/crypto/x509_public_key.c                           | 1 +
 lib/list_sort.c                                        | 1 +
 net/fastboot.c                                         | 1 +
 327 files changed, 329 insertions(+), 3 deletions(-)

diff --git a/arch/arm/lib/gic-v3-its.c b/arch/arm/lib/gic-v3-its.c
index a1657e385366..6cdcd1ed60cf 100644
--- a/arch/arm/lib/gic-v3-its.c
+++ b/arch/arm/lib/gic-v3-its.c
@@ -10,6 +10,7 @@
 #include <asm/gic-v3.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
+#include <linux/printk.h>
 #include <linux/sizes.h>
 
 static u32 lpi_id_bits;
diff --git a/arch/arm/mach-imx/imx8/fdt.c b/arch/arm/mach-imx/imx8/fdt.c
index a132ce2e6a3a..776d2b243456 100644
--- a/arch/arm/mach-imx/imx8/fdt.c
+++ b/arch/arm/mach-imx/imx8/fdt.c
@@ -11,6 +11,7 @@
 #include <dm/ofnode.h>
 #include <fdt_support.h>
 #include <linux/libfdt.h>
+#include <linux/printk.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-k3/common.c b/arch/arm/mach-k3/common.c
index f01aeb40c9d5..3b36e36102c8 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 <asm/global_data.h>
+#include <linux/printk.h>
 #include "common.h"
 #include <dm.h>
 #include <remoteproc.h>
diff --git a/arch/arm/mach-meson/board-gx.c b/arch/arm/mach-meson/board-gx.c
index 6824b846d4d4..53756cc6875d 100644
--- a/arch/arm/mach-meson/board-gx.c
+++ b/arch/arm/mach-meson/board-gx.c
@@ -15,6 +15,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/armv8/mmu.h>
+#include <linux/printk.h>
 #include <linux/sizes.h>
 #include <usb.h>
 #include <linux/usb/otg.h>
diff --git a/arch/arm/mach-omap2/am33xx/board.c b/arch/arm/mach-omap2/am33xx/board.c
index 3b17446cd5d3..cff8c205734f 100644
--- a/arch/arm/mach-omap2/am33xx/board.c
+++ b/arch/arm/mach-omap2/am33xx/board.c
@@ -36,6 +36,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/compiler.h>
+#include <linux/printk.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
 #include <linux/usb/musb.h>
diff --git a/arch/arm/mach-omap2/utils.c b/arch/arm/mach-omap2/utils.c
index 6e6791fc6595..095b5d3c36f2 100644
--- a/arch/arm/mach-omap2/utils.c
+++ b/arch/arm/mach-omap2/utils.c
@@ -9,6 +9,7 @@
 #include <asm/setup.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/omap_common.h>
+#include <linux/printk.h>
 
 static void do_cancel_out(u32 *num, u32 *den, u32 factor)
 {
diff --git a/arch/arm/mach-rockchip/boot_mode.c b/arch/arm/mach-rockchip/boot_mode.c
index 2158934159a5..c6d19541ac72 100644
--- a/arch/arm/mach-rockchip/boot_mode.c
+++ b/arch/arm/mach-rockchip/boot_mode.c
@@ -12,6 +12,7 @@
 #include <asm/arch-rockchip/boot_mode.h>
 #include <dm/device.h>
 #include <dm/uclass.h>
+#include <linux/printk.h>
 
 #if (CONFIG_ROCKCHIP_BOOT_MODE_REG == 0)
 
diff --git a/arch/arm/mach-rockchip/rk3188/rk3188.c b/arch/arm/mach-rockchip/rk3188/rk3188.c
index 85dcce90330b..1338979febb3 100644
--- a/arch/arm/mach-rockchip/rk3188/rk3188.c
+++ b/arch/arm/mach-rockchip/rk3188/rk3188.c
@@ -15,6 +15,7 @@
 #include <asm/arch-rockchip/grf_rk3188.h>
 #include <asm/arch-rockchip/hardware.h>
 #include <linux/err.h>
+#include <linux/printk.h>
 
 #define GRF_BASE	0x20008000
 
diff --git a/arch/arm/mach-rockchip/rk3399/rk3399.c b/arch/arm/mach-rockchip/rk3399/rk3399.c
index 869d2159bea6..f8f6799a7fde 100644
--- a/arch/arm/mach-rockchip/rk3399/rk3399.c
+++ b/arch/arm/mach-rockchip/rk3399/rk3399.c
@@ -19,6 +19,7 @@
 #include <asm/arch-rockchip/grf_rk3399.h>
 #include <asm/arch-rockchip/hardware.h>
 #include <linux/bitops.h>
+#include <linux/printk.h>
 #include <power/regulator.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-socfpga/misc.c b/arch/arm/mach-socfpga/misc.c
index 64a7c9d652c7..6813279e6aef 100644
--- a/arch/arm/mach-socfpga/misc.c
+++ b/arch/arm/mach-socfpga/misc.c
@@ -25,6 +25,7 @@
 #include <asm/arch/nic301.h>
 #include <asm/arch/scu.h>
 #include <asm/pl310.h>
+#include <linux/printk.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-stm32mp/bsec.c b/arch/arm/mach-stm32mp/bsec.c
index a9b9bd090277..566961ae3914 100644
--- a/arch/arm/mach-stm32mp/bsec.c
+++ b/arch/arm/mach-stm32mp/bsec.c
@@ -12,6 +12,7 @@
 #include <asm/arch/stm32mp1_smc.h>
 #include <linux/arm-smccc.h>
 #include <linux/iopoll.h>
+#include <linux/printk.h>
 
 #define BSEC_OTP_MAX_VALUE		95
 #define BSEC_TIMEOUT_US			10000
diff --git a/arch/arm/mach-stm32mp/cmd_stm32key.c b/arch/arm/mach-stm32mp/cmd_stm32key.c
index f191085a12d0..eb3d74bc8364 100644
--- a/arch/arm/mach-stm32mp/cmd_stm32key.c
+++ b/arch/arm/mach-stm32mp/cmd_stm32key.c
@@ -9,6 +9,7 @@
 #include <misc.h>
 #include <dm/device.h>
 #include <dm/uclass.h>
+#include <linux/printk.h>
 
 #define STM32_OTP_HASH_KEY_START 24
 #define STM32_OTP_HASH_KEY_SIZE 8
diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c b/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c
index 49dd25b28f48..d241dbde20e6 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 <asm/arch/stm32prog.h>
+#include <linux/printk.h>
 #include "stm32prog.h"
 
 struct stm32prog_data *stm32prog_data;
diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c
index 74711c0c756d..e749c05d9279 100644
--- a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c
+++ b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c
@@ -17,6 +17,7 @@
 #include <linux/list.h>
 #include <linux/list_sort.h>
 #include <linux/mtd/mtd.h>
+#include <linux/printk.h>
 #include <linux/sizes.h>
 
 #include "stm32prog.h"
diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.h b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.h
index bae4e91c01dc..002b4d39be69 100644
--- a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.h
+++ b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.h
@@ -6,6 +6,8 @@
 #ifndef _STM32PROG_H_
 #define _STM32PROG_H_
 
+#include <linux/printk.h>
+
 /* - phase defines ------------------------------------------------*/
 #define PHASE_FLASHLAYOUT	0x00
 #define PHASE_FIRST_USER	0x10
diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_serial.c b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_serial.c
index 0150d2d5412b..8481a45f65bc 100644
--- a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_serial.c
+++ b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_serial.c
@@ -14,6 +14,7 @@
 #include <dm/lists.h>
 #include <dm/device-internal.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 #include "stm32prog.h"
 
 /* - configuration part -----------------------------*/
diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_usb.c b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_usb.c
index 30547f94c945..134c3b117f52 100644
--- a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_usb.c
+++ b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_usb.c
@@ -9,6 +9,7 @@
 #include <usb.h>
 #include <asm/arch/stm32prog.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/printk.h>
 #include "stm32prog.h"
 
 static int stm32prog_set_phase(struct stm32prog_data *data, u8 phase,
diff --git a/arch/arm/mach-stm32mp/cpu.c b/arch/arm/mach-stm32mp/cpu.c
index 469c5b704e4a..cd27a774d446 100644
--- a/arch/arm/mach-stm32mp/cpu.c
+++ b/arch/arm/mach-stm32mp/cpu.c
@@ -19,6 +19,7 @@
 #include <dm/device.h>
 #include <dm/uclass.h>
 #include <linux/bitops.h>
+#include <linux/printk.h>
 
 /* RCC register */
 #define RCC_TZCR		(STM32_RCC_BASE + 0x00)
diff --git a/arch/arm/mach-stm32mp/include/mach/stm32mp1_smc.h b/arch/arm/mach-stm32mp/include/mach/stm32mp1_smc.h
index 4ad14f963b46..1b2bba3d34c2 100644
--- a/arch/arm/mach-stm32mp/include/mach/stm32mp1_smc.h
+++ b/arch/arm/mach-stm32mp/include/mach/stm32mp1_smc.h
@@ -7,6 +7,7 @@
 #define __STM32MP1_SMC_H__
 
 #include <linux/arm-smccc.h>
+#include <linux/printk.h>
 
 /*
  * SMC function IDs for STM32 Service queries
diff --git a/arch/arm/mach-tegra/cboot.c b/arch/arm/mach-tegra/cboot.c
index bb46fb23ff79..6a47c104b723 100644
--- a/arch/arm/mach-tegra/cboot.c
+++ b/arch/arm/mach-tegra/cboot.c
@@ -15,6 +15,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <asm/global_data.h>
+#include <linux/printk.h>
 
 #include <linux/ctype.h>
 #include <linux/sizes.h>
diff --git a/arch/arm/mach-tegra/ivc.c b/arch/arm/mach-tegra/ivc.c
index b69a458fdf0c..66c1276f4b87 100644
--- a/arch/arm/mach-tegra/ivc.c
+++ b/arch/arm/mach-tegra/ivc.c
@@ -8,6 +8,7 @@
 #include <asm/io.h>
 #include <asm/arch-tegra/ivc.h>
 #include <linux/bug.h>
+#include <linux/printk.h>
 
 #define TEGRA_IVC_ALIGN 64
 
diff --git a/arch/arm/mach-tegra/tegra124/xusb-padctl.c b/arch/arm/mach-tegra/tegra124/xusb-padctl.c
index c95ca048d5e1..5b88d6e5e7b3 100644
--- a/arch/arm/mach-tegra/tegra124/xusb-padctl.c
+++ b/arch/arm/mach-tegra/tegra124/xusb-padctl.c
@@ -12,6 +12,7 @@
 #include <dm/of_access.h>
 #include <dm/ofnode.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 
 #include "../xusb-padctl-common.h"
 
diff --git a/arch/arm/mach-tegra/tegra20/clock.c b/arch/arm/mach-tegra/tegra20/clock.c
index 24e8a13b1f9b..b1e2c87e6296 100644
--- a/arch/arm/mach-tegra/tegra20/clock.c
+++ b/arch/arm/mach-tegra/tegra20/clock.c
@@ -19,6 +19,7 @@
 #include <div64.h>
 #include <fdtdec.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 
 /*
  * Clock types that we can use as a source. The Tegra20 has muxes for the
diff --git a/arch/arm/mach-tegra/tegra210/xusb-padctl.c b/arch/arm/mach-tegra/tegra210/xusb-padctl.c
index c414dfd3b86f..30d0395bb0e5 100644
--- a/arch/arm/mach-tegra/tegra210/xusb-padctl.c
+++ b/arch/arm/mach-tegra/tegra210/xusb-padctl.c
@@ -12,6 +12,7 @@
 #include <dm/of_access.h>
 #include <dm/ofnode.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 
 #include "../xusb-padctl-common.h"
 
diff --git a/arch/arm/mach-tegra/tegra30/clock.c b/arch/arm/mach-tegra/tegra30/clock.c
index b0641c6a41a4..d516ac5f4cbd 100644
--- a/arch/arm/mach-tegra/tegra30/clock.c
+++ b/arch/arm/mach-tegra/tegra30/clock.c
@@ -18,6 +18,7 @@
 #include <div64.h>
 #include <fdtdec.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 
 /*
  * Clock types that we can use as a source. The Tegra30 has muxes for the
diff --git a/arch/arm/mach-tegra/xusb-padctl-common.c b/arch/arm/mach-tegra/xusb-padctl-common.c
index e56e27c8b6ef..5de403c30e4a 100644
--- a/arch/arm/mach-tegra/xusb-padctl-common.c
+++ b/arch/arm/mach-tegra/xusb-padctl-common.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <errno.h>
 #include <log.h>
+#include <linux/printk.h>
 
 #include "xusb-padctl-common.h"
 
diff --git a/arch/arm/mach-uniphier/boot-device/boot-device.c b/arch/arm/mach-uniphier/boot-device/boot-device.c
index 98ff34cfa713..1e6bc8433f7d 100644
--- a/arch/arm/mach-uniphier/boot-device/boot-device.c
+++ b/arch/arm/mach-uniphier/boot-device/boot-device.c
@@ -12,6 +12,7 @@
 #include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/log2.h>
+#include <linux/printk.h>
 
 #include "../init.h"
 #include "../sg-regs.h"
diff --git a/arch/arm/mach-uniphier/clk/dpll-ld4.c b/arch/arm/mach-uniphier/clk/dpll-ld4.c
index 3ccaf02242c6..f24a0eb0b827 100644
--- a/arch/arm/mach-uniphier/clk/dpll-ld4.c
+++ b/arch/arm/mach-uniphier/clk/dpll-ld4.c
@@ -7,6 +7,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/io.h>
+#include <linux/printk.h>
 
 #include "../init.h"
 #include "../sc-regs.h"
diff --git a/arch/arm/mach-uniphier/clk/dpll-pro4.c b/arch/arm/mach-uniphier/clk/dpll-pro4.c
index 44006ae6dc44..204aee1a62c0 100644
--- a/arch/arm/mach-uniphier/clk/dpll-pro4.c
+++ b/arch/arm/mach-uniphier/clk/dpll-pro4.c
@@ -7,6 +7,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/io.h>
+#include <linux/printk.h>
 
 #include "../init.h"
 #include "../sc-regs.h"
diff --git a/arch/arm/mach-uniphier/dram/umc-ld4.c b/arch/arm/mach-uniphier/dram/umc-ld4.c
index 96acca2562fa..1eb15b611fd3 100644
--- a/arch/arm/mach-uniphier/dram/umc-ld4.c
+++ b/arch/arm/mach-uniphier/dram/umc-ld4.c
@@ -7,6 +7,7 @@
 
 #include <linux/errno.h>
 #include <linux/io.h>
+#include <linux/printk.h>
 #include <linux/sizes.h>
 #include <asm/processor.h>
 
diff --git a/arch/arm/mach-uniphier/dram/umc-pro4.c b/arch/arm/mach-uniphier/dram/umc-pro4.c
index cde39b499bf6..0114df782b4f 100644
--- a/arch/arm/mach-uniphier/dram/umc-pro4.c
+++ b/arch/arm/mach-uniphier/dram/umc-pro4.c
@@ -7,6 +7,7 @@
 
 #include <linux/errno.h>
 #include <linux/io.h>
+#include <linux/printk.h>
 #include <linux/sizes.h>
 #include <asm/processor.h>
 
diff --git a/arch/arm/mach-uniphier/dram/umc-sld8.c b/arch/arm/mach-uniphier/dram/umc-sld8.c
index a11586952d84..583a1bad8b74 100644
--- a/arch/arm/mach-uniphier/dram/umc-sld8.c
+++ b/arch/arm/mach-uniphier/dram/umc-sld8.c
@@ -7,6 +7,7 @@
 
 #include <linux/errno.h>
 #include <linux/io.h>
+#include <linux/printk.h>
 #include <linux/sizes.h>
 #include <asm/processor.h>
 
diff --git a/arch/arm/mach-uniphier/memconf.c b/arch/arm/mach-uniphier/memconf.c
index 57192f0154aa..ab0d187a1faa 100644
--- a/arch/arm/mach-uniphier/memconf.c
+++ b/arch/arm/mach-uniphier/memconf.c
@@ -7,6 +7,7 @@
 
 #include <linux/errno.h>
 #include <linux/io.h>
+#include <linux/printk.h>
 #include <linux/sizes.h>
 
 #include "sg-regs.h"
diff --git a/arch/arm/mach-uniphier/spl_board_init.c b/arch/arm/mach-uniphier/spl_board_init.c
index a93b8cdc04d2..0f2e3504c813 100644
--- a/arch/arm/mach-uniphier/spl_board_init.c
+++ b/arch/arm/mach-uniphier/spl_board_init.c
@@ -7,6 +7,7 @@
 #include <debug_uart.h>
 #include <hang.h>
 #include <spl.h>
+#include <linux/printk.h>
 
 #include "init.h"
 #include "micro-support-card.h"
diff --git a/arch/riscv/lib/smp.c b/arch/riscv/lib/smp.c
index c79d2a28d04d..879b7ab9a788 100644
--- a/arch/riscv/lib/smp.c
+++ b/arch/riscv/lib/smp.c
@@ -10,6 +10,7 @@
 #include <asm/barrier.h>
 #include <asm/global_data.h>
 #include <asm/smp.h>
+#include <linux/printk.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/tangier/pinmux.c b/arch/x86/cpu/tangier/pinmux.c
index 5b0e106011ab..596c2c177ce3 100644
--- a/arch/x86/cpu/tangier/pinmux.c
+++ b/arch/x86/cpu/tangier/pinmux.c
@@ -13,6 +13,7 @@
 #include <asm/cpu.h>
 #include <asm/scu.h>
 #include <linux/io.h>
+#include <linux/printk.h>
 
 #define BUFCFG_OFFSET				0x100
 
diff --git a/arch/x86/cpu/tangier/sdram.c b/arch/x86/cpu/tangier/sdram.c
index df3b9e4ec975..0f0ab4102be6 100644
--- a/arch/x86/cpu/tangier/sdram.c
+++ b/arch/x86/cpu/tangier/sdram.c
@@ -9,6 +9,7 @@
 #include <asm/e820.h>
 #include <asm/global_data.h>
 #include <asm/sfi.h>
+#include <linux/printk.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/dhelectronics/dh_stm32mp1/board.c b/board/dhelectronics/dh_stm32mp1/board.c
index 33486edb4f42..73e8c3f9b48f 100644
--- a/board/dhelectronics/dh_stm32mp1/board.c
+++ b/board/dhelectronics/dh_stm32mp1/board.c
@@ -35,6 +35,7 @@
 #include <phy.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 #include <power/regulator.h>
 #include <remoteproc.h>
 #include <reset.h>
diff --git a/board/mediatek/mt8518/mt8518_ap1.c b/board/mediatek/mt8518/mt8518_ap1.c
index fce5de6767cd..5a300821c9b9 100644
--- a/board/mediatek/mt8518/mt8518_ap1.c
+++ b/board/mediatek/mt8518/mt8518_ap1.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <log.h>
 #include <asm/global_data.h>
+#include <linux/printk.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/mscc/ocelot/ocelot.c b/board/mscc/ocelot/ocelot.c
index c462890bb853..51e1aeccf578 100644
--- a/board/mscc/ocelot/ocelot.c
+++ b/board/mscc/ocelot/ocelot.c
@@ -16,6 +16,7 @@
 #include <wait_bit.h>
 #include <miiphy.h>
 #include <linux/bitops.h>
+#include <linux/printk.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/nvidia/jetson-tk1/jetson-tk1.c b/board/nvidia/jetson-tk1/jetson-tk1.c
index 9eccdc4a832f..ae1c76b133d3 100644
--- a/board/nvidia/jetson-tk1/jetson-tk1.c
+++ b/board/nvidia/jetson-tk1/jetson-tk1.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <linux/printk.h>
 #include <power/as3722.h>
 #include <power/pmic.h>
 
diff --git a/board/pine64/pinebook-pro-rk3399/pinebook-pro-rk3399.c b/board/pine64/pinebook-pro-rk3399/pinebook-pro-rk3399.c
index 516292aaa598..4ad780767ead 100644
--- a/board/pine64/pinebook-pro-rk3399/pinebook-pro-rk3399.c
+++ b/board/pine64/pinebook-pro-rk3399/pinebook-pro-rk3399.c
@@ -12,6 +12,7 @@
 #include <asm/arch-rockchip/grf_rk3399.h>
 #include <asm/arch-rockchip/hardware.h>
 #include <asm/arch-rockchip/misc.h>
+#include <linux/printk.h>
 #include <power/regulator.h>
 
 #define GRF_IO_VSEL_BT565_SHIFT 0
diff --git a/board/samsung/common/exynos5-dt.c b/board/samsung/common/exynos5-dt.c
index 4463cdcb87b6..97f4097cbcd8 100644
--- a/board/samsung/common/exynos5-dt.c
+++ b/board/samsung/common/exynos5-dt.c
@@ -26,6 +26,7 @@
 #include <asm/arch/pinmux.h>
 #include <asm/arch/power.h>
 #include <asm/arch/sromc.h>
+#include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/max77686_pmic.h>
 #include <power/regulator.h>
diff --git a/board/samsung/common/misc.c b/board/samsung/common/misc.c
index 7d3b9846e39f..0243d8971c80 100644
--- a/board/samsung/common/misc.c
+++ b/board/samsung/common/misc.c
@@ -11,6 +11,7 @@
 #include <libtizen.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 #include <samsung/misc.h>
 #include <errno.h>
 #include <version.h>
diff --git a/board/samsung/goni/goni.c b/board/samsung/goni/goni.c
index b32b82fc2dad..5fb01bba0555 100644
--- a/board/samsung/goni/goni.c
+++ b/board/samsung/goni/goni.c
@@ -13,6 +13,7 @@
 #include <asm/arch/mmc.h>
 #include <dm.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 #include <power/pmic.h>
 #include <usb/dwc2_udc.h>
 #include <asm/arch/cpu.h>
diff --git a/board/samsung/odroid/odroid.c b/board/samsung/odroid/odroid.c
index 90aab62d33b0..19e5bccbdb51 100644
--- a/board/samsung/odroid/odroid.c
+++ b/board/samsung/odroid/odroid.c
@@ -15,6 +15,7 @@
 #include <asm/arch/cpu.h>
 #include <dm.h>
 #include <env.h>
+#include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/max77686_pmic.h>
diff --git a/board/st/common/stm32mp_dfu.c b/board/st/common/stm32mp_dfu.c
index aab7d741ac60..04b56f7a6c41 100644
--- a/board/st/common/stm32mp_dfu.c
+++ b/board/st/common/stm32mp_dfu.c
@@ -13,6 +13,7 @@
 #include <mtd.h>
 #include <mtd_node.h>
 #include <asm/arch/stm32prog.h>
+#include <linux/printk.h>
 
 #define DFU_ALT_BUF_LEN SZ_1K
 
diff --git a/board/st/common/stm32mp_mtdparts.c b/board/st/common/stm32mp_mtdparts.c
index ef32df04fefc..7151cad6d0f9 100644
--- a/board/st/common/stm32mp_mtdparts.c
+++ b/board/st/common/stm32mp_mtdparts.c
@@ -14,6 +14,7 @@
 #include <asm/arch/stm32prog.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/global_data.h>
+#include <linux/printk.h>
 
 #define MTDPARTS_LEN		256
 #define MTDIDS_LEN		128
diff --git a/board/st/stm32mp1/stm32mp1.c b/board/st/stm32mp1/stm32mp1.c
index 87fac76af6f4..a18b4e33f3f9 100644
--- a/board/st/stm32mp1/stm32mp1.c
+++ b/board/st/stm32mp1/stm32mp1.c
@@ -39,6 +39,7 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/iopoll.h>
+#include <linux/printk.h>
 #include <power/regulator.h>
 #include <usb/dwc2_udc.h>
 
diff --git a/board/sunxi/board.c b/board/sunxi/board.c
index 87c231f38f9f..7812860042f6 100644
--- a/board/sunxi/board.c
+++ b/board/sunxi/board.c
@@ -30,6 +30,7 @@
 #include <asm/arch/spl.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 #include <u-boot/crc.h>
 #ifndef CONFIG_ARM64
 #include <asm/armv7.h>
diff --git a/board/synopsys/hsdk/clk-lib.c b/board/synopsys/hsdk/clk-lib.c
index 1c74bfb93a3b..eed0fa15b192 100644
--- a/board/synopsys/hsdk/clk-lib.c
+++ b/board/synopsys/hsdk/clk-lib.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <dm/device.h>
+#include <linux/printk.h>
 
 #include "clk-lib.h"
 
diff --git a/board/synopsys/hsdk/env-lib.c b/board/synopsys/hsdk/env-lib.c
index 235f29565f9e..dbec12c8a7bc 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 <linux/printk.h>
 
 #define MAX_CMD_LEN	25
 
diff --git a/board/ti/am65x/evm.c b/board/ti/am65x/evm.c
index 3d44c70fe42d..0f5ec260b162 100644
--- a/board/ti/am65x/evm.c
+++ b/board/ti/am65x/evm.c
@@ -22,6 +22,7 @@
 #include <env.h>
 #include <spl.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/printk.h>
 
 #include "../common/board_detect.h"
 
diff --git a/board/ti/common/board_detect.c b/board/ti/common/board_detect.c
index e09ecda4d7e6..9d1bee1c2559 100644
--- a/board/ti/common/board_detect.c
+++ b/board/ti/common/board_detect.c
@@ -19,6 +19,7 @@
 #include <mmc.h>
 #include <errno.h>
 #include <malloc.h>
+#include <linux/printk.h>
 
 #include "board_detect.h"
 
diff --git a/board/ti/j721e/evm.c b/board/ti/j721e/evm.c
index a6983da5b5cf..2ab305a902b9 100644
--- a/board/ti/j721e/evm.c
+++ b/board/ti/j721e/evm.c
@@ -23,6 +23,7 @@
 #include <asm/arch/sys_proto.h>
 #include <dm.h>
 #include <dm/uclass-internal.h>
+#include <linux/printk.h>
 
 #include "../common/board_detect.h"
 
diff --git a/board/toradex/apalis-tk1/apalis-tk1.c b/board/toradex/apalis-tk1/apalis-tk1.c
index e7a2186c2c42..349b3119370b 100644
--- a/board/toradex/apalis-tk1/apalis-tk1.c
+++ b/board/toradex/apalis-tk1/apalis-tk1.c
@@ -16,6 +16,7 @@
 #include <env_internal.h>
 #include <pci_tegra.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 #include <power/as3722.h>
 #include <power/pmic.h>
 
diff --git a/cmd/adc.c b/cmd/adc.c
index 16f914a030e1..557a2c1f5d00 100644
--- a/cmd/adc.c
+++ b/cmd/adc.c
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <dm.h>
 #include <adc.h>
+#include <linux/printk.h>
 
 static int do_adc_list(struct cmd_tbl *cmdtp, int flag, int argc,
 		       char *const argv[])
diff --git a/cmd/fastboot.c b/cmd/fastboot.c
index ad5c06491183..48b891b28fc5 100644
--- a/cmd/fastboot.c
+++ b/cmd/fastboot.c
@@ -14,6 +14,7 @@
 #include <net.h>
 #include <usb.h>
 #include <watchdog.h>
+#include <linux/printk.h>
 #include <linux/stringify.h>
 
 static int do_fastboot_udp(int argc, char *const argv[],
diff --git a/cmd/nvedit.c b/cmd/nvedit.c
index 91fa73fa322c..554596b27d76 100644
--- a/cmd/nvedit.c
+++ b/cmd/nvedit.c
@@ -37,6 +37,7 @@
 #include <mapmem.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
+#include <linux/printk.h>
 #include <u-boot/crc.h>
 #include <watchdog.h>
 #include <linux/stddef.h>
diff --git a/cmd/onenand.c b/cmd/onenand.c
index 216458bb474b..fa403369faaf 100644
--- a/cmd/onenand.c
+++ b/cmd/onenand.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <command.h>
 #include <malloc.h>
+#include <linux/printk.h>
 
 #include <linux/compat.h>
 #include <linux/mtd/mtd.h>
diff --git a/cmd/regulator.c b/cmd/regulator.c
index aa06c9a9fc83..0d97334a9019 100644
--- a/cmd/regulator.c
+++ b/cmd/regulator.c
@@ -8,6 +8,7 @@
 #include <errno.h>
 #include <dm.h>
 #include <dm/uclass-internal.h>
+#include <linux/printk.h>
 #include <power/regulator.h>
 
 #define LIMIT_DEVNAME	20
diff --git a/cmd/thordown.c b/cmd/thordown.c
index ae20dddfddba..f36fb20e26e1 100644
--- a/cmd/thordown.c
+++ b/cmd/thordown.c
@@ -12,6 +12,7 @@
 #include <dfu.h>
 #include <g_dnl.h>
 #include <usb.h>
+#include <linux/printk.h>
 
 int do_thor_down(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 {
diff --git a/cmd/tpm_test.c b/cmd/tpm_test.c
index ebfb25cab0a3..d7044336ff2d 100644
--- a/cmd/tpm_test.c
+++ b/cmd/tpm_test.c
@@ -8,6 +8,7 @@
 #include <cpu_func.h>
 #include <log.h>
 #include <tpm-v1.h>
+#include <linux/printk.h>
 #include "tpm-user-utils.h"
 
 /* Prints error and returns on failure */
diff --git a/cmd/usb_gadget_sdp.c b/cmd/usb_gadget_sdp.c
index 1af82e113665..651a3ebcb5d4 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 <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 d565635c6c40..5996c852e8e1 100644
--- a/cmd/usb_mass_storage.c
+++ b/cmd/usb_mass_storage.c
@@ -18,6 +18,7 @@
 #include <usb_mass_storage.h>
 #include <watchdog.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 
 static int ums_read_sector(struct ums *ums_dev,
 			   ulong start, lbaint_t blkcnt, void *buf)
diff --git a/common/dfu.c b/common/dfu.c
index d23cf67f1942..c879e8d6a8fd 100644
--- a/common/dfu.c
+++ b/common/dfu.c
@@ -19,6 +19,7 @@
 #include <g_dnl.h>
 #include <usb.h>
 #include <net.h>
+#include <linux/printk.h>
 
 int run_usb_dnl_gadget(int usbctrl_index, char *usb_dnl_gadget)
 {
diff --git a/common/spl/spl_dfu.c b/common/spl/spl_dfu.c
index 5728d43ad3f2..8a779da8fa1e 100644
--- a/common/spl/spl_dfu.c
+++ b/common/spl/spl_dfu.c
@@ -15,6 +15,7 @@
 #include <g_dnl.h>
 #include <usb.h>
 #include <dfu.h>
+#include <linux/printk.h>
 
 static int run_dfu(int usb_index, char *interface, char *devstring)
 {
diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c
index 6a9f6f57e8af..da6e021e1bf7 100644
--- a/common/spl/spl_fit.c
+++ b/common/spl/spl_fit.c
@@ -16,6 +16,7 @@
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <linux/libfdt.h>
+#include <linux/printk.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/common/spl/spl_opensbi.c b/common/spl/spl_opensbi.c
index 90c4a5f9704e..4bde3bb46874 100644
--- a/common/spl/spl_opensbi.c
+++ b/common/spl/spl_opensbi.c
@@ -15,6 +15,7 @@
 #include <asm/smp.h>
 #include <opensbi.h>
 #include <linux/libfdt.h>
+#include <linux/printk.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/common/spl/spl_sdp.c b/common/spl/spl_sdp.c
index e7f7b6841163..78ecc962551e 100644
--- a/common/spl/spl_sdp.c
+++ b/common/spl/spl_sdp.c
@@ -10,6 +10,7 @@
 #include <usb.h>
 #include <g_dnl.h>
 #include <sdp.h>
+#include <linux/printk.h>
 
 static int spl_sdp_load_image(struct spl_image_info *spl_image,
 			      struct spl_boot_device *bootdev)
diff --git a/common/update.c b/common/update.c
index c8dd346a0956..5875524d59be 100644
--- a/common/update.c
+++ b/common/update.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <image.h>
+#include <linux/printk.h>
 
 #if !(defined(CONFIG_FIT) && defined(CONFIG_OF_LIBFDT))
 #error "CONFIG_FIT and CONFIG_OF_LIBFDT are required for auto-update feature"
diff --git a/disk/part_efi.c b/disk/part_efi.c
index 933df460c7ba..c0def902feca 100644
--- a/disk/part_efi.c
+++ b/disk/part_efi.c
@@ -25,6 +25,7 @@
 #include <part_efi.h>
 #include <linux/compiler.h>
 #include <linux/ctype.h>
+#include <linux/printk.h>
 #include <u-boot/crc.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/adc/adc-uclass.c b/drivers/adc/adc-uclass.c
index d43566725810..7c033a6855bb 100644
--- a/drivers/adc/adc-uclass.c
+++ b/drivers/adc/adc-uclass.c
@@ -13,6 +13,7 @@
 #include <dm/uclass-internal.h>
 #include <adc.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 #include <power/regulator.h>
 
 #define ADC_UCLASS_PLATDATA_SIZE	sizeof(struct adc_uclass_platdata)
diff --git a/drivers/adc/exynos-adc.c b/drivers/adc/exynos-adc.c
index b459b5705076..973533d261a9 100644
--- a/drivers/adc/exynos-adc.c
+++ b/drivers/adc/exynos-adc.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <adc.h>
 #include <asm/arch/adc.h>
+#include <linux/printk.h>
 
 struct exynos_adc_priv {
 	int active_channel;
diff --git a/drivers/adc/meson-saradc.c b/drivers/adc/meson-saradc.c
index 72b0cc4e5bd1..d4abb6b943d0 100644
--- a/drivers/adc/meson-saradc.c
+++ b/drivers/adc/meson-saradc.c
@@ -18,6 +18,7 @@
 #include <linux/delay.h>
 #include <linux/math64.h>
 #include <linux/bitfield.h>
+#include <linux/printk.h>
 
 #define MESON_SAR_ADC_REG0					0x00
 	#define MESON_SAR_ADC_REG0_PANEL_DETECT			BIT(31)
diff --git a/drivers/adc/rockchip-saradc.c b/drivers/adc/rockchip-saradc.c
index 561740f63b5f..61e3f2cef903 100644
--- a/drivers/adc/rockchip-saradc.c
+++ b/drivers/adc/rockchip-saradc.c
@@ -13,6 +13,7 @@
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/err.h>
+#include <linux/printk.h>
 
 #define SARADC_CTRL_CHN_MASK		GENMASK(2, 0)
 #define SARADC_CTRL_POWER_CTRL		BIT(3)
diff --git a/drivers/adc/sandbox.c b/drivers/adc/sandbox.c
index 1f32289f6036..fa1174bbaa3f 100644
--- a/drivers/adc/sandbox.c
+++ b/drivers/adc/sandbox.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <adc.h>
 #include <sandbox-adc.h>
+#include <linux/printk.h>
 
 /**
  * struct sandbox_adc_priv - sandbox ADC device's operation status and data
diff --git a/drivers/ata/dwc_ahci.c b/drivers/ata/dwc_ahci.c
index 825fe57f8522..5f37fc92784d 100644
--- a/drivers/ata/dwc_ahci.c
+++ b/drivers/ata/dwc_ahci.c
@@ -16,6 +16,7 @@
 #include <asm/arch/sata.h>
 #include <asm/io.h>
 #include <generic-phy.h>
+#include <linux/printk.h>
 
 struct dwc_ahci_priv {
 	void *base;
diff --git a/drivers/bios_emulator/include/x86emu/debug.h b/drivers/bios_emulator/include/x86emu/debug.h
index 4962a2acaf1c..859b54d86000 100644
--- a/drivers/bios_emulator/include/x86emu/debug.h
+++ b/drivers/bios_emulator/include/x86emu/debug.h
@@ -43,6 +43,7 @@
 
 /* checks to be enabled for "runtime" */
 
+#include <linux/printk.h>
 #define CHECK_IP_FETCH_F		0x1
 #define CHECK_SP_ACCESS_F		0x2
 #define CHECK_MEM_ACCESS_F		0x4	/*using regular linear pointer */
diff --git a/drivers/bios_emulator/include/x86emu/regs.h b/drivers/bios_emulator/include/x86emu/regs.h
index 29341297d966..4b4c59089239 100644
--- a/drivers/bios_emulator/include/x86emu/regs.h
+++ b/drivers/bios_emulator/include/x86emu/regs.h
@@ -41,6 +41,7 @@
 
 /*---------------------- Macros and type definitions ----------------------*/
 
+#include <linux/printk.h>
 #pragma pack(1)
 
 /*
diff --git a/drivers/bios_emulator/x86emu/debug.c b/drivers/bios_emulator/x86emu/debug.c
index 27e90e441aa4..95f3cc09aad5 100644
--- a/drivers/bios_emulator/x86emu/debug.c
+++ b/drivers/bios_emulator/x86emu/debug.c
@@ -40,6 +40,7 @@
 #include <stdarg.h>
 #include <common.h>
 #include <linux/ctype.h>
+#include <linux/printk.h>
 #include "x86emu/x86emui.h"
 
 /*----------------------------- Implementation ----------------------------*/
diff --git a/drivers/bios_emulator/x86emu/decode.c b/drivers/bios_emulator/x86emu/decode.c
index a9a01b52d6cd..e2028eaf0833 100644
--- a/drivers/bios_emulator/x86emu/decode.c
+++ b/drivers/bios_emulator/x86emu/decode.c
@@ -37,6 +37,7 @@
 *
 ****************************************************************************/
 #include <common.h>
+#include <linux/printk.h>
 #include "x86emu/x86emui.h"
 
 /*----------------------------- Implementation ----------------------------*/
diff --git a/drivers/bios_emulator/x86emu/ops.c b/drivers/bios_emulator/x86emu/ops.c
index ba18135fe13c..8c1a146165c9 100644
--- a/drivers/bios_emulator/x86emu/ops.c
+++ b/drivers/bios_emulator/x86emu/ops.c
@@ -73,6 +73,7 @@
 ****************************************************************************/
 
 #include <common.h>
+#include <linux/printk.h>
 #include "x86emu/x86emui.h"
 
 /*----------------------------- Implementation ----------------------------*/
diff --git a/drivers/bios_emulator/x86emu/ops2.c b/drivers/bios_emulator/x86emu/ops2.c
index be4ef3644320..6cd1ac398252 100644
--- a/drivers/bios_emulator/x86emu/ops2.c
+++ b/drivers/bios_emulator/x86emu/ops2.c
@@ -43,6 +43,7 @@
 
 #include <common.h>
 #include <linux/compiler.h>
+#include <linux/printk.h>
 #include "x86emu/x86emui.h"
 
 /*----------------------------- Implementation ----------------------------*/
diff --git a/drivers/bios_emulator/x86emu/sys.c b/drivers/bios_emulator/x86emu/sys.c
index c2db1213fe66..53891960c0c6 100644
--- a/drivers/bios_emulator/x86emu/sys.c
+++ b/drivers/bios_emulator/x86emu/sys.c
@@ -40,6 +40,7 @@
 ****************************************************************************/
 
 #include <common.h>
+#include <linux/printk.h>
 #include "x86emu/x86emui.h"
 
 /*------------------------- Global Variables ------------------------------*/
diff --git a/drivers/bootcount/bootcount-uclass.c b/drivers/bootcount/bootcount-uclass.c
index 34ac08d59a6a..2a492c87ebdf 100644
--- a/drivers/bootcount/bootcount-uclass.c
+++ b/drivers/bootcount/bootcount-uclass.c
@@ -8,6 +8,7 @@
 #include <errno.h>
 #include <bootcount.h>
 #include <log.h>
+#include <linux/printk.h>
 
 int dm_bootcount_get(struct udevice *dev, u32 *bootcount)
 {
diff --git a/drivers/clk/analogbits/wrpll-cln28hpc.c b/drivers/clk/analogbits/wrpll-cln28hpc.c
index 776ead319ae9..a3cb109d3575 100644
--- a/drivers/clk/analogbits/wrpll-cln28hpc.c
+++ b/drivers/clk/analogbits/wrpll-cln28hpc.c
@@ -26,6 +26,7 @@
 #include <linux/log2.h>
 #include <linux/math64.h>
 #include <linux/clk/analogbits-wrpll-cln28hpc.h>
+#include <linux/printk.h>
 
 /* MIN_INPUT_FREQ: minimum input clock frequency, in Hz (Fref_min) */
 #define MIN_INPUT_FREQ			7000000
diff --git a/drivers/clk/clk-divider.c b/drivers/clk/clk-divider.c
index 34658536c483..0e0c2d48b741 100644
--- a/drivers/clk/clk-divider.c
+++ b/drivers/clk/clk-divider.c
@@ -24,6 +24,7 @@
 #include <linux/log2.h>
 #include <div64.h>
 #include <clk.h>
+#include <linux/printk.h>
 #include "clk.h"
 
 #define UBOOT_DM_CLK_CCF_DIVIDER "ccf_clk_divider"
diff --git a/drivers/clk/clk-gate.c b/drivers/clk/clk-gate.c
index 98e4b80b32f9..cdca3e38d0d5 100644
--- a/drivers/clk/clk-gate.c
+++ b/drivers/clk/clk-gate.c
@@ -16,6 +16,7 @@
 #include <linux/bitops.h>
 #include <linux/clk-provider.h>
 #include <clk.h>
+#include <linux/printk.h>
 #include "clk.h"
 #include <linux/err.h>
 
diff --git a/drivers/clk/clk-hsdk-cgu.c b/drivers/clk/clk-hsdk-cgu.c
index 3eb93a55fc41..2067316e672f 100644
--- a/drivers/clk/clk-hsdk-cgu.c
+++ b/drivers/clk/clk-hsdk-cgu.c
@@ -19,6 +19,7 @@
 #include <linux/delay.h>
 #include <linux/io.h>
 #include <asm/arcregs.h>
+#include <linux/printk.h>
 
 #include <dt-bindings/clock/snps,hsdk-cgu.h>
 
diff --git a/drivers/clk/clk-mux.c b/drivers/clk/clk-mux.c
index 26991a5bc8fc..8df2a2d01ac6 100644
--- a/drivers/clk/clk-mux.c
+++ b/drivers/clk/clk-mux.c
@@ -30,6 +30,7 @@
 #include <linux/bitops.h>
 #include <linux/clk-provider.h>
 #include <clk.h>
+#include <linux/printk.h>
 #include "clk.h"
 #include <linux/err.h>
 
diff --git a/drivers/clk/clk_boston.c b/drivers/clk/clk_boston.c
index 2318dcf6a45d..47424d8f5333 100644
--- a/drivers/clk/clk_boston.c
+++ b/drivers/clk/clk_boston.c
@@ -10,6 +10,7 @@
 #include <regmap.h>
 #include <syscon.h>
 #include <linux/bitops.h>
+#include <linux/printk.h>
 
 struct clk_boston {
 	struct regmap *regmap;
diff --git a/drivers/clk/clk_stm32f.c b/drivers/clk/clk_stm32f.c
index 93722f74ae4d..cc48905df542 100644
--- a/drivers/clk/clk_stm32f.c
+++ b/drivers/clk/clk_stm32f.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <stm32_rcc.h>
 #include <linux/bitops.h>
+#include <linux/printk.h>
 
 #include <asm/io.h>
 #include <asm/arch/stm32.h>
diff --git a/drivers/clk/clk_stm32h7.c b/drivers/clk/clk_stm32h7.c
index 5e6abca56fab..c1856d8678b5 100644
--- a/drivers/clk/clk_stm32h7.c
+++ b/drivers/clk/clk_stm32h7.c
@@ -13,6 +13,7 @@
 #include <asm/io.h>
 #include <dm/root.h>
 #include <linux/bitops.h>
+#include <linux/printk.h>
 
 #include <dt-bindings/clock/stm32h7-clks.h>
 
diff --git a/drivers/clk/clk_stm32mp1.c b/drivers/clk/clk_stm32mp1.c
index 65ffd32d08e0..8244b7c99fcc 100644
--- a/drivers/clk/clk_stm32mp1.c
+++ b/drivers/clk/clk_stm32mp1.c
@@ -21,6 +21,7 @@
 #include <asm/arch/sys_proto.h>
 #include <dt-bindings/clock/stm32mp1-clks.h>
 #include <dt-bindings/clock/stm32mp1-clksrc.h>
+#include <linux/printk.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/clk/imx/clk-pll14xx.c b/drivers/clk/imx/clk-pll14xx.c
index b0ccb6c8eda5..ac2461948d27 100644
--- a/drivers/clk/imx/clk-pll14xx.c
+++ b/drivers/clk/imx/clk-pll14xx.c
@@ -18,6 +18,7 @@
 #include <linux/iopoll.h>
 #include <clk.h>
 #include <div64.h>
+#include <linux/printk.h>
 
 #include "clk.h"
 
diff --git a/drivers/clk/rockchip/clk_rk3368.c b/drivers/clk/rockchip/clk_rk3368.c
index d1804c6e1682..b87be9a03411 100644
--- a/drivers/clk/rockchip/clk_rk3368.c
+++ b/drivers/clk/rockchip/clk_rk3368.c
@@ -22,6 +22,7 @@
 #include <dm/lists.h>
 #include <dt-bindings/clock/rk3368-cru.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 #include <linux/stringify.h>
 
 #if CONFIG_IS_ENABLED(OF_PLATDATA)
diff --git a/drivers/clk/rockchip/clk_rk3399.c b/drivers/clk/rockchip/clk_rk3399.c
index 22c373a623ca..e3d1438d54fc 100644
--- a/drivers/clk/rockchip/clk_rk3399.c
+++ b/drivers/clk/rockchip/clk_rk3399.c
@@ -22,6 +22,7 @@
 #include <dt-bindings/clock/rk3399-cru.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 
 #if CONFIG_IS_ENABLED(OF_PLATDATA)
 struct rk3399_clk_plat {
diff --git a/drivers/core/device.c b/drivers/core/device.c
index c473789edfa9..dd0874e762d7 100644
--- a/drivers/core/device.c
+++ b/drivers/core/device.c
@@ -31,6 +31,7 @@
 #include <linux/err.h>
 #include <linux/list.h>
 #include <power-domain.h>
+#include <linux/printk.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/core/of_addr.c b/drivers/core/of_addr.c
index ca34d84922b5..3a67d9bc760c 100644
--- a/drivers/core/of_addr.c
+++ b/drivers/core/of_addr.c
@@ -14,6 +14,7 @@
 #include <dm/of_addr.h>
 #include <linux/err.h>
 #include <linux/ioport.h>
+#include <linux/printk.h>
 
 /* Max address size we deal with */
 #define OF_MAX_ADDR_CELLS	4
diff --git a/drivers/core/root.c b/drivers/core/root.c
index b5446b1db02d..1e9d580c4940 100644
--- a/drivers/core/root.c
+++ b/drivers/core/root.c
@@ -25,6 +25,7 @@
 #include <dm/uclass.h>
 #include <dm/util.h>
 #include <linux/list.h>
+#include <linux/printk.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/dfu/dfu.c b/drivers/dfu/dfu.c
index a298c2c43999..3d5de92ecae0 100644
--- a/drivers/dfu/dfu.c
+++ b/drivers/dfu/dfu.c
@@ -17,6 +17,7 @@
 #include <hash.h>
 #include <linux/list.h>
 #include <linux/compiler.h>
+#include <linux/printk.h>
 
 static LIST_HEAD(dfu_list);
 static int dfu_alt_num;
diff --git a/drivers/dfu/dfu_mmc.c b/drivers/dfu/dfu_mmc.c
index 691d01c7ebdf..ac5ea2c7d79c 100644
--- a/drivers/dfu/dfu_mmc.c
+++ b/drivers/dfu/dfu_mmc.c
@@ -16,6 +16,7 @@
 #include <fat.h>
 #include <mmc.h>
 #include <part.h>
+#include <linux/printk.h>
 
 static unsigned char *dfu_file_buf;
 static u64 dfu_file_buf_len;
diff --git a/drivers/dfu/dfu_ram.c b/drivers/dfu/dfu_ram.c
index cc98668e7a47..9b3b71975a19 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 <linux/printk.h>
 
 static int dfu_transfer_medium_ram(enum dfu_op op, struct dfu_entity *dfu,
 				   u64 offset, void *buf, long *len)
diff --git a/drivers/dfu/dfu_tftp.c b/drivers/dfu/dfu_tftp.c
index ffae4bb54f80..0f2c114668ec 100644
--- a/drivers/dfu/dfu_tftp.c
+++ b/drivers/dfu/dfu_tftp.c
@@ -9,6 +9,7 @@
 #include <malloc.h>
 #include <errno.h>
 #include <dfu.h>
+#include <linux/printk.h>
 
 int dfu_tftp_write(char *dfu_entity_name, unsigned int addr, unsigned int len,
 		   char *interface, char *devstring)
diff --git a/drivers/dma/bcm6348-iudma.c b/drivers/dma/bcm6348-iudma.c
index 91172d483c79..ceb8de9b8af2 100644
--- a/drivers/dma/bcm6348-iudma.c
+++ b/drivers/dma/bcm6348-iudma.c
@@ -28,6 +28,7 @@
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 
 #define DMA_RX_DESC	6
 #define DMA_TX_DESC	1
diff --git a/drivers/dma/dma-uclass.c b/drivers/dma/dma-uclass.c
index 8cbb36404270..79fbfa87d12b 100644
--- a/drivers/dma/dma-uclass.c
+++ b/drivers/dma/dma-uclass.c
@@ -19,6 +19,7 @@
 #include <dma-uclass.h>
 #include <dt-structs.h>
 #include <errno.h>
+#include <linux/printk.h>
 
 #ifdef CONFIG_DMA_CHANNELS
 static inline struct dma_ops *dma_dev_ops(struct udevice *dev)
diff --git a/drivers/dma/lpc32xx_dma.c b/drivers/dma/lpc32xx_dma.c
index ab58e97bfe27..0efdfd028cfd 100644
--- a/drivers/dma/lpc32xx_dma.c
+++ b/drivers/dma/lpc32xx_dma.c
@@ -17,6 +17,7 @@
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 
 /* DMA controller channel register structure */
 struct dmac_chan_reg {
diff --git a/drivers/dma/sandbox-dma-test.c b/drivers/dma/sandbox-dma-test.c
index 838596b24b67..18e8fe3806c1 100644
--- a/drivers/dma/sandbox-dma-test.c
+++ b/drivers/dma/sandbox-dma-test.c
@@ -15,6 +15,7 @@
 #include <dma-uclass.h>
 #include <dt-structs.h>
 #include <errno.h>
+#include <linux/printk.h>
 
 #define SANDBOX_DMA_CH_CNT 3
 #define SANDBOX_DMA_BUF_SIZE 1024
diff --git a/drivers/dma/ti-edma3.c b/drivers/dma/ti-edma3.c
index 13ab96708904..c73ab579cf67 100644
--- a/drivers/dma/ti-edma3.c
+++ b/drivers/dma/ti-edma3.c
@@ -15,6 +15,7 @@
 #include <dma-uclass.h>
 #include <asm/omap_common.h>
 #include <asm/ti-common/ti-edma3.h>
+#include <linux/printk.h>
 
 #define EDMA3_SL_BASE(slot)			(0x4000 + ((slot) << 5))
 #define EDMA3_SL_MAX_NUM			512
diff --git a/drivers/dma/ti/k3-udma.c b/drivers/dma/ti/k3-udma.c
index 57d9fbfabbff..9de0258ed1da 100644
--- a/drivers/dma/ti/k3-udma.c
+++ b/drivers/dma/ti/k3-udma.c
@@ -24,6 +24,7 @@
 #include <linux/delay.h>
 #include <linux/bitmap.h>
 #include <linux/err.h>
+#include <linux/printk.h>
 #include <linux/soc/ti/k3-navss-ringacc.h>
 #include <linux/soc/ti/cppi5.h>
 #include <linux/soc/ti/ti-udma.h>
diff --git a/drivers/fastboot/fb_command.c b/drivers/fastboot/fb_command.c
index 49f6a61c3745..42c8fb83433b 100644
--- a/drivers/fastboot/fb_command.c
+++ b/drivers/fastboot/fb_command.c
@@ -13,6 +13,7 @@
 #include <flash.h>
 #include <part.h>
 #include <stdlib.h>
+#include <linux/printk.h>
 
 /**
  * image_size - final fastboot image size
diff --git a/drivers/fastboot/fb_getvar.c b/drivers/fastboot/fb_getvar.c
index 52da34b1e37e..faa785481ade 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 <linux/printk.h>
 
 static void getvar_version(char *var_parameter, char *response);
 static void getvar_version_bootloader(char *var_parameter, char *response);
diff --git a/drivers/fastboot/fb_mmc.c b/drivers/fastboot/fb_mmc.c
index b2f8932e1c7a..d285d0f14fd4 100644
--- a/drivers/fastboot/fb_mmc.c
+++ b/drivers/fastboot/fb_mmc.c
@@ -19,6 +19,7 @@
 #include <div64.h>
 #include <linux/compat.h>
 #include <android_image.h>
+#include <linux/printk.h>
 
 #define FASTBOOT_MAX_BLK_WRITE 16384
 
diff --git a/drivers/fastboot/fb_nand.c b/drivers/fastboot/fb_nand.c
index eb8a36f29222..1bf7ccb960b8 100644
--- a/drivers/fastboot/fb_nand.c
+++ b/drivers/fastboot/fb_nand.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <blk.h>
 #include <flash.h>
+#include <linux/printk.h>
 
 #include <fastboot.h>
 #include <image-sparse.h>
diff --git a/drivers/i2c/i2c-gpio.c b/drivers/i2c/i2c-gpio.c
index 6dc89a4e2023..fe90abd24a6d 100644
--- a/drivers/i2c/i2c-gpio.c
+++ b/drivers/i2c/i2c-gpio.c
@@ -13,6 +13,7 @@
 #include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 
 #define DEFAULT_UDELAY	5
 #define RETRIES		0
diff --git a/drivers/i2c/iproc_i2c.c b/drivers/i2c/iproc_i2c.c
index b90c0ddba7cd..4231c0c617f0 100644
--- a/drivers/i2c/iproc_i2c.c
+++ b/drivers/i2c/iproc_i2c.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <config.h>
 #include <dm.h>
+#include <linux/printk.h>
 #include "errno.h"
 #include <i2c.h>
 #include "iproc_i2c.h"
diff --git a/drivers/i2c/omap24xx_i2c.c b/drivers/i2c/omap24xx_i2c.c
index 0af4e333c412..aaf2d10f6fdf 100644
--- a/drivers/i2c/omap24xx_i2c.c
+++ b/drivers/i2c/omap24xx_i2c.c
@@ -43,6 +43,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 
 #include <asm/io.h>
 #include <asm/omap_i2c.h>
diff --git a/drivers/i2c/stm32f7_i2c.c b/drivers/i2c/stm32f7_i2c.c
index 2f6091154942..6c2fff1c52bf 100644
--- a/drivers/i2c/stm32f7_i2c.c
+++ b/drivers/i2c/stm32f7_i2c.c
@@ -13,6 +13,7 @@
 #include <syscon.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 
 #include <dm/device.h>
 #include <linux/err.h>
diff --git a/drivers/i2c/tegra_i2c.c b/drivers/i2c/tegra_i2c.c
index 65b3734348b0..96a436a8dc1f 100644
--- a/drivers/i2c/tegra_i2c.c
+++ b/drivers/i2c/tegra_i2c.c
@@ -21,6 +21,7 @@
 #include <asm/arch-tegra/tegra_i2c.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/printk.h>
 
 enum i2c_type {
 	TYPE_114,
diff --git a/drivers/misc/sifive-otp.c b/drivers/misc/sifive-otp.c
index 92f08dde011a..0a4fa67f335c 100644
--- a/drivers/misc/sifive-otp.c
+++ b/drivers/misc/sifive-otp.c
@@ -24,6 +24,7 @@
 #include <linux/delay.h>
 #include <linux/io.h>
 #include <misc.h>
+#include <linux/printk.h>
 
 #define BYTES_PER_FUSE		4
 
diff --git a/drivers/misc/tegra186_bpmp.c b/drivers/misc/tegra186_bpmp.c
index 1f4437226e7f..73cc2666e498 100644
--- a/drivers/misc/tegra186_bpmp.c
+++ b/drivers/misc/tegra186_bpmp.c
@@ -17,6 +17,7 @@
 #include <asm/arch-tegra/ivc.h>
 #include <linux/bitops.h>
 #include <linux/err.h>
+#include <linux/printk.h>
 
 #define BPMP_IVC_FRAME_COUNT 1
 #define BPMP_IVC_FRAME_SIZE 128
diff --git a/drivers/mmc/exynos_dw_mmc.c b/drivers/mmc/exynos_dw_mmc.c
index 94af116d10ce..499fafe8f5ef 100644
--- a/drivers/mmc/exynos_dw_mmc.c
+++ b/drivers/mmc/exynos_dw_mmc.c
@@ -16,6 +16,7 @@
 #include <asm/arch/pinmux.h>
 #include <asm/arch/power.h>
 #include <asm/gpio.h>
+#include <linux/printk.h>
 
 #define	DWMMC_MAX_CH_NUM		4
 #define	DWMMC_MAX_FREQ			52000000
diff --git a/drivers/mmc/fsl_esdhc_imx.c b/drivers/mmc/fsl_esdhc_imx.c
index afe4cc69dbe1..e5ef0bcf6608 100644
--- a/drivers/mmc/fsl_esdhc_imx.c
+++ b/drivers/mmc/fsl_esdhc_imx.c
@@ -26,6 +26,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/printk.h>
 #include <power/regulator.h>
 #include <malloc.h>
 #include <fsl_esdhc_imx.h>
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index d79cdef62ed2..2899986fcf15 100644
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@ -19,6 +19,7 @@
 #include <part.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 #include <power/regulator.h>
 #include <malloc.h>
 #include <memalign.h>
diff --git a/drivers/mmc/mtk-sd.c b/drivers/mmc/mtk-sd.c
index bd1fb09d1c9b..2fe33e07c18b 100644
--- a/drivers/mmc/mtk-sd.c
+++ b/drivers/mmc/mtk-sd.c
@@ -20,6 +20,7 @@
 #include <linux/bitops.h>
 #include <linux/io.h>
 #include <linux/iopoll.h>
+#include <linux/printk.h>
 
 /* MSDC_CFG */
 #define MSDC_CFG_HS400_CK_MODE_EXT	BIT(22)
diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c
index ff871f825239..f8da69e95894 100644
--- a/drivers/mmc/sdhci.c
+++ b/drivers/mmc/sdhci.c
@@ -20,6 +20,7 @@
 #include <linux/delay.h>
 #include <linux/dma-mapping.h>
 #include <phys2bus.h>
+#include <linux/printk.h>
 
 static void sdhci_reset(struct sdhci_host *host, u8 mask)
 {
diff --git a/drivers/mmc/sti_sdhci.c b/drivers/mmc/sti_sdhci.c
index db0b566a8b73..11ae392734c3 100644
--- a/drivers/mmc/sti_sdhci.c
+++ b/drivers/mmc/sti_sdhci.c
@@ -12,6 +12,7 @@
 #include <sdhci.h>
 #include <asm/arch/sdhci.h>
 #include <asm/global_data.h>
+#include <linux/printk.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/mmc/stm32_sdmmc2.c b/drivers/mmc/stm32_sdmmc2.c
index 6d503562171c..4736cae76890 100644
--- a/drivers/mmc/stm32_sdmmc2.c
+++ b/drivers/mmc/stm32_sdmmc2.c
@@ -22,6 +22,7 @@
 #include <asm/gpio.h>
 #include <linux/iopoll.h>
 #include <watchdog.h>
+#include <linux/printk.h>
 
 struct stm32_sdmmc2_plat {
 	struct mmc_config cfg;
diff --git a/drivers/mmc/xenon_sdhci.c b/drivers/mmc/xenon_sdhci.c
index c3ea9d7f532a..50c5b194cadd 100644
--- a/drivers/mmc/xenon_sdhci.c
+++ b/drivers/mmc/xenon_sdhci.c
@@ -23,6 +23,7 @@
 #include <linux/libfdt.h>
 #include <malloc.h>
 #include <sdhci.h>
+#include <linux/printk.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/mtd/mtdconcat.c b/drivers/mtd/mtdconcat.c
index 684bc949985b..1baaa6e9475c 100644
--- a/drivers/mtd/mtdconcat.c
+++ b/drivers/mtd/mtdconcat.c
@@ -23,6 +23,7 @@
 #include <div64.h>
 #include <linux/bug.h>
 #include <linux/compat.h>
+#include <linux/printk.h>
 #endif
 
 #include <linux/mtd/mtd.h>
diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c
index 1a4dec34d93e..6b0ea1953127 100644
--- a/drivers/mtd/mtdcore.c
+++ b/drivers/mtd/mtdcore.c
@@ -32,6 +32,7 @@
 #include <linux/bug.h>
 #include <linux/err.h>
 #include <ubi_uboot.h>
+#include <linux/printk.h>
 #endif
 
 #include <linux/log2.h>
diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c
index d064ac304807..cad11805690a 100644
--- a/drivers/mtd/mtdpart.c
+++ b/drivers/mtd/mtdpart.c
@@ -25,6 +25,7 @@
 #include <linux/errno.h>
 #include <linux/compat.h>
 #include <ubi_uboot.h>
+#include <linux/printk.h>
 
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
diff --git a/drivers/mtd/nand/bbt.c b/drivers/mtd/nand/bbt.c
index 294daee7b224..972aec6e2666 100644
--- a/drivers/mtd/nand/bbt.c
+++ b/drivers/mtd/nand/bbt.c
@@ -16,6 +16,7 @@
 #ifndef __UBOOT__
 #include <linux/slab.h>
 #endif
+#include <linux/printk.h>
 
 /**
  * nanddev_bbt_init() - Initialize the BBT (Bad Block Table)
diff --git a/drivers/mtd/nand/core.c b/drivers/mtd/nand/core.c
index 6fbd24ba7495..45d827f686c0 100644
--- a/drivers/mtd/nand/core.c
+++ b/drivers/mtd/nand/core.c
@@ -16,6 +16,7 @@
 #endif
 #include <linux/bitops.h>
 #include <linux/mtd/nand.h>
+#include <linux/printk.h>
 
 /**
  * nanddev_isbad() - Check if a block is bad
diff --git a/drivers/mtd/nand/raw/arasan_nfc.c b/drivers/mtd/nand/raw/arasan_nfc.c
index 6c1d64054c64..9733e6666768 100644
--- a/drivers/mtd/nand/raw/arasan_nfc.c
+++ b/drivers/mtd/nand/raw/arasan_nfc.c
@@ -18,6 +18,7 @@
 #include <asm/arch/sys_proto.h>
 #include <dm.h>
 #include <nand.h>
+#include <linux/printk.h>
 
 struct nand_config {
 	u32 page;
diff --git a/drivers/mtd/nand/raw/atmel_nand.c b/drivers/mtd/nand/raw/atmel_nand.c
index 5e95901e2751..599bdfc0d6df 100644
--- a/drivers/mtd/nand/raw/atmel_nand.c
+++ b/drivers/mtd/nand/raw/atmel_nand.c
@@ -19,6 +19,7 @@
 #include <linux/bitops.h>
 #include <linux/bug.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 
 #include <malloc.h>
 #include <nand.h>
diff --git a/drivers/mtd/nand/raw/brcmnand/bcm63158_nand.c b/drivers/mtd/nand/raw/brcmnand/bcm63158_nand.c
index 6313403cd65a..89c981096ba9 100644
--- a/drivers/mtd/nand/raw/brcmnand/bcm63158_nand.c
+++ b/drivers/mtd/nand/raw/brcmnand/bcm63158_nand.c
@@ -10,6 +10,7 @@
 #include <linux/io.h>
 #include <linux/ioport.h>
 #include <dm.h>
+#include <linux/printk.h>
 
 #include "brcmnand.h"
 
diff --git a/drivers/mtd/nand/raw/brcmnand/bcm6368_nand.c b/drivers/mtd/nand/raw/brcmnand/bcm6368_nand.c
index cd4b24a51a14..3223d9aacfff 100644
--- a/drivers/mtd/nand/raw/brcmnand/bcm6368_nand.c
+++ b/drivers/mtd/nand/raw/brcmnand/bcm6368_nand.c
@@ -9,6 +9,7 @@
 #include <linux/io.h>
 #include <linux/ioport.h>
 #include <dm.h>
+#include <linux/printk.h>
 
 #include "brcmnand.h"
 
diff --git a/drivers/mtd/nand/raw/brcmnand/bcm68360_nand.c b/drivers/mtd/nand/raw/brcmnand/bcm68360_nand.c
index aa042bef1584..b8e7b6b2921e 100644
--- a/drivers/mtd/nand/raw/brcmnand/bcm68360_nand.c
+++ b/drivers/mtd/nand/raw/brcmnand/bcm68360_nand.c
@@ -9,6 +9,7 @@
 #include <linux/io.h>
 #include <linux/ioport.h>
 #include <dm.h>
+#include <linux/printk.h>
 
 #include "brcmnand.h"
 
diff --git a/drivers/mtd/nand/raw/brcmnand/bcm6838_nand.c b/drivers/mtd/nand/raw/brcmnand/bcm6838_nand.c
index 078845509060..071b16c217ae 100644
--- a/drivers/mtd/nand/raw/brcmnand/bcm6838_nand.c
+++ b/drivers/mtd/nand/raw/brcmnand/bcm6838_nand.c
@@ -10,6 +10,7 @@
 #include <linux/io.h>
 #include <linux/ioport.h>
 #include <dm.h>
+#include <linux/printk.h>
 
 #include "brcmnand.h"
 
diff --git a/drivers/mtd/nand/raw/brcmnand/bcm6858_nand.c b/drivers/mtd/nand/raw/brcmnand/bcm6858_nand.c
index 818eae8a7c6c..e9d23377d47a 100644
--- a/drivers/mtd/nand/raw/brcmnand/bcm6858_nand.c
+++ b/drivers/mtd/nand/raw/brcmnand/bcm6858_nand.c
@@ -10,6 +10,7 @@
 #include <linux/io.h>
 #include <linux/ioport.h>
 #include <dm.h>
+#include <linux/printk.h>
 
 #include "brcmnand.h"
 
diff --git a/drivers/mtd/nand/raw/davinci_nand.c b/drivers/mtd/nand/raw/davinci_nand.c
index 4416b8fa1e64..f64de80bf2bd 100644
--- a/drivers/mtd/nand/raw/davinci_nand.c
+++ b/drivers/mtd/nand/raw/davinci_nand.c
@@ -34,6 +34,7 @@
 #include <nand.h>
 #include <dm/uclass.h>
 #include <asm/ti-common/davinci_nand.h>
+#include <linux/printk.h>
 
 /* Definitions for 4-bit hardware ECC */
 #define NAND_TIMEOUT			10240
diff --git a/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c b/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c
index b3232ed59d53..588fb010ee89 100644
--- a/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c
+++ b/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c
@@ -27,6 +27,7 @@
 #include <nand.h>
 #include <asm/arch/clk.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/printk.h>
 
 /*
  * MLC NAND controller registers.
diff --git a/drivers/mtd/nand/raw/lpc32xx_nand_slc.c b/drivers/mtd/nand/raw/lpc32xx_nand_slc.c
index 9cca3c55cc09..5e8e76c3e5f0 100644
--- a/drivers/mtd/nand/raw/lpc32xx_nand_slc.c
+++ b/drivers/mtd/nand/raw/lpc32xx_nand_slc.c
@@ -22,6 +22,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/dma.h>
 #include <asm/arch/cpu.h>
+#include <linux/printk.h>
 
 struct lpc32xx_nand_slc_regs {
 	u32 data;
diff --git a/drivers/mtd/nand/raw/mxc_nand.c b/drivers/mtd/nand/raw/mxc_nand.c
index 59cef205754b..c5e56c05873c 100644
--- a/drivers/mtd/nand/raw/mxc_nand.c
+++ b/drivers/mtd/nand/raw/mxc_nand.c
@@ -15,6 +15,7 @@
 	defined(CONFIG_MX51) || defined(CONFIG_MX53)
 #include <asm/arch/imx-regs.h>
 #endif
+#include <linux/printk.h>
 #include "mxc_nand.h"
 
 #define DRIVER_NAME "mxc_nand"
diff --git a/drivers/mtd/nand/raw/nand_base.c b/drivers/mtd/nand/raw/nand_base.c
index ebb40f933254..7cd1e133c22a 100644
--- a/drivers/mtd/nand/raw/nand_base.c
+++ b/drivers/mtd/nand/raw/nand_base.c
@@ -51,6 +51,7 @@
 #endif
 #include <asm/io.h>
 #include <linux/errno.h>
+#include <linux/printk.h>
 
 /* Define default oob placement schemes for large and small page devices */
 #ifndef CONFIG_SYS_NAND_DRIVER_ECC_LAYOUT
diff --git a/drivers/mtd/nand/raw/nand_bbt.c b/drivers/mtd/nand/raw/nand_bbt.c
index 911472e91e1a..4f3c3223ca71 100644
--- a/drivers/mtd/nand/raw/nand_bbt.c
+++ b/drivers/mtd/nand/raw/nand_bbt.c
@@ -67,6 +67,7 @@
 #include <linux/mtd/bbm.h>
 #include <linux/mtd/rawnand.h>
 #include <linux/bitops.h>
+#include <linux/printk.h>
 #include <linux/string.h>
 
 #define BBT_BLOCK_GOOD		0x00
diff --git a/drivers/mtd/nand/raw/nand_bch.c b/drivers/mtd/nand/raw/nand_bch.c
index 734d1c6204eb..bb48ebbb96c7 100644
--- a/drivers/mtd/nand/raw/nand_bch.c
+++ b/drivers/mtd/nand/raw/nand_bch.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <log.h>
 #include <dm/devres.h>
+#include <linux/printk.h>
 /*#include <asm/io.h>*/
 #include <linux/types.h>
 
diff --git a/drivers/mtd/nand/raw/pxa3xx_nand.c b/drivers/mtd/nand/raw/pxa3xx_nand.c
index 701bfead7731..224db72087b4 100644
--- a/drivers/mtd/nand/raw/pxa3xx_nand.c
+++ b/drivers/mtd/nand/raw/pxa3xx_nand.c
@@ -22,6 +22,7 @@
 #include <asm/arch/cpu.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/rawnand.h>
+#include <linux/printk.h>
 #include <linux/types.h>
 
 #include "pxa3xx_nand.h"
diff --git a/drivers/mtd/nand/raw/stm32_fmc2_nand.c b/drivers/mtd/nand/raw/stm32_fmc2_nand.c
index 47fe61090da4..c1e884af950a 100644
--- a/drivers/mtd/nand/raw/stm32_fmc2_nand.c
+++ b/drivers/mtd/nand/raw/stm32_fmc2_nand.c
@@ -16,6 +16,7 @@
 #include <linux/err.h>
 #include <linux/iopoll.h>
 #include <linux/ioport.h>
+#include <linux/printk.h>
 
 /* Bad block marker length */
 #define FMC2_BBM_LEN			2
diff --git a/drivers/mtd/nand/raw/sunxi_nand.c b/drivers/mtd/nand/raw/sunxi_nand.c
index 6d02d56aeb67..2946f94b6df3 100644
--- a/drivers/mtd/nand/raw/sunxi_nand.c
+++ b/drivers/mtd/nand/raw/sunxi_nand.c
@@ -35,6 +35,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/printk.h>
 
 #include <linux/kernel.h>
 #include <linux/mtd/mtd.h>
diff --git a/drivers/mtd/nand/raw/tegra_nand.c b/drivers/mtd/nand/raw/tegra_nand.c
index dd14c34738ad..a28f830e8cd2 100644
--- a/drivers/mtd/nand/raw/tegra_nand.c
+++ b/drivers/mtd/nand/raw/tegra_nand.c
@@ -23,6 +23,7 @@
 #include <fdtdec.h>
 #include <bouncebuf.h>
 #include <dm.h>
+#include <linux/printk.h>
 #include "tegra_nand.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/mtd/nand/raw/vf610_nfc.c b/drivers/mtd/nand/raw/vf610_nfc.c
index 52c8a94778cb..bee273b1a644 100644
--- a/drivers/mtd/nand/raw/vf610_nfc.c
+++ b/drivers/mtd/nand/raw/vf610_nfc.c
@@ -24,6 +24,7 @@
 #include <common.h>
 #include <malloc.h>
 #include <dm/device_compat.h>
+#include <linux/printk.h>
 
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/rawnand.h>
diff --git a/drivers/mtd/nand/raw/zynq_nand.c b/drivers/mtd/nand/raw/zynq_nand.c
index fa594552109d..37a6835060c4 100644
--- a/drivers/mtd/nand/raw/zynq_nand.c
+++ b/drivers/mtd/nand/raw/zynq_nand.c
@@ -21,6 +21,7 @@
 #include <asm/arch/hardware.h>
 #include <asm/arch/sys_proto.h>
 #include <dm.h>
+#include <linux/printk.h>
 
 /* The NAND flash driver defines */
 #define ZYNQ_NAND_CMD_PHASE		1
diff --git a/drivers/mtd/nand/spi/core.c b/drivers/mtd/nand/spi/core.c
index 93371fdde071..63248f648a1b 100644
--- a/drivers/mtd/nand/spi/core.c
+++ b/drivers/mtd/nand/spi/core.c
@@ -29,6 +29,7 @@
 #include <linux/bitops.h>
 #include <linux/bug.h>
 #include <linux/mtd/spinand.h>
+#include <linux/printk.h>
 #endif
 
 /* SPI NAND index visible in MTD names */
diff --git a/drivers/mtd/onenand/onenand_base.c b/drivers/mtd/onenand/onenand_base.c
index 36daef01aec8..ad9b61f396f3 100644
--- a/drivers/mtd/onenand/onenand_base.c
+++ b/drivers/mtd/onenand/onenand_base.c
@@ -26,6 +26,7 @@
 #include <linux/bitops.h>
 #include <linux/compat.h>
 #include <linux/mtd/mtd.h>
+#include <linux/printk.h>
 #include "linux/mtd/flashchip.h"
 #include <linux/mtd/onenand.h>
 
diff --git a/drivers/mtd/onenand/onenand_bbt.c b/drivers/mtd/onenand/onenand_bbt.c
index eca9edff6039..cc1e449f4a72 100644
--- a/drivers/mtd/onenand/onenand_bbt.c
+++ b/drivers/mtd/onenand/onenand_bbt.c
@@ -20,6 +20,7 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/onenand.h>
 #include <malloc.h>
+#include <linux/printk.h>
 
 #include <linux/errno.h>
 
diff --git a/drivers/mtd/onenand/samsung.c b/drivers/mtd/onenand/samsung.c
index 657abaab8f41..c415e5149a01 100644
--- a/drivers/mtd/onenand/samsung.c
+++ b/drivers/mtd/onenand/samsung.c
@@ -16,6 +16,7 @@
 #include <linux/mtd/onenand.h>
 #include <linux/mtd/flashchip.h>
 #include <linux/mtd/samsung_onenand.h>
+#include <linux/printk.h>
 
 #include <asm/io.h>
 #include <linux/errno.h>
diff --git a/drivers/mtd/spi/spi-nor-core.c b/drivers/mtd/spi/spi-nor-core.c
index f8a292a5e19b..4ac2b09f4dd3 100644
--- a/drivers/mtd/spi/spi-nor-core.c
+++ b/drivers/mtd/spi/spi-nor-core.c
@@ -19,6 +19,7 @@
 #include <linux/errno.h>
 #include <linux/log2.h>
 #include <linux/math64.h>
+#include <linux/printk.h>
 #include <linux/sizes.h>
 
 #include <linux/mtd/mtd.h>
diff --git a/drivers/mtd/spi/spi-nor-tiny.c b/drivers/mtd/spi/spi-nor-tiny.c
index fa26ea33c8ba..0fd986bf9bf3 100644
--- a/drivers/mtd/spi/spi-nor-tiny.c
+++ b/drivers/mtd/spi/spi-nor-tiny.c
@@ -16,6 +16,7 @@
 #include <linux/errno.h>
 #include <linux/log2.h>
 #include <linux/math64.h>
+#include <linux/printk.h>
 #include <linux/sizes.h>
 
 #include <linux/mtd/mtd.h>
diff --git a/drivers/mtd/ubi/attach.c b/drivers/mtd/ubi/attach.c
index e488caa5547b..2ef8fde3d324 100644
--- a/drivers/mtd/ubi/attach.c
+++ b/drivers/mtd/ubi/attach.c
@@ -81,6 +81,7 @@
 #include <div64.h>
 #include <linux/bug.h>
 #include <linux/err.h>
+#include <linux/printk.h>
 #endif
 
 #include <linux/math64.h>
diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c
index 61e38ba1ab77..f4e72ae7e561 100644
--- a/drivers/mtd/ubi/build.c
+++ b/drivers/mtd/ubi/build.c
@@ -33,6 +33,7 @@
 #else
 #include <linux/bug.h>
 #include <linux/log2.h>
+#include <linux/printk.h>
 #endif
 #include <linux/err.h>
 #include <ubi_uboot.h>
diff --git a/drivers/mtd/ubi/debug.c b/drivers/mtd/ubi/debug.c
index d2b7ca5e33fd..b119cb6e9c05 100644
--- a/drivers/mtd/ubi/debug.c
+++ b/drivers/mtd/ubi/debug.c
@@ -8,6 +8,7 @@
 #include <hexdump.h>
 #include <malloc.h>
 #include <ubi_uboot.h>
+#include <linux/printk.h>
 #include "ubi.h"
 #ifndef __UBOOT__
 #include <linux/debugfs.h>
diff --git a/drivers/mtd/ubi/debug.h b/drivers/mtd/ubi/debug.h
index 2c2faaf1b4dc..c27d0ead4276 100644
--- a/drivers/mtd/ubi/debug.h
+++ b/drivers/mtd/ubi/debug.h
@@ -17,6 +17,7 @@ void ubi_dump_vid_hdr(const struct ubi_vid_hdr *vid_hdr);
 #endif
 
 #include <hexdump.h>
+#include <linux/printk.h>
 
 #ifndef __UBOOT__
 #define ubi_assert(expr)  do {                                               \
diff --git a/drivers/mtd/ubi/ubi.h b/drivers/mtd/ubi/ubi.h
index f44960186bbd..175988899c39 100644
--- a/drivers/mtd/ubi/ubi.h
+++ b/drivers/mtd/ubi/ubi.h
@@ -28,6 +28,7 @@
 #include <asm/pgtable.h>
 #else
 #include <ubi_uboot.h>
+#include <linux/printk.h>
 #endif
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/ubi.h>
diff --git a/drivers/net/bcm-sf2-eth-gmac.c b/drivers/net/bcm-sf2-eth-gmac.c
index 3caf0f33109b..cbe1e85222fa 100644
--- a/drivers/net/bcm-sf2-eth-gmac.c
+++ b/drivers/net/bcm-sf2-eth-gmac.c
@@ -6,6 +6,7 @@
 #ifdef BCM_GMAC_DEBUG
 #ifndef DEBUG
 #define DEBUG
+#include <linux/printk.h>
 #endif
 #endif
 
diff --git a/drivers/net/bcm-sf2-eth.c b/drivers/net/bcm-sf2-eth.c
index c862c141461c..040b72e6db06 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 <linux/delay.h>
+#include <linux/printk.h>
 
 #include <phy.h>
 #include <miiphy.h>
diff --git a/drivers/net/bcm6348-eth.c b/drivers/net/bcm6348-eth.c
index 9ddc0f938f23..8849195f248d 100644
--- a/drivers/net/bcm6348-eth.c
+++ b/drivers/net/bcm6348-eth.c
@@ -18,6 +18,7 @@
 #include <reset.h>
 #include <wait_bit.h>
 #include <asm/io.h>
+#include <linux/printk.h>
 
 #define ETH_RX_DESC			PKTBUFSRX
 #define ETH_MAX_MTU_SIZE		1518
diff --git a/drivers/net/bcm6368-eth.c b/drivers/net/bcm6368-eth.c
index 648fafd3e098..f626412ef00a 100644
--- a/drivers/net/bcm6368-eth.c
+++ b/drivers/net/bcm6368-eth.c
@@ -19,6 +19,7 @@
 #include <asm/io.h>
 #include <dm/device_compat.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 
 #define ETH_PORT_STR			"brcm,enetsw-port"
 
diff --git a/drivers/net/designware.c b/drivers/net/designware.c
index 1c0e8294078a..0ab1a12d762e 100644
--- a/drivers/net/designware.c
+++ b/drivers/net/designware.c
@@ -27,6 +27,7 @@
 #include <linux/err.h>
 #include <linux/kernel.h>
 #include <asm/io.h>
+#include <linux/printk.h>
 #include <power/regulator.h>
 #include "designware.h"
 
diff --git a/drivers/net/dwc_eth_qos.c b/drivers/net/dwc_eth_qos.c
index 1bbb7baeb945..cec3d7eeb7e7 100644
--- a/drivers/net/dwc_eth_qos.c
+++ b/drivers/net/dwc_eth_qos.c
@@ -51,6 +51,7 @@
 #endif
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 
 /* Core registers */
 
diff --git a/drivers/net/ep93xx_eth.c b/drivers/net/ep93xx_eth.c
index 0218349b0450..d1d881d6bd95 100644
--- a/drivers/net/ep93xx_eth.c
+++ b/drivers/net/ep93xx_eth.c
@@ -25,6 +25,7 @@
 #include <malloc.h>
 #include <miiphy.h>
 #include <linux/bug.h>
+#include <linux/printk.h>
 #include <linux/types.h>
 #include "ep93xx_eth.h"
 
diff --git a/drivers/net/fsl-mc/dpio/qbman_sys.h b/drivers/net/fsl-mc/dpio/qbman_sys.h
index 8be38e11a843..fb760b94f85b 100644
--- a/drivers/net/fsl-mc/dpio/qbman_sys.h
+++ b/drivers/net/fsl-mc/dpio/qbman_sys.h
@@ -21,6 +21,7 @@
 /* Trace the 3 different classes of read/write access to QBMan. #undef as
  * required. */
 #include <linux/bug.h>
+#include <linux/printk.h>
 #undef QBMAN_CCSR_TRACE
 #undef QBMAN_CINH_TRACE
 #undef QBMAN_CENA_TRACE
diff --git a/drivers/net/ftgmac100.c b/drivers/net/ftgmac100.c
index 5676a5b3ba93..74fea1e45fd0 100644
--- a/drivers/net/ftgmac100.c
+++ b/drivers/net/ftgmac100.c
@@ -25,6 +25,7 @@
 #include <linux/bitops.h>
 #include <linux/io.h>
 #include <linux/iopoll.h>
+#include <linux/printk.h>
 
 #include "ftgmac100.h"
 
diff --git a/drivers/net/mscc_eswitch/jr2_switch.c b/drivers/net/mscc_eswitch/jr2_switch.c
index 1c9a401de81e..97b2b081efb1 100644
--- a/drivers/net/mscc_eswitch/jr2_switch.c
+++ b/drivers/net/mscc_eswitch/jr2_switch.c
@@ -17,6 +17,7 @@
 #include <miiphy.h>
 #include <net.h>
 #include <wait_bit.h>
+#include <linux/printk.h>
 
 #include <dt-bindings/mscc/jr2_data.h>
 #include "mscc_xfer.h"
diff --git a/drivers/net/mscc_eswitch/ocelot_switch.c b/drivers/net/mscc_eswitch/ocelot_switch.c
index 2a48dc6a1905..bdadaa13c725 100644
--- a/drivers/net/mscc_eswitch/ocelot_switch.c
+++ b/drivers/net/mscc_eswitch/ocelot_switch.c
@@ -17,6 +17,7 @@
 #include <miiphy.h>
 #include <net.h>
 #include <wait_bit.h>
+#include <linux/printk.h>
 
 #include "mscc_xfer.h"
 #include "mscc_mac_table.h"
diff --git a/drivers/net/mscc_eswitch/serval_switch.c b/drivers/net/mscc_eswitch/serval_switch.c
index d8ee1a76989a..bbced95f7e47 100644
--- a/drivers/net/mscc_eswitch/serval_switch.c
+++ b/drivers/net/mscc_eswitch/serval_switch.c
@@ -17,6 +17,7 @@
 #include <miiphy.h>
 #include <net.h>
 #include <wait_bit.h>
+#include <linux/printk.h>
 
 #include "mscc_xfer.h"
 #include "mscc_mac_table.h"
diff --git a/drivers/net/mscc_eswitch/servalt_switch.c b/drivers/net/mscc_eswitch/servalt_switch.c
index 1cf2273142b7..c8aaf7d4897c 100644
--- a/drivers/net/mscc_eswitch/servalt_switch.c
+++ b/drivers/net/mscc_eswitch/servalt_switch.c
@@ -16,6 +16,7 @@
 #include <miiphy.h>
 #include <net.h>
 #include <wait_bit.h>
+#include <linux/printk.h>
 
 #include "mscc_xfer.h"
 #include "mscc_miim.h"
diff --git a/drivers/net/mt7628-eth.c b/drivers/net/mt7628-eth.c
index 64f1c8c828d7..8b278c62ba75 100644
--- a/drivers/net/mt7628-eth.c
+++ b/drivers/net/mt7628-eth.c
@@ -28,6 +28,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/printk.h>
 
 /* Ethernet frame engine register */
 #define PDMA_RELATED		0x0800
diff --git a/drivers/net/mtk_eth.c b/drivers/net/mtk_eth.c
index 5183c08e14cd..24a18ce96876 100644
--- a/drivers/net/mtk_eth.c
+++ b/drivers/net/mtk_eth.c
@@ -26,6 +26,7 @@
 #include <linux/ioport.h>
 #include <linux/mdio.h>
 #include <linux/mii.h>
+#include <linux/printk.h>
 
 #include "mtk_eth.h"
 
diff --git a/drivers/net/mvmdio.c b/drivers/net/mvmdio.c
index a8e93e80fc08..deaba8aee4f3 100644
--- a/drivers/net/mvmdio.c
+++ b/drivers/net/mvmdio.c
@@ -13,6 +13,7 @@
 #include <asm/io.h>
 #include <wait_bit.h>
 #include <linux/bitops.h>
+#include <linux/printk.h>
 
 #define MVMDIO_SMI_DATA_SHIFT		0
 #define MVMDIO_SMI_PHY_ADDR_SHIFT	16
diff --git a/drivers/net/phy/dp83867.c b/drivers/net/phy/dp83867.c
index eada4541c9c3..e4081244f211 100644
--- a/drivers/net/phy/dp83867.c
+++ b/drivers/net/phy/dp83867.c
@@ -10,6 +10,7 @@
 #include <linux/bitops.h>
 #include <linux/compat.h>
 #include <malloc.h>
+#include <linux/printk.h>
 
 #include <dm.h>
 #include <dt-bindings/net/ti-dp83867.h>
diff --git a/drivers/net/phy/mscc.c b/drivers/net/phy/mscc.c
index 709979f48c99..264afcd1a575 100644
--- a/drivers/net/phy/mscc.c
+++ b/drivers/net/phy/mscc.c
@@ -15,6 +15,7 @@
 #include <time.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 
 /* Microsemi PHY ID's */
 #define PHY_ID_VSC8530                  0x00070560
diff --git a/drivers/net/rtl8169.c b/drivers/net/rtl8169.c
index 2e1304e44d16..3f6805791f46 100644
--- a/drivers/net/rtl8169.c
+++ b/drivers/net/rtl8169.c
@@ -54,6 +54,7 @@
 #include <asm/io.h>
 #include <pci.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 
 #undef DEBUG_RTL8169
 #undef DEBUG_RTL8169_TX
diff --git a/drivers/net/sni_ave.c b/drivers/net/sni_ave.c
index c11a1c443eed..6e228da2984d 100644
--- a/drivers/net/sni_ave.c
+++ b/drivers/net/sni_ave.c
@@ -23,6 +23,7 @@
 #include <linux/err.h>
 #include <linux/io.h>
 #include <linux/iopoll.h>
+#include <linux/printk.h>
 
 #define AVE_GRST_DELAY_MSEC	40
 #define AVE_MIN_XMITSIZE	60
diff --git a/drivers/net/ti/am65-cpsw-nuss.c b/drivers/net/ti/am65-cpsw-nuss.c
index 971bdcdfda99..08cd26b3c4bc 100644
--- a/drivers/net/ti/am65-cpsw-nuss.c
+++ b/drivers/net/ti/am65-cpsw-nuss.c
@@ -22,6 +22,7 @@
 #include <phy.h>
 #include <power-domain.h>
 #include <linux/bitops.h>
+#include <linux/printk.h>
 #include <linux/soc/ti/ti-udma.h>
 
 #include "cpsw_mdio.h"
diff --git a/drivers/net/ti/cpsw-common.c b/drivers/net/ti/cpsw-common.c
index 3140f2515fbf..d5428274d190 100644
--- a/drivers/net/ti/cpsw-common.c
+++ b/drivers/net/ti/cpsw-common.c
@@ -12,6 +12,7 @@
 #include <asm/io.h>
 #include <cpsw.h>
 #include <dm/device_compat.h>
+#include <linux/printk.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/net/ti/cpsw.c b/drivers/net/ti/cpsw.c
index d6fefe530688..7521deaaa977 100644
--- a/drivers/net/ti/cpsw.c
+++ b/drivers/net/ti/cpsw.c
@@ -24,6 +24,7 @@
 #include <phy.h>
 #include <asm/arch/cpu.h>
 #include <dm.h>
+#include <linux/printk.h>
 
 #include "cpsw_mdio.h"
 
diff --git a/drivers/net/ti/keystone_net.c b/drivers/net/ti/keystone_net.c
index c25902a7032a..5e44215e2238 100644
--- a/drivers/net/ti/keystone_net.c
+++ b/drivers/net/ti/keystone_net.c
@@ -10,6 +10,7 @@
 #include <console.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 
 #include <dm.h>
 #include <dm/lists.h>
diff --git a/drivers/pci/pci-uclass.c b/drivers/pci/pci-uclass.c
index 7e492b42163c..aec09bd5a545 100644
--- a/drivers/pci/pci-uclass.c
+++ b/drivers/pci/pci-uclass.c
@@ -19,6 +19,7 @@
 #include <asm/fsp/fsp_support.h>
 #endif
 #include <linux/delay.h>
+#include <linux/printk.h>
 #include "pci_internal.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/pci/pci_mvebu.c b/drivers/pci/pci_mvebu.c
index 167fe026e8b9..95ed17303585 100644
--- a/drivers/pci/pci_mvebu.c
+++ b/drivers/pci/pci_mvebu.c
@@ -25,6 +25,7 @@
 #include <linux/errno.h>
 #include <linux/ioport.h>
 #include <linux/mbus.h>
+#include <linux/printk.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/pci/pci_tegra.c b/drivers/pci/pci_tegra.c
index 82f5c59d9173..d15fabd92260 100644
--- a/drivers/pci/pci_tegra.c
+++ b/drivers/pci/pci_tegra.c
@@ -22,6 +22,7 @@
 #include <power-domain.h>
 #include <reset.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 
 #include <asm/io.h>
 #include <asm/gpio.h>
diff --git a/drivers/pci/pcie_ecam_generic.c b/drivers/pci/pcie_ecam_generic.c
index 354a1454a9f0..6e18d5ba5527 100644
--- a/drivers/pci/pcie_ecam_generic.c
+++ b/drivers/pci/pcie_ecam_generic.c
@@ -11,6 +11,7 @@
 #include <dm.h>
 #include <pci.h>
 #include <asm/global_data.h>
+#include <linux/printk.h>
 
 #include <asm/io.h>
 
diff --git a/drivers/pci/pcie_fsl.c b/drivers/pci/pcie_fsl.c
index e431ef211edd..3ba7d5b7a013 100644
--- a/drivers/pci/pcie_fsl.c
+++ b/drivers/pci/pcie_fsl.c
@@ -16,6 +16,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 #include "pcie_fsl.h"
 #include <dm/device_compat.h>
 
diff --git a/drivers/pci/pcie_mediatek.c b/drivers/pci/pcie_mediatek.c
index 6e6375cec095..a94ab8310c6f 100644
--- a/drivers/pci/pcie_mediatek.c
+++ b/drivers/pci/pcie_mediatek.c
@@ -20,6 +20,7 @@
 #include <linux/bitops.h>
 #include <linux/iopoll.h>
 #include <linux/list.h>
+#include <linux/printk.h>
 
 /* PCIe shared registers */
 #define PCIE_SYS_CFG		0x00
diff --git a/drivers/pci/pcie_phytium.c b/drivers/pci/pcie_phytium.c
index 35ca104300bf..926e7b33a867 100644
--- a/drivers/pci/pcie_phytium.c
+++ b/drivers/pci/pcie_phytium.c
@@ -12,6 +12,7 @@
 #include <pci.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <linux/printk.h>
 
 /**
  * struct phytium_pcie - phytium PCIe controller state
diff --git a/drivers/pci/pcie_xilinx.c b/drivers/pci/pcie_xilinx.c
index 88660a9957a9..600c69e20cfb 100644
--- a/drivers/pci/pcie_xilinx.c
+++ b/drivers/pci/pcie_xilinx.c
@@ -10,6 +10,7 @@
 #include <pci.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
+#include <linux/printk.h>
 
 #include <asm/io.h>
 
diff --git a/drivers/phy/keystone-usb-phy.c b/drivers/phy/keystone-usb-phy.c
index 9faf50100339..27e1d35fc127 100644
--- a/drivers/phy/keystone-usb-phy.c
+++ b/drivers/phy/keystone-usb-phy.c
@@ -13,6 +13,7 @@
 #include <asm/arch/psc_defs.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 
 /* USB PHY control register offsets */
 #define USB_PHY_CTL_UTMI		0x0000
diff --git a/drivers/phy/marvell/comphy_cp110.c b/drivers/phy/marvell/comphy_cp110.c
index 484b28745e06..35da55c4fee1 100644
--- a/drivers/phy/marvell/comphy_cp110.c
+++ b/drivers/phy/marvell/comphy_cp110.c
@@ -11,6 +11,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 
 #include "comphy_core.h"
 #include "comphy_hpipe.h"
diff --git a/drivers/phy/meson-g12a-usb2.c b/drivers/phy/meson-g12a-usb2.c
index a1e621975867..734c79b78aa1 100644
--- a/drivers/phy/meson-g12a-usb2.c
+++ b/drivers/phy/meson-g12a-usb2.c
@@ -17,6 +17,7 @@
 #include <generic-phy.h>
 #include <regmap.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 #include <power/regulator.h>
 #include <reset.h>
 #include <clk.h>
diff --git a/drivers/phy/meson-g12a-usb3-pcie.c b/drivers/phy/meson-g12a-usb3-pcie.c
index 4e9696fd5908..dc5dd62381f9 100644
--- a/drivers/phy/meson-g12a-usb3-pcie.c
+++ b/drivers/phy/meson-g12a-usb3-pcie.c
@@ -18,6 +18,7 @@
 #include <bitfield.h>
 #include <generic-phy.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 
 #include <linux/bitops.h>
 #include <linux/compat.h>
diff --git a/drivers/phy/meson-gxbb-usb2.c b/drivers/phy/meson-gxbb-usb2.c
index d1beebee43e8..6ae06364a57c 100644
--- a/drivers/phy/meson-gxbb-usb2.c
+++ b/drivers/phy/meson-gxbb-usb2.c
@@ -12,6 +12,7 @@
 #include <clk.h>
 #include <dm.h>
 #include <generic-phy.h>
+#include <linux/printk.h>
 #include <power/regulator.h>
 #include <regmap.h>
 #include <reset.h>
diff --git a/drivers/phy/meson-gxl-usb2.c b/drivers/phy/meson-gxl-usb2.c
index 2267bd08c2c7..4bddd0eed9e2 100644
--- a/drivers/phy/meson-gxl-usb2.c
+++ b/drivers/phy/meson-gxl-usb2.c
@@ -16,6 +16,7 @@
 #include <generic-phy.h>
 #include <regmap.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 #include <power/regulator.h>
 #include <clk.h>
 #include <linux/usb/otg.h>
diff --git a/drivers/phy/meson-gxl-usb3.c b/drivers/phy/meson-gxl-usb3.c
index 9de55bb5df0c..875fe6b44a6f 100644
--- a/drivers/phy/meson-gxl-usb3.c
+++ b/drivers/phy/meson-gxl-usb3.c
@@ -16,6 +16,7 @@
 #include <generic-phy.h>
 #include <regmap.h>
 #include <clk.h>
+#include <linux/printk.h>
 #include <linux/usb/otg.h>
 
 #include <asm/arch/usb-gx.h>
diff --git a/drivers/phy/phy-rcar-gen3.c b/drivers/phy/phy-rcar-gen3.c
index ce39cd8f9e25..4afdb791505a 100644
--- a/drivers/phy/phy-rcar-gen3.c
+++ b/drivers/phy/phy-rcar-gen3.c
@@ -17,6 +17,7 @@
 #include <usb.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
+#include <linux/printk.h>
 #include <power/regulator.h>
 
 /* USB2.0 Host registers (original offset is +0x200) */
diff --git a/drivers/phy/phy-stm32-usbphyc.c b/drivers/phy/phy-stm32-usbphyc.c
index c6d304860256..d61a33422bc9 100644
--- a/drivers/phy/phy-stm32-usbphyc.c
+++ b/drivers/phy/phy-stm32-usbphyc.c
@@ -17,6 +17,7 @@
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 #include <power/regulator.h>
 
 /* USBPHYC registers */
diff --git a/drivers/phy/phy-uclass.c b/drivers/phy/phy-uclass.c
index db7f39cd0b45..af5c2c6497aa 100644
--- a/drivers/phy/phy-uclass.c
+++ b/drivers/phy/phy-uclass.c
@@ -9,6 +9,7 @@
 #include <dm/devres.h>
 #include <generic-phy.h>
 #include <log.h>
+#include <linux/printk.h>
 
 static inline struct phy_ops *phy_dev_ops(struct udevice *dev)
 {
diff --git a/drivers/phy/sti_usb_phy.c b/drivers/phy/sti_usb_phy.c
index c6b1dc297abc..cfc24e76b249 100644
--- a/drivers/phy/sti_usb_phy.c
+++ b/drivers/phy/sti_usb_phy.c
@@ -18,6 +18,7 @@
 #include <reset-uclass.h>
 #include <syscon.h>
 #include <wait_bit.h>
+#include <linux/printk.h>
 
 #include <linux/bitops.h>
 #include <linux/compat.h>
diff --git a/drivers/phy/ti-pipe3-phy.c b/drivers/phy/ti-pipe3-phy.c
index 41cee0eb740d..5953d118baec 100644
--- a/drivers/phy/ti-pipe3-phy.c
+++ b/drivers/phy/ti-pipe3-phy.c
@@ -16,6 +16,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/printk.h>
 
 /* PLLCTRL Registers */
 #define PLL_STATUS              0x00000004
diff --git a/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c b/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c
index 1f61a84c29dc..b64ad9a21c6e 100644
--- a/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c
+++ b/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c
@@ -35,6 +35,7 @@
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/libfdt.h>
+#include <linux/printk.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/pinctrl/pinctrl-sti.c b/drivers/pinctrl/pinctrl-sti.c
index 7d6bdc1d2bd1..09414f6627f3 100644
--- a/drivers/pinctrl/pinctrl-sti.c
+++ b/drivers/pinctrl/pinctrl-sti.c
@@ -17,6 +17,7 @@
 #include <dm/pinctrl.h>
 #include <linux/bug.h>
 #include <linux/libfdt.h>
+#include <linux/printk.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/pinctrl/pinctrl_stm32.c b/drivers/pinctrl/pinctrl_stm32.c
index fedab6605e9e..98232fad3984 100644
--- a/drivers/pinctrl/pinctrl_stm32.c
+++ b/drivers/pinctrl/pinctrl_stm32.c
@@ -13,6 +13,7 @@
 #include <linux/bitops.h>
 #include <linux/err.h>
 #include <linux/libfdt.h>
+#include <linux/printk.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/power/palmas.c b/drivers/power/palmas.c
index 2584bea38d09..d2083a51ac96 100644
--- a/drivers/power/palmas.c
+++ b/drivers/power/palmas.c
@@ -5,6 +5,7 @@
  */
 #include <config.h>
 #include <palmas.h>
+#include <linux/printk.h>
 
 void palmas_init_settings(void)
 {
diff --git a/drivers/power/pmic/as3722.c b/drivers/power/pmic/as3722.c
index 3aa3cce945e7..c7dd9705d189 100644
--- a/drivers/power/pmic/as3722.c
+++ b/drivers/power/pmic/as3722.c
@@ -12,6 +12,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <dm/lists.h>
+#include <linux/printk.h>
 #include <power/as3722.h>
 #include <power/pmic.h>
 
diff --git a/drivers/power/pmic/as3722_gpio.c b/drivers/power/pmic/as3722_gpio.c
index 96943bc1ad5d..987fbdf9bc08 100644
--- a/drivers/power/pmic/as3722_gpio.c
+++ b/drivers/power/pmic/as3722_gpio.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <dm.h>
 #include <asm/gpio.h>
+#include <linux/printk.h>
 #include <power/as3722.h>
 #include <power/pmic.h>
 
diff --git a/drivers/power/pmic/bd71837.c b/drivers/power/pmic/bd71837.c
index cb9238972f27..da9aa541979e 100644
--- a/drivers/power/pmic/bd71837.c
+++ b/drivers/power/pmic/bd71837.c
@@ -9,6 +9,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <asm/global_data.h>
+#include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/bd71837.h>
diff --git a/drivers/power/pmic/da9063.c b/drivers/power/pmic/da9063.c
index 25101d18f74b..ca95b82e6d01 100644
--- a/drivers/power/pmic/da9063.c
+++ b/drivers/power/pmic/da9063.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <log.h>
+#include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/da9063_pmic.h>
diff --git a/drivers/power/pmic/fan53555.c b/drivers/power/pmic/fan53555.c
index 4d1e686d274a..c9b15d5b68f5 100644
--- a/drivers/power/pmic/fan53555.c
+++ b/drivers/power/pmic/fan53555.c
@@ -10,6 +10,7 @@
 #include <dm/device_compat.h>
 #include <dm/lists.h>
 #include <i2c.h>
+#include <linux/printk.h>
 #include <power/fan53555.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/pmic/i2c_pmic_emul.c b/drivers/power/pmic/i2c_pmic_emul.c
index 404fe008fe6b..83d3c292044d 100644
--- a/drivers/power/pmic/i2c_pmic_emul.c
+++ b/drivers/power/pmic/i2c_pmic_emul.c
@@ -10,6 +10,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <malloc.h>
+#include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/sandbox_pmic.h>
 
diff --git a/drivers/power/pmic/lp873x.c b/drivers/power/pmic/lp873x.c
index 2b1260ec6b1f..fda5bc151642 100644
--- a/drivers/power/pmic/lp873x.c
+++ b/drivers/power/pmic/lp873x.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <log.h>
+#include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/lp873x.h>
diff --git a/drivers/power/pmic/lp87565.c b/drivers/power/pmic/lp87565.c
index f4a4bd03d704..904e02c4d818 100644
--- a/drivers/power/pmic/lp87565.c
+++ b/drivers/power/pmic/lp87565.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <log.h>
+#include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/lp87565.h>
diff --git a/drivers/power/pmic/max77686.c b/drivers/power/pmic/max77686.c
index 9f02c0b6f6fb..7e6f7d1966f1 100644
--- a/drivers/power/pmic/max77686.c
+++ b/drivers/power/pmic/max77686.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <log.h>
+#include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/max77686_pmic.h>
diff --git a/drivers/power/pmic/max8997.c b/drivers/power/pmic/max8997.c
index dbae155fb342..504a63bf7431 100644
--- a/drivers/power/pmic/max8997.c
+++ b/drivers/power/pmic/max8997.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <i2c.h>
+#include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/max8997_pmic.h>
 #include <errno.h>
diff --git a/drivers/power/pmic/max8998.c b/drivers/power/pmic/max8998.c
index f58d9f2d74c1..d155474447f5 100644
--- a/drivers/power/pmic/max8998.c
+++ b/drivers/power/pmic/max8998.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <i2c.h>
+#include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/max8998_pmic.h>
 
diff --git a/drivers/power/pmic/palmas.c b/drivers/power/pmic/palmas.c
index 6080cbff0bee..eb83c88d5641 100644
--- a/drivers/power/pmic/palmas.c
+++ b/drivers/power/pmic/palmas.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <log.h>
+#include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/palmas.h>
diff --git a/drivers/power/pmic/pca9450.c b/drivers/power/pmic/pca9450.c
index 786baa5e2597..b61dac193f2d 100644
--- a/drivers/power/pmic/pca9450.c
+++ b/drivers/power/pmic/pca9450.c
@@ -10,6 +10,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <asm/global_data.h>
+#include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/pca9450.h>
diff --git a/drivers/power/pmic/pfuze100.c b/drivers/power/pmic/pfuze100.c
index 65c4456977cc..15420acb4725 100644
--- a/drivers/power/pmic/pfuze100.c
+++ b/drivers/power/pmic/pfuze100.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <log.h>
+#include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/pfuze100_pmic.h>
diff --git a/drivers/power/pmic/pmic_tps65910_dm.c b/drivers/power/pmic/pmic_tps65910_dm.c
index e03ddc98d730..8ead1db802a2 100644
--- a/drivers/power/pmic/pmic_tps65910_dm.c
+++ b/drivers/power/pmic/pmic_tps65910_dm.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <log.h>
+#include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/tps65910_pmic.h>
diff --git a/drivers/power/pmic/s2mps11.c b/drivers/power/pmic/s2mps11.c
index 1ba1640a8df3..5ff4f2052113 100644
--- a/drivers/power/pmic/s2mps11.c
+++ b/drivers/power/pmic/s2mps11.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <log.h>
+#include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/s2mps11.h>
 
diff --git a/drivers/power/pmic/s5m8767.c b/drivers/power/pmic/s5m8767.c
index db6d0357ee4c..eea072ae824f 100644
--- a/drivers/power/pmic/s5m8767.c
+++ b/drivers/power/pmic/s5m8767.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <log.h>
+#include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/s5m8767.h>
diff --git a/drivers/power/pmic/sandbox.c b/drivers/power/pmic/sandbox.c
index d7870915de8c..398b72341bd1 100644
--- a/drivers/power/pmic/sandbox.c
+++ b/drivers/power/pmic/sandbox.c
@@ -9,6 +9,7 @@
 #include <errno.h>
 #include <dm.h>
 #include <i2c.h>
+#include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/sandbox_pmic.h>
diff --git a/drivers/power/pmic/tps65090.c b/drivers/power/pmic/tps65090.c
index b81df0dff1a5..2a04d5948a5e 100644
--- a/drivers/power/pmic/tps65090.c
+++ b/drivers/power/pmic/tps65090.c
@@ -10,6 +10,7 @@
 #include <fdtdec.h>
 #include <i2c.h>
 #include <log.h>
+#include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/tps65090.h>
 
diff --git a/drivers/power/pmic/tps65941.c b/drivers/power/pmic/tps65941.c
index 3dfc1918d5b2..e464d2984e47 100644
--- a/drivers/power/pmic/tps65941.c
+++ b/drivers/power/pmic/tps65941.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <log.h>
+#include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/tps65941.h>
diff --git a/drivers/power/regulator/bd71837.c b/drivers/power/regulator/bd71837.c
index 931d753e3445..3499bd2c56b2 100644
--- a/drivers/power/regulator/bd71837.c
+++ b/drivers/power/regulator/bd71837.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <log.h>
 #include <linux/bitops.h>
+#include <linux/printk.h>
 #include <power/bd71837.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/regulator/fan53555.c b/drivers/power/regulator/fan53555.c
index b407f555fe3d..a7fa01f787b1 100644
--- a/drivers/power/regulator/fan53555.c
+++ b/drivers/power/regulator/fan53555.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <asm/gpio.h>
 #include <linux/bitops.h>
+#include <linux/printk.h>
 #include <power/fan53555.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/regulator/fixed.c b/drivers/power/regulator/fixed.c
index 2fa6c7e6b290..56d84a90e5ec 100644
--- a/drivers/power/regulator/fixed.c
+++ b/drivers/power/regulator/fixed.c
@@ -9,8 +9,10 @@
 #include <errno.h>
 #include <dm.h>
 #include <log.h>
+#include <asm/gpio.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
+#include "regulator_common.h"
 
 #include "regulator_common.h"
 
diff --git a/drivers/power/regulator/gpio-regulator.c b/drivers/power/regulator/gpio-regulator.c
index 947f812d099f..587df32c408b 100644
--- a/drivers/power/regulator/gpio-regulator.c
+++ b/drivers/power/regulator/gpio-regulator.c
@@ -11,8 +11,10 @@
 #include <i2c.h>
 #include <log.h>
 #include <asm/gpio.h>
+#include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
+#include "regulator_common.h"
 
 #include "regulator_common.h"
 
diff --git a/drivers/power/regulator/max77686.c b/drivers/power/regulator/max77686.c
index 752dc88c401e..4d3ac980fc87 100644
--- a/drivers/power/regulator/max77686.c
+++ b/drivers/power/regulator/max77686.c
@@ -11,6 +11,7 @@
 #include <errno.h>
 #include <dm.h>
 #include <i2c.h>
+#include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/max77686_pmic.h>
diff --git a/drivers/power/regulator/pbias_regulator.c b/drivers/power/regulator/pbias_regulator.c
index 28a9a1470b11..0bc8562b317c 100644
--- a/drivers/power/regulator/pbias_regulator.c
+++ b/drivers/power/regulator/pbias_regulator.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <regmap.h>
diff --git a/drivers/power/regulator/regulator_common.c b/drivers/power/regulator/regulator_common.c
index 13906b9c6e2d..46497e0fde28 100644
--- a/drivers/power/regulator/regulator_common.c
+++ b/drivers/power/regulator/regulator_common.c
@@ -7,8 +7,10 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <asm/gpio.h>
 #include <linux/delay.h>
 #include <power/regulator.h>
+#include "regulator_common.h"
 
 #include "regulator_common.h"
 
diff --git a/drivers/power/regulator/regulator_common.h b/drivers/power/regulator/regulator_common.h
index bf80439c7869..946401f5e24e 100644
--- a/drivers/power/regulator/regulator_common.h
+++ b/drivers/power/regulator/regulator_common.h
@@ -7,8 +7,6 @@
 #ifndef _REGULATOR_COMMON_H
 #define _REGULATOR_COMMON_H
 
-#include <asm/gpio.h>
-
 struct regulator_common_platdata {
 	struct gpio_desc gpio; /* GPIO for regulator enable control */
 	unsigned int startup_delay_us;
diff --git a/drivers/power/regulator/s2mps11_regulator.c b/drivers/power/regulator/s2mps11_regulator.c
index a6b4f158ef76..295e1d2c62a6 100644
--- a/drivers/power/regulator/s2mps11_regulator.c
+++ b/drivers/power/regulator/s2mps11_regulator.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/s2mps11.h>
diff --git a/drivers/power/regulator/sandbox.c b/drivers/power/regulator/sandbox.c
index 9893a6b5f3db..18596770b370 100644
--- a/drivers/power/regulator/sandbox.c
+++ b/drivers/power/regulator/sandbox.c
@@ -9,6 +9,7 @@
 #include <errno.h>
 #include <dm.h>
 #include <i2c.h>
+#include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/sandbox_pmic.h>
diff --git a/drivers/power/regulator/tps65910_regulator.c b/drivers/power/regulator/tps65910_regulator.c
index 171afd34a5f1..2c0dd0604b32 100644
--- a/drivers/power/regulator/tps65910_regulator.c
+++ b/drivers/power/regulator/tps65910_regulator.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/tps65910_pmic.h>
diff --git a/drivers/power/twl4030.c b/drivers/power/twl4030.c
index b0d5cba2c49a..34e7fa3d7206 100644
--- a/drivers/power/twl4030.c
+++ b/drivers/power/twl4030.c
@@ -25,6 +25,7 @@
 #include <command.h>
 #include <twl4030.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 
 /*
  * Power Reset
diff --git a/drivers/power/twl6030.c b/drivers/power/twl6030.c
index 60a5aaaf19fa..2c5e4960e54c 100644
--- a/drivers/power/twl6030.c
+++ b/drivers/power/twl6030.c
@@ -5,6 +5,7 @@
  */
 #include <config.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 
 #include <twl6030.h>
 
diff --git a/drivers/ram/imxrt_sdram.c b/drivers/ram/imxrt_sdram.c
index 765a2141d130..8be15340b94c 100644
--- a/drivers/ram/imxrt_sdram.c
+++ b/drivers/ram/imxrt_sdram.c
@@ -14,6 +14,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/printk.h>
 
 /* SDRAM Command Code */
 #define SD_CC_ARD		0x0     /* Master Bus (AXI) command - Read */
diff --git a/drivers/ram/rockchip/dmc-rk3368.c b/drivers/ram/rockchip/dmc-rk3368.c
index 4fa632152fda..41773893fd7c 100644
--- a/drivers/ram/rockchip/dmc-rk3368.c
+++ b/drivers/ram/rockchip/dmc-rk3368.c
@@ -23,6 +23,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/printk.h>
 
 struct dram_info {
 	struct ram_info info;
diff --git a/drivers/ram/stm32_sdram.c b/drivers/ram/stm32_sdram.c
index 3fddf4df9615..de5a9bc05697 100644
--- a/drivers/ram/stm32_sdram.c
+++ b/drivers/ram/stm32_sdram.c
@@ -14,6 +14,7 @@
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 
 #define MEM_MODE_MASK	GENMASK(2, 0)
 #define SWP_FMC_OFFSET 10
diff --git a/drivers/ram/stm32mp1/stm32mp1_ddr.c b/drivers/ram/stm32mp1/stm32mp1_ddr.c
index bf3a4c97a411..8b59903e6bf9 100644
--- a/drivers/ram/stm32mp1/stm32mp1_ddr.c
+++ b/drivers/ram/stm32mp1/stm32mp1_ddr.c
@@ -14,6 +14,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/iopoll.h>
+#include <linux/printk.h>
 #include "stm32mp1_ddr.h"
 #include "stm32mp1_ddr_regs.h"
 
diff --git a/drivers/ram/stm32mp1/stm32mp1_ram.c b/drivers/ram/stm32mp1/stm32mp1_ram.c
index 9022679703b4..63333a1b1b69 100644
--- a/drivers/ram/stm32mp1/stm32mp1_ram.c
+++ b/drivers/ram/stm32mp1/stm32mp1_ram.c
@@ -12,6 +12,7 @@
 #include <regmap.h>
 #include <syscon.h>
 #include <asm/io.h>
+#include <linux/printk.h>
 #include "stm32mp1_ddr.h"
 
 static const char *const clkname[] = {
diff --git a/drivers/ram/stm32mp1/stm32mp1_tuning.c b/drivers/ram/stm32mp1/stm32mp1_tuning.c
index a8d6892bb095..2fc8e32847c2 100644
--- a/drivers/ram/stm32mp1/stm32mp1_tuning.c
+++ b/drivers/ram/stm32mp1/stm32mp1_tuning.c
@@ -13,6 +13,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/iopoll.h>
+#include <linux/printk.h>
 
 #include "stm32mp1_ddr_regs.h"
 #include "stm32mp1_ddr.h"
diff --git a/drivers/remoteproc/rproc-elf-loader.c b/drivers/remoteproc/rproc-elf-loader.c
index c464ecebb77e..1e309c0f4f90 100644
--- a/drivers/remoteproc/rproc-elf-loader.c
+++ b/drivers/remoteproc/rproc-elf-loader.c
@@ -11,6 +11,7 @@
 #include <asm/cache.h>
 #include <dm/device_compat.h>
 #include <linux/compat.h>
+#include <linux/printk.h>
 
 /**
  * struct resource_table - firmware resource table header
diff --git a/drivers/remoteproc/rproc-uclass.c b/drivers/remoteproc/rproc-uclass.c
index 22779d0cb0d3..0c2b601c4721 100644
--- a/drivers/remoteproc/rproc-uclass.c
+++ b/drivers/remoteproc/rproc-uclass.c
@@ -16,6 +16,7 @@
 #include <dm.h>
 #include <dm/uclass.h>
 #include <dm/uclass-internal.h>
+#include <linux/printk.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/remoteproc/sandbox_testproc.c b/drivers/remoteproc/sandbox_testproc.c
index 2b58b27947c0..4317af78d29f 100644
--- a/drivers/remoteproc/sandbox_testproc.c
+++ b/drivers/remoteproc/sandbox_testproc.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <remoteproc.h>
 #include <asm/io.h>
+#include <linux/printk.h>
 
 /**
  * enum sandbox_state - different device states
diff --git a/drivers/remoteproc/stm32_copro.c b/drivers/remoteproc/stm32_copro.c
index 33b574b1bd3d..e09d2b9a6460 100644
--- a/drivers/remoteproc/stm32_copro.c
+++ b/drivers/remoteproc/stm32_copro.c
@@ -15,6 +15,7 @@
 #include <asm/io.h>
 #include <dm/device_compat.h>
 #include <linux/err.h>
+#include <linux/printk.h>
 
 #define RCC_GCR_HOLD_BOOT	0
 #define RCC_GCR_RELEASE_BOOT	1
diff --git a/drivers/remoteproc/ti_power_proc.c b/drivers/remoteproc/ti_power_proc.c
index 1a5dddbe0d21..86fa6457ede7 100644
--- a/drivers/remoteproc/ti_power_proc.c
+++ b/drivers/remoteproc/ti_power_proc.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <remoteproc.h>
 #include <asm/global_data.h>
+#include <linux/printk.h>
 #include <mach/psc_defs.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/remoteproc/ti_sci_proc.h b/drivers/remoteproc/ti_sci_proc.h
index f8299d1aff92..36351da63fcc 100644
--- a/drivers/remoteproc/ti_sci_proc.h
+++ b/drivers/remoteproc/ti_sci_proc.h
@@ -10,6 +10,7 @@
 #ifndef REMOTEPROC_TI_SCI_PROC_H
 #define REMOTEPROC_TI_SCI_PROC_H
 
+#include <linux/printk.h>
 #define TISCI_INVALID_HOST 0xff
 
 /**
diff --git a/drivers/reset/sti-reset.c b/drivers/reset/sti-reset.c
index 2fdc069ce16e..12000d05cc89 100644
--- a/drivers/reset/sti-reset.c
+++ b/drivers/reset/sti-reset.c
@@ -16,6 +16,7 @@
 #include <asm/global_data.h>
 #include <dt-bindings/reset/stih407-resets.h>
 #include <linux/bitops.h>
+#include <linux/printk.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/serial/serial_mtk.c b/drivers/serial/serial_mtk.c
index 9715f372ecfe..0d2a9dc7e3ee 100644
--- a/drivers/serial/serial_mtk.c
+++ b/drivers/serial/serial_mtk.c
@@ -18,6 +18,7 @@
 #include <asm/io.h>
 #include <asm/types.h>
 #include <linux/err.h>
+#include <linux/printk.h>
 
 struct mtk_serial_regs {
 	u32 rbr;
diff --git a/drivers/soc/ti/k3-navss-ringacc.c b/drivers/soc/ti/k3-navss-ringacc.c
index c48e9befe4b9..fb04da2717d5 100644
--- a/drivers/soc/ti/k3-navss-ringacc.c
+++ b/drivers/soc/ti/k3-navss-ringacc.c
@@ -21,6 +21,7 @@
 #include <linux/compat.h>
 #include <linux/dma-mapping.h>
 #include <linux/err.h>
+#include <linux/printk.h>
 #include <linux/soc/ti/k3-navss-ringacc.h>
 #include <linux/soc/ti/ti_sci_protocol.h>
 
diff --git a/drivers/spi/atmel_spi.c b/drivers/spi/atmel_spi.c
index c65733c87ac6..33bf382998e5 100644
--- a/drivers/spi/atmel_spi.c
+++ b/drivers/spi/atmel_spi.c
@@ -17,6 +17,7 @@
 #include <asm/gpio.h>
 #endif
 #include <linux/bitops.h>
+#include <linux/printk.h>
 
 /*
  * Register definitions for the Atmel AT32/AT91 SPI Controller
diff --git a/drivers/spi/fsl_dspi.c b/drivers/spi/fsl_dspi.c
index 1912d676a681..eae6b379a9c5 100644
--- a/drivers/spi/fsl_dspi.c
+++ b/drivers/spi/fsl_dspi.c
@@ -26,6 +26,7 @@
 #include <fsl_dspi.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 
 /* linux/include/time.h */
 #define NSEC_PER_SEC	1000000000L
diff --git a/drivers/spi/mt7621_spi.c b/drivers/spi/mt7621_spi.c
index 3a0738eb2b72..f13d21f5b2c5 100644
--- a/drivers/spi/mt7621_spi.c
+++ b/drivers/spi/mt7621_spi.c
@@ -16,6 +16,7 @@
 #include <wait_bit.h>
 #include <linux/bitops.h>
 #include <linux/io.h>
+#include <linux/printk.h>
 
 #define MT7621_RX_FIFO_LEN	32
 #define MT7621_TX_FIFO_LEN	36
diff --git a/drivers/spi/mxc_spi.c b/drivers/spi/mxc_spi.c
index 466355b0178e..14f68da2ee6e 100644
--- a/drivers/spi/mxc_spi.c
+++ b/drivers/spi/mxc_spi.c
@@ -18,6 +18,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/clock.h>
 #include <asm/mach-imx/spi.h>
+#include <linux/printk.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/spi/pl022_spi.c b/drivers/spi/pl022_spi.c
index 01ffaea4c346..7cf19a1a6615 100644
--- a/drivers/spi/pl022_spi.c
+++ b/drivers/spi/pl022_spi.c
@@ -16,6 +16,7 @@
 #include <dm/platform_data/spi_pl022.h>
 #include <linux/io.h>
 #include <spi.h>
+#include <linux/printk.h>
 
 #define SSP_CR0		0x000
 #define SSP_CR1		0x004
diff --git a/drivers/spi/stm32_qspi.c b/drivers/spi/stm32_qspi.c
index a53b941410dd..8e91475ef95a 100644
--- a/drivers/spi/stm32_qspi.c
+++ b/drivers/spi/stm32_qspi.c
@@ -19,6 +19,7 @@
 #include <linux/delay.h>
 #include <linux/iopoll.h>
 #include <linux/ioport.h>
+#include <linux/printk.h>
 #include <linux/sizes.h>
 
 struct stm32_qspi_regs {
diff --git a/drivers/spi/stm32_spi.c b/drivers/spi/stm32_spi.c
index 4a0833b6fa94..09711b0aabca 100644
--- a/drivers/spi/stm32_spi.c
+++ b/drivers/spi/stm32_spi.c
@@ -15,6 +15,7 @@
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 
 #include <asm/io.h>
 #include <asm/gpio.h>
diff --git a/drivers/spi/uniphier_spi.c b/drivers/spi/uniphier_spi.c
index 2753d0cd2d80..21fa7a77efb1 100644
--- a/drivers/spi/uniphier_spi.c
+++ b/drivers/spi/uniphier_spi.c
@@ -17,6 +17,7 @@
 #include <linux/io.h>
 #include <spi.h>
 #include <wait_bit.h>
+#include <linux/printk.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/sysreset/sysreset_sti.c b/drivers/sysreset/sysreset_sti.c
index 8465a62e1855..c1b22873ff43 100644
--- a/drivers/sysreset/sysreset_sti.c
+++ b/drivers/sysreset/sysreset_sti.c
@@ -12,6 +12,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
+#include <linux/printk.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/sysreset/sysreset_syscon.c b/drivers/sysreset/sysreset_syscon.c
index 1c4748661454..0dfa91fc90e6 100644
--- a/drivers/sysreset/sysreset_syscon.c
+++ b/drivers/sysreset/sysreset_syscon.c
@@ -14,6 +14,7 @@
 #include <sysreset.h>
 #include <syscon.h>
 #include <linux/err.h>
+#include <linux/printk.h>
 
 struct syscon_reboot_priv {
 	struct regmap *regmap;
diff --git a/drivers/sysreset/sysreset_watchdog.c b/drivers/sysreset/sysreset_watchdog.c
index d500d413261c..3493c5e8e452 100644
--- a/drivers/sysreset/sysreset_watchdog.c
+++ b/drivers/sysreset/sysreset_watchdog.c
@@ -8,6 +8,7 @@
 #include <errno.h>
 #include <sysreset.h>
 #include <wdt.h>
+#include <linux/printk.h>
 
 struct wdt_reboot_priv {
 	struct udevice *wdt;
diff --git a/drivers/tpm/tpm_tis_infineon.c b/drivers/tpm/tpm_tis_infineon.c
index f47813e76d09..32c3a3354206 100644
--- a/drivers/tpm/tpm_tis_infineon.c
+++ b/drivers/tpm/tpm_tis_infineon.c
@@ -28,6 +28,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/compiler.h>
+#include <linux/printk.h>
 #include <linux/types.h>
 #include <linux/unaligned/be_byteshift.h>
 
diff --git a/drivers/usb/cdns3/gadget.c b/drivers/usb/cdns3/gadget.c
index 8f81d17ec8e3..de57029cf40a 100644
--- a/drivers/usb/cdns3/gadget.c
+++ b/drivers/usb/cdns3/gadget.c
@@ -62,6 +62,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/printk.h>
 #include <linux/usb/gadget.h>
 #include <linux/compat.h>
 #include <linux/iopoll.h>
diff --git a/drivers/usb/common/common.c b/drivers/usb/common/common.c
index 400bdf72ad79..d27ab90d22d5 100644
--- a/drivers/usb/common/common.c
+++ b/drivers/usb/common/common.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <dm.h>
 #include <asm/global_data.h>
+#include <linux/printk.h>
 #include <linux/usb/otg.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/phy.h>
diff --git a/drivers/usb/dwc3/dwc3-generic.c b/drivers/usb/dwc3/dwc3-generic.c
index 551f682024c0..c78ac00521d6 100644
--- a/drivers/usb/dwc3/dwc3-generic.c
+++ b/drivers/usb/dwc3/dwc3-generic.c
@@ -17,6 +17,7 @@
 #include <dwc3-uboot.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
 #include <malloc.h>
diff --git a/drivers/usb/dwc3/dwc3-meson-g12a.c b/drivers/usb/dwc3/dwc3-meson-g12a.c
index 6567502cdd1f..6fdf686af8da 100644
--- a/drivers/usb/dwc3/dwc3-meson-g12a.c
+++ b/drivers/usb/dwc3/dwc3-meson-g12a.c
@@ -15,6 +15,7 @@
 #include <dwc3-uboot.h>
 #include <generic-phy.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
 #include <malloc.h>
diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
index 2aec874e1ded..17d04b8b71f0 100644
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@ -23,6 +23,7 @@
 #include <linux/delay.h>
 #include <linux/dma-mapping.h>
 #include <linux/list.h>
+#include <linux/printk.h>
 
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
diff --git a/drivers/usb/eth/mcs7830.c b/drivers/usb/eth/mcs7830.c
index c829a436a34c..02eef9b269d5 100644
--- a/drivers/usb/eth/mcs7830.c
+++ b/drivers/usb/eth/mcs7830.c
@@ -19,6 +19,7 @@
 #include <malloc.h>
 #include <memalign.h>
 #include <usb.h>
+#include <linux/printk.h>
 
 #include "usb_ether.h"
 
diff --git a/drivers/usb/gadget/at91_udc.c b/drivers/usb/gadget/at91_udc.c
index 1feed417d68e..e198ef1d34d6 100644
--- a/drivers/usb/gadget/at91_udc.c
+++ b/drivers/usb/gadget/at91_udc.c
@@ -21,6 +21,7 @@
 #include <asm/io.h>
 #include <asm/gpio.h>
 #include <asm/hardware.h>
+#include <linux/printk.h>
 #include <mach/at91_matrix.h>
 #include <linux/list.h>
 #include <linux/usb/ch9.h>
diff --git a/drivers/usb/gadget/atmel_usba_udc.c b/drivers/usb/gadget/atmel_usba_udc.c
index 7d51821497b4..ed3b3c14e609 100644
--- a/drivers/usb/gadget/atmel_usba_udc.c
+++ b/drivers/usb/gadget/atmel_usba_udc.c
@@ -13,6 +13,7 @@
 #include <asm/gpio.h>
 #include <asm/hardware.h>
 #include <linux/list.h>
+#include <linux/printk.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
 #include <linux/usb/atmel_usba_udc.h>
diff --git a/drivers/usb/gadget/dwc2_udc_otg.c b/drivers/usb/gadget/dwc2_udc_otg.c
index eaa5dcb9b138..f548cbc9eb29 100644
--- a/drivers/usb/gadget/dwc2_udc_otg.c
+++ b/drivers/usb/gadget/dwc2_udc_otg.c
@@ -28,6 +28,7 @@
 #include <dm/devres.h>
 #include <linux/bug.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 
 #include <linux/errno.h>
 #include <linux/list.h>
diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c
index a8e8bfc04b40..e4572ec6481c 100644
--- a/drivers/usb/gadget/ether.c
+++ b/drivers/usb/gadget/ether.c
@@ -14,6 +14,7 @@
 #include <part.h>
 #include <linux/errno.h>
 #include <linux/netdevice.h>
+#include <linux/printk.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/cdc.h>
 #include <linux/usb/gadget.h>
diff --git a/drivers/usb/gadget/f_fastboot.c b/drivers/usb/gadget/f_fastboot.c
index 384c0f6f6e27..fce933dba5f8 100644
--- a/drivers/usb/gadget/f_fastboot.c
+++ b/drivers/usb/gadget/f_fastboot.c
@@ -17,6 +17,7 @@
 #include <fastboot.h>
 #include <log.h>
 #include <malloc.h>
+#include <linux/printk.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
 #include <linux/usb/composite.h>
diff --git a/drivers/usb/gadget/f_sdp.c b/drivers/usb/gadget/f_sdp.c
index f2fe89d2a6c4..4169763c094b 100644
--- a/drivers/usb/gadget/f_sdp.c
+++ b/drivers/usb/gadget/f_sdp.c
@@ -22,6 +22,7 @@
 #include <env.h>
 #include <log.h>
 #include <malloc.h>
+#include <linux/printk.h>
 
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
diff --git a/drivers/usb/gadget/f_thor.c b/drivers/usb/gadget/f_thor.c
index 88fc87f2e907..3c47e6251b1f 100644
--- a/drivers/usb/gadget/f_thor.c
+++ b/drivers/usb/gadget/f_thor.c
@@ -24,6 +24,7 @@
 #include <memalign.h>
 #include <version.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
 #include <linux/usb/composite.h>
diff --git a/drivers/usb/gadget/udc/udc-uclass.c b/drivers/usb/gadget/udc/udc-uclass.c
index 3053ccf7d970..384aa47a98f4 100644
--- a/drivers/usb/gadget/udc/udc-uclass.c
+++ b/drivers/usb/gadget/udc/udc-uclass.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <dm/device-internal.h>
+#include <linux/printk.h>
 #include <linux/usb/gadget.h>
 
 #if CONFIG_IS_ENABLED(DM_USB_GADGET)
diff --git a/drivers/usb/host/dwc3-sti-glue.c b/drivers/usb/host/dwc3-sti-glue.c
index febbfe5d2438..95514a4c593b 100644
--- a/drivers/usb/host/dwc3-sti-glue.c
+++ b/drivers/usb/host/dwc3-sti-glue.c
@@ -17,6 +17,7 @@
 #include <reset-uclass.h>
 #include <syscon.h>
 #include <usb.h>
+#include <linux/printk.h>
 
 #include <linux/usb/dwc3.h>
 #include <linux/usb/otg.h>
diff --git a/drivers/usb/musb-new/mt85xx.c b/drivers/usb/musb-new/mt85xx.c
index c281c38a2880..110b5b610f6e 100644
--- a/drivers/usb/musb-new/mt85xx.c
+++ b/drivers/usb/musb-new/mt85xx.c
@@ -15,6 +15,7 @@
 #include <dm/lists.h>
 #include <dm/root.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 #include <linux/usb/musb.h>
 #include <usb.h>
 #include "linux-compat.h"
diff --git a/drivers/usb/musb-new/musb_core.c b/drivers/usb/musb-new/musb_core.c
index 961de99795e9..f29131c69bbd 100644
--- a/drivers/usb/musb-new/musb_core.c
+++ b/drivers/usb/musb-new/musb_core.c
@@ -84,6 +84,7 @@
 #include <linux/bitops.h>
 #include <linux/bug.h>
 #include <linux/errno.h>
+#include <linux/printk.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
 #include <linux/usb/musb.h>
diff --git a/drivers/usb/musb-new/musb_debug.h b/drivers/usb/musb-new/musb_debug.h
index c468bda9ff2f..94375b72c702 100644
--- a/drivers/usb/musb-new/musb_debug.h
+++ b/drivers/usb/musb-new/musb_debug.h
@@ -10,6 +10,7 @@
 #ifndef __MUSB_LINUX_DEBUG_H__
 #define __MUSB_LINUX_DEBUG_H__
 
+#include <linux/printk.h>
 #define yprintk(facility, format, args...) \
 	do { printk(facility "%s %d: " format , \
 	__func__, __LINE__ , ## args); } while (0)
diff --git a/drivers/usb/musb-new/musb_dsps.c b/drivers/usb/musb-new/musb_dsps.c
index eb590885bc53..4d977aba34fc 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 <asm/omap_musb.h>
+#include <linux/printk.h>
 #include "linux-compat.h"
 #endif
 
diff --git a/drivers/usb/musb-new/musb_gadget.c b/drivers/usb/musb-new/musb_gadget.c
index 8ba98d8c0e88..fb3b3e45ef08 100644
--- a/drivers/usb/musb-new/musb_gadget.c
+++ b/drivers/usb/musb-new/musb_gadget.c
@@ -24,6 +24,7 @@
 #else
 #include <common.h>
 #include <linux/bug.h>
+#include <linux/printk.h>
 #include <linux/usb/ch9.h>
 #include "linux-compat.h"
 #endif
diff --git a/drivers/usb/musb-new/musb_gadget_ep0.c b/drivers/usb/musb-new/musb_gadget_ep0.c
index 93f43ba4714b..22de98559d9c 100644
--- a/drivers/usb/musb-new/musb_gadget_ep0.c
+++ b/drivers/usb/musb-new/musb_gadget_ep0.c
@@ -19,6 +19,7 @@
 #include <linux/interrupt.h>
 #else
 #include <common.h>
+#include <linux/printk.h>
 #include "linux-compat.h"
 #include <asm/processor.h>
 #endif
diff --git a/drivers/usb/musb-new/omap2430.c b/drivers/usb/musb-new/omap2430.c
index fbd5f98f3685..c41b9147fa50 100644
--- a/drivers/usb/musb-new/omap2430.c
+++ b/drivers/usb/musb-new/omap2430.c
@@ -17,6 +17,7 @@
 #include <dm/device_compat.h>
 #include <dm/lists.h>
 #include <linux/err.h>
+#include <linux/printk.h>
 #include <linux/usb/otg.h>
 #include <asm/omap_common.h>
 #include <asm/omap_musb.h>
diff --git a/drivers/usb/musb-new/sunxi.c b/drivers/usb/musb-new/sunxi.c
index 53c336fc3f5c..9ae8a0e6b7af 100644
--- a/drivers/usb/musb-new/sunxi.c
+++ b/drivers/usb/musb-new/sunxi.c
@@ -32,6 +32,7 @@
 #include <dm/root.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 #include <linux/usb/musb.h>
 #include "linux-compat.h"
 #include "musb_core.h"
diff --git a/drivers/usb/musb-new/ti-musb.c b/drivers/usb/musb-new/ti-musb.c
index bf58f13480b5..d447baf13bba 100644
--- a/drivers/usb/musb-new/ti-musb.c
+++ b/drivers/usb/musb-new/ti-musb.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <asm/global_data.h>
+#include <linux/printk.h>
 #include <linux/usb/otg.h>
 #include <dm/device-internal.h>
 #include <dm/lists.h>
diff --git a/drivers/video/am335x-fb.c b/drivers/video/am335x-fb.c
index 2bf4d85d021c..4354c3efac11 100644
--- a/drivers/video/am335x-fb.c
+++ b/drivers/video/am335x-fb.c
@@ -25,6 +25,7 @@
 #include <asm/utils.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/printk.h>
 #include "am335x-fb.h"
 
 #define LCDC_FMAX				200000000
diff --git a/drivers/video/meson/meson_dw_hdmi.c b/drivers/video/meson/meson_dw_hdmi.c
index 7b2ff94eba58..ec550b57fdab 100644
--- a/drivers/video/meson/meson_dw_hdmi.c
+++ b/drivers/video/meson/meson_dw_hdmi.c
@@ -14,6 +14,7 @@
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
 #include <linux/bitops.h>
+#include <linux/printk.h>
 #include <power/regulator.h>
 #include <clk.h>
 #include <linux/delay.h>
diff --git a/drivers/video/meson/meson_vclk.c b/drivers/video/meson/meson_vclk.c
index cd1e69040f75..e718a0074ed6 100644
--- a/drivers/video/meson/meson_vclk.c
+++ b/drivers/video/meson/meson_vclk.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <edid.h>
 #include <linux/bitops.h>
+#include <linux/printk.h>
 #include "meson_vpu.h"
 #include <log.h>
 #include <linux/iopoll.h>
diff --git a/drivers/video/stm32/stm32_dsi.c b/drivers/video/stm32/stm32_dsi.c
index b09ecb73365b..e77a0f478a6e 100644
--- a/drivers/video/stm32/stm32_dsi.c
+++ b/drivers/video/stm32/stm32_dsi.c
@@ -26,6 +26,7 @@
 #include <dm/lists.h>
 #include <linux/bitops.h>
 #include <linux/iopoll.h>
+#include <linux/printk.h>
 #include <power/regulator.h>
 
 #define HWVER_130			0x31333000	/* IP version 1.30 */
diff --git a/drivers/video/stm32/stm32_ltdc.c b/drivers/video/stm32/stm32_ltdc.c
index ac031dc6c943..d2ac2e57c8a1 100644
--- a/drivers/video/stm32/stm32_ltdc.c
+++ b/drivers/video/stm32/stm32_ltdc.c
@@ -20,6 +20,7 @@
 #include <dm/device-internal.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
+#include <linux/printk.h>
 
 struct stm32_ltdc_priv {
 	void __iomem *regs;
diff --git a/drivers/video/tegra124/sor.c b/drivers/video/tegra124/sor.c
index 49f33c15b5c6..52ab1b529159 100644
--- a/drivers/video/tegra124/sor.c
+++ b/drivers/video/tegra124/sor.c
@@ -15,6 +15,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch-tegra/dc.h>
 #include <linux/delay.h>
+#include <linux/printk.h>
 #include "displayport.h"
 #include "sor.h"
 #include <linux/err.h>
diff --git a/drivers/watchdog/stm32mp_wdt.c b/drivers/watchdog/stm32mp_wdt.c
index f673fce327c6..89ce5588a37e 100644
--- a/drivers/watchdog/stm32mp_wdt.c
+++ b/drivers/watchdog/stm32mp_wdt.c
@@ -12,6 +12,7 @@
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/iopoll.h>
+#include <linux/printk.h>
 
 /* IWDG registers */
 #define IWDG_KR		0x00	/* Key register */
diff --git a/env/common.c b/env/common.c
index d6d1fa3a1f7d..b6a1f45271ce 100644
--- a/env/common.c
+++ b/env/common.c
@@ -15,6 +15,7 @@
 #include <log.h>
 #include <sort.h>
 #include <asm/global_data.h>
+#include <linux/printk.h>
 #include <linux/stddef.h>
 #include <search.h>
 #include <errno.h>
diff --git a/fs/ubifs/debug.c b/fs/ubifs/debug.c
index 2ff8f1a5f9b1..4a8fd88cdd79 100644
--- a/fs/ubifs/debug.c
+++ b/fs/ubifs/debug.c
@@ -18,6 +18,7 @@
 #include <hexdump.h>
 #include <log.h>
 #include <dm/devres.h>
+#include <linux/printk.h>
 
 #ifndef __UBOOT__
 #include <linux/module.h>
diff --git a/fs/ubifs/debug.h b/fs/ubifs/debug.h
index 5f6e12702de8..85f760e41a15 100644
--- a/fs/ubifs/debug.h
+++ b/fs/ubifs/debug.h
@@ -12,6 +12,7 @@
 #define __UBIFS_DEBUG_H__
 
 /* Checking helper functions */
+#include <linux/printk.h>
 typedef int (*dbg_leaf_callback)(struct ubifs_info *c,
 				 struct ubifs_zbranch *zbr, void *priv);
 typedef int (*dbg_znode_callback)(struct ubifs_info *c,
diff --git a/fs/ubifs/lpt_commit.c b/fs/ubifs/lpt_commit.c
index 897d0014306c..3ca8d704aaf3 100644
--- a/fs/ubifs/lpt_commit.c
+++ b/fs/ubifs/lpt_commit.c
@@ -23,6 +23,7 @@
 #include <linux/bitops.h>
 #include <linux/compat.h>
 #include <linux/err.h>
+#include <linux/printk.h>
 #include "crc16.h"
 #endif
 #include "ubifs.h"
diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c
index e3a4c0bca270..347f83656424 100644
--- a/fs/ubifs/super.c
+++ b/fs/ubifs/super.c
@@ -35,6 +35,7 @@
 #include <linux/bitops.h>
 #include <linux/bug.h>
 #include <linux/log2.h>
+#include <linux/printk.h>
 #include <linux/stat.h>
 #include <linux/err.h>
 #include "ubifs.h"
diff --git a/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h
index 512fdaa1444d..efa7a69cb6dd 100644
--- a/fs/ubifs/ubifs.h
+++ b/fs/ubifs/ubifs.h
@@ -35,6 +35,7 @@
 #include <asm-generic/atomic-long.h>
 #include <ubi_uboot.h>
 #include <ubifs_uboot.h>
+#include <linux/printk.h>
 
 #include <linux/ctype.h>
 #include <linux/time.h>
diff --git a/fs/yaffs2/yaffs_uboot_glue.c b/fs/yaffs2/yaffs_uboot_glue.c
index 7a15a02974d0..913eb323f382 100644
--- a/fs/yaffs2/yaffs_uboot_glue.c
+++ b/fs/yaffs2/yaffs_uboot_glue.c
@@ -22,6 +22,7 @@
 #include <common.h>
 #include <div64.h>
 #include <malloc.h>
+#include <linux/printk.h>
 
 #include <config.h>
 #include "nand.h"
diff --git a/include/common.h b/include/common.h
index 25c317f44392..a79c2bb49931 100644
--- a/include/common.h
+++ b/include/common.h
@@ -17,7 +17,6 @@
 #include <errno.h>
 #include <time.h>
 #include <linux/types.h>
-#include <linux/printk.h>
 #include <linux/string.h>
 #include <stdarg.h>
 #include <stdio.h>
diff --git a/include/crypto/pkcs7_parser.h b/include/crypto/pkcs7_parser.h
index 906033a90eb4..2c45cce52348 100644
--- a/include/crypto/pkcs7_parser.h
+++ b/include/crypto/pkcs7_parser.h
@@ -11,6 +11,7 @@
 #include <linux/oid_registry.h>
 #include <crypto/pkcs7.h>
 #include <crypto/x509_parser.h>
+#include <linux/printk.h>
 
 #define kenter(FMT, ...) \
 	pr_devel("==> %s("FMT")\n", __func__, ##__VA_ARGS__)
diff --git a/include/dm/device_compat.h b/include/dm/device_compat.h
index 3d8cd09f4c0e..8cf11fa58afe 100644
--- a/include/dm/device_compat.h
+++ b/include/dm/device_compat.h
@@ -11,6 +11,7 @@
 #define _DM_DEVICE_COMPAT_H
 
 #include <linux/compat.h>
+#include <linux/printk.h>
 
 /*
  * REVISIT:
diff --git a/include/linux/soc/ti/cppi5.h b/include/linux/soc/ti/cppi5.h
index cfdf7ea29fc3..3a55c3ec46f5 100644
--- a/include/linux/soc/ti/cppi5.h
+++ b/include/linux/soc/ti/cppi5.h
@@ -11,6 +11,7 @@
 #include <hexdump.h>
 #include <linux/bitops.h>
 #include <linux/bug.h>
+#include <linux/printk.h>
 
 /**
  * Descriptor header, present in all types of descriptors
diff --git a/lib/asn1_decoder.c b/lib/asn1_decoder.c
index bcb0390eb41c..1191fc364871 100644
--- a/lib/asn1_decoder.c
+++ b/lib/asn1_decoder.c
@@ -8,6 +8,7 @@
 #ifdef __UBOOT__
 #include <log.h>
 #include <linux/compat.h>
+#include <linux/printk.h>
 #else
 #include <linux/export.h>
 #endif
diff --git a/lib/bch.c b/lib/bch.c
index de66b1acba54..72b4fdcc9c44 100644
--- a/lib/bch.c
+++ b/lib/bch.c
@@ -61,6 +61,7 @@
 #include <dm/devres.h>
 
 #include <linux/bitops.h>
+#include <linux/printk.h>
 #else
 #include <errno.h>
 #if defined(__FreeBSD__)
diff --git a/lib/crypto/asymmetric_type.c b/lib/crypto/asymmetric_type.c
index 1d0532d0f2e0..24c2d15ef97a 100644
--- a/lib/crypto/asymmetric_type.c
+++ b/lib/crypto/asymmetric_type.c
@@ -18,6 +18,7 @@
 #include <linux/compat.h>
 #include <linux/ctype.h>
 #include <linux/err.h>
+#include <linux/printk.h>
 #include <linux/string.h>
 #else
 #include <linux/seq_file.h>
diff --git a/lib/crypto/pkcs7_parser.c b/lib/crypto/pkcs7_parser.c
index 0b85fe8286c7..d5efa828d6aa 100644
--- a/lib/crypto/pkcs7_parser.c
+++ b/lib/crypto/pkcs7_parser.c
@@ -11,6 +11,7 @@
 #include <dm/devres.h>
 #include <linux/bitops.h>
 #include <linux/compat.h>
+#include <linux/printk.h>
 #endif
 #include <linux/kernel.h>
 #ifndef __UBOOT__
diff --git a/lib/crypto/pkcs7_verify.c b/lib/crypto/pkcs7_verify.c
index 320ba49f79df..db02f346f764 100644
--- a/lib/crypto/pkcs7_verify.c
+++ b/lib/crypto/pkcs7_verify.c
@@ -15,6 +15,7 @@
 #include <linux/bitops.h>
 #include <linux/compat.h>
 #include <linux/asn1.h>
+#include <linux/printk.h>
 #include <u-boot/rsa-checksum.h>
 #include <crypto/public_key.h>
 #include <crypto/pkcs7_parser.h>
diff --git a/lib/crypto/public_key.c b/lib/crypto/public_key.c
index df6033cdb499..8eb14aac20d5 100644
--- a/lib/crypto/public_key.c
+++ b/lib/crypto/public_key.c
@@ -13,6 +13,7 @@
 #include <linux/bug.h>
 #include <linux/compat.h>
 #include <linux/err.h>
+#include <linux/printk.h>
 #else
 #include <linux/module.h>
 #include <linux/export.h>
diff --git a/lib/crypto/rsa_helper.c b/lib/crypto/rsa_helper.c
index cc0c0d6637bd..c941d40fd7a8 100644
--- a/lib/crypto/rsa_helper.c
+++ b/lib/crypto/rsa_helper.c
@@ -15,6 +15,7 @@
 #include <linux/fips.h>
 #endif
 #include <crypto/internal/rsa.h>
+#include <linux/printk.h>
 #include "rsapubkey.asn1.h"
 #ifndef __UBOOT__
 #include "rsaprivkey.asn1.h"
diff --git a/lib/crypto/x509_cert_parser.c b/lib/crypto/x509_cert_parser.c
index eb24349460c2..a0f0689118f6 100644
--- a/lib/crypto/x509_cert_parser.c
+++ b/lib/crypto/x509_cert_parser.c
@@ -16,6 +16,7 @@
 #include <linux/err.h>
 #include <linux/oid_registry.h>
 #ifdef __UBOOT__
+#include <linux/printk.h>
 #include <linux/string.h>
 #endif
 #include <crypto/public_key.h>
diff --git a/lib/crypto/x509_public_key.c b/lib/crypto/x509_public_key.c
index 91810a864049..518dc9067310 100644
--- a/lib/crypto/x509_public_key.c
+++ b/lib/crypto/x509_public_key.c
@@ -13,6 +13,7 @@
 #include <linux/compat.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/printk.h>
 #else
 #include <linux/module.h>
 #endif
diff --git a/lib/list_sort.c b/lib/list_sort.c
index 58e1e1614a57..1c9e06173270 100644
--- a/lib/list_sort.c
+++ b/lib/list_sort.c
@@ -8,6 +8,7 @@
 #include <linux/compat.h>
 #include <common.h>
 #include <malloc.h>
+#include <linux/printk.h>
 #endif
 #include <linux/list.h>
 #include <linux/list_sort.h>
diff --git a/net/fastboot.c b/net/fastboot.c
index 0c57fb9947df..d01d3eba120a 100644
--- a/net/fastboot.c
+++ b/net/fastboot.c
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <fastboot.h>
 #include <net.h>
+#include <linux/printk.h>
 #include <net/fastboot.h>
 
 /* Fastboot port # defined in spec */
-- 
2.17.1

^ permalink raw reply related	[flat|nested] 35+ messages in thread

* [RFCv2 04/16] Fix code style for time functions
  2020-08-19 13:08 ` [RFCv2] common: Drop remaining includes in common.h Tom Rini
                     ` (2 preceding siblings ...)
  2020-08-19 13:08   ` [RFCv2 03/16] common: Drop linux/printk.h " Tom Rini
@ 2020-08-19 13:08   ` Tom Rini
  2020-08-19 13:08   ` [RFCv2 05/16] common: Drop time.h from common header Tom Rini
                     ` (12 subsequent siblings)
  16 siblings, 0 replies; 35+ messages in thread
From: Tom Rini @ 2020-08-19 13:08 UTC (permalink / raw)
  To: u-boot

From: Simon Glass <sjg@chromium.org>

Fix the code style used for some time functions.

Signed-off-by: Simon Glass <sjg@chromium.org>
---
 arch/arm/cpu/arm920t/imx/timer.c |  2 +-
 arch/arm/cpu/sa1100/timer.c      |  2 +-
 arch/microblaze/cpu/timer.c      |  2 +-
 arch/powerpc/lib/interrupts.c    |  2 +-
 arch/powerpc/lib/time.c          |  5 +++--
 board/armltd/integrator/timer.c  |  2 +-
 drivers/fpga/ACEX1K.c            |  4 ++--
 drivers/fpga/spartan2.c          | 24 ++++++++++++------------
 drivers/fpga/spartan3.c          | 24 ++++++++++++------------
 drivers/net/lan91c96.c           |  4 ++--
 drivers/net/ne2000_base.c        |  4 ++--
 drivers/net/smc91111.c           |  4 ++--
 post/drivers/rtc.c               |  4 ++--
 13 files changed, 42 insertions(+), 41 deletions(-)

diff --git a/arch/arm/cpu/arm920t/imx/timer.c b/arch/arm/cpu/arm920t/imx/timer.c
index e9d55779214b..b559db75f12c 100644
--- a/arch/arm/cpu/arm920t/imx/timer.c
+++ b/arch/arm/cpu/arm920t/imx/timer.c
@@ -44,7 +44,7 @@ static ulong get_timer_masked (void)
 	return TCN1;
 }
 
-ulong get_timer (ulong base)
+ulong get_timer(ulong base)
 {
 	return get_timer_masked() - base;
 }
diff --git a/arch/arm/cpu/sa1100/timer.c b/arch/arm/cpu/sa1100/timer.c
index a5cdaf5a66c4..5d597dd1ab4c 100644
--- a/arch/arm/cpu/sa1100/timer.c
+++ b/arch/arm/cpu/sa1100/timer.c
@@ -19,7 +19,7 @@ static ulong get_timer_masked (void)
 	return OSCR;
 }
 
-ulong get_timer (ulong base)
+ulong get_timer(ulong base)
 {
 	return get_timer_masked ();
 }
diff --git a/arch/microblaze/cpu/timer.c b/arch/microblaze/cpu/timer.c
index 647bdcd5ba52..05ab0e1b1570 100644
--- a/arch/microblaze/cpu/timer.c
+++ b/arch/microblaze/cpu/timer.c
@@ -20,7 +20,7 @@ DECLARE_GLOBAL_DATA_PTR;
 volatile int timestamp = 0;
 microblaze_timer_t *tmr;
 
-ulong get_timer (ulong base)
+ulong get_timer(ulong base)
 {
 	if (tmr)
 		return timestamp - base;
diff --git a/arch/powerpc/lib/interrupts.c b/arch/powerpc/lib/interrupts.c
index 73f270002cfc..bda0999327d9 100644
--- a/arch/powerpc/lib/interrupts.c
+++ b/arch/powerpc/lib/interrupts.c
@@ -89,7 +89,7 @@ void timer_interrupt(struct pt_regs *regs)
 #endif /* CONFIG_LED_STATUS */
 }
 
-ulong get_timer (ulong base)
+ulong get_timer(ulong base)
 {
 	return (timestamp - base);
 }
diff --git a/arch/powerpc/lib/time.c b/arch/powerpc/lib/time.c
index 8d6babfb83d6..d27432c23af8 100644
--- a/arch/powerpc/lib/time.c
+++ b/arch/powerpc/lib/time.c
@@ -39,8 +39,9 @@ unsigned long usec2ticks(unsigned long usec)
  */
 void __udelay(unsigned long usec)
 {
-	ulong ticks = usec2ticks (usec);
-	wait_ticks (ticks);
+	ulong ticks = usec2ticks(usec);
+
+	wait_ticks(ticks);
 }
 
 /* ------------------------------------------------------------------------- */
diff --git a/board/armltd/integrator/timer.c b/board/armltd/integrator/timer.c
index d220b877d661..53d1c0ec3038 100644
--- a/board/armltd/integrator/timer.c
+++ b/board/armltd/integrator/timer.c
@@ -119,7 +119,7 @@ static ulong get_timer_masked (void)
 	return timestamp;
 }
 
-ulong get_timer (ulong base_ticks)
+ulong get_timer(ulong base_ticks)
 {
 	return get_timer_masked () - base_ticks;
 }
diff --git a/drivers/fpga/ACEX1K.c b/drivers/fpga/ACEX1K.c
index aca8049c56ac..30a3727433e7 100644
--- a/drivers/fpga/ACEX1K.c
+++ b/drivers/fpga/ACEX1K.c
@@ -140,10 +140,10 @@ static int ACEX1K_ps_load(Altera_desc *desc, const void *buf, size_t bsize)
 		udelay(2);		/* T_cf2st1 < 4us	*/
 
 		/* Wait for nSTATUS to be released (i.e. deasserted) */
-		ts = get_timer (0);		/* get current time */
+		ts = get_timer(0);		/* get current time */
 		do {
 			CONFIG_FPGA_DELAY ();
-			if (get_timer (ts) > CONFIG_SYS_FPGA_WAIT) {	/* check the time */
+			if (get_timer(ts) > CONFIG_SYS_FPGA_WAIT) {	/* check the time */
 				puts ("** Timeout waiting for STATUS to go high.\n");
 				(*fn->abort) (cookie);
 				return FPGA_FAIL;
diff --git a/drivers/fpga/spartan2.c b/drivers/fpga/spartan2.c
index 3435400e58bd..fae94f9663ab 100644
--- a/drivers/fpga/spartan2.c
+++ b/drivers/fpga/spartan2.c
@@ -151,11 +151,11 @@ static int spartan2_sp_load(xilinx_desc *desc, const void *buf, size_t bsize)
 		CONFIG_FPGA_DELAY ();
 		(*fn->pgm) (false, true, cookie);	/* Deassert the program, commit */
 
-		ts = get_timer (0);		/* get current time */
+		ts = get_timer(0);		/* get current time */
 		/* Now wait for INIT and BUSY to go high */
 		do {
 			CONFIG_FPGA_DELAY ();
-			if (get_timer (ts) > CONFIG_SYS_FPGA_WAIT) {	/* check the time */
+			if (get_timer(ts) > CONFIG_SYS_FPGA_WAIT) {	/* check the time */
 				puts ("** Timeout waiting for INIT to clear.\n");
 				(*fn->abort) (cookie);	/* abort the burn */
 				return FPGA_FAIL;
@@ -178,7 +178,7 @@ static int spartan2_sp_load(xilinx_desc *desc, const void *buf, size_t bsize)
 			(*fn->clk) (true, true, cookie);	/* Assert the clock pin */
 
 #ifdef CONFIG_SYS_FPGA_CHECK_BUSY
-			ts = get_timer (0);	/* get current time */
+			ts = get_timer(0);	/* get current time */
 			while ((*fn->busy) (cookie)) {
 				/* XXX - we should have a check in here somewhere to
 				 * make sure we aren't busy forever... */
@@ -188,7 +188,7 @@ static int spartan2_sp_load(xilinx_desc *desc, const void *buf, size_t bsize)
 				CONFIG_FPGA_DELAY ();
 				(*fn->clk) (true, true, cookie);	/* Assert the clock pin */
 
-				if (get_timer (ts) > CONFIG_SYS_FPGA_WAIT) {	/* check the time */
+				if (get_timer(ts) > CONFIG_SYS_FPGA_WAIT) {	/* check the time */
 					puts ("** Timeout waiting for BUSY to clear.\n");
 					(*fn->abort) (cookie);	/* abort the burn */
 					return FPGA_FAIL;
@@ -211,7 +211,7 @@ static int spartan2_sp_load(xilinx_desc *desc, const void *buf, size_t bsize)
 #endif
 
 		/* now check for done signal */
-		ts = get_timer (0);		/* get current time */
+		ts = get_timer(0);		/* get current time */
 		ret_val = FPGA_SUCCESS;
 		while ((*fn->done) (cookie) == FPGA_FAIL) {
 
@@ -220,7 +220,7 @@ static int spartan2_sp_load(xilinx_desc *desc, const void *buf, size_t bsize)
 			CONFIG_FPGA_DELAY ();
 			(*fn->clk) (true, true, cookie);	/* Assert the clock pin */
 
-			if (get_timer (ts) > CONFIG_SYS_FPGA_WAIT) {	/* check the time */
+			if (get_timer(ts) > CONFIG_SYS_FPGA_WAIT) {	/* check the time */
 				puts ("** Timeout waiting for DONE to clear.\n");
 				(*fn->abort) (cookie);	/* abort the burn */
 				ret_val = FPGA_FAIL;
@@ -337,10 +337,10 @@ static int spartan2_ss_load(xilinx_desc *desc, const void *buf, size_t bsize)
 		(*fn->pgm) (true, true, cookie);	/* Assert the program, commit */
 
 		/* Wait for INIT state (init low)                            */
-		ts = get_timer (0);		/* get current time */
+		ts = get_timer(0);		/* get current time */
 		do {
 			CONFIG_FPGA_DELAY ();
-			if (get_timer (ts) > CONFIG_SYS_FPGA_WAIT) {	/* check the time */
+			if (get_timer(ts) > CONFIG_SYS_FPGA_WAIT) {	/* check the time */
 				puts ("** Timeout waiting for INIT to start.\n");
 				return FPGA_FAIL;
 			}
@@ -350,11 +350,11 @@ static int spartan2_ss_load(xilinx_desc *desc, const void *buf, size_t bsize)
 		CONFIG_FPGA_DELAY ();
 		(*fn->pgm) (false, true, cookie);	/* Deassert the program, commit */
 
-		ts = get_timer (0);		/* get current time */
+		ts = get_timer(0);		/* get current time */
 		/* Now wait for INIT to go high */
 		do {
 			CONFIG_FPGA_DELAY ();
-			if (get_timer (ts) > CONFIG_SYS_FPGA_WAIT) {	/* check the time */
+			if (get_timer(ts) > CONFIG_SYS_FPGA_WAIT) {	/* check the time */
 				puts ("** Timeout waiting for INIT to clear.\n");
 				return FPGA_FAIL;
 			}
@@ -398,7 +398,7 @@ static int spartan2_ss_load(xilinx_desc *desc, const void *buf, size_t bsize)
 #endif
 
 		/* now check for done signal */
-		ts = get_timer (0);		/* get current time */
+		ts = get_timer(0);		/* get current time */
 		ret_val = FPGA_SUCCESS;
 		(*fn->wr) (true, true, cookie);
 
@@ -411,7 +411,7 @@ static int spartan2_ss_load(xilinx_desc *desc, const void *buf, size_t bsize)
 
 			putc ('*');
 
-			if (get_timer (ts) > CONFIG_SYS_FPGA_WAIT) {	/* check the time */
+			if (get_timer(ts) > CONFIG_SYS_FPGA_WAIT) {	/* check the time */
 				puts ("** Timeout waiting for DONE to clear.\n");
 				ret_val = FPGA_FAIL;
 				break;
diff --git a/drivers/fpga/spartan3.c b/drivers/fpga/spartan3.c
index 4850c99352dd..e40e427a25fe 100644
--- a/drivers/fpga/spartan3.c
+++ b/drivers/fpga/spartan3.c
@@ -155,11 +155,11 @@ static int spartan3_sp_load(xilinx_desc *desc, const void *buf, size_t bsize)
 		CONFIG_FPGA_DELAY ();
 		(*fn->pgm) (false, true, cookie);	/* Deassert the program, commit */
 
-		ts = get_timer (0);		/* get current time */
+		ts = get_timer(0);		/* get current time */
 		/* Now wait for INIT and BUSY to go high */
 		do {
 			CONFIG_FPGA_DELAY ();
-			if (get_timer (ts) > CONFIG_SYS_FPGA_WAIT) {	/* check the time */
+			if (get_timer(ts) > CONFIG_SYS_FPGA_WAIT) {	/* check the time */
 				puts ("** Timeout waiting for INIT to clear.\n");
 				(*fn->abort) (cookie);	/* abort the burn */
 				return FPGA_FAIL;
@@ -182,7 +182,7 @@ static int spartan3_sp_load(xilinx_desc *desc, const void *buf, size_t bsize)
 			(*fn->clk) (true, true, cookie);	/* Assert the clock pin */
 
 #ifdef CONFIG_SYS_FPGA_CHECK_BUSY
-			ts = get_timer (0);	/* get current time */
+			ts = get_timer(0);	/* get current time */
 			while ((*fn->busy) (cookie)) {
 				/* XXX - we should have a check in here somewhere to
 				 * make sure we aren't busy forever... */
@@ -192,7 +192,7 @@ static int spartan3_sp_load(xilinx_desc *desc, const void *buf, size_t bsize)
 				CONFIG_FPGA_DELAY ();
 				(*fn->clk) (true, true, cookie);	/* Assert the clock pin */
 
-				if (get_timer (ts) > CONFIG_SYS_FPGA_WAIT) {	/* check the time */
+				if (get_timer(ts) > CONFIG_SYS_FPGA_WAIT) {	/* check the time */
 					puts ("** Timeout waiting for BUSY to clear.\n");
 					(*fn->abort) (cookie);	/* abort the burn */
 					return FPGA_FAIL;
@@ -215,7 +215,7 @@ static int spartan3_sp_load(xilinx_desc *desc, const void *buf, size_t bsize)
 #endif
 
 		/* now check for done signal */
-		ts = get_timer (0);		/* get current time */
+		ts = get_timer(0);		/* get current time */
 		ret_val = FPGA_SUCCESS;
 		while ((*fn->done) (cookie) == FPGA_FAIL) {
 			/* XXX - we should have a check in here somewhere to
@@ -226,7 +226,7 @@ static int spartan3_sp_load(xilinx_desc *desc, const void *buf, size_t bsize)
 			CONFIG_FPGA_DELAY ();
 			(*fn->clk) (true, true, cookie);	/* Assert the clock pin */
 
-			if (get_timer (ts) > CONFIG_SYS_FPGA_WAIT) {	/* check the time */
+			if (get_timer(ts) > CONFIG_SYS_FPGA_WAIT) {	/* check the time */
 				puts ("** Timeout waiting for DONE to clear.\n");
 				(*fn->abort) (cookie);	/* abort the burn */
 				ret_val = FPGA_FAIL;
@@ -343,10 +343,10 @@ static int spartan3_ss_load(xilinx_desc *desc, const void *buf, size_t bsize)
 		(*fn->pgm) (true, true, cookie);	/* Assert the program, commit */
 
 		/* Wait for INIT state (init low)                            */
-		ts = get_timer (0);		/* get current time */
+		ts = get_timer(0);		/* get current time */
 		do {
 			CONFIG_FPGA_DELAY ();
-			if (get_timer (ts) > CONFIG_SYS_FPGA_WAIT) {	/* check the time */
+			if (get_timer(ts) > CONFIG_SYS_FPGA_WAIT) {	/* check the time */
 				puts ("** Timeout waiting for INIT to start.\n");
 				if (*fn->abort)
 					(*fn->abort) (cookie);
@@ -358,11 +358,11 @@ static int spartan3_ss_load(xilinx_desc *desc, const void *buf, size_t bsize)
 		CONFIG_FPGA_DELAY ();
 		(*fn->pgm) (false, true, cookie);	/* Deassert the program, commit */
 
-		ts = get_timer (0);		/* get current time */
+		ts = get_timer(0);		/* get current time */
 		/* Now wait for INIT to go high */
 		do {
 			CONFIG_FPGA_DELAY ();
-			if (get_timer (ts) > CONFIG_SYS_FPGA_WAIT) {	/* check the time */
+			if (get_timer(ts) > CONFIG_SYS_FPGA_WAIT) {	/* check the time */
 				puts ("** Timeout waiting for INIT to clear.\n");
 				if (*fn->abort)
 					(*fn->abort) (cookie);
@@ -414,7 +414,7 @@ static int spartan3_ss_load(xilinx_desc *desc, const void *buf, size_t bsize)
 #endif
 
 		/* now check for done signal */
-		ts = get_timer (0);		/* get current time */
+		ts = get_timer(0);		/* get current time */
 		ret_val = FPGA_SUCCESS;
 		(*fn->wr) (true, true, cookie);
 
@@ -429,7 +429,7 @@ static int spartan3_ss_load(xilinx_desc *desc, const void *buf, size_t bsize)
 
 			putc ('*');
 
-			if (get_timer (ts) > CONFIG_SYS_FPGA_WAIT) {	/* check the time */
+			if (get_timer(ts) > CONFIG_SYS_FPGA_WAIT) {	/* check the time */
 				puts ("** Timeout waiting for DONE to clear.\n");
 				ret_val = FPGA_FAIL;
 				break;
diff --git a/drivers/net/lan91c96.c b/drivers/net/lan91c96.c
index c2f611144db6..470c68467cde 100644
--- a/drivers/net/lan91c96.c
+++ b/drivers/net/lan91c96.c
@@ -164,14 +164,14 @@ static void print_packet (byte *, int);
 
 static int poll4int (struct eth_device *dev, byte mask, int timeout)
 {
-	int tmo = get_timer (0) + timeout * CONFIG_SYS_HZ;
+	int tmo = get_timer(0) + timeout * CONFIG_SYS_HZ;
 	int is_timeout = 0;
 	word old_bank = SMC_inw(dev, LAN91C96_BANK_SELECT);
 
 	PRINTK2 ("Polling...\n");
 	SMC_SELECT_BANK(dev, 2);
 	while ((SMC_inw(dev, LAN91C96_INT_STATS) & mask) == 0) {
-		if (get_timer (0) >= tmo) {
+		if (get_timer(0) >= tmo) {
 			is_timeout = 1;
 			break;
 		}
diff --git a/drivers/net/ne2000_base.c b/drivers/net/ne2000_base.c
index f6673f5e4c65..09cc8398003b 100644
--- a/drivers/net/ne2000_base.c
+++ b/drivers/net/ne2000_base.c
@@ -750,14 +750,14 @@ static int ne2k_send(struct eth_device *dev, void *packet, int length)
 	pkey = -1;
 
 	dp83902a_send((u8 *) packet, length, 666);
-	tmo = get_timer (0) + TOUT * CONFIG_SYS_HZ;
+	tmo = get_timer(0) + TOUT * CONFIG_SYS_HZ;
 	while(1) {
 		dp83902a_poll();
 		if (pkey != -1) {
 			PRINTK("Packet sucesfully sent\n");
 			return 0;
 		}
-		if (get_timer (0) >= tmo) {
+		if (get_timer(0) >= tmo) {
 			printf("transmission error (timoeut)\n");
 			return 0;
 		}
diff --git a/drivers/net/smc91111.c b/drivers/net/smc91111.c
index ec4e8e928cb6..fea6ba8caaa1 100644
--- a/drivers/net/smc91111.c
+++ b/drivers/net/smc91111.c
@@ -238,14 +238,14 @@ static void print_packet( byte *, int );
 
 static int poll4int (struct eth_device *dev, byte mask, int timeout)
 {
-	int tmo = get_timer (0) + timeout * CONFIG_SYS_HZ;
+	int tmo = get_timer(0) + timeout * CONFIG_SYS_HZ;
 	int is_timeout = 0;
 	word old_bank = SMC_inw (dev, BSR_REG);
 
 	PRINTK2 ("Polling...\n");
 	SMC_SELECT_BANK (dev, 2);
 	while ((SMC_inw (dev, SMC91111_INT_REG) & mask) == 0) {
-		if (get_timer (0) >= tmo) {
+		if (get_timer(0) >= tmo) {
 			is_timeout = 1;
 			break;
 		}
diff --git a/post/drivers/rtc.c b/post/drivers/rtc.c
index c603f0e6728c..af701e464d36 100644
--- a/post/drivers/rtc.c
+++ b/post/drivers/rtc.c
@@ -36,11 +36,11 @@ static int rtc_post_skip (ulong * diff)
 	ulong start2;
 
 	rtc_get (&tm1);
-	start1 = get_timer (0);
+	start1 = get_timer(0);
 
 	while (1) {
 		rtc_get (&tm2);
-		start2 = get_timer (0);
+		start2 = get_timer(0);
 		if (tm1.tm_sec != tm2.tm_sec)
 			break;
 		if (start2 - start1 > 1500)
-- 
2.17.1

^ permalink raw reply related	[flat|nested] 35+ messages in thread

* [RFCv2 05/16] common: Drop time.h from common header
  2020-08-19 13:08 ` [RFCv2] common: Drop remaining includes in common.h Tom Rini
                     ` (3 preceding siblings ...)
  2020-08-19 13:08   ` [RFCv2 04/16] Fix code style for time functions Tom Rini
@ 2020-08-19 13:08   ` Tom Rini
  2020-08-19 13:08   ` [RFCv2 06/16] common: Drop linux/string.h " Tom Rini
                     ` (11 subsequent siblings)
  16 siblings, 0 replies; 35+ messages in thread
From: Tom Rini @ 2020-08-19 13:08 UTC (permalink / raw)
  To: u-boot

From: Simon Glass <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/arm/mach-at91/arm920t/clock.c           | 1 +
 arch/arm/mach-at91/arm926ejs/clock.c         | 1 +
 arch/arm/mach-at91/clock.c                   | 1 +
 arch/arm/mach-at91/phy.c                     | 1 +
 arch/arm/mach-bcm283x/mbox.c                 | 1 +
 arch/arm/mach-exynos/clock.c                 | 1 +
 arch/arm/mach-imx/i2c-mxv7.c                 | 1 +
 arch/arm/mach-imx/mx6/clock.c                | 1 +
 arch/arm/mach-imx/mx7/clock.c                | 1 +
 arch/arm/mach-omap2/omap3/am35x_musb.c       | 1 +
 arch/arm/mach-stm32mp/pwr_regulator.c        | 1 +
 arch/arm/mach-tegra/powergate.c              | 1 +
 arch/arm/mach-tegra/tegra124/xusb-padctl.c   | 1 +
 arch/arm/mach-tegra/tegra210/clock.c         | 1 +
 arch/arm/mach-tegra/tegra210/xusb-padctl.c   | 1 +
 arch/m68k/cpu/mcf547x_8x/slicetimer.c        | 1 +
 arch/mips/mach-mtmips/mt7628/init.c          | 1 +
 arch/mips/mach-octeon/clock.c                | 1 +
 arch/powerpc/lib/interrupts.c                | 1 +
 arch/x86/cpu/acpi_gpe.c                      | 1 +
 arch/x86/cpu/apollolake/punit.c              | 1 +
 arch/x86/cpu/coreboot/timestamp.c            | 1 +
 arch/x86/cpu/intel_common/mrc.c              | 1 +
 arch/x86/cpu/mp_init.c                       | 1 +
 arch/x86/cpu/quark/mrc.c                     | 1 +
 arch/x86/cpu/quark/mrc_util.c                | 1 +
 arch/x86/cpu/quark/smc.c                     | 1 +
 board/astro/mcf5373l/mcf5373l.c              | 1 +
 board/cobra5272/flash.c                      | 1 +
 board/freescale/m5253demo/flash.c            | 1 +
 board/gdsys/common/phy.c                     | 1 +
 board/nokia/rx51/rx51.c                      | 1 +
 board/sandbox/sandbox.c                      | 1 +
 board/theadorable/fpga.c                     | 1 +
 board/theadorable/theadorable.c              | 1 +
 cmd/clone.c                                  | 1 +
 cmd/gettime.c                                | 1 +
 cmd/mem.c                                    | 1 +
 cmd/misc.c                                   | 1 +
 cmd/sf.c                                     | 1 +
 cmd/tpm_test.c                               | 1 +
 common/command.c                             | 1 +
 common/dfu.c                                 | 1 +
 common/usb_hub.c                             | 1 +
 common/usb_kbd.c                             | 1 +
 common/xyzModem.c                            | 1 +
 drivers/ata/ahci.c                           | 1 +
 drivers/ata/sata_mv.c                        | 1 +
 drivers/ddr/altera/sdram_soc64.c             | 1 +
 drivers/dma/lpc32xx_dma.c                    | 1 +
 drivers/fpga/ACEX1K.c                        | 1 +
 drivers/fpga/cyclon2.c                       | 1 +
 drivers/fpga/socfpga_arria10.c               | 1 +
 drivers/fpga/spartan2.c                      | 1 +
 drivers/fpga/spartan3.c                      | 1 +
 drivers/fpga/stratix10.c                     | 1 +
 drivers/fpga/virtex2.c                       | 1 +
 drivers/fpga/zynqpl.c                        | 1 +
 drivers/hwspinlock/hwspinlock-uclass.c       | 1 +
 drivers/i2c/at91_i2c.c                       | 1 +
 drivers/i2c/designware_i2c.c                 | 1 +
 drivers/i2c/i2c-cortina.c                    | 1 +
 drivers/i2c/imx_lpi2c.c                      | 1 +
 drivers/i2c/intel_i2c.c                      | 1 +
 drivers/i2c/meson_i2c.c                      | 1 +
 drivers/i2c/muxes/i2c-arb-gpio-challenge.c   | 1 +
 drivers/i2c/mxc_i2c.c                        | 1 +
 drivers/i2c/nx_i2c.c                         | 1 +
 drivers/i2c/octeon_i2c.c                     | 1 +
 drivers/i2c/rk_i2c.c                         | 1 +
 drivers/i2c/s3c24x0_i2c.c                    | 1 +
 drivers/i2c/stm32f7_i2c.c                    | 1 +
 drivers/input/input.c                        | 1 +
 drivers/input/tegra-kbc.c                    | 1 +
 drivers/misc/cros_ec.c                       | 1 +
 drivers/misc/cros_ec_lpc.c                   | 1 +
 drivers/misc/cros_ec_sandbox.c               | 1 +
 drivers/misc/cros_ec_spi.c                   | 1 +
 drivers/mmc/am654_sdhci.c                    | 1 +
 drivers/mmc/bcm2835_sdhost.c                 | 1 +
 drivers/mmc/dw_mmc.c                         | 1 +
 drivers/mmc/fsl_esdhc.c                      | 1 +
 drivers/mmc/fsl_esdhc_imx.c                  | 1 +
 drivers/mmc/ftsdc010_mci.c                   | 1 +
 drivers/mmc/meson_gx_mmc.c                   | 1 +
 drivers/mmc/mmc.c                            | 1 +
 drivers/mmc/mvebu_mmc.c                      | 1 +
 drivers/mmc/omap_hsmmc.c                     | 1 +
 drivers/mmc/sdhci.c                          | 1 +
 drivers/mmc/sunxi_mmc.c                      | 1 +
 drivers/mmc/tegra_mmc.c                      | 1 +
 drivers/mtd/cfi_flash.c                      | 1 +
 drivers/mtd/nand/raw/brcmnand/brcmnand.c     | 1 +
 drivers/mtd/nand/raw/fsl_elbc_nand.c         | 1 +
 drivers/mtd/nand/raw/fsl_ifc_nand.c          | 1 +
 drivers/mtd/nand/raw/fsmc_nand.c             | 1 +
 drivers/mtd/nand/raw/mxs_nand_spl.c          | 1 +
 drivers/mtd/nand/raw/nand_base.c             | 1 +
 drivers/mtd/nand/raw/pxa3xx_nand.c           | 1 +
 drivers/mtd/nand/raw/sunxi_nand.c            | 1 +
 drivers/mtd/nand/raw/vf610_nfc.c             | 1 +
 drivers/mtd/nand/spi/core.c                  | 1 +
 drivers/mtd/onenand/onenand_base.c           | 1 +
 drivers/mtd/spi/sf_dataflash.c               | 1 +
 drivers/mtd/spi/spi-nor-core.c               | 1 +
 drivers/mtd/spi/spi-nor-tiny.c               | 1 +
 drivers/mtd/st_smi.c                         | 1 +
 drivers/net/ag7xxx.c                         | 1 +
 drivers/net/altera_tse.c                     | 1 +
 drivers/net/cs8900.c                         | 1 +
 drivers/net/designware.c                     | 1 +
 drivers/net/dm9000x.c                        | 1 +
 drivers/net/ethoc.c                          | 1 +
 drivers/net/fec_mxc.c                        | 1 +
 drivers/net/ftmac100.c                       | 1 +
 drivers/net/ftmac110.c                       | 1 +
 drivers/net/lan91c96.c                       | 1 +
 drivers/net/ldpaa_eth/ldpaa_eth.c            | 1 +
 drivers/net/mtk_eth.c                        | 1 +
 drivers/net/ne2000_base.c                    | 1 +
 drivers/net/pch_gbe.c                        | 1 +
 drivers/net/ravb.c                           | 1 +
 drivers/net/rtl8169.c                        | 1 +
 drivers/net/sandbox.c                        | 1 +
 drivers/net/smc91111.c                       | 1 +
 drivers/net/sun8i_emac.c                     | 1 +
 drivers/net/xilinx_emaclite.c                | 1 +
 drivers/pci/pci_rom.c                        | 1 +
 drivers/pci/pci_tegra.c                      | 1 +
 drivers/pci/pcie_dw_mvebu.c                  | 1 +
 drivers/pci/pcie_dw_ti.c                     | 1 +
 drivers/phy/phy-da8xx-usb.c                  | 1 +
 drivers/power/exynos-tmu.c                   | 1 +
 drivers/power/regulator/tps65090_regulator.c | 1 +
 drivers/ram/rockchip/dmc-rk3368.c            | 1 +
 drivers/ram/stm32mp1/stm32mp1_interactive.c  | 1 +
 drivers/rng/sandbox_rng.c                    | 1 +
 drivers/rtc/rv3029.c                         | 1 +
 drivers/sound/samsung-i2s.c                  | 1 +
 drivers/sound/tegra_ahub.c                   | 1 +
 drivers/spi/altera_spi.c                     | 1 +
 drivers/spi/cadence_qspi_apb.c               | 1 +
 drivers/spi/ich.c                            | 1 +
 drivers/spi/mpc8xxx_spi.c                    | 1 +
 drivers/spi/mxc_spi.c                        | 1 +
 drivers/spi/omap3_spi.c                      | 1 +
 drivers/spi/pic32_spi.c                      | 1 +
 drivers/spi/zynq_qspi.c                      | 1 +
 drivers/timer/sandbox_timer.c                | 1 +
 drivers/tpm/cr50_i2c.c                       | 1 +
 drivers/tpm/tpm-uclass.c                     | 1 +
 drivers/tpm/tpm2_tis_spi.c                   | 1 +
 drivers/tpm/tpm_atmel_twi.c                  | 1 +
 drivers/tpm/tpm_tis_infineon.c               | 1 +
 drivers/tpm/tpm_tis_st33zp24_i2c.c           | 1 +
 drivers/tpm/tpm_tis_st33zp24_spi.c           | 1 +
 drivers/ufs/ufs.c                            | 1 +
 drivers/usb/eth/smsc95xx.c                   | 1 +
 drivers/usb/gadget/ether.c                   | 1 +
 drivers/usb/gadget/fotg210.c                 | 1 +
 drivers/usb/gadget/pxa25x_udc.c              | 1 +
 drivers/usb/host/dwc2.c                      | 1 +
 drivers/usb/host/ehci-hcd.c                  | 1 +
 drivers/usb/host/ehci-omap.c                 | 1 +
 drivers/usb/host/ohci-da8xx.c                | 1 +
 drivers/usb/host/sl811-hcd.c                 | 1 +
 drivers/usb/host/xhci-ring.c                 | 1 +
 drivers/usb/musb-new/am35x.c                 | 1 +
 drivers/usb/musb-new/musb_dsps.c             | 1 +
 drivers/usb/musb-new/musb_uboot.c            | 1 +
 drivers/usb/musb-new/omap2430.c              | 1 +
 drivers/video/broadwell_igd.c                | 1 +
 drivers/video/dw_hdmi.c                      | 1 +
 drivers/video/rockchip/rk_edp.c              | 1 +
 drivers/video/tegra124/display.c             | 1 +
 drivers/video/tegra124/dp.c                  | 1 +
 drivers/video/tegra124/sor.c                 | 1 +
 drivers/video/video-uclass.c                 | 1 +
 drivers/watchdog/sbsa_gwdt.c                 | 1 +
 drivers/xen/pvblock.c                        | 1 +
 drivers/xen/xenbus.c                         | 1 +
 fs/fs.c                                      | 1 +
 fs/ubifs/debug.c                             | 1 +
 include/cli.h                                | 2 ++
 include/common.h                             | 1 -
 include/exports.h                            | 1 +
 include/regmap.h                             | 1 +
 include/virtio.h                             | 2 ++
 lib/dhry/cmd_dhry.c                          | 1 +
 net/arp.c                                    | 1 +
 net/bootp.c                                  | 1 +
 net/dns.c                                    | 1 +
 net/fastboot.c                               | 1 +
 net/link_local.c                             | 1 +
 net/net.c                                    | 1 +
 net/sntp.c                                   | 1 +
 net/tftp.c                                   | 1 +
 post/drivers/rtc.c                           | 1 +
 test/dm/regmap.c                             | 1 +
 200 files changed, 201 insertions(+), 1 deletion(-)

diff --git a/api/api.c b/api/api.c
index c7f5db776af9..2e955f7baf24 100644
--- a/api/api.c
+++ b/api/api.c
@@ -11,6 +11,7 @@
 #include <env.h>
 #include <malloc.h>
 #include <env_internal.h>
+#include <time.h>
 #include <linux/delay.h>
 #include <linux/types.h>
 #include <api_public.h>
diff --git a/arch/arm/mach-at91/arm920t/clock.c b/arch/arm/mach-at91/arm920t/clock.c
index c7440278d8f8..2c8fbe6d2846 100644
--- a/arch/arm/mach-at91/arm920t/clock.c
+++ b/arch/arm/mach-at91/arm920t/clock.c
@@ -8,6 +8,7 @@
  * Copyright (C) 2009 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
  */
 #include <common.h>
+#include <time.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
diff --git a/arch/arm/mach-at91/arm926ejs/clock.c b/arch/arm/mach-at91/arm926ejs/clock.c
index c68e0c0c3c44..9b97987fecb8 100644
--- a/arch/arm/mach-at91/arm926ejs/clock.c
+++ b/arch/arm/mach-at91/arm926ejs/clock.c
@@ -8,6 +8,7 @@
  */
 
 #include <common.h>
+#include <time.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
diff --git a/arch/arm/mach-at91/clock.c b/arch/arm/mach-at91/clock.c
index 8344daeb39a2..5b8ce52f5c1e 100644
--- a/arch/arm/mach-at91/clock.c
+++ b/arch/arm/mach-at91/clock.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <time.h>
 #include <wdt.h>
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
diff --git a/arch/arm/mach-at91/phy.c b/arch/arm/mach-at91/phy.c
index 6101eee3589c..b68e4bd355fb 100644
--- a/arch/arm/mach-at91/phy.c
+++ b/arch/arm/mach-at91/phy.c
@@ -12,6 +12,7 @@
  */
 
 #include <common.h>
+#include <time.h>
 #include <asm/hardware.h>
 #include <asm/io.h>
 #include <linux/delay.h>
diff --git a/arch/arm/mach-bcm283x/mbox.c b/arch/arm/mach-bcm283x/mbox.c
index da9faafe1ddc..940699337f1e 100644
--- a/arch/arm/mach-bcm283x/mbox.c
+++ b/arch/arm/mach-bcm283x/mbox.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <log.h>
+#include <time.h>
 #include <asm/cache.h>
 #include <asm/io.h>
 #include <asm/arch/base.h>
diff --git a/arch/arm/mach-exynos/clock.c b/arch/arm/mach-exynos/clock.c
index ef48d35aa4c2..6c21fd642cd4 100644
--- a/arch/arm/mach-exynos/clock.c
+++ b/arch/arm/mach-exynos/clock.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <time.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/clk.h>
diff --git a/arch/arm/mach-imx/i2c-mxv7.c b/arch/arm/mach-imx/i2c-mxv7.c
index e6c74bf77e9a..5e3d79b887f0 100644
--- a/arch/arm/mach-imx/i2c-mxv7.c
+++ b/arch/arm/mach-imx/i2c-mxv7.c
@@ -4,6 +4,7 @@
  */
 #include <common.h>
 #include <malloc.h>
+#include <time.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <linux/delay.h>
diff --git a/arch/arm/mach-imx/mx6/clock.c b/arch/arm/mach-imx/mx6/clock.c
index fb5e5b6f05c4..c40d8855125f 100644
--- a/arch/arm/mach-imx/mx6/clock.c
+++ b/arch/arm/mach-imx/mx6/clock.c
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <div64.h>
 #include <log.h>
+#include <time.h>
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <asm/arch/imx-regs.h>
diff --git a/arch/arm/mach-imx/mx7/clock.c b/arch/arm/mach-imx/mx7/clock.c
index b1d7290704a4..56e0cfa98876 100644
--- a/arch/arm/mach-imx/mx7/clock.c
+++ b/arch/arm/mach-imx/mx7/clock.c
@@ -11,6 +11,7 @@
 #include <command.h>
 #include <div64.h>
 #include <log.h>
+#include <time.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/errno.h>
diff --git a/arch/arm/mach-omap2/omap3/am35x_musb.c b/arch/arm/mach-omap2/omap3/am35x_musb.c
index 95e15c1a51bc..ada70743a335 100644
--- a/arch/arm/mach-omap2/omap3/am35x_musb.c
+++ b/arch/arm/mach-omap2/omap3/am35x_musb.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <time.h>
 #include <asm/io.h>
 #include <asm/arch/am35x_def.h>
 
diff --git a/arch/arm/mach-stm32mp/pwr_regulator.c b/arch/arm/mach-stm32mp/pwr_regulator.c
index 900dee4c38a6..eb024b85116b 100644
--- a/arch/arm/mach-stm32mp/pwr_regulator.c
+++ b/arch/arm/mach-stm32mp/pwr_regulator.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <syscon.h>
+#include <time.h>
 #include <asm/io.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
diff --git a/arch/arm/mach-tegra/powergate.c b/arch/arm/mach-tegra/powergate.c
index 631bc04e9506..c5ced7e3f389 100644
--- a/arch/arm/mach-tegra/powergate.c
+++ b/arch/arm/mach-tegra/powergate.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <errno.h>
+#include <time.h>
 #include <linux/delay.h>
 
 #include <asm/io.h>
diff --git a/arch/arm/mach-tegra/tegra124/xusb-padctl.c b/arch/arm/mach-tegra/tegra124/xusb-padctl.c
index 5b88d6e5e7b3..a1136f1558b8 100644
--- a/arch/arm/mach-tegra/tegra124/xusb-padctl.c
+++ b/arch/arm/mach-tegra/tegra124/xusb-padctl.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <errno.h>
 #include <log.h>
+#include <time.h>
 #include <asm/global_data.h>
 #include <dm/of_access.h>
 #include <dm/ofnode.h>
diff --git a/arch/arm/mach-tegra/tegra210/clock.c b/arch/arm/mach-tegra/tegra210/clock.c
index ccc64eb77b4d..711d02c036ff 100644
--- a/arch/arm/mach-tegra/tegra210/clock.c
+++ b/arch/arm/mach-tegra/tegra210/clock.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <init.h>
 #include <log.h>
+#include <time.h>
 #include <asm/cache.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
diff --git a/arch/arm/mach-tegra/tegra210/xusb-padctl.c b/arch/arm/mach-tegra/tegra210/xusb-padctl.c
index 30d0395bb0e5..0af6e256ad18 100644
--- a/arch/arm/mach-tegra/tegra210/xusb-padctl.c
+++ b/arch/arm/mach-tegra/tegra210/xusb-padctl.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <errno.h>
 #include <log.h>
+#include <time.h>
 #include <asm/global_data.h>
 #include <dm/of_access.h>
 #include <dm/ofnode.h>
diff --git a/arch/m68k/cpu/mcf547x_8x/slicetimer.c b/arch/m68k/cpu/mcf547x_8x/slicetimer.c
index dc076fc6e814..49f246b62e1e 100644
--- a/arch/m68k/cpu/mcf547x_8x/slicetimer.c
+++ b/arch/m68k/cpu/mcf547x_8x/slicetimer.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <init.h>
 #include <irq_func.h>
+#include <time.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
 
diff --git a/arch/mips/mach-mtmips/mt7628/init.c b/arch/mips/mach-mtmips/mt7628/init.c
index 27241050aaf5..3fa0e139e751 100644
--- a/arch/mips/mach-mtmips/mt7628/init.c
+++ b/arch/mips/mach-mtmips/mt7628/init.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <clk.h>
 #include <dm.h>
+#include <time.h>
 #include <asm/global_data.h>
 #include <dm/uclass.h>
 #include <dt-bindings/clock/mt7628-clk.h>
diff --git a/arch/mips/mach-octeon/clock.c b/arch/mips/mach-octeon/clock.c
index 119b3ac50b42..8984bfd74458 100644
--- a/arch/mips/mach-octeon/clock.c
+++ b/arch/mips/mach-octeon/clock.c
@@ -3,6 +3,7 @@
  * Copyright (C) 2018, 2019 Marvell International Ltd.
  */
 
+#include <time.h>
 #include <asm/global_data.h>
 #include <mach/clock.h>
 
diff --git a/arch/powerpc/lib/interrupts.c b/arch/powerpc/lib/interrupts.c
index bda0999327d9..14f32cbd9372 100644
--- a/arch/powerpc/lib/interrupts.c
+++ b/arch/powerpc/lib/interrupts.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <irq_func.h>
+#include <time.h>
 #include <asm/processor.h>
 #include <watchdog.h>
 #ifdef CONFIG_LED_STATUS
diff --git a/arch/x86/cpu/acpi_gpe.c b/arch/x86/cpu/acpi_gpe.c
index 70badb15a3be..9baf4f65b366 100644
--- a/arch/x86/cpu/acpi_gpe.c
+++ b/arch/x86/cpu/acpi_gpe.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <irq.h>
 #include <log.h>
+#include <time.h>
 #include <acpi/acpi_device.h>
 #include <asm/io.h>
 #include <dt-bindings/interrupt-controller/irq.h>
diff --git a/arch/x86/cpu/apollolake/punit.c b/arch/x86/cpu/apollolake/punit.c
index e76f2805d7f9..3514ba215914 100644
--- a/arch/x86/cpu/apollolake/punit.c
+++ b/arch/x86/cpu/apollolake/punit.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <log.h>
 #include <spl.h>
+#include <time.h>
 #include <asm/cpu.h>
 #include <asm/cpu_common.h>
 #include <asm/intel_regs.h>
diff --git a/arch/x86/cpu/coreboot/timestamp.c b/arch/x86/cpu/coreboot/timestamp.c
index 016259780950..c2072535658a 100644
--- a/arch/x86/cpu/coreboot/timestamp.c
+++ b/arch/x86/cpu/coreboot/timestamp.c
@@ -9,6 +9,7 @@
 #include <bootstage.h>
 #include <asm/arch/timestamp.h>
 #include <asm/arch/sysinfo.h>
+#include <asm/u-boot-x86.h>
 #include <linux/compiler.h>
 
 struct timestamp_entry {
diff --git a/arch/x86/cpu/intel_common/mrc.c b/arch/x86/cpu/intel_common/mrc.c
index a97b0b7ceb41..eb27f8f18839 100644
--- a/arch/x86/cpu/intel_common/mrc.c
+++ b/arch/x86/cpu/intel_common/mrc.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <log.h>
 #include <syscon.h>
+#include <time.h>
 #include <asm/cpu.h>
 #include <asm/global_data.h>
 #include <asm/gpio.h>
diff --git a/arch/x86/cpu/mp_init.c b/arch/x86/cpu/mp_init.c
index 03bd71c261ab..bd656d09520f 100644
--- a/arch/x86/cpu/mp_init.c
+++ b/arch/x86/cpu/mp_init.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <qfw.h>
+#include <time.h>
 #include <asm/atomic.h>
 #include <asm/cpu.h>
 #include <asm/global_data.h>
diff --git a/arch/x86/cpu/quark/mrc.c b/arch/x86/cpu/quark/mrc.c
index 3e8c0bc28c5f..b55933ff9e55 100644
--- a/arch/x86/cpu/quark/mrc.c
+++ b/arch/x86/cpu/quark/mrc.c
@@ -34,6 +34,7 @@
 
 #include <common.h>
 #include <version.h>
+#include <asm/u-boot-x86.h>
 #include <asm/arch/mrc.h>
 #include <asm/arch/msg_port.h>
 #include "mrc_util.h"
diff --git a/arch/x86/cpu/quark/mrc_util.c b/arch/x86/cpu/quark/mrc_util.c
index b0bc59b71ef5..ce56c54279e9 100644
--- a/arch/x86/cpu/quark/mrc_util.c
+++ b/arch/x86/cpu/quark/mrc_util.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <hang.h>
+#include <asm/u-boot-x86.h>
 #include <asm/arch/device.h>
 #include <asm/arch/mrc.h>
 #include <asm/arch/msg_port.h>
diff --git a/arch/x86/cpu/quark/smc.c b/arch/x86/cpu/quark/smc.c
index b4b3e1204bd5..824fe02d754f 100644
--- a/arch/x86/cpu/quark/smc.c
+++ b/arch/x86/cpu/quark/smc.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <pci.h>
+#include <asm/u-boot-x86.h>
 #include <asm/arch/device.h>
 #include <asm/arch/mrc.h>
 #include <asm/arch/msg_port.h>
diff --git a/board/astro/mcf5373l/mcf5373l.c b/board/astro/mcf5373l/mcf5373l.c
index 3e2f79a1cf4c..cb336fca0465 100644
--- a/board/astro/mcf5373l/mcf5373l.c
+++ b/board/astro/mcf5373l/mcf5373l.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <init.h>
 #include <serial.h>
+#include <time.h>
 #include <watchdog.h>
 #include <command.h>
 #include <asm/global_data.h>
diff --git a/board/cobra5272/flash.c b/board/cobra5272/flash.c
index 4337f4879de7..9aa8f118baf5 100644
--- a/board/cobra5272/flash.c
+++ b/board/cobra5272/flash.c
@@ -9,6 +9,7 @@
 #include <cpu_func.h>
 #include <flash.h>
 #include <irq_func.h>
+#include <time.h>
 #include <uuid.h>
 #include <linux/delay.h>
 
diff --git a/board/freescale/m5253demo/flash.c b/board/freescale/m5253demo/flash.c
index 319742178168..d37ba362b6cd 100644
--- a/board/freescale/m5253demo/flash.c
+++ b/board/freescale/m5253demo/flash.c
@@ -11,6 +11,7 @@
 #include <flash.h>
 #include <init.h>
 #include <irq_func.h>
+#include <time.h>
 
 #include <asm/immap.h>
 
diff --git a/board/gdsys/common/phy.c b/board/gdsys/common/phy.c
index 516f4e8edcac..a4104a9d202d 100644
--- a/board/gdsys/common/phy.c
+++ b/board/gdsys/common/phy.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <time.h>
 
 #include <miiphy.h>
 
diff --git a/board/nokia/rx51/rx51.c b/board/nokia/rx51/rx51.c
index 65be1719c2ce..5cf6a54dc60d 100644
--- a/board/nokia/rx51/rx51.c
+++ b/board/nokia/rx51/rx51.c
@@ -24,6 +24,7 @@
 #include <common.h>
 #include <env.h>
 #include <init.h>
+#include <time.h>
 #include <watchdog.h>
 #include <malloc.h>
 #include <twl4030.h>
diff --git a/board/sandbox/sandbox.c b/board/sandbox/sandbox.c
index c78e90accbc5..b1bed64910cb 100644
--- a/board/sandbox/sandbox.c
+++ b/board/sandbox/sandbox.c
@@ -11,6 +11,7 @@
 #include <init.h>
 #include <led.h>
 #include <os.h>
+#include <time.h>
 #include <asm/global_data.h>
 #include <asm/test.h>
 #include <asm/u-boot-sandbox.h>
diff --git a/board/theadorable/fpga.c b/board/theadorable/fpga.c
index bc8379cccf6d..3a33e15eacc6 100644
--- a/board/theadorable/fpga.c
+++ b/board/theadorable/fpga.c
@@ -7,6 +7,7 @@
 #include <altera.h>
 #include <errno.h>
 #include <log.h>
+#include <time.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
diff --git a/board/theadorable/theadorable.c b/board/theadorable/theadorable.c
index 3c4133083f54..fb3d1fc42602 100644
--- a/board/theadorable/theadorable.c
+++ b/board/theadorable/theadorable.c
@@ -13,6 +13,7 @@
 #if !defined(CONFIG_SPL_BUILD)
 #include <bootcount.h>
 #endif
+#include <time.h>
 #include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
diff --git a/cmd/clone.c b/cmd/clone.c
index 97747f8f0808..ff8737e0d90e 100644
--- a/cmd/clone.c
+++ b/cmd/clone.c
@@ -9,6 +9,7 @@
 #include <malloc.h>
 #include <part.h>
 #include <blk.h>
+#include <time.h>
 #include <vsprintf.h>
 
 #define BUFSIZE (1 * 1024 * 1024)
diff --git a/cmd/gettime.c b/cmd/gettime.c
index 2e74e02b4998..ebaa45812a68 100644
--- a/cmd/gettime.c
+++ b/cmd/gettime.c
@@ -13,6 +13,7 @@
  */
 #include <common.h>
 #include <command.h>
+#include <time.h>
 
 static int do_gettime(struct cmd_tbl *cmdtp, int flag, int argc,
 		      char *const argv[])
diff --git a/cmd/mem.c b/cmd/mem.c
index aae594c5e686..e8559936984f 100644
--- a/cmd/mem.c
+++ b/cmd/mem.c
@@ -22,6 +22,7 @@
 #include <log.h>
 #include <mapmem.h>
 #include <rand.h>
+#include <time.h>
 #include <watchdog.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/cmd/misc.c b/cmd/misc.c
index 20ab943494e9..36bca24fb20b 100644
--- a/cmd/misc.c
+++ b/cmd/misc.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <command.h>
 #include <console.h>
+#include <time.h>
 #include <linux/delay.h>
 
 static int do_sleep(struct cmd_tbl *cmdtp, int flag, int argc,
diff --git a/cmd/sf.c b/cmd/sf.c
index b3ff4b5773cf..249e2eee377d 100644
--- a/cmd/sf.c
+++ b/cmd/sf.c
@@ -16,6 +16,7 @@
 #include <mapmem.h>
 #include <spi.h>
 #include <spi_flash.h>
+#include <time.h>
 #include <asm/cache.h>
 #include <jffs2/jffs2.h>
 #include <linux/mtd/mtd.h>
diff --git a/cmd/tpm_test.c b/cmd/tpm_test.c
index d7044336ff2d..fbaa1de66ee1 100644
--- a/cmd/tpm_test.c
+++ b/cmd/tpm_test.c
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <cpu_func.h>
 #include <log.h>
+#include <time.h>
 #include <tpm-v1.h>
 #include <linux/printk.h>
 #include "tpm-user-utils.h"
diff --git a/common/command.c b/common/command.c
index 6a87bb54abf6..5cadf732e96e 100644
--- a/common/command.c
+++ b/common/command.c
@@ -14,6 +14,7 @@
 #include <console.h>
 #include <env.h>
 #include <log.h>
+#include <time.h>
 #include <asm/global_data.h>
 #include <linux/ctype.h>
 
diff --git a/common/dfu.c b/common/dfu.c
index c879e8d6a8fd..75fd3e088ef0 100644
--- a/common/dfu.c
+++ b/common/dfu.c
@@ -13,6 +13,7 @@
 #include <common.h>
 #include <command.h>
 #include <log.h>
+#include <time.h>
 #include <watchdog.h>
 #include <dfu.h>
 #include <console.h>
diff --git a/common/usb_hub.c b/common/usb_hub.c
index e578f0be2846..af088bd72896 100644
--- a/common/usb_hub.c
+++ b/common/usb_hub.c
@@ -29,6 +29,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <memalign.h>
+#include <time.h>
 #include <asm/processor.h>
 #include <asm/unaligned.h>
 #include <linux/ctype.h>
diff --git a/common/usb_kbd.c b/common/usb_kbd.c
index b316807844b1..3a81a3059956 100644
--- a/common/usb_kbd.c
+++ b/common/usb_kbd.c
@@ -15,6 +15,7 @@
 #include <malloc.h>
 #include <memalign.h>
 #include <stdio_dev.h>
+#include <time.h>
 #include <watchdog.h>
 #include <asm/byteorder.h>
 
diff --git a/common/xyzModem.c b/common/xyzModem.c
index 6bf2375671d2..e8eb578f6964 100644
--- a/common/xyzModem.c
+++ b/common/xyzModem.c
@@ -22,6 +22,7 @@
  *==========================================================================
  */
 #include <common.h>
+#include <time.h>
 #include <xyzModem.h>
 #include <stdarg.h>
 #include <u-boot/crc.h>
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index 47cdea1f586a..f251ee1b74a0 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -12,6 +12,7 @@
 #include <blk.h>
 #include <cpu_func.h>
 #include <log.h>
+#include <time.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index 9021a00cdb6e..8071fe18a714 100644
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -37,6 +37,7 @@
 #include <cpu_func.h>
 #include <dm.h>
 #include <log.h>
+#include <time.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <dm/device-internal.h>
diff --git a/drivers/ddr/altera/sdram_soc64.c b/drivers/ddr/altera/sdram_soc64.c
index 40fcc8d2e0fc..66dad034fa29 100644
--- a/drivers/ddr/altera/sdram_soc64.c
+++ b/drivers/ddr/altera/sdram_soc64.c
@@ -15,6 +15,7 @@
 #include <log.h>
 #include <ram.h>
 #include <reset.h>
+#include <time.h>
 #include <asm/global_data.h>
 #include "sdram_soc64.h"
 #include <wait_bit.h>
diff --git a/drivers/dma/lpc32xx_dma.c b/drivers/dma/lpc32xx_dma.c
index 0efdfd028cfd..3fd56053faee 100644
--- a/drivers/dma/lpc32xx_dma.c
+++ b/drivers/dma/lpc32xx_dma.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <errno.h>
 #include <init.h>
+#include <time.h>
 #include <asm/arch/dma.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/clk.h>
diff --git a/drivers/fpga/ACEX1K.c b/drivers/fpga/ACEX1K.c
index 30a3727433e7..6c5097d94c72 100644
--- a/drivers/fpga/ACEX1K.c
+++ b/drivers/fpga/ACEX1K.c
@@ -10,6 +10,7 @@
 #include <common.h>		/* core U-Boot definitions */
 #include <console.h>
 #include <ACEX1K.h>		/* ACEX device family */
+#include <time.h>
 #include <linux/delay.h>
 
 /* Define FPGA_DEBUG to get debug printf's */
diff --git a/drivers/fpga/cyclon2.c b/drivers/fpga/cyclon2.c
index 3b008facb8c4..477379449ed0 100644
--- a/drivers/fpga/cyclon2.c
+++ b/drivers/fpga/cyclon2.c
@@ -8,6 +8,7 @@
 #include <common.h>		/* core U-Boot definitions */
 #include <altera.h>
 #include <ACEX1K.h>		/* ACEX device family */
+#include <time.h>
 #include <linux/delay.h>
 
 /* Define FPGA_DEBUG to get debug printf's */
diff --git a/drivers/fpga/socfpga_arria10.c b/drivers/fpga/socfpga_arria10.c
index 4bea7fd900d8..e0674b8beba5 100644
--- a/drivers/fpga/socfpga_arria10.c
+++ b/drivers/fpga/socfpga_arria10.c
@@ -4,6 +4,7 @@
  */
 #include <image.h>
 #include <log.h>
+#include <time.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/fpga_manager.h>
diff --git a/drivers/fpga/spartan2.c b/drivers/fpga/spartan2.c
index fae94f9663ab..355104f77d93 100644
--- a/drivers/fpga/spartan2.c
+++ b/drivers/fpga/spartan2.c
@@ -6,6 +6,7 @@
 
 #include <common.h>		/* core U-Boot definitions */
 #include <spartan2.h>		/* Spartan-II device family */
+#include <time.h>
 
 /* Define FPGA_DEBUG to get debug printf's */
 #ifdef	FPGA_DEBUG
diff --git a/drivers/fpga/spartan3.c b/drivers/fpga/spartan3.c
index e40e427a25fe..95a361b0e861 100644
--- a/drivers/fpga/spartan3.c
+++ b/drivers/fpga/spartan3.c
@@ -11,6 +11,7 @@
 
 #include <common.h>		/* core U-Boot definitions */
 #include <spartan3.h>		/* Spartan-II device family */
+#include <time.h>
 
 /* Define FPGA_DEBUG to get debug printf's */
 #ifdef	FPGA_DEBUG
diff --git a/drivers/fpga/stratix10.c b/drivers/fpga/stratix10.c
index da8fa315e366..bae31c3db1ee 100644
--- a/drivers/fpga/stratix10.c
+++ b/drivers/fpga/stratix10.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <altera.h>
 #include <log.h>
+#include <time.h>
 #include <asm/arch/mailbox_s10.h>
 #include <linux/delay.h>
 
diff --git a/drivers/fpga/virtex2.c b/drivers/fpga/virtex2.c
index b3e0537bab07..aae9250f1980 100644
--- a/drivers/fpga/virtex2.c
+++ b/drivers/fpga/virtex2.c
@@ -14,6 +14,7 @@
 
 #include <common.h>
 #include <console.h>
+#include <time.h>
 #include <virtex2.h>
 #include <linux/delay.h>
 
diff --git a/drivers/fpga/zynqpl.c b/drivers/fpga/zynqpl.c
index a11e48552534..86df6fa32d4f 100644
--- a/drivers/fpga/zynqpl.c
+++ b/drivers/fpga/zynqpl.c
@@ -10,6 +10,7 @@
 #include <console.h>
 #include <cpu_func.h>
 #include <log.h>
+#include <time.h>
 #include <asm/cache.h>
 #include <asm/io.h>
 #include <fs.h>
diff --git a/drivers/hwspinlock/hwspinlock-uclass.c b/drivers/hwspinlock/hwspinlock-uclass.c
index fdc90c3f0e0a..6100fdfd0a5c 100644
--- a/drivers/hwspinlock/hwspinlock-uclass.c
+++ b/drivers/hwspinlock/hwspinlock-uclass.c
@@ -8,6 +8,7 @@
 #include <errno.h>
 #include <hwspinlock.h>
 #include <log.h>
+#include <time.h>
 #include <asm/global_data.h>
 #include <dm/device-internal.h>
 #include <dm/device_compat.h>
diff --git a/drivers/i2c/at91_i2c.c b/drivers/i2c/at91_i2c.c
index ee5dc1db96c1..57fbb0ce2620 100644
--- a/drivers/i2c/at91_i2c.c
+++ b/drivers/i2c/at91_i2c.c
@@ -6,6 +6,7 @@
  */
 
 #include <malloc.h>
+#include <time.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <common.h>
diff --git a/drivers/i2c/designware_i2c.c b/drivers/i2c/designware_i2c.c
index cf892c69d9f3..6cd5d517de77 100644
--- a/drivers/i2c/designware_i2c.c
+++ b/drivers/i2c/designware_i2c.c
@@ -12,6 +12,7 @@
 #include <malloc.h>
 #include <pci.h>
 #include <reset.h>
+#include <time.h>
 #include <asm/io.h>
 #include <linux/delay.h>
 #include "designware_i2c.h"
diff --git a/drivers/i2c/i2c-cortina.c b/drivers/i2c/i2c-cortina.c
index 036fc4282b53..4129d6a68884 100644
--- a/drivers/i2c/i2c-cortina.c
+++ b/drivers/i2c/i2c-cortina.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <i2c.h>
 #include <log.h>
+#include <time.h>
 #include <asm/io.h>
 #include <dm.h>
 #include <mapmem.h>
diff --git a/drivers/i2c/imx_lpi2c.c b/drivers/i2c/imx_lpi2c.c
index feeed1e9a2f9..b02f3883b0d1 100644
--- a/drivers/i2c/imx_lpi2c.c
+++ b/drivers/i2c/imx_lpi2c.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <errno.h>
 #include <log.h>
+#include <time.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
diff --git a/drivers/i2c/intel_i2c.c b/drivers/i2c/intel_i2c.c
index 3b79cb40cd3c..a7ac09a27e5c 100644
--- a/drivers/i2c/intel_i2c.c
+++ b/drivers/i2c/intel_i2c.c
@@ -12,6 +12,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <pci.h>
+#include <time.h>
 #include <asm/io.h>
 
 /* PCI Configuration Space (D31:F3): SMBus */
diff --git a/drivers/i2c/meson_i2c.c b/drivers/i2c/meson_i2c.c
index e070caf43f2a..b133aa1175ea 100644
--- a/drivers/i2c/meson_i2c.c
+++ b/drivers/i2c/meson_i2c.c
@@ -4,6 +4,7 @@
  */
 #include <common.h>
 #include <log.h>
+#include <time.h>
 #include <asm/io.h>
 #include <clk.h>
 #include <dm.h>
diff --git a/drivers/i2c/muxes/i2c-arb-gpio-challenge.c b/drivers/i2c/muxes/i2c-arb-gpio-challenge.c
index 4be32a1b38ce..567660f9a747 100644
--- a/drivers/i2c/muxes/i2c-arb-gpio-challenge.c
+++ b/drivers/i2c/muxes/i2c-arb-gpio-challenge.c
@@ -10,6 +10,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <malloc.h>
+#include <time.h>
 #include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <linux/delay.h>
diff --git a/drivers/i2c/mxc_i2c.c b/drivers/i2c/mxc_i2c.c
index c1204815c20e..e4e504363798 100644
--- a/drivers/i2c/mxc_i2c.c
+++ b/drivers/i2c/mxc_i2c.c
@@ -16,6 +16,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <time.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/global_data.h>
diff --git a/drivers/i2c/nx_i2c.c b/drivers/i2c/nx_i2c.c
index ca14a0ecac71..af58c2c76efa 100644
--- a/drivers/i2c/nx_i2c.c
+++ b/drivers/i2c/nx_i2c.c
@@ -3,6 +3,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <log.h>
+#include <time.h>
 #include <asm/arch/nexell.h>
 #include <asm/arch/reset.h>
 #include <asm/arch/clk.h>
diff --git a/drivers/i2c/octeon_i2c.c b/drivers/i2c/octeon_i2c.c
index c11d6ff93d17..ef04ae5698a2 100644
--- a/drivers/i2c/octeon_i2c.c
+++ b/drivers/i2c/octeon_i2c.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <pci_ids.h>
+#include <time.h>
 #include <asm/io.h>
 #include <linux/bitfield.h>
 #include <linux/compat.h>
diff --git a/drivers/i2c/rk_i2c.c b/drivers/i2c/rk_i2c.c
index 659461088b73..81d8e1eb11d4 100644
--- a/drivers/i2c/rk_i2c.c
+++ b/drivers/i2c/rk_i2c.c
@@ -12,6 +12,7 @@
 #include <errno.h>
 #include <i2c.h>
 #include <log.h>
+#include <time.h>
 #include <asm/io.h>
 #include <asm/arch-rockchip/clock.h>
 #include <asm/arch-rockchip/i2c.h>
diff --git a/drivers/i2c/s3c24x0_i2c.c b/drivers/i2c/s3c24x0_i2c.c
index 43699fc24108..0fe92fe2357b 100644
--- a/drivers/i2c/s3c24x0_i2c.c
+++ b/drivers/i2c/s3c24x0_i2c.c
@@ -16,6 +16,7 @@
 #else
 #include <asm/arch/s3c24x0_cpu.h>
 #endif
+#include <time.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <i2c.h>
diff --git a/drivers/i2c/stm32f7_i2c.c b/drivers/i2c/stm32f7_i2c.c
index 6c2fff1c52bf..fc60f5285aba 100644
--- a/drivers/i2c/stm32f7_i2c.c
+++ b/drivers/i2c/stm32f7_i2c.c
@@ -11,6 +11,7 @@
 #include <regmap.h>
 #include <reset.h>
 #include <syscon.h>
+#include <time.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/printk.h>
diff --git a/drivers/input/input.c b/drivers/input/input.c
index da264f4166ea..24e76052b88f 100644
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -17,6 +17,7 @@
 #ifdef CONFIG_DM_KEYBOARD
 #include <keyboard.h>
 #endif
+#include <time.h>
 #include <linux/input.h>
 
 enum {
diff --git a/drivers/input/tegra-kbc.c b/drivers/input/tegra-kbc.c
index f07a51dc3076..74ece4762e3c 100644
--- a/drivers/input/tegra-kbc.c
+++ b/drivers/input/tegra-kbc.c
@@ -13,6 +13,7 @@
 #include <log.h>
 #include <stdio_dev.h>
 #include <tegra-kbc.h>
+#include <time.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/funcmux.h>
diff --git a/drivers/misc/cros_ec.c b/drivers/misc/cros_ec.c
index a5534b16673b..ccac7a60c129 100644
--- a/drivers/misc/cros_ec.c
+++ b/drivers/misc/cros_ec.c
@@ -25,6 +25,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <spi.h>
+#include <time.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/io.h>
diff --git a/drivers/misc/cros_ec_lpc.c b/drivers/misc/cros_ec_lpc.c
index 4ad6c8ca66d2..0a4f45b2e89b 100644
--- a/drivers/misc/cros_ec_lpc.c
+++ b/drivers/misc/cros_ec_lpc.c
@@ -17,6 +17,7 @@
 #include <command.h>
 #include <cros_ec.h>
 #include <log.h>
+#include <time.h>
 #include <asm/io.h>
 
 #ifdef DEBUG_TRACE
diff --git a/drivers/misc/cros_ec_sandbox.c b/drivers/misc/cros_ec_sandbox.c
index a191f061b898..8575e56a3371 100644
--- a/drivers/misc/cros_ec_sandbox.c
+++ b/drivers/misc/cros_ec_sandbox.c
@@ -13,6 +13,7 @@
 #include <hash.h>
 #include <log.h>
 #include <os.h>
+#include <time.h>
 #include <u-boot/sha256.h>
 #include <spi.h>
 #include <asm/malloc.h>
diff --git a/drivers/misc/cros_ec_spi.c b/drivers/misc/cros_ec_spi.c
index 153f971bdebe..d8778eeb3874 100644
--- a/drivers/misc/cros_ec_spi.c
+++ b/drivers/misc/cros_ec_spi.c
@@ -18,6 +18,7 @@
 #include <errno.h>
 #include <log.h>
 #include <spi.h>
+#include <time.h>
 
 int cros_ec_spi_packet(struct udevice *udev, int out_bytes, int in_bytes)
 {
diff --git a/drivers/mmc/am654_sdhci.c b/drivers/mmc/am654_sdhci.c
index 82abf484e4f7..d9e991355b7f 100644
--- a/drivers/mmc/am654_sdhci.c
+++ b/drivers/mmc/am654_sdhci.c
@@ -12,6 +12,7 @@
 #include <power-domain.h>
 #include <regmap.h>
 #include <sdhci.h>
+#include <time.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/err.h>
diff --git a/drivers/mmc/bcm2835_sdhost.c b/drivers/mmc/bcm2835_sdhost.c
index b793028ab53e..a138165855d4 100644
--- a/drivers/mmc/bcm2835_sdhost.c
+++ b/drivers/mmc/bcm2835_sdhost.c
@@ -33,6 +33,7 @@
 #include <common.h>
 #include <dm.h>
 #include <mmc.h>
+#include <time.h>
 #include <asm/arch/msg.h>
 #include <asm/arch/mbox.h>
 #include <asm/unaligned.h>
diff --git a/drivers/mmc/dw_mmc.c b/drivers/mmc/dw_mmc.c
index 7702f4be3f89..ce7cfb5930e5 100644
--- a/drivers/mmc/dw_mmc.c
+++ b/drivers/mmc/dw_mmc.c
@@ -14,6 +14,7 @@
 #include <memalign.h>
 #include <mmc.h>
 #include <dwmmc.h>
+#include <time.h>
 #include <wait_bit.h>
 #include <asm/cache.h>
 #include <linux/delay.h>
diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c
index 0f9109a2c690..058ba8279408 100644
--- a/drivers/mmc/fsl_esdhc.c
+++ b/drivers/mmc/fsl_esdhc.c
@@ -20,6 +20,7 @@
 #include <malloc.h>
 #include <fsl_esdhc.h>
 #include <fdt_support.h>
+#include <time.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/mmc/fsl_esdhc_imx.c b/drivers/mmc/fsl_esdhc_imx.c
index e5ef0bcf6608..c9f0c2528e63 100644
--- a/drivers/mmc/fsl_esdhc_imx.c
+++ b/drivers/mmc/fsl_esdhc_imx.c
@@ -20,6 +20,7 @@
 #include <log.h>
 #include <mmc.h>
 #include <part.h>
+#include <time.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <dm/device_compat.h>
diff --git a/drivers/mmc/ftsdc010_mci.c b/drivers/mmc/ftsdc010_mci.c
index 71818f964d37..113ed2b7a71b 100644
--- a/drivers/mmc/ftsdc010_mci.c
+++ b/drivers/mmc/ftsdc010_mci.c
@@ -15,6 +15,7 @@
 #include <malloc.h>
 #include <part.h>
 #include <mmc.h>
+#include <time.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/io.h>
diff --git a/drivers/mmc/meson_gx_mmc.c b/drivers/mmc/meson_gx_mmc.c
index 719dd1e5e570..f70ced37d314 100644
--- a/drivers/mmc/meson_gx_mmc.c
+++ b/drivers/mmc/meson_gx_mmc.c
@@ -11,6 +11,7 @@
 #include <malloc.h>
 #include <pwrseq.h>
 #include <mmc.h>
+#include <time.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
 #include <asm/arch/sd_emmc.h>
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index 2899986fcf15..544534a78a71 100644
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@ -13,6 +13,7 @@
 #include <command.h>
 #include <dm.h>
 #include <log.h>
+#include <time.h>
 #include <dm/device-internal.h>
 #include <errno.h>
 #include <mmc.h>
diff --git a/drivers/mmc/mvebu_mmc.c b/drivers/mmc/mvebu_mmc.c
index 8ec1f57a1b70..8101f6bcc277 100644
--- a/drivers/mmc/mvebu_mmc.c
+++ b/drivers/mmc/mvebu_mmc.c
@@ -13,6 +13,7 @@
 #include <malloc.h>
 #include <part.h>
 #include <mmc.h>
+#include <time.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
diff --git a/drivers/mmc/omap_hsmmc.c b/drivers/mmc/omap_hsmmc.c
index c5e575286606..c54edd9c8d1f 100644
--- a/drivers/mmc/omap_hsmmc.c
+++ b/drivers/mmc/omap_hsmmc.c
@@ -34,6 +34,7 @@
 #if defined(CONFIG_OMAP54XX) || defined(CONFIG_OMAP44XX)
 #include <palmas.h>
 #endif
+#include <time.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c
index f8da69e95894..94901e6d6b7d 100644
--- a/drivers/mmc/sdhci.c
+++ b/drivers/mmc/sdhci.c
@@ -15,6 +15,7 @@
 #include <malloc.h>
 #include <mmc.h>
 #include <sdhci.h>
+#include <time.h>
 #include <asm/cache.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/drivers/mmc/sunxi_mmc.c b/drivers/mmc/sunxi_mmc.c
index 0e03b07ce555..f90463059304 100644
--- a/drivers/mmc/sunxi_mmc.c
+++ b/drivers/mmc/sunxi_mmc.c
@@ -15,6 +15,7 @@
 #include <mmc.h>
 #include <clk.h>
 #include <reset.h>
+#include <time.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/cpu.h>
diff --git a/drivers/mmc/tegra_mmc.c b/drivers/mmc/tegra_mmc.c
index cc78a2f2f08e..94e062c12464 100644
--- a/drivers/mmc/tegra_mmc.c
+++ b/drivers/mmc/tegra_mmc.c
@@ -12,6 +12,7 @@
 #include <errno.h>
 #include <log.h>
 #include <mmc.h>
+#include <time.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <asm/arch-tegra/tegra_mmc.h>
diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c
index feb46d8cf28f..74cf47b76372 100644
--- a/drivers/mtd/cfi_flash.c
+++ b/drivers/mtd/cfi_flash.c
@@ -26,6 +26,7 @@
 #include <init.h>
 #include <irq_func.h>
 #include <log.h>
+#include <time.h>
 #include <asm/global_data.h>
 #include <asm/processor.h>
 #include <asm/io.h>
diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand.c b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
index 48c0ca69de55..a57013e72c47 100644
--- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c
+++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
@@ -13,6 +13,7 @@
  */
 
 #include <common.h>
+#include <time.h>
 #include <asm/io.h>
 #include <memalign.h>
 #include <nand.h>
diff --git a/drivers/mtd/nand/raw/fsl_elbc_nand.c b/drivers/mtd/nand/raw/fsl_elbc_nand.c
index 0c1bd7b4740a..32ee212694a5 100644
--- a/drivers/mtd/nand/raw/fsl_elbc_nand.c
+++ b/drivers/mtd/nand/raw/fsl_elbc_nand.c
@@ -11,6 +11,7 @@
 #include <command.h>
 #include <malloc.h>
 #include <nand.h>
+#include <time.h>
 #include <dm/devres.h>
 
 #include <linux/mtd/mtd.h>
diff --git a/drivers/mtd/nand/raw/fsl_ifc_nand.c b/drivers/mtd/nand/raw/fsl_ifc_nand.c
index cf20238782c6..964a329023d4 100644
--- a/drivers/mtd/nand/raw/fsl_ifc_nand.c
+++ b/drivers/mtd/nand/raw/fsl_ifc_nand.c
@@ -10,6 +10,7 @@
 #include <command.h>
 #include <malloc.h>
 #include <nand.h>
+#include <time.h>
 #include <dm/devres.h>
 
 #include <linux/mtd/mtd.h>
diff --git a/drivers/mtd/nand/raw/fsmc_nand.c b/drivers/mtd/nand/raw/fsmc_nand.c
index 1f4c74f0f631..ad34af30e812 100644
--- a/drivers/mtd/nand/raw/fsmc_nand.c
+++ b/drivers/mtd/nand/raw/fsmc_nand.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <nand.h>
+#include <time.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/err.h>
diff --git a/drivers/mtd/nand/raw/mxs_nand_spl.c b/drivers/mtd/nand/raw/mxs_nand_spl.c
index 46dc29df3690..ee778e13aa13 100644
--- a/drivers/mtd/nand/raw/mxs_nand_spl.c
+++ b/drivers/mtd/nand/raw/mxs_nand_spl.c
@@ -9,6 +9,7 @@
 #include <nand.h>
 #include <malloc.h>
 #include <mxs_nand.h>
+#include <time.h>
 #include <asm/cache.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/drivers/mtd/nand/raw/nand_base.c b/drivers/mtd/nand/raw/nand_base.c
index 7cd1e133c22a..693e088f19ad 100644
--- a/drivers/mtd/nand/raw/nand_base.c
+++ b/drivers/mtd/nand/raw/nand_base.c
@@ -34,6 +34,7 @@
 #endif
 #include <log.h>
 #include <malloc.h>
+#include <time.h>
 #include <watchdog.h>
 #include <asm/global_data.h>
 #include <dm/devres.h>
diff --git a/drivers/mtd/nand/raw/pxa3xx_nand.c b/drivers/mtd/nand/raw/pxa3xx_nand.c
index 224db72087b4..bccaa2d82128 100644
--- a/drivers/mtd/nand/raw/pxa3xx_nand.c
+++ b/drivers/mtd/nand/raw/pxa3xx_nand.c
@@ -10,6 +10,7 @@
 #include <malloc.h>
 #include <fdtdec.h>
 #include <nand.h>
+#include <time.h>
 #include <asm/global_data.h>
 #include <dm/device_compat.h>
 #include <dm/devres.h>
diff --git a/drivers/mtd/nand/raw/sunxi_nand.c b/drivers/mtd/nand/raw/sunxi_nand.c
index 2946f94b6df3..606e606fe8b6 100644
--- a/drivers/mtd/nand/raw/sunxi_nand.c
+++ b/drivers/mtd/nand/raw/sunxi_nand.c
@@ -29,6 +29,7 @@
 #include <malloc.h>
 #include <memalign.h>
 #include <nand.h>
+#include <time.h>
 #include <asm/global_data.h>
 #include <dm/device_compat.h>
 #include <dm/devres.h>
diff --git a/drivers/mtd/nand/raw/vf610_nfc.c b/drivers/mtd/nand/raw/vf610_nfc.c
index bee273b1a644..02ca385ed2d4 100644
--- a/drivers/mtd/nand/raw/vf610_nfc.c
+++ b/drivers/mtd/nand/raw/vf610_nfc.c
@@ -23,6 +23,7 @@
 
 #include <common.h>
 #include <malloc.h>
+#include <time.h>
 #include <dm/device_compat.h>
 #include <linux/printk.h>
 
diff --git a/drivers/mtd/nand/spi/core.c b/drivers/mtd/nand/spi/core.c
index 63248f648a1b..ae8932d377cd 100644
--- a/drivers/mtd/nand/spi/core.c
+++ b/drivers/mtd/nand/spi/core.c
@@ -24,6 +24,7 @@
 #include <errno.h>
 #include <spi.h>
 #include <spi-mem.h>
+#include <time.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 ad9b61f396f3..cfc137c6b956 100644
--- a/drivers/mtd/onenand/onenand_base.c
+++ b/drivers/mtd/onenand/onenand_base.c
@@ -21,6 +21,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <time.h>
 #include <watchdog.h>
 #include <dm/devres.h>
 #include <linux/bitops.h>
diff --git a/drivers/mtd/spi/sf_dataflash.c b/drivers/mtd/spi/sf_dataflash.c
index b1034ac2086b..c292ddfb893f 100644
--- a/drivers/mtd/spi/sf_dataflash.c
+++ b/drivers/mtd/spi/sf_dataflash.c
@@ -16,6 +16,7 @@
 #include <spi.h>
 #include <spi_flash.h>
 #include <div64.h>
+#include <time.h>
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/math64.h>
diff --git a/drivers/mtd/spi/spi-nor-core.c b/drivers/mtd/spi/spi-nor-core.c
index 4ac2b09f4dd3..3537fa6aaf78 100644
--- a/drivers/mtd/spi/spi-nor-core.c
+++ b/drivers/mtd/spi/spi-nor-core.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <display_options.h>
 #include <log.h>
+#include <time.h>
 #include <dm/device_compat.h>
 #include <dm/devres.h>
 #include <linux/bitops.h>
diff --git a/drivers/mtd/spi/spi-nor-tiny.c b/drivers/mtd/spi/spi-nor-tiny.c
index 0fd986bf9bf3..54f6d773f0fd 100644
--- a/drivers/mtd/spi/spi-nor-tiny.c
+++ b/drivers/mtd/spi/spi-nor-tiny.c
@@ -11,6 +11,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <time.h>
 #include <dm/device_compat.h>
 #include <linux/err.h>
 #include <linux/errno.h>
diff --git a/drivers/mtd/st_smi.c b/drivers/mtd/st_smi.c
index 7c652e6c5351..970c6ee70432 100644
--- a/drivers/mtd/st_smi.c
+++ b/drivers/mtd/st_smi.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <flash.h>
+#include <time.h>
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/mtd/st_smi.h>
diff --git a/drivers/net/ag7xxx.c b/drivers/net/ag7xxx.c
index c7ea60f5acc2..48cf45d9a8f9 100644
--- a/drivers/net/ag7xxx.c
+++ b/drivers/net/ag7xxx.c
@@ -15,6 +15,7 @@
 #include <miiphy.h>
 #include <malloc.h>
 #include <net.h>
+#include <time.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
diff --git a/drivers/net/altera_tse.c b/drivers/net/altera_tse.c
index 2097718057bd..8b4ab9627c3b 100644
--- a/drivers/net/altera_tse.c
+++ b/drivers/net/altera_tse.c
@@ -17,6 +17,7 @@
 #include <memalign.h>
 #include <miiphy.h>
 #include <net.h>
+#include <time.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <linux/dma-mapping.h>
diff --git a/drivers/net/cs8900.c b/drivers/net/cs8900.c
index 9440a91882f9..d58ae075830c 100644
--- a/drivers/net/cs8900.c
+++ b/drivers/net/cs8900.c
@@ -26,6 +26,7 @@
 #include <common.h>
 #include <command.h>
 #include <log.h>
+#include <time.h>
 #include <asm/io.h>
 #include <net.h>
 #include <malloc.h>
diff --git a/drivers/net/designware.c b/drivers/net/designware.c
index 0ab1a12d762e..c2f3a6483ddc 100644
--- a/drivers/net/designware.c
+++ b/drivers/net/designware.c
@@ -19,6 +19,7 @@
 #include <net.h>
 #include <pci.h>
 #include <reset.h>
+#include <time.h>
 #include <asm/cache.h>
 #include <dm/device_compat.h>
 #include <dm/devres.h>
diff --git a/drivers/net/dm9000x.c b/drivers/net/dm9000x.c
index e46a269af909..3ff3824d52f0 100644
--- a/drivers/net/dm9000x.c
+++ b/drivers/net/dm9000x.c
@@ -52,6 +52,7 @@ TODO: external MII is not functional, only internal at the moment.
 #include <common.h>
 #include <command.h>
 #include <net.h>
+#include <time.h>
 #include <asm/io.h>
 #include <dm9000.h>
 #include <linux/delay.h>
diff --git a/drivers/net/ethoc.c b/drivers/net/ethoc.c
index b9d80a5b08a4..a93358af1a71 100644
--- a/drivers/net/ethoc.c
+++ b/drivers/net/ethoc.c
@@ -13,6 +13,7 @@
 #include <cpu_func.h>
 #include <dm.h>
 #include <log.h>
+#include <time.h>
 #include <dm/platform_data/net_ethoc.h>
 #include <linux/io.h>
 #include <malloc.h>
diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c
index 468be69886ca..c0fc3133afb4 100644
--- a/drivers/net/fec_mxc.c
+++ b/drivers/net/fec_mxc.c
@@ -17,6 +17,7 @@
 #include <miiphy.h>
 #include <net.h>
 #include <netdev.h>
+#include <time.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
diff --git a/drivers/net/ftmac100.c b/drivers/net/ftmac100.c
index d45f17eb8dda..4b94fd6405a0 100644
--- a/drivers/net/ftmac100.c
+++ b/drivers/net/ftmac100.c
@@ -12,6 +12,7 @@
 #include <env.h>
 #include <malloc.h>
 #include <net.h>
+#include <time.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/io.h>
diff --git a/drivers/net/ftmac110.c b/drivers/net/ftmac110.c
index 265d813c4f89..d4a92a70e733 100644
--- a/drivers/net/ftmac110.c
+++ b/drivers/net/ftmac110.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <net.h>
+#include <time.h>
 #include <asm/cache.h>
 #include <linux/errno.h>
 #include <asm/io.h>
diff --git a/drivers/net/lan91c96.c b/drivers/net/lan91c96.c
index 470c68467cde..ce3c406ea6c2 100644
--- a/drivers/net/lan91c96.c
+++ b/drivers/net/lan91c96.c
@@ -48,6 +48,7 @@
 #include <command.h>
 #include <env.h>
 #include <malloc.h>
+#include <time.h>
 #include <linux/delay.h>
 #include "lan91c96.h"
 #include <net.h>
diff --git a/drivers/net/ldpaa_eth/ldpaa_eth.c b/drivers/net/ldpaa_eth/ldpaa_eth.c
index b340c5761087..bbd2aed0ab24 100644
--- a/drivers/net/ldpaa_eth/ldpaa_eth.c
+++ b/drivers/net/ldpaa_eth/ldpaa_eth.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <log.h>
+#include <time.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/types.h>
diff --git a/drivers/net/mtk_eth.c b/drivers/net/mtk_eth.c
index 24a18ce96876..774c1e3bb51f 100644
--- a/drivers/net/mtk_eth.c
+++ b/drivers/net/mtk_eth.c
@@ -16,6 +16,7 @@
 #include <regmap.h>
 #include <reset.h>
 #include <syscon.h>
+#include <time.h>
 #include <wait_bit.h>
 #include <asm/cache.h>
 #include <asm/gpio.h>
diff --git a/drivers/net/ne2000_base.c b/drivers/net/ne2000_base.c
index 09cc8398003b..25c258dd3f75 100644
--- a/drivers/net/ne2000_base.c
+++ b/drivers/net/ne2000_base.c
@@ -78,6 +78,7 @@ Add SNMP
 #include <log.h>
 #include <net.h>
 #include <malloc.h>
+#include <time.h>
 #include <linux/compiler.h>
 
 /* forward definition of function used for the uboot interface */
diff --git a/drivers/net/pch_gbe.c b/drivers/net/pch_gbe.c
index 1daafbe2b9bd..20d757f5dff0 100644
--- a/drivers/net/pch_gbe.c
+++ b/drivers/net/pch_gbe.c
@@ -11,6 +11,7 @@
 #include <errno.h>
 #include <log.h>
 #include <malloc.h>
+#include <time.h>
 #include <asm/io.h>
 #include <pci.h>
 #include <miiphy.h>
diff --git a/drivers/net/ravb.c b/drivers/net/ravb.c
index 23d5c88a88d3..6ab56e6e6538 100644
--- a/drivers/net/ravb.c
+++ b/drivers/net/ravb.c
@@ -16,6 +16,7 @@
 #include <log.h>
 #include <miiphy.h>
 #include <malloc.h>
+#include <time.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
diff --git a/drivers/net/rtl8169.c b/drivers/net/rtl8169.c
index 3f6805791f46..5ff99273a02c 100644
--- a/drivers/net/rtl8169.c
+++ b/drivers/net/rtl8169.c
@@ -50,6 +50,7 @@
 #ifndef CONFIG_DM_ETH
 #include <netdev.h>
 #endif
+#include <time.h>
 #include <asm/cache.h>
 #include <asm/io.h>
 #include <pci.h>
diff --git a/drivers/net/sandbox.c b/drivers/net/sandbox.c
index 51d80f549673..555d9147d11e 100644
--- a/drivers/net/sandbox.c
+++ b/drivers/net/sandbox.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <net.h>
+#include <time.h>
 #include <asm/eth.h>
 #include <asm/global_data.h>
 #include <asm/test.h>
diff --git a/drivers/net/smc91111.c b/drivers/net/smc91111.c
index fea6ba8caaa1..3ae9f805a790 100644
--- a/drivers/net/smc91111.c
+++ b/drivers/net/smc91111.c
@@ -51,6 +51,7 @@
 #include <command.h>
 #include <config.h>
 #include <malloc.h>
+#include <time.h>
 #include <linux/delay.h>
 #include "smc91111.h"
 #include <net.h>
diff --git a/drivers/net/sun8i_emac.c b/drivers/net/sun8i_emac.c
index a65700020d58..e74cfa993247 100644
--- a/drivers/net/sun8i_emac.c
+++ b/drivers/net/sun8i_emac.c
@@ -12,6 +12,7 @@
 
 #include <cpu_func.h>
 #include <log.h>
+#include <time.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/net/xilinx_emaclite.c b/drivers/net/xilinx_emaclite.c
index 9f2327b92cd8..321429090f62 100644
--- a/drivers/net/xilinx_emaclite.c
+++ b/drivers/net/xilinx_emaclite.c
@@ -13,6 +13,7 @@
 #include <dm.h>
 #include <console.h>
 #include <malloc.h>
+#include <time.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <phy.h>
diff --git a/drivers/pci/pci_rom.c b/drivers/pci/pci_rom.c
index 39284badf202..c69919faafe0 100644
--- a/drivers/pci/pci_rom.c
+++ b/drivers/pci/pci_rom.c
@@ -34,6 +34,7 @@
 #include <malloc.h>
 #include <pci.h>
 #include <pci_rom.h>
+#include <time.h>
 #include <vbe.h>
 #include <video.h>
 #include <video_fb.h>
diff --git a/drivers/pci/pci_tegra.c b/drivers/pci/pci_tegra.c
index d15fabd92260..abd4e26543be 100644
--- a/drivers/pci/pci_tegra.c
+++ b/drivers/pci/pci_tegra.c
@@ -21,6 +21,7 @@
 #include <pci_tegra.h>
 #include <power-domain.h>
 #include <reset.h>
+#include <time.h>
 #include <linux/delay.h>
 #include <linux/printk.h>
 
diff --git a/drivers/pci/pcie_dw_mvebu.c b/drivers/pci/pcie_dw_mvebu.c
index 33ecd25f848f..dbc8bb81a7cd 100644
--- a/drivers/pci/pcie_dw_mvebu.c
+++ b/drivers/pci/pcie_dw_mvebu.c
@@ -14,6 +14,7 @@
 #include <dm.h>
 #include <log.h>
 #include <pci.h>
+#include <time.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm-generic/gpio.h>
diff --git a/drivers/pci/pcie_dw_ti.c b/drivers/pci/pcie_dw_ti.c
index 16b2a2da7e7d..eed5e4289724 100644
--- a/drivers/pci/pcie_dw_ti.c
+++ b/drivers/pci/pcie_dw_ti.c
@@ -11,6 +11,7 @@
 #include <power-domain.h>
 #include <regmap.h>
 #include <syscon.h>
+#include <time.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm-generic/gpio.h>
diff --git a/drivers/phy/phy-da8xx-usb.c b/drivers/phy/phy-da8xx-usb.c
index d025188eae98..ec87d3fea2d0 100644
--- a/drivers/phy/phy-da8xx-usb.c
+++ b/drivers/phy/phy-da8xx-usb.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <time.h>
 #include <dm/device-internal.h>
 #include <dm/lists.h>
 #include <asm/arch/hardware.h>
diff --git a/drivers/power/exynos-tmu.c b/drivers/power/exynos-tmu.c
index 4fba7b527c6b..bc8724882153 100644
--- a/drivers/power/exynos-tmu.c
+++ b/drivers/power/exynos-tmu.c
@@ -21,6 +21,7 @@
 #include <errno.h>
 #include <fdtdec.h>
 #include <log.h>
+#include <time.h>
 #include <tmu.h>
 #include <asm/arch/tmu.h>
 #include <asm/arch/power.h>
diff --git a/drivers/power/regulator/tps65090_regulator.c b/drivers/power/regulator/tps65090_regulator.c
index 9e45627a7424..74403a5a8944 100644
--- a/drivers/power/regulator/tps65090_regulator.c
+++ b/drivers/power/regulator/tps65090_regulator.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
+#include <time.h>
 #include <linux/delay.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/ram/rockchip/dmc-rk3368.c b/drivers/ram/rockchip/dmc-rk3368.c
index 41773893fd7c..faf291e5763f 100644
--- a/drivers/ram/rockchip/dmc-rk3368.c
+++ b/drivers/ram/rockchip/dmc-rk3368.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <hang.h>
 #include <log.h>
+#include <time.h>
 #include <dt-bindings/memory/rk3368-dmc.h>
 #include <dt-structs.h>
 #include <ram.h>
diff --git a/drivers/ram/stm32mp1/stm32mp1_interactive.c b/drivers/ram/stm32mp1/stm32mp1_interactive.c
index 7b29c368126b..d3b8b3b5afa5 100644
--- a/drivers/ram/stm32mp1/stm32mp1_interactive.c
+++ b/drivers/ram/stm32mp1/stm32mp1_interactive.c
@@ -12,6 +12,7 @@
 #include <malloc.h>
 #include <ram.h>
 #include <reset.h>
+#include <time.h>
 #include <asm/global_data.h>
 #include "stm32mp1_ddr.h"
 #include "stm32mp1_tests.h"
diff --git a/drivers/rng/sandbox_rng.c b/drivers/rng/sandbox_rng.c
index cc5e1f6e25b6..a55e552177a6 100644
--- a/drivers/rng/sandbox_rng.c
+++ b/drivers/rng/sandbox_rng.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <rand.h>
 #include <rng.h>
+#include <time.h>
 
 #include <linux/string.h>
 
diff --git a/drivers/rtc/rv3029.c b/drivers/rtc/rv3029.c
index 3afe5b2fdd67..188560d3d459 100644
--- a/drivers/rtc/rv3029.c
+++ b/drivers/rtc/rv3029.c
@@ -14,6 +14,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <rtc.h>
+#include <time.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/drivers/sound/samsung-i2s.c b/drivers/sound/samsung-i2s.c
index aa1d6bb209bb..24e124e8083b 100644
--- a/drivers/sound/samsung-i2s.c
+++ b/drivers/sound/samsung-i2s.c
@@ -9,6 +9,7 @@
 #include <i2s.h>
 #include <log.h>
 #include <sound.h>
+#include <time.h>
 #include <asm/arch/clk.h>
 #include <asm/arch/pinmux.h>
 #include <asm/arch/i2s-regs.h>
diff --git a/drivers/sound/tegra_ahub.c b/drivers/sound/tegra_ahub.c
index 26d457255c94..2fead1aeffda 100644
--- a/drivers/sound/tegra_ahub.c
+++ b/drivers/sound/tegra_ahub.c
@@ -12,6 +12,7 @@
 #include <i2s.h>
 #include <log.h>
 #include <misc.h>
+#include <time.h>
 #include <asm/io.h>
 #include <asm/arch-tegra/tegra_ahub.h>
 #include <asm/arch-tegra/tegra_i2s.h>
diff --git a/drivers/spi/altera_spi.c b/drivers/spi/altera_spi.c
index 61372c52b050..c9ef5a69ea9d 100644
--- a/drivers/spi/altera_spi.c
+++ b/drivers/spi/altera_spi.c
@@ -13,6 +13,7 @@
 #include <malloc.h>
 #include <fdtdec.h>
 #include <spi.h>
+#include <time.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
 
diff --git a/drivers/spi/cadence_qspi_apb.c b/drivers/spi/cadence_qspi_apb.c
index f9675f75a401..77ec7c6ecda4 100644
--- a/drivers/spi/cadence_qspi_apb.c
+++ b/drivers/spi/cadence_qspi_apb.c
@@ -27,6 +27,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <time.h>
 #include <asm/io.h>
 #include <dma.h>
 #include <linux/bitops.h>
diff --git a/drivers/spi/ich.c b/drivers/spi/ich.c
index e1336b89c5a7..224c2b07919a 100644
--- a/drivers/spi/ich.c
+++ b/drivers/spi/ich.c
@@ -22,6 +22,7 @@
 #include <spi_flash.h>
 #include <spi-mem.h>
 #include <spl.h>
+#include <time.h>
 #include <asm/fast_spi.h>
 #include <asm/io.h>
 #include <dm/uclass-internal.h>
diff --git a/drivers/spi/mpc8xxx_spi.c b/drivers/spi/mpc8xxx_spi.c
index 811b5d44fb27..4f4b7ea22e0e 100644
--- a/drivers/spi/mpc8xxx_spi.c
+++ b/drivers/spi/mpc8xxx_spi.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <spi.h>
+#include <time.h>
 #include <asm/mpc8xxx_spi.h>
 #include <asm-generic/gpio.h>
 #include <dm/device_compat.h>
diff --git a/drivers/spi/mxc_spi.c b/drivers/spi/mxc_spi.c
index 14f68da2ee6e..cb1abf14416e 100644
--- a/drivers/spi/mxc_spi.c
+++ b/drivers/spi/mxc_spi.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <spi.h>
+#include <time.h>
 #include <asm/global_data.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
diff --git a/drivers/spi/omap3_spi.c b/drivers/spi/omap3_spi.c
index afe80e53d2ba..942db5ca5bab 100644
--- a/drivers/spi/omap3_spi.c
+++ b/drivers/spi/omap3_spi.c
@@ -20,6 +20,7 @@
 #include <dm.h>
 #include <spi.h>
 #include <malloc.h>
+#include <time.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
diff --git a/drivers/spi/pic32_spi.c b/drivers/spi/pic32_spi.c
index ffba2d84f1fd..d08c26c8f4fe 100644
--- a/drivers/spi/pic32_spi.c
+++ b/drivers/spi/pic32_spi.c
@@ -10,6 +10,7 @@
 #include <clk.h>
 #include <dm.h>
 #include <log.h>
+#include <time.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/compat.h>
diff --git a/drivers/spi/zynq_qspi.c b/drivers/spi/zynq_qspi.c
index 1358bd103555..af130d4418b5 100644
--- a/drivers/spi/zynq_qspi.c
+++ b/drivers/spi/zynq_qspi.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <spi.h>
+#include <time.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
diff --git a/drivers/timer/sandbox_timer.c b/drivers/timer/sandbox_timer.c
index 5228486082c2..2120b02d4444 100644
--- a/drivers/timer/sandbox_timer.c
+++ b/drivers/timer/sandbox_timer.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
+#include <time.h>
 #include <timer.h>
 #include <os.h>
 
diff --git a/drivers/tpm/cr50_i2c.c b/drivers/tpm/cr50_i2c.c
index 1942c07c605c..b0075d3bb48c 100644
--- a/drivers/tpm/cr50_i2c.c
+++ b/drivers/tpm/cr50_i2c.c
@@ -13,6 +13,7 @@
 #include <irq.h>
 #include <log.h>
 #include <spl.h>
+#include <time.h>
 #include <tpm-v2.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
diff --git a/drivers/tpm/tpm-uclass.c b/drivers/tpm/tpm-uclass.c
index 6ea795bc0c98..01d7c2f47c15 100644
--- a/drivers/tpm/tpm-uclass.c
+++ b/drivers/tpm/tpm-uclass.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <time.h>
 #include <linux/delay.h>
 #include <linux/unaligned/be_byteshift.h>
 #include <tpm-v1.h>
diff --git a/drivers/tpm/tpm2_tis_spi.c b/drivers/tpm/tpm2_tis_spi.c
index 8ff6c461f19f..195d8be8bf31 100644
--- a/drivers/tpm/tpm2_tis_spi.c
+++ b/drivers/tpm/tpm2_tis_spi.c
@@ -18,6 +18,7 @@
 #include <fdtdec.h>
 #include <log.h>
 #include <spi.h>
+#include <time.h>
 #include <tpm-v2.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
diff --git a/drivers/tpm/tpm_atmel_twi.c b/drivers/tpm/tpm_atmel_twi.c
index 5489e728b6e2..9444c1b48137 100644
--- a/drivers/tpm/tpm_atmel_twi.c
+++ b/drivers/tpm/tpm_atmel_twi.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <display_options.h>
 #include <dm.h>
+#include <time.h>
 #include <tpm-v1.h>
 #include <i2c.h>
 #include <asm/unaligned.h>
diff --git a/drivers/tpm/tpm_tis_infineon.c b/drivers/tpm/tpm_tis_infineon.c
index 32c3a3354206..fe832d413293 100644
--- a/drivers/tpm/tpm_tis_infineon.c
+++ b/drivers/tpm/tpm_tis_infineon.c
@@ -24,6 +24,7 @@
 #include <fdtdec.h>
 #include <i2c.h>
 #include <log.h>
+#include <time.h>
 #include <tpm-v1.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/tpm/tpm_tis_st33zp24_i2c.c b/drivers/tpm/tpm_tis_st33zp24_i2c.c
index a253ee150270..60af8385b5d7 100644
--- a/drivers/tpm/tpm_tis_st33zp24_i2c.c
+++ b/drivers/tpm/tpm_tis_st33zp24_i2c.c
@@ -17,6 +17,7 @@
 #include <fdtdec.h>
 #include <i2c.h>
 #include <log.h>
+#include <time.h>
 #include <tpm-v1.h>
 #include <errno.h>
 #include <linux/delay.h>
diff --git a/drivers/tpm/tpm_tis_st33zp24_spi.c b/drivers/tpm/tpm_tis_st33zp24_spi.c
index ef54e3b7b293..edd7d7840b96 100644
--- a/drivers/tpm/tpm_tis_st33zp24_spi.c
+++ b/drivers/tpm/tpm_tis_st33zp24_spi.c
@@ -17,6 +17,7 @@
 #include <fdtdec.h>
 #include <log.h>
 #include <spi.h>
+#include <time.h>
 #include <tpm-v1.h>
 #include <errno.h>
 #include <linux/delay.h>
diff --git a/drivers/ufs/ufs.c b/drivers/ufs/ufs.c
index 92b7e9fd7cfc..84d84835cfdf 100644
--- a/drivers/ufs/ufs.c
+++ b/drivers/ufs/ufs.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <time.h>
 #include <dm/device_compat.h>
 #include <dm/devres.h>
 #include <dm/lists.h>
diff --git a/drivers/usb/eth/smsc95xx.c b/drivers/usb/eth/smsc95xx.c
index b293a808a3dd..dacf607ed83b 100644
--- a/drivers/usb/eth/smsc95xx.c
+++ b/drivers/usb/eth/smsc95xx.c
@@ -13,6 +13,7 @@
 #include <malloc.h>
 #include <memalign.h>
 #include <net.h>
+#include <time.h>
 #include <usb.h>
 #include <asm/unaligned.h>
 #include <linux/delay.h>
diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c
index e4572ec6481c..a718eae3a0cc 100644
--- a/drivers/usb/gadget/ether.c
+++ b/drivers/usb/gadget/ether.c
@@ -12,6 +12,7 @@
 #include <env.h>
 #include <log.h>
 #include <part.h>
+#include <time.h>
 #include <linux/errno.h>
 #include <linux/netdevice.h>
 #include <linux/printk.h>
diff --git a/drivers/usb/gadget/fotg210.c b/drivers/usb/gadget/fotg210.c
index af43433d88d6..c6eb22bdfd36 100644
--- a/drivers/usb/gadget/fotg210.c
+++ b/drivers/usb/gadget/fotg210.c
@@ -13,6 +13,7 @@
 #include <log.h>
 #include <net.h>
 #include <malloc.h>
+#include <time.h>
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/usb/gadget/pxa25x_udc.c b/drivers/usb/gadget/pxa25x_udc.c
index d19ac1d03531..2d9f2e4e33d0 100644
--- a/drivers/usb/gadget/pxa25x_udc.c
+++ b/drivers/usb/gadget/pxa25x_udc.c
@@ -19,6 +19,7 @@
 #include <common.h>
 #include <errno.h>
 #include <log.h>
+#include <time.h>
 #include <asm/byteorder.h>
 #include <asm/system.h>
 #include <asm/mach-types.h>
diff --git a/drivers/usb/host/dwc2.c b/drivers/usb/host/dwc2.c
index cefe9d83b1dc..ec0b799e1492 100644
--- a/drivers/usb/host/dwc2.c
+++ b/drivers/usb/host/dwc2.c
@@ -14,6 +14,7 @@
 #include <malloc.h>
 #include <memalign.h>
 #include <phys2bus.h>
+#include <time.h>
 #include <usb.h>
 #include <usbroothubdes.h>
 #include <wait_bit.h>
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index f79f06320bfb..26400cac08c1 100644
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -11,6 +11,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
+#include <time.h>
 #include <asm/byteorder.h>
 #include <asm/cache.h>
 #include <asm/unaligned.h>
diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c
index 82b99eeef1e9..90a024068362 100644
--- a/drivers/usb/host/ehci-omap.c
+++ b/drivers/usb/host/ehci-omap.c
@@ -12,6 +12,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <time.h>
 #include <usb.h>
 #include <linux/delay.h>
 #include <usb/ulpi.h>
diff --git a/drivers/usb/host/ohci-da8xx.c b/drivers/usb/host/ohci-da8xx.c
index 22e7b565b5bf..e9f87cfb7b0e 100644
--- a/drivers/usb/host/ohci-da8xx.c
+++ b/drivers/usb/host/ohci-da8xx.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <malloc.h>
+#include <time.h>
 #include <asm/io.h>
 #include <clk.h>
 #include <dm.h>
diff --git a/drivers/usb/host/sl811-hcd.c b/drivers/usb/host/sl811-hcd.c
index 7c823f241a85..39d5988b36ab 100644
--- a/drivers/usb/host/sl811-hcd.c
+++ b/drivers/usb/host/sl811-hcd.c
@@ -20,6 +20,7 @@
 
 #include <common.h>
 #include <mpc8xx.h>
+#include <time.h>
 #include <usb.h>
 #include <linux/delay.h>
 #include "sl811.h"
diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
index 092ed6eaf104..e3e8d09bf357 100644
--- a/drivers/usb/host/xhci-ring.c
+++ b/drivers/usb/host/xhci-ring.c
@@ -16,6 +16,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <log.h>
+#include <time.h>
 #include <asm/byteorder.h>
 #include <usb.h>
 #include <asm/unaligned.h>
diff --git a/drivers/usb/musb-new/am35x.c b/drivers/usb/musb-new/am35x.c
index 0a52e09e19f1..ea0a944a87bb 100644
--- a/drivers/usb/musb-new/am35x.c
+++ b/drivers/usb/musb-new/am35x.c
@@ -25,6 +25,7 @@
 #include <plat/usb.h>
 #else
 #include <common.h>
+#include <time.h>
 #include <asm/omap_musb.h>
 #include <linux/bug.h>
 #include <linux/delay.h>
diff --git a/drivers/usb/musb-new/musb_dsps.c b/drivers/usb/musb-new/musb_dsps.c
index 4d977aba34fc..20987b77ade2 100644
--- a/drivers/usb/musb-new/musb_dsps.c
+++ b/drivers/usb/musb-new/musb_dsps.c
@@ -32,6 +32,7 @@
 #include <plat/usb.h>
 #else
 #include <common.h>
+#include <time.h>
 #include <asm/omap_musb.h>
 #include <linux/printk.h>
 #include "linux-compat.h"
diff --git a/drivers/usb/musb-new/musb_uboot.c b/drivers/usb/musb-new/musb_uboot.c
index 8ac2f0a78adb..c212ecff7af3 100644
--- a/drivers/usb/musb-new/musb_uboot.c
+++ b/drivers/usb/musb-new/musb_uboot.c
@@ -2,6 +2,7 @@
 #include <console.h>
 #include <dm.h>
 #include <malloc.h>
+#include <time.h>
 #include <watchdog.h>
 #include <linux/delay.h>
 #include <linux/err.h>
diff --git a/drivers/usb/musb-new/omap2430.c b/drivers/usb/musb-new/omap2430.c
index c41b9147fa50..e8bc3f33597f 100644
--- a/drivers/usb/musb-new/omap2430.c
+++ b/drivers/usb/musb-new/omap2430.c
@@ -12,6 +12,7 @@
 #include <dm.h>
 #include <log.h>
 #include <serial.h>
+#include <time.h>
 #include <asm/global_data.h>
 #include <dm/device-internal.h>
 #include <dm/device_compat.h>
diff --git a/drivers/video/broadwell_igd.c b/drivers/video/broadwell_igd.c
index 416a1c07b13f..84b31025f742 100644
--- a/drivers/video/broadwell_igd.c
+++ b/drivers/video/broadwell_igd.c
@@ -11,6 +11,7 @@
 #include <dm.h>
 #include <init.h>
 #include <log.h>
+#include <time.h>
 #include <vbe.h>
 #include <video.h>
 #include <asm/cpu.h>
diff --git a/drivers/video/dw_hdmi.c b/drivers/video/dw_hdmi.c
index c4fbb1829446..16db3d38a2c2 100644
--- a/drivers/video/dw_hdmi.c
+++ b/drivers/video/dw_hdmi.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <fdtdec.h>
 #include <log.h>
+#include <time.h>
 #include <asm/io.h>
 #include <i2c.h>
 #include <media_bus_format.h>
diff --git a/drivers/video/rockchip/rk_edp.c b/drivers/video/rockchip/rk_edp.c
index 000bd4814088..36d17deea580 100644
--- a/drivers/video/rockchip/rk_edp.c
+++ b/drivers/video/rockchip/rk_edp.c
@@ -14,6 +14,7 @@
 #include <panel.h>
 #include <regmap.h>
 #include <syscon.h>
+#include <time.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <asm/arch-rockchip/clock.h>
diff --git a/drivers/video/tegra124/display.c b/drivers/video/tegra124/display.c
index 6c2793226395..4f46b222b44c 100644
--- a/drivers/video/tegra124/display.c
+++ b/drivers/video/tegra124/display.c
@@ -15,6 +15,7 @@
 #include <lcd.h>
 #include <log.h>
 #include <part.h>
+#include <time.h>
 #include <video.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
diff --git a/drivers/video/tegra124/dp.c b/drivers/video/tegra124/dp.c
index 59758eb93614..b09943897c18 100644
--- a/drivers/video/tegra124/dp.c
+++ b/drivers/video/tegra124/dp.c
@@ -10,6 +10,7 @@
 #include <div64.h>
 #include <errno.h>
 #include <log.h>
+#include <time.h>
 #include <video_bridge.h>
 #include <asm/io.h>
 #include <asm/arch-tegra/dc.h>
diff --git a/drivers/video/tegra124/sor.c b/drivers/video/tegra124/sor.c
index 52ab1b529159..119219e18bb0 100644
--- a/drivers/video/tegra124/sor.c
+++ b/drivers/video/tegra124/sor.c
@@ -10,6 +10,7 @@
 #include <malloc.h>
 #include <panel.h>
 #include <syscon.h>
+#include <time.h>
 #include <video_bridge.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
diff --git a/drivers/video/video-uclass.c b/drivers/video/video-uclass.c
index 1654d02860be..eb234cc9bf41 100644
--- a/drivers/video/video-uclass.c
+++ b/drivers/video/video-uclass.c
@@ -11,6 +11,7 @@
 #include <malloc.h>
 #include <mapmem.h>
 #include <stdio_dev.h>
+#include <time.h>
 #include <video.h>
 #include <video_console.h>
 #include <asm/cache.h>
diff --git a/drivers/watchdog/sbsa_gwdt.c b/drivers/watchdog/sbsa_gwdt.c
index b837b045fa59..1e44df1da293 100644
--- a/drivers/watchdog/sbsa_gwdt.c
+++ b/drivers/watchdog/sbsa_gwdt.c
@@ -5,6 +5,7 @@
  * Copyright 2020 NXP
  */
 
+#include <time.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <common.h>
diff --git a/drivers/xen/pvblock.c b/drivers/xen/pvblock.c
index 76e82fbf41d8..916b0cabda31 100644
--- a/drivers/xen/pvblock.c
+++ b/drivers/xen/pvblock.c
@@ -9,6 +9,7 @@
 #include <dm/device-internal.h>
 #include <malloc.h>
 #include <part.h>
+#include <time.h>
 
 #include <asm/armv8/mmu.h>
 #include <asm/io.h>
diff --git a/drivers/xen/xenbus.c b/drivers/xen/xenbus.c
index 177d144723c1..1c5e0ff469e8 100644
--- a/drivers/xen/xenbus.c
+++ b/drivers/xen/xenbus.c
@@ -17,6 +17,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <time.h>
 
 #include <asm/armv8/mmu.h>
 #include <asm/io.h>
diff --git a/fs/fs.c b/fs/fs.c
index 8326b6976bf0..23fad1da80f6 100644
--- a/fs/fs.c
+++ b/fs/fs.c
@@ -17,6 +17,7 @@
 #include <fat.h>
 #include <fs.h>
 #include <sandboxfs.h>
+#include <time.h>
 #include <ubifs_uboot.h>
 #include <btrfs.h>
 #include <asm/global_data.h>
diff --git a/fs/ubifs/debug.c b/fs/ubifs/debug.c
index 4a8fd88cdd79..4f0f680131f1 100644
--- a/fs/ubifs/debug.c
+++ b/fs/ubifs/debug.c
@@ -17,6 +17,7 @@
 
 #include <hexdump.h>
 #include <log.h>
+#include <time.h>
 #include <dm/devres.h>
 #include <linux/printk.h>
 
diff --git a/include/cli.h b/include/cli.h
index 39b913743b55..06355767f6dd 100644
--- a/include/cli.h
+++ b/include/cli.h
@@ -7,6 +7,8 @@
 #ifndef __CLI_H
 #define __CLI_H
 
+#include <time.h>
+
 /**
  * Go into the command loop
  *
diff --git a/include/common.h b/include/common.h
index a79c2bb49931..a904f41c366b 100644
--- a/include/common.h
+++ b/include/common.h
@@ -15,7 +15,6 @@
 #ifndef __ASSEMBLY__		/* put C only stuff in this section */
 #include <config.h>
 #include <errno.h>
-#include <time.h>
 #include <linux/types.h>
 #include <linux/string.h>
 #include <stdarg.h>
diff --git a/include/exports.h b/include/exports.h
index e89cc333e52a..4b9aa5ff405f 100644
--- a/include/exports.h
+++ b/include/exports.h
@@ -2,6 +2,7 @@
 #define __EXPORTS_H__
 
 #include <irq_func.h>
+#include <time.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
 
diff --git a/include/regmap.h b/include/regmap.h
index 30183c5e7111..bae96a6ef0bc 100644
--- a/include/regmap.h
+++ b/include/regmap.h
@@ -7,6 +7,7 @@
 #ifndef __REGMAP_H
 #define __REGMAP_H
 
+#include <time.h>
 #include <linux/delay.h>
 
 /**
diff --git a/include/virtio.h b/include/virtio.h
index 10a9c073ba11..6a2932e391fb 100644
--- a/include/virtio.h
+++ b/include/virtio.h
@@ -20,8 +20,10 @@
 #ifndef __VIRTIO_H__
 #define __VIRTIO_H__
 
+#include <compiler.h>
 #include <linux/bitops.h>
 #include <linux/bug.h>
+#include <linux/typecheck.h>
 #define VIRTIO_ID_NET		1 /* virtio net */
 #define VIRTIO_ID_BLOCK		2 /* virtio block */
 #define VIRTIO_ID_RNG		4 /* virtio rng */
diff --git a/lib/dhry/cmd_dhry.c b/lib/dhry/cmd_dhry.c
index d55ab54df97b..bbb02d4ad9ba 100644
--- a/lib/dhry/cmd_dhry.c
+++ b/lib/dhry/cmd_dhry.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <command.h>
 #include <div64.h>
+#include <time.h>
 #include "dhry.h"
 
 static int do_dhry(struct cmd_tbl *cmdtp, int flag, int argc,
diff --git a/net/arp.c b/net/arp.c
index 1d06ed25722b..7913812b9a22 100644
--- a/net/arp.c
+++ b/net/arp.c
@@ -13,6 +13,7 @@
 #include <env.h>
 #include <log.h>
 #include <net.h>
+#include <time.h>
 #include <linux/delay.h>
 
 #include "arp.h"
diff --git a/net/bootp.c b/net/bootp.c
index de3dab4114d9..23b5b8ad9b95 100644
--- a/net/bootp.c
+++ b/net/bootp.c
@@ -16,6 +16,7 @@
 #include <log.h>
 #include <net.h>
 #include <rand.h>
+#include <time.h>
 #include <uuid.h>
 #include <linux/delay.h>
 #include <net/tftp.h>
diff --git a/net/dns.c b/net/dns.c
index 5b1fe5b01037..677e39dd0318 100644
--- a/net/dns.c
+++ b/net/dns.c
@@ -27,6 +27,7 @@
 #include <env.h>
 #include <log.h>
 #include <net.h>
+#include <time.h>
 #include <asm/unaligned.h>
 
 #include "dns.h"
diff --git a/net/fastboot.c b/net/fastboot.c
index d01d3eba120a..c35953f3e333 100644
--- a/net/fastboot.c
+++ b/net/fastboot.c
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <fastboot.h>
 #include <net.h>
+#include <time.h>
 #include <linux/printk.h>
 #include <net/fastboot.h>
 
diff --git a/net/link_local.c b/net/link_local.c
index 8aec3c79969b..16bc5c8b90ad 100644
--- a/net/link_local.c
+++ b/net/link_local.c
@@ -16,6 +16,7 @@
 #include <log.h>
 #include <net.h>
 #include <rand.h>
+#include <time.h>
 #include "arp.h"
 #include "net_rand.h"
 
diff --git a/net/net.c b/net/net.c
index 28d9eebf9dd3..8ee76fba4902 100644
--- a/net/net.c
+++ b/net/net.c
@@ -97,6 +97,7 @@
 #include <image.h>
 #include <log.h>
 #include <net.h>
+#include <time.h>
 #include <net/fastboot.h>
 #include <net/tftp.h>
 #if defined(CONFIG_CMD_PCAP)
diff --git a/net/sntp.c b/net/sntp.c
index 39d7664a2248..8ecc0117ca74 100644
--- a/net/sntp.c
+++ b/net/sntp.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <net.h>
 #include <rtc.h>
+#include <time.h>
 
 #include "sntp.h"
 
diff --git a/net/tftp.c b/net/tftp.c
index 6fc8eb598ae4..9ba34d858c2f 100644
--- a/net/tftp.c
+++ b/net/tftp.c
@@ -15,6 +15,7 @@
 #include <log.h>
 #include <mapmem.h>
 #include <net.h>
+#include <time.h>
 #include <asm/global_data.h>
 #include <net/tftp.h>
 #include "bootp.h"
diff --git a/post/drivers/rtc.c b/post/drivers/rtc.c
index af701e464d36..7f14670317c1 100644
--- a/post/drivers/rtc.c
+++ b/post/drivers/rtc.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <time.h>
 
 /*
  * RTC test
diff --git a/test/dm/regmap.c b/test/dm/regmap.c
index bd21c8365dc3..16dd9b1eaff1 100644
--- a/test/dm/regmap.c
+++ b/test/dm/regmap.c
@@ -9,6 +9,7 @@
 #include <mapmem.h>
 #include <regmap.h>
 #include <syscon.h>
+#include <time.h>
 #include <asm/test.h>
 #include <dm/test.h>
 #include <linux/err.h>
-- 
2.17.1

^ permalink raw reply related	[flat|nested] 35+ messages in thread

* [RFCv2 06/16] common: Drop linux/string.h from common header
  2020-08-19 13:08 ` [RFCv2] common: Drop remaining includes in common.h Tom Rini
                     ` (4 preceding siblings ...)
  2020-08-19 13:08   ` [RFCv2 05/16] common: Drop time.h from common header Tom Rini
@ 2020-08-19 13:08   ` Tom Rini
  2020-08-19 13:08   ` [RFCv2 07/16] common: Drop asm/u-boot.h " Tom Rini
                     ` (10 subsequent siblings)
  16 siblings, 0 replies; 35+ messages in thread
From: Tom Rini @ 2020-08-19 13:08 UTC (permalink / raw)
  To: u-boot

From: Simon Glass <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 +
 api/api_net.c                                           | 1 +
 arch/arc/lib/relocate.c                                 | 1 +
 arch/arm/cpu/arm1136/mx35/generic.c                     | 1 +
 arch/arm/cpu/arm926ejs/mxs/mxs.c                        | 1 +
 arch/arm/cpu/arm926ejs/mxs/spl_boot.c                   | 1 +
 arch/arm/cpu/arm926ejs/spear/cpu.c                      | 1 +
 arch/arm/cpu/arm926ejs/spear/spr_misc.c                 | 1 +
 arch/arm/cpu/armv7/bcm235xx/clk-bcm235xx.c              | 1 +
 arch/arm/cpu/armv7/bcm235xx/clk-core.c                  | 1 +
 arch/arm/cpu/armv7/bcm281xx/clk-bcm281xx.c              | 1 +
 arch/arm/cpu/armv7/bcm281xx/clk-core.c                  | 1 +
 arch/arm/cpu/armv7/ls102xa/fdt.c                        | 1 +
 arch/arm/cpu/armv7/vf610/generic.c                      | 1 +
 arch/arm/cpu/armv7/virt-v7.c                            | 1 +
 arch/arm/cpu/armv8/cache_v8.c                           | 1 +
 arch/arm/cpu/armv8/cpu.c                                | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/cpu.c                 | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/fdt.c                 | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_serdes.c    | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c    | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/ls1028_ids.c          | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/mp.c                  | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/spl.c                 | 1 +
 arch/arm/cpu/armv8/sec_firmware.c                       | 1 +
 arch/arm/cpu/armv8/spin_table.c                         | 1 +
 arch/arm/cpu/armv8/spl_data.c                           | 1 +
 arch/arm/include/asm/io.h                               | 1 +
 arch/arm/lib/bootm.c                                    | 1 +
 arch/arm/lib/eabi_compat.c                              | 1 +
 arch/arm/lib/psci-dt.c                                  | 1 +
 arch/arm/lib/semihosting.c                              | 1 +
 arch/arm/mach-bcm283x/include/mach/mbox.h               | 3 ++-
 arch/arm/mach-imx/cmd_bmode.c                           | 1 +
 arch/arm/mach-imx/cmd_nandbcb.c                         | 1 +
 arch/arm/mach-imx/imx8/ahab.c                           | 1 +
 arch/arm/mach-imx/imx8/fdt.c                            | 1 +
 arch/arm/mach-imx/imx8/image.c                          | 1 +
 arch/arm/mach-imx/imx8/parse-container.c                | 1 +
 arch/arm/mach-imx/imx8m/soc.c                           | 1 +
 arch/arm/mach-imx/mx5/clock.c                           | 1 +
 arch/arm/mach-imx/mx6/module_fuse.c                     | 1 +
 arch/arm/mach-imx/spl_imx_romapi.c                      | 1 +
 arch/arm/mach-imx/video.c                               | 1 +
 arch/arm/mach-k3/common.c                               | 1 +
 arch/arm/mach-keystone/cmd_clock.c                      | 1 +
 arch/arm/mach-keystone/cmd_mon.c                        | 1 +
 arch/arm/mach-keystone/ddr3_spd.c                       | 1 +
 arch/arm/mach-keystone/mon.c                            | 1 +
 arch/arm/mach-meson/sm.c                                | 1 +
 arch/arm/mach-mvebu/armada3700/cpu.c                    | 1 +
 arch/arm/mach-mvebu/serdes/axp/high_speed_env_lib.c     | 1 +
 arch/arm/mach-omap2/emif-common.c                       | 1 +
 arch/arm/mach-omap2/omap3/board.c                       | 1 +
 arch/arm/mach-omap2/sec-common.c                        | 1 +
 arch/arm/mach-rockchip/board.c                          | 1 +
 arch/arm/mach-rockchip/boot_mode.c                      | 1 +
 arch/arm/mach-rockchip/misc.c                           | 1 +
 arch/arm/mach-rockchip/spl-boot-order.c                 | 1 +
 arch/arm/mach-socfpga/clock_manager_arria10.c           | 1 +
 arch/arm/mach-socfpga/misc_s10.c                        | 1 +
 arch/arm/mach-socfpga/pinmux_arria10.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_serial.c  | 1 +
 arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_usb.c     | 1 +
 arch/arm/mach-stm32mp/fdt.c                             | 1 +
 arch/arm/mach-tegra/cboot.c                             | 1 +
 arch/arm/mach-tegra/tegra20/emc.c                       | 1 +
 arch/arm/mach-tegra/tegra20/warmboot.c                  | 1 +
 arch/arm/mach-tegra/xusb-padctl-common.c                | 1 +
 arch/arm/mach-uniphier/base-address.c                   | 1 +
 arch/arm/mach-uniphier/board_late_init.c                | 1 +
 arch/arm/mach-uniphier/dram/cmd_ddrmphy.c               | 1 +
 arch/arm/mach-uniphier/dram/cmd_ddrphy.c                | 1 +
 arch/arm/mach-versal/mp.c                               | 1 +
 arch/arm/mach-zynq/ddrc.c                               | 1 +
 arch/arm/mach-zynq/slcr.c                               | 1 +
 arch/arm/mach-zynq/spl.c                                | 1 +
 arch/arm/mach-zynqmp/cpu.c                              | 1 +
 arch/arm/mach-zynqmp/mp.c                               | 1 +
 arch/microblaze/include/asm/io.h                        | 1 +
 arch/mips/include/asm/io.h                              | 1 +
 arch/mips/lib/bootm.c                                   | 1 +
 arch/mips/lib/reloc.c                                   | 1 +
 arch/mips/lib/traps.c                                   | 1 +
 arch/mips/mach-jz47xx/jz4780/jz4780.c                   | 1 +
 arch/mips/mach-mtmips/cpu.c                             | 1 +
 arch/nds32/lib/bootm.c                                  | 1 +
 arch/nios2/cpu/cpu.c                                    | 1 +
 arch/nios2/include/asm/io.h                             | 1 +
 arch/powerpc/cpu/mpc83xx/ecc.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_corenet2_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/mpc86xx/mp.c                           | 1 +
 arch/powerpc/cpu/mpc8xxx/fsl_pamu.c                     | 1 +
 arch/powerpc/include/asm/io.h                           | 1 +
 arch/riscv/cpu/cpu.c                                    | 1 +
 arch/riscv/lib/andes_plic.c                             | 1 +
 arch/riscv/lib/fdt_fixup.c                              | 1 +
 arch/sandbox/cpu/eth-raw-os.c                           | 1 +
 arch/sandbox/cpu/os.c                                   | 1 +
 arch/sandbox/cpu/sdl.c                                  | 1 +
 arch/sandbox/cpu/spl.c                                  | 1 +
 arch/sandbox/cpu/start.c                                | 1 +
 arch/sandbox/cpu/state.c                                | 1 +
 arch/sandbox/lib/bootm.c                                | 1 +
 arch/sh/lib/board.c                                     | 1 +
 arch/sh/lib/bootm.c                                     | 1 +
 arch/sh/lib/zimageboot.c                                | 1 +
 arch/x86/cpu/acpi_gpe.c                                 | 1 +
 arch/x86/cpu/apollolake/fsp_bindings.c                  | 1 +
 arch/x86/cpu/apollolake/pmc.c                           | 1 +
 arch/x86/cpu/apollolake/spl.c                           | 1 +
 arch/x86/cpu/baytrail/acpi.c                            | 1 +
 arch/x86/cpu/broadwell/me.c                             | 1 +
 arch/x86/cpu/broadwell/northbridge.c                    | 1 +
 arch/x86/cpu/broadwell/pinctrl_broadwell.c              | 1 +
 arch/x86/cpu/broadwell/refcode.c                        | 1 +
 arch/x86/cpu/broadwell/sdram.c                          | 1 +
 arch/x86/cpu/cpu_x86.c                                  | 1 +
 arch/x86/cpu/efi/payload.c                              | 1 +
 arch/x86/cpu/i386/cpu.c                                 | 1 +
 arch/x86/cpu/intel_common/itss.c                        | 1 +
 arch/x86/cpu/intel_common/report_platform.c             | 1 +
 arch/x86/cpu/ivybridge/sata.c                           | 1 +
 arch/x86/cpu/ivybridge/sdram.c                          | 1 +
 arch/x86/cpu/mp_init.c                                  | 1 +
 arch/x86/cpu/qfw_cpu.c                                  | 1 +
 arch/x86/cpu/quark/acpi.c                               | 1 +
 arch/x86/cpu/quark/dram.c                               | 1 +
 arch/x86/cpu/quark/smc.c                                | 1 +
 arch/x86/cpu/tangier/acpi.c                             | 1 +
 arch/x86/cpu/tangier/sdram.c                            | 1 +
 arch/x86/include/asm/io.h                               | 1 +
 arch/x86/include/asm/me_common.h                        | 1 +
 arch/x86/lib/acpi.c                                     | 1 +
 arch/x86/lib/acpi_nhlt.c                                | 1 +
 arch/x86/lib/acpi_s3.c                                  | 1 +
 arch/x86/lib/acpi_table.c                               | 1 +
 arch/x86/lib/bios.c                                     | 1 +
 arch/x86/lib/cmd_boot.c                                 | 1 +
 arch/x86/lib/coreboot_table.c                           | 1 +
 arch/x86/lib/fsp1/fsp_support.c                         | 1 +
 arch/x86/lib/fsp2/fsp_meminit.c                         | 1 +
 arch/x86/lib/fsp2/fsp_silicon_init.c                    | 1 +
 arch/x86/lib/fsp2/fsp_support.c                         | 1 +
 arch/x86/lib/mpspec.c                                   | 1 +
 arch/x86/lib/mrccache.c                                 | 1 +
 arch/x86/lib/physmem.c                                  | 1 +
 arch/x86/lib/pirq_routing.c                             | 1 +
 arch/x86/lib/relocate.c                                 | 1 +
 arch/x86/lib/scu.c                                      | 1 +
 arch/x86/lib/sfi.c                                      | 1 +
 arch/x86/lib/spl.c                                      | 1 +
 arch/x86/lib/string.c                                   | 1 +
 arch/x86/lib/tables.c                                   | 1 +
 arch/x86/lib/zimage.c                                   | 1 +
 arch/xtensa/include/asm/io.h                            | 1 +
 arch/xtensa/lib/bootm.c                                 | 1 +
 arch/xtensa/lib/relocate.c                              | 1 +
 board/Arcturus/ucp1020/cmd_arc.c                        | 1 +
 board/Arcturus/ucp1020/ddr.c                            | 1 +
 board/Arcturus/ucp1020/spl.c                            | 1 +
 board/Arcturus/ucp1020/ucp1020.c                        | 1 +
 board/BuR/common/common.c                               | 1 +
 board/BuS/eb_cpu5282/eb_cpu5282.c                       | 1 +
 board/CZ.NIC/turris_omnia/turris_omnia.c                | 1 +
 board/Synology/ds109/ds109.c                            | 1 +
 board/Synology/ds414/cmd_syno.c                         | 1 +
 board/advantech/imx8qm_rom7720_a1/spl.c                 | 1 +
 board/aristainetos/aristainetos.c                       | 1 +
 board/armltd/vexpress/vexpress_common.c                 | 1 +
 board/armltd/vexpress/vexpress_tc2.c                    | 1 +
 board/armltd/vexpress64/vexpress64.c                    | 1 +
 board/atmel/common/mac-spi-nor.c                        | 1 +
 board/atmel/common/video_display.c                      | 1 +
 board/atmel/sama5d3xek/sama5d3xek.c                     | 1 +
 board/barco/platinum/spl_picon.c                        | 1 +
 board/barco/platinum/spl_titanium.c                     | 1 +
 board/beacon/imx8mm/spl.c                               | 1 +
 board/beckhoff/mx53cx9020/mx53cx9020.c                  | 1 +
 board/bluewater/gurnard/gurnard.c                       | 1 +
 board/boundary/nitrogen6x/nitrogen6x.c                  | 1 +
 board/cavium/thunderx/atf.c                             | 1 +
 board/cobra5272/flash.c                                 | 3 ++-
 board/compulab/cl-som-imx7/spl.c                        | 1 +
 board/compulab/cm_fx6/cm_fx6.c                          | 1 +
 board/compulab/common/eeprom.c                          | 1 +
 board/compulab/common/omap3_display.c                   | 1 +
 board/congatec/cgtqmx6eval/cgtqmx6eval.c                | 1 +
 board/corscience/tricorder/tricorder-eeprom.c           | 1 +
 board/corscience/tricorder/tricorder.c                  | 1 +
 board/creative/xfi3/spl_boot.c                          | 1 +
 board/cssi/MCR3000/MCR3000.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_imx6/dh_imx6_spl.c               | 1 +
 board/dhelectronics/dh_stm32mp1/board.c                 | 1 +
 board/egnite/ethernut5/ethernut5_pwrman.c               | 1 +
 board/el/el6x/el6x.c                                    | 1 +
 board/engicam/common/board.c                            | 1 +
 board/engicam/common/spl.c                              | 1 +
 board/esd/meesc/meesc.c                                 | 1 +
 board/esd/vme8349/caddy.c                               | 1 +
 board/esd/vme8349/vme8349.c                             | 1 +
 board/firefly/roc-pc-rk3399/roc-pc-rk3399.c             | 1 +
 board/freescale/common/fsl_validate.c                   | 1 +
 board/freescale/common/ngpixis.c                        | 1 +
 board/freescale/common/pixis.c                          | 1 +
 board/freescale/common/qixis.c                          | 1 +
 board/freescale/common/sgmii_riser.c                    | 1 +
 board/freescale/common/sys_eeprom.c                     | 1 +
 board/freescale/corenet_ds/ddr.c                        | 1 +
 board/freescale/corenet_ds/eth_hydra.c                  | 1 +
 board/freescale/corenet_ds/eth_superhydra.c             | 1 +
 board/freescale/imx8mm_evk/spl.c                        | 1 +
 board/freescale/imx8mn_evk/spl.c                        | 1 +
 board/freescale/imx8mq_evk/spl.c                        | 1 +
 board/freescale/imx8qm_mek/imx8qm_mek.c                 | 1 +
 board/freescale/imx8qm_mek/spl.c                        | 1 +
 board/freescale/imx8qxp_mek/imx8qxp_mek.c               | 1 +
 board/freescale/imx8qxp_mek/spl.c                       | 1 +
 board/freescale/ls1012aqds/ls1012aqds.c                 | 1 +
 board/freescale/ls1012ardb/ls1012ardb.c                 | 1 +
 board/freescale/ls1021aiot/dcu.c                        | 1 +
 board/freescale/ls1021aiot/ls1021aiot.c                 | 1 +
 board/freescale/ls1021aqds/dcu.c                        | 1 +
 board/freescale/ls1021aqds/ddr.c                        | 1 +
 board/freescale/ls1021aqds/eth.c                        | 1 +
 board/freescale/ls1021aqds/ls1021aqds.c                 | 1 +
 board/freescale/ls1021atsn/ls1021atsn.c                 | 1 +
 board/freescale/ls1021atwr/dcu.c                        | 1 +
 board/freescale/ls1021atwr/ls1021atwr.c                 | 1 +
 board/freescale/ls1043aqds/eth.c                        | 1 +
 board/freescale/ls1043ardb/cpld.c                       | 1 +
 board/freescale/ls1043ardb/ddr.c                        | 1 +
 board/freescale/ls1046afrwy/eth.c                       | 1 +
 board/freescale/ls1046ardb/cpld.c                       | 1 +
 board/freescale/ls1046ardb/eth.c                        | 1 +
 board/freescale/ls1088a/eth_ls1088aqds.c                | 1 +
 board/freescale/ls1088a/ls1088a.c                       | 1 +
 board/freescale/ls2080a/ddr.c                           | 1 +
 board/freescale/ls2080aqds/eth.c                        | 1 +
 board/freescale/ls2080aqds/ls2080aqds.c                 | 1 +
 board/freescale/lx2160a/eth_lx2160aqds.c                | 1 +
 board/freescale/lx2160a/lx2160a.c                       | 1 +
 board/freescale/mpc8323erdb/mpc8323erdb.c               | 1 +
 board/freescale/mpc8349itx/mpc8349itx.c                 | 1 +
 board/freescale/mpc837xemds/mpc837xemds.c               | 1 +
 board/freescale/mpc837xemds/pci.c                       | 1 +
 board/freescale/mpc8569mds/mpc8569mds.c                 | 1 +
 board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c           | 1 +
 board/freescale/mx51evk/mx51evk_video.c                 | 1 +
 board/freescale/mx53loco/mx53loco_video.c               | 1 +
 board/freescale/mx6memcal/spl.c                         | 1 +
 board/freescale/mx6sabreauto/mx6sabreauto.c             | 1 +
 board/freescale/mx6sabresd/mx6sabresd.c                 | 1 +
 board/freescale/mx6slevk/mx6slevk.c                     | 1 +
 board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c       | 1 +
 board/freescale/p1010rdb/ddr.c                          | 1 +
 board/freescale/p1010rdb/p1010rdb.c                     | 1 +
 board/freescale/p1010rdb/spl.c                          | 1 +
 board/freescale/p1023rdb/ddr.c                          | 1 +
 board/freescale/p1_p2_rdb_pc/ddr.c                      | 1 +
 board/freescale/p1_p2_rdb_pc/spl.c                      | 1 +
 board/freescale/p2041rdb/cpld.c                         | 1 +
 board/freescale/qemu-ppce500/qemu-ppce500.c             | 1 +
 board/freescale/t102xrdb/cpld.c                         | 1 +
 board/freescale/t102xrdb/ddr.c                          | 1 +
 board/freescale/t102xrdb/spl.c                          | 1 +
 board/freescale/t102xrdb/t102xrdb.c                     | 1 +
 board/freescale/t104xrdb/cpld.c                         | 1 +
 board/freescale/t104xrdb/spl.c                          | 1 +
 board/freescale/t208xqds/eth_t208xqds.c                 | 1 +
 board/freescale/t208xqds/spl.c                          | 1 +
 board/freescale/t208xrdb/cpld.c                         | 1 +
 board/freescale/t208xrdb/spl.c                          | 1 +
 board/freescale/t4rdb/cpld.c                            | 1 +
 board/freescale/t4rdb/spl.c                             | 1 +
 board/gardena/smart-gateway-mt7688/board.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/hre.c                                  | 1 +
 board/gdsys/a38x/ihs_phys.c                             | 1 +
 board/gdsys/a38x/keyprogram.c                           | 1 +
 board/gdsys/common/cmd_ioloop.c                         | 1 +
 board/gdsys/common/ihs_mdio.c                           | 1 +
 board/gdsys/common/ioep-fpga.c                          | 1 +
 board/gdsys/common/osd.c                                | 1 +
 board/gdsys/common/osd_cmd.c                            | 1 +
 board/gdsys/mpc8308/hrcon.c                             | 1 +
 board/gdsys/mpc8308/strider.c                           | 1 +
 board/gdsys/p1022/controlcenterd-id.c                   | 1 +
 board/gdsys/p1022/ddr.c                                 | 1 +
 board/ge/bx50v3/bx50v3.c                                | 1 +
 board/ge/mx53ppd/mx53ppd.c                              | 1 +
 board/google/imx8mq_phanbell/spl.c                      | 1 +
 board/grinn/liteboard/board.c                           | 1 +
 board/imgtec/malta/malta.c                              | 1 +
 board/isee/igep00x0/igep00x0.c                          | 1 +
 board/k+p/kp_imx53/kp_id_rev.c                          | 1 +
 board/k+p/kp_imx6q_tpc/kp_imx6q_tpc_spl.c               | 1 +
 board/keymile/common/common.c                           | 1 +
 board/keymile/common/ivm.c                              | 1 +
 board/kosagi/novena/novena.c                            | 1 +
 board/laird/wb50n/wb50n.c                               | 1 +
 board/liebherr/display5/display5.c                      | 1 +
 board/liebherr/display5/spl.c                           | 1 +
 board/liebherr/mccmon6/spl.c                            | 1 +
 board/mediatek/mt7623/mt7623_rfb.c                      | 1 +
 board/menlo/m53menlo/m53menlo.c                         | 1 +
 board/mscc/jr2/jr2.c                                    | 1 +
 board/mscc/luton/luton.c                                | 1 +
 board/mscc/ocelot/ocelot.c                              | 1 +
 board/mscc/serval/serval.c                              | 1 +
 board/mscc/servalt/servalt.c                            | 1 +
 board/nokia/rx51/rx51.c                                 | 1 +
 board/nvidia/p2371-2180/p2371-2180.c                    | 1 +
 board/nvidia/p2771-0000/p2771-0000.c                    | 1 +
 board/nvidia/p3450-0000/p3450-0000.c                    | 1 +
 board/phytec/pcm058/pcm058.c                            | 1 +
 board/phytec/pfla02/pfla02.c                            | 1 +
 board/qualcomm/dragonboard410c/dragonboard410c.c        | 1 +
 board/renesas/salvator-x/salvator-x.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/renesas/ulcb/ulcb.c                               | 1 +
 board/samsung/common/gadget.c                           | 1 +
 board/samsung/origen/tools/mkorigenspl.c                | 1 +
 board/samsung/smdkv310/tools/mksmdkv310spl.c            | 1 +
 board/sandisk/sansa_fuze_plus/spl_boot.c                | 1 +
 board/sbc8548/ddr.c                                     | 1 +
 board/siemens/capricorn/board.c                         | 1 +
 board/siemens/capricorn/spl.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/sks-kinkel/sksimx6/sksimx6.c                      | 1 +
 board/softing/vining_2000/vining_2000.c                 | 1 +
 board/softing/vining_fpga/socfpga.c                     | 1 +
 board/solidrun/clearfog/clearfog.c                      | 1 +
 board/solidrun/common/tlv_data.c                        | 1 +
 board/solidrun/mx6cuboxi/mx6cuboxi.c                    | 1 +
 board/st/common/stm32mp_dfu.c                           | 1 +
 board/st/common/stm32mp_mtdparts.c                      | 1 +
 board/st/stm32mp1/stm32mp1.c                            | 1 +
 board/sunxi/board.c                                     | 1 +
 board/synopsys/emsdp/emsdp.c                            | 1 +
 board/synopsys/hsdk/hsdk.c                              | 1 +
 board/syteco/zmx25/zmx25.c                              | 1 +
 board/technexion/pico-imx6/spl.c                        | 1 +
 board/technexion/pico-imx6ul/spl.c                      | 1 +
 board/technexion/pico-imx7d/spl.c                       | 1 +
 board/technexion/pico-imx8mq/spl.c                      | 1 +
 board/theadorable/fpga.c                                | 1 +
 board/theobroma-systems/puma_rk3399/puma-rk3399.c       | 1 +
 board/ti/am335x/board.c                                 | 1 +
 board/ti/am335x/board.h                                 | 1 +
 board/ti/am43xx/board.c                                 | 1 +
 board/ti/am43xx/board.h                                 | 1 +
 board/ti/am57xx/board.c                                 | 1 +
 board/ti/am65x/evm.c                                    | 1 +
 board/ti/beagle/beagle.c                                | 1 +
 board/ti/common/board_detect.c                          | 1 +
 board/ti/j721e/evm.c                                    | 1 +
 board/ti/ks2_evm/board.c                                | 1 +
 board/ti/ks2_evm/board_k2e.c                            | 1 +
 board/ti/ks2_evm/board_k2g.c                            | 1 +
 board/ti/ks2_evm/board_k2hk.c                           | 1 +
 board/ti/ks2_evm/board_k2l.c                            | 1 +
 board/ti/sdp4430/cmd_bat.c                              | 1 +
 board/toradex/apalis-tk1/apalis-tk1.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/toradex/verdin-imx8mm/spl.c                       | 1 +
 board/udoo/neo/neo.c                                    | 1 +
 board/variscite/dart_6ul/spl.c                          | 1 +
 board/varisys/common/sys_eeprom.c                       | 1 +
 board/vscom/baltos/board.c                              | 1 +
 board/wandboard/wandboard.c                             | 1 +
 board/work-microwave/work_92105/work_92105_display.c    | 1 +
 board/xes/common/board.c                                | 1 +
 board/xilinx/versal/board.c                             | 1 +
 board/xilinx/zynq/board.c                               | 1 +
 board/xilinx/zynq/bootimg.c                             | 1 +
 board/xilinx/zynq/cmds.c                                | 1 +
 board/xilinx/zynqmp/zynqmp.c                            | 1 +
 cmd/abootimg.c                                          | 1 +
 cmd/acpi.c                                              | 1 +
 cmd/adtimg.c                                            | 1 +
 cmd/aes.c                                               | 1 +
 cmd/armflash.c                                          | 1 +
 cmd/avb.c                                               | 1 +
 cmd/bcb.c                                               | 1 +
 cmd/bdinfo.c                                            | 1 +
 cmd/binop.c                                             | 1 +
 cmd/blk_common.c                                        | 1 +
 cmd/blob.c                                              | 1 +
 cmd/bmp.c                                               | 1 +
 cmd/bootefi.c                                           | 1 +
 cmd/booti.c                                             | 1 +
 cmd/bootm.c                                             | 1 +
 cmd/bootstage.c                                         | 1 +
 cmd/cache.c                                             | 1 +
 cmd/cros_ec.c                                           | 1 +
 cmd/date.c                                              | 1 +
 cmd/dfu.c                                               | 1 +
 cmd/echo.c                                              | 1 +
 cmd/eeprom.c                                            | 1 +
 cmd/efi.c                                               | 1 +
 cmd/efidebug.c                                          | 1 +
 cmd/elf.c                                               | 1 +
 cmd/ethsw.c                                             | 1 +
 cmd/fastboot.c                                          | 1 +
 cmd/fdt.c                                               | 1 +
 cmd/flash.c                                             | 1 +
 cmd/fpga.c                                              | 1 +
 cmd/fuse.c                                              | 1 +
 cmd/gpio.c                                              | 1 +
 cmd/gpt.c                                               | 1 +
 cmd/hash.c                                              | 1 +
 cmd/i2c.c                                               | 1 +
 cmd/ide.c                                               | 1 +
 cmd/irq.c                                               | 1 +
 cmd/itest.c                                             | 1 +
 cmd/jffs2.c                                             | 1 +
 cmd/led.c                                               | 1 +
 cmd/legacy_led.c                                        | 1 +
 cmd/load.c                                              | 1 +
 cmd/log.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/mvebu/bubt.c                                        | 1 +
 cmd/nand.c                                              | 1 +
 cmd/net.c                                               | 1 +
 cmd/nvedit.c                                            | 1 +
 cmd/nvedit_efi.c                                        | 1 +
 cmd/nvme.c                                              | 1 +
 cmd/onenand.c                                           | 1 +
 cmd/osd.c                                               | 1 +
 cmd/part.c                                              | 1 +
 cmd/pci.c                                               | 1 +
 cmd/pinmux.c                                            | 1 +
 cmd/regulator.c                                         | 1 +
 cmd/remoteproc.c                                        | 1 +
 cmd/rtc.c                                               | 1 +
 cmd/sata.c                                              | 1 +
 cmd/scsi.c                                              | 1 +
 cmd/setexpr.c                                           | 1 +
 cmd/sf.c                                                | 1 +
 cmd/sha1sum.c                                           | 1 +
 cmd/smccc.c                                             | 1 +
 cmd/spi.c                                               | 1 +
 cmd/strings.c                                           | 1 +
 cmd/sysboot.c                                           | 1 +
 cmd/test.c                                              | 1 +
 cmd/ti/ddr3.c                                           | 1 +
 cmd/tlv_eeprom.c                                        | 1 +
 cmd/tpm-v1.c                                            | 1 +
 cmd/tpm-v2.c                                            | 1 +
 cmd/tsi148.c                                            | 1 +
 cmd/ubi.c                                               | 1 +
 cmd/ufs.c                                               | 1 +
 cmd/universe.c                                          | 1 +
 cmd/usb.c                                               | 1 +
 cmd/usb_mass_storage.c                                  | 1 +
 cmd/virtio.c                                            | 1 +
 cmd/w1.c                                                | 1 +
 cmd/x86/mtrr.c                                          | 1 +
 cmd/ximg.c                                              | 1 +
 cmd/yaffs2.c                                            | 1 +
 cmd/zfs.c                                               | 1 +
 common/android_ab.c                                     | 1 +
 common/autoboot.c                                       | 1 +
 common/avb_verify.c                                     | 1 +
 common/bloblist.c                                       | 1 +
 common/board_f.c                                        | 1 +
 common/bootm.c                                          | 1 +
 common/bootm_os.c                                       | 1 +
 common/bootstage.c                                      | 1 +
 common/bouncebuf.c                                      | 1 +
 common/cli.c                                            | 1 +
 common/cli_hush.c                                       | 1 +
 common/cli_readline.c                                   | 1 +
 common/cli_simple.c                                     | 1 +
 common/command.c                                        | 1 +
 common/common_fit.c                                     | 1 +
 common/console.c                                        | 1 +
 common/dlmalloc.c                                       | 1 +
 common/eeprom/eeprom_layout.c                           | 1 +
 common/fdt_region.c                                     | 1 +
 common/fdt_support.c                                    | 1 +
 common/flash.c                                          | 1 +
 common/hash.c                                           | 1 +
 common/image-android.c                                  | 1 +
 common/image-cipher.c                                   | 1 +
 common/image-fdt.c                                      | 1 +
 common/image-fit-sig.c                                  | 1 +
 common/image-fit.c                                      | 1 +
 common/image-sig.c                                      | 1 +
 common/image.c                                          | 1 +
 common/init/board_init.c                                | 1 +
 common/iomux.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/malloc_simple.c                                  | 1 +
 common/menu.c                                           | 1 +
 common/miiphyutil.c                                     | 1 +
 common/spl/spl.c                                        | 1 +
 common/spl/spl_atf.c                                    | 1 +
 common/spl/spl_fit.c                                    | 1 +
 common/spl/spl_net.c                                    | 1 +
 common/spl/spl_nor.c                                    | 1 +
 common/spl/spl_ram.c                                    | 1 +
 common/spl/spl_ubi.c                                    | 1 +
 common/spl/spl_ymodem.c                                 | 1 +
 common/splash.c                                         | 1 +
 common/splash_source.c                                  | 1 +
 common/stdio.c                                          | 1 +
 common/update.c                                         | 1 +
 common/usb.c                                            | 1 +
 common/usb_hub.c                                        | 1 +
 common/usb_kbd.c                                        | 1 +
 common/usb_storage.c                                    | 1 +
 disk/part.c                                             | 1 +
 disk/part_amiga.c                                       | 1 +
 disk/part_dos.c                                         | 1 +
 disk/part_efi.c                                         | 1 +
 disk/part_iso.c                                         | 1 +
 drivers/ata/ahci.c                                      | 1 +
 drivers/ata/dwc_ahsata.c                                | 1 +
 drivers/ata/fsl_sata.c                                  | 1 +
 drivers/ata/libata.c                                    | 1 +
 drivers/ata/sata.c                                      | 1 +
 drivers/ata/sata_mv.c                                   | 1 +
 drivers/ata/sata_sil.c                                  | 1 +
 drivers/bios_emulator/atibios.c                         | 1 +
 drivers/bios_emulator/biosemu.c                         | 1 +
 drivers/bios_emulator/x86emu/debug.c                    | 1 +
 drivers/block/blk-uclass.c                              | 1 +
 drivers/block/blk_legacy.c                              | 1 +
 drivers/block/blkcache.c                                | 1 +
 drivers/block/ide.c                                     | 1 +
 drivers/block/sandbox.c                                 | 1 +
 drivers/clk/altera/clk-arria10.c                        | 1 +
 drivers/clk/clk-mux.c                                   | 1 +
 drivers/clk/clk_stm32f.c                                | 1 +
 drivers/clk/clk_versal.c                                | 1 +
 drivers/clk/mvebu/armada-37xx-periph.c                  | 1 +
 drivers/clk/renesas/clk-rcar-gen2.c                     | 1 +
 drivers/clk/rockchip/clk_rk322x.c                       | 1 +
 drivers/clk/rockchip/clk_rk3288.c                       | 1 +
 drivers/clk/rockchip/clk_rk3328.c                       | 1 +
 drivers/clk/rockchip/clk_rk3368.c                       | 1 +
 drivers/clk/rockchip/clk_rk3399.c                       | 1 +
 drivers/clk/sifive/fu540-prci.c                         | 1 +
 drivers/core/acpi.c                                     | 1 +
 drivers/core/device.c                                   | 1 +
 drivers/core/lists.c                                    | 1 +
 drivers/core/of_access.c                                | 1 +
 drivers/core/of_addr.c                                  | 1 +
 drivers/core/of_extra.c                                 | 1 +
 drivers/core/ofnode.c                                   | 1 +
 drivers/core/uclass.c                                   | 1 +
 drivers/cpu/cpu-uclass.c                                | 1 +
 drivers/cpu/cpu_sandbox.c                               | 1 +
 drivers/cpu/imx8_cpu.c                                  | 1 +
 drivers/cpu/riscv_cpu.c                                 | 1 +
 drivers/crypto/ace_sha.c                                | 1 +
 drivers/crypto/fsl/desc_constr.h                        | 1 +
 drivers/crypto/fsl/error.c                              | 1 +
 drivers/crypto/fsl/fsl_hash.c                           | 1 +
 drivers/crypto/fsl/jobdesc.c                            | 1 +
 drivers/crypto/fsl/jr.c                                 | 1 +
 drivers/crypto/fsl/rng.c                                | 1 +
 drivers/ddr/altera/sdram_arria10.c                      | 1 +
 drivers/ddr/altera/sdram_gen5.c                         | 1 +
 drivers/ddr/altera/sdram_soc64.c                        | 1 +
 drivers/ddr/altera/sequencer.c                          | 1 +
 drivers/ddr/fsl/ctrl_regs.c                             | 1 +
 drivers/ddr/fsl/ddr1_dimm_params.c                      | 1 +
 drivers/ddr/fsl/ddr2_dimm_params.c                      | 1 +
 drivers/ddr/fsl/ddr3_dimm_params.c                      | 1 +
 drivers/ddr/fsl/ddr4_dimm_params.c                      | 1 +
 drivers/ddr/fsl/interactive.c                           | 1 +
 drivers/ddr/fsl/main.c                                  | 1 +
 drivers/ddr/marvell/axp/ddr3_hw_training.c              | 1 +
 drivers/ddr/marvell/axp/ddr3_pbs.c                      | 1 +
 drivers/ddr/marvell/axp/ddr3_spd.c                      | 1 +
 drivers/ddr/marvell/axp/ddr3_write_leveling.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_tftp.c                                  | 1 +
 drivers/dma/apbh_dma.c                                  | 1 +
 drivers/dma/keystone_nav.c                              | 1 +
 drivers/dma/sandbox-dma-test.c                          | 1 +
 drivers/dma/ti-edma3.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/fastboot/fb_mmc.c                               | 1 +
 drivers/fastboot/fb_nand.c                              | 1 +
 drivers/firmware/psci.c                                 | 1 +
 drivers/firmware/ti_sci.c                               | 1 +
 drivers/fpga/fpga.c                                     | 1 +
 drivers/fpga/socfpga_arria10.c                          | 1 +
 drivers/fpga/stratix10.c                                | 1 +
 drivers/fpga/versalpl.c                                 | 1 +
 drivers/fpga/xilinx.c                                   | 1 +
 drivers/gpio/74x164_gpio.c                              | 1 +
 drivers/gpio/adi_gpio2.c                                | 1 +
 drivers/gpio/axp_gpio.c                                 | 1 +
 drivers/gpio/da8xx_gpio.c                               | 1 +
 drivers/gpio/gpio-uclass.c                              | 1 +
 drivers/gpio/hi6220_gpio.c                              | 1 +
 drivers/gpio/imx_rgpio2p.c                              | 1 +
 drivers/gpio/intel_gpio.c                               | 1 +
 drivers/gpio/lpc32xx_gpio.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_gpio.c                             | 1 +
 drivers/gpio/pic32_gpio.c                               | 1 +
 drivers/gpio/rk_gpio.c                                  | 1 +
 drivers/gpio/sifive-gpio.c                              | 1 +
 drivers/gpio/sunxi_gpio.c                               | 1 +
 drivers/gpio/xilinx_gpio.c                              | 1 +
 drivers/gpio/zynq_gpio.c                                | 1 +
 drivers/i2c/fsl_i2c.c                                   | 1 +
 drivers/i2c/i2c-uclass.c                                | 1 +
 drivers/i2c/ihs_i2c.c                                   | 1 +
 drivers/i2c/intel_i2c.c                                 | 1 +
 drivers/i2c/lpc32xx_i2c.c                               | 1 +
 drivers/i2c/muxes/i2c-mux-uclass.c                      | 1 +
 drivers/i2c/mv_i2c.c                                    | 1 +
 drivers/i2c/mvtwsi.c                                    | 1 +
 drivers/i2c/stm32f7_i2c.c                               | 1 +
 drivers/i2c/tegra186_bpmp_i2c.c                         | 1 +
 drivers/i2c/tegra_i2c.c                                 | 1 +
 drivers/input/cros_ec_keyb.c                            | 1 +
 drivers/input/i8042.c                                   | 1 +
 drivers/input/input.c                                   | 1 +
 drivers/input/key_matrix.c                              | 1 +
 drivers/input/keyboard-uclass.c                         | 1 +
 drivers/input/tegra-kbc.c                               | 1 +
 drivers/led/led-uclass.c                                | 1 +
 drivers/misc/atsha204a-i2c.c                            | 1 +
 drivers/misc/cbmem_console.c                            | 1 +
 drivers/misc/cros_ec.c                                  | 1 +
 drivers/misc/cros_ec_i2c.c                              | 1 +
 drivers/misc/cros_ec_sandbox.c                          | 1 +
 drivers/misc/cros_ec_spi.c                              | 1 +
 drivers/misc/ds4510.c                                   | 1 +
 drivers/misc/fsl_portals.c                              | 1 +
 drivers/misc/gdsys_ioep.c                               | 1 +
 drivers/misc/i2c_eeprom_emul.c                          | 1 +
 drivers/misc/ihs_fpga.c                                 | 1 +
 drivers/misc/misc_sandbox.c                             | 1 +
 drivers/misc/mpc83xx_serdes.c                           | 1 +
 drivers/misc/qfw.c                                      | 1 +
 drivers/misc/rockchip-efuse.c                           | 1 +
 drivers/misc/sifive-otp.c                               | 1 +
 drivers/misc/tegra186_bpmp.c                            | 1 +
 drivers/misc/vexpress_config.c                          | 1 +
 drivers/mmc/ca_dw_mmc.c                                 | 1 +
 drivers/mmc/davinci_mmc.c                               | 1 +
 drivers/mmc/fsl_esdhc_imx.c                             | 1 +
 drivers/mmc/fsl_esdhc_spl.c                             | 1 +
 drivers/mmc/ftsdc010_mci.c                              | 1 +
 drivers/mmc/iproc_sdhci.c                               | 1 +
 drivers/mmc/meson_gx_mmc.c                              | 1 +
 drivers/mmc/mmc.c                                       | 1 +
 drivers/mmc/mmc_spi.c                                   | 1 +
 drivers/mmc/msm_sdhci.c                                 | 1 +
 drivers/mmc/mv_sdhci.c                                  | 1 +
 drivers/mmc/mxcmmc.c                                    | 1 +
 drivers/mmc/mxsmmc.c                                    | 1 +
 drivers/mmc/pxa_mmc_gen.c                               | 1 +
 drivers/mmc/rpmb.c                                      | 1 +
 drivers/mmc/sandbox_mmc.c                               | 1 +
 drivers/mmc/sdhci.c                                     | 1 +
 drivers/mmc/sh_mmcif.c                                  | 1 +
 drivers/mmc/snps_dw_mmc.c                               | 1 +
 drivers/mmc/sti_sdhci.c                                 | 1 +
 drivers/mmc/sunxi_mmc.c                                 | 1 +
 drivers/mmc/xenon_sdhci.c                               | 1 +
 drivers/mtd/altera_qspi.c                               | 1 +
 drivers/mtd/cfi_flash.c                                 | 1 +
 drivers/mtd/cfi_mtd.c                                   | 1 +
 drivers/mtd/mtd_uboot.c                                 | 1 +
 drivers/mtd/mtdpart.c                                   | 1 +
 drivers/mtd/nand/raw/atmel_nand.c                       | 1 +
 drivers/mtd/nand/raw/brcmnand/brcmnand.c                | 1 +
 drivers/mtd/nand/raw/denali.c                           | 1 +
 drivers/mtd/nand/raw/denali_spl.c                       | 1 +
 drivers/mtd/nand/raw/fsmc_nand.c                        | 1 +
 drivers/mtd/nand/raw/lpc32xx_nand_mlc.c                 | 1 +
 drivers/mtd/nand/raw/mxs_nand.c                         | 1 +
 drivers/mtd/nand/raw/mxs_nand_spl.c                     | 1 +
 drivers/mtd/nand/raw/nand_base.c                        | 1 +
 drivers/mtd/nand/raw/nand_bch.c                         | 1 +
 drivers/mtd/nand/raw/nand_spl_loaders.c                 | 1 +
 drivers/mtd/nand/raw/nand_util.c                        | 1 +
 drivers/mtd/nand/raw/omap_gpmc.c                        | 1 +
 drivers/mtd/nand/raw/pxa3xx_nand.c                      | 1 +
 drivers/mtd/nand/raw/sunxi_nand.c                       | 1 +
 drivers/mtd/nand/raw/sunxi_nand_spl.c                   | 1 +
 drivers/mtd/nand/raw/tegra_nand.c                       | 1 +
 drivers/mtd/nand/raw/vf610_nfc.c                        | 1 +
 drivers/mtd/nand/spi/core.c                             | 1 +
 drivers/mtd/onenand/onenand_base.c                      | 1 +
 drivers/mtd/onenand/onenand_bbt.c                       | 1 +
 drivers/mtd/onenand/onenand_spl.c                       | 1 +
 drivers/mtd/onenand/onenand_uboot.c                     | 1 +
 drivers/mtd/onenand/samsung.c                           | 1 +
 drivers/mtd/pic32_flash.c                               | 1 +
 drivers/mtd/spi/fsl_espi_spl.c                          | 1 +
 drivers/mtd/spi/sandbox.c                               | 1 +
 drivers/mtd/spi/sf-uclass.c                             | 1 +
 drivers/mtd/spi/sf_dataflash.c                          | 1 +
 drivers/mtd/spi/sf_mtd.c                                | 1 +
 drivers/mtd/spi/sf_probe.c                              | 1 +
 drivers/mtd/spi/spi-nor-core.c                          | 1 +
 drivers/mtd/spi/spi-nor-tiny.c                          | 1 +
 drivers/mtd/ubi/attach.c                                | 1 +
 drivers/mtd/ubi/build.c                                 | 1 +
 drivers/mtd/ubi/debug.c                                 | 1 +
 drivers/mtd/ubi/eba.c                                   | 1 +
 drivers/mtd/ubi/fastmap.c                               | 1 +
 drivers/mtd/ubi/io.c                                    | 1 +
 drivers/mtd/ubi/kapi.c                                  | 1 +
 drivers/mtd/ubi/upd.c                                   | 1 +
 drivers/mtd/ubi/vmt.c                                   | 1 +
 drivers/mtd/ubi/vtbl.c                                  | 1 +
 drivers/mtd/ubispl/ubispl.c                             | 1 +
 drivers/net/ag7xxx.c                                    | 1 +
 drivers/net/altera_tse.c                                | 1 +
 drivers/net/armada100_fec.c                             | 1 +
 drivers/net/at91_emac.c                                 | 1 +
 drivers/net/ax88180.c                                   | 1 +
 drivers/net/bcm-sf2-eth-gmac.c                          | 1 +
 drivers/net/bcm-sf2-eth.c                               | 1 +
 drivers/net/bcm6368-eth.c                               | 1 +
 drivers/net/calxedaxgmac.c                              | 1 +
 drivers/net/dc2114x.c                                   | 1 +
 drivers/net/designware.c                                | 1 +
 drivers/net/dm9000x.c                                   | 1 +
 drivers/net/dnet.c                                      | 1 +
 drivers/net/dwc_eth_qos.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/fm.c                                     | 1 +
 drivers/net/fm/init.c                                   | 1 +
 drivers/net/fm/memac_phy.c                              | 1 +
 drivers/net/fm/tgec_phy.c                               | 1 +
 drivers/net/fsl-mc/dpio/qbman_portal.c                  | 1 +
 drivers/net/fsl-mc/dpio/qbman_sys.h                     | 1 +
 drivers/net/fsl-mc/mc.c                                 | 1 +
 drivers/net/fsl_enetc.c                                 | 1 +
 drivers/net/fsl_mcdmafec.c                              | 1 +
 drivers/net/fsl_mdio.c                                  | 1 +
 drivers/net/ftmac100.c                                  | 1 +
 drivers/net/ftmac110.c                                  | 1 +
 drivers/net/gmac_rockchip.c                             | 1 +
 drivers/net/higmacv300.c                                | 1 +
 drivers/net/lan91c96.c                                  | 1 +
 drivers/net/ldpaa_eth/ldpaa_eth.c                       | 1 +
 drivers/net/lpc32xx_eth.c                               | 1 +
 drivers/net/macb.c                                      | 1 +
 drivers/net/mcffec.c                                    | 1 +
 drivers/net/mcfmii.c                                    | 1 +
 drivers/net/mpc8xx_fec.c                                | 1 +
 drivers/net/mscc_eswitch/jr2_switch.c                   | 1 +
 drivers/net/mscc_eswitch/luton_switch.c                 | 1 +
 drivers/net/mscc_eswitch/ocelot_switch.c                | 1 +
 drivers/net/mscc_eswitch/serval_switch.c                | 1 +
 drivers/net/mscc_eswitch/servalt_switch.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/ne2000_base.c                               | 1 +
 drivers/net/netconsole.c                                | 1 +
 drivers/net/ns8382x.c                                   | 1 +
 drivers/net/pch_gbe.c                                   | 1 +
 drivers/net/pcnet.c                                     | 1 +
 drivers/net/pfe_eth/pfe_cmd.c                           | 1 +
 drivers/net/pfe_eth/pfe_driver.c                        | 1 +
 drivers/net/pfe_eth/pfe_firmware.c                      | 1 +
 drivers/net/pfe_eth/pfe_hw.c                            | 1 +
 drivers/net/phy/aquantia.c                              | 1 +
 drivers/net/phy/atheros.c                               | 1 +
 drivers/net/phy/b53.c                                   | 1 +
 drivers/net/phy/fixed.c                                 | 1 +
 drivers/net/phy/miiphybb.c                              | 1 +
 drivers/net/phy/mv88e61xx.c                             | 1 +
 drivers/net/phy/mv88e6352.c                             | 1 +
 drivers/net/phy/ncsi.c                                  | 1 +
 drivers/net/phy/phy.c                                   | 1 +
 drivers/net/pic32_mdio.c                                | 1 +
 drivers/net/ravb.c                                      | 1 +
 drivers/net/rtl8139.c                                   | 1 +
 drivers/net/rtl8169.c                                   | 1 +
 drivers/net/sandbox-raw-bus.c                           | 1 +
 drivers/net/sandbox-raw.c                               | 1 +
 drivers/net/sandbox.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/sunxi_emac.c                                | 1 +
 drivers/net/ti/cpsw-common.c                            | 1 +
 drivers/net/ti/cpsw.c                                   | 1 +
 drivers/net/ti/davinci_emac.c                           | 1 +
 drivers/net/tsec.c                                      | 1 +
 drivers/net/uli526x.c                                   | 1 +
 drivers/net/xilinx_axi_emac.c                           | 1 +
 drivers/net/zynq_gem.c                                  | 1 +
 drivers/nvme/nvme.c                                     | 1 +
 drivers/pci/fsl_pci_init.c                              | 1 +
 drivers/pci/pci-uclass.c                                | 1 +
 drivers/pci/pci_ftpci100.c                              | 1 +
 drivers/pci/pci_rom.c                                   | 1 +
 drivers/pci/pci_tegra.c                                 | 1 +
 drivers/pci/pcie_imx.c                                  | 1 +
 drivers/pci/pcie_layerscape_fixup_common.c              | 1 +
 drivers/pci_endpoint/sandbox-pci_ep.c                   | 1 +
 drivers/phy/allwinner/phy-sun4i-usb.c                   | 1 +
 drivers/phy/rockchip/phy-rockchip-inno-usb2.c           | 1 +
 drivers/phy/rockchip/phy-rockchip-typec.c               | 1 +
 drivers/pinctrl/exynos/pinctrl-exynos.c                 | 1 +
 drivers/pinctrl/mtmips/pinctrl-mtmips-common.c          | 1 +
 drivers/pinctrl/mvebu/pinctrl-armada-37xx.c             | 1 +
 drivers/pinctrl/pinctrl-generic.c                       | 1 +
 drivers/pinctrl/pinctrl-sandbox.c                       | 1 +
 drivers/pinctrl/pinctrl-stmfx.c                         | 1 +
 drivers/pinctrl/rockchip/pinctrl-rockchip-core.c        | 1 +
 drivers/power/domain/imx8-power-domain-legacy.c         | 1 +
 drivers/power/pmic/i2c_pmic_emul.c                      | 1 +
 drivers/power/pmic/palmas.c                             | 1 +
 drivers/power/pmic/pmic-uclass.c                        | 1 +
 drivers/power/power_core.c                              | 1 +
 drivers/power/power_i2c.c                               | 1 +
 drivers/power/regulator/bd71837.c                       | 1 +
 drivers/power/regulator/da9063.c                        | 1 +
 drivers/power/regulator/palmas_regulator.c              | 1 +
 drivers/power/regulator/pfuze100.c                      | 1 +
 drivers/power/regulator/regulator-uclass.c              | 1 +
 drivers/qe/qe.c                                         | 1 +
 drivers/qe/uccf.c                                       | 1 +
 drivers/qe/uec.c                                        | 1 +
 drivers/qe/uec_phy.c                                    | 1 +
 drivers/ram/imxrt_sdram.c                               | 1 +
 drivers/ram/rockchip/sdram_rk3188.c                     | 1 +
 drivers/ram/rockchip/sdram_rk322x.c                     | 1 +
 drivers/ram/rockchip/sdram_rk3288.c                     | 1 +
 drivers/ram/rockchip/sdram_rk3328.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_ram.c                     | 1 +
 drivers/ram/stm32mp1/stm32mp1_tests.c                   | 1 +
 drivers/ram/stm32mp1/stm32mp1_tuning.c                  | 1 +
 drivers/remoteproc/k3_system_controller.c               | 1 +
 drivers/remoteproc/rproc-elf-loader.c                   | 1 +
 drivers/remoteproc/rproc-uclass.c                       | 1 +
 drivers/remoteproc/ti_k3_dsp_rproc.c                    | 1 +
 drivers/remoteproc/ti_k3_r5f_rproc.c                    | 1 +
 drivers/remoteproc/ti_power_proc.c                      | 1 +
 drivers/rng/meson-rng.c                                 | 1 +
 drivers/rng/stm32mp1_rng.c                              | 1 +
 drivers/rtc/ds1302.c                                    | 1 +
 drivers/rtc/i2c_rtc_emul.c                              | 1 +
 drivers/rtc/rs5c372.c                                   | 1 +
 drivers/scsi/scsi.c                                     | 1 +
 drivers/serial/sandbox.c                                | 1 +
 drivers/serial/serial-uclass.c                          | 1 +
 drivers/serial/serial.c                                 | 1 +
 drivers/serial/usbtty.c                                 | 1 +
 drivers/smem/msm_smem.c                                 | 1 +
 drivers/soc/soc-uclass.c                                | 1 +
 drivers/soc/ti/k3-navss-ringacc.c                       | 1 +
 drivers/spi/atcspi200_spi.c                             | 1 +
 drivers/spi/bcmstb_spi.c                                | 1 +
 drivers/spi/cadence_qspi_apb.c                          | 1 +
 drivers/spi/cf_spi.c                                    | 1 +
 drivers/spi/fsl_espi.c                                  | 1 +
 drivers/spi/fsl_qspi.c                                  | 1 +
 drivers/spi/ich.c                                       | 1 +
 drivers/spi/meson_spifc.c                               | 1 +
 drivers/spi/mtk_snfi_spi.c                              | 1 +
 drivers/spi/mxc_spi.c                                   | 1 +
 drivers/spi/mxs_spi.c                                   | 1 +
 drivers/spi/nxp_fspi.c                                  | 1 +
 drivers/spi/renesas_rpc_spi.c                           | 1 +
 drivers/spi/spi-mem-nodm.c                              | 1 +
 drivers/spi/spi-mem.c                                   | 1 +
 drivers/spi/spi-sifive.c                                | 1 +
 drivers/spi/spi.c                                       | 1 +
 drivers/spi/tegra210_qspi.c                             | 1 +
 drivers/spi/zynq_qspi.c                                 | 1 +
 drivers/spi/zynqmp_gqspi.c                              | 1 +
 drivers/sysreset/sysreset_sandbox.c                     | 1 +
 drivers/tee/broadcom/chimp_optee.c                      | 1 +
 drivers/tee/optee/core.c                                | 1 +
 drivers/tee/sandbox.c                                   | 1 +
 drivers/tee/tee-uclass.c                                | 1 +
 drivers/thermal/imx_scu_thermal.c                       | 1 +
 drivers/thermal/imx_tmu.c                               | 1 +
 drivers/tpm/cr50_i2c.c                                  | 1 +
 drivers/tpm/tpm-uclass.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_atmel_twi.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/ufs/ufs.c                                       | 2 ++
 drivers/usb/cdns3/gadget.c                              | 1 +
 drivers/usb/common/common.c                             | 1 +
 drivers/usb/common/fsl-dt-fixup.c                       | 1 +
 drivers/usb/dwc3/ep0.c                                  | 1 +
 drivers/usb/dwc3/gadget.c                               | 1 +
 drivers/usb/dwc3/linux-compat.h                         | 1 +
 drivers/usb/emul/sandbox_flash.c                        | 1 +
 drivers/usb/emul/sandbox_keyb.c                         | 1 +
 drivers/usb/emul/usb-emul-uclass.c                      | 1 +
 drivers/usb/eth/asix.c                                  | 1 +
 drivers/usb/eth/asix88179.c                             | 1 +
 drivers/usb/eth/lan75xx.c                               | 1 +
 drivers/usb/eth/lan78xx.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/eth/usb_ether.c                             | 1 +
 drivers/usb/gadget/at91_udc.c                           | 1 +
 drivers/usb/gadget/atmel_usba_udc.c                     | 1 +
 drivers/usb/gadget/ci_udc.c                             | 1 +
 drivers/usb/gadget/composite.c                          | 1 +
 drivers/usb/gadget/designware_udc.c                     | 1 +
 drivers/usb/gadget/dwc2_udc_otg.c                       | 1 +
 drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c              | 1 +
 drivers/usb/gadget/epautoconf.c                         | 1 +
 drivers/usb/gadget/ether.c                              | 1 +
 drivers/usb/gadget/f_dfu.c                              | 1 +
 drivers/usb/gadget/f_fastboot.c                         | 1 +
 drivers/usb/gadget/f_mass_storage.c                     | 1 +
 drivers/usb/gadget/f_rockusb.c                          | 1 +
 drivers/usb/gadget/f_sdp.c                              | 1 +
 drivers/usb/gadget/f_thor.c                             | 1 +
 drivers/usb/gadget/fotg210.c                            | 1 +
 drivers/usb/gadget/g_dnl.c                              | 1 +
 drivers/usb/gadget/gadget_chips.h                       | 2 ++
 drivers/usb/gadget/pxa25x_udc.c                         | 1 +
 drivers/usb/gadget/rndis.c                              | 1 +
 drivers/usb/gadget/usbstring.c                          | 1 +
 drivers/usb/host/dwc2.c                                 | 1 +
 drivers/usb/host/ehci-fsl.c                             | 1 +
 drivers/usb/host/ehci-hcd.c                             | 1 +
 drivers/usb/host/ehci-mx5.c                             | 1 +
 drivers/usb/host/ehci-omap.c                            | 1 +
 drivers/usb/host/ehci-tegra.c                           | 1 +
 drivers/usb/host/ehci-vf.c                              | 1 +
 drivers/usb/host/ohci-hcd.c                             | 1 +
 drivers/usb/host/r8a66597-hcd.c                         | 1 +
 drivers/usb/host/r8a66597.h                             | 1 +
 drivers/usb/host/sl811-hcd.c                            | 1 +
 drivers/usb/host/usb-uclass.c                           | 1 +
 drivers/usb/host/xhci-dwc3.c                            | 1 +
 drivers/usb/host/xhci-mem.c                             | 1 +
 drivers/usb/host/xhci.c                                 | 1 +
 drivers/usb/musb-new/am35x.c                            | 1 +
 drivers/usb/musb-new/mt85xx.c                           | 1 +
 drivers/usb/musb-new/musb_core.c                        | 1 +
 drivers/usb/musb-new/musb_gadget.c                      | 1 +
 drivers/usb/musb-new/musb_uboot.c                       | 1 +
 drivers/usb/musb-new/pic32.c                            | 1 +
 drivers/usb/musb-new/sunxi.c                            | 1 +
 drivers/usb/musb-new/ti-musb.c                          | 1 +
 drivers/usb/musb/am35x.c                                | 1 +
 drivers/usb/musb/musb_hcd.c                             | 1 +
 drivers/video/am335x-fb.c                               | 1 +
 drivers/video/ati_radeon_fb.c                           | 1 +
 drivers/video/bridge/anx6345.c                          | 1 +
 drivers/video/cfb_console.c                             | 1 +
 drivers/video/console_truetype.c                        | 1 +
 drivers/video/da8xx-fb.c                                | 1 +
 drivers/video/dw_hdmi.c                                 | 1 +
 drivers/video/dw_mipi_dsi.c                             | 1 +
 drivers/video/exynos/exynos_dp.c                        | 1 +
 drivers/video/exynos/exynos_mipi_dsi.c                  | 1 +
 drivers/video/fsl_dcu_fb.c                              | 1 +
 drivers/video/fsl_diu_fb.c                              | 1 +
 drivers/video/ihs_video_out.c                           | 1 +
 drivers/video/imx/ipu_common.c                          | 1 +
 drivers/video/lg4573.c                                  | 1 +
 drivers/video/logicore_dp_tx.c                          | 1 +
 drivers/video/mali_dp.c                                 | 1 +
 drivers/video/meson/meson_venc.c                        | 1 +
 drivers/video/mipi_dsi.c                                | 1 +
 drivers/video/mx3fb.c                                   | 1 +
 drivers/video/mxsfb.c                                   | 1 +
 drivers/video/orisetech_otm8009a.c                      | 1 +
 drivers/video/raydium-rm68200.c                         | 1 +
 drivers/video/rockchip/rk_edp.c                         | 1 +
 drivers/video/sandbox_osd.c                             | 1 +
 drivers/video/simplefb.c                                | 1 +
 drivers/video/stb_truetype.h                            | 2 ++
 drivers/video/sunxi/sunxi_de2.c                         | 1 +
 drivers/video/sunxi/sunxi_display.c                     | 1 +
 drivers/video/sunxi/sunxi_lcd.c                         | 1 +
 drivers/video/tegra124/dp.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_mmio.c                            | 1 +
 drivers/virtio/virtio_net.c                             | 1 +
 drivers/virtio/virtio_pci_modern.c                      | 1 +
 drivers/virtio/virtio_ring.c                            | 1 +
 drivers/virtio/virtio_rng.c                             | 1 +
 drivers/w1-eeprom/ds2502.c                              | 1 +
 drivers/w1-eeprom/eep_sandbox.c                         | 1 +
 drivers/watchdog/mpc8xx_wdt.c                           | 1 +
 env/callback.c                                          | 1 +
 env/common.c                                            | 1 +
 env/ext4.c                                              | 1 +
 env/fat.c                                               | 1 +
 env/flash.c                                             | 1 +
 env/mmc.c                                               | 1 +
 env/nvram.c                                             | 1 +
 env/ubi.c                                               | 1 +
 examples/api/demo.c                                     | 1 +
 examples/api/glue.c                                     | 1 +
 examples/standalone/atmel_df_pow2.c                     | 1 +
 fs/btrfs/super.c                                        | 1 +
 fs/cbfs/cbfs.c                                          | 1 +
 fs/cramfs/cramfs.c                                      | 1 +
 fs/ext4/ext4_common.c                                   | 1 +
 fs/ext4/ext4_common.h                                   | 1 +
 fs/ext4/ext4_journal.c                                  | 1 +
 fs/ext4/ext4_write.c                                    | 1 +
 fs/ext4/ext4fs.c                                        | 1 +
 fs/fat/fat.c                                            | 1 +
 fs/fat/fat_write.c                                      | 1 +
 fs/fs.c                                                 | 1 +
 fs/fs_internal.c                                        | 1 +
 fs/jffs2/compr_zlib.c                                   | 1 +
 fs/jffs2/jffs2_1pass.c                                  | 1 +
 fs/jffs2/mini_inflate.c                                 | 1 +
 fs/reiserfs/reiserfs.c                                  | 1 +
 fs/ubifs/debug.c                                        | 1 +
 fs/ubifs/io.c                                           | 1 +
 fs/ubifs/key.h                                          | 1 +
 fs/ubifs/log.c                                          | 1 +
 fs/ubifs/lprops.c                                       | 1 +
 fs/ubifs/lpt_commit.c                                   | 1 +
 fs/ubifs/recovery.c                                     | 1 +
 fs/ubifs/replay.c                                       | 1 +
 fs/ubifs/super.c                                        | 1 +
 fs/ubifs/tnc.c                                          | 1 +
 fs/ubifs/ubifs.c                                        | 1 +
 fs/yaffs2/yaffs_mtdif2.c                                | 1 +
 fs/yaffs2/yaffs_uboot_glue.c                            | 1 +
 fs/yaffs2/yaffsfs.c                                     | 1 +
 fs/yaffs2/ydirectenv.h                                  | 1 +
 fs/zfs/zfs.c                                            | 1 +
 include/common.h                                        | 1 -
 include/dm/of.h                                         | 1 +
 include/exception.h                                     | 1 +
 include/exports.h                                       | 1 +
 include/fdt_support.h                                   | 1 +
 include/imx8image.h                                     | 1 +
 include/malloc.h                                        | 2 +-
 include/net.h                                           | 1 +
 include/spi_flash.h                                     | 1 +
 include/test/ut.h                                       | 1 +
 include/tlv_eeprom.h                                    | 1 +
 include/video_console.h                                 | 1 +
 lib/acpi/acpi_device.c                                  | 1 +
 lib/acpi/acpi_dp.c                                      | 1 +
 lib/acpi/acpi_table.c                                   | 1 +
 lib/acpi/acpigen.c                                      | 1 +
 lib/aes.c                                               | 1 +
 lib/aes/aes-decrypt.c                                   | 1 +
 lib/bch.c                                               | 1 +
 lib/bzip2/bzlib.c                                       | 1 +
 lib/charset.c                                           | 1 +
 lib/crc16.c                                             | 1 +
 lib/crc32.c                                             | 1 +
 lib/crypto/pkcs7_verify.c                               | 1 +
 lib/crypto/public_key.c                                 | 1 +
 lib/crypto/x509_public_key.c                            | 1 +
 lib/dhry/dhry_1.c                                       | 1 +
 lib/dhry/dhry_2.c                                       | 1 +
 lib/efi/efi_app.c                                       | 1 +
 lib/efi/efi_stub.c                                      | 1 +
 lib/efi_loader/efi_bootmgr.c                            | 1 +
 lib/efi_loader/efi_boottime.c                           | 1 +
 lib/efi_loader/efi_console.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_file.c                               | 1 +
 lib/efi_loader/efi_freestanding.c                       | 1 +
 lib/efi_loader/efi_gop.c                                | 1 +
 lib/efi_loader/efi_hii.c                                | 1 +
 lib/efi_loader/efi_image_loader.c                       | 1 +
 lib/efi_loader/efi_load_initrd.c                        | 1 +
 lib/efi_loader/efi_net.c                                | 1 +
 lib/efi_loader/efi_runtime.c                            | 1 +
 lib/efi_loader/efi_setup.c                              | 1 +
 lib/efi_loader/efi_signature.c                          | 1 +
 lib/efi_loader/efi_unicode_collation.c                  | 1 +
 lib/efi_loader/efi_var_file.c                           | 1 +
 lib/efi_loader/efi_var_mem.c                            | 1 +
 lib/efi_loader/efi_variable.c                           | 1 +
 lib/efi_loader/efi_variable_tee.c                       | 1 +
 lib/efi_loader/helloworld.c                             | 1 +
 lib/efi_selftest/efi_selftest_block_device.c            | 1 +
 lib/efi_selftest/efi_selftest_config_table.c            | 1 +
 lib/efi_selftest/efi_selftest_load_initrd.c             | 1 +
 lib/efi_selftest/efi_selftest_loaded_image.c            | 1 +
 lib/efi_selftest/efi_selftest_loadimage.c               | 1 +
 lib/efi_selftest/efi_selftest_manageprotocols.c         | 1 +
 lib/efi_selftest/efi_selftest_mem.c                     | 1 +
 lib/efi_selftest/efi_selftest_memory.c                  | 1 +
 lib/efi_selftest/efi_selftest_rng.c                     | 1 +
 lib/efi_selftest/efi_selftest_set_virtual_address_map.c | 1 +
 lib/efi_selftest/efi_selftest_snp.c                     | 1 +
 lib/efi_selftest/efi_selftest_startimage_exit.c         | 1 +
 lib/efi_selftest/efi_selftest_variables.c               | 1 +
 lib/efi_selftest/efi_selftest_variables_runtime.c       | 1 +
 lib/elf.c                                               | 1 +
 lib/fdtdec.c                                            | 1 +
 lib/fdtdec_test.c                                       | 1 +
 lib/gunzip.c                                            | 1 +
 lib/libavb/avb_sysdeps_posix.c                          | 1 +
 lib/linux_compat.c                                      | 1 +
 lib/list_sort.c                                         | 1 +
 lib/lz4.c                                               | 1 +
 lib/lz4_wrapper.c                                       | 1 +
 lib/lzo/lzo1x_decompress.c                              | 1 +
 lib/membuff.c                                           | 1 +
 lib/of_live.c                                           | 1 +
 lib/optee/optee.c                                       | 1 +
 lib/physmem.c                                           | 1 +
 lib/qsort.c                                             | 1 +
 lib/rsa/rsa-keyprop.c                                   | 1 +
 lib/rsa/rsa-mod-exp.c                                   | 1 +
 lib/rsa/rsa-verify.c                                    | 1 +
 lib/slre.c                                              | 1 +
 lib/smbios.c                                            | 1 +
 lib/strto.c                                             | 1 +
 lib/tpm-common.c                                        | 1 +
 lib/tpm-v1.c                                            | 1 +
 lib/tpm-v2.c                                            | 1 +
 lib/trace.c                                             | 1 +
 lib/uuid.c                                              | 1 +
 lib/zstd/zstd_opt.h                                     | 1 +
 net/arp.c                                               | 1 +
 net/bootp.c                                             | 1 +
 net/cdp.c                                               | 1 +
 net/dns.c                                               | 1 +
 net/eth-uclass.c                                        | 1 +
 net/eth_common.c                                        | 1 +
 net/eth_legacy.c                                        | 1 +
 net/fastboot.c                                          | 1 +
 net/link_local.c                                        | 1 +
 net/mdio-uclass.c                                       | 1 +
 net/net.c                                               | 1 +
 net/net_rand.h                                          | 1 +
 net/nfs.c                                               | 1 +
 net/pcap.c                                              | 1 +
 net/rarp.c                                              | 1 +
 net/sntp.c                                              | 1 +
 net/tftp.c                                              | 1 +
 net/wol.c                                               | 1 +
 post/drivers/flash.c                                    | 1 +
 post/lib_powerpc/multi.c                                | 1 +
 post/lib_powerpc/string.c                               | 1 +
 post/post.c                                             | 1 +
 1228 files changed, 1232 insertions(+), 4 deletions(-)

diff --git a/api/api.c b/api/api.c
index 2e955f7baf24..05f0203584df 100644
--- a/api/api.c
+++ b/api/api.c
@@ -13,6 +13,7 @@
 #include <env_internal.h>
 #include <time.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include <linux/types.h>
 #include <api_public.h>
 #include <u-boot/crc.h>
diff --git a/api/api_net.c b/api/api_net.c
index 7515c26e8b44..63ac3ee09c74 100644
--- a/api/api_net.c
+++ b/api/api_net.c
@@ -8,6 +8,7 @@
 #include <config.h>
 #include <common.h>
 #include <net.h>
+#include <linux/string.h>
 #include <linux/types.h>
 #include <api_public.h>
 
diff --git a/arch/arc/lib/relocate.c b/arch/arc/lib/relocate.c
index 7f531c95eec6..a1663c1eb393 100644
--- a/arch/arc/lib/relocate.c
+++ b/arch/arc/lib/relocate.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <asm-generic/sections.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 
 extern ulong __image_copy_start;
 extern ulong __ivt_start;
diff --git a/arch/arm/cpu/arm1136/mx35/generic.c b/arch/arm/cpu/arm1136/mx35/generic.c
index cbf76ab4feec..99e7ec0744fb 100644
--- a/arch/arm/cpu/arm1136/mx35/generic.c
+++ b/arch/arm/cpu/arm1136/mx35/generic.c
@@ -24,6 +24,7 @@
 #endif
 #include <netdev.h>
 #include <spl.h>
+#include <linux/string.h>
 
 #define CLK_CODE(arm, ahb, sel) (((arm) << 16) + ((ahb) << 8) + (sel))
 #define CLK_CODE_ARM(c)		(((c) >> 16) & 0xFF)
diff --git a/arch/arm/cpu/arm926ejs/mxs/mxs.c b/arch/arm/cpu/arm926ejs/mxs/mxs.c
index c9362136fbf9..91ea4f02d02e 100644
--- a/arch/arm/cpu/arm926ejs/mxs/mxs.c
+++ b/arch/arm/cpu/arm926ejs/mxs/mxs.c
@@ -26,6 +26,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
 #include <linux/compiler.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/cpu/arm926ejs/mxs/spl_boot.c b/arch/arm/cpu/arm926ejs/mxs/spl_boot.c
index a16a15e79d83..35f503f93b06 100644
--- a/arch/arm/cpu/arm926ejs/mxs/spl_boot.c
+++ b/arch/arm/cpu/arm926ejs/mxs/spl_boot.c
@@ -17,6 +17,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/gpio.h>
 #include <linux/compiler.h>
+#include <linux/string.h>
 
 #include "mxs_init.h"
 
diff --git a/arch/arm/cpu/arm926ejs/spear/cpu.c b/arch/arm/cpu/arm926ejs/spear/cpu.c
index 21065410746b..93fd7a6d8dfd 100644
--- a/arch/arm/cpu/arm926ejs/spear/cpu.c
+++ b/arch/arm/cpu/arm926ejs/spear/cpu.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/spr_misc.h>
+#include <linux/string.h>
 
 int arch_cpu_init(void)
 {
diff --git a/arch/arm/cpu/arm926ejs/spear/spr_misc.c b/arch/arm/cpu/arm926ejs/spear/spr_misc.c
index 044052b32f93..a910b7134f38 100644
--- a/arch/arm/cpu/arm926ejs/spear/spr_misc.c
+++ b/arch/arm/cpu/arm926ejs/spear/spr_misc.c
@@ -17,6 +17,7 @@
 #include <asm/arch/hardware.h>
 #include <asm/arch/spr_emi.h>
 #include <asm/arch/spr_defs.h>
+#include <linux/string.h>
 
 #define CPU		0
 #define DDR		1
diff --git a/arch/arm/cpu/armv7/bcm235xx/clk-bcm235xx.c b/arch/arm/cpu/armv7/bcm235xx/clk-bcm235xx.c
index 39217c5b2bf1..abdbcb068ee9 100644
--- a/arch/arm/cpu/armv7/bcm235xx/clk-bcm235xx.c
+++ b/arch/arm/cpu/armv7/bcm235xx/clk-bcm235xx.c
@@ -14,6 +14,7 @@
 #include <linux/errno.h>
 #include <asm/arch/sysmap.h>
 #include <asm/kona-common/clk.h>
+#include <linux/string.h>
 #include "clk-core.h"
 
 #define CLOCK_1K		1000
diff --git a/arch/arm/cpu/armv7/bcm235xx/clk-core.c b/arch/arm/cpu/armv7/bcm235xx/clk-core.c
index d7edefee2318..a6bd627e20e4 100644
--- a/arch/arm/cpu/armv7/bcm235xx/clk-core.c
+++ b/arch/arm/cpu/armv7/bcm235xx/clk-core.c
@@ -17,6 +17,7 @@
 #include <bitfield.h>
 #include <asm/arch/sysmap.h>
 #include <asm/kona-common/clk.h>
+#include <linux/string.h>
 #include "clk-core.h"
 
 #define CLK_WR_ACCESS_PASSWORD	0x00a5a501
diff --git a/arch/arm/cpu/armv7/bcm281xx/clk-bcm281xx.c b/arch/arm/cpu/armv7/bcm281xx/clk-bcm281xx.c
index 8f6260e7857e..ee0e75304807 100644
--- a/arch/arm/cpu/armv7/bcm281xx/clk-bcm281xx.c
+++ b/arch/arm/cpu/armv7/bcm281xx/clk-bcm281xx.c
@@ -14,6 +14,7 @@
 #include <linux/errno.h>
 #include <asm/arch/sysmap.h>
 #include <asm/kona-common/clk.h>
+#include <linux/string.h>
 #include "clk-core.h"
 
 #define CLOCK_1K		1000
diff --git a/arch/arm/cpu/armv7/bcm281xx/clk-core.c b/arch/arm/cpu/armv7/bcm281xx/clk-core.c
index 26b673a5405e..a70979d09331 100644
--- a/arch/arm/cpu/armv7/bcm281xx/clk-core.c
+++ b/arch/arm/cpu/armv7/bcm281xx/clk-core.c
@@ -17,6 +17,7 @@
 #include <bitfield.h>
 #include <asm/arch/sysmap.h>
 #include <asm/kona-common/clk.h>
+#include <linux/string.h>
 #include "clk-core.h"
 
 #define CLK_WR_ACCESS_PASSWORD	0x00a5a501
diff --git a/arch/arm/cpu/armv7/ls102xa/fdt.c b/arch/arm/cpu/armv7/ls102xa/fdt.c
index d1d09f936500..b2e80751a98c 100644
--- a/arch/arm/cpu/armv7/ls102xa/fdt.c
+++ b/arch/arm/cpu/armv7/ls102xa/fdt.c
@@ -20,6 +20,7 @@
 #include <asm/arch/immap_ls102xa.h>
 #include <fsl_sec.h>
 #include <dm.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/cpu/armv7/vf610/generic.c b/arch/arm/cpu/armv7/vf610/generic.c
index c23ddc12b456..3f266178c98f 100644
--- a/arch/arm/cpu/armv7/vf610/generic.c
+++ b/arch/arm/cpu/armv7/vf610/generic.c
@@ -21,6 +21,7 @@
 #ifdef CONFIG_FSL_ESDHC_IMX
 #include <fsl_esdhc_imx.h>
 #endif
+#include <linux/string.h>
 
 #ifdef CONFIG_FSL_ESDHC_IMX
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/cpu/armv7/virt-v7.c b/arch/arm/cpu/armv7/virt-v7.c
index 5ffeca13d913..8731af9f6871 100644
--- a/arch/arm/cpu/armv7/virt-v7.c
+++ b/arch/arm/cpu/armv7/virt-v7.c
@@ -15,6 +15,7 @@
 #include <asm/gic.h>
 #include <asm/io.h>
 #include <asm/secure.h>
+#include <linux/string.h>
 
 static unsigned int read_id_pfr1(void)
 {
diff --git a/arch/arm/cpu/armv8/cache_v8.c b/arch/arm/cpu/armv8/cache_v8.c
index 15cecb5e0b34..0930d206ccdd 100644
--- a/arch/arm/cpu/armv8/cache_v8.c
+++ b/arch/arm/cpu/armv8/cache_v8.c
@@ -15,6 +15,7 @@
 #include <asm/global_data.h>
 #include <asm/system.h>
 #include <asm/armv8/mmu.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/cpu/armv8/cpu.c b/arch/arm/cpu/armv8/cpu.c
index ea40c55dd2c0..21c10cf6c7ca 100644
--- a/arch/arm/cpu/armv8/cpu.c
+++ b/arch/arm/cpu/armv8/cpu.c
@@ -18,6 +18,7 @@
 #include <asm/system.h>
 #include <asm/secure.h>
 #include <linux/compiler.h>
+#include <linux/string.h>
 
 /*
  * sdelay() - simple spin loop.
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
index 3654cbf3b497..5839f0b9c9ec 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
@@ -40,6 +40,7 @@
 #include <asm/arch/clock.h>
 #include <hwconfig.h>
 #include <fsl_qbman.h>
+#include <linux/string.h>
 
 #ifdef CONFIG_TFABOOT
 #include <env_internal.h>
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/fdt.c b/arch/arm/cpu/armv8/fsl-layerscape/fdt.c
index 7400b2cf2924..ab4f4a5eb1ab 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/fdt.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/fdt.c
@@ -31,6 +31,7 @@
 #endif
 #include <asm/arch/speed.h>
 #include <fsl_qbman.h>
+#include <linux/string.h>
 
 int fdt_fixup_phy_connection(void *blob, int offset, phy_interface_t phyc)
 {
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_serdes.c b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_serdes.c
index 41c89b8904ee..4a2f22d03661 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_serdes.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_serdes.c
@@ -10,6 +10,7 @@
 #include <linux/errno.h>
 #include <asm/arch/fsl_serdes.h>
 #include <asm/arch/soc.h>
+#include <linux/string.h>
 
 #ifdef CONFIG_SYS_FSL_SRDS_1
 static u8 serdes1_prtcl_map[SERDES_PRCTL_COUNT];
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 aa6fd6b28ce1..f14636a0f5dc 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c
@@ -14,6 +14,7 @@
 #include <asm/arch/fsl_serdes.h>
 #include <asm/arch/soc.h>
 #include <fsl-mc/ldpaa_wriop.h>
+#include <linux/string.h>
 
 #ifdef CONFIG_SYS_FSL_SRDS_1
 static u8 serdes1_prtcl_map[SERDES_PRCTL_COUNT];
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls1028_ids.c b/arch/arm/cpu/armv8/fsl-layerscape/ls1028_ids.c
index 49df8b37900e..2d25c92c6ee1 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/ls1028_ids.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/ls1028_ids.c
@@ -9,6 +9,7 @@
 #include <asm/arch-fsl-layerscape/immap_lsch3.h>
 #include <asm/arch-fsl-layerscape/fsl_icid.h>
 #include <asm/arch-fsl-layerscape/fsl_portals.h>
+#include <linux/string.h>
 
 struct icid_id_table icid_tbl[] = {
 	SET_USB_ICID(1, "snps,dwc3", FSL_USB1_STREAM_ID),
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/mp.c b/arch/arm/cpu/armv8/fsl-layerscape/mp.c
index 5ac545f9df81..8675007da513 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/mp.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/mp.c
@@ -14,6 +14,7 @@
 #include <asm/arch/mp.h>
 #include <asm/arch/soc.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include "cpu.h"
 #include <asm/arch-fsl-layerscape/soc.h>
 #include <efi_loader.h>
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/spl.c b/arch/arm/cpu/armv8/fsl-layerscape/spl.c
index 7d594a9f7490..7c44dc7a95a8 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/spl.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/spl.c
@@ -20,6 +20,7 @@
 #include <asm/arch/fdt.h>
 #include <asm/arch/ppa.h>
 #include <asm/arch/soc.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/cpu/armv8/sec_firmware.c b/arch/arm/cpu/armv8/sec_firmware.c
index c6c4fcc7e073..46d58d176c53 100644
--- a/arch/arm/cpu/armv8/sec_firmware.c
+++ b/arch/arm/cpu/armv8/sec_firmware.c
@@ -18,6 +18,7 @@
 #include <asm/types.h>
 #include <asm/macro.h>
 #include <asm/armv8/sec_firmware.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 extern void c_runtime_cpu_setup(void);
diff --git a/arch/arm/cpu/armv8/spin_table.c b/arch/arm/cpu/armv8/spin_table.c
index 42a0962fdcda..6aafb3b6ea3c 100644
--- a/arch/arm/cpu/armv8/spin_table.c
+++ b/arch/arm/cpu/armv8/spin_table.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <linux/libfdt.h>
 #include <asm/spin_table.h>
+#include <linux/string.h>
 
 int spin_table_update_dt(void *fdt)
 {
diff --git a/arch/arm/cpu/armv8/spl_data.c b/arch/arm/cpu/armv8/spl_data.c
index 8fd986a67a21..f8f9fe2e0260 100644
--- a/arch/arm/cpu/armv8/spl_data.c
+++ b/arch/arm/cpu/armv8/spl_data.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <spl.h>
+#include <linux/string.h>
 
 char __data_save_start[0] __section(.__data_save_start);
 char __data_save_end[0] __section(.__data_save_end);
diff --git a/arch/arm/include/asm/io.h b/arch/arm/include/asm/io.h
index ade1401f3b47..994b47579924 100644
--- a/arch/arm/include/asm/io.h
+++ b/arch/arm/include/asm/io.h
@@ -30,6 +30,7 @@
 #if 0	/* XXX###XXX */
 #include <asm/arch/hardware.h>
 #endif	/* XXX###XXX */
+#include <linux/string.h>
 
 static inline void sync(void)
 {
diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c
index 70c181e45b7e..101f9d9b3ae4 100644
--- a/arch/arm/lib/bootm.c
+++ b/arch/arm/lib/bootm.c
@@ -23,6 +23,7 @@
 #include <dm/root.h>
 #include <env.h>
 #include <image.h>
+#include <linux/string.h>
 #include <u-boot/zlib.h>
 #include <asm/byteorder.h>
 #include <linux/libfdt.h>
diff --git a/arch/arm/lib/eabi_compat.c b/arch/arm/lib/eabi_compat.c
index f7029918d4fb..35ce83a6facd 100644
--- a/arch/arm/lib/eabi_compat.c
+++ b/arch/arm/lib/eabi_compat.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <linux/string.h>
 
 int raise (int signum)
 {
diff --git a/arch/arm/lib/psci-dt.c b/arch/arm/lib/psci-dt.c
index 0ed29a43f10f..6acefab42c02 100644
--- a/arch/arm/lib/psci-dt.c
+++ b/arch/arm/lib/psci-dt.c
@@ -13,6 +13,7 @@
 #ifdef CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT
 #include <asm/armv8/sec_firmware.h>
 #endif
+#include <linux/string.h>
 
 int fdt_psci(void *fdt)
 {
diff --git a/arch/arm/lib/semihosting.c b/arch/arm/lib/semihosting.c
index 904fddd6c04e..73c860dbb3dd 100644
--- a/arch/arm/lib/semihosting.c
+++ b/arch/arm/lib/semihosting.c
@@ -15,6 +15,7 @@
 #include <command.h>
 #include <env.h>
 #include <log.h>
+#include <linux/string.h>
 
 #define SYSOPEN		0x01
 #define SYSCLOSE	0x02
diff --git a/arch/arm/mach-bcm283x/include/mach/mbox.h b/arch/arm/mach-bcm283x/include/mach/mbox.h
index 2ae2d3d97c36..70029eefdedf 100644
--- a/arch/arm/mach-bcm283x/include/mach/mbox.h
+++ b/arch/arm/mach-bcm283x/include/mach/mbox.h
@@ -6,8 +6,9 @@
 #ifndef _BCM2835_MBOX_H
 #define _BCM2835_MBOX_H
 
-#include <linux/compiler.h>
 #include <asm/arch/base.h>
+#include <linux/compiler.h>
+#include <linux/string.h>
 
 /*
  * The BCM2835 SoC contains (at least) two CPUs; the VideoCore (a/k/a "GPU")
diff --git a/arch/arm/mach-imx/cmd_bmode.c b/arch/arm/mach-imx/cmd_bmode.c
index 19bfd9f9a039..2ad9e6c5f2b9 100644
--- a/arch/arm/mach-imx/cmd_bmode.c
+++ b/arch/arm/mach-imx/cmd_bmode.c
@@ -8,6 +8,7 @@
 #include <asm/mach-imx/boot_mode.h>
 #include <malloc.h>
 #include <command.h>
+#include <linux/string.h>
 
 static const struct boot_mode *modes[2];
 
diff --git a/arch/arm/mach-imx/cmd_nandbcb.c b/arch/arm/mach-imx/cmd_nandbcb.c
index 44fc37695db4..21010d455abe 100644
--- a/arch/arm/mach-imx/cmd_nandbcb.c
+++ b/arch/arm/mach-imx/cmd_nandbcb.c
@@ -18,6 +18,7 @@
 #include <nand.h>
 #include <dm/devres.h>
 #include <linux/bug.h>
+#include <linux/string.h>
 
 #include <asm/io.h>
 #include <jffs2/jffs2.h>
diff --git a/arch/arm/mach-imx/imx8/ahab.c b/arch/arm/mach-imx/imx8/ahab.c
index bbcefc8e9b61..9eb38cac029d 100644
--- a/arch/arm/mach-imx/imx8/ahab.c
+++ b/arch/arm/mach-imx/imx8/ahab.c
@@ -15,6 +15,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/image.h>
 #include <console.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-imx/imx8/fdt.c b/arch/arm/mach-imx/imx8/fdt.c
index 776d2b243456..94da4d0951d2 100644
--- a/arch/arm/mach-imx/imx8/fdt.c
+++ b/arch/arm/mach-imx/imx8/fdt.c
@@ -12,6 +12,7 @@
 #include <fdt_support.h>
 #include <linux/libfdt.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-imx/imx8/image.c b/arch/arm/mach-imx/imx8/image.c
index 5abc0d3a39f0..638aac2eafe5 100644
--- a/arch/arm/mach-imx/imx8/image.c
+++ b/arch/arm/mach-imx/imx8/image.c
@@ -14,6 +14,7 @@
 #include <asm/arch/image.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/mach-imx/boot_mode.h>
+#include <linux/string.h>
 
 #define MMC_DEV		0
 #define QSPI_DEV	1
diff --git a/arch/arm/mach-imx/imx8/parse-container.c b/arch/arm/mach-imx/imx8/parse-container.c
index 375098902f8b..ed69abc76d8c 100644
--- a/arch/arm/mach-imx/imx8/parse-container.c
+++ b/arch/arm/mach-imx/imx8/parse-container.c
@@ -9,6 +9,7 @@
 #include <spl.h>
 #include <asm/arch/image.h>
 #include <asm/arch/sci/sci.h>
+#include <linux/string.h>
 
 #define SEC_SECURE_RAM_BASE		0x31800000UL
 #define SEC_SECURE_RAM_END_BASE		(SEC_SECURE_RAM_BASE + 0xFFFFUL)
diff --git a/arch/arm/mach-imx/imx8m/soc.c b/arch/arm/mach-imx/imx8m/soc.c
index 3ad1352f03f2..8c82709024c2 100644
--- a/arch/arm/mach-imx/imx8m/soc.c
+++ b/arch/arm/mach-imx/imx8m/soc.c
@@ -29,6 +29,7 @@
 #include <imx_sip.h>
 #include <linux/arm-smccc.h>
 #include <linux/bitops.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-imx/mx5/clock.c b/arch/arm/mach-imx/mx5/clock.c
index bbaddd5a33fa..cc93716c74e4 100644
--- a/arch/arm/mach-imx/mx5/clock.c
+++ b/arch/arm/mach-imx/mx5/clock.c
@@ -16,6 +16,7 @@
 #include <asm/arch/clock.h>
 #include <div64.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/string.h>
 
 enum pll_clocks {
 	PLL1_CLOCK = 0,
diff --git a/arch/arm/mach-imx/mx6/module_fuse.c b/arch/arm/mach-imx/mx6/module_fuse.c
index 0f4565e3117b..0305b2a7e02c 100644
--- a/arch/arm/mach-imx/mx6/module_fuse.c
+++ b/arch/arm/mach-imx/mx6/module_fuse.c
@@ -10,6 +10,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/mach-imx/module_fuse.h>
 #include <linux/errno.h>
+#include <linux/string.h>
 
 static struct fuse_entry_desc mx6_fuse_descs[] = {
 #if defined(CONFIG_MX6ULL)
diff --git a/arch/arm/mach-imx/spl_imx_romapi.c b/arch/arm/mach-imx/spl_imx_romapi.c
index 9f4d95982e59..dc13a397ea8b 100644
--- a/arch/arm/mach-imx/spl_imx_romapi.c
+++ b/arch/arm/mach-imx/spl_imx_romapi.c
@@ -10,6 +10,7 @@
 #include <asm/global_data.h>
 #include <linux/libfdt.h>
 #include <spl.h>
+#include <linux/string.h>
 
 #include <asm/arch/sys_proto.h>
 
diff --git a/arch/arm/mach-imx/video.c b/arch/arm/mach-imx/video.c
index 1bc9b7cc7e15..4d76ecc29694 100644
--- a/arch/arm/mach-imx/video.c
+++ b/arch/arm/mach-imx/video.c
@@ -4,6 +4,7 @@
 #include <env.h>
 #include <linux/errno.h>
 #include <asm/mach-imx/video.h>
+#include <linux/string.h>
 
 #ifdef CONFIG_IMX_HDMI
 #include <asm/arch/mxc_hdmi.h>
diff --git a/arch/arm/mach-k3/common.c b/arch/arm/mach-k3/common.c
index 3b36e36102c8..97c52dacea80 100644
--- a/arch/arm/mach-k3/common.c
+++ b/arch/arm/mach-k3/common.c
@@ -14,6 +14,7 @@
 #include <spl.h>
 #include <asm/global_data.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include "common.h"
 #include <dm.h>
 #include <remoteproc.h>
diff --git a/arch/arm/mach-keystone/cmd_clock.c b/arch/arm/mach-keystone/cmd_clock.c
index 7165d666e5ed..15fa0ebddeaa 100644
--- a/arch/arm/mach-keystone/cmd_clock.c
+++ b/arch/arm/mach-keystone/cmd_clock.c
@@ -11,6 +11,7 @@
 #include <asm/arch/hardware.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/psc_defs.h>
+#include <linux/string.h>
 
 struct pll_init_data cmd_pll_data = {
 	.pll = MAIN_PLL,
diff --git a/arch/arm/mach-keystone/cmd_mon.c b/arch/arm/mach-keystone/cmd_mon.c
index 049d57347349..f9d5cda827f3 100644
--- a/arch/arm/mach-keystone/cmd_mon.c
+++ b/arch/arm/mach-keystone/cmd_mon.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <command.h>
 #include <image.h>
+#include <linux/string.h>
 #include <mach/mon.h>
 asm(".arch_extension sec\n\t");
 
diff --git a/arch/arm/mach-keystone/ddr3_spd.c b/arch/arm/mach-keystone/ddr3_spd.c
index 3803449c2b07..e84f3253b394 100644
--- a/arch/arm/mach-keystone/ddr3_spd.c
+++ b/arch/arm/mach-keystone/ddr3_spd.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <linux/string.h>
 
 #include <i2c.h>
 #include <ddr_spd.h>
diff --git a/arch/arm/mach-keystone/mon.c b/arch/arm/mach-keystone/mon.c
index 58995d73ac86..bbae14c58f1e 100644
--- a/arch/arm/mach-keystone/mon.c
+++ b/arch/arm/mach-keystone/mon.c
@@ -10,6 +10,7 @@
 #include <asm/unaligned.h>
 #include <common.h>
 #include <command.h>
+#include <linux/string.h>
 #include <mach/mon.h>
 #include <spl.h>
 asm(".arch_extension sec\n\t");
diff --git a/arch/arm/mach-meson/sm.c b/arch/arm/mach-meson/sm.c
index 1a8f23cb1faa..e8036b94a0aa 100644
--- a/arch/arm/mach-meson/sm.c
+++ b/arch/arm/mach-meson/sm.c
@@ -20,6 +20,7 @@
 #include <linux/bitfield.h>
 #include <regmap.h>
 #include <syscon.h>
+#include <linux/string.h>
 
 #define FN_GET_SHARE_MEM_INPUT_BASE	0x82000020
 #define FN_GET_SHARE_MEM_OUTPUT_BASE	0x82000021
diff --git a/arch/arm/mach-mvebu/armada3700/cpu.c b/arch/arm/mach-mvebu/armada3700/cpu.c
index 70f76c7d7074..7ab5c653f1e1 100644
--- a/arch/arm/mach-mvebu/armada3700/cpu.c
+++ b/arch/arm/mach-mvebu/armada3700/cpu.c
@@ -18,6 +18,7 @@
 #include <asm/arch/soc.h>
 #include <asm/armv8/mmu.h>
 #include <sort.h>
+#include <linux/string.h>
 
 /* Armada 3700 */
 #define MVEBU_GPIO_NB_REG_BASE		(MVEBU_REGISTER(0x13800))
diff --git a/arch/arm/mach-mvebu/serdes/axp/high_speed_env_lib.c b/arch/arm/mach-mvebu/serdes/axp/high_speed_env_lib.c
index ea3b4c7d5b72..3ebda4ec6841 100644
--- a/arch/arm/mach-mvebu/serdes/axp/high_speed_env_lib.c
+++ b/arch/arm/mach-mvebu/serdes/axp/high_speed_env_lib.c
@@ -10,6 +10,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include "high_speed_env_spec.h"
 #include "board_env_spec.h"
diff --git a/arch/arm/mach-omap2/emif-common.c b/arch/arm/mach-omap2/emif-common.c
index 312f868fbc71..8346d899e475 100644
--- a/arch/arm/mach-omap2/emif-common.c
+++ b/arch/arm/mach-omap2/emif-common.c
@@ -22,6 +22,7 @@
 #include <linux/compiler.h>
 #include <asm/ti-common/ti-edma3.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 static int emif1_enabled = -1, emif2_enabled = -1;
 
diff --git a/arch/arm/mach-omap2/omap3/board.c b/arch/arm/mach-omap2/omap3/board.c
index f08c8ab43a06..c741652f241f 100644
--- a/arch/arm/mach-omap2/omap3/board.c
+++ b/arch/arm/mach-omap2/omap3/board.c
@@ -28,6 +28,7 @@
 #include <asm/gpio.h>
 #include <asm/omap_common.h>
 #include <linux/compiler.h>
+#include <linux/string.h>
 
 /* Declarations */
 extern omap3_sysinfo sysinfo;
diff --git a/arch/arm/mach-omap2/sec-common.c b/arch/arm/mach-omap2/sec-common.c
index 0551bc125e8f..4fca91ffbd0f 100644
--- a/arch/arm/mach-omap2/sec-common.c
+++ b/arch/arm/mach-omap2/sec-common.c
@@ -19,6 +19,7 @@
 #include <init.h>
 #include <log.h>
 #include <stdarg.h>
+#include <linux/string.h>
 
 #include <asm/arch/sys_proto.h>
 #include <asm/cache.h>
diff --git a/arch/arm/mach-rockchip/board.c b/arch/arm/mach-rockchip/board.c
index eed8f589d23e..2c41e58f598d 100644
--- a/arch/arm/mach-rockchip/board.c
+++ b/arch/arm/mach-rockchip/board.c
@@ -17,6 +17,7 @@
 #include <asm/arch-rockchip/clock.h>
 #include <asm/arch-rockchip/periph.h>
 #include <asm/arch-rockchip/misc.h>
+#include <linux/string.h>
 #include <power/regulator.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-rockchip/boot_mode.c b/arch/arm/mach-rockchip/boot_mode.c
index c6d19541ac72..10d8a1ac5e98 100644
--- a/arch/arm/mach-rockchip/boot_mode.c
+++ b/arch/arm/mach-rockchip/boot_mode.c
@@ -13,6 +13,7 @@
 #include <dm/device.h>
 #include <dm/uclass.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #if (CONFIG_ROCKCHIP_BOOT_MODE_REG == 0)
 
diff --git a/arch/arm/mach-rockchip/misc.c b/arch/arm/mach-rockchip/misc.c
index 28c7c7214cbc..3cbb1794254d 100644
--- a/arch/arm/mach-rockchip/misc.c
+++ b/arch/arm/mach-rockchip/misc.c
@@ -16,6 +16,7 @@
 #include <log.h>
 #include <dm/uclass-internal.h>
 #include <misc.h>
+#include <linux/string.h>
 #include <u-boot/crc.h>
 #include <u-boot/sha256.h>
 
diff --git a/arch/arm/mach-rockchip/spl-boot-order.c b/arch/arm/mach-rockchip/spl-boot-order.c
index e05c12e0cd33..ddc4081dbb47 100644
--- a/arch/arm/mach-rockchip/spl-boot-order.c
+++ b/arch/arm/mach-rockchip/spl-boot-order.c
@@ -9,6 +9,7 @@
 #include <mmc.h>
 #include <spl.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 
 #if CONFIG_IS_ENABLED(OF_LIBFDT)
 /**
diff --git a/arch/arm/mach-socfpga/clock_manager_arria10.c b/arch/arm/mach-socfpga/clock_manager_arria10.c
index 58d5d3fd8a57..9f46df6b2f95 100644
--- a/arch/arm/mach-socfpga/clock_manager_arria10.c
+++ b/arch/arm/mach-socfpga/clock_manager_arria10.c
@@ -12,6 +12,7 @@
 #include <dm/device-internal.h>
 #include <asm/arch/clock_manager.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #ifdef CONFIG_SPL_BUILD
 
diff --git a/arch/arm/mach-socfpga/misc_s10.c b/arch/arm/mach-socfpga/misc_s10.c
index 733856c33c16..1e9a3f62059f 100644
--- a/arch/arm/mach-socfpga/misc_s10.c
+++ b/arch/arm/mach-socfpga/misc_s10.c
@@ -21,6 +21,7 @@
 #include <asm/pl310.h>
 #include <linux/libfdt.h>
 #include <asm/arch/mailbox_s10.h>
+#include <linux/string.h>
 
 #include <dt-bindings/reset/altr,rst-mgr-s10.h>
 
diff --git a/arch/arm/mach-socfpga/pinmux_arria10.c b/arch/arm/mach-socfpga/pinmux_arria10.c
index f378fce7f02d..a38b19c395e2 100644
--- a/arch/arm/mach-socfpga/pinmux_arria10.c
+++ b/arch/arm/mach-socfpga/pinmux_arria10.c
@@ -8,6 +8,7 @@
 #include <asm/io.h>
 #include <common.h>
 #include <fdtdec.h>
+#include <linux/string.h>
 
 static int do_pinctr_pin(const void *blob, int child, const char *node_name)
 {
diff --git a/arch/arm/mach-stm32mp/cmd_stm32key.c b/arch/arm/mach-stm32mp/cmd_stm32key.c
index eb3d74bc8364..ad857e95c462 100644
--- a/arch/arm/mach-stm32mp/cmd_stm32key.c
+++ b/arch/arm/mach-stm32mp/cmd_stm32key.c
@@ -10,6 +10,7 @@
 #include <dm/device.h>
 #include <dm/uclass.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #define STM32_OTP_HASH_KEY_START 24
 #define STM32_OTP_HASH_KEY_SIZE 8
diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c b/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c
index d241dbde20e6..0264eafed5eb 100644
--- a/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c
+++ b/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c
@@ -9,6 +9,7 @@
 #include <image.h>
 #include <asm/arch/stm32prog.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include "stm32prog.h"
 
 struct stm32prog_data *stm32prog_data;
diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c
index e749c05d9279..3ac36bcc8d30 100644
--- a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c
+++ b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c
@@ -19,6 +19,7 @@
 #include <linux/mtd/mtd.h>
 #include <linux/printk.h>
 #include <linux/sizes.h>
+#include <linux/string.h>
 
 #include "stm32prog.h"
 
diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_serial.c b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_serial.c
index 8481a45f65bc..194bdbd75f40 100644
--- a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_serial.c
+++ b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_serial.c
@@ -15,6 +15,7 @@
 #include <dm/device-internal.h>
 #include <linux/delay.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include "stm32prog.h"
 
 /* - configuration part -----------------------------*/
diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_usb.c b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_usb.c
index 134c3b117f52..33bf7a44b38b 100644
--- a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_usb.c
+++ b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_usb.c
@@ -10,6 +10,7 @@
 #include <asm/arch/stm32prog.h>
 #include <asm/arch/sys_proto.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include "stm32prog.h"
 
 static int stm32prog_set_phase(struct stm32prog_data *data, u8 phase,
diff --git a/arch/arm/mach-stm32mp/fdt.c b/arch/arm/mach-stm32mp/fdt.c
index 9dbc595cc4f8..5a7d761586ce 100644
--- a/arch/arm/mach-stm32mp/fdt.c
+++ b/arch/arm/mach-stm32mp/fdt.c
@@ -11,6 +11,7 @@
 #include <asm/arch/sys_proto.h>
 #include <dt-bindings/pinctrl/stm32-pinfunc.h>
 #include <linux/io.h>
+#include <linux/string.h>
 
 #define ETZPC_DECPROT(n)	(STM32_ETZPC_BASE + 0x10 + 4 * (n))
 #define ETZPC_DECPROT_NB	6
diff --git a/arch/arm/mach-tegra/cboot.c b/arch/arm/mach-tegra/cboot.c
index 6a47c104b723..b89f7badb525 100644
--- a/arch/arm/mach-tegra/cboot.c
+++ b/arch/arm/mach-tegra/cboot.c
@@ -16,6 +16,7 @@
 #include <string.h>
 #include <asm/global_data.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #include <linux/ctype.h>
 #include <linux/sizes.h>
diff --git a/arch/arm/mach-tegra/tegra20/emc.c b/arch/arm/mach-tegra/tegra20/emc.c
index d55b09b4ac8c..58abf790bd1b 100644
--- a/arch/arm/mach-tegra/tegra20/emc.c
+++ b/arch/arm/mach-tegra/tegra20/emc.c
@@ -12,6 +12,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/emc.h>
 #include <asm/arch/tegra.h>
+#include <linux/string.h>
 
 /*
  * The EMC registers have shadow registers.  When the EMC clock is updated
diff --git a/arch/arm/mach-tegra/tegra20/warmboot.c b/arch/arm/mach-tegra/tegra20/warmboot.c
index 3d3758f6e6f4..b36b2f652ba7 100644
--- a/arch/arm/mach-tegra/tegra20/warmboot.c
+++ b/arch/arm/mach-tegra/tegra20/warmboot.c
@@ -20,6 +20,7 @@
 #include <asm/arch-tegra/pmc.h>
 #include <asm/arch-tegra/fuse.h>
 #include <asm/arch-tegra/warmboot.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-tegra/xusb-padctl-common.c b/arch/arm/mach-tegra/xusb-padctl-common.c
index 5de403c30e4a..42d64cf2c755 100644
--- a/arch/arm/mach-tegra/xusb-padctl-common.c
+++ b/arch/arm/mach-tegra/xusb-padctl-common.c
@@ -9,6 +9,7 @@
 #include <errno.h>
 #include <log.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #include "xusb-padctl-common.h"
 
diff --git a/arch/arm/mach-uniphier/base-address.c b/arch/arm/mach-uniphier/base-address.c
index d7456f8df6f2..1ba55eb7ebba 100644
--- a/arch/arm/mach-uniphier/base-address.c
+++ b/arch/arm/mach-uniphier/base-address.c
@@ -10,6 +10,7 @@
 #include <linux/libfdt.h>
 #include <linux/sizes.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 
 #include "base-address.h"
 #include "sc64-regs.h"
diff --git a/arch/arm/mach-uniphier/board_late_init.c b/arch/arm/mach-uniphier/board_late_init.c
index b33c4b19389b..922919814ba2 100644
--- a/arch/arm/mach-uniphier/board_late_init.c
+++ b/arch/arm/mach-uniphier/board_late_init.c
@@ -12,6 +12,7 @@
 #include <linux/libfdt.h>
 #include <stdio.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #include "init.h"
 
diff --git a/arch/arm/mach-uniphier/dram/cmd_ddrmphy.c b/arch/arm/mach-uniphier/dram/cmd_ddrmphy.c
index 629f8b90c9d8..be4ce3265bb8 100644
--- a/arch/arm/mach-uniphier/dram/cmd_ddrmphy.c
+++ b/arch/arm/mach-uniphier/dram/cmd_ddrmphy.c
@@ -9,6 +9,7 @@
 #include <linux/io.h>
 #include <linux/printk.h>
 #include <linux/sizes.h>
+#include <linux/string.h>
 
 #include "../soc-info.h"
 #include "ddrmphy-regs.h"
diff --git a/arch/arm/mach-uniphier/dram/cmd_ddrphy.c b/arch/arm/mach-uniphier/dram/cmd_ddrphy.c
index ca519d1c7e0c..3ccafe206382 100644
--- a/arch/arm/mach-uniphier/dram/cmd_ddrphy.c
+++ b/arch/arm/mach-uniphier/dram/cmd_ddrphy.c
@@ -10,6 +10,7 @@
 #include <linux/io.h>
 #include <linux/printk.h>
 #include <linux/sizes.h>
+#include <linux/string.h>
 
 #include "../soc-info.h"
 #include "ddrphy-regs.h"
diff --git a/arch/arm/mach-versal/mp.c b/arch/arm/mach-versal/mp.c
index c97c311d3130..540c010f52c6 100644
--- a/arch/arm/mach-versal/mp.c
+++ b/arch/arm/mach-versal/mp.c
@@ -9,6 +9,7 @@
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-zynq/ddrc.c b/arch/arm/mach-zynq/ddrc.c
index 28988ef95b5a..65c255da209a 100644
--- a/arch/arm/mach-zynq/ddrc.c
+++ b/arch/arm/mach-zynq/ddrc.c
@@ -8,6 +8,7 @@
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/hardware.h>
+#include <linux/string.h>
 
 #ifndef CONFIG_ZYNQ_DDRC_INIT
 void zynq_ddrc_init(void) {}
diff --git a/arch/arm/mach-zynq/slcr.c b/arch/arm/mach-zynq/slcr.c
index 5d9f4d23f34b..d7c879dc82dc 100644
--- a/arch/arm/mach-zynq/slcr.c
+++ b/arch/arm/mach-zynq/slcr.c
@@ -8,6 +8,7 @@
 #include <malloc.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/string.h>
 
 #define SLCR_LOCK_MAGIC		0x767B
 #define SLCR_UNLOCK_MAGIC	0xDF0D
diff --git a/arch/arm/mach-zynq/spl.c b/arch/arm/mach-zynq/spl.c
index 239ce3436a62..eceb6e114c07 100644
--- a/arch/arm/mach-zynq/spl.c
+++ b/arch/arm/mach-zynq/spl.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <spl.h>
 #include <generated/dt.h>
+#include <linux/string.h>
 
 #include <asm/io.h>
 #include <asm/spl.h>
diff --git a/arch/arm/mach-zynqmp/cpu.c b/arch/arm/mach-zynqmp/cpu.c
index 29743cae5aab..a03b29acb83f 100644
--- a/arch/arm/mach-zynqmp/cpu.c
+++ b/arch/arm/mach-zynqmp/cpu.c
@@ -15,6 +15,7 @@
 #include <asm/io.h>
 #include <zynqmp_firmware.h>
 #include <asm/cache.h>
+#include <linux/string.h>
 
 #define ZYNQ_SILICON_VER_MASK	0xF000
 #define ZYNQ_SILICON_VER_SHIFT	12
diff --git a/arch/arm/mach-zynqmp/mp.c b/arch/arm/mach-zynqmp/mp.c
index 656678a1551f..b699f36f1d39 100644
--- a/arch/arm/mach-zynqmp/mp.c
+++ b/arch/arm/mach-zynqmp/mp.c
@@ -11,6 +11,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/io.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #define LOCK		0
 #define SPLIT		1
diff --git a/arch/microblaze/include/asm/io.h b/arch/microblaze/include/asm/io.h
index 8e6be0ae267f..fd77dcd0218d 100644
--- a/arch/microblaze/include/asm/io.h
+++ b/arch/microblaze/include/asm/io.h
@@ -18,6 +18,7 @@
 #define __MICROBLAZE_IO_H__
 
 #include <asm/types.h>
+#include <linux/string.h>
 
 #define IO_SPACE_LIMIT 0xFFFFFFFF
 
diff --git a/arch/mips/include/asm/io.h b/arch/mips/include/asm/io.h
index d3ad66930131..836cd436872d 100644
--- a/arch/mips/include/asm/io.h
+++ b/arch/mips/include/asm/io.h
@@ -11,6 +11,7 @@
 
 #include <linux/bug.h>
 #include <linux/compiler.h>
+#include <linux/string.h>
 #include <linux/types.h>
 
 #include <asm/addrspace.h>
diff --git a/arch/mips/lib/bootm.c b/arch/mips/lib/bootm.c
index c28bca1bbb89..ec165a32b0a4 100644
--- a/arch/mips/lib/bootm.c
+++ b/arch/mips/lib/bootm.c
@@ -14,6 +14,7 @@
 #include <asm/addrspace.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/mips/lib/reloc.c b/arch/mips/lib/reloc.c
index c1c04bc08e86..a0c60c40c861 100644
--- a/arch/mips/lib/reloc.c
+++ b/arch/mips/lib/reloc.c
@@ -33,6 +33,7 @@
 #include <asm/relocs.h>
 #include <asm/sections.h>
 #include <linux/bitops.h>
+#include <linux/string.h>
 
 /**
  * read_uint() - Read an unsigned integer from the buffer
diff --git a/arch/mips/lib/traps.c b/arch/mips/lib/traps.c
index 7c2fdf4a1a9d..510ef4c6c090 100644
--- a/arch/mips/lib/traps.c
+++ b/arch/mips/lib/traps.c
@@ -20,6 +20,7 @@
 #include <asm/mipsregs.h>
 #include <asm/addrspace.h>
 #include <asm/system.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/mips/mach-jz47xx/jz4780/jz4780.c b/arch/mips/mach-jz47xx/jz4780/jz4780.c
index 43f5651f8326..de9bd05fcfde 100644
--- a/arch/mips/mach-jz47xx/jz4780/jz4780.c
+++ b/arch/mips/mach-jz47xx/jz4780/jz4780.c
@@ -15,6 +15,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/sections.h>
+#include <linux/string.h>
 #include <mach/jz4780.h>
 #include <mach/jz4780_dram.h>
 #include <mmc.h>
diff --git a/arch/mips/mach-mtmips/cpu.c b/arch/mips/mach-mtmips/cpu.c
index 76ad4f632058..f9cdce5ff8d8 100644
--- a/arch/mips/mach-mtmips/cpu.c
+++ b/arch/mips/mach-mtmips/cpu.c
@@ -10,6 +10,7 @@
 #include <linux/bitops.h>
 #include <linux/io.h>
 #include <linux/sizes.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/nds32/lib/bootm.c b/arch/nds32/lib/bootm.c
index b3b8bc290378..4668ed9af8b1 100644
--- a/arch/nds32/lib/bootm.c
+++ b/arch/nds32/lib/bootm.c
@@ -13,6 +13,7 @@
 #include <image.h>
 #include <log.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 #include <u-boot/zlib.h>
 #include <asm/byteorder.h>
 #include <asm/bootm.h>
diff --git a/arch/nios2/cpu/cpu.c b/arch/nios2/cpu/cpu.c
index b55c8fbc5841..c670d51f1dfb 100644
--- a/arch/nios2/cpu/cpu.c
+++ b/arch/nios2/cpu/cpu.c
@@ -15,6 +15,7 @@
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <asm/system.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/nios2/include/asm/io.h b/arch/nios2/include/asm/io.h
index 817cd72e00bd..b22134cf29c4 100644
--- a/arch/nios2/include/asm/io.h
+++ b/arch/nios2/include/asm/io.h
@@ -8,6 +8,7 @@
 #define __ASM_NIOS2_IO_H_
 
 #include <asm/global_data.h>
+#include <linux/string.h>
 
 static inline void sync(void)
 {
diff --git a/arch/powerpc/cpu/mpc83xx/ecc.c b/arch/powerpc/cpu/mpc83xx/ecc.c
index 1343dd3d3a36..903983ded3ef 100644
--- a/arch/powerpc/cpu/mpc83xx/ecc.c
+++ b/arch/powerpc/cpu/mpc83xx/ecc.c
@@ -10,6 +10,7 @@
 #include <irq_func.h>
 #include <mpc83xx.h>
 #include <command.h>
+#include <linux/string.h>
 
 #if defined(CONFIG_DDR_ECC) && defined(CONFIG_DDR_ECC_CMD)
 void ecc_print_status(void)
diff --git a/arch/powerpc/cpu/mpc85xx/commproc.c b/arch/powerpc/cpu/mpc85xx/commproc.c
index 8e8427a08bbe..a63519bb5cd8 100644
--- a/arch/powerpc/cpu/mpc85xx/commproc.c
+++ b/arch/powerpc/cpu/mpc85xx/commproc.c
@@ -25,6 +25,7 @@
 #include <asm-offsets.h>
 #include <asm/cpm_85xx.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init.c b/arch/powerpc/cpu/mpc85xx/cpu_init.c
index fcc2c7be31a9..ad6e79396e76 100644
--- a/arch/powerpc/cpu/mpc85xx/cpu_init.c
+++ b/arch/powerpc/cpu/mpc85xx/cpu_init.c
@@ -35,6 +35,7 @@
 #include <hwconfig.h>
 #include <linux/compiler.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include "mp.h"
 #ifdef CONFIG_CHAIN_OF_TRUST
 #include <fsl_validate.h>
diff --git a/arch/powerpc/cpu/mpc85xx/ether_fcc.c b/arch/powerpc/cpu/mpc85xx/ether_fcc.c
index 3c4eb1a7eba9..c6f89e0eba91 100644
--- a/arch/powerpc/cpu/mpc85xx/ether_fcc.c
+++ b/arch/powerpc/cpu/mpc85xx/ether_fcc.c
@@ -30,6 +30,7 @@
 #include <command.h>
 #include <config.h>
 #include <net.h>
+#include <linux/string.h>
 
 #if defined(CONFIG_MII) || defined(CONFIG_CMD_MII)
 #include <miiphy.h>
diff --git a/arch/powerpc/cpu/mpc85xx/fdt.c b/arch/powerpc/cpu/mpc85xx/fdt.c
index 08331f4c6494..4eecbe667ec8 100644
--- a/arch/powerpc/cpu/mpc85xx/fdt.c
+++ b/arch/powerpc/cpu/mpc85xx/fdt.c
@@ -27,6 +27,7 @@
 #ifdef CONFIG_SYS_DPAA_FMAN
 #include <fsl_fman.h>
 #endif
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c b/arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c
index ee5015ec8f3e..29a64b309b29 100644
--- a/arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c
@@ -13,6 +13,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <fsl_errata.h>
+#include <linux/string.h>
 #include "fsl_corenet2_serdes.h"
 
 #ifdef CONFIG_SYS_FSL_SRDS_1
diff --git a/arch/powerpc/cpu/mpc85xx/liodn.c b/arch/powerpc/cpu/mpc85xx/liodn.c
index e552378e78be..a85c81179205 100644
--- a/arch/powerpc/cpu/mpc85xx/liodn.c
+++ b/arch/powerpc/cpu/mpc85xx/liodn.c
@@ -7,6 +7,7 @@
 #include <log.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
+#include <linux/string.h>
 
 #include <asm/immap_85xx.h>
 #include <asm/io.h>
diff --git a/arch/powerpc/cpu/mpc85xx/mp.c b/arch/powerpc/cpu/mpc85xx/mp.c
index 653efe09f935..c9854a82a960 100644
--- a/arch/powerpc/cpu/mpc85xx/mp.c
+++ b/arch/powerpc/cpu/mpc85xx/mp.c
@@ -17,6 +17,7 @@
 #include <asm/fsl_law.h>
 #include <fsl_ddr_sdram.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include "mp.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/powerpc/cpu/mpc85xx/portals.c b/arch/powerpc/cpu/mpc85xx/portals.c
index 52e2124fb976..c0f18d924b61 100644
--- a/arch/powerpc/cpu/mpc85xx/portals.c
+++ b/arch/powerpc/cpu/mpc85xx/portals.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
+#include <linux/string.h>
 
 #include <asm/processor.h>
 #include <asm/io.h>
diff --git a/arch/powerpc/cpu/mpc86xx/mp.c b/arch/powerpc/cpu/mpc86xx/mp.c
index e6795e06c98b..2d23742a2bd9 100644
--- a/arch/powerpc/cpu/mpc86xx/mp.c
+++ b/arch/powerpc/cpu/mpc86xx/mp.c
@@ -12,6 +12,7 @@
 #include <lmb.h>
 #include <asm/io.h>
 #include <asm/mp.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/powerpc/cpu/mpc8xxx/fsl_pamu.c b/arch/powerpc/cpu/mpc8xxx/fsl_pamu.c
index 2c378b761588..bc5958511d71 100644
--- a/arch/powerpc/cpu/mpc8xxx/fsl_pamu.c
+++ b/arch/powerpc/cpu/mpc8xxx/fsl_pamu.c
@@ -11,6 +11,7 @@
 #include <linux/log2.h>
 #include <malloc.h>
 #include <asm/fsl_pamu.h>
+#include <linux/string.h>
 
 struct paace *ppaact;
 struct paace *sec;
diff --git a/arch/powerpc/include/asm/io.h b/arch/powerpc/include/asm/io.h
index 6d76e3e99cca..ccc5e664cf47 100644
--- a/arch/powerpc/include/asm/io.h
+++ b/arch/powerpc/include/asm/io.h
@@ -8,6 +8,7 @@
 #define _PPC_IO_H
 
 #include <asm/byteorder.h>
+#include <linux/string.h>
 
 #ifdef CONFIG_ADDR_MAP
 #include <addr_map.h>
diff --git a/arch/riscv/cpu/cpu.c b/arch/riscv/cpu/cpu.c
index bfa2d4a42693..53fc9455f75d 100644
--- a/arch/riscv/cpu/cpu.c
+++ b/arch/riscv/cpu/cpu.c
@@ -11,6 +11,7 @@
 #include <asm/encoding.h>
 #include <dm/uclass-internal.h>
 #include <linux/bitops.h>
+#include <linux/string.h>
 
 /*
  * The variables here must be stored in the data section since they are used
diff --git a/arch/riscv/lib/andes_plic.c b/arch/riscv/lib/andes_plic.c
index 5d310d137b71..3fa92277639c 100644
--- a/arch/riscv/lib/andes_plic.c
+++ b/arch/riscv/lib/andes_plic.c
@@ -19,6 +19,7 @@
 #include <asm/syscon.h>
 #include <cpu.h>
 #include <linux/err.h>
+#include <linux/string.h>
 
 /* pending register */
 #define PENDING_REG(base, hart)	((ulong)(base) + 0x1000 + ((hart) / 4) * 4)
diff --git a/arch/riscv/lib/fdt_fixup.c b/arch/riscv/lib/fdt_fixup.c
index 8c11b8a99e38..d0a334744974 100644
--- a/arch/riscv/lib/fdt_fixup.c
+++ b/arch/riscv/lib/fdt_fixup.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <mapmem.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/sandbox/cpu/eth-raw-os.c b/arch/sandbox/cpu/eth-raw-os.c
index da01d1addf9c..8ef8f65ebaf6 100644
--- a/arch/sandbox/cpu/eth-raw-os.c
+++ b/arch/sandbox/cpu/eth-raw-os.c
@@ -7,6 +7,7 @@
 #include <asm/eth-raw-os.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <linux/string.h>
 #include <net/if.h>
 #include <netinet/in.h>
 #include <netinet/ip.h>
diff --git a/arch/sandbox/cpu/os.c b/arch/sandbox/cpu/os.c
index e7ec892bdf07..e4192b07be5f 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 <linux/string.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
 #include <sys/time.h>
diff --git a/arch/sandbox/cpu/sdl.c b/arch/sandbox/cpu/sdl.c
index 6416cab96c1e..813fdcdac604 100644
--- a/arch/sandbox/cpu/sdl.c
+++ b/arch/sandbox/cpu/sdl.c
@@ -9,6 +9,7 @@
 #include <linux/input.h>
 #include <SDL2/SDL.h>
 #include <asm/state.h>
+#include <linux/string.h>
 
 /**
  * struct buf_info - a data buffer holding audio data
diff --git a/arch/sandbox/cpu/spl.c b/arch/sandbox/cpu/spl.c
index 17a3507406cd..8998f92858e1 100644
--- a/arch/sandbox/cpu/spl.c
+++ b/arch/sandbox/cpu/spl.c
@@ -13,6 +13,7 @@
 #include <asm/global_data.h>
 #include <asm/spl.h>
 #include <asm/state.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/sandbox/cpu/start.c b/arch/sandbox/cpu/start.c
index c50d14eaf229..9845d3e8fcb9 100644
--- a/arch/sandbox/cpu/start.c
+++ b/arch/sandbox/cpu/start.c
@@ -17,6 +17,7 @@
 #include <asm/sections.h>
 #include <asm/state.h>
 #include <linux/ctype.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/sandbox/cpu/state.c b/arch/sandbox/cpu/state.c
index 34b6fff7e7a8..ec432d06429f 100644
--- a/arch/sandbox/cpu/state.c
+++ b/arch/sandbox/cpu/state.c
@@ -10,6 +10,7 @@
 #include <os.h>
 #include <asm/malloc.h>
 #include <asm/state.h>
+#include <linux/string.h>
 
 /* Main state record for the sandbox */
 static struct sandbox_state main_state;
diff --git a/arch/sandbox/lib/bootm.c b/arch/sandbox/lib/bootm.c
index d1d460b84a44..ab9f8a5f9c9c 100644
--- a/arch/sandbox/lib/bootm.c
+++ b/arch/sandbox/lib/bootm.c
@@ -8,6 +8,7 @@
 #include <bootstage.h>
 #include <image.h>
 #include <asm/io.h>
+#include <linux/string.h>
 
 #define	LINUX_ARM_ZIMAGE_MAGIC	0x016f2818
 
diff --git a/arch/sh/lib/board.c b/arch/sh/lib/board.c
index 3fa093a02ea3..f43213a50e99 100644
--- a/arch/sh/lib/board.c
+++ b/arch/sh/lib/board.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <init.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/sh/lib/bootm.c b/arch/sh/lib/bootm.c
index dc94f8378566..71d964586c5a 100644
--- a/arch/sh/lib/bootm.c
+++ b/arch/sh/lib/bootm.c
@@ -13,6 +13,7 @@
 #include <image.h>
 #include <asm/byteorder.h>
 #include <asm/zimage.h>
+#include <linux/string.h>
 
 #ifdef CONFIG_SYS_DEBUG
 static void hexdump(unsigned char *buf, int len)
diff --git a/arch/sh/lib/zimageboot.c b/arch/sh/lib/zimageboot.c
index c38f0933f894..d1067a60f1ed 100644
--- a/arch/sh/lib/zimageboot.c
+++ b/arch/sh/lib/zimageboot.c
@@ -15,6 +15,7 @@
 #include <irq_func.h>
 #include <asm/io.h>
 #include <asm/zimage.h>
+#include <linux/string.h>
 
 int do_sh_zimageboot(struct cmd_tbl *cmdtp, int flag, int argc,
 		     char *const argv[])
diff --git a/arch/x86/cpu/acpi_gpe.c b/arch/x86/cpu/acpi_gpe.c
index 9baf4f65b366..47ee817eb7ac 100644
--- a/arch/x86/cpu/acpi_gpe.c
+++ b/arch/x86/cpu/acpi_gpe.c
@@ -13,6 +13,7 @@
 #include <asm/io.h>
 #include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/interrupt-controller/x86-irq.h>
+#include <linux/string.h>
 
 /**
  * struct acpi_gpe_priv - private driver information
diff --git a/arch/x86/cpu/apollolake/fsp_bindings.c b/arch/x86/cpu/apollolake/fsp_bindings.c
index bbf04b5009f1..a76855e3e287 100644
--- a/arch/x86/cpu/apollolake/fsp_bindings.c
+++ b/arch/x86/cpu/apollolake/fsp_bindings.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <log.h>
 #include <asm/arch/fsp_bindings.h>
+#include <linux/string.h>
 
 /**
  * read_u8_prop() - Read an u8 property from devicetree (scalar or array)
diff --git a/arch/x86/cpu/apollolake/pmc.c b/arch/x86/cpu/apollolake/pmc.c
index 192dec7109aa..83d165c0d9b0 100644
--- a/arch/x86/cpu/apollolake/pmc.c
+++ b/arch/x86/cpu/apollolake/pmc.c
@@ -17,6 +17,7 @@
 #include <asm/io.h>
 #include <asm/pci.h>
 #include <linux/bitops.h>
+#include <linux/string.h>
 #include <power/acpi_pmc.h>
 
 #define GPIO_GPE_CFG		0x1050
diff --git a/arch/x86/cpu/apollolake/spl.c b/arch/x86/cpu/apollolake/spl.c
index 5a53831dc6a4..a318bca5a62b 100644
--- a/arch/x86/cpu/apollolake/spl.c
+++ b/arch/x86/cpu/apollolake/spl.c
@@ -19,6 +19,7 @@
 #include <asm/arch/iomap.h>
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
+#include <linux/string.h>
 
 /* This reads the next phase from mapped SPI flash */
 static int rom_load_image(struct spl_image_info *spl_image,
diff --git a/arch/x86/cpu/baytrail/acpi.c b/arch/x86/cpu/baytrail/acpi.c
index 07757b88a305..e6c721a16ba9 100644
--- a/arch/x86/cpu/baytrail/acpi.c
+++ b/arch/x86/cpu/baytrail/acpi.c
@@ -14,6 +14,7 @@
 #include <asm/arch/global_nvs.h>
 #include <asm/arch/iomap.h>
 #include <dm/uclass-internal.h>
+#include <linux/string.h>
 
 void acpi_create_fadt(struct acpi_fadt *fadt, struct acpi_facs *facs,
 		      void *dsdt)
diff --git a/arch/x86/cpu/broadwell/me.c b/arch/x86/cpu/broadwell/me.c
index ae16ce264992..4ae084bf4529 100644
--- a/arch/x86/cpu/broadwell/me.c
+++ b/arch/x86/cpu/broadwell/me.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <asm/arch/me.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 static inline void me_read_dword_ptr(struct udevice *dev, void *ptr, int offset)
 {
diff --git a/arch/x86/cpu/broadwell/northbridge.c b/arch/x86/cpu/broadwell/northbridge.c
index 141babc51c3a..4f3ccf589e57 100644
--- a/arch/x86/cpu/broadwell/northbridge.c
+++ b/arch/x86/cpu/broadwell/northbridge.c
@@ -11,6 +11,7 @@
 #include <asm/arch/iomap.h>
 #include <asm/arch/pch.h>
 #include <asm/arch/pei_data.h>
+#include <linux/string.h>
 
 __weak asmlinkage void sdram_console_tx_byte(unsigned char byte)
 {
diff --git a/arch/x86/cpu/broadwell/pinctrl_broadwell.c b/arch/x86/cpu/broadwell/pinctrl_broadwell.c
index 85bd37101ba2..2bc3ef97214c 100644
--- a/arch/x86/cpu/broadwell/pinctrl_broadwell.c
+++ b/arch/x86/cpu/broadwell/pinctrl_broadwell.c
@@ -19,6 +19,7 @@
 #include <dt-bindings/gpio/x86-gpio.h>
 #include <dm/pinctrl.h>
 #include <dm/uclass-internal.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/broadwell/refcode.c b/arch/x86/cpu/broadwell/refcode.c
index 1e0a34de0c8b..ee045a348335 100644
--- a/arch/x86/cpu/broadwell/refcode.c
+++ b/arch/x86/cpu/broadwell/refcode.c
@@ -12,6 +12,7 @@
 #include <init.h>
 #include <log.h>
 #include <asm/arch/pei_data.h>
+#include <linux/string.h>
 
 #define RMODULE_MAGIC		0xf8fe
 #define RMODULE_VERSION_1	1
diff --git a/arch/x86/cpu/broadwell/sdram.c b/arch/x86/cpu/broadwell/sdram.c
index c104a849a545..874b2034b9f6 100644
--- a/arch/x86/cpu/broadwell/sdram.c
+++ b/arch/x86/cpu/broadwell/sdram.c
@@ -24,6 +24,7 @@
 #include <asm/arch/pch.h>
 #include <asm/arch/pei_data.h>
 #include <asm/arch/pm.h>
+#include <linux/string.h>
 
 ulong board_get_usable_ram_top(ulong total_size)
 {
diff --git a/arch/x86/cpu/cpu_x86.c b/arch/x86/cpu/cpu_x86.c
index dc7c8116d040..8b3a9e75d1d4 100644
--- a/arch/x86/cpu/cpu_x86.c
+++ b/arch/x86/cpu/cpu_x86.c
@@ -9,6 +9,7 @@
 #include <errno.h>
 #include <asm/cpu.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/efi/payload.c b/arch/x86/cpu/efi/payload.c
index 9a73b768e9b8..d9955bb47149 100644
--- a/arch/x86/cpu/efi/payload.c
+++ b/arch/x86/cpu/efi/payload.c
@@ -15,6 +15,7 @@
 #include <asm/e820.h>
 #include <asm/global_data.h>
 #include <asm/post.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/i386/cpu.c b/arch/x86/cpu/i386/cpu.c
index 7f6b1a93e1bb..f0a01c2295f2 100644
--- a/arch/x86/cpu/i386/cpu.c
+++ b/arch/x86/cpu/i386/cpu.c
@@ -32,6 +32,7 @@
 #include <asm/msr.h>
 #include <asm/mtrr.h>
 #include <asm/processor-flags.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/intel_common/itss.c b/arch/x86/cpu/intel_common/itss.c
index 2f47bfe20e71..d6bc051397b8 100644
--- a/arch/x86/cpu/intel_common/itss.c
+++ b/arch/x86/cpu/intel_common/itss.c
@@ -19,6 +19,7 @@
 #include <spl.h>
 #include <asm/global_data.h>
 #include <asm/itss.h>
+#include <linux/string.h>
 
 struct itss_platdata {
 #if CONFIG_IS_ENABLED(OF_PLATDATA)
diff --git a/arch/x86/cpu/intel_common/report_platform.c b/arch/x86/cpu/intel_common/report_platform.c
index a3612817c45b..2de29bbbe25e 100644
--- a/arch/x86/cpu/intel_common/report_platform.c
+++ b/arch/x86/cpu/intel_common/report_platform.c
@@ -11,6 +11,7 @@
 #include <asm/pci.h>
 #include <asm/report_platform.h>
 #include <asm/arch/pch.h>
+#include <linux/string.h>
 
 static void report_cpu_info(void)
 {
diff --git a/arch/x86/cpu/ivybridge/sata.c b/arch/x86/cpu/ivybridge/sata.c
index f47ecdffae76..40cb04158681 100644
--- a/arch/x86/cpu/ivybridge/sata.c
+++ b/arch/x86/cpu/ivybridge/sata.c
@@ -14,6 +14,7 @@
 #include <asm/pch_common.h>
 #include <asm/pci.h>
 #include <asm/arch/pch.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/ivybridge/sdram.c b/arch/x86/cpu/ivybridge/sdram.c
index dd6b8753de68..b9cec969be87 100644
--- a/arch/x86/cpu/ivybridge/sdram.c
+++ b/arch/x86/cpu/ivybridge/sdram.c
@@ -37,6 +37,7 @@
 #include <asm/arch/pch.h>
 #include <asm/post.h>
 #include <asm/arch/sandybridge.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/mp_init.c b/arch/x86/cpu/mp_init.c
index bd656d09520f..22cd1dbe52af 100644
--- a/arch/x86/cpu/mp_init.c
+++ b/arch/x86/cpu/mp_init.c
@@ -31,6 +31,7 @@
 #include <dm/root.h>
 #include <linux/delay.h>
 #include <linux/linkage.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/qfw_cpu.c b/arch/x86/cpu/qfw_cpu.c
index 349bab1583ac..2747cb312c75 100644
--- a/arch/x86/cpu/qfw_cpu.c
+++ b/arch/x86/cpu/qfw_cpu.c
@@ -11,6 +11,7 @@
 #include <dm/lists.h>
 #include <dm/uclass-internal.h>
 #include <dm/root.h>
+#include <linux/string.h>
 
 int qemu_cpu_fixup(void)
 {
diff --git a/arch/x86/cpu/quark/acpi.c b/arch/x86/cpu/quark/acpi.c
index 82b776ff65f6..655f2a1ce6ac 100644
--- a/arch/x86/cpu/quark/acpi.c
+++ b/arch/x86/cpu/quark/acpi.c
@@ -9,6 +9,7 @@
 #include <asm/tables.h>
 #include <asm/arch/global_nvs.h>
 #include <asm/arch/iomap.h>
+#include <linux/string.h>
 
 void acpi_create_fadt(struct acpi_fadt *fadt, struct acpi_facs *facs,
 		      void *dsdt)
diff --git a/arch/x86/cpu/quark/dram.c b/arch/x86/cpu/quark/dram.c
index 2287dce12b52..d38c3d0809a7 100644
--- a/arch/x86/cpu/quark/dram.c
+++ b/arch/x86/cpu/quark/dram.c
@@ -18,6 +18,7 @@
 #include <asm/arch/mrc.h>
 #include <asm/arch/msg_port.h>
 #include <asm/arch/quark.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/quark/smc.c b/arch/x86/cpu/quark/smc.c
index 824fe02d754f..b6167e934aa5 100644
--- a/arch/x86/cpu/quark/smc.c
+++ b/arch/x86/cpu/quark/smc.c
@@ -13,6 +13,7 @@
 #include <asm/arch/device.h>
 #include <asm/arch/mrc.h>
 #include <asm/arch/msg_port.h>
+#include <linux/string.h>
 #include "mrc_util.h"
 #include "hte.h"
 #include "smc.h"
diff --git a/arch/x86/cpu/tangier/acpi.c b/arch/x86/cpu/tangier/acpi.c
index 41bd177e095f..7a0020c74fe0 100644
--- a/arch/x86/cpu/tangier/acpi.c
+++ b/arch/x86/cpu/tangier/acpi.c
@@ -15,6 +15,7 @@
 #include <asm/arch/global_nvs.h>
 #include <asm/arch/iomap.h>
 #include <dm/uclass-internal.h>
+#include <linux/string.h>
 
 void acpi_create_fadt(struct acpi_fadt *fadt, struct acpi_facs *facs,
 		      void *dsdt)
diff --git a/arch/x86/cpu/tangier/sdram.c b/arch/x86/cpu/tangier/sdram.c
index 0f0ab4102be6..e1531385fb89 100644
--- a/arch/x86/cpu/tangier/sdram.c
+++ b/arch/x86/cpu/tangier/sdram.c
@@ -10,6 +10,7 @@
 #include <asm/global_data.h>
 #include <asm/sfi.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h
index 83dc09757e0c..f0119c47b856 100644
--- a/arch/x86/include/asm/io.h
+++ b/arch/x86/include/asm/io.h
@@ -8,6 +8,7 @@
 #define _ASM_IO_H
 
 #include <compiler.h>
+#include <linux/string.h>
 
 /*
  * This file contains the definitions for the x86 IO instructions
diff --git a/arch/x86/include/asm/me_common.h b/arch/x86/include/asm/me_common.h
index 49d88623edf9..56e328846cfd 100644
--- a/arch/x86/include/asm/me_common.h
+++ b/arch/x86/include/asm/me_common.h
@@ -13,6 +13,7 @@
 #define __ASM_ME_COMMON_H
 
 #include <linux/compiler.h>
+#include <linux/string.h>
 #include <linux/types.h>
 #include <pci.h>
 
diff --git a/arch/x86/lib/acpi.c b/arch/x86/lib/acpi.c
index 155fffabf080..ffdc9e8257e1 100644
--- a/arch/x86/lib/acpi.c
+++ b/arch/x86/lib/acpi.c
@@ -8,6 +8,7 @@
 #include <acpi/acpi_table.h>
 #include <asm/io.h>
 #include <asm/tables.h>
+#include <linux/string.h>
 
 static struct acpi_rsdp *acpi_valid_rsdp(struct acpi_rsdp *rsdp)
 {
diff --git a/arch/x86/lib/acpi_nhlt.c b/arch/x86/lib/acpi_nhlt.c
index c64dd9c00819..8df5ddd4a7af 100644
--- a/arch/x86/lib/acpi_nhlt.c
+++ b/arch/x86/lib/acpi_nhlt.c
@@ -17,6 +17,7 @@
 #include <asm/acpi_nhlt.h>
 #include <asm/unaligned.h>
 #include <dm/acpi.h>
+#include <linux/string.h>
 
 #define NHLT_RID		1
 #define NHLT_SSID		1
diff --git a/arch/x86/lib/acpi_s3.c b/arch/x86/lib/acpi_s3.c
index 2c70acbe7b0b..244764152b23 100644
--- a/arch/x86/lib/acpi_s3.c
+++ b/arch/x86/lib/acpi_s3.c
@@ -10,6 +10,7 @@
 #include <asm/global_data.h>
 #include <asm/post.h>
 #include <linux/linkage.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/lib/acpi_table.c b/arch/x86/lib/acpi_table.c
index c574f0c62304..c6500f62ad80 100644
--- a/arch/x86/lib/acpi_table.c
+++ b/arch/x86/lib/acpi_table.c
@@ -25,6 +25,7 @@
 #include <asm/arch/global_nvs.h>
 #include <dm/acpi.h>
 #include <linux/err.h>
+#include <linux/string.h>
 
 /*
  * IASL compiles the dsdt entries and writes the hex values
diff --git a/arch/x86/lib/bios.c b/arch/x86/lib/bios.c
index fbdc3b04e361..a4499972c322 100644
--- a/arch/x86/lib/bios.c
+++ b/arch/x86/lib/bios.c
@@ -17,6 +17,7 @@
 #include <asm/i8259.h>
 #include <asm/io.h>
 #include <asm/post.h>
+#include <linux/string.h>
 #include "bios.h"
 
 /* Interrupt handlers for each interrupt the ROM can call */
diff --git a/arch/x86/lib/cmd_boot.c b/arch/x86/lib/cmd_boot.c
index 4facbe5f32fb..b128b43cebe5 100644
--- a/arch/x86/lib/cmd_boot.c
+++ b/arch/x86/lib/cmd_boot.c
@@ -19,6 +19,7 @@
 #include <malloc.h>
 #include <asm/global_data.h>
 #include <asm/u-boot-x86.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/lib/coreboot_table.c b/arch/x86/lib/coreboot_table.c
index 6eab0452fda6..b0377dcee177 100644
--- a/arch/x86/lib/coreboot_table.c
+++ b/arch/x86/lib/coreboot_table.c
@@ -11,6 +11,7 @@
 #include <asm/coreboot_tables.h>
 #include <asm/e820.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/lib/fsp1/fsp_support.c b/arch/x86/lib/fsp1/fsp_support.c
index d84c632f1407..25aa71c6c20a 100644
--- a/arch/x86/lib/fsp1/fsp_support.c
+++ b/arch/x86/lib/fsp1/fsp_support.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <asm/fsp1/fsp_support.h>
 #include <asm/post.h>
+#include <linux/string.h>
 
 struct fsp_header *__attribute__((optimize("O0"))) fsp_find_header(void)
 {
diff --git a/arch/x86/lib/fsp2/fsp_meminit.c b/arch/x86/lib/fsp2/fsp_meminit.c
index 022e2cb64e5a..abbe1a011dda 100644
--- a/arch/x86/lib/fsp2/fsp_meminit.c
+++ b/arch/x86/lib/fsp2/fsp_meminit.c
@@ -18,6 +18,7 @@
 #include <asm/fsp2/fsp_internal.h>
 #include <asm/arch/fsp/fsp_configs.h>
 #include <asm/arch/fsp/fsp_m_upd.h>
+#include <linux/string.h>
 
 static int prepare_mrc_cache_type(enum mrc_type_t type,
 				  struct mrc_data_container **cachep)
diff --git a/arch/x86/lib/fsp2/fsp_silicon_init.c b/arch/x86/lib/fsp2/fsp_silicon_init.c
index f86dbfa6c63c..ca064eaf7165 100644
--- a/arch/x86/lib/fsp2/fsp_silicon_init.c
+++ b/arch/x86/lib/fsp2/fsp_silicon_init.c
@@ -18,6 +18,7 @@
 #include <asm/fsp/fsp_infoheader.h>
 #include <asm/fsp2/fsp_internal.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 
 int fsp_silicon_init(bool s3wake, bool use_spi_flash)
 {
diff --git a/arch/x86/lib/fsp2/fsp_support.c b/arch/x86/lib/fsp2/fsp_support.c
index bcdf429f06ae..1f68479ec586 100644
--- a/arch/x86/lib/fsp2/fsp_support.c
+++ b/arch/x86/lib/fsp2/fsp_support.c
@@ -11,6 +11,7 @@
 #include <asm/fsp/fsp_support.h>
 #include <asm/fsp2/fsp_internal.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 
 /* The amount of the FSP header to probe to obtain what we need */
 #define PROBE_BUF_SIZE 0x180
diff --git a/arch/x86/lib/mpspec.c b/arch/x86/lib/mpspec.c
index 8021d8f75a4a..78724564605a 100644
--- a/arch/x86/lib/mpspec.c
+++ b/arch/x86/lib/mpspec.c
@@ -19,6 +19,7 @@
 #include <asm/mpspec.h>
 #include <asm/tables.h>
 #include <dm/uclass-internal.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/lib/mrccache.c b/arch/x86/lib/mrccache.c
index b52691568012..12c24e1e46fb 100644
--- a/arch/x86/lib/mrccache.c
+++ b/arch/x86/lib/mrccache.c
@@ -19,6 +19,7 @@
 #include <asm/mrccache.h>
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/lib/physmem.c b/arch/x86/lib/physmem.c
index c11101b44ece..1589a8873506 100644
--- a/arch/x86/lib/physmem.c
+++ b/arch/x86/lib/physmem.c
@@ -14,6 +14,7 @@
 #include <asm/cpu.h>
 #include <asm/global_data.h>
 #include <linux/compiler.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/lib/pirq_routing.c b/arch/x86/lib/pirq_routing.c
index caeaec9287fe..8aeba8496a9f 100644
--- a/arch/x86/lib/pirq_routing.c
+++ b/arch/x86/lib/pirq_routing.c
@@ -11,6 +11,7 @@
 #include <asm/global_data.h>
 #include <asm/pci.h>
 #include <asm/pirq_routing.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/lib/relocate.c b/arch/x86/lib/relocate.c
index 6fe515164773..ffccbf54dfcd 100644
--- a/arch/x86/lib/relocate.c
+++ b/arch/x86/lib/relocate.c
@@ -21,6 +21,7 @@
 #include <asm/u-boot-x86.h>
 #include <asm/sections.h>
 #include <elf.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/lib/scu.c b/arch/x86/lib/scu.c
index d29d701631d2..a9d06d82bb45 100644
--- a/arch/x86/lib/scu.c
+++ b/arch/x86/lib/scu.c
@@ -20,6 +20,7 @@
 #include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/kernel.h>
+#include <linux/string.h>
 
 /* SCU register map */
 struct ipc_regs {
diff --git a/arch/x86/lib/sfi.c b/arch/x86/lib/sfi.c
index b48bd5d8f361..2e68504d886c 100644
--- a/arch/x86/lib/sfi.c
+++ b/arch/x86/lib/sfi.c
@@ -20,6 +20,7 @@
 #include <asm/sfi.h>
 #include <asm/tables.h>
 #include <dm/uclass-internal.h>
+#include <linux/string.h>
 
 struct table_info {
 	u32 base;
diff --git a/arch/x86/lib/spl.c b/arch/x86/lib/spl.c
index a220c71b5768..96885c6cc55f 100644
--- a/arch/x86/lib/spl.c
+++ b/arch/x86/lib/spl.c
@@ -24,6 +24,7 @@
 #include <asm/processor.h>
 #include <asm/spl.h>
 #include <asm-generic/sections.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/lib/string.c b/arch/x86/lib/string.c
index c6263cd2f5a8..d85b77a96240 100644
--- a/arch/x86/lib/string.c
+++ b/arch/x86/lib/string.c
@@ -7,6 +7,7 @@
 
 /* From glibc-2.14, sysdeps/i386/memset.c */
 
+#include <linux/string.h>
 #include <linux/types.h>
 #include <linux/compiler.h>
 #include <asm/string.h>
diff --git a/arch/x86/lib/tables.c b/arch/x86/lib/tables.c
index 730552a0ea55..e4ed0f4aae17 100644
--- a/arch/x86/lib/tables.c
+++ b/arch/x86/lib/tables.c
@@ -13,6 +13,7 @@
 #include <asm/mpspec.h>
 #include <asm/tables.h>
 #include <asm/coreboot_tables.h>
+#include <linux/string.h>
 
 /**
  * Function prototype to write a specific configuration table
diff --git a/arch/x86/lib/zimage.c b/arch/x86/lib/zimage.c
index d2b6002008ad..e7c0ff321208 100644
--- a/arch/x86/lib/zimage.c
+++ b/arch/x86/lib/zimage.c
@@ -29,6 +29,7 @@
 #endif
 #include <linux/compiler.h>
 #include <linux/libfdt.h>
+#include <linux/string.h>
 
 /*
  * Memory lay-out:
diff --git a/arch/xtensa/include/asm/io.h b/arch/xtensa/include/asm/io.h
index 76a646e8825c..14e906193602 100644
--- a/arch/xtensa/include/asm/io.h
+++ b/arch/xtensa/include/asm/io.h
@@ -9,6 +9,7 @@
 #ifndef _XTENSA_IO_H
 #define _XTENSA_IO_H
 
+#include <linux/string.h>
 #include <linux/types.h>
 #include <asm/byteorder.h>
 
diff --git a/arch/xtensa/lib/bootm.c b/arch/xtensa/lib/bootm.c
index b51d329c670b..c33bcf2f9edd 100644
--- a/arch/xtensa/lib/bootm.c
+++ b/arch/xtensa/lib/bootm.c
@@ -10,6 +10,7 @@
 #include <cpu_func.h>
 #include <env.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 #include <u-boot/zlib.h>
 #include <asm/byteorder.h>
 #include <asm/addrspace.h>
diff --git a/arch/xtensa/lib/relocate.c b/arch/xtensa/lib/relocate.c
index 91141f581e13..ffe39d4a03ca 100644
--- a/arch/xtensa/lib/relocate.c
+++ b/arch/xtensa/lib/relocate.c
@@ -6,6 +6,7 @@
 #include <relocate.h>
 #include <asm/sections.h>
 #include <asm/string.h>
+#include <linux/string.h>
 
 int clear_bss(void)
 {
diff --git a/board/Arcturus/ucp1020/cmd_arc.c b/board/Arcturus/ucp1020/cmd_arc.c
index 4b30b66e208f..99652dde928a 100644
--- a/board/Arcturus/ucp1020/cmd_arc.c
+++ b/board/Arcturus/ucp1020/cmd_arc.c
@@ -19,6 +19,7 @@
 #include <mmc.h>
 #include <version.h>
 #include <asm/io.h>
+#include <linux/string.h>
 #include <linux/stringify.h>
 
 static ulong fwenv_addr[MAX_FWENV_ADDR];
diff --git a/board/Arcturus/ucp1020/ddr.c b/board/Arcturus/ucp1020/ddr.c
index a3285ebe5cdf..712023faf7d0 100644
--- a/board/Arcturus/ucp1020/ddr.c
+++ b/board/Arcturus/ucp1020/ddr.c
@@ -16,6 +16,7 @@
 #include <fsl_ddr_dimm_params.h>
 #include <asm/io.h>
 #include <asm/fsl_law.h>
+#include <linux/string.h>
 
 #ifdef CONFIG_SYS_DDR_RAW_TIMING
 #if defined(CONFIG_UCP1020) || defined(CONFIG_UCP1020T1)
diff --git a/board/Arcturus/ucp1020/spl.c b/board/Arcturus/ucp1020/spl.c
index 34660e59f44e..b5db24da2942 100644
--- a/board/Arcturus/ucp1020/spl.c
+++ b/board/Arcturus/ucp1020/spl.c
@@ -21,6 +21,7 @@
 #include <fsl_esdhc.h>
 #include <spi_flash.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/Arcturus/ucp1020/ucp1020.c b/board/Arcturus/ucp1020/ucp1020.c
index 24d1d57ec4bd..0846bb0e9ef3 100644
--- a/board/Arcturus/ucp1020/ucp1020.c
+++ b/board/Arcturus/ucp1020/ucp1020.c
@@ -40,6 +40,7 @@
 #include <asm/fsl_law.h>
 #include <asm/fsl_lbc.h>
 #include <asm/mp.h>
+#include <linux/string.h>
 #include "ucp1020.h"
 
 void spi_set_speed(struct spi_slave *slave, uint hz)
diff --git a/board/BuR/common/common.c b/board/BuR/common/common.c
index d2d4ea5835bb..c42711d97330 100644
--- a/board/BuR/common/common.c
+++ b/board/BuR/common/common.c
@@ -17,6 +17,7 @@
 #include <lcd.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include "bur_common.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/BuS/eb_cpu5282/eb_cpu5282.c b/board/BuS/eb_cpu5282/eb_cpu5282.c
index 03a02ffd29c5..fb612c70752f 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 <asm/global_data.h>
+#include <linux/string.h>
 #include "asm/m5282.h"
 #include <bmp_layout.h>
 #include <env.h>
diff --git a/board/CZ.NIC/turris_omnia/turris_omnia.c b/board/CZ.NIC/turris_omnia/turris_omnia.c
index 0353d58a361b..b84227a56e0e 100644
--- a/board/CZ.NIC/turris_omnia/turris_omnia.c
+++ b/board/CZ.NIC/turris_omnia/turris_omnia.c
@@ -23,6 +23,7 @@
 #include <fdt_support.h>
 #include <time.h>
 #include <linux/bitops.h>
+#include <linux/string.h>
 #include <u-boot/crc.h>
 # include <atsha204a-i2c.h>
 
diff --git a/board/Synology/ds109/ds109.c b/board/Synology/ds109/ds109.c
index bf57ffff4385..7159535ec456 100644
--- a/board/Synology/ds109/ds109.c
+++ b/board/Synology/ds109/ds109.c
@@ -15,6 +15,7 @@
 #include <asm/arch/soc.h>
 #include <asm/arch/mpp.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include "ds109.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/Synology/ds414/cmd_syno.c b/board/Synology/ds414/cmd_syno.c
index a120c3123ffb..94a56368970e 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 <linux/mtd/mtd.h>
+#include <linux/string.h>
 
 #include <asm/io.h>
 #include "../drivers/ddr/marvell/axp/ddr3_init.h"
diff --git a/board/advantech/imx8qm_rom7720_a1/spl.c b/board/advantech/imx8qm_rom7720_a1/spl.c
index 8493bb01588d..5a9a00905354 100644
--- a/board/advantech/imx8qm_rom7720_a1/spl.c
+++ b/board/advantech/imx8qm_rom7720_a1/spl.c
@@ -10,6 +10,7 @@
 #include <spl.h>
 #include <fsl_esdhc.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 
 #include <asm/io.h>
 #include <asm/gpio.h>
diff --git a/board/aristainetos/aristainetos.c b/board/aristainetos/aristainetos.c
index a28f67a0b13a..ab73a928d667 100644
--- a/board/aristainetos/aristainetos.c
+++ b/board/aristainetos/aristainetos.c
@@ -34,6 +34,7 @@
 #include <miiphy.h>
 #include <lcd.h>
 #include <led.h>
+#include <linux/string.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/da9063_pmic.h>
diff --git a/board/armltd/vexpress/vexpress_common.c b/board/armltd/vexpress/vexpress_common.c
index d34c03bf9dd5..d359a36c7745 100644
--- a/board/armltd/vexpress/vexpress_common.c
+++ b/board/armltd/vexpress/vexpress_common.c
@@ -29,6 +29,7 @@
 #include <asm/arch/systimer.h>
 #include <asm/arch/sysctrl.h>
 #include <asm/arch/wdt.h>
+#include <linux/string.h>
 #include "../drivers/mmc/arm_pl180_mmci.h"
 
 static struct systimer *systimer_base = (struct systimer *)V2M_TIMER01;
diff --git a/board/armltd/vexpress/vexpress_tc2.c b/board/armltd/vexpress/vexpress_tc2.c
index 8ee24bdde731..fe5389b4e446 100644
--- a/board/armltd/vexpress/vexpress_tc2.c
+++ b/board/armltd/vexpress/vexpress_tc2.c
@@ -11,6 +11,7 @@
 #include <asm/u-boot.h>
 #include <common.h>
 #include <linux/libfdt.h>
+#include <linux/string.h>
 
 #define SCC_BASE	0x7fff0000
 
diff --git a/board/armltd/vexpress64/vexpress64.c b/board/armltd/vexpress64/vexpress64.c
index 6bf2ed23190b..cc118a02f116 100644
--- a/board/armltd/vexpress64/vexpress64.c
+++ b/board/armltd/vexpress64/vexpress64.c
@@ -16,6 +16,7 @@
 #include <asm/io.h>
 #include <linux/compiler.h>
 #include <dm/platform_data/serial_pl01x.h>
+#include <linux/string.h>
 #include "pcie.h"
 #include <asm/armv8/mmu.h>
 
diff --git a/board/atmel/common/mac-spi-nor.c b/board/atmel/common/mac-spi-nor.c
index ced27b65e63b..3b150dac7d86 100644
--- a/board/atmel/common/mac-spi-nor.c
+++ b/board/atmel/common/mac-spi-nor.c
@@ -11,6 +11,7 @@
 #include <net.h>
 #include <linux/mtd/spi-nor.h>
 #include <netdev.h>
+#include <linux/string.h>
 
 #define ETH_ADDR_SIZE			6
 
diff --git a/board/atmel/common/video_display.c b/board/atmel/common/video_display.c
index a5049f4aad41..33725a01f505 100644
--- a/board/atmel/common/video_display.c
+++ b/board/atmel/common/video_display.c
@@ -16,6 +16,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clk.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/atmel/sama5d3xek/sama5d3xek.c b/board/atmel/sama5d3xek/sama5d3xek.c
index b6f8dcd91dc0..4fe979bc8a56 100644
--- a/board/atmel/sama5d3xek/sama5d3xek.c
+++ b/board/atmel/sama5d3xek/sama5d3xek.c
@@ -19,6 +19,7 @@
 #include <spl.h>
 #include <asm/arch/atmel_mpddrc.h>
 #include <asm/arch/at91_wdt.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/barco/platinum/spl_picon.c b/board/barco/platinum/spl_picon.c
index 253a64d28eba..aa33d1feb32c 100644
--- a/board/barco/platinum/spl_picon.c
+++ b/board/barco/platinum/spl_picon.c
@@ -18,6 +18,7 @@
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/mach-imx/mxc_i2c.h>
 #include <spl.h>
+#include <linux/string.h>
 
 #include "platinum.h"
 
diff --git a/board/barco/platinum/spl_titanium.c b/board/barco/platinum/spl_titanium.c
index 8c91b752ffe0..ef1e2c419b46 100644
--- a/board/barco/platinum/spl_titanium.c
+++ b/board/barco/platinum/spl_titanium.c
@@ -18,6 +18,7 @@
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/mach-imx/mxc_i2c.h>
 #include <spl.h>
+#include <linux/string.h>
 
 #include "platinum.h"
 
diff --git a/board/beacon/imx8mm/spl.c b/board/beacon/imx8mm/spl.c
index 12266b22a42f..572dc5191233 100644
--- a/board/beacon/imx8mm/spl.c
+++ b/board/beacon/imx8mm/spl.c
@@ -14,6 +14,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/mach-imx/boot_mode.h>
 #include <asm/arch/ddr.h>
+#include <linux/string.h>
 
 #include <dm/uclass.h>
 #include <dm/device.h>
diff --git a/board/beckhoff/mx53cx9020/mx53cx9020.c b/board/beckhoff/mx53cx9020/mx53cx9020.c
index a3657db8266c..e451ef9ef36c 100644
--- a/board/beckhoff/mx53cx9020/mx53cx9020.c
+++ b/board/beckhoff/mx53cx9020/mx53cx9020.c
@@ -18,6 +18,7 @@
 #include <ACEX1K.h>
 #include <asm/gpio.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 enum LED_GPIOS {
 	GPIO_SD1_CD = IMX_GPIO_NR(1, 1),
diff --git a/board/bluewater/gurnard/gurnard.c b/board/bluewater/gurnard/gurnard.c
index c5c8bcc598e6..2ac23674f9c1 100644
--- a/board/bluewater/gurnard/gurnard.c
+++ b/board/bluewater/gurnard/gurnard.c
@@ -35,6 +35,7 @@
 #include <asm/arch/gpio.h>
 #include <dm/uclass-internal.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #ifdef CONFIG_GURNARD_SPLASH
 #include "splash_logo.h"
diff --git a/board/boundary/nitrogen6x/nitrogen6x.c b/board/boundary/nitrogen6x/nitrogen6x.c
index 84e14d1124fc..3cc093ed5307 100644
--- a/board/boundary/nitrogen6x/nitrogen6x.c
+++ b/board/boundary/nitrogen6x/nitrogen6x.c
@@ -35,6 +35,7 @@
 #include <i2c.h>
 #include <input.h>
 #include <netdev.h>
+#include <linux/string.h>
 #include <usb/ehci-ci.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/cavium/thunderx/atf.c b/board/cavium/thunderx/atf.c
index 64aa198765fe..a60c944089dd 100644
--- a/board/cavium/thunderx/atf.c
+++ b/board/cavium/thunderx/atf.c
@@ -8,6 +8,7 @@
 #include <asm/cache.h>
 #include <asm/io.h>
 #include <asm/ptrace.h>
+#include <linux/string.h>
 
 #include <asm/system.h>
 #include <cavium/thunderx_svc.h>
diff --git a/board/cobra5272/flash.c b/board/cobra5272/flash.c
index 9aa8f118baf5..cefcc6634ffb 100644
--- a/board/cobra5272/flash.c
+++ b/board/cobra5272/flash.c
@@ -12,6 +12,7 @@
 #include <time.h>
 #include <uuid.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #define PHYS_FLASH_1 CONFIG_SYS_FLASH_BASE
 #define FLASH_BANK_SIZE 0x200000
@@ -72,7 +73,7 @@ unsigned long flash_init(void)
 			(AMD_ID_PL160CB & FLASH_TYPEMASK);
 		flash_info[i].size = FLASH_BANK_SIZE;
 		flash_info[i].sector_count = CONFIG_SYS_MAX_FLASH_SECT;
-		memset (flash_info[i].protect, 0, CONFIG_SYS_MAX_FLASH_SECT);
+		memset(flash_info[i].protect, 0, CONFIG_SYS_MAX_FLASH_SECT);
 		if (i == 0)
 			flashbase = PHYS_FLASH_1;
 		else
diff --git a/board/compulab/cl-som-imx7/spl.c b/board/compulab/cl-som-imx7/spl.c
index 9c7332b43b57..0128b912801c 100644
--- a/board/compulab/cl-som-imx7/spl.c
+++ b/board/compulab/cl-som-imx7/spl.c
@@ -16,6 +16,7 @@
 #include <asm/arch-mx7/mx7-pins.h>
 #include <asm/arch-mx7/clock.h>
 #include <asm/arch-mx7/mx7-ddr.h>
+#include <linux/string.h>
 #include "common.h"
 
 #ifdef CONFIG_FSL_ESDHC_IMX
diff --git a/board/compulab/cm_fx6/cm_fx6.c b/board/compulab/cm_fx6/cm_fx6.c
index 2b11b7ee189b..46da479a45fc 100644
--- a/board/compulab/cm_fx6/cm_fx6.c
+++ b/board/compulab/cm_fx6/cm_fx6.c
@@ -37,6 +37,7 @@
 #include <dm/device-internal.h>
 #include <jffs2/load_kernel.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include "common.h"
 #include "../common/eeprom.h"
 #include "../common/common.h"
diff --git a/board/compulab/common/eeprom.c b/board/compulab/common/eeprom.c
index 5206cf5c0ad7..fa4ab7d65672 100644
--- a/board/compulab/common/eeprom.c
+++ b/board/compulab/common/eeprom.c
@@ -13,6 +13,7 @@
 #include <eeprom_field.h>
 #include <asm/setup.h>
 #include <linux/kernel.h>
+#include <linux/string.h>
 #include "eeprom.h"
 
 #ifndef CONFIG_SYS_I2C_EEPROM_ADDR
diff --git a/board/compulab/common/omap3_display.c b/board/compulab/common/omap3_display.c
index cb9ebae7f964..e1511e82eccc 100644
--- a/board/compulab/common/omap3_display.c
+++ b/board/compulab/common/omap3_display.c
@@ -16,6 +16,7 @@
 #include <lcd.h>
 #include <scf0403_lcd.h>
 #include <asm/arch-omap3/dss.h>
+#include <linux/string.h>
 
 enum display_type {
 	NONE,
diff --git a/board/congatec/cgtqmx6eval/cgtqmx6eval.c b/board/congatec/cgtqmx6eval/cgtqmx6eval.c
index 6ae4a1af8921..3f74cd87890f 100644
--- a/board/congatec/cgtqmx6eval/cgtqmx6eval.c
+++ b/board/congatec/cgtqmx6eval/cgtqmx6eval.c
@@ -29,6 +29,7 @@
 #include <i2c.h>
 #include <input.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include <power/pmic.h>
 #include <power/pfuze100_pmic.h>
 #include <linux/fb.h>
diff --git a/board/corscience/tricorder/tricorder-eeprom.c b/board/corscience/tricorder/tricorder-eeprom.c
index d0b91864c27f..266f43a0058f 100644
--- a/board/corscience/tricorder/tricorder-eeprom.c
+++ b/board/corscience/tricorder/tricorder-eeprom.c
@@ -9,6 +9,7 @@
 #include <display_options.h>
 #include <eeprom.h>
 #include <i2c.h>
+#include <linux/string.h>
 #include <u-boot/crc.h>
 
 #include "tricorder-eeprom.h"
diff --git a/board/corscience/tricorder/tricorder.c b/board/corscience/tricorder/tricorder.c
index 3f4a40fd6593..a6fc7f67d02f 100644
--- a/board/corscience/tricorder/tricorder.c
+++ b/board/corscience/tricorder/tricorder.c
@@ -21,6 +21,7 @@
 #include <asm/arch/mux.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/mem.h>
+#include <linux/string.h>
 #include "tricorder.h"
 #include "tricorder-eeprom.h"
 
diff --git a/board/creative/xfi3/spl_boot.c b/board/creative/xfi3/spl_boot.c
index 67c1e9801b9b..64a13cef305c 100644
--- a/board/creative/xfi3/spl_boot.c
+++ b/board/creative/xfi3/spl_boot.c
@@ -11,6 +11,7 @@
 #include <asm/arch/iomux-mx23.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/string.h>
 
 #define	MUX_CONFIG_EMI	(MXS_PAD_1V8 | MXS_PAD_12MA | MXS_PAD_PULLUP)
 #define	MUX_CONFIG_SSP	(MXS_PAD_3V3 | MXS_PAD_8MA | MXS_PAD_PULLUP)
diff --git a/board/cssi/MCR3000/MCR3000.c b/board/cssi/MCR3000/MCR3000.c
index c20e87149493..2603ad4c57d8 100644
--- a/board/cssi/MCR3000/MCR3000.c
+++ b/board/cssi/MCR3000/MCR3000.c
@@ -19,6 +19,7 @@
 #include <dm/uclass.h>
 #include <wdt.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/davinci/da8xxevm/da850evm.c b/board/davinci/da8xxevm/da850evm.c
index 383a86173849..7b3f303f3a74 100644
--- a/board/davinci/da8xxevm/da850evm.c
+++ b/board/davinci/da8xxevm/da850evm.c
@@ -27,6 +27,7 @@
 #include <hwconfig.h>
 #include <asm/mach-types.h>
 #include <asm/gpio.h>
+#include <linux/string.h>
 
 #ifdef CONFIG_MMC_DAVINCI
 #include <mmc.h>
diff --git a/board/davinci/da8xxevm/omapl138_lcdk.c b/board/davinci/da8xxevm/omapl138_lcdk.c
index 7607e313b752..3f4bd39ec8fd 100644
--- a/board/davinci/da8xxevm/omapl138_lcdk.c
+++ b/board/davinci/da8xxevm/omapl138_lcdk.c
@@ -26,6 +26,7 @@
 #include <mmc.h>
 #include <asm/arch/sdmmc_defs.h>
 #endif
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/dhelectronics/dh_imx6/dh_imx6.c b/board/dhelectronics/dh_imx6/dh_imx6.c
index 2969e90a707d..c8c99a2aa47d 100644
--- a/board/dhelectronics/dh_imx6/dh_imx6.c
+++ b/board/dhelectronics/dh_imx6/dh_imx6.c
@@ -34,6 +34,7 @@
 #include <mmc.h>
 #include <usb.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include <usb/ehci-ci.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/dhelectronics/dh_imx6/dh_imx6_spl.c b/board/dhelectronics/dh_imx6/dh_imx6_spl.c
index e49e97724a58..dd8f1625be3c 100644
--- a/board/dhelectronics/dh_imx6/dh_imx6_spl.c
+++ b/board/dhelectronics/dh_imx6/dh_imx6_spl.c
@@ -26,6 +26,7 @@
 #include <mmc.h>
 #include <spl.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #define ENET_PAD_CTRL							\
 	(PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm |	\
diff --git a/board/dhelectronics/dh_stm32mp1/board.c b/board/dhelectronics/dh_stm32mp1/board.c
index 73e8c3f9b48f..ddf8f67ae6cf 100644
--- a/board/dhelectronics/dh_stm32mp1/board.c
+++ b/board/dhelectronics/dh_stm32mp1/board.c
@@ -36,6 +36,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include <power/regulator.h>
 #include <remoteproc.h>
 #include <reset.h>
diff --git a/board/egnite/ethernut5/ethernut5_pwrman.c b/board/egnite/ethernut5/ethernut5_pwrman.c
index 81f1abf2fad9..56c33bfade4b 100644
--- a/board/egnite/ethernut5/ethernut5_pwrman.c
+++ b/board/egnite/ethernut5/ethernut5_pwrman.c
@@ -39,6 +39,7 @@
 #include <asm/io.h>
 #include <i2c.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include "ethernut5_pwrman.h"
 
diff --git a/board/el/el6x/el6x.c b/board/el/el6x/el6x.c
index ddac58f73d28..382a255d1623 100644
--- a/board/el/el6x/el6x.c
+++ b/board/el/el6x/el6x.c
@@ -31,6 +31,7 @@
 #include <asm/arch/sys_proto.h>
 #include <i2c.h>
 #include <input.h>
+#include <linux/string.h>
 #include <power/pmic.h>
 #include <power/pfuze100_pmic.h>
 #include <asm/arch/mx6-ddr.h>
diff --git a/board/engicam/common/board.c b/board/engicam/common/board.c
index df9149e0d6d8..28080d423b39 100644
--- a/board/engicam/common/board.c
+++ b/board/engicam/common/board.c
@@ -17,6 +17,7 @@
 #include <asm/arch/sys_proto.h>
 #include <watchdog.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 
 #include "board.h"
 
diff --git a/board/engicam/common/spl.c b/board/engicam/common/spl.c
index 6a0612481a8a..d57419a78efe 100644
--- a/board/engicam/common/spl.c
+++ b/board/engicam/common/spl.c
@@ -11,6 +11,7 @@
 #include <serial.h>
 #include <spl.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include <asm/io.h>
 #include <asm/gpio.h>
diff --git a/board/esd/meesc/meesc.c b/board/esd/meesc/meesc.c
index eaa525eb0049..81aa22bc8314 100644
--- a/board/esd/meesc/meesc.c
+++ b/board/esd/meesc/meesc.c
@@ -28,6 +28,7 @@
 #include <asm/arch/at91_pio.h>
 #include <asm/arch/clk.h>
 #include <netdev.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/esd/vme8349/caddy.c b/board/esd/vme8349/caddy.c
index ba91f4b3c843..fc4855a5beae 100644
--- a/board/esd/vme8349/caddy.c
+++ b/board/esd/vme8349/caddy.c
@@ -15,6 +15,7 @@
 #include <pci.h>
 #include <asm/mmu.h>
 #include <asm/io.h>
+#include <linux/string.h>
 
 #include "caddy.h"
 
diff --git a/board/esd/vme8349/vme8349.c b/board/esd/vme8349/vme8349.c
index d388fc6d4901..56dd2269cb8b 100644
--- a/board/esd/vme8349/vme8349.c
+++ b/board/esd/vme8349/vme8349.c
@@ -28,6 +28,7 @@
 #include <spd_sdram.h>
 #include <i2c.h>
 #include <netdev.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/firefly/roc-pc-rk3399/roc-pc-rk3399.c b/board/firefly/roc-pc-rk3399/roc-pc-rk3399.c
index 93e7d776fb2f..7029bf7bf869 100644
--- a/board/firefly/roc-pc-rk3399/roc-pc-rk3399.c
+++ b/board/firefly/roc-pc-rk3399/roc-pc-rk3399.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <spl_gpio.h>
 #include <asm/io.h>
+#include <linux/string.h>
 #include <power/regulator.h>
 
 #include <asm/arch-rockchip/cru.h>
diff --git a/board/freescale/common/fsl_validate.c b/board/freescale/common/fsl_validate.c
index 564a8b3b54ff..213545e777f4 100644
--- a/board/freescale/common/fsl_validate.c
+++ b/board/freescale/common/fsl_validate.c
@@ -13,6 +13,7 @@
 #include <command.h>
 #include <log.h>
 #include <malloc.h>
+#include <linux/string.h>
 #include <u-boot/rsa-mod-exp.h>
 #include <hash.h>
 #include <fsl_secboot_err.h>
diff --git a/board/freescale/common/ngpixis.c b/board/freescale/common/ngpixis.c
index 37a6f775a057..a89b07986bb0 100644
--- a/board/freescale/common/ngpixis.c
+++ b/board/freescale/common/ngpixis.c
@@ -32,6 +32,7 @@
 #include <common.h>
 #include <command.h>
 #include <asm/io.h>
+#include <linux/string.h>
 
 #include "ngpixis.h"
 
diff --git a/board/freescale/common/pixis.c b/board/freescale/common/pixis.c
index 4127fbc1396c..99e8069ad299 100644
--- a/board/freescale/common/pixis.c
+++ b/board/freescale/common/pixis.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <command.h>
 #include <asm/io.h>
+#include <linux/string.h>
 
 #define pixis_base (u8 *)PIXIS_BASE
 
diff --git a/board/freescale/common/qixis.c b/board/freescale/common/qixis.c
index 1696c24e27bc..8592b0f0f0ac 100644
--- a/board/freescale/common/qixis.c
+++ b/board/freescale/common/qixis.c
@@ -11,6 +11,7 @@
 #include <command.h>
 #include <asm/io.h>
 #include <linux/compiler.h>
+#include <linux/string.h>
 #include <linux/time.h>
 #include <i2c.h>
 #include "qixis.h"
diff --git a/board/freescale/common/sgmii_riser.c b/board/freescale/common/sgmii_riser.c
index 23157930101f..e6481f695167 100644
--- a/board/freescale/common/sgmii_riser.c
+++ b/board/freescale/common/sgmii_riser.c
@@ -19,6 +19,7 @@
 #include <linux/libfdt.h>
 #include <tsec.h>
 #include <fdt_support.h>
+#include <linux/string.h>
 
 void fsl_sgmii_riser_init(struct tsec_info_struct *tsec_info, int num)
 {
diff --git a/board/freescale/common/sys_eeprom.c b/board/freescale/common/sys_eeprom.c
index 728245d81cda..566920d5feb9 100644
--- a/board/freescale/common/sys_eeprom.c
+++ b/board/freescale/common/sys_eeprom.c
@@ -13,6 +13,7 @@
 #include <init.h>
 #include <linux/ctype.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include <u-boot/crc.h>
 
 #ifdef CONFIG_SYS_I2C_EEPROM_CCID
diff --git a/board/freescale/corenet_ds/ddr.c b/board/freescale/corenet_ds/ddr.c
index 2c440673e7c3..a8e499869f5d 100644
--- a/board/freescale/corenet_ds/ddr.c
+++ b/board/freescale/corenet_ds/ddr.c
@@ -14,6 +14,7 @@
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
 #include <asm/fsl_law.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/corenet_ds/eth_hydra.c b/board/freescale/corenet_ds/eth_hydra.c
index 8112c12568d2..90ce999be0cb 100644
--- a/board/freescale/corenet_ds/eth_hydra.c
+++ b/board/freescale/corenet_ds/eth_hydra.c
@@ -56,6 +56,7 @@
 #include <malloc.h>
 #include <fdt_support.h>
 #include <fsl_dtsec.h>
+#include <linux/string.h>
 
 #include "../common/ngpixis.h"
 #include "../common/fman.h"
diff --git a/board/freescale/corenet_ds/eth_superhydra.c b/board/freescale/corenet_ds/eth_superhydra.c
index 35daa1e80f3a..296b2b100276 100644
--- a/board/freescale/corenet_ds/eth_superhydra.c
+++ b/board/freescale/corenet_ds/eth_superhydra.c
@@ -57,6 +57,7 @@
 #include <malloc.h>
 #include <fdt_support.h>
 #include <fsl_dtsec.h>
+#include <linux/string.h>
 
 #include "../common/ngpixis.h"
 #include "../common/fman.h"
diff --git a/board/freescale/imx8mm_evk/spl.c b/board/freescale/imx8mm_evk/spl.c
index 64bc60651d3e..fbc13ad128ad 100644
--- a/board/freescale/imx8mm_evk/spl.c
+++ b/board/freescale/imx8mm_evk/spl.c
@@ -19,6 +19,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/mach-imx/boot_mode.h>
 #include <asm/arch/ddr.h>
+#include <linux/string.h>
 
 #include <dm/uclass.h>
 #include <dm/device.h>
diff --git a/board/freescale/imx8mn_evk/spl.c b/board/freescale/imx8mn_evk/spl.c
index 6d5c7a5b4676..9f3c58841284 100644
--- a/board/freescale/imx8mn_evk/spl.c
+++ b/board/freescale/imx8mn_evk/spl.c
@@ -20,6 +20,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/mach-imx/boot_mode.h>
 #include <asm/arch/ddr.h>
+#include <linux/string.h>
 
 #include <dm/uclass.h>
 #include <dm/device.h>
diff --git a/board/freescale/imx8mq_evk/spl.c b/board/freescale/imx8mq_evk/spl.c
index 82753585f2f0..66a0be0b3df2 100644
--- a/board/freescale/imx8mq_evk/spl.c
+++ b/board/freescale/imx8mq_evk/spl.c
@@ -24,6 +24,7 @@
 #include <fsl_esdhc_imx.h>
 #include <mmc.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include <power/pmic.h>
 #include <power/pfuze100_pmic.h>
 #include <spl.h>
diff --git a/board/freescale/imx8qm_mek/imx8qm_mek.c b/board/freescale/imx8qm_mek/imx8qm_mek.c
index c6772206244c..7b280be8e94d 100644
--- a/board/freescale/imx8qm_mek/imx8qm_mek.c
+++ b/board/freescale/imx8qm_mek/imx8qm_mek.c
@@ -18,6 +18,7 @@
 #include <asm/arch/imx8-pins.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/imx8qm_mek/spl.c b/board/freescale/imx8qm_mek/spl.c
index 944ba745c09f..cdbff80e31bb 100644
--- a/board/freescale/imx8qm_mek/spl.c
+++ b/board/freescale/imx8qm_mek/spl.c
@@ -17,6 +17,7 @@
 #include <dm/device-internal.h>
 #include <dm/lists.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/imx8qxp_mek/imx8qxp_mek.c b/board/freescale/imx8qxp_mek/imx8qxp_mek.c
index 7179823a2235..645e99235482 100644
--- a/board/freescale/imx8qxp_mek/imx8qxp_mek.c
+++ b/board/freescale/imx8qxp_mek/imx8qxp_mek.c
@@ -21,6 +21,7 @@
 #include <asm/arch/snvs_security_sc.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/imx8qxp_mek/spl.c b/board/freescale/imx8qxp_mek/spl.c
index ae6b64ff6ea1..9eb4268ce3fe 100644
--- a/board/freescale/imx8qxp_mek/spl.c
+++ b/board/freescale/imx8qxp_mek/spl.c
@@ -22,6 +22,7 @@
 #include <asm/arch/imx8-pins.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/ls1012aqds/ls1012aqds.c b/board/freescale/ls1012aqds/ls1012aqds.c
index b77808ea57b7..5c89385acca4 100644
--- a/board/freescale/ls1012aqds/ls1012aqds.c
+++ b/board/freescale/ls1012aqds/ls1012aqds.c
@@ -29,6 +29,7 @@
 #include <spl.h>
 #include <netdev.h>
 #include <fsl_sec.h>
+#include <linux/string.h>
 #include "../common/qixis.h"
 #include "ls1012aqds_qixis.h"
 #include "ls1012aqds_pfe.h"
diff --git a/board/freescale/ls1012ardb/ls1012ardb.c b/board/freescale/ls1012ardb/ls1012ardb.c
index ed6dc9ff712f..02f3ff6aa029 100644
--- a/board/freescale/ls1012ardb/ls1012ardb.c
+++ b/board/freescale/ls1012ardb/ls1012ardb.c
@@ -28,6 +28,7 @@
 #include <fsl_mmdc.h>
 #include <netdev.h>
 #include <fsl_sec.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/ls1021aiot/dcu.c b/board/freescale/ls1021aiot/dcu.c
index e4fbcbcaad35..55706549852c 100644
--- a/board/freescale/ls1021aiot/dcu.c
+++ b/board/freescale/ls1021aiot/dcu.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <fsl_dcu_fb.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 #include "div64.h"
 #include "../common/dcu_sii9022a.h"
 
diff --git a/board/freescale/ls1021aiot/ls1021aiot.c b/board/freescale/ls1021aiot/ls1021aiot.c
index bfe613760427..d257f9723e35 100644
--- a/board/freescale/ls1021aiot/ls1021aiot.c
+++ b/board/freescale/ls1021aiot/ls1021aiot.c
@@ -14,6 +14,7 @@
 #include <asm/arch/ls102xa_stream_id.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include <asm/arch/ls102xa_devdis.h>
 #include <asm/arch/ls102xa_soc.h>
diff --git a/board/freescale/ls1021aqds/dcu.c b/board/freescale/ls1021aqds/dcu.c
index f66961ca5907..1bfd94bb7a18 100644
--- a/board/freescale/ls1021aqds/dcu.c
+++ b/board/freescale/ls1021aqds/dcu.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <fsl_dcu_fb.h>
 #include <i2c.h>
+#include <linux/string.h>
 #include "div64.h"
 #include "../common/diu_ch7301.h"
 #include "ls1021aqds_qixis.h"
diff --git a/board/freescale/ls1021aqds/ddr.c b/board/freescale/ls1021aqds/ddr.c
index 66fe1519cc6d..e63fe63e40cd 100644
--- a/board/freescale/ls1021aqds/ddr.c
+++ b/board/freescale/ls1021aqds/ddr.c
@@ -12,6 +12,7 @@
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include "ddr.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/ls1021aqds/eth.c b/board/freescale/ls1021aqds/eth.c
index a9f162b974d4..9cf797477b86 100644
--- a/board/freescale/ls1021aqds/eth.c
+++ b/board/freescale/ls1021aqds/eth.c
@@ -20,6 +20,7 @@
 #include <fsl_mdio.h>
 #include <tsec.h>
 #include <malloc.h>
+#include <linux/string.h>
 
 #include "../common/sgmii_riser.h"
 #include "../common/qixis.h"
diff --git a/board/freescale/ls1021aqds/ls1021aqds.c b/board/freescale/ls1021aqds/ls1021aqds.c
index 4169a0fc8592..d3af462e68a3 100644
--- a/board/freescale/ls1021aqds/ls1021aqds.c
+++ b/board/freescale/ls1021aqds/ls1021aqds.c
@@ -25,6 +25,7 @@
 #include <fsl_devdis.h>
 #include <fsl_validate.h>
 #include <fsl_ddr.h>
+#include <linux/string.h>
 #include "../common/sleep.h"
 #include "../common/qixis.h"
 #include "ls1021aqds_qixis.h"
diff --git a/board/freescale/ls1021atsn/ls1021atsn.c b/board/freescale/ls1021atsn/ls1021atsn.c
index c1acd3040c42..010d243754c0 100644
--- a/board/freescale/ls1021atsn/ls1021atsn.c
+++ b/board/freescale/ls1021atsn/ls1021atsn.c
@@ -13,6 +13,7 @@
 #include <asm/arch/fsl_serdes.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include "../common/sleep.h"
 #include <fsl_validate.h>
 #include <fsl_immap.h>
diff --git a/board/freescale/ls1021atwr/dcu.c b/board/freescale/ls1021atwr/dcu.c
index 7bf283e3d66c..b52d297bb96f 100644
--- a/board/freescale/ls1021atwr/dcu.c
+++ b/board/freescale/ls1021atwr/dcu.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <fsl_dcu_fb.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 #include "div64.h"
 #include "../common/dcu_sii9022a.h"
 
diff --git a/board/freescale/ls1021atwr/ls1021atwr.c b/board/freescale/ls1021atwr/ls1021atwr.c
index 0cd38a14b830..72014b2173a0 100644
--- a/board/freescale/ls1021atwr/ls1021atwr.c
+++ b/board/freescale/ls1021atwr/ls1021atwr.c
@@ -30,6 +30,7 @@
 #include <fsl_devdis.h>
 #include <spl.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include "../common/sleep.h"
 #ifdef CONFIG_U_QE
 #include <fsl_qe.h>
diff --git a/board/freescale/ls1043aqds/eth.c b/board/freescale/ls1043aqds/eth.c
index 95412df1d7bd..fc4dc210f903 100644
--- a/board/freescale/ls1043aqds/eth.c
+++ b/board/freescale/ls1043aqds/eth.c
@@ -16,6 +16,7 @@
 #include <linux/libfdt.h>
 #include <malloc.h>
 #include <asm/arch/fsl_serdes.h>
+#include <linux/string.h>
 
 #include "../common/qixis.h"
 #include "../common/fman.h"
diff --git a/board/freescale/ls1043ardb/cpld.c b/board/freescale/ls1043ardb/cpld.c
index 5d2e8015a05e..90faa0ba209e 100644
--- a/board/freescale/ls1043ardb/cpld.c
+++ b/board/freescale/ls1043ardb/cpld.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <command.h>
 #include <asm/io.h>
+#include <linux/string.h>
 #include "cpld.h"
 
 u8 cpld_read(unsigned int reg)
diff --git a/board/freescale/ls1043ardb/ddr.c b/board/freescale/ls1043ardb/ddr.c
index 08b43ff5e4c5..75346de3726f 100644
--- a/board/freescale/ls1043ardb/ddr.c
+++ b/board/freescale/ls1043ardb/ddr.c
@@ -7,6 +7,7 @@
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 #include "ddr.h"
 #include <log.h>
 #include <vsprintf.h>
diff --git a/board/freescale/ls1046afrwy/eth.c b/board/freescale/ls1046afrwy/eth.c
index 06ccfe9e8ed5..1b27d3e85381 100644
--- a/board/freescale/ls1046afrwy/eth.c
+++ b/board/freescale/ls1046afrwy/eth.c
@@ -11,6 +11,7 @@
 #include <fsl_dtsec.h>
 #include <fsl_mdio.h>
 #include <malloc.h>
+#include <linux/string.h>
 
 #include "../common/fman.h"
 
diff --git a/board/freescale/ls1046ardb/cpld.c b/board/freescale/ls1046ardb/cpld.c
index 548601a5ae16..252b5adaf5e4 100644
--- a/board/freescale/ls1046ardb/cpld.c
+++ b/board/freescale/ls1046ardb/cpld.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <command.h>
 #include <asm/io.h>
+#include <linux/string.h>
 #include "cpld.h"
 
 u8 cpld_read(unsigned int reg)
diff --git a/board/freescale/ls1046ardb/eth.c b/board/freescale/ls1046ardb/eth.c
index 4905302d8cd9..ddfee6217937 100644
--- a/board/freescale/ls1046ardb/eth.c
+++ b/board/freescale/ls1046ardb/eth.c
@@ -11,6 +11,7 @@
 #include <fsl_dtsec.h>
 #include <fsl_mdio.h>
 #include <malloc.h>
+#include <linux/string.h>
 
 #include "../common/fman.h"
 
diff --git a/board/freescale/ls1088a/eth_ls1088aqds.c b/board/freescale/ls1088a/eth_ls1088aqds.c
index bf4f57e6f8aa..f1cccf7d73fb 100644
--- a/board/freescale/ls1088a/eth_ls1088aqds.c
+++ b/board/freescale/ls1088a/eth_ls1088aqds.c
@@ -21,6 +21,7 @@
 #include <fsl-mc/fsl_mc.h>
 #include <fsl-mc/ldpaa_wriop.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include "../common/qixis.h"
 
diff --git a/board/freescale/ls1088a/ls1088a.c b/board/freescale/ls1088a/ls1088a.c
index 41453709eac1..8fcd8ef7cddd 100644
--- a/board/freescale/ls1088a/ls1088a.c
+++ b/board/freescale/ls1088a/ls1088a.c
@@ -27,6 +27,7 @@
 #include <asm/arch/fsl_serdes.h>
 #include <asm/arch/soc.h>
 #include <asm/arch-fsl-layerscape/fsl_icid.h>
+#include <linux/string.h>
 
 #include "../common/qixis.h"
 #include "ls1088a_qixis.h"
diff --git a/board/freescale/ls2080a/ddr.c b/board/freescale/ls2080a/ddr.c
index 29d7bd1c5ee6..a647cc6a3f7a 100644
--- a/board/freescale/ls2080a/ddr.c
+++ b/board/freescale/ls2080a/ddr.c
@@ -10,6 +10,7 @@
 #include <asm/arch/soc.h>
 #include <asm/arch/clock.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 #include "ddr.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/ls2080aqds/eth.c b/board/freescale/ls2080aqds/eth.c
index 4b7f85540dc9..1b8235c9a092 100644
--- a/board/freescale/ls2080aqds/eth.c
+++ b/board/freescale/ls2080aqds/eth.c
@@ -19,6 +19,7 @@
 #include <fsl-mc/fsl_mc.h>
 #include <fsl-mc/ldpaa_wriop.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include "../common/qixis.h"
 
diff --git a/board/freescale/ls2080aqds/ls2080aqds.c b/board/freescale/ls2080aqds/ls2080aqds.c
index 3ab93388724d..87d7e5312f48 100644
--- a/board/freescale/ls2080aqds/ls2080aqds.c
+++ b/board/freescale/ls2080aqds/ls2080aqds.c
@@ -24,6 +24,7 @@
 #include <fsl_sec.h>
 #include <asm/arch/ppa.h>
 #include <asm/arch-fsl-layerscape/fsl_icid.h>
+#include <linux/string.h>
 
 
 #include "../common/qixis.h"
diff --git a/board/freescale/lx2160a/eth_lx2160aqds.c b/board/freescale/lx2160a/eth_lx2160aqds.c
index 437f0bc4cf68..b069e4fb2669 100644
--- a/board/freescale/lx2160a/eth_lx2160aqds.c
+++ b/board/freescale/lx2160a/eth_lx2160aqds.c
@@ -24,6 +24,7 @@
 #include <fsl-mc/fsl_mc.h>
 #include <fsl-mc/ldpaa_wriop.h>
 #include <linux/libfdt.h>
+#include <linux/string.h>
 
 #include "../common/qixis.h"
 
diff --git a/board/freescale/lx2160a/lx2160a.c b/board/freescale/lx2160a/lx2160a.c
index 1d781841c401..8d87b29cfde9 100644
--- a/board/freescale/lx2160a/lx2160a.c
+++ b/board/freescale/lx2160a/lx2160a.c
@@ -30,6 +30,7 @@
 #include <asm/arch/config.h>
 #include <asm/arch/fsl_serdes.h>
 #include <asm/arch/soc.h>
+#include <linux/string.h>
 #include "../common/qixis.h"
 #include "../common/vid.h"
 #include <fsl_immap.h>
diff --git a/board/freescale/mpc8323erdb/mpc8323erdb.c b/board/freescale/mpc8323erdb/mpc8323erdb.c
index cef3216a6fe5..977bd5120597 100644
--- a/board/freescale/mpc8323erdb/mpc8323erdb.c
+++ b/board/freescale/mpc8323erdb/mpc8323erdb.c
@@ -22,6 +22,7 @@
 #include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
+#include <linux/string.h>
 #include <u-boot/crc.h>
 #if defined(CONFIG_PCI)
 #include <pci.h>
diff --git a/board/freescale/mpc8349itx/mpc8349itx.c b/board/freescale/mpc8349itx/mpc8349itx.c
index 5b4c290df149..356b0ea2daa3 100644
--- a/board/freescale/mpc8349itx/mpc8349itx.c
+++ b/board/freescale/mpc8349itx/mpc8349itx.c
@@ -24,6 +24,7 @@
 #include <linux/libfdt.h>
 #endif
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include "../../../arch/powerpc/cpu/mpc83xx/hrcw/hrcw.h"
 #include "../../../arch/powerpc/cpu/mpc83xx/elbc/elbc.h"
diff --git a/board/freescale/mpc837xemds/mpc837xemds.c b/board/freescale/mpc837xemds/mpc837xemds.c
index 71875cf8f8ec..c4233aad7411 100644
--- a/board/freescale/mpc837xemds/mpc837xemds.c
+++ b/board/freescale/mpc837xemds/mpc837xemds.c
@@ -21,6 +21,7 @@
 #include <fsl_esdhc.h>
 #include <fsl_mdio.h>
 #include <phy.h>
+#include <linux/string.h>
 #include "pci.h"
 #include "../common/pq-mds-pib.h"
 
diff --git a/board/freescale/mpc837xemds/pci.c b/board/freescale/mpc837xemds/pci.c
index 188e60ac08c4..3e5a64d14f0f 100644
--- a/board/freescale/mpc837xemds/pci.c
+++ b/board/freescale/mpc837xemds/pci.c
@@ -15,6 +15,7 @@
 #include <asm/fsl_i2c.h>
 #include <asm/fsl_mpc83xx_serdes.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 static struct pci_region pci_regions[] = {
 	{
diff --git a/board/freescale/mpc8569mds/mpc8569mds.c b/board/freescale/mpc8569mds/mpc8569mds.c
index 1d2cffbacdf5..b4b75f3642a7 100644
--- a/board/freescale/mpc8569mds/mpc8569mds.c
+++ b/board/freescale/mpc8569mds/mpc8569mds.c
@@ -28,6 +28,7 @@
 #include <fdt_support.h>
 #include <fsl_esdhc.h>
 #include <phy.h>
+#include <linux/string.h>
 
 #include "bcsr.h"
 #if defined(CONFIG_PQ_MDS_PIB)
diff --git a/board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c b/board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c
index 9b96d0d33f29..3e45a3390a2f 100644
--- a/board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c
+++ b/board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c
@@ -13,6 +13,7 @@
 #include <log.h>
 #include <asm/io.h>
 #include <fsl_diu_fb.h>
+#include <linux/string.h>
 #include "../common/pixis.h"
 
 #define PX_BRDCFG0_DLINK	0x10
diff --git a/board/freescale/mx51evk/mx51evk_video.c b/board/freescale/mx51evk/mx51evk_video.c
index 3715c5d738f9..2aa456f1c5f8 100644
--- a/board/freescale/mx51evk/mx51evk_video.c
+++ b/board/freescale/mx51evk/mx51evk_video.c
@@ -11,6 +11,7 @@
 #include <asm/arch/iomux-mx51.h>
 #include <linux/fb.h>
 #include <ipu_pixfmt.h>
+#include <linux/string.h>
 
 #define MX51EVK_LCD_3V3		IMX_GPIO_NR(4, 9)
 #define MX51EVK_LCD_5V		IMX_GPIO_NR(4, 10)
diff --git a/board/freescale/mx53loco/mx53loco_video.c b/board/freescale/mx53loco/mx53loco_video.c
index ff3fc8ce3e6f..67c279adf181 100644
--- a/board/freescale/mx53loco/mx53loco_video.c
+++ b/board/freescale/mx53loco/mx53loco_video.c
@@ -11,6 +11,7 @@
 #include <asm/arch/iomux-mx53.h>
 #include <linux/fb.h>
 #include <ipu_pixfmt.h>
+#include <linux/string.h>
 
 #define MX53LOCO_LCD_POWER		IMX_GPIO_NR(3, 24)
 
diff --git a/board/freescale/mx6memcal/spl.c b/board/freescale/mx6memcal/spl.c
index c82b532f6d53..87020e3ffb15 100644
--- a/board/freescale/mx6memcal/spl.c
+++ b/board/freescale/mx6memcal/spl.c
@@ -16,6 +16,7 @@
 #include <asm/arch/mx6-pins.h>
 #include <asm/arch/sys_proto.h>
 #include <spl.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/mx6sabreauto/mx6sabreauto.c b/board/freescale/mx6sabreauto/mx6sabreauto.c
index e92ef26d0ad0..f8612c82342e 100644
--- a/board/freescale/mx6sabreauto/mx6sabreauto.c
+++ b/board/freescale/mx6sabreauto/mx6sabreauto.c
@@ -32,6 +32,7 @@
 #include <asm/mach-imx/video.h>
 #include <asm/arch/crm_regs.h>
 #include <pca953x.h>
+#include <linux/string.h>
 #include <power/pmic.h>
 #include <power/pfuze100_pmic.h>
 #include "../common/pfuze.h"
diff --git a/board/freescale/mx6sabresd/mx6sabresd.c b/board/freescale/mx6sabresd/mx6sabresd.c
index bc28173668e2..15f5b654c1b3 100644
--- a/board/freescale/mx6sabresd/mx6sabresd.c
+++ b/board/freescale/mx6sabresd/mx6sabresd.c
@@ -30,6 +30,7 @@
 #include <asm/arch/sys_proto.h>
 #include <i2c.h>
 #include <input.h>
+#include <linux/string.h>
 #include <power/pmic.h>
 #include <power/pfuze100_pmic.h>
 #include "../common/pfuze.h"
diff --git a/board/freescale/mx6slevk/mx6slevk.c b/board/freescale/mx6slevk/mx6slevk.c
index 2c90a35e2c95..24086a124f06 100644
--- a/board/freescale/mx6slevk/mx6slevk.c
+++ b/board/freescale/mx6slevk/mx6slevk.c
@@ -24,6 +24,7 @@
 #include <fsl_esdhc_imx.h>
 #include <i2c.h>
 #include <mmc.h>
+#include <linux/string.h>
 #include <power/pmic.h>
 #include <power/pfuze100_pmic.h>
 #include "../common/pfuze.h"
diff --git a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
index b916ea010290..ef2408715cf5 100644
--- a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
+++ b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
@@ -27,6 +27,7 @@
 #include <linux/sizes.h>
 #include <mmc.h>
 #include <netdev.h>
+#include <linux/string.h>
 #include <power/pmic.h>
 #include <power/pfuze3000_pmic.h>
 #include "../common/pfuze.h"
diff --git a/board/freescale/p1010rdb/ddr.c b/board/freescale/p1010rdb/ddr.c
index 2625195f81b1..9444a39b6e85 100644
--- a/board/freescale/p1010rdb/ddr.c
+++ b/board/freescale/p1010rdb/ddr.c
@@ -13,6 +13,7 @@
 #include <fsl_ddr_dimm_params.h>
 #include <asm/io.h>
 #include <asm/fsl_law.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/p1010rdb/p1010rdb.c b/board/freescale/p1010rdb/p1010rdb.c
index 4f87f03965c6..3ffec6a02f1d 100644
--- a/board/freescale/p1010rdb/p1010rdb.c
+++ b/board/freescale/p1010rdb/p1010rdb.c
@@ -29,6 +29,7 @@
 #include <asm/fsl_pci.h>
 #include <hwconfig.h>
 #include <i2c.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/p1010rdb/spl.c b/board/freescale/p1010rdb/spl.c
index 91be63c2cf40..059ce8e100fd 100644
--- a/board/freescale/p1010rdb/spl.c
+++ b/board/freescale/p1010rdb/spl.c
@@ -16,6 +16,7 @@
 #include <fsl_esdhc.h>
 #include <spi_flash.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 #include "../common/spl.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/p1023rdb/ddr.c b/board/freescale/p1023rdb/ddr.c
index dc7a909e03b2..9971ed544cdc 100644
--- a/board/freescale/p1023rdb/ddr.c
+++ b/board/freescale/p1023rdb/ddr.c
@@ -11,6 +11,7 @@
 #include <fsl_ddr_dimm_params.h>
 #include <asm/io.h>
 #include <asm/fsl_law.h>
+#include <linux/string.h>
 
 /* CONFIG_SYS_DDR_RAW_TIMING */
 /*
diff --git a/board/freescale/p1_p2_rdb_pc/ddr.c b/board/freescale/p1_p2_rdb_pc/ddr.c
index 2346f6a0c274..2c7e5fe4c7b9 100644
--- a/board/freescale/p1_p2_rdb_pc/ddr.c
+++ b/board/freescale/p1_p2_rdb_pc/ddr.c
@@ -12,6 +12,7 @@
 #include <fsl_ddr_dimm_params.h>
 #include <asm/io.h>
 #include <asm/fsl_law.h>
+#include <linux/string.h>
 
 #ifdef CONFIG_SYS_DDR_RAW_TIMING
 #if	defined(CONFIG_P1020RDB_PROTO) || \
diff --git a/board/freescale/p1_p2_rdb_pc/spl.c b/board/freescale/p1_p2_rdb_pc/spl.c
index 101c748838e5..46c5d15ad18b 100644
--- a/board/freescale/p1_p2_rdb_pc/spl.c
+++ b/board/freescale/p1_p2_rdb_pc/spl.c
@@ -17,6 +17,7 @@
 #include <fsl_esdhc.h>
 #include <spi_flash.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 #include "../common/spl.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/p2041rdb/cpld.c b/board/freescale/p2041rdb/cpld.c
index b042fe3bcbc0..84f1b3c77100 100644
--- a/board/freescale/p2041rdb/cpld.c
+++ b/board/freescale/p2041rdb/cpld.c
@@ -14,6 +14,7 @@
 #include <common.h>
 #include <command.h>
 #include <asm/io.h>
+#include <linux/string.h>
 
 #include "cpld.h"
 
diff --git a/board/freescale/qemu-ppce500/qemu-ppce500.c b/board/freescale/qemu-ppce500/qemu-ppce500.c
index aa5774fd7974..b38d03c07a3e 100644
--- a/board/freescale/qemu-ppce500/qemu-ppce500.c
+++ b/board/freescale/qemu-ppce500/qemu-ppce500.c
@@ -23,6 +23,7 @@
 #include <fdtdec.h>
 #include <errno.h>
 #include <malloc.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/t102xrdb/cpld.c b/board/freescale/t102xrdb/cpld.c
index 47c3b1627e34..5dc3e54bbc37 100644
--- a/board/freescale/t102xrdb/cpld.c
+++ b/board/freescale/t102xrdb/cpld.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <command.h>
 #include <asm/io.h>
+#include <linux/string.h>
 #include "cpld.h"
 
 u8 cpld_read(unsigned int reg)
diff --git a/board/freescale/t102xrdb/ddr.c b/board/freescale/t102xrdb/ddr.c
index 818c20cf1b5e..f4cdbf5b4461 100644
--- a/board/freescale/t102xrdb/ddr.c
+++ b/board/freescale/t102xrdb/ddr.c
@@ -15,6 +15,7 @@
 #include <asm/fsl_law.h>
 #include <asm/mpc85xx_gpio.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/t102xrdb/spl.c b/board/freescale/t102xrdb/spl.c
index 7ed42ed246ff..d8bfbd82791f 100644
--- a/board/freescale/t102xrdb/spl.c
+++ b/board/freescale/t102xrdb/spl.c
@@ -15,6 +15,7 @@
 #include <fsl_esdhc.h>
 #include <spi_flash.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 #include "../common/sleep.h"
 #include "../common/spl.h"
 
diff --git a/board/freescale/t102xrdb/t102xrdb.c b/board/freescale/t102xrdb/t102xrdb.c
index 2770e104ee61..c51555a97e21 100644
--- a/board/freescale/t102xrdb/t102xrdb.c
+++ b/board/freescale/t102xrdb/t102xrdb.c
@@ -21,6 +21,7 @@
 #include <asm/fsl_serdes.h>
 #include <asm/fsl_liodn.h>
 #include <fm_eth.h>
+#include <linux/string.h>
 #include "t102xrdb.h"
 #ifdef CONFIG_TARGET_T1024RDB
 #include "cpld.h"
diff --git a/board/freescale/t104xrdb/cpld.c b/board/freescale/t104xrdb/cpld.c
index ac34095f3b66..6ab7bbdd3322 100644
--- a/board/freescale/t104xrdb/cpld.c
+++ b/board/freescale/t104xrdb/cpld.c
@@ -13,6 +13,7 @@
 #include <common.h>
 #include <command.h>
 #include <asm/io.h>
+#include <linux/string.h>
 
 #include "cpld.h"
 
diff --git a/board/freescale/t104xrdb/spl.c b/board/freescale/t104xrdb/spl.c
index 033a1054ff3c..2e29b3995d8b 100644
--- a/board/freescale/t104xrdb/spl.c
+++ b/board/freescale/t104xrdb/spl.c
@@ -15,6 +15,7 @@
 #include <fsl_esdhc.h>
 #include <spi_flash.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 #include "../common/sleep.h"
 #include "../common/spl.h"
 
diff --git a/board/freescale/t208xqds/eth_t208xqds.c b/board/freescale/t208xqds/eth_t208xqds.c
index 5044b5695b66..e110f3babf18 100644
--- a/board/freescale/t208xqds/eth_t208xqds.c
+++ b/board/freescale/t208xqds/eth_t208xqds.c
@@ -27,6 +27,7 @@
 #include <fsl_dtsec.h>
 #include <asm/fsl_serdes.h>
 #include <hwconfig.h>
+#include <linux/string.h>
 #include "../common/qixis.h"
 #include "../common/fman.h"
 #include "t208xqds_qixis.h"
diff --git a/board/freescale/t208xqds/spl.c b/board/freescale/t208xqds/spl.c
index 6863243b3dd6..4345c29c3b17 100644
--- a/board/freescale/t208xqds/spl.c
+++ b/board/freescale/t208xqds/spl.c
@@ -15,6 +15,7 @@
 #include <fsl_esdhc.h>
 #include <spi_flash.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 #include "../common/qixis.h"
 #include "t208xqds_qixis.h"
 #include "../common/spl.h"
diff --git a/board/freescale/t208xrdb/cpld.c b/board/freescale/t208xrdb/cpld.c
index b9ba62adffcd..81e220ff1149 100644
--- a/board/freescale/t208xrdb/cpld.c
+++ b/board/freescale/t208xrdb/cpld.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <linux/string.h>
 #include "cpld.h"
 
 u8 cpld_read(unsigned int reg)
diff --git a/board/freescale/t208xrdb/spl.c b/board/freescale/t208xrdb/spl.c
index cfa6789d2df0..a9bf5fb64663 100644
--- a/board/freescale/t208xrdb/spl.c
+++ b/board/freescale/t208xrdb/spl.c
@@ -15,6 +15,7 @@
 #include <fsl_esdhc.h>
 #include <spi_flash.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 #include "../common/spl.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/t4rdb/cpld.c b/board/freescale/t4rdb/cpld.c
index d484509bc20a..5bc149f4ab67 100644
--- a/board/freescale/t4rdb/cpld.c
+++ b/board/freescale/t4rdb/cpld.c
@@ -17,6 +17,7 @@
 #include <common.h>
 #include <command.h>
 #include <asm/io.h>
+#include <linux/string.h>
 
 #include "cpld.h"
 
diff --git a/board/freescale/t4rdb/spl.c b/board/freescale/t4rdb/spl.c
index 42db384a15d6..797631199686 100644
--- a/board/freescale/t4rdb/spl.c
+++ b/board/freescale/t4rdb/spl.c
@@ -18,6 +18,7 @@
 #include <mmc.h>
 #include <fsl_esdhc.h>
 #include <i2c.h>
+#include <linux/string.h>
 
 #include "t4rdb.h"
 
diff --git a/board/gardena/smart-gateway-mt7688/board.c b/board/gardena/smart-gateway-mt7688/board.c
index 8a3a6e348256..0c36f53a5a70 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 <linux/delay.h>
+#include <linux/string.h>
 #include <linux/stringify.h>
 #include <u-boot/crc.h>
 #include <uuid.h>
diff --git a/board/gateworks/gw_ventana/eeprom.c b/board/gateworks/gw_ventana/eeprom.c
index a5a151d85b43..325527ceee13 100644
--- a/board/gateworks/gw_ventana/eeprom.c
+++ b/board/gateworks/gw_ventana/eeprom.c
@@ -13,6 +13,7 @@
 #include <malloc.h>
 #include <asm/bitops.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include "gsc.h"
 #include "ventana_eeprom.h"
diff --git a/board/gateworks/gw_ventana/gsc.c b/board/gateworks/gw_ventana/gsc.c
index bcb6bca3462d..54ca5da4fa02 100644
--- a/board/gateworks/gw_ventana/gsc.c
+++ b/board/gateworks/gw_ventana/gsc.c
@@ -13,6 +13,7 @@
 #include <common.h>
 #include <i2c.h>
 #include <linux/ctype.h>
+#include <linux/string.h>
 
 #include "ventana_eeprom.h"
 #include "gsc.h"
diff --git a/board/gateworks/gw_ventana/gw_ventana.c b/board/gateworks/gw_ventana/gw_ventana.c
index bf4d6913067d..b0cfd2e931a1 100644
--- a/board/gateworks/gw_ventana/gw_ventana.c
+++ b/board/gateworks/gw_ventana/gw_ventana.c
@@ -38,6 +38,7 @@
 #include <pci.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
+#include <linux/string.h>
 #include <power/pmic.h>
 #include <power/ltc3676_pmic.h>
 #include <power/pfuze100_pmic.h>
diff --git a/board/gdsys/a38x/hre.c b/board/gdsys/a38x/hre.c
index 699241b3e62a..615973894a1a 100644
--- a/board/gdsys/a38x/hre.c
+++ b/board/gdsys/a38x/hre.c
@@ -11,6 +11,7 @@
 #include <i2c.h>
 #include <mmc.h>
 #include <tpm-v1.h>
+#include <linux/string.h>
 #include <u-boot/crc.h>
 #include <u-boot/sha1.h>
 #include <asm/byteorder.h>
diff --git a/board/gdsys/a38x/ihs_phys.c b/board/gdsys/a38x/ihs_phys.c
index c23d15092144..31a4aa26b507 100644
--- a/board/gdsys/a38x/ihs_phys.c
+++ b/board/gdsys/a38x/ihs_phys.c
@@ -4,6 +4,7 @@
 #include <asm-generic/gpio.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include "ihs_phys.h"
 #include "dt_helpers.h"
diff --git a/board/gdsys/a38x/keyprogram.c b/board/gdsys/a38x/keyprogram.c
index 853981aadbb9..38e25e8fd249 100644
--- a/board/gdsys/a38x/keyprogram.c
+++ b/board/gdsys/a38x/keyprogram.c
@@ -11,6 +11,7 @@
 #include <malloc.h>
 #include <linux/ctype.h>
 #include <asm/unaligned.h>
+#include <linux/string.h>
 
 #include "hre.h"
 
diff --git a/board/gdsys/common/cmd_ioloop.c b/board/gdsys/common/cmd_ioloop.c
index 3ea2bec8ebd5..88bf9b2aadd5 100644
--- a/board/gdsys/common/cmd_ioloop.c
+++ b/board/gdsys/common/cmd_ioloop.c
@@ -9,6 +9,7 @@
 #include <console.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include <gdsys_fpga.h>
 
diff --git a/board/gdsys/common/ihs_mdio.c b/board/gdsys/common/ihs_mdio.c
index 5f1215e9e8a6..3a51338d92ab 100644
--- a/board/gdsys/common/ihs_mdio.c
+++ b/board/gdsys/common/ihs_mdio.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include <miiphy.h>
 #ifdef CONFIG_GDSYS_LEGACY_DRIVERS
diff --git a/board/gdsys/common/ioep-fpga.c b/board/gdsys/common/ioep-fpga.c
index 7292d7ab5a41..9c01661dc32a 100644
--- a/board/gdsys/common/ioep-fpga.c
+++ b/board/gdsys/common/ioep-fpga.c
@@ -445,6 +445,7 @@ static int get_features(unsigned int fpga, struct fpga_features *features)
 }
 
 #include <linux/bitops.h>
+#include <linux/string.h>
 #endif
 
 bool ioep_fpga_has_osd(unsigned int fpga)
diff --git a/board/gdsys/common/osd.c b/board/gdsys/common/osd.c
index 679f8f30191b..9fe95f020598 100644
--- a/board/gdsys/common/osd.c
+++ b/board/gdsys/common/osd.c
@@ -503,4 +503,5 @@ U_BOOT_CMD(
 	") size_y(max. " __stringify(MAX_Y_CHARS) ")\n"
 );
 
+#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 fe6249794e76..120e1efc81e8 100644
--- a/board/gdsys/common/osd_cmd.c
+++ b/board/gdsys/common/osd_cmd.c
@@ -15,6 +15,7 @@
 #include <hexdump.h>
 #include <video_osd.h>
 #include <malloc.h>
+#include <linux/string.h>
 
 static int do_osd_write(struct cmd_tbl *cmdtp, int flag, int argc,
 			char *const argv[])
diff --git a/board/gdsys/mpc8308/hrcon.c b/board/gdsys/mpc8308/hrcon.c
index b5c681c2d1eb..446a756fbbef 100644
--- a/board/gdsys/mpc8308/hrcon.c
+++ b/board/gdsys/mpc8308/hrcon.c
@@ -21,6 +21,7 @@
 #include <asm/io.h>
 #include <asm/fsl_serdes.h>
 #include <asm/fsl_mpc83xx_serdes.h>
+#include <linux/string.h>
 
 #include "mpc8308.h"
 
diff --git a/board/gdsys/mpc8308/strider.c b/board/gdsys/mpc8308/strider.c
index 91fec74fb032..983d2847614f 100644
--- a/board/gdsys/mpc8308/strider.c
+++ b/board/gdsys/mpc8308/strider.c
@@ -21,6 +21,7 @@
 #include <asm/io.h>
 #include <asm/fsl_serdes.h>
 #include <asm/fsl_mpc83xx_serdes.h>
+#include <linux/string.h>
 
 #include "mpc8308.h"
 
diff --git a/board/gdsys/p1022/controlcenterd-id.c b/board/gdsys/p1022/controlcenterd-id.c
index 495ef8e1f837..6ec49996ab99 100644
--- a/board/gdsys/p1022/controlcenterd-id.c
+++ b/board/gdsys/p1022/controlcenterd-id.c
@@ -24,6 +24,7 @@
 #include <mmc.h>
 #include <tpm-v1.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include <u-boot/crc.h>
 #include <u-boot/sha1.h>
 #include <asm/byteorder.h>
diff --git a/board/gdsys/p1022/ddr.c b/board/gdsys/p1022/ddr.c
index eb06d2247111..b2d44da4adcc 100644
--- a/board/gdsys/p1022/ddr.c
+++ b/board/gdsys/p1022/ddr.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <i2c.h>
 #include <log.h>
+#include <linux/string.h>
 
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
diff --git a/board/ge/bx50v3/bx50v3.c b/board/ge/bx50v3/bx50v3.c
index be5fb0e49cc1..3876b25420bb 100644
--- a/board/ge/bx50v3/bx50v3.c
+++ b/board/ge/bx50v3/bx50v3.c
@@ -29,6 +29,7 @@
 #include <asm/arch/crm_regs.h>
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/string.h>
 #include <power/regulator.h>
 #include <power/da9063_pmic.h>
 #include <input.h>
diff --git a/board/ge/mx53ppd/mx53ppd.c b/board/ge/mx53ppd/mx53ppd.c
index 4de82cd5cd25..7018b29d5acc 100644
--- a/board/ge/mx53ppd/mx53ppd.c
+++ b/board/ge/mx53ppd/mx53ppd.c
@@ -28,6 +28,7 @@
 #include <mmc.h>
 #include <fsl_esdhc_imx.h>
 #include <asm/gpio.h>
+#include <linux/string.h>
 #include <power/pmic.h>
 #include <dialog_pmic.h>
 #include <fsl_pmic.h>
diff --git a/board/google/imx8mq_phanbell/spl.c b/board/google/imx8mq_phanbell/spl.c
index eec3f3d931b2..fd5d745118c5 100644
--- a/board/google/imx8mq_phanbell/spl.c
+++ b/board/google/imx8mq_phanbell/spl.c
@@ -24,6 +24,7 @@
 #include <fsl_esdhc_imx.h>
 #include <mmc.h>
 #include <spl.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/grinn/liteboard/board.c b/board/grinn/liteboard/board.c
index 48392c48e5cc..46c7138b303b 100644
--- a/board/grinn/liteboard/board.c
+++ b/board/grinn/liteboard/board.c
@@ -29,6 +29,7 @@
 #include <mmc.h>
 #include <netdev.h>
 #include <spl.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/imgtec/malta/malta.c b/board/imgtec/malta/malta.c
index c04f727961de..4a6fd7857310 100644
--- a/board/imgtec/malta/malta.c
+++ b/board/imgtec/malta/malta.c
@@ -15,6 +15,7 @@
 #include <rtc.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include <asm/addrspace.h>
 #include <asm/io.h>
diff --git a/board/isee/igep00x0/igep00x0.c b/board/isee/igep00x0/igep00x0.c
index e0ca3c2588fa..836a3f91957b 100644
--- a/board/isee/igep00x0/igep00x0.c
+++ b/board/isee/igep00x0/igep00x0.c
@@ -27,6 +27,7 @@
 #include <jffs2/load_kernel.h>
 #include <mtd_node.h>
 #include <fdt_support.h>
+#include <linux/string.h>
 #include "igep00x0.h"
 
 static const struct ns16550_platdata igep_serial = {
diff --git a/board/k+p/kp_imx53/kp_id_rev.c b/board/k+p/kp_imx53/kp_id_rev.c
index 7103a3e0f2b5..3e9315f55226 100644
--- a/board/k+p/kp_imx53/kp_id_rev.c
+++ b/board/k+p/kp_imx53/kp_id_rev.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <env.h>
 #include <i2c.h>
+#include <linux/string.h>
 #include "kp_id_rev.h"
 #include <net.h>
 
diff --git a/board/k+p/kp_imx6q_tpc/kp_imx6q_tpc_spl.c b/board/k+p/kp_imx6q_tpc/kp_imx6q_tpc_spl.c
index 103c4531a64c..4bd2e8d0e877 100644
--- a/board/k+p/kp_imx6q_tpc/kp_imx6q_tpc_spl.c
+++ b/board/k+p/kp_imx6q_tpc/kp_imx6q_tpc_spl.c
@@ -18,6 +18,7 @@
 #include <errno.h>
 #include <spl.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/keymile/common/common.c b/board/keymile/common/common.c
index d85a5eac1658..4f64a1805f77 100644
--- a/board/keymile/common/common.c
+++ b/board/keymile/common/common.c
@@ -19,6 +19,7 @@
 #include <asm/io.h>
 #include <linux/ctype.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #if defined(CONFIG_POST)
 #include "post.h"
diff --git a/board/keymile/common/ivm.c b/board/keymile/common/ivm.c
index 60b89fe348c4..ef51e81996b0 100644
--- a/board/keymile/common/ivm.c
+++ b/board/keymile/common/ivm.c
@@ -8,6 +8,7 @@
 #include <cli_hush.h>
 #include <env.h>
 #include <i2c.h>
+#include <linux/string.h>
 #include "common.h"
 
 #define MAC_STR_SZ	20
diff --git a/board/kosagi/novena/novena.c b/board/kosagi/novena/novena.c
index 815ecf55c4df..383d3705734b 100644
--- a/board/kosagi/novena/novena.c
+++ b/board/kosagi/novena/novena.c
@@ -39,6 +39,7 @@
 #include <malloc.h>
 #include <mmc.h>
 #include <netdev.h>
+#include <linux/string.h>
 #include <power/pmic.h>
 #include <power/pfuze100_pmic.h>
 #include <stdio_dev.h>
diff --git a/board/laird/wb50n/wb50n.c b/board/laird/wb50n/wb50n.c
index 8fa989a2a4ff..f1a7555ac9c9 100644
--- a/board/laird/wb50n/wb50n.c
+++ b/board/laird/wb50n/wb50n.c
@@ -20,6 +20,7 @@
 #include <spl.h>
 #include <asm/arch/atmel_mpddrc.h>
 #include <asm/arch/at91_wdt.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/liebherr/display5/display5.c b/board/liebherr/display5/display5.c
index e3a59dbec009..7a061595f25f 100644
--- a/board/liebherr/display5/display5.c
+++ b/board/liebherr/display5/display5.c
@@ -27,6 +27,7 @@
 #include <netdev.h>
 #include <i2c.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include <dm/platform_data/serial_mxc.h>
 #include <dm/platdata.h>
diff --git a/board/liebherr/display5/spl.c b/board/liebherr/display5/spl.c
index b8658c8d6174..a48eba58f9db 100644
--- a/board/liebherr/display5/spl.c
+++ b/board/liebherr/display5/spl.c
@@ -19,6 +19,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/mx6-ddr.h>
 #include <asm/arch/mx6-pins.h>
+#include <linux/string.h>
 #include "asm/arch/crm_regs.h"
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/liebherr/mccmon6/spl.c b/board/liebherr/mccmon6/spl.c
index 56eae3b4e9ee..1153a7e19f85 100644
--- a/board/liebherr/mccmon6/spl.c
+++ b/board/liebherr/mccmon6/spl.c
@@ -23,6 +23,7 @@
 #include <serial.h>
 #include <spl.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include <asm/arch/mx6-ddr.h>
 /*
diff --git a/board/mediatek/mt7623/mt7623_rfb.c b/board/mediatek/mt7623/mt7623_rfb.c
index 755e879085c2..090270b20d13 100644
--- a/board/mediatek/mt7623/mt7623_rfb.c
+++ b/board/mediatek/mt7623/mt7623_rfb.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <mmc.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/menlo/m53menlo/m53menlo.c b/board/menlo/m53menlo/m53menlo.c
index c34baca602cd..eee12ccdc684 100644
--- a/board/menlo/m53menlo/m53menlo.c
+++ b/board/menlo/m53menlo/m53menlo.c
@@ -34,6 +34,7 @@
 #include <netdev.h>
 #include <spl.h>
 #include <splash.h>
+#include <linux/string.h>
 #include <usb/ehci-ci.h>
 #include <video_console.h>
 
diff --git a/board/mscc/jr2/jr2.c b/board/mscc/jr2/jr2.c
index 1cd720c7d844..2aca78ac7941 100644
--- a/board/mscc/jr2/jr2.c
+++ b/board/mscc/jr2/jr2.c
@@ -12,6 +12,7 @@
 #include <miiphy.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 enum {
 	BOARD_TYPE_PCB110 = 0xAABBCE00,
diff --git a/board/mscc/luton/luton.c b/board/mscc/luton/luton.c
index 038902d08a9d..ebb9060f3d75 100644
--- a/board/mscc/luton/luton.c
+++ b/board/mscc/luton/luton.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <led.h>
 #include <miiphy.h>
+#include <linux/string.h>
 
 enum {
 	BOARD_TYPE_PCB090 = 0xAABBCD00,
diff --git a/board/mscc/ocelot/ocelot.c b/board/mscc/ocelot/ocelot.c
index 51e1aeccf578..d26b93f12bd9 100644
--- a/board/mscc/ocelot/ocelot.c
+++ b/board/mscc/ocelot/ocelot.c
@@ -17,6 +17,7 @@
 #include <miiphy.h>
 #include <linux/bitops.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/mscc/serval/serval.c b/board/mscc/serval/serval.c
index 94c1c42b79b2..0da835828f85 100644
--- a/board/mscc/serval/serval.c
+++ b/board/mscc/serval/serval.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <led.h>
 #include <miiphy.h>
+#include <linux/string.h>
 
 enum {
 	BOARD_TYPE_PCB106 = 0xAABBCD00,
diff --git a/board/mscc/servalt/servalt.c b/board/mscc/servalt/servalt.c
index 252d8e3156d5..31269fa88a41 100644
--- a/board/mscc/servalt/servalt.c
+++ b/board/mscc/servalt/servalt.c
@@ -9,6 +9,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <led.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/nokia/rx51/rx51.c b/board/nokia/rx51/rx51.c
index 5cf6a54dc60d..20d82447b017 100644
--- a/board/nokia/rx51/rx51.c
+++ b/board/nokia/rx51/rx51.c
@@ -38,6 +38,7 @@
 #include <asm/arch/mux.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/mmc_host_def.h>
+#include <linux/string.h>
 
 #include "rx51.h"
 #include "tag_omap.h"
diff --git a/board/nvidia/p2371-2180/p2371-2180.c b/board/nvidia/p2371-2180/p2371-2180.c
index 7423a97ad0e3..0f4796b559b5 100644
--- a/board/nvidia/p2371-2180/p2371-2180.c
+++ b/board/nvidia/p2371-2180/p2371-2180.c
@@ -15,6 +15,7 @@
 #include <asm/arch/gpio.h>
 #include <asm/arch/pinmux.h>
 #include <asm/arch-tegra/cboot.h>
+#include <linux/string.h>
 #include "../p2571/max77620_init.h"
 
 void pin_mux_mmc(void)
diff --git a/board/nvidia/p2771-0000/p2771-0000.c b/board/nvidia/p2771-0000/p2771-0000.c
index 508c4d27b7fb..e96edcc1c91f 100644
--- a/board/nvidia/p2771-0000/p2771-0000.c
+++ b/board/nvidia/p2771-0000/p2771-0000.c
@@ -11,6 +11,7 @@
 #include <net.h>
 #include <linux/libfdt.h>
 #include <asm/arch-tegra/cboot.h>
+#include <linux/string.h>
 #include "../p2571/max77620_init.h"
 
 void pin_mux_mmc(void)
diff --git a/board/nvidia/p3450-0000/p3450-0000.c b/board/nvidia/p3450-0000/p3450-0000.c
index e6b66966c1b6..2a16b1e3b468 100644
--- a/board/nvidia/p3450-0000/p3450-0000.c
+++ b/board/nvidia/p3450-0000/p3450-0000.c
@@ -14,6 +14,7 @@
 #include <asm/arch-tegra/cboot.h>
 #include <asm/arch/gpio.h>
 #include <asm/arch/pinmux.h>
+#include <linux/string.h>
 #include "../p2571/max77620_init.h"
 
 void pin_mux_mmc(void)
diff --git a/board/phytec/pcm058/pcm058.c b/board/phytec/pcm058/pcm058.c
index 5e5b129ef1ff..a2304b764d6e 100644
--- a/board/phytec/pcm058/pcm058.c
+++ b/board/phytec/pcm058/pcm058.c
@@ -18,6 +18,7 @@
 #include <asm/mach-imx/boot_mode.h>
 #include <asm/arch/sys_proto.h>
 #include <dm.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/phytec/pfla02/pfla02.c b/board/phytec/pfla02/pfla02.c
index 076ce6711ef0..996fcedfa2cc 100644
--- a/board/phytec/pfla02/pfla02.c
+++ b/board/phytec/pfla02/pfla02.c
@@ -32,6 +32,7 @@
 #include <netdev.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/sections.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/qualcomm/dragonboard410c/dragonboard410c.c b/board/qualcomm/dragonboard410c/dragonboard410c.c
index 646013cfc93d..1aa67f96d3d8 100644
--- a/board/qualcomm/dragonboard410c/dragonboard410c.c
+++ b/board/qualcomm/dragonboard410c/dragonboard410c.c
@@ -19,6 +19,7 @@
 #include <asm/arch/dram.h>
 #include <asm/arch/misc.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/renesas/salvator-x/salvator-x.c b/board/renesas/salvator-x/salvator-x.c
index 1d0cab8914fe..305968222997 100644
--- a/board/renesas/salvator-x/salvator-x.c
+++ b/board/renesas/salvator-x/salvator-x.c
@@ -29,6 +29,7 @@
 #include <asm/arch/sh_sdhi.h>
 #include <i2c.h>
 #include <mmc.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/renesas/sh7752evb/sh7752evb.c b/board/renesas/sh7752evb/sh7752evb.c
index 522b4bd610dc..07c51e7147ee 100644
--- a/board/renesas/sh7752evb/sh7752evb.c
+++ b/board/renesas/sh7752evb/sh7752evb.c
@@ -16,6 +16,7 @@
 #include <spi.h>
 #include <spi_flash.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 int checkboard(void)
 {
diff --git a/board/renesas/sh7753evb/sh7753evb.c b/board/renesas/sh7753evb/sh7753evb.c
index f34dec1dfabd..8f6f2eee9043 100644
--- a/board/renesas/sh7753evb/sh7753evb.c
+++ b/board/renesas/sh7753evb/sh7753evb.c
@@ -16,6 +16,7 @@
 #include <spi.h>
 #include <spi_flash.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 int checkboard(void)
 {
diff --git a/board/renesas/sh7757lcr/sh7757lcr.c b/board/renesas/sh7757lcr/sh7757lcr.c
index e933e3e73061..a81bdbf9cdc8 100644
--- a/board/renesas/sh7757lcr/sh7757lcr.c
+++ b/board/renesas/sh7757lcr/sh7757lcr.c
@@ -15,6 +15,7 @@
 #include <asm/mmc.h>
 #include <spi.h>
 #include <spi_flash.h>
+#include <linux/string.h>
 
 int checkboard(void)
 {
diff --git a/board/renesas/stout/cpld.c b/board/renesas/stout/cpld.c
index b56ed1703f5f..e6e0a3a3e3d1 100644
--- a/board/renesas/stout/cpld.c
+++ b/board/renesas/stout/cpld.c
@@ -12,6 +12,7 @@
 #include <cpu_func.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
+#include <linux/string.h>
 #include "cpld.h"
 
 #define SCLK			(92 + 24)
diff --git a/board/renesas/ulcb/cpld.c b/board/renesas/ulcb/cpld.c
index a20a34a92a8d..c9579a9dd173 100644
--- a/board/renesas/ulcb/cpld.c
+++ b/board/renesas/ulcb/cpld.c
@@ -14,6 +14,7 @@
 #include <errno.h>
 #include <linux/err.h>
 #include <sysreset.h>
+#include <linux/string.h>
 
 #define CPLD_ADDR_MODE		0x00 /* RW */
 #define CPLD_ADDR_MUX		0x02 /* RW */
diff --git a/board/renesas/ulcb/ulcb.c b/board/renesas/ulcb/ulcb.c
index 66aff8e11080..09711559aef4 100644
--- a/board/renesas/ulcb/ulcb.c
+++ b/board/renesas/ulcb/ulcb.c
@@ -27,6 +27,7 @@
 #include <asm/arch/sh_sdhi.h>
 #include <i2c.h>
 #include <mmc.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/samsung/common/gadget.c b/board/samsung/common/gadget.c
index 6d783e61e0d3..da6fbb9b3584 100644
--- a/board/samsung/common/gadget.c
+++ b/board/samsung/common/gadget.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <linux/string.h>
 #include <linux/usb/ch9.h>
 
 int g_dnl_bind_fixup(struct usb_device_descriptor *dev, const char *name)
diff --git a/board/samsung/origen/tools/mkorigenspl.c b/board/samsung/origen/tools/mkorigenspl.c
index f4be86724503..8f13d26db333 100644
--- a/board/samsung/origen/tools/mkorigenspl.c
+++ b/board/samsung/origen/tools/mkorigenspl.c
@@ -9,6 +9,7 @@
 #include <fcntl.h>
 #include <errno.h>
 #include <string.h>
+#include <linux/string.h>
 #include <sys/stat.h>
 
 #define BUFSIZE			(16*1024)
diff --git a/board/samsung/smdkv310/tools/mksmdkv310spl.c b/board/samsung/smdkv310/tools/mksmdkv310spl.c
index 378b85d72294..e76c9412f7b5 100644
--- a/board/samsung/smdkv310/tools/mksmdkv310spl.c
+++ b/board/samsung/smdkv310/tools/mksmdkv310spl.c
@@ -9,6 +9,7 @@
 #include <fcntl.h>
 #include <errno.h>
 #include <string.h>
+#include <linux/string.h>
 #include <sys/stat.h>
 
 #define CHECKSUM_OFFSET		(14*1024-4)
diff --git a/board/sandisk/sansa_fuze_plus/spl_boot.c b/board/sandisk/sansa_fuze_plus/spl_boot.c
index 633c77408dd6..37f866ccdc3a 100644
--- a/board/sandisk/sansa_fuze_plus/spl_boot.c
+++ b/board/sandisk/sansa_fuze_plus/spl_boot.c
@@ -11,6 +11,7 @@
 #include <asm/arch/iomux-mx23.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/string.h>
 
 #define	MUX_CONFIG_EMI	(MXS_PAD_1V8 | MXS_PAD_12MA | MXS_PAD_PULLUP)
 #define	MUX_CONFIG_SSP	(MXS_PAD_3V3 | MXS_PAD_4MA | MXS_PAD_PULLUP)
diff --git a/board/sbc8548/ddr.c b/board/sbc8548/ddr.c
index 61bc77c418a9..c3239fd1e1a6 100644
--- a/board/sbc8548/ddr.c
+++ b/board/sbc8548/ddr.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <i2c.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
diff --git a/board/siemens/capricorn/board.c b/board/siemens/capricorn/board.c
index 56973a109087..6f34bd73f0de 100644
--- a/board/siemens/capricorn/board.c
+++ b/board/siemens/capricorn/board.c
@@ -28,6 +28,7 @@
 #include <asm/arch-imx8/clock.h>
 #endif
 #include <linux/delay.h>
+#include <linux/string.h>
 #include "../common/factoryset.h"
 
 #define GPIO_PAD_CTRL \
diff --git a/board/siemens/capricorn/spl.c b/board/siemens/capricorn/spl.c
index 8e077d73aef9..da8936291725 100644
--- a/board/siemens/capricorn/spl.c
+++ b/board/siemens/capricorn/spl.c
@@ -14,6 +14,7 @@
 #include <dm/device.h>
 #include <dm/uclass-internal.h>
 #include <dm/device-internal.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/siemens/common/board.c b/board/siemens/common/board.c
index 1bdf404ac3eb..19f27f6805a6 100644
--- a/board/siemens/common/board.c
+++ b/board/siemens/common/board.c
@@ -34,6 +34,7 @@
 #include <cpsw.h>
 #include <watchdog.h>
 #include <asm/mach-types.h>
+#include <linux/string.h>
 #include "../common/factoryset.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/siemens/common/factoryset.c b/board/siemens/common/factoryset.c
index 2e3ae1a54da6..5ceb0871fa0b 100644
--- a/board/siemens/common/factoryset.c
+++ b/board/siemens/common/factoryset.c
@@ -22,6 +22,7 @@
 #include <net.h>
 #include <errno.h>
 #include <g_dnl.h>
+#include <linux/string.h>
 #include "factoryset.h"
 
 #define EEPR_PG_SZ		0x80
diff --git a/board/siemens/pxm2/board.c b/board/siemens/pxm2/board.c
index b5e9b4242cd5..7f36848b2657 100644
--- a/board/siemens/pxm2/board.c
+++ b/board/siemens/pxm2/board.c
@@ -28,6 +28,7 @@
 #include <asm/arch/gpio.h>
 #include <asm/arch/mmc_host_def.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/string.h>
 #include "../../../drivers/video/da8xx-fb.h"
 #include <asm/io.h>
 #include <asm/emif.h>
diff --git a/board/siemens/rut/board.c b/board/siemens/rut/board.c
index e0f232d3b80e..22d8c40a53b1 100644
--- a/board/siemens/rut/board.c
+++ b/board/siemens/rut/board.c
@@ -35,6 +35,7 @@
 #include <video.h>
 #include <watchdog.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include "board.h"
 #include "../common/factoryset.h"
 #include "../../../drivers/video/da8xx-fb.h"
diff --git a/board/sks-kinkel/sksimx6/sksimx6.c b/board/sks-kinkel/sksimx6/sksimx6.c
index cec3ade96cfd..bfe4634fdd7f 100644
--- a/board/sks-kinkel/sksimx6/sksimx6.c
+++ b/board/sks-kinkel/sksimx6/sksimx6.c
@@ -26,6 +26,7 @@
 #include <netdev.h>
 #include <miiphy.h>
 #include <micrel.h>
+#include <linux/string.h>
 
 #include <common.h>
 #include <malloc.h>
diff --git a/board/softing/vining_2000/vining_2000.c b/board/softing/vining_2000/vining_2000.c
index aaeeee361e54..1c5863714c67 100644
--- a/board/softing/vining_2000/vining_2000.c
+++ b/board/softing/vining_2000/vining_2000.c
@@ -29,6 +29,7 @@
 #include <i2c.h>
 #include <miiphy.h>
 #include <netdev.h>
+#include <linux/string.h>
 #include <power/pmic.h>
 #include <power/pfuze100_pmic.h>
 #include <usb.h>
diff --git a/board/softing/vining_fpga/socfpga.c b/board/softing/vining_fpga/socfpga.c
index aaedf0345045..34ce6a13003b 100644
--- a/board/softing/vining_fpga/socfpga.c
+++ b/board/softing/vining_fpga/socfpga.c
@@ -15,6 +15,7 @@
 #include <asm/gpio.h>
 #include <i2c.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/solidrun/clearfog/clearfog.c b/board/solidrun/clearfog/clearfog.c
index 3a2f8b817886..a4d60e1540c5 100644
--- a/board/solidrun/clearfog/clearfog.c
+++ b/board/solidrun/clearfog/clearfog.c
@@ -16,6 +16,7 @@
 #include <asm/arch/soc.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include "../common/tlv_data.h"
 
 #include "../drivers/ddr/marvell/a38x/ddr3_init.h"
diff --git a/board/solidrun/common/tlv_data.c b/board/solidrun/common/tlv_data.c
index 11d6e4a13807..1daf14812ef7 100644
--- a/board/solidrun/common/tlv_data.c
+++ b/board/solidrun/common/tlv_data.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <compiler.h>
 #include <tlv_eeprom.h>
+#include <linux/string.h>
 #include "tlv_data.h"
 
 #define SR_TLV_CODE_RAM_SIZE	0x81
diff --git a/board/solidrun/mx6cuboxi/mx6cuboxi.c b/board/solidrun/mx6cuboxi/mx6cuboxi.c
index 3eadc38f6fd4..e56e32e8c849 100644
--- a/board/solidrun/mx6cuboxi/mx6cuboxi.c
+++ b/board/solidrun/mx6cuboxi/mx6cuboxi.c
@@ -38,6 +38,7 @@
 #include <asm/arch/sys_proto.h>
 #include <spl.h>
 #include <usb.h>
+#include <linux/string.h>
 #include <usb/ehci-ci.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/st/common/stm32mp_dfu.c b/board/st/common/stm32mp_dfu.c
index 04b56f7a6c41..aab502e3146e 100644
--- a/board/st/common/stm32mp_dfu.c
+++ b/board/st/common/stm32mp_dfu.c
@@ -14,6 +14,7 @@
 #include <mtd_node.h>
 #include <asm/arch/stm32prog.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #define DFU_ALT_BUF_LEN SZ_1K
 
diff --git a/board/st/common/stm32mp_mtdparts.c b/board/st/common/stm32mp_mtdparts.c
index 7151cad6d0f9..b7dfd4cb741e 100644
--- a/board/st/common/stm32mp_mtdparts.c
+++ b/board/st/common/stm32mp_mtdparts.c
@@ -15,6 +15,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/global_data.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #define MTDPARTS_LEN		256
 #define MTDIDS_LEN		128
diff --git a/board/st/stm32mp1/stm32mp1.c b/board/st/stm32mp1/stm32mp1.c
index a18b4e33f3f9..b37326b1c3cb 100644
--- a/board/st/stm32mp1/stm32mp1.c
+++ b/board/st/stm32mp1/stm32mp1.c
@@ -40,6 +40,7 @@
 #include <linux/err.h>
 #include <linux/iopoll.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include <power/regulator.h>
 #include <usb/dwc2_udc.h>
 
diff --git a/board/sunxi/board.c b/board/sunxi/board.c
index 7812860042f6..193ec8cff574 100644
--- a/board/sunxi/board.c
+++ b/board/sunxi/board.c
@@ -31,6 +31,7 @@
 #include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include <u-boot/crc.h>
 #ifndef CONFIG_ARM64
 #include <asm/armv7.h>
diff --git a/board/synopsys/emsdp/emsdp.c b/board/synopsys/emsdp/emsdp.c
index 997120ec5e17..a2eaf36ef13a 100644
--- a/board/synopsys/emsdp/emsdp.c
+++ b/board/synopsys/emsdp/emsdp.c
@@ -11,6 +11,7 @@
 #include <malloc.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
+#include <linux/string.h>
 
 #include <asm/arcregs.h>
 
diff --git a/board/synopsys/hsdk/hsdk.c b/board/synopsys/hsdk/hsdk.c
index 892b94bb0836..8644a41fe0ba 100644
--- a/board/synopsys/hsdk/hsdk.c
+++ b/board/synopsys/hsdk/hsdk.c
@@ -25,6 +25,7 @@
 #include <dwmmc.h>
 #include <malloc.h>
 #include <usb.h>
+#include <linux/string.h>
 
 #include "clk-lib.h"
 #include "env-lib.h"
diff --git a/board/syteco/zmx25/zmx25.c b/board/syteco/zmx25/zmx25.c
index 2d4c5cce8920..a3e5efad7c60 100644
--- a/board/syteco/zmx25/zmx25.c
+++ b/board/syteco/zmx25/zmx25.c
@@ -23,6 +23,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux-mx25.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/technexion/pico-imx6/spl.c b/board/technexion/pico-imx6/spl.c
index 3b36bb8df131..7b6cdd6c3b16 100644
--- a/board/technexion/pico-imx6/spl.c
+++ b/board/technexion/pico-imx6/spl.c
@@ -24,6 +24,7 @@
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
 #include <spl.h>
+#include <linux/string.h>
 
 #if defined(CONFIG_SPL_BUILD)
 #include <asm/arch/mx6-ddr.h>
diff --git a/board/technexion/pico-imx6ul/spl.c b/board/technexion/pico-imx6ul/spl.c
index 380777954422..faee99e8d29d 100644
--- a/board/technexion/pico-imx6ul/spl.c
+++ b/board/technexion/pico-imx6ul/spl.c
@@ -17,6 +17,7 @@
 #include <fsl_esdhc_imx.h>
 #include <linux/libfdt.h>
 #include <spl.h>
+#include <linux/string.h>
 
 #if defined(CONFIG_SPL_BUILD)
 
diff --git a/board/technexion/pico-imx7d/spl.c b/board/technexion/pico-imx7d/spl.c
index bed0f21f44d3..ccb094f18845 100644
--- a/board/technexion/pico-imx7d/spl.c
+++ b/board/technexion/pico-imx7d/spl.c
@@ -18,6 +18,7 @@
 #include <asm/gpio.h>
 #include <fsl_esdhc_imx.h>
 #include <spl.h>
+#include <linux/string.h>
 
 #if defined(CONFIG_SPL_BUILD)
 
diff --git a/board/technexion/pico-imx8mq/spl.c b/board/technexion/pico-imx8mq/spl.c
index 8b853a914e85..b434e1e16f29 100644
--- a/board/technexion/pico-imx8mq/spl.c
+++ b/board/technexion/pico-imx8mq/spl.c
@@ -21,6 +21,7 @@
 #include <fsl_esdhc_imx.h>
 #include <mmc.h>
 #include <spl.h>
+#include <linux/string.h>
 
 #include "lpddr4_timing.h"
 
diff --git a/board/theadorable/fpga.c b/board/theadorable/fpga.c
index 3a33e15eacc6..4cfc4bbf0acd 100644
--- a/board/theadorable/fpga.c
+++ b/board/theadorable/fpga.c
@@ -13,6 +13,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
 #include <asm/arch-mvebu/spi.h>
+#include <linux/string.h>
 #include "theadorable.h"
 
 /*
diff --git a/board/theobroma-systems/puma_rk3399/puma-rk3399.c b/board/theobroma-systems/puma_rk3399/puma-rk3399.c
index deeba3084a80..715dcbdc7bc8 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 <linux/string.h>
 #include <u-boot/crc.h>
 #include <usb.h>
 #include <dm/pinctrl.h>
diff --git a/board/ti/am335x/board.c b/board/ti/am335x/board.c
index 211a9bf74467..be474a8472c9 100644
--- a/board/ti/am335x/board.c
+++ b/board/ti/am335x/board.c
@@ -39,6 +39,7 @@
 #include <cpsw.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include <power/tps65217.h>
 #include <power/tps65910.h>
 #include <env_internal.h>
diff --git a/board/ti/am335x/board.h b/board/ti/am335x/board.h
index 48df914af96c..b8ceddb20b12 100644
--- a/board/ti/am335x/board.h
+++ b/board/ti/am335x/board.h
@@ -20,6 +20,7 @@
  * REG_COS_COUNT_2 do not have any effect on current versions of
  * AM335x.
  */
+#include <linux/string.h>
 #define EMIF_OCP_CONFIG_BEAGLEBONE_BLACK       0x00141414
 #define EMIF_OCP_CONFIG_AM335X_EVM             0x003d3d3d
 
diff --git a/board/ti/am43xx/board.c b/board/ti/am43xx/board.c
index 8f5bf3581f48..ba479672c663 100644
--- a/board/ti/am43xx/board.c
+++ b/board/ti/am43xx/board.c
@@ -28,6 +28,7 @@
 #include <asm/arch/gpio.h>
 #include <asm/emif.h>
 #include <asm/omap_common.h>
+#include <linux/string.h>
 #include "../common/board_detect.h"
 #include "board.h"
 #include <power/pmic.h>
diff --git a/board/ti/am43xx/board.h b/board/ti/am43xx/board.h
index 06b737445d44..e28813f4bb80 100644
--- a/board/ti/am43xx/board.h
+++ b/board/ti/am43xx/board.h
@@ -12,6 +12,7 @@
 #define _BOARD_H_
 
 #include <asm/arch/omap.h>
+#include <linux/string.h>
 
 #define DEV_ATTR_MAX_OFFSET    5
 #define DEV_ATTR_MIN_OFFSET    0
diff --git a/board/ti/am57xx/board.c b/board/ti/am57xx/board.c
index be09d719cbe3..d9b28dff52b3 100644
--- a/board/ti/am57xx/board.c
+++ b/board/ti/am57xx/board.c
@@ -33,6 +33,7 @@
 #include <asm/arch/gpio.h>
 #include <asm/arch/omap.h>
 #include <usb.h>
+#include <linux/string.h>
 #include <linux/usb/gadget.h>
 #include <dwc3-uboot.h>
 #include <dwc3-omap-uboot.h>
diff --git a/board/ti/am65x/evm.c b/board/ti/am65x/evm.c
index 0f5ec260b162..2346595b95d1 100644
--- a/board/ti/am65x/evm.c
+++ b/board/ti/am65x/evm.c
@@ -23,6 +23,7 @@
 #include <spl.h>
 #include <asm/arch/sys_proto.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #include "../common/board_detect.h"
 
diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c
index 888a95849190..25297b0ae0c9 100644
--- a/board/ti/beagle/beagle.c
+++ b/board/ti/beagle/beagle.c
@@ -35,6 +35,7 @@
 #include <asm/mach-types.h>
 #include <asm/omap_musb.h>
 #include <linux/errno.h>
+#include <linux/string.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
 #include <linux/usb/musb.h>
diff --git a/board/ti/common/board_detect.c b/board/ti/common/board_detect.c
index 9d1bee1c2559..f51bacfbbcde 100644
--- a/board/ti/common/board_detect.c
+++ b/board/ti/common/board_detect.c
@@ -20,6 +20,7 @@
 #include <errno.h>
 #include <malloc.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #include "board_detect.h"
 
diff --git a/board/ti/j721e/evm.c b/board/ti/j721e/evm.c
index 2ab305a902b9..2ef1acec680e 100644
--- a/board/ti/j721e/evm.c
+++ b/board/ti/j721e/evm.c
@@ -24,6 +24,7 @@
 #include <dm.h>
 #include <dm/uclass-internal.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #include "../common/board_detect.h"
 
diff --git a/board/ti/ks2_evm/board.c b/board/ti/ks2_evm/board.c
index 9e5f08e33720..078b89073fc1 100644
--- a/board/ti/ks2_evm/board.c
+++ b/board/ti/ks2_evm/board.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 #include "board.h"
 #include <env.h>
 #include <hang.h>
diff --git a/board/ti/ks2_evm/board_k2e.c b/board/ti/ks2_evm/board_k2e.c
index 39abb24e1560..b5258b66e102 100644
--- a/board/ti/ks2_evm/board_k2e.c
+++ b/board/ti/ks2_evm/board_k2e.c
@@ -12,6 +12,7 @@
 #include <asm/arch/ddr3.h>
 #include <asm/arch/hardware.h>
 #include <asm/ti-common/keystone_net.h>
+#include <linux/string.h>
 
 unsigned int get_external_clk(u32 clk)
 {
diff --git a/board/ti/ks2_evm/board_k2g.c b/board/ti/ks2_evm/board_k2g.c
index a71024bcbce5..b6ef7164d9fb 100644
--- a/board/ti/ks2_evm/board_k2g.c
+++ b/board/ti/ks2_evm/board_k2g.c
@@ -20,6 +20,7 @@
 #include <remoteproc.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include "mux-k2g.h"
 #include "../common/board_detect.h"
 
diff --git a/board/ti/ks2_evm/board_k2hk.c b/board/ti/ks2_evm/board_k2hk.c
index 12c4649c3c4c..6a9935c7ef5c 100644
--- a/board/ti/ks2_evm/board_k2hk.c
+++ b/board/ti/ks2_evm/board_k2hk.c
@@ -12,6 +12,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/hardware.h>
 #include <asm/ti-common/keystone_net.h>
+#include <linux/string.h>
 
 unsigned int external_clk[ext_clk_count] = {
 	[sys_clk]	=	122880000,
diff --git a/board/ti/ks2_evm/board_k2l.c b/board/ti/ks2_evm/board_k2l.c
index f759ee364666..459530ecb9de 100644
--- a/board/ti/ks2_evm/board_k2l.c
+++ b/board/ti/ks2_evm/board_k2l.c
@@ -12,6 +12,7 @@
 #include <asm/arch/ddr3.h>
 #include <asm/arch/hardware.h>
 #include <asm/ti-common/keystone_net.h>
+#include <linux/string.h>
 
 unsigned int get_external_clk(u32 clk)
 {
diff --git a/board/ti/sdp4430/cmd_bat.c b/board/ti/sdp4430/cmd_bat.c
index 6c1e6ca393c6..2b8f4bc69de2 100644
--- a/board/ti/sdp4430/cmd_bat.c
+++ b/board/ti/sdp4430/cmd_bat.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <linux/string.h>
 
 #ifdef CONFIG_CMD_BAT
 #include <twl6030.h>
diff --git a/board/toradex/apalis-tk1/apalis-tk1.c b/board/toradex/apalis-tk1/apalis-tk1.c
index 349b3119370b..2883f1b98c5e 100644
--- a/board/toradex/apalis-tk1/apalis-tk1.c
+++ b/board/toradex/apalis-tk1/apalis-tk1.c
@@ -17,6 +17,7 @@
 #include <pci_tegra.h>
 #include <linux/delay.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include <power/as3722.h>
 #include <power/pmic.h>
 
diff --git a/board/toradex/apalis_imx6/apalis_imx6.c b/board/toradex/apalis_imx6/apalis_imx6.c
index 17f6094687b7..d17f90f86fda 100644
--- a/board/toradex/apalis_imx6/apalis_imx6.c
+++ b/board/toradex/apalis_imx6/apalis_imx6.c
@@ -15,6 +15,7 @@
 #include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include <ahci.h>
 #include <asm/arch/clock.h>
diff --git a/board/toradex/colibri_imx6/colibri_imx6.c b/board/toradex/colibri_imx6/colibri_imx6.c
index 64a8406ec77c..1f18552b57c7 100644
--- a/board/toradex/colibri_imx6/colibri_imx6.c
+++ b/board/toradex/colibri_imx6/colibri_imx6.c
@@ -15,6 +15,7 @@
 #include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include <asm/arch/clock.h>
 #include <asm/arch/crm_regs.h>
diff --git a/board/toradex/common/tdx-cfg-block.c b/board/toradex/common/tdx-cfg-block.c
index ab561237e6f7..fbd3f5de13ff 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 <asm/global_data.h>
+#include <linux/string.h>
 #include "tdx-cfg-block.h"
 #include "tdx-eeprom.h"
 
diff --git a/board/toradex/common/tdx-common.c b/board/toradex/common/tdx-common.c
index fe5295f94bff..888b39fbe42a 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 <linux/libfdt.h>
+#include <linux/string.h>
 
 #ifdef CONFIG_DM_VIDEO
 #include <bmp_logo.h>
diff --git a/board/toradex/verdin-imx8mm/spl.c b/board/toradex/verdin-imx8mm/spl.c
index 588da0aeba6b..5ee86dd3f899 100644
--- a/board/toradex/verdin-imx8mm/spl.c
+++ b/board/toradex/verdin-imx8mm/spl.c
@@ -22,6 +22,7 @@
 #include <dm/uclass.h>
 #include <dm/uclass-internal.h>
 #include <hang.h>
+#include <linux/string.h>
 #include <power/bd71837.h>
 #include <power/pmic.h>
 #include <spl.h>
diff --git a/board/udoo/neo/neo.c b/board/udoo/neo/neo.c
index 653ca1ca5a62..aef82e2c2df1 100644
--- a/board/udoo/neo/neo.c
+++ b/board/udoo/neo/neo.c
@@ -32,6 +32,7 @@
 #include <i2c.h>
 #include <miiphy.h>
 #include <netdev.h>
+#include <linux/string.h>
 #include <power/pmic.h>
 #include <power/pfuze3000_pmic.h>
 #include <malloc.h>
diff --git a/board/variscite/dart_6ul/spl.c b/board/variscite/dart_6ul/spl.c
index 071f049caf6c..725600770b7e 100644
--- a/board/variscite/dart_6ul/spl.c
+++ b/board/variscite/dart_6ul/spl.c
@@ -13,6 +13,7 @@
 #include <asm/arch/mx6-pins.h>
 #include <asm/arch/crm_regs.h>
 #include <fsl_esdhc_imx.h>
+#include <linux/string.h>
 
 #define UART_PAD_CTRL  (PAD_CTL_PKE | PAD_CTL_PUE |		\
 	PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED |		\
diff --git a/board/varisys/common/sys_eeprom.c b/board/varisys/common/sys_eeprom.c
index 251d9fd73e56..facda8e5419f 100644
--- a/board/varisys/common/sys_eeprom.c
+++ b/board/varisys/common/sys_eeprom.c
@@ -16,6 +16,7 @@
 #include <i2c.h>
 #include <linux/ctype.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include <u-boot/crc.h>
 
 #include "eeprom.h"
diff --git a/board/vscom/baltos/board.c b/board/vscom/baltos/board.c
index 4175d414694b..ed375c58cb9e 100644
--- a/board/vscom/baltos/board.c
+++ b/board/vscom/baltos/board.c
@@ -32,6 +32,7 @@
 #include <i2c.h>
 #include <miiphy.h>
 #include <cpsw.h>
+#include <linux/string.h>
 #include <power/tps65910.h>
 #include <watchdog.h>
 #include "board.h"
diff --git a/board/wandboard/wandboard.c b/board/wandboard/wandboard.c
index 53299c87010a..7d3da302395a 100644
--- a/board/wandboard/wandboard.c
+++ b/board/wandboard/wandboard.c
@@ -33,6 +33,7 @@
 #include <netdev.h>
 #include <phy.h>
 #include <i2c.h>
+#include <linux/string.h>
 #include <power/pmic.h>
 #include <power/pfuze100_pmic.h>
 
diff --git a/board/work-microwave/work_92105/work_92105_display.c b/board/work-microwave/work_92105/work_92105_display.c
index fecbbbdb584a..eefcb8545f50 100644
--- a/board/work-microwave/work_92105/work_92105_display.c
+++ b/board/work-microwave/work_92105/work_92105_display.c
@@ -23,6 +23,7 @@
 #include <version.h>
 #include <vsprintf.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 /*
  * GPO 15 in port 3 is gpio 3*32+15 = 111
diff --git a/board/xes/common/board.c b/board/xes/common/board.c
index 053b07a0b70f..b6aeee3f2ca6 100644
--- a/board/xes/common/board.c
+++ b/board/xes/common/board.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <env.h>
+#include <linux/string.h>
 #include "fsl_8xxx_misc.h"
 #include <init.h>
 
diff --git a/board/xilinx/versal/board.c b/board/xilinx/versal/board.c
index 55da0df75c43..025212b223c6 100644
--- a/board/xilinx/versal/board.c
+++ b/board/xilinx/versal/board.c
@@ -20,6 +20,7 @@
 #include <dm/device.h>
 #include <dm/uclass.h>
 #include <versalpl.h>
+#include <linux/string.h>
 #include "../common/board.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/xilinx/zynq/board.c b/board/xilinx/zynq/board.c
index 09e4184e1728..91446fb9c39c 100644
--- a/board/xilinx/zynq/board.c
+++ b/board/xilinx/zynq/board.c
@@ -18,6 +18,7 @@
 #include <zynqpl.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/string.h>
 #include "../common/board.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/xilinx/zynq/bootimg.c b/board/xilinx/zynq/bootimg.c
index 2f55078dd768..1a9d3ed3ec5e 100644
--- a/board/xilinx/zynq/bootimg.c
+++ b/board/xilinx/zynq/bootimg.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/string.h>
 #include <u-boot/md5.h>
 #include <zynq_bootimg.h>
 
diff --git a/board/xilinx/zynq/cmds.c b/board/xilinx/zynq/cmds.c
index 6c697caa625b..c43727ab87a4 100644
--- a/board/xilinx/zynq/cmds.c
+++ b/board/xilinx/zynq/cmds.c
@@ -12,6 +12,7 @@
 #include <asm/arch/sys_proto.h>
 #include <malloc.h>
 #include <linux/bitops.h>
+#include <linux/string.h>
 #include <u-boot/md5.h>
 #include <u-boot/rsa.h>
 #include <u-boot/rsa-mod-exp.h>
diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c
index a64174a915c9..3bd39d5eb47a 100644
--- a/board/xilinx/zynqmp/zynqmp.c
+++ b/board/xilinx/zynqmp/zynqmp.c
@@ -35,6 +35,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/sizes.h>
+#include <linux/string.h>
 #include "../common/board.h"
 
 #include "pm_cfg_obj.h"
diff --git a/cmd/abootimg.c b/cmd/abootimg.c
index 40e8978f152e..f21b77dbf6f8 100644
--- a/cmd/abootimg.c
+++ b/cmd/abootimg.c
@@ -9,6 +9,7 @@
 #include <command.h>
 #include <image.h>
 #include <mapmem.h>
+#include <linux/string.h>
 
 #define abootimg_addr() \
 	(_abootimg_addr == -1 ? image_load_addr : _abootimg_addr)
diff --git a/cmd/acpi.c b/cmd/acpi.c
index 6fa61c5fb89c..b009368eacee 100644
--- a/cmd/acpi.c
+++ b/cmd/acpi.c
@@ -11,6 +11,7 @@
 #include <asm/acpi_table.h>
 #include <asm/global_data.h>
 #include <dm/acpi.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/cmd/adtimg.c b/cmd/adtimg.c
index aa943007f350..2d43dd147d49 100644
--- a/cmd/adtimg.c
+++ b/cmd/adtimg.c
@@ -9,6 +9,7 @@
 #include <env.h>
 #include <image-android-dt.h>
 #include <common.h>
+#include <linux/string.h>
 
 #define OPT_INDEX	"--index"
 
diff --git a/cmd/aes.c b/cmd/aes.c
index 4c0dad99326a..51bc922b937c 100644
--- a/cmd/aes.c
+++ b/cmd/aes.c
@@ -12,6 +12,7 @@
 #include <asm/byteorder.h>
 #include <linux/compiler.h>
 #include <mapmem.h>
+#include <linux/string.h>
 
 u32 aes_get_key_len(char *command)
 {
diff --git a/cmd/armflash.c b/cmd/armflash.c
index 5e7315eb7cde..2365f16ce4c5 100644
--- a/cmd/armflash.c
+++ b/cmd/armflash.c
@@ -10,6 +10,7 @@
 #include <console.h>
 #include <flash.h>
 #include <asm/io.h>
+#include <linux/string.h>
 
 #define MAX_REGIONS 4
 #define MAX_IMAGES 32
diff --git a/cmd/avb.c b/cmd/avb.c
index 88172a9ee675..5e9db6f23851 100644
--- a/cmd/avb.c
+++ b/cmd/avb.c
@@ -11,6 +11,7 @@
 #include <image.h>
 #include <malloc.h>
 #include <mmc.h>
+#include <linux/string.h>
 
 #define AVB_BOOTARGS	"avb_bootargs"
 static struct AvbOps *avb_ops;
diff --git a/cmd/bcb.c b/cmd/bcb.c
index 81e099fbb1b4..2de6a08beb97 100644
--- a/cmd/bcb.c
+++ b/cmd/bcb.c
@@ -11,6 +11,7 @@
 #include <display_options.h>
 #include <log.h>
 #include <part.h>
+#include <linux/string.h>
 
 enum bcb_cmd {
 	BCB_CMD_LOAD,
diff --git a/cmd/bdinfo.c b/cmd/bdinfo.c
index a940cac7eafd..f9fe3cd0e155 100644
--- a/cmd/bdinfo.c
+++ b/cmd/bdinfo.c
@@ -14,6 +14,7 @@
 #include <vsprintf.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/cmd/binop.c b/cmd/binop.c
index c85cb51568da..afeffadc44f3 100644
--- a/cmd/binop.c
+++ b/cmd/binop.c
@@ -7,6 +7,7 @@
 #include <malloc.h>
 #include <mapmem.h>
 #include <linux/ctype.h>
+#include <linux/string.h>
 
 enum {
 	OP_ID_XOR,
diff --git a/cmd/blk_common.c b/cmd/blk_common.c
index 87f94b5abbfc..14413da3f6da 100644
--- a/cmd/blk_common.c
+++ b/cmd/blk_common.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <blk.h>
 #include <command.h>
+#include <linux/string.h>
 
 int blk_common_cmd(int argc, char *const argv[], enum if_type if_type,
 		   int *cur_devnump)
diff --git a/cmd/blob.c b/cmd/blob.c
index c80e6977b4bf..a3b4f7a32862 100644
--- a/cmd/blob.c
+++ b/cmd/blob.c
@@ -9,6 +9,7 @@
 #include <malloc.h>
 #include <asm/byteorder.h>
 #include <linux/compiler.h>
+#include <linux/string.h>
 
 /**
  * blob_decap() - Decapsulate the data as a blob
diff --git a/cmd/bmp.c b/cmd/bmp.c
index 6040fa5d95d6..3ecf8db5e653 100644
--- a/cmd/bmp.c
+++ b/cmd/bmp.c
@@ -21,6 +21,7 @@
 #include <splash.h>
 #include <video.h>
 #include <asm/byteorder.h>
+#include <linux/string.h>
 
 static int bmp_info (ulong addr);
 
diff --git a/cmd/bootefi.c b/cmd/bootefi.c
index 9808049548db..8fb56106a898 100644
--- a/cmd/bootefi.c
+++ b/cmd/bootefi.c
@@ -25,6 +25,7 @@
 #include <memalign.h>
 #include <asm-generic/sections.h>
 #include <linux/linkage.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/cmd/booti.c b/cmd/booti.c
index 3df70ea9caaf..7df747bc575c 100644
--- a/cmd/booti.c
+++ b/cmd/booti.c
@@ -15,6 +15,7 @@
 #include <asm/global_data.h>
 #include <linux/kernel.h>
 #include <linux/sizes.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 /*
diff --git a/cmd/bootm.c b/cmd/bootm.c
index 7732b97f635d..599251f7181c 100644
--- a/cmd/bootm.c
+++ b/cmd/bootm.c
@@ -19,6 +19,7 @@
 #include <asm/global_data.h>
 #include <linux/ctype.h>
 #include <linux/err.h>
+#include <linux/string.h>
 #include <u-boot/zlib.h>
 #include <mapmem.h>
 
diff --git a/cmd/bootstage.c b/cmd/bootstage.c
index 0e623f216b19..37615c3ffec7 100644
--- a/cmd/bootstage.c
+++ b/cmd/bootstage.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <bootstage.h>
 #include <command.h>
+#include <linux/string.h>
 
 static int do_bootstage_report(struct cmd_tbl *cmdtp, int flag, int argc,
 			       char *const argv[])
diff --git a/cmd/cache.c b/cmd/cache.c
index b68d45b98bf2..0ea2c6c033a8 100644
--- a/cmd/cache.c
+++ b/cmd/cache.c
@@ -11,6 +11,7 @@
 #include <command.h>
 #include <cpu_func.h>
 #include <linux/compiler.h>
+#include <linux/string.h>
 
 static int parse_argv(const char *);
 
diff --git a/cmd/cros_ec.c b/cmd/cros_ec.c
index ce1f59a740c1..b4059f0e7dce 100644
--- a/cmd/cros_ec.c
+++ b/cmd/cros_ec.c
@@ -14,6 +14,7 @@
 #include <log.h>
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
+#include <linux/string.h>
 
 /* Note: depends on enum ec_current_image */
 static const char * const ec_current_image_name[] = {"unknown", "RO", "RW"};
diff --git a/cmd/date.c b/cmd/date.c
index 0e1189475313..8e8f54ba405c 100644
--- a/cmd/date.c
+++ b/cmd/date.c
@@ -13,6 +13,7 @@
 #include <rtc.h>
 #include <i2c.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/cmd/dfu.c b/cmd/dfu.c
index 7310595a0278..b19b79c57eb6 100644
--- a/cmd/dfu.c
+++ b/cmd/dfu.c
@@ -18,6 +18,7 @@
 #include <g_dnl.h>
 #include <usb.h>
 #include <net.h>
+#include <linux/string.h>
 
 static int do_dfu(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 {
diff --git a/cmd/echo.c b/cmd/echo.c
index d02a4cfd586a..1d85e23c218c 100644
--- a/cmd/echo.c
+++ b/cmd/echo.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <linux/string.h>
 
 static int do_echo(struct cmd_tbl *cmdtp, int flag, int argc,
 		   char *const argv[])
diff --git a/cmd/eeprom.c b/cmd/eeprom.c
index 7fa62bba8fc9..654004e14303 100644
--- a/cmd/eeprom.c
+++ b/cmd/eeprom.c
@@ -26,6 +26,7 @@
 #include <i2c.h>
 #include <eeprom_layout.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #ifndef	CONFIG_SYS_I2C_SPEED
 #define	CONFIG_SYS_I2C_SPEED	50000
diff --git a/cmd/efi.c b/cmd/efi.c
index 1c0e62e4a330..11531cd1b4aa 100644
--- a/cmd/efi.c
+++ b/cmd/efi.c
@@ -12,6 +12,7 @@
 #include <malloc.h>
 #include <sort.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 
 static const char *const type_name[] = {
 	"reserved",
diff --git a/cmd/efidebug.c b/cmd/efidebug.c
index 9874838b005a..cf08e07d6d42 100644
--- a/cmd/efidebug.c
+++ b/cmd/efidebug.c
@@ -16,6 +16,7 @@
 #include <mapmem.h>
 #include <search.h>
 #include <linux/ctype.h>
+#include <linux/string.h>
 
 #define BS systab.boottime
 
diff --git a/cmd/elf.c b/cmd/elf.c
index d44b95d90339..a3cb6e274f4a 100644
--- a/cmd/elf.c
+++ b/cmd/elf.c
@@ -19,6 +19,7 @@
 #include <asm/e820.h>
 #include <linux/linkage.h>
 #endif
+#include <linux/string.h>
 
 /* Allow ports to override the default behavior */
 static unsigned long do_bootelf_exec(ulong (*entry)(int, char * const[]),
diff --git a/cmd/ethsw.c b/cmd/ethsw.c
index f8b8a798bf6a..8e2bd3dfa578 100644
--- a/cmd/ethsw.c
+++ b/cmd/ethsw.c
@@ -12,6 +12,7 @@
 #include <env_flags.h>
 #include <ethsw.h>
 #include <net.h>
+#include <linux/string.h>
 
 static const char *ethsw_name;
 
diff --git a/cmd/fastboot.c b/cmd/fastboot.c
index 48b891b28fc5..90efc85360d6 100644
--- a/cmd/fastboot.c
+++ b/cmd/fastboot.c
@@ -15,6 +15,7 @@
 #include <usb.h>
 #include <watchdog.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include <linux/stringify.h>
 
 static int do_fastboot_udp(int argc, char *const argv[],
diff --git a/cmd/fdt.c b/cmd/fdt.c
index 89ab572d8df7..f5f1f6b00171 100644
--- a/cmd/fdt.c
+++ b/cmd/fdt.c
@@ -12,6 +12,7 @@
 #include <env.h>
 #include <image.h>
 #include <linux/ctype.h>
+#include <linux/string.h>
 #include <linux/types.h>
 #include <asm/global_data.h>
 #include <linux/libfdt.h>
diff --git a/cmd/flash.c b/cmd/flash.c
index 240871e8089a..3e7b335109de 100644
--- a/cmd/flash.c
+++ b/cmd/flash.c
@@ -11,6 +11,7 @@
 #include <command.h>
 #include <log.h>
 #include <uuid.h>
+#include <linux/string.h>
 
 #if defined(CONFIG_CMD_MTDPARTS)
 #include <jffs2/jffs2.h>
diff --git a/cmd/fpga.c b/cmd/fpga.c
index 8ae1c936fbb5..3151100aa140 100644
--- a/cmd/fpga.c
+++ b/cmd/fpga.c
@@ -16,6 +16,7 @@
 #include <image.h>
 #include <log.h>
 #include <malloc.h>
+#include <linux/string.h>
 
 static long do_fpga_get_device(char *arg)
 {
diff --git a/cmd/fuse.c b/cmd/fuse.c
index e001619d1720..db504349af1f 100644
--- a/cmd/fuse.c
+++ b/cmd/fuse.c
@@ -13,6 +13,7 @@
 #include <console.h>
 #include <fuse.h>
 #include <linux/errno.h>
+#include <linux/string.h>
 
 static int strtou32(const char *str, unsigned int base, u32 *result)
 {
diff --git a/cmd/gpio.c b/cmd/gpio.c
index 4fdb3135fc1a..e256f83ea103 100644
--- a/cmd/gpio.c
+++ b/cmd/gpio.c
@@ -14,6 +14,7 @@
 #include <malloc.h>
 #include <asm/gpio.h>
 #include <linux/err.h>
+#include <linux/string.h>
 
 __weak int name_to_gpio(const char *name)
 {
diff --git a/cmd/gpt.c b/cmd/gpt.c
index df759416c882..db70ba887b4b 100644
--- a/cmd/gpt.c
+++ b/cmd/gpt.c
@@ -27,6 +27,7 @@
 #include <linux/err.h>
 #include <linux/sizes.h>
 #include <stdlib.h>
+#include <linux/string.h>
 
 static LIST_HEAD(disk_partitions);
 
diff --git a/cmd/hash.c b/cmd/hash.c
index e163cd677420..5b0d75f8662d 100644
--- a/cmd/hash.c
+++ b/cmd/hash.c
@@ -13,6 +13,7 @@
 #include <command.h>
 #include <hash.h>
 #include <linux/ctype.h>
+#include <linux/string.h>
 
 static int do_hash(struct cmd_tbl *cmdtp, int flag, int argc,
 		   char *const argv[])
diff --git a/cmd/i2c.c b/cmd/i2c.c
index cc01119b2107..83e4cfaa255d 100644
--- a/cmd/i2c.c
+++ b/cmd/i2c.c
@@ -78,6 +78,7 @@
 #include <asm/byteorder.h>
 #include <linux/compiler.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include <u-boot/crc.h>
 
 /* Display values from last command.
diff --git a/cmd/ide.c b/cmd/ide.c
index b78c38e1590d..8fefaf3f8158 100644
--- a/cmd/ide.c
+++ b/cmd/ide.c
@@ -16,6 +16,7 @@
 #include <image.h>
 #include <asm/byteorder.h>
 #include <asm/io.h>
+#include <linux/string.h>
 
 #include <ide.h>
 #include <ata.h>
diff --git a/cmd/irq.c b/cmd/irq.c
index 1d3e28cb3ce0..614fd942bc2a 100644
--- a/cmd/irq.c
+++ b/cmd/irq.c
@@ -7,6 +7,7 @@
 #include <config.h>
 #include <command.h>
 #include <irq_func.h>
+#include <linux/string.h>
 
 static int do_interrupts(struct cmd_tbl *cmdtp, int flag, int argc,
 			 char *const argv[])
diff --git a/cmd/itest.c b/cmd/itest.c
index a0cf4bee041f..4ccc4cbb8a91 100644
--- a/cmd/itest.c
+++ b/cmd/itest.c
@@ -16,6 +16,7 @@
 #include <command.h>
 #include <env.h>
 #include <mapmem.h>
+#include <linux/string.h>
 
 #include <asm/io.h>
 
diff --git a/cmd/jffs2.c b/cmd/jffs2.c
index 9540988e33e5..e06ab60a77f1 100644
--- a/cmd/jffs2.c
+++ b/cmd/jffs2.c
@@ -81,6 +81,7 @@
 #include <linux/list.h>
 #include <linux/ctype.h>
 #include <cramfs/cramfs_fs.h>
+#include <linux/string.h>
 
 #if defined(CONFIG_CMD_NAND)
 #include <linux/mtd/rawnand.h>
diff --git a/cmd/led.c b/cmd/led.c
index 9433fa886c25..a2b2f1b5e56b 100644
--- a/cmd/led.c
+++ b/cmd/led.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <led.h>
 #include <dm/uclass-internal.h>
+#include <linux/string.h>
 
 #define LED_TOGGLE LEDST_COUNT
 
diff --git a/cmd/legacy_led.c b/cmd/legacy_led.c
index 86cd969e4072..4176f089dfce 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 <linux/string.h>
 
 struct led_tbl_s {
 	char		*string;	/* String for use in the command */
diff --git a/cmd/load.c b/cmd/load.c
index 4bd463c3a7cb..a651478d920b 100644
--- a/cmd/load.c
+++ b/cmd/load.c
@@ -22,6 +22,7 @@
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/cmd/log.c b/cmd/log.c
index ccefb0cbb8cf..f47ff5d17e9b 100644
--- a/cmd/log.c
+++ b/cmd/log.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <log.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 
 static char log_fmt_chars[LOGF_COUNT] = "clFLfm";
 
diff --git a/cmd/md5sum.c b/cmd/md5sum.c
index 5ae3ddf85f82..ae2d81470d7f 100644
--- a/cmd/md5sum.c
+++ b/cmd/md5sum.c
@@ -12,6 +12,7 @@
 #include <env.h>
 #include <image.h>
 #include <mapmem.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 cfa45ad12a0a..d346ccc538d4 100644
--- a/cmd/mdio.c
+++ b/cmd/mdio.c
@@ -13,6 +13,7 @@
 #include <dm.h>
 #include <miiphy.h>
 #include <phy.h>
+#include <linux/string.h>
 
 static char last_op[2];
 static uint last_data;
diff --git a/cmd/mem.c b/cmd/mem.c
index e8559936984f..5970dff8f5ca 100644
--- a/cmd/mem.c
+++ b/cmd/mem.c
@@ -30,6 +30,7 @@
 #include <linux/compiler.h>
 #include <linux/ctype.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/cmd/mii.c b/cmd/mii.c
index fe8602eb7c87..a6524e400e70 100644
--- a/cmd/mii.c
+++ b/cmd/mii.c
@@ -12,6 +12,7 @@
 #include <command.h>
 #include <dm.h>
 #include <miiphy.h>
+#include <linux/string.h>
 
 typedef struct _MII_field_desc_t {
 	ushort hi;
diff --git a/cmd/misc.c b/cmd/misc.c
index 36bca24fb20b..8743a34cff56 100644
--- a/cmd/misc.c
+++ b/cmd/misc.c
@@ -12,6 +12,7 @@
 #include <console.h>
 #include <time.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 static int do_sleep(struct cmd_tbl *cmdtp, int flag, int argc,
 		    char *const argv[])
diff --git a/cmd/mmc.c b/cmd/mmc.c
index e3e75d0fc0e9..bc7e991c86e9 100644
--- a/cmd/mmc.c
+++ b/cmd/mmc.c
@@ -14,6 +14,7 @@
 #include <part.h>
 #include <sparse_format.h>
 #include <image-sparse.h>
+#include <linux/string.h>
 
 static int curr_device = -1;
 
diff --git a/cmd/mp.c b/cmd/mp.c
index c2b5235a373a..a14ebbd0b568 100644
--- a/cmd/mp.c
+++ b/cmd/mp.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <command.h>
 #include <cpu_func.h>
+#include <linux/string.h>
 
 static int cpu_status_all(void)
 {
diff --git a/cmd/mtd.c b/cmd/mtd.c
index 485a963bdd0f..fe1e94f6cc4c 100644
--- a/cmd/mtd.c
+++ b/cmd/mtd.c
@@ -16,6 +16,7 @@
 #include <mtd.h>
 #include <dm/devres.h>
 #include <linux/err.h>
+#include <linux/string.h>
 
 #include <linux/ctype.h>
 
diff --git a/cmd/mtdparts.c b/cmd/mtdparts.c
index ed373a8c4dad..077793e88576 100644
--- a/cmd/mtdparts.c
+++ b/cmd/mtdparts.c
@@ -81,6 +81,7 @@
 #include <linux/ctype.h>
 #include <linux/err.h>
 #include <linux/mtd/mtd.h>
+#include <linux/string.h>
 
 #if defined(CONFIG_CMD_NAND)
 #include <linux/mtd/rawnand.h>
diff --git a/cmd/mvebu/bubt.c b/cmd/mvebu/bubt.c
index 4c58fd3c2e25..3df3ffd78a34 100644
--- a/cmd/mvebu/bubt.c
+++ b/cmd/mvebu/bubt.c
@@ -14,6 +14,7 @@
 #include <vsprintf.h>
 #include <errno.h>
 #include <dm.h>
+#include <linux/string.h>
 
 #include <spi_flash.h>
 #include <spi.h>
diff --git a/cmd/nand.c b/cmd/nand.c
index 92d039af8f52..880ee53d837d 100644
--- a/cmd/nand.c
+++ b/cmd/nand.c
@@ -32,6 +32,7 @@
 #include <asm/byteorder.h>
 #include <jffs2/jffs2.h>
 #include <nand.h>
+#include <linux/string.h>
 
 #include "legacy-mtd-utils.h"
 
diff --git a/cmd/net.c b/cmd/net.c
index 9bbcdbcfe076..c505656a949a 100644
--- a/cmd/net.c
+++ b/cmd/net.c
@@ -13,6 +13,7 @@
 #include <env.h>
 #include <image.h>
 #include <net.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 554596b27d76..c73472ec2260 100644
--- a/cmd/nvedit.c
+++ b/cmd/nvedit.c
@@ -38,6 +38,7 @@
 #include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include <u-boot/crc.h>
 #include <watchdog.h>
 #include <linux/stddef.h>
diff --git a/cmd/nvedit_efi.c b/cmd/nvedit_efi.c
index 8e31f43e1f9a..4f0148b074c9 100644
--- a/cmd/nvedit_efi.c
+++ b/cmd/nvedit_efi.c
@@ -18,6 +18,7 @@
 #include <rtc.h>
 #include <uuid.h>
 #include <linux/kernel.h>
+#include <linux/string.h>
 
 /*
  * From efi_variable.c,
diff --git a/cmd/nvme.c b/cmd/nvme.c
index e715c570a384..8c025980843c 100644
--- a/cmd/nvme.c
+++ b/cmd/nvme.c
@@ -9,6 +9,7 @@
 #include <command.h>
 #include <dm.h>
 #include <nvme.h>
+#include <linux/string.h>
 
 static int nvme_curr_dev;
 
diff --git a/cmd/onenand.c b/cmd/onenand.c
index fa403369faaf..fa12f0dec757 100644
--- a/cmd/onenand.c
+++ b/cmd/onenand.c
@@ -13,6 +13,7 @@
 #include <command.h>
 #include <malloc.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #include <linux/compat.h>
 #include <linux/mtd/mtd.h>
diff --git a/cmd/osd.c b/cmd/osd.c
index bdad5d8e9637..c1ef7eb8cda2 100644
--- a/cmd/osd.c
+++ b/cmd/osd.c
@@ -15,6 +15,7 @@
 #include <hexdump.h>
 #include <video_osd.h>
 #include <malloc.h>
+#include <linux/string.h>
 
 /* Container for selected OSD device */
 static struct udevice *osd_cur;
diff --git a/cmd/part.c b/cmd/part.c
index 3395c17b892a..f53edac8357b 100644
--- a/cmd/part.c
+++ b/cmd/part.c
@@ -21,6 +21,7 @@
 #include <env.h>
 #include <part.h>
 #include <vsprintf.h>
+#include <linux/string.h>
 
 enum cmd_part_info {
 	CMD_PART_INFO_START = 0,
diff --git a/cmd/pci.c b/cmd/pci.c
index f91a4eb8ed06..c2d4e5d4ed67 100644
--- a/cmd/pci.c
+++ b/cmd/pci.c
@@ -22,6 +22,7 @@
 #include <asm/processor.h>
 #include <asm/io.h>
 #include <pci.h>
+#include <linux/string.h>
 
 struct pci_reg_info {
 	const char *name;
diff --git a/cmd/pinmux.c b/cmd/pinmux.c
index 9942b154196c..6f8a3fd94405 100644
--- a/cmd/pinmux.c
+++ b/cmd/pinmux.c
@@ -9,6 +9,7 @@
 #include <errno.h>
 #include <dm/pinctrl.h>
 #include <dm/uclass-internal.h>
+#include <linux/string.h>
 
 #define LIMIT_DEVNAME	30
 
diff --git a/cmd/regulator.c b/cmd/regulator.c
index 0d97334a9019..6e91c1775375 100644
--- a/cmd/regulator.c
+++ b/cmd/regulator.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <dm/uclass-internal.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include <power/regulator.h>
 
 #define LIMIT_DEVNAME	20
diff --git a/cmd/remoteproc.c b/cmd/remoteproc.c
index e8b9178e7407..7adf45534003 100644
--- a/cmd/remoteproc.c
+++ b/cmd/remoteproc.c
@@ -9,6 +9,7 @@
 #include <errno.h>
 #include <malloc.h>
 #include <remoteproc.h>
+#include <linux/string.h>
 
 /**
  * print_remoteproc_list() - print all the remote processor devices
diff --git a/cmd/rtc.c b/cmd/rtc.c
index 4ac49d228cb1..b3f46f13eb40 100644
--- a/cmd/rtc.c
+++ b/cmd/rtc.c
@@ -8,6 +8,7 @@
 #include <i2c.h>
 #include <mapmem.h>
 #include <rtc.h>
+#include <linux/string.h>
 
 #define MAX_RTC_BYTES 32
 
diff --git a/cmd/sata.c b/cmd/sata.c
index aa396c1bbdff..9b19ca49b18d 100644
--- a/cmd/sata.c
+++ b/cmd/sata.c
@@ -18,6 +18,7 @@
 #include <sata.h>
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
+#include <linux/string.h>
 
 static int sata_curr_device = -1;
 
diff --git a/cmd/scsi.c b/cmd/scsi.c
index 5f710d289574..61437ef21eb0 100644
--- a/cmd/scsi.c
+++ b/cmd/scsi.c
@@ -11,6 +11,7 @@
 #include <blk.h>
 #include <command.h>
 #include <scsi.h>
+#include <linux/string.h>
 
 static int scsi_curr_dev; /* current device */
 
diff --git a/cmd/setexpr.c b/cmd/setexpr.c
index 770dc24d2b7a..1569d7ad72dd 100644
--- a/cmd/setexpr.c
+++ b/cmd/setexpr.c
@@ -14,6 +14,7 @@
 #include <env.h>
 #include <log.h>
 #include <mapmem.h>
+#include <linux/string.h>
 
 static ulong get_arg(char *s, int w)
 {
diff --git a/cmd/sf.c b/cmd/sf.c
index 249e2eee377d..c74651d23b6e 100644
--- a/cmd/sf.c
+++ b/cmd/sf.c
@@ -20,6 +20,7 @@
 #include <asm/cache.h>
 #include <jffs2/jffs2.h>
 #include <linux/mtd/mtd.h>
+#include <linux/string.h>
 
 #include <asm/io.h>
 #include <dm/device-internal.h>
diff --git a/cmd/sha1sum.c b/cmd/sha1sum.c
index bcc665a5a6c6..677f57b62d74 100644
--- a/cmd/sha1sum.c
+++ b/cmd/sha1sum.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <command.h>
 #include <hash.h>
+#include <linux/string.h>
 #include <u-boot/sha1.h>
 
 int do_sha1sum(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
diff --git a/cmd/smccc.c b/cmd/smccc.c
index 0b19f6c68c6e..101959c848ab 100644
--- a/cmd/smccc.c
+++ b/cmd/smccc.c
@@ -9,6 +9,7 @@
 #include <linux/arm-smccc.h>
 #include <linux/compiler.h>
 #include <linux/psci.h>
+#include <linux/string.h>
 
 static int do_call(struct cmd_tbl *cmdtp, int flag, int argc,
 		   char *const argv[])
diff --git a/cmd/spi.c b/cmd/spi.c
index 4aea19141290..df05e828fd1d 100644
--- a/cmd/spi.c
+++ b/cmd/spi.c
@@ -13,6 +13,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <spi.h>
+#include <linux/string.h>
 
 /*-----------------------------------------------------------------------
  * Definitions
diff --git a/cmd/strings.c b/cmd/strings.c
index 85fdc34f08fe..bf4efa4aa3a3 100644
--- a/cmd/strings.c
+++ b/cmd/strings.c
@@ -9,6 +9,7 @@
 #include <config.h>
 #include <common.h>
 #include <command.h>
+#include <linux/string.h>
 
 static char *start_addr, *last_addr;
 
diff --git a/cmd/sysboot.c b/cmd/sysboot.c
index af6a2f1b7f1f..38aa2a2cdb03 100644
--- a/cmd/sysboot.c
+++ b/cmd/sysboot.c
@@ -4,6 +4,7 @@
 #include <command.h>
 #include <env.h>
 #include <fs.h>
+#include <linux/string.h>
 #include "pxe_utils.h"
 
 static char *fs_argv[5];
diff --git a/cmd/test.c b/cmd/test.c
index fa7c48fb9f10..ad69e6dd7a6c 100644
--- a/cmd/test.c
+++ b/cmd/test.c
@@ -8,6 +8,7 @@
 #include <command.h>
 #include <fs.h>
 #include <log.h>
+#include <linux/string.h>
 
 #define OP_INVALID	0
 #define OP_NOT		1
diff --git a/cmd/ti/ddr3.c b/cmd/ti/ddr3.c
index 6b43a7386832..f3c3e7e9fbe5 100644
--- a/cmd/ti/ddr3.c
+++ b/cmd/ti/ddr3.c
@@ -15,6 +15,7 @@
 #include <common.h>
 #include <command.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/cmd/tlv_eeprom.c b/cmd/tlv_eeprom.c
index 5099cbdd95ee..663beeb9f73b 100644
--- a/cmd/tlv_eeprom.c
+++ b/cmd/tlv_eeprom.c
@@ -19,6 +19,7 @@
 #include <net.h>
 #include <asm/global_data.h>
 #include <linux/ctype.h>
+#include <linux/string.h>
 #include <u-boot/crc.h>
 
 #include "tlv_eeprom.h"
diff --git a/cmd/tpm-v1.c b/cmd/tpm-v1.c
index 0e2168aea670..77cd5e3bd7c7 100644
--- a/cmd/tpm-v1.c
+++ b/cmd/tpm-v1.c
@@ -10,6 +10,7 @@
 #include <asm/unaligned.h>
 #include <tpm-common.h>
 #include <tpm-v1.h>
+#include <linux/string.h>
 #include "tpm-user-utils.h"
 
 static int do_tpm_startup(struct cmd_tbl *cmdtp, int flag, int argc,
diff --git a/cmd/tpm-v2.c b/cmd/tpm-v2.c
index e6742656f578..392811f12795 100644
--- a/cmd/tpm-v2.c
+++ b/cmd/tpm-v2.c
@@ -11,6 +11,7 @@
 #include <mapmem.h>
 #include <tpm-common.h>
 #include <tpm-v2.h>
+#include <linux/string.h>
 #include "tpm-user-utils.h"
 
 static int do_tpm2_startup(struct cmd_tbl *cmdtp, int flag, int argc,
diff --git a/cmd/tsi148.c b/cmd/tsi148.c
index 2eae14f87f1d..cbe898475bac 100644
--- a/cmd/tsi148.c
+++ b/cmd/tsi148.c
@@ -13,6 +13,7 @@
 #include <malloc.h>
 #include <asm/io.h>
 #include <pci.h>
+#include <linux/string.h>
 
 #include <tsi148.h>
 
diff --git a/cmd/ubi.c b/cmd/ubi.c
index 171377cc66b5..afd45bab9435 100644
--- a/cmd/ubi.c
+++ b/cmd/ubi.c
@@ -27,6 +27,7 @@
 #include <ubi_uboot.h>
 #include <linux/errno.h>
 #include <jffs2/load_kernel.h>
+#include <linux/string.h>
 
 #undef ubi_msg
 #define ubi_msg(fmt, ...) printf("UBI: " fmt "\n", ##__VA_ARGS__)
diff --git a/cmd/ufs.c b/cmd/ufs.c
index 858cd49b5970..a04d15a2441c 100644
--- a/cmd/ufs.c
+++ b/cmd/ufs.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <command.h>
 #include <ufs.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 5ff47dde4fbe..37437a1cdddd 100644
--- a/cmd/universe.c
+++ b/cmd/universe.c
@@ -8,6 +8,7 @@
 #include <malloc.h>
 #include <asm/io.h>
 #include <pci.h>
+#include <linux/string.h>
 
 #include <universe.h>
 
diff --git a/cmd/usb.c b/cmd/usb.c
index b9ec29a8457e..04205a7a52e1 100644
--- a/cmd/usb.c
+++ b/cmd/usb.c
@@ -22,6 +22,7 @@
 #include <asm/unaligned.h>
 #include <part.h>
 #include <usb.h>
+#include <linux/string.h>
 
 #ifdef CONFIG_USB_STORAGE
 static int usb_stor_curr_dev = -1; /* current device */
diff --git a/cmd/usb_mass_storage.c b/cmd/usb_mass_storage.c
index 5996c852e8e1..43fdb097078e 100644
--- a/cmd/usb_mass_storage.c
+++ b/cmd/usb_mass_storage.c
@@ -19,6 +19,7 @@
 #include <watchdog.h>
 #include <linux/delay.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 static int ums_read_sector(struct ums *ums_dev,
 			   ulong start, lbaint_t blkcnt, void *buf)
diff --git a/cmd/virtio.c b/cmd/virtio.c
index 3dace5344f7e..8f64ffa8e147 100644
--- a/cmd/virtio.c
+++ b/cmd/virtio.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <virtio_types.h>
 #include <virtio.h>
+#include <linux/string.h>
 
 static int virtio_curr_dev;
 
diff --git a/cmd/w1.c b/cmd/w1.c
index 459094bf8094..5682981f2df2 100644
--- a/cmd/w1.c
+++ b/cmd/w1.c
@@ -10,6 +10,7 @@
 #include <w1.h>
 #include <w1-eeprom.h>
 #include <dm/device-internal.h>
+#include <linux/string.h>
 
 static int w1_bus(void)
 {
diff --git a/cmd/x86/mtrr.c b/cmd/x86/mtrr.c
index e118bba5a2a7..3e46a342a055 100644
--- a/cmd/x86/mtrr.c
+++ b/cmd/x86/mtrr.c
@@ -9,6 +9,7 @@
 #include <asm/msr.h>
 #include <asm/mp.h>
 #include <asm/mtrr.h>
+#include <linux/string.h>
 
 static const char *const mtrr_type_name[MTRR_TYPE_COUNT] = {
 	"Uncacheable",
diff --git a/cmd/ximg.c b/cmd/ximg.c
index 159ba5164898..c9cf4009d0d7 100644
--- a/cmd/ximg.c
+++ b/cmd/ximg.c
@@ -26,6 +26,7 @@
 #include <asm/byteorder.h>
 #include <asm/cache.h>
 #include <asm/io.h>
+#include <linux/string.h>
 
 #ifndef CONFIG_SYS_XIMG_LEN
 /* use 8MByte as default max gunzip size */
diff --git a/cmd/yaffs2.c b/cmd/yaffs2.c
index f29ebcc026e5..1ecb5bea8e26 100644
--- a/cmd/yaffs2.c
+++ b/cmd/yaffs2.c
@@ -14,6 +14,7 @@
  */
 
 #include <common.h>
+#include <linux/string.h>
 
 #include <config.h>
 #include <command.h>
diff --git a/cmd/zfs.c b/cmd/zfs.c
index e429ac88d73c..d01835573a4c 100644
--- a/cmd/zfs.c
+++ b/cmd/zfs.c
@@ -19,6 +19,7 @@
 #include <zfs_common.h>
 #include <linux/stat.h>
 #include <malloc.h>
+#include <linux/string.h>
 
 #if defined(CONFIG_CMD_USB) && defined(CONFIG_USB_STORAGE)
 #include <usb.h>
diff --git a/common/android_ab.c b/common/android_ab.c
index 4943f26d53ab..794df3fde7ad 100644
--- a/common/android_ab.c
+++ b/common/android_ab.c
@@ -11,6 +11,7 @@
 #include <part.h>
 #include <memalign.h>
 #include <linux/err.h>
+#include <linux/string.h>
 #include <u-boot/crc.h>
 #include <u-boot/crc.h>
 
diff --git a/common/autoboot.c b/common/autoboot.c
index 4341f5f0bb02..6db005259777 100644
--- a/common/autoboot.c
+++ b/common/autoboot.c
@@ -21,6 +21,7 @@
 #include <time.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include <u-boot/sha256.h>
 #include <bootcount.h>
 
diff --git a/common/avb_verify.c b/common/avb_verify.c
index a2b739626b52..6894f6872e94 100644
--- a/common/avb_verify.c
+++ b/common/avb_verify.c
@@ -12,6 +12,7 @@
 #include <malloc.h>
 #include <part.h>
 #include <tee.h>
+#include <linux/string.h>
 #include <tee/optee_ta_avb.h>
 
 static const unsigned char avb_root_pub[1032] = {
diff --git a/common/bloblist.c b/common/bloblist.c
index e3c2b5fa898b..9abd360db8db 100644
--- a/common/bloblist.c
+++ b/common/bloblist.c
@@ -10,6 +10,7 @@
 #include <mapmem.h>
 #include <spl.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 #include <u-boot/crc.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/common/board_f.c b/common/board_f.c
index bf3015d73b17..adf8c837358d 100644
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -55,6 +55,7 @@
 #include <asm/sections.h>
 #include <dm/root.h>
 #include <linux/errno.h>
+#include <linux/string.h>
 
 /*
  * Pointer to initial global data area
diff --git a/common/bootm.c b/common/bootm.c
index 157b0cbc7e86..f9ff1ce78ba8 100644
--- a/common/bootm.c
+++ b/common/bootm.c
@@ -23,6 +23,7 @@
 #if defined(CONFIG_CMD_USB)
 #include <usb.h>
 #endif
+#include <linux/string.h>
 #else
 #include "mkimage.h"
 #endif
diff --git a/common/bootm_os.c b/common/bootm_os.c
index 0b6325db6605..295c6b8c0642 100644
--- a/common/bootm_os.c
+++ b/common/bootm_os.c
@@ -19,6 +19,7 @@
 #include <malloc.h>
 #include <mapmem.h>
 #include <vxworks.h>
+#include <linux/string.h>
 #include <tee/optee.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/common/bootstage.c b/common/bootstage.c
index d5b78b9f4872..6eb837679493 100644
--- a/common/bootstage.c
+++ b/common/bootstage.c
@@ -19,6 +19,7 @@
 #include <asm/global_data.h>
 #include <linux/compiler.h>
 #include <linux/libfdt.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/common/bouncebuf.c b/common/bouncebuf.c
index 6d98920de662..bcca7838bcc7 100644
--- a/common/bouncebuf.c
+++ b/common/bouncebuf.c
@@ -12,6 +12,7 @@
 #include <errno.h>
 #include <bouncebuf.h>
 #include <asm/cache.h>
+#include <linux/string.h>
 
 static int addr_aligned(struct bounce_buffer *state)
 {
diff --git a/common/cli.c b/common/cli.c
index 048eacb9ef97..4fc4c206e4df 100644
--- a/common/cli.c
+++ b/common/cli.c
@@ -19,6 +19,7 @@
 #include <hang.h>
 #include <malloc.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/common/cli_hush.c b/common/cli_hush.c
index 3fbe918ebade..f077707f9f7e 100644
--- a/common/cli_hush.c
+++ b/common/cli_hush.c
@@ -88,6 +88,7 @@
 #define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #endif
 #include <asm/global_data.h>
+#include <linux/string.h>
 #endif
 #ifndef __U_BOOT__
 #include <ctype.h>     /* isalpha, isdigit */
diff --git a/common/cli_readline.c b/common/cli_readline.c
index c89bb136b867..927c5066a9e0 100644
--- a/common/cli_readline.c
+++ b/common/cli_readline.c
@@ -15,6 +15,7 @@
 #include <time.h>
 #include <watchdog.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/common/cli_simple.c b/common/cli_simple.c
index 7d91316a0fbd..b7f21bbbe75d 100644
--- a/common/cli_simple.c
+++ b/common/cli_simple.c
@@ -16,6 +16,7 @@
 #include <env.h>
 #include <log.h>
 #include <linux/ctype.h>
+#include <linux/string.h>
 
 #define DEBUG_PARSER	0	/* set to 1 to debug */
 
diff --git a/common/command.c b/common/command.c
index 5cadf732e96e..3bc2038f97f9 100644
--- a/common/command.c
+++ b/common/command.c
@@ -17,6 +17,7 @@
 #include <time.h>
 #include <asm/global_data.h>
 #include <linux/ctype.h>
+#include <linux/string.h>
 
 /*
  * Use puts() instead of printf() to avoid printf buffer overflow
diff --git a/common/common_fit.c b/common/common_fit.c
index a9933081007b..dfb2134fcf11 100644
--- a/common/common_fit.c
+++ b/common/common_fit.c
@@ -9,6 +9,7 @@
 #include <image.h>
 #include <log.h>
 #include <linux/libfdt.h>
+#include <linux/string.h>
 
 ulong fdt_getprop_u32(const void *fdt, int node, const char *prop)
 {
diff --git a/common/console.c b/common/console.c
index 3596f684ac2e..86c42cb8e5b2 100644
--- a/common/console.c
+++ b/common/console.c
@@ -22,6 +22,7 @@
 #include <watchdog.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/common/dlmalloc.c b/common/dlmalloc.c
index cf0270a9c115..dc584f792b3a 100644
--- a/common/dlmalloc.c
+++ b/common/dlmalloc.c
@@ -1,6 +1,7 @@
 #include <common.h>
 #include <log.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 
 #if CONFIG_IS_ENABLED(UNIT_TEST)
 #define DEBUG
diff --git a/common/eeprom/eeprom_layout.c b/common/eeprom/eeprom_layout.c
index 5a9be1da061f..338185d58c36 100644
--- a/common/eeprom/eeprom_layout.c
+++ b/common/eeprom/eeprom_layout.c
@@ -10,6 +10,7 @@
 #include <linux/kernel.h>
 #include <eeprom_layout.h>
 #include <eeprom_field.h>
+#include <linux/string.h>
 
 #define NO_LAYOUT_FIELDS	"Unknown layout. Dumping raw data\n"
 
diff --git a/common/fdt_region.c b/common/fdt_region.c
index ff12c518e97a..66b47c13bdc9 100644
--- a/common/fdt_region.c
+++ b/common/fdt_region.c
@@ -12,6 +12,7 @@
 #ifndef USE_HOSTCC
 #include <fdt.h>
 #include <linux/libfdt.h>
+#include <linux/string.h>
 #else
 #include "fdt_host.h"
 #endif
diff --git a/common/fdt_support.c b/common/fdt_support.c
index a565b470f81e..9b685cc1736a 100644
--- a/common/fdt_support.c
+++ b/common/fdt_support.c
@@ -13,6 +13,7 @@
 #include <net.h>
 #include <stdio_dev.h>
 #include <linux/ctype.h>
+#include <linux/string.h>
 #include <linux/types.h>
 #include <asm/global_data.h>
 #include <linux/libfdt.h>
diff --git a/common/flash.c b/common/flash.c
index bb82385c1f74..62f4c98749ae 100644
--- a/common/flash.c
+++ b/common/flash.c
@@ -10,6 +10,7 @@
 #include <flash.h>
 #include <log.h>
 #include <uuid.h>
+#include <linux/string.h>
 
 #include <mtd/cfi_flash.h>
 
diff --git a/common/hash.c b/common/hash.c
index fc64002f736a..e1be8dc05f9d 100644
--- a/common/hash.c
+++ b/common/hash.c
@@ -21,6 +21,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/errno.h>
+#include <linux/string.h>
 #include <u-boot/crc.h>
 #else
 #include "mkimage.h"
diff --git a/common/image-android.c b/common/image-android.c
index d07b0e0f09b4..7f76be86790c 100644
--- a/common/image-android.c
+++ b/common/image-android.c
@@ -13,6 +13,7 @@
 #include <asm/unaligned.h>
 #include <mapmem.h>
 #include <linux/libfdt.h>
+#include <linux/string.h>
 
 #define ANDROID_IMAGE_DEFAULT_KERNEL_ADDR	0x10008000
 
diff --git a/common/image-cipher.c b/common/image-cipher.c
index 09d8512f8e59..c611eb52948f 100644
--- a/common/image-cipher.c
+++ b/common/image-cipher.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <malloc.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 DECLARE_GLOBAL_DATA_PTR;
 #endif /* !USE_HOSdTCC*/
 #include <image.h>
diff --git a/common/image-fdt.c b/common/image-fdt.c
index cb7b7c3ef2c3..41fce043f544 100644
--- a/common/image-fdt.c
+++ b/common/image-fdt.c
@@ -21,6 +21,7 @@
 #include <linux/libfdt.h>
 #include <mapmem.h>
 #include <asm/io.h>
+#include <linux/string.h>
 #include <tee/optee.h>
 
 #ifndef CONFIG_SYS_FDT_PAD
diff --git a/common/image-fit-sig.c b/common/image-fit-sig.c
index 11fbdb0fb4f3..0c36649dce0b 100644
--- a/common/image-fit-sig.c
+++ b/common/image-fit-sig.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 DECLARE_GLOBAL_DATA_PTR;
 #endif /* !USE_HOSTCC*/
 #include <fdt_region.h>
diff --git a/common/image-fit.c b/common/image-fit.c
index 973a37969f68..5d5dd7dc40a4 100644
--- a/common/image-fit.c
+++ b/common/image-fit.c
@@ -23,6 +23,7 @@
 #include <asm/io.h>
 #include <malloc.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 DECLARE_GLOBAL_DATA_PTR;
 #endif /* !USE_HOSTCC*/
 
diff --git a/common/image-sig.c b/common/image-sig.c
index 4abd3c080f78..6cb5bedc8a95 100644
--- a/common/image-sig.c
+++ b/common/image-sig.c
@@ -13,6 +13,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 DECLARE_GLOBAL_DATA_PTR;
 #endif /* !USE_HOSTCC*/
 #include <image.h>
diff --git a/common/image.c b/common/image.c
index d8db73c82ba5..ab0f0439bad2 100644
--- a/common/image.c
+++ b/common/image.c
@@ -16,6 +16,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <asm/cache.h>
+#include <linux/string.h>
 #include <u-boot/crc.h>
 #include <watchdog.h>
 
diff --git a/common/init/board_init.c b/common/init/board_init.c
index 3f183ee11326..319d59b51641 100644
--- a/common/init/board_init.c
+++ b/common/init/board_init.c
@@ -10,6 +10,7 @@
 #include <bootstage.h>
 #include <init.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/common/iomux.c b/common/iomux.c
index 7cfd9f2e9162..d552e0ee61ac 100644
--- a/common/iomux.c
+++ b/common/iomux.c
@@ -8,6 +8,7 @@
 #include <console.h>
 #include <serial.h>
 #include <malloc.h>
+#include <linux/string.h>
 
 #if CONFIG_IS_ENABLED(CONSOLE_MUX)
 void iomux_printdevs(const int console)
diff --git a/common/kallsyms.c b/common/kallsyms.c
index ce42a932bb85..b8e64c5b6334 100644
--- a/common/kallsyms.c
+++ b/common/kallsyms.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <linux/string.h>
 
 /* We need the weak marking as this symbol is provided specially */
 extern const char system_map[] __attribute__((weak));
diff --git a/common/kgdb.c b/common/kgdb.c
index 4493a1591986..2f3bb7f6142d 100644
--- a/common/kgdb.c
+++ b/common/kgdb.c
@@ -89,6 +89,7 @@
 
 #include <common.h>
 #include <asm/ptrace.h>
+#include <linux/string.h>
 
 #include <kgdb.h>
 #include <command.h>
diff --git a/common/lcd.c b/common/lcd.c
index ab5614ad0e3d..04736d6c9805 100644
--- a/common/lcd.c
+++ b/common/lcd.c
@@ -16,6 +16,7 @@
 #include <asm/cache.h>
 #include <init.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 #include <linux/types.h>
 #include <stdio_dev.h>
 #include <lcd.h>
diff --git a/common/lcd_console.c b/common/lcd_console.c
index 1a246c492cec..7a10a20d7244 100644
--- a/common/lcd_console.c
+++ b/common/lcd_console.c
@@ -15,6 +15,7 @@
 #if defined(CONFIG_LCD_LOGO)
 #include <bmp_logo.h>
 #endif
+#include <linux/string.h>
 
 static struct console_t cons;
 
diff --git a/common/log.c b/common/log.c
index f40513dc5322..0eeee6a66b0a 100644
--- a/common/log.c
+++ b/common/log.c
@@ -11,6 +11,7 @@
 #include <malloc.h>
 #include <asm/global_data.h>
 #include <dm/uclass.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/common/log_syslog.c b/common/log_syslog.c
index 2477a6995d3e..2f3c93bf8393 100644
--- a/common/log_syslog.c
+++ b/common/log_syslog.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <net.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/common/malloc_simple.c b/common/malloc_simple.c
index 0267fb6bec87..805b044515fc 100644
--- a/common/malloc_simple.c
+++ b/common/malloc_simple.c
@@ -13,6 +13,7 @@
 #include <mapmem.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/common/menu.c b/common/menu.c
index 5fb2ffbd065d..0d08321e0e7f 100644
--- a/common/menu.c
+++ b/common/menu.c
@@ -9,6 +9,7 @@
 #include <malloc.h>
 #include <errno.h>
 #include <linux/list.h>
+#include <linux/string.h>
 
 #include "menu.h"
 
diff --git a/common/miiphyutil.c b/common/miiphyutil.c
index 7d4d15ed9189..fa273f1c2017 100644
--- a/common/miiphyutil.c
+++ b/common/miiphyutil.c
@@ -15,6 +15,7 @@
 #include <miiphy.h>
 #include <phy.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include <asm/types.h>
 #include <linux/list.h>
diff --git a/common/spl/spl.c b/common/spl/spl.c
index fd050cc63103..bea542ed2e35 100644
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -22,6 +22,7 @@
 #include <asm/u-boot.h>
 #include <nand.h>
 #include <fat.h>
+#include <linux/string.h>
 #include <u-boot/crc.h>
 #include <version.h>
 #include <image.h>
diff --git a/common/spl/spl_atf.c b/common/spl/spl_atf.c
index b54b4f0d22e2..6c3e839e8558 100644
--- a/common/spl/spl_atf.c
+++ b/common/spl/spl_atf.c
@@ -17,6 +17,7 @@
 #include <log.h>
 #include <spl.h>
 #include <asm/cache.h>
+#include <linux/string.h>
 
 static struct bl2_to_bl31_params_mem bl31_params_mem;
 static struct bl31_params *bl2_to_bl31_params;
diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c
index da6e021e1bf7..5da3fceb0de6 100644
--- a/common/spl/spl_fit.c
+++ b/common/spl/spl_fit.c
@@ -17,6 +17,7 @@
 #include <asm/global_data.h>
 #include <linux/libfdt.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/common/spl/spl_net.c b/common/spl/spl_net.c
index e140a6306fff..6ac8b65eebd0 100644
--- a/common/spl/spl_net.c
+++ b/common/spl/spl_net.c
@@ -14,6 +14,7 @@
 #include <spl.h>
 #include <net.h>
 #include <linux/libfdt.h>
+#include <linux/string.h>
 
 #if defined(CONFIG_SPL_ETH_SUPPORT) || defined(CONFIG_SPL_USB_ETHER)
 static ulong spl_net_load_read(struct spl_load_info *load, ulong sector,
diff --git a/common/spl/spl_nor.c b/common/spl/spl_nor.c
index 5270401db034..a1966cbad85f 100644
--- a/common/spl/spl_nor.c
+++ b/common/spl/spl_nor.c
@@ -7,6 +7,7 @@
 #include <image.h>
 #include <log.h>
 #include <spl.h>
+#include <linux/string.h>
 
 static ulong spl_nor_load_read(struct spl_load_info *load, ulong sector,
 			       ulong count, void *buf)
diff --git a/common/spl/spl_ram.c b/common/spl/spl_ram.c
index df1d5b43d8b5..7ea0a32b0d72 100644
--- a/common/spl/spl_ram.c
+++ b/common/spl/spl_ram.c
@@ -16,6 +16,7 @@
 #include <mapmem.h>
 #include <spl.h>
 #include <linux/libfdt.h>
+#include <linux/string.h>
 
 #ifndef CONFIG_SPL_LOAD_FIT_ADDRESS
 # define CONFIG_SPL_LOAD_FIT_ADDRESS	0
diff --git a/common/spl/spl_ubi.c b/common/spl/spl_ubi.c
index de6a63bd2d45..6a3679300d7e 100644
--- a/common/spl/spl_ubi.c
+++ b/common/spl/spl_ubi.c
@@ -11,6 +11,7 @@
 #include <onenand_uboot.h>
 #include <ubispl.h>
 #include <spl.h>
+#include <linux/string.h>
 
 int spl_ubi_load_image(struct spl_image_info *spl_image,
 		       struct spl_boot_device *bootdev)
diff --git a/common/spl/spl_ymodem.c b/common/spl/spl_ymodem.c
index 284512478f1b..c1958613299c 100644
--- a/common/spl/spl_ymodem.c
+++ b/common/spl/spl_ymodem.c
@@ -16,6 +16,7 @@
 #include <xyzModem.h>
 #include <asm/u-boot.h>
 #include <linux/libfdt.h>
+#include <linux/string.h>
 
 #define BUF_SIZE 1024
 
diff --git a/common/splash.c b/common/splash.c
index e26b366cb238..31bbbc2f531c 100644
--- a/common/splash.c
+++ b/common/splash.c
@@ -25,6 +25,7 @@
 #include <env.h>
 #include <splash.h>
 #include <lcd.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 2737fc6e7ffa..12ea112a9d48 100644
--- a/common/splash_source.c
+++ b/common/splash_source.c
@@ -21,6 +21,7 @@
 #include <splash.h>
 #include <usb.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/common/stdio.c b/common/stdio.c
index 1c6ad6861060..411796138f7f 100644
--- a/common/stdio.c
+++ b/common/stdio.c
@@ -19,6 +19,7 @@
 #include <serial.h>
 #include <splash.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 
 #if defined(CONFIG_SYS_I2C)
 #include <i2c.h>
diff --git a/common/update.c b/common/update.c
index 5875524d59be..8851943b15cd 100644
--- a/common/update.c
+++ b/common/update.c
@@ -10,6 +10,7 @@
 #include <cpu_func.h>
 #include <image.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #if !(defined(CONFIG_FIT) && defined(CONFIG_OF_LIBFDT))
 #error "CONFIG_FIT and CONFIG_OF_LIBFDT are required for auto-update feature"
diff --git a/common/usb.c b/common/usb.c
index aad13fd9c557..7dd34df3cd64 100644
--- a/common/usb.c
+++ b/common/usb.c
@@ -39,6 +39,7 @@
 #include <errno.h>
 #include <usb.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #define USB_BUFSIZ	512
 
diff --git a/common/usb_hub.c b/common/usb_hub.c
index af088bd72896..1eee9401dc35 100644
--- a/common/usb_hub.c
+++ b/common/usb_hub.c
@@ -40,6 +40,7 @@
 #include <asm/state.h>
 #endif
 #include <asm/unaligned.h>
+#include <linux/string.h>
 
 #include <usb.h>
 
diff --git a/common/usb_kbd.c b/common/usb_kbd.c
index 3a81a3059956..0fb955c14b6a 100644
--- a/common/usb_kbd.c
+++ b/common/usb_kbd.c
@@ -18,6 +18,7 @@
 #include <time.h>
 #include <watchdog.h>
 #include <asm/byteorder.h>
+#include <linux/string.h>
 
 #include <usb.h>
 
diff --git a/common/usb_storage.c b/common/usb_storage.c
index ff254419951f..492a9374ad24 100644
--- a/common/usb_storage.c
+++ b/common/usb_storage.c
@@ -46,6 +46,7 @@
 #include <dm/device-internal.h>
 #include <dm/lists.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include <part.h>
 #include <usb.h>
diff --git a/disk/part.c b/disk/part.c
index b69fd345f360..45d629508c24 100644
--- a/disk/part.c
+++ b/disk/part.c
@@ -14,6 +14,7 @@
 #include <malloc.h>
 #include <part.h>
 #include <ubifs_uboot.h>
+#include <linux/string.h>
 
 #undef	PART_DEBUG
 
diff --git a/disk/part_amiga.c b/disk/part_amiga.c
index 7eea60b564de..17c595a0a7bd 100644
--- a/disk/part_amiga.c
+++ b/disk/part_amiga.c
@@ -8,6 +8,7 @@
 #include <command.h>
 #include <env.h>
 #include <ide.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 04f53106f7ce..8eaa85e6b299 100644
--- a/disk/part_dos.c
+++ b/disk/part_dos.c
@@ -18,6 +18,7 @@
 #include <command.h>
 #include <ide.h>
 #include <memalign.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 c0def902feca..b995efc732de 100644
--- a/disk/part_efi.c
+++ b/disk/part_efi.c
@@ -26,6 +26,7 @@
 #include <linux/compiler.h>
 #include <linux/ctype.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include <u-boot/crc.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/disk/part_iso.c b/disk/part_iso.c
index 822f2c4d9f40..a7d63d64e90b 100644
--- a/disk/part_iso.c
+++ b/disk/part_iso.c
@@ -10,6 +10,7 @@
 #include <part.h>
 #include <asm/cache.h>
 #include <asm/unaligned.h>
+#include <linux/string.h>
 #include "part_iso.h"
 
 #ifdef CONFIG_HAVE_BLOCK_DEVICE
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index f251ee1b74a0..271c2ddf4a87 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -15,6 +15,7 @@
 #include <time.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include <command.h>
 #include <dm.h>
diff --git a/drivers/ata/dwc_ahsata.c b/drivers/ata/dwc_ahsata.c
index 562e982e32a6..1ecae1d1c952 100644
--- a/drivers/ata/dwc_ahsata.c
+++ b/drivers/ata/dwc_ahsata.c
@@ -26,6 +26,7 @@
 #include <linux/ctype.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/string.h>
 #include "dwc_ahsata_priv.h"
 
 struct sata_port_regs {
diff --git a/drivers/ata/fsl_sata.c b/drivers/ata/fsl_sata.c
index 8c6726a62146..d2f802aff86b 100644
--- a/drivers/ata/fsl_sata.c
+++ b/drivers/ata/fsl_sata.c
@@ -19,6 +19,7 @@
 #include <fis.h>
 #include <sata.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include "fsl_sata.h"
 
 #if CONFIG_IS_ENABLED(BLK)
diff --git a/drivers/ata/libata.c b/drivers/ata/libata.c
index 47e2c5c1cc40..cdc83c75bb69 100644
--- a/drivers/ata/libata.c
+++ b/drivers/ata/libata.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <compiler.h>
 #include <libata.h>
+#include <linux/string.h>
 
 u64 ata_id_n_sectors(u16 *id)
 {
diff --git a/drivers/ata/sata.c b/drivers/ata/sata.c
index 6a38d5002455..fa17ee3ab48c 100644
--- a/drivers/ata/sata.c
+++ b/drivers/ata/sata.c
@@ -15,6 +15,7 @@
 #include <dm.h>
 #include <part.h>
 #include <sata.h>
+#include <linux/string.h>
 
 #ifndef CONFIG_AHCI
 struct blk_desc sata_dev_desc[CONFIG_SYS_SATA_MAX_DEVICE];
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index 8071fe18a714..9554aeb137d0 100644
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -51,6 +51,7 @@
 #include <linux/errno.h>
 #include <asm/io.h>
 #include <linux/mbus.h>
+#include <linux/string.h>
 
 #include <asm/arch/soc.h>
 #if defined(CONFIG_ARCH_KIRKWOOD)
diff --git a/drivers/ata/sata_sil.c b/drivers/ata/sata_sil.c
index d5ba94c17253..c34af206669c 100644
--- a/drivers/ata/sata_sil.c
+++ b/drivers/ata/sata_sil.c
@@ -18,6 +18,7 @@
 #include <libata.h>
 #include <sata.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #if CONFIG_IS_ENABLED(BLK)
 #include <dm.h>
diff --git a/drivers/bios_emulator/atibios.c b/drivers/bios_emulator/atibios.c
index 6c7cc24cbd92..3d1b22f1f54f 100644
--- a/drivers/bios_emulator/atibios.c
+++ b/drivers/bios_emulator/atibios.c
@@ -53,6 +53,7 @@
 #include <malloc.h>
 #include <vbe.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include "biosemui.h"
 
 /* Length of the BIOS image */
diff --git a/drivers/bios_emulator/biosemu.c b/drivers/bios_emulator/biosemu.c
index 9d4f07c074d3..e605238d4391 100644
--- a/drivers/bios_emulator/biosemu.c
+++ b/drivers/bios_emulator/biosemu.c
@@ -47,6 +47,7 @@
 
 #include <malloc.h>
 #include <common.h>
+#include <linux/string.h>
 #include "biosemui.h"
 
 BE_sysEnv _BE_env = {{0}};
diff --git a/drivers/bios_emulator/x86emu/debug.c b/drivers/bios_emulator/x86emu/debug.c
index 95f3cc09aad5..1e4b6ba0c6bd 100644
--- a/drivers/bios_emulator/x86emu/debug.c
+++ b/drivers/bios_emulator/x86emu/debug.c
@@ -41,6 +41,7 @@
 #include <common.h>
 #include <linux/ctype.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include "x86emu/x86emui.h"
 
 /*----------------------------- Implementation ----------------------------*/
diff --git a/drivers/block/blk-uclass.c b/drivers/block/blk-uclass.c
index 2fb9f6b765ee..1d90a9349bf5 100644
--- a/drivers/block/blk-uclass.c
+++ b/drivers/block/blk-uclass.c
@@ -14,6 +14,7 @@
 #include <dm/lists.h>
 #include <dm/uclass-internal.h>
 #include <linux/err.h>
+#include <linux/string.h>
 
 static const char *if_typename_str[IF_TYPE_COUNT] = {
 	[IF_TYPE_IDE]		= "ide",
diff --git a/drivers/block/blk_legacy.c b/drivers/block/blk_legacy.c
index e3ee778c29d2..f812169a4f26 100644
--- a/drivers/block/blk_legacy.c
+++ b/drivers/block/blk_legacy.c
@@ -8,6 +8,7 @@
 #include <blk.h>
 #include <part.h>
 #include <linux/err.h>
+#include <linux/string.h>
 
 struct blk_driver *blk_driver_lookup_type(int if_type)
 {
diff --git a/drivers/block/blkcache.c b/drivers/block/blkcache.c
index eca66198edf7..50619dd03a2c 100644
--- a/drivers/block/blkcache.c
+++ b/drivers/block/blkcache.c
@@ -11,6 +11,7 @@
 #include <part.h>
 #include <linux/ctype.h>
 #include <linux/list.h>
+#include <linux/string.h>
 
 #ifdef CONFIG_NEEDS_MANUAL_RELOC
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/block/ide.c b/drivers/block/ide.c
index a766b5cf0366..01bf76d0023b 100644
--- a/drivers/block/ide.c
+++ b/drivers/block/ide.c
@@ -14,6 +14,7 @@
 #include <watchdog.h>
 #include <asm/io.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #ifdef __PPC__
 # define EIEIO		__asm__ volatile ("eieio")
diff --git a/drivers/block/sandbox.c b/drivers/block/sandbox.c
index 11ebdd52d77e..a3b2e77ef301 100644
--- a/drivers/block/sandbox.c
+++ b/drivers/block/sandbox.c
@@ -15,6 +15,7 @@
 #include <dm/device_compat.h>
 #include <linux/errno.h>
 #include <dm/device-internal.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/clk/altera/clk-arria10.c b/drivers/clk/altera/clk-arria10.c
index a2f105a415f8..b05648e8a545 100644
--- a/drivers/clk/altera/clk-arria10.c
+++ b/drivers/clk/altera/clk-arria10.c
@@ -14,6 +14,7 @@
 #include <dm/lists.h>
 #include <dm/util.h>
 #include <linux/bitops.h>
+#include <linux/string.h>
 
 #include <asm/arch/clock_manager.h>
 
diff --git a/drivers/clk/clk-mux.c b/drivers/clk/clk-mux.c
index 8df2a2d01ac6..075d4932a9c4 100644
--- a/drivers/clk/clk-mux.c
+++ b/drivers/clk/clk-mux.c
@@ -31,6 +31,7 @@
 #include <linux/clk-provider.h>
 #include <clk.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include "clk.h"
 #include <linux/err.h>
 
diff --git a/drivers/clk/clk_stm32f.c b/drivers/clk/clk_stm32f.c
index cc48905df542..45f5f567f8d5 100644
--- a/drivers/clk/clk_stm32f.c
+++ b/drivers/clk/clk_stm32f.c
@@ -11,6 +11,7 @@
 #include <stm32_rcc.h>
 #include <linux/bitops.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #include <asm/io.h>
 #include <asm/arch/stm32.h>
diff --git a/drivers/clk/clk_versal.c b/drivers/clk/clk_versal.c
index 6f82b60f04db..7a04d68f8dd5 100644
--- a/drivers/clk/clk_versal.c
+++ b/drivers/clk/clk_versal.c
@@ -18,6 +18,7 @@
 #include <asm/arch/sys_proto.h>
 #include <zynqmp_firmware.h>
 #include <linux/err.h>
+#include <linux/string.h>
 
 #define MAX_PARENT			100
 #define MAX_NODES			6
diff --git a/drivers/clk/mvebu/armada-37xx-periph.c b/drivers/clk/mvebu/armada-37xx-periph.c
index 223da22c1b63..30710040ff9b 100644
--- a/drivers/clk/mvebu/armada-37xx-periph.c
+++ b/drivers/clk/mvebu/armada-37xx-periph.c
@@ -17,6 +17,7 @@
 #include <asm/arch/cpu.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
+#include <linux/string.h>
 
 #define TBG_SEL		0x0
 #define DIV_SEL0	0x4
diff --git a/drivers/clk/renesas/clk-rcar-gen2.c b/drivers/clk/renesas/clk-rcar-gen2.c
index b423c9414b2e..cbf2ffe6e853 100644
--- a/drivers/clk/renesas/clk-rcar-gen2.c
+++ b/drivers/clk/renesas/clk-rcar-gen2.c
@@ -17,6 +17,7 @@
 #include <log.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <linux/string.h>
 
 #include <dt-bindings/clock/renesas-cpg-mssr.h>
 
diff --git a/drivers/clk/rockchip/clk_rk322x.c b/drivers/clk/rockchip/clk_rk322x.c
index 054b2fd349b3..b63fb9b3cca9 100644
--- a/drivers/clk/rockchip/clk_rk322x.c
+++ b/drivers/clk/rockchip/clk_rk322x.c
@@ -19,6 +19,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/log2.h>
+#include <linux/string.h>
 #include <linux/stringify.h>
 
 enum {
diff --git a/drivers/clk/rockchip/clk_rk3288.c b/drivers/clk/rockchip/clk_rk3288.c
index be1f646c070e..a3c5bbf1f6b2 100644
--- a/drivers/clk/rockchip/clk_rk3288.c
+++ b/drivers/clk/rockchip/clk_rk3288.c
@@ -28,6 +28,7 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/log2.h>
+#include <linux/string.h>
 #include <linux/stringify.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/clk/rockchip/clk_rk3328.c b/drivers/clk/rockchip/clk_rk3328.c
index bf4f1069ea6d..e04042f0bd90 100644
--- a/drivers/clk/rockchip/clk_rk3328.c
+++ b/drivers/clk/rockchip/clk_rk3328.c
@@ -20,6 +20,7 @@
 #include <dt-bindings/clock/rk3328-cru.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 struct pll_div {
 	u32 refdiv;
diff --git a/drivers/clk/rockchip/clk_rk3368.c b/drivers/clk/rockchip/clk_rk3368.c
index b87be9a03411..586639344d09 100644
--- a/drivers/clk/rockchip/clk_rk3368.c
+++ b/drivers/clk/rockchip/clk_rk3368.c
@@ -23,6 +23,7 @@
 #include <dt-bindings/clock/rk3368-cru.h>
 #include <linux/delay.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include <linux/stringify.h>
 
 #if CONFIG_IS_ENABLED(OF_PLATDATA)
diff --git a/drivers/clk/rockchip/clk_rk3399.c b/drivers/clk/rockchip/clk_rk3399.c
index e3d1438d54fc..c2eaf67f58f7 100644
--- a/drivers/clk/rockchip/clk_rk3399.c
+++ b/drivers/clk/rockchip/clk_rk3399.c
@@ -23,6 +23,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #if CONFIG_IS_ENABLED(OF_PLATDATA)
 struct rk3399_clk_plat {
diff --git a/drivers/clk/sifive/fu540-prci.c b/drivers/clk/sifive/fu540-prci.c
index c5148e9a37e5..c8f73a1fa269 100644
--- a/drivers/clk/sifive/fu540-prci.c
+++ b/drivers/clk/sifive/fu540-prci.c
@@ -41,6 +41,7 @@
 #include <dm/uclass.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/string.h>
 
 #include <linux/math64.h>
 #include <linux/clk/analogbits-wrpll-cln28hpc.h>
diff --git a/drivers/core/acpi.c b/drivers/core/acpi.c
index 99c0da500eb2..a28b56a73339 100644
--- a/drivers/core/acpi.c
+++ b/drivers/core/acpi.c
@@ -17,6 +17,7 @@
 #include <dm/acpi.h>
 #include <dm/device-internal.h>
 #include <dm/root.h>
+#include <linux/string.h>
 
 #define MAX_ACPI_ITEMS	100
 
diff --git a/drivers/core/device.c b/drivers/core/device.c
index dd0874e762d7..29b71e240551 100644
--- a/drivers/core/device.c
+++ b/drivers/core/device.c
@@ -32,6 +32,7 @@
 #include <linux/list.h>
 #include <power-domain.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/core/lists.c b/drivers/core/lists.c
index 5beba9181cc3..86a99abfaae3 100644
--- a/drivers/core/lists.c
+++ b/drivers/core/lists.c
@@ -19,6 +19,7 @@
 #include <dm/util.h>
 #include <fdtdec.h>
 #include <linux/compiler.h>
+#include <linux/string.h>
 
 struct driver *lists_driver_lookup_name(const char *name)
 {
diff --git a/drivers/core/of_access.c b/drivers/core/of_access.c
index c23763726bba..26f240b022c4 100644
--- a/drivers/core/of_access.c
+++ b/drivers/core/of_access.c
@@ -29,6 +29,7 @@
 #include <linux/ctype.h>
 #include <linux/err.h>
 #include <linux/ioport.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/core/of_addr.c b/drivers/core/of_addr.c
index 3a67d9bc760c..6316b6515349 100644
--- a/drivers/core/of_addr.c
+++ b/drivers/core/of_addr.c
@@ -15,6 +15,7 @@
 #include <linux/err.h>
 #include <linux/ioport.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 /* Max address size we deal with */
 #define OF_MAX_ADDR_CELLS	4
diff --git a/drivers/core/of_extra.c b/drivers/core/of_extra.c
index 6420e6ec4480..f6597c273507 100644
--- a/drivers/core/of_extra.c
+++ b/drivers/core/of_extra.c
@@ -10,6 +10,7 @@
 #include <dm/of_access.h>
 #include <dm/of_extra.h>
 #include <dm/ofnode.h>
+#include <linux/string.h>
 
 int ofnode_read_fmap_entry(ofnode node, struct fmap_entry *entry)
 {
diff --git a/drivers/core/ofnode.c b/drivers/core/ofnode.c
index a49a54c60f98..31c1d67fe2c0 100644
--- a/drivers/core/ofnode.c
+++ b/drivers/core/ofnode.c
@@ -17,6 +17,7 @@
 #include <dm/ofnode.h>
 #include <linux/err.h>
 #include <linux/ioport.h>
+#include <linux/string.h>
 
 int ofnode_read_u32(ofnode node, const char *propname, u32 *outp)
 {
diff --git a/drivers/core/uclass.c b/drivers/core/uclass.c
index 95c37db5ad0b..98fdb014222b 100644
--- a/drivers/core/uclass.c
+++ b/drivers/core/uclass.c
@@ -20,6 +20,7 @@
 #include <dm/uclass.h>
 #include <dm/uclass-internal.h>
 #include <dm/util.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/cpu/cpu-uclass.c b/drivers/cpu/cpu-uclass.c
index 37e3cf2d8ff0..58c8f833c6fa 100644
--- a/drivers/cpu/cpu-uclass.c
+++ b/drivers/cpu/cpu-uclass.c
@@ -12,6 +12,7 @@
 #include <dm/lists.h>
 #include <dm/root.h>
 #include <linux/err.h>
+#include <linux/string.h>
 
 int cpu_probe_all(void)
 {
diff --git a/drivers/cpu/cpu_sandbox.c b/drivers/cpu/cpu_sandbox.c
index caa26e50f281..7c5ccaa0d00a 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 <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 aca14157ad55..21ccc1ce31d9 100644
--- a/drivers/cpu/imx8_cpu.c
+++ b/drivers/cpu/imx8_cpu.c
@@ -14,6 +14,7 @@
 #include <asm/arch-imx/cpu.h>
 #include <asm/armv8/cpu.h>
 #include <linux/bitops.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/cpu/riscv_cpu.c b/drivers/cpu/riscv_cpu.c
index 3c7395a9f207..fcf487d73d06 100644
--- a/drivers/cpu/riscv_cpu.c
+++ b/drivers/cpu/riscv_cpu.c
@@ -15,6 +15,7 @@
 #include <dm/lists.h>
 #include <linux/bitops.h>
 #include <linux/err.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/crypto/ace_sha.c b/drivers/crypto/ace_sha.c
index 261d3efe84e5..0b07ae5fd713 100644
--- a/drivers/crypto/ace_sha.c
+++ b/drivers/crypto/ace_sha.c
@@ -4,6 +4,7 @@
  * Copyright (c) 2012  Samsung Electronics
  */
 #include <common.h>
+#include <linux/string.h>
 #include "ace_sha.h"
 #include <log.h>
 #include <rand.h>
diff --git a/drivers/crypto/fsl/desc_constr.h b/drivers/crypto/fsl/desc_constr.h
index b82ba83e73ac..ef4cd525e3ae 100644
--- a/drivers/crypto/fsl/desc_constr.h
+++ b/drivers/crypto/fsl/desc_constr.h
@@ -8,6 +8,7 @@
  */
 
 #include <linux/compat.h>
+#include <linux/string.h>
 #include "desc.h"
 
 #define IMMEDIATE (1 << 23)
diff --git a/drivers/crypto/fsl/error.c b/drivers/crypto/fsl/error.c
index c76574919c74..d19685b0ec4c 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 <linux/string.h>
 #include "desc.h"
 #include "jr.h"
 
diff --git a/drivers/crypto/fsl/fsl_hash.c b/drivers/crypto/fsl/fsl_hash.c
index 61f953e8a6da..5182f21acb24 100644
--- a/drivers/crypto/fsl/fsl_hash.c
+++ b/drivers/crypto/fsl/fsl_hash.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <memalign.h>
+#include <linux/string.h>
 #include "jobdesc.h"
 #include "desc.h"
 #include "jr.h"
diff --git a/drivers/crypto/fsl/jobdesc.c b/drivers/crypto/fsl/jobdesc.c
index fbc1aeddeeb4..17777e5551db 100644
--- a/drivers/crypto/fsl/jobdesc.c
+++ b/drivers/crypto/fsl/jobdesc.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <fsl_sec.h>
+#include <linux/string.h>
 #include "desc_constr.h"
 #include "jobdesc.h"
 #include "rsa_caam.h"
diff --git a/drivers/crypto/fsl/jr.c b/drivers/crypto/fsl/jr.c
index 44273c345f95..afca79dfc0a2 100644
--- a/drivers/crypto/fsl/jr.c
+++ b/drivers/crypto/fsl/jr.c
@@ -10,6 +10,7 @@
 #include <linux/kernel.h>
 #include <log.h>
 #include <malloc.h>
+#include <linux/string.h>
 #include "fsl_sec.h"
 #include "jr.h"
 #include "jobdesc.h"
diff --git a/drivers/crypto/fsl/rng.c b/drivers/crypto/fsl/rng.c
index 3c0c2b067f35..e4a952caeec5 100644
--- a/drivers/crypto/fsl/rng.c
+++ b/drivers/crypto/fsl/rng.c
@@ -12,6 +12,7 @@
 #include <dm.h>
 #include <rng.h>
 #include <linux/kernel.h>
+#include <linux/string.h>
 #include "desc_constr.h"
 #include "jobdesc.h"
 #include "jr.h"
diff --git a/drivers/ddr/altera/sdram_arria10.c b/drivers/ddr/altera/sdram_arria10.c
index 4a8f8dea1c4d..b2053bf412ca 100644
--- a/drivers/ddr/altera/sdram_arria10.c
+++ b/drivers/ddr/altera/sdram_arria10.c
@@ -22,6 +22,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/ddr/altera/sdram_gen5.c b/drivers/ddr/altera/sdram_gen5.c
index 1360bd0a3b82..52cde7d409b8 100644
--- a/drivers/ddr/altera/sdram_gen5.c
+++ b/drivers/ddr/altera/sdram_gen5.c
@@ -18,6 +18,7 @@
 #include <asm/bitops.h>
 #include <asm/io.h>
 #include <dm/device_compat.h>
+#include <linux/string.h>
 
 #include "sequencer.h"
 
diff --git a/drivers/ddr/altera/sdram_soc64.c b/drivers/ddr/altera/sdram_soc64.c
index 66dad034fa29..1312244ae52f 100644
--- a/drivers/ddr/altera/sdram_soc64.c
+++ b/drivers/ddr/altera/sdram_soc64.c
@@ -17,6 +17,7 @@
 #include <reset.h>
 #include <time.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 #include "sdram_soc64.h"
 #include <wait_bit.h>
 #include <asm/arch/firewall.h>
diff --git a/drivers/ddr/altera/sequencer.c b/drivers/ddr/altera/sequencer.c
index 2dbde49a9c3b..7c54f0018251 100644
--- a/drivers/ddr/altera/sequencer.c
+++ b/drivers/ddr/altera/sequencer.c
@@ -9,6 +9,7 @@
 #include <asm/arch/sdram.h>
 #include <errno.h>
 #include <hang.h>
+#include <linux/string.h>
 #include "sequencer.h"
 
 static const struct socfpga_sdr_rw_load_manager *sdr_rw_load_mgr_regs =
diff --git a/drivers/ddr/fsl/ctrl_regs.c b/drivers/ddr/fsl/ctrl_regs.c
index c849ef3a4c7e..247587c646b6 100644
--- a/drivers/ddr/fsl/ctrl_regs.c
+++ b/drivers/ddr/fsl/ctrl_regs.c
@@ -22,6 +22,7 @@
 	defined(CONFIG_ARM)
 #include <asm/arch/clock.h>
 #endif
+#include <linux/string.h>
 
 /*
  * Determine Rtt value.
diff --git a/drivers/ddr/fsl/ddr1_dimm_params.c b/drivers/ddr/fsl/ddr1_dimm_params.c
index e5481eaa0ddd..2ccf1e82f9a6 100644
--- a/drivers/ddr/fsl/ddr1_dimm_params.c
+++ b/drivers/ddr/fsl/ddr1_dimm_params.c
@@ -7,6 +7,7 @@
 #include <fsl_ddr_sdram.h>
 #include <log.h>
 #include <asm/bitops.h>
+#include <linux/string.h>
 
 #include <fsl_ddr.h>
 
diff --git a/drivers/ddr/fsl/ddr2_dimm_params.c b/drivers/ddr/fsl/ddr2_dimm_params.c
index 3b78118a9d82..9ee2dfc24554 100644
--- a/drivers/ddr/fsl/ddr2_dimm_params.c
+++ b/drivers/ddr/fsl/ddr2_dimm_params.c
@@ -7,6 +7,7 @@
 #include <fsl_ddr_sdram.h>
 #include <log.h>
 #include <asm/bitops.h>
+#include <linux/string.h>
 
 #include <fsl_ddr.h>
 /*
diff --git a/drivers/ddr/fsl/ddr3_dimm_params.c b/drivers/ddr/fsl/ddr3_dimm_params.c
index 8464438c544f..d0625ea0e1bf 100644
--- a/drivers/ddr/fsl/ddr3_dimm_params.c
+++ b/drivers/ddr/fsl/ddr3_dimm_params.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <fsl_ddr_sdram.h>
 #include <log.h>
+#include <linux/string.h>
 
 #include <fsl_ddr.h>
 
diff --git a/drivers/ddr/fsl/ddr4_dimm_params.c b/drivers/ddr/fsl/ddr4_dimm_params.c
index e2bdc12ef2c4..37e43dc8f172 100644
--- a/drivers/ddr/fsl/ddr4_dimm_params.c
+++ b/drivers/ddr/fsl/ddr4_dimm_params.c
@@ -14,6 +14,7 @@
 #include <fsl_ddr_sdram.h>
 #include <log.h>
 #include <linux/bug.h>
+#include <linux/string.h>
 
 #include <fsl_ddr.h>
 
diff --git a/drivers/ddr/fsl/interactive.c b/drivers/ddr/fsl/interactive.c
index 2f76beb2dbe6..3736ea129a77 100644
--- a/drivers/ddr/fsl/interactive.c
+++ b/drivers/ddr/fsl/interactive.c
@@ -20,6 +20,7 @@
 #include <linux/ctype.h>
 #include <asm/types.h>
 #include <asm/io.h>
+#include <linux/string.h>
 
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr.h>
diff --git a/drivers/ddr/fsl/main.c b/drivers/ddr/fsl/main.c
index f5299fe31113..5b2ddc3893a9 100644
--- a/drivers/ddr/fsl/main.c
+++ b/drivers/ddr/fsl/main.c
@@ -18,6 +18,7 @@
 #include <init.h>
 #include <log.h>
 #include <asm/bitops.h>
+#include <linux/string.h>
 
 /*
  * CONFIG_SYS_FSL_DDR_SDRAM_BASE_PHY is the physical address from the view
diff --git a/drivers/ddr/marvell/axp/ddr3_hw_training.c b/drivers/ddr/marvell/axp/ddr3_hw_training.c
index 35d98faf58f3..c39f40095fcc 100644
--- a/drivers/ddr/marvell/axp/ddr3_hw_training.c
+++ b/drivers/ddr/marvell/axp/ddr3_hw_training.c
@@ -11,6 +11,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include "ddr3_init.h"
 #include "ddr3_hw_training.h"
diff --git a/drivers/ddr/marvell/axp/ddr3_pbs.c b/drivers/ddr/marvell/axp/ddr3_pbs.c
index 069a42fbf5ed..a963b3c55be2 100644
--- a/drivers/ddr/marvell/axp/ddr3_pbs.c
+++ b/drivers/ddr/marvell/axp/ddr3_pbs.c
@@ -10,6 +10,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include "ddr3_hw_training.h"
 
diff --git a/drivers/ddr/marvell/axp/ddr3_spd.c b/drivers/ddr/marvell/axp/ddr3_spd.c
index e2305d881450..8927abe17ef0 100644
--- a/drivers/ddr/marvell/axp/ddr3_spd.c
+++ b/drivers/ddr/marvell/axp/ddr3_spd.c
@@ -9,6 +9,7 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <linux/string.h>
 
 #include "ddr3_init.h"
 
diff --git a/drivers/ddr/marvell/axp/ddr3_write_leveling.c b/drivers/ddr/marvell/axp/ddr3_write_leveling.c
index d4add4477745..de8dfc299f7e 100644
--- a/drivers/ddr/marvell/axp/ddr3_write_leveling.c
+++ b/drivers/ddr/marvell/axp/ddr3_write_leveling.c
@@ -11,6 +11,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include "ddr3_hw_training.h"
 
diff --git a/drivers/dfu/dfu.c b/drivers/dfu/dfu.c
index 3d5de92ecae0..5dc5f80854e8 100644
--- a/drivers/dfu/dfu.c
+++ b/drivers/dfu/dfu.c
@@ -18,6 +18,7 @@
 #include <linux/list.h>
 #include <linux/compiler.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 static LIST_HEAD(dfu_list);
 static int dfu_alt_num;
diff --git a/drivers/dfu/dfu_mmc.c b/drivers/dfu/dfu_mmc.c
index ac5ea2c7d79c..0fd69d0d1e4c 100644
--- a/drivers/dfu/dfu_mmc.c
+++ b/drivers/dfu/dfu_mmc.c
@@ -17,6 +17,7 @@
 #include <mmc.h>
 #include <part.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 static unsigned char *dfu_file_buf;
 static u64 dfu_file_buf_len;
diff --git a/drivers/dfu/dfu_mtd.c b/drivers/dfu/dfu_mtd.c
index 36cd4e945b2a..861a0b370e09 100644
--- a/drivers/dfu/dfu_mtd.c
+++ b/drivers/dfu/dfu_mtd.c
@@ -12,6 +12,7 @@
 #include <mtd.h>
 #include <jffs2/load_kernel.h>
 #include <linux/err.h>
+#include <linux/string.h>
 
 static bool mtd_is_aligned_with_block_size(struct mtd_info *mtd, u64 size)
 {
diff --git a/drivers/dfu/dfu_nand.c b/drivers/dfu/dfu_nand.c
index b8d24d203beb..38f46b2f4129 100644
--- a/drivers/dfu/dfu_nand.c
+++ b/drivers/dfu/dfu_nand.c
@@ -18,6 +18,7 @@
 #include <linux/mtd/mtd.h>
 #include <jffs2/load_kernel.h>
 #include <nand.h>
+#include <linux/string.h>
 
 static int nand_block_op(enum dfu_op op, struct dfu_entity *dfu,
 			u64 offset, void *buf, long *len)
diff --git a/drivers/dfu/dfu_ram.c b/drivers/dfu/dfu_ram.c
index 9b3b71975a19..b2a5b62d425d 100644
--- a/drivers/dfu/dfu_ram.c
+++ b/drivers/dfu/dfu_ram.c
@@ -13,6 +13,7 @@
 #include <errno.h>
 #include <dfu.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 static int dfu_transfer_medium_ram(enum dfu_op op, struct dfu_entity *dfu,
 				   u64 offset, void *buf, long *len)
diff --git a/drivers/dfu/dfu_sf.c b/drivers/dfu/dfu_sf.c
index 318e43c179b2..20e1c2869027 100644
--- a/drivers/dfu/dfu_sf.c
+++ b/drivers/dfu/dfu_sf.c
@@ -13,6 +13,7 @@
 #include <spi_flash.h>
 #include <jffs2/load_kernel.h>
 #include <linux/mtd/mtd.h>
+#include <linux/string.h>
 
 static int dfu_get_medium_size_sf(struct dfu_entity *dfu, u64 *size)
 {
diff --git a/drivers/dfu/dfu_tftp.c b/drivers/dfu/dfu_tftp.c
index 0f2c114668ec..efa25d86f22e 100644
--- a/drivers/dfu/dfu_tftp.c
+++ b/drivers/dfu/dfu_tftp.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <dfu.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 int dfu_tftp_write(char *dfu_entity_name, unsigned int addr, unsigned int len,
 		   char *interface, char *devstring)
diff --git a/drivers/dma/apbh_dma.c b/drivers/dma/apbh_dma.c
index da988f6bb667..a2a76aba84a1 100644
--- a/drivers/dma/apbh_dma.c
+++ b/drivers/dma/apbh_dma.c
@@ -14,6 +14,7 @@
 #include <cpu_func.h>
 #include <asm/cache.h>
 #include <linux/list.h>
+#include <linux/string.h>
 
 #include <common.h>
 #include <malloc.h>
diff --git a/drivers/dma/keystone_nav.c b/drivers/dma/keystone_nav.c
index 443e4b23669a..72b0a7736fcd 100644
--- a/drivers/dma/keystone_nav.c
+++ b/drivers/dma/keystone_nav.c
@@ -9,6 +9,7 @@
 #include <asm/io.h>
 #include <asm/ti-common/keystone_nav.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 struct qm_config qm_memmap = {
 	.stat_cfg	= CONFIG_KSNAV_QM_QUEUE_STATUS_BASE,
diff --git a/drivers/dma/sandbox-dma-test.c b/drivers/dma/sandbox-dma-test.c
index 18e8fe3806c1..f479f2a79e37 100644
--- a/drivers/dma/sandbox-dma-test.c
+++ b/drivers/dma/sandbox-dma-test.c
@@ -16,6 +16,7 @@
 #include <dt-structs.h>
 #include <errno.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #define SANDBOX_DMA_CH_CNT 3
 #define SANDBOX_DMA_BUF_SIZE 1024
diff --git a/drivers/dma/ti-edma3.c b/drivers/dma/ti-edma3.c
index c73ab579cf67..aba4efc15c2e 100644
--- a/drivers/dma/ti-edma3.c
+++ b/drivers/dma/ti-edma3.c
@@ -16,6 +16,7 @@
 #include <asm/omap_common.h>
 #include <asm/ti-common/ti-edma3.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #define EDMA3_SL_BASE(slot)			(0x4000 + ((slot) << 5))
 #define EDMA3_SL_MAX_NUM			512
diff --git a/drivers/dma/ti/k3-udma.c b/drivers/dma/ti/k3-udma.c
index 9de0258ed1da..aa835498d29b 100644
--- a/drivers/dma/ti/k3-udma.c
+++ b/drivers/dma/ti/k3-udma.c
@@ -29,6 +29,7 @@
 #include <linux/soc/ti/cppi5.h>
 #include <linux/soc/ti/ti-udma.h>
 #include <linux/soc/ti/ti_sci_protocol.h>
+#include <linux/string.h>
 
 #include "k3-udma-hwdef.h"
 #include "k3-psil-priv.h"
diff --git a/drivers/fastboot/fb_command.c b/drivers/fastboot/fb_command.c
index 42c8fb83433b..699fc52fc1c3 100644
--- a/drivers/fastboot/fb_command.c
+++ b/drivers/fastboot/fb_command.c
@@ -14,6 +14,7 @@
 #include <part.h>
 #include <stdlib.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 /**
  * image_size - final fastboot image size
diff --git a/drivers/fastboot/fb_common.c b/drivers/fastboot/fb_common.c
index c3735a44af74..3c8338f7c688 100644
--- a/drivers/fastboot/fb_common.c
+++ b/drivers/fastboot/fb_common.c
@@ -14,6 +14,7 @@
 #include <command.h>
 #include <env.h>
 #include <fastboot.h>
+#include <linux/string.h>
 #include <net/fastboot.h>
 
 /**
diff --git a/drivers/fastboot/fb_getvar.c b/drivers/fastboot/fb_getvar.c
index faa785481ade..a7881cc71966 100644
--- a/drivers/fastboot/fb_getvar.c
+++ b/drivers/fastboot/fb_getvar.c
@@ -13,6 +13,7 @@
 #include <part.h>
 #include <version.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 static void getvar_version(char *var_parameter, char *response);
 static void getvar_version_bootloader(char *var_parameter, char *response);
diff --git a/drivers/fastboot/fb_mmc.c b/drivers/fastboot/fb_mmc.c
index d285d0f14fd4..3512e2191f04 100644
--- a/drivers/fastboot/fb_mmc.c
+++ b/drivers/fastboot/fb_mmc.c
@@ -20,6 +20,7 @@
 #include <linux/compat.h>
 #include <android_image.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #define FASTBOOT_MAX_BLK_WRITE 16384
 
diff --git a/drivers/fastboot/fb_nand.c b/drivers/fastboot/fb_nand.c
index 1bf7ccb960b8..c048600d44a7 100644
--- a/drivers/fastboot/fb_nand.c
+++ b/drivers/fastboot/fb_nand.c
@@ -9,6 +9,7 @@
 #include <blk.h>
 #include <flash.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #include <fastboot.h>
 #include <image-sparse.h>
diff --git a/drivers/firmware/psci.c b/drivers/firmware/psci.c
index 7d2e49fd3e3b..cb920139b1c0 100644
--- a/drivers/firmware/psci.c
+++ b/drivers/firmware/psci.c
@@ -19,6 +19,7 @@
 #include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/psci.h>
+#include <linux/string.h>
 
 #define DRIVER_NAME "psci"
 
diff --git a/drivers/firmware/ti_sci.c b/drivers/firmware/ti_sci.c
index 15f5b0b14cce..1a38526d80a8 100644
--- a/drivers/firmware/ti_sci.c
+++ b/drivers/firmware/ti_sci.c
@@ -21,6 +21,7 @@
 #include <linux/err.h>
 #include <linux/soc/ti/k3-sec-proxy.h>
 #include <linux/soc/ti/ti_sci_protocol.h>
+#include <linux/string.h>
 
 #include "ti_sci.h"
 
diff --git a/drivers/fpga/fpga.c b/drivers/fpga/fpga.c
index fe3dfa12335d..4140c8254523 100644
--- a/drivers/fpga/fpga.c
+++ b/drivers/fpga/fpga.c
@@ -12,6 +12,7 @@
 #include <altera.h>             /* altera specific definitions */
 #include <lattice.h>
 #include <dm/device_compat.h>
+#include <linux/string.h>
 
 /* Local definitions */
 #ifndef CONFIG_MAX_FPGA_DEVICES
diff --git a/drivers/fpga/socfpga_arria10.c b/drivers/fpga/socfpga_arria10.c
index e0674b8beba5..de175848e8ba 100644
--- a/drivers/fpga/socfpga_arria10.c
+++ b/drivers/fpga/socfpga_arria10.c
@@ -23,6 +23,7 @@
 #include <watchdog.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #define CFGWDTH_32	1
 #define MIN_BITSTREAM_SIZECHECK	230
diff --git a/drivers/fpga/stratix10.c b/drivers/fpga/stratix10.c
index bae31c3db1ee..84f453f76e0c 100644
--- a/drivers/fpga/stratix10.c
+++ b/drivers/fpga/stratix10.c
@@ -9,6 +9,7 @@
 #include <time.h>
 #include <asm/arch/mailbox_s10.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #define RECONFIG_STATUS_POLL_RESP_TIMEOUT_MS		60000
 #define RECONFIG_STATUS_INTERVAL_DELAY_US		1000000
diff --git a/drivers/fpga/versalpl.c b/drivers/fpga/versalpl.c
index 8e2ef4f0da99..5d67ce215ce5 100644
--- a/drivers/fpga/versalpl.c
+++ b/drivers/fpga/versalpl.c
@@ -12,6 +12,7 @@
 #include <versalpl.h>
 #include <zynqmp_firmware.h>
 #include <asm/cache.h>
+#include <linux/string.h>
 
 static ulong versal_align_dma_buffer(ulong *buf, u32 len)
 {
diff --git a/drivers/fpga/xilinx.c b/drivers/fpga/xilinx.c
index cbebefb55fe4..d9f3b82a40ef 100644
--- a/drivers/fpga/xilinx.c
+++ b/drivers/fpga/xilinx.c
@@ -18,6 +18,7 @@
 #include <spartan2.h>
 #include <spartan3.h>
 #include <zynqpl.h>
+#include <linux/string.h>
 
 /* Local Static Functions */
 static int xilinx_validate(xilinx_desc *desc, char *fn);
diff --git a/drivers/gpio/74x164_gpio.c b/drivers/gpio/74x164_gpio.c
index 045685fcd9c8..6d497613cc4d 100644
--- a/drivers/gpio/74x164_gpio.c
+++ b/drivers/gpio/74x164_gpio.c
@@ -19,6 +19,7 @@
 #include <dm/device_compat.h>
 #include <dt-bindings/gpio/gpio.h>
 #include <spi.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/gpio/adi_gpio2.c b/drivers/gpio/adi_gpio2.c
index d0849c85c3bc..8d4ee813985c 100644
--- a/drivers/gpio/adi_gpio2.c
+++ b/drivers/gpio/adi_gpio2.c
@@ -12,6 +12,7 @@
 #include <linux/bug.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
+#include <linux/string.h>
 
 #define RESOURCE_LABEL_SIZE	16
 
diff --git a/drivers/gpio/axp_gpio.c b/drivers/gpio/axp_gpio.c
index 73058cf40b4b..88993b643e25 100644
--- a/drivers/gpio/axp_gpio.c
+++ b/drivers/gpio/axp_gpio.c
@@ -15,6 +15,7 @@
 #include <dm/lists.h>
 #include <dm/root.h>
 #include <errno.h>
+#include <linux/string.h>
 
 static int axp_gpio_set_value(struct udevice *dev, unsigned pin, int val);
 
diff --git a/drivers/gpio/da8xx_gpio.c b/drivers/gpio/da8xx_gpio.c
index 614c489e45df..0f39972ceeb8 100644
--- a/drivers/gpio/da8xx_gpio.c
+++ b/drivers/gpio/da8xx_gpio.c
@@ -14,6 +14,7 @@
 #include <asm/io.h>
 #include <asm/gpio.h>
 #include <dt-bindings/gpio/gpio.h>
+#include <linux/string.h>
 
 #include "da8xx_gpio.h"
 
diff --git a/drivers/gpio/gpio-uclass.c b/drivers/gpio/gpio-uclass.c
index 36de7bc7cc68..28f4a48900fb 100644
--- a/drivers/gpio/gpio-uclass.c
+++ b/drivers/gpio/gpio-uclass.c
@@ -19,6 +19,7 @@
 #include <dm/device_compat.h>
 #include <linux/bug.h>
 #include <linux/ctype.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/gpio/hi6220_gpio.c b/drivers/gpio/hi6220_gpio.c
index 95de2ae3660d..06151d21fba1 100644
--- a/drivers/gpio/hi6220_gpio.c
+++ b/drivers/gpio/hi6220_gpio.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <errno.h>
 #include <linux/bitops.h>
+#include <linux/string.h>
 
 static int hi6220_gpio_direction_input(struct udevice *dev, unsigned int gpio)
 {
diff --git a/drivers/gpio/imx_rgpio2p.c b/drivers/gpio/imx_rgpio2p.c
index 1e876f691477..8ff37f2ecccf 100644
--- a/drivers/gpio/imx_rgpio2p.c
+++ b/drivers/gpio/imx_rgpio2p.c
@@ -12,6 +12,7 @@
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <malloc.h>
+#include <linux/string.h>
 
 enum imx_rgpio2p_direction {
 	IMX_RGPIO2P_DIRECTION_IN,
diff --git a/drivers/gpio/intel_gpio.c b/drivers/gpio/intel_gpio.c
index 6a3a8c4cfaae..975293ff3ab8 100644
--- a/drivers/gpio/intel_gpio.c
+++ b/drivers/gpio/intel_gpio.c
@@ -22,6 +22,7 @@
 #include <asm/arch/gpio.h>
 #include <dm/acpi.h>
 #include <dt-bindings/gpio/x86-gpio.h>
+#include <linux/string.h>
 
 static int intel_gpio_direction_input(struct udevice *dev, uint offset)
 {
diff --git a/drivers/gpio/lpc32xx_gpio.c b/drivers/gpio/lpc32xx_gpio.c
index 1265ee41a60b..6ccc503e6665 100644
--- a/drivers/gpio/lpc32xx_gpio.c
+++ b/drivers/gpio/lpc32xx_gpio.c
@@ -12,6 +12,7 @@
 #include <asm/arch-lpc32xx/gpio.h>
 #include <asm-generic/gpio.h>
 #include <dm.h>
+#include <linux/string.h>
 
 /**
  * LPC32xx GPIOs work in banks but are non-homogeneous:
diff --git a/drivers/gpio/mpc83xx_spisel_boot.c b/drivers/gpio/mpc83xx_spisel_boot.c
index c7b08404d93b..eac0ff82ae69 100644
--- a/drivers/gpio/mpc83xx_spisel_boot.c
+++ b/drivers/gpio/mpc83xx_spisel_boot.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <mapmem.h>
 #include <asm/gpio.h>
+#include <linux/string.h>
 
 struct mpc83xx_spisel_boot {
 	u32 __iomem *spi_cs;
diff --git a/drivers/gpio/mpc8xxx_gpio.c b/drivers/gpio/mpc8xxx_gpio.c
index 1dfd22522c7d..14ecfb42c589 100644
--- a/drivers/gpio/mpc8xxx_gpio.c
+++ b/drivers/gpio/mpc8xxx_gpio.c
@@ -12,6 +12,7 @@
 #include <dm.h>
 #include <mapmem.h>
 #include <asm/gpio.h>
+#include <linux/string.h>
 
 struct ccsr_gpio {
 	u32	gpdir;
diff --git a/drivers/gpio/mxc_gpio.c b/drivers/gpio/mxc_gpio.c
index 88b920a0746b..6f0692997f64 100644
--- a/drivers/gpio/mxc_gpio.c
+++ b/drivers/gpio/mxc_gpio.c
@@ -15,6 +15,7 @@
 #include <asm/io.h>
 #include <dt-structs.h>
 #include <mapmem.h>
+#include <linux/string.h>
 
 enum mxc_gpio_direction {
 	MXC_GPIO_DIRECTION_IN,
diff --git a/drivers/gpio/mxs_gpio.c b/drivers/gpio/mxs_gpio.c
index 0340786712ee..2a9f64d633c1 100644
--- a/drivers/gpio/mxs_gpio.c
+++ b/drivers/gpio/mxs_gpio.c
@@ -15,6 +15,7 @@
 #include <asm/io.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/imx-regs.h>
+#include <linux/string.h>
 
 #if	defined(CONFIG_MX23)
 #define	PINCTRL_BANKS		3
diff --git a/drivers/gpio/omap_gpio.c b/drivers/gpio/omap_gpio.c
index 4200afba1212..91d664e02ff6 100644
--- a/drivers/gpio/omap_gpio.c
+++ b/drivers/gpio/omap_gpio.c
@@ -25,6 +25,7 @@
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <malloc.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/gpio/pca953x_gpio.c b/drivers/gpio/pca953x_gpio.c
index fd17d1a59102..4ffb3aa27f4d 100644
--- a/drivers/gpio/pca953x_gpio.c
+++ b/drivers/gpio/pca953x_gpio.c
@@ -29,6 +29,7 @@
 #include <dm/device_compat.h>
 #include <dt-bindings/gpio/gpio.h>
 #include <linux/bitops.h>
+#include <linux/string.h>
 
 #define PCA953X_INPUT           0
 #define PCA953X_OUTPUT          1
diff --git a/drivers/gpio/pic32_gpio.c b/drivers/gpio/pic32_gpio.c
index 50c5376e00d1..00f20c0979cc 100644
--- a/drivers/gpio/pic32_gpio.c
+++ b/drivers/gpio/pic32_gpio.c
@@ -13,6 +13,7 @@
 #include <asm/gpio.h>
 #include <linux/bitops.h>
 #include <linux/compat.h>
+#include <linux/string.h>
 #include <mach/pic32.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/gpio/rk_gpio.c b/drivers/gpio/rk_gpio.c
index 8cc288581c99..3cabd11b5c5e 100644
--- a/drivers/gpio/rk_gpio.c
+++ b/drivers/gpio/rk_gpio.c
@@ -16,6 +16,7 @@
 #include <asm/arch-rockchip/gpio.h>
 #include <dm/pinctrl.h>
 #include <dt-bindings/clock/rk3288-cru.h>
+#include <linux/string.h>
 
 enum {
 	ROCKCHIP_GPIOS_PER_BANK		= 32,
diff --git a/drivers/gpio/sifive-gpio.c b/drivers/gpio/sifive-gpio.c
index bf3537b76bdb..eb8b8f65e98f 100644
--- a/drivers/gpio/sifive-gpio.c
+++ b/drivers/gpio/sifive-gpio.c
@@ -12,6 +12,7 @@
 #include <errno.h>
 #include <asm/gpio.h>
 #include <linux/bitops.h>
+#include <linux/string.h>
 
 static int sifive_gpio_probe(struct udevice *dev)
 {
diff --git a/drivers/gpio/sunxi_gpio.c b/drivers/gpio/sunxi_gpio.c
index 3efccf496fc3..973854ca6135 100644
--- a/drivers/gpio/sunxi_gpio.c
+++ b/drivers/gpio/sunxi_gpio.c
@@ -19,6 +19,7 @@
 #include <asm/gpio.h>
 #include <dm/device-internal.h>
 #include <dt-bindings/gpio/gpio.h>
+#include <linux/string.h>
 
 #define SUNXI_GPIOS_PER_BANK	SUNXI_GPIO_A_NR
 
diff --git a/drivers/gpio/xilinx_gpio.c b/drivers/gpio/xilinx_gpio.c
index 014f120d609f..23de1f44e9c3 100644
--- a/drivers/gpio/xilinx_gpio.c
+++ b/drivers/gpio/xilinx_gpio.c
@@ -12,6 +12,7 @@
 #include <asm/gpio.h>
 #include <dm.h>
 #include <dt-bindings/gpio/gpio.h>
+#include <linux/string.h>
 
 #define XILINX_GPIO_MAX_BANK	2
 
diff --git a/drivers/gpio/zynq_gpio.c b/drivers/gpio/zynq_gpio.c
index d0e90b8d633f..8888d2324c42 100644
--- a/drivers/gpio/zynq_gpio.c
+++ b/drivers/gpio/zynq_gpio.c
@@ -15,6 +15,7 @@
 #include <linux/errno.h>
 #include <dm.h>
 #include <fdtdec.h>
+#include <linux/string.h>
 
 /* Maximum banks */
 #define ZYNQ_GPIO_MAX_BANK	4
diff --git a/drivers/i2c/fsl_i2c.c b/drivers/i2c/fsl_i2c.c
index e7a8dcc82122..c2000104b51f 100644
--- a/drivers/i2c/fsl_i2c.c
+++ b/drivers/i2c/fsl_i2c.c
@@ -18,6 +18,7 @@
 #include <dm.h>
 #include <mapmem.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 /* The maximum number of microseconds we will wait until another master has
  * released the bus.  If not defined in the board header file, then use a
diff --git a/drivers/i2c/i2c-uclass.c b/drivers/i2c/i2c-uclass.c
index 2373aa2ea4c2..c16bda469781 100644
--- a/drivers/i2c/i2c-uclass.c
+++ b/drivers/i2c/i2c-uclass.c
@@ -16,6 +16,7 @@
 #include <asm/gpio.h>
 #endif
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #define I2C_MAX_OFFSET_LEN	4
 
diff --git a/drivers/i2c/ihs_i2c.c b/drivers/i2c/ihs_i2c.c
index 1c39b8c9dfc5..f6cd1222b876 100644
--- a/drivers/i2c/ihs_i2c.c
+++ b/drivers/i2c/ihs_i2c.c
@@ -17,6 +17,7 @@
 #include <asm/unaligned.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #ifdef CONFIG_DM_I2C
 struct ihs_i2c_priv {
diff --git a/drivers/i2c/intel_i2c.c b/drivers/i2c/intel_i2c.c
index a7ac09a27e5c..fa36f48df9a1 100644
--- a/drivers/i2c/intel_i2c.c
+++ b/drivers/i2c/intel_i2c.c
@@ -14,6 +14,7 @@
 #include <pci.h>
 #include <time.h>
 #include <asm/io.h>
+#include <linux/string.h>
 
 /* PCI Configuration Space (D31:F3): SMBus */
 #define SMB_BASE		0x20
diff --git a/drivers/i2c/lpc32xx_i2c.c b/drivers/i2c/lpc32xx_i2c.c
index 6af2e975cf35..8aef939981f0 100644
--- a/drivers/i2c/lpc32xx_i2c.c
+++ b/drivers/i2c/lpc32xx_i2c.c
@@ -15,6 +15,7 @@
 #include <asm/arch/i2c.h>
 #include <dm.h>
 #include <mapmem.h>
+#include <linux/string.h>
 
 /*
  * Provide default speed and slave if target did not
diff --git a/drivers/i2c/muxes/i2c-mux-uclass.c b/drivers/i2c/muxes/i2c-mux-uclass.c
index 26897554b0f2..8f6d1547f169 100644
--- a/drivers/i2c/muxes/i2c-mux-uclass.c
+++ b/drivers/i2c/muxes/i2c-mux-uclass.c
@@ -12,6 +12,7 @@
 #include <malloc.h>
 #include <dm/lists.h>
 #include <dm/root.h>
+#include <linux/string.h>
 
 /**
  * struct i2c_mux: Information the uclass stores about an I2C mux
diff --git a/drivers/i2c/mv_i2c.c b/drivers/i2c/mv_i2c.c
index 59675d8d5742..54fa069528b6 100644
--- a/drivers/i2c/mv_i2c.c
+++ b/drivers/i2c/mv_i2c.c
@@ -22,6 +22,7 @@
 #include <log.h>
 #include <asm/io.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include "mv_i2c.h"
 
 /* All transfers are described by this data structure */
diff --git a/drivers/i2c/mvtwsi.c b/drivers/i2c/mvtwsi.c
index 21383ecf132f..1cc9cfc2eb8b 100644
--- a/drivers/i2c/mvtwsi.c
+++ b/drivers/i2c/mvtwsi.c
@@ -19,6 +19,7 @@
 #ifdef CONFIG_DM_I2C
 #include <dm.h>
 #endif
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/i2c/stm32f7_i2c.c b/drivers/i2c/stm32f7_i2c.c
index fc60f5285aba..0f5c8446365e 100644
--- a/drivers/i2c/stm32f7_i2c.c
+++ b/drivers/i2c/stm32f7_i2c.c
@@ -15,6 +15,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #include <dm/device.h>
 #include <linux/err.h>
diff --git a/drivers/i2c/tegra186_bpmp_i2c.c b/drivers/i2c/tegra186_bpmp_i2c.c
index 0a507079a2dc..897627a12360 100644
--- a/drivers/i2c/tegra186_bpmp_i2c.c
+++ b/drivers/i2c/tegra186_bpmp_i2c.c
@@ -11,6 +11,7 @@
 #include <asm/arch-tegra/bpmp_abi.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/i2c/tegra_i2c.c b/drivers/i2c/tegra_i2c.c
index 96a436a8dc1f..2cb51473a6c5 100644
--- a/drivers/i2c/tegra_i2c.c
+++ b/drivers/i2c/tegra_i2c.c
@@ -22,6 +22,7 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 enum i2c_type {
 	TYPE_114,
diff --git a/drivers/input/cros_ec_keyb.c b/drivers/input/cros_ec_keyb.c
index 00bf58f2b5d2..c09a66376af5 100644
--- a/drivers/input/cros_ec_keyb.c
+++ b/drivers/input/cros_ec_keyb.c
@@ -14,6 +14,7 @@
 #include <key_matrix.h>
 #include <log.h>
 #include <stdio_dev.h>
+#include <linux/string.h>
 
 enum {
 	KBC_MAX_KEYS		= 8,	/* Maximum keys held down at once */
diff --git a/drivers/input/i8042.c b/drivers/input/i8042.c
index ca2978e79d5e..b484cebfb4e7 100644
--- a/drivers/input/i8042.c
+++ b/drivers/input/i8042.c
@@ -17,6 +17,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/input/input.c b/drivers/input/input.c
index 24e76052b88f..37dae11d97a3 100644
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -19,6 +19,7 @@
 #endif
 #include <time.h>
 #include <linux/input.h>
+#include <linux/string.h>
 
 enum {
 	/* These correspond to the lights on the keyboard */
diff --git a/drivers/input/key_matrix.c b/drivers/input/key_matrix.c
index 4631728b8b51..4742d5759844 100644
--- a/drivers/input/key_matrix.c
+++ b/drivers/input/key_matrix.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <linux/input.h>
+#include <linux/string.h>
 
 /**
  * Determine if the current keypress configuration can cause key ghosting
diff --git a/drivers/input/keyboard-uclass.c b/drivers/input/keyboard-uclass.c
index f19934e6bb66..a265c02efe70 100644
--- a/drivers/input/keyboard-uclass.c
+++ b/drivers/input/keyboard-uclass.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <keyboard.h>
 #include <log.h>
+#include <linux/string.h>
 
 static int keyboard_start(struct stdio_dev *sdev)
 {
diff --git a/drivers/input/tegra-kbc.c b/drivers/input/tegra-kbc.c
index 74ece4762e3c..3654510858f1 100644
--- a/drivers/input/tegra-kbc.c
+++ b/drivers/input/tegra-kbc.c
@@ -20,6 +20,7 @@
 #include <asm/arch-tegra/timer.h>
 #include <linux/delay.h>
 #include <linux/input.h>
+#include <linux/string.h>
 
 enum {
 	KBC_MAX_GPIO		= 24,
diff --git a/drivers/led/led-uclass.c b/drivers/led/led-uclass.c
index 2859475a6b8e..ae9c3cbd7d3a 100644
--- a/drivers/led/led-uclass.c
+++ b/drivers/led/led-uclass.c
@@ -11,6 +11,7 @@
 #include <dm/device-internal.h>
 #include <dm/root.h>
 #include <dm/uclass-internal.h>
+#include <linux/string.h>
 
 int led_get_by_label(const char *label, struct udevice **devp)
 {
diff --git a/drivers/misc/atsha204a-i2c.c b/drivers/misc/atsha204a-i2c.c
index c79c260783e8..779e1a17607a 100644
--- a/drivers/misc/atsha204a-i2c.c
+++ b/drivers/misc/atsha204a-i2c.c
@@ -18,6 +18,7 @@
 #include <log.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include <u-boot/crc.h>
 
 #define ATSHA204A_TWLO			60
diff --git a/drivers/misc/cbmem_console.c b/drivers/misc/cbmem_console.c
index 5ba0a542060a..dfa99175d3d0 100644
--- a/drivers/misc/cbmem_console.c
+++ b/drivers/misc/cbmem_console.c
@@ -8,6 +8,7 @@
 #ifndef CONFIG_SYS_COREBOOT
 #error This driver requires coreboot
 #endif
+#include <linux/string.h>
 
 #include <asm/arch/sysinfo.h>
 
diff --git a/drivers/misc/cros_ec.c b/drivers/misc/cros_ec.c
index ccac7a60c129..881dce016fa1 100644
--- a/drivers/misc/cros_ec.c
+++ b/drivers/misc/cros_ec.c
@@ -33,6 +33,7 @@
 #include <dm/device-internal.h>
 #include <dm/of_extra.h>
 #include <dm/uclass-internal.h>
+#include <linux/string.h>
 
 #ifdef DEBUG_TRACE
 #define debug_trace(fmt, b...)	debug(fmt, #b)
diff --git a/drivers/misc/cros_ec_i2c.c b/drivers/misc/cros_ec_i2c.c
index c00f5f764a04..6a5dcc016f20 100644
--- a/drivers/misc/cros_ec_i2c.c
+++ b/drivers/misc/cros_ec_i2c.c
@@ -17,6 +17,7 @@
 #include <i2c.h>
 #include <cros_ec.h>
 #include <log.h>
+#include <linux/string.h>
 
 #ifdef DEBUG_TRACE
 #define debug_trace(fmt, b...)	debug(fmt, #b)
diff --git a/drivers/misc/cros_ec_sandbox.c b/drivers/misc/cros_ec_sandbox.c
index 8575e56a3371..81d2191542c3 100644
--- a/drivers/misc/cros_ec_sandbox.c
+++ b/drivers/misc/cros_ec_sandbox.c
@@ -14,6 +14,7 @@
 #include <log.h>
 #include <os.h>
 #include <time.h>
+#include <linux/string.h>
 #include <u-boot/sha256.h>
 #include <spi.h>
 #include <asm/malloc.h>
diff --git a/drivers/misc/cros_ec_spi.c b/drivers/misc/cros_ec_spi.c
index d8778eeb3874..357e31f7edc3 100644
--- a/drivers/misc/cros_ec_spi.c
+++ b/drivers/misc/cros_ec_spi.c
@@ -19,6 +19,7 @@
 #include <log.h>
 #include <spi.h>
 #include <time.h>
+#include <linux/string.h>
 
 int cros_ec_spi_packet(struct udevice *udev, int out_bytes, int in_bytes)
 {
diff --git a/drivers/misc/ds4510.c b/drivers/misc/ds4510.c
index a2a529156546..d914123fdf9f 100644
--- a/drivers/misc/ds4510.c
+++ b/drivers/misc/ds4510.c
@@ -12,6 +12,7 @@
 #include <i2c.h>
 #include <command.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include "ds4510.h"
 
 enum {
diff --git a/drivers/misc/fsl_portals.c b/drivers/misc/fsl_portals.c
index 632430e42099..2c8cec7c421a 100644
--- a/drivers/misc/fsl_portals.c
+++ b/drivers/misc/fsl_portals.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
+#include <linux/string.h>
 
 #include <asm/processor.h>
 #include <asm/io.h>
diff --git a/drivers/misc/gdsys_ioep.c b/drivers/misc/gdsys_ioep.c
index 69e16a06a0a7..8c65f1473c3f 100644
--- a/drivers/misc/gdsys_ioep.c
+++ b/drivers/misc/gdsys_ioep.c
@@ -16,6 +16,7 @@
 #include <log.h>
 #include <misc.h>
 #include <regmap.h>
+#include <linux/string.h>
 
 #include "gdsys_ioep.h"
 
diff --git a/drivers/misc/i2c_eeprom_emul.c b/drivers/misc/i2c_eeprom_emul.c
index 6be76ad02ef6..925120ea0d58 100644
--- a/drivers/misc/i2c_eeprom_emul.c
+++ b/drivers/misc/i2c_eeprom_emul.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <asm/test.h>
+#include <linux/string.h>
 
 #ifdef DEBUG
 #define debug_buffer print_buffer
diff --git a/drivers/misc/ihs_fpga.c b/drivers/misc/ihs_fpga.c
index 00d34a3adc2b..9d9d52e978c0 100644
--- a/drivers/misc/ihs_fpga.c
+++ b/drivers/misc/ihs_fpga.c
@@ -16,6 +16,7 @@
 #include <asm/gpio.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include "ihs_fpga.h"
 
diff --git a/drivers/misc/misc_sandbox.c b/drivers/misc/misc_sandbox.c
index f7c5b2e25fa0..9ea2a35db604 100644
--- a/drivers/misc/misc_sandbox.c
+++ b/drivers/misc/misc_sandbox.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <misc.h>
+#include <linux/string.h>
 
 struct misc_sandbox_priv {
 	u8 mem[128];
diff --git a/drivers/misc/mpc83xx_serdes.c b/drivers/misc/mpc83xx_serdes.c
index ab1e34e6f46c..b2f23e1343bf 100644
--- a/drivers/misc/mpc83xx_serdes.c
+++ b/drivers/misc/mpc83xx_serdes.c
@@ -15,6 +15,7 @@
 #include <mapmem.h>
 #include <misc.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include "mpc83xx_serdes.h"
 
diff --git a/drivers/misc/qfw.c b/drivers/misc/qfw.c
index f6eb6583ed0b..fed08422419d 100644
--- a/drivers/misc/qfw.c
+++ b/drivers/misc/qfw.c
@@ -14,6 +14,7 @@
 #include <asm/tables.h>
 #endif
 #include <linux/list.h>
+#include <linux/string.h>
 
 static bool fwcfg_present;
 static bool fwcfg_dma_present;
diff --git a/drivers/misc/rockchip-efuse.c b/drivers/misc/rockchip-efuse.c
index 46ce6305fe68..adaa51ce99b5 100644
--- a/drivers/misc/rockchip-efuse.c
+++ b/drivers/misc/rockchip-efuse.c
@@ -14,6 +14,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <misc.h>
+#include <linux/string.h>
 
 #define RK3399_A_SHIFT          16
 #define RK3399_A_MASK           0x3ff
diff --git a/drivers/misc/sifive-otp.c b/drivers/misc/sifive-otp.c
index 0a4fa67f335c..7d502febea4f 100644
--- a/drivers/misc/sifive-otp.c
+++ b/drivers/misc/sifive-otp.c
@@ -25,6 +25,7 @@
 #include <linux/io.h>
 #include <misc.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #define BYTES_PER_FUSE		4
 
diff --git a/drivers/misc/tegra186_bpmp.c b/drivers/misc/tegra186_bpmp.c
index 73cc2666e498..c9079b86a7a0 100644
--- a/drivers/misc/tegra186_bpmp.c
+++ b/drivers/misc/tegra186_bpmp.c
@@ -18,6 +18,7 @@
 #include <linux/bitops.h>
 #include <linux/err.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #define BPMP_IVC_FRAME_COUNT 1
 #define BPMP_IVC_FRAME_SIZE 128
diff --git a/drivers/misc/vexpress_config.c b/drivers/misc/vexpress_config.c
index 02e5b586e297..9a9c5f75573e 100644
--- a/drivers/misc/vexpress_config.c
+++ b/drivers/misc/vexpress_config.c
@@ -12,6 +12,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <misc.h>
+#include <linux/string.h>
 
 #define SYS_CFGDATA		0xa0
 
diff --git a/drivers/mmc/ca_dw_mmc.c b/drivers/mmc/ca_dw_mmc.c
index 562dcb8ee35e..8ae5bd41454e 100644
--- a/drivers/mmc/ca_dw_mmc.c
+++ b/drivers/mmc/ca_dw_mmc.c
@@ -13,6 +13,7 @@
 #include <errno.h>
 #include <dm.h>
 #include <mapmem.h>
+#include <linux/string.h>
 
 #define SD_CLK_SEL_MASK (0x3)
 #define SD_DLL_DEFAULT  (0x143000)
diff --git a/drivers/mmc/davinci_mmc.c b/drivers/mmc/davinci_mmc.c
index 0a05fb13bc98..9b2fe0653c65 100644
--- a/drivers/mmc/davinci_mmc.c
+++ b/drivers/mmc/davinci_mmc.c
@@ -17,6 +17,7 @@
 #include <asm/arch/sdmmc_defs.h>
 #include <asm-generic/gpio.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #define WATCHDOG_COUNT		(100000)
 
diff --git a/drivers/mmc/fsl_esdhc_imx.c b/drivers/mmc/fsl_esdhc_imx.c
index c9f0c2528e63..c3806fd3e6fd 100644
--- a/drivers/mmc/fsl_esdhc_imx.c
+++ b/drivers/mmc/fsl_esdhc_imx.c
@@ -28,6 +28,7 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include <power/regulator.h>
 #include <malloc.h>
 #include <fsl_esdhc_imx.h>
diff --git a/drivers/mmc/fsl_esdhc_spl.c b/drivers/mmc/fsl_esdhc_spl.c
index afe55fad9de6..033fd0edd8f4 100644
--- a/drivers/mmc/fsl_esdhc_spl.c
+++ b/drivers/mmc/fsl_esdhc_spl.c
@@ -8,6 +8,7 @@
 #include <hang.h>
 #include <mmc.h>
 #include <malloc.h>
+#include <linux/string.h>
 
 /*
  * The environment variables are written to just after the u-boot image
diff --git a/drivers/mmc/ftsdc010_mci.c b/drivers/mmc/ftsdc010_mci.c
index 113ed2b7a71b..b26571e0a695 100644
--- a/drivers/mmc/ftsdc010_mci.c
+++ b/drivers/mmc/ftsdc010_mci.c
@@ -22,6 +22,7 @@
 #include <linux/errno.h>
 #include <asm/byteorder.h>
 #include <faraday/ftsdc010.h>
+#include <linux/string.h>
 #include "ftsdc010_mci.h"
 #include <dm.h>
 #include <dt-structs.h>
diff --git a/drivers/mmc/iproc_sdhci.c b/drivers/mmc/iproc_sdhci.c
index 7eda1d606fd6..ef7d8f8b41e8 100644
--- a/drivers/mmc/iproc_sdhci.c
+++ b/drivers/mmc/iproc_sdhci.c
@@ -11,6 +11,7 @@
 #include <sdhci.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/mmc/meson_gx_mmc.c b/drivers/mmc/meson_gx_mmc.c
index f70ced37d314..2afc80ff0c5e 100644
--- a/drivers/mmc/meson_gx_mmc.c
+++ b/drivers/mmc/meson_gx_mmc.c
@@ -17,6 +17,7 @@
 #include <asm/arch/sd_emmc.h>
 #include <linux/delay.h>
 #include <linux/log2.h>
+#include <linux/string.h>
 
 static inline void *get_regbase(const struct mmc *mmc)
 {
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index 544534a78a71..e8c2360f9768 100644
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@ -21,6 +21,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include <power/regulator.h>
 #include <malloc.h>
 #include <memalign.h>
diff --git a/drivers/mmc/mmc_spi.c b/drivers/mmc/mmc_spi.c
index 50fcd32674f9..56755c66fd2a 100644
--- a/drivers/mmc/mmc_spi.c
+++ b/drivers/mmc/mmc_spi.c
@@ -14,6 +14,7 @@
 #include <mmc.h>
 #include <stdlib.h>
 #include <linux/bitops.h>
+#include <linux/string.h>
 #include <u-boot/crc.h>
 #include <linux/crc7.h>
 #include <asm/byteorder.h>
diff --git a/drivers/mmc/msm_sdhci.c b/drivers/mmc/msm_sdhci.c
index 525c1dc90272..27d8fb84fab5 100644
--- a/drivers/mmc/msm_sdhci.c
+++ b/drivers/mmc/msm_sdhci.c
@@ -16,6 +16,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
+#include <linux/string.h>
 
 /* Non-standard registers needed for SDHCI startup */
 #define SDCC_MCI_POWER   0x0
diff --git a/drivers/mmc/mv_sdhci.c b/drivers/mmc/mv_sdhci.c
index fa7c12837d16..356d161d51fe 100644
--- a/drivers/mmc/mv_sdhci.c
+++ b/drivers/mmc/mv_sdhci.c
@@ -9,6 +9,7 @@
 #include <sdhci.h>
 #include <asm/global_data.h>
 #include <linux/mbus.h>
+#include <linux/string.h>
 
 #define MVSDH_NAME "mv_sdh"
 
diff --git a/drivers/mmc/mxcmmc.c b/drivers/mmc/mxcmmc.c
index 0057273a2a76..5ca4a5140e1b 100644
--- a/drivers/mmc/mxcmmc.c
+++ b/drivers/mmc/mxcmmc.c
@@ -27,6 +27,7 @@
 #include <linux/errno.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
+#include <linux/string.h>
 
 #define DRIVER_NAME "mxc-mmc"
 
diff --git a/drivers/mmc/mxsmmc.c b/drivers/mmc/mxsmmc.c
index 2b3a3a992cbc..5bb12b612e3e 100644
--- a/drivers/mmc/mxsmmc.c
+++ b/drivers/mmc/mxsmmc.c
@@ -33,6 +33,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/mach-imx/dma.h>
 #include <bouncebuf.h>
+#include <linux/string.h>
 
 #define	MXSMMC_MAX_TIMEOUT	10000
 #define MXSMMC_SMALL_TRANSFER	512
diff --git a/drivers/mmc/pxa_mmc_gen.c b/drivers/mmc/pxa_mmc_gen.c
index 2c081fdc69f0..7d88ca015c12 100644
--- a/drivers/mmc/pxa_mmc_gen.c
+++ b/drivers/mmc/pxa_mmc_gen.c
@@ -18,6 +18,7 @@
 #include <dm/platform_data/pxa_mmc_gen.h>
 #include <malloc.h>
 #include <mmc.h>
+#include <linux/string.h>
 
 /* PXAMMC Generic default config for various CPUs */
 #if defined(CONFIG_CPU_PXA25X)
diff --git a/drivers/mmc/rpmb.c b/drivers/mmc/rpmb.c
index ea7e506666b0..7a596b2f19ba 100644
--- a/drivers/mmc/rpmb.c
+++ b/drivers/mmc/rpmb.c
@@ -13,6 +13,7 @@
 #include <memalign.h>
 #include <mmc.h>
 #include <sdhci.h>
+#include <linux/string.h>
 #include <u-boot/sha256.h>
 #include "mmc_private.h"
 
diff --git a/drivers/mmc/sandbox_mmc.c b/drivers/mmc/sandbox_mmc.c
index e86ea8fe0968..d4780271fc30 100644
--- a/drivers/mmc/sandbox_mmc.c
+++ b/drivers/mmc/sandbox_mmc.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <mmc.h>
 #include <asm/test.h>
+#include <linux/string.h>
 
 struct sandbox_mmc_plat {
 	struct mmc_config cfg;
diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c
index 94901e6d6b7d..e9c7207fa362 100644
--- a/drivers/mmc/sdhci.c
+++ b/drivers/mmc/sdhci.c
@@ -22,6 +22,7 @@
 #include <linux/dma-mapping.h>
 #include <phys2bus.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 static void sdhci_reset(struct sdhci_host *host, u8 mask)
 {
diff --git a/drivers/mmc/sh_mmcif.c b/drivers/mmc/sh_mmcif.c
index f7dd2aadc3e1..5f25acd55db9 100644
--- a/drivers/mmc/sh_mmcif.c
+++ b/drivers/mmc/sh_mmcif.c
@@ -22,6 +22,7 @@
 #include <linux/compat.h>
 #include <linux/io.h>
 #include <linux/sizes.h>
+#include <linux/string.h>
 #include "sh_mmcif.h"
 
 #define DRIVER_NAME	"sh_mmcif"
diff --git a/drivers/mmc/snps_dw_mmc.c b/drivers/mmc/snps_dw_mmc.c
index c606ef011bff..f7c64312154c 100644
--- a/drivers/mmc/snps_dw_mmc.c
+++ b/drivers/mmc/snps_dw_mmc.c
@@ -17,6 +17,7 @@
 #include <linux/libfdt.h>
 #include <linux/err.h>
 #include <malloc.h>
+#include <linux/string.h>
 
 #define CLOCK_MIN		400000	/*  400 kHz */
 #define FIFO_MIN		8
diff --git a/drivers/mmc/sti_sdhci.c b/drivers/mmc/sti_sdhci.c
index 11ae392734c3..394c4d19b567 100644
--- a/drivers/mmc/sti_sdhci.c
+++ b/drivers/mmc/sti_sdhci.c
@@ -13,6 +13,7 @@
 #include <asm/arch/sdhci.h>
 #include <asm/global_data.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/mmc/sunxi_mmc.c b/drivers/mmc/sunxi_mmc.c
index f90463059304..96d8f18d0f5a 100644
--- a/drivers/mmc/sunxi_mmc.c
+++ b/drivers/mmc/sunxi_mmc.c
@@ -23,6 +23,7 @@
 #include <asm/arch/mmc.h>
 #include <asm-generic/gpio.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #ifdef CONFIG_DM_MMC
 struct sunxi_mmc_variant {
diff --git a/drivers/mmc/xenon_sdhci.c b/drivers/mmc/xenon_sdhci.c
index 50c5b194cadd..57fe6a4df23d 100644
--- a/drivers/mmc/xenon_sdhci.c
+++ b/drivers/mmc/xenon_sdhci.c
@@ -24,6 +24,7 @@
 #include <malloc.h>
 #include <sdhci.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/mtd/altera_qspi.c b/drivers/mtd/altera_qspi.c
index 346244e1110f..c406963d7573 100644
--- a/drivers/mtd/altera_qspi.c
+++ b/drivers/mtd/altera_qspi.c
@@ -14,6 +14,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c
index 74cf47b76372..21cdf62478a2 100644
--- a/drivers/mtd/cfi_flash.c
+++ b/drivers/mtd/cfi_flash.c
@@ -34,6 +34,7 @@
 #include <asm/unaligned.h>
 #include <env_internal.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include <mtd/cfi_flash.h>
 #include <watchdog.h>
 
diff --git a/drivers/mtd/cfi_mtd.c b/drivers/mtd/cfi_mtd.c
index a5bb0962e556..21ca7bd65d4c 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 <linux/string.h>
 
 #include <linux/errno.h>
 #include <linux/mtd/mtd.h>
diff --git a/drivers/mtd/mtd_uboot.c b/drivers/mtd/mtd_uboot.c
index 2499cb52d8c0..16fe4ecdb6e1 100644
--- a/drivers/mtd/mtd_uboot.c
+++ b/drivers/mtd/mtd_uboot.c
@@ -14,6 +14,7 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 #include <mtd.h>
+#include <linux/string.h>
 
 #define MTD_NAME_MAX_LEN 20
 
diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c
index cad11805690a..ef3eb456ac87 100644
--- a/drivers/mtd/mtdpart.c
+++ b/drivers/mtd/mtdpart.c
@@ -26,6 +26,7 @@
 #include <linux/compat.h>
 #include <ubi_uboot.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
diff --git a/drivers/mtd/nand/raw/atmel_nand.c b/drivers/mtd/nand/raw/atmel_nand.c
index 599bdfc0d6df..dcd5f8ff82e4 100644
--- a/drivers/mtd/nand/raw/atmel_nand.c
+++ b/drivers/mtd/nand/raw/atmel_nand.c
@@ -20,6 +20,7 @@
 #include <linux/bug.h>
 #include <linux/delay.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #include <malloc.h>
 #include <nand.h>
diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand.c b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
index a57013e72c47..3ac5b4445166 100644
--- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c
+++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
@@ -29,6 +29,7 @@
 #include <linux/log2.h>
 #include <asm/processor.h>
 #include <dm.h>
+#include <linux/string.h>
 
 #include "brcmnand.h"
 #include "brcmnand_compat.h"
diff --git a/drivers/mtd/nand/raw/denali.c b/drivers/mtd/nand/raw/denali.c
index ab91db85467d..ca99aa88b3d4 100644
--- a/drivers/mtd/nand/raw/denali.c
+++ b/drivers/mtd/nand/raw/denali.c
@@ -23,6 +23,7 @@
 #include <linux/io.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/rawnand.h>
+#include <linux/string.h>
 
 #include "denali.h"
 
diff --git a/drivers/mtd/nand/raw/denali_spl.c b/drivers/mtd/nand/raw/denali_spl.c
index f72142817e7f..7252e0340c6a 100644
--- a/drivers/mtd/nand/raw/denali_spl.c
+++ b/drivers/mtd/nand/raw/denali_spl.c
@@ -10,6 +10,7 @@
 #include <asm/unaligned.h>
 #include <linux/delay.h>
 #include <linux/mtd/rawnand.h>
+#include <linux/string.h>
 #include "denali.h"
 
 #define DENALI_MAP01		(1 << 26)	/* read/write pages in PIO */
diff --git a/drivers/mtd/nand/raw/fsmc_nand.c b/drivers/mtd/nand/raw/fsmc_nand.c
index ad34af30e812..a5ef0ae75e0e 100644
--- a/drivers/mtd/nand/raw/fsmc_nand.c
+++ b/drivers/mtd/nand/raw/fsmc_nand.c
@@ -16,6 +16,7 @@
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/fsmc_nand.h>
 #include <asm/arch/hardware.h>
+#include <linux/string.h>
 
 static u32 fsmc_version;
 static struct fsmc_regs *const fsmc_regs_p = (struct fsmc_regs *)
diff --git a/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c b/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c
index 588fb010ee89..cfa2510b038f 100644
--- a/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c
+++ b/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c
@@ -28,6 +28,7 @@
 #include <asm/arch/clk.h>
 #include <asm/arch/sys_proto.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 /*
  * MLC NAND controller registers.
diff --git a/drivers/mtd/nand/raw/mxs_nand.c b/drivers/mtd/nand/raw/mxs_nand.c
index a7852a841ce2..3ba3afbbf291 100644
--- a/drivers/mtd/nand/raw/mxs_nand.c
+++ b/drivers/mtd/nand/raw/mxs_nand.c
@@ -19,6 +19,7 @@
 #include <asm/cache.h>
 #include <linux/mtd/rawnand.h>
 #include <linux/sizes.h>
+#include <linux/string.h>
 #include <linux/types.h>
 #include <malloc.h>
 #include <linux/errno.h>
diff --git a/drivers/mtd/nand/raw/mxs_nand_spl.c b/drivers/mtd/nand/raw/mxs_nand_spl.c
index ee778e13aa13..2e1f4c522a6a 100644
--- a/drivers/mtd/nand/raw/mxs_nand_spl.c
+++ b/drivers/mtd/nand/raw/mxs_nand_spl.c
@@ -14,6 +14,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/string.h>
 
 static struct mtd_info *mtd;
 static struct nand_chip nand_chip;
diff --git a/drivers/mtd/nand/raw/nand_base.c b/drivers/mtd/nand/raw/nand_base.c
index 693e088f19ad..a6b3504facd5 100644
--- a/drivers/mtd/nand/raw/nand_base.c
+++ b/drivers/mtd/nand/raw/nand_base.c
@@ -53,6 +53,7 @@
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 /* Define default oob placement schemes for large and small page devices */
 #ifndef CONFIG_SYS_NAND_DRIVER_ECC_LAYOUT
diff --git a/drivers/mtd/nand/raw/nand_bch.c b/drivers/mtd/nand/raw/nand_bch.c
index bb48ebbb96c7..5733bcb9c624 100644
--- a/drivers/mtd/nand/raw/nand_bch.c
+++ b/drivers/mtd/nand/raw/nand_bch.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <dm/devres.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 /*#include <asm/io.h>*/
 #include <linux/types.h>
 
diff --git a/drivers/mtd/nand/raw/nand_spl_loaders.c b/drivers/mtd/nand/raw/nand_spl_loaders.c
index 4befc75c047e..f297205bc795 100644
--- a/drivers/mtd/nand/raw/nand_spl_loaders.c
+++ b/drivers/mtd/nand/raw/nand_spl_loaders.c
@@ -1,3 +1,4 @@
+#include <linux/string.h>
 int nand_spl_load_image(uint32_t offs, unsigned int size, void *dst)
 {
 	unsigned int block, lastblock;
diff --git a/drivers/mtd/nand/raw/nand_util.c b/drivers/mtd/nand/raw/nand_util.c
index 5b74ef0dfdbf..264a1efada9b 100644
--- a/drivers/mtd/nand/raw/nand_util.c
+++ b/drivers/mtd/nand/raw/nand_util.c
@@ -27,6 +27,7 @@
 #include <div64.h>
 #include <asm/cache.h>
 #include <dm/devres.h>
+#include <linux/string.h>
 
 #include <linux/errno.h>
 #include <linux/mtd/mtd.h>
diff --git a/drivers/mtd/nand/raw/omap_gpmc.c b/drivers/mtd/nand/raw/omap_gpmc.c
index 97fd5690f518..9fef305da1c6 100644
--- a/drivers/mtd/nand/raw/omap_gpmc.c
+++ b/drivers/mtd/nand/raw/omap_gpmc.c
@@ -15,6 +15,7 @@
 #include <linux/compiler.h>
 #include <nand.h>
 #include <linux/mtd/omap_elm.h>
+#include <linux/string.h>
 
 #define BADBLOCK_MARKER_LENGTH	2
 #define SECTOR_BYTES		512
diff --git a/drivers/mtd/nand/raw/pxa3xx_nand.c b/drivers/mtd/nand/raw/pxa3xx_nand.c
index bccaa2d82128..e222fb994b0a 100644
--- a/drivers/mtd/nand/raw/pxa3xx_nand.c
+++ b/drivers/mtd/nand/raw/pxa3xx_nand.c
@@ -24,6 +24,7 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/rawnand.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include <linux/types.h>
 
 #include "pxa3xx_nand.h"
diff --git a/drivers/mtd/nand/raw/sunxi_nand.c b/drivers/mtd/nand/raw/sunxi_nand.c
index 606e606fe8b6..5fd741f11243 100644
--- a/drivers/mtd/nand/raw/sunxi_nand.c
+++ b/drivers/mtd/nand/raw/sunxi_nand.c
@@ -37,6 +37,7 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #include <linux/kernel.h>
 #include <linux/mtd/mtd.h>
diff --git a/drivers/mtd/nand/raw/sunxi_nand_spl.c b/drivers/mtd/nand/raw/sunxi_nand_spl.c
index 85d8013b1a6b..942f2366849e 100644
--- a/drivers/mtd/nand/raw/sunxi_nand_spl.c
+++ b/drivers/mtd/nand/raw/sunxi_nand_spl.c
@@ -12,6 +12,7 @@
 #include <linux/bitops.h>
 #include <linux/ctype.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 /* registers */
 #define NFC_CTL                    0x00000000
diff --git a/drivers/mtd/nand/raw/tegra_nand.c b/drivers/mtd/nand/raw/tegra_nand.c
index a28f830e8cd2..0b81fe1d4874 100644
--- a/drivers/mtd/nand/raw/tegra_nand.c
+++ b/drivers/mtd/nand/raw/tegra_nand.c
@@ -24,6 +24,7 @@
 #include <bouncebuf.h>
 #include <dm.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include "tegra_nand.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/mtd/nand/raw/vf610_nfc.c b/drivers/mtd/nand/raw/vf610_nfc.c
index 02ca385ed2d4..457efcc23e6e 100644
--- a/drivers/mtd/nand/raw/vf610_nfc.c
+++ b/drivers/mtd/nand/raw/vf610_nfc.c
@@ -26,6 +26,7 @@
 #include <time.h>
 #include <dm/device_compat.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/rawnand.h>
diff --git a/drivers/mtd/nand/spi/core.c b/drivers/mtd/nand/spi/core.c
index ae8932d377cd..87494854fc28 100644
--- a/drivers/mtd/nand/spi/core.c
+++ b/drivers/mtd/nand/spi/core.c
@@ -31,6 +31,7 @@
 #include <linux/bug.h>
 #include <linux/mtd/spinand.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #endif
 
 /* SPI NAND index visible in MTD names */
diff --git a/drivers/mtd/onenand/onenand_base.c b/drivers/mtd/onenand/onenand_base.c
index cfc137c6b956..bd73642752bf 100644
--- a/drivers/mtd/onenand/onenand_base.c
+++ b/drivers/mtd/onenand/onenand_base.c
@@ -28,6 +28,7 @@
 #include <linux/compat.h>
 #include <linux/mtd/mtd.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include "linux/mtd/flashchip.h"
 #include <linux/mtd/onenand.h>
 
diff --git a/drivers/mtd/onenand/onenand_bbt.c b/drivers/mtd/onenand/onenand_bbt.c
index cc1e449f4a72..026280e5e629 100644
--- a/drivers/mtd/onenand/onenand_bbt.c
+++ b/drivers/mtd/onenand/onenand_bbt.c
@@ -21,6 +21,7 @@
 #include <linux/mtd/onenand.h>
 #include <malloc.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #include <linux/errno.h>
 
diff --git a/drivers/mtd/onenand/onenand_spl.c b/drivers/mtd/onenand/onenand_spl.c
index ab6f1a8be3ee..463ec9b8d50c 100644
--- a/drivers/mtd/onenand/onenand_spl.c
+++ b/drivers/mtd/onenand/onenand_spl.c
@@ -12,6 +12,7 @@
 #include <linux/bitops.h>
 #include <linux/mtd/onenand_regs.h>
 #include <onenand_uboot.h>
+#include <linux/string.h>
 
 /*
  * Device geometry:
diff --git a/drivers/mtd/onenand/onenand_uboot.c b/drivers/mtd/onenand/onenand_uboot.c
index 3a8c7b867eba..b6ec9eecda6a 100644
--- a/drivers/mtd/onenand/onenand_uboot.c
+++ b/drivers/mtd/onenand/onenand_uboot.c
@@ -18,6 +18,7 @@
 #include <linux/compat.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/onenand.h>
+#include <linux/string.h>
 
 struct mtd_info onenand_mtd;
 struct onenand_chip onenand_chip;
diff --git a/drivers/mtd/onenand/samsung.c b/drivers/mtd/onenand/samsung.c
index c415e5149a01..27143d4d0a5c 100644
--- a/drivers/mtd/onenand/samsung.c
+++ b/drivers/mtd/onenand/samsung.c
@@ -17,6 +17,7 @@
 #include <linux/mtd/flashchip.h>
 #include <linux/mtd/samsung_onenand.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #include <asm/io.h>
 #include <linux/errno.h>
diff --git a/drivers/mtd/pic32_flash.c b/drivers/mtd/pic32_flash.c
index ea0dbe9eeee5..71f22406badb 100644
--- a/drivers/mtd/pic32_flash.c
+++ b/drivers/mtd/pic32_flash.c
@@ -14,6 +14,7 @@
 #include <irq_func.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
+#include <linux/string.h>
 #include <mach/pic32.h>
 #include <wait_bit.h>
 
diff --git a/drivers/mtd/spi/fsl_espi_spl.c b/drivers/mtd/spi/fsl_espi_spl.c
index 5c41d7558c24..9c9975748845 100644
--- a/drivers/mtd/spi/fsl_espi_spl.c
+++ b/drivers/mtd/spi/fsl_espi_spl.c
@@ -8,6 +8,7 @@
 #include <hang.h>
 #include <spi_flash.h>
 #include <malloc.h>
+#include <linux/string.h>
 
 #define ESPI_BOOT_IMAGE_SIZE	0x48
 #define ESPI_BOOT_IMAGE_ADDR	0x50
diff --git a/drivers/mtd/spi/sandbox.c b/drivers/mtd/spi/sandbox.c
index 0b602dc9140a..a63e92d0340c 100644
--- a/drivers/mtd/spi/sandbox.c
+++ b/drivers/mtd/spi/sandbox.c
@@ -16,6 +16,7 @@
 #include <malloc.h>
 #include <spi.h>
 #include <os.h>
+#include <linux/string.h>
 
 #include <spi_flash.h>
 #include "sf_internal.h"
diff --git a/drivers/mtd/spi/sf-uclass.c b/drivers/mtd/spi/sf-uclass.c
index 121804e32693..5e96d3dc6c8d 100644
--- a/drivers/mtd/spi/sf-uclass.c
+++ b/drivers/mtd/spi/sf-uclass.c
@@ -11,6 +11,7 @@
 #include <spi_flash.h>
 #include <asm/global_data.h>
 #include <dm/device-internal.h>
+#include <linux/string.h>
 #include "sf_internal.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/mtd/spi/sf_dataflash.c b/drivers/mtd/spi/sf_dataflash.c
index c292ddfb893f..11a396f11a20 100644
--- a/drivers/mtd/spi/sf_dataflash.c
+++ b/drivers/mtd/spi/sf_dataflash.c
@@ -20,6 +20,7 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/math64.h>
+#include <linux/string.h>
 
 #include "sf_internal.h"
 
diff --git a/drivers/mtd/spi/sf_mtd.c b/drivers/mtd/spi/sf_mtd.c
index 987fac2501f4..1d8276d59d6e 100644
--- a/drivers/mtd/spi/sf_mtd.c
+++ b/drivers/mtd/spi/sf_mtd.c
@@ -9,6 +9,7 @@
 #include <linux/errno.h>
 #include <linux/mtd/mtd.h>
 #include <spi_flash.h>
+#include <linux/string.h>
 
 static struct mtd_info sf_mtd_info;
 static bool sf_mtd_registered;
diff --git a/drivers/mtd/spi/sf_probe.c b/drivers/mtd/spi/sf_probe.c
index b959e3453a51..b37fed685770 100644
--- a/drivers/mtd/spi/sf_probe.c
+++ b/drivers/mtd/spi/sf_probe.c
@@ -14,6 +14,7 @@
 #include <malloc.h>
 #include <spi.h>
 #include <spi_flash.h>
+#include <linux/string.h>
 
 #include "sf_internal.h"
 
diff --git a/drivers/mtd/spi/spi-nor-core.c b/drivers/mtd/spi/spi-nor-core.c
index 3537fa6aaf78..d236f860df5b 100644
--- a/drivers/mtd/spi/spi-nor-core.c
+++ b/drivers/mtd/spi/spi-nor-core.c
@@ -22,6 +22,7 @@
 #include <linux/math64.h>
 #include <linux/printk.h>
 #include <linux/sizes.h>
+#include <linux/string.h>
 
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/spi-nor.h>
diff --git a/drivers/mtd/spi/spi-nor-tiny.c b/drivers/mtd/spi/spi-nor-tiny.c
index 54f6d773f0fd..91f98aac2d18 100644
--- a/drivers/mtd/spi/spi-nor-tiny.c
+++ b/drivers/mtd/spi/spi-nor-tiny.c
@@ -19,6 +19,7 @@
 #include <linux/math64.h>
 #include <linux/printk.h>
 #include <linux/sizes.h>
+#include <linux/string.h>
 
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/spi-nor.h>
diff --git a/drivers/mtd/ubi/attach.c b/drivers/mtd/ubi/attach.c
index 2ef8fde3d324..7b9ca10ed2aa 100644
--- a/drivers/mtd/ubi/attach.c
+++ b/drivers/mtd/ubi/attach.c
@@ -82,6 +82,7 @@
 #include <linux/bug.h>
 #include <linux/err.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #endif
 
 #include <linux/math64.h>
diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c
index f4e72ae7e561..a449b21b5bf2 100644
--- a/drivers/mtd/ubi/build.c
+++ b/drivers/mtd/ubi/build.c
@@ -34,6 +34,7 @@
 #include <linux/bug.h>
 #include <linux/log2.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #endif
 #include <linux/err.h>
 #include <ubi_uboot.h>
diff --git a/drivers/mtd/ubi/debug.c b/drivers/mtd/ubi/debug.c
index b119cb6e9c05..393419bd1376 100644
--- a/drivers/mtd/ubi/debug.c
+++ b/drivers/mtd/ubi/debug.c
@@ -9,6 +9,7 @@
 #include <malloc.h>
 #include <ubi_uboot.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include "ubi.h"
 #ifndef __UBOOT__
 #include <linux/debugfs.h>
diff --git a/drivers/mtd/ubi/eba.c b/drivers/mtd/ubi/eba.c
index 9d4337bcfffd..9fe5ed791258 100644
--- a/drivers/mtd/ubi/eba.c
+++ b/drivers/mtd/ubi/eba.c
@@ -36,6 +36,7 @@
 #include <u-boot/crc.h>
 #else
 #include <ubi_uboot.h>
+#include <linux/string.h>
 #endif
 
 #include <linux/err.h>
diff --git a/drivers/mtd/ubi/fastmap.c b/drivers/mtd/ubi/fastmap.c
index b54b56375b44..90ed73b8577f 100644
--- a/drivers/mtd/ubi/fastmap.c
+++ b/drivers/mtd/ubi/fastmap.c
@@ -17,6 +17,7 @@
 #include <malloc.h>
 #include <ubi_uboot.h>
 #include <linux/bug.h>
+#include <linux/string.h>
 #endif
 
 #include <linux/compat.h>
diff --git a/drivers/mtd/ubi/io.c b/drivers/mtd/ubi/io.c
index b8b878b9182d..ef819a86d27c 100644
--- a/drivers/mtd/ubi/io.c
+++ b/drivers/mtd/ubi/io.c
@@ -83,6 +83,7 @@
 #else
 #include <hexdump.h>
 #include <ubi_uboot.h>
+#include <linux/string.h>
 #endif
 
 #include "ubi.h"
diff --git a/drivers/mtd/ubi/kapi.c b/drivers/mtd/ubi/kapi.c
index 41680cdad13f..3fac8b2b3088 100644
--- a/drivers/mtd/ubi/kapi.c
+++ b/drivers/mtd/ubi/kapi.c
@@ -16,6 +16,7 @@
 #include <asm/div64.h>
 #else
 #include <ubi_uboot.h>
+#include <linux/string.h>
 #endif
 #include <linux/err.h>
 
diff --git a/drivers/mtd/ubi/upd.c b/drivers/mtd/ubi/upd.c
index 28a362aa14a9..c4856b6c11eb 100644
--- a/drivers/mtd/ubi/upd.c
+++ b/drivers/mtd/ubi/upd.c
@@ -32,6 +32,7 @@
 #else
 #include <div64.h>
 #include <ubi_uboot.h>
+#include <linux/string.h>
 #endif
 #include <linux/err.h>
 #include <linux/math64.h>
diff --git a/drivers/mtd/ubi/vmt.c b/drivers/mtd/ubi/vmt.c
index 0bfedd0debd6..da68f3519daa 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 <linux/string.h>
 #endif
 #include <linux/math64.h>
 
diff --git a/drivers/mtd/ubi/vtbl.c b/drivers/mtd/ubi/vtbl.c
index a2b5352cb2da..cb4de78fcbba 100644
--- a/drivers/mtd/ubi/vtbl.c
+++ b/drivers/mtd/ubi/vtbl.c
@@ -56,6 +56,7 @@
 #else
 #include <ubi_uboot.h>
 #include <linux/bug.h>
+#include <linux/string.h>
 #endif
 
 #include <linux/err.h>
diff --git a/drivers/mtd/ubispl/ubispl.c b/drivers/mtd/ubispl/ubispl.c
index 03b31f002b95..3ffad5485352 100644
--- a/drivers/mtd/ubispl/ubispl.c
+++ b/drivers/mtd/ubispl/ubispl.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <errno.h>
 #include <linux/bug.h>
+#include <linux/string.h>
 #include <u-boot/crc.h>
 #include <ubispl.h>
 
diff --git a/drivers/net/ag7xxx.c b/drivers/net/ag7xxx.c
index 48cf45d9a8f9..7171479c80de 100644
--- a/drivers/net/ag7xxx.c
+++ b/drivers/net/ag7xxx.c
@@ -25,6 +25,7 @@
 #include <linux/mii.h>
 #include <wait_bit.h>
 #include <asm/io.h>
+#include <linux/string.h>
 
 #include <mach/ath79.h>
 
diff --git a/drivers/net/altera_tse.c b/drivers/net/altera_tse.c
index 8b4ab9627c3b..e97937628004 100644
--- a/drivers/net/altera_tse.c
+++ b/drivers/net/altera_tse.c
@@ -22,6 +22,7 @@
 #include <asm/global_data.h>
 #include <linux/dma-mapping.h>
 #include <asm/io.h>
+#include <linux/string.h>
 #include "altera_tse.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/net/armada100_fec.c b/drivers/net/armada100_fec.c
index 018891e173c3..2dbd2d870b35 100644
--- a/drivers/net/armada100_fec.c
+++ b/drivers/net/armada100_fec.c
@@ -22,6 +22,7 @@
 #include <linux/mii.h>
 #include <asm/io.h>
 #include <asm/arch/armada100.h>
+#include <linux/string.h>
 #include "armada100_fec.h"
 
 #define  PHY_ADR_REQ     0xFF	/* Magic number to read/write PHY address */
diff --git a/drivers/net/at91_emac.c b/drivers/net/at91_emac.c
index e40b94ad892d..b62829387888 100644
--- a/drivers/net/at91_emac.c
+++ b/drivers/net/at91_emac.c
@@ -20,6 +20,7 @@
 #include <miiphy.h>
 #include <linux/delay.h>
 #include <linux/mii.h>
+#include <linux/string.h>
 
 #undef MII_DEBUG
 #undef ET_DEBUG
diff --git a/drivers/net/ax88180.c b/drivers/net/ax88180.c
index 402bcdb63ed7..a679b6529ff2 100644
--- a/drivers/net/ax88180.c
+++ b/drivers/net/ax88180.c
@@ -44,6 +44,7 @@
 #include <malloc.h>
 #include <linux/delay.h>
 #include <linux/mii.h>
+#include <linux/string.h>
 #include "ax88180.h"
 
 /*
diff --git a/drivers/net/bcm-sf2-eth-gmac.c b/drivers/net/bcm-sf2-eth-gmac.c
index cbe1e85222fa..3ab5841a7d0f 100644
--- a/drivers/net/bcm-sf2-eth-gmac.c
+++ b/drivers/net/bcm-sf2-eth-gmac.c
@@ -8,6 +8,7 @@
 #define DEBUG
 #include <linux/printk.h>
 #endif
+#include <linux/string.h>
 #endif
 
 #include <config.h>
diff --git a/drivers/net/bcm-sf2-eth.c b/drivers/net/bcm-sf2-eth.c
index 040b72e6db06..7ffdd87449ac 100644
--- a/drivers/net/bcm-sf2-eth.c
+++ b/drivers/net/bcm-sf2-eth.c
@@ -10,6 +10,7 @@
 #include <config.h>
 #include <linux/delay.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #include <phy.h>
 #include <miiphy.h>
diff --git a/drivers/net/bcm6368-eth.c b/drivers/net/bcm6368-eth.c
index f626412ef00a..8b0205350066 100644
--- a/drivers/net/bcm6368-eth.c
+++ b/drivers/net/bcm6368-eth.c
@@ -20,6 +20,7 @@
 #include <dm/device_compat.h>
 #include <linux/delay.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #define ETH_PORT_STR			"brcm,enetsw-port"
 
diff --git a/drivers/net/calxedaxgmac.c b/drivers/net/calxedaxgmac.c
index 8b2ee49b441c..75b519ccfd1e 100644
--- a/drivers/net/calxedaxgmac.c
+++ b/drivers/net/calxedaxgmac.c
@@ -10,6 +10,7 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <asm/io.h>
+#include <linux/string.h>
 
 #define TX_NUM_DESC			1
 #define RX_NUM_DESC			32
diff --git a/drivers/net/dc2114x.c b/drivers/net/dc2114x.c
index 9f8c6c58d952..8eacba7083c4 100644
--- a/drivers/net/dc2114x.c
+++ b/drivers/net/dc2114x.c
@@ -9,6 +9,7 @@
 #include <pci.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #define SROM_DLEVEL	0
 
diff --git a/drivers/net/designware.c b/drivers/net/designware.c
index c2f3a6483ddc..490db2b69fc1 100644
--- a/drivers/net/designware.c
+++ b/drivers/net/designware.c
@@ -29,6 +29,7 @@
 #include <linux/kernel.h>
 #include <asm/io.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include <power/regulator.h>
 #include "designware.h"
 
diff --git a/drivers/net/dm9000x.c b/drivers/net/dm9000x.c
index 3ff3824d52f0..9860830da092 100644
--- a/drivers/net/dm9000x.c
+++ b/drivers/net/dm9000x.c
@@ -56,6 +56,7 @@ TODO: external MII is not functional, only internal at the moment.
 #include <asm/io.h>
 #include <dm9000.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include "dm9000x.h"
 
diff --git a/drivers/net/dnet.c b/drivers/net/dnet.c
index fbcf15f26801..888a9990efef 100644
--- a/drivers/net/dnet.c
+++ b/drivers/net/dnet.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <log.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #ifndef CONFIG_DNET_AUTONEG_TIMEOUT
 #define CONFIG_DNET_AUTONEG_TIMEOUT	5000000	/* default value */
diff --git a/drivers/net/dwc_eth_qos.c b/drivers/net/dwc_eth_qos.c
index cec3d7eeb7e7..db76ac9c7528 100644
--- a/drivers/net/dwc_eth_qos.c
+++ b/drivers/net/dwc_eth_qos.c
@@ -52,6 +52,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 /* Core registers */
 
diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c
index 49be76670214..cf2c56cd123b 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 <linux/delay.h>
+#include <linux/string.h>
 #include "e1000.h"
 #include <asm/cache.h>
 
diff --git a/drivers/net/e1000_spi.c b/drivers/net/e1000_spi.c
index 4fcc65d9782c..ed3e987b12bd 100644
--- a/drivers/net/e1000_spi.c
+++ b/drivers/net/e1000_spi.c
@@ -2,6 +2,7 @@
 #include <command.h>
 #include <console.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include "e1000.h"
 #include <malloc.h>
 #include <linux/compiler.h>
diff --git a/drivers/net/eepro100.c b/drivers/net/eepro100.c
index feba5327da4d..392d44f89d75 100644
--- a/drivers/net/eepro100.c
+++ b/drivers/net/eepro100.c
@@ -13,6 +13,7 @@
 #include <netdev.h>
 #include <pci.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 /* Ethernet chip registers. */
 #define SCB_STATUS		0	/* Rx/Command Unit Status *Word* */
diff --git a/drivers/net/ep93xx_eth.c b/drivers/net/ep93xx_eth.c
index d1d881d6bd95..a72d9c2471dd 100644
--- a/drivers/net/ep93xx_eth.c
+++ b/drivers/net/ep93xx_eth.c
@@ -26,6 +26,7 @@
 #include <miiphy.h>
 #include <linux/bug.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include <linux/types.h>
 #include "ep93xx_eth.h"
 
diff --git a/drivers/net/ethoc.c b/drivers/net/ethoc.c
index a93358af1a71..7c56b7242d49 100644
--- a/drivers/net/ethoc.c
+++ b/drivers/net/ethoc.c
@@ -21,6 +21,7 @@
 #include <miiphy.h>
 #include <asm/cache.h>
 #include <wait_bit.h>
+#include <linux/string.h>
 
 /* register offsets */
 #define	MODER		0x00
diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c
index c0fc3133afb4..eef443f5f63e 100644
--- a/drivers/net/fec_mxc.c
+++ b/drivers/net/fec_mxc.c
@@ -21,6 +21,7 @@
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include <power/regulator.h>
 
 #include <asm/io.h>
diff --git a/drivers/net/fm/eth.c b/drivers/net/fm/eth.c
index 2f433cedd093..252f96787994 100644
--- a/drivers/net/fm/eth.c
+++ b/drivers/net/fm/eth.c
@@ -25,6 +25,7 @@
 #include <fsl_tgec.h>
 #include <fsl_memac.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include "fm.h"
 
diff --git a/drivers/net/fm/fm.c b/drivers/net/fm/fm.c
index bbb1738c4bdc..247a1c13645c 100644
--- a/drivers/net/fm/fm.c
+++ b/drivers/net/fm/fm.c
@@ -8,6 +8,7 @@
 #include <malloc.h>
 #include <asm/io.h>
 #include <linux/errno.h>
+#include <linux/string.h>
 #include <u-boot/crc.h>
 #ifdef CONFIG_DM_ETH
 #include <dm.h>
diff --git a/drivers/net/fm/init.c b/drivers/net/fm/init.c
index 2fed64205cb1..8f1a45b3a22e 100644
--- a/drivers/net/fm/init.c
+++ b/drivers/net/fm/init.c
@@ -14,6 +14,7 @@
 #else
 #include <asm/fsl_serdes.h>
 #endif
+#include <linux/string.h>
 
 #include "fm.h"
 
diff --git a/drivers/net/fm/memac_phy.c b/drivers/net/fm/memac_phy.c
index e15c28d50053..53e0760833cb 100644
--- a/drivers/net/fm/memac_phy.c
+++ b/drivers/net/fm/memac_phy.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <fsl_memac.h>
 #include <fm_eth.h>
+#include <linux/string.h>
 
 #ifdef CONFIG_SYS_MEMAC_LITTLE_ENDIAN
 #define memac_out_32(a, v)	out_le32(a, v)
diff --git a/drivers/net/fm/tgec_phy.c b/drivers/net/fm/tgec_phy.c
index 22225c2f82f9..ad6c08e431c4 100644
--- a/drivers/net/fm/tgec_phy.c
+++ b/drivers/net/fm/tgec_phy.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <fsl_tgec.h>
 #include <fm_eth.h>
+#include <linux/string.h>
 
 /*
  * Write value to the PHY for this device to the register at regnum, waiting
diff --git a/drivers/net/fsl-mc/dpio/qbman_portal.c b/drivers/net/fsl-mc/dpio/qbman_portal.c
index 44ce00041ee0..5a0bef9324fd 100644
--- a/drivers/net/fsl-mc/dpio/qbman_portal.c
+++ b/drivers/net/fsl-mc/dpio/qbman_portal.c
@@ -7,6 +7,7 @@
 #include <malloc.h>
 #include <asm/arch/clock.h>
 #include <linux/bug.h>
+#include <linux/string.h>
 #include "qbman_portal.h"
 
 /* QBMan portal management command codes */
diff --git a/drivers/net/fsl-mc/dpio/qbman_sys.h b/drivers/net/fsl-mc/dpio/qbman_sys.h
index fb760b94f85b..e320e9b905e7 100644
--- a/drivers/net/fsl-mc/dpio/qbman_sys.h
+++ b/drivers/net/fsl-mc/dpio/qbman_sys.h
@@ -22,6 +22,7 @@
  * required. */
 #include <linux/bug.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #undef QBMAN_CCSR_TRACE
 #undef QBMAN_CINH_TRACE
 #undef QBMAN_CENA_TRACE
diff --git a/drivers/net/fsl-mc/mc.c b/drivers/net/fsl-mc/mc.c
index 26e9523288e1..e088d1fc12dc 100644
--- a/drivers/net/fsl-mc/mc.c
+++ b/drivers/net/fsl-mc/mc.c
@@ -28,6 +28,7 @@
 #include <fsl-mc/fsl_dpsparser.h>
 #include <fsl-mc/fsl_qbman_portal.h>
 #include <fsl-mc/ldpaa_wriop.h>
+#include <linux/string.h>
 
 #define MC_RAM_BASE_ADDR_ALIGNMENT  (512UL * 1024 * 1024)
 #define MC_RAM_BASE_ADDR_ALIGNMENT_MASK	(~(MC_RAM_BASE_ADDR_ALIGNMENT - 1))
diff --git a/drivers/net/fsl_enetc.c b/drivers/net/fsl_enetc.c
index 2929ae72092e..d983841bafd5 100644
--- a/drivers/net/fsl_enetc.c
+++ b/drivers/net/fsl_enetc.c
@@ -17,6 +17,7 @@
 #include <miiphy.h>
 #include <linux/bug.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include "fsl_enetc.h"
 
diff --git a/drivers/net/fsl_mcdmafec.c b/drivers/net/fsl_mcdmafec.c
index f3eea57fb9a8..62f9d00ece34 100644
--- a/drivers/net/fsl_mcdmafec.c
+++ b/drivers/net/fsl_mcdmafec.c
@@ -23,6 +23,7 @@
 #include <linux/mii.h>
 #include <asm/immap.h>
 #include <asm/fsl_mcdmafec.h>
+#include <linux/string.h>
 
 #include "MCD_dma.h"
 
diff --git a/drivers/net/fsl_mdio.c b/drivers/net/fsl_mdio.c
index d2edd1751c3e..5f692a27f23c 100644
--- a/drivers/net/fsl_mdio.c
+++ b/drivers/net/fsl_mdio.c
@@ -11,6 +11,7 @@
 #include <fsl_mdio.h>
 #include <asm/io.h>
 #include <linux/errno.h>
+#include <linux/string.h>
 
 #ifdef CONFIG_DM_MDIO
 struct tsec_mdio_priv {
diff --git a/drivers/net/ftmac100.c b/drivers/net/ftmac100.c
index 4b94fd6405a0..c61d13aa21f8 100644
--- a/drivers/net/ftmac100.c
+++ b/drivers/net/ftmac100.c
@@ -16,6 +16,7 @@
 #include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/io.h>
+#include <linux/string.h>
 
 #include "ftmac100.h"
 #ifdef CONFIG_DM_ETH
diff --git a/drivers/net/ftmac110.c b/drivers/net/ftmac110.c
index d4a92a70e733..f186148b6197 100644
--- a/drivers/net/ftmac110.c
+++ b/drivers/net/ftmac110.c
@@ -16,6 +16,7 @@
 #include <linux/errno.h>
 #include <asm/io.h>
 #include <linux/dma-mapping.h>
+#include <linux/string.h>
 
 #if defined(CONFIG_MII) || defined(CONFIG_CMD_MII)
 #include <miiphy.h>
diff --git a/drivers/net/gmac_rockchip.c b/drivers/net/gmac_rockchip.c
index 98d7c39f9fee..7cd2451e0846 100644
--- a/drivers/net/gmac_rockchip.c
+++ b/drivers/net/gmac_rockchip.c
@@ -28,6 +28,7 @@
 #include <dm/pinctrl.h>
 #include <dt-bindings/clock/rk3288-cru.h>
 #include <linux/bitops.h>
+#include <linux/string.h>
 #include "designware.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/net/higmacv300.c b/drivers/net/higmacv300.c
index 2aae7f4863c0..0c71c51ceb43 100644
--- a/drivers/net/higmacv300.c
+++ b/drivers/net/higmacv300.c
@@ -18,6 +18,7 @@
 #include <net.h>
 #include <reset.h>
 #include <wait_bit.h>
+#include <linux/string.h>
 
 #define STATION_ADDR_LOW		0x0000
 #define STATION_ADDR_HIGH		0x0004
diff --git a/drivers/net/lan91c96.c b/drivers/net/lan91c96.c
index ce3c406ea6c2..524e9455ccf5 100644
--- a/drivers/net/lan91c96.c
+++ b/drivers/net/lan91c96.c
@@ -50,6 +50,7 @@
 #include <malloc.h>
 #include <time.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include "lan91c96.h"
 #include <net.h>
 #include <linux/compiler.h>
diff --git a/drivers/net/ldpaa_eth/ldpaa_eth.c b/drivers/net/ldpaa_eth/ldpaa_eth.c
index bbd2aed0ab24..d5384b216ab2 100644
--- a/drivers/net/ldpaa_eth/ldpaa_eth.c
+++ b/drivers/net/ldpaa_eth/ldpaa_eth.c
@@ -20,6 +20,7 @@
 #include <linux/compat.h>
 #include <fsl-mc/fsl_dpmac.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include <fsl-mc/ldpaa_wriop.h>
 #include "ldpaa_eth.h"
diff --git a/drivers/net/lpc32xx_eth.c b/drivers/net/lpc32xx_eth.c
index 3f281a515c6a..b059accf5247 100644
--- a/drivers/net/lpc32xx_eth.c
+++ b/drivers/net/lpc32xx_eth.c
@@ -19,6 +19,7 @@
 #include <asm/byteorder.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/config.h>
+#include <linux/string.h>
 
 /*
  * Notes:
diff --git a/drivers/net/macb.c b/drivers/net/macb.c
index cda9b16cc240..26939c6fa466 100644
--- a/drivers/net/macb.c
+++ b/drivers/net/macb.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 /*
  * The u-boot networking stack is a little weird.  It seems like the
diff --git a/drivers/net/mcffec.c b/drivers/net/mcffec.c
index d881c5eb871b..2d307b23afb6 100644
--- a/drivers/net/mcffec.c
+++ b/drivers/net/mcffec.c
@@ -22,6 +22,7 @@
 #include <asm/immap.h>
 #include <linux/delay.h>
 #include <linux/mii.h>
+#include <linux/string.h>
 
 #undef	ET_DEBUG
 #undef	MII_DEBUG
diff --git a/drivers/net/mcfmii.c b/drivers/net/mcfmii.c
index da5075172fa2..c99950d0e9ed 100644
--- a/drivers/net/mcfmii.c
+++ b/drivers/net/mcfmii.c
@@ -10,6 +10,7 @@
 #include <netdev.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #ifdef CONFIG_MCF547x_8x
 #include <asm/fsl_mcdmafec.h>
diff --git a/drivers/net/mpc8xx_fec.c b/drivers/net/mpc8xx_fec.c
index 282c2599d3c4..b6f805683e2c 100644
--- a/drivers/net/mpc8xx_fec.c
+++ b/drivers/net/mpc8xx_fec.c
@@ -14,6 +14,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include <phy.h>
 #include <linux/mii.h>
diff --git a/drivers/net/mscc_eswitch/jr2_switch.c b/drivers/net/mscc_eswitch/jr2_switch.c
index 97b2b081efb1..92debab424f5 100644
--- a/drivers/net/mscc_eswitch/jr2_switch.c
+++ b/drivers/net/mscc_eswitch/jr2_switch.c
@@ -18,6 +18,7 @@
 #include <net.h>
 #include <wait_bit.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #include <dt-bindings/mscc/jr2_data.h>
 #include "mscc_xfer.h"
diff --git a/drivers/net/mscc_eswitch/luton_switch.c b/drivers/net/mscc_eswitch/luton_switch.c
index 1d46d0e5e1e2..79f4d19dad97 100644
--- a/drivers/net/mscc_eswitch/luton_switch.c
+++ b/drivers/net/mscc_eswitch/luton_switch.c
@@ -16,6 +16,7 @@
 #include <miiphy.h>
 #include <net.h>
 #include <wait_bit.h>
+#include <linux/string.h>
 
 #include "mscc_xfer.h"
 #include "mscc_mac_table.h"
diff --git a/drivers/net/mscc_eswitch/ocelot_switch.c b/drivers/net/mscc_eswitch/ocelot_switch.c
index bdadaa13c725..de8a44e48bc1 100644
--- a/drivers/net/mscc_eswitch/ocelot_switch.c
+++ b/drivers/net/mscc_eswitch/ocelot_switch.c
@@ -18,6 +18,7 @@
 #include <net.h>
 #include <wait_bit.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #include "mscc_xfer.h"
 #include "mscc_mac_table.h"
diff --git a/drivers/net/mscc_eswitch/serval_switch.c b/drivers/net/mscc_eswitch/serval_switch.c
index bbced95f7e47..540799567ec9 100644
--- a/drivers/net/mscc_eswitch/serval_switch.c
+++ b/drivers/net/mscc_eswitch/serval_switch.c
@@ -18,6 +18,7 @@
 #include <net.h>
 #include <wait_bit.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #include "mscc_xfer.h"
 #include "mscc_mac_table.h"
diff --git a/drivers/net/mscc_eswitch/servalt_switch.c b/drivers/net/mscc_eswitch/servalt_switch.c
index c8aaf7d4897c..fc79d34b5193 100644
--- a/drivers/net/mscc_eswitch/servalt_switch.c
+++ b/drivers/net/mscc_eswitch/servalt_switch.c
@@ -17,6 +17,7 @@
 #include <net.h>
 #include <wait_bit.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #include "mscc_xfer.h"
 #include "mscc_miim.h"
diff --git a/drivers/net/mt7628-eth.c b/drivers/net/mt7628-eth.c
index 8b278c62ba75..3bf8b636ea84 100644
--- a/drivers/net/mt7628-eth.c
+++ b/drivers/net/mt7628-eth.c
@@ -29,6 +29,7 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 /* Ethernet frame engine register */
 #define PDMA_RELATED		0x0800
diff --git a/drivers/net/mtk_eth.c b/drivers/net/mtk_eth.c
index 774c1e3bb51f..7e7699339964 100644
--- a/drivers/net/mtk_eth.c
+++ b/drivers/net/mtk_eth.c
@@ -28,6 +28,7 @@
 #include <linux/mdio.h>
 #include <linux/mii.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #include "mtk_eth.h"
 
diff --git a/drivers/net/mvgbe.c b/drivers/net/mvgbe.c
index bf5f6f4b6723..5ceb37324f31 100644
--- a/drivers/net/mvgbe.c
+++ b/drivers/net/mvgbe.c
@@ -26,6 +26,7 @@
 #include <asm/system.h>
 #include <asm/byteorder.h>
 #include <asm/arch/cpu.h>
+#include <linux/string.h>
 
 #if defined(CONFIG_ARCH_KIRKWOOD)
 #include <asm/arch/soc.h>
diff --git a/drivers/net/mvneta.c b/drivers/net/mvneta.c
index 5fd668b5e42c..6ee0e1c7897b 100644
--- a/drivers/net/mvneta.c
+++ b/drivers/net/mvneta.c
@@ -37,6 +37,7 @@
 #include <linux/compat.h>
 #include <linux/mbus.h>
 #include <asm-generic/gpio.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/net/mvpp2.c b/drivers/net/mvpp2.c
index 37a8a7849f45..06eb619c002d 100644
--- a/drivers/net/mvpp2.c
+++ b/drivers/net/mvpp2.c
@@ -43,6 +43,7 @@
 #include <asm-generic/gpio.h>
 #include <fdt_support.h>
 #include <linux/mdio.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/net/natsemi.c b/drivers/net/natsemi.c
index bfd8cc396b98..e44787d33ba9 100644
--- a/drivers/net/natsemi.c
+++ b/drivers/net/natsemi.c
@@ -57,6 +57,7 @@
 #include <asm/io.h>
 #include <pci.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 /* defines */
 #define EEPROM_SIZE 0xb /*12 16-bit chunks, or 24 bytes*/
diff --git a/drivers/net/ne2000_base.c b/drivers/net/ne2000_base.c
index 25c258dd3f75..2fad46712201 100644
--- a/drivers/net/ne2000_base.c
+++ b/drivers/net/ne2000_base.c
@@ -80,6 +80,7 @@ Add SNMP
 #include <malloc.h>
 #include <time.h>
 #include <linux/compiler.h>
+#include <linux/string.h>
 
 /* forward definition of function used for the uboot interface */
 void uboot_push_packet_len(int len);
diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c
index f1d0630d0204..432d2b0121c8 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 <linux/string.h>
 
 #ifndef CONFIG_NETCONSOLE_BUFFER_SIZE
 #define CONFIG_NETCONSOLE_BUFFER_SIZE 512
diff --git a/drivers/net/ns8382x.c b/drivers/net/ns8382x.c
index d79872af0936..7192156a698c 100644
--- a/drivers/net/ns8382x.c
+++ b/drivers/net/ns8382x.c
@@ -58,6 +58,7 @@
 #include <asm/io.h>
 #include <pci.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 /* defines */
 #define DSIZE     0x00000FFF
diff --git a/drivers/net/pch_gbe.c b/drivers/net/pch_gbe.c
index 20d757f5dff0..c1596a2cd351 100644
--- a/drivers/net/pch_gbe.c
+++ b/drivers/net/pch_gbe.c
@@ -16,6 +16,7 @@
 #include <pci.h>
 #include <miiphy.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include "pch_gbe.h"
 
 #if !defined(CONFIG_PHYLIB)
diff --git a/drivers/net/pcnet.c b/drivers/net/pcnet.c
index ad5ac6618f7e..405ae75d0862 100644
--- a/drivers/net/pcnet.c
+++ b/drivers/net/pcnet.c
@@ -18,6 +18,7 @@
 #include <asm/io.h>
 #include <pci.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #define	PCNET_DEBUG_LEVEL	0	/* 0=off, 1=init, 2=rx/tx */
 
diff --git a/drivers/net/pfe_eth/pfe_cmd.c b/drivers/net/pfe_eth/pfe_cmd.c
index 1e69525cb71f..f72413cf132a 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 <linux/delay.h>
+#include <linux/string.h>
 #include <net/pfe_eth/pfe_eth.h>
 
 static inline void pfe_command_help(void)
diff --git a/drivers/net/pfe_eth/pfe_driver.c b/drivers/net/pfe_eth/pfe_driver.c
index 6f443b4ea81c..573ceabcf7e0 100644
--- a/drivers/net/pfe_eth/pfe_driver.c
+++ b/drivers/net/pfe_eth/pfe_driver.c
@@ -7,6 +7,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include <net/pfe_eth/pfe_eth.h>
 #include <net/pfe_eth/pfe_firmware.h>
 
diff --git a/drivers/net/pfe_eth/pfe_firmware.c b/drivers/net/pfe_eth/pfe_firmware.c
index 55e661c0e1d5..1601ec48a59d 100644
--- a/drivers/net/pfe_eth/pfe_firmware.c
+++ b/drivers/net/pfe_eth/pfe_firmware.c
@@ -14,6 +14,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <linux/bitops.h>
+#include <linux/string.h>
 #include <net/pfe_eth/pfe_eth.h>
 #include <net/pfe_eth/pfe_firmware.h>
 #include <spi_flash.h>
diff --git a/drivers/net/pfe_eth/pfe_hw.c b/drivers/net/pfe_eth/pfe_hw.c
index 722f5c238fa1..2889dd6b9070 100644
--- a/drivers/net/pfe_eth/pfe_hw.c
+++ b/drivers/net/pfe_eth/pfe_hw.c
@@ -5,6 +5,7 @@
  */
 #include <log.h>
 #include <linux/bitops.h>
+#include <linux/string.h>
 #include <net/pfe_eth/pfe_eth.h>
 #include <net/pfe_eth/pfe/pfe_hw.h>
 
diff --git a/drivers/net/phy/aquantia.c b/drivers/net/phy/aquantia.c
index 68cd3d03fd06..59c7abeb667b 100644
--- a/drivers/net/phy/aquantia.c
+++ b/drivers/net/phy/aquantia.c
@@ -13,6 +13,7 @@
 #include <phy.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include <u-boot/crc.h>
 #include <malloc.h>
 #include <asm/byteorder.h>
diff --git a/drivers/net/phy/atheros.c b/drivers/net/phy/atheros.c
index f922fecd6b5d..29db299c1e79 100644
--- a/drivers/net/phy/atheros.c
+++ b/drivers/net/phy/atheros.c
@@ -12,6 +12,7 @@
 #include <linux/bitfield.h>
 #include <linux/bitops.h>
 #include <dt-bindings/net/qca-ar803x.h>
+#include <linux/string.h>
 
 #define AR803x_PHY_DEBUG_ADDR_REG	0x1d
 #define AR803x_PHY_DEBUG_DATA_REG	0x1e
diff --git a/drivers/net/phy/b53.c b/drivers/net/phy/b53.c
index 21da53c7e5b3..b376ef8f82b9 100644
--- a/drivers/net/phy/b53.c
+++ b/drivers/net/phy/b53.c
@@ -26,6 +26,7 @@
 #include <command.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include <errno.h>
 #include <malloc.h>
diff --git a/drivers/net/phy/fixed.c b/drivers/net/phy/fixed.c
index 3228672fc4ae..d3e9e3e3d4af 100644
--- a/drivers/net/phy/fixed.c
+++ b/drivers/net/phy/fixed.c
@@ -12,6 +12,7 @@
 #include <dm.h>
 #include <fdt_support.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/net/phy/miiphybb.c b/drivers/net/phy/miiphybb.c
index bb5aa3513b61..6b031196f44d 100644
--- a/drivers/net/phy/miiphybb.c
+++ b/drivers/net/phy/miiphybb.c
@@ -17,6 +17,7 @@
 #include <ppc_asm.tmpl>
 #include <miiphy.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 
 #define BB_MII_RELOCATE(v,off) (v += (v?off:0))
 
diff --git a/drivers/net/phy/mv88e61xx.c b/drivers/net/phy/mv88e61xx.c
index 7eff37b24499..832b538f5e92 100644
--- a/drivers/net/phy/mv88e61xx.c
+++ b/drivers/net/phy/mv88e61xx.c
@@ -33,6 +33,7 @@
 #include <log.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include <bitfield.h>
 #include <errno.h>
diff --git a/drivers/net/phy/mv88e6352.c b/drivers/net/phy/mv88e6352.c
index 62a7f1921493..40e0edc6d88e 100644
--- a/drivers/net/phy/mv88e6352.c
+++ b/drivers/net/phy/mv88e6352.c
@@ -11,6 +11,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <mv88e6352.h>
+#include <linux/string.h>
 
 #define SMI_HDR		((0x8 | 0x1) << 12)
 #define SMI_BUSY_MASK	(0x8000)
diff --git a/drivers/net/phy/ncsi.c b/drivers/net/phy/ncsi.c
index bf1e832be9f1..862a1564a732 100644
--- a/drivers/net/phy/ncsi.c
+++ b/drivers/net/phy/ncsi.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <phy.h>
+#include <linux/string.h>
 #include <net/ncsi.h>
 #include <net/ncsi-pkt.h>
 #include <asm/unaligned.h>
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index f82547593864..030dc7538241 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -22,6 +22,7 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/compiler.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/net/pic32_mdio.c b/drivers/net/pic32_mdio.c
index d4049cfea525..802563960a16 100644
--- a/drivers/net/pic32_mdio.c
+++ b/drivers/net/pic32_mdio.c
@@ -12,6 +12,7 @@
 #include <wait_bit.h>
 #include <asm/io.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include "pic32_eth.h"
 
 static int pic32_mdio_write(struct mii_dev *bus,
diff --git a/drivers/net/ravb.c b/drivers/net/ravb.c
index 6ab56e6e6538..8f76279c7eed 100644
--- a/drivers/net/ravb.c
+++ b/drivers/net/ravb.c
@@ -25,6 +25,7 @@
 #include <wait_bit.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
+#include <linux/string.h>
 
 /* Registers */
 #define RAVB_REG_CCC		0x000
diff --git a/drivers/net/rtl8139.c b/drivers/net/rtl8139.c
index 71f2aba4c709..1229e94185cb 100644
--- a/drivers/net/rtl8139.c
+++ b/drivers/net/rtl8139.c
@@ -79,6 +79,7 @@
 #include <pci.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include <linux/types.h>
 
 #define RTL_TIMEOUT	100000
diff --git a/drivers/net/rtl8169.c b/drivers/net/rtl8169.c
index 5ff99273a02c..9157dd1e351a 100644
--- a/drivers/net/rtl8169.c
+++ b/drivers/net/rtl8169.c
@@ -56,6 +56,7 @@
 #include <pci.h>
 #include <linux/delay.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #undef DEBUG_RTL8169
 #undef DEBUG_RTL8169_TX
diff --git a/drivers/net/sandbox-raw-bus.c b/drivers/net/sandbox-raw-bus.c
index fb1ba5a8c83a..6b111d47eea8 100644
--- a/drivers/net/sandbox-raw-bus.c
+++ b/drivers/net/sandbox-raw-bus.c
@@ -11,6 +11,7 @@
 #include <malloc.h>
 #include <dm/device-internal.h>
 #include <dm/lists.h>
+#include <linux/string.h>
 
 static int eth_raw_bus_post_bind(struct udevice *dev)
 {
diff --git a/drivers/net/sandbox-raw.c b/drivers/net/sandbox-raw.c
index 6dddae911b04..bda3ffd003b4 100644
--- a/drivers/net/sandbox-raw.c
+++ b/drivers/net/sandbox-raw.c
@@ -14,6 +14,7 @@
 #include <malloc.h>
 #include <net.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/net/sandbox.c b/drivers/net/sandbox.c
index 555d9147d11e..b63b3aaebcff 100644
--- a/drivers/net/sandbox.c
+++ b/drivers/net/sandbox.c
@@ -15,6 +15,7 @@
 #include <asm/eth.h>
 #include <asm/global_data.h>
 #include <asm/test.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c
index 49b4a91875ab..8f2fe1515e67 100644
--- a/drivers/net/sh_eth.c
+++ b/drivers/net/sh_eth.c
@@ -22,6 +22,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/io.h>
+#include <linux/string.h>
 
 #ifdef CONFIG_DM_ETH
 #include <clk.h>
diff --git a/drivers/net/smc91111.c b/drivers/net/smc91111.c
index 3ae9f805a790..3ae55a1db7da 100644
--- a/drivers/net/smc91111.c
+++ b/drivers/net/smc91111.c
@@ -53,6 +53,7 @@
 #include <malloc.h>
 #include <time.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include "smc91111.h"
 #include <net.h>
 
diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
index 09372d7f6ba9..0ac1e3fb3d76 100644
--- a/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.c
@@ -12,6 +12,7 @@
 #include <miiphy.h>
 #include <linux/io.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include <linux/types.h>
 
 #include "smc911x.h"
diff --git a/drivers/net/sni_ave.c b/drivers/net/sni_ave.c
index 6e228da2984d..9288355fb4ad 100644
--- a/drivers/net/sni_ave.c
+++ b/drivers/net/sni_ave.c
@@ -24,6 +24,7 @@
 #include <linux/io.h>
 #include <linux/iopoll.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #define AVE_GRST_DELAY_MSEC	40
 #define AVE_MIN_XMITSIZE	60
diff --git a/drivers/net/sun8i_emac.c b/drivers/net/sun8i_emac.c
index e74cfa993247..77c03cbf3012 100644
--- a/drivers/net/sun8i_emac.c
+++ b/drivers/net/sun8i_emac.c
@@ -34,6 +34,7 @@
 #if CONFIG_IS_ENABLED(DM_GPIO)
 #include <asm-generic/gpio.h>
 #endif
+#include <linux/string.h>
 
 #define MDIO_CMD_MII_BUSY		BIT(0)
 #define MDIO_CMD_MII_WRITE		BIT(1)
diff --git a/drivers/net/sunxi_emac.c b/drivers/net/sunxi_emac.c
index df18ecc06450..e1176454f2eb 100644
--- a/drivers/net/sunxi_emac.c
+++ b/drivers/net/sunxi_emac.c
@@ -18,6 +18,7 @@
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/gpio.h>
+#include <linux/string.h>
 
 /* EMAC register  */
 struct emac_regs {
diff --git a/drivers/net/ti/cpsw-common.c b/drivers/net/ti/cpsw-common.c
index d5428274d190..9ed0b56cc800 100644
--- a/drivers/net/ti/cpsw-common.c
+++ b/drivers/net/ti/cpsw-common.c
@@ -13,6 +13,7 @@
 #include <cpsw.h>
 #include <dm/device_compat.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/net/ti/cpsw.c b/drivers/net/ti/cpsw.c
index 7521deaaa977..044a74776c35 100644
--- a/drivers/net/ti/cpsw.c
+++ b/drivers/net/ti/cpsw.c
@@ -25,6 +25,7 @@
 #include <asm/arch/cpu.h>
 #include <dm.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #include "cpsw_mdio.h"
 
diff --git a/drivers/net/ti/davinci_emac.c b/drivers/net/ti/davinci_emac.c
index 56ea1fec0af6..c2df17d3a6f7 100644
--- a/drivers/net/ti/davinci_emac.c
+++ b/drivers/net/ti/davinci_emac.c
@@ -33,6 +33,7 @@
 #include <asm/arch/emac_defs.h>
 #include <asm/io.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include "davinci_emac.h"
 
 unsigned int	emac_dbg = 0;
diff --git a/drivers/net/tsec.c b/drivers/net/tsec.c
index 5d12e4b77558..b7623bf85b13 100644
--- a/drivers/net/tsec.c
+++ b/drivers/net/tsec.c
@@ -20,6 +20,7 @@
 #include <linux/errno.h>
 #include <asm/processor.h>
 #include <asm/io.h>
+#include <linux/string.h>
 
 #ifndef CONFIG_DM_ETH
 /* Default initializations for TSEC controllers. */
diff --git a/drivers/net/uli526x.c b/drivers/net/uli526x.c
index 3191868cae5a..3784f72b87e8 100644
--- a/drivers/net/uli526x.c
+++ b/drivers/net/uli526x.c
@@ -17,6 +17,7 @@
 #include <pci.h>
 #include <miiphy.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 /* some kernel function compatible define */
 
diff --git a/drivers/net/xilinx_axi_emac.c b/drivers/net/xilinx_axi_emac.c
index 2a2e0585a34b..da571efde4e0 100644
--- a/drivers/net/xilinx_axi_emac.c
+++ b/drivers/net/xilinx_axi_emac.c
@@ -19,6 +19,7 @@
 #include <miiphy.h>
 #include <wait_bit.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/net/zynq_gem.c b/drivers/net/zynq_gem.c
index da4b6fba9ff6..9d19e89090c5 100644
--- a/drivers/net/zynq_gem.c
+++ b/drivers/net/zynq_gem.c
@@ -31,6 +31,7 @@
 #include <linux/bitops.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/string.h>
 
 /* Bit/mask specification */
 #define ZYNQ_GEM_PHYMNTNC_OP_MASK	0x40020000 /* operation mask bits */
diff --git a/drivers/nvme/nvme.c b/drivers/nvme/nvme.c
index fc64d93ab83b..6d8ab8bf786f 100644
--- a/drivers/nvme/nvme.c
+++ b/drivers/nvme/nvme.c
@@ -16,6 +16,7 @@
 #include <time.h>
 #include <dm/device-internal.h>
 #include <linux/compat.h>
+#include <linux/string.h>
 #include "nvme.h"
 
 #define NVME_Q_DEPTH		2
diff --git a/drivers/pci/fsl_pci_init.c b/drivers/pci/fsl_pci_init.c
index e72a60c13180..ffd160439fdf 100644
--- a/drivers/pci/fsl_pci_init.c
+++ b/drivers/pci/fsl_pci_init.c
@@ -11,6 +11,7 @@
 #include <asm/fsl_serdes.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/pci/pci-uclass.c b/drivers/pci/pci-uclass.c
index aec09bd5a545..9aa616ccfa9e 100644
--- a/drivers/pci/pci-uclass.c
+++ b/drivers/pci/pci-uclass.c
@@ -20,6 +20,7 @@
 #endif
 #include <linux/delay.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include "pci_internal.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/pci/pci_ftpci100.c b/drivers/pci/pci_ftpci100.c
index 32fac878a672..f7a601726725 100644
--- a/drivers/pci/pci_ftpci100.c
+++ b/drivers/pci/pci_ftpci100.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <pci.h>
+#include <linux/string.h>
 
 #include <faraday/ftpci100.h>
 
diff --git a/drivers/pci/pci_rom.c b/drivers/pci/pci_rom.c
index c69919faafe0..68b9949ba1e2 100644
--- a/drivers/pci/pci_rom.c
+++ b/drivers/pci/pci_rom.c
@@ -41,6 +41,7 @@
 #include <acpi/acpi_s3.h>
 #include <asm/global_data.h>
 #include <linux/screen_info.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/pci/pci_tegra.c b/drivers/pci/pci_tegra.c
index abd4e26543be..8845dc451e55 100644
--- a/drivers/pci/pci_tegra.c
+++ b/drivers/pci/pci_tegra.c
@@ -24,6 +24,7 @@
 #include <time.h>
 #include <linux/delay.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #include <asm/io.h>
 #include <asm/gpio.h>
diff --git a/drivers/pci/pcie_imx.c b/drivers/pci/pcie_imx.c
index cbf12371a0f7..16468e733640 100644
--- a/drivers/pci/pcie_imx.c
+++ b/drivers/pci/pcie_imx.c
@@ -24,6 +24,7 @@
 #include <linux/sizes.h>
 #include <errno.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/string.h>
 
 #define PCI_ACCESS_READ  0
 #define PCI_ACCESS_WRITE 1
diff --git a/drivers/pci/pcie_layerscape_fixup_common.c b/drivers/pci/pcie_layerscape_fixup_common.c
index 814650f1e15c..bba410e386f6 100644
--- a/drivers/pci/pcie_layerscape_fixup_common.c
+++ b/drivers/pci/pcie_layerscape_fixup_common.c
@@ -12,6 +12,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/soc.h>
 #include <linux/libfdt.h>
+#include <linux/string.h>
 #include "pcie_layerscape_fixup_common.h"
 
 void ft_pci_setup(void *blob, struct bd_info *bd)
diff --git a/drivers/pci_endpoint/sandbox-pci_ep.c b/drivers/pci_endpoint/sandbox-pci_ep.c
index 8e05d5ba8906..d1e552a24662 100644
--- a/drivers/pci_endpoint/sandbox-pci_ep.c
+++ b/drivers/pci_endpoint/sandbox-pci_ep.c
@@ -9,6 +9,7 @@
 #include <pci.h>
 #include <pci_ep.h>
 #include <asm/test.h>
+#include <linux/string.h>
 
 /**
  * struct sandbox_pci_ep_priv - private data for driver
diff --git a/drivers/phy/allwinner/phy-sun4i-usb.c b/drivers/phy/allwinner/phy-sun4i-usb.c
index f050645044c9..db62fd45f8f2 100644
--- a/drivers/phy/allwinner/phy-sun4i-usb.c
+++ b/drivers/phy/allwinner/phy-sun4i-usb.c
@@ -26,6 +26,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/string.h>
 
 #define REG_ISCR			0x00
 #define REG_PHYCTL_A10			0x04
diff --git a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
index 29749b4c3fa3..75bd0fff5db3 100644
--- a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
+++ b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
@@ -19,6 +19,7 @@
 #include <asm/io.h>
 #include <linux/iopoll.h>
 #include <asm/arch-rockchip/clock.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/phy/rockchip/phy-rockchip-typec.c b/drivers/phy/rockchip/phy-rockchip-typec.c
index 6a5dc7ee44f7..9a9a653c7efb 100644
--- a/drivers/phy/rockchip/phy-rockchip-typec.c
+++ b/drivers/phy/rockchip/phy-rockchip-typec.c
@@ -21,6 +21,7 @@
 #include <asm/io.h>
 #include <linux/iopoll.h>
 #include <asm/arch-rockchip/clock.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/pinctrl/exynos/pinctrl-exynos.c b/drivers/pinctrl/exynos/pinctrl-exynos.c
index cc7ef7998950..6034794f6713 100644
--- a/drivers/pinctrl/exynos/pinctrl-exynos.c
+++ b/drivers/pinctrl/exynos/pinctrl-exynos.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <linux/string.h>
 #include "pinctrl-exynos.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/pinctrl/mtmips/pinctrl-mtmips-common.c b/drivers/pinctrl/mtmips/pinctrl-mtmips-common.c
index e361916eb285..d5262438e17b 100644
--- a/drivers/pinctrl/mtmips/pinctrl-mtmips-common.c
+++ b/drivers/pinctrl/mtmips/pinctrl-mtmips-common.c
@@ -10,6 +10,7 @@
 #include <malloc.h>
 #include <dm/pinctrl.h>
 #include <linux/io.h>
+#include <linux/string.h>
 
 #include "pinctrl-mtmips-common.h"
 
diff --git a/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c b/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c
index b64ad9a21c6e..7541898ac46f 100644
--- a/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c
+++ b/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c
@@ -36,6 +36,7 @@
 #include <linux/bitops.h>
 #include <linux/libfdt.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/pinctrl/pinctrl-generic.c b/drivers/pinctrl/pinctrl-generic.c
index 313aeccb1eec..7a2131d73ea1 100644
--- a/drivers/pinctrl/pinctrl-generic.c
+++ b/drivers/pinctrl/pinctrl-generic.c
@@ -8,6 +8,7 @@
 #include <dm/device_compat.h>
 #include <linux/compat.h>
 #include <dm/pinctrl.h>
+#include <linux/string.h>
 
 /**
  * pinctrl_pin_name_to_selector() - return the pin selector for a pin
diff --git a/drivers/pinctrl/pinctrl-sandbox.c b/drivers/pinctrl/pinctrl-sandbox.c
index ac0119d1988b..b33122946838 100644
--- a/drivers/pinctrl/pinctrl-sandbox.c
+++ b/drivers/pinctrl/pinctrl-sandbox.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <dm/pinctrl.h>
 #include <linux/bitops.h>
+#include <linux/string.h>
 
 static const char * const sandbox_pins[] = {
 	"SCL",
diff --git a/drivers/pinctrl/pinctrl-stmfx.c b/drivers/pinctrl/pinctrl-stmfx.c
index c2ea82770e63..2c437c25f69e 100644
--- a/drivers/pinctrl/pinctrl-stmfx.c
+++ b/drivers/pinctrl/pinctrl-stmfx.c
@@ -17,6 +17,7 @@
 #include <linux/bitfield.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include <power/regulator.h>
 
 /* STMFX pins = GPIO[15:0] + aGPIO[7:0] */
diff --git a/drivers/pinctrl/rockchip/pinctrl-rockchip-core.c b/drivers/pinctrl/rockchip/pinctrl-rockchip-core.c
index 8abad950431c..16efb09b57f9 100644
--- a/drivers/pinctrl/rockchip/pinctrl-rockchip-core.c
+++ b/drivers/pinctrl/rockchip/pinctrl-rockchip-core.c
@@ -13,6 +13,7 @@
 #include <fdtdec.h>
 #include <linux/bitops.h>
 #include <linux/libfdt.h>
+#include <linux/string.h>
 
 #include "pinctrl-rockchip.h"
 
diff --git a/drivers/power/domain/imx8-power-domain-legacy.c b/drivers/power/domain/imx8-power-domain-legacy.c
index 961382f33e1c..980b946fca1e 100644
--- a/drivers/power/domain/imx8-power-domain-legacy.c
+++ b/drivers/power/domain/imx8-power-domain-legacy.c
@@ -15,6 +15,7 @@
 #include <dm/device.h>
 #include <dm/uclass-internal.h>
 #include <asm/arch/sci/sci.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/power/pmic/i2c_pmic_emul.c b/drivers/power/pmic/i2c_pmic_emul.c
index 83d3c292044d..4e72e966cfe8 100644
--- a/drivers/power/pmic/i2c_pmic_emul.c
+++ b/drivers/power/pmic/i2c_pmic_emul.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include <power/pmic.h>
 #include <power/sandbox_pmic.h>
 
diff --git a/drivers/power/pmic/palmas.c b/drivers/power/pmic/palmas.c
index eb83c88d5641..88f88e0014ca 100644
--- a/drivers/power/pmic/palmas.c
+++ b/drivers/power/pmic/palmas.c
@@ -11,6 +11,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/palmas.h>
diff --git a/drivers/power/pmic/pmic-uclass.c b/drivers/power/pmic/pmic-uclass.c
index 7770171917d7..a83131e17365 100644
--- a/drivers/power/pmic/pmic-uclass.c
+++ b/drivers/power/pmic/pmic-uclass.c
@@ -13,6 +13,7 @@
 #include <dm/lists.h>
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
+#include <linux/string.h>
 #include <power/pmic.h>
 #include <linux/ctype.h>
 
diff --git a/drivers/power/power_core.c b/drivers/power/power_core.c
index eeed8e24a90b..9caa4d72b6de 100644
--- a/drivers/power/power_core.c
+++ b/drivers/power/power_core.c
@@ -13,6 +13,7 @@
 #include <command.h>
 #include <log.h>
 #include <malloc.h>
+#include <linux/string.h>
 #include <linux/types.h>
 #include <linux/list.h>
 #include <power/pmic.h>
diff --git a/drivers/power/power_i2c.c b/drivers/power/power_i2c.c
index 5a0455e1195a..41d7113251d9 100644
--- a/drivers/power/power_i2c.c
+++ b/drivers/power/power_i2c.c
@@ -12,6 +12,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <linux/string.h>
 #include <linux/types.h>
 #include <power/pmic.h>
 #include <i2c.h>
diff --git a/drivers/power/regulator/bd71837.c b/drivers/power/regulator/bd71837.c
index 3499bd2c56b2..8c7f71be3e81 100644
--- a/drivers/power/regulator/bd71837.c
+++ b/drivers/power/regulator/bd71837.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <linux/bitops.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include <power/bd71837.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/regulator/da9063.c b/drivers/power/regulator/da9063.c
index 5055e39cb797..3e5d2596561f 100644
--- a/drivers/power/regulator/da9063.c
+++ b/drivers/power/regulator/da9063.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <linux/bitops.h>
+#include <linux/string.h>
 #include <power/da9063_pmic.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/regulator/palmas_regulator.c b/drivers/power/regulator/palmas_regulator.c
index 78909f701894..9bb8c7ff32a9 100644
--- a/drivers/power/regulator/palmas_regulator.c
+++ b/drivers/power/regulator/palmas_regulator.c
@@ -11,6 +11,7 @@
 #include <errno.h>
 #include <dm.h>
 #include <i2c.h>
+#include <linux/string.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/palmas.h>
diff --git a/drivers/power/regulator/pfuze100.c b/drivers/power/regulator/pfuze100.c
index b56843046f27..15f34b915f20 100644
--- a/drivers/power/regulator/pfuze100.c
+++ b/drivers/power/regulator/pfuze100.c
@@ -11,6 +11,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <log.h>
+#include <linux/string.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/pfuze100_pmic.h>
diff --git a/drivers/power/regulator/regulator-uclass.c b/drivers/power/regulator/regulator-uclass.c
index da679a572c23..c20c42b29d03 100644
--- a/drivers/power/regulator/regulator-uclass.c
+++ b/drivers/power/regulator/regulator-uclass.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <dm/uclass-internal.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 
diff --git a/drivers/qe/qe.c b/drivers/qe/qe.c
index 79dcbf049a05..cfcc247389af 100644
--- a/drivers/qe/qe.c
+++ b/drivers/qe/qe.c
@@ -15,6 +15,7 @@
 #include <linux/immap_qe.h>
 #include <fsl_qe.h>
 #include <mmc.h>
+#include <linux/string.h>
 #include <u-boot/crc.h>
 
 #ifdef CONFIG_ARCH_LS1021A
diff --git a/drivers/qe/uccf.c b/drivers/qe/uccf.c
index 9beb5d90aca6..4d5840e77b1b 100644
--- a/drivers/qe/uccf.c
+++ b/drivers/qe/uccf.c
@@ -11,6 +11,7 @@
 #include <linux/errno.h>
 #include <asm/io.h>
 #include <linux/immap_qe.h>
+#include <linux/string.h>
 #include "uccf.h"
 #include <fsl_qe.h>
 
diff --git a/drivers/qe/uec.c b/drivers/qe/uec.c
index 01434543873b..409d806dd8f3 100644
--- a/drivers/qe/uec.c
+++ b/drivers/qe/uec.c
@@ -13,6 +13,7 @@
 #include <linux/errno.h>
 #include <asm/io.h>
 #include <linux/immap_qe.h>
+#include <linux/string.h>
 #include "uccf.h"
 #include "uec.h"
 #include "uec_phy.h"
diff --git a/drivers/qe/uec_phy.c b/drivers/qe/uec_phy.c
index 69c22dd5e261..69a520d4baf9 100644
--- a/drivers/qe/uec_phy.c
+++ b/drivers/qe/uec_phy.c
@@ -16,6 +16,7 @@
 #include <linux/errno.h>
 #include <linux/immap_qe.h>
 #include <asm/io.h>
+#include <linux/string.h>
 #include "uccf.h"
 #include "uec.h"
 #include "uec_phy.h"
diff --git a/drivers/ram/imxrt_sdram.c b/drivers/ram/imxrt_sdram.c
index 8be15340b94c..dcf3590c6c39 100644
--- a/drivers/ram/imxrt_sdram.c
+++ b/drivers/ram/imxrt_sdram.c
@@ -15,6 +15,7 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 /* SDRAM Command Code */
 #define SD_CC_ARD		0x0     /* Master Bus (AXI) command - Read */
diff --git a/drivers/ram/rockchip/sdram_rk3188.c b/drivers/ram/rockchip/sdram_rk3188.c
index 06f9eba1a5b8..d3ed9bcc29e2 100644
--- a/drivers/ram/rockchip/sdram_rk3188.c
+++ b/drivers/ram/rockchip/sdram_rk3188.c
@@ -27,6 +27,7 @@
 #include <asm/arch-rockchip/sdram_rk3288.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/string.h>
 
 struct chan_info {
 	struct rk3288_ddr_pctl *pctl;
diff --git a/drivers/ram/rockchip/sdram_rk322x.c b/drivers/ram/rockchip/sdram_rk322x.c
index 4a24854a3df8..4154f0c2642f 100644
--- a/drivers/ram/rockchip/sdram_rk322x.c
+++ b/drivers/ram/rockchip/sdram_rk322x.c
@@ -23,6 +23,7 @@
 #include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 struct chan_info {
diff --git a/drivers/ram/rockchip/sdram_rk3288.c b/drivers/ram/rockchip/sdram_rk3288.c
index 26e8d059b5d8..01f030e01a16 100644
--- a/drivers/ram/rockchip/sdram_rk3288.c
+++ b/drivers/ram/rockchip/sdram_rk3288.c
@@ -27,6 +27,7 @@
 #include <asm/arch-rockchip/sdram_rk3288.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/string.h>
 #include <power/regulator.h>
 #include <power/rk8xx_pmic.h>
 
diff --git a/drivers/ram/rockchip/sdram_rk3328.c b/drivers/ram/rockchip/sdram_rk3328.c
index 98c7feb6cfab..586e82e6ebc0 100644
--- a/drivers/ram/rockchip/sdram_rk3328.c
+++ b/drivers/ram/rockchip/sdram_rk3328.c
@@ -20,6 +20,7 @@
 #include <asm/arch-rockchip/sdram_rk3328.h>
 #include <asm/arch-rockchip/uart.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 struct dram_info {
 #ifdef CONFIG_TPL_BUILD
diff --git a/drivers/ram/stm32_sdram.c b/drivers/ram/stm32_sdram.c
index de5a9bc05697..1b8cb5949660 100644
--- a/drivers/ram/stm32_sdram.c
+++ b/drivers/ram/stm32_sdram.c
@@ -15,6 +15,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #define MEM_MODE_MASK	GENMASK(2, 0)
 #define SWP_FMC_OFFSET 10
diff --git a/drivers/ram/stm32mp1/stm32mp1_ddr.c b/drivers/ram/stm32mp1/stm32mp1_ddr.c
index 8b59903e6bf9..350681bcfe54 100644
--- a/drivers/ram/stm32mp1/stm32mp1_ddr.c
+++ b/drivers/ram/stm32mp1/stm32mp1_ddr.c
@@ -15,6 +15,7 @@
 #include <linux/delay.h>
 #include <linux/iopoll.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include "stm32mp1_ddr.h"
 #include "stm32mp1_ddr_regs.h"
 
diff --git a/drivers/ram/stm32mp1/stm32mp1_interactive.c b/drivers/ram/stm32mp1/stm32mp1_interactive.c
index d3b8b3b5afa5..398018e4c253 100644
--- a/drivers/ram/stm32mp1/stm32mp1_interactive.c
+++ b/drivers/ram/stm32mp1/stm32mp1_interactive.c
@@ -14,6 +14,7 @@
 #include <reset.h>
 #include <time.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 #include "stm32mp1_ddr.h"
 #include "stm32mp1_tests.h"
 
diff --git a/drivers/ram/stm32mp1/stm32mp1_ram.c b/drivers/ram/stm32mp1/stm32mp1_ram.c
index 63333a1b1b69..85e01ffd098d 100644
--- a/drivers/ram/stm32mp1/stm32mp1_ram.c
+++ b/drivers/ram/stm32mp1/stm32mp1_ram.c
@@ -13,6 +13,7 @@
 #include <syscon.h>
 #include <asm/io.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include "stm32mp1_ddr.h"
 
 static const char *const clkname[] = {
diff --git a/drivers/ram/stm32mp1/stm32mp1_tests.c b/drivers/ram/stm32mp1/stm32mp1_tests.c
index b0c510ad5e99..a5433ac14024 100644
--- a/drivers/ram/stm32mp1/stm32mp1_tests.c
+++ b/drivers/ram/stm32mp1/stm32mp1_tests.c
@@ -11,6 +11,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/log2.h>
+#include <linux/string.h>
 #include "stm32mp1_tests.h"
 
 #define ADDR_INVALID	0xFFFFFFFF
diff --git a/drivers/ram/stm32mp1/stm32mp1_tuning.c b/drivers/ram/stm32mp1/stm32mp1_tuning.c
index 2fc8e32847c2..222777ad3cf3 100644
--- a/drivers/ram/stm32mp1/stm32mp1_tuning.c
+++ b/drivers/ram/stm32mp1/stm32mp1_tuning.c
@@ -14,6 +14,7 @@
 #include <linux/delay.h>
 #include <linux/iopoll.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #include "stm32mp1_ddr_regs.h"
 #include "stm32mp1_ddr.h"
diff --git a/drivers/remoteproc/k3_system_controller.c b/drivers/remoteproc/k3_system_controller.c
index 54209fccb3e2..44271c5baf8e 100644
--- a/drivers/remoteproc/k3_system_controller.c
+++ b/drivers/remoteproc/k3_system_controller.c
@@ -14,6 +14,7 @@
 #include <mailbox.h>
 #include <dm/device_compat.h>
 #include <linux/soc/ti/k3-sec-proxy.h>
+#include <linux/string.h>
 
 #define K3_MSG_R5_TO_M3_M3FW			0x8105
 #define K3_MSG_M3_TO_R5_CERT_RESULT		0x8805
diff --git a/drivers/remoteproc/rproc-elf-loader.c b/drivers/remoteproc/rproc-elf-loader.c
index 1e309c0f4f90..45331107353b 100644
--- a/drivers/remoteproc/rproc-elf-loader.c
+++ b/drivers/remoteproc/rproc-elf-loader.c
@@ -12,6 +12,7 @@
 #include <dm/device_compat.h>
 #include <linux/compat.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 /**
  * struct resource_table - firmware resource table header
diff --git a/drivers/remoteproc/rproc-uclass.c b/drivers/remoteproc/rproc-uclass.c
index 0c2b601c4721..1ed194aa034d 100644
--- a/drivers/remoteproc/rproc-uclass.c
+++ b/drivers/remoteproc/rproc-uclass.c
@@ -17,6 +17,7 @@
 #include <dm/uclass.h>
 #include <dm/uclass-internal.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/remoteproc/ti_k3_dsp_rproc.c b/drivers/remoteproc/ti_k3_dsp_rproc.c
index 3361555c5367..cbebfacb48c1 100644
--- a/drivers/remoteproc/ti_k3_dsp_rproc.c
+++ b/drivers/remoteproc/ti_k3_dsp_rproc.c
@@ -21,6 +21,7 @@
 #include <linux/err.h>
 #include <linux/sizes.h>
 #include <linux/soc/ti/ti_sci_protocol.h>
+#include <linux/string.h>
 #include "ti_sci_proc.h"
 
 #define KEYSTONE_RPROC_LOCAL_ADDRESS_MASK	(SZ_16M - 1)
diff --git a/drivers/remoteproc/ti_k3_r5f_rproc.c b/drivers/remoteproc/ti_k3_r5f_rproc.c
index 1a7f1f8a005f..c3018d74a47e 100644
--- a/drivers/remoteproc/ti_k3_r5f_rproc.c
+++ b/drivers/remoteproc/ti_k3_r5f_rproc.c
@@ -19,6 +19,7 @@
 #include <linux/err.h>
 #include <linux/kernel.h>
 #include <linux/soc/ti/ti_sci_protocol.h>
+#include <linux/string.h>
 #include "ti_sci_proc.h"
 
 /*
diff --git a/drivers/remoteproc/ti_power_proc.c b/drivers/remoteproc/ti_power_proc.c
index 86fa6457ede7..0d78ec439d0e 100644
--- a/drivers/remoteproc/ti_power_proc.c
+++ b/drivers/remoteproc/ti_power_proc.c
@@ -12,6 +12,7 @@
 #include <remoteproc.h>
 #include <asm/global_data.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include <mach/psc_defs.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/rng/meson-rng.c b/drivers/rng/meson-rng.c
index 4b81a623535d..448d4537b05d 100644
--- a/drivers/rng/meson-rng.c
+++ b/drivers/rng/meson-rng.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <rng.h>
 #include <asm/io.h>
+#include <linux/string.h>
 
 struct meson_rng_platdata {
 	fdt_addr_t base;
diff --git a/drivers/rng/stm32mp1_rng.c b/drivers/rng/stm32mp1_rng.c
index 7ef7ff9756d4..4354edd4a1bd 100644
--- a/drivers/rng/stm32mp1_rng.c
+++ b/drivers/rng/stm32mp1_rng.c
@@ -11,6 +11,7 @@
 #include <rng.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include <asm/io.h>
 #include <linux/iopoll.h>
diff --git a/drivers/rtc/ds1302.c b/drivers/rtc/ds1302.c
index 189607c3e02a..21655085d1b7 100644
--- a/drivers/rtc/ds1302.c
+++ b/drivers/rtc/ds1302.c
@@ -9,6 +9,7 @@
 #include <command.h>
 #include <rtc.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 /* GPP Pins */
 #define DATA		0x200
diff --git a/drivers/rtc/i2c_rtc_emul.c b/drivers/rtc/i2c_rtc_emul.c
index 7f78ff83cb07..a78dc78cfcc4 100644
--- a/drivers/rtc/i2c_rtc_emul.c
+++ b/drivers/rtc/i2c_rtc_emul.c
@@ -21,6 +21,7 @@
 #include <rtc.h>
 #include <asm/rtc.h>
 #include <asm/test.h>
+#include <linux/string.h>
 
 #ifdef DEBUG
 #define debug_buffer print_buffer
diff --git a/drivers/rtc/rs5c372.c b/drivers/rtc/rs5c372.c
index 97ec001aef56..64ff8c89d40e 100644
--- a/drivers/rtc/rs5c372.c
+++ b/drivers/rtc/rs5c372.c
@@ -23,6 +23,7 @@
 #include <command.h>
 #include <rtc.h>
 #include <i2c.h>
+#include <linux/string.h>
 
 /*
  * Reads are always done starting with register 15, which requires some
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
index 0ab1d441f40c..2492c3394b97 100644
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -15,6 +15,7 @@
 #include <scsi.h>
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
+#include <linux/string.h>
 
 #if !defined(CONFIG_DM_SCSI)
 # ifdef CONFIG_SCSI_DEV_LIST
diff --git a/drivers/serial/sandbox.c b/drivers/serial/sandbox.c
index 8a7f171e0416..01c924675af9 100644
--- a/drivers/serial/sandbox.c
+++ b/drivers/serial/sandbox.c
@@ -20,6 +20,7 @@
 #include <asm/global_data.h>
 #include <linux/compiler.h>
 #include <asm/state.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/serial/serial-uclass.c b/drivers/serial/serial-uclass.c
index 3dbbd2a79380..a21aee247415 100644
--- a/drivers/serial/serial-uclass.c
+++ b/drivers/serial/serial-uclass.c
@@ -17,6 +17,7 @@
 #include <dm/device-internal.h>
 #include <dm/of_access.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/serial/serial.c b/drivers/serial/serial.c
index f428ddb2ed5b..2f7d65f72d16 100644
--- a/drivers/serial/serial.c
+++ b/drivers/serial/serial.c
@@ -14,6 +14,7 @@
 #include <linux/compiler.h>
 #include <errno.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/serial/usbtty.c b/drivers/serial/usbtty.c
index f1c1a260da51..f0b64809560e 100644
--- a/drivers/serial/usbtty.c
+++ b/drivers/serial/usbtty.c
@@ -14,6 +14,7 @@
 #include <serial.h>
 #include <stdio_dev.h>
 #include <asm/unaligned.h>
+#include <linux/string.h>
 #include "usbtty.h"
 #include "usb_cdc_acm.h"
 #include "usbdescriptors.h"
diff --git a/drivers/smem/msm_smem.c b/drivers/smem/msm_smem.c
index bf1696e85e01..09a1268e2766 100644
--- a/drivers/smem/msm_smem.c
+++ b/drivers/smem/msm_smem.c
@@ -19,6 +19,7 @@
 #include <linux/ioport.h>
 #include <linux/io.h>
 #include <smem.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/soc/soc-uclass.c b/drivers/soc/soc-uclass.c
index c32d647864f2..d22773e478bf 100644
--- a/drivers/soc/soc-uclass.c
+++ b/drivers/soc/soc-uclass.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <dm/lists.h>
 #include <dm/root.h>
+#include <linux/string.h>
 
 int soc_get(struct udevice **devp)
 {
diff --git a/drivers/soc/ti/k3-navss-ringacc.c b/drivers/soc/ti/k3-navss-ringacc.c
index fb04da2717d5..f4a0272f3ae2 100644
--- a/drivers/soc/ti/k3-navss-ringacc.c
+++ b/drivers/soc/ti/k3-navss-ringacc.c
@@ -24,6 +24,7 @@
 #include <linux/printk.h>
 #include <linux/soc/ti/k3-navss-ringacc.h>
 #include <linux/soc/ti/ti_sci_protocol.h>
+#include <linux/string.h>
 
 #define set_bit(bit, bitmap)	__set_bit(bit, bitmap)
 #define clear_bit(bit, bitmap)	__clear_bit(bit, bitmap)
diff --git a/drivers/spi/atcspi200_spi.c b/drivers/spi/atcspi200_spi.c
index 9e7d40d0a81e..7ba208baf2e7 100644
--- a/drivers/spi/atcspi200_spi.c
+++ b/drivers/spi/atcspi200_spi.c
@@ -14,6 +14,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/spi/bcmstb_spi.c b/drivers/spi/bcmstb_spi.c
index f400a0f57323..40364fbf57c1 100644
--- a/drivers/spi/bcmstb_spi.c
+++ b/drivers/spi/bcmstb_spi.c
@@ -18,6 +18,7 @@
 #include <malloc.h>
 #include <spi.h>
 #include <time.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/spi/cadence_qspi_apb.c b/drivers/spi/cadence_qspi_apb.c
index 77ec7c6ecda4..f1f510ef65f6 100644
--- a/drivers/spi/cadence_qspi_apb.c
+++ b/drivers/spi/cadence_qspi_apb.c
@@ -37,6 +37,7 @@
 #include <spi.h>
 #include <spi-mem.h>
 #include <malloc.h>
+#include <linux/string.h>
 #include "cadence_qspi.h"
 
 #define CQSPI_REG_POLL_US			1 /* 1us */
diff --git a/drivers/spi/cf_spi.c b/drivers/spi/cf_spi.c
index 242dc9d89095..0f39fe843989 100644
--- a/drivers/spi/cf_spi.c
+++ b/drivers/spi/cf_spi.c
@@ -22,6 +22,7 @@
 #include <malloc.h>
 #include <asm/coldfire/dspi.h>
 #include <asm/io.h>
+#include <linux/string.h>
 
 struct coldfire_spi_priv {
 	struct dspi *regs;
diff --git a/drivers/spi/fsl_espi.c b/drivers/spi/fsl_espi.c
index 3dd98aadbaa7..35f8a58da162 100644
--- a/drivers/spi/fsl_espi.c
+++ b/drivers/spi/fsl_espi.c
@@ -13,6 +13,7 @@
 #include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include <malloc.h>
 #include <spi.h>
diff --git a/drivers/spi/fsl_qspi.c b/drivers/spi/fsl_qspi.c
index 84b4714c0507..2923fb5fb3d8 100644
--- a/drivers/spi/fsl_qspi.c
+++ b/drivers/spi/fsl_qspi.c
@@ -38,6 +38,7 @@
 #include <linux/err.h>
 #include <spi.h>
 #include <spi-mem.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/spi/ich.c b/drivers/spi/ich.c
index 224c2b07919a..308ace8a5802 100644
--- a/drivers/spi/ich.c
+++ b/drivers/spi/ich.c
@@ -30,6 +30,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/sizes.h>
+#include <linux/string.h>
 
 #include "ich.h"
 
diff --git a/drivers/spi/meson_spifc.c b/drivers/spi/meson_spifc.c
index 2cdc0186825d..5bc99370a101 100644
--- a/drivers/spi/meson_spifc.c
+++ b/drivers/spi/meson_spifc.c
@@ -17,6 +17,7 @@
 #include <asm/io.h>
 #include <linux/bitfield.h>
 #include <linux/bitops.h>
+#include <linux/string.h>
 
 /* register map */
 #define REG_CMD			0x00
diff --git a/drivers/spi/mtk_snfi_spi.c b/drivers/spi/mtk_snfi_spi.c
index c30c8f4ff6d3..7f5d78e357e9 100644
--- a/drivers/spi/mtk_snfi_spi.c
+++ b/drivers/spi/mtk_snfi_spi.c
@@ -17,6 +17,7 @@
 #include <linux/bitops.h>
 #include <linux/io.h>
 #include <linux/iopoll.h>
+#include <linux/string.h>
 
 #define SNFI_MAC_CTL			0x500
 #define MAC_XIO_SEL			BIT(4)
diff --git a/drivers/spi/mxc_spi.c b/drivers/spi/mxc_spi.c
index cb1abf14416e..a2dbd8a96de0 100644
--- a/drivers/spi/mxc_spi.c
+++ b/drivers/spi/mxc_spi.c
@@ -20,6 +20,7 @@
 #include <asm/arch/clock.h>
 #include <asm/mach-imx/spi.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/spi/mxs_spi.c b/drivers/spi/mxs_spi.c
index fb0af02be087..8d7bb35d02f9 100644
--- a/drivers/spi/mxs_spi.c
+++ b/drivers/spi/mxs_spi.c
@@ -29,6 +29,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/mach-imx/dma.h>
+#include <linux/string.h>
 
 #define	MXS_SPI_MAX_TIMEOUT	1000000
 #define	MXS_SPI_PORT_OFFSET	0x2000
diff --git a/drivers/spi/nxp_fspi.c b/drivers/spi/nxp_fspi.c
index c507437f2e7d..b4f928741f34 100644
--- a/drivers/spi/nxp_fspi.c
+++ b/drivers/spi/nxp_fspi.c
@@ -46,6 +46,7 @@
 #include <linux/iopoll.h>
 #include <linux/bug.h>
 #include <linux/err.h>
+#include <linux/string.h>
 
 /*
  * The driver only uses one single LUT entry, that is updated on
diff --git a/drivers/spi/renesas_rpc_spi.c b/drivers/spi/renesas_rpc_spi.c
index 72a9e464776f..1ceb7294bb63 100644
--- a/drivers/spi/renesas_rpc_spi.c
+++ b/drivers/spi/renesas_rpc_spi.c
@@ -18,6 +18,7 @@
 #include <linux/errno.h>
 #include <spi.h>
 #include <wait_bit.h>
+#include <linux/string.h>
 
 #define RPC_CMNCR		0x0000	/* R/W */
 #define RPC_CMNCR_MD		BIT(31)
diff --git a/drivers/spi/spi-mem-nodm.c b/drivers/spi/spi-mem-nodm.c
index 765f05fe5429..841eefc12ce1 100644
--- a/drivers/spi/spi-mem-nodm.c
+++ b/drivers/spi/spi-mem-nodm.c
@@ -7,6 +7,7 @@
 #include <malloc.h>
 #include <spi.h>
 #include <spi-mem.h>
+#include <linux/string.h>
 
 int spi_mem_exec_op(struct spi_slave *slave,
 		    const struct spi_mem_op *op)
diff --git a/drivers/spi/spi-mem.c b/drivers/spi/spi-mem.c
index c095ae9505a2..01e9b6928cfc 100644
--- a/drivers/spi/spi-mem.c
+++ b/drivers/spi/spi-mem.c
@@ -21,6 +21,7 @@
 #include <spi.h>
 #include <spi-mem.h>
 #include <dm/device_compat.h>
+#include <linux/string.h>
 #endif
 
 #ifndef __UBOOT__
diff --git a/drivers/spi/spi-sifive.c b/drivers/spi/spi-sifive.c
index c7345d904280..a11728739866 100644
--- a/drivers/spi/spi-sifive.c
+++ b/drivers/spi/spi-sifive.c
@@ -17,6 +17,7 @@
 #include <linux/bitops.h>
 #include <linux/log2.h>
 #include <clk.h>
+#include <linux/string.h>
 
 #define SIFIVE_SPI_MAX_CS		32
 
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 22910de0dd93..426d30c6b21e 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -7,6 +7,7 @@
 #include <fdtdec.h>
 #include <malloc.h>
 #include <spi.h>
+#include <linux/string.h>
 
 int spi_set_wordlen(struct spi_slave *slave, unsigned int wordlen)
 {
diff --git a/drivers/spi/tegra210_qspi.c b/drivers/spi/tegra210_qspi.c
index 293b16c6fe93..90ac21f8ad9b 100644
--- a/drivers/spi/tegra210_qspi.c
+++ b/drivers/spi/tegra210_qspi.c
@@ -18,6 +18,7 @@
 #include <fdtdec.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include "tegra_spi.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/spi/zynq_qspi.c b/drivers/spi/zynq_qspi.c
index af130d4418b5..7607c5102490 100644
--- a/drivers/spi/zynq_qspi.c
+++ b/drivers/spi/zynq_qspi.c
@@ -15,6 +15,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/spi/zynqmp_gqspi.c b/drivers/spi/zynqmp_gqspi.c
index cd2c7d40b86e..151618a99f41 100644
--- a/drivers/spi/zynqmp_gqspi.c
+++ b/drivers/spi/zynqmp_gqspi.c
@@ -22,6 +22,7 @@
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/err.h>
+#include <linux/string.h>
 
 #define GQSPI_GFIFO_STRT_MODE_MASK	BIT(29)
 #define GQSPI_CONFIG_MODE_EN_MASK	(3 << 30)
diff --git a/drivers/sysreset/sysreset_sandbox.c b/drivers/sysreset/sysreset_sandbox.c
index 69c22a70008f..cb90266ab0cb 100644
--- a/drivers/sysreset/sysreset_sandbox.c
+++ b/drivers/sysreset/sysreset_sandbox.c
@@ -10,6 +10,7 @@
 #include <sysreset.h>
 #include <asm/state.h>
 #include <asm/test.h>
+#include <linux/string.h>
 
 static int sandbox_warm_sysreset_request(struct udevice *dev,
 					 enum sysreset_t type)
diff --git a/drivers/tee/broadcom/chimp_optee.c b/drivers/tee/broadcom/chimp_optee.c
index 37f9b094f767..91ebc17c0361 100644
--- a/drivers/tee/broadcom/chimp_optee.c
+++ b/drivers/tee/broadcom/chimp_optee.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <string.h>
 #include <tee.h>
 #include <broadcom/chimp.h>
 
diff --git a/drivers/tee/optee/core.c b/drivers/tee/optee/core.c
index 5260dab3ac0e..0fc7a0ec7f17 100644
--- a/drivers/tee/optee/core.c
+++ b/drivers/tee/optee/core.c
@@ -11,6 +11,7 @@
 #include <linux/arm-smccc.h>
 #include <linux/err.h>
 #include <linux/io.h>
+#include <linux/string.h>
 
 #include "optee_smc.h"
 #include "optee_msg.h"
diff --git a/drivers/tee/sandbox.c b/drivers/tee/sandbox.c
index 4b91e7db1bc6..2f174fa00f91 100644
--- a/drivers/tee/sandbox.c
+++ b/drivers/tee/sandbox.c
@@ -6,6 +6,7 @@
 #include <dm.h>
 #include <sandboxtee.h>
 #include <tee.h>
+#include <linux/string.h>
 #include <tee/optee_ta_avb.h>
 
 /*
diff --git a/drivers/tee/tee-uclass.c b/drivers/tee/tee-uclass.c
index 112e21688344..76de11c3fb84 100644
--- a/drivers/tee/tee-uclass.c
+++ b/drivers/tee/tee-uclass.c
@@ -10,6 +10,7 @@
 #include <tee.h>
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
+#include <linux/string.h>
 
 /**
  * struct tee_uclass_priv - information of a TEE, stored by the uclass
diff --git a/drivers/thermal/imx_scu_thermal.c b/drivers/thermal/imx_scu_thermal.c
index dc92e6b603e9..b3c823ffcb7b 100644
--- a/drivers/thermal/imx_scu_thermal.c
+++ b/drivers/thermal/imx_scu_thermal.c
@@ -15,6 +15,7 @@
 #include <asm/arch/sci/sci.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/thermal/imx_tmu.c b/drivers/thermal/imx_tmu.c
index d8acfef49252..b9bdec00c6d9 100644
--- a/drivers/thermal/imx_tmu.c
+++ b/drivers/thermal/imx_tmu.c
@@ -17,6 +17,7 @@
 #include <fuse.h>
 #include <malloc.h>
 #include <thermal.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/tpm/cr50_i2c.c b/drivers/tpm/cr50_i2c.c
index b0075d3bb48c..611dd534dc3a 100644
--- a/drivers/tpm/cr50_i2c.c
+++ b/drivers/tpm/cr50_i2c.c
@@ -20,6 +20,7 @@
 #include <asm/arch/iomap.h>
 #include <asm/arch/pm.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 enum {
 	TIMEOUT_INIT_MS		= 30000, /* Very long timeout for TPM init */
diff --git a/drivers/tpm/tpm-uclass.c b/drivers/tpm/tpm-uclass.c
index 01d7c2f47c15..61331726833a 100644
--- a/drivers/tpm/tpm-uclass.c
+++ b/drivers/tpm/tpm-uclass.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <time.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include <linux/unaligned/be_byteshift.h>
 #include <tpm-v1.h>
 #include <tpm-v2.h>
diff --git a/drivers/tpm/tpm2_ftpm_tee.c b/drivers/tpm/tpm2_ftpm_tee.c
index 3197e0ebcd3d..a7c94c7429bc 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 <linux/string.h>
 
 #include "tpm_tis.h"
 #include "tpm2_ftpm_tee.h"
diff --git a/drivers/tpm/tpm2_tis_sandbox.c b/drivers/tpm/tpm2_tis_sandbox.c
index 41a15bd49fb1..708d030f5ebf 100644
--- a/drivers/tpm/tpm2_tis_sandbox.c
+++ b/drivers/tpm/tpm2_tis_sandbox.c
@@ -10,6 +10,7 @@
 #include <asm/state.h>
 #include <asm/unaligned.h>
 #include <linux/bitops.h>
+#include <linux/string.h>
 #include <u-boot/crc.h>
 
 /* Hierarchies */
diff --git a/drivers/tpm/tpm2_tis_spi.c b/drivers/tpm/tpm2_tis_spi.c
index 195d8be8bf31..52fb3a9235f4 100644
--- a/drivers/tpm/tpm2_tis_spi.c
+++ b/drivers/tpm/tpm2_tis_spi.c
@@ -25,6 +25,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/compiler.h>
+#include <linux/string.h>
 #include <linux/types.h>
 #include <linux/unaligned/be_byteshift.h>
 #include <asm-generic/gpio.h>
diff --git a/drivers/tpm/tpm_atmel_twi.c b/drivers/tpm/tpm_atmel_twi.c
index 9444c1b48137..ade72c056380 100644
--- a/drivers/tpm/tpm_atmel_twi.c
+++ b/drivers/tpm/tpm_atmel_twi.c
@@ -13,6 +13,7 @@
 #include <i2c.h>
 #include <asm/unaligned.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include "tpm_internal.h"
 
diff --git a/drivers/tpm/tpm_tis_infineon.c b/drivers/tpm/tpm_tis_infineon.c
index fe832d413293..e8391eaa1e6d 100644
--- a/drivers/tpm/tpm_tis_infineon.c
+++ b/drivers/tpm/tpm_tis_infineon.c
@@ -30,6 +30,7 @@
 #include <linux/errno.h>
 #include <linux/compiler.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include <linux/types.h>
 #include <linux/unaligned/be_byteshift.h>
 
diff --git a/drivers/tpm/tpm_tis_lpc.c b/drivers/tpm/tpm_tis_lpc.c
index 2dd374cf77d1..8929b269ddf1 100644
--- a/drivers/tpm/tpm_tis_lpc.c
+++ b/drivers/tpm/tpm_tis_lpc.c
@@ -19,6 +19,7 @@
 #include <tpm-v1.h>
 #include <asm/io.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #define PREFIX "lpc_tpm: "
 
diff --git a/drivers/tpm/tpm_tis_sandbox.c b/drivers/tpm/tpm_tis_sandbox.c
index f35d69204428..d923e9723ae5 100644
--- a/drivers/tpm/tpm_tis_sandbox.c
+++ b/drivers/tpm/tpm_tis_sandbox.c
@@ -9,6 +9,7 @@
 #include <tpm-v1.h>
 #include <asm/state.h>
 #include <asm/unaligned.h>
+#include <linux/string.h>
 #include <u-boot/crc.h>
 
 /* TPM NVRAM location indices. */
diff --git a/drivers/tpm/tpm_tis_st33zp24_i2c.c b/drivers/tpm/tpm_tis_st33zp24_i2c.c
index 60af8385b5d7..f648ea406d75 100644
--- a/drivers/tpm/tpm_tis_st33zp24_i2c.c
+++ b/drivers/tpm/tpm_tis_st33zp24_i2c.c
@@ -21,6 +21,7 @@
 #include <tpm-v1.h>
 #include <errno.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include <linux/types.h>
 #include <asm/unaligned.h>
 
diff --git a/drivers/tpm/tpm_tis_st33zp24_spi.c b/drivers/tpm/tpm_tis_st33zp24_spi.c
index edd7d7840b96..5c3ce1372444 100644
--- a/drivers/tpm/tpm_tis_st33zp24_spi.c
+++ b/drivers/tpm/tpm_tis_st33zp24_spi.c
@@ -21,6 +21,7 @@
 #include <tpm-v1.h>
 #include <errno.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include <linux/types.h>
 #include <asm/unaligned.h>
 #include <linux/compat.h>
diff --git a/drivers/ufs/ufs.c b/drivers/ufs/ufs.c
index 84d84835cfdf..ab17ecf7f131 100644
--- a/drivers/ufs/ufs.c
+++ b/drivers/ufs/ufs.c
@@ -24,6 +24,8 @@
 #include <asm/dma-mapping.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/string.h>
+
 #include <linux/dma-mapping.h>
 
 #include "ufs.h"
diff --git a/drivers/usb/cdns3/gadget.c b/drivers/usb/cdns3/gadget.c
index de57029cf40a..d4aaa19dad62 100644
--- a/drivers/usb/cdns3/gadget.c
+++ b/drivers/usb/cdns3/gadget.c
@@ -63,6 +63,7 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include <linux/usb/gadget.h>
 #include <linux/compat.h>
 #include <linux/iopoll.h>
diff --git a/drivers/usb/common/common.c b/drivers/usb/common/common.c
index d27ab90d22d5..5a8d24da8218 100644
--- a/drivers/usb/common/common.c
+++ b/drivers/usb/common/common.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <asm/global_data.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include <linux/usb/otg.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/phy.h>
diff --git a/drivers/usb/common/fsl-dt-fixup.c b/drivers/usb/common/fsl-dt-fixup.c
index 4d7a2acd8e54..5fc887c7cf70 100644
--- a/drivers/usb/common/fsl-dt-fixup.c
+++ b/drivers/usb/common/fsl-dt-fixup.c
@@ -15,6 +15,7 @@
 #include <fsl_errata.h>
 #include <fsl_usb.h>
 #include <fdt_support.h>
+#include <linux/string.h>
 
 #ifndef CONFIG_USB_MAX_CONTROLLER_COUNT
 #define CONFIG_USB_MAX_CONTROLLER_COUNT 1
diff --git a/drivers/usb/dwc3/ep0.c b/drivers/usb/dwc3/ep0.c
index 385bed3e34c4..f9420873bba1 100644
--- a/drivers/usb/dwc3/ep0.c
+++ b/drivers/usb/dwc3/ep0.c
@@ -18,6 +18,7 @@
 #include <linux/bug.h>
 #include <linux/kernel.h>
 #include <linux/list.h>
+#include <linux/string.h>
 
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
index 17d04b8b71f0..55324118ae7c 100644
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@ -24,6 +24,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/list.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
diff --git a/drivers/usb/dwc3/linux-compat.h b/drivers/usb/dwc3/linux-compat.h
index 82793765bea2..92a3dc2850b0 100644
--- a/drivers/usb/dwc3/linux-compat.h
+++ b/drivers/usb/dwc3/linux-compat.h
@@ -11,6 +11,7 @@
 #ifndef __DWC3_LINUX_COMPAT__
 #define __DWC3_LINUX_COMPAT__
 
+#include <linux/string.h>
 #define dev_WARN(dev, format, arg...)	debug(format, ##arg)
 
 static inline size_t strlcat(char *dest, const char *src, size_t n)
diff --git a/drivers/usb/emul/sandbox_flash.c b/drivers/usb/emul/sandbox_flash.c
index 9c305f46e944..883f6ae6d39b 100644
--- a/drivers/usb/emul/sandbox_flash.c
+++ b/drivers/usb/emul/sandbox_flash.c
@@ -10,6 +10,7 @@
 #include <os.h>
 #include <scsi.h>
 #include <usb.h>
+#include <linux/string.h>
 
 /*
  * This driver emulates a flash stick using the UFI command specification and
diff --git a/drivers/usb/emul/sandbox_keyb.c b/drivers/usb/emul/sandbox_keyb.c
index f562fb7eca2f..9f4b40895629 100644
--- a/drivers/usb/emul/sandbox_keyb.c
+++ b/drivers/usb/emul/sandbox_keyb.c
@@ -10,6 +10,7 @@
 #include <os.h>
 #include <scsi.h>
 #include <usb.h>
+#include <linux/string.h>
 
 /*
  * This driver emulates a USB keyboard using the USB HID specification (boot
diff --git a/drivers/usb/emul/usb-emul-uclass.c b/drivers/usb/emul/usb-emul-uclass.c
index e3419e2fd479..9807cbed1651 100644
--- a/drivers/usb/emul/usb-emul-uclass.c
+++ b/drivers/usb/emul/usb-emul-uclass.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <usb.h>
 #include <dm/device-internal.h>
+#include <linux/string.h>
 
 static int copy_to_unicode(char *buff, int length, const char *str)
 {
diff --git a/drivers/usb/eth/asix.c b/drivers/usb/eth/asix.c
index ac4a27fff204..3a0d8dadb35e 100644
--- a/drivers/usb/eth/asix.c
+++ b/drivers/usb/eth/asix.c
@@ -14,6 +14,7 @@
 #include <memalign.h>
 #include <linux/delay.h>
 #include <linux/mii.h>
+#include <linux/string.h>
 #include "usb_ether.h"
 
 /* ASIX AX8817X based USB 2.0 Ethernet Devices */
diff --git a/drivers/usb/eth/asix88179.c b/drivers/usb/eth/asix88179.c
index c142b8b19bfc..b4249d9ad51e 100644
--- a/drivers/usb/eth/asix88179.c
+++ b/drivers/usb/eth/asix88179.c
@@ -12,6 +12,7 @@
 #include <net.h>
 #include <linux/delay.h>
 #include <linux/mii.h>
+#include <linux/string.h>
 #include "usb_ether.h"
 #include <malloc.h>
 #include <memalign.h>
diff --git a/drivers/usb/eth/lan75xx.c b/drivers/usb/eth/lan75xx.c
index 46b92e8d68bd..7d828d75dc61 100644
--- a/drivers/usb/eth/lan75xx.c
+++ b/drivers/usb/eth/lan75xx.c
@@ -8,6 +8,7 @@
 #include <usb.h>
 #include <linux/bitops.h>
 #include <linux/mii.h>
+#include <linux/string.h>
 #include "usb_ether.h"
 #include "lan7x.h"
 
diff --git a/drivers/usb/eth/lan78xx.c b/drivers/usb/eth/lan78xx.c
index e34ad2603fbb..9a7a0d834a13 100644
--- a/drivers/usb/eth/lan78xx.c
+++ b/drivers/usb/eth/lan78xx.c
@@ -8,6 +8,7 @@
 #include <net.h>
 #include <usb.h>
 #include <linux/bitops.h>
+#include <linux/string.h>
 #include "usb_ether.h"
 #include "lan7x.h"
 
diff --git a/drivers/usb/eth/lan7x.c b/drivers/usb/eth/lan7x.c
index 0a283619ae53..b14836127835 100644
--- a/drivers/usb/eth/lan7x.c
+++ b/drivers/usb/eth/lan7x.c
@@ -12,6 +12,7 @@
 #include <usb.h>
 #include <linux/ethtool.h>
 #include <linux/mii.h>
+#include <linux/string.h>
 #include "usb_ether.h"
 #include "lan7x.h"
 
diff --git a/drivers/usb/eth/mcs7830.c b/drivers/usb/eth/mcs7830.c
index 02eef9b269d5..5cdd7a10e7c2 100644
--- a/drivers/usb/eth/mcs7830.c
+++ b/drivers/usb/eth/mcs7830.c
@@ -20,6 +20,7 @@
 #include <memalign.h>
 #include <usb.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #include "usb_ether.h"
 
diff --git a/drivers/usb/eth/r8152.c b/drivers/usb/eth/r8152.c
index 1845d957f973..40947150a0b0 100644
--- a/drivers/usb/eth/r8152.c
+++ b/drivers/usb/eth/r8152.c
@@ -15,6 +15,7 @@
 #include <linux/delay.h>
 #include <linux/mii.h>
 #include <linux/bitops.h>
+#include <linux/string.h>
 #include "usb_ether.h"
 #include "r8152.h"
 
diff --git a/drivers/usb/eth/smsc95xx.c b/drivers/usb/eth/smsc95xx.c
index dacf607ed83b..5d8e93c23379 100644
--- a/drivers/usb/eth/smsc95xx.c
+++ b/drivers/usb/eth/smsc95xx.c
@@ -18,6 +18,7 @@
 #include <asm/unaligned.h>
 #include <linux/delay.h>
 #include <linux/mii.h>
+#include <linux/string.h>
 #include "usb_ether.h"
 
 /* SMSC LAN95xx based USB 2.0 Ethernet Devices */
diff --git a/drivers/usb/eth/usb_ether.c b/drivers/usb/eth/usb_ether.c
index e368ecda0d70..91f34ab175de 100644
--- a/drivers/usb/eth/usb_ether.c
+++ b/drivers/usb/eth/usb_ether.c
@@ -12,6 +12,7 @@
 #include <usb.h>
 #include <asm/cache.h>
 #include <dm/device-internal.h>
+#include <linux/string.h>
 
 #include "usb_ether.h"
 
diff --git a/drivers/usb/gadget/at91_udc.c b/drivers/usb/gadget/at91_udc.c
index e198ef1d34d6..8674f3c9f4fa 100644
--- a/drivers/usb/gadget/at91_udc.c
+++ b/drivers/usb/gadget/at91_udc.c
@@ -22,6 +22,7 @@
 #include <asm/gpio.h>
 #include <asm/hardware.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include <mach/at91_matrix.h>
 #include <linux/list.h>
 #include <linux/usb/ch9.h>
diff --git a/drivers/usb/gadget/atmel_usba_udc.c b/drivers/usb/gadget/atmel_usba_udc.c
index ed3b3c14e609..23e107b86214 100644
--- a/drivers/usb/gadget/atmel_usba_udc.c
+++ b/drivers/usb/gadget/atmel_usba_udc.c
@@ -14,6 +14,7 @@
 #include <asm/hardware.h>
 #include <linux/list.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
 #include <linux/usb/atmel_usba_udc.h>
diff --git a/drivers/usb/gadget/ci_udc.c b/drivers/usb/gadget/ci_udc.c
index cdbdbcc5cac1..98a88c102e9f 100644
--- a/drivers/usb/gadget/ci_udc.c
+++ b/drivers/usb/gadget/ci_udc.c
@@ -19,6 +19,7 @@
 #include <linux/errno.h>
 #include <asm/io.h>
 #include <asm/unaligned.h>
+#include <linux/string.h>
 #include <linux/types.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
index 91ed7fcec5af..f353f1a3cd25 100644
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@ -11,6 +11,7 @@
 #include <dm/devres.h>
 #include <linux/bitops.h>
 #include <linux/bug.h>
+#include <linux/string.h>
 #include <linux/usb/composite.h>
 
 #define USB_BUFSIZ	4096
diff --git a/drivers/usb/gadget/designware_udc.c b/drivers/usb/gadget/designware_udc.c
index 7fc5d27d436f..d4b94a7cfce0 100644
--- a/drivers/usb/gadget/designware_udc.c
+++ b/drivers/usb/gadget/designware_udc.c
@@ -11,6 +11,7 @@
 #include <serial.h>
 #include <asm/io.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include <env.h>
 #include <usbdevice.h>
diff --git a/drivers/usb/gadget/dwc2_udc_otg.c b/drivers/usb/gadget/dwc2_udc_otg.c
index f548cbc9eb29..8a5edc776ef1 100644
--- a/drivers/usb/gadget/dwc2_udc_otg.c
+++ b/drivers/usb/gadget/dwc2_udc_otg.c
@@ -29,6 +29,7 @@
 #include <linux/bug.h>
 #include <linux/delay.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #include <linux/errno.h>
 #include <linux/list.h>
diff --git a/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c b/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c
index 1c0505eb28c1..80b7e519978d 100644
--- a/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c
+++ b/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c
@@ -21,6 +21,7 @@
 #include <cpu_func.h>
 #include <log.h>
 #include <linux/bug.h>
+#include <linux/string.h>
 
 static u8 clear_feature_num;
 int clear_feature_flag;
diff --git a/drivers/usb/gadget/epautoconf.c b/drivers/usb/gadget/epautoconf.c
index e61fe5d11445..c7b0a9651885 100644
--- a/drivers/usb/gadget/epautoconf.c
+++ b/drivers/usb/gadget/epautoconf.c
@@ -9,6 +9,7 @@
  */
 
 #include <common.h>
+#include <linux/string.h>
 #include <linux/usb/ch9.h>
 #include <linux/errno.h>
 #include <linux/usb/gadget.h>
diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c
index a718eae3a0cc..0f9195c7a5c9 100644
--- a/drivers/usb/gadget/ether.c
+++ b/drivers/usb/gadget/ether.c
@@ -16,6 +16,7 @@
 #include <linux/errno.h>
 #include <linux/netdevice.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/cdc.h>
 #include <linux/usb/gadget.h>
diff --git a/drivers/usb/gadget/f_dfu.c b/drivers/usb/gadget/f_dfu.c
index 4bedc7d3a190..b7b1e0c1add9 100644
--- a/drivers/usb/gadget/f_dfu.c
+++ b/drivers/usb/gadget/f_dfu.c
@@ -19,6 +19,7 @@
 #include <common.h>
 #include <log.h>
 #include <malloc.h>
+#include <linux/string.h>
 
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
diff --git a/drivers/usb/gadget/f_fastboot.c b/drivers/usb/gadget/f_fastboot.c
index fce933dba5f8..e14262676f33 100644
--- a/drivers/usb/gadget/f_fastboot.c
+++ b/drivers/usb/gadget/f_fastboot.c
@@ -18,6 +18,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
 #include <linux/usb/composite.h>
diff --git a/drivers/usb/gadget/f_mass_storage.c b/drivers/usb/gadget/f_mass_storage.c
index 439a31c2556b..d87701b4a35a 100644
--- a/drivers/usb/gadget/f_mass_storage.c
+++ b/drivers/usb/gadget/f_mass_storage.c
@@ -248,6 +248,7 @@
 #include <g_dnl.h>
 #include <dm/devres.h>
 #include <linux/bug.h>
+#include <linux/string.h>
 
 #include <linux/err.h>
 #include <linux/usb/ch9.h>
diff --git a/drivers/usb/gadget/f_rockusb.c b/drivers/usb/gadget/f_rockusb.c
index 9ae02ae78c1e..2ff3c692edcc 100644
--- a/drivers/usb/gadget/f_rockusb.c
+++ b/drivers/usb/gadget/f_rockusb.c
@@ -13,6 +13,7 @@
 #include <malloc.h>
 #include <memalign.h>
 #include <part.h>
+#include <linux/string.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
 #include <linux/usb/composite.h>
diff --git a/drivers/usb/gadget/f_sdp.c b/drivers/usb/gadget/f_sdp.c
index 4169763c094b..120aed4d95ec 100644
--- a/drivers/usb/gadget/f_sdp.c
+++ b/drivers/usb/gadget/f_sdp.c
@@ -23,6 +23,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
diff --git a/drivers/usb/gadget/f_thor.c b/drivers/usb/gadget/f_thor.c
index 3c47e6251b1f..4758ccb7c460 100644
--- a/drivers/usb/gadget/f_thor.c
+++ b/drivers/usb/gadget/f_thor.c
@@ -25,6 +25,7 @@
 #include <version.h>
 #include <linux/delay.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
 #include <linux/usb/composite.h>
diff --git a/drivers/usb/gadget/fotg210.c b/drivers/usb/gadget/fotg210.c
index c6eb22bdfd36..1c145eb428e8 100644
--- a/drivers/usb/gadget/fotg210.c
+++ b/drivers/usb/gadget/fotg210.c
@@ -17,6 +17,7 @@
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/string.h>
 #include <linux/types.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
diff --git a/drivers/usb/gadget/g_dnl.c b/drivers/usb/gadget/g_dnl.c
index 86fdd16b0125..c6ecbb301929 100644
--- a/drivers/usb/gadget/g_dnl.c
+++ b/drivers/usb/gadget/g_dnl.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <log.h>
 #include <malloc.h>
+#include <linux/string.h>
 
 #include <mmc.h>
 #include <part.h>
diff --git a/drivers/usb/gadget/gadget_chips.h b/drivers/usb/gadget/gadget_chips.h
index 91b0285244ec..70067afa7d43 100644
--- a/drivers/usb/gadget/gadget_chips.h
+++ b/drivers/usb/gadget/gadget_chips.h
@@ -14,6 +14,8 @@
  * Ported to U-Boot by: Thomas Smits <ts.smits@gmail.com> and
  *                      Remy Bohmer <linux@bohmer.net>
  */
+#include <linux/string.h>
+
 #ifdef CONFIG_USB_GADGET_NET2280
 #define	gadget_is_net2280(g)	(!strcmp("net2280", (g)->name))
 #else
diff --git a/drivers/usb/gadget/pxa25x_udc.c b/drivers/usb/gadget/pxa25x_udc.c
index 2d9f2e4e33d0..4f4d2982f88f 100644
--- a/drivers/usb/gadget/pxa25x_udc.c
+++ b/drivers/usb/gadget/pxa25x_udc.c
@@ -31,6 +31,7 @@
 #include <asm/io.h>
 #include <asm/arch/pxa.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
diff --git a/drivers/usb/gadget/rndis.c b/drivers/usb/gadget/rndis.c
index 13c327ea38ad..92c01adb75d1 100644
--- a/drivers/usb/gadget/rndis.c
+++ b/drivers/usb/gadget/rndis.c
@@ -22,6 +22,7 @@
 #include <log.h>
 #include <net.h>
 #include <malloc.h>
+#include <linux/string.h>
 #include <linux/types.h>
 #include <linux/list.h>
 #include <linux/netdevice.h>
diff --git a/drivers/usb/gadget/usbstring.c b/drivers/usb/gadget/usbstring.c
index 83cdd8a2595e..2870052fec3f 100644
--- a/drivers/usb/gadget/usbstring.c
+++ b/drivers/usb/gadget/usbstring.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <linux/errno.h>
+#include <linux/string.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
 
diff --git a/drivers/usb/host/dwc2.c b/drivers/usb/host/dwc2.c
index ec0b799e1492..7f04ea81bfcc 100644
--- a/drivers/usb/host/dwc2.c
+++ b/drivers/usb/host/dwc2.c
@@ -22,6 +22,7 @@
 #include <asm/io.h>
 #include <dm/device_compat.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include <power/regulator.h>
 #include <reset.h>
 
diff --git a/drivers/usb/host/ehci-fsl.c b/drivers/usb/host/ehci-fsl.c
index eed67e77dc67..8c5403fbdb3d 100644
--- a/drivers/usb/host/ehci-fsl.c
+++ b/drivers/usb/host/ehci-fsl.c
@@ -15,6 +15,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include <usb/ehci-ci.h>
 #include <hwconfig.h>
 #include <fsl_usb.h>
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index 26400cac08c1..60e5f4e41bca 100644
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -23,6 +23,7 @@
 #include <dm/device_compat.h>
 #include <linux/compiler.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include "ehci.h"
 
diff --git a/drivers/usb/host/ehci-mx5.c b/drivers/usb/host/ehci-mx5.c
index 516d64953591..ca6cb6b645bb 100644
--- a/drivers/usb/host/ehci-mx5.c
+++ b/drivers/usb/host/ehci-mx5.c
@@ -11,6 +11,7 @@
 #include <asm/global_data.h>
 #include <linux/compiler.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include <usb/ehci-ci.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c
index 90a024068362..5aa9eb445afc 100644
--- a/drivers/usb/host/ehci-omap.c
+++ b/drivers/usb/host/ehci-omap.c
@@ -15,6 +15,7 @@
 #include <time.h>
 #include <usb.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include <usb/ulpi.h>
 #include <errno.h>
 #include <asm/io.h>
diff --git a/drivers/usb/host/ehci-tegra.c b/drivers/usb/host/ehci-tegra.c
index d81f4a03f149..3b9373f2cd64 100644
--- a/drivers/usb/host/ehci-tegra.c
+++ b/drivers/usb/host/ehci-tegra.c
@@ -16,6 +16,7 @@
 #include <asm/arch-tegra/usb.h>
 #include <asm/arch-tegra/clk_rst.h>
 #include <usb.h>
+#include <linux/string.h>
 #include <usb/ulpi.h>
 #include <linux/libfdt.h>
 
diff --git a/drivers/usb/host/ehci-vf.c b/drivers/usb/host/ehci-vf.c
index 86eac41ea667..39d5b1dd9be8 100644
--- a/drivers/usb/host/ehci-vf.c
+++ b/drivers/usb/host/ehci-vf.c
@@ -21,6 +21,7 @@
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/mach-imx/regs-usbphy.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include <usb/ehci-ci.h>
 #include <linux/libfdt.h>
 #include <fdtdec.h>
diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c
index c62d8feecce1..89592f0a1143 100644
--- a/drivers/usb/host/ohci-hcd.c
+++ b/drivers/usb/host/ohci-hcd.c
@@ -34,6 +34,7 @@
 #include <errno.h>
 #include <asm/cache.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #if defined(CONFIG_PCI_OHCI)
 # include <pci.h>
diff --git a/drivers/usb/host/r8a66597-hcd.c b/drivers/usb/host/r8a66597-hcd.c
index 37aa2c55f241..339e260ea33c 100644
--- a/drivers/usb/host/r8a66597-hcd.c
+++ b/drivers/usb/host/r8a66597-hcd.c
@@ -14,6 +14,7 @@
 #include <dm/device_compat.h>
 #include <linux/delay.h>
 #include <linux/iopoll.h>
+#include <linux/string.h>
 #include <power/regulator.h>
 
 #include "r8a66597.h"
diff --git a/drivers/usb/host/r8a66597.h b/drivers/usb/host/r8a66597.h
index 625d4938ccee..b42389b9188a 100644
--- a/drivers/usb/host/r8a66597.h
+++ b/drivers/usb/host/r8a66597.h
@@ -9,6 +9,7 @@
 #define __R8A66597_H__
 
 #include <linux/bitops.h>
+#include <linux/string.h>
 #define SYSCFG0		0x00
 #define SYSCFG1		0x02
 #define SYSSTS0		0x04
diff --git a/drivers/usb/host/sl811-hcd.c b/drivers/usb/host/sl811-hcd.c
index 39d5988b36ab..b33d7dc9ac49 100644
--- a/drivers/usb/host/sl811-hcd.c
+++ b/drivers/usb/host/sl811-hcd.c
@@ -23,6 +23,7 @@
 #include <time.h>
 #include <usb.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include "sl811.h"
 
 #include "../../../board/kup/common/kup.h"
diff --git a/drivers/usb/host/usb-uclass.c b/drivers/usb/host/usb-uclass.c
index e5dda79b94c8..6d772000cde6 100644
--- a/drivers/usb/host/usb-uclass.c
+++ b/drivers/usb/host/usb-uclass.c
@@ -15,6 +15,7 @@
 #include <dm/device-internal.h>
 #include <dm/lists.h>
 #include <dm/uclass-internal.h>
+#include <linux/string.h>
 
 extern bool usb_started; /* flag for the started/stopped USB status */
 static bool asynch_allowed;
diff --git a/drivers/usb/host/xhci-dwc3.c b/drivers/usb/host/xhci-dwc3.c
index 27f84102db38..44cb31c9c5fb 100644
--- a/drivers/usb/host/xhci-dwc3.c
+++ b/drivers/usb/host/xhci-dwc3.c
@@ -14,6 +14,7 @@
 #include <usb.h>
 #include <dwc3-uboot.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include <usb/xhci.h>
 #include <asm/io.h>
diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c
index 1da0524aa0e9..f4518e3eac99 100644
--- a/drivers/usb/host/xhci-mem.c
+++ b/drivers/usb/host/xhci-mem.c
@@ -23,6 +23,7 @@
 #include <asm/cache.h>
 #include <linux/bug.h>
 #include <linux/errno.h>
+#include <linux/string.h>
 
 #include <usb/xhci.h>
 
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index 126dabc11ba3..4c752f4ad0ef 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -33,6 +33,7 @@
 #include <linux/bug.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/string.h>
 #include <usb/xhci.h>
 
 #ifndef CONFIG_USB_MAX_CONTROLLER_COUNT
diff --git a/drivers/usb/musb-new/am35x.c b/drivers/usb/musb-new/am35x.c
index ea0a944a87bb..410cf042f66e 100644
--- a/drivers/usb/musb-new/am35x.c
+++ b/drivers/usb/musb-new/am35x.c
@@ -29,6 +29,7 @@
 #include <asm/omap_musb.h>
 #include <linux/bug.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include "linux-compat.h"
 #endif
 
diff --git a/drivers/usb/musb-new/mt85xx.c b/drivers/usb/musb-new/mt85xx.c
index 110b5b610f6e..f826b986ba78 100644
--- a/drivers/usb/musb-new/mt85xx.c
+++ b/drivers/usb/musb-new/mt85xx.c
@@ -16,6 +16,7 @@
 #include <dm/root.h>
 #include <linux/delay.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include <linux/usb/musb.h>
 #include <usb.h>
 #include "linux-compat.h"
diff --git a/drivers/usb/musb-new/musb_core.c b/drivers/usb/musb-new/musb_core.c
index f29131c69bbd..a696c5a5b476 100644
--- a/drivers/usb/musb-new/musb_core.c
+++ b/drivers/usb/musb-new/musb_core.c
@@ -85,6 +85,7 @@
 #include <linux/bug.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
 #include <linux/usb/musb.h>
diff --git a/drivers/usb/musb-new/musb_gadget.c b/drivers/usb/musb-new/musb_gadget.c
index fb3b3e45ef08..c6e346d5d805 100644
--- a/drivers/usb/musb-new/musb_gadget.c
+++ b/drivers/usb/musb-new/musb_gadget.c
@@ -25,6 +25,7 @@
 #include <common.h>
 #include <linux/bug.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include <linux/usb/ch9.h>
 #include "linux-compat.h"
 #endif
diff --git a/drivers/usb/musb-new/musb_uboot.c b/drivers/usb/musb-new/musb_uboot.c
index c212ecff7af3..0d18ed919a02 100644
--- a/drivers/usb/musb-new/musb_uboot.c
+++ b/drivers/usb/musb-new/musb_uboot.c
@@ -7,6 +7,7 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/string.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
 
diff --git a/drivers/usb/musb-new/pic32.c b/drivers/usb/musb-new/pic32.c
index 8995e78fee49..ce8ec050025b 100644
--- a/drivers/usb/musb-new/pic32.c
+++ b/drivers/usb/musb-new/pic32.c
@@ -15,6 +15,7 @@
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include <linux/usb/musb.h>
 #include "linux-compat.h"
 #include "musb_core.h"
diff --git a/drivers/usb/musb-new/sunxi.c b/drivers/usb/musb-new/sunxi.c
index 9ae8a0e6b7af..082df93fdd85 100644
--- a/drivers/usb/musb-new/sunxi.c
+++ b/drivers/usb/musb-new/sunxi.c
@@ -33,6 +33,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include <linux/usb/musb.h>
 #include "linux-compat.h"
 #include "musb_core.h"
diff --git a/drivers/usb/musb-new/ti-musb.c b/drivers/usb/musb-new/ti-musb.c
index d447baf13bba..4867c2e792e4 100644
--- a/drivers/usb/musb-new/ti-musb.c
+++ b/drivers/usb/musb-new/ti-musb.c
@@ -13,6 +13,7 @@
 #include <malloc.h>
 #include <asm/global_data.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include <linux/usb/otg.h>
 #include <dm/device-internal.h>
 #include <dm/lists.h>
diff --git a/drivers/usb/musb/am35x.c b/drivers/usb/musb/am35x.c
index f945f1f5e2c5..e749ae97180b 100644
--- a/drivers/usb/musb/am35x.c
+++ b/drivers/usb/musb/am35x.c
@@ -11,6 +11,7 @@
 
 #include <common.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include "am35x.h"
 
diff --git a/drivers/usb/musb/musb_hcd.c b/drivers/usb/musb/musb_hcd.c
index afbc648883bc..99514419e5f8 100644
--- a/drivers/usb/musb/musb_hcd.c
+++ b/drivers/usb/musb/musb_hcd.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <usb.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include "musb_hcd.h"
 
 /* MSC control transfers */
diff --git a/drivers/video/am335x-fb.c b/drivers/video/am335x-fb.c
index 4354c3efac11..b381b147cddf 100644
--- a/drivers/video/am335x-fb.c
+++ b/drivers/video/am335x-fb.c
@@ -26,6 +26,7 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include "am335x-fb.h"
 
 #define LCDC_FMAX				200000000
diff --git a/drivers/video/ati_radeon_fb.c b/drivers/video/ati_radeon_fb.c
index c4da2e3ae7f2..c326722c5500 100644
--- a/drivers/video/ati_radeon_fb.c
+++ b/drivers/video/ati_radeon_fb.c
@@ -17,6 +17,7 @@
 
 #include <common.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include <command.h>
 #include <bios_emul.h>
diff --git a/drivers/video/bridge/anx6345.c b/drivers/video/bridge/anx6345.c
index 1c5270ff05ce..5d76cedbcea0 100644
--- a/drivers/video/bridge/anx6345.c
+++ b/drivers/video/bridge/anx6345.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <video_bridge.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include "../anx98xx-edp.h"
 
 #define DP_MAX_LINK_RATE		0x001
diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c
index 3a51ad4a9d42..f9e3c1ac43e7 100644
--- a/drivers/video/cfb_console.c
+++ b/drivers/video/cfb_console.c
@@ -76,6 +76,7 @@
 #include <video.h>
 #include <asm/global_data.h>
 #include <linux/compiler.h>
+#include <linux/string.h>
 
 #if defined(CONFIG_VIDEO_MXS)
 #define VIDEO_FB_16BPP_WORD_SWAP
diff --git a/drivers/video/console_truetype.c b/drivers/video/console_truetype.c
index 22b2ea7191ef..26093408453a 100644
--- a/drivers/video/console_truetype.c
+++ b/drivers/video/console_truetype.c
@@ -9,6 +9,7 @@
 #include <malloc.h>
 #include <video.h>
 #include <video_console.h>
+#include <linux/string.h>
 
 /* Functions needed by stb_truetype.h */
 static int tt_floor(double val)
diff --git a/drivers/video/da8xx-fb.c b/drivers/video/da8xx-fb.c
index 462c318126dd..994b90a9665f 100644
--- a/drivers/video/da8xx-fb.c
+++ b/drivers/video/da8xx-fb.c
@@ -21,6 +21,7 @@
 #include <linux/delay.h>
 #include <linux/list.h>
 #include <linux/fb.h>
+#include <linux/string.h>
 
 #include <linux/errno.h>
 #include <asm/io.h>
diff --git a/drivers/video/dw_hdmi.c b/drivers/video/dw_hdmi.c
index 16db3d38a2c2..b2868413144a 100644
--- a/drivers/video/dw_hdmi.c
+++ b/drivers/video/dw_hdmi.c
@@ -13,6 +13,7 @@
 #include <i2c.h>
 #include <media_bus_format.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include "dw_hdmi.h"
 
 struct tmds_n_cts {
diff --git a/drivers/video/dw_mipi_dsi.c b/drivers/video/dw_mipi_dsi.c
index b7bfbb5e5011..547dfc4b81c6 100644
--- a/drivers/video/dw_mipi_dsi.c
+++ b/drivers/video/dw_mipi_dsi.c
@@ -24,6 +24,7 @@
 #include <linux/delay.h>
 #include <linux/iopoll.h>
 #include <video_bridge.h>
+#include <linux/string.h>
 
 #define HWVER_131			0x31333100	/* IP version 1.31 */
 
diff --git a/drivers/video/exynos/exynos_dp.c b/drivers/video/exynos/exynos_dp.c
index 36595556f137..71dae58f08b3 100644
--- a/drivers/video/exynos/exynos_dp.c
+++ b/drivers/video/exynos/exynos_dp.c
@@ -24,6 +24,7 @@
 #include <asm/arch/dp.h>
 #include <asm/arch/pinmux.h>
 #include <asm/arch/power.h>
+#include <linux/string.h>
 
 #include "exynos_dp_lowlevel.h"
 
diff --git a/drivers/video/exynos/exynos_mipi_dsi.c b/drivers/video/exynos/exynos_mipi_dsi.c
index c56eadc8237b..376e6abf2cf6 100644
--- a/drivers/video/exynos/exynos_mipi_dsi.c
+++ b/drivers/video/exynos/exynos_mipi_dsi.c
@@ -20,6 +20,7 @@
 #include <asm/arch/power.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/clk.h>
+#include <linux/string.h>
 
 #include "exynos_mipi_dsi_lowlevel.h"
 #include "exynos_mipi_dsi_common.h"
diff --git a/drivers/video/fsl_dcu_fb.c b/drivers/video/fsl_dcu_fb.c
index 60b97e40633e..bfa4ed3129b2 100644
--- a/drivers/video/fsl_dcu_fb.c
+++ b/drivers/video/fsl_dcu_fb.c
@@ -18,6 +18,7 @@
 #include <malloc.h>
 #include <video.h>
 #include <video_fb.h>
+#include <linux/string.h>
 #include "videomodes.h"
 
 /* Convert the X,Y resolution pair into a single number */
diff --git a/drivers/video/fsl_diu_fb.c b/drivers/video/fsl_diu_fb.c
index 2c21e293a2c3..e90e23779d79 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 <asm/io.h>
+#include <linux/string.h>
 
 #include "videomodes.h"
 #include <video_fb.h>
diff --git a/drivers/video/ihs_video_out.c b/drivers/video/ihs_video_out.c
index f02fd13d28ca..2124b826d28d 100644
--- a/drivers/video/ihs_video_out.c
+++ b/drivers/video/ihs_video_out.c
@@ -16,6 +16,7 @@
 #include <regmap.h>
 #include <video_osd.h>
 #include <asm/gpio.h>
+#include <linux/string.h>
 
 static const uint MAX_X_CHARS = 53;
 static const uint MAX_Y_CHARS = 26;
diff --git a/drivers/video/imx/ipu_common.c b/drivers/video/imx/ipu_common.c
index 5908b23acc9b..da7e5c851836 100644
--- a/drivers/video/imx/ipu_common.c
+++ b/drivers/video/imx/ipu_common.c
@@ -14,6 +14,7 @@
 #include <common.h>
 #include <log.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include <linux/types.h>
 #include <linux/err.h>
 #include <asm/io.h>
diff --git a/drivers/video/lg4573.c b/drivers/video/lg4573.c
index 45df9c13474e..3e61f7f53ce0 100644
--- a/drivers/video/lg4573.c
+++ b/drivers/video/lg4573.c
@@ -16,6 +16,7 @@
 #include <spi.h>
 #include <asm/gpio.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #define PWR_ON_DELAY_MSECS  120
 
diff --git a/drivers/video/logicore_dp_tx.c b/drivers/video/logicore_dp_tx.c
index 9bc4bbb85d39..e752f457560c 100644
--- a/drivers/video/logicore_dp_tx.c
+++ b/drivers/video/logicore_dp_tx.c
@@ -15,6 +15,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include "axi.h"
 #include "logicore_dp_dpcd.h"
diff --git a/drivers/video/mali_dp.c b/drivers/video/mali_dp.c
index 7f9443828b2d..e487d6742a12 100644
--- a/drivers/video/mali_dp.c
+++ b/drivers/video/mali_dp.c
@@ -21,6 +21,7 @@
 #include <dm/device_compat.h>
 #include <linux/delay.h>
 #include <linux/sizes.h>
+#include <linux/string.h>
 
 #define MALIDP_CORE_ID		0x0018
 #define MALIDP_REG_BG_COLOR	0x0044
diff --git a/drivers/video/meson/meson_venc.c b/drivers/video/meson/meson_venc.c
index e7366dd2fdea..ce64865d591a 100644
--- a/drivers/video/meson/meson_venc.c
+++ b/drivers/video/meson/meson_venc.c
@@ -12,6 +12,7 @@
 #include <fdtdec.h>
 #include <log.h>
 #include <asm/io.h>
+#include <linux/string.h>
 #include "meson_vpu.h"
 
 enum {
diff --git a/drivers/video/mipi_dsi.c b/drivers/video/mipi_dsi.c
index ecacea1dbebd..5caa6a6fef6c 100644
--- a/drivers/video/mipi_dsi.c
+++ b/drivers/video/mipi_dsi.c
@@ -39,6 +39,7 @@
 #include <mipi_display.h>
 #include <mipi_dsi.h>
 #include <dm/devres.h>
+#include <linux/string.h>
 
 /**
  * DOC: dsi helpers
diff --git a/drivers/video/mx3fb.c b/drivers/video/mx3fb.c
index 9b42ca8d03f0..05b654291879 100644
--- a/drivers/video/mx3fb.c
+++ b/drivers/video/mx3fb.c
@@ -11,6 +11,7 @@
 #include <malloc.h>
 #include <video_fb.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/clock.h>
diff --git a/drivers/video/mxsfb.c b/drivers/video/mxsfb.c
index d84adb004bcc..4bb817669f77 100644
--- a/drivers/video/mxsfb.c
+++ b/drivers/video/mxsfb.c
@@ -17,6 +17,7 @@
 #include <malloc.h>
 #include <video.h>
 #include <video_fb.h>
+#include <linux/string.h>
 
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
diff --git a/drivers/video/orisetech_otm8009a.c b/drivers/video/orisetech_otm8009a.c
index 362bf6a6fe4f..acb8f384a882 100644
--- a/drivers/video/orisetech_otm8009a.c
+++ b/drivers/video/orisetech_otm8009a.c
@@ -15,6 +15,7 @@
 #include <asm/gpio.h>
 #include <dm/device_compat.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include <power/regulator.h>
 
 #define OTM8009A_BACKLIGHT_DEFAULT	240
diff --git a/drivers/video/raydium-rm68200.c b/drivers/video/raydium-rm68200.c
index 353894503b9b..1efd1607f63e 100644
--- a/drivers/video/raydium-rm68200.c
+++ b/drivers/video/raydium-rm68200.c
@@ -15,6 +15,7 @@
 #include <asm/gpio.h>
 #include <dm/device_compat.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include <power/regulator.h>
 
 /*** Manufacturer Command Set ***/
diff --git a/drivers/video/rockchip/rk_edp.c b/drivers/video/rockchip/rk_edp.c
index 36d17deea580..b5fa492e2530 100644
--- a/drivers/video/rockchip/rk_edp.c
+++ b/drivers/video/rockchip/rk_edp.c
@@ -23,6 +23,7 @@
 #include <asm/arch-rockchip/hardware.h>
 #include <dt-bindings/clock/rk3288-cru.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #define MAX_CR_LOOP 5
 #define MAX_EQ_LOOP 5
diff --git a/drivers/video/sandbox_osd.c b/drivers/video/sandbox_osd.c
index 7e722326b3d9..9fb1224bf596 100644
--- a/drivers/video/sandbox_osd.c
+++ b/drivers/video/sandbox_osd.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <malloc.h>
 #include <video_osd.h>
+#include <linux/string.h>
 
 #include "sandbox_osd.h"
 
diff --git a/drivers/video/simplefb.c b/drivers/video/simplefb.c
index e7c2e184ba5c..a45e9aa9e0f2 100644
--- a/drivers/video/simplefb.c
+++ b/drivers/video/simplefb.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <video.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 
 static int simple_video_probe(struct udevice *dev)
 {
diff --git a/drivers/video/stb_truetype.h b/drivers/video/stb_truetype.h
index 5d00bff9fd02..93518d200ff6 100644
--- a/drivers/video/stb_truetype.h
+++ b/drivers/video/stb_truetype.h
@@ -232,6 +232,8 @@
 //
 //  Incomplete text-in-3d-api example, which draws quads properly aligned to be lossless
 //
+#include <linux/string.h>
+
 #if 0
 #define STB_TRUETYPE_IMPLEMENTATION  // force following include to generate implementation
 #include "stb_truetype.h"
diff --git a/drivers/video/sunxi/sunxi_de2.c b/drivers/video/sunxi/sunxi_de2.c
index b657e163f06a..6e3999649d31 100644
--- a/drivers/video/sunxi/sunxi_de2.c
+++ b/drivers/video/sunxi/sunxi_de2.c
@@ -22,6 +22,7 @@
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
 #include <linux/bitops.h>
+#include <linux/string.h>
 #include "simplefb_common.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/video/sunxi/sunxi_display.c b/drivers/video/sunxi/sunxi_display.c
index f52aba4d21c0..d1330314621c 100644
--- a/drivers/video/sunxi/sunxi_display.c
+++ b/drivers/video/sunxi/sunxi_display.c
@@ -12,6 +12,7 @@
 #include <init.h>
 #include <time.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include <asm/arch/clock.h>
 #include <asm/arch/display.h>
diff --git a/drivers/video/sunxi/sunxi_lcd.c b/drivers/video/sunxi/sunxi_lcd.c
index 10f7e2ac2346..c39438ff09af 100644
--- a/drivers/video/sunxi/sunxi_lcd.c
+++ b/drivers/video/sunxi/sunxi_lcd.c
@@ -18,6 +18,7 @@
 #include <asm/arch/lcdc.h>
 #include <asm/arch/gpio.h>
 #include <asm/gpio.h>
+#include <linux/string.h>
 
 struct sunxi_lcd_priv {
 	struct display_timing timing;
diff --git a/drivers/video/tegra124/dp.c b/drivers/video/tegra124/dp.c
index b09943897c18..5fcb03835d11 100644
--- a/drivers/video/tegra124/dp.c
+++ b/drivers/video/tegra124/dp.c
@@ -15,6 +15,7 @@
 #include <asm/io.h>
 #include <asm/arch-tegra/dc.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include "display.h"
 #include "edid.h"
 #include "sor.h"
diff --git a/drivers/video/vidconsole-uclass.c b/drivers/video/vidconsole-uclass.c
index 3a07f36ce278..6912177993d0 100644
--- a/drivers/video/vidconsole-uclass.c
+++ b/drivers/video/vidconsole-uclass.c
@@ -16,6 +16,7 @@
 #include <video_console.h>
 #include <video_font.h>		/* Bitmap font for code page 437 */
 #include <linux/ctype.h>
+#include <linux/string.h>
 
 /*
  * Structure to describe a console color
diff --git a/drivers/video/video-uclass.c b/drivers/video/video-uclass.c
index eb234cc9bf41..75a4ea17e36d 100644
--- a/drivers/video/video-uclass.c
+++ b/drivers/video/video-uclass.c
@@ -22,6 +22,7 @@
 #ifdef CONFIG_SANDBOX
 #include <asm/sdl.h>
 #endif
+#include <linux/string.h>
 
 /*
  * Theory of operation:
diff --git a/drivers/video/videomodes.c b/drivers/video/videomodes.c
index ed7373eac84b..8d3aff1a14c1 100644
--- a/drivers/video/videomodes.c
+++ b/drivers/video/videomodes.c
@@ -62,6 +62,7 @@
 #include <errno.h>
 #include <fdtdec.h>
 #include <linux/ctype.h>
+#include <linux/string.h>
 
 #include "videomodes.h"
 
diff --git a/drivers/virtio/virtio-uclass.c b/drivers/virtio/virtio-uclass.c
index 2636cbedfe27..5264fc209c9c 100644
--- a/drivers/virtio/virtio-uclass.c
+++ b/drivers/virtio/virtio-uclass.c
@@ -23,6 +23,7 @@
 #include <virtio.h>
 #include <dm/lists.h>
 #include <linux/bug.h>
+#include <linux/string.h>
 
 static const char *const virtio_drv_name[VIRTIO_ID_MAX_NUM] = {
 	[VIRTIO_ID_NET]		= VIRTIO_NET_DRV_NAME,
diff --git a/drivers/virtio/virtio_mmio.c b/drivers/virtio/virtio_mmio.c
index b951ea3257b1..50f79dcb3b1d 100644
--- a/drivers/virtio/virtio_mmio.c
+++ b/drivers/virtio/virtio_mmio.c
@@ -17,6 +17,7 @@
 #include <linux/compat.h>
 #include <linux/err.h>
 #include <linux/io.h>
+#include <linux/string.h>
 #include "virtio_mmio.h"
 
 static int virtio_mmio_get_config(struct udevice *udev, unsigned int offset,
diff --git a/drivers/virtio/virtio_net.c b/drivers/virtio/virtio_net.c
index 0dbbd7802308..a16268f9d27b 100644
--- a/drivers/virtio/virtio_net.c
+++ b/drivers/virtio/virtio_net.c
@@ -10,6 +10,7 @@
 #include <virtio_types.h>
 #include <virtio.h>
 #include <virtio_ring.h>
+#include <linux/string.h>
 #include "virtio_net.h"
 
 /* Amount of buffers to keep in the RX virtqueue */
diff --git a/drivers/virtio/virtio_pci_modern.c b/drivers/virtio/virtio_pci_modern.c
index 2e5bbade0021..483525872dda 100644
--- a/drivers/virtio/virtio_pci_modern.c
+++ b/drivers/virtio/virtio_pci_modern.c
@@ -18,6 +18,7 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/io.h>
+#include <linux/string.h>
 #include "virtio_pci.h"
 
 #define VIRTIO_PCI_DRV_NAME	"virtio-pci.m"
diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c
index 7f1cbc59329e..dfd0ce8db63a 100644
--- a/drivers/virtio/virtio_ring.c
+++ b/drivers/virtio/virtio_ring.c
@@ -15,6 +15,7 @@
 #include <virtio_ring.h>
 #include <linux/bug.h>
 #include <linux/compat.h>
+#include <linux/string.h>
 
 int virtqueue_add(struct virtqueue *vq, struct virtio_sg *sgs[],
 		  unsigned int out_sgs, unsigned int in_sgs)
diff --git a/drivers/virtio/virtio_rng.c b/drivers/virtio/virtio_rng.c
index fc3e19cfaeeb..111f8de2855e 100644
--- a/drivers/virtio/virtio_rng.c
+++ b/drivers/virtio/virtio_rng.c
@@ -10,6 +10,7 @@
 #include <virtio_types.h>
 #include <virtio.h>
 #include <virtio_ring.h>
+#include <linux/string.h>
 
 #define BUFFER_SIZE	16UL
 
diff --git a/drivers/w1-eeprom/ds2502.c b/drivers/w1-eeprom/ds2502.c
index 19ee4b17ea54..42a3560c2372 100644
--- a/drivers/w1-eeprom/ds2502.c
+++ b/drivers/w1-eeprom/ds2502.c
@@ -26,6 +26,7 @@
 #include <linux/err.h>
 #include <w1-eeprom.h>
 #include <w1.h>
+#include <linux/string.h>
 
 #define DS2502_PAGE_SIZE	32
 #define DS2502_PAGE_COUNT	4
diff --git a/drivers/w1-eeprom/eep_sandbox.c b/drivers/w1-eeprom/eep_sandbox.c
index 27c7f9f1b6b8..86c02b9b915b 100644
--- a/drivers/w1-eeprom/eep_sandbox.c
+++ b/drivers/w1-eeprom/eep_sandbox.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <w1-eeprom.h>
 #include <w1.h>
+#include <linux/string.h>
 
 #define W1_F2D_READ_EEPROM      0xf0
 
diff --git a/drivers/watchdog/mpc8xx_wdt.c b/drivers/watchdog/mpc8xx_wdt.c
index c8b104d8f567..3cb50ab091fc 100644
--- a/drivers/watchdog/mpc8xx_wdt.c
+++ b/drivers/watchdog/mpc8xx_wdt.c
@@ -10,6 +10,7 @@
 #include <mpc8xx.h>
 #include <asm/cpm_8xx.h>
 #include <asm/io.h>
+#include <linux/string.h>
 
 void hw_watchdog_reset(void)
 {
diff --git a/env/callback.c b/env/callback.c
index 638a02b28f78..3bcd5c111e8e 100644
--- a/env/callback.c
+++ b/env/callback.c
@@ -8,6 +8,7 @@
 #include <env.h>
 #include <env_internal.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 
 #if defined(CONFIG_NEEDS_MANUAL_RELOC)
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/env/common.c b/env/common.c
index b6a1f45271ce..1918bfa47ff3 100644
--- a/env/common.c
+++ b/env/common.c
@@ -20,6 +20,7 @@
 #include <search.h>
 #include <errno.h>
 #include <malloc.h>
+#include <linux/string.h>
 #include <u-boot/crc.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/env/ext4.c b/env/ext4.c
index d4869a1a4577..03f8e4e027bb 100644
--- a/env/ext4.c
+++ b/env/ext4.c
@@ -20,6 +20,7 @@
 
 #include <common.h>
 #include <part.h>
+#include <linux/string.h>
 
 #include <command.h>
 #include <env.h>
diff --git a/env/fat.c b/env/fat.c
index 71bf8bfa18f9..adc5e9259c24 100644
--- a/env/fat.c
+++ b/env/fat.c
@@ -19,6 +19,7 @@
 #include <mmc.h>
 #include <asm/cache.h>
 #include <linux/stddef.h>
+#include <linux/string.h>
 
 #ifdef CONFIG_SPL_BUILD
 /* TODO(sjg at chromium.org): Figure out why this is needed */
diff --git a/env/flash.c b/env/flash.c
index ebee9069e4e3..6fb9ba7edefe 100644
--- a/env/flash.c
+++ b/env/flash.c
@@ -20,6 +20,7 @@
 #include <malloc.h>
 #include <search.h>
 #include <errno.h>
+#include <linux/string.h>
 #include <u-boot/crc.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/env/mmc.c b/env/mmc.c
index 3fecdff816ba..9c28141858f7 100644
--- a/env/mmc.c
+++ b/env/mmc.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 
 #include <command.h>
 #include <env.h>
diff --git a/env/nvram.c b/env/nvram.c
index f4126858b5b4..7af5c4cf4b8f 100644
--- a/env/nvram.c
+++ b/env/nvram.c
@@ -31,6 +31,7 @@
 #include <linux/stddef.h>
 #include <search.h>
 #include <errno.h>
+#include <linux/string.h>
 #include <u-boot/crc.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/env/ubi.c b/env/ubi.c
index eb21c4f38b49..f1e9d42dbf46 100644
--- a/env/ubi.c
+++ b/env/ubi.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 
 #include <command.h>
 #include <env.h>
diff --git a/examples/api/demo.c b/examples/api/demo.c
index d586174ce8c9..789847c401ea 100644
--- a/examples/api/demo.c
+++ b/examples/api/demo.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <env.h>
+#include <linux/string.h>
 #include <linux/types.h>
 #include <api_public.h>
 
diff --git a/examples/api/glue.c b/examples/api/glue.c
index 91d13157a1e4..c90765e8d285 100644
--- a/examples/api/glue.c
+++ b/examples/api/glue.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <env.h>
+#include <linux/string.h>
 #include <linux/types.h>
 #include <api_public.h>
 #include <u-boot/crc.h>
diff --git a/examples/standalone/atmel_df_pow2.c b/examples/standalone/atmel_df_pow2.c
index 9c74f4994b95..271561d7d96f 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 <linux/delay.h>
+#include <linux/string.h>
 
 #define CMD_ID    0x9f
 #define CMD_STAT  0xd7
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index 913a4d402e91..477a4ab81733 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -10,6 +10,7 @@
 #include <memalign.h>
 #include <part.h>
 #include <linux/compat.h>
+#include <linux/string.h>
 #include "btrfs.h"
 
 #define BTRFS_SUPER_FLAG_SUPP	(BTRFS_HEADER_FLAG_WRITTEN	\
diff --git a/fs/cbfs/cbfs.c b/fs/cbfs/cbfs.c
index 9007aa7d1594..51a59030f60e 100644
--- a/fs/cbfs/cbfs.c
+++ b/fs/cbfs/cbfs.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <asm/byteorder.h>
+#include <linux/string.h>
 
 /* Offset of master header from the start of a coreboot ROM */
 #define MASTER_HDR_OFFSET	0x38
diff --git a/fs/cramfs/cramfs.c b/fs/cramfs/cramfs.c
index 7ef48bbc064c..975e29d00b11 100644
--- a/fs/cramfs/cramfs.c
+++ b/fs/cramfs/cramfs.c
@@ -32,6 +32,7 @@
 #include <jffs2/jffs2.h>
 #include <jffs2/load_kernel.h>
 #include <cramfs/cramfs_fs.h>
+#include <linux/string.h>
 
 /* These two macros may change in future, to provide better st_ino
    semantics. */
diff --git a/fs/ext4/ext4_common.c b/fs/ext4/ext4_common.c
index c52cc400e1f2..8022d7376348 100644
--- a/fs/ext4/ext4_common.c
+++ b/fs/ext4/ext4_common.c
@@ -28,6 +28,7 @@
 #include <part.h>
 #include <stddef.h>
 #include <linux/stat.h>
+#include <linux/string.h>
 #include <linux/time.h>
 #include <asm/byteorder.h>
 #include "ext4_common.h"
diff --git a/fs/ext4/ext4_common.h b/fs/ext4/ext4_common.h
index beaee9c80bd6..1314cf20df89 100644
--- a/fs/ext4/ext4_common.h
+++ b/fs/ext4/ext4_common.h
@@ -29,6 +29,7 @@
 #include "ext4_journal.h"
 #include "crc16.h"
 #endif
+#include <linux/string.h>
 
 #define YES		1
 #define NO		0
diff --git a/fs/ext4/ext4_journal.c b/fs/ext4/ext4_journal.c
index 361baa35c921..82af0784bd85 100644
--- a/fs/ext4/ext4_journal.c
+++ b/fs/ext4/ext4_journal.c
@@ -20,6 +20,7 @@
 #include <malloc.h>
 #include <ext_common.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 #include "ext4_common.h"
 
 static struct revoke_blk_list *revk_blk_list;
diff --git a/fs/ext4/ext4_write.c b/fs/ext4/ext4_write.c
index f22af45d1b97..7c04c5d3dd62 100644
--- a/fs/ext4/ext4_write.c
+++ b/fs/ext4/ext4_write.c
@@ -29,6 +29,7 @@
 #include <part.h>
 #include <linux/stat.h>
 #include <div64.h>
+#include <linux/string.h>
 #include "ext4_common.h"
 
 static inline void ext4fs_sb_free_inodes_inc(struct ext2_sblock *sb)
diff --git a/fs/ext4/ext4fs.c b/fs/ext4/ext4fs.c
index 691d7e29b6d7..44df0f4a4ad8 100644
--- a/fs/ext4/ext4fs.c
+++ b/fs/ext4/ext4fs.c
@@ -28,6 +28,7 @@
 #include <malloc.h>
 #include <part.h>
 #include <uuid.h>
+#include <linux/string.h>
 #include "ext4_common.h"
 
 int ext4fs_symlinknest;
diff --git a/fs/fat/fat.c b/fs/fat/fat.c
index 28aa5aaa9ffb..dfcc4455830e 100644
--- a/fs/fat/fat.c
+++ b/fs/fat/fat.c
@@ -22,6 +22,7 @@
 #include <asm/cache.h>
 #include <linux/compiler.h>
 #include <linux/ctype.h>
+#include <linux/string.h>
 
 /*
  * Convert a string to lowercase.  Converts at most 'len' characters,
diff --git a/fs/fat/fat_write.c b/fs/fat/fat_write.c
index a2682b5f4655..9facf7609f2e 100644
--- a/fs/fat/fat_write.c
+++ b/fs/fat/fat_write.c
@@ -17,6 +17,7 @@
 #include <linux/ctype.h>
 #include <div64.h>
 #include <linux/math64.h>
+#include <linux/string.h>
 #include "fat.c"
 
 static void uppercase(char *str, int len)
diff --git a/fs/fs.c b/fs/fs.c
index 23fad1da80f6..047390227738 100644
--- a/fs/fs.c
+++ b/fs/fs.c
@@ -26,6 +26,7 @@
 #include <linux/math64.h>
 #include <efi_loader.h>
 #include <squashfs.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/fs/fs_internal.c b/fs/fs_internal.c
index 8b19811a639a..55d6d26ba5fa 100644
--- a/fs/fs_internal.c
+++ b/fs/fs_internal.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <part.h>
 #include <memalign.h>
+#include <linux/string.h>
 
 int fs_devread(struct blk_desc *blk, struct disk_partition *partition,
 	       lbaint_t sector, int byte_offset, int byte_len, char *buf)
diff --git a/fs/jffs2/compr_zlib.c b/fs/jffs2/compr_zlib.c
index d306b6dc4cfe..12c5ed65e135 100644
--- a/fs/jffs2/compr_zlib.c
+++ b/fs/jffs2/compr_zlib.c
@@ -37,6 +37,7 @@
 
 #include <common.h>
 #include <config.h>
+#include <string.h>
 #include <jffs2/jffs2.h>
 #include <jffs2/mini_inflate.h>
 
diff --git a/fs/jffs2/jffs2_1pass.c b/fs/jffs2/jffs2_1pass.c
index a98745c50ead..c5b142973985 100644
--- a/fs/jffs2/jffs2_1pass.c
+++ b/fs/jffs2/jffs2_1pass.c
@@ -118,6 +118,7 @@
 #include <div64.h>
 #include <linux/compiler.h>
 #include <linux/stat.h>
+#include <linux/string.h>
 #include <linux/time.h>
 #include <u-boot/crc.h>
 #include <watchdog.h>
diff --git a/fs/jffs2/mini_inflate.c b/fs/jffs2/mini_inflate.c
index 3072eedd8c16..117e8f58b304 100644
--- a/fs/jffs2/mini_inflate.c
+++ b/fs/jffs2/mini_inflate.c
@@ -9,6 +9,7 @@
 
 #include <config.h>
 #include <jffs2/mini_inflate.h>
+#include <linux/string.h>
 
 /* The order that the code lengths in section 3.2.7 are in */
 static unsigned char huffman_order[] = {16, 17, 18,  0,  8,  7,  9,  6, 10,  5,
diff --git a/fs/reiserfs/reiserfs.c b/fs/reiserfs/reiserfs.c
index 635aab2eba7c..cf053e12d948 100644
--- a/fs/reiserfs/reiserfs.c
+++ b/fs/reiserfs/reiserfs.c
@@ -18,6 +18,7 @@
 #include <common.h>
 #include <malloc.h>
 #include <linux/ctype.h>
+#include <linux/string.h>
 #include <linux/time.h>
 #include <asm/byteorder.h>
 #include <reiserfs.h>
diff --git a/fs/ubifs/debug.c b/fs/ubifs/debug.c
index 4f0f680131f1..2bd0073cc591 100644
--- a/fs/ubifs/debug.c
+++ b/fs/ubifs/debug.c
@@ -20,6 +20,7 @@
 #include <time.h>
 #include <dm/devres.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 
 #ifndef __UBOOT__
 #include <linux/module.h>
diff --git a/fs/ubifs/io.c b/fs/ubifs/io.c
index eb14b8954471..57e0847464ce 100644
--- a/fs/ubifs/io.c
+++ b/fs/ubifs/io.c
@@ -68,6 +68,7 @@
 #else
 #include <linux/compat.h>
 #include <linux/err.h>
+#include <linux/string.h>
 #endif
 #include "ubifs.h"
 
diff --git a/fs/ubifs/key.h b/fs/ubifs/key.h
index 70c2faf331b8..f5b19525621e 100644
--- a/fs/ubifs/key.h
+++ b/fs/ubifs/key.h
@@ -33,6 +33,7 @@
  * reserved for "." and "..". %2 is reserved for "end of readdir" marker. This
  * function makes sure the reserved values are not used.
  */
+#include <linux/string.h>
 static inline uint32_t key_mask_hash(uint32_t hash)
 {
 	hash &= UBIFS_S_KEY_HASH_MASK;
diff --git a/fs/ubifs/log.c b/fs/ubifs/log.c
index 77ff52575eaa..0c8671a88478 100644
--- a/fs/ubifs/log.c
+++ b/fs/ubifs/log.c
@@ -19,6 +19,7 @@
 #include <log.h>
 #include <dm/devres.h>
 #include <linux/err.h>
+#include <linux/string.h>
 #endif
 #include "ubifs.h"
 
diff --git a/fs/ubifs/lprops.c b/fs/ubifs/lprops.c
index a9e22abe6b40..83e6b2d5df2c 100644
--- a/fs/ubifs/lprops.c
+++ b/fs/ubifs/lprops.c
@@ -20,6 +20,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <linux/err.h>
+#include <linux/string.h>
 #endif
 #include "ubifs.h"
 
diff --git a/fs/ubifs/lpt_commit.c b/fs/ubifs/lpt_commit.c
index 3ca8d704aaf3..583f113902ef 100644
--- a/fs/ubifs/lpt_commit.c
+++ b/fs/ubifs/lpt_commit.c
@@ -24,6 +24,7 @@
 #include <linux/compat.h>
 #include <linux/err.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include "crc16.h"
 #endif
 #include "ubifs.h"
diff --git a/fs/ubifs/recovery.c b/fs/ubifs/recovery.c
index 6b6884fb2098..cf2b8a48b8a5 100644
--- a/fs/ubifs/recovery.c
+++ b/fs/ubifs/recovery.c
@@ -43,6 +43,7 @@
 #include <u-boot/crc.h>
 #else
 #include <linux/err.h>
+#include <linux/string.h>
 #endif
 #include "ubifs.h"
 
diff --git a/fs/ubifs/replay.c b/fs/ubifs/replay.c
index aa7f281ef6b5..0862fe4ebf3b 100644
--- a/fs/ubifs/replay.c
+++ b/fs/ubifs/replay.c
@@ -25,6 +25,7 @@
 #include <dm/devres.h>
 #include <linux/compat.h>
 #include <linux/err.h>
+#include <linux/string.h>
 #endif
 #include "ubifs.h"
 #include <linux/bug.h>
diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c
index 347f83656424..1ce46ef542d5 100644
--- a/fs/ubifs/super.c
+++ b/fs/ubifs/super.c
@@ -38,6 +38,7 @@
 #include <linux/printk.h>
 #include <linux/stat.h>
 #include <linux/err.h>
+#include <linux/string.h>
 #include "ubifs.h"
 #include <ubi_uboot.h>
 #include <linux/stringify.h>
diff --git a/fs/ubifs/tnc.c b/fs/ubifs/tnc.c
index e8b8f1683804..c8aef71d86a5 100644
--- a/fs/ubifs/tnc.c
+++ b/fs/ubifs/tnc.c
@@ -30,6 +30,7 @@
 #include <linux/compat.h>
 #include <linux/err.h>
 #include <linux/stat.h>
+#include <linux/string.h>
 #endif
 #include "ubifs.h"
 
diff --git a/fs/ubifs/ubifs.c b/fs/ubifs/ubifs.c
index d6be5c947d7e..76ea7a8031e1 100644
--- a/fs/ubifs/ubifs.c
+++ b/fs/ubifs/ubifs.c
@@ -18,6 +18,7 @@
 #include <malloc.h>
 #include <memalign.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 #include "ubifs.h"
 #include <part.h>
 #include <dm/devres.h>
diff --git a/fs/yaffs2/yaffs_mtdif2.c b/fs/yaffs2/yaffs_mtdif2.c
index 81a4d964f3e9..9cf4deee99e1 100644
--- a/fs/yaffs2/yaffs_mtdif2.c
+++ b/fs/yaffs2/yaffs_mtdif2.c
@@ -17,6 +17,7 @@
 #include <common.h>
 #include <linux/bug.h>
 #include <linux/errno.h>
+#include <linux/string.h>
 
 #include "yportenv.h"
 #include "yaffs_trace.h"
diff --git a/fs/yaffs2/yaffs_uboot_glue.c b/fs/yaffs2/yaffs_uboot_glue.c
index 913eb323f382..3528a70dc054 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 <linux/printk.h>
+#include <linux/string.h>
 
 #include <config.h>
 #include "nand.h"
diff --git a/fs/yaffs2/yaffsfs.c b/fs/yaffs2/yaffsfs.c
index 510faaeed149..2643cc51057a 100644
--- a/fs/yaffs2/yaffsfs.c
+++ b/fs/yaffs2/yaffsfs.c
@@ -12,6 +12,7 @@
  */
 
 #include <div64.h>
+#include <linux/string.h>
 #include "yaffsfs.h"
 #include "yaffs_guts.h"
 #include "yaffscfg.h"
diff --git a/fs/yaffs2/ydirectenv.h b/fs/yaffs2/ydirectenv.h
index d274f22e84d0..a68c76378673 100644
--- a/fs/yaffs2/ydirectenv.h
+++ b/fs/yaffs2/ydirectenv.h
@@ -23,6 +23,7 @@
 #include <common.h>
 #include <malloc.h>
 #include <linux/compat.h>
+#include <linux/string.h>
 
 #include "yaffs_osglue.h"
 
diff --git a/fs/zfs/zfs.c b/fs/zfs/zfs.c
index 1fec96cd5ce5..8958a2562277 100644
--- a/fs/zfs/zfs.c
+++ b/fs/zfs/zfs.c
@@ -14,6 +14,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <linux/stat.h>
+#include <linux/string.h>
 #include <linux/time.h>
 #include <linux/ctype.h>
 #include <asm/byteorder.h>
diff --git a/include/common.h b/include/common.h
index a904f41c366b..69fa19324832 100644
--- a/include/common.h
+++ b/include/common.h
@@ -16,7 +16,6 @@
 #include <config.h>
 #include <errno.h>
 #include <linux/types.h>
-#include <linux/string.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <linux/kernel.h>
diff --git a/include/dm/of.h b/include/dm/of.h
index 6bef73b441c1..a64822f7e91f 100644
--- a/include/dm/of.h
+++ b/include/dm/of.h
@@ -9,6 +9,7 @@
 
 #include <asm/u-boot.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 
 /* integer value within a device tree property which references another node */
 typedef u32 phandle;
diff --git a/include/exception.h b/include/exception.h
index a7f21e73d753..7f4638e42523 100644
--- a/include/exception.h
+++ b/include/exception.h
@@ -6,6 +6,7 @@
  */
 
 #include <command.h>
+#include <linux/string.h>
 
 static int do_exception(struct cmd_tbl *cmdtp, int flag, int argc,
 			char *const argv[])
diff --git a/include/exports.h b/include/exports.h
index 4b9aa5ff405f..902f8b559b23 100644
--- a/include/exports.h
+++ b/include/exports.h
@@ -5,6 +5,7 @@
 #include <time.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #ifndef __ASSEMBLY__
 #ifdef CONFIG_PHY_AQUANTIA
diff --git a/include/fdt_support.h b/include/fdt_support.h
index 9684cffe80b2..443bfe5e3a31 100644
--- a/include/fdt_support.h
+++ b/include/fdt_support.h
@@ -338,6 +338,7 @@ int fdt_overlay_apply_verbose(void *fdt, void *fdto);
  */
 int fdt_get_cells_len(const void *blob, char *nr_cells_name);
 
+#include <linux/string.h>
 #endif /* ifdef CONFIG_OF_LIBFDT */
 
 #ifdef USE_HOSTCC
diff --git a/include/imx8image.h b/include/imx8image.h
index 00c614ab6cc5..72daa6ed5d38 100644
--- a/include/imx8image.h
+++ b/include/imx8image.h
@@ -10,6 +10,7 @@
 
 #include <image.h>
 #include <inttypes.h>
+#include <linux/string.h>
 #include "imagetool.h"
 
 #define __packed   __attribute__((packed))
diff --git a/include/malloc.h b/include/malloc.h
index f66c2e86176c..36f8556f9fe0 100644
--- a/include/malloc.h
+++ b/include/malloc.h
@@ -215,7 +215,6 @@
 
 */
 
-\f
 #ifndef __MALLOC_H__
 #define __MALLOC_H__
 
@@ -230,6 +229,7 @@
 #else
 #define __STD_C     0
 #endif /*__cplusplus*/
+#include <linux/string.h>
 #endif /*__STDC__*/
 #endif /*__STD_C*/
 
diff --git a/include/net.h b/include/net.h
index 1bf9867f8cf8..26163f9f097b 100644
--- a/include/net.h
+++ b/include/net.h
@@ -12,6 +12,7 @@
 #ifndef __NET_H__
 #define __NET_H__
 
+#include <linux/string.h>
 #include <linux/types.h>
 #include <asm/cache.h>
 #include <asm/byteorder.h>	/* for nton* / ntoh* stuff */
diff --git a/include/spi_flash.h b/include/spi_flash.h
index 85cae32cc733..d9eb9cb3eeb7 100644
--- a/include/spi_flash.h
+++ b/include/spi_flash.h
@@ -9,6 +9,7 @@
 #ifndef _SPI_FLASH_H_
 #define _SPI_FLASH_H_
 
+#include <linux/string.h>
 #include <linux/types.h>
 #include <linux/mtd/spi-nor.h>
 
diff --git a/include/test/ut.h b/include/test/ut.h
index 3295cd4e5481..96456386d214 100644
--- a/include/test/ut.h
+++ b/include/test/ut.h
@@ -11,6 +11,7 @@
 #include <command.h>
 #include <hexdump.h>
 #include <linux/err.h>
+#include <linux/string.h>
 #include <test/test.h>
 
 struct unit_test_state;
diff --git a/include/tlv_eeprom.h b/include/tlv_eeprom.h
index 9f4a109dca9b..f7e130296a7f 100644
--- a/include/tlv_eeprom.h
+++ b/include/tlv_eeprom.h
@@ -8,6 +8,7 @@
 #define __TLV_EEPROM_H_
 
 #include <compiler.h>
+#include <linux/string.h>
 
 /*
  *  The Definition of the TlvInfo EEPROM format can be found at onie.org or
diff --git a/include/video_console.h b/include/video_console.h
index 06b798ef10c5..b033dc24b390 100644
--- a/include/video_console.h
+++ b/include/video_console.h
@@ -7,6 +7,7 @@
 #define __video_console_h
 
 #include <video.h>
+#include <linux/string.h>
 
 struct video_priv;
 
diff --git a/lib/acpi/acpi_device.c b/lib/acpi/acpi_device.c
index 3c75b6d96291..cefbb5f69c5b 100644
--- a/lib/acpi/acpi_device.c
+++ b/lib/acpi/acpi_device.c
@@ -16,6 +16,7 @@
 #include <acpi/acpigen.h>
 #include <asm-generic/gpio.h>
 #include <dm/acpi.h>
+#include <linux/string.h>
 
 /**
  * acpi_device_path_fill() - Find the root device and build a path from there
diff --git a/lib/acpi/acpi_dp.c b/lib/acpi/acpi_dp.c
index 579cab477151..194e79d7d038 100644
--- a/lib/acpi/acpi_dp.c
+++ b/lib/acpi/acpi_dp.c
@@ -14,6 +14,7 @@
 #include <acpi/acpigen.h>
 #include <acpi/acpi_dp.h>
 #include <dm/acpi.h>
+#include <linux/string.h>
 
 static void acpi_dp_write_array(struct acpi_ctx *ctx,
 				const struct acpi_dp *array);
diff --git a/lib/acpi/acpi_table.c b/lib/acpi/acpi_table.c
index a3b0fb3bce00..d6abb6068a6b 100644
--- a/lib/acpi/acpi_table.c
+++ b/lib/acpi/acpi_table.c
@@ -15,6 +15,7 @@
 #include <acpi/acpi_table.h>
 #include <asm/global_data.h>
 #include <dm/acpi.h>
+#include <linux/string.h>
 
 int acpi_create_dmar(struct acpi_dmar *dmar, enum dmar_flags flags)
 {
diff --git a/lib/acpi/acpigen.c b/lib/acpi/acpigen.c
index c609ef4daa4b..0906b1d30306 100644
--- a/lib/acpi/acpigen.c
+++ b/lib/acpi/acpigen.c
@@ -16,6 +16,7 @@
 #include <acpi/acpi_device.h>
 #include <acpi/acpi_table.h>
 #include <dm/acpi.h>
+#include <linux/string.h>
 
 u8 *acpigen_get_current(struct acpi_ctx *ctx)
 {
diff --git a/lib/aes.c b/lib/aes.c
index bc6d4dfd4e09..ab1f8d67a53f 100644
--- a/lib/aes.c
+++ b/lib/aes.c
@@ -25,6 +25,7 @@
 #include <common.h>
 #include <display_options.h>
 #include <log.h>
+#include <linux/string.h>
 #else
 #include <string.h>
 #endif
diff --git a/lib/aes/aes-decrypt.c b/lib/aes/aes-decrypt.c
index 345029fa7847..06b5e0274094 100644
--- a/lib/aes/aes-decrypt.c
+++ b/lib/aes/aes-decrypt.c
@@ -6,6 +6,7 @@
 #ifndef USE_HOSTCC
 #include <common.h>
 #include <malloc.h>
+#include <linux/string.h>
 #endif
 #include <image.h>
 #include <uboot_aes.h>
diff --git a/lib/bch.c b/lib/bch.c
index 72b4fdcc9c44..7f82cef242b0 100644
--- a/lib/bch.c
+++ b/lib/bch.c
@@ -59,6 +59,7 @@
 #include <malloc.h>
 #include <ubi_uboot.h>
 #include <dm/devres.h>
+#include <linux/string.h>
 
 #include <linux/bitops.h>
 #include <linux/printk.h>
diff --git a/lib/bzip2/bzlib.c b/lib/bzip2/bzlib.c
index 377b269b06db..010ff4d73314 100644
--- a/lib/bzip2/bzlib.c
+++ b/lib/bzip2/bzlib.c
@@ -2,6 +2,7 @@
 #include <common.h>
 #include <malloc.h>
 #include <watchdog.h>
+#include <linux/string.h>
 
 /*
  * This file is a modified version of bzlib.c from the bzip2-1.0.2
diff --git a/lib/charset.c b/lib/charset.c
index a28034ee1f1e..55a487253fa9 100644
--- a/lib/charset.c
+++ b/lib/charset.c
@@ -9,6 +9,7 @@
 #include <charset.h>
 #include <capitalization.h>
 #include <malloc.h>
+#include <linux/string.h>
 
 static struct capitalization_table capitalization_table[] =
 #ifdef CONFIG_EFI_UNICODE_CAPITALIZATION
diff --git a/lib/crc16.c b/lib/crc16.c
index f46ba727c9a8..aa6d117ae174 100644
--- a/lib/crc16.c
+++ b/lib/crc16.c
@@ -26,6 +26,7 @@
 #include <arpa/inet.h>
 #else
 #include <common.h>
+#include <linux/string.h>
 #endif
 #include <u-boot/crc.h>
 
diff --git a/lib/crc32.c b/lib/crc32.c
index e9be3bf386e7..aa210cea0558 100644
--- a/lib/crc32.c
+++ b/lib/crc32.c
@@ -14,6 +14,7 @@
 #else
 #include <common.h>
 #include <efi_loader.h>
+#include <linux/string.h>
 #endif
 #include <compiler.h>
 #include <u-boot/crc.h>
diff --git a/lib/crypto/pkcs7_verify.c b/lib/crypto/pkcs7_verify.c
index db02f346f764..5ca268ee00cc 100644
--- a/lib/crypto/pkcs7_verify.c
+++ b/lib/crypto/pkcs7_verify.c
@@ -16,6 +16,7 @@
 #include <linux/compat.h>
 #include <linux/asn1.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include <u-boot/rsa-checksum.h>
 #include <crypto/public_key.h>
 #include <crypto/pkcs7_parser.h>
diff --git a/lib/crypto/public_key.c b/lib/crypto/public_key.c
index 8eb14aac20d5..17c3947c82df 100644
--- a/lib/crypto/public_key.c
+++ b/lib/crypto/public_key.c
@@ -14,6 +14,7 @@
 #include <linux/compat.h>
 #include <linux/err.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #else
 #include <linux/module.h>
 #include <linux/export.h>
diff --git a/lib/crypto/x509_public_key.c b/lib/crypto/x509_public_key.c
index 518dc9067310..f79b4ea6b0fc 100644
--- a/lib/crypto/x509_public_key.c
+++ b/lib/crypto/x509_public_key.c
@@ -14,6 +14,7 @@
 #include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #else
 #include <linux/module.h>
 #endif
diff --git a/lib/dhry/dhry_1.c b/lib/dhry/dhry_1.c
index dcc224fb387d..b36c1672b4a3 100644
--- a/lib/dhry/dhry_1.c
+++ b/lib/dhry/dhry_1.c
@@ -44,6 +44,7 @@ char SCCSid[] = "@(#) @(#)dhry_1.c:3.4 -- 5/15/91 19:30:21";
 
 #include <common.h>
 #include <malloc.h>
+#include <string.h>
 
 #include "dhry.h"
 
diff --git a/lib/dhry/dhry_2.c b/lib/dhry/dhry_2.c
index 1ba879673e30..02cd9827e892 100644
--- a/lib/dhry/dhry_2.c
+++ b/lib/dhry/dhry_2.c
@@ -40,6 +40,7 @@
 /* SCCSid is defined in dhry_1.c */
 
 #include <common.h>
+#include <string.h>
 #include "dhry.h"
 
 #ifndef REG
diff --git a/lib/efi/efi_app.c b/lib/efi/efi_app.c
index 907bacd716a7..878c1cd6e5cd 100644
--- a/lib/efi/efi_app.c
+++ b/lib/efi/efi_app.c
@@ -17,6 +17,7 @@
 #include <malloc.h>
 #include <asm/global_data.h>
 #include <linux/err.h>
+#include <linux/string.h>
 #include <linux/types.h>
 #include <efi.h>
 #include <efi_api.h>
diff --git a/lib/efi/efi_stub.c b/lib/efi/efi_stub.c
index 7d650d512e30..b19e6d21a799 100644
--- a/lib/efi/efi_stub.c
+++ b/lib/efi/efi_stub.c
@@ -19,6 +19,7 @@
 #include <asm/cpu.h>
 #include <asm/io.h>
 #include <linux/err.h>
+#include <linux/string.h>
 #include <linux/types.h>
 
 #ifndef CONFIG_X86
diff --git a/lib/efi_loader/efi_bootmgr.c b/lib/efi_loader/efi_bootmgr.c
index 1e06e6096392..45442789db15 100644
--- a/lib/efi_loader/efi_bootmgr.c
+++ b/lib/efi_loader/efi_bootmgr.c
@@ -14,6 +14,7 @@
 #include <efi_loader.h>
 #include <efi_variable.h>
 #include <asm/unaligned.h>
+#include <linux/string.h>
 
 static const struct efi_boot_services *bs;
 static const struct efi_runtime_services *rs;
diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c
index d07e36caa3f4..b39ca817dde5 100644
--- a/lib/efi_loader/efi_boottime.c
+++ b/lib/efi_loader/efi_boottime.c
@@ -14,6 +14,7 @@
 #include <time.h>
 #include <asm/global_data.h>
 #include <linux/libfdt_env.h>
+#include <linux/string.h>
 #include <u-boot/crc.h>
 #include <bootm.h>
 #include <pe.h>
diff --git a/lib/efi_loader/efi_console.c b/lib/efi_loader/efi_console.c
index 426de779517c..48c7940e5bfe 100644
--- a/lib/efi_loader/efi_console.c
+++ b/lib/efi_loader/efi_console.c
@@ -14,6 +14,7 @@
 #include <env.h>
 #include <stdio_dev.h>
 #include <video_console.h>
+#include <linux/string.h>
 
 #define EFI_COUT_MODE_2 2
 #define EFI_MAX_COUT_MODE 3
diff --git a/lib/efi_loader/efi_device_path.c b/lib/efi_loader/efi_device_path.c
index 7ae14f342396..d3b1e273b9b8 100644
--- a/lib/efi_loader/efi_device_path.c
+++ b/lib/efi_loader/efi_device_path.c
@@ -18,6 +18,7 @@
 #include <sandboxblockdev.h>
 #include <asm-generic/unaligned.h>
 #include <linux/compat.h> /* U16_MAX */
+#include <linux/string.h>
 
 #ifdef CONFIG_SANDBOX
 const efi_guid_t efi_guid_host_dev = U_BOOT_HOST_DEV_GUID;
diff --git a/lib/efi_loader/efi_device_path_to_text.c b/lib/efi_loader/efi_device_path_to_text.c
index 5ae4833fa78c..ece99eb94243 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 <linux/string.h>
 
 #define MAC_OUTPUT_LEN 22
 #define UNKNOWN_OUTPUT_LEN 23
diff --git a/lib/efi_loader/efi_disk.c b/lib/efi_loader/efi_disk.c
index 7bd1ccec4501..6a66b5cf2923 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 <linux/string.h>
 
 struct efi_system_partition efi_system_partition;
 
diff --git a/lib/efi_loader/efi_file.c b/lib/efi_loader/efi_file.c
index 44fafae05868..5954397e4daf 100644
--- a/lib/efi_loader/efi_file.c
+++ b/lib/efi_loader/efi_file.c
@@ -13,6 +13,7 @@
 #include <mapmem.h>
 #include <fs.h>
 #include <part.h>
+#include <linux/string.h>
 
 /* GUID for file system information */
 const efi_guid_t efi_file_system_info_guid = EFI_FILE_SYSTEM_INFO_GUID;
diff --git a/lib/efi_loader/efi_freestanding.c b/lib/efi_loader/efi_freestanding.c
index bd0dff162f6b..87c1633804c9 100644
--- a/lib/efi_loader/efi_freestanding.c
+++ b/lib/efi_loader/efi_freestanding.c
@@ -9,6 +9,7 @@
  */
 
 #include <common.h>
+#include <linux/string.h>
 
 /**
  * memcmp() - compare memory areas
diff --git a/lib/efi_loader/efi_gop.c b/lib/efi_loader/efi_gop.c
index 1206b2d7a2c8..c26493af6ca0 100644
--- a/lib/efi_loader/efi_gop.c
+++ b/lib/efi_loader/efi_gop.c
@@ -13,6 +13,7 @@
 #include <malloc.h>
 #include <video.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/lib/efi_loader/efi_hii.c b/lib/efi_loader/efi_hii.c
index 77e330285a72..92ae7e44e0a4 100644
--- a/lib/efi_loader/efi_hii.c
+++ b/lib/efi_loader/efi_hii.c
@@ -10,6 +10,7 @@
 #include <efi_loader.h>
 #include <malloc.h>
 #include <asm/unaligned.h>
+#include <linux/string.h>
 
 const efi_guid_t efi_guid_hii_database_protocol
 		= EFI_HII_DATABASE_PROTOCOL_GUID;
diff --git a/lib/efi_loader/efi_image_loader.c b/lib/efi_loader/efi_image_loader.c
index eea42cc20436..79338e9a61d3 100644
--- a/lib/efi_loader/efi_image_loader.c
+++ b/lib/efi_loader/efi_image_loader.c
@@ -15,6 +15,7 @@
 #include <sort.h>
 #include <crypto/pkcs7_parser.h>
 #include <linux/err.h>
+#include <linux/string.h>
 
 const efi_guid_t efi_global_variable_guid = EFI_GLOBAL_VARIABLE_GUID;
 const efi_guid_t efi_guid_device_path = EFI_DEVICE_PATH_PROTOCOL_GUID;
diff --git a/lib/efi_loader/efi_load_initrd.c b/lib/efi_loader/efi_load_initrd.c
index 574a83d7e308..800ff9fc41a6 100644
--- a/lib/efi_loader/efi_load_initrd.c
+++ b/lib/efi_loader/efi_load_initrd.c
@@ -11,6 +11,7 @@
 #include <fs.h>
 #include <efi_loader.h>
 #include <efi_load_initrd.h>
+#include <linux/string.h>
 
 static const efi_guid_t efi_guid_load_file2_protocol =
 		EFI_LOAD_FILE2_PROTOCOL_GUID;
diff --git a/lib/efi_loader/efi_net.c b/lib/efi_loader/efi_net.c
index 22f0123eca47..b056e08b3ecd 100644
--- a/lib/efi_loader/efi_net.c
+++ b/lib/efi_loader/efi_net.c
@@ -19,6 +19,7 @@
 #include <efi_loader.h>
 #include <malloc.h>
 #include <net.h>
+#include <linux/string.h>
 
 static const efi_guid_t efi_net_guid = EFI_SIMPLE_NETWORK_PROTOCOL_GUID;
 static const efi_guid_t efi_pxe_base_code_protocol_guid =
diff --git a/lib/efi_loader/efi_runtime.c b/lib/efi_loader/efi_runtime.c
index d0235c46e185..ddc6e6a4cdee 100644
--- a/lib/efi_loader/efi_runtime.c
+++ b/lib/efi_loader/efi_runtime.c
@@ -15,6 +15,7 @@
 #include <malloc.h>
 #include <rtc.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 #include <u-boot/crc.h>
 
 /* For manual relocation support */
diff --git a/lib/efi_loader/efi_setup.c b/lib/efi_loader/efi_setup.c
index 6196c0a06cd7..51fc48b780bc 100644
--- a/lib/efi_loader/efi_setup.c
+++ b/lib/efi_loader/efi_setup.c
@@ -9,6 +9,7 @@
 #include <bootm.h>
 #include <efi_loader.h>
 #include <efi_variable.h>
+#include <linux/string.h>
 
 #define OBJ_LIST_NOT_INITIALIZED 1
 
diff --git a/lib/efi_loader/efi_signature.c b/lib/efi_loader/efi_signature.c
index 79dee27421b2..3d18edd04d79 100644
--- a/lib/efi_loader/efi_signature.c
+++ b/lib/efi_loader/efi_signature.c
@@ -15,6 +15,7 @@
 #include <crypto/public_key.h>
 #include <linux/compat.h>
 #include <linux/oid_registry.h>
+#include <linux/string.h>
 #include <u-boot/rsa.h>
 #include <u-boot/sha256.h>
 
diff --git a/lib/efi_loader/efi_unicode_collation.c b/lib/efi_loader/efi_unicode_collation.c
index 6655c68092e4..e002ed6a3925 100644
--- a/lib/efi_loader/efi_unicode_collation.c
+++ b/lib/efi_loader/efi_unicode_collation.c
@@ -10,6 +10,7 @@
 #include <cp1250.h>
 #include <cp437.h>
 #include <efi_loader.h>
+#include <linux/string.h>
 
 /* Characters that may not be used in FAT 8.3 file names */
 static const char illegal[] = "+,<=>:;\"/\\|?*[]\x7f";
diff --git a/lib/efi_loader/efi_var_file.c b/lib/efi_loader/efi_var_file.c
index b171d2d1a8f7..91c458ceea4b 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 <linux/string.h>
 #include <u-boot/crc.h>
 
 #define PART_STR_LEN 10
diff --git a/lib/efi_loader/efi_var_mem.c b/lib/efi_loader/efi_var_mem.c
index 8f4a5a5e4709..33501ad0c061 100644
--- a/lib/efi_loader/efi_var_mem.c
+++ b/lib/efi_loader/efi_var_mem.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <efi_loader.h>
 #include <efi_variable.h>
+#include <linux/string.h>
 #include <u-boot/crc.h>
 
 struct efi_var_file __efi_runtime_data *efi_var_buf;
diff --git a/lib/efi_loader/efi_variable.c b/lib/efi_loader/efi_variable.c
index a10b9caa8b03..d613de2ebb34 100644
--- a/lib/efi_loader/efi_variable.c
+++ b/lib/efi_loader/efi_variable.c
@@ -20,6 +20,7 @@
 #include <uuid.h>
 #include <crypto/pkcs7_parser.h>
 #include <linux/compat.h>
+#include <linux/string.h>
 #include <u-boot/crc.h>
 #include <asm/sections.h>
 
diff --git a/lib/efi_loader/efi_variable_tee.c b/lib/efi_loader/efi_variable_tee.c
index be6f3dfad469..08f7c95e37bf 100644
--- a/lib/efi_loader/efi_variable_tee.c
+++ b/lib/efi_loader/efi_variable_tee.c
@@ -14,6 +14,7 @@
 #include <tee.h>
 #include <malloc.h>
 #include <mm_communication.h>
+#include <linux/string.h>
 
 #define OPTEE_PAGE_SIZE BIT(12)
 extern struct efi_var_file __efi_runtime_data *efi_var_buf;
diff --git a/lib/efi_loader/helloworld.c b/lib/efi_loader/helloworld.c
index 9ae2ee338987..2598fdfd124b 100644
--- a/lib/efi_loader/helloworld.c
+++ b/lib/efi_loader/helloworld.c
@@ -11,6 +11,7 @@
 
 #include <common.h>
 #include <efi_api.h>
+#include <linux/string.h>
 
 static const efi_guid_t loaded_image_guid = EFI_LOADED_IMAGE_PROTOCOL_GUID;
 static const efi_guid_t fdt_guid = EFI_FDT_GUID;
diff --git a/lib/efi_selftest/efi_selftest_block_device.c b/lib/efi_selftest/efi_selftest_block_device.c
index 5eb297d285af..63d340342a9d 100644
--- a/lib/efi_selftest/efi_selftest_block_device.c
+++ b/lib/efi_selftest/efi_selftest_block_device.c
@@ -14,6 +14,7 @@
  */
 
 #include <efi_selftest.h>
+#include <linux/string.h>
 #include "efi_selftest_disk_image.h"
 #include <asm/cache.h>
 
diff --git a/lib/efi_selftest/efi_selftest_config_table.c b/lib/efi_selftest/efi_selftest_config_table.c
index 2bf12b5bb68e..6f6a8757ac54 100644
--- a/lib/efi_selftest/efi_selftest_config_table.c
+++ b/lib/efi_selftest/efi_selftest_config_table.c
@@ -9,6 +9,7 @@
  */
 
 #include <efi_selftest.h>
+#include <linux/string.h>
 #include <u-boot/crc.h>
 
 static const struct efi_system_table *sys_table;
diff --git a/lib/efi_selftest/efi_selftest_load_initrd.c b/lib/efi_selftest/efi_selftest_load_initrd.c
index e16163caca85..144443ff6854 100644
--- a/lib/efi_selftest/efi_selftest_load_initrd.c
+++ b/lib/efi_selftest/efi_selftest_load_initrd.c
@@ -41,6 +41,7 @@
 #include <efi_selftest.h>
 #include <efi_loader.h>
 #include <efi_load_initrd.h>
+#include <linux/string.h>
 
 static struct efi_boot_services *boottime;
 
diff --git a/lib/efi_selftest/efi_selftest_loaded_image.c b/lib/efi_selftest/efi_selftest_loaded_image.c
index 5889ab126175..01f6dee2ea6e 100644
--- a/lib/efi_selftest/efi_selftest_loaded_image.c
+++ b/lib/efi_selftest/efi_selftest_loaded_image.c
@@ -8,6 +8,7 @@
  */
 
 #include <efi_selftest.h>
+#include <linux/string.h>
 
 static efi_guid_t loaded_image_protocol_guid =
 	EFI_GUID(0x5b1b31a1, 0x9562, 0x11d2,
diff --git a/lib/efi_selftest/efi_selftest_loadimage.c b/lib/efi_selftest/efi_selftest_loadimage.c
index 06a87df8620c..f251cbc33bce 100644
--- a/lib/efi_selftest/efi_selftest_loadimage.c
+++ b/lib/efi_selftest/efi_selftest_loadimage.c
@@ -11,6 +11,7 @@
  */
 
 #include <efi_selftest.h>
+#include <linux/string.h>
 /* Include containing the efi_selftest_miniapp_exit.efi application */
 #include "efi_miniapp_file_image_exit.h"
 
diff --git a/lib/efi_selftest/efi_selftest_manageprotocols.c b/lib/efi_selftest/efi_selftest_manageprotocols.c
index 8edb1e4d4671..f22cad4c1c0f 100644
--- a/lib/efi_selftest/efi_selftest_manageprotocols.c
+++ b/lib/efi_selftest/efi_selftest_manageprotocols.c
@@ -12,6 +12,7 @@
  */
 
 #include <efi_selftest.h>
+#include <linux/string.h>
 
 /*
  * The test currently does not actually call the interface function.
diff --git a/lib/efi_selftest/efi_selftest_mem.c b/lib/efi_selftest/efi_selftest_mem.c
index 51f0fec39b9b..c5f0d7ccfa15 100644
--- a/lib/efi_selftest/efi_selftest_mem.c
+++ b/lib/efi_selftest/efi_selftest_mem.c
@@ -11,6 +11,7 @@
  */
 
 #include <efi_selftest.h>
+#include <linux/string.h>
 
 static struct efi_boot_services *boottime;
 
diff --git a/lib/efi_selftest/efi_selftest_memory.c b/lib/efi_selftest/efi_selftest_memory.c
index 4d32a2800613..2efb6e42aa25 100644
--- a/lib/efi_selftest/efi_selftest_memory.c
+++ b/lib/efi_selftest/efi_selftest_memory.c
@@ -11,6 +11,7 @@
  */
 
 #include <efi_selftest.h>
+#include <linux/string.h>
 
 #define EFI_ST_NUM_PAGES 8
 
diff --git a/lib/efi_selftest/efi_selftest_rng.c b/lib/efi_selftest/efi_selftest_rng.c
index fca9749d072d..ecf13a41fafc 100644
--- a/lib/efi_selftest/efi_selftest_rng.c
+++ b/lib/efi_selftest/efi_selftest_rng.c
@@ -9,6 +9,7 @@
 
 #include <efi_selftest.h>
 #include <efi_rng.h>
+#include <linux/string.h>
 
 #define RNG_LEN 9
 
diff --git a/lib/efi_selftest/efi_selftest_set_virtual_address_map.c b/lib/efi_selftest/efi_selftest_set_virtual_address_map.c
index a4e5a50f632b..b9045fe1143b 100644
--- a/lib/efi_selftest/efi_selftest_set_virtual_address_map.c
+++ b/lib/efi_selftest/efi_selftest_set_virtual_address_map.c
@@ -9,6 +9,7 @@
  */
 
 #include <efi_selftest.h>
+#include <linux/string.h>
 
 static const struct efi_boot_services *boottime;
 static const struct efi_runtime_services *runtime;
diff --git a/lib/efi_selftest/efi_selftest_snp.c b/lib/efi_selftest/efi_selftest_snp.c
index 79f04678039f..3357048c7f44 100644
--- a/lib/efi_selftest/efi_selftest_snp.c
+++ b/lib/efi_selftest/efi_selftest_snp.c
@@ -16,6 +16,7 @@
 
 #include <efi_selftest.h>
 #include <net.h>
+#include <linux/string.h>
 
 /*
  * MAC address for broadcasts
diff --git a/lib/efi_selftest/efi_selftest_startimage_exit.c b/lib/efi_selftest/efi_selftest_startimage_exit.c
index 11207b8162f7..1406dfc91721 100644
--- a/lib/efi_selftest/efi_selftest_startimage_exit.c
+++ b/lib/efi_selftest/efi_selftest_startimage_exit.c
@@ -10,6 +10,7 @@
  */
 
 #include <efi_selftest.h>
+#include <linux/string.h>
 /* Include containing the miniapp.efi application */
 #include "efi_miniapp_file_image_exit.h"
 
diff --git a/lib/efi_selftest/efi_selftest_variables.c b/lib/efi_selftest/efi_selftest_variables.c
index 2c16f3db6cc3..dfbdeb99f31c 100644
--- a/lib/efi_selftest/efi_selftest_variables.c
+++ b/lib/efi_selftest/efi_selftest_variables.c
@@ -9,6 +9,7 @@
  */
 
 #include <efi_selftest.h>
+#include <linux/string.h>
 
 #define EFI_ST_MAX_DATA_SIZE 16
 #define EFI_ST_MAX_VARNAME_SIZE 80
diff --git a/lib/efi_selftest/efi_selftest_variables_runtime.c b/lib/efi_selftest/efi_selftest_variables_runtime.c
index 3226069c0b21..619da67a292a 100644
--- a/lib/efi_selftest/efi_selftest_variables_runtime.c
+++ b/lib/efi_selftest/efi_selftest_variables_runtime.c
@@ -10,6 +10,7 @@
  */
 
 #include <efi_selftest.h>
+#include <linux/string.h>
 
 #define EFI_ST_MAX_DATA_SIZE 16
 #define EFI_ST_MAX_VARNAME_SIZE 40
diff --git a/lib/elf.c b/lib/elf.c
index d074e4e0a7d9..4c5b050da2e1 100644
--- a/lib/elf.c
+++ b/lib/elf.c
@@ -15,6 +15,7 @@
 #include <asm/e820.h>
 #include <linux/linkage.h>
 #endif
+#include <linux/string.h>
 
 /*
  * A very simple ELF64 loader, assumes the image is valid, returns the
diff --git a/lib/fdtdec.c b/lib/fdtdec.c
index c3724790a6ec..37bacdd7b335 100644
--- a/lib/fdtdec.c
+++ b/lib/fdtdec.c
@@ -26,6 +26,7 @@
 #include <asm/sections.h>
 #include <linux/ctype.h>
 #include <linux/lzo.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/lib/fdtdec_test.c b/lib/fdtdec_test.c
index e0c6e0971cd9..28260468e077 100644
--- a/lib/fdtdec_test.c
+++ b/lib/fdtdec_test.c
@@ -12,6 +12,7 @@
 #include <linux/libfdt.h>
 #include <malloc.h>
 #include <os.h>
+#include <linux/string.h>
 
 /* The size of our test fdt blob */
 #define FDT_SIZE	(16 * 1024)
diff --git a/lib/gunzip.c b/lib/gunzip.c
index bee3b9261f34..1073bebac063 100644
--- a/lib/gunzip.c
+++ b/lib/gunzip.c
@@ -13,6 +13,7 @@
 #include <image.h>
 #include <malloc.h>
 #include <memalign.h>
+#include <linux/string.h>
 #include <u-boot/crc.h>
 #include <watchdog.h>
 #include <u-boot/zlib.h>
diff --git a/lib/libavb/avb_sysdeps_posix.c b/lib/libavb/avb_sysdeps_posix.c
index 6ffdb0b7eb35..88135b90850c 100644
--- a/lib/libavb/avb_sysdeps_posix.c
+++ b/lib/libavb/avb_sysdeps_posix.c
@@ -7,6 +7,7 @@
 #include <malloc.h>
 #include <stdarg.h>
 #include <stdlib.h>
+#include <linux/string.h>
 
 #include "avb_sysdeps.h"
 
diff --git a/lib/linux_compat.c b/lib/linux_compat.c
index c83426f59dc2..8b9b562f98ea 100644
--- a/lib/linux_compat.c
+++ b/lib/linux_compat.c
@@ -4,6 +4,7 @@
 #include <memalign.h>
 #include <asm/cache.h>
 #include <linux/compat.h>
+#include <linux/string.h>
 
 struct p_current cur = {
 	.pid = 1,
diff --git a/lib/list_sort.c b/lib/list_sort.c
index 1c9e06173270..44d85ff43fee 100644
--- a/lib/list_sort.c
+++ b/lib/list_sort.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <malloc.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #endif
 #include <linux/list.h>
 #include <linux/list_sort.h>
diff --git a/lib/lz4.c b/lib/lz4.c
index 046c34e39063..e803c087a269 100644
--- a/lib/lz4.c
+++ b/lib/lz4.c
@@ -8,6 +8,7 @@
    - LZ4 public forum : https://groups.google.com/forum/#!forum/lz4c
 */
 
+#include <linux/string.h>
 
 /**************************************
 *  Reading and writing into memory
diff --git a/lib/lz4_wrapper.c b/lib/lz4_wrapper.c
index e0f7d3688ee5..edce13da6bde 100644
--- a/lib/lz4_wrapper.c
+++ b/lib/lz4_wrapper.c
@@ -8,6 +8,7 @@
 #include <image.h>
 #include <lz4.h>
 #include <linux/kernel.h>
+#include <linux/string.h>
 #include <linux/types.h>
 #include <asm/unaligned.h>
 
diff --git a/lib/lzo/lzo1x_decompress.c b/lib/lzo/lzo1x_decompress.c
index 65fef0b0eb90..48800c91ccff 100644
--- a/lib/lzo/lzo1x_decompress.c
+++ b/lib/lzo/lzo1x_decompress.c
@@ -15,6 +15,7 @@
 #include <linux/lzo.h>
 #include <asm/byteorder.h>
 #include <asm/unaligned.h>
+#include <linux/string.h>
 #include "lzodefs.h"
 
 #define HAVE_IP(x, ip_end, ip) ((size_t)(ip_end - ip) < (x))
diff --git a/lib/membuff.c b/lib/membuff.c
index 36dc43a523fb..b0fc716a04be 100644
--- a/lib/membuff.c
+++ b/lib/membuff.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <log.h>
 #include <malloc.h>
+#include <linux/string.h>
 #include "membuff.h"
 
 void membuff_purge(struct membuff *mb)
diff --git a/lib/of_live.c b/lib/of_live.c
index 05a45ed34af2..c27a7a6e24fe 100644
--- a/lib/of_live.c
+++ b/lib/of_live.c
@@ -15,6 +15,7 @@
 #include <malloc.h>
 #include <dm/of_access.h>
 #include <linux/err.h>
+#include <linux/string.h>
 
 static void *unflatten_dt_alloc(void **mem, unsigned long size,
 				unsigned long align)
diff --git a/lib/optee/optee.c b/lib/optee/optee.c
index ed9731680233..ec1e29cc3f69 100644
--- a/lib/optee/optee.c
+++ b/lib/optee/optee.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <linux/libfdt.h>
+#include <linux/string.h>
 #include <tee/optee.h>
 
 #define optee_hdr_err_msg \
diff --git a/lib/physmem.c b/lib/physmem.c
index fc90ce4d7cfd..43f034766ab8 100644
--- a/lib/physmem.c
+++ b/lib/physmem.c
@@ -13,6 +13,7 @@
 #include <mapmem.h>
 #include <physmem.h>
 #include <linux/compiler.h>
+#include <linux/string.h>
 
 phys_addr_t __weak arch_phys_memset(phys_addr_t s, int c, phys_size_t n)
 {
diff --git a/lib/qsort.c b/lib/qsort.c
index 2f18588dfccd..40f90d28866f 100644
--- a/lib/qsort.c
+++ b/lib/qsort.c
@@ -16,6 +16,7 @@
  * bcc and gcc. */
 
 #include <log.h>
+#include <linux/string.h>
 #include <linux/types.h>
 #include <common.h>
 #include <exports.h>
diff --git a/lib/rsa/rsa-keyprop.c b/lib/rsa/rsa-keyprop.c
index 1e83eedc82cf..4114e33d36e0 100644
--- a/lib/rsa/rsa-keyprop.c
+++ b/lib/rsa/rsa-keyprop.c
@@ -14,6 +14,7 @@
 #include <malloc.h>
 #include <asm/byteorder.h>
 #include <crypto/internal/rsa.h>
+#include <linux/string.h>
 #include <u-boot/rsa-mod-exp.h>
 
 /**
diff --git a/lib/rsa/rsa-mod-exp.c b/lib/rsa/rsa-mod-exp.c
index a437cbe26f28..d8cd3ecd88d6 100644
--- a/lib/rsa/rsa-mod-exp.c
+++ b/lib/rsa/rsa-mod-exp.c
@@ -12,6 +12,7 @@
 #include <linux/errno.h>
 #include <asm/types.h>
 #include <asm/unaligned.h>
+#include <linux/string.h>
 #else
 #include "fdt_host.h"
 #include "mkimage.h"
diff --git a/lib/rsa/rsa-verify.c b/lib/rsa/rsa-verify.c
index 2057f6819db8..22ec890b407f 100644
--- a/lib/rsa/rsa-verify.c
+++ b/lib/rsa/rsa-verify.c
@@ -14,6 +14,7 @@
 #include <asm/types.h>
 #include <asm/unaligned.h>
 #include <dm.h>
+#include <linux/string.h>
 #else
 #include "fdt_host.h"
 #include "mkimage.h"
diff --git a/lib/slre.c b/lib/slre.c
index e82a9e7635b1..da17c018d839 100644
--- a/lib/slre.c
+++ b/lib/slre.c
@@ -26,6 +26,7 @@
 #endif /* SLRE_TEST */
 
 #include <errno.h>
+#include <linux/string.h>
 
 #include <slre.h>
 
diff --git a/lib/smbios.c b/lib/smbios.c
index 11790443e1a9..12f0a3a4ffdc 100644
--- a/lib/smbios.c
+++ b/lib/smbios.c
@@ -16,6 +16,7 @@
 #include <dm.h>
 #include <dm/uclass-internal.h>
 #endif
+#include <linux/string.h>
 
 /**
  * smbios_add_string() - add a string to the string area
diff --git a/lib/strto.c b/lib/strto.c
index c00bb5895df4..009e67d417a2 100644
--- a/lib/strto.c
+++ b/lib/strto.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <errno.h>
 #include <linux/ctype.h>
+#include <linux/string.h>
 
 /* from lib/kstrtox.c */
 static const char *_parse_integer_fixup_radix(const char *s, unsigned int *base)
diff --git a/lib/tpm-common.c b/lib/tpm-common.c
index e4af87f76aa7..adfe49190699 100644
--- a/lib/tpm-common.c
+++ b/lib/tpm-common.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <asm/unaligned.h>
 #include <tpm-common.h>
+#include <linux/string.h>
 #include "tpm-utils.h"
 
 enum tpm_version tpm_get_version(struct udevice *dev)
diff --git a/lib/tpm-v1.c b/lib/tpm-v1.c
index a846fe00dd3e..e7221dd8f2e9 100644
--- a/lib/tpm-v1.c
+++ b/lib/tpm-v1.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <log.h>
 #include <asm/unaligned.h>
+#include <linux/string.h>
 #include <u-boot/sha1.h>
 #include <tpm-common.h>
 #include <tpm-v1.h>
diff --git a/lib/tpm-v2.c b/lib/tpm-v2.c
index a4c352e3ef75..594ccb6c2348 100644
--- a/lib/tpm-v2.c
+++ b/lib/tpm-v2.c
@@ -9,6 +9,7 @@
 #include <tpm-common.h>
 #include <tpm-v2.h>
 #include <linux/bitops.h>
+#include <linux/string.h>
 #include "tpm-utils.h"
 
 u32 tpm2_startup(struct udevice *dev, enum tpm2_startup_types mode)
diff --git a/lib/trace.c b/lib/trace.c
index 854e495ed715..1b59e7d1cb96 100644
--- a/lib/trace.c
+++ b/lib/trace.c
@@ -10,6 +10,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/sections.h>
+#include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/lib/uuid.c b/lib/uuid.c
index e62d5ca2643f..ec6beedd55a5 100644
--- a/lib/uuid.c
+++ b/lib/uuid.c
@@ -15,6 +15,7 @@
 #include <asm/io.h>
 #include <part_efi.h>
 #include <malloc.h>
+#include <linux/string.h>
 
 /*
  * UUID - Universally Unique IDentifier - 128 bits unique number.
diff --git a/lib/zstd/zstd_opt.h b/lib/zstd/zstd_opt.h
index af0aaf5b20d4..25f78bdba24f 100644
--- a/lib/zstd/zstd_opt.h
+++ b/lib/zstd/zstd_opt.h
@@ -9,6 +9,7 @@
 #ifndef ZSTD_OPT_H_91842398743
 #define ZSTD_OPT_H_91842398743
 
+#include <linux/string.h>
 #define ZSTD_LITFREQ_ADD 2
 #define ZSTD_FREQ_DIV 4
 #define ZSTD_MAX_PRICE (1 << 30)
diff --git a/net/arp.c b/net/arp.c
index 7913812b9a22..52f4f31e5295 100644
--- a/net/arp.c
+++ b/net/arp.c
@@ -15,6 +15,7 @@
 #include <net.h>
 #include <time.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #include "arp.h"
 
diff --git a/net/bootp.c b/net/bootp.c
index 23b5b8ad9b95..6038e7a86c60 100644
--- a/net/bootp.c
+++ b/net/bootp.c
@@ -19,6 +19,7 @@
 #include <time.h>
 #include <uuid.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 #include <net/tftp.h>
 #include "bootp.h"
 #ifdef CONFIG_LED_STATUS
diff --git a/net/cdp.c b/net/cdp.c
index fac020468194..af4ea9cd41a2 100644
--- a/net/cdp.c
+++ b/net/cdp.c
@@ -14,6 +14,7 @@
 #if defined(CONFIG_CDP_VERSION)
 #include <timestamp.h>
 #endif
+#include <linux/string.h>
 
 #include "cdp.h"
 
diff --git a/net/dns.c b/net/dns.c
index 677e39dd0318..12182c9501ce 100644
--- a/net/dns.c
+++ b/net/dns.c
@@ -29,6 +29,7 @@
 #include <net.h>
 #include <time.h>
 #include <asm/unaligned.h>
+#include <linux/string.h>
 
 #include "dns.h"
 
diff --git a/net/eth-uclass.c b/net/eth-uclass.c
index 9b5c3c04eccb..42eb460e833a 100644
--- a/net/eth-uclass.c
+++ b/net/eth-uclass.c
@@ -14,6 +14,7 @@
 #include <asm/global_data.h>
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
+#include <linux/string.h>
 #include <net/pcap.h>
 #include "eth_internal.h"
 #include <eth_phy.h>
diff --git a/net/eth_common.c b/net/eth_common.c
index 58f899a02405..44047abe7c96 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 <linux/string.h>
 #include "eth_internal.h"
 
 int eth_env_get_enetaddr_by_index(const char *base_name, int index,
diff --git a/net/eth_legacy.c b/net/eth_legacy.c
index 5e51164a8cd3..efd325d46ab2 100644
--- a/net/eth_legacy.c
+++ b/net/eth_legacy.c
@@ -16,6 +16,7 @@
 #include <asm/global_data.h>
 #include <linux/bug.h>
 #include <linux/errno.h>
+#include <linux/string.h>
 #include <net/pcap.h>
 #include "eth_internal.h"
 
diff --git a/net/fastboot.c b/net/fastboot.c
index c35953f3e333..4f1fed9e7787 100644
--- a/net/fastboot.c
+++ b/net/fastboot.c
@@ -9,6 +9,7 @@
 #include <net.h>
 #include <time.h>
 #include <linux/printk.h>
+#include <linux/string.h>
 #include <net/fastboot.h>
 
 /* Fastboot port # defined in spec */
diff --git a/net/link_local.c b/net/link_local.c
index 16bc5c8b90ad..0ddd1bd061fb 100644
--- a/net/link_local.c
+++ b/net/link_local.c
@@ -17,6 +17,7 @@
 #include <net.h>
 #include <rand.h>
 #include <time.h>
+#include <linux/string.h>
 #include "arp.h"
 #include "net_rand.h"
 
diff --git a/net/mdio-uclass.c b/net/mdio-uclass.c
index 66ee2e19763a..1c9ce801dc86 100644
--- a/net/mdio-uclass.c
+++ b/net/mdio-uclass.c
@@ -13,6 +13,7 @@
 #include <dm/device_compat.h>
 #include <dm/uclass-internal.h>
 #include <linux/compat.h>
+#include <linux/string.h>
 
 /* DT node properties for MAC-PHY interface */
 #define PHY_MODE_STR_CNT	2
diff --git a/net/net.c b/net/net.c
index 8ee76fba4902..02f2ea5be5b3 100644
--- a/net/net.c
+++ b/net/net.c
@@ -98,6 +98,7 @@
 #include <log.h>
 #include <net.h>
 #include <time.h>
+#include <linux/string.h>
 #include <net/fastboot.h>
 #include <net/tftp.h>
 #if defined(CONFIG_CMD_PCAP)
diff --git a/net/net_rand.h b/net/net_rand.h
index 4bf9bd817e5f..3181aa358cc4 100644
--- a/net/net_rand.h
+++ b/net/net_rand.h
@@ -10,6 +10,7 @@
 #define __NET_RAND_H__
 
 #include <common.h>
+#include <linux/string.h>
 
 /*
  * Return a seed for the PRNG derived from the eth0 MAC address.
diff --git a/net/nfs.c b/net/nfs.c
index 8a3b04adcdc6..3d7ebeaff09c 100644
--- a/net/nfs.c
+++ b/net/nfs.c
@@ -35,6 +35,7 @@
 #include <net.h>
 #include <malloc.h>
 #include <mapmem.h>
+#include <linux/string.h>
 #include "nfs.h"
 #include "bootp.h"
 #include <time.h>
diff --git a/net/pcap.c b/net/pcap.c
index 4036d8a3fa53..981f8f750e23 100644
--- a/net/pcap.c
+++ b/net/pcap.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <net.h>
+#include <linux/string.h>
 #include <net/pcap.h>
 #include <time.h>
 #include <asm/io.h>
diff --git a/net/rarp.c b/net/rarp.c
index a676a4253b5e..6fd07bc6f14b 100644
--- a/net/rarp.c
+++ b/net/rarp.c
@@ -8,6 +8,7 @@
 #include <command.h>
 #include <log.h>
 #include <net.h>
+#include <linux/string.h>
 #include <net/tftp.h>
 #include "nfs.h"
 #include "bootp.h"
diff --git a/net/sntp.c b/net/sntp.c
index 8ecc0117ca74..e814af66b794 100644
--- a/net/sntp.c
+++ b/net/sntp.c
@@ -12,6 +12,7 @@
 #include <net.h>
 #include <rtc.h>
 #include <time.h>
+#include <linux/string.h>
 
 #include "sntp.h"
 
diff --git a/net/tftp.c b/net/tftp.c
index 9ba34d858c2f..d52133214858 100644
--- a/net/tftp.c
+++ b/net/tftp.c
@@ -17,6 +17,7 @@
 #include <net.h>
 #include <time.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 #include <net/tftp.h>
 #include "bootp.h"
 #ifdef CONFIG_SYS_DIRECT_FLASH_TFTP
diff --git a/net/wol.c b/net/wol.c
index 0a625668a992..e985f4adc59d 100644
--- a/net/wol.c
+++ b/net/wol.c
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <env.h>
 #include <net.h>
+#include <linux/string.h>
 #include "wol.h"
 
 static ulong wol_timeout = WOL_DEFAULT_TIMEOUT;
diff --git a/post/drivers/flash.c b/post/drivers/flash.c
index 07eab332d21b..7c6caa4f1977 100644
--- a/post/drivers/flash.c
+++ b/post/drivers/flash.c
@@ -10,6 +10,7 @@
 #include <malloc.h>
 #include <post.h>
 #include <flash.h>
+#include <linux/string.h>
 
 #if CONFIG_POST & CONFIG_SYS_POST_FLASH
 
diff --git a/post/lib_powerpc/multi.c b/post/lib_powerpc/multi.c
index f082e4c546cc..31134a9f1b56 100644
--- a/post/lib_powerpc/multi.c
+++ b/post/lib_powerpc/multi.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <irq_func.h>
 #include <log.h>
+#include <linux/string.h>
 
 /*
  * CPU test
diff --git a/post/lib_powerpc/string.c b/post/lib_powerpc/string.c
index fc460ceb9f0b..c292f8f0f8e0 100644
--- a/post/lib_powerpc/string.c
+++ b/post/lib_powerpc/string.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <irq_func.h>
+#include <linux/string.h>
 
 /*
  * CPU test
diff --git a/post/post.c b/post/post.c
index c344ec5810f7..65162e6d985a 100644
--- a/post/post.c
+++ b/post/post.c
@@ -15,6 +15,7 @@
 #include <div64.h>
 #include <post.h>
 #include <asm/global_data.h>
+#include <linux/string.h>
 
 #ifdef CONFIG_SYS_POST_HOTKEYS_GPIO
 #include <asm/gpio.h>
-- 
2.17.1

^ permalink raw reply related	[flat|nested] 35+ messages in thread

* [RFCv2 07/16] common: Drop asm/u-boot.h from common header
  2020-08-19 13:08 ` [RFCv2] common: Drop remaining includes in common.h Tom Rini
                     ` (5 preceding siblings ...)
  2020-08-19 13:08   ` [RFCv2 06/16] common: Drop linux/string.h " Tom Rini
@ 2020-08-19 13:08   ` Tom Rini
  2020-08-19 13:09   ` [RFCv2 08/16] common: Drop stdio.h " Tom Rini
                     ` (9 subsequent siblings)
  16 siblings, 0 replies; 35+ messages in thread
From: Tom Rini @ 2020-08-19 13:08 UTC (permalink / raw)
  To: u-boot

From: Simon Glass <sjg@chromium.org>

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

In many cases this means pulling in different headers that some
architectures included within <asm/u-boot.h> but should be included
directly as needed instead.

Signed-off-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Tom Rini <trini@konsulko.com>
---
Changes in v2:
- If a file needed <asm/u-boot.h> for struct bd_info, keep adding back
  <asm/u-boot.h>
- In the case of PowerPC platforms that used <common.h> to pull in
  <asm/ppc.h> via <asm/u-boot.h>, directly include <asm/ppc.h> in cases
  that need headers pulled in via that switching mechanism.
---
 arch/arm/cpu/arm1136/mx35/generic.c               | 1 +
 arch/arm/cpu/arm926ejs/mx25/generic.c             | 1 +
 arch/arm/cpu/arm926ejs/mx27/generic.c             | 1 +
 arch/arm/cpu/arm926ejs/mxs/mxs.c                  | 1 +
 arch/arm/cpu/arm926ejs/mxs/spl_boot.c             | 1 +
 arch/arm/cpu/armv7/ls102xa/cpu.c                  | 1 +
 arch/arm/cpu/armv7/ls102xa/fdt.c                  | 1 +
 arch/arm/cpu/armv7/vf610/generic.c                | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/cpu.c           | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/fdt.c           | 1 +
 arch/arm/cpu/armv8/s32v234/generic.c              | 1 +
 arch/arm/include/asm/arch-mx27/mxcmmc.h           | 1 +
 arch/arm/include/asm/arch-mx31/sys_proto.h        | 1 +
 arch/arm/include/asm/arch-mx6/litesom.h           | 1 +
 arch/arm/include/asm/arch-mxs/sys_proto.h         | 1 +
 arch/arm/include/asm/mach-imx/sys_proto.h         | 1 +
 arch/arm/include/asm/omap_common.h                | 1 +
 arch/arm/lib/bdinfo.c                             | 1 +
 arch/arm/lib/bootm-fdt.c                          | 1 +
 arch/arm/lib/bootm.c                              | 1 +
 arch/arm/lib/cache-cp15.c                         | 1 +
 arch/arm/mach-davinci/include/mach/sdmmc_defs.h   | 1 +
 arch/arm/mach-imx/cpu.c                           | 1 +
 arch/arm/mach-imx/imx8/ahab.c                     | 1 +
 arch/arm/mach-imx/imx8/fdt.c                      | 1 +
 arch/arm/mach-imx/imx8m/soc.c                     | 1 +
 arch/arm/mach-imx/mx6/litesom.c                   | 1 +
 arch/arm/mach-imx/mx6/module_fuse.c               | 1 +
 arch/arm/mach-kirkwood/cpu.c                      | 1 +
 arch/arm/mach-lpc32xx/cpu.c                       | 1 +
 arch/arm/mach-meson/board-common.c                | 1 +
 arch/arm/mach-mvebu/cpu.c                         | 1 +
 arch/arm/mach-omap2/am33xx/board.c                | 1 +
 arch/arm/mach-omap2/am33xx/fdt.c                  | 1 +
 arch/arm/mach-omap2/fdt-common.c                  | 1 +
 arch/arm/mach-omap2/omap-cache.c                  | 1 +
 arch/arm/mach-omap2/omap3/emac.c                  | 1 +
 arch/arm/mach-omap2/omap5/fdt.c                   | 1 +
 arch/arm/mach-orion5x/cpu.c                       | 1 +
 arch/arm/mach-rmobile/emac.c                      | 1 +
 arch/arm/mach-rockchip/rk3288/rk3288.c            | 1 +
 arch/arm/mach-stm32mp/fdt.c                       | 1 +
 arch/arm/mach-tegra/dt-setup.c                    | 1 +
 arch/arm/mach-uniphier/fdt-fixup.c                | 1 +
 arch/m68k/cpu/mcf523x/cpu.c                       | 1 +
 arch/m68k/cpu/mcf52x2/cpu.c                       | 1 +
 arch/m68k/cpu/mcf532x/cpu.c                       | 1 +
 arch/m68k/cpu/mcf5445x/cpu.c                      | 1 +
 arch/m68k/cpu/mcf547x_8x/cpu.c                    | 1 +
 arch/m68k/lib/bdinfo.c                            | 1 +
 arch/m68k/lib/bootm.c                             | 1 +
 arch/nds32/lib/bootm.c                            | 1 +
 arch/powerpc/cpu/mpc83xx/cpu.c                    | 3 ++-
 arch/powerpc/cpu/mpc83xx/cpu_init.c               | 2 +-
 arch/powerpc/cpu/mpc83xx/ecc.c                    | 1 +
 arch/powerpc/cpu/mpc83xx/fdt.c                    | 3 ++-
 arch/powerpc/cpu/mpc83xx/interrupts.c             | 3 ++-
 arch/powerpc/cpu/mpc83xx/law.c                    | 1 +
 arch/powerpc/cpu/mpc83xx/pci.c                    | 2 ++
 arch/powerpc/cpu/mpc83xx/pcie.c                   | 1 +
 arch/powerpc/cpu/mpc83xx/spd_sdram.c              | 2 +-
 arch/powerpc/cpu/mpc83xx/speed.c                  | 2 +-
 arch/powerpc/cpu/mpc83xx/spl_minimal.c            | 1 +
 arch/powerpc/cpu/mpc83xx/traps.c                  | 2 +-
 arch/powerpc/cpu/mpc85xx/b4860_serdes.c           | 2 +-
 arch/powerpc/cpu/mpc85xx/cmd_errata.c             | 3 ++-
 arch/powerpc/cpu/mpc85xx/cpu.c                    | 1 +
 arch/powerpc/cpu/mpc85xx/ether_fcc.c              | 1 +
 arch/powerpc/cpu/mpc85xx/fdt.c                    | 1 +
 arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c    | 3 +--
 arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c     | 3 +--
 arch/powerpc/cpu/mpc85xx/interrupts.c             | 1 +
 arch/powerpc/cpu/mpc85xx/p2041_serdes.c           | 3 +--
 arch/powerpc/cpu/mpc85xx/p3041_serdes.c           | 3 +--
 arch/powerpc/cpu/mpc85xx/p4080_serdes.c           | 3 +--
 arch/powerpc/cpu/mpc85xx/p5020_serdes.c           | 3 +--
 arch/powerpc/cpu/mpc85xx/p5040_serdes.c           | 3 +--
 arch/powerpc/cpu/mpc85xx/t1024_serdes.c           | 4 +---
 arch/powerpc/cpu/mpc85xx/t1040_serdes.c           | 3 +--
 arch/powerpc/cpu/mpc85xx/t2080_serdes.c           | 3 +--
 arch/powerpc/cpu/mpc85xx/t4240_serdes.c           | 3 +--
 arch/powerpc/cpu/mpc86xx/fdt.c                    | 1 +
 arch/powerpc/cpu/mpc86xx/interrupts.c             | 2 +-
 arch/powerpc/cpu/mpc86xx/mp.c                     | 2 +-
 arch/powerpc/cpu/mpc86xx/speed.c                  | 2 +-
 arch/powerpc/cpu/mpc8xx/cpu.c                     | 2 ++
 arch/powerpc/cpu/mpc8xx/cpu_init.c                | 1 +
 arch/powerpc/cpu/mpc8xx/fdt.c                     | 1 +
 arch/powerpc/cpu/mpc8xx/interrupts.c              | 2 +-
 arch/powerpc/cpu/mpc8xx/speed.c                   | 2 +-
 arch/powerpc/cpu/mpc8xxx/cpu.c                    | 1 +
 arch/powerpc/cpu/mpc8xxx/fsl_pamu.c               | 1 +
 arch/powerpc/cpu/mpc8xxx/srio.c                   | 1 +
 arch/powerpc/include/asm/fsl_liodn.h              | 1 +
 arch/powerpc/include/asm/immap_83xx.h             | 1 +
 arch/powerpc/include/asm/immap_85xx.h             | 1 +
 arch/powerpc/include/asm/immap_86xx.h             | 1 +
 arch/powerpc/lib/bdinfo.c                         | 1 +
 arch/powerpc/lib/bootm.c                          | 1 +
 arch/powerpc/lib/interrupts.c                     | 7 ++++---
 arch/riscv/include/asm/arch-fu540/reset.h         | 2 ++
 arch/riscv/lib/boot.c                             | 2 +-
 arch/riscv/lib/bootm.c                            | 1 +
 arch/riscv/lib/interrupts.c                       | 1 +
 arch/sh/cpu/sh4/cpu.c                             | 1 +
 arch/x86/lib/bootm.c                              | 1 +
 arch/xtensa/lib/bootm.c                           | 1 +
 board/AndesTech/adp-ae3xx/adp-ae3xx.c             | 1 +
 board/AndesTech/adp-ag101p/adp-ag101p.c           | 1 +
 board/AndesTech/ax25-ae350/ax25-ae350.c           | 1 +
 board/Arcturus/ucp1020/spl.c                      | 1 +
 board/Arcturus/ucp1020/tlb.c                      | 2 +-
 board/Arcturus/ucp1020/ucp1020.c                  | 1 +
 board/BuR/common/bur_common.h                     | 1 +
 board/BuR/common/common.c                         | 1 +
 board/CZ.NIC/turris_mox/turris_mox.c              | 1 +
 board/CarMediaLab/flea3/flea3.c                   | 1 +
 board/Marvell/db-88f6720/db-88f6720.c             | 1 +
 board/Marvell/db-88f6820-amc/db-88f6820-amc.c     | 1 +
 board/Marvell/db-88f6820-gp/db-88f6820-gp.c       | 1 +
 board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c       | 1 +
 board/Marvell/gplugd/gplugd.c                     | 1 +
 board/abilis/tb100/tb100.c                        | 1 +
 board/advantech/dms-ba16/dms-ba16.c               | 1 +
 board/advantech/imx8qm_rom7720_a1/spl.c           | 1 +
 board/amazon/kc1/kc1.c                            | 1 +
 board/armltd/integrator/integrator.c              | 1 +
 board/armltd/vexpress/vexpress_common.c           | 1 +
 board/armltd/vexpress64/vexpress64.c              | 1 +
 board/atmel/at91rm9200ek/at91rm9200ek.c           | 1 +
 board/atmel/at91sam9261ek/at91sam9261ek.c         | 1 +
 board/atmel/at91sam9n12ek/at91sam9n12ek.c         | 1 +
 board/bachmann/ot1200/ot1200.c                    | 1 +
 board/barco/platinum/platinum.c                   | 1 +
 board/barco/titanium/titanium.c                   | 1 +
 board/bluegiga/apx4devkit/apx4devkit.c            | 1 +
 board/bluewater/gurnard/gurnard.c                 | 1 +
 board/bluewater/snapper9260/snapper9260.c         | 1 +
 board/bosch/shc/board.c                           | 1 +
 board/boundary/nitrogen6x/nitrogen6x.c            | 1 +
 board/broadcom/bcm23550_w1d/bcm23550_w1d.c        | 1 +
 board/broadcom/bcm28155_ap/bcm28155_ap.c          | 1 +
 board/broadcom/bcm_ep/board.c                     | 1 +
 board/calao/usb_a9263/usb_a9263.c                 | 1 +
 board/cavium/thunderx/thunderx.c                  | 1 +
 board/ccv/xpress/xpress.c                         | 1 +
 board/cirrus/edb93xx/edb93xx.c                    | 1 +
 board/compulab/cl-som-imx7/cl-som-imx7.c          | 1 +
 board/compulab/cl-som-imx7/spl.c                  | 1 +
 board/compulab/cm_fx6/cm_fx6.c                    | 1 +
 board/compulab/cm_fx6/spl.c                       | 1 +
 board/compulab/cm_t335/cm_t335.c                  | 1 +
 board/compulab/cm_t43/cm_t43.c                    | 1 +
 board/congatec/cgtqmx6eval/cgtqmx6eval.c          | 1 +
 board/corscience/tricorder/tricorder.c            | 1 +
 board/creative/xfi3/xfi3.c                        | 1 +
 board/cssi/MCR3000/MCR3000.c                      | 2 ++
 board/cssi/MCR3000/nand.c                         | 1 +
 board/davinci/da8xxevm/da850evm.c                 | 1 +
 board/davinci/da8xxevm/omapl138_lcdk.c            | 1 +
 board/dhelectronics/dh_imx6/dh_imx6_spl.c         | 1 +
 board/dhelectronics/dh_stm32mp1/board.c           | 1 +
 board/egnite/ethernut5/ethernut5.c                | 1 +
 board/el/el6x/el6x.c                              | 1 +
 board/embest/mx6boards/mx6boards.c                | 1 +
 board/esd/meesc/meesc.c                           | 1 +
 board/esd/vme8349/pci.c                           | 1 +
 board/esd/vme8349/vme8349.c                       | 2 ++
 board/freescale/common/cds_pci_ft.c               | 1 +
 board/freescale/common/p_corenet/pci.c            | 1 +
 board/freescale/common/p_corenet/tlb.c            | 2 +-
 board/freescale/corenet_ds/corenet_ds.c           | 1 +
 board/freescale/corenet_ds/corenet_ds.h           | 1 +
 board/freescale/corenet_ds/ddr.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/imx8mq_evk/spl.c                  | 1 +
 board/freescale/imx8qm_mek/imx8qm_mek.c           | 1 +
 board/freescale/imx8qxp_mek/imx8qxp_mek.c         | 1 +
 board/freescale/ls1012afrdm/ls1012afrdm.c         | 1 +
 board/freescale/ls1012aqds/ls1012aqds.c           | 1 +
 board/freescale/ls1012ardb/ls1012ardb.c           | 1 +
 board/freescale/ls1021aiot/ls1021aiot.c           | 1 +
 board/freescale/ls1021aqds/eth.c                  | 1 +
 board/freescale/ls1021aqds/ls1021aqds.c           | 1 +
 board/freescale/ls1021atsn/ls1021atsn.c           | 1 +
 board/freescale/ls1021atwr/ls1021atwr.c           | 1 +
 board/freescale/ls1028a/ls1028a.c                 | 1 +
 board/freescale/ls1043aqds/eth.c                  | 1 +
 board/freescale/ls1043aqds/ls1043aqds.c           | 1 +
 board/freescale/ls1043ardb/eth.c                  | 1 +
 board/freescale/ls1043ardb/ls1043ardb.c           | 1 +
 board/freescale/ls1046afrwy/eth.c                 | 1 +
 board/freescale/ls1046afrwy/ls1046afrwy.c         | 1 +
 board/freescale/ls1046aqds/eth.c                  | 1 +
 board/freescale/ls1046aqds/ls1046aqds.c           | 1 +
 board/freescale/ls1046ardb/eth.c                  | 1 +
 board/freescale/ls1046ardb/ls1046ardb.c           | 1 +
 board/freescale/ls1088a/eth_ls1088aqds.c          | 1 +
 board/freescale/ls1088a/eth_ls1088ardb.c          | 1 +
 board/freescale/ls1088a/ls1088a.c                 | 1 +
 board/freescale/ls2080a/ls2080a.c                 | 1 +
 board/freescale/ls2080aqds/eth.c                  | 1 +
 board/freescale/ls2080aqds/ls2080aqds.c           | 1 +
 board/freescale/ls2080ardb/eth_ls2080rdb.c        | 1 +
 board/freescale/ls2080ardb/ls2080ardb.c           | 1 +
 board/freescale/lx2160a/eth_lx2160aqds.c          | 1 +
 board/freescale/lx2160a/eth_lx2160ardb.c          | 1 +
 board/freescale/lx2160a/lx2160a.c                 | 1 +
 board/freescale/m5253demo/m5253demo.c             | 1 +
 board/freescale/mpc8308rdb/mpc8308rdb.c           | 2 ++
 board/freescale/mpc8308rdb/sdram.c                | 2 +-
 board/freescale/mpc8313erdb/mpc8313erdb.c         | 2 ++
 board/freescale/mpc8313erdb/sdram.c               | 2 +-
 board/freescale/mpc8315erdb/mpc8315erdb.c         | 2 ++
 board/freescale/mpc8315erdb/sdram.c               | 2 +-
 board/freescale/mpc8323erdb/mpc8323erdb.c         | 2 ++
 board/freescale/mpc832xemds/mpc832xemds.c         | 2 ++
 board/freescale/mpc832xemds/pci.c                 | 1 +
 board/freescale/mpc8349emds/ddr.c                 | 1 +
 board/freescale/mpc8349emds/mpc8349emds.c         | 2 ++
 board/freescale/mpc8349emds/pci.c                 | 1 +
 board/freescale/mpc8349itx/mpc8349itx.c           | 2 ++
 board/freescale/mpc8349itx/pci.c                  | 1 +
 board/freescale/mpc837xemds/mpc837xemds.c         | 2 ++
 board/freescale/mpc837xemds/pci.c                 | 2 ++
 board/freescale/mpc837xemds/pci.h                 | 1 +
 board/freescale/mpc837xerdb/mpc837xerdb.c         | 2 ++
 board/freescale/mpc837xerdb/pci.c                 | 1 +
 board/freescale/mpc8541cds/mpc8541cds.c           | 1 +
 board/freescale/mpc8541cds/tlb.c                  | 2 +-
 board/freescale/mpc8544ds/mpc8544ds.c             | 1 +
 board/freescale/mpc8544ds/tlb.c                   | 2 +-
 board/freescale/mpc8548cds/mpc8548cds.c           | 1 +
 board/freescale/mpc8548cds/tlb.c                  | 2 +-
 board/freescale/mpc8555cds/mpc8555cds.c           | 1 +
 board/freescale/mpc8555cds/tlb.c                  | 2 +-
 board/freescale/mpc8568mds/mpc8568mds.c           | 1 +
 board/freescale/mpc8568mds/tlb.c                  | 2 +-
 board/freescale/mpc8569mds/mpc8569mds.c           | 1 +
 board/freescale/mpc8569mds/tlb.c                  | 2 +-
 board/freescale/mpc8572ds/ddr.c                   | 1 +
 board/freescale/mpc8572ds/mpc8572ds.c             | 1 +
 board/freescale/mpc8572ds/tlb.c                   | 2 +-
 board/freescale/mpc8610hpcd/mpc8610hpcd.c         | 1 +
 board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c     | 1 +
 board/freescale/mpc8641hpcn/ddr.c                 | 1 +
 board/freescale/mpc8641hpcn/mpc8641hpcn.c         | 1 +
 board/freescale/mx23evk/mx23evk.c                 | 1 +
 board/freescale/mx25pdk/mx25pdk.c                 | 1 +
 board/freescale/mx28evk/mx28evk.c                 | 1 +
 board/freescale/mx35pdk/mx35pdk.c                 | 1 +
 board/freescale/mx51evk/mx51evk.c                 | 1 +
 board/freescale/mx53ard/mx53ard.c                 | 1 +
 board/freescale/mx53evk/mx53evk.c                 | 1 +
 board/freescale/mx53loco/mx53loco.c               | 1 +
 board/freescale/mx53smd/mx53smd.c                 | 1 +
 board/freescale/mx6qarm2/mx6qarm2.c               | 1 +
 board/freescale/mx6sabreauto/mx6sabreauto.c       | 1 +
 board/freescale/mx6sabresd/mx6sabresd.c           | 1 +
 board/freescale/mx6slevk/mx6slevk.c               | 1 +
 board/freescale/mx6sxsabreauto/mx6sxsabreauto.c   | 1 +
 board/freescale/mx6sxsabresd/mx6sxsabresd.c       | 1 +
 board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c | 1 +
 board/freescale/mx7ulp_evk/mx7ulp_evk.c           | 1 +
 board/freescale/p1010rdb/ddr.c                    | 3 +--
 board/freescale/p1010rdb/p1010rdb.c               | 1 +
 board/freescale/p1010rdb/spl.c                    | 1 +
 board/freescale/p1010rdb/tlb.c                    | 2 +-
 board/freescale/p1023rdb/p1023rdb.c               | 1 +
 board/freescale/p1023rdb/tlb.c                    | 2 +-
 board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c       | 1 +
 board/freescale/p1_p2_rdb_pc/spl.c                | 1 +
 board/freescale/p1_p2_rdb_pc/tlb.c                | 2 +-
 board/freescale/p2041rdb/ddr.c                    | 1 +
 board/freescale/p2041rdb/eth.c                    | 1 +
 board/freescale/p2041rdb/p2041rdb.c               | 1 +
 board/freescale/qemu-ppce500/qemu-ppce500.c       | 1 +
 board/freescale/s32v234evb/s32v234evb.c           | 1 +
 board/freescale/t102xrdb/ddr.c                    | 1 +
 board/freescale/t102xrdb/eth_t102xrdb.c           | 1 +
 board/freescale/t102xrdb/pci.c                    | 1 +
 board/freescale/t102xrdb/spl.c                    | 1 +
 board/freescale/t102xrdb/t102xrdb.c               | 1 +
 board/freescale/t102xrdb/t102xrdb.h               | 1 +
 board/freescale/t102xrdb/tlb.c                    | 2 +-
 board/freescale/t104xrdb/ddr.c                    | 1 +
 board/freescale/t104xrdb/eth.c                    | 1 +
 board/freescale/t104xrdb/pci.c                    | 1 +
 board/freescale/t104xrdb/spl.c                    | 1 +
 board/freescale/t104xrdb/t104xrdb.c               | 1 +
 board/freescale/t104xrdb/t104xrdb.h               | 1 +
 board/freescale/t104xrdb/tlb.c                    | 2 +-
 board/freescale/t208xqds/ddr.c                    | 1 +
 board/freescale/t208xqds/eth_t208xqds.c           | 1 +
 board/freescale/t208xqds/pci.c                    | 1 +
 board/freescale/t208xqds/spl.c                    | 1 +
 board/freescale/t208xqds/t208xqds.c               | 1 +
 board/freescale/t208xqds/t208xqds.h               | 1 +
 board/freescale/t208xqds/tlb.c                    | 2 +-
 board/freescale/t208xrdb/cpld.c                   | 1 +
 board/freescale/t208xrdb/ddr.c                    | 1 +
 board/freescale/t208xrdb/eth_t208xrdb.c           | 1 +
 board/freescale/t208xrdb/pci.c                    | 1 +
 board/freescale/t208xrdb/spl.c                    | 1 +
 board/freescale/t208xrdb/t208xrdb.c               | 1 +
 board/freescale/t208xrdb/t208xrdb.h               | 1 +
 board/freescale/t208xrdb/tlb.c                    | 2 +-
 board/freescale/t4rdb/ddr.c                       | 1 +
 board/freescale/t4rdb/eth.c                       | 1 +
 board/freescale/t4rdb/pci.c                       | 1 +
 board/freescale/t4rdb/spl.c                       | 1 +
 board/freescale/t4rdb/t4240rdb.c                  | 1 +
 board/freescale/t4rdb/t4rdb.h                     | 1 +
 board/freescale/t4rdb/tlb.c                       | 2 +-
 board/freescale/vf610twr/vf610twr.c               | 1 +
 board/gateworks/gw_ventana/common.c               | 1 +
 board/gateworks/gw_ventana/gw_ventana.c           | 1 +
 board/gdsys/common/ioep-fpga.c                    | 2 +-
 board/gdsys/mpc8308/gazerbeam.c                   | 1 +
 board/gdsys/mpc8308/hrcon.c                       | 2 ++
 board/gdsys/mpc8308/mpc8308.c                     | 2 +-
 board/gdsys/mpc8308/sdram.c                       | 2 +-
 board/gdsys/mpc8308/strider.c                     | 2 ++
 board/gdsys/p1022/controlcenterd.c                | 1 +
 board/gdsys/p1022/diu.c                           | 1 +
 board/gdsys/p1022/tlb.c                           | 2 +-
 board/ge/bx50v3/bx50v3.c                          | 1 +
 board/ge/mx53ppd/mx53ppd.c                        | 1 +
 board/google/imx8mq_phanbell/spl.c                | 1 +
 board/grinn/liteboard/board.c                     | 1 +
 board/highbank/highbank.c                         | 1 +
 board/hisilicon/hikey/hikey.c                     | 1 +
 board/ids/ids8313/ids8313.c                       | 2 ++
 board/imgtec/boston/dt.c                          | 1 +
 board/imgtec/ci20/ci20.c                          | 1 +
 board/imgtec/malta/malta.c                        | 1 +
 board/inversepath/usbarmory/usbarmory.c           | 1 +
 board/isee/igep003x/board.c                       | 1 +
 board/isee/igep00x0/common.c                      | 1 +
 board/isee/igep00x0/igep00x0.c                    | 1 +
 board/keymile/common/common.c                     | 1 +
 board/keymile/common/qrio.c                       | 1 +
 board/keymile/km83xx/km83xx.c                     | 3 ++-
 board/keymile/km83xx/km83xx_i2c.c                 | 1 +
 board/keymile/kmp204x/eth.c                       | 1 +
 board/keymile/kmp204x/kmp204x.c                   | 1 +
 board/keymile/kmp204x/kmp204x.h                   | 1 +
 board/keymile/kmp204x/pci.c                       | 1 +
 board/keymile/kmp204x/tlb.c                       | 2 +-
 board/kmc/kzm9g/kzm9g.c                           | 1 +
 board/kobol/helios4/helios4.c                     | 1 +
 board/kosagi/novena/novena_spl.c                  | 1 +
 board/l+g/vinco/vinco.c                           | 1 +
 board/laird/wb45n/wb45n.c                         | 1 +
 board/laird/wb50n/wb50n.c                         | 1 +
 board/lg/sniper/sniper.c                          | 1 +
 board/liebherr/display5/display5.c                | 1 +
 board/liebherr/display5/spl.c                     | 1 +
 board/liebherr/mccmon6/spl.c                      | 1 +
 board/liebherr/xea/xea.c                          | 1 +
 board/logicpd/am3517evm/am3517evm.c               | 1 +
 board/menlo/m53menlo/m53menlo.c                   | 1 +
 board/mini-box/picosam9g45/picosam9g45.c          | 1 +
 board/mpc8308_p1m/mpc8308_p1m.c                   | 2 ++
 board/mpc8308_p1m/sdram.c                         | 2 +-
 board/nokia/rx51/rx51.c                           | 1 +
 board/nvidia/p2371-2180/p2371-2180.c              | 1 +
 board/nvidia/p2771-0000/p2771-0000.c              | 1 +
 board/nvidia/p3450-0000/p3450-0000.c              | 1 +
 board/olimex/mx23_olinuxino/mx23_olinuxino.c      | 1 +
 board/phytec/pcl063/spl.c                         | 1 +
 board/phytec/pfla02/pfla02.c                      | 1 +
 board/phytec/phycore_am335x_r2/board.c            | 1 +
 board/ppcag/bg0900/bg0900.c                       | 1 +
 board/qemu-mips/qemu-mips.c                       | 1 +
 board/qualcomm/dragonboard410c/dragonboard410c.c  | 1 +
 board/raspberrypi/rpi/rpi.c                       | 1 +
 board/renesas/MigoR/migo_r.c                      | 1 +
 board/renesas/blanche/blanche.c                   | 1 +
 board/renesas/r2dplus/r2dplus.c                   | 1 +
 board/renesas/r7780mp/r7780mp.c                   | 1 +
 board/renesas/rcar-common/common.c                | 1 +
 board/renesas/sh7752evb/sh7752evb.c               | 1 +
 board/renesas/sh7753evb/sh7753evb.c               | 1 +
 board/renesas/sh7757lcr/sh7757lcr.c               | 1 +
 board/ronetix/pm9261/pm9261.c                     | 1 +
 board/ronetix/pm9263/pm9263.c                     | 1 +
 board/ronetix/pm9g45/pm9g45.c                     | 1 +
 board/samsung/arndale/arndale.c                   | 1 +
 board/samsung/common/board.c                      | 1 +
 board/samsung/goni/goni.c                         | 1 +
 board/samsung/smdkc100/smdkc100.c                 | 1 +
 board/samsung/smdkv310/smdkv310.c                 | 1 +
 board/sandbox/sandbox.c                           | 1 +
 board/sandisk/sansa_fuze_plus/sfp.c               | 1 +
 board/sbc8349/pci.c                               | 1 +
 board/sbc8349/sbc8349.c                           | 2 ++
 board/sbc8548/ddr.c                               | 1 +
 board/sbc8548/sbc8548.c                           | 1 +
 board/sbc8548/tlb.c                               | 2 +-
 board/sbc8641d/sbc8641d.c                         | 1 +
 board/schulercontrol/sc_sps_1/sc_sps_1.c          | 1 +
 board/seco/mx6quq7/mx6quq7.c                      | 1 +
 board/siemens/capricorn/board.c                   | 1 +
 board/siemens/corvus/board.c                      | 1 +
 board/siemens/draco/board.c                       | 1 +
 board/siemens/pxm2/board.c                        | 1 +
 board/siemens/rut/board.c                         | 1 +
 board/siemens/smartweb/smartweb.c                 | 1 +
 board/siemens/taurus/taurus.c                     | 1 +
 board/sks-kinkel/sksimx6/sksimx6.c                | 1 +
 board/socrates/socrates.c                         | 1 +
 board/socrates/tlb.c                              | 2 +-
 board/softing/vining_2000/vining_2000.c           | 1 +
 board/solidrun/clearfog/clearfog.c                | 1 +
 board/spear/spear300/spear300.c                   | 1 +
 board/spear/spear310/spear310.c                   | 1 +
 board/spear/spear320/spear320.c                   | 1 +
 board/spear/spear600/spear600.c                   | 1 +
 board/spear/x600/x600.c                           | 1 +
 board/st/stm32mp1/stm32mp1.c                      | 1 +
 board/st/stv0991/stv0991.c                        | 1 +
 board/sunxi/board.c                               | 1 +
 board/tcl/sl50/board.c                            | 1 +
 board/technexion/pico-imx6/pico-imx6.c            | 1 +
 board/technexion/pico-imx6/spl.c                  | 1 +
 board/technexion/pico-imx6ul/pico-imx6ul.c        | 1 +
 board/technexion/pico-imx6ul/spl.c                | 1 +
 board/technexion/pico-imx7d/spl.c                 | 1 +
 board/technexion/pico-imx8mq/spl.c                | 1 +
 board/technexion/tao3530/tao3530.c                | 1 +
 board/technologic/ts4600/ts4600.c                 | 1 +
 board/technologic/ts4800/ts4800.c                 | 1 +
 board/theadorable/theadorable.c                   | 1 +
 board/ti/am335x/board.c                           | 1 +
 board/ti/am3517crane/am3517crane.c                | 1 +
 board/ti/am43xx/board.c                           | 1 +
 board/ti/am57xx/board.c                           | 1 +
 board/ti/am65x/evm.c                              | 1 +
 board/ti/beagle/beagle.c                          | 1 +
 board/ti/dra7xx/evm.c                             | 1 +
 board/ti/evm/evm.c                                | 1 +
 board/ti/j721e/evm.c                              | 1 +
 board/ti/ks2_evm/board.c                          | 1 +
 board/ti/ks2_evm/board_k2g.c                      | 1 +
 board/ti/omap5_uevm/evm.c                         | 1 +
 board/ti/panda/panda.c                            | 1 +
 board/ti/sdp4430/sdp.c                            | 1 +
 board/ti/ti816x/evm.c                             | 1 +
 board/timll/devkit8000/devkit8000.c               | 1 +
 board/toradex/apalis-imx8/apalis-imx8.c           | 1 +
 board/toradex/apalis-tk1/apalis-tk1.c             | 1 +
 board/toradex/apalis_imx6/apalis_imx6.c           | 1 +
 board/toradex/apalis_t30/apalis_t30.c             | 1 +
 board/toradex/colibri-imx6ull/colibri-imx6ull.c   | 1 +
 board/toradex/colibri-imx8x/colibri-imx8x.c       | 1 +
 board/toradex/colibri_imx6/colibri_imx6.c         | 1 +
 board/toradex/colibri_imx7/colibri_imx7.c         | 1 +
 board/toradex/colibri_pxa270/colibri_pxa270.c     | 1 +
 board/toradex/colibri_t20/colibri_t20.c           | 1 +
 board/toradex/colibri_t30/colibri_t30.c           | 1 +
 board/toradex/colibri_vf/colibri_vf.c             | 1 +
 board/toradex/common/tdx-common.c                 | 1 +
 board/toradex/common/tdx-common.h                 | 1 +
 board/toradex/verdin-imx8mm/verdin-imx8mm.c       | 1 +
 board/tqc/tqm834x/pci.c                           | 1 +
 board/tqc/tqm834x/tqm834x.c                       | 2 ++
 board/tqc/tqma6/tqma6.c                           | 1 +
 board/tqc/tqma6/tqma6_bb.h                        | 1 +
 board/tqc/tqma6/tqma6_mba6.c                      | 1 +
 board/tqc/tqma6/tqma6_wru4.c                      | 1 +
 board/udoo/neo/neo.c                              | 1 +
 board/udoo/udoo.c                                 | 1 +
 board/variscite/dart_6ul/dart_6ul.c               | 1 +
 board/variscite/dart_6ul/spl.c                    | 1 +
 board/varisys/cyrus/cyrus.c                       | 1 +
 board/varisys/cyrus/cyrus.h                       | 1 +
 board/varisys/cyrus/ddr.c                         | 1 +
 board/varisys/cyrus/eth.c                         | 1 +
 board/varisys/cyrus/pci.c                         | 1 +
 board/varisys/cyrus/tlb.c                         | 2 +-
 board/ve8313/ve8313.c                             | 2 ++
 board/vscom/baltos/board.c                        | 1 +
 board/wandboard/spl.c                             | 1 +
 board/warp/warp.c                                 | 1 +
 board/warp7/warp7.c                               | 1 +
 board/xes/common/fsl_8xxx_clk.c                   | 1 +
 board/xes/common/fsl_8xxx_misc.c                  | 1 +
 board/xes/common/fsl_8xxx_pci.c                   | 1 +
 board/xes/xpedite517x/ddr.c                       | 1 +
 board/xes/xpedite517x/xpedite517x.c               | 1 +
 board/xes/xpedite520x/tlb.c                       | 2 +-
 board/xes/xpedite520x/xpedite520x.c               | 1 +
 board/xes/xpedite537x/ddr.c                       | 1 +
 board/xes/xpedite537x/tlb.c                       | 2 +-
 board/xes/xpedite537x/xpedite537x.c               | 1 +
 board/xes/xpedite550x/ddr.c                       | 1 +
 board/xes/xpedite550x/tlb.c                       | 2 +-
 board/xes/xpedite550x/xpedite550x.c               | 1 +
 cmd/bdinfo.c                                      | 1 +
 common/board_f.c                                  | 1 +
 common/board_r.c                                  | 1 +
 common/bootm_os.c                                 | 1 +
 common/image.c                                    | 1 +
 common/init/handoff.c                             | 1 +
 drivers/ata/fsl_sata.c                            | 2 +-
 drivers/clk/mpc83xx_clk.c                         | 1 +
 drivers/cpu/mpc83xx_cpu.c                         | 1 +
 drivers/ddr/altera/sdram_agilex.c                 | 1 +
 drivers/ddr/altera/sdram_s10.c                    | 1 +
 drivers/ddr/altera/sdram_soc64.c                  | 1 +
 drivers/ddr/fsl/mpc85xx_ddr_gen1.c                | 1 +
 drivers/ddr/fsl/mpc85xx_ddr_gen2.c                | 2 +-
 drivers/ddr/fsl/mpc85xx_ddr_gen3.c                | 1 +
 drivers/ddr/fsl/mpc86xx_ddr.c                     | 1 +
 drivers/ddr/fsl/options.c                         | 3 +++
 drivers/ddr/fsl/util.c                            | 1 +
 drivers/gpio/mpc83xx_gpio.c                       | 1 +
 drivers/misc/fsl_sec_mon.c                        | 3 +++
 drivers/mmc/davinci_mmc.c                         | 1 +
 drivers/mmc/fsl_esdhc.c                           | 4 ++++
 drivers/mmc/fsl_esdhc_imx.c                       | 1 +
 drivers/mmc/mmc.c                                 | 1 +
 drivers/mmc/mvebu_mmc.c                           | 1 +
 drivers/mmc/mxcmmc.c                              | 1 +
 drivers/mmc/mxsmmc.c                              | 1 +
 drivers/net/armada100_fec.c                       | 1 +
 drivers/net/at91_emac.c                           | 1 +
 drivers/net/ax88180.c                             | 1 +
 drivers/net/bcm-sf2-eth.c                         | 1 +
 drivers/net/calxedaxgmac.c                        | 1 +
 drivers/net/dc2114x.c                             | 1 +
 drivers/net/designware.c                          | 1 +
 drivers/net/dm9000x.c                             | 1 +
 drivers/net/dnet.c                                | 1 +
 drivers/net/e1000.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/fec_mxc.h                             | 1 +
 drivers/net/fm/eth.c                              | 1 +
 drivers/net/fm/init.c                             | 1 +
 drivers/net/fm/memac_phy.c                        | 1 +
 drivers/net/fm/tgec_phy.c                         | 1 +
 drivers/net/fsl-mc/mc.c                           | 1 +
 drivers/net/fsl_mcdmafec.c                        | 1 +
 drivers/net/fsl_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/lpc32xx_eth.c                         | 1 +
 drivers/net/macb.c                                | 1 +
 drivers/net/mcffec.c                              | 1 +
 drivers/net/mpc8xx_fec.c                          | 2 ++
 drivers/net/mvgbe.c                               | 1 +
 drivers/net/natsemi.c                             | 1 +
 drivers/net/ne2000_base.c                         | 1 +
 drivers/net/ns8382x.c                             | 1 +
 drivers/net/pcnet.c                               | 1 +
 drivers/net/rtl8139.c                             | 1 +
 drivers/net/rtl8169.c                             | 1 +
 drivers/net/sh_eth.c                              | 1 +
 drivers/net/smc91111.c                            | 1 +
 drivers/net/smc911x.c                             | 1 +
 drivers/net/ti/cpsw.c                             | 1 +
 drivers/net/tsec.c                                | 1 +
 drivers/net/uli526x.c                             | 1 +
 drivers/net/vsc9953.c                             | 1 +
 drivers/pci/fsl_pci_init.c                        | 1 +
 drivers/pci/pci-uclass.c                          | 1 +
 drivers/pci/pcie_fsl.c                            | 1 +
 drivers/pci/pcie_layerscape_fixup.c               | 1 +
 drivers/pci/pcie_layerscape_fixup_common.c        | 1 +
 drivers/pci/pcie_layerscape_fixup_common.h        | 1 +
 drivers/pci/pcie_layerscape_gen4_fixup.c          | 1 +
 drivers/qe/uec.c                                  | 1 +
 drivers/ram/mpc83xx_sdram.c                       | 1 +
 drivers/serial/serial_mpc8xx.c                    | 1 +
 drivers/spi/mpc8xx_spi.c                          | 1 +
 drivers/sysreset/sysreset_mpc83xx.c               | 1 +
 drivers/timer/mpc83xx_timer.c                     | 1 +
 drivers/usb/common/fsl-dt-fixup.c                 | 1 +
 drivers/usb/eth/asix.c                            | 1 +
 drivers/usb/eth/asix88179.c                       | 1 +
 drivers/usb/eth/mcs7830.c                         | 1 +
 drivers/usb/eth/r8152.c                           | 1 +
 drivers/usb/eth/smsc95xx.c                        | 1 +
 drivers/usb/gadget/ether.c                        | 1 +
 drivers/video/cfb_console.c                       | 1 +
 drivers/video/fsl_diu_fb.c                        | 1 +
 drivers/watchdog/mpc8xx_wdt.c                     | 1 +
 drivers/xen/events.c                              | 1 +
 include/asm-generic/global_data.h                 | 1 +
 include/asm-generic/u-boot.h                      | 1 +
 include/button.h                                  | 2 ++
 include/common.h                                  | 1 -
 include/dm/test.h                                 | 2 ++
 include/fdtdec.h                                  | 1 +
 include/fm_eth.h                                  | 1 +
 include/fsl-mc/fsl_mc.h                           | 1 +
 include/fsl_errata.h                              | 2 +-
 include/fsl_esdhc.h                               | 1 +
 include/fsl_esdhc_imx.h                           | 1 +
 include/fsl_ifc.h                                 | 2 ++
 include/fsl_mdio.h                                | 1 +
 include/mmc.h                                     | 1 +
 include/mpc85xx.h                                 | 2 ++
 include/mvebu_mmc.h                               | 1 +
 include/net.h                                     | 1 +
 include/net/pfe_eth/pfe_eth.h                     | 1 +
 include/netdev.h                                  | 1 +
 include/tsec.h                                    | 1 +
 include/vsc9953.h                                 | 1 +
 lib/asm-offsets.c                                 | 1 +
 lib/fdtdec.c                                      | 1 +
 lib/lmb.c                                         | 1 +
 net/eth_legacy.c                                  | 1 +
 post/drivers/memory.c                             | 1 +
 623 files changed, 664 insertions(+), 80 deletions(-)

diff --git a/arch/arm/cpu/arm1136/mx35/generic.c b/arch/arm/cpu/arm1136/mx35/generic.c
index 99e7ec0744fb..b0dccac64b6b 100644
--- a/arch/arm/cpu/arm1136/mx35/generic.c
+++ b/arch/arm/cpu/arm1136/mx35/generic.c
@@ -14,6 +14,7 @@
 #include <net.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/crm_regs.h>
diff --git a/arch/arm/cpu/arm926ejs/mx25/generic.c b/arch/arm/cpu/arm926ejs/mx25/generic.c
index 9cd60abcccbd..5b745880b9c3 100644
--- a/arch/arm/cpu/arm926ejs/mx25/generic.c
+++ b/arch/arm/cpu/arm926ejs/mx25/generic.c
@@ -20,6 +20,7 @@
 #include <asm/arch-imx/cpu.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/clock.h>
+#include <asm/u-boot.h>
 
 #ifdef CONFIG_FSL_ESDHC_IMX
 #include <fsl_esdhc_imx.h>
diff --git a/arch/arm/cpu/arm926ejs/mx27/generic.c b/arch/arm/cpu/arm926ejs/mx27/generic.c
index 8b9d3a272af1..0c804b8bad21 100644
--- a/arch/arm/cpu/arm926ejs/mx27/generic.c
+++ b/arch/arm/cpu/arm926ejs/mx27/generic.c
@@ -17,6 +17,7 @@
 #ifdef CONFIG_MMC_MXC
 #include <asm/arch/mxcmmc.h>
 #endif
+#include <asm/u-boot.h>
 
 /*
  *  get the system pll clock in Hz
diff --git a/arch/arm/cpu/arm926ejs/mxs/mxs.c b/arch/arm/cpu/arm926ejs/mxs/mxs.c
index 91ea4f02d02e..8d5a3d750536 100644
--- a/arch/arm/cpu/arm926ejs/mxs/mxs.c
+++ b/arch/arm/cpu/arm926ejs/mxs/mxs.c
@@ -16,6 +16,7 @@
 #include <init.h>
 #include <net.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/io.h>
diff --git a/arch/arm/cpu/arm926ejs/mxs/spl_boot.c b/arch/arm/cpu/arm926ejs/mxs/spl_boot.c
index 35f503f93b06..f24378305fc3 100644
--- a/arch/arm/cpu/arm926ejs/mxs/spl_boot.c
+++ b/arch/arm/cpu/arm926ejs/mxs/spl_boot.c
@@ -16,6 +16,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/gpio.h>
+#include <asm/u-boot.h>
 #include <linux/compiler.h>
 #include <linux/string.h>
 
diff --git a/arch/arm/cpu/armv7/ls102xa/cpu.c b/arch/arm/cpu/armv7/ls102xa/cpu.c
index cbc8254b42a0..61b80261f521 100644
--- a/arch/arm/cpu/armv7/ls102xa/cpu.c
+++ b/arch/arm/cpu/armv7/ls102xa/cpu.c
@@ -19,6 +19,7 @@
 #include <fsl_esdhc.h>
 #include <config.h>
 #include <fsl_wdog.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 
 #include "fsl_epu.h"
diff --git a/arch/arm/cpu/armv7/ls102xa/fdt.c b/arch/arm/cpu/armv7/ls102xa/fdt.c
index b2e80751a98c..0ab9e9092d04 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 <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <asm/io.h>
diff --git a/arch/arm/cpu/armv7/vf610/generic.c b/arch/arm/cpu/armv7/vf610/generic.c
index 3f266178c98f..83459204a8f5 100644
--- a/arch/arm/cpu/armv7/vf610/generic.c
+++ b/arch/arm/cpu/armv7/vf610/generic.c
@@ -21,6 +21,7 @@
 #ifdef CONFIG_FSL_ESDHC_IMX
 #include <fsl_esdhc_imx.h>
 #endif
+#include <asm/u-boot.h>
 #include <linux/string.h>
 
 #ifdef CONFIG_FSL_ESDHC_IMX
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
index 5839f0b9c9ec..f19b02dc4733 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
@@ -17,6 +17,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/ptrace.h>
+#include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <asm/system.h>
 #include <fm_eth.h>
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/fdt.c b/arch/arm/cpu/armv8/fsl-layerscape/fdt.c
index ab4f4a5eb1ab..0553faf90e05 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/fdt.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/fdt.c
@@ -9,6 +9,7 @@
 #include <efi_loader.h>
 #include <log.h>
 #include <asm/cache.h>
+#include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <phy.h>
diff --git a/arch/arm/cpu/armv8/s32v234/generic.c b/arch/arm/cpu/armv8/s32v234/generic.c
index 0fc98852228a..5a49a8a4a0de 100644
--- a/arch/arm/cpu/armv8/s32v234/generic.c
+++ b/arch/arm/cpu/armv8/s32v234/generic.c
@@ -18,6 +18,7 @@
 #include <netdev.h>
 #include <div64.h>
 #include <errno.h>
+#include <asm/u-boot.h>
 
 u32 get_cpu_rev(void)
 {
diff --git a/arch/arm/include/asm/arch-mx27/mxcmmc.h b/arch/arm/include/asm/arch-mx27/mxcmmc.h
index 52fb0ab57828..bf85a128bc70 100644
--- a/arch/arm/include/asm/arch-mx27/mxcmmc.h
+++ b/arch/arm/include/asm/arch-mx27/mxcmmc.h
@@ -6,6 +6,7 @@
 #ifndef ASM_ARCH_MXCMMC_H
 #define ASM_ARCH_MXCMMC_H
 
+#include <asm/u-boot.h>
 int mxc_mmc_init(struct bd_info *bis);
 
 #endif
diff --git a/arch/arm/include/asm/arch-mx31/sys_proto.h b/arch/arm/include/asm/arch-mx31/sys_proto.h
index 29fc0fda0e66..a530afcbc91a 100644
--- a/arch/arm/include/asm/arch-mx31/sys_proto.h
+++ b/arch/arm/include/asm/arch-mx31/sys_proto.h
@@ -8,6 +8,7 @@
 #define _MX31_SYS_PROTO_H_
 
 #include <asm/mach-imx/sys_proto.h>
+#include <asm/u-boot.h>
 
 struct mxc_weimcs {
 	u32 upper;
diff --git a/arch/arm/include/asm/arch-mx6/litesom.h b/arch/arm/include/asm/arch-mx6/litesom.h
index 37a16d2c309e..43adf8f422d9 100644
--- a/arch/arm/include/asm/arch-mx6/litesom.h
+++ b/arch/arm/include/asm/arch-mx6/litesom.h
@@ -6,6 +6,7 @@
 #ifndef __ARCH_ARM_MX6UL_LITESOM_H__
 #define __ARCH_ARM_MX6UL_LITESOM_H__
 
+#include <asm/u-boot.h>
 int litesom_mmc_init(struct bd_info *bis);
 
 #ifdef CONFIG_SPL_BUILD
diff --git a/arch/arm/include/asm/arch-mxs/sys_proto.h b/arch/arm/include/asm/arch-mxs/sys_proto.h
index 20ee863ac7e7..85374e2b87c6 100644
--- a/arch/arm/include/asm/arch-mxs/sys_proto.h
+++ b/arch/arm/include/asm/arch-mxs/sys_proto.h
@@ -10,6 +10,7 @@
 #define __MXS_SYS_PROTO_H__
 
 #include <asm/mach-imx/sys_proto.h>
+#include <asm/u-boot.h>
 
 int mxsmmc_initialize(struct bd_info *bis, int id, int (*wp)(int),
 		      int (*cd)(int));
diff --git a/arch/arm/include/asm/mach-imx/sys_proto.h b/arch/arm/include/asm/mach-imx/sys_proto.h
index ab94024c9b8b..ae33d6a9a495 100644
--- a/arch/arm/include/asm/mach-imx/sys_proto.h
+++ b/arch/arm/include/asm/mach-imx/sys_proto.h
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <asm/mach-imx/regs-common.h>
 #include <asm/mach-imx/module_fuse.h>
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include "../arch-imx/cpu.h"
 
diff --git a/arch/arm/include/asm/omap_common.h b/arch/arm/include/asm/omap_common.h
index de8fc99d0478..257896773788 100644
--- a/arch/arm/include/asm/omap_common.h
+++ b/arch/arm/include/asm/omap_common.h
@@ -10,6 +10,7 @@
 
 #ifndef __ASSEMBLY__
 
+#include <asm/u-boot.h>
 #include <linux/types.h>
 
 #define NUM_SYS_CLKS	7
diff --git a/arch/arm/lib/bdinfo.c b/arch/arm/lib/bdinfo.c
index 572f7fb2429f..73b9ed0815ab 100644
--- a/arch/arm/lib/bdinfo.c
+++ b/arch/arm/lib/bdinfo.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <init.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/lib/bootm-fdt.c b/arch/arm/lib/bootm-fdt.c
index e1970ea9f148..72a86f7defe5 100644
--- a/arch/arm/lib/bootm-fdt.c
+++ b/arch/arm/lib/bootm-fdt.c
@@ -22,6 +22,7 @@
 #include <asm/global_data.h>
 #include <asm/psci.h>
 #include <asm/spin_table.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c
index 101f9d9b3ae4..9dbca39b52ad 100644
--- a/arch/arm/lib/bootm.c
+++ b/arch/arm/lib/bootm.c
@@ -20,6 +20,7 @@
 #include <lmb.h>
 #include <log.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <dm/root.h>
 #include <env.h>
 #include <image.h>
diff --git a/arch/arm/lib/cache-cp15.c b/arch/arm/lib/cache-cp15.c
index 24050e5bdd30..d33136a9dbc1 100644
--- a/arch/arm/lib/cache-cp15.c
+++ b/arch/arm/lib/cache-cp15.c
@@ -10,6 +10,7 @@
 #include <asm/global_data.h>
 #include <asm/system.h>
 #include <asm/cache.h>
+#include <asm/u-boot.h>
 #include <linux/compiler.h>
 #include <asm/armv7_mpu.h>
 
diff --git a/arch/arm/mach-davinci/include/mach/sdmmc_defs.h b/arch/arm/mach-davinci/include/mach/sdmmc_defs.h
index d4195cf588dc..e1851c5ae4e4 100644
--- a/arch/arm/mach-davinci/include/mach/sdmmc_defs.h
+++ b/arch/arm/mach-davinci/include/mach/sdmmc_defs.h
@@ -9,6 +9,7 @@
 #define _SDMMC_DEFS_H_
 
 #include <asm/arch/hardware.h>
+#include <asm/u-boot.h>
 
 /* MMC Control Reg fields */
 #define MMCCTL_DATRST		(1 << 0)
diff --git a/arch/arm/mach-imx/cpu.c b/arch/arm/mach-imx/cpu.c
index f2e95ffac7bd..3bd60a5cdbab 100644
--- a/arch/arm/mach-imx/cpu.c
+++ b/arch/arm/mach-imx/cpu.c
@@ -13,6 +13,7 @@
 #include <log.h>
 #include <net.h>
 #include <netdev.h>
+#include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
diff --git a/arch/arm/mach-imx/imx8/ahab.c b/arch/arm/mach-imx/imx8/ahab.c
index 9eb38cac029d..0df61fca4769 100644
--- a/arch/arm/mach-imx/imx8/ahab.c
+++ b/arch/arm/mach-imx/imx8/ahab.c
@@ -15,6 +15,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/image.h>
 #include <console.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-imx/imx8/fdt.c b/arch/arm/mach-imx/imx8/fdt.c
index 94da4d0951d2..6c473ddcc9c9 100644
--- a/arch/arm/mach-imx/imx8/fdt.c
+++ b/arch/arm/mach-imx/imx8/fdt.c
@@ -8,6 +8,7 @@
 #include <asm/arch/sci/sci.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <dm/ofnode.h>
 #include <fdt_support.h>
 #include <linux/libfdt.h>
diff --git a/arch/arm/mach-imx/imx8m/soc.c b/arch/arm/mach-imx/imx8m/soc.c
index 8c82709024c2..a6e386fda798 100644
--- a/arch/arm/mach-imx/imx8m/soc.c
+++ b/arch/arm/mach-imx/imx8m/soc.c
@@ -19,6 +19,7 @@
 #include <asm/mach-imx/syscounter.h>
 #include <asm/ptrace.h>
 #include <asm/armv8/mmu.h>
+#include <asm/u-boot.h>
 #include <dm/uclass.h>
 #include <efi_loader.h>
 #include <env.h>
diff --git a/arch/arm/mach-imx/mx6/litesom.c b/arch/arm/mach-imx/mx6/litesom.c
index 699a3dc317f0..17108a839814 100644
--- a/arch/arm/mach-imx/mx6/litesom.c
+++ b/arch/arm/mach-imx/mx6/litesom.c
@@ -19,6 +19,7 @@
 #include <asm/io.h>
 #include <common.h>
 #include <fsl_esdhc_imx.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/sizes.h>
 #include <mmc.h>
diff --git a/arch/arm/mach-imx/mx6/module_fuse.c b/arch/arm/mach-imx/mx6/module_fuse.c
index 0305b2a7e02c..ced49dcad33d 100644
--- a/arch/arm/mach-imx/mx6/module_fuse.c
+++ b/arch/arm/mach-imx/mx6/module_fuse.c
@@ -9,6 +9,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/mach-imx/module_fuse.h>
+#include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 
diff --git a/arch/arm/mach-kirkwood/cpu.c b/arch/arm/mach-kirkwood/cpu.c
index 551c22a8ea1e..beee83b22498 100644
--- a/arch/arm/mach-kirkwood/cpu.c
+++ b/arch/arm/mach-kirkwood/cpu.c
@@ -18,6 +18,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
 #include <mvebu_mmc.h>
+#include <asm/u-boot.h>
 
 void reset_cpu(unsigned long ignored)
 {
diff --git a/arch/arm/mach-lpc32xx/cpu.c b/arch/arm/mach-lpc32xx/cpu.c
index 32af6206056b..df5006207612 100644
--- a/arch/arm/mach-lpc32xx/cpu.c
+++ b/arch/arm/mach-lpc32xx/cpu.c
@@ -13,6 +13,7 @@
 #include <asm/arch/wdt.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 
 static struct clk_pm_regs *clk = (struct clk_pm_regs *)CLK_PM_BASE;
 static struct wdt_regs  *wdt = (struct wdt_regs *)WDT_BASE;
diff --git a/arch/arm/mach-meson/board-common.c b/arch/arm/mach-meson/board-common.c
index 2e1dcf0e0109..67d85d4e1ce2 100644
--- a/arch/arm/mach-meson/board-common.c
+++ b/arch/arm/mach-meson/board-common.c
@@ -12,6 +12,7 @@
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <asm/ptrace.h>
+#include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <linux/err.h>
 #include <asm/arch/mem.h>
diff --git a/arch/arm/mach-mvebu/cpu.c b/arch/arm/mach-mvebu/cpu.c
index 7dce11e77f36..19886c5f1399 100644
--- a/arch/arm/mach-mvebu/cpu.c
+++ b/arch/arm/mach-mvebu/cpu.c
@@ -7,6 +7,7 @@
 #include <ahci.h>
 #include <cpu_func.h>
 #include <init.h>
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/mbus.h>
diff --git a/arch/arm/mach-omap2/am33xx/board.c b/arch/arm/mach-omap2/am33xx/board.c
index cff8c205734f..0b0372e22cad 100644
--- a/arch/arm/mach-omap2/am33xx/board.c
+++ b/arch/arm/mach-omap2/am33xx/board.c
@@ -33,6 +33,7 @@
 #include <i2c.h>
 #include <miiphy.h>
 #include <cpsw.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/compiler.h>
diff --git a/arch/arm/mach-omap2/am33xx/fdt.c b/arch/arm/mach-omap2/am33xx/fdt.c
index 2ec30b1f9c38..2b4fd731db09 100644
--- a/arch/arm/mach-omap2/am33xx/fdt.c
+++ b/arch/arm/mach-omap2/am33xx/fdt.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <hang.h>
+#include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <malloc.h>
diff --git a/arch/arm/mach-omap2/fdt-common.c b/arch/arm/mach-omap2/fdt-common.c
index 5eb044731230..b122db8bf7a9 100644
--- a/arch/arm/mach-omap2/fdt-common.c
+++ b/arch/arm/mach-omap2/fdt-common.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 
diff --git a/arch/arm/mach-omap2/omap-cache.c b/arch/arm/mach-omap2/omap-cache.c
index 1b246f844a84..5034404801aa 100644
--- a/arch/arm/mach-omap2/omap-cache.c
+++ b/arch/arm/mach-omap2/omap-cache.c
@@ -16,6 +16,7 @@
 #include <log.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-omap2/omap3/emac.c b/arch/arm/mach-omap2/omap3/emac.c
index d0d0b7a75a61..4c102dadf42d 100644
--- a/arch/arm/mach-omap2/omap3/emac.c
+++ b/arch/arm/mach-omap2/omap3/emac.c
@@ -10,6 +10,7 @@
 #include <net.h>
 #include <asm/io.h>
 #include <asm/arch/am35x_def.h>
+#include <asm/u-boot.h>
 
 /*
  * Initializes on-chip ethernet controllers.
diff --git a/arch/arm/mach-omap2/omap5/fdt.c b/arch/arm/mach-omap2/omap5/fdt.c
index c4162420f3a7..bf4f015cf520 100644
--- a/arch/arm/mach-omap2/omap5/fdt.c
+++ b/arch/arm/mach-omap2/omap5/fdt.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <hang.h>
 #include <log.h>
+#include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <malloc.h>
diff --git a/arch/arm/mach-orion5x/cpu.c b/arch/arm/mach-orion5x/cpu.c
index beae7b84843b..aef399860060 100644
--- a/arch/arm/mach-orion5x/cpu.c
+++ b/arch/arm/mach-orion5x/cpu.c
@@ -15,6 +15,7 @@
 #include <netdev.h>
 #include <asm/cache.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 #include <u-boot/md5.h>
 #include <asm/arch/cpu.h>
 
diff --git a/arch/arm/mach-rmobile/emac.c b/arch/arm/mach-rmobile/emac.c
index cb9bce0cf23b..2066ab7796eb 100644
--- a/arch/arm/mach-rmobile/emac.c
+++ b/arch/arm/mach-rmobile/emac.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <net.h>
+#include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <netdev.h>
 
diff --git a/arch/arm/mach-rockchip/rk3288/rk3288.c b/arch/arm/mach-rockchip/rk3288/rk3288.c
index bc20bc5ab909..d54eedb6a588 100644
--- a/arch/arm/mach-rockchip/rk3288/rk3288.c
+++ b/arch/arm/mach-rockchip/rk3288/rk3288.c
@@ -21,6 +21,7 @@
 #include <asm/arch-rockchip/pmu_rk3288.h>
 #include <asm/arch-rockchip/qos_rk3288.h>
 #include <asm/arch-rockchip/sdram.h>
+#include <asm/u-boot.h>
 #include <linux/err.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-stm32mp/fdt.c b/arch/arm/mach-stm32mp/fdt.c
index 5a7d761586ce..ded804403e31 100644
--- a/arch/arm/mach-stm32mp/fdt.c
+++ b/arch/arm/mach-stm32mp/fdt.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <tee.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/u-boot.h>
 #include <dt-bindings/pinctrl/stm32-pinfunc.h>
 #include <linux/io.h>
 #include <linux/string.h>
diff --git a/arch/arm/mach-tegra/dt-setup.c b/arch/arm/mach-tegra/dt-setup.c
index 602b20e6b7e9..237f184b7514 100644
--- a/arch/arm/mach-tegra/dt-setup.c
+++ b/arch/arm/mach-tegra/dt-setup.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <asm/arch-tegra/gpu.h>
+#include <asm/u-boot.h>
 
 /*
  * This function is called right before the kernel is booted. "blob" is the
diff --git a/arch/arm/mach-uniphier/fdt-fixup.c b/arch/arm/mach-uniphier/fdt-fixup.c
index dfa32fdd48b3..f65a8b62e66e 100644
--- a/arch/arm/mach-uniphier/fdt-fixup.c
+++ b/arch/arm/mach-uniphier/fdt-fixup.c
@@ -6,6 +6,7 @@
 
 #include <fdt_support.h>
 #include <fdtdec.h>
+#include <asm/u-boot.h>
 #include <jffs2/load_kernel.h>
 #include <mtd_node.h>
 #include <linux/errno.h>
diff --git a/arch/m68k/cpu/mcf523x/cpu.c b/arch/m68k/cpu/mcf523x/cpu.c
index 8d3ab6f3fb25..c091d39ef675 100644
--- a/arch/m68k/cpu/mcf523x/cpu.c
+++ b/arch/m68k/cpu/mcf523x/cpu.c
@@ -16,6 +16,7 @@
 #include <command.h>
 #include <netdev.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 
 #include <asm/immap.h>
 #include <asm/io.h>
diff --git a/arch/m68k/cpu/mcf52x2/cpu.c b/arch/m68k/cpu/mcf52x2/cpu.c
index 0676e3914105..9a6a77e13c04 100644
--- a/arch/m68k/cpu/mcf52x2/cpu.c
+++ b/arch/m68k/cpu/mcf52x2/cpu.c
@@ -23,6 +23,7 @@
 #include <asm/immap.h>
 #include <asm/io.h>
 #include <netdev.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include "cpu.h"
 
diff --git a/arch/m68k/cpu/mcf532x/cpu.c b/arch/m68k/cpu/mcf532x/cpu.c
index d37dd3defb73..cc56cdebb250 100644
--- a/arch/m68k/cpu/mcf532x/cpu.c
+++ b/arch/m68k/cpu/mcf532x/cpu.c
@@ -16,6 +16,7 @@
 #include <command.h>
 #include <netdev.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 
 #include <asm/immap.h>
diff --git a/arch/m68k/cpu/mcf5445x/cpu.c b/arch/m68k/cpu/mcf5445x/cpu.c
index ac1e59168161..1bdf983ac2eb 100644
--- a/arch/m68k/cpu/mcf5445x/cpu.c
+++ b/arch/m68k/cpu/mcf5445x/cpu.c
@@ -16,6 +16,7 @@
 #include <command.h>
 #include <netdev.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 
 #include <asm/immap.h>
diff --git a/arch/m68k/cpu/mcf547x_8x/cpu.c b/arch/m68k/cpu/mcf547x_8x/cpu.c
index c1361e705799..4df8459f6987 100644
--- a/arch/m68k/cpu/mcf547x_8x/cpu.c
+++ b/arch/m68k/cpu/mcf547x_8x/cpu.c
@@ -16,6 +16,7 @@
 #include <command.h>
 #include <netdev.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 
 #include <asm/immap.h>
 #include <asm/io.h>
diff --git a/arch/m68k/lib/bdinfo.c b/arch/m68k/lib/bdinfo.c
index 9ec56fd3418f..7b410e7743cd 100644
--- a/arch/m68k/lib/bdinfo.c
+++ b/arch/m68k/lib/bdinfo.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <init.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/m68k/lib/bootm.c b/arch/m68k/lib/bootm.c
index 51a6f938586d..6dbb86ee396f 100644
--- a/arch/m68k/lib/bootm.c
+++ b/arch/m68k/lib/bootm.c
@@ -12,6 +12,7 @@
 #include <lmb.h>
 #include <log.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <u-boot/zlib.h>
 #include <bzlib.h>
 #include <watchdog.h>
diff --git a/arch/nds32/lib/bootm.c b/arch/nds32/lib/bootm.c
index 4668ed9af8b1..957599304549 100644
--- a/arch/nds32/lib/bootm.c
+++ b/arch/nds32/lib/bootm.c
@@ -13,6 +13,7 @@
 #include <image.h>
 #include <log.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 #include <u-boot/zlib.h>
 #include <asm/byteorder.h>
diff --git a/arch/powerpc/cpu/mpc83xx/cpu.c b/arch/powerpc/cpu/mpc83xx/cpu.c
index 8d531898bd89..3043a38f8b29 100644
--- a/arch/powerpc/cpu/mpc83xx/cpu.c
+++ b/arch/powerpc/cpu/mpc83xx/cpu.c
@@ -19,7 +19,8 @@
 #include <command.h>
 #include <mpc83xx.h>
 #include <asm/global_data.h>
-#include <asm/processor.h>
+#include <asm/ppc.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 #include <tsec.h>
diff --git a/arch/powerpc/cpu/mpc83xx/cpu_init.c b/arch/powerpc/cpu/mpc83xx/cpu_init.c
index 8793639e20e8..af51fbd69063 100644
--- a/arch/powerpc/cpu/mpc83xx/cpu_init.c
+++ b/arch/powerpc/cpu/mpc83xx/cpu_init.c
@@ -9,7 +9,7 @@
 #include <ioports.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
-#include <asm/processor.h>
+#include <asm/ppc.h>
 #ifdef CONFIG_USB_EHCI_FSL
 #include <usb/ehci-ci.h>
 #endif
diff --git a/arch/powerpc/cpu/mpc83xx/ecc.c b/arch/powerpc/cpu/mpc83xx/ecc.c
index 903983ded3ef..9ebfe1ab1fd6 100644
--- a/arch/powerpc/cpu/mpc83xx/ecc.c
+++ b/arch/powerpc/cpu/mpc83xx/ecc.c
@@ -10,6 +10,7 @@
 #include <irq_func.h>
 #include <mpc83xx.h>
 #include <command.h>
+#include <asm/ppc.h>
 #include <linux/string.h>
 
 #if defined(CONFIG_DDR_ECC) && defined(CONFIG_DDR_ECC_CMD)
diff --git a/arch/powerpc/cpu/mpc83xx/fdt.c b/arch/powerpc/cpu/mpc83xx/fdt.c
index 707838ac9abb..a2705b2b0e35 100644
--- a/arch/powerpc/cpu/mpc83xx/fdt.c
+++ b/arch/powerpc/cpu/mpc83xx/fdt.c
@@ -9,9 +9,10 @@
 #include <common.h>
 #include <clock_legacy.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
-#include <asm/processor.h>
+#include <asm/ppc.h>
 
 extern void ft_qe_setup(void *blob);
 
diff --git a/arch/powerpc/cpu/mpc83xx/interrupts.c b/arch/powerpc/cpu/mpc83xx/interrupts.c
index f9486678af33..878d88321a1d 100644
--- a/arch/powerpc/cpu/mpc83xx/interrupts.c
+++ b/arch/powerpc/cpu/mpc83xx/interrupts.c
@@ -11,8 +11,9 @@
 #include <irq_func.h>
 #include <mpc83xx.h>
 #include <asm/global_data.h>
-#include <asm/processor.h>
+#include <asm/ppc.h>
 #include <asm/ptrace.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/powerpc/cpu/mpc83xx/law.c b/arch/powerpc/cpu/mpc83xx/law.c
index 5e02f4094bb1..891a0d7727ef 100644
--- a/arch/powerpc/cpu/mpc83xx/law.c
+++ b/arch/powerpc/cpu/mpc83xx/law.c
@@ -7,6 +7,7 @@
 #include <log.h>
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
+#include <asm/ppc.h>
 #include <linux/log2.h>
 
 int set_ddr_laws(u64 start, u64 sz, enum law_trgt_if id)
diff --git a/arch/powerpc/cpu/mpc83xx/pci.c b/arch/powerpc/cpu/mpc83xx/pci.c
index 5c289d002260..0c618f0ad4de 100644
--- a/arch/powerpc/cpu/mpc83xx/pci.c
+++ b/arch/powerpc/cpu/mpc83xx/pci.c
@@ -11,6 +11,8 @@
 #include <pci.h>
 #include <asm/bitops.h>
 #include <asm/global_data.h>
+#include <asm/ppc.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 
 #if defined(CONFIG_OF_LIBFDT)
diff --git a/arch/powerpc/cpu/mpc83xx/pcie.c b/arch/powerpc/cpu/mpc83xx/pcie.c
index 84797c871c95..aa8cded66167 100644
--- a/arch/powerpc/cpu/mpc83xx/pcie.c
+++ b/arch/powerpc/cpu/mpc83xx/pcie.c
@@ -12,6 +12,7 @@
 #include <mpc83xx.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <asm/ppc.h>
 #include <linux/delay.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/powerpc/cpu/mpc83xx/spd_sdram.c b/arch/powerpc/cpu/mpc83xx/spd_sdram.c
index a861e8dd2ddc..d101c2fcce42 100644
--- a/arch/powerpc/cpu/mpc83xx/spd_sdram.c
+++ b/arch/powerpc/cpu/mpc83xx/spd_sdram.c
@@ -17,7 +17,7 @@
 #include <log.h>
 #include <time.h>
 #include <vsprintf.h>
-#include <asm/processor.h>
+#include <asm/ppc.h>
 #include <asm/io.h>
 #include <i2c.h>
 #include <spd.h>
diff --git a/arch/powerpc/cpu/mpc83xx/speed.c b/arch/powerpc/cpu/mpc83xx/speed.c
index 58e197f12082..17577e96307b 100644
--- a/arch/powerpc/cpu/mpc83xx/speed.c
+++ b/arch/powerpc/cpu/mpc83xx/speed.c
@@ -14,7 +14,7 @@
 #include <command.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
-#include <asm/processor.h>
+#include <asm/ppc.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/powerpc/cpu/mpc83xx/spl_minimal.c b/arch/powerpc/cpu/mpc83xx/spl_minimal.c
index 00cb2bd044ef..d51d1f6700f0 100644
--- a/arch/powerpc/cpu/mpc83xx/spl_minimal.c
+++ b/arch/powerpc/cpu/mpc83xx/spl_minimal.c
@@ -9,6 +9,7 @@
 #include <mpc83xx.h>
 #include <time.h>
 #include <asm/global_data.h>
+#include <asm/ppc.h>
 
 #include "lblaw/lblaw.h"
 #include "elbc/elbc.h"
diff --git a/arch/powerpc/cpu/mpc83xx/traps.c b/arch/powerpc/cpu/mpc83xx/traps.c
index 74781126e947..f1d47cbd3ba9 100644
--- a/arch/powerpc/cpu/mpc83xx/traps.c
+++ b/arch/powerpc/cpu/mpc83xx/traps.c
@@ -16,7 +16,7 @@
 #include <asm/ptrace.h>
 #include <command.h>
 #include <kgdb.h>
-#include <asm/processor.h>
+#include <asm/ppc.h>
 #include <asm/mpc8349_pci.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/powerpc/cpu/mpc85xx/b4860_serdes.c b/arch/powerpc/cpu/mpc85xx/b4860_serdes.c
index 8e18e12f6341..dae5bb83b922 100644
--- a/arch/powerpc/cpu/mpc85xx/b4860_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/b4860_serdes.c
@@ -5,7 +5,7 @@
 
 #include <common.h>
 #include <asm/fsl_serdes.h>
-#include <asm/processor.h>
+#include <asm/ppc.h>
 #include <asm/io.h>
 #include "fsl_corenet2_serdes.h"
 
diff --git a/arch/powerpc/cpu/mpc85xx/cmd_errata.c b/arch/powerpc/cpu/mpc85xx/cmd_errata.c
index ff73596ba903..8a98717125b3 100644
--- a/arch/powerpc/cpu/mpc85xx/cmd_errata.c
+++ b/arch/powerpc/cpu/mpc85xx/cmd_errata.c
@@ -8,7 +8,8 @@
 #include <init.h>
 #include <linux/compiler.h>
 #include <fsl_errata.h>
-#include <asm/processor.h>
+#include <asm/immap_85xx.h>
+#include <asm/ppc.h>
 #include <fsl_usb.h>
 #include "fsl_corenet_serdes.h"
 
diff --git a/arch/powerpc/cpu/mpc85xx/cpu.c b/arch/powerpc/cpu/mpc85xx/cpu.c
index d35c97801722..ea3554af7817 100644
--- a/arch/powerpc/cpu/mpc85xx/cpu.c
+++ b/arch/powerpc/cpu/mpc85xx/cpu.c
@@ -31,6 +31,7 @@
 #include <asm/processor.h>
 #include <fsl_ddr_sdram.h>
 #include <asm/ppc.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/powerpc/cpu/mpc85xx/ether_fcc.c b/arch/powerpc/cpu/mpc85xx/ether_fcc.c
index c6f89e0eba91..d458d0e135e9 100644
--- a/arch/powerpc/cpu/mpc85xx/ether_fcc.c
+++ b/arch/powerpc/cpu/mpc85xx/ether_fcc.c
@@ -30,6 +30,7 @@
 #include <command.h>
 #include <config.h>
 #include <net.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 
 #if defined(CONFIG_MII) || defined(CONFIG_CMD_MII)
diff --git a/arch/powerpc/cpu/mpc85xx/fdt.c b/arch/powerpc/cpu/mpc85xx/fdt.c
index 4eecbe667ec8..41bbddf81d41 100644
--- a/arch/powerpc/cpu/mpc85xx/fdt.c
+++ b/arch/powerpc/cpu/mpc85xx/fdt.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <time.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <asm/processor.h>
diff --git a/arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c b/arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c
index 29a64b309b29..2cfcc92f15b9 100644
--- a/arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c
@@ -6,9 +6,8 @@
 #include <common.h>
 #include <log.h>
 #include <asm/fsl_serdes.h>
-#include <asm/immap_85xx.h>
 #include <asm/io.h>
-#include <asm/processor.h>
+#include <asm/ppc.h>
 #include <asm/fsl_law.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c b/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c
index f5126e2c8acf..a370faf0fe01 100644
--- a/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c
@@ -11,9 +11,8 @@
 #include <hwconfig.h>
 #endif
 #include <asm/fsl_serdes.h>
-#include <asm/immap_85xx.h>
 #include <asm/io.h>
-#include <asm/processor.h>
+#include <asm/ppc.h>
 #include <asm/fsl_law.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/arch/powerpc/cpu/mpc85xx/interrupts.c b/arch/powerpc/cpu/mpc85xx/interrupts.c
index 4ad762683fb9..5a491399d998 100644
--- a/arch/powerpc/cpu/mpc85xx/interrupts.c
+++ b/arch/powerpc/cpu/mpc85xx/interrupts.c
@@ -22,6 +22,7 @@
 #include <post.h>
 #endif
 #include <asm/ptrace.h>
+#include <asm/ppc.h>
 
 void interrupt_init_cpu(unsigned *decrementer_count)
 {
diff --git a/arch/powerpc/cpu/mpc85xx/p2041_serdes.c b/arch/powerpc/cpu/mpc85xx/p2041_serdes.c
index 3eca3a69326f..4461b3848442 100644
--- a/arch/powerpc/cpu/mpc85xx/p2041_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/p2041_serdes.c
@@ -3,9 +3,8 @@
  * Copyright 2010-2011 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
 #include <asm/fsl_serdes.h>
-#include <asm/processor.h>
+#include <asm/ppc.h>
 #include <asm/io.h>
 #include "fsl_corenet_serdes.h"
 
diff --git a/arch/powerpc/cpu/mpc85xx/p3041_serdes.c b/arch/powerpc/cpu/mpc85xx/p3041_serdes.c
index ec8234c1c1e5..5fa3eb405698 100644
--- a/arch/powerpc/cpu/mpc85xx/p3041_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/p3041_serdes.c
@@ -3,9 +3,8 @@
  * Copyright 2009-2011 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
 #include <asm/fsl_serdes.h>
-#include <asm/processor.h>
+#include <asm/ppc.h>
 #include <asm/io.h>
 #include "fsl_corenet_serdes.h"
 
diff --git a/arch/powerpc/cpu/mpc85xx/p4080_serdes.c b/arch/powerpc/cpu/mpc85xx/p4080_serdes.c
index 463fa119c9b8..7d3cb6cdefb8 100644
--- a/arch/powerpc/cpu/mpc85xx/p4080_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/p4080_serdes.c
@@ -3,10 +3,9 @@
  * Copyright 2009-2010 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
 #include <asm/io.h>
 #include <asm/fsl_serdes.h>
-#include <asm/processor.h>
+#include <asm/ppc.h>
 #include <asm/io.h>
 #include "fsl_corenet_serdes.h"
 
diff --git a/arch/powerpc/cpu/mpc85xx/p5020_serdes.c b/arch/powerpc/cpu/mpc85xx/p5020_serdes.c
index ec8234c1c1e5..5fa3eb405698 100644
--- a/arch/powerpc/cpu/mpc85xx/p5020_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/p5020_serdes.c
@@ -3,9 +3,8 @@
  * Copyright 2009-2011 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
 #include <asm/fsl_serdes.h>
-#include <asm/processor.h>
+#include <asm/ppc.h>
 #include <asm/io.h>
 #include "fsl_corenet_serdes.h"
 
diff --git a/arch/powerpc/cpu/mpc85xx/p5040_serdes.c b/arch/powerpc/cpu/mpc85xx/p5040_serdes.c
index 2327b2c2a414..61d97f5e0453 100644
--- a/arch/powerpc/cpu/mpc85xx/p5040_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/p5040_serdes.c
@@ -3,9 +3,8 @@
  * Copyright 2009-2011 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
 #include <asm/fsl_serdes.h>
-#include <asm/processor.h>
+#include <asm/ppc.h>
 #include <asm/io.h>
 #include "fsl_corenet_serdes.h"
 
diff --git a/arch/powerpc/cpu/mpc85xx/t1024_serdes.c b/arch/powerpc/cpu/mpc85xx/t1024_serdes.c
index 16458e73be13..3dfcf67ceba6 100644
--- a/arch/powerpc/cpu/mpc85xx/t1024_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/t1024_serdes.c
@@ -3,12 +3,10 @@
  * Copyright 2014 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
 #include <asm/fsl_serdes.h>
-#include <asm/processor.h>
+#include <asm/ppc.h>
 #include <asm/io.h>
 
-
 static u8 serdes_cfg_tbl[][SRDS_MAX_LANES] = {
 	[0x40] = {PCIE1, PCIE1, PCIE1, PCIE1},
 	[0xD5] = {QSGMII_FM1_A, PCIE3, PCIE2, PCIE1},
diff --git a/arch/powerpc/cpu/mpc85xx/t1040_serdes.c b/arch/powerpc/cpu/mpc85xx/t1040_serdes.c
index 3a7fdef79c2e..a50397b4b3ac 100644
--- a/arch/powerpc/cpu/mpc85xx/t1040_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/t1040_serdes.c
@@ -3,9 +3,8 @@
  * Copyright 2012 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
 #include <asm/fsl_serdes.h>
-#include <asm/processor.h>
+#include <asm/ppc.h>
 #include <asm/io.h>
 
 
diff --git a/arch/powerpc/cpu/mpc85xx/t2080_serdes.c b/arch/powerpc/cpu/mpc85xx/t2080_serdes.c
index 32cfcc0242bb..ecf4f6e1a877 100644
--- a/arch/powerpc/cpu/mpc85xx/t2080_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/t2080_serdes.c
@@ -5,9 +5,8 @@
  * Shengzhou Liu <Shengzhou.Liu@freescale.com>
  */
 
-#include <common.h>
 #include <asm/fsl_serdes.h>
-#include <asm/processor.h>
+#include <asm/ppc.h>
 #include "fsl_corenet2_serdes.h"
 
 struct serdes_config {
diff --git a/arch/powerpc/cpu/mpc85xx/t4240_serdes.c b/arch/powerpc/cpu/mpc85xx/t4240_serdes.c
index a8c0c47f4af1..59f3e2285441 100644
--- a/arch/powerpc/cpu/mpc85xx/t4240_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/t4240_serdes.c
@@ -3,9 +3,8 @@
  * Copyright 2012 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
 #include <asm/fsl_serdes.h>
-#include <asm/processor.h>
+#include <asm/ppc.h>
 #include <asm/io.h>
 #include "fsl_corenet2_serdes.h"
 
diff --git a/arch/powerpc/cpu/mpc86xx/fdt.c b/arch/powerpc/cpu/mpc86xx/fdt.c
index 24e53115eccf..a5c313b8a25d 100644
--- a/arch/powerpc/cpu/mpc86xx/fdt.c
+++ b/arch/powerpc/cpu/mpc86xx/fdt.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <asm/mp.h>
diff --git a/arch/powerpc/cpu/mpc86xx/interrupts.c b/arch/powerpc/cpu/mpc86xx/interrupts.c
index 5a916600ed62..b139abe936d5 100644
--- a/arch/powerpc/cpu/mpc86xx/interrupts.c
+++ b/arch/powerpc/cpu/mpc86xx/interrupts.c
@@ -20,7 +20,7 @@
 #include <mpc86xx.h>
 #include <command.h>
 #include <time.h>
-#include <asm/processor.h>
+#include <asm/ppc.h>
 #ifdef CONFIG_POST
 #include <post.h>
 #endif
diff --git a/arch/powerpc/cpu/mpc86xx/mp.c b/arch/powerpc/cpu/mpc86xx/mp.c
index 2d23742a2bd9..e404ef367c16 100644
--- a/arch/powerpc/cpu/mpc86xx/mp.c
+++ b/arch/powerpc/cpu/mpc86xx/mp.c
@@ -6,7 +6,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <asm/global_data.h>
-#include <asm/processor.h>
+#include <asm/ppc.h>
 #include <asm/mmu.h>
 #include <ioports.h>
 #include <lmb.h>
diff --git a/arch/powerpc/cpu/mpc86xx/speed.c b/arch/powerpc/cpu/mpc86xx/speed.c
index 86c1709c4ca2..87e6e5957826 100644
--- a/arch/powerpc/cpu/mpc86xx/speed.c
+++ b/arch/powerpc/cpu/mpc86xx/speed.c
@@ -12,7 +12,7 @@
 #include <clock_legacy.h>
 #include <mpc86xx.h>
 #include <asm/global_data.h>
-#include <asm/processor.h>
+#include <asm/ppc.h>
 #include <asm/io.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/powerpc/cpu/mpc8xx/cpu.c b/arch/powerpc/cpu/mpc8xx/cpu.c
index f79a06d19a2b..e77789a7f2fe 100644
--- a/arch/powerpc/cpu/mpc8xx/cpu.c
+++ b/arch/powerpc/cpu/mpc8xx/cpu.c
@@ -29,6 +29,8 @@
 #include <asm/cache.h>
 #include <asm/cpm_8xx.h>
 #include <asm/global_data.h>
+#include <asm/ppc.h>
+#include <asm/u-boot.h>
 #include <linux/compiler.h>
 #include <asm/io.h>
 
diff --git a/arch/powerpc/cpu/mpc8xx/cpu_init.c b/arch/powerpc/cpu/mpc8xx/cpu_init.c
index c8d06b0508d7..f5a3b02558f8 100644
--- a/arch/powerpc/cpu/mpc8xx/cpu_init.c
+++ b/arch/powerpc/cpu/mpc8xx/cpu_init.c
@@ -11,6 +11,7 @@
 #include <mpc8xx.h>
 #include <asm/cpm_8xx.h>
 #include <asm/io.h>
+#include <asm/ppc.h>
 
 /*
  * Breath some life into the CPU...
diff --git a/arch/powerpc/cpu/mpc8xx/fdt.c b/arch/powerpc/cpu/mpc8xx/fdt.c
index 75aef758f06f..7c01af4ccde1 100644
--- a/arch/powerpc/cpu/mpc8xx/fdt.c
+++ b/arch/powerpc/cpu/mpc8xx/fdt.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <time.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 
diff --git a/arch/powerpc/cpu/mpc8xx/interrupts.c b/arch/powerpc/cpu/mpc8xx/interrupts.c
index eef1951f2fd9..a0d1853e7471 100644
--- a/arch/powerpc/cpu/mpc8xx/interrupts.c
+++ b/arch/powerpc/cpu/mpc8xx/interrupts.c
@@ -10,7 +10,7 @@
 #include <mpc8xx_irq.h>
 #include <time.h>
 #include <asm/cpm_8xx.h>
-#include <asm/processor.h>
+#include <asm/ppc.h>
 #include <asm/io.h>
 #include <asm/ptrace.h>
 
diff --git a/arch/powerpc/cpu/mpc8xx/speed.c b/arch/powerpc/cpu/mpc8xx/speed.c
index ad3d3f9101cc..49699c3e4a7b 100644
--- a/arch/powerpc/cpu/mpc8xx/speed.c
+++ b/arch/powerpc/cpu/mpc8xx/speed.c
@@ -8,7 +8,7 @@
 #include <clock_legacy.h>
 #include <mpc8xx.h>
 #include <asm/global_data.h>
-#include <asm/processor.h>
+#include <asm/ppc.h>
 #include <asm/io.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/powerpc/cpu/mpc8xxx/cpu.c b/arch/powerpc/cpu/mpc8xxx/cpu.c
index 560488be22e7..4c9da0293045 100644
--- a/arch/powerpc/cpu/mpc8xxx/cpu.c
+++ b/arch/powerpc/cpu/mpc8xxx/cpu.c
@@ -20,6 +20,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <vsc9953.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/powerpc/cpu/mpc8xxx/fsl_pamu.c b/arch/powerpc/cpu/mpc8xxx/fsl_pamu.c
index bc5958511d71..c2c2d22572c6 100644
--- a/arch/powerpc/cpu/mpc8xxx/fsl_pamu.c
+++ b/arch/powerpc/cpu/mpc8xxx/fsl_pamu.c
@@ -10,6 +10,7 @@
 #include <linux/bitops.h>
 #include <linux/log2.h>
 #include <malloc.h>
+#include <asm/ppc.h>
 #include <asm/fsl_pamu.h>
 #include <linux/string.h>
 
diff --git a/arch/powerpc/cpu/mpc8xxx/srio.c b/arch/powerpc/cpu/mpc8xxx/srio.c
index c73cf9319c87..3db592d040ce 100644
--- a/arch/powerpc/cpu/mpc8xxx/srio.c
+++ b/arch/powerpc/cpu/mpc8xxx/srio.c
@@ -10,6 +10,7 @@
 #include <asm/fsl_law.h>
 #include <asm/fsl_serdes.h>
 #include <asm/fsl_srio.h>
+#include <asm/ppc.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 
diff --git a/arch/powerpc/include/asm/fsl_liodn.h b/arch/powerpc/include/asm/fsl_liodn.h
index 7ced50c1d422..875b15172990 100644
--- a/arch/powerpc/include/asm/fsl_liodn.h
+++ b/arch/powerpc/include/asm/fsl_liodn.h
@@ -7,6 +7,7 @@
 #define _FSL_LIODN_H_
 
 #include <asm/types.h>
+#include <asm/ppc.h>
 #include <fsl_qbman.h>
 
 struct srio_liodn_id_table {
diff --git a/arch/powerpc/include/asm/immap_83xx.h b/arch/powerpc/include/asm/immap_83xx.h
index 609869c7154b..225d4a8d33b4 100644
--- a/arch/powerpc/include/asm/immap_83xx.h
+++ b/arch/powerpc/include/asm/immap_83xx.h
@@ -19,6 +19,7 @@
 #include <asm/mpc8xxx_spi.h>
 #include <asm/fsl_lbc.h>
 #include <asm/fsl_dma.h>
+#include <asm/ppc.h>
 
 /*
  * Local Access Window
diff --git a/arch/powerpc/include/asm/immap_85xx.h b/arch/powerpc/include/asm/immap_85xx.h
index bfa601e91b6b..20ec82288581 100644
--- a/arch/powerpc/include/asm/immap_85xx.h
+++ b/arch/powerpc/include/asm/immap_85xx.h
@@ -11,6 +11,7 @@
 #ifndef __IMMAP_85xx__
 #define __IMMAP_85xx__
 
+#include <asm/ppc.h>
 #include <asm/types.h>
 #include <asm/fsl_dma.h>
 #include <asm/fsl_i2c.h>
diff --git a/arch/powerpc/include/asm/immap_86xx.h b/arch/powerpc/include/asm/immap_86xx.h
index 1fbc63a5ceb8..30c296d5b7c6 100644
--- a/arch/powerpc/include/asm/immap_86xx.h
+++ b/arch/powerpc/include/asm/immap_86xx.h
@@ -15,6 +15,7 @@
 #include <asm/fsl_dma.h>
 #include <asm/fsl_lbc.h>
 #include <asm/fsl_i2c.h>
+#include <asm/ppc.h>
 
 /* Local-Access Registers and MCM Registers(0x0000-0x2000) */
 typedef struct ccsr_local_mcm {
diff --git a/arch/powerpc/lib/bdinfo.c b/arch/powerpc/lib/bdinfo.c
index 39062804ccfe..914127457234 100644
--- a/arch/powerpc/lib/bdinfo.c
+++ b/arch/powerpc/lib/bdinfo.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <init.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/powerpc/lib/bootm.c b/arch/powerpc/lib/bootm.c
index cf3e3fd8409d..a43126e39745 100644
--- a/arch/powerpc/lib/bootm.c
+++ b/arch/powerpc/lib/bootm.c
@@ -19,6 +19,7 @@
 #include <image.h>
 #include <malloc.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <u-boot/zlib.h>
 #include <bzlib.h>
 #include <asm/byteorder.h>
diff --git a/arch/powerpc/lib/interrupts.c b/arch/powerpc/lib/interrupts.c
index 14f32cbd9372..b85f7dc79172 100644
--- a/arch/powerpc/lib/interrupts.c
+++ b/arch/powerpc/lib/interrupts.c
@@ -16,6 +16,7 @@
 #include <status_led.h>
 #endif
 #include <asm/ptrace.h>
+#include <asm/ppc.h>
 
 #ifndef CONFIG_MPC83XX_TIMER
 #ifndef CONFIG_SYS_WATCHDOG_FREQ
@@ -43,13 +44,13 @@ static __inline__ void set_dec (unsigned long val)
 
 void enable_interrupts(void)
 {
-	set_msr (get_msr () | MSR_EE);
+	set_msr(get_msr() | MSR_EE);
 }
 
 /* returns flag if MSR_EE was set before */
 int disable_interrupts(void)
 {
-	ulong msr = get_msr ();
+	ulong msr = get_msr();
 
 	set_msr (msr & ~MSR_EE);
 	return ((msr & MSR_EE) != 0);
@@ -63,7 +64,7 @@ int interrupt_init(void)
 
 	set_dec (decrementer_count);
 
-	set_msr (get_msr () | MSR_EE);
+	set_msr(get_msr() | MSR_EE);
 
 	return (0);
 }
diff --git a/arch/riscv/include/asm/arch-fu540/reset.h b/arch/riscv/include/asm/arch-fu540/reset.h
index e42797a3958f..f49b72100e35 100644
--- a/arch/riscv/include/asm/arch-fu540/reset.h
+++ b/arch/riscv/include/asm/arch-fu540/reset.h
@@ -8,6 +8,8 @@
 #ifndef __RESET_SIFIVE_H
 #define __RESET_SIFIVE_H
 
+struct udevice;
+
 int sifive_reset_bind(struct udevice *dev, ulong count);
 
 #endif
diff --git a/arch/riscv/lib/boot.c b/arch/riscv/lib/boot.c
index 778d011f7cea..80ac3e58fd80 100644
--- a/arch/riscv/lib/boot.c
+++ b/arch/riscv/lib/boot.c
@@ -4,8 +4,8 @@
  * Rick Chen, Andes Technology Corporation <rick@andestech.com>
  */
 
-#include <common.h>
 #include <command.h>
+#include <asm/u-boot-riscv.h>
 
 unsigned long do_go_exec(ulong (*entry)(int, char * const []),
 			 int argc, char *const argv[])
diff --git a/arch/riscv/lib/bootm.c b/arch/riscv/lib/bootm.c
index 8dd18205403c..41e0504c6468 100644
--- a/arch/riscv/lib/bootm.c
+++ b/arch/riscv/lib/bootm.c
@@ -19,6 +19,7 @@
 #include <asm/byteorder.h>
 #include <asm/csr.h>
 #include <asm/smp.h>
+#include <asm/u-boot-riscv.h>
 #include <dm/device.h>
 #include <dm/root.h>
 #include <u-boot/zlib.h>
diff --git a/arch/riscv/lib/interrupts.c b/arch/riscv/lib/interrupts.c
index cd47e6448722..0ae9c00635f9 100644
--- a/arch/riscv/lib/interrupts.c
+++ b/arch/riscv/lib/interrupts.c
@@ -13,6 +13,7 @@
 #include <efi_loader.h>
 #include <hang.h>
 #include <irq_func.h>
+#include <asm/global_data.h>
 #include <asm/ptrace.h>
 #include <asm/system.h>
 #include <asm/encoding.h>
diff --git a/arch/sh/cpu/sh4/cpu.c b/arch/sh/cpu/sh4/cpu.c
index 801102fc7d5d..d4cdfb61ab52 100644
--- a/arch/sh/cpu/sh4/cpu.c
+++ b/arch/sh/cpu/sh4/cpu.c
@@ -11,6 +11,7 @@
 #include <net.h>
 #include <netdev.h>
 #include <asm/processor.h>
+#include <asm/u-boot.h>
 
 int checkcpu(void)
 {
diff --git a/arch/x86/lib/bootm.c b/arch/x86/lib/bootm.c
index b255144318cd..e8d252abcd6d 100644
--- a/arch/x86/lib/bootm.c
+++ b/arch/x86/lib/bootm.c
@@ -13,6 +13,7 @@
 #include <hang.h>
 #include <log.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <dm/device.h>
 #include <dm/root.h>
 #include <errno.h>
diff --git a/arch/xtensa/lib/bootm.c b/arch/xtensa/lib/bootm.c
index c33bcf2f9edd..61ae08517566 100644
--- a/arch/xtensa/lib/bootm.c
+++ b/arch/xtensa/lib/bootm.c
@@ -10,6 +10,7 @@
 #include <cpu_func.h>
 #include <env.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 #include <u-boot/zlib.h>
 #include <asm/byteorder.h>
diff --git a/board/AndesTech/adp-ae3xx/adp-ae3xx.c b/board/AndesTech/adp-ae3xx/adp-ae3xx.c
index 3c4a27d63f6a..1c142b80a5ae 100644
--- a/board/AndesTech/adp-ae3xx/adp-ae3xx.c
+++ b/board/AndesTech/adp-ae3xx/adp-ae3xx.c
@@ -14,6 +14,7 @@
 #if defined(CONFIG_FTMAC100) && !defined(CONFIG_DM_ETH)
 #include <netdev.h>
 #endif
+#include <asm/u-boot.h>
 #include <linux/io.h>
 #include <faraday/ftsmc020.h>
 
diff --git a/board/AndesTech/adp-ag101p/adp-ag101p.c b/board/AndesTech/adp-ag101p/adp-ag101p.c
index 8848b7f97386..97f25fa42ed4 100644
--- a/board/AndesTech/adp-ag101p/adp-ag101p.c
+++ b/board/AndesTech/adp-ag101p/adp-ag101p.c
@@ -13,6 +13,7 @@
 #include <netdev.h>
 #endif
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/io.h>
 #include <asm/io.h>
 #include <asm/mach-types.h>
diff --git a/board/AndesTech/ax25-ae350/ax25-ae350.c b/board/AndesTech/ax25-ae350/ax25-ae350.c
index d781038de285..bb0dfb5e95d3 100644
--- a/board/AndesTech/ax25-ae350/ax25-ae350.c
+++ b/board/AndesTech/ax25-ae350/ax25-ae350.c
@@ -13,6 +13,7 @@
 #include <netdev.h>
 #endif
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/io.h>
 #include <faraday/ftsmc020.h>
 #include <fdtdec.h>
diff --git a/board/Arcturus/ucp1020/spl.c b/board/Arcturus/ucp1020/spl.c
index b5db24da2942..1f9206aa6147 100644
--- a/board/Arcturus/ucp1020/spl.c
+++ b/board/Arcturus/ucp1020/spl.c
@@ -21,6 +21,7 @@
 #include <fsl_esdhc.h>
 #include <spi_flash.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/Arcturus/ucp1020/tlb.c b/board/Arcturus/ucp1020/tlb.c
index 2c07df63e5b5..48035ff80270 100644
--- a/board/Arcturus/ucp1020/tlb.c
+++ b/board/Arcturus/ucp1020/tlb.c
@@ -7,8 +7,8 @@
  * Copyright 2010-2011 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
 #include <asm/mmu.h>
+#include <asm/ppc.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/Arcturus/ucp1020/ucp1020.c b/board/Arcturus/ucp1020/ucp1020.c
index 0846bb0e9ef3..838b7995693b 100644
--- a/board/Arcturus/ucp1020/ucp1020.c
+++ b/board/Arcturus/ucp1020/ucp1020.c
@@ -18,6 +18,7 @@
 #include <pci.h>
 #include <i2c.h>
 #include <miiphy.h>
+#include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <fsl_mdio.h>
diff --git a/board/BuR/common/bur_common.h b/board/BuR/common/bur_common.h
index c64ebe93b0e9..4db630668e29 100644
--- a/board/BuR/common/bur_common.h
+++ b/board/BuR/common/bur_common.h
@@ -26,4 +26,5 @@ int board_eth_init(struct bd_info *bis);
 
 int brdefaultip_setup(int bus, int chip);
 
+#include <asm/u-boot.h>
 #endif
diff --git a/board/BuR/common/common.c b/board/BuR/common/common.c
index c42711d97330..377d3f41fe67 100644
--- a/board/BuR/common/common.c
+++ b/board/BuR/common/common.c
@@ -16,6 +16,7 @@
 #include <i2c.h>
 #include <lcd.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 #include "bur_common.h"
diff --git a/board/CZ.NIC/turris_mox/turris_mox.c b/board/CZ.NIC/turris_mox/turris_mox.c
index 486680a49e88..f7f5c1174313 100644
--- a/board/CZ.NIC/turris_mox/turris_mox.c
+++ b/board/CZ.NIC/turris_mox/turris_mox.c
@@ -15,6 +15,7 @@
 #include <env.h>
 #include <fdt_support.h>
 #include <init.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 #include <linux/string.h>
diff --git a/board/CarMediaLab/flea3/flea3.c b/board/CarMediaLab/flea3/flea3.c
index 12c5ac331f97..a5beea9e5506 100644
--- a/board/CarMediaLab/flea3/flea3.c
+++ b/board/CarMediaLab/flea3/flea3.c
@@ -12,6 +12,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <env.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/Marvell/db-88f6720/db-88f6720.c b/board/Marvell/db-88f6720/db-88f6720.c
index 26c30647fbb0..8f2b0f55b0ef 100644
--- a/board/Marvell/db-88f6720/db-88f6720.c
+++ b/board/Marvell/db-88f6720/db-88f6720.c
@@ -12,6 +12,7 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/Marvell/db-88f6820-amc/db-88f6820-amc.c b/board/Marvell/db-88f6820-amc/db-88f6820-amc.c
index 163a1b3de9d2..948988c788dd 100644
--- a/board/Marvell/db-88f6820-amc/db-88f6820-amc.c
+++ b/board/Marvell/db-88f6820-amc/db-88f6820-amc.c
@@ -13,6 +13,7 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 
 #include "../drivers/ddr/marvell/a38x/ddr3_init.h"
diff --git a/board/Marvell/db-88f6820-gp/db-88f6820-gp.c b/board/Marvell/db-88f6820-gp/db-88f6820-gp.c
index 06307e582cec..508f007d52e6 100644
--- a/board/Marvell/db-88f6820-gp/db-88f6820-gp.c
+++ b/board/Marvell/db-88f6820-gp/db-88f6820-gp.c
@@ -13,6 +13,7 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 
 #include "../drivers/ddr/marvell/a38x/ddr3_init.h"
diff --git a/board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c b/board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c
index 9e1fdecfca4d..66c308bda54a 100644
--- a/board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c
+++ b/board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c
@@ -12,6 +12,7 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/Marvell/gplugd/gplugd.c b/board/Marvell/gplugd/gplugd.c
index c6376cdf6a94..f8d1b9cc13a3 100644
--- a/board/Marvell/gplugd/gplugd.c
+++ b/board/Marvell/gplugd/gplugd.c
@@ -22,6 +22,7 @@
 #include <asm/gpio.h>
 #include <miiphy.h>
 #include <asm/mach-types.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 
 #ifdef CONFIG_ARMADA100_FEC
diff --git a/board/abilis/tb100/tb100.c b/board/abilis/tb100/tb100.c
index 52dc5b8d8673..9ef7ed6e7f45 100644
--- a/board/abilis/tb100/tb100.c
+++ b/board/abilis/tb100/tb100.c
@@ -8,6 +8,7 @@
 #include <net.h>
 #include <netdev.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 
 void reset_cpu(ulong addr)
 {
diff --git a/board/advantech/dms-ba16/dms-ba16.c b/board/advantech/dms-ba16/dms-ba16.c
index 07a47e9fbb04..685fd20f4238 100644
--- a/board/advantech/dms-ba16/dms-ba16.c
+++ b/board/advantech/dms-ba16/dms-ba16.c
@@ -12,6 +12,7 @@
 #include <asm/arch/iomux.h>
 #include <asm/arch/mx6-pins.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
diff --git a/board/advantech/imx8qm_rom7720_a1/spl.c b/board/advantech/imx8qm_rom7720_a1/spl.c
index 5a9a00905354..67028b79a1b7 100644
--- a/board/advantech/imx8qm_rom7720_a1/spl.c
+++ b/board/advantech/imx8qm_rom7720_a1/spl.c
@@ -10,6 +10,7 @@
 #include <spl.h>
 #include <fsl_esdhc.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 
 #include <asm/io.h>
diff --git a/board/amazon/kc1/kc1.c b/board/amazon/kc1/kc1.c
index 94e396134406..a1b179d1a3c4 100644
--- a/board/amazon/kc1/kc1.c
+++ b/board/amazon/kc1/kc1.c
@@ -10,6 +10,7 @@
 #include <env.h>
 #include <init.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/ctype.h>
 #include <linux/usb/musb.h>
 #include <asm/omap_musb.h>
diff --git a/board/armltd/integrator/integrator.c b/board/armltd/integrator/integrator.c
index a730f15c7a32..ddad2bd80dac 100644
--- a/board/armltd/integrator/integrator.c
+++ b/board/armltd/integrator/integrator.c
@@ -26,6 +26,7 @@
 #include <netdev.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 #include <dm/platform_data/serial_pl01x.h>
 #include "arm-ebi.h"
 #include "integrator-sc.h"
diff --git a/board/armltd/vexpress/vexpress_common.c b/board/armltd/vexpress/vexpress_common.c
index d359a36c7745..d4835191a935 100644
--- a/board/armltd/vexpress/vexpress_common.c
+++ b/board/armltd/vexpress/vexpress_common.c
@@ -29,6 +29,7 @@
 #include <asm/arch/systimer.h>
 #include <asm/arch/sysctrl.h>
 #include <asm/arch/wdt.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 #include "../drivers/mmc/arm_pl180_mmci.h"
 
diff --git a/board/armltd/vexpress64/vexpress64.c b/board/armltd/vexpress64/vexpress64.c
index cc118a02f116..c88482d3cef3 100644
--- a/board/armltd/vexpress64/vexpress64.c
+++ b/board/armltd/vexpress64/vexpress64.c
@@ -14,6 +14,7 @@
 #include <netdev.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 #include <linux/compiler.h>
 #include <dm/platform_data/serial_pl01x.h>
 #include <linux/string.h>
diff --git a/board/atmel/at91rm9200ek/at91rm9200ek.c b/board/atmel/at91rm9200ek/at91rm9200ek.c
index a314ced5e4a5..5838e36c7a47 100644
--- a/board/atmel/at91rm9200ek/at91rm9200ek.c
+++ b/board/atmel/at91rm9200ek/at91rm9200ek.c
@@ -19,6 +19,7 @@
 #include <asm/arch/at91_pio.h>
 #include <asm/arch/at91_common.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/atmel/at91sam9261ek/at91sam9261ek.c b/board/atmel/at91sam9261ek/at91sam9261ek.c
index 0318eeaa94e9..3a36a23a4d35 100644
--- a/board/atmel/at91sam9261ek/at91sam9261ek.c
+++ b/board/atmel/at91sam9261ek/at91sam9261ek.c
@@ -25,6 +25,7 @@
 #include <netdev.h>
 #endif
 #include <asm/mach-types.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/atmel/at91sam9n12ek/at91sam9n12ek.c b/board/atmel/at91sam9n12ek/at91sam9n12ek.c
index a3fc55bbc34b..75d5ffa88ae1 100644
--- a/board/atmel/at91sam9n12ek/at91sam9n12ek.c
+++ b/board/atmel/at91sam9n12ek/at91sam9n12ek.c
@@ -20,6 +20,7 @@
 #include <lcd.h>
 #include <atmel_hlcdc.h>
 #include <netdev.h>
+#include <asm/u-boot.h>
 
 #ifdef CONFIG_LCD_INFO
 #include <nand.h>
diff --git a/board/bachmann/ot1200/ot1200.c b/board/bachmann/ot1200/ot1200.c
index 69d1b106b072..0754a5994331 100644
--- a/board/bachmann/ot1200/ot1200.c
+++ b/board/bachmann/ot1200/ot1200.c
@@ -28,6 +28,7 @@
 #include <pca953x.h>
 #include <asm/gpio.h>
 #include <phy.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/barco/platinum/platinum.c b/board/barco/platinum/platinum.c
index ec8d55288876..af2b37cbdb1b 100644
--- a/board/barco/platinum/platinum.c
+++ b/board/barco/platinum/platinum.c
@@ -22,6 +22,7 @@
 #include <asm/gpio.h>
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/mach-imx/boot_mode.h>
+#include <asm/u-boot.h>
 
 #include "platinum.h"
 
diff --git a/board/barco/titanium/titanium.c b/board/barco/titanium/titanium.c
index efd1dc35ef4c..fe27965b482d 100644
--- a/board/barco/titanium/titanium.c
+++ b/board/barco/titanium/titanium.c
@@ -23,6 +23,7 @@
 #include <micrel.h>
 #include <miiphy.h>
 #include <netdev.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/bluegiga/apx4devkit/apx4devkit.c b/board/bluegiga/apx4devkit/apx4devkit.c
index ed0885f724c4..0bb752e51bd9 100644
--- a/board/bluegiga/apx4devkit/apx4devkit.c
+++ b/board/bluegiga/apx4devkit/apx4devkit.c
@@ -25,6 +25,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/sys_proto.h>
 #include <env.h>
+#include <asm/u-boot.h>
 #include <linux/mii.h>
 #include <miiphy.h>
 #include <netdev.h>
diff --git a/board/bluewater/gurnard/gurnard.c b/board/bluewater/gurnard/gurnard.c
index 2ac23674f9c1..706bb6935d2f 100644
--- a/board/bluewater/gurnard/gurnard.c
+++ b/board/bluewater/gurnard/gurnard.c
@@ -33,6 +33,7 @@
 #include <asm/arch/atmel_serial.h>
 #include <asm/arch/clk.h>
 #include <asm/arch/gpio.h>
+#include <asm/u-boot.h>
 #include <dm/uclass-internal.h>
 #include <linux/delay.h>
 #include <linux/string.h>
diff --git a/board/bluewater/snapper9260/snapper9260.c b/board/bluewater/snapper9260/snapper9260.c
index 87fb967ea058..188001c77ed0 100644
--- a/board/bluewater/snapper9260/snapper9260.c
+++ b/board/bluewater/snapper9260/snapper9260.c
@@ -24,6 +24,7 @@
 #include <netdev.h>
 #include <i2c.h>
 #include <pca953x.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/bosch/shc/board.c b/board/bosch/shc/board.c
index bfce291691a0..3b4536238260 100644
--- a/board/bosch/shc/board.c
+++ b/board/bosch/shc/board.c
@@ -36,6 +36,7 @@
 #include <i2c.h>
 #include <miiphy.h>
 #include <cpsw.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <power/tps65217.h>
 #include <env_internal.h>
diff --git a/board/boundary/nitrogen6x/nitrogen6x.c b/board/boundary/nitrogen6x/nitrogen6x.c
index 3cc093ed5307..16b50dac92af 100644
--- a/board/boundary/nitrogen6x/nitrogen6x.c
+++ b/board/boundary/nitrogen6x/nitrogen6x.c
@@ -17,6 +17,7 @@
 #include <asm/arch/sys_proto.h>
 #include <malloc.h>
 #include <asm/arch/mx6-pins.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
diff --git a/board/broadcom/bcm23550_w1d/bcm23550_w1d.c b/board/broadcom/bcm23550_w1d/bcm23550_w1d.c
index 90685c072a3b..0a5ae5718bec 100644
--- a/board/broadcom/bcm23550_w1d/bcm23550_w1d.c
+++ b/board/broadcom/bcm23550_w1d/bcm23550_w1d.c
@@ -14,6 +14,7 @@
 #include <asm/kona-common/kona_sdhci.h>
 #include <asm/kona-common/clk.h>
 #include <asm/arch/sysmap.h>
+#include <asm/u-boot.h>
 
 #include <usb.h>
 #include <usb/dwc2_udc.h>
diff --git a/board/broadcom/bcm28155_ap/bcm28155_ap.c b/board/broadcom/bcm28155_ap/bcm28155_ap.c
index 43726f79bde3..4c0973089475 100644
--- a/board/broadcom/bcm28155_ap/bcm28155_ap.c
+++ b/board/broadcom/bcm28155_ap/bcm28155_ap.c
@@ -14,6 +14,7 @@
 #include <asm/kona-common/kona_sdhci.h>
 #include <asm/kona-common/clk.h>
 #include <asm/arch/sysmap.h>
+#include <asm/u-boot.h>
 
 #include <usb.h>
 #include <usb/dwc2_udc.h>
diff --git a/board/broadcom/bcm_ep/board.c b/board/broadcom/bcm_ep/board.c
index 6064eb43db11..d14bb9e9e012 100644
--- a/board/broadcom/bcm_ep/board.c
+++ b/board/broadcom/bcm_ep/board.c
@@ -14,6 +14,7 @@
 #include <netdev.h>
 #include <asm/system.h>
 #include <asm/iproc-common/armpll.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/calao/usb_a9263/usb_a9263.c b/board/calao/usb_a9263/usb_a9263.c
index c0a5c518ca8b..0f59a9276c70 100644
--- a/board/calao/usb_a9263/usb_a9263.c
+++ b/board/calao/usb_a9263/usb_a9263.c
@@ -19,6 +19,7 @@
 #include <asm/io.h>
 #include <net.h>
 #include <netdev.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/cavium/thunderx/thunderx.c b/board/cavium/thunderx/thunderx.c
index ccb6b26c91b4..18b0f43aa7db 100644
--- a/board/cavium/thunderx/thunderx.c
+++ b/board/cavium/thunderx/thunderx.c
@@ -11,6 +11,7 @@
 #include <errno.h>
 #include <net.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/compiler.h>
 
 #include <cavium/atf.h>
diff --git a/board/ccv/xpress/xpress.c b/board/ccv/xpress/xpress.c
index 9f5e78ce6804..8e23359751ae 100644
--- a/board/ccv/xpress/xpress.c
+++ b/board/ccv/xpress/xpress.c
@@ -26,6 +26,7 @@
 #include <mmc.h>
 #include <netdev.h>
 #include <usb.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <usb/ehci-ci.h>
 
diff --git a/board/cirrus/edb93xx/edb93xx.c b/board/cirrus/edb93xx/edb93xx.c
index 7a7f62fe88e4..f2fb24000c85 100644
--- a/board/cirrus/edb93xx/edb93xx.c
+++ b/board/cirrus/edb93xx/edb93xx.c
@@ -25,6 +25,7 @@
 #include <asm/io.h>
 #include <asm/mach-types.h>
 #include <asm/arch/ep93xx.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/compulab/cl-som-imx7/cl-som-imx7.c b/board/compulab/cl-som-imx7/cl-som-imx7.c
index 454c93a572f8..46a0fa76473e 100644
--- a/board/compulab/cl-som-imx7/cl-som-imx7.c
+++ b/board/compulab/cl-som-imx7/cl-som-imx7.c
@@ -16,6 +16,7 @@
 #include <netdev.h>
 #include <fsl_esdhc_imx.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <power/pmic.h>
 #include <power/pfuze3000_pmic.h>
diff --git a/board/compulab/cl-som-imx7/spl.c b/board/compulab/cl-som-imx7/spl.c
index 0128b912801c..18dc86cdc830 100644
--- a/board/compulab/cl-som-imx7/spl.c
+++ b/board/compulab/cl-som-imx7/spl.c
@@ -16,6 +16,7 @@
 #include <asm/arch-mx7/mx7-pins.h>
 #include <asm/arch-mx7/clock.h>
 #include <asm/arch-mx7/mx7-ddr.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 #include "common.h"
 
diff --git a/board/compulab/cm_fx6/cm_fx6.c b/board/compulab/cm_fx6/cm_fx6.c
index 46da479a45fc..4147c4f7d023 100644
--- a/board/compulab/cm_fx6/cm_fx6.c
+++ b/board/compulab/cm_fx6/cm_fx6.c
@@ -33,6 +33,7 @@
 #include <asm/mach-imx/video.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
+#include <asm/u-boot.h>
 #include <dm/platform_data/serial_mxc.h>
 #include <dm/device-internal.h>
 #include <jffs2/load_kernel.h>
diff --git a/board/compulab/cm_fx6/spl.c b/board/compulab/cm_fx6/spl.c
index c3c816181fd9..ab739330d9c4 100644
--- a/board/compulab/cm_fx6/spl.c
+++ b/board/compulab/cm_fx6/spl.c
@@ -20,6 +20,7 @@
 #include <asm/arch/crm_regs.h>
 #include <asm/mach-imx/iomux-v3.h>
 #include <fsl_esdhc_imx.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include "common.h"
 
diff --git a/board/compulab/cm_t335/cm_t335.c b/board/compulab/cm_t335/cm_t335.c
index 1d4a3aceef54..2a63aadf0d72 100644
--- a/board/compulab/cm_t335/cm_t335.c
+++ b/board/compulab/cm_t335/cm_t335.c
@@ -15,6 +15,7 @@
 #include <status_led.h>
 #include <cpsw.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 
 #include <asm/arch/sys_proto.h>
diff --git a/board/compulab/cm_t43/cm_t43.c b/board/compulab/cm_t43/cm_t43.c
index efdade155b57..92c8092d6d7e 100644
--- a/board/compulab/cm_t43/cm_t43.c
+++ b/board/compulab/cm_t43/cm_t43.c
@@ -12,6 +12,7 @@
 #include <asm/gpio.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/emif.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <power/pmic.h>
 #include <power/tps65218.h>
diff --git a/board/congatec/cgtqmx6eval/cgtqmx6eval.c b/board/congatec/cgtqmx6eval/cgtqmx6eval.c
index 3f74cd87890f..62c53d782e00 100644
--- a/board/congatec/cgtqmx6eval/cgtqmx6eval.c
+++ b/board/congatec/cgtqmx6eval/cgtqmx6eval.c
@@ -28,6 +28,7 @@
 #include <fsl_esdhc_imx.h>
 #include <i2c.h>
 #include <input.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 #include <power/pmic.h>
diff --git a/board/corscience/tricorder/tricorder.c b/board/corscience/tricorder/tricorder.c
index a6fc7f67d02f..53495aa187bd 100644
--- a/board/corscience/tricorder/tricorder.c
+++ b/board/corscience/tricorder/tricorder.c
@@ -21,6 +21,7 @@
 #include <asm/arch/mux.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/mem.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 #include "tricorder.h"
 #include "tricorder-eeprom.h"
diff --git a/board/creative/xfi3/xfi3.c b/board/creative/xfi3/xfi3.c
index 2aa2435e49c2..cbaa5e59eac8 100644
--- a/board/creative/xfi3/xfi3.c
+++ b/board/creative/xfi3/xfi3.c
@@ -20,6 +20,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/cssi/MCR3000/MCR3000.c b/board/cssi/MCR3000/MCR3000.c
index 2603ad4c57d8..dc0edd961d84 100644
--- a/board/cssi/MCR3000/MCR3000.c
+++ b/board/cssi/MCR3000/MCR3000.c
@@ -16,6 +16,8 @@
 #include <serial.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <asm/ppc.h>
+#include <asm/u-boot.h>
 #include <dm/uclass.h>
 #include <wdt.h>
 #include <linux/delay.h>
diff --git a/board/cssi/MCR3000/nand.c b/board/cssi/MCR3000/nand.c
index 15a10bffadc1..d2ed0fc7d49d 100644
--- a/board/cssi/MCR3000/nand.c
+++ b/board/cssi/MCR3000/nand.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <nand.h>
 #include <asm/io.h>
+#include <asm/ppc.h>
 
 #define BIT_CLE			((unsigned short)0x0800)
 #define BIT_ALE			((unsigned short)0x0400)
diff --git a/board/davinci/da8xxevm/da850evm.c b/board/davinci/da8xxevm/da850evm.c
index 7b3f303f3a74..38e51eb23e37 100644
--- a/board/davinci/da8xxevm/da850evm.c
+++ b/board/davinci/da8xxevm/da850evm.c
@@ -23,6 +23,7 @@
 #include <asm/arch/pinmux_defs.h>
 #include <asm/io.h>
 #include <asm/arch/davinci_misc.h>
+#include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <hwconfig.h>
 #include <asm/mach-types.h>
diff --git a/board/davinci/da8xxevm/omapl138_lcdk.c b/board/davinci/da8xxevm/omapl138_lcdk.c
index 3f4bd39ec8fd..347f616df672 100644
--- a/board/davinci/da8xxevm/omapl138_lcdk.c
+++ b/board/davinci/da8xxevm/omapl138_lcdk.c
@@ -18,6 +18,7 @@
 #include <asm/ti-common/davinci_nand.h>
 #include <asm/io.h>
 #include <ns16550.h>
+#include <asm/u-boot.h>
 #include <dm/platdata.h>
 #include <linux/errno.h>
 #include <asm/mach-types.h>
diff --git a/board/dhelectronics/dh_imx6/dh_imx6_spl.c b/board/dhelectronics/dh_imx6/dh_imx6_spl.c
index dd8f1625be3c..bcb39eab886f 100644
--- a/board/dhelectronics/dh_imx6/dh_imx6_spl.c
+++ b/board/dhelectronics/dh_imx6/dh_imx6_spl.c
@@ -25,6 +25,7 @@
 #include <i2c.h>
 #include <mmc.h>
 #include <spl.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 
diff --git a/board/dhelectronics/dh_stm32mp1/board.c b/board/dhelectronics/dh_stm32mp1/board.c
index ddf8f67ae6cf..92d752f7258a 100644
--- a/board/dhelectronics/dh_stm32mp1/board.c
+++ b/board/dhelectronics/dh_stm32mp1/board.c
@@ -16,6 +16,7 @@
 #include <clk.h>
 #include <config.h>
 #include <dm.h>
+#include <asm/u-boot.h>
 #include <dm/device.h>
 #include <dm/uclass.h>
 #include <env.h>
diff --git a/board/egnite/ethernut5/ethernut5.c b/board/egnite/ethernut5/ethernut5.c
index 559fdd2f646d..6dc58eab14e7 100644
--- a/board/egnite/ethernut5/ethernut5.c
+++ b/board/egnite/ethernut5/ethernut5.c
@@ -61,6 +61,7 @@
 #include <mmc.h>
 #include <atmel_mci.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 
 #include <asm/arch/at91sam9260.h>
 #include <asm/arch/at91sam9260_matrix.h>
diff --git a/board/el/el6x/el6x.c b/board/el/el6x/el6x.c
index 382a255d1623..f5c874dcda8b 100644
--- a/board/el/el6x/el6x.c
+++ b/board/el/el6x/el6x.c
@@ -14,6 +14,7 @@
 #include <asm/arch/mx6-pins.h>
 #include <env.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
diff --git a/board/embest/mx6boards/mx6boards.c b/board/embest/mx6boards/mx6boards.c
index 65b3942e3991..3cd24de612ba 100644
--- a/board/embest/mx6boards/mx6boards.c
+++ b/board/embest/mx6boards/mx6boards.c
@@ -21,6 +21,7 @@
 #include <asm/arch/iomux.h>
 #include <asm/arch/mx6-pins.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
diff --git a/board/esd/meesc/meesc.c b/board/esd/meesc/meesc.c
index 81aa22bc8314..fe2f9a4d2b13 100644
--- a/board/esd/meesc/meesc.c
+++ b/board/esd/meesc/meesc.c
@@ -28,6 +28,7 @@
 #include <asm/arch/at91_pio.h>
 #include <asm/arch/clk.h>
 #include <netdev.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/esd/vme8349/pci.c b/board/esd/vme8349/pci.c
index bf51d39b67c8..560069bbc145 100644
--- a/board/esd/vme8349/pci.c
+++ b/board/esd/vme8349/pci.c
@@ -18,6 +18,7 @@
 #include <pci.h>
 #include <i2c.h>
 #include <asm/fsl_i2c.h>
+#include <asm/ppc.h>
 #include <linux/delay.h>
 #include "vme8349pin.h"
 
diff --git a/board/esd/vme8349/vme8349.c b/board/esd/vme8349/vme8349.c
index 56dd2269cb8b..a5874ad273a1 100644
--- a/board/esd/vme8349/vme8349.c
+++ b/board/esd/vme8349/vme8349.c
@@ -24,10 +24,12 @@
 #endif
 #include <asm/io.h>
 #include <asm/mmu.h>
+#include <asm/ppc.h>
 #include <spd.h>
 #include <spd_sdram.h>
 #include <i2c.h>
 #include <netdev.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/common/cds_pci_ft.c b/board/freescale/common/cds_pci_ft.c
index be97a28ed25f..6b3690610d99 100644
--- a/board/freescale/common/cds_pci_ft.c
+++ b/board/freescale/common/cds_pci_ft.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include "cadmus.h"
diff --git a/board/freescale/common/p_corenet/pci.c b/board/freescale/common/p_corenet/pci.c
index 636334863e18..ce6c375aff40 100644
--- a/board/freescale/common/p_corenet/pci.c
+++ b/board/freescale/common/p_corenet/pci.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <pci.h>
 #include <asm/fsl_pci.h>
+#include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <asm/fsl_serdes.h>
diff --git a/board/freescale/common/p_corenet/tlb.c b/board/freescale/common/p_corenet/tlb.c
index c0ab1a5fd14e..6ca3758b0691 100644
--- a/board/freescale/common/p_corenet/tlb.c
+++ b/board/freescale/common/p_corenet/tlb.c
@@ -6,8 +6,8 @@
  * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
  */
 
-#include <common.h>
 #include <asm/mmu.h>
+#include <asm/ppc.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/freescale/corenet_ds/corenet_ds.c b/board/freescale/corenet_ds/corenet_ds.c
index 3a83e65f2fe5..67b47e33e725 100644
--- a/board/freescale/corenet_ds/corenet_ds.c
+++ b/board/freescale/corenet_ds/corenet_ds.c
@@ -11,6 +11,7 @@
 #include <init.h>
 #include <netdev.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/compiler.h>
 #include <asm/mmu.h>
 #include <asm/processor.h>
diff --git a/board/freescale/corenet_ds/corenet_ds.h b/board/freescale/corenet_ds/corenet_ds.h
index 84e5c4a2de21..bf9181e0768e 100644
--- a/board/freescale/corenet_ds/corenet_ds.h
+++ b/board/freescale/corenet_ds/corenet_ds.h
@@ -6,6 +6,7 @@
 #ifndef __CORENET_DS_H__
 #define __CORENET_DS_H__
 
+#include <asm/u-boot.h>
 void fdt_fixup_board_enet(void *blob);
 void pci_of_setup(void *blob, struct bd_info *bd);
 
diff --git a/board/freescale/corenet_ds/ddr.c b/board/freescale/corenet_ds/ddr.c
index a8e499869f5d..bce099a8ed8f 100644
--- a/board/freescale/corenet_ds/ddr.c
+++ b/board/freescale/corenet_ds/ddr.c
@@ -11,6 +11,7 @@
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/mmu.h>
+#include <asm/ppc.h>
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
 #include <asm/fsl_law.h>
diff --git a/board/freescale/corenet_ds/eth_hydra.c b/board/freescale/corenet_ds/eth_hydra.c
index 90ce999be0cb..71c588c14178 100644
--- a/board/freescale/corenet_ds/eth_hydra.c
+++ b/board/freescale/corenet_ds/eth_hydra.c
@@ -56,6 +56,7 @@
 #include <malloc.h>
 #include <fdt_support.h>
 #include <fsl_dtsec.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 
 #include "../common/ngpixis.h"
diff --git a/board/freescale/corenet_ds/eth_p4080.c b/board/freescale/corenet_ds/eth_p4080.c
index 650013bb6fc3..3360e0ffc795 100644
--- a/board/freescale/corenet_ds/eth_p4080.c
+++ b/board/freescale/corenet_ds/eth_p4080.c
@@ -22,6 +22,7 @@
 #include <fsl_mdio.h>
 #include <miiphy.h>
 #include <phy.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 
 #include "../common/ngpixis.h"
diff --git a/board/freescale/corenet_ds/eth_superhydra.c b/board/freescale/corenet_ds/eth_superhydra.c
index 296b2b100276..57fb5a77f06c 100644
--- a/board/freescale/corenet_ds/eth_superhydra.c
+++ b/board/freescale/corenet_ds/eth_superhydra.c
@@ -57,6 +57,7 @@
 #include <malloc.h>
 #include <fdt_support.h>
 #include <fsl_dtsec.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 
 #include "../common/ngpixis.h"
diff --git a/board/freescale/imx8mq_evk/spl.c b/board/freescale/imx8mq_evk/spl.c
index 66a0be0b3df2..d9d1973120b6 100644
--- a/board/freescale/imx8mq_evk/spl.c
+++ b/board/freescale/imx8mq_evk/spl.c
@@ -23,6 +23,7 @@
 #include <asm/mach-imx/mxc_i2c.h>
 #include <fsl_esdhc_imx.h>
 #include <mmc.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 #include <power/pmic.h>
diff --git a/board/freescale/imx8qm_mek/imx8qm_mek.c b/board/freescale/imx8qm_mek/imx8qm_mek.c
index 7b280be8e94d..de9e4f0de418 100644
--- a/board/freescale/imx8qm_mek/imx8qm_mek.c
+++ b/board/freescale/imx8qm_mek/imx8qm_mek.c
@@ -9,6 +9,7 @@
 #include <errno.h>
 #include <init.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <asm/io.h>
diff --git a/board/freescale/imx8qxp_mek/imx8qxp_mek.c b/board/freescale/imx8qxp_mek/imx8qxp_mek.c
index 645e99235482..b6511d4e9df1 100644
--- a/board/freescale/imx8qxp_mek/imx8qxp_mek.c
+++ b/board/freescale/imx8qxp_mek/imx8qxp_mek.c
@@ -9,6 +9,7 @@
 #include <errno.h>
 #include <init.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 #include <fsl_esdhc_imx.h>
diff --git a/board/freescale/ls1012afrdm/ls1012afrdm.c b/board/freescale/ls1012afrdm/ls1012afrdm.c
index 2cd651b943fb..c872318b2c88 100644
--- a/board/freescale/ls1012afrdm/ls1012afrdm.c
+++ b/board/freescale/ls1012afrdm/ls1012afrdm.c
@@ -23,6 +23,7 @@
 #include <fsl_mmdc.h>
 #include <netdev.h>
 #include <fsl_sec.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/ls1012aqds/ls1012aqds.c b/board/freescale/ls1012aqds/ls1012aqds.c
index 5c89385acca4..163d2c419485 100644
--- a/board/freescale/ls1012aqds/ls1012aqds.c
+++ b/board/freescale/ls1012aqds/ls1012aqds.c
@@ -29,6 +29,7 @@
 #include <spl.h>
 #include <netdev.h>
 #include <fsl_sec.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 #include "../common/qixis.h"
 #include "ls1012aqds_qixis.h"
diff --git a/board/freescale/ls1012ardb/ls1012ardb.c b/board/freescale/ls1012ardb/ls1012ardb.c
index 02f3ff6aa029..1d3461f24232 100644
--- a/board/freescale/ls1012ardb/ls1012ardb.c
+++ b/board/freescale/ls1012ardb/ls1012ardb.c
@@ -28,6 +28,7 @@
 #include <fsl_mmdc.h>
 #include <netdev.h>
 #include <fsl_sec.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/ls1021aiot/ls1021aiot.c b/board/freescale/ls1021aiot/ls1021aiot.c
index d257f9723e35..0170712c2463 100644
--- a/board/freescale/ls1021aiot/ls1021aiot.c
+++ b/board/freescale/ls1021aiot/ls1021aiot.c
@@ -13,6 +13,7 @@
 #include <asm/arch/fsl_serdes.h>
 #include <asm/arch/ls102xa_stream_id.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 
diff --git a/board/freescale/ls1021aqds/eth.c b/board/freescale/ls1021aqds/eth.c
index 9cf797477b86..f9aa2f09fb99 100644
--- a/board/freescale/ls1021aqds/eth.c
+++ b/board/freescale/ls1021aqds/eth.c
@@ -20,6 +20,7 @@
 #include <fsl_mdio.h>
 #include <tsec.h>
 #include <malloc.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 
 #include "../common/sgmii_riser.h"
diff --git a/board/freescale/ls1021aqds/ls1021aqds.c b/board/freescale/ls1021aqds/ls1021aqds.c
index d3af462e68a3..267af86ccb2f 100644
--- a/board/freescale/ls1021aqds/ls1021aqds.c
+++ b/board/freescale/ls1021aqds/ls1021aqds.c
@@ -25,6 +25,7 @@
 #include <fsl_devdis.h>
 #include <fsl_validate.h>
 #include <fsl_ddr.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 #include "../common/sleep.h"
 #include "../common/qixis.h"
diff --git a/board/freescale/ls1021atsn/ls1021atsn.c b/board/freescale/ls1021atsn/ls1021atsn.c
index 010d243754c0..16d9df1b7044 100644
--- a/board/freescale/ls1021atsn/ls1021atsn.c
+++ b/board/freescale/ls1021atsn/ls1021atsn.c
@@ -12,6 +12,7 @@
 #include <asm/arch/ls102xa_soc.h>
 #include <asm/arch/fsl_serdes.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 #include "../common/sleep.h"
diff --git a/board/freescale/ls1021atwr/ls1021atwr.c b/board/freescale/ls1021atwr/ls1021atwr.c
index 72014b2173a0..8640d2746a29 100644
--- a/board/freescale/ls1021atwr/ls1021atwr.c
+++ b/board/freescale/ls1021atwr/ls1021atwr.c
@@ -29,6 +29,7 @@
 #include <fsl_sec.h>
 #include <fsl_devdis.h>
 #include <spl.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 #include "../common/sleep.h"
diff --git a/board/freescale/ls1028a/ls1028a.c b/board/freescale/ls1028a/ls1028a.c
index 984883bb00f5..de41dd155e69 100644
--- a/board/freescale/ls1028a/ls1028a.c
+++ b/board/freescale/ls1028a/ls1028a.c
@@ -14,6 +14,7 @@
 #include <asm/io.h>
 #include <hwconfig.h>
 #include <fdt_support.h>
+#include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <env_internal.h>
 #include <asm/arch-fsl-layerscape/soc.h>
diff --git a/board/freescale/ls1043aqds/eth.c b/board/freescale/ls1043aqds/eth.c
index fc4dc210f903..68e1642d2d4f 100644
--- a/board/freescale/ls1043aqds/eth.c
+++ b/board/freescale/ls1043aqds/eth.c
@@ -13,6 +13,7 @@
 #include <fm_eth.h>
 #include <fsl_mdio.h>
 #include <fsl_dtsec.h>
+#include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <malloc.h>
 #include <asm/arch/fsl_serdes.h>
diff --git a/board/freescale/ls1043aqds/ls1043aqds.c b/board/freescale/ls1043aqds/ls1043aqds.c
index 44e4c61eab27..8fc20ea46e77 100644
--- a/board/freescale/ls1043aqds/ls1043aqds.c
+++ b/board/freescale/ls1043aqds/ls1043aqds.c
@@ -28,6 +28,7 @@
 #include <fsl_esdhc.h>
 #include <fsl_ifc.h>
 #include <spl.h>
+#include <asm/u-boot.h>
 
 #include "../common/qixis.h"
 #include "ls1043aqds_qixis.h"
diff --git a/board/freescale/ls1043ardb/eth.c b/board/freescale/ls1043ardb/eth.c
index 1f01c1551656..dde2f376c9a5 100644
--- a/board/freescale/ls1043ardb/eth.c
+++ b/board/freescale/ls1043ardb/eth.c
@@ -10,6 +10,7 @@
 #include <fsl_dtsec.h>
 #include <fsl_mdio.h>
 #include <malloc.h>
+#include <asm/u-boot.h>
 
 #include "../common/fman.h"
 
diff --git a/board/freescale/ls1043ardb/ls1043ardb.c b/board/freescale/ls1043ardb/ls1043ardb.c
index beef26b084bf..d9ab32bd2cc6 100644
--- a/board/freescale/ls1043ardb/ls1043ardb.c
+++ b/board/freescale/ls1043ardb/ls1043ardb.c
@@ -21,6 +21,7 @@
 #include <fsl_esdhc.h>
 #include <fsl_ifc.h>
 #include <fsl_sec.h>
+#include <asm/u-boot.h>
 #include "cpld.h"
 #ifdef CONFIG_U_QE
 #include <fsl_qe.h>
diff --git a/board/freescale/ls1046afrwy/eth.c b/board/freescale/ls1046afrwy/eth.c
index 1b27d3e85381..5797c764dce8 100644
--- a/board/freescale/ls1046afrwy/eth.c
+++ b/board/freescale/ls1046afrwy/eth.c
@@ -11,6 +11,7 @@
 #include <fsl_dtsec.h>
 #include <fsl_mdio.h>
 #include <malloc.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 
 #include "../common/fman.h"
diff --git a/board/freescale/ls1046afrwy/ls1046afrwy.c b/board/freescale/ls1046afrwy/ls1046afrwy.c
index 9813a36ca07e..4d2d66b6b359 100644
--- a/board/freescale/ls1046afrwy/ls1046afrwy.c
+++ b/board/freescale/ls1046afrwy/ls1046afrwy.c
@@ -22,6 +22,7 @@
 #include <fsl_esdhc.h>
 #include <fsl_sec.h>
 #include <fsl_dspi.h>
+#include <asm/u-boot.h>
 
 #define LS1046A_PORSR1_REG 0x1EE0000
 #define BOOT_SRC_SD        0x20000000
diff --git a/board/freescale/ls1046aqds/eth.c b/board/freescale/ls1046aqds/eth.c
index 8f5f95e3968d..b4ea0239da4c 100644
--- a/board/freescale/ls1046aqds/eth.c
+++ b/board/freescale/ls1046aqds/eth.c
@@ -15,6 +15,7 @@
 #include <fsl_dtsec.h>
 #include <malloc.h>
 #include <asm/arch/fsl_serdes.h>
+#include <asm/u-boot.h>
 
 #include "../common/qixis.h"
 #include "../common/fman.h"
diff --git a/board/freescale/ls1046aqds/ls1046aqds.c b/board/freescale/ls1046aqds/ls1046aqds.c
index 3c96c900c320..cb11eb633bbc 100644
--- a/board/freescale/ls1046aqds/ls1046aqds.c
+++ b/board/freescale/ls1046aqds/ls1046aqds.c
@@ -29,6 +29,7 @@
 #include <fsl_ifc.h>
 #include <fsl_sec.h>
 #include <spl.h>
+#include <asm/u-boot.h>
 
 #include "../common/vid.h"
 #include "../common/qixis.h"
diff --git a/board/freescale/ls1046ardb/eth.c b/board/freescale/ls1046ardb/eth.c
index ddfee6217937..c0ae35c6e395 100644
--- a/board/freescale/ls1046ardb/eth.c
+++ b/board/freescale/ls1046ardb/eth.c
@@ -11,6 +11,7 @@
 #include <fsl_dtsec.h>
 #include <fsl_mdio.h>
 #include <malloc.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 
 #include "../common/fman.h"
diff --git a/board/freescale/ls1046ardb/ls1046ardb.c b/board/freescale/ls1046ardb/ls1046ardb.c
index 93ef903f2998..6a15cdfcd332 100644
--- a/board/freescale/ls1046ardb/ls1046ardb.c
+++ b/board/freescale/ls1046ardb/ls1046ardb.c
@@ -21,6 +21,7 @@
 #include <fm_eth.h>
 #include <fsl_csu.h>
 #include <fsl_esdhc.h>
+#include <asm/u-boot.h>
 #include <power/mc34vr500_pmic.h>
 #include "cpld.h"
 #include <fsl_sec.h>
diff --git a/board/freescale/ls1088a/eth_ls1088aqds.c b/board/freescale/ls1088a/eth_ls1088aqds.c
index f1cccf7d73fb..de44024173fc 100644
--- a/board/freescale/ls1088a/eth_ls1088aqds.c
+++ b/board/freescale/ls1088a/eth_ls1088aqds.c
@@ -18,6 +18,7 @@
 #include <fm_eth.h>
 #include <i2c.h>
 #include <miiphy.h>
+#include <asm/u-boot.h>
 #include <fsl-mc/fsl_mc.h>
 #include <fsl-mc/ldpaa_wriop.h>
 #include <linux/delay.h>
diff --git a/board/freescale/ls1088a/eth_ls1088ardb.c b/board/freescale/ls1088a/eth_ls1088ardb.c
index a8e9ef15dc48..5c5655e549bf 100644
--- a/board/freescale/ls1088a/eth_ls1088ardb.c
+++ b/board/freescale/ls1088a/eth_ls1088ardb.c
@@ -15,6 +15,7 @@
 #include <asm/io.h>
 #include <exports.h>
 #include <asm/arch/fsl_serdes.h>
+#include <asm/u-boot.h>
 #include <fsl-mc/fsl_mc.h>
 #include <fsl-mc/ldpaa_wriop.h>
 
diff --git a/board/freescale/ls1088a/ls1088a.c b/board/freescale/ls1088a/ls1088a.c
index 8fcd8ef7cddd..921fd985bf67 100644
--- a/board/freescale/ls1088a/ls1088a.c
+++ b/board/freescale/ls1088a/ls1088a.c
@@ -17,6 +17,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <fdt_support.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 #include <fsl-mc/fsl_mc.h>
diff --git a/board/freescale/ls2080a/ls2080a.c b/board/freescale/ls2080a/ls2080a.c
index 020e7bfcb5cc..d9c87d6840de 100644
--- a/board/freescale/ls2080a/ls2080a.c
+++ b/board/freescale/ls2080a/ls2080a.c
@@ -14,6 +14,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <fdt_support.h>
+#include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <fsl-mc/fsl_mc.h>
 #include <env_internal.h>
diff --git a/board/freescale/ls2080aqds/eth.c b/board/freescale/ls2080aqds/eth.c
index 1b8235c9a092..1a3a891f825f 100644
--- a/board/freescale/ls2080aqds/eth.c
+++ b/board/freescale/ls2080aqds/eth.c
@@ -16,6 +16,7 @@
 #include <fm_eth.h>
 #include <i2c.h>
 #include <miiphy.h>
+#include <asm/u-boot.h>
 #include <fsl-mc/fsl_mc.h>
 #include <fsl-mc/ldpaa_wriop.h>
 #include <linux/delay.h>
diff --git a/board/freescale/ls2080aqds/ls2080aqds.c b/board/freescale/ls2080aqds/ls2080aqds.c
index 87d7e5312f48..ac4388a1188a 100644
--- a/board/freescale/ls2080aqds/ls2080aqds.c
+++ b/board/freescale/ls2080aqds/ls2080aqds.c
@@ -14,6 +14,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <fdt_support.h>
+#include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <fsl-mc/fsl_mc.h>
 #include <env_internal.h>
diff --git a/board/freescale/ls2080ardb/eth_ls2080rdb.c b/board/freescale/ls2080ardb/eth_ls2080rdb.c
index 21b4c16ff27c..786a253cbd5c 100644
--- a/board/freescale/ls2080ardb/eth_ls2080rdb.c
+++ b/board/freescale/ls2080ardb/eth_ls2080rdb.c
@@ -17,6 +17,7 @@
 #include <asm/io.h>
 #include <exports.h>
 #include <asm/arch/fsl_serdes.h>
+#include <asm/u-boot.h>
 #include <fsl-mc/fsl_mc.h>
 #include <fsl-mc/ldpaa_wriop.h>
 
diff --git a/board/freescale/ls2080ardb/ls2080ardb.c b/board/freescale/ls2080ardb/ls2080ardb.c
index a6ece49c01ea..493040916381 100644
--- a/board/freescale/ls2080ardb/ls2080ardb.c
+++ b/board/freescale/ls2080ardb/ls2080ardb.c
@@ -16,6 +16,7 @@
 #include <asm/io.h>
 #include <hwconfig.h>
 #include <fdt_support.h>
+#include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <fsl-mc/fsl_mc.h>
 #include <env_internal.h>
diff --git a/board/freescale/lx2160a/eth_lx2160aqds.c b/board/freescale/lx2160a/eth_lx2160aqds.c
index b069e4fb2669..20dffcbf327a 100644
--- a/board/freescale/lx2160a/eth_lx2160aqds.c
+++ b/board/freescale/lx2160a/eth_lx2160aqds.c
@@ -21,6 +21,7 @@
 #include <asm/io.h>
 #include <exports.h>
 #include <asm/arch/fsl_serdes.h>
+#include <asm/u-boot.h>
 #include <fsl-mc/fsl_mc.h>
 #include <fsl-mc/ldpaa_wriop.h>
 #include <linux/libfdt.h>
diff --git a/board/freescale/lx2160a/eth_lx2160ardb.c b/board/freescale/lx2160a/eth_lx2160ardb.c
index 02f36f4f5f55..604922f84126 100644
--- a/board/freescale/lx2160a/eth_lx2160ardb.c
+++ b/board/freescale/lx2160a/eth_lx2160ardb.c
@@ -18,6 +18,7 @@
 #include <asm/io.h>
 #include <exports.h>
 #include <asm/arch/fsl_serdes.h>
+#include <asm/u-boot.h>
 #include <fsl-mc/fsl_mc.h>
 #include <fsl-mc/ldpaa_wriop.h>
 
diff --git a/board/freescale/lx2160a/lx2160a.c b/board/freescale/lx2160a/lx2160a.c
index 8d87b29cfde9..2133177cbe10 100644
--- a/board/freescale/lx2160a/lx2160a.c
+++ b/board/freescale/lx2160a/lx2160a.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <init.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <dm/platform_data/serial_pl01x.h>
 #include <i2c.h>
 #include <malloc.h>
diff --git a/board/freescale/m5253demo/m5253demo.c b/board/freescale/m5253demo/m5253demo.c
index 2a4703579dab..f593c31c842e 100644
--- a/board/freescale/m5253demo/m5253demo.c
+++ b/board/freescale/m5253demo/m5253demo.c
@@ -14,6 +14,7 @@
 #include <asm/immap.h>
 #include <netdev.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/mpc8308rdb/mpc8308rdb.c b/board/freescale/mpc8308rdb/mpc8308rdb.c
index db9c5ba1935e..810a39534196 100644
--- a/board/freescale/mpc8308rdb/mpc8308rdb.c
+++ b/board/freescale/mpc8308rdb/mpc8308rdb.c
@@ -10,6 +10,7 @@
 #include <init.h>
 #include <net.h>
 #include <spi.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
@@ -21,6 +22,7 @@
 #include <asm/io.h>
 #include <asm/fsl_serdes.h>
 #include <asm/fsl_mpc83xx_serdes.h>
+#include <asm/ppc.h>
 
 /*
  * The following are used to control the SPI chip selects for the SPI command.
diff --git a/board/freescale/mpc8308rdb/sdram.c b/board/freescale/mpc8308rdb/sdram.c
index 6340fd16ea9b..33feed16e05c 100644
--- a/board/freescale/mpc8308rdb/sdram.c
+++ b/board/freescale/mpc8308rdb/sdram.c
@@ -19,7 +19,7 @@
 #include <asm/bitops.h>
 #include <asm/io.h>
 
-#include <asm/processor.h>
+#include <asm/ppc.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/mpc8313erdb/mpc8313erdb.c b/board/freescale/mpc8313erdb/mpc8313erdb.c
index f309961dca87..8e820f4b2f1e 100644
--- a/board/freescale/mpc8313erdb/mpc8313erdb.c
+++ b/board/freescale/mpc8313erdb/mpc8313erdb.c
@@ -21,6 +21,8 @@
 #include <asm/gpio.h>
 #endif
 #include <asm/global_data.h>
+#include <asm/ppc.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/mpc8313erdb/sdram.c b/board/freescale/mpc8313erdb/sdram.c
index f146ae5d43c4..bd1d2f09d4f4 100644
--- a/board/freescale/mpc8313erdb/sdram.c
+++ b/board/freescale/mpc8313erdb/sdram.c
@@ -17,7 +17,7 @@
 #include <asm/bitops.h>
 #include <asm/io.h>
 
-#include <asm/processor.h>
+#include <asm/ppc.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/mpc8315erdb/mpc8315erdb.c b/board/freescale/mpc8315erdb/mpc8315erdb.c
index 795162b3c0c6..1563b6ccbb8c 100644
--- a/board/freescale/mpc8315erdb/mpc8315erdb.c
+++ b/board/freescale/mpc8315erdb/mpc8315erdb.c
@@ -12,6 +12,8 @@
 #include <init.h>
 #include <net.h>
 #include <asm/global_data.h>
+#include <asm/ppc.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
diff --git a/board/freescale/mpc8315erdb/sdram.c b/board/freescale/mpc8315erdb/sdram.c
index ffbb79aaec14..dee7fb5abbab 100644
--- a/board/freescale/mpc8315erdb/sdram.c
+++ b/board/freescale/mpc8315erdb/sdram.c
@@ -17,7 +17,7 @@
 #include <asm/bitops.h>
 #include <asm/io.h>
 
-#include <asm/processor.h>
+#include <asm/ppc.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/mpc8323erdb/mpc8323erdb.c b/board/freescale/mpc8323erdb/mpc8323erdb.c
index 977bd5120597..37f6a18dd281 100644
--- a/board/freescale/mpc8323erdb/mpc8323erdb.c
+++ b/board/freescale/mpc8323erdb/mpc8323erdb.c
@@ -20,6 +20,8 @@
 #include <miiphy.h>
 #include <command.h>
 #include <asm/global_data.h>
+#include <asm/ppc.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 #include <linux/string.h>
diff --git a/board/freescale/mpc832xemds/mpc832xemds.c b/board/freescale/mpc832xemds/mpc832xemds.c
index f34758a9470a..def1ad23b7a7 100644
--- a/board/freescale/mpc832xemds/mpc832xemds.c
+++ b/board/freescale/mpc832xemds/mpc832xemds.c
@@ -18,12 +18,14 @@
 #endif
 #include <asm/global_data.h>
 #include <asm/mmu.h>
+#include <asm/ppc.h>
 #if defined(CONFIG_OF_LIBFDT)
 #include <linux/libfdt.h>
 #endif
 #if defined(CONFIG_PQ_MDS_PIB)
 #include "../common/pq-mds-pib.h"
 #endif
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/mpc832xemds/pci.c b/board/freescale/mpc832xemds/pci.c
index 944108f6319d..79e4a5772c79 100644
--- a/board/freescale/mpc832xemds/pci.c
+++ b/board/freescale/mpc832xemds/pci.c
@@ -14,6 +14,7 @@
 #include <pci.h>
 #include <i2c.h>
 #include <asm/fsl_i2c.h>
+#include <asm/ppc.h>
 #include <linux/delay.h>
 #include "../common/pq-mds-pib.h"
 
diff --git a/board/freescale/mpc8349emds/ddr.c b/board/freescale/mpc8349emds/ddr.c
index ac5ddc6d94b8..e266c98bcef8 100644
--- a/board/freescale/mpc8349emds/ddr.c
+++ b/board/freescale/mpc8349emds/ddr.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <asm/ppc.h>
 
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
diff --git a/board/freescale/mpc8349emds/mpc8349emds.c b/board/freescale/mpc8349emds/mpc8349emds.c
index 5f38639afd42..4d06d9c05bf1 100644
--- a/board/freescale/mpc8349emds/mpc8349emds.c
+++ b/board/freescale/mpc8349emds/mpc8349emds.c
@@ -12,6 +12,7 @@
 #include <asm/bitops.h>
 #include <asm/global_data.h>
 #include <asm/mpc8349_pci.h>
+#include <asm/ppc.h>
 #include <i2c.h>
 #include <spi.h>
 #include <miiphy.h>
@@ -20,6 +21,7 @@
 #else
 #include <spd_sdram.h>
 #endif
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 
 #if defined(CONFIG_OF_LIBFDT)
diff --git a/board/freescale/mpc8349emds/pci.c b/board/freescale/mpc8349emds/pci.c
index 3ddbe717756e..c9a8ced907f4 100644
--- a/board/freescale/mpc8349emds/pci.c
+++ b/board/freescale/mpc8349emds/pci.c
@@ -6,6 +6,7 @@
 #include <init.h>
 #include <asm/mmu.h>
 #include <asm/io.h>
+#include <asm/ppc.h>
 #include <common.h>
 #include <mpc83xx.h>
 #include <pci.h>
diff --git a/board/freescale/mpc8349itx/mpc8349itx.c b/board/freescale/mpc8349itx/mpc8349itx.c
index 356b0ea2daa3..795bc9b3df43 100644
--- a/board/freescale/mpc8349itx/mpc8349itx.c
+++ b/board/freescale/mpc8349itx/mpc8349itx.c
@@ -20,9 +20,11 @@
 #include <asm/bitops.h>
 #include <asm/global_data.h>
 #include <asm/mmu.h>
+#include <asm/ppc.h>
 #if defined(CONFIG_OF_LIBFDT)
 #include <linux/libfdt.h>
 #endif
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 
diff --git a/board/freescale/mpc8349itx/pci.c b/board/freescale/mpc8349itx/pci.c
index a09b6586882f..c98772b59452 100644
--- a/board/freescale/mpc8349itx/pci.c
+++ b/board/freescale/mpc8349itx/pci.c
@@ -8,6 +8,7 @@
 #include <linux/delay.h>
 
 #include <asm/mmu.h>
+#include <asm/ppc.h>
 #include <asm/io.h>
 #include <mpc83xx.h>
 #include <pci.h>
diff --git a/board/freescale/mpc837xemds/mpc837xemds.c b/board/freescale/mpc837xemds/mpc837xemds.c
index c4233aad7411..1b843a16881f 100644
--- a/board/freescale/mpc837xemds/mpc837xemds.c
+++ b/board/freescale/mpc837xemds/mpc837xemds.c
@@ -13,8 +13,10 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/fsl_mpc83xx_serdes.h>
+#include <asm/ppc.h>
 #include <spd_sdram.h>
 #include <tsec.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
diff --git a/board/freescale/mpc837xemds/pci.c b/board/freescale/mpc837xemds/pci.c
index 3e5a64d14f0f..db22938773c5 100644
--- a/board/freescale/mpc837xemds/pci.c
+++ b/board/freescale/mpc837xemds/pci.c
@@ -14,6 +14,8 @@
 #include <fdt_support.h>
 #include <asm/fsl_i2c.h>
 #include <asm/fsl_mpc83xx_serdes.h>
+#include <asm/ppc.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 
diff --git a/board/freescale/mpc837xemds/pci.h b/board/freescale/mpc837xemds/pci.h
index a56803198889..bf56a3bf2b24 100644
--- a/board/freescale/mpc837xemds/pci.h
+++ b/board/freescale/mpc837xemds/pci.h
@@ -1,6 +1,7 @@
 #ifndef __BOARD_MPC837XEMDS_PCI_H
 #define __BOARD_MPC837XEMDS_PCI_H
 
+#include <asm/u-boot.h>
 extern void ft_pcie_fixup(void *blob, struct bd_info *bd);
 
 #endif /* __BOARD_MPC837XEMDS_PCI_H */
diff --git a/board/freescale/mpc837xerdb/mpc837xerdb.c b/board/freescale/mpc837xerdb/mpc837xerdb.c
index 81d31f19c4c1..d8c6b3464ab4 100644
--- a/board/freescale/mpc837xerdb/mpc837xerdb.c
+++ b/board/freescale/mpc837xerdb/mpc837xerdb.c
@@ -12,12 +12,14 @@
 #include <init.h>
 #include <asm/bitops.h>
 #include <asm/global_data.h>
+#include <asm/ppc.h>
 #include <asm/io.h>
 #include <asm/fsl_mpc83xx_serdes.h>
 #include <fdt_support.h>
 #include <spd_sdram.h>
 #include <vsc7385.h>
 #include <fsl_esdhc.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/mpc837xerdb/pci.c b/board/freescale/mpc837xerdb/pci.c
index dccf8c5551b0..35e825f4778b 100644
--- a/board/freescale/mpc837xerdb/pci.c
+++ b/board/freescale/mpc837xerdb/pci.c
@@ -8,6 +8,7 @@
 #include <mpc83xx.h>
 #include <pci.h>
 #include <asm/io.h>
+#include <asm/ppc.h>
 #include <linux/delay.h>
 
 static struct pci_region pci_regions[] = {
diff --git a/board/freescale/mpc8541cds/mpc8541cds.c b/board/freescale/mpc8541cds/mpc8541cds.c
index 3986d81c62d6..6f02b8e7b8fc 100644
--- a/board/freescale/mpc8541cds/mpc8541cds.c
+++ b/board/freescale/mpc8541cds/mpc8541cds.c
@@ -16,6 +16,7 @@
 #include <fsl_ddr_sdram.h>
 #include <ioports.h>
 #include <spd_sdram.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
diff --git a/board/freescale/mpc8541cds/tlb.c b/board/freescale/mpc8541cds/tlb.c
index d4ed51c54383..cde80667e9c7 100644
--- a/board/freescale/mpc8541cds/tlb.c
+++ b/board/freescale/mpc8541cds/tlb.c
@@ -6,8 +6,8 @@
  * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
  */
 
-#include <common.h>
 #include <asm/mmu.h>
+#include <asm/ppc.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/freescale/mpc8544ds/mpc8544ds.c b/board/freescale/mpc8544ds/mpc8544ds.c
index 30ed7083657f..06dc619cf932 100644
--- a/board/freescale/mpc8544ds/mpc8544ds.c
+++ b/board/freescale/mpc8544ds/mpc8544ds.c
@@ -16,6 +16,7 @@
 #include <asm/fsl_serdes.h>
 #include <asm/io.h>
 #include <miiphy.h>
+#include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <fsl_mdio.h>
diff --git a/board/freescale/mpc8544ds/tlb.c b/board/freescale/mpc8544ds/tlb.c
index 7bd462934aa5..05250d64849b 100644
--- a/board/freescale/mpc8544ds/tlb.c
+++ b/board/freescale/mpc8544ds/tlb.c
@@ -6,8 +6,8 @@
  * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
  */
 
-#include <common.h>
 #include <asm/mmu.h>
+#include <asm/ppc.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/freescale/mpc8548cds/mpc8548cds.c b/board/freescale/mpc8548cds/mpc8548cds.c
index fd51c0e8018b..941071594bd7 100644
--- a/board/freescale/mpc8548cds/mpc8548cds.c
+++ b/board/freescale/mpc8548cds/mpc8548cds.c
@@ -18,6 +18,7 @@
 #include <fsl_ddr_sdram.h>
 #include <asm/fsl_serdes.h>
 #include <miiphy.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
diff --git a/board/freescale/mpc8548cds/tlb.c b/board/freescale/mpc8548cds/tlb.c
index 8d1e5fee9365..59fea79d0ced 100644
--- a/board/freescale/mpc8548cds/tlb.c
+++ b/board/freescale/mpc8548cds/tlb.c
@@ -6,8 +6,8 @@
  * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
  */
 
-#include <common.h>
 #include <asm/mmu.h>
+#include <asm/ppc.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/freescale/mpc8555cds/mpc8555cds.c b/board/freescale/mpc8555cds/mpc8555cds.c
index d91763ae800c..d66f56996666 100644
--- a/board/freescale/mpc8555cds/mpc8555cds.c
+++ b/board/freescale/mpc8555cds/mpc8555cds.c
@@ -14,6 +14,7 @@
 #include <fsl_ddr_sdram.h>
 #include <ioports.h>
 #include <spd_sdram.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
diff --git a/board/freescale/mpc8555cds/tlb.c b/board/freescale/mpc8555cds/tlb.c
index 4a18f05af0d1..cd72f9f110d3 100644
--- a/board/freescale/mpc8555cds/tlb.c
+++ b/board/freescale/mpc8555cds/tlb.c
@@ -6,8 +6,8 @@
  * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
  */
 
-#include <common.h>
 #include <asm/mmu.h>
+#include <asm/ppc.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/freescale/mpc8568mds/mpc8568mds.c b/board/freescale/mpc8568mds/mpc8568mds.c
index 1acdf93e4d79..810bcff8b6bb 100644
--- a/board/freescale/mpc8568mds/mpc8568mds.c
+++ b/board/freescale/mpc8568mds/mpc8568mds.c
@@ -20,6 +20,7 @@
 #include <spd_sdram.h>
 #include <i2c.h>
 #include <ioports.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
diff --git a/board/freescale/mpc8568mds/tlb.c b/board/freescale/mpc8568mds/tlb.c
index fea1606a1d3f..ec22acfddf0a 100644
--- a/board/freescale/mpc8568mds/tlb.c
+++ b/board/freescale/mpc8568mds/tlb.c
@@ -6,8 +6,8 @@
  * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
  */
 
-#include <common.h>
 #include <asm/mmu.h>
+#include <asm/ppc.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/freescale/mpc8569mds/mpc8569mds.c b/board/freescale/mpc8569mds/mpc8569mds.c
index b4b75f3642a7..7f00ddc82a10 100644
--- a/board/freescale/mpc8569mds/mpc8569mds.c
+++ b/board/freescale/mpc8569mds/mpc8569mds.c
@@ -23,6 +23,7 @@
 #include <spd_sdram.h>
 #include <i2c.h>
 #include <ioports.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
diff --git a/board/freescale/mpc8569mds/tlb.c b/board/freescale/mpc8569mds/tlb.c
index fdbac5498474..21713f2f9da5 100644
--- a/board/freescale/mpc8569mds/tlb.c
+++ b/board/freescale/mpc8569mds/tlb.c
@@ -6,8 +6,8 @@
  * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
  */
 
-#include <common.h>
 #include <asm/mmu.h>
+#include <asm/ppc.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/freescale/mpc8572ds/ddr.c b/board/freescale/mpc8572ds/ddr.c
index 11ca08d1a0b9..dcce7d84581a 100644
--- a/board/freescale/mpc8572ds/ddr.c
+++ b/board/freescale/mpc8572ds/ddr.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <asm/ppc.h>
 
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
diff --git a/board/freescale/mpc8572ds/mpc8572ds.c b/board/freescale/mpc8572ds/mpc8572ds.c
index 97e73533ab4b..d81a33083595 100644
--- a/board/freescale/mpc8572ds/mpc8572ds.c
+++ b/board/freescale/mpc8572ds/mpc8572ds.c
@@ -20,6 +20,7 @@
 #include <asm/io.h>
 #include <asm/fsl_serdes.h>
 #include <miiphy.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
diff --git a/board/freescale/mpc8572ds/tlb.c b/board/freescale/mpc8572ds/tlb.c
index 99b136b04297..9558f3d1f7a2 100644
--- a/board/freescale/mpc8572ds/tlb.c
+++ b/board/freescale/mpc8572ds/tlb.c
@@ -6,8 +6,8 @@
  * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
  */
 
-#include <common.h>
 #include <asm/mmu.h>
+#include <asm/ppc.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/freescale/mpc8610hpcd/mpc8610hpcd.c b/board/freescale/mpc8610hpcd/mpc8610hpcd.c
index 74b0e45b4f82..157f850fef5e 100644
--- a/board/freescale/mpc8610hpcd/mpc8610hpcd.c
+++ b/board/freescale/mpc8610hpcd/mpc8610hpcd.c
@@ -17,6 +17,7 @@
 #include <asm/fsl_serdes.h>
 #include <i2c.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
diff --git a/board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c b/board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c
index 3e45a3390a2f..97c4623bca4f 100644
--- a/board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c
+++ b/board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c
@@ -13,6 +13,7 @@
 #include <log.h>
 #include <asm/io.h>
 #include <fsl_diu_fb.h>
+#include <asm/ppc.h>
 #include <linux/string.h>
 #include "../common/pixis.h"
 
diff --git a/board/freescale/mpc8641hpcn/ddr.c b/board/freescale/mpc8641hpcn/ddr.c
index df7e3eceed70..86031137693c 100644
--- a/board/freescale/mpc8641hpcn/ddr.c
+++ b/board/freescale/mpc8641hpcn/ddr.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <asm/ppc.h>
 
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
diff --git a/board/freescale/mpc8641hpcn/mpc8641hpcn.c b/board/freescale/mpc8641hpcn/mpc8641hpcn.c
index b30b86364d5d..c4a7a568cd17 100644
--- a/board/freescale/mpc8641hpcn/mpc8641hpcn.c
+++ b/board/freescale/mpc8641hpcn/mpc8641hpcn.c
@@ -15,6 +15,7 @@
 #include <fsl_ddr_sdram.h>
 #include <asm/fsl_serdes.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
diff --git a/board/freescale/mx23evk/mx23evk.c b/board/freescale/mx23evk/mx23evk.c
index 605cdec218a3..b25bdb386016 100644
--- a/board/freescale/mx23evk/mx23evk.c
+++ b/board/freescale/mx23evk/mx23evk.c
@@ -19,6 +19,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/iomux-mx23.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/mx25pdk/mx25pdk.c b/board/freescale/mx25pdk/mx25pdk.c
index 3b445a46dd7b..4c2f6da69c25 100644
--- a/board/freescale/mx25pdk/mx25pdk.c
+++ b/board/freescale/mx25pdk/mx25pdk.c
@@ -16,6 +16,7 @@
 #include <mmc.h>
 #include <fsl_esdhc_imx.h>
 #include <i2c.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <power/pmic.h>
 #include <fsl_pmic.h>
diff --git a/board/freescale/mx28evk/mx28evk.c b/board/freescale/mx28evk/mx28evk.c
index 21c9cb112836..72abf8739bcf 100644
--- a/board/freescale/mx28evk/mx28evk.c
+++ b/board/freescale/mx28evk/mx28evk.c
@@ -21,6 +21,7 @@
 #include <asm/arch/iomux-mx28.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/mii.h>
 #include <miiphy.h>
diff --git a/board/freescale/mx35pdk/mx35pdk.c b/board/freescale/mx35pdk/mx35pdk.c
index 4039d9f049a6..362a0391e4f9 100644
--- a/board/freescale/mx35pdk/mx35pdk.c
+++ b/board/freescale/mx35pdk/mx35pdk.c
@@ -10,6 +10,7 @@
 #include <net.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/freescale/mx51evk/mx51evk.c b/board/freescale/mx51evk/mx51evk.c
index ac48e7668c0e..f1625ebac5cd 100644
--- a/board/freescale/mx51evk/mx51evk.c
+++ b/board/freescale/mx51evk/mx51evk.c
@@ -10,6 +10,7 @@
 #include <asm/gpio.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux-mx51.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/arch/sys_proto.h>
diff --git a/board/freescale/mx53ard/mx53ard.c b/board/freescale/mx53ard/mx53ard.c
index f9ec5ca6ef35..89aa16a097b1 100644
--- a/board/freescale/mx53ard/mx53ard.c
+++ b/board/freescale/mx53ard/mx53ard.c
@@ -13,6 +13,7 @@
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/iomux-mx53.h>
+#include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <netdev.h>
 #include <mmc.h>
diff --git a/board/freescale/mx53evk/mx53evk.c b/board/freescale/mx53evk/mx53evk.c
index b006638e2c12..5567f3f01a93 100644
--- a/board/freescale/mx53evk/mx53evk.c
+++ b/board/freescale/mx53evk/mx53evk.c
@@ -12,6 +12,7 @@
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/iomux-mx53.h>
+#include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <asm/mach-imx/boot_mode.h>
 #include <netdev.h>
diff --git a/board/freescale/mx53loco/mx53loco.c b/board/freescale/mx53loco/mx53loco.c
index ee54a61d874e..7a1cebbebfd8 100644
--- a/board/freescale/mx53loco/mx53loco.c
+++ b/board/freescale/mx53loco/mx53loco.c
@@ -16,6 +16,7 @@
 #include <asm/arch/iomux-mx53.h>
 #include <asm/arch/clock.h>
 #include <env.h>
+#include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <asm/mach-imx/mx5_video.h>
 #include <netdev.h>
diff --git a/board/freescale/mx53smd/mx53smd.c b/board/freescale/mx53smd/mx53smd.c
index 2f91a0525c4b..335146604a51 100644
--- a/board/freescale/mx53smd/mx53smd.c
+++ b/board/freescale/mx53smd/mx53smd.c
@@ -12,6 +12,7 @@
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/iomux-mx53.h>
+#include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <netdev.h>
 #include <mmc.h>
diff --git a/board/freescale/mx6qarm2/mx6qarm2.c b/board/freescale/mx6qarm2/mx6qarm2.c
index c06fd643677d..03cceefb60d1 100644
--- a/board/freescale/mx6qarm2/mx6qarm2.c
+++ b/board/freescale/mx6qarm2/mx6qarm2.c
@@ -11,6 +11,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/mx6-pins.h>
 #include <asm/arch/clock.h>
+#include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
 #include <asm/mach-imx/iomux-v3.h>
diff --git a/board/freescale/mx6sabreauto/mx6sabreauto.c b/board/freescale/mx6sabreauto/mx6sabreauto.c
index f8612c82342e..98b3ab4b7656 100644
--- a/board/freescale/mx6sabreauto/mx6sabreauto.c
+++ b/board/freescale/mx6sabreauto/mx6sabreauto.c
@@ -16,6 +16,7 @@
 #include <asm/arch/iomux.h>
 #include <asm/arch/mx6-pins.h>
 #include <env.h>
+#include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
 #include <asm/mach-imx/iomux-v3.h>
diff --git a/board/freescale/mx6sabresd/mx6sabresd.c b/board/freescale/mx6sabresd/mx6sabresd.c
index 15f5b654c1b3..40423d77c4be 100644
--- a/board/freescale/mx6sabresd/mx6sabresd.c
+++ b/board/freescale/mx6sabresd/mx6sabresd.c
@@ -15,6 +15,7 @@
 #include <asm/global_data.h>
 #include <asm/mach-imx/spi.h>
 #include <env.h>
+#include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
 #include <asm/mach-imx/mxc_i2c.h>
diff --git a/board/freescale/mx6slevk/mx6slevk.c b/board/freescale/mx6slevk/mx6slevk.c
index 24086a124f06..781c5392655f 100644
--- a/board/freescale/mx6slevk/mx6slevk.c
+++ b/board/freescale/mx6slevk/mx6slevk.c
@@ -19,6 +19,7 @@
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/mach-imx/mxc_i2c.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 #include <linux/sizes.h>
 #include <common.h>
 #include <fsl_esdhc_imx.h>
diff --git a/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c b/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c
index 7340a3440231..f705505b518a 100644
--- a/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c
+++ b/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c
@@ -18,6 +18,7 @@
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/mach-imx/boot_mode.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/sizes.h>
 #include <common.h>
diff --git a/board/freescale/mx6sxsabresd/mx6sxsabresd.c b/board/freescale/mx6sxsabresd/mx6sxsabresd.c
index 57fab2386415..d8f4e915cfd4 100644
--- a/board/freescale/mx6sxsabresd/mx6sxsabresd.c
+++ b/board/freescale/mx6sxsabresd/mx6sxsabresd.c
@@ -19,6 +19,7 @@
 #include <asm/io.h>
 #include <asm/mach-imx/mxc_i2c.h>
 #include <env.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/sizes.h>
 #include <common.h>
diff --git a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
index ef2408715cf5..6805d949f17f 100644
--- a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
+++ b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
@@ -23,6 +23,7 @@
 #include <fsl_esdhc_imx.h>
 #include <i2c.h>
 #include <miiphy.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/sizes.h>
 #include <mmc.h>
diff --git a/board/freescale/mx7ulp_evk/mx7ulp_evk.c b/board/freescale/mx7ulp_evk/mx7ulp_evk.c
index 01e32136532d..1e4053edbe75 100644
--- a/board/freescale/mx7ulp_evk/mx7ulp_evk.c
+++ b/board/freescale/mx7ulp_evk/mx7ulp_evk.c
@@ -12,6 +12,7 @@
 #include <asm/arch/mx7ulp-pins.h>
 #include <asm/arch/iomux.h>
 #include <asm/mach-imx/boot_mode.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/p1010rdb/ddr.c b/board/freescale/p1010rdb/ddr.c
index 9444a39b6e85..a2133c2ad39a 100644
--- a/board/freescale/p1010rdb/ddr.c
+++ b/board/freescale/p1010rdb/ddr.c
@@ -7,8 +7,7 @@
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/mmu.h>
-#include <asm/immap_85xx.h>
-#include <asm/processor.h>
+#include <asm/ppc.h>
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
 #include <asm/io.h>
diff --git a/board/freescale/p1010rdb/p1010rdb.c b/board/freescale/p1010rdb/p1010rdb.c
index 3ffec6a02f1d..f209f72fdbe4 100644
--- a/board/freescale/p1010rdb/p1010rdb.c
+++ b/board/freescale/p1010rdb/p1010rdb.c
@@ -17,6 +17,7 @@
 #include <asm/io.h>
 #include <env.h>
 #include <miiphy.h>
+#include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <fsl_mdio.h>
diff --git a/board/freescale/p1010rdb/spl.c b/board/freescale/p1010rdb/spl.c
index 059ce8e100fd..3e35b49f3d2f 100644
--- a/board/freescale/p1010rdb/spl.c
+++ b/board/freescale/p1010rdb/spl.c
@@ -16,6 +16,7 @@
 #include <fsl_esdhc.h>
 #include <spi_flash.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 #include "../common/spl.h"
 
diff --git a/board/freescale/p1010rdb/tlb.c b/board/freescale/p1010rdb/tlb.c
index 04faefe994d0..057ab4eb9be0 100644
--- a/board/freescale/p1010rdb/tlb.c
+++ b/board/freescale/p1010rdb/tlb.c
@@ -3,8 +3,8 @@
  * Copyright 2010-2011 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
 #include <asm/mmu.h>
+#include <asm/ppc.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/freescale/p1023rdb/p1023rdb.c b/board/freescale/p1023rdb/p1023rdb.c
index bb4a39a3fa6c..c760b4c83bd8 100644
--- a/board/freescale/p1023rdb/p1023rdb.c
+++ b/board/freescale/p1023rdb/p1023rdb.c
@@ -23,6 +23,7 @@
 #include <fsl_ddr_sdram.h>
 #include <asm/fsl_portals.h>
 #include <fsl_qbman.h>
+#include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <netdev.h>
diff --git a/board/freescale/p1023rdb/tlb.c b/board/freescale/p1023rdb/tlb.c
index 9f0314d190f7..be93c2c1bf30 100644
--- a/board/freescale/p1023rdb/tlb.c
+++ b/board/freescale/p1023rdb/tlb.c
@@ -3,8 +3,8 @@
  * Copyright 2013 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
 #include <asm/mmu.h>
+#include <asm/ppc.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
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 7c703b354fad..f4ab4492536f 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
@@ -25,6 +25,7 @@
 #include <asm/fsl_lbc.h>
 #include <asm/mp.h>
 #include <miiphy.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
diff --git a/board/freescale/p1_p2_rdb_pc/spl.c b/board/freescale/p1_p2_rdb_pc/spl.c
index 46c5d15ad18b..9b687bc4c08d 100644
--- a/board/freescale/p1_p2_rdb_pc/spl.c
+++ b/board/freescale/p1_p2_rdb_pc/spl.c
@@ -17,6 +17,7 @@
 #include <fsl_esdhc.h>
 #include <spi_flash.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 #include "../common/spl.h"
 
diff --git a/board/freescale/p1_p2_rdb_pc/tlb.c b/board/freescale/p1_p2_rdb_pc/tlb.c
index 14971f0476e9..8b7ae118b3f1 100644
--- a/board/freescale/p1_p2_rdb_pc/tlb.c
+++ b/board/freescale/p1_p2_rdb_pc/tlb.c
@@ -3,8 +3,8 @@
  * Copyright 2010-2011 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
 #include <asm/mmu.h>
+#include <asm/ppc.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/freescale/p2041rdb/ddr.c b/board/freescale/p2041rdb/ddr.c
index 910058cefe16..12d58fa52b45 100644
--- a/board/freescale/p2041rdb/ddr.c
+++ b/board/freescale/p2041rdb/ddr.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <asm/global_data.h>
 #include <asm/mmu.h>
+#include <asm/ppc.h>
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
 #include <asm/fsl_law.h>
diff --git a/board/freescale/p2041rdb/eth.c b/board/freescale/p2041rdb/eth.c
index 396981605d21..a49365311201 100644
--- a/board/freescale/p2041rdb/eth.c
+++ b/board/freescale/p2041rdb/eth.c
@@ -20,6 +20,7 @@
 #include <fsl_mdio.h>
 #include <malloc.h>
 #include <fsl_dtsec.h>
+#include <asm/u-boot.h>
 
 #include "cpld.h"
 #include "../common/fman.h"
diff --git a/board/freescale/p2041rdb/p2041rdb.c b/board/freescale/p2041rdb/p2041rdb.c
index 4ece1e6ea0a4..2f8e9c12551b 100644
--- a/board/freescale/p2041rdb/p2041rdb.c
+++ b/board/freescale/p2041rdb/p2041rdb.c
@@ -11,6 +11,7 @@
 #include <init.h>
 #include <netdev.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/compiler.h>
 #include <asm/mmu.h>
 #include <asm/processor.h>
diff --git a/board/freescale/qemu-ppce500/qemu-ppce500.c b/board/freescale/qemu-ppce500/qemu-ppce500.c
index b38d03c07a3e..c99f998fbb31 100644
--- a/board/freescale/qemu-ppce500/qemu-ppce500.c
+++ b/board/freescale/qemu-ppce500/qemu-ppce500.c
@@ -17,6 +17,7 @@
 #include <asm/mmu.h>
 #include <asm/fsl_pci.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <netdev.h>
diff --git a/board/freescale/s32v234evb/s32v234evb.c b/board/freescale/s32v234evb/s32v234evb.c
index 304f5acf3be7..846a89849f02 100644
--- a/board/freescale/s32v234evb/s32v234evb.c
+++ b/board/freescale/s32v234evb/s32v234evb.c
@@ -16,6 +16,7 @@
 #include <miiphy.h>
 #include <netdev.h>
 #include <i2c.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/t102xrdb/ddr.c b/board/freescale/t102xrdb/ddr.c
index f4cdbf5b4461..3ec4a26948be 100644
--- a/board/freescale/t102xrdb/ddr.c
+++ b/board/freescale/t102xrdb/ddr.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <asm/global_data.h>
 #include <asm/mmu.h>
+#include <asm/ppc.h>
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
 #include <asm/fsl_law.h>
diff --git a/board/freescale/t102xrdb/eth_t102xrdb.c b/board/freescale/t102xrdb/eth_t102xrdb.c
index b64590f9d796..414a45f2c0a3 100644
--- a/board/freescale/t102xrdb/eth_t102xrdb.c
+++ b/board/freescale/t102xrdb/eth_t102xrdb.c
@@ -24,6 +24,7 @@
 #include <phy.h>
 #include <fsl_dtsec.h>
 #include <asm/fsl_serdes.h>
+#include <asm/u-boot.h>
 #include "../common/fman.h"
 
 int board_eth_init(struct bd_info *bis)
diff --git a/board/freescale/t102xrdb/pci.c b/board/freescale/t102xrdb/pci.c
index 45ab9223ae1f..2f1a27b42508 100644
--- a/board/freescale/t102xrdb/pci.c
+++ b/board/freescale/t102xrdb/pci.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <pci.h>
 #include <asm/fsl_pci.h>
+#include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <asm/fsl_serdes.h>
diff --git a/board/freescale/t102xrdb/spl.c b/board/freescale/t102xrdb/spl.c
index d8bfbd82791f..6596f2cfafee 100644
--- a/board/freescale/t102xrdb/spl.c
+++ b/board/freescale/t102xrdb/spl.c
@@ -15,6 +15,7 @@
 #include <fsl_esdhc.h>
 #include <spi_flash.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 #include "../common/sleep.h"
 #include "../common/spl.h"
diff --git a/board/freescale/t102xrdb/t102xrdb.c b/board/freescale/t102xrdb/t102xrdb.c
index c51555a97e21..5f98f768cc3d 100644
--- a/board/freescale/t102xrdb/t102xrdb.c
+++ b/board/freescale/t102xrdb/t102xrdb.c
@@ -13,6 +13,7 @@
 #include <init.h>
 #include <netdev.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/compiler.h>
 #include <asm/mmu.h>
 #include <asm/processor.h>
diff --git a/board/freescale/t102xrdb/t102xrdb.h b/board/freescale/t102xrdb/t102xrdb.h
index 33df0f24df8a..a567ae18dabc 100644
--- a/board/freescale/t102xrdb/t102xrdb.h
+++ b/board/freescale/t102xrdb/t102xrdb.h
@@ -6,6 +6,7 @@
 #ifndef __T1024_RDB_H__
 #define __T1024_RDB_H__
 
+#include <asm/u-boot.h>
 void fdt_fixup_board_enet(void *blob);
 void pci_of_setup(void *blob, struct bd_info *bd);
 #ifdef CONFIG_TARGET_T1023RDB
diff --git a/board/freescale/t102xrdb/tlb.c b/board/freescale/t102xrdb/tlb.c
index 97080eb95e59..404033feeb17 100644
--- a/board/freescale/t102xrdb/tlb.c
+++ b/board/freescale/t102xrdb/tlb.c
@@ -3,8 +3,8 @@
  * Copyright 2014 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
 #include <asm/mmu.h>
+#include <asm/ppc.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/freescale/t104xrdb/ddr.c b/board/freescale/t104xrdb/ddr.c
index 8351f7ce9db2..7d02596a24d1 100644
--- a/board/freescale/t104xrdb/ddr.c
+++ b/board/freescale/t104xrdb/ddr.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <asm/global_data.h>
 #include <asm/mmu.h>
+#include <asm/ppc.h>
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
 #include <asm/fsl_law.h>
diff --git a/board/freescale/t104xrdb/eth.c b/board/freescale/t104xrdb/eth.c
index 8e2f03587404..a554083470e9 100644
--- a/board/freescale/t104xrdb/eth.c
+++ b/board/freescale/t104xrdb/eth.c
@@ -13,6 +13,7 @@
 #include <malloc.h>
 #include <fsl_dtsec.h>
 #include <vsc9953.h>
+#include <asm/u-boot.h>
 
 #include "../common/fman.h"
 
diff --git a/board/freescale/t104xrdb/pci.c b/board/freescale/t104xrdb/pci.c
index 1fd24027000f..787d03e10787 100644
--- a/board/freescale/t104xrdb/pci.c
+++ b/board/freescale/t104xrdb/pci.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <pci.h>
 #include <asm/fsl_pci.h>
+#include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <asm/fsl_serdes.h>
diff --git a/board/freescale/t104xrdb/spl.c b/board/freescale/t104xrdb/spl.c
index 2e29b3995d8b..6551b2248eff 100644
--- a/board/freescale/t104xrdb/spl.c
+++ b/board/freescale/t104xrdb/spl.c
@@ -15,6 +15,7 @@
 #include <fsl_esdhc.h>
 #include <spi_flash.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 #include "../common/sleep.h"
 #include "../common/spl.h"
diff --git a/board/freescale/t104xrdb/t104xrdb.c b/board/freescale/t104xrdb/t104xrdb.c
index 780043483dff..fc4964783977 100644
--- a/board/freescale/t104xrdb/t104xrdb.c
+++ b/board/freescale/t104xrdb/t104xrdb.c
@@ -13,6 +13,7 @@
 #include <log.h>
 #include <netdev.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/compiler.h>
 #include <asm/mmu.h>
 #include <asm/processor.h>
diff --git a/board/freescale/t104xrdb/t104xrdb.h b/board/freescale/t104xrdb/t104xrdb.h
index 678724c7e2b1..8b009f833799 100644
--- a/board/freescale/t104xrdb/t104xrdb.h
+++ b/board/freescale/t104xrdb/t104xrdb.h
@@ -6,6 +6,7 @@
 #ifndef __T104x_RDB_H__
 #define __T104x_RDB_H__
 
+#include <asm/u-boot.h>
 void fdt_fixup_board_enet(void *blob);
 void pci_of_setup(void *blob, struct bd_info *bd);
 
diff --git a/board/freescale/t104xrdb/tlb.c b/board/freescale/t104xrdb/tlb.c
index 9dcba7933ff9..9661a8645852 100644
--- a/board/freescale/t104xrdb/tlb.c
+++ b/board/freescale/t104xrdb/tlb.c
@@ -3,8 +3,8 @@
  * Copyright 2013 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
 #include <asm/mmu.h>
+#include <asm/ppc.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/freescale/t208xqds/ddr.c b/board/freescale/t208xqds/ddr.c
index 56471b3988b9..336c6e7d0da1 100644
--- a/board/freescale/t208xqds/ddr.c
+++ b/board/freescale/t208xqds/ddr.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <asm/global_data.h>
 #include <asm/mmu.h>
+#include <asm/ppc.h>
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
 #include <asm/fsl_law.h>
diff --git a/board/freescale/t208xqds/eth_t208xqds.c b/board/freescale/t208xqds/eth_t208xqds.c
index e110f3babf18..61dc408c5b17 100644
--- a/board/freescale/t208xqds/eth_t208xqds.c
+++ b/board/freescale/t208xqds/eth_t208xqds.c
@@ -27,6 +27,7 @@
 #include <fsl_dtsec.h>
 #include <asm/fsl_serdes.h>
 #include <hwconfig.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 #include "../common/qixis.h"
 #include "../common/fman.h"
diff --git a/board/freescale/t208xqds/pci.c b/board/freescale/t208xqds/pci.c
index a03b11ccb503..46f558f5cfe7 100644
--- a/board/freescale/t208xqds/pci.c
+++ b/board/freescale/t208xqds/pci.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <pci.h>
 #include <asm/fsl_pci.h>
+#include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <asm/fsl_serdes.h>
diff --git a/board/freescale/t208xqds/spl.c b/board/freescale/t208xqds/spl.c
index 4345c29c3b17..bf1b049af7f6 100644
--- a/board/freescale/t208xqds/spl.c
+++ b/board/freescale/t208xqds/spl.c
@@ -15,6 +15,7 @@
 #include <fsl_esdhc.h>
 #include <spi_flash.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 #include "../common/qixis.h"
 #include "t208xqds_qixis.h"
diff --git a/board/freescale/t208xqds/t208xqds.c b/board/freescale/t208xqds/t208xqds.c
index dedf722c6957..a0ead05e37d4 100644
--- a/board/freescale/t208xqds/t208xqds.c
+++ b/board/freescale/t208xqds/t208xqds.c
@@ -14,6 +14,7 @@
 #include <log.h>
 #include <netdev.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/compiler.h>
 #include <asm/mmu.h>
 #include <asm/processor.h>
diff --git a/board/freescale/t208xqds/t208xqds.h b/board/freescale/t208xqds/t208xqds.h
index 50ebb6f6f988..8a77206b0dfe 100644
--- a/board/freescale/t208xqds/t208xqds.h
+++ b/board/freescale/t208xqds/t208xqds.h
@@ -6,6 +6,7 @@
 #ifndef __CORENET_DS_H__
 #define __CORENET_DS_H__
 
+#include <asm/u-boot.h>
 void fdt_fixup_board_enet(void *blob);
 void pci_of_setup(void *blob, struct bd_info *bd);
 
diff --git a/board/freescale/t208xqds/tlb.c b/board/freescale/t208xqds/tlb.c
index 1e501da363d4..884315373e1a 100644
--- a/board/freescale/t208xqds/tlb.c
+++ b/board/freescale/t208xqds/tlb.c
@@ -6,8 +6,8 @@
  * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
  */
 
-#include <common.h>
 #include <asm/mmu.h>
+#include <asm/ppc.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/freescale/t208xrdb/cpld.c b/board/freescale/t208xrdb/cpld.c
index 81e220ff1149..cf39623b7ae0 100644
--- a/board/freescale/t208xrdb/cpld.c
+++ b/board/freescale/t208xrdb/cpld.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <asm/io.h>
 #include <linux/string.h>
 #include "cpld.h"
 
diff --git a/board/freescale/t208xrdb/ddr.c b/board/freescale/t208xrdb/ddr.c
index 1fbab36e1a20..aeb51d28737d 100644
--- a/board/freescale/t208xrdb/ddr.c
+++ b/board/freescale/t208xrdb/ddr.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <asm/global_data.h>
 #include <asm/mmu.h>
+#include <asm/ppc.h>
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
 #include <asm/fsl_law.h>
diff --git a/board/freescale/t208xrdb/eth_t208xrdb.c b/board/freescale/t208xrdb/eth_t208xrdb.c
index c16538850cd0..de997db78f74 100644
--- a/board/freescale/t208xrdb/eth_t208xrdb.c
+++ b/board/freescale/t208xrdb/eth_t208xrdb.c
@@ -24,6 +24,7 @@
 #include <phy.h>
 #include <fsl_dtsec.h>
 #include <asm/fsl_serdes.h>
+#include <asm/u-boot.h>
 
 int board_eth_init(struct bd_info *bis)
 {
diff --git a/board/freescale/t208xrdb/pci.c b/board/freescale/t208xrdb/pci.c
index 45ab9223ae1f..2f1a27b42508 100644
--- a/board/freescale/t208xrdb/pci.c
+++ b/board/freescale/t208xrdb/pci.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <pci.h>
 #include <asm/fsl_pci.h>
+#include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <asm/fsl_serdes.h>
diff --git a/board/freescale/t208xrdb/spl.c b/board/freescale/t208xrdb/spl.c
index a9bf5fb64663..234fd145e7dd 100644
--- a/board/freescale/t208xrdb/spl.c
+++ b/board/freescale/t208xrdb/spl.c
@@ -15,6 +15,7 @@
 #include <fsl_esdhc.h>
 #include <spi_flash.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 #include "../common/spl.h"
 
diff --git a/board/freescale/t208xrdb/t208xrdb.c b/board/freescale/t208xrdb/t208xrdb.c
index a18459841c62..e09f0efdda62 100644
--- a/board/freescale/t208xrdb/t208xrdb.c
+++ b/board/freescale/t208xrdb/t208xrdb.c
@@ -12,6 +12,7 @@
 #include <init.h>
 #include <netdev.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/compiler.h>
 #include <asm/mmu.h>
 #include <asm/processor.h>
diff --git a/board/freescale/t208xrdb/t208xrdb.h b/board/freescale/t208xrdb/t208xrdb.h
index 22a496fb8cf2..b830fe86c9b6 100644
--- a/board/freescale/t208xrdb/t208xrdb.h
+++ b/board/freescale/t208xrdb/t208xrdb.h
@@ -6,6 +6,7 @@
 #ifndef __CORENET_DS_H__
 #define __CORENET_DS_H__
 
+#include <asm/u-boot.h>
 void fdt_fixup_board_enet(void *blob);
 void pci_of_setup(void *blob, struct bd_info *bd);
 
diff --git a/board/freescale/t208xrdb/tlb.c b/board/freescale/t208xrdb/tlb.c
index 542ab1e034f3..2cfe3b8ec9cc 100644
--- a/board/freescale/t208xrdb/tlb.c
+++ b/board/freescale/t208xrdb/tlb.c
@@ -6,8 +6,8 @@
  * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
  */
 
-#include <common.h>
 #include <asm/mmu.h>
+#include <asm/ppc.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/freescale/t4rdb/ddr.c b/board/freescale/t4rdb/ddr.c
index 57cbde154f0e..60d3c54437a5 100644
--- a/board/freescale/t4rdb/ddr.c
+++ b/board/freescale/t4rdb/ddr.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <asm/global_data.h>
 #include <asm/mmu.h>
+#include <asm/ppc.h>
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
 #include <asm/fsl_law.h>
diff --git a/board/freescale/t4rdb/eth.c b/board/freescale/t4rdb/eth.c
index c815a3a4fa52..a81b3be878bc 100644
--- a/board/freescale/t4rdb/eth.c
+++ b/board/freescale/t4rdb/eth.c
@@ -27,6 +27,7 @@
 #include <fsl_dtsec.h>
 #include <asm/fsl_serdes.h>
 #include <hwconfig.h>
+#include <asm/u-boot.h>
 
 #include "../common/fman.h"
 #include "t4rdb.h"
diff --git a/board/freescale/t4rdb/pci.c b/board/freescale/t4rdb/pci.c
index c2bc05164dd1..14dacb7e3c91 100644
--- a/board/freescale/t4rdb/pci.c
+++ b/board/freescale/t4rdb/pci.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <pci.h>
 #include <asm/fsl_pci.h>
+#include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <asm/fsl_serdes.h>
diff --git a/board/freescale/t4rdb/spl.c b/board/freescale/t4rdb/spl.c
index 797631199686..186327a3cde1 100644
--- a/board/freescale/t4rdb/spl.c
+++ b/board/freescale/t4rdb/spl.c
@@ -18,6 +18,7 @@
 #include <mmc.h>
 #include <fsl_esdhc.h>
 #include <i2c.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 
 #include "t4rdb.h"
diff --git a/board/freescale/t4rdb/t4240rdb.c b/board/freescale/t4rdb/t4240rdb.c
index 6ab35ca9185b..bee6d42c83dd 100644
--- a/board/freescale/t4rdb/t4240rdb.c
+++ b/board/freescale/t4rdb/t4240rdb.c
@@ -12,6 +12,7 @@
 #include <init.h>
 #include <netdev.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/compiler.h>
 #include <asm/mmu.h>
 #include <asm/processor.h>
diff --git a/board/freescale/t4rdb/t4rdb.h b/board/freescale/t4rdb/t4rdb.h
index 3f1fa7bbd24e..0bb1b9cca1f0 100644
--- a/board/freescale/t4rdb/t4rdb.h
+++ b/board/freescale/t4rdb/t4rdb.h
@@ -6,6 +6,7 @@
 #ifndef __T4RDB_H__
 #define __T4RDB_H__
 
+#include <asm/u-boot.h>
 #undef CONFIG_SYS_NUM_FM1_DTSEC
 #undef CONFIG_SYS_NUM_FM2_DTSEC
 #define CONFIG_SYS_NUM_FM1_DTSEC	4
diff --git a/board/freescale/t4rdb/tlb.c b/board/freescale/t4rdb/tlb.c
index b927dd8484f8..bd27201140ac 100644
--- a/board/freescale/t4rdb/tlb.c
+++ b/board/freescale/t4rdb/tlb.c
@@ -3,8 +3,8 @@
  * Copyright 2014 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
 #include <asm/mmu.h>
+#include <asm/ppc.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/freescale/vf610twr/vf610twr.c b/board/freescale/vf610twr/vf610twr.c
index 98cb0140ad02..3641e5fb92f0 100644
--- a/board/freescale/vf610twr/vf610twr.c
+++ b/board/freescale/vf610twr/vf610twr.c
@@ -17,6 +17,7 @@
 #include <miiphy.h>
 #include <netdev.h>
 #include <i2c.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/gateworks/gw_ventana/common.c b/board/gateworks/gw_ventana/common.c
index 14f45bf07da8..ec42d5aa093f 100644
--- a/board/gateworks/gw_ventana/common.c
+++ b/board/gateworks/gw_ventana/common.c
@@ -15,6 +15,7 @@
 #include <env.h>
 #include <fsl_esdhc_imx.h>
 #include <hwconfig.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <power/pmic.h>
 #include <power/ltc3676_pmic.h>
diff --git a/board/gateworks/gw_ventana/gw_ventana.c b/board/gateworks/gw_ventana/gw_ventana.c
index b0cfd2e931a1..84de3c3bb0f7 100644
--- a/board/gateworks/gw_ventana/gw_ventana.c
+++ b/board/gateworks/gw_ventana/gw_ventana.c
@@ -24,6 +24,7 @@
 #include <asm/io.h>
 #include <asm/setup.h>
 #include <dm.h>
+#include <asm/u-boot.h>
 #include <dm/platform_data/serial_mxc.h>
 #include <env.h>
 #include <hwconfig.h>
diff --git a/board/gdsys/common/ioep-fpga.c b/board/gdsys/common/ioep-fpga.c
index 9c01661dc32a..c758c8a885d0 100644
--- a/board/gdsys/common/ioep-fpga.c
+++ b/board/gdsys/common/ioep-fpga.c
@@ -7,7 +7,7 @@
 #ifdef CONFIG_GDSYS_LEGACY_DRIVERS
 
 #include <common.h>
-
+#include <string.h>
 #include <gdsys_fpga.h>
 #include <linux/bitops.h>
 
diff --git a/board/gdsys/mpc8308/gazerbeam.c b/board/gdsys/mpc8308/gazerbeam.c
index 68a9595511c9..9891baa11262 100644
--- a/board/gdsys/mpc8308/gazerbeam.c
+++ b/board/gdsys/mpc8308/gazerbeam.c
@@ -18,6 +18,7 @@
 #include <tpm-v1.h>
 #include <video_osd.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 
 #include "../common/ihs_mdio.h"
 #include "../../../drivers/board/gazerbeam.h"
diff --git a/board/gdsys/mpc8308/hrcon.c b/board/gdsys/mpc8308/hrcon.c
index 446a756fbbef..64ac8f5e8eb0 100644
--- a/board/gdsys/mpc8308/hrcon.c
+++ b/board/gdsys/mpc8308/hrcon.c
@@ -11,6 +11,7 @@
 #include <i2c.h>
 #include <init.h>
 #include <spi.h>
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
@@ -21,6 +22,7 @@
 #include <asm/io.h>
 #include <asm/fsl_serdes.h>
 #include <asm/fsl_mpc83xx_serdes.h>
+#include <asm/ppc.h>
 #include <linux/string.h>
 
 #include "mpc8308.h"
diff --git a/board/gdsys/mpc8308/mpc8308.c b/board/gdsys/mpc8308/mpc8308.c
index 0f90f8ad327b..d2401d09b14f 100644
--- a/board/gdsys/mpc8308/mpc8308.c
+++ b/board/gdsys/mpc8308/mpc8308.c
@@ -7,7 +7,7 @@
 #include <common.h>
 #include <command.h>
 #include <init.h>
-#include <asm/processor.h>
+#include <asm/ppc.h>
 #include <asm/io.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
diff --git a/board/gdsys/mpc8308/sdram.c b/board/gdsys/mpc8308/sdram.c
index bfd55f54e4e1..64979828adbc 100644
--- a/board/gdsys/mpc8308/sdram.c
+++ b/board/gdsys/mpc8308/sdram.c
@@ -22,7 +22,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 
-#include <asm/processor.h>
+#include <asm/ppc.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/gdsys/mpc8308/strider.c b/board/gdsys/mpc8308/strider.c
index 983d2847614f..d7d51f23829c 100644
--- a/board/gdsys/mpc8308/strider.c
+++ b/board/gdsys/mpc8308/strider.c
@@ -11,6 +11,7 @@
 #include <i2c.h>
 #include <init.h>
 #include <spi.h>
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
@@ -21,6 +22,7 @@
 #include <asm/io.h>
 #include <asm/fsl_serdes.h>
 #include <asm/fsl_mpc83xx_serdes.h>
+#include <asm/ppc.h>
 #include <linux/string.h>
 
 #include "mpc8308.h"
diff --git a/board/gdsys/p1022/controlcenterd.c b/board/gdsys/p1022/controlcenterd.c
index d31cba3d06ef..0348b7100758 100644
--- a/board/gdsys/p1022/controlcenterd.c
+++ b/board/gdsys/p1022/controlcenterd.c
@@ -36,6 +36,7 @@
 #include <fsl_ddr_sdram.h>
 #include <asm/fsl_serdes.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
diff --git a/board/gdsys/p1022/diu.c b/board/gdsys/p1022/diu.c
index 9a5d3c11e14c..5dcb80873bda 100644
--- a/board/gdsys/p1022/diu.c
+++ b/board/gdsys/p1022/diu.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <linux/ctype.h>
 #include <asm/io.h>
+#include <asm/ppc.h>
 #include <stdio_dev.h>
 #include <video_fb.h>
 #include <fsl_diu_fb.h>
diff --git a/board/gdsys/p1022/tlb.c b/board/gdsys/p1022/tlb.c
index 00139ac5e39c..10074d0df2f0 100644
--- a/board/gdsys/p1022/tlb.c
+++ b/board/gdsys/p1022/tlb.c
@@ -5,8 +5,8 @@
  *          Timur Tabi <timur@freescale.com>
  */
 
-#include <common.h>
 #include <asm/mmu.h>
+#include <asm/ppc.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/ge/bx50v3/bx50v3.c b/board/ge/bx50v3/bx50v3.c
index 3876b25420bb..8df982450c22 100644
--- a/board/ge/bx50v3/bx50v3.c
+++ b/board/ge/bx50v3/bx50v3.c
@@ -13,6 +13,7 @@
 #include <asm/arch/mx6-pins.h>
 #include <env.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/libfdt.h>
diff --git a/board/ge/mx53ppd/mx53ppd.c b/board/ge/mx53ppd/mx53ppd.c
index 7018b29d5acc..02d17952d589 100644
--- a/board/ge/mx53ppd/mx53ppd.c
+++ b/board/ge/mx53ppd/mx53ppd.c
@@ -19,6 +19,7 @@
 #include <asm/arch/iomux-mx53.h>
 #include <asm/arch/clock.h>
 #include <env.h>
+#include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <asm/mach-imx/mxc_i2c.h>
diff --git a/board/google/imx8mq_phanbell/spl.c b/board/google/imx8mq_phanbell/spl.c
index fd5d745118c5..aee71acc98e9 100644
--- a/board/google/imx8mq_phanbell/spl.c
+++ b/board/google/imx8mq_phanbell/spl.c
@@ -20,6 +20,7 @@
 #include <asm/mach-imx/gpio.h>
 #include <asm/mach-imx/mxc_i2c.h>
 #include <asm/sections.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <fsl_esdhc_imx.h>
 #include <mmc.h>
diff --git a/board/grinn/liteboard/board.c b/board/grinn/liteboard/board.c
index 46c7138b303b..0617e7978c9f 100644
--- a/board/grinn/liteboard/board.c
+++ b/board/grinn/liteboard/board.c
@@ -23,6 +23,7 @@
 #include <common.h>
 #include <env.h>
 #include <fsl_esdhc_imx.h>
+#include <asm/u-boot.h>
 #include <linux/sizes.h>
 #include <linux/fb.h>
 #include <miiphy.h>
diff --git a/board/highbank/highbank.c b/board/highbank/highbank.c
index a790d453da04..1a47a8457372 100644
--- a/board/highbank/highbank.c
+++ b/board/highbank/highbank.c
@@ -13,6 +13,7 @@
 #include <netdev.h>
 #include <scsi.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 
 #include <linux/sizes.h>
 #include <asm/io.h>
diff --git a/board/hisilicon/hikey/hikey.c b/board/hisilicon/hikey/hikey.c
index 5a858dec64e4..0c6cdb5c9cfe 100644
--- a/board/hisilicon/hikey/hikey.c
+++ b/board/hisilicon/hikey/hikey.c
@@ -10,6 +10,7 @@
 #include <init.h>
 #include <log.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <dm/platform_data/serial_pl01x.h>
 #include <errno.h>
 #include <malloc.h>
diff --git a/board/ids/ids8313/ids8313.c b/board/ids/ids8313/ids8313.c
index 45c77a249a9b..2945d676bb38 100644
--- a/board/ids/ids8313/ids8313.c
+++ b/board/ids/ids8313/ids8313.c
@@ -18,6 +18,8 @@
 #include <spi.h>
 #include <asm/bitops.h>
 #include <asm/global_data.h>
+#include <asm/ppc.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 
diff --git a/board/imgtec/boston/dt.c b/board/imgtec/boston/dt.c
index bf772ff5dec4..1d7a95073abe 100644
--- a/board/imgtec/boston/dt.c
+++ b/board/imgtec/boston/dt.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <fdt_support.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 
 int ft_board_setup(void *blob, struct bd_info *bd)
 {
diff --git a/board/imgtec/ci20/ci20.c b/board/imgtec/ci20/ci20.c
index 7ee175d40a5b..8f45ff89e5f4 100644
--- a/board/imgtec/ci20/ci20.c
+++ b/board/imgtec/ci20/ci20.c
@@ -14,6 +14,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <mach/jz4780.h>
diff --git a/board/imgtec/malta/malta.c b/board/imgtec/malta/malta.c
index 4a6fd7857310..0a6ab37e12de 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 <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 
diff --git a/board/inversepath/usbarmory/usbarmory.c b/board/inversepath/usbarmory/usbarmory.c
index 086d0522c78a..2ad772c225f9 100644
--- a/board/inversepath/usbarmory/usbarmory.c
+++ b/board/inversepath/usbarmory/usbarmory.c
@@ -18,6 +18,7 @@
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/iomux-mx53.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <i2c.h>
diff --git a/board/isee/igep003x/board.c b/board/isee/igep003x/board.c
index 02ae7df04db9..8844bb427200 100644
--- a/board/isee/igep003x/board.c
+++ b/board/isee/igep003x/board.c
@@ -30,6 +30,7 @@
 #include <cpsw.h>
 #include <fdt_support.h>
 #include <mtd_node.h>
+#include <asm/u-boot.h>
 #include <jffs2/load_kernel.h>
 #include "board.h"
 
diff --git a/board/isee/igep00x0/common.c b/board/isee/igep00x0/common.c
index 3fdf83e845c9..e4ea96f076ea 100644
--- a/board/isee/igep00x0/common.c
+++ b/board/isee/igep00x0/common.c
@@ -7,6 +7,7 @@
 #include <asm/omap_mmc.h>
 #include <asm/arch/mux.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/u-boot.h>
 #include <jffs2/load_kernel.h>
 #include <linux/delay.h>
 #include <linux/mtd/rawnand.h>
diff --git a/board/isee/igep00x0/igep00x0.c b/board/isee/igep00x0/igep00x0.c
index 836a3f91957b..098ef3f96646 100644
--- a/board/isee/igep00x0/igep00x0.c
+++ b/board/isee/igep00x0/igep00x0.c
@@ -20,6 +20,7 @@
 #include <asm/arch/mmc_host_def.h>
 #include <asm/arch/mux.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/rawnand.h>
diff --git a/board/keymile/common/common.c b/board/keymile/common/common.c
index 4f64a1805f77..bada40e1e628 100644
--- a/board/keymile/common/common.c
+++ b/board/keymile/common/common.c
@@ -17,6 +17,7 @@
 #include <netdev.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 #include <linux/ctype.h>
 #include <linux/delay.h>
 #include <linux/string.h>
diff --git a/board/keymile/common/qrio.c b/board/keymile/common/qrio.c
index 06a4e67881f9..b3b9c0691524 100644
--- a/board/keymile/common/qrio.c
+++ b/board/keymile/common/qrio.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <asm/ppc.h>
 #include <linux/bitops.h>
 
 #include "common.h"
diff --git a/board/keymile/km83xx/km83xx.c b/board/keymile/km83xx/km83xx.c
index 1e5c33b5fd56..040638934121 100644
--- a/board/keymile/km83xx/km83xx.c
+++ b/board/keymile/km83xx/km83xx.c
@@ -25,8 +25,9 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/mmu.h>
-#include <asm/processor.h>
+#include <asm/ppc.h>
 #include <pci.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 #include <post.h>
diff --git a/board/keymile/km83xx/km83xx_i2c.c b/board/keymile/km83xx/km83xx_i2c.c
index 62100b19492d..104e30875d74 100644
--- a/board/keymile/km83xx/km83xx_i2c.c
+++ b/board/keymile/km83xx/km83xx_i2c.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <i2c.h>
+#include <asm/fsl_i2c.h>
 #include <asm/io.h>
 #include <linux/ctype.h>
 #include <linux/delay.h>
diff --git a/board/keymile/kmp204x/eth.c b/board/keymile/kmp204x/eth.c
index 29c5b339ae8c..0cac3ecdad3c 100644
--- a/board/keymile/kmp204x/eth.c
+++ b/board/keymile/kmp204x/eth.c
@@ -10,6 +10,7 @@
 #include <fm_eth.h>
 #include <fsl_mdio.h>
 #include <phy.h>
+#include <asm/u-boot.h>
 
 int board_eth_init(struct bd_info *bis)
 {
diff --git a/board/keymile/kmp204x/kmp204x.c b/board/keymile/kmp204x/kmp204x.c
index 29dde7a8024c..1d491bda92f7 100644
--- a/board/keymile/kmp204x/kmp204x.c
+++ b/board/keymile/kmp204x/kmp204x.c
@@ -13,6 +13,7 @@
 #include <image.h>
 #include <init.h>
 #include <netdev.h>
+#include <asm/u-boot.h>
 #include <linux/compiler.h>
 #include <asm/mmu.h>
 #include <asm/processor.h>
diff --git a/board/keymile/kmp204x/kmp204x.h b/board/keymile/kmp204x/kmp204x.h
index 3b858a557117..077954faebbc 100644
--- a/board/keymile/kmp204x/kmp204x.h
+++ b/board/keymile/kmp204x/kmp204x.h
@@ -5,4 +5,5 @@
  */
 
 
+#include <asm/u-boot.h>
 void pci_of_setup(void *blob, struct bd_info *bd);
diff --git a/board/keymile/kmp204x/pci.c b/board/keymile/kmp204x/pci.c
index cdb498da03b0..bfc853a2e824 100644
--- a/board/keymile/kmp204x/pci.c
+++ b/board/keymile/kmp204x/pci.c
@@ -11,6 +11,7 @@
 #include <init.h>
 #include <pci.h>
 #include <asm/fsl_pci.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
diff --git a/board/keymile/kmp204x/tlb.c b/board/keymile/kmp204x/tlb.c
index a268bd8e959c..ac9c9fb9021c 100644
--- a/board/keymile/kmp204x/tlb.c
+++ b/board/keymile/kmp204x/tlb.c
@@ -9,8 +9,8 @@
  * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
  */
 
-#include <common.h>
 #include <asm/mmu.h>
+#include <asm/ppc.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/kmc/kzm9g/kzm9g.c b/board/kmc/kzm9g/kzm9g.c
index 02c87a031c30..5b0c198940aa 100644
--- a/board/kmc/kzm9g/kzm9g.c
+++ b/board/kmc/kzm9g/kzm9g.c
@@ -14,6 +14,7 @@
 #include <asm/gpio.h>
 #include <netdev.h>
 #include <i2c.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/kobol/helios4/helios4.c b/board/kobol/helios4/helios4.c
index adb091ce4fd3..79cd4a4bc1f7 100644
--- a/board/kobol/helios4/helios4.c
+++ b/board/kobol/helios4/helios4.c
@@ -14,6 +14,7 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <asm/u-boot.h>
 
 #include "../drivers/ddr/marvell/a38x/ddr3_init.h"
 #include <../serdes/a38x/high_speed_env_spec.h>
diff --git a/board/kosagi/novena/novena_spl.c b/board/kosagi/novena/novena_spl.c
index 3d22f2019e99..eddea6e29159 100644
--- a/board/kosagi/novena/novena_spl.c
+++ b/board/kosagi/novena/novena_spl.c
@@ -23,6 +23,7 @@
 #include <mmc.h>
 #include <fsl_esdhc_imx.h>
 #include <spl.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 
 #include <asm/arch/mx6-ddr.h>
diff --git a/board/l+g/vinco/vinco.c b/board/l+g/vinco/vinco.c
index f221f05261ae..9f8533faa9ee 100644
--- a/board/l+g/vinco/vinco.c
+++ b/board/l+g/vinco/vinco.c
@@ -31,6 +31,7 @@
 #include <nand.h>
 #include <spi.h>
 #include <version.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/laird/wb45n/wb45n.c b/board/laird/wb45n/wb45n.c
index 5e1ef8a49ac4..fa96682625ac 100644
--- a/board/laird/wb45n/wb45n.c
+++ b/board/laird/wb45n/wb45n.c
@@ -14,6 +14,7 @@
 #include <asm/arch/gpio.h>
 #include <net.h>
 #include <netdev.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/laird/wb50n/wb50n.c b/board/laird/wb50n/wb50n.c
index f1a7555ac9c9..13ac53ab21a8 100644
--- a/board/laird/wb50n/wb50n.c
+++ b/board/laird/wb50n/wb50n.c
@@ -20,6 +20,7 @@
 #include <spl.h>
 #include <asm/arch/atmel_mpddrc.h>
 #include <asm/arch/at91_wdt.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/lg/sniper/sniper.c b/board/lg/sniper/sniper.c
index 15c088d73486..3de18af2a1da 100644
--- a/board/lg/sniper/sniper.c
+++ b/board/lg/sniper/sniper.c
@@ -11,6 +11,7 @@
 #include <env.h>
 #include <init.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/ctype.h>
 #include <linux/usb/musb.h>
 #include <asm/omap_musb.h>
diff --git a/board/liebherr/display5/display5.c b/board/liebherr/display5/display5.c
index 7a061595f25f..f98a92ad9cf4 100644
--- a/board/liebherr/display5/display5.c
+++ b/board/liebherr/display5/display5.c
@@ -26,6 +26,7 @@
 #include <miiphy.h>
 #include <netdev.h>
 #include <i2c.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 
diff --git a/board/liebherr/display5/spl.c b/board/liebherr/display5/spl.c
index a48eba58f9db..b910b3fbf0e5 100644
--- a/board/liebherr/display5/spl.c
+++ b/board/liebherr/display5/spl.c
@@ -13,6 +13,7 @@
 #include <serial.h>
 #include <spl.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 #include <asm/io.h>
diff --git a/board/liebherr/mccmon6/spl.c b/board/liebherr/mccmon6/spl.c
index 1153a7e19f85..69cf7def1f67 100644
--- a/board/liebherr/mccmon6/spl.c
+++ b/board/liebherr/mccmon6/spl.c
@@ -22,6 +22,7 @@
 #include <asm/arch/sys_proto.h>
 #include <serial.h>
 #include <spl.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 
diff --git a/board/liebherr/xea/xea.c b/board/liebherr/xea/xea.c
index cd11b0ada77c..eee2e00b78ec 100644
--- a/board/liebherr/xea/xea.c
+++ b/board/liebherr/xea/xea.c
@@ -25,6 +25,7 @@
 #include <asm/arch/iomux-mx28.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/mii.h>
 #include <miiphy.h>
diff --git a/board/logicpd/am3517evm/am3517evm.c b/board/logicpd/am3517evm/am3517evm.c
index f0141659282a..e0e578685462 100644
--- a/board/logicpd/am3517evm/am3517evm.c
+++ b/board/logicpd/am3517evm/am3517evm.c
@@ -26,6 +26,7 @@
 #include <asm/arch/mmc_host_def.h>
 #include <asm/arch/musb.h>
 #include <asm/mach-types.h>
+#include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
 #include <linux/usb/ch9.h>
diff --git a/board/menlo/m53menlo/m53menlo.c b/board/menlo/m53menlo/m53menlo.c
index eee12ccdc684..4c7fd84e281e 100644
--- a/board/menlo/m53menlo/m53menlo.c
+++ b/board/menlo/m53menlo/m53menlo.c
@@ -27,6 +27,7 @@
 #include <gzip.h>
 #include <i2c.h>
 #include <ipu_pixfmt.h>
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/fb.h>
diff --git a/board/mini-box/picosam9g45/picosam9g45.c b/board/mini-box/picosam9g45/picosam9g45.c
index 5d6cb24966d6..d4af394670ce 100644
--- a/board/mini-box/picosam9g45/picosam9g45.c
+++ b/board/mini-box/picosam9g45/picosam9g45.c
@@ -22,6 +22,7 @@
 #include <asm/arch/gpio.h>
 #include <asm/arch/clk.h>
 #include <lcd.h>
+#include <asm/u-boot.h>
 #include <linux/mtd/rawnand.h>
 #include <atmel_lcdc.h>
 #include <atmel_mci.h>
diff --git a/board/mpc8308_p1m/mpc8308_p1m.c b/board/mpc8308_p1m/mpc8308_p1m.c
index 87607bd48983..349d1ac88506 100644
--- a/board/mpc8308_p1m/mpc8308_p1m.c
+++ b/board/mpc8308_p1m/mpc8308_p1m.c
@@ -8,6 +8,8 @@
 #include <i2c.h>
 #include <init.h>
 #include <net.h>
+#include <asm/ppc.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
diff --git a/board/mpc8308_p1m/sdram.c b/board/mpc8308_p1m/sdram.c
index 62a2d8a53afa..93614a82d46e 100644
--- a/board/mpc8308_p1m/sdram.c
+++ b/board/mpc8308_p1m/sdram.c
@@ -15,7 +15,7 @@
 #include <asm/bitops.h>
 #include <asm/io.h>
 
-#include <asm/processor.h>
+#include <asm/ppc.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/nokia/rx51/rx51.c b/board/nokia/rx51/rx51.c
index 20d82447b017..e58bf3acc2e8 100644
--- a/board/nokia/rx51/rx51.c
+++ b/board/nokia/rx51/rx51.c
@@ -38,6 +38,7 @@
 #include <asm/arch/mux.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/mmc_host_def.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 
 #include "rx51.h"
diff --git a/board/nvidia/p2371-2180/p2371-2180.c b/board/nvidia/p2371-2180/p2371-2180.c
index 0f4796b559b5..4631fa21f5bc 100644
--- a/board/nvidia/p2371-2180/p2371-2180.c
+++ b/board/nvidia/p2371-2180/p2371-2180.c
@@ -10,6 +10,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <net.h>
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/libfdt.h>
 #include <asm/arch/gpio.h>
diff --git a/board/nvidia/p2771-0000/p2771-0000.c b/board/nvidia/p2771-0000/p2771-0000.c
index e96edcc1c91f..14b151d8a165 100644
--- a/board/nvidia/p2771-0000/p2771-0000.c
+++ b/board/nvidia/p2771-0000/p2771-0000.c
@@ -9,6 +9,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <net.h>
+#include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <asm/arch-tegra/cboot.h>
 #include <linux/string.h>
diff --git a/board/nvidia/p3450-0000/p3450-0000.c b/board/nvidia/p3450-0000/p3450-0000.c
index 2a16b1e3b468..e40644388ecc 100644
--- a/board/nvidia/p3450-0000/p3450-0000.c
+++ b/board/nvidia/p3450-0000/p3450-0000.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <fdtdec.h>
 #include <i2c.h>
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/libfdt.h>
 #include <pca953x.h>
diff --git a/board/olimex/mx23_olinuxino/mx23_olinuxino.c b/board/olimex/mx23_olinuxino/mx23_olinuxino.c
index d1e189cbb6eb..bfaf18fca470 100644
--- a/board/olimex/mx23_olinuxino/mx23_olinuxino.c
+++ b/board/olimex/mx23_olinuxino/mx23_olinuxino.c
@@ -17,6 +17,7 @@
 #ifdef CONFIG_LED_STATUS
 #include <status_led.h>
 #endif
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/phytec/pcl063/spl.c b/board/phytec/pcl063/spl.c
index fea4aa33655a..175223dbc75c 100644
--- a/board/phytec/pcl063/spl.c
+++ b/board/phytec/pcl063/spl.c
@@ -16,6 +16,7 @@
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/sys_proto.h>
 #include <fsl_esdhc_imx.h>
+#include <asm/u-boot.h>
 
 /* Configuration for Micron MT41K256M16TW-107 IT:P, 32M x 16 x 8 -> 256MiB */
 
diff --git a/board/phytec/pfla02/pfla02.c b/board/phytec/pfla02/pfla02.c
index 996fcedfa2cc..225fdd55cc58 100644
--- a/board/phytec/pfla02/pfla02.c
+++ b/board/phytec/pfla02/pfla02.c
@@ -21,6 +21,7 @@
 #include <asm/mach-imx/mxc_i2c.h>
 #include <asm/mach-imx/spi.h>
 #include <env.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
diff --git a/board/phytec/phycore_am335x_r2/board.c b/board/phytec/phycore_am335x_r2/board.c
index 5ca94152049f..19c1033c9d7a 100644
--- a/board/phytec/phycore_am335x_r2/board.c
+++ b/board/phytec/phycore_am335x_r2/board.c
@@ -18,6 +18,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <power/tps65910.h>
 #include <jffs2/load_kernel.h>
 #include <mtd_node.h>
diff --git a/board/ppcag/bg0900/bg0900.c b/board/ppcag/bg0900/bg0900.c
index 578f5c73b6cb..5fe7ed9a3a8f 100644
--- a/board/ppcag/bg0900/bg0900.c
+++ b/board/ppcag/bg0900/bg0900.c
@@ -15,6 +15,7 @@
 #include <asm/arch/iomux-mx28.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/mii.h>
 #include <miiphy.h>
diff --git a/board/qemu-mips/qemu-mips.c b/board/qemu-mips/qemu-mips.c
index f57091739ec9..21437168044f 100644
--- a/board/qemu-mips/qemu-mips.c
+++ b/board/qemu-mips/qemu-mips.c
@@ -12,6 +12,7 @@
 #include <asm/mipsregs.h>
 #include <asm/io.h>
 #include <netdev.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/qualcomm/dragonboard410c/dragonboard410c.c b/board/qualcomm/dragonboard410c/dragonboard410c.c
index 1aa67f96d3d8..bac8b1ff8993 100644
--- a/board/qualcomm/dragonboard410c/dragonboard410c.c
+++ b/board/qualcomm/dragonboard410c/dragonboard410c.c
@@ -18,6 +18,7 @@
 #include <fdt_support.h>
 #include <asm/arch/dram.h>
 #include <asm/arch/misc.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 
diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c
index 6b1fa5fc1444..e76fc2cca94d 100644
--- a/board/raspberrypi/rpi/rpi.c
+++ b/board/raspberrypi/rpi/rpi.c
@@ -19,6 +19,7 @@
 #include <asm/arch/msg.h>
 #include <asm/arch/sdhci.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <dm/platform_data/serial_bcm283x_mu.h>
 #ifdef CONFIG_ARM64
 #include <asm/armv8/mmu.h>
diff --git a/board/renesas/MigoR/migo_r.c b/board/renesas/MigoR/migo_r.c
index f2f4c657534f..61564a2f50f7 100644
--- a/board/renesas/MigoR/migo_r.c
+++ b/board/renesas/MigoR/migo_r.c
@@ -15,6 +15,7 @@
 #include <netdev.h>
 #include <asm/io.h>
 #include <asm/processor.h>
+#include <asm/u-boot.h>
 
 int checkboard(void)
 {
diff --git a/board/renesas/blanche/blanche.c b/board/renesas/blanche/blanche.c
index 9671382f2a3e..77d4cc8bd6c1 100644
--- a/board/renesas/blanche/blanche.c
+++ b/board/renesas/blanche/blanche.c
@@ -21,6 +21,7 @@
 #include <asm/mach-types.h>
 #include <asm/processor.h>
 #include <dm.h>
+#include <asm/u-boot.h>
 #include <dm/platform_data/serial_sh.h>
 #include <env.h>
 #include <hang.h>
diff --git a/board/renesas/r2dplus/r2dplus.c b/board/renesas/r2dplus/r2dplus.c
index 4b9959a4326e..e637b4f98763 100644
--- a/board/renesas/r2dplus/r2dplus.c
+++ b/board/renesas/r2dplus/r2dplus.c
@@ -11,6 +11,7 @@
 #include <netdev.h>
 #include <asm/processor.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 
 int checkboard(void)
 {
diff --git a/board/renesas/r7780mp/r7780mp.c b/board/renesas/r7780mp/r7780mp.c
index 422381ca780b..28c99bf58547 100644
--- a/board/renesas/r7780mp/r7780mp.c
+++ b/board/renesas/r7780mp/r7780mp.c
@@ -12,6 +12,7 @@
 #include <asm/io.h>
 #include <asm/pci.h>
 #include <netdev.h>
+#include <asm/u-boot.h>
 #include "r7780mp.h"
 
 int checkboard(void)
diff --git a/board/renesas/rcar-common/common.c b/board/renesas/rcar-common/common.c
index 1d645a82aafb..4f56627b8129 100644
--- a/board/renesas/rcar-common/common.c
+++ b/board/renesas/rcar-common/common.c
@@ -11,6 +11,7 @@
 #include <dm.h>
 #include <init.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <dm/uclass-internal.h>
 #include <asm/arch/rmobile.h>
 #include <linux/libfdt.h>
diff --git a/board/renesas/sh7752evb/sh7752evb.c b/board/renesas/sh7752evb/sh7752evb.c
index 07c51e7147ee..4df154a2a910 100644
--- a/board/renesas/sh7752evb/sh7752evb.c
+++ b/board/renesas/sh7752evb/sh7752evb.c
@@ -15,6 +15,7 @@
 #include <asm/mmc.h>
 #include <spi.h>
 #include <spi_flash.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 
diff --git a/board/renesas/sh7753evb/sh7753evb.c b/board/renesas/sh7753evb/sh7753evb.c
index 8f6f2eee9043..de719983979f 100644
--- a/board/renesas/sh7753evb/sh7753evb.c
+++ b/board/renesas/sh7753evb/sh7753evb.c
@@ -15,6 +15,7 @@
 #include <asm/mmc.h>
 #include <spi.h>
 #include <spi_flash.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 
diff --git a/board/renesas/sh7757lcr/sh7757lcr.c b/board/renesas/sh7757lcr/sh7757lcr.c
index a81bdbf9cdc8..2adca5dc6dc9 100644
--- a/board/renesas/sh7757lcr/sh7757lcr.c
+++ b/board/renesas/sh7757lcr/sh7757lcr.c
@@ -15,6 +15,7 @@
 #include <asm/mmc.h>
 #include <spi.h>
 #include <spi_flash.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 
 int checkboard(void)
diff --git a/board/ronetix/pm9261/pm9261.c b/board/ronetix/pm9261/pm9261.c
index 5be2c5e192bb..b5b79b28391d 100644
--- a/board/ronetix/pm9261/pm9261.c
+++ b/board/ronetix/pm9261/pm9261.c
@@ -11,6 +11,7 @@
 #include <init.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/sizes.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
diff --git a/board/ronetix/pm9263/pm9263.c b/board/ronetix/pm9263/pm9263.c
index 95c0dec4db5f..ec73ced76042 100644
--- a/board/ronetix/pm9263/pm9263.c
+++ b/board/ronetix/pm9263/pm9263.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <init.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/sizes.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
diff --git a/board/ronetix/pm9g45/pm9g45.c b/board/ronetix/pm9g45/pm9g45.c
index 8d5825c7f131..fa0d9f2467eb 100644
--- a/board/ronetix/pm9g45/pm9g45.c
+++ b/board/ronetix/pm9g45/pm9g45.c
@@ -13,6 +13,7 @@
 #include <common.h>
 #include <init.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/sizes.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
diff --git a/board/samsung/arndale/arndale.c b/board/samsung/arndale/arndale.c
index 2742a7f32b2a..d1525b4a8562 100644
--- a/board/samsung/arndale/arndale.c
+++ b/board/samsung/arndale/arndale.c
@@ -13,6 +13,7 @@
 #include <asm/arch/pinmux.h>
 #include <asm/arch/dwmmc.h>
 #include <asm/arch/power.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/samsung/common/board.c b/board/samsung/common/board.c
index 9eea11f755b7..ae66bc73fd15 100644
--- a/board/samsung/common/board.c
+++ b/board/samsung/common/board.c
@@ -33,6 +33,7 @@
 #include <stdio_dev.h>
 #include <usb.h>
 #include <dwc3-uboot.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <samsung/misc.h>
 #include <dm/pinctrl.h>
diff --git a/board/samsung/goni/goni.c b/board/samsung/goni/goni.c
index 5fb01bba0555..1631e68e713c 100644
--- a/board/samsung/goni/goni.c
+++ b/board/samsung/goni/goni.c
@@ -12,6 +12,7 @@
 #include <asm/gpio.h>
 #include <asm/arch/mmc.h>
 #include <dm.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/printk.h>
 #include <power/pmic.h>
diff --git a/board/samsung/smdkc100/smdkc100.c b/board/samsung/smdkc100/smdkc100.c
index 69ed715403fb..f343a6f9dfe4 100644
--- a/board/samsung/smdkc100/smdkc100.c
+++ b/board/samsung/smdkc100/smdkc100.c
@@ -14,6 +14,7 @@
 #include <asm/arch/sromc.h>
 #include <netdev.h>
 #include <asm/mach-types.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/samsung/smdkv310/smdkv310.c b/board/samsung/smdkv310/smdkv310.c
index 8811cbb9ad0b..0be4ddf92d8d 100644
--- a/board/samsung/smdkv310/smdkv310.c
+++ b/board/samsung/smdkv310/smdkv310.c
@@ -16,6 +16,7 @@
 #include <asm/arch/periph.h>
 #include <asm/arch/pinmux.h>
 #include <asm/arch/sromc.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/sandbox/sandbox.c b/board/sandbox/sandbox.c
index b1bed64910cb..9773074d0882 100644
--- a/board/sandbox/sandbox.c
+++ b/board/sandbox/sandbox.c
@@ -15,6 +15,7 @@
 #include <asm/global_data.h>
 #include <asm/test.h>
 #include <asm/u-boot-sandbox.h>
+#include <asm/u-boot.h>
 
 /*
  * Pointer to initial global data area
diff --git a/board/sandisk/sansa_fuze_plus/sfp.c b/board/sandisk/sansa_fuze_plus/sfp.c
index f46b02e38e59..c6cce3b3fa63 100644
--- a/board/sandisk/sansa_fuze_plus/sfp.c
+++ b/board/sandisk/sansa_fuze_plus/sfp.c
@@ -20,6 +20,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/sbc8349/pci.c b/board/sbc8349/pci.c
index 26c4f24e4f8b..3b35b99dfdc0 100644
--- a/board/sbc8349/pci.c
+++ b/board/sbc8349/pci.c
@@ -15,6 +15,7 @@
 #include <pci.h>
 #include <i2c.h>
 #include <asm/fsl_i2c.h>
+#include <asm/ppc.h>
 #include <linux/delay.h>
 
 static struct pci_region pci1_regions[] = {
diff --git a/board/sbc8349/sbc8349.c b/board/sbc8349/sbc8349.c
index b440a0b17e97..18138289965d 100644
--- a/board/sbc8349/sbc8349.c
+++ b/board/sbc8349/sbc8349.c
@@ -14,6 +14,7 @@
 #include <mpc83xx.h>
 #include <asm/bitops.h>
 #include <asm/global_data.h>
+#include <asm/ppc.h>
 #include <asm/mpc8349_pci.h>
 #include <i2c.h>
 #include <spd_sdram.h>
@@ -21,6 +22,7 @@
 #if defined(CONFIG_OF_LIBFDT)
 #include <linux/libfdt.h>
 #endif
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/sbc8548/ddr.c b/board/sbc8548/ddr.c
index c3239fd1e1a6..48e1bcf806a9 100644
--- a/board/sbc8548/ddr.c
+++ b/board/sbc8548/ddr.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <i2c.h>
+#include <asm/ppc.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 
diff --git a/board/sbc8548/sbc8548.c b/board/sbc8548/sbc8548.c
index 13a66507ffce..b3c1da920a8a 100644
--- a/board/sbc8548/sbc8548.c
+++ b/board/sbc8548/sbc8548.c
@@ -24,6 +24,7 @@
 #include <netdev.h>
 #include <tsec.h>
 #include <miiphy.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
diff --git a/board/sbc8548/tlb.c b/board/sbc8548/tlb.c
index 8ad01d10e49b..31fd1539bf32 100644
--- a/board/sbc8548/tlb.c
+++ b/board/sbc8548/tlb.c
@@ -6,8 +6,8 @@
  * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
  */
 
-#include <common.h>
 #include <asm/mmu.h>
+#include <asm/ppc.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/sbc8641d/sbc8641d.c b/board/sbc8641d/sbc8641d.c
index a67092daf47f..cc17f80d07db 100644
--- a/board/sbc8641d/sbc8641d.c
+++ b/board/sbc8641d/sbc8641d.c
@@ -22,6 +22,7 @@
 #include <asm/fsl_pci.h>
 #include <fsl_ddr_sdram.h>
 #include <asm/fsl_serdes.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
diff --git a/board/schulercontrol/sc_sps_1/sc_sps_1.c b/board/schulercontrol/sc_sps_1/sc_sps_1.c
index 3a04b1a634cc..a5b25b60fc49 100644
--- a/board/schulercontrol/sc_sps_1/sc_sps_1.c
+++ b/board/schulercontrol/sc_sps_1/sc_sps_1.c
@@ -16,6 +16,7 @@
 #include <asm/arch/iomux-mx28.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/u-boot.h>
 #include <linux/mii.h>
 #include <miiphy.h>
 #include <netdev.h>
diff --git a/board/seco/mx6quq7/mx6quq7.c b/board/seco/mx6quq7/mx6quq7.c
index a061d7d8afbc..138c6e04291d 100644
--- a/board/seco/mx6quq7/mx6quq7.c
+++ b/board/seco/mx6quq7/mx6quq7.c
@@ -14,6 +14,7 @@
 #include <asm/arch/iomux.h>
 #include <asm/arch/mx6-pins.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
diff --git a/board/siemens/capricorn/board.c b/board/siemens/capricorn/board.c
index 6f34bd73f0de..03418707a853 100644
--- a/board/siemens/capricorn/board.c
+++ b/board/siemens/capricorn/board.c
@@ -27,6 +27,7 @@
 #ifndef CONFIG_SPL
 #include <asm/arch-imx8/clock.h>
 #endif
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 #include "../common/factoryset.h"
diff --git a/board/siemens/corvus/board.c b/board/siemens/corvus/board.c
index 2acd3226cf2d..fbccbb0f6da1 100644
--- a/board/siemens/corvus/board.c
+++ b/board/siemens/corvus/board.c
@@ -31,6 +31,7 @@
 #include <netdev.h>
 #endif
 #include <spi.h>
+#include <asm/u-boot.h>
 
 #ifdef CONFIG_USB_GADGET_ATMEL_USBA
 #include <asm/arch/atmel_usba_udc.h>
diff --git a/board/siemens/draco/board.c b/board/siemens/draco/board.c
index b512bdbfabf4..2c15cfdda3f3 100644
--- a/board/siemens/draco/board.c
+++ b/board/siemens/draco/board.c
@@ -35,6 +35,7 @@
 #include <miiphy.h>
 #include <cpsw.h>
 #include <watchdog.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include "board.h"
 #include "../common/factoryset.h"
diff --git a/board/siemens/pxm2/board.c b/board/siemens/pxm2/board.c
index 7f36848b2657..8ab3610da7d6 100644
--- a/board/siemens/pxm2/board.c
+++ b/board/siemens/pxm2/board.c
@@ -28,6 +28,7 @@
 #include <asm/arch/gpio.h>
 #include <asm/arch/mmc_host_def.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 #include "../../../drivers/video/da8xx-fb.h"
 #include <asm/io.h>
diff --git a/board/siemens/rut/board.c b/board/siemens/rut/board.c
index 22d8c40a53b1..84053b10d846 100644
--- a/board/siemens/rut/board.c
+++ b/board/siemens/rut/board.c
@@ -34,6 +34,7 @@
 #include <cpsw.h>
 #include <video.h>
 #include <watchdog.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 #include "board.h"
diff --git a/board/siemens/smartweb/smartweb.c b/board/siemens/smartweb/smartweb.c
index d500a6214d56..f3415e545171 100644
--- a/board/siemens/smartweb/smartweb.c
+++ b/board/siemens/smartweb/smartweb.c
@@ -32,6 +32,7 @@
 #include <asm/arch/gpio.h>
 #include <asm/gpio.h>
 #include <watchdog.h>
+#include <asm/u-boot.h>
 # include <net.h>
 #ifndef CONFIG_DM_ETH
 # include <netdev.h>
diff --git a/board/siemens/taurus/taurus.c b/board/siemens/taurus/taurus.c
index cad16f906564..3fb7d6bca227 100644
--- a/board/siemens/taurus/taurus.c
+++ b/board/siemens/taurus/taurus.c
@@ -28,6 +28,7 @@
 #include <asm/arch/atmel_serial.h>
 #include <asm/arch/clk.h>
 #include <asm/gpio.h>
+#include <asm/u-boot.h>
 #include <linux/mtd/rawnand.h>
 #include <atmel_mci.h>
 #include <asm/arch/at91_spi.h>
diff --git a/board/sks-kinkel/sksimx6/sksimx6.c b/board/sks-kinkel/sksimx6/sksimx6.c
index bfe4634fdd7f..cbf3a5952be7 100644
--- a/board/sks-kinkel/sksimx6/sksimx6.c
+++ b/board/sks-kinkel/sksimx6/sksimx6.c
@@ -12,6 +12,7 @@
 #include <asm/arch/iomux.h>
 #include <asm/arch/mx6-pins.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
diff --git a/board/socrates/socrates.c b/board/socrates/socrates.c
index 0c9262d35400..711ddcf256ea 100644
--- a/board/socrates/socrates.c
+++ b/board/socrates/socrates.c
@@ -21,6 +21,7 @@
 #include <asm/immap_85xx.h>
 #include <ioports.h>
 #include <flash.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
diff --git a/board/socrates/tlb.c b/board/socrates/tlb.c
index de80c3c0e573..392fbdfdab4e 100644
--- a/board/socrates/tlb.c
+++ b/board/socrates/tlb.c
@@ -9,8 +9,8 @@
  * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
  */
 
-#include <common.h>
 #include <asm/mmu.h>
+#include <asm/ppc.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/softing/vining_2000/vining_2000.c b/board/softing/vining_2000/vining_2000.c
index 1c5863714c67..93670b7a946b 100644
--- a/board/softing/vining_2000/vining_2000.c
+++ b/board/softing/vining_2000/vining_2000.c
@@ -20,6 +20,7 @@
 #include <asm/io.h>
 #include <asm/mach-imx/mxc_i2c.h>
 #include <env.h>
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/sizes.h>
diff --git a/board/solidrun/clearfog/clearfog.c b/board/solidrun/clearfog/clearfog.c
index a4d60e1540c5..46ffc026f347 100644
--- a/board/solidrun/clearfog/clearfog.c
+++ b/board/solidrun/clearfog/clearfog.c
@@ -14,6 +14,7 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/string.h>
diff --git a/board/spear/spear300/spear300.c b/board/spear/spear300/spear300.c
index a5945383932a..1fe825182f33 100644
--- a/board/spear/spear300/spear300.c
+++ b/board/spear/spear300/spear300.c
@@ -10,6 +10,7 @@
 #include <netdev.h>
 #include <nand.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 #include <linux/mtd/fsmc_nand.h>
 #include <asm/mach-types.h>
 #include <asm/arch/hardware.h>
diff --git a/board/spear/spear310/spear310.c b/board/spear/spear310/spear310.c
index b4c3c0c5c78f..721b1dd4aa54 100644
--- a/board/spear/spear310/spear310.c
+++ b/board/spear/spear310/spear310.c
@@ -11,6 +11,7 @@
 #include <netdev.h>
 #include <nand.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 #include <linux/mtd/fsmc_nand.h>
 #include <asm/mach-types.h>
 #include <asm/arch/hardware.h>
diff --git a/board/spear/spear320/spear320.c b/board/spear/spear320/spear320.c
index 291337b80497..f726f8fccf0c 100644
--- a/board/spear/spear320/spear320.c
+++ b/board/spear/spear320/spear320.c
@@ -11,6 +11,7 @@
 #include <netdev.h>
 #include <nand.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 #include <linux/mtd/fsmc_nand.h>
 #include <asm/mach-types.h>
 #include <asm/arch/hardware.h>
diff --git a/board/spear/spear600/spear600.c b/board/spear/spear600/spear600.c
index 4706c52c1273..0c01f1fbf9ee 100644
--- a/board/spear/spear600/spear600.c
+++ b/board/spear/spear600/spear600.c
@@ -10,6 +10,7 @@
 #include <netdev.h>
 #include <nand.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 #include <linux/mtd/fsmc_nand.h>
 #include <asm/mach-types.h>
 #include <asm/arch/hardware.h>
diff --git a/board/spear/x600/x600.c b/board/spear/x600/x600.c
index 9c30581ec01c..fcc7524121c0 100644
--- a/board/spear/x600/x600.c
+++ b/board/spear/x600/x600.c
@@ -20,6 +20,7 @@
 #include <asm/arch/hardware.h>
 #include <asm/arch/spr_defs.h>
 #include <asm/arch/spr_misc.h>
+#include <asm/u-boot.h>
 #include <linux/mtd/fsmc_nand.h>
 #include "fpga.h"
 
diff --git a/board/st/stm32mp1/stm32mp1.c b/board/st/stm32mp1/stm32mp1.c
index b37326b1c3cb..f2312a03d1a1 100644
--- a/board/st/stm32mp1/stm32mp1.c
+++ b/board/st/stm32mp1/stm32mp1.c
@@ -34,6 +34,7 @@
 #include <asm/gpio.h>
 #include <asm/arch/stm32.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/u-boot.h>
 #include <jffs2/load_kernel.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/board/st/stv0991/stv0991.c b/board/st/stv0991/stv0991.c
index 72399cf5f653..e2d62a7ede9d 100644
--- a/board/st/stv0991/stv0991.c
+++ b/board/st/stv0991/stv0991.c
@@ -17,6 +17,7 @@
 #include <netdev.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 #include <dm/platform_data/serial_pl01x.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/sunxi/board.c b/board/sunxi/board.c
index 193ec8cff574..a34b1f4cf178 100644
--- a/board/sunxi/board.c
+++ b/board/sunxi/board.c
@@ -29,6 +29,7 @@
 #include <asm/arch/mmc.h>
 #include <asm/arch/spl.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/printk.h>
 #include <linux/string.h>
diff --git a/board/tcl/sl50/board.c b/board/tcl/sl50/board.c
index 4821925c026d..8095053fd60f 100644
--- a/board/tcl/sl50/board.c
+++ b/board/tcl/sl50/board.c
@@ -30,6 +30,7 @@
 #include <i2c.h>
 #include <miiphy.h>
 #include <cpsw.h>
+#include <asm/u-boot.h>
 #include <power/tps65217.h>
 #include <power/tps65910.h>
 #include <env_internal.h>
diff --git a/board/technexion/pico-imx6/pico-imx6.c b/board/technexion/pico-imx6/pico-imx6.c
index 6b9c4f4373cc..90592900ec6e 100644
--- a/board/technexion/pico-imx6/pico-imx6.c
+++ b/board/technexion/pico-imx6/pico-imx6.c
@@ -22,6 +22,7 @@
 #include <asm/mach-imx/video.h>
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/sizes.h>
 #include <miiphy.h>
diff --git a/board/technexion/pico-imx6/spl.c b/board/technexion/pico-imx6/spl.c
index 7b6cdd6c3b16..dd5e154e6711 100644
--- a/board/technexion/pico-imx6/spl.c
+++ b/board/technexion/pico-imx6/spl.c
@@ -13,6 +13,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/mx6-pins.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
diff --git a/board/technexion/pico-imx6ul/pico-imx6ul.c b/board/technexion/pico-imx6ul/pico-imx6ul.c
index c9f553bdfd52..0d972158b1c8 100644
--- a/board/technexion/pico-imx6ul/pico-imx6ul.c
+++ b/board/technexion/pico-imx6ul/pico-imx6ul.c
@@ -20,6 +20,7 @@
 #include <common.h>
 #include <miiphy.h>
 #include <netdev.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/sizes.h>
 #include <usb.h>
diff --git a/board/technexion/pico-imx6ul/spl.c b/board/technexion/pico-imx6ul/spl.c
index faee99e8d29d..bea16a7ab9f0 100644
--- a/board/technexion/pico-imx6ul/spl.c
+++ b/board/technexion/pico-imx6ul/spl.c
@@ -15,6 +15,7 @@
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/mach-imx/boot_mode.h>
 #include <fsl_esdhc_imx.h>
+#include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <spl.h>
 #include <linux/string.h>
diff --git a/board/technexion/pico-imx7d/spl.c b/board/technexion/pico-imx7d/spl.c
index ccb094f18845..3739706dee1b 100644
--- a/board/technexion/pico-imx7d/spl.c
+++ b/board/technexion/pico-imx7d/spl.c
@@ -18,6 +18,7 @@
 #include <asm/gpio.h>
 #include <fsl_esdhc_imx.h>
 #include <spl.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 
 #if defined(CONFIG_SPL_BUILD)
diff --git a/board/technexion/pico-imx8mq/spl.c b/board/technexion/pico-imx8mq/spl.c
index b434e1e16f29..02b2a01cae75 100644
--- a/board/technexion/pico-imx8mq/spl.c
+++ b/board/technexion/pico-imx8mq/spl.c
@@ -16,6 +16,7 @@
 #include <asm/mach-imx/gpio.h>
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/mach-imx/mxc_i2c.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <errno.h>
 #include <fsl_esdhc_imx.h>
diff --git a/board/technexion/tao3530/tao3530.c b/board/technexion/tao3530/tao3530.c
index 0c9dca31e67e..157ad85d4f75 100644
--- a/board/technexion/tao3530/tao3530.c
+++ b/board/technexion/tao3530/tao3530.c
@@ -18,6 +18,7 @@
 #include <asm/arch/gpio.h>
 #include <asm/gpio.h>
 #include <asm/mach-types.h>
+#include <asm/u-boot.h>
 
 #include <usb.h>
 #include <asm/ehci-omap.h>
diff --git a/board/technologic/ts4600/ts4600.c b/board/technologic/ts4600/ts4600.c
index b9cce821d96d..7daac4e53aa2 100644
--- a/board/technologic/ts4600/ts4600.c
+++ b/board/technologic/ts4600/ts4600.c
@@ -22,6 +22,7 @@
 #include <asm/arch/iomux-mx28.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/mii.h>
 #include <miiphy.h>
diff --git a/board/technologic/ts4800/ts4800.c b/board/technologic/ts4800/ts4800.c
index a309e58b27fd..61ec4ffb831e 100644
--- a/board/technologic/ts4800/ts4800.c
+++ b/board/technologic/ts4800/ts4800.c
@@ -16,6 +16,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux-mx51.h>
 #include <env.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/arch/sys_proto.h>
diff --git a/board/theadorable/theadorable.c b/board/theadorable/theadorable.c
index fb3d1fc42602..9664a8c0ef31 100644
--- a/board/theadorable/theadorable.c
+++ b/board/theadorable/theadorable.c
@@ -19,6 +19,7 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/mbus.h>
 #ifdef CONFIG_NET
diff --git a/board/ti/am335x/board.c b/board/ti/am335x/board.c
index be474a8472c9..7103dc454d8e 100644
--- a/board/ti/am335x/board.c
+++ b/board/ti/am335x/board.c
@@ -37,6 +37,7 @@
 #include <i2c.h>
 #include <miiphy.h>
 #include <cpsw.h>
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/string.h>
diff --git a/board/ti/am3517crane/am3517crane.c b/board/ti/am3517crane/am3517crane.c
index b1017d6c9b76..b7f6ce212435 100644
--- a/board/ti/am3517crane/am3517crane.c
+++ b/board/ti/am3517crane/am3517crane.c
@@ -19,6 +19,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/mach-types.h>
 #include <i2c.h>
+#include <asm/u-boot.h>
 #include "am3517crane.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/ti/am43xx/board.c b/board/ti/am43xx/board.c
index ba479672c663..463dccc0ccba 100644
--- a/board/ti/am43xx/board.c
+++ b/board/ti/am43xx/board.c
@@ -11,6 +11,7 @@
 #include <eeprom.h>
 #include <image.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <dm/uclass.h>
 #include <env.h>
 #include <fdt_support.h>
diff --git a/board/ti/am57xx/board.c b/board/ti/am57xx/board.c
index d9b28dff52b3..fca15a9a6294 100644
--- a/board/ti/am57xx/board.c
+++ b/board/ti/am57xx/board.c
@@ -33,6 +33,7 @@
 #include <asm/arch/gpio.h>
 #include <asm/arch/omap.h>
 #include <usb.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 #include <linux/usb/gadget.h>
 #include <dwc3-uboot.h>
diff --git a/board/ti/am65x/evm.c b/board/ti/am65x/evm.c
index 2346595b95d1..6f0dbf608300 100644
--- a/board/ti/am65x/evm.c
+++ b/board/ti/am65x/evm.c
@@ -22,6 +22,7 @@
 #include <env.h>
 #include <spl.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/u-boot.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c
index 25297b0ae0c9..752cb584c66a 100644
--- a/board/ti/beagle/beagle.c
+++ b/board/ti/beagle/beagle.c
@@ -25,6 +25,7 @@
 #endif
 #include <twl4030.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/mtd/rawnand.h>
 #include <asm/io.h>
 #include <asm/arch/mmc_host_def.h>
diff --git a/board/ti/dra7xx/evm.c b/board/ti/dra7xx/evm.c
index 851471cd1304..fa56ebb25333 100644
--- a/board/ti/dra7xx/evm.c
+++ b/board/ti/dra7xx/evm.c
@@ -20,6 +20,7 @@
 #include <sata.h>
 #include <serial.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 #include <asm/gpio.h>
 #include <usb.h>
diff --git a/board/ti/evm/evm.c b/board/ti/evm/evm.c
index 96434b3ba0f4..7e5efc32bc36 100644
--- a/board/ti/evm/evm.c
+++ b/board/ti/evm/evm.c
@@ -26,6 +26,7 @@
 #include <asm/gpio.h>
 #include <twl4030.h>
 #include <asm/mach-types.h>
+#include <asm/omap_musb.h>
 #include <linux/delay.h>
 #include <linux/mtd/rawnand.h>
 #include "evm.h"
diff --git a/board/ti/j721e/evm.c b/board/ti/j721e/evm.c
index 2ef1acec680e..d6b67504654b 100644
--- a/board/ti/j721e/evm.c
+++ b/board/ti/j721e/evm.c
@@ -22,6 +22,7 @@
 #include <spl.h>
 #include <asm/arch/sys_proto.h>
 #include <dm.h>
+#include <asm/u-boot.h>
 #include <dm/uclass-internal.h>
 #include <linux/printk.h>
 #include <linux/string.h>
diff --git a/board/ti/ks2_evm/board.c b/board/ti/ks2_evm/board.c
index 078b89073fc1..ba08c22f942b 100644
--- a/board/ti/ks2_evm/board.c
+++ b/board/ti/ks2_evm/board.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 #include "board.h"
 #include <env.h>
diff --git a/board/ti/ks2_evm/board_k2g.c b/board/ti/ks2_evm/board_k2g.c
index b6ef7164d9fb..979b1febc021 100644
--- a/board/ti/ks2_evm/board_k2g.c
+++ b/board/ti/ks2_evm/board_k2g.c
@@ -18,6 +18,7 @@
 #include <fdtdec.h>
 #include <i2c.h>
 #include <remoteproc.h>
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/string.h>
diff --git a/board/ti/omap5_uevm/evm.c b/board/ti/omap5_uevm/evm.c
index 4777622156b8..a6c75bda3c39 100644
--- a/board/ti/omap5_uevm/evm.c
+++ b/board/ti/omap5_uevm/evm.c
@@ -16,6 +16,7 @@
 #include <tca642x.h>
 #include <usb.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/usb/gadget.h>
 #include <dwc3-uboot.h>
diff --git a/board/ti/panda/panda.c b/board/ti/panda/panda.c
index fda8d5f3c838..c36690eec172 100644
--- a/board/ti/panda/panda.c
+++ b/board/ti/panda/panda.c
@@ -18,6 +18,7 @@
 #include <asm/gpio.h>
 #include <env.h>
 #include <twl6030.h>
+#include <asm/u-boot.h>
 
 #include "panda_mux_data.h"
 
diff --git a/board/ti/sdp4430/sdp.c b/board/ti/sdp4430/sdp.c
index 4895bfafd80a..fe12d6e89139 100644
--- a/board/ti/sdp4430/sdp.c
+++ b/board/ti/sdp4430/sdp.c
@@ -13,6 +13,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/mmc_host_def.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 
 #include "sdp4430_mux_data.h"
 
diff --git a/board/ti/ti816x/evm.c b/board/ti/ti816x/evm.c
index 2d42af6b809d..12c56a607c99 100644
--- a/board/ti/ti816x/evm.c
+++ b/board/ti/ti816x/evm.c
@@ -22,6 +22,7 @@
 #include <asm/arch/mmc_host_def.h>
 #include <asm/arch/mem.h>
 #include <asm/arch/mux.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/timll/devkit8000/devkit8000.c b/board/timll/devkit8000/devkit8000.c
index 5af883180627..e1b33d091eea 100644
--- a/board/timll/devkit8000/devkit8000.c
+++ b/board/timll/devkit8000/devkit8000.c
@@ -29,6 +29,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/mem.h>
 #include <asm/mach-types.h>
+#include <asm/u-boot.h>
 #include "devkit8000.h"
 #include <asm/gpio.h>
 #ifdef CONFIG_DRIVER_DM9000
diff --git a/board/toradex/apalis-imx8/apalis-imx8.c b/board/toradex/apalis-imx8/apalis-imx8.c
index 6e8594a64725..1c4ff3d1984b 100644
--- a/board/toradex/apalis-imx8/apalis-imx8.c
+++ b/board/toradex/apalis-imx8/apalis-imx8.c
@@ -7,6 +7,7 @@
 #include <cpu_func.h>
 #include <init.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 
 #include <asm/arch/clock.h>
 #include <asm/arch/imx8-pins.h>
diff --git a/board/toradex/apalis-tk1/apalis-tk1.c b/board/toradex/apalis-tk1/apalis-tk1.c
index 2883f1b98c5e..6d907817593d 100644
--- a/board/toradex/apalis-tk1/apalis-tk1.c
+++ b/board/toradex/apalis-tk1/apalis-tk1.c
@@ -15,6 +15,7 @@
 #include <asm/arch/pinmux.h>
 #include <env_internal.h>
 #include <pci_tegra.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/printk.h>
 #include <linux/string.h>
diff --git a/board/toradex/apalis_imx6/apalis_imx6.c b/board/toradex/apalis_imx6/apalis_imx6.c
index d17f90f86fda..db7746e78c8d 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 <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/string.h>
diff --git a/board/toradex/apalis_t30/apalis_t30.c b/board/toradex/apalis_t30/apalis_t30.c
index 0396eea56b55..cad2f32b6651 100644
--- a/board/toradex/apalis_t30/apalis_t30.c
+++ b/board/toradex/apalis_t30/apalis_t30.c
@@ -17,6 +17,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <pci_tegra.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include "../common/tdx-common.h"
 
diff --git a/board/toradex/colibri-imx6ull/colibri-imx6ull.c b/board/toradex/colibri-imx6ull/colibri-imx6ull.c
index 818a29f22be2..cde64f6684f6 100644
--- a/board/toradex/colibri-imx6ull/colibri-imx6ull.c
+++ b/board/toradex/colibri-imx6ull/colibri-imx6ull.c
@@ -5,6 +5,7 @@
 #include <common.h>
 #include <init.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 
 #include <asm/arch/clock.h>
diff --git a/board/toradex/colibri-imx8x/colibri-imx8x.c b/board/toradex/colibri-imx8x/colibri-imx8x.c
index 9531ec64a5da..09f3525bb450 100644
--- a/board/toradex/colibri-imx8x/colibri-imx8x.c
+++ b/board/toradex/colibri-imx8x/colibri-imx8x.c
@@ -7,6 +7,7 @@
 #include <cpu_func.h>
 #include <init.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 
 #include <asm/arch/clock.h>
 #include <asm/arch/imx8-pins.h>
diff --git a/board/toradex/colibri_imx6/colibri_imx6.c b/board/toradex/colibri_imx6/colibri_imx6.c
index 1f18552b57c7..dc026fd3e401 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 <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/string.h>
diff --git a/board/toradex/colibri_imx7/colibri_imx7.c b/board/toradex/colibri_imx7/colibri_imx7.c
index 75babe1ea5fc..fe8212bb4284 100644
--- a/board/toradex/colibri_imx7/colibri_imx7.c
+++ b/board/toradex/colibri_imx7/colibri_imx7.c
@@ -18,6 +18,7 @@
 #include <asm/io.h>
 #include <common.h>
 #include <dm.h>
+#include <asm/u-boot.h>
 #include <dm/platform_data/serial_mxc.h>
 #include <fdt_support.h>
 #include <fsl_esdhc_imx.h>
diff --git a/board/toradex/colibri_pxa270/colibri_pxa270.c b/board/toradex/colibri_pxa270/colibri_pxa270.c
index bc7a79f0b341..81b7f72d6dad 100644
--- a/board/toradex/colibri_pxa270/colibri_pxa270.c
+++ b/board/toradex/colibri_pxa270/colibri_pxa270.c
@@ -17,6 +17,7 @@
 #include <asm/arch/regs-uart.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 #include <dm/platdata.h>
 #include <dm/platform_data/pxa_mmc_gen.h>
 #include <dm/platform_data/serial_pxa.h>
diff --git a/board/toradex/colibri_t20/colibri_t20.c b/board/toradex/colibri_t20/colibri_t20.c
index 73ef4d2db32c..bb37ff7507d1 100644
--- a/board/toradex/colibri_t20/colibri_t20.c
+++ b/board/toradex/colibri_t20/colibri_t20.c
@@ -17,6 +17,7 @@
 #include <asm/io.h>
 #include <i2c.h>
 #include <nand.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include "../common/tdx-common.h"
 
diff --git a/board/toradex/colibri_t30/colibri_t30.c b/board/toradex/colibri_t30/colibri_t30.c
index c5562f6d5780..de13ec49c5f4 100644
--- a/board/toradex/colibri_t30/colibri_t30.c
+++ b/board/toradex/colibri_t30/colibri_t30.c
@@ -13,6 +13,7 @@
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <i2c.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include "pinmux-config-colibri_t30.h"
 #include "../common/tdx-common.h"
diff --git a/board/toradex/colibri_vf/colibri_vf.c b/board/toradex/colibri_vf/colibri_vf.c
index e9c5bc063223..5056447761de 100644
--- a/board/toradex/colibri_vf/colibri_vf.c
+++ b/board/toradex/colibri_vf/colibri_vf.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <init.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 
 #include <asm/arch/clock.h>
 #include <asm/arch/crm_regs.h>
diff --git a/board/toradex/common/tdx-common.c b/board/toradex/common/tdx-common.c
index 888b39fbe42a..2bbb11b21963 100644
--- a/board/toradex/common/tdx-common.c
+++ b/board/toradex/common/tdx-common.c
@@ -7,6 +7,7 @@
 #include <env.h>
 #include <g_dnl.h>
 #include <init.h>
+#include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <linux/string.h>
 
diff --git a/board/toradex/common/tdx-common.h b/board/toradex/common/tdx-common.h
index 8020df5b4436..6fdb1cb1252c 100644
--- a/board/toradex/common/tdx-common.h
+++ b/board/toradex/common/tdx-common.h
@@ -6,6 +6,7 @@
 #ifndef _TDX_COMMON_H
 #define _TDX_COMMON_H
 
+#include <asm/u-boot.h>
 #define TORADEX_USB_PRODUCT_NUM_OFFSET	0x4000
 #define TDX_USB_VID			0x1B67
 
diff --git a/board/toradex/verdin-imx8mm/verdin-imx8mm.c b/board/toradex/verdin-imx8mm/verdin-imx8mm.c
index 1161b5c31d9c..2fe5d407ef9b 100644
--- a/board/toradex/verdin-imx8mm/verdin-imx8mm.c
+++ b/board/toradex/verdin-imx8mm/verdin-imx8mm.c
@@ -12,6 +12,7 @@
 #include <miiphy.h>
 #include <netdev.h>
 #include <micrel.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/tqc/tqm834x/pci.c b/board/tqc/tqm834x/pci.c
index 92bda6076524..eac1b7f2df81 100644
--- a/board/tqc/tqm834x/pci.c
+++ b/board/tqc/tqm834x/pci.c
@@ -13,6 +13,7 @@
 #include <pci.h>
 #include <i2c.h>
 #include <asm/fsl_i2c.h>
+#include <asm/ppc.h>
 #include <linux/delay.h>
 
 static struct pci_region pci1_regions[] = {
diff --git a/board/tqc/tqm834x/tqm834x.c b/board/tqc/tqm834x/tqm834x.c
index 17b4662c167f..c13c36edeeac 100644
--- a/board/tqc/tqm834x/tqm834x.c
+++ b/board/tqc/tqm834x/tqm834x.c
@@ -12,11 +12,13 @@
 #include <mpc83xx.h>
 #include <asm/global_data.h>
 #include <asm/mpc8349_pci.h>
+#include <asm/ppc.h>
 #include <i2c.h>
 #include <miiphy.h>
 #include <asm/mmu.h>
 #include <pci.h>
 #include <flash.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <mtd/cfi_flash.h>
 
diff --git a/board/tqc/tqma6/tqma6.c b/board/tqc/tqma6/tqma6.c
index 26d557cece94..d9bbbfc5e432 100644
--- a/board/tqc/tqma6/tqma6.c
+++ b/board/tqc/tqma6/tqma6.c
@@ -16,6 +16,7 @@
 #include <env.h>
 #include <fdt_support.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
diff --git a/board/tqc/tqma6/tqma6_bb.h b/board/tqc/tqma6/tqma6_bb.h
index b0f1f99a83c5..1c5f3fc5adfc 100644
--- a/board/tqc/tqma6/tqma6_bb.h
+++ b/board/tqc/tqma6/tqma6_bb.h
@@ -8,6 +8,7 @@
 #define __TQMA6_BB__
 
 #include <common.h>
+#include <asm/u-boot.h>
 
 int tqma6_bb_board_mmc_getwp(struct mmc *mmc);
 int tqma6_bb_board_mmc_getcd(struct mmc *mmc);
diff --git a/board/tqc/tqma6/tqma6_mba6.c b/board/tqc/tqma6/tqma6_mba6.c
index 801619e80b6e..e50bd9ecebd9 100644
--- a/board/tqc/tqma6/tqma6_mba6.c
+++ b/board/tqc/tqma6/tqma6_mba6.c
@@ -15,6 +15,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
diff --git a/board/tqc/tqma6/tqma6_wru4.c b/board/tqc/tqma6/tqma6_wru4.c
index 3b1bc603ce88..9a4350cce6d4 100644
--- a/board/tqc/tqma6/tqma6_wru4.c
+++ b/board/tqc/tqma6/tqma6_wru4.c
@@ -17,6 +17,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
diff --git a/board/udoo/neo/neo.c b/board/udoo/neo/neo.c
index aef82e2c2df1..1ae4bc339785 100644
--- a/board/udoo/neo/neo.c
+++ b/board/udoo/neo/neo.c
@@ -26,6 +26,7 @@
 #include <asm/mach-imx/mxc_i2c.h>
 #include <asm/arch/sys_proto.h>
 #include <spl.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/sizes.h>
 #include <common.h>
diff --git a/board/udoo/udoo.c b/board/udoo/udoo.c
index d83f23dd3581..e6d441f582b8 100644
--- a/board/udoo/udoo.c
+++ b/board/udoo/udoo.c
@@ -14,6 +14,7 @@
 #include <malloc.h>
 #include <asm/arch/mx6-pins.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
diff --git a/board/variscite/dart_6ul/dart_6ul.c b/board/variscite/dart_6ul/dart_6ul.c
index 1c52cfd882ec..6378d44863be 100644
--- a/board/variscite/dart_6ul/dart_6ul.c
+++ b/board/variscite/dart_6ul/dart_6ul.c
@@ -14,6 +14,7 @@
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/mach-imx/mxc_i2c.h>
 #include <fsl_esdhc_imx.h>
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <miiphy.h>
 #include <netdev.h>
diff --git a/board/variscite/dart_6ul/spl.c b/board/variscite/dart_6ul/spl.c
index 725600770b7e..49ff41cab0ff 100644
--- a/board/variscite/dart_6ul/spl.c
+++ b/board/variscite/dart_6ul/spl.c
@@ -13,6 +13,7 @@
 #include <asm/arch/mx6-pins.h>
 #include <asm/arch/crm_regs.h>
 #include <fsl_esdhc_imx.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 
 #define UART_PAD_CTRL  (PAD_CTL_PKE | PAD_CTL_PUE |		\
diff --git a/board/varisys/cyrus/cyrus.c b/board/varisys/cyrus/cyrus.c
index c5d34df777d4..0c8060e4d7d8 100644
--- a/board/varisys/cyrus/cyrus.c
+++ b/board/varisys/cyrus/cyrus.c
@@ -10,6 +10,7 @@
 #include <image.h>
 #include <init.h>
 #include <netdev.h>
+#include <asm/u-boot.h>
 #include <linux/compiler.h>
 #include <asm/mmu.h>
 #include <asm/processor.h>
diff --git a/board/varisys/cyrus/cyrus.h b/board/varisys/cyrus/cyrus.h
index d8f8d6c8ec8f..4aefae46ae9b 100644
--- a/board/varisys/cyrus/cyrus.h
+++ b/board/varisys/cyrus/cyrus.h
@@ -3,6 +3,7 @@
 #ifndef __CYRUS_H
 #define __CYRUS_H
 
+#include <asm/u-boot.h>
 void fdt_fixup_board_enet(void *blob);
 void pci_of_setup(void *blob, struct bd_info *bd);
 
diff --git a/board/varisys/cyrus/ddr.c b/board/varisys/cyrus/ddr.c
index 184948094db0..c374b8ce0275 100644
--- a/board/varisys/cyrus/ddr.c
+++ b/board/varisys/cyrus/ddr.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <asm/global_data.h>
 #include <asm/mmu.h>
+#include <asm/ppc.h>
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
 #include <asm/fsl_law.h>
diff --git a/board/varisys/cyrus/eth.c b/board/varisys/cyrus/eth.c
index bc681079e261..07e3b979c47d 100644
--- a/board/varisys/cyrus/eth.c
+++ b/board/varisys/cyrus/eth.c
@@ -13,6 +13,7 @@
 #include <malloc.h>
 #include <fdt_support.h>
 #include <fsl_dtsec.h>
+#include <asm/u-boot.h>
 
 #ifdef CONFIG_FMAN_ENET
 
diff --git a/board/varisys/cyrus/pci.c b/board/varisys/cyrus/pci.c
index 429c398cb449..373d15c0e27b 100644
--- a/board/varisys/cyrus/pci.c
+++ b/board/varisys/cyrus/pci.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <pci.h>
 #include <asm/fsl_pci.h>
+#include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <asm/fsl_serdes.h>
diff --git a/board/varisys/cyrus/tlb.c b/board/varisys/cyrus/tlb.c
index b1af3e04d646..381e898ad343 100644
--- a/board/varisys/cyrus/tlb.c
+++ b/board/varisys/cyrus/tlb.c
@@ -4,8 +4,8 @@
  * Based on corenet_ds tlb code
  */
 
-#include <common.h>
 #include <asm/mmu.h>
+#include <asm/ppc.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/ve8313/ve8313.c b/board/ve8313/ve8313.c
index 78d401e955eb..ec2552a29abc 100644
--- a/board/ve8313/ve8313.c
+++ b/board/ve8313/ve8313.c
@@ -12,6 +12,8 @@
 #include <fdt_support.h>
 #include <init.h>
 #include <asm/global_data.h>
+#include <asm/ppc.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 #include <pci.h>
diff --git a/board/vscom/baltos/board.c b/board/vscom/baltos/board.c
index ed375c58cb9e..f01a78897c6b 100644
--- a/board/vscom/baltos/board.c
+++ b/board/vscom/baltos/board.c
@@ -14,6 +14,7 @@
 #include <net.h>
 #include <serial.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <spl.h>
 #include <asm/arch/cpu.h>
diff --git a/board/wandboard/spl.c b/board/wandboard/spl.c
index 0983d1005881..c61428d6c641 100644
--- a/board/wandboard/spl.c
+++ b/board/wandboard/spl.c
@@ -11,6 +11,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/mx6-pins.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
diff --git a/board/warp/warp.c b/board/warp/warp.c
index 0f1d038fabdf..fbf7a5be71cd 100644
--- a/board/warp/warp.c
+++ b/board/warp/warp.c
@@ -18,6 +18,7 @@
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/mach-imx/mxc_i2c.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 #include <linux/sizes.h>
 #include <common.h>
 #include <watchdog.h>
diff --git a/board/warp7/warp7.c b/board/warp7/warp7.c
index 0f202241dd78..929ec65947cd 100644
--- a/board/warp7/warp7.c
+++ b/board/warp7/warp7.c
@@ -19,6 +19,7 @@
 #include <env.h>
 #include <asm/arch/crm_regs.h>
 #include <netdev.h>
+#include <asm/u-boot.h>
 #include <power/pmic.h>
 #include <power/pfuze3000_pmic.h>
 #include "../freescale/common/pfuze.h"
diff --git a/board/xes/common/fsl_8xxx_clk.c b/board/xes/common/fsl_8xxx_clk.c
index 8ca65ca85931..c73ec1d21ba0 100644
--- a/board/xes/common/fsl_8xxx_clk.c
+++ b/board/xes/common/fsl_8xxx_clk.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <asm/io.h>
+#include <asm/ppc.h>
 
 /*
  * Return SYSCLK input frequency - 50 MHz or 66 MHz depending on POR config
diff --git a/board/xes/common/fsl_8xxx_misc.c b/board/xes/common/fsl_8xxx_misc.c
index b26810338f8f..d39cd7e8b65b 100644
--- a/board/xes/common/fsl_8xxx_misc.c
+++ b/board/xes/common/fsl_8xxx_misc.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <asm/mmu.h>
+#include <asm/ppc.h>
 #ifdef CONFIG_PCA953X
 #include <pca953x.h>
 
diff --git a/board/xes/common/fsl_8xxx_pci.c b/board/xes/common/fsl_8xxx_pci.c
index 157aa32826a7..c4aa04b41c9b 100644
--- a/board/xes/common/fsl_8xxx_pci.c
+++ b/board/xes/common/fsl_8xxx_pci.c
@@ -10,6 +10,7 @@
 #include <asm/fsl_pci.h>
 #include <asm/fsl_serdes.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 #include <linux/compiler.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
diff --git a/board/xes/xpedite517x/ddr.c b/board/xes/xpedite517x/ddr.c
index a3fd2fc8ca89..93bf7b9d5407 100644
--- a/board/xes/xpedite517x/ddr.c
+++ b/board/xes/xpedite517x/ddr.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <i2c.h>
+#include <asm/ppc.h>
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
 #include <log.h>
diff --git a/board/xes/xpedite517x/xpedite517x.c b/board/xes/xpedite517x/xpedite517x.c
index 8a5b52c49527..333edd4cd996 100644
--- a/board/xes/xpedite517x/xpedite517x.c
+++ b/board/xes/xpedite517x/xpedite517x.c
@@ -12,6 +12,7 @@
 #include <asm/io.h>
 #include <fdt_support.h>
 #include <pca953x.h>
+#include <asm/u-boot.h>
 #include "../common/fsl_8xxx_misc.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/xes/xpedite520x/tlb.c b/board/xes/xpedite520x/tlb.c
index d45f532861ea..4091e2a5d8ba 100644
--- a/board/xes/xpedite520x/tlb.c
+++ b/board/xes/xpedite520x/tlb.c
@@ -7,8 +7,8 @@
  * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
  */
 
-#include <common.h>
 #include <asm/mmu.h>
+#include <asm/ppc.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/xes/xpedite520x/xpedite520x.c b/board/xes/xpedite520x/xpedite520x.c
index 63e1e0efe54c..016bd412ce84 100644
--- a/board/xes/xpedite520x/xpedite520x.c
+++ b/board/xes/xpedite520x/xpedite520x.c
@@ -14,6 +14,7 @@
 #include <asm/io.h>
 #include <asm/cache.h>
 #include <asm/mmu.h>
+#include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <pca953x.h>
diff --git a/board/xes/xpedite537x/ddr.c b/board/xes/xpedite537x/ddr.c
index f55102a072e9..f3454fe5790a 100644
--- a/board/xes/xpedite537x/ddr.c
+++ b/board/xes/xpedite537x/ddr.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <i2c.h>
 #include <log.h>
+#include <asm/ppc.h>
 
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
diff --git a/board/xes/xpedite537x/tlb.c b/board/xes/xpedite537x/tlb.c
index 6d50360f069c..15c176a51b43 100644
--- a/board/xes/xpedite537x/tlb.c
+++ b/board/xes/xpedite537x/tlb.c
@@ -7,8 +7,8 @@
  * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
  */
 
-#include <common.h>
 #include <asm/mmu.h>
+#include <asm/ppc.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/xes/xpedite537x/xpedite537x.c b/board/xes/xpedite537x/xpedite537x.c
index 437b57d4ff6e..a55c7d24264b 100644
--- a/board/xes/xpedite537x/xpedite537x.c
+++ b/board/xes/xpedite537x/xpedite537x.c
@@ -12,6 +12,7 @@
 #include <asm/fsl_pci.h>
 #include <asm/io.h>
 #include <asm/cache.h>
+#include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <pca953x.h>
diff --git a/board/xes/xpedite550x/ddr.c b/board/xes/xpedite550x/ddr.c
index ad52c9455b8b..974fc52db80b 100644
--- a/board/xes/xpedite550x/ddr.c
+++ b/board/xes/xpedite550x/ddr.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <i2c.h>
+#include <asm/ppc.h>
 
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
diff --git a/board/xes/xpedite550x/tlb.c b/board/xes/xpedite550x/tlb.c
index 7cb6cd677067..5dc0c1e1460a 100644
--- a/board/xes/xpedite550x/tlb.c
+++ b/board/xes/xpedite550x/tlb.c
@@ -7,8 +7,8 @@
  * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
  */
 
-#include <common.h>
 #include <asm/mmu.h>
+#include <asm/ppc.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/xes/xpedite550x/xpedite550x.c b/board/xes/xpedite550x/xpedite550x.c
index 9089a0cc72a0..9347b8958853 100644
--- a/board/xes/xpedite550x/xpedite550x.c
+++ b/board/xes/xpedite550x/xpedite550x.c
@@ -12,6 +12,7 @@
 #include <asm/fsl_pci.h>
 #include <asm/io.h>
 #include <asm/cache.h>
+#include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <pca953x.h>
diff --git a/cmd/bdinfo.c b/cmd/bdinfo.c
index f9fe3cd0e155..fa6146705d95 100644
--- a/cmd/bdinfo.c
+++ b/cmd/bdinfo.c
@@ -14,6 +14,7 @@
 #include <vsprintf.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/common/board_f.c b/common/board_f.c
index adf8c837358d..fa83d964ceb1 100644
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -53,6 +53,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/sections.h>
+#include <asm/u-boot.h>
 #include <dm/root.h>
 #include <linux/errno.h>
 #include <linux/string.h>
diff --git a/common/board_r.c b/common/board_r.c
index 1a1ac932d23e..469362c103ea 100644
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -23,6 +23,7 @@
 #include <net.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <u-boot/crc.h>
 /* TODO: can we just include all these headers whether needed or not? */
 #if defined(CONFIG_CMD_BEDBUG)
diff --git a/common/bootm_os.c b/common/bootm_os.c
index 295c6b8c0642..9c78bba8e61d 100644
--- a/common/bootm_os.c
+++ b/common/bootm_os.c
@@ -15,6 +15,7 @@
 #include <lmb.h>
 #include <log.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <malloc.h>
 #include <mapmem.h>
diff --git a/common/image.c b/common/image.c
index ab0f0439bad2..e183a9cefa0b 100644
--- a/common/image.c
+++ b/common/image.c
@@ -16,6 +16,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <asm/cache.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
 #include <watchdog.h>
diff --git a/common/init/handoff.c b/common/init/handoff.c
index 0e7470ad78e1..0b8ac0d4d74a 100644
--- a/common/init/handoff.c
+++ b/common/init/handoff.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <handoff.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/ata/fsl_sata.c b/drivers/ata/fsl_sata.c
index d2f802aff86b..3f5c7c2a0b94 100644
--- a/drivers/ata/fsl_sata.c
+++ b/drivers/ata/fsl_sata.c
@@ -12,7 +12,7 @@
 #include <cpu_func.h>
 #include <log.h>
 #include <asm/io.h>
-#include <asm/processor.h>
+#include <asm/ppc.h>
 #include <asm/fsl_serdes.h>
 #include <malloc.h>
 #include <libata.h>
diff --git a/drivers/clk/mpc83xx_clk.c b/drivers/clk/mpc83xx_clk.c
index 9ec41d7705a0..fce12b025d6b 100644
--- a/drivers/clk/mpc83xx_clk.c
+++ b/drivers/clk/mpc83xx_clk.c
@@ -15,6 +15,7 @@
 #include <dm/lists.h>
 #include <dt-bindings/clk/mpc83xx-clk.h>
 #include <asm/arch/soc.h>
+#include <asm/ppc.h>
 #include <linux/bitops.h>
 
 #include "mpc83xx_clk.h"
diff --git a/drivers/cpu/mpc83xx_cpu.c b/drivers/cpu/mpc83xx_cpu.c
index 5f1592f9ad4a..5089c9d09fb8 100644
--- a/drivers/cpu/mpc83xx_cpu.c
+++ b/drivers/cpu/mpc83xx_cpu.c
@@ -11,6 +11,7 @@
 #include <dm.h>
 #include <log.h>
 #include <vsprintf.h>
+#include <asm/ppc.h>
 #include <linux/bitops.h>
 
 #include "mpc83xx_cpu.h"
diff --git a/drivers/ddr/altera/sdram_agilex.c b/drivers/ddr/altera/sdram_agilex.c
index d554df87ebac..1ddc35d5d3b1 100644
--- a/drivers/ddr/altera/sdram_agilex.c
+++ b/drivers/ddr/altera/sdram_agilex.c
@@ -14,6 +14,7 @@
 #include <ram.h>
 #include <reset.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include "sdram_soc64.h"
 #include <wait_bit.h>
 #include <asm/arch/firewall.h>
diff --git a/drivers/ddr/altera/sdram_s10.c b/drivers/ddr/altera/sdram_s10.c
index 6235bd959fe9..71c68d3e7a86 100644
--- a/drivers/ddr/altera/sdram_s10.c
+++ b/drivers/ddr/altera/sdram_s10.c
@@ -16,6 +16,7 @@
 #include <ram.h>
 #include <reset.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include "sdram_s10.h"
 #include <wait_bit.h>
 #include <asm/arch/firewall.h>
diff --git a/drivers/ddr/altera/sdram_soc64.c b/drivers/ddr/altera/sdram_soc64.c
index 1312244ae52f..5729588a0747 100644
--- a/drivers/ddr/altera/sdram_soc64.c
+++ b/drivers/ddr/altera/sdram_soc64.c
@@ -17,6 +17,7 @@
 #include <reset.h>
 #include <time.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 #include "sdram_soc64.h"
 #include <wait_bit.h>
diff --git a/drivers/ddr/fsl/mpc85xx_ddr_gen1.c b/drivers/ddr/fsl/mpc85xx_ddr_gen1.c
index 572f3703d51a..a449c8354584 100644
--- a/drivers/ddr/fsl/mpc85xx_ddr_gen1.c
+++ b/drivers/ddr/fsl/mpc85xx_ddr_gen1.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <log.h>
 #include <asm/io.h>
+#include <asm/ppc.h>
 #include <fsl_ddr_sdram.h>
 #include <linux/delay.h>
 
diff --git a/drivers/ddr/fsl/mpc85xx_ddr_gen2.c b/drivers/ddr/fsl/mpc85xx_ddr_gen2.c
index d7b8064e5f10..f91398ec0648 100644
--- a/drivers/ddr/fsl/mpc85xx_ddr_gen2.c
+++ b/drivers/ddr/fsl/mpc85xx_ddr_gen2.c
@@ -5,7 +5,7 @@
 
 #include <common.h>
 #include <asm/io.h>
-#include <asm/processor.h>
+#include <asm/ppc.h>
 #include <fsl_ddr_sdram.h>
 #include <linux/delay.h>
 
diff --git a/drivers/ddr/fsl/mpc85xx_ddr_gen3.c b/drivers/ddr/fsl/mpc85xx_ddr_gen3.c
index 1ed4d50cc743..f4f2f590db06 100644
--- a/drivers/ddr/fsl/mpc85xx_ddr_gen3.c
+++ b/drivers/ddr/fsl/mpc85xx_ddr_gen3.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <log.h>
 #include <asm/io.h>
+#include <asm/ppc.h>
 #include <fsl_ddr_sdram.h>
 #include <asm/processor.h>
 #include <linux/delay.h>
diff --git a/drivers/ddr/fsl/mpc86xx_ddr.c b/drivers/ddr/fsl/mpc86xx_ddr.c
index 43ed1ba432de..37a86f0aba9b 100644
--- a/drivers/ddr/fsl/mpc86xx_ddr.c
+++ b/drivers/ddr/fsl/mpc86xx_ddr.c
@@ -7,6 +7,7 @@
 #include <log.h>
 #include <asm/io.h>
 #include <fsl_ddr_sdram.h>
+#include <asm/ppc.h>
 #include <linux/delay.h>
 
 #if (CONFIG_CHIP_SELECTS_PER_CTRL > 4)
diff --git a/drivers/ddr/fsl/options.c b/drivers/ddr/fsl/options.c
index c000a45f8ea8..9e6175169ab3 100644
--- a/drivers/ddr/fsl/options.c
+++ b/drivers/ddr/fsl/options.c
@@ -11,9 +11,12 @@
 #include <log.h>
 
 #include <fsl_ddr.h>
+/* For get_ddr_freq() */
 #if defined(CONFIG_FSL_LSCH2) || defined(CONFIG_FSL_LSCH3) || \
 	defined(CONFIG_ARM)
 #include <asm/arch/clock.h>
+#else
+#include <asm/ppc.h>
 #endif
 
 /*
diff --git a/drivers/ddr/fsl/util.c b/drivers/ddr/fsl/util.c
index ac4f8d2732d7..c29215e84d8e 100644
--- a/drivers/ddr/fsl/util.c
+++ b/drivers/ddr/fsl/util.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #ifdef CONFIG_PPC
 #include <asm/fsl_law.h>
+#include <asm/ppc.h>
 #endif
 #include <div64.h>
 #include <linux/delay.h>
diff --git a/drivers/gpio/mpc83xx_gpio.c b/drivers/gpio/mpc83xx_gpio.c
index 276a3b350dc2..b5aaa64be476 100644
--- a/drivers/gpio/mpc83xx_gpio.c
+++ b/drivers/gpio/mpc83xx_gpio.c
@@ -8,6 +8,7 @@
 #include <mpc83xx.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
+#include <asm/ppc.h>
 
 #ifndef CONFIG_MPC83XX_GPIO_0_INIT_DIRECTION
 #define CONFIG_MPC83XX_GPIO_0_INIT_DIRECTION 0
diff --git a/drivers/misc/fsl_sec_mon.c b/drivers/misc/fsl_sec_mon.c
index 321bd27fd325..76aae5a74742 100644
--- a/drivers/misc/fsl_sec_mon.c
+++ b/drivers/misc/fsl_sec_mon.c
@@ -5,6 +5,9 @@
 
 #include <common.h>
 #include <fsl_sec_mon.h>
+#ifdef CONFIG_PPC
+#include <asm/ppc.h>
+#endif
 #include <linux/delay.h>
 
 static u32 get_sec_mon_state(void)
diff --git a/drivers/mmc/davinci_mmc.c b/drivers/mmc/davinci_mmc.c
index 9b2fe0653c65..50731f3fe7b0 100644
--- a/drivers/mmc/davinci_mmc.c
+++ b/drivers/mmc/davinci_mmc.c
@@ -16,6 +16,7 @@
 #include <asm/io.h>
 #include <asm/arch/sdmmc_defs.h>
 #include <asm-generic/gpio.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 
diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c
index 058ba8279408..a7c28f128e0f 100644
--- a/drivers/mmc/fsl_esdhc.c
+++ b/drivers/mmc/fsl_esdhc.c
@@ -24,7 +24,11 @@
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#ifdef CONFIG_ARCH_MPC830X
+#include <asm/ppc.h>
+#endif
 #include <dm.h>
+#include <asm/u-boot.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/drivers/mmc/fsl_esdhc_imx.c b/drivers/mmc/fsl_esdhc_imx.c
index c3806fd3e6fd..ebf64ab5c448 100644
--- a/drivers/mmc/fsl_esdhc_imx.c
+++ b/drivers/mmc/fsl_esdhc_imx.c
@@ -23,6 +23,7 @@
 #include <time.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index e8c2360f9768..e9c181555d01 100644
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@ -14,6 +14,7 @@
 #include <dm.h>
 #include <log.h>
 #include <time.h>
+#include <asm/u-boot.h>
 #include <dm/device-internal.h>
 #include <errno.h>
 #include <mmc.h>
diff --git a/drivers/mmc/mvebu_mmc.c b/drivers/mmc/mvebu_mmc.c
index 8101f6bcc277..b33cd40faee2 100644
--- a/drivers/mmc/mvebu_mmc.c
+++ b/drivers/mmc/mvebu_mmc.c
@@ -19,6 +19,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
 #include <mvebu_mmc.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/mmc/mxcmmc.c b/drivers/mmc/mxcmmc.c
index 5ca4a5140e1b..00720c64084a 100644
--- a/drivers/mmc/mxcmmc.c
+++ b/drivers/mmc/mxcmmc.c
@@ -24,6 +24,7 @@
 #include <malloc.h>
 #include <mmc.h>
 #include <time.h>
+#include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
diff --git a/drivers/mmc/mxsmmc.c b/drivers/mmc/mxsmmc.c
index 5bb12b612e3e..4df872cc3ecf 100644
--- a/drivers/mmc/mxsmmc.c
+++ b/drivers/mmc/mxsmmc.c
@@ -24,6 +24,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <mmc.h>
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/net/armada100_fec.c b/drivers/net/armada100_fec.c
index 2dbd2d870b35..375f1b139999 100644
--- a/drivers/net/armada100_fec.c
+++ b/drivers/net/armada100_fec.c
@@ -17,6 +17,7 @@
 #include <netdev.h>
 #include <asm/types.h>
 #include <asm/byteorder.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/mii.h>
diff --git a/drivers/net/at91_emac.c b/drivers/net/at91_emac.c
index b62829387888..62263cb435a1 100644
--- a/drivers/net/at91_emac.c
+++ b/drivers/net/at91_emac.c
@@ -18,6 +18,7 @@
 #include <netdev.h>
 #include <malloc.h>
 #include <miiphy.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/mii.h>
 #include <linux/string.h>
diff --git a/drivers/net/ax88180.c b/drivers/net/ax88180.c
index a679b6529ff2..b971c16a6543 100644
--- a/drivers/net/ax88180.c
+++ b/drivers/net/ax88180.c
@@ -42,6 +42,7 @@
 #include <log.h>
 #include <net.h>
 #include <malloc.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/mii.h>
 #include <linux/string.h>
diff --git a/drivers/net/bcm-sf2-eth.c b/drivers/net/bcm-sf2-eth.c
index 7ffdd87449ac..2e8642086331 100644
--- a/drivers/net/bcm-sf2-eth.c
+++ b/drivers/net/bcm-sf2-eth.c
@@ -8,6 +8,7 @@
 #include <malloc.h>
 #include <net.h>
 #include <config.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/printk.h>
 #include <linux/string.h>
diff --git a/drivers/net/calxedaxgmac.c b/drivers/net/calxedaxgmac.c
index 75b519ccfd1e..ff8131fafc2f 100644
--- a/drivers/net/calxedaxgmac.c
+++ b/drivers/net/calxedaxgmac.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <malloc.h>
 #include <net.h>
+#include <asm/u-boot.h>
 #include <linux/compiler.h>
 #include <linux/delay.h>
 #include <linux/err.h>
diff --git a/drivers/net/dc2114x.c b/drivers/net/dc2114x.c
index 8eacba7083c4..fea6ad77d0a5 100644
--- a/drivers/net/dc2114x.c
+++ b/drivers/net/dc2114x.c
@@ -7,6 +7,7 @@
 #include <net.h>
 #include <netdev.h>
 #include <pci.h>
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/string.h>
diff --git a/drivers/net/designware.c b/drivers/net/designware.c
index 490db2b69fc1..f325bf237315 100644
--- a/drivers/net/designware.c
+++ b/drivers/net/designware.c
@@ -21,6 +21,7 @@
 #include <reset.h>
 #include <time.h>
 #include <asm/cache.h>
+#include <asm/u-boot.h>
 #include <dm/device_compat.h>
 #include <dm/devres.h>
 #include <linux/compiler.h>
diff --git a/drivers/net/dm9000x.c b/drivers/net/dm9000x.c
index 9860830da092..928c6d858561 100644
--- a/drivers/net/dm9000x.c
+++ b/drivers/net/dm9000x.c
@@ -55,6 +55,7 @@ TODO: external MII is not functional, only internal at the moment.
 #include <time.h>
 #include <asm/io.h>
 #include <dm9000.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 
diff --git a/drivers/net/dnet.c b/drivers/net/dnet.c
index 888a9990efef..4efb8199dfbb 100644
--- a/drivers/net/dnet.c
+++ b/drivers/net/dnet.c
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <log.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 cf2c56cd123b..9613af44422b 100644
--- a/drivers/net/e1000.c
+++ b/drivers/net/e1000.c
@@ -39,6 +39,7 @@ tested on both gig copper and gig fiber boards
 #include <memalign.h>
 #include <net.h>
 #include <pci.h>
+#include <asm/u-boot.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 392d44f89d75..9ff078176b8c 100644
--- a/drivers/net/eepro100.c
+++ b/drivers/net/eepro100.c
@@ -12,6 +12,7 @@
 #include <net.h>
 #include <netdev.h>
 #include <pci.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 
diff --git a/drivers/net/ep93xx_eth.c b/drivers/net/ep93xx_eth.c
index a72d9c2471dd..72ad7936d63d 100644
--- a/drivers/net/ep93xx_eth.c
+++ b/drivers/net/ep93xx_eth.c
@@ -24,6 +24,7 @@
 #include <asm/io.h>
 #include <malloc.h>
 #include <miiphy.h>
+#include <asm/u-boot.h>
 #include <linux/bug.h>
 #include <linux/printk.h>
 #include <linux/string.h>
diff --git a/drivers/net/ethoc.c b/drivers/net/ethoc.c
index 7c56b7242d49..f158c7625bd5 100644
--- a/drivers/net/ethoc.c
+++ b/drivers/net/ethoc.c
@@ -14,6 +14,7 @@
 #include <dm.h>
 #include <log.h>
 #include <time.h>
+#include <asm/u-boot.h>
 #include <dm/platform_data/net_ethoc.h>
 #include <linux/io.h>
 #include <malloc.h>
diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c
index eef443f5f63e..1d8bdb9e12f5 100644
--- a/drivers/net/fec_mxc.c
+++ b/drivers/net/fec_mxc.c
@@ -20,6 +20,7 @@
 #include <time.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 #include <power/regulator.h>
diff --git a/drivers/net/fec_mxc.h b/drivers/net/fec_mxc.h
index 5ccde9193b2f..20e1712a077c 100644
--- a/drivers/net/fec_mxc.h
+++ b/drivers/net/fec_mxc.h
@@ -17,6 +17,7 @@
 #define __FEC_MXC_H
 
 #include <clk.h>
+#include <asm/u-boot.h>
 
 /* Layout description of the FEC */
 struct ethernet_regs {
diff --git a/drivers/net/fm/eth.c b/drivers/net/fm/eth.c
index 252f96787994..358643c70fb0 100644
--- a/drivers/net/fm/eth.c
+++ b/drivers/net/fm/eth.c
@@ -24,6 +24,7 @@
 #include <fsl_dtsec.h>
 #include <fsl_tgec.h>
 #include <fsl_memac.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 
diff --git a/drivers/net/fm/init.c b/drivers/net/fm/init.c
index 8f1a45b3a22e..b779b5c22998 100644
--- a/drivers/net/fm/init.c
+++ b/drivers/net/fm/init.c
@@ -14,6 +14,7 @@
 #else
 #include <asm/fsl_serdes.h>
 #endif
+#include <asm/u-boot.h>
 #include <linux/string.h>
 
 #include "fm.h"
diff --git a/drivers/net/fm/memac_phy.c b/drivers/net/fm/memac_phy.c
index 53e0760833cb..72246192b3c6 100644
--- a/drivers/net/fm/memac_phy.c
+++ b/drivers/net/fm/memac_phy.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <fsl_memac.h>
 #include <fm_eth.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 
 #ifdef CONFIG_SYS_MEMAC_LITTLE_ENDIAN
diff --git a/drivers/net/fm/tgec_phy.c b/drivers/net/fm/tgec_phy.c
index ad6c08e431c4..390444187964 100644
--- a/drivers/net/fm/tgec_phy.c
+++ b/drivers/net/fm/tgec_phy.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <fsl_tgec.h>
 #include <fm_eth.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 
 /*
diff --git a/drivers/net/fsl-mc/mc.c b/drivers/net/fsl-mc/mc.c
index e088d1fc12dc..1ce12ae5db91 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 <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/bug.h>
 #include <asm/io.h>
 #include <linux/delay.h>
diff --git a/drivers/net/fsl_mcdmafec.c b/drivers/net/fsl_mcdmafec.c
index 62f9d00ece34..1c2449d18f4a 100644
--- a/drivers/net/fsl_mcdmafec.c
+++ b/drivers/net/fsl_mcdmafec.c
@@ -19,6 +19,7 @@
 #include <net.h>
 #include <miiphy.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/mii.h>
 #include <asm/immap.h>
diff --git a/drivers/net/fsl_mdio.c b/drivers/net/fsl_mdio.c
index 5f692a27f23c..a06b72013352 100644
--- a/drivers/net/fsl_mdio.c
+++ b/drivers/net/fsl_mdio.c
@@ -10,6 +10,7 @@
 #include <phy.h>
 #include <fsl_mdio.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 
diff --git a/drivers/net/ftmac100.c b/drivers/net/ftmac100.c
index c61d13aa21f8..763e0f72318c 100644
--- a/drivers/net/ftmac100.c
+++ b/drivers/net/ftmac100.c
@@ -14,6 +14,7 @@
 #include <net.h>
 #include <time.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/io.h>
 #include <linux/string.h>
diff --git a/drivers/net/ftmac110.c b/drivers/net/ftmac110.c
index f186148b6197..449bb9873559 100644
--- a/drivers/net/ftmac110.c
+++ b/drivers/net/ftmac110.c
@@ -13,6 +13,7 @@
 #include <net.h>
 #include <time.h>
 #include <asm/cache.h>
+#include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <asm/io.h>
 #include <linux/dma-mapping.h>
diff --git a/drivers/net/ks8851_mll.c b/drivers/net/ks8851_mll.c
index d22668446da1..be4da897b8d4 100644
--- a/drivers/net/ks8851_mll.c
+++ b/drivers/net/ks8851_mll.c
@@ -11,6 +11,7 @@
 #include <malloc.h>
 #include <net.h>
 #include <miiphy.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 
 #include "ks8851_mll.h"
diff --git a/drivers/net/lan91c96.c b/drivers/net/lan91c96.c
index 524e9455ccf5..bcaa18747f4d 100644
--- a/drivers/net/lan91c96.c
+++ b/drivers/net/lan91c96.c
@@ -49,6 +49,7 @@
 #include <env.h>
 #include <malloc.h>
 #include <time.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 #include "lan91c96.h"
diff --git a/drivers/net/ldpaa_eth/ldpaa_eth.c b/drivers/net/ldpaa_eth/ldpaa_eth.c
index d5384b216ab2..c4befd9028b6 100644
--- a/drivers/net/ldpaa_eth/ldpaa_eth.c
+++ b/drivers/net/ldpaa_eth/ldpaa_eth.c
@@ -16,6 +16,7 @@
 #include <hwconfig.h>
 #include <phy.h>
 #include <miiphy.h>
+#include <asm/u-boot.h>
 #include <linux/bug.h>
 #include <linux/compat.h>
 #include <fsl-mc/fsl_dpmac.h>
diff --git a/drivers/net/lpc32xx_eth.c b/drivers/net/lpc32xx_eth.c
index b059accf5247..4b4b09b54389 100644
--- a/drivers/net/lpc32xx_eth.c
+++ b/drivers/net/lpc32xx_eth.c
@@ -12,6 +12,7 @@
 #include <malloc.h>
 #include <miiphy.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/types.h>
diff --git a/drivers/net/macb.c b/drivers/net/macb.c
index 26939c6fa466..ec8817799da0 100644
--- a/drivers/net/macb.c
+++ b/drivers/net/macb.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <log.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 
diff --git a/drivers/net/mcffec.c b/drivers/net/mcffec.c
index 2d307b23afb6..d5bead5e2ce3 100644
--- a/drivers/net/mcffec.c
+++ b/drivers/net/mcffec.c
@@ -20,6 +20,7 @@
 #include <asm/fec.h>
 #include <asm/global_data.h>
 #include <asm/immap.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/mii.h>
 #include <linux/string.h>
diff --git a/drivers/net/mpc8xx_fec.c b/drivers/net/mpc8xx_fec.c
index b6f805683e2c..08bb4a7693a0 100644
--- a/drivers/net/mpc8xx_fec.c
+++ b/drivers/net/mpc8xx_fec.c
@@ -13,6 +13,8 @@
 #include <asm/cpm_8xx.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <asm/ppc.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 
diff --git a/drivers/net/mvgbe.c b/drivers/net/mvgbe.c
index 5ceb37324f31..54febc7ce42c 100644
--- a/drivers/net/mvgbe.c
+++ b/drivers/net/mvgbe.c
@@ -20,6 +20,7 @@
 #include <wait_bit.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/types.h>
diff --git a/drivers/net/natsemi.c b/drivers/net/natsemi.c
index e44787d33ba9..5f81d22bf0e0 100644
--- a/drivers/net/natsemi.c
+++ b/drivers/net/natsemi.c
@@ -56,6 +56,7 @@
 #include <netdev.h>
 #include <asm/io.h>
 #include <pci.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 
diff --git a/drivers/net/ne2000_base.c b/drivers/net/ne2000_base.c
index 2fad46712201..409c41a179b3 100644
--- a/drivers/net/ne2000_base.c
+++ b/drivers/net/ne2000_base.c
@@ -79,6 +79,7 @@ Add SNMP
 #include <net.h>
 #include <malloc.h>
 #include <time.h>
+#include <asm/u-boot.h>
 #include <linux/compiler.h>
 #include <linux/string.h>
 
diff --git a/drivers/net/ns8382x.c b/drivers/net/ns8382x.c
index 7192156a698c..7ae60e8a3e78 100644
--- a/drivers/net/ns8382x.c
+++ b/drivers/net/ns8382x.c
@@ -57,6 +57,7 @@
 #include <netdev.h>
 #include <asm/io.h>
 #include <pci.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 
diff --git a/drivers/net/pcnet.c b/drivers/net/pcnet.c
index 405ae75d0862..ec8e07339304 100644
--- a/drivers/net/pcnet.c
+++ b/drivers/net/pcnet.c
@@ -17,6 +17,7 @@
 #include <asm/cache.h>
 #include <asm/io.h>
 #include <pci.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 
diff --git a/drivers/net/rtl8139.c b/drivers/net/rtl8139.c
index 1229e94185cb..f52fa66a4eb2 100644
--- a/drivers/net/rtl8139.c
+++ b/drivers/net/rtl8139.c
@@ -77,6 +77,7 @@
 #include <netdev.h>
 #include <asm/io.h>
 #include <pci.h>
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/string.h>
diff --git a/drivers/net/rtl8169.c b/drivers/net/rtl8169.c
index 9157dd1e351a..683e5d5d9e94 100644
--- a/drivers/net/rtl8169.c
+++ b/drivers/net/rtl8169.c
@@ -54,6 +54,7 @@
 #include <asm/cache.h>
 #include <asm/io.h>
 #include <pci.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/printk.h>
 #include <linux/string.h>
diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c
index 8f2fe1515e67..5ea0adb6b102 100644
--- a/drivers/net/sh_eth.c
+++ b/drivers/net/sh_eth.c
@@ -19,6 +19,7 @@
 #include <miiphy.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/io.h>
diff --git a/drivers/net/smc91111.c b/drivers/net/smc91111.c
index 3ae55a1db7da..a341bca51cf1 100644
--- a/drivers/net/smc91111.c
+++ b/drivers/net/smc91111.c
@@ -52,6 +52,7 @@
 #include <config.h>
 #include <malloc.h>
 #include <time.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 #include "smc91111.h"
diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
index 0ac1e3fb3d76..6f3521651171 100644
--- a/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.c
@@ -10,6 +10,7 @@
 #include <malloc.h>
 #include <net.h>
 #include <miiphy.h>
+#include <asm/u-boot.h>
 #include <linux/io.h>
 #include <linux/delay.h>
 #include <linux/string.h>
diff --git a/drivers/net/ti/cpsw.c b/drivers/net/ti/cpsw.c
index 044a74776c35..921d56394267 100644
--- a/drivers/net/ti/cpsw.c
+++ b/drivers/net/ti/cpsw.c
@@ -15,6 +15,7 @@
 #include <net.h>
 #include <netdev.h>
 #include <cpsw.h>
+#include <asm/u-boot.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/compiler.h>
diff --git a/drivers/net/tsec.c b/drivers/net/tsec.c
index b7623bf85b13..5ab450cf8a4f 100644
--- a/drivers/net/tsec.c
+++ b/drivers/net/tsec.c
@@ -15,6 +15,7 @@
 #include <command.h>
 #include <tsec.h>
 #include <fsl_mdio.h>
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/net/uli526x.c b/drivers/net/uli526x.c
index 3784f72b87e8..d6bc29c0c102 100644
--- a/drivers/net/uli526x.c
+++ b/drivers/net/uli526x.c
@@ -16,6 +16,7 @@
 #include <asm/io.h>
 #include <pci.h>
 #include <miiphy.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 
diff --git a/drivers/net/vsc9953.c b/drivers/net/vsc9953.c
index 29f26b4b3320..a4c701e86a30 100644
--- a/drivers/net/vsc9953.c
+++ b/drivers/net/vsc9953.c
@@ -17,6 +17,7 @@
 #include <malloc.h>
 #include <vsc9953.h>
 #include <ethsw.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 
 static struct vsc9953_info vsc9953_l2sw = {
diff --git a/drivers/pci/fsl_pci_init.c b/drivers/pci/fsl_pci_init.c
index ffd160439fdf..4f3f21e72936 100644
--- a/drivers/pci/fsl_pci_init.c
+++ b/drivers/pci/fsl_pci_init.c
@@ -10,6 +10,7 @@
 #include <malloc.h>
 #include <asm/fsl_serdes.h>
 #include <asm/global_data.h>
+#include <asm/ppc.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 
diff --git a/drivers/pci/pci-uclass.c b/drivers/pci/pci-uclass.c
index 9aa616ccfa9e..ccf842781479 100644
--- a/drivers/pci/pci-uclass.c
+++ b/drivers/pci/pci-uclass.c
@@ -13,6 +13,7 @@
 #include <pci.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <asm/u-boot.h>
 #include <dm/device-internal.h>
 #include <dm/lists.h>
 #if defined(CONFIG_X86) && defined(CONFIG_HAVE_FSP)
diff --git a/drivers/pci/pcie_fsl.c b/drivers/pci/pcie_fsl.c
index 3ba7d5b7a013..80786e68cb3b 100644
--- a/drivers/pci/pcie_fsl.c
+++ b/drivers/pci/pcie_fsl.c
@@ -11,6 +11,7 @@
 #include <malloc.h>
 #include <mapmem.h>
 #include <pci.h>
+#include <asm/immap_85xx.h>
 #include <asm/fsl_pci.h>
 #include <asm/fsl_serdes.h>
 #include <asm/global_data.h>
diff --git a/drivers/pci/pcie_layerscape_fixup.c b/drivers/pci/pcie_layerscape_fixup.c
index 8315b0b59023..7f5d6f693c5c 100644
--- a/drivers/pci/pcie_layerscape_fixup.c
+++ b/drivers/pci/pcie_layerscape_fixup.c
@@ -19,6 +19,7 @@
 #ifdef CONFIG_ARM
 #include <asm/arch/clock.h>
 #endif
+#include <asm/u-boot.h>
 #include "pcie_layerscape.h"
 #include "pcie_layerscape_fixup_common.h"
 
diff --git a/drivers/pci/pcie_layerscape_fixup_common.c b/drivers/pci/pcie_layerscape_fixup_common.c
index bba410e386f6..b1a7578ec435 100644
--- a/drivers/pci/pcie_layerscape_fixup_common.c
+++ b/drivers/pci/pcie_layerscape_fixup_common.c
@@ -11,6 +11,7 @@
 #include <init.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/soc.h>
+#include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <linux/string.h>
 #include "pcie_layerscape_fixup_common.h"
diff --git a/drivers/pci/pcie_layerscape_fixup_common.h b/drivers/pci/pcie_layerscape_fixup_common.h
index 70bd3f0cba31..0d9504fe6720 100644
--- a/drivers/pci/pcie_layerscape_fixup_common.h
+++ b/drivers/pci/pcie_layerscape_fixup_common.h
@@ -10,6 +10,7 @@
 #define _PCIE_LAYERSCAPE_FIXUP_COMMON_H_
 
 #include <common.h>
+#include <asm/u-boot.h>
 
 void ft_pci_setup_ls(void *blob, struct bd_info *bd);
 
diff --git a/drivers/pci/pcie_layerscape_gen4_fixup.c b/drivers/pci/pcie_layerscape_gen4_fixup.c
index 148b5d17ed05..ad329f7dd555 100644
--- a/drivers/pci/pcie_layerscape_gen4_fixup.c
+++ b/drivers/pci/pcie_layerscape_gen4_fixup.c
@@ -20,6 +20,7 @@
 #ifdef CONFIG_ARM
 #include <asm/arch/clock.h>
 #endif
+#include <asm/u-boot.h>
 #include "pcie_layerscape_gen4.h"
 #include "pcie_layerscape_fixup_common.h"
 
diff --git a/drivers/qe/uec.c b/drivers/qe/uec.c
index 409d806dd8f3..3d2a37466a50 100644
--- a/drivers/qe/uec.c
+++ b/drivers/qe/uec.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <net.h>
 #include <malloc.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/io.h>
diff --git a/drivers/ram/mpc83xx_sdram.c b/drivers/ram/mpc83xx_sdram.c
index 2a78291deb5e..f37812d4c5d9 100644
--- a/drivers/ram/mpc83xx_sdram.c
+++ b/drivers/ram/mpc83xx_sdram.c
@@ -11,6 +11,7 @@
 #include <ram.h>
 #include <asm/bitops.h>
 #include <asm/global_data.h>
+#include <asm/ppc.h>
 #include <dt-bindings/memory/mpc83xx-sdram.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/serial/serial_mpc8xx.c b/drivers/serial/serial_mpc8xx.c
index 0978930dcd4f..7f0d130963d5 100644
--- a/drivers/serial/serial_mpc8xx.c
+++ b/drivers/serial/serial_mpc8xx.c
@@ -11,6 +11,7 @@
 #include <watchdog.h>
 #include <asm/cpm_8xx.h>
 #include <asm/global_data.h>
+#include <asm/ppc.h>
 #include <linux/compiler.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/spi/mpc8xx_spi.c b/drivers/spi/mpc8xx_spi.c
index 0026ad23e376..f7981b8638cd 100644
--- a/drivers/spi/mpc8xx_spi.c
+++ b/drivers/spi/mpc8xx_spi.c
@@ -24,6 +24,7 @@
 
 #include <asm/cpm_8xx.h>
 #include <asm/io.h>
+#include <asm/ppc.h>
 
 #define CPM_SPI_BASE_RX	CPM_SPI_BASE
 #define CPM_SPI_BASE_TX	(CPM_SPI_BASE + sizeof(cbd_t))
diff --git a/drivers/sysreset/sysreset_mpc83xx.c b/drivers/sysreset/sysreset_mpc83xx.c
index ddd7e26d6968..0da8d5b3a577 100644
--- a/drivers/sysreset/sysreset_mpc83xx.c
+++ b/drivers/sysreset/sysreset_mpc83xx.c
@@ -11,6 +11,7 @@
 #include <sysreset.h>
 #include <wait_bit.h>
 #include <asm/global_data.h>
+#include <asm/ppc.h>
 #include <linux/delay.h>
 
 #include "sysreset_mpc83xx.h"
diff --git a/drivers/timer/mpc83xx_timer.c b/drivers/timer/mpc83xx_timer.c
index 51ad79aa6eb2..f1eb1a9d115c 100644
--- a/drivers/timer/mpc83xx_timer.c
+++ b/drivers/timer/mpc83xx_timer.c
@@ -16,6 +16,7 @@
 #include <watchdog.h>
 #include <asm/global_data.h>
 #include <asm/ptrace.h>
+#include <asm/ppc.h>
 #include <linux/bitops.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/usb/common/fsl-dt-fixup.c b/drivers/usb/common/fsl-dt-fixup.c
index 5fc887c7cf70..bda8885d7cd3 100644
--- a/drivers/usb/common/fsl-dt-fixup.c
+++ b/drivers/usb/common/fsl-dt-fixup.c
@@ -15,6 +15,7 @@
 #include <fsl_errata.h>
 #include <fsl_usb.h>
 #include <fdt_support.h>
+#include <asm/u-boot.h>
 #include <linux/string.h>
 
 #ifndef CONFIG_USB_MAX_CONTROLLER_COUNT
diff --git a/drivers/usb/eth/asix.c b/drivers/usb/eth/asix.c
index 3a0d8dadb35e..c649813600b5 100644
--- a/drivers/usb/eth/asix.c
+++ b/drivers/usb/eth/asix.c
@@ -12,6 +12,7 @@
 #include <usb.h>
 #include <malloc.h>
 #include <memalign.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/mii.h>
 #include <linux/string.h>
diff --git a/drivers/usb/eth/asix88179.c b/drivers/usb/eth/asix88179.c
index b4249d9ad51e..f26b47dcb6a3 100644
--- a/drivers/usb/eth/asix88179.c
+++ b/drivers/usb/eth/asix88179.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <usb.h>
 #include <net.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/mii.h>
 #include <linux/string.h>
diff --git a/drivers/usb/eth/mcs7830.c b/drivers/usb/eth/mcs7830.c
index 5cdd7a10e7c2..c9bbc4035c1f 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 <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/mii.h>
 #include <malloc.h>
diff --git a/drivers/usb/eth/r8152.c b/drivers/usb/eth/r8152.c
index 40947150a0b0..0f37a5aaea56 100644
--- a/drivers/usb/eth/r8152.c
+++ b/drivers/usb/eth/r8152.c
@@ -12,6 +12,7 @@
 #include <memalign.h>
 #include <net.h>
 #include <usb.h>
+#include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/mii.h>
 #include <linux/bitops.h>
diff --git a/drivers/usb/eth/smsc95xx.c b/drivers/usb/eth/smsc95xx.c
index 5d8e93c23379..f12e67bf238d 100644
--- a/drivers/usb/eth/smsc95xx.c
+++ b/drivers/usb/eth/smsc95xx.c
@@ -15,6 +15,7 @@
 #include <net.h>
 #include <time.h>
 #include <usb.h>
+#include <asm/u-boot.h>
 #include <asm/unaligned.h>
 #include <linux/delay.h>
 #include <linux/mii.h>
diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c
index 0f9195c7a5c9..4489db3613e1 100644
--- a/drivers/usb/gadget/ether.c
+++ b/drivers/usb/gadget/ether.c
@@ -13,6 +13,7 @@
 #include <log.h>
 #include <part.h>
 #include <time.h>
+#include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <linux/netdevice.h>
 #include <linux/printk.h>
diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c
index f9e3c1ac43e7..bc1e999b7614 100644
--- a/drivers/video/cfb_console.c
+++ b/drivers/video/cfb_console.c
@@ -75,6 +75,7 @@
 #include <malloc.h>
 #include <video.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/compiler.h>
 #include <linux/string.h>
 
diff --git a/drivers/video/fsl_diu_fb.c b/drivers/video/fsl_diu_fb.c
index e90e23779d79..eb3f2393ec93 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 <asm/io.h>
+#include <asm/ppc.h>
 #include <linux/string.h>
 
 #include "videomodes.h"
diff --git a/drivers/watchdog/mpc8xx_wdt.c b/drivers/watchdog/mpc8xx_wdt.c
index 3cb50ab091fc..45e679d35159 100644
--- a/drivers/watchdog/mpc8xx_wdt.c
+++ b/drivers/watchdog/mpc8xx_wdt.c
@@ -10,6 +10,7 @@
 #include <mpc8xx.h>
 #include <asm/cpm_8xx.h>
 #include <asm/io.h>
+#include <asm/ppc.h>
 #include <linux/string.h>
 
 void hw_watchdog_reset(void)
diff --git a/drivers/xen/events.c b/drivers/xen/events.c
index c490f87b2fca..9a481dc0d717 100644
--- a/drivers/xen/events.c
+++ b/drivers/xen/events.c
@@ -18,6 +18,7 @@
 #include <log.h>
 
 #include <asm/io.h>
+#include <asm/ptrace.h>
 #include <asm/xen/system.h>
 
 #include <xen/events.h>
diff --git a/include/asm-generic/global_data.h b/include/asm-generic/global_data.h
index d4a4e2215dc6..7a6b90d7da07 100644
--- a/include/asm-generic/global_data.h
+++ b/include/asm-generic/global_data.h
@@ -22,6 +22,7 @@
 #ifndef __ASSEMBLY__
 #include <fdtdec.h>
 #include <membuff.h>
+#include <asm/u-boot.h>
 #include <linux/list.h>
 
 typedef struct global_data {
diff --git a/include/asm-generic/u-boot.h b/include/asm-generic/u-boot.h
index 62e61d41cc9c..3d4f2247e2ca 100644
--- a/include/asm-generic/u-boot.h
+++ b/include/asm-generic/u-boot.h
@@ -24,6 +24,7 @@
 #ifndef __ASSEMBLY__
 
 #include <asm/types.h>
+#include <asm/u-boot.h>
 #include <linux/types.h>
 
 struct bd_info {
diff --git a/include/button.h b/include/button.h
index 688b63b082c6..ee14fadf0cfd 100644
--- a/include/button.h
+++ b/include/button.h
@@ -6,6 +6,8 @@
 #ifndef __BUTTON_H
 #define __BUTTON_H
 
+struct udevice;
+
 /**
  * struct button_uc_plat - Platform data the uclass stores about each device
  *
diff --git a/include/common.h b/include/common.h
index 69fa19324832..6407748e53d6 100644
--- a/include/common.h
+++ b/include/common.h
@@ -19,7 +19,6 @@
 #include <stdarg.h>
 #include <stdio.h>
 #include <linux/kernel.h>
-#include <asm/u-boot.h> /* boot information for Linux kernel */
 #include <vsprintf.h>
 #endif	/* __ASSEMBLY__ */
 
diff --git a/include/dm/test.h b/include/dm/test.h
index b2adce730adb..d895d96bceed 100644
--- a/include/dm/test.h
+++ b/include/dm/test.h
@@ -6,6 +6,8 @@
 #ifndef __DM_TEST_H
 #define __DM_TEST_H
 
+struct udevice;
+
 /**
  * struct dm_test_cdata - configuration data for test instance
  *
diff --git a/include/fdtdec.h b/include/fdtdec.h
index 760b392bdfbc..138c1e9b5908 100644
--- a/include/fdtdec.h
+++ b/include/fdtdec.h
@@ -14,6 +14,7 @@
  * changes to support FDT are minimized.
  */
 
+#include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <pci.h>
 
diff --git a/include/fm_eth.h b/include/fm_eth.h
index 44da014c66c7..0a6000137b1f 100644
--- a/include/fm_eth.h
+++ b/include/fm_eth.h
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <phy.h>
 #include <asm/types.h>
+#include <asm/u-boot.h>
 
 enum fm_port {
 	FM1_DTSEC1,
diff --git a/include/fsl-mc/fsl_mc.h b/include/fsl-mc/fsl_mc.h
index a8b072ad7c1b..732b4953b5d1 100644
--- a/include/fsl-mc/fsl_mc.h
+++ b/include/fsl-mc/fsl_mc.h
@@ -7,6 +7,7 @@
 #define __FSL_MC_H__
 
 #include <common.h>
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 
 #define MC_CCSR_BASE_ADDR \
diff --git a/include/fsl_errata.h b/include/fsl_errata.h
index 88f4268658a1..4d3ce3b1eb1c 100644
--- a/include/fsl_errata.h
+++ b/include/fsl_errata.h
@@ -8,7 +8,7 @@
 
 #include <common.h>
 #if defined(CONFIG_PPC)
-#include <asm/processor.h>
+#include <asm/ppc.h>
 #elif defined(CONFIG_ARCH_LS1021A)
 #include <asm/arch-ls102xa/immap_ls102xa.h>
 #elif defined(CONFIG_FSL_LAYERSCAPE)
diff --git a/include/fsl_esdhc.h b/include/fsl_esdhc.h
index 7f8f8edc621f..e15d10c669de 100644
--- a/include/fsl_esdhc.h
+++ b/include/fsl_esdhc.h
@@ -207,6 +207,7 @@ void fdt_fixup_esdhc(void *blob, struct bd_info *bd);
 static inline int fsl_esdhc_execute_tuning(struct udevice *dev,
 					   uint32_t opcode) {return 0; }
 #endif
+#include <asm/u-boot.h>
 #else
 static inline int fsl_esdhc_mmc_init(struct bd_info *bis) { return -ENOSYS; }
 static inline void fdt_fixup_esdhc(void *blob, struct bd_info *bd) {}
diff --git a/include/fsl_esdhc_imx.h b/include/fsl_esdhc_imx.h
index 45ed635a77bf..78f0e18dde37 100644
--- a/include/fsl_esdhc_imx.h
+++ b/include/fsl_esdhc_imx.h
@@ -12,6 +12,7 @@
 #ifndef __FSL_ESDHC_IMX_H__
 #define __FSL_ESDHC_IMX_H__
 
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <asm/byteorder.h>
diff --git a/include/fsl_ifc.h b/include/fsl_ifc.h
index fd915335b2c2..1985244d3b92 100644
--- a/include/fsl_ifc.h
+++ b/include/fsl_ifc.h
@@ -13,6 +13,8 @@
 #include <part.h>
 #ifdef CONFIG_ARM
 #include <asm/arch/soc.h>
+#else
+#include <asm/ppc.h>
 #endif
 
 #define FSL_IFC_V1_1_0	0x01010000
diff --git a/include/fsl_mdio.h b/include/fsl_mdio.h
index 41cb73717bc9..b8fed2a0d2c0 100644
--- a/include/fsl_mdio.h
+++ b/include/fsl_mdio.h
@@ -10,6 +10,7 @@
 
 #include <net.h>
 #include <miiphy.h>
+#include <asm/u-boot.h>
 
 struct tsec_mii_mng {
 	u32 miimcfg;		/* MII management configuration reg */
diff --git a/include/mmc.h b/include/mmc.h
index 82562193cc48..c1562a61ea5b 100644
--- a/include/mmc.h
+++ b/include/mmc.h
@@ -9,6 +9,7 @@
 #ifndef _MMC_H_
 #define _MMC_H_
 
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/list.h>
 #include <linux/sizes.h>
diff --git a/include/mpc85xx.h b/include/mpc85xx.h
index 3753e47edfb5..cd3ad72f6258 100644
--- a/include/mpc85xx.h
+++ b/include/mpc85xx.h
@@ -6,6 +6,8 @@
 #ifndef	__MPC85xx_H__
 #define __MPC85xx_H__
 
+#include <config.h>
+
 #if defined(CONFIG_E500)
 #include <e500.h>
 #endif
diff --git a/include/mvebu_mmc.h b/include/mvebu_mmc.h
index a35e5a12ce8d..790199ca5e6a 100644
--- a/include/mvebu_mmc.h
+++ b/include/mvebu_mmc.h
@@ -12,6 +12,7 @@
 
 /* needed for the mmc_cfg definition */
 #include <mmc.h>
+#include <asm/u-boot.h>
 
 #define MMC_BLOCK_SIZE				512
 
diff --git a/include/net.h b/include/net.h
index 26163f9f097b..bf6e2f052272 100644
--- a/include/net.h
+++ b/include/net.h
@@ -12,6 +12,7 @@
 #ifndef __NET_H__
 #define __NET_H__
 
+#include <asm/u-boot.h>
 #include <linux/string.h>
 #include <linux/types.h>
 #include <asm/cache.h>
diff --git a/include/net/pfe_eth/pfe_eth.h b/include/net/pfe_eth/pfe_eth.h
index 92dc46ee9ac6..64ac9be763cc 100644
--- a/include/net/pfe_eth/pfe_eth.h
+++ b/include/net/pfe_eth/pfe_eth.h
@@ -7,6 +7,7 @@
 #ifndef __PFE_ETH_H__
 #define __PFE_ETH_H__
 
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/sizes.h>
 #include <asm/io.h>
diff --git a/include/netdev.h b/include/netdev.h
index 0ad9f8dc3a5c..52db3d56411f 100644
--- a/include/netdev.h
+++ b/include/netdev.h
@@ -11,6 +11,7 @@
 #ifndef _NETDEV_H_
 #define _NETDEV_H_
 #include <phy_interface.h>
+#include <asm/u-boot.h>
 
 struct udevice;
 
diff --git a/include/tsec.h b/include/tsec.h
index 43255e538f7d..630c30b63963 100644
--- a/include/tsec.h
+++ b/include/tsec.h
@@ -16,6 +16,7 @@
 #include <net.h>
 #include <config.h>
 #include <phy.h>
+#include <asm/u-boot.h>
 
 #define TSEC_MDIO_REGS_OFFSET	0x520
 
diff --git a/include/vsc9953.h b/include/vsc9953.h
index a9c84b4b50c7..604214ee32dd 100644
--- a/include/vsc9953.h
+++ b/include/vsc9953.h
@@ -11,6 +11,7 @@
 #include <config.h>
 #include <miiphy.h>
 #include <asm/types.h>
+#include <asm/u-boot.h>
 #include <linux/bitops.h>
 
 #define VSC9953_OFFSET			(CONFIG_SYS_CCSRBAR_DEFAULT + 0x800000)
diff --git a/lib/asm-offsets.c b/lib/asm-offsets.c
index ee592cfda1cc..e4fb52e87604 100644
--- a/lib/asm-offsets.c
+++ b/lib/asm-offsets.c
@@ -14,6 +14,7 @@
 #include <common.h>
 #include <asm-offsets.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 
 #include <linux/kbuild.h>
 
diff --git a/lib/fdtdec.c b/lib/fdtdec.c
index 37bacdd7b335..e938ea5ea303 100644
--- a/lib/fdtdec.c
+++ b/lib/fdtdec.c
@@ -13,6 +13,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <net.h>
+#include <asm/u-boot.h>
 #include <dm/of_extra.h>
 #include <env.h>
 #include <errno.h>
diff --git a/lib/lmb.c b/lib/lmb.c
index 75082f35599b..a7277dace165 100644
--- a/lib/lmb.c
+++ b/lib/lmb.c
@@ -11,6 +11,7 @@
 #include <lmb.h>
 #include <log.h>
 #include <malloc.h>
+#include <asm/u-boot.h>
 
 #define LMB_ALLOC_ANYWHERE	0
 
diff --git a/net/eth_legacy.c b/net/eth_legacy.c
index efd325d46ab2..4ea2dbbaaf67 100644
--- a/net/eth_legacy.c
+++ b/net/eth_legacy.c
@@ -14,6 +14,7 @@
 #include <net.h>
 #include <phy.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/bug.h>
 #include <linux/errno.h>
 #include <linux/string.h>
diff --git a/post/drivers/memory.c b/post/drivers/memory.c
index 281989da6fa7..05dbfc144c84 100644
--- a/post/drivers/memory.c
+++ b/post/drivers/memory.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <log.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 
 /* Memory test
  *
-- 
2.17.1

^ permalink raw reply related	[flat|nested] 35+ messages in thread

* [RFCv2 08/16] common: Drop stdio.h from common header
  2020-08-19 13:08 ` [RFCv2] common: Drop remaining includes in common.h Tom Rini
                     ` (6 preceding siblings ...)
  2020-08-19 13:08   ` [RFCv2 07/16] common: Drop asm/u-boot.h " Tom Rini
@ 2020-08-19 13:09   ` Tom Rini
  2020-08-19 13:09   ` [RFCv2 09/16] common: Drop stdarg.h " Tom Rini
                     ` (8 subsequent siblings)
  16 siblings, 0 replies; 35+ messages in thread
From: Tom Rini @ 2020-08-19 13:09 UTC (permalink / raw)
  To: u-boot

From: Simon Glass <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 +
 api/api_net.c                                              | 1 +
 api/api_storage.c                                          | 1 +
 arch/arc/lib/bootm.c                                       | 1 +
 arch/arc/lib/cpu.c                                         | 1 +
 arch/arc/lib/interrupts.c                                  | 1 +
 arch/arc/lib/reset.c                                       | 1 +
 arch/arm/cpu/arm1136/mx31/generic.c                        | 1 +
 arch/arm/cpu/arm1136/mx35/generic.c                        | 1 +
 arch/arm/cpu/arm926ejs/armada100/cpu.c                     | 1 +
 arch/arm/cpu/arm926ejs/armada100/dram.c                    | 1 +
 arch/arm/cpu/arm926ejs/mx25/generic.c                      | 1 +
 arch/arm/cpu/arm926ejs/mx27/generic.c                      | 1 +
 arch/arm/cpu/arm926ejs/mxs/mxs.c                           | 1 +
 arch/arm/cpu/arm926ejs/spear/cpu.c                         | 1 +
 arch/arm/cpu/arm926ejs/spear/reset.c                       | 1 +
 arch/arm/cpu/arm926ejs/spear/spl.c                         | 1 +
 arch/arm/cpu/arm926ejs/spear/spr_misc.c                    | 1 +
 arch/arm/cpu/armv7/bcm235xx/clk-bsc.c                      | 1 +
 arch/arm/cpu/armv7/bcm235xx/clk-core.c                     | 1 +
 arch/arm/cpu/armv7/bcm235xx/clk-core.h                     | 1 +
 arch/arm/cpu/armv7/bcm235xx/clk-eth.c                      | 1 +
 arch/arm/cpu/armv7/bcm235xx/clk-sdio.c                     | 1 +
 arch/arm/cpu/armv7/bcm235xx/clk-usb-otg.c                  | 1 +
 arch/arm/cpu/armv7/bcm281xx/clk-bsc.c                      | 1 +
 arch/arm/cpu/armv7/bcm281xx/clk-core.c                     | 1 +
 arch/arm/cpu/armv7/bcm281xx/clk-core.h                     | 1 +
 arch/arm/cpu/armv7/bcm281xx/clk-eth.c                      | 1 +
 arch/arm/cpu/armv7/bcm281xx/clk-sdio.c                     | 1 +
 arch/arm/cpu/armv7/bcm281xx/clk-usb-otg.c                  | 1 +
 arch/arm/cpu/armv7/iproc-common/armpll.c                   | 1 +
 arch/arm/cpu/armv7/ls102xa/clock.c                         | 1 +
 arch/arm/cpu/armv7/ls102xa/cpu.c                           | 1 +
 arch/arm/cpu/armv7/ls102xa/fdt.c                           | 1 +
 arch/arm/cpu/armv7/ls102xa/fsl_ls1_serdes.c                | 1 +
 arch/arm/cpu/armv7/s5p-common/cpu_info.c                   | 1 +
 arch/arm/cpu/armv7/stv0991/reset.c                         | 1 +
 arch/arm/cpu/armv7/vf610/generic.c                         | 1 +
 arch/arm/cpu/armv7/virt-v7.c                               | 1 +
 arch/arm/cpu/armv7m/cache.c                                | 1 +
 arch/arm/cpu/armv8/cache_v8.c                              | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/cpu.c                    | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/fdt.c                    | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_serdes.c       | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c        | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c       | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c        | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/icid.c                   | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/mp.c                     | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/ppa.c                    | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/soc.c                    | 1 +
 arch/arm/cpu/armv8/s32v234/cpu.c                           | 1 +
 arch/arm/cpu/armv8/s32v234/generic.c                       | 1 +
 arch/arm/cpu/armv8/sec_firmware.c                          | 1 +
 arch/arm/cpu/armv8/spin_table.c                            | 1 +
 arch/arm/cpu/pxa/cpuinfo.c                                 | 1 +
 arch/arm/include/asm/arch-mx7ulp/scg.h                     | 2 ++
 arch/arm/lib/bdinfo.c                                      | 1 +
 arch/arm/lib/bootm.c                                       | 1 +
 arch/arm/lib/cache-cp15.c                                  | 1 +
 arch/arm/lib/cache-pl310.c                                 | 1 +
 arch/arm/lib/cache.c                                       | 1 +
 arch/arm/lib/eabi_compat.c                                 | 1 +
 arch/arm/lib/image.c                                       | 1 +
 arch/arm/lib/interrupts.c                                  | 1 +
 arch/arm/lib/interrupts_64.c                               | 1 +
 arch/arm/lib/interrupts_m.c                                | 1 +
 arch/arm/lib/psci-dt.c                                     | 1 +
 arch/arm/lib/semihosting.c                                 | 1 +
 arch/arm/lib/zimage.c                                      | 1 +
 arch/arm/mach-at91/arm920t/clock.c                         | 1 +
 arch/arm/mach-at91/arm926ejs/clock.c                       | 1 +
 arch/arm/mach-at91/arm926ejs/cpu.c                         | 1 +
 arch/arm/mach-at91/arm926ejs/eflash.c                      | 1 +
 arch/arm/mach-at91/armv7/clock.c                           | 1 +
 arch/arm/mach-at91/armv7/cpu.c                             | 1 +
 arch/arm/mach-at91/clock.c                                 | 1 +
 arch/arm/mach-at91/phy.c                                   | 1 +
 arch/arm/mach-at91/spl.c                                   | 1 +
 arch/arm/mach-bcm283x/mbox.c                               | 1 +
 arch/arm/mach-bcm283x/msg.c                                | 1 +
 arch/arm/mach-davinci/misc.c                               | 1 +
 arch/arm/mach-davinci/spl.c                                | 1 +
 arch/arm/mach-exynos/clock.c                               | 1 +
 arch/arm/mach-imx/cache.c                                  | 1 +
 arch/arm/mach-imx/cmd_nandbcb.c                            | 1 +
 arch/arm/mach-imx/cpu.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/clock.c                             | 1 +
 arch/arm/mach-imx/imx8/cpu.c                               | 1 +
 arch/arm/mach-imx/imx8/fdt.c                               | 1 +
 arch/arm/mach-imx/imx8/image.c                             | 1 +
 arch/arm/mach-imx/imx8/iomux.c                             | 1 +
 arch/arm/mach-imx/imx8/misc.c                              | 1 +
 arch/arm/mach-imx/imx8/parse-container.c                   | 1 +
 arch/arm/mach-imx/imx8/snvs_security_sc.c                  | 1 +
 arch/arm/mach-imx/imx8m/clock_imx8mm.c                     | 1 +
 arch/arm/mach-imx/imx8m/clock_imx8mq.c                     | 1 +
 arch/arm/mach-imx/imx8m/soc.c                              | 1 +
 arch/arm/mach-imx/imx_bootaux.c                            | 1 +
 arch/arm/mach-imx/mx5/clock.c                              | 1 +
 arch/arm/mach-imx/mx6/clock.c                              | 1 +
 arch/arm/mach-imx/mx6/ddr.c                                | 1 +
 arch/arm/mach-imx/mx6/litesom.c                            | 1 +
 arch/arm/mach-imx/mx6/module_fuse.c                        | 1 +
 arch/arm/mach-imx/mx6/mp.c                                 | 1 +
 arch/arm/mach-imx/mx7/clock.c                              | 1 +
 arch/arm/mach-imx/mx7/clock_slice.c                        | 1 +
 arch/arm/mach-imx/mx7ulp/clock.c                           | 1 +
 arch/arm/mach-imx/mx7ulp/pcc.c                             | 1 +
 arch/arm/mach-imx/mx7ulp/scg.c                             | 1 +
 arch/arm/mach-imx/mx7ulp/soc.c                             | 1 +
 arch/arm/mach-imx/spl.c                                    | 1 +
 arch/arm/mach-imx/spl_imx_romapi.c                         | 1 +
 arch/arm/mach-imx/video.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/security.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/ddr3_spd.c                          | 1 +
 arch/arm/mach-keystone/init.c                              | 1 +
 arch/arm/mach-keystone/keystone.c                          | 1 +
 arch/arm/mach-keystone/mon.c                               | 1 +
 arch/arm/mach-keystone/psc.c                               | 1 +
 arch/arm/mach-kirkwood/cpu.c                               | 1 +
 arch/arm/mach-lpc32xx/cpu.c                                | 1 +
 arch/arm/mach-mediatek/mt7622/init.c                       | 1 +
 arch/arm/mach-mediatek/mt7623/init.c                       | 1 +
 arch/arm/mach-mediatek/mt7629/init.c                       | 1 +
 arch/arm/mach-mediatek/mt8516/init.c                       | 1 +
 arch/arm/mach-mediatek/mt8518/init.c                       | 1 +
 arch/arm/mach-meson/board-axg.c                            | 1 +
 arch/arm/mach-meson/board-common.c                         | 1 +
 arch/arm/mach-meson/board-g12a.c                           | 1 +
 arch/arm/mach-meson/board-gx.c                             | 1 +
 arch/arm/mach-meson/board-info.c                           | 1 +
 arch/arm/mach-meson/sm.c                                   | 1 +
 arch/arm/mach-mvebu/armada3700/cpu.c                       | 1 +
 arch/arm/mach-mvebu/cpu.c                                  | 1 +
 arch/arm/mach-mvebu/dram.c                                 | 1 +
 arch/arm/mach-mvebu/mbus.c                                 | 1 +
 arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec-38x.c  | 1 +
 arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec.c      | 1 +
 arch/arm/mach-mvebu/serdes/a38x/seq_exec.c                 | 1 +
 arch/arm/mach-mvebu/serdes/a38x/sys_env_lib.c              | 1 +
 arch/arm/mach-omap2/abb.c                                  | 1 +
 arch/arm/mach-omap2/am33xx/chilisom.c                      | 1 +
 arch/arm/mach-omap2/am33xx/clk_synthesizer.c               | 1 +
 arch/arm/mach-omap2/am33xx/clock.c                         | 1 +
 arch/arm/mach-omap2/am33xx/clock_am33xx.c                  | 1 +
 arch/arm/mach-omap2/am33xx/ddr.c                           | 1 +
 arch/arm/mach-omap2/am33xx/fdt.c                           | 1 +
 arch/arm/mach-omap2/am33xx/sys_info.c                      | 1 +
 arch/arm/mach-omap2/clocks-common.c                        | 1 +
 arch/arm/mach-omap2/emif-common.c                          | 1 +
 arch/arm/mach-omap2/fdt-common.c                           | 1 +
 arch/arm/mach-omap2/hwinit-common.c                        | 1 +
 arch/arm/mach-omap2/omap3/am35x_musb.c                     | 1 +
 arch/arm/mach-omap2/omap3/board.c                          | 1 +
 arch/arm/mach-omap2/omap3/sys_info.c                       | 1 +
 arch/arm/mach-omap2/omap4/hw_data.c                        | 1 +
 arch/arm/mach-omap2/omap5/dra7xx_iodelay.c                 | 1 +
 arch/arm/mach-omap2/omap5/fdt.c                            | 1 +
 arch/arm/mach-omap2/omap5/hw_data.c                        | 1 +
 arch/arm/mach-omap2/omap5/sdram.c                          | 1 +
 arch/arm/mach-omap2/pipe3-phy.c                            | 1 +
 arch/arm/mach-omap2/sec-common.c                           | 1 +
 arch/arm/mach-omap2/utils.c                                | 1 +
 arch/arm/mach-omap2/vc.c                                   | 1 +
 arch/arm/mach-orion5x/cpu.c                                | 1 +
 arch/arm/mach-owl/soc.c                                    | 1 +
 arch/arm/mach-rmobile/board.c                              | 1 +
 arch/arm/mach-rmobile/cpu_info.c                           | 1 +
 arch/arm/mach-rockchip/board.c                             | 1 +
 arch/arm/mach-rockchip/boot_mode.c                         | 1 +
 arch/arm/mach-rockchip/bootrom.c                           | 1 +
 arch/arm/mach-rockchip/cpu-info.c                          | 1 +
 arch/arm/mach-rockchip/misc.c                              | 1 +
 arch/arm/mach-rockchip/rk3288/rk3288.c                     | 1 +
 arch/arm/mach-rockchip/rk3308/rk3308.c                     | 1 +
 arch/arm/mach-rockchip/spl.c                               | 1 +
 arch/arm/mach-rockchip/tpl.c                               | 1 +
 arch/arm/mach-s5pc1xx/clock.c                              | 1 +
 arch/arm/mach-snapdragon/dram.c                            | 1 +
 arch/arm/mach-socfpga/board.c                              | 1 +
 arch/arm/mach-socfpga/clock_manager_agilex.c               | 1 +
 arch/arm/mach-socfpga/clock_manager_arria10.c              | 1 +
 arch/arm/mach-socfpga/clock_manager_gen5.c                 | 1 +
 arch/arm/mach-socfpga/clock_manager_s10.c                  | 1 +
 arch/arm/mach-socfpga/mailbox_s10.c                        | 1 +
 arch/arm/mach-socfpga/misc_arria10.c                       | 1 +
 arch/arm/mach-socfpga/misc_gen5.c                          | 1 +
 arch/arm/mach-socfpga/misc_s10.c                           | 1 +
 arch/arm/mach-socfpga/reset_manager_gen5.c                 | 1 +
 arch/arm/mach-socfpga/spl_a10.c                            | 1 +
 arch/arm/mach-socfpga/spl_gen5.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_serial.c     | 1 +
 arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_usb.c        | 1 +
 arch/arm/mach-stm32mp/cpu.c                                | 1 +
 arch/arm/mach-stm32mp/fdt.c                                | 1 +
 arch/arm/mach-stm32mp/spl.c                                | 1 +
 arch/arm/mach-sunxi/clock_sun4i.c                          | 1 +
 arch/arm/mach-sunxi/cpu_info.c                             | 1 +
 arch/arm/mach-sunxi/dram_sun9i.c                           | 1 +
 arch/arm/mach-tegra/ap.c                                   | 1 +
 arch/arm/mach-tegra/board2.c                               | 1 +
 arch/arm/mach-tegra/cboot.c                                | 1 +
 arch/arm/mach-tegra/clock.c                                | 1 +
 arch/arm/mach-tegra/cmd_enterrcm.c                         | 1 +
 arch/arm/mach-tegra/cpu.c                                  | 1 +
 arch/arm/mach-tegra/pinmux-common.c                        | 1 +
 arch/arm/mach-tegra/pmc.c                                  | 1 +
 arch/arm/mach-tegra/sys_info.c                             | 1 +
 arch/arm/mach-tegra/tegra114/clock.c                       | 1 +
 arch/arm/mach-tegra/tegra124/clock.c                       | 1 +
 arch/arm/mach-tegra/tegra20/clock.c                        | 1 +
 arch/arm/mach-tegra/tegra20/warmboot.c                     | 1 +
 arch/arm/mach-tegra/tegra210/clock.c                       | 1 +
 arch/arm/mach-tegra/tegra30/clock.c                        | 1 +
 arch/arm/mach-u8500/cpuinfo.c                              | 1 +
 arch/arm/mach-uniphier/micro-support-card.c                | 1 +
 arch/arm/mach-versal/cpu.c                                 | 1 +
 arch/arm/mach-versal/mp.c                                  | 1 +
 arch/arm/mach-zynq/clk.c                                   | 1 +
 arch/arm/mach-zynq/cpu.c                                   | 1 +
 arch/arm/mach-zynq/ddrc.c                                  | 1 +
 arch/arm/mach-zynq/spl.c                                   | 1 +
 arch/arm/mach-zynqmp/cpu.c                                 | 1 +
 arch/arm/mach-zynqmp/mp.c                                  | 1 +
 arch/arm/mach-zynqmp/spl.c                                 | 1 +
 arch/m68k/cpu/mcf5227x/cpu.c                               | 1 +
 arch/m68k/cpu/mcf523x/cpu.c                                | 1 +
 arch/m68k/cpu/mcf52x2/cpu.c                                | 1 +
 arch/m68k/cpu/mcf530x/cpu.c                                | 1 +
 arch/m68k/cpu/mcf532x/cpu.c                                | 1 +
 arch/m68k/cpu/mcf5445x/cpu.c                               | 1 +
 arch/m68k/cpu/mcf547x_8x/cpu.c                             | 1 +
 arch/m68k/lib/bootm.c                                      | 1 +
 arch/m68k/lib/fec.c                                        | 1 +
 arch/m68k/lib/traps.c                                      | 1 +
 arch/microblaze/cpu/exception.c                            | 1 +
 arch/microblaze/cpu/interrupts.c                           | 1 +
 arch/microblaze/lib/bootm.c                                | 1 +
 arch/mips/lib/cache.c                                      | 1 +
 arch/mips/lib/traps.c                                      | 1 +
 arch/mips/mach-ath79/ar934x/clk.c                          | 1 +
 arch/mips/mach-ath79/cpu.c                                 | 1 +
 arch/mips/mach-ath79/reset.c                               | 1 +
 arch/mips/mach-jz47xx/jz4780/jz4780.c                      | 1 +
 arch/mips/mach-jz47xx/jz4780/pll.c                         | 1 +
 arch/mips/mach-mscc/dram.c                                 | 1 +
 arch/mips/mach-mtmips/cpu.c                                | 1 +
 arch/mips/mach-mtmips/mt7628/init.c                        | 1 +
 arch/mips/mach-octeon/cpu.c                                | 1 +
 arch/mips/mach-pic32/cpu.c                                 | 1 +
 arch/nds32/lib/bootm.c                                     | 1 +
 arch/nds32/lib/interrupts.c                                | 1 +
 arch/nios2/cpu/cpu.c                                       | 1 +
 arch/powerpc/cpu/mpc83xx/cpu.c                             | 1 +
 arch/powerpc/cpu/mpc83xx/cpu_init.c                        | 1 +
 arch/powerpc/cpu/mpc83xx/ecc.c                             | 1 +
 arch/powerpc/cpu/mpc83xx/pci.c                             | 1 +
 arch/powerpc/cpu/mpc83xx/pcie.c                            | 1 +
 arch/powerpc/cpu/mpc83xx/spd_sdram.c                       | 1 +
 arch/powerpc/cpu/mpc83xx/speed.c                           | 1 +
 arch/powerpc/cpu/mpc83xx/spl_minimal.c                     | 1 +
 arch/powerpc/cpu/mpc83xx/traps.c                           | 1 +
 arch/powerpc/cpu/mpc85xx/bsc9132_serdes.c                  | 1 +
 arch/powerpc/cpu/mpc85xx/c29x_serdes.c                     | 1 +
 arch/powerpc/cpu/mpc85xx/cmd_errata.c                      | 1 +
 arch/powerpc/cpu/mpc85xx/cpu.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_corenet2_serdes.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/mpc8536_serdes.c                  | 1 +
 arch/powerpc/cpu/mpc85xx/mpc8544_serdes.c                  | 1 +
 arch/powerpc/cpu/mpc85xx/mpc8548_serdes.c                  | 1 +
 arch/powerpc/cpu/mpc85xx/mpc8568_serdes.c                  | 1 +
 arch/powerpc/cpu/mpc85xx/mpc8569_serdes.c                  | 1 +
 arch/powerpc/cpu/mpc85xx/mpc8572_serdes.c                  | 1 +
 arch/powerpc/cpu/mpc85xx/p1010_serdes.c                    | 1 +
 arch/powerpc/cpu/mpc85xx/p1021_serdes.c                    | 1 +
 arch/powerpc/cpu/mpc85xx/p1022_serdes.c                    | 1 +
 arch/powerpc/cpu/mpc85xx/p1023_serdes.c                    | 1 +
 arch/powerpc/cpu/mpc85xx/p2020_serdes.c                    | 1 +
 arch/powerpc/cpu/mpc85xx/pci.c                             | 1 +
 arch/powerpc/cpu/mpc85xx/portals.c                         | 1 +
 arch/powerpc/cpu/mpc85xx/speed.c                           | 1 +
 arch/powerpc/cpu/mpc85xx/tlb.c                             | 1 +
 arch/powerpc/cpu/mpc85xx/traps.c                           | 1 +
 arch/powerpc/cpu/mpc86xx/cpu.c                             | 1 +
 arch/powerpc/cpu/mpc86xx/fdt.c                             | 1 +
 arch/powerpc/cpu/mpc86xx/interrupts.c                      | 1 +
 arch/powerpc/cpu/mpc86xx/mp.c                              | 1 +
 arch/powerpc/cpu/mpc86xx/mpc8610_serdes.c                  | 1 +
 arch/powerpc/cpu/mpc86xx/mpc8641_serdes.c                  | 1 +
 arch/powerpc/cpu/mpc86xx/traps.c                           | 1 +
 arch/powerpc/cpu/mpc8xx/cpu.c                              | 1 +
 arch/powerpc/cpu/mpc8xx/immap.c                            | 1 +
 arch/powerpc/cpu/mpc8xx/interrupts.c                       | 1 +
 arch/powerpc/cpu/mpc8xx/traps.c                            | 1 +
 arch/powerpc/cpu/mpc8xxx/fdt.c                             | 1 +
 arch/powerpc/cpu/mpc8xxx/fsl_lbc.c                         | 1 +
 arch/powerpc/cpu/mpc8xxx/fsl_pamu.c                        | 1 +
 arch/powerpc/cpu/mpc8xxx/law.c                             | 1 +
 arch/powerpc/cpu/mpc8xxx/srio.c                            | 1 +
 arch/powerpc/lib/bat_rw.c                                  | 1 +
 arch/powerpc/lib/bdinfo.c                                  | 1 +
 arch/powerpc/lib/bootm.c                                   | 1 +
 arch/riscv/lib/bootm.c                                     | 1 +
 arch/riscv/lib/fdt_fixup.c                                 | 1 +
 arch/riscv/lib/image.c                                     | 1 +
 arch/riscv/lib/interrupts.c                                | 1 +
 arch/riscv/lib/reset.c                                     | 1 +
 arch/sandbox/cpu/cpu.c                                     | 1 +
 arch/sandbox/cpu/sdl.c                                     | 1 +
 arch/sandbox/cpu/spl.c                                     | 1 +
 arch/sandbox/cpu/start.c                                   | 1 +
 arch/sandbox/cpu/state.c                                   | 1 +
 arch/sandbox/lib/bootm.c                                   | 1 +
 arch/sh/cpu/sh4/cpu.c                                      | 1 +
 arch/sh/lib/bootm.c                                        | 1 +
 arch/x86/cpu/apollolake/cpu_spl.c                          | 1 +
 arch/x86/cpu/broadwell/cpu.c                               | 1 +
 arch/x86/cpu/broadwell/iobp.c                              | 1 +
 arch/x86/cpu/broadwell/northbridge.c                       | 1 +
 arch/x86/cpu/broadwell/sdram.c                             | 1 +
 arch/x86/cpu/coreboot/coreboot.c                           | 1 +
 arch/x86/cpu/coreboot/sdram.c                              | 1 +
 arch/x86/cpu/cpu.c                                         | 1 +
 arch/x86/cpu/efi/payload.c                                 | 1 +
 arch/x86/cpu/i386/cpu.c                                    | 1 +
 arch/x86/cpu/i386/interrupt.c                              | 1 +
 arch/x86/cpu/intel_common/cpu.c                            | 1 +
 arch/x86/cpu/intel_common/microcode.c                      | 1 +
 arch/x86/cpu/intel_common/mrc.c                            | 1 +
 arch/x86/cpu/irq.c                                         | 1 +
 arch/x86/cpu/ivybridge/bd82x6x.c                           | 1 +
 arch/x86/cpu/ivybridge/cpu.c                               | 1 +
 arch/x86/cpu/ivybridge/early_me.c                          | 1 +
 arch/x86/cpu/ivybridge/lpc.c                               | 1 +
 arch/x86/cpu/ivybridge/sdram.c                             | 1 +
 arch/x86/cpu/mp_init.c                                     | 1 +
 arch/x86/cpu/qfw_cpu.c                                     | 1 +
 arch/x86/lib/acpi_s3.c                                     | 1 +
 arch/x86/lib/acpi_table.c                                  | 1 +
 arch/x86/lib/bios_interrupts.c                             | 1 +
 arch/x86/lib/bootm.c                                       | 1 +
 arch/x86/lib/fsp/fsp_graphics.c                            | 1 +
 arch/x86/lib/fsp2/fsp_meminit.c                            | 1 +
 arch/x86/lib/interrupts.c                                  | 1 +
 arch/x86/lib/mrccache.c                                    | 1 +
 arch/x86/lib/pirq_routing.c                                | 1 +
 arch/x86/lib/pmu.c                                         | 1 +
 arch/x86/lib/relocate.c                                    | 1 +
 arch/x86/lib/scu.c                                         | 1 +
 arch/x86/lib/spl.c                                         | 1 +
 arch/x86/lib/tables.c                                      | 1 +
 arch/x86/lib/tpl.c                                         | 1 +
 arch/x86/lib/zimage.c                                      | 1 +
 arch/xtensa/cpu/cpu.c                                      | 1 +
 arch/xtensa/cpu/exceptions.c                               | 1 +
 arch/xtensa/lib/bootm.c                                    | 1 +
 board/AndesTech/adp-ae3xx/adp-ae3xx.c                      | 1 +
 board/AndesTech/adp-ag101p/adp-ag101p.c                    | 1 +
 board/Arcturus/ucp1020/cmd_arc.c                           | 1 +
 board/Arcturus/ucp1020/ddr.c                               | 1 +
 board/Arcturus/ucp1020/spl.c                               | 1 +
 board/Arcturus/ucp1020/spl_minimal.c                       | 1 +
 board/Arcturus/ucp1020/ucp1020.c                           | 1 +
 board/BuR/brppt1/board.c                                   | 1 +
 board/BuR/brppt2/board.c                                   | 1 +
 board/BuR/brsmarc1/board.c                                 | 1 +
 board/BuR/brxre1/board.c                                   | 1 +
 board/BuR/common/br_resetc.c                               | 1 +
 board/BuR/common/common.c                                  | 1 +
 board/BuS/eb_cpu5282/eb_cpu5282.c                          | 1 +
 board/CZ.NIC/turris_mox/turris_mox.c                       | 1 +
 board/CZ.NIC/turris_omnia/turris_omnia.c                   | 1 +
 board/CarMediaLab/flea3/flea3.c                            | 1 +
 board/LaCie/common/common.c                                | 1 +
 board/LaCie/net2big_v2/net2big_v2.c                        | 1 +
 board/Marvell/db-88f6720/db-88f6720.c                      | 1 +
 board/Marvell/db-88f6820-amc/db-88f6820-amc.c              | 1 +
 board/Marvell/db-88f6820-gp/db-88f6820-gp.c                | 1 +
 board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c                | 1 +
 board/Marvell/db-xc3-24g4xg/db-xc3-24g4xg.c                | 1 +
 board/Marvell/dreamplug/dreamplug.c                        | 1 +
 board/Marvell/gplugd/gplugd.c                              | 1 +
 board/Marvell/guruplug/guruplug.c                          | 1 +
 board/Marvell/mvebu_armada-37xx/board.c                    | 1 +
 board/Marvell/mvebu_armada-8k/board.c                      | 1 +
 board/Marvell/openrd/openrd.c                              | 1 +
 board/Marvell/sheevaplug/sheevaplug.c                      | 1 +
 board/Seagate/dockstar/dockstar.c                          | 1 +
 board/Seagate/goflexhome/goflexhome.c                      | 1 +
 board/Seagate/nas220/nas220.c                              | 1 +
 board/Synology/ds109/ds109.c                               | 1 +
 board/Synology/ds414/cmd_syno.c                            | 1 +
 board/Synology/ds414/ds414.c                               | 1 +
 board/advantech/dms-ba16/dms-ba16.c                        | 1 +
 board/advantech/imx8qm_rom7720_a1/imx8qm_rom7720_a1.c      | 1 +
 board/advantech/imx8qm_rom7720_a1/spl.c                    | 1 +
 board/alliedtelesis/x530/x530.c                            | 1 +
 board/aristainetos/aristainetos.c                          | 1 +
 board/armadeus/apf27/apf27.c                               | 1 +
 board/armadeus/opos6uldev/board.c                          | 1 +
 board/armltd/integrator/integrator.c                       | 1 +
 board/armltd/vexpress/vexpress_common.c                    | 1 +
 board/armltd/vexpress/vexpress_tc2.c                       | 1 +
 board/armltd/vexpress64/pcie.c                             | 1 +
 board/armltd/vexpress64/vexpress64.c                       | 1 +
 board/astro/mcf5373l/fpga.c                                | 1 +
 board/astro/mcf5373l/mcf5373l.c                            | 1 +
 board/atmel/common/board.c                                 | 1 +
 board/bachmann/ot1200/ot1200.c                             | 1 +
 board/barco/platinum/platinum.c                            | 1 +
 board/barco/titanium/titanium.c                            | 1 +
 board/beacon/imx8mm/spl.c                                  | 1 +
 board/beckhoff/mx53cx9020/mx53cx9020.c                     | 1 +
 board/bluegiga/apx4devkit/apx4devkit.c                     | 1 +
 board/bluewater/gurnard/gurnard.c                          | 1 +
 board/bosch/guardian/board.c                               | 1 +
 board/bosch/shc/board.c                                    | 1 +
 board/bosch/shc/mux.c                                      | 1 +
 board/boundary/nitrogen6x/nitrogen6x.c                     | 1 +
 board/broadcom/bcm23550_w1d/bcm23550_w1d.c                 | 1 +
 board/broadcom/bcm28155_ap/bcm28155_ap.c                   | 1 +
 board/broadcom/bcm963158/bcm963158.c                       | 1 +
 board/broadcom/bcm968360bg/bcm968360bg.c                   | 1 +
 board/broadcom/bcm968580xref/bcm968580xref.c               | 1 +
 board/broadcom/bcm_ep/board.c                              | 1 +
 board/buffalo/lsxl/lsxl.c                                  | 1 +
 board/cadence/xtfpga/xtfpga.c                              | 1 +
 board/cavium/thunderx/atf.c                                | 1 +
 board/cavium/thunderx/thunderx.c                           | 1 +
 board/ccv/xpress/xpress.c                                  | 1 +
 board/cirrus/edb93xx/edb93xx.c                             | 1 +
 board/cloudengines/pogo_e02/pogo_e02.c                     | 1 +
 board/compulab/cl-som-imx7/cl-som-imx7.c                   | 1 +
 board/compulab/cl-som-imx7/spl.c                           | 1 +
 board/compulab/cm_fx6/cm_fx6.c                             | 1 +
 board/compulab/cm_fx6/spl.c                                | 1 +
 board/compulab/cm_t335/cm_t335.c                           | 1 +
 board/compulab/cm_t335/spl.c                               | 1 +
 board/compulab/cm_t43/cm_t43.c                             | 1 +
 board/compulab/common/common.c                             | 1 +
 board/compulab/common/eeprom.c                             | 1 +
 board/compulab/common/omap3_display.c                      | 1 +
 board/compulab/common/omap3_smc911x.c                      | 1 +
 board/congatec/cgtqmx6eval/cgtqmx6eval.c                   | 1 +
 board/congatec/conga-qeval20-qa3-e3845/conga-qeval20-qa3.c | 1 +
 board/corscience/tricorder/tricorder-eeprom.c              | 1 +
 board/corscience/tricorder/tricorder.c                     | 1 +
 board/cortina/presidio-asic/presidio.c                     | 1 +
 board/cssi/MCR3000/MCR3000.c                               | 1 +
 board/d-link/dns325/dns325.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_imx6/dh_imx6_spl.c                  | 1 +
 board/dhelectronics/dh_stm32mp1/board.c                    | 1 +
 board/egnite/ethernut5/ethernut5_pwrman.c                  | 1 +
 board/el/el6x/el6x.c                                       | 1 +
 board/embest/mx6boards/mx6boards.c                         | 1 +
 board/engicam/common/spl.c                                 | 1 +
 board/esd/meesc/meesc.c                                    | 1 +
 board/esd/vme8349/caddy.c                                  | 1 +
 board/esd/vme8349/pci.c                                    | 1 +
 board/esd/vme8349/vme8349.c                                | 1 +
 board/firefly/firefly-rk3308/roc_cc_rk3308.c               | 1 +
 board/freescale/common/cmd_esbc_validate.c                 | 1 +
 board/freescale/common/dcu_sii9022a.c                      | 1 +
 board/freescale/common/diu_ch7301.c                        | 1 +
 board/freescale/common/emc2305.c                           | 1 +
 board/freescale/common/fsl_chain_of_trust.c                | 1 +
 board/freescale/common/fsl_validate.c                      | 1 +
 board/freescale/common/mc34vr500.c                         | 1 +
 board/freescale/common/ngpixis.c                           | 1 +
 board/freescale/common/pfuze.c                             | 1 +
 board/freescale/common/pixis.c                             | 1 +
 board/freescale/common/pq-mds-pib.c                        | 1 +
 board/freescale/common/qixis.c                             | 1 +
 board/freescale/common/sys_eeprom.c                        | 1 +
 board/freescale/common/vid.c                               | 1 +
 board/freescale/corenet_ds/corenet_ds.c                    | 1 +
 board/freescale/corenet_ds/ddr.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/imx8mm_evk/spl.c                           | 1 +
 board/freescale/imx8mn_evk/spl.c                           | 1 +
 board/freescale/imx8mp_evk/spl.c                           | 1 +
 board/freescale/imx8mq_evk/spl.c                           | 1 +
 board/freescale/imx8qm_mek/imx8qm_mek.c                    | 1 +
 board/freescale/imx8qm_mek/spl.c                           | 1 +
 board/freescale/imx8qxp_mek/imx8qxp_mek.c                  | 1 +
 board/freescale/imx8qxp_mek/spl.c                          | 1 +
 board/freescale/ls1012afrdm/eth.c                          | 1 +
 board/freescale/ls1012afrdm/ls1012afrdm.c                  | 1 +
 board/freescale/ls1012aqds/eth.c                           | 1 +
 board/freescale/ls1012aqds/ls1012aqds.c                    | 1 +
 board/freescale/ls1012ardb/eth.c                           | 1 +
 board/freescale/ls1012ardb/ls1012ardb.c                    | 1 +
 board/freescale/ls1021aiot/dcu.c                           | 1 +
 board/freescale/ls1021aiot/ls1021aiot.c                    | 1 +
 board/freescale/ls1021aqds/dcu.c                           | 1 +
 board/freescale/ls1021aqds/ddr.c                           | 1 +
 board/freescale/ls1021aqds/eth.c                           | 1 +
 board/freescale/ls1021aqds/ls1021aqds.c                    | 1 +
 board/freescale/ls1021atwr/dcu.c                           | 1 +
 board/freescale/ls1021atwr/ls1021atwr.c                    | 1 +
 board/freescale/ls1028a/ls1028a.c                          | 1 +
 board/freescale/ls1043aqds/ddr.c                           | 1 +
 board/freescale/ls1043aqds/eth.c                           | 1 +
 board/freescale/ls1043aqds/ls1043aqds.c                    | 1 +
 board/freescale/ls1043ardb/cpld.c                          | 1 +
 board/freescale/ls1043ardb/ddr.c                           | 1 +
 board/freescale/ls1043ardb/eth.c                           | 1 +
 board/freescale/ls1043ardb/ls1043ardb.c                    | 1 +
 board/freescale/ls1046afrwy/eth.c                          | 1 +
 board/freescale/ls1046afrwy/ls1046afrwy.c                  | 1 +
 board/freescale/ls1046aqds/ddr.c                           | 1 +
 board/freescale/ls1046aqds/eth.c                           | 1 +
 board/freescale/ls1046aqds/ls1046aqds.c                    | 1 +
 board/freescale/ls1046ardb/cpld.c                          | 1 +
 board/freescale/ls1046ardb/ddr.c                           | 1 +
 board/freescale/ls1046ardb/eth.c                           | 1 +
 board/freescale/ls1046ardb/ls1046ardb.c                    | 1 +
 board/freescale/ls1088a/ddr.c                              | 1 +
 board/freescale/ls1088a/eth_ls1088aqds.c                   | 1 +
 board/freescale/ls1088a/eth_ls1088ardb.c                   | 1 +
 board/freescale/ls1088a/ls1088a.c                          | 1 +
 board/freescale/ls2080a/ddr.c                              | 1 +
 board/freescale/ls2080a/ls2080a.c                          | 1 +
 board/freescale/ls2080aqds/ddr.c                           | 1 +
 board/freescale/ls2080aqds/eth.c                           | 1 +
 board/freescale/ls2080aqds/ls2080aqds.c                    | 1 +
 board/freescale/ls2080ardb/ddr.c                           | 1 +
 board/freescale/ls2080ardb/eth_ls2080rdb.c                 | 1 +
 board/freescale/ls2080ardb/ls2080ardb.c                    | 1 +
 board/freescale/lx2160a/eth_lx2160aqds.c                   | 1 +
 board/freescale/lx2160a/eth_lx2160ardb.c                   | 1 +
 board/freescale/lx2160a/lx2160a.c                          | 1 +
 board/freescale/m5208evbe/m5208evbe.c                      | 1 +
 board/freescale/m52277evb/m52277evb.c                      | 1 +
 board/freescale/m5235evb/m5235evb.c                        | 1 +
 board/freescale/m5249evb/m5249evb.c                        | 1 +
 board/freescale/m5253demo/flash.c                          | 1 +
 board/freescale/m5253demo/m5253demo.c                      | 1 +
 board/freescale/m5275evb/m5275evb.c                        | 1 +
 board/freescale/m53017evb/m53017evb.c                      | 1 +
 board/freescale/m5329evb/m5329evb.c                        | 1 +
 board/freescale/m5373evb/m5373evb.c                        | 1 +
 board/freescale/m54418twr/m54418twr.c                      | 1 +
 board/freescale/m54451evb/m54451evb.c                      | 1 +
 board/freescale/m54455evb/m54455evb.c                      | 1 +
 board/freescale/m547xevb/m547xevb.c                        | 1 +
 board/freescale/m548xevb/m548xevb.c                        | 1 +
 board/freescale/mpc8308rdb/mpc8308rdb.c                    | 1 +
 board/freescale/mpc8313erdb/mpc8313erdb.c                  | 1 +
 board/freescale/mpc8313erdb/sdram.c                        | 1 +
 board/freescale/mpc8315erdb/mpc8315erdb.c                  | 1 +
 board/freescale/mpc8315erdb/sdram.c                        | 1 +
 board/freescale/mpc8323erdb/mpc8323erdb.c                  | 1 +
 board/freescale/mpc832xemds/mpc832xemds.c                  | 1 +
 board/freescale/mpc832xemds/pci.c                          | 1 +
 board/freescale/mpc8349emds/ddr.c                          | 1 +
 board/freescale/mpc8349emds/mpc8349emds.c                  | 1 +
 board/freescale/mpc8349emds/pci.c                          | 1 +
 board/freescale/mpc8349itx/mpc8349itx.c                    | 1 +
 board/freescale/mpc837xemds/mpc837xemds.c                  | 1 +
 board/freescale/mpc837xerdb/mpc837xerdb.c                  | 1 +
 board/freescale/mpc8541cds/mpc8541cds.c                    | 1 +
 board/freescale/mpc8544ds/mpc8544ds.c                      | 1 +
 board/freescale/mpc8548cds/mpc8548cds.c                    | 1 +
 board/freescale/mpc8555cds/mpc8555cds.c                    | 1 +
 board/freescale/mpc8568mds/mpc8568mds.c                    | 1 +
 board/freescale/mpc8569mds/mpc8569mds.c                    | 1 +
 board/freescale/mpc8572ds/ddr.c                            | 1 +
 board/freescale/mpc8572ds/mpc8572ds.c                      | 1 +
 board/freescale/mpc8610hpcd/mpc8610hpcd.c                  | 1 +
 board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c              | 1 +
 board/freescale/mpc8641hpcn/ddr.c                          | 1 +
 board/freescale/mpc8641hpcn/mpc8641hpcn.c                  | 1 +
 board/freescale/mx23evk/mx23evk.c                          | 1 +
 board/freescale/mx25pdk/mx25pdk.c                          | 1 +
 board/freescale/mx28evk/mx28evk.c                          | 1 +
 board/freescale/mx35pdk/mx35pdk.c                          | 1 +
 board/freescale/mx51evk/mx51evk.c                          | 1 +
 board/freescale/mx51evk/mx51evk_video.c                    | 1 +
 board/freescale/mx53ard/mx53ard.c                          | 1 +
 board/freescale/mx53evk/mx53evk.c                          | 1 +
 board/freescale/mx53loco/mx53loco.c                        | 1 +
 board/freescale/mx53loco/mx53loco_video.c                  | 1 +
 board/freescale/mx53smd/mx53smd.c                          | 1 +
 board/freescale/mx6memcal/mx6memcal.c                      | 1 +
 board/freescale/mx6memcal/spl.c                            | 1 +
 board/freescale/mx6qarm2/mx6qarm2.c                        | 1 +
 board/freescale/mx6sabreauto/mx6sabreauto.c                | 1 +
 board/freescale/mx6sabresd/mx6sabresd.c                    | 1 +
 board/freescale/mx6slevk/mx6slevk.c                        | 1 +
 board/freescale/mx6sllevk/mx6sllevk.c                      | 1 +
 board/freescale/mx6sxsabreauto/mx6sxsabreauto.c            | 1 +
 board/freescale/mx6sxsabresd/mx6sxsabresd.c                | 1 +
 board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c          | 1 +
 board/freescale/mx6ullevk/mx6ullevk.c                      | 1 +
 board/freescale/mx7dsabresd/mx7dsabresd.c                  | 1 +
 board/freescale/mx7ulp_evk/mx7ulp_evk.c                    | 1 +
 board/freescale/p1010rdb/ddr.c                             | 1 +
 board/freescale/p1010rdb/p1010rdb.c                        | 1 +
 board/freescale/p1010rdb/spl.c                             | 1 +
 board/freescale/p1010rdb/spl_minimal.c                     | 1 +
 board/freescale/p1023rdb/p1023rdb.c                        | 1 +
 board/freescale/p1_p2_rdb_pc/ddr.c                         | 1 +
 board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c                | 1 +
 board/freescale/p1_p2_rdb_pc/spl.c                         | 1 +
 board/freescale/p1_p2_rdb_pc/spl_minimal.c                 | 1 +
 board/freescale/p2041rdb/cpld.c                            | 1 +
 board/freescale/p2041rdb/ddr.c                             | 1 +
 board/freescale/p2041rdb/eth.c                             | 1 +
 board/freescale/p2041rdb/p2041rdb.c                        | 1 +
 board/freescale/qemu-ppce500/qemu-ppce500.c                | 1 +
 board/freescale/s32v234evb/s32v234evb.c                    | 1 +
 board/freescale/t102xrdb/cpld.c                            | 1 +
 board/freescale/t102xrdb/ddr.c                             | 1 +
 board/freescale/t102xrdb/eth_t102xrdb.c                    | 1 +
 board/freescale/t102xrdb/spl.c                             | 1 +
 board/freescale/t102xrdb/t102xrdb.c                        | 1 +
 board/freescale/t104xrdb/cpld.c                            | 1 +
 board/freescale/t104xrdb/ddr.c                             | 1 +
 board/freescale/t104xrdb/diu.c                             | 1 +
 board/freescale/t104xrdb/eth.c                             | 1 +
 board/freescale/t104xrdb/spl.c                             | 1 +
 board/freescale/t104xrdb/t104xrdb.c                        | 1 +
 board/freescale/t208xqds/ddr.c                             | 1 +
 board/freescale/t208xqds/eth_t208xqds.c                    | 1 +
 board/freescale/t208xqds/spl.c                             | 1 +
 board/freescale/t208xqds/t208xqds.c                        | 1 +
 board/freescale/t208xrdb/ddr.c                             | 1 +
 board/freescale/t208xrdb/eth_t208xrdb.c                    | 1 +
 board/freescale/t208xrdb/spl.c                             | 1 +
 board/freescale/t208xrdb/t208xrdb.c                        | 1 +
 board/freescale/t4rdb/cpld.c                               | 1 +
 board/freescale/t4rdb/ddr.c                                | 1 +
 board/freescale/t4rdb/eth.c                                | 1 +
 board/freescale/t4rdb/spl.c                                | 1 +
 board/freescale/t4rdb/t4240rdb.c                           | 1 +
 board/freescale/vf610twr/vf610twr.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/gateworks/gw_ventana/gw_ventana_spl.c                | 1 +
 board/gdsys/a38x/controlcenterdc.c                         | 1 +
 board/gdsys/a38x/hre.c                                     | 1 +
 board/gdsys/a38x/hydra.c                                   | 1 +
 board/gdsys/a38x/ihs_phys.c                                | 1 +
 board/gdsys/a38x/keyprogram.c                              | 1 +
 board/gdsys/a38x/spl.c                                     | 1 +
 board/gdsys/common/cmd_ioloop.c                            | 1 +
 board/gdsys/common/dp501.c                                 | 1 +
 board/gdsys/common/ihs_mdio.c                              | 1 +
 board/gdsys/common/ioep-fpga.c                             | 1 +
 board/gdsys/common/osd.c                                   | 1 +
 board/gdsys/common/osd_cmd.c                               | 1 +
 board/gdsys/common/phy.c                                   | 1 +
 board/gdsys/mpc8308/gazerbeam.c                            | 1 +
 board/gdsys/mpc8308/hrcon.c                                | 1 +
 board/gdsys/mpc8308/strider.c                              | 1 +
 board/gdsys/p1022/controlcenterd-id.c                      | 1 +
 board/gdsys/p1022/controlcenterd.c                         | 1 +
 board/gdsys/p1022/ddr.c                                    | 1 +
 board/gdsys/p1022/diu.c                                    | 1 +
 board/ge/bx50v3/bx50v3.c                                   | 1 +
 board/ge/mx53ppd/mx53ppd.c                                 | 1 +
 board/ge/mx53ppd/mx53ppd_video.c                           | 1 +
 board/google/chromebook_coral/coral.c                      | 1 +
 board/google/imx8mq_phanbell/spl.c                         | 1 +
 board/grinn/chiliboard/board.c                             | 1 +
 board/grinn/liteboard/board.c                              | 1 +
 board/hisilicon/hikey/hikey.c                              | 1 +
 board/hisilicon/hikey960/hikey960.c                        | 1 +
 board/hisilicon/poplar/poplar.c                            | 1 +
 board/ids/ids8313/ids8313.c                                | 1 +
 board/imgtec/boston/checkboard.c                           | 1 +
 board/imgtec/ci20/ci20.c                                   | 1 +
 board/imgtec/malta/malta.c                                 | 1 +
 board/intel/edison/edison.c                                | 1 +
 board/inversepath/usbarmory/usbarmory.c                    | 1 +
 board/isee/igep003x/board.c                                | 1 +
 board/k+p/kp_imx53/kp_id_rev.c                             | 1 +
 board/k+p/kp_imx53/kp_imx53.c                              | 1 +
 board/k+p/kp_imx6q_tpc/kp_imx6q_tpc.c                      | 1 +
 board/k+p/kp_imx6q_tpc/kp_imx6q_tpc_spl.c                  | 1 +
 board/keymile/common/common.c                              | 1 +
 board/keymile/common/ivm.c                                 | 1 +
 board/keymile/km83xx/km83xx.c                              | 1 +
 board/keymile/km83xx/km83xx_i2c.c                          | 1 +
 board/keymile/km_arm/fpga_config.c                         | 1 +
 board/keymile/km_arm/km_arm.c                              | 1 +
 board/keymile/kmp204x/ddr.c                                | 1 +
 board/keymile/kmp204x/eth.c                                | 1 +
 board/keymile/kmp204x/kmp204x.c                            | 1 +
 board/keymile/kmp204x/pci.c                                | 1 +
 board/keymile/secu1/socfpga.c                              | 1 +
 board/kobol/helios4/helios4.c                              | 1 +
 board/kosagi/novena/novena.c                               | 1 +
 board/kosagi/novena/video.c                                | 1 +
 board/lego/ev3/legoev3.c                                   | 1 +
 board/liebherr/display5/display5.c                         | 1 +
 board/liebherr/display5/spl.c                              | 1 +
 board/liebherr/mccmon6/mccmon6.c                           | 1 +
 board/liebherr/mccmon6/spl.c                               | 1 +
 board/liebherr/xea/xea.c                                   | 1 +
 board/maxbcm/maxbcm.c                                      | 1 +
 board/mediatek/mt7623/mt7623_rfb.c                         | 1 +
 board/menlo/m53menlo/m53menlo.c                            | 1 +
 board/microchip/pic32mzda/pic32mzda.c                      | 1 +
 board/mikrotik/crs3xx-98dx3236/crs3xx-98dx3236.c           | 1 +
 board/mpc8308_p1m/mpc8308_p1m.c                            | 1 +
 board/novtech/meerkat96/meerkat96.c                        | 1 +
 board/nvidia/dalmore/dalmore.c                             | 1 +
 board/nvidia/e2220-1170/e2220-1170.c                       | 1 +
 board/nvidia/p2371-0000/p2371-0000.c                       | 1 +
 board/nvidia/p2371-2180/p2371-2180.c                       | 1 +
 board/nvidia/p2571/p2571.c                                 | 1 +
 board/nvidia/p2771-0000/p2771-0000.c                       | 1 +
 board/nvidia/p3450-0000/p3450-0000.c                       | 1 +
 board/phytec/pcl063/pcl063.c                               | 1 +
 board/phytec/pcl063/spl.c                                  | 1 +
 board/phytec/pcm052/pcm052.c                               | 1 +
 board/phytec/pcm058/pcm058.c                               | 1 +
 board/phytec/pfla02/pfla02.c                               | 1 +
 board/phytec/phycore_rk3288/phycore-rk3288.c               | 1 +
 board/phytium/durian/durian.c                              | 1 +
 board/ppcag/bg0900/bg0900.c                                | 1 +
 board/qemu-mips/qemu-mips.c                                | 1 +
 board/qualcomm/dragonboard410c/dragonboard410c.c           | 1 +
 board/qualcomm/dragonboard820c/dragonboard820c.c           | 1 +
 board/raspberrypi/rpi/rpi.c                                | 1 +
 board/renesas/MigoR/migo_r.c                               | 1 +
 board/renesas/alt/alt_spl.c                                | 1 +
 board/renesas/blanche/blanche.c                            | 1 +
 board/renesas/gose/gose_spl.c                              | 1 +
 board/renesas/koelsch/koelsch_spl.c                        | 1 +
 board/renesas/lager/lager_spl.c                            | 1 +
 board/renesas/porter/porter_spl.c                          | 1 +
 board/renesas/r2dplus/r2dplus.c                            | 1 +
 board/renesas/r7780mp/r7780mp.c                            | 1 +
 board/renesas/rcar-common/common.c                         | 1 +
 board/renesas/sh7752evb/sh7752evb.c                        | 1 +
 board/renesas/sh7753evb/sh7753evb.c                        | 1 +
 board/renesas/sh7757lcr/sh7757lcr.c                        | 1 +
 board/renesas/sh7763rdp/sh7763rdp.c                        | 1 +
 board/renesas/silk/silk_spl.c                              | 1 +
 board/renesas/stout/cpld.c                                 | 1 +
 board/renesas/stout/stout_spl.c                            | 1 +
 board/renesas/ulcb/cpld.c                                  | 1 +
 board/rockchip/evb_rk3308/evb_rk3308.c                     | 1 +
 board/rockchip/kylin_rk3036/kylin_rk3036.c                 | 1 +
 board/ronetix/pm9263/pm9263.c                              | 1 +
 board/samsung/arndale/arndale.c                            | 1 +
 board/samsung/common/board.c                               | 1 +
 board/samsung/common/misc.c                                | 1 +
 board/samsung/goni/goni.c                                  | 1 +
 board/samsung/smdkc100/smdkc100.c                          | 1 +
 board/samsung/smdkv310/smdkv310.c                          | 1 +
 board/samsung/trats/trats.c                                | 1 +
 board/samsung/trats2/trats2.c                              | 1 +
 board/samsung/universal_c210/universal.c                   | 1 +
 board/sandbox/sandbox.c                                    | 1 +
 board/sbc8349/sbc8349.c                                    | 1 +
 board/sbc8548/ddr.c                                        | 1 +
 board/sbc8548/sbc8548.c                                    | 1 +
 board/schulercontrol/sc_sps_1/sc_sps_1.c                   | 1 +
 board/seco/common/mx6.c                                    | 1 +
 board/seco/mx6quq7/mx6quq7.c                               | 1 +
 board/siemens/capricorn/board.c                            | 1 +
 board/siemens/common/board.c                               | 1 +
 board/siemens/common/factoryset.c                          | 1 +
 board/siemens/draco/board.c                                | 1 +
 board/siemens/draco/board.h                                | 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/sks-kinkel/sksimx6/sksimx6.c                         | 1 +
 board/socrates/nand.c                                      | 1 +
 board/socrates/socrates.c                                  | 1 +
 board/softing/vining_2000/vining_2000.c                    | 1 +
 board/softing/vining_fpga/socfpga.c                        | 1 +
 board/solidrun/clearfog/clearfog.c                         | 1 +
 board/solidrun/mx6cuboxi/mx6cuboxi.c                       | 1 +
 board/somlabs/visionsom-6ull/visionsom-6ull.c              | 1 +
 board/spear/x600/x600.c                                    | 1 +
 board/st/common/stm32mp_dfu.c                              | 1 +
 board/st/common/stpmic1.c                                  | 1 +
 board/st/stm32f746-disco/stm32f746-disco.c                 | 1 +
 board/st/stm32mp1/stm32mp1.c                               | 1 +
 board/st/stv0991/stv0991.c                                 | 1 +
 board/sunxi/board.c                                        | 1 +
 board/synopsys/axs10x/axs10x.c                             | 1 +
 board/synopsys/emsdp/emsdp.c                               | 1 +
 board/synopsys/hsdk/clk-lib.c                              | 1 +
 board/synopsys/hsdk/hsdk.c                                 | 1 +
 board/synopsys/iot_devkit/iot_devkit.c                     | 1 +
 board/synopsys/nsim/nsim.c                                 | 1 +
 board/sysam/amcore/amcore.c                                | 1 +
 board/sysam/stmark2/stmark2.c                              | 1 +
 board/tbs/tbs2910/tbs2910.c                                | 1 +
 board/tcl/sl50/board.c                                     | 1 +
 board/technexion/pico-imx6/pico-imx6.c                     | 1 +
 board/technexion/pico-imx6ul/pico-imx6ul.c                 | 1 +
 board/technexion/pico-imx6ul/spl.c                         | 1 +
 board/technexion/pico-imx7d/pico-imx7d.c                   | 1 +
 board/technexion/pico-imx8mq/pico-imx8mq.c                 | 1 +
 board/technexion/pico-imx8mq/spl.c                         | 1 +
 board/technexion/tao3530/tao3530.c                         | 1 +
 board/technologic/ts4600/ts4600.c                          | 1 +
 board/technologic/ts4800/ts4800.c                          | 1 +
 board/theadorable/theadorable.c                            | 1 +
 board/ti/am335x/board.c                                    | 1 +
 board/ti/am335x/mux.c                                      | 1 +
 board/ti/am43xx/board.c                                    | 1 +
 board/ti/am43xx/mux.c                                      | 1 +
 board/ti/am57xx/board.c                                    | 1 +
 board/ti/am65x/evm.c                                       | 1 +
 board/ti/beagle/beagle.c                                   | 1 +
 board/ti/common/board_detect.c                             | 1 +
 board/ti/dra7xx/evm.c                                      | 1 +
 board/ti/evm/evm.c                                         | 1 +
 board/ti/j721e/evm.c                                       | 1 +
 board/ti/ks2_evm/board.c                                   | 1 +
 board/ti/ks2_evm/board_k2g.c                               | 1 +
 board/ti/ks2_evm/ddr3_k2e.c                                | 1 +
 board/ti/ks2_evm/ddr3_k2hk.c                               | 1 +
 board/ti/ks2_evm/ddr3_k2l.c                                | 1 +
 board/ti/ks2_evm/mux-k2g.h                                 | 1 +
 board/ti/omap5_uevm/evm.c                                  | 1 +
 board/ti/ti816x/evm.c                                      | 1 +
 board/timll/devkit8000/devkit8000.c                        | 1 +
 board/toradex/apalis-imx8/apalis-imx8.c                    | 1 +
 board/toradex/apalis-tk1/apalis-tk1.c                      | 1 +
 board/toradex/apalis_imx6/apalis_imx6.c                    | 1 +
 board/toradex/apalis_imx6/pf0100.c                         | 1 +
 board/toradex/apalis_t30/apalis_t30.c                      | 1 +
 board/toradex/colibri-imx6ull/colibri-imx6ull.c            | 1 +
 board/toradex/colibri-imx8x/colibri-imx8x.c                | 1 +
 board/toradex/colibri_imx6/colibri_imx6.c                  | 1 +
 board/toradex/colibri_imx6/pf0100.c                        | 1 +
 board/toradex/colibri_imx7/colibri_imx7.c                  | 1 +
 board/toradex/colibri_pxa270/colibri_pxa270.c              | 1 +
 board/toradex/colibri_t20/colibri_t20.c                    | 1 +
 board/toradex/colibri_t30/colibri_t30.c                    | 1 +
 board/toradex/colibri_vf/colibri_vf.c                      | 1 +
 board/toradex/common/tdx-cfg-block.c                       | 1 +
 board/toradex/common/tdx-common.c                          | 1 +
 board/toradex/verdin-imx8mm/spl.c                          | 1 +
 board/tqc/tqm834x/tqm834x.c                                | 1 +
 board/tqc/tqma6/tqma6.c                                    | 1 +
 board/tqc/tqma6/tqma6_wru4.c                               | 1 +
 board/udoo/neo/neo.c                                       | 1 +
 board/udoo/udoo.c                                          | 1 +
 board/variscite/dart_6ul/dart_6ul.c                        | 1 +
 board/variscite/dart_6ul/spl.c                             | 1 +
 board/varisys/common/sys_eeprom.c                          | 1 +
 board/varisys/cyrus/cyrus.c                                | 1 +
 board/varisys/cyrus/ddr.c                                  | 1 +
 board/varisys/cyrus/eth.c                                  | 1 +
 board/ve8313/ve8313.c                                      | 1 +
 board/vscom/baltos/board.c                                 | 1 +
 board/wandboard/spl.c                                      | 1 +
 board/wandboard/wandboard.c                                | 1 +
 board/warp/warp.c                                          | 1 +
 board/warp7/warp7.c                                        | 1 +
 board/work-microwave/work_92105/work_92105_display.c       | 1 +
 board/xes/common/board.c                                   | 1 +
 board/xes/common/fsl_8xxx_pci.c                            | 1 +
 board/xes/xpedite517x/xpedite517x.c                        | 1 +
 board/xes/xpedite520x/xpedite520x.c                        | 1 +
 board/xes/xpedite537x/xpedite537x.c                        | 1 +
 board/xes/xpedite550x/ddr.c                                | 1 +
 board/xes/xpedite550x/xpedite550x.c                        | 1 +
 board/xilinx/microblaze-generic/microblaze-generic.c       | 1 +
 board/xilinx/versal/board.c                                | 1 +
 board/xilinx/zynq/bootimg.c                                | 1 +
 board/xilinx/zynq/cmds.c                                   | 1 +
 board/xilinx/zynqmp/cmds.c                                 | 1 +
 board/xilinx/zynqmp/zynqmp.c                               | 1 +
 board/zyxel/nsa310s/nsa310s.c                              | 1 +
 cmd/ab_select.c                                            | 1 +
 cmd/abootimg.c                                             | 1 +
 cmd/acpi.c                                                 | 1 +
 cmd/adc.c                                                  | 1 +
 cmd/adtimg.c                                               | 1 +
 cmd/armflash.c                                             | 1 +
 cmd/avb.c                                                  | 1 +
 cmd/axi.c                                                  | 1 +
 cmd/bcb.c                                                  | 1 +
 cmd/bdinfo.c                                               | 1 +
 cmd/bind.c                                                 | 1 +
 cmd/binop.c                                                | 1 +
 cmd/blk_common.c                                           | 1 +
 cmd/blkcache.c                                             | 1 +
 cmd/bmp.c                                                  | 1 +
 cmd/bootcount.c                                            | 1 +
 cmd/booti.c                                                | 1 +
 cmd/bootm.c                                                | 1 +
 cmd/bootmenu.c                                             | 1 +
 cmd/bootstage.c                                            | 1 +
 cmd/bootz.c                                                | 1 +
 cmd/cache.c                                                | 1 +
 cmd/cbfs.c                                                 | 1 +
 cmd/clk.c                                                  | 1 +
 cmd/config.c                                               | 1 +
 cmd/conitrace.c                                            | 1 +
 cmd/cpu.c                                                  | 1 +
 cmd/cramfs.c                                               | 1 +
 cmd/cros_ec.c                                              | 1 +
 cmd/date.c                                                 | 1 +
 cmd/demo.c                                                 | 1 +
 cmd/disk.c                                                 | 1 +
 cmd/echo.c                                                 | 1 +
 cmd/eeprom.c                                               | 1 +
 cmd/efi.c                                                  | 1 +
 cmd/efidebug.c                                             | 1 +
 cmd/elf.c                                                  | 1 +
 cmd/ethsw.c                                                | 1 +
 cmd/fastboot.c                                             | 1 +
 cmd/fat.c                                                  | 1 +
 cmd/fdt.c                                                  | 1 +
 cmd/flash.c                                                | 1 +
 cmd/fpga.c                                                 | 1 +
 cmd/fuse.c                                                 | 1 +
 cmd/gettime.c                                              | 1 +
 cmd/gpio.c                                                 | 1 +
 cmd/gpt.c                                                  | 1 +
 cmd/host.c                                                 | 1 +
 cmd/i2c.c                                                  | 1 +
 cmd/ide.c                                                  | 1 +
 cmd/ini.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/license.c                                              | 1 +
 cmd/load.c                                                 | 1 +
 cmd/log.c                                                  | 1 +
 cmd/lsblk.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/mvebu/bubt.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/part.c                                                 | 1 +
 cmd/pci.c                                                  | 1 +
 cmd/pinmux.c                                               | 1 +
 cmd/pmc.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/reiser.c                                               | 1 +
 cmd/remoteproc.c                                           | 1 +
 cmd/rng.c                                                  | 1 +
 cmd/rockusb.c                                              | 1 +
 cmd/rtc.c                                                  | 1 +
 cmd/sata.c                                                 | 1 +
 cmd/sb.c                                                   | 1 +
 cmd/scsi.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/spl.c                                                  | 1 +
 cmd/strings.c                                              | 1 +
 cmd/sysboot.c                                              | 1 +
 cmd/terminal.c                                             | 1 +
 cmd/thordown.c                                             | 1 +
 cmd/ti/ddr3.c                                              | 1 +
 cmd/time.c                                                 | 1 +
 cmd/tlv_eeprom.c                                           | 1 +
 cmd/tpm-common.c                                           | 1 +
 cmd/tpm-v1.c                                               | 1 +
 cmd/tpm-v2.c                                               | 1 +
 cmd/tpm_test.c                                             | 1 +
 cmd/trace.c                                                | 1 +
 cmd/tsi148.c                                               | 1 +
 cmd/ubi.c                                                  | 1 +
 cmd/ubifs.c                                                | 1 +
 cmd/universe.c                                             | 1 +
 cmd/unlz4.c                                                | 1 +
 cmd/unzip.c                                                | 1 +
 cmd/usb.c                                                  | 1 +
 cmd/usb_mass_storage.c                                     | 1 +
 cmd/version.c                                              | 1 +
 cmd/w1.c                                                   | 1 +
 cmd/wdt.c                                                  | 1 +
 cmd/x86/fsp.c                                              | 1 +
 cmd/x86/hob.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/avb_verify.c                                        | 1 +
 common/board_f.c                                           | 1 +
 common/board_info.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.c                                               | 1 +
 common/cli_readline.c                                      | 1 +
 common/cli_simple.c                                        | 1 +
 common/command.c                                           | 1 +
 common/common_fit.c                                        | 1 +
 common/console.c                                           | 1 +
 common/ddr_spd.c                                           | 1 +
 common/dlmalloc.c                                          | 1 +
 common/edid.c                                              | 1 +
 common/eeprom/eeprom_field.c                               | 1 +
 common/eeprom/eeprom_layout.c                              | 1 +
 common/fdt_support.c                                       | 1 +
 common/flash.c                                             | 1 +
 common/hash.c                                              | 1 +
 common/image-android-dt.c                                  | 1 +
 common/image-android.c                                     | 1 +
 common/image-cipher.c                                      | 1 +
 common/image-fdt.c                                         | 1 +
 common/image-fit-sig.c                                     | 1 +
 common/image-fit.c                                         | 1 +
 common/image.c                                             | 1 +
 common/iomux.c                                             | 1 +
 common/kgdb.c                                              | 1 +
 common/kgdb_stubs.c                                        | 1 +
 common/lcd.c                                               | 1 +
 common/lcd_console_rotation.c                              | 1 +
 common/log_console.c                                       | 1 +
 common/menu.c                                              | 1 +
 common/miiphyutil.c                                        | 1 +
 common/spl/spl.c                                           | 1 +
 common/spl/spl_ext.c                                       | 1 +
 common/spl/spl_fat.c                                       | 1 +
 common/spl/spl_fit.c                                       | 1 +
 common/spl/spl_legacy.c                                    | 1 +
 common/spl/spl_mmc.c                                       | 1 +
 common/spl/spl_nand.c                                      | 1 +
 common/spl/spl_net.c                                       | 1 +
 common/spl/spl_nor.c                                       | 1 +
 common/spl/spl_sata.c                                      | 1 +
 common/spl/spl_spi.c                                       | 1 +
 common/spl/spl_ubi.c                                       | 1 +
 common/spl/spl_usb.c                                       | 1 +
 common/spl/spl_ymodem.c                                    | 1 +
 common/splash.c                                            | 1 +
 common/splash_source.c                                     | 1 +
 common/stdio.c                                             | 1 +
 common/update.c                                            | 1 +
 common/usb.c                                               | 1 +
 common/usb_hub.c                                           | 1 +
 common/usb_kbd.c                                           | 1 +
 common/usb_storage.c                                       | 1 +
 disk/part.c                                                | 1 +
 disk/part_amiga.c                                          | 1 +
 disk/part_dos.c                                            | 1 +
 disk/part_efi.c                                            | 1 +
 disk/part_iso.c                                            | 1 +
 disk/part_mac.c                                            | 1 +
 drivers/adc/adc-uclass.c                                   | 1 +
 drivers/adc/meson-saradc.c                                 | 1 +
 drivers/ata/ahci.c                                         | 1 +
 drivers/ata/ahci_sunxi.c                                   | 1 +
 drivers/ata/dwc_ahsata.c                                   | 1 +
 drivers/ata/fsl_sata.c                                     | 1 +
 drivers/ata/libata.c                                       | 1 +
 drivers/ata/sata.c                                         | 1 +
 drivers/ata/sata_mv.c                                      | 1 +
 drivers/ata/sata_sil.c                                     | 1 +
 drivers/bios_emulator/atibios.c                            | 1 +
 drivers/bios_emulator/besys.c                              | 1 +
 drivers/bios_emulator/bios.c                               | 1 +
 drivers/bios_emulator/biosemu.c                            | 1 +
 drivers/bios_emulator/include/x86emu.h                     | 1 +
 drivers/bios_emulator/include/x86emu/debug.h               | 2 ++
 drivers/bios_emulator/x86emu/ops.c                         | 1 +
 drivers/block/blk-uclass.c                                 | 1 +
 drivers/block/blk_legacy.c                                 | 1 +
 drivers/block/ide.c                                        | 1 +
 drivers/block/sandbox.c                                    | 1 +
 drivers/bootcount/bootcount_ext.c                          | 1 +
 drivers/bootcount/bootcount_i2c.c                          | 1 +
 drivers/cache/cache-ncore.c                                | 1 +
 drivers/cache/cache-v5l2.c                                 | 1 +
 drivers/clk/at91/clk-utmi.c                                | 1 +
 drivers/clk/clk-mux.c                                      | 1 +
 drivers/clk/clk-uclass.c                                   | 1 +
 drivers/clk/clk.c                                          | 1 +
 drivers/clk/clk_pic32.c                                    | 1 +
 drivers/clk/clk_stm32mp1.c                                 | 1 +
 drivers/clk/clk_versal.c                                   | 1 +
 drivers/clk/clk_zynqmp.c                                   | 1 +
 drivers/clk/ics8n3qv01.c                                   | 1 +
 drivers/clk/imx/clk-imx6q.c                                | 1 +
 drivers/clk/imx/clk-imx8.c                                 | 1 +
 drivers/clk/imx/clk-imx8qm.c                               | 1 +
 drivers/clk/imx/clk-imx8qxp.c                              | 1 +
 drivers/clk/mpc83xx_clk.c                                  | 1 +
 drivers/clk/mvebu/armada-37xx-periph.c                     | 1 +
 drivers/clk/mvebu/armada-37xx-tbg.c                        | 1 +
 drivers/clk/renesas/clk-rcar-gen2.c                        | 1 +
 drivers/clk/renesas/clk-rcar-gen3.c                        | 1 +
 drivers/clk/rockchip/clk_pll.c                             | 1 +
 drivers/clk/rockchip/clk_px30.c                            | 1 +
 drivers/clk/rockchip/clk_rk3128.c                          | 1 +
 drivers/clk/rockchip/clk_rk3288.c                          | 1 +
 drivers/clk/rockchip/clk_rk3308.c                          | 1 +
 drivers/clk/rockchip/clk_rk3328.c                          | 1 +
 drivers/clk/rockchip/clk_rk3399.c                          | 1 +
 drivers/clk/rockchip/clk_rv1108.c                          | 1 +
 drivers/clk/sunxi/clk_sunxi.c                              | 1 +
 drivers/core/acpi.c                                        | 1 +
 drivers/core/devres.c                                      | 1 +
 drivers/core/dump.c                                        | 1 +
 drivers/core/util.c                                        | 1 +
 drivers/cpu/bmips_cpu.c                                    | 1 +
 drivers/cpu/imx8_cpu.c                                     | 1 +
 drivers/crypto/fsl/desc_constr.h                           | 1 +
 drivers/crypto/fsl/fsl_blob.c                              | 1 +
 drivers/crypto/fsl/fsl_hash.c                              | 1 +
 drivers/crypto/fsl/jobdesc.c                               | 1 +
 drivers/crypto/fsl/jr.c                                    | 1 +
 drivers/crypto/fsl/sec.c                                   | 1 +
 drivers/ddr/altera/sdram_agilex.c                          | 1 +
 drivers/ddr/altera/sdram_arria10.c                         | 1 +
 drivers/ddr/altera/sdram_gen5.c                            | 1 +
 drivers/ddr/altera/sdram_s10.c                             | 1 +
 drivers/ddr/altera/sdram_soc64.c                           | 1 +
 drivers/ddr/fsl/arm_ddr_gen3.c                             | 1 +
 drivers/ddr/fsl/ctrl_regs.c                                | 1 +
 drivers/ddr/fsl/ddr1_dimm_params.c                         | 1 +
 drivers/ddr/fsl/ddr2_dimm_params.c                         | 1 +
 drivers/ddr/fsl/ddr3_dimm_params.c                         | 1 +
 drivers/ddr/fsl/ddr4_dimm_params.c                         | 1 +
 drivers/ddr/fsl/fsl_ddr_gen4.c                             | 1 +
 drivers/ddr/fsl/fsl_mmdc.c                                 | 1 +
 drivers/ddr/fsl/interactive.c                              | 1 +
 drivers/ddr/fsl/lc_common_dimm_params.c                    | 1 +
 drivers/ddr/fsl/main.c                                     | 1 +
 drivers/ddr/fsl/mpc85xx_ddr_gen1.c                         | 1 +
 drivers/ddr/fsl/mpc85xx_ddr_gen2.c                         | 1 +
 drivers/ddr/fsl/mpc85xx_ddr_gen3.c                         | 1 +
 drivers/ddr/fsl/mpc86xx_ddr.c                              | 1 +
 drivers/ddr/fsl/options.c                                  | 1 +
 drivers/ddr/fsl/util.c                                     | 1 +
 drivers/ddr/imx/imx8m/helper.c                             | 1 +
 drivers/ddr/marvell/a38x/ddr_ml_wrapper.h                  | 1 +
 drivers/ddr/marvell/axp/ddr3_dfs.c                         | 1 +
 drivers/ddr/marvell/axp/ddr3_dqs.c                         | 1 +
 drivers/ddr/marvell/axp/ddr3_hw_training.c                 | 1 +
 drivers/ddr/marvell/axp/ddr3_init.c                        | 1 +
 drivers/ddr/marvell/axp/ddr3_pbs.c                         | 1 +
 drivers/ddr/marvell/axp/ddr3_read_leveling.c               | 1 +
 drivers/ddr/marvell/axp/ddr3_spd.c                         | 1 +
 drivers/ddr/marvell/axp/ddr3_write_leveling.c              | 1 +
 drivers/ddr/microchip/ddr2.c                               | 1 +
 drivers/demo/demo-shape.c                                  | 1 +
 drivers/demo/demo-simple.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_sf.c                                       | 1 +
 drivers/dma/MCD_dmaApi.c                                   | 1 +
 drivers/dma/apbh_dma.c                                     | 1 +
 drivers/dma/ti/k3-udma.c                                   | 1 +
 drivers/fastboot/fb_command.c                              | 1 +
 drivers/fastboot/fb_common.c                               | 1 +
 drivers/fastboot/fb_mmc.c                                  | 1 +
 drivers/fastboot/fb_nand.c                                 | 1 +
 drivers/firmware/firmware-zynqmp.c                         | 1 +
 drivers/firmware/psci.c                                    | 1 +
 drivers/fpga/altera.c                                      | 1 +
 drivers/fpga/cyclon2.c                                     | 1 +
 drivers/fpga/fpga.c                                        | 1 +
 drivers/fpga/ivm_core.c                                    | 1 +
 drivers/fpga/lattice.c                                     | 1 +
 drivers/fpga/socfpga_arria10.c                             | 1 +
 drivers/fpga/socfpga_gen5.c                                | 1 +
 drivers/fpga/stratix10.c                                   | 1 +
 drivers/fpga/stratixv.c                                    | 1 +
 drivers/fpga/versalpl.c                                    | 1 +
 drivers/fpga/virtex2.c                                     | 1 +
 drivers/fpga/xilinx.c                                      | 1 +
 drivers/fpga/zynqmppl.c                                    | 1 +
 drivers/fpga/zynqpl.c                                      | 1 +
 drivers/gpio/adi_gpio2.c                                   | 1 +
 drivers/gpio/at91_gpio.c                                   | 1 +
 drivers/gpio/atmel_pio4.c                                  | 1 +
 drivers/gpio/da8xx_gpio.c                                  | 1 +
 drivers/gpio/db8500_gpio.c                                 | 1 +
 drivers/gpio/gpio-uclass.c                                 | 1 +
 drivers/gpio/kona_gpio.c                                   | 1 +
 drivers/gpio/kw_gpio.c                                     | 1 +
 drivers/gpio/mpc83xx_gpio.c                                | 1 +
 drivers/gpio/mvgpio.c                                      | 1 +
 drivers/gpio/mxs_gpio.c                                    | 1 +
 drivers/gpio/omap_gpio.c                                   | 1 +
 drivers/gpio/pca953x.c                                     | 1 +
 drivers/gpio/pcf8575_gpio.c                                | 1 +
 drivers/gpio/sandbox.c                                     | 1 +
 drivers/gpio/tca642x.c                                     | 1 +
 drivers/gpio/xilinx_gpio.c                                 | 1 +
 drivers/gpio/zynq_gpio.c                                   | 1 +
 drivers/i2c/davinci_i2c.c                                  | 1 +
 drivers/i2c/designware_i2c.c                               | 1 +
 drivers/i2c/i2c-cdns.c                                     | 1 +
 drivers/i2c/i2c-cortina.c                                  | 1 +
 drivers/i2c/i2c-uclass.c                                   | 1 +
 drivers/i2c/i2c_core.c                                     | 1 +
 drivers/i2c/imx_lpi2c.c                                    | 1 +
 drivers/i2c/intel_i2c.c                                    | 1 +
 drivers/i2c/kona_i2c.c                                     | 1 +
 drivers/i2c/muxes/i2c-arb-gpio-challenge.c                 | 1 +
 drivers/i2c/mv_i2c.c                                       | 1 +
 drivers/i2c/mvtwsi.c                                       | 1 +
 drivers/i2c/mxc_i2c.c                                      | 1 +
 drivers/i2c/omap24xx_i2c.c                                 | 1 +
 drivers/input/keyboard-uclass.c                            | 1 +
 drivers/mailbox/k3-sec-proxy.c                             | 1 +
 drivers/memory/ti-aemif.c                                  | 1 +
 drivers/misc/altera_sysid.c                                | 1 +
 drivers/misc/cros_ec.c                                     | 1 +
 drivers/misc/cros_ec_i2c.c                                 | 1 +
 drivers/misc/cros_ec_lpc.c                                 | 1 +
 drivers/misc/cros_ec_sandbox.c                             | 1 +
 drivers/misc/cros_ec_spi.c                                 | 1 +
 drivers/misc/ds4510.c                                      | 1 +
 drivers/misc/fsl_ifc.c                                     | 1 +
 drivers/misc/fsl_iim.c                                     | 1 +
 drivers/misc/fsl_portals.c                                 | 1 +
 drivers/misc/fsl_sec_mon.c                                 | 1 +
 drivers/misc/gpio_led.c                                    | 1 +
 drivers/misc/ihs_fpga.c                                    | 1 +
 drivers/misc/imx8/fuse.c                                   | 1 +
 drivers/misc/imx8/scu.c                                    | 1 +
 drivers/misc/imx8/scu_api.c                                | 1 +
 drivers/misc/k3_avs.c                                      | 1 +
 drivers/misc/mc9sdz60.c                                    | 1 +
 drivers/misc/mxc_ocotp.c                                   | 1 +
 drivers/misc/mxs_ocotp.c                                   | 1 +
 drivers/misc/qfw.c                                         | 1 +
 drivers/misc/rockchip-efuse.c                              | 1 +
 drivers/misc/rockchip-otp.c                                | 1 +
 drivers/misc/sifive-otp.c                                  | 1 +
 drivers/misc/spltest_sandbox.c                             | 1 +
 drivers/misc/stm32mp_fuse.c                                | 1 +
 drivers/mmc/atmel_sdhci.c                                  | 1 +
 drivers/mmc/bcm2835_sdhost.c                               | 1 +
 drivers/mmc/davinci_mmc.c                                  | 1 +
 drivers/mmc/exynos_dw_mmc.c                                | 1 +
 drivers/mmc/fsl_esdhc.c                                    | 1 +
 drivers/mmc/fsl_esdhc_imx.c                                | 1 +
 drivers/mmc/fsl_esdhc_spl.c                                | 1 +
 drivers/mmc/ftsdc010_mci.c                                 | 1 +
 drivers/mmc/gen_atmel_mci.c                                | 1 +
 drivers/mmc/iproc_sdhci.c                                  | 1 +
 drivers/mmc/kona_sdhci.c                                   | 1 +
 drivers/mmc/mmc-uclass.c                                   | 1 +
 drivers/mmc/mmc.c                                          | 1 +
 drivers/mmc/mmc_legacy.c                                   | 1 +
 drivers/mmc/mmc_write.c                                    | 1 +
 drivers/mmc/msm_sdhci.c                                    | 1 +
 drivers/mmc/mv_sdhci.c                                     | 1 +
 drivers/mmc/mvebu_mmc.c                                    | 1 +
 drivers/mmc/mxcmmc.c                                       | 1 +
 drivers/mmc/mxsmmc.c                                       | 1 +
 drivers/mmc/omap_hsmmc.c                                   | 1 +
 drivers/mmc/pic32_sdhci.c                                  | 1 +
 drivers/mmc/pxa_mmc_gen.c                                  | 1 +
 drivers/mmc/rockchip_sdhci.c                               | 1 +
 drivers/mmc/rpmb.c                                         | 1 +
 drivers/mmc/s5p_sdhci.c                                    | 1 +
 drivers/mmc/sdhci.c                                        | 1 +
 drivers/mmc/sh_mmcif.c                                     | 1 +
 drivers/mmc/sh_sdhi.c                                      | 1 +
 drivers/mmc/socfpga_dw_mmc.c                               | 1 +
 drivers/mmc/stm32_sdmmc2.c                                 | 1 +
 drivers/mmc/sunxi_mmc.c                                    | 1 +
 drivers/mmc/tegra_mmc.c                                    | 1 +
 drivers/mmc/xenon_sdhci.c                                  | 1 +
 drivers/mmc/zynq_sdhci.c                                   | 1 +
 drivers/mtd/altera_qspi.c                                  | 1 +
 drivers/mtd/cfi_flash.c                                    | 1 +
 drivers/mtd/jedec_flash.c                                  | 1 +
 drivers/mtd/mtd_uboot.c                                    | 1 +
 drivers/mtd/mtdpart.c                                      | 1 +
 drivers/mtd/mw_eeprom.c                                    | 1 +
 drivers/mtd/nand/raw/arasan_nfc.c                          | 1 +
 drivers/mtd/nand/raw/fsl_elbc_nand.c                       | 1 +
 drivers/mtd/nand/raw/fsl_elbc_spl.c                        | 1 +
 drivers/mtd/nand/raw/fsl_ifc_nand.c                        | 1 +
 drivers/mtd/nand/raw/fsl_ifc_spl.c                         | 1 +
 drivers/mtd/nand/raw/fsmc_nand.c                           | 1 +
 drivers/mtd/nand/raw/mxs_nand.c                            | 1 +
 drivers/mtd/nand/raw/mxs_nand_spl.c                        | 1 +
 drivers/mtd/nand/raw/nand_util.c                           | 1 +
 drivers/mtd/nand/raw/omap_elm.c                            | 1 +
 drivers/mtd/nand/raw/omap_gpmc.c                           | 1 +
 drivers/mtd/nand/raw/sunxi_nand_spl.c                      | 1 +
 drivers/mtd/nand/raw/tegra_nand.c                          | 1 +
 drivers/mtd/nand/raw/vf610_nfc.c                           | 1 +
 drivers/mtd/nand/raw/zynq_nand.c                           | 1 +
 drivers/mtd/onenand/onenand_uboot.c                        | 1 +
 drivers/mtd/onenand/samsung.c                              | 1 +
 drivers/mtd/pic32_flash.c                                  | 1 +
 drivers/mtd/renesas_rpc_hf.c                               | 1 +
 drivers/mtd/spi/fsl_espi_spl.c                             | 1 +
 drivers/mtd/spi/sandbox.c                                  | 1 +
 drivers/mtd/spi/sf_dataflash.c                             | 1 +
 drivers/mtd/spi/sf_mtd.c                                   | 1 +
 drivers/mtd/spi/sf_probe.c                                 | 1 +
 drivers/mtd/spi/spi-nor-core.c                             | 1 +
 drivers/mtd/spi/spi-nor-tiny.c                             | 1 +
 drivers/mtd/st_smi.c                                       | 1 +
 drivers/mtd/stm32_flash.c                                  | 1 +
 drivers/mtd/ubi/debug.c                                    | 1 +
 drivers/net/ag7xxx.c                                       | 1 +
 drivers/net/altera_tse.c                                   | 1 +
 drivers/net/armada100_fec.c                                | 1 +
 drivers/net/at91_emac.c                                    | 1 +
 drivers/net/ax88180.c                                      | 1 +
 drivers/net/bcm-sf2-eth-gmac.c                             | 1 +
 drivers/net/bcm-sf2-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/dm9000x.c                                      | 1 +
 drivers/net/dnet.c                                         | 1 +
 drivers/net/e1000.c                                        | 1 +
 drivers/net/e1000.h                                        | 1 +
 drivers/net/e1000_spi.c                                    | 1 +
 drivers/net/eepro100.c                                     | 1 +
 drivers/net/ep93xx_eth.c                                   | 1 +
 drivers/net/eth-phy-uclass.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/fm/fm.c                                        | 1 +
 drivers/net/fm/memac_phy.c                                 | 1 +
 drivers/net/fm/tgec_phy.c                                  | 1 +
 drivers/net/fsl-mc/dpio/qbman_portal.c                     | 1 +
 drivers/net/fsl-mc/dpio/qbman_sys.h                        | 1 +
 drivers/net/fsl-mc/mc.c                                    | 1 +
 drivers/net/fsl-mc/mc_sys.c                                | 1 +
 drivers/net/fsl_enetc_mdio.c                               | 1 +
 drivers/net/fsl_mcdmafec.c                                 | 1 +
 drivers/net/fsl_mdio.c                                     | 1 +
 drivers/net/ftgmac100.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/lpc32xx_eth.c                                  | 1 +
 drivers/net/macb.c                                         | 1 +
 drivers/net/mcffec.c                                       | 1 +
 drivers/net/mcfmii.c                                       | 1 +
 drivers/net/mpc8xx_fec.c                                   | 1 +
 drivers/net/mscc_eswitch/jr2_switch.c                      | 1 +
 drivers/net/mscc_eswitch/luton_switch.c                    | 1 +
 drivers/net/mscc_eswitch/servalt_switch.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/ne2000.c                                       | 1 +
 drivers/net/ne2000_base.c                                  | 1 +
 drivers/net/ne2000_base.h                                  | 1 +
 drivers/net/ns8382x.c                                      | 1 +
 drivers/net/pch_gbe.c                                      | 1 +
 drivers/net/pcnet.c                                        | 1 +
 drivers/net/pfe_eth/pfe_cmd.c                              | 1 +
 drivers/net/pfe_eth/pfe_driver.c                           | 1 +
 drivers/net/pfe_eth/pfe_eth.c                              | 1 +
 drivers/net/pfe_eth/pfe_firmware.c                         | 1 +
 drivers/net/pfe_eth/pfe_hw.c                               | 1 +
 drivers/net/pfe_eth/pfe_mdio.c                             | 1 +
 drivers/net/phy/aquantia.c                                 | 1 +
 drivers/net/phy/b53.c                                      | 1 +
 drivers/net/phy/broadcom.c                                 | 1 +
 drivers/net/phy/cortina.c                                  | 1 +
 drivers/net/phy/fixed.c                                    | 1 +
 drivers/net/phy/marvell.c                                  | 1 +
 drivers/net/phy/meson-gxl.c                                | 1 +
 drivers/net/phy/miiphybb.c                                 | 1 +
 drivers/net/phy/mscc.c                                     | 1 +
 drivers/net/phy/mv88e61xx.c                                | 1 +
 drivers/net/phy/mv88e6352.c                                | 1 +
 drivers/net/phy/ncsi.c                                     | 1 +
 drivers/net/phy/phy.c                                      | 1 +
 drivers/net/phy/realtek.c                                  | 1 +
 drivers/net/phy/teranetics.c                               | 1 +
 drivers/net/phy/vitesse.c                                  | 1 +
 drivers/net/phy/xilinx_gmii2rgmii.c                        | 1 +
 drivers/net/pic32_eth.c                                    | 1 +
 drivers/net/pic32_mdio.c                                   | 1 +
 drivers/net/rtl8139.c                                      | 1 +
 drivers/net/rtl8169.c                                      | 1 +
 drivers/net/sandbox-raw.c                                  | 1 +
 drivers/net/sandbox.c                                      | 1 +
 drivers/net/sh_eth.c                                       | 1 +
 drivers/net/smc91111.c                                     | 1 +
 drivers/net/smc911x.c                                      | 1 +
 drivers/net/sun8i_emac.c                                   | 1 +
 drivers/net/sunxi_emac.c                                   | 1 +
 drivers/net/ti/am65-cpsw-nuss.c                            | 1 +
 drivers/net/ti/cpsw.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/vsc7385.c                                      | 1 +
 drivers/net/vsc9953.c                                      | 1 +
 drivers/net/xilinx_axi_emac.c                              | 1 +
 drivers/net/xilinx_emaclite.c                              | 1 +
 drivers/net/zynq_gem.c                                     | 1 +
 drivers/nvme/nvme.c                                        | 1 +
 drivers/nvme/nvme_show.c                                   | 1 +
 drivers/pci/fsl_pci_init.c                                 | 1 +
 drivers/pci/pci-aardvark.c                                 | 1 +
 drivers/pci/pci-uclass.c                                   | 1 +
 drivers/pci/pci.c                                          | 1 +
 drivers/pci/pci_auto.c                                     | 1 +
 drivers/pci/pci_common.c                                   | 1 +
 drivers/pci/pci_ftpci100.c                                 | 1 +
 drivers/pci/pci_mpc85xx.c                                  | 1 +
 drivers/pci/pci_mvebu.c                                    | 1 +
 drivers/pci/pci_rom.c                                      | 1 +
 drivers/pci/pci_sh4.c                                      | 1 +
 drivers/pci/pci_sh7751.c                                   | 1 +
 drivers/pci/pci_sh7780.c                                   | 1 +
 drivers/pci/pcie_brcmstb.c                                 | 1 +
 drivers/pci/pcie_dw_mvebu.c                                | 1 +
 drivers/pci/pcie_dw_ti.c                                   | 1 +
 drivers/pci/pcie_fsl.c                                     | 1 +
 drivers/pci/pcie_imx.c                                     | 1 +
 drivers/pci/pcie_layerscape_ep.c                           | 1 +
 drivers/pci/pcie_layerscape_gen4.c                         | 1 +
 drivers/pci/pcie_layerscape_rc.c                           | 1 +
 drivers/phy/marvell/comphy_a3700.c                         | 1 +
 drivers/phy/marvell/comphy_core.c                          | 1 +
 drivers/phy/marvell/comphy_core.h                          | 1 +
 drivers/phy/marvell/comphy_cp110.c                         | 1 +
 drivers/phy/omap-usb2-phy.c                                | 1 +
 drivers/phy/ti-pipe3-phy.c                                 | 1 +
 drivers/pinctrl/broadcom/pinctrl-bcm283x.c                 | 1 +
 drivers/pinctrl/intel/pinctrl.c                            | 1 +
 drivers/pinctrl/meson/pinctrl-meson.c                      | 1 +
 drivers/pinctrl/mvebu/pinctrl-armada-37xx.c                | 1 +
 drivers/pinctrl/nxp/pinctrl-scu.c                          | 1 +
 drivers/pinctrl/pinctrl-at91-pio4.c                        | 1 +
 drivers/pinctrl/pinctrl_pic32.c                            | 1 +
 drivers/pinctrl/renesas/pfc-r7s72100.c                     | 1 +
 drivers/pinctrl/renesas/pfc.c                              | 1 +
 drivers/power/acpi_pmc/acpi-pmc-uclass.c                   | 1 +
 drivers/power/battery/bat_trats.c                          | 1 +
 drivers/power/battery/bat_trats2.c                         | 1 +
 drivers/power/domain/imx8-power-domain-legacy.c            | 1 +
 drivers/power/domain/imx8-power-domain.c                   | 1 +
 drivers/power/domain/imx8m-power-domain.c                  | 1 +
 drivers/power/fuel_gauge/fg_max17042.c                     | 1 +
 drivers/power/mfd/fg_max77693.c                            | 1 +
 drivers/power/mfd/muic_max77693.c                          | 1 +
 drivers/power/mfd/pmic_max77693.c                          | 1 +
 drivers/power/mt6323.c                                     | 1 +
 drivers/power/palmas.c                                     | 1 +
 drivers/power/pmic/lp873x.c                                | 1 +
 drivers/power/pmic/lp87565.c                               | 1 +
 drivers/power/pmic/mc34708.c                               | 1 +
 drivers/power/pmic/muic_max8997.c                          | 1 +
 drivers/power/pmic/pmic_hi6553.c                           | 1 +
 drivers/power/pmic/pmic_ltc3676.c                          | 1 +
 drivers/power/pmic/pmic_max77696.c                         | 1 +
 drivers/power/pmic/pmic_max8997.c                          | 1 +
 drivers/power/pmic/pmic_max8998.c                          | 1 +
 drivers/power/pmic/pmic_mc34vr500.c                        | 1 +
 drivers/power/pmic/pmic_pca9450.c                          | 1 +
 drivers/power/pmic/pmic_pfuze100.c                         | 1 +
 drivers/power/pmic/pmic_pfuze3000.c                        | 1 +
 drivers/power/pmic/pmic_tps62362.c                         | 1 +
 drivers/power/pmic/pmic_tps65218.c                         | 1 +
 drivers/power/pmic/rk8xx.c                                 | 1 +
 drivers/power/pmic/tps65941.c                              | 1 +
 drivers/power/power_core.c                                 | 1 +
 drivers/power/power_dialog.c                               | 1 +
 drivers/power/power_fsl.c                                  | 1 +
 drivers/power/power_i2c.c                                  | 1 +
 drivers/power/regulator/lp873x_regulator.c                 | 1 +
 drivers/power/regulator/lp87565_regulator.c                | 1 +
 drivers/power/regulator/palmas_regulator.c                 | 1 +
 drivers/power/regulator/pwm_regulator.c                    | 1 +
 drivers/power/regulator/regulator-uclass.c                 | 1 +
 drivers/power/regulator/tps65941_regulator.c               | 1 +
 drivers/power/twl4030.c                                    | 1 +
 drivers/power/twl6030.c                                    | 1 +
 drivers/pwm/pwm-imx-util.c                                 | 1 +
 drivers/pwm/pwm-mtk.c                                      | 1 +
 drivers/qe/qe.c                                            | 1 +
 drivers/qe/uccf.c                                          | 1 +
 drivers/qe/uec.c                                           | 1 +
 drivers/qe/uec_phy.c                                       | 1 +
 drivers/ram/k3-am654-ddrss.c                               | 1 +
 drivers/ram/k3-j721e/k3-j721e-ddrss.c                      | 1 +
 drivers/ram/rockchip/dmc-rk3368.c                          | 1 +
 drivers/ram/rockchip/sdram_common.c                        | 1 +
 drivers/ram/rockchip/sdram_rk3188.c                        | 1 +
 drivers/ram/rockchip/sdram_rk322x.c                        | 1 +
 drivers/ram/rockchip/sdram_rk3288.c                        | 1 +
 drivers/ram/rockchip/sdram_rk3328.c                        | 1 +
 drivers/ram/rockchip/sdram_rk3399.c                        | 1 +
 drivers/ram/sifive/fu540_ddr.c                             | 1 +
 drivers/ram/stm32mp1/stm32mp1_ddr.c                        | 1 +
 drivers/ram/stm32mp1/stm32mp1_interactive.c                | 1 +
 drivers/ram/stm32mp1/stm32mp1_ram.c                        | 1 +
 drivers/ram/stm32mp1/stm32mp1_tests.c                      | 1 +
 drivers/ram/stm32mp1/stm32mp1_tuning.c                     | 1 +
 drivers/remoteproc/ti_k3_r5f_rproc.c                       | 1 +
 drivers/reset/reset-socfpga.c                              | 1 +
 drivers/reset/reset-sunxi.c                                | 1 +
 drivers/rng/stm32mp1_rng.c                                 | 1 +
 drivers/rtc/davinci.c                                      | 1 +
 drivers/rtc/ds1302.c                                       | 1 +
 drivers/rtc/ds1307.c                                       | 1 +
 drivers/rtc/ds1337.c                                       | 1 +
 drivers/rtc/ds1374.c                                       | 1 +
 drivers/rtc/ds1556.c                                       | 1 +
 drivers/rtc/ds164x.c                                       | 1 +
 drivers/rtc/ds174x.c                                       | 1 +
 drivers/rtc/ds3231.c                                       | 1 +
 drivers/rtc/imxdi.c                                        | 1 +
 drivers/rtc/isl1208.c                                      | 1 +
 drivers/rtc/m41t11.c                                       | 1 +
 drivers/rtc/m41t60.c                                       | 1 +
 drivers/rtc/m41t62.c                                       | 1 +
 drivers/rtc/mc146818.c                                     | 1 +
 drivers/rtc/mcfrtc.c                                       | 1 +
 drivers/rtc/mvrtc.c                                        | 1 +
 drivers/rtc/mxsrtc.c                                       | 1 +
 drivers/rtc/pcf2127.c                                      | 1 +
 drivers/rtc/pcf8563.c                                      | 1 +
 drivers/rtc/pt7c4338.c                                     | 1 +
 drivers/rtc/rs5c372.c                                      | 1 +
 drivers/rtc/rv3029.c                                       | 1 +
 drivers/rtc/rv8803.c                                       | 1 +
 drivers/rtc/rx8010sj.c                                     | 1 +
 drivers/rtc/rx8025.c                                       | 1 +
 drivers/rtc/s35392a.c                                      | 1 +
 drivers/rtc/s3c24x0_rtc.c                                  | 1 +
 drivers/scsi/scsi.c                                        | 1 +
 drivers/serial/serial-uclass.c                             | 1 +
 drivers/serial/serial.c                                    | 1 +
 drivers/soc/ti/keystone_serdes.c                           | 1 +
 drivers/sound/hda_codec.c                                  | 1 +
 drivers/spi/atcspi200_spi.c                                | 1 +
 drivers/spi/bcm63xx_hsspi.c                                | 1 +
 drivers/spi/bcm63xx_spi.c                                  | 1 +
 drivers/spi/bcmstb_spi.c                                   | 1 +
 drivers/spi/cadence_qspi.c                                 | 1 +
 drivers/spi/cadence_qspi_apb.c                             | 1 +
 drivers/spi/cf_spi.c                                       | 1 +
 drivers/spi/davinci_spi.c                                  | 1 +
 drivers/spi/designware_spi.c                               | 1 +
 drivers/spi/kirkwood_spi.c                                 | 1 +
 drivers/spi/mpc8xx_spi.c                                   | 1 +
 drivers/spi/mpc8xxx_spi.c                                  | 1 +
 drivers/spi/mt7621_spi.c                                   | 1 +
 drivers/spi/mtk_snfi_spi.c                                 | 1 +
 drivers/spi/mxc_spi.c                                      | 1 +
 drivers/spi/mxs_spi.c                                      | 1 +
 drivers/spi/omap3_spi.c                                    | 1 +
 drivers/spi/pic32_spi.c                                    | 1 +
 drivers/spi/renesas_rpc_spi.c                              | 1 +
 drivers/spi/sandbox_spi.c                                  | 1 +
 drivers/spi/sh_qspi.c                                      | 1 +
 drivers/spi/spi-sifive.c                                   | 1 +
 drivers/spi/spi-sunxi.c                                    | 1 +
 drivers/spi/spi-uclass.c                                   | 1 +
 drivers/spi/spi.c                                          | 1 +
 drivers/spi/tegra114_spi.c                                 | 1 +
 drivers/spi/tegra20_sflash.c                               | 1 +
 drivers/spi/tegra20_slink.c                                | 1 +
 drivers/spi/tegra210_qspi.c                                | 1 +
 drivers/spi/ti_qspi.c                                      | 1 +
 drivers/spi/xilinx_spi.c                                   | 1 +
 drivers/spi/zynq_qspi.c                                    | 1 +
 drivers/spi/zynq_spi.c                                     | 1 +
 drivers/spi/zynqmp_gqspi.c                                 | 1 +
 drivers/spmi/spmi-msm.c                                    | 1 +
 drivers/sysreset/sysreset-uclass.c                         | 1 +
 drivers/sysreset/sysreset_microblaze.c                     | 1 +
 drivers/sysreset/sysreset_mpc83xx.c                        | 1 +
 drivers/sysreset/sysreset_socfpga_s10.c                    | 1 +
 drivers/tee/sandbox.c                                      | 1 +
 drivers/thermal/imx_scu_thermal.c                          | 1 +
 drivers/thermal/imx_thermal.c                              | 1 +
 drivers/thermal/imx_tmu.c                                  | 1 +
 drivers/tpm/cr50_i2c.c                                     | 1 +
 drivers/tpm/tpm2_tis_sandbox.c                             | 1 +
 drivers/tpm/tpm_atmel_twi.c                                | 1 +
 drivers/tpm/tpm_tis_lpc.c                                  | 1 +
 drivers/tpm/tpm_tis_sandbox.c                              | 1 +
 drivers/ufs/ufs.c                                          | 1 +
 drivers/usb/cdns3/core.c                                   | 1 +
 drivers/usb/common/fsl-dt-fixup.c                          | 1 +
 drivers/usb/eth/asix.c                                     | 1 +
 drivers/usb/eth/asix88179.c                                | 1 +
 drivers/usb/eth/lan7x.c                                    | 1 +
 drivers/usb/eth/lan7x.h                                    | 1 +
 drivers/usb/eth/r8152.c                                    | 1 +
 drivers/usb/eth/smsc95xx.c                                 | 1 +
 drivers/usb/eth/usb_ether.c                                | 1 +
 drivers/usb/gadget/at91_udc.c                              | 1 +
 drivers/usb/gadget/atmel_usba_udc.c                        | 1 +
 drivers/usb/gadget/ci_udc.c                                | 1 +
 drivers/usb/gadget/dwc2_udc_otg.c                          | 1 +
 drivers/usb/gadget/dwc2_udc_otg_phy.c                      | 1 +
 drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c                 | 1 +
 drivers/usb/gadget/ether.c                                 | 1 +
 drivers/usb/gadget/f_dfu.c                                 | 1 +
 drivers/usb/gadget/f_fastboot.c                            | 1 +
 drivers/usb/gadget/f_mass_storage.c                        | 1 +
 drivers/usb/gadget/f_rockusb.c                             | 1 +
 drivers/usb/gadget/f_sdp.c                                 | 1 +
 drivers/usb/gadget/f_thor.c                                | 1 +
 drivers/usb/gadget/fotg210.c                               | 1 +
 drivers/usb/gadget/g_dnl.c                                 | 1 +
 drivers/usb/gadget/pxa25x_udc.c                            | 1 +
 drivers/usb/gadget/udc/udc-core.c                          | 1 +
 drivers/usb/host/dwc2.c                                    | 1 +
 drivers/usb/host/ehci-faraday.c                            | 1 +
 drivers/usb/host/ehci-fsl.c                                | 1 +
 drivers/usb/host/ehci-hcd.c                                | 1 +
 drivers/usb/host/ehci-msm.c                                | 1 +
 drivers/usb/host/ehci-mx5.c                                | 1 +
 drivers/usb/host/ehci-mx6.c                                | 1 +
 drivers/usb/host/ehci-mxs.c                                | 1 +
 drivers/usb/host/ehci-omap.c                               | 1 +
 drivers/usb/host/ehci-pci.c                                | 1 +
 drivers/usb/host/ehci-rmobile.c                            | 1 +
 drivers/usb/host/ehci-spear.c                              | 1 +
 drivers/usb/host/ehci-tegra.c                              | 1 +
 drivers/usb/host/ehci-zynq.c                               | 1 +
 drivers/usb/host/ohci-hcd.c                                | 1 +
 drivers/usb/host/r8a66597-hcd.c                            | 1 +
 drivers/usb/host/sl811-hcd.c                               | 1 +
 drivers/usb/host/sl811.h                                   | 1 +
 drivers/usb/host/usb-uclass.c                              | 1 +
 drivers/usb/host/xhci-dwc3.c                               | 1 +
 drivers/usb/host/xhci-exynos5.c                            | 1 +
 drivers/usb/host/xhci-fsl.c                                | 1 +
 drivers/usb/host/xhci-mem.c                                | 1 +
 drivers/usb/host/xhci-mvebu.c                              | 1 +
 drivers/usb/host/xhci-omap.c                               | 1 +
 drivers/usb/host/xhci-ring.c                               | 1 +
 drivers/usb/host/xhci.c                                    | 1 +
 drivers/usb/musb-new/mt85xx.c                              | 1 +
 drivers/usb/musb-new/musb_uboot.c                          | 1 +
 drivers/usb/musb-new/pic32.c                               | 1 +
 drivers/usb/musb-new/sunxi.c                               | 1 +
 drivers/usb/phy/twl4030.c                                  | 1 +
 drivers/usb/ulpi/ulpi-viewport.c                           | 1 +
 drivers/usb/ulpi/ulpi.c                                    | 1 +
 drivers/video/am335x-fb.c                                  | 1 +
 drivers/video/anx9804.c                                    | 1 +
 drivers/video/ati_radeon_fb.c                              | 1 +
 drivers/video/ati_radeon_fb.h                              | 1 +
 drivers/video/atmel_hlcdfb.c                               | 1 +
 drivers/video/broadwell_igd.c                              | 1 +
 drivers/video/bus_vcxk.c                                   | 1 +
 drivers/video/cfb_console.c                                | 1 +
 drivers/video/coreboot.c                                   | 1 +
 drivers/video/da8xx-fb.c                                   | 1 +
 drivers/video/efi.c                                        | 1 +
 drivers/video/exynos/exynos_dp.c                           | 1 +
 drivers/video/exynos/exynos_dp_lowlevel.c                  | 1 +
 drivers/video/exynos/exynos_fb.c                           | 1 +
 drivers/video/exynos/exynos_mipi_dsi.c                     | 1 +
 drivers/video/exynos/exynos_mipi_dsi_lowlevel.c            | 1 +
 drivers/video/formike.c                                    | 1 +
 drivers/video/fsl_dcu_fb.c                                 | 1 +
 drivers/video/fsl_diu_fb.c                                 | 1 +
 drivers/video/hitachi_tx18d42vm_lcd.c                      | 1 +
 drivers/video/imx/ipu_common.c                             | 1 +
 drivers/video/imx/ipu_disp.c                               | 1 +
 drivers/video/imx/ipu_regs.h                               | 1 +
 drivers/video/imx/mxc_ipuv3_fb.c                           | 1 +
 drivers/video/ivybridge_igd.c                              | 1 +
 drivers/video/lg4573.c                                     | 1 +
 drivers/video/logicore_dp_tx.c                             | 1 +
 drivers/video/mali_dp.c                                    | 1 +
 drivers/video/mb862xx.c                                    | 1 +
 drivers/video/meson/meson_vclk.c                           | 1 +
 drivers/video/mx3fb.c                                      | 1 +
 drivers/video/mxsfb.c                                      | 1 +
 drivers/video/pxa_lcd.c                                    | 1 +
 drivers/video/rockchip/rk_edp.c                            | 1 +
 drivers/video/sandbox_sdl.c                                | 1 +
 drivers/video/scf0403_lcd.c                                | 1 +
 drivers/video/simplefb.c                                   | 1 +
 drivers/video/ssd2828.c                                    | 1 +
 drivers/video/sunxi/sunxi_display.c                        | 1 +
 drivers/video/sunxi/sunxi_dw_hdmi.c                        | 1 +
 drivers/video/tda19988.c                                   | 1 +
 drivers/video/tegra.c                                      | 1 +
 drivers/video/tegra124/display.c                           | 1 +
 drivers/video/tegra124/dp.c                                | 1 +
 drivers/video/tegra124/sor.c                               | 1 +
 drivers/video/video-uclass.c                               | 1 +
 drivers/video/video_bmp.c                                  | 1 +
 drivers/video/videomodes.c                                 | 1 +
 drivers/virtio/virtio_pci_legacy.c                         | 1 +
 drivers/virtio/virtio_pci_modern.c                         | 1 +
 drivers/virtio/virtio_ring.c                               | 1 +
 drivers/w1-eeprom/w1-eeprom-uclass.c                       | 1 +
 drivers/w1/w1-gpio.c                                       | 1 +
 drivers/w1/w1-uclass.c                                     | 1 +
 drivers/watchdog/at91sam9_wdt.c                            | 1 +
 drivers/watchdog/ftwdt010_wdt.c                            | 1 +
 drivers/watchdog/wdt-uclass.c                              | 1 +
 env/common.c                                               | 1 +
 env/env.c                                                  | 1 +
 env/ext4.c                                                 | 1 +
 env/fat.c                                                  | 1 +
 env/flash.c                                                | 1 +
 env/mmc.c                                                  | 1 +
 env/nand.c                                                 | 1 +
 env/onenand.c                                              | 1 +
 env/remote.c                                               | 1 +
 env/sata.c                                                 | 1 +
 env/sf.c                                                   | 1 +
 env/ubi.c                                                  | 1 +
 examples/api/demo.c                                        | 1 +
 examples/api/libgenwrap.c                                  | 1 +
 examples/standalone/atmel_df_pow2.c                        | 1 +
 examples/standalone/hello_world.c                          | 1 +
 examples/standalone/sched.c                                | 1 +
 fs/btrfs/dir-item.c                                        | 1 +
 fs/btrfs/inode.c                                           | 1 +
 fs/btrfs/root.c                                            | 1 +
 fs/btrfs/subvolume.c                                       | 1 +
 fs/btrfs/super.c                                           | 1 +
 fs/cramfs/uncompress.c                                     | 1 +
 fs/ext4/ext4_common.c                                      | 1 +
 fs/ext4/ext4_journal.c                                     | 1 +
 fs/ext4/ext4_write.c                                       | 1 +
 fs/ext4/ext4fs.c                                           | 1 +
 fs/fat/fat.c                                               | 1 +
 fs/fat/fat_write.c                                         | 1 +
 fs/fs.c                                                    | 1 +
 fs/fs_internal.c                                           | 1 +
 fs/jffs2/jffs2_1pass.c                                     | 1 +
 fs/reiserfs/reiserfs.c                                     | 1 +
 fs/sandbox/sandboxfs.c                                     | 1 +
 fs/squashfs/sqfs_filesystem.h                              | 1 +
 fs/ubifs/super.c                                           | 1 +
 fs/ubifs/ubifs.c                                           | 1 +
 fs/yaffs2/yaffs_uboot_glue.c                               | 1 +
 fs/yaffs2/yaffsfs.c                                        | 1 +
 fs/yaffs2/ydirectenv.h                                     | 1 +
 fs/zfs/zfs.c                                               | 1 +
 fs/zfs/zfs_lzjb.c                                          | 1 +
 include/bootcount.h                                        | 1 +
 include/common.h                                           | 1 -
 include/dfu.h                                              | 1 +
 include/exports.h                                          | 1 +
 include/i2c.h                                              | 1 +
 include/initcall.h                                         | 1 +
 include/spi_flash.h                                        | 1 +
 include/wait_bit.h                                         | 1 +
 lib/aes.c                                                  | 1 +
 lib/aes/aes-decrypt.c                                      | 1 +
 lib/bzip2/bzlib.c                                          | 1 +
 lib/charset.c                                              | 1 +
 lib/dhry/cmd_dhry.c                                        | 1 +
 lib/dhry/dhry_1.c                                          | 1 +
 lib/display_options.c                                      | 1 +
 lib/efi/efi_app.c                                          | 1 +
 lib/efi/efi_stub.c                                         | 1 +
 lib/efi_driver/efi_uclass.c                                | 1 +
 lib/efi_loader/efi_boottime.c                              | 1 +
 lib/efi_loader/efi_console.c                               | 1 +
 lib/efi_loader/efi_file.c                                  | 1 +
 lib/efi_loader/efi_gop.c                                   | 1 +
 lib/efi_loader/efi_image_loader.c                          | 1 +
 lib/efi_loader/efi_memory.c                                | 1 +
 lib/efi_loader/efi_net.c                                   | 1 +
 lib/efi_loader/efi_runtime.c                               | 1 +
 lib/efi_loader/efi_setup.c                                 | 1 +
 lib/efi_loader/efi_var_common.c                            | 1 +
 lib/efi_loader/efi_watchdog.c                              | 1 +
 lib/efi_selftest/efi_selftest_devicepath_util.c            | 1 +
 lib/efi_selftest/efi_selftest_fdt.c                        | 1 +
 lib/efi_selftest/efi_selftest_manageprotocols.c            | 1 +
 lib/elf.c                                                  | 1 +
 lib/fdtdec.c                                               | 1 +
 lib/fdtdec_test.c                                          | 1 +
 lib/gunzip.c                                               | 1 +
 lib/gzip.c                                                 | 1 +
 lib/hang.c                                                 | 1 +
 lib/hashtable.c                                            | 1 +
 lib/hexdump.c                                              | 1 +
 lib/image-sparse.c                                         | 1 +
 lib/libavb/avb_sysdeps_posix.c                             | 1 +
 lib/lmb.c                                                  | 1 +
 lib/optee/optee.c                                          | 1 +
 lib/panic.c                                                | 1 +
 lib/rsa/rsa-verify.c                                       | 1 +
 lib/smbios.c                                               | 1 +
 lib/tiny-printf.c                                          | 1 +
 lib/trace.c                                                | 1 +
 lib/uuid.c                                                 | 1 +
 lib/vsprintf.c                                             | 1 +
 net/arp.c                                                  | 1 +
 net/bootp.c                                                | 1 +
 net/cdp.c                                                  | 1 +
 net/dns.c                                                  | 1 +
 net/eth-uclass.c                                           | 1 +
 net/eth_legacy.c                                           | 1 +
 net/fastboot.c                                             | 1 +
 net/link_local.c                                           | 1 +
 net/net.c                                                  | 1 +
 net/nfs.c                                                  | 1 +
 net/pcap.c                                                 | 1 +
 net/rarp.c                                                 | 1 +
 net/sntp.c                                                 | 1 +
 net/tftp.c                                                 | 1 +
 post/cpu/mpc83xx/ecc.c                                     | 1 +
 post/drivers/flash.c                                       | 1 +
 post/post.c                                                | 1 +
 test/cmd_ut.c                                              | 1 +
 test/command_ut.c                                          | 1 +
 test/compression.c                                         | 1 +
 test/dm/core.c                                             | 1 +
 test/dm/osd.c                                              | 1 +
 test/dm/rtc.c                                              | 1 +
 test/dm/test-fdt.c                                         | 1 +
 test/dm/test-main.c                                        | 1 +
 test/dm/usb.c                                              | 1 +
 test/lib/sscanf.c                                          | 1 +
 test/lib/test_aes.c                                        | 1 +
 test/log/log_test.c                                        | 1 +
 test/print_ut.c                                            | 1 +
 test/stdint/int-types.c                                    | 1 +
 test/time_ut.c                                             | 1 +
 test/ut.c                                                  | 1 +
 1893 files changed, 1894 insertions(+), 1 deletion(-)

diff --git a/api/api.c b/api/api.c
index 05f0203584df..d6b5b60c2255 100644
--- a/api/api.c
+++ b/api/api.c
@@ -11,6 +11,7 @@
 #include <env.h>
 #include <malloc.h>
 #include <env_internal.h>
+#include <stdio.h>
 #include <time.h>
 #include <linux/delay.h>
 #include <linux/string.h>
diff --git a/api/api_net.c b/api/api_net.c
index 63ac3ee09c74..0982ec778eab 100644
--- a/api/api_net.c
+++ b/api/api_net.c
@@ -8,6 +8,7 @@
 #include <config.h>
 #include <common.h>
 #include <net.h>
+#include <stdio.h>
 #include <linux/string.h>
 #include <linux/types.h>
 #include <api_public.h>
diff --git a/api/api_storage.c b/api/api_storage.c
index a0dacad1a55e..d4474d7d55cf 100644
--- a/api/api_storage.c
+++ b/api/api_storage.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <api_public.h>
 #include <part.h>
+#include <stdio.h>
 
 #if defined(CONFIG_CMD_USB) && defined(CONFIG_USB_STORAGE)
 #include <usb.h>
diff --git a/arch/arc/lib/bootm.c b/arch/arc/lib/bootm.c
index 8a8d394a5f0c..28550041984f 100644
--- a/arch/arc/lib/bootm.c
+++ b/arch/arc/lib/bootm.c
@@ -10,6 +10,7 @@
 #include <irq_func.h>
 #include <lmb.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 
diff --git a/arch/arc/lib/cpu.c b/arch/arc/lib/cpu.c
index 07f57878ef14..903824615131 100644
--- a/arch/arc/lib/cpu.c
+++ b/arch/arc/lib/cpu.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <init.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <vsprintf.h>
 #include <asm/arcregs.h>
 #include <asm/cache.h>
diff --git a/arch/arc/lib/interrupts.c b/arch/arc/lib/interrupts.c
index db21fbb11428..988e04aea0bb 100644
--- a/arch/arc/lib/interrupts.c
+++ b/arch/arc/lib/interrupts.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <irq_func.h>
+#include <stdio.h>
 #include <asm/arcregs.h>
 #include <asm/ptrace.h>
 
diff --git a/arch/arc/lib/reset.c b/arch/arc/lib/reset.c
index fbb56ec83af0..4869fa936bfb 100644
--- a/arch/arc/lib/reset.c
+++ b/arch/arc/lib/reset.c
@@ -6,6 +6,7 @@
 #include <command.h>
 #include <common.h>
 #include <cpu_func.h>
+#include <stdio.h>
 
 __weak void reset_cpu(ulong addr)
 {
diff --git a/arch/arm/cpu/arm1136/mx31/generic.c b/arch/arm/cpu/arm1136/mx31/generic.c
index a3d4f1479623..ef738d6cd845 100644
--- a/arch/arm/cpu/arm1136/mx31/generic.c
+++ b/arch/arm/cpu/arm1136/mx31/generic.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <div64.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/clock.h>
 #include <asm/io.h>
diff --git a/arch/arm/cpu/arm1136/mx35/generic.c b/arch/arm/cpu/arm1136/mx35/generic.c
index b0dccac64b6b..a001dee838d6 100644
--- a/arch/arm/cpu/arm1136/mx35/generic.c
+++ b/arch/arm/cpu/arm1136/mx35/generic.c
@@ -12,6 +12,7 @@
 #include <div64.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/u-boot.h>
diff --git a/arch/arm/cpu/arm926ejs/armada100/cpu.c b/arch/arm/cpu/arm926ejs/armada100/cpu.c
index 96726b3144ec..734e4d92a8fc 100644
--- a/arch/arm/cpu/arm926ejs/armada100/cpu.c
+++ b/arch/arm/cpu/arm926ejs/armada100/cpu.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/armada100.h>
 
diff --git a/arch/arm/cpu/arm926ejs/armada100/dram.c b/arch/arm/cpu/arm926ejs/armada100/dram.c
index c97b5b1940a5..4b50d448ab11 100644
--- a/arch/arm/cpu/arm926ejs/armada100/dram.c
+++ b/arch/arm/cpu/arm926ejs/armada100/dram.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/armada100.h>
diff --git a/arch/arm/cpu/arm926ejs/mx25/generic.c b/arch/arm/cpu/arm926ejs/mx25/generic.c
index 5b745880b9c3..e9ebda4317c9 100644
--- a/arch/arm/cpu/arm926ejs/mx25/generic.c
+++ b/arch/arm/cpu/arm926ejs/mx25/generic.c
@@ -14,6 +14,7 @@
 #include <init.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/arch/arm/cpu/arm926ejs/mx27/generic.c b/arch/arm/cpu/arm926ejs/mx27/generic.c
index 0c804b8bad21..ec5f5e12e1e7 100644
--- a/arch/arm/cpu/arm926ejs/mx27/generic.c
+++ b/arch/arm/cpu/arm926ejs/mx27/generic.c
@@ -8,6 +8,7 @@
 #include <div64.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <vsprintf.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
diff --git a/arch/arm/cpu/arm926ejs/mxs/mxs.c b/arch/arm/cpu/arm926ejs/mxs/mxs.c
index 8d5a3d750536..84d672286312 100644
--- a/arch/arm/cpu/arm926ejs/mxs/mxs.c
+++ b/arch/arm/cpu/arm926ejs/mxs/mxs.c
@@ -15,6 +15,7 @@
 #include <hang.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
diff --git a/arch/arm/cpu/arm926ejs/spear/cpu.c b/arch/arm/cpu/arm926ejs/spear/cpu.c
index 93fd7a6d8dfd..3b1e80252512 100644
--- a/arch/arm/cpu/arm926ejs/spear/cpu.c
+++ b/arch/arm/cpu/arm926ejs/spear/cpu.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <command.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/spr_misc.h>
diff --git a/arch/arm/cpu/arm926ejs/spear/reset.c b/arch/arm/cpu/arm926ejs/spear/reset.c
index a316540d52a8..7c3ba8b2dbd5 100644
--- a/arch/arm/cpu/arm926ejs/spear/reset.c
+++ b/arch/arm/cpu/arm926ejs/spear/reset.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <cpu_func.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/spr_syscntl.h>
diff --git a/arch/arm/cpu/arm926ejs/spear/spl.c b/arch/arm/cpu/arm926ejs/spear/spl.c
index 08b98a2d0683..54c540b7bf25 100644
--- a/arch/arm/cpu/arm926ejs/spear/spl.c
+++ b/arch/arm/cpu/arm926ejs/spear/spl.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <init.h>
 #include <spl.h>
+#include <stdio.h>
 #include <version.h>
 #include <asm/io.h>
 #include <asm/ptrace.h>
diff --git a/arch/arm/cpu/arm926ejs/spear/spr_misc.c b/arch/arm/cpu/arm926ejs/spear/spr_misc.c
index a910b7134f38..7c780c07c310 100644
--- a/arch/arm/cpu/arm926ejs/spear/spr_misc.c
+++ b/arch/arm/cpu/arm926ejs/spear/spr_misc.c
@@ -11,6 +11,7 @@
 #include <i2c.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/mtd/st_smi.h>
 #include <asm/io.h>
diff --git a/arch/arm/cpu/armv7/bcm235xx/clk-bsc.c b/arch/arm/cpu/armv7/bcm235xx/clk-bsc.c
index 1b3f36aebe11..c8a8e358f744 100644
--- a/arch/arm/cpu/armv7/bcm235xx/clk-bsc.c
+++ b/arch/arm/cpu/armv7/bcm235xx/clk-bsc.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <asm/arch/sysmap.h>
diff --git a/arch/arm/cpu/armv7/bcm235xx/clk-core.c b/arch/arm/cpu/armv7/bcm235xx/clk-core.c
index a6bd627e20e4..8c718bf5f0bd 100644
--- a/arch/arm/cpu/armv7/bcm235xx/clk-core.c
+++ b/arch/arm/cpu/armv7/bcm235xx/clk-core.c
@@ -11,6 +11,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/arch/arm/cpu/armv7/bcm235xx/clk-core.h b/arch/arm/cpu/armv7/bcm235xx/clk-core.h
index ace384dea782..91d38703fa77 100644
--- a/arch/arm/cpu/armv7/bcm235xx/clk-core.h
+++ b/arch/arm/cpu/armv7/bcm235xx/clk-core.h
@@ -3,6 +3,7 @@
  * Copyright 2013 Broadcom Corporation.
  */
 
+#include <stdio.h>
 #include <linux/stddef.h>
 #include <linux/stringify.h>
 
diff --git a/arch/arm/cpu/armv7/bcm235xx/clk-eth.c b/arch/arm/cpu/armv7/bcm235xx/clk-eth.c
index 209ceca9a06e..0b564fbf12be 100644
--- a/arch/arm/cpu/armv7/bcm235xx/clk-eth.c
+++ b/arch/arm/cpu/armv7/bcm235xx/clk-eth.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/arch/arm/cpu/armv7/bcm235xx/clk-sdio.c b/arch/arm/cpu/armv7/bcm235xx/clk-sdio.c
index f2ba354c24f8..c21a23c2abeb 100644
--- a/arch/arm/cpu/armv7/bcm235xx/clk-sdio.c
+++ b/arch/arm/cpu/armv7/bcm235xx/clk-sdio.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <asm/arch/sysmap.h>
diff --git a/arch/arm/cpu/armv7/bcm235xx/clk-usb-otg.c b/arch/arm/cpu/armv7/bcm235xx/clk-usb-otg.c
index f604aec62fa6..f065560d2d0b 100644
--- a/arch/arm/cpu/armv7/bcm235xx/clk-usb-otg.c
+++ b/arch/arm/cpu/armv7/bcm235xx/clk-usb-otg.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <linux/errno.h>
 #include <asm/arch/sysmap.h>
 #include "clk-core.h"
diff --git a/arch/arm/cpu/armv7/bcm281xx/clk-bsc.c b/arch/arm/cpu/armv7/bcm281xx/clk-bsc.c
index 1b3f36aebe11..c8a8e358f744 100644
--- a/arch/arm/cpu/armv7/bcm281xx/clk-bsc.c
+++ b/arch/arm/cpu/armv7/bcm281xx/clk-bsc.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <asm/arch/sysmap.h>
diff --git a/arch/arm/cpu/armv7/bcm281xx/clk-core.c b/arch/arm/cpu/armv7/bcm281xx/clk-core.c
index a70979d09331..d1828d6234a9 100644
--- a/arch/arm/cpu/armv7/bcm281xx/clk-core.c
+++ b/arch/arm/cpu/armv7/bcm281xx/clk-core.c
@@ -11,6 +11,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/arch/arm/cpu/armv7/bcm281xx/clk-core.h b/arch/arm/cpu/armv7/bcm281xx/clk-core.h
index f0fbff081d02..531d9a4f3eb7 100644
--- a/arch/arm/cpu/armv7/bcm281xx/clk-core.h
+++ b/arch/arm/cpu/armv7/bcm281xx/clk-core.h
@@ -3,6 +3,7 @@
  * Copyright 2013 Broadcom Corporation.
  */
 
+#include <stdio.h>
 #include <linux/stddef.h>
 #include <linux/stringify.h>
 
diff --git a/arch/arm/cpu/armv7/bcm281xx/clk-eth.c b/arch/arm/cpu/armv7/bcm281xx/clk-eth.c
index 209ceca9a06e..0b564fbf12be 100644
--- a/arch/arm/cpu/armv7/bcm281xx/clk-eth.c
+++ b/arch/arm/cpu/armv7/bcm281xx/clk-eth.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/arch/arm/cpu/armv7/bcm281xx/clk-sdio.c b/arch/arm/cpu/armv7/bcm281xx/clk-sdio.c
index f2ba354c24f8..c21a23c2abeb 100644
--- a/arch/arm/cpu/armv7/bcm281xx/clk-sdio.c
+++ b/arch/arm/cpu/armv7/bcm281xx/clk-sdio.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <asm/arch/sysmap.h>
diff --git a/arch/arm/cpu/armv7/bcm281xx/clk-usb-otg.c b/arch/arm/cpu/armv7/bcm281xx/clk-usb-otg.c
index f604aec62fa6..f065560d2d0b 100644
--- a/arch/arm/cpu/armv7/bcm281xx/clk-usb-otg.c
+++ b/arch/arm/cpu/armv7/bcm281xx/clk-usb-otg.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <linux/errno.h>
 #include <asm/arch/sysmap.h>
 #include "clk-core.h"
diff --git a/arch/arm/cpu/armv7/iproc-common/armpll.c b/arch/arm/cpu/armv7/iproc-common/armpll.c
index efa3d9e5a9bd..2ac598cee7bb 100644
--- a/arch/arm/cpu/armv7/iproc-common/armpll.c
+++ b/arch/arm/cpu/armv7/iproc-common/armpll.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/iproc-common/armpll.h>
 #include <asm/iproc-common/sysmap.h>
diff --git a/arch/arm/cpu/armv7/ls102xa/clock.c b/arch/arm/cpu/armv7/ls102xa/clock.c
index 940995ef5af1..d0f349618d4b 100644
--- a/arch/arm/cpu/armv7/ls102xa/clock.c
+++ b/arch/arm/cpu/armv7/ls102xa/clock.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <clock_legacy.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/immap_ls102xa.h>
diff --git a/arch/arm/cpu/armv7/ls102xa/cpu.c b/arch/arm/cpu/armv7/ls102xa/cpu.c
index 61b80261f521..b7ec5ccdd267 100644
--- a/arch/arm/cpu/armv7/ls102xa/cpu.c
+++ b/arch/arm/cpu/armv7/ls102xa/cpu.c
@@ -7,6 +7,7 @@
 #include <cpu_func.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <vsprintf.h>
 #include <asm/arch/clock.h>
 #include <asm/global_data.h>
diff --git a/arch/arm/cpu/armv7/ls102xa/fdt.c b/arch/arm/cpu/armv7/ls102xa/fdt.c
index 0ab9e9092d04..ea068727f57a 100644
--- a/arch/arm/cpu/armv7/ls102xa/fdt.c
+++ b/arch/arm/cpu/armv7/ls102xa/fdt.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <clock_legacy.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/libfdt.h>
diff --git a/arch/arm/cpu/armv7/ls102xa/fsl_ls1_serdes.c b/arch/arm/cpu/armv7/ls102xa/fsl_ls1_serdes.c
index caf51e17b359..2683b59a2a0a 100644
--- a/arch/arm/cpu/armv7/ls102xa/fsl_ls1_serdes.c
+++ b/arch/arm/cpu/armv7/ls102xa/fsl_ls1_serdes.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/arch/fsl_serdes.h>
 #include <asm/arch/immap_ls102xa.h>
 #include <linux/errno.h>
diff --git a/arch/arm/cpu/armv7/s5p-common/cpu_info.c b/arch/arm/cpu/armv7/s5p-common/cpu_info.c
index fb2920950d42..722810276dec 100644
--- a/arch/arm/cpu/armv7/s5p-common/cpu_info.c
+++ b/arch/arm/cpu/armv7/s5p-common/cpu_info.c
@@ -7,6 +7,7 @@
 #include <display_options.h>
 #include <fdtdec.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clk.h>
diff --git a/arch/arm/cpu/armv7/stv0991/reset.c b/arch/arm/cpu/armv7/stv0991/reset.c
index fb67de10f483..1be1dc486d44 100644
--- a/arch/arm/cpu/armv7/stv0991/reset.c
+++ b/arch/arm/cpu/armv7/stv0991/reset.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <cpu_func.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/stv0991_wdru.h>
 #include <linux/delay.h>
diff --git a/arch/arm/cpu/armv7/vf610/generic.c b/arch/arm/cpu/armv7/vf610/generic.c
index 83459204a8f5..297a3d2378a9 100644
--- a/arch/arm/cpu/armv7/vf610/generic.c
+++ b/arch/arm/cpu/armv7/vf610/generic.c
@@ -9,6 +9,7 @@
 #include <cpu_func.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/arch/arm/cpu/armv7/virt-v7.c b/arch/arm/cpu/armv7/virt-v7.c
index 8731af9f6871..0031bf859754 100644
--- a/arch/arm/cpu/armv7/virt-v7.c
+++ b/arch/arm/cpu/armv7/virt-v7.c
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <cpu_func.h>
+#include <stdio.h>
 #include <asm/armv7.h>
 #include <asm/cache.h>
 #include <asm/gic.h>
diff --git a/arch/arm/cpu/armv7m/cache.c b/arch/arm/cpu/armv7m/cache.c
index d1aecf6a85cf..f87e1d393676 100644
--- a/arch/arm/cpu/armv7m/cache.c
+++ b/arch/arm/cpu/armv7m/cache.c
@@ -8,6 +8,7 @@
 #include <cpu_func.h>
 #include <errno.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/armv7m.h>
 #include <asm/cache.h>
 #include <asm/io.h>
diff --git a/arch/arm/cpu/armv8/cache_v8.c b/arch/arm/cpu/armv8/cache_v8.c
index 0930d206ccdd..ad019f4fe2e0 100644
--- a/arch/arm/cpu/armv8/cache_v8.c
+++ b/arch/arm/cpu/armv8/cache_v8.c
@@ -11,6 +11,7 @@
 #include <cpu_func.h>
 #include <hang.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <asm/system.h>
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
index f19b02dc4733..bf38eacb8eb9 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
@@ -12,6 +12,7 @@
 #include <hang.h>
 #include <log.h>
 #include <net.h>
+#include <stdio.h>
 #include <vsprintf.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/fdt.c b/arch/arm/cpu/armv8/fsl-layerscape/fdt.c
index 0553faf90e05..09750dc2e884 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/fdt.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/fdt.c
@@ -8,6 +8,7 @@
 #include <clock_legacy.h>
 #include <efi_loader.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <asm/u-boot.h>
 #include <linux/libfdt.h>
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_serdes.c b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_serdes.c
index 4a2f22d03661..86b2d335ab08 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_serdes.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_serdes.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c
index 63d34e1ec039..c32e7f20962e 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <clock_legacy.h>
 #include <cpu_func.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/compiler.h>
 #include <asm/io.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 f14636a0f5dc..34d5fe81d0e1 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <env.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c
index 767359fa5bd6..3240f8ef97f8 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <clock_legacy.h>
 #include <cpu_func.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/compiler.h>
 #include <fsl_ifc.h>
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/icid.c b/arch/arm/cpu/armv8/fsl-layerscape/icid.c
index 82c5a8b123a1..84ca91a0cc8e 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/icid.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/icid.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/mp.c b/arch/arm/cpu/armv8/fsl-layerscape/mp.c
index 8675007da513..fb5d8a2a6346 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/mp.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/mp.c
@@ -7,6 +7,7 @@
 #include <cpu_func.h>
 #include <image.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ppa.c b/arch/arm/cpu/armv8/fsl-layerscape/ppa.c
index f26be5a25b02..0d458d0273ef 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/ppa.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/ppa.c
@@ -7,6 +7,7 @@
 #include <malloc.h>
 #include <config.h>
 #include <errno.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <asm/system.h>
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/soc.c b/arch/arm/cpu/armv8/fsl-layerscape/soc.c
index fde893e8c9bd..a4882d8599c5 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/soc.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/soc.c
@@ -11,6 +11,7 @@
 #include <fsl_immap.h>
 #include <fsl_ifc.h>
 #include <init.h>
+#include <stdio.h>
 #include <linux/sizes.h>
 #include <log.h>
 #include <asm/arch/fsl_serdes.h>
diff --git a/arch/arm/cpu/armv8/s32v234/cpu.c b/arch/arm/cpu/armv8/s32v234/cpu.c
index 8ee3adc80584..8912eb725e20 100644
--- a/arch/arm/cpu/armv8/s32v234/cpu.c
+++ b/arch/arm/cpu/armv8/s32v234/cpu.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <asm/io.h>
 #include <asm/system.h>
diff --git a/arch/arm/cpu/armv8/s32v234/generic.c b/arch/arm/cpu/armv8/s32v234/generic.c
index 5a49a8a4a0de..59900958cd20 100644
--- a/arch/arm/cpu/armv8/s32v234/generic.c
+++ b/arch/arm/cpu/armv8/s32v234/generic.c
@@ -8,6 +8,7 @@
 #include <cpu_func.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
diff --git a/arch/arm/cpu/armv8/sec_firmware.c b/arch/arm/cpu/armv8/sec_firmware.c
index 46d58d176c53..8f7eef0d4c0e 100644
--- a/arch/arm/cpu/armv8/sec_firmware.c
+++ b/arch/arm/cpu/armv8/sec_firmware.c
@@ -9,6 +9,7 @@
 #include <fdt_support.h>
 #include <image.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <asm/ptrace.h>
diff --git a/arch/arm/cpu/armv8/spin_table.c b/arch/arm/cpu/armv8/spin_table.c
index 6aafb3b6ea3c..f687b54d0e19 100644
--- a/arch/arm/cpu/armv8/spin_table.c
+++ b/arch/arm/cpu/armv8/spin_table.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <linux/libfdt.h>
 #include <asm/spin_table.h>
 #include <linux/string.h>
diff --git a/arch/arm/cpu/pxa/cpuinfo.c b/arch/arm/cpu/pxa/cpuinfo.c
index 0d9542f998e4..582c1fcaa7a7 100644
--- a/arch/arm/cpu/pxa/cpuinfo.c
+++ b/arch/arm/cpu/pxa/cpuinfo.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <errno.h>
 #include <linux/compiler.h>
diff --git a/arch/arm/include/asm/arch-mx7ulp/scg.h b/arch/arm/include/asm/arch-mx7ulp/scg.h
index 3b5b7f6803ce..71e241db288f 100644
--- a/arch/arm/include/asm/arch-mx7ulp/scg.h
+++ b/arch/arm/include/asm/arch-mx7ulp/scg.h
@@ -6,6 +6,8 @@
 #ifndef _ASM_ARCH_SCG_H
 #define _ASM_ARCH_SCG_H
 
+#include <stdio.h>
+
 #ifdef CONFIG_CLK_DEBUG
 #define clk_debug(fmt, args...)	printf(fmt, ##args)
 #else
diff --git a/arch/arm/lib/bdinfo.c b/arch/arm/lib/bdinfo.c
index 73b9ed0815ab..3cca68e24fc0 100644
--- a/arch/arm/lib/bdinfo.c
+++ b/arch/arm/lib/bdinfo.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 
diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c
index 9dbca39b52ad..613e7abeaae5 100644
--- a/arch/arm/lib/bootm.c
+++ b/arch/arm/lib/bootm.c
@@ -19,6 +19,7 @@
 #include <hang.h>
 #include <lmb.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <dm/root.h>
diff --git a/arch/arm/lib/cache-cp15.c b/arch/arm/lib/cache-cp15.c
index d33136a9dbc1..e0e273495b30 100644
--- a/arch/arm/lib/cache-cp15.c
+++ b/arch/arm/lib/cache-cp15.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/system.h>
 #include <asm/cache.h>
diff --git a/arch/arm/lib/cache-pl310.c b/arch/arm/lib/cache-pl310.c
index bbaaaa4157a5..7976d854c983 100644
--- a/arch/arm/lib/cache-pl310.c
+++ b/arch/arm/lib/cache-pl310.c
@@ -4,6 +4,7 @@
  * Texas Instruments, <www.ti.com>
  * Aneesh V <aneesh@ti.com>
  */
+#include <stdio.h>
 #include <linux/types.h>
 #include <asm/io.h>
 #include <asm/armv7.h>
diff --git a/arch/arm/lib/cache.c b/arch/arm/lib/cache.c
index b494611d6e8d..4956942002da 100644
--- a/arch/arm/lib/cache.c
+++ b/arch/arm/lib/cache.c
@@ -10,6 +10,7 @@
 #include <cpu_func.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 
diff --git a/arch/arm/lib/eabi_compat.c b/arch/arm/lib/eabi_compat.c
index 35ce83a6facd..9e2912ffe393 100644
--- a/arch/arm/lib/eabi_compat.c
+++ b/arch/arm/lib/eabi_compat.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 int raise (int signum)
diff --git a/arch/arm/lib/image.c b/arch/arm/lib/image.c
index e394c1ad9093..044fe573c127 100644
--- a/arch/arm/lib/image.c
+++ b/arch/arm/lib/image.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <image.h>
 #include <mapmem.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/sizes.h>
diff --git a/arch/arm/lib/interrupts.c b/arch/arm/lib/interrupts.c
index 05bb1a38b35e..af65144f7a78 100644
--- a/arch/arm/lib/interrupts.c
+++ b/arch/arm/lib/interrupts.c
@@ -22,6 +22,7 @@
 #include <cpu_func.h>
 #include <efi_loader.h>
 #include <irq_func.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/proc-armv/ptrace.h>
 #include <asm/ptrace.h>
diff --git a/arch/arm/lib/interrupts_64.c b/arch/arm/lib/interrupts_64.c
index c653e67db286..6c6a81529f06 100644
--- a/arch/arm/lib/interrupts_64.c
+++ b/arch/arm/lib/interrupts_64.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <stdio.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 2ae1c5ba76c9..5561f3475c7d 100644
--- a/arch/arm/lib/interrupts_m.c
+++ b/arch/arm/lib/interrupts_m.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <irq_func.h>
+#include <stdio.h>
 
 /*
  * Upon exception entry ARMv7-M processors automatically save stack
diff --git a/arch/arm/lib/psci-dt.c b/arch/arm/lib/psci-dt.c
index 6acefab42c02..5c6f7bfe4b09 100644
--- a/arch/arm/lib/psci-dt.c
+++ b/arch/arm/lib/psci-dt.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
diff --git a/arch/arm/lib/semihosting.c b/arch/arm/lib/semihosting.c
index 73c860dbb3dd..d186584c3794 100644
--- a/arch/arm/lib/semihosting.c
+++ b/arch/arm/lib/semihosting.c
@@ -15,6 +15,7 @@
 #include <command.h>
 #include <env.h>
 #include <log.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 #define SYSOPEN		0x01
diff --git a/arch/arm/lib/zimage.c b/arch/arm/lib/zimage.c
index 477ea94997de..b5155c2a9143 100644
--- a/arch/arm/lib/zimage.c
+++ b/arch/arm/lib/zimage.c
@@ -8,6 +8,7 @@
  */
 #include <common.h>
 #include <image.h>
+#include <stdio.h>
 
 #define	LINUX_ARM_ZIMAGE_MAGIC	0x016f2818
 #define	BAREBOX_IMAGE_MAGIC	0x00786f62
diff --git a/arch/arm/mach-at91/arm920t/clock.c b/arch/arm/mach-at91/arm920t/clock.c
index 2c8fbe6d2846..57cb159d1f60 100644
--- a/arch/arm/mach-at91/arm920t/clock.c
+++ b/arch/arm/mach-at91/arm920t/clock.c
@@ -8,6 +8,7 @@
  * Copyright (C) 2009 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
  */
 #include <common.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/arch/arm/mach-at91/arm926ejs/clock.c b/arch/arm/mach-at91/arm926ejs/clock.c
index 9b97987fecb8..97e45fffd1d1 100644
--- a/arch/arm/mach-at91/arm926ejs/clock.c
+++ b/arch/arm/mach-at91/arm926ejs/clock.c
@@ -8,6 +8,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/arch/arm/mach-at91/arm926ejs/cpu.c b/arch/arm/mach-at91/arm926ejs/cpu.c
index 761edb6df589..4dbb806979de 100644
--- a/arch/arm/mach-at91/arm926ejs/cpu.c
+++ b/arch/arm/mach-at91/arm926ejs/cpu.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <vsprintf.h>
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
diff --git a/arch/arm/mach-at91/arm926ejs/eflash.c b/arch/arm/mach-at91/arm926ejs/eflash.c
index ef579e6089ce..ca52791d5bc4 100644
--- a/arch/arm/mach-at91/arm926ejs/eflash.c
+++ b/arch/arm/mach-at91/arm926ejs/eflash.c
@@ -46,6 +46,7 @@
 #include <display_options.h>
 #include <flash.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/at91_common.h>
diff --git a/arch/arm/mach-at91/armv7/clock.c b/arch/arm/mach-at91/armv7/clock.c
index aa6bb6bf31e0..7fab52d1e7e3 100644
--- a/arch/arm/mach-at91/armv7/clock.c
+++ b/arch/arm/mach-at91/armv7/clock.c
@@ -10,6 +10,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/arch/arm/mach-at91/armv7/cpu.c b/arch/arm/mach-at91/armv7/cpu.c
index a8f4356ce94f..22a03c82a2a0 100644
--- a/arch/arm/mach-at91/armv7/cpu.c
+++ b/arch/arm/mach-at91/armv7/cpu.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <init.h>
+#include <stdio.h>
 #include <vsprintf.h>
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
diff --git a/arch/arm/mach-at91/clock.c b/arch/arm/mach-at91/clock.c
index 5b8ce52f5c1e..f9723bd145e4 100644
--- a/arch/arm/mach-at91/clock.c
+++ b/arch/arm/mach-at91/clock.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <stdio.h>
 #include <time.h>
 #include <wdt.h>
 #include <asm/io.h>
diff --git a/arch/arm/mach-at91/phy.c b/arch/arm/mach-at91/phy.c
index b68e4bd355fb..c9e2db787dfe 100644
--- a/arch/arm/mach-at91/phy.c
+++ b/arch/arm/mach-at91/phy.c
@@ -12,6 +12,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/hardware.h>
 #include <asm/io.h>
diff --git a/arch/arm/mach-at91/spl.c b/arch/arm/mach-at91/spl.c
index 156150c89c8b..217fcfa66895 100644
--- a/arch/arm/mach-at91/spl.c
+++ b/arch/arm/mach-at91/spl.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <hang.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/at91_common.h>
 #include <asm/arch/at91_wdt.h>
diff --git a/arch/arm/mach-bcm283x/mbox.c b/arch/arm/mach-bcm283x/mbox.c
index 940699337f1e..ed724497b0c5 100644
--- a/arch/arm/mach-bcm283x/mbox.c
+++ b/arch/arm/mach-bcm283x/mbox.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/cache.h>
 #include <asm/io.h>
diff --git a/arch/arm/mach-bcm283x/msg.c b/arch/arm/mach-bcm283x/msg.c
index 347aece3cd8d..ac43d51e64d4 100644
--- a/arch/arm/mach-bcm283x/msg.c
+++ b/arch/arm/mach-bcm283x/msg.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <memalign.h>
 #include <phys2bus.h>
+#include <stdio.h>
 #include <asm/arch/mbox.h>
 #include <linux/delay.h>
 
diff --git a/arch/arm/mach-davinci/misc.c b/arch/arm/mach-davinci/misc.c
index 90b38b7e020e..d8a424fd028f 100644
--- a/arch/arm/mach-davinci/misc.c
+++ b/arch/arm/mach-davinci/misc.c
@@ -14,6 +14,7 @@
 #include <init.h>
 #include <log.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/arch/hardware.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/arch/arm/mach-davinci/spl.c b/arch/arm/mach-davinci/spl.c
index 5fea935d6e4e..9e14284ab02f 100644
--- a/arch/arm/mach-davinci/spl.c
+++ b/arch/arm/mach-davinci/spl.c
@@ -8,6 +8,7 @@
 #include <hang.h>
 #include <init.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 #include <asm/utils.h>
 #include <nand.h>
diff --git a/arch/arm/mach-exynos/clock.c b/arch/arm/mach-exynos/clock.c
index 6c21fd642cd4..76bb97e37325 100644
--- a/arch/arm/mach-exynos/clock.c
+++ b/arch/arm/mach-exynos/clock.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
diff --git a/arch/arm/mach-imx/cache.c b/arch/arm/mach-imx/cache.c
index 4e3b49a3fdfc..ce49253d0b40 100644
--- a/arch/arm/mach-imx/cache.c
+++ b/arch/arm/mach-imx/cache.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <cpu_func.h>
+#include <stdio.h>
 #include <asm/armv7.h>
 #include <asm/cache.h>
 #include <asm/pl310.h>
diff --git a/arch/arm/mach-imx/cmd_nandbcb.c b/arch/arm/mach-imx/cmd_nandbcb.c
index 21010d455abe..c2ca33888b50 100644
--- a/arch/arm/mach-imx/cmd_nandbcb.c
+++ b/arch/arm/mach-imx/cmd_nandbcb.c
@@ -16,6 +16,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <nand.h>
+#include <stdio.h>
 #include <dm/devres.h>
 #include <linux/bug.h>
 #include <linux/string.h>
diff --git a/arch/arm/mach-imx/cpu.c b/arch/arm/mach-imx/cpu.c
index 3bd60a5cdbab..c2f0f510e83a 100644
--- a/arch/arm/mach-imx/cpu.c
+++ b/arch/arm/mach-imx/cpu.c
@@ -13,6 +13,7 @@
 #include <log.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <asm/io.h>
diff --git a/arch/arm/mach-imx/hab.c b/arch/arm/mach-imx/hab.c
index 7510735bf463..0d2cbf989635 100644
--- a/arch/arm/mach-imx/hab.c
+++ b/arch/arm/mach-imx/hab.c
@@ -10,6 +10,7 @@
 #include <fuse.h>
 #include <mapmem.h>
 #include <image.h>
+#include <stdio.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 5e3d79b887f0..5f5103a12a62 100644
--- a/arch/arm/mach-imx/i2c-mxv7.c
+++ b/arch/arm/mach-imx/i2c-mxv7.c
@@ -4,6 +4,7 @@
  */
 #include <common.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
diff --git a/arch/arm/mach-imx/imx8/ahab.c b/arch/arm/mach-imx/imx8/ahab.c
index 0df61fca4769..69033420ee5a 100644
--- a/arch/arm/mach-imx/imx8/ahab.c
+++ b/arch/arm/mach-imx/imx8/ahab.c
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <errno.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/sci/sci.h>
diff --git a/arch/arm/mach-imx/imx8/clock.c b/arch/arm/mach-imx/imx8/clock.c
index 9941b57b4be5..9288282dfb03 100644
--- a/arch/arm/mach-imx/imx8/clock.c
+++ b/arch/arm/mach-imx/imx8/clock.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
 #include <asm/arch/clock.h>
diff --git a/arch/arm/mach-imx/imx8/cpu.c b/arch/arm/mach-imx/imx8/cpu.c
index 293c931b2ffa..b9cbdc64164d 100644
--- a/arch/arm/mach-imx/imx8/cpu.c
+++ b/arch/arm/mach-imx/imx8/cpu.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <dm/device-internal.h>
diff --git a/arch/arm/mach-imx/imx8/fdt.c b/arch/arm/mach-imx/imx8/fdt.c
index 6c473ddcc9c9..0fd0c4bca097 100644
--- a/arch/arm/mach-imx/imx8/fdt.c
+++ b/arch/arm/mach-imx/imx8/fdt.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/arch/sci/sci.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/global_data.h>
diff --git a/arch/arm/mach-imx/imx8/image.c b/arch/arm/mach-imx/imx8/image.c
index 638aac2eafe5..9b4fc6f09059 100644
--- a/arch/arm/mach-imx/imx8/image.c
+++ b/arch/arm/mach-imx/imx8/image.c
@@ -7,6 +7,7 @@
 #include <errno.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <mmc.h>
 #include <spi_flash.h>
diff --git a/arch/arm/mach-imx/imx8/iomux.c b/arch/arm/mach-imx/imx8/iomux.c
index 9c3cfbf0068c..0f4f0cac1077 100644
--- a/arch/arm/mach-imx/imx8/iomux.c
+++ b/arch/arm/mach-imx/imx8/iomux.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/iomux.h>
diff --git a/arch/arm/mach-imx/imx8/misc.c b/arch/arm/mach-imx/imx8/misc.c
index de19955e2f77..e83c0517fca7 100644
--- a/arch/arm/mach-imx/imx8/misc.c
+++ b/arch/arm/mach-imx/imx8/misc.c
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0+
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/arch/sci/sci.h>
 #include <asm/mach-imx/sys_proto.h>
 #include <imx_sip.h>
diff --git a/arch/arm/mach-imx/imx8/parse-container.c b/arch/arm/mach-imx/imx8/parse-container.c
index ed69abc76d8c..3a1c8c7a5e5f 100644
--- a/arch/arm/mach-imx/imx8/parse-container.c
+++ b/arch/arm/mach-imx/imx8/parse-container.c
@@ -7,6 +7,7 @@
 #include <errno.h>
 #include <log.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/arch/image.h>
 #include <asm/arch/sci/sci.h>
 #include <linux/string.h>
diff --git a/arch/arm/mach-imx/imx8/snvs_security_sc.c b/arch/arm/mach-imx/imx8/snvs_security_sc.c
index 6f9b1c99fcd2..84d400f02837 100644
--- a/arch/arm/mach-imx/imx8/snvs_security_sc.c
+++ b/arch/arm/mach-imx/imx8/snvs_security_sc.c
@@ -15,6 +15,7 @@
 #include <log.h>
 #include <stddef.h>
 #include <common.h>
+#include <stdio.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/clock_imx8mm.c b/arch/arm/mach-imx/imx8m/clock_imx8mm.c
index 7f99c5c4b916..ff3943e5106c 100644
--- a/arch/arm/mach-imx/imx8m/clock_imx8mm.c
+++ b/arch/arm/mach-imx/imx8m/clock_imx8mm.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
diff --git a/arch/arm/mach-imx/imx8m/clock_imx8mq.c b/arch/arm/mach-imx/imx8m/clock_imx8mq.c
index 759ec6d114eb..444e9b7feee4 100644
--- a/arch/arm/mach-imx/imx8m/clock_imx8mq.c
+++ b/arch/arm/mach-imx/imx8m/clock_imx8mq.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/io.h>
diff --git a/arch/arm/mach-imx/imx8m/soc.c b/arch/arm/mach-imx/imx8m/soc.c
index a6e386fda798..4b02c70e6d52 100644
--- a/arch/arm/mach-imx/imx8m/soc.c
+++ b/arch/arm/mach-imx/imx8m/soc.c
@@ -9,6 +9,7 @@
 #include <cpu_func.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.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 e1fc4b3e19af..46a4d3661d10 100644
--- a/arch/arm/mach-imx/imx_bootaux.c
+++ b/arch/arm/mach-imx/imx_bootaux.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/mach-imx/sys_proto.h>
 #include <command.h>
diff --git a/arch/arm/mach-imx/mx5/clock.c b/arch/arm/mach-imx/mx5/clock.c
index cc93716c74e4..c6a14a6a7ec9 100644
--- a/arch/arm/mach-imx/mx5/clock.c
+++ b/arch/arm/mach-imx/mx5/clock.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <command.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <asm/arch/imx-regs.h>
diff --git a/arch/arm/mach-imx/mx6/clock.c b/arch/arm/mach-imx/mx6/clock.c
index c40d8855125f..c91259f4bec3 100644
--- a/arch/arm/mach-imx/mx6/clock.c
+++ b/arch/arm/mach-imx/mx6/clock.c
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <div64.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/io.h>
 #include <linux/errno.h>
diff --git a/arch/arm/mach-imx/mx6/ddr.c b/arch/arm/mach-imx/mx6/ddr.c
index 16df71083db0..fc1479629396 100644
--- a/arch/arm/mach-imx/mx6/ddr.c
+++ b/arch/arm/mach-imx/mx6/ddr.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <hang.h>
 #include <log.h>
+#include <stdio.h>
 #include <linux/delay.h>
 #include <linux/types.h>
 #include <asm/arch/clock.h>
diff --git a/arch/arm/mach-imx/mx6/litesom.c b/arch/arm/mach-imx/mx6/litesom.c
index 17108a839814..5514389ca2af 100644
--- a/arch/arm/mach-imx/mx6/litesom.c
+++ b/arch/arm/mach-imx/mx6/litesom.c
@@ -5,6 +5,7 @@
  */
 
 #include <init.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/imx-regs.h>
diff --git a/arch/arm/mach-imx/mx6/module_fuse.c b/arch/arm/mach-imx/mx6/module_fuse.c
index ced49dcad33d..569c8dc0b139 100644
--- a/arch/arm/mach-imx/mx6/module_fuse.c
+++ b/arch/arm/mach-imx/mx6/module_fuse.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <fdt_support.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/imx-regs.h>
diff --git a/arch/arm/mach-imx/mx6/mp.c b/arch/arm/mach-imx/mx6/mp.c
index 2fdf070a08b4..fe591a8ffc39 100644
--- a/arch/arm/mach-imx/mx6/mp.c
+++ b/arch/arm/mach-imx/mx6/mp.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <cpu_func.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <asm/arch/sys_proto.h>
diff --git a/arch/arm/mach-imx/mx7/clock.c b/arch/arm/mach-imx/mx7/clock.c
index 56e0cfa98876..b2d566737a40 100644
--- a/arch/arm/mach-imx/mx7/clock.c
+++ b/arch/arm/mach-imx/mx7/clock.c
@@ -11,6 +11,7 @@
 #include <command.h>
 #include <div64.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/arch/arm/mach-imx/mx7/clock_slice.c b/arch/arm/mach-imx/mx7/clock_slice.c
index dd731d949621..ce2f59cd098e 100644
--- a/arch/arm/mach-imx/mx7/clock_slice.c
+++ b/arch/arm/mach-imx/mx7/clock_slice.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <div64.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <asm/arch/imx-regs.h>
diff --git a/arch/arm/mach-imx/mx7ulp/clock.c b/arch/arm/mach-imx/mx7ulp/clock.c
index 467832074afb..10390a74165b 100644
--- a/arch/arm/mach-imx/mx7ulp/clock.c
+++ b/arch/arm/mach-imx/mx7ulp/clock.c
@@ -7,6 +7,7 @@
 #include <clock_legacy.h>
 #include <command.h>
 #include <div64.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <errno.h>
diff --git a/arch/arm/mach-imx/mx7ulp/pcc.c b/arch/arm/mach-imx/mx7ulp/pcc.c
index aa7ea86a443e..a70131dfa3b3 100644
--- a/arch/arm/mach-imx/mx7ulp/pcc.c
+++ b/arch/arm/mach-imx/mx7ulp/pcc.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <div64.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <errno.h>
 #include <asm/arch/imx-regs.h>
diff --git a/arch/arm/mach-imx/mx7ulp/scg.c b/arch/arm/mach-imx/mx7ulp/scg.c
index 4c066557c1ca..6c24ec2d819a 100644
--- a/arch/arm/mach-imx/mx7ulp/scg.c
+++ b/arch/arm/mach-imx/mx7ulp/scg.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <div64.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <errno.h>
 #include <asm/arch/imx-regs.h>
diff --git a/arch/arm/mach-imx/mx7ulp/soc.c b/arch/arm/mach-imx/mx7ulp/soc.c
index 8dd6b4d40e77..e67121c55237 100644
--- a/arch/arm/mach-imx/mx7ulp/soc.c
+++ b/arch/arm/mach-imx/mx7ulp/soc.c
@@ -7,6 +7,7 @@
 #include <cpu_func.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
diff --git a/arch/arm/mach-imx/spl.c b/arch/arm/mach-imx/spl.c
index 982fb47bc89d..e78d2515e2bf 100644
--- a/arch/arm/mach-imx/spl.c
+++ b/arch/arm/mach-imx/spl.c
@@ -10,6 +10,7 @@
 #include <hang.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
diff --git a/arch/arm/mach-imx/spl_imx_romapi.c b/arch/arm/mach-imx/spl_imx_romapi.c
index dc13a397ea8b..8750fbdaf4e9 100644
--- a/arch/arm/mach-imx/spl_imx_romapi.c
+++ b/arch/arm/mach-imx/spl_imx_romapi.c
@@ -7,6 +7,7 @@
 #include <errno.h>
 #include <image.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/libfdt.h>
 #include <spl.h>
diff --git a/arch/arm/mach-imx/video.c b/arch/arm/mach-imx/video.c
index 4d76ecc29694..fbf2a73ea1de 100644
--- a/arch/arm/mach-imx/video.c
+++ b/arch/arm/mach-imx/video.c
@@ -2,6 +2,7 @@
 
 #include <common.h>
 #include <env.h>
+#include <stdio.h>
 #include <linux/errno.h>
 #include <asm/mach-imx/video.h>
 #include <linux/string.h>
diff --git a/arch/arm/mach-k3/am6_init.c b/arch/arm/mach-k3/am6_init.c
index 603834e5078b..d4c9780c6bb8 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 <fdt_support.h>
 #include <init.h>
+#include <stdio.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 97c52dacea80..572b7116c8c3 100644
--- a/arch/arm/mach-k3/common.c
+++ b/arch/arm/mach-k3/common.c
@@ -12,6 +12,7 @@
 #include <init.h>
 #include <log.h>
 #include <spl.h>
+#include <stdio.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 a36e4ed603b1..df899fa0fb3a 100644
--- a/arch/arm/mach-k3/j721e_init.c
+++ b/arch/arm/mach-k3/j721e_init.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <init.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/armv7_mpu.h>
 #include <asm/arch/hardware.h>
diff --git a/arch/arm/mach-k3/security.c b/arch/arm/mach-k3/security.c
index 66f90a5a34df..484884819b4d 100644
--- a/arch/arm/mach-k3/security.c
+++ b/arch/arm/mach-k3/security.c
@@ -12,6 +12,7 @@
 #include <hang.h>
 #include <image.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <linux/soc/ti/ti_sci_protocol.h>
 #include <mach/spl.h>
diff --git a/arch/arm/mach-keystone/cmd_clock.c b/arch/arm/mach-keystone/cmd_clock.c
index 15fa0ebddeaa..22277b5987e0 100644
--- a/arch/arm/mach-keystone/cmd_clock.c
+++ b/arch/arm/mach-keystone/cmd_clock.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <stdio.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 f9d5cda827f3..94e55331d5c7 100644
--- a/arch/arm/mach-keystone/cmd_mon.c
+++ b/arch/arm/mach-keystone/cmd_mon.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <command.h>
 #include <image.h>
+#include <stdio.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 7dea600d509b..b646599587a9 100644
--- a/arch/arm/mach-keystone/ddr3.c
+++ b/arch/arm/mach-keystone/ddr3.c
@@ -8,6 +8,7 @@
 
 #include <cpu_func.h>
 #include <env.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <common.h>
 #include <asm/arch/msmc.h>
diff --git a/arch/arm/mach-keystone/ddr3_spd.c b/arch/arm/mach-keystone/ddr3_spd.c
index e84f3253b394..a7aa7f365210 100644
--- a/arch/arm/mach-keystone/ddr3_spd.c
+++ b/arch/arm/mach-keystone/ddr3_spd.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 #include <i2c.h>
diff --git a/arch/arm/mach-keystone/init.c b/arch/arm/mach-keystone/init.c
index 88e8912959fa..1c67a1fdfe8c 100644
--- a/arch/arm/mach-keystone/init.c
+++ b/arch/arm/mach-keystone/init.c
@@ -10,6 +10,7 @@
 #include <cpu_func.h>
 #include <init.h>
 #include <ns16550.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <asm/io.h>
 #include <asm/arch/msmc.h>
diff --git a/arch/arm/mach-keystone/keystone.c b/arch/arm/mach-keystone/keystone.c
index efaabca5a7e7..2337adb6ef2d 100644
--- a/arch/arm/mach-keystone/keystone.c
+++ b/arch/arm/mach-keystone/keystone.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <env.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/psc_defs.h>
 #include <asm/arch/hardware.h>
diff --git a/arch/arm/mach-keystone/mon.c b/arch/arm/mach-keystone/mon.c
index bbae14c58f1e..af038dec7ae6 100644
--- a/arch/arm/mach-keystone/mon.c
+++ b/arch/arm/mach-keystone/mon.c
@@ -7,6 +7,7 @@
 
 #include <hang.h>
 #include <image.h>
+#include <stdio.h>
 #include <asm/unaligned.h>
 #include <common.h>
 #include <command.h>
diff --git a/arch/arm/mach-keystone/psc.c b/arch/arm/mach-keystone/psc.c
index 145aff8ac66f..6d68ecba4f8c 100644
--- a/arch/arm/mach-keystone/psc.c
+++ b/arch/arm/mach-keystone/psc.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/io.h>
diff --git a/arch/arm/mach-kirkwood/cpu.c b/arch/arm/mach-kirkwood/cpu.c
index beee83b22498..087240b4d3f6 100644
--- a/arch/arm/mach-kirkwood/cpu.c
+++ b/arch/arm/mach-kirkwood/cpu.c
@@ -13,6 +13,7 @@
 #include <log.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
diff --git a/arch/arm/mach-lpc32xx/cpu.c b/arch/arm/mach-lpc32xx/cpu.c
index df5006207612..cdc069639d5b 100644
--- a/arch/arm/mach-lpc32xx/cpu.c
+++ b/arch/arm/mach-lpc32xx/cpu.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/clk.h>
 #include <asm/arch/wdt.h>
diff --git a/arch/arm/mach-mediatek/mt7622/init.c b/arch/arm/mach-mediatek/mt7622/init.c
index 7f6ce80f37b2..ff07936be34c 100644
--- a/arch/arm/mach-mediatek/mt7622/init.c
+++ b/arch/arm/mach-mediatek/mt7622/init.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <fdtdec.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/armv8/mmu.h>
 #include <asm/cache.h>
 
diff --git a/arch/arm/mach-mediatek/mt7623/init.c b/arch/arm/mach-mediatek/mt7623/init.c
index 5d837e059719..7db7336494e3 100644
--- a/arch/arm/mach-mediatek/mt7623/init.c
+++ b/arch/arm/mach-mediatek/mt7623/init.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/io.h>
 #include <linux/sizes.h>
diff --git a/arch/arm/mach-mediatek/mt7629/init.c b/arch/arm/mach-mediatek/mt7629/init.c
index 617a77e98003..5cee055f94c1 100644
--- a/arch/arm/mach-mediatek/mt7629/init.c
+++ b/arch/arm/mach-mediatek/mt7629/init.c
@@ -11,6 +11,7 @@
 #include <init.h>
 #include <log.h>
 #include <ram.h>
+#include <stdio.h>
 #include <asm/arch/misc.h>
 #include <asm/global_data.h>
 #include <asm/sections.h>
diff --git a/arch/arm/mach-mediatek/mt8516/init.c b/arch/arm/mach-mediatek/mt8516/init.c
index 0eb65aa76b5f..a09874280a91 100644
--- a/arch/arm/mach-mediatek/mt8516/init.c
+++ b/arch/arm/mach-mediatek/mt8516/init.c
@@ -12,6 +12,7 @@
 #include <fdtdec.h>
 #include <init.h>
 #include <ram.h>
+#include <stdio.h>
 #include <asm/arch/misc.h>
 #include <asm/armv8/mmu.h>
 #include <asm/cache.h>
diff --git a/arch/arm/mach-mediatek/mt8518/init.c b/arch/arm/mach-mediatek/mt8518/init.c
index 28b00c3dec89..2e4ab1fa37ab 100644
--- a/arch/arm/mach-mediatek/mt8518/init.c
+++ b/arch/arm/mach-mediatek/mt8518/init.c
@@ -13,6 +13,7 @@
 #include <fdtdec.h>
 #include <init.h>
 #include <ram.h>
+#include <stdio.h>
 #include <asm/arch/misc.h>
 #include <asm/armv8/mmu.h>
 #include <asm/cache.h>
diff --git a/arch/arm/mach-meson/board-axg.c b/arch/arm/mach-meson/board-axg.c
index 9ec63141ab15..7e07465d2540 100644
--- a/arch/arm/mach-meson/board-axg.c
+++ b/arch/arm/mach-meson/board-axg.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/arch/boot.h>
 #include <asm/arch/eth.h>
 #include <asm/arch/axg.h>
diff --git a/arch/arm/mach-meson/board-common.c b/arch/arm/mach-meson/board-common.c
index 67d85d4e1ce2..a8d0254d5766 100644
--- a/arch/arm/mach-meson/board-common.c
+++ b/arch/arm/mach-meson/board-common.c
@@ -7,6 +7,7 @@
 #include <cpu_func.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/arch/boot.h>
 #include <env.h>
 #include <asm/cache.h>
diff --git a/arch/arm/mach-meson/board-g12a.c b/arch/arm/mach-meson/board-g12a.c
index bb75d4f8ad37..b698298e13e6 100644
--- a/arch/arm/mach-meson/board-g12a.c
+++ b/arch/arm/mach-meson/board-g12a.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <log.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/arch/boot.h>
 #include <asm/arch/eth.h>
 #include <asm/arch/g12a.h>
diff --git a/arch/arm/mach-meson/board-gx.c b/arch/arm/mach-meson/board-gx.c
index 53756cc6875d..ec2f1c07314f 100644
--- a/arch/arm/mach-meson/board-gx.c
+++ b/arch/arm/mach-meson/board-gx.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/arch/boot.h>
 #include <asm/arch/eth.h>
 #include <asm/arch/gx.h>
diff --git a/arch/arm/mach-meson/board-info.c b/arch/arm/mach-meson/board-info.c
index 28385488995a..fdc8df595568 100644
--- a/arch/arm/mach-meson/board-info.c
+++ b/arch/arm/mach-meson/board-info.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm.h>
diff --git a/arch/arm/mach-meson/sm.c b/arch/arm/mach-meson/sm.c
index e8036b94a0aa..a2a30eb80b00 100644
--- a/arch/arm/mach-meson/sm.c
+++ b/arch/arm/mach-meson/sm.c
@@ -9,6 +9,7 @@
 #include <command.h>
 #include <env.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/arch/sm.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
diff --git a/arch/arm/mach-mvebu/armada3700/cpu.c b/arch/arm/mach-mvebu/armada3700/cpu.c
index 7ab5c653f1e1..2551c69d1959 100644
--- a/arch/arm/mach-mvebu/armada3700/cpu.c
+++ b/arch/arm/mach-mvebu/armada3700/cpu.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <fdtdec.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/libfdt.h>
diff --git a/arch/arm/mach-mvebu/cpu.c b/arch/arm/mach-mvebu/cpu.c
index 19886c5f1399..d529407987e9 100644
--- a/arch/arm/mach-mvebu/cpu.c
+++ b/arch/arm/mach-mvebu/cpu.c
@@ -7,6 +7,7 @@
 #include <ahci.h>
 #include <cpu_func.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/arch/arm/mach-mvebu/dram.c b/arch/arm/mach-mvebu/dram.c
index 349e0cc4c180..8241926fad01 100644
--- a/arch/arm/mach-mvebu/dram.c
+++ b/arch/arm/mach-mvebu/dram.c
@@ -8,6 +8,7 @@
 #include <config.h>
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
diff --git a/arch/arm/mach-mvebu/mbus.c b/arch/arm/mach-mvebu/mbus.c
index f29abe591109..e754f122b1c4 100644
--- a/arch/arm/mach-mvebu/mbus.c
+++ b/arch/arm/mach-mvebu/mbus.c
@@ -48,6 +48,7 @@
 
 #include <common.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <asm/io.h>
diff --git a/arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec-38x.c b/arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec-38x.c
index 12596ec2d8bd..98354da9b273 100644
--- a/arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec-38x.c
+++ b/arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec-38x.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
diff --git a/arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec.c b/arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec.c
index 2454730e6d86..e4bec786429b 100644
--- a/arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec.c
+++ b/arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
diff --git a/arch/arm/mach-mvebu/serdes/a38x/seq_exec.c b/arch/arm/mach-mvebu/serdes/a38x/seq_exec.c
index 2a51b7113ce4..a8f491b5b414 100644
--- a/arch/arm/mach-mvebu/serdes/a38x/seq_exec.c
+++ b/arch/arm/mach-mvebu/serdes/a38x/seq_exec.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
diff --git a/arch/arm/mach-mvebu/serdes/a38x/sys_env_lib.c b/arch/arm/mach-mvebu/serdes/a38x/sys_env_lib.c
index 3c4c7e01a1cd..1be86bc4ae1d 100644
--- a/arch/arm/mach-mvebu/serdes/a38x/sys_env_lib.c
+++ b/arch/arm/mach-mvebu/serdes/a38x/sys_env_lib.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
diff --git a/arch/arm/mach-omap2/abb.c b/arch/arm/mach-omap2/abb.c
index 722e6db0566d..c8c455fef1e0 100644
--- a/arch/arm/mach-omap2/abb.c
+++ b/arch/arm/mach-omap2/abb.c
@@ -9,6 +9,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/omap_common.h>
 #include <asm/arch/clock.h>
 #include <asm/io.h>
diff --git a/arch/arm/mach-omap2/am33xx/chilisom.c b/arch/arm/mach-omap2/am33xx/chilisom.c
index 15b6b35ae7c1..8ab9b49a2f72 100644
--- a/arch/arm/mach-omap2/am33xx/chilisom.c
+++ b/arch/arm/mach-omap2/am33xx/chilisom.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/clk_synthesizer.h>
 #include <asm/arch/cpu.h>
diff --git a/arch/arm/mach-omap2/am33xx/clk_synthesizer.c b/arch/arm/mach-omap2/am33xx/clk_synthesizer.c
index ff1bfaf84b69..b2493d8179be 100644
--- a/arch/arm/mach-omap2/am33xx/clk_synthesizer.c
+++ b/arch/arm/mach-omap2/am33xx/clk_synthesizer.c
@@ -9,6 +9,7 @@
 
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/arch/clk_synthesizer.h>
 #include <i2c.h>
 
diff --git a/arch/arm/mach-omap2/am33xx/clock.c b/arch/arm/mach-omap2/am33xx/clock.c
index 8819062aaadd..4339817b556a 100644
--- a/arch/arm/mach-omap2/am33xx/clock.c
+++ b/arch/arm/mach-omap2/am33xx/clock.c
@@ -11,6 +11,7 @@
 #include <hang.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/hardware.h>
diff --git a/arch/arm/mach-omap2/am33xx/clock_am33xx.c b/arch/arm/mach-omap2/am33xx/clock_am33xx.c
index 2427933c8ba7..b5136f8f46c9 100644
--- a/arch/arm/mach-omap2/am33xx/clock_am33xx.c
+++ b/arch/arm/mach-omap2/am33xx/clock_am33xx.c
@@ -8,6 +8,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/clock.h>
diff --git a/arch/arm/mach-omap2/am33xx/ddr.c b/arch/arm/mach-omap2/am33xx/ddr.c
index f8434ecf5758..4caa2d62ab25 100644
--- a/arch/arm/mach-omap2/am33xx/ddr.c
+++ b/arch/arm/mach-omap2/am33xx/ddr.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/ddr_defs.h>
 #include <asm/arch/sys_proto.h>
diff --git a/arch/arm/mach-omap2/am33xx/fdt.c b/arch/arm/mach-omap2/am33xx/fdt.c
index 2b4fd731db09..e5787df566b0 100644
--- a/arch/arm/mach-omap2/am33xx/fdt.c
+++ b/arch/arm/mach-omap2/am33xx/fdt.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <hang.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
diff --git a/arch/arm/mach-omap2/am33xx/sys_info.c b/arch/arm/mach-omap2/am33xx/sys_info.c
index 338f6afcae38..0809664b7ecd 100644
--- a/arch/arm/mach-omap2/am33xx/sys_info.c
+++ b/arch/arm/mach-omap2/am33xx/sys_info.c
@@ -13,6 +13,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/cpu.h>
diff --git a/arch/arm/mach-omap2/clocks-common.c b/arch/arm/mach-omap2/clocks-common.c
index 757fa3801a14..a151358f6e0f 100644
--- a/arch/arm/mach-omap2/clocks-common.c
+++ b/arch/arm/mach-omap2/clocks-common.c
@@ -17,6 +17,7 @@
 #include <i2c.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/omap_common.h>
 #include <asm/gpio.h>
 #include <asm/arch/clock.h>
diff --git a/arch/arm/mach-omap2/emif-common.c b/arch/arm/mach-omap2/emif-common.c
index 8346d899e475..7405d692e7b9 100644
--- a/arch/arm/mach-omap2/emif-common.c
+++ b/arch/arm/mach-omap2/emif-common.c
@@ -13,6 +13,7 @@
 #include <init.h>
 #include <log.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/emif.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/sys_proto.h>
diff --git a/arch/arm/mach-omap2/fdt-common.c b/arch/arm/mach-omap2/fdt-common.c
index b122db8bf7a9..e1d3a72ec6d7 100644
--- a/arch/arm/mach-omap2/fdt-common.c
+++ b/arch/arm/mach-omap2/fdt-common.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
diff --git a/arch/arm/mach-omap2/hwinit-common.c b/arch/arm/mach-omap2/hwinit-common.c
index 3da50f974dc0..b3ada7af6b86 100644
--- a/arch/arm/mach-omap2/hwinit-common.c
+++ b/arch/arm/mach-omap2/hwinit-common.c
@@ -15,6 +15,7 @@
 #include <fdtdec.h>
 #include <init.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/global_data.h>
 #include <linux/sizes.h>
diff --git a/arch/arm/mach-omap2/omap3/am35x_musb.c b/arch/arm/mach-omap2/omap3/am35x_musb.c
index ada70743a335..23b55d8d7059 100644
--- a/arch/arm/mach-omap2/omap3/am35x_musb.c
+++ b/arch/arm/mach-omap2/omap3/am35x_musb.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/io.h>
 #include <asm/arch/am35x_def.h>
diff --git a/arch/arm/mach-omap2/omap3/board.c b/arch/arm/mach-omap2/omap3/board.c
index c741652f241f..30a3b02bb289 100644
--- a/arch/arm/mach-omap2/omap3/board.c
+++ b/arch/arm/mach-omap2/omap3/board.c
@@ -20,6 +20,7 @@
 #include <dm.h>
 #include <init.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/mem.h>
diff --git a/arch/arm/mach-omap2/omap3/sys_info.c b/arch/arm/mach-omap2/omap3/sys_info.c
index ac72633c20f8..5ed2c6bdeeeb 100644
--- a/arch/arm/mach-omap2/omap3/sys_info.c
+++ b/arch/arm/mach-omap2/omap3/sys_info.c
@@ -12,6 +12,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/mem.h>	/* get mem tables */
 #include <asm/arch/sys_proto.h>
diff --git a/arch/arm/mach-omap2/omap4/hw_data.c b/arch/arm/mach-omap2/omap4/hw_data.c
index d587a4d4def0..5f15e086c644 100644
--- a/arch/arm/mach-omap2/omap4/hw_data.c
+++ b/arch/arm/mach-omap2/omap4/hw_data.c
@@ -9,6 +9,7 @@
  * Sricharan R <r.sricharan@ti.com>
  */
 #include <common.h>
+#include <stdio.h>
 #include <asm/arch/omap.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/omap_common.h>
diff --git a/arch/arm/mach-omap2/omap5/dra7xx_iodelay.c b/arch/arm/mach-omap2/omap5/dra7xx_iodelay.c
index 8569eff31ab5..c5d51aabfc94 100644
--- a/arch/arm/mach-omap2/omap5/dra7xx_iodelay.c
+++ b/arch/arm/mach-omap2/omap5/dra7xx_iodelay.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <hang.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/utils.h>
 #include <asm/arch/dra7xx_iodelay.h>
 #include <asm/arch/omap.h>
diff --git a/arch/arm/mach-omap2/omap5/fdt.c b/arch/arm/mach-omap2/omap5/fdt.c
index bf4f015cf520..d6259434a235 100644
--- a/arch/arm/mach-omap2/omap5/fdt.c
+++ b/arch/arm/mach-omap2/omap5/fdt.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <hang.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
diff --git a/arch/arm/mach-omap2/omap5/hw_data.c b/arch/arm/mach-omap2/omap5/hw_data.c
index fa4e27063c53..d9c447c0e8d2 100644
--- a/arch/arm/mach-omap2/omap5/hw_data.c
+++ b/arch/arm/mach-omap2/omap5/hw_data.c
@@ -10,6 +10,7 @@
  */
 #include <common.h>
 #include <palmas.h>
+#include <stdio.h>
 #include <asm/arch/omap.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/omap_common.h>
diff --git a/arch/arm/mach-omap2/omap5/sdram.c b/arch/arm/mach-omap2/omap5/sdram.c
index 786da45fac83..a35218ae600f 100644
--- a/arch/arm/mach-omap2/omap5/sdram.c
+++ b/arch/arm/mach-omap2/omap5/sdram.c
@@ -11,6 +11,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/emif.h>
 #include <asm/arch/sys_proto.h>
 
diff --git a/arch/arm/mach-omap2/pipe3-phy.c b/arch/arm/mach-omap2/pipe3-phy.c
index 35ec81d31468..fb64961db4ba 100644
--- a/arch/arm/mach-omap2/pipe3-phy.c
+++ b/arch/arm/mach-omap2/pipe3-phy.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <sata.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/io.h>
diff --git a/arch/arm/mach-omap2/sec-common.c b/arch/arm/mach-omap2/sec-common.c
index 4fca91ffbd0f..03375321a471 100644
--- a/arch/arm/mach-omap2/sec-common.c
+++ b/arch/arm/mach-omap2/sec-common.c
@@ -19,6 +19,7 @@
 #include <init.h>
 #include <log.h>
 #include <stdarg.h>
+#include <stdio.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 095b5d3c36f2..2e10ab983ebd 100644
--- a/arch/arm/mach-omap2/utils.c
+++ b/arch/arm/mach-omap2/utils.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <env.h>
 #include <part.h>
+#include <stdio.h>
 #include <asm/setup.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/omap_common.h>
diff --git a/arch/arm/mach-omap2/vc.c b/arch/arm/mach-omap2/vc.c
index b7f79800de57..5888bc86752c 100644
--- a/arch/arm/mach-omap2/vc.c
+++ b/arch/arm/mach-omap2/vc.c
@@ -15,6 +15,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/omap_common.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/clock.h>
diff --git a/arch/arm/mach-orion5x/cpu.c b/arch/arm/mach-orion5x/cpu.c
index aef399860060..f2c925b2d113 100644
--- a/arch/arm/mach-orion5x/cpu.c
+++ b/arch/arm/mach-orion5x/cpu.c
@@ -13,6 +13,7 @@
 #include <init.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <asm/io.h>
 #include <asm/u-boot.h>
diff --git a/arch/arm/mach-owl/soc.c b/arch/arm/mach-owl/soc.c
index 4d2b9d0b0ebc..8ac35b56d42b 100644
--- a/arch/arm/mach-owl/soc.c
+++ b/arch/arm/mach-owl/soc.c
@@ -7,6 +7,7 @@
 
 #include <cpu_func.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <linux/arm-smccc.h>
diff --git a/arch/arm/mach-rmobile/board.c b/arch/arm/mach-rmobile/board.c
index a10371f74e0c..b10ac4a630fe 100644
--- a/arch/arm/mach-rmobile/board.c
+++ b/arch/arm/mach-rmobile/board.c
@@ -5,6 +5,7 @@
  */
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/io.h>
 
 #ifdef CONFIG_ARCH_RMOBILE_BOARD_STRING
diff --git a/arch/arm/mach-rmobile/cpu_info.c b/arch/arm/mach-rmobile/cpu_info.c
index fdbbd72e2857..afecb6388c95 100644
--- a/arch/arm/mach-rmobile/cpu_info.c
+++ b/arch/arm/mach-rmobile/cpu_info.c
@@ -5,6 +5,7 @@
  */
 #include <common.h>
 #include <cpu_func.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <init.h>
 #include <asm/io.h>
diff --git a/arch/arm/mach-rockchip/board.c b/arch/arm/mach-rockchip/board.c
index 2c41e58f598d..fa7adacd5953 100644
--- a/arch/arm/mach-rockchip/board.c
+++ b/arch/arm/mach-rockchip/board.c
@@ -9,6 +9,7 @@
 #include <init.h>
 #include <log.h>
 #include <ram.h>
+#include <stdio.h>
 #include <syscon.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
diff --git a/arch/arm/mach-rockchip/boot_mode.c b/arch/arm/mach-rockchip/boot_mode.c
index 10d8a1ac5e98..fefffc71ffaf 100644
--- a/arch/arm/mach-rockchip/boot_mode.c
+++ b/arch/arm/mach-rockchip/boot_mode.c
@@ -8,6 +8,7 @@
 #include <command.h>
 #include <env.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch-rockchip/boot_mode.h>
 #include <dm/device.h>
diff --git a/arch/arm/mach-rockchip/bootrom.c b/arch/arm/mach-rockchip/bootrom.c
index b36e559e8719..71ac29ee435a 100644
--- a/arch/arm/mach-rockchip/bootrom.c
+++ b/arch/arm/mach-rockchip/bootrom.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <hang.h>
+#include <stdio.h>
 #include <asm/arch-rockchip/bootrom.h>
 #include <asm/arch-rockchip/boot_mode.h>
 #include <asm/cache.h>
diff --git a/arch/arm/mach-rockchip/cpu-info.c b/arch/arm/mach-rockchip/cpu-info.c
index d0f030109f45..8bde5bdd2980 100644
--- a/arch/arm/mach-rockchip/cpu-info.c
+++ b/arch/arm/mach-rockchip/cpu-info.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <env.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch-rockchip/clock.h>
 #include <asm/arch-rockchip/cru.h>
diff --git a/arch/arm/mach-rockchip/misc.c b/arch/arm/mach-rockchip/misc.c
index 3cbb1794254d..ce75e7c1f2c3 100644
--- a/arch/arm/mach-rockchip/misc.c
+++ b/arch/arm/mach-rockchip/misc.c
@@ -14,6 +14,7 @@
 #include <dm.h>
 #include <hash.h>
 #include <log.h>
+#include <stdio.h>
 #include <dm/uclass-internal.h>
 #include <misc.h>
 #include <linux/string.h>
diff --git a/arch/arm/mach-rockchip/rk3288/rk3288.c b/arch/arm/mach-rockchip/rk3288/rk3288.c
index d54eedb6a588..97900fb3a311 100644
--- a/arch/arm/mach-rockchip/rk3288/rk3288.c
+++ b/arch/arm/mach-rockchip/rk3288/rk3288.c
@@ -9,6 +9,7 @@
 #include <clk.h>
 #include <init.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/armv7.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/arch/arm/mach-rockchip/rk3308/rk3308.c b/arch/arm/mach-rockchip/rk3308/rk3308.c
index 70fe0d0ac350..60566d092f62 100644
--- a/arch/arm/mach-rockchip/rk3308/rk3308.c
+++ b/arch/arm/mach-rockchip/rk3308/rk3308.c
@@ -5,6 +5,7 @@
 #include <common.h>
 #include <init.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/grf_rk3308.h>
diff --git a/arch/arm/mach-rockchip/spl.c b/arch/arm/mach-rockchip/spl.c
index 4b5c22dc1382..6addcf4d962c 100644
--- a/arch/arm/mach-rockchip/spl.c
+++ b/arch/arm/mach-rockchip/spl.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <ram.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/arch-rockchip/bootrom.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/arch/arm/mach-rockchip/tpl.c b/arch/arm/mach-rockchip/tpl.c
index cc908e1b0e81..df052b82f2f4 100644
--- a/arch/arm/mach-rockchip/tpl.c
+++ b/arch/arm/mach-rockchip/tpl.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <ram.h>
 #include <spl.h>
+#include <stdio.h>
 #include <version.h>
 #include <asm/io.h>
 #include <asm/arch-rockchip/bootrom.h>
diff --git a/arch/arm/mach-s5pc1xx/clock.c b/arch/arm/mach-s5pc1xx/clock.c
index 555228a52083..e8809aa8ce2b 100644
--- a/arch/arm/mach-s5pc1xx/clock.c
+++ b/arch/arm/mach-s5pc1xx/clock.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/clk.h>
diff --git a/arch/arm/mach-snapdragon/dram.c b/arch/arm/mach-snapdragon/dram.c
index 2a161be137cc..c3e61007417a 100644
--- a/arch/arm/mach-snapdragon/dram.c
+++ b/arch/arm/mach-snapdragon/dram.c
@@ -12,6 +12,7 @@
 #include <part.h>
 #include <smem.h>
 #include <fdt_support.h>
+#include <stdio.h>
 #include <asm/arch/dram.h>
 
 #define SMEM_USABLE_RAM_PARTITION_TABLE 402
diff --git a/arch/arm/mach-socfpga/board.c b/arch/arm/mach-socfpga/board.c
index bdd5b863c459..a3733207d6ab 100644
--- a/arch/arm/mach-socfpga/board.c
+++ b/arch/arm/mach-socfpga/board.c
@@ -9,6 +9,7 @@
 #include <errno.h>
 #include <fdtdec.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/arch/reset_manager.h>
 #include <asm/arch/clock_manager.h>
 #include <asm/arch/misc.h>
diff --git a/arch/arm/mach-socfpga/clock_manager_agilex.c b/arch/arm/mach-socfpga/clock_manager_agilex.c
index 4bf01f3c8ae4..0582b0b08573 100644
--- a/arch/arm/mach-socfpga/clock_manager_agilex.c
+++ b/arch/arm/mach-socfpga/clock_manager_agilex.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/arch/clock_manager.h>
 #include <asm/arch/system_manager.h>
 #include <asm/global_data.h>
diff --git a/arch/arm/mach-socfpga/clock_manager_arria10.c b/arch/arm/mach-socfpga/clock_manager_arria10.c
index 9f46df6b2f95..9379005444dc 100644
--- a/arch/arm/mach-socfpga/clock_manager_arria10.c
+++ b/arch/arm/mach-socfpga/clock_manager_arria10.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <fdtdec.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <dm.h>
 #include <clk.h>
diff --git a/arch/arm/mach-socfpga/clock_manager_gen5.c b/arch/arm/mach-socfpga/clock_manager_gen5.c
index 8fa2760798b8..85a3d1926c1d 100644
--- a/arch/arm/mach-socfpga/clock_manager_gen5.c
+++ b/arch/arm/mach-socfpga/clock_manager_gen5.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/io.h>
 #include <dm.h>
diff --git a/arch/arm/mach-socfpga/clock_manager_s10.c b/arch/arm/mach-socfpga/clock_manager_s10.c
index 642dcbb0ac04..6355a3128330 100644
--- a/arch/arm/mach-socfpga/clock_manager_s10.c
+++ b/arch/arm/mach-socfpga/clock_manager_s10.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock_manager.h>
diff --git a/arch/arm/mach-socfpga/mailbox_s10.c b/arch/arm/mach-socfpga/mailbox_s10.c
index 82dfcd124ca8..58d94694b7ed 100644
--- a/arch/arm/mach-socfpga/mailbox_s10.c
+++ b/arch/arm/mach-socfpga/mailbox_s10.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <hang.h>
+#include <stdio.h>
 #include <wait_bit.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/arch/arm/mach-socfpga/misc_arria10.c b/arch/arm/mach-socfpga/misc_arria10.c
index bf978053ca64..dffe53a1a2e5 100644
--- a/arch/arm/mach-socfpga/misc_arria10.c
+++ b/arch/arm/mach-socfpga/misc_arria10.c
@@ -11,6 +11,7 @@
 #include <miiphy.h>
 #include <netdev.h>
 #include <ns16550.h>
+#include <stdio.h>
 #include <watchdog.h>
 #include <asm/arch/misc.h>
 #include <asm/arch/pinmux.h>
diff --git a/arch/arm/mach-socfpga/misc_gen5.c b/arch/arm/mach-socfpga/misc_gen5.c
index 4edf4f9b5c16..eed510d66e7d 100644
--- a/arch/arm/mach-socfpga/misc_gen5.c
+++ b/arch/arm/mach-socfpga/misc_gen5.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <env.h>
diff --git a/arch/arm/mach-socfpga/misc_s10.c b/arch/arm/mach-socfpga/misc_s10.c
index 1e9a3f62059f..abf0109ba3c1 100644
--- a/arch/arm/mach-socfpga/misc_s10.c
+++ b/arch/arm/mach-socfpga/misc_s10.c
@@ -13,6 +13,7 @@
 #include <log.h>
 #include <miiphy.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/reset_manager.h>
diff --git a/arch/arm/mach-socfpga/reset_manager_gen5.c b/arch/arm/mach-socfpga/reset_manager_gen5.c
index a65860ef021a..090567e9d8ab 100644
--- a/arch/arm/mach-socfpga/reset_manager_gen5.c
+++ b/arch/arm/mach-socfpga/reset_manager_gen5.c
@@ -5,6 +5,7 @@
 
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/fpga_manager.h>
 #include <asm/arch/reset_manager.h>
diff --git a/arch/arm/mach-socfpga/spl_a10.c b/arch/arm/mach-socfpga/spl_a10.c
index 92231b5ba3c6..daf75addde71 100644
--- a/arch/arm/mach-socfpga/spl_a10.c
+++ b/arch/arm/mach-socfpga/spl_a10.c
@@ -7,6 +7,7 @@
 #include <cpu_func.h>
 #include <hang.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/pl310.h>
diff --git a/arch/arm/mach-socfpga/spl_gen5.c b/arch/arm/mach-socfpga/spl_gen5.c
index 7c716117685c..2cffc2ef778a 100644
--- a/arch/arm/mach-socfpga/spl_gen5.c
+++ b/arch/arm/mach-socfpga/spl_gen5.c
@@ -7,6 +7,7 @@
 #include <hang.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/u-boot.h>
diff --git a/arch/arm/mach-stm32mp/cmd_stm32key.c b/arch/arm/mach-stm32mp/cmd_stm32key.c
index ad857e95c462..d12e24f0fefc 100644
--- a/arch/arm/mach-stm32mp/cmd_stm32key.c
+++ b/arch/arm/mach-stm32mp/cmd_stm32key.c
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <console.h>
 #include <misc.h>
+#include <stdio.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 0264eafed5eb..9ede9388f6dd 100644
--- a/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c
+++ b/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <dfu.h>
 #include <image.h>
+#include <stdio.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 3ac36bcc8d30..4da58041c057 100644
--- a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c
+++ b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c
@@ -10,6 +10,7 @@
 #include <misc.h>
 #include <mmc.h>
 #include <part.h>
+#include <stdio.h>
 #include <asm/arch/stm32mp1_smc.h>
 #include <asm/global_data.h>
 #include <dm/uclass.h>
diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_serial.c b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_serial.c
index 194bdbd75f40..c37dca677ead 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 <dfu.h>
 #include <malloc.h>
 #include <serial.h>
+#include <stdio.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 33bf7a44b38b..bcc9239ba92f 100644
--- a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_usb.c
+++ b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_usb.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <dfu.h>
 #include <g_dnl.h>
+#include <stdio.h>
 #include <usb.h>
 #include <asm/arch/stm32prog.h>
 #include <asm/arch/sys_proto.h>
diff --git a/arch/arm/mach-stm32mp/cpu.c b/arch/arm/mach-stm32mp/cpu.c
index cd27a774d446..4ded59569708 100644
--- a/arch/arm/mach-stm32mp/cpu.c
+++ b/arch/arm/mach-stm32mp/cpu.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <misc.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/bsec.h>
diff --git a/arch/arm/mach-stm32mp/fdt.c b/arch/arm/mach-stm32mp/fdt.c
index ded804403e31..1bfa19207d11 100644
--- a/arch/arm/mach-stm32mp/fdt.c
+++ b/arch/arm/mach-stm32mp/fdt.c
@@ -7,6 +7,7 @@
 #include <fdtdec.h>
 #include <fdt_support.h>
 #include <log.h>
+#include <stdio.h>
 #include <tee.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/u-boot.h>
diff --git a/arch/arm/mach-stm32mp/spl.c b/arch/arm/mach-stm32mp/spl.c
index ab467de231ab..9d951ce15f96 100644
--- a/arch/arm/mach-stm32mp/spl.c
+++ b/arch/arm/mach-stm32mp/spl.c
@@ -10,6 +10,7 @@
 #include <init.h>
 #include <log.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/arch/arm/mach-sunxi/clock_sun4i.c b/arch/arm/mach-sunxi/clock_sun4i.c
index 57ee018eaa2b..bd9f476543d8 100644
--- a/arch/arm/mach-sunxi/clock_sun4i.c
+++ b/arch/arm/mach-sunxi/clock_sun4i.c
@@ -10,6 +10,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/gpio.h>
diff --git a/arch/arm/mach-sunxi/cpu_info.c b/arch/arm/mach-sunxi/cpu_info.c
index 875e5a1a8a8e..5198fb555a9c 100644
--- a/arch/arm/mach-sunxi/cpu_info.c
+++ b/arch/arm/mach-sunxi/cpu_info.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/clock.h>
diff --git a/arch/arm/mach-sunxi/dram_sun9i.c b/arch/arm/mach-sunxi/dram_sun9i.c
index 14be212e891d..e2ab5d2fafb8 100644
--- a/arch/arm/mach-sunxi/dram_sun9i.c
+++ b/arch/arm/mach-sunxi/dram_sun9i.c
@@ -16,6 +16,7 @@
 #include <init.h>
 #include <log.h>
 #include <ram.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/dram.h>
diff --git a/arch/arm/mach-tegra/ap.c b/arch/arm/mach-tegra/ap.c
index 532730fe7270..f3876927e3a1 100644
--- a/arch/arm/mach-tegra/ap.c
+++ b/arch/arm/mach-tegra/ap.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <linux/bug.h>
 #include <asm/io.h>
 #include <asm/arch/gp_padctrl.h>
diff --git a/arch/arm/mach-tegra/board2.c b/arch/arm/mach-tegra/board2.c
index 66376dd39a2e..1ae686dbd05c 100644
--- a/arch/arm/mach-tegra/board2.c
+++ b/arch/arm/mach-tegra/board2.c
@@ -11,6 +11,7 @@
 #include <init.h>
 #include <log.h>
 #include <ns16550.h>
+#include <stdio.h>
 #include <usb.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/arch/arm/mach-tegra/cboot.c b/arch/arm/mach-tegra/cboot.c
index b89f7badb525..384e81bac073 100644
--- a/arch/arm/mach-tegra/cboot.c
+++ b/arch/arm/mach-tegra/cboot.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <net.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <asm/global_data.h>
diff --git a/arch/arm/mach-tegra/clock.c b/arch/arm/mach-tegra/clock.c
index 18c19dbf6061..6b587209c1c6 100644
--- a/arch/arm/mach-tegra/clock.c
+++ b/arch/arm/mach-tegra/clock.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
diff --git a/arch/arm/mach-tegra/cmd_enterrcm.c b/arch/arm/mach-tegra/cmd_enterrcm.c
index 25df31a3b858..32091e04b919 100644
--- a/arch/arm/mach-tegra/cmd_enterrcm.c
+++ b/arch/arm/mach-tegra/cmd_enterrcm.c
@@ -28,6 +28,7 @@
 #include <command.h>
 #include <cpu_func.h>
 #include <irq_func.h>
+#include <stdio.h>
 #include <asm/arch/tegra.h>
 #include <asm/arch-tegra/pmc.h>
 #include <linux/delay.h>
diff --git a/arch/arm/mach-tegra/cpu.c b/arch/arm/mach-tegra/cpu.c
index 65b15b79fe9b..216e307ccb2c 100644
--- a/arch/arm/mach-tegra/cpu.c
+++ b/arch/arm/mach-tegra/cpu.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/gp_padctrl.h>
diff --git a/arch/arm/mach-tegra/pinmux-common.c b/arch/arm/mach-tegra/pinmux-common.c
index 16b03bfe7b06..64c397fa4979 100644
--- a/arch/arm/mach-tegra/pinmux-common.c
+++ b/arch/arm/mach-tegra/pinmux-common.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/pinmux.h>
 
diff --git a/arch/arm/mach-tegra/pmc.c b/arch/arm/mach-tegra/pmc.c
index 93db63e104a1..0d4063ad1a27 100644
--- a/arch/arm/mach-tegra/pmc.c
+++ b/arch/arm/mach-tegra/pmc.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 
 #include <linux/arm-smccc.h>
diff --git a/arch/arm/mach-tegra/sys_info.c b/arch/arm/mach-tegra/sys_info.c
index 5ad586ac17fb..956a2e1730ff 100644
--- a/arch/arm/mach-tegra/sys_info.c
+++ b/arch/arm/mach-tegra/sys_info.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <linux/ctype.h>
 #if defined(CONFIG_TEGRA124) || defined(CONFIG_TEGRA30)
 #include <asm/arch-tegra/pmc.h>
diff --git a/arch/arm/mach-tegra/tegra114/clock.c b/arch/arm/mach-tegra/tegra114/clock.c
index 167589d1bb76..53d958e82dd6 100644
--- a/arch/arm/mach-tegra/tegra114/clock.c
+++ b/arch/arm/mach-tegra/tegra114/clock.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/sysctr.h>
diff --git a/arch/arm/mach-tegra/tegra124/clock.c b/arch/arm/mach-tegra/tegra124/clock.c
index 79e67f5194ea..8dfdd2bc8add 100644
--- a/arch/arm/mach-tegra/tegra124/clock.c
+++ b/arch/arm/mach-tegra/tegra124/clock.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/sysctr.h>
diff --git a/arch/arm/mach-tegra/tegra20/clock.c b/arch/arm/mach-tegra/tegra20/clock.c
index b1e2c87e6296..fc197a050c54 100644
--- a/arch/arm/mach-tegra/tegra20/clock.c
+++ b/arch/arm/mach-tegra/tegra20/clock.c
@@ -11,6 +11,7 @@
 #include <errno.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/tegra.h>
diff --git a/arch/arm/mach-tegra/tegra20/warmboot.c b/arch/arm/mach-tegra/tegra20/warmboot.c
index b36b2f652ba7..215cf5ae5613 100644
--- a/arch/arm/mach-tegra/tegra20/warmboot.c
+++ b/arch/arm/mach-tegra/tegra20/warmboot.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/errno.h>
diff --git a/arch/arm/mach-tegra/tegra210/clock.c b/arch/arm/mach-tegra/tegra210/clock.c
index 711d02c036ff..7f8c3c3a7c7b 100644
--- a/arch/arm/mach-tegra/tegra210/clock.c
+++ b/arch/arm/mach-tegra/tegra210/clock.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/cache.h>
 #include <asm/io.h>
diff --git a/arch/arm/mach-tegra/tegra30/clock.c b/arch/arm/mach-tegra/tegra30/clock.c
index d516ac5f4cbd..38b53cbbe480 100644
--- a/arch/arm/mach-tegra/tegra30/clock.c
+++ b/arch/arm/mach-tegra/tegra30/clock.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/tegra.h>
diff --git a/arch/arm/mach-u8500/cpuinfo.c b/arch/arm/mach-u8500/cpuinfo.c
index ab05b8a51b23..bc3fd036035d 100644
--- a/arch/arm/mach-u8500/cpuinfo.c
+++ b/arch/arm/mach-u8500/cpuinfo.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/io.h>
 
 #define U8500_BOOTROM_BASE	0x90000000
diff --git a/arch/arm/mach-uniphier/micro-support-card.c b/arch/arm/mach-uniphier/micro-support-card.c
index dbd156ffceca..f3abb8554125 100644
--- a/arch/arm/mach-uniphier/micro-support-card.c
+++ b/arch/arm/mach-uniphier/micro-support-card.c
@@ -7,6 +7,7 @@
 
 #include <dm.h>
 #include <fdt_support.h>
+#include <stdio.h>
 #include <linux/ctype.h>
 #include <linux/delay.h>
 #include <linux/io.h>
diff --git a/arch/arm/mach-versal/cpu.c b/arch/arm/mach-versal/cpu.c
index a35aac2c02c2..2417a60025ce 100644
--- a/arch/arm/mach-versal/cpu.c
+++ b/arch/arm/mach-versal/cpu.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/armv8/mmu.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
diff --git a/arch/arm/mach-versal/mp.c b/arch/arm/mach-versal/mp.c
index 540c010f52c6..df196460dd55 100644
--- a/arch/arm/mach-versal/mp.c
+++ b/arch/arm/mach-versal/mp.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
diff --git a/arch/arm/mach-zynq/clk.c b/arch/arm/mach-zynq/clk.c
index 9bab393e2112..4ef3f39f0523 100644
--- a/arch/arm/mach-zynq/clk.c
+++ b/arch/arm/mach-zynq/clk.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <init.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/arch/clk.h>
 #include <asm/global_data.h>
 
diff --git a/arch/arm/mach-zynq/cpu.c b/arch/arm/mach-zynq/cpu.c
index 77b7cb130712..a193e5c5b607 100644
--- a/arch/arm/mach-zynq/cpu.c
+++ b/arch/arm/mach-zynq/cpu.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <init.h>
+#include <stdio.h>
 #include <zynqpl.h>
 #include <asm/cache.h>
 #include <asm/io.h>
diff --git a/arch/arm/mach-zynq/ddrc.c b/arch/arm/mach-zynq/ddrc.c
index 65c255da209a..f601c927f1ae 100644
--- a/arch/arm/mach-zynq/ddrc.c
+++ b/arch/arm/mach-zynq/ddrc.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/hardware.h>
diff --git a/arch/arm/mach-zynq/spl.c b/arch/arm/mach-zynq/spl.c
index eceb6e114c07..dd5535a06508 100644
--- a/arch/arm/mach-zynq/spl.c
+++ b/arch/arm/mach-zynq/spl.c
@@ -9,6 +9,7 @@
 #include <init.h>
 #include <log.h>
 #include <spl.h>
+#include <stdio.h>
 #include <generated/dt.h>
 #include <linux/string.h>
 
diff --git a/arch/arm/mach-zynqmp/cpu.c b/arch/arm/mach-zynqmp/cpu.c
index a03b29acb83f..943b601ef8e4 100644
--- a/arch/arm/mach-zynqmp/cpu.c
+++ b/arch/arm/mach-zynqmp/cpu.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/sys_proto.h>
diff --git a/arch/arm/mach-zynqmp/mp.c b/arch/arm/mach-zynqmp/mp.c
index b699f36f1d39..b2fcae619dca 100644
--- a/arch/arm/mach-zynqmp/mp.c
+++ b/arch/arm/mach-zynqmp/mp.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/io.h>
diff --git a/arch/arm/mach-zynqmp/spl.c b/arch/arm/mach-zynqmp/spl.c
index 9dd61e25f6f5..cddc8a3fc1e8 100644
--- a/arch/arm/mach-zynqmp/spl.c
+++ b/arch/arm/mach-zynqmp/spl.c
@@ -10,6 +10,7 @@
 #include <init.h>
 #include <log.h>
 #include <spl.h>
+#include <stdio.h>
 #include <linux/delay.h>
 
 #include <asm/io.h>
diff --git a/arch/m68k/cpu/mcf5227x/cpu.c b/arch/m68k/cpu/mcf5227x/cpu.c
index a7adf64f0de0..e4c7041c4214 100644
--- a/arch/m68k/cpu/mcf5227x/cpu.c
+++ b/arch/m68k/cpu/mcf5227x/cpu.c
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <vsprintf.h>
 #include <watchdog.h>
 #include <command.h>
diff --git a/arch/m68k/cpu/mcf523x/cpu.c b/arch/m68k/cpu/mcf523x/cpu.c
index c091d39ef675..bf3acb8f8930 100644
--- a/arch/m68k/cpu/mcf523x/cpu.c
+++ b/arch/m68k/cpu/mcf523x/cpu.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <vsprintf.h>
 #include <watchdog.h>
 #include <command.h>
diff --git a/arch/m68k/cpu/mcf52x2/cpu.c b/arch/m68k/cpu/mcf52x2/cpu.c
index 9a6a77e13c04..82f5b3c2f801 100644
--- a/arch/m68k/cpu/mcf52x2/cpu.c
+++ b/arch/m68k/cpu/mcf52x2/cpu.c
@@ -16,6 +16,7 @@
 #include <common.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <vsprintf.h>
 #include <watchdog.h>
 #include <command.h>
diff --git a/arch/m68k/cpu/mcf530x/cpu.c b/arch/m68k/cpu/mcf530x/cpu.c
index 0659bf655811..4b8d2bd833e9 100644
--- a/arch/m68k/cpu/mcf530x/cpu.c
+++ b/arch/m68k/cpu/mcf530x/cpu.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <command.h>
 #include <init.h>
+#include <stdio.h>
 #include <vsprintf.h>
 #include <asm/immap.h>
 #include <asm/io.h>
diff --git a/arch/m68k/cpu/mcf532x/cpu.c b/arch/m68k/cpu/mcf532x/cpu.c
index cc56cdebb250..776543f06a96 100644
--- a/arch/m68k/cpu/mcf532x/cpu.c
+++ b/arch/m68k/cpu/mcf532x/cpu.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <vsprintf.h>
 #include <watchdog.h>
 #include <command.h>
diff --git a/arch/m68k/cpu/mcf5445x/cpu.c b/arch/m68k/cpu/mcf5445x/cpu.c
index 1bdf983ac2eb..aa9af8a5a2a8 100644
--- a/arch/m68k/cpu/mcf5445x/cpu.c
+++ b/arch/m68k/cpu/mcf5445x/cpu.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <vsprintf.h>
 #include <watchdog.h>
 #include <command.h>
diff --git a/arch/m68k/cpu/mcf547x_8x/cpu.c b/arch/m68k/cpu/mcf547x_8x/cpu.c
index 4df8459f6987..e1a7f360e777 100644
--- a/arch/m68k/cpu/mcf547x_8x/cpu.c
+++ b/arch/m68k/cpu/mcf547x_8x/cpu.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <vsprintf.h>
 #include <watchdog.h>
 #include <command.h>
diff --git a/arch/m68k/lib/bootm.c b/arch/m68k/lib/bootm.c
index 6dbb86ee396f..20ff33f7532a 100644
--- a/arch/m68k/lib/bootm.c
+++ b/arch/m68k/lib/bootm.c
@@ -11,6 +11,7 @@
 #include <image.h>
 #include <lmb.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <u-boot/zlib.h>
diff --git a/arch/m68k/lib/fec.c b/arch/m68k/lib/fec.c
index eecea7a02354..3b76d1392bf9 100644
--- a/arch/m68k/lib/fec.c
+++ b/arch/m68k/lib/fec.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
diff --git a/arch/m68k/lib/traps.c b/arch/m68k/lib/traps.c
index c49141f376d3..f724be3a63c9 100644
--- a/arch/m68k/lib/traps.c
+++ b/arch/m68k/lib/traps.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <watchdog.h>
 #include <command.h>
 #include <asm/processor.h>
diff --git a/arch/microblaze/cpu/exception.c b/arch/microblaze/cpu/exception.c
index b8dedc4e1958..dd35f8c16f11 100644
--- a/arch/microblaze/cpu/exception.c
+++ b/arch/microblaze/cpu/exception.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <hang.h>
+#include <stdio.h>
 #include <asm/asm.h>
 
 void _hw_exception_handler (void)
diff --git a/arch/microblaze/cpu/interrupts.c b/arch/microblaze/cpu/interrupts.c
index fe65f3728fdb..e86f0cda9dfd 100644
--- a/arch/microblaze/cpu/interrupts.c
+++ b/arch/microblaze/cpu/interrupts.c
@@ -13,6 +13,7 @@
 #include <irq_func.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/microblaze_intc.h>
 #include <asm/asm.h>
diff --git a/arch/microblaze/lib/bootm.c b/arch/microblaze/lib/bootm.c
index 6695ac63c774..1a30635c87f5 100644
--- a/arch/microblaze/lib/bootm.c
+++ b/arch/microblaze/lib/bootm.c
@@ -17,6 +17,7 @@
 #include <image.h>
 #include <lmb.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <u-boot/zlib.h>
diff --git a/arch/mips/lib/cache.c b/arch/mips/lib/cache.c
index 51a8f4334750..1eb1459184cb 100644
--- a/arch/mips/lib/cache.c
+++ b/arch/mips/lib/cache.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <cpu_func.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <asm/cacheops.h>
 #include <asm/cm.h>
diff --git a/arch/mips/lib/traps.c b/arch/mips/lib/traps.c
index 510ef4c6c090..76d50f99a14c 100644
--- a/arch/mips/lib/traps.c
+++ b/arch/mips/lib/traps.c
@@ -11,6 +11,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/ptrace.h>
 #include <cpu_func.h>
diff --git a/arch/mips/mach-ath79/ar934x/clk.c b/arch/mips/mach-ath79/ar934x/clk.c
index 6ed4057353a8..c2ccd35e8bb2 100644
--- a/arch/mips/mach-ath79/ar934x/clk.c
+++ b/arch/mips/mach-ath79/ar934x/clk.c
@@ -7,6 +7,7 @@
 #include <clock_legacy.h>
 #include <command.h>
 #include <hang.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/addrspace.h>
diff --git a/arch/mips/mach-ath79/cpu.c b/arch/mips/mach-ath79/cpu.c
index ed190e8f9b02..709fa7a9c3b0 100644
--- a/arch/mips/mach-ath79/cpu.c
+++ b/arch/mips/mach-ath79/cpu.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/addrspace.h>
diff --git a/arch/mips/mach-ath79/reset.c b/arch/mips/mach-ath79/reset.c
index 6cd5e77fd15a..6ecde8a39ff1 100644
--- a/arch/mips/mach-ath79/reset.c
+++ b/arch/mips/mach-ath79/reset.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/arch/mips/mach-jz47xx/jz4780/jz4780.c b/arch/mips/mach-jz47xx/jz4780/jz4780.c
index de9bd05fcfde..63a87635c25a 100644
--- a/arch/mips/mach-jz47xx/jz4780/jz4780.c
+++ b/arch/mips/mach-jz47xx/jz4780/jz4780.c
@@ -12,6 +12,7 @@
 #include <hang.h>
 #include <image.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/sections.h>
diff --git a/arch/mips/mach-jz47xx/jz4780/pll.c b/arch/mips/mach-jz47xx/jz4780/pll.c
index 323c634fb322..9aada2ef15b9 100644
--- a/arch/mips/mach-jz47xx/jz4780/pll.c
+++ b/arch/mips/mach-jz47xx/jz4780/pll.c
@@ -8,6 +8,7 @@
 
 #include <config.h>
 #include <common.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/arch/mips/mach-mscc/dram.c b/arch/mips/mach-mscc/dram.c
index c53a4202e0d9..4aa5c90a3b1b 100644
--- a/arch/mips/mach-mscc/dram.c
+++ b/arch/mips/mach-mscc/dram.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 
 #include <asm/io.h>
diff --git a/arch/mips/mach-mtmips/cpu.c b/arch/mips/mach-mtmips/cpu.c
index f9cdce5ff8d8..1cb59178018f 100644
--- a/arch/mips/mach-mtmips/cpu.c
+++ b/arch/mips/mach-mtmips/cpu.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <init.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/io.h>
diff --git a/arch/mips/mach-mtmips/mt7628/init.c b/arch/mips/mach-mtmips/mt7628/init.c
index 3fa0e139e751..c0b4387585fa 100644
--- a/arch/mips/mach-mtmips/mt7628/init.c
+++ b/arch/mips/mach-mtmips/mt7628/init.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <clk.h>
 #include <dm.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/global_data.h>
 #include <dm/uclass.h>
diff --git a/arch/mips/mach-octeon/cpu.c b/arch/mips/mach-octeon/cpu.c
index 2680a2e6ed67..1831f1dfa8c2 100644
--- a/arch/mips/mach-octeon/cpu.c
+++ b/arch/mips/mach-octeon/cpu.c
@@ -3,6 +3,7 @@
  * Copyright (C) 2020 Marvell International Ltd.
  */
 
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/bitfield.h>
 #include <linux/bitops.h>
diff --git a/arch/mips/mach-pic32/cpu.c b/arch/mips/mach-pic32/cpu.c
index eac2fe5f8c94..bc76152ed3da 100644
--- a/arch/mips/mach-pic32/cpu.c
+++ b/arch/mips/mach-pic32/cpu.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <init.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <mach/pic32.h>
 #include <mach/ddr.h>
diff --git a/arch/nds32/lib/bootm.c b/arch/nds32/lib/bootm.c
index 957599304549..3afd1c5cff24 100644
--- a/arch/nds32/lib/bootm.c
+++ b/arch/nds32/lib/bootm.c
@@ -12,6 +12,7 @@
 #include <hang.h>
 #include <image.h>
 #include <log.h>
+#include <stdio.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 1481e055007b..dcff67d0eb6a 100644
--- a/arch/nds32/lib/interrupts.c
+++ b/arch/nds32/lib/interrupts.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <irq_func.h>
+#include <stdio.h>
 #include <asm/ptrace.h>
 #include <asm/system.h>
 #undef INTERRUPT_MODE
diff --git a/arch/nios2/cpu/cpu.c b/arch/nios2/cpu/cpu.c
index c670d51f1dfb..0203348df010 100644
--- a/arch/nios2/cpu/cpu.c
+++ b/arch/nios2/cpu/cpu.c
@@ -12,6 +12,7 @@
 #include <errno.h>
 #include <init.h>
 #include <irq_func.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <asm/system.h>
diff --git a/arch/powerpc/cpu/mpc83xx/cpu.c b/arch/powerpc/cpu/mpc83xx/cpu.c
index 3043a38f8b29..5d3ff0e4d372 100644
--- a/arch/powerpc/cpu/mpc83xx/cpu.c
+++ b/arch/powerpc/cpu/mpc83xx/cpu.c
@@ -13,6 +13,7 @@
 #include <cpu_func.h>
 #include <irq_func.h>
 #include <net.h>
+#include <stdio.h>
 #include <time.h>
 #include <vsprintf.h>
 #include <watchdog.h>
diff --git a/arch/powerpc/cpu/mpc83xx/cpu_init.c b/arch/powerpc/cpu/mpc83xx/cpu_init.c
index af51fbd69063..b23647e91729 100644
--- a/arch/powerpc/cpu/mpc83xx/cpu_init.c
+++ b/arch/powerpc/cpu/mpc83xx/cpu_init.c
@@ -7,6 +7,7 @@
 #include <asm-offsets.h>
 #include <mpc83xx.h>
 #include <ioports.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/ppc.h>
diff --git a/arch/powerpc/cpu/mpc83xx/ecc.c b/arch/powerpc/cpu/mpc83xx/ecc.c
index 9ebfe1ab1fd6..5c843e4fafd9 100644
--- a/arch/powerpc/cpu/mpc83xx/ecc.c
+++ b/arch/powerpc/cpu/mpc83xx/ecc.c
@@ -10,6 +10,7 @@
 #include <irq_func.h>
 #include <mpc83xx.h>
 #include <command.h>
+#include <stdio.h>
 #include <asm/ppc.h>
 #include <linux/string.h>
 
diff --git a/arch/powerpc/cpu/mpc83xx/pci.c b/arch/powerpc/cpu/mpc83xx/pci.c
index 0c618f0ad4de..4d3bbc1dfc91 100644
--- a/arch/powerpc/cpu/mpc83xx/pci.c
+++ b/arch/powerpc/cpu/mpc83xx/pci.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <init.h>
 #include <pci.h>
+#include <stdio.h>
 #include <asm/bitops.h>
 #include <asm/global_data.h>
 #include <asm/ppc.h>
diff --git a/arch/powerpc/cpu/mpc83xx/pcie.c b/arch/powerpc/cpu/mpc83xx/pcie.c
index aa8cded66167..5b8322fadb87 100644
--- a/arch/powerpc/cpu/mpc83xx/pcie.c
+++ b/arch/powerpc/cpu/mpc83xx/pcie.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <pci.h>
 #include <mpc83xx.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/ppc.h>
diff --git a/arch/powerpc/cpu/mpc83xx/spd_sdram.c b/arch/powerpc/cpu/mpc83xx/spd_sdram.c
index d101c2fcce42..7c8cfd7f2346 100644
--- a/arch/powerpc/cpu/mpc83xx/spd_sdram.c
+++ b/arch/powerpc/cpu/mpc83xx/spd_sdram.c
@@ -15,6 +15,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <vsprintf.h>
 #include <asm/ppc.h>
diff --git a/arch/powerpc/cpu/mpc83xx/speed.c b/arch/powerpc/cpu/mpc83xx/speed.c
index 17577e96307b..a595c58e5bf8 100644
--- a/arch/powerpc/cpu/mpc83xx/speed.c
+++ b/arch/powerpc/cpu/mpc83xx/speed.c
@@ -602,4 +602,5 @@ U_BOOT_CMD(clocks, 1, 0, do_clocks,
 	"    clocks"
 );
 
+#include <stdio.h>
 #endif
diff --git a/arch/powerpc/cpu/mpc83xx/spl_minimal.c b/arch/powerpc/cpu/mpc83xx/spl_minimal.c
index d51d1f6700f0..d116b6c43297 100644
--- a/arch/powerpc/cpu/mpc83xx/spl_minimal.c
+++ b/arch/powerpc/cpu/mpc83xx/spl_minimal.c
@@ -7,6 +7,7 @@
 #include <asm-offsets.h>
 #include <clock_legacy.h>
 #include <mpc83xx.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/global_data.h>
 #include <asm/ppc.h>
diff --git a/arch/powerpc/cpu/mpc83xx/traps.c b/arch/powerpc/cpu/mpc83xx/traps.c
index f1d47cbd3ba9..8bbf8407764e 100644
--- a/arch/powerpc/cpu/mpc83xx/traps.c
+++ b/arch/powerpc/cpu/mpc83xx/traps.c
@@ -12,6 +12,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/ptrace.h>
 #include <command.h>
diff --git a/arch/powerpc/cpu/mpc85xx/bsc9132_serdes.c b/arch/powerpc/cpu/mpc85xx/bsc9132_serdes.c
index b972cf3b5e45..e08484324d0e 100644
--- a/arch/powerpc/cpu/mpc85xx/bsc9132_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/bsc9132_serdes.c
@@ -7,6 +7,7 @@
 #include <config.h>
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
diff --git a/arch/powerpc/cpu/mpc85xx/c29x_serdes.c b/arch/powerpc/cpu/mpc85xx/c29x_serdes.c
index 34b58bb7f9e4..10bc15c45ca8 100644
--- a/arch/powerpc/cpu/mpc85xx/c29x_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/c29x_serdes.c
@@ -6,6 +6,7 @@
 #include <config.h>
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
diff --git a/arch/powerpc/cpu/mpc85xx/cmd_errata.c b/arch/powerpc/cpu/mpc85xx/cmd_errata.c
index 8a98717125b3..42fcfb249966 100644
--- a/arch/powerpc/cpu/mpc85xx/cmd_errata.c
+++ b/arch/powerpc/cpu/mpc85xx/cmd_errata.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <command.h>
 #include <init.h>
+#include <stdio.h>
 #include <linux/compiler.h>
 #include <fsl_errata.h>
 #include <asm/immap_85xx.h>
diff --git a/arch/powerpc/cpu/mpc85xx/cpu.c b/arch/powerpc/cpu/mpc85xx/cpu.c
index ea3554af7817..afcfc47554df 100644
--- a/arch/powerpc/cpu/mpc85xx/cpu.c
+++ b/arch/powerpc/cpu/mpc85xx/cpu.c
@@ -15,6 +15,7 @@
 #include <init.h>
 #include <irq_func.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <vsprintf.h>
 #include <watchdog.h>
diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init.c b/arch/powerpc/cpu/mpc85xx/cpu_init.c
index ad6e79396e76..397a118140e9 100644
--- a/arch/powerpc/cpu/mpc85xx/cpu_init.c
+++ b/arch/powerpc/cpu/mpc85xx/cpu_init.c
@@ -14,6 +14,7 @@
 #include <env.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.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 d458d0e135e9..2a6e07f28347 100644
--- a/arch/powerpc/cpu/mpc85xx/ether_fcc.c
+++ b/arch/powerpc/cpu/mpc85xx/ether_fcc.c
@@ -26,6 +26,7 @@
 
 #include <common.h>
 #include <malloc.h>
+#include <stdio.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 41bbddf81d41..c8388da6331d 100644
--- a/arch/powerpc/cpu/mpc85xx/fdt.c
+++ b/arch/powerpc/cpu/mpc85xx/fdt.c
@@ -10,6 +10,7 @@
 #include <clock_legacy.h>
 #include <env.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
diff --git a/arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c b/arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c
index 2cfcc92f15b9..c6a7995e873d 100644
--- a/arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/fsl_serdes.h>
 #include <asm/io.h>
 #include <asm/ppc.h>
diff --git a/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c b/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c
index a370faf0fe01..59785c562918 100644
--- a/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <env.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #ifdef CONFIG_SYS_P4080_ERRATUM_SERDES8
 #include <hwconfig.h>
diff --git a/arch/powerpc/cpu/mpc85xx/liodn.c b/arch/powerpc/cpu/mpc85xx/liodn.c
index a85c81179205..188318f66ceb 100644
--- a/arch/powerpc/cpu/mpc85xx/liodn.c
+++ b/arch/powerpc/cpu/mpc85xx/liodn.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <linux/string.h>
diff --git a/arch/powerpc/cpu/mpc85xx/mp.c b/arch/powerpc/cpu/mpc85xx/mp.c
index c9854a82a960..cd348bf6ee63 100644
--- a/arch/powerpc/cpu/mpc85xx/mp.c
+++ b/arch/powerpc/cpu/mpc85xx/mp.c
@@ -7,6 +7,7 @@
 #include <cpu_func.h>
 #include <env.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/processor.h>
 #include <env.h>
diff --git a/arch/powerpc/cpu/mpc85xx/mpc8536_serdes.c b/arch/powerpc/cpu/mpc85xx/mpc8536_serdes.c
index 111692f15d18..433d5cb136bb 100644
--- a/arch/powerpc/cpu/mpc85xx/mpc8536_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/mpc8536_serdes.c
@@ -7,6 +7,7 @@
 #include <config.h>
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
diff --git a/arch/powerpc/cpu/mpc85xx/mpc8544_serdes.c b/arch/powerpc/cpu/mpc85xx/mpc8544_serdes.c
index f3b5450ad55c..1eb446eef182 100644
--- a/arch/powerpc/cpu/mpc85xx/mpc8544_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/mpc8544_serdes.c
@@ -6,6 +6,7 @@
 #include <config.h>
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
diff --git a/arch/powerpc/cpu/mpc85xx/mpc8548_serdes.c b/arch/powerpc/cpu/mpc85xx/mpc8548_serdes.c
index 2a5c3e32002a..2e21f69e5ad1 100644
--- a/arch/powerpc/cpu/mpc85xx/mpc8548_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/mpc8548_serdes.c
@@ -6,6 +6,7 @@
 #include <config.h>
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
diff --git a/arch/powerpc/cpu/mpc85xx/mpc8568_serdes.c b/arch/powerpc/cpu/mpc85xx/mpc8568_serdes.c
index 81b66c3fa6a2..dd6231a47b9d 100644
--- a/arch/powerpc/cpu/mpc85xx/mpc8568_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/mpc8568_serdes.c
@@ -6,6 +6,7 @@
 #include <config.h>
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
diff --git a/arch/powerpc/cpu/mpc85xx/mpc8569_serdes.c b/arch/powerpc/cpu/mpc85xx/mpc8569_serdes.c
index eb54b8252b20..148b4cd98192 100644
--- a/arch/powerpc/cpu/mpc85xx/mpc8569_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/mpc8569_serdes.c
@@ -6,6 +6,7 @@
 #include <config.h>
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
diff --git a/arch/powerpc/cpu/mpc85xx/mpc8572_serdes.c b/arch/powerpc/cpu/mpc85xx/mpc8572_serdes.c
index 1b4e6149184d..d625f9041e98 100644
--- a/arch/powerpc/cpu/mpc85xx/mpc8572_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/mpc8572_serdes.c
@@ -6,6 +6,7 @@
 #include <config.h>
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
diff --git a/arch/powerpc/cpu/mpc85xx/p1010_serdes.c b/arch/powerpc/cpu/mpc85xx/p1010_serdes.c
index 8cba4222c4fc..185445e46b93 100644
--- a/arch/powerpc/cpu/mpc85xx/p1010_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/p1010_serdes.c
@@ -7,6 +7,7 @@
 #include <config.h>
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
diff --git a/arch/powerpc/cpu/mpc85xx/p1021_serdes.c b/arch/powerpc/cpu/mpc85xx/p1021_serdes.c
index 6b8e447e94a4..62e76c0c70ec 100644
--- a/arch/powerpc/cpu/mpc85xx/p1021_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/p1021_serdes.c
@@ -6,6 +6,7 @@
 #include <config.h>
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
diff --git a/arch/powerpc/cpu/mpc85xx/p1022_serdes.c b/arch/powerpc/cpu/mpc85xx/p1022_serdes.c
index 719cb4f3d4e4..9fe4eb57cea4 100644
--- a/arch/powerpc/cpu/mpc85xx/p1022_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/p1022_serdes.c
@@ -7,6 +7,7 @@
 #include <config.h>
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
diff --git a/arch/powerpc/cpu/mpc85xx/p1023_serdes.c b/arch/powerpc/cpu/mpc85xx/p1023_serdes.c
index bf5cac619920..591637e2cfd6 100644
--- a/arch/powerpc/cpu/mpc85xx/p1023_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/p1023_serdes.c
@@ -7,6 +7,7 @@
 #include <config.h>
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
diff --git a/arch/powerpc/cpu/mpc85xx/p2020_serdes.c b/arch/powerpc/cpu/mpc85xx/p2020_serdes.c
index f36b1b64ede7..eb2324887537 100644
--- a/arch/powerpc/cpu/mpc85xx/p2020_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/p2020_serdes.c
@@ -6,6 +6,7 @@
 #include <config.h>
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
diff --git a/arch/powerpc/cpu/mpc85xx/pci.c b/arch/powerpc/cpu/mpc85xx/pci.c
index 9a6fc13b73f1..af340f2a63bb 100644
--- a/arch/powerpc/cpu/mpc85xx/pci.c
+++ b/arch/powerpc/cpu/mpc85xx/pci.c
@@ -9,6 +9,7 @@
  * PCI Configuration space access support for MPC85xx PCI Bridge
  */
 #include <common.h>
+#include <stdio.h>
 #include <asm/bitops.h>
 #include <asm/cpm_85xx.h>
 #include <pci.h>
diff --git a/arch/powerpc/cpu/mpc85xx/portals.c b/arch/powerpc/cpu/mpc85xx/portals.c
index c0f18d924b61..5fc672d153dc 100644
--- a/arch/powerpc/cpu/mpc85xx/portals.c
+++ b/arch/powerpc/cpu/mpc85xx/portals.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <linux/string.h>
diff --git a/arch/powerpc/cpu/mpc85xx/speed.c b/arch/powerpc/cpu/mpc85xx/speed.c
index 09653c70125f..f3c6da306c49 100644
--- a/arch/powerpc/cpu/mpc85xx/speed.c
+++ b/arch/powerpc/cpu/mpc85xx/speed.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <ppc_asm.tmpl>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/compiler.h>
 #include <asm/processor.h>
diff --git a/arch/powerpc/cpu/mpc85xx/tlb.c b/arch/powerpc/cpu/mpc85xx/tlb.c
index 927df4e5b660..522454631300 100644
--- a/arch/powerpc/cpu/mpc85xx/tlb.c
+++ b/arch/powerpc/cpu/mpc85xx/tlb.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <display_options.h>
+#include <stdio.h>
 #include <asm/bitops.h>
 #include <asm/global_data.h>
 #include <asm/processor.h>
diff --git a/arch/powerpc/cpu/mpc85xx/traps.c b/arch/powerpc/cpu/mpc85xx/traps.c
index 080451ec567c..569aca6474a7 100644
--- a/arch/powerpc/cpu/mpc85xx/traps.c
+++ b/arch/powerpc/cpu/mpc85xx/traps.c
@@ -20,6 +20,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/ptrace.h>
 #include <command.h>
diff --git a/arch/powerpc/cpu/mpc86xx/cpu.c b/arch/powerpc/cpu/mpc86xx/cpu.c
index 051607785667..a14214ecb868 100644
--- a/arch/powerpc/cpu/mpc86xx/cpu.c
+++ b/arch/powerpc/cpu/mpc86xx/cpu.c
@@ -9,6 +9,7 @@
 #include <cpu_func.h>
 #include <display_options.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <vsprintf.h>
 #include <watchdog.h>
diff --git a/arch/powerpc/cpu/mpc86xx/fdt.c b/arch/powerpc/cpu/mpc86xx/fdt.c
index a5c313b8a25d..be6292dd6a3e 100644
--- a/arch/powerpc/cpu/mpc86xx/fdt.c
+++ b/arch/powerpc/cpu/mpc86xx/fdt.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
diff --git a/arch/powerpc/cpu/mpc86xx/interrupts.c b/arch/powerpc/cpu/mpc86xx/interrupts.c
index b139abe936d5..3288f3913cc1 100644
--- a/arch/powerpc/cpu/mpc86xx/interrupts.c
+++ b/arch/powerpc/cpu/mpc86xx/interrupts.c
@@ -19,6 +19,7 @@
 #include <log.h>
 #include <mpc86xx.h>
 #include <command.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/ppc.h>
 #ifdef CONFIG_POST
diff --git a/arch/powerpc/cpu/mpc86xx/mp.c b/arch/powerpc/cpu/mpc86xx/mp.c
index e404ef367c16..9f41a32d29a9 100644
--- a/arch/powerpc/cpu/mpc86xx/mp.c
+++ b/arch/powerpc/cpu/mpc86xx/mp.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <cpu_func.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/ppc.h>
 #include <asm/mmu.h>
diff --git a/arch/powerpc/cpu/mpc86xx/mpc8610_serdes.c b/arch/powerpc/cpu/mpc86xx/mpc8610_serdes.c
index ecc88ba43746..2f755ac2012a 100644
--- a/arch/powerpc/cpu/mpc86xx/mpc8610_serdes.c
+++ b/arch/powerpc/cpu/mpc86xx/mpc8610_serdes.c
@@ -6,6 +6,7 @@
 #include <config.h>
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/immap_86xx.h>
 #include <asm/fsl_serdes.h>
diff --git a/arch/powerpc/cpu/mpc86xx/mpc8641_serdes.c b/arch/powerpc/cpu/mpc86xx/mpc8641_serdes.c
index 4df446618c09..1621fd116ddd 100644
--- a/arch/powerpc/cpu/mpc86xx/mpc8641_serdes.c
+++ b/arch/powerpc/cpu/mpc86xx/mpc8641_serdes.c
@@ -6,6 +6,7 @@
 #include <config.h>
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/immap_86xx.h>
 #include <asm/fsl_serdes.h>
diff --git a/arch/powerpc/cpu/mpc86xx/traps.c b/arch/powerpc/cpu/mpc86xx/traps.c
index 0d258b3a97f8..ce29b0f4a79b 100644
--- a/arch/powerpc/cpu/mpc86xx/traps.c
+++ b/arch/powerpc/cpu/mpc86xx/traps.c
@@ -14,6 +14,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/ptrace.h>
 #include <command.h>
diff --git a/arch/powerpc/cpu/mpc8xx/cpu.c b/arch/powerpc/cpu/mpc8xx/cpu.c
index e77789a7f2fe..dbebe7b30e12 100644
--- a/arch/powerpc/cpu/mpc8xx/cpu.c
+++ b/arch/powerpc/cpu/mpc8xx/cpu.c
@@ -20,6 +20,7 @@
 #include <cpu_func.h>
 #include <display_options.h>
 #include <net.h>
+#include <stdio.h>
 #include <time.h>
 #include <vsprintf.h>
 #include <watchdog.h>
diff --git a/arch/powerpc/cpu/mpc8xx/immap.c b/arch/powerpc/cpu/mpc8xx/immap.c
index 40793c26e120..56cd33ee4b93 100644
--- a/arch/powerpc/cpu/mpc8xx/immap.c
+++ b/arch/powerpc/cpu/mpc8xx/immap.c
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 
 #include <asm/immap_8xx.h>
diff --git a/arch/powerpc/cpu/mpc8xx/interrupts.c b/arch/powerpc/cpu/mpc8xx/interrupts.c
index a0d1853e7471..c2627aa9791e 100644
--- a/arch/powerpc/cpu/mpc8xx/interrupts.c
+++ b/arch/powerpc/cpu/mpc8xx/interrupts.c
@@ -8,6 +8,7 @@
 #include <irq_func.h>
 #include <mpc8xx.h>
 #include <mpc8xx_irq.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/cpm_8xx.h>
 #include <asm/ppc.h>
diff --git a/arch/powerpc/cpu/mpc8xx/traps.c b/arch/powerpc/cpu/mpc8xx/traps.c
index 56794b08a155..6aeb20c4c99f 100644
--- a/arch/powerpc/cpu/mpc8xx/traps.c
+++ b/arch/powerpc/cpu/mpc8xx/traps.c
@@ -16,6 +16,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/ptrace.h>
 #include <command.h>
 #include <asm/processor.h>
diff --git a/arch/powerpc/cpu/mpc8xxx/fdt.c b/arch/powerpc/cpu/mpc8xxx/fdt.c
index 67f8b1000183..5322c64808e5 100644
--- a/arch/powerpc/cpu/mpc8xxx/fdt.c
+++ b/arch/powerpc/cpu/mpc8xxx/fdt.c
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <cpu_func.h>
+#include <stdio.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <asm/mp.h>
diff --git a/arch/powerpc/cpu/mpc8xxx/fsl_lbc.c b/arch/powerpc/cpu/mpc8xxx/fsl_lbc.c
index 29489b46e6cd..6f2b64948a52 100644
--- a/arch/powerpc/cpu/mpc8xxx/fsl_lbc.c
+++ b/arch/powerpc/cpu/mpc8xxx/fsl_lbc.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <hang.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/fsl_lbc.h>
 
 #ifdef CONFIG_MPC83xx
diff --git a/arch/powerpc/cpu/mpc8xxx/fsl_pamu.c b/arch/powerpc/cpu/mpc8xxx/fsl_pamu.c
index c2c2d22572c6..a10969576b12 100644
--- a/arch/powerpc/cpu/mpc8xxx/fsl_pamu.c
+++ b/arch/powerpc/cpu/mpc8xxx/fsl_pamu.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <linux/bitops.h>
 #include <linux/log2.h>
 #include <malloc.h>
diff --git a/arch/powerpc/cpu/mpc8xxx/law.c b/arch/powerpc/cpu/mpc8xxx/law.c
index ff4b878aa9c1..0fba380cd40e 100644
--- a/arch/powerpc/cpu/mpc8xxx/law.c
+++ b/arch/powerpc/cpu/mpc8xxx/law.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <display_options.h>
+#include <stdio.h>
 #include <asm/bitops.h>
 #include <asm/global_data.h>
 #include <linux/compiler.h>
diff --git a/arch/powerpc/cpu/mpc8xxx/srio.c b/arch/powerpc/cpu/mpc8xxx/srio.c
index 3db592d040ce..71178b47bc18 100644
--- a/arch/powerpc/cpu/mpc8xxx/srio.c
+++ b/arch/powerpc/cpu/mpc8xxx/srio.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <config.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/fsl_law.h>
 #include <asm/fsl_serdes.h>
diff --git a/arch/powerpc/lib/bat_rw.c b/arch/powerpc/lib/bat_rw.c
index 24dd30615bd3..2eae204f2947 100644
--- a/arch/powerpc/lib/bat_rw.c
+++ b/arch/powerpc/lib/bat_rw.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/processor.h>
 #include <asm/mmu.h>
diff --git a/arch/powerpc/lib/bdinfo.c b/arch/powerpc/lib/bdinfo.c
index 914127457234..22acf76dedb0 100644
--- a/arch/powerpc/lib/bdinfo.c
+++ b/arch/powerpc/lib/bdinfo.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 
diff --git a/arch/powerpc/lib/bootm.c b/arch/powerpc/lib/bootm.c
index a43126e39745..d72da1da2d28 100644
--- a/arch/powerpc/lib/bootm.c
+++ b/arch/powerpc/lib/bootm.c
@@ -14,6 +14,7 @@
 #include <init.h>
 #include <lmb.h>
 #include <log.h>
+#include <stdio.h>
 #include <watchdog.h>
 #include <command.h>
 #include <image.h>
diff --git a/arch/riscv/lib/bootm.c b/arch/riscv/lib/bootm.c
index 41e0504c6468..14a09eee717f 100644
--- a/arch/riscv/lib/bootm.c
+++ b/arch/riscv/lib/bootm.c
@@ -13,6 +13,7 @@
 #include <fdt_support.h>
 #include <hang.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <dm/root.h>
 #include <image.h>
diff --git a/arch/riscv/lib/fdt_fixup.c b/arch/riscv/lib/fdt_fixup.c
index d0a334744974..f83f49c67762 100644
--- a/arch/riscv/lib/fdt_fixup.c
+++ b/arch/riscv/lib/fdt_fixup.c
@@ -10,6 +10,7 @@
 #include <fdt_support.h>
 #include <log.h>
 #include <mapmem.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/string.h>
 
diff --git a/arch/riscv/lib/image.c b/arch/riscv/lib/image.c
index 47f2edcf7fc2..636b6597c062 100644
--- a/arch/riscv/lib/image.c
+++ b/arch/riscv/lib/image.c
@@ -10,6 +10,7 @@
 #include <image.h>
 #include <mapmem.h>
 #include <errno.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/sizes.h>
 #include <linux/stddef.h>
diff --git a/arch/riscv/lib/interrupts.c b/arch/riscv/lib/interrupts.c
index 0ae9c00635f9..7a961f937aec 100644
--- a/arch/riscv/lib/interrupts.c
+++ b/arch/riscv/lib/interrupts.c
@@ -13,6 +13,7 @@
 #include <efi_loader.h>
 #include <hang.h>
 #include <irq_func.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/ptrace.h>
 #include <asm/system.h>
diff --git a/arch/riscv/lib/reset.c b/arch/riscv/lib/reset.c
index 8779c619cc5a..76ffdb904392 100644
--- a/arch/riscv/lib/reset.c
+++ b/arch/riscv/lib/reset.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <command.h>
 #include <hang.h>
+#include <stdio.h>
 
 int do_reset(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 {
diff --git a/arch/sandbox/cpu/cpu.c b/arch/sandbox/cpu/cpu.c
index edd48e2c1b74..c58a5ef7d1f7 100644
--- a/arch/sandbox/cpu/cpu.c
+++ b/arch/sandbox/cpu/cpu.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
diff --git a/arch/sandbox/cpu/sdl.c b/arch/sandbox/cpu/sdl.c
index 813fdcdac604..8673e601e5e2 100644
--- a/arch/sandbox/cpu/sdl.c
+++ b/arch/sandbox/cpu/sdl.c
@@ -4,6 +4,7 @@
  */
 
 #include <errno.h>
+#include <stdio.h>
 #include <unistd.h>
 #include <stdbool.h>
 #include <linux/input.h>
diff --git a/arch/sandbox/cpu/spl.c b/arch/sandbox/cpu/spl.c
index 8998f92858e1..41591d6528cb 100644
--- a/arch/sandbox/cpu/spl.c
+++ b/arch/sandbox/cpu/spl.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <os.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/spl.h>
 #include <asm/state.h>
diff --git a/arch/sandbox/cpu/start.c b/arch/sandbox/cpu/start.c
index 9845d3e8fcb9..5759651b9a4a 100644
--- a/arch/sandbox/cpu/start.c
+++ b/arch/sandbox/cpu/start.c
@@ -10,6 +10,7 @@
 #include <os.h>
 #include <cli.h>
 #include <sort.h>
+#include <stdio.h>
 #include <asm/getopt.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/arch/sandbox/cpu/state.c b/arch/sandbox/cpu/state.c
index ec432d06429f..bfc4f0b8defb 100644
--- a/arch/sandbox/cpu/state.c
+++ b/arch/sandbox/cpu/state.c
@@ -8,6 +8,7 @@
 #include <fdtdec.h>
 #include <log.h>
 #include <os.h>
+#include <stdio.h>
 #include <asm/malloc.h>
 #include <asm/state.h>
 #include <linux/string.h>
diff --git a/arch/sandbox/lib/bootm.c b/arch/sandbox/lib/bootm.c
index ab9f8a5f9c9c..d9378f019c09 100644
--- a/arch/sandbox/lib/bootm.c
+++ b/arch/sandbox/lib/bootm.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <bootstage.h>
 #include <image.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/string.h>
 
diff --git a/arch/sh/cpu/sh4/cpu.c b/arch/sh/cpu/sh4/cpu.c
index d4cdfb61ab52..edab955079ef 100644
--- a/arch/sh/cpu/sh4/cpu.c
+++ b/arch/sh/cpu/sh4/cpu.c
@@ -10,6 +10,7 @@
 #include <cpu_func.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/processor.h>
 #include <asm/u-boot.h>
 
diff --git a/arch/sh/lib/bootm.c b/arch/sh/lib/bootm.c
index 71d964586c5a..b6e961f70834 100644
--- a/arch/sh/lib/bootm.c
+++ b/arch/sh/lib/bootm.c
@@ -11,6 +11,7 @@
 #include <command.h>
 #include <env.h>
 #include <image.h>
+#include <stdio.h>
 #include <asm/byteorder.h>
 #include <asm/zimage.h>
 #include <linux/string.h>
diff --git a/arch/x86/cpu/apollolake/cpu_spl.c b/arch/x86/cpu/apollolake/cpu_spl.c
index a52bc288617d..00cfcd2f4a2d 100644
--- a/arch/x86/cpu/apollolake/cpu_spl.c
+++ b/arch/x86/cpu/apollolake/cpu_spl.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <spi_flash.h>
 #include <spl.h>
+#include <stdio.h>
 #include <syscon.h>
 #include <acpi/acpi_s3.h>
 #include <asm/cpu.h>
diff --git a/arch/x86/cpu/broadwell/cpu.c b/arch/x86/cpu/broadwell/cpu.c
index 3832a97f2c73..ec9592c5aa7a 100644
--- a/arch/x86/cpu/broadwell/cpu.c
+++ b/arch/x86/cpu/broadwell/cpu.c
@@ -10,6 +10,7 @@
 #include <cpu.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/cpu.h>
 #include <asm/cpu_x86.h>
 #include <asm/cpu_common.h>
diff --git a/arch/x86/cpu/broadwell/iobp.c b/arch/x86/cpu/broadwell/iobp.c
index cb5595c930e1..16c840690bcc 100644
--- a/arch/x86/cpu/broadwell/iobp.c
+++ b/arch/x86/cpu/broadwell/iobp.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <errno.h>
+#include <stdio.h>
 #include <asm/intel_regs.h>
 #include <asm/io.h>
 #include <asm/arch/pch.h>
diff --git a/arch/x86/cpu/broadwell/northbridge.c b/arch/x86/cpu/broadwell/northbridge.c
index 4f3ccf589e57..4b0dd46f7fe4 100644
--- a/arch/x86/cpu/broadwell/northbridge.c
+++ b/arch/x86/cpu/broadwell/northbridge.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/mrc_common.h>
diff --git a/arch/x86/cpu/broadwell/sdram.c b/arch/x86/cpu/broadwell/sdram.c
index 874b2034b9f6..b118116e3e66 100644
--- a/arch/x86/cpu/broadwell/sdram.c
+++ b/arch/x86/cpu/broadwell/sdram.c
@@ -10,6 +10,7 @@
 #include <init.h>
 #include <log.h>
 #include <pci.h>
+#include <stdio.h>
 #include <syscon.h>
 #include <asm/cpu.h>
 #include <asm/global_data.h>
diff --git a/arch/x86/cpu/coreboot/coreboot.c b/arch/x86/cpu/coreboot/coreboot.c
index 15c3ad879a00..cfd97a153199 100644
--- a/arch/x86/cpu/coreboot/coreboot.c
+++ b/arch/x86/cpu/coreboot/coreboot.c
@@ -9,6 +9,7 @@
 #include <cpu_func.h>
 #include <fdtdec.h>
 #include <init.h>
+#include <stdio.h>
 #include <usb.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/arch/x86/cpu/coreboot/sdram.c b/arch/x86/cpu/coreboot/sdram.c
index a2e47d196a2e..21dbcd91e039 100644
--- a/arch/x86/cpu/coreboot/sdram.c
+++ b/arch/x86/cpu/coreboot/sdram.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/e820.h>
 #include <asm/arch/sysinfo.h>
 #include <asm/global_data.h>
diff --git a/arch/x86/cpu/cpu.c b/arch/x86/cpu/cpu.c
index 078607a435c1..4c8c586fc8b6 100644
--- a/arch/x86/cpu/cpu.c
+++ b/arch/x86/cpu/cpu.c
@@ -28,6 +28,7 @@
 #include <irq.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <syscon.h>
 #include <acpi/acpi_s3.h>
 #include <acpi/acpi_table.h>
diff --git a/arch/x86/cpu/efi/payload.c b/arch/x86/cpu/efi/payload.c
index d9955bb47149..ab78059e76e8 100644
--- a/arch/x86/cpu/efi/payload.c
+++ b/arch/x86/cpu/efi/payload.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <usb.h>
 #include <asm/bootparam.h>
 #include <asm/e820.h>
diff --git a/arch/x86/cpu/i386/cpu.c b/arch/x86/cpu/i386/cpu.c
index f0a01c2295f2..2f61ea8e5bb2 100644
--- a/arch/x86/cpu/i386/cpu.c
+++ b/arch/x86/cpu/i386/cpu.c
@@ -24,6 +24,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/control_regs.h>
 #include <asm/coreboot_tables.h>
 #include <asm/cpu.h>
diff --git a/arch/x86/cpu/i386/interrupt.c b/arch/x86/cpu/i386/interrupt.c
index 67a72146de8a..5ade3712e7ca 100644
--- a/arch/x86/cpu/i386/interrupt.c
+++ b/arch/x86/cpu/i386/interrupt.c
@@ -17,6 +17,7 @@
 #include <init.h>
 #include <irq.h>
 #include <irq_func.h>
+#include <stdio.h>
 #include <asm/control_regs.h>
 #include <asm/global_data.h>
 #include <asm/i8259.h>
diff --git a/arch/x86/cpu/intel_common/cpu.c b/arch/x86/cpu/intel_common/cpu.c
index 3a4fd35cff17..87da5feaf616 100644
--- a/arch/x86/cpu/intel_common/cpu.c
+++ b/arch/x86/cpu/intel_common/cpu.c
@@ -12,6 +12,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/cpu.h>
 #include <asm/cpu_common.h>
 #include <asm/global_data.h>
diff --git a/arch/x86/cpu/intel_common/microcode.c b/arch/x86/cpu/intel_common/microcode.c
index 4d8e1d210838..919d146940af 100644
--- a/arch/x86/cpu/intel_common/microcode.c
+++ b/arch/x86/cpu/intel_common/microcode.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <fdtdec.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/libfdt.h>
 #include <asm/cpu.h>
diff --git a/arch/x86/cpu/intel_common/mrc.c b/arch/x86/cpu/intel_common/mrc.c
index eb27f8f18839..e5bf4b225cf3 100644
--- a/arch/x86/cpu/intel_common/mrc.c
+++ b/arch/x86/cpu/intel_common/mrc.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <syscon.h>
 #include <time.h>
 #include <asm/cpu.h>
diff --git a/arch/x86/cpu/irq.c b/arch/x86/cpu/irq.c
index 001c8913fadb..0775c5cddac2 100644
--- a/arch/x86/cpu/irq.c
+++ b/arch/x86/cpu/irq.c
@@ -10,6 +10,7 @@
 #include <irq.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/irq.h>
diff --git a/arch/x86/cpu/ivybridge/bd82x6x.c b/arch/x86/cpu/ivybridge/bd82x6x.c
index 0540b021618f..84d719e6c4ef 100644
--- a/arch/x86/cpu/ivybridge/bd82x6x.c
+++ b/arch/x86/cpu/ivybridge/bd82x6x.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <pch.h>
+#include <stdio.h>
 #include <asm/cpu.h>
 #include <asm/global_data.h>
 #include <asm/intel_regs.h>
diff --git a/arch/x86/cpu/ivybridge/cpu.c b/arch/x86/cpu/ivybridge/cpu.c
index bddba3eddecd..f5d0993bf214 100644
--- a/arch/x86/cpu/ivybridge/cpu.c
+++ b/arch/x86/cpu/ivybridge/cpu.c
@@ -18,6 +18,7 @@
 #include <init.h>
 #include <log.h>
 #include <pch.h>
+#include <stdio.h>
 #include <asm/cpu.h>
 #include <asm/cpu_common.h>
 #include <asm/global_data.h>
diff --git a/arch/x86/cpu/ivybridge/early_me.c b/arch/x86/cpu/ivybridge/early_me.c
index bee1671baf8b..4f43986926ac 100644
--- a/arch/x86/cpu/ivybridge/early_me.c
+++ b/arch/x86/cpu/ivybridge/early_me.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
+#include <stdio.h>
 #include <sysreset.h>
 #include <asm/pci.h>
 #include <asm/cpu.h>
diff --git a/arch/x86/cpu/ivybridge/lpc.c b/arch/x86/cpu/ivybridge/lpc.c
index f931d2be1b52..2d82984dbdf1 100644
--- a/arch/x86/cpu/ivybridge/lpc.c
+++ b/arch/x86/cpu/ivybridge/lpc.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <rtc.h>
 #include <pci.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/intel_regs.h>
 #include <asm/interrupt.h>
diff --git a/arch/x86/cpu/ivybridge/sdram.c b/arch/x86/cpu/ivybridge/sdram.c
index b9cec969be87..de0f0071fc0c 100644
--- a/arch/x86/cpu/ivybridge/sdram.c
+++ b/arch/x86/cpu/ivybridge/sdram.c
@@ -20,6 +20,7 @@
 #include <rtc.h>
 #include <spi.h>
 #include <spi_flash.h>
+#include <stdio.h>
 #include <syscon.h>
 #include <sysreset.h>
 #include <asm/cpu.h>
diff --git a/arch/x86/cpu/mp_init.c b/arch/x86/cpu/mp_init.c
index 22cd1dbe52af..a32283a7e8a2 100644
--- a/arch/x86/cpu/mp_init.c
+++ b/arch/x86/cpu/mp_init.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <qfw.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/atomic.h>
 #include <asm/cpu.h>
diff --git a/arch/x86/cpu/qfw_cpu.c b/arch/x86/cpu/qfw_cpu.c
index 2747cb312c75..cfa70c10e07a 100644
--- a/arch/x86/cpu/qfw_cpu.c
+++ b/arch/x86/cpu/qfw_cpu.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <malloc.h>
 #include <qfw.h>
+#include <stdio.h>
 #include <dm/lists.h>
 #include <dm/uclass-internal.h>
 #include <dm/root.h>
diff --git a/arch/x86/lib/acpi_s3.c b/arch/x86/lib/acpi_s3.c
index 244764152b23..06b15825fc14 100644
--- a/arch/x86/lib/acpi_s3.c
+++ b/arch/x86/lib/acpi_s3.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <acpi/acpi_s3.h>
 #include <acpi/acpi_table.h>
 #include <asm/acpi.h>
diff --git a/arch/x86/lib/acpi_table.c b/arch/x86/lib/acpi_table.c
index c6500f62ad80..0d0b8edfcaf2 100644
--- a/arch/x86/lib/acpi_table.c
+++ b/arch/x86/lib/acpi_table.c
@@ -10,6 +10,7 @@
 #include <cpu.h>
 #include <dm.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <dm/uclass-internal.h>
 #include <mapmem.h>
diff --git a/arch/x86/lib/bios_interrupts.c b/arch/x86/lib/bios_interrupts.c
index d6b4da7e2502..2582ac1b8408 100644
--- a/arch/x86/lib/bios_interrupts.c
+++ b/arch/x86/lib/bios_interrupts.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/pci.h>
 #include "bios_emul.h"
 
diff --git a/arch/x86/lib/bootm.c b/arch/x86/lib/bootm.c
index e8d252abcd6d..a4bd65d3b7b3 100644
--- a/arch/x86/lib/bootm.c
+++ b/arch/x86/lib/bootm.c
@@ -12,6 +12,7 @@
 #include <command.h>
 #include <hang.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <dm/device.h>
diff --git a/arch/x86/lib/fsp/fsp_graphics.c b/arch/x86/lib/fsp/fsp_graphics.c
index 32995e2df60e..c5129ff1f304 100644
--- a/arch/x86/lib/fsp/fsp_graphics.c
+++ b/arch/x86/lib/fsp/fsp_graphics.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <vbe.h>
 #include <video.h>
 #include <asm/fsp/fsp_support.h>
diff --git a/arch/x86/lib/fsp2/fsp_meminit.c b/arch/x86/lib/fsp2/fsp_meminit.c
index abbe1a011dda..70d0070e6b58 100644
--- a/arch/x86/lib/fsp2/fsp_meminit.c
+++ b/arch/x86/lib/fsp2/fsp_meminit.c
@@ -11,6 +11,7 @@
 #include <bootstage.h>
 #include <dm.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/mrccache.h>
 #include <asm/fsp/fsp_infoheader.h>
diff --git a/arch/x86/lib/interrupts.c b/arch/x86/lib/interrupts.c
index a81e4291105e..11c1a01f0715 100644
--- a/arch/x86/lib/interrupts.c
+++ b/arch/x86/lib/interrupts.c
@@ -32,6 +32,7 @@
 #include <common.h>
 #include <command.h>
 #include <irq_func.h>
+#include <stdio.h>
 #include <asm/interrupt.h>
 
 #if !CONFIG_IS_ENABLED(X86_64)
diff --git a/arch/x86/lib/mrccache.c b/arch/x86/lib/mrccache.c
index 12c24e1e46fb..3582f42733f1 100644
--- a/arch/x86/lib/mrccache.c
+++ b/arch/x86/lib/mrccache.c
@@ -15,6 +15,7 @@
 #include <net.h>
 #include <spi.h>
 #include <spi_flash.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/mrccache.h>
 #include <dm/device-internal.h>
diff --git a/arch/x86/lib/pirq_routing.c b/arch/x86/lib/pirq_routing.c
index 8aeba8496a9f..d99a90fb8269 100644
--- a/arch/x86/lib/pirq_routing.c
+++ b/arch/x86/lib/pirq_routing.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <log.h>
 #include <pci.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/pci.h>
 #include <asm/pirq_routing.h>
diff --git a/arch/x86/lib/pmu.c b/arch/x86/lib/pmu.c
index 3cd7b1f536e5..8f2649d9829b 100644
--- a/arch/x86/lib/pmu.c
+++ b/arch/x86/lib/pmu.c
@@ -5,6 +5,7 @@
 #include <common.h>
 #include <dm.h>
 #include <regmap.h>
+#include <stdio.h>
 #include <syscon.h>
 #include <asm/cpu.h>
 #include <asm/pmu.h>
diff --git a/arch/x86/lib/relocate.c b/arch/x86/lib/relocate.c
index ffccbf54dfcd..8a5082d6f30c 100644
--- a/arch/x86/lib/relocate.c
+++ b/arch/x86/lib/relocate.c
@@ -17,6 +17,7 @@
 #include <common.h>
 #include <log.h>
 #include <relocate.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot-x86.h>
 #include <asm/sections.h>
diff --git a/arch/x86/lib/scu.c b/arch/x86/lib/scu.c
index a9d06d82bb45..792b87c2f1b2 100644
--- a/arch/x86/lib/scu.c
+++ b/arch/x86/lib/scu.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <dm.h>
 #include <regmap.h>
+#include <stdio.h>
 #include <syscon.h>
 #include <asm/cpu.h>
 #include <asm/scu.h>
diff --git a/arch/x86/lib/spl.c b/arch/x86/lib/spl.c
index 96885c6cc55f..ad167be31c47 100644
--- a/arch/x86/lib/spl.c
+++ b/arch/x86/lib/spl.c
@@ -14,6 +14,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <spl.h>
+#include <stdio.h>
 #include <syscon.h>
 #include <asm/cpu.h>
 #include <asm/cpu_common.h>
diff --git a/arch/x86/lib/tables.c b/arch/x86/lib/tables.c
index e4ed0f4aae17..6c1464f4fa4e 100644
--- a/arch/x86/lib/tables.c
+++ b/arch/x86/lib/tables.c
@@ -7,6 +7,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <smbios.h>
+#include <stdio.h>
 #include <acpi/acpi_table.h>
 #include <asm/global_data.h>
 #include <asm/sfi.h>
diff --git a/arch/x86/lib/tpl.c b/arch/x86/lib/tpl.c
index 789472bc9a2a..db07d88dbc4a 100644
--- a/arch/x86/lib/tpl.c
+++ b/arch/x86/lib/tpl.c
@@ -11,6 +11,7 @@
 #include <init.h>
 #include <log.h>
 #include <spl.h>
+#include <stdio.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 e7c0ff321208..d467657f8793 100644
--- a/arch/x86/lib/zimage.c
+++ b/arch/x86/lib/zimage.c
@@ -17,6 +17,7 @@
 #include <env.h>
 #include <irq_func.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <acpi/acpi_table.h>
 #include <asm/io.h>
 #include <asm/ptrace.h>
diff --git a/arch/xtensa/cpu/cpu.c b/arch/xtensa/cpu/cpu.c
index 85d3464607df..50e330686652 100644
--- a/arch/xtensa/cpu/cpu.c
+++ b/arch/xtensa/cpu/cpu.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <command.h>
 #include <init.h>
+#include <stdio.h>
 #include <vsprintf.h>
 #include <linux/stringify.h>
 #include <asm/global_data.h>
diff --git a/arch/xtensa/cpu/exceptions.c b/arch/xtensa/cpu/exceptions.c
index cf9af4326a29..7047b1938d2a 100644
--- a/arch/xtensa/cpu/exceptions.c
+++ b/arch/xtensa/cpu/exceptions.c
@@ -13,6 +13,7 @@
 #include <common.h>
 #include <command.h>
 #include <irq_func.h>
+#include <stdio.h>
 #include <asm/ptrace.h>
 #include <asm/string.h>
 #include <asm/regs.h>
diff --git a/arch/xtensa/lib/bootm.c b/arch/xtensa/lib/bootm.c
index 61ae08517566..0299534728ca 100644
--- a/arch/xtensa/lib/bootm.c
+++ b/arch/xtensa/lib/bootm.c
@@ -9,6 +9,7 @@
 #include <command.h>
 #include <cpu_func.h>
 #include <env.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
diff --git a/board/AndesTech/adp-ae3xx/adp-ae3xx.c b/board/AndesTech/adp-ae3xx/adp-ae3xx.c
index 1c142b80a5ae..69611c788320 100644
--- a/board/AndesTech/adp-ae3xx/adp-ae3xx.c
+++ b/board/AndesTech/adp-ae3xx/adp-ae3xx.c
@@ -7,6 +7,7 @@
 
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/mach-types.h>
 #include <common.h>
diff --git a/board/AndesTech/adp-ag101p/adp-ag101p.c b/board/AndesTech/adp-ag101p/adp-ag101p.c
index 97f25fa42ed4..9ba4f732223e 100644
--- a/board/AndesTech/adp-ag101p/adp-ag101p.c
+++ b/board/AndesTech/adp-ag101p/adp-ag101p.c
@@ -12,6 +12,7 @@
 #if defined(CONFIG_FTMAC100) && !defined(CONFIG_DM_ETH)
 #include <netdev.h>
 #endif
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/io.h>
diff --git a/board/Arcturus/ucp1020/cmd_arc.c b/board/Arcturus/ucp1020/cmd_arc.c
index 99652dde928a..2cd51d0aa873 100644
--- a/board/Arcturus/ucp1020/cmd_arc.c
+++ b/board/Arcturus/ucp1020/cmd_arc.c
@@ -17,6 +17,7 @@
 #include <malloc.h>
 #include <spi_flash.h>
 #include <mmc.h>
+#include <stdio.h>
 #include <version.h>
 #include <asm/io.h>
 #include <linux/string.h>
diff --git a/board/Arcturus/ucp1020/ddr.c b/board/Arcturus/ucp1020/ddr.c
index 712023faf7d0..7549d4341bbe 100644
--- a/board/Arcturus/ucp1020/ddr.c
+++ b/board/Arcturus/ucp1020/ddr.c
@@ -8,6 +8,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <vsprintf.h>
 #include <asm/mmu.h>
 #include <asm/immap_85xx.h>
diff --git a/board/Arcturus/ucp1020/spl.c b/board/Arcturus/ucp1020/spl.c
index 1f9206aa6147..9a6b465bf96d 100644
--- a/board/Arcturus/ucp1020/spl.c
+++ b/board/Arcturus/ucp1020/spl.c
@@ -20,6 +20,7 @@
 #include <i2c.h>
 #include <fsl_esdhc.h>
 #include <spi_flash.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
diff --git a/board/Arcturus/ucp1020/spl_minimal.c b/board/Arcturus/ucp1020/spl_minimal.c
index cd0022a73e17..718139688bf4 100644
--- a/board/Arcturus/ucp1020/spl_minimal.c
+++ b/board/Arcturus/ucp1020/spl_minimal.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <init.h>
 #include <ns16550.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <nand.h>
 #include <linux/compiler.h>
diff --git a/board/Arcturus/ucp1020/ucp1020.c b/board/Arcturus/ucp1020/ucp1020.c
index 838b7995693b..791c91d0e0da 100644
--- a/board/Arcturus/ucp1020/ucp1020.c
+++ b/board/Arcturus/ucp1020/ucp1020.c
@@ -18,6 +18,7 @@
 #include <pci.h>
 #include <i2c.h>
 #include <miiphy.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
diff --git a/board/BuR/brppt1/board.c b/board/BuR/brppt1/board.c
index 7df37e4e66ac..b5a1dccb19bd 100644
--- a/board/BuR/brppt1/board.c
+++ b/board/BuR/brppt1/board.c
@@ -15,6 +15,7 @@
 #include <errno.h>
 #include <init.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/omap.h>
diff --git a/board/BuR/brppt2/board.c b/board/BuR/brppt2/board.c
index e6eb403fc3d9..01bdbc12abb0 100644
--- a/board/BuR/brppt2/board.c
+++ b/board/BuR/brppt2/board.c
@@ -13,6 +13,7 @@
 #include <spl.h>
 #include <dm.h>
 #include <miiphy.h>
+#include <stdio.h>
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/iomux.h>
diff --git a/board/BuR/brsmarc1/board.c b/board/BuR/brsmarc1/board.c
index 738a5d2ff944..b4b1c327f947 100644
--- a/board/BuR/brsmarc1/board.c
+++ b/board/BuR/brsmarc1/board.c
@@ -12,6 +12,7 @@
 #include <errno.h>
 #include <init.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/omap.h>
diff --git a/board/BuR/brxre1/board.c b/board/BuR/brxre1/board.c
index ef692b006d51..6e36a4bb60e8 100644
--- a/board/BuR/brxre1/board.c
+++ b/board/BuR/brxre1/board.c
@@ -13,6 +13,7 @@
 #include <errno.h>
 #include <init.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/omap.h>
diff --git a/board/BuR/common/br_resetc.c b/board/BuR/common/br_resetc.c
index 5006687fbf0d..6bbea816a0e5 100644
--- a/board/BuR/common/br_resetc.c
+++ b/board/BuR/common/br_resetc.c
@@ -9,6 +9,7 @@
 #include <env.h>
 #include <errno.h>
 #include <i2c.h>
+#include <stdio.h>
 #include <dm/uclass.h>
 #include <linux/delay.h>
 #include "br_resetc.h"
diff --git a/board/BuR/common/common.c b/board/BuR/common/common.c
index 377d3f41fe67..b6e763b77fa9 100644
--- a/board/BuR/common/common.c
+++ b/board/BuR/common/common.c
@@ -9,6 +9,7 @@
  *
  */
 #include <log.h>
+#include <stdio.h>
 #include <version.h>
 #include <common.h>
 #include <env.h>
diff --git a/board/BuS/eb_cpu5282/eb_cpu5282.c b/board/BuS/eb_cpu5282/eb_cpu5282.c
index fb612c70752f..7768aeb59df1 100644
--- a/board/BuS/eb_cpu5282/eb_cpu5282.c
+++ b/board/BuS/eb_cpu5282/eb_cpu5282.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/string.h>
 #include "asm/m5282.h"
diff --git a/board/CZ.NIC/turris_mox/turris_mox.c b/board/CZ.NIC/turris_mox/turris_mox.c
index f7f5c1174313..f5fcb93262b7 100644
--- a/board/CZ.NIC/turris_mox/turris_mox.c
+++ b/board/CZ.NIC/turris_mox/turris_mox.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
 #include <net.h>
diff --git a/board/CZ.NIC/turris_omnia/turris_omnia.c b/board/CZ.NIC/turris_omnia/turris_omnia.c
index b84227a56e0e..fdce33e157d0 100644
--- a/board/CZ.NIC/turris_omnia/turris_omnia.c
+++ b/board/CZ.NIC/turris_omnia/turris_omnia.c
@@ -15,6 +15,7 @@
 #include <miiphy.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
diff --git a/board/CarMediaLab/flea3/flea3.c b/board/CarMediaLab/flea3/flea3.c
index a5beea9e5506..a0322219d438 100644
--- a/board/CarMediaLab/flea3/flea3.c
+++ b/board/CarMediaLab/flea3/flea3.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <env.h>
diff --git a/board/LaCie/common/common.c b/board/LaCie/common/common.c
index 52880a16fad3..325bc9b3bf7d 100644
--- a/board/LaCie/common/common.c
+++ b/board/LaCie/common/common.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <i2c.h>
 #include <miiphy.h>
+#include <stdio.h>
 
 #if defined(CONFIG_CMD_NET) && defined(CONFIG_RESET_PHY_R)
 
diff --git a/board/LaCie/net2big_v2/net2big_v2.c b/board/LaCie/net2big_v2/net2big_v2.c
index 695d6f6ed470..f3710681e51c 100644
--- a/board/LaCie/net2big_v2/net2big_v2.c
+++ b/board/LaCie/net2big_v2/net2big_v2.c
@@ -14,6 +14,7 @@
 #include <i2c.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/mach-types.h>
 #include <asm/arch/cpu.h>
diff --git a/board/Marvell/db-88f6720/db-88f6720.c b/board/Marvell/db-88f6720/db-88f6720.c
index 8f2b0f55b0ef..82b7ce568e4c 100644
--- a/board/Marvell/db-88f6720/db-88f6720.c
+++ b/board/Marvell/db-88f6720/db-88f6720.c
@@ -8,6 +8,7 @@
 #include <miiphy.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
diff --git a/board/Marvell/db-88f6820-amc/db-88f6820-amc.c b/board/Marvell/db-88f6820-amc/db-88f6820-amc.c
index 948988c788dd..62f59ecb7280 100644
--- a/board/Marvell/db-88f6820-amc/db-88f6820-amc.c
+++ b/board/Marvell/db-88f6820-amc/db-88f6820-amc.c
@@ -9,6 +9,7 @@
 #include <miiphy.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
diff --git a/board/Marvell/db-88f6820-gp/db-88f6820-gp.c b/board/Marvell/db-88f6820-gp/db-88f6820-gp.c
index 508f007d52e6..8fbf78e6d8b6 100644
--- a/board/Marvell/db-88f6820-gp/db-88f6820-gp.c
+++ b/board/Marvell/db-88f6820-gp/db-88f6820-gp.c
@@ -9,6 +9,7 @@
 #include <miiphy.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
diff --git a/board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c b/board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c
index 66c308bda54a..39a1a52f704d 100644
--- a/board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c
+++ b/board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c
@@ -8,6 +8,7 @@
 #include <miiphy.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
diff --git a/board/Marvell/db-xc3-24g4xg/db-xc3-24g4xg.c b/board/Marvell/db-xc3-24g4xg/db-xc3-24g4xg.c
index 0abdca1cd210..23def38e35b3 100644
--- a/board/Marvell/db-xc3-24g4xg/db-xc3-24g4xg.c
+++ b/board/Marvell/db-xc3-24g4xg/db-xc3-24g4xg.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <i2c.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <linux/bitops.h>
diff --git a/board/Marvell/dreamplug/dreamplug.c b/board/Marvell/dreamplug/dreamplug.c
index e1c64b52246b..ff02a72b3bb8 100644
--- a/board/Marvell/dreamplug/dreamplug.c
+++ b/board/Marvell/dreamplug/dreamplug.c
@@ -12,6 +12,7 @@
 #include <init.h>
 #include <miiphy.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
 #include <asm/arch/mpp.h>
diff --git a/board/Marvell/gplugd/gplugd.c b/board/Marvell/gplugd/gplugd.c
index f8d1b9cc13a3..8909fba88374 100644
--- a/board/Marvell/gplugd/gplugd.c
+++ b/board/Marvell/gplugd/gplugd.c
@@ -15,6 +15,7 @@
 #include <init.h>
 #include <log.h>
 #include <mvmfp.h>
+#include <stdio.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/mfp.h>
 #include <asm/arch/armada100.h>
diff --git a/board/Marvell/guruplug/guruplug.c b/board/Marvell/guruplug/guruplug.c
index 8e7dbb3f3f60..ee4aa24150ca 100644
--- a/board/Marvell/guruplug/guruplug.c
+++ b/board/Marvell/guruplug/guruplug.c
@@ -9,6 +9,7 @@
 #include <init.h>
 #include <miiphy.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/mach-types.h>
 #include <asm/arch/cpu.h>
diff --git a/board/Marvell/mvebu_armada-37xx/board.c b/board/Marvell/mvebu_armada-37xx/board.c
index 73e2c3723a36..89b0973389f7 100644
--- a/board/Marvell/mvebu_armada-37xx/board.c
+++ b/board/Marvell/mvebu_armada-37xx/board.c
@@ -8,6 +8,7 @@
 #include <i2c.h>
 #include <init.h>
 #include <phy.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
diff --git a/board/Marvell/mvebu_armada-8k/board.c b/board/Marvell/mvebu_armada-8k/board.c
index fa27a3521422..41fe47defa91 100644
--- a/board/Marvell/mvebu_armada-8k/board.c
+++ b/board/Marvell/mvebu_armada-8k/board.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
diff --git a/board/Marvell/openrd/openrd.c b/board/Marvell/openrd/openrd.c
index f44ac3315ebc..5d5447c394e3 100644
--- a/board/Marvell/openrd/openrd.c
+++ b/board/Marvell/openrd/openrd.c
@@ -14,6 +14,7 @@
 #include <init.h>
 #include <miiphy.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/mach-types.h>
 #include <asm/arch/cpu.h>
diff --git a/board/Marvell/sheevaplug/sheevaplug.c b/board/Marvell/sheevaplug/sheevaplug.c
index 0cc7f2b39243..4b126a5808d1 100644
--- a/board/Marvell/sheevaplug/sheevaplug.c
+++ b/board/Marvell/sheevaplug/sheevaplug.c
@@ -9,6 +9,7 @@
 #include <init.h>
 #include <miiphy.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/mach-types.h>
 #include <asm/arch/cpu.h>
diff --git a/board/Seagate/dockstar/dockstar.c b/board/Seagate/dockstar/dockstar.c
index 380e37be5502..5797e3df7d5c 100644
--- a/board/Seagate/dockstar/dockstar.c
+++ b/board/Seagate/dockstar/dockstar.c
@@ -13,6 +13,7 @@
 #include <init.h>
 #include <miiphy.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/arch/soc.h>
 #include <asm/arch/mpp.h>
 #include <asm/arch/cpu.h>
diff --git a/board/Seagate/goflexhome/goflexhome.c b/board/Seagate/goflexhome/goflexhome.c
index 4c19fa7195e8..1a00eb0cb1f4 100644
--- a/board/Seagate/goflexhome/goflexhome.c
+++ b/board/Seagate/goflexhome/goflexhome.c
@@ -16,6 +16,7 @@
 #include <init.h>
 #include <miiphy.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/mach-types.h>
 #include <asm/arch/soc.h>
diff --git a/board/Seagate/nas220/nas220.c b/board/Seagate/nas220/nas220.c
index cd2bbdad1cd6..7f561b01dac0 100644
--- a/board/Seagate/nas220/nas220.c
+++ b/board/Seagate/nas220/nas220.c
@@ -12,6 +12,7 @@
 #include <init.h>
 #include <miiphy.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/mach-types.h>
 #include <asm/arch/soc.h>
diff --git a/board/Synology/ds109/ds109.c b/board/Synology/ds109/ds109.c
index 7159535ec456..c15f8c38b9d2 100644
--- a/board/Synology/ds109/ds109.c
+++ b/board/Synology/ds109/ds109.c
@@ -9,6 +9,7 @@
 #include <init.h>
 #include <miiphy.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/setup.h>
 #include <asm/arch/cpu.h>
diff --git a/board/Synology/ds414/cmd_syno.c b/board/Synology/ds414/cmd_syno.c
index 94a56368970e..95911a300a76 100644
--- a/board/Synology/ds414/cmd_syno.c
+++ b/board/Synology/ds414/cmd_syno.c
@@ -12,6 +12,7 @@
 #include <net.h>
 #include <spi.h>
 #include <spi_flash.h>
+#include <stdio.h>
 #include <linux/mtd/mtd.h>
 #include <linux/string.h>
 
diff --git a/board/Synology/ds414/ds414.c b/board/Synology/ds414/ds414.c
index 9c4ce670ddfb..f4a940676e8a 100644
--- a/board/Synology/ds414/ds414.c
+++ b/board/Synology/ds414/ds414.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <init.h>
 #include <miiphy.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
diff --git a/board/advantech/dms-ba16/dms-ba16.c b/board/advantech/dms-ba16/dms-ba16.c
index 685fd20f4238..b59f42c6dafa 100644
--- a/board/advantech/dms-ba16/dms-ba16.c
+++ b/board/advantech/dms-ba16/dms-ba16.c
@@ -7,6 +7,7 @@
 
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux.h>
diff --git a/board/advantech/imx8qm_rom7720_a1/imx8qm_rom7720_a1.c b/board/advantech/imx8qm_rom7720_a1/imx8qm_rom7720_a1.c
index 8492e7603b46..8cd1a1642497 100644
--- a/board/advantech/imx8qm_rom7720_a1/imx8qm_rom7720_a1.c
+++ b/board/advantech/imx8qm_rom7720_a1/imx8qm_rom7720_a1.c
@@ -9,6 +9,7 @@
 #include <env.h>
 #include <errno.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
diff --git a/board/advantech/imx8qm_rom7720_a1/spl.c b/board/advantech/imx8qm_rom7720_a1/spl.c
index 67028b79a1b7..4d2f692b2940 100644
--- a/board/advantech/imx8qm_rom7720_a1/spl.c
+++ b/board/advantech/imx8qm_rom7720_a1/spl.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <spl.h>
 #include <fsl_esdhc.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
diff --git a/board/alliedtelesis/x530/x530.c b/board/alliedtelesis/x530/x530.c
index d602092d7329..6618cbdc0ad0 100644
--- a/board/alliedtelesis/x530/x530.c
+++ b/board/alliedtelesis/x530/x530.c
@@ -9,6 +9,7 @@
 #include <env.h>
 #include <i2c.h>
 #include <init.h>
+#include <stdio.h>
 #include <wdt.h>
 #include <asm/global_data.h>
 #include <asm/gpio.h>
diff --git a/board/aristainetos/aristainetos.c b/board/aristainetos/aristainetos.c
index ab73a928d667..7d9deb57a633 100644
--- a/board/aristainetos/aristainetos.c
+++ b/board/aristainetos/aristainetos.c
@@ -12,6 +12,7 @@
 #include <command.h>
 #include <image.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux.h>
diff --git a/board/armadeus/apf27/apf27.c b/board/armadeus/apf27/apf27.c
index 5e3fdd36fa21..6536dd5fe9de 100644
--- a/board/armadeus/apf27/apf27.c
+++ b/board/armadeus/apf27/apf27.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <hang.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <jffs2/jffs2.h>
 #include <nand.h>
diff --git a/board/armadeus/opos6uldev/board.c b/board/armadeus/opos6uldev/board.c
index 365fdca1b76f..34c2ce33c92c 100644
--- a/board/armadeus/opos6uldev/board.c
+++ b/board/armadeus/opos6uldev/board.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
diff --git a/board/armltd/integrator/integrator.c b/board/armltd/integrator/integrator.c
index ddad2bd80dac..a85ac69962ba 100644
--- a/board/armltd/integrator/integrator.c
+++ b/board/armltd/integrator/integrator.c
@@ -24,6 +24,7 @@
 #include <init.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/u-boot.h>
diff --git a/board/armltd/vexpress/vexpress_common.c b/board/armltd/vexpress/vexpress_common.c
index d4835191a935..5e0d7464dd84 100644
--- a/board/armltd/vexpress/vexpress_common.c
+++ b/board/armltd/vexpress/vexpress_common.c
@@ -23,6 +23,7 @@
 #include <errno.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/mach-types.h>
diff --git a/board/armltd/vexpress/vexpress_tc2.c b/board/armltd/vexpress/vexpress_tc2.c
index fe5389b4e446..f0bedda24a53 100644
--- a/board/armltd/vexpress/vexpress_tc2.c
+++ b/board/armltd/vexpress/vexpress_tc2.c
@@ -6,6 +6,7 @@
  * TC2 specific code for Versatile Express.
  */
 
+#include <stdio.h>
 #include <asm/armv7.h>
 #include <asm/io.h>
 #include <asm/u-boot.h>
diff --git a/board/armltd/vexpress64/pcie.c b/board/armltd/vexpress64/pcie.c
index 733b190e594d..1ad320df3a9e 100644
--- a/board/armltd/vexpress64/pcie.c
+++ b/board/armltd/vexpress64/pcie.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <pci_ids.h>
diff --git a/board/armltd/vexpress64/vexpress64.c b/board/armltd/vexpress64/vexpress64.c
index c88482d3cef3..2a44828d6e6d 100644
--- a/board/armltd/vexpress64/vexpress64.c
+++ b/board/armltd/vexpress64/vexpress64.c
@@ -12,6 +12,7 @@
 #include <errno.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/u-boot.h>
diff --git a/board/astro/mcf5373l/fpga.c b/board/astro/mcf5373l/fpga.c
index ef82f0660703..871700ebfe8a 100644
--- a/board/astro/mcf5373l/fpga.c
+++ b/board/astro/mcf5373l/fpga.c
@@ -15,6 +15,7 @@
 
 #include <common.h>
 #include <console.h>
+#include <stdio.h>
 #include <watchdog.h>
 #include <altera.h>
 #include <ACEX1K.h>
diff --git a/board/astro/mcf5373l/mcf5373l.c b/board/astro/mcf5373l/mcf5373l.c
index cb336fca0465..3eabf924c4a5 100644
--- a/board/astro/mcf5373l/mcf5373l.c
+++ b/board/astro/mcf5373l/mcf5373l.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <init.h>
 #include <serial.h>
+#include <stdio.h>
 #include <time.h>
 #include <watchdog.h>
 #include <command.h>
diff --git a/board/atmel/common/board.c b/board/atmel/common/board.c
index eee5c357bdcc..d5455dcab354 100644
--- a/board/atmel/common/board.c
+++ b/board/atmel/common/board.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <env.h>
+#include <stdio.h>
 #include <w1.h>
 #include <w1-eeprom.h>
 #include <dm/device-internal.h>
diff --git a/board/bachmann/ot1200/ot1200.c b/board/bachmann/ot1200/ot1200.c
index 0754a5994331..6872af6dcd23 100644
--- a/board/bachmann/ot1200/ot1200.c
+++ b/board/bachmann/ot1200/ot1200.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
diff --git a/board/barco/platinum/platinum.c b/board/barco/platinum/platinum.c
index af2b37cbdb1b..b98c577fbbac 100644
--- a/board/barco/platinum/platinum.c
+++ b/board/barco/platinum/platinum.c
@@ -11,6 +11,7 @@
 #include <miiphy.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
diff --git a/board/barco/titanium/titanium.c b/board/barco/titanium/titanium.c
index fe27965b482d..9cd88e2a72de 100644
--- a/board/barco/titanium/titanium.c
+++ b/board/barco/titanium/titanium.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
diff --git a/board/beacon/imx8mm/spl.c b/board/beacon/imx8mm/spl.c
index 572dc5191233..f2525c20b7b3 100644
--- a/board/beacon/imx8mm/spl.c
+++ b/board/beacon/imx8mm/spl.c
@@ -6,6 +6,7 @@
 #include <init.h>
 #include <log.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/mach-imx/iomux-v3.h>
diff --git a/board/beckhoff/mx53cx9020/mx53cx9020.c b/board/beckhoff/mx53cx9020/mx53cx9020.c
index e451ef9ef36c..cbaa4a68f9ed 100644
--- a/board/beckhoff/mx53cx9020/mx53cx9020.c
+++ b/board/beckhoff/mx53cx9020/mx53cx9020.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/iomux-mx53.h>
diff --git a/board/bluegiga/apx4devkit/apx4devkit.c b/board/bluegiga/apx4devkit/apx4devkit.c
index 0bb752e51bd9..93fda9c5b1f3 100644
--- a/board/bluegiga/apx4devkit/apx4devkit.c
+++ b/board/bluegiga/apx4devkit/apx4devkit.c
@@ -16,6 +16,7 @@
 #include <common.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.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 706bb6935d2f..874d24e22d6a 100644
--- a/board/bluewater/gurnard/gurnard.c
+++ b/board/bluewater/gurnard/gurnard.c
@@ -19,6 +19,7 @@
 #ifndef CONFIG_DM_ETH
 #include <netdev.h>
 #endif
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
diff --git a/board/bosch/guardian/board.c b/board/bosch/guardian/board.c
index 113838f8b723..5e58ddf3e3d9 100644
--- a/board/bosch/guardian/board.c
+++ b/board/bosch/guardian/board.c
@@ -19,6 +19,7 @@
 #include <led.h>
 #include <miiphy.h>
 #include <panel.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <power/tps65217.h>
 #include <power/tps65910.h>
diff --git a/board/bosch/shc/board.c b/board/bosch/shc/board.c
index 3b4536238260..243a810c4207 100644
--- a/board/bosch/shc/board.c
+++ b/board/bosch/shc/board.c
@@ -20,6 +20,7 @@
 #include <irq_func.h>
 #include <net.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/omap.h>
diff --git a/board/bosch/shc/mux.c b/board/bosch/shc/mux.c
index 0a97eafea6c4..97cf9c79d82b 100644
--- a/board/bosch/shc/mux.c
+++ b/board/bosch/shc/mux.c
@@ -11,6 +11,7 @@
 
 #include <common.h>
 #include <hang.h>
+#include <stdio.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/mux.h>
diff --git a/board/boundary/nitrogen6x/nitrogen6x.c b/board/boundary/nitrogen6x/nitrogen6x.c
index 16b50dac92af..25005a390f5d 100644
--- a/board/boundary/nitrogen6x/nitrogen6x.c
+++ b/board/boundary/nitrogen6x/nitrogen6x.c
@@ -9,6 +9,7 @@
 #include <env.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
diff --git a/board/broadcom/bcm23550_w1d/bcm23550_w1d.c b/board/broadcom/bcm23550_w1d/bcm23550_w1d.c
index 0a5ae5718bec..4c1694985df8 100644
--- a/board/broadcom/bcm23550_w1d/bcm23550_w1d.c
+++ b/board/broadcom/bcm23550_w1d/bcm23550_w1d.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/mach-types.h>
diff --git a/board/broadcom/bcm28155_ap/bcm28155_ap.c b/board/broadcom/bcm28155_ap/bcm28155_ap.c
index 4c0973089475..66e7b916f1f8 100644
--- a/board/broadcom/bcm28155_ap/bcm28155_ap.c
+++ b/board/broadcom/bcm28155_ap/bcm28155_ap.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/mach-types.h>
diff --git a/board/broadcom/bcm963158/bcm963158.c b/board/broadcom/bcm963158/bcm963158.c
index 9feaee3c0fc4..46850b134f73 100644
--- a/board/broadcom/bcm963158/bcm963158.c
+++ b/board/broadcom/bcm963158/bcm963158.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <fdtdec.h>
 #include <init.h>
+#include <stdio.h>
 #include <linux/io.h>
 
 #ifdef CONFIG_ARM64
diff --git a/board/broadcom/bcm968360bg/bcm968360bg.c b/board/broadcom/bcm968360bg/bcm968360bg.c
index 90af6b88bd47..2653c9b28d07 100644
--- a/board/broadcom/bcm968360bg/bcm968360bg.c
+++ b/board/broadcom/bcm968360bg/bcm968360bg.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <fdtdec.h>
 #include <init.h>
+#include <stdio.h>
 #include <linux/io.h>
 
 #ifdef CONFIG_ARM64
diff --git a/board/broadcom/bcm968580xref/bcm968580xref.c b/board/broadcom/bcm968580xref/bcm968580xref.c
index 1bd723d49edd..60d9dc379981 100644
--- a/board/broadcom/bcm968580xref/bcm968580xref.c
+++ b/board/broadcom/bcm968580xref/bcm968580xref.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <fdtdec.h>
 #include <init.h>
+#include <stdio.h>
 #include <linux/io.h>
 
 #ifdef CONFIG_ARM64
diff --git a/board/broadcom/bcm_ep/board.c b/board/broadcom/bcm_ep/board.c
index d14bb9e9e012..3776d00b8d88 100644
--- a/board/broadcom/bcm_ep/board.c
+++ b/board/broadcom/bcm_ep/board.c
@@ -7,6 +7,7 @@
 #include <cpu_func.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/board/buffalo/lsxl/lsxl.c b/board/buffalo/lsxl/lsxl.c
index 34be601fdde6..97656dd2a7d1 100644
--- a/board/buffalo/lsxl/lsxl.c
+++ b/board/buffalo/lsxl/lsxl.c
@@ -20,6 +20,7 @@
 #include <miiphy.h>
 #include <spi.h>
 #include <spi_flash.h>
+#include <stdio.h>
 #include <asm/arch/soc.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/mpp.h>
diff --git a/board/cadence/xtfpga/xtfpga.c b/board/cadence/xtfpga/xtfpga.c
index 4b49b6e5c863..20f62f61fcde 100644
--- a/board/cadence/xtfpga/xtfpga.c
+++ b/board/cadence/xtfpga/xtfpga.c
@@ -8,6 +8,7 @@
 #include <command.h>
 #include <dm.h>
 #include <init.h>
+#include <stdio.h>
 #include <dm/platform_data/net_ethoc.h>
 #include <env.h>
 #include <linux/ctype.h>
diff --git a/board/cavium/thunderx/atf.c b/board/cavium/thunderx/atf.c
index a60c944089dd..9c812e9531fe 100644
--- a/board/cavium/thunderx/atf.c
+++ b/board/cavium/thunderx/atf.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <asm/io.h>
 #include <asm/ptrace.h>
diff --git a/board/cavium/thunderx/thunderx.c b/board/cavium/thunderx/thunderx.c
index 18b0f43aa7db..71444324f317 100644
--- a/board/cavium/thunderx/thunderx.c
+++ b/board/cavium/thunderx/thunderx.c
@@ -10,6 +10,7 @@
 #include <malloc.h>
 #include <errno.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/compiler.h>
diff --git a/board/ccv/xpress/xpress.c b/board/ccv/xpress/xpress.c
index 8e23359751ae..1edec6158efc 100644
--- a/board/ccv/xpress/xpress.c
+++ b/board/ccv/xpress/xpress.c
@@ -5,6 +5,7 @@
 
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/cirrus/edb93xx/edb93xx.c b/board/cirrus/edb93xx/edb93xx.c
index f2fb24000c85..d33861f229c1 100644
--- a/board/cirrus/edb93xx/edb93xx.c
+++ b/board/cirrus/edb93xx/edb93xx.c
@@ -21,6 +21,7 @@
 #include <net.h>
 #include <netdev.h>
 #include <status_led.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/mach-types.h>
diff --git a/board/cloudengines/pogo_e02/pogo_e02.c b/board/cloudengines/pogo_e02/pogo_e02.c
index 039fd6e3dd67..fbb88a7150a7 100644
--- a/board/cloudengines/pogo_e02/pogo_e02.c
+++ b/board/cloudengines/pogo_e02/pogo_e02.c
@@ -14,6 +14,7 @@
 #include <log.h>
 #include <miiphy.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
 #include <asm/arch/mpp.h>
diff --git a/board/compulab/cl-som-imx7/cl-som-imx7.c b/board/compulab/cl-som-imx7/cl-som-imx7.c
index 46a0fa76473e..edb37225e743 100644
--- a/board/compulab/cl-som-imx7/cl-som-imx7.c
+++ b/board/compulab/cl-som-imx7/cl-som-imx7.c
@@ -15,6 +15,7 @@
 #include <phy.h>
 #include <netdev.h>
 #include <fsl_esdhc_imx.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
diff --git a/board/compulab/cl-som-imx7/spl.c b/board/compulab/cl-som-imx7/spl.c
index 18dc86cdc830..d75951615be4 100644
--- a/board/compulab/cl-som-imx7/spl.c
+++ b/board/compulab/cl-som-imx7/spl.c
@@ -12,6 +12,7 @@
 #include <init.h>
 #include <spl.h>
 #include <fsl_esdhc_imx.h>
+#include <stdio.h>
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/arch-mx7/mx7-pins.h>
 #include <asm/arch-mx7/clock.h>
diff --git a/board/compulab/cm_fx6/cm_fx6.c b/board/compulab/cm_fx6/cm_fx6.c
index 4147c4f7d023..aeab97d7d207 100644
--- a/board/compulab/cm_fx6/cm_fx6.c
+++ b/board/compulab/cm_fx6/cm_fx6.c
@@ -19,6 +19,7 @@
 #include <net.h>
 #include <netdev.h>
 #include <errno.h>
+#include <stdio.h>
 #include <usb.h>
 #include <fdt_support.h>
 #include <sata.h>
diff --git a/board/compulab/cm_fx6/spl.c b/board/compulab/cm_fx6/spl.c
index ab739330d9c4..0dab1cbd60aa 100644
--- a/board/compulab/cm_fx6/spl.c
+++ b/board/compulab/cm_fx6/spl.c
@@ -12,6 +12,7 @@
 #include <hang.h>
 #include <init.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
 #include <asm/arch/mx6-ddr.h>
diff --git a/board/compulab/cm_t335/cm_t335.c b/board/compulab/cm_t335/cm_t335.c
index 2a63aadf0d72..26ba6711c934 100644
--- a/board/compulab/cm_t335/cm_t335.c
+++ b/board/compulab/cm_t335/cm_t335.c
@@ -14,6 +14,7 @@
 #include <net.h>
 #include <status_led.h>
 #include <cpsw.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
diff --git a/board/compulab/cm_t335/spl.c b/board/compulab/cm_t335/spl.c
index 8662632a7e39..293323b4b0fc 100644
--- a/board/compulab/cm_t335/spl.c
+++ b/board/compulab/cm_t335/spl.c
@@ -14,6 +14,7 @@
 #include <errno.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 
 #include <asm/arch/ddr_defs.h>
 #include <asm/arch/clock.h>
diff --git a/board/compulab/cm_t43/cm_t43.c b/board/compulab/cm_t43/cm_t43.c
index 92c8092d6d7e..c035f3643103 100644
--- a/board/compulab/cm_t43/cm_t43.c
+++ b/board/compulab/cm_t43/cm_t43.c
@@ -8,6 +8,7 @@
 #include <miiphy.h>
 #include <cpsw.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/arch/sys_proto.h>
diff --git a/board/compulab/common/common.c b/board/compulab/common/common.c
index 528c97df19a4..7021e73b0820 100644
--- a/board/compulab/common/common.c
+++ b/board/compulab/common/common.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/bootm.h>
 #include <asm/gpio.h>
 #include <asm/setup.h>
diff --git a/board/compulab/common/eeprom.c b/board/compulab/common/eeprom.c
index fa4ab7d65672..94ab9003b35d 100644
--- a/board/compulab/common/eeprom.c
+++ b/board/compulab/common/eeprom.c
@@ -11,6 +11,7 @@
 #include <i2c.h>
 #include <eeprom_layout.h>
 #include <eeprom_field.h>
+#include <stdio.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 e1511e82eccc..93ae1c6b0863 100644
--- a/board/compulab/common/omap3_display.c
+++ b/board/compulab/common/omap3_display.c
@@ -8,6 +8,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <env.h>
diff --git a/board/compulab/common/omap3_smc911x.c b/board/compulab/common/omap3_smc911x.c
index f0d365272c1b..a6a03bc58237 100644
--- a/board/compulab/common/omap3_smc911x.c
+++ b/board/compulab/common/omap3_smc911x.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <linux/delay.h>
 
 #include <asm/io.h>
diff --git a/board/congatec/cgtqmx6eval/cgtqmx6eval.c b/board/congatec/cgtqmx6eval/cgtqmx6eval.c
index 62c53d782e00..c4b3772e8355 100644
--- a/board/congatec/cgtqmx6eval/cgtqmx6eval.c
+++ b/board/congatec/cgtqmx6eval/cgtqmx6eval.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
diff --git a/board/congatec/conga-qeval20-qa3-e3845/conga-qeval20-qa3.c b/board/congatec/conga-qeval20-qa3-e3845/conga-qeval20-qa3.c
index 315b6dc54295..4184c34ace04 100644
--- a/board/congatec/conga-qeval20-qa3-e3845/conga-qeval20-qa3.c
+++ b/board/congatec/conga-qeval20-qa3-e3845/conga-qeval20-qa3.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <i2c.h>
 #include <init.h>
+#include <stdio.h>
 #include <winbond_w83627.h>
 #include <asm/gpio.h>
 #include <asm/ibmpc.h>
diff --git a/board/corscience/tricorder/tricorder-eeprom.c b/board/corscience/tricorder/tricorder-eeprom.c
index 266f43a0058f..002daf23f4db 100644
--- a/board/corscience/tricorder/tricorder-eeprom.c
+++ b/board/corscience/tricorder/tricorder-eeprom.c
@@ -9,6 +9,7 @@
 #include <display_options.h>
 #include <eeprom.h>
 #include <i2c.h>
+#include <stdio.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 53495aa187bd..8fec67a69128 100644
--- a/board/corscience/tricorder/tricorder.c
+++ b/board/corscience/tricorder/tricorder.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <init.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <twl4030.h>
 #include <status_led.h>
 #include <asm/global_data.h>
diff --git a/board/cortina/presidio-asic/presidio.c b/board/cortina/presidio-asic/presidio.c
index 5c7352226373..f26ad2a5d9c1 100644
--- a/board/cortina/presidio-asic/presidio.c
+++ b/board/cortina/presidio-asic/presidio.c
@@ -8,6 +8,7 @@
 #include <malloc.h>
 #include <errno.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
diff --git a/board/cssi/MCR3000/MCR3000.c b/board/cssi/MCR3000/MCR3000.c
index dc0edd961d84..3bce44ef4305 100644
--- a/board/cssi/MCR3000/MCR3000.c
+++ b/board/cssi/MCR3000/MCR3000.c
@@ -14,6 +14,7 @@
 #include <mpc8xx.h>
 #include <fdt_support.h>
 #include <serial.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/ppc.h>
diff --git a/board/d-link/dns325/dns325.c b/board/d-link/dns325/dns325.c
index 055783f63ada..a50220576f12 100644
--- a/board/d-link/dns325/dns325.c
+++ b/board/d-link/dns325/dns325.c
@@ -15,6 +15,7 @@
 #include <miiphy.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
 #include <asm/arch/mpp.h>
diff --git a/board/davinci/da8xxevm/da850evm.c b/board/davinci/da8xxevm/da850evm.c
index 38e51eb23e37..80c317a5a5d6 100644
--- a/board/davinci/da8xxevm/da850evm.c
+++ b/board/davinci/da8xxevm/da850evm.c
@@ -16,6 +16,7 @@
 #include <net.h>
 #include <spi.h>
 #include <spi_flash.h>
+#include <stdio.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 347f616df672..7a75494d7f3d 100644
--- a/board/davinci/da8xxevm/omapl138_lcdk.c
+++ b/board/davinci/da8xxevm/omapl138_lcdk.c
@@ -13,6 +13,7 @@
 #include <i2c.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.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 c8c99a2aa47d..b7a1a71de097 100644
--- a/board/dhelectronics/dh_imx6/dh_imx6.c
+++ b/board/dhelectronics/dh_imx6/dh_imx6.c
@@ -11,6 +11,7 @@
 #include <image.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <dm/device-internal.h>
 #include <asm/arch/clock.h>
diff --git a/board/dhelectronics/dh_imx6/dh_imx6_spl.c b/board/dhelectronics/dh_imx6/dh_imx6_spl.c
index bcb39eab886f..fdf915fead49 100644
--- a/board/dhelectronics/dh_imx6/dh_imx6_spl.c
+++ b/board/dhelectronics/dh_imx6/dh_imx6_spl.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/dhelectronics/dh_stm32mp1/board.c b/board/dhelectronics/dh_stm32mp1/board.c
index 92d752f7258a..9f48438dde31 100644
--- a/board/dhelectronics/dh_stm32mp1/board.c
+++ b/board/dhelectronics/dh_stm32mp1/board.c
@@ -7,6 +7,7 @@
 #include <adc.h>
 #include <log.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/arch/stm32.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/global_data.h>
diff --git a/board/egnite/ethernut5/ethernut5_pwrman.c b/board/egnite/ethernut5/ethernut5_pwrman.c
index 56c33bfade4b..b91020ec33f2 100644
--- a/board/egnite/ethernut5/ethernut5_pwrman.c
+++ b/board/egnite/ethernut5/ethernut5_pwrman.c
@@ -33,6 +33,7 @@
  */
 #include <common.h>
 #include <command.h>
+#include <stdio.h>
 #include <asm/arch/at91sam9260.h>
 #include <asm/arch/at91_common.h>
 #include <asm/arch/gpio.h>
diff --git a/board/el/el6x/el6x.c b/board/el/el6x/el6x.c
index f5c874dcda8b..8272e1459d2a 100644
--- a/board/el/el6x/el6x.c
+++ b/board/el/el6x/el6x.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux.h>
diff --git a/board/embest/mx6boards/mx6boards.c b/board/embest/mx6boards/mx6boards.c
index 3cd24de612ba..6bd0b10a9e1b 100644
--- a/board/embest/mx6boards/mx6boards.c
+++ b/board/embest/mx6boards/mx6boards.c
@@ -15,6 +15,7 @@
 #include <common.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/engicam/common/spl.c b/board/engicam/common/spl.c
index d57419a78efe..fc01fabd521f 100644
--- a/board/engicam/common/spl.c
+++ b/board/engicam/common/spl.c
@@ -10,6 +10,7 @@
 #include <init.h>
 #include <serial.h>
 #include <spl.h>
+#include <stdio.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 
diff --git a/board/esd/meesc/meesc.c b/board/esd/meesc/meesc.c
index fe2f9a4d2b13..6ddaed412ed8 100644
--- a/board/esd/meesc/meesc.c
+++ b/board/esd/meesc/meesc.c
@@ -14,6 +14,7 @@
 #include <init.h>
 #include <net.h>
 #include <serial.h>
+#include <stdio.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/board/esd/vme8349/caddy.c b/board/esd/vme8349/caddy.c
index fc4855a5beae..6bda7b040736 100644
--- a/board/esd/vme8349/caddy.c
+++ b/board/esd/vme8349/caddy.c
@@ -11,6 +11,7 @@
 #include <console.h>
 #include <ioports.h>
 #include <mpc83xx.h>
+#include <stdio.h>
 #include <asm/mpc8349_pci.h>
 #include <pci.h>
 #include <asm/mmu.h>
diff --git a/board/esd/vme8349/pci.c b/board/esd/vme8349/pci.c
index 560069bbc145..bf59cc8d8c2d 100644
--- a/board/esd/vme8349/pci.c
+++ b/board/esd/vme8349/pci.c
@@ -11,6 +11,7 @@
  */
 
 #include <init.h>
+#include <stdio.h>
 #include <asm/mmu.h>
 #include <asm/io.h>
 #include <common.h>
diff --git a/board/esd/vme8349/vme8349.c b/board/esd/vme8349/vme8349.c
index a5874ad273a1..bc56284655c7 100644
--- a/board/esd/vme8349/vme8349.c
+++ b/board/esd/vme8349/vme8349.c
@@ -17,6 +17,7 @@
 #include <ioports.h>
 #include <mpc83xx.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/mpc8349_pci.h>
 #if defined(CONFIG_OF_LIBFDT)
diff --git a/board/firefly/firefly-rk3308/roc_cc_rk3308.c b/board/firefly/firefly-rk3308/roc_cc_rk3308.c
index 28dcc2a6903a..d559fccf2ab2 100644
--- a/board/firefly/firefly-rk3308/roc_cc_rk3308.c
+++ b/board/firefly/firefly-rk3308/roc_cc_rk3308.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <adc.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/grf_rk3308.h>
 #include <asm/arch-rockchip/hardware.h>
diff --git a/board/freescale/common/cmd_esbc_validate.c b/board/freescale/common/cmd_esbc_validate.c
index 638aa3c19a4d..2190e51c150e 100644
--- a/board/freescale/common/cmd_esbc_validate.c
+++ b/board/freescale/common/cmd_esbc_validate.c
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <env.h>
 #include <fsl_validate.h>
+#include <stdio.h>
 
 int do_esbc_halt(struct cmd_tbl *cmdtp, int flag, int argc,
 		 char *const argv[])
diff --git a/board/freescale/common/dcu_sii9022a.c b/board/freescale/common/dcu_sii9022a.c
index 832ae258f149..dc0f27bfe71d 100644
--- a/board/freescale/common/dcu_sii9022a.c
+++ b/board/freescale/common/dcu_sii9022a.c
@@ -4,6 +4,7 @@
  * Copyright 2019 NXP
  */
 
+#include <stdio.h>
 #include <asm/io.h>
 #include <common.h>
 #include <fsl_dcu_fb.h>
diff --git a/board/freescale/common/diu_ch7301.c b/board/freescale/common/diu_ch7301.c
index 02a271895bdc..cd6264b354f5 100644
--- a/board/freescale/common/diu_ch7301.c
+++ b/board/freescale/common/diu_ch7301.c
@@ -10,6 +10,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <stdio_dev.h>
 #include <i2c.h>
 #include <linux/delay.h>
diff --git a/board/freescale/common/emc2305.c b/board/freescale/common/emc2305.c
index 07b2ec06bbcb..b8f2bbd2b5a9 100644
--- a/board/freescale/common/emc2305.c
+++ b/board/freescale/common/emc2305.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <command.h>
 #include <i2c.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 
diff --git a/board/freescale/common/fsl_chain_of_trust.c b/board/freescale/common/fsl_chain_of_trust.c
index cafb24971b21..7567ea2c1c29 100644
--- a/board/freescale/common/fsl_chain_of_trust.c
+++ b/board/freescale/common/fsl_chain_of_trust.c
@@ -10,6 +10,7 @@
 #include <fsl_secboot_err.h>
 #include <fsl_sfp.h>
 #include <log.h>
+#include <stdio.h>
 #include <dm/root.h>
 
 #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_FRAMEWORK)
diff --git a/board/freescale/common/fsl_validate.c b/board/freescale/common/fsl_validate.c
index 213545e777f4..ff6e2bfb34f5 100644
--- a/board/freescale/common/fsl_validate.c
+++ b/board/freescale/common/fsl_validate.c
@@ -13,6 +13,7 @@
 #include <command.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <linux/string.h>
 #include <u-boot/rsa-mod-exp.h>
 #include <hash.h>
diff --git a/board/freescale/common/mc34vr500.c b/board/freescale/common/mc34vr500.c
index d6b4c65a3c08..6f485ea233ed 100644
--- a/board/freescale/common/mc34vr500.c
+++ b/board/freescale/common/mc34vr500.c
@@ -8,6 +8,7 @@
 #include <errno.h>
 #include <i2c.h>
 #include <log.h>
+#include <stdio.h>
 #include <power/pmic.h>
 #include <power/mc34vr500_pmic.h>
 
diff --git a/board/freescale/common/ngpixis.c b/board/freescale/common/ngpixis.c
index a89b07986bb0..5bceb7747d5e 100644
--- a/board/freescale/common/ngpixis.c
+++ b/board/freescale/common/ngpixis.c
@@ -31,6 +31,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/string.h>
 
diff --git a/board/freescale/common/pfuze.c b/board/freescale/common/pfuze.c
index 6dca22960bf8..af1ee044bb3c 100644
--- a/board/freescale/common/pfuze.c
+++ b/board/freescale/common/pfuze.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <errno.h>
+#include <stdio.h>
 #include <power/pmic.h>
 #include <power/pfuze100_pmic.h>
 
diff --git a/board/freescale/common/pixis.c b/board/freescale/common/pixis.c
index 99e8069ad299..6f4f2e6d2413 100644
--- a/board/freescale/common/pixis.c
+++ b/board/freescale/common/pixis.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/string.h>
 
diff --git a/board/freescale/common/pq-mds-pib.c b/board/freescale/common/pq-mds-pib.c
index ae6603985751..10e1dfe43f97 100644
--- a/board/freescale/common/pq-mds-pib.c
+++ b/board/freescale/common/pq-mds-pib.c
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <i2c.h>
+#include <stdio.h>
 #include <asm/io.h>
 
 #include "pq-mds-pib.h"
diff --git a/board/freescale/common/qixis.c b/board/freescale/common/qixis.c
index 8592b0f0f0ac..e1716676a4ab 100644
--- a/board/freescale/common/qixis.c
+++ b/board/freescale/common/qixis.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/compiler.h>
 #include <linux/string.h>
diff --git a/board/freescale/common/sys_eeprom.c b/board/freescale/common/sys_eeprom.c
index 566920d5feb9..2f1144dcd74e 100644
--- a/board/freescale/common/sys_eeprom.c
+++ b/board/freescale/common/sys_eeprom.c
@@ -11,6 +11,7 @@
 #include <env.h>
 #include <i2c.h>
 #include <init.h>
+#include <stdio.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 ed0d9b471cad..77c7dd2c4689 100644
--- a/board/freescale/common/vid.c
+++ b/board/freescale/common/vid.c
@@ -9,6 +9,7 @@
 #include <i2c.h>
 #include <irq_func.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #ifdef CONFIG_FSL_LSCH2
 #include <asm/arch/immap_lsch2.h>
diff --git a/board/freescale/corenet_ds/corenet_ds.c b/board/freescale/corenet_ds/corenet_ds.c
index 67b47e33e725..a6b93bab4e89 100644
--- a/board/freescale/corenet_ds/corenet_ds.c
+++ b/board/freescale/corenet_ds/corenet_ds.c
@@ -10,6 +10,7 @@
 #include <image.h>
 #include <init.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/compiler.h>
diff --git a/board/freescale/corenet_ds/ddr.c b/board/freescale/corenet_ds/ddr.c
index bce099a8ed8f..ea1419efa700 100644
--- a/board/freescale/corenet_ds/ddr.c
+++ b/board/freescale/corenet_ds/ddr.c
@@ -8,6 +8,7 @@
 #include <hwconfig.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/mmu.h>
diff --git a/board/freescale/corenet_ds/eth_hydra.c b/board/freescale/corenet_ds/eth_hydra.c
index 71c588c14178..0a31c9e31120 100644
--- a/board/freescale/corenet_ds/eth_hydra.c
+++ b/board/freescale/corenet_ds/eth_hydra.c
@@ -50,6 +50,7 @@
 #include <common.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdio.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 3360e0ffc795..09f9f85f91b9 100644
--- a/board/freescale/corenet_ds/eth_p4080.c
+++ b/board/freescale/corenet_ds/eth_p4080.c
@@ -8,6 +8,7 @@
 #include <fdt_support.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdio.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 57fb5a77f06c..954f55bdbf62 100644
--- a/board/freescale/corenet_ds/eth_superhydra.c
+++ b/board/freescale/corenet_ds/eth_superhydra.c
@@ -51,6 +51,7 @@
 #include <log.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/fsl_serdes.h>
 #include <fm_eth.h>
 #include <fsl_mdio.h>
diff --git a/board/freescale/imx8mm_evk/spl.c b/board/freescale/imx8mm_evk/spl.c
index fbc13ad128ad..63257eabb6f8 100644
--- a/board/freescale/imx8mm_evk/spl.c
+++ b/board/freescale/imx8mm_evk/spl.c
@@ -11,6 +11,7 @@
 #include <init.h>
 #include <log.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/mach-imx/iomux-v3.h>
diff --git a/board/freescale/imx8mn_evk/spl.c b/board/freescale/imx8mn_evk/spl.c
index 9f3c58841284..1d5e95e62d85 100644
--- a/board/freescale/imx8mn_evk/spl.c
+++ b/board/freescale/imx8mn_evk/spl.c
@@ -12,6 +12,7 @@
 #include <init.h>
 #include <log.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/mach-imx/iomux-v3.h>
diff --git a/board/freescale/imx8mp_evk/spl.c b/board/freescale/imx8mp_evk/spl.c
index ebfd94dc1fa0..244d04c18a5a 100644
--- a/board/freescale/imx8mp_evk/spl.c
+++ b/board/freescale/imx8mp_evk/spl.c
@@ -12,6 +12,7 @@
 #include <init.h>
 #include <log.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <errno.h>
diff --git a/board/freescale/imx8mq_evk/spl.c b/board/freescale/imx8mq_evk/spl.c
index d9d1973120b6..7316c762a2b7 100644
--- a/board/freescale/imx8mq_evk/spl.c
+++ b/board/freescale/imx8mq_evk/spl.c
@@ -10,6 +10,7 @@
 #include <image.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <errno.h>
diff --git a/board/freescale/imx8qm_mek/imx8qm_mek.c b/board/freescale/imx8qm_mek/imx8qm_mek.c
index de9e4f0de418..4f0b0467da00 100644
--- a/board/freescale/imx8qm_mek/imx8qm_mek.c
+++ b/board/freescale/imx8qm_mek/imx8qm_mek.c
@@ -8,6 +8,7 @@
 #include <env.h>
 #include <errno.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/libfdt.h>
diff --git a/board/freescale/imx8qm_mek/spl.c b/board/freescale/imx8qm_mek/spl.c
index cdbff80e31bb..d3d3431fe63f 100644
--- a/board/freescale/imx8qm_mek/spl.c
+++ b/board/freescale/imx8qm_mek/spl.c
@@ -10,6 +10,7 @@
 #include <init.h>
 #include <log.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <dm/uclass.h>
 #include <dm/device.h>
diff --git a/board/freescale/imx8qxp_mek/imx8qxp_mek.c b/board/freescale/imx8qxp_mek/imx8qxp_mek.c
index b6511d4e9df1..9b70813281be 100644
--- a/board/freescale/imx8qxp_mek/imx8qxp_mek.c
+++ b/board/freescale/imx8qxp_mek/imx8qxp_mek.c
@@ -8,6 +8,7 @@
 #include <env.h>
 #include <errno.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
diff --git a/board/freescale/imx8qxp_mek/spl.c b/board/freescale/imx8qxp_mek/spl.c
index 9eb4268ce3fe..78d2856e3b43 100644
--- a/board/freescale/imx8qxp_mek/spl.c
+++ b/board/freescale/imx8qxp_mek/spl.c
@@ -10,6 +10,7 @@
 #include <init.h>
 #include <log.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <dm/uclass.h>
 #include <dm/device.h>
diff --git a/board/freescale/ls1012afrdm/eth.c b/board/freescale/ls1012afrdm/eth.c
index eaea1c46e48e..c29cb639e3ac 100644
--- a/board/freescale/ls1012afrdm/eth.c
+++ b/board/freescale/ls1012afrdm/eth.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <netdev.h>
 #include <fm_eth.h>
diff --git a/board/freescale/ls1012afrdm/ls1012afrdm.c b/board/freescale/ls1012afrdm/ls1012afrdm.c
index c872318b2c88..3100aee2715e 100644
--- a/board/freescale/ls1012afrdm/ls1012afrdm.c
+++ b/board/freescale/ls1012afrdm/ls1012afrdm.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <fdt_support.h>
 #include <i2c.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <init.h>
 #include <asm/global_data.h>
diff --git a/board/freescale/ls1012aqds/eth.c b/board/freescale/ls1012aqds/eth.c
index b4ef60738ebf..d0d012e67f20 100644
--- a/board/freescale/ls1012aqds/eth.c
+++ b/board/freescale/ls1012aqds/eth.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <netdev.h>
 #include <fm_eth.h>
diff --git a/board/freescale/ls1012aqds/ls1012aqds.c b/board/freescale/ls1012aqds/ls1012aqds.c
index 163d2c419485..50e04204c688 100644
--- a/board/freescale/ls1012aqds/ls1012aqds.c
+++ b/board/freescale/ls1012aqds/ls1012aqds.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <i2c.h>
 #include <fdt_support.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <init.h>
 #include <asm/global_data.h>
diff --git a/board/freescale/ls1012ardb/eth.c b/board/freescale/ls1012ardb/eth.c
index a65ff4dc9c4f..7d4d4017e925 100644
--- a/board/freescale/ls1012ardb/eth.c
+++ b/board/freescale/ls1012ardb/eth.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <netdev.h>
 #include <fm_eth.h>
diff --git a/board/freescale/ls1012ardb/ls1012ardb.c b/board/freescale/ls1012ardb/ls1012ardb.c
index 1d3461f24232..278dc2221e40 100644
--- a/board/freescale/ls1012ardb/ls1012ardb.c
+++ b/board/freescale/ls1012ardb/ls1012ardb.c
@@ -8,6 +8,7 @@
 #include <fdt_support.h>
 #include <hang.h>
 #include <i2c.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <init.h>
 #include <asm/global_data.h>
diff --git a/board/freescale/ls1021aiot/dcu.c b/board/freescale/ls1021aiot/dcu.c
index 55706549852c..581165100c7c 100644
--- a/board/freescale/ls1021aiot/dcu.c
+++ b/board/freescale/ls1021aiot/dcu.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <fsl_dcu_fb.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/string.h>
 #include "div64.h"
diff --git a/board/freescale/ls1021aiot/ls1021aiot.c b/board/freescale/ls1021aiot/ls1021aiot.c
index 0170712c2463..09ef96e6bb4f 100644
--- a/board/freescale/ls1021aiot/ls1021aiot.c
+++ b/board/freescale/ls1021aiot/ls1021aiot.c
@@ -8,6 +8,7 @@
 #include <fdt_support.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/arch/immap_ls102xa.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/fsl_serdes.h>
diff --git a/board/freescale/ls1021aqds/dcu.c b/board/freescale/ls1021aqds/dcu.c
index 1bfd94bb7a18..7f0ae42e92b6 100644
--- a/board/freescale/ls1021aqds/dcu.c
+++ b/board/freescale/ls1021aqds/dcu.c
@@ -6,6 +6,7 @@
  * FSL DCU Framebuffer driver
  */
 
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <common.h>
diff --git a/board/freescale/ls1021aqds/ddr.c b/board/freescale/ls1021aqds/ddr.c
index e63fe63e40cd..61dcdf8fb06f 100644
--- a/board/freescale/ls1021aqds/ddr.c
+++ b/board/freescale/ls1021aqds/ddr.c
@@ -8,6 +8,7 @@
 #include <fsl_ddr_dimm_params.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
diff --git a/board/freescale/ls1021aqds/eth.c b/board/freescale/ls1021aqds/eth.c
index f9aa2f09fb99..786935b8b335 100644
--- a/board/freescale/ls1021aqds/eth.c
+++ b/board/freescale/ls1021aqds/eth.c
@@ -16,6 +16,7 @@
 #include <common.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/arch/fsl_serdes.h>
 #include <fsl_mdio.h>
 #include <tsec.h>
diff --git a/board/freescale/ls1021aqds/ls1021aqds.c b/board/freescale/ls1021aqds/ls1021aqds.c
index 267af86ccb2f..1b7dcf2d33d0 100644
--- a/board/freescale/ls1021aqds/ls1021aqds.c
+++ b/board/freescale/ls1021aqds/ls1021aqds.c
@@ -10,6 +10,7 @@
 #include <i2c.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/immap_ls102xa.h>
 #include <asm/arch/clock.h>
diff --git a/board/freescale/ls1021atwr/dcu.c b/board/freescale/ls1021atwr/dcu.c
index b52d297bb96f..89b1fb802716 100644
--- a/board/freescale/ls1021atwr/dcu.c
+++ b/board/freescale/ls1021atwr/dcu.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <fsl_dcu_fb.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/string.h>
 #include "div64.h"
diff --git a/board/freescale/ls1021atwr/ls1021atwr.c b/board/freescale/ls1021atwr/ls1021atwr.c
index 8640d2746a29..cf9c171889e2 100644
--- a/board/freescale/ls1021atwr/ls1021atwr.c
+++ b/board/freescale/ls1021atwr/ls1021atwr.c
@@ -11,6 +11,7 @@
 #include <i2c.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/immap_ls102xa.h>
diff --git a/board/freescale/ls1028a/ls1028a.c b/board/freescale/ls1028a/ls1028a.c
index de41dd155e69..220d0b0befaa 100644
--- a/board/freescale/ls1028a/ls1028a.c
+++ b/board/freescale/ls1028a/ls1028a.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <fsl_ddr.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <hwconfig.h>
diff --git a/board/freescale/ls1043aqds/ddr.c b/board/freescale/ls1043aqds/ddr.c
index 23947bdb84c9..079f19458e41 100644
--- a/board/freescale/ls1043aqds/ddr.c
+++ b/board/freescale/ls1043aqds/ddr.c
@@ -10,6 +10,7 @@
 #include <fsl_sleep.h>
 #endif
 #include <log.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/global_data.h>
 #include "ddr.h"
diff --git a/board/freescale/ls1043aqds/eth.c b/board/freescale/ls1043aqds/eth.c
index 68e1642d2d4f..ba56512ec96e 100644
--- a/board/freescale/ls1043aqds/eth.c
+++ b/board/freescale/ls1043aqds/eth.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <log.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <netdev.h>
 #include <fdt_support.h>
diff --git a/board/freescale/ls1043aqds/ls1043aqds.c b/board/freescale/ls1043aqds/ls1043aqds.c
index 8fc20ea46e77..183fdcf12c37 100644
--- a/board/freescale/ls1043aqds/ls1043aqds.c
+++ b/board/freescale/ls1043aqds/ls1043aqds.c
@@ -10,6 +10,7 @@
 #include <fsl_ddr_sdram.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
diff --git a/board/freescale/ls1043ardb/cpld.c b/board/freescale/ls1043ardb/cpld.c
index 90faa0ba209e..c230dcdca5df 100644
--- a/board/freescale/ls1043ardb/cpld.c
+++ b/board/freescale/ls1043ardb/cpld.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/string.h>
 #include "cpld.h"
diff --git a/board/freescale/ls1043ardb/ddr.c b/board/freescale/ls1043ardb/ddr.c
index 75346de3726f..d4442e6d8ff6 100644
--- a/board/freescale/ls1043ardb/ddr.c
+++ b/board/freescale/ls1043ardb/ddr.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/string.h>
 #include "ddr.h"
diff --git a/board/freescale/ls1043ardb/eth.c b/board/freescale/ls1043ardb/eth.c
index dde2f376c9a5..a89978bbd7dd 100644
--- a/board/freescale/ls1043ardb/eth.c
+++ b/board/freescale/ls1043ardb/eth.c
@@ -4,6 +4,7 @@
  */
 #include <common.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <netdev.h>
 #include <fm_eth.h>
diff --git a/board/freescale/ls1043ardb/ls1043ardb.c b/board/freescale/ls1043ardb/ls1043ardb.c
index d9ab32bd2cc6..86309266a047 100644
--- a/board/freescale/ls1043ardb/ls1043ardb.c
+++ b/board/freescale/ls1043ardb/ls1043ardb.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <i2c.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
diff --git a/board/freescale/ls1046afrwy/eth.c b/board/freescale/ls1046afrwy/eth.c
index 5797c764dce8..278856f56d73 100644
--- a/board/freescale/ls1046afrwy/eth.c
+++ b/board/freescale/ls1046afrwy/eth.c
@@ -5,6 +5,7 @@
 #include <common.h>
 #include <fdt_support.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <netdev.h>
 #include <fm_eth.h>
diff --git a/board/freescale/ls1046afrwy/ls1046afrwy.c b/board/freescale/ls1046afrwy/ls1046afrwy.c
index 4d2d66b6b359..550c901a76bf 100644
--- a/board/freescale/ls1046afrwy/ls1046afrwy.c
+++ b/board/freescale/ls1046afrwy/ls1046afrwy.c
@@ -7,6 +7,7 @@
 #include <i2c.h>
 #include <fdt_support.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
diff --git a/board/freescale/ls1046aqds/ddr.c b/board/freescale/ls1046aqds/ddr.c
index 9a96de271786..98484ef995be 100644
--- a/board/freescale/ls1046aqds/ddr.c
+++ b/board/freescale/ls1046aqds/ddr.c
@@ -10,6 +10,7 @@
 #include <fsl_sleep.h>
 #endif
 #include <log.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/global_data.h>
 #include "ddr.h"
diff --git a/board/freescale/ls1046aqds/eth.c b/board/freescale/ls1046aqds/eth.c
index b4ea0239da4c..93a41cd4a129 100644
--- a/board/freescale/ls1046aqds/eth.c
+++ b/board/freescale/ls1046aqds/eth.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <log.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <netdev.h>
 #include <fdt_support.h>
diff --git a/board/freescale/ls1046aqds/ls1046aqds.c b/board/freescale/ls1046aqds/ls1046aqds.c
index cb11eb633bbc..52266a594367 100644
--- a/board/freescale/ls1046aqds/ls1046aqds.c
+++ b/board/freescale/ls1046aqds/ls1046aqds.c
@@ -9,6 +9,7 @@
 #include <fdt_support.h>
 #include <fsl_ddr_sdram.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
diff --git a/board/freescale/ls1046ardb/cpld.c b/board/freescale/ls1046ardb/cpld.c
index 252b5adaf5e4..4182baa4975e 100644
--- a/board/freescale/ls1046ardb/cpld.c
+++ b/board/freescale/ls1046ardb/cpld.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/string.h>
 #include "cpld.h"
diff --git a/board/freescale/ls1046ardb/ddr.c b/board/freescale/ls1046ardb/ddr.c
index befb556bd30b..ff7a4e225068 100644
--- a/board/freescale/ls1046ardb/ddr.c
+++ b/board/freescale/ls1046ardb/ddr.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include "ddr.h"
 #ifdef CONFIG_FSL_DEEP_SLEEP
diff --git a/board/freescale/ls1046ardb/eth.c b/board/freescale/ls1046ardb/eth.c
index c0ae35c6e395..6d05c964bd0f 100644
--- a/board/freescale/ls1046ardb/eth.c
+++ b/board/freescale/ls1046ardb/eth.c
@@ -5,6 +5,7 @@
 #include <common.h>
 #include <fdt_support.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <netdev.h>
 #include <fm_eth.h>
diff --git a/board/freescale/ls1046ardb/ls1046ardb.c b/board/freescale/ls1046ardb/ls1046ardb.c
index 6a15cdfcd332..ad4caaa5044f 100644
--- a/board/freescale/ls1046ardb/ls1046ardb.c
+++ b/board/freescale/ls1046ardb/ls1046ardb.c
@@ -7,6 +7,7 @@
 #include <i2c.h>
 #include <fdt_support.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
diff --git a/board/freescale/ls1088a/ddr.c b/board/freescale/ls1088a/ddr.c
index 995c42960178..1e3002005a99 100644
--- a/board/freescale/ls1088a/ddr.c
+++ b/board/freescale/ls1088a/ddr.c
@@ -7,6 +7,7 @@
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
 #include <log.h>
+#include <stdio.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 de44024173fc..f26bbf3267ea 100644
--- a/board/freescale/ls1088a/eth_ls1088aqds.c
+++ b/board/freescale/ls1088a/eth_ls1088aqds.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/fsl_serdes.h>
 #include <hwconfig.h>
diff --git a/board/freescale/ls1088a/eth_ls1088ardb.c b/board/freescale/ls1088a/eth_ls1088ardb.c
index 5c5655e549bf..6898dfc6f395 100644
--- a/board/freescale/ls1088a/eth_ls1088ardb.c
+++ b/board/freescale/ls1088a/eth_ls1088ardb.c
@@ -12,6 +12,7 @@
 #include <miiphy.h>
 #include <phy.h>
 #include <fm_eth.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <exports.h>
 #include <asm/arch/fsl_serdes.h>
diff --git a/board/freescale/ls1088a/ls1088a.c b/board/freescale/ls1088a/ls1088a.c
index 921fd985bf67..8d33151cdad9 100644
--- a/board/freescale/ls1088a/ls1088a.c
+++ b/board/freescale/ls1088a/ls1088a.c
@@ -14,6 +14,7 @@
 #include <fsl_ifc.h>
 #include <fsl_ddr.h>
 #include <fsl_sec.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <fdt_support.h>
diff --git a/board/freescale/ls2080a/ddr.c b/board/freescale/ls2080a/ddr.c
index a647cc6a3f7a..4175bd33cbf3 100644
--- a/board/freescale/ls2080a/ddr.c
+++ b/board/freescale/ls2080a/ddr.c
@@ -7,6 +7,7 @@
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/arch/soc.h>
 #include <asm/arch/clock.h>
 #include <asm/global_data.h>
diff --git a/board/freescale/ls2080a/ls2080a.c b/board/freescale/ls2080a/ls2080a.c
index d9c87d6840de..b2fb47eaaa50 100644
--- a/board/freescale/ls2080a/ls2080a.c
+++ b/board/freescale/ls2080a/ls2080a.c
@@ -11,6 +11,7 @@
 #include <netdev.h>
 #include <fsl_ifc.h>
 #include <fsl_ddr.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <fdt_support.h>
diff --git a/board/freescale/ls2080aqds/ddr.c b/board/freescale/ls2080aqds/ddr.c
index 2767d058cc96..8ad91bcc79ec 100644
--- a/board/freescale/ls2080aqds/ddr.c
+++ b/board/freescale/ls2080aqds/ddr.c
@@ -7,6 +7,7 @@
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
 #include <log.h>
+#include <stdio.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 1a3a891f825f..2a25cb9f0703 100644
--- a/board/freescale/ls2080aqds/eth.c
+++ b/board/freescale/ls2080aqds/eth.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/fsl_serdes.h>
 #include <hwconfig.h>
diff --git a/board/freescale/ls2080aqds/ls2080aqds.c b/board/freescale/ls2080aqds/ls2080aqds.c
index ac4388a1188a..39724dcbcbab 100644
--- a/board/freescale/ls2080aqds/ls2080aqds.c
+++ b/board/freescale/ls2080aqds/ls2080aqds.c
@@ -11,6 +11,7 @@
 #include <netdev.h>
 #include <fsl_ifc.h>
 #include <fsl_ddr.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <fdt_support.h>
diff --git a/board/freescale/ls2080ardb/ddr.c b/board/freescale/ls2080ardb/ddr.c
index 07fa84733324..7a91db928e24 100644
--- a/board/freescale/ls2080ardb/ddr.c
+++ b/board/freescale/ls2080ardb/ddr.c
@@ -7,6 +7,7 @@
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/arch/soc.h>
 #include <asm/arch/clock.h>
 #include <asm/global_data.h>
diff --git a/board/freescale/ls2080ardb/eth_ls2080rdb.c b/board/freescale/ls2080ardb/eth_ls2080rdb.c
index 786a253cbd5c..b4f718b1ae6a 100644
--- a/board/freescale/ls2080ardb/eth_ls2080rdb.c
+++ b/board/freescale/ls2080ardb/eth_ls2080rdb.c
@@ -13,6 +13,7 @@
 #include <miiphy.h>
 #include <phy.h>
 #include <fm_eth.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <exports.h>
diff --git a/board/freescale/ls2080ardb/ls2080ardb.c b/board/freescale/ls2080ardb/ls2080ardb.c
index 493040916381..3a154564f3fe 100644
--- a/board/freescale/ls2080ardb/ls2080ardb.c
+++ b/board/freescale/ls2080ardb/ls2080ardb.c
@@ -12,6 +12,7 @@
 #include <netdev.h>
 #include <fsl_ifc.h>
 #include <fsl_ddr.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <hwconfig.h>
diff --git a/board/freescale/lx2160a/eth_lx2160aqds.c b/board/freescale/lx2160a/eth_lx2160aqds.c
index 20dffcbf327a..5dfe7489ba88 100644
--- a/board/freescale/lx2160a/eth_lx2160aqds.c
+++ b/board/freescale/lx2160a/eth_lx2160aqds.c
@@ -17,6 +17,7 @@
 #include <miiphy.h>
 #include <phy.h>
 #include <fm_eth.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <exports.h>
diff --git a/board/freescale/lx2160a/eth_lx2160ardb.c b/board/freescale/lx2160a/eth_lx2160ardb.c
index 604922f84126..ea2c8c5647a7 100644
--- a/board/freescale/lx2160a/eth_lx2160ardb.c
+++ b/board/freescale/lx2160a/eth_lx2160ardb.c
@@ -14,6 +14,7 @@
 #include <miiphy.h>
 #include <phy.h>
 #include <fm_eth.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <exports.h>
diff --git a/board/freescale/lx2160a/lx2160a.c b/board/freescale/lx2160a/lx2160a.c
index 2133177cbe10..313085256418 100644
--- a/board/freescale/lx2160a/lx2160a.c
+++ b/board/freescale/lx2160a/lx2160a.c
@@ -8,6 +8,7 @@
 #include <display_options.h>
 #include <dm.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <dm/platform_data/serial_pl01x.h>
diff --git a/board/freescale/m5208evbe/m5208evbe.c b/board/freescale/m5208evbe/m5208evbe.c
index 7bfb4557dd5b..594728a2dd6c 100644
--- a/board/freescale/m5208evbe/m5208evbe.c
+++ b/board/freescale/m5208evbe/m5208evbe.c
@@ -10,6 +10,7 @@
 #include <config.h>
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/immap.h>
 #include <asm/io.h>
diff --git a/board/freescale/m52277evb/m52277evb.c b/board/freescale/m52277evb/m52277evb.c
index 510af33e4c3c..1ecdfb393124 100644
--- a/board/freescale/m52277evb/m52277evb.c
+++ b/board/freescale/m52277evb/m52277evb.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/immap.h>
 #include <asm/io.h>
diff --git a/board/freescale/m5235evb/m5235evb.c b/board/freescale/m5235evb/m5235evb.c
index e7c7a94036b5..6050d5c621d4 100644
--- a/board/freescale/m5235evb/m5235evb.c
+++ b/board/freescale/m5235evb/m5235evb.c
@@ -10,6 +10,7 @@
 #include <config.h>
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/immap.h>
 #include <asm/io.h>
diff --git a/board/freescale/m5249evb/m5249evb.c b/board/freescale/m5249evb/m5249evb.c
index 48c00791114d..9cb08d85cc7a 100644
--- a/board/freescale/m5249evb/m5249evb.c
+++ b/board/freescale/m5249evb/m5249evb.c
@@ -8,6 +8,7 @@
 #include <command.h>
 #include <init.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/immap.h>
 #include <linux/delay.h>
diff --git a/board/freescale/m5253demo/flash.c b/board/freescale/m5253demo/flash.c
index d37ba362b6cd..025e9dbcf52c 100644
--- a/board/freescale/m5253demo/flash.c
+++ b/board/freescale/m5253demo/flash.c
@@ -11,6 +11,7 @@
 #include <flash.h>
 #include <init.h>
 #include <irq_func.h>
+#include <stdio.h>
 #include <time.h>
 
 #include <asm/immap.h>
diff --git a/board/freescale/m5253demo/m5253demo.c b/board/freescale/m5253demo/m5253demo.c
index f593c31c842e..90c79a60f833 100644
--- a/board/freescale/m5253demo/m5253demo.c
+++ b/board/freescale/m5253demo/m5253demo.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/immap.h>
 #include <netdev.h>
diff --git a/board/freescale/m5275evb/m5275evb.c b/board/freescale/m5275evb/m5275evb.c
index 1c4fb7232afb..bd0901c0c5d4 100644
--- a/board/freescale/m5275evb/m5275evb.c
+++ b/board/freescale/m5275evb/m5275evb.c
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/immap.h>
 #include <asm/io.h>
diff --git a/board/freescale/m53017evb/m53017evb.c b/board/freescale/m53017evb/m53017evb.c
index c9f89353ce4b..e1c5dca70042 100644
--- a/board/freescale/m53017evb/m53017evb.c
+++ b/board/freescale/m53017evb/m53017evb.c
@@ -10,6 +10,7 @@
 #include <config.h>
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/immap.h>
 #include <asm/io.h>
diff --git a/board/freescale/m5329evb/m5329evb.c b/board/freescale/m5329evb/m5329evb.c
index 7a75b04dd0d2..ccbcbeb342e0 100644
--- a/board/freescale/m5329evb/m5329evb.c
+++ b/board/freescale/m5329evb/m5329evb.c
@@ -10,6 +10,7 @@
 #include <config.h>
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/immap.h>
 #include <asm/io.h>
diff --git a/board/freescale/m5373evb/m5373evb.c b/board/freescale/m5373evb/m5373evb.c
index cfa5ca4a477c..bd65509ac608 100644
--- a/board/freescale/m5373evb/m5373evb.c
+++ b/board/freescale/m5373evb/m5373evb.c
@@ -10,6 +10,7 @@
 #include <config.h>
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/immap.h>
 #include <asm/io.h>
diff --git a/board/freescale/m54418twr/m54418twr.c b/board/freescale/m54418twr/m54418twr.c
index ca8993197e3e..b931b869326b 100644
--- a/board/freescale/m54418twr/m54418twr.c
+++ b/board/freescale/m54418twr/m54418twr.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <init.h>
 #include <spi.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/immap.h>
diff --git a/board/freescale/m54451evb/m54451evb.c b/board/freescale/m54451evb/m54451evb.c
index a4ddc69166b3..deaf62530a1e 100644
--- a/board/freescale/m54451evb/m54451evb.c
+++ b/board/freescale/m54451evb/m54451evb.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <init.h>
 #include <spi.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/immap.h>
 #include <asm/io.h>
diff --git a/board/freescale/m54455evb/m54455evb.c b/board/freescale/m54455evb/m54455evb.c
index c749ee407e77..64ff296ad806 100644
--- a/board/freescale/m54455evb/m54455evb.c
+++ b/board/freescale/m54455evb/m54455evb.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <init.h>
 #include <pci.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/immap.h>
 #include <asm/io.h>
diff --git a/board/freescale/m547xevb/m547xevb.c b/board/freescale/m547xevb/m547xevb.c
index 1568f455e927..255a42baeee7 100644
--- a/board/freescale/m547xevb/m547xevb.c
+++ b/board/freescale/m547xevb/m547xevb.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <init.h>
 #include <pci.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/immap.h>
 #include <asm/io.h>
diff --git a/board/freescale/m548xevb/m548xevb.c b/board/freescale/m548xevb/m548xevb.c
index b62355a7ae7b..9228ccbb06f4 100644
--- a/board/freescale/m548xevb/m548xevb.c
+++ b/board/freescale/m548xevb/m548xevb.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <init.h>
 #include <pci.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/immap.h>
 #include <asm/io.h>
diff --git a/board/freescale/mpc8308rdb/mpc8308rdb.c b/board/freescale/mpc8308rdb/mpc8308rdb.c
index 810a39534196..7a8895c80123 100644
--- a/board/freescale/mpc8308rdb/mpc8308rdb.c
+++ b/board/freescale/mpc8308rdb/mpc8308rdb.c
@@ -10,6 +10,7 @@
 #include <init.h>
 #include <net.h>
 #include <spi.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
diff --git a/board/freescale/mpc8313erdb/mpc8313erdb.c b/board/freescale/mpc8313erdb/mpc8313erdb.c
index 8e820f4b2f1e..e23317597cac 100644
--- a/board/freescale/mpc8313erdb/mpc8313erdb.c
+++ b/board/freescale/mpc8313erdb/mpc8313erdb.c
@@ -14,6 +14,7 @@
 #endif
 #include <pci.h>
 #include <mpc83xx.h>
+#include <stdio.h>
 #include <vsc7385.h>
 #include <ns16550.h>
 #include <nand.h>
diff --git a/board/freescale/mpc8313erdb/sdram.c b/board/freescale/mpc8313erdb/sdram.c
index bd1d2f09d4f4..3d03da024099 100644
--- a/board/freescale/mpc8313erdb/sdram.c
+++ b/board/freescale/mpc8313erdb/sdram.c
@@ -11,6 +11,7 @@
 #include <init.h>
 #include <mpc83xx.h>
 #include <spd_sdram.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
 
diff --git a/board/freescale/mpc8315erdb/mpc8315erdb.c b/board/freescale/mpc8315erdb/mpc8315erdb.c
index 1563b6ccbb8c..c664e5ea80d0 100644
--- a/board/freescale/mpc8315erdb/mpc8315erdb.c
+++ b/board/freescale/mpc8315erdb/mpc8315erdb.c
@@ -11,6 +11,7 @@
 #include <i2c.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/ppc.h>
 #include <asm/u-boot.h>
diff --git a/board/freescale/mpc8315erdb/sdram.c b/board/freescale/mpc8315erdb/sdram.c
index dee7fb5abbab..84f8cd926ed4 100644
--- a/board/freescale/mpc8315erdb/sdram.c
+++ b/board/freescale/mpc8315erdb/sdram.c
@@ -11,6 +11,7 @@
 #include <init.h>
 #include <mpc83xx.h>
 #include <spd_sdram.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
 
diff --git a/board/freescale/mpc8323erdb/mpc8323erdb.c b/board/freescale/mpc8323erdb/mpc8323erdb.c
index 37f6a18dd281..d98b07e2daa2 100644
--- a/board/freescale/mpc8323erdb/mpc8323erdb.c
+++ b/board/freescale/mpc8323erdb/mpc8323erdb.c
@@ -19,6 +19,7 @@
 #include <i2c.h>
 #include <miiphy.h>
 #include <command.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/ppc.h>
 #include <asm/u-boot.h>
diff --git a/board/freescale/mpc832xemds/mpc832xemds.c b/board/freescale/mpc832xemds/mpc832xemds.c
index def1ad23b7a7..f8b81ee3cc31 100644
--- a/board/freescale/mpc832xemds/mpc832xemds.c
+++ b/board/freescale/mpc832xemds/mpc832xemds.c
@@ -16,6 +16,7 @@
 #if defined(CONFIG_PCI)
 #include <pci.h>
 #endif
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/mmu.h>
 #include <asm/ppc.h>
diff --git a/board/freescale/mpc832xemds/pci.c b/board/freescale/mpc832xemds/pci.c
index 79e4a5772c79..2d117a9de4fa 100644
--- a/board/freescale/mpc832xemds/pci.c
+++ b/board/freescale/mpc832xemds/pci.c
@@ -7,6 +7,7 @@
  * PCI Configuration space access support for MPC83xx PCI Bridge
  */
 #include <init.h>
+#include <stdio.h>
 #include <asm/mmu.h>
 #include <asm/io.h>
 #include <common.h>
diff --git a/board/freescale/mpc8349emds/ddr.c b/board/freescale/mpc8349emds/ddr.c
index e266c98bcef8..71615fe1ffd9 100644
--- a/board/freescale/mpc8349emds/ddr.c
+++ b/board/freescale/mpc8349emds/ddr.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/ppc.h>
 
 #include <fsl_ddr_sdram.h>
diff --git a/board/freescale/mpc8349emds/mpc8349emds.c b/board/freescale/mpc8349emds/mpc8349emds.c
index 4d06d9c05bf1..cec8b77de960 100644
--- a/board/freescale/mpc8349emds/mpc8349emds.c
+++ b/board/freescale/mpc8349emds/mpc8349emds.c
@@ -9,6 +9,7 @@
 #include <init.h>
 #include <ioports.h>
 #include <mpc83xx.h>
+#include <stdio.h>
 #include <asm/bitops.h>
 #include <asm/global_data.h>
 #include <asm/mpc8349_pci.h>
diff --git a/board/freescale/mpc8349emds/pci.c b/board/freescale/mpc8349emds/pci.c
index c9a8ced907f4..0408dfff554b 100644
--- a/board/freescale/mpc8349emds/pci.c
+++ b/board/freescale/mpc8349emds/pci.c
@@ -4,6 +4,7 @@
  */
 
 #include <init.h>
+#include <stdio.h>
 #include <asm/mmu.h>
 #include <asm/io.h>
 #include <asm/ppc.h>
diff --git a/board/freescale/mpc8349itx/mpc8349itx.c b/board/freescale/mpc8349itx/mpc8349itx.c
index 795bc9b3df43..c1ae8c5b9884 100644
--- a/board/freescale/mpc8349itx/mpc8349itx.c
+++ b/board/freescale/mpc8349itx/mpc8349itx.c
@@ -11,6 +11,7 @@
 #include <mpc83xx.h>
 #include <i2c.h>
 #include <miiphy.h>
+#include <stdio.h>
 #include <vsc7385.h>
 #ifdef CONFIG_PCI
 #include <asm/mpc8349_pci.h>
diff --git a/board/freescale/mpc837xemds/mpc837xemds.c b/board/freescale/mpc837xemds/mpc837xemds.c
index 1b843a16881f..e45bc0d516c0 100644
--- a/board/freescale/mpc837xemds/mpc837xemds.c
+++ b/board/freescale/mpc837xemds/mpc837xemds.c
@@ -9,6 +9,7 @@
 #include <i2c.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/bitops.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/board/freescale/mpc837xerdb/mpc837xerdb.c b/board/freescale/mpc837xerdb/mpc837xerdb.c
index d8c6b3464ab4..448bc9b937a9 100644
--- a/board/freescale/mpc837xerdb/mpc837xerdb.c
+++ b/board/freescale/mpc837xerdb/mpc837xerdb.c
@@ -10,6 +10,7 @@
 #include <hwconfig.h>
 #include <i2c.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/bitops.h>
 #include <asm/global_data.h>
 #include <asm/ppc.h>
diff --git a/board/freescale/mpc8541cds/mpc8541cds.c b/board/freescale/mpc8541cds/mpc8541cds.c
index 6f02b8e7b8fc..ed71fa4d3846 100644
--- a/board/freescale/mpc8541cds/mpc8541cds.c
+++ b/board/freescale/mpc8541cds/mpc8541cds.c
@@ -9,6 +9,7 @@
 #include <display_options.h>
 #include <init.h>
 #include <pci.h>
+#include <stdio.h>
 #include <vsprintf.h>
 #include <asm/processor.h>
 #include <asm/mmu.h>
diff --git a/board/freescale/mpc8544ds/mpc8544ds.c b/board/freescale/mpc8544ds/mpc8544ds.c
index 06dc619cf932..a495e0818005 100644
--- a/board/freescale/mpc8544ds/mpc8544ds.c
+++ b/board/freescale/mpc8544ds/mpc8544ds.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <net.h>
 #include <pci.h>
+#include <stdio.h>
 #include <asm/processor.h>
 #include <asm/mmu.h>
 #include <asm/immap_85xx.h>
diff --git a/board/freescale/mpc8548cds/mpc8548cds.c b/board/freescale/mpc8548cds/mpc8548cds.c
index 941071594bd7..08ac02b4923f 100644
--- a/board/freescale/mpc8548cds/mpc8548cds.c
+++ b/board/freescale/mpc8548cds/mpc8548cds.c
@@ -10,6 +10,7 @@
 #include <init.h>
 #include <net.h>
 #include <pci.h>
+#include <stdio.h>
 #include <vsprintf.h>
 #include <asm/processor.h>
 #include <asm/mmu.h>
diff --git a/board/freescale/mpc8555cds/mpc8555cds.c b/board/freescale/mpc8555cds/mpc8555cds.c
index d66f56996666..e3c96ae162f5 100644
--- a/board/freescale/mpc8555cds/mpc8555cds.c
+++ b/board/freescale/mpc8555cds/mpc8555cds.c
@@ -7,6 +7,7 @@
 #include <display_options.h>
 #include <init.h>
 #include <pci.h>
+#include <stdio.h>
 #include <vsprintf.h>
 #include <asm/processor.h>
 #include <asm/mmu.h>
diff --git a/board/freescale/mpc8568mds/mpc8568mds.c b/board/freescale/mpc8568mds/mpc8568mds.c
index 810bcff8b6bb..8ea51e1f2362 100644
--- a/board/freescale/mpc8568mds/mpc8568mds.c
+++ b/board/freescale/mpc8568mds/mpc8568mds.c
@@ -11,6 +11,7 @@
 #include <init.h>
 #include <log.h>
 #include <pci.h>
+#include <stdio.h>
 #include <asm/processor.h>
 #include <asm/mmu.h>
 #include <asm/immap_85xx.h>
diff --git a/board/freescale/mpc8569mds/mpc8569mds.c b/board/freescale/mpc8569mds/mpc8569mds.c
index 7f00ddc82a10..012fd54c3fe0 100644
--- a/board/freescale/mpc8569mds/mpc8569mds.c
+++ b/board/freescale/mpc8569mds/mpc8569mds.c
@@ -12,6 +12,7 @@
 #include <init.h>
 #include <log.h>
 #include <pci.h>
+#include <stdio.h>
 #include <asm/processor.h>
 #include <asm/mmu.h>
 #include <asm/cache.h>
diff --git a/board/freescale/mpc8572ds/ddr.c b/board/freescale/mpc8572ds/ddr.c
index dcce7d84581a..4015b475f065 100644
--- a/board/freescale/mpc8572ds/ddr.c
+++ b/board/freescale/mpc8572ds/ddr.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/ppc.h>
 
 #include <fsl_ddr_sdram.h>
diff --git a/board/freescale/mpc8572ds/mpc8572ds.c b/board/freescale/mpc8572ds/mpc8572ds.c
index d81a33083595..c62862f1db07 100644
--- a/board/freescale/mpc8572ds/mpc8572ds.c
+++ b/board/freescale/mpc8572ds/mpc8572ds.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <net.h>
 #include <pci.h>
+#include <stdio.h>
 #include <asm/processor.h>
 #include <asm/mmu.h>
 #include <asm/cache.h>
diff --git a/board/freescale/mpc8610hpcd/mpc8610hpcd.c b/board/freescale/mpc8610hpcd/mpc8610hpcd.c
index 157f850fef5e..d696e23bc53c 100644
--- a/board/freescale/mpc8610hpcd/mpc8610hpcd.c
+++ b/board/freescale/mpc8610hpcd/mpc8610hpcd.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <net.h>
 #include <pci.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/processor.h>
 #include <asm/immap_86xx.h>
diff --git a/board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c b/board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c
index 97c4623bca4f..642f6ca15c58 100644
--- a/board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c
+++ b/board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c
@@ -11,6 +11,7 @@
 #include <clock_legacy.h>
 #include <command.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <fsl_diu_fb.h>
 #include <asm/ppc.h>
diff --git a/board/freescale/mpc8641hpcn/ddr.c b/board/freescale/mpc8641hpcn/ddr.c
index 86031137693c..682e17ac56f2 100644
--- a/board/freescale/mpc8641hpcn/ddr.c
+++ b/board/freescale/mpc8641hpcn/ddr.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/ppc.h>
 
 #include <fsl_ddr_sdram.h>
diff --git a/board/freescale/mpc8641hpcn/mpc8641hpcn.c b/board/freescale/mpc8641hpcn/mpc8641hpcn.c
index c4a7a568cd17..209c354dda45 100644
--- a/board/freescale/mpc8641hpcn/mpc8641hpcn.c
+++ b/board/freescale/mpc8641hpcn/mpc8641hpcn.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <net.h>
 #include <pci.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/processor.h>
 #include <asm/immap_86xx.h>
diff --git a/board/freescale/mx23evk/mx23evk.c b/board/freescale/mx23evk/mx23evk.c
index b25bdb386016..96f2de11245f 100644
--- a/board/freescale/mx23evk/mx23evk.c
+++ b/board/freescale/mx23evk/mx23evk.c
@@ -13,6 +13,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/freescale/mx25pdk/mx25pdk.c b/board/freescale/mx25pdk/mx25pdk.c
index 4c2f6da69c25..8e0edb45c3ef 100644
--- a/board/freescale/mx25pdk/mx25pdk.c
+++ b/board/freescale/mx25pdk/mx25pdk.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
diff --git a/board/freescale/mx28evk/mx28evk.c b/board/freescale/mx28evk/mx28evk.c
index 72abf8739bcf..8ff35fbd02b8 100644
--- a/board/freescale/mx28evk/mx28evk.c
+++ b/board/freescale/mx28evk/mx28evk.c
@@ -14,6 +14,7 @@
 #include <common.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
diff --git a/board/freescale/mx35pdk/mx35pdk.c b/board/freescale/mx35pdk/mx35pdk.c
index 362a0391e4f9..940ada7b1675 100644
--- a/board/freescale/mx35pdk/mx35pdk.c
+++ b/board/freescale/mx35pdk/mx35pdk.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/u-boot.h>
diff --git a/board/freescale/mx51evk/mx51evk.c b/board/freescale/mx51evk/mx51evk.c
index f1625ebac5cd..0a6561799014 100644
--- a/board/freescale/mx51evk/mx51evk.c
+++ b/board/freescale/mx51evk/mx51evk.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
diff --git a/board/freescale/mx51evk/mx51evk_video.c b/board/freescale/mx51evk/mx51evk_video.c
index 2aa456f1c5f8..06fd4140a2ee 100644
--- a/board/freescale/mx51evk/mx51evk_video.c
+++ b/board/freescale/mx51evk/mx51evk_video.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <env.h>
+#include <stdio.h>
 #include <linux/list.h>
 #include <asm/gpio.h>
 #include <asm/arch/iomux-mx51.h>
diff --git a/board/freescale/mx53ard/mx53ard.c b/board/freescale/mx53ard/mx53ard.c
index 89aa16a097b1..cb4f063e95ae 100644
--- a/board/freescale/mx53ard/mx53ard.c
+++ b/board/freescale/mx53ard/mx53ard.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/freescale/mx53evk/mx53evk.c b/board/freescale/mx53evk/mx53evk.c
index 5567f3f01a93..37a946054082 100644
--- a/board/freescale/mx53evk/mx53evk.c
+++ b/board/freescale/mx53evk/mx53evk.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/freescale/mx53loco/mx53loco.c b/board/freescale/mx53loco/mx53loco.c
index 7a1cebbebfd8..67bb279104d3 100644
--- a/board/freescale/mx53loco/mx53loco.c
+++ b/board/freescale/mx53loco/mx53loco.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/freescale/mx53loco/mx53loco_video.c b/board/freescale/mx53loco/mx53loco_video.c
index 67c279adf181..45a40a8959c9 100644
--- a/board/freescale/mx53loco/mx53loco_video.c
+++ b/board/freescale/mx53loco/mx53loco_video.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <env.h>
+#include <stdio.h>
 #include <linux/list.h>
 #include <asm/gpio.h>
 #include <asm/arch/iomux-mx53.h>
diff --git a/board/freescale/mx53smd/mx53smd.c b/board/freescale/mx53smd/mx53smd.c
index 335146604a51..6a6549341407 100644
--- a/board/freescale/mx53smd/mx53smd.c
+++ b/board/freescale/mx53smd/mx53smd.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/freescale/mx6memcal/mx6memcal.c b/board/freescale/mx6memcal/mx6memcal.c
index 1cc744fa9ba0..d24800d3f9d4 100644
--- a/board/freescale/mx6memcal/mx6memcal.c
+++ b/board/freescale/mx6memcal/mx6memcal.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/global_data.h>
 
diff --git a/board/freescale/mx6memcal/spl.c b/board/freescale/mx6memcal/spl.c
index 87020e3ffb15..f10b12cedc23 100644
--- a/board/freescale/mx6memcal/spl.c
+++ b/board/freescale/mx6memcal/spl.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/iomux.h>
diff --git a/board/freescale/mx6qarm2/mx6qarm2.c b/board/freescale/mx6qarm2/mx6qarm2.c
index 03cceefb60d1..bdc2e2a146b3 100644
--- a/board/freescale/mx6qarm2/mx6qarm2.c
+++ b/board/freescale/mx6qarm2/mx6qarm2.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/freescale/mx6sabreauto/mx6sabreauto.c b/board/freescale/mx6sabreauto/mx6sabreauto.c
index 98b3ab4b7656..359f5bca17c6 100644
--- a/board/freescale/mx6sabreauto/mx6sabreauto.c
+++ b/board/freescale/mx6sabreauto/mx6sabreauto.c
@@ -9,6 +9,7 @@
 #include <image.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
diff --git a/board/freescale/mx6sabresd/mx6sabresd.c b/board/freescale/mx6sabresd/mx6sabresd.c
index 40423d77c4be..01d6340c624c 100644
--- a/board/freescale/mx6sabresd/mx6sabresd.c
+++ b/board/freescale/mx6sabresd/mx6sabresd.c
@@ -8,6 +8,7 @@
 #include <image.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux.h>
diff --git a/board/freescale/mx6slevk/mx6slevk.c b/board/freescale/mx6slevk/mx6slevk.c
index 781c5392655f..5e6072dd424d 100644
--- a/board/freescale/mx6slevk/mx6slevk.c
+++ b/board/freescale/mx6slevk/mx6slevk.c
@@ -7,6 +7,7 @@
 
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/crm_regs.h>
diff --git a/board/freescale/mx6sllevk/mx6sllevk.c b/board/freescale/mx6sllevk/mx6sllevk.c
index b4fddafe6402..f5aeaa41e746 100644
--- a/board/freescale/mx6sllevk/mx6sllevk.c
+++ b/board/freescale/mx6sllevk/mx6sllevk.c
@@ -4,6 +4,7 @@
  */
 
 #include <init.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/iomux.h>
diff --git a/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c b/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c
index f705505b518a..d5621c5e0422 100644
--- a/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c
+++ b/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c
@@ -7,6 +7,7 @@
 
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/iomux.h>
diff --git a/board/freescale/mx6sxsabresd/mx6sxsabresd.c b/board/freescale/mx6sxsabresd/mx6sxsabresd.c
index d8f4e915cfd4..361c3c2c517d 100644
--- a/board/freescale/mx6sxsabresd/mx6sxsabresd.c
+++ b/board/freescale/mx6sxsabresd/mx6sxsabresd.c
@@ -7,6 +7,7 @@
 
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/iomux.h>
diff --git a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
index 6805d949f17f..bb6c2474abd6 100644
--- a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
+++ b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
@@ -5,6 +5,7 @@
 
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/freescale/mx6ullevk/mx6ullevk.c b/board/freescale/mx6ullevk/mx6ullevk.c
index 86c11c7bd3a5..fbd14920519f 100644
--- a/board/freescale/mx6ullevk/mx6ullevk.c
+++ b/board/freescale/mx6ullevk/mx6ullevk.c
@@ -4,6 +4,7 @@
  */
 
 #include <init.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/freescale/mx7dsabresd/mx7dsabresd.c b/board/freescale/mx7dsabresd/mx7dsabresd.c
index 2777ae13bce0..8bf430670c55 100644
--- a/board/freescale/mx7dsabresd/mx7dsabresd.c
+++ b/board/freescale/mx7dsabresd/mx7dsabresd.c
@@ -5,6 +5,7 @@
 
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/mx7-pins.h>
diff --git a/board/freescale/mx7ulp_evk/mx7ulp_evk.c b/board/freescale/mx7ulp_evk/mx7ulp_evk.c
index 1e4053edbe75..da3f9e72d615 100644
--- a/board/freescale/mx7ulp_evk/mx7ulp_evk.c
+++ b/board/freescale/mx7ulp_evk/mx7ulp_evk.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <fdt_support.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
diff --git a/board/freescale/p1010rdb/ddr.c b/board/freescale/p1010rdb/ddr.c
index a2133c2ad39a..9ecba83a393e 100644
--- a/board/freescale/p1010rdb/ddr.c
+++ b/board/freescale/p1010rdb/ddr.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/mmu.h>
diff --git a/board/freescale/p1010rdb/p1010rdb.c b/board/freescale/p1010rdb/p1010rdb.c
index f209f72fdbe4..a57b564f5efc 100644
--- a/board/freescale/p1010rdb/p1010rdb.c
+++ b/board/freescale/p1010rdb/p1010rdb.c
@@ -9,6 +9,7 @@
 #include <image.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/processor.h>
 #include <asm/mmu.h>
diff --git a/board/freescale/p1010rdb/spl.c b/board/freescale/p1010rdb/spl.c
index 3e35b49f3d2f..a11ec6b0c981 100644
--- a/board/freescale/p1010rdb/spl.c
+++ b/board/freescale/p1010rdb/spl.c
@@ -15,6 +15,7 @@
 #include <i2c.h>
 #include <fsl_esdhc.h>
 #include <spi_flash.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
diff --git a/board/freescale/p1010rdb/spl_minimal.c b/board/freescale/p1010rdb/spl_minimal.c
index 0bb2c8387204..4d72665dbb78 100644
--- a/board/freescale/p1010rdb/spl_minimal.c
+++ b/board/freescale/p1010rdb/spl_minimal.c
@@ -5,6 +5,7 @@
 #include <common.h>
 #include <init.h>
 #include <mpc85xx.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <ns16550.h>
 #include <nand.h>
diff --git a/board/freescale/p1023rdb/p1023rdb.c b/board/freescale/p1023rdb/p1023rdb.c
index c760b4c83bd8..e7862d18498b 100644
--- a/board/freescale/p1023rdb/p1023rdb.c
+++ b/board/freescale/p1023rdb/p1023rdb.c
@@ -13,6 +13,7 @@
 #include <init.h>
 #include <net.h>
 #include <pci.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/cache.h>
diff --git a/board/freescale/p1_p2_rdb_pc/ddr.c b/board/freescale/p1_p2_rdb_pc/ddr.c
index 2c7e5fe4c7b9..8de6f7b54820 100644
--- a/board/freescale/p1_p2_rdb_pc/ddr.c
+++ b/board/freescale/p1_p2_rdb_pc/ddr.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <vsprintf.h>
 #include <asm/mmu.h>
 #include <asm/immap_85xx.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 f4ab4492536f..648ff4c3e792 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
@@ -14,6 +14,7 @@
 #include <net.h>
 #include <pci.h>
 #include <i2c.h>
+#include <stdio.h>
 #include <asm/processor.h>
 #include <asm/mmu.h>
 #include <asm/cache.h>
diff --git a/board/freescale/p1_p2_rdb_pc/spl.c b/board/freescale/p1_p2_rdb_pc/spl.c
index 9b687bc4c08d..f69f7fced31c 100644
--- a/board/freescale/p1_p2_rdb_pc/spl.c
+++ b/board/freescale/p1_p2_rdb_pc/spl.c
@@ -16,6 +16,7 @@
 #include <i2c.h>
 #include <fsl_esdhc.h>
 #include <spi_flash.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
diff --git a/board/freescale/p1_p2_rdb_pc/spl_minimal.c b/board/freescale/p1_p2_rdb_pc/spl_minimal.c
index ced5f3c3b5d5..3079e21d1c14 100644
--- a/board/freescale/p1_p2_rdb_pc/spl_minimal.c
+++ b/board/freescale/p1_p2_rdb_pc/spl_minimal.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <init.h>
 #include <ns16550.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <nand.h>
 #include <linux/compiler.h>
diff --git a/board/freescale/p2041rdb/cpld.c b/board/freescale/p2041rdb/cpld.c
index 84f1b3c77100..256cdc684247 100644
--- a/board/freescale/p2041rdb/cpld.c
+++ b/board/freescale/p2041rdb/cpld.c
@@ -13,6 +13,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/string.h>
 
diff --git a/board/freescale/p2041rdb/ddr.c b/board/freescale/p2041rdb/ddr.c
index 12d58fa52b45..e95f0481be22 100644
--- a/board/freescale/p2041rdb/ddr.c
+++ b/board/freescale/p2041rdb/ddr.c
@@ -8,6 +8,7 @@
 #include <hwconfig.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/mmu.h>
 #include <asm/ppc.h>
diff --git a/board/freescale/p2041rdb/eth.c b/board/freescale/p2041rdb/eth.c
index a49365311201..0faa288f003e 100644
--- a/board/freescale/p2041rdb/eth.c
+++ b/board/freescale/p2041rdb/eth.c
@@ -15,6 +15,7 @@
 #include <common.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/fsl_serdes.h>
 #include <fm_eth.h>
 #include <fsl_mdio.h>
diff --git a/board/freescale/p2041rdb/p2041rdb.c b/board/freescale/p2041rdb/p2041rdb.c
index 2f8e9c12551b..ca2a8eb95973 100644
--- a/board/freescale/p2041rdb/p2041rdb.c
+++ b/board/freescale/p2041rdb/p2041rdb.c
@@ -10,6 +10,7 @@
 #include <image.h>
 #include <init.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/compiler.h>
diff --git a/board/freescale/qemu-ppce500/qemu-ppce500.c b/board/freescale/qemu-ppce500/qemu-ppce500.c
index c99f998fbb31..6588804fbbaa 100644
--- a/board/freescale/qemu-ppce500/qemu-ppce500.c
+++ b/board/freescale/qemu-ppce500/qemu-ppce500.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <net.h>
 #include <pci.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/global_data.h>
 #include <asm/processor.h>
diff --git a/board/freescale/s32v234evb/s32v234evb.c b/board/freescale/s32v234evb/s32v234evb.c
index 846a89849f02..4f390aa0de55 100644
--- a/board/freescale/s32v234evb/s32v234evb.c
+++ b/board/freescale/s32v234evb/s32v234evb.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/freescale/t102xrdb/cpld.c b/board/freescale/t102xrdb/cpld.c
index 5dc3e54bbc37..601afbc336d1 100644
--- a/board/freescale/t102xrdb/cpld.c
+++ b/board/freescale/t102xrdb/cpld.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/string.h>
 #include "cpld.h"
diff --git a/board/freescale/t102xrdb/ddr.c b/board/freescale/t102xrdb/ddr.c
index 3ec4a26948be..8afb71c4c80a 100644
--- a/board/freescale/t102xrdb/ddr.c
+++ b/board/freescale/t102xrdb/ddr.c
@@ -8,6 +8,7 @@
 #include <hwconfig.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/mmu.h>
 #include <asm/ppc.h>
diff --git a/board/freescale/t102xrdb/eth_t102xrdb.c b/board/freescale/t102xrdb/eth_t102xrdb.c
index 414a45f2c0a3..95d49e26f449 100644
--- a/board/freescale/t102xrdb/eth_t102xrdb.c
+++ b/board/freescale/t102xrdb/eth_t102xrdb.c
@@ -10,6 +10,7 @@
 #include <fdt_support.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/mmu.h>
 #include <asm/processor.h>
 #include <asm/immap_85xx.h>
diff --git a/board/freescale/t102xrdb/spl.c b/board/freescale/t102xrdb/spl.c
index 6596f2cfafee..1d8da1116680 100644
--- a/board/freescale/t102xrdb/spl.c
+++ b/board/freescale/t102xrdb/spl.c
@@ -14,6 +14,7 @@
 #include <mmc.h>
 #include <fsl_esdhc.h>
 #include <spi_flash.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
diff --git a/board/freescale/t102xrdb/t102xrdb.c b/board/freescale/t102xrdb/t102xrdb.c
index 5f98f768cc3d..cdecfb087065 100644
--- a/board/freescale/t102xrdb/t102xrdb.c
+++ b/board/freescale/t102xrdb/t102xrdb.c
@@ -12,6 +12,7 @@
 #include <image.h>
 #include <init.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/compiler.h>
diff --git a/board/freescale/t104xrdb/cpld.c b/board/freescale/t104xrdb/cpld.c
index 6ab7bbdd3322..c2dfb17a1cf9 100644
--- a/board/freescale/t104xrdb/cpld.c
+++ b/board/freescale/t104xrdb/cpld.c
@@ -12,6 +12,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/string.h>
 
diff --git a/board/freescale/t104xrdb/ddr.c b/board/freescale/t104xrdb/ddr.c
index 7d02596a24d1..6a6bacf2d4fc 100644
--- a/board/freescale/t104xrdb/ddr.c
+++ b/board/freescale/t104xrdb/ddr.c
@@ -8,6 +8,7 @@
 #include <hwconfig.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/mmu.h>
 #include <asm/ppc.h>
diff --git a/board/freescale/t104xrdb/diu.c b/board/freescale/t104xrdb/diu.c
index 25c8597202a2..4e941fbfc931 100644
--- a/board/freescale/t104xrdb/diu.c
+++ b/board/freescale/t104xrdb/diu.c
@@ -5,6 +5,7 @@
  */
 
 #include <clock_legacy.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <common.h>
 #include <command.h>
diff --git a/board/freescale/t104xrdb/eth.c b/board/freescale/t104xrdb/eth.c
index a554083470e9..fbd247e301b2 100644
--- a/board/freescale/t104xrdb/eth.c
+++ b/board/freescale/t104xrdb/eth.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/fsl_serdes.h>
 #include <asm/immap_85xx.h>
 #include <fm_eth.h>
diff --git a/board/freescale/t104xrdb/spl.c b/board/freescale/t104xrdb/spl.c
index 6551b2248eff..4a3f02d10fc1 100644
--- a/board/freescale/t104xrdb/spl.c
+++ b/board/freescale/t104xrdb/spl.c
@@ -14,6 +14,7 @@
 #include <mmc.h>
 #include <fsl_esdhc.h>
 #include <spi_flash.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
diff --git a/board/freescale/t104xrdb/t104xrdb.c b/board/freescale/t104xrdb/t104xrdb.c
index fc4964783977..292c31246c44 100644
--- a/board/freescale/t104xrdb/t104xrdb.c
+++ b/board/freescale/t104xrdb/t104xrdb.c
@@ -12,6 +12,7 @@
 #include <init.h>
 #include <log.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/compiler.h>
diff --git a/board/freescale/t208xqds/ddr.c b/board/freescale/t208xqds/ddr.c
index 336c6e7d0da1..382f1ebe53ed 100644
--- a/board/freescale/t208xqds/ddr.c
+++ b/board/freescale/t208xqds/ddr.c
@@ -8,6 +8,7 @@
 #include <hwconfig.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/mmu.h>
 #include <asm/ppc.h>
diff --git a/board/freescale/t208xqds/eth_t208xqds.c b/board/freescale/t208xqds/eth_t208xqds.c
index 61dc408c5b17..f60e2047759c 100644
--- a/board/freescale/t208xqds/eth_t208xqds.c
+++ b/board/freescale/t208xqds/eth_t208xqds.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/mmu.h>
 #include <asm/processor.h>
 #include <asm/immap_85xx.h>
diff --git a/board/freescale/t208xqds/spl.c b/board/freescale/t208xqds/spl.c
index bf1b049af7f6..7902b746d565 100644
--- a/board/freescale/t208xqds/spl.c
+++ b/board/freescale/t208xqds/spl.c
@@ -14,6 +14,7 @@
 #include <mmc.h>
 #include <fsl_esdhc.h>
 #include <spi_flash.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
diff --git a/board/freescale/t208xqds/t208xqds.c b/board/freescale/t208xqds/t208xqds.c
index a0ead05e37d4..c25b0a72ce5e 100644
--- a/board/freescale/t208xqds/t208xqds.c
+++ b/board/freescale/t208xqds/t208xqds.c
@@ -13,6 +13,7 @@
 #include <init.h>
 #include <log.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/compiler.h>
diff --git a/board/freescale/t208xrdb/ddr.c b/board/freescale/t208xrdb/ddr.c
index aeb51d28737d..2a375619116b 100644
--- a/board/freescale/t208xrdb/ddr.c
+++ b/board/freescale/t208xrdb/ddr.c
@@ -8,6 +8,7 @@
 #include <hwconfig.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/mmu.h>
 #include <asm/ppc.h>
diff --git a/board/freescale/t208xrdb/eth_t208xrdb.c b/board/freescale/t208xrdb/eth_t208xrdb.c
index de997db78f74..fda113f01562 100644
--- a/board/freescale/t208xrdb/eth_t208xrdb.c
+++ b/board/freescale/t208xrdb/eth_t208xrdb.c
@@ -10,6 +10,7 @@
 #include <fdt_support.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/mmu.h>
 #include <asm/processor.h>
 #include <asm/immap_85xx.h>
diff --git a/board/freescale/t208xrdb/spl.c b/board/freescale/t208xrdb/spl.c
index 234fd145e7dd..8ef46a09c958 100644
--- a/board/freescale/t208xrdb/spl.c
+++ b/board/freescale/t208xrdb/spl.c
@@ -14,6 +14,7 @@
 #include <mmc.h>
 #include <fsl_esdhc.h>
 #include <spi_flash.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
diff --git a/board/freescale/t208xrdb/t208xrdb.c b/board/freescale/t208xrdb/t208xrdb.c
index e09f0efdda62..bc5152810efd 100644
--- a/board/freescale/t208xrdb/t208xrdb.c
+++ b/board/freescale/t208xrdb/t208xrdb.c
@@ -11,6 +11,7 @@
 #include <image.h>
 #include <init.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/compiler.h>
diff --git a/board/freescale/t4rdb/cpld.c b/board/freescale/t4rdb/cpld.c
index 5bc149f4ab67..023b39852a78 100644
--- a/board/freescale/t4rdb/cpld.c
+++ b/board/freescale/t4rdb/cpld.c
@@ -16,6 +16,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/string.h>
 
diff --git a/board/freescale/t4rdb/ddr.c b/board/freescale/t4rdb/ddr.c
index 60d3c54437a5..037190ff11dc 100644
--- a/board/freescale/t4rdb/ddr.c
+++ b/board/freescale/t4rdb/ddr.c
@@ -8,6 +8,7 @@
 #include <hwconfig.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/mmu.h>
 #include <asm/ppc.h>
diff --git a/board/freescale/t4rdb/eth.c b/board/freescale/t4rdb/eth.c
index a81b3be878bc..def5e6c8b32c 100644
--- a/board/freescale/t4rdb/eth.c
+++ b/board/freescale/t4rdb/eth.c
@@ -10,6 +10,7 @@
 #include <fdt_support.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/mmu.h>
 #include <asm/processor.h>
 #include <asm/cache.h>
diff --git a/board/freescale/t4rdb/spl.c b/board/freescale/t4rdb/spl.c
index 186327a3cde1..8ae19d006850 100644
--- a/board/freescale/t4rdb/spl.c
+++ b/board/freescale/t4rdb/spl.c
@@ -10,6 +10,7 @@
 #include <console.h>
 #include <env_internal.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/spl.h>
 #include <malloc.h>
diff --git a/board/freescale/t4rdb/t4240rdb.c b/board/freescale/t4rdb/t4240rdb.c
index bee6d42c83dd..3cd6eb8e8bb6 100644
--- a/board/freescale/t4rdb/t4240rdb.c
+++ b/board/freescale/t4rdb/t4240rdb.c
@@ -11,6 +11,7 @@
 #include <image.h>
 #include <init.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/compiler.h>
diff --git a/board/freescale/vf610twr/vf610twr.c b/board/freescale/vf610twr/vf610twr.c
index 3641e5fb92f0..342feb42d17a 100644
--- a/board/freescale/vf610twr/vf610twr.c
+++ b/board/freescale/vf610twr/vf610twr.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/gardena/smart-gateway-mt7688/board.c b/board/gardena/smart-gateway-mt7688/board.c
index 0c36f53a5a70..03a9e43875a1 100644
--- a/board/gardena/smart-gateway-mt7688/board.c
+++ b/board/gardena/smart-gateway-mt7688/board.c
@@ -15,6 +15,7 @@
 #include <net.h>
 #include <spi.h>
 #include <spi_flash.h>
+#include <stdio.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 ec42d5aa093f..3f7ce584528f 100644
--- a/board/gateworks/gw_ventana/common.c
+++ b/board/gateworks/gw_ventana/common.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.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 325527ceee13..efaff179a2c5 100644
--- a/board/gateworks/gw_ventana/eeprom.c
+++ b/board/gateworks/gw_ventana/eeprom.c
@@ -11,6 +11,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.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 54ca5da4fa02..143493c24ab3 100644
--- a/board/gateworks/gw_ventana/gsc.c
+++ b/board/gateworks/gw_ventana/gsc.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <command.h>
 #include <log.h>
+#include <stdio.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 84de3c3bb0f7..a8b012dda736 100644
--- a/board/gateworks/gw_ventana/gw_ventana.c
+++ b/board/gateworks/gw_ventana/gw_ventana.c
@@ -9,6 +9,7 @@
 #include <init.h>
 #include <log.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/iomux.h>
diff --git a/board/gateworks/gw_ventana/gw_ventana_spl.c b/board/gateworks/gw_ventana/gw_ventana_spl.c
index e0e4bac16126..11a845e4f0e0 100644
--- a/board/gateworks/gw_ventana/gw_ventana_spl.c
+++ b/board/gateworks/gw_ventana/gw_ventana_spl.c
@@ -9,6 +9,7 @@
 #include <hang.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/mx6-ddr.h>
diff --git a/board/gdsys/a38x/controlcenterdc.c b/board/gdsys/a38x/controlcenterdc.c
index ba57a272187e..fb371be4926d 100644
--- a/board/gdsys/a38x/controlcenterdc.c
+++ b/board/gdsys/a38x/controlcenterdc.c
@@ -10,6 +10,7 @@
 #include <init.h>
 #include <miiphy.h>
 #include <net.h>
+#include <stdio.h>
 #include <tpm-v1.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/board/gdsys/a38x/hre.c b/board/gdsys/a38x/hre.c
index 615973894a1a..1e7d7e71f12e 100644
--- a/board/gdsys/a38x/hre.c
+++ b/board/gdsys/a38x/hre.c
@@ -10,6 +10,7 @@
 #include <fs.h>
 #include <i2c.h>
 #include <mmc.h>
+#include <stdio.h>
 #include <tpm-v1.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
diff --git a/board/gdsys/a38x/hydra.c b/board/gdsys/a38x/hydra.c
index 495a97691881..bd66cd52b86b 100644
--- a/board/gdsys/a38x/hydra.c
+++ b/board/gdsys/a38x/hydra.c
@@ -2,6 +2,7 @@
 #include <command.h>
 #include <console.h> /* ctrlc */
 #include <pci.h>
+#include <stdio.h>
 #include <asm/io.h>
 
 #include "hydra.h"
diff --git a/board/gdsys/a38x/ihs_phys.c b/board/gdsys/a38x/ihs_phys.c
index 31a4aa26b507..4d6d0da76fae 100644
--- a/board/gdsys/a38x/ihs_phys.c
+++ b/board/gdsys/a38x/ihs_phys.c
@@ -1,6 +1,7 @@
 #include <common.h>
 #include <dm.h>
 #include <miiphy.h>
+#include <stdio.h>
 #include <asm-generic/gpio.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/board/gdsys/a38x/keyprogram.c b/board/gdsys/a38x/keyprogram.c
index 38e25e8fd249..be41844dcf13 100644
--- a/board/gdsys/a38x/keyprogram.c
+++ b/board/gdsys/a38x/keyprogram.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <command.h>
 #include <env.h>
+#include <stdio.h>
 #include <tpm-v1.h>
 #include <malloc.h>
 #include <linux/ctype.h>
diff --git a/board/gdsys/a38x/spl.c b/board/gdsys/a38x/spl.c
index 84864d19746e..a06acd64f9f5 100644
--- a/board/gdsys/a38x/spl.c
+++ b/board/gdsys/a38x/spl.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <config.h>
+#include <stdio.h>
 #include <asm/arch/cpu.h>
 
 void spl_board_init(void)
diff --git a/board/gdsys/common/cmd_ioloop.c b/board/gdsys/common/cmd_ioloop.c
index 88bf9b2aadd5..72fef03d7b13 100644
--- a/board/gdsys/common/cmd_ioloop.c
+++ b/board/gdsys/common/cmd_ioloop.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <command.h>
 #include <console.h>
+#include <stdio.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/string.h>
diff --git a/board/gdsys/common/dp501.c b/board/gdsys/common/dp501.c
index 9ca69ebcbbe7..ae82274a896f 100644
--- a/board/gdsys/common/dp501.c
+++ b/board/gdsys/common/dp501.c
@@ -158,4 +158,5 @@ int dp501_probe(unsigned screen, bool power)
 	return 0;
 }
 
+#include <stdio.h>
 #endif /* CONFIG_GDSYS_LEGACY_DRIVERS */
diff --git a/board/gdsys/common/ihs_mdio.c b/board/gdsys/common/ihs_mdio.c
index 3a51338d92ab..ea91d767d5b6 100644
--- a/board/gdsys/common/ihs_mdio.c
+++ b/board/gdsys/common/ihs_mdio.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 
diff --git a/board/gdsys/common/ioep-fpga.c b/board/gdsys/common/ioep-fpga.c
index c758c8a885d0..a75de339b7a8 100644
--- a/board/gdsys/common/ioep-fpga.c
+++ b/board/gdsys/common/ioep-fpga.c
@@ -444,6 +444,7 @@ static int get_features(unsigned int fpga, struct fpga_features *features)
 	return 0;
 }
 
+#include <stdio.h>
 #include <linux/bitops.h>
 #include <linux/string.h>
 #endif
diff --git a/board/gdsys/common/osd.c b/board/gdsys/common/osd.c
index 9fe95f020598..e4941a94f310 100644
--- a/board/gdsys/common/osd.c
+++ b/board/gdsys/common/osd.c
@@ -503,5 +503,6 @@ U_BOOT_CMD(
 	") size_y(max. " __stringify(MAX_Y_CHARS) ")\n"
 );
 
+#include <stdio.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 120e1efc81e8..b73e2597299b 100644
--- a/board/gdsys/common/osd_cmd.c
+++ b/board/gdsys/common/osd_cmd.c
@@ -13,6 +13,7 @@
 #include <command.h>
 #include <dm.h>
 #include <hexdump.h>
+#include <stdio.h>
 #include <video_osd.h>
 #include <malloc.h>
 #include <linux/string.h>
diff --git a/board/gdsys/common/phy.c b/board/gdsys/common/phy.c
index a4104a9d202d..7b969853b3c0 100644
--- a/board/gdsys/common/phy.c
+++ b/board/gdsys/common/phy.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 
 #include <miiphy.h>
diff --git a/board/gdsys/mpc8308/gazerbeam.c b/board/gdsys/mpc8308/gazerbeam.c
index 9891baa11262..3258cc72179e 100644
--- a/board/gdsys/mpc8308/gazerbeam.c
+++ b/board/gdsys/mpc8308/gazerbeam.c
@@ -15,6 +15,7 @@
 #include <init.h>
 #include <miiphy.h>
 #include <misc.h>
+#include <stdio.h>
 #include <tpm-v1.h>
 #include <video_osd.h>
 #include <asm/global_data.h>
diff --git a/board/gdsys/mpc8308/hrcon.c b/board/gdsys/mpc8308/hrcon.c
index 64ac8f5e8eb0..961bf0af72e7 100644
--- a/board/gdsys/mpc8308/hrcon.c
+++ b/board/gdsys/mpc8308/hrcon.c
@@ -11,6 +11,7 @@
 #include <i2c.h>
 #include <init.h>
 #include <spi.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/board/gdsys/mpc8308/strider.c b/board/gdsys/mpc8308/strider.c
index d7d51f23829c..a9025cd55cfb 100644
--- a/board/gdsys/mpc8308/strider.c
+++ b/board/gdsys/mpc8308/strider.c
@@ -11,6 +11,7 @@
 #include <i2c.h>
 #include <init.h>
 #include <spi.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/board/gdsys/p1022/controlcenterd-id.c b/board/gdsys/p1022/controlcenterd-id.c
index 6ec49996ab99..ddf419edab4c 100644
--- a/board/gdsys/p1022/controlcenterd-id.c
+++ b/board/gdsys/p1022/controlcenterd-id.c
@@ -22,6 +22,7 @@
 #include <fs.h>
 #include <i2c.h>
 #include <mmc.h>
+#include <stdio.h>
 #include <tpm-v1.h>
 #include <linux/delay.h>
 #include <linux/string.h>
diff --git a/board/gdsys/p1022/controlcenterd.c b/board/gdsys/p1022/controlcenterd.c
index 0348b7100758..619e8073253d 100644
--- a/board/gdsys/p1022/controlcenterd.c
+++ b/board/gdsys/p1022/controlcenterd.c
@@ -28,6 +28,7 @@
 #include <init.h>
 #include <net.h>
 #include <pci.h>
+#include <stdio.h>
 #include <asm/processor.h>
 #include <asm/mmu.h>
 #include <asm/cache.h>
diff --git a/board/gdsys/p1022/ddr.c b/board/gdsys/p1022/ddr.c
index b2d44da4adcc..1ed8b9ff2831 100644
--- a/board/gdsys/p1022/ddr.c
+++ b/board/gdsys/p1022/ddr.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <i2c.h>
 #include <log.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 #include <fsl_ddr_sdram.h>
diff --git a/board/gdsys/p1022/diu.c b/board/gdsys/p1022/diu.c
index 5dcb80873bda..d96ac2d0ab6a 100644
--- a/board/gdsys/p1022/diu.c
+++ b/board/gdsys/p1022/diu.c
@@ -10,6 +10,7 @@
 #include <clock_legacy.h>
 #include <command.h>
 #include <log.h>
+#include <stdio.h>
 #include <linux/ctype.h>
 #include <asm/io.h>
 #include <asm/ppc.h>
diff --git a/board/ge/bx50v3/bx50v3.c b/board/ge/bx50v3/bx50v3.c
index 8df982450c22..0d88f8ad4a9e 100644
--- a/board/ge/bx50v3/bx50v3.c
+++ b/board/ge/bx50v3/bx50v3.c
@@ -7,6 +7,7 @@
 
 #include <image.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux.h>
diff --git a/board/ge/mx53ppd/mx53ppd.c b/board/ge/mx53ppd/mx53ppd.c
index 02d17952d589..a02c8a4de80f 100644
--- a/board/ge/mx53ppd/mx53ppd.c
+++ b/board/ge/mx53ppd/mx53ppd.c
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/ge/mx53ppd/mx53ppd_video.c b/board/ge/mx53ppd/mx53ppd_video.c
index 3240ed62aeb4..3c56120c0323 100644
--- a/board/ge/mx53ppd/mx53ppd_video.c
+++ b/board/ge/mx53ppd/mx53ppd_video.c
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <stdio.h>
 #include <linux/list.h>
 #include <asm/arch/iomux-mx53.h>
 #include <asm/mach-imx/video.h>
diff --git a/board/google/chromebook_coral/coral.c b/board/google/chromebook_coral/coral.c
index 12d4fe63cb0b..bcf8cb413420 100644
--- a/board/google/chromebook_coral/coral.c
+++ b/board/google/chromebook_coral/coral.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <stdio.h>
 
 int arch_misc_init(void)
 {
diff --git a/board/google/imx8mq_phanbell/spl.c b/board/google/imx8mq_phanbell/spl.c
index aee71acc98e9..0e822d01c4c2 100644
--- a/board/google/imx8mq_phanbell/spl.c
+++ b/board/google/imx8mq_phanbell/spl.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <hang.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <errno.h>
diff --git a/board/grinn/chiliboard/board.c b/board/grinn/chiliboard/board.c
index 12480f5729d6..d2544abab576 100644
--- a/board/grinn/chiliboard/board.c
+++ b/board/grinn/chiliboard/board.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/arch/chilisom.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/hardware.h>
diff --git a/board/grinn/liteboard/board.c b/board/grinn/liteboard/board.c
index 0617e7978c9f..fbbfbd8fb292 100644
--- a/board/grinn/liteboard/board.c
+++ b/board/grinn/liteboard/board.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <command.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/hisilicon/hikey/hikey.c b/board/hisilicon/hikey/hikey.c
index 0c6cdb5c9cfe..5525ec91872b 100644
--- a/board/hisilicon/hikey/hikey.c
+++ b/board/hisilicon/hikey/hikey.c
@@ -9,6 +9,7 @@
 #include <fdt_support.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <dm/platform_data/serial_pl01x.h>
diff --git a/board/hisilicon/hikey960/hikey960.c b/board/hisilicon/hikey960/hikey960.c
index a14b9e44fa5d..3282ee9824a2 100644
--- a/board/hisilicon/hikey960/hikey960.c
+++ b/board/hisilicon/hikey960/hikey960.c
@@ -8,6 +8,7 @@
 #include <cpu_func.h>
 #include <dm.h>
 #include <errno.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <init.h>
 #include <asm/global_data.h>
diff --git a/board/hisilicon/poplar/poplar.c b/board/hisilicon/poplar/poplar.c
index 486e37f90a6e..d0d8fa81b3bf 100644
--- a/board/hisilicon/poplar/poplar.c
+++ b/board/hisilicon/poplar/poplar.c
@@ -8,6 +8,7 @@
 #include <cpu_func.h>
 #include <dm.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/board/ids/ids8313/ids8313.c b/board/ids/ids8313/ids8313.c
index 2945d676bb38..da78f60d05b2 100644
--- a/board/ids/ids8313/ids8313.c
+++ b/board/ids/ids8313/ids8313.c
@@ -16,6 +16,7 @@
 #include <init.h>
 #include <mpc83xx.h>
 #include <spi.h>
+#include <stdio.h>
 #include <asm/bitops.h>
 #include <asm/global_data.h>
 #include <asm/ppc.h>
diff --git a/board/imgtec/boston/checkboard.c b/board/imgtec/boston/checkboard.c
index 1b8a47d2549f..9d3a90282a07 100644
--- a/board/imgtec/boston/checkboard.c
+++ b/board/imgtec/boston/checkboard.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 
 #include <asm/io.h>
 #include <asm/mipsregs.h>
diff --git a/board/imgtec/ci20/ci20.c b/board/imgtec/ci20/ci20.c
index 8f45ff89e5f4..11f140f172ea 100644
--- a/board/imgtec/ci20/ci20.c
+++ b/board/imgtec/ci20/ci20.c
@@ -11,6 +11,7 @@
 #include <init.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
diff --git a/board/imgtec/malta/malta.c b/board/imgtec/malta/malta.c
index 0a6ab37e12de..7ed9b53bc169 100644
--- a/board/imgtec/malta/malta.c
+++ b/board/imgtec/malta/malta.c
@@ -13,6 +13,7 @@
 #include <pci_gt64120.h>
 #include <pci_msc01.h>
 #include <rtc.h>
+#include <stdio.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 652f9755155f..8d1c4ade1c5c 100644
--- a/board/intel/edison/edison.c
+++ b/board/intel/edison/edison.c
@@ -7,6 +7,7 @@
 #include <env.h>
 #include <init.h>
 #include <mmc.h>
+#include <stdio.h>
 #include <u-boot/md5.h>
 #include <usb.h>
 #include <watchdog.h>
diff --git a/board/inversepath/usbarmory/usbarmory.c b/board/inversepath/usbarmory/usbarmory.c
index 2ad772c225f9..4eb30ae33746 100644
--- a/board/inversepath/usbarmory/usbarmory.c
+++ b/board/inversepath/usbarmory/usbarmory.c
@@ -11,6 +11,7 @@
 #include <command.h>
 #include <fs.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/isee/igep003x/board.c b/board/isee/igep003x/board.c
index 8844bb427200..a3ae87537210 100644
--- a/board/isee/igep003x/board.c
+++ b/board/isee/igep003x/board.c
@@ -13,6 +13,7 @@
 #include <net.h>
 #include <serial.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/omap.h>
diff --git a/board/k+p/kp_imx53/kp_id_rev.c b/board/k+p/kp_imx53/kp_id_rev.c
index 3e9315f55226..9a5c5cb64da6 100644
--- a/board/k+p/kp_imx53/kp_id_rev.c
+++ b/board/k+p/kp_imx53/kp_id_rev.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <env.h>
 #include <i2c.h>
+#include <stdio.h>
 #include <linux/string.h>
 #include "kp_id_rev.h"
 #include <net.h>
diff --git a/board/k+p/kp_imx53/kp_imx53.c b/board/k+p/kp_imx53/kp_imx53.c
index a5ee4a8a5192..a2dc296cc8b6 100644
--- a/board/k+p/kp_imx53/kp_imx53.c
+++ b/board/k+p/kp_imx53/kp_imx53.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/k+p/kp_imx6q_tpc/kp_imx6q_tpc.c b/board/k+p/kp_imx6q_tpc/kp_imx6q_tpc.c
index 110496d99505..917133dae921 100644
--- a/board/k+p/kp_imx6q_tpc/kp_imx6q_tpc.c
+++ b/board/k+p/kp_imx6q_tpc/kp_imx6q_tpc.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/k+p/kp_imx6q_tpc/kp_imx6q_tpc_spl.c b/board/k+p/kp_imx6q_tpc/kp_imx6q_tpc_spl.c
index 4bd2e8d0e877..d8d0b5c9aac6 100644
--- a/board/k+p/kp_imx6q_tpc/kp_imx6q_tpc_spl.c
+++ b/board/k+p/kp_imx6q_tpc/kp_imx6q_tpc_spl.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/keymile/common/common.c b/board/keymile/common/common.c
index bada40e1e628..5287ec205355 100644
--- a/board/keymile/common/common.c
+++ b/board/keymile/common/common.c
@@ -15,6 +15,7 @@
 #include <cli_hush.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdio.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 ef51e81996b0..f850c4d75633 100644
--- a/board/keymile/common/ivm.c
+++ b/board/keymile/common/ivm.c
@@ -8,6 +8,7 @@
 #include <cli_hush.h>
 #include <env.h>
 #include <i2c.h>
+#include <stdio.h>
 #include <linux/string.h>
 #include "common.h"
 
diff --git a/board/keymile/km83xx/km83xx.c b/board/keymile/km83xx/km83xx.c
index 040638934121..3bd9a1263fc2 100644
--- a/board/keymile/km83xx/km83xx.c
+++ b/board/keymile/km83xx/km83xx.c
@@ -22,6 +22,7 @@
 #include <mpc83xx.h>
 #include <i2c.h>
 #include <miiphy.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/mmu.h>
diff --git a/board/keymile/km83xx/km83xx_i2c.c b/board/keymile/km83xx/km83xx_i2c.c
index 104e30875d74..55c993481c22 100644
--- a/board/keymile/km83xx/km83xx_i2c.c
+++ b/board/keymile/km83xx/km83xx_i2c.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <i2c.h>
+#include <stdio.h>
 #include <asm/fsl_i2c.h>
 #include <asm/io.h>
 #include <linux/ctype.h>
diff --git a/board/keymile/km_arm/fpga_config.c b/board/keymile/km_arm/fpga_config.c
index abb5b7d60d0e..2e60221f2284 100644
--- a/board/keymile/km_arm/fpga_config.c
+++ b/board/keymile/km_arm/fpga_config.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <i2c.h>
+#include <stdio.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 
diff --git a/board/keymile/km_arm/km_arm.c b/board/keymile/km_arm/km_arm.c
index f4235b377fc0..bfea7a41ae2b 100644
--- a/board/keymile/km_arm/km_arm.c
+++ b/board/keymile/km_arm/km_arm.c
@@ -20,6 +20,7 @@
 #include <netdev.h>
 #include <miiphy.h>
 #include <spi.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
diff --git a/board/keymile/kmp204x/ddr.c b/board/keymile/kmp204x/ddr.c
index 77a00c55c951..80f824c3013e 100644
--- a/board/keymile/kmp204x/ddr.c
+++ b/board/keymile/kmp204x/ddr.c
@@ -11,6 +11,7 @@
 #include <hwconfig.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/mmu.h>
 #include <fsl_ddr_sdram.h>
diff --git a/board/keymile/kmp204x/eth.c b/board/keymile/kmp204x/eth.c
index 0cac3ecdad3c..a1e3a23cd75c 100644
--- a/board/keymile/kmp204x/eth.c
+++ b/board/keymile/kmp204x/eth.c
@@ -10,6 +10,7 @@
 #include <fm_eth.h>
 #include <fsl_mdio.h>
 #include <phy.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 
 int board_eth_init(struct bd_info *bis)
diff --git a/board/keymile/kmp204x/kmp204x.c b/board/keymile/kmp204x/kmp204x.c
index 1d491bda92f7..46316d345424 100644
--- a/board/keymile/kmp204x/kmp204x.c
+++ b/board/keymile/kmp204x/kmp204x.c
@@ -13,6 +13,7 @@
 #include <image.h>
 #include <init.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 #include <linux/compiler.h>
 #include <asm/mmu.h>
diff --git a/board/keymile/kmp204x/pci.c b/board/keymile/kmp204x/pci.c
index bfc853a2e824..169c8bc6edba 100644
--- a/board/keymile/kmp204x/pci.c
+++ b/board/keymile/kmp204x/pci.c
@@ -10,6 +10,7 @@
 #include <command.h>
 #include <init.h>
 #include <pci.h>
+#include <stdio.h>
 #include <asm/fsl_pci.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
diff --git a/board/keymile/secu1/socfpga.c b/board/keymile/secu1/socfpga.c
index dc04a21abea8..4afaf0dec729 100644
--- a/board/keymile/secu1/socfpga.c
+++ b/board/keymile/secu1/socfpga.c
@@ -4,6 +4,7 @@
  */
 #include <common.h>
 #include <i2c.h>
+#include <stdio.h>
 #include <asm/gpio.h>
 
 #include "../common/common.h"
diff --git a/board/kobol/helios4/helios4.c b/board/kobol/helios4/helios4.c
index 79cd4a4bc1f7..560a2e393a45 100644
--- a/board/kobol/helios4/helios4.c
+++ b/board/kobol/helios4/helios4.c
@@ -10,6 +10,7 @@
 #include <miiphy.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
diff --git a/board/kosagi/novena/novena.c b/board/kosagi/novena/novena.c
index 383d3705734b..114cd9e1f14a 100644
--- a/board/kosagi/novena/novena.c
+++ b/board/kosagi/novena/novena.c
@@ -11,6 +11,7 @@
 #include <eeprom.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <dm/device-internal.h>
 #include <ahci.h>
diff --git a/board/kosagi/novena/video.c b/board/kosagi/novena/video.c
index a96a877f5f21..8fc76d6347a5 100644
--- a/board/kosagi/novena/video.c
+++ b/board/kosagi/novena/video.c
@@ -11,6 +11,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
diff --git a/board/lego/ev3/legoev3.c b/board/lego/ev3/legoev3.c
index 5e5c8c1198f7..429dbbdcc458 100644
--- a/board/lego/ev3/legoev3.c
+++ b/board/lego/ev3/legoev3.c
@@ -17,6 +17,7 @@
 #include <init.h>
 #include <spi.h>
 #include <spi_flash.h>
+#include <stdio.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/pinmux_defs.h>
 #include <asm/global_data.h>
diff --git a/board/liebherr/display5/display5.c b/board/liebherr/display5/display5.c
index f98a92ad9cf4..727a4c036d3e 100644
--- a/board/liebherr/display5/display5.c
+++ b/board/liebherr/display5/display5.c
@@ -9,6 +9,7 @@
 #include <fdt_support.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
diff --git a/board/liebherr/display5/spl.c b/board/liebherr/display5/spl.c
index b910b3fbf0e5..3225ca0197b2 100644
--- a/board/liebherr/display5/spl.c
+++ b/board/liebherr/display5/spl.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <serial.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
diff --git a/board/liebherr/mccmon6/mccmon6.c b/board/liebherr/mccmon6/mccmon6.c
index 1b49526fba4f..5efd6b8d197f 100644
--- a/board/liebherr/mccmon6/mccmon6.c
+++ b/board/liebherr/mccmon6/mccmon6.c
@@ -8,6 +8,7 @@
 #include <env.h>
 #include <init.h>
 #include <serial.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/liebherr/mccmon6/spl.c b/board/liebherr/mccmon6/spl.c
index 69cf7def1f67..6eacd60ddca5 100644
--- a/board/liebherr/mccmon6/spl.c
+++ b/board/liebherr/mccmon6/spl.c
@@ -7,6 +7,7 @@
 
 #include <image.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux.h>
diff --git a/board/liebherr/xea/xea.c b/board/liebherr/xea/xea.c
index eee2e00b78ec..7dd6cc34156d 100644
--- a/board/liebherr/xea/xea.c
+++ b/board/liebherr/xea/xea.c
@@ -18,6 +18,7 @@
 #include <init.h>
 #include <log.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
diff --git a/board/maxbcm/maxbcm.c b/board/maxbcm/maxbcm.c
index e92132ad19a1..d56dc78e75e1 100644
--- a/board/maxbcm/maxbcm.c
+++ b/board/maxbcm/maxbcm.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <init.h>
 #include <miiphy.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
diff --git a/board/mediatek/mt7623/mt7623_rfb.c b/board/mediatek/mt7623/mt7623_rfb.c
index 090270b20d13..8d50e1f6149b 100644
--- a/board/mediatek/mt7623/mt7623_rfb.c
+++ b/board/mediatek/mt7623/mt7623_rfb.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <mmc.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/string.h>
 
diff --git a/board/menlo/m53menlo/m53menlo.c b/board/menlo/m53menlo/m53menlo.c
index 4c7fd84e281e..93186b9bca35 100644
--- a/board/menlo/m53menlo/m53menlo.c
+++ b/board/menlo/m53menlo/m53menlo.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <init.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/microchip/pic32mzda/pic32mzda.c b/board/microchip/pic32mzda/pic32mzda.c
index e7337deea7fa..96bb8c8f4252 100644
--- a/board/microchip/pic32mzda/pic32mzda.c
+++ b/board/microchip/pic32mzda/pic32mzda.c
@@ -12,6 +12,7 @@
 #include <clk.h>
 #include <init.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <dt-bindings/clock/microchip,clock.h>
 #include <mach/pic32.h>
 
diff --git a/board/mikrotik/crs3xx-98dx3236/crs3xx-98dx3236.c b/board/mikrotik/crs3xx-98dx3236/crs3xx-98dx3236.c
index 315169ba661d..676b0687fa46 100644
--- a/board/mikrotik/crs3xx-98dx3236/crs3xx-98dx3236.c
+++ b/board/mikrotik/crs3xx-98dx3236/crs3xx-98dx3236.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <i2c.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <linux/bitops.h>
diff --git a/board/mpc8308_p1m/mpc8308_p1m.c b/board/mpc8308_p1m/mpc8308_p1m.c
index 349d1ac88506..a2d5cb370377 100644
--- a/board/mpc8308_p1m/mpc8308_p1m.c
+++ b/board/mpc8308_p1m/mpc8308_p1m.c
@@ -8,6 +8,7 @@
 #include <i2c.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/ppc.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
diff --git a/board/novtech/meerkat96/meerkat96.c b/board/novtech/meerkat96/meerkat96.c
index 1edebe5db9be..5211055edd65 100644
--- a/board/novtech/meerkat96/meerkat96.c
+++ b/board/novtech/meerkat96/meerkat96.c
@@ -5,6 +5,7 @@
  */
 
 #include <init.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/mx7-pins.h>
diff --git a/board/nvidia/dalmore/dalmore.c b/board/nvidia/dalmore/dalmore.c
index 72511e401e3c..21b00855eb57 100644
--- a/board/nvidia/dalmore/dalmore.c
+++ b/board/nvidia/dalmore/dalmore.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/arch/pinmux.h>
 #include <asm/arch/gp_padctrl.h>
 #include "pinmux-config-dalmore.h"
diff --git a/board/nvidia/e2220-1170/e2220-1170.c b/board/nvidia/e2220-1170/e2220-1170.c
index b819b049f4b4..4c59b61e5da0 100644
--- a/board/nvidia/e2220-1170/e2220-1170.c
+++ b/board/nvidia/e2220-1170/e2220-1170.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <i2c.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/arch/gpio.h>
 #include <asm/arch/pinmux.h>
 #include "../p2571/max77620_init.h"
diff --git a/board/nvidia/p2371-0000/p2371-0000.c b/board/nvidia/p2371-0000/p2371-0000.c
index b819b049f4b4..4c59b61e5da0 100644
--- a/board/nvidia/p2371-0000/p2371-0000.c
+++ b/board/nvidia/p2371-0000/p2371-0000.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <i2c.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/arch/gpio.h>
 #include <asm/arch/pinmux.h>
 #include "../p2571/max77620_init.h"
diff --git a/board/nvidia/p2371-2180/p2371-2180.c b/board/nvidia/p2371-2180/p2371-2180.c
index 4631fa21f5bc..e20a74943ff7 100644
--- a/board/nvidia/p2371-2180/p2371-2180.c
+++ b/board/nvidia/p2371-2180/p2371-2180.c
@@ -10,6 +10,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/libfdt.h>
diff --git a/board/nvidia/p2571/p2571.c b/board/nvidia/p2571/p2571.c
index a4c4259eeaee..e8760ca51727 100644
--- a/board/nvidia/p2571/p2571.c
+++ b/board/nvidia/p2571/p2571.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <i2c.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/arch/gpio.h>
 #include <asm/arch/pinmux.h>
 #include <asm/gpio.h>
diff --git a/board/nvidia/p2771-0000/p2771-0000.c b/board/nvidia/p2771-0000/p2771-0000.c
index 14b151d8a165..c1d9b79d3e90 100644
--- a/board/nvidia/p2771-0000/p2771-0000.c
+++ b/board/nvidia/p2771-0000/p2771-0000.c
@@ -9,6 +9,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <asm/arch-tegra/cboot.h>
diff --git a/board/nvidia/p3450-0000/p3450-0000.c b/board/nvidia/p3450-0000/p3450-0000.c
index e40644388ecc..f6751b65ab9f 100644
--- a/board/nvidia/p3450-0000/p3450-0000.c
+++ b/board/nvidia/p3450-0000/p3450-0000.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <fdtdec.h>
 #include <i2c.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/libfdt.h>
diff --git a/board/phytec/pcl063/pcl063.c b/board/phytec/pcl063/pcl063.c
index b2e435f6908d..f274519c0734 100644
--- a/board/phytec/pcl063/pcl063.c
+++ b/board/phytec/pcl063/pcl063.c
@@ -7,6 +7,7 @@
  */
 
 #include <init.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/mx6-pins.h>
diff --git a/board/phytec/pcl063/spl.c b/board/phytec/pcl063/spl.c
index 175223dbc75c..662f3d7e12d3 100644
--- a/board/phytec/pcl063/spl.c
+++ b/board/phytec/pcl063/spl.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <init.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/io.h>
 #include <asm/arch/mx6-ddr.h>
diff --git a/board/phytec/pcm052/pcm052.c b/board/phytec/pcm052/pcm052.c
index f9cf4abd474b..4acfa7c1fbc5 100644
--- a/board/phytec/pcm052/pcm052.c
+++ b/board/phytec/pcm052/pcm052.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/phytec/pcm058/pcm058.c b/board/phytec/pcm058/pcm058.c
index a2304b764d6e..113369b5eacd 100644
--- a/board/phytec/pcm058/pcm058.c
+++ b/board/phytec/pcm058/pcm058.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/mx6-ddr.h>
 #include <asm/global_data.h>
diff --git a/board/phytec/pfla02/pfla02.c b/board/phytec/pfla02/pfla02.c
index 225fdd55cc58..57f30a04ed8c 100644
--- a/board/phytec/pfla02/pfla02.c
+++ b/board/phytec/pfla02/pfla02.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <log.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
diff --git a/board/phytec/phycore_rk3288/phycore-rk3288.c b/board/phytec/phycore_rk3288/phycore-rk3288.c
index f588fc3b0c70..141707c7b9a0 100644
--- a/board/phytec/phycore_rk3288/phycore-rk3288.c
+++ b/board/phytec/phycore_rk3288/phycore-rk3288.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <log.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <common.h>
diff --git a/board/phytium/durian/durian.c b/board/phytium/durian/durian.c
index 8a82a4591ac2..f694eb099136 100644
--- a/board/phytium/durian/durian.c
+++ b/board/phytium/durian/durian.c
@@ -10,6 +10,7 @@
 #include <cpu_func.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/armv8/mmu.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
diff --git a/board/ppcag/bg0900/bg0900.c b/board/ppcag/bg0900/bg0900.c
index 5fe7ed9a3a8f..9d2ad0b20140 100644
--- a/board/ppcag/bg0900/bg0900.c
+++ b/board/ppcag/bg0900/bg0900.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
diff --git a/board/qemu-mips/qemu-mips.c b/board/qemu-mips/qemu-mips.c
index 21437168044f..7d00176ffe6a 100644
--- a/board/qemu-mips/qemu-mips.c
+++ b/board/qemu-mips/qemu-mips.c
@@ -8,6 +8,7 @@
 #include <command.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/mipsregs.h>
 #include <asm/io.h>
diff --git a/board/qualcomm/dragonboard410c/dragonboard410c.c b/board/qualcomm/dragonboard410c/dragonboard410c.c
index bac8b1ff8993..9ba3dcb092ac 100644
--- a/board/qualcomm/dragonboard410c/dragonboard410c.c
+++ b/board/qualcomm/dragonboard410c/dragonboard410c.c
@@ -11,6 +11,7 @@
 #include <env.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <usb.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
diff --git a/board/qualcomm/dragonboard820c/dragonboard820c.c b/board/qualcomm/dragonboard820c/dragonboard820c.c
index 877e34c21017..dc70a8347f7f 100644
--- a/board/qualcomm/dragonboard820c/dragonboard820c.c
+++ b/board/qualcomm/dragonboard820c/dragonboard820c.c
@@ -7,6 +7,7 @@
 
 #include <cpu_func.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/arch/sysmap-apq8096.h>
 #include <env.h>
 #include <asm/cache.h>
diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c
index e76fc2cca94d..647ebde09a7c 100644
--- a/board/raspberrypi/rpi/rpi.c
+++ b/board/raspberrypi/rpi/rpi.c
@@ -14,6 +14,7 @@
 #include <lcd.h>
 #include <memalign.h>
 #include <mmc.h>
+#include <stdio.h>
 #include <asm/gpio.h>
 #include <asm/arch/mbox.h>
 #include <asm/arch/msg.h>
diff --git a/board/renesas/MigoR/migo_r.c b/board/renesas/MigoR/migo_r.c
index 61564a2f50f7..29cb1a82215b 100644
--- a/board/renesas/MigoR/migo_r.c
+++ b/board/renesas/MigoR/migo_r.c
@@ -13,6 +13,7 @@
 #include <init.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/processor.h>
 #include <asm/u-boot.h>
diff --git a/board/renesas/alt/alt_spl.c b/board/renesas/alt/alt_spl.c
index 2de236fc2989..02e3ed3b563c 100644
--- a/board/renesas/alt/alt_spl.c
+++ b/board/renesas/alt/alt_spl.c
@@ -9,6 +9,7 @@
 #include <cpu_func.h>
 #include <init.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <dm/platform_data/serial_sh.h>
 #include <asm/processor.h>
 #include <asm/mach-types.h>
diff --git a/board/renesas/blanche/blanche.c b/board/renesas/blanche/blanche.c
index 77d4cc8bd6c1..e91cffaa8c5a 100644
--- a/board/renesas/blanche/blanche.c
+++ b/board/renesas/blanche/blanche.c
@@ -10,6 +10,7 @@
 #include <cpu_func.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/arch/mmc.h>
 #include <asm/arch/rcar-mstp.h>
 #include <asm/arch/rmobile.h>
diff --git a/board/renesas/gose/gose_spl.c b/board/renesas/gose/gose_spl.c
index 624ba5db04e5..a181ffd6dcf8 100644
--- a/board/renesas/gose/gose_spl.c
+++ b/board/renesas/gose/gose_spl.c
@@ -9,6 +9,7 @@
 #include <cpu_func.h>
 #include <init.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <dm/platform_data/serial_sh.h>
 #include <asm/processor.h>
 #include <asm/mach-types.h>
diff --git a/board/renesas/koelsch/koelsch_spl.c b/board/renesas/koelsch/koelsch_spl.c
index 449bbfa7b81a..f5be6548738f 100644
--- a/board/renesas/koelsch/koelsch_spl.c
+++ b/board/renesas/koelsch/koelsch_spl.c
@@ -9,6 +9,7 @@
 #include <cpu_func.h>
 #include <init.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <dm/platform_data/serial_sh.h>
 #include <asm/processor.h>
 #include <asm/mach-types.h>
diff --git a/board/renesas/lager/lager_spl.c b/board/renesas/lager/lager_spl.c
index 1ca857c2c3d8..4dc47ecd5f73 100644
--- a/board/renesas/lager/lager_spl.c
+++ b/board/renesas/lager/lager_spl.c
@@ -9,6 +9,7 @@
 #include <cpu_func.h>
 #include <init.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <dm/platform_data/serial_sh.h>
 #include <asm/processor.h>
 #include <asm/mach-types.h>
diff --git a/board/renesas/porter/porter_spl.c b/board/renesas/porter/porter_spl.c
index f10c6cffc2b8..9b4e787b5f16 100644
--- a/board/renesas/porter/porter_spl.c
+++ b/board/renesas/porter/porter_spl.c
@@ -9,6 +9,7 @@
 #include <cpu_func.h>
 #include <init.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <dm/platform_data/serial_sh.h>
 #include <asm/processor.h>
 #include <asm/mach-types.h>
diff --git a/board/renesas/r2dplus/r2dplus.c b/board/renesas/r2dplus/r2dplus.c
index e637b4f98763..824b4d34deaf 100644
--- a/board/renesas/r2dplus/r2dplus.c
+++ b/board/renesas/r2dplus/r2dplus.c
@@ -9,6 +9,7 @@
 #include <init.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/processor.h>
 #include <asm/io.h>
 #include <asm/u-boot.h>
diff --git a/board/renesas/r7780mp/r7780mp.c b/board/renesas/r7780mp/r7780mp.c
index 28c99bf58547..0c9af494c232 100644
--- a/board/renesas/r7780mp/r7780mp.c
+++ b/board/renesas/r7780mp/r7780mp.c
@@ -8,6 +8,7 @@
 #include <ide.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/processor.h>
 #include <asm/io.h>
 #include <asm/pci.h>
diff --git a/board/renesas/rcar-common/common.c b/board/renesas/rcar-common/common.c
index 4f56627b8129..f4a0179b9f84 100644
--- a/board/renesas/rcar-common/common.c
+++ b/board/renesas/rcar-common/common.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <dm.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <dm/uclass-internal.h>
diff --git a/board/renesas/sh7752evb/sh7752evb.c b/board/renesas/sh7752evb/sh7752evb.c
index 4df154a2a910..5c65b0d692a8 100644
--- a/board/renesas/sh7752evb/sh7752evb.c
+++ b/board/renesas/sh7752evb/sh7752evb.c
@@ -10,6 +10,7 @@
 #include <init.h>
 #include <malloc.h>
 #include <net.h>
+#include <stdio.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 de719983979f..014fdf94b75f 100644
--- a/board/renesas/sh7753evb/sh7753evb.c
+++ b/board/renesas/sh7753evb/sh7753evb.c
@@ -10,6 +10,7 @@
 #include <init.h>
 #include <malloc.h>
 #include <net.h>
+#include <stdio.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 2adca5dc6dc9..80f296444064 100644
--- a/board/renesas/sh7757lcr/sh7757lcr.c
+++ b/board/renesas/sh7757lcr/sh7757lcr.c
@@ -10,6 +10,7 @@
 #include <init.h>
 #include <malloc.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/processor.h>
 #include <asm/io.h>
 #include <asm/mmc.h>
diff --git a/board/renesas/sh7763rdp/sh7763rdp.c b/board/renesas/sh7763rdp/sh7763rdp.c
index 73a53c1e5acf..2f11643bb101 100644
--- a/board/renesas/sh7763rdp/sh7763rdp.c
+++ b/board/renesas/sh7763rdp/sh7763rdp.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/processor.h>
 
diff --git a/board/renesas/silk/silk_spl.c b/board/renesas/silk/silk_spl.c
index f10f84a3cce0..27f59ce9e4dc 100644
--- a/board/renesas/silk/silk_spl.c
+++ b/board/renesas/silk/silk_spl.c
@@ -9,6 +9,7 @@
 #include <cpu_func.h>
 #include <init.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <dm/platform_data/serial_sh.h>
 #include <asm/processor.h>
 #include <asm/mach-types.h>
diff --git a/board/renesas/stout/cpld.c b/board/renesas/stout/cpld.c
index e6e0a3a3e3d1..366076a3b880 100644
--- a/board/renesas/stout/cpld.c
+++ b/board/renesas/stout/cpld.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <command.h>
 #include <cpu_func.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
 #include <linux/string.h>
diff --git a/board/renesas/stout/stout_spl.c b/board/renesas/stout/stout_spl.c
index 57c1fabaf3a8..f3a5dbc8d0bb 100644
--- a/board/renesas/stout/stout_spl.c
+++ b/board/renesas/stout/stout_spl.c
@@ -9,6 +9,7 @@
 #include <cpu_func.h>
 #include <init.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <dm/platform_data/serial_sh.h>
 #include <asm/processor.h>
 #include <asm/mach-types.h>
diff --git a/board/renesas/ulcb/cpld.c b/board/renesas/ulcb/cpld.c
index c9579a9dd173..b443c36b1dfb 100644
--- a/board/renesas/ulcb/cpld.c
+++ b/board/renesas/ulcb/cpld.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <stdio.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <dm.h>
diff --git a/board/rockchip/evb_rk3308/evb_rk3308.c b/board/rockchip/evb_rk3308/evb_rk3308.c
index e0c96fd70a28..efe6363a4134 100644
--- a/board/rockchip/evb_rk3308/evb_rk3308.c
+++ b/board/rockchip/evb_rk3308/evb_rk3308.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <adc.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/rockchip/kylin_rk3036/kylin_rk3036.c b/board/rockchip/kylin_rk3036/kylin_rk3036.c
index 0ca91cdeb014..6caee58e9d8d 100644
--- a/board/rockchip/kylin_rk3036/kylin_rk3036.c
+++ b/board/rockchip/kylin_rk3036/kylin_rk3036.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <env.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch-rockchip/uart.h>
 #include <asm/arch-rockchip/sdram_rk3036.h>
diff --git a/board/ronetix/pm9263/pm9263.c b/board/ronetix/pm9263/pm9263.c
index ec73ced76042..58263a908235 100644
--- a/board/ronetix/pm9263/pm9263.c
+++ b/board/ronetix/pm9263/pm9263.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/sizes.h>
diff --git a/board/samsung/arndale/arndale.c b/board/samsung/arndale/arndale.c
index d1525b4a8562..fa568f76c66e 100644
--- a/board/samsung/arndale/arndale.c
+++ b/board/samsung/arndale/arndale.c
@@ -7,6 +7,7 @@
 #include <cpu_func.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <usb.h>
 #include <asm/global_data.h>
 #include <asm/gpio.h>
diff --git a/board/samsung/common/board.c b/board/samsung/common/board.c
index ae66bc73fd15..8ee9ca43c41d 100644
--- a/board/samsung/common/board.c
+++ b/board/samsung/common/board.c
@@ -14,6 +14,7 @@
 #include <log.h>
 #include <net.h>
 #include <spi.h>
+#include <stdio.h>
 #include <tmu.h>
 #include <netdev.h>
 #include <asm/global_data.h>
diff --git a/board/samsung/common/misc.c b/board/samsung/common/misc.c
index 0243d8971c80..eef565d1cee8 100644
--- a/board/samsung/common/misc.c
+++ b/board/samsung/common/misc.c
@@ -9,6 +9,7 @@
 #include <env.h>
 #include <lcd.h>
 #include <libtizen.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/printk.h>
diff --git a/board/samsung/goni/goni.c b/board/samsung/goni/goni.c
index 1631e68e713c..9476a437113e 100644
--- a/board/samsung/goni/goni.c
+++ b/board/samsung/goni/goni.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/arch/mmc.h>
diff --git a/board/samsung/smdkc100/smdkc100.c b/board/samsung/smdkc100/smdkc100.c
index f343a6f9dfe4..38cfde4f1366 100644
--- a/board/samsung/smdkc100/smdkc100.c
+++ b/board/samsung/smdkc100/smdkc100.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
diff --git a/board/samsung/smdkv310/smdkv310.c b/board/samsung/smdkv310/smdkv310.c
index 0be4ddf92d8d..58b71df0817c 100644
--- a/board/samsung/smdkv310/smdkv310.c
+++ b/board/samsung/smdkv310/smdkv310.c
@@ -7,6 +7,7 @@
 #include <init.h>
 #include <log.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
diff --git a/board/samsung/trats/trats.c b/board/samsung/trats/trats.c
index 2e80dbbc84a7..b79a87242734 100644
--- a/board/samsung/trats/trats.c
+++ b/board/samsung/trats/trats.c
@@ -10,6 +10,7 @@
 #include <env.h>
 #include <lcd.h>
 #include <log.h>
+#include <stdio.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 69e0ef192d10..6880dcda1caf 100644
--- a/board/samsung/trats2/trats2.c
+++ b/board/samsung/trats2/trats2.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <lcd.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/gpio.h>
 #include <asm/arch/pinmux.h>
 #include <asm/arch/power.h>
diff --git a/board/samsung/universal_c210/universal.c b/board/samsung/universal_c210/universal.c
index 9ef11b8471ca..fce8dfcc2344 100644
--- a/board/samsung/universal_c210/universal.c
+++ b/board/samsung/universal_c210/universal.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <spi.h>
 #include <lcd.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
diff --git a/board/sandbox/sandbox.c b/board/sandbox/sandbox.c
index 9773074d0882..f1d93dc0aa1e 100644
--- a/board/sandbox/sandbox.c
+++ b/board/sandbox/sandbox.c
@@ -11,6 +11,7 @@
 #include <init.h>
 #include <led.h>
 #include <os.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/global_data.h>
 #include <asm/test.h>
diff --git a/board/sbc8349/sbc8349.c b/board/sbc8349/sbc8349.c
index 18138289965d..f7e7ae7405c2 100644
--- a/board/sbc8349/sbc8349.c
+++ b/board/sbc8349/sbc8349.c
@@ -12,6 +12,7 @@
 #include <init.h>
 #include <ioports.h>
 #include <mpc83xx.h>
+#include <stdio.h>
 #include <asm/bitops.h>
 #include <asm/global_data.h>
 #include <asm/ppc.h>
diff --git a/board/sbc8548/ddr.c b/board/sbc8548/ddr.c
index 48e1bcf806a9..8351a9ca9333 100644
--- a/board/sbc8548/ddr.c
+++ b/board/sbc8548/ddr.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <i2c.h>
+#include <stdio.h>
 #include <asm/ppc.h>
 #include <linux/delay.h>
 #include <linux/string.h>
diff --git a/board/sbc8548/sbc8548.c b/board/sbc8548/sbc8548.c
index b3c1da920a8a..7780b53a2046 100644
--- a/board/sbc8548/sbc8548.c
+++ b/board/sbc8548/sbc8548.c
@@ -15,6 +15,7 @@
 #include <log.h>
 #include <net.h>
 #include <pci.h>
+#include <stdio.h>
 #include <asm/processor.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_pci.h>
diff --git a/board/schulercontrol/sc_sps_1/sc_sps_1.c b/board/schulercontrol/sc_sps_1/sc_sps_1.c
index a5b25b60fc49..23345604d63e 100644
--- a/board/schulercontrol/sc_sps_1/sc_sps_1.c
+++ b/board/schulercontrol/sc_sps_1/sc_sps_1.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
diff --git a/board/seco/common/mx6.c b/board/seco/common/mx6.c
index 51832b9d082f..eaf7edf952dd 100644
--- a/board/seco/common/mx6.c
+++ b/board/seco/common/mx6.c
@@ -7,6 +7,7 @@
  * Modified by: Boris Brezillon <boris.brezillon@free-electrons.com>
  */
 
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux.h>
diff --git a/board/seco/mx6quq7/mx6quq7.c b/board/seco/mx6quq7/mx6quq7.c
index 138c6e04291d..e022e057b643 100644
--- a/board/seco/mx6quq7/mx6quq7.c
+++ b/board/seco/mx6quq7/mx6quq7.c
@@ -9,6 +9,7 @@
 
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux.h>
diff --git a/board/siemens/capricorn/board.c b/board/siemens/capricorn/board.c
index 03418707a853..18d9c64f55a2 100644
--- a/board/siemens/capricorn/board.c
+++ b/board/siemens/capricorn/board.c
@@ -19,6 +19,7 @@
 #include <led.h>
 #include <pca953x.h>
 #include <power-domain.h>
+#include <stdio.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 19f27f6805a6..769979952174 100644
--- a/board/siemens/common/board.c
+++ b/board/siemens/common/board.c
@@ -17,6 +17,7 @@
 #include <malloc.h>
 #include <serial.h>
 #include <spl.h>
+#include <stdio.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 5ceb0871fa0b..75c347973227 100644
--- a/board/siemens/common/factoryset.c
+++ b/board/siemens/common/factoryset.c
@@ -17,6 +17,7 @@
 #if !CONFIG_IS_ENABLED(TARGET_GIEDI) && !CONFIG_IS_ENABLED(TARGET_DENEB)
 #include <asm/arch/cpu.h>
 #endif
+#include <stdio.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/unaligned.h>
 #include <net.h>
diff --git a/board/siemens/draco/board.c b/board/siemens/draco/board.c
index 2c15cfdda3f3..83cc14421dcb 100644
--- a/board/siemens/draco/board.c
+++ b/board/siemens/draco/board.c
@@ -19,6 +19,7 @@
 #include <init.h>
 #include <net.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/omap.h>
diff --git a/board/siemens/draco/board.h b/board/siemens/draco/board.h
index 7c29a45c036f..3e8ce399229e 100644
--- a/board/siemens/draco/board.h
+++ b/board/siemens/draco/board.h
@@ -15,6 +15,7 @@
 #ifndef _BOARD_H_
 #define _BOARD_H_
 
+#include <stdio.h>
 #define PARGS(x)	#x , /* Parameter Name */ \
 			settings.ddr3.x, /* EEPROM Value */ \
 			ddr3_default.x, /* Default Value */ \
diff --git a/board/siemens/pxm2/board.c b/board/siemens/pxm2/board.c
index 8ab3610da7d6..4fec3d8c95e1 100644
--- a/board/siemens/pxm2/board.c
+++ b/board/siemens/pxm2/board.c
@@ -20,6 +20,7 @@
 #include <malloc.h>
 #include <net.h>
 #include <spl.h>
+#include <stdio.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 84053b10d846..531ed7e15972 100644
--- a/board/siemens/rut/board.c
+++ b/board/siemens/rut/board.c
@@ -18,6 +18,7 @@
 #include <net.h>
 #include <spi.h>
 #include <spl.h>
+#include <stdio.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 3fb7d6bca227..631812f15083 100644
--- a/board/siemens/taurus/taurus.c
+++ b/board/siemens/taurus/taurus.c
@@ -17,6 +17,7 @@
 #include <env.h>
 #include <flash.h>
 #include <init.h>
+#include <stdio.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 54e5a4c16739..dea0924c6bf5 100644
--- a/board/sifive/fu540/fu540.c
+++ b/board/sifive/fu540/fu540.c
@@ -10,6 +10,7 @@
 #include <env.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <linux/bitops.h>
 #include <linux/bug.h>
 #include <linux/delay.h>
diff --git a/board/sks-kinkel/sksimx6/sksimx6.c b/board/sks-kinkel/sksimx6/sksimx6.c
index cbf3a5952be7..15c75959e6ad 100644
--- a/board/sks-kinkel/sksimx6/sksimx6.c
+++ b/board/sks-kinkel/sksimx6/sksimx6.c
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux.h>
diff --git a/board/socrates/nand.c b/board/socrates/nand.c
index 07c493679bf0..3fca5d063caf 100644
--- a/board/socrates/nand.c
+++ b/board/socrates/nand.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 
 #if defined(CONFIG_SYS_NAND_BASE)
 #include <nand.h>
diff --git a/board/socrates/socrates.c b/board/socrates/socrates.c
index 711ddcf256ea..96cde5afcbee 100644
--- a/board/socrates/socrates.c
+++ b/board/socrates/socrates.c
@@ -15,6 +15,7 @@
 #include <env.h>
 #include <init.h>
 #include <pci.h>
+#include <stdio.h>
 #include <uuid.h>
 #include <asm/global_data.h>
 #include <asm/processor.h>
diff --git a/board/softing/vining_2000/vining_2000.c b/board/softing/vining_2000/vining_2000.c
index 93670b7a946b..7c9c8d78b339 100644
--- a/board/softing/vining_2000/vining_2000.c
+++ b/board/softing/vining_2000/vining_2000.c
@@ -8,6 +8,7 @@
 
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/iomux.h>
diff --git a/board/softing/vining_fpga/socfpga.c b/board/softing/vining_fpga/socfpga.c
index 34ce6a13003b..7c9d4885dbef 100644
--- a/board/softing/vining_fpga/socfpga.c
+++ b/board/softing/vining_fpga/socfpga.c
@@ -9,6 +9,7 @@
 #include <init.h>
 #include <net.h>
 #include <status_led.h>
+#include <stdio.h>
 #include <asm/arch/reset_manager.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/board/solidrun/clearfog/clearfog.c b/board/solidrun/clearfog/clearfog.c
index 46ffc026f347..660962364f62 100644
--- a/board/solidrun/clearfog/clearfog.c
+++ b/board/solidrun/clearfog/clearfog.c
@@ -10,6 +10,7 @@
 #include <miiphy.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
diff --git a/board/solidrun/mx6cuboxi/mx6cuboxi.c b/board/solidrun/mx6cuboxi/mx6cuboxi.c
index e56e32e8c849..890d456ef4fe 100644
--- a/board/solidrun/mx6cuboxi/mx6cuboxi.c
+++ b/board/solidrun/mx6cuboxi/mx6cuboxi.c
@@ -17,6 +17,7 @@
 #include <image.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux.h>
diff --git a/board/somlabs/visionsom-6ull/visionsom-6ull.c b/board/somlabs/visionsom-6ull/visionsom-6ull.c
index 076c641d8a90..0146ba868db6 100644
--- a/board/somlabs/visionsom-6ull/visionsom-6ull.c
+++ b/board/somlabs/visionsom-6ull/visionsom-6ull.c
@@ -5,6 +5,7 @@
  */
 
 #include <init.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/spear/x600/x600.c b/board/spear/x600/x600.c
index fcc7524121c0..e3e9008fa3ec 100644
--- a/board/spear/x600/x600.c
+++ b/board/spear/x600/x600.c
@@ -15,6 +15,7 @@
 #include <netdev.h>
 #include <phy.h>
 #include <rtc.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/mach-types.h>
 #include <asm/arch/hardware.h>
diff --git a/board/st/common/stm32mp_dfu.c b/board/st/common/stm32mp_dfu.c
index aab502e3146e..0cf9a1544b80 100644
--- a/board/st/common/stm32mp_dfu.c
+++ b/board/st/common/stm32mp_dfu.c
@@ -12,6 +12,7 @@
 #include <misc.h>
 #include <mtd.h>
 #include <mtd_node.h>
+#include <stdio.h>
 #include <asm/arch/stm32prog.h>
 #include <linux/printk.h>
 #include <linux/string.h>
diff --git a/board/st/common/stpmic1.c b/board/st/common/stpmic1.c
index 3aa379e8a50f..042476dc318e 100644
--- a/board/st/common/stpmic1.c
+++ b/board/st/common/stpmic1.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/ddr.h>
 #include <linux/bitops.h>
diff --git a/board/st/stm32f746-disco/stm32f746-disco.c b/board/st/stm32f746-disco/stm32f746-disco.c
index 40450ca914be..ba3a1682d6cd 100644
--- a/board/st/stm32f746-disco/stm32f746-disco.c
+++ b/board/st/stm32f746-disco/stm32f746-disco.c
@@ -16,6 +16,7 @@
 #include <spl.h>
 #include <splash.h>
 #include <st_logo_data.h>
+#include <stdio.h>
 #include <video.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/board/st/stm32mp1/stm32mp1.c b/board/st/stm32mp1/stm32mp1.c
index f2312a03d1a1..b86cbee8e908 100644
--- a/board/st/stm32mp1/stm32mp1.c
+++ b/board/st/stm32mp1/stm32mp1.c
@@ -26,6 +26,7 @@
 #include <phy.h>
 #include <remoteproc.h>
 #include <reset.h>
+#include <stdio.h>
 #include <syscon.h>
 #include <usb.h>
 #include <watchdog.h>
diff --git a/board/st/stv0991/stv0991.c b/board/st/stv0991/stv0991.c
index e2d62a7ede9d..bd2d56d6d59b 100644
--- a/board/st/stv0991/stv0991.c
+++ b/board/st/stv0991/stv0991.c
@@ -10,6 +10,7 @@
 #include <init.h>
 #include <miiphy.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/arch/stv0991_periph.h>
 #include <asm/arch/stv0991_defs.h>
 #include <asm/arch/hardware.h>
diff --git a/board/sunxi/board.c b/board/sunxi/board.c
index a34b1f4cf178..cca98e2d5426 100644
--- a/board/sunxi/board.c
+++ b/board/sunxi/board.c
@@ -21,6 +21,7 @@
 #include <axp_pmic.h>
 #include <generic-phy.h>
 #include <phy-sun4i-usb.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/display.h>
diff --git a/board/synopsys/axs10x/axs10x.c b/board/synopsys/axs10x/axs10x.c
index 75e4d037623e..8faaf8045c1d 100644
--- a/board/synopsys/axs10x/axs10x.c
+++ b/board/synopsys/axs10x/axs10x.c
@@ -8,6 +8,7 @@
 #include <dwmmc.h>
 #include <init.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/arcregs.h>
 #include <asm/global_data.h>
 #include "axs10x.h"
diff --git a/board/synopsys/emsdp/emsdp.c b/board/synopsys/emsdp/emsdp.c
index a2eaf36ef13a..7a33440f273e 100644
--- a/board/synopsys/emsdp/emsdp.c
+++ b/board/synopsys/emsdp/emsdp.c
@@ -9,6 +9,7 @@
 #include <dwmmc.h>
 #include <init.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/string.h>
diff --git a/board/synopsys/hsdk/clk-lib.c b/board/synopsys/hsdk/clk-lib.c
index eed0fa15b192..93f3dca9afd3 100644
--- a/board/synopsys/hsdk/clk-lib.c
+++ b/board/synopsys/hsdk/clk-lib.c
@@ -7,6 +7,7 @@
 #include <clk.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <dm/device.h>
 #include <linux/printk.h>
 
diff --git a/board/synopsys/hsdk/hsdk.c b/board/synopsys/hsdk/hsdk.c
index 8644a41fe0ba..9c6e8dbc8f25 100644
--- a/board/synopsys/hsdk/hsdk.c
+++ b/board/synopsys/hsdk/hsdk.c
@@ -13,6 +13,7 @@
 #include <init.h>
 #include <irq_func.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
diff --git a/board/synopsys/iot_devkit/iot_devkit.c b/board/synopsys/iot_devkit/iot_devkit.c
index c6051363c1f9..151ade5fb7c9 100644
--- a/board/synopsys/iot_devkit/iot_devkit.c
+++ b/board/synopsys/iot_devkit/iot_devkit.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <malloc.h>
 #include <dwmmc.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/libfdt.h>
diff --git a/board/synopsys/nsim/nsim.c b/board/synopsys/nsim/nsim.c
index 00e5cc36414b..06eea41eb782 100644
--- a/board/synopsys/nsim/nsim.c
+++ b/board/synopsys/nsim/nsim.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <dm/device.h>
 #include <virtio_types.h>
 #include <virtio.h>
diff --git a/board/sysam/amcore/amcore.c b/board/sysam/amcore/amcore.c
index 9e1b8022705e..183a78d9ed77 100644
--- a/board/sysam/amcore/amcore.c
+++ b/board/sysam/amcore/amcore.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/immap.h>
 #include <asm/io.h>
diff --git a/board/sysam/stmark2/stmark2.c b/board/sysam/stmark2/stmark2.c
index d48da48b69d6..4c75bd6a5bec 100644
--- a/board/sysam/stmark2/stmark2.c
+++ b/board/sysam/stmark2/stmark2.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <init.h>
 #include <spi.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/immap.h>
diff --git a/board/tbs/tbs2910/tbs2910.c b/board/tbs/tbs2910/tbs2910.c
index ac1b8231281d..56e0f378b6a9 100644
--- a/board/tbs/tbs2910/tbs2910.c
+++ b/board/tbs/tbs2910/tbs2910.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux.h>
diff --git a/board/tcl/sl50/board.c b/board/tcl/sl50/board.c
index 8095053fd60f..7adaea5d5874 100644
--- a/board/tcl/sl50/board.c
+++ b/board/tcl/sl50/board.c
@@ -14,6 +14,7 @@
 #include <net.h>
 #include <serial.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/omap.h>
diff --git a/board/technexion/pico-imx6/pico-imx6.c b/board/technexion/pico-imx6/pico-imx6.c
index 90592900ec6e..87a78f418431 100644
--- a/board/technexion/pico-imx6/pico-imx6.c
+++ b/board/technexion/pico-imx6/pico-imx6.c
@@ -10,6 +10,7 @@
 #include <env.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/iomux.h>
diff --git a/board/technexion/pico-imx6ul/pico-imx6ul.c b/board/technexion/pico-imx6ul/pico-imx6ul.c
index 0d972158b1c8..11ae82b6bf2c 100644
--- a/board/technexion/pico-imx6ul/pico-imx6ul.c
+++ b/board/technexion/pico-imx6ul/pico-imx6ul.c
@@ -7,6 +7,7 @@
 
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/technexion/pico-imx6ul/spl.c b/board/technexion/pico-imx6ul/spl.c
index bea16a7ab9f0..0c5b166b6539 100644
--- a/board/technexion/pico-imx6ul/spl.c
+++ b/board/technexion/pico-imx6ul/spl.c
@@ -4,6 +4,7 @@
 #include <cpu_func.h>
 #include <hang.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/technexion/pico-imx7d/pico-imx7d.c b/board/technexion/pico-imx7d/pico-imx7d.c
index 2d749dac19a4..4af38f223cf0 100644
--- a/board/technexion/pico-imx7d/pico-imx7d.c
+++ b/board/technexion/pico-imx7d/pico-imx7d.c
@@ -5,6 +5,7 @@
 
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/technexion/pico-imx8mq/pico-imx8mq.c b/board/technexion/pico-imx8mq/pico-imx8mq.c
index 951e3e1985bc..de1c7c52211f 100644
--- a/board/technexion/pico-imx8mq/pico-imx8mq.c
+++ b/board/technexion/pico-imx8mq/pico-imx8mq.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <malloc.h>
 #include <errno.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <miiphy.h>
diff --git a/board/technexion/pico-imx8mq/spl.c b/board/technexion/pico-imx8mq/spl.c
index 02b2a01cae75..048ffb48d3f6 100644
--- a/board/technexion/pico-imx8mq/spl.c
+++ b/board/technexion/pico-imx8mq/spl.c
@@ -7,6 +7,7 @@
 #include <hang.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/ddr.h>
 #include <asm/arch/imx8mq_pins.h>
diff --git a/board/technexion/tao3530/tao3530.c b/board/technexion/tao3530/tao3530.c
index 157ad85d4f75..31bf21c94cbd 100644
--- a/board/technexion/tao3530/tao3530.c
+++ b/board/technexion/tao3530/tao3530.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <malloc.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <twl4030.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/board/technologic/ts4600/ts4600.c b/board/technologic/ts4600/ts4600.c
index 7daac4e53aa2..033fdcd9713a 100644
--- a/board/technologic/ts4600/ts4600.c
+++ b/board/technologic/ts4600/ts4600.c
@@ -15,6 +15,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
diff --git a/board/technologic/ts4800/ts4800.c b/board/technologic/ts4800/ts4800.c
index 61ec4ffb831e..37347949a38b 100644
--- a/board/technologic/ts4800/ts4800.c
+++ b/board/technologic/ts4800/ts4800.c
@@ -10,6 +10,7 @@
 #include <init.h>
 #include <log.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
diff --git a/board/theadorable/theadorable.c b/board/theadorable/theadorable.c
index 9664a8c0ef31..090a471a7172 100644
--- a/board/theadorable/theadorable.c
+++ b/board/theadorable/theadorable.c
@@ -13,6 +13,7 @@
 #if !defined(CONFIG_SPL_BUILD)
 #include <bootcount.h>
 #endif
+#include <stdio.h>
 #include <time.h>
 #include <asm/global_data.h>
 #include <asm/gpio.h>
diff --git a/board/ti/am335x/board.c b/board/ti/am335x/board.c
index 7103dc454d8e..0fa4d31a2e7b 100644
--- a/board/ti/am335x/board.c
+++ b/board/ti/am335x/board.c
@@ -17,6 +17,7 @@
 #include <net.h>
 #include <spl.h>
 #include <serial.h>
+#include <stdio.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/omap.h>
diff --git a/board/ti/am335x/mux.c b/board/ti/am335x/mux.c
index 6fb2c009ba0f..b5333b10ab76 100644
--- a/board/ti/am335x/mux.c
+++ b/board/ti/am335x/mux.c
@@ -14,6 +14,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/mux.h>
diff --git a/board/ti/am43xx/board.c b/board/ti/am43xx/board.c
index 463dccc0ccba..28bc5333c52d 100644
--- a/board/ti/am43xx/board.c
+++ b/board/ti/am43xx/board.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <eeprom.h>
 #include <image.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <dm/uclass.h>
diff --git a/board/ti/am43xx/mux.c b/board/ti/am43xx/mux.c
index f59e93a0ebba..13591a369f54 100644
--- a/board/ti/am43xx/mux.c
+++ b/board/ti/am43xx/mux.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/mux.h>
 #include "../common/board_detect.h"
diff --git a/board/ti/am57xx/board.c b/board/ti/am57xx/board.c
index fca15a9a6294..e0fb2b39b7da 100644
--- a/board/ti/am57xx/board.c
+++ b/board/ti/am57xx/board.c
@@ -17,6 +17,7 @@
 #include <palmas.h>
 #include <sata.h>
 #include <serial.h>
+#include <stdio.h>
 #include <usb.h>
 #include <errno.h>
 #include <asm/global_data.h>
diff --git a/board/ti/am65x/evm.c b/board/ti/am65x/evm.c
index 6f0dbf608300..83067eb56638 100644
--- a/board/ti/am65x/evm.c
+++ b/board/ti/am65x/evm.c
@@ -13,6 +13,7 @@
 #include <image.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/hardware.h>
 #include <asm/global_data.h>
diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c
index 752cb584c66a..fe8aeac9e46b 100644
--- a/board/ti/beagle/beagle.c
+++ b/board/ti/beagle/beagle.c
@@ -23,6 +23,7 @@
 #ifdef CONFIG_LED_STATUS
 #include <status_led.h>
 #endif
+#include <stdio.h>
 #include <twl4030.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
diff --git a/board/ti/common/board_detect.c b/board/ti/common/board_detect.c
index f51bacfbbcde..5721ef9e11d1 100644
--- a/board/ti/common/board_detect.c
+++ b/board/ti/common/board_detect.c
@@ -11,6 +11,7 @@
 #include <eeprom.h>
 #include <log.h>
 #include <net.h>
+#include <stdio.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 fa56ebb25333..e88aac06683d 100644
--- a/board/ti/dra7xx/evm.c
+++ b/board/ti/dra7xx/evm.c
@@ -19,6 +19,7 @@
 #include <palmas.h>
 #include <sata.h>
 #include <serial.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
diff --git a/board/ti/evm/evm.c b/board/ti/evm/evm.c
index 7e5efc32bc36..e84014b7c1c3 100644
--- a/board/ti/evm/evm.c
+++ b/board/ti/evm/evm.c
@@ -17,6 +17,7 @@
 #include <net.h>
 #include <ns16550.h>
 #include <serial.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/mem.h>
diff --git a/board/ti/j721e/evm.c b/board/ti/j721e/evm.c
index d6b67504654b..0c31ca2f7cc2 100644
--- a/board/ti/j721e/evm.c
+++ b/board/ti/j721e/evm.c
@@ -14,6 +14,7 @@
 #include <init.h>
 #include <log.h>
 #include <net.h>
+#include <stdio.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 ba08c22f942b..7b6f04b36beb 100644
--- a/board/ti/ks2_evm/board.c
+++ b/board/ti/ks2_evm/board.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
diff --git a/board/ti/ks2_evm/board_k2g.c b/board/ti/ks2_evm/board_k2g.c
index 979b1febc021..e79497752a6f 100644
--- a/board/ti/ks2_evm/board_k2g.c
+++ b/board/ti/ks2_evm/board_k2g.c
@@ -11,6 +11,7 @@
 #include <hang.h>
 #include <image.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/ti-common/keystone_net.h>
 #include <asm/arch/psc_defs.h>
diff --git a/board/ti/ks2_evm/ddr3_k2e.c b/board/ti/ks2_evm/ddr3_k2e.c
index 95fe3a9021e2..85e70fc67761 100644
--- a/board/ti/ks2_evm/ddr3_k2e.c
+++ b/board/ti/ks2_evm/ddr3_k2e.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include "ddr3_cfg.h"
 #include <asm/arch/ddr3.h>
 
diff --git a/board/ti/ks2_evm/ddr3_k2hk.c b/board/ti/ks2_evm/ddr3_k2hk.c
index 198c5da0e622..03bae4bf91eb 100644
--- a/board/ti/ks2_evm/ddr3_k2hk.c
+++ b/board/ti/ks2_evm/ddr3_k2hk.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include "ddr3_cfg.h"
 #include <asm/arch/ddr3.h>
 #include <asm/arch/hardware.h>
diff --git a/board/ti/ks2_evm/ddr3_k2l.c b/board/ti/ks2_evm/ddr3_k2l.c
index 805bf81f6bdf..36babcc5e116 100644
--- a/board/ti/ks2_evm/ddr3_k2l.c
+++ b/board/ti/ks2_evm/ddr3_k2l.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include "ddr3_cfg.h"
 #include <asm/arch/ddr3.h>
 
diff --git a/board/ti/ks2_evm/mux-k2g.h b/board/ti/ks2_evm/mux-k2g.h
index 3ecf571c5c37..239064c1dc67 100644
--- a/board/ti/ks2_evm/mux-k2g.h
+++ b/board/ti/ks2_evm/mux-k2g.h
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <hang.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/mux-k2g.h>
 #include <asm/arch/hardware.h>
diff --git a/board/ti/omap5_uevm/evm.c b/board/ti/omap5_uevm/evm.c
index a6c75bda3c39..e47da78fb773 100644
--- a/board/ti/omap5_uevm/evm.c
+++ b/board/ti/omap5_uevm/evm.c
@@ -9,6 +9,7 @@
 #include <init.h>
 #include <net.h>
 #include <palmas.h>
+#include <stdio.h>
 #include <asm/arch/omap.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/mmc_host_def.h>
diff --git a/board/ti/ti816x/evm.c b/board/ti/ti816x/evm.c
index 12c56a607c99..2689e48c8cef 100644
--- a/board/ti/ti816x/evm.c
+++ b/board/ti/ti816x/evm.c
@@ -11,6 +11,7 @@
 #include <init.h>
 #include <net.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/board/timll/devkit8000/devkit8000.c b/board/timll/devkit8000/devkit8000.c
index e1b33d091eea..4c05c9a8b7fc 100644
--- a/board/timll/devkit8000/devkit8000.c
+++ b/board/timll/devkit8000/devkit8000.c
@@ -21,6 +21,7 @@
 #include <init.h>
 #include <malloc.h>
 #include <ns16550.h>
+#include <stdio.h>
 #include <twl4030.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/board/toradex/apalis-imx8/apalis-imx8.c b/board/toradex/apalis-imx8/apalis-imx8.c
index 1c4ff3d1984b..d46ab222f890 100644
--- a/board/toradex/apalis-imx8/apalis-imx8.c
+++ b/board/toradex/apalis-imx8/apalis-imx8.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 
diff --git a/board/toradex/apalis-tk1/apalis-tk1.c b/board/toradex/apalis-tk1/apalis-tk1.c
index 6d907817593d..052a16bb7b3d 100644
--- a/board/toradex/apalis-tk1/apalis-tk1.c
+++ b/board/toradex/apalis-tk1/apalis-tk1.c
@@ -8,6 +8,7 @@
 #include <env.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/arch-tegra/ap.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
diff --git a/board/toradex/apalis_imx6/apalis_imx6.c b/board/toradex/apalis_imx6/apalis_imx6.c
index db7746e78c8d..76cf8e360f9b 100644
--- a/board/toradex/apalis_imx6/apalis_imx6.c
+++ b/board/toradex/apalis_imx6/apalis_imx6.c
@@ -12,6 +12,7 @@
 #include <image.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
diff --git a/board/toradex/apalis_imx6/pf0100.c b/board/toradex/apalis_imx6/pf0100.c
index c89052ff5daa..a720099f91e1 100644
--- a/board/toradex/apalis_imx6/pf0100.c
+++ b/board/toradex/apalis_imx6/pf0100.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <command.h>
 #include <i2c.h>
+#include <stdio.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/mx6-pins.h>
diff --git a/board/toradex/apalis_t30/apalis_t30.c b/board/toradex/apalis_t30/apalis_t30.c
index cad2f32b6651..bdc0691755e7 100644
--- a/board/toradex/apalis_t30/apalis_t30.c
+++ b/board/toradex/apalis_t30/apalis_t30.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/arch/gp_padctrl.h>
 #include <asm/arch/pinmux.h>
 #include <asm/arch-tegra/ap.h>
diff --git a/board/toradex/colibri-imx6ull/colibri-imx6ull.c b/board/toradex/colibri-imx6ull/colibri-imx6ull.c
index cde64f6684f6..81ec9e853267 100644
--- a/board/toradex/colibri-imx6ull/colibri-imx6ull.c
+++ b/board/toradex/colibri-imx6ull/colibri-imx6ull.c
@@ -4,6 +4,7 @@
  */
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
diff --git a/board/toradex/colibri-imx8x/colibri-imx8x.c b/board/toradex/colibri-imx8x/colibri-imx8x.c
index 09f3525bb450..d80762aec3c4 100644
--- a/board/toradex/colibri-imx8x/colibri-imx8x.c
+++ b/board/toradex/colibri-imx8x/colibri-imx8x.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 
diff --git a/board/toradex/colibri_imx6/colibri_imx6.c b/board/toradex/colibri_imx6/colibri_imx6.c
index dc026fd3e401..51e62b6ab20b 100644
--- a/board/toradex/colibri_imx6/colibri_imx6.c
+++ b/board/toradex/colibri_imx6/colibri_imx6.c
@@ -12,6 +12,7 @@
 #include <env.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
diff --git a/board/toradex/colibri_imx6/pf0100.c b/board/toradex/colibri_imx6/pf0100.c
index 8f08d8c7337c..caaf7553e5a1 100644
--- a/board/toradex/colibri_imx6/pf0100.c
+++ b/board/toradex/colibri_imx6/pf0100.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <command.h>
 #include <i2c.h>
+#include <stdio.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/mx6-pins.h>
diff --git a/board/toradex/colibri_imx7/colibri_imx7.c b/board/toradex/colibri_imx7/colibri_imx7.c
index fe8212bb4284..45cb4f9b9e23 100644
--- a/board/toradex/colibri_imx7/colibri_imx7.c
+++ b/board/toradex/colibri_imx7/colibri_imx7.c
@@ -7,6 +7,7 @@
 #include <cpu_func.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/toradex/colibri_pxa270/colibri_pxa270.c b/board/toradex/colibri_pxa270/colibri_pxa270.c
index 81b7f72d6dad..d3716ab85f82 100644
--- a/board/toradex/colibri_pxa270/colibri_pxa270.c
+++ b/board/toradex/colibri_pxa270/colibri_pxa270.c
@@ -11,6 +11,7 @@
 #include <dm.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/pxa.h>
 #include <asm/arch/regs-mmc.h>
diff --git a/board/toradex/colibri_t20/colibri_t20.c b/board/toradex/colibri_t20/colibri_t20.c
index bb37ff7507d1..f809260aa217 100644
--- a/board/toradex/colibri_t20/colibri_t20.c
+++ b/board/toradex/colibri_t20/colibri_t20.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/funcmux.h>
 #include <asm/arch/pinmux.h>
diff --git a/board/toradex/colibri_t30/colibri_t30.c b/board/toradex/colibri_t30/colibri_t30.c
index de13ec49c5f4..7a185ef8ec96 100644
--- a/board/toradex/colibri_t30/colibri_t30.c
+++ b/board/toradex/colibri_t30/colibri_t30.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/arch/gp_padctrl.h>
 #include <asm/arch/pinmux.h>
 #include <asm/arch-tegra/ap.h>
diff --git a/board/toradex/colibri_vf/colibri_vf.c b/board/toradex/colibri_vf/colibri_vf.c
index 5056447761de..071c6b55b826 100644
--- a/board/toradex/colibri_vf/colibri_vf.c
+++ b/board/toradex/colibri_vf/colibri_vf.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 
diff --git a/board/toradex/common/tdx-cfg-block.c b/board/toradex/common/tdx-cfg-block.c
index fbd3f5de13ff..2bdd589126db 100644
--- a/board/toradex/common/tdx-cfg-block.c
+++ b/board/toradex/common/tdx-cfg-block.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <stdio.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 2bbb11b21963..6a28a9b31f65 100644
--- a/board/toradex/common/tdx-common.c
+++ b/board/toradex/common/tdx-common.c
@@ -7,6 +7,7 @@
 #include <env.h>
 #include <g_dnl.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <linux/string.h>
diff --git a/board/toradex/verdin-imx8mm/spl.c b/board/toradex/verdin-imx8mm/spl.c
index 5ee86dd3f899..c21419b3d543 100644
--- a/board/toradex/verdin-imx8mm/spl.c
+++ b/board/toradex/verdin-imx8mm/spl.c
@@ -8,6 +8,7 @@
 #include <image.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/ddr.h>
 #include <asm/arch/imx8mm_pins.h>
diff --git a/board/tqc/tqm834x/tqm834x.c b/board/tqc/tqm834x/tqm834x.c
index c13c36edeeac..f5e3bc5bf975 100644
--- a/board/tqc/tqm834x/tqm834x.c
+++ b/board/tqc/tqm834x/tqm834x.c
@@ -10,6 +10,7 @@
 #include <ioports.h>
 #include <log.h>
 #include <mpc83xx.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/mpc8349_pci.h>
 #include <asm/ppc.h>
diff --git a/board/tqc/tqma6/tqma6.c b/board/tqc/tqma6/tqma6.c
index d9bbbfc5e432..5ebbdda38e2a 100644
--- a/board/tqc/tqma6/tqma6.c
+++ b/board/tqc/tqma6/tqma6.c
@@ -8,6 +8,7 @@
  */
 
 #include <init.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/mx6-pins.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/tqc/tqma6/tqma6_wru4.c b/board/tqc/tqma6/tqma6_wru4.c
index 9a4350cce6d4..70b1626e9721 100644
--- a/board/tqc/tqma6/tqma6_wru4.c
+++ b/board/tqc/tqma6/tqma6_wru4.c
@@ -11,6 +11,7 @@
 
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/mx6-pins.h>
diff --git a/board/udoo/neo/neo.c b/board/udoo/neo/neo.c
index 1ae4bc339785..0a8f0fec9ce6 100644
--- a/board/udoo/neo/neo.c
+++ b/board/udoo/neo/neo.c
@@ -10,6 +10,7 @@
 
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/udoo/udoo.c b/board/udoo/udoo.c
index e6d441f582b8..c0cd357845ee 100644
--- a/board/udoo/udoo.c
+++ b/board/udoo/udoo.c
@@ -7,6 +7,7 @@
 
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux.h>
diff --git a/board/variscite/dart_6ul/dart_6ul.c b/board/variscite/dart_6ul/dart_6ul.c
index 6378d44863be..ec1e1d262cfe 100644
--- a/board/variscite/dart_6ul/dart_6ul.c
+++ b/board/variscite/dart_6ul/dart_6ul.c
@@ -6,6 +6,7 @@
 
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/mx6-pins.h>
diff --git a/board/variscite/dart_6ul/spl.c b/board/variscite/dart_6ul/spl.c
index 49ff41cab0ff..7610182b725f 100644
--- a/board/variscite/dart_6ul/spl.c
+++ b/board/variscite/dart_6ul/spl.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <init.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/io.h>
 #include <asm/arch/mx6-ddr.h>
diff --git a/board/varisys/common/sys_eeprom.c b/board/varisys/common/sys_eeprom.c
index facda8e5419f..7667bbdc579e 100644
--- a/board/varisys/common/sys_eeprom.c
+++ b/board/varisys/common/sys_eeprom.c
@@ -14,6 +14,7 @@
 #include <command.h>
 #include <env.h>
 #include <i2c.h>
+#include <stdio.h>
 #include <linux/ctype.h>
 #include <linux/delay.h>
 #include <linux/string.h>
diff --git a/board/varisys/cyrus/cyrus.c b/board/varisys/cyrus/cyrus.c
index 0c8060e4d7d8..a7721274aed0 100644
--- a/board/varisys/cyrus/cyrus.c
+++ b/board/varisys/cyrus/cyrus.c
@@ -10,6 +10,7 @@
 #include <image.h>
 #include <init.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 #include <linux/compiler.h>
 #include <asm/mmu.h>
diff --git a/board/varisys/cyrus/ddr.c b/board/varisys/cyrus/ddr.c
index c374b8ce0275..0677bd1c693c 100644
--- a/board/varisys/cyrus/ddr.c
+++ b/board/varisys/cyrus/ddr.c
@@ -8,6 +8,7 @@
 #include <hwconfig.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/mmu.h>
 #include <asm/ppc.h>
diff --git a/board/varisys/cyrus/eth.c b/board/varisys/cyrus/eth.c
index 07e3b979c47d..b85e8208be1f 100644
--- a/board/varisys/cyrus/eth.c
+++ b/board/varisys/cyrus/eth.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/fsl_serdes.h>
 #include <fm_eth.h>
 #include <fsl_mdio.h>
diff --git a/board/ve8313/ve8313.c b/board/ve8313/ve8313.c
index ec2552a29abc..2f78b475d393 100644
--- a/board/ve8313/ve8313.c
+++ b/board/ve8313/ve8313.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <fdt_support.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/ppc.h>
 #include <asm/u-boot.h>
diff --git a/board/vscom/baltos/board.c b/board/vscom/baltos/board.c
index f01a78897c6b..045e46aba301 100644
--- a/board/vscom/baltos/board.c
+++ b/board/vscom/baltos/board.c
@@ -13,6 +13,7 @@
 #include <init.h>
 #include <net.h>
 #include <serial.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/libfdt.h>
diff --git a/board/wandboard/spl.c b/board/wandboard/spl.c
index c61428d6c641..e6ba35612171 100644
--- a/board/wandboard/spl.c
+++ b/board/wandboard/spl.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux.h>
diff --git a/board/wandboard/wandboard.c b/board/wandboard/wandboard.c
index 7d3da302395a..aa444959a06a 100644
--- a/board/wandboard/wandboard.c
+++ b/board/wandboard/wandboard.c
@@ -10,6 +10,7 @@
 #include <image.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/iomux.h>
diff --git a/board/warp/warp.c b/board/warp/warp.c
index fbf7a5be71cd..73d7aca7aadd 100644
--- a/board/warp/warp.c
+++ b/board/warp/warp.c
@@ -8,6 +8,7 @@
  */
 
 #include <init.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/warp7/warp7.c b/board/warp7/warp7.c
index 929ec65947cd..d13a10e1a7cb 100644
--- a/board/warp7/warp7.c
+++ b/board/warp7/warp7.c
@@ -6,6 +6,7 @@
 
 #include <init.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/mx7-pins.h>
diff --git a/board/work-microwave/work_92105/work_92105_display.c b/board/work-microwave/work_92105/work_92105_display.c
index eefcb8545f50..53d5d3c5a835 100644
--- a/board/work-microwave/work_92105/work_92105_display.c
+++ b/board/work-microwave/work_92105/work_92105_display.c
@@ -13,6 +13,7 @@
 #include <common.h>
 #include <command.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/emc.h>
diff --git a/board/xes/common/board.c b/board/xes/common/board.c
index b6aeee3f2ca6..eb9749f8a712 100644
--- a/board/xes/common/board.c
+++ b/board/xes/common/board.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <env.h>
+#include <stdio.h>
 #include <linux/string.h>
 #include "fsl_8xxx_misc.h"
 #include <init.h>
diff --git a/board/xes/common/fsl_8xxx_pci.c b/board/xes/common/fsl_8xxx_pci.c
index c4aa04b41c9b..6c6db6c2fcf8 100644
--- a/board/xes/common/fsl_8xxx_pci.c
+++ b/board/xes/common/fsl_8xxx_pci.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <init.h>
 #include <pci.h>
+#include <stdio.h>
 #include <asm/fsl_pci.h>
 #include <asm/fsl_serdes.h>
 #include <asm/io.h>
diff --git a/board/xes/xpedite517x/xpedite517x.c b/board/xes/xpedite517x/xpedite517x.c
index 333edd4cd996..768b10271102 100644
--- a/board/xes/xpedite517x/xpedite517x.c
+++ b/board/xes/xpedite517x/xpedite517x.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/processor.h>
 #include <fsl_ddr_sdram.h>
diff --git a/board/xes/xpedite520x/xpedite520x.c b/board/xes/xpedite520x/xpedite520x.c
index 016bd412ce84..2433bcd64591 100644
--- a/board/xes/xpedite520x/xpedite520x.c
+++ b/board/xes/xpedite520x/xpedite520x.c
@@ -8,6 +8,7 @@
 #include <command.h>
 #include <init.h>
 #include <pci.h>
+#include <stdio.h>
 #include <asm/processor.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_pci.h>
diff --git a/board/xes/xpedite537x/xpedite537x.c b/board/xes/xpedite537x/xpedite537x.c
index a55c7d24264b..8aeca7de758f 100644
--- a/board/xes/xpedite537x/xpedite537x.c
+++ b/board/xes/xpedite537x/xpedite537x.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <command.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/processor.h>
 #include <asm/mmu.h>
 #include <asm/immap_85xx.h>
diff --git a/board/xes/xpedite550x/ddr.c b/board/xes/xpedite550x/ddr.c
index 974fc52db80b..b1abd3d54dcf 100644
--- a/board/xes/xpedite550x/ddr.c
+++ b/board/xes/xpedite550x/ddr.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <i2c.h>
+#include <stdio.h>
 #include <asm/ppc.h>
 
 #include <fsl_ddr_sdram.h>
diff --git a/board/xes/xpedite550x/xpedite550x.c b/board/xes/xpedite550x/xpedite550x.c
index 9347b8958853..69d3292af27e 100644
--- a/board/xes/xpedite550x/xpedite550x.c
+++ b/board/xes/xpedite550x/xpedite550x.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <command.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/processor.h>
 #include <asm/mmu.h>
 #include <asm/immap_85xx.h>
diff --git a/board/xilinx/microblaze-generic/microblaze-generic.c b/board/xilinx/microblaze-generic/microblaze-generic.c
index 7729ce915ea3..49478b05bea1 100644
--- a/board/xilinx/microblaze-generic/microblaze-generic.c
+++ b/board/xilinx/microblaze-generic/microblaze-generic.c
@@ -15,6 +15,7 @@
 #include <env.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <dm/lists.h>
 #include <fdtdec.h>
diff --git a/board/xilinx/versal/board.c b/board/xilinx/versal/board.c
index 025212b223c6..48bd3dcd1508 100644
--- a/board/xilinx/versal/board.c
+++ b/board/xilinx/versal/board.c
@@ -11,6 +11,7 @@
 #include <init.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
diff --git a/board/xilinx/zynq/bootimg.c b/board/xilinx/zynq/bootimg.c
index 1a9d3ed3ec5e..332500bdc721 100644
--- a/board/xilinx/zynq/bootimg.c
+++ b/board/xilinx/zynq/bootimg.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <log.h>
 #include <part.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
diff --git a/board/xilinx/zynq/cmds.c b/board/xilinx/zynq/cmds.c
index c43727ab87a4..b3a2c933b7ca 100644
--- a/board/xilinx/zynq/cmds.c
+++ b/board/xilinx/zynq/cmds.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <command.h>
 #include <log.h>
+#include <stdio.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 c0d28a73e45d..48898f69c938 100644
--- a/board/xilinx/zynqmp/cmds.c
+++ b/board/xilinx/zynqmp/cmds.c
@@ -9,6 +9,7 @@
 #include <cpu_func.h>
 #include <env.h>
 #include <malloc.h>
+#include <stdio.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 3bd39d5eb47a..0686b16a887e 100644
--- a/board/xilinx/zynqmp/zynqmp.c
+++ b/board/xilinx/zynqmp/zynqmp.c
@@ -16,6 +16,7 @@
 #include <ahci.h>
 #include <scsi.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <wdt.h>
 #include <asm/arch/clk.h>
 #include <asm/arch/hardware.h>
diff --git a/board/zyxel/nsa310s/nsa310s.c b/board/zyxel/nsa310s/nsa310s.c
index cd4a7723b120..b8b896d717cb 100644
--- a/board/zyxel/nsa310s/nsa310s.c
+++ b/board/zyxel/nsa310s/nsa310s.c
@@ -9,6 +9,7 @@
 #include <init.h>
 #include <miiphy.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
 #include <asm/arch/mpp.h>
diff --git a/cmd/ab_select.c b/cmd/ab_select.c
index 6298fcfb6044..1ee3206c3406 100644
--- a/cmd/ab_select.c
+++ b/cmd/ab_select.c
@@ -8,6 +8,7 @@
 #include <command.h>
 #include <env.h>
 #include <part.h>
+#include <stdio.h>
 
 static int do_ab_select(struct cmd_tbl *cmdtp, int flag, int argc,
 			char *const argv[])
diff --git a/cmd/abootimg.c b/cmd/abootimg.c
index f21b77dbf6f8..f90468a1ae3e 100644
--- a/cmd/abootimg.c
+++ b/cmd/abootimg.c
@@ -9,6 +9,7 @@
 #include <command.h>
 #include <image.h>
 #include <mapmem.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 #define abootimg_addr() \
diff --git a/cmd/acpi.c b/cmd/acpi.c
index b009368eacee..2904b146befd 100644
--- a/cmd/acpi.c
+++ b/cmd/acpi.c
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <display_options.h>
 #include <mapmem.h>
+#include <stdio.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 557a2c1f5d00..9869aad8dceb 100644
--- a/cmd/adc.c
+++ b/cmd/adc.c
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <dm.h>
 #include <adc.h>
+#include <stdio.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 2d43dd147d49..90a72619720b 100644
--- a/cmd/adtimg.c
+++ b/cmd/adtimg.c
@@ -9,6 +9,7 @@
 #include <env.h>
 #include <image-android-dt.h>
 #include <common.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 #define OPT_INDEX	"--index"
diff --git a/cmd/armflash.c b/cmd/armflash.c
index 2365f16ce4c5..4c4a719ad019 100644
--- a/cmd/armflash.c
+++ b/cmd/armflash.c
@@ -9,6 +9,7 @@
 #include <command.h>
 #include <console.h>
 #include <flash.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/string.h>
 
diff --git a/cmd/avb.c b/cmd/avb.c
index 5e9db6f23851..a9de5bed9735 100644
--- a/cmd/avb.c
+++ b/cmd/avb.c
@@ -11,6 +11,7 @@
 #include <image.h>
 #include <malloc.h>
 #include <mmc.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 #define AVB_BOOTARGS	"avb_bootargs"
diff --git a/cmd/axi.c b/cmd/axi.c
index 36508223c34b..e61cc3e35ca2 100644
--- a/cmd/axi.c
+++ b/cmd/axi.c
@@ -16,6 +16,7 @@
 #include <display_options.h>
 #include <dm.h>
 #include <log.h>
+#include <stdio.h>
 
 /* Currently selected AXI bus device */
 static struct udevice *axi_cur_bus;
diff --git a/cmd/bcb.c b/cmd/bcb.c
index 2de6a08beb97..4cccd8eab3f2 100644
--- a/cmd/bcb.c
+++ b/cmd/bcb.c
@@ -11,6 +11,7 @@
 #include <display_options.h>
 #include <log.h>
 #include <part.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 enum bcb_cmd {
diff --git a/cmd/bdinfo.c b/cmd/bdinfo.c
index fa6146705d95..c80395a50f46 100644
--- a/cmd/bdinfo.c
+++ b/cmd/bdinfo.c
@@ -11,6 +11,7 @@
 #include <env.h>
 #include <lmb.h>
 #include <net.h>
+#include <stdio.h>
 #include <vsprintf.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
diff --git a/cmd/bind.c b/cmd/bind.c
index 068b1399ab1d..050c4be2d72f 100644
--- a/cmd/bind.c
+++ b/cmd/bind.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <command.h>
 #include <dm.h>
+#include <stdio.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 afeffadc44f3..a643cc906cec 100644
--- a/cmd/binop.c
+++ b/cmd/binop.c
@@ -6,6 +6,7 @@
 #include <hexdump.h>
 #include <malloc.h>
 #include <mapmem.h>
+#include <stdio.h>
 #include <linux/ctype.h>
 #include <linux/string.h>
 
diff --git a/cmd/blk_common.c b/cmd/blk_common.c
index 14413da3f6da..aed076acb77e 100644
--- a/cmd/blk_common.c
+++ b/cmd/blk_common.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <blk.h>
 #include <command.h>
+#include <stdio.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 25f252e455ed..025c692b485c 100644
--- a/cmd/blkcache.c
+++ b/cmd/blkcache.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <malloc.h>
 #include <part.h>
+#include <stdio.h>
 
 static int blkc_show(struct cmd_tbl *cmdtp, int flag,
 		     int argc, char *const argv[])
diff --git a/cmd/bmp.c b/cmd/bmp.c
index 3ecf8db5e653..499e3585f742 100644
--- a/cmd/bmp.c
+++ b/cmd/bmp.c
@@ -19,6 +19,7 @@
 #include <malloc.h>
 #include <mapmem.h>
 #include <splash.h>
+#include <stdio.h>
 #include <video.h>
 #include <asm/byteorder.h>
 #include <linux/string.h>
diff --git a/cmd/bootcount.c b/cmd/bootcount.c
index 654bbb805c1c..a1ad62ad4191 100644
--- a/cmd/bootcount.c
+++ b/cmd/bootcount.c
@@ -3,6 +3,7 @@
 #include <common.h>
 #include <command.h>
 #include <bootcount.h>
+#include <stdio.h>
 
 static int do_bootcount_print(struct cmd_tbl *cmdtp, int flag, int argc,
 			      char *const argv[])
diff --git a/cmd/booti.c b/cmd/booti.c
index 7df747bc575c..de60d4ea7cbc 100644
--- a/cmd/booti.c
+++ b/cmd/booti.c
@@ -12,6 +12,7 @@
 #include <lmb.h>
 #include <log.h>
 #include <mapmem.h>
+#include <stdio.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 599251f7181c..4490e4d3ac15 100644
--- a/cmd/bootm.c
+++ b/cmd/bootm.c
@@ -15,6 +15,7 @@
 #include <image.h>
 #include <malloc.h>
 #include <nand.h>
+#include <stdio.h>
 #include <asm/byteorder.h>
 #include <asm/global_data.h>
 #include <linux/ctype.h>
diff --git a/cmd/bootmenu.c b/cmd/bootmenu.c
index 18efe25751f7..e307660e516c 100644
--- a/cmd/bootmenu.c
+++ b/cmd/bootmenu.c
@@ -9,6 +9,7 @@
 #include <env.h>
 #include <log.h>
 #include <menu.h>
+#include <stdio.h>
 #include <watchdog.h>
 #include <malloc.h>
 #include <linux/delay.h>
diff --git a/cmd/bootstage.c b/cmd/bootstage.c
index 37615c3ffec7..1592f24c11d3 100644
--- a/cmd/bootstage.c
+++ b/cmd/bootstage.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <bootstage.h>
 #include <command.h>
+#include <stdio.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 7556cd2752a8..a251c48a0b88 100644
--- a/cmd/bootz.c
+++ b/cmd/bootz.c
@@ -11,6 +11,7 @@
 #include <irq_func.h>
 #include <lmb.h>
 #include <log.h>
+#include <stdio.h>
 #include <linux/compiler.h>
 
 int __weak bootz_setup(ulong image, ulong *start, ulong *end)
diff --git a/cmd/cache.c b/cmd/cache.c
index 0ea2c6c033a8..19890c2566c9 100644
--- a/cmd/cache.c
+++ b/cmd/cache.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <command.h>
 #include <cpu_func.h>
+#include <stdio.h>
 #include <linux/compiler.h>
 #include <linux/string.h>
 
diff --git a/cmd/cbfs.c b/cmd/cbfs.c
index 10c2c929c374..432974009a1d 100644
--- a/cmd/cbfs.c
+++ b/cmd/cbfs.c
@@ -10,6 +10,7 @@
 #include <command.h>
 #include <env.h>
 #include <cbfs.h>
+#include <stdio.h>
 
 static int do_cbfs_init(struct cmd_tbl *cmdtp, int flag, int argc,
 			char *const argv[])
diff --git a/cmd/clk.c b/cmd/clk.c
index 439736d0724e..5946d527d35a 100644
--- a/cmd/clk.c
+++ b/cmd/clk.c
@@ -12,6 +12,7 @@
 #include <dm/device-internal.h>
 #include <linux/clk-provider.h>
 #endif
+#include <stdio.h>
 
 #if defined(CONFIG_DM) && defined(CONFIG_CLK)
 static void show_clks(struct udevice *dev, int depth, int last_flag)
diff --git a/cmd/config.c b/cmd/config.c
index cf30841a3594..763afe9ca753 100644
--- a/cmd/config.c
+++ b/cmd/config.c
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <gzip.h>
 #include <malloc.h>
+#include <stdio.h>
 
 #include "config_data_gz.h"
 #include "config_data_size.h"
diff --git a/cmd/conitrace.c b/cmd/conitrace.c
index 88850db541f0..0050831accfa 100644
--- a/cmd/conitrace.c
+++ b/cmd/conitrace.c
@@ -7,6 +7,7 @@
  */
 #include <common.h>
 #include <command.h>
+#include <stdio.h>
 #include <linux/delay.h>
 
 static int do_conitrace(struct cmd_tbl *cmdtp, int flag, int argc,
diff --git a/cmd/cpu.c b/cmd/cpu.c
index b3dd7e57449f..27b0919709a8 100644
--- a/cmd/cpu.c
+++ b/cmd/cpu.c
@@ -11,6 +11,7 @@
 #include <display_options.h>
 #include <dm.h>
 #include <errno.h>
+#include <stdio.h>
 
 static const char *cpu_feature_name[CPU_FEAT_COUNT] = {
 	"L1 cache",
diff --git a/cmd/cramfs.c b/cmd/cramfs.c
index 1aeb56702cad..8f4d0ab54a01 100644
--- a/cmd/cramfs.c
+++ b/cmd/cramfs.c
@@ -16,6 +16,7 @@
 #include <image.h>
 #include <malloc.h>
 #include <mapmem.h>
+#include <stdio.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 b4059f0e7dce..d381980ec6cd 100644
--- a/cmd/cros_ec.c
+++ b/cmd/cros_ec.c
@@ -12,6 +12,7 @@
 #include <dm.h>
 #include <flash.h>
 #include <log.h>
+#include <stdio.h>
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
 #include <linux/string.h>
diff --git a/cmd/date.c b/cmd/date.c
index 8e8f54ba405c..306f640fdc5f 100644
--- a/cmd/date.c
+++ b/cmd/date.c
@@ -12,6 +12,7 @@
 #include <dm.h>
 #include <rtc.h>
 #include <i2c.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/string.h>
 
diff --git a/cmd/demo.c b/cmd/demo.c
index 7310aa2907ad..aaeff9c18883 100644
--- a/cmd/demo.c
+++ b/cmd/demo.c
@@ -11,6 +11,7 @@
 #include <dm.h>
 #include <dm-demo.h>
 #include <mapmem.h>
+#include <stdio.h>
 #include <asm/io.h>
 
 struct udevice *demo_dev;
diff --git a/cmd/disk.c b/cmd/disk.c
index 8060e753ebda..bfebe3520c33 100644
--- a/cmd/disk.c
+++ b/cmd/disk.c
@@ -10,6 +10,7 @@
 #include <image.h>
 #include <log.h>
 #include <part.h>
+#include <stdio.h>
 
 int common_diskboot(struct cmd_tbl *cmdtp, const char *intf, int argc,
 		    char *const argv[])
diff --git a/cmd/echo.c b/cmd/echo.c
index 1d85e23c218c..44350a882e50 100644
--- a/cmd/echo.c
+++ b/cmd/echo.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 static int do_echo(struct cmd_tbl *cmdtp, int flag, int argc,
diff --git a/cmd/eeprom.c b/cmd/eeprom.c
index 654004e14303..ffd1db893bf7 100644
--- a/cmd/eeprom.c
+++ b/cmd/eeprom.c
@@ -25,6 +25,7 @@
 #include <eeprom.h>
 #include <i2c.h>
 #include <eeprom_layout.h>
+#include <stdio.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 
diff --git a/cmd/efi.c b/cmd/efi.c
index 11531cd1b4aa..7b7a019e1af8 100644
--- a/cmd/efi.c
+++ b/cmd/efi.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <sort.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/string.h>
 
diff --git a/cmd/efidebug.c b/cmd/efidebug.c
index cf08e07d6d42..c81c23463b20 100644
--- a/cmd/efidebug.c
+++ b/cmd/efidebug.c
@@ -15,6 +15,7 @@
 #include <malloc.h>
 #include <mapmem.h>
 #include <search.h>
+#include <stdio.h>
 #include <linux/ctype.h>
 #include <linux/string.h>
 
diff --git a/cmd/elf.c b/cmd/elf.c
index a3cb6e274f4a..c38d8d015a90 100644
--- a/cmd/elf.c
+++ b/cmd/elf.c
@@ -12,6 +12,7 @@
 #include <image.h>
 #include <log.h>
 #include <net.h>
+#include <stdio.h>
 #include <vxworks.h>
 #ifdef CONFIG_X86
 #include <vbe.h>
diff --git a/cmd/ethsw.c b/cmd/ethsw.c
index 8e2bd3dfa578..6b76061cd0f8 100644
--- a/cmd/ethsw.c
+++ b/cmd/ethsw.c
@@ -12,6 +12,7 @@
 #include <env_flags.h>
 #include <ethsw.h>
 #include <net.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 static const char *ethsw_name;
diff --git a/cmd/fastboot.c b/cmd/fastboot.c
index 90efc85360d6..8340af5df8cb 100644
--- a/cmd/fastboot.c
+++ b/cmd/fastboot.c
@@ -12,6 +12,7 @@
 #include <g_dnl.h>
 #include <fastboot.h>
 #include <net.h>
+#include <stdio.h>
 #include <usb.h>
 #include <watchdog.h>
 #include <linux/printk.h>
diff --git a/cmd/fat.c b/cmd/fat.c
index b438ce16c911..d56648f2a856 100644
--- a/cmd/fat.c
+++ b/cmd/fat.c
@@ -13,6 +13,7 @@
 #include <fat.h>
 #include <fs.h>
 #include <part.h>
+#include <stdio.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 f5f1f6b00171..e784b0d5d943 100644
--- a/cmd/fdt.c
+++ b/cmd/fdt.c
@@ -11,6 +11,7 @@
 #include <command.h>
 #include <env.h>
 #include <image.h>
+#include <stdio.h>
 #include <linux/ctype.h>
 #include <linux/string.h>
 #include <linux/types.h>
diff --git a/cmd/flash.c b/cmd/flash.c
index 3e7b335109de..ce44d7dc76bd 100644
--- a/cmd/flash.c
+++ b/cmd/flash.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <command.h>
 #include <log.h>
+#include <stdio.h>
 #include <uuid.h>
 #include <linux/string.h>
 
diff --git a/cmd/fpga.c b/cmd/fpga.c
index 3151100aa140..924ca10749d4 100644
--- a/cmd/fpga.c
+++ b/cmd/fpga.c
@@ -16,6 +16,7 @@
 #include <image.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 static long do_fpga_get_device(char *arg)
diff --git a/cmd/fuse.c b/cmd/fuse.c
index db504349af1f..d3680e98440d 100644
--- a/cmd/fuse.c
+++ b/cmd/fuse.c
@@ -12,6 +12,7 @@
 #include <command.h>
 #include <console.h>
 #include <fuse.h>
+#include <stdio.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 
diff --git a/cmd/gettime.c b/cmd/gettime.c
index ebaa45812a68..697e80a3a97c 100644
--- a/cmd/gettime.c
+++ b/cmd/gettime.c
@@ -13,6 +13,7 @@
  */
 #include <common.h>
 #include <command.h>
+#include <stdio.h>
 #include <time.h>
 
 static int do_gettime(struct cmd_tbl *cmdtp, int flag, int argc,
diff --git a/cmd/gpio.c b/cmd/gpio.c
index e256f83ea103..92831350b48f 100644
--- a/cmd/gpio.c
+++ b/cmd/gpio.c
@@ -12,6 +12,7 @@
 #include <dm.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/gpio.h>
 #include <linux/err.h>
 #include <linux/string.h>
diff --git a/cmd/gpt.c b/cmd/gpt.c
index db70ba887b4b..639fcae8e31c 100644
--- a/cmd/gpt.c
+++ b/cmd/gpt.c
@@ -19,6 +19,7 @@
 #include <part.h>
 #include <part_efi.h>
 #include <exports.h>
+#include <stdio.h>
 #include <uuid.h>
 #include <linux/ctype.h>
 #include <div64.h>
diff --git a/cmd/host.c b/cmd/host.c
index ff119da73890..dec1da41def3 100644
--- a/cmd/host.c
+++ b/cmd/host.c
@@ -9,6 +9,7 @@
 #include <fs.h>
 #include <part.h>
 #include <sandboxblockdev.h>
+#include <stdio.h>
 #include <dm/device_compat.h>
 #include <linux/errno.h>
 
diff --git a/cmd/i2c.c b/cmd/i2c.c
index 83e4cfaa255d..c1f7372a151a 100644
--- a/cmd/i2c.c
+++ b/cmd/i2c.c
@@ -75,6 +75,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/byteorder.h>
 #include <linux/compiler.h>
 #include <linux/delay.h>
diff --git a/cmd/ide.c b/cmd/ide.c
index 8fefaf3f8158..788269080add 100644
--- a/cmd/ide.c
+++ b/cmd/ide.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <blk.h>
 #include <config.h>
+#include <stdio.h>
 #include <watchdog.h>
 #include <command.h>
 #include <image.h>
diff --git a/cmd/ini.c b/cmd/ini.c
index c075be623cce..787e3ed950e8 100644
--- a/cmd/ini.c
+++ b/cmd/ini.c
@@ -14,6 +14,7 @@
 #include <common.h>
 #include <command.h>
 #include <env.h>
+#include <stdio.h>
 #include <linux/ctype.h>
 #include <linux/string.h>
 
diff --git a/cmd/iotrace.c b/cmd/iotrace.c
index 652ebefb89ee..e691e91c4861 100644
--- a/cmd/iotrace.c
+++ b/cmd/iotrace.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <command.h>
 #include <iotrace.h>
+#include <stdio.h>
 
 static void do_print_stats(void)
 {
diff --git a/cmd/itest.c b/cmd/itest.c
index 4ccc4cbb8a91..0ec595c0d700 100644
--- a/cmd/itest.c
+++ b/cmd/itest.c
@@ -16,6 +16,7 @@
 #include <command.h>
 #include <env.h>
 #include <mapmem.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 #include <asm/io.h>
diff --git a/cmd/jffs2.c b/cmd/jffs2.c
index e06ab60a77f1..5ccd5b091532 100644
--- a/cmd/jffs2.c
+++ b/cmd/jffs2.c
@@ -76,6 +76,7 @@
 #include <flash.h>
 #include <image.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <jffs2/jffs2.h>
 #include <linux/bug.h>
 #include <linux/list.h>
diff --git a/cmd/led.c b/cmd/led.c
index a2b2f1b5e56b..33714e26ae9d 100644
--- a/cmd/led.c
+++ b/cmd/led.c
@@ -8,6 +8,7 @@
 #include <command.h>
 #include <dm.h>
 #include <led.h>
+#include <stdio.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 ac7139f84d63..c763121fe5e8 100644
--- a/cmd/legacy-mtd-utils.c
+++ b/cmd/legacy-mtd-utils.c
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0+
 
 #include <common.h>
+#include <stdio.h>
 #include <jffs2/jffs2.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
diff --git a/cmd/license.c b/cmd/license.c
index 15411b5a92d5..255f476d52b4 100644
--- a/cmd/license.c
+++ b/cmd/license.c
@@ -8,6 +8,7 @@
 #include <command.h>
 #include <gzip.h>
 #include <malloc.h>
+#include <stdio.h>
 
 #include "license_data_gz.h"
 #include "license_data_size.h"
diff --git a/cmd/load.c b/cmd/load.c
index a651478d920b..fc50722e0655 100644
--- a/cmd/load.c
+++ b/cmd/load.c
@@ -18,6 +18,7 @@
 #include <net.h>
 #include <exports.h>
 #include <serial.h>
+#include <stdio.h>
 #include <xyzModem.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
diff --git a/cmd/log.c b/cmd/log.c
index f47ff5d17e9b..a233d239bb3c 100644
--- a/cmd/log.c
+++ b/cmd/log.c
@@ -8,6 +8,7 @@
 #include <command.h>
 #include <dm.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/string.h>
 
diff --git a/cmd/lsblk.c b/cmd/lsblk.c
index 653dffce0419..b41a34491e62 100644
--- a/cmd/lsblk.c
+++ b/cmd/lsblk.c
@@ -8,6 +8,7 @@
 #include <blk.h>
 #include <command.h>
 #include <dm.h>
+#include <stdio.h>
 
 static int do_lsblk(struct cmd_tbl *cmdtp, int flag, int argc, char * const argv[])
 {
diff --git a/cmd/lzmadec.c b/cmd/lzmadec.c
index 3b8db0a85385..409ad6e69c16 100644
--- a/cmd/lzmadec.c
+++ b/cmd/lzmadec.c
@@ -13,6 +13,7 @@
 #include <command.h>
 #include <env.h>
 #include <mapmem.h>
+#include <stdio.h>
 #include <asm/io.h>
 
 #include <lzma/LzmaTools.h>
diff --git a/cmd/md5sum.c b/cmd/md5sum.c
index ae2d81470d7f..a6e12bba4b54 100644
--- a/cmd/md5sum.c
+++ b/cmd/md5sum.c
@@ -12,6 +12,7 @@
 #include <env.h>
 #include <image.h>
 #include <mapmem.h>
+#include <stdio.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 d346ccc538d4..581d0a7db7e2 100644
--- a/cmd/mdio.c
+++ b/cmd/mdio.c
@@ -13,6 +13,7 @@
 #include <dm.h>
 #include <miiphy.h>
 #include <phy.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 static char last_op[2];
diff --git a/cmd/mem.c b/cmd/mem.c
index 5970dff8f5ca..ca2b2fabb333 100644
--- a/cmd/mem.c
+++ b/cmd/mem.c
@@ -22,6 +22,7 @@
 #include <log.h>
 #include <mapmem.h>
 #include <rand.h>
+#include <stdio.h>
 #include <time.h>
 #include <watchdog.h>
 #include <asm/global_data.h>
diff --git a/cmd/mii.c b/cmd/mii.c
index a6524e400e70..be67ea70ba2b 100644
--- a/cmd/mii.c
+++ b/cmd/mii.c
@@ -12,6 +12,7 @@
 #include <command.h>
 #include <dm.h>
 #include <miiphy.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 typedef struct _MII_field_desc_t {
diff --git a/cmd/misc.c b/cmd/misc.c
index 8743a34cff56..c349ade10f1b 100644
--- a/cmd/misc.c
+++ b/cmd/misc.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <command.h>
 #include <console.h>
+#include <stdio.h>
 #include <time.h>
 #include <linux/delay.h>
 #include <linux/string.h>
diff --git a/cmd/mmc.c b/cmd/mmc.c
index bc7e991c86e9..5d2a0e002b97 100644
--- a/cmd/mmc.c
+++ b/cmd/mmc.c
@@ -14,6 +14,7 @@
 #include <part.h>
 #include <sparse_format.h>
 #include <image-sparse.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 static int curr_device = -1;
diff --git a/cmd/mp.c b/cmd/mp.c
index a14ebbd0b568..d82a8675e66f 100644
--- a/cmd/mp.c
+++ b/cmd/mp.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <command.h>
 #include <cpu_func.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 static int cpu_status_all(void)
diff --git a/cmd/mtd.c b/cmd/mtd.c
index fe1e94f6cc4c..25c288f356c0 100644
--- a/cmd/mtd.c
+++ b/cmd/mtd.c
@@ -14,6 +14,7 @@
 #include <malloc.h>
 #include <mapmem.h>
 #include <mtd.h>
+#include <stdio.h>
 #include <dm/devres.h>
 #include <linux/err.h>
 #include <linux/string.h>
diff --git a/cmd/mtdparts.c b/cmd/mtdparts.c
index 077793e88576..875424013fea 100644
--- a/cmd/mtdparts.c
+++ b/cmd/mtdparts.c
@@ -75,6 +75,7 @@
 #include <env.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <jffs2/load_kernel.h>
 #include <linux/list.h>
diff --git a/cmd/mvebu/bubt.c b/cmd/mvebu/bubt.c
index 3df3ffd78a34..598a61be1fff 100644
--- a/cmd/mvebu/bubt.c
+++ b/cmd/mvebu/bubt.c
@@ -11,6 +11,7 @@
 #include <flash.h>
 #include <image.h>
 #include <net.h>
+#include <stdio.h>
 #include <vsprintf.h>
 #include <errno.h>
 #include <dm.h>
diff --git a/cmd/nand.c b/cmd/nand.c
index 880ee53d837d..787baa78c55e 100644
--- a/cmd/nand.c
+++ b/cmd/nand.c
@@ -22,6 +22,7 @@
 #include <common.h>
 #include <bootstage.h>
 #include <image.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <linux/mtd/mtd.h>
 #include <command.h>
diff --git a/cmd/net.c b/cmd/net.c
index c505656a949a..d70206587104 100644
--- a/cmd/net.c
+++ b/cmd/net.c
@@ -13,6 +13,7 @@
 #include <env.h>
 #include <image.h>
 #include <net.h>
+#include <stdio.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 c73472ec2260..e859dfc29bb4 100644
--- a/cmd/nvedit.c
+++ b/cmd/nvedit.c
@@ -35,6 +35,7 @@
 #include <errno.h>
 #include <malloc.h>
 #include <mapmem.h>
+#include <stdio.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 4f0148b074c9..aac7fb91a606 100644
--- a/cmd/nvedit_efi.c
+++ b/cmd/nvedit_efi.c
@@ -16,6 +16,7 @@
 #include <malloc.h>
 #include <mapmem.h>
 #include <rtc.h>
+#include <stdio.h>
 #include <uuid.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
diff --git a/cmd/onenand.c b/cmd/onenand.c
index fa12f0dec757..af974b93fc5f 100644
--- a/cmd/onenand.c
+++ b/cmd/onenand.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <command.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/cmd/osd.c b/cmd/osd.c
index c1ef7eb8cda2..2d9ac604cae3 100644
--- a/cmd/osd.c
+++ b/cmd/osd.c
@@ -13,6 +13,7 @@
 #include <command.h>
 #include <dm.h>
 #include <hexdump.h>
+#include <stdio.h>
 #include <video_osd.h>
 #include <malloc.h>
 #include <linux/string.h>
diff --git a/cmd/part.c b/cmd/part.c
index f53edac8357b..796fb65baccc 100644
--- a/cmd/part.c
+++ b/cmd/part.c
@@ -20,6 +20,7 @@
 #include <command.h>
 #include <env.h>
 #include <part.h>
+#include <stdio.h>
 #include <vsprintf.h>
 #include <linux/string.h>
 
diff --git a/cmd/pci.c b/cmd/pci.c
index c2d4e5d4ed67..b8818b5f3d7a 100644
--- a/cmd/pci.c
+++ b/cmd/pci.c
@@ -19,6 +19,7 @@
 #include <console.h>
 #include <dm.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/processor.h>
 #include <asm/io.h>
 #include <pci.h>
diff --git a/cmd/pinmux.c b/cmd/pinmux.c
index 6f8a3fd94405..60856cdc3c4f 100644
--- a/cmd/pinmux.c
+++ b/cmd/pinmux.c
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <dm.h>
 #include <errno.h>
+#include <stdio.h>
 #include <dm/pinctrl.h>
 #include <dm/uclass-internal.h>
 #include <linux/string.h>
diff --git a/cmd/pmc.c b/cmd/pmc.c
index 9a3ba2bffc50..753d7b8fbf04 100644
--- a/cmd/pmc.c
+++ b/cmd/pmc.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <command.h>
 #include <dm.h>
+#include <stdio.h>
 #include <power/acpi_pmc.h>
 
 static int get_pmc_dev(struct udevice **devp)
diff --git a/cmd/pmic.c b/cmd/pmic.c
index 3bda0534a36c..6712d9238dc2 100644
--- a/cmd/pmic.c
+++ b/cmd/pmic.c
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <errno.h>
 #include <dm.h>
+#include <stdio.h>
 #include <dm/uclass-internal.h>
 #include <power/pmic.h>
 
diff --git a/cmd/pxe.c b/cmd/pxe.c
index 6372fc987187..84f7c9f37efb 100644
--- a/cmd/pxe.c
+++ b/cmd/pxe.c
@@ -8,6 +8,7 @@
 #include <command.h>
 #include <fs.h>
 #include <net.h>
+#include <stdio.h>
 
 #include "pxe_utils.h"
 
diff --git a/cmd/pxe_utils.c b/cmd/pxe_utils.c
index 8716e782f6aa..425e6f984fb1 100644
--- a/cmd/pxe_utils.c
+++ b/cmd/pxe_utils.c
@@ -13,6 +13,7 @@
 #include <mapmem.h>
 #include <lcd.h>
 #include <net.h>
+#include <stdio.h>
 #include <linux/string.h>
 #include <linux/ctype.h>
 #include <errno.h>
diff --git a/cmd/qfw.c b/cmd/qfw.c
index bb571487f068..4470059975a9 100644
--- a/cmd/qfw.c
+++ b/cmd/qfw.c
@@ -8,6 +8,7 @@
 #include <env.h>
 #include <errno.h>
 #include <qfw.h>
+#include <stdio.h>
 
 /*
  * This function prepares kernel for zboot. It loads kernel data
diff --git a/cmd/read.c b/cmd/read.c
index 34f53f9a292e..f1d23fb478f3 100644
--- a/cmd/read.c
+++ b/cmd/read.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <command.h>
 #include <part.h>
+#include <stdio.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 6e91c1775375..a9105561b6e7 100644
--- a/cmd/regulator.c
+++ b/cmd/regulator.c
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <errno.h>
 #include <dm.h>
+#include <stdio.h>
 #include <dm/uclass-internal.h>
 #include <linux/printk.h>
 #include <linux/string.h>
diff --git a/cmd/reiser.c b/cmd/reiser.c
index 3db926f80648..8a2f976a2138 100644
--- a/cmd/reiser.c
+++ b/cmd/reiser.c
@@ -13,6 +13,7 @@
 #include <command.h>
 #include <env.h>
 #include <image.h>
+#include <stdio.h>
 #include <linux/ctype.h>
 #include <asm/byteorder.h>
 #include <reiserfs.h>
diff --git a/cmd/remoteproc.c b/cmd/remoteproc.c
index 7adf45534003..660a1b563577 100644
--- a/cmd/remoteproc.c
+++ b/cmd/remoteproc.c
@@ -9,6 +9,7 @@
 #include <errno.h>
 #include <malloc.h>
 #include <remoteproc.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 /**
diff --git a/cmd/rng.c b/cmd/rng.c
index 9747c11be460..d5a1faf7a77b 100644
--- a/cmd/rng.c
+++ b/cmd/rng.c
@@ -10,6 +10,7 @@
 #include <hexdump.h>
 #include <malloc.h>
 #include <rng.h>
+#include <stdio.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 f181ec611191..4eda6fa3e947 100644
--- a/cmd/rockusb.c
+++ b/cmd/rockusb.c
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <console.h>
 #include <g_dnl.h>
+#include <stdio.h>
 #include <usb.h>
 #include <asm/arch-rockchip/f_rockusb.h>
 
diff --git a/cmd/rtc.c b/cmd/rtc.c
index b3f46f13eb40..f048494c551c 100644
--- a/cmd/rtc.c
+++ b/cmd/rtc.c
@@ -8,6 +8,7 @@
 #include <i2c.h>
 #include <mapmem.h>
 #include <rtc.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 #define MAX_RTC_BYTES 32
diff --git a/cmd/sata.c b/cmd/sata.c
index 9b19ca49b18d..2c7be9c5fe8e 100644
--- a/cmd/sata.c
+++ b/cmd/sata.c
@@ -16,6 +16,7 @@
 #include <command.h>
 #include <part.h>
 #include <sata.h>
+#include <stdio.h>
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
 #include <linux/string.h>
diff --git a/cmd/sb.c b/cmd/sb.c
index 0d55818e3c67..16e37c18cb5e 100644
--- a/cmd/sb.c
+++ b/cmd/sb.c
@@ -8,6 +8,7 @@
 #include <command.h>
 #include <dm.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/state.h>
 
diff --git a/cmd/scsi.c b/cmd/scsi.c
index 61437ef21eb0..6e3f3308f1e1 100644
--- a/cmd/scsi.c
+++ b/cmd/scsi.c
@@ -11,6 +11,7 @@
 #include <blk.h>
 #include <command.h>
 #include <scsi.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 static int scsi_curr_dev; /* current device */
diff --git a/cmd/setexpr.c b/cmd/setexpr.c
index 1569d7ad72dd..29d6e3eac020 100644
--- a/cmd/setexpr.c
+++ b/cmd/setexpr.c
@@ -14,6 +14,7 @@
 #include <env.h>
 #include <log.h>
 #include <mapmem.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 static ulong get_arg(char *s, int w)
diff --git a/cmd/sf.c b/cmd/sf.c
index c74651d23b6e..cf4be7774376 100644
--- a/cmd/sf.c
+++ b/cmd/sf.c
@@ -16,6 +16,7 @@
 #include <mapmem.h>
 #include <spi.h>
 #include <spi_flash.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/cache.h>
 #include <jffs2/jffs2.h>
diff --git a/cmd/smccc.c b/cmd/smccc.c
index 101959c848ab..89ef440f1dc8 100644
--- a/cmd/smccc.c
+++ b/cmd/smccc.c
@@ -3,6 +3,7 @@
  * Copyright 2018
  * Michalis Pappas <mpappas@fastmail.fm>
  */
+#include <stdio.h>
 #include <asm/psci.h>
 #include <common.h>
 #include <command.h>
diff --git a/cmd/sound.c b/cmd/sound.c
index fdcde3653390..95d7b8b6ecc4 100644
--- a/cmd/sound.c
+++ b/cmd/sound.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <fdtdec.h>
 #include <sound.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/cmd/source.c b/cmd/source.c
index b6c709a3d258..b7dfeb0adf27 100644
--- a/cmd/source.c
+++ b/cmd/source.c
@@ -21,6 +21,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <mapmem.h>
+#include <stdio.h>
 #include <asm/byteorder.h>
 #include <asm/io.h>
 
diff --git a/cmd/spi.c b/cmd/spi.c
index df05e828fd1d..7184e44c030e 100644
--- a/cmd/spi.c
+++ b/cmd/spi.c
@@ -13,6 +13,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <spi.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 /*-----------------------------------------------------------------------
diff --git a/cmd/spl.c b/cmd/spl.c
index 472703f8fe15..f6b9f4744287 100644
--- a/cmd/spl.c
+++ b/cmd/spl.c
@@ -10,6 +10,7 @@
 #include <env.h>
 #include <image.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/libfdt.h>
 
diff --git a/cmd/strings.c b/cmd/strings.c
index bf4efa4aa3a3..adc6e8147126 100644
--- a/cmd/strings.c
+++ b/cmd/strings.c
@@ -9,6 +9,7 @@
 #include <config.h>
 #include <common.h>
 #include <command.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 static char *start_addr, *last_addr;
diff --git a/cmd/sysboot.c b/cmd/sysboot.c
index 38aa2a2cdb03..4f6869382f2d 100644
--- a/cmd/sysboot.c
+++ b/cmd/sysboot.c
@@ -4,6 +4,7 @@
 #include <command.h>
 #include <env.h>
 #include <fs.h>
+#include <stdio.h>
 #include <linux/string.h>
 #include "pxe_utils.h"
 
diff --git a/cmd/terminal.c b/cmd/terminal.c
index f6e4d2539e35..3af67bb2d00e 100644
--- a/cmd/terminal.c
+++ b/cmd/terminal.c
@@ -9,6 +9,7 @@
  */
 #include <common.h>
 #include <command.h>
+#include <stdio.h>
 #include <stdio_dev.h>
 #include <serial.h>
 
diff --git a/cmd/thordown.c b/cmd/thordown.c
index f36fb20e26e1..e837064ffdd5 100644
--- a/cmd/thordown.c
+++ b/cmd/thordown.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <stdio.h>
 #include <thor.h>
 #include <dfu.h>
 #include <g_dnl.h>
diff --git a/cmd/ti/ddr3.c b/cmd/ti/ddr3.c
index f3c3e7e9fbe5..6be51f8c3358 100644
--- a/cmd/ti/ddr3.c
+++ b/cmd/ti/ddr3.c
@@ -9,6 +9,7 @@
 #include <env.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/arch/hardware.h>
 #include <asm/cache.h>
 #include <asm/emif.h>
diff --git a/cmd/time.c b/cmd/time.c
index db8c1892df4a..7d4345bbf74d 100644
--- a/cmd/time.c
+++ b/cmd/time.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <stdio.h>
 
 static void report_time(ulong cycles)
 {
diff --git a/cmd/tlv_eeprom.c b/cmd/tlv_eeprom.c
index 663beeb9f73b..5a9abf440584 100644
--- a/cmd/tlv_eeprom.c
+++ b/cmd/tlv_eeprom.c
@@ -17,6 +17,7 @@
 #include <env.h>
 #include <init.h>
 #include <net.h>
+#include <stdio.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 88c9e08e318d..943bd0bfc9a2 100644
--- a/cmd/tpm-common.c
+++ b/cmd/tpm-common.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <env.h>
 #include <malloc.h>
+#include <stdio.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 77cd5e3bd7c7..4e935b286760 100644
--- a/cmd/tpm-v1.c
+++ b/cmd/tpm-v1.c
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <env.h>
 #include <malloc.h>
+#include <stdio.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 392811f12795..33cc85fa6f08 100644
--- a/cmd/tpm-v2.c
+++ b/cmd/tpm-v2.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <log.h>
 #include <mapmem.h>
+#include <stdio.h>
 #include <tpm-common.h>
 #include <tpm-v2.h>
 #include <linux/string.h>
diff --git a/cmd/tpm_test.c b/cmd/tpm_test.c
index fbaa1de66ee1..39d1ad2b4af9 100644
--- a/cmd/tpm_test.c
+++ b/cmd/tpm_test.c
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <cpu_func.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <tpm-v1.h>
 #include <linux/printk.h>
diff --git a/cmd/trace.c b/cmd/trace.c
index 4ce47c762760..a09d837c0496 100644
--- a/cmd/trace.c
+++ b/cmd/trace.c
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <env.h>
 #include <mapmem.h>
+#include <stdio.h>
 #include <trace.h>
 #include <asm/io.h>
 
diff --git a/cmd/tsi148.c b/cmd/tsi148.c
index cbe898475bac..6a9e346f27d6 100644
--- a/cmd/tsi148.c
+++ b/cmd/tsi148.c
@@ -11,6 +11,7 @@
 #include <command.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <pci.h>
 #include <linux/string.h>
diff --git a/cmd/ubi.c b/cmd/ubi.c
index afd45bab9435..707f1a9b87d0 100644
--- a/cmd/ubi.c
+++ b/cmd/ubi.c
@@ -20,6 +20,7 @@
 #include <mtd.h>
 #include <nand.h>
 #include <onenand_uboot.h>
+#include <stdio.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 a26b653d61e9..1e2dfab2f491 100644
--- a/cmd/ubifs.c
+++ b/cmd/ubifs.c
@@ -15,6 +15,7 @@
 #include <config.h>
 #include <command.h>
 #include <log.h>
+#include <stdio.h>
 #include <ubifs_uboot.h>
 
 static int ubifs_initialized;
diff --git a/cmd/universe.c b/cmd/universe.c
index 37437a1cdddd..c7edde24d453 100644
--- a/cmd/universe.c
+++ b/cmd/universe.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <command.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <pci.h>
 #include <linux/string.h>
diff --git a/cmd/unlz4.c b/cmd/unlz4.c
index 4ae7f34d36e7..7221a8bd2c79 100644
--- a/cmd/unlz4.c
+++ b/cmd/unlz4.c
@@ -8,6 +8,7 @@
 #include <command.h>
 #include <env.h>
 #include <lz4.h>
+#include <stdio.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 9b28328a1d76..a2d21ffa0a80 100644
--- a/cmd/unzip.c
+++ b/cmd/unzip.c
@@ -9,6 +9,7 @@
 #include <env.h>
 #include <gzip.h>
 #include <part.h>
+#include <stdio.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 04205a7a52e1..cc2f4f62e99d 100644
--- a/cmd/usb.c
+++ b/cmd/usb.c
@@ -16,6 +16,7 @@
 #include <command.h>
 #include <console.h>
 #include <dm.h>
+#include <stdio.h>
 #include <dm/uclass-internal.h>
 #include <memalign.h>
 #include <asm/byteorder.h>
diff --git a/cmd/usb_mass_storage.c b/cmd/usb_mass_storage.c
index 43fdb097078e..51d5ad78c633 100644
--- a/cmd/usb_mass_storage.c
+++ b/cmd/usb_mass_storage.c
@@ -14,6 +14,7 @@
 #include <g_dnl.h>
 #include <malloc.h>
 #include <part.h>
+#include <stdio.h>
 #include <usb.h>
 #include <usb_mass_storage.h>
 #include <watchdog.h>
diff --git a/cmd/version.c b/cmd/version.c
index 2c321a92f9b2..dcd91f09fa13 100644
--- a/cmd/version.c
+++ b/cmd/version.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <command.h>
 #include <display_options.h>
+#include <stdio.h>
 #include <version.h>
 #include <linux/compiler.h>
 #ifdef CONFIG_SYS_COREBOOT
diff --git a/cmd/w1.c b/cmd/w1.c
index 5682981f2df2..6b3ecea8b039 100644
--- a/cmd/w1.c
+++ b/cmd/w1.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <command.h>
 #include <dm.h>
+#include <stdio.h>
 #include <w1.h>
 #include <w1-eeprom.h>
 #include <dm/device-internal.h>
diff --git a/cmd/wdt.c b/cmd/wdt.c
index 27410981e7bf..fff95a93b327 100644
--- a/cmd/wdt.c
+++ b/cmd/wdt.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <command.h>
 #include <dm.h>
+#include <stdio.h>
 #include <wdt.h>
 
 static struct udevice *currdev;
diff --git a/cmd/x86/fsp.c b/cmd/x86/fsp.c
index 82e4415b16eb..ef49b530b55e 100644
--- a/cmd/x86/fsp.c
+++ b/cmd/x86/fsp.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <stdio.h>
 #include <asm/fsp/fsp_support.h>
 #include <asm/global_data.h>
 
diff --git a/cmd/x86/hob.c b/cmd/x86/hob.c
index 1b8dfa99f7b1..37f540521651 100644
--- a/cmd/x86/hob.c
+++ b/cmd/x86/hob.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <command.h>
 #include <efi.h>
+#include <stdio.h>
 #include <uuid.h>
 #include <asm/global_data.h>
 #include <asm/hob.h>
diff --git a/cmd/x86/mtrr.c b/cmd/x86/mtrr.c
index 3e46a342a055..6bc4fb1c9be4 100644
--- a/cmd/x86/mtrr.c
+++ b/cmd/x86/mtrr.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <command.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/msr.h>
 #include <asm/mp.h>
 #include <asm/mtrr.h>
diff --git a/cmd/ximg.c b/cmd/ximg.c
index c9cf4009d0d7..c6016719dc96 100644
--- a/cmd/ximg.c
+++ b/cmd/ximg.c
@@ -19,6 +19,7 @@
 #include <image.h>
 #include <malloc.h>
 #include <mapmem.h>
+#include <stdio.h>
 #include <watchdog.h>
 #if defined(CONFIG_BZIP2)
 #include <bzlib.h>
diff --git a/cmd/yaffs2.c b/cmd/yaffs2.c
index 1ecb5bea8e26..3a3dba3cfd38 100644
--- a/cmd/yaffs2.c
+++ b/cmd/yaffs2.c
@@ -14,6 +14,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 #include <config.h>
diff --git a/cmd/zfs.c b/cmd/zfs.c
index d01835573a4c..9a03722a0306 100644
--- a/cmd/zfs.c
+++ b/cmd/zfs.c
@@ -14,6 +14,7 @@
 #include <command.h>
 #include <env.h>
 #include <image.h>
+#include <stdio.h>
 #include <linux/ctype.h>
 #include <asm/byteorder.h>
 #include <zfs_common.h>
diff --git a/cmd/zip.c b/cmd/zip.c
index 8ad376846476..407390a95a48 100644
--- a/cmd/zip.c
+++ b/cmd/zip.c
@@ -8,6 +8,7 @@
 #include <command.h>
 #include <env.h>
 #include <gzip.h>
+#include <stdio.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 6db005259777..1effce6f7e55 100644
--- a/common/autoboot.c
+++ b/common/autoboot.c
@@ -18,6 +18,7 @@
 #include <memalign.h>
 #include <menu.h>
 #include <post.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
diff --git a/common/avb_verify.c b/common/avb_verify.c
index 6894f6872e94..7a7a50968525 100644
--- a/common/avb_verify.c
+++ b/common/avb_verify.c
@@ -11,6 +11,7 @@
 #include <image.h>
 #include <malloc.h>
 #include <part.h>
+#include <stdio.h>
 #include <tee.h>
 #include <linux/string.h>
 #include <tee/optee_ta_avb.h>
diff --git a/common/board_f.c b/common/board_f.c
index fa83d964ceb1..384e7a69c42c 100644
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -38,6 +38,7 @@
 #include <spl.h>
 #endif
 #include <status_led.h>
+#include <stdio.h>
 #include <sysreset.h>
 #include <timer.h>
 #include <trace.h>
diff --git a/common/board_info.c b/common/board_info.c
index b54aa30a9442..bfa5324e8217 100644
--- a/common/board_info.c
+++ b/common/board_info.c
@@ -2,6 +2,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/libfdt.h>
 #include <linux/compiler.h>
diff --git a/common/board_r.c b/common/board_r.c
index 469362c103ea..15f3209b2924 100644
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -21,6 +21,7 @@
 #include <irq_func.h>
 #include <log.h>
 #include <net.h>
+#include <stdio.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 f9ff1ce78ba8..aaacd3ba4b02 100644
--- a/common/bootm.c
+++ b/common/bootm.c
@@ -17,6 +17,7 @@
 #include <malloc.h>
 #include <mapmem.h>
 #include <net.h>
+#include <stdio.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 9c78bba8e61d..1987c574d995 100644
--- a/common/bootm_os.c
+++ b/common/bootm_os.c
@@ -14,6 +14,7 @@
 #include <image.h>
 #include <lmb.h>
 #include <log.h>
+#include <stdio.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 dac891fbc5e3..cd04ad9894df 100644
--- a/common/bootretry.c
+++ b/common/bootretry.c
@@ -9,6 +9,7 @@
 #include <cli.h>
 #include <env.h>
 #include <errno.h>
+#include <stdio.h>
 #include <time.h>
 #include <watchdog.h>
 
diff --git a/common/bootstage.c b/common/bootstage.c
index 6eb837679493..4656951675cc 100644
--- a/common/bootstage.c
+++ b/common/bootstage.c
@@ -16,6 +16,7 @@
 #include <malloc.h>
 #include <sort.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/compiler.h>
 #include <linux/libfdt.h>
diff --git a/common/cli.c b/common/cli.c
index 4fc4c206e4df..88053b587014 100644
--- a/common/cli.c
+++ b/common/cli.c
@@ -18,6 +18,7 @@
 #include <fdtdec.h>
 #include <hang.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/string.h>
 
diff --git a/common/cli_readline.c b/common/cli_readline.c
index 927c5066a9e0..78c1faad8f75 100644
--- a/common/cli_readline.c
+++ b/common/cli_readline.c
@@ -12,6 +12,7 @@
 #include <bootretry.h>
 #include <cli.h>
 #include <command.h>
+#include <stdio.h>
 #include <time.h>
 #include <watchdog.h>
 #include <asm/global_data.h>
diff --git a/common/cli_simple.c b/common/cli_simple.c
index b7f21bbbe75d..c8e26b9a6977 100644
--- a/common/cli_simple.c
+++ b/common/cli_simple.c
@@ -15,6 +15,7 @@
 #include <console.h>
 #include <env.h>
 #include <log.h>
+#include <stdio.h>
 #include <linux/ctype.h>
 #include <linux/string.h>
 
diff --git a/common/command.c b/common/command.c
index 3bc2038f97f9..dfad65d735cd 100644
--- a/common/command.c
+++ b/common/command.c
@@ -14,6 +14,7 @@
 #include <console.h>
 #include <env.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/global_data.h>
 #include <linux/ctype.h>
diff --git a/common/common_fit.c b/common/common_fit.c
index dfb2134fcf11..50b165016d2d 100644
--- a/common/common_fit.c
+++ b/common/common_fit.c
@@ -8,6 +8,7 @@
 #include <errno.h>
 #include <image.h>
 #include <log.h>
+#include <stdio.h>
 #include <linux/libfdt.h>
 #include <linux/string.h>
 
diff --git a/common/console.c b/common/console.c
index 86c42cb8e5b2..556fc60139a5 100644
--- a/common/console.c
+++ b/common/console.c
@@ -16,6 +16,7 @@
 #include <mapmem.h>
 #include <os.h>
 #include <serial.h>
+#include <stdio.h>
 #include <stdio_dev.h>
 #include <exports.h>
 #include <env_internal.h>
diff --git a/common/ddr_spd.c b/common/ddr_spd.c
index 58dc9b3781b7..241549bd4856 100644
--- a/common/ddr_spd.c
+++ b/common/ddr_spd.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <ddr_spd.h>
+#include <stdio.h>
 
 /* used for ddr1 and ddr2 spd */
 static int
diff --git a/common/dlmalloc.c b/common/dlmalloc.c
index dc584f792b3a..9493d1158d40 100644
--- a/common/dlmalloc.c
+++ b/common/dlmalloc.c
@@ -1,5 +1,6 @@
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/string.h>
 
diff --git a/common/edid.c b/common/edid.c
index 553ab8fd01a1..d539c5215070 100644
--- a/common/edid.c
+++ b/common/edid.c
@@ -14,6 +14,7 @@
 #include <errno.h>
 #include <fdtdec.h>
 #include <log.h>
+#include <stdio.h>
 #include <linux/ctype.h>
 #include <linux/string.h>
 
diff --git a/common/eeprom/eeprom_field.c b/common/eeprom/eeprom_field.c
index f56eebe679f7..e68cf5d48101 100644
--- a/common/eeprom/eeprom_field.c
+++ b/common/eeprom/eeprom_field.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <linux/string.h>
 #include <eeprom_field.h>
 
diff --git a/common/eeprom/eeprom_layout.c b/common/eeprom/eeprom_layout.c
index 338185d58c36..cfe457c7444d 100644
--- a/common/eeprom/eeprom_layout.c
+++ b/common/eeprom/eeprom_layout.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <linux/kernel.h>
 #include <eeprom_layout.h>
 #include <eeprom_field.h>
diff --git a/common/fdt_support.c b/common/fdt_support.c
index 9b685cc1736a..c768e4c8bab1 100644
--- a/common/fdt_support.c
+++ b/common/fdt_support.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <mapmem.h>
 #include <net.h>
+#include <stdio.h>
 #include <stdio_dev.h>
 #include <linux/ctype.h>
 #include <linux/string.h>
diff --git a/common/flash.c b/common/flash.c
index 62f4c98749ae..c01cb28b92f9 100644
--- a/common/flash.c
+++ b/common/flash.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <flash.h>
 #include <log.h>
+#include <stdio.h>
 #include <uuid.h>
 #include <linux/string.h>
 
diff --git a/common/hash.c b/common/hash.c
index e1be8dc05f9d..f6d032038f73 100644
--- a/common/hash.c
+++ b/common/hash.c
@@ -17,6 +17,7 @@
 #include <malloc.h>
 #include <mapmem.h>
 #include <hw_sha.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/common/image-android-dt.c b/common/image-android-dt.c
index a2d52df4a2a9..74dcbdd1608e 100644
--- a/common/image-android-dt.c
+++ b/common/image-android-dt.c
@@ -7,6 +7,7 @@
 #include <image-android-dt.h>
 #include <dt_table.h>
 #include <common.h>
+#include <stdio.h>
 #include <linux/libfdt.h>
 #include <mapmem.h>
 
diff --git a/common/image-android.c b/common/image-android.c
index 7f76be86790c..1e79f6b144c7 100644
--- a/common/image-android.c
+++ b/common/image-android.c
@@ -10,6 +10,7 @@
 #include <android_image.h>
 #include <malloc.h>
 #include <errno.h>
+#include <stdio.h>
 #include <asm/unaligned.h>
 #include <mapmem.h>
 #include <linux/libfdt.h>
diff --git a/common/image-cipher.c b/common/image-cipher.c
index c611eb52948f..3a4ba40b743b 100644
--- a/common/image-cipher.c
+++ b/common/image-cipher.c
@@ -9,6 +9,7 @@
 #else
 #include <common.h>
 #include <malloc.h>
+#include <stdio.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 41fce043f544..af93298ffab3 100644
--- a/common/image-fdt.c
+++ b/common/image-fdt.c
@@ -17,6 +17,7 @@
 #include <lmb.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/libfdt.h>
 #include <mapmem.h>
diff --git a/common/image-fit-sig.c b/common/image-fit-sig.c
index 0c36649dce0b..1247d0280e2f 100644
--- a/common/image-fit-sig.c
+++ b/common/image-fit-sig.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/string.h>
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/common/image-fit.c b/common/image-fit.c
index 5d5dd7dc40a4..76318ca6ed3c 100644
--- a/common/image-fit.c
+++ b/common/image-fit.c
@@ -14,6 +14,7 @@
 #include <linux/libfdt.h>
 #include <u-boot/crc.h>
 #else
+#include <stdio.h>
 #include <linux/compiler.h>
 #include <linux/kconfig.h>
 #include <common.h>
diff --git a/common/image.c b/common/image.c
index e183a9cefa0b..61c608858565 100644
--- a/common/image.c
+++ b/common/image.c
@@ -15,6 +15,7 @@
 #include <lmb.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
diff --git a/common/iomux.c b/common/iomux.c
index d552e0ee61ac..2fa90eadc65b 100644
--- a/common/iomux.c
+++ b/common/iomux.c
@@ -8,6 +8,7 @@
 #include <console.h>
 #include <serial.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 #if CONFIG_IS_ENABLED(CONSOLE_MUX)
diff --git a/common/kgdb.c b/common/kgdb.c
index 2f3bb7f6142d..62997f100055 100644
--- a/common/kgdb.c
+++ b/common/kgdb.c
@@ -88,6 +88,7 @@
  ****************************************************************************/
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/ptrace.h>
 #include <linux/string.h>
 
diff --git a/common/kgdb_stubs.c b/common/kgdb_stubs.c
index 66aed7cea1c7..43d9a3646a34 100644
--- a/common/kgdb_stubs.c
+++ b/common/kgdb_stubs.c
@@ -11,6 +11,7 @@
 #include <cpu_func.h>
 #include <kgdb.h>
 #include <serial.h>
+#include <stdio.h>
 #include <asm/ptrace.h>
 
 int (*debugger_exception_handler)(struct pt_regs *);
diff --git a/common/lcd.c b/common/lcd.c
index 04736d6c9805..442e61d9fd20 100644
--- a/common/lcd.c
+++ b/common/lcd.c
@@ -13,6 +13,7 @@
 #include <cpu_func.h>
 #include <env_callback.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <init.h>
 #include <asm/global_data.h>
diff --git a/common/lcd_console_rotation.c b/common/lcd_console_rotation.c
index a5f5c6da7bea..8fc333d4e323 100644
--- a/common/lcd_console_rotation.c
+++ b/common/lcd_console_rotation.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <lcd.h>
+#include <stdio.h>
 #include <video_font.h>		/* Get font data, width and height */
 
 static void lcd_putc_xy90(struct console_t *pcons, ushort x, ushort y, char c)
diff --git a/common/log_console.c b/common/log_console.c
index 357dff29168f..5084dcc8d82e 100644
--- a/common/log_console.c
+++ b/common/log_console.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/common/menu.c b/common/menu.c
index 0d08321e0e7f..d61c274eedf2 100644
--- a/common/menu.c
+++ b/common/menu.c
@@ -8,6 +8,7 @@
 #include <cli.h>
 #include <malloc.h>
 #include <errno.h>
+#include <stdio.h>
 #include <linux/list.h>
 #include <linux/string.h>
 
diff --git a/common/miiphyutil.c b/common/miiphyutil.c
index fa273f1c2017..5680157b7202 100644
--- a/common/miiphyutil.c
+++ b/common/miiphyutil.c
@@ -14,6 +14,7 @@
 #include <log.h>
 #include <miiphy.h>
 #include <phy.h>
+#include <stdio.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 
diff --git a/common/spl/spl.c b/common/spl/spl.c
index bea542ed2e35..4c852d347547 100644
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -18,6 +18,7 @@
 #include <log.h>
 #include <serial.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <nand.h>
diff --git a/common/spl/spl_ext.c b/common/spl/spl_ext.c
index d73f06276215..50f0f5f4ca77 100644
--- a/common/spl/spl_ext.c
+++ b/common/spl/spl_ext.c
@@ -4,6 +4,7 @@
 #include <env.h>
 #include <part.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 #include <ext4fs.h>
 #include <errno.h>
diff --git a/common/spl/spl_fat.c b/common/spl/spl_fat.c
index c2eb097365ff..20b440906500 100644
--- a/common/spl/spl_fat.c
+++ b/common/spl/spl_fat.c
@@ -12,6 +12,7 @@
 #include <env.h>
 #include <log.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 #include <fat.h>
 #include <errno.h>
diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c
index 5da3fceb0de6..87d482695583 100644
--- a/common/spl/spl_fit.c
+++ b/common/spl/spl_fit.c
@@ -13,6 +13,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <linux/libfdt.h>
diff --git a/common/spl/spl_legacy.c b/common/spl/spl_legacy.c
index 82d032680616..6813759aa4e2 100644
--- a/common/spl/spl_legacy.c
+++ b/common/spl/spl_legacy.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <spl.h>
+#include <stdio.h>
 
 #include <lzma/LzmaTypes.h>
 #include <lzma/LzmaDec.h>
diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c
index add2785b4e39..1cfe4b2b442d 100644
--- a/common/spl/spl_mmc.c
+++ b/common/spl/spl_mmc.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <part.h>
 #include <spl.h>
+#include <stdio.h>
 #include <linux/compiler.h>
 #include <errno.h>
 #include <asm/u-boot.h>
diff --git a/common/spl/spl_nand.c b/common/spl/spl_nand.c
index d13a5245974f..15101f394233 100644
--- a/common/spl/spl_nand.c
+++ b/common/spl/spl_nand.c
@@ -9,6 +9,7 @@
 #include <image.h>
 #include <log.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <nand.h>
 #include <linux/libfdt_env.h>
diff --git a/common/spl/spl_net.c b/common/spl/spl_net.c
index 6ac8b65eebd0..ac7be6360bbc 100644
--- a/common/spl/spl_net.c
+++ b/common/spl/spl_net.c
@@ -13,6 +13,7 @@
 #include <log.h>
 #include <spl.h>
 #include <net.h>
+#include <stdio.h>
 #include <linux/libfdt.h>
 #include <linux/string.h>
 
diff --git a/common/spl/spl_nor.c b/common/spl/spl_nor.c
index a1966cbad85f..a198577a2bdf 100644
--- a/common/spl/spl_nor.c
+++ b/common/spl/spl_nor.c
@@ -7,6 +7,7 @@
 #include <image.h>
 #include <log.h>
 #include <spl.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 static ulong spl_nor_load_read(struct spl_load_info *load, ulong sector,
diff --git a/common/spl/spl_sata.c b/common/spl/spl_sata.c
index e108af0576aa..3ac3b743d992 100644
--- a/common/spl/spl_sata.c
+++ b/common/spl/spl_sata.c
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 #include <sata.h>
 #include <scsi.h>
diff --git a/common/spl/spl_spi.c b/common/spl/spl_spi.c
index 6a4e03328709..caa5ed10e1a8 100644
--- a/common/spl/spl_spi.c
+++ b/common/spl/spl_spi.c
@@ -15,6 +15,7 @@
 #include <spi_flash.h>
 #include <errno.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/common/spl/spl_ubi.c b/common/spl/spl_ubi.c
index 6a3679300d7e..a142268c0f7e 100644
--- a/common/spl/spl_ubi.c
+++ b/common/spl/spl_ubi.c
@@ -9,6 +9,7 @@
 #include <image.h>
 #include <nand.h>
 #include <onenand_uboot.h>
+#include <stdio.h>
 #include <ubispl.h>
 #include <spl.h>
 #include <linux/string.h>
diff --git a/common/spl/spl_usb.c b/common/spl/spl_usb.c
index 3648de349273..33bdc3617486 100644
--- a/common/spl/spl_usb.c
+++ b/common/spl/spl_usb.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <log.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 #include <errno.h>
 #include <usb.h>
diff --git a/common/spl/spl_ymodem.c b/common/spl/spl_ymodem.c
index c1958613299c..7124f604b0ab 100644
--- a/common/spl/spl_ymodem.c
+++ b/common/spl/spl_ymodem.c
@@ -13,6 +13,7 @@
 #include <image.h>
 #include <log.h>
 #include <spl.h>
+#include <stdio.h>
 #include <xyzModem.h>
 #include <asm/u-boot.h>
 #include <linux/libfdt.h>
diff --git a/common/splash.c b/common/splash.c
index 31bbbc2f531c..e6dce1dbf3a6 100644
--- a/common/splash.c
+++ b/common/splash.c
@@ -25,6 +25,7 @@
 #include <env.h>
 #include <splash.h>
 #include <lcd.h>
+#include <stdio.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 12ea112a9d48..8166d0055b96 100644
--- a/common/splash_source.c
+++ b/common/splash_source.c
@@ -19,6 +19,7 @@
 #include <spi.h>
 #include <spi_flash.h>
 #include <splash.h>
+#include <stdio.h>
 #include <usb.h>
 #include <asm/global_data.h>
 #include <linux/string.h>
diff --git a/common/stdio.c b/common/stdio.c
index 411796138f7f..3f29c91ce48e 100644
--- a/common/stdio.c
+++ b/common/stdio.c
@@ -15,6 +15,7 @@
 #include <log.h>
 #include <stdarg.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <stdio_dev.h>
 #include <serial.h>
 #include <splash.h>
diff --git a/common/update.c b/common/update.c
index 8851943b15cd..5fb6a2d5288f 100644
--- a/common/update.c
+++ b/common/update.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <image.h>
+#include <stdio.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/common/usb.c b/common/usb.c
index 7dd34df3cd64..5a3193930251 100644
--- a/common/usb.c
+++ b/common/usb.c
@@ -31,6 +31,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <memalign.h>
+#include <stdio.h>
 #include <asm/processor.h>
 #include <linux/compiler.h>
 #include <linux/ctype.h>
diff --git a/common/usb_hub.c b/common/usb_hub.c
index 1eee9401dc35..244bd0a13694 100644
--- a/common/usb_hub.c
+++ b/common/usb_hub.c
@@ -29,6 +29,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <memalign.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/processor.h>
 #include <asm/unaligned.h>
diff --git a/common/usb_kbd.c b/common/usb_kbd.c
index 0fb955c14b6a..0d3a34ea5c11 100644
--- a/common/usb_kbd.c
+++ b/common/usb_kbd.c
@@ -14,6 +14,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <memalign.h>
+#include <stdio.h>
 #include <stdio_dev.h>
 #include <time.h>
 #include <watchdog.h>
diff --git a/common/usb_storage.c b/common/usb_storage.c
index 492a9374ad24..3416bee012f6 100644
--- a/common/usb_storage.c
+++ b/common/usb_storage.c
@@ -40,6 +40,7 @@
 #include <log.h>
 #include <mapmem.h>
 #include <memalign.h>
+#include <stdio.h>
 #include <asm/byteorder.h>
 #include <asm/cache.h>
 #include <asm/processor.h>
diff --git a/disk/part.c b/disk/part.c
index 45d629508c24..e0d699ce6613 100644
--- a/disk/part.c
+++ b/disk/part.c
@@ -13,6 +13,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <part.h>
+#include <stdio.h>
 #include <ubifs_uboot.h>
 #include <linux/string.h>
 
diff --git a/disk/part_amiga.c b/disk/part_amiga.c
index 17c595a0a7bd..e8c7068081ba 100644
--- a/disk/part_amiga.c
+++ b/disk/part_amiga.c
@@ -8,6 +8,7 @@
 #include <command.h>
 #include <env.h>
 #include <ide.h>
+#include <stdio.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 8eaa85e6b299..a321ad2d2207 100644
--- a/disk/part_dos.c
+++ b/disk/part_dos.c
@@ -18,6 +18,7 @@
 #include <command.h>
 #include <ide.h>
 #include <memalign.h>
+#include <stdio.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 b995efc732de..d066d9c920ce 100644
--- a/disk/part_efi.c
+++ b/disk/part_efi.c
@@ -13,6 +13,7 @@
 #include <blk.h>
 #include <log.h>
 #include <part.h>
+#include <stdio.h>
 #include <uuid.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
diff --git a/disk/part_iso.c b/disk/part_iso.c
index a7d63d64e90b..accb95da3bc2 100644
--- a/disk/part_iso.c
+++ b/disk/part_iso.c
@@ -8,6 +8,7 @@
 #include <blk.h>
 #include <command.h>
 #include <part.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <asm/unaligned.h>
 #include <linux/string.h>
diff --git a/disk/part_mac.c b/disk/part_mac.c
index e01ae7456618..2d9aa380168c 100644
--- a/disk/part_mac.c
+++ b/disk/part_mac.c
@@ -17,6 +17,7 @@
 #include <log.h>
 #include <memalign.h>
 #include <ide.h>
+#include <stdio.h>
 #include "part_mac.h"
 #include <part.h>
 
diff --git a/drivers/adc/adc-uclass.c b/drivers/adc/adc-uclass.c
index 7c033a6855bb..c1dd1f0599dc 100644
--- a/drivers/adc/adc-uclass.c
+++ b/drivers/adc/adc-uclass.c
@@ -8,6 +8,7 @@
 #include <errno.h>
 #include <div64.h>
 #include <dm.h>
+#include <stdio.h>
 #include <dm/lists.h>
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
diff --git a/drivers/adc/meson-saradc.c b/drivers/adc/meson-saradc.c
index d4abb6b943d0..d7c02f1aa3f4 100644
--- a/drivers/adc/meson-saradc.c
+++ b/drivers/adc/meson-saradc.c
@@ -13,6 +13,7 @@
 #include <dm.h>
 #include <regmap.h>
 #include <errno.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index 271c2ddf4a87..e31e280f5416 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -12,6 +12,7 @@
 #include <blk.h>
 #include <cpu_func.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/drivers/ata/ahci_sunxi.c b/drivers/ata/ahci_sunxi.c
index 58e345d9983c..162e7de5194b 100644
--- a/drivers/ata/ahci_sunxi.c
+++ b/drivers/ata/ahci_sunxi.c
@@ -4,6 +4,7 @@
 #include <log.h>
 #include <scsi.h>
 #include <errno.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
 #include <linux/delay.h>
diff --git a/drivers/ata/dwc_ahsata.c b/drivers/ata/dwc_ahsata.c
index 1ecae1d1c952..90db0d210148 100644
--- a/drivers/ata/dwc_ahsata.c
+++ b/drivers/ata/dwc_ahsata.c
@@ -17,6 +17,7 @@
 #include <memalign.h>
 #include <part.h>
 #include <sata.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
diff --git a/drivers/ata/fsl_sata.c b/drivers/ata/fsl_sata.c
index 3f5c7c2a0b94..aa30bf0846e6 100644
--- a/drivers/ata/fsl_sata.c
+++ b/drivers/ata/fsl_sata.c
@@ -11,6 +11,7 @@
 #include <console.h>
 #include <cpu_func.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/ppc.h>
 #include <asm/fsl_serdes.h>
diff --git a/drivers/ata/libata.c b/drivers/ata/libata.c
index cdc83c75bb69..c830ef490252 100644
--- a/drivers/ata/libata.c
+++ b/drivers/ata/libata.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <compiler.h>
 #include <libata.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 u64 ata_id_n_sectors(u16 *id)
diff --git a/drivers/ata/sata.c b/drivers/ata/sata.c
index fa17ee3ab48c..b70de83df2cd 100644
--- a/drivers/ata/sata.c
+++ b/drivers/ata/sata.c
@@ -15,6 +15,7 @@
 #include <dm.h>
 #include <part.h>
 #include <sata.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 #ifndef CONFIG_AHCI
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index 9554aeb137d0..f122d154e334 100644
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -37,6 +37,7 @@
 #include <cpu_func.h>
 #include <dm.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
diff --git a/drivers/ata/sata_sil.c b/drivers/ata/sata_sil.c
index c34af206669c..920a3c9f9014 100644
--- a/drivers/ata/sata_sil.c
+++ b/drivers/ata/sata_sil.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <pci.h>
 #include <command.h>
+#include <stdio.h>
 #include <asm/byteorder.h>
 #include <malloc.h>
 #include <asm/io.h>
diff --git a/drivers/bios_emulator/atibios.c b/drivers/bios_emulator/atibios.c
index 3d1b22f1f54f..dbf74a45eed0 100644
--- a/drivers/bios_emulator/atibios.c
+++ b/drivers/bios_emulator/atibios.c
@@ -51,6 +51,7 @@
 #include <errno.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <vbe.h>
 #include <linux/delay.h>
 #include <linux/string.h>
diff --git a/drivers/bios_emulator/besys.c b/drivers/bios_emulator/besys.c
index 02c4286a854c..a8475b138866 100644
--- a/drivers/bios_emulator/besys.c
+++ b/drivers/bios_emulator/besys.c
@@ -49,6 +49,7 @@
 
 #define __io
 #include <common.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include "biosemui.h"
 
diff --git a/drivers/bios_emulator/bios.c b/drivers/bios_emulator/bios.c
index 77c7f94bc63e..af27582275b0 100644
--- a/drivers/bios_emulator/bios.c
+++ b/drivers/bios_emulator/bios.c
@@ -43,6 +43,7 @@
 
 #define __io
 #include <common.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include "biosemui.h"
 
diff --git a/drivers/bios_emulator/biosemu.c b/drivers/bios_emulator/biosemu.c
index e605238d4391..ca083a4d6467 100644
--- a/drivers/bios_emulator/biosemu.c
+++ b/drivers/bios_emulator/biosemu.c
@@ -47,6 +47,7 @@
 
 #include <malloc.h>
 #include <common.h>
+#include <stdio.h>
 #include <linux/string.h>
 #include "biosemui.h"
 
diff --git a/drivers/bios_emulator/include/x86emu.h b/drivers/bios_emulator/include/x86emu.h
index b28cdc6b8cad..0970faaa21b5 100644
--- a/drivers/bios_emulator/include/x86emu.h
+++ b/drivers/bios_emulator/include/x86emu.h
@@ -41,6 +41,7 @@
 #ifndef __X86EMU_X86EMU_H
 #define __X86EMU_X86EMU_H
 
+#include <stdio.h>
 #include <asm/types.h>
 #include <common.h>
 #include <pci.h>
diff --git a/drivers/bios_emulator/include/x86emu/debug.h b/drivers/bios_emulator/include/x86emu/debug.h
index 859b54d86000..e80c89d763db 100644
--- a/drivers/bios_emulator/include/x86emu/debug.h
+++ b/drivers/bios_emulator/include/x86emu/debug.h
@@ -39,6 +39,8 @@
 #ifndef __X86EMU_DEBUG_H
 #define __X86EMU_DEBUG_H
 
+#include <stdio.h>
+
 /*---------------------- Macros and type definitions ----------------------*/
 
 /* checks to be enabled for "runtime" */
diff --git a/drivers/bios_emulator/x86emu/ops.c b/drivers/bios_emulator/x86emu/ops.c
index 8c1a146165c9..9c8c1eecdda1 100644
--- a/drivers/bios_emulator/x86emu/ops.c
+++ b/drivers/bios_emulator/x86emu/ops.c
@@ -73,6 +73,7 @@
 ****************************************************************************/
 
 #include <common.h>
+#include <stdio.h>
 #include <linux/printk.h>
 #include "x86emu/x86emui.h"
 
diff --git a/drivers/block/blk-uclass.c b/drivers/block/blk-uclass.c
index 1d90a9349bf5..fe68d1ffd0ff 100644
--- a/drivers/block/blk-uclass.c
+++ b/drivers/block/blk-uclass.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <part.h>
+#include <stdio.h>
 #include <dm/device-internal.h>
 #include <dm/lists.h>
 #include <dm/uclass-internal.h>
diff --git a/drivers/block/blk_legacy.c b/drivers/block/blk_legacy.c
index f812169a4f26..2b02e4d3b1c0 100644
--- a/drivers/block/blk_legacy.c
+++ b/drivers/block/blk_legacy.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <blk.h>
 #include <part.h>
+#include <stdio.h>
 #include <linux/err.h>
 #include <linux/string.h>
 
diff --git a/drivers/block/ide.c b/drivers/block/ide.c
index 01bf76d0023b..6ac9323420d9 100644
--- a/drivers/block/ide.c
+++ b/drivers/block/ide.c
@@ -11,6 +11,7 @@
 #include <ide.h>
 #include <log.h>
 #include <part.h>
+#include <stdio.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 a3b2e77ef301..5c4d24c9c028 100644
--- a/drivers/block/sandbox.c
+++ b/drivers/block/sandbox.c
@@ -11,6 +11,7 @@
 #include <os.h>
 #include <malloc.h>
 #include <sandboxblockdev.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <dm/device_compat.h>
 #include <linux/errno.h>
diff --git a/drivers/bootcount/bootcount_ext.c b/drivers/bootcount/bootcount_ext.c
index 9639e638e953..44f97a1054fd 100644
--- a/drivers/bootcount/bootcount_ext.c
+++ b/drivers/bootcount/bootcount_ext.c
@@ -6,6 +6,7 @@
 #include <bootcount.h>
 #include <fs.h>
 #include <mapmem.h>
+#include <stdio.h>
 
 #define BC_MAGIC	0xbd
 #define BC_VERSION	1
diff --git a/drivers/bootcount/bootcount_i2c.c b/drivers/bootcount/bootcount_i2c.c
index 496741d63f78..6f8d12e8fdd5 100644
--- a/drivers/bootcount/bootcount_i2c.c
+++ b/drivers/bootcount/bootcount_i2c.c
@@ -5,6 +5,7 @@
  */
 
 #include <bootcount.h>
+#include <stdio.h>
 #include <linux/compiler.h>
 #include <i2c.h>
 
diff --git a/drivers/cache/cache-ncore.c b/drivers/cache/cache-ncore.c
index 3beff780de0f..efef05613781 100644
--- a/drivers/cache/cache-ncore.c
+++ b/drivers/cache/cache-ncore.c
@@ -5,6 +5,7 @@
  */
 #include <dm.h>
 #include <hang.h>
+#include <stdio.h>
 #include <wait_bit.h>
 
 #include <asm/io.h>
diff --git a/drivers/cache/cache-v5l2.c b/drivers/cache/cache-v5l2.c
index 305a737d3b35..7adc69d514c1 100644
--- a/drivers/cache/cache-v5l2.c
+++ b/drivers/cache/cache-v5l2.c
@@ -9,6 +9,7 @@
 #include <cache.h>
 #include <dm.h>
 #include <hang.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm/ofnode.h>
diff --git a/drivers/clk/at91/clk-utmi.c b/drivers/clk/at91/clk-utmi.c
index 18af0bfeaad1..72b97af1bcb2 100644
--- a/drivers/clk/at91/clk-utmi.c
+++ b/drivers/clk/at91/clk-utmi.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <clk-uclass.h>
 #include <dm.h>
+#include <stdio.h>
 #include <syscon.h>
 #include <linux/io.h>
 #include <mach/at91_pmc.h>
diff --git a/drivers/clk/clk-mux.c b/drivers/clk/clk-mux.c
index 075d4932a9c4..446c0c7b52de 100644
--- a/drivers/clk/clk-mux.c
+++ b/drivers/clk/clk-mux.c
@@ -22,6 +22,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <malloc.h>
 #include <clk-uclass.h>
diff --git a/drivers/clk/clk-uclass.c b/drivers/clk/clk-uclass.c
index 5d5573962342..8ebfecd347a8 100644
--- a/drivers/clk/clk-uclass.c
+++ b/drivers/clk/clk-uclass.c
@@ -14,6 +14,7 @@
 #include <errno.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <dm/devres.h>
 #include <dm/read.h>
diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
index 0f55ba751c0f..f55d57a95e65 100644
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <clk-uclass.h>
 #include <log.h>
+#include <stdio.h>
 #include <dm/device.h>
 #include <dm/uclass.h>
 #include <dm/lists.h>
diff --git a/drivers/clk/clk_pic32.c b/drivers/clk/clk_pic32.c
index 78daf2cbad37..fff359a8035b 100644
--- a/drivers/clk/clk_pic32.c
+++ b/drivers/clk/clk_pic32.c
@@ -8,6 +8,7 @@
 #include <clk-uclass.h>
 #include <dm.h>
 #include <div64.h>
+#include <stdio.h>
 #include <time.h>
 #include <wait_bit.h>
 #include <asm/global_data.h>
diff --git a/drivers/clk/clk_stm32mp1.c b/drivers/clk/clk_stm32mp1.c
index 8244b7c99fcc..b2e0c8ca00d0 100644
--- a/drivers/clk/clk_stm32mp1.c
+++ b/drivers/clk/clk_stm32mp1.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <regmap.h>
 #include <spl.h>
+#include <stdio.h>
 #include <syscon.h>
 #include <time.h>
 #include <vsprintf.h>
diff --git a/drivers/clk/clk_versal.c b/drivers/clk/clk_versal.c
index 7a04d68f8dd5..19db23159f02 100644
--- a/drivers/clk/clk_versal.c
+++ b/drivers/clk/clk_versal.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <asm/ptrace.h>
 #include <dm/device_compat.h>
diff --git a/drivers/clk/clk_zynqmp.c b/drivers/clk/clk_zynqmp.c
index 2313ac0bc044..8c62b63ea2b4 100644
--- a/drivers/clk/clk_zynqmp.c
+++ b/drivers/clk/clk_zynqmp.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <clk-uclass.h>
diff --git a/drivers/clk/ics8n3qv01.c b/drivers/clk/ics8n3qv01.c
index 4f80bf6e5223..95f1c7641f2e 100644
--- a/drivers/clk/ics8n3qv01.c
+++ b/drivers/clk/ics8n3qv01.c
@@ -14,6 +14,7 @@
 #include <clk-uclass.h>
 #include <i2c.h>
 #include <log.h>
+#include <stdio.h>
 
 const long long ICS8N3QV01_FREF = 114285000;
 const long long ICS8N3QV01_FREF_LL = 114285000LL;
diff --git a/drivers/clk/imx/clk-imx6q.c b/drivers/clk/imx/clk-imx6q.c
index 11d194363d3d..c8d826b0141d 100644
--- a/drivers/clk/imx/clk-imx6q.c
+++ b/drivers/clk/imx/clk-imx6q.c
@@ -8,6 +8,7 @@
 #include <clk-uclass.h>
 #include <dm.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <dt-bindings/clock/imx6qdl-clock.h>
diff --git a/drivers/clk/imx/clk-imx8.c b/drivers/clk/imx/clk-imx8.c
index 27a652a625ab..523ead82e971 100644
--- a/drivers/clk/imx/clk-imx8.c
+++ b/drivers/clk/imx/clk-imx8.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/arch/sci/sci.h>
 #include <asm/arch/clock.h>
 #include <dt-bindings/clock/imx8qxp-clock.h>
diff --git a/drivers/clk/imx/clk-imx8qm.c b/drivers/clk/imx/clk-imx8qm.c
index 54fb09fda405..d781bcd8a93c 100644
--- a/drivers/clk/imx/clk-imx8qm.c
+++ b/drivers/clk/imx/clk-imx8qm.c
@@ -8,6 +8,7 @@
 #include <clk-uclass.h>
 #include <dm.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/arch/sci/sci.h>
 #include <asm/arch/clock.h>
 #include <dt-bindings/clock/imx8qm-clock.h>
diff --git a/drivers/clk/imx/clk-imx8qxp.c b/drivers/clk/imx/clk-imx8qxp.c
index e6b2fb40da2a..407613407394 100644
--- a/drivers/clk/imx/clk-imx8qxp.c
+++ b/drivers/clk/imx/clk-imx8qxp.c
@@ -8,6 +8,7 @@
 #include <clk-uclass.h>
 #include <dm.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/arch/sci/sci.h>
 #include <asm/arch/clock.h>
 #include <dt-bindings/clock/imx8qxp-clock.h>
diff --git a/drivers/clk/mpc83xx_clk.c b/drivers/clk/mpc83xx_clk.c
index fce12b025d6b..24bb06c2f2d3 100644
--- a/drivers/clk/mpc83xx_clk.c
+++ b/drivers/clk/mpc83xx_clk.c
@@ -10,6 +10,7 @@
 #include <command.h>
 #include <dm.h>
 #include <log.h>
+#include <stdio.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <dm/lists.h>
diff --git a/drivers/clk/mvebu/armada-37xx-periph.c b/drivers/clk/mvebu/armada-37xx-periph.c
index 30710040ff9b..2e2ac6fe8706 100644
--- a/drivers/clk/mvebu/armada-37xx-periph.c
+++ b/drivers/clk/mvebu/armada-37xx-periph.c
@@ -13,6 +13,7 @@
 #include <clk-uclass.h>
 #include <clk.h>
 #include <dm.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <dm/device_compat.h>
diff --git a/drivers/clk/mvebu/armada-37xx-tbg.c b/drivers/clk/mvebu/armada-37xx-tbg.c
index 233926e9b6a8..bb9438302665 100644
--- a/drivers/clk/mvebu/armada-37xx-tbg.c
+++ b/drivers/clk/mvebu/armada-37xx-tbg.c
@@ -12,6 +12,7 @@
 #include <clk-uclass.h>
 #include <clk.h>
 #include <dm.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <dm/device_compat.h>
diff --git a/drivers/clk/renesas/clk-rcar-gen2.c b/drivers/clk/renesas/clk-rcar-gen2.c
index cbf2ffe6e853..a859625b60bd 100644
--- a/drivers/clk/renesas/clk-rcar-gen2.c
+++ b/drivers/clk/renesas/clk-rcar-gen2.c
@@ -15,6 +15,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/string.h>
diff --git a/drivers/clk/renesas/clk-rcar-gen3.c b/drivers/clk/renesas/clk-rcar-gen3.c
index 3223becd753b..ad2c73998d4b 100644
--- a/drivers/clk/renesas/clk-rcar-gen3.c
+++ b/drivers/clk/renesas/clk-rcar-gen3.c
@@ -15,6 +15,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
+#include <stdio.h>
 #include <wait_bit.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/clk/rockchip/clk_pll.c b/drivers/clk/rockchip/clk_pll.c
index 83d45c75ee22..3424a9a36a33 100644
--- a/drivers/clk/rockchip/clk_pll.c
+++ b/drivers/clk/rockchip/clk_pll.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch-rockchip/clock.h>
 #include <asm/arch-rockchip/hardware.h>
diff --git a/drivers/clk/rockchip/clk_px30.c b/drivers/clk/rockchip/clk_px30.c
index 0ef449159d92..4178502bdff3 100644
--- a/drivers/clk/rockchip/clk_px30.c
+++ b/drivers/clk/rockchip/clk_px30.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <syscon.h>
 #include <asm/arch-rockchip/clock.h>
 #include <asm/arch-rockchip/cru_px30.h>
diff --git a/drivers/clk/rockchip/clk_rk3128.c b/drivers/clk/rockchip/clk_rk3128.c
index 61f823e254eb..5a0079e0298b 100644
--- a/drivers/clk/rockchip/clk_rk3128.c
+++ b/drivers/clk/rockchip/clk_rk3128.c
@@ -9,6 +9,7 @@
 #include <errno.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <syscon.h>
 #include <asm/io.h>
 #include <asm/arch-rockchip/clock.h>
diff --git a/drivers/clk/rockchip/clk_rk3288.c b/drivers/clk/rockchip/clk_rk3288.c
index a3c5bbf1f6b2..6221515df206 100644
--- a/drivers/clk/rockchip/clk_rk3288.c
+++ b/drivers/clk/rockchip/clk_rk3288.c
@@ -13,6 +13,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <mapmem.h>
+#include <stdio.h>
 #include <syscon.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/clk/rockchip/clk_rk3308.c b/drivers/clk/rockchip/clk_rk3308.c
index 4a72fe293750..c6270aa07e19 100644
--- a/drivers/clk/rockchip/clk_rk3308.c
+++ b/drivers/clk/rockchip/clk_rk3308.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <syscon.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/clk/rockchip/clk_rk3328.c b/drivers/clk/rockchip/clk_rk3328.c
index e04042f0bd90..1050559cedfd 100644
--- a/drivers/clk/rockchip/clk_rk3328.c
+++ b/drivers/clk/rockchip/clk_rk3328.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <syscon.h>
 #include <asm/arch-rockchip/clock.h>
 #include <asm/arch-rockchip/cru_rk3328.h>
diff --git a/drivers/clk/rockchip/clk_rk3399.c b/drivers/clk/rockchip/clk_rk3399.c
index c2eaf67f58f7..e6d74ab6b934 100644
--- a/drivers/clk/rockchip/clk_rk3399.c
+++ b/drivers/clk/rockchip/clk_rk3399.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <mapmem.h>
+#include <stdio.h>
 #include <syscon.h>
 #include <bitfield.h>
 #include <asm/io.h>
diff --git a/drivers/clk/rockchip/clk_rv1108.c b/drivers/clk/rockchip/clk_rv1108.c
index 9e6bb9cd88db..87a2847485ce 100644
--- a/drivers/clk/rockchip/clk_rv1108.c
+++ b/drivers/clk/rockchip/clk_rv1108.c
@@ -11,6 +11,7 @@
 #include <errno.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <syscon.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/clk/sunxi/clk_sunxi.c b/drivers/clk/sunxi/clk_sunxi.c
index 41934cd826e3..d440abc13944 100644
--- a/drivers/clk/sunxi/clk_sunxi.c
+++ b/drivers/clk/sunxi/clk_sunxi.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <log.h>
 #include <reset.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/ccu.h>
 #include <linux/bitops.h>
diff --git a/drivers/core/acpi.c b/drivers/core/acpi.c
index a28b56a73339..26f494f2aeb6 100644
--- a/drivers/core/acpi.c
+++ b/drivers/core/acpi.c
@@ -13,6 +13,7 @@
 #include <dm.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <acpi/acpi_device.h>
 #include <dm/acpi.h>
 #include <dm/device-internal.h>
diff --git a/drivers/core/devres.c b/drivers/core/devres.c
index 88244698b0cb..e2d4a80cefd9 100644
--- a/drivers/core/devres.c
+++ b/drivers/core/devres.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <linux/compat.h>
 #include <linux/kernel.h>
 #include <linux/list.h>
diff --git a/drivers/core/dump.c b/drivers/core/dump.c
index 6debaf97a1df..3b707eb49335 100644
--- a/drivers/core/dump.c
+++ b/drivers/core/dump.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <dm.h>
 #include <mapmem.h>
+#include <stdio.h>
 #include <dm/root.h>
 #include <dm/util.h>
 #include <dm/uclass-internal.h>
diff --git a/drivers/core/util.c b/drivers/core/util.c
index 25b0d76f430d..7a2fe1f4394b 100644
--- a/drivers/core/util.c
+++ b/drivers/core/util.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <dm/device.h>
 #include <dm/ofnode.h>
 #include <dm/read.h>
diff --git a/drivers/cpu/bmips_cpu.c b/drivers/cpu/bmips_cpu.c
index 8419adb3cc37..fd079951d6f0 100644
--- a/drivers/cpu/bmips_cpu.c
+++ b/drivers/cpu/bmips_cpu.c
@@ -13,6 +13,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <init.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
 
diff --git a/drivers/cpu/imx8_cpu.c b/drivers/cpu/imx8_cpu.c
index 21ccc1ce31d9..907358f312e7 100644
--- a/drivers/cpu/imx8_cpu.c
+++ b/drivers/cpu/imx8_cpu.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <cpu.h>
 #include <dm.h>
+#include <stdio.h>
 #include <thermal.h>
 #include <asm/global_data.h>
 #include <asm/system.h>
diff --git a/drivers/crypto/fsl/desc_constr.h b/drivers/crypto/fsl/desc_constr.h
index ef4cd525e3ae..7d6546fd9c0c 100644
--- a/drivers/crypto/fsl/desc_constr.h
+++ b/drivers/crypto/fsl/desc_constr.h
@@ -7,6 +7,7 @@
  * Based on desc_constr.h file in linux drivers/crypto/caam
  */
 
+#include <stdio.h>
 #include <linux/compat.h>
 #include <linux/string.h>
 #include "desc.h"
diff --git a/drivers/crypto/fsl/fsl_blob.c b/drivers/crypto/fsl/fsl_blob.c
index d6bd861251e0..5bc0f3d5f22e 100644
--- a/drivers/crypto/fsl/fsl_blob.c
+++ b/drivers/crypto/fsl/fsl_blob.c
@@ -10,6 +10,7 @@
 #include <malloc.h>
 #include <memalign.h>
 #include <fsl_sec.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <linux/errno.h>
 #include "jobdesc.h"
diff --git a/drivers/crypto/fsl/fsl_hash.c b/drivers/crypto/fsl/fsl_hash.c
index 5182f21acb24..80640248c373 100644
--- a/drivers/crypto/fsl/fsl_hash.c
+++ b/drivers/crypto/fsl/fsl_hash.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <memalign.h>
+#include <stdio.h>
 #include <linux/string.h>
 #include "jobdesc.h"
 #include "desc.h"
diff --git a/drivers/crypto/fsl/jobdesc.c b/drivers/crypto/fsl/jobdesc.c
index 17777e5551db..e85c2dd01d92 100644
--- a/drivers/crypto/fsl/jobdesc.c
+++ b/drivers/crypto/fsl/jobdesc.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <fsl_sec.h>
+#include <stdio.h>
 #include <linux/string.h>
 #include "desc_constr.h"
 #include "jobdesc.h"
diff --git a/drivers/crypto/fsl/jr.c b/drivers/crypto/fsl/jr.c
index afca79dfc0a2..9e31e92024c9 100644
--- a/drivers/crypto/fsl/jr.c
+++ b/drivers/crypto/fsl/jr.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <cpu_func.h>
+#include <stdio.h>
 #include <linux/kernel.h>
 #include <log.h>
 #include <malloc.h>
diff --git a/drivers/crypto/fsl/sec.c b/drivers/crypto/fsl/sec.c
index f0a4a63d8863..afdad43d331e 100644
--- a/drivers/crypto/fsl/sec.c
+++ b/drivers/crypto/fsl/sec.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <stdio.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_agilex.c b/drivers/ddr/altera/sdram_agilex.c
index 1ddc35d5d3b1..771820941aac 100644
--- a/drivers/ddr/altera/sdram_agilex.c
+++ b/drivers/ddr/altera/sdram_agilex.c
@@ -13,6 +13,7 @@
 #include <log.h>
 #include <ram.h>
 #include <reset.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include "sdram_soc64.h"
diff --git a/drivers/ddr/altera/sdram_arria10.c b/drivers/ddr/altera/sdram_arria10.c
index b2053bf412ca..b7986a4f47e3 100644
--- a/drivers/ddr/altera/sdram_arria10.c
+++ b/drivers/ddr/altera/sdram_arria10.c
@@ -10,6 +10,7 @@
 #include <init.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <wait_bit.h>
 #include <watchdog.h>
 #include <asm/cache.h>
diff --git a/drivers/ddr/altera/sdram_gen5.c b/drivers/ddr/altera/sdram_gen5.c
index 52cde7d409b8..01857f292565 100644
--- a/drivers/ddr/altera/sdram_gen5.c
+++ b/drivers/ddr/altera/sdram_gen5.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <ram.h>
 #include <reset.h>
+#include <stdio.h>
 #include <watchdog.h>
 #include <asm/arch/fpga_manager.h>
 #include <asm/arch/reset_manager.h>
diff --git a/drivers/ddr/altera/sdram_s10.c b/drivers/ddr/altera/sdram_s10.c
index 71c68d3e7a86..4c913e9b5b64 100644
--- a/drivers/ddr/altera/sdram_s10.c
+++ b/drivers/ddr/altera/sdram_s10.c
@@ -15,6 +15,7 @@
 #include <log.h>
 #include <ram.h>
 #include <reset.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include "sdram_s10.h"
diff --git a/drivers/ddr/altera/sdram_soc64.c b/drivers/ddr/altera/sdram_soc64.c
index 5729588a0747..03ca6b58cfc0 100644
--- a/drivers/ddr/altera/sdram_soc64.c
+++ b/drivers/ddr/altera/sdram_soc64.c
@@ -15,6 +15,7 @@
 #include <log.h>
 #include <ram.h>
 #include <reset.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
diff --git a/drivers/ddr/fsl/arm_ddr_gen3.c b/drivers/ddr/fsl/arm_ddr_gen3.c
index 629ba6784e0d..15799011c9b5 100644
--- a/drivers/ddr/fsl/arm_ddr_gen3.c
+++ b/drivers/ddr/fsl/arm_ddr_gen3.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <fsl_ddr_sdram.h>
 #include <asm/processor.h>
diff --git a/drivers/ddr/fsl/ctrl_regs.c b/drivers/ddr/fsl/ctrl_regs.c
index 247587c646b6..1dd680e4f19b 100644
--- a/drivers/ddr/fsl/ctrl_regs.c
+++ b/drivers/ddr/fsl/ctrl_regs.c
@@ -16,6 +16,7 @@
 #include <fsl_ddr.h>
 #include <fsl_immap.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/bitops.h>
 #include <asm/io.h>
 #if defined(CONFIG_FSL_LSCH2) || defined(CONFIG_FSL_LSCH3) || \
diff --git a/drivers/ddr/fsl/ddr1_dimm_params.c b/drivers/ddr/fsl/ddr1_dimm_params.c
index 2ccf1e82f9a6..698324073dbb 100644
--- a/drivers/ddr/fsl/ddr1_dimm_params.c
+++ b/drivers/ddr/fsl/ddr1_dimm_params.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <fsl_ddr_sdram.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/bitops.h>
 #include <linux/string.h>
 
diff --git a/drivers/ddr/fsl/ddr2_dimm_params.c b/drivers/ddr/fsl/ddr2_dimm_params.c
index 9ee2dfc24554..95a250c33f48 100644
--- a/drivers/ddr/fsl/ddr2_dimm_params.c
+++ b/drivers/ddr/fsl/ddr2_dimm_params.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <fsl_ddr_sdram.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/bitops.h>
 #include <linux/string.h>
 
diff --git a/drivers/ddr/fsl/ddr3_dimm_params.c b/drivers/ddr/fsl/ddr3_dimm_params.c
index d0625ea0e1bf..b3e42519e86b 100644
--- a/drivers/ddr/fsl/ddr3_dimm_params.c
+++ b/drivers/ddr/fsl/ddr3_dimm_params.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <fsl_ddr_sdram.h>
 #include <log.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 #include <fsl_ddr.h>
diff --git a/drivers/ddr/fsl/ddr4_dimm_params.c b/drivers/ddr/fsl/ddr4_dimm_params.c
index 37e43dc8f172..cc6c034747fd 100644
--- a/drivers/ddr/fsl/ddr4_dimm_params.c
+++ b/drivers/ddr/fsl/ddr4_dimm_params.c
@@ -13,6 +13,7 @@
 #include <common.h>
 #include <fsl_ddr_sdram.h>
 #include <log.h>
+#include <stdio.h>
 #include <linux/bug.h>
 #include <linux/string.h>
 
diff --git a/drivers/ddr/fsl/fsl_ddr_gen4.c b/drivers/ddr/fsl/fsl_ddr_gen4.c
index e43c6801546a..5e092e3e9241 100644
--- a/drivers/ddr/fsl/fsl_ddr_gen4.c
+++ b/drivers/ddr/fsl/fsl_ddr_gen4.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <env.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <fsl_ddr_sdram.h>
 #include <asm/processor.h>
diff --git a/drivers/ddr/fsl/fsl_mmdc.c b/drivers/ddr/fsl/fsl_mmdc.c
index cbd625b7eeac..b88c65cd2e47 100644
--- a/drivers/ddr/fsl/fsl_mmdc.c
+++ b/drivers/ddr/fsl/fsl_mmdc.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <fsl_mmdc.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/delay.h>
 
diff --git a/drivers/ddr/fsl/interactive.c b/drivers/ddr/fsl/interactive.c
index 3736ea129a77..645d83c0df87 100644
--- a/drivers/ddr/fsl/interactive.c
+++ b/drivers/ddr/fsl/interactive.c
@@ -16,6 +16,7 @@
 #include <command.h>
 #include <env.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/bitops.h>
 #include <linux/ctype.h>
 #include <asm/types.h>
diff --git a/drivers/ddr/fsl/lc_common_dimm_params.c b/drivers/ddr/fsl/lc_common_dimm_params.c
index d299d763db1a..d6a2ad99c427 100644
--- a/drivers/ddr/fsl/lc_common_dimm_params.c
+++ b/drivers/ddr/fsl/lc_common_dimm_params.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <fsl_ddr_sdram.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/bitops.h>
 
 #include <fsl_ddr.h>
diff --git a/drivers/ddr/fsl/main.c b/drivers/ddr/fsl/main.c
index 5b2ddc3893a9..cf0731bd842a 100644
--- a/drivers/ddr/fsl/main.c
+++ b/drivers/ddr/fsl/main.c
@@ -17,6 +17,7 @@
 #include <fsl_ddr.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/bitops.h>
 #include <linux/string.h>
 
diff --git a/drivers/ddr/fsl/mpc85xx_ddr_gen1.c b/drivers/ddr/fsl/mpc85xx_ddr_gen1.c
index a449c8354584..930dd72abce1 100644
--- a/drivers/ddr/fsl/mpc85xx_ddr_gen1.c
+++ b/drivers/ddr/fsl/mpc85xx_ddr_gen1.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/ppc.h>
 #include <fsl_ddr_sdram.h>
diff --git a/drivers/ddr/fsl/mpc85xx_ddr_gen2.c b/drivers/ddr/fsl/mpc85xx_ddr_gen2.c
index f91398ec0648..799243f7fc60 100644
--- a/drivers/ddr/fsl/mpc85xx_ddr_gen2.c
+++ b/drivers/ddr/fsl/mpc85xx_ddr_gen2.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/ppc.h>
 #include <fsl_ddr_sdram.h>
diff --git a/drivers/ddr/fsl/mpc85xx_ddr_gen3.c b/drivers/ddr/fsl/mpc85xx_ddr_gen3.c
index f4f2f590db06..1e1648592323 100644
--- a/drivers/ddr/fsl/mpc85xx_ddr_gen3.c
+++ b/drivers/ddr/fsl/mpc85xx_ddr_gen3.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/ppc.h>
 #include <fsl_ddr_sdram.h>
diff --git a/drivers/ddr/fsl/mpc86xx_ddr.c b/drivers/ddr/fsl/mpc86xx_ddr.c
index 37a86f0aba9b..cebe07308f3d 100644
--- a/drivers/ddr/fsl/mpc86xx_ddr.c
+++ b/drivers/ddr/fsl/mpc86xx_ddr.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <fsl_ddr_sdram.h>
 #include <asm/ppc.h>
diff --git a/drivers/ddr/fsl/options.c b/drivers/ddr/fsl/options.c
index 9e6175169ab3..6780e5ddf43f 100644
--- a/drivers/ddr/fsl/options.c
+++ b/drivers/ddr/fsl/options.c
@@ -9,6 +9,7 @@
 #include <hwconfig.h>
 #include <fsl_ddr_sdram.h>
 #include <log.h>
+#include <stdio.h>
 
 #include <fsl_ddr.h>
 /* For get_ddr_freq() */
diff --git a/drivers/ddr/fsl/util.c b/drivers/ddr/fsl/util.c
index c29215e84d8e..f37846d8e60f 100644
--- a/drivers/ddr/fsl/util.c
+++ b/drivers/ddr/fsl/util.c
@@ -9,6 +9,7 @@
 #include <asm/ppc.h>
 #endif
 #include <div64.h>
+#include <stdio.h>
 #include <linux/delay.h>
 
 #include <fsl_ddr.h>
diff --git a/drivers/ddr/imx/imx8m/helper.c b/drivers/ddr/imx/imx8m/helper.c
index f23904bf7124..8903ff146fc9 100644
--- a/drivers/ddr/imx/imx8m/helper.c
+++ b/drivers/ddr/imx/imx8m/helper.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <log.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <errno.h>
diff --git a/drivers/ddr/marvell/a38x/ddr_ml_wrapper.h b/drivers/ddr/marvell/a38x/ddr_ml_wrapper.h
index 5bf323992117..688cbbeefc5f 100644
--- a/drivers/ddr/marvell/a38x/ddr_ml_wrapper.h
+++ b/drivers/ddr/marvell/a38x/ddr_ml_wrapper.h
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <i2c.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
diff --git a/drivers/ddr/marvell/axp/ddr3_dfs.c b/drivers/ddr/marvell/axp/ddr3_dfs.c
index b58c0fe01e5a..86abdf70db71 100644
--- a/drivers/ddr/marvell/axp/ddr3_dfs.c
+++ b/drivers/ddr/marvell/axp/ddr3_dfs.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <i2c.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
diff --git a/drivers/ddr/marvell/axp/ddr3_dqs.c b/drivers/ddr/marvell/axp/ddr3_dqs.c
index 0db94212b90f..33187fbc64fd 100644
--- a/drivers/ddr/marvell/axp/ddr3_dqs.c
+++ b/drivers/ddr/marvell/axp/ddr3_dqs.c
@@ -7,6 +7,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
diff --git a/drivers/ddr/marvell/axp/ddr3_hw_training.c b/drivers/ddr/marvell/axp/ddr3_hw_training.c
index c39f40095fcc..cc36f29ff862 100644
--- a/drivers/ddr/marvell/axp/ddr3_hw_training.c
+++ b/drivers/ddr/marvell/axp/ddr3_hw_training.c
@@ -7,6 +7,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
diff --git a/drivers/ddr/marvell/axp/ddr3_init.c b/drivers/ddr/marvell/axp/ddr3_init.c
index 607f3e12c3ae..f934957a0f3d 100644
--- a/drivers/ddr/marvell/axp/ddr3_init.c
+++ b/drivers/ddr/marvell/axp/ddr3_init.c
@@ -7,6 +7,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
diff --git a/drivers/ddr/marvell/axp/ddr3_pbs.c b/drivers/ddr/marvell/axp/ddr3_pbs.c
index a963b3c55be2..dd7905dd7f47 100644
--- a/drivers/ddr/marvell/axp/ddr3_pbs.c
+++ b/drivers/ddr/marvell/axp/ddr3_pbs.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <i2c.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
diff --git a/drivers/ddr/marvell/axp/ddr3_read_leveling.c b/drivers/ddr/marvell/axp/ddr3_read_leveling.c
index 30a5c3548857..03dae99107a4 100644
--- a/drivers/ddr/marvell/axp/ddr3_read_leveling.c
+++ b/drivers/ddr/marvell/axp/ddr3_read_leveling.c
@@ -7,6 +7,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
diff --git a/drivers/ddr/marvell/axp/ddr3_spd.c b/drivers/ddr/marvell/axp/ddr3_spd.c
index 8927abe17ef0..f96d2bdaeb91 100644
--- a/drivers/ddr/marvell/axp/ddr3_spd.c
+++ b/drivers/ddr/marvell/axp/ddr3_spd.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <i2c.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
diff --git a/drivers/ddr/marvell/axp/ddr3_write_leveling.c b/drivers/ddr/marvell/axp/ddr3_write_leveling.c
index de8dfc299f7e..8c875287b4c5 100644
--- a/drivers/ddr/marvell/axp/ddr3_write_leveling.c
+++ b/drivers/ddr/marvell/axp/ddr3_write_leveling.c
@@ -7,6 +7,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
diff --git a/drivers/ddr/microchip/ddr2.c b/drivers/ddr/microchip/ddr2.c
index 149b6071cfde..90ebf4642d5d 100644
--- a/drivers/ddr/microchip/ddr2.c
+++ b/drivers/ddr/microchip/ddr2.c
@@ -4,6 +4,7 @@
  *
  */
 #include <common.h>
+#include <stdio.h>
 #include <wait_bit.h>
 #include <linux/kernel.h>
 #include <linux/bitops.h>
diff --git a/drivers/demo/demo-shape.c b/drivers/demo/demo-shape.c
index d0c0c7365517..3e1f79aee50b 100644
--- a/drivers/demo/demo-shape.c
+++ b/drivers/demo/demo-shape.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <dm-demo.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
diff --git a/drivers/demo/demo-simple.c b/drivers/demo/demo-simple.c
index 68972c780f44..325f653877f2 100644
--- a/drivers/demo/demo-simple.c
+++ b/drivers/demo/demo-simple.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <dm-demo.h>
 #include <mapmem.h>
+#include <stdio.h>
 #include <asm/io.h>
 
 static int simple_hello(struct udevice *dev, int ch)
diff --git a/drivers/dfu/dfu.c b/drivers/dfu/dfu.c
index 5dc5f80854e8..043c03a34921 100644
--- a/drivers/dfu/dfu.c
+++ b/drivers/dfu/dfu.c
@@ -15,6 +15,7 @@
 #include <fat.h>
 #include <dfu.h>
 #include <hash.h>
+#include <stdio.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 0fd69d0d1e4c..a3444f131ea6 100644
--- a/drivers/dfu/dfu_mmc.c
+++ b/drivers/dfu/dfu_mmc.c
@@ -16,6 +16,7 @@
 #include <fat.h>
 #include <mmc.h>
 #include <part.h>
+#include <stdio.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/dfu/dfu_mtd.c b/drivers/dfu/dfu_mtd.c
index 861a0b370e09..ebf4b8b26e8a 100644
--- a/drivers/dfu/dfu_mtd.c
+++ b/drivers/dfu/dfu_mtd.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <dfu.h>
 #include <mtd.h>
+#include <stdio.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 38f46b2f4129..b4abe6005d90 100644
--- a/drivers/dfu/dfu_nand.c
+++ b/drivers/dfu/dfu_nand.c
@@ -15,6 +15,7 @@
 #include <errno.h>
 #include <div64.h>
 #include <dfu.h>
+#include <stdio.h>
 #include <linux/mtd/mtd.h>
 #include <jffs2/load_kernel.h>
 #include <nand.h>
diff --git a/drivers/dfu/dfu_sf.c b/drivers/dfu/dfu_sf.c
index 20e1c2869027..b64570aa4c73 100644
--- a/drivers/dfu/dfu_sf.c
+++ b/drivers/dfu/dfu_sf.c
@@ -11,6 +11,7 @@
 #include <dfu.h>
 #include <spi.h>
 #include <spi_flash.h>
+#include <stdio.h>
 #include <jffs2/load_kernel.h>
 #include <linux/mtd/mtd.h>
 #include <linux/string.h>
diff --git a/drivers/dma/MCD_dmaApi.c b/drivers/dma/MCD_dmaApi.c
index af0e13452200..d3c79e122cb7 100644
--- a/drivers/dma/MCD_dmaApi.c
+++ b/drivers/dma/MCD_dmaApi.c
@@ -6,6 +6,7 @@
 /*Main C file for multi-channel DMA API. */
 
 #include <common.h>
+#include <stdio.h>
 
 #include <MCD_dma.h>
 #include <MCD_tasksInit.h>
diff --git a/drivers/dma/apbh_dma.c b/drivers/dma/apbh_dma.c
index a2a76aba84a1..8a7ef5013e86 100644
--- a/drivers/dma/apbh_dma.c
+++ b/drivers/dma/apbh_dma.c
@@ -12,6 +12,7 @@
  */
 
 #include <cpu_func.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <linux/list.h>
 #include <linux/string.h>
diff --git a/drivers/dma/ti/k3-udma.c b/drivers/dma/ti/k3-udma.c
index aa835498d29b..cab6031ccf23 100644
--- a/drivers/dma/ti/k3-udma.c
+++ b/drivers/dma/ti/k3-udma.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <log.h>
+#include <stdio.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 699fc52fc1c3..ab477f5cb91d 100644
--- a/drivers/fastboot/fb_command.c
+++ b/drivers/fastboot/fb_command.c
@@ -12,6 +12,7 @@
 #include <fb_nand.h>
 #include <flash.h>
 #include <part.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <linux/printk.h>
 #include <linux/string.h>
diff --git a/drivers/fastboot/fb_common.c b/drivers/fastboot/fb_common.c
index 3c8338f7c688..da467666cf4c 100644
--- a/drivers/fastboot/fb_common.c
+++ b/drivers/fastboot/fb_common.c
@@ -14,6 +14,7 @@
 #include <command.h>
 #include <env.h>
 #include <fastboot.h>
+#include <stdio.h>
 #include <linux/string.h>
 #include <net/fastboot.h>
 
diff --git a/drivers/fastboot/fb_mmc.c b/drivers/fastboot/fb_mmc.c
index 3512e2191f04..5dc58f00a75a 100644
--- a/drivers/fastboot/fb_mmc.c
+++ b/drivers/fastboot/fb_mmc.c
@@ -17,6 +17,7 @@
 #include <part.h>
 #include <mmc.h>
 #include <div64.h>
+#include <stdio.h>
 #include <linux/compat.h>
 #include <android_image.h>
 #include <linux/printk.h>
diff --git a/drivers/fastboot/fb_nand.c b/drivers/fastboot/fb_nand.c
index c048600d44a7..431580631168 100644
--- a/drivers/fastboot/fb_nand.c
+++ b/drivers/fastboot/fb_nand.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <blk.h>
 #include <flash.h>
+#include <stdio.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/firmware/firmware-zynqmp.c b/drivers/firmware/firmware-zynqmp.c
index 66edc1693016..3e38848d4cc6 100644
--- a/drivers/firmware/firmware-zynqmp.c
+++ b/drivers/firmware/firmware-zynqmp.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <stdio.h>
 #include <zynqmp_firmware.h>
 #include <asm/cache.h>
 #include <asm/ptrace.h>
diff --git a/drivers/firmware/psci.c b/drivers/firmware/psci.c
index cb920139b1c0..4bc898bacb1b 100644
--- a/drivers/firmware/psci.c
+++ b/drivers/firmware/psci.c
@@ -11,6 +11,7 @@
 #include <dm.h>
 #include <irq_func.h>
 #include <log.h>
+#include <stdio.h>
 #include <dm/lists.h>
 #include <efi_loader.h>
 #include <linux/delay.h>
diff --git a/drivers/fpga/altera.c b/drivers/fpga/altera.c
index bb27b3778f31..7f7d768c5cb9 100644
--- a/drivers/fpga/altera.c
+++ b/drivers/fpga/altera.c
@@ -14,6 +14,7 @@
 #include <errno.h>
 #include <ACEX1K.h>
 #include <log.h>
+#include <stdio.h>
 #include <stratixII.h>
 
 /* Define FPGA_DEBUG to 1 to get debug printf's */
diff --git a/drivers/fpga/cyclon2.c b/drivers/fpga/cyclon2.c
index 477379449ed0..a163f7225155 100644
--- a/drivers/fpga/cyclon2.c
+++ b/drivers/fpga/cyclon2.c
@@ -8,6 +8,7 @@
 #include <common.h>		/* core U-Boot definitions */
 #include <altera.h>
 #include <ACEX1K.h>		/* ACEX device family */
+#include <stdio.h>
 #include <time.h>
 #include <linux/delay.h>
 
diff --git a/drivers/fpga/fpga.c b/drivers/fpga/fpga.c
index 4140c8254523..1d76e1232124 100644
--- a/drivers/fpga/fpga.c
+++ b/drivers/fpga/fpga.c
@@ -8,6 +8,7 @@
 #include <common.h>             /* core U-Boot definitions */
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <xilinx.h>             /* xilinx specific definitions */
 #include <altera.h>             /* altera specific definitions */
 #include <lattice.h>
diff --git a/drivers/fpga/ivm_core.c b/drivers/fpga/ivm_core.c
index adc60919f3b0..180663ca32f4 100644
--- a/drivers/fpga/ivm_core.c
+++ b/drivers/fpga/ivm_core.c
@@ -31,6 +31,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <linux/string.h>
 #include <malloc.h>
 #include <lattice.h>
diff --git a/drivers/fpga/lattice.c b/drivers/fpga/lattice.c
index e292d991cd18..cbdf00d3a2e3 100644
--- a/drivers/fpga/lattice.c
+++ b/drivers/fpga/lattice.c
@@ -15,6 +15,7 @@
 #include <malloc.h>
 #include <fpga.h>
 #include <lattice.h>
+#include <stdio.h>
 #include <linux/delay.h>
 
 static lattice_board_specific_func *pfns;
diff --git a/drivers/fpga/socfpga_arria10.c b/drivers/fpga/socfpga_arria10.c
index de175848e8ba..f6ece13b06ca 100644
--- a/drivers/fpga/socfpga_arria10.c
+++ b/drivers/fpga/socfpga_arria10.c
@@ -4,6 +4,7 @@
  */
 #include <image.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/fpga/socfpga_gen5.c b/drivers/fpga/socfpga_gen5.c
index d73474f29ee1..1edd494a5b0e 100644
--- a/drivers/fpga/socfpga_gen5.c
+++ b/drivers/fpga/socfpga_gen5.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <asm/arch/fpga_manager.h>
diff --git a/drivers/fpga/stratix10.c b/drivers/fpga/stratix10.c
index 84f453f76e0c..81a3c35d9ebf 100644
--- a/drivers/fpga/stratix10.c
+++ b/drivers/fpga/stratix10.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <altera.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/arch/mailbox_s10.h>
 #include <linux/delay.h>
diff --git a/drivers/fpga/stratixv.c b/drivers/fpga/stratixv.c
index abae3b5b7511..403865c1e370 100644
--- a/drivers/fpga/stratixv.c
+++ b/drivers/fpga/stratixv.c
@@ -7,6 +7,7 @@
 #include <altera.h>
 #include <log.h>
 #include <spi.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/fpga/versalpl.c b/drivers/fpga/versalpl.c
index 5d67ce215ce5..7738cfaf1039 100644
--- a/drivers/fpga/versalpl.c
+++ b/drivers/fpga/versalpl.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/arch/sys_proto.h>
 #include <memalign.h>
 #include <versalpl.h>
diff --git a/drivers/fpga/virtex2.c b/drivers/fpga/virtex2.c
index aae9250f1980..c6449cfc60f4 100644
--- a/drivers/fpga/virtex2.c
+++ b/drivers/fpga/virtex2.c
@@ -14,6 +14,7 @@
 
 #include <common.h>
 #include <console.h>
+#include <stdio.h>
 #include <time.h>
 #include <virtex2.h>
 #include <linux/delay.h>
diff --git a/drivers/fpga/xilinx.c b/drivers/fpga/xilinx.c
index d9f3b82a40ef..302596074107 100644
--- a/drivers/fpga/xilinx.c
+++ b/drivers/fpga/xilinx.c
@@ -14,6 +14,7 @@
 #include <common.h>
 #include <fpga.h>
 #include <log.h>
+#include <stdio.h>
 #include <virtex2.h>
 #include <spartan2.h>
 #include <spartan3.h>
diff --git a/drivers/fpga/zynqmppl.c b/drivers/fpga/zynqmppl.c
index 328e275cd374..fd92b47d67a8 100644
--- a/drivers/fpga/zynqmppl.c
+++ b/drivers/fpga/zynqmppl.c
@@ -10,6 +10,7 @@
 #include <compiler.h>
 #include <cpu_func.h>
 #include <log.h>
+#include <stdio.h>
 #include <zynqmppl.h>
 #include <zynqmp_firmware.h>
 #include <asm/cache.h>
diff --git a/drivers/fpga/zynqpl.c b/drivers/fpga/zynqpl.c
index 86df6fa32d4f..14de9c11d548 100644
--- a/drivers/fpga/zynqpl.c
+++ b/drivers/fpga/zynqpl.c
@@ -10,6 +10,7 @@
 #include <console.h>
 #include <cpu_func.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/cache.h>
 #include <asm/io.h>
diff --git a/drivers/gpio/adi_gpio2.c b/drivers/gpio/adi_gpio2.c
index 8d4ee813985c..fc508093d6f2 100644
--- a/drivers/gpio/adi_gpio2.c
+++ b/drivers/gpio/adi_gpio2.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <linux/bug.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
diff --git a/drivers/gpio/at91_gpio.c b/drivers/gpio/at91_gpio.c
index 4a8b2e6ff610..d738a04033a5 100644
--- a/drivers/gpio/at91_gpio.c
+++ b/drivers/gpio/at91_gpio.c
@@ -12,6 +12,7 @@
 #include <clk.h>
 #include <dm.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/sizes.h>
 #include <asm/gpio.h>
diff --git a/drivers/gpio/atmel_pio4.c b/drivers/gpio/atmel_pio4.c
index 3256469ddc16..b82fe74a62b1 100644
--- a/drivers/gpio/atmel_pio4.c
+++ b/drivers/gpio/atmel_pio4.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <fdtdec.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/arch/hardware.h>
 #include <asm/global_data.h>
 #include <asm/gpio.h>
diff --git a/drivers/gpio/da8xx_gpio.c b/drivers/gpio/da8xx_gpio.c
index 0f39972ceeb8..dd7506ff1772 100644
--- a/drivers/gpio/da8xx_gpio.c
+++ b/drivers/gpio/da8xx_gpio.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <fdtdec.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
diff --git a/drivers/gpio/db8500_gpio.c b/drivers/gpio/db8500_gpio.c
index eefb56d83f69..4e79571aa4e7 100644
--- a/drivers/gpio/db8500_gpio.c
+++ b/drivers/gpio/db8500_gpio.c
@@ -17,6 +17,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/io.h>
 
 #include <asm/arch/db8500_gpio.h>
diff --git a/drivers/gpio/gpio-uclass.c b/drivers/gpio/gpio-uclass.c
index 28f4a48900fb..7d4e3354f173 100644
--- a/drivers/gpio/gpio-uclass.c
+++ b/drivers/gpio/gpio-uclass.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <dm/device-internal.h>
 #include <dm/lists.h>
diff --git a/drivers/gpio/kona_gpio.c b/drivers/gpio/kona_gpio.c
index 29791882a340..9b8e6240f5a1 100644
--- a/drivers/gpio/kona_gpio.c
+++ b/drivers/gpio/kona_gpio.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/sysmap.h>
 
diff --git a/drivers/gpio/kw_gpio.c b/drivers/gpio/kw_gpio.c
index a15769793f17..39a73ccfb748 100644
--- a/drivers/gpio/kw_gpio.c
+++ b/drivers/gpio/kw_gpio.c
@@ -13,6 +13,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <linux/bitops.h>
 #include <asm/io.h>
 #include <asm/arch/soc.h>
diff --git a/drivers/gpio/mpc83xx_gpio.c b/drivers/gpio/mpc83xx_gpio.c
index b5aaa64be476..ac8e6199d95e 100644
--- a/drivers/gpio/mpc83xx_gpio.c
+++ b/drivers/gpio/mpc83xx_gpio.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <malloc.h>
 #include <mpc83xx.h>
+#include <stdio.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <asm/ppc.h>
diff --git a/drivers/gpio/mvgpio.c b/drivers/gpio/mvgpio.c
index 12e7197daf7b..bf1842ccf7ec 100644
--- a/drivers/gpio/mvgpio.c
+++ b/drivers/gpio/mvgpio.c
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/errno.h>
 #include "mvgpio.h"
diff --git a/drivers/gpio/mxs_gpio.c b/drivers/gpio/mxs_gpio.c
index 2a9f64d633c1..4ff267899cb6 100644
--- a/drivers/gpio/mxs_gpio.c
+++ b/drivers/gpio/mxs_gpio.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.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 91d664e02ff6..fb2f5a30b6d9 100644
--- a/drivers/gpio/omap_gpio.c
+++ b/drivers/gpio/omap_gpio.c
@@ -20,6 +20,7 @@
 #include <common.h>
 #include <dm.h>
 #include <fdtdec.h>
+#include <stdio.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 4ab8cee2d18c..3e32d70e29d2 100644
--- a/drivers/gpio/pca953x.c
+++ b/drivers/gpio/pca953x.c
@@ -12,6 +12,7 @@
 #include <command.h>
 #include <i2c.h>
 #include <pca953x.h>
+#include <stdio.h>
 
 /* Default to an address that hopefully won't corrupt other i2c devices */
 #ifndef CONFIG_SYS_I2C_PCA953X_ADDR
diff --git a/drivers/gpio/pcf8575_gpio.c b/drivers/gpio/pcf8575_gpio.c
index 8a9214dec3ee..7eeacd77c2a6 100644
--- a/drivers/gpio/pcf8575_gpio.c
+++ b/drivers/gpio/pcf8575_gpio.c
@@ -27,6 +27,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm-generic/gpio.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
diff --git a/drivers/gpio/sandbox.c b/drivers/gpio/sandbox.c
index c2f80472b83a..599df135acfe 100644
--- a/drivers/gpio/sandbox.c
+++ b/drivers/gpio/sandbox.c
@@ -8,6 +8,7 @@
 #include <fdtdec.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <acpi/acpi_device.h>
 #include <asm/gpio.h>
 #include <dm/acpi.h>
diff --git a/drivers/gpio/tca642x.c b/drivers/gpio/tca642x.c
index 463cfe879a8f..21e432d7d80e 100644
--- a/drivers/gpio/tca642x.c
+++ b/drivers/gpio/tca642x.c
@@ -23,6 +23,7 @@
 #include <common.h>
 #include <command.h>
 #include <i2c.h>
+#include <stdio.h>
 #include <tca642x.h>
 
 /* tca642x register address definitions */
diff --git a/drivers/gpio/xilinx_gpio.c b/drivers/gpio/xilinx_gpio.c
index 23de1f44e9c3..6ee0757e03c4 100644
--- a/drivers/gpio/xilinx_gpio.c
+++ b/drivers/gpio/xilinx_gpio.c
@@ -7,6 +7,7 @@
 #include <errno.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <linux/list.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
diff --git a/drivers/gpio/zynq_gpio.c b/drivers/gpio/zynq_gpio.c
index 8888d2324c42..91b8cd945e33 100644
--- a/drivers/gpio/zynq_gpio.c
+++ b/drivers/gpio/zynq_gpio.c
@@ -9,6 +9,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
diff --git a/drivers/i2c/davinci_i2c.c b/drivers/i2c/davinci_i2c.c
index a54f2151fd3a..b4bd22fcc85a 100644
--- a/drivers/i2c/davinci_i2c.c
+++ b/drivers/i2c/davinci_i2c.c
@@ -15,6 +15,7 @@
 #include <i2c.h>
 #include <dm.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/i2c_defs.h>
 #include <asm/io.h>
diff --git a/drivers/i2c/designware_i2c.c b/drivers/i2c/designware_i2c.c
index 6cd5d517de77..6ea5a31160be 100644
--- a/drivers/i2c/designware_i2c.c
+++ b/drivers/i2c/designware_i2c.c
@@ -12,6 +12,7 @@
 #include <malloc.h>
 #include <pci.h>
 #include <reset.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/io.h>
 #include <linux/delay.h>
diff --git a/drivers/i2c/i2c-cdns.c b/drivers/i2c/i2c-cdns.c
index 024c63c4eaed..abbfdcbcc5c9 100644
--- a/drivers/i2c/i2c-cdns.c
+++ b/drivers/i2c/i2c-cdns.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <stdio.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/types.h>
diff --git a/drivers/i2c/i2c-cortina.c b/drivers/i2c/i2c-cortina.c
index 4129d6a68884..4575ab6c40ce 100644
--- a/drivers/i2c/i2c-cortina.c
+++ b/drivers/i2c/i2c-cortina.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <i2c.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/io.h>
 #include <dm.h>
diff --git a/drivers/i2c/i2c-uclass.c b/drivers/i2c/i2c-uclass.c
index c16bda469781..d73748adc4cc 100644
--- a/drivers/i2c/i2c-uclass.c
+++ b/drivers/i2c/i2c-uclass.c
@@ -9,6 +9,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <dm/device-internal.h>
 #include <dm/lists.h>
 #include <dm/pinctrl.h>
diff --git a/drivers/i2c/i2c_core.c b/drivers/i2c/i2c_core.c
index 85cf75ecd922..40096e95aa06 100644
--- a/drivers/i2c/i2c_core.c
+++ b/drivers/i2c/i2c_core.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <i2c.h>
 #include <linker_lists.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 
 struct i2c_adapter *i2c_get_adapter(int index)
diff --git a/drivers/i2c/imx_lpi2c.c b/drivers/i2c/imx_lpi2c.c
index b02f3883b0d1..eeb35e050b76 100644
--- a/drivers/i2c/imx_lpi2c.c
+++ b/drivers/i2c/imx_lpi2c.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <errno.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
diff --git a/drivers/i2c/intel_i2c.c b/drivers/i2c/intel_i2c.c
index fa36f48df9a1..0e98e08e4a75 100644
--- a/drivers/i2c/intel_i2c.c
+++ b/drivers/i2c/intel_i2c.c
@@ -12,6 +12,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <pci.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/io.h>
 #include <linux/string.h>
diff --git a/drivers/i2c/kona_i2c.c b/drivers/i2c/kona_i2c.c
index 4edcba29110e..e2632a6e36c5 100644
--- a/drivers/i2c/kona_i2c.c
+++ b/drivers/i2c/kona_i2c.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/i2c/muxes/i2c-arb-gpio-challenge.c b/drivers/i2c/muxes/i2c-arb-gpio-challenge.c
index 567660f9a747..14ead6e27538 100644
--- a/drivers/i2c/muxes/i2c-arb-gpio-challenge.c
+++ b/drivers/i2c/muxes/i2c-arb-gpio-challenge.c
@@ -10,6 +10,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/global_data.h>
 #include <asm/gpio.h>
diff --git a/drivers/i2c/mv_i2c.c b/drivers/i2c/mv_i2c.c
index 54fa069528b6..1850dc6a5678 100644
--- a/drivers/i2c/mv_i2c.c
+++ b/drivers/i2c/mv_i2c.c
@@ -20,6 +20,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <linux/string.h>
diff --git a/drivers/i2c/mvtwsi.c b/drivers/i2c/mvtwsi.c
index 1cc9cfc2eb8b..775f02403460 100644
--- a/drivers/i2c/mvtwsi.c
+++ b/drivers/i2c/mvtwsi.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <i2c.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/i2c/mxc_i2c.c b/drivers/i2c/mxc_i2c.c
index e4e504363798..683b45bd8fd4 100644
--- a/drivers/i2c/mxc_i2c.c
+++ b/drivers/i2c/mxc_i2c.c
@@ -16,6 +16,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
diff --git a/drivers/i2c/omap24xx_i2c.c b/drivers/i2c/omap24xx_i2c.c
index aaf2d10f6fdf..db0812c17ec1 100644
--- a/drivers/i2c/omap24xx_i2c.c
+++ b/drivers/i2c/omap24xx_i2c.c
@@ -42,6 +42,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <log.h>
+#include <stdio.h>
 #include <linux/delay.h>
 #include <linux/printk.h>
 
diff --git a/drivers/input/keyboard-uclass.c b/drivers/input/keyboard-uclass.c
index a265c02efe70..2007032e10cd 100644
--- a/drivers/input/keyboard-uclass.c
+++ b/drivers/input/keyboard-uclass.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <keyboard.h>
 #include <log.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 static int keyboard_start(struct stdio_dev *sdev)
diff --git a/drivers/mailbox/k3-sec-proxy.c b/drivers/mailbox/k3-sec-proxy.c
index b9337f2db5ce..1edb7dfd56cc 100644
--- a/drivers/mailbox/k3-sec-proxy.c
+++ b/drivers/mailbox/k3-sec-proxy.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm/device_compat.h>
diff --git a/drivers/memory/ti-aemif.c b/drivers/memory/ti-aemif.c
index 6250e274e12f..b5fd376862c8 100644
--- a/drivers/memory/ti-aemif.c
+++ b/drivers/memory/ti-aemif.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/ti-common/ti-aemif.h>
 
 #define AEMIF_WAITCYCLE_CONFIG		(CONFIG_AEMIF_CNTRL_BASE + 0x4)
diff --git a/drivers/misc/altera_sysid.c b/drivers/misc/altera_sysid.c
index c6502650b75d..600315be5eac 100644
--- a/drivers/misc/altera_sysid.c
+++ b/drivers/misc/altera_sysid.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <misc.h>
+#include <stdio.h>
 #include <linux/time.h>
 #include <asm/io.h>
 
diff --git a/drivers/misc/cros_ec.c b/drivers/misc/cros_ec.c
index 881dce016fa1..a3ae33acd053 100644
--- a/drivers/misc/cros_ec.c
+++ b/drivers/misc/cros_ec.c
@@ -25,6 +25,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <spi.h>
+#include <stdio.h>
 #include <time.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/misc/cros_ec_i2c.c b/drivers/misc/cros_ec_i2c.c
index 6a5dcc016f20..e3678d0213a0 100644
--- a/drivers/misc/cros_ec_i2c.c
+++ b/drivers/misc/cros_ec_i2c.c
@@ -17,6 +17,7 @@
 #include <i2c.h>
 #include <cros_ec.h>
 #include <log.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 #ifdef DEBUG_TRACE
diff --git a/drivers/misc/cros_ec_lpc.c b/drivers/misc/cros_ec_lpc.c
index 0a4f45b2e89b..caca59471f17 100644
--- a/drivers/misc/cros_ec_lpc.c
+++ b/drivers/misc/cros_ec_lpc.c
@@ -17,6 +17,7 @@
 #include <command.h>
 #include <cros_ec.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/io.h>
 
diff --git a/drivers/misc/cros_ec_sandbox.c b/drivers/misc/cros_ec_sandbox.c
index 81d2191542c3..308b34e2f4bf 100644
--- a/drivers/misc/cros_ec_sandbox.c
+++ b/drivers/misc/cros_ec_sandbox.c
@@ -13,6 +13,7 @@
 #include <hash.h>
 #include <log.h>
 #include <os.h>
+#include <stdio.h>
 #include <time.h>
 #include <linux/string.h>
 #include <u-boot/sha256.h>
diff --git a/drivers/misc/cros_ec_spi.c b/drivers/misc/cros_ec_spi.c
index 357e31f7edc3..a94e216cac7f 100644
--- a/drivers/misc/cros_ec_spi.c
+++ b/drivers/misc/cros_ec_spi.c
@@ -18,6 +18,7 @@
 #include <errno.h>
 #include <log.h>
 #include <spi.h>
+#include <stdio.h>
 #include <time.h>
 #include <linux/string.h>
 
diff --git a/drivers/misc/ds4510.c b/drivers/misc/ds4510.c
index d914123fdf9f..bd2818197c61 100644
--- a/drivers/misc/ds4510.c
+++ b/drivers/misc/ds4510.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <i2c.h>
 #include <command.h>
+#include <stdio.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 #include "ds4510.h"
diff --git a/drivers/misc/fsl_ifc.c b/drivers/misc/fsl_ifc.c
index 8fdaacd5e04c..27666a71fb36 100644
--- a/drivers/misc/fsl_ifc.c
+++ b/drivers/misc/fsl_ifc.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <fsl_ifc.h>
 #include <part.h>
+#include <stdio.h>
 
 #ifdef CONFIG_TFABOOT
 struct ifc_regs ifc_cfg_default_boot[CONFIG_SYS_FSL_IFC_BANK_COUNT] = {
diff --git a/drivers/misc/fsl_iim.c b/drivers/misc/fsl_iim.c
index 85cc3c26b2ef..be6d03444d5f 100644
--- a/drivers/misc/fsl_iim.c
+++ b/drivers/misc/fsl_iim.c
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <fuse.h>
+#include <stdio.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/io.h>
diff --git a/drivers/misc/fsl_portals.c b/drivers/misc/fsl_portals.c
index 2c8cec7c421a..25508cfe672b 100644
--- a/drivers/misc/fsl_portals.c
+++ b/drivers/misc/fsl_portals.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <linux/string.h>
diff --git a/drivers/misc/fsl_sec_mon.c b/drivers/misc/fsl_sec_mon.c
index 76aae5a74742..039e3b77f710 100644
--- a/drivers/misc/fsl_sec_mon.c
+++ b/drivers/misc/fsl_sec_mon.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <fsl_sec_mon.h>
+#include <stdio.h>
 #ifdef CONFIG_PPC
 #include <asm/ppc.h>
 #endif
diff --git a/drivers/misc/gpio_led.c b/drivers/misc/gpio_led.c
index b913069849ac..acf3ec8c017f 100644
--- a/drivers/misc/gpio_led.c
+++ b/drivers/misc/gpio_led.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <status_led.h>
+#include <stdio.h>
 #include <asm/gpio.h>
 
 #ifndef CONFIG_GPIO_LED_INVERTED_TABLE
diff --git a/drivers/misc/ihs_fpga.c b/drivers/misc/ihs_fpga.c
index 9d9d52e978c0..6a61a22c071f 100644
--- a/drivers/misc/ihs_fpga.c
+++ b/drivers/misc/ihs_fpga.c
@@ -13,6 +13,7 @@
 #include <dm.h>
 #include <log.h>
 #include <regmap.h>
+#include <stdio.h>
 #include <asm/gpio.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/drivers/misc/imx8/fuse.c b/drivers/misc/imx8/fuse.c
index 38111c525485..e25d68e6a2e8 100644
--- a/drivers/misc/imx8/fuse.c
+++ b/drivers/misc/imx8/fuse.c
@@ -7,6 +7,7 @@
 #include <console.h>
 #include <errno.h>
 #include <fuse.h>
+#include <stdio.h>
 #include <asm/arch/sci/sci.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/global_data.h>
diff --git a/drivers/misc/imx8/scu.c b/drivers/misc/imx8/scu.c
index fc9320fa9932..ce1a35a552b3 100644
--- a/drivers/misc/imx8/scu.c
+++ b/drivers/misc/imx8/scu.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm.h>
diff --git a/drivers/misc/imx8/scu_api.c b/drivers/misc/imx8/scu_api.c
index 27ecce710fcb..bc0d8f7ae5c5 100644
--- a/drivers/misc/imx8/scu_api.c
+++ b/drivers/misc/imx8/scu_api.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <hang.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm.h>
diff --git a/drivers/misc/k3_avs.c b/drivers/misc/k3_avs.c
index 408c89315a9f..3468f02208e1 100644
--- a/drivers/misc/k3_avs.c
+++ b/drivers/misc/k3_avs.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <i2c.h>
 #include <k3-avs.h>
diff --git a/drivers/misc/mc9sdz60.c b/drivers/misc/mc9sdz60.c
index e68a056a559d..7f9f9223f719 100644
--- a/drivers/misc/mc9sdz60.c
+++ b/drivers/misc/mc9sdz60.c
@@ -6,6 +6,7 @@
 
 #include <config.h>
 #include <common.h>
+#include <stdio.h>
 #include <linux/errno.h>
 #include <linux/types.h>
 #include <i2c.h>
diff --git a/drivers/misc/mxc_ocotp.c b/drivers/misc/mxc_ocotp.c
index 926c62c8a14c..5d7a74afe2c2 100644
--- a/drivers/misc/mxc_ocotp.c
+++ b/drivers/misc/mxc_ocotp.c
@@ -13,6 +13,7 @@
 
 #include <common.h>
 #include <fuse.h>
+#include <stdio.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/io.h>
diff --git a/drivers/misc/mxs_ocotp.c b/drivers/misc/mxs_ocotp.c
index facc720c8ef2..fa185612b2c1 100644
--- a/drivers/misc/mxs_ocotp.c
+++ b/drivers/misc/mxs_ocotp.c
@@ -13,6 +13,7 @@
 
 #include <common.h>
 #include <fuse.h>
+#include <stdio.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/io.h>
diff --git a/drivers/misc/qfw.c b/drivers/misc/qfw.c
index fed08422419d..5c3ff8e52f67 100644
--- a/drivers/misc/qfw.c
+++ b/drivers/misc/qfw.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <qfw.h>
+#include <stdio.h>
 #include <asm/io.h>
 #ifdef CONFIG_GENERATE_ACPI_TABLE
 #include <asm/tables.h>
diff --git a/drivers/misc/rockchip-efuse.c b/drivers/misc/rockchip-efuse.c
index adaa51ce99b5..d5c1a62ba644 100644
--- a/drivers/misc/rockchip-efuse.c
+++ b/drivers/misc/rockchip-efuse.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <command.h>
 #include <display_options.h>
diff --git a/drivers/misc/rockchip-otp.c b/drivers/misc/rockchip-otp.c
index bdd443b3db9b..482de69070da 100644
--- a/drivers/misc/rockchip-otp.c
+++ b/drivers/misc/rockchip-otp.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <command.h>
 #include <dm.h>
diff --git a/drivers/misc/sifive-otp.c b/drivers/misc/sifive-otp.c
index 7d502febea4f..799d75b08738 100644
--- a/drivers/misc/sifive-otp.c
+++ b/drivers/misc/sifive-otp.c
@@ -18,6 +18,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <dm/device.h>
 #include <dm/read.h>
 #include <linux/bitops.h>
diff --git a/drivers/misc/spltest_sandbox.c b/drivers/misc/spltest_sandbox.c
index 999031625b54..8a5e6b1975ec 100644
--- a/drivers/misc/spltest_sandbox.c
+++ b/drivers/misc/spltest_sandbox.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <dt-structs.h>
+#include <stdio.h>
 
 static int sandbox_spl_probe(struct udevice *dev)
 {
diff --git a/drivers/misc/stm32mp_fuse.c b/drivers/misc/stm32mp_fuse.c
index 0eed3459734b..530a7824e3ec 100644
--- a/drivers/misc/stm32mp_fuse.c
+++ b/drivers/misc/stm32mp_fuse.c
@@ -8,6 +8,7 @@
 #include <fuse.h>
 #include <misc.h>
 #include <errno.h>
+#include <stdio.h>
 #include <dm/device.h>
 #include <dm/uclass.h>
 #include <power/stpmic1.h>
diff --git a/drivers/mmc/atmel_sdhci.c b/drivers/mmc/atmel_sdhci.c
index 96cbb2a2c51b..1781d7a3f914 100644
--- a/drivers/mmc/atmel_sdhci.c
+++ b/drivers/mmc/atmel_sdhci.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <malloc.h>
 #include <sdhci.h>
+#include <stdio.h>
 #include <asm/arch/clk.h>
 #include <asm/global_data.h>
 
diff --git a/drivers/mmc/bcm2835_sdhost.c b/drivers/mmc/bcm2835_sdhost.c
index a138165855d4..cf362f620ae1 100644
--- a/drivers/mmc/bcm2835_sdhost.c
+++ b/drivers/mmc/bcm2835_sdhost.c
@@ -33,6 +33,7 @@
 #include <common.h>
 #include <dm.h>
 #include <mmc.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/arch/msg.h>
 #include <asm/arch/mbox.h>
diff --git a/drivers/mmc/davinci_mmc.c b/drivers/mmc/davinci_mmc.c
index 50731f3fe7b0..f4edff7566e7 100644
--- a/drivers/mmc/davinci_mmc.c
+++ b/drivers/mmc/davinci_mmc.c
@@ -13,6 +13,7 @@
 #include <command.h>
 #include <part.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/sdmmc_defs.h>
 #include <asm-generic/gpio.h>
diff --git a/drivers/mmc/exynos_dw_mmc.c b/drivers/mmc/exynos_dw_mmc.c
index 499fafe8f5ef..55d3ad1692c5 100644
--- a/drivers/mmc/exynos_dw_mmc.c
+++ b/drivers/mmc/exynos_dw_mmc.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dwmmc.h>
 #include <fdtdec.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/libfdt.h>
 #include <malloc.h>
diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c
index a7c28f128e0f..8f0bce6d5659 100644
--- a/drivers/mmc/fsl_esdhc.c
+++ b/drivers/mmc/fsl_esdhc.c
@@ -20,6 +20,7 @@
 #include <malloc.h>
 #include <fsl_esdhc.h>
 #include <fdt_support.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
diff --git a/drivers/mmc/fsl_esdhc_imx.c b/drivers/mmc/fsl_esdhc_imx.c
index ebf64ab5c448..b8f89affc33e 100644
--- a/drivers/mmc/fsl_esdhc_imx.c
+++ b/drivers/mmc/fsl_esdhc_imx.c
@@ -20,6 +20,7 @@
 #include <log.h>
 #include <mmc.h>
 #include <part.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
diff --git a/drivers/mmc/fsl_esdhc_spl.c b/drivers/mmc/fsl_esdhc_spl.c
index 033fd0edd8f4..4c725436de45 100644
--- a/drivers/mmc/fsl_esdhc_spl.c
+++ b/drivers/mmc/fsl_esdhc_spl.c
@@ -8,6 +8,7 @@
 #include <hang.h>
 #include <mmc.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 /*
diff --git a/drivers/mmc/ftsdc010_mci.c b/drivers/mmc/ftsdc010_mci.c
index b26571e0a695..cc0348d46633 100644
--- a/drivers/mmc/ftsdc010_mci.c
+++ b/drivers/mmc/ftsdc010_mci.c
@@ -15,6 +15,7 @@
 #include <malloc.h>
 #include <part.h>
 #include <mmc.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
diff --git a/drivers/mmc/gen_atmel_mci.c b/drivers/mmc/gen_atmel_mci.c
index 44c9f1288b35..19ba2b51182f 100644
--- a/drivers/mmc/gen_atmel_mci.c
+++ b/drivers/mmc/gen_atmel_mci.c
@@ -16,6 +16,7 @@
 #include <mmc.h>
 #include <part.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/mmc/iproc_sdhci.c b/drivers/mmc/iproc_sdhci.c
index ef7d8f8b41e8..cd9d87be98b7 100644
--- a/drivers/mmc/iproc_sdhci.c
+++ b/drivers/mmc/iproc_sdhci.c
@@ -9,6 +9,7 @@
 #include <errno.h>
 #include <malloc.h>
 #include <sdhci.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/string.h>
diff --git a/drivers/mmc/kona_sdhci.c b/drivers/mmc/kona_sdhci.c
index 2bbe673b9129..dc7a203f1f0f 100644
--- a/drivers/mmc/kona_sdhci.c
+++ b/drivers/mmc/kona_sdhci.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <malloc.h>
 #include <sdhci.h>
+#include <stdio.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/kona-common/clk.h>
diff --git a/drivers/mmc/mmc-uclass.c b/drivers/mmc/mmc-uclass.c
index 90690c8d1e36..9c30e01028b7 100644
--- a/drivers/mmc/mmc-uclass.c
+++ b/drivers/mmc/mmc-uclass.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <mmc.h>
 #include <dm.h>
+#include <stdio.h>
 #include <dm/device-internal.h>
 #include <dm/device_compat.h>
 #include <dm/lists.h>
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index e9c181555d01..e5a712fbf1b0 100644
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@ -13,6 +13,7 @@
 #include <command.h>
 #include <dm.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/u-boot.h>
 #include <dm/device-internal.h>
diff --git a/drivers/mmc/mmc_legacy.c b/drivers/mmc/mmc_legacy.c
index a05da6c2e882..da2941bada8b 100644
--- a/drivers/mmc/mmc_legacy.c
+++ b/drivers/mmc/mmc_legacy.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <mmc.h>
+#include <stdio.h>
 #include "mmc_private.h"
 
 static struct list_head mmc_devices;
diff --git a/drivers/mmc/mmc_write.c b/drivers/mmc/mmc_write.c
index 6a4453ca02e7..68d872fd142b 100644
--- a/drivers/mmc/mmc_write.c
+++ b/drivers/mmc/mmc_write.c
@@ -12,6 +12,7 @@
 #include <dm.h>
 #include <part.h>
 #include <div64.h>
+#include <stdio.h>
 #include <linux/math64.h>
 #include "mmc_private.h"
 
diff --git a/drivers/mmc/msm_sdhci.c b/drivers/mmc/msm_sdhci.c
index 27d8fb84fab5..6e61ef6b8585 100644
--- a/drivers/mmc/msm_sdhci.c
+++ b/drivers/mmc/msm_sdhci.c
@@ -12,6 +12,7 @@
 #include <dm.h>
 #include <malloc.h>
 #include <sdhci.h>
+#include <stdio.h>
 #include <wait_bit.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/mmc/mv_sdhci.c b/drivers/mmc/mv_sdhci.c
index 356d161d51fe..775f2041a1ac 100644
--- a/drivers/mmc/mv_sdhci.c
+++ b/drivers/mmc/mv_sdhci.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <malloc.h>
 #include <sdhci.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/mbus.h>
 #include <linux/string.h>
diff --git a/drivers/mmc/mvebu_mmc.c b/drivers/mmc/mvebu_mmc.c
index b33cd40faee2..d586342a58d8 100644
--- a/drivers/mmc/mvebu_mmc.c
+++ b/drivers/mmc/mvebu_mmc.c
@@ -13,6 +13,7 @@
 #include <malloc.h>
 #include <part.h>
 #include <mmc.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/mmc/mxcmmc.c b/drivers/mmc/mxcmmc.c
index 00720c64084a..01d57d4c778c 100644
--- a/drivers/mmc/mxcmmc.c
+++ b/drivers/mmc/mxcmmc.c
@@ -23,6 +23,7 @@
 #include <part.h>
 #include <malloc.h>
 #include <mmc.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
diff --git a/drivers/mmc/mxsmmc.c b/drivers/mmc/mxsmmc.c
index 4df872cc3ecf..a54e1e128359 100644
--- a/drivers/mmc/mxsmmc.c
+++ b/drivers/mmc/mxsmmc.c
@@ -24,6 +24,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <mmc.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/drivers/mmc/omap_hsmmc.c b/drivers/mmc/omap_hsmmc.c
index c54edd9c8d1f..95d3cad4d0c5 100644
--- a/drivers/mmc/omap_hsmmc.c
+++ b/drivers/mmc/omap_hsmmc.c
@@ -34,6 +34,7 @@
 #if defined(CONFIG_OMAP54XX) || defined(CONFIG_OMAP44XX)
 #include <palmas.h>
 #endif
+#include <stdio.h>
 #include <time.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
diff --git a/drivers/mmc/pic32_sdhci.c b/drivers/mmc/pic32_sdhci.c
index 963809fb2aee..009bf00a7f81 100644
--- a/drivers/mmc/pic32_sdhci.c
+++ b/drivers/mmc/pic32_sdhci.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <dm.h>
 #include <sdhci.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
 #include <mach/pic32.h>
diff --git a/drivers/mmc/pxa_mmc_gen.c b/drivers/mmc/pxa_mmc_gen.c
index 7d88ca015c12..854d346a7469 100644
--- a/drivers/mmc/pxa_mmc_gen.c
+++ b/drivers/mmc/pxa_mmc_gen.c
@@ -9,6 +9,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/regs-mmc.h>
 #include <linux/delay.h>
diff --git a/drivers/mmc/rockchip_sdhci.c b/drivers/mmc/rockchip_sdhci.c
index b073f1a08d4a..f8def838ca21 100644
--- a/drivers/mmc/rockchip_sdhci.c
+++ b/drivers/mmc/rockchip_sdhci.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <dm.h>
 #include <dt-structs.h>
+#include <stdio.h>
 #include <linux/err.h>
 #include <linux/libfdt.h>
 #include <malloc.h>
diff --git a/drivers/mmc/rpmb.c b/drivers/mmc/rpmb.c
index 7a596b2f19ba..0d1b3eb875b3 100644
--- a/drivers/mmc/rpmb.c
+++ b/drivers/mmc/rpmb.c
@@ -13,6 +13,7 @@
 #include <memalign.h>
 #include <mmc.h>
 #include <sdhci.h>
+#include <stdio.h>
 #include <linux/string.h>
 #include <u-boot/sha256.h>
 #include "mmc_private.h"
diff --git a/drivers/mmc/s5p_sdhci.c b/drivers/mmc/s5p_sdhci.c
index 240db8a75697..e06662141f54 100644
--- a/drivers/mmc/s5p_sdhci.c
+++ b/drivers/mmc/s5p_sdhci.c
@@ -10,6 +10,7 @@
 #include <malloc.h>
 #include <sdhci.h>
 #include <fdtdec.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/libfdt.h>
 #include <asm/gpio.h>
diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c
index e9c7207fa362..9cfe0fcb9a55 100644
--- a/drivers/mmc/sdhci.c
+++ b/drivers/mmc/sdhci.c
@@ -15,6 +15,7 @@
 #include <malloc.h>
 #include <mmc.h>
 #include <sdhci.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/cache.h>
 #include <linux/bitops.h>
diff --git a/drivers/mmc/sh_mmcif.c b/drivers/mmc/sh_mmcif.c
index 5f25acd55db9..e9ff31b4afe5 100644
--- a/drivers/mmc/sh_mmcif.c
+++ b/drivers/mmc/sh_mmcif.c
@@ -8,6 +8,7 @@
 #include <config.h>
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <watchdog.h>
 #include <command.h>
 #include <mmc.h>
diff --git a/drivers/mmc/sh_sdhi.c b/drivers/mmc/sh_sdhi.c
index a279bc69aaf3..97fb1ee48ecc 100644
--- a/drivers/mmc/sh_sdhi.c
+++ b/drivers/mmc/sh_sdhi.c
@@ -15,6 +15,7 @@
 #include <mmc.h>
 #include <dm.h>
 #include <part.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
diff --git a/drivers/mmc/socfpga_dw_mmc.c b/drivers/mmc/socfpga_dw_mmc.c
index 16a6e3056dc2..1c3d996bcd52 100644
--- a/drivers/mmc/socfpga_dw_mmc.c
+++ b/drivers/mmc/socfpga_dw_mmc.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/arch/clock_manager.h>
 #include <asm/arch/system_manager.h>
 #include <clk.h>
diff --git a/drivers/mmc/stm32_sdmmc2.c b/drivers/mmc/stm32_sdmmc2.c
index 4736cae76890..0bc2ecee69be 100644
--- a/drivers/mmc/stm32_sdmmc2.c
+++ b/drivers/mmc/stm32_sdmmc2.c
@@ -11,6 +11,7 @@
 #include <fdtdec.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/bitops.h>
 #include <asm/cache.h>
 #include <linux/bitops.h>
diff --git a/drivers/mmc/sunxi_mmc.c b/drivers/mmc/sunxi_mmc.c
index 96d8f18d0f5a..4152b7be0e42 100644
--- a/drivers/mmc/sunxi_mmc.c
+++ b/drivers/mmc/sunxi_mmc.c
@@ -15,6 +15,7 @@
 #include <mmc.h>
 #include <clk.h>
 #include <reset.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
diff --git a/drivers/mmc/tegra_mmc.c b/drivers/mmc/tegra_mmc.c
index 94e062c12464..e7a06ec79492 100644
--- a/drivers/mmc/tegra_mmc.c
+++ b/drivers/mmc/tegra_mmc.c
@@ -12,6 +12,7 @@
 #include <errno.h>
 #include <log.h>
 #include <mmc.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
diff --git a/drivers/mmc/xenon_sdhci.c b/drivers/mmc/xenon_sdhci.c
index 57fe6a4df23d..1336d9193357 100644
--- a/drivers/mmc/xenon_sdhci.c
+++ b/drivers/mmc/xenon_sdhci.c
@@ -17,6 +17,7 @@
 #include <common.h>
 #include <dm.h>
 #include <fdtdec.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/drivers/mmc/zynq_sdhci.c b/drivers/mmc/zynq_sdhci.c
index 43b9f215229a..01e75e2e770b 100644
--- a/drivers/mmc/zynq_sdhci.c
+++ b/drivers/mmc/zynq_sdhci.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <dm.h>
 #include <fdtdec.h>
+#include <stdio.h>
 #include <linux/delay.h>
 #include "mmc_private.h"
 #include <log.h>
diff --git a/drivers/mtd/altera_qspi.c b/drivers/mtd/altera_qspi.c
index c406963d7573..9722f32a533f 100644
--- a/drivers/mtd/altera_qspi.c
+++ b/drivers/mtd/altera_qspi.c
@@ -11,6 +11,7 @@
 #include <flash.h>
 #include <log.h>
 #include <mtd.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c
index 21cdf62478a2..dcbba181c60b 100644
--- a/drivers/mtd/cfi_flash.c
+++ b/drivers/mtd/cfi_flash.c
@@ -26,6 +26,7 @@
 #include <init.h>
 #include <irq_func.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/global_data.h>
 #include <asm/processor.h>
diff --git a/drivers/mtd/jedec_flash.c b/drivers/mtd/jedec_flash.c
index 859c7fd4ec24..790373dac8fc 100644
--- a/drivers/mtd/jedec_flash.c
+++ b/drivers/mtd/jedec_flash.c
@@ -14,6 +14,7 @@
 #include <common.h>
 #include <flash.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/processor.h>
 #include <asm/io.h>
 #include <asm/byteorder.h>
diff --git a/drivers/mtd/mtd_uboot.c b/drivers/mtd/mtd_uboot.c
index 16fe4ecdb6e1..ebdec0dd6c56 100644
--- a/drivers/mtd/mtd_uboot.c
+++ b/drivers/mtd/mtd_uboot.c
@@ -7,6 +7,7 @@
 #include <env.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <dm/device.h>
 #include <dm/uclass-internal.h>
diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c
index ef3eb456ac87..2f882b7df079 100644
--- a/drivers/mtd/mtdpart.c
+++ b/drivers/mtd/mtdpart.c
@@ -21,6 +21,7 @@
 
 #include <common.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <linux/bug.h>
 #include <linux/errno.h>
 #include <linux/compat.h>
diff --git a/drivers/mtd/mw_eeprom.c b/drivers/mtd/mw_eeprom.c
index 9837733beeed..5d1a35732417 100644
--- a/drivers/mtd/mw_eeprom.c
+++ b/drivers/mtd/mw_eeprom.c
@@ -2,6 +2,7 @@
 
 #include <common.h>
 #include <eeprom.h>
+#include <stdio.h>
 #include <asm/ic/ssi.h>
 #include <linux/delay.h>
 
diff --git a/drivers/mtd/nand/raw/arasan_nfc.c b/drivers/mtd/nand/raw/arasan_nfc.c
index 9733e6666768..978174ffa8d8 100644
--- a/drivers/mtd/nand/raw/arasan_nfc.c
+++ b/drivers/mtd/nand/raw/arasan_nfc.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/mtd/nand/raw/fsl_elbc_nand.c b/drivers/mtd/nand/raw/fsl_elbc_nand.c
index 32ee212694a5..99749f9e50a9 100644
--- a/drivers/mtd/nand/raw/fsl_elbc_nand.c
+++ b/drivers/mtd/nand/raw/fsl_elbc_nand.c
@@ -11,6 +11,7 @@
 #include <command.h>
 #include <malloc.h>
 #include <nand.h>
+#include <stdio.h>
 #include <time.h>
 #include <dm/devres.h>
 
diff --git a/drivers/mtd/nand/raw/fsl_elbc_spl.c b/drivers/mtd/nand/raw/fsl_elbc_spl.c
index a62ab69ee1e0..e8b9f40f3b0a 100644
--- a/drivers/mtd/nand/raw/fsl_elbc_spl.c
+++ b/drivers/mtd/nand/raw/fsl_elbc_spl.c
@@ -11,6 +11,7 @@
 
 #include <common.h>
 #include <cpu_func.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/fsl_lbc.h>
 #include <nand.h>
diff --git a/drivers/mtd/nand/raw/fsl_ifc_nand.c b/drivers/mtd/nand/raw/fsl_ifc_nand.c
index 964a329023d4..33c80d032091 100644
--- a/drivers/mtd/nand/raw/fsl_ifc_nand.c
+++ b/drivers/mtd/nand/raw/fsl_ifc_nand.c
@@ -10,6 +10,7 @@
 #include <command.h>
 #include <malloc.h>
 #include <nand.h>
+#include <stdio.h>
 #include <time.h>
 #include <dm/devres.h>
 
diff --git a/drivers/mtd/nand/raw/fsl_ifc_spl.c b/drivers/mtd/nand/raw/fsl_ifc_spl.c
index b7e37416a49b..cf09fce3fbbf 100644
--- a/drivers/mtd/nand/raw/fsl_ifc_spl.c
+++ b/drivers/mtd/nand/raw/fsl_ifc_spl.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <cpu_func.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <fsl_ifc.h>
 #include <part.h>
diff --git a/drivers/mtd/nand/raw/fsmc_nand.c b/drivers/mtd/nand/raw/fsmc_nand.c
index a5ef0ae75e0e..1feaeadd4b72 100644
--- a/drivers/mtd/nand/raw/fsmc_nand.c
+++ b/drivers/mtd/nand/raw/fsmc_nand.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <nand.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
diff --git a/drivers/mtd/nand/raw/mxs_nand.c b/drivers/mtd/nand/raw/mxs_nand.c
index 3ba3afbbf291..d59528e27fd3 100644
--- a/drivers/mtd/nand/raw/mxs_nand.c
+++ b/drivers/mtd/nand/raw/mxs_nand.c
@@ -16,6 +16,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <dm.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <linux/mtd/rawnand.h>
 #include <linux/sizes.h>
diff --git a/drivers/mtd/nand/raw/mxs_nand_spl.c b/drivers/mtd/nand/raw/mxs_nand_spl.c
index 2e1f4c522a6a..bc3bc836434a 100644
--- a/drivers/mtd/nand/raw/mxs_nand_spl.c
+++ b/drivers/mtd/nand/raw/mxs_nand_spl.c
@@ -9,6 +9,7 @@
 #include <nand.h>
 #include <malloc.h>
 #include <mxs_nand.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/cache.h>
 #include <linux/bitops.h>
diff --git a/drivers/mtd/nand/raw/nand_util.c b/drivers/mtd/nand/raw/nand_util.c
index 264a1efada9b..162f6fe1f0cf 100644
--- a/drivers/mtd/nand/raw/nand_util.c
+++ b/drivers/mtd/nand/raw/nand_util.c
@@ -21,6 +21,7 @@
 #include <common.h>
 #include <command.h>
 #include <log.h>
+#include <stdio.h>
 #include <watchdog.h>
 #include <malloc.h>
 #include <memalign.h>
diff --git a/drivers/mtd/nand/raw/omap_elm.c b/drivers/mtd/nand/raw/omap_elm.c
index 35c6dd1f1bcc..87368743a9a0 100644
--- a/drivers/mtd/nand/raw/omap_elm.c
+++ b/drivers/mtd/nand/raw/omap_elm.c
@@ -13,6 +13,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <linux/mtd/omap_elm.h>
diff --git a/drivers/mtd/nand/raw/omap_gpmc.c b/drivers/mtd/nand/raw/omap_gpmc.c
index 9fef305da1c6..2863b1de1b63 100644
--- a/drivers/mtd/nand/raw/omap_gpmc.c
+++ b/drivers/mtd/nand/raw/omap_gpmc.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <asm/arch/mem.h>
diff --git a/drivers/mtd/nand/raw/sunxi_nand_spl.c b/drivers/mtd/nand/raw/sunxi_nand_spl.c
index 942f2366849e..b098ebef8f39 100644
--- a/drivers/mtd/nand/raw/sunxi_nand_spl.c
+++ b/drivers/mtd/nand/raw/sunxi_nand_spl.c
@@ -4,6 +4,7 @@
  * Copyright (c) 2015, AW-SOM Technologies <www.aw-som.com>
  */
 
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/io.h>
 #include <common.h>
diff --git a/drivers/mtd/nand/raw/tegra_nand.c b/drivers/mtd/nand/raw/tegra_nand.c
index 0b81fe1d4874..ace59249b9ef 100644
--- a/drivers/mtd/nand/raw/tegra_nand.c
+++ b/drivers/mtd/nand/raw/tegra_nand.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <memalign.h>
diff --git a/drivers/mtd/nand/raw/vf610_nfc.c b/drivers/mtd/nand/raw/vf610_nfc.c
index 457efcc23e6e..708653ab1621 100644
--- a/drivers/mtd/nand/raw/vf610_nfc.c
+++ b/drivers/mtd/nand/raw/vf610_nfc.c
@@ -23,6 +23,7 @@
 
 #include <common.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <time.h>
 #include <dm/device_compat.h>
 #include <linux/printk.h>
diff --git a/drivers/mtd/nand/raw/zynq_nand.c b/drivers/mtd/nand/raw/zynq_nand.c
index 37a6835060c4..47435cfdccc3 100644
--- a/drivers/mtd/nand/raw/zynq_nand.c
+++ b/drivers/mtd/nand/raw/zynq_nand.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/mtd/onenand/onenand_uboot.c b/drivers/mtd/onenand/onenand_uboot.c
index b6ec9eecda6a..c76ae04a1efb 100644
--- a/drivers/mtd/onenand/onenand_uboot.c
+++ b/drivers/mtd/onenand/onenand_uboot.c
@@ -15,6 +15,7 @@
 
 #include <common.h>
 #include <display_options.h>
+#include <stdio.h>
 #include <linux/compat.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/onenand.h>
diff --git a/drivers/mtd/onenand/samsung.c b/drivers/mtd/onenand/samsung.c
index 27143d4d0a5c..be6c8e1def39 100644
--- a/drivers/mtd/onenand/samsung.c
+++ b/drivers/mtd/onenand/samsung.c
@@ -11,6 +11,7 @@
 
 #include <common.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <linux/compat.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/onenand.h>
diff --git a/drivers/mtd/pic32_flash.c b/drivers/mtd/pic32_flash.c
index 71f22406badb..a50aec7d77e4 100644
--- a/drivers/mtd/pic32_flash.c
+++ b/drivers/mtd/pic32_flash.c
@@ -12,6 +12,7 @@
 #include <flash.h>
 #include <init.h>
 #include <irq_func.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/string.h>
diff --git a/drivers/mtd/renesas_rpc_hf.c b/drivers/mtd/renesas_rpc_hf.c
index f15228741ffe..1398a474b218 100644
--- a/drivers/mtd/renesas_rpc_hf.c
+++ b/drivers/mtd/renesas_rpc_hf.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <clk.h>
diff --git a/drivers/mtd/spi/fsl_espi_spl.c b/drivers/mtd/spi/fsl_espi_spl.c
index 9c9975748845..5a3b5abd5c7d 100644
--- a/drivers/mtd/spi/fsl_espi_spl.c
+++ b/drivers/mtd/spi/fsl_espi_spl.c
@@ -8,6 +8,7 @@
 #include <hang.h>
 #include <spi_flash.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 #define ESPI_BOOT_IMAGE_SIZE	0x48
diff --git a/drivers/mtd/spi/sandbox.c b/drivers/mtd/spi/sandbox.c
index a63e92d0340c..e18326b56921 100644
--- a/drivers/mtd/spi/sandbox.c
+++ b/drivers/mtd/spi/sandbox.c
@@ -16,6 +16,7 @@
 #include <malloc.h>
 #include <spi.h>
 #include <os.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 #include <spi_flash.h>
diff --git a/drivers/mtd/spi/sf_dataflash.c b/drivers/mtd/spi/sf_dataflash.c
index 11a396f11a20..90f09a5fa1d5 100644
--- a/drivers/mtd/spi/sf_dataflash.c
+++ b/drivers/mtd/spi/sf_dataflash.c
@@ -16,6 +16,7 @@
 #include <spi.h>
 #include <spi_flash.h>
 #include <div64.h>
+#include <stdio.h>
 #include <time.h>
 #include <linux/delay.h>
 #include <linux/err.h>
diff --git a/drivers/mtd/spi/sf_mtd.c b/drivers/mtd/spi/sf_mtd.c
index 1d8276d59d6e..d41811ecdae9 100644
--- a/drivers/mtd/spi/sf_mtd.c
+++ b/drivers/mtd/spi/sf_mtd.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <flash.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <linux/errno.h>
 #include <linux/mtd/mtd.h>
 #include <spi_flash.h>
diff --git a/drivers/mtd/spi/sf_probe.c b/drivers/mtd/spi/sf_probe.c
index b37fed685770..8de8f94d2f3e 100644
--- a/drivers/mtd/spi/sf_probe.c
+++ b/drivers/mtd/spi/sf_probe.c
@@ -14,6 +14,7 @@
 #include <malloc.h>
 #include <spi.h>
 #include <spi_flash.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 #include "sf_internal.h"
diff --git a/drivers/mtd/spi/spi-nor-core.c b/drivers/mtd/spi/spi-nor-core.c
index d236f860df5b..fd49d6ae4d19 100644
--- a/drivers/mtd/spi/spi-nor-core.c
+++ b/drivers/mtd/spi/spi-nor-core.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <display_options.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <dm/device_compat.h>
 #include <dm/devres.h>
diff --git a/drivers/mtd/spi/spi-nor-tiny.c b/drivers/mtd/spi/spi-nor-tiny.c
index 91f98aac2d18..0cddd1068448 100644
--- a/drivers/mtd/spi/spi-nor-tiny.c
+++ b/drivers/mtd/spi/spi-nor-tiny.c
@@ -11,6 +11,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <dm/device_compat.h>
 #include <linux/err.h>
diff --git a/drivers/mtd/st_smi.c b/drivers/mtd/st_smi.c
index 970c6ee70432..d53466059905 100644
--- a/drivers/mtd/st_smi.c
+++ b/drivers/mtd/st_smi.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <flash.h>
+#include <stdio.h>
 #include <time.h>
 #include <linux/delay.h>
 #include <linux/err.h>
diff --git a/drivers/mtd/stm32_flash.c b/drivers/mtd/stm32_flash.c
index 95afa2d6bc72..703afc7a07eb 100644
--- a/drivers/mtd/stm32_flash.c
+++ b/drivers/mtd/stm32_flash.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <flash.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/stm32.h>
 #include "stm32_flash.h"
diff --git a/drivers/mtd/ubi/debug.c b/drivers/mtd/ubi/debug.c
index 393419bd1376..e9c50a4852b7 100644
--- a/drivers/mtd/ubi/debug.c
+++ b/drivers/mtd/ubi/debug.c
@@ -7,6 +7,7 @@
 
 #include <hexdump.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <ubi_uboot.h>
 #include <linux/printk.h>
 #include <linux/string.h>
diff --git a/drivers/net/ag7xxx.c b/drivers/net/ag7xxx.c
index 7171479c80de..f6c8b57d93d4 100644
--- a/drivers/net/ag7xxx.c
+++ b/drivers/net/ag7xxx.c
@@ -15,6 +15,7 @@
 #include <miiphy.h>
 #include <malloc.h>
 #include <net.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
diff --git a/drivers/net/altera_tse.c b/drivers/net/altera_tse.c
index e97937628004..0c5c2e3053dc 100644
--- a/drivers/net/altera_tse.c
+++ b/drivers/net/altera_tse.c
@@ -17,6 +17,7 @@
 #include <memalign.h>
 #include <miiphy.h>
 #include <net.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
diff --git a/drivers/net/armada100_fec.c b/drivers/net/armada100_fec.c
index 375f1b139999..87c01e0e3cd2 100644
--- a/drivers/net/armada100_fec.c
+++ b/drivers/net/armada100_fec.c
@@ -15,6 +15,7 @@
 #include <malloc.h>
 #include <miiphy.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/types.h>
 #include <asm/byteorder.h>
 #include <asm/u-boot.h>
diff --git a/drivers/net/at91_emac.c b/drivers/net/at91_emac.c
index 62263cb435a1..d49f9216c7de 100644
--- a/drivers/net/at91_emac.c
+++ b/drivers/net/at91_emac.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/at91_emac.h>
diff --git a/drivers/net/ax88180.c b/drivers/net/ax88180.c
index b971c16a6543..5783c42aa234 100644
--- a/drivers/net/ax88180.c
+++ b/drivers/net/ax88180.c
@@ -42,6 +42,7 @@
 #include <log.h>
 #include <net.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/mii.h>
diff --git a/drivers/net/bcm-sf2-eth-gmac.c b/drivers/net/bcm-sf2-eth-gmac.c
index 3ab5841a7d0f..67c8498f0f63 100644
--- a/drivers/net/bcm-sf2-eth-gmac.c
+++ b/drivers/net/bcm-sf2-eth-gmac.c
@@ -8,6 +8,7 @@
 #define DEBUG
 #include <linux/printk.h>
 #endif
+#include <stdio.h>
 #include <linux/string.h>
 #endif
 
diff --git a/drivers/net/bcm-sf2-eth.c b/drivers/net/bcm-sf2-eth.c
index 2e8642086331..21266d66dd64 100644
--- a/drivers/net/bcm-sf2-eth.c
+++ b/drivers/net/bcm-sf2-eth.c
@@ -8,6 +8,7 @@
 #include <malloc.h>
 #include <net.h>
 #include <config.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/printk.h>
diff --git a/drivers/net/bcmgenet.c b/drivers/net/bcmgenet.c
index 11b6148ab632..ed17df0392b2 100644
--- a/drivers/net/bcmgenet.c
+++ b/drivers/net/bcmgenet.c
@@ -17,6 +17,7 @@
  */
 
 #include <log.h>
+#include <stdio.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 ff8131fafc2f..0fcbcf919a02 100644
--- a/drivers/net/calxedaxgmac.c
+++ b/drivers/net/calxedaxgmac.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <malloc.h>
 #include <net.h>
+#include <stdio.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 fea6ad77d0a5..9baef753b602 100644
--- a/drivers/net/dc2114x.c
+++ b/drivers/net/dc2114x.c
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0+
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <dm.h>
 #include <malloc.h>
diff --git a/drivers/net/designware.c b/drivers/net/designware.c
index f325bf237315..2abe901a8559 100644
--- a/drivers/net/designware.c
+++ b/drivers/net/designware.c
@@ -19,6 +19,7 @@
 #include <net.h>
 #include <pci.h>
 #include <reset.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/cache.h>
 #include <asm/u-boot.h>
diff --git a/drivers/net/dm9000x.c b/drivers/net/dm9000x.c
index 928c6d858561..33cd6c72e19d 100644
--- a/drivers/net/dm9000x.c
+++ b/drivers/net/dm9000x.c
@@ -52,6 +52,7 @@ TODO: external MII is not functional, only internal at the moment.
 #include <common.h>
 #include <command.h>
 #include <net.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/io.h>
 #include <dm9000.h>
diff --git a/drivers/net/dnet.c b/drivers/net/dnet.c
index 4efb8199dfbb..1233d7814dde 100644
--- a/drivers/net/dnet.c
+++ b/drivers/net/dnet.c
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.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 9613af44422b..151ae3e038d1 100644
--- a/drivers/net/e1000.c
+++ b/drivers/net/e1000.c
@@ -39,6 +39,7 @@ tested on both gig copper and gig fiber boards
 #include <memalign.h>
 #include <net.h>
 #include <pci.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
diff --git a/drivers/net/e1000.h b/drivers/net/e1000.h
index 19ed4777d9ab..641502ea9286 100644
--- a/drivers/net/e1000.h
+++ b/drivers/net/e1000.h
@@ -18,6 +18,7 @@
 #ifndef _E1000_HW_H_
 #define _E1000_HW_H_
 
+#include <stdio.h>
 #include <linux/list.h>
 #include <malloc.h>
 #include <net.h>
diff --git a/drivers/net/e1000_spi.c b/drivers/net/e1000_spi.c
index ed3e987b12bd..6af5b32e413a 100644
--- a/drivers/net/e1000_spi.c
+++ b/drivers/net/e1000_spi.c
@@ -1,6 +1,7 @@
 #include <common.h>
 #include <command.h>
 #include <console.h>
+#include <stdio.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 9ff078176b8c..1272e915f0e2 100644
--- a/drivers/net/eepro100.c
+++ b/drivers/net/eepro100.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <stdio.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 72ad7936d63d..2116f31cf767 100644
--- a/drivers/net/ep93xx_eth.c
+++ b/drivers/net/ep93xx_eth.c
@@ -20,6 +20,7 @@
 #include <common.h>
 #include <log.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/arch/ep93xx.h>
 #include <asm/io.h>
 #include <malloc.h>
diff --git a/drivers/net/eth-phy-uclass.c b/drivers/net/eth-phy-uclass.c
index b383f455276b..4afa6c87461d 100644
--- a/drivers/net/eth-phy-uclass.c
+++ b/drivers/net/eth-phy-uclass.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <dm.h>
 #include <net.h>
+#include <stdio.h>
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
 #include <dm/lists.h>
diff --git a/drivers/net/ethoc.c b/drivers/net/ethoc.c
index f158c7625bd5..73228d9e5685 100644
--- a/drivers/net/ethoc.c
+++ b/drivers/net/ethoc.c
@@ -13,6 +13,7 @@
 #include <cpu_func.h>
 #include <dm.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/u-boot.h>
 #include <dm/platform_data/net_ethoc.h>
diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c
index 1d8bdb9e12f5..79eb1497930a 100644
--- a/drivers/net/fec_mxc.c
+++ b/drivers/net/fec_mxc.c
@@ -17,6 +17,7 @@
 #include <miiphy.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
diff --git a/drivers/net/fm/eth.c b/drivers/net/fm/eth.c
index 358643c70fb0..308b2baf936a 100644
--- a/drivers/net/fm/eth.c
+++ b/drivers/net/fm/eth.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <log.h>
 #include <part.h>
+#include <stdio.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 242d27a34eab..608e2add6cc1 100644
--- a/drivers/net/fm/fdt.c
+++ b/drivers/net/fm/fdt.c
@@ -2,6 +2,7 @@
 /*
  * Copyright 2016 Freescale Semiconductor, Inc.
  */
+#include <stdio.h>
 #include <asm/io.h>
 #include <env.h>
 #include <fdt_support.h>
diff --git a/drivers/net/fm/fm.c b/drivers/net/fm/fm.c
index 247a1c13645c..964dc01884bd 100644
--- a/drivers/net/fm/fm.c
+++ b/drivers/net/fm/fm.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <env.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <linux/string.h>
diff --git a/drivers/net/fm/memac_phy.c b/drivers/net/fm/memac_phy.c
index 72246192b3c6..8973f498d173 100644
--- a/drivers/net/fm/memac_phy.c
+++ b/drivers/net/fm/memac_phy.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <miiphy.h>
 #include <phy.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <fsl_memac.h>
 #include <fm_eth.h>
diff --git a/drivers/net/fm/tgec_phy.c b/drivers/net/fm/tgec_phy.c
index 390444187964..7afcf01916ff 100644
--- a/drivers/net/fm/tgec_phy.c
+++ b/drivers/net/fm/tgec_phy.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <miiphy.h>
 #include <phy.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <fsl_tgec.h>
 #include <fm_eth.h>
diff --git a/drivers/net/fsl-mc/dpio/qbman_portal.c b/drivers/net/fsl-mc/dpio/qbman_portal.c
index 5a0bef9324fd..bedff4ff321f 100644
--- a/drivers/net/fsl-mc/dpio/qbman_portal.c
+++ b/drivers/net/fsl-mc/dpio/qbman_portal.c
@@ -5,6 +5,7 @@
 
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <linux/bug.h>
 #include <linux/string.h>
diff --git a/drivers/net/fsl-mc/dpio/qbman_sys.h b/drivers/net/fsl-mc/dpio/qbman_sys.h
index e320e9b905e7..2d94d91129db 100644
--- a/drivers/net/fsl-mc/dpio/qbman_sys.h
+++ b/drivers/net/fsl-mc/dpio/qbman_sys.h
@@ -20,6 +20,7 @@
 
 /* Trace the 3 different classes of read/write access to QBMan. #undef as
  * required. */
+#include <stdio.h>
 #include <linux/bug.h>
 #include <linux/printk.h>
 #include <linux/string.h>
diff --git a/drivers/net/fsl-mc/mc.c b/drivers/net/fsl-mc/mc.c
index 1ce12ae5db91..aa0cfee67ae6 100644
--- a/drivers/net/fsl-mc/mc.c
+++ b/drivers/net/fsl-mc/mc.c
@@ -11,6 +11,7 @@
 #include <image.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/bug.h>
diff --git a/drivers/net/fsl-mc/mc_sys.c b/drivers/net/fsl-mc/mc_sys.c
index b5ae2ea3eb56..239bccb4b0a2 100644
--- a/drivers/net/fsl-mc/mc_sys.c
+++ b/drivers/net/fsl-mc/mc_sys.c
@@ -6,6 +6,7 @@
  * Author: German Rivera <German.Rivera@freescale.com>
  */
 
+#include <stdio.h>
 #include <fsl-mc/fsl_mc_sys.h>
 #include <fsl-mc/fsl_mc_cmd.h>
 #include <common.h>
diff --git a/drivers/net/fsl_enetc_mdio.c b/drivers/net/fsl_enetc_mdio.c
index 47257a6cf686..474714da9585 100644
--- a/drivers/net/fsl_enetc_mdio.c
+++ b/drivers/net/fsl_enetc_mdio.c
@@ -9,6 +9,7 @@
 #include <errno.h>
 #include <pci.h>
 #include <miiphy.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/processor.h>
 #include <miiphy.h>
diff --git a/drivers/net/fsl_mcdmafec.c b/drivers/net/fsl_mcdmafec.c
index 1c2449d18f4a..819de6236252 100644
--- a/drivers/net/fsl_mcdmafec.c
+++ b/drivers/net/fsl_mcdmafec.c
@@ -18,6 +18,7 @@
 #include <config.h>
 #include <net.h>
 #include <miiphy.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
diff --git a/drivers/net/fsl_mdio.c b/drivers/net/fsl_mdio.c
index a06b72013352..36fa90766c28 100644
--- a/drivers/net/fsl_mdio.c
+++ b/drivers/net/fsl_mdio.c
@@ -9,6 +9,7 @@
 #include <miiphy.h>
 #include <phy.h>
 #include <fsl_mdio.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
diff --git a/drivers/net/ftgmac100.c b/drivers/net/ftgmac100.c
index 74fea1e45fd0..f5e50ff08477 100644
--- a/drivers/net/ftgmac100.c
+++ b/drivers/net/ftgmac100.c
@@ -19,6 +19,7 @@
 #include <malloc.h>
 #include <miiphy.h>
 #include <net.h>
+#include <stdio.h>
 #include <wait_bit.h>
 #include <asm/cache.h>
 #include <dm/device_compat.h>
diff --git a/drivers/net/ftmac100.c b/drivers/net/ftmac100.c
index 763e0f72318c..26901136d585 100644
--- a/drivers/net/ftmac100.c
+++ b/drivers/net/ftmac100.c
@@ -12,6 +12,7 @@
 #include <env.h>
 #include <malloc.h>
 #include <net.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
diff --git a/drivers/net/ftmac110.c b/drivers/net/ftmac110.c
index 449bb9873559..6ce47832a68b 100644
--- a/drivers/net/ftmac110.c
+++ b/drivers/net/ftmac110.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <net.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/cache.h>
 #include <asm/u-boot.h>
diff --git a/drivers/net/ks8851_mll.c b/drivers/net/ks8851_mll.c
index be4da897b8d4..c1b6d8195b5c 100644
--- a/drivers/net/ks8851_mll.c
+++ b/drivers/net/ks8851_mll.c
@@ -5,6 +5,7 @@
  */
 
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <common.h>
 #include <command.h>
diff --git a/drivers/net/lan91c96.c b/drivers/net/lan91c96.c
index bcaa18747f4d..0bc2c21e5990 100644
--- a/drivers/net/lan91c96.c
+++ b/drivers/net/lan91c96.c
@@ -48,6 +48,7 @@
 #include <command.h>
 #include <env.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
diff --git a/drivers/net/ldpaa_eth/ldpaa_eth.c b/drivers/net/ldpaa_eth/ldpaa_eth.c
index c4befd9028b6..5de15c9684f2 100644
--- a/drivers/net/ldpaa_eth/ldpaa_eth.c
+++ b/drivers/net/ldpaa_eth/ldpaa_eth.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/net/lpc32xx_eth.c b/drivers/net/lpc32xx_eth.c
index 4b4b09b54389..a43623a1adf6 100644
--- a/drivers/net/lpc32xx_eth.c
+++ b/drivers/net/lpc32xx_eth.c
@@ -11,6 +11,7 @@
 #include <net.h>
 #include <malloc.h>
 #include <miiphy.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
diff --git a/drivers/net/macb.c b/drivers/net/macb.c
index ec8817799da0..fcb940037a38 100644
--- a/drivers/net/macb.c
+++ b/drivers/net/macb.c
@@ -7,6 +7,7 @@
 #include <cpu_func.h>
 #include <dm.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
diff --git a/drivers/net/mcffec.c b/drivers/net/mcffec.c
index d5bead5e2ce3..5a86f204ee34 100644
--- a/drivers/net/mcffec.c
+++ b/drivers/net/mcffec.c
@@ -17,6 +17,7 @@
 #include <command.h>
 #include <net.h>
 #include <miiphy.h>
+#include <stdio.h>
 #include <asm/fec.h>
 #include <asm/global_data.h>
 #include <asm/immap.h>
diff --git a/drivers/net/mcfmii.c b/drivers/net/mcfmii.c
index c99950d0e9ed..0e906e85670d 100644
--- a/drivers/net/mcfmii.c
+++ b/drivers/net/mcfmii.c
@@ -8,6 +8,7 @@
 #include <config.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/string.h>
diff --git a/drivers/net/mpc8xx_fec.c b/drivers/net/mpc8xx_fec.c
index 08bb4a7693a0..cef4b31dd247 100644
--- a/drivers/net/mpc8xx_fec.c
+++ b/drivers/net/mpc8xx_fec.c
@@ -10,6 +10,7 @@
 #include <malloc.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/cpm_8xx.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/net/mscc_eswitch/jr2_switch.c b/drivers/net/mscc_eswitch/jr2_switch.c
index 92debab424f5..d4752492c5ba 100644
--- a/drivers/net/mscc_eswitch/jr2_switch.c
+++ b/drivers/net/mscc_eswitch/jr2_switch.c
@@ -7,6 +7,7 @@
 #include <config.h>
 #include <dm.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <dm/of_access.h>
 #include <dm/of_addr.h>
 #include <fdt_support.h>
diff --git a/drivers/net/mscc_eswitch/luton_switch.c b/drivers/net/mscc_eswitch/luton_switch.c
index 79f4d19dad97..0ebc207157b9 100644
--- a/drivers/net/mscc_eswitch/luton_switch.c
+++ b/drivers/net/mscc_eswitch/luton_switch.c
@@ -7,6 +7,7 @@
 #include <config.h>
 #include <dm.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <dm/of_access.h>
 #include <dm/of_addr.h>
 #include <fdt_support.h>
diff --git a/drivers/net/mscc_eswitch/servalt_switch.c b/drivers/net/mscc_eswitch/servalt_switch.c
index fc79d34b5193..a1c86062fac4 100644
--- a/drivers/net/mscc_eswitch/servalt_switch.c
+++ b/drivers/net/mscc_eswitch/servalt_switch.c
@@ -7,6 +7,7 @@
 #include <config.h>
 #include <dm.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <dm/of_access.h>
 #include <dm/of_addr.h>
 #include <fdt_support.h>
diff --git a/drivers/net/mt7628-eth.c b/drivers/net/mt7628-eth.c
index 3bf8b636ea84..b8739562b731 100644
--- a/drivers/net/mt7628-eth.c
+++ b/drivers/net/mt7628-eth.c
@@ -21,6 +21,7 @@
 #include <miiphy.h>
 #include <net.h>
 #include <reset.h>
+#include <stdio.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 7e7699339964..0ad215da92f0 100644
--- a/drivers/net/mtk_eth.c
+++ b/drivers/net/mtk_eth.c
@@ -15,6 +15,7 @@
 #include <net.h>
 #include <regmap.h>
 #include <reset.h>
+#include <stdio.h>
 #include <syscon.h>
 #include <time.h>
 #include <wait_bit.h>
diff --git a/drivers/net/mvgbe.c b/drivers/net/mvgbe.c
index 54febc7ce42c..227f22f7e050 100644
--- a/drivers/net/mvgbe.c
+++ b/drivers/net/mvgbe.c
@@ -17,6 +17,7 @@
 #include <net.h>
 #include <malloc.h>
 #include <miiphy.h>
+#include <stdio.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 6ee0e1c7897b..996534792583 100644
--- a/drivers/net/mvneta.c
+++ b/drivers/net/mvneta.c
@@ -20,6 +20,7 @@
 #include <netdev.h>
 #include <config.h>
 #include <malloc.h>
+#include <stdio.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 06eb619c002d..98a56cb8de1d 100644
--- a/drivers/net/mvpp2.c
+++ b/drivers/net/mvpp2.c
@@ -16,6 +16,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <dm.h>
+#include <stdio.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 5f81d22bf0e0..1819c24a843e 100644
--- a/drivers/net/natsemi.c
+++ b/drivers/net/natsemi.c
@@ -54,6 +54,7 @@
 #include <malloc.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <pci.h>
 #include <asm/u-boot.h>
diff --git a/drivers/net/ne2000.c b/drivers/net/ne2000.c
index 28a99bb8c48e..85da482b8ffe 100644
--- a/drivers/net/ne2000.c
+++ b/drivers/net/ne2000.c
@@ -74,6 +74,7 @@ Add SNMP
 
 #include <common.h>
 #include <command.h>
+#include <stdio.h>
 #include <linux/delay.h>
 
 /* NE2000 base header file */
diff --git a/drivers/net/ne2000_base.c b/drivers/net/ne2000_base.c
index 409c41a179b3..7ed8721bc803 100644
--- a/drivers/net/ne2000_base.c
+++ b/drivers/net/ne2000_base.c
@@ -78,6 +78,7 @@ Add SNMP
 #include <log.h>
 #include <net.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/u-boot.h>
 #include <linux/compiler.h>
diff --git a/drivers/net/ne2000_base.h b/drivers/net/ne2000_base.h
index 2493608a5a64..21c1a8c15b55 100644
--- a/drivers/net/ne2000_base.h
+++ b/drivers/net/ne2000_base.h
@@ -106,6 +106,7 @@ are GPL, so this is, of course, GPL.
 #endif
 
 /* timeout for tx/rx in s */
+#include <stdio.h>
 #include <linux/delay.h>
 #define TOUT 5
 /* Ether MAC address size */
diff --git a/drivers/net/ns8382x.c b/drivers/net/ns8382x.c
index 7ae60e8a3e78..b0aeb470a199 100644
--- a/drivers/net/ns8382x.c
+++ b/drivers/net/ns8382x.c
@@ -55,6 +55,7 @@
 #include <malloc.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <pci.h>
 #include <asm/u-boot.h>
diff --git a/drivers/net/pch_gbe.c b/drivers/net/pch_gbe.c
index c1596a2cd351..fa824079391a 100644
--- a/drivers/net/pch_gbe.c
+++ b/drivers/net/pch_gbe.c
@@ -11,6 +11,7 @@
 #include <errno.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/io.h>
 #include <pci.h>
diff --git a/drivers/net/pcnet.c b/drivers/net/pcnet.c
index ec8e07339304..aef5e7e4fd79 100644
--- a/drivers/net/pcnet.c
+++ b/drivers/net/pcnet.c
@@ -14,6 +14,7 @@
 #include <memalign.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdio.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 f72413cf132a..365a74aa094b 100644
--- a/drivers/net/pfe_eth/pfe_cmd.c
+++ b/drivers/net/pfe_eth/pfe_cmd.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <command.h>
 #include <log.h>
+#include <stdio.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 #include <net/pfe_eth/pfe_eth.h>
diff --git a/drivers/net/pfe_eth/pfe_driver.c b/drivers/net/pfe_eth/pfe_driver.c
index 573ceabcf7e0..7d712370100e 100644
--- a/drivers/net/pfe_eth/pfe_driver.c
+++ b/drivers/net/pfe_eth/pfe_driver.c
@@ -6,6 +6,7 @@
 
 #include <log.h>
 #include <malloc.h>
+#include <stdio.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 e49bf4a6f3cf..4fb81ab0cd40 100644
--- a/drivers/net/pfe_eth/pfe_eth.c
+++ b/drivers/net/pfe_eth/pfe_eth.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <dm/platform_data/pfe_dm_eth.h>
 #include <net.h>
 #include <linux/delay.h>
diff --git a/drivers/net/pfe_eth/pfe_firmware.c b/drivers/net/pfe_eth/pfe_firmware.c
index 1601ec48a59d..66d5ad930e3b 100644
--- a/drivers/net/pfe_eth/pfe_firmware.c
+++ b/drivers/net/pfe_eth/pfe_firmware.c
@@ -13,6 +13,7 @@
 #include <image.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <linux/bitops.h>
 #include <linux/string.h>
 #include <net/pfe_eth/pfe_eth.h>
diff --git a/drivers/net/pfe_eth/pfe_hw.c b/drivers/net/pfe_eth/pfe_hw.c
index 2889dd6b9070..fb60e605b194 100644
--- a/drivers/net/pfe_eth/pfe_hw.c
+++ b/drivers/net/pfe_eth/pfe_hw.c
@@ -4,6 +4,7 @@
  * Copyright 2017 NXP
  */
 #include <log.h>
+#include <stdio.h>
 #include <linux/bitops.h>
 #include <linux/string.h>
 #include <net/pfe_eth/pfe_eth.h>
diff --git a/drivers/net/pfe_eth/pfe_mdio.c b/drivers/net/pfe_eth/pfe_mdio.c
index 3228b8df49d4..0f682d1cfdd8 100644
--- a/drivers/net/pfe_eth/pfe_mdio.c
+++ b/drivers/net/pfe_eth/pfe_mdio.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <dm/platform_data/pfe_dm_eth.h>
 #include <net.h>
 #include <linux/delay.h>
diff --git a/drivers/net/phy/aquantia.c b/drivers/net/phy/aquantia.c
index 59c7abeb667b..aa3e566bf2ea 100644
--- a/drivers/net/phy/aquantia.c
+++ b/drivers/net/phy/aquantia.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <net.h>
 #include <phy.h>
+#include <stdio.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/string.h>
diff --git a/drivers/net/phy/b53.c b/drivers/net/phy/b53.c
index b376ef8f82b9..34ba893dcdb9 100644
--- a/drivers/net/phy/b53.c
+++ b/drivers/net/phy/b53.c
@@ -24,6 +24,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <stdio.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/string.h>
diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c
index 566fcb8de73b..91e8f6123deb 100644
--- a/drivers/net/phy/broadcom.c
+++ b/drivers/net/phy/broadcom.c
@@ -7,6 +7,7 @@
  */
 #include <common.h>
 #include <phy.h>
+#include <stdio.h>
 #include <linux/delay.h>
 
 /* Broadcom BCM54xx -- taken from linux sungem_phy */
diff --git a/drivers/net/phy/cortina.c b/drivers/net/phy/cortina.c
index dbc20b14051c..a02d620d9663 100644
--- a/drivers/net/phy/cortina.c
+++ b/drivers/net/phy/cortina.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <linux/ctype.h>
 #include <linux/delay.h>
 #include <linux/string.h>
diff --git a/drivers/net/phy/fixed.c b/drivers/net/phy/fixed.c
index d3e9e3e3d4af..b4833c5ac96d 100644
--- a/drivers/net/phy/fixed.c
+++ b/drivers/net/phy/fixed.c
@@ -11,6 +11,7 @@
 #include <phy.h>
 #include <dm.h>
 #include <fdt_support.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/string.h>
 
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
index a62c695c5c84..a313e8bf917b 100644
--- a/drivers/net/phy/marvell.c
+++ b/drivers/net/phy/marvell.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <errno.h>
 #include <phy.h>
+#include <stdio.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 
diff --git a/drivers/net/phy/meson-gxl.c b/drivers/net/phy/meson-gxl.c
index ffb1a61402e9..e7a1008f14de 100644
--- a/drivers/net/phy/meson-gxl.c
+++ b/drivers/net/phy/meson-gxl.c
@@ -8,6 +8,7 @@
  */
 #include <config.h>
 #include <common.h>
+#include <stdio.h>
 #include <linux/bitops.h>
 #include <dm.h>
 #include <phy.h>
diff --git a/drivers/net/phy/miiphybb.c b/drivers/net/phy/miiphybb.c
index 6b031196f44d..d19a13dd62b6 100644
--- a/drivers/net/phy/miiphybb.c
+++ b/drivers/net/phy/miiphybb.c
@@ -16,6 +16,7 @@
 #include <ioports.h>
 #include <ppc_asm.tmpl>
 #include <miiphy.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/string.h>
 
diff --git a/drivers/net/phy/mscc.c b/drivers/net/phy/mscc.c
index 264afcd1a575..f8a4d0694406 100644
--- a/drivers/net/phy/mscc.c
+++ b/drivers/net/phy/mscc.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <miiphy.h>
 #include <bitfield.h>
+#include <stdio.h>
 #include <time.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/drivers/net/phy/mv88e61xx.c b/drivers/net/phy/mv88e61xx.c
index 832b538f5e92..0a783e031298 100644
--- a/drivers/net/phy/mv88e61xx.c
+++ b/drivers/net/phy/mv88e61xx.c
@@ -31,6 +31,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/string.h>
diff --git a/drivers/net/phy/mv88e6352.c b/drivers/net/phy/mv88e6352.c
index 40e0edc6d88e..977102d4d803 100644
--- a/drivers/net/phy/mv88e6352.c
+++ b/drivers/net/phy/mv88e6352.c
@@ -8,6 +8,7 @@
 #include <command.h>
 #include <log.h>
 #include <miiphy.h>
+#include <stdio.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <mv88e6352.h>
diff --git a/drivers/net/phy/ncsi.c b/drivers/net/phy/ncsi.c
index 862a1564a732..f112fa2bee97 100644
--- a/drivers/net/phy/ncsi.c
+++ b/drivers/net/phy/ncsi.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <phy.h>
+#include <stdio.h>
 #include <linux/string.h>
 #include <net/ncsi.h>
 #include <net/ncsi-pkt.h>
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 030dc7538241..026ccc467f62 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -17,6 +17,7 @@
 #include <miiphy.h>
 #include <phy.h>
 #include <errno.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/drivers/net/phy/realtek.c b/drivers/net/phy/realtek.c
index b1b1fa50809a..2f9b50e168ad 100644
--- a/drivers/net/phy/realtek.c
+++ b/drivers/net/phy/realtek.c
@@ -7,6 +7,7 @@
  * Copyright 2016 Karsten Merker <merker@debian.org>
  */
 #include <common.h>
+#include <stdio.h>
 #include <linux/bitops.h>
 #include <phy.h>
 #include <linux/delay.h>
diff --git a/drivers/net/phy/teranetics.c b/drivers/net/phy/teranetics.c
index 60049c2074f3..7b5494eea98b 100644
--- a/drivers/net/phy/teranetics.c
+++ b/drivers/net/phy/teranetics.c
@@ -7,6 +7,7 @@
  */
 #include <common.h>
 #include <phy.h>
+#include <stdio.h>
 #include <linux/delay.h>
 
 #ifndef CONFIG_PHYLIB_10G
diff --git a/drivers/net/phy/vitesse.c b/drivers/net/phy/vitesse.c
index eca26c989389..fdc676102369 100644
--- a/drivers/net/phy/vitesse.c
+++ b/drivers/net/phy/vitesse.c
@@ -8,6 +8,7 @@
  */
 #include <common.h>
 #include <miiphy.h>
+#include <stdio.h>
 
 /* Cicada Auxiliary Control/Status Register */
 #define MIIM_CIS82xx_AUX_CONSTAT	0x1c
diff --git a/drivers/net/phy/xilinx_gmii2rgmii.c b/drivers/net/phy/xilinx_gmii2rgmii.c
index 74105c0b7d6b..86492e90c4df 100644
--- a/drivers/net/phy/xilinx_gmii2rgmii.c
+++ b/drivers/net/phy/xilinx_gmii2rgmii.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <log.h>
 #include <phy.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/net/pic32_eth.c b/drivers/net/pic32_eth.c
index bbc305f81dbe..5627b5d2d1a5 100644
--- a/drivers/net/pic32_eth.c
+++ b/drivers/net/pic32_eth.c
@@ -12,6 +12,7 @@
 #include <net.h>
 #include <miiphy.h>
 #include <console.h>
+#include <stdio.h>
 #include <time.h>
 #include <wait_bit.h>
 #include <asm/global_data.h>
diff --git a/drivers/net/pic32_mdio.c b/drivers/net/pic32_mdio.c
index 802563960a16..963b9e7fc8fc 100644
--- a/drivers/net/pic32_mdio.c
+++ b/drivers/net/pic32_mdio.c
@@ -9,6 +9,7 @@
 #include <phy.h>
 #include <miiphy.h>
 #include <errno.h>
+#include <stdio.h>
 #include <wait_bit.h>
 #include <asm/io.h>
 #include <linux/delay.h>
diff --git a/drivers/net/rtl8139.c b/drivers/net/rtl8139.c
index f52fa66a4eb2..42169e996832 100644
--- a/drivers/net/rtl8139.c
+++ b/drivers/net/rtl8139.c
@@ -75,6 +75,7 @@
 #include <malloc.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <pci.h>
 #include <asm/u-boot.h>
diff --git a/drivers/net/rtl8169.c b/drivers/net/rtl8169.c
index 683e5d5d9e94..c64888be4904 100644
--- a/drivers/net/rtl8169.c
+++ b/drivers/net/rtl8169.c
@@ -50,6 +50,7 @@
 #ifndef CONFIG_DM_ETH
 #include <netdev.h>
 #endif
+#include <stdio.h>
 #include <time.h>
 #include <asm/cache.h>
 #include <asm/io.h>
diff --git a/drivers/net/sandbox-raw.c b/drivers/net/sandbox-raw.c
index bda3ffd003b4..cc358428a366 100644
--- a/drivers/net/sandbox-raw.c
+++ b/drivers/net/sandbox-raw.c
@@ -7,6 +7,7 @@
  */
 
 #include <log.h>
+#include <stdio.h>
 #include <asm/eth-raw-os.h>
 #include <common.h>
 #include <dm.h>
diff --git a/drivers/net/sandbox.c b/drivers/net/sandbox.c
index b63b3aaebcff..0551d0670b13 100644
--- a/drivers/net/sandbox.c
+++ b/drivers/net/sandbox.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <net.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/eth.h>
 #include <asm/global_data.h>
diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c
index 5ea0adb6b102..84f3fa473c75 100644
--- a/drivers/net/sh_eth.c
+++ b/drivers/net/sh_eth.c
@@ -17,6 +17,7 @@
 #include <net.h>
 #include <netdev.h>
 #include <miiphy.h>
+#include <stdio.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 a341bca51cf1..9b279d48002c 100644
--- a/drivers/net/smc91111.c
+++ b/drivers/net/smc91111.c
@@ -51,6 +51,7 @@
 #include <command.h>
 #include <config.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
index 6f3521651171..a28ccc8c18ab 100644
--- a/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.c
@@ -10,6 +10,7 @@
 #include <malloc.h>
 #include <net.h>
 #include <miiphy.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 #include <linux/io.h>
 #include <linux/delay.h>
diff --git a/drivers/net/sun8i_emac.c b/drivers/net/sun8i_emac.c
index 77c03cbf3012..b0d83de8cbd8 100644
--- a/drivers/net/sun8i_emac.c
+++ b/drivers/net/sun8i_emac.c
@@ -12,6 +12,7 @@
 
 #include <cpu_func.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
diff --git a/drivers/net/sunxi_emac.c b/drivers/net/sunxi_emac.c
index e1176454f2eb..009d0de48454 100644
--- a/drivers/net/sunxi_emac.c
+++ b/drivers/net/sunxi_emac.c
@@ -9,6 +9,7 @@
 #include <clk.h>
 #include <dm.h>
 #include <log.h>
+#include <stdio.h>
 #include <dm/device_compat.h>
 #include <linux/delay.h>
 #include <linux/err.h>
diff --git a/drivers/net/ti/am65-cpsw-nuss.c b/drivers/net/ti/am65-cpsw-nuss.c
index 08cd26b3c4bc..571f1ebfc46c 100644
--- a/drivers/net/ti/am65-cpsw-nuss.c
+++ b/drivers/net/ti/am65-cpsw-nuss.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <asm/io.h>
 #include <asm/processor.h>
diff --git a/drivers/net/ti/cpsw.c b/drivers/net/ti/cpsw.c
index 921d56394267..02dd3bc984fe 100644
--- a/drivers/net/ti/cpsw.c
+++ b/drivers/net/ti/cpsw.c
@@ -15,6 +15,7 @@
 #include <net.h>
 #include <netdev.h>
 #include <cpsw.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
diff --git a/drivers/net/ti/davinci_emac.c b/drivers/net/ti/davinci_emac.c
index c2df17d3a6f7..b4647554bcec 100644
--- a/drivers/net/ti/davinci_emac.c
+++ b/drivers/net/ti/davinci_emac.c
@@ -28,6 +28,7 @@
 #include <net.h>
 #include <miiphy.h>
 #include <malloc.h>
+#include <stdio.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 5e44215e2238..4dd205c1507f 100644
--- a/drivers/net/ti/keystone_net.c
+++ b/drivers/net/ti/keystone_net.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <command.h>
 #include <console.h>
+#include <stdio.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 5ab450cf8a4f..17ce68baffe5 100644
--- a/drivers/net/tsec.c
+++ b/drivers/net/tsec.c
@@ -13,6 +13,7 @@
 #include <malloc.h>
 #include <net.h>
 #include <command.h>
+#include <stdio.h>
 #include <tsec.h>
 #include <fsl_mdio.h>
 #include <asm/u-boot.h>
diff --git a/drivers/net/uli526x.c b/drivers/net/uli526x.c
index d6bc29c0c102..0a8369f96e39 100644
--- a/drivers/net/uli526x.c
+++ b/drivers/net/uli526x.c
@@ -13,6 +13,7 @@
 #include <malloc.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <pci.h>
 #include <miiphy.h>
diff --git a/drivers/net/vsc7385.c b/drivers/net/vsc7385.c
index af8d99cefbef..ba4793122ea8 100644
--- a/drivers/net/vsc7385.c
+++ b/drivers/net/vsc7385.c
@@ -16,6 +16,7 @@
 #include <common.h>
 #include <console.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/net/vsc9953.c b/drivers/net/vsc9953.c
index a4c701e86a30..b1bb27fb7f80 100644
--- a/drivers/net/vsc9953.c
+++ b/drivers/net/vsc9953.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <command.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/fsl_serdes.h>
 #include <fm_eth.h>
diff --git a/drivers/net/xilinx_axi_emac.c b/drivers/net/xilinx_axi_emac.c
index da571efde4e0..f6cf8df44fff 100644
--- a/drivers/net/xilinx_axi_emac.c
+++ b/drivers/net/xilinx_axi_emac.c
@@ -13,6 +13,7 @@
 #include <log.h>
 #include <net.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <phy.h>
diff --git a/drivers/net/xilinx_emaclite.c b/drivers/net/xilinx_emaclite.c
index 321429090f62..5334b61c7aad 100644
--- a/drivers/net/xilinx_emaclite.c
+++ b/drivers/net/xilinx_emaclite.c
@@ -13,6 +13,7 @@
 #include <dm.h>
 #include <console.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/net/zynq_gem.c b/drivers/net/zynq_gem.c
index 9d19e89090c5..8e3a96c51efb 100644
--- a/drivers/net/zynq_gem.c
+++ b/drivers/net/zynq_gem.c
@@ -18,6 +18,7 @@
 #include <config.h>
 #include <console.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <asm/io.h>
 #include <phy.h>
diff --git a/drivers/nvme/nvme.c b/drivers/nvme/nvme.c
index 6d8ab8bf786f..8b3b60570d73 100644
--- a/drivers/nvme/nvme.c
+++ b/drivers/nvme/nvme.c
@@ -13,6 +13,7 @@
 #include <malloc.h>
 #include <memalign.h>
 #include <pci.h>
+#include <stdio.h>
 #include <time.h>
 #include <dm/device-internal.h>
 #include <linux/compat.h>
diff --git a/drivers/nvme/nvme_show.c b/drivers/nvme/nvme_show.c
index 15e459da1acd..5a0bb4a223ee 100644
--- a/drivers/nvme/nvme_show.c
+++ b/drivers/nvme/nvme_show.c
@@ -9,6 +9,7 @@
 #include <errno.h>
 #include <memalign.h>
 #include <nvme.h>
+#include <stdio.h>
 #include "nvme.h"
 
 static void print_optional_admin_cmd(u16 oacs, int devnum)
diff --git a/drivers/pci/fsl_pci_init.c b/drivers/pci/fsl_pci_init.c
index 4f3f21e72936..ba4ce355b729 100644
--- a/drivers/pci/fsl_pci_init.c
+++ b/drivers/pci/fsl_pci_init.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/fsl_serdes.h>
 #include <asm/global_data.h>
 #include <asm/ppc.h>
diff --git a/drivers/pci/pci-aardvark.c b/drivers/pci/pci-aardvark.c
index 711b930d0f9f..76234ea61c46 100644
--- a/drivers/pci/pci-aardvark.c
+++ b/drivers/pci/pci-aardvark.c
@@ -27,6 +27,7 @@
 #include <common.h>
 #include <dm.h>
 #include <pci.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm-generic/gpio.h>
 #include <dm/device_compat.h>
diff --git a/drivers/pci/pci-uclass.c b/drivers/pci/pci-uclass.c
index ccf842781479..72f47321b7e6 100644
--- a/drivers/pci/pci-uclass.c
+++ b/drivers/pci/pci-uclass.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <pci.h>
+#include <stdio.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 25a755627c0c..b6a147ec1f51 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -17,6 +17,7 @@
 #include <common.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
 
diff --git a/drivers/pci/pci_auto.c b/drivers/pci/pci_auto.c
index 3f46b7697d7c..e0e325755e18 100644
--- a/drivers/pci/pci_auto.c
+++ b/drivers/pci/pci_auto.c
@@ -12,6 +12,7 @@
 #include <errno.h>
 #include <log.h>
 #include <pci.h>
+#include <stdio.h>
 
 /* the user can define CONFIG_SYS_PCI_CACHE_LINE_SIZE to avoid problems */
 #ifndef CONFIG_SYS_PCI_CACHE_LINE_SIZE
diff --git a/drivers/pci/pci_common.c b/drivers/pci/pci_common.c
index 5231b69dc9ad..e7469d88d826 100644
--- a/drivers/pci/pci_common.c
+++ b/drivers/pci/pci_common.c
@@ -14,6 +14,7 @@
 #include <env.h>
 #include <errno.h>
 #include <pci.h>
+#include <stdio.h>
 #include <asm/io.h>
 
 const char *pci_class_str(u8 class)
diff --git a/drivers/pci/pci_ftpci100.c b/drivers/pci/pci_ftpci100.c
index f7a601726725..b3d928ac1fe1 100644
--- a/drivers/pci/pci_ftpci100.c
+++ b/drivers/pci/pci_ftpci100.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <pci.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 #include <faraday/ftpci100.h>
diff --git a/drivers/pci/pci_mpc85xx.c b/drivers/pci/pci_mpc85xx.c
index 6576f53f52a5..d7073a496940 100644
--- a/drivers/pci/pci_mpc85xx.c
+++ b/drivers/pci/pci_mpc85xx.c
@@ -5,6 +5,7 @@
  *
  */
 #include <common.h>
+#include <stdio.h>
 #include <asm/bitops.h>
 #include <asm/cpm_85xx.h>
 #include <pci.h>
diff --git a/drivers/pci/pci_mvebu.c b/drivers/pci/pci_mvebu.c
index 95ed17303585..07c34fe74daf 100644
--- a/drivers/pci/pci_mvebu.c
+++ b/drivers/pci/pci_mvebu.c
@@ -13,6 +13,7 @@
 #include <dm.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <dm/device-internal.h>
 #include <dm/lists.h>
diff --git a/drivers/pci/pci_rom.c b/drivers/pci/pci_rom.c
index 68b9949ba1e2..3a046df743d5 100644
--- a/drivers/pci/pci_rom.c
+++ b/drivers/pci/pci_rom.c
@@ -34,6 +34,7 @@
 #include <malloc.h>
 #include <pci.h>
 #include <pci_rom.h>
+#include <stdio.h>
 #include <time.h>
 #include <vbe.h>
 #include <video.h>
diff --git a/drivers/pci/pci_sh4.c b/drivers/pci/pci_sh4.c
index aac9be055e2c..c6609d58e898 100644
--- a/drivers/pci/pci_sh4.c
+++ b/drivers/pci/pci_sh4.c
@@ -9,6 +9,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <linux/delay.h>
 
 #include <asm/processor.h>
diff --git a/drivers/pci/pci_sh7751.c b/drivers/pci/pci_sh7751.c
index e110550c71c8..62d098d378f5 100644
--- a/drivers/pci/pci_sh7751.c
+++ b/drivers/pci/pci_sh7751.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <dm.h>
 #include <pci.h>
+#include <stdio.h>
 #include <asm/processor.h>
 #include <asm/io.h>
 #include <asm/pci.h>
diff --git a/drivers/pci/pci_sh7780.c b/drivers/pci/pci_sh7780.c
index 06d711a6cb9e..ed0834a984ec 100644
--- a/drivers/pci/pci_sh7780.c
+++ b/drivers/pci/pci_sh7780.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <linux/delay.h>
 
 #include <pci.h>
diff --git a/drivers/pci/pcie_brcmstb.c b/drivers/pci/pcie_brcmstb.c
index dade79e9c867..4fd4d4dfbd1e 100644
--- a/drivers/pci/pcie_brcmstb.c
+++ b/drivers/pci/pcie_brcmstb.c
@@ -15,6 +15,7 @@
 #include <common.h>
 #include <errno.h>
 #include <dm.h>
+#include <stdio.h>
 #include <dm/ofnode.h>
 #include <pci.h>
 #include <asm/io.h>
diff --git a/drivers/pci/pcie_dw_mvebu.c b/drivers/pci/pcie_dw_mvebu.c
index dbc8bb81a7cd..b1f2750888cc 100644
--- a/drivers/pci/pcie_dw_mvebu.c
+++ b/drivers/pci/pcie_dw_mvebu.c
@@ -14,6 +14,7 @@
 #include <dm.h>
 #include <log.h>
 #include <pci.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/pci/pcie_dw_ti.c b/drivers/pci/pcie_dw_ti.c
index eed5e4289724..3d86bdaaafb7 100644
--- a/drivers/pci/pcie_dw_ti.c
+++ b/drivers/pci/pcie_dw_ti.c
@@ -10,6 +10,7 @@
 #include <generic-phy.h>
 #include <power-domain.h>
 #include <regmap.h>
+#include <stdio.h>
 #include <syscon.h>
 #include <time.h>
 #include <asm/global_data.h>
diff --git a/drivers/pci/pcie_fsl.c b/drivers/pci/pcie_fsl.c
index 80786e68cb3b..e609ac58d40f 100644
--- a/drivers/pci/pcie_fsl.c
+++ b/drivers/pci/pcie_fsl.c
@@ -11,6 +11,7 @@
 #include <malloc.h>
 #include <mapmem.h>
 #include <pci.h>
+#include <stdio.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_pci.h>
 #include <asm/fsl_serdes.h>
diff --git a/drivers/pci/pcie_imx.c b/drivers/pci/pcie_imx.c
index 16468e733640..ab3d96efc533 100644
--- a/drivers/pci/pcie_imx.c
+++ b/drivers/pci/pcie_imx.c
@@ -14,6 +14,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <pci.h>
+#include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/crm_regs.h>
diff --git a/drivers/pci/pcie_layerscape_ep.c b/drivers/pci/pcie_layerscape_ep.c
index 6de93fac997f..0661834c1102 100644
--- a/drivers/pci/pcie_layerscape_ep.c
+++ b/drivers/pci/pcie_layerscape_ep.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <dm/devres.h>
 #include <errno.h>
diff --git a/drivers/pci/pcie_layerscape_gen4.c b/drivers/pci/pcie_layerscape_gen4.c
index 96c6527f806e..369124c2b8be 100644
--- a/drivers/pci/pcie_layerscape_gen4.c
+++ b/drivers/pci/pcie_layerscape_gen4.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/arch/fsl_serdes.h>
 #include <pci.h>
 #include <asm/global_data.h>
diff --git a/drivers/pci/pcie_layerscape_rc.c b/drivers/pci/pcie_layerscape_rc.c
index 7ae5b48bb92c..397c9ea5e603 100644
--- a/drivers/pci/pcie_layerscape_rc.c
+++ b/drivers/pci/pcie_layerscape_rc.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/arch/fsl_serdes.h>
 #include <pci.h>
 #include <asm/global_data.h>
diff --git a/drivers/phy/marvell/comphy_a3700.c b/drivers/phy/marvell/comphy_a3700.c
index e9ba4cfec228..b106fd3e1321 100644
--- a/drivers/phy/marvell/comphy_a3700.c
+++ b/drivers/phy/marvell/comphy_a3700.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <fdtdec.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
diff --git a/drivers/phy/marvell/comphy_core.c b/drivers/phy/marvell/comphy_core.c
index 5ef6129f349d..99f68fff12cf 100644
--- a/drivers/phy/marvell/comphy_core.c
+++ b/drivers/phy/marvell/comphy_core.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <dm.h>
 #include <fdtdec.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm/device_compat.h>
diff --git a/drivers/phy/marvell/comphy_core.h b/drivers/phy/marvell/comphy_core.h
index 12ab921d24c3..58c5c2fabdc8 100644
--- a/drivers/phy/marvell/comphy_core.h
+++ b/drivers/phy/marvell/comphy_core.h
@@ -7,6 +7,7 @@
 #define _COMPHY_CORE_H_
 
 #include <fdtdec.h>
+#include <stdio.h>
 #include <mvebu/comphy.h>
 
 #if defined(DEBUG)
diff --git a/drivers/phy/marvell/comphy_cp110.c b/drivers/phy/marvell/comphy_cp110.c
index 35da55c4fee1..90d2d283c0e7 100644
--- a/drivers/phy/marvell/comphy_cp110.c
+++ b/drivers/phy/marvell/comphy_cp110.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <fdtdec.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
diff --git a/drivers/phy/omap-usb2-phy.c b/drivers/phy/omap-usb2-phy.c
index ae0968ab5b2e..a460a0560c3a 100644
--- a/drivers/phy/omap-usb2-phy.c
+++ b/drivers/phy/omap-usb2-phy.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm.h>
diff --git a/drivers/phy/ti-pipe3-phy.c b/drivers/phy/ti-pipe3-phy.c
index 5953d118baec..2aa2a90c47c8 100644
--- a/drivers/phy/ti-pipe3-phy.c
+++ b/drivers/phy/ti-pipe3-phy.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <dm/device.h>
 #include <generic-phy.h>
diff --git a/drivers/pinctrl/broadcom/pinctrl-bcm283x.c b/drivers/pinctrl/broadcom/pinctrl-bcm283x.c
index c22d534da9ad..775a8a0a48ae 100644
--- a/drivers/pinctrl/broadcom/pinctrl-bcm283x.c
+++ b/drivers/pinctrl/broadcom/pinctrl-bcm283x.c
@@ -15,6 +15,7 @@
 #include <errno.h>
 #include <dm.h>
 #include <log.h>
+#include <stdio.h>
 #include <dm/pinctrl.h>
 #include <dm/root.h>
 #include <dm/device-internal.h>
diff --git a/drivers/pinctrl/intel/pinctrl.c b/drivers/pinctrl/intel/pinctrl.c
index ba21c9dcc2e9..933175d2b6c5 100644
--- a/drivers/pinctrl/intel/pinctrl.c
+++ b/drivers/pinctrl/intel/pinctrl.c
@@ -23,6 +23,7 @@
 #include <malloc.h>
 #include <p2sb.h>
 #include <spl.h>
+#include <stdio.h>
 #include <asm-generic/gpio.h>
 #include <asm/intel_pinctrl.h>
 #include <asm/intel_pinctrl_defs.h>
diff --git a/drivers/pinctrl/meson/pinctrl-meson.c b/drivers/pinctrl/meson/pinctrl-meson.c
index 664af76d5848..639eb849db45 100644
--- a/drivers/pinctrl/meson/pinctrl-meson.c
+++ b/drivers/pinctrl/meson/pinctrl-meson.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.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 7541898ac46f..0fe1b3488099 100644
--- a/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c
+++ b/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c
@@ -20,6 +20,7 @@
 #include <config.h>
 #include <dm.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <dm/device-internal.h>
 #include <dm/device_compat.h>
diff --git a/drivers/pinctrl/nxp/pinctrl-scu.c b/drivers/pinctrl/nxp/pinctrl-scu.c
index c032be782a15..33bba8696f65 100644
--- a/drivers/pinctrl/nxp/pinctrl-scu.c
+++ b/drivers/pinctrl/nxp/pinctrl-scu.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <errno.h>
+#include <stdio.h>
 #include <linux/bitops.h>
 #include <asm/io.h>
 #include <asm/arch/sci/sci.h>
diff --git a/drivers/pinctrl/pinctrl-at91-pio4.c b/drivers/pinctrl/pinctrl-at91-pio4.c
index d325422f8547..4400e8088d89 100644
--- a/drivers/pinctrl/pinctrl-at91-pio4.c
+++ b/drivers/pinctrl/pinctrl-at91-pio4.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <dm/pinctrl.h>
 #include <linux/bitops.h>
diff --git a/drivers/pinctrl/pinctrl_pic32.c b/drivers/pinctrl/pinctrl_pic32.c
index 79c95034985f..2eb80d92b341 100644
--- a/drivers/pinctrl/pinctrl_pic32.c
+++ b/drivers/pinctrl/pinctrl_pic32.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm/pinctrl.h>
diff --git a/drivers/pinctrl/renesas/pfc-r7s72100.c b/drivers/pinctrl/renesas/pfc-r7s72100.c
index b368336c887f..3d0caa9bb777 100644
--- a/drivers/pinctrl/renesas/pfc-r7s72100.c
+++ b/drivers/pinctrl/renesas/pfc-r7s72100.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <dm/lists.h>
 #include <dm/pinctrl.h>
diff --git a/drivers/pinctrl/renesas/pfc.c b/drivers/pinctrl/renesas/pfc.c
index 7183b1180889..6bf8fdff4781 100644
--- a/drivers/pinctrl/renesas/pfc.c
+++ b/drivers/pinctrl/renesas/pfc.c
@@ -14,6 +14,7 @@
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
+#include <stdio.h>
 #include <dm/device_compat.h>
 #include <dm/devres.h>
 #include <dm/pinctrl.h>
diff --git a/drivers/power/acpi_pmc/acpi-pmc-uclass.c b/drivers/power/acpi_pmc/acpi-pmc-uclass.c
index 828963d8a09a..98d217ca72f1 100644
--- a/drivers/power/acpi_pmc/acpi-pmc-uclass.c
+++ b/drivers/power/acpi_pmc/acpi-pmc-uclass.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <stdio.h>
 #include <acpi/acpi_s3.h>
 #ifdef CONFIG_X86
 #include <asm/intel_pinctrl.h>
diff --git a/drivers/power/battery/bat_trats.c b/drivers/power/battery/bat_trats.c
index 54b2bf91e5c2..d1545004de31 100644
--- a/drivers/power/battery/bat_trats.c
+++ b/drivers/power/battery/bat_trats.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <console.h>
 #include <log.h>
+#include <stdio.h>
 #include <linux/delay.h>
 #include <power/pmic.h>
 #include <power/battery.h>
diff --git a/drivers/power/battery/bat_trats2.c b/drivers/power/battery/bat_trats2.c
index 1172970d1e0b..abac714ff346 100644
--- a/drivers/power/battery/bat_trats2.c
+++ b/drivers/power/battery/bat_trats2.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <power/pmic.h>
 #include <power/battery.h>
 #include <power/max77693_pmic.h>
diff --git a/drivers/power/domain/imx8-power-domain-legacy.c b/drivers/power/domain/imx8-power-domain-legacy.c
index 980b946fca1e..61ed7172f285 100644
--- a/drivers/power/domain/imx8-power-domain-legacy.c
+++ b/drivers/power/domain/imx8-power-domain-legacy.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <power-domain-uclass.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/power-domain.h>
diff --git a/drivers/power/domain/imx8-power-domain.c b/drivers/power/domain/imx8-power-domain.c
index 6461ab23d629..b0107dff1f82 100644
--- a/drivers/power/domain/imx8-power-domain.c
+++ b/drivers/power/domain/imx8-power-domain.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <power-domain-uclass.h>
+#include <stdio.h>
 #include <asm/arch/power-domain.h>
 #include <asm/arch/sci/sci.h>
 
diff --git a/drivers/power/domain/imx8m-power-domain.c b/drivers/power/domain/imx8m-power-domain.c
index f6681c7b0b5c..e50ded8b4c54 100644
--- a/drivers/power/domain/imx8m-power-domain.c
+++ b/drivers/power/domain/imx8m-power-domain.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <malloc.h>
 #include <power-domain-uclass.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/power-domain.h>
diff --git a/drivers/power/fuel_gauge/fg_max17042.c b/drivers/power/fuel_gauge/fg_max17042.c
index a395d587a86f..fde4bd195548 100644
--- a/drivers/power/fuel_gauge/fg_max17042.c
+++ b/drivers/power/fuel_gauge/fg_max17042.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <linux/delay.h>
 #include <power/pmic.h>
 #include <power/max17042_fg.h>
diff --git a/drivers/power/mfd/fg_max77693.c b/drivers/power/mfd/fg_max77693.c
index 983a6d4a2bde..4633f79bbe74 100644
--- a/drivers/power/mfd/fg_max77693.c
+++ b/drivers/power/mfd/fg_max77693.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <power/pmic.h>
 #include <power/max77693_fg.h>
 #include <i2c.h>
diff --git a/drivers/power/mfd/muic_max77693.c b/drivers/power/mfd/muic_max77693.c
index 36ee44b9a2c9..a021c04ccd4a 100644
--- a/drivers/power/mfd/muic_max77693.c
+++ b/drivers/power/mfd/muic_max77693.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <power/pmic.h>
 #include <power/power_chrg.h>
 #include <power/max77693_muic.h>
diff --git a/drivers/power/mfd/pmic_max77693.c b/drivers/power/mfd/pmic_max77693.c
index e32a9722a408..1955189c239d 100644
--- a/drivers/power/mfd/pmic_max77693.c
+++ b/drivers/power/mfd/pmic_max77693.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <power/pmic.h>
 #include <power/max77693_pmic.h>
 #include <i2c.h>
diff --git a/drivers/power/mt6323.c b/drivers/power/mt6323.c
index 354817a03780..21e627559832 100644
--- a/drivers/power/mt6323.c
+++ b/drivers/power/mt6323.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/delay.h>
 
diff --git a/drivers/power/palmas.c b/drivers/power/palmas.c
index d2083a51ac96..c716e4ff10df 100644
--- a/drivers/power/palmas.c
+++ b/drivers/power/palmas.c
@@ -5,6 +5,7 @@
  */
 #include <config.h>
 #include <palmas.h>
+#include <stdio.h>
 #include <linux/printk.h>
 
 void palmas_init_settings(void)
diff --git a/drivers/power/pmic/lp873x.c b/drivers/power/pmic/lp873x.c
index fda5bc151642..c307a9e3024a 100644
--- a/drivers/power/pmic/lp873x.c
+++ b/drivers/power/pmic/lp873x.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <log.h>
+#include <stdio.h>
 #include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/pmic/lp87565.c b/drivers/power/pmic/lp87565.c
index 904e02c4d818..ba67a5efc023 100644
--- a/drivers/power/pmic/lp87565.c
+++ b/drivers/power/pmic/lp87565.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <log.h>
+#include <stdio.h>
 #include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/pmic/mc34708.c b/drivers/power/pmic/mc34708.c
index 40d732224b6c..d1661f01999a 100644
--- a/drivers/power/pmic/mc34708.c
+++ b/drivers/power/pmic/mc34708.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <fsl_pmic.h>
 #include <i2c.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <power/pmic.h>
 
diff --git a/drivers/power/pmic/muic_max8997.c b/drivers/power/pmic/muic_max8997.c
index 969ce902395f..6184b70e2fd1 100644
--- a/drivers/power/pmic/muic_max8997.c
+++ b/drivers/power/pmic/muic_max8997.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <power/pmic.h>
 #include <power/power_chrg.h>
 #include <power/max8997_muic.h>
diff --git a/drivers/power/pmic/pmic_hi6553.c b/drivers/power/pmic/pmic_hi6553.c
index 80b9078cf8f0..4442f3501f7b 100644
--- a/drivers/power/pmic/pmic_hi6553.c
+++ b/drivers/power/pmic/pmic_hi6553.c
@@ -3,6 +3,7 @@
  *  Copyright (C) 2015 Linaro
  *  Peter Griffin <peter.griffin@linaro.org>
  */
+#include <stdio.h>
 #include <asm/io.h>
 #include <common.h>
 #include <linux/delay.h>
diff --git a/drivers/power/pmic/pmic_ltc3676.c b/drivers/power/pmic/pmic_ltc3676.c
index 00c3e201cd56..5dc0079c2af2 100644
--- a/drivers/power/pmic/pmic_ltc3676.c
+++ b/drivers/power/pmic/pmic_ltc3676.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <errno.h>
 #include <i2c.h>
+#include <stdio.h>
 #include <power/pmic.h>
 #include <power/ltc3676_pmic.h>
 
diff --git a/drivers/power/pmic/pmic_max77696.c b/drivers/power/pmic/pmic_max77696.c
index f3a73d6405f8..de36b4621802 100644
--- a/drivers/power/pmic/pmic_max77696.c
+++ b/drivers/power/pmic/pmic_max77696.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <errno.h>
 #include <i2c.h>
+#include <stdio.h>
 #include <power/pmic.h>
 #include <power/max77696_pmic.h>
 
diff --git a/drivers/power/pmic/pmic_max8997.c b/drivers/power/pmic/pmic_max8997.c
index 1d834ff71304..bf8a015dc8cd 100644
--- a/drivers/power/pmic/pmic_max8997.c
+++ b/drivers/power/pmic/pmic_max8997.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <power/pmic.h>
 #include <power/max8997_pmic.h>
 #include <i2c.h>
diff --git a/drivers/power/pmic/pmic_max8998.c b/drivers/power/pmic/pmic_max8998.c
index f058238c9217..8e2c4b8e02e3 100644
--- a/drivers/power/pmic/pmic_max8998.c
+++ b/drivers/power/pmic/pmic_max8998.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <power/pmic.h>
 #include <power/max8998_pmic.h>
 #include <errno.h>
diff --git a/drivers/power/pmic/pmic_mc34vr500.c b/drivers/power/pmic/pmic_mc34vr500.c
index 9dd1c46ea220..9a3f748538ce 100644
--- a/drivers/power/pmic/pmic_mc34vr500.c
+++ b/drivers/power/pmic/pmic_mc34vr500.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <errno.h>
 #include <i2c.h>
+#include <stdio.h>
 #include <power/pmic.h>
 #include <power/mc34vr500_pmic.h>
 
diff --git a/drivers/power/pmic/pmic_pca9450.c b/drivers/power/pmic/pmic_pca9450.c
index d4f27428bd11..651f3a0c2742 100644
--- a/drivers/power/pmic/pmic_pca9450.c
+++ b/drivers/power/pmic/pmic_pca9450.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <errno.h>
 #include <i2c.h>
+#include <stdio.h>
 #include <power/pmic.h>
 #include <power/pca9450.h>
 
diff --git a/drivers/power/pmic/pmic_pfuze100.c b/drivers/power/pmic/pmic_pfuze100.c
index c646a0c31f82..25a4aa0ed624 100644
--- a/drivers/power/pmic/pmic_pfuze100.c
+++ b/drivers/power/pmic/pmic_pfuze100.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <errno.h>
 #include <i2c.h>
+#include <stdio.h>
 #include <power/pmic.h>
 #include <power/pfuze100_pmic.h>
 
diff --git a/drivers/power/pmic/pmic_pfuze3000.c b/drivers/power/pmic/pmic_pfuze3000.c
index 1077fa5e9d98..82d932cef1bf 100644
--- a/drivers/power/pmic/pmic_pfuze3000.c
+++ b/drivers/power/pmic/pmic_pfuze3000.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <errno.h>
 #include <i2c.h>
+#include <stdio.h>
 #include <power/pmic.h>
 #include <power/pfuze3000_pmic.h>
 
diff --git a/drivers/power/pmic/pmic_tps62362.c b/drivers/power/pmic/pmic_tps62362.c
index c3977fccc3b6..790f1fad0470 100644
--- a/drivers/power/pmic/pmic_tps62362.c
+++ b/drivers/power/pmic/pmic_tps62362.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <i2c.h>
+#include <stdio.h>
 #include <linux/errno.h>
 #include <power/pmic.h>
 #include <power/tps62362.h>
diff --git a/drivers/power/pmic/pmic_tps65218.c b/drivers/power/pmic/pmic_tps65218.c
index 7c95e5e75809..992838de1b3f 100644
--- a/drivers/power/pmic/pmic_tps65218.c
+++ b/drivers/power/pmic/pmic_tps65218.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <i2c.h>
+#include <stdio.h>
 #include <linux/errno.h>
 #include <power/pmic.h>
 #include <power/tps65218.h>
diff --git a/drivers/power/pmic/rk8xx.c b/drivers/power/pmic/rk8xx.c
index 148ee29cca00..71027e8da35b 100644
--- a/drivers/power/pmic/rk8xx.c
+++ b/drivers/power/pmic/rk8xx.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
+#include <stdio.h>
 #include <power/rk8xx_pmic.h>
 #include <power/pmic.h>
 
diff --git a/drivers/power/pmic/tps65941.c b/drivers/power/pmic/tps65941.c
index e464d2984e47..fd350b24df28 100644
--- a/drivers/power/pmic/tps65941.c
+++ b/drivers/power/pmic/tps65941.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <log.h>
+#include <stdio.h>
 #include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/power_core.c b/drivers/power/power_core.c
index 9caa4d72b6de..a7df7965f641 100644
--- a/drivers/power/power_core.c
+++ b/drivers/power/power_core.c
@@ -13,6 +13,7 @@
 #include <command.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <linux/string.h>
 #include <linux/types.h>
 #include <linux/list.h>
diff --git a/drivers/power/power_dialog.c b/drivers/power/power_dialog.c
index e286dd108f31..62e460bd5812 100644
--- a/drivers/power/power_dialog.c
+++ b/drivers/power/power_dialog.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <power/pmic.h>
 #include <dialog_pmic.h>
 #include <errno.h>
diff --git a/drivers/power/power_fsl.c b/drivers/power/power_fsl.c
index a163300ab6b8..2324815a5bdf 100644
--- a/drivers/power/power_fsl.c
+++ b/drivers/power/power_fsl.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <spi.h>
+#include <stdio.h>
 #include <power/pmic.h>
 #include <fsl_pmic.h>
 #include <errno.h>
diff --git a/drivers/power/power_i2c.c b/drivers/power/power_i2c.c
index 41d7113251d9..ebf078fe7140 100644
--- a/drivers/power/power_i2c.c
+++ b/drivers/power/power_i2c.c
@@ -12,6 +12,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <linux/string.h>
 #include <linux/types.h>
 #include <power/pmic.h>
diff --git a/drivers/power/regulator/lp873x_regulator.c b/drivers/power/regulator/lp873x_regulator.c
index 5b73f54172c4..9ec23b6f5484 100644
--- a/drivers/power/regulator/lp873x_regulator.c
+++ b/drivers/power/regulator/lp873x_regulator.c
@@ -11,6 +11,7 @@
 #include <errno.h>
 #include <dm.h>
 #include <i2c.h>
+#include <stdio.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/lp873x.h>
diff --git a/drivers/power/regulator/lp87565_regulator.c b/drivers/power/regulator/lp87565_regulator.c
index 4ea6c346d7c7..5b14c07b4ce7 100644
--- a/drivers/power/regulator/lp87565_regulator.c
+++ b/drivers/power/regulator/lp87565_regulator.c
@@ -12,6 +12,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <log.h>
+#include <stdio.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/lp87565.h>
diff --git a/drivers/power/regulator/palmas_regulator.c b/drivers/power/regulator/palmas_regulator.c
index 9bb8c7ff32a9..adbc921e53a2 100644
--- a/drivers/power/regulator/palmas_regulator.c
+++ b/drivers/power/regulator/palmas_regulator.c
@@ -11,6 +11,7 @@
 #include <errno.h>
 #include <dm.h>
 #include <i2c.h>
+#include <stdio.h>
 #include <linux/string.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/regulator/pwm_regulator.c b/drivers/power/regulator/pwm_regulator.c
index 185e38e32a4e..2031d882953a 100644
--- a/drivers/power/regulator/pwm_regulator.c
+++ b/drivers/power/regulator/pwm_regulator.c
@@ -12,6 +12,7 @@
 #include <errno.h>
 #include <log.h>
 #include <pwm.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <dm/device_compat.h>
 #include <power/regulator.h>
diff --git a/drivers/power/regulator/regulator-uclass.c b/drivers/power/regulator/regulator-uclass.c
index c20c42b29d03..2f095d57e8e4 100644
--- a/drivers/power/regulator/regulator-uclass.c
+++ b/drivers/power/regulator/regulator-uclass.c
@@ -8,6 +8,7 @@
 #include <errno.h>
 #include <dm.h>
 #include <log.h>
+#include <stdio.h>
 #include <dm/uclass-internal.h>
 #include <linux/delay.h>
 #include <linux/string.h>
diff --git a/drivers/power/regulator/tps65941_regulator.c b/drivers/power/regulator/tps65941_regulator.c
index 150c72d7ec4a..c25ca3181004 100644
--- a/drivers/power/regulator/tps65941_regulator.c
+++ b/drivers/power/regulator/tps65941_regulator.c
@@ -12,6 +12,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <log.h>
+#include <stdio.h>
 #include <linux/delay.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/twl4030.c b/drivers/power/twl4030.c
index 34e7fa3d7206..c62db5f24f5d 100644
--- a/drivers/power/twl4030.c
+++ b/drivers/power/twl4030.c
@@ -23,6 +23,7 @@
  */
 
 #include <command.h>
+#include <stdio.h>
 #include <twl4030.h>
 #include <linux/delay.h>
 #include <linux/printk.h>
diff --git a/drivers/power/twl6030.c b/drivers/power/twl6030.c
index 2c5e4960e54c..3f9c2550c3dd 100644
--- a/drivers/power/twl6030.c
+++ b/drivers/power/twl6030.c
@@ -4,6 +4,7 @@
  * Texas Instruments, <www.ti.com>
  */
 #include <config.h>
+#include <stdio.h>
 #include <linux/delay.h>
 #include <linux/printk.h>
 
diff --git a/drivers/pwm/pwm-imx-util.c b/drivers/pwm/pwm-imx-util.c
index 823a9d2d6bfa..3da4cf988a33 100644
--- a/drivers/pwm/pwm-imx-util.c
+++ b/drivers/pwm/pwm-imx-util.c
@@ -12,6 +12,7 @@
 
 #include <common.h>
 #include <div64.h>
+#include <stdio.h>
 #include <asm/arch/imx-regs.h>
 
 /* pwm_id from 0..7 */
diff --git a/drivers/pwm/pwm-mtk.c b/drivers/pwm/pwm-mtk.c
index 7bd82518d67b..48acb6d744e4 100644
--- a/drivers/pwm/pwm-mtk.c
+++ b/drivers/pwm/pwm-mtk.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <pwm.h>
 #include <div64.h>
+#include <stdio.h>
 #include <linux/bitops.h>
 #include <linux/io.h>
 
diff --git a/drivers/qe/qe.c b/drivers/qe/qe.c
index cfcc247389af..cd3ef1789677 100644
--- a/drivers/qe/qe.c
+++ b/drivers/qe/qe.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <malloc.h>
 #include <command.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
 #include <asm/io.h>
diff --git a/drivers/qe/uccf.c b/drivers/qe/uccf.c
index 4d5840e77b1b..b4f0a0979c29 100644
--- a/drivers/qe/uccf.c
+++ b/drivers/qe/uccf.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <linux/errno.h>
 #include <asm/io.h>
 #include <linux/immap_qe.h>
diff --git a/drivers/qe/uec.c b/drivers/qe/uec.c
index 3d2a37466a50..d765cd1f5958 100644
--- a/drivers/qe/uec.c
+++ b/drivers/qe/uec.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <net.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/qe/uec_phy.c b/drivers/qe/uec_phy.c
index 69a520d4baf9..c9beb852defd 100644
--- a/drivers/qe/uec_phy.c
+++ b/drivers/qe/uec_phy.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <net.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/immap_qe.h>
diff --git a/drivers/ram/k3-am654-ddrss.c b/drivers/ram/k3-am654-ddrss.c
index 21e5a6552956..21d5426f5c8a 100644
--- a/drivers/ram/k3-am654-ddrss.c
+++ b/drivers/ram/k3-am654-ddrss.c
@@ -11,6 +11,7 @@
 #include <dm.h>
 #include <log.h>
 #include <ram.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <power-domain.h>
 #include <asm/arch/sys_proto.h>
diff --git a/drivers/ram/k3-j721e/k3-j721e-ddrss.c b/drivers/ram/k3-j721e/k3-j721e-ddrss.c
index d647a8a2090c..25cdf83922f9 100644
--- a/drivers/ram/k3-j721e/k3-j721e-ddrss.c
+++ b/drivers/ram/k3-j721e/k3-j721e-ddrss.c
@@ -11,6 +11,7 @@
 #include <hang.h>
 #include <log.h>
 #include <ram.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <power-domain.h>
 #include <wait_bit.h>
diff --git a/drivers/ram/rockchip/dmc-rk3368.c b/drivers/ram/rockchip/dmc-rk3368.c
index faf291e5763f..8795ad1c32cd 100644
--- a/drivers/ram/rockchip/dmc-rk3368.c
+++ b/drivers/ram/rockchip/dmc-rk3368.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <hang.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <dt-bindings/memory/rk3368-dmc.h>
 #include <dt-structs.h>
diff --git a/drivers/ram/rockchip/sdram_common.c b/drivers/ram/rockchip/sdram_common.c
index b3e7421d0854..5dd68c976822 100644
--- a/drivers/ram/rockchip/sdram_common.c
+++ b/drivers/ram/rockchip/sdram_common.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <debug_uart.h>
 #include <ram.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch-rockchip/sdram.h>
 #include <asm/arch-rockchip/sdram_common.h>
diff --git a/drivers/ram/rockchip/sdram_rk3188.c b/drivers/ram/rockchip/sdram_rk3188.c
index d3ed9bcc29e2..a2c36fa3cad4 100644
--- a/drivers/ram/rockchip/sdram_rk3188.c
+++ b/drivers/ram/rockchip/sdram_rk3188.c
@@ -16,6 +16,7 @@
 #include <log.h>
 #include <ram.h>
 #include <regmap.h>
+#include <stdio.h>
 #include <syscon.h>
 #include <asm/io.h>
 #include <asm/arch-rockchip/clock.h>
diff --git a/drivers/ram/rockchip/sdram_rk322x.c b/drivers/ram/rockchip/sdram_rk322x.c
index 4154f0c2642f..51d87e6d29fd 100644
--- a/drivers/ram/rockchip/sdram_rk322x.c
+++ b/drivers/ram/rockchip/sdram_rk322x.c
@@ -10,6 +10,7 @@
 #include <init.h>
 #include <ram.h>
 #include <regmap.h>
+#include <stdio.h>
 #include <syscon.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/ram/rockchip/sdram_rk3288.c b/drivers/ram/rockchip/sdram_rk3288.c
index 01f030e01a16..1063fde3e877 100644
--- a/drivers/ram/rockchip/sdram_rk3288.c
+++ b/drivers/ram/rockchip/sdram_rk3288.c
@@ -16,6 +16,7 @@
 #include <log.h>
 #include <ram.h>
 #include <regmap.h>
+#include <stdio.h>
 #include <syscon.h>
 #include <asm/io.h>
 #include <asm/arch-rockchip/clock.h>
diff --git a/drivers/ram/rockchip/sdram_rk3328.c b/drivers/ram/rockchip/sdram_rk3328.c
index 586e82e6ebc0..e61972e322c7 100644
--- a/drivers/ram/rockchip/sdram_rk3328.c
+++ b/drivers/ram/rockchip/sdram_rk3328.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <ram.h>
 #include <regmap.h>
+#include <stdio.h>
 #include <syscon.h>
 #include <asm/io.h>
 #include <asm/arch-rockchip/clock.h>
diff --git a/drivers/ram/rockchip/sdram_rk3399.c b/drivers/ram/rockchip/sdram_rk3399.c
index 530c8a2f4013..935bfc97b147 100644
--- a/drivers/ram/rockchip/sdram_rk3399.c
+++ b/drivers/ram/rockchip/sdram_rk3399.c
@@ -13,6 +13,7 @@
 #include <log.h>
 #include <ram.h>
 #include <regmap.h>
+#include <stdio.h>
 #include <syscon.h>
 #include <asm/io.h>
 #include <asm/arch-rockchip/clock.h>
diff --git a/drivers/ram/sifive/fu540_ddr.c b/drivers/ram/sifive/fu540_ddr.c
index 7208d350f410..eff6da55ad26 100644
--- a/drivers/ram/sifive/fu540_ddr.c
+++ b/drivers/ram/sifive/fu540_ddr.c
@@ -12,6 +12,7 @@
 #include <init.h>
 #include <ram.h>
 #include <regmap.h>
+#include <stdio.h>
 #include <syscon.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/ram/stm32mp1/stm32mp1_ddr.c b/drivers/ram/stm32mp1/stm32mp1_ddr.c
index 350681bcfe54..911bc2223db1 100644
--- a/drivers/ram/stm32mp1/stm32mp1_ddr.c
+++ b/drivers/ram/stm32mp1/stm32mp1_ddr.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <ram.h>
 #include <reset.h>
+#include <stdio.h>
 #include <timer.h>
 #include <asm/io.h>
 #include <asm/arch/ddr.h>
diff --git a/drivers/ram/stm32mp1/stm32mp1_interactive.c b/drivers/ram/stm32mp1/stm32mp1_interactive.c
index 398018e4c253..e758abe9ee99 100644
--- a/drivers/ram/stm32mp1/stm32mp1_interactive.c
+++ b/drivers/ram/stm32mp1/stm32mp1_interactive.c
@@ -12,6 +12,7 @@
 #include <malloc.h>
 #include <ram.h>
 #include <reset.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/global_data.h>
 #include <linux/string.h>
diff --git a/drivers/ram/stm32mp1/stm32mp1_ram.c b/drivers/ram/stm32mp1/stm32mp1_ram.c
index 85e01ffd098d..a24788957dfb 100644
--- a/drivers/ram/stm32mp1/stm32mp1_ram.c
+++ b/drivers/ram/stm32mp1/stm32mp1_ram.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <ram.h>
 #include <regmap.h>
+#include <stdio.h>
 #include <syscon.h>
 #include <asm/io.h>
 #include <linux/printk.h>
diff --git a/drivers/ram/stm32mp1/stm32mp1_tests.c b/drivers/ram/stm32mp1/stm32mp1_tests.c
index a5433ac14024..2d73b768b49d 100644
--- a/drivers/ram/stm32mp1/stm32mp1_tests.c
+++ b/drivers/ram/stm32mp1/stm32mp1_tests.c
@@ -7,6 +7,7 @@
 #include <init.h>
 #include <log.h>
 #include <rand.h>
+#include <stdio.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 222777ad3cf3..8707dead754c 100644
--- a/drivers/ram/stm32mp1/stm32mp1_tuning.c
+++ b/drivers/ram/stm32mp1/stm32mp1_tuning.c
@@ -9,6 +9,7 @@
 #include <ram.h>
 #include <rand.h>
 #include <reset.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/drivers/remoteproc/ti_k3_r5f_rproc.c b/drivers/remoteproc/ti_k3_r5f_rproc.c
index c3018d74a47e..964a75309adb 100644
--- a/drivers/remoteproc/ti_k3_r5f_rproc.c
+++ b/drivers/remoteproc/ti_k3_r5f_rproc.c
@@ -14,6 +14,7 @@
 #include <errno.h>
 #include <clk.h>
 #include <reset.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <dm/device_compat.h>
 #include <linux/err.h>
diff --git a/drivers/reset/reset-socfpga.c b/drivers/reset/reset-socfpga.c
index 830eda9430ec..87daf65d7fe0 100644
--- a/drivers/reset/reset-socfpga.c
+++ b/drivers/reset/reset-socfpga.c
@@ -16,6 +16,7 @@
 #include <dm.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <dm/lists.h>
 #include <dm/of_access.h>
 #include <env.h>
diff --git a/drivers/reset/reset-sunxi.c b/drivers/reset/reset-sunxi.c
index 05f7f599ce30..b9ca80e9b025 100644
--- a/drivers/reset/reset-sunxi.c
+++ b/drivers/reset/reset-sunxi.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <reset-uclass.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <dm/lists.h>
 #include <linux/bitops.h>
diff --git a/drivers/rng/stm32mp1_rng.c b/drivers/rng/stm32mp1_rng.c
index 4354edd4a1bd..32f8cebb687d 100644
--- a/drivers/rng/stm32mp1_rng.c
+++ b/drivers/rng/stm32mp1_rng.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <reset.h>
 #include <rng.h>
+#include <stdio.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/string.h>
diff --git a/drivers/rtc/davinci.c b/drivers/rtc/davinci.c
index c446e7a735fd..fe6a21fdf003 100644
--- a/drivers/rtc/davinci.c
+++ b/drivers/rtc/davinci.c
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <log.h>
 #include <rtc.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/davinci_rtc.h>
 #include <linux/delay.h>
diff --git a/drivers/rtc/ds1302.c b/drivers/rtc/ds1302.c
index 21655085d1b7..2667f149baf3 100644
--- a/drivers/rtc/ds1302.c
+++ b/drivers/rtc/ds1302.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <command.h>
 #include <rtc.h>
+#include <stdio.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 
diff --git a/drivers/rtc/ds1307.c b/drivers/rtc/ds1307.c
index 17344d4d4ff2..acdae077c40c 100644
--- a/drivers/rtc/ds1307.c
+++ b/drivers/rtc/ds1307.c
@@ -19,6 +19,7 @@
 #include <log.h>
 #include <rtc.h>
 #include <i2c.h>
+#include <stdio.h>
 
 enum ds_type {
 	ds_1307,
diff --git a/drivers/rtc/ds1337.c b/drivers/rtc/ds1337.c
index 4986c96f8623..9b9a9d6a810d 100644
--- a/drivers/rtc/ds1337.c
+++ b/drivers/rtc/ds1337.c
@@ -17,6 +17,7 @@
 #include <log.h>
 #include <rtc.h>
 #include <i2c.h>
+#include <stdio.h>
 
 /*
  * RTC register addresses
diff --git a/drivers/rtc/ds1374.c b/drivers/rtc/ds1374.c
index 9f2647d707e5..5ca0e32b50c7 100644
--- a/drivers/rtc/ds1374.c
+++ b/drivers/rtc/ds1374.c
@@ -17,6 +17,7 @@
 #include <command.h>
 #include <rtc.h>
 #include <i2c.h>
+#include <stdio.h>
 
 /*---------------------------------------------------------------------*/
 #undef DEBUG_RTC
diff --git a/drivers/rtc/ds1556.c b/drivers/rtc/ds1556.c
index 687b32937a08..27bf42816989 100644
--- a/drivers/rtc/ds1556.c
+++ b/drivers/rtc/ds1556.c
@@ -18,6 +18,7 @@
 #include <common.h>
 #include <command.h>
 #include <rtc.h>
+#include <stdio.h>
 
 #if defined(CONFIG_CMD_DATE)
 
diff --git a/drivers/rtc/ds164x.c b/drivers/rtc/ds164x.c
index f8707892e71f..b363908e79a7 100644
--- a/drivers/rtc/ds164x.c
+++ b/drivers/rtc/ds164x.c
@@ -18,6 +18,7 @@
 #include <common.h>
 #include <command.h>
 #include <rtc.h>
+#include <stdio.h>
 
 
 static uchar    rtc_read(unsigned int addr );
diff --git a/drivers/rtc/ds174x.c b/drivers/rtc/ds174x.c
index 94f943d97a5e..b7ee5b7ba1d5 100644
--- a/drivers/rtc/ds174x.c
+++ b/drivers/rtc/ds174x.c
@@ -15,6 +15,7 @@
 #include <common.h>
 #include <command.h>
 #include <rtc.h>
+#include <stdio.h>
 
 static uchar rtc_read( unsigned int addr );
 static void  rtc_write( unsigned int addr, uchar val);
diff --git a/drivers/rtc/ds3231.c b/drivers/rtc/ds3231.c
index 5b72e86768a1..328b03ed05da 100644
--- a/drivers/rtc/ds3231.c
+++ b/drivers/rtc/ds3231.c
@@ -20,6 +20,7 @@
 #include <log.h>
 #include <rtc.h>
 #include <i2c.h>
+#include <stdio.h>
 
 /*
  * RTC register addresses
diff --git a/drivers/rtc/imxdi.c b/drivers/rtc/imxdi.c
index e3a1393266c3..55def3ac9fd9 100644
--- a/drivers/rtc/imxdi.c
+++ b/drivers/rtc/imxdi.c
@@ -14,6 +14,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <stdio.h>
 #include <linux/compat.h>
 #include <rtc.h>
 #include <linux/delay.h>
diff --git a/drivers/rtc/isl1208.c b/drivers/rtc/isl1208.c
index 59a60b75b307..47c48bfc11f5 100644
--- a/drivers/rtc/isl1208.c
+++ b/drivers/rtc/isl1208.c
@@ -16,6 +16,7 @@
 #include <dm.h>
 #include <rtc.h>
 #include <i2c.h>
+#include <stdio.h>
 
 /*---------------------------------------------------------------------*/
 #ifdef DEBUG_RTC
diff --git a/drivers/rtc/m41t11.c b/drivers/rtc/m41t11.c
index 706b7188cf83..469551980a90 100644
--- a/drivers/rtc/m41t11.c
+++ b/drivers/rtc/m41t11.c
@@ -16,6 +16,7 @@
 #include <log.h>
 #include <rtc.h>
 #include <i2c.h>
+#include <stdio.h>
 
 /*
 	I Don't have an example config file but this
diff --git a/drivers/rtc/m41t60.c b/drivers/rtc/m41t60.c
index 692042b93519..21775a5aed63 100644
--- a/drivers/rtc/m41t60.c
+++ b/drivers/rtc/m41t60.c
@@ -21,6 +21,7 @@
 #include <log.h>
 #include <rtc.h>
 #include <i2c.h>
+#include <stdio.h>
 
 /*
  * Convert between century and "century bits" (CB1 and CB0).  These routines
diff --git a/drivers/rtc/m41t62.c b/drivers/rtc/m41t62.c
index 94a6b523aab3..23ebaddf9417 100644
--- a/drivers/rtc/m41t62.c
+++ b/drivers/rtc/m41t62.c
@@ -22,6 +22,7 @@
 #include <log.h>
 #include <rtc.h>
 #include <i2c.h>
+#include <stdio.h>
 
 #define M41T62_REG_SSEC	0
 #define M41T62_REG_SEC	1
diff --git a/drivers/rtc/mc146818.c b/drivers/rtc/mc146818.c
index b98c39d8219c..43318e066efc 100644
--- a/drivers/rtc/mc146818.c
+++ b/drivers/rtc/mc146818.c
@@ -12,6 +12,7 @@
 #include <command.h>
 #include <dm.h>
 #include <rtc.h>
+#include <stdio.h>
 
 #if defined(CONFIG_X86) || defined(CONFIG_MALTA)
 #include <asm/io.h>
diff --git a/drivers/rtc/mcfrtc.c b/drivers/rtc/mcfrtc.c
index e10638ec7dd3..f86caae9eb24 100644
--- a/drivers/rtc/mcfrtc.c
+++ b/drivers/rtc/mcfrtc.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 
 #include <command.h>
 #include <rtc.h>
diff --git a/drivers/rtc/mvrtc.c b/drivers/rtc/mvrtc.c
index ed057f7bc4e4..6a0224cad736 100644
--- a/drivers/rtc/mvrtc.c
+++ b/drivers/rtc/mvrtc.c
@@ -12,6 +12,7 @@
 #include <command.h>
 #include <dm.h>
 #include <rtc.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/delay.h>
 #include "mvrtc.h"
diff --git a/drivers/rtc/mxsrtc.c b/drivers/rtc/mxsrtc.c
index be899a925408..ec0c631cc499 100644
--- a/drivers/rtc/mxsrtc.c
+++ b/drivers/rtc/mxsrtc.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <rtc.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
diff --git a/drivers/rtc/pcf2127.c b/drivers/rtc/pcf2127.c
index 88ff8c52c350..e4ab395f514a 100644
--- a/drivers/rtc/pcf2127.c
+++ b/drivers/rtc/pcf2127.c
@@ -11,6 +11,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <rtc.h>
+#include <stdio.h>
 
 #define PCF2127_REG_CTRL1	0x00
 #define PCF2127_REG_CTRL2	0x01
diff --git a/drivers/rtc/pcf8563.c b/drivers/rtc/pcf8563.c
index 19faefba7c8f..79d1b71a0cfa 100644
--- a/drivers/rtc/pcf8563.c
+++ b/drivers/rtc/pcf8563.c
@@ -16,6 +16,7 @@
 #include <log.h>
 #include <rtc.h>
 #include <i2c.h>
+#include <stdio.h>
 
 #if !CONFIG_IS_ENABLED(DM_RTC)
 static uchar rtc_read  (uchar reg);
diff --git a/drivers/rtc/pt7c4338.c b/drivers/rtc/pt7c4338.c
index c987494b669d..4718229657e6 100644
--- a/drivers/rtc/pt7c4338.c
+++ b/drivers/rtc/pt7c4338.c
@@ -24,6 +24,7 @@
 #include <log.h>
 #include <rtc.h>
 #include <i2c.h>
+#include <stdio.h>
 
 /* RTC register addresses */
 #define RTC_SEC_REG_ADDR        0x0
diff --git a/drivers/rtc/rs5c372.c b/drivers/rtc/rs5c372.c
index 64ff8c89d40e..e9a3329a7315 100644
--- a/drivers/rtc/rs5c372.c
+++ b/drivers/rtc/rs5c372.c
@@ -23,6 +23,7 @@
 #include <command.h>
 #include <rtc.h>
 #include <i2c.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 /*
diff --git a/drivers/rtc/rv3029.c b/drivers/rtc/rv3029.c
index 188560d3d459..4dddf62aca88 100644
--- a/drivers/rtc/rv3029.c
+++ b/drivers/rtc/rv3029.c
@@ -14,6 +14,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <rtc.h>
+#include <stdio.h>
 #include <time.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
diff --git a/drivers/rtc/rv8803.c b/drivers/rtc/rv8803.c
index acd50c656483..5e16676c04c8 100644
--- a/drivers/rtc/rv8803.c
+++ b/drivers/rtc/rv8803.c
@@ -16,6 +16,7 @@
 #include <log.h>
 #include <rtc.h>
 #include <i2c.h>
+#include <stdio.h>
 #include <linux/bitops.h>
 
 /*
diff --git a/drivers/rtc/rx8010sj.c b/drivers/rtc/rx8010sj.c
index d513561b8202..1d9b7cd6358c 100644
--- a/drivers/rtc/rx8010sj.c
+++ b/drivers/rtc/rx8010sj.c
@@ -21,6 +21,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <rtc.h>
+#include <stdio.h>
 #include <linux/bitops.h>
 
 /*---------------------------------------------------------------------*/
diff --git a/drivers/rtc/rx8025.c b/drivers/rtc/rx8025.c
index e717dcbbfe35..7fd04d999b0f 100644
--- a/drivers/rtc/rx8025.c
+++ b/drivers/rtc/rx8025.c
@@ -13,6 +13,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <rtc.h>
+#include <stdio.h>
 
 /*---------------------------------------------------------------------*/
 #undef DEBUG_RTC
diff --git a/drivers/rtc/s35392a.c b/drivers/rtc/s35392a.c
index 80f55c86233a..5d70ed1ecda8 100644
--- a/drivers/rtc/s35392a.c
+++ b/drivers/rtc/s35392a.c
@@ -21,6 +21,7 @@
 #include <common.h>
 #include <dm.h>
 #include <i2c.h>
+#include <stdio.h>
 #include <linux/bitrev.h>
 #include <rtc.h>
 #include <linux/delay.h>
diff --git a/drivers/rtc/s3c24x0_rtc.c b/drivers/rtc/s3c24x0_rtc.c
index 96ea3cf878ee..807347a91495 100644
--- a/drivers/rtc/s3c24x0_rtc.c
+++ b/drivers/rtc/s3c24x0_rtc.c
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <stdio.h>
 
 #include <asm/arch/s3c24x0_cpu.h>
 
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
index 2492c3394b97..6f940d23e7a2 100644
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -13,6 +13,7 @@
 #include <part.h>
 #include <pci.h>
 #include <scsi.h>
+#include <stdio.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 a21aee247415..2ef344a46ecf 100644
--- a/drivers/serial/serial-uclass.c
+++ b/drivers/serial/serial-uclass.c
@@ -10,6 +10,7 @@
 #include <malloc.h>
 #include <os.h>
 #include <serial.h>
+#include <stdio.h>
 #include <stdio_dev.h>
 #include <watchdog.h>
 #include <asm/global_data.h>
diff --git a/drivers/serial/serial.c b/drivers/serial/serial.c
index 2f7d65f72d16..151bba4ab66a 100644
--- a/drivers/serial/serial.c
+++ b/drivers/serial/serial.c
@@ -8,6 +8,7 @@
 #include <env_internal.h>
 #include <hang.h>
 #include <serial.h>
+#include <stdio.h>
 #include <stdio_dev.h>
 #include <post.h>
 #include <asm/global_data.h>
diff --git a/drivers/soc/ti/keystone_serdes.c b/drivers/soc/ti/keystone_serdes.c
index 2ece1a8f6470..f2a5c18b80bd 100644
--- a/drivers/soc/ti/keystone_serdes.c
+++ b/drivers/soc/ti/keystone_serdes.c
@@ -8,6 +8,7 @@
 
 #include <errno.h>
 #include <common.h>
+#include <stdio.h>
 #include <asm/ti-common/keystone_serdes.h>
 #include <linux/bitops.h>
 
diff --git a/drivers/sound/hda_codec.c b/drivers/sound/hda_codec.c
index 4154d2939981..93820d77802f 100644
--- a/drivers/sound/hda_codec.c
+++ b/drivers/sound/hda_codec.c
@@ -13,6 +13,7 @@
 #include <log.h>
 #include <pci.h>
 #include <sound.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <dt-bindings/sound/azalia.h>
 #include <linux/bitops.h>
diff --git a/drivers/spi/atcspi200_spi.c b/drivers/spi/atcspi200_spi.c
index 7ba208baf2e7..79bcd12367b5 100644
--- a/drivers/spi/atcspi200_spi.c
+++ b/drivers/spi/atcspi200_spi.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <spi.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm.h>
diff --git a/drivers/spi/bcm63xx_hsspi.c b/drivers/spi/bcm63xx_hsspi.c
index f30a8a42bd45..f59143802485 100644
--- a/drivers/spi/bcm63xx_hsspi.c
+++ b/drivers/spi/bcm63xx_hsspi.c
@@ -14,6 +14,7 @@
 #include <malloc.h>
 #include <spi.h>
 #include <reset.h>
+#include <stdio.h>
 #include <wait_bit.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
diff --git a/drivers/spi/bcm63xx_spi.c b/drivers/spi/bcm63xx_spi.c
index acc1a493c4eb..a5550a214e8e 100644
--- a/drivers/spi/bcm63xx_spi.c
+++ b/drivers/spi/bcm63xx_spi.c
@@ -14,6 +14,7 @@
 #include <malloc.h>
 #include <spi.h>
 #include <reset.h>
+#include <stdio.h>
 #include <wait_bit.h>
 #include <asm/io.h>
 
diff --git a/drivers/spi/bcmstb_spi.c b/drivers/spi/bcmstb_spi.c
index 40364fbf57c1..5879a7883b1c 100644
--- a/drivers/spi/bcmstb_spi.c
+++ b/drivers/spi/bcmstb_spi.c
@@ -5,6 +5,7 @@
  * Author: Thomas Fitzsimmons <fitzsim@fitzsim.org>
  */
 
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <command.h>
diff --git a/drivers/spi/cadence_qspi.c b/drivers/spi/cadence_qspi.c
index 1e8574920907..4b77a6b4b727 100644
--- a/drivers/spi/cadence_qspi.c
+++ b/drivers/spi/cadence_qspi.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <clk.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm-generic/io.h>
 #include <dm.h>
 #include <fdtdec.h>
diff --git a/drivers/spi/cadence_qspi_apb.c b/drivers/spi/cadence_qspi_apb.c
index f1f510ef65f6..d97b299a93c8 100644
--- a/drivers/spi/cadence_qspi_apb.c
+++ b/drivers/spi/cadence_qspi_apb.c
@@ -27,6 +27,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/io.h>
 #include <dma.h>
diff --git a/drivers/spi/cf_spi.c b/drivers/spi/cf_spi.c
index 0f39fe843989..a6a5c7f17c99 100644
--- a/drivers/spi/cf_spi.c
+++ b/drivers/spi/cf_spi.c
@@ -16,6 +16,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <dm/platform_data/spi_coldfire.h>
 #include <spi.h>
diff --git a/drivers/spi/davinci_spi.c b/drivers/spi/davinci_spi.c
index c1b21a8cd358..3d1c0b58070d 100644
--- a/drivers/spi/davinci_spi.c
+++ b/drivers/spi/davinci_spi.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <spi.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
diff --git a/drivers/spi/designware_spi.c b/drivers/spi/designware_spi.c
index 2559aac2e942..3838504455ab 100644
--- a/drivers/spi/designware_spi.c
+++ b/drivers/spi/designware_spi.c
@@ -11,6 +11,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm-generic/gpio.h>
 #include <clk.h>
 #include <dm.h>
diff --git a/drivers/spi/kirkwood_spi.c b/drivers/spi/kirkwood_spi.c
index dc7d2bc1f01c..3659e5e8adec 100644
--- a/drivers/spi/kirkwood_spi.c
+++ b/drivers/spi/kirkwood_spi.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <spi.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/soc.h>
 #ifdef CONFIG_ARCH_KIRKWOOD
diff --git a/drivers/spi/mpc8xx_spi.c b/drivers/spi/mpc8xx_spi.c
index f7981b8638cd..0f9ebc58f297 100644
--- a/drivers/spi/mpc8xx_spi.c
+++ b/drivers/spi/mpc8xx_spi.c
@@ -20,6 +20,7 @@
 #include <dm.h>
 #include <mpc8xx.h>
 #include <spi.h>
+#include <stdio.h>
 #include <linux/delay.h>
 
 #include <asm/cpm_8xx.h>
diff --git a/drivers/spi/mpc8xxx_spi.c b/drivers/spi/mpc8xxx_spi.c
index 4f4b7ea22e0e..b7fd47984de7 100644
--- a/drivers/spi/mpc8xxx_spi.c
+++ b/drivers/spi/mpc8xxx_spi.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <spi.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/mpc8xxx_spi.h>
 #include <asm-generic/gpio.h>
diff --git a/drivers/spi/mt7621_spi.c b/drivers/spi/mt7621_spi.c
index f13d21f5b2c5..786afaaa9cda 100644
--- a/drivers/spi/mt7621_spi.c
+++ b/drivers/spi/mt7621_spi.c
@@ -13,6 +13,7 @@
 #include <dm.h>
 #include <log.h>
 #include <spi.h>
+#include <stdio.h>
 #include <wait_bit.h>
 #include <linux/bitops.h>
 #include <linux/io.h>
diff --git a/drivers/spi/mtk_snfi_spi.c b/drivers/spi/mtk_snfi_spi.c
index 7f5d78e357e9..bd9b79929a9d 100644
--- a/drivers/spi/mtk_snfi_spi.c
+++ b/drivers/spi/mtk_snfi_spi.c
@@ -12,6 +12,7 @@
 #include <spi.h>
 #include <spi-mem.h>
 #include <stdbool.h>
+#include <stdio.h>
 #include <watchdog.h>
 #include <dm/pinctrl.h>
 #include <linux/bitops.h>
diff --git a/drivers/spi/mxc_spi.c b/drivers/spi/mxc_spi.c
index a2dbd8a96de0..00e3b5962279 100644
--- a/drivers/spi/mxc_spi.c
+++ b/drivers/spi/mxc_spi.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <spi.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/global_data.h>
 #include <dm/device_compat.h>
diff --git a/drivers/spi/mxs_spi.c b/drivers/spi/mxs_spi.c
index 8d7bb35d02f9..8c541dc03e69 100644
--- a/drivers/spi/mxs_spi.c
+++ b/drivers/spi/mxs_spi.c
@@ -21,6 +21,7 @@
 #include <malloc.h>
 #include <memalign.h>
 #include <spi.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
diff --git a/drivers/spi/omap3_spi.c b/drivers/spi/omap3_spi.c
index 942db5ca5bab..3cee5a7fccda 100644
--- a/drivers/spi/omap3_spi.c
+++ b/drivers/spi/omap3_spi.c
@@ -20,6 +20,7 @@
 #include <dm.h>
 #include <spi.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/spi/pic32_spi.c b/drivers/spi/pic32_spi.c
index d08c26c8f4fe..4eb039f35793 100644
--- a/drivers/spi/pic32_spi.c
+++ b/drivers/spi/pic32_spi.c
@@ -10,6 +10,7 @@
 #include <clk.h>
 #include <dm.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
diff --git a/drivers/spi/renesas_rpc_spi.c b/drivers/spi/renesas_rpc_spi.c
index 1ceb7294bb63..9090667bf0fb 100644
--- a/drivers/spi/renesas_rpc_spi.c
+++ b/drivers/spi/renesas_rpc_spi.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <clk.h>
diff --git a/drivers/spi/sandbox_spi.c b/drivers/spi/sandbox_spi.c
index 755f17686149..d7cef659ea4a 100644
--- a/drivers/spi/sandbox_spi.c
+++ b/drivers/spi/sandbox_spi.c
@@ -17,6 +17,7 @@
 #include <spi.h>
 #include <spi_flash.h>
 #include <os.h>
+#include <stdio.h>
 
 #include <linux/errno.h>
 #include <asm/spi.h>
diff --git a/drivers/spi/sh_qspi.c b/drivers/spi/sh_qspi.c
index aa1c03047e28..49f3fdb6928c 100644
--- a/drivers/spi/sh_qspi.c
+++ b/drivers/spi/sh_qspi.c
@@ -10,6 +10,7 @@
 #include <console.h>
 #include <malloc.h>
 #include <spi.h>
+#include <stdio.h>
 #include <wait_bit.h>
 #include <asm/arch/rmobile.h>
 #include <asm/io.h>
diff --git a/drivers/spi/spi-sifive.c b/drivers/spi/spi-sifive.c
index a11728739866..b046792b636e 100644
--- a/drivers/spi/spi-sifive.c
+++ b/drivers/spi/spi-sifive.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <stdio.h>
 #include <dm/device_compat.h>
 #include <malloc.h>
 #include <spi.h>
diff --git a/drivers/spi/spi-sunxi.c b/drivers/spi/spi-sunxi.c
index be6ef1757a07..3b1e9fc22846 100644
--- a/drivers/spi/spi-sunxi.c
+++ b/drivers/spi/spi-sunxi.c
@@ -26,6 +26,7 @@
 #include <errno.h>
 #include <fdt_support.h>
 #include <reset.h>
+#include <stdio.h>
 #include <wait_bit.h>
 #include <asm/global_data.h>
 #include <dm/device_compat.h>
diff --git a/drivers/spi/spi-uclass.c b/drivers/spi/spi-uclass.c
index 46b5249f5095..56869c125afb 100644
--- a/drivers/spi/spi-uclass.c
+++ b/drivers/spi/spi-uclass.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <spi.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 426d30c6b21e..7662932d40a9 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -7,6 +7,7 @@
 #include <fdtdec.h>
 #include <malloc.h>
 #include <spi.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 int spi_set_wordlen(struct spi_slave *slave, unsigned int wordlen)
diff --git a/drivers/spi/tegra114_spi.c b/drivers/spi/tegra114_spi.c
index 0e8198c5a022..1b7246af2584 100644
--- a/drivers/spi/tegra114_spi.c
+++ b/drivers/spi/tegra114_spi.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
diff --git a/drivers/spi/tegra20_sflash.c b/drivers/spi/tegra20_sflash.c
index 5066f43ba614..7b81e785215c 100644
--- a/drivers/spi/tegra20_sflash.c
+++ b/drivers/spi/tegra20_sflash.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/spi/tegra20_slink.c b/drivers/spi/tegra20_slink.c
index d725a9574854..64485de5d327 100644
--- a/drivers/spi/tegra20_slink.c
+++ b/drivers/spi/tegra20_slink.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/spi/tegra210_qspi.c b/drivers/spi/tegra210_qspi.c
index 90ac21f8ad9b..19e50919f6db 100644
--- a/drivers/spi/tegra210_qspi.c
+++ b/drivers/spi/tegra210_qspi.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/spi/ti_qspi.c b/drivers/spi/ti_qspi.c
index 26cd83be76ab..ba97f3ece771 100644
--- a/drivers/spi/ti_qspi.c
+++ b/drivers/spi/ti_qspi.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/spi/xilinx_spi.c b/drivers/spi/xilinx_spi.c
index 348630faf381..6b1cea4519e2 100644
--- a/drivers/spi/xilinx_spi.c
+++ b/drivers/spi/xilinx_spi.c
@@ -19,6 +19,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <spi.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <wait_bit.h>
 #include <linux/bitops.h>
diff --git a/drivers/spi/zynq_qspi.c b/drivers/spi/zynq_qspi.c
index 7607c5102490..a1022ad496e7 100644
--- a/drivers/spi/zynq_qspi.c
+++ b/drivers/spi/zynq_qspi.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <spi.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/spi/zynq_spi.c b/drivers/spi/zynq_spi.c
index b4604a4b2020..bbac203e0dd0 100644
--- a/drivers/spi/zynq_spi.c
+++ b/drivers/spi/zynq_spi.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <spi.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/spi/zynqmp_gqspi.c b/drivers/spi/zynqmp_gqspi.c
index 151618a99f41..01186f3c0399 100644
--- a/drivers/spi/zynqmp_gqspi.c
+++ b/drivers/spi/zynqmp_gqspi.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
diff --git a/drivers/spmi/spmi-msm.c b/drivers/spmi/spmi-msm.c
index 6b12a96ee3c0..1f9b3c310086 100644
--- a/drivers/spmi/spmi-msm.c
+++ b/drivers/spmi/spmi-msm.c
@@ -11,6 +11,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <fdtdec.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm/device_compat.h>
diff --git a/drivers/sysreset/sysreset-uclass.c b/drivers/sysreset/sysreset-uclass.c
index d1b47eebac75..a42c603ff56d 100644
--- a/drivers/sysreset/sysreset-uclass.c
+++ b/drivers/sysreset/sysreset-uclass.c
@@ -11,6 +11,7 @@
 #include <cpu_func.h>
 #include <hang.h>
 #include <log.h>
+#include <stdio.h>
 #include <sysreset.h>
 #include <dm.h>
 #include <errno.h>
diff --git a/drivers/sysreset/sysreset_microblaze.c b/drivers/sysreset/sysreset_microblaze.c
index 514c95817f2f..b45e894440dc 100644
--- a/drivers/sysreset/sysreset_microblaze.c
+++ b/drivers/sysreset/sysreset_microblaze.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
+#include <stdio.h>
 #include <sysreset.h>
 #include <linux/err.h>
 
diff --git a/drivers/sysreset/sysreset_mpc83xx.c b/drivers/sysreset/sysreset_mpc83xx.c
index 0da8d5b3a577..2d0abca3200c 100644
--- a/drivers/sysreset/sysreset_mpc83xx.c
+++ b/drivers/sysreset/sysreset_mpc83xx.c
@@ -8,6 +8,7 @@
 #include <command.h>
 #include <dm.h>
 #include <log.h>
+#include <stdio.h>
 #include <sysreset.h>
 #include <wait_bit.h>
 #include <asm/global_data.h>
diff --git a/drivers/sysreset/sysreset_socfpga_s10.c b/drivers/sysreset/sysreset_socfpga_s10.c
index 9837aadf64b6..b109320eedd0 100644
--- a/drivers/sysreset/sysreset_socfpga_s10.c
+++ b/drivers/sysreset/sysreset_socfpga_s10.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
+#include <stdio.h>
 #include <sysreset.h>
 #include <asm/arch/mailbox_s10.h>
 
diff --git a/drivers/tee/sandbox.c b/drivers/tee/sandbox.c
index 2f174fa00f91..00e6f91df987 100644
--- a/drivers/tee/sandbox.c
+++ b/drivers/tee/sandbox.c
@@ -5,6 +5,7 @@
 #include <common.h>
 #include <dm.h>
 #include <sandboxtee.h>
+#include <stdio.h>
 #include <tee.h>
 #include <linux/string.h>
 #include <tee/optee_ta_avb.h>
diff --git a/drivers/thermal/imx_scu_thermal.c b/drivers/thermal/imx_scu_thermal.c
index b3c823ffcb7b..9b2f74636a5f 100644
--- a/drivers/thermal/imx_scu_thermal.c
+++ b/drivers/thermal/imx_scu_thermal.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
+#include <stdio.h>
 #include <thermal.h>
 #include <asm/global_data.h>
 #include <dm/device-internal.h>
diff --git a/drivers/thermal/imx_thermal.c b/drivers/thermal/imx_thermal.c
index 101bd5ef2d74..82e8f8e65126 100644
--- a/drivers/thermal/imx_thermal.c
+++ b/drivers/thermal/imx_thermal.c
@@ -10,6 +10,7 @@
 #include <div64.h>
 #include <fuse.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/sys_proto.h>
diff --git a/drivers/thermal/imx_tmu.c b/drivers/thermal/imx_tmu.c
index b9bdec00c6d9..6ec16a35f278 100644
--- a/drivers/thermal/imx_tmu.c
+++ b/drivers/thermal/imx_tmu.c
@@ -6,6 +6,7 @@
 
 #include <config.h>
 #include <common.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
diff --git a/drivers/tpm/cr50_i2c.c b/drivers/tpm/cr50_i2c.c
index 611dd534dc3a..8a1c65bbe8cd 100644
--- a/drivers/tpm/cr50_i2c.c
+++ b/drivers/tpm/cr50_i2c.c
@@ -13,6 +13,7 @@
 #include <irq.h>
 #include <log.h>
 #include <spl.h>
+#include <stdio.h>
 #include <time.h>
 #include <tpm-v2.h>
 #include <asm/gpio.h>
diff --git a/drivers/tpm/tpm2_tis_sandbox.c b/drivers/tpm/tpm2_tis_sandbox.c
index 708d030f5ebf..70e4e258db1b 100644
--- a/drivers/tpm/tpm2_tis_sandbox.c
+++ b/drivers/tpm/tpm2_tis_sandbox.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <stdio.h>
 #include <tpm-v2.h>
 #include <asm/state.h>
 #include <asm/unaligned.h>
diff --git a/drivers/tpm/tpm_atmel_twi.c b/drivers/tpm/tpm_atmel_twi.c
index ade72c056380..c8b597d43cc5 100644
--- a/drivers/tpm/tpm_atmel_twi.c
+++ b/drivers/tpm/tpm_atmel_twi.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <display_options.h>
 #include <dm.h>
+#include <stdio.h>
 #include <time.h>
 #include <tpm-v1.h>
 #include <i2c.h>
diff --git a/drivers/tpm/tpm_tis_lpc.c b/drivers/tpm/tpm_tis_lpc.c
index 8929b269ddf1..9ef0f3347338 100644
--- a/drivers/tpm/tpm_tis_lpc.c
+++ b/drivers/tpm/tpm_tis_lpc.c
@@ -16,6 +16,7 @@
 #include <dm.h>
 #include <log.h>
 #include <mapmem.h>
+#include <stdio.h>
 #include <tpm-v1.h>
 #include <asm/io.h>
 #include <linux/delay.h>
diff --git a/drivers/tpm/tpm_tis_sandbox.c b/drivers/tpm/tpm_tis_sandbox.c
index d923e9723ae5..bc96c7354d8c 100644
--- a/drivers/tpm/tpm_tis_sandbox.c
+++ b/drivers/tpm/tpm_tis_sandbox.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <display_options.h>
 #include <dm.h>
+#include <stdio.h>
 #include <tpm-v1.h>
 #include <asm/state.h>
 #include <asm/unaligned.h>
diff --git a/drivers/ufs/ufs.c b/drivers/ufs/ufs.c
index ab17ecf7f131..8509c65171dc 100644
--- a/drivers/ufs/ufs.c
+++ b/drivers/ufs/ufs.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <dm/device_compat.h>
 #include <dm/devres.h>
diff --git a/drivers/usb/cdns3/core.c b/drivers/usb/cdns3/core.c
index ea86a250608b..d5fb8a0edb35 100644
--- a/drivers/usb/cdns3/core.c
+++ b/drivers/usb/cdns3/core.c
@@ -14,6 +14,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <stdio.h>
 #include <dm/device-internal.h>
 #include <dm/device_compat.h>
 #include <dm/devres.h>
diff --git a/drivers/usb/common/fsl-dt-fixup.c b/drivers/usb/common/fsl-dt-fixup.c
index bda8885d7cd3..b62b120d96f4 100644
--- a/drivers/usb/common/fsl-dt-fixup.c
+++ b/drivers/usb/common/fsl-dt-fixup.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <usb.h>
 #include <asm/io.h>
 #include <hwconfig.h>
diff --git a/drivers/usb/eth/asix.c b/drivers/usb/eth/asix.c
index c649813600b5..cbf2b12ffb07 100644
--- a/drivers/usb/eth/asix.c
+++ b/drivers/usb/eth/asix.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <log.h>
 #include <net.h>
+#include <stdio.h>
 #include <usb.h>
 #include <malloc.h>
 #include <memalign.h>
diff --git a/drivers/usb/eth/asix88179.c b/drivers/usb/eth/asix88179.c
index f26b47dcb6a3..fa983257f300 100644
--- a/drivers/usb/eth/asix88179.c
+++ b/drivers/usb/eth/asix88179.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <stdio.h>
 #include <usb.h>
 #include <net.h>
 #include <asm/u-boot.h>
diff --git a/drivers/usb/eth/lan7x.c b/drivers/usb/eth/lan7x.c
index b14836127835..d4fcda1ecd36 100644
--- a/drivers/usb/eth/lan7x.c
+++ b/drivers/usb/eth/lan7x.c
@@ -9,6 +9,7 @@
 #include <miiphy.h>
 #include <memalign.h>
 #include <net.h>
+#include <stdio.h>
 #include <usb.h>
 #include <linux/ethtool.h>
 #include <linux/mii.h>
diff --git a/drivers/usb/eth/lan7x.h b/drivers/usb/eth/lan7x.h
index f71e8c7268c6..feec7427a418 100644
--- a/drivers/usb/eth/lan7x.h
+++ b/drivers/usb/eth/lan7x.h
@@ -4,6 +4,7 @@
  */
 
 #include <console.h>
+#include <stdio.h>
 #include <time.h>
 #include <watchdog.h>
 #include <linux/bitops.h>
diff --git a/drivers/usb/eth/r8152.c b/drivers/usb/eth/r8152.c
index 0f37a5aaea56..d1b51201a35b 100644
--- a/drivers/usb/eth/r8152.c
+++ b/drivers/usb/eth/r8152.c
@@ -11,6 +11,7 @@
 #include <malloc.h>
 #include <memalign.h>
 #include <net.h>
+#include <stdio.h>
 #include <usb.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
diff --git a/drivers/usb/eth/smsc95xx.c b/drivers/usb/eth/smsc95xx.c
index f12e67bf238d..fb645f22e420 100644
--- a/drivers/usb/eth/smsc95xx.c
+++ b/drivers/usb/eth/smsc95xx.c
@@ -13,6 +13,7 @@
 #include <malloc.h>
 #include <memalign.h>
 #include <net.h>
+#include <stdio.h>
 #include <time.h>
 #include <usb.h>
 #include <asm/u-boot.h>
diff --git a/drivers/usb/eth/usb_ether.c b/drivers/usb/eth/usb_ether.c
index 91f34ab175de..097425b7afa2 100644
--- a/drivers/usb/eth/usb_ether.c
+++ b/drivers/usb/eth/usb_ether.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <net.h>
+#include <stdio.h>
 #include <usb.h>
 #include <asm/cache.h>
 #include <dm/device-internal.h>
diff --git a/drivers/usb/gadget/at91_udc.c b/drivers/usb/gadget/at91_udc.c
index 8674f3c9f4fa..64682355daa6 100644
--- a/drivers/usb/gadget/at91_udc.c
+++ b/drivers/usb/gadget/at91_udc.c
@@ -14,6 +14,7 @@
 #undef	PACKET_TRACE
 
 #include <common.h>
+#include <stdio.h>
 #include <dm/devres.h>
 #include <linux/bug.h>
 #include <linux/err.h>
diff --git a/drivers/usb/gadget/atmel_usba_udc.c b/drivers/usb/gadget/atmel_usba_udc.c
index 23e107b86214..a586e16347d0 100644
--- a/drivers/usb/gadget/atmel_usba_udc.c
+++ b/drivers/usb/gadget/atmel_usba_udc.c
@@ -8,6 +8,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
diff --git a/drivers/usb/gadget/ci_udc.c b/drivers/usb/gadget/ci_udc.c
index 98a88c102e9f..e119fd6a0337 100644
--- a/drivers/usb/gadget/ci_udc.c
+++ b/drivers/usb/gadget/ci_udc.c
@@ -13,6 +13,7 @@
 #include <cpu_func.h>
 #include <net.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/byteorder.h>
 #include <asm/cache.h>
 #include <linux/delay.h>
diff --git a/drivers/usb/gadget/dwc2_udc_otg.c b/drivers/usb/gadget/dwc2_udc_otg.c
index 8a5edc776ef1..867f31be7b49 100644
--- a/drivers/usb/gadget/dwc2_udc_otg.c
+++ b/drivers/usb/gadget/dwc2_udc_otg.c
@@ -24,6 +24,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <reset.h>
+#include <stdio.h>
 #include <dm/device_compat.h>
 #include <dm/devres.h>
 #include <linux/bug.h>
diff --git a/drivers/usb/gadget/dwc2_udc_otg_phy.c b/drivers/usb/gadget/dwc2_udc_otg_phy.c
index 7f8e9564b9e5..69d712282436 100644
--- a/drivers/usb/gadget/dwc2_udc_otg_phy.c
+++ b/drivers/usb/gadget/dwc2_udc_otg_phy.c
@@ -18,6 +18,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/list.h>
diff --git a/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c b/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c
index 80b7e519978d..84b46709a58a 100644
--- a/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c
+++ b/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c
@@ -20,6 +20,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <log.h>
+#include <stdio.h>
 #include <linux/bug.h>
 #include <linux/string.h>
 
diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c
index 4489db3613e1..927495d0b8d7 100644
--- a/drivers/usb/gadget/ether.c
+++ b/drivers/usb/gadget/ether.c
@@ -12,6 +12,7 @@
 #include <env.h>
 #include <log.h>
 #include <part.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
diff --git a/drivers/usb/gadget/f_dfu.c b/drivers/usb/gadget/f_dfu.c
index b7b1e0c1add9..43a342c5afed 100644
--- a/drivers/usb/gadget/f_dfu.c
+++ b/drivers/usb/gadget/f_dfu.c
@@ -19,6 +19,7 @@
 #include <common.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 #include <linux/usb/ch9.h>
diff --git a/drivers/usb/gadget/f_fastboot.c b/drivers/usb/gadget/f_fastboot.c
index e14262676f33..14a710a52384 100644
--- a/drivers/usb/gadget/f_fastboot.c
+++ b/drivers/usb/gadget/f_fastboot.c
@@ -17,6 +17,7 @@
 #include <fastboot.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include <linux/usb/ch9.h>
diff --git a/drivers/usb/gadget/f_mass_storage.c b/drivers/usb/gadget/f_mass_storage.c
index d87701b4a35a..a220d1517615 100644
--- a/drivers/usb/gadget/f_mass_storage.c
+++ b/drivers/usb/gadget/f_mass_storage.c
@@ -246,6 +246,7 @@
 #include <common.h>
 #include <console.h>
 #include <g_dnl.h>
+#include <stdio.h>
 #include <dm/devres.h>
 #include <linux/bug.h>
 #include <linux/string.h>
diff --git a/drivers/usb/gadget/f_rockusb.c b/drivers/usb/gadget/f_rockusb.c
index 2ff3c692edcc..1705b7a611a8 100644
--- a/drivers/usb/gadget/f_rockusb.c
+++ b/drivers/usb/gadget/f_rockusb.c
@@ -13,6 +13,7 @@
 #include <malloc.h>
 #include <memalign.h>
 #include <part.h>
+#include <stdio.h>
 #include <linux/string.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
diff --git a/drivers/usb/gadget/f_sdp.c b/drivers/usb/gadget/f_sdp.c
index 120aed4d95ec..34c393c9f047 100644
--- a/drivers/usb/gadget/f_sdp.c
+++ b/drivers/usb/gadget/f_sdp.c
@@ -22,6 +22,7 @@
 #include <env.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/usb/gadget/f_thor.c b/drivers/usb/gadget/f_thor.c
index 4758ccb7c460..11d703eb3320 100644
--- a/drivers/usb/gadget/f_thor.c
+++ b/drivers/usb/gadget/f_thor.c
@@ -22,6 +22,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <memalign.h>
+#include <stdio.h>
 #include <version.h>
 #include <linux/delay.h>
 #include <linux/printk.h>
diff --git a/drivers/usb/gadget/fotg210.c b/drivers/usb/gadget/fotg210.c
index 1c145eb428e8..ff9e98a7566d 100644
--- a/drivers/usb/gadget/fotg210.c
+++ b/drivers/usb/gadget/fotg210.c
@@ -13,6 +13,7 @@
 #include <log.h>
 #include <net.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/io.h>
 #include <linux/delay.h>
diff --git a/drivers/usb/gadget/g_dnl.c b/drivers/usb/gadget/g_dnl.c
index c6ecbb301929..cd4015f65a00 100644
--- a/drivers/usb/gadget/g_dnl.c
+++ b/drivers/usb/gadget/g_dnl.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 #include <mmc.h>
diff --git a/drivers/usb/gadget/pxa25x_udc.c b/drivers/usb/gadget/pxa25x_udc.c
index 4f4d2982f88f..22db49164da8 100644
--- a/drivers/usb/gadget/pxa25x_udc.c
+++ b/drivers/usb/gadget/pxa25x_udc.c
@@ -19,6 +19,7 @@
 #include <common.h>
 #include <errno.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/byteorder.h>
 #include <asm/system.h>
diff --git a/drivers/usb/gadget/udc/udc-core.c b/drivers/usb/gadget/udc/udc-core.c
index 7f73926cb3e1..13c42aabab33 100644
--- a/drivers/usb/gadget/udc/udc-core.c
+++ b/drivers/usb/gadget/udc/udc-core.c
@@ -13,6 +13,7 @@
  *		       usb_
  */
 
+#include <stdio.h>
 #include <dm/device_compat.h>
 #include <dm/devres.h>
 #include <linux/compat.h>
diff --git a/drivers/usb/host/dwc2.c b/drivers/usb/host/dwc2.c
index 7f04ea81bfcc..62eab821bb67 100644
--- a/drivers/usb/host/dwc2.c
+++ b/drivers/usb/host/dwc2.c
@@ -14,6 +14,7 @@
 #include <malloc.h>
 #include <memalign.h>
 #include <phys2bus.h>
+#include <stdio.h>
 #include <time.h>
 #include <usb.h>
 #include <usbroothubdes.h>
diff --git a/drivers/usb/host/ehci-faraday.c b/drivers/usb/host/ehci-faraday.c
index b61b5382df41..fe28aec8a85c 100644
--- a/drivers/usb/host/ehci-faraday.c
+++ b/drivers/usb/host/ehci-faraday.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <usb.h>
 #include <linux/delay.h>
diff --git a/drivers/usb/host/ehci-fsl.c b/drivers/usb/host/ehci-fsl.c
index 8c5403fbdb3d..45b82da4f4a7 100644
--- a/drivers/usb/host/ehci-fsl.c
+++ b/drivers/usb/host/ehci-fsl.c
@@ -11,6 +11,7 @@
 #include <env.h>
 #include <log.h>
 #include <pci.h>
+#include <stdio.h>
 #include <usb.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index 60e5f4e41bca..fe6459e4a314 100644
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -11,6 +11,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/byteorder.h>
 #include <asm/cache.h>
diff --git a/drivers/usb/host/ehci-msm.c b/drivers/usb/host/ehci-msm.c
index dd92808ff7b3..6492769b2a3e 100644
--- a/drivers/usb/host/ehci-msm.c
+++ b/drivers/usb/host/ehci-msm.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
+#include <stdio.h>
 #include <usb.h>
 #include <usb/ehci-ci.h>
 #include <usb/ulpi.h>
diff --git a/drivers/usb/host/ehci-mx5.c b/drivers/usb/host/ehci-mx5.c
index ca6cb6b645bb..709cb1cff54d 100644
--- a/drivers/usb/host/ehci-mx5.c
+++ b/drivers/usb/host/ehci-mx5.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <usb.h>
 #include <errno.h>
 #include <asm/global_data.h>
diff --git a/drivers/usb/host/ehci-mx6.c b/drivers/usb/host/ehci-mx6.c
index f9e72ba0d967..51723fca051a 100644
--- a/drivers/usb/host/ehci-mx6.c
+++ b/drivers/usb/host/ehci-mx6.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <usb.h>
 #include <errno.h>
 #include <wait_bit.h>
diff --git a/drivers/usb/host/ehci-mxs.c b/drivers/usb/host/ehci-mxs.c
index 824c620e6387..05c0f4a196ee 100644
--- a/drivers/usb/host/ehci-mxs.c
+++ b/drivers/usb/host/ehci-mxs.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
 #include <errno.h>
diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c
index 5aa9eb445afc..4d3b6527ac9a 100644
--- a/drivers/usb/host/ehci-omap.c
+++ b/drivers/usb/host/ehci-omap.c
@@ -12,6 +12,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <usb.h>
 #include <linux/delay.h>
diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c
index 7dd5c33c13df..d8dbd77114ac 100644
--- a/drivers/usb/host/ehci-pci.c
+++ b/drivers/usb/host/ehci-pci.c
@@ -10,6 +10,7 @@
 #include <init.h>
 #include <log.h>
 #include <pci.h>
+#include <stdio.h>
 #include <usb.h>
 #include <asm/io.h>
 
diff --git a/drivers/usb/host/ehci-rmobile.c b/drivers/usb/host/ehci-rmobile.c
index 130b73dfe49d..72ae211d6271 100644
--- a/drivers/usb/host/ehci-rmobile.c
+++ b/drivers/usb/host/ehci-rmobile.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/ehci-rmobile.h>
 #include <linux/delay.h>
diff --git a/drivers/usb/host/ehci-spear.c b/drivers/usb/host/ehci-spear.c
index 3e87e0c7fd8a..2e3ea349a726 100644
--- a/drivers/usb/host/ehci-spear.c
+++ b/drivers/usb/host/ehci-spear.c
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <usb.h>
 #include <linux/delay.h>
diff --git a/drivers/usb/host/ehci-tegra.c b/drivers/usb/host/ehci-tegra.c
index 3b9373f2cd64..d71e455446f1 100644
--- a/drivers/usb/host/ehci-tegra.c
+++ b/drivers/usb/host/ehci-tegra.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <stdio.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/io.h>
diff --git a/drivers/usb/host/ehci-zynq.c b/drivers/usb/host/ehci-zynq.c
index 939c30999eeb..6eef3814a149 100644
--- a/drivers/usb/host/ehci-zynq.c
+++ b/drivers/usb/host/ehci-zynq.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <stdio.h>
 #include <usb.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/sys_proto.h>
diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c
index 89592f0a1143..598567d60477 100644
--- a/drivers/usb/host/ohci-hcd.c
+++ b/drivers/usb/host/ohci-hcd.c
@@ -29,6 +29,7 @@
 
 #include <common.h>
 #include <cpu_func.h>
+#include <stdio.h>
 #include <asm/byteorder.h>
 #include <dm.h>
 #include <errno.h>
diff --git a/drivers/usb/host/r8a66597-hcd.c b/drivers/usb/host/r8a66597-hcd.c
index 339e260ea33c..7595813868c6 100644
--- a/drivers/usb/host/r8a66597-hcd.c
+++ b/drivers/usb/host/r8a66597-hcd.c
@@ -9,6 +9,7 @@
 #include <console.h>
 #include <dm.h>
 #include <log.h>
+#include <stdio.h>
 #include <usb.h>
 #include <asm/io.h>
 #include <dm/device_compat.h>
diff --git a/drivers/usb/host/sl811-hcd.c b/drivers/usb/host/sl811-hcd.c
index b33d7dc9ac49..c87b02f97471 100644
--- a/drivers/usb/host/sl811-hcd.c
+++ b/drivers/usb/host/sl811-hcd.c
@@ -20,6 +20,7 @@
 
 #include <common.h>
 #include <mpc8xx.h>
+#include <stdio.h>
 #include <time.h>
 #include <usb.h>
 #include <linux/delay.h>
diff --git a/drivers/usb/host/sl811.h b/drivers/usb/host/sl811.h
index c1f9f013bd1c..8eddb456194f 100644
--- a/drivers/usb/host/sl811.h
+++ b/drivers/usb/host/sl811.h
@@ -1,6 +1,7 @@
 #ifndef __UBOOT_SL811_H
 #define __UBOOT_SL811_H
 
+#include <stdio.h>
 #undef SL811_DEBUG
 
 #ifdef SL811_DEBUG
diff --git a/drivers/usb/host/usb-uclass.c b/drivers/usb/host/usb-uclass.c
index 6d772000cde6..eb03956e9105 100644
--- a/drivers/usb/host/usb-uclass.c
+++ b/drivers/usb/host/usb-uclass.c
@@ -11,6 +11,7 @@
 #include <errno.h>
 #include <log.h>
 #include <memalign.h>
+#include <stdio.h>
 #include <usb.h>
 #include <dm/device-internal.h>
 #include <dm/lists.h>
diff --git a/drivers/usb/host/xhci-dwc3.c b/drivers/usb/host/xhci-dwc3.c
index 44cb31c9c5fb..fdbf2c83b569 100644
--- a/drivers/usb/host/xhci-dwc3.c
+++ b/drivers/usb/host/xhci-dwc3.c
@@ -11,6 +11,7 @@
 #include <dm.h>
 #include <generic-phy.h>
 #include <log.h>
+#include <stdio.h>
 #include <usb.h>
 #include <dwc3-uboot.h>
 #include <linux/delay.h>
diff --git a/drivers/usb/host/xhci-exynos5.c b/drivers/usb/host/xhci-exynos5.c
index 77c2534da44c..ee61c88e2aa3 100644
--- a/drivers/usb/host/xhci-exynos5.c
+++ b/drivers/usb/host/xhci-exynos5.c
@@ -16,6 +16,7 @@
 #include <dm.h>
 #include <fdtdec.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
diff --git a/drivers/usb/host/xhci-fsl.c b/drivers/usb/host/xhci-fsl.c
index 0a2da70e2004..440f17f66d69 100644
--- a/drivers/usb/host/xhci-fsl.c
+++ b/drivers/usb/host/xhci-fsl.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <usb.h>
 #include <linux/errno.h>
 #include <linux/compat.h>
diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c
index f4518e3eac99..aa9063098c2a 100644
--- a/drivers/usb/host/xhci-mem.c
+++ b/drivers/usb/host/xhci-mem.c
@@ -17,6 +17,7 @@
 #include <cpu_func.h>
 #include <dm.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/byteorder.h>
 #include <usb.h>
 #include <malloc.h>
diff --git a/drivers/usb/host/xhci-mvebu.c b/drivers/usb/host/xhci-mvebu.c
index f2e338f6fbcb..32e00378ab70 100644
--- a/drivers/usb/host/xhci-mvebu.c
+++ b/drivers/usb/host/xhci-mvebu.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <fdtdec.h>
 #include <log.h>
+#include <stdio.h>
 #include <usb.h>
 #include <power/regulator.h>
 #include <asm/gpio.h>
diff --git a/drivers/usb/host/xhci-omap.c b/drivers/usb/host/xhci-omap.c
index 501129d769a2..00b7d8571d29 100644
--- a/drivers/usb/host/xhci-omap.c
+++ b/drivers/usb/host/xhci-omap.c
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <usb.h>
 #include <linux/errno.h>
 #include <asm/omap_common.h>
diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
index e3e8d09bf357..6a8f42a974a1 100644
--- a/drivers/usb/host/xhci-ring.c
+++ b/drivers/usb/host/xhci-ring.c
@@ -16,6 +16,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/byteorder.h>
 #include <usb.h>
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index 4c752f4ad0ef..4d9ba91da8ce 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -23,6 +23,7 @@
 #include <cpu_func.h>
 #include <dm.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/byteorder.h>
 #include <usb.h>
 #include <malloc.h>
diff --git a/drivers/usb/musb-new/mt85xx.c b/drivers/usb/musb-new/mt85xx.c
index f826b986ba78..78b4c93e8609 100644
--- a/drivers/usb/musb-new/mt85xx.c
+++ b/drivers/usb/musb-new/mt85xx.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <clk.h>
 #include <dm.h>
+#include <stdio.h>
 #include <dm/lists.h>
 #include <dm/root.h>
 #include <linux/delay.h>
diff --git a/drivers/usb/musb-new/musb_uboot.c b/drivers/usb/musb-new/musb_uboot.c
index 0d18ed919a02..233acc1ea1e5 100644
--- a/drivers/usb/musb-new/musb_uboot.c
+++ b/drivers/usb/musb-new/musb_uboot.c
@@ -2,6 +2,7 @@
 #include <console.h>
 #include <dm.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <time.h>
 #include <watchdog.h>
 #include <linux/delay.h>
diff --git a/drivers/usb/musb-new/pic32.c b/drivers/usb/musb-new/pic32.c
index ce8ec050025b..b3905660c797 100644
--- a/drivers/usb/musb-new/pic32.c
+++ b/drivers/usb/musb-new/pic32.c
@@ -11,6 +11,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
diff --git a/drivers/usb/musb-new/sunxi.c b/drivers/usb/musb-new/sunxi.c
index 082df93fdd85..20d968f8497e 100644
--- a/drivers/usb/musb-new/sunxi.c
+++ b/drivers/usb/musb-new/sunxi.c
@@ -23,6 +23,7 @@
 #include <malloc.h>
 #include <phy-sun4i-usb.h>
 #include <reset.h>
+#include <stdio.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/gpio.h>
diff --git a/drivers/usb/phy/twl4030.c b/drivers/usb/phy/twl4030.c
index 676868bead36..9bea192fccf0 100644
--- a/drivers/usb/phy/twl4030.c
+++ b/drivers/usb/phy/twl4030.c
@@ -23,6 +23,7 @@
  * ------------------------------------------------------------------------
  */
 
+#include <stdio.h>
 #include <twl4030.h>
 #include <linux/delay.h>
 
diff --git a/drivers/usb/ulpi/ulpi-viewport.c b/drivers/usb/ulpi/ulpi-viewport.c
index 3bb152be8939..5a7f034da1d7 100644
--- a/drivers/usb/ulpi/ulpi-viewport.c
+++ b/drivers/usb/ulpi/ulpi-viewport.c
@@ -14,6 +14,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <usb/ulpi.h>
diff --git a/drivers/usb/ulpi/ulpi.c b/drivers/usb/ulpi/ulpi.c
index dd0da0e841e5..d5045a17959f 100644
--- a/drivers/usb/ulpi/ulpi.c
+++ b/drivers/usb/ulpi/ulpi.c
@@ -22,6 +22,7 @@
 #include <common.h>
 #include <exports.h>
 #include <log.h>
+#include <stdio.h>
 #include <linux/delay.h>
 #include <usb/ulpi.h>
 
diff --git a/drivers/video/am335x-fb.c b/drivers/video/am335x-fb.c
index b381b147cddf..4e0d9c2b0981 100644
--- a/drivers/video/am335x-fb.c
+++ b/drivers/video/am335x-fb.c
@@ -15,6 +15,7 @@
 #include <dm.h>
 #include <lcd.h>
 #include <log.h>
+#include <stdio.h>
 #include <video.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/hardware.h>
diff --git a/drivers/video/anx9804.c b/drivers/video/anx9804.c
index b050c4292f64..648564bc3e17 100644
--- a/drivers/video/anx9804.c
+++ b/drivers/video/anx9804.c
@@ -11,6 +11,7 @@
 
 #include <common.h>
 #include <i2c.h>
+#include <stdio.h>
 #include <linux/delay.h>
 #include "anx98xx-edp.h"
 #include "anx9804.h"
diff --git a/drivers/video/ati_radeon_fb.c b/drivers/video/ati_radeon_fb.c
index c326722c5500..d7938ac2cbd4 100644
--- a/drivers/video/ati_radeon_fb.c
+++ b/drivers/video/ati_radeon_fb.c
@@ -16,6 +16,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 
diff --git a/drivers/video/ati_radeon_fb.h b/drivers/video/ati_radeon_fb.h
index 9dd638bb9e45..dde2067ef2ed 100644
--- a/drivers/video/ati_radeon_fb.h
+++ b/drivers/video/ati_radeon_fb.h
@@ -8,6 +8,7 @@
 /*
  * Chip families. Must fit in the low 16 bits of a long word
  */
+#include <stdio.h>
 enum radeon_family {
 	CHIP_FAMILY_UNKNOW,
 	CHIP_FAMILY_LEGACY,
diff --git a/drivers/video/atmel_hlcdfb.c b/drivers/video/atmel_hlcdfb.c
index bfe76349fda4..13dc28412c76 100644
--- a/drivers/video/atmel_hlcdfb.c
+++ b/drivers/video/atmel_hlcdfb.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <part.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/gpio.h>
diff --git a/drivers/video/broadwell_igd.c b/drivers/video/broadwell_igd.c
index 84b31025f742..7a282be660f9 100644
--- a/drivers/video/broadwell_igd.c
+++ b/drivers/video/broadwell_igd.c
@@ -11,6 +11,7 @@
 #include <dm.h>
 #include <init.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <vbe.h>
 #include <video.h>
diff --git a/drivers/video/bus_vcxk.c b/drivers/video/bus_vcxk.c
index 2a72d23eb87b..8f9b607099e1 100644
--- a/drivers/video/bus_vcxk.c
+++ b/drivers/video/bus_vcxk.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <bmp_layout.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/io.h>
 
 vu_char  *vcxk_bws      = ((vu_char *) (CONFIG_SYS_VCXK_BASE));
diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c
index bc1e999b7614..af92a83d6a0b 100644
--- a/drivers/video/cfb_console.c
+++ b/drivers/video/cfb_console.c
@@ -71,6 +71,7 @@
 #include <fdtdec.h>
 #include <gzip.h>
 #include <log.h>
+#include <stdio.h>
 #include <version.h>
 #include <malloc.h>
 #include <video.h>
diff --git a/drivers/video/coreboot.c b/drivers/video/coreboot.c
index c8797a0d9c45..6914162d3acf 100644
--- a/drivers/video/coreboot.c
+++ b/drivers/video/coreboot.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <stdio.h>
 #include <vbe.h>
 #include <video.h>
 #include <asm/arch/sysinfo.h>
diff --git a/drivers/video/da8xx-fb.c b/drivers/video/da8xx-fb.c
index 994b90a9665f..27234e7adee4 100644
--- a/drivers/video/da8xx-fb.c
+++ b/drivers/video/da8xx-fb.c
@@ -16,6 +16,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <memalign.h>
+#include <stdio.h>
 #include <video_fb.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
diff --git a/drivers/video/efi.c b/drivers/video/efi.c
index 47441a35a64f..489998f3625f 100644
--- a/drivers/video/efi.c
+++ b/drivers/video/efi.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <efi_api.h>
 #include <log.h>
+#include <stdio.h>
 #include <vbe.h>
 #include <video.h>
 
diff --git a/drivers/video/exynos/exynos_dp.c b/drivers/video/exynos/exynos_dp.c
index 71dae58f08b3..d63d9effb007 100644
--- a/drivers/video/exynos/exynos_dp.c
+++ b/drivers/video/exynos/exynos_dp.c
@@ -11,6 +11,7 @@
 #include <display.h>
 #include <fdtdec.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
diff --git a/drivers/video/exynos/exynos_dp_lowlevel.c b/drivers/video/exynos/exynos_dp_lowlevel.c
index ae500a702804..efa3b924af16 100644
--- a/drivers/video/exynos/exynos_dp_lowlevel.c
+++ b/drivers/video/exynos/exynos_dp_lowlevel.c
@@ -8,6 +8,7 @@
 #include <config.h>
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <asm/arch/cpu.h>
diff --git a/drivers/video/exynos/exynos_fb.c b/drivers/video/exynos/exynos_fb.c
index 26068ab056f2..42ec0494fa06 100644
--- a/drivers/video/exynos/exynos_fb.c
+++ b/drivers/video/exynos/exynos_fb.c
@@ -13,6 +13,7 @@
 #include <dm.h>
 #include <fdtdec.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/libfdt.h>
 #include <panel.h>
diff --git a/drivers/video/exynos/exynos_mipi_dsi.c b/drivers/video/exynos/exynos_mipi_dsi.c
index 376e6abf2cf6..1d5ed38bf44f 100644
--- a/drivers/video/exynos/exynos_mipi_dsi.c
+++ b/drivers/video/exynos/exynos_mipi_dsi.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <fdtdec.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <dm/devres.h>
 #include <linux/libfdt.h>
diff --git a/drivers/video/exynos/exynos_mipi_dsi_lowlevel.c b/drivers/video/exynos/exynos_mipi_dsi_lowlevel.c
index 8111acd9a0b5..d7a8db62fa92 100644
--- a/drivers/video/exynos/exynos_mipi_dsi_lowlevel.c
+++ b/drivers/video/exynos/exynos_mipi_dsi_lowlevel.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/arch/dsim.h>
 #include <asm/arch/mipi_dsim.h>
 #include <asm/arch/power.h>
diff --git a/drivers/video/formike.c b/drivers/video/formike.c
index 5cbe50d4cbd2..14c39b65f5c7 100644
--- a/drivers/video/formike.c
+++ b/drivers/video/formike.c
@@ -9,6 +9,7 @@
 #include <errno.h>
 #include <log.h>
 #include <spi.h>
+#include <stdio.h>
 #include <linux/delay.h>
 
 #define TAG_READ	0x80
diff --git a/drivers/video/fsl_dcu_fb.c b/drivers/video/fsl_dcu_fb.c
index bfa4ed3129b2..eaf4892b0484 100644
--- a/drivers/video/fsl_dcu_fb.c
+++ b/drivers/video/fsl_dcu_fb.c
@@ -7,6 +7,7 @@
  */
 
 #include <init.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/video/fsl_diu_fb.c b/drivers/video/fsl_diu_fb.c
index eb3f2393ec93..426418415afd 100644
--- a/drivers/video/fsl_diu_fb.c
+++ b/drivers/video/fsl_diu_fb.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/ppc.h>
 #include <linux/string.h>
diff --git a/drivers/video/hitachi_tx18d42vm_lcd.c b/drivers/video/hitachi_tx18d42vm_lcd.c
index c6c8df6a96e2..752bc62eb68a 100644
--- a/drivers/video/hitachi_tx18d42vm_lcd.c
+++ b/drivers/video/hitachi_tx18d42vm_lcd.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <linux/delay.h>
 
 #include <asm/gpio.h>
diff --git a/drivers/video/imx/ipu_common.c b/drivers/video/imx/ipu_common.c
index da7e5c851836..2d5f47ff4adc 100644
--- a/drivers/video/imx/ipu_common.c
+++ b/drivers/video/imx/ipu_common.c
@@ -13,6 +13,7 @@
 /* #define DEBUG */
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 #include <linux/types.h>
diff --git a/drivers/video/imx/ipu_disp.c b/drivers/video/imx/ipu_disp.c
index 45069897fafc..cc2c57553f6e 100644
--- a/drivers/video/imx/ipu_disp.c
+++ b/drivers/video/imx/ipu_disp.c
@@ -14,6 +14,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <linux/delay.h>
 #include <linux/types.h>
 #include <linux/errno.h>
diff --git a/drivers/video/imx/ipu_regs.h b/drivers/video/imx/ipu_regs.h
index deb44002d753..1e29f66e67b0 100644
--- a/drivers/video/imx/ipu_regs.h
+++ b/drivers/video/imx/ipu_regs.h
@@ -13,6 +13,7 @@
 #ifndef __IPU_REGS_INCLUDED__
 #define __IPU_REGS_INCLUDED__
 
+#include <stdio.h>
 #define IPU_DISP0_BASE		0x00000000
 #define IPU_MCU_T_DEFAULT	8
 #define IPU_DISP1_BASE		(IPU_MCU_T_DEFAULT << 25)
diff --git a/drivers/video/imx/mxc_ipuv3_fb.c b/drivers/video/imx/mxc_ipuv3_fb.c
index eb93a4f1fa9d..b06e9f29a56c 100644
--- a/drivers/video/imx/mxc_ipuv3_fb.c
+++ b/drivers/video/imx/mxc_ipuv3_fb.c
@@ -13,6 +13,7 @@
 #include <common.h>
 #include <log.h>
 #include <part.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <linux/errno.h>
 #include <asm/global_data.h>
diff --git a/drivers/video/ivybridge_igd.c b/drivers/video/ivybridge_igd.c
index cd742b2273cd..d4247ee6406d 100644
--- a/drivers/video/ivybridge_igd.c
+++ b/drivers/video/ivybridge_igd.c
@@ -10,6 +10,7 @@
 #include <fdtdec.h>
 #include <log.h>
 #include <pci_rom.h>
+#include <stdio.h>
 #include <vbe.h>
 #include <video.h>
 #include <asm/global_data.h>
diff --git a/drivers/video/lg4573.c b/drivers/video/lg4573.c
index 3e61f7f53ce0..f91ee7363f50 100644
--- a/drivers/video/lg4573.c
+++ b/drivers/video/lg4573.c
@@ -10,6 +10,7 @@
 #include <display.h>
 #include <dm.h>
 #include <log.h>
+#include <stdio.h>
 #include <dm/read.h>
 #include <dm/uclass-internal.h>
 #include <errno.h>
diff --git a/drivers/video/logicore_dp_tx.c b/drivers/video/logicore_dp_tx.c
index e752f457560c..45eba82c4095 100644
--- a/drivers/video/logicore_dp_tx.c
+++ b/drivers/video/logicore_dp_tx.c
@@ -14,6 +14,7 @@
 #include <display.h>
 #include <dm.h>
 #include <errno.h>
+#include <stdio.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 
diff --git a/drivers/video/mali_dp.c b/drivers/video/mali_dp.c
index e487d6742a12..778a9a917ddd 100644
--- a/drivers/video/mali_dp.c
+++ b/drivers/video/mali_dp.c
@@ -7,6 +7,7 @@
 #define DEBUG
 #include <common.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <video.h>
 #include <dm.h>
 #ifdef CONFIG_DISPLAY
diff --git a/drivers/video/mb862xx.c b/drivers/video/mb862xx.c
index 04e435f913c7..8b736f9e7375 100644
--- a/drivers/video/mb862xx.c
+++ b/drivers/video/mb862xx.c
@@ -10,6 +10,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <linux/delay.h>
 
 #include <asm/io.h>
diff --git a/drivers/video/meson/meson_vclk.c b/drivers/video/meson/meson_vclk.c
index e718a0074ed6..e096b437a384 100644
--- a/drivers/video/meson/meson_vclk.c
+++ b/drivers/video/meson/meson_vclk.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <dm.h>
 #include <edid.h>
+#include <stdio.h>
 #include <linux/bitops.h>
 #include <linux/printk.h>
 #include "meson_vpu.h"
diff --git a/drivers/video/mx3fb.c b/drivers/video/mx3fb.c
index 05b654291879..ff29773170b4 100644
--- a/drivers/video/mx3fb.c
+++ b/drivers/video/mx3fb.c
@@ -9,6 +9,7 @@
 #include <env.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <video_fb.h>
 #include <linux/delay.h>
 #include <linux/string.h>
diff --git a/drivers/video/mxsfb.c b/drivers/video/mxsfb.c
index 4bb817669f77..82a94507b2ea 100644
--- a/drivers/video/mxsfb.c
+++ b/drivers/video/mxsfb.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <env.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <dm/device_compat.h>
diff --git a/drivers/video/pxa_lcd.c b/drivers/video/pxa_lcd.c
index 67f5266164fa..79981e99707d 100644
--- a/drivers/video/pxa_lcd.c
+++ b/drivers/video/pxa_lcd.c
@@ -12,6 +12,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/arch/pxa-regs.h>
 #include <asm/io.h>
 #include <lcd.h>
diff --git a/drivers/video/rockchip/rk_edp.c b/drivers/video/rockchip/rk_edp.c
index b5fa492e2530..575aee1cdb19 100644
--- a/drivers/video/rockchip/rk_edp.c
+++ b/drivers/video/rockchip/rk_edp.c
@@ -13,6 +13,7 @@
 #include <malloc.h>
 #include <panel.h>
 #include <regmap.h>
+#include <stdio.h>
 #include <syscon.h>
 #include <time.h>
 #include <asm/gpio.h>
diff --git a/drivers/video/sandbox_sdl.c b/drivers/video/sandbox_sdl.c
index 48470e6f5567..898790c09d57 100644
--- a/drivers/video/sandbox_sdl.c
+++ b/drivers/video/sandbox_sdl.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <fdtdec.h>
 #include <log.h>
+#include <stdio.h>
 #include <video.h>
 #include <asm/global_data.h>
 #include <asm/sdl.h>
diff --git a/drivers/video/scf0403_lcd.c b/drivers/video/scf0403_lcd.c
index 54f0f88b4c90..dcf0504ae561 100644
--- a/drivers/video/scf0403_lcd.c
+++ b/drivers/video/scf0403_lcd.c
@@ -15,6 +15,7 @@
 
 #include <common.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/gpio.h>
 #include <spi.h>
 #include <linux/delay.h>
diff --git a/drivers/video/simplefb.c b/drivers/video/simplefb.c
index a45e9aa9e0f2..c545c79ced85 100644
--- a/drivers/video/simplefb.c
+++ b/drivers/video/simplefb.c
@@ -8,6 +8,7 @@
 #include <fdtdec.h>
 #include <fdt_support.h>
 #include <log.h>
+#include <stdio.h>
 #include <video.h>
 #include <asm/global_data.h>
 #include <linux/string.h>
diff --git a/drivers/video/ssd2828.c b/drivers/video/ssd2828.c
index 4cdcbe7755ae..84479b3ded90 100644
--- a/drivers/video/ssd2828.c
+++ b/drivers/video/ssd2828.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <malloc.h>
 #include <mipi_display.h>
+#include <stdio.h>
 #include <asm/arch/gpio.h>
 #include <asm/gpio.h>
 #include <linux/delay.h>
diff --git a/drivers/video/sunxi/sunxi_display.c b/drivers/video/sunxi/sunxi_display.c
index d1330314621c..07a63e7570ec 100644
--- a/drivers/video/sunxi/sunxi_display.c
+++ b/drivers/video/sunxi/sunxi_display.c
@@ -10,6 +10,7 @@
 #include <cpu_func.h>
 #include <efi_loader.h>
 #include <init.h>
+#include <stdio.h>
 #include <time.h>
 #include <linux/delay.h>
 #include <linux/string.h>
diff --git a/drivers/video/sunxi/sunxi_dw_hdmi.c b/drivers/video/sunxi/sunxi_dw_hdmi.c
index 01d4b7a11c96..418b429ce0e8 100644
--- a/drivers/video/sunxi/sunxi_dw_hdmi.c
+++ b/drivers/video/sunxi/sunxi_dw_hdmi.c
@@ -11,6 +11,7 @@
 #include <dw_hdmi.h>
 #include <edid.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
diff --git a/drivers/video/tda19988.c b/drivers/video/tda19988.c
index 191cda3ce763..48c291291923 100644
--- a/drivers/video/tda19988.c
+++ b/drivers/video/tda19988.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <display.h>
 #include <i2c.h>
+#include <stdio.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 
diff --git a/drivers/video/tegra.c b/drivers/video/tegra.c
index a32478ea6277..5e03aab67bb5 100644
--- a/drivers/video/tegra.c
+++ b/drivers/video/tegra.c
@@ -10,6 +10,7 @@
 #include <panel.h>
 #include <part.h>
 #include <pwm.h>
+#include <stdio.h>
 #include <video.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
diff --git a/drivers/video/tegra124/display.c b/drivers/video/tegra124/display.c
index 4f46b222b44c..1c47b133c856 100644
--- a/drivers/video/tegra124/display.c
+++ b/drivers/video/tegra124/display.c
@@ -15,6 +15,7 @@
 #include <lcd.h>
 #include <log.h>
 #include <part.h>
+#include <stdio.h>
 #include <time.h>
 #include <video.h>
 #include <asm/gpio.h>
diff --git a/drivers/video/tegra124/dp.c b/drivers/video/tegra124/dp.c
index 5fcb03835d11..9c5ce04c3760 100644
--- a/drivers/video/tegra124/dp.c
+++ b/drivers/video/tegra124/dp.c
@@ -10,6 +10,7 @@
 #include <div64.h>
 #include <errno.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <video_bridge.h>
 #include <asm/io.h>
diff --git a/drivers/video/tegra124/sor.c b/drivers/video/tegra124/sor.c
index 119219e18bb0..345974f465b4 100644
--- a/drivers/video/tegra124/sor.c
+++ b/drivers/video/tegra124/sor.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <panel.h>
+#include <stdio.h>
 #include <syscon.h>
 #include <time.h>
 #include <video_bridge.h>
diff --git a/drivers/video/video-uclass.c b/drivers/video/video-uclass.c
index 75a4ea17e36d..bb8555000a96 100644
--- a/drivers/video/video-uclass.c
+++ b/drivers/video/video-uclass.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <mapmem.h>
+#include <stdio.h>
 #include <stdio_dev.h>
 #include <time.h>
 #include <video.h>
diff --git a/drivers/video/video_bmp.c b/drivers/video/video_bmp.c
index 5a4d12c68d4e..802d84a88603 100644
--- a/drivers/video/video_bmp.c
+++ b/drivers/video/video_bmp.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <mapmem.h>
 #include <splash.h>
+#include <stdio.h>
 #include <video.h>
 #include <watchdog.h>
 #include <asm/unaligned.h>
diff --git a/drivers/video/videomodes.c b/drivers/video/videomodes.c
index 8d3aff1a14c1..f1781dbb6661 100644
--- a/drivers/video/videomodes.c
+++ b/drivers/video/videomodes.c
@@ -61,6 +61,7 @@
 #include <env.h>
 #include <errno.h>
 #include <fdtdec.h>
+#include <stdio.h>
 #include <linux/ctype.h>
 #include <linux/string.h>
 
diff --git a/drivers/virtio/virtio_pci_legacy.c b/drivers/virtio/virtio_pci_legacy.c
index fa7f2429f1f1..a617fffd7aa6 100644
--- a/drivers/virtio/virtio_pci_legacy.c
+++ b/drivers/virtio/virtio_pci_legacy.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <stdio.h>
 #include <virtio_types.h>
 #include <virtio.h>
 #include <virtio_ring.h>
diff --git a/drivers/virtio/virtio_pci_modern.c b/drivers/virtio/virtio_pci_modern.c
index 483525872dda..7a5926ebe640 100644
--- a/drivers/virtio/virtio_pci_modern.c
+++ b/drivers/virtio/virtio_pci_modern.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <stdio.h>
 #include <virtio_types.h>
 #include <virtio.h>
 #include <virtio_ring.h>
diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c
index dfd0ce8db63a..f058b2f8de8c 100644
--- a/drivers/virtio/virtio_ring.c
+++ b/drivers/virtio/virtio_ring.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <virtio_types.h>
 #include <virtio.h>
 #include <virtio_ring.h>
diff --git a/drivers/w1-eeprom/w1-eeprom-uclass.c b/drivers/w1-eeprom/w1-eeprom-uclass.c
index d515b4c53660..8a63f614c58d 100644
--- a/drivers/w1-eeprom/w1-eeprom-uclass.c
+++ b/drivers/w1-eeprom/w1-eeprom-uclass.c
@@ -13,6 +13,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <stdio.h>
 #include <w1.h>
 #include <w1-eeprom.h>
 
diff --git a/drivers/w1/w1-gpio.c b/drivers/w1/w1-gpio.c
index 45ad47a5d6bd..ba3dd688e6eb 100644
--- a/drivers/w1/w1-gpio.c
+++ b/drivers/w1/w1-gpio.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <stdio.h>
 #include <w1.h>
 #include <linux/delay.h>
 
diff --git a/drivers/w1/w1-uclass.c b/drivers/w1/w1-uclass.c
index 9478c93e9b0c..61887bee1dea 100644
--- a/drivers/w1/w1-uclass.c
+++ b/drivers/w1/w1-uclass.c
@@ -13,6 +13,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <stdio.h>
 #include <w1.h>
 #include <w1-eeprom.h>
 
diff --git a/drivers/watchdog/at91sam9_wdt.c b/drivers/watchdog/at91sam9_wdt.c
index e64831132dc7..a5cbc4309cc3 100644
--- a/drivers/watchdog/at91sam9_wdt.c
+++ b/drivers/watchdog/at91sam9_wdt.c
@@ -15,6 +15,7 @@
  */
 
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/at91_wdt.h>
diff --git a/drivers/watchdog/ftwdt010_wdt.c b/drivers/watchdog/ftwdt010_wdt.c
index 6aed41642de5..c46e610577e0 100644
--- a/drivers/watchdog/ftwdt010_wdt.c
+++ b/drivers/watchdog/ftwdt010_wdt.c
@@ -15,6 +15,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdio.h>
 #include <watchdog.h>
 #include <asm/io.h>
 #include <faraday/ftwdt010_wdt.h>
diff --git a/drivers/watchdog/wdt-uclass.c b/drivers/watchdog/wdt-uclass.c
index 28f7918c4673..0ef303f1f2d1 100644
--- a/drivers/watchdog/wdt-uclass.c
+++ b/drivers/watchdog/wdt-uclass.c
@@ -8,6 +8,7 @@
 #include <errno.h>
 #include <hang.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <wdt.h>
 #include <asm/global_data.h>
diff --git a/env/common.c b/env/common.c
index 1918bfa47ff3..4df445eb2c4f 100644
--- a/env/common.c
+++ b/env/common.c
@@ -14,6 +14,7 @@
 #include <env_internal.h>
 #include <log.h>
 #include <sort.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/printk.h>
 #include <linux/stddef.h>
diff --git a/env/env.c b/env/env.c
index 51f55ec3fe87..c289af4c6a44 100644
--- a/env/env.c
+++ b/env/env.c
@@ -8,6 +8,7 @@
 #include <env.h>
 #include <env_internal.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/bug.h>
diff --git a/env/ext4.c b/env/ext4.c
index 03f8e4e027bb..a51c7c6eff38 100644
--- a/env/ext4.c
+++ b/env/ext4.c
@@ -20,6 +20,7 @@
 
 #include <common.h>
 #include <part.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 #include <command.h>
diff --git a/env/fat.c b/env/fat.c
index adc5e9259c24..e95af7e19d34 100644
--- a/env/fat.c
+++ b/env/fat.c
@@ -17,6 +17,7 @@
 #include <errno.h>
 #include <fat.h>
 #include <mmc.h>
+#include <stdio.h>
 #include <asm/cache.h>
 #include <linux/stddef.h>
 #include <linux/string.h>
diff --git a/env/flash.c b/env/flash.c
index 6fb9ba7edefe..7e355d227267 100644
--- a/env/flash.c
+++ b/env/flash.c
@@ -15,6 +15,7 @@
 #include <env_internal.h>
 #include <flash.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/stddef.h>
 #include <malloc.h>
diff --git a/env/mmc.c b/env/mmc.c
index 9c28141858f7..21d3c54d85d6 100644
--- a/env/mmc.c
+++ b/env/mmc.c
@@ -6,6 +6,7 @@
 /* #define DEBUG */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/string.h>
 
diff --git a/env/nand.c b/env/nand.c
index be82e97d69cd..e8d226ee7153 100644
--- a/env/nand.c
+++ b/env/nand.c
@@ -17,6 +17,7 @@
 #include <command.h>
 #include <env.h>
 #include <env_internal.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/stddef.h>
 #include <malloc.h>
diff --git a/env/onenand.c b/env/onenand.c
index c8da3ff8114b..8ef4ca7535eb 100644
--- a/env/onenand.c
+++ b/env/onenand.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <command.h>
 #include <env_internal.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/stddef.h>
 #include <malloc.h>
diff --git a/env/remote.c b/env/remote.c
index 166bebf52b5b..131ac83584fc 100644
--- a/env/remote.c
+++ b/env/remote.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <command.h>
 #include <env_internal.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/stddef.h>
 #include <u-boot/crc.h>
diff --git a/env/sata.c b/env/sata.c
index 9442cfcaf3ca..d88771b27e21 100644
--- a/env/sata.c
+++ b/env/sata.c
@@ -6,6 +6,7 @@
 /* #define DEBUG */
 
 #include <common.h>
+#include <stdio.h>
 
 #include <command.h>
 #include <env.h>
diff --git a/env/sf.c b/env/sf.c
index f01d1dbcb216..077d82f8e77f 100644
--- a/env/sf.c
+++ b/env/sf.c
@@ -18,6 +18,7 @@
 #include <spi_flash.h>
 #include <search.h>
 #include <errno.h>
+#include <stdio.h>
 #include <uuid.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
diff --git a/env/ubi.c b/env/ubi.c
index f1e9d42dbf46..12495776609b 100644
--- a/env/ubi.c
+++ b/env/ubi.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/string.h>
 
diff --git a/examples/api/demo.c b/examples/api/demo.c
index 789847c401ea..ce1e07bf4857 100644
--- a/examples/api/demo.c
+++ b/examples/api/demo.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <env.h>
+#include <stdio.h>
 #include <linux/string.h>
 #include <linux/types.h>
 #include <api_public.h>
diff --git a/examples/api/libgenwrap.c b/examples/api/libgenwrap.c
index 3aa222866ff5..b69ce054ab2e 100644
--- a/examples/api/libgenwrap.c
+++ b/examples/api/libgenwrap.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <command.h>
 #include <hang.h>
+#include <stdio.h>
 #include <linux/delay.h>
 #include <linux/types.h>
 #include <api_public.h>
diff --git a/examples/standalone/atmel_df_pow2.c b/examples/standalone/atmel_df_pow2.c
index 271561d7d96f..1d32aa90342a 100644
--- a/examples/standalone/atmel_df_pow2.c
+++ b/examples/standalone/atmel_df_pow2.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <exports.h>
 #include <spi.h>
+#include <stdio.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 
diff --git a/examples/standalone/hello_world.c b/examples/standalone/hello_world.c
index 263cd9ca079d..64f2d950be41 100644
--- a/examples/standalone/hello_world.c
+++ b/examples/standalone/hello_world.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <exports.h>
+#include <stdio.h>
 
 int hello_world(int argc, char *const argv[])
 {
diff --git a/examples/standalone/sched.c b/examples/standalone/sched.c
index 1c5296071322..0d734e7c9df5 100644
--- a/examples/standalone/sched.c
+++ b/examples/standalone/sched.c
@@ -2,6 +2,7 @@
 
 #include <common.h>
 #include <exports.h>
+#include <stdio.h>
 
 /*
  * Author: Arun Dharankar <ADharankar@ATTBI.Com>
diff --git a/fs/btrfs/dir-item.c b/fs/btrfs/dir-item.c
index 63b5bf0a860f..9ce2979a758d 100644
--- a/fs/btrfs/dir-item.c
+++ b/fs/btrfs/dir-item.c
@@ -6,6 +6,7 @@
  */
 
 #include "btrfs.h"
+#include <stdio.h>
 
 static int verify_dir_item(struct btrfs_dir_item *item, u32 start, u32 total)
 {
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 991c2f68c3b7..f1e185b2a9ea 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -7,6 +7,7 @@
 
 #include "btrfs.h"
 #include <malloc.h>
+#include <stdio.h>
 
 u64 btrfs_lookup_inode_ref(struct btrfs_root *root, u64 inr,
 			   struct btrfs_inode_ref *refp, char *name)
diff --git a/fs/btrfs/root.c b/fs/btrfs/root.c
index 127b67fd1c89..2c3025069533 100644
--- a/fs/btrfs/root.c
+++ b/fs/btrfs/root.c
@@ -6,6 +6,7 @@
  */
 
 #include "btrfs.h"
+#include <stdio.h>
 
 static void read_root_item(struct btrfs_path *p, struct btrfs_root_item *item)
 {
diff --git a/fs/btrfs/subvolume.c b/fs/btrfs/subvolume.c
index 06e54f331098..72f9b01d3b3c 100644
--- a/fs/btrfs/subvolume.c
+++ b/fs/btrfs/subvolume.c
@@ -7,6 +7,7 @@
 
 #include "btrfs.h"
 #include <malloc.h>
+#include <stdio.h>
 
 static int get_subvol_name(u64 subvolid, char *name, int max_len)
 {
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index 477a4ab81733..0b6def086ea2 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <memalign.h>
 #include <part.h>
+#include <stdio.h>
 #include <linux/compat.h>
 #include <linux/string.h>
 #include "btrfs.h"
diff --git a/fs/cramfs/uncompress.c b/fs/cramfs/uncompress.c
index f431cc46c1f7..a30747f8501e 100644
--- a/fs/cramfs/uncompress.c
+++ b/fs/cramfs/uncompress.c
@@ -22,6 +22,7 @@
 
 #include <common.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <watchdog.h>
 #include <u-boot/zlib.h>
 
diff --git a/fs/ext4/ext4_common.c b/fs/ext4/ext4_common.c
index 8022d7376348..a6fbd5a971d7 100644
--- a/fs/ext4/ext4_common.c
+++ b/fs/ext4/ext4_common.c
@@ -27,6 +27,7 @@
 #include <memalign.h>
 #include <part.h>
 #include <stddef.h>
+#include <stdio.h>
 #include <linux/stat.h>
 #include <linux/string.h>
 #include <linux/time.h>
diff --git a/fs/ext4/ext4_journal.c b/fs/ext4/ext4_journal.c
index 82af0784bd85..9f1eb6ad9d1e 100644
--- a/fs/ext4/ext4_journal.c
+++ b/fs/ext4/ext4_journal.c
@@ -19,6 +19,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <ext_common.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/string.h>
 #include "ext4_common.h"
diff --git a/fs/ext4/ext4_write.c b/fs/ext4/ext4_write.c
index 7c04c5d3dd62..22bb845f8bf0 100644
--- a/fs/ext4/ext4_write.c
+++ b/fs/ext4/ext4_write.c
@@ -27,6 +27,7 @@
 #include <malloc.h>
 #include <memalign.h>
 #include <part.h>
+#include <stdio.h>
 #include <linux/stat.h>
 #include <div64.h>
 #include <linux/string.h>
diff --git a/fs/ext4/ext4fs.c b/fs/ext4/ext4fs.c
index 44df0f4a4ad8..c004d5facbb2 100644
--- a/fs/ext4/ext4fs.c
+++ b/fs/ext4/ext4fs.c
@@ -27,6 +27,7 @@
 #include <div64.h>
 #include <malloc.h>
 #include <part.h>
+#include <stdio.h>
 #include <uuid.h>
 #include <linux/string.h>
 #include "ext4_common.h"
diff --git a/fs/fat/fat.c b/fs/fat/fat.c
index dfcc4455830e..a16896c8e087 100644
--- a/fs/fat/fat.c
+++ b/fs/fat/fat.c
@@ -15,6 +15,7 @@
 #include <fat.h>
 #include <fs.h>
 #include <log.h>
+#include <stdio.h>
 #include <asm/byteorder.h>
 #include <part.h>
 #include <malloc.h>
diff --git a/fs/fat/fat_write.c b/fs/fat/fat_write.c
index 9facf7609f2e..bdc604038ad5 100644
--- a/fs/fat/fat_write.c
+++ b/fs/fat/fat_write.c
@@ -11,6 +11,7 @@
 #include <fat.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/byteorder.h>
 #include <part.h>
 #include <asm/cache.h>
diff --git a/fs/fs.c b/fs/fs.c
index 047390227738..cd3bae21e1fd 100644
--- a/fs/fs.c
+++ b/fs/fs.c
@@ -17,6 +17,7 @@
 #include <fat.h>
 #include <fs.h>
 #include <sandboxfs.h>
+#include <stdio.h>
 #include <time.h>
 #include <ubifs_uboot.h>
 #include <btrfs.h>
diff --git a/fs/fs_internal.c b/fs/fs_internal.c
index 55d6d26ba5fa..37223573a7c6 100644
--- a/fs/fs_internal.c
+++ b/fs/fs_internal.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <part.h>
 #include <memalign.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 int fs_devread(struct blk_desc *blk, struct disk_partition *partition,
diff --git a/fs/jffs2/jffs2_1pass.c b/fs/jffs2/jffs2_1pass.c
index c5b142973985..af3a0fc48aaa 100644
--- a/fs/jffs2/jffs2_1pass.c
+++ b/fs/jffs2/jffs2_1pass.c
@@ -116,6 +116,7 @@
 #include <flash.h>
 #include <malloc.h>
 #include <div64.h>
+#include <stdio.h>
 #include <linux/compiler.h>
 #include <linux/stat.h>
 #include <linux/string.h>
diff --git a/fs/reiserfs/reiserfs.c b/fs/reiserfs/reiserfs.c
index cf053e12d948..37068e295b35 100644
--- a/fs/reiserfs/reiserfs.c
+++ b/fs/reiserfs/reiserfs.c
@@ -17,6 +17,7 @@
 
 #include <common.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <linux/ctype.h>
 #include <linux/string.h>
 #include <linux/time.h>
diff --git a/fs/sandbox/sandboxfs.c b/fs/sandbox/sandboxfs.c
index 4ae41d5b4db1..59e18d0c049b 100644
--- a/fs/sandbox/sandboxfs.c
+++ b/fs/sandbox/sandboxfs.c
@@ -8,6 +8,7 @@
 #include <malloc.h>
 #include <os.h>
 #include <sandboxfs.h>
+#include <stdio.h>
 
 int sandbox_fs_set_blk_dev(struct blk_desc *rbdd, struct disk_partition *info)
 {
diff --git a/fs/squashfs/sqfs_filesystem.h b/fs/squashfs/sqfs_filesystem.h
index d63e3a41adf5..fbd3b3eb59c2 100644
--- a/fs/squashfs/sqfs_filesystem.h
+++ b/fs/squashfs/sqfs_filesystem.h
@@ -10,6 +10,7 @@
 
 #include <asm/unaligned.h>
 #include <stdint.h>
+#include <stdbool.h>
 #include <fs.h>
 
 #define SQFS_UNCOMPRESSED_DATA 0x0002
diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c
index 1ce46ef542d5..ebb0d1c1571f 100644
--- a/fs/ubifs/super.c
+++ b/fs/ubifs/super.c
@@ -32,6 +32,7 @@
 #include <common.h>
 #include <malloc.h>
 #include <memalign.h>
+#include <stdio.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 76ea7a8031e1..deb2d21b0a24 100644
--- a/fs/ubifs/ubifs.c
+++ b/fs/ubifs/ubifs.c
@@ -17,6 +17,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <memalign.h>
+#include <stdio.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 3528a70dc054..91ed09888e7c 100644
--- a/fs/yaffs2/yaffs_uboot_glue.c
+++ b/fs/yaffs2/yaffs_uboot_glue.c
@@ -22,6 +22,7 @@
 #include <common.h>
 #include <div64.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/fs/yaffs2/yaffsfs.c b/fs/yaffs2/yaffsfs.c
index 2643cc51057a..5bf9350c8225 100644
--- a/fs/yaffs2/yaffsfs.c
+++ b/fs/yaffs2/yaffsfs.c
@@ -12,6 +12,7 @@
  */
 
 #include <div64.h>
+#include <stdio.h>
 #include <linux/string.h>
 #include "yaffsfs.h"
 #include "yaffs_guts.h"
diff --git a/fs/yaffs2/ydirectenv.h b/fs/yaffs2/ydirectenv.h
index a68c76378673..cad7a35a4e50 100644
--- a/fs/yaffs2/ydirectenv.h
+++ b/fs/yaffs2/ydirectenv.h
@@ -22,6 +22,7 @@
 
 #include <common.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <linux/compat.h>
 #include <linux/string.h>
 
diff --git a/fs/zfs/zfs.c b/fs/zfs/zfs.c
index 8958a2562277..b63022aae32d 100644
--- a/fs/zfs/zfs.c
+++ b/fs/zfs/zfs.c
@@ -13,6 +13,7 @@
 #include <common.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <linux/stat.h>
 #include <linux/string.h>
 #include <linux/time.h>
diff --git a/fs/zfs/zfs_lzjb.c b/fs/zfs/zfs_lzjb.c
index b42d4980129f..c2a9ae1ddeff 100644
--- a/fs/zfs/zfs_lzjb.c
+++ b/fs/zfs/zfs_lzjb.c
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <linux/stat.h>
 #include <linux/time.h>
 #include <linux/ctype.h>
diff --git a/include/bootcount.h b/include/bootcount.h
index bb235407e301..a3ce40948540 100644
--- a/include/bootcount.h
+++ b/include/bootcount.h
@@ -7,6 +7,7 @@
 #define _BOOTCOUNT_H__
 
 #include <common.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/byteorder.h>
diff --git a/include/common.h b/include/common.h
index 6407748e53d6..33171360ddb0 100644
--- a/include/common.h
+++ b/include/common.h
@@ -17,7 +17,6 @@
 #include <errno.h>
 #include <linux/types.h>
 #include <stdarg.h>
-#include <stdio.h>
 #include <linux/kernel.h>
 #include <vsprintf.h>
 #endif	/* __ASSEMBLY__ */
diff --git a/include/dfu.h b/include/dfu.h
index 6fa450593605..436057e378ed 100644
--- a/include/dfu.h
+++ b/include/dfu.h
@@ -11,6 +11,7 @@
 #define __DFU_ENTITY_H_
 
 #include <common.h>
+#include <stdio.h>
 #include <linux/list.h>
 #include <mmc.h>
 #include <spi_flash.h>
diff --git a/include/exports.h b/include/exports.h
index 902f8b559b23..5e10fc3bce53 100644
--- a/include/exports.h
+++ b/include/exports.h
@@ -2,6 +2,7 @@
 #define __EXPORTS_H__
 
 #include <irq_func.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
diff --git a/include/i2c.h b/include/i2c.h
index 1d792db454a1..7ea6b9a14cbc 100644
--- a/include/i2c.h
+++ b/include/i2c.h
@@ -17,6 +17,7 @@
 #define _I2C_H_
 
 #include <linker_lists.h>
+#include <stdio.h>
 
 /*
  * For now there are essentially two parts to this file - driver model
diff --git a/include/initcall.h b/include/initcall.h
index 41b74dc52d2f..63098644cd34 100644
--- a/include/initcall.h
+++ b/include/initcall.h
@@ -12,6 +12,7 @@ typedef int (*init_fnc_t)(void);
 #ifdef CONFIG_EFI_APP
 #include <efi.h>
 #endif
+#include <stdio.h>
 
 /*
  * To enable debugging. add #define DEBUG at the top of the including file.
diff --git a/include/spi_flash.h b/include/spi_flash.h
index d9eb9cb3eeb7..e555495da610 100644
--- a/include/spi_flash.h
+++ b/include/spi_flash.h
@@ -9,6 +9,7 @@
 #ifndef _SPI_FLASH_H_
 #define _SPI_FLASH_H_
 
+#include <stdio.h>
 #include <linux/string.h>
 #include <linux/types.h>
 #include <linux/mtd/spi-nor.h>
diff --git a/include/wait_bit.h b/include/wait_bit.h
index dc2ffeb2c249..a9bf4d90a8f9 100644
--- a/include/wait_bit.h
+++ b/include/wait_bit.h
@@ -10,6 +10,7 @@
 
 #include <console.h>
 #include <log.h>
+#include <stdio.h>
 #include <time.h>
 #include <watchdog.h>
 #include <linux/delay.h>
diff --git a/lib/aes.c b/lib/aes.c
index ab1f8d67a53f..204431bcf77c 100644
--- a/lib/aes.c
+++ b/lib/aes.c
@@ -25,6 +25,7 @@
 #include <common.h>
 #include <display_options.h>
 #include <log.h>
+#include <stdio.h>
 #include <linux/string.h>
 #else
 #include <string.h>
diff --git a/lib/aes/aes-decrypt.c b/lib/aes/aes-decrypt.c
index 06b5e0274094..09fdf38df63a 100644
--- a/lib/aes/aes-decrypt.c
+++ b/lib/aes/aes-decrypt.c
@@ -6,6 +6,7 @@
 #ifndef USE_HOSTCC
 #include <common.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <linux/string.h>
 #endif
 #include <image.h>
diff --git a/lib/bzip2/bzlib.c b/lib/bzip2/bzlib.c
index 010ff4d73314..3051b7eb1a5a 100644
--- a/lib/bzip2/bzlib.c
+++ b/lib/bzip2/bzlib.c
@@ -1,6 +1,7 @@
 #include <config.h>
 #include <common.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <watchdog.h>
 #include <linux/string.h>
 
diff --git a/lib/charset.c b/lib/charset.c
index 55a487253fa9..b69e111918a4 100644
--- a/lib/charset.c
+++ b/lib/charset.c
@@ -9,6 +9,7 @@
 #include <charset.h>
 #include <capitalization.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 static struct capitalization_table capitalization_table[] =
diff --git a/lib/dhry/cmd_dhry.c b/lib/dhry/cmd_dhry.c
index bbb02d4ad9ba..ec4b511d492f 100644
--- a/lib/dhry/cmd_dhry.c
+++ b/lib/dhry/cmd_dhry.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <command.h>
 #include <div64.h>
+#include <stdio.h>
 #include <time.h>
 #include "dhry.h"
 
diff --git a/lib/dhry/dhry_1.c b/lib/dhry/dhry_1.c
index b36c1672b4a3..3636097ba080 100644
--- a/lib/dhry/dhry_1.c
+++ b/lib/dhry/dhry_1.c
@@ -44,6 +44,7 @@ char SCCSid[] = "@(#) @(#)dhry_1.c:3.4 -- 5/15/91 19:30:21";
 
 #include <common.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <string.h>
 
 #include "dhry.h"
diff --git a/lib/display_options.c b/lib/display_options.c
index 90e8ce547836..14cb3cff0551 100644
--- a/lib/display_options.c
+++ b/lib/display_options.c
@@ -9,6 +9,7 @@
 #include <console.h>
 #include <display_options.h>
 #include <div64.h>
+#include <stdio.h>
 #include <version.h>
 #include <linux/ctype.h>
 #include <asm/io.h>
diff --git a/lib/efi/efi_app.c b/lib/efi/efi_app.c
index 878c1cd6e5cd..c1796f83a59a 100644
--- a/lib/efi/efi_app.c
+++ b/lib/efi/efi_app.c
@@ -15,6 +15,7 @@
 #include <errno.h>
 #include <init.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/err.h>
 #include <linux/string.h>
diff --git a/lib/efi/efi_stub.c b/lib/efi/efi_stub.c
index b19e6d21a799..97a709904dfb 100644
--- a/lib/efi/efi_stub.c
+++ b/lib/efi/efi_stub.c
@@ -16,6 +16,7 @@
 #include <errno.h>
 #include <malloc.h>
 #include <ns16550.h>
+#include <stdio.h>
 #include <asm/cpu.h>
 #include <asm/io.h>
 #include <linux/err.h>
diff --git a/lib/efi_driver/efi_uclass.c b/lib/efi_driver/efi_uclass.c
index 0cf74b0361db..36e7d943a38d 100644
--- a/lib/efi_driver/efi_uclass.c
+++ b/lib/efi_driver/efi_uclass.c
@@ -22,6 +22,7 @@
 #include <efi_driver.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 
 /**
  * check_node_type() - check node type
diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c
index b39ca817dde5..8b057ef18902 100644
--- a/lib/efi_loader/efi_boottime.c
+++ b/lib/efi_loader/efi_boottime.c
@@ -11,6 +11,7 @@
 #include <irq_func.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/global_data.h>
 #include <linux/libfdt_env.h>
diff --git a/lib/efi_loader/efi_console.c b/lib/efi_loader/efi_console.c
index 48c7940e5bfe..088e3eacb829 100644
--- a/lib/efi_loader/efi_console.c
+++ b/lib/efi_loader/efi_console.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <charset.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <time.h>
 #include <dm/device.h>
 #include <efi_loader.h>
diff --git a/lib/efi_loader/efi_file.c b/lib/efi_loader/efi_file.c
index 5954397e4daf..0226e65ef54c 100644
--- a/lib/efi_loader/efi_file.c
+++ b/lib/efi_loader/efi_file.c
@@ -13,6 +13,7 @@
 #include <mapmem.h>
 #include <fs.h>
 #include <part.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 /* GUID for file system information */
diff --git a/lib/efi_loader/efi_gop.c b/lib/efi_loader/efi_gop.c
index c26493af6ca0..44ffed05c69f 100644
--- a/lib/efi_loader/efi_gop.c
+++ b/lib/efi_loader/efi_gop.c
@@ -11,6 +11,7 @@
 #include <lcd.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <video.h>
 #include <asm/global_data.h>
 #include <linux/string.h>
diff --git a/lib/efi_loader/efi_image_loader.c b/lib/efi_loader/efi_image_loader.c
index 79338e9a61d3..ba9a4a3505fc 100644
--- a/lib/efi_loader/efi_image_loader.c
+++ b/lib/efi_loader/efi_image_loader.c
@@ -13,6 +13,7 @@
 #include <malloc.h>
 #include <pe.h>
 #include <sort.h>
+#include <stdio.h>
 #include <crypto/pkcs7_parser.h>
 #include <linux/err.h>
 #include <linux/string.h>
diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c
index 302bbcda887a..169f239de8eb 100644
--- a/lib/efi_loader/efi_memory.c
+++ b/lib/efi_loader/efi_memory.c
@@ -10,6 +10,7 @@
 #include <init.h>
 #include <malloc.h>
 #include <mapmem.h>
+#include <stdio.h>
 #include <watchdog.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
diff --git a/lib/efi_loader/efi_net.c b/lib/efi_loader/efi_net.c
index b056e08b3ecd..51c1bd2f6065 100644
--- a/lib/efi_loader/efi_net.c
+++ b/lib/efi_loader/efi_net.c
@@ -19,6 +19,7 @@
 #include <efi_loader.h>
 #include <malloc.h>
 #include <net.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 static const efi_guid_t efi_net_guid = EFI_SIMPLE_NETWORK_PROTOCOL_GUID;
diff --git a/lib/efi_loader/efi_runtime.c b/lib/efi_loader/efi_runtime.c
index ddc6e6a4cdee..5b6ab297cbb7 100644
--- a/lib/efi_loader/efi_runtime.c
+++ b/lib/efi_loader/efi_runtime.c
@@ -14,6 +14,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <rtc.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
diff --git a/lib/efi_loader/efi_setup.c b/lib/efi_loader/efi_setup.c
index 51fc48b780bc..d675b96e64f6 100644
--- a/lib/efi_loader/efi_setup.c
+++ b/lib/efi_loader/efi_setup.c
@@ -9,6 +9,7 @@
 #include <bootm.h>
 #include <efi_loader.h>
 #include <efi_variable.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 #define OBJ_LIST_NOT_INITIALIZED 1
diff --git a/lib/efi_loader/efi_var_common.c b/lib/efi_loader/efi_var_common.c
index 1c7459266a38..36860e66e895 100644
--- a/lib/efi_loader/efi_var_common.c
+++ b/lib/efi_loader/efi_var_common.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <efi_loader.h>
 #include <efi_variable.h>
+#include <stdio.h>
 
 enum efi_secure_mode {
 	EFI_MODE_SETUP,
diff --git a/lib/efi_loader/efi_watchdog.c b/lib/efi_loader/efi_watchdog.c
index 61ea0f79260a..4d097929e83e 100644
--- a/lib/efi_loader/efi_watchdog.c
+++ b/lib/efi_loader/efi_watchdog.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <efi_loader.h>
+#include <stdio.h>
 
 /* Conversion factor from seconds to multiples of 100ns */
 #define EFI_SECONDS_TO_100NS 10000000ULL
diff --git a/lib/efi_selftest/efi_selftest_devicepath_util.c b/lib/efi_selftest/efi_selftest_devicepath_util.c
index c846e057d353..c82b37258323 100644
--- a/lib/efi_selftest/efi_selftest_devicepath_util.c
+++ b/lib/efi_selftest/efi_selftest_devicepath_util.c
@@ -8,6 +8,7 @@
  */
 
 #include <efi_selftest.h>
+#include <stdio.h>
 
 static struct efi_boot_services *boottime;
 
diff --git a/lib/efi_selftest/efi_selftest_fdt.c b/lib/efi_selftest/efi_selftest_fdt.c
index 94d72d3f6d85..db94bef08038 100644
--- a/lib/efi_selftest/efi_selftest_fdt.c
+++ b/lib/efi_selftest/efi_selftest_fdt.c
@@ -11,6 +11,7 @@
  */
 
 #include <efi_selftest.h>
+#include <stdio.h>
 #include <linux/libfdt.h>
 
 static const struct efi_system_table *systemtab;
diff --git a/lib/efi_selftest/efi_selftest_manageprotocols.c b/lib/efi_selftest/efi_selftest_manageprotocols.c
index f22cad4c1c0f..717774e00f3b 100644
--- a/lib/efi_selftest/efi_selftest_manageprotocols.c
+++ b/lib/efi_selftest/efi_selftest_manageprotocols.c
@@ -12,6 +12,7 @@
  */
 
 #include <efi_selftest.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 /*
diff --git a/lib/elf.c b/lib/elf.c
index 4c5b050da2e1..7b24ca685a49 100644
--- a/lib/elf.c
+++ b/lib/elf.c
@@ -9,6 +9,7 @@
 #include <elf.h>
 #include <env.h>
 #include <net.h>
+#include <stdio.h>
 #include <vxworks.h>
 #ifdef CONFIG_X86
 #include <vbe.h>
diff --git a/lib/fdtdec.c b/lib/fdtdec.c
index e938ea5ea303..8370ecd11ea3 100644
--- a/lib/fdtdec.c
+++ b/lib/fdtdec.c
@@ -13,6 +13,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <net.h>
+#include <stdio.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 28260468e077..897b2d262993 100644
--- a/lib/fdtdec_test.c
+++ b/lib/fdtdec_test.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <command.h>
 #include <fdtdec.h>
+#include <stdio.h>
 #include <linux/libfdt.h>
 #include <malloc.h>
 #include <os.h>
diff --git a/lib/gunzip.c b/lib/gunzip.c
index 1073bebac063..60429e5dd7e6 100644
--- a/lib/gunzip.c
+++ b/lib/gunzip.c
@@ -13,6 +13,7 @@
 #include <image.h>
 #include <malloc.h>
 #include <memalign.h>
+#include <stdio.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
 #include <watchdog.h>
diff --git a/lib/gzip.c b/lib/gzip.c
index c6c0ec880cfb..db36a3e5680f 100644
--- a/lib/gzip.c
+++ b/lib/gzip.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <stdio.h>
 #include <watchdog.h>
 #include <command.h>
 #include <gzip.h>
diff --git a/lib/hang.c b/lib/hang.c
index 578ac78d4530..875ed55187bb 100644
--- a/lib/hang.c
+++ b/lib/hang.c
@@ -11,6 +11,7 @@
 #include <bootstage.h>
 #include <hang.h>
 #include <os.h>
+#include <stdio.h>
 
 /**
  * hang - stop processing by staying in an endless loop
diff --git a/lib/hashtable.c b/lib/hashtable.c
index 4a8c50b4b8ac..3a7d293aff1b 100644
--- a/lib/hashtable.c
+++ b/lib/hashtable.c
@@ -16,6 +16,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <sort.h>
+#include <stdio.h>
 
 #ifdef USE_HOSTCC		/* HOST build */
 # include <string.h>
diff --git a/lib/hexdump.c b/lib/hexdump.c
index a3f219a87416..3a0861c7d38a 100644
--- a/lib/hexdump.c
+++ b/lib/hexdump.c
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <hexdump.h>
+#include <stdio.h>
 #include <linux/ctype.h>
 #include <linux/compat.h>
 #include <linux/log2.h>
diff --git a/lib/image-sparse.c b/lib/image-sparse.c
index 187ac28cd364..5f985a0aa5c2 100644
--- a/lib/image-sparse.c
+++ b/lib/image-sparse.c
@@ -43,6 +43,7 @@
 #include <malloc.h>
 #include <part.h>
 #include <sparse_format.h>
+#include <stdio.h>
 #include <asm/cache.h>
 
 #include <linux/math64.h>
diff --git a/lib/libavb/avb_sysdeps_posix.c b/lib/libavb/avb_sysdeps_posix.c
index 88135b90850c..a563d397bf55 100644
--- a/lib/libavb/avb_sysdeps_posix.c
+++ b/lib/libavb/avb_sysdeps_posix.c
@@ -6,6 +6,7 @@
 #include <hang.h>
 #include <malloc.h>
 #include <stdarg.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <linux/string.h>
 
diff --git a/lib/lmb.c b/lib/lmb.c
index a7277dace165..71665332689d 100644
--- a/lib/lmb.c
+++ b/lib/lmb.c
@@ -11,6 +11,7 @@
 #include <lmb.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/u-boot.h>
 
 #define LMB_ALLOC_ANYWHERE	0
diff --git a/lib/optee/optee.c b/lib/optee/optee.c
index ec1e29cc3f69..c902eee3bc44 100644
--- a/lib/optee/optee.c
+++ b/lib/optee/optee.c
@@ -9,6 +9,7 @@
 #include <image.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <linux/libfdt.h>
 #include <linux/string.h>
 #include <tee/optee.h>
diff --git a/lib/panic.c b/lib/panic.c
index 58382ac4f4cc..eba1d43b7551 100644
--- a/lib/panic.c
+++ b/lib/panic.c
@@ -14,6 +14,7 @@
 #if !defined(CONFIG_PANIC_HANG)
 #include <command.h>
 #endif
+#include <stdio.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 22ec890b407f..a8f4f089f138 100644
--- a/lib/rsa/rsa-verify.c
+++ b/lib/rsa/rsa-verify.c
@@ -8,6 +8,7 @@
 #include <fdtdec.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/types.h>
 #include <asm/byteorder.h>
 #include <linux/errno.h>
diff --git a/lib/smbios.c b/lib/smbios.c
index 12f0a3a4ffdc..489a0d61ee27 100644
--- a/lib/smbios.c
+++ b/lib/smbios.c
@@ -9,6 +9,7 @@
 #include <env.h>
 #include <mapmem.h>
 #include <smbios.h>
+#include <stdio.h>
 #include <tables_csum.h>
 #include <version.h>
 #ifdef CONFIG_CPU
diff --git a/lib/tiny-printf.c b/lib/tiny-printf.c
index 8fc7e48d9942..4d65bd9eeb5f 100644
--- a/lib/tiny-printf.c
+++ b/lib/tiny-printf.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <stdarg.h>
 #include <serial.h>
+#include <stdio.h>
 #include <linux/ctype.h>
 
 struct printf_info {
diff --git a/lib/trace.c b/lib/trace.c
index 1b59e7d1cb96..e6f342872959 100644
--- a/lib/trace.c
+++ b/lib/trace.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <mapmem.h>
+#include <stdio.h>
 #include <time.h>
 #include <trace.h>
 #include <asm/global_data.h>
diff --git a/lib/uuid.c b/lib/uuid.c
index ec6beedd55a5..63efc114f841 100644
--- a/lib/uuid.c
+++ b/lib/uuid.c
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <env.h>
 #include <rand.h>
+#include <stdio.h>
 #include <time.h>
 #include <uuid.h>
 #include <linux/ctype.h>
diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index 9dc96c81c624..18d4bc5a27bc 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -19,6 +19,7 @@
 #include <div64.h>
 #include <hexdump.h>
 #include <stdarg.h>
+#include <stdio.h>
 #include <uuid.h>
 #include <vsprintf.h>
 #include <linux/ctype.h>
diff --git a/net/arp.c b/net/arp.c
index 52f4f31e5295..bea265b3674c 100644
--- a/net/arp.c
+++ b/net/arp.c
@@ -13,6 +13,7 @@
 #include <env.h>
 #include <log.h>
 #include <net.h>
+#include <stdio.h>
 #include <time.h>
 #include <linux/delay.h>
 #include <linux/string.h>
diff --git a/net/bootp.c b/net/bootp.c
index 6038e7a86c60..f5d4f85fe247 100644
--- a/net/bootp.c
+++ b/net/bootp.c
@@ -16,6 +16,7 @@
 #include <log.h>
 #include <net.h>
 #include <rand.h>
+#include <stdio.h>
 #include <time.h>
 #include <uuid.h>
 #include <linux/delay.h>
diff --git a/net/cdp.c b/net/cdp.c
index af4ea9cd41a2..fe19914659bf 100644
--- a/net/cdp.c
+++ b/net/cdp.c
@@ -14,6 +14,7 @@
 #if defined(CONFIG_CDP_VERSION)
 #include <timestamp.h>
 #endif
+#include <stdio.h>
 #include <linux/string.h>
 
 #include "cdp.h"
diff --git a/net/dns.c b/net/dns.c
index 12182c9501ce..c86e519c3c7c 100644
--- a/net/dns.c
+++ b/net/dns.c
@@ -27,6 +27,7 @@
 #include <env.h>
 #include <log.h>
 #include <net.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/unaligned.h>
 #include <linux/string.h>
diff --git a/net/eth-uclass.c b/net/eth-uclass.c
index 42eb460e833a..6eae0746d4d5 100644
--- a/net/eth-uclass.c
+++ b/net/eth-uclass.c
@@ -11,6 +11,7 @@
 #include <env.h>
 #include <log.h>
 #include <net.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
diff --git a/net/eth_legacy.c b/net/eth_legacy.c
index 4ea2dbbaaf67..13f0f2b850b3 100644
--- a/net/eth_legacy.c
+++ b/net/eth_legacy.c
@@ -13,6 +13,7 @@
 #include <log.h>
 #include <net.h>
 #include <phy.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/bug.h>
diff --git a/net/fastboot.c b/net/fastboot.c
index 4f1fed9e7787..93b4863d476c 100644
--- a/net/fastboot.c
+++ b/net/fastboot.c
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <fastboot.h>
 #include <net.h>
+#include <stdio.h>
 #include <time.h>
 #include <linux/printk.h>
 #include <linux/string.h>
diff --git a/net/link_local.c b/net/link_local.c
index 0ddd1bd061fb..ce49abd0d1fd 100644
--- a/net/link_local.c
+++ b/net/link_local.c
@@ -16,6 +16,7 @@
 #include <log.h>
 #include <net.h>
 #include <rand.h>
+#include <stdio.h>
 #include <time.h>
 #include <linux/string.h>
 #include "arp.h"
diff --git a/net/net.c b/net/net.c
index 02f2ea5be5b3..ce6b55f87def 100644
--- a/net/net.c
+++ b/net/net.c
@@ -97,6 +97,7 @@
 #include <image.h>
 #include <log.h>
 #include <net.h>
+#include <stdio.h>
 #include <time.h>
 #include <linux/string.h>
 #include <net/fastboot.h>
diff --git a/net/nfs.c b/net/nfs.c
index 3d7ebeaff09c..c675d8076a56 100644
--- a/net/nfs.c
+++ b/net/nfs.c
@@ -35,6 +35,7 @@
 #include <net.h>
 #include <malloc.h>
 #include <mapmem.h>
+#include <stdio.h>
 #include <linux/string.h>
 #include "nfs.h"
 #include "bootp.h"
diff --git a/net/pcap.c b/net/pcap.c
index 981f8f750e23..31cfc1ca8481 100644
--- a/net/pcap.c
+++ b/net/pcap.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <net.h>
+#include <stdio.h>
 #include <linux/string.h>
 #include <net/pcap.h>
 #include <time.h>
diff --git a/net/rarp.c b/net/rarp.c
index 6fd07bc6f14b..28abc8a4bcf2 100644
--- a/net/rarp.c
+++ b/net/rarp.c
@@ -8,6 +8,7 @@
 #include <command.h>
 #include <log.h>
 #include <net.h>
+#include <stdio.h>
 #include <linux/string.h>
 #include <net/tftp.h>
 #include "nfs.h"
diff --git a/net/sntp.c b/net/sntp.c
index e814af66b794..9968984eece5 100644
--- a/net/sntp.c
+++ b/net/sntp.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <net.h>
 #include <rtc.h>
+#include <stdio.h>
 #include <time.h>
 #include <linux/string.h>
 
diff --git a/net/tftp.c b/net/tftp.c
index d52133214858..e2de4a17ff4b 100644
--- a/net/tftp.c
+++ b/net/tftp.c
@@ -15,6 +15,7 @@
 #include <log.h>
 #include <mapmem.h>
 #include <net.h>
+#include <stdio.h>
 #include <time.h>
 #include <asm/global_data.h>
 #include <linux/string.h>
diff --git a/post/cpu/mpc83xx/ecc.c b/post/cpu/mpc83xx/ecc.c
index cc971a890978..9b700fbc9eb9 100644
--- a/post/cpu/mpc83xx/ecc.c
+++ b/post/cpu/mpc83xx/ecc.c
@@ -13,6 +13,7 @@
 #include <irq_func.h>
 #include <log.h>
 #include <mpc83xx.h>
+#include <stdio.h>
 #include <watchdog.h>
 #include <asm/io.h>
 #include <post.h>
diff --git a/post/drivers/flash.c b/post/drivers/flash.c
index 7c6caa4f1977..721d48eb6b31 100644
--- a/post/drivers/flash.c
+++ b/post/drivers/flash.c
@@ -10,6 +10,7 @@
 #include <malloc.h>
 #include <post.h>
 #include <flash.h>
+#include <stdio.h>
 #include <linux/string.h>
 
 #if CONFIG_POST & CONFIG_SYS_POST_FLASH
diff --git a/post/post.c b/post/post.c
index 65162e6d985a..5671da102510 100644
--- a/post/post.c
+++ b/post/post.c
@@ -9,6 +9,7 @@
 #include <env.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <stdio_dev.h>
 #include <time.h>
 #include <watchdog.h>
diff --git a/test/cmd_ut.c b/test/cmd_ut.c
index 8f0bc688a223..b49c2e9a1f00 100644
--- a/test/cmd_ut.c
+++ b/test/cmd_ut.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <command.h>
 #include <console.h>
+#include <stdio.h>
 #include <test/suites.h>
 #include <test/test.h>
 
diff --git a/test/command_ut.c b/test/command_ut.c
index 9837d10eb5c9..3379252fd7d6 100644
--- a/test/command_ut.c
+++ b/test/command_ut.c
@@ -9,6 +9,7 @@
 #include <command.h>
 #include <env.h>
 #include <log.h>
+#include <stdio.h>
 
 static const char test_cmd[] = "setenv list 1\n setenv list ${list}2; "
 		"setenv list ${list}3\0"
diff --git a/test/compression.c b/test/compression.c
index a2a4b9ff9e85..4fc7b07fece8 100644
--- a/test/compression.c
+++ b/test/compression.c
@@ -12,6 +12,7 @@
 #include <lz4.h>
 #include <malloc.h>
 #include <mapmem.h>
+#include <stdio.h>
 #include <asm/io.h>
 
 #include <u-boot/zlib.h>
diff --git a/test/dm/core.c b/test/dm/core.c
index 6a77c4fcc83a..cac3c00cd433 100644
--- a/test/dm/core.c
+++ b/test/dm/core.c
@@ -11,6 +11,7 @@
 #include <fdtdec.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <dm/device-internal.h>
 #include <dm/root.h>
diff --git a/test/dm/osd.c b/test/dm/osd.c
index 6279b391ca5e..14823437f20e 100644
--- a/test/dm/osd.c
+++ b/test/dm/osd.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <display_options.h>
 #include <dm.h>
+#include <stdio.h>
 #include <video_osd.h>
 #include <asm/test.h>
 #include <dm/test.h>
diff --git a/test/dm/rtc.c b/test/dm/rtc.c
index 8ab997c87d10..2ef8ff724e78 100644
--- a/test/dm/rtc.c
+++ b/test/dm/rtc.c
@@ -10,6 +10,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <rtc.h>
+#include <stdio.h>
 #include <asm/io.h>
 #include <asm/rtc.h>
 #include <asm/test.h>
diff --git a/test/dm/test-fdt.c b/test/dm/test-fdt.c
index e615a18a01ed..0dc824b938e7 100644
--- a/test/dm/test-fdt.c
+++ b/test/dm/test-fdt.c
@@ -9,6 +9,7 @@
 #include <fdtdec.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm/test.h>
diff --git a/test/dm/test-main.c b/test/dm/test-main.c
index 8dc59fc636f1..2bc27c8b9c48 100644
--- a/test/dm/test-main.c
+++ b/test/dm/test-main.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/state.h>
 #include <dm/test.h>
diff --git a/test/dm/usb.c b/test/dm/usb.c
index db4b8ba0f7aa..7ad280f215ce 100644
--- a/test/dm/usb.c
+++ b/test/dm/usb.c
@@ -7,6 +7,7 @@
 #include <console.h>
 #include <dm.h>
 #include <part.h>
+#include <stdio.h>
 #include <usb.h>
 #include <asm/io.h>
 #include <asm/state.h>
diff --git a/test/lib/sscanf.c b/test/lib/sscanf.c
index 772e4b920425..0b0d9c179246 100644
--- a/test/lib/sscanf.c
+++ b/test/lib/sscanf.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <command.h>
 #include <log.h>
+#include <stdio.h>
 #include <test/lib.h>
 #include <test/test.h>
 #include <test/ut.h>
diff --git a/test/lib/test_aes.c b/test/lib/test_aes.c
index cbc712f7eda3..d287aedbdd10 100644
--- a/test/lib/test_aes.c
+++ b/test/lib/test_aes.c
@@ -9,6 +9,7 @@
 #include <command.h>
 #include <hexdump.h>
 #include <rand.h>
+#include <stdio.h>
 #include <uboot_aes.h>
 #include <test/lib.h>
 #include <test/test.h>
diff --git a/test/log/log_test.c b/test/log/log_test.c
index 4245372d65f6..6b263557945c 100644
--- a/test/log/log_test.c
+++ b/test/log/log_test.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <command.h>
 #include <log.h>
+#include <stdio.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 a456a449efab..206a72c789c1 100644
--- a/test/print_ut.c
+++ b/test/print_ut.c
@@ -12,6 +12,7 @@
 #endif
 #include <display_options.h>
 #include <log.h>
+#include <stdio.h>
 #include <version.h>
 
 #define FAKE_BUILD_TAG	"jenkins-u-boot-denx_uboot_dm-master-build-aarch64" \
diff --git a/test/stdint/int-types.c b/test/stdint/int-types.c
index f6d09e8643d6..0cde46dafa0c 100644
--- a/test/stdint/int-types.c
+++ b/test/stdint/int-types.c
@@ -1,4 +1,5 @@
 #include <common.h>
+#include <stdio.h>
 
 int test_types(void)
 {
diff --git a/test/time_ut.c b/test/time_ut.c
index 80b82dbfd833..701b6cb4a7ed 100644
--- a/test/time_ut.c
+++ b/test/time_ut.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <command.h>
 #include <errno.h>
+#include <stdio.h>
 #include <time.h>
 #include <linux/delay.h>
 
diff --git a/test/ut.c b/test/ut.c
index 556e9694ee17..a7cd25d1a053 100644
--- a/test/ut.c
+++ b/test/ut.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <console.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <asm/global_data.h>
 #include <test/test.h>
 #include <test/ut.h>
-- 
2.17.1

^ permalink raw reply related	[flat|nested] 35+ messages in thread

* [RFCv2 09/16] common: Drop stdarg.h from common header
  2020-08-19 13:08 ` [RFCv2] common: Drop remaining includes in common.h Tom Rini
                     ` (7 preceding siblings ...)
  2020-08-19 13:09   ` [RFCv2 08/16] common: Drop stdio.h " Tom Rini
@ 2020-08-19 13:09   ` Tom Rini
  2020-08-19 13:09   ` [RFCv2 10/16] common: Drop vsprintf.h " Tom Rini
                     ` (7 subsequent siblings)
  16 siblings, 0 replies; 35+ messages in thread
From: Tom Rini @ 2020-08-19 13:09 UTC (permalink / raw)
  To: u-boot

From: Simon Glass <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 +
 board/CZ.NIC/turris_mox/turris_mox.c            | 1 +
 common/lcd_console.c                            | 1 +
 common/log.c                                    | 1 +
 common/log_syslog.c                             | 1 +
 drivers/core/util.c                             | 1 +
 drivers/fastboot/fb_common.c                    | 1 +
 drivers/gpio/gpio-uclass.c                      | 1 +
 drivers/mtd/nand/raw/brcmnand/brcmnand_compat.c | 1 +
 include/common.h                                | 1 -
 include/efi.h                                   | 1 +
 include/exports.h                               | 1 +
 lib/efi_selftest/efi_selftest_console.c         | 1 +
 lib/panic.c                                     | 1 +
 lib/tpm-common.c                                | 1 +
 post/post.c                                     | 1 +
 test/ut.c                                       | 1 +
 17 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/api/api.c b/api/api.c
index d6b5b60c2255..748df20bebe4 100644
--- a/api/api.c
+++ b/api/api.c
@@ -11,6 +11,7 @@
 #include <env.h>
 #include <malloc.h>
 #include <env_internal.h>
+#include <stdarg.h>
 #include <stdio.h>
 #include <time.h>
 #include <linux/delay.h>
diff --git a/board/CZ.NIC/turris_mox/turris_mox.c b/board/CZ.NIC/turris_mox/turris_mox.c
index f5fcb93262b7..7f2ed1350bf2 100644
--- a/board/CZ.NIC/turris_mox/turris_mox.c
+++ b/board/CZ.NIC/turris_mox/turris_mox.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <stdarg.h>
 #include <stdio.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
diff --git a/common/lcd_console.c b/common/lcd_console.c
index 7a10a20d7244..0ccb4a468802 100644
--- a/common/lcd_console.c
+++ b/common/lcd_console.c
@@ -11,6 +11,7 @@
 #include <lcd.h>
 #include <log.h>
 #include <serial.h>
+#include <stdarg.h>
 #include <video_font.h>		/* Get font data, width and height */
 #if defined(CONFIG_LCD_LOGO)
 #include <bmp_logo.h>
diff --git a/common/log.c b/common/log.c
index 0eeee6a66b0a..493ee0ff0d9f 100644
--- a/common/log.c
+++ b/common/log.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdarg.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 2f3c93bf8393..6cb4ed18ca12 100644
--- a/common/log_syslog.c
+++ b/common/log_syslog.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <log.h>
 #include <net.h>
+#include <stdarg.h>
 #include <asm/global_data.h>
 #include <linux/string.h>
 
diff --git a/drivers/core/util.c b/drivers/core/util.c
index 7a2fe1f4394b..cd15768970cc 100644
--- a/drivers/core/util.c
+++ b/drivers/core/util.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <stdarg.h>
 #include <stdio.h>
 #include <dm/device.h>
 #include <dm/ofnode.h>
diff --git a/drivers/fastboot/fb_common.c b/drivers/fastboot/fb_common.c
index da467666cf4c..325ce4d283fe 100644
--- a/drivers/fastboot/fb_common.c
+++ b/drivers/fastboot/fb_common.c
@@ -14,6 +14,7 @@
 #include <command.h>
 #include <env.h>
 #include <fastboot.h>
+#include <stdarg.h>
 #include <stdio.h>
 #include <linux/string.h>
 #include <net/fastboot.h>
diff --git a/drivers/gpio/gpio-uclass.c b/drivers/gpio/gpio-uclass.c
index 7d4e3354f173..2e371f3ad79c 100644
--- a/drivers/gpio/gpio-uclass.c
+++ b/drivers/gpio/gpio-uclass.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <stdarg.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <dm/device-internal.h>
diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand_compat.c b/drivers/mtd/nand/raw/brcmnand/brcmnand_compat.c
index a6acf556bcc7..1b05e2db9f6d 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 <dm.h>
 #include <malloc.h>
+#include <stdarg.h>
 #include <dm/devres.h>
 #include "brcmnand_compat.h"
 
diff --git a/include/common.h b/include/common.h
index 33171360ddb0..31c3d462132f 100644
--- a/include/common.h
+++ b/include/common.h
@@ -16,7 +16,6 @@
 #include <config.h>
 #include <errno.h>
 #include <linux/types.h>
-#include <stdarg.h>
 #include <linux/kernel.h>
 #include <vsprintf.h>
 #endif	/* __ASSEMBLY__ */
diff --git a/include/efi.h b/include/efi.h
index f986aad87777..818295642ddb 100644
--- a/include/efi.h
+++ b/include/efi.h
@@ -16,6 +16,7 @@
 #ifndef _EFI_H
 #define _EFI_H
 
+#include <stdarg.h>
 #include <linux/linkage.h>
 #include <linux/string.h>
 #include <linux/types.h>
diff --git a/include/exports.h b/include/exports.h
index 5e10fc3bce53..935cf594c3b4 100644
--- a/include/exports.h
+++ b/include/exports.h
@@ -2,6 +2,7 @@
 #define __EXPORTS_H__
 
 #include <irq_func.h>
+#include <stdarg.h>
 #include <stdio.h>
 #include <time.h>
 #include <asm/global_data.h>
diff --git a/lib/efi_selftest/efi_selftest_console.c b/lib/efi_selftest/efi_selftest_console.c
index 13f3ee6bc19f..0462c196c16d 100644
--- a/lib/efi_selftest/efi_selftest_console.c
+++ b/lib/efi_selftest/efi_selftest_console.c
@@ -7,6 +7,7 @@
 
 #include <efi_selftest.h>
 #include <net.h>
+#include <stdarg.h>
 #include <vsprintf.h>
 
 struct efi_simple_text_output_protocol *con_out;
diff --git a/lib/panic.c b/lib/panic.c
index eba1d43b7551..2267a8d4fb91 100644
--- a/lib/panic.c
+++ b/lib/panic.c
@@ -14,6 +14,7 @@
 #if !defined(CONFIG_PANIC_HANG)
 #include <command.h>
 #endif
+#include <stdarg.h>
 #include <stdio.h>
 #include <linux/delay.h>
 
diff --git a/lib/tpm-common.c b/lib/tpm-common.c
index adfe49190699..21fc4c7c865e 100644
--- a/lib/tpm-common.c
+++ b/lib/tpm-common.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <stdarg.h>
 #include <asm/unaligned.h>
 #include <tpm-common.h>
 #include <linux/string.h>
diff --git a/post/post.c b/post/post.c
index 5671da102510..ad700975846b 100644
--- a/post/post.c
+++ b/post/post.c
@@ -9,6 +9,7 @@
 #include <env.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdio_dev.h>
 #include <time.h>
diff --git a/test/ut.c b/test/ut.c
index a7cd25d1a053..12e3de619a12 100644
--- a/test/ut.c
+++ b/test/ut.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <console.h>
 #include <malloc.h>
+#include <stdarg.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <test/test.h>
-- 
2.17.1

^ permalink raw reply related	[flat|nested] 35+ messages in thread

* [RFCv2 10/16] common: Drop vsprintf.h from common header
  2020-08-19 13:08 ` [RFCv2] common: Drop remaining includes in common.h Tom Rini
                     ` (8 preceding siblings ...)
  2020-08-19 13:09   ` [RFCv2 09/16] common: Drop stdarg.h " Tom Rini
@ 2020-08-19 13:09   ` Tom Rini
  2020-08-19 13:09   ` [RFCv2 11/16] common: Drop errno.h " Tom Rini
                     ` (6 subsequent siblings)
  16 siblings, 0 replies; 35+ messages in thread
From: Tom Rini @ 2020-08-19 13:09 UTC (permalink / raw)
  To: u-boot

From: Simon Glass <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/lib/sscanf.c                                      | 1 +
 test/log/log_test.c                                    | 1 +
 test/print_ut.c                                        | 1 +
 test/unicode_ut.c                                      | 1 +
 test/ut.c                                              | 1 +
 670 files changed, 674 insertions(+), 5 deletions(-)

diff --git a/api/api.c b/api/api.c
index 748df20bebe4..17f740529743 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 f807cd83d6b5..1bdffd052e46 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 988e04aea0bb..932bb81ce948 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>
 
diff --git a/arch/arm/cpu/arm926ejs/spear/spr_misc.c b/arch/arm/cpu/arm926ejs/spear/spr_misc.c
index 7c780c07c310..6a7d63d09848 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 <linux/mtd/st_smi.h>
 #include <asm/io.h>
diff --git a/arch/arm/cpu/armv7/ls102xa/fdt.c b/arch/arm/cpu/armv7/ls102xa/fdt.c
index ea068727f57a..684c0c91ef5c 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 ad019f4fe2e0..052ba4d5407d 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 34d5fe81d0e1..917ae991a525 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 fb5d8a2a6346..a85fa358765f 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 a4882d8599c5..340206d90952 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 <linux/sizes.h>
 #include <log.h>
 #include <asm/arch/fsl_serdes.h>
diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c
index 613e7abeaae5..c9efede771e4 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 6c6a81529f06..00e052d9a862 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 5561f3475c7d..7dee0e5a2271 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>
 
 /*
  * Upon exception entry ARMv7-M processors automatically save stack
diff --git a/arch/arm/lib/semihosting.c b/arch/arm/lib/semihosting.c
index d186584c3794..8b09d87cb169 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 49dd473af72e..a8199497a916 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 c2ca33888b50..2b7affaaccdf 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 0d2cbf989635..3f3d47c13005 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 5f5103a12a62..bf0742e57e3d 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 69033420ee5a..1d92c07be246 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 84d400f02837..6bb067e08bdd 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 4b02c70e6d52..12f644e69ee7 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 46a4d3661d10..c94da85bf760 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 fe591a8ffc39..d28d55d4be5c 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 e67121c55237..c0feac134f23 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 d4c9780c6bb8..2e4bb59c4a26 100644
--- a/arch/arm/mach-k3/am6_init.c
+++ b/arch/arm/mach-k3/am6_init.c
@@ -10,6 +10,7 @@
 #include <fdt_support.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 572b7116c8c3..359dee5af86c 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 df899fa0fb3a..5c1f248b13bc 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 91182d04b227..ecc3a6711802 100644
--- a/arch/arm/mach-k3/sysfw-loader.c
+++ b/arch/arm/mach-k3/sysfw-loader.c
@@ -13,6 +13,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 22277b5987e0..9130978537fb 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 94e55331d5c7..e98df01e89f7 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 b646599587a9..99c394cd91d6 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 2337adb6ef2d..a74c4d995b18 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 087240b4d3f6..a202e83b08fe 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 a2a30eb80b00..f4f54fafce96 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 a0ba2d8e0cf8..0fac5efc2a72 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 7405d692e7b9..a6428a23db41 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 03375321a471..f96d1379bb3b 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 2e10ab983ebd..4ee409521ef7 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 f2c925b2d113..81f3bd37ea35 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 ce75e7c1f2c3..82a106e786e8 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 aaa561c2c68e..03515f6d2bf2 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 1042b564c370..d261129a4dd4 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 20a71c319b33..da4a2d3901c5 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 6813279e6aef..ae84d2a22579 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 abf0109ba3c1..cf5c918fe54a 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 d12e24f0fefc..7ce8a9dee69e 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 9ede9388f6dd..89baa9885a84 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 4da58041c057..c2cbfe7e48b6 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 <dm/uclass.h>
diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.h b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.h
index 002b4d39be69..de1361d9841d 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 c37dca677ead..14bd4cc27d6e 100644
--- a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_serial.c
+++ b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_serial.c
@@ -10,6 +10,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 bcc9239ba92f..616f556ab90c 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 4ded59569708..80d7d5790a85 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 f40fccd8f8b9..1a720a0858d0 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 520b597fcc01..de04e9d84282 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 76d698214da4..f85f52898d12 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 9e34da474798..a877d655d86b 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 0590110d4acb..9d1620c97588 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 a46253852196..e3e40aaa5e6d 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 922919814ba2..ae126f824c1a 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 <stdio.h>
diff --git a/arch/arm/mach-zynqmp/mp.c b/arch/arm/mach-zynqmp/mp.c
index b2fcae619dca..589f9ec9ab22 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 ec165a32b0a4..7a9afcb0b18e 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 a0c60c40c861..d6ea2f5730d0 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 c3efa31f594d..31ab6257fd14 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>
 
diff --git a/arch/nds32/lib/bootm.c b/arch/nds32/lib/bootm.c
index 3afd1c5cff24..5532d515b733 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 dcff67d0eb6a..a61795a52a2b 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>
 #undef INTERRUPT_MODE
diff --git a/arch/nios2/lib/bootm.c b/arch/nios2/lib/bootm.c
index 2c8f9731c747..59099a4d5eae 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 5c843e4fafd9..b32370fa4d9c 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/ppc.h>
 #include <linux/string.h>
 
diff --git a/arch/powerpc/cpu/mpc83xx/traps.c b/arch/powerpc/cpu/mpc83xx/traps.c
index 8bbf8407764e..2ee72517ca2f 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 a63519bb5cd8..79ad806dbdf0 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 397a118140e9..be5381b47a50 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 2a6e07f28347..35bc146a38be 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 c8388da6331d..4864a6809a49 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 59785c562918..61eba2e99355 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/io.h>
 #include <asm/ppc.h>
diff --git a/arch/powerpc/cpu/mpc85xx/liodn.c b/arch/powerpc/cpu/mpc85xx/liodn.c
index 188318f66ceb..340d563d7d4d 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 <linux/libfdt.h>
 #include <fdt_support.h>
 #include <linux/string.h>
diff --git a/arch/powerpc/cpu/mpc85xx/mp.c b/arch/powerpc/cpu/mpc85xx/mp.c
index cd348bf6ee63..4c7e2f8612a7 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 5fc672d153dc..add179be3853 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 569aca6474a7..91021e718662 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 ce29b0f4a79b..d0b7fa75248c 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 56cd33ee4b93..bc131f85b26b 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/immap_8xx.h>
diff --git a/arch/powerpc/cpu/mpc8xx/traps.c b/arch/powerpc/cpu/mpc8xx/traps.c
index 6aeb20c4c99f..fdc6b110412d 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 448d4da6a80a..b8771cb61c22 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 e4192b07be5f..f0721d3f7c50 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 5759651b9a4a..b3365c78b4b9 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 b6e961f70834..f64ea4e2e664 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 d1067a60f1ed..8567d390376a 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 21dbcd91e039..cd8500827374 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 ab78059e76e8..66a122c9d427 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 e5bf4b225cf3..7369ffa19d75 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 cfa70c10e07a..3db95256015d 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 36d0d4da5531..94d117e516ea 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 <linux/sizes.h>
 #include <asm/e820.h>
diff --git a/arch/x86/cpu/slimbootloader/serial.c b/arch/x86/cpu/slimbootloader/serial.c
index 8b84565ce62f..10e4e9300ece 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 ec5b87cfd63f..f78e0eeec802 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>
 
diff --git a/arch/x86/cpu/tangier/acpi.c b/arch/x86/cpu/tangier/acpi.c
index 7a0020c74fe0..8aa5efdcab9c 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 20926171822d..e70b77972386 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 25aa71c6c20a..6850b9b73334 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 <linux/string.h>
diff --git a/arch/x86/lib/ramtest.c b/arch/x86/lib/ramtest.c
index 03385396325d..17729eb8aa0b 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>
 
diff --git a/arch/x86/lib/relocate.c b/arch/x86/lib/relocate.c
index 8a5082d6f30c..e31565a589e0 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 db07d88dbc4a..0e2558ce944c 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 d467657f8793..219e70607bf8 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 7047b1938d2a..69325e20ec18 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 791c91d0e0da..ccd5f8ae1e4e 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 6e36a4bb60e8..f6f35f6750df 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 b6e763b77fa9..9b96b0c30b97 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 7768aeb59df1..863372e06e01 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 cc57b9f095f7..2c0c4956cd4f 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 7f2ed1350bf2..32dabe99598d 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 95911a300a76..f6a434d08c93 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 caf7fd681007..005e4bebf13f 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 7d9deb57a633..f0c0b5d821c9 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 d5455dcab354..46cb5e407bb0 100644
--- a/board/atmel/common/board.c
+++ b/board/atmel/common/board.c
@@ -8,6 +8,7 @@
 #include <dm.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 93fda9c5b1f3..ca44e5aba962 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 874d24e22d6a..da597bbfb0a3 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 25005a390f5d..79ba375cd2bc 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 20f62f61fcde..f61e6bb93012 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 <dm/platform_data/net_ethoc.h>
 #include <env.h>
 #include <linux/ctype.h>
diff --git a/board/cavium/thunderx/atf.c b/board/cavium/thunderx/atf.c
index 9c812e9531fe..1c91cfe5f061 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 cefcc6634ffb..f1874e35ff46 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 94ab9003b35d..0ffa82dd6d38 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 93ae1c6b0863..4b580b70fbec 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 002daf23f4db..1a878397007f 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 8fec67a69128..08b8e7f4d04e 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 80c317a5a5d6..14f8f4d89a2f 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 7a75494d7f3d..3694a034b73a 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 b7a1a71de097..960c1adec98d 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 <dm/device-internal.h>
 #include <asm/arch/clock.h>
diff --git a/board/dhelectronics/dh_stm32mp1/board.c b/board/dhelectronics/dh_stm32mp1/board.c
index 9f48438dde31..e875d5410c59 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 f806d1e7672a..4268885e29e5 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 b91020ec33f2..ad5285f8ca98 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 28080d423b39..f752ac95ec1e 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 6bda7b040736..7ced22e8430d 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 2190e51c150e..72b58360c271 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 ff6e2bfb34f5..f12dcb3cf143 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 5bceb7747d5e..6938c2c2ead4 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 6f4f2e6d2413..2d232958c5ba 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 e6481f695167..5e486a98e848 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 2f1144dcd74e..5f07d28e8ec4 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 77c7dd2c4689..6b68d03cecef 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 0a31c9e31120..f7c337d677af 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 09f9f85f91b9..30b7912c270f 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 954f55bdbf62..bda97fbd6bd8 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 d0d012e67f20..35d7bfcb2ff8 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 61dcdf8fb06f..b35f98b46d15 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 079f19458e41..d4e7c4093078 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 "ddr.h"
diff --git a/board/freescale/ls1046aqds/ddr.c b/board/freescale/ls1046aqds/ddr.c
index 98484ef995be..5a85383d9451 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 "ddr.h"
diff --git a/board/freescale/ls1046aqds/eth.c b/board/freescale/ls1046aqds/eth.c
index 93a41cd4a129..1977b08eca27 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 ff7a4e225068..53f788d2e149 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 "ddr.h"
 #ifdef CONFIG_FSL_DEEP_SLEEP
diff --git a/board/freescale/ls1088a/ddr.c b/board/freescale/ls1088a/ddr.c
index 1e3002005a99..091dbafd8717 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 f26bbf3267ea..d5a1752c055b 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 4175bd33cbf3..473468e53df8 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 8ad91bcc79ec..6933066e826e 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 2a25cb9f0703..7756620bdfde 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 7a91db928e24..e29cef3d2722 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 5dfe7489ba88..e592ca12927a 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 d98b07e2daa2..16f3f49b6cb9 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/ppc.h>
 #include <asm/u-boot.h>
diff --git a/board/freescale/mpc8349emds/ddr.c b/board/freescale/mpc8349emds/ddr.c
index 71615fe1ffd9..39731d4bf733 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/ppc.h>
 
 #include <fsl_ddr_sdram.h>
diff --git a/board/freescale/mpc8572ds/ddr.c b/board/freescale/mpc8572ds/ddr.c
index 4015b475f065..941a85ed927b 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/ppc.h>
 
 #include <fsl_ddr_sdram.h>
diff --git a/board/freescale/mpc8641hpcn/ddr.c b/board/freescale/mpc8641hpcn/ddr.c
index 682e17ac56f2..8d25628709b5 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/ppc.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 648ff4c3e792..f4bf325e0d3c 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 256cdc684247..4e1254dd1344 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 e95f0481be22..496d3a4f3088 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 <asm/ppc.h>
diff --git a/board/freescale/p2041rdb/eth.c b/board/freescale/p2041rdb/eth.c
index 0faa288f003e..94b050200500 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 6588804fbbaa..00c83d664385 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 8afb71c4c80a..8e6bb29877d9 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 <asm/ppc.h>
diff --git a/board/freescale/t104xrdb/ddr.c b/board/freescale/t104xrdb/ddr.c
index 6a6bacf2d4fc..e2c8492138ec 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 <asm/ppc.h>
diff --git a/board/freescale/t208xqds/ddr.c b/board/freescale/t208xqds/ddr.c
index 382f1ebe53ed..ca9ab0013d04 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 <asm/ppc.h>
diff --git a/board/freescale/t208xqds/eth_t208xqds.c b/board/freescale/t208xqds/eth_t208xqds.c
index f60e2047759c..c2fcbfeedf67 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 2a375619116b..3ce072ce6810 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 <asm/ppc.h>
diff --git a/board/freescale/t4rdb/ddr.c b/board/freescale/t4rdb/ddr.c
index 037190ff11dc..c3b1c7e0fe19 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 <asm/ppc.h>
diff --git a/board/gardena/smart-gateway-mt7688/board.c b/board/gardena/smart-gateway-mt7688/board.c
index 03a9e43875a1..2e446f86753a 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 3f7ce584528f..299f92f68262 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 efaff179a2c5..7d6509be77bf 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 143493c24ab3..d98fa4bf2ee5 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 a8b012dda736..4932fc2d1173 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 fb371be4926d..20c1a4fe3cce 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 4d6d0da76fae..feeae37cd700 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 72fef03d7b13..881f2cc7bf25 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 e4941a94f310..fb9c7b8a6eca 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 b73e2597299b..e306d7e82fed 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 3258cc72179e..1399a2726b30 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 0d88f8ad4a9e..36489db79adb 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 fbbfbd8fb292..e6bcb08aadf1 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 1a47a8457372..144193f44552 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 7ed9b53bc169..1edbf36ea903 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 8d1c4ade1c5c..42ebb831f577 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 098ef3f96646..cb129dca03e6 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 9a5c5cb64da6..387c2271046f 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 5287ec205355..d87c0ac8f153 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 f850c4d75633..5aae1db2ad34 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 bfea7a41ae2b..b7dd0243a5a1 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 46316d345424..0a977ca84ae2 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 93186b9bca35..41751f3d15c1 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 e58bf3acc2e8..6d9f8c988bf6 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 57f30a04ed8c..97986b67f1c4 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 9ba3dcb092ac..ebb7ddb1fb73 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 647ebde09a7c..45586323f3af 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 5c65b0d692a8..ceeba7eda68d 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 014fdf94b75f..bcd8060d2b58 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 80f296444064..fca730212f06 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 366076a3b880..71a3f5dd39cb 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 b443c36b1dfb..7a52eaa9d399 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 8ee9ca43c41d..4fcc0bf6f770 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 97f4097cbcd8..4463f64dbc20 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 eef565d1cee8..4438bff523e0 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 19e5bccbdb51..37bab0f49338 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 b79a87242734..f21cfe40d53c 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 6880dcda1caf..fcbead5c127c 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 f1d93dc0aa1e..2e4c72f97810 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 18d9c64f55a2..ebd34939cb41 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 769979952174..490c80a5734c 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 75c347973227..d60ef4e87cd7 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 4fec3d8c95e1..18b397c61d40 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 531ed7e15972..2da0560bd2be 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 631812f15083..102e7e82cd9d 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 dea0924c6bf5..2ca4dcbe492e 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 <linux/bitops.h>
 #include <linux/bug.h>
 #include <linux/delay.h>
diff --git a/board/sifive/fu540/spl.c b/board/sifive/fu540/spl.c
index fe27316b2d9a..f60acc87b2c6 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 <linux/io.h>
 #include <asm/gpio.h>
diff --git a/board/softing/vining_fpga/socfpga.c b/board/softing/vining_fpga/socfpga.c
index 7c9d4885dbef..ade287493bc2 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 890d456ef4fe..ad2d5d5998ca 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 0cf9a1544b80..a02cc29f7f24 100644
--- a/board/st/common/stm32mp_dfu.c
+++ b/board/st/common/stm32mp_dfu.c
@@ -13,6 +13,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 9d8fc9f5a2e1..3cbf5916ae95 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/io.h>
diff --git a/board/st/stm32f429-evaluation/stm32f429-evaluation.c b/board/st/stm32f429-evaluation/stm32f429-evaluation.c
index 35e71380b892..4e503825dfaf 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/io.h>
diff --git a/board/st/stm32f469-discovery/stm32f469-discovery.c b/board/st/stm32f469-discovery/stm32f469-discovery.c
index fcc34e7955a6..c9ce68f679bd 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/io.h>
diff --git a/board/st/stm32mp1/stm32mp1.c b/board/st/stm32mp1/stm32mp1.c
index b86cbee8e908..61a86df37b4e 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 cca98e2d5426..b2ee68d9c21f 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 dbec12c8a7bc..6b1fff98a45c 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 9c6e8dbc8f25..4fe6219514de 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 090a471a7172..2f3df5209284 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 715dcbdc7bc8..7edfd2a2b92e 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 0fa4d31a2e7b..67695ca61f55 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 e0fb2b39b7da..869131a08f95 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 5721ef9e11d1..862398e53a2b 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 e88aac06683d..b283bb410399 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 0c31ca2f7cc2..5872ce4648c9 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 7b6f04b36beb..1b9b79f65ae0 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 76cf8e360f9b..62ae4dbf9225 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 51e62b6ab20b..16bb57991375 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 2bdd589126db..b0057b585c12 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 6a28a9b31f65..7c7f15d19915 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 5ebbdda38e2a..42dd0a8f173e 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 7667bbdc579e..80cd3753cbf9 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 0677bd1c693c..5221b6174d76 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 <asm/ppc.h>
diff --git a/board/vscom/baltos/board.c b/board/vscom/baltos/board.c
index 045e46aba301..434aadd8763b 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 d13a10e1a7cb..7272dc2bb2e8 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 48bd3dcd1508..68c6f4827732 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 91446fb9c39c..b3c486ab1b39 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 <dm/uclass.h>
 #include <env.h>
diff --git a/board/xilinx/zynq/cmds.c b/board/xilinx/zynq/cmds.c
index b3a2c933b7ca..00f2feba27b8 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 48898f69c938..15a059896133 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 0686b16a887e..58067c213a84 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 f90468a1ae3e..73b6053c65d9 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 2904b146befd..a6df5785f5fb 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 9869aad8dceb..8737f9c7f740 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 90a72619720b..e31a5b10b563 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 51bc922b937c..db4cd114628b 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 4c4a719ad019..e76838c55c29 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 a9de5bed9735..6cf9648670a4 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 e61cc3e35ca2..858fddee1318 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 4cccd8eab3f2..46737101f658 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 050c4be2d72f..b008d4a6e8cc 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 a643cc906cec..9fde726b5cb9 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 aed076acb77e..4bf7a582b52e 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 025c692b485c..632f73a58c0b 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 a3b4f7a32862..d4ee6966e975 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 499e3585f742..a4c8c3f5c06c 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 36aba22b301b..8b079b31714c 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 8fb56106a898..63902ef730dc 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 <linux/libfdt.h>
 #include <linux/libfdt_env.h>
diff --git a/cmd/booti.c b/cmd/booti.c
index de60d4ea7cbc..52ce6bbc031e 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 4490e4d3ac15..b6a2a75e8bf2 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 <linux/ctype.h>
diff --git a/cmd/bootmenu.c b/cmd/bootmenu.c
index e307660e516c..d76ae7b13634 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 1592f24c11d3..3cf4138e2d42 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 a251c48a0b88..e34ed63b4dfe 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 <linux/compiler.h>
 
 int __weak bootz_setup(ulong image, ulong *start, ulong *end)
diff --git a/cmd/cbfs.c b/cmd/cbfs.c
index 432974009a1d..8f7a10751f7b 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 8f4d0ab54a01..b34a4dde0799 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 d381980ec6cd..38f89dd05f67 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 aaeff9c18883..39236e6955e0 100644
--- a/cmd/demo.c
+++ b/cmd/demo.c
@@ -12,6 +12,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 b19b79c57eb6..97c422a2843c 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 bfebe3520c33..fcb19ee02e44 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 ffd1db893bf7..5d6df466c1c2 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 c81c23463b20..ca3804c33154 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 c38d8d015a90..37267ccacaee 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 6b76061cd0f8..fe93d2a8b173 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 7bf241ec732d..b84b6c0e1c01 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 8340af5df8cb..0a6cfe453097 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 d56648f2a856..e3bee99ec9b0 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 e784b0d5d943..ba44460ea39d 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 ce44d7dc76bd..56995822cb7b 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 924ca10749d4..b3ec2b25568e 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 89b34f864259..96901b684a6f 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 d3680e98440d..b75676e641e5 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 92831350b48f..3171556bb286 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 639fcae8e31c..086a91ab5776 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 dec1da41def3..b06bbc922c93 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 c1f7372a151a..2f442f0e8110 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 787e3ed950e8..0c25c7ae5fea 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 dd770a20ce19..d16bb4f8c618 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 e691e91c4861..f6db7ad48eaa 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 0ec595c0d700..0d0e1521953a 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 5ccd5b091532..b2dba80cf2c8 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 33714e26ae9d..5ba868068523 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 c763121fe5e8..2918ee6d28de 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 4176f089dfce..d70f6d11462c 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 fc50722e0655..b2db540e8d1b 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 a233d239bb3c..88efad8a9f9f 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 409ad6e69c16..1452a7ac558d 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 a6e12bba4b54..2fb8d7b27597 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 581d0a7db7e2..50e3919487aa 100644
--- a/cmd/mdio.c
+++ b/cmd/mdio.c
@@ -14,6 +14,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 ca2b2fabb333..7e951323a7a9 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 be67ea70ba2b..d1c377595e28 100644
--- a/cmd/mii.c
+++ b/cmd/mii.c
@@ -13,6 +13,7 @@
 #include <dm.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 c349ade10f1b..65bc67f6da05 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 5d2a0e002b97..f76fbe28ea25 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 <linux/string.h>
 
 static int curr_device = -1;
diff --git a/cmd/mp.c b/cmd/mp.c
index d82a8675e66f..ed466685319a 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 25c288f356c0..5c7493549953 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 875424013fea..f18a6e70f100 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 787baa78c55e..286d5ee1df51 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 d70206587104..691cef173682 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 e859dfc29bb4..84af5f05e976 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 aac7fb91a606..91214c93e225 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 af974b93fc5f..c71b8b98b9d3 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 2d9ac604cae3..9ad0407521ac 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 f13b3f094fab..ed2bfed03f8f 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 d0172f3fffc4..b5a3b3c0444c 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 b8818b5f3d7a..48a945e30f05 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 6712d9238dc2..3ac12938c8ac 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 84f7c9f37efb..7673469d39f0 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 425e6f984fb1..748c314fa077 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 4470059975a9..0cb6b85504d4 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 f1d23fb478f3..254925c1f78f 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 a9105561b6e7..cdf8940fa9e3 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 660a1b563577..fbb40095aa67 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 d5a1faf7a77b..92d7c0de639d 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 4eda6fa3e947..8a2ac1e3fccb 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 f048494c551c..66d18b5973f0 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 2c7be9c5fe8e..3ce351323ccf 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 29d6e3eac020..9aefaeb14131 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 cf4be7774376..c6a69422ebde 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 89ef440f1dc8..8305d741bb0a 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 95d7b8b6ecc4..c01ee4bd4c9a 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 b7dfeb0adf27..d5488a903ef1 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 7184e44c030e..72662f0e0b11 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 adc6e8147126..0d31b3d47f85 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 4f6869382f2d..9090b8ee4415 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 ad69e6dd7a6c..e95b8cb44067 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 e837064ffdd5..f5e73ba963bc 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 6be51f8c3358..c036df8a1f8c 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 5a9abf440584..98104fb7f2d1 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 943bd0bfc9a2..2df4dc069200 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 4e935b286760..00d589fac072 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 33cc85fa6f08..1a6e80a38666 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 a09d837c0496..0de1ac02ae2b 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 6a9e346f27d6..17f7f192f963 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 707f1a9b87d0..54955f5ef2ff 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 1e2dfab2f491..191199c07625 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 a04d15a2441c..8d3ee93ae223 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 c7edde24d453..b1eeff7a6608 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 7221a8bd2c79..a885c93dc4b8 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 a2d21ffa0a80..3143877dd8c7 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 cc2f4f62e99d..6a6d20096ad0 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 651a3ebcb5d4..912ad274aeba 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 51d5ad78c633..84d919d4467c 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 6b3ecea8b039..be6d076a8841 100644
--- a/cmd/w1.c
+++ b/cmd/w1.c
@@ -8,6 +8,7 @@
 #include <command.h>
 #include <dm.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 fff95a93b327..422be75a0db3 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 f0d634322721..61a9d95e0eb5 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 6bc4fb1c9be4..2f2e205d7100 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 c6016719dc96..11acfaab4d9c 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 3a3dba3cfd38..29b52f7ceda3 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 9a03722a0306..dde1c097c63f 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 407390a95a48..bb2a9ff969e2 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 1effce6f7e55..4ba7e25588ae 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 15f3209b2924..7ddf7c78835e 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 aaacd3ba4b02..901e2a1e253e 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 1987c574d995..2496a3cc6243 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 cd04ad9894df..5417389a9a39 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 4656951675cc..190379f8ac07 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 f077707f9f7e..7a66d337148e 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 556fc60139a5..c3007f575c20 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 9493d1158d40..801d8633bae6 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 e68cf5d48101..d67b0f4f0b81 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 c768e4c8bab1..d506d580914a 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 f6d032038f73..e44fdedc2fa4 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 3a4ba40b743b..d9a1230f26f5 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 af93298ffab3..e01e88b989a1 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 76318ca6ed3c..01353f0157d4 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 61c608858565..565a5ebeed59 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 b8e64c5b6334..80bd8c1c76c2 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 62997f100055..9bf7434ddb25 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 442e61d9fd20..f71477c2963c 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 0ccb4a468802..6c70b88e10ee 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 493ee0ff0d9f..c4eaed2c91ed 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 6cb4ed18ca12..21c10511df15 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 4b3cd302c3e2..9ce703090bc5 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 5680157b7202..fd1039c0ee1e 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 4c852d347547..5fd0119cb59d 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 e6dce1dbf3a6..1f92d791df8a 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 8166d0055b96..99dce118a8f2 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 3f29c91ce48e..eea1507754db 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 5fb6a2d5288f..5cf02ddec2db 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 244bd0a13694..a846fc5dff9a 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 3416bee012f6..9fc002bcf67a 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 e8eb578f6964..46dbf7c7ee60 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 e0d699ce6613..fdde4d61eba9 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 e8c7068081ba..40ae1466788f 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 a321ad2d2207..4c4e5dfe11c7 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 d066d9c920ce..659373791995 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 aa30bf0846e6..f2109c80ce2c 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/ppc.h>
 #include <asm/fsl_serdes.h>
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index f122d154e334..849b6892ba85 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 920a3c9f9014..b55b9daab744 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 1e4b6ba0c6bd..0ada5b693b10 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 fe68d1ffd0ff..e830a9b6f9cc 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 6ac9323420d9..c7b37bfe11bb 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 5c4d24c9c028..08c9b6a3b36c 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 50621e47a4fa..22aaad102838 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 fff359a8035b..664d8f986150 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 b00fe1d13b0e..f590ad8dfa9a 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 26f240b022c4..368cd023578e 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 f6597c273507..e04fc9d2687a 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 31c1d67fe2c0..fe94799b230d 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 fd079951d6f0..5a2fe894a5de 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 7c5ccaa0d00a..9092562fb7c6 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 907358f312e7..2ebb28194888 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 d19685b0ec4c..9138de69e8a2 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 afdad43d331e..b2a1e822feb9 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 b7986a4f47e3..488f950dfcf0 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 645d83c0df87..e3a7670e3d14 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 cf0731bd842a..92a29568342b 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 6780e5ddf43f..481b1914c001 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 <fsl_ddr.h>
 /* For get_ddr_freq() */
diff --git a/drivers/dfu/dfu.c b/drivers/dfu/dfu.c
index 043c03a34921..dad6b5a1e361 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 a3444f131ea6..d34456c82f26 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 ebf4b8b26e8a..679c7713fba9 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 b4abe6005d90..848a9d81d11b 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 b2a5b62d425d..969468e7e412 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 b64570aa4c73..c6c5328602e2 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 62605bcde507..4d9a56bbf5c7 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 f479f2a79e37..6e02e8ff6e30 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 cab6031ccf23..15be04b0898f 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 ab477f5cb91d..966c0024579e 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 325ce4d283fe..dfa383de57d1 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 a7881cc71966..448840ae4fe9 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 3e38848d4cc6..b4f8dba9604c 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 180663ca32f4..1466452d50dc 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 6d497613cc4d..81666c83a595 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 2e371f3ad79c..b4501da67d16 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 06151d21fba1..49236c97722c 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 8ff37f2ecccf..60b8e8e25ac1 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 eac0ff82ae69..d818954ce29c 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 14ecfb42c589..20ad373d023a 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 6f0692997f64..95e1fd643423 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 4ff267899cb6..310e04dd33e7 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 fb2f5a30b6d9..8d9cee050670 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 3e32d70e29d2..adb2079e0835 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 4ffb3aa27f4d..e5fbd291377c 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 00f20c0979cc..7a98469de469 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 3cabd11b5c5e..29ef2dc2c858 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 599df135acfe..df4ca043ac1a 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 eb8b8f65e98f..e7dbeea400d6 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 973854ca6135..20a60fe8b07f 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 21e432d7d80e..9929eed5d1b0 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 d0d869c81a1c..946506b89b28 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 d73748adc4cc..3b7db392b677 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 0e98e08e4a75..57ff9ec2a4a7 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 bd2818197c61..4cf609bdad4c 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 25508cfe672b..672d39c4733e 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 <linux/libfdt.h>
 #include <fdt_support.h>
 #include <linux/string.h>
diff --git a/drivers/misc/k3_avs.c b/drivers/misc/k3_avs.c
index 3468f02208e1..5aabac793093 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 8f0bce6d5659..3aa8e943efb5 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 e5a712fbf1b0..a3fdc5d63cc8 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 56755c66fd2a..f89433141738 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 95d3cad4d0c5..54a34c725981 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 dcbba181c60b..c6fb2a35ace0 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 21ca7bd65d4c..02b4277bd235 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 6b0ea1953127..ba19bd8c7fa0 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 2f882b7df079..ea31330bf112 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 3ac5b4445166..cefe65654c5d 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 1b05e2db9f6d..d8d752d6080a 100644
--- a/drivers/mtd/nand/raw/brcmnand/brcmnand_compat.c
+++ b/drivers/mtd/nand/raw/brcmnand/brcmnand_compat.c
@@ -4,6 +4,7 @@
 #include <dm.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 026419e4e646..1b7918c54b69 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 87494854fc28..a59dae357f32 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 bd73642752bf..7e5aaac23727 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 5e96d3dc6c8d..354d7b47f0f9 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 d41811ecdae9..5f80e115f4db 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 a449b21b5bf2..f07051c9f735 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 e9c50a4852b7..c84e3471266a 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 da68f3519daa..079ffbe7563e 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 bae402418fb1..b7e5cc17ef4d 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 f6c8b57d93d4..212f43ca4daa 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 <linux/bitops.h>
diff --git a/drivers/net/altera_tse.c b/drivers/net/altera_tse.c
index 0c5c2e3053dc..8e58464cc6ce 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 21266d66dd64..a0cbecf60dfc 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 8849195f248d..b759d12867d7 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 8b0205350066..f6b473ae9b00 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 ed17df0392b2..a767fa6e6de1 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 0fcbcf919a02..5df36fa67269 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 9baef753b602..3b0219eee920 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 2abe901a8559..bb36b77169a7 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 1233d7814dde..485e6c0cdcc6 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 151ae3e038d1..5041a1894eed 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 6af5b32e413a..7e37ade1e9c0 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 1272e915f0e2..a8a20a080120 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 2116f31cf767..802d04a26baa 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 73228d9e5685..a1e051770c7e 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 79eb1497930a..669f3af7aeeb 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 308b2baf936a..7d65ee70be4b 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 608e2add6cc1..924632c39913 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 53f1300eaf80..e7ba37c0e665 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 <linux/bug.h>
 #include <linux/types.h>
diff --git a/drivers/net/fsl-mc/mc.c b/drivers/net/fsl-mc/mc.c
index aa0cfee67ae6..3a7e8e84b468 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 d983841bafd5..ed302eace59f 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 474714da9585..9bca18e94076 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 26901136d585..e2b897a7cccf 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 6ce47832a68b..2ff318cb9a9e 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 c1b6d8195b5c..65b160f8c40c 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 0bc2c21e5990..7c26c60ff2b0 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 5de15c9684f2..ac0487e68d28 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 fcb940037a38..3d6b2fa8eb4b 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 cef4b31dd247..94939c590f6e 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 6687787b1a6a..de257d4d60f4 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 b8739562b731..1eea520b8762 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 0ad215da92f0..ad86820bbb09 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 227f22f7e050..45f4e004c9ca 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 996534792583..ce7cf045f735 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 98a56cb8de1d..9baa1004bf36 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 1819c24a843e..f705a0264319 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 432d2b0121c8..b4bbd9429fd3 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 b0aeb470a199..bb07369d32f9 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 aef5e7e4fd79..41231a0a773f 100644
--- a/drivers/net/pcnet.c
+++ b/drivers/net/pcnet.c
@@ -15,6 +15,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 365a74aa094b..4a189f7b280a 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 4fb81ab0cd40..4848e2e2aa91 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 0f682d1cfdd8..4cc55b36885a 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 34ba893dcdb9..2e4796f5d6c8 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 a02d620d9663..18e9f5ab25ce 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 977102d4d803..c11ddf765f62 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 8f76279c7eed..b3f392cb8bf3 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 42169e996832..ba0f477bf23b 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 84f3fa473c75..69f895f720b3 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 9b279d48002c..036642b223b8 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 a28ccc8c18ab..196020c1b812 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 9288355fb4ad..13ec074acacb 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 b0d83de8cbd8..0715cf81c740 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 f4cb86d10a74..e47d5a2a5c55 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 b4647554bcec..19041be320ef 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 4dd205c1507f..96bbb219d5d6 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 17ce68baffe5..afcb170be329 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 0a8369f96e39..530341faa3f3 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 b1bb27fb7f80..4ae225e879f4 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 277e31e1f397..9fb2900d55f9 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 8b3b60570d73..9ce57335bc68 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 ba4ce355b729..0f51109e7a3b 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 <asm/ppc.h>
diff --git a/drivers/pci/pci-uclass.c b/drivers/pci/pci-uclass.c
index 72f47321b7e6..32b6f0619e22 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 b6a147ec1f51..4eac485f2788 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 07c34fe74daf..57edb22d8192 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 a94ab8310c6f..8318b9ee7962 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 db62fd45f8f2..16c412b245d6 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 6c8a990f57b0..af10ead601f1 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 c6cb941d0a95..8246aa6890e1 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 159f3406a203..90c5e1648967 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 639eb849db45..8a3c292548e5 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 0fe1b3488099..1e8c345b8477 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 b33122946838..28db1116387e 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 09414f6627f3..d446982c4e76 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 2c437c25f69e..dc063e087e82 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 79a523330536..f821959137e0 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 98232fad3984..998b90f803f3 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 a7df7965f641..35be5d907325 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 48acb6d744e4..c6973dad3a80 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 cd3ef1789677..7c14fe35e587 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 d765cd1f5958..49adc58165d7 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 dcf3590c6c39..3726a39335ef 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 1b8cb5949660..3f61addac31c 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 911bc2223db1..1f39ce5ea497 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 e758abe9ee99..34c9af7214b9 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 2d73b768b49d..02ee683303d8 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 8707dead754c..822c890031ad 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 87daf65d7fe0..f01b1e53e981 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 21775a5aed63..05ed89bf8d67 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 6f940d23e7a2..1a5e256d61a3 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 2ef344a46ecf..191263a0d636 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 151bba4ab66a..71e1acbde083 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 6fc126f404b7..a97d03a88760 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 5c82ad84fc21..dbc0f316d64d 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 94285403ca23..0d26cf17d565 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 9320a8be685b..7dbbe1f43cf7 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 d7cef659ea4a..7e08bf9dc543 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 2d0abca3200c..bd4301bcbb6a 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 <asm/ppc.h>
diff --git a/drivers/timer/tsc_timer.c b/drivers/timer/tsc_timer.c
index b4c40fe1c2d5..f211f9fe142f 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 8a1c65bbe8cd..24b1e2448603 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 a7c94c7429bc..885b3e2c148e 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 70e4e258db1b..437f65cc395b 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 52fb3a9235f4..6303187180f1 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 e8391eaa1e6d..29062b15641c 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 9ef0f3347338..63b86b131bcc 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 bc96c7354d8c..4b1cf36d9b9b 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 f648ea406d75..bd9c08e06cb9 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 5c3ce1372444..2b6b3714087c 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 a08c6945590f..4fbd450fed38 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 d4aaa19dad62..535935ac7237 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 b62b120d96f4..5382447eb72d 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 55324118ae7c..c33e0894e10a 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 cbf2b12ffb07..fe98a581d0d5 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 fa983257f300..8191b85eb4d6 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 d4fcda1ecd36..b3bca81059c3 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 c9bbc4035c1f..bbc03c7ea586 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 d1b51201a35b..1f60fc499b94 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 fb645f22e420..d90850074411 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 c7b0a9651885..caab17473dfc 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 927495d0b8d7..9ddbb5c0f214 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 a220d1517615..8723c656e0b5 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 11d703eb3320..142bd99c698d 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 45b82da4f4a7..35bd319de8a1 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 4d3b6527ac9a..45c3418e7f84 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 eb03956e9105..8d095c7fe241 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 a696c5a5b476..0a537fc45527 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 20987b77ade2..f9d30b5b76dd 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 c6e346d5d805..ceac6a82b644 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 4867c2e792e4..bbec87743104 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 d7938ac2cbd4..6ac6d0e69ac0 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 af92a83d6a0b..5edef8924e8d 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 426418415afd..7e62e4f41ce5 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/ppc.h>
 #include <linux/string.h>
diff --git a/drivers/video/mx3fb.c b/drivers/video/mx3fb.c
index ff29773170b4..c0e0d1e5ea38 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 82a94507b2ea..bb1eb3778272 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 6912177993d0..128fa88648f5 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 bb8555000a96..398f1a97e046 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 f1781dbb6661..ba0fa3589f6b 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 5264fc209c9c..50e143bb9e55 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 992118c60758..95b7360656a3 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 a617fffd7aa6..59deadeec33a 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 7a5926ebe640..cc3378d87583 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 2a2abb9d499c..1e5589f004c6 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 a958c7148283..a9cabafacdcb 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 21d3c54d85d6..4afabf673653 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 1d32aa90342a..9e4e883d9d22 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 975e29d00b11..12fab86e4706 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 cd3bae21e1fd..b8ce3d8f266a 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 2bd0073cc591..77178e0e28a0 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 ebb0d1c1571f..62b03731f8d1 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 deb2d21b0a24..ab48f10310c6 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 91ed09888e7c..a3ff0044788c 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 31c3d462132f..2b7a422fbe19 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 818295642ddb..0c99e1707d0a 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 935cf594c3b4..28a6713ed716 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 2290083eba40..901a3d05affa 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 cefbb5f69c5b..f891f3ade90b 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 17c3947c82df..54078471bec7 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 ec4b511d492f..46f7fe89daa0 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 14cb3cff0551..826668505ca4 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 0e72a68bced0..98600db09dcb 100644
--- a/lib/efi_driver/efi_block_device.c
+++ b/lib/efi_driver/efi_block_device.c
@@ -33,6 +33,7 @@
 #include <dm.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 8b057ef18902..063067c05c05 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 <linux/libfdt_env.h>
 #include <linux/string.h>
diff --git a/lib/efi_loader/efi_device_path.c b/lib/efi_loader/efi_device_path.c
index d3b1e273b9b8..d4820fa5f0b0 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 ece99eb94243..b0f213d72b97 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 6a66b5cf2923..ecbd14817ad3 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 91c458ceea4b..4a668eab8429 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 8370ecd11ea3..faf7be634f39 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 897b2d262993..50e773260ef7 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 3a0861c7d38a..285610562285 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 a563d397bf55..030d21fc2b91 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 0a8a557319cf..eb2d52e849bf 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 209edc73b99f..5846030ac136 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 2267a8d4fb91..a01868d8520c 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 a8f4f089f138..c894e7a6b9b6 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 009e67d417a2..e6f69b31e478 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 4d65bd9eeb5f..60a0619aafc9 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 21fc4c7c865e..93bcab46112f 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 e6f342872959..37f53dad235b 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 63efc114f841..91f99bcb5ff0 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 bea265b3674c..2a4449489ff9 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 f5d4f85fe247..6e9f2fc57d15 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 fe19914659bf..ffb91a64900c 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 6eae0746d4d5..9af7971fc492 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 44047abe7c96..5e8276b9bcec 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 13f0f2b850b3..f2e906dfe8cf 100644
--- a/net/eth_legacy.c
+++ b/net/eth_legacy.c
@@ -14,6 +14,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 ce6b55f87def..1aa977d00879 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 c675d8076a56..76ff7d32e0bb 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 e2de4a17ff4b..5b600800a050 100644
--- a/net/tftp.c
+++ b/net/tftp.c
@@ -17,6 +17,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 ad700975846b..dee7ff1ce142 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 4eef4048de48..c2634d0a0167 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 339cc19ba14a..4331eac02fec 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/lib/sscanf.c b/test/lib/sscanf.c
index 0b0d9c179246..467a21181731 100644
--- a/test/lib/sscanf.c
+++ b/test/lib/sscanf.c
@@ -13,6 +13,7 @@
 #include <command.h>
 #include <log.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <test/lib.h>
 #include <test/test.h>
 #include <test/ut.h>
diff --git a/test/log/log_test.c b/test/log/log_test.c
index 6b263557945c..ffade6d14b16 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 206a72c789c1..d317cbf5562b 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 26d96336f36b..ace35c18a428 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 12e3de619a12..8edff967fa1d 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.17.1

^ permalink raw reply related	[flat|nested] 35+ messages in thread

* [RFCv2 11/16] common: Drop errno.h from common header
  2020-08-19 13:08 ` [RFCv2] common: Drop remaining includes in common.h Tom Rini
                     ` (9 preceding siblings ...)
  2020-08-19 13:09   ` [RFCv2 10/16] common: Drop vsprintf.h " Tom Rini
@ 2020-08-19 13:09   ` Tom Rini
  2020-08-19 13:09   ` [RFCv2 12/16] common: Drop linux/kernel.h " Tom Rini
                     ` (5 subsequent siblings)
  16 siblings, 0 replies; 35+ messages in thread
From: Tom Rini @ 2020-08-19 13:09 UTC (permalink / raw)
  To: u-boot

From: Simon Glass <sjg@chromium.org>

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

Signed-off-by: Simon Glass <sjg@chromium.org>
---
 arch/arm/cpu/arm926ejs/mx25/generic.c               |  1 +
 arch/arm/cpu/armv7/s5p-common/pwm.c                 |  1 +
 arch/arm/cpu/armv7/vf610/generic.c                  |  1 +
 arch/arm/cpu/armv7/virt-dt.c                        |  1 +
 arch/arm/cpu/armv7m/cache.c                         |  1 +
 arch/arm/cpu/armv8/fsl-layerscape/ppa.c             |  1 +
 arch/arm/cpu/armv8/fsl-layerscape/soc.c             |  1 +
 arch/arm/cpu/armv8/s32v234/generic.c                |  1 +
 arch/arm/cpu/armv8/sec_firmware.c                   |  1 +
 arch/arm/cpu/armv8/spin_table.c                     |  1 +
 arch/arm/cpu/pxa/cpuinfo.c                          |  1 +
 arch/arm/include/asm/arch-tegra/cboot.h             |  1 +
 arch/arm/lib/gic-v3-its.c                           |  1 +
 arch/arm/mach-aspeed/ast2500/sdram_ast2500.c        |  1 +
 arch/arm/mach-bcm283x/msg.c                         |  1 +
 arch/arm/mach-imx/cmd_nandbcb.c                     |  1 +
 arch/arm/mach-imx/imx8/ahab.c                       |  1 +
 arch/arm/mach-imx/imx8/cpu.c                        |  1 +
 arch/arm/mach-imx/imx8/fdt.c                        |  1 +
 arch/arm/mach-imx/imx8/image.c                      |  1 +
 arch/arm/mach-imx/imx8/parse-container.c            |  1 +
 arch/arm/mach-imx/imx8/snvs_security_sc.c           |  1 +
 arch/arm/mach-imx/imx8m/clock_imx8mm.c              |  1 +
 arch/arm/mach-imx/imx8m/clock_imx8mq.c              |  1 +
 arch/arm/mach-imx/imx8m/clock_slice.c               |  1 +
 arch/arm/mach-imx/imx8m/soc.c                       |  1 +
 arch/arm/mach-imx/imx_bootaux.c                     |  1 +
 arch/arm/mach-imx/mx7ulp/clock.c                    |  1 +
 arch/arm/mach-imx/mx7ulp/pcc.c                      |  1 +
 arch/arm/mach-imx/mx7ulp/scg.c                      |  1 +
 arch/arm/mach-ipq40xx/clock-ipq4019.c               |  1 +
 arch/arm/mach-ipq40xx/pinctrl-snapdragon.c          |  1 +
 arch/arm/mach-k3/sysfw-loader.c                     |  1 +
 arch/arm/mach-keystone/cmd_mon.c                    |  1 +
 arch/arm/mach-meson/board-common.c                  |  1 +
 arch/arm/mach-meson/board-g12a.c                    |  1 +
 arch/arm/mach-meson/board-gx.c                      |  1 +
 arch/arm/mach-meson/sm.c                            |  1 +
 arch/arm/mach-mvebu/arm64-common.c                  |  1 +
 arch/arm/mach-mvebu/armada3700/cpu.c                |  1 +
 arch/arm/mach-mvebu/efuse.c                         |  1 +
 arch/arm/mach-nexell/clock.c                        |  1 +
 arch/arm/mach-omap2/sec-common.c                    |  1 +
 arch/arm/mach-rockchip/board.c                      |  1 +
 arch/arm/mach-rockchip/boot_mode.c                  |  1 +
 arch/arm/mach-rockchip/spl-boot-order.c             |  1 +
 arch/arm/mach-snapdragon/clock-snapdragon.c         |  1 +
 arch/arm/mach-snapdragon/dram.c                     |  1 +
 arch/arm/mach-snapdragon/pinctrl-snapdragon.c       |  1 +
 arch/arm/mach-socfpga/board.c                       |  1 +
 arch/arm/mach-socfpga/clock_manager_agilex.c        |  1 +
 arch/arm/mach-socfpga/clock_manager_arria10.c       |  1 +
 arch/arm/mach-socfpga/mailbox_s10.c                 |  1 +
 arch/arm/mach-socfpga/misc.c                        |  1 +
 arch/arm/mach-socfpga/misc_gen5.c                   |  1 +
 arch/arm/mach-socfpga/misc_s10.c                    |  1 +
 arch/arm/mach-socfpga/pinmux_arria10.c              |  1 +
 arch/arm/mach-socfpga/scan_manager.c                |  1 +
 arch/arm/mach-socfpga/wrap_iocsr_config.c           |  1 +
 arch/arm/mach-stm32mp/bsec.c                        |  1 +
 arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c     |  1 +
 .../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-stm32mp/include/mach/stm32mp1_smc.h   |  1 +
 arch/arm/mach-stm32mp/pwr_regulator.c               |  1 +
 arch/arm/mach-stm32mp/spl.c                         |  1 +
 arch/arm/mach-sunxi/cpu_info.c                      |  1 +
 arch/arm/mach-sunxi/dram_sun8i_a33.c                |  1 +
 arch/arm/mach-sunxi/dram_sun8i_a83t.c               |  1 +
 arch/arm/mach-sunxi/p2wi.c                          |  1 +
 arch/arm/mach-sunxi/rsb.c                           |  1 +
 arch/arm/mach-tegra/cboot.c                         |  1 +
 arch/arm/mach-tegra/clock.c                         |  1 +
 arch/arm/mach-tegra/ivc.c                           |  1 +
 arch/arm/mach-tegra/powergate.c                     |  1 +
 arch/arm/mach-tegra/tegra124/xusb-padctl.c          |  1 +
 arch/arm/mach-tegra/tegra20/clock.c                 |  1 +
 arch/arm/mach-tegra/tegra210/clock.c                |  1 +
 arch/arm/mach-tegra/tegra210/xusb-padctl.c          |  1 +
 arch/arm/mach-tegra/tegra30/clock.c                 |  1 +
 arch/arm/mach-tegra/xusb-padctl-common.c            |  1 +
 arch/arm/mach-tegra/xusb-padctl-dummy.c             |  1 +
 arch/arm/mach-zynq/clk.c                            |  1 +
 arch/arm/mach-zynq/cpu.c                            |  1 +
 arch/arm/mach-zynqmp/cpu.c                          |  1 +
 arch/m68k/lib/fec.c                                 |  1 +
 arch/nios2/cpu/cpu.c                                |  1 +
 arch/powerpc/cpu/mpc85xx/ether_fcc.c                |  1 +
 arch/riscv/lib/andes_plic.c                         |  1 +
 arch/riscv/lib/image.c                              |  1 +
 arch/riscv/lib/sbi.c                                |  1 +
 arch/riscv/lib/smp.c                                |  1 +
 arch/sandbox/cpu/cpu.c                              |  1 +
 arch/sandbox/cpu/eth-raw-os.c                       |  1 +
 arch/sandbox/cpu/os.c                               |  1 +
 arch/sandbox/cpu/sdl.c                              |  1 +
 arch/sandbox/cpu/spl.c                              |  1 +
 arch/sandbox/cpu/start.c                            |  1 +
 arch/sandbox/cpu/state.c                            |  1 +
 arch/sandbox/include/asm/sdl.h                      |  1 +
 arch/sandbox/lib/pci_io.c                           |  1 +
 arch/x86/cpu/acpi_gpe.c                             |  1 +
 arch/x86/cpu/apollolake/fsp_bindings.c              |  1 +
 arch/x86/cpu/apollolake/fsp_m.c                     |  1 +
 arch/x86/cpu/apollolake/fsp_s.c                     |  1 +
 arch/x86/cpu/apollolake/lpc.c                       |  1 +
 arch/x86/cpu/apollolake/punit.c                     |  1 +
 arch/x86/cpu/apollolake/spl.c                       |  1 +
 arch/x86/cpu/apollolake/uart.c                      |  1 +
 arch/x86/cpu/broadwell/adsp.c                       |  1 +
 arch/x86/cpu/broadwell/cpu.c                        |  1 +
 arch/x86/cpu/broadwell/cpu_from_spl.c               |  1 +
 arch/x86/cpu/broadwell/cpu_full.c                   |  1 +
 arch/x86/cpu/broadwell/iobp.c                       |  1 +
 arch/x86/cpu/broadwell/me.c                         |  1 +
 arch/x86/cpu/broadwell/pch.c                        |  1 +
 arch/x86/cpu/broadwell/pinctrl_broadwell.c          |  1 +
 arch/x86/cpu/broadwell/refcode.c                    |  1 +
 arch/x86/cpu/broadwell/sdram.c                      |  1 +
 arch/x86/cpu/coreboot/tables.c                      |  1 +
 arch/x86/cpu/cpu.c                                  |  1 +
 arch/x86/cpu/cpu_x86.c                              |  1 +
 arch/x86/cpu/efi/payload.c                          |  1 +
 arch/x86/cpu/i386/cpu.c                             |  1 +
 arch/x86/cpu/i386/interrupt.c                       |  1 +
 arch/x86/cpu/intel_common/cpu.c                     |  1 +
 arch/x86/cpu/intel_common/itss.c                    |  1 +
 arch/x86/cpu/intel_common/lpc.c                     |  1 +
 arch/x86/cpu/intel_common/microcode.c               |  1 +
 arch/x86/cpu/intel_common/mrc.c                     |  1 +
 arch/x86/cpu/intel_common/p2sb.c                    |  1 +
 arch/x86/cpu/irq.c                                  |  1 +
 arch/x86/cpu/ivybridge/bd82x6x.c                    |  1 +
 arch/x86/cpu/ivybridge/cpu.c                        |  1 +
 arch/x86/cpu/ivybridge/early_me.c                   |  1 +
 arch/x86/cpu/ivybridge/lpc.c                        |  1 +
 arch/x86/cpu/ivybridge/model_206ax.c                |  1 +
 arch/x86/cpu/ivybridge/sdram.c                      |  1 +
 arch/x86/cpu/mp_init.c                              |  1 +
 arch/x86/cpu/mtrr.c                                 |  1 +
 arch/x86/cpu/qemu/cpu.c                             |  1 +
 arch/x86/cpu/qfw_cpu.c                              |  1 +
 arch/x86/cpu/quark/dram.c                           |  1 +
 arch/x86/cpu/slimbootloader/serial.c                |  1 +
 arch/x86/cpu/tangier/pinmux.c                       |  1 +
 arch/x86/cpu/tangier/sdram.c                        |  1 +
 arch/x86/cpu/tangier/sysreset.c                     |  1 +
 arch/x86/include/asm/mp.h                           |  1 +
 arch/x86/lib/acpi_nhlt.c                            |  1 +
 arch/x86/lib/acpi_table.c                           |  1 +
 arch/x86/lib/bootm.c                                |  1 +
 arch/x86/lib/fsp/fsp_common.c                       |  1 +
 arch/x86/lib/fsp/fsp_graphics.c                     |  1 +
 arch/x86/lib/fsp2/fsp_dram.c                        |  1 +
 arch/x86/lib/fsp2/fsp_init.c                        |  1 +
 arch/x86/lib/fsp2/fsp_meminit.c                     |  1 +
 arch/x86/lib/fsp2/fsp_silicon_init.c                |  1 +
 arch/x86/lib/fsp2/fsp_support.c                     |  1 +
 arch/x86/lib/i8254.c                                |  1 +
 arch/x86/lib/mpspec.c                               |  1 +
 arch/x86/lib/mrccache.c                             |  1 +
 arch/x86/lib/pinctrl_ich6.c                         |  1 +
 arch/x86/lib/sfi.c                                  |  1 +
 arch/x86/lib/spl.c                                  |  1 +
 arch/x86/lib/tpl.c                                  |  1 +
 arch/x86/lib/zimage.c                               |  1 +
 board/AndesTech/ax25-ae350/ax25-ae350.c             |  1 +
 board/CZ.NIC/turris_mox/mox_sp.c                    |  1 +
 board/CZ.NIC/turris_mox/turris_mox.c                |  1 +
 board/CZ.NIC/turris_omnia/turris_omnia.c            |  1 +
 board/Marvell/mvebu_armada-37xx/board.c             |  1 +
 board/Marvell/mvebu_armada-8k/board.c               |  1 +
 board/alliedtelesis/common/gpio_hog.c               |  1 +
 board/alliedtelesis/x530/x530.c                     |  1 +
 board/armltd/vexpress/vexpress_common.c             |  1 +
 board/atmel/common/mac-spi-nor.c                    |  1 +
 board/bachmann/ot1200/ot1200.c                      |  1 +
 board/beacon/beacon-rzg2m/beacon-rzg2m.c            |  1 +
 board/beacon/imx8mm/spl.c                           |  1 +
 board/bluegiga/apx4devkit/apx4devkit.c              |  1 +
 board/bosch/guardian/board.c                        |  1 +
 board/bosch/shc/board.c                             |  1 +
 board/broadcom/bcmns3/ns3.c                         |  1 +
 board/broadcom/bcmstb/bcmstb.c                      |  1 +
 board/ccv/xpress/xpress.c                           |  1 +
 board/compulab/cl-som-imx7/cl-som-imx7.c            |  1 +
 board/compulab/cm_fx6/cm_fx6.c                      |  1 +
 board/compulab/common/eeprom.c                      |  1 +
 board/compulab/common/eeprom.h                      |  1 +
 board/congatec/cgtqmx6eval/cgtqmx6eval.c            |  1 +
 board/creative/xfi3/xfi3.c                          |  1 +
 board/dhelectronics/dh_imx6/dh_imx6.c               |  1 +
 board/dhelectronics/dh_stm32mp1/board.c             |  1 +
 board/emulation/qemu-arm/qemu-arm.c                 |  1 +
 board/engicam/common/board.c                        |  1 +
 board/esd/vme8349/vme8349.c                         |  1 +
 board/freescale/common/fsl_validate.c               |  1 +
 board/freescale/common/mc34vr500.c                  |  1 +
 board/freescale/common/pfuze.c                      |  1 +
 board/freescale/imx8mm_evk/spl.c                    |  1 +
 board/freescale/imx8mq_evk/spl.c                    |  1 +
 board/freescale/ls1012ardb/ls1012ardb.c             |  1 +
 board/freescale/mpc8308rdb/sdram.c                  |  1 +
 board/freescale/mpc8313erdb/sdram.c                 |  1 +
 board/freescale/mpc8315erdb/sdram.c                 |  1 +
 board/freescale/mpc8323erdb/mpc8323erdb.c           |  1 +
 board/freescale/mpc832xemds/mpc832xemds.c           |  1 +
 board/freescale/mpc8349emds/mpc8349emds.c           |  1 +
 board/freescale/mpc8349itx/mpc8349itx.c             |  1 +
 board/freescale/mpc837xemds/mpc837xemds.c           |  1 +
 board/freescale/mpc837xerdb/mpc837xerdb.c           |  1 +
 board/freescale/mx25pdk/mx25pdk.c                   |  1 +
 board/freescale/mx28evk/mx28evk.c                   |  1 +
 board/freescale/mx6slevk/mx6slevk.c                 |  1 +
 board/freescale/mx6sllevk/mx6sllevk.c               |  1 +
 board/freescale/mx6sxsabreauto/mx6sxsabreauto.c     |  1 +
 board/freescale/mx6sxsabresd/mx6sxsabresd.c         |  1 +
 board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c   |  1 +
 board/freescale/mx7dsabresd/mx7dsabresd.c           |  1 +
 board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c         |  1 +
 board/freescale/p2041rdb/ddr.c                      |  1 +
 board/freescale/qemu-ppce500/qemu-ppce500.c         |  1 +
 board/friendlyarm/nanopi2/onewire.c                 |  1 +
 board/gateworks/gw_ventana/gw_ventana.c             |  1 +
 board/gdsys/a38x/ihs_phys.c                         |  1 +
 board/gdsys/mpc8308/hrcon.c                         |  1 +
 board/gdsys/mpc8308/sdram.c                         |  1 +
 board/gdsys/mpc8308/strider.c                       |  1 +
 board/ge/common/ge_common.c                         |  1 +
 board/ge/common/vpd_reader.c                        | 13 +++++++------
 board/ge/common/vpd_reader.h                        |  2 --
 board/google/imx8mq_phanbell/spl.c                  |  1 +
 board/ids/ids8313/ids8313.c                         |  1 +
 board/intel/cougarcanyon2/cougarcanyon2.c           |  1 +
 board/intel/edison/edison.c                         |  1 +
 board/keymile/km83xx/km83xx.c                       |  1 +
 board/liebherr/display5/spl.c                       |  1 +
 board/liebherr/mccmon6/spl.c                        |  1 +
 board/nvidia/jetson-tk1/jetson-tk1.c                |  1 +
 board/ppcag/bg0900/bg0900.c                         |  1 +
 board/renesas/grpeach/grpeach.c                     |  1 +
 board/renesas/ulcb/cpld.c                           |  1 +
 board/samsung/common/board.c                        |  1 +
 board/samsung/common/exynos5-dt.c                   |  1 +
 board/samsung/goni/goni.c                           |  1 +
 board/samsung/trats/trats.c                         |  1 +
 board/samsung/trats2/trats2.c                       |  1 +
 board/samsung/universal_c210/universal.c            |  1 +
 board/sandbox/sandbox.c                             |  1 +
 board/sandisk/sansa_fuze_plus/sfp.c                 |  1 +
 board/siemens/draco/board.c                         |  1 +
 board/siemens/taurus/taurus.c                       |  1 +
 board/sipeed/maix/maix.c                            |  1 +
 board/softing/vining_2000/vining_2000.c             |  1 +
 board/st/common/stm32mp_dfu.c                       |  1 +
 board/st/stm32f429-discovery/stm32f429-discovery.c  |  1 +
 .../st/stm32f429-evaluation/stm32f429-evaluation.c  |  1 +
 board/st/stm32f469-discovery/stm32f469-discovery.c  |  1 +
 board/st/stm32h743-disco/stm32h743-disco.c          |  1 +
 board/st/stm32h743-eval/stm32h743-eval.c            |  1 +
 board/st/stm32mp1/stm32mp1.c                        |  1 +
 board/sunxi/board.c                                 |  1 +
 board/synopsys/hsdk/clk-lib.c                       |  1 +
 board/synopsys/hsdk/env-lib.c                       |  1 +
 board/synopsys/hsdk/hsdk.c                          |  1 +
 board/synopsys/iot_devkit/iot_devkit.c              |  1 +
 board/technexion/pico-imx6ul/pico-imx6ul.c          |  1 +
 board/technexion/pico-imx7d/pico-imx7d.c            |  1 +
 board/theadorable/fpga.c                            |  1 +
 board/ti/am335x/board.c                             |  1 +
 board/ti/am57xx/board.c                             |  1 +
 board/ti/am65x/evm.c                                |  1 +
 board/ti/common/board_detect.c                      |  1 +
 board/ti/j721e/evm.c                                |  1 +
 board/ti/omap5_uevm/evm.c                           |  1 +
 board/toradex/apalis-tk1/apalis-tk1.c               |  1 +
 board/toradex/colibri_imx7/colibri_imx7.c           |  1 +
 board/toradex/common/tdx-cfg-block.c                |  1 +
 board/toradex/verdin-imx8mm/spl.c                   |  1 +
 board/udoo/neo/neo.c                                |  1 +
 board/vscom/baltos/board.c                          |  1 +
 board/wandboard/wandboard.c                         |  1 +
 board/warp/warp.c                                   |  1 +
 board/warp7/warp7.c                                 |  1 +
 board/xilinx/common/board.c                         |  1 +
 .../xilinx/microblaze-generic/microblaze-generic.c  |  1 +
 board/xilinx/versal/board.c                         |  1 +
 board/xilinx/zynq/board.c                           |  1 +
 board/xilinx/zynqmp/cmds.c                          |  1 +
 board/xilinx/zynqmp/zynqmp.c                        |  1 +
 board/xilinx/zynqmp_r5/board.c                      |  1 +
 cmd/acpi.c                                          |  1 +
 cmd/axi.c                                           |  1 +
 cmd/bcb.c                                           |  1 +
 cmd/bind.c                                          |  1 +
 cmd/booti.c                                         |  1 +
 cmd/bootm.c                                         |  1 +
 cmd/button.c                                        |  1 +
 cmd/cpu.c                                           |  1 +
 cmd/efi.c                                           |  1 +
 cmd/elf.c                                           |  1 +
 cmd/ethsw.c                                         |  1 +
 cmd/gpio.c                                          |  1 +
 cmd/gpt.c                                           |  1 +
 cmd/i2c.c                                           |  1 +
 cmd/led.c                                           |  1 +
 cmd/mtd.c                                           |  1 +
 cmd/mvebu/bubt.c                                    |  1 +
 cmd/nand.c                                          |  1 +
 cmd/nvedit.c                                        |  1 +
 cmd/osd.c                                           |  1 +
 cmd/pci.c                                           |  1 +
 cmd/pinmux.c                                        |  1 +
 cmd/pmic.c                                          |  1 +
 cmd/pxe.c                                           |  1 +
 cmd/pxe_utils.c                                     |  1 +
 cmd/regulator.c                                     |  1 +
 cmd/spi.c                                           |  1 +
 cmd/sysboot.c                                       |  1 +
 cmd/tlv_eeprom.c                                    |  1 +
 cmd/tpm-v2.c                                        |  1 +
 cmd/usb_mass_storage.c                              |  1 +
 cmd/wdt.c                                           |  1 +
 common/android_ab.c                                 |  1 +
 common/avb_verify.c                                 |  1 +
 common/bloblist.c                                   |  1 +
 common/board_r.c                                    |  1 +
 common/boot_fit.c                                   |  1 +
 common/bootm.c                                      |  1 +
 common/bootretry.c                                  |  1 +
 common/bootstage.c                                  |  1 +
 common/bouncebuf.c                                  |  1 +
 common/cli_hush.c                                   |  1 +
 common/common_fit.c                                 |  1 +
 common/edid.c                                       |  1 +
 common/image-android.c                              |  1 +
 common/image-fdt.c                                  |  1 +
 common/image-fit-sig.c                              |  1 +
 common/image-fit.c                                  |  1 +
 common/lcd_simplefb.c                               |  1 +
 common/log.c                                        |  1 +
 common/menu.c                                       |  1 +
 common/spl/spl.c                                    |  1 +
 common/spl/spl_dfu.c                                |  1 +
 common/spl/spl_ext.c                                |  1 +
 common/spl/spl_fat.c                                |  1 +
 common/spl/spl_fit.c                                |  1 +
 common/spl/spl_legacy.c                             |  1 +
 common/spl/spl_mmc.c                                |  1 +
 common/spl/spl_net.c                                |  1 +
 common/spl/spl_opensbi.c                            |  1 +
 common/spl/spl_sata.c                               |  1 +
 common/spl/spl_sdp.c                                |  1 +
 common/spl/spl_spi.c                                |  1 +
 common/spl/spl_usb.c                                |  1 +
 common/spl/spl_ymodem.c                             |  1 +
 common/splash.c                                     |  1 +
 common/splash_source.c                              |  1 +
 common/stdio.c                                      |  1 +
 common/update.c                                     |  1 +
 common/usb.c                                        |  1 +
 common/usb_hub.c                                    |  1 +
 common/usb_kbd.c                                    |  1 +
 common/usb_storage.c                                |  1 +
 disk/part.c                                         |  1 +
 disk/part_efi.c                                     |  1 +
 drivers/adc/adc-uclass.c                            |  1 +
 drivers/adc/exynos-adc.c                            |  1 +
 drivers/adc/meson-saradc.c                          |  1 +
 drivers/adc/rockchip-saradc.c                       |  1 +
 drivers/adc/sandbox.c                               |  1 +
 drivers/adc/stm32-adc-core.c                        |  1 +
 drivers/adc/stm32-adc.c                             |  1 +
 drivers/ata/ahci_sunxi.c                            |  1 +
 drivers/ata/fsl_sata.c                              |  1 +
 drivers/ata/sata.c                                  |  1 +
 drivers/ata/sata_ceva.c                             |  1 +
 drivers/ata/sata_sil.c                              |  1 +
 drivers/axi/axi-emul-uclass.c                       |  1 +
 drivers/axi/axi-uclass.c                            |  1 +
 drivers/axi/axi_sandbox.c                           |  1 +
 drivers/axi/ihs_axi.c                               |  1 +
 drivers/axi/sandbox_store.c                         |  1 +
 drivers/bios_emulator/atibios.c                     |  1 +
 drivers/block/blk-uclass.c                          |  1 +
 drivers/block/blk_legacy.c                          |  1 +
 drivers/board/board-uclass.c                        |  1 +
 drivers/board/gazerbeam.c                           |  1 +
 drivers/board/sandbox.c                             |  1 +
 drivers/bootcount/bootcount-uclass.c                |  1 +
 drivers/bootcount/bootcount.c                       |  1 +
 drivers/bootcount/i2c-eeprom.c                      |  1 +
 drivers/bootcount/rtc.c                             |  1 +
 drivers/button/button-gpio.c                        |  1 +
 drivers/button/button-uclass.c                      |  1 +
 drivers/cache/cache-ncore.c                         |  1 +
 drivers/cache/cache-uclass.c                        |  1 +
 drivers/cache/cache-v5l2.c                          |  1 +
 drivers/clk/altera/clk-agilex.c                     |  1 +
 drivers/clk/altera/clk-arria10.c                    |  1 +
 drivers/clk/analogbits/wrpll-cln28hpc.c             |  1 +
 drivers/clk/aspeed/clk_ast2500.c                    |  1 +
 drivers/clk/at91/clk-main.c                         |  1 +
 drivers/clk/at91/clk-plla.c                         |  1 +
 drivers/clk/at91/clk-plladiv.c                      |  1 +
 drivers/clk/at91/clk-system.c                       |  1 +
 drivers/clk/at91/clk-utmi.c                         |  1 +
 drivers/clk/at91/pmc.c                              |  1 +
 drivers/clk/clk-cdce9xx.c                           |  1 +
 drivers/clk/clk-composite.c                         |  1 +
 drivers/clk/clk-divider.c                           |  1 +
 drivers/clk/clk-fixed-factor.c                      |  1 +
 drivers/clk/clk-gate.c                              |  1 +
 drivers/clk/clk-hsdk-cgu.c                          |  1 +
 drivers/clk/clk-mux.c                               |  1 +
 drivers/clk/clk-ti-sci.c                            |  1 +
 drivers/clk/clk-uclass.c                            |  1 +
 drivers/clk/clk.c                                   |  1 +
 drivers/clk/clk_bcm6345.c                           |  1 +
 drivers/clk/clk_boston.c                            |  1 +
 drivers/clk/clk_pic32.c                             |  1 +
 drivers/clk/clk_sandbox.c                           |  1 +
 drivers/clk/clk_sandbox_ccf.c                       |  1 +
 drivers/clk/clk_sandbox_test.c                      |  1 +
 drivers/clk/clk_stm32f.c                            |  1 +
 drivers/clk/clk_stm32h7.c                           |  1 +
 drivers/clk/clk_stm32mp1.c                          |  1 +
 drivers/clk/clk_versal.c                            |  1 +
 drivers/clk/clk_vexpress_osc.c                      |  1 +
 drivers/clk/clk_zynq.c                              |  1 +
 drivers/clk/clk_zynqmp.c                            |  1 +
 drivers/clk/exynos/clk-exynos7420.c                 |  1 +
 drivers/clk/ics8n3qv01.c                            |  1 +
 drivers/clk/imx/clk-composite-8m.c                  |  1 +
 drivers/clk/imx/clk-gate2.c                         |  1 +
 drivers/clk/imx/clk-imx6q.c                         |  1 +
 drivers/clk/imx/clk-imx8.c                          |  1 +
 drivers/clk/imx/clk-imx8mm.c                        |  1 +
 drivers/clk/imx/clk-imx8mn.c                        |  1 +
 drivers/clk/imx/clk-imx8mp.c                        |  1 +
 drivers/clk/imx/clk-imx8qm.c                        |  1 +
 drivers/clk/imx/clk-imx8qxp.c                       |  1 +
 drivers/clk/imx/clk-imxrt1020.c                     |  1 +
 drivers/clk/imx/clk-imxrt1050.c                     |  1 +
 drivers/clk/imx/clk-pfd.c                           |  1 +
 drivers/clk/imx/clk-pll14xx.c                       |  1 +
 drivers/clk/imx/clk-pllv3.c                         |  1 +
 drivers/clk/intel/clk_intel.c                       |  1 +
 drivers/clk/kendryte/bypass.c                       |  1 +
 drivers/clk/kendryte/clk.c                          |  1 +
 drivers/clk/kendryte/pll.c                          |  2 ++
 drivers/clk/mediatek/clk-mt7622.c                   |  1 +
 drivers/clk/mediatek/clk-mt7623.c                   |  1 +
 drivers/clk/mediatek/clk-mt7629.c                   |  1 +
 drivers/clk/mediatek/clk-mtk.c                      |  1 +
 drivers/clk/meson/axg.c                             |  1 +
 drivers/clk/meson/g12a.c                            |  1 +
 drivers/clk/meson/gxbb.c                            |  1 +
 drivers/clk/mpc83xx_clk.c                           |  1 +
 drivers/clk/mpc83xx_clk.h                           |  1 +
 drivers/clk/mtmips/clk-mt7628.c                     |  1 +
 drivers/clk/mvebu/armada-37xx-periph.c              |  1 +
 drivers/clk/mvebu/armada-37xx-tbg.c                 |  1 +
 drivers/clk/owl/clk_owl.c                           |  1 +
 drivers/clk/renesas/clk-rcar-gen2.c                 |  1 +
 drivers/clk/renesas/clk-rcar-gen3.c                 |  1 +
 drivers/clk/renesas/renesas-cpg-mssr.c              |  1 +
 drivers/clk/rockchip/clk_pll.c                      |  1 +
 drivers/clk/rockchip/clk_px30.c                     |  1 +
 drivers/clk/rockchip/clk_rk3036.c                   |  1 +
 drivers/clk/rockchip/clk_rk3128.c                   |  1 +
 drivers/clk/rockchip/clk_rk3188.c                   |  1 +
 drivers/clk/rockchip/clk_rk322x.c                   |  1 +
 drivers/clk/rockchip/clk_rk3288.c                   |  1 +
 drivers/clk/rockchip/clk_rk3308.c                   |  1 +
 drivers/clk/rockchip/clk_rk3328.c                   |  1 +
 drivers/clk/rockchip/clk_rk3368.c                   |  1 +
 drivers/clk/rockchip/clk_rk3399.c                   |  1 +
 drivers/clk/rockchip/clk_rv1108.c                   |  1 +
 drivers/clk/sifive/fu540-prci.c                     |  1 +
 drivers/clk/sunxi/clk_sunxi.c                       |  1 +
 drivers/clk/tegra/tegra-car-clk.c                   |  1 +
 drivers/clk/uniphier/clk-uniphier-core.c            |  1 +
 drivers/core/acpi.c                                 |  1 +
 drivers/core/device-remove.c                        |  1 +
 drivers/core/device.c                               |  1 +
 drivers/core/devres.c                               |  1 +
 drivers/core/lists.c                                |  1 +
 drivers/core/of_access.c                            |  1 +
 drivers/core/of_addr.c                              |  1 +
 drivers/core/of_extra.c                             |  1 +
 drivers/core/ofnode.c                               |  1 +
 drivers/core/read.c                                 |  1 +
 drivers/core/regmap.c                               |  1 +
 drivers/core/root.c                                 |  1 +
 drivers/core/simple-pm-bus.c                        |  1 +
 drivers/core/syscon-uclass.c                        |  1 +
 drivers/core/uclass.c                               |  1 +
 drivers/core/util.c                                 |  1 +
 drivers/cpu/bmips_cpu.c                             |  1 +
 drivers/cpu/cpu-uclass.c                            |  1 +
 drivers/cpu/imx8_cpu.c                              |  1 +
 drivers/cpu/mpc83xx_cpu.c                           |  1 +
 drivers/cpu/riscv_cpu.c                             |  1 +
 drivers/crypto/fsl/fsl_rsa.c                        |  1 +
 drivers/crypto/fsl/jr.c                             |  1 +
 drivers/crypto/fsl/rng.c                            |  1 +
 drivers/crypto/rsa_mod_exp/mod_exp_uclass.c         |  1 +
 drivers/ddr/altera/sdram_agilex.c                   |  1 +
 drivers/ddr/altera/sdram_arria10.c                  |  1 +
 drivers/ddr/altera/sdram_gen5.c                     |  1 +
 drivers/ddr/altera/sdram_soc64.c                    |  1 +
 drivers/ddr/altera/sequencer.c                      |  1 +
 drivers/demo/demo-shape.c                           |  1 +
 drivers/demo/demo-uclass.c                          |  1 +
 drivers/dfu/dfu.c                                   |  1 +
 drivers/dfu/dfu_mmc.c                               |  1 +
 drivers/dfu/dfu_mtd.c                               |  1 +
 drivers/dfu/dfu_ram.c                               |  1 +
 drivers/dfu/dfu_sf.c                                |  1 +
 drivers/dfu/dfu_tftp.c                              |  1 +
 drivers/dma/bcm6348-iudma.c                         |  1 +
 drivers/dma/dma-uclass.c                            |  1 +
 drivers/dma/lpc32xx_dma.c                           |  1 +
 drivers/dma/sandbox-dma-test.c                      |  1 +
 drivers/dma/ti/k3-psil.c                            |  1 +
 drivers/dma/ti/k3-udma.c                            |  1 +
 drivers/fastboot/fb_common.c                        |  1 +
 drivers/fastboot/fb_getvar.c                        |  1 +
 drivers/fastboot/fb_mmc.c                           |  1 +
 drivers/fastboot/fb_nand.c                          |  1 +
 drivers/firmware/firmware-zynqmp.c                  |  1 +
 drivers/firmware/ti_sci.c                           |  1 +
 drivers/fpga/altera.c                               |  1 +
 drivers/fpga/socfpga_arria10.c                      |  1 +
 drivers/fpga/stratix10.c                            |  1 +
 drivers/gpio/74x164_gpio.c                          |  1 +
 drivers/gpio/atmel_pio4.c                           |  1 +
 drivers/gpio/axp_gpio.c                             |  1 +
 drivers/gpio/bcm2835_gpio.c                         |  1 +
 drivers/gpio/bcm6345_gpio.c                         |  1 +
 drivers/gpio/cortina_gpio.c                         |  1 +
 drivers/gpio/da8xx_gpio.c                           |  1 +
 drivers/gpio/dwapb_gpio.c                           |  1 +
 drivers/gpio/gpio-rza1.c                            |  1 +
 drivers/gpio/gpio-uclass.c                          |  1 +
 drivers/gpio/hi6220_gpio.c                          |  1 +
 drivers/gpio/hsdk-creg-gpio.c                       |  1 +
 drivers/gpio/imx_rgpio2p.c                          |  1 +
 drivers/gpio/intel_broadwell_gpio.c                 |  1 +
 drivers/gpio/intel_gpio.c                           |  1 +
 drivers/gpio/intel_ich6_gpio.c                      |  1 +
 drivers/gpio/iproc_gpio.c                           |  1 +
 drivers/gpio/mpc83xx_spisel_boot.c                  |  1 +
 drivers/gpio/mpc8xxx_gpio.c                         |  1 +
 drivers/gpio/mscc_sgpio.c                           |  1 +
 drivers/gpio/msm_gpio.c                             |  1 +
 drivers/gpio/mt7621_gpio.c                          |  1 +
 drivers/gpio/pca953x_gpio.c                         |  1 +
 drivers/gpio/pic32_gpio.c                           |  1 +
 drivers/gpio/pm8916_gpio.c                          |  1 +
 drivers/gpio/s5p_gpio.c                             |  1 +
 drivers/gpio/sandbox.c                              |  1 +
 drivers/gpio/sifive-gpio.c                          |  1 +
 drivers/gpio/spear_gpio.c                           |  1 +
 drivers/gpio/sunxi_gpio.c                           |  1 +
 drivers/gpio/tegra186_gpio.c                        |  1 +
 drivers/gpio/tegra_gpio.c                           |  1 +
 drivers/gpio/vybrid_gpio.c                          |  1 +
 drivers/gpio/xilinx_gpio.c                          |  1 +
 drivers/hwspinlock/hwspinlock-uclass.c              |  1 +
 drivers/hwspinlock/stm32_hwspinlock.c               |  1 +
 drivers/i2c/ast_i2c.c                               |  1 +
 drivers/i2c/at91_i2c.c                              |  1 +
 drivers/i2c/cros_ec_ldo.c                           |  1 +
 drivers/i2c/davinci_i2c.c                           |  1 +
 drivers/i2c/designware_i2c.c                        |  1 +
 drivers/i2c/designware_i2c_pci.c                    |  1 +
 drivers/i2c/exynos_hs_i2c.c                         |  1 +
 drivers/i2c/fsl_i2c.c                               |  1 +
 drivers/i2c/i2c-cortina.c                           |  1 +
 drivers/i2c/i2c-gpio.c                              |  1 +
 drivers/i2c/i2c-uclass.c                            |  1 +
 drivers/i2c/i2c-versatile.c                         |  1 +
 drivers/i2c/ihs_i2c.c                               |  1 +
 drivers/i2c/imx_lpi2c.c                             |  1 +
 drivers/i2c/intel_i2c.c                             |  1 +
 drivers/i2c/iproc_i2c.c                             |  1 +
 drivers/i2c/meson_i2c.c                             |  1 +
 drivers/i2c/muxes/i2c-arb-gpio-challenge.c          |  1 +
 drivers/i2c/muxes/i2c-mux-uclass.c                  |  1 +
 drivers/i2c/muxes/pca954x.c                         |  1 +
 drivers/i2c/mv_i2c.c                                |  1 +
 drivers/i2c/nx_i2c.c                                |  1 +
 drivers/i2c/octeon_i2c.c                            |  1 +
 drivers/i2c/omap24xx_i2c.c                          |  1 +
 drivers/i2c/rcar_i2c.c                              |  1 +
 drivers/i2c/rcar_iic.c                              |  1 +
 drivers/i2c/rk_i2c.c                                |  1 +
 drivers/i2c/s3c24x0_i2c.c                           |  1 +
 drivers/i2c/sandbox_i2c.c                           |  1 +
 drivers/i2c/stm32f7_i2c.c                           |  1 +
 drivers/i2c/tegra186_bpmp_i2c.c                     |  1 +
 drivers/i2c/tegra_i2c.c                             |  1 +
 drivers/i2c/xilinx_xiic.c                           |  1 +
 drivers/input/cros_ec_keyb.c                        |  1 +
 drivers/input/i8042.c                               |  1 +
 drivers/input/keyboard-uclass.c                     |  1 +
 drivers/input/tegra-kbc.c                           |  1 +
 drivers/led/led-uclass.c                            |  1 +
 drivers/led/led_bcm6328.c                           |  1 +
 drivers/led/led_bcm6358.c                           |  1 +
 drivers/led/led_bcm6858.c                           |  1 +
 drivers/led/led_gpio.c                              |  1 +
 drivers/mailbox/k3-sec-proxy.c                      |  1 +
 drivers/mailbox/mailbox-uclass.c                    |  1 +
 drivers/mailbox/sandbox-mbox.c                      |  1 +
 drivers/mailbox/stm32-ipcc.c                        |  1 +
 drivers/mailbox/tegra-hsp.c                         |  1 +
 drivers/mailbox/zynqmp-ipi.c                        |  1 +
 drivers/misc/atsha204a-i2c.c                        |  1 +
 drivers/misc/cros_ec_i2c.c                          |  1 +
 drivers/misc/cros_ec_lpc.c                          |  1 +
 drivers/misc/cros_ec_sandbox.c                      |  1 +
 drivers/misc/cros_ec_spi.c                          |  1 +
 drivers/misc/fs_loader.c                            |  1 +
 drivers/misc/gdsys_ioep.c                           |  1 +
 drivers/misc/gdsys_soc.c                            |  1 +
 drivers/misc/i2c_eeprom.c                           |  1 +
 drivers/misc/i2c_eeprom_emul.c                      |  1 +
 drivers/misc/ihs_fpga.c                             |  1 +
 drivers/misc/imx8/fuse.c                            |  1 +
 drivers/misc/imx8/scu.c                             |  1 +
 drivers/misc/irq-uclass.c                           |  1 +
 drivers/misc/irq_sandbox.c                          |  1 +
 drivers/misc/k3_avs.c                               |  1 +
 drivers/misc/k3_esm.c                               |  1 +
 drivers/misc/microchip_flexcom.c                    |  1 +
 drivers/misc/misc-uclass.c                          |  1 +
 drivers/misc/misc_sandbox.c                         |  1 +
 drivers/misc/mpc83xx_serdes.c                       |  1 +
 drivers/misc/p2sb-uclass.c                          |  1 +
 drivers/misc/p2sb_emul.c                            |  1 +
 drivers/misc/pca9551_led.c                          |  1 +
 drivers/misc/pwrseq-uclass.c                        |  1 +
 drivers/misc/qfw.c                                  |  1 +
 drivers/misc/rockchip-otp.c                         |  1 +
 drivers/misc/sifive-otp.c                           |  1 +
 drivers/misc/smsc_sio1007.c                         |  1 +
 drivers/misc/stm32_rcc.c                            |  1 +
 drivers/misc/stm32mp_fuse.c                         |  1 +
 drivers/misc/swap_case.c                            |  1 +
 drivers/misc/tegra186_bpmp.c                        |  1 +
 drivers/misc/vexpress_config.c                      |  1 +
 drivers/mmc/am654_sdhci.c                           |  1 +
 drivers/mmc/atmel_sdhci.c                           |  1 +
 drivers/mmc/bcm2835_sdhci.c                         |  1 +
 drivers/mmc/bcm2835_sdhost.c                        |  1 +
 drivers/mmc/bcmstb_sdhci.c                          |  1 +
 drivers/mmc/ca_dw_mmc.c                             |  1 +
 drivers/mmc/davinci_mmc.c                           |  1 +
 drivers/mmc/dw_mmc.c                                |  1 +
 drivers/mmc/exynos_dw_mmc.c                         |  1 +
 drivers/mmc/fsl_esdhc.c                             |  1 +
 drivers/mmc/fsl_esdhc_imx.c                         |  1 +
 drivers/mmc/iproc_sdhci.c                           |  1 +
 drivers/mmc/jz_mmc.c                                |  1 +
 drivers/mmc/meson_gx_mmc.c                          |  1 +
 drivers/mmc/mmc-uclass.c                            |  1 +
 drivers/mmc/mmc.c                                   |  1 +
 drivers/mmc/mmc_legacy.c                            |  1 +
 drivers/mmc/mmc_spi.c                               |  1 +
 drivers/mmc/msm_sdhci.c                             |  1 +
 drivers/mmc/mtk-sd.c                                |  1 +
 drivers/mmc/mv_sdhci.c                              |  1 +
 drivers/mmc/mvebu_mmc.c                             |  1 +
 drivers/mmc/nexell_dw_mmc.c                         |  1 +
 drivers/mmc/omap_hsmmc.c                            |  1 +
 drivers/mmc/pci_mmc.c                               |  1 +
 drivers/mmc/renesas-sdhi.c                          |  1 +
 drivers/mmc/rockchip_dw_mmc.c                       |  1 +
 drivers/mmc/rpmb.c                                  |  1 +
 drivers/mmc/s5p_sdhci.c                             |  1 +
 drivers/mmc/sdhci-cadence.c                         |  1 +
 drivers/mmc/sdhci.c                                 |  1 +
 drivers/mmc/snps_dw_mmc.c                           |  1 +
 drivers/mmc/socfpga_dw_mmc.c                        |  1 +
 drivers/mmc/sti_sdhci.c                             |  1 +
 drivers/mmc/stm32_sdmmc2.c                          |  1 +
 drivers/mmc/sunxi_mmc.c                             |  1 +
 drivers/mmc/tangier_sdhci.c                         |  1 +
 drivers/mmc/tegra_mmc.c                             |  1 +
 drivers/mmc/tmio-common.c                           |  1 +
 drivers/mmc/xenon_sdhci.c                           |  1 +
 drivers/mmc/zynq_sdhci.c                            |  1 +
 drivers/mtd/altera_qspi.c                           |  1 +
 drivers/mtd/cfi_flash.c                             |  1 +
 drivers/mtd/hbmc-am654.c                            |  1 +
 drivers/mtd/mtd_uboot.c                             |  1 +
 drivers/mtd/mtdconcat.c                             |  1 +
 drivers/mtd/mtdcore.c                               |  1 +
 drivers/mtd/nand/bbt.c                              |  1 +
 drivers/mtd/nand/core.c                             |  1 +
 drivers/mtd/nand/raw/atmel_nand.c                   |  1 +
 drivers/mtd/nand/raw/davinci_nand.c                 |  1 +
 drivers/mtd/nand/raw/denali_dt.c                    |  1 +
 drivers/mtd/nand/raw/denali_spl.c                   |  1 +
 drivers/mtd/nand/raw/fsmc_nand.c                    |  1 +
 drivers/mtd/nand/raw/mxc_nand.c                     |  1 +
 drivers/mtd/nand/raw/mxc_nand_spl.c                 |  1 +
 drivers/mtd/nand/raw/mxs_nand_dt.c                  |  1 +
 drivers/mtd/nand/raw/mxs_nand_spl.c                 |  1 +
 drivers/mtd/nand/raw/nand.c                         |  1 +
 drivers/mtd/nand/raw/nand_bbt.c                     |  1 +
 drivers/mtd/nand/raw/nand_bch.c                     |  1 +
 drivers/mtd/nand/raw/nand_timings.c                 |  1 +
 drivers/mtd/nand/raw/stm32_fmc2_nand.c              |  1 +
 drivers/mtd/nand/raw/sunxi_nand.c                   |  1 +
 drivers/mtd/nand/raw/sunxi_nand_spl.c               |  1 +
 drivers/mtd/nand/raw/vf610_nfc.c                    |  1 +
 drivers/mtd/nand/spi/core.c                         |  1 +
 drivers/mtd/nand/spi/gigadevice.c                   |  1 +
 drivers/mtd/nand/spi/macronix.c                     |  1 +
 drivers/mtd/nand/spi/micron.c                       |  1 +
 drivers/mtd/nand/spi/toshiba.c                      |  1 +
 drivers/mtd/nand/spi/winbond.c                      |  1 +
 drivers/mtd/pic32_flash.c                           |  1 +
 drivers/mtd/renesas_rpc_hf.c                        |  1 +
 drivers/mtd/spi/sandbox.c                           |  1 +
 drivers/mtd/spi/sf_dataflash.c                      |  1 +
 drivers/mtd/spi/sf_probe.c                          |  1 +
 drivers/mtd/st_smi.c                                |  1 +
 drivers/mtd/ubi/attach.c                            |  1 +
 drivers/mtd/ubi/build.c                             |  1 +
 drivers/mtd/ubi/debug.c                             |  1 +
 drivers/mtd/ubi/eba.c                               |  1 +
 drivers/mtd/ubi/fastmap-wl.c                        |  2 ++
 drivers/mtd/ubi/fastmap.c                           |  1 +
 drivers/mtd/ubi/io.c                                |  1 +
 drivers/mtd/ubi/kapi.c                              |  1 +
 drivers/mtd/ubi/misc.c                              |  1 +
 drivers/mtd/ubi/ubi.h                               |  1 +
 drivers/mtd/ubi/upd.c                               |  1 +
 drivers/mtd/ubi/vmt.c                               |  1 +
 drivers/mtd/ubi/vtbl.c                              |  1 +
 drivers/mtd/ubi/wl.c                                |  1 +
 drivers/mtd/ubispl/ubispl.c                         |  1 +
 drivers/net/ag7xxx.c                                |  1 +
 drivers/net/altera_tse.c                            |  1 +
 drivers/net/armada100_fec.c                         |  1 +
 drivers/net/at91_emac.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/dwc_eth_qos.c                           |  1 +
 drivers/net/dwmac_socfpga.c                         |  1 +
 drivers/net/e1000.c                                 |  1 +
 drivers/net/eepro100.c                              |  1 +
 drivers/net/ep93xx_eth.c                            |  1 +
 drivers/net/eth-phy-uclass.c                        |  1 +
 drivers/net/ethoc.c                                 |  1 +
 drivers/net/fm/eth.c                                |  1 +
 drivers/net/fm/init.c                               |  1 +
 drivers/net/fm/memac_phy.c                          |  1 +
 drivers/net/fsl-mc/dpio/qbman_portal.c              |  1 +
 drivers/net/fsl-mc/mc.c                             |  1 +
 drivers/net/fsl-mc/mc_sys.c                         |  1 +
 drivers/net/fsl_enetc.c                             |  1 +
 drivers/net/fsl_enetc_mdio.c                        |  1 +
 drivers/net/fsl_mcdmafec.c                          |  1 +
 drivers/net/ftgmac100.c                             |  1 +
 drivers/net/ftmac100.c                              |  1 +
 drivers/net/gmac_rockchip.c                         |  1 +
 drivers/net/higmacv300.c                            |  1 +
 drivers/net/ks8851_mll.c                            |  1 +
 drivers/net/ldpaa_eth/ldpaa_eth.c                   |  1 +
 drivers/net/ldpaa_eth/ldpaa_wriop.c                 |  1 +
 drivers/net/ldpaa_eth/lx2160a.c                     |  1 +
 drivers/net/mcffec.c                                |  1 +
 drivers/net/mdio_mux_sandbox.c                      |  1 +
 drivers/net/mdio_sandbox.c                          |  1 +
 drivers/net/mpc8xx_fec.c                            |  1 +
 drivers/net/mscc_eswitch/jr2_switch.c               |  1 +
 drivers/net/mscc_eswitch/luton_switch.c             |  1 +
 drivers/net/mscc_eswitch/mscc_mac_table.c           |  1 +
 drivers/net/mscc_eswitch/mscc_miim.c                |  1 +
 drivers/net/mscc_eswitch/mscc_xfer.c                |  1 +
 drivers/net/mscc_eswitch/ocelot_switch.c            |  1 +
 drivers/net/mscc_eswitch/serval_switch.c            |  1 +
 drivers/net/mscc_eswitch/servalt_switch.c           |  1 +
 drivers/net/mt7628-eth.c                            |  1 +
 drivers/net/mtk_eth.c                               |  1 +
 drivers/net/mvmdio.c                                |  1 +
 drivers/net/pch_gbe.c                               |  1 +
 drivers/net/pcnet.c                                 |  1 +
 drivers/net/pfe_eth/pfe_driver.c                    |  1 +
 drivers/net/pfe_eth/pfe_eth.c                       |  1 +
 drivers/net/pfe_eth/pfe_firmware.c                  |  1 +
 drivers/net/pfe_eth/pfe_mdio.c                      |  1 +
 drivers/net/phy/aquantia.c                          |  1 +
 drivers/net/phy/atheros.c                           |  1 +
 drivers/net/phy/b53.c                               |  1 +
 drivers/net/phy/cortina.c                           |  1 +
 drivers/net/phy/dp83867.c                           |  1 +
 drivers/net/phy/fixed.c                             |  1 +
 drivers/net/phy/marvell.c                           |  1 +
 drivers/net/phy/meson-gxl.c                         |  1 +
 drivers/net/phy/micrel_ksz90x1.c                    |  1 +
 drivers/net/phy/mscc.c                              |  1 +
 drivers/net/phy/mv88e61xx.c                         |  1 +
 drivers/net/phy/ncsi.c                              |  1 +
 drivers/net/phy/phy.c                               |  1 +
 drivers/net/phy/xilinx_gmii2rgmii.c                 |  1 +
 drivers/net/phy/xilinx_phy.c                        |  1 +
 drivers/net/pic32_eth.c                             |  1 +
 drivers/net/pic32_mdio.c                            |  1 +
 drivers/net/ravb.c                                  |  1 +
 drivers/net/rtl8139.c                               |  1 +
 drivers/net/rtl8169.c                               |  1 +
 drivers/net/sandbox-raw-bus.c                       |  1 +
 drivers/net/sandbox.c                               |  1 +
 drivers/net/smc911x.c                               |  1 +
 drivers/net/sni_ave.c                               |  1 +
 drivers/net/sun8i_emac.c                            |  1 +
 drivers/net/sunxi_emac.c                            |  1 +
 drivers/net/ti/am65-cpsw-nuss.c                     |  1 +
 drivers/net/ti/cpsw-common.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/vsc9953.c                               |  1 +
 drivers/net/xilinx_axi_emac.c                       |  1 +
 drivers/nvme/nvme.c                                 |  1 +
 drivers/nvme/nvme_show.c                            |  1 +
 drivers/pch/pch-uclass.c                            |  1 +
 drivers/pch/pch7.c                                  |  1 +
 drivers/pch/pch9.c                                  |  1 +
 drivers/pch/sandbox_pch.c                           |  1 +
 drivers/pci/pci-aardvark.c                          |  1 +
 drivers/pci/pci-emul-uclass.c                       |  1 +
 drivers/pci/pci-rcar-gen2.c                         |  1 +
 drivers/pci/pci-rcar-gen3.c                         |  1 +
 drivers/pci/pci-uclass.c                            |  1 +
 drivers/pci/pci_common.c                            |  1 +
 drivers/pci/pci_mpc85xx.c                           |  1 +
 drivers/pci/pci_rom.c                               |  1 +
 drivers/pci/pci_sandbox.c                           |  1 +
 drivers/pci/pci_sh7751.c                            |  1 +
 drivers/pci/pci_tegra.c                             |  1 +
 drivers/pci/pcie_brcmstb.c                          |  1 +
 drivers/pci/pcie_dw_mvebu.c                         |  1 +
 drivers/pci/pcie_dw_ti.c                            |  1 +
 drivers/pci/pcie_fsl.c                              |  1 +
 drivers/pci/pcie_imx.c                              |  1 +
 drivers/pci/pcie_intel_fpga.c                       |  1 +
 drivers/pci/pcie_layerscape_ep.c                    |  1 +
 drivers/pci/pcie_layerscape_fixup.c                 |  1 +
 drivers/pci/pcie_layerscape_fixup_common.c          |  1 +
 drivers/pci/pcie_layerscape_gen4.c                  |  1 +
 drivers/pci/pcie_layerscape_gen4_fixup.c            |  1 +
 drivers/pci/pcie_layerscape_rc.c                    |  1 +
 drivers/pci/pcie_mediatek.c                         |  1 +
 drivers/pci/pcie_phytium.c                          |  1 +
 drivers/pci/pcie_rockchip.c                         |  1 +
 drivers/pci/pcie_xilinx.c                           |  1 +
 drivers/pci_endpoint/pci_ep-uclass.c                |  1 +
 drivers/pci_endpoint/pcie-cadence-ep.c              |  1 +
 drivers/pci_endpoint/sandbox-pci_ep.c               |  1 +
 drivers/phy/allwinner/phy-sun4i-usb.c               |  1 +
 drivers/phy/bcm6318-usbh-phy.c                      |  1 +
 drivers/phy/bcm6348-usbh-phy.c                      |  1 +
 drivers/phy/bcm6358-usbh-phy.c                      |  1 +
 drivers/phy/bcm6368-usbh-phy.c                      |  1 +
 drivers/phy/keystone-usb-phy.c                      |  1 +
 drivers/phy/meson-g12a-usb2.c                       |  1 +
 drivers/phy/meson-g12a-usb3-pcie.c                  |  1 +
 drivers/phy/meson-gxbb-usb2.c                       |  1 +
 drivers/phy/meson-gxl-usb2.c                        |  1 +
 drivers/phy/meson-gxl-usb3.c                        |  1 +
 drivers/phy/msm8916-usbh-phy.c                      |  1 +
 drivers/phy/mt76x8-usb-phy.c                        |  1 +
 drivers/phy/omap-usb2-phy.c                         |  1 +
 drivers/phy/phy-da8xx-usb.c                         |  1 +
 drivers/phy/phy-mtk-tphy.c                          |  1 +
 drivers/phy/phy-rcar-gen2.c                         |  1 +
 drivers/phy/phy-rcar-gen3.c                         |  1 +
 drivers/phy/phy-stm32-usbphyc.c                     |  1 +
 drivers/phy/phy-ti-am654.c                          |  1 +
 drivers/phy/phy-uclass.c                            |  1 +
 drivers/phy/rockchip/phy-rockchip-inno-usb2.c       |  1 +
 drivers/phy/rockchip/phy-rockchip-pcie.c            |  1 +
 drivers/phy/rockchip/phy-rockchip-typec.c           |  1 +
 drivers/phy/sandbox-phy.c                           |  1 +
 drivers/phy/sti_usb_phy.c                           |  1 +
 drivers/phy/ti-pipe3-phy.c                          |  1 +
 drivers/pinctrl/aspeed/pinctrl_ast2500.c            |  1 +
 drivers/pinctrl/ath79/pinctrl_ar933x.c              |  1 +
 drivers/pinctrl/ath79/pinctrl_qca953x.c             |  1 +
 drivers/pinctrl/broadcom/pinctrl-bcm283x.c          |  1 +
 drivers/pinctrl/broadcom/pinctrl-bcm6838.c          |  1 +
 drivers/pinctrl/exynos/pinctrl-exynos.c             |  1 +
 drivers/pinctrl/exynos/pinctrl-exynos7420.c         |  1 +
 drivers/pinctrl/intel/pinctrl.c                     |  1 +
 drivers/pinctrl/mediatek/pinctrl-mtk-common.c       |  1 +
 drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c       |  1 +
 drivers/pinctrl/meson/pinctrl-meson.c               |  1 +
 drivers/pinctrl/mscc/mscc-common.c                  |  1 +
 drivers/pinctrl/mtmips/pinctrl-mt7628.c             |  1 +
 drivers/pinctrl/mtmips/pinctrl-mtmips-common.c      |  1 +
 drivers/pinctrl/mvebu/pinctrl-armada-37xx.c         |  1 +
 drivers/pinctrl/mvebu/pinctrl-mvebu.c               |  1 +
 drivers/pinctrl/nexell/pinctrl-nexell.c             |  1 +
 drivers/pinctrl/nexell/pinctrl-s5pxx18.c            |  1 +
 drivers/pinctrl/nxp/pinctrl-imx.c                   |  1 +
 drivers/pinctrl/nxp/pinctrl-mxs.c                   |  1 +
 drivers/pinctrl/nxp/pinctrl-scu.c                   |  1 +
 drivers/pinctrl/pinctrl-at91-pio4.c                 |  1 +
 drivers/pinctrl/pinctrl-at91.c                      |  1 +
 drivers/pinctrl/pinctrl-generic.c                   |  1 +
 drivers/pinctrl/pinctrl-single.c                    |  1 +
 drivers/pinctrl/pinctrl-sti.c                       |  1 +
 drivers/pinctrl/pinctrl-stmfx.c                     |  1 +
 drivers/pinctrl/pinctrl-uclass.c                    |  1 +
 drivers/pinctrl/pinctrl_pic32.c                     |  1 +
 drivers/pinctrl/pinctrl_stm32.c                     |  1 +
 drivers/pinctrl/renesas/pfc-r7s72100.c              |  1 +
 drivers/pinctrl/renesas/pfc-r8a7790.c               |  1 +
 drivers/pinctrl/renesas/pfc-r8a7791.c               |  1 +
 drivers/pinctrl/renesas/pfc-r8a7794.c               |  1 +
 drivers/pinctrl/renesas/pfc-r8a77970.c              |  1 +
 drivers/pinctrl/renesas/pfc-r8a77980.c              |  1 +
 drivers/pinctrl/renesas/pfc-r8a77990.c              |  1 +
 drivers/pinctrl/renesas/pfc.c                       |  1 +
 drivers/pinctrl/rockchip/pinctrl-px30.c             |  1 +
 drivers/pinctrl/rockchip/pinctrl-rk3036.c           |  1 +
 drivers/pinctrl/rockchip/pinctrl-rk3128.c           |  1 +
 drivers/pinctrl/rockchip/pinctrl-rk3188.c           |  1 +
 drivers/pinctrl/rockchip/pinctrl-rk322x.c           |  1 +
 drivers/pinctrl/rockchip/pinctrl-rk3288.c           |  1 +
 drivers/pinctrl/rockchip/pinctrl-rk3308.c           |  1 +
 drivers/pinctrl/rockchip/pinctrl-rk3328.c           |  1 +
 drivers/pinctrl/rockchip/pinctrl-rk3368.c           |  1 +
 drivers/pinctrl/rockchip/pinctrl-rk3399.c           |  1 +
 drivers/pinctrl/rockchip/pinctrl-rockchip-core.c    |  1 +
 drivers/pinctrl/rockchip/pinctrl-rv1108.c           |  1 +
 drivers/pinctrl/uniphier/pinctrl-uniphier-core.c    |  1 +
 drivers/power/acpi_pmc/acpi-pmc-uclass.c            |  1 +
 drivers/power/acpi_pmc/pmc_emul.c                   |  1 +
 drivers/power/acpi_pmc/sandbox.c                    |  1 +
 drivers/power/axp152.c                              |  1 +
 drivers/power/axp209.c                              |  1 +
 drivers/power/axp221.c                              |  1 +
 drivers/power/axp809.c                              |  1 +
 drivers/power/axp818.c                              |  1 +
 drivers/power/battery/bat_trats.c                   |  1 +
 drivers/power/battery/bat_trats2.c                  |  1 +
 drivers/power/domain/bcm6328-power-domain.c         |  1 +
 drivers/power/domain/imx8-power-domain-legacy.c     |  1 +
 drivers/power/domain/imx8m-power-domain.c           |  1 +
 drivers/power/domain/meson-ee-pwrc.c                |  1 +
 drivers/power/domain/meson-gx-pwrc-vpu.c            |  1 +
 drivers/power/domain/mtk-power-domain.c             |  1 +
 drivers/power/domain/power-domain-uclass.c          |  1 +
 drivers/power/domain/sandbox-power-domain.c         |  1 +
 drivers/power/domain/ti-sci-power-domain.c          |  1 +
 drivers/power/exynos-tmu.c                          |  1 +
 drivers/power/fuel_gauge/fg_max17042.c              |  1 +
 drivers/power/mfd/fg_max77693.c                     |  1 +
 drivers/power/mfd/muic_max77693.c                   |  1 +
 drivers/power/mfd/pmic_max77693.c                   |  1 +
 drivers/power/pmic/act8846.c                        |  1 +
 drivers/power/pmic/as3722.c                         |  1 +
 drivers/power/pmic/as3722_gpio.c                    |  1 +
 drivers/power/pmic/bd71837.c                        |  1 +
 drivers/power/pmic/da9063.c                         |  1 +
 drivers/power/pmic/fan53555.c                       |  1 +
 drivers/power/pmic/i2c_pmic_emul.c                  |  1 +
 drivers/power/pmic/lp873x.c                         |  1 +
 drivers/power/pmic/lp87565.c                        |  1 +
 drivers/power/pmic/max77686.c                       |  1 +
 drivers/power/pmic/mc34708.c                        |  1 +
 drivers/power/pmic/muic_max8997.c                   |  1 +
 drivers/power/pmic/palmas.c                         |  1 +
 drivers/power/pmic/pca9450.c                        |  1 +
 drivers/power/pmic/pfuze100.c                       |  1 +
 drivers/power/pmic/pm8916.c                         |  1 +
 drivers/power/pmic/pmic-uclass.c                    |  1 +
 drivers/power/pmic/pmic_hi6553.c                    |  1 +
 drivers/power/pmic/pmic_ltc3676.c                   |  1 +
 drivers/power/pmic/pmic_max77696.c                  |  1 +
 drivers/power/pmic/pmic_max8997.c                   |  1 +
 drivers/power/pmic/pmic_max8998.c                   |  1 +
 drivers/power/pmic/pmic_mc34vr500.c                 |  1 +
 drivers/power/pmic/pmic_pca9450.c                   |  1 +
 drivers/power/pmic/pmic_pfuze100.c                  |  1 +
 drivers/power/pmic/pmic_pfuze3000.c                 |  1 +
 drivers/power/pmic/pmic_tps65910_dm.c               |  1 +
 drivers/power/pmic/rk8xx.c                          |  1 +
 drivers/power/pmic/s2mps11.c                        |  1 +
 drivers/power/pmic/s5m8767.c                        |  1 +
 drivers/power/pmic/sandbox.c                        |  1 +
 drivers/power/pmic/stpmic1.c                        |  1 +
 drivers/power/pmic/tps65090.c                       |  1 +
 drivers/power/pmic/tps65941.c                       |  1 +
 drivers/power/power_core.c                          |  1 +
 drivers/power/power_dialog.c                        |  1 +
 drivers/power/power_fsl.c                           |  1 +
 drivers/power/power_i2c.c                           |  1 +
 drivers/power/power_spi.c                           |  1 +
 drivers/power/regulator/act8846.c                   |  1 +
 drivers/power/regulator/as3722_regulator.c          |  1 +
 drivers/power/regulator/bd71837.c                   |  1 +
 drivers/power/regulator/da9063.c                    |  1 +
 drivers/power/regulator/fan53555.c                  |  1 +
 drivers/power/regulator/fixed.c                     |  1 +
 drivers/power/regulator/gpio-regulator.c            |  1 +
 drivers/power/regulator/lp873x_regulator.c          |  1 +
 drivers/power/regulator/lp87565_regulator.c         |  1 +
 drivers/power/regulator/max77686.c                  |  1 +
 drivers/power/regulator/palmas_regulator.c          |  1 +
 drivers/power/regulator/pbias_regulator.c           |  1 +
 drivers/power/regulator/pfuze100.c                  |  1 +
 drivers/power/regulator/pwm_regulator.c             |  1 +
 drivers/power/regulator/regulator-uclass.c          |  1 +
 drivers/power/regulator/regulator_common.c          |  1 +
 drivers/power/regulator/rk8xx.c                     |  1 +
 drivers/power/regulator/s2mps11_regulator.c         |  1 +
 drivers/power/regulator/s5m8767.c                   |  1 +
 drivers/power/regulator/sandbox.c                   |  1 +
 drivers/power/regulator/stm32-vrefbuf.c             |  1 +
 drivers/power/regulator/stpmic1.c                   |  1 +
 drivers/power/regulator/tps62360_regulator.c        |  1 +
 drivers/power/regulator/tps65090_regulator.c        |  1 +
 drivers/power/regulator/tps65910_regulator.c        |  1 +
 drivers/power/regulator/tps65941_regulator.c        |  1 +
 drivers/power/tps6586x.c                            |  1 +
 drivers/pwm/exynos_pwm.c                            |  1 +
 drivers/pwm/pwm-mtk.c                               |  1 +
 drivers/pwm/pwm-sifive.c                            |  1 +
 drivers/pwm/pwm-uclass.c                            |  1 +
 drivers/pwm/rk_pwm.c                                |  1 +
 drivers/pwm/sandbox_pwm.c                           |  1 +
 drivers/pwm/sunxi_pwm.c                             |  1 +
 drivers/pwm/tegra_pwm.c                             |  1 +
 drivers/ram/bmips_ram.c                             |  1 +
 drivers/ram/imxrt_sdram.c                           |  1 +
 drivers/ram/k3-am654-ddrss.c                        |  1 +
 drivers/ram/k3-j721e/k3-j721e-ddrss.c               |  1 +
 drivers/ram/k3-j721e/lpddr4_sanity.h                |  1 +
 drivers/ram/mediatek/ddr3-mt7629.c                  |  1 +
 drivers/ram/mpc83xx_sdram.c                         |  1 +
 drivers/ram/ram-uclass.c                            |  1 +
 drivers/ram/rockchip/dmc-rk3368.c                   |  1 +
 drivers/ram/rockchip/sdram_rk3188.c                 |  1 +
 drivers/ram/rockchip/sdram_rk322x.c                 |  1 +
 drivers/ram/rockchip/sdram_rk3288.c                 |  1 +
 drivers/ram/rockchip/sdram_rk3399.c                 |  1 +
 drivers/ram/sifive/fu540_ddr.c                      |  1 +
 drivers/ram/stm32_sdram.c                           |  1 +
 drivers/ram/stm32mp1/stm32mp1_ddr.c                 |  1 +
 drivers/ram/stm32mp1/stm32mp1_ram.c                 |  1 +
 drivers/remoteproc/k3_system_controller.c           |  1 +
 drivers/remoteproc/rproc-elf-loader.c               |  1 +
 drivers/remoteproc/rproc-uclass.c                   |  1 +
 drivers/remoteproc/sandbox_testproc.c               |  1 +
 drivers/remoteproc/stm32_copro.c                    |  1 +
 drivers/remoteproc/ti_k3_arm64_rproc.c              |  1 +
 drivers/remoteproc/ti_k3_dsp_rproc.c                |  1 +
 drivers/remoteproc/ti_k3_r5f_rproc.c                |  1 +
 drivers/remoteproc/ti_power_proc.c                  |  1 +
 drivers/reset/reset-bcm6345.c                       |  1 +
 drivers/reset/reset-hisilicon.c                     |  1 +
 drivers/reset/reset-hsdk.c                          |  1 +
 drivers/reset/reset-imx7.c                          |  1 +
 drivers/reset/reset-mediatek.c                      |  1 +
 drivers/reset/reset-meson.c                         |  1 +
 drivers/reset/reset-mtmips.c                        |  1 +
 drivers/reset/reset-raspberrypi.c                   |  1 +
 drivers/reset/reset-rockchip.c                      |  1 +
 drivers/reset/reset-sunxi.c                         |  1 +
 drivers/reset/reset-syscon.c                        |  1 +
 drivers/reset/reset-ti-sci.c                        |  1 +
 drivers/reset/reset-uclass.c                        |  1 +
 drivers/reset/reset-uniphier.c                      |  1 +
 drivers/reset/sandbox-reset.c                       |  1 +
 drivers/reset/sti-reset.c                           |  1 +
 drivers/reset/stm32-reset.c                         |  1 +
 drivers/reset/tegra-car-reset.c                     |  1 +
 drivers/rng/meson-rng.c                             |  1 +
 drivers/rng/rng-uclass.c                            |  1 +
 drivers/rng/rockchip_rng.c                          |  1 +
 drivers/rng/stm32mp1_rng.c                          |  1 +
 drivers/rtc/ds3231.c                                |  1 +
 drivers/rtc/ds3232.c                                |  1 +
 drivers/rtc/pl031.c                                 |  1 +
 drivers/rtc/rtc-uclass.c                            |  1 +
 drivers/rtc/rv3029.c                                |  1 +
 drivers/rtc/rx8010sj.c                              |  1 +
 drivers/rtc/rx8025.c                                |  1 +
 drivers/rtc/s35392a.c                               |  1 +
 drivers/rtc/stm32_rtc.c                             |  1 +
 drivers/scsi/scsi-uclass.c                          |  1 +
 drivers/scsi/scsi.c                                 |  1 +
 drivers/serial/altera_jtag_uart.c                   |  1 +
 drivers/serial/altera_uart.c                        |  1 +
 drivers/serial/arm_dcc.c                            |  1 +
 drivers/serial/atmel_usart.c                        |  1 +
 drivers/serial/lpc32xx_hsuart.c                     |  1 +
 drivers/serial/ns16550.c                            |  1 +
 drivers/serial/sandbox.c                            |  1 +
 drivers/serial/serial-uclass.c                      |  1 +
 drivers/serial/serial.c                             |  1 +
 drivers/serial/serial_ar933x.c                      |  1 +
 drivers/serial/serial_bcm283x_mu.c                  |  1 +
 drivers/serial/serial_bcm283x_pl011.c               |  1 +
 drivers/serial/serial_bcm6345.c                     |  1 +
 drivers/serial/serial_cortina.c                     |  1 +
 drivers/serial/serial_efi.c                         |  1 +
 drivers/serial/serial_linflexuart.c                 |  1 +
 drivers/serial/serial_lpuart.c                      |  1 +
 drivers/serial/serial_mcf.c                         |  1 +
 drivers/serial/serial_meson.c                       |  1 +
 drivers/serial/serial_msm.c                         |  1 +
 drivers/serial/serial_mtk.c                         |  1 +
 drivers/serial/serial_mxc.c                         |  1 +
 drivers/serial/serial_nulldev.c                     |  1 +
 drivers/serial/serial_omap.c                        |  1 +
 drivers/serial/serial_owl.c                         |  1 +
 drivers/serial/serial_pic32.c                       |  1 +
 drivers/serial/serial_pl01x.c                       |  1 +
 drivers/serial/serial_pxa.c                         |  1 +
 drivers/serial/serial_s5p.c                         |  1 +
 drivers/serial/serial_sh.c                          |  1 +
 drivers/serial/serial_sifive.c                      |  1 +
 drivers/serial/serial_sti_asc.c                     |  1 +
 drivers/serial/serial_stm32.c                       |  1 +
 drivers/serial/serial_xuartlite.c                   |  1 +
 drivers/serial/serial_zynq.c                        |  1 +
 drivers/smem/msm_smem.c                             |  1 +
 drivers/smem/smem-uclass.c                          |  1 +
 drivers/soc/soc-uclass.c                            |  1 +
 drivers/soc/soc_ti_k3.c                             |  1 +
 drivers/soc/ti/k3-navss-ringacc.c                   |  1 +
 drivers/soc/ti/keystone_serdes.c                    |  1 +
 drivers/sound/broadwell_i2s.c                       |  1 +
 drivers/sound/broadwell_sound.c                     |  1 +
 drivers/sound/codec-uclass.c                        |  1 +
 drivers/sound/da7219.c                              |  1 +
 drivers/sound/hda_codec.c                           |  1 +
 drivers/sound/i2s-uclass.c                          |  1 +
 drivers/sound/max98088.c                            |  1 +
 drivers/sound/max98090.c                            |  1 +
 drivers/sound/max98095.c                            |  1 +
 drivers/sound/max98357a.c                           |  1 +
 drivers/sound/rockchip_i2s.c                        |  1 +
 drivers/sound/rockchip_sound.c                      |  1 +
 drivers/sound/rt5677.c                              |  1 +
 drivers/sound/samsung-i2s.c                         |  1 +
 drivers/sound/samsung_sound.c                       |  1 +
 drivers/sound/sandbox.c                             |  1 +
 drivers/sound/sound-uclass.c                        |  1 +
 drivers/sound/tegra_ahub.c                          |  1 +
 drivers/sound/tegra_i2s.c                           |  1 +
 drivers/sound/tegra_sound.c                         |  1 +
 drivers/sound/wm8994.c                              |  1 +
 drivers/spi/atcspi200_spi.c                         |  1 +
 drivers/spi/atmel-quadspi.c                         |  1 +
 drivers/spi/atmel_spi.c                             |  1 +
 drivers/spi/bcm63xx_hsspi.c                         |  1 +
 drivers/spi/bcm63xx_spi.c                           |  1 +
 drivers/spi/bcmstb_spi.c                            |  1 +
 drivers/spi/cf_spi.c                                |  1 +
 drivers/spi/davinci_spi.c                           |  1 +
 drivers/spi/designware_spi.c                        |  1 +
 drivers/spi/exynos_spi.c                            |  1 +
 drivers/spi/fsl_dspi.c                              |  1 +
 drivers/spi/fsl_espi.c                              |  1 +
 drivers/spi/fsl_qspi.c                              |  1 +
 drivers/spi/ich.c                                   |  1 +
 drivers/spi/meson_spifc.c                           |  1 +
 drivers/spi/mpc8xx_spi.c                            |  1 +
 drivers/spi/mpc8xxx_spi.c                           |  1 +
 drivers/spi/mt7621_spi.c                            |  1 +
 drivers/spi/mtk_snfi_spi.c                          |  1 +
 drivers/spi/nxp_fspi.c                              |  1 +
 drivers/spi/pic32_spi.c                             |  1 +
 drivers/spi/pl022_spi.c                             |  1 +
 drivers/spi/soft_spi.c                              |  1 +
 drivers/spi/spi-mem-nodm.c                          |  1 +
 drivers/spi/spi-sifive.c                            |  1 +
 drivers/spi/spi-sunxi.c                             |  1 +
 drivers/spi/spi-uclass.c                            |  1 +
 drivers/spi/stm32_qspi.c                            |  1 +
 drivers/spi/stm32_spi.c                             |  1 +
 drivers/spi/tegra20_sflash.c                        |  1 +
 drivers/spi/ti_qspi.c                               |  1 +
 drivers/spi/uniphier_spi.c                          |  1 +
 drivers/spi/zynq_qspi.c                             |  1 +
 drivers/spi/zynqmp_gqspi.c                          |  1 +
 drivers/spmi/spmi-msm.c                             |  1 +
 drivers/spmi/spmi-sandbox.c                         |  1 +
 drivers/spmi/spmi-uclass.c                          |  1 +
 drivers/sysreset/sysreset-ti-sci.c                  |  1 +
 drivers/sysreset/sysreset-uclass.c                  |  1 +
 drivers/sysreset/sysreset_ast.c                     |  1 +
 drivers/sysreset/sysreset_microblaze.c              |  1 +
 drivers/sysreset/sysreset_mpc83xx.c                 |  1 +
 drivers/sysreset/sysreset_octeon.c                  |  1 +
 drivers/sysreset/sysreset_rockchip.c                |  1 +
 drivers/sysreset/sysreset_sandbox.c                 |  1 +
 drivers/sysreset/sysreset_socfpga.c                 |  1 +
 drivers/sysreset/sysreset_socfpga_s10.c             |  1 +
 drivers/sysreset/sysreset_sti.c                     |  1 +
 drivers/sysreset/sysreset_syscon.c                  |  1 +
 drivers/sysreset/sysreset_watchdog.c                |  1 +
 drivers/sysreset/sysreset_x86.c                     |  1 +
 drivers/sysreset/sysreset_xtfpga.c                  |  1 +
 drivers/tee/broadcom/chimp_optee.c                  |  1 +
 drivers/tee/optee/core.c                            |  1 +
 drivers/tee/optee/supplicant.c                      |  1 +
 drivers/tee/sandbox.c                               |  1 +
 drivers/tee/tee-uclass.c                            |  1 +
 drivers/thermal/imx_scu_thermal.c                   |  1 +
 drivers/thermal/imx_thermal.c                       |  1 +
 drivers/thermal/imx_tmu.c                           |  1 +
 drivers/thermal/thermal-uclass.c                    |  1 +
 drivers/timer/arc_timer.c                           |  1 +
 drivers/timer/atmel_pit_timer.c                     |  1 +
 drivers/timer/mpc83xx_timer.c                       |  1 +
 drivers/timer/mtk_timer.c                           |  1 +
 drivers/timer/nomadik-mtu-timer.c                   |  1 +
 drivers/timer/rockchip_timer.c                      |  1 +
 drivers/timer/sti-timer.c                           |  1 +
 drivers/timer/stm32_timer.c                         |  1 +
 drivers/timer/timer-uclass.c                        |  1 +
 drivers/tpm/cr50_i2c.c                              |  1 +
 drivers/tpm/tpm-uclass.c                            |  1 +
 drivers/tpm/tpm2_ftpm_tee.c                         |  1 +
 drivers/tpm/tpm2_tis_sandbox.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/ufs/ufs.c                                   |  1 +
 drivers/usb/cdns3/cdns3-ti.c                        |  1 +
 drivers/usb/cdns3/core.c                            |  1 +
 drivers/usb/cdns3/drd.c                             |  1 +
 drivers/usb/cdns3/ep0.c                             |  1 +
 drivers/usb/cdns3/gadget-export.h                   |  1 +
 drivers/usb/cdns3/gadget.c                          |  1 +
 drivers/usb/cdns3/host-export.h                     |  1 +
 drivers/usb/cdns3/host.c                            |  1 +
 drivers/usb/common/fsl-dt-fixup.c                   |  1 +
 drivers/usb/dwc3/core.c                             |  1 +
 drivers/usb/dwc3/dwc3-generic.c                     |  1 +
 drivers/usb/dwc3/dwc3-meson-g12a.c                  |  1 +
 drivers/usb/dwc3/dwc3-omap.c                        |  1 +
 drivers/usb/dwc3/ep0.c                              |  1 +
 drivers/usb/dwc3/gadget.c                           |  1 +
 drivers/usb/dwc3/ti_usb_phy.c                       |  1 +
 drivers/usb/emul/sandbox_flash.c                    |  1 +
 drivers/usb/emul/sandbox_hub.c                      |  1 +
 drivers/usb/emul/sandbox_keyb.c                     |  1 +
 drivers/usb/emul/usb-emul-uclass.c                  |  1 +
 drivers/usb/eth/asix.c                              |  1 +
 drivers/usb/eth/asix88179.c                         |  1 +
 drivers/usb/eth/lan78xx.c                           |  1 +
 drivers/usb/eth/lan7x.c                             |  1 +
 drivers/usb/eth/mcs7830.c                           |  1 +
 drivers/usb/eth/r8152.c                             |  1 +
 drivers/usb/eth/r8152_fw.c                          |  1 +
 drivers/usb/eth/smsc95xx.c                          |  1 +
 drivers/usb/eth/usb_ether.c                         |  1 +
 drivers/usb/gadget/composite.c                      |  1 +
 drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c          |  1 +
 drivers/usb/gadget/f_dfu.c                          |  1 +
 drivers/usb/gadget/f_fastboot.c                     |  1 +
 drivers/usb/gadget/f_mass_storage.c                 |  1 +
 drivers/usb/gadget/f_rockusb.c                      |  1 +
 drivers/usb/gadget/f_sdp.c                          |  1 +
 drivers/usb/gadget/f_thor.c                         |  1 +
 drivers/usb/gadget/g_dnl.c                          |  1 +
 drivers/usb/gadget/gadget_chips.h                   |  1 +
 drivers/usb/gadget/pxa25x_udc.c                     |  1 +
 drivers/usb/gadget/udc/udc-core.c                   |  1 +
 drivers/usb/gadget/udc/udc-uclass.c                 |  1 +
 drivers/usb/host/dwc2.c                             |  1 +
 drivers/usb/host/dwc3-of-simple.c                   |  1 +
 drivers/usb/host/dwc3-sti-glue.c                    |  1 +
 drivers/usb/host/ehci-atmel.c                       |  1 +
 drivers/usb/host/ehci-fsl.c                         |  1 +
 drivers/usb/host/ehci-generic.c                     |  1 +
 drivers/usb/host/ehci-hcd.c                         |  1 +
 drivers/usb/host/ehci-marvell.c                     |  1 +
 drivers/usb/host/ehci-msm.c                         |  1 +
 drivers/usb/host/ehci-mx5.c                         |  1 +
 drivers/usb/host/ehci-mx6.c                         |  1 +
 drivers/usb/host/ehci-mxc.c                         |  1 +
 drivers/usb/host/ehci-mxs.c                         |  1 +
 drivers/usb/host/ehci-omap.c                        |  1 +
 drivers/usb/host/ehci-vf.c                          |  1 +
 drivers/usb/host/ehci-zynq.c                        |  1 +
 drivers/usb/host/ohci-da8xx.c                       |  1 +
 drivers/usb/host/ohci-generic.c                     |  1 +
 drivers/usb/host/ohci-hcd.c                         |  1 +
 drivers/usb/host/r8a66597-hcd.c                     |  1 +
 drivers/usb/host/usb-uclass.c                       |  1 +
 drivers/usb/host/xhci-brcm.c                        |  1 +
 drivers/usb/host/xhci-dwc3.c                        |  1 +
 drivers/usb/host/xhci-mvebu.c                       |  1 +
 drivers/usb/host/xhci-rcar.c                        |  1 +
 drivers/usb/musb-new/am35x.c                        |  1 +
 drivers/usb/musb-new/da8xx.c                        |  1 +
 drivers/usb/musb-new/mt85xx.c                       |  1 +
 drivers/usb/musb-new/musb_dsps.c                    |  1 +
 drivers/usb/musb-new/musb_gadget.c                  |  1 +
 drivers/usb/musb-new/musb_gadget_ep0.c              |  1 +
 drivers/usb/musb-new/omap2430.c                     |  1 +
 drivers/usb/musb-new/pic32.c                        |  1 +
 drivers/usb/musb-new/sunxi.c                        |  1 +
 drivers/usb/musb-new/ti-musb.c                      |  1 +
 drivers/video/am335x-fb.c                           |  1 +
 drivers/video/atmel_hlcdfb.c                        |  1 +
 drivers/video/atmel_lcdfb.c                         |  1 +
 drivers/video/backlight-uclass.c                    |  1 +
 drivers/video/bcm2835.c                             |  1 +
 drivers/video/bridge/anx6345.c                      |  1 +
 drivers/video/bridge/ps862x.c                       |  1 +
 drivers/video/bridge/video-bridge-uclass.c          |  1 +
 drivers/video/broadwell_igd.c                       |  1 +
 drivers/video/console_normal.c                      |  1 +
 drivers/video/console_rotate.c                      |  1 +
 drivers/video/console_truetype.c                    |  1 +
 drivers/video/coreboot.c                            |  1 +
 drivers/video/display-uclass.c                      |  1 +
 drivers/video/dsi-host-uclass.c                     |  1 +
 drivers/video/dw_mipi_dsi.c                         |  1 +
 drivers/video/efi.c                                 |  1 +
 drivers/video/exynos/exynos_dp.c                    |  1 +
 drivers/video/exynos/exynos_dp_lowlevel.c           |  1 +
 drivers/video/exynos/exynos_mipi_dsi.c              |  1 +
 drivers/video/exynos/exynos_mipi_dsi_common.c       |  1 +
 drivers/video/fsl_dcu_fb.c                          |  1 +
 drivers/video/hitachi_tx18d42vm_lcd.c               |  1 +
 drivers/video/ihs_video_out.c                       |  1 +
 drivers/video/ivybridge_igd.c                       |  1 +
 drivers/video/lg4573.c                              |  1 +
 drivers/video/logicore_dp_tx.c                      |  1 +
 drivers/video/mali_dp.c                             |  1 +
 drivers/video/meson/meson_dw_hdmi.c                 |  1 +
 drivers/video/meson/meson_vpu.c                     |  1 +
 drivers/video/mipi_dsi.c                            |  1 +
 drivers/video/mvebu_lcd.c                           |  1 +
 drivers/video/nexell/s5pxx18_dp.c                   |  1 +
 drivers/video/nexell/s5pxx18_dp_hdmi.c              |  1 +
 drivers/video/nexell/s5pxx18_dp_lvds.c              |  1 +
 drivers/video/nexell/s5pxx18_dp_mipi.c              |  1 +
 drivers/video/nexell_display.c                      |  1 +
 drivers/video/orisetech_otm8009a.c                  |  1 +
 drivers/video/panel-uclass.c                        |  1 +
 drivers/video/pwm_backlight.c                       |  1 +
 drivers/video/raydium-rm68200.c                     |  1 +
 drivers/video/rockchip/rk3288_mipi.c                |  1 +
 drivers/video/rockchip/rk3399_mipi.c                |  1 +
 drivers/video/rockchip/rk_edp.c                     |  1 +
 drivers/video/rockchip/rk_lvds.c                    |  1 +
 drivers/video/rockchip/rk_mipi.c                    |  1 +
 drivers/video/rockchip/rk_vop.c                     |  1 +
 drivers/video/sandbox_osd.c                         |  1 +
 drivers/video/simple_panel.c                        |  1 +
 drivers/video/simplefb.c                            |  1 +
 drivers/video/stm32/stm32_dsi.c                     |  1 +
 drivers/video/stm32/stm32_ltdc.c                    |  1 +
 drivers/video/sunxi/sunxi_de2.c                     |  1 +
 drivers/video/sunxi/sunxi_display.c                 |  1 +
 drivers/video/sunxi/sunxi_lcd.c                     |  1 +
 drivers/video/tda19988.c                            |  1 +
 drivers/video/tegra.c                               |  1 +
 drivers/video/tegra124/display.c                    |  1 +
 drivers/video/tegra124/dp.c                         |  1 +
 drivers/video/tegra124/sor.c                        |  1 +
 drivers/video/vidconsole-uclass.c                   |  1 +
 drivers/video/video-uclass.c                        |  1 +
 drivers/video/video_bmp.c                           |  1 +
 drivers/video/videomodes.c                          |  1 +
 drivers/virtio/virtio-uclass.c                      |  1 +
 drivers/virtio/virtio_blk.c                         |  1 +
 drivers/virtio/virtio_mmio.c                        |  1 +
 drivers/virtio/virtio_net.c                         |  1 +
 drivers/virtio/virtio_pci_legacy.c                  |  1 +
 drivers/virtio/virtio_pci_modern.c                  |  1 +
 drivers/virtio/virtio_ring.c                        |  1 +
 drivers/virtio/virtio_sandbox.c                     |  1 +
 drivers/w1-eeprom/ds2502.c                          |  1 +
 drivers/w1-eeprom/w1-eeprom-uclass.c                |  1 +
 drivers/w1/mxc_w1.c                                 |  1 +
 drivers/w1/w1-uclass.c                              |  1 +
 drivers/watchdog/armada-37xx-wdt.c                  |  1 +
 drivers/watchdog/at91sam9_wdt.c                     |  1 +
 drivers/watchdog/bcm6345_wdt.c                      |  1 +
 drivers/watchdog/cortina_wdt.c                      |  1 +
 drivers/watchdog/designware_wdt.c                   |  1 +
 drivers/watchdog/imx_watchdog.c                     |  1 +
 drivers/watchdog/mpc8xx_wdt.c                       |  1 +
 drivers/watchdog/mt7621_wdt.c                       |  1 +
 drivers/watchdog/mtk_wdt.c                          |  1 +
 drivers/watchdog/omap_wdt.c                         |  1 +
 drivers/watchdog/orion_wdt.c                        |  1 +
 drivers/watchdog/stm32mp_wdt.c                      |  1 +
 drivers/watchdog/wdt-uclass.c                       |  1 +
 drivers/watchdog/xilinx_tb_wdt.c                    |  1 +
 drivers/watchdog/xilinx_wwdt.c                      |  1 +
 env/common.c                                        |  1 +
 env/env.c                                           |  1 +
 env/ext4.c                                          |  1 +
 env/fat.c                                           |  1 +
 env/mmc.c                                           |  1 +
 env/nand.c                                          |  1 +
 env/remote.c                                        |  1 +
 env/sata.c                                          |  1 +
 env/sf.c                                            |  1 +
 env/ubi.c                                           |  1 +
 fs/btrfs/btrfs.c                                    |  1 +
 fs/cbfs/cbfs.c                                      |  1 +
 fs/ext4/ext4_common.c                               |  1 +
 fs/ext4/ext4_journal.c                              |  1 +
 fs/ext4/ext4_write.c                                |  1 +
 fs/ext4/ext4fs.c                                    |  1 +
 fs/fat/fat.c                                        |  1 +
 fs/fat/fat_write.c                                  |  1 +
 fs/fs.c                                             |  1 +
 fs/ubifs/debug.c                                    |  1 +
 fs/ubifs/io.c                                       |  1 +
 fs/ubifs/log.c                                      |  1 +
 fs/ubifs/lprops.c                                   |  1 +
 fs/ubifs/lpt_commit.c                               |  1 +
 fs/ubifs/orphan.c                                   |  1 +
 fs/ubifs/recovery.c                                 |  1 +
 fs/ubifs/replay.c                                   |  1 +
 fs/ubifs/scan.c                                     |  1 +
 fs/ubifs/super.c                                    |  1 +
 fs/ubifs/tnc.c                                      |  1 +
 fs/ubifs/tnc_misc.c                                 |  1 +
 fs/ubifs/ubifs.c                                    |  1 +
 fs/yaffs2/yaffs_uboot_glue.c                        |  1 +
 fs/yaffs2/yaffsfs.c                                 |  1 +
 fs/yaffs2/yportenv.h                                |  1 +
 include/acpi/acpi_s3.h                              |  1 +
 include/board.h                                     |  1 +
 include/common.h                                    |  1 -
 include/dfu.h                                       |  1 +
 include/dm/pinctrl.h                                |  1 +
 include/dwc3-uboot.h                                |  1 +
 include/eeprom.h                                    |  1 +
 include/hwspinlock.h                                |  1 +
 include/linux/soc/ti/ti_sci_protocol.h              |  1 +
 include/mipi_dsi.h                                  |  1 +
 include/power-domain.h                              |  1 +
 include/power/sandbox_pmic.h                        |  1 +
 include/regmap.h                                    |  1 +
 include/remoteproc.h                                |  1 +
 include/soc.h                                       |  1 +
 include/spi_flash.h                                 |  1 +
 include/splash.h                                    |  1 +
 include/tlv_eeprom.h                                |  1 +
 include/u-boot/aes.h                                |  1 +
 include/u-boot/rsa.h                                |  1 +
 lib/acpi/acpi_device.c                              |  1 +
 lib/acpi/acpi_dp.c                                  |  1 +
 lib/acpi/acpi_table.c                               |  1 +
 lib/acpi/acpigen.c                                  |  1 +
 lib/aes/aes-decrypt.c                               |  1 +
 lib/bch.c                                           |  1 +
 lib/binman.c                                        |  1 +
 lib/crypto/asymmetric_type.c                        |  1 +
 lib/crypto/pkcs7_parser.c                           |  1 +
 lib/crypto/pkcs7_verify.c                           |  1 +
 lib/crypto/public_key.c                             |  1 +
 lib/crypto/rsa_helper.c                             |  1 +
 lib/crypto/x509_cert_parser.c                       |  1 +
 lib/efi/efi_app.c                                   |  1 +
 lib/efi/efi_info.c                                  |  1 +
 lib/efi/efi_stub.c                                  |  1 +
 lib/efi_driver/efi_block_device.c                   |  1 +
 lib/efi_loader/efi_variable_tee.c                   |  1 +
 lib/errno_str.c                                     |  1 +
 lib/fdtdec.c                                        |  1 +
 lib/list_sort.c                                     |  1 +
 lib/lz4_wrapper.c                                   |  1 +
 lib/membuff.c                                       |  1 +
 lib/of_live.c                                       |  1 +
 lib/optee/optee.c                                   |  1 +
 lib/rsa/rsa-keyprop.c                               |  1 +
 lib/strto.c                                         |  1 +
 lib/trace.c                                         |  1 +
 lib/uuid.c                                          |  1 +
 lib/vsprintf.c                                      |  1 +
 net/eth-uclass.c                                    |  1 +
 net/mdio-mux-uclass.c                               |  1 +
 net/mdio-uclass.c                                   |  1 +
 net/net.c                                           |  1 +
 net/pcap.c                                          |  1 +
 test/bloblist.c                                     |  1 +
 test/dm/acpi.c                                      |  1 +
 test/dm/acpi_dp.c                                   |  1 +
 test/dm/acpigen.c                                   |  1 +
 test/dm/adc.c                                       |  1 +
 test/dm/blk.c                                       |  1 +
 test/dm/bus.c                                       |  1 +
 test/dm/button.c                                    |  1 +
 test/dm/core.c                                      |  1 +
 test/dm/eth.c                                       |  1 +
 test/dm/gpio.c                                      |  1 +
 test/dm/i2c.c                                       |  1 +
 test/dm/irq.c                                       |  1 +
 test/dm/k210_pll.c                                  |  1 +
 test/dm/led.c                                       |  1 +
 test/dm/mailbox.c                                   |  1 +
 test/dm/nop.c                                       |  1 +
 test/dm/pch.c                                       |  1 +
 test/dm/phy.c                                       |  1 +
 test/dm/pwm.c                                       |  1 +
 test/dm/regmap.c                                    |  1 +
 test/dm/regulator.c                                 |  1 +
 test/dm/remoteproc.c                                |  1 +
 test/dm/rtc.c                                       |  1 +
 test/dm/serial.c                                    |  1 +
 test/dm/sound.c                                     |  1 +
 test/dm/spi.c                                       |  1 +
 test/dm/syscon-reset.c                              |  1 +
 test/dm/syscon.c                                    |  1 +
 test/dm/sysreset.c                                  |  1 +
 test/dm/tee.c                                       |  1 +
 test/dm/test-driver.c                               |  1 +
 test/dm/test-fdt.c                                  |  1 +
 test/dm/test-uclass.c                               |  1 +
 test/dm/usb.c                                       |  1 +
 test/dm/video.c                                     |  1 +
 test/dm/virtio.c                                    |  1 +
 test/env/attr.c                                     |  1 +
 test/lib/test_errno_str.c                           |  1 +
 test/optee/cmd_ut_optee.c                           |  1 +
 test/overlay/cmd_ut_overlay.c                       |  1 +
 test/time_ut.c                                      |  1 +
 1549 files changed, 1555 insertions(+), 9 deletions(-)

diff --git a/arch/arm/cpu/arm926ejs/mx25/generic.c b/arch/arm/cpu/arm926ejs/mx25/generic.c
index e9ebda4317c9..8b74650b3647 100644
--- a/arch/arm/cpu/arm926ejs/mx25/generic.c
+++ b/arch/arm/cpu/arm926ejs/mx25/generic.c
@@ -22,6 +22,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/clock.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 
 #ifdef CONFIG_FSL_ESDHC_IMX
 #include <fsl_esdhc_imx.h>
diff --git a/arch/arm/cpu/armv7/s5p-common/pwm.c b/arch/arm/cpu/armv7/s5p-common/pwm.c
index aef2e5574b41..67c9208084db 100644
--- a/arch/arm/cpu/armv7/s5p-common/pwm.c
+++ b/arch/arm/cpu/armv7/s5p-common/pwm.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <asm/arch/pwm.h>
 #include <asm/arch/clk.h>
+#include <linux/errno.h>
 
 int pwm_enable(int pwm_id)
 {
diff --git a/arch/arm/cpu/armv7/vf610/generic.c b/arch/arm/cpu/armv7/vf610/generic.c
index 297a3d2378a9..93418ce9a8c5 100644
--- a/arch/arm/cpu/armv7/vf610/generic.c
+++ b/arch/arm/cpu/armv7/vf610/generic.c
@@ -23,6 +23,7 @@
 #include <fsl_esdhc_imx.h>
 #endif
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #ifdef CONFIG_FSL_ESDHC_IMX
diff --git a/arch/arm/cpu/armv7/virt-dt.c b/arch/arm/cpu/armv7/virt-dt.c
index 61c82f64699c..d4818bf75fc3 100644
--- a/arch/arm/cpu/armv7/virt-dt.c
+++ b/arch/arm/cpu/armv7/virt-dt.c
@@ -20,6 +20,7 @@
 #include <log.h>
 #include <stdio_dev.h>
 #include <linux/ctype.h>
+#include <linux/errno.h>
 #include <linux/types.h>
 #include <asm/global_data.h>
 #include <linux/libfdt.h>
diff --git a/arch/arm/cpu/armv7m/cache.c b/arch/arm/cpu/armv7m/cache.c
index f87e1d393676..abed2e36df44 100644
--- a/arch/arm/cpu/armv7m/cache.c
+++ b/arch/arm/cpu/armv7m/cache.c
@@ -13,6 +13,7 @@
 #include <asm/cache.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 /* Cache maintenance operation registers */
 
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ppa.c b/arch/arm/cpu/armv8/fsl-layerscape/ppa.c
index 0d458d0273ef..60f2a4b002d4 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/ppa.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/ppa.c
@@ -24,6 +24,7 @@
 #ifdef CONFIG_CHAIN_OF_TRUST
 #include <fsl_validate.h>
 #endif
+#include <linux/errno.h>
 
 #ifdef CONFIG_SYS_LS_PPA_FW_IN_NAND
 #include <nand.h>
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/soc.c b/arch/arm/cpu/armv8/fsl-layerscape/soc.c
index 340206d90952..aaf0bb6440c8 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/soc.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/soc.c
@@ -13,6 +13,7 @@
 #include <init.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/errno.h>
 #include <linux/sizes.h>
 #include <log.h>
 #include <asm/arch/fsl_serdes.h>
diff --git a/arch/arm/cpu/armv8/s32v234/generic.c b/arch/arm/cpu/armv8/s32v234/generic.c
index 59900958cd20..575dbb1f6098 100644
--- a/arch/arm/cpu/armv8/s32v234/generic.c
+++ b/arch/arm/cpu/armv8/s32v234/generic.c
@@ -20,6 +20,7 @@
 #include <div64.h>
 #include <errno.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 
 u32 get_cpu_rev(void)
 {
diff --git a/arch/arm/cpu/armv8/sec_firmware.c b/arch/arm/cpu/armv8/sec_firmware.c
index 8f7eef0d4c0e..1b273db4f988 100644
--- a/arch/arm/cpu/armv8/sec_firmware.c
+++ b/arch/arm/cpu/armv8/sec_firmware.c
@@ -13,6 +13,7 @@
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <asm/ptrace.h>
+#include <linux/errno.h>
 #include <linux/kernel.h>
 #include <asm/io.h>
 #include <asm/system.h>
diff --git a/arch/arm/cpu/armv8/spin_table.c b/arch/arm/cpu/armv8/spin_table.c
index f687b54d0e19..49e1903a29f0 100644
--- a/arch/arm/cpu/armv8/spin_table.c
+++ b/arch/arm/cpu/armv8/spin_table.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <asm/spin_table.h>
 #include <linux/string.h>
diff --git a/arch/arm/cpu/pxa/cpuinfo.c b/arch/arm/cpu/pxa/cpuinfo.c
index 582c1fcaa7a7..ff56c3a82be1 100644
--- a/arch/arm/cpu/pxa/cpuinfo.c
+++ b/arch/arm/cpu/pxa/cpuinfo.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <errno.h>
 #include <linux/compiler.h>
+#include <linux/errno.h>
 
 #ifdef CONFIG_CPU_PXA25X
 #if ((CONFIG_SYS_INIT_SP_ADDR) != 0xfffff800)
diff --git a/arch/arm/include/asm/arch-tegra/cboot.h b/arch/arm/include/asm/arch-tegra/cboot.h
index 4e1da98d1f21..d89e784f2d26 100644
--- a/arch/arm/include/asm/arch-tegra/cboot.h
+++ b/arch/arm/include/asm/arch-tegra/cboot.h
@@ -7,6 +7,7 @@
 #define _TEGRA_CBOOT_H_
 
 #include <net.h>
+#include <linux/errno.h>
 
 #ifdef CONFIG_ARM64
 
diff --git a/arch/arm/lib/gic-v3-its.c b/arch/arm/lib/gic-v3-its.c
index 6cdcd1ed60cf..45c8ae093507 100644
--- a/arch/arm/lib/gic-v3-its.c
+++ b/arch/arm/lib/gic-v3-its.c
@@ -10,6 +10,7 @@
 #include <asm/gic-v3.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/sizes.h>
 
diff --git a/arch/arm/mach-aspeed/ast2500/sdram_ast2500.c b/arch/arm/mach-aspeed/ast2500/sdram_ast2500.c
index cfb0374d60c8..9eefeef5fb33 100644
--- a/arch/arm/mach-aspeed/ast2500/sdram_ast2500.c
+++ b/arch/arm/mach-aspeed/ast2500/sdram_ast2500.c
@@ -19,6 +19,7 @@
 #include <asm/arch/sdram_ast2500.h>
 #include <asm/arch/wdt.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/kernel.h>
 #include <dt-bindings/clock/ast2500-scu.h>
 
diff --git a/arch/arm/mach-bcm283x/msg.c b/arch/arm/mach-bcm283x/msg.c
index ac43d51e64d4..3c3eac9025b0 100644
--- a/arch/arm/mach-bcm283x/msg.c
+++ b/arch/arm/mach-bcm283x/msg.c
@@ -9,6 +9,7 @@
 #include <stdio.h>
 #include <asm/arch/mbox.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 struct msg_set_power_state {
 	struct bcm2835_mbox_hdr hdr;
diff --git a/arch/arm/mach-imx/cmd_nandbcb.c b/arch/arm/mach-imx/cmd_nandbcb.c
index 2b7affaaccdf..beb538677d95 100644
--- a/arch/arm/mach-imx/cmd_nandbcb.c
+++ b/arch/arm/mach-imx/cmd_nandbcb.c
@@ -20,6 +20,7 @@
 #include <vsprintf.h>
 #include <dm/devres.h>
 #include <linux/bug.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include <asm/io.h>
diff --git a/arch/arm/mach-imx/imx8/ahab.c b/arch/arm/mach-imx/imx8/ahab.c
index 1d92c07be246..fb1d067f9c56 100644
--- a/arch/arm/mach-imx/imx8/ahab.c
+++ b/arch/arm/mach-imx/imx8/ahab.c
@@ -18,6 +18,7 @@
 #include <asm/arch/image.h>
 #include <console.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-imx/imx8/cpu.c b/arch/arm/mach-imx/imx8/cpu.c
index b9cbdc64164d..8ae43f00bcb8 100644
--- a/arch/arm/mach-imx/imx8/cpu.c
+++ b/arch/arm/mach-imx/imx8/cpu.c
@@ -27,6 +27,7 @@
 #include <asm/setup.h>
 #include <asm/mach-imx/boot_mode.h>
 #include <spl.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-imx/imx8/fdt.c b/arch/arm/mach-imx/imx8/fdt.c
index 0fd0c4bca097..239adfc2e5cd 100644
--- a/arch/arm/mach-imx/imx8/fdt.c
+++ b/arch/arm/mach-imx/imx8/fdt.c
@@ -12,6 +12,7 @@
 #include <asm/u-boot.h>
 #include <dm/ofnode.h>
 #include <fdt_support.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <linux/printk.h>
 #include <linux/string.h>
diff --git a/arch/arm/mach-imx/imx8/image.c b/arch/arm/mach-imx/imx8/image.c
index 9b4fc6f09059..528a42a5996e 100644
--- a/arch/arm/mach-imx/imx8/image.c
+++ b/arch/arm/mach-imx/imx8/image.c
@@ -15,6 +15,7 @@
 #include <asm/arch/image.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/mach-imx/boot_mode.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #define MMC_DEV		0
diff --git a/arch/arm/mach-imx/imx8/parse-container.c b/arch/arm/mach-imx/imx8/parse-container.c
index 3a1c8c7a5e5f..6a3a4eaa7c79 100644
--- a/arch/arm/mach-imx/imx8/parse-container.c
+++ b/arch/arm/mach-imx/imx8/parse-container.c
@@ -10,6 +10,7 @@
 #include <stdio.h>
 #include <asm/arch/image.h>
 #include <asm/arch/sci/sci.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #define SEC_SECURE_RAM_BASE		0x31800000UL
diff --git a/arch/arm/mach-imx/imx8/snvs_security_sc.c b/arch/arm/mach-imx/imx8/snvs_security_sc.c
index 6bb067e08bdd..391d2d0e4b17 100644
--- a/arch/arm/mach-imx/imx8/snvs_security_sc.c
+++ b/arch/arm/mach-imx/imx8/snvs_security_sc.c
@@ -21,6 +21,7 @@
 #include <asm/arch-imx8/imx8-pins.h>
 #include <asm/arch-imx8/snvs_security_sc.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 
 /* Access to gd */
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-imx/imx8m/clock_imx8mm.c b/arch/arm/mach-imx/imx8m/clock_imx8mm.c
index ff3943e5106c..170e6c20853a 100644
--- a/arch/arm/mach-imx/imx8m/clock_imx8mm.c
+++ b/arch/arm/mach-imx/imx8m/clock_imx8mm.c
@@ -16,6 +16,7 @@
 #include <errno.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-imx/imx8m/clock_imx8mq.c b/arch/arm/mach-imx/imx8m/clock_imx8mq.c
index 444e9b7feee4..0c74f99f440f 100644
--- a/arch/arm/mach-imx/imx8m/clock_imx8mq.c
+++ b/arch/arm/mach-imx/imx8m/clock_imx8mq.c
@@ -14,6 +14,7 @@
 #include <asm/arch/sys_proto.h>
 #include <errno.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/iopoll.h>
 
 static struct anamix_pll *ana_pll = (struct anamix_pll *)ANATOP_BASE_ADDR;
diff --git a/arch/arm/mach-imx/imx8m/clock_slice.c b/arch/arm/mach-imx/imx8m/clock_slice.c
index b5ed27a923e0..ad0d553c1cf7 100644
--- a/arch/arm/mach-imx/imx8m/clock_slice.c
+++ b/arch/arm/mach-imx/imx8m/clock_slice.c
@@ -10,6 +10,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/io.h>
 #include <errno.h>
+#include <linux/errno.h>
 
 static struct ccm_reg *ccm_reg = (struct ccm_reg *)CCM_BASE_ADDR;
 
diff --git a/arch/arm/mach-imx/imx8m/soc.c b/arch/arm/mach-imx/imx8m/soc.c
index 12f644e69ee7..4e3d12f9b3c7 100644
--- a/arch/arm/mach-imx/imx8m/soc.c
+++ b/arch/arm/mach-imx/imx8m/soc.c
@@ -32,6 +32,7 @@
 #include <imx_sip.h>
 #include <linux/arm-smccc.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-imx/imx_bootaux.c b/arch/arm/mach-imx/imx_bootaux.c
index c94da85bf760..02fa1d7b62b2 100644
--- a/arch/arm/mach-imx/imx_bootaux.c
+++ b/arch/arm/mach-imx/imx_bootaux.c
@@ -15,6 +15,7 @@
 #include <linux/arm-smccc.h>
 #include <linux/compiler.h>
 #include <cpu_func.h>
+#include <linux/errno.h>
 
 int arch_auxiliary_core_up(u32 core_id, ulong addr)
 {
diff --git a/arch/arm/mach-imx/mx7ulp/clock.c b/arch/arm/mach-imx/mx7ulp/clock.c
index 10390a74165b..c7dfa798b454 100644
--- a/arch/arm/mach-imx/mx7ulp/clock.c
+++ b/arch/arm/mach-imx/mx7ulp/clock.c
@@ -13,6 +13,7 @@
 #include <errno.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-imx/mx7ulp/pcc.c b/arch/arm/mach-imx/mx7ulp/pcc.c
index a70131dfa3b3..1fd8b0a540f7 100644
--- a/arch/arm/mach-imx/mx7ulp/pcc.c
+++ b/arch/arm/mach-imx/mx7ulp/pcc.c
@@ -12,6 +12,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/pcc.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/errno.h>
 
 #define PCC_CLKSRC_TYPES 2
 #define PCC_CLKSRC_NUM 7
diff --git a/arch/arm/mach-imx/mx7ulp/scg.c b/arch/arm/mach-imx/mx7ulp/scg.c
index 6c24ec2d819a..58bc3df1e78f 100644
--- a/arch/arm/mach-imx/mx7ulp/scg.c
+++ b/arch/arm/mach-imx/mx7ulp/scg.c
@@ -13,6 +13,7 @@
 #include <asm/arch/pcc.h>
 #include <asm/arch/sys_proto.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 scg_p scg1_regs = (scg_p)SCG1_RBASE;
 
diff --git a/arch/arm/mach-ipq40xx/clock-ipq4019.c b/arch/arm/mach-ipq40xx/clock-ipq4019.c
index 7cf98a203c2f..dae070f0ed62 100644
--- a/arch/arm/mach-ipq40xx/clock-ipq4019.c
+++ b/arch/arm/mach-ipq40xx/clock-ipq4019.c
@@ -12,6 +12,7 @@
 #include <clk-uclass.h>
 #include <dm.h>
 #include <errno.h>
+#include <linux/errno.h>
 
 struct msm_clk_priv {
 	phys_addr_t base;
diff --git a/arch/arm/mach-ipq40xx/pinctrl-snapdragon.c b/arch/arm/mach-ipq40xx/pinctrl-snapdragon.c
index 64b8b049fa15..08001da66f1b 100644
--- a/arch/arm/mach-ipq40xx/pinctrl-snapdragon.c
+++ b/arch/arm/mach-ipq40xx/pinctrl-snapdragon.c
@@ -16,6 +16,7 @@
 #include <asm/io.h>
 #include <dm/pinctrl.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include "pinctrl-snapdragon.h"
 
 struct msm_pinctrl_priv {
diff --git a/arch/arm/mach-k3/sysfw-loader.c b/arch/arm/mach-k3/sysfw-loader.c
index ecc3a6711802..3e76b26dc756 100644
--- a/arch/arm/mach-k3/sysfw-loader.c
+++ b/arch/arm/mach-k3/sysfw-loader.c
@@ -16,6 +16,7 @@
 #include <vsprintf.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/soc/ti/ti_sci_protocol.h>
 #include <g_dnl.h>
 #include <usb.h>
diff --git a/arch/arm/mach-keystone/cmd_mon.c b/arch/arm/mach-keystone/cmd_mon.c
index e98df01e89f7..5887a89ff114 100644
--- a/arch/arm/mach-keystone/cmd_mon.c
+++ b/arch/arm/mach-keystone/cmd_mon.c
@@ -11,6 +11,7 @@
 #include <image.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <mach/mon.h>
 asm(".arch_extension sec\n\t");
diff --git a/arch/arm/mach-meson/board-common.c b/arch/arm/mach-meson/board-common.c
index a8d0254d5766..cdae5f987708 100644
--- a/arch/arm/mach-meson/board-common.c
+++ b/arch/arm/mach-meson/board-common.c
@@ -14,6 +14,7 @@
 #include <asm/global_data.h>
 #include <asm/ptrace.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <linux/err.h>
 #include <asm/arch/mem.h>
diff --git a/arch/arm/mach-meson/board-g12a.c b/arch/arm/mach-meson/board-g12a.c
index b698298e13e6..cdaed763b426 100644
--- a/arch/arm/mach-meson/board-g12a.c
+++ b/arch/arm/mach-meson/board-g12a.c
@@ -17,6 +17,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/armv8/mmu.h>
+#include <linux/errno.h>
 #include <linux/sizes.h>
 #include <usb.h>
 #include <linux/usb/otg.h>
diff --git a/arch/arm/mach-meson/board-gx.c b/arch/arm/mach-meson/board-gx.c
index ec2f1c07314f..b38811fb9510 100644
--- a/arch/arm/mach-meson/board-gx.c
+++ b/arch/arm/mach-meson/board-gx.c
@@ -16,6 +16,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/armv8/mmu.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/sizes.h>
 #include <usb.h>
diff --git a/arch/arm/mach-meson/sm.c b/arch/arm/mach-meson/sm.c
index f4f54fafce96..62feaccfce05 100644
--- a/arch/arm/mach-meson/sm.c
+++ b/arch/arm/mach-meson/sm.c
@@ -17,6 +17,7 @@
 #include <asm/ptrace.h>
 #include <linux/bitops.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/kernel.h>
 #include <dm.h>
 #include <linux/bitfield.h>
diff --git a/arch/arm/mach-mvebu/arm64-common.c b/arch/arm/mach-mvebu/arm64-common.c
index fa687d8abbbd..aecdbb86a9d7 100644
--- a/arch/arm/mach-mvebu/arm64-common.c
+++ b/arch/arm/mach-mvebu/arm64-common.c
@@ -10,6 +10,7 @@
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <asm/ptrace.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <linux/sizes.h>
 #include <pci.h>
diff --git a/arch/arm/mach-mvebu/armada3700/cpu.c b/arch/arm/mach-mvebu/armada3700/cpu.c
index 2551c69d1959..b98f78fde3b7 100644
--- a/arch/arm/mach-mvebu/armada3700/cpu.c
+++ b/arch/arm/mach-mvebu/armada3700/cpu.c
@@ -12,6 +12,7 @@
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <asm/io.h>
 #include <asm/system.h>
diff --git a/arch/arm/mach-mvebu/efuse.c b/arch/arm/mach-mvebu/efuse.c
index c79eee98fe98..8ada3cf93e72 100644
--- a/arch/arm/mach-mvebu/efuse.c
+++ b/arch/arm/mach-mvebu/efuse.c
@@ -12,6 +12,7 @@
 #include <asm/arch/soc.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/mbus.h>
 
 #if defined(CONFIG_MVEBU_EFUSE_FAKE)
diff --git a/arch/arm/mach-nexell/clock.c b/arch/arm/mach-nexell/clock.c
index 0fac5efc2a72..38f6b1fc9010 100644
--- a/arch/arm/mach-nexell/clock.c
+++ b/arch/arm/mach-nexell/clock.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <asm/arch/nexell.h>
 #include <asm/arch/clk.h>
+#include <linux/errno.h>
 
 /*
  * clock generator macros
diff --git a/arch/arm/mach-omap2/sec-common.c b/arch/arm/mach-omap2/sec-common.c
index f96d1379bb3b..f24e0ad6366d 100644
--- a/arch/arm/mach-omap2/sec-common.c
+++ b/arch/arm/mach-omap2/sec-common.c
@@ -21,6 +21,7 @@
 #include <stdarg.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include <asm/arch/sys_proto.h>
diff --git a/arch/arm/mach-rockchip/board.c b/arch/arm/mach-rockchip/board.c
index fa7adacd5953..aaa7127d1abd 100644
--- a/arch/arm/mach-rockchip/board.c
+++ b/arch/arm/mach-rockchip/board.c
@@ -18,6 +18,7 @@
 #include <asm/arch-rockchip/clock.h>
 #include <asm/arch-rockchip/periph.h>
 #include <asm/arch-rockchip/misc.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <power/regulator.h>
 
diff --git a/arch/arm/mach-rockchip/boot_mode.c b/arch/arm/mach-rockchip/boot_mode.c
index fefffc71ffaf..20d44d424be7 100644
--- a/arch/arm/mach-rockchip/boot_mode.c
+++ b/arch/arm/mach-rockchip/boot_mode.c
@@ -13,6 +13,7 @@
 #include <asm/arch-rockchip/boot_mode.h>
 #include <dm/device.h>
 #include <dm/uclass.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/arch/arm/mach-rockchip/spl-boot-order.c b/arch/arm/mach-rockchip/spl-boot-order.c
index ddc4081dbb47..57ea84a9346e 100644
--- a/arch/arm/mach-rockchip/spl-boot-order.c
+++ b/arch/arm/mach-rockchip/spl-boot-order.c
@@ -9,6 +9,7 @@
 #include <mmc.h>
 #include <spl.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #if CONFIG_IS_ENABLED(OF_LIBFDT)
diff --git a/arch/arm/mach-snapdragon/clock-snapdragon.c b/arch/arm/mach-snapdragon/clock-snapdragon.c
index 69d65c82e3ec..78e30ea5bab6 100644
--- a/arch/arm/mach-snapdragon/clock-snapdragon.c
+++ b/arch/arm/mach-snapdragon/clock-snapdragon.c
@@ -13,6 +13,7 @@
 #include <errno.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include "clock-snapdragon.h"
 
 /* CBCR register fields */
diff --git a/arch/arm/mach-snapdragon/dram.c b/arch/arm/mach-snapdragon/dram.c
index c3e61007417a..df7148fee11e 100644
--- a/arch/arm/mach-snapdragon/dram.c
+++ b/arch/arm/mach-snapdragon/dram.c
@@ -14,6 +14,7 @@
 #include <fdt_support.h>
 #include <stdio.h>
 #include <asm/arch/dram.h>
+#include <linux/errno.h>
 
 #define SMEM_USABLE_RAM_PARTITION_TABLE 402
 #define RAM_PART_NAME_LENGTH            16
diff --git a/arch/arm/mach-snapdragon/pinctrl-snapdragon.c b/arch/arm/mach-snapdragon/pinctrl-snapdragon.c
index 4c2af213082b..b1c075a44ac7 100644
--- a/arch/arm/mach-snapdragon/pinctrl-snapdragon.c
+++ b/arch/arm/mach-snapdragon/pinctrl-snapdragon.c
@@ -12,6 +12,7 @@
 #include <asm/io.h>
 #include <dm/pinctrl.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include "pinctrl-snapdragon.h"
 
 struct msm_pinctrl_priv {
diff --git a/arch/arm/mach-socfpga/board.c b/arch/arm/mach-socfpga/board.c
index a3733207d6ab..d8cfe2ce66d4 100644
--- a/arch/arm/mach-socfpga/board.c
+++ b/arch/arm/mach-socfpga/board.c
@@ -15,6 +15,7 @@
 #include <asm/arch/misc.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <linux/errno.h>
 
 #include <usb.h>
 #include <usb/dwc2_udc.h>
diff --git a/arch/arm/mach-socfpga/clock_manager_agilex.c b/arch/arm/mach-socfpga/clock_manager_agilex.c
index 0582b0b08573..9c229de4b92f 100644
--- a/arch/arm/mach-socfpga/clock_manager_agilex.c
+++ b/arch/arm/mach-socfpga/clock_manager_agilex.c
@@ -15,6 +15,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <dt-bindings/clock/agilex-clock.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-socfpga/clock_manager_arria10.c b/arch/arm/mach-socfpga/clock_manager_arria10.c
index 9379005444dc..82c90fb526c1 100644
--- a/arch/arm/mach-socfpga/clock_manager_arria10.c
+++ b/arch/arm/mach-socfpga/clock_manager_arria10.c
@@ -13,6 +13,7 @@
 #include <dm/device-internal.h>
 #include <asm/arch/clock_manager.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #ifdef CONFIG_SPL_BUILD
diff --git a/arch/arm/mach-socfpga/mailbox_s10.c b/arch/arm/mach-socfpga/mailbox_s10.c
index 58d94694b7ed..85df32968d85 100644
--- a/arch/arm/mach-socfpga/mailbox_s10.c
+++ b/arch/arm/mach-socfpga/mailbox_s10.c
@@ -13,6 +13,7 @@
 #include <asm/arch/mailbox_s10.h>
 #include <asm/arch/system_manager.h>
 #include <asm/secure.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-socfpga/misc.c b/arch/arm/mach-socfpga/misc.c
index ae84d2a22579..8bb924b6b5dd 100644
--- a/arch/arm/mach-socfpga/misc.c
+++ b/arch/arm/mach-socfpga/misc.c
@@ -14,6 +14,7 @@
 #include <asm/io.h>
 #include <errno.h>
 #include <fdtdec.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <altera.h>
 #include <miiphy.h>
diff --git a/arch/arm/mach-socfpga/misc_gen5.c b/arch/arm/mach-socfpga/misc_gen5.c
index eed510d66e7d..22f113048149 100644
--- a/arch/arm/mach-socfpga/misc_gen5.c
+++ b/arch/arm/mach-socfpga/misc_gen5.c
@@ -13,6 +13,7 @@
 #include <errno.h>
 #include <fdtdec.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <altera.h>
 #include <miiphy.h>
diff --git a/arch/arm/mach-socfpga/misc_s10.c b/arch/arm/mach-socfpga/misc_s10.c
index cf5c918fe54a..0addd436c2ba 100644
--- a/arch/arm/mach-socfpga/misc_s10.c
+++ b/arch/arm/mach-socfpga/misc_s10.c
@@ -21,6 +21,7 @@
 #include <asm/arch/system_manager.h>
 #include <asm/arch/misc.h>
 #include <asm/pl310.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <asm/arch/mailbox_s10.h>
 #include <linux/string.h>
diff --git a/arch/arm/mach-socfpga/pinmux_arria10.c b/arch/arm/mach-socfpga/pinmux_arria10.c
index a38b19c395e2..aee51c039c9c 100644
--- a/arch/arm/mach-socfpga/pinmux_arria10.c
+++ b/arch/arm/mach-socfpga/pinmux_arria10.c
@@ -8,6 +8,7 @@
 #include <asm/io.h>
 #include <common.h>
 #include <fdtdec.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 static int do_pinctr_pin(const void *blob, int child, const char *node_name)
diff --git a/arch/arm/mach-socfpga/scan_manager.c b/arch/arm/mach-socfpga/scan_manager.c
index 36d6880141ea..d5601739ef68 100644
--- a/arch/arm/mach-socfpga/scan_manager.c
+++ b/arch/arm/mach-socfpga/scan_manager.c
@@ -10,6 +10,7 @@
 #include <asm/arch/scan_manager.h>
 #include <asm/arch/system_manager.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 /*
  * Maximum polling loop to wait for IO scan chain engine becomes idle
diff --git a/arch/arm/mach-socfpga/wrap_iocsr_config.c b/arch/arm/mach-socfpga/wrap_iocsr_config.c
index f810fade92a9..01864be5edbb 100644
--- a/arch/arm/mach-socfpga/wrap_iocsr_config.c
+++ b/arch/arm/mach-socfpga/wrap_iocsr_config.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <errno.h>
 #include <asm/arch/clock_manager.h>
+#include <linux/errno.h>
 
 /* Board-specific header. */
 #include <qts/iocsr_config.h>
diff --git a/arch/arm/mach-stm32mp/bsec.c b/arch/arm/mach-stm32mp/bsec.c
index 566961ae3914..d41382409c30 100644
--- a/arch/arm/mach-stm32mp/bsec.c
+++ b/arch/arm/mach-stm32mp/bsec.c
@@ -11,6 +11,7 @@
 #include <asm/arch/bsec.h>
 #include <asm/arch/stm32mp1_smc.h>
 #include <linux/arm-smccc.h>
+#include <linux/errno.h>
 #include <linux/iopoll.h>
 #include <linux/printk.h>
 
diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c
index c2cbfe7e48b6..0589cfcb31c7 100644
--- a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c
+++ b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c
@@ -16,6 +16,7 @@
 #include <asm/global_data.h>
 #include <dm/uclass.h>
 #include <jffs2/load_kernel.h>
+#include <linux/errno.h>
 #include <linux/list.h>
 #include <linux/list_sort.h>
 #include <linux/mtd/mtd.h>
diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_serial.c b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_serial.c
index 14bd4cc27d6e..be3eb230f1e9 100644
--- a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_serial.c
+++ b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_serial.c
@@ -16,6 +16,7 @@
 #include <dm/lists.h>
 #include <dm/device-internal.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include "stm32prog.h"
diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_usb.c b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_usb.c
index 616f556ab90c..15ca72043a33 100644
--- a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_usb.c
+++ b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_usb.c
@@ -11,6 +11,7 @@
 #include <vsprintf.h>
 #include <asm/arch/stm32prog.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include "stm32prog.h"
diff --git a/arch/arm/mach-stm32mp/cpu.c b/arch/arm/mach-stm32mp/cpu.c
index 80d7d5790a85..8dcf4d4f8531 100644
--- a/arch/arm/mach-stm32mp/cpu.c
+++ b/arch/arm/mach-stm32mp/cpu.c
@@ -21,6 +21,7 @@
 #include <dm/device.h>
 #include <dm/uclass.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 /* RCC register */
diff --git a/arch/arm/mach-stm32mp/include/mach/stm32mp1_smc.h b/arch/arm/mach-stm32mp/include/mach/stm32mp1_smc.h
index 1b2bba3d34c2..fbc082703dc2 100644
--- a/arch/arm/mach-stm32mp/include/mach/stm32mp1_smc.h
+++ b/arch/arm/mach-stm32mp/include/mach/stm32mp1_smc.h
@@ -7,6 +7,7 @@
 #define __STM32MP1_SMC_H__
 
 #include <linux/arm-smccc.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 /*
diff --git a/arch/arm/mach-stm32mp/pwr_regulator.c b/arch/arm/mach-stm32mp/pwr_regulator.c
index eb024b85116b..954603f67455 100644
--- a/arch/arm/mach-stm32mp/pwr_regulator.c
+++ b/arch/arm/mach-stm32mp/pwr_regulator.c
@@ -12,6 +12,7 @@
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 
diff --git a/arch/arm/mach-stm32mp/spl.c b/arch/arm/mach-stm32mp/spl.c
index 9d951ce15f96..fdaaeb27abaf 100644
--- a/arch/arm/mach-stm32mp/spl.c
+++ b/arch/arm/mach-stm32mp/spl.c
@@ -15,6 +15,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 
 u32 spl_boot_device(void)
diff --git a/arch/arm/mach-sunxi/cpu_info.c b/arch/arm/mach-sunxi/cpu_info.c
index 5198fb555a9c..5a7d03dce898 100644
--- a/arch/arm/mach-sunxi/cpu_info.c
+++ b/arch/arm/mach-sunxi/cpu_info.c
@@ -13,6 +13,7 @@
 #include <asm/arch/clock.h>
 #include <axp_pmic.h>
 #include <errno.h>
+#include <linux/errno.h>
 
 #ifdef CONFIG_MACH_SUN6I
 int sunxi_get_ss_bonding_id(void)
diff --git a/arch/arm/mach-sunxi/dram_sun8i_a33.c b/arch/arm/mach-sunxi/dram_sun8i_a33.c
index d99a38b10aa6..d5d324860e3f 100644
--- a/arch/arm/mach-sunxi/dram_sun8i_a33.c
+++ b/arch/arm/mach-sunxi/dram_sun8i_a33.c
@@ -15,6 +15,7 @@
 #include <asm/arch/dram.h>
 #include <asm/arch/prcm.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 /* PLL runs at 2x dram-clk, controller runs at PLL / 4 (dram-clk / 2) */
 #define DRAM_CLK_MUL 2
diff --git a/arch/arm/mach-sunxi/dram_sun8i_a83t.c b/arch/arm/mach-sunxi/dram_sun8i_a83t.c
index a3f833dd341b..8a32ea4f0a17 100644
--- a/arch/arm/mach-sunxi/dram_sun8i_a83t.c
+++ b/arch/arm/mach-sunxi/dram_sun8i_a83t.c
@@ -15,6 +15,7 @@
 #include <asm/arch/dram.h>
 #include <asm/arch/prcm.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 #define DRAM_CLK_MUL 2
 #define DRAM_CLK_DIV 1
diff --git a/arch/arm/mach-sunxi/p2wi.c b/arch/arm/mach-sunxi/p2wi.c
index 7c5c12254ea1..550b37b36635 100644
--- a/arch/arm/mach-sunxi/p2wi.c
+++ b/arch/arm/mach-sunxi/p2wi.c
@@ -23,6 +23,7 @@
 #include <asm/arch/prcm.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/errno.h>
 
 void p2wi_init(void)
 {
diff --git a/arch/arm/mach-sunxi/rsb.c b/arch/arm/mach-sunxi/rsb.c
index 01bb09b7478e..2ec63f5a5689 100644
--- a/arch/arm/mach-sunxi/rsb.c
+++ b/arch/arm/mach-sunxi/rsb.c
@@ -15,6 +15,7 @@
 #include <asm/arch/gpio.h>
 #include <asm/arch/prcm.h>
 #include <asm/arch/rsb.h>
+#include <linux/errno.h>
 
 static int rsb_set_device_mode(void);
 
diff --git a/arch/arm/mach-tegra/cboot.c b/arch/arm/mach-tegra/cboot.c
index 384e81bac073..832a0ba1ca08 100644
--- a/arch/arm/mach-tegra/cboot.c
+++ b/arch/arm/mach-tegra/cboot.c
@@ -16,6 +16,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/arch/arm/mach-tegra/clock.c b/arch/arm/mach-tegra/clock.c
index 6b587209c1c6..9056fe0dd31c 100644
--- a/arch/arm/mach-tegra/clock.c
+++ b/arch/arm/mach-tegra/clock.c
@@ -20,6 +20,7 @@
 #include <asm/arch-tegra/pmc.h>
 #include <asm/arch-tegra/timer.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 /*
  * This is our record of the current clock rate of each clock. We don't
diff --git a/arch/arm/mach-tegra/ivc.c b/arch/arm/mach-tegra/ivc.c
index 66c1276f4b87..216673e43673 100644
--- a/arch/arm/mach-tegra/ivc.c
+++ b/arch/arm/mach-tegra/ivc.c
@@ -8,6 +8,7 @@
 #include <asm/io.h>
 #include <asm/arch-tegra/ivc.h>
 #include <linux/bug.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 #define TEGRA_IVC_ALIGN 64
diff --git a/arch/arm/mach-tegra/powergate.c b/arch/arm/mach-tegra/powergate.c
index c5ced7e3f389..5b3e3d8f56e8 100644
--- a/arch/arm/mach-tegra/powergate.c
+++ b/arch/arm/mach-tegra/powergate.c
@@ -7,6 +7,7 @@
 #include <errno.h>
 #include <time.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 #include <asm/io.h>
 #include <asm/types.h>
diff --git a/arch/arm/mach-tegra/tegra124/xusb-padctl.c b/arch/arm/mach-tegra/tegra124/xusb-padctl.c
index a1136f1558b8..6985515499f1 100644
--- a/arch/arm/mach-tegra/tegra124/xusb-padctl.c
+++ b/arch/arm/mach-tegra/tegra124/xusb-padctl.c
@@ -13,6 +13,7 @@
 #include <dm/of_access.h>
 #include <dm/ofnode.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 #include "../xusb-padctl-common.h"
diff --git a/arch/arm/mach-tegra/tegra20/clock.c b/arch/arm/mach-tegra/tegra20/clock.c
index fc197a050c54..c8db06cf66c7 100644
--- a/arch/arm/mach-tegra/tegra20/clock.c
+++ b/arch/arm/mach-tegra/tegra20/clock.c
@@ -20,6 +20,7 @@
 #include <div64.h>
 #include <fdtdec.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 /*
diff --git a/arch/arm/mach-tegra/tegra210/clock.c b/arch/arm/mach-tegra/tegra210/clock.c
index 7f8c3c3a7c7b..48f7e354108b 100644
--- a/arch/arm/mach-tegra/tegra210/clock.c
+++ b/arch/arm/mach-tegra/tegra210/clock.c
@@ -23,6 +23,7 @@
 #include <fdtdec.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 /*
  * Clock types that we can use as a source. The Tegra210 has muxes for the
diff --git a/arch/arm/mach-tegra/tegra210/xusb-padctl.c b/arch/arm/mach-tegra/tegra210/xusb-padctl.c
index 0af6e256ad18..572ba95d5b07 100644
--- a/arch/arm/mach-tegra/tegra210/xusb-padctl.c
+++ b/arch/arm/mach-tegra/tegra210/xusb-padctl.c
@@ -13,6 +13,7 @@
 #include <dm/of_access.h>
 #include <dm/ofnode.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 #include "../xusb-padctl-common.h"
diff --git a/arch/arm/mach-tegra/tegra30/clock.c b/arch/arm/mach-tegra/tegra30/clock.c
index 38b53cbbe480..b35f02eedd4c 100644
--- a/arch/arm/mach-tegra/tegra30/clock.c
+++ b/arch/arm/mach-tegra/tegra30/clock.c
@@ -19,6 +19,7 @@
 #include <div64.h>
 #include <fdtdec.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 /*
diff --git a/arch/arm/mach-tegra/xusb-padctl-common.c b/arch/arm/mach-tegra/xusb-padctl-common.c
index 42d64cf2c755..94a271311ce3 100644
--- a/arch/arm/mach-tegra/xusb-padctl-common.c
+++ b/arch/arm/mach-tegra/xusb-padctl-common.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <errno.h>
 #include <log.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/arch/arm/mach-tegra/xusb-padctl-dummy.c b/arch/arm/mach-tegra/xusb-padctl-dummy.c
index f2d90302f6d2..b3c5c9453b24 100644
--- a/arch/arm/mach-tegra/xusb-padctl-dummy.c
+++ b/arch/arm/mach-tegra/xusb-padctl-dummy.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <errno.h>
+#include <linux/errno.h>
 
 #include <asm/arch-tegra/xusb-padctl.h>
 
diff --git a/arch/arm/mach-zynq/clk.c b/arch/arm/mach-zynq/clk.c
index 4ef3f39f0523..04d6607f591a 100644
--- a/arch/arm/mach-zynq/clk.c
+++ b/arch/arm/mach-zynq/clk.c
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <asm/arch/clk.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-zynq/cpu.c b/arch/arm/mach-zynq/cpu.c
index a193e5c5b607..0c214f71fae4 100644
--- a/arch/arm/mach-zynq/cpu.c
+++ b/arch/arm/mach-zynq/cpu.c
@@ -14,6 +14,7 @@
 #include <asm/arch/hardware.h>
 #include <asm/arch/ps7_init_gpl.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/errno.h>
 
 #define ZYNQ_SILICON_VER_MASK	0xF0000000
 #define ZYNQ_SILICON_VER_SHIFT	28
diff --git a/arch/arm/mach-zynqmp/cpu.c b/arch/arm/mach-zynqmp/cpu.c
index 943b601ef8e4..b17145155eaa 100644
--- a/arch/arm/mach-zynqmp/cpu.c
+++ b/arch/arm/mach-zynqmp/cpu.c
@@ -16,6 +16,7 @@
 #include <asm/io.h>
 #include <zynqmp_firmware.h>
 #include <asm/cache.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #define ZYNQ_SILICON_VER_MASK	0xF000
diff --git a/arch/m68k/lib/fec.c b/arch/m68k/lib/fec.c
index 3b76d1392bf9..4f0132389288 100644
--- a/arch/m68k/lib/fec.c
+++ b/arch/m68k/lib/fec.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 
diff --git a/arch/nios2/cpu/cpu.c b/arch/nios2/cpu/cpu.c
index 0203348df010..f13e61b6a983 100644
--- a/arch/nios2/cpu/cpu.c
+++ b/arch/nios2/cpu/cpu.c
@@ -16,6 +16,7 @@
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <asm/system.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/powerpc/cpu/mpc85xx/ether_fcc.c b/arch/powerpc/cpu/mpc85xx/ether_fcc.c
index 35bc146a38be..5504ded9e059 100644
--- a/arch/powerpc/cpu/mpc85xx/ether_fcc.c
+++ b/arch/powerpc/cpu/mpc85xx/ether_fcc.c
@@ -33,6 +33,7 @@
 #include <config.h>
 #include <net.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #if defined(CONFIG_MII) || defined(CONFIG_CMD_MII)
diff --git a/arch/riscv/lib/andes_plic.c b/arch/riscv/lib/andes_plic.c
index 3fa92277639c..445a39798b91 100644
--- a/arch/riscv/lib/andes_plic.c
+++ b/arch/riscv/lib/andes_plic.c
@@ -19,6 +19,7 @@
 #include <asm/syscon.h>
 #include <cpu.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 /* pending register */
diff --git a/arch/riscv/lib/image.c b/arch/riscv/lib/image.c
index 636b6597c062..88563331b33b 100644
--- a/arch/riscv/lib/image.c
+++ b/arch/riscv/lib/image.c
@@ -12,6 +12,7 @@
 #include <errno.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/sizes.h>
 #include <linux/stddef.h>
 
diff --git a/arch/riscv/lib/sbi.c b/arch/riscv/lib/sbi.c
index 8fbc23839dda..984499960a1a 100644
--- a/arch/riscv/lib/sbi.c
+++ b/arch/riscv/lib/sbi.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <asm/encoding.h>
 #include <asm/sbi.h>
+#include <linux/errno.h>
 
 struct sbiret sbi_ecall(int ext, int fid, unsigned long arg0,
 			unsigned long arg1, unsigned long arg2,
diff --git a/arch/riscv/lib/smp.c b/arch/riscv/lib/smp.c
index 879b7ab9a788..09dd439b59aa 100644
--- a/arch/riscv/lib/smp.c
+++ b/arch/riscv/lib/smp.c
@@ -10,6 +10,7 @@
 #include <asm/barrier.h>
 #include <asm/global_data.h>
 #include <asm/smp.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/sandbox/cpu/cpu.c b/arch/sandbox/cpu/cpu.c
index c58a5ef7d1f7..e606d56f0121 100644
--- a/arch/sandbox/cpu/cpu.c
+++ b/arch/sandbox/cpu/cpu.c
@@ -12,6 +12,7 @@
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <os.h>
 #include <asm/io.h>
diff --git a/arch/sandbox/cpu/eth-raw-os.c b/arch/sandbox/cpu/eth-raw-os.c
index 8ef8f65ebaf6..00b3785bad9a 100644
--- a/arch/sandbox/cpu/eth-raw-os.c
+++ b/arch/sandbox/cpu/eth-raw-os.c
@@ -7,6 +7,7 @@
 #include <asm/eth-raw-os.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <net/if.h>
 #include <netinet/in.h>
diff --git a/arch/sandbox/cpu/os.c b/arch/sandbox/cpu/os.c
index f0721d3f7c50..581a48ea9edb 100644
--- a/arch/sandbox/cpu/os.c
+++ b/arch/sandbox/cpu/os.c
@@ -17,6 +17,7 @@
 #include <time.h>
 #include <unistd.h>
 #include <vsprintf.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
diff --git a/arch/sandbox/cpu/sdl.c b/arch/sandbox/cpu/sdl.c
index 8673e601e5e2..c1c9bb68e0a9 100644
--- a/arch/sandbox/cpu/sdl.c
+++ b/arch/sandbox/cpu/sdl.c
@@ -7,6 +7,7 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <stdbool.h>
+#include <linux/errno.h>
 #include <linux/input.h>
 #include <SDL2/SDL.h>
 #include <asm/state.h>
diff --git a/arch/sandbox/cpu/spl.c b/arch/sandbox/cpu/spl.c
index 41591d6528cb..52cabd7ff12b 100644
--- a/arch/sandbox/cpu/spl.c
+++ b/arch/sandbox/cpu/spl.c
@@ -14,6 +14,7 @@
 #include <asm/global_data.h>
 #include <asm/spl.h>
 #include <asm/state.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/sandbox/cpu/start.c b/arch/sandbox/cpu/start.c
index b3365c78b4b9..4cacd23d0cd8 100644
--- a/arch/sandbox/cpu/start.c
+++ b/arch/sandbox/cpu/start.c
@@ -19,6 +19,7 @@
 #include <asm/sections.h>
 #include <asm/state.h>
 #include <linux/ctype.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/sandbox/cpu/state.c b/arch/sandbox/cpu/state.c
index bfc4f0b8defb..35bc7586fa57 100644
--- a/arch/sandbox/cpu/state.c
+++ b/arch/sandbox/cpu/state.c
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <asm/malloc.h>
 #include <asm/state.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 /* Main state record for the sandbox */
diff --git a/arch/sandbox/include/asm/sdl.h b/arch/sandbox/include/asm/sdl.h
index 47fc4889d207..2a98a7f49b2a 100644
--- a/arch/sandbox/include/asm/sdl.h
+++ b/arch/sandbox/include/asm/sdl.h
@@ -7,6 +7,7 @@
 #define __SANDBOX_SDL_H
 
 #include <errno.h>
+#include <linux/errno.h>
 
 #ifdef CONFIG_SANDBOX_SDL
 
diff --git a/arch/sandbox/lib/pci_io.c b/arch/sandbox/lib/pci_io.c
index 2038141947ab..cfc5291ab7b6 100644
--- a/arch/sandbox/lib/pci_io.c
+++ b/arch/sandbox/lib/pci_io.c
@@ -13,6 +13,7 @@
 #include <dm.h>
 #include <log.h>
 #include <asm/io.h>
+#include <linux/errno.h>
 
 int pci_map_physmem(phys_addr_t paddr, unsigned long *lenp,
 		    struct udevice **devp, void **ptrp)
diff --git a/arch/x86/cpu/acpi_gpe.c b/arch/x86/cpu/acpi_gpe.c
index 47ee817eb7ac..5610d5437236 100644
--- a/arch/x86/cpu/acpi_gpe.c
+++ b/arch/x86/cpu/acpi_gpe.c
@@ -13,6 +13,7 @@
 #include <asm/io.h>
 #include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/interrupt-controller/x86-irq.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 /**
diff --git a/arch/x86/cpu/apollolake/fsp_bindings.c b/arch/x86/cpu/apollolake/fsp_bindings.c
index a76855e3e287..b9880b56a8b3 100644
--- a/arch/x86/cpu/apollolake/fsp_bindings.c
+++ b/arch/x86/cpu/apollolake/fsp_bindings.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <log.h>
 #include <asm/arch/fsp_bindings.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 /**
diff --git a/arch/x86/cpu/apollolake/fsp_m.c b/arch/x86/cpu/apollolake/fsp_m.c
index cef937573b0c..83f94d20f581 100644
--- a/arch/x86/cpu/apollolake/fsp_m.c
+++ b/arch/x86/cpu/apollolake/fsp_m.c
@@ -11,6 +11,7 @@
 #include <asm/arch/fsp_bindings.h>
 #include <asm/fsp2/fsp_internal.h>
 #include <dm/uclass-internal.h>
+#include <linux/errno.h>
 
 int fspm_update_config(struct udevice *dev, struct fspm_upd *upd)
 {
diff --git a/arch/x86/cpu/apollolake/fsp_s.c b/arch/x86/cpu/apollolake/fsp_s.c
index a4e1c511614a..c6da4bbfce64 100644
--- a/arch/x86/cpu/apollolake/fsp_s.c
+++ b/arch/x86/cpu/apollolake/fsp_s.c
@@ -28,6 +28,7 @@
 #include <asm/arch/fsp/fsp_s_upd.h>
 #include <dm/uclass-internal.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #define PCH_P2SB_E0		0xe0
 #define HIDE_BIT		BIT(0)
diff --git a/arch/x86/cpu/apollolake/lpc.c b/arch/x86/cpu/apollolake/lpc.c
index b81a458f2ebf..1de8c4a98044 100644
--- a/arch/x86/cpu/apollolake/lpc.c
+++ b/arch/x86/cpu/apollolake/lpc.c
@@ -13,6 +13,7 @@
 #include <asm/pci.h>
 #include <asm/arch/iomap.h>
 #include <asm/arch/lpc.h>
+#include <linux/errno.h>
 #include <linux/log2.h>
 
 void lpc_enable_fixed_io_ranges(uint io_enables)
diff --git a/arch/x86/cpu/apollolake/punit.c b/arch/x86/cpu/apollolake/punit.c
index 3514ba215914..632309f69015 100644
--- a/arch/x86/cpu/apollolake/punit.c
+++ b/arch/x86/cpu/apollolake/punit.c
@@ -15,6 +15,7 @@
 #include <asm/pci.h>
 #include <asm/arch/systemagent.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 /*
  * Punit Initialisation code. This all isn't documented, but
diff --git a/arch/x86/cpu/apollolake/spl.c b/arch/x86/cpu/apollolake/spl.c
index a318bca5a62b..44cbe4590a71 100644
--- a/arch/x86/cpu/apollolake/spl.c
+++ b/arch/x86/cpu/apollolake/spl.c
@@ -19,6 +19,7 @@
 #include <asm/arch/iomap.h>
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 /* This reads the next phase from mapped SPI flash */
diff --git a/arch/x86/cpu/apollolake/uart.c b/arch/x86/cpu/apollolake/uart.c
index f368f7d2db4e..2a2010229455 100644
--- a/arch/x86/cpu/apollolake/uart.c
+++ b/arch/x86/cpu/apollolake/uart.c
@@ -16,6 +16,7 @@
 #include <asm/io.h>
 #include <asm/pci.h>
 #include <asm/lpss.h>
+#include <linux/errno.h>
 
 /* Low-power Subsystem (LPSS) clock register */
 enum {
diff --git a/arch/x86/cpu/broadwell/adsp.c b/arch/x86/cpu/broadwell/adsp.c
index 41f7d5d4d1a9..f5ae97c88ce0 100644
--- a/arch/x86/cpu/broadwell/adsp.c
+++ b/arch/x86/cpu/broadwell/adsp.c
@@ -19,6 +19,7 @@
 #include <asm/arch/adsp.h>
 #include <asm/arch/pch.h>
 #include <asm/arch/rcb.h>
+#include <linux/errno.h>
 
 enum pci_type_t {
 	LYNX_POINT,
diff --git a/arch/x86/cpu/broadwell/cpu.c b/arch/x86/cpu/broadwell/cpu.c
index ec9592c5aa7a..9fb35bad3131 100644
--- a/arch/x86/cpu/broadwell/cpu.c
+++ b/arch/x86/cpu/broadwell/cpu.c
@@ -24,6 +24,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/pch.h>
 #include <asm/arch/rcb.h>
+#include <linux/errno.h>
 
 int arch_cpu_init_dm(void)
 {
diff --git a/arch/x86/cpu/broadwell/cpu_from_spl.c b/arch/x86/cpu/broadwell/cpu_from_spl.c
index 6cede74a8299..4ca4fdcabb7f 100644
--- a/arch/x86/cpu/broadwell/cpu_from_spl.c
+++ b/arch/x86/cpu/broadwell/cpu_from_spl.c
@@ -13,6 +13,7 @@
 #include <log.h>
 #include <asm/global_data.h>
 #include <asm/mtrr.h>
+#include <linux/errno.h>
 
 int misc_init_r(void)
 {
diff --git a/arch/x86/cpu/broadwell/cpu_full.c b/arch/x86/cpu/broadwell/cpu_full.c
index 4debddce8ada..5fb6af3a3872 100644
--- a/arch/x86/cpu/broadwell/cpu_full.c
+++ b/arch/x86/cpu/broadwell/cpu_full.c
@@ -22,6 +22,7 @@
 #include <asm/arch/pch.h>
 #include <asm/arch/rcb.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 struct cpu_broadwell_priv {
 	bool ht_disabled;
diff --git a/arch/x86/cpu/broadwell/iobp.c b/arch/x86/cpu/broadwell/iobp.c
index 16c840690bcc..9805f8dbed48 100644
--- a/arch/x86/cpu/broadwell/iobp.c
+++ b/arch/x86/cpu/broadwell/iobp.c
@@ -12,6 +12,7 @@
 #include <asm/io.h>
 #include <asm/arch/pch.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 #define IOBP_RETRY 1000
 
diff --git a/arch/x86/cpu/broadwell/me.c b/arch/x86/cpu/broadwell/me.c
index 4ae084bf4529..89b7bd15082b 100644
--- a/arch/x86/cpu/broadwell/me.c
+++ b/arch/x86/cpu/broadwell/me.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <asm/arch/me.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 static inline void me_read_dword_ptr(struct udevice *dev, void *ptr, int offset)
diff --git a/arch/x86/cpu/broadwell/pch.c b/arch/x86/cpu/broadwell/pch.c
index f012db9debe8..6a5d9dc345e9 100644
--- a/arch/x86/cpu/broadwell/pch.c
+++ b/arch/x86/cpu/broadwell/pch.c
@@ -26,6 +26,7 @@
 #include <asm/arch/spi.h>
 #include <dm/uclass-internal.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 #define BIOS_CTRL	0xdc
 
diff --git a/arch/x86/cpu/broadwell/pinctrl_broadwell.c b/arch/x86/cpu/broadwell/pinctrl_broadwell.c
index 2bc3ef97214c..332d45fd088a 100644
--- a/arch/x86/cpu/broadwell/pinctrl_broadwell.c
+++ b/arch/x86/cpu/broadwell/pinctrl_broadwell.c
@@ -19,6 +19,7 @@
 #include <dt-bindings/gpio/x86-gpio.h>
 #include <dm/pinctrl.h>
 #include <dm/uclass-internal.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/x86/cpu/broadwell/refcode.c b/arch/x86/cpu/broadwell/refcode.c
index ee045a348335..ba4a23ac58ff 100644
--- a/arch/x86/cpu/broadwell/refcode.c
+++ b/arch/x86/cpu/broadwell/refcode.c
@@ -12,6 +12,7 @@
 #include <init.h>
 #include <log.h>
 #include <asm/arch/pei_data.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #define RMODULE_MAGIC		0xf8fe
diff --git a/arch/x86/cpu/broadwell/sdram.c b/arch/x86/cpu/broadwell/sdram.c
index b118116e3e66..1d48741f473a 100644
--- a/arch/x86/cpu/broadwell/sdram.c
+++ b/arch/x86/cpu/broadwell/sdram.c
@@ -25,6 +25,7 @@
 #include <asm/arch/pch.h>
 #include <asm/arch/pei_data.h>
 #include <asm/arch/pm.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 ulong board_get_usable_ram_top(ulong total_size)
diff --git a/arch/x86/cpu/coreboot/tables.c b/arch/x86/cpu/coreboot/tables.c
index c52741ac9da6..f0c350605e19 100644
--- a/arch/x86/cpu/coreboot/tables.c
+++ b/arch/x86/cpu/coreboot/tables.c
@@ -10,6 +10,7 @@
 #include <net.h>
 #include <asm/arch/sysinfo.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/cpu.c b/arch/x86/cpu/cpu.c
index 4c8c586fc8b6..cd1a6832cb2d 100644
--- a/arch/x86/cpu/cpu.c
+++ b/arch/x86/cpu/cpu.c
@@ -49,6 +49,7 @@
 #include <asm/interrupt.h>
 #include <asm/tables.h>
 #include <linux/compiler.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/cpu_x86.c b/arch/x86/cpu/cpu_x86.c
index 8b3a9e75d1d4..fc76839cc7d3 100644
--- a/arch/x86/cpu/cpu_x86.c
+++ b/arch/x86/cpu/cpu_x86.c
@@ -9,6 +9,7 @@
 #include <errno.h>
 #include <asm/cpu.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/x86/cpu/efi/payload.c b/arch/x86/cpu/efi/payload.c
index 66a122c9d427..9b87cf02418a 100644
--- a/arch/x86/cpu/efi/payload.c
+++ b/arch/x86/cpu/efi/payload.c
@@ -17,6 +17,7 @@
 #include <asm/e820.h>
 #include <asm/global_data.h>
 #include <asm/post.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/x86/cpu/i386/cpu.c b/arch/x86/cpu/i386/cpu.c
index 2f61ea8e5bb2..6ac70c9ec9a8 100644
--- a/arch/x86/cpu/i386/cpu.c
+++ b/arch/x86/cpu/i386/cpu.c
@@ -33,6 +33,7 @@
 #include <asm/msr.h>
 #include <asm/mtrr.h>
 #include <asm/processor-flags.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/x86/cpu/i386/interrupt.c b/arch/x86/cpu/i386/interrupt.c
index 5ade3712e7ca..c7d3570a986b 100644
--- a/arch/x86/cpu/i386/interrupt.c
+++ b/arch/x86/cpu/i386/interrupt.c
@@ -26,6 +26,7 @@
 #include <asm/lapic.h>
 #include <asm/processor-flags.h>
 #include <asm/ptrace.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/intel_common/cpu.c b/arch/x86/cpu/intel_common/cpu.c
index 87da5feaf616..a292dd72a888 100644
--- a/arch/x86/cpu/intel_common/cpu.c
+++ b/arch/x86/cpu/intel_common/cpu.c
@@ -23,6 +23,7 @@
 #include <asm/mtrr.h>
 #include <asm/post.h>
 #include <asm/microcode.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/intel_common/itss.c b/arch/x86/cpu/intel_common/itss.c
index d6bc051397b8..cc9111d7fc5a 100644
--- a/arch/x86/cpu/intel_common/itss.c
+++ b/arch/x86/cpu/intel_common/itss.c
@@ -19,6 +19,7 @@
 #include <spl.h>
 #include <asm/global_data.h>
 #include <asm/itss.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 struct itss_platdata {
diff --git a/arch/x86/cpu/intel_common/lpc.c b/arch/x86/cpu/intel_common/lpc.c
index 23befbef15ff..eda4e58d608f 100644
--- a/arch/x86/cpu/intel_common/lpc.c
+++ b/arch/x86/cpu/intel_common/lpc.c
@@ -14,6 +14,7 @@
 #include <asm/io.h>
 #include <asm/lpc_common.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/intel_common/microcode.c b/arch/x86/cpu/intel_common/microcode.c
index 919d146940af..157350a89491 100644
--- a/arch/x86/cpu/intel_common/microcode.c
+++ b/arch/x86/cpu/intel_common/microcode.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <asm/cpu.h>
 #include <asm/microcode.h>
diff --git a/arch/x86/cpu/intel_common/mrc.c b/arch/x86/cpu/intel_common/mrc.c
index 7369ffa19d75..f9380015139b 100644
--- a/arch/x86/cpu/intel_common/mrc.c
+++ b/arch/x86/cpu/intel_common/mrc.c
@@ -20,6 +20,7 @@
 #include <asm/post.h>
 #include <asm/arch/me.h>
 #include <asm/report_platform.h>
+#include <linux/errno.h>
 
 static const char *const ecc_decoder[] = {
 	"inactive",
diff --git a/arch/x86/cpu/intel_common/p2sb.c b/arch/x86/cpu/intel_common/p2sb.c
index 361d4c90cb91..8b62cc5d7be0 100644
--- a/arch/x86/cpu/intel_common/p2sb.c
+++ b/arch/x86/cpu/intel_common/p2sb.c
@@ -15,6 +15,7 @@
 #include <spl.h>
 #include <asm/pci.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #define PCH_P2SB_E0		0xe0
 #define HIDE_BIT		BIT(0)
diff --git a/arch/x86/cpu/irq.c b/arch/x86/cpu/irq.c
index 0775c5cddac2..547eedfbb859 100644
--- a/arch/x86/cpu/irq.c
+++ b/arch/x86/cpu/irq.c
@@ -17,6 +17,7 @@
 #include <asm/pci.h>
 #include <asm/pirq_routing.h>
 #include <asm/tables.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/ivybridge/bd82x6x.c b/arch/x86/cpu/ivybridge/bd82x6x.c
index 84d719e6c4ef..fefea448ade0 100644
--- a/arch/x86/cpu/ivybridge/bd82x6x.c
+++ b/arch/x86/cpu/ivybridge/bd82x6x.c
@@ -22,6 +22,7 @@
 #include <asm/arch/sandybridge.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/ivybridge/cpu.c b/arch/x86/cpu/ivybridge/cpu.c
index f5d0993bf214..209be6877be5 100644
--- a/arch/x86/cpu/ivybridge/cpu.c
+++ b/arch/x86/cpu/ivybridge/cpu.c
@@ -35,6 +35,7 @@
 #include <asm/arch/model_206ax.h>
 #include <asm/arch/pch.h>
 #include <asm/arch/sandybridge.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/ivybridge/early_me.c b/arch/x86/cpu/ivybridge/early_me.c
index 4f43986926ac..9758c9a653dc 100644
--- a/arch/x86/cpu/ivybridge/early_me.c
+++ b/arch/x86/cpu/ivybridge/early_me.c
@@ -18,6 +18,7 @@
 #include <asm/arch/pch.h>
 #include <asm/io.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 static const char *const me_ack_values[] = {
 	[ME_HFS_ACK_NO_DID]	= "No DID Ack received",
diff --git a/arch/x86/cpu/ivybridge/lpc.c b/arch/x86/cpu/ivybridge/lpc.c
index 2d82984dbdf1..a579eb3b38e2 100644
--- a/arch/x86/cpu/ivybridge/lpc.c
+++ b/arch/x86/cpu/ivybridge/lpc.c
@@ -21,6 +21,7 @@
 #include <asm/lpc_common.h>
 #include <asm/pci.h>
 #include <asm/arch/pch.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/ivybridge/model_206ax.c b/arch/x86/cpu/ivybridge/model_206ax.c
index 788e589b26d7..e11aa0001c48 100644
--- a/arch/x86/cpu/ivybridge/model_206ax.c
+++ b/arch/x86/cpu/ivybridge/model_206ax.c
@@ -23,6 +23,7 @@
 #include <asm/speedstep.h>
 #include <asm/turbo.h>
 #include <asm/arch/model_206ax.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/ivybridge/sdram.c b/arch/x86/cpu/ivybridge/sdram.c
index de0f0071fc0c..4c1ec37c6005 100644
--- a/arch/x86/cpu/ivybridge/sdram.c
+++ b/arch/x86/cpu/ivybridge/sdram.c
@@ -38,6 +38,7 @@
 #include <asm/arch/pch.h>
 #include <asm/post.h>
 #include <asm/arch/sandybridge.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/x86/cpu/mp_init.c b/arch/x86/cpu/mp_init.c
index a32283a7e8a2..1a34c2f03756 100644
--- a/arch/x86/cpu/mp_init.c
+++ b/arch/x86/cpu/mp_init.c
@@ -31,6 +31,7 @@
 #include <dm/lists.h>
 #include <dm/root.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/linkage.h>
 #include <linux/string.h>
 
diff --git a/arch/x86/cpu/mtrr.c b/arch/x86/cpu/mtrr.c
index 44a6f5c8124e..fd86a4e105b2 100644
--- a/arch/x86/cpu/mtrr.c
+++ b/arch/x86/cpu/mtrr.c
@@ -25,6 +25,7 @@
 #include <asm/mp.h>
 #include <asm/msr.h>
 #include <asm/mtrr.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/qemu/cpu.c b/arch/x86/cpu/qemu/cpu.c
index 9ce86b379c4d..a8451fa066f0 100644
--- a/arch/x86/cpu/qemu/cpu.c
+++ b/arch/x86/cpu/qemu/cpu.c
@@ -9,6 +9,7 @@
 #include <errno.h>
 #include <qfw.h>
 #include <asm/cpu.h>
+#include <linux/errno.h>
 
 int cpu_qemu_get_desc(const struct udevice *dev, char *buf, int size)
 {
diff --git a/arch/x86/cpu/qfw_cpu.c b/arch/x86/cpu/qfw_cpu.c
index 3db95256015d..5f13984278bc 100644
--- a/arch/x86/cpu/qfw_cpu.c
+++ b/arch/x86/cpu/qfw_cpu.c
@@ -13,6 +13,7 @@
 #include <dm/lists.h>
 #include <dm/uclass-internal.h>
 #include <dm/root.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 int qemu_cpu_fixup(void)
diff --git a/arch/x86/cpu/quark/dram.c b/arch/x86/cpu/quark/dram.c
index d38c3d0809a7..e2a36ceffd41 100644
--- a/arch/x86/cpu/quark/dram.c
+++ b/arch/x86/cpu/quark/dram.c
@@ -18,6 +18,7 @@
 #include <asm/arch/mrc.h>
 #include <asm/arch/msg_port.h>
 #include <asm/arch/quark.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/x86/cpu/slimbootloader/serial.c b/arch/x86/cpu/slimbootloader/serial.c
index 10e4e9300ece..cb5029667418 100644
--- a/arch/x86/cpu/slimbootloader/serial.c
+++ b/arch/x86/cpu/slimbootloader/serial.c
@@ -11,6 +11,7 @@
 #include <vsprintf.h>
 #include <asm/arch/slimbootloader.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 
 /**
  * The serial port info hob is generated by Slim Bootloader, so eligible for
diff --git a/arch/x86/cpu/tangier/pinmux.c b/arch/x86/cpu/tangier/pinmux.c
index 596c2c177ce3..aba74a083d7f 100644
--- a/arch/x86/cpu/tangier/pinmux.c
+++ b/arch/x86/cpu/tangier/pinmux.c
@@ -12,6 +12,7 @@
 #include <syscon.h>
 #include <asm/cpu.h>
 #include <asm/scu.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/printk.h>
 
diff --git a/arch/x86/cpu/tangier/sdram.c b/arch/x86/cpu/tangier/sdram.c
index e1531385fb89..a8760263cf4b 100644
--- a/arch/x86/cpu/tangier/sdram.c
+++ b/arch/x86/cpu/tangier/sdram.c
@@ -9,6 +9,7 @@
 #include <asm/e820.h>
 #include <asm/global_data.h>
 #include <asm/sfi.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/arch/x86/cpu/tangier/sysreset.c b/arch/x86/cpu/tangier/sysreset.c
index b03bc28f9353..c0246dfdf963 100644
--- a/arch/x86/cpu/tangier/sysreset.c
+++ b/arch/x86/cpu/tangier/sysreset.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <sysreset.h>
 #include <asm/scu.h>
+#include <linux/errno.h>
 
 static int tangier_sysreset_request(struct udevice *dev, enum sysreset_t type)
 {
diff --git a/arch/x86/include/asm/mp.h b/arch/x86/include/asm/mp.h
index 25edabbdd399..f93426ed7846 100644
--- a/arch/x86/include/asm/mp.h
+++ b/arch/x86/include/asm/mp.h
@@ -10,6 +10,7 @@
 
 #include <asm/atomic.h>
 #include <asm/cache.h>
+#include <linux/errno.h>
 
 struct udevice;
 
diff --git a/arch/x86/lib/acpi_nhlt.c b/arch/x86/lib/acpi_nhlt.c
index 8df5ddd4a7af..83f110ebba80 100644
--- a/arch/x86/lib/acpi_nhlt.c
+++ b/arch/x86/lib/acpi_nhlt.c
@@ -17,6 +17,7 @@
 #include <asm/acpi_nhlt.h>
 #include <asm/unaligned.h>
 #include <dm/acpi.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #define NHLT_RID		1
diff --git a/arch/x86/lib/acpi_table.c b/arch/x86/lib/acpi_table.c
index 0d0b8edfcaf2..2de8ad0d6f45 100644
--- a/arch/x86/lib/acpi_table.c
+++ b/arch/x86/lib/acpi_table.c
@@ -26,6 +26,7 @@
 #include <asm/arch/global_nvs.h>
 #include <dm/acpi.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 /*
diff --git a/arch/x86/lib/bootm.c b/arch/x86/lib/bootm.c
index a4bd65d3b7b3..66fc8a69aaa4 100644
--- a/arch/x86/lib/bootm.c
+++ b/arch/x86/lib/bootm.c
@@ -20,6 +20,7 @@
 #include <errno.h>
 #include <fdt_support.h>
 #include <image.h>
+#include <linux/errno.h>
 #include <u-boot/zlib.h>
 #include <asm/bootparam.h>
 #include <asm/cpu.h>
diff --git a/arch/x86/lib/fsp/fsp_common.c b/arch/x86/lib/fsp/fsp_common.c
index 82f7d3ab5f0d..0f81d54f52c0 100644
--- a/arch/x86/lib/fsp/fsp_common.c
+++ b/arch/x86/lib/fsp/fsp_common.c
@@ -19,6 +19,7 @@
 #include <asm/post.h>
 #include <asm/processor.h>
 #include <asm/fsp/fsp_support.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/lib/fsp/fsp_graphics.c b/arch/x86/lib/fsp/fsp_graphics.c
index c5129ff1f304..6e4368d4184d 100644
--- a/arch/x86/lib/fsp/fsp_graphics.c
+++ b/arch/x86/lib/fsp/fsp_graphics.c
@@ -13,6 +13,7 @@
 #include <asm/fsp/fsp_support.h>
 #include <asm/global_data.h>
 #include <asm/mtrr.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/lib/fsp2/fsp_dram.c b/arch/x86/lib/fsp2/fsp_dram.c
index c31e2a11b7a2..e81b35d8d72e 100644
--- a/arch/x86/lib/fsp2/fsp_dram.c
+++ b/arch/x86/lib/fsp2/fsp_dram.c
@@ -15,6 +15,7 @@
 #include <asm/fsp2/fsp_api.h>
 #include <asm/fsp2/fsp_internal.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/sizes.h>
 
 int dram_init(void)
diff --git a/arch/x86/lib/fsp2/fsp_init.c b/arch/x86/lib/fsp2/fsp_init.c
index 85cae54a0cad..31702b90fd74 100644
--- a/arch/x86/lib/fsp2/fsp_init.c
+++ b/arch/x86/lib/fsp2/fsp_init.c
@@ -17,6 +17,7 @@
 #include <asm/intel_pinctrl.h>
 #include <dm/uclass-internal.h>
 #include <asm/fsp2/fsp_internal.h>
+#include <linux/errno.h>
 
 int arch_cpu_init_dm(void)
 {
diff --git a/arch/x86/lib/fsp2/fsp_meminit.c b/arch/x86/lib/fsp2/fsp_meminit.c
index 70d0070e6b58..5dfaf73b12a8 100644
--- a/arch/x86/lib/fsp2/fsp_meminit.c
+++ b/arch/x86/lib/fsp2/fsp_meminit.c
@@ -19,6 +19,7 @@
 #include <asm/fsp2/fsp_internal.h>
 #include <asm/arch/fsp/fsp_configs.h>
 #include <asm/arch/fsp/fsp_m_upd.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 static int prepare_mrc_cache_type(enum mrc_type_t type,
diff --git a/arch/x86/lib/fsp2/fsp_silicon_init.c b/arch/x86/lib/fsp2/fsp_silicon_init.c
index ca064eaf7165..7d83ae2a1cb7 100644
--- a/arch/x86/lib/fsp2/fsp_silicon_init.c
+++ b/arch/x86/lib/fsp2/fsp_silicon_init.c
@@ -18,6 +18,7 @@
 #include <asm/fsp/fsp_infoheader.h>
 #include <asm/fsp2/fsp_internal.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 int fsp_silicon_init(bool s3wake, bool use_spi_flash)
diff --git a/arch/x86/lib/fsp2/fsp_support.c b/arch/x86/lib/fsp2/fsp_support.c
index 1f68479ec586..b962487418b9 100644
--- a/arch/x86/lib/fsp2/fsp_support.c
+++ b/arch/x86/lib/fsp2/fsp_support.c
@@ -11,6 +11,7 @@
 #include <asm/fsp/fsp_support.h>
 #include <asm/fsp2/fsp_internal.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 /* The amount of the FSP header to probe to obtain what we need */
diff --git a/arch/x86/lib/i8254.c b/arch/x86/lib/i8254.c
index 0f975389103d..7aa41ede74b7 100644
--- a/arch/x86/lib/i8254.c
+++ b/arch/x86/lib/i8254.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <asm/io.h>
 #include <asm/i8254.h>
+#include <linux/errno.h>
 
 #define TIMER1_VALUE		18	/* 15.6us */
 #define BEEP_FREQUENCY_HZ	440
diff --git a/arch/x86/lib/mpspec.c b/arch/x86/lib/mpspec.c
index 78724564605a..bda9b7f1a112 100644
--- a/arch/x86/lib/mpspec.c
+++ b/arch/x86/lib/mpspec.c
@@ -19,6 +19,7 @@
 #include <asm/mpspec.h>
 #include <asm/tables.h>
 #include <dm/uclass-internal.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/x86/lib/mrccache.c b/arch/x86/lib/mrccache.c
index 3582f42733f1..0488a261c654 100644
--- a/arch/x86/lib/mrccache.c
+++ b/arch/x86/lib/mrccache.c
@@ -20,6 +20,7 @@
 #include <asm/mrccache.h>
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/x86/lib/pinctrl_ich6.c b/arch/x86/lib/pinctrl_ich6.c
index fd5e311b2916..82de4cbdc431 100644
--- a/arch/x86/lib/pinctrl_ich6.c
+++ b/arch/x86/lib/pinctrl_ich6.c
@@ -16,6 +16,7 @@
 #include <asm/io.h>
 #include <asm/pci.h>
 #include <dm/pinctrl.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/lib/sfi.c b/arch/x86/lib/sfi.c
index 2e68504d886c..13029fc08cbd 100644
--- a/arch/x86/lib/sfi.c
+++ b/arch/x86/lib/sfi.c
@@ -20,6 +20,7 @@
 #include <asm/sfi.h>
 #include <asm/tables.h>
 #include <dm/uclass-internal.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 struct table_info {
diff --git a/arch/x86/lib/spl.c b/arch/x86/lib/spl.c
index ad167be31c47..36c92b7b1489 100644
--- a/arch/x86/lib/spl.c
+++ b/arch/x86/lib/spl.c
@@ -25,6 +25,7 @@
 #include <asm/processor.h>
 #include <asm/spl.h>
 #include <asm-generic/sections.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/x86/lib/tpl.c b/arch/x86/lib/tpl.c
index 0e2558ce944c..140e36f037a8 100644
--- a/arch/x86/lib/tpl.c
+++ b/arch/x86/lib/tpl.c
@@ -18,6 +18,7 @@
 #include <asm/mtrr.h>
 #include <asm/processor.h>
 #include <asm-generic/sections.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/lib/zimage.c b/arch/x86/lib/zimage.c
index 219e70607bf8..a13eb78e2224 100644
--- a/arch/x86/lib/zimage.c
+++ b/arch/x86/lib/zimage.c
@@ -30,6 +30,7 @@
 #include <asm/arch/timestamp.h>
 #endif
 #include <linux/compiler.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <linux/string.h>
 
diff --git a/board/AndesTech/ax25-ae350/ax25-ae350.c b/board/AndesTech/ax25-ae350/ax25-ae350.c
index bb0dfb5e95d3..4e546adfc68a 100644
--- a/board/AndesTech/ax25-ae350/ax25-ae350.c
+++ b/board/AndesTech/ax25-ae350/ax25-ae350.c
@@ -14,6 +14,7 @@
 #endif
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <faraday/ftsmc020.h>
 #include <fdtdec.h>
diff --git a/board/CZ.NIC/turris_mox/mox_sp.c b/board/CZ.NIC/turris_mox/mox_sp.c
index 2c0c4956cd4f..c15f8ee5b512 100644
--- a/board/CZ.NIC/turris_mox/mox_sp.c
+++ b/board/CZ.NIC/turris_mox/mox_sp.c
@@ -9,6 +9,7 @@
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 #define RWTM_BASE		(MVEBU_REGISTER(0xb0000))
 #define RWTM_CMD_PARAM(i)	(size_t)(RWTM_BASE + (i) * 4)
diff --git a/board/CZ.NIC/turris_mox/turris_mox.c b/board/CZ.NIC/turris_mox/turris_mox.c
index 32dabe99598d..9429806b673e 100644
--- a/board/CZ.NIC/turris_mox/turris_mox.c
+++ b/board/CZ.NIC/turris_mox/turris_mox.c
@@ -20,6 +20,7 @@
 #include <init.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <linux/string.h>
 #include <miiphy.h>
diff --git a/board/CZ.NIC/turris_omnia/turris_omnia.c b/board/CZ.NIC/turris_omnia/turris_omnia.c
index fdce33e157d0..a466c8e9f86f 100644
--- a/board/CZ.NIC/turris_omnia/turris_omnia.c
+++ b/board/CZ.NIC/turris_omnia/turris_omnia.c
@@ -24,6 +24,7 @@
 #include <fdt_support.h>
 #include <time.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
 # include <atsha204a-i2c.h>
diff --git a/board/Marvell/mvebu_armada-37xx/board.c b/board/Marvell/mvebu_armada-37xx/board.c
index 89b0973389f7..1ae867e5816d 100644
--- a/board/Marvell/mvebu_armada-37xx/board.c
+++ b/board/Marvell/mvebu_armada-37xx/board.c
@@ -14,6 +14,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/Marvell/mvebu_armada-8k/board.c b/board/Marvell/mvebu_armada-8k/board.c
index 41fe47defa91..00c0d21782ae 100644
--- a/board/Marvell/mvebu_armada-8k/board.c
+++ b/board/Marvell/mvebu_armada-8k/board.c
@@ -13,6 +13,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/alliedtelesis/common/gpio_hog.c b/board/alliedtelesis/common/gpio_hog.c
index 4aecf7e2cef7..7d26ccbd4628 100644
--- a/board/alliedtelesis/common/gpio_hog.c
+++ b/board/alliedtelesis/common/gpio_hog.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <asm/global_data.h>
 #include <asm/gpio.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/alliedtelesis/x530/x530.c b/board/alliedtelesis/x530/x530.c
index 6618cbdc0ad0..dff8a6b886c3 100644
--- a/board/alliedtelesis/x530/x530.c
+++ b/board/alliedtelesis/x530/x530.c
@@ -14,6 +14,7 @@
 #include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/mbus.h>
 #include <linux/io.h>
 #include <asm/arch/cpu.h>
diff --git a/board/armltd/vexpress/vexpress_common.c b/board/armltd/vexpress/vexpress_common.c
index 5e0d7464dd84..ee9f61f2b7ac 100644
--- a/board/armltd/vexpress/vexpress_common.c
+++ b/board/armltd/vexpress/vexpress_common.c
@@ -31,6 +31,7 @@
 #include <asm/arch/sysctrl.h>
 #include <asm/arch/wdt.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include "../drivers/mmc/arm_pl180_mmci.h"
 
diff --git a/board/atmel/common/mac-spi-nor.c b/board/atmel/common/mac-spi-nor.c
index 3b150dac7d86..67bfd3785b70 100644
--- a/board/atmel/common/mac-spi-nor.c
+++ b/board/atmel/common/mac-spi-nor.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <env.h>
 #include <net.h>
+#include <linux/errno.h>
 #include <linux/mtd/spi-nor.h>
 #include <netdev.h>
 #include <linux/string.h>
diff --git a/board/bachmann/ot1200/ot1200.c b/board/bachmann/ot1200/ot1200.c
index 6872af6dcd23..ac9eba85180c 100644
--- a/board/bachmann/ot1200/ot1200.c
+++ b/board/bachmann/ot1200/ot1200.c
@@ -30,6 +30,7 @@
 #include <asm/gpio.h>
 #include <phy.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/beacon/beacon-rzg2m/beacon-rzg2m.c b/board/beacon/beacon-rzg2m/beacon-rzg2m.c
index c343de510232..4b31d8ff57cd 100644
--- a/board/beacon/beacon-rzg2m/beacon-rzg2m.c
+++ b/board/beacon/beacon-rzg2m/beacon-rzg2m.c
@@ -7,6 +7,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/rcar-mstp.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/beacon/imx8mm/spl.c b/board/beacon/imx8mm/spl.c
index f2525c20b7b3..6307d689ab58 100644
--- a/board/beacon/imx8mm/spl.c
+++ b/board/beacon/imx8mm/spl.c
@@ -15,6 +15,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/mach-imx/boot_mode.h>
 #include <asm/arch/ddr.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include <dm/uclass.h>
diff --git a/board/bluegiga/apx4devkit/apx4devkit.c b/board/bluegiga/apx4devkit/apx4devkit.c
index ca44e5aba962..2d4437fbfe0f 100644
--- a/board/bluegiga/apx4devkit/apx4devkit.c
+++ b/board/bluegiga/apx4devkit/apx4devkit.c
@@ -28,6 +28,7 @@
 #include <asm/arch/sys_proto.h>
 #include <env.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 #include <linux/mii.h>
 #include <miiphy.h>
 #include <netdev.h>
diff --git a/board/bosch/guardian/board.c b/board/bosch/guardian/board.c
index 5e58ddf3e3d9..4f8d73bf9b37 100644
--- a/board/bosch/guardian/board.c
+++ b/board/bosch/guardian/board.c
@@ -21,6 +21,7 @@
 #include <panel.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <power/tps65217.h>
 #include <power/tps65910.h>
 #include <spl.h>
diff --git a/board/bosch/shc/board.c b/board/bosch/shc/board.c
index 243a810c4207..ac8665fc77b8 100644
--- a/board/bosch/shc/board.c
+++ b/board/bosch/shc/board.c
@@ -39,6 +39,7 @@
 #include <cpsw.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <power/tps65217.h>
 #include <env_internal.h>
 #include <watchdog.h>
diff --git a/board/broadcom/bcmns3/ns3.c b/board/broadcom/bcmns3/ns3.c
index 40eda6d465df..ac9ca20f8adc 100644
--- a/board/broadcom/bcmns3/ns3.c
+++ b/board/broadcom/bcmns3/ns3.c
@@ -13,6 +13,7 @@
 #include <asm/armv8/mmu.h>
 #include <asm/arch-bcmns3/bl33_info.h>
 #include <dt-bindings/memory/bcm-ns3-mc.h>
+#include <linux/errno.h>
 
 /* Default reset-level = 3 and strap-val = 0 */
 #define L3_RESET	30
diff --git a/board/broadcom/bcmstb/bcmstb.c b/board/broadcom/bcmstb/bcmstb.c
index f6bdf1f5f400..ca86511b1c9e 100644
--- a/board/broadcom/bcmstb/bcmstb.c
+++ b/board/broadcom/bcmstb/bcmstb.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <time.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/types.h>
 #include <common.h>
 #include <env.h>
diff --git a/board/ccv/xpress/xpress.c b/board/ccv/xpress/xpress.c
index 1edec6158efc..c7476ba197c7 100644
--- a/board/ccv/xpress/xpress.c
+++ b/board/ccv/xpress/xpress.c
@@ -29,6 +29,7 @@
 #include <usb.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <usb/ehci-ci.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/compulab/cl-som-imx7/cl-som-imx7.c b/board/compulab/cl-som-imx7/cl-som-imx7.c
index edb37225e743..28f4859f6491 100644
--- a/board/compulab/cl-som-imx7/cl-som-imx7.c
+++ b/board/compulab/cl-som-imx7/cl-som-imx7.c
@@ -19,6 +19,7 @@
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <power/pmic.h>
 #include <power/pfuze3000_pmic.h>
 #include <asm/mach-imx/mxc_i2c.h>
diff --git a/board/compulab/cm_fx6/cm_fx6.c b/board/compulab/cm_fx6/cm_fx6.c
index aeab97d7d207..e39768378f90 100644
--- a/board/compulab/cm_fx6/cm_fx6.c
+++ b/board/compulab/cm_fx6/cm_fx6.c
@@ -39,6 +39,7 @@
 #include <dm/device-internal.h>
 #include <jffs2/load_kernel.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include "common.h"
 #include "../common/eeprom.h"
diff --git a/board/compulab/common/eeprom.c b/board/compulab/common/eeprom.c
index 0ffa82dd6d38..cc190103c4cf 100644
--- a/board/compulab/common/eeprom.c
+++ b/board/compulab/common/eeprom.c
@@ -14,6 +14,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/setup.h>
+#include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include "eeprom.h"
diff --git a/board/compulab/common/eeprom.h b/board/compulab/common/eeprom.h
index a9c0203b81a4..5e5aa41074dc 100644
--- a/board/compulab/common/eeprom.h
+++ b/board/compulab/common/eeprom.h
@@ -9,6 +9,7 @@
 #ifndef _EEPROM_
 #define _EEPROM_
 #include <errno.h>
+#include <linux/errno.h>
 
 #ifdef CONFIG_SYS_I2C
 int cl_eeprom_read_mac_addr(uchar *buf, uint eeprom_bus);
diff --git a/board/congatec/cgtqmx6eval/cgtqmx6eval.c b/board/congatec/cgtqmx6eval/cgtqmx6eval.c
index c4b3772e8355..c857a73df742 100644
--- a/board/congatec/cgtqmx6eval/cgtqmx6eval.c
+++ b/board/congatec/cgtqmx6eval/cgtqmx6eval.c
@@ -31,6 +31,7 @@
 #include <input.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <power/pmic.h>
 #include <power/pfuze100_pmic.h>
diff --git a/board/creative/xfi3/xfi3.c b/board/creative/xfi3/xfi3.c
index cbaa5e59eac8..3e7f7e6e1735 100644
--- a/board/creative/xfi3/xfi3.c
+++ b/board/creative/xfi3/xfi3.c
@@ -22,6 +22,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/dhelectronics/dh_imx6/dh_imx6.c b/board/dhelectronics/dh_imx6/dh_imx6.c
index 960c1adec98d..8badac1d682e 100644
--- a/board/dhelectronics/dh_imx6/dh_imx6.c
+++ b/board/dhelectronics/dh_imx6/dh_imx6.c
@@ -36,6 +36,7 @@
 #include <mmc.h>
 #include <usb.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <usb/ehci-ci.h>
 
diff --git a/board/dhelectronics/dh_stm32mp1/board.c b/board/dhelectronics/dh_stm32mp1/board.c
index e875d5410c59..571168570e1a 100644
--- a/board/dhelectronics/dh_stm32mp1/board.c
+++ b/board/dhelectronics/dh_stm32mp1/board.c
@@ -38,6 +38,7 @@
 #include <phy.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include <power/regulator.h>
diff --git a/board/emulation/qemu-arm/qemu-arm.c b/board/emulation/qemu-arm/qemu-arm.c
index f18f2ed7da3a..e6b8776bfafc 100644
--- a/board/emulation/qemu-arm/qemu-arm.c
+++ b/board/emulation/qemu-arm/qemu-arm.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <virtio_types.h>
 #include <virtio.h>
+#include <linux/errno.h>
 
 #ifdef CONFIG_ARM64
 #include <asm/armv8/mmu.h>
diff --git a/board/engicam/common/board.c b/board/engicam/common/board.c
index f752ac95ec1e..174266397048 100644
--- a/board/engicam/common/board.c
+++ b/board/engicam/common/board.c
@@ -18,6 +18,7 @@
 #include <asm/arch/sys_proto.h>
 #include <watchdog.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include "board.h"
diff --git a/board/esd/vme8349/vme8349.c b/board/esd/vme8349/vme8349.c
index bc56284655c7..014578673656 100644
--- a/board/esd/vme8349/vme8349.c
+++ b/board/esd/vme8349/vme8349.c
@@ -31,6 +31,7 @@
 #include <i2c.h>
 #include <netdev.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/common/fsl_validate.c b/board/freescale/common/fsl_validate.c
index f12dcb3cf143..a228c82bc8e0 100644
--- a/board/freescale/common/fsl_validate.c
+++ b/board/freescale/common/fsl_validate.c
@@ -15,6 +15,7 @@
 #include <malloc.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <u-boot/rsa-mod-exp.h>
 #include <hash.h>
diff --git a/board/freescale/common/mc34vr500.c b/board/freescale/common/mc34vr500.c
index 6f485ea233ed..d96d1e2293f2 100644
--- a/board/freescale/common/mc34vr500.c
+++ b/board/freescale/common/mc34vr500.c
@@ -9,6 +9,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <power/pmic.h>
 #include <power/mc34vr500_pmic.h>
 
diff --git a/board/freescale/common/pfuze.c b/board/freescale/common/pfuze.c
index af1ee044bb3c..2011738fe215 100644
--- a/board/freescale/common/pfuze.c
+++ b/board/freescale/common/pfuze.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <errno.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <power/pmic.h>
 #include <power/pfuze100_pmic.h>
 
diff --git a/board/freescale/imx8mm_evk/spl.c b/board/freescale/imx8mm_evk/spl.c
index 63257eabb6f8..c3224c66192b 100644
--- a/board/freescale/imx8mm_evk/spl.c
+++ b/board/freescale/imx8mm_evk/spl.c
@@ -20,6 +20,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/mach-imx/boot_mode.h>
 #include <asm/arch/ddr.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include <dm/uclass.h>
diff --git a/board/freescale/imx8mq_evk/spl.c b/board/freescale/imx8mq_evk/spl.c
index 7316c762a2b7..6a37467314cc 100644
--- a/board/freescale/imx8mq_evk/spl.c
+++ b/board/freescale/imx8mq_evk/spl.c
@@ -26,6 +26,7 @@
 #include <mmc.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <power/pmic.h>
 #include <power/pfuze100_pmic.h>
diff --git a/board/freescale/ls1012ardb/ls1012ardb.c b/board/freescale/ls1012ardb/ls1012ardb.c
index 278dc2221e40..1ca23aef0ebf 100644
--- a/board/freescale/ls1012ardb/ls1012ardb.c
+++ b/board/freescale/ls1012ardb/ls1012ardb.c
@@ -30,6 +30,7 @@
 #include <netdev.h>
 #include <fsl_sec.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/mpc8308rdb/sdram.c b/board/freescale/mpc8308rdb/sdram.c
index 33feed16e05c..d0c359f639d8 100644
--- a/board/freescale/mpc8308rdb/sdram.c
+++ b/board/freescale/mpc8308rdb/sdram.c
@@ -15,6 +15,7 @@
 #include <init.h>
 #include <mpc83xx.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 
 #include <asm/bitops.h>
 #include <asm/io.h>
diff --git a/board/freescale/mpc8313erdb/sdram.c b/board/freescale/mpc8313erdb/sdram.c
index 3d03da024099..80b24cb7d168 100644
--- a/board/freescale/mpc8313erdb/sdram.c
+++ b/board/freescale/mpc8313erdb/sdram.c
@@ -14,6 +14,7 @@
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 #include <asm/bitops.h>
 #include <asm/io.h>
diff --git a/board/freescale/mpc8315erdb/sdram.c b/board/freescale/mpc8315erdb/sdram.c
index 84f8cd926ed4..bda9421977b8 100644
--- a/board/freescale/mpc8315erdb/sdram.c
+++ b/board/freescale/mpc8315erdb/sdram.c
@@ -14,6 +14,7 @@
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 #include <asm/bitops.h>
 #include <asm/io.h>
diff --git a/board/freescale/mpc8323erdb/mpc8323erdb.c b/board/freescale/mpc8323erdb/mpc8323erdb.c
index 16f3f49b6cb9..a96f4ecca205 100644
--- a/board/freescale/mpc8323erdb/mpc8323erdb.c
+++ b/board/freescale/mpc8323erdb/mpc8323erdb.c
@@ -25,6 +25,7 @@
 #include <asm/ppc.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
diff --git a/board/freescale/mpc832xemds/mpc832xemds.c b/board/freescale/mpc832xemds/mpc832xemds.c
index f8b81ee3cc31..0ed0d8e137d7 100644
--- a/board/freescale/mpc832xemds/mpc832xemds.c
+++ b/board/freescale/mpc832xemds/mpc832xemds.c
@@ -28,6 +28,7 @@
 #endif
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/mpc8349emds/mpc8349emds.c b/board/freescale/mpc8349emds/mpc8349emds.c
index cec8b77de960..1b10fea9c6d6 100644
--- a/board/freescale/mpc8349emds/mpc8349emds.c
+++ b/board/freescale/mpc8349emds/mpc8349emds.c
@@ -24,6 +24,7 @@
 #endif
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 #if defined(CONFIG_OF_LIBFDT)
 #include <linux/libfdt.h>
diff --git a/board/freescale/mpc8349itx/mpc8349itx.c b/board/freescale/mpc8349itx/mpc8349itx.c
index c1ae8c5b9884..d21bd4aa16b4 100644
--- a/board/freescale/mpc8349itx/mpc8349itx.c
+++ b/board/freescale/mpc8349itx/mpc8349itx.c
@@ -27,6 +27,7 @@
 #endif
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include "../../../arch/powerpc/cpu/mpc83xx/hrcw/hrcw.h"
diff --git a/board/freescale/mpc837xemds/mpc837xemds.c b/board/freescale/mpc837xemds/mpc837xemds.c
index e45bc0d516c0..bd283076b1e2 100644
--- a/board/freescale/mpc837xemds/mpc837xemds.c
+++ b/board/freescale/mpc837xemds/mpc837xemds.c
@@ -19,6 +19,7 @@
 #include <tsec.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <fsl_esdhc.h>
diff --git a/board/freescale/mpc837xerdb/mpc837xerdb.c b/board/freescale/mpc837xerdb/mpc837xerdb.c
index 448bc9b937a9..5679f932c903 100644
--- a/board/freescale/mpc837xerdb/mpc837xerdb.c
+++ b/board/freescale/mpc837xerdb/mpc837xerdb.c
@@ -22,6 +22,7 @@
 #include <fsl_esdhc.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/mx25pdk/mx25pdk.c b/board/freescale/mx25pdk/mx25pdk.c
index 8e0edb45c3ef..f20087328b3e 100644
--- a/board/freescale/mx25pdk/mx25pdk.c
+++ b/board/freescale/mx25pdk/mx25pdk.c
@@ -19,6 +19,7 @@
 #include <i2c.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <power/pmic.h>
 #include <fsl_pmic.h>
 #include <mc34704.h>
diff --git a/board/freescale/mx28evk/mx28evk.c b/board/freescale/mx28evk/mx28evk.c
index 8ff35fbd02b8..d6cbdaf406fb 100644
--- a/board/freescale/mx28evk/mx28evk.c
+++ b/board/freescale/mx28evk/mx28evk.c
@@ -24,6 +24,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/mii.h>
 #include <miiphy.h>
 #include <netdev.h>
diff --git a/board/freescale/mx6slevk/mx6slevk.c b/board/freescale/mx6slevk/mx6slevk.c
index 5e6072dd424d..9e7a81d4bb52 100644
--- a/board/freescale/mx6slevk/mx6slevk.c
+++ b/board/freescale/mx6slevk/mx6slevk.c
@@ -21,6 +21,7 @@
 #include <asm/mach-imx/mxc_i2c.h>
 #include <asm/io.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 #include <linux/sizes.h>
 #include <common.h>
 #include <fsl_esdhc_imx.h>
diff --git a/board/freescale/mx6sllevk/mx6sllevk.c b/board/freescale/mx6sllevk/mx6sllevk.c
index f5aeaa41e746..3887ec62848e 100644
--- a/board/freescale/mx6sllevk/mx6sllevk.c
+++ b/board/freescale/mx6sllevk/mx6sllevk.c
@@ -17,6 +17,7 @@
 #include <asm/mach-imx/boot_mode.h>
 #include <asm/io.h>
 #include <common.h>
+#include <linux/errno.h>
 #include <linux/sizes.h>
 #include <mmc.h>
 #include <power/pmic.h>
diff --git a/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c b/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c
index d5621c5e0422..aefc1ab2bd86 100644
--- a/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c
+++ b/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c
@@ -21,6 +21,7 @@
 #include <asm/io.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/sizes.h>
 #include <common.h>
 #include <fsl_esdhc_imx.h>
diff --git a/board/freescale/mx6sxsabresd/mx6sxsabresd.c b/board/freescale/mx6sxsabresd/mx6sxsabresd.c
index 361c3c2c517d..ad3461c6661f 100644
--- a/board/freescale/mx6sxsabresd/mx6sxsabresd.c
+++ b/board/freescale/mx6sxsabresd/mx6sxsabresd.c
@@ -22,6 +22,7 @@
 #include <env.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/sizes.h>
 #include <common.h>
 #include <fsl_esdhc_imx.h>
diff --git a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
index bb6c2474abd6..cb903798df54 100644
--- a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
+++ b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
@@ -26,6 +26,7 @@
 #include <miiphy.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/sizes.h>
 #include <mmc.h>
 #include <netdev.h>
diff --git a/board/freescale/mx7dsabresd/mx7dsabresd.c b/board/freescale/mx7dsabresd/mx7dsabresd.c
index 8bf430670c55..d0f2e5f99184 100644
--- a/board/freescale/mx7dsabresd/mx7dsabresd.c
+++ b/board/freescale/mx7dsabresd/mx7dsabresd.c
@@ -15,6 +15,7 @@
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/io.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/sizes.h>
 #include <common.h>
 #include <fsl_esdhc_imx.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 f4bf325e0d3c..7fec510c8caa 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
@@ -29,6 +29,7 @@
 #include <miiphy.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <fsl_mdio.h>
diff --git a/board/freescale/p2041rdb/ddr.c b/board/freescale/p2041rdb/ddr.c
index 496d3a4f3088..f539002e3e1b 100644
--- a/board/freescale/p2041rdb/ddr.c
+++ b/board/freescale/p2041rdb/ddr.c
@@ -16,6 +16,7 @@
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
 #include <asm/fsl_law.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/qemu-ppce500/qemu-ppce500.c b/board/freescale/qemu-ppce500/qemu-ppce500.c
index 00c83d664385..5c84b404e0e4 100644
--- a/board/freescale/qemu-ppce500/qemu-ppce500.c
+++ b/board/freescale/qemu-ppce500/qemu-ppce500.c
@@ -20,6 +20,7 @@
 #include <asm/fsl_pci.h>
 #include <asm/io.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <netdev.h>
diff --git a/board/friendlyarm/nanopi2/onewire.c b/board/friendlyarm/nanopi2/onewire.c
index 994befb1ec99..be0f0c79efe3 100644
--- a/board/friendlyarm/nanopi2/onewire.c
+++ b/board/friendlyarm/nanopi2/onewire.c
@@ -11,6 +11,7 @@
 #include <asm/arch/clk.h>
 #include <i2c.h>
 #include <pwm.h>
+#include <linux/errno.h>
 
 #include <irq_func.h>
 
diff --git a/board/gateworks/gw_ventana/gw_ventana.c b/board/gateworks/gw_ventana/gw_ventana.c
index 4932fc2d1173..800d9e76d38c 100644
--- a/board/gateworks/gw_ventana/gw_ventana.c
+++ b/board/gateworks/gw_ventana/gw_ventana.c
@@ -40,6 +40,7 @@
 #include <netdev.h>
 #include <pci.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <linux/string.h>
 #include <power/pmic.h>
diff --git a/board/gdsys/a38x/ihs_phys.c b/board/gdsys/a38x/ihs_phys.c
index feeae37cd700..c4017a25af35 100644
--- a/board/gdsys/a38x/ihs_phys.c
+++ b/board/gdsys/a38x/ihs_phys.c
@@ -6,6 +6,7 @@
 #include <asm-generic/gpio.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include "ihs_phys.h"
diff --git a/board/gdsys/mpc8308/hrcon.c b/board/gdsys/mpc8308/hrcon.c
index 961bf0af72e7..ad231cace750 100644
--- a/board/gdsys/mpc8308/hrcon.c
+++ b/board/gdsys/mpc8308/hrcon.c
@@ -15,6 +15,7 @@
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <pci.h>
diff --git a/board/gdsys/mpc8308/sdram.c b/board/gdsys/mpc8308/sdram.c
index 64979828adbc..593f59265884 100644
--- a/board/gdsys/mpc8308/sdram.c
+++ b/board/gdsys/mpc8308/sdram.c
@@ -23,6 +23,7 @@
 #include <asm/io.h>
 
 #include <asm/ppc.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/gdsys/mpc8308/strider.c b/board/gdsys/mpc8308/strider.c
index a9025cd55cfb..9fedf79eaa94 100644
--- a/board/gdsys/mpc8308/strider.c
+++ b/board/gdsys/mpc8308/strider.c
@@ -15,6 +15,7 @@
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <pci.h>
diff --git a/board/ge/common/ge_common.c b/board/ge/common/ge_common.c
index 48c3778046f1..4885c9979294 100644
--- a/board/ge/common/ge_common.c
+++ b/board/ge/common/ge_common.c
@@ -7,6 +7,7 @@
 #include <env.h>
 #include <dm/uclass.h>
 #include <rtc.h>
+#include <linux/errno.h>
 
 void check_time(void)
 {
diff --git a/board/ge/common/vpd_reader.c b/board/ge/common/vpd_reader.c
index d42b00da2fe6..cdf96802d9e5 100644
--- a/board/ge/common/vpd_reader.c
+++ b/board/ge/common/vpd_reader.c
@@ -3,15 +3,16 @@
  * Copyright 2016 General Electric Company
  */
 
-#include "vpd_reader.h"
-#include <malloc.h>
-
+#include <common.h>
+#include <hexdump.h>
 #include <i2c.h>
-#include <linux/bch.h>
+#include <i2c_eeprom.h>
+#include <malloc.h>
 #include <stdlib.h>
 #include <dm/uclass.h>
-#include <i2c_eeprom.h>
-#include <hexdump.h>
+#include <linux/bch.h>
+#include <linux/errno.h>
+#include "vpd_reader.h"
 
 /* BCH configuration */
 
diff --git a/board/ge/common/vpd_reader.h b/board/ge/common/vpd_reader.h
index 3045b7e21e22..2c1028bfbe28 100644
--- a/board/ge/common/vpd_reader.h
+++ b/board/ge/common/vpd_reader.h
@@ -3,8 +3,6 @@
  * Copyright 2016 General Electric Company
  */
 
-#include "common.h"
-
 struct vpd_cache;
 
 /*
diff --git a/board/google/imx8mq_phanbell/spl.c b/board/google/imx8mq_phanbell/spl.c
index 0e822d01c4c2..38045791f131 100644
--- a/board/google/imx8mq_phanbell/spl.c
+++ b/board/google/imx8mq_phanbell/spl.c
@@ -26,6 +26,7 @@
 #include <fsl_esdhc_imx.h>
 #include <mmc.h>
 #include <spl.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/ids/ids8313/ids8313.c b/board/ids/ids8313/ids8313.c
index da78f60d05b2..0aec6e6ca853 100644
--- a/board/ids/ids8313/ids8313.c
+++ b/board/ids/ids8313/ids8313.c
@@ -22,6 +22,7 @@
 #include <asm/ppc.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/intel/cougarcanyon2/cougarcanyon2.c b/board/intel/cougarcanyon2/cougarcanyon2.c
index ce11eae59d50..412660bd414c 100644
--- a/board/intel/cougarcanyon2/cougarcanyon2.c
+++ b/board/intel/cougarcanyon2/cougarcanyon2.c
@@ -13,6 +13,7 @@
 #include <asm/lpc_common.h>
 #include <asm/pci.h>
 #include <asm/arch/pch.h>
+#include <linux/errno.h>
 
 #define SIO1007_RUNTIME_IOPORT	0x180
 
diff --git a/board/intel/edison/edison.c b/board/intel/edison/edison.c
index 42ebb831f577..755162070cd6 100644
--- a/board/intel/edison/edison.c
+++ b/board/intel/edison/edison.c
@@ -9,6 +9,7 @@
 #include <mmc.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/errno.h>
 #include <u-boot/md5.h>
 #include <usb.h>
 #include <watchdog.h>
diff --git a/board/keymile/km83xx/km83xx.c b/board/keymile/km83xx/km83xx.c
index 3bd9a1263fc2..54a6787c13d7 100644
--- a/board/keymile/km83xx/km83xx.c
+++ b/board/keymile/km83xx/km83xx.c
@@ -30,6 +30,7 @@
 #include <pci.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <post.h>
 
diff --git a/board/liebherr/display5/spl.c b/board/liebherr/display5/spl.c
index 3225ca0197b2..1580b8d3cf98 100644
--- a/board/liebherr/display5/spl.c
+++ b/board/liebherr/display5/spl.c
@@ -16,6 +16,7 @@
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
diff --git a/board/liebherr/mccmon6/spl.c b/board/liebherr/mccmon6/spl.c
index 6eacd60ddca5..1da59eb0668c 100644
--- a/board/liebherr/mccmon6/spl.c
+++ b/board/liebherr/mccmon6/spl.c
@@ -25,6 +25,7 @@
 #include <spl.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include <asm/arch/mx6-ddr.h>
diff --git a/board/nvidia/jetson-tk1/jetson-tk1.c b/board/nvidia/jetson-tk1/jetson-tk1.c
index ae1c76b133d3..06a8b390a0bf 100644
--- a/board/nvidia/jetson-tk1/jetson-tk1.c
+++ b/board/nvidia/jetson-tk1/jetson-tk1.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <power/as3722.h>
 #include <power/pmic.h>
diff --git a/board/ppcag/bg0900/bg0900.c b/board/ppcag/bg0900/bg0900.c
index 9d2ad0b20140..4f2ab859f303 100644
--- a/board/ppcag/bg0900/bg0900.c
+++ b/board/ppcag/bg0900/bg0900.c
@@ -18,6 +18,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/mii.h>
 #include <miiphy.h>
 #include <netdev.h>
diff --git a/board/renesas/grpeach/grpeach.c b/board/renesas/grpeach/grpeach.c
index ac989eb29c2f..d60a496c958f 100644
--- a/board/renesas/grpeach/grpeach.c
+++ b/board/renesas/grpeach/grpeach.c
@@ -10,6 +10,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/errno.h>
 
 #define RZA1_WDT_BASE	0xfcfe0000
 #define WTCSR		0x00
diff --git a/board/renesas/ulcb/cpld.c b/board/renesas/ulcb/cpld.c
index 7a52eaa9d399..30f96966b574 100644
--- a/board/renesas/ulcb/cpld.c
+++ b/board/renesas/ulcb/cpld.c
@@ -16,6 +16,7 @@
 #include <errno.h>
 #include <linux/err.h>
 #include <sysreset.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #define CPLD_ADDR_MODE		0x00 /* RW */
diff --git a/board/samsung/common/board.c b/board/samsung/common/board.c
index 4fcc0bf6f770..e79f5ddd2c9f 100644
--- a/board/samsung/common/board.c
+++ b/board/samsung/common/board.c
@@ -37,6 +37,7 @@
 #include <dwc3-uboot.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <samsung/misc.h>
 #include <dm/pinctrl.h>
 #include <dm.h>
diff --git a/board/samsung/common/exynos5-dt.c b/board/samsung/common/exynos5-dt.c
index 4463f64dbc20..1783983ab115 100644
--- a/board/samsung/common/exynos5-dt.c
+++ b/board/samsung/common/exynos5-dt.c
@@ -27,6 +27,7 @@
 #include <asm/arch/pinmux.h>
 #include <asm/arch/power.h>
 #include <asm/arch/sromc.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/max77686_pmic.h>
diff --git a/board/samsung/goni/goni.c b/board/samsung/goni/goni.c
index 9476a437113e..183579c4e3e1 100644
--- a/board/samsung/goni/goni.c
+++ b/board/samsung/goni/goni.c
@@ -15,6 +15,7 @@
 #include <dm.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <power/pmic.h>
 #include <usb/dwc2_udc.h>
diff --git a/board/samsung/trats/trats.c b/board/samsung/trats/trats.c
index f21cfe40d53c..18f311da9794 100644
--- a/board/samsung/trats/trats.c
+++ b/board/samsung/trats/trats.c
@@ -21,6 +21,7 @@
 #include <asm/arch/watchdog.h>
 #include <asm/arch/power.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <power/pmic.h>
 #include <usb/dwc2_udc.h>
 #include <power/max8997_pmic.h>
diff --git a/board/samsung/trats2/trats2.c b/board/samsung/trats2/trats2.c
index fcbead5c127c..6b008943da17 100644
--- a/board/samsung/trats2/trats2.c
+++ b/board/samsung/trats2/trats2.c
@@ -15,6 +15,7 @@
 #include <asm/arch/power.h>
 #include <asm/arch/mipi_dsim.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <power/pmic.h>
 #include <power/max77686_pmic.h>
 #include <power/battery.h>
diff --git a/board/samsung/universal_c210/universal.c b/board/samsung/universal_c210/universal.c
index fce8dfcc2344..dddf8d279bc7 100644
--- a/board/samsung/universal_c210/universal.c
+++ b/board/samsung/universal_c210/universal.c
@@ -19,6 +19,7 @@
 #include <asm/arch/watchdog.h>
 #include <ld9040.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <power/pmic.h>
 #include <usb.h>
 #include <usb/dwc2_udc.h>
diff --git a/board/sandbox/sandbox.c b/board/sandbox/sandbox.c
index 2e4c72f97810..deee7b147df9 100644
--- a/board/sandbox/sandbox.c
+++ b/board/sandbox/sandbox.c
@@ -18,6 +18,7 @@
 #include <asm/test.h>
 #include <asm/u-boot-sandbox.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 
 /*
  * Pointer to initial global data area
diff --git a/board/sandisk/sansa_fuze_plus/sfp.c b/board/sandisk/sansa_fuze_plus/sfp.c
index c6cce3b3fa63..b5052deb7acb 100644
--- a/board/sandisk/sansa_fuze_plus/sfp.c
+++ b/board/sandisk/sansa_fuze_plus/sfp.c
@@ -22,6 +22,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/siemens/draco/board.c b/board/siemens/draco/board.c
index 83cc14421dcb..7fa7d632ae2d 100644
--- a/board/siemens/draco/board.c
+++ b/board/siemens/draco/board.c
@@ -38,6 +38,7 @@
 #include <watchdog.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include "board.h"
 #include "../common/factoryset.h"
 #include <nand.h>
diff --git a/board/siemens/taurus/taurus.c b/board/siemens/taurus/taurus.c
index 102e7e82cd9d..dd37a64792a4 100644
--- a/board/siemens/taurus/taurus.c
+++ b/board/siemens/taurus/taurus.c
@@ -31,6 +31,7 @@
 #include <asm/arch/clk.h>
 #include <asm/gpio.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 #include <linux/mtd/rawnand.h>
 #include <atmel_mci.h>
 #include <asm/arch/at91_spi.h>
diff --git a/board/sipeed/maix/maix.c b/board/sipeed/maix/maix.c
index cbcb23cf5c28..a859b086075c 100644
--- a/board/sipeed/maix/maix.c
+++ b/board/sipeed/maix/maix.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <fdt_support.h>
 #include <asm/io.h>
+#include <linux/errno.h>
 
 phys_size_t get_effective_memsize(void)
 {
diff --git a/board/softing/vining_2000/vining_2000.c b/board/softing/vining_2000/vining_2000.c
index 7c9c8d78b339..1c84539c1205 100644
--- a/board/softing/vining_2000/vining_2000.c
+++ b/board/softing/vining_2000/vining_2000.c
@@ -24,6 +24,7 @@
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/sizes.h>
 #include <common.h>
 #include <fsl_esdhc_imx.h>
diff --git a/board/st/common/stm32mp_dfu.c b/board/st/common/stm32mp_dfu.c
index a02cc29f7f24..2a0e9334e82d 100644
--- a/board/st/common/stm32mp_dfu.c
+++ b/board/st/common/stm32mp_dfu.c
@@ -15,6 +15,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/arch/stm32prog.h>
+#include <linux/errno.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 3cbf5916ae95..c0e8c7575e2b 100644
--- a/board/st/stm32f429-discovery/stm32f429-discovery.c
+++ b/board/st/stm32f429-discovery/stm32f429-discovery.c
@@ -17,6 +17,7 @@
 #include <log.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 
 #include <asm/io.h>
 #include <asm/arch/stm32.h>
diff --git a/board/st/stm32f429-evaluation/stm32f429-evaluation.c b/board/st/stm32f429-evaluation/stm32f429-evaluation.c
index 4e503825dfaf..af34d9cea3cb 100644
--- a/board/st/stm32f429-evaluation/stm32f429-evaluation.c
+++ b/board/st/stm32f429-evaluation/stm32f429-evaluation.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 
 #include <asm/io.h>
 #include <asm/arch/stm32.h>
diff --git a/board/st/stm32f469-discovery/stm32f469-discovery.c b/board/st/stm32f469-discovery/stm32f469-discovery.c
index c9ce68f679bd..18da5ed2bcdf 100644
--- a/board/st/stm32f469-discovery/stm32f469-discovery.c
+++ b/board/st/stm32f469-discovery/stm32f469-discovery.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 
 #include <asm/io.h>
 #include <asm/arch/stm32.h>
diff --git a/board/st/stm32h743-disco/stm32h743-disco.c b/board/st/stm32h743-disco/stm32h743-disco.c
index 53bf09221972..f1a72e1d22e2 100644
--- a/board/st/stm32h743-disco/stm32h743-disco.c
+++ b/board/st/stm32h743-disco/stm32h743-disco.c
@@ -9,6 +9,7 @@
 #include <init.h>
 #include <log.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/st/stm32h743-eval/stm32h743-eval.c b/board/st/stm32h743-eval/stm32h743-eval.c
index 53bf09221972..f1a72e1d22e2 100644
--- a/board/st/stm32h743-eval/stm32h743-eval.c
+++ b/board/st/stm32h743-eval/stm32h743-eval.c
@@ -9,6 +9,7 @@
 #include <init.h>
 #include <log.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/st/stm32mp1/stm32mp1.c b/board/st/stm32mp1/stm32mp1.c
index 61a86df37b4e..6669b4813058 100644
--- a/board/st/stm32mp1/stm32mp1.c
+++ b/board/st/stm32mp1/stm32mp1.c
@@ -41,6 +41,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/iopoll.h>
 #include <linux/printk.h>
 #include <linux/string.h>
diff --git a/board/sunxi/board.c b/board/sunxi/board.c
index b2ee68d9c21f..f49984238f1c 100644
--- a/board/sunxi/board.c
+++ b/board/sunxi/board.c
@@ -33,6 +33,7 @@
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
diff --git a/board/synopsys/hsdk/clk-lib.c b/board/synopsys/hsdk/clk-lib.c
index 93f3dca9afd3..295e80afe722 100644
--- a/board/synopsys/hsdk/clk-lib.c
+++ b/board/synopsys/hsdk/clk-lib.c
@@ -9,6 +9,7 @@
 #include <malloc.h>
 #include <stdio.h>
 #include <dm/device.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 #include "clk-lib.h"
diff --git a/board/synopsys/hsdk/env-lib.c b/board/synopsys/hsdk/env-lib.c
index 6b1fff98a45c..ae55c0ab138e 100644
--- a/board/synopsys/hsdk/env-lib.c
+++ b/board/synopsys/hsdk/env-lib.c
@@ -8,6 +8,7 @@
 #include <env.h>
 #include <log.h>
 #include <vsprintf.h>
+#include <linux/errno.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 4fe6219514de..0812126a98d4 100644
--- a/board/synopsys/hsdk/hsdk.c
+++ b/board/synopsys/hsdk/hsdk.c
@@ -19,6 +19,7 @@
 #include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/kernel.h>
 #include <linux/io.h>
diff --git a/board/synopsys/iot_devkit/iot_devkit.c b/board/synopsys/iot_devkit/iot_devkit.c
index 151ade5fb7c9..50af75fb7e27 100644
--- a/board/synopsys/iot_devkit/iot_devkit.c
+++ b/board/synopsys/iot_devkit/iot_devkit.c
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <fdtdec.h>
 
diff --git a/board/technexion/pico-imx6ul/pico-imx6ul.c b/board/technexion/pico-imx6ul/pico-imx6ul.c
index 11ae82b6bf2c..fb3d9ee726a6 100644
--- a/board/technexion/pico-imx6ul/pico-imx6ul.c
+++ b/board/technexion/pico-imx6ul/pico-imx6ul.c
@@ -23,6 +23,7 @@
 #include <netdev.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/sizes.h>
 #include <usb.h>
 #include <power/pmic.h>
diff --git a/board/technexion/pico-imx7d/pico-imx7d.c b/board/technexion/pico-imx7d/pico-imx7d.c
index 4af38f223cf0..5b59862be8a5 100644
--- a/board/technexion/pico-imx7d/pico-imx7d.c
+++ b/board/technexion/pico-imx7d/pico-imx7d.c
@@ -19,6 +19,7 @@
 #include <common.h>
 #include <i2c.h>
 #include <miiphy.h>
+#include <linux/errno.h>
 #include <power/pmic.h>
 #include <power/pfuze3000_pmic.h>
 #include "../../freescale/common/pfuze.h"
diff --git a/board/theadorable/fpga.c b/board/theadorable/fpga.c
index 4cfc4bbf0acd..904af3ed2e98 100644
--- a/board/theadorable/fpga.c
+++ b/board/theadorable/fpga.c
@@ -13,6 +13,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
 #include <asm/arch-mvebu/spi.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include "theadorable.h"
 
diff --git a/board/ti/am335x/board.c b/board/ti/am335x/board.c
index 67695ca61f55..17096159442a 100644
--- a/board/ti/am335x/board.c
+++ b/board/ti/am335x/board.c
@@ -42,6 +42,7 @@
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <power/tps65217.h>
 #include <power/tps65910.h>
diff --git a/board/ti/am57xx/board.c b/board/ti/am57xx/board.c
index 869131a08f95..808b99937031 100644
--- a/board/ti/am57xx/board.c
+++ b/board/ti/am57xx/board.c
@@ -36,6 +36,7 @@
 #include <asm/arch/omap.h>
 #include <usb.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/usb/gadget.h>
 #include <dwc3-uboot.h>
diff --git a/board/ti/am65x/evm.c b/board/ti/am65x/evm.c
index 83067eb56638..5c2e8845057d 100644
--- a/board/ti/am65x/evm.c
+++ b/board/ti/am65x/evm.c
@@ -24,6 +24,7 @@
 #include <spl.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/board/ti/common/board_detect.c b/board/ti/common/board_detect.c
index 862398e53a2b..5519d2d7e612 100644
--- a/board/ti/common/board_detect.c
+++ b/board/ti/common/board_detect.c
@@ -21,6 +21,7 @@
 #include <mmc.h>
 #include <errno.h>
 #include <malloc.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/board/ti/j721e/evm.c b/board/ti/j721e/evm.c
index 5872ce4648c9..bddffa049329 100644
--- a/board/ti/j721e/evm.c
+++ b/board/ti/j721e/evm.c
@@ -26,6 +26,7 @@
 #include <dm.h>
 #include <asm/u-boot.h>
 #include <dm/uclass-internal.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/board/ti/omap5_uevm/evm.c b/board/ti/omap5_uevm/evm.c
index e47da78fb773..dd9217f0fba5 100644
--- a/board/ti/omap5_uevm/evm.c
+++ b/board/ti/omap5_uevm/evm.c
@@ -19,6 +19,7 @@
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/usb/gadget.h>
 #include <dwc3-uboot.h>
 #include <dwc3-omap-uboot.h>
diff --git a/board/toradex/apalis-tk1/apalis-tk1.c b/board/toradex/apalis-tk1/apalis-tk1.c
index 052a16bb7b3d..adc9bef31e7e 100644
--- a/board/toradex/apalis-tk1/apalis-tk1.c
+++ b/board/toradex/apalis-tk1/apalis-tk1.c
@@ -18,6 +18,7 @@
 #include <pci_tegra.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include <power/as3722.h>
diff --git a/board/toradex/colibri_imx7/colibri_imx7.c b/board/toradex/colibri_imx7/colibri_imx7.c
index 45cb4f9b9e23..9d091f05501e 100644
--- a/board/toradex/colibri_imx7/colibri_imx7.c
+++ b/board/toradex/colibri_imx7/colibri_imx7.c
@@ -25,6 +25,7 @@
 #include <fsl_esdhc_imx.h>
 #include <jffs2/load_kernel.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/sizes.h>
 #include <mmc.h>
 #include <miiphy.h>
diff --git a/board/toradex/common/tdx-cfg-block.c b/board/toradex/common/tdx-cfg-block.c
index b0057b585c12..b0656501985e 100644
--- a/board/toradex/common/tdx-cfg-block.c
+++ b/board/toradex/common/tdx-cfg-block.c
@@ -7,6 +7,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include "tdx-cfg-block.h"
 #include "tdx-eeprom.h"
diff --git a/board/toradex/verdin-imx8mm/spl.c b/board/toradex/verdin-imx8mm/spl.c
index c21419b3d543..19e4bc02a3bd 100644
--- a/board/toradex/verdin-imx8mm/spl.c
+++ b/board/toradex/verdin-imx8mm/spl.c
@@ -23,6 +23,7 @@
 #include <dm/uclass.h>
 #include <dm/uclass-internal.h>
 #include <hang.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <power/bd71837.h>
 #include <power/pmic.h>
diff --git a/board/udoo/neo/neo.c b/board/udoo/neo/neo.c
index 0a8f0fec9ce6..1853330e2ce3 100644
--- a/board/udoo/neo/neo.c
+++ b/board/udoo/neo/neo.c
@@ -29,6 +29,7 @@
 #include <spl.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/sizes.h>
 #include <common.h>
 #include <i2c.h>
diff --git a/board/vscom/baltos/board.c b/board/vscom/baltos/board.c
index 434aadd8763b..a7ba5393183e 100644
--- a/board/vscom/baltos/board.c
+++ b/board/vscom/baltos/board.c
@@ -17,6 +17,7 @@
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <spl.h>
 #include <asm/arch/cpu.h>
diff --git a/board/wandboard/wandboard.c b/board/wandboard/wandboard.c
index aa444959a06a..8c44d6d18998 100644
--- a/board/wandboard/wandboard.c
+++ b/board/wandboard/wandboard.c
@@ -28,6 +28,7 @@
 #include <asm/io.h>
 #include <env.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/sizes.h>
 #include <common.h>
 #include <miiphy.h>
diff --git a/board/warp/warp.c b/board/warp/warp.c
index 73d7aca7aadd..a99e74b0c953 100644
--- a/board/warp/warp.c
+++ b/board/warp/warp.c
@@ -20,6 +20,7 @@
 #include <asm/mach-imx/mxc_i2c.h>
 #include <asm/io.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 #include <linux/sizes.h>
 #include <common.h>
 #include <watchdog.h>
diff --git a/board/warp7/warp7.c b/board/warp7/warp7.c
index 7272dc2bb2e8..db255f36788f 100644
--- a/board/warp7/warp7.c
+++ b/board/warp7/warp7.c
@@ -22,6 +22,7 @@
 #include <asm/arch/crm_regs.h>
 #include <netdev.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 #include <power/pmic.h>
 #include <power/pfuze3000_pmic.h>
 #include "../freescale/common/pfuze.h"
diff --git a/board/xilinx/common/board.c b/board/xilinx/common/board.c
index 458eef45adfb..83ff23dacdc1 100644
--- a/board/xilinx/common/board.c
+++ b/board/xilinx/common/board.c
@@ -11,6 +11,7 @@
 #include <asm/sections.h>
 #include <dm/uclass.h>
 #include <i2c.h>
+#include <linux/errno.h>
 #include <linux/sizes.h>
 #include "board.h"
 
diff --git a/board/xilinx/microblaze-generic/microblaze-generic.c b/board/xilinx/microblaze-generic/microblaze-generic.c
index 49478b05bea1..385f5c752a57 100644
--- a/board/xilinx/microblaze-generic/microblaze-generic.c
+++ b/board/xilinx/microblaze-generic/microblaze-generic.c
@@ -19,6 +19,7 @@
 #include <asm/global_data.h>
 #include <dm/lists.h>
 #include <fdtdec.h>
+#include <linux/errno.h>
 #include <linux/sizes.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/xilinx/versal/board.c b/board/xilinx/versal/board.c
index 68c6f4827732..f310f0e56930 100644
--- a/board/xilinx/versal/board.c
+++ b/board/xilinx/versal/board.c
@@ -22,6 +22,7 @@
 #include <dm/device.h>
 #include <dm/uclass.h>
 #include <versalpl.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include "../common/board.h"
 
diff --git a/board/xilinx/zynq/board.c b/board/xilinx/zynq/board.c
index b3c486ab1b39..d9f3f15905a2 100644
--- a/board/xilinx/zynq/board.c
+++ b/board/xilinx/zynq/board.c
@@ -19,6 +19,7 @@
 #include <zynqpl.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include "../common/board.h"
 
diff --git a/board/xilinx/zynqmp/cmds.c b/board/xilinx/zynqmp/cmds.c
index 15a059896133..fe4ffba7fb63 100644
--- a/board/xilinx/zynqmp/cmds.c
+++ b/board/xilinx/zynqmp/cmds.c
@@ -15,6 +15,7 @@
 #include <asm/arch/hardware.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/io.h>
+#include <linux/errno.h>
 
 static int do_zynqmp_verify_secure(struct cmd_tbl *cmdtp, int flag, int argc,
 				   char *const argv[])
diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c
index 58067c213a84..f185b17fc1b4 100644
--- a/board/xilinx/zynqmp/zynqmp.c
+++ b/board/xilinx/zynqmp/zynqmp.c
@@ -36,6 +36,7 @@
 #include <g_dnl.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/sizes.h>
 #include <linux/string.h>
 #include "../common/board.h"
diff --git a/board/xilinx/zynqmp_r5/board.c b/board/xilinx/zynqmp_r5/board.c
index 5c5a2e93863f..b6e2ad87de8e 100644
--- a/board/xilinx/zynqmp_r5/board.c
+++ b/board/xilinx/zynqmp_r5/board.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <fdtdec.h>
 #include <init.h>
+#include <linux/errno.h>
 
 int board_init(void)
 {
diff --git a/cmd/acpi.c b/cmd/acpi.c
index a6df5785f5fb..a11cf5c29ac1 100644
--- a/cmd/acpi.c
+++ b/cmd/acpi.c
@@ -13,6 +13,7 @@
 #include <asm/acpi_table.h>
 #include <asm/global_data.h>
 #include <dm/acpi.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/cmd/axi.c b/cmd/axi.c
index 858fddee1318..68e8a06ae9ea 100644
--- a/cmd/axi.c
+++ b/cmd/axi.c
@@ -18,6 +18,7 @@
 #include <log.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/errno.h>
 
 /* Currently selected AXI bus device */
 static struct udevice *axi_cur_bus;
diff --git a/cmd/bcb.c b/cmd/bcb.c
index 46737101f658..d145856d14f2 100644
--- a/cmd/bcb.c
+++ b/cmd/bcb.c
@@ -13,6 +13,7 @@
 #include <part.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 enum bcb_cmd {
diff --git a/cmd/bind.c b/cmd/bind.c
index b008d4a6e8cc..91202fbd4a96 100644
--- a/cmd/bind.c
+++ b/cmd/bind.c
@@ -11,6 +11,7 @@
 #include <dm/device-internal.h>
 #include <dm/lists.h>
 #include <dm/uclass-internal.h>
+#include <linux/errno.h>
 
 static int bind_by_class_index(const char *uclass, int index,
 			       const char *drv_name)
diff --git a/cmd/booti.c b/cmd/booti.c
index 52ce6bbc031e..405152c80ebe 100644
--- a/cmd/booti.c
+++ b/cmd/booti.c
@@ -15,6 +15,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <linux/string.h>
diff --git a/cmd/bootm.c b/cmd/bootm.c
index b6a2a75e8bf2..47272bf2cdc6 100644
--- a/cmd/bootm.c
+++ b/cmd/bootm.c
@@ -21,6 +21,7 @@
 #include <asm/global_data.h>
 #include <linux/ctype.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <u-boot/zlib.h>
 #include <mapmem.h>
diff --git a/cmd/button.c b/cmd/button.c
index 84ad1653c7b5..0371ae8774d7 100644
--- a/cmd/button.c
+++ b/cmd/button.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <button.h>
 #include <dm/uclass-internal.h>
+#include <linux/errno.h>
 
 static const char *const state_label[] = {
 	[BUTTON_OFF]	= "off",
diff --git a/cmd/cpu.c b/cmd/cpu.c
index 27b0919709a8..4066f764292b 100644
--- a/cmd/cpu.c
+++ b/cmd/cpu.c
@@ -12,6 +12,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <stdio.h>
+#include <linux/errno.h>
 
 static const char *cpu_feature_name[CPU_FEAT_COUNT] = {
 	"L1 cache",
diff --git a/cmd/efi.c b/cmd/efi.c
index 7b7a019e1af8..762d4c1c3807 100644
--- a/cmd/efi.c
+++ b/cmd/efi.c
@@ -13,6 +13,7 @@
 #include <sort.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 static const char *const type_name[] = {
diff --git a/cmd/elf.c b/cmd/elf.c
index 37267ccacaee..3eaf1fe137dd 100644
--- a/cmd/elf.c
+++ b/cmd/elf.c
@@ -21,6 +21,7 @@
 #include <asm/e820.h>
 #include <linux/linkage.h>
 #endif
+#include <linux/errno.h>
 #include <linux/string.h>
 
 /* Allow ports to override the default behavior */
diff --git a/cmd/ethsw.c b/cmd/ethsw.c
index fe93d2a8b173..83a229720deb 100644
--- a/cmd/ethsw.c
+++ b/cmd/ethsw.c
@@ -14,6 +14,7 @@
 #include <net.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 static const char *ethsw_name;
diff --git a/cmd/gpio.c b/cmd/gpio.c
index 3171556bb286..570c17d5bac4 100644
--- a/cmd/gpio.c
+++ b/cmd/gpio.c
@@ -16,6 +16,7 @@
 #include <vsprintf.h>
 #include <asm/gpio.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 __weak int name_to_gpio(const char *name)
diff --git a/cmd/gpt.c b/cmd/gpt.c
index 086a91ab5776..11ad5f7de462 100644
--- a/cmd/gpt.c
+++ b/cmd/gpt.c
@@ -27,6 +27,7 @@
 #include <memalign.h>
 #include <linux/compat.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/sizes.h>
 #include <stdlib.h>
 #include <linux/string.h>
diff --git a/cmd/i2c.c b/cmd/i2c.c
index 2f442f0e8110..b8f587a26faf 100644
--- a/cmd/i2c.c
+++ b/cmd/i2c.c
@@ -80,6 +80,7 @@
 #include <asm/byteorder.h>
 #include <linux/compiler.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
 
diff --git a/cmd/led.c b/cmd/led.c
index 5ba868068523..8d0abd048eca 100644
--- a/cmd/led.c
+++ b/cmd/led.c
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <dm/uclass-internal.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #define LED_TOGGLE LEDST_COUNT
diff --git a/cmd/mtd.c b/cmd/mtd.c
index 5c7493549953..70ba0d01c71e 100644
--- a/cmd/mtd.c
+++ b/cmd/mtd.c
@@ -18,6 +18,7 @@
 #include <vsprintf.h>
 #include <dm/devres.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include <linux/ctype.h>
diff --git a/cmd/mvebu/bubt.c b/cmd/mvebu/bubt.c
index 598a61be1fff..43d0a5bb409f 100644
--- a/cmd/mvebu/bubt.c
+++ b/cmd/mvebu/bubt.c
@@ -15,6 +15,7 @@
 #include <vsprintf.h>
 #include <errno.h>
 #include <dm.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include <spi_flash.h>
diff --git a/cmd/nand.c b/cmd/nand.c
index 286d5ee1df51..f52343c42cdc 100644
--- a/cmd/nand.c
+++ b/cmd/nand.c
@@ -25,6 +25,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/cache.h>
+#include <linux/errno.h>
 #include <linux/mtd/mtd.h>
 #include <command.h>
 #include <console.h>
diff --git a/cmd/nvedit.c b/cmd/nvedit.c
index 84af5f05e976..e450bb14a54b 100644
--- a/cmd/nvedit.c
+++ b/cmd/nvedit.c
@@ -39,6 +39,7 @@
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
diff --git a/cmd/osd.c b/cmd/osd.c
index 9ad0407521ac..6cccd8968c19 100644
--- a/cmd/osd.c
+++ b/cmd/osd.c
@@ -17,6 +17,7 @@
 #include <video_osd.h>
 #include <malloc.h>
 #include <vsprintf.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 /* Container for selected OSD device */
diff --git a/cmd/pci.c b/cmd/pci.c
index 48a945e30f05..ead55d46c21b 100644
--- a/cmd/pci.c
+++ b/cmd/pci.c
@@ -24,6 +24,7 @@
 #include <asm/processor.h>
 #include <asm/io.h>
 #include <pci.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 struct pci_reg_info {
diff --git a/cmd/pinmux.c b/cmd/pinmux.c
index 60856cdc3c4f..84cbf564e8ad 100644
--- a/cmd/pinmux.c
+++ b/cmd/pinmux.c
@@ -10,6 +10,7 @@
 #include <stdio.h>
 #include <dm/pinctrl.h>
 #include <dm/uclass-internal.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #define LIMIT_DEVNAME	30
diff --git a/cmd/pmic.c b/cmd/pmic.c
index 3ac12938c8ac..8e7956724f67 100644
--- a/cmd/pmic.c
+++ b/cmd/pmic.c
@@ -10,6 +10,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <dm/uclass-internal.h>
+#include <linux/errno.h>
 #include <power/pmic.h>
 
 #define LIMIT_DEV	32
diff --git a/cmd/pxe.c b/cmd/pxe.c
index 7673469d39f0..8804faa170a9 100644
--- a/cmd/pxe.c
+++ b/cmd/pxe.c
@@ -10,6 +10,7 @@
 #include <net.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/errno.h>
 
 #include "pxe_utils.h"
 
diff --git a/cmd/pxe_utils.c b/cmd/pxe_utils.c
index 748c314fa077..af6071ed68a6 100644
--- a/cmd/pxe_utils.c
+++ b/cmd/pxe_utils.c
@@ -15,6 +15,7 @@
 #include <net.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/ctype.h>
 #include <errno.h>
diff --git a/cmd/regulator.c b/cmd/regulator.c
index cdf8940fa9e3..e492da4f03c4 100644
--- a/cmd/regulator.c
+++ b/cmd/regulator.c
@@ -10,6 +10,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <dm/uclass-internal.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include <power/regulator.h>
diff --git a/cmd/spi.c b/cmd/spi.c
index 72662f0e0b11..2079ed0e1bea 100644
--- a/cmd/spi.c
+++ b/cmd/spi.c
@@ -15,6 +15,7 @@
 #include <spi.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 /*-----------------------------------------------------------------------
diff --git a/cmd/sysboot.c b/cmd/sysboot.c
index 9090b8ee4415..8a965eaf12d3 100644
--- a/cmd/sysboot.c
+++ b/cmd/sysboot.c
@@ -6,6 +6,7 @@
 #include <fs.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include "pxe_utils.h"
 
diff --git a/cmd/tlv_eeprom.c b/cmd/tlv_eeprom.c
index 98104fb7f2d1..ca315dad0cc7 100644
--- a/cmd/tlv_eeprom.c
+++ b/cmd/tlv_eeprom.c
@@ -21,6 +21,7 @@
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <linux/ctype.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
 
diff --git a/cmd/tpm-v2.c b/cmd/tpm-v2.c
index 1a6e80a38666..56c5aca12c8a 100644
--- a/cmd/tpm-v2.c
+++ b/cmd/tpm-v2.c
@@ -13,6 +13,7 @@
 #include <tpm-common.h>
 #include <tpm-v2.h>
 #include <vsprintf.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include "tpm-user-utils.h"
 
diff --git a/cmd/usb_mass_storage.c b/cmd/usb_mass_storage.c
index 84d919d4467c..36a905cd7716 100644
--- a/cmd/usb_mass_storage.c
+++ b/cmd/usb_mass_storage.c
@@ -20,6 +20,7 @@
 #include <vsprintf.h>
 #include <watchdog.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/cmd/wdt.c b/cmd/wdt.c
index 422be75a0db3..c9c7a610efd3 100644
--- a/cmd/wdt.c
+++ b/cmd/wdt.c
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <wdt.h>
+#include <linux/errno.h>
 
 static struct udevice *currdev;
 
diff --git a/common/android_ab.c b/common/android_ab.c
index 794df3fde7ad..4c58f7a75c85 100644
--- a/common/android_ab.c
+++ b/common/android_ab.c
@@ -11,6 +11,7 @@
 #include <part.h>
 #include <memalign.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
 #include <u-boot/crc.h>
diff --git a/common/avb_verify.c b/common/avb_verify.c
index 7a7a50968525..230d576835d7 100644
--- a/common/avb_verify.c
+++ b/common/avb_verify.c
@@ -13,6 +13,7 @@
 #include <part.h>
 #include <stdio.h>
 #include <tee.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <tee/optee_ta_avb.h>
 
diff --git a/common/bloblist.c b/common/bloblist.c
index 9abd360db8db..20a29c82bb51 100644
--- a/common/bloblist.c
+++ b/common/bloblist.c
@@ -10,6 +10,7 @@
 #include <mapmem.h>
 #include <spl.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
 
diff --git a/common/board_r.c b/common/board_r.c
index 7ddf7c78835e..f272e1e46688 100644
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -26,6 +26,7 @@
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 #include <u-boot/crc.h>
 /* TODO: can we just include all these headers whether needed or not? */
 #if defined(CONFIG_CMD_BEDBUG)
diff --git a/common/boot_fit.c b/common/boot_fit.c
index dfc2a3117d15..d1e298baf5bb 100644
--- a/common/boot_fit.c
+++ b/common/boot_fit.c
@@ -11,6 +11,7 @@
 #include <errno.h>
 #include <image.h>
 #include <log.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 
 static int fdt_offset(const void *fit)
diff --git a/common/bootm.c b/common/bootm.c
index 901e2a1e253e..8398054ab5c5 100644
--- a/common/bootm.c
+++ b/common/bootm.c
@@ -25,6 +25,7 @@
 #if defined(CONFIG_CMD_USB)
 #include <usb.h>
 #endif
+#include <linux/errno.h>
 #include <linux/string.h>
 #else
 #include "mkimage.h"
diff --git a/common/bootretry.c b/common/bootretry.c
index 5417389a9a39..41d52a7b9c14 100644
--- a/common/bootretry.c
+++ b/common/bootretry.c
@@ -13,6 +13,7 @@
 #include <time.h>
 #include <vsprintf.h>
 #include <watchdog.h>
+#include <linux/errno.h>
 
 #ifndef CONFIG_BOOT_RETRY_MIN
 #define CONFIG_BOOT_RETRY_MIN CONFIG_BOOT_RETRY_TIME
diff --git a/common/bootstage.c b/common/bootstage.c
index 190379f8ac07..9eaa65b009f5 100644
--- a/common/bootstage.c
+++ b/common/bootstage.c
@@ -20,6 +20,7 @@
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <linux/compiler.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <linux/string.h>
 
diff --git a/common/bouncebuf.c b/common/bouncebuf.c
index bcca7838bcc7..519ca264992b 100644
--- a/common/bouncebuf.c
+++ b/common/bouncebuf.c
@@ -12,6 +12,7 @@
 #include <errno.h>
 #include <bouncebuf.h>
 #include <asm/cache.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 static int addr_aligned(struct bounce_buffer *state)
diff --git a/common/cli_hush.c b/common/cli_hush.c
index 7a66d337148e..34facc8397eb 100644
--- a/common/cli_hush.c
+++ b/common/cli_hush.c
@@ -89,6 +89,7 @@
 #endif
 #include <vsprintf.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #endif
 #ifndef __U_BOOT__
diff --git a/common/common_fit.c b/common/common_fit.c
index 50b165016d2d..8872b83646af 100644
--- a/common/common_fit.c
+++ b/common/common_fit.c
@@ -9,6 +9,7 @@
 #include <image.h>
 #include <log.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <linux/string.h>
 
diff --git a/common/edid.c b/common/edid.c
index d539c5215070..b047c7246300 100644
--- a/common/edid.c
+++ b/common/edid.c
@@ -16,6 +16,7 @@
 #include <log.h>
 #include <stdio.h>
 #include <linux/ctype.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 int edid_check_info(struct edid1_info *edid_info)
diff --git a/common/image-android.c b/common/image-android.c
index 1e79f6b144c7..1615f2c415d5 100644
--- a/common/image-android.c
+++ b/common/image-android.c
@@ -13,6 +13,7 @@
 #include <stdio.h>
 #include <asm/unaligned.h>
 #include <mapmem.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <linux/string.h>
 
diff --git a/common/image-fdt.c b/common/image-fdt.c
index e01e88b989a1..c05495ee36c2 100644
--- a/common/image-fdt.c
+++ b/common/image-fdt.c
@@ -20,6 +20,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <mapmem.h>
 #include <asm/io.h>
diff --git a/common/image-fit-sig.c b/common/image-fit-sig.c
index 1247d0280e2f..e65e27f5109f 100644
--- a/common/image-fit-sig.c
+++ b/common/image-fit-sig.c
@@ -12,6 +12,7 @@
 #include <malloc.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 DECLARE_GLOBAL_DATA_PTR;
 #endif /* !USE_HOSTCC*/
diff --git a/common/image-fit.c b/common/image-fit.c
index 01353f0157d4..bc12b3fe0e6c 100644
--- a/common/image-fit.c
+++ b/common/image-fit.c
@@ -17,6 +17,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/compiler.h>
+#include <linux/errno.h>
 #include <linux/kconfig.h>
 #include <common.h>
 #include <errno.h>
diff --git a/common/lcd_simplefb.c b/common/lcd_simplefb.c
index 6dd7972f7093..7a2f0056fd4e 100644
--- a/common/lcd_simplefb.c
+++ b/common/lcd_simplefb.c
@@ -11,6 +11,7 @@
 #include <lcd.h>
 #include <fdt_support.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <video.h>
 
diff --git a/common/log.c b/common/log.c
index c4eaed2c91ed..79e23aacece5 100644
--- a/common/log.c
+++ b/common/log.c
@@ -13,6 +13,7 @@
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <dm/uclass.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/common/menu.c b/common/menu.c
index d61c274eedf2..b7ee3cb8e494 100644
--- a/common/menu.c
+++ b/common/menu.c
@@ -9,6 +9,7 @@
 #include <malloc.h>
 #include <errno.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <linux/list.h>
 #include <linux/string.h>
 
diff --git a/common/spl/spl.c b/common/spl/spl.c
index 5fd0119cb59d..671bda67ed7e 100644
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -24,6 +24,7 @@
 #include <asm/u-boot.h>
 #include <nand.h>
 #include <fat.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
 #include <version.h>
diff --git a/common/spl/spl_dfu.c b/common/spl/spl_dfu.c
index 8a779da8fa1e..4709ffaff94c 100644
--- a/common/spl/spl_dfu.c
+++ b/common/spl/spl_dfu.c
@@ -15,6 +15,7 @@
 #include <g_dnl.h>
 #include <usb.h>
 #include <dfu.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 static int run_dfu(int usb_index, char *interface, char *devstring)
diff --git a/common/spl/spl_ext.c b/common/spl/spl_ext.c
index 50f0f5f4ca77..4f152270da77 100644
--- a/common/spl/spl_ext.c
+++ b/common/spl/spl_ext.c
@@ -9,6 +9,7 @@
 #include <ext4fs.h>
 #include <errno.h>
 #include <image.h>
+#include <linux/errno.h>
 
 int spl_load_image_ext(struct spl_image_info *spl_image,
 		       struct blk_desc *block_dev, int partition,
diff --git a/common/spl/spl_fat.c b/common/spl/spl_fat.c
index 20b440906500..f31fdee02bac 100644
--- a/common/spl/spl_fat.c
+++ b/common/spl/spl_fat.c
@@ -17,6 +17,7 @@
 #include <fat.h>
 #include <errno.h>
 #include <image.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 
 static int fat_registered;
diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c
index 87d482695583..4d588a85c8fe 100644
--- a/common/spl/spl_fit.c
+++ b/common/spl/spl_fit.c
@@ -16,6 +16,7 @@
 #include <stdio.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <linux/printk.h>
 #include <linux/string.h>
diff --git a/common/spl/spl_legacy.c b/common/spl/spl_legacy.c
index 6813759aa4e2..d8ca3e9873bd 100644
--- a/common/spl/spl_legacy.c
+++ b/common/spl/spl_legacy.c
@@ -9,6 +9,7 @@
 #include <malloc.h>
 #include <spl.h>
 #include <stdio.h>
+#include <linux/errno.h>
 
 #include <lzma/LzmaTypes.h>
 #include <lzma/LzmaDec.h>
diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c
index 1cfe4b2b442d..897ea3fbfa6f 100644
--- a/common/spl/spl_mmc.c
+++ b/common/spl/spl_mmc.c
@@ -17,6 +17,7 @@
 #include <errno.h>
 #include <mmc.h>
 #include <image.h>
+#include <linux/errno.h>
 
 static int mmc_load_legacy(struct spl_image_info *spl_image, struct mmc *mmc,
 			   ulong sector, struct image_header *header)
diff --git a/common/spl/spl_net.c b/common/spl/spl_net.c
index ac7be6360bbc..b4a0a56b7016 100644
--- a/common/spl/spl_net.c
+++ b/common/spl/spl_net.c
@@ -14,6 +14,7 @@
 #include <spl.h>
 #include <net.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <linux/string.h>
 
diff --git a/common/spl/spl_opensbi.c b/common/spl/spl_opensbi.c
index 4bde3bb46874..086759d63f2d 100644
--- a/common/spl/spl_opensbi.c
+++ b/common/spl/spl_opensbi.c
@@ -14,6 +14,7 @@
 #include <asm/global_data.h>
 #include <asm/smp.h>
 #include <opensbi.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <linux/printk.h>
 
diff --git a/common/spl/spl_sata.c b/common/spl/spl_sata.c
index 3ac3b743d992..599243f1823f 100644
--- a/common/spl/spl_sata.c
+++ b/common/spl/spl_sata.c
@@ -17,6 +17,7 @@
 #include <errno.h>
 #include <fat.h>
 #include <image.h>
+#include <linux/errno.h>
 
 #ifndef CONFIG_SYS_SATA_FAT_BOOT_PARTITION
 #define CONFIG_SYS_SATA_FAT_BOOT_PARTITION	1
diff --git a/common/spl/spl_sdp.c b/common/spl/spl_sdp.c
index 78ecc962551e..c406d2ce0389 100644
--- a/common/spl/spl_sdp.c
+++ b/common/spl/spl_sdp.c
@@ -10,6 +10,7 @@
 #include <usb.h>
 #include <g_dnl.h>
 #include <sdp.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 static int spl_sdp_load_image(struct spl_image_info *spl_image,
diff --git a/common/spl/spl_spi.c b/common/spl/spl_spi.c
index caa5ed10e1a8..1121813abf05 100644
--- a/common/spl/spl_spi.c
+++ b/common/spl/spl_spi.c
@@ -17,6 +17,7 @@
 #include <spl.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/common/spl/spl_usb.c b/common/spl/spl_usb.c
index 33bdc3617486..4ad5dfe9c720 100644
--- a/common/spl/spl_usb.c
+++ b/common/spl/spl_usb.c
@@ -16,6 +16,7 @@
 #include <errno.h>
 #include <usb.h>
 #include <fat.h>
+#include <linux/errno.h>
 
 static int usb_stor_curr_dev = -1; /* current device */
 
diff --git a/common/spl/spl_ymodem.c b/common/spl/spl_ymodem.c
index 7124f604b0ab..f9c7c2b04fc9 100644
--- a/common/spl/spl_ymodem.c
+++ b/common/spl/spl_ymodem.c
@@ -16,6 +16,7 @@
 #include <stdio.h>
 #include <xyzModem.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <linux/string.h>
 
diff --git a/common/splash.c b/common/splash.c
index 1f92d791df8a..174f82486eb7 100644
--- a/common/splash.c
+++ b/common/splash.c
@@ -27,6 +27,7 @@
 #include <lcd.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/errno.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 99dce118a8f2..9c5c285b76ed 100644
--- a/common/splash_source.c
+++ b/common/splash_source.c
@@ -23,6 +23,7 @@
 #include <usb.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/common/stdio.c b/common/stdio.c
index eea1507754db..634ab9203af2 100644
--- a/common/stdio.c
+++ b/common/stdio.c
@@ -21,6 +21,7 @@
 #include <splash.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #if defined(CONFIG_SYS_I2C)
diff --git a/common/update.c b/common/update.c
index 5cf02ddec2db..ab92824c70f4 100644
--- a/common/update.c
+++ b/common/update.c
@@ -11,6 +11,7 @@
 #include <image.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/common/usb.c b/common/usb.c
index 5a3193930251..16b51e8f4c7c 100644
--- a/common/usb.c
+++ b/common/usb.c
@@ -40,6 +40,7 @@
 #include <errno.h>
 #include <usb.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #define USB_BUFSIZ	512
diff --git a/common/usb_hub.c b/common/usb_hub.c
index a846fc5dff9a..46d074f0b55d 100644
--- a/common/usb_hub.c
+++ b/common/usb_hub.c
@@ -36,6 +36,7 @@
 #include <asm/unaligned.h>
 #include <linux/ctype.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/list.h>
 #include <asm/byteorder.h>
 #ifdef CONFIG_SANDBOX
diff --git a/common/usb_kbd.c b/common/usb_kbd.c
index 0d3a34ea5c11..3fafbda40fd4 100644
--- a/common/usb_kbd.c
+++ b/common/usb_kbd.c
@@ -19,6 +19,7 @@
 #include <time.h>
 #include <watchdog.h>
 #include <asm/byteorder.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include <usb.h>
diff --git a/common/usb_storage.c b/common/usb_storage.c
index 9fc002bcf67a..d46e9288c05f 100644
--- a/common/usb_storage.c
+++ b/common/usb_storage.c
@@ -48,6 +48,7 @@
 #include <dm/device-internal.h>
 #include <dm/lists.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include <part.h>
diff --git a/disk/part.c b/disk/part.c
index fdde4d61eba9..aa10ed3134b3 100644
--- a/disk/part.c
+++ b/disk/part.c
@@ -16,6 +16,7 @@
 #include <stdio.h>
 #include <ubifs_uboot.h>
 #include <vsprintf.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #undef	PART_DEBUG
diff --git a/disk/part_efi.c b/disk/part_efi.c
index 659373791995..f062bc383ea8 100644
--- a/disk/part_efi.c
+++ b/disk/part_efi.c
@@ -27,6 +27,7 @@
 #include <part_efi.h>
 #include <linux/compiler.h>
 #include <linux/ctype.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
diff --git a/drivers/adc/adc-uclass.c b/drivers/adc/adc-uclass.c
index c1dd1f0599dc..fa88040126f7 100644
--- a/drivers/adc/adc-uclass.c
+++ b/drivers/adc/adc-uclass.c
@@ -14,6 +14,7 @@
 #include <dm/uclass-internal.h>
 #include <adc.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <power/regulator.h>
 
diff --git a/drivers/adc/exynos-adc.c b/drivers/adc/exynos-adc.c
index 973533d261a9..7e9ad41ec26d 100644
--- a/drivers/adc/exynos-adc.c
+++ b/drivers/adc/exynos-adc.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <adc.h>
 #include <asm/arch/adc.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 struct exynos_adc_priv {
diff --git a/drivers/adc/meson-saradc.c b/drivers/adc/meson-saradc.c
index d7c02f1aa3f4..785d37c238f5 100644
--- a/drivers/adc/meson-saradc.c
+++ b/drivers/adc/meson-saradc.c
@@ -17,6 +17,7 @@
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/math64.h>
 #include <linux/bitfield.h>
 #include <linux/printk.h>
diff --git a/drivers/adc/rockchip-saradc.c b/drivers/adc/rockchip-saradc.c
index 61e3f2cef903..26e037509cdc 100644
--- a/drivers/adc/rockchip-saradc.c
+++ b/drivers/adc/rockchip-saradc.c
@@ -13,6 +13,7 @@
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 #define SARADC_CTRL_CHN_MASK		GENMASK(2, 0)
diff --git a/drivers/adc/sandbox.c b/drivers/adc/sandbox.c
index fa1174bbaa3f..0bbb8efccbd7 100644
--- a/drivers/adc/sandbox.c
+++ b/drivers/adc/sandbox.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <adc.h>
 #include <sandbox-adc.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 /**
diff --git a/drivers/adc/stm32-adc-core.c b/drivers/adc/stm32-adc-core.c
index f20c46fb36cf..a3d255d786c4 100644
--- a/drivers/adc/stm32-adc-core.c
+++ b/drivers/adc/stm32-adc-core.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <power/regulator.h>
 #include "stm32-adc-core.h"
 
diff --git a/drivers/adc/stm32-adc.c b/drivers/adc/stm32-adc.c
index 3f0ed48846c7..8c90bb711ca8 100644
--- a/drivers/adc/stm32-adc.c
+++ b/drivers/adc/stm32-adc.c
@@ -13,6 +13,7 @@
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/iopoll.h>
 #include "stm32-adc-core.h"
 
diff --git a/drivers/ata/ahci_sunxi.c b/drivers/ata/ahci_sunxi.c
index 162e7de5194b..f584317ab23b 100644
--- a/drivers/ata/ahci_sunxi.c
+++ b/drivers/ata/ahci_sunxi.c
@@ -8,6 +8,7 @@
 #include <asm/io.h>
 #include <asm/gpio.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 #define AHCI_PHYCS0R 0x00c0
 #define AHCI_PHYCS1R 0x00c4
diff --git a/drivers/ata/fsl_sata.c b/drivers/ata/fsl_sata.c
index f2109c80ce2c..884ce4449d4d 100644
--- a/drivers/ata/fsl_sata.c
+++ b/drivers/ata/fsl_sata.c
@@ -21,6 +21,7 @@
 #include <fis.h>
 #include <sata.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include "fsl_sata.h"
 
diff --git a/drivers/ata/sata.c b/drivers/ata/sata.c
index b70de83df2cd..453338e944b7 100644
--- a/drivers/ata/sata.c
+++ b/drivers/ata/sata.c
@@ -16,6 +16,7 @@
 #include <part.h>
 #include <sata.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #ifndef CONFIG_AHCI
diff --git a/drivers/ata/sata_ceva.c b/drivers/ata/sata_ceva.c
index 77508aa5bc76..cd10d228964a 100644
--- a/drivers/ata/sata_ceva.c
+++ b/drivers/ata/sata_ceva.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <scsi.h>
 #include <asm/io.h>
+#include <linux/errno.h>
 #include <linux/ioport.h>
 
 /* Vendor Specific Register Offsets */
diff --git a/drivers/ata/sata_sil.c b/drivers/ata/sata_sil.c
index b55b9daab744..54a9141808b5 100644
--- a/drivers/ata/sata_sil.c
+++ b/drivers/ata/sata_sil.c
@@ -20,6 +20,7 @@
 #include <libata.h>
 #include <sata.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #if CONFIG_IS_ENABLED(BLK)
diff --git a/drivers/axi/axi-emul-uclass.c b/drivers/axi/axi-emul-uclass.c
index b28351f1adb0..fb56b824513f 100644
--- a/drivers/axi/axi-emul-uclass.c
+++ b/drivers/axi/axi-emul-uclass.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <dm/device-internal.h>
 #include <asm/axi.h>
+#include <linux/errno.h>
 
 int axi_sandbox_get_emul(struct udevice *bus, ulong address,
 			 enum axi_size_t size, struct udevice **emulp)
diff --git a/drivers/axi/axi-uclass.c b/drivers/axi/axi-uclass.c
index af8acd9f88ba..3d642e710784 100644
--- a/drivers/axi/axi-uclass.c
+++ b/drivers/axi/axi-uclass.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <axi.h>
+#include <linux/errno.h>
 
 int axi_read(struct udevice *dev, ulong address, void *data,
 	     enum axi_size_t size)
diff --git a/drivers/axi/axi_sandbox.c b/drivers/axi/axi_sandbox.c
index b91c91f6b3b6..41f62065e8ed 100644
--- a/drivers/axi/axi_sandbox.c
+++ b/drivers/axi/axi_sandbox.c
@@ -8,6 +8,7 @@
 #include <axi.h>
 #include <dm.h>
 #include <asm/axi.h>
+#include <linux/errno.h>
 
 /*
  * This driver implements a AXI bus for the sandbox architecture for testing
diff --git a/drivers/axi/ihs_axi.c b/drivers/axi/ihs_axi.c
index 394551109070..0e4cbab9762c 100644
--- a/drivers/axi/ihs_axi.c
+++ b/drivers/axi/ihs_axi.c
@@ -14,6 +14,7 @@
 #include <regmap.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 /**
  * struct ihs_axi_regs - Structure for the register map of a IHS AXI device
diff --git a/drivers/axi/sandbox_store.c b/drivers/axi/sandbox_store.c
index 42bcae6af26b..72a4191946e3 100644
--- a/drivers/axi/sandbox_store.c
+++ b/drivers/axi/sandbox_store.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <log.h>
 #include <malloc.h>
+#include <linux/errno.h>
 
 /**
  * struct sandbox_store_priv - Private data structure of a AXI store device
diff --git a/drivers/bios_emulator/atibios.c b/drivers/bios_emulator/atibios.c
index dbf74a45eed0..d49839542a55 100644
--- a/drivers/bios_emulator/atibios.c
+++ b/drivers/bios_emulator/atibios.c
@@ -54,6 +54,7 @@
 #include <stdio.h>
 #include <vbe.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include "biosemui.h"
 
diff --git a/drivers/block/blk-uclass.c b/drivers/block/blk-uclass.c
index e830a9b6f9cc..10fffb096757 100644
--- a/drivers/block/blk-uclass.c
+++ b/drivers/block/blk-uclass.c
@@ -16,6 +16,7 @@
 #include <dm/lists.h>
 #include <dm/uclass-internal.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 static const char *if_typename_str[IF_TYPE_COUNT] = {
diff --git a/drivers/block/blk_legacy.c b/drivers/block/blk_legacy.c
index 2b02e4d3b1c0..c1a78f72a368 100644
--- a/drivers/block/blk_legacy.c
+++ b/drivers/block/blk_legacy.c
@@ -9,6 +9,7 @@
 #include <part.h>
 #include <stdio.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 struct blk_driver *blk_driver_lookup_type(int if_type)
diff --git a/drivers/board/board-uclass.c b/drivers/board/board-uclass.c
index b5485e9895b8..57a28f065bfc 100644
--- a/drivers/board/board-uclass.c
+++ b/drivers/board/board-uclass.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <board.h>
+#include <linux/errno.h>
 
 int board_get(struct udevice **devp)
 {
diff --git a/drivers/board/gazerbeam.c b/drivers/board/gazerbeam.c
index ed50fc530cb4..7be676fff58c 100644
--- a/drivers/board/gazerbeam.c
+++ b/drivers/board/gazerbeam.c
@@ -10,6 +10,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <asm/gpio.h>
+#include <linux/errno.h>
 
 #include "gazerbeam.h"
 
diff --git a/drivers/board/sandbox.c b/drivers/board/sandbox.c
index 22aaad102838..5de827504188 100644
--- a/drivers/board/sandbox.c
+++ b/drivers/board/sandbox.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <board.h>
 #include <vsprintf.h>
+#include <linux/errno.h>
 
 #include "sandbox.h"
 
diff --git a/drivers/bootcount/bootcount-uclass.c b/drivers/bootcount/bootcount-uclass.c
index 2a492c87ebdf..81ca0027ebd8 100644
--- a/drivers/bootcount/bootcount-uclass.c
+++ b/drivers/bootcount/bootcount-uclass.c
@@ -8,6 +8,7 @@
 #include <errno.h>
 #include <bootcount.h>
 #include <log.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 int dm_bootcount_get(struct udevice *dev, u32 *bootcount)
diff --git a/drivers/bootcount/bootcount.c b/drivers/bootcount/bootcount.c
index e8db8542f934..0a2fb50efeae 100644
--- a/drivers/bootcount/bootcount.c
+++ b/drivers/bootcount/bootcount.c
@@ -8,6 +8,7 @@
 #include <cpu_func.h>
 #include <asm/cache.h>
 #include <linux/compiler.h>
+#include <linux/errno.h>
 
 #if !defined(CONFIG_DM_BOOTCOUNT)
 /* Now implement the generic default functions */
diff --git a/drivers/bootcount/i2c-eeprom.c b/drivers/bootcount/i2c-eeprom.c
index a3aa0cf55957..141713c3d526 100644
--- a/drivers/bootcount/i2c-eeprom.c
+++ b/drivers/bootcount/i2c-eeprom.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <i2c_eeprom.h>
 #include <log.h>
+#include <linux/errno.h>
 
 static const u8 bootcount_magic = 0xbc;
 
diff --git a/drivers/bootcount/rtc.c b/drivers/bootcount/rtc.c
index 076a8bb2be8d..c6b30cd1483e 100644
--- a/drivers/bootcount/rtc.c
+++ b/drivers/bootcount/rtc.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <log.h>
 #include <rtc.h>
+#include <linux/errno.h>
 
 static const u8 bootcount_magic = 0xbc;
 
diff --git a/drivers/button/button-gpio.c b/drivers/button/button-gpio.c
index 985ae7f5a768..3e6f11f74d09 100644
--- a/drivers/button/button-gpio.c
+++ b/drivers/button/button-gpio.c
@@ -10,6 +10,7 @@
 #include <dm/uclass-internal.h>
 #include <log.h>
 #include <asm/gpio.h>
+#include <linux/errno.h>
 
 struct button_gpio_priv {
 	struct gpio_desc gpio;
diff --git a/drivers/button/button-uclass.c b/drivers/button/button-uclass.c
index 1c742c265cfd..c2c3960d7b18 100644
--- a/drivers/button/button-uclass.c
+++ b/drivers/button/button-uclass.c
@@ -9,6 +9,7 @@
 #include <button.h>
 #include <dm.h>
 #include <dm/uclass-internal.h>
+#include <linux/errno.h>
 
 int button_get_by_label(const char *label, struct udevice **devp)
 {
diff --git a/drivers/cache/cache-ncore.c b/drivers/cache/cache-ncore.c
index efef05613781..279e3c2801bf 100644
--- a/drivers/cache/cache-ncore.c
+++ b/drivers/cache/cache-ncore.c
@@ -7,6 +7,7 @@
 #include <hang.h>
 #include <stdio.h>
 #include <wait_bit.h>
+#include <linux/errno.h>
 
 #include <asm/io.h>
 #include <linux/bitops.h>
diff --git a/drivers/cache/cache-uclass.c b/drivers/cache/cache-uclass.c
index 3b20a10f087d..10497b37eda0 100644
--- a/drivers/cache/cache-uclass.c
+++ b/drivers/cache/cache-uclass.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <cache.h>
 #include <dm.h>
+#include <linux/errno.h>
 
 int cache_get_info(struct udevice *dev, struct cache_info *info)
 {
diff --git a/drivers/cache/cache-v5l2.c b/drivers/cache/cache-v5l2.c
index 7adc69d514c1..298eadb4af12 100644
--- a/drivers/cache/cache-v5l2.c
+++ b/drivers/cache/cache-v5l2.c
@@ -14,6 +14,7 @@
 #include <asm/io.h>
 #include <dm/ofnode.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 struct l2cache {
 	volatile u64	configure;
diff --git a/drivers/clk/altera/clk-agilex.c b/drivers/clk/altera/clk-agilex.c
index 8254ce68e4d5..e6c01dd7b32f 100644
--- a/drivers/clk/altera/clk-agilex.c
+++ b/drivers/clk/altera/clk-agilex.c
@@ -13,6 +13,7 @@
 #include <dm/util.h>
 #include <dt-bindings/clock/agilex-clock.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #include <asm/arch/clock_manager.h>
 
diff --git a/drivers/clk/altera/clk-arria10.c b/drivers/clk/altera/clk-arria10.c
index b05648e8a545..85300e611785 100644
--- a/drivers/clk/altera/clk-arria10.c
+++ b/drivers/clk/altera/clk-arria10.c
@@ -14,6 +14,7 @@
 #include <dm/lists.h>
 #include <dm/util.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include <asm/arch/clock_manager.h>
diff --git a/drivers/clk/analogbits/wrpll-cln28hpc.c b/drivers/clk/analogbits/wrpll-cln28hpc.c
index a3cb109d3575..291a23d93f70 100644
--- a/drivers/clk/analogbits/wrpll-cln28hpc.c
+++ b/drivers/clk/analogbits/wrpll-cln28hpc.c
@@ -23,6 +23,7 @@
 
 #include <linux/bug.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/log2.h>
 #include <linux/math64.h>
 #include <linux/clk/analogbits-wrpll-cln28hpc.h>
diff --git a/drivers/clk/aspeed/clk_ast2500.c b/drivers/clk/aspeed/clk_ast2500.c
index d83e6590d6c3..e837e0cd19a7 100644
--- a/drivers/clk/aspeed/clk_ast2500.c
+++ b/drivers/clk/aspeed/clk_ast2500.c
@@ -14,6 +14,7 @@
 #include <dt-bindings/clock/ast2500-scu.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 
 /*
  * MAC Clock Delay settings, taken from Aspeed SDK
diff --git a/drivers/clk/at91/clk-main.c b/drivers/clk/at91/clk-main.c
index c1ca09c21099..85ec506de128 100644
--- a/drivers/clk/at91/clk-main.c
+++ b/drivers/clk/at91/clk-main.c
@@ -8,6 +8,7 @@
 #include <clk-uclass.h>
 #include <dm.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <mach/at91_pmc.h>
 #include "pmc.h"
diff --git a/drivers/clk/at91/clk-plla.c b/drivers/clk/at91/clk-plla.c
index 4f246afa18ae..ae7df40f20d0 100644
--- a/drivers/clk/at91/clk-plla.c
+++ b/drivers/clk/at91/clk-plla.c
@@ -8,6 +8,7 @@
 #include <clk-uclass.h>
 #include <dm.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <mach/at91_pmc.h>
 #include "pmc.h"
diff --git a/drivers/clk/at91/clk-plladiv.c b/drivers/clk/at91/clk-plladiv.c
index ca6158ef6ab2..7c074327e27c 100644
--- a/drivers/clk/at91/clk-plladiv.c
+++ b/drivers/clk/at91/clk-plladiv.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <clk-uclass.h>
 #include <dm/device.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <mach/at91_pmc.h>
 #include "pmc.h"
diff --git a/drivers/clk/at91/clk-system.c b/drivers/clk/at91/clk-system.c
index 76b1958670d6..8e1a5f757742 100644
--- a/drivers/clk/at91/clk-system.c
+++ b/drivers/clk/at91/clk-system.c
@@ -8,6 +8,7 @@
 #include <clk-uclass.h>
 #include <dm.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <mach/at91_pmc.h>
 #include "pmc.h"
diff --git a/drivers/clk/at91/clk-utmi.c b/drivers/clk/at91/clk-utmi.c
index 72b97af1bcb2..99a1ae865353 100644
--- a/drivers/clk/at91/clk-utmi.c
+++ b/drivers/clk/at91/clk-utmi.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <stdio.h>
 #include <syscon.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <mach/at91_pmc.h>
 #include <mach/at91_sfr.h>
diff --git a/drivers/clk/at91/pmc.c b/drivers/clk/at91/pmc.c
index 11859db32654..91e57b387770 100644
--- a/drivers/clk/at91/pmc.c
+++ b/drivers/clk/at91/pmc.c
@@ -11,6 +11,7 @@
 #include <asm/global_data.h>
 #include <dm/lists.h>
 #include <dm/util.h>
+#include <linux/errno.h>
 #include "pmc.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/clk/clk-cdce9xx.c b/drivers/clk/clk-cdce9xx.c
index fd47872ab992..a6e49a7765e4 100644
--- a/drivers/clk/clk-cdce9xx.c
+++ b/drivers/clk/clk-cdce9xx.c
@@ -15,6 +15,7 @@
 #include <i2c.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #define MAX_NUMBER_OF_PLLS		4
 #define MAX_NUMER_OF_OUTPUTS		9
diff --git a/drivers/clk/clk-composite.c b/drivers/clk/clk-composite.c
index 819bfca2fcf9..62d404d791db 100644
--- a/drivers/clk/clk-composite.c
+++ b/drivers/clk/clk-composite.c
@@ -13,6 +13,7 @@
 #include <linux/clk-provider.h>
 #include <clk.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 
 #include "clk.h"
 
diff --git a/drivers/clk/clk-divider.c b/drivers/clk/clk-divider.c
index 0e0c2d48b741..d2039512b216 100644
--- a/drivers/clk/clk-divider.c
+++ b/drivers/clk/clk-divider.c
@@ -21,6 +21,7 @@
 #include <linux/bug.h>
 #include <linux/clk-provider.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/log2.h>
 #include <div64.h>
 #include <clk.h>
diff --git a/drivers/clk/clk-fixed-factor.c b/drivers/clk/clk-fixed-factor.c
index 0eb24b87fc39..c181c0b6ea5f 100644
--- a/drivers/clk/clk-fixed-factor.c
+++ b/drivers/clk/clk-fixed-factor.c
@@ -13,6 +13,7 @@
 #include <linux/clk-provider.h>
 #include <div64.h>
 #include <clk.h>
+#include <linux/errno.h>
 #include "clk.h"
 #include <linux/err.h>
 
diff --git a/drivers/clk/clk-gate.c b/drivers/clk/clk-gate.c
index cdca3e38d0d5..221db043abcc 100644
--- a/drivers/clk/clk-gate.c
+++ b/drivers/clk/clk-gate.c
@@ -16,6 +16,7 @@
 #include <linux/bitops.h>
 #include <linux/clk-provider.h>
 #include <clk.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include "clk.h"
 #include <linux/err.h>
diff --git a/drivers/clk/clk-hsdk-cgu.c b/drivers/clk/clk-hsdk-cgu.c
index 2067316e672f..6f4cd1ecf2ab 100644
--- a/drivers/clk/clk-hsdk-cgu.c
+++ b/drivers/clk/clk-hsdk-cgu.c
@@ -17,6 +17,7 @@
 #include <linux/bitops.h>
 #include <linux/bug.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <asm/arcregs.h>
 #include <linux/printk.h>
diff --git a/drivers/clk/clk-mux.c b/drivers/clk/clk-mux.c
index 446c0c7b52de..cba7113f3b63 100644
--- a/drivers/clk/clk-mux.c
+++ b/drivers/clk/clk-mux.c
@@ -31,6 +31,7 @@
 #include <linux/bitops.h>
 #include <linux/clk-provider.h>
 #include <clk.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include "clk.h"
diff --git a/drivers/clk/clk-ti-sci.c b/drivers/clk/clk-ti-sci.c
index 7a9a6451374d..0f31ee73d9e3 100644
--- a/drivers/clk/clk-ti-sci.c
+++ b/drivers/clk/clk-ti-sci.c
@@ -16,6 +16,7 @@
 #include <malloc.h>
 #include <dm/device_compat.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/soc/ti/ti_sci_protocol.h>
 #include <k3-avs.h>
 
diff --git a/drivers/clk/clk-uclass.c b/drivers/clk/clk-uclass.c
index 8ebfecd347a8..d11edf6058fd 100644
--- a/drivers/clk/clk-uclass.c
+++ b/drivers/clk/clk-uclass.c
@@ -21,6 +21,7 @@
 #include <linux/bug.h>
 #include <linux/clk-provider.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 
 static inline const struct clk_ops *clk_dev_ops(struct udevice *dev)
 {
diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
index f55d57a95e65..5dac14c185e5 100644
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@ -13,6 +13,7 @@
 #include <dm/lists.h>
 #include <dm/device-internal.h>
 #include <clk.h>
+#include <linux/errno.h>
 
 int clk_register(struct clk *clk, const char *drv_name,
 		 const char *name, const char *parent_name)
diff --git a/drivers/clk/clk_bcm6345.c b/drivers/clk/clk_bcm6345.c
index b850b9fc069b..a03cee546c72 100644
--- a/drivers/clk/clk_bcm6345.c
+++ b/drivers/clk/clk_bcm6345.c
@@ -12,6 +12,7 @@
 #include <errno.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #define MAX_CLKS	32
 
diff --git a/drivers/clk/clk_boston.c b/drivers/clk/clk_boston.c
index 47424d8f5333..c97d457062c6 100644
--- a/drivers/clk/clk_boston.c
+++ b/drivers/clk/clk_boston.c
@@ -10,6 +10,7 @@
 #include <regmap.h>
 #include <syscon.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 struct clk_boston {
diff --git a/drivers/clk/clk_pic32.c b/drivers/clk/clk_pic32.c
index 664d8f986150..c9b047914a4b 100644
--- a/drivers/clk/clk_pic32.c
+++ b/drivers/clk/clk_pic32.c
@@ -17,6 +17,7 @@
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/bug.h>
+#include <linux/errno.h>
 #include <mach/pic32.h>
 #include <dt-bindings/clock/microchip,clock.h>
 
diff --git a/drivers/clk/clk_sandbox.c b/drivers/clk/clk_sandbox.c
index 768fbb7c5203..d1e2c0dab316 100644
--- a/drivers/clk/clk_sandbox.c
+++ b/drivers/clk/clk_sandbox.c
@@ -9,6 +9,7 @@
 #include <errno.h>
 #include <malloc.h>
 #include <asm/clk.h>
+#include <linux/errno.h>
 
 struct sandbox_clk_priv {
 	bool probed;
diff --git a/drivers/clk/clk_sandbox_ccf.c b/drivers/clk/clk_sandbox_ccf.c
index 0619d04f0ece..b282735c1d6e 100644
--- a/drivers/clk/clk_sandbox_ccf.c
+++ b/drivers/clk/clk_sandbox_ccf.c
@@ -17,6 +17,7 @@
 #include <linux/clk-provider.h>
 #include <sandbox-clk.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 
 /*
  * Sandbox implementation of CCF primitives necessary for clk-uclass testing
diff --git a/drivers/clk/clk_sandbox_test.c b/drivers/clk/clk_sandbox_test.c
index 873383856f92..6eef29f9dc3b 100644
--- a/drivers/clk/clk_sandbox_test.c
+++ b/drivers/clk/clk_sandbox_test.c
@@ -10,6 +10,7 @@
 #include <asm/clk.h>
 #include <dm/device_compat.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 
 struct sandbox_clk_test {
 	struct clk clks[SANDBOX_CLK_TEST_NON_DEVM_COUNT];
diff --git a/drivers/clk/clk_stm32f.c b/drivers/clk/clk_stm32f.c
index 45f5f567f8d5..4d0eadf7e4f5 100644
--- a/drivers/clk/clk_stm32f.c
+++ b/drivers/clk/clk_stm32f.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <stm32_rcc.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/clk/clk_stm32h7.c b/drivers/clk/clk_stm32h7.c
index c1856d8678b5..d97a211423c3 100644
--- a/drivers/clk/clk_stm32h7.c
+++ b/drivers/clk/clk_stm32h7.c
@@ -13,6 +13,7 @@
 #include <asm/io.h>
 #include <dm/root.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 #include <dt-bindings/clock/stm32h7-clks.h>
diff --git a/drivers/clk/clk_stm32mp1.c b/drivers/clk/clk_stm32mp1.c
index b2e0c8ca00d0..e7e57ad73a95 100644
--- a/drivers/clk/clk_stm32mp1.c
+++ b/drivers/clk/clk_stm32mp1.c
@@ -17,6 +17,7 @@
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/iopoll.h>
 #include <asm/arch/sys_proto.h>
diff --git a/drivers/clk/clk_versal.c b/drivers/clk/clk_versal.c
index 19db23159f02..b73dcc2980d6 100644
--- a/drivers/clk/clk_versal.c
+++ b/drivers/clk/clk_versal.c
@@ -19,6 +19,7 @@
 #include <asm/arch/sys_proto.h>
 #include <zynqmp_firmware.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #define MAX_PARENT			100
diff --git a/drivers/clk/clk_vexpress_osc.c b/drivers/clk/clk_vexpress_osc.c
index b48319bba67f..950c72d573a7 100644
--- a/drivers/clk/clk_vexpress_osc.c
+++ b/drivers/clk/clk_vexpress_osc.c
@@ -14,6 +14,7 @@
 #include <errno.h>
 #include <misc.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #define CLK_FUNCTION		BIT(20)
 
diff --git a/drivers/clk/clk_zynq.c b/drivers/clk/clk_zynq.c
index f590ad8dfa9a..2c8b851295cf 100644
--- a/drivers/clk/clk_zynq.c
+++ b/drivers/clk/clk_zynq.c
@@ -20,6 +20,7 @@
 #include <asm/arch/clk.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/errno.h>
 
 /* Register bitfield defines */
 #define PLLCTRL_FBDIV_MASK	0x7f000
diff --git a/drivers/clk/clk_zynqmp.c b/drivers/clk/clk_zynqmp.c
index 8c62b63ea2b4..3ebf6223c06d 100644
--- a/drivers/clk/clk_zynqmp.c
+++ b/drivers/clk/clk_zynqmp.c
@@ -16,6 +16,7 @@
 #include <asm/arch/sys_proto.h>
 #include <dm.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 
 static const resource_size_t zynqmp_crf_apb_clkc_base = 0xfd1a0020;
 static const resource_size_t zynqmp_crl_apb_clkc_base = 0xff5e0020;
diff --git a/drivers/clk/exynos/clk-exynos7420.c b/drivers/clk/exynos/clk-exynos7420.c
index 4a023ea736b4..d86f84acef11 100644
--- a/drivers/clk/exynos/clk-exynos7420.c
+++ b/drivers/clk/exynos/clk-exynos7420.c
@@ -11,6 +11,7 @@
 #include <clk-uclass.h>
 #include <asm/io.h>
 #include <dt-bindings/clock/exynos7420-clk.h>
+#include <linux/errno.h>
 #include "clk-pll.h"
 
 #define DIVIDER(reg, shift, mask)	\
diff --git a/drivers/clk/ics8n3qv01.c b/drivers/clk/ics8n3qv01.c
index 95f1c7641f2e..7d551b7c8d85 100644
--- a/drivers/clk/ics8n3qv01.c
+++ b/drivers/clk/ics8n3qv01.c
@@ -15,6 +15,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <stdio.h>
+#include <linux/errno.h>
 
 const long long ICS8N3QV01_FREF = 114285000;
 const long long ICS8N3QV01_FREF_LL = 114285000LL;
diff --git a/drivers/clk/imx/clk-composite-8m.c b/drivers/clk/imx/clk-composite-8m.c
index 494156751dae..64756ed9e642 100644
--- a/drivers/clk/imx/clk-composite-8m.c
+++ b/drivers/clk/imx/clk-composite-8m.c
@@ -12,6 +12,7 @@
 #include <dm/devres.h>
 #include <linux/clk-provider.h>
 #include <clk.h>
+#include <linux/errno.h>
 #include "clk.h"
 #include <linux/err.h>
 
diff --git a/drivers/clk/imx/clk-gate2.c b/drivers/clk/imx/clk-gate2.c
index 40b2d4caab49..0e3678acc639 100644
--- a/drivers/clk/imx/clk-gate2.c
+++ b/drivers/clk/imx/clk-gate2.c
@@ -22,6 +22,7 @@
 #include <dm/devres.h>
 #include <linux/clk-provider.h>
 #include <clk.h>
+#include <linux/errno.h>
 #include "clk.h"
 #include <linux/err.h>
 
diff --git a/drivers/clk/imx/clk-imx6q.c b/drivers/clk/imx/clk-imx6q.c
index c8d826b0141d..709c2883da58 100644
--- a/drivers/clk/imx/clk-imx6q.c
+++ b/drivers/clk/imx/clk-imx6q.c
@@ -12,6 +12,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <dt-bindings/clock/imx6qdl-clock.h>
+#include <linux/errno.h>
 
 #include "clk.h"
 
diff --git a/drivers/clk/imx/clk-imx8.c b/drivers/clk/imx/clk-imx8.c
index 523ead82e971..63fd42a29461 100644
--- a/drivers/clk/imx/clk-imx8.c
+++ b/drivers/clk/imx/clk-imx8.c
@@ -15,6 +15,7 @@
 #include <dt-bindings/clock/imx8qxp-clock.h>
 #include <dt-bindings/soc/imx_rsrc.h>
 #include <misc.h>
+#include <linux/errno.h>
 
 #include "clk-imx8.h"
 
diff --git a/drivers/clk/imx/clk-imx8mm.c b/drivers/clk/imx/clk-imx8mm.c
index d32ff8409aa4..081d8aee01bd 100644
--- a/drivers/clk/imx/clk-imx8mm.c
+++ b/drivers/clk/imx/clk-imx8mm.c
@@ -12,6 +12,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <dt-bindings/clock/imx8mm-clock.h>
+#include <linux/errno.h>
 
 #include "clk.h"
 
diff --git a/drivers/clk/imx/clk-imx8mn.c b/drivers/clk/imx/clk-imx8mn.c
index e29d902544c3..c35689bdea4c 100644
--- a/drivers/clk/imx/clk-imx8mn.c
+++ b/drivers/clk/imx/clk-imx8mn.c
@@ -12,6 +12,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <dt-bindings/clock/imx8mn-clock.h>
+#include <linux/errno.h>
 
 #include "clk.h"
 
diff --git a/drivers/clk/imx/clk-imx8mp.c b/drivers/clk/imx/clk-imx8mp.c
index c77500bcce0c..883a29a4f315 100644
--- a/drivers/clk/imx/clk-imx8mp.c
+++ b/drivers/clk/imx/clk-imx8mp.c
@@ -12,6 +12,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <dt-bindings/clock/imx8mp-clock.h>
+#include <linux/errno.h>
 
 #include "clk.h"
 
diff --git a/drivers/clk/imx/clk-imx8qm.c b/drivers/clk/imx/clk-imx8qm.c
index d781bcd8a93c..1a818694d252 100644
--- a/drivers/clk/imx/clk-imx8qm.c
+++ b/drivers/clk/imx/clk-imx8qm.c
@@ -14,6 +14,7 @@
 #include <dt-bindings/clock/imx8qm-clock.h>
 #include <dt-bindings/soc/imx_rsrc.h>
 #include <misc.h>
+#include <linux/errno.h>
 
 #include "clk-imx8.h"
 
diff --git a/drivers/clk/imx/clk-imx8qxp.c b/drivers/clk/imx/clk-imx8qxp.c
index 407613407394..755d8518f645 100644
--- a/drivers/clk/imx/clk-imx8qxp.c
+++ b/drivers/clk/imx/clk-imx8qxp.c
@@ -14,6 +14,7 @@
 #include <dt-bindings/clock/imx8qxp-clock.h>
 #include <dt-bindings/soc/imx_rsrc.h>
 #include <misc.h>
+#include <linux/errno.h>
 
 #include "clk-imx8.h"
 
diff --git a/drivers/clk/imx/clk-imxrt1020.c b/drivers/clk/imx/clk-imxrt1020.c
index 840f783940fd..6bf82fee4eb5 100644
--- a/drivers/clk/imx/clk-imxrt1020.c
+++ b/drivers/clk/imx/clk-imxrt1020.c
@@ -11,6 +11,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <dt-bindings/clock/imxrt1020-clock.h>
+#include <linux/errno.h>
 
 #include "clk.h"
 
diff --git a/drivers/clk/imx/clk-imxrt1050.c b/drivers/clk/imx/clk-imxrt1050.c
index 594093ee5fba..4127fa752364 100644
--- a/drivers/clk/imx/clk-imxrt1050.c
+++ b/drivers/clk/imx/clk-imxrt1050.c
@@ -12,6 +12,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <dt-bindings/clock/imxrt1050-clock.h>
+#include <linux/errno.h>
 
 #include "clk.h"
 
diff --git a/drivers/clk/imx/clk-pfd.c b/drivers/clk/imx/clk-pfd.c
index b8be3167c4cd..08f1234aab28 100644
--- a/drivers/clk/imx/clk-pfd.c
+++ b/drivers/clk/imx/clk-pfd.c
@@ -23,6 +23,7 @@
 #include <linux/clk-provider.h>
 #include <div64.h>
 #include <clk.h>
+#include <linux/errno.h>
 #include "clk.h"
 #include <linux/err.h>
 
diff --git a/drivers/clk/imx/clk-pll14xx.c b/drivers/clk/imx/clk-pll14xx.c
index ac2461948d27..a9b56b79027a 100644
--- a/drivers/clk/imx/clk-pll14xx.c
+++ b/drivers/clk/imx/clk-pll14xx.c
@@ -15,6 +15,7 @@
 #include <linux/clk-provider.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/iopoll.h>
 #include <clk.h>
 #include <div64.h>
diff --git a/drivers/clk/imx/clk-pllv3.c b/drivers/clk/imx/clk-pllv3.c
index b4a9d587e1b1..a0193e185195 100644
--- a/drivers/clk/imx/clk-pllv3.c
+++ b/drivers/clk/imx/clk-pllv3.c
@@ -13,6 +13,7 @@
 #include <dm/devres.h>
 #include <dm/uclass.h>
 #include <clk.h>
+#include <linux/errno.h>
 #include "clk.h"
 #include <linux/err.h>
 
diff --git a/drivers/clk/intel/clk_intel.c b/drivers/clk/intel/clk_intel.c
index b633934d90a1..371898f27443 100644
--- a/drivers/clk/intel/clk_intel.c
+++ b/drivers/clk/intel/clk_intel.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <clk-uclass.h>
 #include <dt-bindings/clock/intel-clock.h>
+#include <linux/errno.h>
 
 static ulong intel_clk_get_rate(struct clk *clk)
 {
diff --git a/drivers/clk/kendryte/bypass.c b/drivers/clk/kendryte/bypass.c
index 5f1986f2cb80..c48014c80e83 100644
--- a/drivers/clk/kendryte/bypass.c
+++ b/drivers/clk/kendryte/bypass.c
@@ -13,6 +13,7 @@
 #include <kendryte/bypass.h>
 #include <linux/clk-provider.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 
 #define CLK_K210_BYPASS "k210_clk_bypass"
 
diff --git a/drivers/clk/kendryte/clk.c b/drivers/clk/kendryte/clk.c
index 981b3b7699b6..5128cca10607 100644
--- a/drivers/clk/kendryte/clk.c
+++ b/drivers/clk/kendryte/clk.c
@@ -3,6 +3,7 @@
  * Copyright (C) 2019-20 Sean Anderson <seanga2@gmail.com>
  */
 #include <kendryte/clk.h>
+#include <linux/errno.h>
 
 #include <asm/io.h>
 #include <dt-bindings/clock/k210-sysctl.h>
diff --git a/drivers/clk/kendryte/pll.c b/drivers/clk/kendryte/pll.c
index ab6d75d585ab..68c93a5f965a 100644
--- a/drivers/clk/kendryte/pll.c
+++ b/drivers/clk/kendryte/pll.c
@@ -3,6 +3,8 @@
  * Copyright (C) 2019-20 Sean Anderson <seanga2@gmail.com>
  */
 #define LOG_CATEGORY UCLASS_CLK
+#include <kendryte/pll.h>
+#include <linux/errno.h>
 
 #include <common.h>
 #include <dm.h>
diff --git a/drivers/clk/mediatek/clk-mt7622.c b/drivers/clk/mediatek/clk-mt7622.c
index dc0ba71f1092..3462b49c69df 100644
--- a/drivers/clk/mediatek/clk-mt7622.c
+++ b/drivers/clk/mediatek/clk-mt7622.c
@@ -13,6 +13,7 @@
 #include <asm/io.h>
 #include <dt-bindings/clock/mt7622-clk.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #include "clk-mtk.h"
 
diff --git a/drivers/clk/mediatek/clk-mt7623.c b/drivers/clk/mediatek/clk-mt7623.c
index a15fb45e8e7a..042031dd70fd 100644
--- a/drivers/clk/mediatek/clk-mt7623.c
+++ b/drivers/clk/mediatek/clk-mt7623.c
@@ -13,6 +13,7 @@
 #include <asm/io.h>
 #include <dt-bindings/clock/mt7623-clk.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #include "clk-mtk.h"
 
diff --git a/drivers/clk/mediatek/clk-mt7629.c b/drivers/clk/mediatek/clk-mt7629.c
index 5b2aa5f200ae..94b83a532818 100644
--- a/drivers/clk/mediatek/clk-mt7629.c
+++ b/drivers/clk/mediatek/clk-mt7629.c
@@ -13,6 +13,7 @@
 #include <asm/io.h>
 #include <dt-bindings/clock/mt7629-clk.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #include "clk-mtk.h"
 
diff --git a/drivers/clk/mediatek/clk-mtk.c b/drivers/clk/mediatek/clk-mtk.c
index 388471b03a90..e4217bd96271 100644
--- a/drivers/clk/mediatek/clk-mtk.c
+++ b/drivers/clk/mediatek/clk-mtk.c
@@ -13,6 +13,7 @@
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 #include "clk-mtk.h"
 
diff --git a/drivers/clk/meson/axg.c b/drivers/clk/meson/axg.c
index 6ef8b418d782..99b4da094174 100644
--- a/drivers/clk/meson/axg.c
+++ b/drivers/clk/meson/axg.c
@@ -16,6 +16,7 @@
 #include <div64.h>
 #include <dt-bindings/clock/axg-clkc.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include "clk_meson.h"
 #include <linux/err.h>
 
diff --git a/drivers/clk/meson/g12a.c b/drivers/clk/meson/g12a.c
index bf2f357435ab..ba9ec818de6d 100644
--- a/drivers/clk/meson/g12a.c
+++ b/drivers/clk/meson/g12a.c
@@ -18,6 +18,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/kernel.h>
 #include "clk_meson.h"
 
diff --git a/drivers/clk/meson/gxbb.c b/drivers/clk/meson/gxbb.c
index b9353c053eb2..d66b23c2a90c 100644
--- a/drivers/clk/meson/gxbb.c
+++ b/drivers/clk/meson/gxbb.c
@@ -16,6 +16,7 @@
 #include <syscon.h>
 #include <dt-bindings/clock/gxbb-clkc.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include "clk_meson.h"
 #include <linux/err.h>
 
diff --git a/drivers/clk/mpc83xx_clk.c b/drivers/clk/mpc83xx_clk.c
index 24bb06c2f2d3..a390fea85f64 100644
--- a/drivers/clk/mpc83xx_clk.c
+++ b/drivers/clk/mpc83xx_clk.c
@@ -18,6 +18,7 @@
 #include <asm/arch/soc.h>
 #include <asm/ppc.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #include "mpc83xx_clk.h"
 
diff --git a/drivers/clk/mpc83xx_clk.h b/drivers/clk/mpc83xx_clk.h
index 8a31a4c868f1..b03b35a87842 100644
--- a/drivers/clk/mpc83xx_clk.h
+++ b/drivers/clk/mpc83xx_clk.h
@@ -18,6 +18,7 @@
  * @RAT_3_TO_1:   Ratio 3:1
  */
 #include <linux/bitops.h>
+#include <linux/errno.h>
 enum ratio {
 	RAT_UNK,
 	RAT_BYP,
diff --git a/drivers/clk/mtmips/clk-mt7628.c b/drivers/clk/mtmips/clk-mt7628.c
index 35780de8c496..f013c77df289 100644
--- a/drivers/clk/mtmips/clk-mt7628.c
+++ b/drivers/clk/mtmips/clk-mt7628.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <dt-bindings/clock/mt7628-clk.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 
 /* SYSCFG0 */
diff --git a/drivers/clk/mvebu/armada-37xx-periph.c b/drivers/clk/mvebu/armada-37xx-periph.c
index 2e2ac6fe8706..dd2b0b9914b6 100644
--- a/drivers/clk/mvebu/armada-37xx-periph.c
+++ b/drivers/clk/mvebu/armada-37xx-periph.c
@@ -18,6 +18,7 @@
 #include <asm/arch/cpu.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #define TBG_SEL		0x0
diff --git a/drivers/clk/mvebu/armada-37xx-tbg.c b/drivers/clk/mvebu/armada-37xx-tbg.c
index bb9438302665..512a1f5824f8 100644
--- a/drivers/clk/mvebu/armada-37xx-tbg.c
+++ b/drivers/clk/mvebu/armada-37xx-tbg.c
@@ -16,6 +16,7 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <dm/device_compat.h>
+#include <linux/errno.h>
 
 #define NUM_TBG	    4
 
diff --git a/drivers/clk/owl/clk_owl.c b/drivers/clk/owl/clk_owl.c
index 1999c87a3360..d596c0cf1617 100644
--- a/drivers/clk/owl/clk_owl.c
+++ b/drivers/clk/owl/clk_owl.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <linux/errno.h>
 #include "clk_owl.h"
 #include <asm/io.h>
 #if defined(CONFIG_MACH_S900)
diff --git a/drivers/clk/renesas/clk-rcar-gen2.c b/drivers/clk/renesas/clk-rcar-gen2.c
index a859625b60bd..52d7bba0cff3 100644
--- a/drivers/clk/renesas/clk-rcar-gen2.c
+++ b/drivers/clk/renesas/clk-rcar-gen2.c
@@ -18,6 +18,7 @@
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include <dt-bindings/clock/renesas-cpg-mssr.h>
diff --git a/drivers/clk/renesas/clk-rcar-gen3.c b/drivers/clk/renesas/clk-rcar-gen3.c
index ad2c73998d4b..be230d1d923c 100644
--- a/drivers/clk/renesas/clk-rcar-gen3.c
+++ b/drivers/clk/renesas/clk-rcar-gen3.c
@@ -20,6 +20,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #include <dt-bindings/clock/renesas-cpg-mssr.h>
 
diff --git a/drivers/clk/renesas/renesas-cpg-mssr.c b/drivers/clk/renesas/renesas-cpg-mssr.c
index 7c1222f6c8ce..e3e5d9640c91 100644
--- a/drivers/clk/renesas/renesas-cpg-mssr.c
+++ b/drivers/clk/renesas/renesas-cpg-mssr.c
@@ -17,6 +17,7 @@
 #include <wait_bit.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #include <dt-bindings/clock/renesas-cpg-mssr.h>
 
diff --git a/drivers/clk/rockchip/clk_pll.c b/drivers/clk/rockchip/clk_pll.c
index 3424a9a36a33..65da88b5109a 100644
--- a/drivers/clk/rockchip/clk_pll.c
+++ b/drivers/clk/rockchip/clk_pll.c
@@ -14,6 +14,7 @@
 #include <asm/arch-rockchip/hardware.h>
 #include <div64.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 static struct rockchip_pll_rate_table rockchip_auto_table;
 
diff --git a/drivers/clk/rockchip/clk_px30.c b/drivers/clk/rockchip/clk_px30.c
index 4178502bdff3..8fc3b6e572f7 100644
--- a/drivers/clk/rockchip/clk_px30.c
+++ b/drivers/clk/rockchip/clk_px30.c
@@ -21,6 +21,7 @@
 #include <dt-bindings/clock/px30-cru.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/clk/rockchip/clk_rk3036.c b/drivers/clk/rockchip/clk_rk3036.c
index 274572f70c14..80aa7c2f39a0 100644
--- a/drivers/clk/rockchip/clk_rk3036.c
+++ b/drivers/clk/rockchip/clk_rk3036.c
@@ -17,6 +17,7 @@
 #include <dm/lists.h>
 #include <dt-bindings/clock/rk3036-cru.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/log2.h>
 #include <linux/stringify.h>
 
diff --git a/drivers/clk/rockchip/clk_rk3128.c b/drivers/clk/rockchip/clk_rk3128.c
index 5a0079e0298b..b9c896460f0e 100644
--- a/drivers/clk/rockchip/clk_rk3128.c
+++ b/drivers/clk/rockchip/clk_rk3128.c
@@ -19,6 +19,7 @@
 #include <dm/lists.h>
 #include <dt-bindings/clock/rk3128-cru.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/log2.h>
 
 enum {
diff --git a/drivers/clk/rockchip/clk_rk3188.c b/drivers/clk/rockchip/clk_rk3188.c
index aacc8cf2d14f..b77b92e4c5b7 100644
--- a/drivers/clk/rockchip/clk_rk3188.c
+++ b/drivers/clk/rockchip/clk_rk3188.c
@@ -24,6 +24,7 @@
 #include <dm/uclass-internal.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/log2.h>
 #include <linux/stringify.h>
 
diff --git a/drivers/clk/rockchip/clk_rk322x.c b/drivers/clk/rockchip/clk_rk322x.c
index b63fb9b3cca9..780fd7e725b2 100644
--- a/drivers/clk/rockchip/clk_rk322x.c
+++ b/drivers/clk/rockchip/clk_rk322x.c
@@ -18,6 +18,7 @@
 #include <dt-bindings/clock/rk3228-cru.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/log2.h>
 #include <linux/string.h>
 #include <linux/stringify.h>
diff --git a/drivers/clk/rockchip/clk_rk3288.c b/drivers/clk/rockchip/clk_rk3288.c
index 6221515df206..da40f74d424d 100644
--- a/drivers/clk/rockchip/clk_rk3288.c
+++ b/drivers/clk/rockchip/clk_rk3288.c
@@ -28,6 +28,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/log2.h>
 #include <linux/string.h>
 #include <linux/stringify.h>
diff --git a/drivers/clk/rockchip/clk_rk3308.c b/drivers/clk/rockchip/clk_rk3308.c
index c6270aa07e19..7106685bb50d 100644
--- a/drivers/clk/rockchip/clk_rk3308.c
+++ b/drivers/clk/rockchip/clk_rk3308.c
@@ -20,6 +20,7 @@
 #include <dm/lists.h>
 #include <dt-bindings/clock/rk3308-cru.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/clk/rockchip/clk_rk3328.c b/drivers/clk/rockchip/clk_rk3328.c
index 1050559cedfd..6c7626ab154a 100644
--- a/drivers/clk/rockchip/clk_rk3328.c
+++ b/drivers/clk/rockchip/clk_rk3328.c
@@ -21,6 +21,7 @@
 #include <dt-bindings/clock/rk3328-cru.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 struct pll_div {
diff --git a/drivers/clk/rockchip/clk_rk3368.c b/drivers/clk/rockchip/clk_rk3368.c
index 586639344d09..0d677f55ee17 100644
--- a/drivers/clk/rockchip/clk_rk3368.c
+++ b/drivers/clk/rockchip/clk_rk3368.c
@@ -22,6 +22,7 @@
 #include <dm/lists.h>
 #include <dt-bindings/clock/rk3368-cru.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include <linux/stringify.h>
diff --git a/drivers/clk/rockchip/clk_rk3399.c b/drivers/clk/rockchip/clk_rk3399.c
index e6d74ab6b934..016633c13820 100644
--- a/drivers/clk/rockchip/clk_rk3399.c
+++ b/drivers/clk/rockchip/clk_rk3399.c
@@ -23,6 +23,7 @@
 #include <dt-bindings/clock/rk3399-cru.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/clk/rockchip/clk_rv1108.c b/drivers/clk/rockchip/clk_rv1108.c
index 87a2847485ce..4297934b9810 100644
--- a/drivers/clk/rockchip/clk_rv1108.c
+++ b/drivers/clk/rockchip/clk_rv1108.c
@@ -21,6 +21,7 @@
 #include <dm/lists.h>
 #include <dt-bindings/clock/rv1108-cru.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/stringify.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/clk/sifive/fu540-prci.c b/drivers/clk/sifive/fu540-prci.c
index c8f73a1fa269..e7b03e2c6e8d 100644
--- a/drivers/clk/sifive/fu540-prci.c
+++ b/drivers/clk/sifive/fu540-prci.c
@@ -41,6 +41,7 @@
 #include <dm/uclass.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include <linux/math64.h>
diff --git a/drivers/clk/sunxi/clk_sunxi.c b/drivers/clk/sunxi/clk_sunxi.c
index d440abc13944..1b70f15ab9a7 100644
--- a/drivers/clk/sunxi/clk_sunxi.c
+++ b/drivers/clk/sunxi/clk_sunxi.c
@@ -14,6 +14,7 @@
 #include <asm/io.h>
 #include <asm/arch/ccu.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/log2.h>
 
 static const struct ccu_clk_gate *priv_to_gate(struct ccu_priv *priv,
diff --git a/drivers/clk/tegra/tegra-car-clk.c b/drivers/clk/tegra/tegra-car-clk.c
index 09a7cf470ca2..d6abf0d6c11a 100644
--- a/drivers/clk/tegra/tegra-car-clk.c
+++ b/drivers/clk/tegra/tegra-car-clk.c
@@ -10,6 +10,7 @@
 #include <malloc.h>
 #include <asm/arch/clock.h>
 #include <asm/arch-tegra/clk_rst.h>
+#include <linux/errno.h>
 
 static int tegra_car_clk_request(struct clk *clk)
 {
diff --git a/drivers/clk/uniphier/clk-uniphier-core.c b/drivers/clk/uniphier/clk-uniphier-core.c
index 4e25db354e0c..13f2b76c890b 100644
--- a/drivers/clk/uniphier/clk-uniphier-core.c
+++ b/drivers/clk/uniphier/clk-uniphier-core.c
@@ -10,6 +10,7 @@
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/bug.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/sizes.h>
 
diff --git a/drivers/core/acpi.c b/drivers/core/acpi.c
index 26f494f2aeb6..356cf0862a51 100644
--- a/drivers/core/acpi.c
+++ b/drivers/core/acpi.c
@@ -18,6 +18,7 @@
 #include <dm/acpi.h>
 #include <dm/device-internal.h>
 #include <dm/root.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #define MAX_ACPI_ITEMS	100
diff --git a/drivers/core/device-remove.c b/drivers/core/device-remove.c
index 360cfa72bc14..3de629d24dfa 100644
--- a/drivers/core/device-remove.c
+++ b/drivers/core/device-remove.c
@@ -19,6 +19,7 @@
 #include <dm/uclass-internal.h>
 #include <dm/util.h>
 #include <power-domain.h>
+#include <linux/errno.h>
 
 int device_chld_unbind(struct udevice *dev, struct driver *drv)
 {
diff --git a/drivers/core/device.c b/drivers/core/device.c
index 29b71e240551..ac6ce92bc0f6 100644
--- a/drivers/core/device.c
+++ b/drivers/core/device.c
@@ -29,6 +29,7 @@
 #include <dm/uclass-internal.h>
 #include <dm/util.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/list.h>
 #include <power-domain.h>
 #include <linux/printk.h>
diff --git a/drivers/core/devres.c b/drivers/core/devres.c
index e2d4a80cefd9..9507ecb9a80e 100644
--- a/drivers/core/devres.c
+++ b/drivers/core/devres.c
@@ -14,6 +14,7 @@
 #include <malloc.h>
 #include <stdio.h>
 #include <linux/compat.h>
+#include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/list.h>
 #include <dm/device.h>
diff --git a/drivers/core/lists.c b/drivers/core/lists.c
index 86a99abfaae3..dcc1e4a4f951 100644
--- a/drivers/core/lists.c
+++ b/drivers/core/lists.c
@@ -19,6 +19,7 @@
 #include <dm/util.h>
 #include <fdtdec.h>
 #include <linux/compiler.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 struct driver *lists_driver_lookup_name(const char *name)
diff --git a/drivers/core/of_access.c b/drivers/core/of_access.c
index 368cd023578e..ad9bd7dd5a2c 100644
--- a/drivers/core/of_access.c
+++ b/drivers/core/of_access.c
@@ -25,6 +25,7 @@
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <linux/bug.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <dm/of_access.h>
 #include <linux/ctype.h>
diff --git a/drivers/core/of_addr.c b/drivers/core/of_addr.c
index 6316b6515349..4fd4ee0c8893 100644
--- a/drivers/core/of_addr.c
+++ b/drivers/core/of_addr.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <log.h>
 #include <linux/bug.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <dm/of_access.h>
 #include <dm/of_addr.h>
diff --git a/drivers/core/of_extra.c b/drivers/core/of_extra.c
index e04fc9d2687a..f2efc0c8ad9d 100644
--- a/drivers/core/of_extra.c
+++ b/drivers/core/of_extra.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <log.h>
 #include <vsprintf.h>
+#include <linux/errno.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 fe94799b230d..d68be142e681 100644
--- a/drivers/core/ofnode.c
+++ b/drivers/core/ofnode.c
@@ -12,6 +12,7 @@
 #include <malloc.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <dm/of_access.h>
 #include <dm/of_addr.h>
diff --git a/drivers/core/read.c b/drivers/core/read.c
index 8a31dc67c9b3..ecd812566ceb 100644
--- a/drivers/core/read.c
+++ b/drivers/core/read.c
@@ -11,6 +11,7 @@
 #include <mapmem.h>
 #include <asm/types.h>
 #include <asm/io.h>
+#include <linux/errno.h>
 
 int dev_read_u32(const struct udevice *dev, const char *propname, u32 *outp)
 {
diff --git a/drivers/core/regmap.c b/drivers/core/regmap.c
index e3f2affd1cf0..37fff77dc09a 100644
--- a/drivers/core/regmap.c
+++ b/drivers/core/regmap.c
@@ -9,6 +9,7 @@
 #include <errno.h>
 #include <log.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <malloc.h>
 #include <mapmem.h>
diff --git a/drivers/core/root.c b/drivers/core/root.c
index 1e9d580c4940..2d0deea9f78c 100644
--- a/drivers/core/root.c
+++ b/drivers/core/root.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <dm/acpi.h>
 #include <dm/device.h>
diff --git a/drivers/core/simple-pm-bus.c b/drivers/core/simple-pm-bus.c
index 51dc9b206fd6..96608bd95ede 100644
--- a/drivers/core/simple-pm-bus.c
+++ b/drivers/core/simple-pm-bus.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <clk.h>
 #include <dm.h>
+#include <linux/errno.h>
 
 /*
  * Power domains are taken care of by driver_probe, so we just have to enable
diff --git a/drivers/core/syscon-uclass.c b/drivers/core/syscon-uclass.c
index b5cd763b6bb9..11ac1b177334 100644
--- a/drivers/core/syscon-uclass.c
+++ b/drivers/core/syscon-uclass.c
@@ -15,6 +15,7 @@
 #include <dm/lists.h>
 #include <dm/root.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 
 /*
  * Caution:
diff --git a/drivers/core/uclass.c b/drivers/core/uclass.c
index 98fdb014222b..3fae359866fa 100644
--- a/drivers/core/uclass.c
+++ b/drivers/core/uclass.c
@@ -20,6 +20,7 @@
 #include <dm/uclass.h>
 #include <dm/uclass-internal.h>
 #include <dm/util.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/core/util.c b/drivers/core/util.c
index cd15768970cc..242fb7010de5 100644
--- a/drivers/core/util.c
+++ b/drivers/core/util.c
@@ -10,6 +10,7 @@
 #include <dm/ofnode.h>
 #include <dm/read.h>
 #include <dm/util.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <vsprintf.h>
 
diff --git a/drivers/cpu/bmips_cpu.c b/drivers/cpu/bmips_cpu.c
index 5a2fe894a5de..44110e1d8ecd 100644
--- a/drivers/cpu/bmips_cpu.c
+++ b/drivers/cpu/bmips_cpu.c
@@ -17,6 +17,7 @@
 #include <vsprintf.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #define REV_CHIPID_SHIFT		16
 #define REV_CHIPID_MASK			(0xffff << REV_CHIPID_SHIFT)
diff --git a/drivers/cpu/cpu-uclass.c b/drivers/cpu/cpu-uclass.c
index 58c8f833c6fa..7aac150b12c8 100644
--- a/drivers/cpu/cpu-uclass.c
+++ b/drivers/cpu/cpu-uclass.c
@@ -12,6 +12,7 @@
 #include <dm/lists.h>
 #include <dm/root.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 int cpu_probe_all(void)
diff --git a/drivers/cpu/imx8_cpu.c b/drivers/cpu/imx8_cpu.c
index 2ebb28194888..0c660f81227f 100644
--- a/drivers/cpu/imx8_cpu.c
+++ b/drivers/cpu/imx8_cpu.c
@@ -16,6 +16,7 @@
 #include <asm/arch-imx/cpu.h>
 #include <asm/armv8/cpu.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/cpu/mpc83xx_cpu.c b/drivers/cpu/mpc83xx_cpu.c
index 5089c9d09fb8..ced2213de10d 100644
--- a/drivers/cpu/mpc83xx_cpu.c
+++ b/drivers/cpu/mpc83xx_cpu.c
@@ -13,6 +13,7 @@
 #include <vsprintf.h>
 #include <asm/ppc.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #include "mpc83xx_cpu.h"
 
diff --git a/drivers/cpu/riscv_cpu.c b/drivers/cpu/riscv_cpu.c
index fcf487d73d06..2fd18901dd4f 100644
--- a/drivers/cpu/riscv_cpu.c
+++ b/drivers/cpu/riscv_cpu.c
@@ -15,6 +15,7 @@
 #include <dm/lists.h>
 #include <linux/bitops.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/crypto/fsl/fsl_rsa.c b/drivers/crypto/fsl/fsl_rsa.c
index ed2a54f6ec20..2658f8c04343 100644
--- a/drivers/crypto/fsl/fsl_rsa.c
+++ b/drivers/crypto/fsl/fsl_rsa.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <asm/types.h>
 #include <malloc.h>
+#include <linux/errno.h>
 #include "jobdesc.h"
 #include "desc.h"
 #include "jr.h"
diff --git a/drivers/crypto/fsl/jr.c b/drivers/crypto/fsl/jr.c
index 9e31e92024c9..9ac4817d4489 100644
--- a/drivers/crypto/fsl/jr.c
+++ b/drivers/crypto/fsl/jr.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <linux/kernel.h>
 #include <log.h>
 #include <malloc.h>
diff --git a/drivers/crypto/fsl/rng.c b/drivers/crypto/fsl/rng.c
index e4a952caeec5..77f8e8a055f7 100644
--- a/drivers/crypto/fsl/rng.c
+++ b/drivers/crypto/fsl/rng.c
@@ -11,6 +11,7 @@
 #include <cpu_func.h>
 #include <dm.h>
 #include <rng.h>
+#include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include "desc_constr.h"
diff --git a/drivers/crypto/rsa_mod_exp/mod_exp_uclass.c b/drivers/crypto/rsa_mod_exp/mod_exp_uclass.c
index f5ae35e13254..8997980cacae 100644
--- a/drivers/crypto/rsa_mod_exp/mod_exp_uclass.c
+++ b/drivers/crypto/rsa_mod_exp/mod_exp_uclass.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <u-boot/rsa-mod-exp.h>
 #include <errno.h>
 #include <fdtdec.h>
diff --git a/drivers/ddr/altera/sdram_agilex.c b/drivers/ddr/altera/sdram_agilex.c
index 771820941aac..8cc648bc98e6 100644
--- a/drivers/ddr/altera/sdram_agilex.c
+++ b/drivers/ddr/altera/sdram_agilex.c
@@ -16,6 +16,7 @@
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 #include "sdram_soc64.h"
 #include <wait_bit.h>
 #include <asm/arch/firewall.h>
diff --git a/drivers/ddr/altera/sdram_arria10.c b/drivers/ddr/altera/sdram_arria10.c
index 488f950dfcf0..7d51bfd83c50 100644
--- a/drivers/ddr/altera/sdram_arria10.c
+++ b/drivers/ddr/altera/sdram_arria10.c
@@ -23,6 +23,7 @@
 #include <asm/arch/sdram.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
 
diff --git a/drivers/ddr/altera/sdram_gen5.c b/drivers/ddr/altera/sdram_gen5.c
index 01857f292565..bc20fa096454 100644
--- a/drivers/ddr/altera/sdram_gen5.c
+++ b/drivers/ddr/altera/sdram_gen5.c
@@ -19,6 +19,7 @@
 #include <asm/bitops.h>
 #include <asm/io.h>
 #include <dm/device_compat.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include "sequencer.h"
diff --git a/drivers/ddr/altera/sdram_soc64.c b/drivers/ddr/altera/sdram_soc64.c
index 03ca6b58cfc0..778528bf8631 100644
--- a/drivers/ddr/altera/sdram_soc64.c
+++ b/drivers/ddr/altera/sdram_soc64.c
@@ -19,6 +19,7 @@
 #include <time.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include "sdram_soc64.h"
 #include <wait_bit.h>
diff --git a/drivers/ddr/altera/sequencer.c b/drivers/ddr/altera/sequencer.c
index 7c54f0018251..8d62f02660d3 100644
--- a/drivers/ddr/altera/sequencer.c
+++ b/drivers/ddr/altera/sequencer.c
@@ -9,6 +9,7 @@
 #include <asm/arch/sdram.h>
 #include <errno.h>
 #include <hang.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include "sequencer.h"
 
diff --git a/drivers/demo/demo-shape.c b/drivers/demo/demo-shape.c
index 3e1f79aee50b..f35bc3e14922 100644
--- a/drivers/demo/demo-shape.c
+++ b/drivers/demo/demo-shape.c
@@ -14,6 +14,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/demo/demo-uclass.c b/drivers/demo/demo-uclass.c
index 5856a9891e81..cf85bf24a3f6 100644
--- a/drivers/demo/demo-uclass.c
+++ b/drivers/demo/demo-uclass.c
@@ -15,6 +15,7 @@
 #include <malloc.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <linux/errno.h>
 #include <linux/list.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/dfu/dfu.c b/drivers/dfu/dfu.c
index dad6b5a1e361..4cc2be16bb3e 100644
--- a/drivers/dfu/dfu.c
+++ b/drivers/dfu/dfu.c
@@ -17,6 +17,7 @@
 #include <hash.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/errno.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 d34456c82f26..94989c2ba239 100644
--- a/drivers/dfu/dfu_mmc.c
+++ b/drivers/dfu/dfu_mmc.c
@@ -18,6 +18,7 @@
 #include <part.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/dfu/dfu_mtd.c b/drivers/dfu/dfu_mtd.c
index 679c7713fba9..b93d99873749 100644
--- a/drivers/dfu/dfu_mtd.c
+++ b/drivers/dfu/dfu_mtd.c
@@ -14,6 +14,7 @@
 #include <vsprintf.h>
 #include <jffs2/load_kernel.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 static bool mtd_is_aligned_with_block_size(struct mtd_info *mtd, u64 size)
diff --git a/drivers/dfu/dfu_ram.c b/drivers/dfu/dfu_ram.c
index 969468e7e412..55c3dc9eb193 100644
--- a/drivers/dfu/dfu_ram.c
+++ b/drivers/dfu/dfu_ram.c
@@ -13,6 +13,7 @@
 #include <errno.h>
 #include <dfu.h>
 #include <vsprintf.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/dfu/dfu_sf.c b/drivers/dfu/dfu_sf.c
index c6c5328602e2..3d0a4f989715 100644
--- a/drivers/dfu/dfu_sf.c
+++ b/drivers/dfu/dfu_sf.c
@@ -14,6 +14,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <jffs2/load_kernel.h>
+#include <linux/errno.h>
 #include <linux/mtd/mtd.h>
 #include <linux/string.h>
 
diff --git a/drivers/dfu/dfu_tftp.c b/drivers/dfu/dfu_tftp.c
index efa25d86f22e..61efb11a5452 100644
--- a/drivers/dfu/dfu_tftp.c
+++ b/drivers/dfu/dfu_tftp.c
@@ -9,6 +9,7 @@
 #include <malloc.h>
 #include <errno.h>
 #include <dfu.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/dma/bcm6348-iudma.c b/drivers/dma/bcm6348-iudma.c
index ceb8de9b8af2..e1130f8f9fb8 100644
--- a/drivers/dma/bcm6348-iudma.c
+++ b/drivers/dma/bcm6348-iudma.c
@@ -28,6 +28,7 @@
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 #define DMA_RX_DESC	6
diff --git a/drivers/dma/dma-uclass.c b/drivers/dma/dma-uclass.c
index 79fbfa87d12b..cc872831b5f7 100644
--- a/drivers/dma/dma-uclass.c
+++ b/drivers/dma/dma-uclass.c
@@ -19,6 +19,7 @@
 #include <dma-uclass.h>
 #include <dt-structs.h>
 #include <errno.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 #ifdef CONFIG_DMA_CHANNELS
diff --git a/drivers/dma/lpc32xx_dma.c b/drivers/dma/lpc32xx_dma.c
index 3fd56053faee..7078d3e7c6aa 100644
--- a/drivers/dma/lpc32xx_dma.c
+++ b/drivers/dma/lpc32xx_dma.c
@@ -18,6 +18,7 @@
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 /* DMA controller channel register structure */
diff --git a/drivers/dma/sandbox-dma-test.c b/drivers/dma/sandbox-dma-test.c
index 6e02e8ff6e30..9a6904cd634f 100644
--- a/drivers/dma/sandbox-dma-test.c
+++ b/drivers/dma/sandbox-dma-test.c
@@ -16,6 +16,7 @@
 #include <dma-uclass.h>
 #include <dt-structs.h>
 #include <errno.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/dma/ti/k3-psil.c b/drivers/dma/ti/k3-psil.c
index b5c92b282936..56da1e605c33 100644
--- a/drivers/dma/ti/k3-psil.c
+++ b/drivers/dma/ti/k3-psil.c
@@ -4,6 +4,7 @@
  *  Author: Peter Ujfalusi <peter.ujfalusi@ti.com>
  */
 
+#include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/err.h>
 
diff --git a/drivers/dma/ti/k3-udma.c b/drivers/dma/ti/k3-udma.c
index 15be04b0898f..0b6de5bbbcc5 100644
--- a/drivers/dma/ti/k3-udma.c
+++ b/drivers/dma/ti/k3-udma.c
@@ -26,6 +26,7 @@
 #include <linux/delay.h>
 #include <linux/bitmap.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/soc/ti/k3-navss-ringacc.h>
 #include <linux/soc/ti/cppi5.h>
diff --git a/drivers/fastboot/fb_common.c b/drivers/fastboot/fb_common.c
index dfa383de57d1..74a5bce22f78 100644
--- a/drivers/fastboot/fb_common.c
+++ b/drivers/fastboot/fb_common.c
@@ -17,6 +17,7 @@
 #include <stdarg.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <net/fastboot.h>
 
diff --git a/drivers/fastboot/fb_getvar.c b/drivers/fastboot/fb_getvar.c
index 448840ae4fe9..b8f4938f9d5b 100644
--- a/drivers/fastboot/fb_getvar.c
+++ b/drivers/fastboot/fb_getvar.c
@@ -13,6 +13,7 @@
 #include <part.h>
 #include <version.h>
 #include <vsprintf.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/fastboot/fb_mmc.c b/drivers/fastboot/fb_mmc.c
index 5dc58f00a75a..37cef1890f26 100644
--- a/drivers/fastboot/fb_mmc.c
+++ b/drivers/fastboot/fb_mmc.c
@@ -20,6 +20,7 @@
 #include <stdio.h>
 #include <linux/compat.h>
 #include <android_image.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/fastboot/fb_nand.c b/drivers/fastboot/fb_nand.c
index 431580631168..074aa2aeb2ba 100644
--- a/drivers/fastboot/fb_nand.c
+++ b/drivers/fastboot/fb_nand.c
@@ -9,6 +9,7 @@
 #include <blk.h>
 #include <flash.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/firmware/firmware-zynqmp.c b/drivers/firmware/firmware-zynqmp.c
index b4f8dba9604c..01d5ac72f8fc 100644
--- a/drivers/firmware/firmware-zynqmp.c
+++ b/drivers/firmware/firmware-zynqmp.c
@@ -13,6 +13,7 @@
 #include <zynqmp_firmware.h>
 #include <asm/cache.h>
 #include <asm/ptrace.h>
+#include <linux/errno.h>
 
 #if defined(CONFIG_ZYNQMP_IPI)
 #include <mailbox.h>
diff --git a/drivers/firmware/ti_sci.c b/drivers/firmware/ti_sci.c
index 1a38526d80a8..d2e1be9c9940 100644
--- a/drivers/firmware/ti_sci.c
+++ b/drivers/firmware/ti_sci.c
@@ -19,6 +19,7 @@
 #include <linux/bitops.h>
 #include <linux/compat.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/soc/ti/k3-sec-proxy.h>
 #include <linux/soc/ti/ti_sci_protocol.h>
 #include <linux/string.h>
diff --git a/drivers/fpga/altera.c b/drivers/fpga/altera.c
index 7f7d768c5cb9..9908630c2d40 100644
--- a/drivers/fpga/altera.c
+++ b/drivers/fpga/altera.c
@@ -16,6 +16,7 @@
 #include <log.h>
 #include <stdio.h>
 #include <stratixII.h>
+#include <linux/errno.h>
 
 /* Define FPGA_DEBUG to 1 to get debug printf's */
 #define FPGA_DEBUG	0
diff --git a/drivers/fpga/socfpga_arria10.c b/drivers/fpga/socfpga_arria10.c
index f6ece13b06ca..0c26701e95d2 100644
--- a/drivers/fpga/socfpga_arria10.c
+++ b/drivers/fpga/socfpga_arria10.c
@@ -24,6 +24,7 @@
 #include <watchdog.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #define CFGWDTH_32	1
diff --git a/drivers/fpga/stratix10.c b/drivers/fpga/stratix10.c
index 81a3c35d9ebf..e4a513171eba 100644
--- a/drivers/fpga/stratix10.c
+++ b/drivers/fpga/stratix10.c
@@ -10,6 +10,7 @@
 #include <time.h>
 #include <asm/arch/mailbox_s10.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #define RECONFIG_STATUS_POLL_RESP_TIMEOUT_MS		60000
diff --git a/drivers/gpio/74x164_gpio.c b/drivers/gpio/74x164_gpio.c
index 81666c83a595..a6d360a04e1f 100644
--- a/drivers/gpio/74x164_gpio.c
+++ b/drivers/gpio/74x164_gpio.c
@@ -20,6 +20,7 @@
 #include <dm/device_compat.h>
 #include <dt-bindings/gpio/gpio.h>
 #include <spi.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/gpio/atmel_pio4.c b/drivers/gpio/atmel_pio4.c
index b82fe74a62b1..9b291ae976ad 100644
--- a/drivers/gpio/atmel_pio4.c
+++ b/drivers/gpio/atmel_pio4.c
@@ -15,6 +15,7 @@
 #include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <mach/gpio.h>
 #include <mach/atmel_pio4.h>
 
diff --git a/drivers/gpio/axp_gpio.c b/drivers/gpio/axp_gpio.c
index 88993b643e25..76008670e0be 100644
--- a/drivers/gpio/axp_gpio.c
+++ b/drivers/gpio/axp_gpio.c
@@ -15,6 +15,7 @@
 #include <dm/lists.h>
 #include <dm/root.h>
 #include <errno.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 static int axp_gpio_set_value(struct udevice *dev, unsigned pin, int val);
diff --git a/drivers/gpio/bcm2835_gpio.c b/drivers/gpio/bcm2835_gpio.c
index 0dff9ac711d7..c7d120246fc0 100644
--- a/drivers/gpio/bcm2835_gpio.c
+++ b/drivers/gpio/bcm2835_gpio.c
@@ -11,6 +11,7 @@
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <fdtdec.h>
+#include <linux/errno.h>
 
 struct bcm2835_gpios {
 	struct bcm2835_gpio_regs *reg;
diff --git a/drivers/gpio/bcm6345_gpio.c b/drivers/gpio/bcm6345_gpio.c
index 5da11d988e08..5eaad77dcb64 100644
--- a/drivers/gpio/bcm6345_gpio.c
+++ b/drivers/gpio/bcm6345_gpio.c
@@ -13,6 +13,7 @@
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 struct bcm6345_gpio_priv {
 	void __iomem *reg_dirout;
diff --git a/drivers/gpio/cortina_gpio.c b/drivers/gpio/cortina_gpio.c
index 055907c1a1d3..3b093c87568b 100644
--- a/drivers/gpio/cortina_gpio.c
+++ b/drivers/gpio/cortina_gpio.c
@@ -13,6 +13,7 @@
 #include <linux/bitops.h>
 #include <linux/compat.h>
 #include <linux/compiler.h>
+#include <linux/errno.h>
 
 /* GPIO Register Map */
 #define CORTINA_GPIO_CFG	0x00
diff --git a/drivers/gpio/da8xx_gpio.c b/drivers/gpio/da8xx_gpio.c
index dd7506ff1772..d38a3f75bc5b 100644
--- a/drivers/gpio/da8xx_gpio.c
+++ b/drivers/gpio/da8xx_gpio.c
@@ -15,6 +15,7 @@
 #include <asm/io.h>
 #include <asm/gpio.h>
 #include <dt-bindings/gpio/gpio.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include "da8xx_gpio.h"
diff --git a/drivers/gpio/dwapb_gpio.c b/drivers/gpio/dwapb_gpio.c
index e5e35181940c..3ab3b399c6b7 100644
--- a/drivers/gpio/dwapb_gpio.c
+++ b/drivers/gpio/dwapb_gpio.c
@@ -20,6 +20,7 @@
 #include <errno.h>
 #include <reset.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #define GPIO_SWPORT_DR(p)	(0x00 + (p) * 0xc)
 #define GPIO_SWPORT_DDR(p)	(0x04 + (p) * 0xc)
diff --git a/drivers/gpio/gpio-rza1.c b/drivers/gpio/gpio-rza1.c
index aa600e483a6c..6407727b4533 100644
--- a/drivers/gpio/gpio-rza1.c
+++ b/drivers/gpio/gpio-rza1.c
@@ -11,6 +11,7 @@
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #define P(bank)			(0x0000 + (bank) * 4)
 #define PSR(bank)		(0x0100 + (bank) * 4)
diff --git a/drivers/gpio/gpio-uclass.c b/drivers/gpio/gpio-uclass.c
index b4501da67d16..44ba2ac2b3ce 100644
--- a/drivers/gpio/gpio-uclass.c
+++ b/drivers/gpio/gpio-uclass.c
@@ -22,6 +22,7 @@
 #include <dm/device_compat.h>
 #include <linux/bug.h>
 #include <linux/ctype.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/gpio/hi6220_gpio.c b/drivers/gpio/hi6220_gpio.c
index 49236c97722c..eb369195c8d7 100644
--- a/drivers/gpio/hi6220_gpio.c
+++ b/drivers/gpio/hi6220_gpio.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <errno.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 static int hi6220_gpio_direction_input(struct udevice *dev, unsigned int gpio)
diff --git a/drivers/gpio/hsdk-creg-gpio.c b/drivers/gpio/hsdk-creg-gpio.c
index d9df804f6390..82ce0a813ba4 100644
--- a/drivers/gpio/hsdk-creg-gpio.c
+++ b/drivers/gpio/hsdk-creg-gpio.c
@@ -16,6 +16,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 #define DRV_NAME	"gpio_creg"
diff --git a/drivers/gpio/imx_rgpio2p.c b/drivers/gpio/imx_rgpio2p.c
index 60b8e8e25ac1..fe171af18c56 100644
--- a/drivers/gpio/imx_rgpio2p.c
+++ b/drivers/gpio/imx_rgpio2p.c
@@ -13,6 +13,7 @@
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <malloc.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 enum imx_rgpio2p_direction {
diff --git a/drivers/gpio/intel_broadwell_gpio.c b/drivers/gpio/intel_broadwell_gpio.c
index 4323f0ba7609..4fc345c755e7 100644
--- a/drivers/gpio/intel_broadwell_gpio.c
+++ b/drivers/gpio/intel_broadwell_gpio.c
@@ -18,6 +18,7 @@
 #include <asm/pci.h>
 #include <asm/arch/gpio.h>
 #include <dt-bindings/gpio/x86-gpio.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/gpio/intel_gpio.c b/drivers/gpio/intel_gpio.c
index 975293ff3ab8..360ec685249e 100644
--- a/drivers/gpio/intel_gpio.c
+++ b/drivers/gpio/intel_gpio.c
@@ -22,6 +22,7 @@
 #include <asm/arch/gpio.h>
 #include <dm/acpi.h>
 #include <dt-bindings/gpio/x86-gpio.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 static int intel_gpio_direction_input(struct udevice *dev, uint offset)
diff --git a/drivers/gpio/intel_ich6_gpio.c b/drivers/gpio/intel_ich6_gpio.c
index 4a2757d1ac68..b3df925c7564 100644
--- a/drivers/gpio/intel_ich6_gpio.c
+++ b/drivers/gpio/intel_ich6_gpio.c
@@ -38,6 +38,7 @@
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <asm/pci.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/gpio/iproc_gpio.c b/drivers/gpio/iproc_gpio.c
index cc26a1306b63..50eb95d25227 100644
--- a/drivers/gpio/iproc_gpio.c
+++ b/drivers/gpio/iproc_gpio.c
@@ -11,6 +11,7 @@
 #include <dm/device_compat.h>
 #include <dm/devres.h>
 #include <dm/pinctrl.h>
+#include <linux/errno.h>
 
 /*
  * There are five GPIO bank register. Each bank can configure max of 32 gpios.
diff --git a/drivers/gpio/mpc83xx_spisel_boot.c b/drivers/gpio/mpc83xx_spisel_boot.c
index d818954ce29c..34705769cbf8 100644
--- a/drivers/gpio/mpc83xx_spisel_boot.c
+++ b/drivers/gpio/mpc83xx_spisel_boot.c
@@ -10,6 +10,7 @@
 #include <mapmem.h>
 #include <vsprintf.h>
 #include <asm/gpio.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 struct mpc83xx_spisel_boot {
diff --git a/drivers/gpio/mpc8xxx_gpio.c b/drivers/gpio/mpc8xxx_gpio.c
index 20ad373d023a..6959f1c5d62f 100644
--- a/drivers/gpio/mpc8xxx_gpio.c
+++ b/drivers/gpio/mpc8xxx_gpio.c
@@ -13,6 +13,7 @@
 #include <mapmem.h>
 #include <vsprintf.h>
 #include <asm/gpio.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 struct ccsr_gpio {
diff --git a/drivers/gpio/mscc_sgpio.c b/drivers/gpio/mscc_sgpio.c
index 780d77b2f86e..0133e14bb735 100644
--- a/drivers/gpio/mscc_sgpio.c
+++ b/drivers/gpio/mscc_sgpio.c
@@ -17,6 +17,7 @@
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 
 #define MSCC_SGPIOS_PER_BANK	32
 #define MSCC_SGPIO_BANK_DEPTH	4
diff --git a/drivers/gpio/msm_gpio.c b/drivers/gpio/msm_gpio.c
index 710994b4e127..d08774850852 100644
--- a/drivers/gpio/msm_gpio.c
+++ b/drivers/gpio/msm_gpio.c
@@ -11,6 +11,7 @@
 #include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/gpio/mt7621_gpio.c b/drivers/gpio/mt7621_gpio.c
index 612413e17bca..e569c67a6150 100644
--- a/drivers/gpio/mt7621_gpio.c
+++ b/drivers/gpio/mt7621_gpio.c
@@ -13,6 +13,7 @@
 #include <fdtdec.h>
 #include <malloc.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
diff --git a/drivers/gpio/pca953x_gpio.c b/drivers/gpio/pca953x_gpio.c
index e5fbd291377c..1f7563531e77 100644
--- a/drivers/gpio/pca953x_gpio.c
+++ b/drivers/gpio/pca953x_gpio.c
@@ -30,6 +30,7 @@
 #include <dm/device_compat.h>
 #include <dt-bindings/gpio/gpio.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #define PCA953X_INPUT           0
diff --git a/drivers/gpio/pic32_gpio.c b/drivers/gpio/pic32_gpio.c
index 7a98469de469..a4352ec8ba82 100644
--- a/drivers/gpio/pic32_gpio.c
+++ b/drivers/gpio/pic32_gpio.c
@@ -14,6 +14,7 @@
 #include <asm/gpio.h>
 #include <linux/bitops.h>
 #include <linux/compat.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <mach/pic32.h>
 
diff --git a/drivers/gpio/pm8916_gpio.c b/drivers/gpio/pm8916_gpio.c
index 58f044678b7d..de150c44a54f 100644
--- a/drivers/gpio/pm8916_gpio.c
+++ b/drivers/gpio/pm8916_gpio.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <linux/errno.h>
 #include <power/pmic.h>
 #include <spmi/spmi.h>
 #include <asm/io.h>
diff --git a/drivers/gpio/s5p_gpio.c b/drivers/gpio/s5p_gpio.c
index 14f262739d21..0d87c6be7f27 100644
--- a/drivers/gpio/s5p_gpio.c
+++ b/drivers/gpio/s5p_gpio.c
@@ -14,6 +14,7 @@
 #include <asm/io.h>
 #include <asm/gpio.h>
 #include <dm/device-internal.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/gpio/sandbox.c b/drivers/gpio/sandbox.c
index df4ca043ac1a..acbc6495c837 100644
--- a/drivers/gpio/sandbox.c
+++ b/drivers/gpio/sandbox.c
@@ -19,6 +19,7 @@
 #include <dm/pinctrl.h>
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/gpio/sandbox-gpio.h>
+#include <linux/errno.h>
 
 
 struct gpio_state {
diff --git a/drivers/gpio/sifive-gpio.c b/drivers/gpio/sifive-gpio.c
index e7dbeea400d6..76e3c702e21f 100644
--- a/drivers/gpio/sifive-gpio.c
+++ b/drivers/gpio/sifive-gpio.c
@@ -13,6 +13,7 @@
 #include <errno.h>
 #include <asm/gpio.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 static int sifive_gpio_probe(struct udevice *dev)
diff --git a/drivers/gpio/spear_gpio.c b/drivers/gpio/spear_gpio.c
index 4e4cd125457d..2aed08781d76 100644
--- a/drivers/gpio/spear_gpio.c
+++ b/drivers/gpio/spear_gpio.c
@@ -13,6 +13,7 @@
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <errno.h>
+#include <linux/errno.h>
 
 static int gpio_direction(unsigned gpio,
 			  enum gpio_direction direction)
diff --git a/drivers/gpio/sunxi_gpio.c b/drivers/gpio/sunxi_gpio.c
index 20a60fe8b07f..d7ba86cc1511 100644
--- a/drivers/gpio/sunxi_gpio.c
+++ b/drivers/gpio/sunxi_gpio.c
@@ -20,6 +20,7 @@
 #include <asm/gpio.h>
 #include <dm/device-internal.h>
 #include <dt-bindings/gpio/gpio.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #define SUNXI_GPIOS_PER_BANK	SUNXI_GPIO_A_NR
diff --git a/drivers/gpio/tegra186_gpio.c b/drivers/gpio/tegra186_gpio.c
index 6626b5415a38..cf973e2d7f26 100644
--- a/drivers/gpio/tegra186_gpio.c
+++ b/drivers/gpio/tegra186_gpio.c
@@ -14,6 +14,7 @@
 #include <asm/gpio.h>
 #include <dm/device-internal.h>
 #include <dt-bindings/gpio/gpio.h>
+#include <linux/errno.h>
 #include "tegra186_gpio_priv.h"
 
 struct tegra186_gpio_port_data {
diff --git a/drivers/gpio/tegra_gpio.c b/drivers/gpio/tegra_gpio.c
index 912577a57191..c002e6864dd6 100644
--- a/drivers/gpio/tegra_gpio.c
+++ b/drivers/gpio/tegra_gpio.c
@@ -22,6 +22,7 @@
 #include <asm/gpio.h>
 #include <dm/device-internal.h>
 #include <dt-bindings/gpio/gpio.h>
+#include <linux/errno.h>
 
 static const int CONFIG_SFIO = 0;
 static const int CONFIG_GPIO = 1;
diff --git a/drivers/gpio/vybrid_gpio.c b/drivers/gpio/vybrid_gpio.c
index 82ae6d889411..99f5d07cca0d 100644
--- a/drivers/gpio/vybrid_gpio.c
+++ b/drivers/gpio/vybrid_gpio.c
@@ -13,6 +13,7 @@
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/io.h>
 #include <malloc.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/gpio/xilinx_gpio.c b/drivers/gpio/xilinx_gpio.c
index 6ee0757e03c4..2fb39ca0382b 100644
--- a/drivers/gpio/xilinx_gpio.c
+++ b/drivers/gpio/xilinx_gpio.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <linux/list.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
diff --git a/drivers/hwspinlock/hwspinlock-uclass.c b/drivers/hwspinlock/hwspinlock-uclass.c
index 6100fdfd0a5c..14bfc6ae1b69 100644
--- a/drivers/hwspinlock/hwspinlock-uclass.c
+++ b/drivers/hwspinlock/hwspinlock-uclass.c
@@ -13,6 +13,7 @@
 #include <dm/device-internal.h>
 #include <dm/device_compat.h>
 #include <linux/compat.h>
+#include <linux/errno.h>
 
 static inline const struct hwspinlock_ops *
 hwspinlock_dev_ops(struct udevice *dev)
diff --git a/drivers/hwspinlock/stm32_hwspinlock.c b/drivers/hwspinlock/stm32_hwspinlock.c
index 8be585a0c866..ea54063c19b3 100644
--- a/drivers/hwspinlock/stm32_hwspinlock.c
+++ b/drivers/hwspinlock/stm32_hwspinlock.c
@@ -10,6 +10,7 @@
 #include <malloc.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #define STM32_MUTEX_COREID	BIT(8)
 #define STM32_MUTEX_LOCK_BIT	BIT(31)
diff --git a/drivers/i2c/ast_i2c.c b/drivers/i2c/ast_i2c.c
index 214362d04bb3..f0d830e5636e 100644
--- a/drivers/i2c/ast_i2c.c
+++ b/drivers/i2c/ast_i2c.c
@@ -16,6 +16,7 @@
 #include <asm/arch/scu_ast2500.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 
 #include "ast_i2c.h"
 
diff --git a/drivers/i2c/at91_i2c.c b/drivers/i2c/at91_i2c.c
index 57fbb0ce2620..b825599dba54 100644
--- a/drivers/i2c/at91_i2c.c
+++ b/drivers/i2c/at91_i2c.c
@@ -16,6 +16,7 @@
 #include <fdtdec.h>
 #include <i2c.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <mach/clk.h>
 
 #include "at91_i2c.h"
diff --git a/drivers/i2c/cros_ec_ldo.c b/drivers/i2c/cros_ec_ldo.c
index c593540ac138..13b9973b543d 100644
--- a/drivers/i2c/cros_ec_ldo.c
+++ b/drivers/i2c/cros_ec_ldo.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <i2c.h>
 #include <log.h>
+#include <linux/errno.h>
 #include <power/tps65090.h>
 
 static int cros_ec_ldo_set_bus_speed(struct udevice *dev, unsigned int speed)
diff --git a/drivers/i2c/davinci_i2c.c b/drivers/i2c/davinci_i2c.c
index b4bd22fcc85a..694172106c1c 100644
--- a/drivers/i2c/davinci_i2c.c
+++ b/drivers/i2c/davinci_i2c.c
@@ -20,6 +20,7 @@
 #include <asm/arch/i2c_defs.h>
 #include <asm/io.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include "davinci_i2c.h"
 
 #ifdef CONFIG_DM_I2C
diff --git a/drivers/i2c/designware_i2c.c b/drivers/i2c/designware_i2c.c
index 6ea5a31160be..e32bfbc2c290 100644
--- a/drivers/i2c/designware_i2c.c
+++ b/drivers/i2c/designware_i2c.c
@@ -16,6 +16,7 @@
 #include <time.h>
 #include <asm/io.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include "designware_i2c.h"
 #include <dm/device_compat.h>
 #include <linux/err.h>
diff --git a/drivers/i2c/designware_i2c_pci.c b/drivers/i2c/designware_i2c_pci.c
index 946506b89b28..50649710aae3 100644
--- a/drivers/i2c/designware_i2c_pci.c
+++ b/drivers/i2c/designware_i2c_pci.c
@@ -16,6 +16,7 @@
 #include <dm/acpi.h>
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
+#include <linux/errno.h>
 #include "designware_i2c.h"
 
 enum {
diff --git a/drivers/i2c/exynos_hs_i2c.c b/drivers/i2c/exynos_hs_i2c.c
index 34d10abde067..c334755a2764 100644
--- a/drivers/i2c/exynos_hs_i2c.c
+++ b/drivers/i2c/exynos_hs_i2c.c
@@ -15,6 +15,7 @@
 #include <asm/arch/pinmux.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include "s3c24x0_i2c.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/i2c/fsl_i2c.c b/drivers/i2c/fsl_i2c.c
index c2000104b51f..ad63c108a03d 100644
--- a/drivers/i2c/fsl_i2c.c
+++ b/drivers/i2c/fsl_i2c.c
@@ -18,6 +18,7 @@
 #include <dm.h>
 #include <mapmem.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 /* The maximum number of microseconds we will wait until another master has
diff --git a/drivers/i2c/i2c-cortina.c b/drivers/i2c/i2c-cortina.c
index 4575ab6c40ce..aa7f3a0264ec 100644
--- a/drivers/i2c/i2c-cortina.c
+++ b/drivers/i2c/i2c-cortina.c
@@ -12,6 +12,7 @@
 #include <asm/io.h>
 #include <dm.h>
 #include <mapmem.h>
+#include <linux/errno.h>
 #include "i2c-cortina.h"
 
 static void set_speed(struct i2c_regs *regs, int i2c_spd)
diff --git a/drivers/i2c/i2c-gpio.c b/drivers/i2c/i2c-gpio.c
index fe90abd24a6d..c29e5d7def0f 100644
--- a/drivers/i2c/i2c-gpio.c
+++ b/drivers/i2c/i2c-gpio.c
@@ -13,6 +13,7 @@
 #include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 #define DEFAULT_UDELAY	5
diff --git a/drivers/i2c/i2c-uclass.c b/drivers/i2c/i2c-uclass.c
index 3b7db392b677..9e2d5dd0b122 100644
--- a/drivers/i2c/i2c-uclass.c
+++ b/drivers/i2c/i2c-uclass.c
@@ -18,6 +18,7 @@
 #include <asm/gpio.h>
 #endif
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #define I2C_MAX_OFFSET_LEN	4
diff --git a/drivers/i2c/i2c-versatile.c b/drivers/i2c/i2c-versatile.c
index 62831522bd33..f78b12a560c3 100644
--- a/drivers/i2c/i2c-versatile.c
+++ b/drivers/i2c/i2c-versatile.c
@@ -13,6 +13,7 @@
 #include <clk.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 
 #define I2C_CONTROL_REG		0x00
diff --git a/drivers/i2c/ihs_i2c.c b/drivers/i2c/ihs_i2c.c
index f6cd1222b876..31e8cc5d8eb2 100644
--- a/drivers/i2c/ihs_i2c.c
+++ b/drivers/i2c/ihs_i2c.c
@@ -17,6 +17,7 @@
 #include <asm/unaligned.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #ifdef CONFIG_DM_I2C
diff --git a/drivers/i2c/imx_lpi2c.c b/drivers/i2c/imx_lpi2c.c
index eeb35e050b76..f7186639d185 100644
--- a/drivers/i2c/imx_lpi2c.c
+++ b/drivers/i2c/imx_lpi2c.c
@@ -17,6 +17,7 @@
 #include <fdtdec.h>
 #include <i2c.h>
 #include <dm/device_compat.h>
+#include <linux/errno.h>
 
 #define LPI2C_FIFO_SIZE 4
 #define LPI2C_NACK_TOUT_MS 1
diff --git a/drivers/i2c/intel_i2c.c b/drivers/i2c/intel_i2c.c
index 57ff9ec2a4a7..cbda069131ac 100644
--- a/drivers/i2c/intel_i2c.c
+++ b/drivers/i2c/intel_i2c.c
@@ -16,6 +16,7 @@
 #include <time.h>
 #include <vsprintf.h>
 #include <asm/io.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 /* PCI Configuration Space (D31:F3): SMBus */
diff --git a/drivers/i2c/iproc_i2c.c b/drivers/i2c/iproc_i2c.c
index 4231c0c617f0..b5d865d66ba6 100644
--- a/drivers/i2c/iproc_i2c.c
+++ b/drivers/i2c/iproc_i2c.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <config.h>
 #include <dm.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include "errno.h"
 #include <i2c.h>
diff --git a/drivers/i2c/meson_i2c.c b/drivers/i2c/meson_i2c.c
index b133aa1175ea..051b238e1668 100644
--- a/drivers/i2c/meson_i2c.c
+++ b/drivers/i2c/meson_i2c.c
@@ -12,6 +12,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 
 #define I2C_TIMEOUT_MS		100
 
diff --git a/drivers/i2c/muxes/i2c-arb-gpio-challenge.c b/drivers/i2c/muxes/i2c-arb-gpio-challenge.c
index 14ead6e27538..2b9e0ba585ae 100644
--- a/drivers/i2c/muxes/i2c-arb-gpio-challenge.c
+++ b/drivers/i2c/muxes/i2c-arb-gpio-challenge.c
@@ -15,6 +15,7 @@
 #include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/i2c/muxes/i2c-mux-uclass.c b/drivers/i2c/muxes/i2c-mux-uclass.c
index 8f6d1547f169..1af7b68e2052 100644
--- a/drivers/i2c/muxes/i2c-mux-uclass.c
+++ b/drivers/i2c/muxes/i2c-mux-uclass.c
@@ -12,6 +12,7 @@
 #include <malloc.h>
 #include <dm/lists.h>
 #include <dm/root.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 /**
diff --git a/drivers/i2c/muxes/pca954x.c b/drivers/i2c/muxes/pca954x.c
index 87e9f9cb21d7..3140a1abb6c6 100644
--- a/drivers/i2c/muxes/pca954x.c
+++ b/drivers/i2c/muxes/pca954x.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 
 #include <asm-generic/gpio.h>
 
diff --git a/drivers/i2c/mv_i2c.c b/drivers/i2c/mv_i2c.c
index 1850dc6a5678..37d04bf11e95 100644
--- a/drivers/i2c/mv_i2c.c
+++ b/drivers/i2c/mv_i2c.c
@@ -23,6 +23,7 @@
 #include <stdio.h>
 #include <asm/io.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include "mv_i2c.h"
 
diff --git a/drivers/i2c/nx_i2c.c b/drivers/i2c/nx_i2c.c
index af58c2c76efa..738796788af8 100644
--- a/drivers/i2c/nx_i2c.c
+++ b/drivers/i2c/nx_i2c.c
@@ -9,6 +9,7 @@
 #include <asm/arch/clk.h>
 #include <asm/arch/nx_gpio.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 #define I2C_WRITE       0
 #define I2C_READ        1
diff --git a/drivers/i2c/octeon_i2c.c b/drivers/i2c/octeon_i2c.c
index ef04ae5698a2..19b7622b4181 100644
--- a/drivers/i2c/octeon_i2c.c
+++ b/drivers/i2c/octeon_i2c.c
@@ -13,6 +13,7 @@
 #include <linux/bitfield.h>
 #include <linux/compat.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 #define TWSI_SW_TWSI		0x00
 #define TWSI_TWSI_SW		0x08
diff --git a/drivers/i2c/omap24xx_i2c.c b/drivers/i2c/omap24xx_i2c.c
index db0812c17ec1..b8cfc69c6cc9 100644
--- a/drivers/i2c/omap24xx_i2c.c
+++ b/drivers/i2c/omap24xx_i2c.c
@@ -44,6 +44,7 @@
 #include <log.h>
 #include <stdio.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 #include <asm/io.h>
diff --git a/drivers/i2c/rcar_i2c.c b/drivers/i2c/rcar_i2c.c
index 4267bbfa5a96..1fe207e7bc8f 100644
--- a/drivers/i2c/rcar_i2c.c
+++ b/drivers/i2c/rcar_i2c.c
@@ -20,6 +20,7 @@
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 #define RCAR_I2C_ICSCR			0x00 /* slave ctrl */
 #define RCAR_I2C_ICMCR			0x04 /* master ctrl */
diff --git a/drivers/i2c/rcar_iic.c b/drivers/i2c/rcar_iic.c
index cad0a623d363..dd0e921725be 100644
--- a/drivers/i2c/rcar_iic.c
+++ b/drivers/i2c/rcar_iic.c
@@ -16,6 +16,7 @@
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 struct rcar_iic_priv {
 	void __iomem		*base;
diff --git a/drivers/i2c/rk_i2c.c b/drivers/i2c/rk_i2c.c
index 81d8e1eb11d4..98a0aee9b0ef 100644
--- a/drivers/i2c/rk_i2c.c
+++ b/drivers/i2c/rk_i2c.c
@@ -19,6 +19,7 @@
 #include <asm/arch-rockchip/periph.h>
 #include <dm/pinctrl.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/sizes.h>
 
 /* i2c timerout */
diff --git a/drivers/i2c/s3c24x0_i2c.c b/drivers/i2c/s3c24x0_i2c.c
index 0fe92fe2357b..ae3084d549d8 100644
--- a/drivers/i2c/s3c24x0_i2c.c
+++ b/drivers/i2c/s3c24x0_i2c.c
@@ -20,6 +20,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <i2c.h>
+#include <linux/errno.h>
 #include "s3c24x0_i2c.h"
 
 #ifndef CONFIG_SYS_I2C_S3C24X0_SLAVE
diff --git a/drivers/i2c/sandbox_i2c.c b/drivers/i2c/sandbox_i2c.c
index 57b1c60fde6d..2afd17f92fc5 100644
--- a/drivers/i2c/sandbox_i2c.c
+++ b/drivers/i2c/sandbox_i2c.c
@@ -14,6 +14,7 @@
 #include <dm/acpi.h>
 #include <dm/lists.h>
 #include <dm/device-internal.h>
+#include <linux/errno.h>
 
 struct sandbox_i2c_priv {
 	bool test_mode;
diff --git a/drivers/i2c/stm32f7_i2c.c b/drivers/i2c/stm32f7_i2c.c
index 0f5c8446365e..a353f063ed96 100644
--- a/drivers/i2c/stm32f7_i2c.c
+++ b/drivers/i2c/stm32f7_i2c.c
@@ -14,6 +14,7 @@
 #include <time.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/i2c/tegra186_bpmp_i2c.c b/drivers/i2c/tegra186_bpmp_i2c.c
index 897627a12360..188821bb8789 100644
--- a/drivers/i2c/tegra186_bpmp_i2c.c
+++ b/drivers/i2c/tegra186_bpmp_i2c.c
@@ -11,6 +11,7 @@
 #include <asm/arch-tegra/bpmp_abi.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/i2c/tegra_i2c.c b/drivers/i2c/tegra_i2c.c
index 2cb51473a6c5..03687b7532be 100644
--- a/drivers/i2c/tegra_i2c.c
+++ b/drivers/i2c/tegra_i2c.c
@@ -21,6 +21,7 @@
 #include <asm/arch-tegra/tegra_i2c.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/i2c/xilinx_xiic.c b/drivers/i2c/xilinx_xiic.c
index 149bd327bdfe..aa86c6308855 100644
--- a/drivers/i2c/xilinx_xiic.c
+++ b/drivers/i2c/xilinx_xiic.c
@@ -16,6 +16,7 @@
 #include <wait_bit.h>
 #include <asm/io.h>
 #include <dm/device_compat.h>
+#include <linux/errno.h>
 
 struct xilinx_xiic_priv {
 	void __iomem		*base;
diff --git a/drivers/input/cros_ec_keyb.c b/drivers/input/cros_ec_keyb.c
index c09a66376af5..60f89562fadf 100644
--- a/drivers/input/cros_ec_keyb.c
+++ b/drivers/input/cros_ec_keyb.c
@@ -14,6 +14,7 @@
 #include <key_matrix.h>
 #include <log.h>
 #include <stdio_dev.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 enum {
diff --git a/drivers/input/i8042.c b/drivers/input/i8042.c
index b484cebfb4e7..b2320d648f3e 100644
--- a/drivers/input/i8042.c
+++ b/drivers/input/i8042.c
@@ -17,6 +17,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/input/keyboard-uclass.c b/drivers/input/keyboard-uclass.c
index 2007032e10cd..fe73cd7bfd0f 100644
--- a/drivers/input/keyboard-uclass.c
+++ b/drivers/input/keyboard-uclass.c
@@ -8,6 +8,7 @@
 #include <keyboard.h>
 #include <log.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 static int keyboard_start(struct stdio_dev *sdev)
diff --git a/drivers/input/tegra-kbc.c b/drivers/input/tegra-kbc.c
index 3654510858f1..af289c8badbc 100644
--- a/drivers/input/tegra-kbc.c
+++ b/drivers/input/tegra-kbc.c
@@ -19,6 +19,7 @@
 #include <asm/arch/funcmux.h>
 #include <asm/arch-tegra/timer.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/input.h>
 #include <linux/string.h>
 
diff --git a/drivers/led/led-uclass.c b/drivers/led/led-uclass.c
index ae9c3cbd7d3a..70a94a19cd72 100644
--- a/drivers/led/led-uclass.c
+++ b/drivers/led/led-uclass.c
@@ -11,6 +11,7 @@
 #include <dm/device-internal.h>
 #include <dm/root.h>
 #include <dm/uclass-internal.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 int led_get_by_label(const char *label, struct udevice **devp)
diff --git a/drivers/led/led_bcm6328.c b/drivers/led/led_bcm6328.c
index 52946835de33..4a07bcc8a705 100644
--- a/drivers/led/led_bcm6328.c
+++ b/drivers/led/led_bcm6328.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <asm/io.h>
 #include <dm/lists.h>
+#include <linux/errno.h>
 
 #define LEDS_MAX			24
 
diff --git a/drivers/led/led_bcm6358.c b/drivers/led/led_bcm6358.c
index 307d418a1789..019a84813ac5 100644
--- a/drivers/led/led_bcm6358.c
+++ b/drivers/led/led_bcm6358.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <dm/lists.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 #define LEDS_MAX		32
 #define LEDS_WAIT		100
diff --git a/drivers/led/led_bcm6858.c b/drivers/led/led_bcm6858.c
index b415d8b2b404..c0f5a1a7bb65 100644
--- a/drivers/led/led_bcm6858.c
+++ b/drivers/led/led_bcm6858.c
@@ -15,6 +15,7 @@
 #include <asm/io.h>
 #include <dm/lists.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #define LEDS_MAX		32
 #define LEDS_WAIT		100
diff --git a/drivers/led/led_gpio.c b/drivers/led/led_gpio.c
index ef9b61ee626b..c576c0eae526 100644
--- a/drivers/led/led_gpio.c
+++ b/drivers/led/led_gpio.c
@@ -12,6 +12,7 @@
 #include <malloc.h>
 #include <asm/gpio.h>
 #include <dm/lists.h>
+#include <linux/errno.h>
 
 struct led_gpio_priv {
 	struct gpio_desc gpio;
diff --git a/drivers/mailbox/k3-sec-proxy.c b/drivers/mailbox/k3-sec-proxy.c
index 1edb7dfd56cc..d9516bd59e40 100644
--- a/drivers/mailbox/k3-sec-proxy.c
+++ b/drivers/mailbox/k3-sec-proxy.c
@@ -13,6 +13,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm/device_compat.h>
+#include <linux/errno.h>
 #include <linux/types.h>
 #include <linux/bitops.h>
 #include <linux/soc/ti/k3-sec-proxy.h>
diff --git a/drivers/mailbox/mailbox-uclass.c b/drivers/mailbox/mailbox-uclass.c
index c972d8460891..233fa4f715fe 100644
--- a/drivers/mailbox/mailbox-uclass.c
+++ b/drivers/mailbox/mailbox-uclass.c
@@ -10,6 +10,7 @@
 #include <mailbox-uclass.h>
 #include <malloc.h>
 #include <time.h>
+#include <linux/errno.h>
 
 static inline struct mbox_ops *mbox_dev_ops(struct udevice *dev)
 {
diff --git a/drivers/mailbox/sandbox-mbox.c b/drivers/mailbox/sandbox-mbox.c
index 19704dd5da9e..4dd5371fc198 100644
--- a/drivers/mailbox/sandbox-mbox.c
+++ b/drivers/mailbox/sandbox-mbox.c
@@ -10,6 +10,7 @@
 #include <malloc.h>
 #include <asm/io.h>
 #include <asm/mbox.h>
+#include <linux/errno.h>
 
 #define SANDBOX_MBOX_CHANNELS 2
 
diff --git a/drivers/mailbox/stm32-ipcc.c b/drivers/mailbox/stm32-ipcc.c
index b8bf356b4ac2..0c72f5e7c3d8 100644
--- a/drivers/mailbox/stm32-ipcc.c
+++ b/drivers/mailbox/stm32-ipcc.c
@@ -12,6 +12,7 @@
 #include <asm/io.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 /*
  * IPCC has one set of registers per CPU
diff --git a/drivers/mailbox/tegra-hsp.c b/drivers/mailbox/tegra-hsp.c
index e91dac201d2a..4b71e3ca7efb 100644
--- a/drivers/mailbox/tegra-hsp.c
+++ b/drivers/mailbox/tegra-hsp.c
@@ -11,6 +11,7 @@
 #include <mailbox-uclass.h>
 #include <dt-bindings/mailbox/tegra186-hsp.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #define TEGRA_HSP_INT_DIMENSIONING		0x380
 #define TEGRA_HSP_INT_DIMENSIONING_NSI_SHIFT	16
diff --git a/drivers/mailbox/zynqmp-ipi.c b/drivers/mailbox/zynqmp-ipi.c
index f206a27a79e4..ef8c93fa4607 100644
--- a/drivers/mailbox/zynqmp-ipi.c
+++ b/drivers/mailbox/zynqmp-ipi.c
@@ -11,6 +11,7 @@
 #include <dm.h>
 #include <mailbox-uclass.h>
 #include <dm/device_compat.h>
+#include <linux/errno.h>
 #include <mach/sys_proto.h>
 #include <linux/ioport.h>
 #include <linux/io.h>
diff --git a/drivers/misc/atsha204a-i2c.c b/drivers/misc/atsha204a-i2c.c
index 779e1a17607a..5262c005a04e 100644
--- a/drivers/misc/atsha204a-i2c.c
+++ b/drivers/misc/atsha204a-i2c.c
@@ -18,6 +18,7 @@
 #include <log.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
 
diff --git a/drivers/misc/cros_ec_i2c.c b/drivers/misc/cros_ec_i2c.c
index e3678d0213a0..782ee703eb60 100644
--- a/drivers/misc/cros_ec_i2c.c
+++ b/drivers/misc/cros_ec_i2c.c
@@ -18,6 +18,7 @@
 #include <cros_ec.h>
 #include <log.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #ifdef DEBUG_TRACE
diff --git a/drivers/misc/cros_ec_lpc.c b/drivers/misc/cros_ec_lpc.c
index caca59471f17..6c9c9593a7c0 100644
--- a/drivers/misc/cros_ec_lpc.c
+++ b/drivers/misc/cros_ec_lpc.c
@@ -20,6 +20,7 @@
 #include <stdio.h>
 #include <time.h>
 #include <asm/io.h>
+#include <linux/errno.h>
 
 #ifdef DEBUG_TRACE
 #define debug_trace(fmt, b...)	debug(fmt, ##b)
diff --git a/drivers/misc/cros_ec_sandbox.c b/drivers/misc/cros_ec_sandbox.c
index 308b34e2f4bf..5a5af51eb39f 100644
--- a/drivers/misc/cros_ec_sandbox.c
+++ b/drivers/misc/cros_ec_sandbox.c
@@ -15,6 +15,7 @@
 #include <os.h>
 #include <stdio.h>
 #include <time.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <u-boot/sha256.h>
 #include <spi.h>
diff --git a/drivers/misc/cros_ec_spi.c b/drivers/misc/cros_ec_spi.c
index a94e216cac7f..bb7b8c1b1de6 100644
--- a/drivers/misc/cros_ec_spi.c
+++ b/drivers/misc/cros_ec_spi.c
@@ -20,6 +20,7 @@
 #include <spi.h>
 #include <stdio.h>
 #include <time.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 int cros_ec_spi_packet(struct udevice *udev, int out_bytes, int in_bytes)
diff --git a/drivers/misc/fs_loader.c b/drivers/misc/fs_loader.c
index f6383a023985..a4d048afd7f6 100644
--- a/drivers/misc/fs_loader.c
+++ b/drivers/misc/fs_loader.c
@@ -12,6 +12,7 @@
 #include <fs_loader.h>
 #include <log.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <mapmem.h>
 #include <malloc.h>
diff --git a/drivers/misc/gdsys_ioep.c b/drivers/misc/gdsys_ioep.c
index 8c65f1473c3f..22afebd9ab07 100644
--- a/drivers/misc/gdsys_ioep.c
+++ b/drivers/misc/gdsys_ioep.c
@@ -16,6 +16,7 @@
 #include <log.h>
 #include <misc.h>
 #include <regmap.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include "gdsys_ioep.h"
diff --git a/drivers/misc/gdsys_soc.c b/drivers/misc/gdsys_soc.c
index b4c721c6fe63..09216f0e398e 100644
--- a/drivers/misc/gdsys_soc.c
+++ b/drivers/misc/gdsys_soc.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <log.h>
 #include <dm/lists.h>
+#include <linux/errno.h>
 
 #include "gdsys_soc.h"
 
diff --git a/drivers/misc/i2c_eeprom.c b/drivers/misc/i2c_eeprom.c
index 45c34d388c8a..0e1ba165f91d 100644
--- a/drivers/misc/i2c_eeprom.c
+++ b/drivers/misc/i2c_eeprom.c
@@ -7,6 +7,7 @@
 #include <eeprom.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/kernel.h>
 #include <dm.h>
 #include <dm/device-internal.h>
diff --git a/drivers/misc/i2c_eeprom_emul.c b/drivers/misc/i2c_eeprom_emul.c
index 925120ea0d58..9f0d89673d97 100644
--- a/drivers/misc/i2c_eeprom_emul.c
+++ b/drivers/misc/i2c_eeprom_emul.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <asm/test.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #ifdef DEBUG
diff --git a/drivers/misc/ihs_fpga.c b/drivers/misc/ihs_fpga.c
index 6a61a22c071f..9dbb857101d0 100644
--- a/drivers/misc/ihs_fpga.c
+++ b/drivers/misc/ihs_fpga.c
@@ -17,6 +17,7 @@
 #include <asm/gpio.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include "ihs_fpga.h"
diff --git a/drivers/misc/imx8/fuse.c b/drivers/misc/imx8/fuse.c
index e25d68e6a2e8..c3a7d3a40b3b 100644
--- a/drivers/misc/imx8/fuse.c
+++ b/drivers/misc/imx8/fuse.c
@@ -12,6 +12,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/global_data.h>
 #include <linux/arm-smccc.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/misc/imx8/scu.c b/drivers/misc/imx8/scu.c
index ce1a35a552b3..74cab6294820 100644
--- a/drivers/misc/imx8/scu.c
+++ b/drivers/misc/imx8/scu.c
@@ -16,6 +16,7 @@
 #include <dm/device-internal.h>
 #include <asm/arch/sci/sci.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/iopoll.h>
 #include <misc.h>
 
diff --git a/drivers/misc/irq-uclass.c b/drivers/misc/irq-uclass.c
index 94fa233f193d..6b6813e1fc50 100644
--- a/drivers/misc/irq-uclass.c
+++ b/drivers/misc/irq-uclass.c
@@ -12,6 +12,7 @@
 #include <irq.h>
 #include <log.h>
 #include <dm/device-internal.h>
+#include <linux/errno.h>
 
 int irq_route_pmc_gpio_gpe(struct udevice *dev, uint pmc_gpe_num)
 {
diff --git a/drivers/misc/irq_sandbox.c b/drivers/misc/irq_sandbox.c
index a2511b32fcd6..14366febd382 100644
--- a/drivers/misc/irq_sandbox.c
+++ b/drivers/misc/irq_sandbox.c
@@ -10,6 +10,7 @@
 #include <irq.h>
 #include <acpi/acpi_device.h>
 #include <asm/test.h>
+#include <linux/errno.h>
 
 /**
  * struct sandbox_irq_priv - private data for this driver
diff --git a/drivers/misc/k3_avs.c b/drivers/misc/k3_avs.c
index 5aabac793093..621ce8b28d9c 100644
--- a/drivers/misc/k3_avs.c
+++ b/drivers/misc/k3_avs.c
@@ -17,6 +17,7 @@
 #include <k3-avs.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <power/regulator.h>
 
 #define AM6_VTM_DEVINFO(i)	(priv->base + 0x100 + 0x20 * (i))
diff --git a/drivers/misc/k3_esm.c b/drivers/misc/k3_esm.c
index cc2a23dd6638..82aa2545c084 100644
--- a/drivers/misc/k3_esm.c
+++ b/drivers/misc/k3_esm.c
@@ -13,6 +13,7 @@
 #include <asm/io.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #define ESM_SFT_RST			0x0c
 #define ESM_SFT_RST_KEY			0x0f
diff --git a/drivers/misc/microchip_flexcom.c b/drivers/misc/microchip_flexcom.c
index 64cc4ae7b61e..0886fbdd8654 100644
--- a/drivers/misc/microchip_flexcom.c
+++ b/drivers/misc/microchip_flexcom.c
@@ -11,6 +11,7 @@
 #include <misc.h>
 #include <asm/io.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 
 struct microchip_flexcom_regs {
 	u32 cr;
diff --git a/drivers/misc/misc-uclass.c b/drivers/misc/misc-uclass.c
index 55381edc9808..c0db58b89679 100644
--- a/drivers/misc/misc-uclass.c
+++ b/drivers/misc/misc-uclass.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <misc.h>
+#include <linux/errno.h>
 
 /*
  * Implement a  miscellaneous uclass for those do not fit other more
diff --git a/drivers/misc/misc_sandbox.c b/drivers/misc/misc_sandbox.c
index 9ea2a35db604..4e3e8a4a3640 100644
--- a/drivers/misc/misc_sandbox.c
+++ b/drivers/misc/misc_sandbox.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <misc.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 struct misc_sandbox_priv {
diff --git a/drivers/misc/mpc83xx_serdes.c b/drivers/misc/mpc83xx_serdes.c
index b2f23e1343bf..925e6ec3ab83 100644
--- a/drivers/misc/mpc83xx_serdes.c
+++ b/drivers/misc/mpc83xx_serdes.c
@@ -15,6 +15,7 @@
 #include <mapmem.h>
 #include <misc.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include "mpc83xx_serdes.h"
diff --git a/drivers/misc/p2sb-uclass.c b/drivers/misc/p2sb-uclass.c
index b5219df46be2..149f3d28ebf2 100644
--- a/drivers/misc/p2sb-uclass.c
+++ b/drivers/misc/p2sb-uclass.c
@@ -15,6 +15,7 @@
 #include <spl.h>
 #include <asm/io.h>
 #include <dm/uclass-internal.h>
+#include <linux/errno.h>
 
 #define PCR_COMMON_IOSF_1_0	1
 
diff --git a/drivers/misc/p2sb_emul.c b/drivers/misc/p2sb_emul.c
index a4b6dba51620..3c17f6de3f6a 100644
--- a/drivers/misc/p2sb_emul.c
+++ b/drivers/misc/p2sb_emul.c
@@ -16,6 +16,7 @@
 #include <pci.h>
 #include <asm/test.h>
 #include <p2sb.h>
+#include <linux/errno.h>
 
 /**
  * struct p2sb_emul_platdata - platform data for this device
diff --git a/drivers/misc/pca9551_led.c b/drivers/misc/pca9551_led.c
index cdc4390f8155..312192fd62d3 100644
--- a/drivers/misc/pca9551_led.c
+++ b/drivers/misc/pca9551_led.c
@@ -7,6 +7,7 @@
 #include <errno.h>
 #include <i2c.h>
 #include <status_led.h>
+#include <linux/errno.h>
 
 #ifndef CONFIG_PCA9551_I2C_ADDR
 #error "CONFIG_PCA9551_I2C_ADDR not defined!"
diff --git a/drivers/misc/pwrseq-uclass.c b/drivers/misc/pwrseq-uclass.c
index c8f6c46069b7..220567ee2798 100644
--- a/drivers/misc/pwrseq-uclass.c
+++ b/drivers/misc/pwrseq-uclass.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <dm.h>
 #include <pwrseq.h>
+#include <linux/errno.h>
 
 int pwrseq_set_power(struct udevice *dev, bool enable)
 {
diff --git a/drivers/misc/qfw.c b/drivers/misc/qfw.c
index 5c3ff8e52f67..c5629183f860 100644
--- a/drivers/misc/qfw.c
+++ b/drivers/misc/qfw.c
@@ -14,6 +14,7 @@
 #ifdef CONFIG_GENERATE_ACPI_TABLE
 #include <asm/tables.h>
 #endif
+#include <linux/errno.h>
 #include <linux/list.h>
 #include <linux/string.h>
 
diff --git a/drivers/misc/rockchip-otp.c b/drivers/misc/rockchip-otp.c
index 482de69070da..a8563a305d0c 100644
--- a/drivers/misc/rockchip-otp.c
+++ b/drivers/misc/rockchip-otp.c
@@ -11,6 +11,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <misc.h>
+#include <linux/errno.h>
 
 /* OTP Register Offsets */
 #define OTPC_SBPI_CTRL			0x0020
diff --git a/drivers/misc/sifive-otp.c b/drivers/misc/sifive-otp.c
index 799d75b08738..97cb40b542ca 100644
--- a/drivers/misc/sifive-otp.c
+++ b/drivers/misc/sifive-otp.c
@@ -23,6 +23,7 @@
 #include <dm/read.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <misc.h>
 #include <linux/printk.h>
diff --git a/drivers/misc/smsc_sio1007.c b/drivers/misc/smsc_sio1007.c
index 3b7b1c8bcf2a..9fe6a18f59e8 100644
--- a/drivers/misc/smsc_sio1007.c
+++ b/drivers/misc/smsc_sio1007.c
@@ -7,6 +7,7 @@
 #include <asm/io.h>
 #include <errno.h>
 #include <smsc_sio1007.h>
+#include <linux/errno.h>
 
 static inline u8 sio1007_read(int port, int reg)
 {
diff --git a/drivers/misc/stm32_rcc.c b/drivers/misc/stm32_rcc.c
index b82fe54c6009..9a03679d21ad 100644
--- a/drivers/misc/stm32_rcc.c
+++ b/drivers/misc/stm32_rcc.c
@@ -12,6 +12,7 @@
 #include <dm/device-internal.h>
 #include <dm/device_compat.h>
 #include <dm/lists.h>
+#include <linux/errno.h>
 
 struct stm32_rcc_clk stm32_rcc_clk_f42x = {
 	.drv_name = "stm32fx_rcc_clock",
diff --git a/drivers/misc/stm32mp_fuse.c b/drivers/misc/stm32mp_fuse.c
index 530a7824e3ec..2d8c43b123fc 100644
--- a/drivers/misc/stm32mp_fuse.c
+++ b/drivers/misc/stm32mp_fuse.c
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <dm/device.h>
 #include <dm/uclass.h>
+#include <linux/errno.h>
 #include <power/stpmic1.h>
 
 #define STM32MP_OTP_BANK	0
diff --git a/drivers/misc/swap_case.c b/drivers/misc/swap_case.c
index 07c67577d546..64f29f86baa3 100644
--- a/drivers/misc/swap_case.c
+++ b/drivers/misc/swap_case.c
@@ -13,6 +13,7 @@
 #include <pci.h>
 #include <asm/test.h>
 #include <linux/ctype.h>
+#include <linux/errno.h>
 
 /**
  * struct swap_case_platdata - platform data for this device
diff --git a/drivers/misc/tegra186_bpmp.c b/drivers/misc/tegra186_bpmp.c
index c9079b86a7a0..24ff0cd120d0 100644
--- a/drivers/misc/tegra186_bpmp.c
+++ b/drivers/misc/tegra186_bpmp.c
@@ -17,6 +17,7 @@
 #include <asm/arch-tegra/ivc.h>
 #include <linux/bitops.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/misc/vexpress_config.c b/drivers/misc/vexpress_config.c
index 9a9c5f75573e..2b1d19a14a7e 100644
--- a/drivers/misc/vexpress_config.c
+++ b/drivers/misc/vexpress_config.c
@@ -12,6 +12,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <misc.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #define SYS_CFGDATA		0xa0
diff --git a/drivers/mmc/am654_sdhci.c b/drivers/mmc/am654_sdhci.c
index d9e991355b7f..eea327ace76e 100644
--- a/drivers/mmc/am654_sdhci.c
+++ b/drivers/mmc/am654_sdhci.c
@@ -16,6 +16,7 @@
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 
 /* CTL_CFG Registers */
 #define CTL_CFG_2		0x14
diff --git a/drivers/mmc/atmel_sdhci.c b/drivers/mmc/atmel_sdhci.c
index 1781d7a3f914..cb838a398a63 100644
--- a/drivers/mmc/atmel_sdhci.c
+++ b/drivers/mmc/atmel_sdhci.c
@@ -12,6 +12,7 @@
 #include <stdio.h>
 #include <asm/arch/clk.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 
 #define ATMEL_SDHC_MIN_FREQ	400000
 #define ATMEL_SDHC_GCK_RATE	240000000
diff --git a/drivers/mmc/bcm2835_sdhci.c b/drivers/mmc/bcm2835_sdhci.c
index 7a410d1dd361..ac1a421cd3e9 100644
--- a/drivers/mmc/bcm2835_sdhci.c
+++ b/drivers/mmc/bcm2835_sdhci.c
@@ -45,6 +45,7 @@
 #include <time.h>
 #include <asm/arch/msg.h>
 #include <asm/arch/mbox.h>
+#include <linux/errno.h>
 #include <mach/sdhci.h>
 #include <mach/timer.h>
 
diff --git a/drivers/mmc/bcm2835_sdhost.c b/drivers/mmc/bcm2835_sdhost.c
index cf362f620ae1..97ca2ce029af 100644
--- a/drivers/mmc/bcm2835_sdhost.c
+++ b/drivers/mmc/bcm2835_sdhost.c
@@ -43,6 +43,7 @@
 #include <linux/bug.h>
 #include <linux/compat.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/iopoll.h>
 #include <linux/sizes.h>
diff --git a/drivers/mmc/bcmstb_sdhci.c b/drivers/mmc/bcmstb_sdhci.c
index 5269aa77cebd..5c4d227c6f00 100644
--- a/drivers/mmc/bcmstb_sdhci.c
+++ b/drivers/mmc/bcmstb_sdhci.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <linux/errno.h>
 #include <mach/sdhci.h>
 #include <malloc.h>
 #include <sdhci.h>
diff --git a/drivers/mmc/ca_dw_mmc.c b/drivers/mmc/ca_dw_mmc.c
index 8ae5bd41454e..fcb2700a7a8f 100644
--- a/drivers/mmc/ca_dw_mmc.c
+++ b/drivers/mmc/ca_dw_mmc.c
@@ -8,6 +8,7 @@
 #include <dwmmc.h>
 #include <fdtdec.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <malloc.h>
 #include <errno.h>
diff --git a/drivers/mmc/davinci_mmc.c b/drivers/mmc/davinci_mmc.c
index f4edff7566e7..f8dc47bc2398 100644
--- a/drivers/mmc/davinci_mmc.c
+++ b/drivers/mmc/davinci_mmc.c
@@ -19,6 +19,7 @@
 #include <asm-generic/gpio.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #define WATCHDOG_COUNT		(100000)
diff --git a/drivers/mmc/dw_mmc.c b/drivers/mmc/dw_mmc.c
index ce7cfb5930e5..8c690c3ce127 100644
--- a/drivers/mmc/dw_mmc.c
+++ b/drivers/mmc/dw_mmc.c
@@ -18,6 +18,7 @@
 #include <wait_bit.h>
 #include <asm/cache.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <power/regulator.h>
 
 #define PAGE_SIZE 4096
diff --git a/drivers/mmc/exynos_dw_mmc.c b/drivers/mmc/exynos_dw_mmc.c
index 55d3ad1692c5..f54413aa9e5c 100644
--- a/drivers/mmc/exynos_dw_mmc.c
+++ b/drivers/mmc/exynos_dw_mmc.c
@@ -9,6 +9,7 @@
 #include <fdtdec.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <malloc.h>
 #include <errno.h>
diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c
index 3aa8e943efb5..6ad270e7c2d8 100644
--- a/drivers/mmc/fsl_esdhc.c
+++ b/drivers/mmc/fsl_esdhc.c
@@ -34,6 +34,7 @@
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/mmc/fsl_esdhc_imx.c b/drivers/mmc/fsl_esdhc_imx.c
index b8f89affc33e..ffd21684d3f6 100644
--- a/drivers/mmc/fsl_esdhc_imx.c
+++ b/drivers/mmc/fsl_esdhc_imx.c
@@ -29,6 +29,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include <power/regulator.h>
diff --git a/drivers/mmc/iproc_sdhci.c b/drivers/mmc/iproc_sdhci.c
index cd9d87be98b7..216538d435a8 100644
--- a/drivers/mmc/iproc_sdhci.c
+++ b/drivers/mmc/iproc_sdhci.c
@@ -12,6 +12,7 @@
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/mmc/jz_mmc.c b/drivers/mmc/jz_mmc.c
index eec432a0df65..608e56239764 100644
--- a/drivers/mmc/jz_mmc.c
+++ b/drivers/mmc/jz_mmc.c
@@ -16,6 +16,7 @@
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <mach/jz4780.h>
 #include <wait_bit.h>
 
diff --git a/drivers/mmc/meson_gx_mmc.c b/drivers/mmc/meson_gx_mmc.c
index 2afc80ff0c5e..b804a0c83648 100644
--- a/drivers/mmc/meson_gx_mmc.c
+++ b/drivers/mmc/meson_gx_mmc.c
@@ -16,6 +16,7 @@
 #include <asm/gpio.h>
 #include <asm/arch/sd_emmc.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/log2.h>
 #include <linux/string.h>
 
diff --git a/drivers/mmc/mmc-uclass.c b/drivers/mmc/mmc-uclass.c
index 9c30e01028b7..cdc93c756c0b 100644
--- a/drivers/mmc/mmc-uclass.c
+++ b/drivers/mmc/mmc-uclass.c
@@ -14,6 +14,7 @@
 #include <dm/device_compat.h>
 #include <dm/lists.h>
 #include <linux/compat.h>
+#include <linux/errno.h>
 #include "mmc_private.h"
 
 int dm_mmc_get_b_max(struct udevice *dev, void *dst, lbaint_t blkcnt)
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index a3fdc5d63cc8..932205968960 100644
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@ -23,6 +23,7 @@
 #include <part.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include <power/regulator.h>
diff --git a/drivers/mmc/mmc_legacy.c b/drivers/mmc/mmc_legacy.c
index da2941bada8b..42077f88652c 100644
--- a/drivers/mmc/mmc_legacy.c
+++ b/drivers/mmc/mmc_legacy.c
@@ -10,6 +10,7 @@
 #include <malloc.h>
 #include <mmc.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include "mmc_private.h"
 
 static struct list_head mmc_devices;
diff --git a/drivers/mmc/mmc_spi.c b/drivers/mmc/mmc_spi.c
index f89433141738..0581adb08415 100644
--- a/drivers/mmc/mmc_spi.c
+++ b/drivers/mmc/mmc_spi.c
@@ -15,6 +15,7 @@
 #include <stdlib.h>
 #include <vsprintf.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
 #include <linux/crc7.h>
diff --git a/drivers/mmc/msm_sdhci.c b/drivers/mmc/msm_sdhci.c
index 6e61ef6b8585..0ac7529f01a2 100644
--- a/drivers/mmc/msm_sdhci.c
+++ b/drivers/mmc/msm_sdhci.c
@@ -17,6 +17,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 /* Non-standard registers needed for SDHCI startup */
diff --git a/drivers/mmc/mtk-sd.c b/drivers/mmc/mtk-sd.c
index 2fe33e07c18b..2ec53e853a97 100644
--- a/drivers/mmc/mtk-sd.c
+++ b/drivers/mmc/mtk-sd.c
@@ -18,6 +18,7 @@
 #include <dm/device_compat.h>
 #include <dm/pinctrl.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/iopoll.h>
 #include <linux/printk.h>
diff --git a/drivers/mmc/mv_sdhci.c b/drivers/mmc/mv_sdhci.c
index 775f2041a1ac..f3e44f53cb41 100644
--- a/drivers/mmc/mv_sdhci.c
+++ b/drivers/mmc/mv_sdhci.c
@@ -9,6 +9,7 @@
 #include <sdhci.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/mbus.h>
 #include <linux/string.h>
 
diff --git a/drivers/mmc/mvebu_mmc.c b/drivers/mmc/mvebu_mmc.c
index d586342a58d8..3a967ac7720e 100644
--- a/drivers/mmc/mvebu_mmc.c
+++ b/drivers/mmc/mvebu_mmc.c
@@ -21,6 +21,7 @@
 #include <asm/arch/soc.h>
 #include <mvebu_mmc.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/mmc/nexell_dw_mmc.c b/drivers/mmc/nexell_dw_mmc.c
index 046275944498..e5df2920242f 100644
--- a/drivers/mmc/nexell_dw_mmc.c
+++ b/drivers/mmc/nexell_dw_mmc.c
@@ -14,6 +14,7 @@
 #include <syscon.h>
 #include <asm/arch/reset.h>
 #include <asm/arch/clk.h>
+#include <linux/errno.h>
 
 #define DWMCI_CLKSEL			0x09C
 #define DWMCI_SHIFT_0			0x0
diff --git a/drivers/mmc/omap_hsmmc.c b/drivers/mmc/omap_hsmmc.c
index 54a34c725981..606c4a5c1c6c 100644
--- a/drivers/mmc/omap_hsmmc.c
+++ b/drivers/mmc/omap_hsmmc.c
@@ -57,6 +57,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <power/regulator.h>
 #include <thermal.h>
 
diff --git a/drivers/mmc/pci_mmc.c b/drivers/mmc/pci_mmc.c
index 0c45e1b8936e..345a330a983a 100644
--- a/drivers/mmc/pci_mmc.c
+++ b/drivers/mmc/pci_mmc.c
@@ -16,6 +16,7 @@
 #include <acpi/acpi_dp.h>
 #include <asm-generic/gpio.h>
 #include <dm/acpi.h>
+#include <linux/errno.h>
 
 struct pci_mmc_plat {
 	struct mmc_config cfg;
diff --git a/drivers/mmc/renesas-sdhi.c b/drivers/mmc/renesas-sdhi.c
index 83153c5c4c4d..4e8d2a9e509a 100644
--- a/drivers/mmc/renesas-sdhi.c
+++ b/drivers/mmc/renesas-sdhi.c
@@ -17,6 +17,7 @@
 #include <linux/compat.h>
 #include <linux/delay.h>
 #include <linux/dma-direction.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/sizes.h>
 #include <power/regulator.h>
diff --git a/drivers/mmc/rockchip_dw_mmc.c b/drivers/mmc/rockchip_dw_mmc.c
index f1dafa6ce711..6d31f9f3d306 100644
--- a/drivers/mmc/rockchip_dw_mmc.c
+++ b/drivers/mmc/rockchip_dw_mmc.c
@@ -18,6 +18,7 @@
 #include <asm/arch-rockchip/periph.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 
 struct rockchip_mmc_plat {
 #if CONFIG_IS_ENABLED(OF_PLATDATA)
diff --git a/drivers/mmc/rpmb.c b/drivers/mmc/rpmb.c
index 0d1b3eb875b3..93fdf72f3444 100644
--- a/drivers/mmc/rpmb.c
+++ b/drivers/mmc/rpmb.c
@@ -14,6 +14,7 @@
 #include <mmc.h>
 #include <sdhci.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <u-boot/sha256.h>
 #include "mmc_private.h"
diff --git a/drivers/mmc/s5p_sdhci.c b/drivers/mmc/s5p_sdhci.c
index e06662141f54..cf32ca808211 100644
--- a/drivers/mmc/s5p_sdhci.c
+++ b/drivers/mmc/s5p_sdhci.c
@@ -12,6 +12,7 @@
 #include <fdtdec.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <asm/gpio.h>
 #include <asm/arch/mmc.h>
diff --git a/drivers/mmc/sdhci-cadence.c b/drivers/mmc/sdhci-cadence.c
index b1e53e8d425a..96901bce72da 100644
--- a/drivers/mmc/sdhci-cadence.c
+++ b/drivers/mmc/sdhci-cadence.c
@@ -11,6 +11,7 @@
 #include <linux/bitfield.h>
 #include <linux/bitops.h>
 #include <linux/bug.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/iopoll.h>
 #include <linux/sizes.h>
diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c
index 9cfe0fcb9a55..f6b8625c21eb 100644
--- a/drivers/mmc/sdhci.c
+++ b/drivers/mmc/sdhci.c
@@ -22,6 +22,7 @@
 #include <linux/delay.h>
 #include <linux/dma-mapping.h>
 #include <phys2bus.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/mmc/snps_dw_mmc.c b/drivers/mmc/snps_dw_mmc.c
index f7c64312154c..f123d3fe2222 100644
--- a/drivers/mmc/snps_dw_mmc.c
+++ b/drivers/mmc/snps_dw_mmc.c
@@ -14,6 +14,7 @@
 #include <errno.h>
 #include <fdtdec.h>
 #include <dm/device_compat.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <linux/err.h>
 #include <malloc.h>
diff --git a/drivers/mmc/socfpga_dw_mmc.c b/drivers/mmc/socfpga_dw_mmc.c
index 1c3d996bcd52..9877919f4f1b 100644
--- a/drivers/mmc/socfpga_dw_mmc.c
+++ b/drivers/mmc/socfpga_dw_mmc.c
@@ -15,6 +15,7 @@
 #include <fdtdec.h>
 #include <asm/global_data.h>
 #include <dm/device_compat.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <linux/err.h>
 #include <malloc.h>
diff --git a/drivers/mmc/sti_sdhci.c b/drivers/mmc/sti_sdhci.c
index 394c4d19b567..e71b63a8fdfc 100644
--- a/drivers/mmc/sti_sdhci.c
+++ b/drivers/mmc/sti_sdhci.c
@@ -12,6 +12,7 @@
 #include <sdhci.h>
 #include <asm/arch/sdhci.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/mmc/stm32_sdmmc2.c b/drivers/mmc/stm32_sdmmc2.c
index 0bc2ecee69be..f46c9a8e5bf2 100644
--- a/drivers/mmc/stm32_sdmmc2.c
+++ b/drivers/mmc/stm32_sdmmc2.c
@@ -16,6 +16,7 @@
 #include <asm/cache.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <mmc.h>
 #include <reset.h>
diff --git a/drivers/mmc/sunxi_mmc.c b/drivers/mmc/sunxi_mmc.c
index 4152b7be0e42..7164db122fa8 100644
--- a/drivers/mmc/sunxi_mmc.c
+++ b/drivers/mmc/sunxi_mmc.c
@@ -24,6 +24,7 @@
 #include <asm/arch/mmc.h>
 #include <asm-generic/gpio.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #ifdef CONFIG_DM_MMC
diff --git a/drivers/mmc/tangier_sdhci.c b/drivers/mmc/tangier_sdhci.c
index 879e2c98a21d..622cc3ef1bea 100644
--- a/drivers/mmc/tangier_sdhci.c
+++ b/drivers/mmc/tangier_sdhci.c
@@ -5,6 +5,7 @@
 #include <common.h>
 #include <dm.h>
 #include <dm/device.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/sizes.h>
 #include <malloc.h>
diff --git a/drivers/mmc/tegra_mmc.c b/drivers/mmc/tegra_mmc.c
index e7a06ec79492..4cf183864340 100644
--- a/drivers/mmc/tegra_mmc.c
+++ b/drivers/mmc/tegra_mmc.c
@@ -23,6 +23,7 @@
 #if defined(CONFIG_TEGRA30) || defined(CONFIG_TEGRA210)
 #include <asm/arch/clock.h>
 #endif
+#include <linux/errno.h>
 
 struct tegra_mmc_plat {
 	struct mmc_config cfg;
diff --git a/drivers/mmc/tmio-common.c b/drivers/mmc/tmio-common.c
index b56f650f8a76..ff563cf97734 100644
--- a/drivers/mmc/tmio-common.c
+++ b/drivers/mmc/tmio-common.c
@@ -16,6 +16,7 @@
 #include <linux/compat.h>
 #include <linux/delay.h>
 #include <linux/dma-mapping.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/sizes.h>
 #include <power/regulator.h>
diff --git a/drivers/mmc/xenon_sdhci.c b/drivers/mmc/xenon_sdhci.c
index 1336d9193357..355b4eecb093 100644
--- a/drivers/mmc/xenon_sdhci.c
+++ b/drivers/mmc/xenon_sdhci.c
@@ -21,6 +21,7 @@
 #include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <malloc.h>
 #include <sdhci.h>
diff --git a/drivers/mmc/zynq_sdhci.c b/drivers/mmc/zynq_sdhci.c
index 01e75e2e770b..923a10f11ecd 100644
--- a/drivers/mmc/zynq_sdhci.c
+++ b/drivers/mmc/zynq_sdhci.c
@@ -11,6 +11,7 @@
 #include <fdtdec.h>
 #include <stdio.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include "mmc_private.h"
 #include <log.h>
 #include <dm/device_compat.h>
diff --git a/drivers/mtd/altera_qspi.c b/drivers/mtd/altera_qspi.c
index 9722f32a533f..eb901c8c93bf 100644
--- a/drivers/mtd/altera_qspi.c
+++ b/drivers/mtd/altera_qspi.c
@@ -15,6 +15,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c
index c6fb2a35ace0..53f605084a5b 100644
--- a/drivers/mtd/cfi_flash.c
+++ b/drivers/mtd/cfi_flash.c
@@ -36,6 +36,7 @@
 #include <asm/unaligned.h>
 #include <env_internal.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <mtd/cfi_flash.h>
 #include <watchdog.h>
diff --git a/drivers/mtd/hbmc-am654.c b/drivers/mtd/hbmc-am654.c
index 846b0e832b75..1583efd267de 100644
--- a/drivers/mtd/hbmc-am654.c
+++ b/drivers/mtd/hbmc-am654.c
@@ -9,6 +9,7 @@
 #include <regmap.h>
 #include <syscon.h>
 #include <dm/device_compat.h>
+#include <linux/errno.h>
 
 #define FSS_SYSC_REG	0x4
 
diff --git a/drivers/mtd/mtd_uboot.c b/drivers/mtd/mtd_uboot.c
index ebdec0dd6c56..cdf4600cd31e 100644
--- a/drivers/mtd/mtd_uboot.c
+++ b/drivers/mtd/mtd_uboot.c
@@ -12,6 +12,7 @@
 #include <dm/device.h>
 #include <dm/uclass-internal.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 #include <mtd.h>
diff --git a/drivers/mtd/mtdconcat.c b/drivers/mtd/mtdconcat.c
index 1baaa6e9475c..46f2330468c7 100644
--- a/drivers/mtd/mtdconcat.c
+++ b/drivers/mtd/mtdconcat.c
@@ -23,6 +23,7 @@
 #include <div64.h>
 #include <linux/bug.h>
 #include <linux/compat.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #endif
 
diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c
index ba19bd8c7fa0..b995fb8abab3 100644
--- a/drivers/mtd/mtdcore.c
+++ b/drivers/mtd/mtdcore.c
@@ -33,6 +33,7 @@
 #include <linux/bug.h>
 #include <linux/err.h>
 #include <ubi_uboot.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #endif
 
diff --git a/drivers/mtd/nand/bbt.c b/drivers/mtd/nand/bbt.c
index 972aec6e2666..674b9c98b097 100644
--- a/drivers/mtd/nand/bbt.c
+++ b/drivers/mtd/nand/bbt.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <dm/devres.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/mtd/nand.h>
 #ifndef __UBOOT__
 #include <linux/slab.h>
diff --git a/drivers/mtd/nand/core.c b/drivers/mtd/nand/core.c
index 45d827f686c0..1d9d13dfe1e3 100644
--- a/drivers/mtd/nand/core.c
+++ b/drivers/mtd/nand/core.c
@@ -15,6 +15,7 @@
 #include <linux/module.h>
 #endif
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/mtd/nand.h>
 #include <linux/printk.h>
 
diff --git a/drivers/mtd/nand/raw/atmel_nand.c b/drivers/mtd/nand/raw/atmel_nand.c
index dcd5f8ff82e4..75c21ff7852e 100644
--- a/drivers/mtd/nand/raw/atmel_nand.c
+++ b/drivers/mtd/nand/raw/atmel_nand.c
@@ -19,6 +19,7 @@
 #include <linux/bitops.h>
 #include <linux/bug.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/mtd/nand/raw/davinci_nand.c b/drivers/mtd/nand/raw/davinci_nand.c
index f64de80bf2bd..6c4eb58abb60 100644
--- a/drivers/mtd/nand/raw/davinci_nand.c
+++ b/drivers/mtd/nand/raw/davinci_nand.c
@@ -34,6 +34,7 @@
 #include <nand.h>
 #include <dm/uclass.h>
 #include <asm/ti-common/davinci_nand.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 /* Definitions for 4-bit hardware ECC */
diff --git a/drivers/mtd/nand/raw/denali_dt.c b/drivers/mtd/nand/raw/denali_dt.c
index 8318ff507f37..1f6963b55fe2 100644
--- a/drivers/mtd/nand/raw/denali_dt.c
+++ b/drivers/mtd/nand/raw/denali_dt.c
@@ -9,6 +9,7 @@
 #include <dm/device_compat.h>
 #include <linux/bug.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/ioport.h>
 #include <linux/printk.h>
diff --git a/drivers/mtd/nand/raw/denali_spl.c b/drivers/mtd/nand/raw/denali_spl.c
index 7252e0340c6a..504f773e4dec 100644
--- a/drivers/mtd/nand/raw/denali_spl.c
+++ b/drivers/mtd/nand/raw/denali_spl.c
@@ -9,6 +9,7 @@
 #include <asm/io.h>
 #include <asm/unaligned.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/mtd/rawnand.h>
 #include <linux/string.h>
 #include "denali.h"
diff --git a/drivers/mtd/nand/raw/fsmc_nand.c b/drivers/mtd/nand/raw/fsmc_nand.c
index 1feaeadd4b72..0991a398f452 100644
--- a/drivers/mtd/nand/raw/fsmc_nand.c
+++ b/drivers/mtd/nand/raw/fsmc_nand.c
@@ -14,6 +14,7 @@
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/fsmc_nand.h>
 #include <asm/arch/hardware.h>
diff --git a/drivers/mtd/nand/raw/mxc_nand.c b/drivers/mtd/nand/raw/mxc_nand.c
index c5e56c05873c..a90d30bd1003 100644
--- a/drivers/mtd/nand/raw/mxc_nand.c
+++ b/drivers/mtd/nand/raw/mxc_nand.c
@@ -15,6 +15,7 @@
 	defined(CONFIG_MX51) || defined(CONFIG_MX53)
 #include <asm/arch/imx-regs.h>
 #endif
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include "mxc_nand.h"
 
diff --git a/drivers/mtd/nand/raw/mxc_nand_spl.c b/drivers/mtd/nand/raw/mxc_nand_spl.c
index e1e542519d81..ad01cdce2607 100644
--- a/drivers/mtd/nand/raw/mxc_nand_spl.c
+++ b/drivers/mtd/nand/raw/mxc_nand_spl.c
@@ -15,6 +15,7 @@
 #include <nand.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/io.h>
+#include <linux/errno.h>
 #include "mxc_nand.h"
 
 #if defined(MXC_NFC_V1) || defined(MXC_NFC_V2_1)
diff --git a/drivers/mtd/nand/raw/mxs_nand_dt.c b/drivers/mtd/nand/raw/mxs_nand_dt.c
index 43dbe9e66ec4..675b284b063b 100644
--- a/drivers/mtd/nand/raw/mxs_nand_dt.c
+++ b/drivers/mtd/nand/raw/mxs_nand_dt.c
@@ -13,6 +13,7 @@
  */
 
 #include <dm.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/ioport.h>
 #include <linux/printk.h>
diff --git a/drivers/mtd/nand/raw/mxs_nand_spl.c b/drivers/mtd/nand/raw/mxs_nand_spl.c
index bc3bc836434a..0fe538e7d6d8 100644
--- a/drivers/mtd/nand/raw/mxs_nand_spl.c
+++ b/drivers/mtd/nand/raw/mxs_nand_spl.c
@@ -15,6 +15,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 static struct mtd_info *mtd;
diff --git a/drivers/mtd/nand/raw/nand.c b/drivers/mtd/nand/raw/nand.c
index 1b7918c54b69..486c1b4a8bdc 100644
--- a/drivers/mtd/nand/raw/nand.c
+++ b/drivers/mtd/nand/raw/nand.c
@@ -9,6 +9,7 @@
 #include <nand.h>
 #include <errno.h>
 #include <vsprintf.h>
+#include <linux/errno.h>
 #include <linux/mtd/concat.h>
 
 #ifndef CONFIG_SYS_NAND_BASE_LIST
diff --git a/drivers/mtd/nand/raw/nand_bbt.c b/drivers/mtd/nand/raw/nand_bbt.c
index 4f3c3223ca71..82b925e57c80 100644
--- a/drivers/mtd/nand/raw/nand_bbt.c
+++ b/drivers/mtd/nand/raw/nand_bbt.c
@@ -63,6 +63,7 @@
 #include <dm/devres.h>
 #include <linux/bug.h>
 #include <linux/compat.h>
+#include <linux/errno.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/bbm.h>
 #include <linux/mtd/rawnand.h>
diff --git a/drivers/mtd/nand/raw/nand_bch.c b/drivers/mtd/nand/raw/nand_bch.c
index 5733bcb9c624..94e03e9ba5ec 100644
--- a/drivers/mtd/nand/raw/nand_bch.c
+++ b/drivers/mtd/nand/raw/nand_bch.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <log.h>
 #include <dm/devres.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 /*#include <asm/io.h>*/
diff --git a/drivers/mtd/nand/raw/nand_timings.c b/drivers/mtd/nand/raw/nand_timings.c
index e6aa79039131..008ea3bdf40c 100644
--- a/drivers/mtd/nand/raw/nand_timings.c
+++ b/drivers/mtd/nand/raw/nand_timings.c
@@ -10,6 +10,7 @@
  */
 #include <common.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/mtd/rawnand.h>
 
diff --git a/drivers/mtd/nand/raw/stm32_fmc2_nand.c b/drivers/mtd/nand/raw/stm32_fmc2_nand.c
index c1e884af950a..1b8003fd73c0 100644
--- a/drivers/mtd/nand/raw/stm32_fmc2_nand.c
+++ b/drivers/mtd/nand/raw/stm32_fmc2_nand.c
@@ -14,6 +14,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/iopoll.h>
 #include <linux/ioport.h>
 #include <linux/printk.h>
diff --git a/drivers/mtd/nand/raw/sunxi_nand.c b/drivers/mtd/nand/raw/sunxi_nand.c
index 5fd741f11243..025f18ad49dd 100644
--- a/drivers/mtd/nand/raw/sunxi_nand.c
+++ b/drivers/mtd/nand/raw/sunxi_nand.c
@@ -36,6 +36,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/mtd/nand/raw/sunxi_nand_spl.c b/drivers/mtd/nand/raw/sunxi_nand_spl.c
index b098ebef8f39..9b54d007f8e4 100644
--- a/drivers/mtd/nand/raw/sunxi_nand_spl.c
+++ b/drivers/mtd/nand/raw/sunxi_nand_spl.c
@@ -13,6 +13,7 @@
 #include <linux/bitops.h>
 #include <linux/ctype.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 /* registers */
diff --git a/drivers/mtd/nand/raw/vf610_nfc.c b/drivers/mtd/nand/raw/vf610_nfc.c
index 708653ab1621..ceec8c81e94d 100644
--- a/drivers/mtd/nand/raw/vf610_nfc.c
+++ b/drivers/mtd/nand/raw/vf610_nfc.c
@@ -26,6 +26,7 @@
 #include <stdio.h>
 #include <time.h>
 #include <dm/device_compat.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/mtd/nand/spi/core.c b/drivers/mtd/nand/spi/core.c
index a59dae357f32..99622a335a3d 100644
--- a/drivers/mtd/nand/spi/core.c
+++ b/drivers/mtd/nand/spi/core.c
@@ -30,6 +30,7 @@
 #include <dm/devres.h>
 #include <linux/bitops.h>
 #include <linux/bug.h>
+#include <linux/errno.h>
 #include <linux/mtd/spinand.h>
 #include <linux/printk.h>
 #include <linux/string.h>
diff --git a/drivers/mtd/nand/spi/gigadevice.c b/drivers/mtd/nand/spi/gigadevice.c
index 0b228dcb5b1d..465f18642b06 100644
--- a/drivers/mtd/nand/spi/gigadevice.c
+++ b/drivers/mtd/nand/spi/gigadevice.c
@@ -11,6 +11,7 @@
 #include <linux/device.h>
 #include <linux/kernel.h>
 #endif
+#include <linux/errno.h>
 #include <linux/mtd/spinand.h>
 
 #define SPINAND_MFR_GIGADEVICE			0xC8
diff --git a/drivers/mtd/nand/spi/macronix.c b/drivers/mtd/nand/spi/macronix.c
index 215f09acc371..83f9daaf5791 100644
--- a/drivers/mtd/nand/spi/macronix.c
+++ b/drivers/mtd/nand/spi/macronix.c
@@ -11,6 +11,7 @@
 #include <linux/kernel.h>
 #endif
 #include <linux/bug.h>
+#include <linux/errno.h>
 #include <linux/mtd/spinand.h>
 
 #define SPINAND_MFR_MACRONIX		0xC2
diff --git a/drivers/mtd/nand/spi/micron.c b/drivers/mtd/nand/spi/micron.c
index 6bacf14aafea..5fde4a78d23d 100644
--- a/drivers/mtd/nand/spi/micron.c
+++ b/drivers/mtd/nand/spi/micron.c
@@ -12,6 +12,7 @@
 #include <linux/kernel.h>
 #endif
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/mtd/spinand.h>
 
 #define SPINAND_MFR_MICRON		0x2c
diff --git a/drivers/mtd/nand/spi/toshiba.c b/drivers/mtd/nand/spi/toshiba.c
index c2cd3b426b31..d0b003d2957d 100644
--- a/drivers/mtd/nand/spi/toshiba.c
+++ b/drivers/mtd/nand/spi/toshiba.c
@@ -12,6 +12,7 @@
 #include <linux/kernel.h>
 #endif
 #include <linux/bug.h>
+#include <linux/errno.h>
 #include <linux/mtd/spinand.h>
 
 #define SPINAND_MFR_TOSHIBA		0x98
diff --git a/drivers/mtd/nand/spi/winbond.c b/drivers/mtd/nand/spi/winbond.c
index c119486efb7a..4e1c8883b383 100644
--- a/drivers/mtd/nand/spi/winbond.c
+++ b/drivers/mtd/nand/spi/winbond.c
@@ -13,6 +13,7 @@
 #include <linux/kernel.h>
 #endif
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/mtd/spinand.h>
 
 #define SPINAND_MFR_WINBOND		0xEF
diff --git a/drivers/mtd/pic32_flash.c b/drivers/mtd/pic32_flash.c
index a50aec7d77e4..3daa76f949ab 100644
--- a/drivers/mtd/pic32_flash.c
+++ b/drivers/mtd/pic32_flash.c
@@ -15,6 +15,7 @@
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <mach/pic32.h>
 #include <wait_bit.h>
diff --git a/drivers/mtd/renesas_rpc_hf.c b/drivers/mtd/renesas_rpc_hf.c
index 1398a474b218..7dc795c06aba 100644
--- a/drivers/mtd/renesas_rpc_hf.c
+++ b/drivers/mtd/renesas_rpc_hf.c
@@ -22,6 +22,7 @@
 #include <mtd.h>
 #include <wait_bit.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <mtd/cfi_flash.h>
 
 #define RPC_CMNCR		0x0000	/* R/W */
diff --git a/drivers/mtd/spi/sandbox.c b/drivers/mtd/spi/sandbox.c
index e18326b56921..0ab3596a2a1f 100644
--- a/drivers/mtd/spi/sandbox.c
+++ b/drivers/mtd/spi/sandbox.c
@@ -17,6 +17,7 @@
 #include <spi.h>
 #include <os.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include <spi_flash.h>
diff --git a/drivers/mtd/spi/sf_dataflash.c b/drivers/mtd/spi/sf_dataflash.c
index 90f09a5fa1d5..c65d62e7cdb2 100644
--- a/drivers/mtd/spi/sf_dataflash.c
+++ b/drivers/mtd/spi/sf_dataflash.c
@@ -20,6 +20,7 @@
 #include <time.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/math64.h>
 #include <linux/string.h>
 
diff --git a/drivers/mtd/spi/sf_probe.c b/drivers/mtd/spi/sf_probe.c
index 8de8f94d2f3e..dd5e624f4b2c 100644
--- a/drivers/mtd/spi/sf_probe.c
+++ b/drivers/mtd/spi/sf_probe.c
@@ -15,6 +15,7 @@
 #include <spi.h>
 #include <spi_flash.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include "sf_internal.h"
diff --git a/drivers/mtd/st_smi.c b/drivers/mtd/st_smi.c
index d53466059905..a6c1a0e1c78a 100644
--- a/drivers/mtd/st_smi.c
+++ b/drivers/mtd/st_smi.c
@@ -10,6 +10,7 @@
 #include <time.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/mtd/st_smi.h>
 
 #include <asm/io.h>
diff --git a/drivers/mtd/ubi/attach.c b/drivers/mtd/ubi/attach.c
index 7b9ca10ed2aa..2fdf3dbc6583 100644
--- a/drivers/mtd/ubi/attach.c
+++ b/drivers/mtd/ubi/attach.c
@@ -81,6 +81,7 @@
 #include <div64.h>
 #include <linux/bug.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #endif
diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c
index f07051c9f735..f0f63ae7df03 100644
--- a/drivers/mtd/ubi/build.c
+++ b/drivers/mtd/ubi/build.c
@@ -33,6 +33,7 @@
 #else
 #include <vsprintf.h>
 #include <linux/bug.h>
+#include <linux/errno.h>
 #include <linux/log2.h>
 #include <linux/printk.h>
 #include <linux/string.h>
diff --git a/drivers/mtd/ubi/debug.c b/drivers/mtd/ubi/debug.c
index c84e3471266a..213061847d73 100644
--- a/drivers/mtd/ubi/debug.c
+++ b/drivers/mtd/ubi/debug.c
@@ -10,6 +10,7 @@
 #include <stdio.h>
 #include <ubi_uboot.h>
 #include <vsprintf.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include "ubi.h"
diff --git a/drivers/mtd/ubi/eba.c b/drivers/mtd/ubi/eba.c
index 9fe5ed791258..23a72d6a325c 100644
--- a/drivers/mtd/ubi/eba.c
+++ b/drivers/mtd/ubi/eba.c
@@ -36,6 +36,7 @@
 #include <u-boot/crc.h>
 #else
 #include <ubi_uboot.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #endif
 
diff --git a/drivers/mtd/ubi/fastmap-wl.c b/drivers/mtd/ubi/fastmap-wl.c
index 4cb1377c4257..df5fab00e1a3 100644
--- a/drivers/mtd/ubi/fastmap-wl.c
+++ b/drivers/mtd/ubi/fastmap-wl.c
@@ -6,6 +6,8 @@
  *
  */
 
+#include <linux/errno.h>
+
 /**
  * update_fastmap_work_fn - calls ubi_update_fastmap from a work queue
  * @wrk: the work description object
diff --git a/drivers/mtd/ubi/fastmap.c b/drivers/mtd/ubi/fastmap.c
index 90ed73b8577f..6812b122d651 100644
--- a/drivers/mtd/ubi/fastmap.c
+++ b/drivers/mtd/ubi/fastmap.c
@@ -17,6 +17,7 @@
 #include <malloc.h>
 #include <ubi_uboot.h>
 #include <linux/bug.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #endif
 
diff --git a/drivers/mtd/ubi/io.c b/drivers/mtd/ubi/io.c
index ef819a86d27c..f88bafd35d3e 100644
--- a/drivers/mtd/ubi/io.c
+++ b/drivers/mtd/ubi/io.c
@@ -83,6 +83,7 @@
 #else
 #include <hexdump.h>
 #include <ubi_uboot.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #endif
 
diff --git a/drivers/mtd/ubi/kapi.c b/drivers/mtd/ubi/kapi.c
index 3fac8b2b3088..981146ef034b 100644
--- a/drivers/mtd/ubi/kapi.c
+++ b/drivers/mtd/ubi/kapi.c
@@ -16,6 +16,7 @@
 #include <asm/div64.h>
 #else
 #include <ubi_uboot.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #endif
 #include <linux/err.h>
diff --git a/drivers/mtd/ubi/misc.c b/drivers/mtd/ubi/misc.c
index 81275deaeb77..b9bad95cf6f8 100644
--- a/drivers/mtd/ubi/misc.c
+++ b/drivers/mtd/ubi/misc.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <ubi_uboot.h>
+#include <linux/errno.h>
 #include "ubi.h"
 
 /**
diff --git a/drivers/mtd/ubi/ubi.h b/drivers/mtd/ubi/ubi.h
index 175988899c39..d91c9effd070 100644
--- a/drivers/mtd/ubi/ubi.h
+++ b/drivers/mtd/ubi/ubi.h
@@ -28,6 +28,7 @@
 #include <asm/pgtable.h>
 #else
 #include <ubi_uboot.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #endif
 #include <linux/mtd/mtd.h>
diff --git a/drivers/mtd/ubi/upd.c b/drivers/mtd/ubi/upd.c
index c4856b6c11eb..96ecaf60c040 100644
--- a/drivers/mtd/ubi/upd.c
+++ b/drivers/mtd/ubi/upd.c
@@ -32,6 +32,7 @@
 #else
 #include <div64.h>
 #include <ubi_uboot.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #endif
 #include <linux/err.h>
diff --git a/drivers/mtd/ubi/vmt.c b/drivers/mtd/ubi/vmt.c
index 079ffbe7563e..806abc9122e8 100644
--- a/drivers/mtd/ubi/vmt.c
+++ b/drivers/mtd/ubi/vmt.c
@@ -20,6 +20,7 @@
 #include <div64.h>
 #include <ubi_uboot.h>
 #include <vsprintf.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #endif
 #include <linux/math64.h>
diff --git a/drivers/mtd/ubi/vtbl.c b/drivers/mtd/ubi/vtbl.c
index cb4de78fcbba..91c0589bb62d 100644
--- a/drivers/mtd/ubi/vtbl.c
+++ b/drivers/mtd/ubi/vtbl.c
@@ -56,6 +56,7 @@
 #else
 #include <ubi_uboot.h>
 #include <linux/bug.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #endif
 
diff --git a/drivers/mtd/ubi/wl.c b/drivers/mtd/ubi/wl.c
index b7e5cc17ef4d..d0963285b1fd 100644
--- a/drivers/mtd/ubi/wl.c
+++ b/drivers/mtd/ubi/wl.c
@@ -95,6 +95,7 @@
 #else
 #include <ubi_uboot.h>
 #include <vsprintf.h>
+#include <linux/errno.h>
 #endif
 
 #include "ubi.h"
diff --git a/drivers/mtd/ubispl/ubispl.c b/drivers/mtd/ubispl/ubispl.c
index 3ffad5485352..96afa7dec115 100644
--- a/drivers/mtd/ubispl/ubispl.c
+++ b/drivers/mtd/ubispl/ubispl.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <errno.h>
 #include <linux/bug.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
 #include <ubispl.h>
diff --git a/drivers/net/ag7xxx.c b/drivers/net/ag7xxx.c
index 212f43ca4daa..c73c95ce6153 100644
--- a/drivers/net/ag7xxx.c
+++ b/drivers/net/ag7xxx.c
@@ -24,6 +24,7 @@
 #include <linux/compiler.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/mii.h>
 #include <wait_bit.h>
 #include <asm/io.h>
diff --git a/drivers/net/altera_tse.c b/drivers/net/altera_tse.c
index 8e58464cc6ce..bf17d1fb29ae 100644
--- a/drivers/net/altera_tse.c
+++ b/drivers/net/altera_tse.c
@@ -24,6 +24,7 @@
 #include <asm/global_data.h>
 #include <linux/dma-mapping.h>
 #include <asm/io.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include "altera_tse.h"
 
diff --git a/drivers/net/armada100_fec.c b/drivers/net/armada100_fec.c
index 87c01e0e3cd2..c8f61a23d125 100644
--- a/drivers/net/armada100_fec.c
+++ b/drivers/net/armada100_fec.c
@@ -21,6 +21,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/mii.h>
 #include <asm/io.h>
 #include <asm/arch/armada100.h>
diff --git a/drivers/net/at91_emac.c b/drivers/net/at91_emac.c
index d49f9216c7de..26381a1bc6e3 100644
--- a/drivers/net/at91_emac.c
+++ b/drivers/net/at91_emac.c
@@ -21,6 +21,7 @@
 #include <miiphy.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/mii.h>
 #include <linux/string.h>
 
diff --git a/drivers/net/bcm-sf2-eth.c b/drivers/net/bcm-sf2-eth.c
index a0cbecf60dfc..db7930fb88eb 100644
--- a/drivers/net/bcm-sf2-eth.c
+++ b/drivers/net/bcm-sf2-eth.c
@@ -12,6 +12,7 @@
 #include <vsprintf.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/net/bcm6348-eth.c b/drivers/net/bcm6348-eth.c
index b759d12867d7..eeea3dc579f8 100644
--- a/drivers/net/bcm6348-eth.c
+++ b/drivers/net/bcm6348-eth.c
@@ -19,6 +19,7 @@
 #include <vsprintf.h>
 #include <wait_bit.h>
 #include <asm/io.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 #define ETH_RX_DESC			PKTBUFSRX
diff --git a/drivers/net/bcm6368-eth.c b/drivers/net/bcm6368-eth.c
index f6b473ae9b00..0e6d266f1037 100644
--- a/drivers/net/bcm6368-eth.c
+++ b/drivers/net/bcm6368-eth.c
@@ -20,6 +20,7 @@
 #include <asm/io.h>
 #include <dm/device_compat.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/net/bcmgenet.c b/drivers/net/bcmgenet.c
index a767fa6e6de1..cd3dac49e7ea 100644
--- a/drivers/net/bcmgenet.c
+++ b/drivers/net/bcmgenet.c
@@ -33,6 +33,7 @@
 #include <net.h>
 #include <dm/of_access.h>
 #include <dm/ofnode.h>
+#include <linux/errno.h>
 #include <linux/iopoll.h>
 #include <linux/sizes.h>
 #include <asm/dma-mapping.h>
diff --git a/drivers/net/calxedaxgmac.c b/drivers/net/calxedaxgmac.c
index 5df36fa67269..37c3a54761b6 100644
--- a/drivers/net/calxedaxgmac.c
+++ b/drivers/net/calxedaxgmac.c
@@ -13,6 +13,7 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <asm/io.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #define TX_NUM_DESC			1
diff --git a/drivers/net/dc2114x.c b/drivers/net/dc2114x.c
index 3b0219eee920..8bc75baf97f1 100644
--- a/drivers/net/dc2114x.c
+++ b/drivers/net/dc2114x.c
@@ -12,6 +12,7 @@
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #define SROM_DLEVEL	0
diff --git a/drivers/net/designware.c b/drivers/net/designware.c
index bb36b77169a7..ffb41e8bf1f4 100644
--- a/drivers/net/designware.c
+++ b/drivers/net/designware.c
@@ -29,6 +29,7 @@
 #include <linux/compiler.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/kernel.h>
 #include <asm/io.h>
 #include <linux/printk.h>
diff --git a/drivers/net/dwc_eth_qos.c b/drivers/net/dwc_eth_qos.c
index db76ac9c7528..68d80bafa1e3 100644
--- a/drivers/net/dwc_eth_qos.c
+++ b/drivers/net/dwc_eth_qos.c
@@ -51,6 +51,7 @@
 #endif
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/net/dwmac_socfpga.c b/drivers/net/dwmac_socfpga.c
index e93561dffa87..cddbd56ac7dc 100644
--- a/drivers/net/dwmac_socfpga.c
+++ b/drivers/net/dwmac_socfpga.c
@@ -13,6 +13,7 @@
 #include <regmap.h>
 #include <reset.h>
 #include <syscon.h>
+#include <linux/errno.h>
 #include "designware.h"
 #include <dm/device_compat.h>
 #include <linux/err.h>
diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c
index 5041a1894eed..1705dde9d2c1 100644
--- a/drivers/net/e1000.c
+++ b/drivers/net/e1000.c
@@ -43,6 +43,7 @@ tested on both gig copper and gig fiber boards
 #include <vsprintf.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include "e1000.h"
 #include <asm/cache.h>
diff --git a/drivers/net/eepro100.c b/drivers/net/eepro100.c
index a8a20a080120..3d7decd126ae 100644
--- a/drivers/net/eepro100.c
+++ b/drivers/net/eepro100.c
@@ -16,6 +16,7 @@
 #include <pci.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 /* Ethernet chip registers. */
diff --git a/drivers/net/ep93xx_eth.c b/drivers/net/ep93xx_eth.c
index 802d04a26baa..a4767e8742dd 100644
--- a/drivers/net/ep93xx_eth.c
+++ b/drivers/net/ep93xx_eth.c
@@ -28,6 +28,7 @@
 #include <miiphy.h>
 #include <asm/u-boot.h>
 #include <linux/bug.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include <linux/types.h>
diff --git a/drivers/net/eth-phy-uclass.c b/drivers/net/eth-phy-uclass.c
index 4afa6c87461d..861fc1bfb8a1 100644
--- a/drivers/net/eth-phy-uclass.c
+++ b/drivers/net/eth-phy-uclass.c
@@ -10,6 +10,7 @@
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
 #include <dm/lists.h>
+#include <linux/errno.h>
 
 struct eth_phy_device_priv {
 	struct mii_dev *mdio_bus;
diff --git a/drivers/net/ethoc.c b/drivers/net/ethoc.c
index a1e051770c7e..c331cd9e97ca 100644
--- a/drivers/net/ethoc.c
+++ b/drivers/net/ethoc.c
@@ -18,6 +18,7 @@
 #include <vsprintf.h>
 #include <asm/u-boot.h>
 #include <dm/platform_data/net_ethoc.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <malloc.h>
 #include <net.h>
diff --git a/drivers/net/fm/eth.c b/drivers/net/fm/eth.c
index 7d65ee70be4b..c451b136ae3f 100644
--- a/drivers/net/fm/eth.c
+++ b/drivers/net/fm/eth.c
@@ -28,6 +28,7 @@
 #include <fsl_memac.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include "fm.h"
diff --git a/drivers/net/fm/init.c b/drivers/net/fm/init.c
index b779b5c22998..1829517d024f 100644
--- a/drivers/net/fm/init.c
+++ b/drivers/net/fm/init.c
@@ -15,6 +15,7 @@
 #include <asm/fsl_serdes.h>
 #endif
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include "fm.h"
diff --git a/drivers/net/fm/memac_phy.c b/drivers/net/fm/memac_phy.c
index 8973f498d173..79a15989ad94 100644
--- a/drivers/net/fm/memac_phy.c
+++ b/drivers/net/fm/memac_phy.c
@@ -13,6 +13,7 @@
 #include <fsl_memac.h>
 #include <fm_eth.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #ifdef CONFIG_SYS_MEMAC_LITTLE_ENDIAN
diff --git a/drivers/net/fsl-mc/dpio/qbman_portal.c b/drivers/net/fsl-mc/dpio/qbman_portal.c
index bedff4ff321f..fb325846322e 100644
--- a/drivers/net/fsl-mc/dpio/qbman_portal.c
+++ b/drivers/net/fsl-mc/dpio/qbman_portal.c
@@ -8,6 +8,7 @@
 #include <stdio.h>
 #include <asm/arch/clock.h>
 #include <linux/bug.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include "qbman_portal.h"
 
diff --git a/drivers/net/fsl-mc/mc.c b/drivers/net/fsl-mc/mc.c
index 3a7e8e84b468..d2f8869a3408 100644
--- a/drivers/net/fsl-mc/mc.c
+++ b/drivers/net/fsl-mc/mc.c
@@ -18,6 +18,7 @@
 #include <linux/bug.h>
 #include <asm/io.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <net.h>
 #include <fdt_support.h>
diff --git a/drivers/net/fsl-mc/mc_sys.c b/drivers/net/fsl-mc/mc_sys.c
index 239bccb4b0a2..aa50e64bced0 100644
--- a/drivers/net/fsl-mc/mc_sys.c
+++ b/drivers/net/fsl-mc/mc_sys.c
@@ -13,6 +13,7 @@
 #include <errno.h>
 #include <asm/io.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 #define MC_CMD_HDR_READ_CMDID(_hdr) \
 	((uint16_t)mc_dec((_hdr), MC_CMD_HDR_CMDID_O, MC_CMD_HDR_CMDID_S))
diff --git a/drivers/net/fsl_enetc.c b/drivers/net/fsl_enetc.c
index ed302eace59f..7b9730a84463 100644
--- a/drivers/net/fsl_enetc.c
+++ b/drivers/net/fsl_enetc.c
@@ -18,6 +18,7 @@
 #include <miiphy.h>
 #include <linux/bug.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include "fsl_enetc.h"
diff --git a/drivers/net/fsl_enetc_mdio.c b/drivers/net/fsl_enetc_mdio.c
index 9bca18e94076..282c08c82f55 100644
--- a/drivers/net/fsl_enetc_mdio.c
+++ b/drivers/net/fsl_enetc_mdio.c
@@ -14,6 +14,7 @@
 #include <asm/io.h>
 #include <asm/processor.h>
 #include <miiphy.h>
+#include <linux/errno.h>
 
 #include "fsl_enetc.h"
 
diff --git a/drivers/net/fsl_mcdmafec.c b/drivers/net/fsl_mcdmafec.c
index 819de6236252..64c1e71ebbe7 100644
--- a/drivers/net/fsl_mcdmafec.c
+++ b/drivers/net/fsl_mcdmafec.c
@@ -22,6 +22,7 @@
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/mii.h>
 #include <asm/immap.h>
 #include <asm/fsl_mcdmafec.h>
diff --git a/drivers/net/ftgmac100.c b/drivers/net/ftgmac100.c
index f5e50ff08477..af58d04da231 100644
--- a/drivers/net/ftgmac100.c
+++ b/drivers/net/ftgmac100.c
@@ -24,6 +24,7 @@
 #include <asm/cache.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/iopoll.h>
 #include <linux/printk.h>
diff --git a/drivers/net/ftmac100.c b/drivers/net/ftmac100.c
index e2b897a7cccf..569f1e400473 100644
--- a/drivers/net/ftmac100.c
+++ b/drivers/net/ftmac100.c
@@ -18,6 +18,7 @@
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/string.h>
 
diff --git a/drivers/net/gmac_rockchip.c b/drivers/net/gmac_rockchip.c
index 7cd2451e0846..8aed219d9eda 100644
--- a/drivers/net/gmac_rockchip.c
+++ b/drivers/net/gmac_rockchip.c
@@ -28,6 +28,7 @@
 #include <dm/pinctrl.h>
 #include <dt-bindings/clock/rk3288-cru.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include "designware.h"
 
diff --git a/drivers/net/higmacv300.c b/drivers/net/higmacv300.c
index 0c71c51ceb43..7310d6a04267 100644
--- a/drivers/net/higmacv300.c
+++ b/drivers/net/higmacv300.c
@@ -13,6 +13,7 @@
 #include <linux/bitops.h>
 #include <linux/bug.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/mii.h>
 #include <miiphy.h>
 #include <net.h>
diff --git a/drivers/net/ks8851_mll.c b/drivers/net/ks8851_mll.c
index 65b160f8c40c..f357fec5cc9a 100644
--- a/drivers/net/ks8851_mll.c
+++ b/drivers/net/ks8851_mll.c
@@ -15,6 +15,7 @@
 #include <miiphy.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 #include "ks8851_mll.h"
 
diff --git a/drivers/net/ldpaa_eth/ldpaa_eth.c b/drivers/net/ldpaa_eth/ldpaa_eth.c
index ac0487e68d28..5da5582200d4 100644
--- a/drivers/net/ldpaa_eth/ldpaa_eth.c
+++ b/drivers/net/ldpaa_eth/ldpaa_eth.c
@@ -23,6 +23,7 @@
 #include <linux/compat.h>
 #include <fsl-mc/fsl_dpmac.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include <fsl-mc/ldpaa_wriop.h>
diff --git a/drivers/net/ldpaa_eth/ldpaa_wriop.c b/drivers/net/ldpaa_eth/ldpaa_wriop.c
index 06a284ad684d..e2ad13b89757 100644
--- a/drivers/net/ldpaa_eth/ldpaa_wriop.c
+++ b/drivers/net/ldpaa_eth/ldpaa_wriop.c
@@ -11,6 +11,7 @@
 #include <linux/compat.h>
 #include <asm/arch/fsl_serdes.h>
 #include <fsl-mc/ldpaa_wriop.h>
+#include <linux/errno.h>
 
 struct wriop_dpmac_info dpmac_info[NUM_WRIOP_PORTS];
 
diff --git a/drivers/net/ldpaa_eth/lx2160a.c b/drivers/net/ldpaa_eth/lx2160a.c
index 9432b6eb85c7..a61508befc81 100644
--- a/drivers/net/ldpaa_eth/lx2160a.c
+++ b/drivers/net/ldpaa_eth/lx2160a.c
@@ -8,6 +8,7 @@
 #include <asm/io.h>
 #include <asm/arch/fsl_serdes.h>
 #include <asm/arch/soc.h>
+#include <linux/errno.h>
 #include <linux/mii.h>
 
 u32 dpmac_to_devdisr[] = {
diff --git a/drivers/net/mcffec.c b/drivers/net/mcffec.c
index 5a86f204ee34..91ca0e03216b 100644
--- a/drivers/net/mcffec.c
+++ b/drivers/net/mcffec.c
@@ -23,6 +23,7 @@
 #include <asm/immap.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/mii.h>
 #include <linux/string.h>
 
diff --git a/drivers/net/mdio_mux_sandbox.c b/drivers/net/mdio_mux_sandbox.c
index 3dba4d18a159..c22882c6e8db 100644
--- a/drivers/net/mdio_mux_sandbox.c
+++ b/drivers/net/mdio_mux_sandbox.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <miiphy.h>
+#include <linux/errno.h>
 
 /* macros copied over from mdio_sandbox.c */
 #define SANDBOX_PHY_ADDR	5
diff --git a/drivers/net/mdio_sandbox.c b/drivers/net/mdio_sandbox.c
index b731f60a98a1..2d7c845a098e 100644
--- a/drivers/net/mdio_sandbox.c
+++ b/drivers/net/mdio_sandbox.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <miiphy.h>
+#include <linux/errno.h>
 
 #define SANDBOX_PHY_ADDR	5
 #define SANDBOX_PHY_REG_CNT	2
diff --git a/drivers/net/mpc8xx_fec.c b/drivers/net/mpc8xx_fec.c
index 94939c590f6e..5c86710cfdb1 100644
--- a/drivers/net/mpc8xx_fec.c
+++ b/drivers/net/mpc8xx_fec.c
@@ -18,6 +18,7 @@
 #include <asm/ppc.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include <phy.h>
diff --git a/drivers/net/mscc_eswitch/jr2_switch.c b/drivers/net/mscc_eswitch/jr2_switch.c
index d4752492c5ba..0e0a4d7037ca 100644
--- a/drivers/net/mscc_eswitch/jr2_switch.c
+++ b/drivers/net/mscc_eswitch/jr2_switch.c
@@ -13,6 +13,7 @@
 #include <fdt_support.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/ioport.h>
 #include <miiphy.h>
diff --git a/drivers/net/mscc_eswitch/luton_switch.c b/drivers/net/mscc_eswitch/luton_switch.c
index 0ebc207157b9..6ceb250688ad 100644
--- a/drivers/net/mscc_eswitch/luton_switch.c
+++ b/drivers/net/mscc_eswitch/luton_switch.c
@@ -12,6 +12,7 @@
 #include <dm/of_addr.h>
 #include <fdt_support.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/ioport.h>
 #include <miiphy.h>
diff --git a/drivers/net/mscc_eswitch/mscc_mac_table.c b/drivers/net/mscc_eswitch/mscc_mac_table.c
index 25b9cad42c97..dba44318f529 100644
--- a/drivers/net/mscc_eswitch/mscc_mac_table.c
+++ b/drivers/net/mscc_eswitch/mscc_mac_table.c
@@ -4,6 +4,7 @@
  */
 
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include "mscc_mac_table.h"
 
diff --git a/drivers/net/mscc_eswitch/mscc_miim.c b/drivers/net/mscc_eswitch/mscc_miim.c
index de257d4d60f4..9d59fc53ee9d 100644
--- a/drivers/net/mscc_eswitch/mscc_miim.c
+++ b/drivers/net/mscc_eswitch/mscc_miim.c
@@ -7,6 +7,7 @@
 #include <vsprintf.h>
 #include <wait_bit.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include "mscc_miim.h"
 
 #define MIIM_STATUS			0x0
diff --git a/drivers/net/mscc_eswitch/mscc_xfer.c b/drivers/net/mscc_eswitch/mscc_xfer.c
index 6f7474645717..a2827b5377e6 100644
--- a/drivers/net/mscc_eswitch/mscc_xfer.c
+++ b/drivers/net/mscc_eswitch/mscc_xfer.c
@@ -6,6 +6,7 @@
 #include <log.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include "mscc_xfer.h"
 
diff --git a/drivers/net/mscc_eswitch/ocelot_switch.c b/drivers/net/mscc_eswitch/ocelot_switch.c
index de8a44e48bc1..b787524af163 100644
--- a/drivers/net/mscc_eswitch/ocelot_switch.c
+++ b/drivers/net/mscc_eswitch/ocelot_switch.c
@@ -12,6 +12,7 @@
 #include <dm/of_addr.h>
 #include <fdt_support.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/ioport.h>
 #include <miiphy.h>
diff --git a/drivers/net/mscc_eswitch/serval_switch.c b/drivers/net/mscc_eswitch/serval_switch.c
index 540799567ec9..9b6e5d8743de 100644
--- a/drivers/net/mscc_eswitch/serval_switch.c
+++ b/drivers/net/mscc_eswitch/serval_switch.c
@@ -12,6 +12,7 @@
 #include <dm/of_addr.h>
 #include <fdt_support.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/ioport.h>
 #include <miiphy.h>
diff --git a/drivers/net/mscc_eswitch/servalt_switch.c b/drivers/net/mscc_eswitch/servalt_switch.c
index a1c86062fac4..eecf6153245a 100644
--- a/drivers/net/mscc_eswitch/servalt_switch.c
+++ b/drivers/net/mscc_eswitch/servalt_switch.c
@@ -12,6 +12,7 @@
 #include <dm/of_addr.h>
 #include <fdt_support.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/ioport.h>
 #include <miiphy.h>
diff --git a/drivers/net/mt7628-eth.c b/drivers/net/mt7628-eth.c
index 1eea520b8762..fd6193617275 100644
--- a/drivers/net/mt7628-eth.c
+++ b/drivers/net/mt7628-eth.c
@@ -30,6 +30,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/net/mtk_eth.c b/drivers/net/mtk_eth.c
index ad86820bbb09..8cf78422f7d2 100644
--- a/drivers/net/mtk_eth.c
+++ b/drivers/net/mtk_eth.c
@@ -26,6 +26,7 @@
 #include <dm/device_compat.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/ioport.h>
 #include <linux/mdio.h>
 #include <linux/mii.h>
diff --git a/drivers/net/mvmdio.c b/drivers/net/mvmdio.c
index deaba8aee4f3..c712043dc7d0 100644
--- a/drivers/net/mvmdio.c
+++ b/drivers/net/mvmdio.c
@@ -13,6 +13,7 @@
 #include <asm/io.h>
 #include <wait_bit.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 #define MVMDIO_SMI_DATA_SHIFT		0
diff --git a/drivers/net/pch_gbe.c b/drivers/net/pch_gbe.c
index fa824079391a..887958fef546 100644
--- a/drivers/net/pch_gbe.c
+++ b/drivers/net/pch_gbe.c
@@ -17,6 +17,7 @@
 #include <pci.h>
 #include <miiphy.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include "pch_gbe.h"
 
diff --git a/drivers/net/pcnet.c b/drivers/net/pcnet.c
index 41231a0a773f..d574aff8327a 100644
--- a/drivers/net/pcnet.c
+++ b/drivers/net/pcnet.c
@@ -21,6 +21,7 @@
 #include <pci.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #define	PCNET_DEBUG_LEVEL	0	/* 0=off, 1=init, 2=rx/tx */
diff --git a/drivers/net/pfe_eth/pfe_driver.c b/drivers/net/pfe_eth/pfe_driver.c
index 7d712370100e..64d570e361eb 100644
--- a/drivers/net/pfe_eth/pfe_driver.c
+++ b/drivers/net/pfe_eth/pfe_driver.c
@@ -8,6 +8,7 @@
 #include <malloc.h>
 #include <stdio.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <net/pfe_eth/pfe_eth.h>
 #include <net/pfe_eth/pfe_firmware.h>
diff --git a/drivers/net/pfe_eth/pfe_eth.c b/drivers/net/pfe_eth/pfe_eth.c
index 4848e2e2aa91..f582f8c5af5b 100644
--- a/drivers/net/pfe_eth/pfe_eth.c
+++ b/drivers/net/pfe_eth/pfe_eth.c
@@ -13,6 +13,7 @@
 #include <dm/platform_data/pfe_dm_eth.h>
 #include <net.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <net/pfe_eth/pfe_eth.h>
 #include <net/pfe_eth/pfe_mdio.h>
 
diff --git a/drivers/net/pfe_eth/pfe_firmware.c b/drivers/net/pfe_eth/pfe_firmware.c
index 66d5ad930e3b..286594d91b94 100644
--- a/drivers/net/pfe_eth/pfe_firmware.c
+++ b/drivers/net/pfe_eth/pfe_firmware.c
@@ -15,6 +15,7 @@
 #include <malloc.h>
 #include <stdio.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <net/pfe_eth/pfe_eth.h>
 #include <net/pfe_eth/pfe_firmware.h>
diff --git a/drivers/net/pfe_eth/pfe_mdio.c b/drivers/net/pfe_eth/pfe_mdio.c
index 4cc55b36885a..08536dea67ef 100644
--- a/drivers/net/pfe_eth/pfe_mdio.c
+++ b/drivers/net/pfe_eth/pfe_mdio.c
@@ -12,6 +12,7 @@
 #include <dm/platform_data/pfe_dm_eth.h>
 #include <net.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <net/pfe_eth/pfe_eth.h>
 
 extern struct gemac_s gem_info[];
diff --git a/drivers/net/phy/aquantia.c b/drivers/net/phy/aquantia.c
index aa3e566bf2ea..1395af5444d3 100644
--- a/drivers/net/phy/aquantia.c
+++ b/drivers/net/phy/aquantia.c
@@ -14,6 +14,7 @@
 #include <stdio.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
 #include <malloc.h>
diff --git a/drivers/net/phy/atheros.c b/drivers/net/phy/atheros.c
index 29db299c1e79..7577ebdbe833 100644
--- a/drivers/net/phy/atheros.c
+++ b/drivers/net/phy/atheros.c
@@ -12,6 +12,7 @@
 #include <linux/bitfield.h>
 #include <linux/bitops.h>
 #include <dt-bindings/net/qca-ar803x.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #define AR803x_PHY_DEBUG_ADDR_REG	0x1d
diff --git a/drivers/net/phy/b53.c b/drivers/net/phy/b53.c
index 2e4796f5d6c8..1bc9b2e4e7c8 100644
--- a/drivers/net/phy/b53.c
+++ b/drivers/net/phy/b53.c
@@ -28,6 +28,7 @@
 #include <vsprintf.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include <errno.h>
diff --git a/drivers/net/phy/cortina.c b/drivers/net/phy/cortina.c
index 18e9f5ab25ce..8ab483cdd58d 100644
--- a/drivers/net/phy/cortina.c
+++ b/drivers/net/phy/cortina.c
@@ -15,6 +15,7 @@
 #include <vsprintf.h>
 #include <linux/ctype.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/err.h>
 #include <phy.h>
diff --git a/drivers/net/phy/dp83867.c b/drivers/net/phy/dp83867.c
index e4081244f211..9f07045007c7 100644
--- a/drivers/net/phy/dp83867.c
+++ b/drivers/net/phy/dp83867.c
@@ -10,6 +10,7 @@
 #include <linux/bitops.h>
 #include <linux/compat.h>
 #include <malloc.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 #include <dm.h>
diff --git a/drivers/net/phy/fixed.c b/drivers/net/phy/fixed.c
index b4833c5ac96d..987cde1fc129 100644
--- a/drivers/net/phy/fixed.c
+++ b/drivers/net/phy/fixed.c
@@ -13,6 +13,7 @@
 #include <fdt_support.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
index a313e8bf917b..f03b5541a97e 100644
--- a/drivers/net/phy/marvell.c
+++ b/drivers/net/phy/marvell.c
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 #define PHY_AUTONEGOTIATE_TIMEOUT 5000
 
diff --git a/drivers/net/phy/meson-gxl.c b/drivers/net/phy/meson-gxl.c
index e7a1008f14de..d65368a85e1e 100644
--- a/drivers/net/phy/meson-gxl.c
+++ b/drivers/net/phy/meson-gxl.c
@@ -12,6 +12,7 @@
 #include <linux/bitops.h>
 #include <dm.h>
 #include <phy.h>
+#include <linux/errno.h>
 
 /* This function is provided to cope with the possible failures of this phy
  * during aneg process. When aneg fails, the PHY reports that aneg is done
diff --git a/drivers/net/phy/micrel_ksz90x1.c b/drivers/net/phy/micrel_ksz90x1.c
index f0032e8ce166..4c0b2f4af85e 100644
--- a/drivers/net/phy/micrel_ksz90x1.c
+++ b/drivers/net/phy/micrel_ksz90x1.c
@@ -14,6 +14,7 @@
 #include <errno.h>
 #include <micrel.h>
 #include <phy.h>
+#include <linux/errno.h>
 
 /*
  * KSZ9021 - KSZ9031 common
diff --git a/drivers/net/phy/mscc.c b/drivers/net/phy/mscc.c
index f8a4d0694406..f0d37d1b81fa 100644
--- a/drivers/net/phy/mscc.c
+++ b/drivers/net/phy/mscc.c
@@ -16,6 +16,7 @@
 #include <time.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 /* Microsemi PHY ID's */
diff --git a/drivers/net/phy/mv88e61xx.c b/drivers/net/phy/mv88e61xx.c
index 0a783e031298..927edb62a2ea 100644
--- a/drivers/net/phy/mv88e61xx.c
+++ b/drivers/net/phy/mv88e61xx.c
@@ -34,6 +34,7 @@
 #include <stdio.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include <bitfield.h>
diff --git a/drivers/net/phy/ncsi.c b/drivers/net/phy/ncsi.c
index f112fa2bee97..9f68d14bf53f 100644
--- a/drivers/net/phy/ncsi.c
+++ b/drivers/net/phy/ncsi.c
@@ -10,6 +10,7 @@
 #include <malloc.h>
 #include <phy.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <net/ncsi.h>
 #include <net/ncsi-pkt.h>
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 026ccc467f62..bda41672cc97 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -23,6 +23,7 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/compiler.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/net/phy/xilinx_gmii2rgmii.c b/drivers/net/phy/xilinx_gmii2rgmii.c
index 86492e90c4df..1a7b24f0f683 100644
--- a/drivers/net/phy/xilinx_gmii2rgmii.c
+++ b/drivers/net/phy/xilinx_gmii2rgmii.c
@@ -11,6 +11,7 @@
 #include <phy.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/net/phy/xilinx_phy.c b/drivers/net/phy/xilinx_phy.c
index 39dbfdb7da88..84fb1f0fe2e6 100644
--- a/drivers/net/phy/xilinx_phy.c
+++ b/drivers/net/phy/xilinx_phy.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <phy.h>
 #include <dm.h>
+#include <linux/errno.h>
 
 #define MII_PHY_STATUS_SPD_MASK		0x0C00
 #define MII_PHY_STATUS_FULLDUPLEX	0x1000
diff --git a/drivers/net/pic32_eth.c b/drivers/net/pic32_eth.c
index 5627b5d2d1a5..3be550e64d5b 100644
--- a/drivers/net/pic32_eth.c
+++ b/drivers/net/pic32_eth.c
@@ -18,6 +18,7 @@
 #include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/mii.h>
 
 #include "pic32_eth.h"
diff --git a/drivers/net/pic32_mdio.c b/drivers/net/pic32_mdio.c
index 963b9e7fc8fc..d30bceb4e53e 100644
--- a/drivers/net/pic32_mdio.c
+++ b/drivers/net/pic32_mdio.c
@@ -13,6 +13,7 @@
 #include <wait_bit.h>
 #include <asm/io.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include "pic32_eth.h"
 
diff --git a/drivers/net/ravb.c b/drivers/net/ravb.c
index b3f392cb8bf3..d9d376c09ec9 100644
--- a/drivers/net/ravb.c
+++ b/drivers/net/ravb.c
@@ -22,6 +22,7 @@
 #include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/mii.h>
 #include <wait_bit.h>
 #include <asm/io.h>
diff --git a/drivers/net/rtl8139.c b/drivers/net/rtl8139.c
index ba0f477bf23b..7c0bb2372d3c 100644
--- a/drivers/net/rtl8139.c
+++ b/drivers/net/rtl8139.c
@@ -82,6 +82,7 @@
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/types.h>
 
diff --git a/drivers/net/rtl8169.c b/drivers/net/rtl8169.c
index c64888be4904..9cc5cc8acf9f 100644
--- a/drivers/net/rtl8169.c
+++ b/drivers/net/rtl8169.c
@@ -57,6 +57,7 @@
 #include <pci.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/net/sandbox-raw-bus.c b/drivers/net/sandbox-raw-bus.c
index 6b111d47eea8..1509630b8350 100644
--- a/drivers/net/sandbox-raw-bus.c
+++ b/drivers/net/sandbox-raw-bus.c
@@ -11,6 +11,7 @@
 #include <malloc.h>
 #include <dm/device-internal.h>
 #include <dm/lists.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 static int eth_raw_bus_post_bind(struct udevice *dev)
diff --git a/drivers/net/sandbox.c b/drivers/net/sandbox.c
index 0551d0670b13..37eeaab4e82c 100644
--- a/drivers/net/sandbox.c
+++ b/drivers/net/sandbox.c
@@ -16,6 +16,7 @@
 #include <asm/eth.h>
 #include <asm/global_data.h>
 #include <asm/test.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
index 196020c1b812..8b1aae24467b 100644
--- a/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.c
@@ -13,6 +13,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/delay.h>
 #include <linux/string.h>
diff --git a/drivers/net/sni_ave.c b/drivers/net/sni_ave.c
index 13ec074acacb..eb422f33b706 100644
--- a/drivers/net/sni_ave.c
+++ b/drivers/net/sni_ave.c
@@ -22,6 +22,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/iopoll.h>
 #include <linux/printk.h>
diff --git a/drivers/net/sun8i_emac.c b/drivers/net/sun8i_emac.c
index 0715cf81c740..8b94322ae746 100644
--- a/drivers/net/sun8i_emac.c
+++ b/drivers/net/sun8i_emac.c
@@ -36,6 +36,7 @@
 #if CONFIG_IS_ENABLED(DM_GPIO)
 #include <asm-generic/gpio.h>
 #endif
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #define MDIO_CMD_MII_BUSY		BIT(0)
diff --git a/drivers/net/sunxi_emac.c b/drivers/net/sunxi_emac.c
index 009d0de48454..4470c741fa9e 100644
--- a/drivers/net/sunxi_emac.c
+++ b/drivers/net/sunxi_emac.c
@@ -19,6 +19,7 @@
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/gpio.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 /* EMAC register  */
diff --git a/drivers/net/ti/am65-cpsw-nuss.c b/drivers/net/ti/am65-cpsw-nuss.c
index 571f1ebfc46c..14956af45804 100644
--- a/drivers/net/ti/am65-cpsw-nuss.c
+++ b/drivers/net/ti/am65-cpsw-nuss.c
@@ -23,6 +23,7 @@
 #include <phy.h>
 #include <power-domain.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/soc/ti/ti-udma.h>
 
diff --git a/drivers/net/ti/cpsw-common.c b/drivers/net/ti/cpsw-common.c
index 9ed0b56cc800..0b4adb1aa61d 100644
--- a/drivers/net/ti/cpsw-common.c
+++ b/drivers/net/ti/cpsw-common.c
@@ -12,6 +12,7 @@
 #include <asm/io.h>
 #include <cpsw.h>
 #include <dm/device_compat.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/net/ti/cpsw_mdio.c b/drivers/net/ti/cpsw_mdio.c
index e47d5a2a5c55..2e70477756ac 100644
--- a/drivers/net/ti/cpsw_mdio.c
+++ b/drivers/net/ti/cpsw_mdio.c
@@ -14,6 +14,7 @@
 #include <wait_bit.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 struct cpsw_mdio_regs {
 	u32	version;
diff --git a/drivers/net/ti/davinci_emac.c b/drivers/net/ti/davinci_emac.c
index 19041be320ef..272127903f50 100644
--- a/drivers/net/ti/davinci_emac.c
+++ b/drivers/net/ti/davinci_emac.c
@@ -35,6 +35,7 @@
 #include <asm/arch/emac_defs.h>
 #include <asm/io.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include "davinci_emac.h"
 
diff --git a/drivers/net/ti/keystone_net.c b/drivers/net/ti/keystone_net.c
index 96bbb219d5d6..a6062e336383 100644
--- a/drivers/net/ti/keystone_net.c
+++ b/drivers/net/ti/keystone_net.c
@@ -12,6 +12,7 @@
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 #include <dm.h>
diff --git a/drivers/net/vsc9953.c b/drivers/net/vsc9953.c
index 4ae225e879f4..36960bf12340 100644
--- a/drivers/net/vsc9953.c
+++ b/drivers/net/vsc9953.c
@@ -21,6 +21,7 @@
 #include <ethsw.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 static struct vsc9953_info vsc9953_l2sw = {
 		.port[0] = VSC9953_PORT_INFO_INITIALIZER(0),
diff --git a/drivers/net/xilinx_axi_emac.c b/drivers/net/xilinx_axi_emac.c
index f6cf8df44fff..0da2385a92e9 100644
--- a/drivers/net/xilinx_axi_emac.c
+++ b/drivers/net/xilinx_axi_emac.c
@@ -20,6 +20,7 @@
 #include <miiphy.h>
 #include <wait_bit.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/nvme/nvme.c b/drivers/nvme/nvme.c
index 9ce57335bc68..47a401cc96f1 100644
--- a/drivers/nvme/nvme.c
+++ b/drivers/nvme/nvme.c
@@ -18,6 +18,7 @@
 #include <vsprintf.h>
 #include <dm/device-internal.h>
 #include <linux/compat.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include "nvme.h"
 
diff --git a/drivers/nvme/nvme_show.c b/drivers/nvme/nvme_show.c
index 5a0bb4a223ee..2c3d7bcfa006 100644
--- a/drivers/nvme/nvme_show.c
+++ b/drivers/nvme/nvme_show.c
@@ -10,6 +10,7 @@
 #include <memalign.h>
 #include <nvme.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include "nvme.h"
 
 static void print_optional_admin_cmd(u16 oacs, int devnum)
diff --git a/drivers/pch/pch-uclass.c b/drivers/pch/pch-uclass.c
index ad4906aa58b4..be9b89539f01 100644
--- a/drivers/pch/pch-uclass.c
+++ b/drivers/pch/pch-uclass.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <pch.h>
+#include <linux/errno.h>
 
 int pch_get_spi_base(struct udevice *dev, ulong *sbasep)
 {
diff --git a/drivers/pch/pch7.c b/drivers/pch/pch7.c
index 5fb35a19effe..8fc6388593f2 100644
--- a/drivers/pch/pch7.c
+++ b/drivers/pch/pch7.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <log.h>
 #include <pch.h>
+#include <linux/errno.h>
 
 #define GPIO_BASE	0x44
 #define BIOS_CTRL	0xd8
diff --git a/drivers/pch/pch9.c b/drivers/pch/pch9.c
index 3bd011518b3a..f36b70c53ab7 100644
--- a/drivers/pch/pch9.c
+++ b/drivers/pch/pch9.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <log.h>
 #include <pch.h>
+#include <linux/errno.h>
 
 #define GPIO_BASE	0x48
 #define IO_BASE		0x4c
diff --git a/drivers/pch/sandbox_pch.c b/drivers/pch/sandbox_pch.c
index 76f552527e37..c9317f1fda2c 100644
--- a/drivers/pch/sandbox_pch.c
+++ b/drivers/pch/sandbox_pch.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <dm.h>
 #include <pch.h>
+#include <linux/errno.h>
 
 struct sandbox_pch_priv {
 	bool protect;
diff --git a/drivers/pci/pci-aardvark.c b/drivers/pci/pci-aardvark.c
index 76234ea61c46..f2c2eb3870f3 100644
--- a/drivers/pci/pci-aardvark.c
+++ b/drivers/pci/pci-aardvark.c
@@ -33,6 +33,7 @@
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/ioport.h>
 
 /* PCIe core registers */
diff --git a/drivers/pci/pci-emul-uclass.c b/drivers/pci/pci-emul-uclass.c
index a52064341e0d..6a2242ab00cb 100644
--- a/drivers/pci/pci-emul-uclass.c
+++ b/drivers/pci/pci-emul-uclass.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <fdtdec.h>
 #include <log.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <pci.h>
 #include <dm/lists.h>
diff --git a/drivers/pci/pci-rcar-gen2.c b/drivers/pci/pci-rcar-gen2.c
index e76abc1f84c1..d73c171846f8 100644
--- a/drivers/pci/pci-rcar-gen2.c
+++ b/drivers/pci/pci-rcar-gen2.c
@@ -12,6 +12,7 @@
 #include <errno.h>
 #include <pci.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 /* AHB-PCI Bridge PCI communication registers */
 #define RCAR_AHBPCI_PCICOM_OFFSET	0x800
diff --git a/drivers/pci/pci-rcar-gen3.c b/drivers/pci/pci-rcar-gen3.c
index 1f51854ccc6f..9a990a063245 100644
--- a/drivers/pci/pci-rcar-gen3.c
+++ b/drivers/pci/pci-rcar-gen3.c
@@ -23,6 +23,7 @@
 #include <pci.h>
 #include <wait_bit.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #define PCIECAR			0x000010
 #define PCIECCTLR		0x000018
diff --git a/drivers/pci/pci-uclass.c b/drivers/pci/pci-uclass.c
index 32b6f0619e22..f3c243be31ae 100644
--- a/drivers/pci/pci-uclass.c
+++ b/drivers/pci/pci-uclass.c
@@ -22,6 +22,7 @@
 #include <asm/fsp/fsp_support.h>
 #endif
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include "pci_internal.h"
diff --git a/drivers/pci/pci_common.c b/drivers/pci/pci_common.c
index e7469d88d826..7ee0980bb759 100644
--- a/drivers/pci/pci_common.c
+++ b/drivers/pci/pci_common.c
@@ -16,6 +16,7 @@
 #include <pci.h>
 #include <stdio.h>
 #include <asm/io.h>
+#include <linux/errno.h>
 
 const char *pci_class_str(u8 class)
 {
diff --git a/drivers/pci/pci_mpc85xx.c b/drivers/pci/pci_mpc85xx.c
index d7073a496940..d207f8e645ba 100644
--- a/drivers/pci/pci_mpc85xx.c
+++ b/drivers/pci/pci_mpc85xx.c
@@ -11,6 +11,7 @@
 #include <pci.h>
 #include <dm.h>
 #include <asm/fsl_law.h>
+#include <linux/errno.h>
 
 struct mpc85xx_pci_priv {
 	void __iomem		*cfg_addr;
diff --git a/drivers/pci/pci_rom.c b/drivers/pci/pci_rom.c
index 3a046df743d5..85ad27322f9c 100644
--- a/drivers/pci/pci_rom.c
+++ b/drivers/pci/pci_rom.c
@@ -41,6 +41,7 @@
 #include <video_fb.h>
 #include <acpi/acpi_s3.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/screen_info.h>
 #include <linux/string.h>
 
diff --git a/drivers/pci/pci_sandbox.c b/drivers/pci/pci_sandbox.c
index 8745f286bd4a..4af0bf730347 100644
--- a/drivers/pci/pci_sandbox.c
+++ b/drivers/pci/pci_sandbox.c
@@ -9,6 +9,7 @@
 #include <fdtdec.h>
 #include <log.h>
 #include <pci.h>
+#include <linux/errno.h>
 
 #define FDT_DEV_INFO_CELLS	4
 #define FDT_DEV_INFO_SIZE	(FDT_DEV_INFO_CELLS * sizeof(u32))
diff --git a/drivers/pci/pci_sh7751.c b/drivers/pci/pci_sh7751.c
index 62d098d378f5..d5d1147f37db 100644
--- a/drivers/pci/pci_sh7751.c
+++ b/drivers/pci/pci_sh7751.c
@@ -14,6 +14,7 @@
 #include <asm/pci.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 /* Register addresses and such */
 #define SH7751_BCR1	(vu_long *)0xFF800000
diff --git a/drivers/pci/pci_tegra.c b/drivers/pci/pci_tegra.c
index 8845dc451e55..5f8cde34bdf5 100644
--- a/drivers/pci/pci_tegra.c
+++ b/drivers/pci/pci_tegra.c
@@ -23,6 +23,7 @@
 #include <reset.h>
 #include <time.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/pci/pcie_brcmstb.c b/drivers/pci/pcie_brcmstb.c
index 4fd4d4dfbd1e..10a19bdc9502 100644
--- a/drivers/pci/pcie_brcmstb.c
+++ b/drivers/pci/pcie_brcmstb.c
@@ -20,6 +20,7 @@
 #include <pci.h>
 #include <asm/io.h>
 #include <linux/bitfield.h>
+#include <linux/errno.h>
 #include <linux/log2.h>
 #include <linux/iopoll.h>
 
diff --git a/drivers/pci/pcie_dw_mvebu.c b/drivers/pci/pcie_dw_mvebu.c
index b1f2750888cc..287736cd88c0 100644
--- a/drivers/pci/pcie_dw_mvebu.c
+++ b/drivers/pci/pcie_dw_mvebu.c
@@ -20,6 +20,7 @@
 #include <asm/io.h>
 #include <asm-generic/gpio.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/pci/pcie_dw_ti.c b/drivers/pci/pcie_dw_ti.c
index 3d86bdaaafb7..00b9a2418ab1 100644
--- a/drivers/pci/pcie_dw_ti.c
+++ b/drivers/pci/pcie_dw_ti.c
@@ -20,6 +20,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/pci/pcie_fsl.c b/drivers/pci/pcie_fsl.c
index e609ac58d40f..89a1490e2aca 100644
--- a/drivers/pci/pcie_fsl.c
+++ b/drivers/pci/pcie_fsl.c
@@ -18,6 +18,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include "pcie_fsl.h"
 #include <dm/device_compat.h>
diff --git a/drivers/pci/pcie_imx.c b/drivers/pci/pcie_imx.c
index ab3d96efc533..928f624da9a7 100644
--- a/drivers/pci/pcie_imx.c
+++ b/drivers/pci/pcie_imx.c
@@ -22,6 +22,7 @@
 #include <asm/io.h>
 #include <dm.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/sizes.h>
 #include <errno.h>
 #include <asm/arch/sys_proto.h>
diff --git a/drivers/pci/pcie_intel_fpga.c b/drivers/pci/pcie_intel_fpga.c
index 2aedbdd0e568..bc9375326426 100644
--- a/drivers/pci/pcie_intel_fpga.c
+++ b/drivers/pci/pcie_intel_fpga.c
@@ -14,6 +14,7 @@
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 #define RP_TX_REG0			0x2000
 #define RP_TX_CNTRL			0x2004
diff --git a/drivers/pci/pcie_layerscape_ep.c b/drivers/pci/pcie_layerscape_ep.c
index 0661834c1102..f6d4ae25cbe5 100644
--- a/drivers/pci/pcie_layerscape_ep.c
+++ b/drivers/pci/pcie_layerscape_ep.c
@@ -12,6 +12,7 @@
 #include <errno.h>
 #include <pci_ep.h>
 #include <asm/io.h>
+#include <linux/errno.h>
 #include <linux/sizes.h>
 #include <linux/log2.h>
 #include "pcie_layerscape.h"
diff --git a/drivers/pci/pcie_layerscape_fixup.c b/drivers/pci/pcie_layerscape_fixup.c
index 7f5d6f693c5c..2adc2aa251bb 100644
--- a/drivers/pci/pcie_layerscape_fixup.c
+++ b/drivers/pci/pcie_layerscape_fixup.c
@@ -20,6 +20,7 @@
 #include <asm/arch/clock.h>
 #endif
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 #include "pcie_layerscape.h"
 #include "pcie_layerscape_fixup_common.h"
 
diff --git a/drivers/pci/pcie_layerscape_fixup_common.c b/drivers/pci/pcie_layerscape_fixup_common.c
index b1a7578ec435..05b5f76cf2c1 100644
--- a/drivers/pci/pcie_layerscape_fixup_common.c
+++ b/drivers/pci/pcie_layerscape_fixup_common.c
@@ -12,6 +12,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/soc.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <linux/string.h>
 #include "pcie_layerscape_fixup_common.h"
diff --git a/drivers/pci/pcie_layerscape_gen4.c b/drivers/pci/pcie_layerscape_gen4.c
index 369124c2b8be..dcb991596b0e 100644
--- a/drivers/pci/pcie_layerscape_gen4.c
+++ b/drivers/pci/pcie_layerscape_gen4.c
@@ -16,6 +16,7 @@
 #include <errno.h>
 #include <malloc.h>
 #include <dm.h>
+#include <linux/errno.h>
 #include <linux/sizes.h>
 
 #include "pcie_layerscape_gen4.h"
diff --git a/drivers/pci/pcie_layerscape_gen4_fixup.c b/drivers/pci/pcie_layerscape_gen4_fixup.c
index ad329f7dd555..e16c0daa7858 100644
--- a/drivers/pci/pcie_layerscape_gen4_fixup.c
+++ b/drivers/pci/pcie_layerscape_gen4_fixup.c
@@ -21,6 +21,7 @@
 #include <asm/arch/clock.h>
 #endif
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 #include "pcie_layerscape_gen4.h"
 #include "pcie_layerscape_fixup_common.h"
 
diff --git a/drivers/pci/pcie_layerscape_rc.c b/drivers/pci/pcie_layerscape_rc.c
index 397c9ea5e603..973a481c3b43 100644
--- a/drivers/pci/pcie_layerscape_rc.c
+++ b/drivers/pci/pcie_layerscape_rc.c
@@ -18,6 +18,7 @@
 	defined(CONFIG_ARM)
 #include <asm/arch/clock.h>
 #endif
+#include <linux/errno.h>
 #include "pcie_layerscape.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/pci/pcie_mediatek.c b/drivers/pci/pcie_mediatek.c
index 8318b9ee7962..29d82739486e 100644
--- a/drivers/pci/pcie_mediatek.c
+++ b/drivers/pci/pcie_mediatek.c
@@ -19,6 +19,7 @@
 #include <asm/io.h>
 #include <dm/devres.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/iopoll.h>
 #include <linux/list.h>
 #include <linux/printk.h>
diff --git a/drivers/pci/pcie_phytium.c b/drivers/pci/pcie_phytium.c
index 926e7b33a867..3d91706ccf1c 100644
--- a/drivers/pci/pcie_phytium.c
+++ b/drivers/pci/pcie_phytium.c
@@ -12,6 +12,7 @@
 #include <pci.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 /**
diff --git a/drivers/pci/pcie_rockchip.c b/drivers/pci/pcie_rockchip.c
index 7d84be36be98..460d74a3088b 100644
--- a/drivers/pci/pcie_rockchip.c
+++ b/drivers/pci/pcie_rockchip.c
@@ -19,6 +19,7 @@
 #include <generic-phy.h>
 #include <pci.h>
 #include <power-domain.h>
+#include <linux/errno.h>
 #include <power/regulator.h>
 #include <reset.h>
 #include <syscon.h>
diff --git a/drivers/pci/pcie_xilinx.c b/drivers/pci/pcie_xilinx.c
index 600c69e20cfb..442a21c11152 100644
--- a/drivers/pci/pcie_xilinx.c
+++ b/drivers/pci/pcie_xilinx.c
@@ -10,6 +10,7 @@
 #include <pci.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 #include <asm/io.h>
diff --git a/drivers/pci_endpoint/pci_ep-uclass.c b/drivers/pci_endpoint/pci_ep-uclass.c
index 71b6bfa63828..aba38c3fe79a 100644
--- a/drivers/pci_endpoint/pci_ep-uclass.c
+++ b/drivers/pci_endpoint/pci_ep-uclass.c
@@ -13,6 +13,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/log2.h>
 #include <pci_ep.h>
 
diff --git a/drivers/pci_endpoint/pcie-cadence-ep.c b/drivers/pci_endpoint/pcie-cadence-ep.c
index e392fae338ad..44cce69a9aa1 100644
--- a/drivers/pci_endpoint/pcie-cadence-ep.c
+++ b/drivers/pci_endpoint/pcie-cadence-ep.c
@@ -9,6 +9,7 @@
 #include <errno.h>
 #include <pci_ep.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/sizes.h>
 #include <linux/log2.h>
 #include "pcie-cadence.h"
diff --git a/drivers/pci_endpoint/sandbox-pci_ep.c b/drivers/pci_endpoint/sandbox-pci_ep.c
index d1e552a24662..59c330066d7f 100644
--- a/drivers/pci_endpoint/sandbox-pci_ep.c
+++ b/drivers/pci_endpoint/sandbox-pci_ep.c
@@ -9,6 +9,7 @@
 #include <pci.h>
 #include <pci_ep.h>
 #include <asm/test.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 /**
diff --git a/drivers/phy/allwinner/phy-sun4i-usb.c b/drivers/phy/allwinner/phy-sun4i-usb.c
index 16c412b245d6..17c2de2caee0 100644
--- a/drivers/phy/allwinner/phy-sun4i-usb.c
+++ b/drivers/phy/allwinner/phy-sun4i-usb.c
@@ -27,6 +27,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #define REG_ISCR			0x00
diff --git a/drivers/phy/bcm6318-usbh-phy.c b/drivers/phy/bcm6318-usbh-phy.c
index d29344ddb484..f6b7e4c1ca58 100644
--- a/drivers/phy/bcm6318-usbh-phy.c
+++ b/drivers/phy/bcm6318-usbh-phy.c
@@ -19,6 +19,7 @@
 #include <dm/device.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 /* USBH Setup register */
 #define USBH_SETUP_REG		0x00
diff --git a/drivers/phy/bcm6348-usbh-phy.c b/drivers/phy/bcm6348-usbh-phy.c
index 8d28292726ce..13031b886d47 100644
--- a/drivers/phy/bcm6348-usbh-phy.c
+++ b/drivers/phy/bcm6348-usbh-phy.c
@@ -17,6 +17,7 @@
 #include <asm/io.h>
 #include <dm/device.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #define USBH_SETUP_PORT1_EN	BIT(0)
 
diff --git a/drivers/phy/bcm6358-usbh-phy.c b/drivers/phy/bcm6358-usbh-phy.c
index 501b97f3e213..aaa32315fa74 100644
--- a/drivers/phy/bcm6358-usbh-phy.c
+++ b/drivers/phy/bcm6358-usbh-phy.c
@@ -16,6 +16,7 @@
 #include <asm/io.h>
 #include <dm/device.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 /* USBH Swap Control register */
 #define USBH_SWAP_REG		0x00
diff --git a/drivers/phy/bcm6368-usbh-phy.c b/drivers/phy/bcm6368-usbh-phy.c
index 99fdd33499ad..3bd4d6884193 100644
--- a/drivers/phy/bcm6368-usbh-phy.c
+++ b/drivers/phy/bcm6368-usbh-phy.c
@@ -19,6 +19,7 @@
 #include <dm/device.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 /* USBH PLL Control register */
 #define USBH_PLL_REG		0x18
diff --git a/drivers/phy/keystone-usb-phy.c b/drivers/phy/keystone-usb-phy.c
index 27e1d35fc127..2806ee50ead4 100644
--- a/drivers/phy/keystone-usb-phy.c
+++ b/drivers/phy/keystone-usb-phy.c
@@ -13,6 +13,7 @@
 #include <asm/arch/psc_defs.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 /* USB PHY control register offsets */
diff --git a/drivers/phy/meson-g12a-usb2.c b/drivers/phy/meson-g12a-usb2.c
index 734c79b78aa1..3a63900833e3 100644
--- a/drivers/phy/meson-g12a-usb2.c
+++ b/drivers/phy/meson-g12a-usb2.c
@@ -17,6 +17,7 @@
 #include <generic-phy.h>
 #include <regmap.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <power/regulator.h>
 #include <reset.h>
diff --git a/drivers/phy/meson-g12a-usb3-pcie.c b/drivers/phy/meson-g12a-usb3-pcie.c
index dc5dd62381f9..02feae1e2cd8 100644
--- a/drivers/phy/meson-g12a-usb3-pcie.c
+++ b/drivers/phy/meson-g12a-usb3-pcie.c
@@ -18,6 +18,7 @@
 #include <bitfield.h>
 #include <generic-phy.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 #include <linux/bitops.h>
diff --git a/drivers/phy/meson-gxbb-usb2.c b/drivers/phy/meson-gxbb-usb2.c
index 6ae06364a57c..8a06bc5aadb9 100644
--- a/drivers/phy/meson-gxbb-usb2.c
+++ b/drivers/phy/meson-gxbb-usb2.c
@@ -12,6 +12,7 @@
 #include <clk.h>
 #include <dm.h>
 #include <generic-phy.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <power/regulator.h>
 #include <regmap.h>
diff --git a/drivers/phy/meson-gxl-usb2.c b/drivers/phy/meson-gxl-usb2.c
index 4bddd0eed9e2..ebfde063ee8b 100644
--- a/drivers/phy/meson-gxl-usb2.c
+++ b/drivers/phy/meson-gxl-usb2.c
@@ -16,6 +16,7 @@
 #include <generic-phy.h>
 #include <regmap.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <power/regulator.h>
 #include <clk.h>
diff --git a/drivers/phy/meson-gxl-usb3.c b/drivers/phy/meson-gxl-usb3.c
index 875fe6b44a6f..f566ef786638 100644
--- a/drivers/phy/meson-gxl-usb3.c
+++ b/drivers/phy/meson-gxl-usb3.c
@@ -16,6 +16,7 @@
 #include <generic-phy.h>
 #include <regmap.h>
 #include <clk.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/usb/otg.h>
 
diff --git a/drivers/phy/msm8916-usbh-phy.c b/drivers/phy/msm8916-usbh-phy.c
index 4efaddd701cc..5883926f0877 100644
--- a/drivers/phy/msm8916-usbh-phy.c
+++ b/drivers/phy/msm8916-usbh-phy.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <generic-phy.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <usb/ehci-ci.h>
 #include <usb/ulpi.h>
 #include <asm/io.h>
diff --git a/drivers/phy/mt76x8-usb-phy.c b/drivers/phy/mt76x8-usb-phy.c
index 4c0818f6e8da..8c05e5e00df2 100644
--- a/drivers/phy/mt76x8-usb-phy.c
+++ b/drivers/phy/mt76x8-usb-phy.c
@@ -15,6 +15,7 @@
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 #define OFS_U2_PHY_AC0			0x800
 #define USBPLL_FBDIV_S			16
diff --git a/drivers/phy/omap-usb2-phy.c b/drivers/phy/omap-usb2-phy.c
index a460a0560c3a..df9ee1402917 100644
--- a/drivers/phy/omap-usb2-phy.c
+++ b/drivers/phy/omap-usb2-phy.c
@@ -17,6 +17,7 @@
 #include <syscon.h>
 #include <linux/bitops.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 
 #define OMAP_USB2_CALIBRATE_FALSE_DISCONNECT	BIT(0)
 #define OMAP_USB2_DISABLE_CHG_DET		BIT(1)
diff --git a/drivers/phy/phy-da8xx-usb.c b/drivers/phy/phy-da8xx-usb.c
index ec87d3fea2d0..943c908fafaa 100644
--- a/drivers/phy/phy-da8xx-usb.c
+++ b/drivers/phy/phy-da8xx-usb.c
@@ -16,6 +16,7 @@
 #include <asm/arch/da8xx-usb.h>
 #include <asm/io.h>
 #include <generic-phy.h>
+#include <linux/errno.h>
 
 static int da8xx_usb_phy_power_on(struct phy *phy)
 {
diff --git a/drivers/phy/phy-mtk-tphy.c b/drivers/phy/phy-mtk-tphy.c
index 1e65c24356e3..375a7575b779 100644
--- a/drivers/phy/phy-mtk-tphy.c
+++ b/drivers/phy/phy-mtk-tphy.c
@@ -16,6 +16,7 @@
 #include <dm/devres.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 #include <dt-bindings/phy/phy.h>
 
diff --git a/drivers/phy/phy-rcar-gen2.c b/drivers/phy/phy-rcar-gen2.c
index 18da86e4bea5..db32d3b1a41c 100644
--- a/drivers/phy/phy-rcar-gen2.c
+++ b/drivers/phy/phy-rcar-gen2.c
@@ -19,6 +19,7 @@
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <power/regulator.h>
 
 #define USBHS_LPSTS			0x02
diff --git a/drivers/phy/phy-rcar-gen3.c b/drivers/phy/phy-rcar-gen3.c
index 4afdb791505a..fdd61efe4aca 100644
--- a/drivers/phy/phy-rcar-gen3.c
+++ b/drivers/phy/phy-rcar-gen3.c
@@ -17,6 +17,7 @@
 #include <usb.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <power/regulator.h>
 
diff --git a/drivers/phy/phy-stm32-usbphyc.c b/drivers/phy/phy-stm32-usbphyc.c
index d61a33422bc9..c66d185cc82d 100644
--- a/drivers/phy/phy-stm32-usbphyc.c
+++ b/drivers/phy/phy-stm32-usbphyc.c
@@ -17,6 +17,7 @@
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <power/regulator.h>
 
diff --git a/drivers/phy/phy-ti-am654.c b/drivers/phy/phy-ti-am654.c
index 6907c1afb395..fa22b7145405 100644
--- a/drivers/phy/phy-ti-am654.c
+++ b/drivers/phy/phy-ti-am654.c
@@ -23,6 +23,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 
 #define CMU_R07C		0x7c
 #define CMU_MASTER_CDN_O	BIT(24)
diff --git a/drivers/phy/phy-uclass.c b/drivers/phy/phy-uclass.c
index af5c2c6497aa..bde8d029a441 100644
--- a/drivers/phy/phy-uclass.c
+++ b/drivers/phy/phy-uclass.c
@@ -9,6 +9,7 @@
 #include <dm/devres.h>
 #include <generic-phy.h>
 #include <log.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 static inline struct phy_ops *phy_dev_ops(struct udevice *dev)
diff --git a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
index 75bd0fff5db3..93d3696b133e 100644
--- a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
+++ b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
@@ -17,6 +17,7 @@
 #include <syscon.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
+#include <linux/errno.h>
 #include <linux/iopoll.h>
 #include <asm/arch-rockchip/clock.h>
 #include <linux/string.h>
diff --git a/drivers/phy/rockchip/phy-rockchip-pcie.c b/drivers/phy/rockchip/phy-rockchip-pcie.c
index c3bec8263f8e..fc7801224ace 100644
--- a/drivers/phy/rockchip/phy-rockchip-pcie.c
+++ b/drivers/phy/rockchip/phy-rockchip-pcie.c
@@ -17,6 +17,7 @@
 #include <syscon.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
+#include <linux/errno.h>
 #include <linux/iopoll.h>
 #include <asm/arch-rockchip/clock.h>
 
diff --git a/drivers/phy/rockchip/phy-rockchip-typec.c b/drivers/phy/rockchip/phy-rockchip-typec.c
index 9a9a653c7efb..f018a95497da 100644
--- a/drivers/phy/rockchip/phy-rockchip-typec.c
+++ b/drivers/phy/rockchip/phy-rockchip-typec.c
@@ -19,6 +19,7 @@
 #include <syscon.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
+#include <linux/errno.h>
 #include <linux/iopoll.h>
 #include <asm/arch-rockchip/clock.h>
 #include <linux/string.h>
diff --git a/drivers/phy/sandbox-phy.c b/drivers/phy/sandbox-phy.c
index 84ff5c6275b5..5b867a6294e9 100644
--- a/drivers/phy/sandbox-phy.c
+++ b/drivers/phy/sandbox-phy.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <generic-phy.h>
+#include <linux/errno.h>
 
 struct sandbox_phy_priv {
 	bool initialized;
diff --git a/drivers/phy/sti_usb_phy.c b/drivers/phy/sti_usb_phy.c
index cfc24e76b249..03a4d61434e0 100644
--- a/drivers/phy/sti_usb_phy.c
+++ b/drivers/phy/sti_usb_phy.c
@@ -13,6 +13,7 @@
 #include <errno.h>
 #include <fdtdec.h>
 #include <generic-phy.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <regmap.h>
 #include <reset-uclass.h>
diff --git a/drivers/phy/ti-pipe3-phy.c b/drivers/phy/ti-pipe3-phy.c
index 2aa2a90c47c8..96a573add48f 100644
--- a/drivers/phy/ti-pipe3-phy.c
+++ b/drivers/phy/ti-pipe3-phy.c
@@ -17,6 +17,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 /* PLLCTRL Registers */
diff --git a/drivers/pinctrl/aspeed/pinctrl_ast2500.c b/drivers/pinctrl/aspeed/pinctrl_ast2500.c
index 05ef24864f2e..3f57aabea1d3 100644
--- a/drivers/pinctrl/aspeed/pinctrl_ast2500.c
+++ b/drivers/pinctrl/aspeed/pinctrl_ast2500.c
@@ -11,6 +11,7 @@
 #include <asm/arch/pinctrl.h>
 #include <asm/arch/scu_ast2500.h>
 #include <dm/pinctrl.h>
+#include <linux/errno.h>
 
 /*
  * This driver works with very simple configuration that has the same name
diff --git a/drivers/pinctrl/ath79/pinctrl_ar933x.c b/drivers/pinctrl/ath79/pinctrl_ar933x.c
index b3f9f6a01fd7..9f8ecf49ca46 100644
--- a/drivers/pinctrl/ath79/pinctrl_ar933x.c
+++ b/drivers/pinctrl/ath79/pinctrl_ar933x.c
@@ -10,6 +10,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm/pinctrl.h>
+#include <linux/errno.h>
 #include <mach/ar71xx_regs.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/pinctrl/ath79/pinctrl_qca953x.c b/drivers/pinctrl/ath79/pinctrl_qca953x.c
index d27848c1ddd6..409ab0411739 100644
--- a/drivers/pinctrl/ath79/pinctrl_qca953x.c
+++ b/drivers/pinctrl/ath79/pinctrl_qca953x.c
@@ -10,6 +10,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm/pinctrl.h>
+#include <linux/errno.h>
 #include <mach/ar71xx_regs.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/pinctrl/broadcom/pinctrl-bcm283x.c b/drivers/pinctrl/broadcom/pinctrl-bcm283x.c
index 775a8a0a48ae..a7c928c71e39 100644
--- a/drivers/pinctrl/broadcom/pinctrl-bcm283x.c
+++ b/drivers/pinctrl/broadcom/pinctrl-bcm283x.c
@@ -23,6 +23,7 @@
 #include <asm/system.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
+#include <linux/errno.h>
 
 struct bcm283x_pinctrl_priv {
 	u32 *base_reg;
diff --git a/drivers/pinctrl/broadcom/pinctrl-bcm6838.c b/drivers/pinctrl/broadcom/pinctrl-bcm6838.c
index af10ead601f1..2f871b611fd5 100644
--- a/drivers/pinctrl/broadcom/pinctrl-bcm6838.c
+++ b/drivers/pinctrl/broadcom/pinctrl-bcm6838.c
@@ -7,6 +7,7 @@
 #include <vsprintf.h>
 #include <dm/device_compat.h>
 #include <dm/pinctrl.h>
+#include <linux/errno.h>
 
 #define BCM6838_CMD_LOAD_MUX            0x21
 
diff --git a/drivers/pinctrl/exynos/pinctrl-exynos.c b/drivers/pinctrl/exynos/pinctrl-exynos.c
index 6034794f6713..4a49519416c3 100644
--- a/drivers/pinctrl/exynos/pinctrl-exynos.c
+++ b/drivers/pinctrl/exynos/pinctrl-exynos.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include "pinctrl-exynos.h"
 
diff --git a/drivers/pinctrl/exynos/pinctrl-exynos7420.c b/drivers/pinctrl/exynos/pinctrl-exynos7420.c
index ff6d6c4143f5..7f1aeeda940e 100644
--- a/drivers/pinctrl/exynos/pinctrl-exynos7420.c
+++ b/drivers/pinctrl/exynos/pinctrl-exynos7420.c
@@ -13,6 +13,7 @@
 #include <dm/root.h>
 #include <fdtdec.h>
 #include <asm/arch/pinmux.h>
+#include <linux/errno.h>
 #include "pinctrl-exynos.h"
 
 #define	GPD1_OFFSET	0xc0
diff --git a/drivers/pinctrl/intel/pinctrl.c b/drivers/pinctrl/intel/pinctrl.c
index 933175d2b6c5..aa261a8bdc5d 100644
--- a/drivers/pinctrl/intel/pinctrl.c
+++ b/drivers/pinctrl/intel/pinctrl.c
@@ -32,6 +32,7 @@
 #include <dm/device-internal.h>
 #include <dt-bindings/gpio/gpio.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 
 #define GPIO_DW_SIZE(x)			(sizeof(u32) * (x))
 #define PAD_CFG_OFFSET(x, dw_num)	((x) + GPIO_DW_SIZE(dw_num))
diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
index 6553dde45c2c..9227e5948c8f 100644
--- a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
@@ -12,6 +12,7 @@
 #include <asm/io.h>
 #include <asm-generic/gpio.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #include "pinctrl-mtk-common.h"
 
diff --git a/drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c b/drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c
index 8246aa6890e1..0ed4b50b4589 100644
--- a/drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c
+++ b/drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <dm.h>
 #include <dm/pinctrl.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include "pinctrl-meson-axg.h"
 
diff --git a/drivers/pinctrl/meson/pinctrl-meson.c b/drivers/pinctrl/meson/pinctrl-meson.c
index 8a3c292548e5..ad44da1e8bba 100644
--- a/drivers/pinctrl/meson/pinctrl-meson.c
+++ b/drivers/pinctrl/meson/pinctrl-meson.c
@@ -17,6 +17,7 @@
 #include <fdt_support.h>
 #include <linux/bitops.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/libfdt.h>
 #include <linux/sizes.h>
diff --git a/drivers/pinctrl/mscc/mscc-common.c b/drivers/pinctrl/mscc/mscc-common.c
index 307ed1db8750..308f23b742df 100644
--- a/drivers/pinctrl/mscc/mscc-common.c
+++ b/drivers/pinctrl/mscc/mscc-common.c
@@ -22,6 +22,7 @@
 #include <errno.h>
 #include <fdtdec.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include "mscc-common.h"
 
diff --git a/drivers/pinctrl/mtmips/pinctrl-mt7628.c b/drivers/pinctrl/mtmips/pinctrl-mt7628.c
index 1b51c2292717..2e043509cf84 100644
--- a/drivers/pinctrl/mtmips/pinctrl-mt7628.c
+++ b/drivers/pinctrl/mtmips/pinctrl-mt7628.c
@@ -10,6 +10,7 @@
 #include <asm/global_data.h>
 #include <dm/pinctrl.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 
 #include "pinctrl-mtmips-common.h"
diff --git a/drivers/pinctrl/mtmips/pinctrl-mtmips-common.c b/drivers/pinctrl/mtmips/pinctrl-mtmips-common.c
index d5262438e17b..ad9bd0311cc7 100644
--- a/drivers/pinctrl/mtmips/pinctrl-mtmips-common.c
+++ b/drivers/pinctrl/mtmips/pinctrl-mtmips-common.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <malloc.h>
 #include <dm/pinctrl.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/string.h>
 
diff --git a/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c b/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c
index 1e8c345b8477..c52b8f5df337 100644
--- a/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c
+++ b/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c
@@ -36,6 +36,7 @@
 #include <asm/system.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <linux/printk.h>
 #include <linux/string.h>
diff --git a/drivers/pinctrl/mvebu/pinctrl-mvebu.c b/drivers/pinctrl/mvebu/pinctrl-mvebu.c
index c2b9c80586bc..e5820375393a 100644
--- a/drivers/pinctrl/mvebu/pinctrl-mvebu.c
+++ b/drivers/pinctrl/mvebu/pinctrl-mvebu.c
@@ -17,6 +17,7 @@
 #include <asm/io.h>
 #include <asm/arch-armada8k/soc-info.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include "pinctrl-mvebu.h"
 
 #define AP_EMMC_PHY_CTRL_REG		0x100
diff --git a/drivers/pinctrl/nexell/pinctrl-nexell.c b/drivers/pinctrl/nexell/pinctrl-nexell.c
index 4518c05d4685..da5ca6846cf2 100644
--- a/drivers/pinctrl/nexell/pinctrl-nexell.c
+++ b/drivers/pinctrl/nexell/pinctrl-nexell.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <asm/io.h>
+#include <linux/errno.h>
 #include "pinctrl-nexell.h"
 #include "pinctrl-s5pxx18.h"
 
diff --git a/drivers/pinctrl/nexell/pinctrl-s5pxx18.c b/drivers/pinctrl/nexell/pinctrl-s5pxx18.c
index 96a2ed38a056..5bb012b197fc 100644
--- a/drivers/pinctrl/nexell/pinctrl-s5pxx18.c
+++ b/drivers/pinctrl/nexell/pinctrl-s5pxx18.c
@@ -13,6 +13,7 @@
 #include <asm/io.h>
 #include <dm/pinctrl.h>
 #include <dm/root.h>
+#include <linux/errno.h>
 #include "pinctrl-nexell.h"
 #include "pinctrl-s5pxx18.h"
 
diff --git a/drivers/pinctrl/nxp/pinctrl-imx.c b/drivers/pinctrl/nxp/pinctrl-imx.c
index 1596dcc4747e..6db7313aecda 100644
--- a/drivers/pinctrl/nxp/pinctrl-imx.c
+++ b/drivers/pinctrl/nxp/pinctrl-imx.c
@@ -10,6 +10,7 @@
 #include <dm/device_compat.h>
 #include <dm/devres.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/err.h>
 #include <dm.h>
diff --git a/drivers/pinctrl/nxp/pinctrl-mxs.c b/drivers/pinctrl/nxp/pinctrl-mxs.c
index 1067654e07e1..6cb6977812a6 100644
--- a/drivers/pinctrl/nxp/pinctrl-mxs.c
+++ b/drivers/pinctrl/nxp/pinctrl-mxs.c
@@ -9,6 +9,7 @@
 #include <asm/global_data.h>
 #include <dm/device_compat.h>
 #include <dm/devres.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/err.h>
 #include <dm.h>
diff --git a/drivers/pinctrl/nxp/pinctrl-scu.c b/drivers/pinctrl/nxp/pinctrl-scu.c
index 33bba8696f65..81f6eb56db39 100644
--- a/drivers/pinctrl/nxp/pinctrl-scu.c
+++ b/drivers/pinctrl/nxp/pinctrl-scu.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <asm/arch/sci/sci.h>
 #include <misc.h>
+#include <linux/errno.h>
 
 #include "pinctrl-imx.h"
 
diff --git a/drivers/pinctrl/pinctrl-at91-pio4.c b/drivers/pinctrl/pinctrl-at91-pio4.c
index 4400e8088d89..49eb9078f150 100644
--- a/drivers/pinctrl/pinctrl-at91-pio4.c
+++ b/drivers/pinctrl/pinctrl-at91-pio4.c
@@ -12,6 +12,7 @@
 #include <asm/global_data.h>
 #include <dm/pinctrl.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/err.h>
 #include <mach/atmel_pio4.h>
diff --git a/drivers/pinctrl/pinctrl-at91.c b/drivers/pinctrl/pinctrl-at91.c
index 30f2bebbc78f..aa5d05d93e9c 100644
--- a/drivers/pinctrl/pinctrl-at91.c
+++ b/drivers/pinctrl/pinctrl-at91.c
@@ -13,6 +13,7 @@
 #include <dm/pinctrl.h>
 #include <asm/hardware.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/err.h>
 #include <mach/at91_pio.h>
diff --git a/drivers/pinctrl/pinctrl-generic.c b/drivers/pinctrl/pinctrl-generic.c
index 7a2131d73ea1..45b3ad5d793c 100644
--- a/drivers/pinctrl/pinctrl-generic.c
+++ b/drivers/pinctrl/pinctrl-generic.c
@@ -8,6 +8,7 @@
 #include <dm/device_compat.h>
 #include <linux/compat.h>
 #include <dm/pinctrl.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 /**
diff --git a/drivers/pinctrl/pinctrl-single.c b/drivers/pinctrl/pinctrl-single.c
index 738f5bd63643..e4a05f5cce67 100644
--- a/drivers/pinctrl/pinctrl-single.c
+++ b/drivers/pinctrl/pinctrl-single.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <dm/device_compat.h>
 #include <dm/pinctrl.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <asm/io.h>
 
diff --git a/drivers/pinctrl/pinctrl-sti.c b/drivers/pinctrl/pinctrl-sti.c
index d446982c4e76..f6444181671d 100644
--- a/drivers/pinctrl/pinctrl-sti.c
+++ b/drivers/pinctrl/pinctrl-sti.c
@@ -17,6 +17,7 @@
 #include <asm/io.h>
 #include <dm/pinctrl.h>
 #include <linux/bug.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <linux/printk.h>
 
diff --git a/drivers/pinctrl/pinctrl-stmfx.c b/drivers/pinctrl/pinctrl-stmfx.c
index dc063e087e82..bdf852c5f024 100644
--- a/drivers/pinctrl/pinctrl-stmfx.c
+++ b/drivers/pinctrl/pinctrl-stmfx.c
@@ -18,6 +18,7 @@
 #include <linux/bitfield.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <power/regulator.h>
 
diff --git a/drivers/pinctrl/pinctrl-uclass.c b/drivers/pinctrl/pinctrl-uclass.c
index f821959137e0..817ea3f33232 100644
--- a/drivers/pinctrl/pinctrl-uclass.c
+++ b/drivers/pinctrl/pinctrl-uclass.c
@@ -8,6 +8,7 @@
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <dm/device_compat.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <linux/err.h>
 #include <linux/list.h>
diff --git a/drivers/pinctrl/pinctrl_pic32.c b/drivers/pinctrl/pinctrl_pic32.c
index 2eb80d92b341..6f2b34f2813e 100644
--- a/drivers/pinctrl/pinctrl_pic32.c
+++ b/drivers/pinctrl/pinctrl_pic32.c
@@ -13,6 +13,7 @@
 #include <asm/io.h>
 #include <dm/pinctrl.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <mach/pic32.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/pinctrl/pinctrl_stm32.c b/drivers/pinctrl/pinctrl_stm32.c
index 998b90f803f3..faec68c3b2ef 100644
--- a/drivers/pinctrl/pinctrl_stm32.c
+++ b/drivers/pinctrl/pinctrl_stm32.c
@@ -13,6 +13,7 @@
 #include <dm/pinctrl.h>
 #include <linux/bitops.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <linux/printk.h>
 
diff --git a/drivers/pinctrl/renesas/pfc-r7s72100.c b/drivers/pinctrl/renesas/pfc-r7s72100.c
index 3d0caa9bb777..db4dea111040 100644
--- a/drivers/pinctrl/renesas/pfc-r7s72100.c
+++ b/drivers/pinctrl/renesas/pfc-r7s72100.c
@@ -12,6 +12,7 @@
 #include <dm/lists.h>
 #include <dm/pinctrl.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/err.h>
 
diff --git a/drivers/pinctrl/renesas/pfc-r8a7790.c b/drivers/pinctrl/renesas/pfc-r8a7790.c
index 5e1502ed9696..30e9a117f8d0 100644
--- a/drivers/pinctrl/renesas/pfc-r8a7790.c
+++ b/drivers/pinctrl/renesas/pfc-r8a7790.c
@@ -12,6 +12,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <dm/pinctrl.h>
+#include <linux/errno.h>
 #include <linux/kernel.h>
 
 #include "sh_pfc.h"
diff --git a/drivers/pinctrl/renesas/pfc-r8a7791.c b/drivers/pinctrl/renesas/pfc-r8a7791.c
index d6095d6f674c..7ae6e4081c00 100644
--- a/drivers/pinctrl/renesas/pfc-r8a7791.c
+++ b/drivers/pinctrl/renesas/pfc-r8a7791.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <dm/pinctrl.h>
+#include <linux/errno.h>
 #include <linux/kernel.h>
 
 #include "sh_pfc.h"
diff --git a/drivers/pinctrl/renesas/pfc-r8a7794.c b/drivers/pinctrl/renesas/pfc-r8a7794.c
index 91ac815f3da6..e59fd7656e01 100644
--- a/drivers/pinctrl/renesas/pfc-r8a7794.c
+++ b/drivers/pinctrl/renesas/pfc-r8a7794.c
@@ -11,6 +11,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <dm/pinctrl.h>
+#include <linux/errno.h>
 #include <linux/kernel.h>
 
 #include "sh_pfc.h"
diff --git a/drivers/pinctrl/renesas/pfc-r8a77970.c b/drivers/pinctrl/renesas/pfc-r8a77970.c
index 33ecd9339867..9996eb9298c5 100644
--- a/drivers/pinctrl/renesas/pfc-r8a77970.c
+++ b/drivers/pinctrl/renesas/pfc-r8a77970.c
@@ -16,6 +16,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <dm/pinctrl.h>
+#include <linux/errno.h>
 #include <linux/kernel.h>
 
 #include "sh_pfc.h"
diff --git a/drivers/pinctrl/renesas/pfc-r8a77980.c b/drivers/pinctrl/renesas/pfc-r8a77980.c
index 32efb4409c67..1b04250e527a 100644
--- a/drivers/pinctrl/renesas/pfc-r8a77980.c
+++ b/drivers/pinctrl/renesas/pfc-r8a77980.c
@@ -16,6 +16,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <dm/pinctrl.h>
+#include <linux/errno.h>
 #include <linux/kernel.h>
 
 #include "sh_pfc.h"
diff --git a/drivers/pinctrl/renesas/pfc-r8a77990.c b/drivers/pinctrl/renesas/pfc-r8a77990.c
index de22e49ebef4..e0bf1e4a3003 100644
--- a/drivers/pinctrl/renesas/pfc-r8a77990.c
+++ b/drivers/pinctrl/renesas/pfc-r8a77990.c
@@ -16,6 +16,7 @@
 #include <errno.h>
 #include <dm/pinctrl.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/kernel.h>
 
 #include "sh_pfc.h"
diff --git a/drivers/pinctrl/renesas/pfc.c b/drivers/pinctrl/renesas/pfc.c
index 6bf8fdff4781..1a7e686a4653 100644
--- a/drivers/pinctrl/renesas/pfc.c
+++ b/drivers/pinctrl/renesas/pfc.c
@@ -20,6 +20,7 @@
 #include <dm/pinctrl.h>
 #include <linux/bitops.h>
 #include <linux/bug.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/sizes.h>
 
diff --git a/drivers/pinctrl/rockchip/pinctrl-px30.c b/drivers/pinctrl/rockchip/pinctrl-px30.c
index 617721a6264c..bf1ee07c5fe0 100644
--- a/drivers/pinctrl/rockchip/pinctrl-px30.c
+++ b/drivers/pinctrl/rockchip/pinctrl-px30.c
@@ -10,6 +10,7 @@
 #include <regmap.h>
 #include <syscon.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #include "pinctrl-rockchip.h"
 
diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3036.c b/drivers/pinctrl/rockchip/pinctrl-rk3036.c
index d49e3007cea2..11d4e784d02a 100644
--- a/drivers/pinctrl/rockchip/pinctrl-rk3036.c
+++ b/drivers/pinctrl/rockchip/pinctrl-rk3036.c
@@ -9,6 +9,7 @@
 #include <regmap.h>
 #include <syscon.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #include "pinctrl-rockchip.h"
 
diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3128.c b/drivers/pinctrl/rockchip/pinctrl-rk3128.c
index a175d6c07f1f..445dbf85d4f8 100644
--- a/drivers/pinctrl/rockchip/pinctrl-rk3128.c
+++ b/drivers/pinctrl/rockchip/pinctrl-rk3128.c
@@ -9,6 +9,7 @@
 #include <regmap.h>
 #include <syscon.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #include "pinctrl-rockchip.h"
 
diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3188.c b/drivers/pinctrl/rockchip/pinctrl-rk3188.c
index 8f197110e5e4..c4ff4e585312 100644
--- a/drivers/pinctrl/rockchip/pinctrl-rk3188.c
+++ b/drivers/pinctrl/rockchip/pinctrl-rk3188.c
@@ -9,6 +9,7 @@
 #include <dm/pinctrl.h>
 #include <regmap.h>
 #include <syscon.h>
+#include <linux/errno.h>
 
 #include "pinctrl-rockchip.h"
 
diff --git a/drivers/pinctrl/rockchip/pinctrl-rk322x.c b/drivers/pinctrl/rockchip/pinctrl-rk322x.c
index 85bc0ef0f317..3e925837ee85 100644
--- a/drivers/pinctrl/rockchip/pinctrl-rk322x.c
+++ b/drivers/pinctrl/rockchip/pinctrl-rk322x.c
@@ -10,6 +10,7 @@
 #include <regmap.h>
 #include <syscon.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #include "pinctrl-rockchip.h"
 
diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3288.c b/drivers/pinctrl/rockchip/pinctrl-rk3288.c
index 011ca286ec9e..e8cdca1bd280 100644
--- a/drivers/pinctrl/rockchip/pinctrl-rk3288.c
+++ b/drivers/pinctrl/rockchip/pinctrl-rk3288.c
@@ -9,6 +9,7 @@
 #include <dm/pinctrl.h>
 #include <regmap.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #include "pinctrl-rockchip.h"
 
diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3308.c b/drivers/pinctrl/rockchip/pinctrl-rk3308.c
index db2b10a6906a..088617de5db9 100644
--- a/drivers/pinctrl/rockchip/pinctrl-rk3308.c
+++ b/drivers/pinctrl/rockchip/pinctrl-rk3308.c
@@ -10,6 +10,7 @@
 #include <regmap.h>
 #include <syscon.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #include "pinctrl-rockchip.h"
 
diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3328.c b/drivers/pinctrl/rockchip/pinctrl-rk3328.c
index 61eb9e0af0c9..342d67d06d91 100644
--- a/drivers/pinctrl/rockchip/pinctrl-rk3328.c
+++ b/drivers/pinctrl/rockchip/pinctrl-rk3328.c
@@ -10,6 +10,7 @@
 #include <regmap.h>
 #include <syscon.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #include "pinctrl-rockchip.h"
 
diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3368.c b/drivers/pinctrl/rockchip/pinctrl-rk3368.c
index d8ccd4de5761..d66b62d91361 100644
--- a/drivers/pinctrl/rockchip/pinctrl-rk3368.c
+++ b/drivers/pinctrl/rockchip/pinctrl-rk3368.c
@@ -9,6 +9,7 @@
 #include <dm/pinctrl.h>
 #include <regmap.h>
 #include <syscon.h>
+#include <linux/errno.h>
 
 #include "pinctrl-rockchip.h"
 
diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3399.c b/drivers/pinctrl/rockchip/pinctrl-rk3399.c
index d04c1afb090a..ec33f89bb829 100644
--- a/drivers/pinctrl/rockchip/pinctrl-rk3399.c
+++ b/drivers/pinctrl/rockchip/pinctrl-rk3399.c
@@ -10,6 +10,7 @@
 #include <regmap.h>
 #include <syscon.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #include "pinctrl-rockchip.h"
 
diff --git a/drivers/pinctrl/rockchip/pinctrl-rockchip-core.c b/drivers/pinctrl/rockchip/pinctrl-rockchip-core.c
index 16efb09b57f9..389d584078f8 100644
--- a/drivers/pinctrl/rockchip/pinctrl-rockchip-core.c
+++ b/drivers/pinctrl/rockchip/pinctrl-rockchip-core.c
@@ -12,6 +12,7 @@
 #include <syscon.h>
 #include <fdtdec.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <linux/string.h>
 
diff --git a/drivers/pinctrl/rockchip/pinctrl-rv1108.c b/drivers/pinctrl/rockchip/pinctrl-rv1108.c
index 22334329ed4c..c0fb962ef059 100644
--- a/drivers/pinctrl/rockchip/pinctrl-rv1108.c
+++ b/drivers/pinctrl/rockchip/pinctrl-rv1108.c
@@ -10,6 +10,7 @@
 #include <regmap.h>
 #include <syscon.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #include "pinctrl-rockchip.h"
 
diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-core.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-core.c
index 631bb1f963b9..44a1571db4fb 100644
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier-core.c
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-core.c
@@ -9,6 +9,7 @@
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/bug.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/err.h>
 #include <linux/kernel.h>
diff --git a/drivers/power/acpi_pmc/acpi-pmc-uclass.c b/drivers/power/acpi_pmc/acpi-pmc-uclass.c
index 98d217ca72f1..d713dc81f0a5 100644
--- a/drivers/power/acpi_pmc/acpi-pmc-uclass.c
+++ b/drivers/power/acpi_pmc/acpi-pmc-uclass.c
@@ -14,6 +14,7 @@
 #include <asm/intel_pinctrl.h>
 #endif
 #include <asm/io.h>
+#include <linux/errno.h>
 #include <power/acpi_pmc.h>
 
 struct tco_regs {
diff --git a/drivers/power/acpi_pmc/pmc_emul.c b/drivers/power/acpi_pmc/pmc_emul.c
index 5ed6fcca262a..93ba847e2eca 100644
--- a/drivers/power/acpi_pmc/pmc_emul.c
+++ b/drivers/power/acpi_pmc/pmc_emul.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <pci.h>
 #include <asm/test.h>
+#include <linux/errno.h>
 #include <power/acpi_pmc.h>
 
 /**
diff --git a/drivers/power/acpi_pmc/sandbox.c b/drivers/power/acpi_pmc/sandbox.c
index 48a6c663bd2f..667b7a5daf58 100644
--- a/drivers/power/acpi_pmc/sandbox.c
+++ b/drivers/power/acpi_pmc/sandbox.c
@@ -11,6 +11,7 @@
 #include <dm.h>
 #include <log.h>
 #include <asm/io.h>
+#include <linux/errno.h>
 #include <power/acpi_pmc.h>
 
 #define GPIO_GPE_CFG		0x1050
diff --git a/drivers/power/axp152.c b/drivers/power/axp152.c
index d6e36125c12c..bf07232b08d1 100644
--- a/drivers/power/axp152.c
+++ b/drivers/power/axp152.c
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <asm/arch/pmic_bus.h>
 #include <axp_pmic.h>
+#include <linux/errno.h>
 
 static u8 axp152_mvolt_to_target(int mvolt, int min, int max, int div)
 {
diff --git a/drivers/power/axp209.c b/drivers/power/axp209.c
index ade531940b93..878ccf459066 100644
--- a/drivers/power/axp209.c
+++ b/drivers/power/axp209.c
@@ -9,6 +9,7 @@
 #include <asm/arch/pmic_bus.h>
 #include <axp_pmic.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 #ifdef CONFIG_AXP_ALDO3_VOLT_SLOPE_08
 #  define AXP209_VRC_SLOPE AXP209_VRC_LDO3_800uV_uS
diff --git a/drivers/power/axp221.c b/drivers/power/axp221.c
index 3446fe7365d2..e0249796729e 100644
--- a/drivers/power/axp221.c
+++ b/drivers/power/axp221.c
@@ -14,6 +14,7 @@
 #include <errno.h>
 #include <asm/arch/pmic_bus.h>
 #include <axp_pmic.h>
+#include <linux/errno.h>
 
 static u8 axp221_mvolt_to_cfg(int mvolt, int min, int max, int div)
 {
diff --git a/drivers/power/axp809.c b/drivers/power/axp809.c
index 6323492b66d1..fd85b7341457 100644
--- a/drivers/power/axp809.c
+++ b/drivers/power/axp809.c
@@ -16,6 +16,7 @@
 #include <asm/arch/gpio.h>
 #include <asm/arch/pmic_bus.h>
 #include <axp_pmic.h>
+#include <linux/errno.h>
 
 static u8 axp809_mvolt_to_cfg(int mvolt, int min, int max, int div)
 {
diff --git a/drivers/power/axp818.c b/drivers/power/axp818.c
index 0531707c8aa7..bfdc3d93caf0 100644
--- a/drivers/power/axp818.c
+++ b/drivers/power/axp818.c
@@ -16,6 +16,7 @@
 #include <asm/arch/gpio.h>
 #include <asm/arch/pmic_bus.h>
 #include <axp_pmic.h>
+#include <linux/errno.h>
 
 static u8 axp818_mvolt_to_cfg(int mvolt, int min, int max, int div)
 {
diff --git a/drivers/power/battery/bat_trats.c b/drivers/power/battery/bat_trats.c
index d1545004de31..c7350afe8e2b 100644
--- a/drivers/power/battery/bat_trats.c
+++ b/drivers/power/battery/bat_trats.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <stdio.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <power/pmic.h>
 #include <power/battery.h>
 #include <power/max8997_pmic.h>
diff --git a/drivers/power/battery/bat_trats2.c b/drivers/power/battery/bat_trats2.c
index abac714ff346..67fd7d8dbaee 100644
--- a/drivers/power/battery/bat_trats2.c
+++ b/drivers/power/battery/bat_trats2.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <log.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <power/pmic.h>
 #include <power/battery.h>
 #include <power/max77693_pmic.h>
diff --git a/drivers/power/domain/bcm6328-power-domain.c b/drivers/power/domain/bcm6328-power-domain.c
index a494bfa8c9de..21933018fc46 100644
--- a/drivers/power/domain/bcm6328-power-domain.c
+++ b/drivers/power/domain/bcm6328-power-domain.c
@@ -9,6 +9,7 @@
 #include <power-domain-uclass.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #define MAX_DOMAINS	32
 
diff --git a/drivers/power/domain/imx8-power-domain-legacy.c b/drivers/power/domain/imx8-power-domain-legacy.c
index 61ed7172f285..37167b334603 100644
--- a/drivers/power/domain/imx8-power-domain-legacy.c
+++ b/drivers/power/domain/imx8-power-domain-legacy.c
@@ -16,6 +16,7 @@
 #include <dm/device.h>
 #include <dm/uclass-internal.h>
 #include <asm/arch/sci/sci.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/power/domain/imx8m-power-domain.c b/drivers/power/domain/imx8m-power-domain.c
index e50ded8b4c54..0d9501cf8acc 100644
--- a/drivers/power/domain/imx8m-power-domain.c
+++ b/drivers/power/domain/imx8m-power-domain.c
@@ -16,6 +16,7 @@
 #include <dm/device.h>
 #include <imx_sip.h>
 #include <linux/arm-smccc.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/power/domain/meson-ee-pwrc.c b/drivers/power/domain/meson-ee-pwrc.c
index 8349a9c15822..7e131d325534 100644
--- a/drivers/power/domain/meson-ee-pwrc.c
+++ b/drivers/power/domain/meson-ee-pwrc.c
@@ -18,6 +18,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 
 /* AO Offsets */
 
diff --git a/drivers/power/domain/meson-gx-pwrc-vpu.c b/drivers/power/domain/meson-gx-pwrc-vpu.c
index a41b230448fc..78ac99e8d9be 100644
--- a/drivers/power/domain/meson-gx-pwrc-vpu.c
+++ b/drivers/power/domain/meson-gx-pwrc-vpu.c
@@ -18,6 +18,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 
 enum {
 	VPU_PWRC_COMPATIBLE_GX		= 0,
diff --git a/drivers/power/domain/mtk-power-domain.c b/drivers/power/domain/mtk-power-domain.c
index fae4749012bd..d8467ac6c26f 100644
--- a/drivers/power/domain/mtk-power-domain.c
+++ b/drivers/power/domain/mtk-power-domain.c
@@ -15,6 +15,7 @@
 #include <asm/processor.h>
 #include <linux/bitops.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/iopoll.h>
 
 #include <dt-bindings/power/mt7623-power.h>
diff --git a/drivers/power/domain/power-domain-uclass.c b/drivers/power/domain/power-domain-uclass.c
index c2c7c3bd507f..cf9227572f98 100644
--- a/drivers/power/domain/power-domain-uclass.c
+++ b/drivers/power/domain/power-domain-uclass.c
@@ -10,6 +10,7 @@
 #include <power-domain.h>
 #include <power-domain-uclass.h>
 #include <dm/device-internal.h>
+#include <linux/errno.h>
 
 static inline struct power_domain_ops *power_domain_dev_ops(struct udevice *dev)
 {
diff --git a/drivers/power/domain/sandbox-power-domain.c b/drivers/power/domain/sandbox-power-domain.c
index 4d9a2006e660..373db61ba0f9 100644
--- a/drivers/power/domain/sandbox-power-domain.c
+++ b/drivers/power/domain/sandbox-power-domain.c
@@ -10,6 +10,7 @@
 #include <power-domain-uclass.h>
 #include <asm/io.h>
 #include <asm/power-domain.h>
+#include <linux/errno.h>
 
 #define SANDBOX_POWER_DOMAINS 3
 
diff --git a/drivers/power/domain/ti-sci-power-domain.c b/drivers/power/domain/ti-sci-power-domain.c
index 7ee121dfb26b..fd90f4926dbd 100644
--- a/drivers/power/domain/ti-sci-power-domain.c
+++ b/drivers/power/domain/ti-sci-power-domain.c
@@ -16,6 +16,7 @@
 #include <power-domain-uclass.h>
 #include <dm/device_compat.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/soc/ti/ti_sci_protocol.h>
 #include <dt-bindings/soc/ti,sci_pm_domain.h>
 
diff --git a/drivers/power/exynos-tmu.c b/drivers/power/exynos-tmu.c
index bc8724882153..e714add99951 100644
--- a/drivers/power/exynos-tmu.c
+++ b/drivers/power/exynos-tmu.c
@@ -25,6 +25,7 @@
 #include <tmu.h>
 #include <asm/arch/tmu.h>
 #include <asm/arch/power.h>
+#include <linux/errno.h>
 
 #define TRIMINFO_RELOAD		1
 #define CORE_EN			1
diff --git a/drivers/power/fuel_gauge/fg_max17042.c b/drivers/power/fuel_gauge/fg_max17042.c
index fde4bd195548..89a170aea609 100644
--- a/drivers/power/fuel_gauge/fg_max17042.c
+++ b/drivers/power/fuel_gauge/fg_max17042.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <stdio.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <power/pmic.h>
 #include <power/max17042_fg.h>
 #include <i2c.h>
diff --git a/drivers/power/mfd/fg_max77693.c b/drivers/power/mfd/fg_max77693.c
index 4633f79bbe74..e96e59076286 100644
--- a/drivers/power/mfd/fg_max77693.c
+++ b/drivers/power/mfd/fg_max77693.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <log.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <power/pmic.h>
 #include <power/max77693_fg.h>
 #include <i2c.h>
diff --git a/drivers/power/mfd/muic_max77693.c b/drivers/power/mfd/muic_max77693.c
index a021c04ccd4a..8f567c0ebe9d 100644
--- a/drivers/power/mfd/muic_max77693.c
+++ b/drivers/power/mfd/muic_max77693.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <log.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <power/pmic.h>
 #include <power/power_chrg.h>
 #include <power/max77693_muic.h>
diff --git a/drivers/power/mfd/pmic_max77693.c b/drivers/power/mfd/pmic_max77693.c
index 1955189c239d..64519d92fd1e 100644
--- a/drivers/power/mfd/pmic_max77693.c
+++ b/drivers/power/mfd/pmic_max77693.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <log.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <power/pmic.h>
 #include <power/max77693_pmic.h>
 #include <i2c.h>
diff --git a/drivers/power/pmic/act8846.c b/drivers/power/pmic/act8846.c
index 8f0f5a6d96e5..7bd69ccc0b4f 100644
--- a/drivers/power/pmic/act8846.c
+++ b/drivers/power/pmic/act8846.c
@@ -9,6 +9,7 @@
 #include <errno.h>
 #include <fdtdec.h>
 #include <log.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <power/act8846_pmic.h>
 #include <power/pmic.h>
diff --git a/drivers/power/pmic/as3722.c b/drivers/power/pmic/as3722.c
index c7dd9705d189..9152f657ff71 100644
--- a/drivers/power/pmic/as3722.c
+++ b/drivers/power/pmic/as3722.c
@@ -12,6 +12,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <dm/lists.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <power/as3722.h>
 #include <power/pmic.h>
diff --git a/drivers/power/pmic/as3722_gpio.c b/drivers/power/pmic/as3722_gpio.c
index 987fbdf9bc08..6b091a58b8b0 100644
--- a/drivers/power/pmic/as3722_gpio.c
+++ b/drivers/power/pmic/as3722_gpio.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <dm.h>
 #include <asm/gpio.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <power/as3722.h>
 #include <power/pmic.h>
diff --git a/drivers/power/pmic/bd71837.c b/drivers/power/pmic/bd71837.c
index da9aa541979e..35d5018a3910 100644
--- a/drivers/power/pmic/bd71837.c
+++ b/drivers/power/pmic/bd71837.c
@@ -9,6 +9,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/pmic/da9063.c b/drivers/power/pmic/da9063.c
index ca95b82e6d01..b88e79f43143 100644
--- a/drivers/power/pmic/da9063.c
+++ b/drivers/power/pmic/da9063.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <log.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/pmic/fan53555.c b/drivers/power/pmic/fan53555.c
index c9b15d5b68f5..256c455aa29b 100644
--- a/drivers/power/pmic/fan53555.c
+++ b/drivers/power/pmic/fan53555.c
@@ -10,6 +10,7 @@
 #include <dm/device_compat.h>
 #include <dm/lists.h>
 #include <i2c.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <power/fan53555.h>
 #include <power/pmic.h>
diff --git a/drivers/power/pmic/i2c_pmic_emul.c b/drivers/power/pmic/i2c_pmic_emul.c
index 4e72e966cfe8..1a044ea5b17d 100644
--- a/drivers/power/pmic/i2c_pmic_emul.c
+++ b/drivers/power/pmic/i2c_pmic_emul.c
@@ -10,6 +10,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <malloc.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include <power/pmic.h>
diff --git a/drivers/power/pmic/lp873x.c b/drivers/power/pmic/lp873x.c
index c307a9e3024a..4addcf9cbd13 100644
--- a/drivers/power/pmic/lp873x.c
+++ b/drivers/power/pmic/lp873x.c
@@ -11,6 +11,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/pmic/lp87565.c b/drivers/power/pmic/lp87565.c
index ba67a5efc023..c4bf1aff78cb 100644
--- a/drivers/power/pmic/lp87565.c
+++ b/drivers/power/pmic/lp87565.c
@@ -11,6 +11,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/pmic/max77686.c b/drivers/power/pmic/max77686.c
index 7e6f7d1966f1..2c83aab57a8d 100644
--- a/drivers/power/pmic/max77686.c
+++ b/drivers/power/pmic/max77686.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <log.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/pmic/mc34708.c b/drivers/power/pmic/mc34708.c
index d1661f01999a..df66038d68d9 100644
--- a/drivers/power/pmic/mc34708.c
+++ b/drivers/power/pmic/mc34708.c
@@ -12,6 +12,7 @@
 #include <i2c.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <power/pmic.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/power/pmic/muic_max8997.c b/drivers/power/pmic/muic_max8997.c
index 6184b70e2fd1..6994eb96d7ca 100644
--- a/drivers/power/pmic/muic_max8997.c
+++ b/drivers/power/pmic/muic_max8997.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <log.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <power/pmic.h>
 #include <power/power_chrg.h>
 #include <power/max8997_muic.h>
diff --git a/drivers/power/pmic/palmas.c b/drivers/power/pmic/palmas.c
index 88f88e0014ca..0b4366a27153 100644
--- a/drivers/power/pmic/palmas.c
+++ b/drivers/power/pmic/palmas.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <log.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include <power/pmic.h>
diff --git a/drivers/power/pmic/pca9450.c b/drivers/power/pmic/pca9450.c
index b61dac193f2d..6e80c5cdc4f1 100644
--- a/drivers/power/pmic/pca9450.c
+++ b/drivers/power/pmic/pca9450.c
@@ -10,6 +10,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/pmic/pfuze100.c b/drivers/power/pmic/pfuze100.c
index 15420acb4725..0955d46fc78e 100644
--- a/drivers/power/pmic/pfuze100.c
+++ b/drivers/power/pmic/pfuze100.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <log.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/pmic/pm8916.c b/drivers/power/pmic/pm8916.c
index ddc30604cff8..c47c89754d10 100644
--- a/drivers/power/pmic/pm8916.c
+++ b/drivers/power/pmic/pm8916.c
@@ -6,6 +6,7 @@
  */
 #include <common.h>
 #include <dm.h>
+#include <linux/errno.h>
 #include <power/pmic.h>
 #include <spmi/spmi.h>
 
diff --git a/drivers/power/pmic/pmic-uclass.c b/drivers/power/pmic/pmic-uclass.c
index a83131e17365..257e514b10b9 100644
--- a/drivers/power/pmic/pmic-uclass.c
+++ b/drivers/power/pmic/pmic-uclass.c
@@ -13,6 +13,7 @@
 #include <dm/lists.h>
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <power/pmic.h>
 #include <linux/ctype.h>
diff --git a/drivers/power/pmic/pmic_hi6553.c b/drivers/power/pmic/pmic_hi6553.c
index 4442f3501f7b..b724fe4a69e6 100644
--- a/drivers/power/pmic/pmic_hi6553.c
+++ b/drivers/power/pmic/pmic_hi6553.c
@@ -7,6 +7,7 @@
 #include <asm/io.h>
 #include <common.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <power/pmic.h>
 #include <power/max8997_muic.h>
 #include <power/hi6553_pmic.h>
diff --git a/drivers/power/pmic/pmic_ltc3676.c b/drivers/power/pmic/pmic_ltc3676.c
index 5dc0079c2af2..022d782e83d9 100644
--- a/drivers/power/pmic/pmic_ltc3676.c
+++ b/drivers/power/pmic/pmic_ltc3676.c
@@ -8,6 +8,7 @@
 #include <errno.h>
 #include <i2c.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <power/pmic.h>
 #include <power/ltc3676_pmic.h>
 
diff --git a/drivers/power/pmic/pmic_max77696.c b/drivers/power/pmic/pmic_max77696.c
index de36b4621802..b29fa6dedfd4 100644
--- a/drivers/power/pmic/pmic_max77696.c
+++ b/drivers/power/pmic/pmic_max77696.c
@@ -8,6 +8,7 @@
 #include <errno.h>
 #include <i2c.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <power/pmic.h>
 #include <power/max77696_pmic.h>
 
diff --git a/drivers/power/pmic/pmic_max8997.c b/drivers/power/pmic/pmic_max8997.c
index bf8a015dc8cd..6c4958208c83 100644
--- a/drivers/power/pmic/pmic_max8997.c
+++ b/drivers/power/pmic/pmic_max8997.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <log.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <power/pmic.h>
 #include <power/max8997_pmic.h>
 #include <i2c.h>
diff --git a/drivers/power/pmic/pmic_max8998.c b/drivers/power/pmic/pmic_max8998.c
index 8e2c4b8e02e3..c4cc8485ea8b 100644
--- a/drivers/power/pmic/pmic_max8998.c
+++ b/drivers/power/pmic/pmic_max8998.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <power/pmic.h>
 #include <power/max8998_pmic.h>
 #include <errno.h>
diff --git a/drivers/power/pmic/pmic_mc34vr500.c b/drivers/power/pmic/pmic_mc34vr500.c
index 9a3f748538ce..a28c3e9b2b11 100644
--- a/drivers/power/pmic/pmic_mc34vr500.c
+++ b/drivers/power/pmic/pmic_mc34vr500.c
@@ -8,6 +8,7 @@
 #include <errno.h>
 #include <i2c.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <power/pmic.h>
 #include <power/mc34vr500_pmic.h>
 
diff --git a/drivers/power/pmic/pmic_pca9450.c b/drivers/power/pmic/pmic_pca9450.c
index 651f3a0c2742..323b81a66ca8 100644
--- a/drivers/power/pmic/pmic_pca9450.c
+++ b/drivers/power/pmic/pmic_pca9450.c
@@ -7,6 +7,7 @@
 #include <errno.h>
 #include <i2c.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <power/pmic.h>
 #include <power/pca9450.h>
 
diff --git a/drivers/power/pmic/pmic_pfuze100.c b/drivers/power/pmic/pmic_pfuze100.c
index 25a4aa0ed624..1beb42393c3f 100644
--- a/drivers/power/pmic/pmic_pfuze100.c
+++ b/drivers/power/pmic/pmic_pfuze100.c
@@ -8,6 +8,7 @@
 #include <errno.h>
 #include <i2c.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <power/pmic.h>
 #include <power/pfuze100_pmic.h>
 
diff --git a/drivers/power/pmic/pmic_pfuze3000.c b/drivers/power/pmic/pmic_pfuze3000.c
index 82d932cef1bf..7d426801b7de 100644
--- a/drivers/power/pmic/pmic_pfuze3000.c
+++ b/drivers/power/pmic/pmic_pfuze3000.c
@@ -8,6 +8,7 @@
 #include <errno.h>
 #include <i2c.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <power/pmic.h>
 #include <power/pfuze3000_pmic.h>
 
diff --git a/drivers/power/pmic/pmic_tps65910_dm.c b/drivers/power/pmic/pmic_tps65910_dm.c
index 8ead1db802a2..422fb72c38eb 100644
--- a/drivers/power/pmic/pmic_tps65910_dm.c
+++ b/drivers/power/pmic/pmic_tps65910_dm.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <log.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/pmic/rk8xx.c b/drivers/power/pmic/rk8xx.c
index 71027e8da35b..991a94b41ab4 100644
--- a/drivers/power/pmic/rk8xx.c
+++ b/drivers/power/pmic/rk8xx.c
@@ -9,6 +9,7 @@
 #include <errno.h>
 #include <log.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <power/rk8xx_pmic.h>
 #include <power/pmic.h>
 
diff --git a/drivers/power/pmic/s2mps11.c b/drivers/power/pmic/s2mps11.c
index 5ff4f2052113..93c3507e8fac 100644
--- a/drivers/power/pmic/s2mps11.c
+++ b/drivers/power/pmic/s2mps11.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <log.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/s2mps11.h>
diff --git a/drivers/power/pmic/s5m8767.c b/drivers/power/pmic/s5m8767.c
index eea072ae824f..f1fa67406602 100644
--- a/drivers/power/pmic/s5m8767.c
+++ b/drivers/power/pmic/s5m8767.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <log.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/pmic/sandbox.c b/drivers/power/pmic/sandbox.c
index 398b72341bd1..813294c7f36f 100644
--- a/drivers/power/pmic/sandbox.c
+++ b/drivers/power/pmic/sandbox.c
@@ -9,6 +9,7 @@
 #include <errno.h>
 #include <dm.h>
 #include <i2c.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/pmic/stpmic1.c b/drivers/power/pmic/stpmic1.c
index 2c85410b1bf5..c7cd596da088 100644
--- a/drivers/power/pmic/stpmic1.c
+++ b/drivers/power/pmic/stpmic1.c
@@ -13,6 +13,7 @@
 #include <dm/device.h>
 #include <dm/device_compat.h>
 #include <dm/lists.h>
+#include <linux/errno.h>
 #include <power/pmic.h>
 #include <power/stpmic1.h>
 
diff --git a/drivers/power/pmic/tps65090.c b/drivers/power/pmic/tps65090.c
index 2a04d5948a5e..8c8ffbe2046f 100644
--- a/drivers/power/pmic/tps65090.c
+++ b/drivers/power/pmic/tps65090.c
@@ -10,6 +10,7 @@
 #include <fdtdec.h>
 #include <i2c.h>
 #include <log.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/tps65090.h>
diff --git a/drivers/power/pmic/tps65941.c b/drivers/power/pmic/tps65941.c
index fd350b24df28..a05023516ba5 100644
--- a/drivers/power/pmic/tps65941.c
+++ b/drivers/power/pmic/tps65941.c
@@ -11,6 +11,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/power_core.c b/drivers/power/power_core.c
index 35be5d907325..bc8a2b6bf8c1 100644
--- a/drivers/power/power_core.c
+++ b/drivers/power/power_core.c
@@ -15,6 +15,7 @@
 #include <malloc.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/types.h>
 #include <linux/list.h>
diff --git a/drivers/power/power_dialog.c b/drivers/power/power_dialog.c
index 62e460bd5812..267ef50203f0 100644
--- a/drivers/power/power_dialog.c
+++ b/drivers/power/power_dialog.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <log.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <power/pmic.h>
 #include <dialog_pmic.h>
 #include <errno.h>
diff --git a/drivers/power/power_fsl.c b/drivers/power/power_fsl.c
index 2324815a5bdf..e26b60c6abcb 100644
--- a/drivers/power/power_fsl.c
+++ b/drivers/power/power_fsl.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <spi.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <power/pmic.h>
 #include <fsl_pmic.h>
 #include <errno.h>
diff --git a/drivers/power/power_i2c.c b/drivers/power/power_i2c.c
index ebf078fe7140..263d0f3eaa62 100644
--- a/drivers/power/power_i2c.c
+++ b/drivers/power/power_i2c.c
@@ -13,6 +13,7 @@
 #include <common.h>
 #include <log.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/types.h>
 #include <power/pmic.h>
diff --git a/drivers/power/power_spi.c b/drivers/power/power_spi.c
index 1eaf9773ef8b..adf317e849a1 100644
--- a/drivers/power/power_spi.c
+++ b/drivers/power/power_spi.c
@@ -10,6 +10,7 @@
  */
 
 #include <common.h>
+#include <linux/errno.h>
 #include <linux/types.h>
 #include <power/pmic.h>
 #include <spi.h>
diff --git a/drivers/power/regulator/act8846.c b/drivers/power/regulator/act8846.c
index 1783813a158d..0140231214a8 100644
--- a/drivers/power/regulator/act8846.c
+++ b/drivers/power/regulator/act8846.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
+#include <linux/errno.h>
 #include <power/act8846_pmic.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/regulator/as3722_regulator.c b/drivers/power/regulator/as3722_regulator.c
index 0fee9bf00b6b..da25e58dec9f 100644
--- a/drivers/power/regulator/as3722_regulator.c
+++ b/drivers/power/regulator/as3722_regulator.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
+#include <linux/errno.h>
 #include <power/as3722.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/regulator/bd71837.c b/drivers/power/regulator/bd71837.c
index 8c7f71be3e81..7ebba28a9927 100644
--- a/drivers/power/regulator/bd71837.c
+++ b/drivers/power/regulator/bd71837.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <log.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include <power/bd71837.h>
diff --git a/drivers/power/regulator/da9063.c b/drivers/power/regulator/da9063.c
index 3e5d2596561f..ae069e602a31 100644
--- a/drivers/power/regulator/da9063.c
+++ b/drivers/power/regulator/da9063.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <power/da9063_pmic.h>
 #include <power/pmic.h>
diff --git a/drivers/power/regulator/fan53555.c b/drivers/power/regulator/fan53555.c
index a7fa01f787b1..fa8dc96f9da0 100644
--- a/drivers/power/regulator/fan53555.c
+++ b/drivers/power/regulator/fan53555.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <asm/gpio.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <power/fan53555.h>
 #include <power/pmic.h>
diff --git a/drivers/power/regulator/fixed.c b/drivers/power/regulator/fixed.c
index 56d84a90e5ec..629b61c766c6 100644
--- a/drivers/power/regulator/fixed.c
+++ b/drivers/power/regulator/fixed.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <log.h>
 #include <asm/gpio.h>
+#include <linux/errno.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include "regulator_common.h"
diff --git a/drivers/power/regulator/gpio-regulator.c b/drivers/power/regulator/gpio-regulator.c
index 587df32c408b..05b12f4fe8c8 100644
--- a/drivers/power/regulator/gpio-regulator.c
+++ b/drivers/power/regulator/gpio-regulator.c
@@ -11,6 +11,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <asm/gpio.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/regulator/lp873x_regulator.c b/drivers/power/regulator/lp873x_regulator.c
index 9ec23b6f5484..c47a4a9a7786 100644
--- a/drivers/power/regulator/lp873x_regulator.c
+++ b/drivers/power/regulator/lp873x_regulator.c
@@ -12,6 +12,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/lp873x.h>
diff --git a/drivers/power/regulator/lp87565_regulator.c b/drivers/power/regulator/lp87565_regulator.c
index 5b14c07b4ce7..2275a7367b0a 100644
--- a/drivers/power/regulator/lp87565_regulator.c
+++ b/drivers/power/regulator/lp87565_regulator.c
@@ -13,6 +13,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/lp87565.h>
diff --git a/drivers/power/regulator/max77686.c b/drivers/power/regulator/max77686.c
index 4d3ac980fc87..bcbe257f53fd 100644
--- a/drivers/power/regulator/max77686.c
+++ b/drivers/power/regulator/max77686.c
@@ -11,6 +11,7 @@
 #include <errno.h>
 #include <dm.h>
 #include <i2c.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/regulator/palmas_regulator.c b/drivers/power/regulator/palmas_regulator.c
index adbc921e53a2..9f1ae1d246fd 100644
--- a/drivers/power/regulator/palmas_regulator.c
+++ b/drivers/power/regulator/palmas_regulator.c
@@ -12,6 +12,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/regulator/pbias_regulator.c b/drivers/power/regulator/pbias_regulator.c
index 0bc8562b317c..26598b7129fa 100644
--- a/drivers/power/regulator/pbias_regulator.c
+++ b/drivers/power/regulator/pbias_regulator.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/regulator/pfuze100.c b/drivers/power/regulator/pfuze100.c
index 15f34b915f20..b874d58961cc 100644
--- a/drivers/power/regulator/pfuze100.c
+++ b/drivers/power/regulator/pfuze100.c
@@ -11,6 +11,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <log.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/regulator/pwm_regulator.c b/drivers/power/regulator/pwm_regulator.c
index 2031d882953a..451ce106e4f9 100644
--- a/drivers/power/regulator/pwm_regulator.c
+++ b/drivers/power/regulator/pwm_regulator.c
@@ -15,6 +15,7 @@
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <dm/device_compat.h>
+#include <linux/errno.h>
 #include <power/regulator.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/power/regulator/regulator-uclass.c b/drivers/power/regulator/regulator-uclass.c
index 2f095d57e8e4..704a33d057a4 100644
--- a/drivers/power/regulator/regulator-uclass.c
+++ b/drivers/power/regulator/regulator-uclass.c
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <dm/uclass-internal.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/regulator/regulator_common.c b/drivers/power/regulator/regulator_common.c
index 46497e0fde28..575b631597e1 100644
--- a/drivers/power/regulator/regulator_common.c
+++ b/drivers/power/regulator/regulator_common.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <asm/gpio.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <power/regulator.h>
 #include "regulator_common.h"
 
diff --git a/drivers/power/regulator/rk8xx.c b/drivers/power/regulator/rk8xx.c
index a08e2151f93b..03e6ffcc978e 100644
--- a/drivers/power/regulator/rk8xx.c
+++ b/drivers/power/regulator/rk8xx.c
@@ -12,6 +12,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
+#include <linux/errno.h>
 #include <power/rk8xx_pmic.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/regulator/s2mps11_regulator.c b/drivers/power/regulator/s2mps11_regulator.c
index 295e1d2c62a6..ffbc06d9b794 100644
--- a/drivers/power/regulator/s2mps11_regulator.c
+++ b/drivers/power/regulator/s2mps11_regulator.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/regulator/s5m8767.c b/drivers/power/regulator/s5m8767.c
index b46a2a486ec3..7e1d08b8d11d 100644
--- a/drivers/power/regulator/s5m8767.c
+++ b/drivers/power/regulator/s5m8767.c
@@ -8,6 +8,7 @@
 #include <errno.h>
 #include <dm.h>
 #include <i2c.h>
+#include <linux/errno.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/s5m8767.h>
diff --git a/drivers/power/regulator/sandbox.c b/drivers/power/regulator/sandbox.c
index 18596770b370..88c6f3ca3b24 100644
--- a/drivers/power/regulator/sandbox.c
+++ b/drivers/power/regulator/sandbox.c
@@ -9,6 +9,7 @@
 #include <errno.h>
 #include <dm.h>
 #include <i2c.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/regulator/stm32-vrefbuf.c b/drivers/power/regulator/stm32-vrefbuf.c
index 92136961c2ed..73cae7c6d8e0 100644
--- a/drivers/power/regulator/stm32-vrefbuf.c
+++ b/drivers/power/regulator/stm32-vrefbuf.c
@@ -12,6 +12,7 @@
 #include <asm/io.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/iopoll.h>
 #include <linux/kernel.h>
 #include <power/regulator.h>
diff --git a/drivers/power/regulator/stpmic1.c b/drivers/power/regulator/stpmic1.c
index 3e342f48086b..38cd18b0d4f0 100644
--- a/drivers/power/regulator/stpmic1.c
+++ b/drivers/power/regulator/stpmic1.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/stpmic1.h>
diff --git a/drivers/power/regulator/tps62360_regulator.c b/drivers/power/regulator/tps62360_regulator.c
index ce54495490d1..5d7d3d43ed51 100644
--- a/drivers/power/regulator/tps62360_regulator.c
+++ b/drivers/power/regulator/tps62360_regulator.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <dm/device_compat.h>
+#include <linux/errno.h>
 #include <power/regulator.h>
 
 #define TPS62360_REG_SET0	0
diff --git a/drivers/power/regulator/tps65090_regulator.c b/drivers/power/regulator/tps65090_regulator.c
index 74403a5a8944..95db2d60e504 100644
--- a/drivers/power/regulator/tps65090_regulator.c
+++ b/drivers/power/regulator/tps65090_regulator.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <time.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/tps65090.h>
diff --git a/drivers/power/regulator/tps65910_regulator.c b/drivers/power/regulator/tps65910_regulator.c
index 2c0dd0604b32..a2bd9c6c18ab 100644
--- a/drivers/power/regulator/tps65910_regulator.c
+++ b/drivers/power/regulator/tps65910_regulator.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/regulator/tps65941_regulator.c b/drivers/power/regulator/tps65941_regulator.c
index c25ca3181004..535d88a7e19c 100644
--- a/drivers/power/regulator/tps65941_regulator.c
+++ b/drivers/power/regulator/tps65941_regulator.c
@@ -14,6 +14,7 @@
 #include <log.h>
 #include <stdio.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/tps65941.h>
diff --git a/drivers/power/tps6586x.c b/drivers/power/tps6586x.c
index 49b28a5e6bf6..acf0d5cfa4f4 100644
--- a/drivers/power/tps6586x.c
+++ b/drivers/power/tps6586x.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <i2c.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 static struct udevice *tps6586x_dev;
 
diff --git a/drivers/pwm/exynos_pwm.c b/drivers/pwm/exynos_pwm.c
index e55fcceafd71..5417e95ef7b1 100644
--- a/drivers/pwm/exynos_pwm.c
+++ b/drivers/pwm/exynos_pwm.c
@@ -11,6 +11,7 @@
 #include <asm/arch/clk.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/pwm.h>
+#include <linux/errno.h>
 
 struct exynos_pwm_priv {
 	struct s5p_timer *regs;
diff --git a/drivers/pwm/pwm-mtk.c b/drivers/pwm/pwm-mtk.c
index c6973dad3a80..1459e7fa6738 100644
--- a/drivers/pwm/pwm-mtk.c
+++ b/drivers/pwm/pwm-mtk.c
@@ -13,6 +13,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 
 /* PWM registers and bits definitions */
diff --git a/drivers/pwm/pwm-sifive.c b/drivers/pwm/pwm-sifive.c
index 0b819cfbf788..866b243c0046 100644
--- a/drivers/pwm/pwm-sifive.c
+++ b/drivers/pwm/pwm-sifive.c
@@ -19,6 +19,7 @@
 #include <pwm.h>
 #include <regmap.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/log2.h>
 #include <linux/bitfield.h>
diff --git a/drivers/pwm/pwm-uclass.c b/drivers/pwm/pwm-uclass.c
index 027181c64652..ab2df85e3ea2 100644
--- a/drivers/pwm/pwm-uclass.c
+++ b/drivers/pwm/pwm-uclass.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <pwm.h>
+#include <linux/errno.h>
 
 int pwm_set_invert(struct udevice *dev, uint channel, bool polarity)
 {
diff --git a/drivers/pwm/rk_pwm.c b/drivers/pwm/rk_pwm.c
index 0fb894804b57..04c16ff36d8e 100644
--- a/drivers/pwm/rk_pwm.c
+++ b/drivers/pwm/rk_pwm.c
@@ -16,6 +16,7 @@
 #include <asm/io.h>
 #include <asm/arch-rockchip/pwm.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <power/regulator.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/pwm/sandbox_pwm.c b/drivers/pwm/sandbox_pwm.c
index 28988187e039..0e267064b146 100644
--- a/drivers/pwm/sandbox_pwm.c
+++ b/drivers/pwm/sandbox_pwm.c
@@ -9,6 +9,7 @@
 #include <errno.h>
 #include <pwm.h>
 #include <asm/test.h>
+#include <linux/errno.h>
 
 enum {
 	NUM_CHANNELS	= 3,
diff --git a/drivers/pwm/sunxi_pwm.c b/drivers/pwm/sunxi_pwm.c
index ffcf60c55842..d3e714a6ab3c 100644
--- a/drivers/pwm/sunxi_pwm.c
+++ b/drivers/pwm/sunxi_pwm.c
@@ -14,6 +14,7 @@
 #include <asm/io.h>
 #include <asm/arch/pwm.h>
 #include <asm/arch/gpio.h>
+#include <linux/errno.h>
 #include <power/regulator.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/pwm/tegra_pwm.c b/drivers/pwm/tegra_pwm.c
index 5e98d0fc2c7b..2cfb3787dc4d 100644
--- a/drivers/pwm/tegra_pwm.c
+++ b/drivers/pwm/tegra_pwm.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/pwm.h>
+#include <linux/errno.h>
 
 struct tegra_pwm_priv {
 	struct pwm_ctlr *regs;
diff --git a/drivers/ram/bmips_ram.c b/drivers/ram/bmips_ram.c
index 8f953e79afd7..0746d677a4c3 100644
--- a/drivers/ram/bmips_ram.c
+++ b/drivers/ram/bmips_ram.c
@@ -13,6 +13,7 @@
 #include <init.h>
 #include <ram.h>
 #include <asm/io.h>
+#include <linux/errno.h>
 
 #define SDRAM_CFG_REG		0x0
 #define SDRAM_CFG_COL_SHIFT	4
diff --git a/drivers/ram/imxrt_sdram.c b/drivers/ram/imxrt_sdram.c
index 3726a39335ef..bfdf666cc435 100644
--- a/drivers/ram/imxrt_sdram.c
+++ b/drivers/ram/imxrt_sdram.c
@@ -15,6 +15,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/ram/k3-am654-ddrss.c b/drivers/ram/k3-am654-ddrss.c
index 21d5426f5c8a..1f282ec75104 100644
--- a/drivers/ram/k3-am654-ddrss.c
+++ b/drivers/ram/k3-am654-ddrss.c
@@ -16,6 +16,7 @@
 #include <power-domain.h>
 #include <asm/arch/sys_proto.h>
 #include <dm/device_compat.h>
+#include <linux/errno.h>
 #include <power/regulator.h>
 #include "k3-am654-ddrss.h"
 
diff --git a/drivers/ram/k3-j721e/k3-j721e-ddrss.c b/drivers/ram/k3-j721e/k3-j721e-ddrss.c
index 25cdf83922f9..bccf5a65c92a 100644
--- a/drivers/ram/k3-j721e/k3-j721e-ddrss.c
+++ b/drivers/ram/k3-j721e/k3-j721e-ddrss.c
@@ -16,6 +16,7 @@
 #include <power-domain.h>
 #include <wait_bit.h>
 #include <dm/device_compat.h>
+#include <linux/errno.h>
 
 #include "lpddr4_obj_if.h"
 #include "lpddr4_if.h"
diff --git a/drivers/ram/k3-j721e/lpddr4_sanity.h b/drivers/ram/k3-j721e/lpddr4_sanity.h
index 0f0fc2767c11..84050d72c4a3 100644
--- a/drivers/ram/k3-j721e/lpddr4_sanity.h
+++ b/drivers/ram/k3-j721e/lpddr4_sanity.h
@@ -21,6 +21,7 @@
 #define LPDDR4_SANITY_H
 
 #include <errno.h>
+#include <linux/errno.h>
 #include <linux/types.h>
 #include "lpddr4_if.h"
 
diff --git a/drivers/ram/mediatek/ddr3-mt7629.c b/drivers/ram/mediatek/ddr3-mt7629.c
index b3a68cb07879..a2f72b704706 100644
--- a/drivers/ram/mediatek/ddr3-mt7629.c
+++ b/drivers/ram/mediatek/ddr3-mt7629.c
@@ -14,6 +14,7 @@
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 /* EMI */
 #define EMI_CONA			0x000
diff --git a/drivers/ram/mpc83xx_sdram.c b/drivers/ram/mpc83xx_sdram.c
index f37812d4c5d9..568867e8aa36 100644
--- a/drivers/ram/mpc83xx_sdram.c
+++ b/drivers/ram/mpc83xx_sdram.c
@@ -13,6 +13,7 @@
 #include <asm/global_data.h>
 #include <asm/ppc.h>
 #include <dt-bindings/memory/mpc83xx-sdram.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/ram/ram-uclass.c b/drivers/ram/ram-uclass.c
index f4d387fed1ef..7f3b6276f9f4 100644
--- a/drivers/ram/ram-uclass.c
+++ b/drivers/ram/ram-uclass.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <dm/lists.h>
 #include <dm/root.h>
+#include <linux/errno.h>
 
 int ram_get_info(struct udevice *dev, struct ram_info *info)
 {
diff --git a/drivers/ram/rockchip/dmc-rk3368.c b/drivers/ram/rockchip/dmc-rk3368.c
index 8795ad1c32cd..1c3d95d7d632 100644
--- a/drivers/ram/rockchip/dmc-rk3368.c
+++ b/drivers/ram/rockchip/dmc-rk3368.c
@@ -25,6 +25,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 struct dram_info {
diff --git a/drivers/ram/rockchip/sdram_rk3188.c b/drivers/ram/rockchip/sdram_rk3188.c
index a2c36fa3cad4..a8db0e341222 100644
--- a/drivers/ram/rockchip/sdram_rk3188.c
+++ b/drivers/ram/rockchip/sdram_rk3188.c
@@ -28,6 +28,7 @@
 #include <asm/arch-rockchip/sdram_rk3288.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 struct chan_info {
diff --git a/drivers/ram/rockchip/sdram_rk322x.c b/drivers/ram/rockchip/sdram_rk322x.c
index 51d87e6d29fd..92fe235be5a5 100644
--- a/drivers/ram/rockchip/sdram_rk322x.c
+++ b/drivers/ram/rockchip/sdram_rk322x.c
@@ -24,6 +24,7 @@
 #include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/ram/rockchip/sdram_rk3288.c b/drivers/ram/rockchip/sdram_rk3288.c
index 1063fde3e877..4f48da4b4e58 100644
--- a/drivers/ram/rockchip/sdram_rk3288.c
+++ b/drivers/ram/rockchip/sdram_rk3288.c
@@ -28,6 +28,7 @@
 #include <asm/arch-rockchip/sdram_rk3288.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <power/regulator.h>
 #include <power/rk8xx_pmic.h>
diff --git a/drivers/ram/rockchip/sdram_rk3399.c b/drivers/ram/rockchip/sdram_rk3399.c
index 935bfc97b147..45c20b7cfa3b 100644
--- a/drivers/ram/rockchip/sdram_rk3399.c
+++ b/drivers/ram/rockchip/sdram_rk3399.c
@@ -26,6 +26,7 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <time.h>
+#include <linux/errno.h>
 
 #define PRESET_SGRF_HOLD(n)	((0x1 << (6 + 16)) | ((n) << 6))
 #define PRESET_GPIO0_HOLD(n)	((0x1 << (7 + 16)) | ((n) << 7))
diff --git a/drivers/ram/sifive/fu540_ddr.c b/drivers/ram/sifive/fu540_ddr.c
index eff6da55ad26..0270dd088dbc 100644
--- a/drivers/ram/sifive/fu540_ddr.c
+++ b/drivers/ram/sifive/fu540_ddr.c
@@ -19,6 +19,7 @@
 #include <clk.h>
 #include <wait_bit.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #define DENALI_CTL_0	0
 #define DENALI_CTL_21	21
diff --git a/drivers/ram/stm32_sdram.c b/drivers/ram/stm32_sdram.c
index 3f61addac31c..04fb730525d3 100644
--- a/drivers/ram/stm32_sdram.c
+++ b/drivers/ram/stm32_sdram.c
@@ -15,6 +15,7 @@
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/ram/stm32mp1/stm32mp1_ddr.c b/drivers/ram/stm32mp1/stm32mp1_ddr.c
index 1f39ce5ea497..6742aa6a9869 100644
--- a/drivers/ram/stm32mp1/stm32mp1_ddr.c
+++ b/drivers/ram/stm32mp1/stm32mp1_ddr.c
@@ -15,6 +15,7 @@
 #include <asm/arch/ddr.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/iopoll.h>
 #include <linux/printk.h>
 #include <linux/string.h>
diff --git a/drivers/ram/stm32mp1/stm32mp1_ram.c b/drivers/ram/stm32mp1/stm32mp1_ram.c
index a24788957dfb..347ff769e405 100644
--- a/drivers/ram/stm32mp1/stm32mp1_ram.c
+++ b/drivers/ram/stm32mp1/stm32mp1_ram.c
@@ -13,6 +13,7 @@
 #include <stdio.h>
 #include <syscon.h>
 #include <asm/io.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include "stm32mp1_ddr.h"
diff --git a/drivers/remoteproc/k3_system_controller.c b/drivers/remoteproc/k3_system_controller.c
index 44271c5baf8e..aa993b973929 100644
--- a/drivers/remoteproc/k3_system_controller.c
+++ b/drivers/remoteproc/k3_system_controller.c
@@ -13,6 +13,7 @@
 #include <errno.h>
 #include <mailbox.h>
 #include <dm/device_compat.h>
+#include <linux/errno.h>
 #include <linux/soc/ti/k3-sec-proxy.h>
 #include <linux/string.h>
 
diff --git a/drivers/remoteproc/rproc-elf-loader.c b/drivers/remoteproc/rproc-elf-loader.c
index 45331107353b..d4064a311b52 100644
--- a/drivers/remoteproc/rproc-elf-loader.c
+++ b/drivers/remoteproc/rproc-elf-loader.c
@@ -11,6 +11,7 @@
 #include <asm/cache.h>
 #include <dm/device_compat.h>
 #include <linux/compat.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/remoteproc/rproc-uclass.c b/drivers/remoteproc/rproc-uclass.c
index 1ed194aa034d..950dc3f9b11c 100644
--- a/drivers/remoteproc/rproc-uclass.c
+++ b/drivers/remoteproc/rproc-uclass.c
@@ -16,6 +16,7 @@
 #include <dm.h>
 #include <dm/uclass.h>
 #include <dm/uclass-internal.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/remoteproc/sandbox_testproc.c b/drivers/remoteproc/sandbox_testproc.c
index 4317af78d29f..e3759eed95ca 100644
--- a/drivers/remoteproc/sandbox_testproc.c
+++ b/drivers/remoteproc/sandbox_testproc.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <remoteproc.h>
 #include <asm/io.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 /**
diff --git a/drivers/remoteproc/stm32_copro.c b/drivers/remoteproc/stm32_copro.c
index e09d2b9a6460..eb437464ae16 100644
--- a/drivers/remoteproc/stm32_copro.c
+++ b/drivers/remoteproc/stm32_copro.c
@@ -15,6 +15,7 @@
 #include <asm/io.h>
 #include <dm/device_compat.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 #define RCC_GCR_HOLD_BOOT	0
diff --git a/drivers/remoteproc/ti_k3_arm64_rproc.c b/drivers/remoteproc/ti_k3_arm64_rproc.c
index 28c6ddb69191..20b02f691e35 100644
--- a/drivers/remoteproc/ti_k3_arm64_rproc.c
+++ b/drivers/remoteproc/ti_k3_arm64_rproc.c
@@ -17,6 +17,7 @@
 #include <power-domain.h>
 #include <dm/device_compat.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/soc/ti/ti_sci_protocol.h>
 #include "ti_sci_proc.h"
 
diff --git a/drivers/remoteproc/ti_k3_dsp_rproc.c b/drivers/remoteproc/ti_k3_dsp_rproc.c
index cbebfacb48c1..722b9432491a 100644
--- a/drivers/remoteproc/ti_k3_dsp_rproc.c
+++ b/drivers/remoteproc/ti_k3_dsp_rproc.c
@@ -19,6 +19,7 @@
 #include <power-domain.h>
 #include <dm/device_compat.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/sizes.h>
 #include <linux/soc/ti/ti_sci_protocol.h>
 #include <linux/string.h>
diff --git a/drivers/remoteproc/ti_k3_r5f_rproc.c b/drivers/remoteproc/ti_k3_r5f_rproc.c
index 964a75309adb..db437c1a6861 100644
--- a/drivers/remoteproc/ti_k3_r5f_rproc.c
+++ b/drivers/remoteproc/ti_k3_r5f_rproc.c
@@ -18,6 +18,7 @@
 #include <asm/io.h>
 #include <dm/device_compat.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/soc/ti/ti_sci_protocol.h>
 #include <linux/string.h>
diff --git a/drivers/remoteproc/ti_power_proc.c b/drivers/remoteproc/ti_power_proc.c
index 0d78ec439d0e..84e621ca9ee0 100644
--- a/drivers/remoteproc/ti_power_proc.c
+++ b/drivers/remoteproc/ti_power_proc.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <remoteproc.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include <mach/psc_defs.h>
diff --git a/drivers/reset/reset-bcm6345.c b/drivers/reset/reset-bcm6345.c
index 156703e08430..69793967c420 100644
--- a/drivers/reset/reset-bcm6345.c
+++ b/drivers/reset/reset-bcm6345.c
@@ -15,6 +15,7 @@
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 #define MAX_RESETS	32
 
diff --git a/drivers/reset/reset-hisilicon.c b/drivers/reset/reset-hisilicon.c
index 139bc5d73e0b..2012421e4173 100644
--- a/drivers/reset/reset-hisilicon.c
+++ b/drivers/reset/reset-hisilicon.c
@@ -11,6 +11,7 @@
 #include <dt-bindings/reset/ti-syscon.h>
 #include <reset-uclass.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 struct hisi_reset_priv {
 	void __iomem *base;
diff --git a/drivers/reset/reset-hsdk.c b/drivers/reset/reset-hsdk.c
index 0c8f276293db..531e2cfb5fa4 100644
--- a/drivers/reset/reset-hsdk.c
+++ b/drivers/reset/reset-hsdk.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <dm.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/iopoll.h>
 #include <reset-uclass.h>
 
diff --git a/drivers/reset/reset-imx7.c b/drivers/reset/reset-imx7.c
index 96916b644ad1..1ad031b90412 100644
--- a/drivers/reset/reset-imx7.c
+++ b/drivers/reset/reset-imx7.c
@@ -13,6 +13,7 @@
 #include <reset-uclass.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 struct imx7_reset_priv {
 	void __iomem *base;
diff --git a/drivers/reset/reset-mediatek.c b/drivers/reset/reset-mediatek.c
index 97d3d5759274..9df4c2a1c7b7 100644
--- a/drivers/reset/reset-mediatek.c
+++ b/drivers/reset/reset-mediatek.c
@@ -16,6 +16,7 @@
 #include <syscon.h>
 #include <linux/bitops.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 
 struct mediatek_reset_priv {
 	struct regmap *regmap;
diff --git a/drivers/reset/reset-meson.c b/drivers/reset/reset-meson.c
index 4e3327898e22..8322a48a8aeb 100644
--- a/drivers/reset/reset-meson.c
+++ b/drivers/reset/reset-meson.c
@@ -13,6 +13,7 @@
 #include <reset-uclass.h>
 #include <regmap.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #define REG_COUNT	8
 #define BITS_PER_REG	32
diff --git a/drivers/reset/reset-mtmips.c b/drivers/reset/reset-mtmips.c
index bc20e3335c5c..4d59a9b8ac56 100644
--- a/drivers/reset/reset-mtmips.c
+++ b/drivers/reset/reset-mtmips.c
@@ -12,6 +12,7 @@
 #include <malloc.h>
 #include <reset-uclass.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 
 struct mtmips_reset_priv {
diff --git a/drivers/reset/reset-raspberrypi.c b/drivers/reset/reset-raspberrypi.c
index e2d284e5aca5..e4aa7ca6d3be 100644
--- a/drivers/reset/reset-raspberrypi.c
+++ b/drivers/reset/reset-raspberrypi.c
@@ -9,6 +9,7 @@
 #include <reset-uclass.h>
 #include <asm/arch/msg.h>
 #include <dt-bindings/reset/raspberrypi,firmware-reset.h>
+#include <linux/errno.h>
 
 static int raspberrypi_reset_request(struct reset_ctl *reset_ctl)
 {
diff --git a/drivers/reset/reset-rockchip.c b/drivers/reset/reset-rockchip.c
index 809255565086..5e8daa28913c 100644
--- a/drivers/reset/reset-rockchip.c
+++ b/drivers/reset/reset-rockchip.c
@@ -9,6 +9,7 @@
 #include <malloc.h>
 #include <reset-uclass.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <asm/arch-rockchip/hardware.h>
 #include <dm/lists.h>
diff --git a/drivers/reset/reset-sunxi.c b/drivers/reset/reset-sunxi.c
index b9ca80e9b025..54692cc3f5e7 100644
--- a/drivers/reset/reset-sunxi.c
+++ b/drivers/reset/reset-sunxi.c
@@ -14,6 +14,7 @@
 #include <asm/io.h>
 #include <dm/lists.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/log2.h>
 #include <asm/arch/ccu.h>
 
diff --git a/drivers/reset/reset-syscon.c b/drivers/reset/reset-syscon.c
index 8520227d551e..16e74dc8e94b 100644
--- a/drivers/reset/reset-syscon.c
+++ b/drivers/reset/reset-syscon.c
@@ -11,6 +11,7 @@
 #include <syscon.h>
 #include <linux/bitops.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 
 struct syscon_reset_priv {
 	struct regmap *regmap;
diff --git a/drivers/reset/reset-ti-sci.c b/drivers/reset/reset-ti-sci.c
index 95cd3885876d..4d00622eb81a 100644
--- a/drivers/reset/reset-ti-sci.c
+++ b/drivers/reset/reset-ti-sci.c
@@ -16,6 +16,7 @@
 #include <reset-uclass.h>
 #include <dm/device_compat.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/soc/ti/ti_sci_protocol.h>
 
 /**
diff --git a/drivers/reset/reset-uclass.c b/drivers/reset/reset-uclass.c
index 5e38ce5c0669..4dc2950bbab1 100644
--- a/drivers/reset/reset-uclass.c
+++ b/drivers/reset/reset-uclass.c
@@ -11,6 +11,7 @@
 #include <reset.h>
 #include <reset-uclass.h>
 #include <dm/devres.h>
+#include <linux/errno.h>
 
 static inline struct reset_ops *reset_dev_ops(struct udevice *dev)
 {
diff --git a/drivers/reset/reset-uniphier.c b/drivers/reset/reset-uniphier.c
index fe1bd5541bda..b557906b8903 100644
--- a/drivers/reset/reset-uniphier.c
+++ b/drivers/reset/reset-uniphier.c
@@ -11,6 +11,7 @@
 #include <reset-uclass.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/sizes.h>
 
diff --git a/drivers/reset/sandbox-reset.c b/drivers/reset/sandbox-reset.c
index 7a6f7f676cc4..a6936e81877e 100644
--- a/drivers/reset/sandbox-reset.c
+++ b/drivers/reset/sandbox-reset.c
@@ -10,6 +10,7 @@
 #include <reset-uclass.h>
 #include <asm/io.h>
 #include <asm/reset.h>
+#include <linux/errno.h>
 
 #define SANDBOX_RESET_SIGNALS 101
 
diff --git a/drivers/reset/sti-reset.c b/drivers/reset/sti-reset.c
index 12000d05cc89..75d972a5fa2f 100644
--- a/drivers/reset/sti-reset.c
+++ b/drivers/reset/sti-reset.c
@@ -16,6 +16,7 @@
 #include <asm/global_data.h>
 #include <dt-bindings/reset/stih407-resets.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/reset/stm32-reset.c b/drivers/reset/stm32-reset.c
index 64a11cfcfc0a..6f68c479e36b 100644
--- a/drivers/reset/stm32-reset.c
+++ b/drivers/reset/stm32-reset.c
@@ -13,6 +13,7 @@
 #include <stm32_rcc.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 /* reset clear offset for STM32MP RCC */
 #define RCC_CL 0x4
diff --git a/drivers/reset/tegra-car-reset.c b/drivers/reset/tegra-car-reset.c
index a33d4533a82b..68ec38643fd8 100644
--- a/drivers/reset/tegra-car-reset.c
+++ b/drivers/reset/tegra-car-reset.c
@@ -10,6 +10,7 @@
 #include <reset-uclass.h>
 #include <asm/arch/clock.h>
 #include <asm/arch-tegra/clk_rst.h>
+#include <linux/errno.h>
 
 static int tegra_car_reset_request(struct reset_ctl *reset_ctl)
 {
diff --git a/drivers/rng/meson-rng.c b/drivers/rng/meson-rng.c
index 448d4537b05d..0debe8a10689 100644
--- a/drivers/rng/meson-rng.c
+++ b/drivers/rng/meson-rng.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <rng.h>
 #include <asm/io.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 struct meson_rng_platdata {
diff --git a/drivers/rng/rng-uclass.c b/drivers/rng/rng-uclass.c
index b6af3b8606a7..b315401f20e5 100644
--- a/drivers/rng/rng-uclass.c
+++ b/drivers/rng/rng-uclass.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <dm.h>
 #include <rng.h>
+#include <linux/errno.h>
 
 int dm_rng_read(struct udevice *dev, void *buffer, size_t size)
 {
diff --git a/drivers/rng/rockchip_rng.c b/drivers/rng/rockchip_rng.c
index c6a834b67c56..efc1980e4497 100644
--- a/drivers/rng/rockchip_rng.c
+++ b/drivers/rng/rockchip_rng.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/iopoll.h>
 #include <linux/string.h>
 #include <rng.h>
diff --git a/drivers/rng/stm32mp1_rng.c b/drivers/rng/stm32mp1_rng.c
index 32f8cebb687d..25cba1602227 100644
--- a/drivers/rng/stm32mp1_rng.c
+++ b/drivers/rng/stm32mp1_rng.c
@@ -12,6 +12,7 @@
 #include <stdio.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include <asm/io.h>
diff --git a/drivers/rtc/ds3231.c b/drivers/rtc/ds3231.c
index 328b03ed05da..ebb1cc65c64c 100644
--- a/drivers/rtc/ds3231.c
+++ b/drivers/rtc/ds3231.c
@@ -21,6 +21,7 @@
 #include <rtc.h>
 #include <i2c.h>
 #include <stdio.h>
+#include <linux/errno.h>
 
 /*
  * RTC register addresses
diff --git a/drivers/rtc/ds3232.c b/drivers/rtc/ds3232.c
index 0a30e0eabb45..e6c9f8786659 100644
--- a/drivers/rtc/ds3232.c
+++ b/drivers/rtc/ds3232.c
@@ -10,6 +10,7 @@
 #include <rtc.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 /*
  * RTC register addresses
diff --git a/drivers/rtc/pl031.c b/drivers/rtc/pl031.c
index 1b6717232c79..f98e3506eb61 100644
--- a/drivers/rtc/pl031.c
+++ b/drivers/rtc/pl031.c
@@ -14,6 +14,7 @@
 #include <rtc.h>
 #include <asm/io.h>
 #include <asm/types.h>
+#include <linux/errno.h>
 
 /*
  * Register definitions
diff --git a/drivers/rtc/rtc-uclass.c b/drivers/rtc/rtc-uclass.c
index 8035f7fe9ccc..1fda0cd8fbce 100644
--- a/drivers/rtc/rtc-uclass.c
+++ b/drivers/rtc/rtc-uclass.c
@@ -9,6 +9,7 @@
 #include <errno.h>
 #include <log.h>
 #include <rtc.h>
+#include <linux/errno.h>
 
 int dm_rtc_get(struct udevice *dev, struct rtc_time *time)
 {
diff --git a/drivers/rtc/rv3029.c b/drivers/rtc/rv3029.c
index 4dddf62aca88..ffed37ad5aa3 100644
--- a/drivers/rtc/rv3029.c
+++ b/drivers/rtc/rv3029.c
@@ -19,6 +19,7 @@
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 #define RTC_RV3029_PAGE_LEN             7
 
diff --git a/drivers/rtc/rx8010sj.c b/drivers/rtc/rx8010sj.c
index 1d9b7cd6358c..1da7a7d6c905 100644
--- a/drivers/rtc/rx8010sj.c
+++ b/drivers/rtc/rx8010sj.c
@@ -23,6 +23,7 @@
 #include <rtc.h>
 #include <stdio.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 /*---------------------------------------------------------------------*/
 /* #undef DEBUG_RTC */
diff --git a/drivers/rtc/rx8025.c b/drivers/rtc/rx8025.c
index 7fd04d999b0f..aaa3609be008 100644
--- a/drivers/rtc/rx8025.c
+++ b/drivers/rtc/rx8025.c
@@ -14,6 +14,7 @@
 #include <i2c.h>
 #include <rtc.h>
 #include <stdio.h>
+#include <linux/errno.h>
 
 /*---------------------------------------------------------------------*/
 #undef DEBUG_RTC
diff --git a/drivers/rtc/s35392a.c b/drivers/rtc/s35392a.c
index 5d70ed1ecda8..3744d8445fbc 100644
--- a/drivers/rtc/s35392a.c
+++ b/drivers/rtc/s35392a.c
@@ -25,6 +25,7 @@
 #include <linux/bitrev.h>
 #include <rtc.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 #define S35390A_CHIP_ADDR	0x30
 
diff --git a/drivers/rtc/stm32_rtc.c b/drivers/rtc/stm32_rtc.c
index f9db318af1dc..8f9540697df4 100644
--- a/drivers/rtc/stm32_rtc.c
+++ b/drivers/rtc/stm32_rtc.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/iopoll.h>
 
 #define STM32_RTC_TR		0x00
diff --git a/drivers/scsi/scsi-uclass.c b/drivers/scsi/scsi-uclass.c
index acf3b3dc9570..4b063ad06e13 100644
--- a/drivers/scsi/scsi-uclass.c
+++ b/drivers/scsi/scsi-uclass.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <dm.h>
 #include <scsi.h>
+#include <linux/errno.h>
 
 int scsi_exec(struct udevice *dev, struct scsi_cmd *pccb)
 {
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
index 1a5e256d61a3..ad7ca9e8784a 100644
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -17,6 +17,7 @@
 #include <vsprintf.h>
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #if !defined(CONFIG_DM_SCSI)
diff --git a/drivers/serial/altera_jtag_uart.c b/drivers/serial/altera_jtag_uart.c
index 35b76f53f93d..6b20d3d487be 100644
--- a/drivers/serial/altera_jtag_uart.c
+++ b/drivers/serial/altera_jtag_uart.c
@@ -10,6 +10,7 @@
 #include <serial.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 /* data register */
 #define ALTERA_JTAG_RVALID	BIT(15)	/* Read valid */
diff --git a/drivers/serial/altera_uart.c b/drivers/serial/altera_uart.c
index 0be5cd75c853..ea9eb206a109 100644
--- a/drivers/serial/altera_uart.c
+++ b/drivers/serial/altera_uart.c
@@ -10,6 +10,7 @@
 #include <serial.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 /* status register */
 #define ALTERA_UART_TMT		BIT(5)	/* tx empty */
diff --git a/drivers/serial/arm_dcc.c b/drivers/serial/arm_dcc.c
index dfcb6fd69812..270f61cc0741 100644
--- a/drivers/serial/arm_dcc.c
+++ b/drivers/serial/arm_dcc.c
@@ -18,6 +18,7 @@
 #include <common.h>
 #include <dm.h>
 #include <serial.h>
+#include <linux/errno.h>
 
 #if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_V7A) || defined(CONFIG_CPU_V7R)
 /*
diff --git a/drivers/serial/atmel_usart.c b/drivers/serial/atmel_usart.c
index f20659358869..f6e14cc90216 100644
--- a/drivers/serial/atmel_usart.c
+++ b/drivers/serial/atmel_usart.c
@@ -16,6 +16,7 @@
 #include <asm/global_data.h>
 #include <linux/compiler.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 #include <asm/io.h>
 #ifdef CONFIG_DM_SERIAL
diff --git a/drivers/serial/lpc32xx_hsuart.c b/drivers/serial/lpc32xx_hsuart.c
index 7d31c6d4a145..598ae08c668e 100644
--- a/drivers/serial/lpc32xx_hsuart.c
+++ b/drivers/serial/lpc32xx_hsuart.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <serial.h>
 #include <dm/platform_data/lpc32xx_hsuart.h>
+#include <linux/errno.h>
 
 #include <asm/arch/uart.h>
 #include <linux/compiler.h>
diff --git a/drivers/serial/ns16550.c b/drivers/serial/ns16550.c
index 840d89f16fa5..603a8cb59774 100644
--- a/drivers/serial/ns16550.c
+++ b/drivers/serial/ns16550.c
@@ -16,6 +16,7 @@
 #include <watchdog.h>
 #include <asm/global_data.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/types.h>
 #include <asm/io.h>
 
diff --git a/drivers/serial/sandbox.c b/drivers/serial/sandbox.c
index 01c924675af9..aef4c75d3880 100644
--- a/drivers/serial/sandbox.c
+++ b/drivers/serial/sandbox.c
@@ -20,6 +20,7 @@
 #include <asm/global_data.h>
 #include <linux/compiler.h>
 #include <asm/state.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/serial/serial-uclass.c b/drivers/serial/serial-uclass.c
index 191263a0d636..9b679a5a6af2 100644
--- a/drivers/serial/serial-uclass.c
+++ b/drivers/serial/serial-uclass.c
@@ -19,6 +19,7 @@
 #include <dm/device-internal.h>
 #include <dm/of_access.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/serial/serial.c b/drivers/serial/serial.c
index 71e1acbde083..a6839f465dc5 100644
--- a/drivers/serial/serial.c
+++ b/drivers/serial/serial.c
@@ -16,6 +16,7 @@
 #include <linux/compiler.h>
 #include <errno.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/serial/serial_ar933x.c b/drivers/serial/serial_ar933x.c
index 9de94b69bd04..a16d6a6eca61 100644
--- a/drivers/serial/serial_ar933x.c
+++ b/drivers/serial/serial_ar933x.c
@@ -14,6 +14,7 @@
 #include <asm/types.h>
 #include <dm/pinctrl.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <mach/ar71xx_regs.h>
 
 #define AR933X_UART_DATA_REG            0x00
diff --git a/drivers/serial/serial_bcm283x_mu.c b/drivers/serial/serial_bcm283x_mu.c
index 8a4af87eb640..d9ebb273ddc5 100644
--- a/drivers/serial/serial_bcm283x_mu.c
+++ b/drivers/serial/serial_bcm283x_mu.c
@@ -25,6 +25,7 @@
 #include <dm/pinctrl.h>
 #include <linux/bitops.h>
 #include <linux/compiler.h>
+#include <linux/errno.h>
 
 struct bcm283x_mu_regs {
 	u32 io;
diff --git a/drivers/serial/serial_bcm283x_pl011.c b/drivers/serial/serial_bcm283x_pl011.c
index 923f402fbe9d..efb6eb60b356 100644
--- a/drivers/serial/serial_bcm283x_pl011.c
+++ b/drivers/serial/serial_bcm283x_pl011.c
@@ -9,6 +9,7 @@
 #include <dm/pinctrl.h>
 #include <dm/platform_data/serial_pl01x.h>
 #include <serial.h>
+#include <linux/errno.h>
 #include "serial_pl01x_internal.h"
 
 /*
diff --git a/drivers/serial/serial_bcm6345.c b/drivers/serial/serial_bcm6345.c
index 5b963ce45bc0..309cbf63af9f 100644
--- a/drivers/serial/serial_bcm6345.c
+++ b/drivers/serial/serial_bcm6345.c
@@ -14,6 +14,7 @@
 #include <serial.h>
 #include <asm/io.h>
 #include <asm/types.h>
+#include <linux/errno.h>
 
 /* UART Control register */
 #define UART_CTL_REG			0x0
diff --git a/drivers/serial/serial_cortina.c b/drivers/serial/serial_cortina.c
index cc20673efeff..c0beba19f58a 100644
--- a/drivers/serial/serial_cortina.c
+++ b/drivers/serial/serial_cortina.c
@@ -13,6 +13,7 @@
 #include <serial.h>
 #include <linux/bitops.h>
 #include <linux/compiler.h>
+#include <linux/errno.h>
 
 /* Register definitions */
 #define UCFG			0x00	/* UART config register */
diff --git a/drivers/serial/serial_efi.c b/drivers/serial/serial_efi.c
index b152e1025879..df3a09010243 100644
--- a/drivers/serial/serial_efi.c
+++ b/drivers/serial/serial_efi.c
@@ -15,6 +15,7 @@
 #include <linux/compiler.h>
 #include <asm/io.h>
 #include <serial.h>
+#include <linux/errno.h>
 
 /* Information about the efi console */
 struct serial_efi_priv {
diff --git a/drivers/serial/serial_linflexuart.c b/drivers/serial/serial_linflexuart.c
index d8482ba7047c..d9be526ffe2e 100644
--- a/drivers/serial/serial_linflexuart.c
+++ b/drivers/serial/serial_linflexuart.c
@@ -13,6 +13,7 @@
 #include <linux/compiler.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/clock.h>
+#include <linux/errno.h>
 
 #define US1_TDRE            (1 << 7)
 #define US1_RDRF            (1 << 5)
diff --git a/drivers/serial/serial_lpuart.c b/drivers/serial/serial_lpuart.c
index 8631d790e6f3..1017981f97c2 100644
--- a/drivers/serial/serial_lpuart.c
+++ b/drivers/serial/serial_lpuart.c
@@ -18,6 +18,7 @@
 #include <linux/compiler.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/clock.h>
+#include <linux/errno.h>
 
 #define US1_TDRE	(1 << 7)
 #define US1_RDRF	(1 << 5)
diff --git a/drivers/serial/serial_mcf.c b/drivers/serial/serial_mcf.c
index 6b907fe19202..2d2f07e369b7 100644
--- a/drivers/serial/serial_mcf.c
+++ b/drivers/serial/serial_mcf.c
@@ -23,6 +23,7 @@
 #include <linux/compiler.h>
 #include <asm/immap.h>
 #include <asm/uart.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/serial/serial_meson.c b/drivers/serial/serial_meson.c
index 496a2ca2c35b..80141642af84 100644
--- a/drivers/serial/serial_meson.c
+++ b/drivers/serial/serial_meson.c
@@ -10,6 +10,7 @@
 #include <linux/bitops.h>
 #include <linux/compiler.h>
 #include <serial.h>
+#include <linux/errno.h>
 
 struct meson_uart {
 	u32 wfifo;
diff --git a/drivers/serial/serial_msm.c b/drivers/serial/serial_msm.c
index 13c7f9d809ec..0809f1ff8a9f 100644
--- a/drivers/serial/serial_msm.c
+++ b/drivers/serial/serial_msm.c
@@ -19,6 +19,7 @@
 #include <asm/io.h>
 #include <linux/compiler.h>
 #include <dm/pinctrl.h>
+#include <linux/errno.h>
 
 /* Serial registers - this driver works in uartdm mode*/
 
diff --git a/drivers/serial/serial_mtk.c b/drivers/serial/serial_mtk.c
index 0d2a9dc7e3ee..74b5cc880c19 100644
--- a/drivers/serial/serial_mtk.c
+++ b/drivers/serial/serial_mtk.c
@@ -18,6 +18,7 @@
 #include <asm/io.h>
 #include <asm/types.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 struct mtk_serial_regs {
diff --git a/drivers/serial/serial_mxc.c b/drivers/serial/serial_mxc.c
index 1f8eeb2cbfe1..1c08f3ec7957 100644
--- a/drivers/serial/serial_mxc.c
+++ b/drivers/serial/serial_mxc.c
@@ -13,6 +13,7 @@
 #include <dm/platform_data/serial_mxc.h>
 #include <serial.h>
 #include <linux/compiler.h>
+#include <linux/errno.h>
 
 /* UART Control Register Bit Fields.*/
 #define URXD_CHARRDY	(1<<15)
diff --git a/drivers/serial/serial_nulldev.c b/drivers/serial/serial_nulldev.c
index efae14dd6ca5..c92ae698088a 100644
--- a/drivers/serial/serial_nulldev.c
+++ b/drivers/serial/serial_nulldev.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <dm.h>
 #include <serial.h>
+#include <linux/errno.h>
 
 static int nulldev_serial_setbrg(struct udevice *dev, int baudrate)
 {
diff --git a/drivers/serial/serial_omap.c b/drivers/serial/serial_omap.c
index f7997fc788fc..b661b11f0d8c 100644
--- a/drivers/serial/serial_omap.c
+++ b/drivers/serial/serial_omap.c
@@ -14,6 +14,7 @@
 #include <serial.h>
 #include <clk.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 
 #ifndef CONFIG_SYS_NS16550_CLK
 #define CONFIG_SYS_NS16550_CLK  0
diff --git a/drivers/serial/serial_owl.c b/drivers/serial/serial_owl.c
index 2651a45a7f3c..d721e24e4bfe 100644
--- a/drivers/serial/serial_owl.c
+++ b/drivers/serial/serial_owl.c
@@ -15,6 +15,7 @@
 #include <asm/io.h>
 #include <asm/types.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 /* UART Registers */
 #define	OWL_UART_CTL			(0x0000)
diff --git a/drivers/serial/serial_pic32.c b/drivers/serial/serial_pic32.c
index ce6c5db762f3..8e420fb764bc 100644
--- a/drivers/serial/serial_pic32.c
+++ b/drivers/serial/serial_pic32.c
@@ -11,6 +11,7 @@
 #include <wait_bit.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <mach/pic32.h>
 #include <dt-bindings/clock/microchip,clock.h>
 
diff --git a/drivers/serial/serial_pl01x.c b/drivers/serial/serial_pl01x.c
index 1ae5bac249a9..a472e8ca5de9 100644
--- a/drivers/serial/serial_pl01x.c
+++ b/drivers/serial/serial_pl01x.c
@@ -12,6 +12,7 @@
 
 #include <common.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 /* For get_bus_freq() */
 #include <clock_legacy.h>
 #include <dm.h>
diff --git a/drivers/serial/serial_pxa.c b/drivers/serial/serial_pxa.c
index a97d03a88760..e20f0c87540a 100644
--- a/drivers/serial/serial_pxa.c
+++ b/drivers/serial/serial_pxa.c
@@ -31,6 +31,7 @@
 #include <linux/compiler.h>
 #include <serial.h>
 #include <watchdog.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/serial/serial_s5p.c b/drivers/serial/serial_s5p.c
index 986c5ca8107e..1a939628a5aa 100644
--- a/drivers/serial/serial_s5p.c
+++ b/drivers/serial/serial_s5p.c
@@ -18,6 +18,7 @@
 #include <asm/arch/uart.h>
 #include <serial.h>
 #include <clk.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/serial/serial_sh.c b/drivers/serial/serial_sh.c
index d697d62d910c..e596c042ca6b 100644
--- a/drivers/serial/serial_sh.c
+++ b/drivers/serial/serial_sh.c
@@ -17,6 +17,7 @@
 #include <linux/compiler.h>
 #include <dm/platform_data/serial_sh.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include "serial_sh.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/serial/serial_sifive.c b/drivers/serial/serial_sifive.c
index c3f0a3cb65d2..39b62d30eb4f 100644
--- a/drivers/serial/serial_sifive.c
+++ b/drivers/serial/serial_sifive.c
@@ -16,6 +16,7 @@
 #include <linux/compiler.h>
 #include <serial.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/serial/serial_sti_asc.c b/drivers/serial/serial_sti_asc.c
index aa3c9efc8a0e..0cb53d7ae3f1 100644
--- a/drivers/serial/serial_sti_asc.c
+++ b/drivers/serial/serial_sti_asc.c
@@ -13,6 +13,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/serial/serial_stm32.c b/drivers/serial/serial_stm32.c
index cab0db2c96a3..5cd4c815cfd9 100644
--- a/drivers/serial/serial_stm32.c
+++ b/drivers/serial/serial_stm32.c
@@ -15,6 +15,7 @@
 #include <asm/arch/stm32.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include "serial_stm32.h"
 #include <dm/device_compat.h>
 
diff --git a/drivers/serial/serial_xuartlite.c b/drivers/serial/serial_xuartlite.c
index 5116d13751de..fd9e227557f2 100644
--- a/drivers/serial/serial_xuartlite.c
+++ b/drivers/serial/serial_xuartlite.c
@@ -14,6 +14,7 @@
 #include <linux/bitops.h>
 #include <linux/compiler.h>
 #include <serial.h>
+#include <linux/errno.h>
 
 #define SR_TX_FIFO_FULL		BIT(3) /* transmit FIFO full */
 #define SR_TX_FIFO_EMPTY	BIT(2) /* transmit FIFO empty */
diff --git a/drivers/serial/serial_zynq.c b/drivers/serial/serial_zynq.c
index 0e71cada1bba..7fec7d5bec4f 100644
--- a/drivers/serial/serial_zynq.c
+++ b/drivers/serial/serial_zynq.c
@@ -18,6 +18,7 @@
 #include <linux/compiler.h>
 #include <serial.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 
 #define ZYNQ_UART_SR_TXACTIVE	BIT(11) /* TX active */
 #define ZYNQ_UART_SR_TXFULL	BIT(4) /* TX FIFO full */
diff --git a/drivers/smem/msm_smem.c b/drivers/smem/msm_smem.c
index 09a1268e2766..ba9d108173cd 100644
--- a/drivers/smem/msm_smem.c
+++ b/drivers/smem/msm_smem.c
@@ -16,6 +16,7 @@
 #include <asm/io.h>
 #include <linux/bug.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/ioport.h>
 #include <linux/io.h>
 #include <smem.h>
diff --git a/drivers/smem/smem-uclass.c b/drivers/smem/smem-uclass.c
index ce7bf40656e8..90b1316d6dc9 100644
--- a/drivers/smem/smem-uclass.c
+++ b/drivers/smem/smem-uclass.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <dm.h>
 #include <smem.h>
+#include <linux/errno.h>
 
 int smem_alloc(struct udevice *dev, unsigned int host,
 		unsigned int item, size_t size)
diff --git a/drivers/soc/soc-uclass.c b/drivers/soc/soc-uclass.c
index d22773e478bf..29d586e0bcdd 100644
--- a/drivers/soc/soc-uclass.c
+++ b/drivers/soc/soc-uclass.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <dm/lists.h>
 #include <dm/root.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 int soc_get(struct udevice **devp)
diff --git a/drivers/soc/soc_ti_k3.c b/drivers/soc/soc_ti_k3.c
index 0d26cf17d565..fff1a2e744a0 100644
--- a/drivers/soc/soc_ti_k3.c
+++ b/drivers/soc/soc_ti_k3.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <soc.h>
 #include <vsprintf.h>
+#include <linux/errno.h>
 
 #include <asm/io.h>
 
diff --git a/drivers/soc/ti/k3-navss-ringacc.c b/drivers/soc/ti/k3-navss-ringacc.c
index f4a0272f3ae2..21c4b3fe1945 100644
--- a/drivers/soc/ti/k3-navss-ringacc.c
+++ b/drivers/soc/ti/k3-navss-ringacc.c
@@ -21,6 +21,7 @@
 #include <linux/compat.h>
 #include <linux/dma-mapping.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/soc/ti/k3-navss-ringacc.h>
 #include <linux/soc/ti/ti_sci_protocol.h>
diff --git a/drivers/soc/ti/keystone_serdes.c b/drivers/soc/ti/keystone_serdes.c
index f2a5c18b80bd..c121fec52d43 100644
--- a/drivers/soc/ti/keystone_serdes.c
+++ b/drivers/soc/ti/keystone_serdes.c
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <asm/ti-common/keystone_serdes.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #define SERDES_CMU_REGS(x)		(0x0000 + (0x0c00 * (x)))
 #define SERDES_LANE_REGS(x)		(0x0200 + (0x200 * (x)))
diff --git a/drivers/sound/broadwell_i2s.c b/drivers/sound/broadwell_i2s.c
index adb0b2b104da..4258d607cb4d 100644
--- a/drivers/sound/broadwell_i2s.c
+++ b/drivers/sound/broadwell_i2s.c
@@ -15,6 +15,7 @@
 #include <log.h>
 #include <time.h>
 #include <asm/io.h>
+#include <linux/errno.h>
 #include "broadwell_i2s.h"
 
 enum {
diff --git a/drivers/sound/broadwell_sound.c b/drivers/sound/broadwell_sound.c
index 6e083fe1f696..ba2a68ce56a0 100644
--- a/drivers/sound/broadwell_sound.c
+++ b/drivers/sound/broadwell_sound.c
@@ -13,6 +13,7 @@
 #include <dm.h>
 #include <i2s.h>
 #include <sound.h>
+#include <linux/errno.h>
 
 static int broadwell_sound_probe(struct udevice *dev)
 {
diff --git a/drivers/sound/codec-uclass.c b/drivers/sound/codec-uclass.c
index 1ec77acfc1ce..207dc188c48c 100644
--- a/drivers/sound/codec-uclass.c
+++ b/drivers/sound/codec-uclass.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <audio_codec.h>
+#include <linux/errno.h>
 
 int audio_codec_set_params(struct udevice *dev, int interface, int rate,
 			   int mclk_freq, int bits_per_sample, uint channels)
diff --git a/drivers/sound/da7219.c b/drivers/sound/da7219.c
index 6bc1ad0036e0..41aa338b55f5 100644
--- a/drivers/sound/da7219.c
+++ b/drivers/sound/da7219.c
@@ -20,6 +20,7 @@
 #include <asm-generic/gpio.h>
 #include <dt-bindings/sound/nhlt.h>
 #include <dm/acpi.h>
+#include <linux/errno.h>
 
 #define DA7219_ACPI_HID		"DLGS7219"
 
diff --git a/drivers/sound/hda_codec.c b/drivers/sound/hda_codec.c
index 93820d77802f..241b6270c4dd 100644
--- a/drivers/sound/hda_codec.c
+++ b/drivers/sound/hda_codec.c
@@ -18,6 +18,7 @@
 #include <dt-bindings/sound/azalia.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 /**
  * struct hda_regs - HDA registers
diff --git a/drivers/sound/i2s-uclass.c b/drivers/sound/i2s-uclass.c
index b741e3952d17..e31d9933fff8 100644
--- a/drivers/sound/i2s-uclass.c
+++ b/drivers/sound/i2s-uclass.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <i2s.h>
+#include <linux/errno.h>
 
 int i2s_tx_data(struct udevice *dev, void *data, uint data_size)
 {
diff --git a/drivers/sound/max98088.c b/drivers/sound/max98088.c
index 5b4c489f4b1a..6c2caf3f77fd 100644
--- a/drivers/sound/max98088.c
+++ b/drivers/sound/max98088.c
@@ -17,6 +17,7 @@
 #include <log.h>
 #include <sound.h>
 #include <asm/gpio.h>
+#include <linux/errno.h>
 #include "maxim_codec.h"
 #include "max98088.h"
 
diff --git a/drivers/sound/max98090.c b/drivers/sound/max98090.c
index d23955d6e10e..16620c3e9674 100644
--- a/drivers/sound/max98090.c
+++ b/drivers/sound/max98090.c
@@ -15,6 +15,7 @@
 #include <sound.h>
 #include <asm/gpio.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include "maxim_codec.h"
 #include "max98090.h"
 
diff --git a/drivers/sound/max98095.c b/drivers/sound/max98095.c
index 5037f9516fa1..db52ccdea3b2 100644
--- a/drivers/sound/max98095.c
+++ b/drivers/sound/max98095.c
@@ -16,6 +16,7 @@
 #include <log.h>
 #include <sound.h>
 #include <asm/gpio.h>
+#include <linux/errno.h>
 #include "i2s.h"
 #include "max98095.h"
 
diff --git a/drivers/sound/max98357a.c b/drivers/sound/max98357a.c
index 841bc6ef682d..8fbcf80abcba 100644
--- a/drivers/sound/max98357a.c
+++ b/drivers/sound/max98357a.c
@@ -20,6 +20,7 @@
 #endif
 #include <dt-bindings/sound/nhlt.h>
 #include <dm/acpi.h>
+#include <linux/errno.h>
 
 struct max98357a_priv {
 	struct gpio_desc sdmode_gpio;
diff --git a/drivers/sound/rockchip_i2s.c b/drivers/sound/rockchip_i2s.c
index 4e9e68aaac81..a20c8e78b88b 100644
--- a/drivers/sound/rockchip_i2s.c
+++ b/drivers/sound/rockchip_i2s.c
@@ -14,6 +14,7 @@
 #include <sound.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 struct rk_i2s_regs {
 	u32 txcr;		/* I2S_TXCR, 0x00 */
diff --git a/drivers/sound/rockchip_sound.c b/drivers/sound/rockchip_sound.c
index 94058e603d7d..ec93a44aec7e 100644
--- a/drivers/sound/rockchip_sound.c
+++ b/drivers/sound/rockchip_sound.c
@@ -16,6 +16,7 @@
 #include <sound.h>
 #include <asm/arch-rockchip/periph.h>
 #include <dm/pinctrl.h>
+#include <linux/errno.h>
 
 static int rockchip_sound_setup(struct udevice *dev)
 {
diff --git a/drivers/sound/rt5677.c b/drivers/sound/rt5677.c
index 16aa9dfc5b2b..bfe78ff6b4f6 100644
--- a/drivers/sound/rt5677.c
+++ b/drivers/sound/rt5677.c
@@ -9,6 +9,7 @@
 #include <audio_codec.h>
 #include <dm.h>
 #include <i2c.h>
+#include <linux/errno.h>
 #include "rt5677.h"
 #include <log.h>
 
diff --git a/drivers/sound/samsung-i2s.c b/drivers/sound/samsung-i2s.c
index 24e124e8083b..51cb9637bab1 100644
--- a/drivers/sound/samsung-i2s.c
+++ b/drivers/sound/samsung-i2s.c
@@ -14,6 +14,7 @@
 #include <asm/arch/pinmux.h>
 #include <asm/arch/i2s-regs.h>
 #include <asm/io.h>
+#include <linux/errno.h>
 
 #define FIC_TX2COUNT(x)		(((x) >>  24) & 0xf)
 #define FIC_TX1COUNT(x)		(((x) >>  16) & 0xf)
diff --git a/drivers/sound/samsung_sound.c b/drivers/sound/samsung_sound.c
index 473cedf7e974..16fdb22ea9ee 100644
--- a/drivers/sound/samsung_sound.c
+++ b/drivers/sound/samsung_sound.c
@@ -12,6 +12,7 @@
 #include <sound.h>
 #include <asm/gpio.h>
 #include <asm/arch/power.h>
+#include <linux/errno.h>
 
 static int samsung_sound_setup(struct udevice *dev)
 {
diff --git a/drivers/sound/sandbox.c b/drivers/sound/sandbox.c
index 0686add3c8b3..1c30f06350f6 100644
--- a/drivers/sound/sandbox.c
+++ b/drivers/sound/sandbox.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <sound.h>
 #include <asm/sdl.h>
+#include <linux/errno.h>
 
 struct sandbox_codec_priv {
 	int interface;
diff --git a/drivers/sound/sound-uclass.c b/drivers/sound/sound-uclass.c
index 92f4b0b924ba..86722d23c5ce 100644
--- a/drivers/sound/sound-uclass.c
+++ b/drivers/sound/sound-uclass.c
@@ -11,6 +11,7 @@
 #include <malloc.h>
 #include <sound.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 #define SOUND_BITS_IN_BYTE 8
 
diff --git a/drivers/sound/tegra_ahub.c b/drivers/sound/tegra_ahub.c
index 2fead1aeffda..cb27be0a7cb3 100644
--- a/drivers/sound/tegra_ahub.c
+++ b/drivers/sound/tegra_ahub.c
@@ -16,6 +16,7 @@
 #include <asm/io.h>
 #include <asm/arch-tegra/tegra_ahub.h>
 #include <asm/arch-tegra/tegra_i2s.h>
+#include <linux/errno.h>
 #include "tegra_i2s_priv.h"
 
 struct tegra_ahub_priv {
diff --git a/drivers/sound/tegra_i2s.c b/drivers/sound/tegra_i2s.c
index 5cf82250da20..7749cd47b70c 100644
--- a/drivers/sound/tegra_i2s.c
+++ b/drivers/sound/tegra_i2s.c
@@ -14,6 +14,7 @@
 #include <sound.h>
 #include <asm/io.h>
 #include <asm/arch-tegra/tegra_i2s.h>
+#include <linux/errno.h>
 #include "tegra_i2s_priv.h"
 
 int tegra_i2s_set_cif_tx_ctrl(struct udevice *dev, u32 value)
diff --git a/drivers/sound/tegra_sound.c b/drivers/sound/tegra_sound.c
index aef6a2eb1475..d76448c7e4d4 100644
--- a/drivers/sound/tegra_sound.c
+++ b/drivers/sound/tegra_sound.c
@@ -14,6 +14,7 @@
 #include <misc.h>
 #include <sound.h>
 #include <asm/gpio.h>
+#include <linux/errno.h>
 #include "tegra_i2s_priv.h"
 
 static int tegra_sound_setup(struct udevice *dev)
diff --git a/drivers/sound/wm8994.c b/drivers/sound/wm8994.c
index 367e14454170..c37c787549d5 100644
--- a/drivers/sound/wm8994.c
+++ b/drivers/sound/wm8994.c
@@ -17,6 +17,7 @@
 #include <asm/arch/clk.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/sound.h>
+#include <linux/errno.h>
 #include "wm8994.h"
 #include "wm8994_registers.h"
 
diff --git a/drivers/spi/atcspi200_spi.c b/drivers/spi/atcspi200_spi.c
index 79bcd12367b5..aed5f64eabba 100644
--- a/drivers/spi/atcspi200_spi.c
+++ b/drivers/spi/atcspi200_spi.c
@@ -15,6 +15,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/spi/atmel-quadspi.c b/drivers/spi/atmel-quadspi.c
index 7dbbe1f43cf7..f270eea61e84 100644
--- a/drivers/spi/atmel-quadspi.c
+++ b/drivers/spi/atmel-quadspi.c
@@ -20,6 +20,7 @@
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/iopoll.h>
 #include <linux/ioport.h>
diff --git a/drivers/spi/atmel_spi.c b/drivers/spi/atmel_spi.c
index 33bf382998e5..1a95cfb9f65b 100644
--- a/drivers/spi/atmel_spi.c
+++ b/drivers/spi/atmel_spi.c
@@ -17,6 +17,7 @@
 #include <asm/gpio.h>
 #endif
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 /*
diff --git a/drivers/spi/bcm63xx_hsspi.c b/drivers/spi/bcm63xx_hsspi.c
index f59143802485..f45214fbda4a 100644
--- a/drivers/spi/bcm63xx_hsspi.c
+++ b/drivers/spi/bcm63xx_hsspi.c
@@ -18,6 +18,7 @@
 #include <wait_bit.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #define HSSPI_PP			0
 
diff --git a/drivers/spi/bcm63xx_spi.c b/drivers/spi/bcm63xx_spi.c
index a5550a214e8e..ac79961a14e2 100644
--- a/drivers/spi/bcm63xx_spi.c
+++ b/drivers/spi/bcm63xx_spi.c
@@ -17,6 +17,7 @@
 #include <stdio.h>
 #include <wait_bit.h>
 #include <asm/io.h>
+#include <linux/errno.h>
 
 /* BCM6348 SPI core */
 #define SPI_6348_CLK			0x06
diff --git a/drivers/spi/bcmstb_spi.c b/drivers/spi/bcmstb_spi.c
index 5879a7883b1c..539abcfd953f 100644
--- a/drivers/spi/bcmstb_spi.c
+++ b/drivers/spi/bcmstb_spi.c
@@ -19,6 +19,7 @@
 #include <malloc.h>
 #include <spi.h>
 #include <time.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/spi/cf_spi.c b/drivers/spi/cf_spi.c
index a6a5c7f17c99..0a211b377070 100644
--- a/drivers/spi/cf_spi.c
+++ b/drivers/spi/cf_spi.c
@@ -23,6 +23,7 @@
 #include <malloc.h>
 #include <asm/coldfire/dspi.h>
 #include <asm/io.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 struct coldfire_spi_priv {
diff --git a/drivers/spi/davinci_spi.c b/drivers/spi/davinci_spi.c
index 3d1c0b58070d..7058ba9acf52 100644
--- a/drivers/spi/davinci_spi.c
+++ b/drivers/spi/davinci_spi.c
@@ -20,6 +20,7 @@
 #include <dm/platform_data/spi_davinci.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 /* SPIGCR0 */
 #define SPIGCR0_SPIENA_MASK	0x1
diff --git a/drivers/spi/designware_spi.c b/drivers/spi/designware_spi.c
index 3838504455ab..f6c63435147e 100644
--- a/drivers/spi/designware_spi.c
+++ b/drivers/spi/designware_spi.c
@@ -23,6 +23,7 @@
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/compat.h>
+#include <linux/errno.h>
 #include <linux/iopoll.h>
 #include <asm/io.h>
 
diff --git a/drivers/spi/exynos_spi.c b/drivers/spi/exynos_spi.c
index 03c03ab4874d..cec59208395d 100644
--- a/drivers/spi/exynos_spi.c
+++ b/drivers/spi/exynos_spi.c
@@ -21,6 +21,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/spi/fsl_dspi.c b/drivers/spi/fsl_dspi.c
index eae6b379a9c5..190b60b3c4f0 100644
--- a/drivers/spi/fsl_dspi.c
+++ b/drivers/spi/fsl_dspi.c
@@ -10,6 +10,7 @@
  */
 
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/math64.h>
 #include <common.h>
 #include <dm.h>
diff --git a/drivers/spi/fsl_espi.c b/drivers/spi/fsl_espi.c
index 35f8a58da162..2e85c25907d5 100644
--- a/drivers/spi/fsl_espi.c
+++ b/drivers/spi/fsl_espi.c
@@ -13,6 +13,7 @@
 #include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include <malloc.h>
diff --git a/drivers/spi/fsl_qspi.c b/drivers/spi/fsl_qspi.c
index 2923fb5fb3d8..195808c4066f 100644
--- a/drivers/spi/fsl_qspi.c
+++ b/drivers/spi/fsl_qspi.c
@@ -29,6 +29,7 @@
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <linux/sizes.h>
 #include <linux/iopoll.h>
diff --git a/drivers/spi/ich.c b/drivers/spi/ich.c
index 308ace8a5802..51d283c5e6fa 100644
--- a/drivers/spi/ich.c
+++ b/drivers/spi/ich.c
@@ -29,6 +29,7 @@
 #include <asm/mtrr.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/sizes.h>
 #include <linux/string.h>
 
diff --git a/drivers/spi/meson_spifc.c b/drivers/spi/meson_spifc.c
index 5bc99370a101..08b3859678fd 100644
--- a/drivers/spi/meson_spifc.c
+++ b/drivers/spi/meson_spifc.c
@@ -17,6 +17,7 @@
 #include <asm/io.h>
 #include <linux/bitfield.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 /* register map */
diff --git a/drivers/spi/mpc8xx_spi.c b/drivers/spi/mpc8xx_spi.c
index 0f9ebc58f297..d549c6e8a740 100644
--- a/drivers/spi/mpc8xx_spi.c
+++ b/drivers/spi/mpc8xx_spi.c
@@ -22,6 +22,7 @@
 #include <spi.h>
 #include <stdio.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 #include <asm/cpm_8xx.h>
 #include <asm/io.h>
diff --git a/drivers/spi/mpc8xxx_spi.c b/drivers/spi/mpc8xxx_spi.c
index b7fd47984de7..eedb29216cb6 100644
--- a/drivers/spi/mpc8xxx_spi.c
+++ b/drivers/spi/mpc8xxx_spi.c
@@ -18,6 +18,7 @@
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 enum {
 	SPI_EV_NE = BIT(31 - 22),	/* Receiver Not Empty */
diff --git a/drivers/spi/mt7621_spi.c b/drivers/spi/mt7621_spi.c
index 786afaaa9cda..581a9bd44c4a 100644
--- a/drivers/spi/mt7621_spi.c
+++ b/drivers/spi/mt7621_spi.c
@@ -16,6 +16,7 @@
 #include <stdio.h>
 #include <wait_bit.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/printk.h>
 
diff --git a/drivers/spi/mtk_snfi_spi.c b/drivers/spi/mtk_snfi_spi.c
index bd9b79929a9d..07a178a87859 100644
--- a/drivers/spi/mtk_snfi_spi.c
+++ b/drivers/spi/mtk_snfi_spi.c
@@ -16,6 +16,7 @@
 #include <watchdog.h>
 #include <dm/pinctrl.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/iopoll.h>
 #include <linux/string.h>
diff --git a/drivers/spi/nxp_fspi.c b/drivers/spi/nxp_fspi.c
index b4f928741f34..fc75913022b3 100644
--- a/drivers/spi/nxp_fspi.c
+++ b/drivers/spi/nxp_fspi.c
@@ -41,6 +41,7 @@
 #include <dm.h>
 #include <clk.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <linux/iopoll.h>
diff --git a/drivers/spi/pic32_spi.c b/drivers/spi/pic32_spi.c
index 4eb039f35793..222c30a1ebdd 100644
--- a/drivers/spi/pic32_spi.c
+++ b/drivers/spi/pic32_spi.c
@@ -17,6 +17,7 @@
 #include <linux/compat.h>
 #include <malloc.h>
 #include <spi.h>
+#include <linux/errno.h>
 
 #include <asm/types.h>
 #include <asm/io.h>
diff --git a/drivers/spi/pl022_spi.c b/drivers/spi/pl022_spi.c
index 7cf19a1a6615..236de5b54a3f 100644
--- a/drivers/spi/pl022_spi.c
+++ b/drivers/spi/pl022_spi.c
@@ -14,6 +14,7 @@
 #include <dm.h>
 #include <asm/global_data.h>
 #include <dm/platform_data/spi_pl022.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <spi.h>
 #include <linux/printk.h>
diff --git a/drivers/spi/soft_spi.c b/drivers/spi/soft_spi.c
index 87e1e2417cea..9818ecb4c18a 100644
--- a/drivers/spi/soft_spi.c
+++ b/drivers/spi/soft_spi.c
@@ -20,6 +20,7 @@
 #include <asm/gpio.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/spi/spi-mem-nodm.c b/drivers/spi/spi-mem-nodm.c
index 841eefc12ce1..42a6126dd7bc 100644
--- a/drivers/spi/spi-mem-nodm.c
+++ b/drivers/spi/spi-mem-nodm.c
@@ -7,6 +7,7 @@
 #include <malloc.h>
 #include <spi.h>
 #include <spi-mem.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 int spi_mem_exec_op(struct spi_slave *slave,
diff --git a/drivers/spi/spi-sifive.c b/drivers/spi/spi-sifive.c
index b046792b636e..3c0300d68d6d 100644
--- a/drivers/spi/spi-sifive.c
+++ b/drivers/spi/spi-sifive.c
@@ -16,6 +16,7 @@
 #include <wait_bit.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/log2.h>
 #include <clk.h>
 #include <linux/string.h>
diff --git a/drivers/spi/spi-sunxi.c b/drivers/spi/spi-sunxi.c
index 3b1e9fc22846..c19a24a1c64c 100644
--- a/drivers/spi/spi-sunxi.c
+++ b/drivers/spi/spi-sunxi.c
@@ -31,6 +31,7 @@
 #include <asm/global_data.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #include <asm/bitops.h>
 #include <asm/gpio.h>
diff --git a/drivers/spi/spi-uclass.c b/drivers/spi/spi-uclass.c
index 56869c125afb..c59ae3ff9b30 100644
--- a/drivers/spi/spi-uclass.c
+++ b/drivers/spi/spi-uclass.c
@@ -15,6 +15,7 @@
 #include <dm/uclass-internal.h>
 #include <dm/lists.h>
 #include <dm/util.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/spi/stm32_qspi.c b/drivers/spi/stm32_qspi.c
index 8e91475ef95a..704a66d0c77f 100644
--- a/drivers/spi/stm32_qspi.c
+++ b/drivers/spi/stm32_qspi.c
@@ -17,6 +17,7 @@
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/iopoll.h>
 #include <linux/ioport.h>
 #include <linux/printk.h>
diff --git a/drivers/spi/stm32_spi.c b/drivers/spi/stm32_spi.c
index 09711b0aabca..d37404f0c8cc 100644
--- a/drivers/spi/stm32_spi.c
+++ b/drivers/spi/stm32_spi.c
@@ -15,6 +15,7 @@
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 #include <asm/io.h>
diff --git a/drivers/spi/tegra20_sflash.c b/drivers/spi/tegra20_sflash.c
index 7b81e785215c..7be4efd35c60 100644
--- a/drivers/spi/tegra20_sflash.c
+++ b/drivers/spi/tegra20_sflash.c
@@ -21,6 +21,7 @@
 #include <fdtdec.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include "tegra_spi.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/spi/ti_qspi.c b/drivers/spi/ti_qspi.c
index ba97f3ece771..9fecdb20f73f 100644
--- a/drivers/spi/ti_qspi.c
+++ b/drivers/spi/ti_qspi.c
@@ -23,6 +23,7 @@
 #include <asm/ti-common/ti-edma3.h>
 #include <linux/bitops.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/kernel.h>
 #include <regmap.h>
 #include <syscon.h>
diff --git a/drivers/spi/uniphier_spi.c b/drivers/spi/uniphier_spi.c
index 21fa7a77efb1..742554a09ab4 100644
--- a/drivers/spi/uniphier_spi.c
+++ b/drivers/spi/uniphier_spi.c
@@ -14,6 +14,7 @@
 #include <linux/bitfield.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <spi.h>
 #include <wait_bit.h>
diff --git a/drivers/spi/zynq_qspi.c b/drivers/spi/zynq_qspi.c
index a1022ad496e7..a95558139d83 100644
--- a/drivers/spi/zynq_qspi.c
+++ b/drivers/spi/zynq_qspi.c
@@ -16,6 +16,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/spi/zynqmp_gqspi.c b/drivers/spi/zynqmp_gqspi.c
index 01186f3c0399..1386dc86ed62 100644
--- a/drivers/spi/zynqmp_gqspi.c
+++ b/drivers/spi/zynqmp_gqspi.c
@@ -23,6 +23,7 @@
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #define GQSPI_GFIFO_STRT_MODE_MASK	BIT(29)
diff --git a/drivers/spmi/spmi-msm.c b/drivers/spmi/spmi-msm.c
index 1f9b3c310086..d06fc34c6973 100644
--- a/drivers/spmi/spmi-msm.c
+++ b/drivers/spmi/spmi-msm.c
@@ -15,6 +15,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm/device_compat.h>
+#include <linux/errno.h>
 #include <spmi/spmi.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/spmi/spmi-sandbox.c b/drivers/spmi/spmi-sandbox.c
index 0da419c50529..f1e0d6915030 100644
--- a/drivers/spmi/spmi-sandbox.c
+++ b/drivers/spmi/spmi-sandbox.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
+#include <linux/errno.h>
 #include <spmi/spmi.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
diff --git a/drivers/spmi/spmi-uclass.c b/drivers/spmi/spmi-uclass.c
index ff098731bb2d..fc8252fbc91b 100644
--- a/drivers/spmi/spmi-uclass.c
+++ b/drivers/spmi/spmi-uclass.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
+#include <linux/errno.h>
 #include <spmi/spmi.h>
 #include <linux/ctype.h>
 
diff --git a/drivers/sysreset/sysreset-ti-sci.c b/drivers/sysreset/sysreset-ti-sci.c
index 3877b9bc1258..09ebd161fcb3 100644
--- a/drivers/sysreset/sysreset-ti-sci.c
+++ b/drivers/sysreset/sysreset-ti-sci.c
@@ -13,6 +13,7 @@
 #include <sysreset.h>
 #include <dm/device_compat.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/soc/ti/ti_sci_protocol.h>
 
 /**
diff --git a/drivers/sysreset/sysreset-uclass.c b/drivers/sysreset/sysreset-uclass.c
index a42c603ff56d..46092d939cf3 100644
--- a/drivers/sysreset/sysreset-uclass.c
+++ b/drivers/sysreset/sysreset-uclass.c
@@ -22,6 +22,7 @@
 #include <dm/root.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 
 int sysreset_request(struct udevice *dev, enum sysreset_t type)
 {
diff --git a/drivers/sysreset/sysreset_ast.c b/drivers/sysreset/sysreset_ast.c
index ee941c777062..f93eea629dfd 100644
--- a/drivers/sysreset/sysreset_ast.c
+++ b/drivers/sysreset/sysreset_ast.c
@@ -12,6 +12,7 @@
 #include <asm/io.h>
 #include <asm/arch/wdt.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 
 static int ast_sysreset_request(struct udevice *dev, enum sysreset_t type)
 {
diff --git a/drivers/sysreset/sysreset_microblaze.c b/drivers/sysreset/sysreset_microblaze.c
index b45e894440dc..1bb24914e77c 100644
--- a/drivers/sysreset/sysreset_microblaze.c
+++ b/drivers/sysreset/sysreset_microblaze.c
@@ -9,6 +9,7 @@
 #include <stdio.h>
 #include <sysreset.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 
 static int microblaze_sysreset_request(struct udevice *dev,
 				       enum sysreset_t type)
diff --git a/drivers/sysreset/sysreset_mpc83xx.c b/drivers/sysreset/sysreset_mpc83xx.c
index bd4301bcbb6a..603dbbaea4ac 100644
--- a/drivers/sysreset/sysreset_mpc83xx.c
+++ b/drivers/sysreset/sysreset_mpc83xx.c
@@ -15,6 +15,7 @@
 #include <asm/global_data.h>
 #include <asm/ppc.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 #include "sysreset_mpc83xx.h"
 
diff --git a/drivers/sysreset/sysreset_octeon.c b/drivers/sysreset/sysreset_octeon.c
index a05dac3226e8..963ec20dc0bb 100644
--- a/drivers/sysreset/sysreset_octeon.c
+++ b/drivers/sysreset/sysreset_octeon.c
@@ -8,6 +8,7 @@
 #include <errno.h>
 #include <sysreset.h>
 #include <asm/io.h>
+#include <linux/errno.h>
 
 #define RST_SOFT_RST		0x0080
 
diff --git a/drivers/sysreset/sysreset_rockchip.c b/drivers/sysreset/sysreset_rockchip.c
index 0fc6b683f2be..a5e0f47c7d8e 100644
--- a/drivers/sysreset/sysreset_rockchip.c
+++ b/drivers/sysreset/sysreset_rockchip.c
@@ -12,6 +12,7 @@
 #include <asm/arch-rockchip/cru_rk3328.h>
 #include <asm/arch-rockchip/hardware.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 
 int rockchip_sysreset_request(struct udevice *dev, enum sysreset_t type)
 {
diff --git a/drivers/sysreset/sysreset_sandbox.c b/drivers/sysreset/sysreset_sandbox.c
index cb90266ab0cb..fd302d6473e8 100644
--- a/drivers/sysreset/sysreset_sandbox.c
+++ b/drivers/sysreset/sysreset_sandbox.c
@@ -10,6 +10,7 @@
 #include <sysreset.h>
 #include <asm/state.h>
 #include <asm/test.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 static int sandbox_warm_sysreset_request(struct udevice *dev,
diff --git a/drivers/sysreset/sysreset_socfpga.c b/drivers/sysreset/sysreset_socfpga.c
index 178bcb227ff8..c348649cedf5 100644
--- a/drivers/sysreset/sysreset_socfpga.c
+++ b/drivers/sysreset/sysreset_socfpga.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <asm/arch/reset_manager.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 struct socfpga_sysreset_data {
 	void __iomem *rstmgr_base;
diff --git a/drivers/sysreset/sysreset_socfpga_s10.c b/drivers/sysreset/sysreset_socfpga_s10.c
index b109320eedd0..7c6e5391b509 100644
--- a/drivers/sysreset/sysreset_socfpga_s10.c
+++ b/drivers/sysreset/sysreset_socfpga_s10.c
@@ -10,6 +10,7 @@
 #include <stdio.h>
 #include <sysreset.h>
 #include <asm/arch/mailbox_s10.h>
+#include <linux/errno.h>
 
 static int socfpga_sysreset_request(struct udevice *dev,
 				    enum sysreset_t type)
diff --git a/drivers/sysreset/sysreset_sti.c b/drivers/sysreset/sysreset_sti.c
index c1b22873ff43..26431ee129b8 100644
--- a/drivers/sysreset/sysreset_sti.c
+++ b/drivers/sysreset/sysreset_sti.c
@@ -12,6 +12,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/sysreset/sysreset_syscon.c b/drivers/sysreset/sysreset_syscon.c
index 0dfa91fc90e6..e6e98b383ee5 100644
--- a/drivers/sysreset/sysreset_syscon.c
+++ b/drivers/sysreset/sysreset_syscon.c
@@ -14,6 +14,7 @@
 #include <sysreset.h>
 #include <syscon.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 struct syscon_reboot_priv {
diff --git a/drivers/sysreset/sysreset_watchdog.c b/drivers/sysreset/sysreset_watchdog.c
index 3493c5e8e452..4fd234a62eca 100644
--- a/drivers/sysreset/sysreset_watchdog.c
+++ b/drivers/sysreset/sysreset_watchdog.c
@@ -8,6 +8,7 @@
 #include <errno.h>
 #include <sysreset.h>
 #include <wdt.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 struct wdt_reboot_priv {
diff --git a/drivers/sysreset/sysreset_x86.c b/drivers/sysreset/sysreset_x86.c
index bc911435602a..0ab2b543abdf 100644
--- a/drivers/sysreset/sysreset_x86.c
+++ b/drivers/sysreset/sysreset_x86.c
@@ -13,6 +13,7 @@
 #include <acpi/acpi_s3.h>
 #include <asm/io.h>
 #include <asm/processor.h>
+#include <linux/errno.h>
 
 struct x86_sysreset_platdata {
 	struct udevice *pch;
diff --git a/drivers/sysreset/sysreset_xtfpga.c b/drivers/sysreset/sysreset_xtfpga.c
index ad1781e6c0f8..ce30114a17ac 100644
--- a/drivers/sysreset/sysreset_xtfpga.c
+++ b/drivers/sysreset/sysreset_xtfpga.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <sysreset.h>
 #include <asm/io.h>
+#include <linux/errno.h>
 
 static int xtfpga_reset_request(struct udevice *dev, enum sysreset_t type)
 {
diff --git a/drivers/tee/broadcom/chimp_optee.c b/drivers/tee/broadcom/chimp_optee.c
index 91ebc17c0361..a92fd9c95627 100644
--- a/drivers/tee/broadcom/chimp_optee.c
+++ b/drivers/tee/broadcom/chimp_optee.c
@@ -7,6 +7,7 @@
 #include <string.h>
 #include <tee.h>
 #include <broadcom/chimp.h>
+#include <linux/errno.h>
 
 #ifdef CONFIG_CHIMP_OPTEE
 
diff --git a/drivers/tee/optee/core.c b/drivers/tee/optee/core.c
index 0fc7a0ec7f17..c1460999cbec 100644
--- a/drivers/tee/optee/core.c
+++ b/drivers/tee/optee/core.c
@@ -10,6 +10,7 @@
 #include <tee.h>
 #include <linux/arm-smccc.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/string.h>
 
diff --git a/drivers/tee/optee/supplicant.c b/drivers/tee/optee/supplicant.c
index ae042b9a2047..fe99a328adbe 100644
--- a/drivers/tee/optee/supplicant.c
+++ b/drivers/tee/optee/supplicant.c
@@ -7,6 +7,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <tee.h>
+#include <linux/errno.h>
 #include <linux/types.h>
 
 #include "optee_msg.h"
diff --git a/drivers/tee/sandbox.c b/drivers/tee/sandbox.c
index 00e6f91df987..14df3ce01304 100644
--- a/drivers/tee/sandbox.c
+++ b/drivers/tee/sandbox.c
@@ -7,6 +7,7 @@
 #include <sandboxtee.h>
 #include <stdio.h>
 #include <tee.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <tee/optee_ta_avb.h>
 
diff --git a/drivers/tee/tee-uclass.c b/drivers/tee/tee-uclass.c
index 76de11c3fb84..f42cc1becb83 100644
--- a/drivers/tee/tee-uclass.c
+++ b/drivers/tee/tee-uclass.c
@@ -10,6 +10,7 @@
 #include <tee.h>
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 /**
diff --git a/drivers/thermal/imx_scu_thermal.c b/drivers/thermal/imx_scu_thermal.c
index 9b2f74636a5f..17c92ae0635e 100644
--- a/drivers/thermal/imx_scu_thermal.c
+++ b/drivers/thermal/imx_scu_thermal.c
@@ -15,6 +15,7 @@
 #include <dm/device.h>
 #include <asm/arch/sci/sci.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <linux/string.h>
 
diff --git a/drivers/thermal/imx_thermal.c b/drivers/thermal/imx_thermal.c
index 82e8f8e65126..812c2ec07c36 100644
--- a/drivers/thermal/imx_thermal.c
+++ b/drivers/thermal/imx_thermal.c
@@ -18,6 +18,7 @@
 #include <errno.h>
 #include <malloc.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/math64.h>
 #include <thermal.h>
 #include <imx_thermal.h>
diff --git a/drivers/thermal/imx_tmu.c b/drivers/thermal/imx_tmu.c
index 6ec16a35f278..279ea5a322ea 100644
--- a/drivers/thermal/imx_tmu.c
+++ b/drivers/thermal/imx_tmu.c
@@ -18,6 +18,7 @@
 #include <fuse.h>
 #include <malloc.h>
 #include <thermal.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/thermal/thermal-uclass.c b/drivers/thermal/thermal-uclass.c
index a4ea1e291453..92dc311168be 100644
--- a/drivers/thermal/thermal-uclass.c
+++ b/drivers/thermal/thermal-uclass.c
@@ -10,6 +10,7 @@
 #include <fdtdec.h>
 #include <malloc.h>
 #include <asm/io.h>
+#include <linux/errno.h>
 #include <linux/list.h>
 
 
diff --git a/drivers/timer/arc_timer.c b/drivers/timer/arc_timer.c
index c6771d15966e..592b196cbbc2 100644
--- a/drivers/timer/arc_timer.c
+++ b/drivers/timer/arc_timer.c
@@ -10,6 +10,7 @@
 #include <asm/arcregs.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/timer/atmel_pit_timer.c b/drivers/timer/atmel_pit_timer.c
index 70511697fef7..07459d9c26b4 100644
--- a/drivers/timer/atmel_pit_timer.c
+++ b/drivers/timer/atmel_pit_timer.c
@@ -10,6 +10,7 @@
 #include <timer.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #define AT91_PIT_VALUE		0xfffff
 #define AT91_PIT_PITEN		BIT(24)		/* Timer Enabled */
diff --git a/drivers/timer/mpc83xx_timer.c b/drivers/timer/mpc83xx_timer.c
index f1eb1a9d115c..aef8666dea05 100644
--- a/drivers/timer/mpc83xx_timer.c
+++ b/drivers/timer/mpc83xx_timer.c
@@ -18,6 +18,7 @@
 #include <asm/ptrace.h>
 #include <asm/ppc.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/timer/mtk_timer.c b/drivers/timer/mtk_timer.c
index 69ed521811d2..7aec7a7d59ea 100644
--- a/drivers/timer/mtk_timer.c
+++ b/drivers/timer/mtk_timer.c
@@ -12,6 +12,7 @@
 #include <timer.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #define MTK_GPT4_CTRL	0x40
 #define MTK_GPT4_CLK	0x44
diff --git a/drivers/timer/nomadik-mtu-timer.c b/drivers/timer/nomadik-mtu-timer.c
index 7ff921385a33..5d5eadc47d79 100644
--- a/drivers/timer/nomadik-mtu-timer.c
+++ b/drivers/timer/nomadik-mtu-timer.c
@@ -17,6 +17,7 @@
 #include <timer.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #define MTU_NUM_TIMERS		4
 
diff --git a/drivers/timer/rockchip_timer.c b/drivers/timer/rockchip_timer.c
index 7e7612f154ea..20dddd53e4fb 100644
--- a/drivers/timer/rockchip_timer.c
+++ b/drivers/timer/rockchip_timer.c
@@ -15,6 +15,7 @@
 #include <dt-structs.h>
 #include <timer.h>
 #include <asm/io.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/timer/sti-timer.c b/drivers/timer/sti-timer.c
index ff42056abdd1..2278b049354b 100644
--- a/drivers/timer/sti-timer.c
+++ b/drivers/timer/sti-timer.c
@@ -9,6 +9,7 @@
 #include <clk.h>
 #include <timer.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 
 #include <asm/io.h>
 #include <asm/arch-armv7/globaltimer.h>
diff --git a/drivers/timer/stm32_timer.c b/drivers/timer/stm32_timer.c
index c57fa3f55704..96749c8a64f5 100644
--- a/drivers/timer/stm32_timer.c
+++ b/drivers/timer/stm32_timer.c
@@ -11,6 +11,7 @@
 #include <timer.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #include <asm/io.h>
 
diff --git a/drivers/timer/timer-uclass.c b/drivers/timer/timer-uclass.c
index d90755a7e74f..01b3a42f3e07 100644
--- a/drivers/timer/timer-uclass.c
+++ b/drivers/timer/timer-uclass.c
@@ -14,6 +14,7 @@
 #include <errno.h>
 #include <timer.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/tpm/cr50_i2c.c b/drivers/tpm/cr50_i2c.c
index 24b1e2448603..9ba0466f9298 100644
--- a/drivers/tpm/cr50_i2c.c
+++ b/drivers/tpm/cr50_i2c.c
@@ -22,6 +22,7 @@
 #include <asm/arch/iomap.h>
 #include <asm/arch/pm.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 enum {
diff --git a/drivers/tpm/tpm-uclass.c b/drivers/tpm/tpm-uclass.c
index 61331726833a..23400235a4cf 100644
--- a/drivers/tpm/tpm-uclass.c
+++ b/drivers/tpm/tpm-uclass.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <time.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/unaligned/be_byteshift.h>
 #include <tpm-v1.h>
diff --git a/drivers/tpm/tpm2_ftpm_tee.c b/drivers/tpm/tpm2_ftpm_tee.c
index 885b3e2c148e..249cf11beff7 100644
--- a/drivers/tpm/tpm2_ftpm_tee.c
+++ b/drivers/tpm/tpm2_ftpm_tee.c
@@ -19,6 +19,7 @@
 #include <tpm-v2.h>
 #include <tee.h>
 #include <vsprintf.h>
+#include <linux/errno.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 437f65cc395b..6b61dbb88b55 100644
--- a/drivers/tpm/tpm2_tis_sandbox.c
+++ b/drivers/tpm/tpm2_tis_sandbox.c
@@ -12,6 +12,7 @@
 #include <asm/state.h>
 #include <asm/unaligned.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
 
diff --git a/drivers/tpm/tpm_tis_lpc.c b/drivers/tpm/tpm_tis_lpc.c
index 63b86b131bcc..e6eec6bca9e8 100644
--- a/drivers/tpm/tpm_tis_lpc.c
+++ b/drivers/tpm/tpm_tis_lpc.c
@@ -21,6 +21,7 @@
 #include <vsprintf.h>
 #include <asm/io.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #define PREFIX "lpc_tpm: "
diff --git a/drivers/tpm/tpm_tis_sandbox.c b/drivers/tpm/tpm_tis_sandbox.c
index 4b1cf36d9b9b..da31ec3ff561 100644
--- a/drivers/tpm/tpm_tis_sandbox.c
+++ b/drivers/tpm/tpm_tis_sandbox.c
@@ -11,6 +11,7 @@
 #include <vsprintf.h>
 #include <asm/state.h>
 #include <asm/unaligned.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
 
diff --git a/drivers/tpm/tpm_tis_st33zp24_i2c.c b/drivers/tpm/tpm_tis_st33zp24_i2c.c
index bd9c08e06cb9..b5c706b7ccf5 100644
--- a/drivers/tpm/tpm_tis_st33zp24_i2c.c
+++ b/drivers/tpm/tpm_tis_st33zp24_i2c.c
@@ -22,6 +22,7 @@
 #include <errno.h>
 #include <vsprintf.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/types.h>
 #include <asm/unaligned.h>
diff --git a/drivers/tpm/tpm_tis_st33zp24_spi.c b/drivers/tpm/tpm_tis_st33zp24_spi.c
index 2b6b3714087c..33f7392431f5 100644
--- a/drivers/tpm/tpm_tis_st33zp24_spi.c
+++ b/drivers/tpm/tpm_tis_st33zp24_spi.c
@@ -22,6 +22,7 @@
 #include <errno.h>
 #include <vsprintf.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/types.h>
 #include <asm/unaligned.h>
diff --git a/drivers/ufs/ufs.c b/drivers/ufs/ufs.c
index 8509c65171dc..666a0a547978 100644
--- a/drivers/ufs/ufs.c
+++ b/drivers/ufs/ufs.c
@@ -25,6 +25,7 @@
 #include <asm/dma-mapping.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include <linux/dma-mapping.h>
diff --git a/drivers/usb/cdns3/cdns3-ti.c b/drivers/usb/cdns3/cdns3-ti.c
index cd7b2113ace8..5130b4c70d23 100644
--- a/drivers/usb/cdns3/cdns3-ti.c
+++ b/drivers/usb/cdns3/cdns3-ti.c
@@ -11,6 +11,7 @@
 #include <dm.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/usb/otg.h>
 #include <malloc.h>
diff --git a/drivers/usb/cdns3/core.c b/drivers/usb/cdns3/core.c
index d5fb8a0edb35..135ca1b2af9f 100644
--- a/drivers/usb/cdns3/core.c
+++ b/drivers/usb/cdns3/core.c
@@ -20,6 +20,7 @@
 #include <dm/devres.h>
 #include <dm/lists.h>
 #include <linux/bug.h>
+#include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/io.h>
 #include <usb.h>
diff --git a/drivers/usb/cdns3/drd.c b/drivers/usb/cdns3/drd.c
index 47874fec29eb..e84fb57b2e02 100644
--- a/drivers/usb/cdns3/drd.c
+++ b/drivers/usb/cdns3/drd.c
@@ -13,6 +13,7 @@
 #include <dm.h>
 #include <dm/device_compat.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/iopoll.h>
 #include <linux/kernel.h>
 #include <linux/usb/otg.h>
diff --git a/drivers/usb/cdns3/ep0.c b/drivers/usb/cdns3/ep0.c
index 4fbd450fed38..7be5c8de4e2f 100644
--- a/drivers/usb/cdns3/ep0.c
+++ b/drivers/usb/cdns3/ep0.c
@@ -16,6 +16,7 @@
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/usb/composite.h>
 #include <linux/iopoll.h>
 
diff --git a/drivers/usb/cdns3/gadget-export.h b/drivers/usb/cdns3/gadget-export.h
index 577469eee961..99066a2adb5f 100644
--- a/drivers/usb/cdns3/gadget-export.h
+++ b/drivers/usb/cdns3/gadget-export.h
@@ -25,4 +25,5 @@ static inline void cdns3_gadget_exit(struct cdns3 *cdns) { }
 
 #endif
 
+#include <linux/errno.h>
 #endif /* __LINUX_CDNS3_GADGET_EXPORT */
diff --git a/drivers/usb/cdns3/gadget.c b/drivers/usb/cdns3/gadget.c
index 535935ac7237..e42b82d0c2ba 100644
--- a/drivers/usb/cdns3/gadget.c
+++ b/drivers/usb/cdns3/gadget.c
@@ -63,6 +63,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include <linux/usb/gadget.h>
diff --git a/drivers/usb/cdns3/host-export.h b/drivers/usb/cdns3/host-export.h
index b498a170b7e8..299fe5749c9d 100644
--- a/drivers/usb/cdns3/host-export.h
+++ b/drivers/usb/cdns3/host-export.h
@@ -25,4 +25,5 @@ static inline void cdns3_host_exit(struct cdns3 *cdns) { }
 
 #endif /* CONFIG_USB_CDNS3_HOST */
 
+#include <linux/errno.h>
 #endif /* __LINUX_CDNS3_HOST_EXPORT */
diff --git a/drivers/usb/cdns3/host.c b/drivers/usb/cdns3/host.c
index b44e7df11319..702fc86e92ec 100644
--- a/drivers/usb/cdns3/host.c
+++ b/drivers/usb/cdns3/host.c
@@ -12,6 +12,7 @@
 #include <dm/devres.h>
 #include <linux/compat.h>
 #include <usb.h>
+#include <linux/errno.h>
 #include <usb/xhci.h>
 
 #include "core.h"
diff --git a/drivers/usb/common/fsl-dt-fixup.c b/drivers/usb/common/fsl-dt-fixup.c
index 5382447eb72d..a279c28bdad2 100644
--- a/drivers/usb/common/fsl-dt-fixup.c
+++ b/drivers/usb/common/fsl-dt-fixup.c
@@ -18,6 +18,7 @@
 #include <fsl_usb.h>
 #include <fdt_support.h>
 #include <asm/u-boot.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #ifndef CONFIG_USB_MAX_CONTROLLER_COUNT
diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
index 86825565895f..f79f9c931664 100644
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -23,6 +23,7 @@
 #include <linux/delay.h>
 #include <linux/dma-mapping.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/ioport.h>
 #include <dm.h>
 #include <generic-phy.h>
diff --git a/drivers/usb/dwc3/dwc3-generic.c b/drivers/usb/dwc3/dwc3-generic.c
index c78ac00521d6..54a9ffb9d681 100644
--- a/drivers/usb/dwc3/dwc3-generic.c
+++ b/drivers/usb/dwc3/dwc3-generic.c
@@ -17,6 +17,7 @@
 #include <dwc3-uboot.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
diff --git a/drivers/usb/dwc3/dwc3-meson-g12a.c b/drivers/usb/dwc3/dwc3-meson-g12a.c
index 6fdf686af8da..999cb11d594e 100644
--- a/drivers/usb/dwc3/dwc3-meson-g12a.c
+++ b/drivers/usb/dwc3/dwc3-meson-g12a.c
@@ -15,6 +15,7 @@
 #include <dwc3-uboot.h>
 #include <generic-phy.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
diff --git a/drivers/usb/dwc3/dwc3-omap.c b/drivers/usb/dwc3/dwc3-omap.c
index 9596bf144c37..2d722376efb4 100644
--- a/drivers/usb/dwc3/dwc3-omap.c
+++ b/drivers/usb/dwc3/dwc3-omap.c
@@ -20,6 +20,7 @@
 #include <dwc3-omap-uboot.h>
 #include <dm/device_compat.h>
 #include <dm/devres.h>
+#include <linux/errno.h>
 #include <linux/usb/dwc3-omap.h>
 #include <linux/ioport.h>
 
diff --git a/drivers/usb/dwc3/ep0.c b/drivers/usb/dwc3/ep0.c
index f9420873bba1..80de10ec1258 100644
--- a/drivers/usb/dwc3/ep0.c
+++ b/drivers/usb/dwc3/ep0.c
@@ -16,6 +16,7 @@
 #include <cpu_func.h>
 #include <dm/device_compat.h>
 #include <linux/bug.h>
+#include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/list.h>
 #include <linux/string.h>
diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
index c33e0894e10a..fa338119de62 100644
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@ -23,6 +23,7 @@
 #include <linux/bug.h>
 #include <linux/delay.h>
 #include <linux/dma-mapping.h>
+#include <linux/errno.h>
 #include <linux/list.h>
 #include <linux/printk.h>
 #include <linux/string.h>
diff --git a/drivers/usb/dwc3/ti_usb_phy.c b/drivers/usb/dwc3/ti_usb_phy.c
index f8ab06482c92..ea512ea8ffb7 100644
--- a/drivers/usb/dwc3/ti_usb_phy.c
+++ b/drivers/usb/dwc3/ti_usb_phy.c
@@ -23,6 +23,7 @@
 #include <dm/devres.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/ioport.h>
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
diff --git a/drivers/usb/emul/sandbox_flash.c b/drivers/usb/emul/sandbox_flash.c
index 883f6ae6d39b..e63720f2550f 100644
--- a/drivers/usb/emul/sandbox_flash.c
+++ b/drivers/usb/emul/sandbox_flash.c
@@ -10,6 +10,7 @@
 #include <os.h>
 #include <scsi.h>
 #include <usb.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 /*
diff --git a/drivers/usb/emul/sandbox_hub.c b/drivers/usb/emul/sandbox_hub.c
index 21bf3bda48d2..b2dc73e65f70 100644
--- a/drivers/usb/emul/sandbox_hub.c
+++ b/drivers/usb/emul/sandbox_hub.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <usb.h>
 #include <dm/device-internal.h>
+#include <linux/errno.h>
 
 /* We only support up to 8 */
 #define SANDBOX_NUM_PORTS	4
diff --git a/drivers/usb/emul/sandbox_keyb.c b/drivers/usb/emul/sandbox_keyb.c
index 9f4b40895629..1c8de6d37feb 100644
--- a/drivers/usb/emul/sandbox_keyb.c
+++ b/drivers/usb/emul/sandbox_keyb.c
@@ -10,6 +10,7 @@
 #include <os.h>
 #include <scsi.h>
 #include <usb.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 /*
diff --git a/drivers/usb/emul/usb-emul-uclass.c b/drivers/usb/emul/usb-emul-uclass.c
index 9807cbed1651..6b309592f6bb 100644
--- a/drivers/usb/emul/usb-emul-uclass.c
+++ b/drivers/usb/emul/usb-emul-uclass.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <usb.h>
 #include <dm/device-internal.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 static int copy_to_unicode(char *buff, int length, const char *str)
diff --git a/drivers/usb/eth/asix.c b/drivers/usb/eth/asix.c
index fe98a581d0d5..de25ba12f61b 100644
--- a/drivers/usb/eth/asix.c
+++ b/drivers/usb/eth/asix.c
@@ -16,6 +16,7 @@
 #include <vsprintf.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/mii.h>
 #include <linux/string.h>
 #include "usb_ether.h"
diff --git a/drivers/usb/eth/asix88179.c b/drivers/usb/eth/asix88179.c
index 8191b85eb4d6..c1c873c2c2b8 100644
--- a/drivers/usb/eth/asix88179.c
+++ b/drivers/usb/eth/asix88179.c
@@ -14,6 +14,7 @@
 #include <vsprintf.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/mii.h>
 #include <linux/string.h>
 #include "usb_ether.h"
diff --git a/drivers/usb/eth/lan78xx.c b/drivers/usb/eth/lan78xx.c
index 9a7a0d834a13..194753fb278a 100644
--- a/drivers/usb/eth/lan78xx.c
+++ b/drivers/usb/eth/lan78xx.c
@@ -8,6 +8,7 @@
 #include <net.h>
 #include <usb.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include "usb_ether.h"
 #include "lan7x.h"
diff --git a/drivers/usb/eth/lan7x.c b/drivers/usb/eth/lan7x.c
index b3bca81059c3..c3c1ebb1cb6b 100644
--- a/drivers/usb/eth/lan7x.c
+++ b/drivers/usb/eth/lan7x.c
@@ -12,6 +12,7 @@
 #include <stdio.h>
 #include <usb.h>
 #include <vsprintf.h>
+#include <linux/errno.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 bbc03c7ea586..02a241414ff1 100644
--- a/drivers/usb/eth/mcs7830.c
+++ b/drivers/usb/eth/mcs7830.c
@@ -17,6 +17,7 @@
 #include <vsprintf.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/mii.h>
 #include <malloc.h>
 #include <memalign.h>
diff --git a/drivers/usb/eth/r8152.c b/drivers/usb/eth/r8152.c
index 1f60fc499b94..da0b285077a6 100644
--- a/drivers/usb/eth/r8152.c
+++ b/drivers/usb/eth/r8152.c
@@ -16,6 +16,7 @@
 #include <vsprintf.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/mii.h>
 #include <linux/bitops.h>
 #include <linux/string.h>
diff --git a/drivers/usb/eth/r8152_fw.c b/drivers/usb/eth/r8152_fw.c
index f953b0384b88..7e9b13de0447 100644
--- a/drivers/usb/eth/r8152_fw.c
+++ b/drivers/usb/eth/r8152_fw.c
@@ -8,6 +8,7 @@
 #include <errno.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include "usb_ether.h"
 #include "r8152.h"
 
diff --git a/drivers/usb/eth/smsc95xx.c b/drivers/usb/eth/smsc95xx.c
index d90850074411..435224c71979 100644
--- a/drivers/usb/eth/smsc95xx.c
+++ b/drivers/usb/eth/smsc95xx.c
@@ -20,6 +20,7 @@
 #include <asm/u-boot.h>
 #include <asm/unaligned.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/mii.h>
 #include <linux/string.h>
 #include "usb_ether.h"
diff --git a/drivers/usb/eth/usb_ether.c b/drivers/usb/eth/usb_ether.c
index 097425b7afa2..54bb0118228c 100644
--- a/drivers/usb/eth/usb_ether.c
+++ b/drivers/usb/eth/usb_ether.c
@@ -13,6 +13,7 @@
 #include <usb.h>
 #include <asm/cache.h>
 #include <dm/device-internal.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include "usb_ether.h"
diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
index f353f1a3cd25..d5b3d1d40e4f 100644
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@ -11,6 +11,7 @@
 #include <dm/devres.h>
 #include <linux/bitops.h>
 #include <linux/bug.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/usb/composite.h>
 
diff --git a/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c b/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c
index 84b46709a58a..6b6fe0a5040b 100644
--- a/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c
+++ b/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c
@@ -22,6 +22,7 @@
 #include <log.h>
 #include <stdio.h>
 #include <linux/bug.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 static u8 clear_feature_num;
diff --git a/drivers/usb/gadget/f_dfu.c b/drivers/usb/gadget/f_dfu.c
index 43a342c5afed..a1f13b6ec22a 100644
--- a/drivers/usb/gadget/f_dfu.c
+++ b/drivers/usb/gadget/f_dfu.c
@@ -20,6 +20,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include <linux/usb/ch9.h>
diff --git a/drivers/usb/gadget/f_fastboot.c b/drivers/usb/gadget/f_fastboot.c
index 14a710a52384..40648ef38bdb 100644
--- a/drivers/usb/gadget/f_fastboot.c
+++ b/drivers/usb/gadget/f_fastboot.c
@@ -18,6 +18,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include <linux/usb/ch9.h>
diff --git a/drivers/usb/gadget/f_mass_storage.c b/drivers/usb/gadget/f_mass_storage.c
index 8723c656e0b5..e0b898db214c 100644
--- a/drivers/usb/gadget/f_mass_storage.c
+++ b/drivers/usb/gadget/f_mass_storage.c
@@ -250,6 +250,7 @@
 #include <vsprintf.h>
 #include <dm/devres.h>
 #include <linux/bug.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include <linux/err.h>
diff --git a/drivers/usb/gadget/f_rockusb.c b/drivers/usb/gadget/f_rockusb.c
index 1705b7a611a8..a852707525a4 100644
--- a/drivers/usb/gadget/f_rockusb.c
+++ b/drivers/usb/gadget/f_rockusb.c
@@ -14,6 +14,7 @@
 #include <memalign.h>
 #include <part.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
diff --git a/drivers/usb/gadget/f_sdp.c b/drivers/usb/gadget/f_sdp.c
index 34c393c9f047..fde5c2c690ee 100644
--- a/drivers/usb/gadget/f_sdp.c
+++ b/drivers/usb/gadget/f_sdp.c
@@ -23,6 +23,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/usb/gadget/f_thor.c b/drivers/usb/gadget/f_thor.c
index 142bd99c698d..4a70bdcc5c33 100644
--- a/drivers/usb/gadget/f_thor.c
+++ b/drivers/usb/gadget/f_thor.c
@@ -26,6 +26,7 @@
 #include <version.h>
 #include <vsprintf.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include <linux/usb/ch9.h>
diff --git a/drivers/usb/gadget/g_dnl.c b/drivers/usb/gadget/g_dnl.c
index cd4015f65a00..1a0160b5836c 100644
--- a/drivers/usb/gadget/g_dnl.c
+++ b/drivers/usb/gadget/g_dnl.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include <mmc.h>
diff --git a/drivers/usb/gadget/gadget_chips.h b/drivers/usb/gadget/gadget_chips.h
index 70067afa7d43..e43d96eab361 100644
--- a/drivers/usb/gadget/gadget_chips.h
+++ b/drivers/usb/gadget/gadget_chips.h
@@ -14,6 +14,7 @@
  * Ported to U-Boot by: Thomas Smits <ts.smits@gmail.com> and
  *                      Remy Bohmer <linux@bohmer.net>
  */
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #ifdef CONFIG_USB_GADGET_NET2280
diff --git a/drivers/usb/gadget/pxa25x_udc.c b/drivers/usb/gadget/pxa25x_udc.c
index 22db49164da8..3e35e0fa45f1 100644
--- a/drivers/usb/gadget/pxa25x_udc.c
+++ b/drivers/usb/gadget/pxa25x_udc.c
@@ -32,6 +32,7 @@
 #include <asm/io.h>
 #include <asm/arch/pxa.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include <linux/usb/ch9.h>
diff --git a/drivers/usb/gadget/udc/udc-core.c b/drivers/usb/gadget/udc/udc-core.c
index 13c42aabab33..74d66fd77b24 100644
--- a/drivers/usb/gadget/udc/udc-core.c
+++ b/drivers/usb/gadget/udc/udc-core.c
@@ -23,6 +23,7 @@
 #include <common.h>
 #include <dm.h>
 #include <dm/device-internal.h>
+#include <linux/errno.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
 
diff --git a/drivers/usb/gadget/udc/udc-uclass.c b/drivers/usb/gadget/udc/udc-uclass.c
index 384aa47a98f4..7fa4aae4d2b7 100644
--- a/drivers/usb/gadget/udc/udc-uclass.c
+++ b/drivers/usb/gadget/udc/udc-uclass.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <dm/device-internal.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/usb/gadget.h>
 
diff --git a/drivers/usb/host/dwc2.c b/drivers/usb/host/dwc2.c
index 62eab821bb67..b8c92f52b2fd 100644
--- a/drivers/usb/host/dwc2.c
+++ b/drivers/usb/host/dwc2.c
@@ -23,6 +23,7 @@
 #include <asm/io.h>
 #include <dm/device_compat.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <power/regulator.h>
 #include <reset.h>
diff --git a/drivers/usb/host/dwc3-of-simple.c b/drivers/usb/host/dwc3-of-simple.c
index e4abc6f3b9be..afd304fba866 100644
--- a/drivers/usb/host/dwc3-of-simple.c
+++ b/drivers/usb/host/dwc3-of-simple.c
@@ -14,6 +14,7 @@
 #include <dm.h>
 #include <reset.h>
 #include <clk.h>
+#include <linux/errno.h>
 
 struct dwc3_of_simple {
 	struct clk_bulk		clks;
diff --git a/drivers/usb/host/dwc3-sti-glue.c b/drivers/usb/host/dwc3-sti-glue.c
index 95514a4c593b..1989881ae84e 100644
--- a/drivers/usb/host/dwc3-sti-glue.c
+++ b/drivers/usb/host/dwc3-sti-glue.c
@@ -17,6 +17,7 @@
 #include <reset-uclass.h>
 #include <syscon.h>
 #include <usb.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 #include <linux/usb/dwc3.h>
diff --git a/drivers/usb/host/ehci-atmel.c b/drivers/usb/host/ehci-atmel.c
index 3b208e8eb228..dc6eb5b9bb6f 100644
--- a/drivers/usb/host/ehci-atmel.c
+++ b/drivers/usb/host/ehci-atmel.c
@@ -13,6 +13,7 @@
 #include <usb.h>
 #include <asm/io.h>
 #include <asm/arch/clk.h>
+#include <linux/errno.h>
 
 #include "ehci.h"
 
diff --git a/drivers/usb/host/ehci-fsl.c b/drivers/usb/host/ehci-fsl.c
index 35bd319de8a1..b929eb9781b1 100644
--- a/drivers/usb/host/ehci-fsl.c
+++ b/drivers/usb/host/ehci-fsl.c
@@ -17,6 +17,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <usb/ehci-ci.h>
 #include <hwconfig.h>
diff --git a/drivers/usb/host/ehci-generic.c b/drivers/usb/host/ehci-generic.c
index 304a3437d56c..b9ad1785ceac 100644
--- a/drivers/usb/host/ehci-generic.c
+++ b/drivers/usb/host/ehci-generic.c
@@ -13,6 +13,7 @@
 #include <reset.h>
 #include <asm/io.h>
 #include <dm.h>
+#include <linux/errno.h>
 #include "ehci.h"
 #include <power/regulator.h>
 
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index fe6459e4a314..4ef54a53d83f 100644
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -24,6 +24,7 @@
 #include <dm/device_compat.h>
 #include <linux/compiler.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include "ehci.h"
diff --git a/drivers/usb/host/ehci-marvell.c b/drivers/usb/host/ehci-marvell.c
index 9f6b8a2ae5fa..635f9f252360 100644
--- a/drivers/usb/host/ehci-marvell.c
+++ b/drivers/usb/host/ehci-marvell.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <usb.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include "ehci.h"
 #include <linux/mbus.h>
 #include <asm/arch/cpu.h>
diff --git a/drivers/usb/host/ehci-msm.c b/drivers/usb/host/ehci-msm.c
index 6492769b2a3e..458472b7b2e2 100644
--- a/drivers/usb/host/ehci-msm.c
+++ b/drivers/usb/host/ehci-msm.c
@@ -12,6 +12,7 @@
 #include <errno.h>
 #include <stdio.h>
 #include <usb.h>
+#include <linux/errno.h>
 #include <usb/ehci-ci.h>
 #include <usb/ulpi.h>
 #include <wait_bit.h>
diff --git a/drivers/usb/host/ehci-mx5.c b/drivers/usb/host/ehci-mx5.c
index 709cb1cff54d..2b7c9cc80d75 100644
--- a/drivers/usb/host/ehci-mx5.c
+++ b/drivers/usb/host/ehci-mx5.c
@@ -12,6 +12,7 @@
 #include <asm/global_data.h>
 #include <linux/compiler.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <usb/ehci-ci.h>
 #include <asm/io.h>
diff --git a/drivers/usb/host/ehci-mx6.c b/drivers/usb/host/ehci-mx6.c
index 51723fca051a..7ca106520dbe 100644
--- a/drivers/usb/host/ehci-mx6.c
+++ b/drivers/usb/host/ehci-mx6.c
@@ -13,6 +13,7 @@
 #include <asm/global_data.h>
 #include <linux/compiler.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <usb/ehci-ci.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
diff --git a/drivers/usb/host/ehci-mxc.c b/drivers/usb/host/ehci-mxc.c
index d0b7ac512e80..0cbc8ee75e95 100644
--- a/drivers/usb/host/ehci-mxc.c
+++ b/drivers/usb/host/ehci-mxc.c
@@ -9,6 +9,7 @@
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <usb/ehci-ci.h>
 #include <errno.h>
 
diff --git a/drivers/usb/host/ehci-mxs.c b/drivers/usb/host/ehci-mxs.c
index 05c0f4a196ee..7698c7761fee 100644
--- a/drivers/usb/host/ehci-mxs.c
+++ b/drivers/usb/host/ehci-mxs.c
@@ -12,6 +12,7 @@
 #include <asm/arch/imx-regs.h>
 #include <errno.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 #include "ehci.h"
 
diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c
index 45c3418e7f84..cc5c9406112f 100644
--- a/drivers/usb/host/ehci-omap.c
+++ b/drivers/usb/host/ehci-omap.c
@@ -17,6 +17,7 @@
 #include <usb.h>
 #include <vsprintf.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <usb/ulpi.h>
 #include <errno.h>
diff --git a/drivers/usb/host/ehci-vf.c b/drivers/usb/host/ehci-vf.c
index 39d5b1dd9be8..3f140521c9c5 100644
--- a/drivers/usb/host/ehci-vf.c
+++ b/drivers/usb/host/ehci-vf.c
@@ -21,6 +21,7 @@
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/mach-imx/regs-usbphy.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <usb/ehci-ci.h>
 #include <linux/libfdt.h>
diff --git a/drivers/usb/host/ehci-zynq.c b/drivers/usb/host/ehci-zynq.c
index 6eef3814a149..918e224e761f 100644
--- a/drivers/usb/host/ehci-zynq.c
+++ b/drivers/usb/host/ehci-zynq.c
@@ -12,6 +12,7 @@
 #include <asm/arch/hardware.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/io.h>
+#include <linux/errno.h>
 #include <usb/ehci-ci.h>
 #include <usb/ulpi.h>
 
diff --git a/drivers/usb/host/ohci-da8xx.c b/drivers/usb/host/ohci-da8xx.c
index e9f87cfb7b0e..f034d50a3826 100644
--- a/drivers/usb/host/ohci-da8xx.c
+++ b/drivers/usb/host/ohci-da8xx.c
@@ -14,6 +14,7 @@
 #include <dm/ofnode.h>
 #include <generic-phy.h>
 #include <reset.h>
+#include <linux/errno.h>
 #include "ohci.h"
 #include <asm/arch/da8xx-usb.h>
 
diff --git a/drivers/usb/host/ohci-generic.c b/drivers/usb/host/ohci-generic.c
index b84bf8ac0f7c..ae7066169d33 100644
--- a/drivers/usb/host/ohci-generic.c
+++ b/drivers/usb/host/ohci-generic.c
@@ -12,6 +12,7 @@
 #include <dm/ofnode.h>
 #include <generic-phy.h>
 #include <reset.h>
+#include <linux/errno.h>
 #include "ohci.h"
 
 #if !defined(CONFIG_USB_OHCI_NEW)
diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c
index 598567d60477..3b204efdd690 100644
--- a/drivers/usb/host/ohci-hcd.c
+++ b/drivers/usb/host/ohci-hcd.c
@@ -35,6 +35,7 @@
 #include <errno.h>
 #include <asm/cache.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #if defined(CONFIG_PCI_OHCI)
diff --git a/drivers/usb/host/r8a66597-hcd.c b/drivers/usb/host/r8a66597-hcd.c
index 7595813868c6..f977b3336f05 100644
--- a/drivers/usb/host/r8a66597-hcd.c
+++ b/drivers/usb/host/r8a66597-hcd.c
@@ -14,6 +14,7 @@
 #include <asm/io.h>
 #include <dm/device_compat.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/iopoll.h>
 #include <linux/string.h>
 #include <power/regulator.h>
diff --git a/drivers/usb/host/usb-uclass.c b/drivers/usb/host/usb-uclass.c
index 8d095c7fe241..36c676a1e5cb 100644
--- a/drivers/usb/host/usb-uclass.c
+++ b/drivers/usb/host/usb-uclass.c
@@ -17,6 +17,7 @@
 #include <dm/device-internal.h>
 #include <dm/lists.h>
 #include <dm/uclass-internal.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 extern bool usb_started; /* flag for the started/stopped USB status */
diff --git a/drivers/usb/host/xhci-brcm.c b/drivers/usb/host/xhci-brcm.c
index ee65f51c5d27..3308b7e756a7 100644
--- a/drivers/usb/host/xhci-brcm.c
+++ b/drivers/usb/host/xhci-brcm.c
@@ -8,6 +8,7 @@
 #include <fdtdec.h>
 #include <usb.h>
 #include <asm/io.h>
+#include <linux/errno.h>
 #include <usb/xhci.h>
 
 #define DRD2U3H_XHC_REGS_AXIWRA	0xC08
diff --git a/drivers/usb/host/xhci-dwc3.c b/drivers/usb/host/xhci-dwc3.c
index fdbf2c83b569..b96aea1e0105 100644
--- a/drivers/usb/host/xhci-dwc3.c
+++ b/drivers/usb/host/xhci-dwc3.c
@@ -15,6 +15,7 @@
 #include <usb.h>
 #include <dwc3-uboot.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include <usb/xhci.h>
diff --git a/drivers/usb/host/xhci-mvebu.c b/drivers/usb/host/xhci-mvebu.c
index 32e00378ab70..bc3a9f4d0181 100644
--- a/drivers/usb/host/xhci-mvebu.c
+++ b/drivers/usb/host/xhci-mvebu.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <stdio.h>
 #include <usb.h>
+#include <linux/errno.h>
 #include <power/regulator.h>
 #include <asm/gpio.h>
 
diff --git a/drivers/usb/host/xhci-rcar.c b/drivers/usb/host/xhci-rcar.c
index 8fc51df3d111..28eea930cc21 100644
--- a/drivers/usb/host/xhci-rcar.c
+++ b/drivers/usb/host/xhci-rcar.c
@@ -15,6 +15,7 @@
 #include <wait_bit.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #include <usb/xhci.h>
 #include "xhci-rcar-r8a779x_usb3_v3.h"
diff --git a/drivers/usb/musb-new/am35x.c b/drivers/usb/musb-new/am35x.c
index 410cf042f66e..8d8aa7794670 100644
--- a/drivers/usb/musb-new/am35x.c
+++ b/drivers/usb/musb-new/am35x.c
@@ -29,6 +29,7 @@
 #include <asm/omap_musb.h>
 #include <linux/bug.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include "linux-compat.h"
 #endif
diff --git a/drivers/usb/musb-new/da8xx.c b/drivers/usb/musb-new/da8xx.c
index e13a6810b8da..8c44ed2429fb 100644
--- a/drivers/usb/musb-new/da8xx.c
+++ b/drivers/usb/musb-new/da8xx.c
@@ -23,6 +23,7 @@
 #include <asm/arch/hardware.h>
 #include <asm/arch/da8xx-usb.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/usb/otg.h>
 #include <asm/omap_musb.h>
 #include <generic-phy.h>
diff --git a/drivers/usb/musb-new/mt85xx.c b/drivers/usb/musb-new/mt85xx.c
index 78b4c93e8609..c5b994d906bf 100644
--- a/drivers/usb/musb-new/mt85xx.c
+++ b/drivers/usb/musb-new/mt85xx.c
@@ -16,6 +16,7 @@
 #include <dm/lists.h>
 #include <dm/root.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include <linux/usb/musb.h>
diff --git a/drivers/usb/musb-new/musb_dsps.c b/drivers/usb/musb-new/musb_dsps.c
index f9d30b5b76dd..14d8cfb70fc7 100644
--- a/drivers/usb/musb-new/musb_dsps.c
+++ b/drivers/usb/musb-new/musb_dsps.c
@@ -35,6 +35,7 @@
 #include <time.h>
 #include <vsprintf.h>
 #include <asm/omap_musb.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include "linux-compat.h"
 #endif
diff --git a/drivers/usb/musb-new/musb_gadget.c b/drivers/usb/musb-new/musb_gadget.c
index ceac6a82b644..949bea72aae8 100644
--- a/drivers/usb/musb-new/musb_gadget.c
+++ b/drivers/usb/musb-new/musb_gadget.c
@@ -25,6 +25,7 @@
 #include <common.h>
 #include <vsprintf.h>
 #include <linux/bug.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include <linux/usb/ch9.h>
diff --git a/drivers/usb/musb-new/musb_gadget_ep0.c b/drivers/usb/musb-new/musb_gadget_ep0.c
index 22de98559d9c..769aa25f1759 100644
--- a/drivers/usb/musb-new/musb_gadget_ep0.c
+++ b/drivers/usb/musb-new/musb_gadget_ep0.c
@@ -19,6 +19,7 @@
 #include <linux/interrupt.h>
 #else
 #include <common.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include "linux-compat.h"
 #include <asm/processor.h>
diff --git a/drivers/usb/musb-new/omap2430.c b/drivers/usb/musb-new/omap2430.c
index e8bc3f33597f..b609034184fa 100644
--- a/drivers/usb/musb-new/omap2430.c
+++ b/drivers/usb/musb-new/omap2430.c
@@ -18,6 +18,7 @@
 #include <dm/device_compat.h>
 #include <dm/lists.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/usb/otg.h>
 #include <asm/omap_common.h>
diff --git a/drivers/usb/musb-new/pic32.c b/drivers/usb/musb-new/pic32.c
index b3905660c797..b4ee18442239 100644
--- a/drivers/usb/musb-new/pic32.c
+++ b/drivers/usb/musb-new/pic32.c
@@ -16,6 +16,7 @@
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/usb/musb.h>
 #include "linux-compat.h"
diff --git a/drivers/usb/musb-new/sunxi.c b/drivers/usb/musb-new/sunxi.c
index 20d968f8497e..1ab74d4be394 100644
--- a/drivers/usb/musb-new/sunxi.c
+++ b/drivers/usb/musb-new/sunxi.c
@@ -33,6 +33,7 @@
 #include <dm/root.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include <linux/usb/musb.h>
diff --git a/drivers/usb/musb-new/ti-musb.c b/drivers/usb/musb-new/ti-musb.c
index bbec87743104..e4382a30969d 100644
--- a/drivers/usb/musb-new/ti-musb.c
+++ b/drivers/usb/musb-new/ti-musb.c
@@ -13,6 +13,7 @@
 #include <malloc.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include <linux/usb/otg.h>
diff --git a/drivers/video/am335x-fb.c b/drivers/video/am335x-fb.c
index 4e0d9c2b0981..4d74e96e2a3f 100644
--- a/drivers/video/am335x-fb.c
+++ b/drivers/video/am335x-fb.c
@@ -26,6 +26,7 @@
 #include <asm/utils.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include "am335x-fb.h"
diff --git a/drivers/video/atmel_hlcdfb.c b/drivers/video/atmel_hlcdfb.c
index 13dc28412c76..bee082508b6d 100644
--- a/drivers/video/atmel_hlcdfb.c
+++ b/drivers/video/atmel_hlcdfb.c
@@ -23,6 +23,7 @@
 #include <wait_bit.h>
 #include <atmel_hlcdc.h>
 #include <linux/bug.h>
+#include <linux/errno.h>
 
 #if defined(CONFIG_LCD_LOGO)
 #include <bmp_logo.h>
diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c
index e5e0aeec3502..20b9ba661c2d 100644
--- a/drivers/video/atmel_lcdfb.c
+++ b/drivers/video/atmel_lcdfb.c
@@ -20,6 +20,7 @@
 #include <bmp_layout.h>
 #include <atmel_lcdc.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/video/backlight-uclass.c b/drivers/video/backlight-uclass.c
index 0aadf8a1f974..60cc206c5fd6 100644
--- a/drivers/video/backlight-uclass.c
+++ b/drivers/video/backlight-uclass.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <backlight.h>
+#include <linux/errno.h>
 
 int backlight_enable(struct udevice *dev)
 {
diff --git a/drivers/video/bcm2835.c b/drivers/video/bcm2835.c
index 0888cb001971..7d2a452fd6fd 100644
--- a/drivers/video/bcm2835.c
+++ b/drivers/video/bcm2835.c
@@ -10,6 +10,7 @@
 #include <asm/arch/mbox.h>
 #include <asm/arch/msg.h>
 #include <asm/cache.h>
+#include <linux/errno.h>
 
 static int bcm2835_video_probe(struct udevice *dev)
 {
diff --git a/drivers/video/bridge/anx6345.c b/drivers/video/bridge/anx6345.c
index 5d76cedbcea0..e7c33e6a18b4 100644
--- a/drivers/video/bridge/anx6345.c
+++ b/drivers/video/bridge/anx6345.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <video_bridge.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include "../anx98xx-edp.h"
 
diff --git a/drivers/video/bridge/ps862x.c b/drivers/video/bridge/ps862x.c
index 7e9c6da4545f..b6f3e300f352 100644
--- a/drivers/video/bridge/ps862x.c
+++ b/drivers/video/bridge/ps862x.c
@@ -12,6 +12,7 @@
 #include <video_bridge.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <power/regulator.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/video/bridge/video-bridge-uclass.c b/drivers/video/bridge/video-bridge-uclass.c
index 389b02cdcba2..d606342d8472 100644
--- a/drivers/video/bridge/video-bridge-uclass.c
+++ b/drivers/video/bridge/video-bridge-uclass.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <video_bridge.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 int video_bridge_set_backlight(struct udevice *dev, int percent)
 {
diff --git a/drivers/video/broadwell_igd.c b/drivers/video/broadwell_igd.c
index 7a282be660f9..77a4dc158304 100644
--- a/drivers/video/broadwell_igd.c
+++ b/drivers/video/broadwell_igd.c
@@ -24,6 +24,7 @@
 #include <asm/arch/iomap.h>
 #include <asm/arch/pch.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include "i915_reg.h"
 
 struct broadwell_igd_priv {
diff --git a/drivers/video/console_normal.c b/drivers/video/console_normal.c
index 04f022491e52..5b51252aaa62 100644
--- a/drivers/video/console_normal.c
+++ b/drivers/video/console_normal.c
@@ -12,6 +12,7 @@
 #include <video.h>
 #include <video_console.h>
 #include <video_font.h>		/* Get font data, width and height */
+#include <linux/errno.h>
 
 static int console_normal_set_row(struct udevice *dev, uint row, int clr)
 {
diff --git a/drivers/video/console_rotate.c b/drivers/video/console_rotate.c
index 36c8d0609d87..3649bd4487e5 100644
--- a/drivers/video/console_rotate.c
+++ b/drivers/video/console_rotate.c
@@ -10,6 +10,7 @@
 #include <video.h>
 #include <video_console.h>
 #include <video_font.h>		/* Get font data, width and height */
+#include <linux/errno.h>
 
 static int console_set_row_1(struct udevice *dev, uint row, int clr)
 {
diff --git a/drivers/video/console_truetype.c b/drivers/video/console_truetype.c
index 26093408453a..17e040bc9261 100644
--- a/drivers/video/console_truetype.c
+++ b/drivers/video/console_truetype.c
@@ -9,6 +9,7 @@
 #include <malloc.h>
 #include <video.h>
 #include <video_console.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 /* Functions needed by stb_truetype.h */
diff --git a/drivers/video/coreboot.c b/drivers/video/coreboot.c
index 6914162d3acf..e29b0651a67a 100644
--- a/drivers/video/coreboot.c
+++ b/drivers/video/coreboot.c
@@ -9,6 +9,7 @@
 #include <vbe.h>
 #include <video.h>
 #include <asm/arch/sysinfo.h>
+#include <linux/errno.h>
 
 static int save_vesa_mode(struct cb_framebuffer *fb,
 			  struct vesa_mode_info *vesa)
diff --git a/drivers/video/display-uclass.c b/drivers/video/display-uclass.c
index 1a29ce5d8589..8b49a7ba028c 100644
--- a/drivers/video/display-uclass.c
+++ b/drivers/video/display-uclass.c
@@ -8,6 +8,7 @@
 #include <display.h>
 #include <edid.h>
 #include <errno.h>
+#include <linux/errno.h>
 
 int display_read_edid(struct udevice *dev, u8 *buf, int buf_size)
 {
diff --git a/drivers/video/dsi-host-uclass.c b/drivers/video/dsi-host-uclass.c
index 1db1f88a1799..78e3d94e3e7d 100644
--- a/drivers/video/dsi-host-uclass.c
+++ b/drivers/video/dsi-host-uclass.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <dm.h>
 #include <dsi_host.h>
+#include <linux/errno.h>
 
 int dsi_host_init(struct udevice *dev,
 		  struct mipi_dsi_device *device,
diff --git a/drivers/video/dw_mipi_dsi.c b/drivers/video/dw_mipi_dsi.c
index 547dfc4b81c6..1a2d2b3b7f5d 100644
--- a/drivers/video/dw_mipi_dsi.c
+++ b/drivers/video/dw_mipi_dsi.c
@@ -22,6 +22,7 @@
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/iopoll.h>
 #include <video_bridge.h>
 #include <linux/string.h>
diff --git a/drivers/video/efi.c b/drivers/video/efi.c
index 489998f3625f..aa67cf17ad0a 100644
--- a/drivers/video/efi.c
+++ b/drivers/video/efi.c
@@ -12,6 +12,7 @@
 #include <stdio.h>
 #include <vbe.h>
 #include <video.h>
+#include <linux/errno.h>
 
 struct pixel {
 	u8 pos;
diff --git a/drivers/video/exynos/exynos_dp.c b/drivers/video/exynos/exynos_dp.c
index d63d9effb007..72333b470108 100644
--- a/drivers/video/exynos/exynos_dp.c
+++ b/drivers/video/exynos/exynos_dp.c
@@ -14,6 +14,7 @@
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <malloc.h>
 #include <video_bridge.h>
diff --git a/drivers/video/exynos/exynos_dp_lowlevel.c b/drivers/video/exynos/exynos_dp_lowlevel.c
index efa3b924af16..c87e18f1dadf 100644
--- a/drivers/video/exynos/exynos_dp_lowlevel.c
+++ b/drivers/video/exynos/exynos_dp_lowlevel.c
@@ -15,6 +15,7 @@
 #include <asm/arch/dp_info.h>
 #include <asm/arch/dp.h>
 #include <fdtdec.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include "exynos_dp_lowlevel.h"
 
diff --git a/drivers/video/exynos/exynos_mipi_dsi.c b/drivers/video/exynos/exynos_mipi_dsi.c
index 1d5ed38bf44f..a21c185cc792 100644
--- a/drivers/video/exynos/exynos_mipi_dsi.c
+++ b/drivers/video/exynos/exynos_mipi_dsi.c
@@ -13,6 +13,7 @@
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <dm/devres.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <linux/compat.h>
 #include <linux/err.h>
diff --git a/drivers/video/exynos/exynos_mipi_dsi_common.c b/drivers/video/exynos/exynos_mipi_dsi_common.c
index ab7d61afc88b..26e5d24314bb 100644
--- a/drivers/video/exynos/exynos_mipi_dsi_common.c
+++ b/drivers/video/exynos/exynos_mipi_dsi_common.c
@@ -13,6 +13,7 @@
 #include <linux/err.h>
 #include <asm/arch/dsim.h>
 #include <asm/arch/mipi_dsim.h>
+#include <linux/errno.h>
 
 #include "exynos_mipi_dsi_lowlevel.h"
 
diff --git a/drivers/video/fsl_dcu_fb.c b/drivers/video/fsl_dcu_fb.c
index eaf4892b0484..be6b62bfa838 100644
--- a/drivers/video/fsl_dcu_fb.c
+++ b/drivers/video/fsl_dcu_fb.c
@@ -15,6 +15,7 @@
 #include <dm.h>
 #include <fdt_support.h>
 #include <fsl_dcu_fb.h>
+#include <linux/errno.h>
 #include <linux/fb.h>
 #include <malloc.h>
 #include <video.h>
diff --git a/drivers/video/hitachi_tx18d42vm_lcd.c b/drivers/video/hitachi_tx18d42vm_lcd.c
index 752bc62eb68a..fd51761485d7 100644
--- a/drivers/video/hitachi_tx18d42vm_lcd.c
+++ b/drivers/video/hitachi_tx18d42vm_lcd.c
@@ -9,6 +9,7 @@
 #include <malloc.h>
 #include <stdio.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 #include <asm/gpio.h>
 #include <errno.h>
diff --git a/drivers/video/ihs_video_out.c b/drivers/video/ihs_video_out.c
index 2124b826d28d..dcbfbde688ff 100644
--- a/drivers/video/ihs_video_out.c
+++ b/drivers/video/ihs_video_out.c
@@ -16,6 +16,7 @@
 #include <regmap.h>
 #include <video_osd.h>
 #include <asm/gpio.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 static const uint MAX_X_CHARS = 53;
diff --git a/drivers/video/ivybridge_igd.c b/drivers/video/ivybridge_igd.c
index d4247ee6406d..47aa55ebdfcb 100644
--- a/drivers/video/ivybridge_igd.c
+++ b/drivers/video/ivybridge_igd.c
@@ -21,6 +21,7 @@
 #include <asm/arch/pch.h>
 #include <asm/arch/sandybridge.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/video/lg4573.c b/drivers/video/lg4573.c
index f91ee7363f50..7d4ddca1573e 100644
--- a/drivers/video/lg4573.c
+++ b/drivers/video/lg4573.c
@@ -17,6 +17,7 @@
 #include <spi.h>
 #include <asm/gpio.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #define PWR_ON_DELAY_MSECS  120
diff --git a/drivers/video/logicore_dp_tx.c b/drivers/video/logicore_dp_tx.c
index 45eba82c4095..938455c0e4a6 100644
--- a/drivers/video/logicore_dp_tx.c
+++ b/drivers/video/logicore_dp_tx.c
@@ -16,6 +16,7 @@
 #include <errno.h>
 #include <stdio.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include "axi.h"
diff --git a/drivers/video/mali_dp.c b/drivers/video/mali_dp.c
index 778a9a917ddd..44841a9f9296 100644
--- a/drivers/video/mali_dp.c
+++ b/drivers/video/mali_dp.c
@@ -21,6 +21,7 @@
 #include <clk.h>
 #include <dm/device_compat.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/sizes.h>
 #include <linux/string.h>
 
diff --git a/drivers/video/meson/meson_dw_hdmi.c b/drivers/video/meson/meson_dw_hdmi.c
index ec550b57fdab..0fa1178415a9 100644
--- a/drivers/video/meson/meson_dw_hdmi.c
+++ b/drivers/video/meson/meson_dw_hdmi.c
@@ -14,6 +14,7 @@
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <power/regulator.h>
 #include <clk.h>
diff --git a/drivers/video/meson/meson_vpu.c b/drivers/video/meson/meson_vpu.c
index 2d095c6a28eb..84171befb993 100644
--- a/drivers/video/meson/meson_vpu.c
+++ b/drivers/video/meson/meson_vpu.c
@@ -14,6 +14,7 @@
 #include <log.h>
 #include <part.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/sizes.h>
 #include <asm/arch/mem.h>
 #include <dm/device-internal.h>
diff --git a/drivers/video/mipi_dsi.c b/drivers/video/mipi_dsi.c
index 5caa6a6fef6c..7f9e2c8357fb 100644
--- a/drivers/video/mipi_dsi.c
+++ b/drivers/video/mipi_dsi.c
@@ -39,6 +39,7 @@
 #include <mipi_display.h>
 #include <mipi_dsi.h>
 #include <dm/devres.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 /**
diff --git a/drivers/video/mvebu_lcd.c b/drivers/video/mvebu_lcd.c
index f3cb2bfb480c..142ae2355998 100644
--- a/drivers/video/mvebu_lcd.c
+++ b/drivers/video/mvebu_lcd.c
@@ -12,6 +12,7 @@
 #include <asm/cache.h>
 #include <dm/device_compat.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/mbus.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
diff --git a/drivers/video/nexell/s5pxx18_dp.c b/drivers/video/nexell/s5pxx18_dp.c
index 2248f4790575..e857b004d914 100644
--- a/drivers/video/nexell/s5pxx18_dp.c
+++ b/drivers/video/nexell/s5pxx18_dp.c
@@ -12,6 +12,7 @@
 #include <asm/arch/reset.h>
 #include <asm/arch/nexell.h>
 #include <asm/arch/display.h>
+#include <linux/errno.h>
 
 #include "soc/s5pxx18_soc_disptop.h"
 #include "soc/s5pxx18_soc_dpc.h"
diff --git a/drivers/video/nexell/s5pxx18_dp_hdmi.c b/drivers/video/nexell/s5pxx18_dp_hdmi.c
index 3f1fb8a5757b..087cb11f916f 100644
--- a/drivers/video/nexell/s5pxx18_dp_hdmi.c
+++ b/drivers/video/nexell/s5pxx18_dp_hdmi.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <errno.h>
 #include <log.h>
+#include <linux/errno.h>
 
 #include <asm/arch/nexell.h>
 #include <asm/arch/tieoff.h>
diff --git a/drivers/video/nexell/s5pxx18_dp_lvds.c b/drivers/video/nexell/s5pxx18_dp_lvds.c
index f8ea63fdf1b3..cc95de13f511 100644
--- a/drivers/video/nexell/s5pxx18_dp_lvds.c
+++ b/drivers/video/nexell/s5pxx18_dp_lvds.c
@@ -8,6 +8,7 @@
 #include <config.h>
 #include <common.h>
 #include <errno.h>
+#include <linux/errno.h>
 
 #include <asm/arch/nexell.h>
 #include <asm/arch/reset.h>
diff --git a/drivers/video/nexell/s5pxx18_dp_mipi.c b/drivers/video/nexell/s5pxx18_dp_mipi.c
index 670272b26802..0eb1ebb377a3 100644
--- a/drivers/video/nexell/s5pxx18_dp_mipi.c
+++ b/drivers/video/nexell/s5pxx18_dp_mipi.c
@@ -8,6 +8,7 @@
 #include <config.h>
 #include <common.h>
 #include <errno.h>
+#include <linux/errno.h>
 
 #include <asm/arch/nexell.h>
 #include <asm/arch/tieoff.h>
diff --git a/drivers/video/nexell_display.c b/drivers/video/nexell_display.c
index 4101e0962a9c..1592e9b46ab9 100644
--- a/drivers/video/nexell_display.c
+++ b/drivers/video/nexell_display.c
@@ -22,6 +22,7 @@
 #include <asm/io.h>
 #include <asm/arch/display.h>
 #include <asm/arch/display_dev.h>
+#include <linux/errno.h>
 #include "videomodes.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/video/orisetech_otm8009a.c b/drivers/video/orisetech_otm8009a.c
index acb8f384a882..b6a8527533cb 100644
--- a/drivers/video/orisetech_otm8009a.c
+++ b/drivers/video/orisetech_otm8009a.c
@@ -15,6 +15,7 @@
 #include <asm/gpio.h>
 #include <dm/device_compat.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <power/regulator.h>
 
diff --git a/drivers/video/panel-uclass.c b/drivers/video/panel-uclass.c
index 246d1b2836d7..8bdba13c457a 100644
--- a/drivers/video/panel-uclass.c
+++ b/drivers/video/panel-uclass.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <panel.h>
+#include <linux/errno.h>
 
 int panel_enable_backlight(struct udevice *dev)
 {
diff --git a/drivers/video/pwm_backlight.c b/drivers/video/pwm_backlight.c
index 468a5703bdbd..6aacb067ad3a 100644
--- a/drivers/video/pwm_backlight.c
+++ b/drivers/video/pwm_backlight.c
@@ -14,6 +14,7 @@
 #include <pwm.h>
 #include <asm/gpio.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <power/regulator.h>
 
 /**
diff --git a/drivers/video/raydium-rm68200.c b/drivers/video/raydium-rm68200.c
index 1efd1607f63e..d31cbb4c34a9 100644
--- a/drivers/video/raydium-rm68200.c
+++ b/drivers/video/raydium-rm68200.c
@@ -15,6 +15,7 @@
 #include <asm/gpio.h>
 #include <dm/device_compat.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <power/regulator.h>
 
diff --git a/drivers/video/rockchip/rk3288_mipi.c b/drivers/video/rockchip/rk3288_mipi.c
index b232ff0b76b2..f842dfeb1d77 100644
--- a/drivers/video/rockchip/rk3288_mipi.c
+++ b/drivers/video/rockchip/rk3288_mipi.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <panel.h>
 #include <regmap.h>
+#include <linux/errno.h>
 #include "rk_mipi.h"
 #include <syscon.h>
 #include <asm/gpio.h>
diff --git a/drivers/video/rockchip/rk3399_mipi.c b/drivers/video/rockchip/rk3399_mipi.c
index 113708d97e5a..efcd8614c035 100644
--- a/drivers/video/rockchip/rk3399_mipi.c
+++ b/drivers/video/rockchip/rk3399_mipi.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <panel.h>
 #include <regmap.h>
+#include <linux/errno.h>
 #include "rk_mipi.h"
 #include <syscon.h>
 #include <asm/gpio.h>
diff --git a/drivers/video/rockchip/rk_edp.c b/drivers/video/rockchip/rk_edp.c
index 575aee1cdb19..d6478d4f3986 100644
--- a/drivers/video/rockchip/rk_edp.c
+++ b/drivers/video/rockchip/rk_edp.c
@@ -24,6 +24,7 @@
 #include <asm/arch-rockchip/hardware.h>
 #include <dt-bindings/clock/rk3288-cru.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #define MAX_CR_LOOP 5
diff --git a/drivers/video/rockchip/rk_lvds.c b/drivers/video/rockchip/rk_lvds.c
index 24f3caabb011..c9890feac0f1 100644
--- a/drivers/video/rockchip/rk_lvds.c
+++ b/drivers/video/rockchip/rk_lvds.c
@@ -20,6 +20,7 @@
 #include <asm/arch-rockchip/lvds_rk3288.h>
 #include <dt-bindings/clock/rk3288-cru.h>
 #include <dt-bindings/video/rk3288.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/video/rockchip/rk_mipi.c b/drivers/video/rockchip/rk_mipi.c
index 2e235cb6c2cd..2438d44cf3f4 100644
--- a/drivers/video/rockchip/rk_mipi.c
+++ b/drivers/video/rockchip/rk_mipi.c
@@ -12,6 +12,7 @@
 #include <panel.h>
 #include <regmap.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include "rk_mipi.h"
 #include <syscon.h>
 #include <asm/gpio.h>
diff --git a/drivers/video/rockchip/rk_vop.c b/drivers/video/rockchip/rk_vop.c
index 7e864698697a..41541ef8222f 100644
--- a/drivers/video/rockchip/rk_vop.c
+++ b/drivers/video/rockchip/rk_vop.c
@@ -23,6 +23,7 @@
 #include <dm/uclass-internal.h>
 #include <linux/bitops.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <power/regulator.h>
 #include "rk_vop.h"
 
diff --git a/drivers/video/sandbox_osd.c b/drivers/video/sandbox_osd.c
index 9fb1224bf596..ab6abae520e8 100644
--- a/drivers/video/sandbox_osd.c
+++ b/drivers/video/sandbox_osd.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <malloc.h>
 #include <video_osd.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include "sandbox_osd.h"
diff --git a/drivers/video/simple_panel.c b/drivers/video/simple_panel.c
index 6c624c376991..74ae68ea3ad9 100644
--- a/drivers/video/simple_panel.c
+++ b/drivers/video/simple_panel.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <panel.h>
 #include <asm/gpio.h>
+#include <linux/errno.h>
 #include <power/regulator.h>
 
 struct simple_panel_priv {
diff --git a/drivers/video/simplefb.c b/drivers/video/simplefb.c
index c545c79ced85..d722832f3eb5 100644
--- a/drivers/video/simplefb.c
+++ b/drivers/video/simplefb.c
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <video.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 static int simple_video_probe(struct udevice *dev)
diff --git a/drivers/video/stm32/stm32_dsi.c b/drivers/video/stm32/stm32_dsi.c
index e77a0f478a6e..617d900343ca 100644
--- a/drivers/video/stm32/stm32_dsi.c
+++ b/drivers/video/stm32/stm32_dsi.c
@@ -25,6 +25,7 @@
 #include <dm/device_compat.h>
 #include <dm/lists.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/iopoll.h>
 #include <linux/printk.h>
 #include <power/regulator.h>
diff --git a/drivers/video/stm32/stm32_ltdc.c b/drivers/video/stm32/stm32_ltdc.c
index d2ac2e57c8a1..3767792a399f 100644
--- a/drivers/video/stm32/stm32_ltdc.c
+++ b/drivers/video/stm32/stm32_ltdc.c
@@ -20,6 +20,7 @@
 #include <dm/device-internal.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 struct stm32_ltdc_priv {
diff --git a/drivers/video/sunxi/sunxi_de2.c b/drivers/video/sunxi/sunxi_de2.c
index 6e3999649d31..13a23f4ff63e 100644
--- a/drivers/video/sunxi/sunxi_de2.c
+++ b/drivers/video/sunxi/sunxi_de2.c
@@ -22,6 +22,7 @@
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include "simplefb_common.h"
 
diff --git a/drivers/video/sunxi/sunxi_display.c b/drivers/video/sunxi/sunxi_display.c
index 07a63e7570ec..8285ccd70a45 100644
--- a/drivers/video/sunxi/sunxi_display.c
+++ b/drivers/video/sunxi/sunxi_display.c
@@ -13,6 +13,7 @@
 #include <stdio.h>
 #include <time.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include <asm/arch/clock.h>
diff --git a/drivers/video/sunxi/sunxi_lcd.c b/drivers/video/sunxi/sunxi_lcd.c
index c39438ff09af..841ef4334930 100644
--- a/drivers/video/sunxi/sunxi_lcd.c
+++ b/drivers/video/sunxi/sunxi_lcd.c
@@ -18,6 +18,7 @@
 #include <asm/arch/lcdc.h>
 #include <asm/arch/gpio.h>
 #include <asm/gpio.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 struct sunxi_lcd_priv {
diff --git a/drivers/video/tda19988.c b/drivers/video/tda19988.c
index 48c291291923..bead13f29344 100644
--- a/drivers/video/tda19988.c
+++ b/drivers/video/tda19988.c
@@ -12,6 +12,7 @@
 #include <stdio.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 /*
  * TDA19988 uses paged registers. We encode the page# in the upper
diff --git a/drivers/video/tegra.c b/drivers/video/tegra.c
index 5e03aab67bb5..f10c509345d0 100644
--- a/drivers/video/tegra.c
+++ b/drivers/video/tegra.c
@@ -17,6 +17,7 @@
 #include <asm/system.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
+#include <linux/errno.h>
 
 #include <asm/arch/clock.h>
 #include <asm/arch/funcmux.h>
diff --git a/drivers/video/tegra124/display.c b/drivers/video/tegra124/display.c
index 1c47b133c856..c16110f1191e 100644
--- a/drivers/video/tegra124/display.c
+++ b/drivers/video/tegra124/display.c
@@ -25,6 +25,7 @@
 #include <asm/arch-tegra/dc.h>
 #include <dm/uclass-internal.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include "displayport.h"
 
 /* return in 1000ths of a Hertz */
diff --git a/drivers/video/tegra124/dp.c b/drivers/video/tegra124/dp.c
index 9c5ce04c3760..52b06f32ea85 100644
--- a/drivers/video/tegra124/dp.c
+++ b/drivers/video/tegra124/dp.c
@@ -16,6 +16,7 @@
 #include <asm/io.h>
 #include <asm/arch-tegra/dc.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include "display.h"
 #include "edid.h"
diff --git a/drivers/video/tegra124/sor.c b/drivers/video/tegra124/sor.c
index 345974f465b4..17a1f75a9bf0 100644
--- a/drivers/video/tegra124/sor.c
+++ b/drivers/video/tegra124/sor.c
@@ -17,6 +17,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch-tegra/dc.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include "displayport.h"
 #include "sor.h"
diff --git a/drivers/video/vidconsole-uclass.c b/drivers/video/vidconsole-uclass.c
index 128fa88648f5..7262cc0a65ce 100644
--- a/drivers/video/vidconsole-uclass.c
+++ b/drivers/video/vidconsole-uclass.c
@@ -17,6 +17,7 @@
 #include <video_font.h>		/* Bitmap font for code page 437 */
 #include <vsprintf.h>
 #include <linux/ctype.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 /*
diff --git a/drivers/video/video-uclass.c b/drivers/video/video-uclass.c
index 398f1a97e046..722a9c8765a6 100644
--- a/drivers/video/video-uclass.c
+++ b/drivers/video/video-uclass.c
@@ -24,6 +24,7 @@
 #ifdef CONFIG_SANDBOX
 #include <asm/sdl.h>
 #endif
+#include <linux/errno.h>
 #include <linux/string.h>
 
 /*
diff --git a/drivers/video/video_bmp.c b/drivers/video/video_bmp.c
index 802d84a88603..e854e3a3bfec 100644
--- a/drivers/video/video_bmp.c
+++ b/drivers/video/video_bmp.c
@@ -13,6 +13,7 @@
 #include <video.h>
 #include <watchdog.h>
 #include <asm/unaligned.h>
+#include <linux/errno.h>
 
 #ifdef CONFIG_VIDEO_BMP_RLE8
 #define BMP_RLE8_ESCAPE		0
diff --git a/drivers/video/videomodes.c b/drivers/video/videomodes.c
index ba0fa3589f6b..f14fe3bb9e66 100644
--- a/drivers/video/videomodes.c
+++ b/drivers/video/videomodes.c
@@ -64,6 +64,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/ctype.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include "videomodes.h"
diff --git a/drivers/virtio/virtio-uclass.c b/drivers/virtio/virtio-uclass.c
index 50e143bb9e55..da0945b5c60a 100644
--- a/drivers/virtio/virtio-uclass.c
+++ b/drivers/virtio/virtio-uclass.c
@@ -24,6 +24,7 @@
 #include <vsprintf.h>
 #include <dm/lists.h>
 #include <linux/bug.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 static const char *const virtio_drv_name[VIRTIO_ID_MAX_NUM] = {
diff --git a/drivers/virtio/virtio_blk.c b/drivers/virtio/virtio_blk.c
index 95b7360656a3..5117b9251260 100644
--- a/drivers/virtio/virtio_blk.c
+++ b/drivers/virtio/virtio_blk.c
@@ -12,6 +12,7 @@
 #include <virtio.h>
 #include <virtio_ring.h>
 #include <vsprintf.h>
+#include <linux/errno.h>
 #include "virtio_blk.h"
 
 struct virtio_blk_priv {
diff --git a/drivers/virtio/virtio_mmio.c b/drivers/virtio/virtio_mmio.c
index 50f79dcb3b1d..42baf5c9fd2d 100644
--- a/drivers/virtio/virtio_mmio.c
+++ b/drivers/virtio/virtio_mmio.c
@@ -16,6 +16,7 @@
 #include <linux/bug.h>
 #include <linux/compat.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/string.h>
 #include "virtio_mmio.h"
diff --git a/drivers/virtio/virtio_net.c b/drivers/virtio/virtio_net.c
index a16268f9d27b..277d4832fbb2 100644
--- a/drivers/virtio/virtio_net.c
+++ b/drivers/virtio/virtio_net.c
@@ -10,6 +10,7 @@
 #include <virtio_types.h>
 #include <virtio.h>
 #include <virtio_ring.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include "virtio_net.h"
 
diff --git a/drivers/virtio/virtio_pci_legacy.c b/drivers/virtio/virtio_pci_legacy.c
index 59deadeec33a..bef5dd1ca3cc 100644
--- a/drivers/virtio/virtio_pci_legacy.c
+++ b/drivers/virtio/virtio_pci_legacy.c
@@ -18,6 +18,7 @@
 #include <linux/bug.h>
 #include <linux/compat.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include "virtio_pci.h"
 
diff --git a/drivers/virtio/virtio_pci_modern.c b/drivers/virtio/virtio_pci_modern.c
index cc3378d87583..9edb271e929a 100644
--- a/drivers/virtio/virtio_pci_modern.c
+++ b/drivers/virtio/virtio_pci_modern.c
@@ -19,6 +19,7 @@
 #include <linux/compat.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/string.h>
 #include "virtio_pci.h"
diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c
index f058b2f8de8c..76dc7d3a7620 100644
--- a/drivers/virtio/virtio_ring.c
+++ b/drivers/virtio/virtio_ring.c
@@ -16,6 +16,7 @@
 #include <virtio_ring.h>
 #include <linux/bug.h>
 #include <linux/compat.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 int virtqueue_add(struct virtqueue *vq, struct virtio_sg *sgs[],
diff --git a/drivers/virtio/virtio_sandbox.c b/drivers/virtio/virtio_sandbox.c
index 1e5589f004c6..8fb04b8b39ec 100644
--- a/drivers/virtio/virtio_sandbox.c
+++ b/drivers/virtio/virtio_sandbox.c
@@ -14,6 +14,7 @@
 #include <linux/bug.h>
 #include <linux/compat.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 
 struct virtio_sandbox_priv {
diff --git a/drivers/w1-eeprom/ds2502.c b/drivers/w1-eeprom/ds2502.c
index 42a3560c2372..167351055afd 100644
--- a/drivers/w1-eeprom/ds2502.c
+++ b/drivers/w1-eeprom/ds2502.c
@@ -26,6 +26,7 @@
 #include <linux/err.h>
 #include <w1-eeprom.h>
 #include <w1.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #define DS2502_PAGE_SIZE	32
diff --git a/drivers/w1-eeprom/w1-eeprom-uclass.c b/drivers/w1-eeprom/w1-eeprom-uclass.c
index 8a63f614c58d..07e1c12e5ce8 100644
--- a/drivers/w1-eeprom/w1-eeprom-uclass.c
+++ b/drivers/w1-eeprom/w1-eeprom-uclass.c
@@ -16,6 +16,7 @@
 #include <stdio.h>
 #include <w1.h>
 #include <w1-eeprom.h>
+#include <linux/errno.h>
 
 #include <dm/device-internal.h>
 
diff --git a/drivers/w1/mxc_w1.c b/drivers/w1/mxc_w1.c
index 8e6372f0bede..92b18606c824 100644
--- a/drivers/w1/mxc_w1.c
+++ b/drivers/w1/mxc_w1.c
@@ -23,6 +23,7 @@
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <w1.h>
 
diff --git a/drivers/w1/w1-uclass.c b/drivers/w1/w1-uclass.c
index 61887bee1dea..a40beaefd67c 100644
--- a/drivers/w1/w1-uclass.c
+++ b/drivers/w1/w1-uclass.c
@@ -16,6 +16,7 @@
 #include <stdio.h>
 #include <w1.h>
 #include <w1-eeprom.h>
+#include <linux/errno.h>
 
 #include <dm/device-internal.h>
 
diff --git a/drivers/watchdog/armada-37xx-wdt.c b/drivers/watchdog/armada-37xx-wdt.c
index 7af680a5c250..b845e2b2e3d9 100644
--- a/drivers/watchdog/armada-37xx-wdt.c
+++ b/drivers/watchdog/armada-37xx-wdt.c
@@ -13,6 +13,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
 #include <dm/device_compat.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/watchdog/at91sam9_wdt.c b/drivers/watchdog/at91sam9_wdt.c
index a5cbc4309cc3..c116a011263d 100644
--- a/drivers/watchdog/at91sam9_wdt.c
+++ b/drivers/watchdog/at91sam9_wdt.c
@@ -24,6 +24,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <wdt.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/watchdog/bcm6345_wdt.c b/drivers/watchdog/bcm6345_wdt.c
index ee77f49a9445..5999561efd22 100644
--- a/drivers/watchdog/bcm6345_wdt.c
+++ b/drivers/watchdog/bcm6345_wdt.c
@@ -13,6 +13,7 @@
 #include <wdt.h>
 #include <clk.h>
 #include <asm/io.h>
+#include <linux/errno.h>
 
 /* WDT Value register */
 #define WDT_VAL_REG		0x0
diff --git a/drivers/watchdog/cortina_wdt.c b/drivers/watchdog/cortina_wdt.c
index 7ab9d7b2db97..0f60b3a63220 100644
--- a/drivers/watchdog/cortina_wdt.c
+++ b/drivers/watchdog/cortina_wdt.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <wdt.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #define CA_WDT_CTRL		0x00
 #define CA_WDT_PS		0x04
diff --git a/drivers/watchdog/designware_wdt.c b/drivers/watchdog/designware_wdt.c
index 12f09a7a3920..b2d17f6e335d 100644
--- a/drivers/watchdog/designware_wdt.c
+++ b/drivers/watchdog/designware_wdt.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <asm/utils.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #define DW_WDT_CR	0x00
 #define DW_WDT_TORR	0x04
diff --git a/drivers/watchdog/imx_watchdog.c b/drivers/watchdog/imx_watchdog.c
index b90c2daecee6..e17d9217cc0a 100644
--- a/drivers/watchdog/imx_watchdog.c
+++ b/drivers/watchdog/imx_watchdog.c
@@ -17,6 +17,7 @@
 #endif
 #include <fsl_wdog.h>
 #include <div64.h>
+#include <linux/errno.h>
 
 #define TIMEOUT_MAX	128000
 #define TIMEOUT_MIN	500
diff --git a/drivers/watchdog/mpc8xx_wdt.c b/drivers/watchdog/mpc8xx_wdt.c
index 45e679d35159..1640cd46bb7a 100644
--- a/drivers/watchdog/mpc8xx_wdt.c
+++ b/drivers/watchdog/mpc8xx_wdt.c
@@ -11,6 +11,7 @@
 #include <asm/cpm_8xx.h>
 #include <asm/io.h>
 #include <asm/ppc.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 void hw_watchdog_reset(void)
diff --git a/drivers/watchdog/mt7621_wdt.c b/drivers/watchdog/mt7621_wdt.c
index ff5c3243ce73..d033d95b6f5f 100644
--- a/drivers/watchdog/mt7621_wdt.c
+++ b/drivers/watchdog/mt7621_wdt.c
@@ -14,6 +14,7 @@
 #include <wdt.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/watchdog/mtk_wdt.c b/drivers/watchdog/mtk_wdt.c
index a636cff354d8..2a38bef43ec6 100644
--- a/drivers/watchdog/mtk_wdt.c
+++ b/drivers/watchdog/mtk_wdt.c
@@ -12,6 +12,7 @@
 #include <wdt.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 #define MTK_WDT_MODE			0x00
 #define MTK_WDT_LENGTH			0x04
diff --git a/drivers/watchdog/omap_wdt.c b/drivers/watchdog/omap_wdt.c
index 9059a4c6105b..9d3896a5d990 100644
--- a/drivers/watchdog/omap_wdt.c
+++ b/drivers/watchdog/omap_wdt.c
@@ -46,6 +46,7 @@
 #include <wdt.h>
 #include <dm.h>
 #include <errno.h>
+#include <linux/errno.h>
 
 /* Hardware timeout in seconds */
 #define WDT_HW_TIMEOUT 60
diff --git a/drivers/watchdog/orion_wdt.c b/drivers/watchdog/orion_wdt.c
index 3284321299d0..804a76811070 100644
--- a/drivers/watchdog/orion_wdt.c
+++ b/drivers/watchdog/orion_wdt.c
@@ -19,6 +19,7 @@
 #include <wdt.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/kernel.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
diff --git a/drivers/watchdog/stm32mp_wdt.c b/drivers/watchdog/stm32mp_wdt.c
index 89ce5588a37e..c45dbdc9bdbd 100644
--- a/drivers/watchdog/stm32mp_wdt.c
+++ b/drivers/watchdog/stm32mp_wdt.c
@@ -11,6 +11,7 @@
 #include <wdt.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 #include <linux/iopoll.h>
 #include <linux/printk.h>
 
diff --git a/drivers/watchdog/wdt-uclass.c b/drivers/watchdog/wdt-uclass.c
index 0ef303f1f2d1..e2791a0dba0d 100644
--- a/drivers/watchdog/wdt-uclass.c
+++ b/drivers/watchdog/wdt-uclass.c
@@ -14,6 +14,7 @@
 #include <asm/global_data.h>
 #include <dm/device-internal.h>
 #include <dm/lists.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/watchdog/xilinx_tb_wdt.c b/drivers/watchdog/xilinx_tb_wdt.c
index ea4311c8ce1a..5047cd045615 100644
--- a/drivers/watchdog/xilinx_tb_wdt.c
+++ b/drivers/watchdog/xilinx_tb_wdt.c
@@ -13,6 +13,7 @@
 #include <log.h>
 #include <wdt.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 
 #define XWT_CSR0_WRS_MASK	0x00000008 /* Reset status Mask */
diff --git a/drivers/watchdog/xilinx_wwdt.c b/drivers/watchdog/xilinx_wwdt.c
index d8a585a48306..a486e032624d 100644
--- a/drivers/watchdog/xilinx_wwdt.c
+++ b/drivers/watchdog/xilinx_wwdt.c
@@ -14,6 +14,7 @@
 #include <regmap.h>
 #include <wdt.h>
 #include <linux/compat.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 
 /* Refresh Register Masks */
diff --git a/env/common.c b/env/common.c
index 4df445eb2c4f..b8ac49cf4998 100644
--- a/env/common.c
+++ b/env/common.c
@@ -16,6 +16,7 @@
 #include <sort.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/stddef.h>
 #include <search.h>
diff --git a/env/env.c b/env/env.c
index c289af4c6a44..60c0295affbf 100644
--- a/env/env.c
+++ b/env/env.c
@@ -12,6 +12,7 @@
 #include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/bug.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/env/ext4.c b/env/ext4.c
index a51c7c6eff38..59ed02c0ca17 100644
--- a/env/ext4.c
+++ b/env/ext4.c
@@ -21,6 +21,7 @@
 #include <common.h>
 #include <part.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include <command.h>
diff --git a/env/fat.c b/env/fat.c
index e95af7e19d34..c4c09fee02be 100644
--- a/env/fat.c
+++ b/env/fat.c
@@ -19,6 +19,7 @@
 #include <mmc.h>
 #include <stdio.h>
 #include <asm/cache.h>
+#include <linux/errno.h>
 #include <linux/stddef.h>
 #include <linux/string.h>
 
diff --git a/env/mmc.c b/env/mmc.c
index 4afabf673653..63287ec398e9 100644
--- a/env/mmc.c
+++ b/env/mmc.c
@@ -9,6 +9,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include <command.h>
diff --git a/env/nand.c b/env/nand.c
index e8d226ee7153..730baf0095c1 100644
--- a/env/nand.c
+++ b/env/nand.c
@@ -19,6 +19,7 @@
 #include <env_internal.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/stddef.h>
 #include <malloc.h>
 #include <memalign.h>
diff --git a/env/remote.c b/env/remote.c
index 131ac83584fc..0d0261767944 100644
--- a/env/remote.c
+++ b/env/remote.c
@@ -10,6 +10,7 @@
 #include <env_internal.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/stddef.h>
 #include <u-boot/crc.h>
 
diff --git a/env/sata.c b/env/sata.c
index d88771b27e21..56109397d533 100644
--- a/env/sata.c
+++ b/env/sata.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <stdio.h>
+#include <linux/errno.h>
 
 #include <command.h>
 #include <env.h>
diff --git a/env/sf.c b/env/sf.c
index 077d82f8e77f..4bf67dcc8a9d 100644
--- a/env/sf.c
+++ b/env/sf.c
@@ -23,6 +23,7 @@
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <dm/device-internal.h>
+#include <linux/errno.h>
 #include <u-boot/crc.h>
 
 #ifndef CONFIG_SPL_BUILD
diff --git a/env/ubi.c b/env/ubi.c
index 12495776609b..da691f470c8e 100644
--- a/env/ubi.c
+++ b/env/ubi.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include <command.h>
diff --git a/fs/btrfs/btrfs.c b/fs/btrfs/btrfs.c
index de16217d0dd3..9b9f9b5ffa34 100644
--- a/fs/btrfs/btrfs.c
+++ b/fs/btrfs/btrfs.c
@@ -9,6 +9,7 @@
 #include <config.h>
 #include <malloc.h>
 #include <uuid.h>
+#include <linux/errno.h>
 #include <linux/time.h>
 
 struct btrfs_info btrfs_info;
diff --git a/fs/cbfs/cbfs.c b/fs/cbfs/cbfs.c
index 51a59030f60e..1b27320a7601 100644
--- a/fs/cbfs/cbfs.c
+++ b/fs/cbfs/cbfs.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <asm/byteorder.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 /* Offset of master header from the start of a coreboot ROM */
diff --git a/fs/ext4/ext4_common.c b/fs/ext4/ext4_common.c
index a6fbd5a971d7..c3ca193a1906 100644
--- a/fs/ext4/ext4_common.c
+++ b/fs/ext4/ext4_common.c
@@ -28,6 +28,7 @@
 #include <part.h>
 #include <stddef.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <linux/stat.h>
 #include <linux/string.h>
 #include <linux/time.h>
diff --git a/fs/ext4/ext4_journal.c b/fs/ext4/ext4_journal.c
index 9f1eb6ad9d1e..ad967d39f950 100644
--- a/fs/ext4/ext4_journal.c
+++ b/fs/ext4/ext4_journal.c
@@ -21,6 +21,7 @@
 #include <ext_common.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include "ext4_common.h"
 
diff --git a/fs/ext4/ext4_write.c b/fs/ext4/ext4_write.c
index 22bb845f8bf0..a38e0edd6a73 100644
--- a/fs/ext4/ext4_write.c
+++ b/fs/ext4/ext4_write.c
@@ -28,6 +28,7 @@
 #include <memalign.h>
 #include <part.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <linux/stat.h>
 #include <div64.h>
 #include <linux/string.h>
diff --git a/fs/ext4/ext4fs.c b/fs/ext4/ext4fs.c
index c004d5facbb2..8143079b8b01 100644
--- a/fs/ext4/ext4fs.c
+++ b/fs/ext4/ext4fs.c
@@ -29,6 +29,7 @@
 #include <part.h>
 #include <stdio.h>
 #include <uuid.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include "ext4_common.h"
 
diff --git a/fs/fat/fat.c b/fs/fat/fat.c
index a16896c8e087..e25416674b79 100644
--- a/fs/fat/fat.c
+++ b/fs/fat/fat.c
@@ -23,6 +23,7 @@
 #include <asm/cache.h>
 #include <linux/compiler.h>
 #include <linux/ctype.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 /*
diff --git a/fs/fat/fat_write.c b/fs/fat/fat_write.c
index bdc604038ad5..42ddb2857897 100644
--- a/fs/fat/fat_write.c
+++ b/fs/fat/fat_write.c
@@ -17,6 +17,7 @@
 #include <asm/cache.h>
 #include <linux/ctype.h>
 #include <div64.h>
+#include <linux/errno.h>
 #include <linux/math64.h>
 #include <linux/string.h>
 #include "fat.c"
diff --git a/fs/fs.c b/fs/fs.c
index b8ce3d8f266a..71dbad6103b5 100644
--- a/fs/fs.c
+++ b/fs/fs.c
@@ -25,6 +25,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <div64.h>
+#include <linux/errno.h>
 #include <linux/math64.h>
 #include <efi_loader.h>
 #include <squashfs.h>
diff --git a/fs/ubifs/debug.c b/fs/ubifs/debug.c
index 77178e0e28a0..07196c52e4f8 100644
--- a/fs/ubifs/debug.c
+++ b/fs/ubifs/debug.c
@@ -20,6 +20,7 @@
 #include <time.h>
 #include <vsprintf.h>
 #include <dm/devres.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/fs/ubifs/io.c b/fs/ubifs/io.c
index 57e0847464ce..4ef1381fc7d0 100644
--- a/fs/ubifs/io.c
+++ b/fs/ubifs/io.c
@@ -68,6 +68,7 @@
 #else
 #include <linux/compat.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #endif
 #include "ubifs.h"
diff --git a/fs/ubifs/log.c b/fs/ubifs/log.c
index 0c8671a88478..6e43a9c62b4b 100644
--- a/fs/ubifs/log.c
+++ b/fs/ubifs/log.c
@@ -19,6 +19,7 @@
 #include <log.h>
 #include <dm/devres.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #endif
 #include "ubifs.h"
diff --git a/fs/ubifs/lprops.c b/fs/ubifs/lprops.c
index 83e6b2d5df2c..b5ddde857c38 100644
--- a/fs/ubifs/lprops.c
+++ b/fs/ubifs/lprops.c
@@ -20,6 +20,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #endif
 #include "ubifs.h"
diff --git a/fs/ubifs/lpt_commit.c b/fs/ubifs/lpt_commit.c
index 583f113902ef..7c5f5d9a246e 100644
--- a/fs/ubifs/lpt_commit.c
+++ b/fs/ubifs/lpt_commit.c
@@ -23,6 +23,7 @@
 #include <linux/bitops.h>
 #include <linux/compat.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include "crc16.h"
diff --git a/fs/ubifs/orphan.c b/fs/ubifs/orphan.c
index 6aa2890ff05c..1d7b8b6a181f 100644
--- a/fs/ubifs/orphan.c
+++ b/fs/ubifs/orphan.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <dm/devres.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include "ubifs.h"
 
 /*
diff --git a/fs/ubifs/recovery.c b/fs/ubifs/recovery.c
index cf2b8a48b8a5..8d342766221d 100644
--- a/fs/ubifs/recovery.c
+++ b/fs/ubifs/recovery.c
@@ -43,6 +43,7 @@
 #include <u-boot/crc.h>
 #else
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #endif
 #include "ubifs.h"
diff --git a/fs/ubifs/replay.c b/fs/ubifs/replay.c
index 0862fe4ebf3b..248a80659257 100644
--- a/fs/ubifs/replay.c
+++ b/fs/ubifs/replay.c
@@ -25,6 +25,7 @@
 #include <dm/devres.h>
 #include <linux/compat.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #endif
 #include "ubifs.h"
diff --git a/fs/ubifs/scan.c b/fs/ubifs/scan.c
index 7a6e46df5d90..9332a61ff34a 100644
--- a/fs/ubifs/scan.c
+++ b/fs/ubifs/scan.c
@@ -20,6 +20,7 @@
 #include <log.h>
 #include <dm/devres.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #endif
 #include "ubifs.h"
 
diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c
index 62b03731f8d1..8f219ba85333 100644
--- a/fs/ubifs/super.c
+++ b/fs/ubifs/super.c
@@ -36,6 +36,7 @@
 #include <vsprintf.h>
 #include <linux/bitops.h>
 #include <linux/bug.h>
+#include <linux/errno.h>
 #include <linux/log2.h>
 #include <linux/printk.h>
 #include <linux/stat.h>
diff --git a/fs/ubifs/tnc.c b/fs/ubifs/tnc.c
index c8aef71d86a5..72bcd4227462 100644
--- a/fs/ubifs/tnc.c
+++ b/fs/ubifs/tnc.c
@@ -29,6 +29,7 @@
 #include <linux/bug.h>
 #include <linux/compat.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/stat.h>
 #include <linux/string.h>
 #endif
diff --git a/fs/ubifs/tnc_misc.c b/fs/ubifs/tnc_misc.c
index e4cd785b9f5f..659ff2e2ce2b 100644
--- a/fs/ubifs/tnc_misc.c
+++ b/fs/ubifs/tnc_misc.c
@@ -19,6 +19,7 @@
 #include <log.h>
 #include <dm/devres.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #endif
 #include "ubifs.h"
 
diff --git a/fs/ubifs/ubifs.c b/fs/ubifs/ubifs.c
index ab48f10310c6..e76839e098d8 100644
--- a/fs/ubifs/ubifs.c
+++ b/fs/ubifs/ubifs.c
@@ -20,6 +20,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include "ubifs.h"
 #include <part.h>
diff --git a/fs/yaffs2/yaffs_uboot_glue.c b/fs/yaffs2/yaffs_uboot_glue.c
index a3ff0044788c..62f034552e58 100644
--- a/fs/yaffs2/yaffs_uboot_glue.c
+++ b/fs/yaffs2/yaffs_uboot_glue.c
@@ -24,6 +24,7 @@
 #include <malloc.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/fs/yaffs2/yaffsfs.c b/fs/yaffs2/yaffsfs.c
index 5bf9350c8225..8f43d3ac0851 100644
--- a/fs/yaffs2/yaffsfs.c
+++ b/fs/yaffs2/yaffsfs.c
@@ -13,6 +13,7 @@
 
 #include <div64.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include "yaffsfs.h"
 #include "yaffs_guts.h"
diff --git a/fs/yaffs2/yportenv.h b/fs/yaffs2/yportenv.h
index 081391a1d0fe..607b7cc31cf2 100644
--- a/fs/yaffs2/yportenv.h
+++ b/fs/yaffs2/yportenv.h
@@ -18,6 +18,7 @@
 #define __YPORTENV_H__
 
 #include <linux/bug.h>
+#include <linux/errno.h>
 #include <linux/types.h>
 
 /* Definition of types */
diff --git a/include/acpi/acpi_s3.h b/include/acpi/acpi_s3.h
index baa848dcd15b..1dc568117bd3 100644
--- a/include/acpi/acpi_s3.h
+++ b/include/acpi/acpi_s3.h
@@ -6,6 +6,7 @@
 #ifndef __ASM_ACPI_S3_H__
 #define __ASM_ACPI_S3_H__
 
+#include <linux/errno.h>
 #define WAKEUP_BASE	0x600
 
 /* PM1_STATUS register */
diff --git a/include/board.h b/include/board.h
index a43f35a021b0..755a888e3382 100644
--- a/include/board.h
+++ b/include/board.h
@@ -4,6 +4,7 @@
  * Mario Six,  Guntermann & Drunck GmbH, mario.six at gdsys.cc
  */
 
+#include <linux/errno.h>
 struct udevice;
 
 /*
diff --git a/include/common.h b/include/common.h
index 2b7a422fbe19..4fa613216ef2 100644
--- a/include/common.h
+++ b/include/common.h
@@ -14,7 +14,6 @@
 
 #ifndef __ASSEMBLY__		/* put C only stuff in this section */
 #include <config.h>
-#include <errno.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
 #endif	/* __ASSEMBLY__ */
diff --git a/include/dfu.h b/include/dfu.h
index 436057e378ed..475b2a254d6b 100644
--- a/include/dfu.h
+++ b/include/dfu.h
@@ -12,6 +12,7 @@
 
 #include <common.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <linux/list.h>
 #include <mmc.h>
 #include <spi_flash.h>
diff --git a/include/dm/pinctrl.h b/include/dm/pinctrl.h
index 692e5fc8cbfa..f879901279db 100644
--- a/include/dm/pinctrl.h
+++ b/include/dm/pinctrl.h
@@ -6,6 +6,7 @@
 #ifndef __PINCTRL_H
 #define __PINCTRL_H
 
+#include <linux/errno.h>
 #define PINNAME_SIZE	10
 #define PINMUX_SIZE	40
 
diff --git a/include/dwc3-uboot.h b/include/dwc3-uboot.h
index e08530ec4e58..6c583e5e7b6c 100644
--- a/include/dwc3-uboot.h
+++ b/include/dwc3-uboot.h
@@ -10,6 +10,7 @@
 #define __DWC3_UBOOT_H_
 
 #include <generic-phy.h>
+#include <linux/errno.h>
 #include <linux/usb/otg.h>
 #include <linux/usb/phy.h>
 
diff --git a/include/eeprom.h b/include/eeprom.h
index 6820844cea3a..06f2a471657e 100644
--- a/include/eeprom.h
+++ b/include/eeprom.h
@@ -25,4 +25,5 @@ int eeprom_write(uint dev_addr, uint offset, uchar *buffer, uint cnt);
 # define CONFIG_SYS_DEF_EEPROM_ADDR CONFIG_SYS_I2C_EEPROM_ADDR
 #endif
 
+#include <linux/errno.h>
 #endif
diff --git a/include/hwspinlock.h b/include/hwspinlock.h
index 99389c13c24e..88a2868b70ec 100644
--- a/include/hwspinlock.h
+++ b/include/hwspinlock.h
@@ -12,6 +12,7 @@
  * critical sections and synchronisation between multiprocessors.
  */
 
+#include <linux/errno.h>
 struct udevice;
 
 /**
diff --git a/include/linux/soc/ti/ti_sci_protocol.h b/include/linux/soc/ti/ti_sci_protocol.h
index eb916ba10194..0d02ca82aef7 100644
--- a/include/linux/soc/ti/ti_sci_protocol.h
+++ b/include/linux/soc/ti/ti_sci_protocol.h
@@ -21,6 +21,7 @@
  * @firmware_description: Firmware description (not usually used).
  */
 #include <linux/bitops.h>
+#include <linux/errno.h>
 struct ti_sci_version_info {
 	u8 abi_major;
 	u8 abi_minor;
diff --git a/include/mipi_dsi.h b/include/mipi_dsi.h
index c8a7d3daefa1..33eae9fb6d00 100644
--- a/include/mipi_dsi.h
+++ b/include/mipi_dsi.h
@@ -17,6 +17,7 @@
 
 #include <mipi_display.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 struct mipi_dsi_host;
 struct mipi_dsi_device;
diff --git a/include/power-domain.h b/include/power-domain.h
index 72ff2ff25ba2..12945f078547 100644
--- a/include/power-domain.h
+++ b/include/power-domain.h
@@ -42,6 +42,7 @@
  * by which power domains are managed.
  */
 
+#include <linux/errno.h>
 struct udevice;
 
 /**
diff --git a/include/power/sandbox_pmic.h b/include/power/sandbox_pmic.h
index 1dbd15b52354..25cb95db84f9 100644
--- a/include/power/sandbox_pmic.h
+++ b/include/power/sandbox_pmic.h
@@ -7,6 +7,7 @@
 #ifndef _SANDBOX_PMIC_H_
 #define  _SANDBOX_PMIC_H_
 
+#include <linux/errno.h>
 #define SANDBOX_LDO_DRIVER		"sandbox_ldo"
 #define SANDBOX_OF_LDO_PREFIX		"ldo"
 #define SANDBOX_BUCK_DRIVER		"sandbox_buck"
diff --git a/include/regmap.h b/include/regmap.h
index bae96a6ef0bc..5a3f3dce02cc 100644
--- a/include/regmap.h
+++ b/include/regmap.h
@@ -9,6 +9,7 @@
 
 #include <time.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 /**
  * DOC: Overview
diff --git a/include/remoteproc.h b/include/remoteproc.h
index a903acb9b24f..92de5604a800 100644
--- a/include/remoteproc.h
+++ b/include/remoteproc.h
@@ -14,6 +14,7 @@
  * platforms have moved to dm/fdt.
  */
 #include <dm/platdata.h>	/* For platform data support - non dt world */
+#include <linux/errno.h>
 
 /**
  * enum rproc_mem_type - What type of memory model does the rproc use
diff --git a/include/soc.h b/include/soc.h
index a52a300a84a6..eda52d78cdf6 100644
--- a/include/soc.h
+++ b/include/soc.h
@@ -7,6 +7,7 @@
 #ifndef __SOC_H
 #define __SOC_H
 
+#include <linux/errno.h>
 #define SOC_MAX_STR_SIZE	128
 
 struct udevice;
diff --git a/include/spi_flash.h b/include/spi_flash.h
index e555495da610..2ee4dbb1322a 100644
--- a/include/spi_flash.h
+++ b/include/spi_flash.h
@@ -10,6 +10,7 @@
 #define _SPI_FLASH_H_
 
 #include <stdio.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/types.h>
 #include <linux/mtd/spi-nor.h>
diff --git a/include/splash.h b/include/splash.h
index 7fd2de8fea1d..8b70e4a8068b 100644
--- a/include/splash.h
+++ b/include/splash.h
@@ -23,6 +23,7 @@
 #define _SPLASH_H_
 
 #include <errno.h>
+#include <linux/errno.h>
 
 enum splash_storage {
 	SPLASH_STORAGE_NAND,
diff --git a/include/tlv_eeprom.h b/include/tlv_eeprom.h
index f7e130296a7f..99cefa61dfa5 100644
--- a/include/tlv_eeprom.h
+++ b/include/tlv_eeprom.h
@@ -8,6 +8,7 @@
 #define __TLV_EEPROM_H_
 
 #include <compiler.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 /*
diff --git a/include/u-boot/aes.h b/include/u-boot/aes.h
index 32281041de24..ee6863945095 100644
--- a/include/u-boot/aes.h
+++ b/include/u-boot/aes.h
@@ -8,6 +8,7 @@
 
 #include <errno.h>
 #include <image.h>
+#include <linux/errno.h>
 
 #if IMAGE_ENABLE_ENCRYPT
 int image_aes_encrypt(struct image_cipher_info *info,
diff --git a/include/u-boot/rsa.h b/include/u-boot/rsa.h
index bed1c097c2ce..6d5f50a0030b 100644
--- a/include/u-boot/rsa.h
+++ b/include/u-boot/rsa.h
@@ -13,6 +13,7 @@
 
 #include <errno.h>
 #include <image.h>
+#include <linux/errno.h>
 
 /**
  * struct rsa_public_key - holder for a public key
diff --git a/lib/acpi/acpi_device.c b/lib/acpi/acpi_device.c
index f891f3ade90b..9e31a69c20f9 100644
--- a/lib/acpi/acpi_device.c
+++ b/lib/acpi/acpi_device.c
@@ -17,6 +17,7 @@
 #include <acpi/acpigen.h>
 #include <asm-generic/gpio.h>
 #include <dm/acpi.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 /**
diff --git a/lib/acpi/acpi_dp.c b/lib/acpi/acpi_dp.c
index 194e79d7d038..87e7bc4313b8 100644
--- a/lib/acpi/acpi_dp.c
+++ b/lib/acpi/acpi_dp.c
@@ -14,6 +14,7 @@
 #include <acpi/acpigen.h>
 #include <acpi/acpi_dp.h>
 #include <dm/acpi.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 static void acpi_dp_write_array(struct acpi_ctx *ctx,
diff --git a/lib/acpi/acpi_table.c b/lib/acpi/acpi_table.c
index d6abb6068a6b..0f6cb8728cd8 100644
--- a/lib/acpi/acpi_table.c
+++ b/lib/acpi/acpi_table.c
@@ -15,6 +15,7 @@
 #include <acpi/acpi_table.h>
 #include <asm/global_data.h>
 #include <dm/acpi.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 int acpi_create_dmar(struct acpi_dmar *dmar, enum dmar_flags flags)
diff --git a/lib/acpi/acpigen.c b/lib/acpi/acpigen.c
index 0906b1d30306..f119de2bca6d 100644
--- a/lib/acpi/acpigen.c
+++ b/lib/acpi/acpigen.c
@@ -16,6 +16,7 @@
 #include <acpi/acpi_device.h>
 #include <acpi/acpi_table.h>
 #include <dm/acpi.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 u8 *acpigen_get_current(struct acpi_ctx *ctx)
diff --git a/lib/aes/aes-decrypt.c b/lib/aes/aes-decrypt.c
index 09fdf38df63a..3b01d1c8cbb5 100644
--- a/lib/aes/aes-decrypt.c
+++ b/lib/aes/aes-decrypt.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <malloc.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #endif
 #include <image.h>
diff --git a/lib/bch.c b/lib/bch.c
index 7f82cef242b0..578f4191309c 100644
--- a/lib/bch.c
+++ b/lib/bch.c
@@ -59,6 +59,7 @@
 #include <malloc.h>
 #include <ubi_uboot.h>
 #include <dm/devres.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #include <linux/bitops.h>
diff --git a/lib/binman.c b/lib/binman.c
index 7a8ad62c4a8c..f6c2d0a64321 100644
--- a/lib/binman.c
+++ b/lib/binman.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <mapmem.h>
+#include <linux/errno.h>
 
 /**
  * struct binman_info - Information needed by the binman library
diff --git a/lib/crypto/asymmetric_type.c b/lib/crypto/asymmetric_type.c
index 24c2d15ef97a..46d0dd468e5c 100644
--- a/lib/crypto/asymmetric_type.c
+++ b/lib/crypto/asymmetric_type.c
@@ -18,6 +18,7 @@
 #include <linux/compat.h>
 #include <linux/ctype.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #else
diff --git a/lib/crypto/pkcs7_parser.c b/lib/crypto/pkcs7_parser.c
index d5efa828d6aa..3cb13fae86d7 100644
--- a/lib/crypto/pkcs7_parser.c
+++ b/lib/crypto/pkcs7_parser.c
@@ -11,6 +11,7 @@
 #include <dm/devres.h>
 #include <linux/bitops.h>
 #include <linux/compat.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #endif
 #include <linux/kernel.h>
diff --git a/lib/crypto/pkcs7_verify.c b/lib/crypto/pkcs7_verify.c
index 5ca268ee00cc..2d9113fd2e05 100644
--- a/lib/crypto/pkcs7_verify.c
+++ b/lib/crypto/pkcs7_verify.c
@@ -15,6 +15,7 @@
 #include <linux/bitops.h>
 #include <linux/compat.h>
 #include <linux/asn1.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include <u-boot/rsa-checksum.h>
diff --git a/lib/crypto/public_key.c b/lib/crypto/public_key.c
index 54078471bec7..be5e722a83d4 100644
--- a/lib/crypto/public_key.c
+++ b/lib/crypto/public_key.c
@@ -14,6 +14,7 @@
 #include <linux/bug.h>
 #include <linux/compat.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #else
diff --git a/lib/crypto/rsa_helper.c b/lib/crypto/rsa_helper.c
index c941d40fd7a8..acea8b262132 100644
--- a/lib/crypto/rsa_helper.c
+++ b/lib/crypto/rsa_helper.c
@@ -15,6 +15,7 @@
 #include <linux/fips.h>
 #endif
 #include <crypto/internal/rsa.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include "rsapubkey.asn1.h"
 #ifndef __UBOOT__
diff --git a/lib/crypto/x509_cert_parser.c b/lib/crypto/x509_cert_parser.c
index a0f0689118f6..909190c8af8a 100644
--- a/lib/crypto/x509_cert_parser.c
+++ b/lib/crypto/x509_cert_parser.c
@@ -8,6 +8,7 @@
 #define pr_fmt(fmt) "X.509: "fmt
 #include <log.h>
 #include <dm/devres.h>
+#include <linux/errno.h>
 #include <linux/kernel.h>
 #ifndef __UBOOT__
 #include <linux/export.h>
diff --git a/lib/efi/efi_app.c b/lib/efi/efi_app.c
index c1796f83a59a..046ca411e42e 100644
--- a/lib/efi/efi_app.c
+++ b/lib/efi/efi_app.c
@@ -18,6 +18,7 @@
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/types.h>
 #include <efi.h>
diff --git a/lib/efi/efi_info.c b/lib/efi/efi_info.c
index 4d78923c4d40..6ba042f6894a 100644
--- a/lib/efi/efi_info.c
+++ b/lib/efi/efi_info.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <mapmem.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 
 int efi_info_get(enum efi_entry_t type, void **datap, int *sizep)
 {
diff --git a/lib/efi/efi_stub.c b/lib/efi/efi_stub.c
index 97a709904dfb..ef8b80a46257 100644
--- a/lib/efi/efi_stub.c
+++ b/lib/efi/efi_stub.c
@@ -20,6 +20,7 @@
 #include <asm/cpu.h>
 #include <asm/io.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/types.h>
 
diff --git a/lib/efi_driver/efi_block_device.c b/lib/efi_driver/efi_block_device.c
index 98600db09dcb..3ac3a94ab03e 100644
--- a/lib/efi_driver/efi_block_device.c
+++ b/lib/efi_driver/efi_block_device.c
@@ -36,6 +36,7 @@
 #include <vsprintf.h>
 #include <dm/device-internal.h>
 #include <dm/root.h>
+#include <linux/errno.h>
 
 /*
  * EFI attributes of the udevice handled by this driver.
diff --git a/lib/efi_loader/efi_variable_tee.c b/lib/efi_loader/efi_variable_tee.c
index 08f7c95e37bf..c1f88c28244f 100644
--- a/lib/efi_loader/efi_variable_tee.c
+++ b/lib/efi_loader/efi_variable_tee.c
@@ -14,6 +14,7 @@
 #include <tee.h>
 #include <malloc.h>
 #include <mm_communication.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 #define OPTEE_PAGE_SIZE BIT(12)
diff --git a/lib/errno_str.c b/lib/errno_str.c
index 2e5f4a887d5b..d342ed70b603 100644
--- a/lib/errno_str.c
+++ b/lib/errno_str.c
@@ -6,6 +6,7 @@
  */
 #include <common.h>
 #include <errno.h>
+#include <linux/errno.h>
 
 #define ERRNO_MSG(errno, msg)	msg
 #define SAME_AS(x)		(const char *)&errno_message[x]
diff --git a/lib/fdtdec.c b/lib/fdtdec.c
index faf7be634f39..3ac889ba730e 100644
--- a/lib/fdtdec.c
+++ b/lib/fdtdec.c
@@ -23,6 +23,7 @@
 #include <fdt_support.h>
 #include <gzip.h>
 #include <mapmem.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <serial.h>
 #include <asm/global_data.h>
diff --git a/lib/list_sort.c b/lib/list_sort.c
index 44d85ff43fee..0c0605285041 100644
--- a/lib/list_sort.c
+++ b/lib/list_sort.c
@@ -8,6 +8,7 @@
 #include <linux/compat.h>
 #include <common.h>
 #include <malloc.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #endif
diff --git a/lib/lz4_wrapper.c b/lib/lz4_wrapper.c
index edce13da6bde..c5ebe9624619 100644
--- a/lib/lz4_wrapper.c
+++ b/lib/lz4_wrapper.c
@@ -7,6 +7,7 @@
 #include <compiler.h>
 #include <image.h>
 #include <lz4.h>
+#include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/types.h>
diff --git a/lib/membuff.c b/lib/membuff.c
index b0fc716a04be..6abac4114f96 100644
--- a/lib/membuff.c
+++ b/lib/membuff.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <log.h>
 #include <malloc.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include "membuff.h"
 
diff --git a/lib/of_live.c b/lib/of_live.c
index c27a7a6e24fe..fd83a6ba420f 100644
--- a/lib/of_live.c
+++ b/lib/of_live.c
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <of_live.h>
 #include <malloc.h>
diff --git a/lib/optee/optee.c b/lib/optee/optee.c
index c902eee3bc44..8493ca6c6211 100644
--- a/lib/optee/optee.c
+++ b/lib/optee/optee.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <linux/string.h>
 #include <tee/optee.h>
diff --git a/lib/rsa/rsa-keyprop.c b/lib/rsa/rsa-keyprop.c
index 4114e33d36e0..e5ece6152451 100644
--- a/lib/rsa/rsa-keyprop.c
+++ b/lib/rsa/rsa-keyprop.c
@@ -14,6 +14,7 @@
 #include <malloc.h>
 #include <asm/byteorder.h>
 #include <crypto/internal/rsa.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <u-boot/rsa-mod-exp.h>
 
diff --git a/lib/strto.c b/lib/strto.c
index e6f69b31e478..9636c797ea5a 100644
--- a/lib/strto.c
+++ b/lib/strto.c
@@ -13,6 +13,7 @@
 #include <errno.h>
 #include <vsprintf.h>
 #include <linux/ctype.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 /* from lib/kstrtox.c */
diff --git a/lib/trace.c b/lib/trace.c
index 37f53dad235b..8ab4258b35a9 100644
--- a/lib/trace.c
+++ b/lib/trace.c
@@ -12,6 +12,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/sections.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/lib/uuid.c b/lib/uuid.c
index 91f99bcb5ff0..3a6cd7e87fda 100644
--- a/lib/uuid.c
+++ b/lib/uuid.c
@@ -17,6 +17,7 @@
 #include <asm/io.h>
 #include <part_efi.h>
 #include <malloc.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 /*
diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index 18d4bc5a27bc..7be3127c2a10 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -24,6 +24,7 @@
 #include <vsprintf.h>
 #include <linux/ctype.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/types.h>
 #include <linux/string.h>
 
diff --git a/net/eth-uclass.c b/net/eth-uclass.c
index 9af7971fc492..a20b896170cd 100644
--- a/net/eth-uclass.c
+++ b/net/eth-uclass.c
@@ -16,6 +16,7 @@
 #include <asm/global_data.h>
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <net/pcap.h>
 #include "eth_internal.h"
diff --git a/net/mdio-mux-uclass.c b/net/mdio-mux-uclass.c
index 6674eb6bee78..1325484e0d99 100644
--- a/net/mdio-mux-uclass.c
+++ b/net/mdio-mux-uclass.c
@@ -11,6 +11,7 @@
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
 #include <dm/lists.h>
+#include <linux/errno.h>
 
 #define MDIO_MUX_CHILD_DRV_NAME	"mdio-mux-bus-drv"
 
diff --git a/net/mdio-uclass.c b/net/mdio-uclass.c
index 1c9ce801dc86..3e39a9b74f88 100644
--- a/net/mdio-uclass.c
+++ b/net/mdio-uclass.c
@@ -13,6 +13,7 @@
 #include <dm/device_compat.h>
 #include <dm/uclass-internal.h>
 #include <linux/compat.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 
 /* DT node properties for MAC-PHY interface */
diff --git a/net/net.c b/net/net.c
index 1aa977d00879..c05117cf6b61 100644
--- a/net/net.c
+++ b/net/net.c
@@ -100,6 +100,7 @@
 #include <stdio.h>
 #include <time.h>
 #include <vsprintf.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <net/fastboot.h>
 #include <net/tftp.h>
diff --git a/net/pcap.c b/net/pcap.c
index 31cfc1ca8481..907aa1cda095 100644
--- a/net/pcap.c
+++ b/net/pcap.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <net.h>
 #include <stdio.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <net/pcap.h>
 #include <time.h>
diff --git a/test/bloblist.c b/test/bloblist.c
index b93e2713dfd3..19b8f65b81b9 100644
--- a/test/bloblist.c
+++ b/test/bloblist.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <mapmem.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <test/suites.h>
 #include <test/test.h>
 #include <test/ut.h>
diff --git a/test/dm/acpi.c b/test/dm/acpi.c
index 9ded00ad168f..003b0f4ca979 100644
--- a/test/dm/acpi.c
+++ b/test/dm/acpi.c
@@ -20,6 +20,7 @@
 #include <asm/global_data.h>
 #include <dm/acpi.h>
 #include <dm/test.h>
+#include <linux/errno.h>
 #include <test/ut.h>
 #include "acpi.h"
 
diff --git a/test/dm/acpi_dp.c b/test/dm/acpi_dp.c
index e0fa61263c8a..ce96441faa5a 100644
--- a/test/dm/acpi_dp.c
+++ b/test/dm/acpi_dp.c
@@ -14,6 +14,7 @@
 #include <asm/unaligned.h>
 #include <dm/acpi.h>
 #include <dm/test.h>
+#include <linux/errno.h>
 #include <test/ut.h>
 #include "acpi.h"
 
diff --git a/test/dm/acpigen.c b/test/dm/acpigen.c
index 1b2767e732d3..51c846081f90 100644
--- a/test/dm/acpigen.c
+++ b/test/dm/acpigen.c
@@ -18,6 +18,7 @@
 #include <dm/acpi.h>
 #include <dm/test.h>
 #include <dm/uclass-internal.h>
+#include <linux/errno.h>
 #include <test/ut.h>
 #include "acpi.h"
 
diff --git a/test/dm/adc.c b/test/dm/adc.c
index 8c6e4b0604e9..c28121389932 100644
--- a/test/dm/adc.c
+++ b/test/dm/adc.c
@@ -14,6 +14,7 @@
 #include <dm/test.h>
 #include <errno.h>
 #include <fdtdec.h>
+#include <linux/errno.h>
 #include <power/regulator.h>
 #include <power/sandbox_pmic.h>
 #include <sandbox-adc.h>
diff --git a/test/dm/blk.c b/test/dm/blk.c
index c2634d0a0167..db7cea932df3 100644
--- a/test/dm/blk.c
+++ b/test/dm/blk.c
@@ -12,6 +12,7 @@
 #include <asm/state.h>
 #include <dm/test.h>
 #include <test/test.h>
+#include <linux/errno.h>
 #include <test/ut.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/test/dm/bus.c b/test/dm/bus.c
index 3808305f24fe..b81f429ffad5 100644
--- a/test/dm/bus.c
+++ b/test/dm/bus.c
@@ -16,6 +16,7 @@
 #include <dm/uclass-internal.h>
 #include <dm/util.h>
 #include <test/test.h>
+#include <linux/errno.h>
 #include <test/ut.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/test/dm/button.c b/test/dm/button.c
index 911780173657..3497a11041ca 100644
--- a/test/dm/button.c
+++ b/test/dm/button.c
@@ -10,6 +10,7 @@
 #include <button.h>
 #include <asm/gpio.h>
 #include <dm/test.h>
+#include <linux/errno.h>
 #include <test/ut.h>
 
 /* Base test of the button uclass */
diff --git a/test/dm/core.c b/test/dm/core.c
index cac3c00cd433..7f45bc506ea4 100644
--- a/test/dm/core.c
+++ b/test/dm/core.c
@@ -19,6 +19,7 @@
 #include <dm/test.h>
 #include <dm/uclass-internal.h>
 #include <test/test.h>
+#include <linux/errno.h>
 #include <test/ut.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/test/dm/eth.c b/test/dm/eth.c
index fa8a69da7013..48142c8117a1 100644
--- a/test/dm/eth.c
+++ b/test/dm/eth.c
@@ -18,6 +18,7 @@
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
 #include <test/test.h>
+#include <linux/errno.h>
 #include <test/ut.h>
 
 #define DM_TEST_ETH_NUM		4
diff --git a/test/dm/gpio.c b/test/dm/gpio.c
index 4848152644aa..8abf8c7964ed 100644
--- a/test/dm/gpio.c
+++ b/test/dm/gpio.c
@@ -14,6 +14,7 @@
 #include <dm/test.h>
 #include <dm/util.h>
 #include <test/test.h>
+#include <linux/errno.h>
 #include <test/ut.h>
 
 /* Test that sandbox GPIOs work correctly */
diff --git a/test/dm/i2c.c b/test/dm/i2c.c
index 681ce45107c3..6ca1c24089ad 100644
--- a/test/dm/i2c.c
+++ b/test/dm/i2c.c
@@ -16,6 +16,7 @@
 #include <dm/uclass-internal.h>
 #include <dm/util.h>
 #include <hexdump.h>
+#include <linux/errno.h>
 #include <test/test.h>
 #include <test/ut.h>
 
diff --git a/test/dm/irq.c b/test/dm/irq.c
index 51dd5e4abb41..14bb2e9aee2c 100644
--- a/test/dm/irq.c
+++ b/test/dm/irq.c
@@ -11,6 +11,7 @@
 #include <acpi/acpi_device.h>
 #include <asm/test.h>
 #include <dm/test.h>
+#include <linux/errno.h>
 #include <test/ut.h>
 
 /* Base test of the irq uclass */
diff --git a/test/dm/k210_pll.c b/test/dm/k210_pll.c
index 54764f269c58..94740ce09261 100644
--- a/test/dm/k210_pll.c
+++ b/test/dm/k210_pll.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <linux/errno.h>
 /* For DIV_ROUND_DOWN_ULL, defined in linux/kernel.h */
 #include <div64.h>
 #include <dm/test.h>
diff --git a/test/dm/led.c b/test/dm/led.c
index 8b587d0a22a8..4d044a1194dc 100644
--- a/test/dm/led.c
+++ b/test/dm/led.c
@@ -8,6 +8,7 @@
 #include <led.h>
 #include <asm/gpio.h>
 #include <dm/test.h>
+#include <linux/errno.h>
 #include <test/test.h>
 #include <test/ut.h>
 
diff --git a/test/dm/mailbox.c b/test/dm/mailbox.c
index 7ad8a1cbba28..60e1c9fd8548 100644
--- a/test/dm/mailbox.c
+++ b/test/dm/mailbox.c
@@ -8,6 +8,7 @@
 #include <malloc.h>
 #include <dm/test.h>
 #include <asm/mbox.h>
+#include <linux/errno.h>
 #include <test/test.h>
 #include <test/ut.h>
 
diff --git a/test/dm/nop.c b/test/dm/nop.c
index 2cd92c52402e..32e2d46f4fe7 100644
--- a/test/dm/nop.c
+++ b/test/dm/nop.c
@@ -13,6 +13,7 @@
 #include <dm/device.h>
 #include <dm/test.h>
 #include <misc.h>
+#include <linux/errno.h>
 #include <test/test.h>
 #include <test/ut.h>
 
diff --git a/test/dm/pch.c b/test/dm/pch.c
index 53f7bbf180c9..eeb1c7f2a1f4 100644
--- a/test/dm/pch.c
+++ b/test/dm/pch.c
@@ -8,6 +8,7 @@
 #include <pch.h>
 #include <asm/test.h>
 #include <dm/test.h>
+#include <linux/errno.h>
 #include <test/test.h>
 #include <test/ut.h>
 
diff --git a/test/dm/phy.c b/test/dm/phy.c
index 75d05a14c030..a9e1964520d7 100644
--- a/test/dm/phy.c
+++ b/test/dm/phy.c
@@ -9,6 +9,7 @@
 #include <generic-phy.h>
 #include <log.h>
 #include <dm/test.h>
+#include <linux/errno.h>
 #include <test/test.h>
 #include <test/ut.h>
 
diff --git a/test/dm/pwm.c b/test/dm/pwm.c
index 0de6dba1ba64..fc4fd29fea37 100644
--- a/test/dm/pwm.c
+++ b/test/dm/pwm.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <pwm.h>
 #include <dm/test.h>
+#include <linux/errno.h>
 #include <test/test.h>
 #include <test/ut.h>
 
diff --git a/test/dm/regmap.c b/test/dm/regmap.c
index 16dd9b1eaff1..271ec80e57fc 100644
--- a/test/dm/regmap.c
+++ b/test/dm/regmap.c
@@ -13,6 +13,7 @@
 #include <asm/test.h>
 #include <dm/test.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <test/test.h>
 #include <test/ut.h>
 
diff --git a/test/dm/regulator.c b/test/dm/regulator.c
index 0e7a232a7081..f713fb8c34fd 100644
--- a/test/dm/regulator.c
+++ b/test/dm/regulator.c
@@ -17,6 +17,7 @@
 #include <dm/util.h>
 #include <dm/test.h>
 #include <dm/uclass-internal.h>
+#include <linux/errno.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/sandbox_pmic.h>
diff --git a/test/dm/remoteproc.c b/test/dm/remoteproc.c
index 1cc07bc80832..d45deec0a0ed 100644
--- a/test/dm/remoteproc.c
+++ b/test/dm/remoteproc.c
@@ -10,6 +10,7 @@
 #include <remoteproc.h>
 #include <asm/io.h>
 #include <dm/test.h>
+#include <linux/errno.h>
 #include <test/test.h>
 #include <test/ut.h>
 
diff --git a/test/dm/rtc.c b/test/dm/rtc.c
index 2ef8ff724e78..69f712752359 100644
--- a/test/dm/rtc.c
+++ b/test/dm/rtc.c
@@ -15,6 +15,7 @@
 #include <asm/rtc.h>
 #include <asm/test.h>
 #include <dm/test.h>
+#include <linux/errno.h>
 #include <test/test.h>
 #include <test/ut.h>
 
diff --git a/test/dm/serial.c b/test/dm/serial.c
index 0662b5f09b8b..e73f9ea7fa9b 100644
--- a/test/dm/serial.c
+++ b/test/dm/serial.c
@@ -8,6 +8,7 @@
 #include <serial.h>
 #include <dm.h>
 #include <dm/test.h>
+#include <linux/errno.h>
 #include <test/test.h>
 #include <test/ut.h>
 
diff --git a/test/dm/sound.c b/test/dm/sound.c
index b73f6ab1113e..7088906a9970 100644
--- a/test/dm/sound.c
+++ b/test/dm/sound.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <sound.h>
 #include <dm/test.h>
+#include <linux/errno.h>
 #include <test/ut.h>
 #include <test/test.h>
 #include <asm/test.h>
diff --git a/test/dm/spi.c b/test/dm/spi.c
index fb180aed1f08..0f09dcdb5526 100644
--- a/test/dm/spi.c
+++ b/test/dm/spi.c
@@ -13,6 +13,7 @@
 #include <dm/test.h>
 #include <dm/uclass-internal.h>
 #include <dm/util.h>
+#include <linux/errno.h>
 #include <test/test.h>
 #include <test/ut.h>
 
diff --git a/test/dm/syscon-reset.c b/test/dm/syscon-reset.c
index eeaddf88392c..8f84d17b4926 100644
--- a/test/dm/syscon-reset.c
+++ b/test/dm/syscon-reset.c
@@ -9,6 +9,7 @@
 #include <regmap.h>
 #include <reset.h>
 #include <syscon.h>
+#include <linux/errno.h>
 #include <test/ut.h>
 #include <asm/test.h>
 #include <linux/bitops.h>
diff --git a/test/dm/syscon.c b/test/dm/syscon.c
index be2329723362..ad9fb49fe1fd 100644
--- a/test/dm/syscon.c
+++ b/test/dm/syscon.c
@@ -11,6 +11,7 @@
 #include <asm/test.h>
 #include <dm/test.h>
 #include <linux/err.h>
+#include <linux/errno.h>
 #include <test/test.h>
 #include <test/ut.h>
 
diff --git a/test/dm/sysreset.c b/test/dm/sysreset.c
index aec97b1cbb10..50cd64efe43d 100644
--- a/test/dm/sysreset.c
+++ b/test/dm/sysreset.c
@@ -9,6 +9,7 @@
 #include <asm/state.h>
 #include <asm/test.h>
 #include <dm/test.h>
+#include <linux/errno.h>
 #include <test/test.h>
 #include <test/ut.h>
 
diff --git a/test/dm/tee.c b/test/dm/tee.c
index ddbdcfb0cff1..2f786324df55 100644
--- a/test/dm/tee.c
+++ b/test/dm/tee.c
@@ -10,6 +10,7 @@
 #include <dm/test.h>
 #include <sandboxtee.h>
 #include <tee.h>
+#include <linux/errno.h>
 #include <test/test.h>
 #include <test/ut.h>
 #include <tee/optee_ta_avb.h>
diff --git a/test/dm/test-driver.c b/test/dm/test-driver.c
index 08bdf011946f..0cc12849fb31 100644
--- a/test/dm/test-driver.c
+++ b/test/dm/test-driver.c
@@ -13,6 +13,7 @@
 #include <malloc.h>
 #include <asm/io.h>
 #include <dm/test.h>
+#include <linux/errno.h>
 #include <test/test.h>
 #include <test/ut.h>
 
diff --git a/test/dm/test-fdt.c b/test/dm/test-fdt.c
index 0dc824b938e7..6a83b5bc36d1 100644
--- a/test/dm/test-fdt.c
+++ b/test/dm/test-fdt.c
@@ -20,6 +20,7 @@
 #include <dm/util.h>
 #include <dm/lists.h>
 #include <dm/of_access.h>
+#include <linux/errno.h>
 #include <test/test.h>
 #include <test/ut.h>
 
diff --git a/test/dm/test-uclass.c b/test/dm/test-uclass.c
index 760731b06675..98374328d81a 100644
--- a/test/dm/test-uclass.c
+++ b/test/dm/test-uclass.c
@@ -13,6 +13,7 @@
 #include <errno.h>
 #include <asm/io.h>
 #include <dm/test.h>
+#include <linux/errno.h>
 #include <linux/list.h>
 #include <test/test.h>
 #include <test/ut.h>
diff --git a/test/dm/usb.c b/test/dm/usb.c
index 7ad280f215ce..345111775bef 100644
--- a/test/dm/usb.c
+++ b/test/dm/usb.c
@@ -15,6 +15,7 @@
 #include <dm/device-internal.h>
 #include <dm/test.h>
 #include <dm/uclass-internal.h>
+#include <linux/errno.h>
 #include <test/test.h>
 #include <test/ut.h>
 
diff --git a/test/dm/video.c b/test/dm/video.c
index 1af948dca3e1..f9bd904b070b 100644
--- a/test/dm/video.c
+++ b/test/dm/video.c
@@ -15,6 +15,7 @@
 #include <video_console.h>
 #include <dm/test.h>
 #include <dm/uclass-internal.h>
+#include <linux/errno.h>
 #include <test/test.h>
 #include <test/ut.h>
 
diff --git a/test/dm/virtio.c b/test/dm/virtio.c
index 2e876c36e43f..f7a28a649493 100644
--- a/test/dm/virtio.c
+++ b/test/dm/virtio.c
@@ -12,6 +12,7 @@
 #include <dm/root.h>
 #include <dm/test.h>
 #include <dm/uclass-internal.h>
+#include <linux/errno.h>
 #include <test/test.h>
 #include <test/ut.h>
 
diff --git a/test/env/attr.c b/test/env/attr.c
index 8d5c0f1c3df4..64eb14475e8e 100644
--- a/test/env/attr.c
+++ b/test/env/attr.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <command.h>
 #include <env_attr.h>
+#include <linux/errno.h>
 #include <test/env.h>
 #include <test/ut.h>
 
diff --git a/test/lib/test_errno_str.c b/test/lib/test_errno_str.c
index 8a9f1fd9805a..1a02e712048b 100644
--- a/test/lib/test_errno_str.c
+++ b/test/lib/test_errno_str.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <command.h>
 #include <errno.h>
+#include <linux/errno.h>
 #include <test/lib.h>
 #include <test/test.h>
 #include <test/ut.h>
diff --git a/test/optee/cmd_ut_optee.c b/test/optee/cmd_ut_optee.c
index 9fa4c91e0dd0..9153d7159188 100644
--- a/test/optee/cmd_ut_optee.c
+++ b/test/optee/cmd_ut_optee.c
@@ -9,6 +9,7 @@
 #include <fdt_support.h>
 #include <log.h>
 #include <malloc.h>
+#include <linux/errno.h>
 #include <tee/optee.h>
 
 #include <linux/sizes.h>
diff --git a/test/overlay/cmd_ut_overlay.c b/test/overlay/cmd_ut_overlay.c
index c001fb183fe8..ee8c4944e401 100644
--- a/test/overlay/cmd_ut_overlay.c
+++ b/test/overlay/cmd_ut_overlay.c
@@ -11,6 +11,7 @@
 #include <image.h>
 #include <log.h>
 #include <malloc.h>
+#include <linux/errno.h>
 
 #include <linux/sizes.h>
 
diff --git a/test/time_ut.c b/test/time_ut.c
index 701b6cb4a7ed..1670c5d2184b 100644
--- a/test/time_ut.c
+++ b/test/time_ut.c
@@ -10,6 +10,7 @@
 #include <stdio.h>
 #include <time.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 
 static int test_get_timer(void)
 {
-- 
2.17.1

^ permalink raw reply related	[flat|nested] 35+ messages in thread

* [RFCv2 12/16] common: Drop linux/kernel.h from common header
  2020-08-19 13:08 ` [RFCv2] common: Drop remaining includes in common.h Tom Rini
                     ` (10 preceding siblings ...)
  2020-08-19 13:09   ` [RFCv2 11/16] common: Drop errno.h " Tom Rini
@ 2020-08-19 13:09   ` Tom Rini
  2020-08-19 13:09   ` [RFCv2 13/16] common: Drop linux/types.h " Tom Rini
                     ` (4 subsequent siblings)
  16 siblings, 0 replies; 35+ messages in thread
From: Tom Rini @ 2020-08-19 13:09 UTC (permalink / raw)
  To: u-boot

From: Simon Glass <sjg@chromium.org>

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

Signed-off-by: Simon Glass <sjg@chromium.org>
---
 arch/arc/lib/cpu.c                                      | 1 +
 arch/arm/cpu/arm1136/mx31/generic.c                     | 1 +
 arch/arm/cpu/arm926ejs/mx25/generic.c                   | 1 +
 arch/arm/cpu/arm926ejs/mx27/generic.c                   | 1 +
 arch/arm/cpu/arm926ejs/mxs/spl_boot.c                   | 1 +
 arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c               | 1 +
 arch/arm/cpu/arm926ejs/mxs/spl_power_init.c             | 1 +
 arch/arm/cpu/arm926ejs/spear/spear600.c                 | 1 +
 arch/arm/cpu/armv7/bcm235xx/clk-bcm235xx.c              | 1 +
 arch/arm/cpu/armv7/bcm235xx/clk-core.c                  | 1 +
 arch/arm/cpu/armv7/bcm235xx/clk-core.h                  | 1 +
 arch/arm/cpu/armv7/bcm281xx/clk-bcm281xx.c              | 1 +
 arch/arm/cpu/armv7/bcm281xx/clk-core.c                  | 1 +
 arch/arm/cpu/armv7/bcm281xx/clk-core.h                  | 1 +
 arch/arm/cpu/armv7/exception_level.c                    | 1 +
 arch/arm/cpu/armv7/kona-common/clk-stubs.c              | 1 +
 arch/arm/cpu/armv7/ls102xa/cpu.c                        | 1 +
 arch/arm/cpu/armv7/ls102xa/fdt.c                        | 1 +
 arch/arm/cpu/armv7/ls102xa/ls102xa_serdes.c             | 1 +
 arch/arm/cpu/armv7/ls102xa/soc.c                        | 1 +
 arch/arm/cpu/armv7/sunxi/psci.c                         | 1 +
 arch/arm/cpu/armv7/virt-v7.c                            | 1 +
 arch/arm/cpu/armv8/cache_v8.c                           | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/cpu.c                 | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c    | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/icid.c                | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/ls1012a_serdes.c      | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/ls1028_ids.c          | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/ls1028a_serdes.c      | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/ls1043_ids.c          | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/ls1043a_serdes.c      | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/ls1046_ids.c          | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/ls1046a_serdes.c      | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/ls1088_ids.c          | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/ls1088a_serdes.c      | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/ls2080a_serdes.c      | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/ls2088_ids.c          | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/lx2160_ids.c          | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/lx2160a_serdes.c      | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/mp.c                  | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/ppa.c                 | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/soc.c                 | 1 +
 arch/arm/cpu/armv8/fwcall.c                             | 1 +
 arch/arm/include/asm/arch-fsl-layerscape/fsl_icid.h     | 1 +
 arch/arm/include/asm/arch-fsl-layerscape/soc.h          | 1 +
 arch/arm/include/asm/arch-imx8/sys_proto.h              | 1 +
 arch/arm/include/asm/arch-imx8m/clock.h                 | 1 +
 arch/arm/include/asm/arch-mx25/clock.h                  | 1 +
 arch/arm/include/asm/arch-mx5/clock.h                   | 1 +
 arch/arm/include/asm/arch-mx6/clock.h                   | 1 +
 arch/arm/include/asm/arch-mx7/clock_slice.h             | 1 +
 arch/arm/include/asm/arch-mx7ulp/pcc.h                  | 1 +
 arch/arm/include/asm/arch-mx7ulp/scg.h                  | 1 +
 arch/arm/include/asm/arch-rk3308/cru_rk3308.h           | 1 +
 arch/arm/include/asm/arch-rk3308/grf_rk3308.h           | 1 +
 arch/arm/include/asm/arch-rockchip/clock.h              | 2 ++
 arch/arm/include/asm/arch-rockchip/cpu_rk3288.h         | 1 +
 arch/arm/include/asm/arch-rockchip/cru_px30.h           | 1 +
 arch/arm/include/asm/arch-rockchip/cru_rk3036.h         | 1 +
 arch/arm/include/asm/arch-rockchip/cru_rk3128.h         | 1 +
 arch/arm/include/asm/arch-rockchip/cru_rk3188.h         | 2 ++
 arch/arm/include/asm/arch-rockchip/cru_rk322x.h         | 1 +
 arch/arm/include/asm/arch-rockchip/cru_rk3288.h         | 1 +
 arch/arm/include/asm/arch-rockchip/cru_rk3328.h         | 1 +
 arch/arm/include/asm/arch-rockchip/cru_rk3368.h         | 1 +
 arch/arm/include/asm/arch-rockchip/cru_rk3399.h         | 1 +
 arch/arm/include/asm/arch-rockchip/cru_rv1108.h         | 1 +
 arch/arm/include/asm/arch-rockchip/ddr_rk3188.h         | 1 +
 arch/arm/include/asm/arch-rockchip/ddr_rk3288.h         | 1 +
 arch/arm/include/asm/arch-rockchip/ddr_rk3368.h         | 1 +
 arch/arm/include/asm/arch-rockchip/edp_rk3288.h         | 1 +
 arch/arm/include/asm/arch-rockchip/gpio.h               | 1 +
 arch/arm/include/asm/arch-rockchip/grf_px30.h           | 1 +
 arch/arm/include/asm/arch-rockchip/grf_rk3036.h         | 1 +
 arch/arm/include/asm/arch-rockchip/grf_rk3128.h         | 1 +
 arch/arm/include/asm/arch-rockchip/grf_rk3188.h         | 1 +
 arch/arm/include/asm/arch-rockchip/grf_rk322x.h         | 1 +
 arch/arm/include/asm/arch-rockchip/grf_rk3328.h         | 1 +
 arch/arm/include/asm/arch-rockchip/grf_rk3368.h         | 1 +
 arch/arm/include/asm/arch-rockchip/grf_rk3399.h         | 1 +
 arch/arm/include/asm/arch-rockchip/grf_rv1108.h         | 1 +
 arch/arm/include/asm/arch-rockchip/pmu_rk3188.h         | 1 +
 arch/arm/include/asm/arch-rockchip/pmu_rk3288.h         | 1 +
 arch/arm/include/asm/arch-rockchip/pmu_rk3399.h         | 1 +
 arch/arm/include/asm/arch-rockchip/sdram_rk3036.h       | 1 +
 arch/arm/include/asm/arch-rockchip/sdram_rk322x.h       | 1 +
 arch/arm/include/asm/arch-rockchip/sdram_rk3288.h       | 1 +
 arch/arm/include/asm/arch-rockchip/vop_rk3288.h         | 1 +
 arch/arm/include/asm/arch-sunxi/clock_sun6i.h           | 1 +
 arch/arm/include/asm/arch-sunxi/dram.h                  | 1 +
 arch/arm/include/asm/arch-sunxi/dram_sun50i_h6.h        | 1 +
 arch/arm/include/asm/arch-sunxi/dram_sunxi_dw.h         | 1 +
 arch/arm/include/asm/arch-sunxi/lcdc.h                  | 1 +
 arch/arm/include/asm/arch-tegra/ap.h                    | 1 +
 arch/arm/include/asm/arch-tegra/clock.h                 | 1 +
 arch/arm/include/asm/armv7.h                            | 1 +
 arch/arm/include/asm/armv8/sec_firmware.h               | 2 ++
 arch/arm/include/asm/mach-imx/hab.h                     | 1 +
 arch/arm/include/asm/mach-imx/iomux-v3.h                | 1 +
 arch/arm/lib/bootm.c                                    | 1 +
 arch/arm/lib/cache-cp15.c                               | 1 +
 arch/arm/lib/cache.c                                    | 1 +
 arch/arm/lib/gic-v3-its.c                               | 1 +
 arch/arm/lib/image.c                                    | 1 +
 arch/arm/mach-at91/atmel_sfr.c                          | 1 +
 arch/arm/mach-at91/include/mach/at91_common.h           | 1 +
 arch/arm/mach-at91/include/mach/atmel_usba_udc.h        | 1 +
 arch/arm/mach-bcm283x/mbox.c                            | 1 +
 arch/arm/mach-davinci/include/mach/davinci_misc.h       | 1 +
 arch/arm/mach-exynos/clock.c                            | 1 +
 arch/arm/mach-exynos/clock_init_exynos5.c               | 1 +
 arch/arm/mach-exynos/dmc_init_ddr3.c                    | 2 ++
 arch/arm/mach-exynos/pinmux.c                           | 1 +
 arch/arm/mach-exynos/spl_boot.c                         | 1 +
 arch/arm/mach-imx/cmd_bmode.c                           | 1 +
 arch/arm/mach-imx/cmd_nandbcb.c                         | 1 +
 arch/arm/mach-imx/ddrmc-vf610.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/cpu.c                            | 1 +
 arch/arm/mach-imx/imx8/fdt.c                            | 1 +
 arch/arm/mach-imx/imx8/image.c                          | 1 +
 arch/arm/mach-imx/imx8/parse-container.c                | 1 +
 arch/arm/mach-imx/imx8/snvs_security_sc.c               | 1 +
 arch/arm/mach-imx/imx8m/clock_imx8mm.c                  | 1 +
 arch/arm/mach-imx/imx8m/clock_imx8mq.c                  | 1 +
 arch/arm/mach-imx/imx8m/clock_slice.c                   | 1 +
 arch/arm/mach-imx/imx8m/soc.c                           | 1 +
 arch/arm/mach-imx/imxrt/soc.c                           | 1 +
 arch/arm/mach-imx/mac.c                                 | 1 +
 arch/arm/mach-imx/mx5/clock.c                           | 1 +
 arch/arm/mach-imx/mx6/clock.c                           | 1 +
 arch/arm/mach-imx/mx6/ddr.c                             | 1 +
 arch/arm/mach-imx/mx6/litesom.c                         | 1 +
 arch/arm/mach-imx/mx6/module_fuse.c                     | 1 +
 arch/arm/mach-imx/mx6/soc.c                             | 1 +
 arch/arm/mach-imx/mx7/clock_slice.c                     | 1 +
 arch/arm/mach-imx/mx7/psci-mx7.c                        | 1 +
 arch/arm/mach-imx/mx7/soc.c                             | 1 +
 arch/arm/mach-imx/mx7ulp/pcc.c                          | 1 +
 arch/arm/mach-imx/mx7ulp/scg.c                          | 1 +
 arch/arm/mach-imx/mx7ulp/soc.c                          | 1 +
 arch/arm/mach-imx/spl.c                                 | 1 +
 arch/arm/mach-imx/spl_imx_romapi.c                      | 1 +
 arch/arm/mach-ipq40xx/pinctrl-snapdragon.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/security.c                             | 1 +
 arch/arm/mach-k3/sysfw-loader.c                         | 1 +
 arch/arm/mach-keystone/include/mach/psc_defs.h          | 1 +
 arch/arm/mach-keystone/psc.c                            | 1 +
 arch/arm/mach-kirkwood/cpu.c                            | 1 +
 arch/arm/mach-mediatek/mt7623/init.c                    | 1 +
 arch/arm/mach-mediatek/mt7629/init.c                    | 1 +
 arch/arm/mach-mediatek/mt8516/init.c                    | 1 +
 arch/arm/mach-meson/board-g12a.c                        | 1 +
 arch/arm/mach-meson/board-info.c                        | 1 +
 arch/arm/mach-mvebu/cpu.c                               | 1 +
 arch/arm/mach-nexell/clock.c                            | 1 +
 arch/arm/mach-nexell/nx_gpio.c                          | 1 +
 arch/arm/mach-nexell/timer.c                            | 1 +
 arch/arm/mach-omap2/abb.c                               | 1 +
 arch/arm/mach-omap2/am33xx/sys_info.c                   | 1 +
 arch/arm/mach-omap2/emif-common.c                       | 1 +
 arch/arm/mach-omap2/omap5/fdt.c                         | 1 +
 arch/arm/mach-omap2/omap5/sdram.c                       | 1 +
 arch/arm/mach-omap2/sec-common.c                        | 1 +
 arch/arm/mach-rmobile/cpu_info.c                        | 1 +
 arch/arm/mach-rmobile/pfc-r8a7740.c                     | 1 +
 arch/arm/mach-rmobile/pfc-sh73a0.c                      | 1 +
 arch/arm/mach-rockchip/board.c                          | 1 +
 arch/arm/mach-rockchip/boot_mode.c                      | 1 +
 arch/arm/mach-rockchip/bootrom.c                        | 1 +
 arch/arm/mach-rockchip/rk3288/rk3288.c                  | 1 +
 arch/arm/mach-rockchip/rk3399/rk3399.c                  | 1 +
 arch/arm/mach-rockchip/sdram.c                          | 1 +
 arch/arm/mach-rockchip/spl.c                            | 1 +
 arch/arm/mach-snapdragon/pinctrl-apq8016.c              | 1 +
 arch/arm/mach-snapdragon/pinctrl-apq8096.c              | 1 +
 arch/arm/mach-snapdragon/pinctrl-snapdragon.c           | 1 +
 arch/arm/mach-socfpga/clock_manager_arria10.c           | 1 +
 arch/arm/mach-socfpga/firewall.c                        | 1 +
 arch/arm/mach-socfpga/freeze_controller.c               | 1 +
 arch/arm/mach-socfpga/include/mach/misc.h               | 1 +
 arch/arm/mach-socfpga/include/mach/reset_manager_gen5.h | 1 +
 arch/arm/mach-socfpga/misc_gen5.c                       | 1 +
 arch/arm/mach-socfpga/misc_s10.c                        | 1 +
 arch/arm/mach-socfpga/reset_manager_arria10.c           | 1 +
 arch/arm/mach-socfpga/reset_manager_gen5.c              | 1 +
 arch/arm/mach-socfpga/wrap_pinmux_config.c              | 1 +
 arch/arm/mach-socfpga/wrap_pinmux_config_s10.c          | 1 +
 arch/arm/mach-socfpga/wrap_sdram_config.c               | 1 +
 arch/arm/mach-stm32/soc.c                               | 1 +
 arch/arm/mach-stm32mp/bsec.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-stm32mp/dram_init.c                       | 1 +
 arch/arm/mach-stm32mp/fdt.c                             | 1 +
 arch/arm/mach-stm32mp/include/mach/bsec.h               | 1 +
 arch/arm/mach-stm32mp/include/mach/stm32prog.h          | 1 +
 arch/arm/mach-sunxi/clock_sun4i.c                       | 1 +
 arch/arm/mach-sunxi/clock_sun6i.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_sun8i_a33.c                    | 1 +
 arch/arm/mach-sunxi/dram_sun8i_a83t.c                   | 1 +
 arch/arm/mach-sunxi/dram_sunxi_dw.c                     | 1 +
 arch/arm/mach-sunxi/dram_timings/ddr2_v3s.c             | 1 +
 arch/arm/mach-sunxi/dram_timings/ddr3_1333.c            | 1 +
 arch/arm/mach-sunxi/dram_timings/h6_ddr3_1333.c         | 1 +
 arch/arm/mach-sunxi/dram_timings/h6_lpddr3.c            | 1 +
 arch/arm/mach-sunxi/dram_timings/lpddr3_stock.c         | 1 +
 arch/arm/mach-sunxi/spl_spi_sunxi.c                     | 1 +
 arch/arm/mach-tegra/board.c                             | 1 +
 arch/arm/mach-tegra/cboot.c                             | 1 +
 arch/arm/mach-tegra/clock.c                             | 1 +
 arch/arm/mach-tegra/dt-setup.c                          | 1 +
 arch/arm/mach-tegra/gpu.c                               | 1 +
 arch/arm/mach-tegra/pmc.c                               | 1 +
 arch/arm/mach-tegra/powergate.c                         | 1 +
 arch/arm/mach-tegra/tegra114/cpu.c                      | 1 +
 arch/arm/mach-tegra/tegra124/clock.c                    | 1 +
 arch/arm/mach-tegra/tegra124/cpu.c                      | 1 +
 arch/arm/mach-tegra/tegra124/xusb-padctl.c              | 1 +
 arch/arm/mach-tegra/tegra20/funcmux.c                   | 1 +
 arch/arm/mach-tegra/tegra20/warmboot.c                  | 1 +
 arch/arm/mach-tegra/tegra210/xusb-padctl.c              | 1 +
 arch/arm/mach-tegra/xusb-padctl-dummy.c                 | 1 +
 arch/arm/mach-uniphier/dram/ddrphy-init.h               | 1 +
 arch/arm/mach-uniphier/dram/ddrphy-ld4.c                | 1 +
 arch/arm/mach-uniphier/dram/umc-ld4.c                   | 1 +
 arch/arm/mach-uniphier/dram/umc-pro4.c                  | 1 +
 arch/arm/mach-uniphier/dram/umc-pxs2.c                  | 1 +
 arch/arm/mach-uniphier/dram/umc-sld8.c                  | 1 +
 arch/arm/mach-uniphier/micro-support-card.c             | 1 +
 arch/arm/mach-uniphier/mmc-first-dev.c                  | 1 +
 arch/arm/mach-versal/mp.c                               | 1 +
 arch/arm/mach-zynq/slcr.c                               | 1 +
 arch/arm/mach-zynqmp/include/mach/sys_proto.h           | 1 +
 arch/arm/mach-zynqmp/mp.c                               | 1 +
 arch/m68k/lib/cache.c                                   | 1 +
 arch/m68k/lib/interrupts.c                              | 1 +
 arch/microblaze/cpu/spl.c                               | 1 +
 arch/microblaze/cpu/timer.c                             | 1 +
 arch/mips/cpu/time.c                                    | 1 +
 arch/mips/lib/cache.c                                   | 1 +
 arch/mips/mach-ath79/ar934x/clk.c                       | 1 +
 arch/mips/mach-ath79/cpu.c                              | 1 +
 arch/mips/mach-jz47xx/jz4780/pll.c                      | 1 +
 arch/mips/mach-mscc/include/mach/ddr.h                  | 1 +
 arch/mips/mach-mtmips/ddr_cal.c                         | 1 +
 arch/mips/mach-mtmips/mt7628/init.c                     | 1 +
 arch/mips/mach-octeon/clock.c                           | 1 +
 arch/nios2/cpu/traps.c                                  | 1 +
 arch/powerpc/cpu/mpc83xx/cpu.c                          | 1 +
 arch/powerpc/cpu/mpc83xx/cpu_init.c                     | 1 +
 arch/powerpc/cpu/mpc83xx/law.c                          | 1 +
 arch/powerpc/cpu/mpc83xx/pcie.c                         | 1 +
 arch/powerpc/cpu/mpc83xx/speed.c                        | 1 +
 arch/powerpc/cpu/mpc85xx/b4860_ids.c                    | 1 +
 arch/powerpc/cpu/mpc85xx/b4860_serdes.c                 | 1 +
 arch/powerpc/cpu/mpc85xx/bsc9132_serdes.c               | 1 +
 arch/powerpc/cpu/mpc85xx/c29x_serdes.c                  | 1 +
 arch/powerpc/cpu/mpc85xx/cmd_errata.c                   | 1 +
 arch/powerpc/cpu/mpc85xx/cpu.c                          | 1 +
 arch/powerpc/cpu/mpc85xx/cpu_init.c                     | 1 +
 arch/powerpc/cpu/mpc85xx/ether_fcc.c                    | 1 +
 arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c           | 1 +
 arch/powerpc/cpu/mpc85xx/mpc8536_serdes.c               | 1 +
 arch/powerpc/cpu/mpc85xx/mpc8544_serdes.c               | 1 +
 arch/powerpc/cpu/mpc85xx/mpc8548_serdes.c               | 1 +
 arch/powerpc/cpu/mpc85xx/mpc8568_serdes.c               | 1 +
 arch/powerpc/cpu/mpc85xx/mpc8569_serdes.c               | 1 +
 arch/powerpc/cpu/mpc85xx/mpc8572_serdes.c               | 1 +
 arch/powerpc/cpu/mpc85xx/p1010_serdes.c                 | 1 +
 arch/powerpc/cpu/mpc85xx/p1021_serdes.c                 | 1 +
 arch/powerpc/cpu/mpc85xx/p1022_serdes.c                 | 1 +
 arch/powerpc/cpu/mpc85xx/p1023_serdes.c                 | 1 +
 arch/powerpc/cpu/mpc85xx/p2020_serdes.c                 | 1 +
 arch/powerpc/cpu/mpc85xx/p2041_ids.c                    | 1 +
 arch/powerpc/cpu/mpc85xx/p2041_serdes.c                 | 1 +
 arch/powerpc/cpu/mpc85xx/p3041_ids.c                    | 1 +
 arch/powerpc/cpu/mpc85xx/p3041_serdes.c                 | 1 +
 arch/powerpc/cpu/mpc85xx/p4080_ids.c                    | 1 +
 arch/powerpc/cpu/mpc85xx/p4080_serdes.c                 | 1 +
 arch/powerpc/cpu/mpc85xx/p5020_ids.c                    | 1 +
 arch/powerpc/cpu/mpc85xx/p5020_serdes.c                 | 1 +
 arch/powerpc/cpu/mpc85xx/p5040_ids.c                    | 1 +
 arch/powerpc/cpu/mpc85xx/p5040_serdes.c                 | 1 +
 arch/powerpc/cpu/mpc85xx/t1024_ids.c                    | 1 +
 arch/powerpc/cpu/mpc85xx/t1024_serdes.c                 | 1 +
 arch/powerpc/cpu/mpc85xx/t1040_ids.c                    | 1 +
 arch/powerpc/cpu/mpc85xx/t1040_serdes.c                 | 1 +
 arch/powerpc/cpu/mpc85xx/t2080_ids.c                    | 1 +
 arch/powerpc/cpu/mpc85xx/t2080_serdes.c                 | 1 +
 arch/powerpc/cpu/mpc85xx/t4240_ids.c                    | 1 +
 arch/powerpc/cpu/mpc85xx/t4240_serdes.c                 | 1 +
 arch/powerpc/cpu/mpc85xx/tlb.c                          | 1 +
 arch/powerpc/cpu/mpc86xx/cpu.c                          | 1 +
 arch/powerpc/cpu/mpc86xx/mpc8610_serdes.c               | 1 +
 arch/powerpc/cpu/mpc86xx/mpc8641_serdes.c               | 1 +
 arch/powerpc/cpu/mpc8xxx/cpu.c                          | 1 +
 arch/powerpc/cpu/mpc8xxx/law.c                          | 1 +
 arch/powerpc/cpu/mpc8xxx/pamu_table.c                   | 1 +
 arch/powerpc/include/asm/arch-mpc83xx/soc.h             | 1 +
 arch/powerpc/lib/bootm.c                                | 1 +
 arch/riscv/cpu/cpu.c                                    | 1 +
 arch/riscv/lib/cache.c                                  | 1 +
 arch/riscv/lib/fdt_fixup.c                              | 1 +
 arch/riscv/lib/image.c                                  | 1 +
 arch/riscv/lib/interrupts.c                             | 1 +
 arch/sandbox/cpu/cpu.c                                  | 1 +
 arch/sandbox/cpu/os.c                                   | 1 +
 arch/sandbox/cpu/start.c                                | 1 +
 arch/sandbox/cpu/state.c                                | 1 +
 arch/sandbox/include/asm/eth.h                          | 1 +
 arch/sandbox/include/asm/sdl.h                          | 1 +
 arch/sandbox/include/asm/test.h                         | 1 +
 arch/x86/cpu/apollolake/fsp_bindings.c                  | 1 +
 arch/x86/cpu/apollolake/fsp_s.c                         | 1 +
 arch/x86/cpu/apollolake/hostbridge.c                    | 1 +
 arch/x86/cpu/apollolake/lpc.c                           | 1 +
 arch/x86/cpu/apollolake/pch.c                           | 1 +
 arch/x86/cpu/apollolake/pmc.c                           | 1 +
 arch/x86/cpu/apollolake/spl.c                           | 1 +
 arch/x86/cpu/broadwell/adsp.c                           | 1 +
 arch/x86/cpu/broadwell/cpu_full.c                       | 1 +
 arch/x86/cpu/broadwell/iobp.c                           | 1 +
 arch/x86/cpu/broadwell/pch.c                            | 1 +
 arch/x86/cpu/broadwell/pinctrl_broadwell.c              | 1 +
 arch/x86/cpu/coreboot/sdram.c                           | 1 +
 arch/x86/cpu/cpu.c                                      | 1 +
 arch/x86/cpu/i386/cpu.c                                 | 1 +
 arch/x86/cpu/intel_common/cpu.c                         | 1 +
 arch/x86/cpu/intel_common/itss.c                        | 1 +
 arch/x86/cpu/intel_common/lpc.c                         | 1 +
 arch/x86/cpu/intel_common/me_status.c                   | 1 +
 arch/x86/cpu/intel_common/mrc.c                         | 1 +
 arch/x86/cpu/intel_common/p2sb.c                        | 1 +
 arch/x86/cpu/intel_common/report_platform.c             | 1 +
 arch/x86/cpu/irq.c                                      | 1 +
 arch/x86/cpu/ivybridge/bd82x6x.c                        | 1 +
 arch/x86/cpu/ivybridge/lpc.c                            | 1 +
 arch/x86/cpu/ivybridge/model_206ax.c                    | 1 +
 arch/x86/cpu/mp_init.c                                  | 1 +
 arch/x86/cpu/mtrr.c                                     | 1 +
 arch/x86/cpu/qemu/qemu.c                                | 1 +
 arch/x86/cpu/quark/mrc.c                                | 1 +
 arch/x86/cpu/quark/mrc_util.c                           | 1 +
 arch/x86/cpu/quark/mrc_util.h                           | 1 +
 arch/x86/cpu/quark/smc.c                                | 1 +
 arch/x86/cpu/slimbootloader/sdram.c                     | 1 +
 arch/x86/cpu/tangier/pinmux.c                           | 1 +
 arch/x86/include/asm/arch-apollolake/fsp_bindings.h     | 1 +
 arch/x86/include/asm/arch-broadwell/gpio.h              | 1 +
 arch/x86/include/asm/arch-broadwell/pch.h               | 2 ++
 arch/x86/include/asm/arch-ivybridge/model_206ax.h       | 1 +
 arch/x86/include/asm/bootm.h                            | 1 +
 arch/x86/include/asm/cpu_common.h                       | 2 ++
 arch/x86/include/asm/fast_spi.h                         | 1 +
 arch/x86/include/asm/fsp2/fsp_api.h                     | 1 +
 arch/x86/include/asm/fsp2/fsp_internal.h                | 1 +
 arch/x86/include/asm/global_data.h                      | 1 +
 arch/x86/include/asm/hob.h                              | 1 +
 arch/x86/include/asm/intel_pinctrl.h                    | 1 +
 arch/x86/include/asm/interrupt.h                        | 1 +
 arch/x86/include/asm/irq.h                              | 1 +
 arch/x86/include/asm/itss.h                             | 1 +
 arch/x86/include/asm/lpc_common.h                       | 1 +
 arch/x86/include/asm/mrc_common.h                       | 1 +
 arch/x86/include/asm/mrccache.h                         | 2 ++
 arch/x86/include/asm/mtrr.h                             | 1 +
 arch/x86/include/asm/pirq_routing.h                     | 1 +
 arch/x86/include/asm/pmu.h                              | 1 +
 arch/x86/lib/acpi_nhlt.c                                | 1 +
 arch/x86/lib/acpi_table.c                               | 1 +
 arch/x86/lib/bootm.c                                    | 1 +
 arch/x86/lib/coreboot_table.c                           | 1 +
 arch/x86/lib/e820.c                                     | 1 +
 arch/x86/lib/fsp/fsp_dram.c                             | 1 +
 arch/x86/lib/fsp2/fsp_dram.c                            | 1 +
 arch/x86/lib/fsp2/fsp_init.c                            | 1 +
 arch/x86/lib/fsp2/fsp_meminit.c                         | 1 +
 arch/x86/lib/fsp2/fsp_silicon_init.c                    | 1 +
 arch/x86/lib/fsp2/fsp_support.c                         | 1 +
 arch/x86/lib/i8259.c                                    | 1 +
 arch/x86/lib/init_helpers.c                             | 1 +
 arch/x86/lib/mpspec.c                                   | 1 +
 arch/x86/lib/mrccache.c                                 | 1 +
 arch/x86/lib/physmem.c                                  | 1 +
 arch/x86/lib/pinctrl_ich6.c                             | 1 +
 arch/x86/lib/pirq_routing.c                             | 1 +
 arch/x86/lib/pmu.c                                      | 1 +
 arch/x86/lib/sfi.c                                      | 1 +
 arch/x86/lib/tables.c                                   | 1 +
 arch/x86/lib/zimage.c                                   | 1 +
 board/AndesTech/ax25-ae350/ax25-ae350.c                 | 1 +
 board/Arcturus/ucp1020/law.c                            | 1 +
 board/Arcturus/ucp1020/tlb.c                            | 1 +
 board/CZ.NIC/turris_mox/turris_mox.c                    | 1 +
 board/CZ.NIC/turris_omnia/turris_omnia.c                | 1 +
 board/CarMediaLab/flea3/flea3.c                         | 1 +
 board/LaCie/net2big_v2/net2big_v2.c                     | 1 +
 board/Marvell/db-88f6820-amc/db-88f6820-amc.c           | 1 +
 board/Marvell/db-88f6820-gp/db-88f6820-gp.c             | 1 +
 board/Synology/ds414/ds414.c                            | 1 +
 board/advantech/dms-ba16/dms-ba16.c                     | 1 +
 board/advantech/imx8qm_rom7720_a1/imx8qm_rom7720_a1.c   | 1 +
 board/advantech/imx8qm_rom7720_a1/spl.c                 | 1 +
 board/alliedtelesis/x530/x530.c                         | 1 +
 board/aristainetos/aristainetos.c                       | 1 +
 board/armadeus/apf27/apf27.c                            | 1 +
 board/armltd/vexpress/vexpress_tc2.c                    | 1 +
 board/avionic-design/common/tamonten-ng.c               | 1 +
 board/bachmann/ot1200/ot1200.c                          | 1 +
 board/barco/platinum/platinum.c                         | 1 +
 board/barco/platinum/platinum_picon.c                   | 1 +
 board/barco/platinum/platinum_titanium.c                | 1 +
 board/barco/titanium/titanium.c                         | 1 +
 board/beacon/imx8mm/spl.c                               | 1 +
 board/beckhoff/mx53cx9020/mx53cx9020_video.c            | 1 +
 board/bluegiga/apx4devkit/spl_boot.c                    | 1 +
 board/boundary/nitrogen6x/nitrogen6x.c                  | 1 +
 board/ccv/xpress/xpress.c                               | 1 +
 board/cei/cei-tk1-som/cei-tk1-som.c                     | 1 +
 board/compulab/cl-som-imx7/mux.c                        | 1 +
 board/compulab/cm_fx6/cm_fx6.c                          | 1 +
 board/compulab/cm_fx6/spl.c                             | 1 +
 board/compulab/cm_t43/spl.c                             | 1 +
 board/compulab/common/omap3_display.c                   | 1 +
 board/congatec/cgtqmx6eval/cgtqmx6eval.c                | 1 +
 board/corscience/tricorder/tricorder-eeprom.c           | 1 +
 board/creative/xfi3/spl_boot.c                          | 1 +
 board/creative/xfi3/xfi3.c                              | 1 +
 board/davinci/da8xxevm/da850evm.c                       | 1 +
 board/davinci/da8xxevm/omapl138_lcdk.c                  | 1 +
 board/dhelectronics/dh_stm32mp1/board.c                 | 1 +
 board/ea/mx7ulp_com/mx7ulp_com.c                        | 1 +
 board/el/el6x/el6x.c                                    | 1 +
 board/embest/mx6boards/mx6boards.c                      | 1 +
 board/engicam/imx6q/imx6q.c                             | 1 +
 board/firefly/roc-pc-rk3399/roc-pc-rk3399.c             | 1 +
 board/freescale/common/arm_sleep.c                      | 1 +
 board/freescale/common/ics307_clk.c                     | 1 +
 board/freescale/common/mpc85xx_sleep.c                  | 1 +
 board/freescale/common/ns_access.c                      | 1 +
 board/freescale/common/p_corenet/law.c                  | 1 +
 board/freescale/common/p_corenet/tlb.c                  | 1 +
 board/freescale/common/qixis.c                          | 1 +
 board/freescale/common/sleep.h                          | 1 +
 board/freescale/common/sys_eeprom.c                     | 1 +
 board/freescale/common/vid.c                            | 1 +
 board/freescale/imx8mm_evk/spl.c                        | 1 +
 board/freescale/imx8mn_evk/spl.c                        | 1 +
 board/freescale/imx8mp_evk/imx8mp_evk.c                 | 1 +
 board/freescale/imx8mq_evk/imx8mq_evk.c                 | 1 +
 board/freescale/imx8mq_evk/spl.c                        | 1 +
 board/freescale/imx8qm_mek/imx8qm_mek.c                 | 1 +
 board/freescale/imx8qxp_mek/imx8qxp_mek.c               | 1 +
 board/freescale/imx8qxp_mek/spl.c                       | 1 +
 board/freescale/ls1012ardb/ls1012ardb.c                 | 1 +
 board/freescale/ls1021aiot/ls1021aiot.c                 | 1 +
 board/freescale/ls1021aqds/ls1021aqds.c                 | 1 +
 board/freescale/ls1021atsn/ls1021atsn.c                 | 1 +
 board/freescale/ls1021atwr/ls1021atwr.c                 | 1 +
 board/freescale/ls1043aqds/ls1043aqds.c                 | 1 +
 board/freescale/ls1046aqds/ls1046aqds.c                 | 1 +
 board/freescale/ls1046ardb/cpld.c                       | 1 +
 board/freescale/ls1046ardb/cpld.h                       | 1 +
 board/freescale/ls1046ardb/ls1046ardb.c                 | 1 +
 board/freescale/ls1088a/eth_ls1088aqds.c                | 1 +
 board/freescale/ls1088a/ls1088a.c                       | 1 +
 board/freescale/ls2080aqds/eth.c                        | 1 +
 board/freescale/ls2080aqds/ls2080aqds.c                 | 1 +
 board/freescale/ls2080ardb/ls2080ardb.c                 | 1 +
 board/freescale/lx2160a/eth_lx2160aqds.c                | 1 +
 board/freescale/lx2160a/eth_lx2160ardb.c                | 1 +
 board/freescale/lx2160a/lx2160a.c                       | 1 +
 board/freescale/mpc8541cds/law.c                        | 1 +
 board/freescale/mpc8541cds/tlb.c                        | 1 +
 board/freescale/mpc8544ds/law.c                         | 1 +
 board/freescale/mpc8544ds/tlb.c                         | 1 +
 board/freescale/mpc8548cds/law.c                        | 1 +
 board/freescale/mpc8548cds/tlb.c                        | 1 +
 board/freescale/mpc8555cds/law.c                        | 1 +
 board/freescale/mpc8555cds/tlb.c                        | 1 +
 board/freescale/mpc8568mds/law.c                        | 1 +
 board/freescale/mpc8568mds/tlb.c                        | 1 +
 board/freescale/mpc8569mds/law.c                        | 1 +
 board/freescale/mpc8569mds/tlb.c                        | 1 +
 board/freescale/mpc8572ds/law.c                         | 1 +
 board/freescale/mpc8572ds/tlb.c                         | 1 +
 board/freescale/mpc8610hpcd/law.c                       | 1 +
 board/freescale/mpc8641hpcn/law.c                       | 1 +
 board/freescale/mx23evk/spl_boot.c                      | 1 +
 board/freescale/mx25pdk/mx25pdk.c                       | 1 +
 board/freescale/mx28evk/iomux.c                         | 1 +
 board/freescale/mx35pdk/mx35pdk.c                       | 1 +
 board/freescale/mx51evk/mx51evk.c                       | 1 +
 board/freescale/mx53ard/mx53ard.c                       | 1 +
 board/freescale/mx53evk/mx53evk.c                       | 1 +
 board/freescale/mx53loco/mx53loco.c                     | 1 +
 board/freescale/mx53loco/mx53loco_video.c               | 1 +
 board/freescale/mx53smd/mx53smd.c                       | 1 +
 board/freescale/mx6qarm2/mx6qarm2.c                     | 1 +
 board/freescale/mx6sabreauto/mx6sabreauto.c             | 1 +
 board/freescale/mx6sabresd/mx6sabresd.c                 | 1 +
 board/freescale/mx6slevk/mx6slevk.c                     | 1 +
 board/freescale/mx6sllevk/mx6sllevk.c                   | 1 +
 board/freescale/mx6sxsabreauto/mx6sxsabreauto.c         | 1 +
 board/freescale/mx6sxsabresd/mx6sxsabresd.c             | 1 +
 board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c       | 1 +
 board/freescale/mx6ullevk/mx6ullevk.c                   | 1 +
 board/freescale/mx7dsabresd/mx7dsabresd.c               | 1 +
 board/freescale/mx7ulp_evk/mx7ulp_evk.c                 | 1 +
 board/freescale/p1010rdb/law.c                          | 1 +
 board/freescale/p1010rdb/tlb.c                          | 1 +
 board/freescale/p1023rdb/law.c                          | 1 +
 board/freescale/p1023rdb/tlb.c                          | 1 +
 board/freescale/p1_p2_rdb_pc/law.c                      | 1 +
 board/freescale/p1_p2_rdb_pc/tlb.c                      | 1 +
 board/freescale/t102xrdb/law.c                          | 1 +
 board/freescale/t102xrdb/tlb.c                          | 1 +
 board/freescale/t104xrdb/law.c                          | 1 +
 board/freescale/t104xrdb/tlb.c                          | 1 +
 board/freescale/t208xqds/law.c                          | 1 +
 board/freescale/t208xqds/tlb.c                          | 1 +
 board/freescale/t208xrdb/law.c                          | 1 +
 board/freescale/t208xrdb/tlb.c                          | 1 +
 board/freescale/t4rdb/law.c                             | 1 +
 board/freescale/t4rdb/tlb.c                             | 1 +
 board/freescale/vf610twr/vf610twr.c                     | 1 +
 board/friendlyarm/nanopi2/board.c                       | 1 +
 board/friendlyarm/nanopi2/lcds.c                        | 1 +
 board/gardena/smart-gateway-mt7688/board.c              | 1 +
 board/gateworks/gw_ventana/common.c                     | 1 +
 board/gateworks/gw_ventana/gw_ventana.c                 | 1 +
 board/gdsys/a38x/controlcenterdc.c                      | 1 +
 board/gdsys/a38x/dt_helpers.c                           | 1 +
 board/gdsys/a38x/dt_helpers.h                           | 1 +
 board/gdsys/a38x/hre.c                                  | 1 +
 board/gdsys/a38x/hre.h                                  | 1 +
 board/gdsys/a38x/ihs_phys.c                             | 1 +
 board/gdsys/common/ch7301.h                             | 1 +
 board/gdsys/common/dp501.c                              | 1 +
 board/gdsys/common/dp501.h                              | 1 +
 board/gdsys/common/ioep-fpga.c                          | 6 +++---
 board/gdsys/common/ioep-fpga.h                          | 1 +
 board/gdsys/common/osd.c                                | 1 +
 board/gdsys/common/osd.h                                | 1 +
 board/gdsys/common/phy.c                                | 1 +
 board/gdsys/mpc8308/hrcon.c                             | 1 +
 board/gdsys/mpc8308/strider.c                           | 1 +
 board/gdsys/p1022/controlcenterd-id.c                   | 1 +
 board/gdsys/p1022/law.c                                 | 1 +
 board/gdsys/p1022/tlb.c                                 | 1 +
 board/ge/bx50v3/bx50v3.c                                | 1 +
 board/ge/mx53ppd/mx53ppd.c                              | 1 +
 board/ge/mx53ppd/mx53ppd_video.c                        | 1 +
 board/google/imx8mq_phanbell/imx8mq_phanbell.c          | 1 +
 board/google/imx8mq_phanbell/spl.c                      | 1 +
 board/grinn/liteboard/board.c                           | 1 +
 board/hisilicon/poplar/poplar.c                         | 1 +
 board/imgtec/boston/ddr.c                               | 1 +
 board/imgtec/boston/dt.c                                | 1 +
 board/imgtec/malta/malta.c                              | 1 +
 board/imgtec/malta/superio.c                            | 1 +
 board/inversepath/usbarmory/usbarmory.c                 | 1 +
 board/isee/igep003x/board.c                             | 1 +
 board/isee/igep00x0/igep00x0.c                          | 1 +
 board/keymile/common/ivm.c                              | 1 +
 board/keymile/common/qrio.c                             | 1 +
 board/keymile/common/qrio.h                             | 1 +
 board/keymile/km_arm/km_arm.c                           | 1 +
 board/keymile/kmp204x/kmp204x.c                         | 1 +
 board/keymile/kmp204x/law.c                             | 1 +
 board/keymile/kmp204x/pci.c                             | 1 +
 board/keymile/kmp204x/tlb.c                             | 1 +
 board/kobol/helios4/helios4.c                           | 1 +
 board/kosagi/novena/novena_spl.c                        | 1 +
 board/kosagi/novena/video.c                             | 1 +
 board/lego/ev3/legoev3.c                                | 1 +
 board/liebherr/display5/display5.c                      | 1 +
 board/liebherr/xea/spl_xea.c                            | 1 +
 board/logicpd/imx6/imx6logic.c                          | 1 +
 board/menlo/m53menlo/m53menlo.c                         | 1 +
 board/mscc/common/spi.c                                 | 1 +
 board/mscc/ocelot/ocelot.c                              | 1 +
 board/novtech/meerkat96/meerkat96.c                     | 1 +
 board/nvidia/cardhu/cardhu.c                            | 1 +
 board/nvidia/dalmore/dalmore.c                          | 1 +
 board/nvidia/jetson-tk1/jetson-tk1.c                    | 1 +
 board/nvidia/nyan-big/nyan-big.c                        | 1 +
 board/nvidia/p2371-2180/p2371-2180.c                    | 1 +
 board/nvidia/p2771-0000/p2771-0000.c                    | 1 +
 board/nvidia/p3450-0000/p3450-0000.c                    | 1 +
 board/nvidia/venice2/venice2.c                          | 1 +
 board/olimex/mx23_olinuxino/spl_boot.c                  | 1 +
 board/phytec/pcl063/pcl063.c                            | 1 +
 board/phytec/phycore_am335x_r2/board.c                  | 1 +
 board/ppcag/bg0900/spl_boot.c                           | 1 +
 board/qualcomm/dragonboard820c/dragonboard820c.c        | 1 +
 board/raspberrypi/rpi/rpi.c                             | 1 +
 board/renesas/alt/alt_spl.c                             | 1 +
 board/renesas/blanche/blanche.c                         | 1 +
 board/renesas/gose/gose_spl.c                           | 1 +
 board/renesas/koelsch/koelsch_spl.c                     | 1 +
 board/renesas/lager/lager_spl.c                         | 1 +
 board/renesas/porter/porter_spl.c                       | 1 +
 board/renesas/silk/silk_spl.c                           | 1 +
 board/renesas/stout/stout_spl.c                         | 1 +
 board/rockchip/evb_rk3308/evb_rk3308.c                  | 1 +
 board/samsung/common/exynos5-dt-types.c                 | 1 +
 board/samsung/common/misc.c                             | 1 +
 board/sandisk/sansa_fuze_plus/sfp.c                     | 1 +
 board/sandisk/sansa_fuze_plus/spl_boot.c                | 1 +
 board/sbc8548/law.c                                     | 1 +
 board/sbc8548/tlb.c                                     | 1 +
 board/sbc8641d/law.c                                    | 1 +
 board/schulercontrol/sc_sps_1/spl_boot.c                | 1 +
 board/seco/common/mx6.c                                 | 1 +
 board/siemens/capricorn/board.c                         | 1 +
 board/siemens/rut/board.c                               | 1 +
 board/sipeed/maix/maix.c                                | 1 +
 board/socrates/law.c                                    | 1 +
 board/socrates/tlb.c                                    | 1 +
 board/softing/vining_2000/vining_2000.c                 | 1 +
 board/solidrun/clearfog/clearfog.c                      | 1 +
 board/solidrun/common/tlv_data.c                        | 1 +
 board/solidrun/common/tlv_data.h                        | 1 +
 board/solidrun/mx6cuboxi/mx6cuboxi.c                    | 1 +
 board/somlabs/visionsom-6ull/visionsom-6ull.c           | 1 +
 board/st/common/stm32mp_dfu.c                           | 1 +
 board/st/common/stm32mp_mtdparts.c                      | 1 +
 board/st/common/stpmic1.c                               | 1 +
 board/st/stm32mp1/stm32mp1.c                            | 1 +
 board/synopsys/emsdp/emsdp.c                            | 1 +
 board/synopsys/hsdk/env-lib.h                           | 1 +
 board/syteco/zmx25/zmx25.c                              | 1 +
 board/tbs/tbs2910/tbs2910.c                             | 1 +
 board/technexion/pico-imx6/pico-imx6.c                  | 1 +
 board/technexion/pico-imx6ul/pico-imx6ul.c              | 1 +
 board/technexion/pico-imx6ul/spl.c                      | 1 +
 board/technexion/pico-imx7d/pico-imx7d.c                | 1 +
 board/technexion/pico-imx7d/spl.c                       | 1 +
 board/technexion/pico-imx8mq/pico-imx8mq.c              | 1 +
 board/technexion/pico-imx8mq/spl.c                      | 1 +
 board/technologic/ts4600/iomux.c                        | 1 +
 board/technologic/ts4800/ts4800.c                       | 1 +
 board/theadorable/fpga.c                                | 1 +
 board/ti/am335x/board.c                                 | 1 +
 board/ti/am43xx/board.c                                 | 1 +
 board/ti/am57xx/board.c                                 | 1 +
 board/ti/am65x/evm.c                                    | 1 +
 board/ti/beagle/beagle.c                                | 1 +
 board/ti/common/board_detect.c                          | 1 +
 board/ti/common/board_detect.h                          | 1 +
 board/ti/dra7xx/evm.c                                   | 1 +
 board/ti/j721e/evm.c                                    | 1 +
 board/ti/ks2_evm/board.c                                | 1 +
 board/ti/ks2_evm/board_k2g.c                            | 1 +
 board/toradex/apalis-imx8/apalis-imx8.c                 | 1 +
 board/toradex/apalis-tk1/apalis-tk1.c                   | 1 +
 board/toradex/apalis_imx6/apalis_imx6.c                 | 1 +
 board/toradex/apalis_imx6/pf0100.c                      | 1 +
 board/toradex/apalis_t30/apalis_t30.c                   | 1 +
 board/toradex/colibri-imx6ull/colibri-imx6ull.c         | 1 +
 board/toradex/colibri-imx8x/colibri-imx8x.c             | 1 +
 board/toradex/colibri_imx6/colibri_imx6.c               | 1 +
 board/toradex/colibri_imx6/pf0100.c                     | 1 +
 board/toradex/colibri_imx7/colibri_imx7.c               | 1 +
 board/toradex/colibri_t30/colibri_t30.c                 | 1 +
 board/toradex/colibri_vf/colibri_vf.c                   | 1 +
 board/toradex/common/tdx-cfg-block.c                    | 1 +
 board/toradex/verdin-imx8mm/spl.c                       | 1 +
 board/tqc/tqma6/tqma6.c                                 | 1 +
 board/tqc/tqma6/tqma6_mba6.c                            | 1 +
 board/tqc/tqma6/tqma6_wru4.c                            | 1 +
 board/udoo/neo/neo.c                                    | 1 +
 board/variscite/dart_6ul/dart_6ul.c                     | 1 +
 board/variscite/dart_6ul/spl.c                          | 1 +
 board/varisys/common/sys_eeprom.c                       | 1 +
 board/varisys/cyrus/law.c                               | 1 +
 board/varisys/cyrus/tlb.c                               | 1 +
 board/wandboard/wandboard.c                             | 1 +
 board/warp/warp.c                                       | 1 +
 board/warp7/warp7.c                                     | 1 +
 board/xes/xpedite517x/ddr.c                             | 1 +
 board/xes/xpedite517x/law.c                             | 1 +
 board/xes/xpedite520x/law.c                             | 1 +
 board/xes/xpedite520x/tlb.c                             | 1 +
 board/xes/xpedite537x/ddr.c                             | 1 +
 board/xes/xpedite537x/law.c                             | 1 +
 board/xes/xpedite537x/tlb.c                             | 1 +
 board/xes/xpedite550x/law.c                             | 1 +
 board/xes/xpedite550x/tlb.c                             | 1 +
 board/xilinx/common/board.c                             | 1 +
 board/xilinx/microblaze-generic/microblaze-generic.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/adtimg.c                                            | 1 +
 cmd/aes.c                                               | 1 +
 cmd/avb.c                                               | 1 +
 cmd/axi.c                                               | 1 +
 cmd/bcb.c                                               | 1 +
 cmd/bind.c                                              | 1 +
 cmd/blkcache.c                                          | 1 +
 cmd/bmp.c                                               | 1 +
 cmd/bootcount.c                                         | 1 +
 cmd/bootm.c                                             | 1 +
 cmd/bootstage.c                                         | 1 +
 cmd/clk.c                                               | 1 +
 cmd/conitrace.c                                         | 1 +
 cmd/cpu.c                                               | 1 +
 cmd/cros_ec.c                                           | 1 +
 cmd/demo.c                                              | 1 +
 cmd/dm.c                                                | 1 +
 cmd/eeprom.c                                            | 1 +
 cmd/efi.c                                               | 1 +
 cmd/efidebug.c                                          | 1 +
 cmd/elf.c                                               | 1 +
 cmd/ethsw.c                                             | 1 +
 cmd/fdt.c                                               | 1 +
 cmd/fpga.c                                              | 1 +
 cmd/host.c                                              | 1 +
 cmd/i2c.c                                               | 1 +
 cmd/ini.c                                               | 1 +
 cmd/io.c                                                | 1 +
 cmd/itest.c                                             | 1 +
 cmd/load.c                                              | 1 +
 cmd/log.c                                               | 1 +
 cmd/mem.c                                               | 1 +
 cmd/mii.c                                               | 1 +
 cmd/mmc.c                                               | 1 +
 cmd/mtd.c                                               | 1 +
 cmd/mvebu/bubt.c                                        | 1 +
 cmd/nand.c                                              | 1 +
 cmd/nvedit.c                                            | 1 +
 cmd/onenand.c                                           | 1 +
 cmd/osd.c                                               | 1 +
 cmd/part.c                                              | 1 +
 cmd/pci.c                                               | 1 +
 cmd/pinmux.c                                            | 1 +
 cmd/pmc.c                                               | 1 +
 cmd/pmic.c                                              | 1 +
 cmd/pxe.c                                               | 1 +
 cmd/pxe_utils.c                                         | 1 +
 cmd/pxe_utils.h                                         | 1 +
 cmd/qfw.c                                               | 1 +
 cmd/regulator.c                                         | 1 +
 cmd/remoteproc.c                                        | 1 +
 cmd/rtc.c                                               | 1 +
 cmd/sb.c                                                | 1 +
 cmd/sf.c                                                | 1 +
 cmd/sound.c                                             | 1 +
 cmd/spl.c                                               | 1 +
 cmd/test.c                                              | 1 +
 cmd/tlv_eeprom.c                                        | 1 +
 cmd/tpm-v1.c                                            | 1 +
 cmd/tpm-v2.c                                            | 1 +
 cmd/tpm_test.c                                          | 1 +
 cmd/trace.c                                             | 1 +
 cmd/ubi.c                                               | 1 +
 cmd/x86/fsp.c                                           | 1 +
 cmd/x86/hob.c                                           | 1 +
 cmd/x86/mtrr.c                                          | 1 +
 cmd/ximg.c                                              | 1 +
 common/android_ab.c                                     | 1 +
 common/autoboot.c                                       | 1 +
 common/avb_verify.c                                     | 1 +
 common/bloblist.c                                       | 1 +
 common/board_f.c                                        | 1 +
 common/board_r.c                                        | 1 +
 common/bootm.c                                          | 1 +
 common/bootm_os.c                                       | 1 +
 common/bootstage.c                                      | 1 +
 common/bouncebuf.c                                      | 1 +
 common/cli.c                                            | 1 +
 common/cli_hush.c                                       | 1 +
 common/console.c                                        | 1 +
 common/dfu.c                                            | 1 +
 common/dlmalloc.c                                       | 1 +
 common/edid.c                                           | 1 +
 common/eeprom/eeprom_field.c                            | 1 +
 common/fdt_support.c                                    | 1 +
 common/hash.c                                           | 1 +
 common/image-android-dt.c                               | 1 +
 common/image-android.c                                  | 1 +
 common/image-cipher.c                                   | 1 +
 common/image-fit-sig.c                                  | 1 +
 common/image-fit.c                                      | 1 +
 common/image-sig.c                                      | 1 +
 common/image.c                                          | 1 +
 common/init/board_init.c                                | 1 +
 common/iotrace.c                                        | 1 +
 common/lcd.c                                            | 1 +
 common/lcd_console.c                                    | 1 +
 common/log.c                                            | 1 +
 common/malloc_simple.c                                  | 1 +
 common/spl/spl.c                                        | 1 +
 common/spl/spl_fit.c                                    | 1 +
 common/spl/spl_sata.c                                   | 1 +
 common/spl/spl_spi.c                                    | 1 +
 common/splash.c                                         | 1 +
 common/splash_source.c                                  | 1 +
 common/update.c                                         | 1 +
 common/usb.c                                            | 1 +
 common/usb_hub.c                                        | 1 +
 common/usb_kbd.c                                        | 1 +
 common/xyzModem.c                                       | 1 +
 drivers/adc/adc-uclass.c                                | 1 +
 drivers/adc/meson-saradc.c                              | 1 +
 drivers/adc/stm32-adc-core.c                            | 1 +
 drivers/adc/stm32-adc.c                                 | 1 +
 drivers/ata/ahci.c                                      | 1 +
 drivers/ata/fsl_sata.c                                  | 1 +
 drivers/ata/sata_mv.c                                   | 1 +
 drivers/axi/axi-emul-uclass.c                           | 1 +
 drivers/axi/sandbox_store.c                             | 1 +
 drivers/bios_emulator/atibios.c                         | 1 +
 drivers/bios_emulator/x86emu/prim_ops.c                 | 1 +
 drivers/board/board-uclass.c                            | 1 +
 drivers/board/gazerbeam.c                               | 1 +
 drivers/board/sandbox.c                                 | 1 +
 drivers/bootcount/bootcount.c                           | 1 +
 drivers/clk/altera/clk-agilex.c                         | 1 +
 drivers/clk/altera/clk-arria10.c                        | 1 +
 drivers/clk/analogbits/wrpll-cln28hpc.c                 | 1 +
 drivers/clk/aspeed/clk_ast2500.c                        | 1 +
 drivers/clk/at91/clk-generated.c                        | 1 +
 drivers/clk/at91/clk-usb.c                              | 1 +
 drivers/clk/at91/pmc.c                                  | 1 +
 drivers/clk/clk-divider.c                               | 1 +
 drivers/clk/clk-hsdk-cgu.c                              | 1 +
 drivers/clk/clk-ti-sci.c                                | 1 +
 drivers/clk/clk.c                                       | 1 +
 drivers/clk/clk_sandbox.c                               | 1 +
 drivers/clk/clk_sandbox_ccf.c                           | 1 +
 drivers/clk/clk_stm32f.c                                | 1 +
 drivers/clk/clk_stm32mp1.c                              | 1 +
 drivers/clk/clk_versal.c                                | 1 +
 drivers/clk/clk_zynq.c                                  | 1 +
 drivers/clk/clk_zynqmp.c                                | 1 +
 drivers/clk/imx/clk-composite-8m.c                      | 1 +
 drivers/clk/imx/clk-gate2.c                             | 1 +
 drivers/clk/imx/clk-imx6q.c                             | 1 +
 drivers/clk/imx/clk-imx8.c                              | 1 +
 drivers/clk/imx/clk-imx8.h                              | 1 +
 drivers/clk/imx/clk-imx8mm.c                            | 1 +
 drivers/clk/imx/clk-imx8mn.c                            | 1 +
 drivers/clk/imx/clk-imx8mp.c                            | 1 +
 drivers/clk/imx/clk-imx8qm.c                            | 1 +
 drivers/clk/imx/clk-imx8qxp.c                           | 1 +
 drivers/clk/imx/clk-imxrt1020.c                         | 1 +
 drivers/clk/imx/clk-imxrt1050.c                         | 1 +
 drivers/clk/imx/clk-pfd.c                               | 1 +
 drivers/clk/imx/clk-pll14xx.c                           | 1 +
 drivers/clk/imx/clk-pllv3.c                             | 1 +
 drivers/clk/imx/clk.h                                   | 1 +
 drivers/clk/kendryte/clk.c                              | 1 +
 drivers/clk/kendryte/pll.c                              | 1 +
 drivers/clk/mediatek/clk-mtk.h                          | 1 +
 drivers/clk/meson/axg.c                                 | 1 +
 drivers/clk/meson/gxbb.c                                | 1 +
 drivers/clk/mpc83xx_clk.c                               | 1 +
 drivers/clk/mtmips/clk-mt7628.c                         | 1 +
 drivers/clk/mvebu/armada-37xx-periph.c                  | 1 +
 drivers/clk/renesas/clk-rcar-gen3.c                     | 1 +
 drivers/clk/renesas/r8a774a1-cpg-mssr.c                 | 1 +
 drivers/clk/renesas/r8a7790-cpg-mssr.c                  | 1 +
 drivers/clk/renesas/r8a7791-cpg-mssr.c                  | 1 +
 drivers/clk/renesas/r8a7792-cpg-mssr.c                  | 1 +
 drivers/clk/renesas/r8a7794-cpg-mssr.c                  | 1 +
 drivers/clk/renesas/r8a7795-cpg-mssr.c                  | 1 +
 drivers/clk/renesas/r8a7796-cpg-mssr.c                  | 1 +
 drivers/clk/renesas/r8a77965-cpg-mssr.c                 | 1 +
 drivers/clk/renesas/r8a77970-cpg-mssr.c                 | 1 +
 drivers/clk/renesas/r8a77980-cpg-mssr.c                 | 1 +
 drivers/clk/renesas/r8a77990-cpg-mssr.c                 | 1 +
 drivers/clk/renesas/r8a77995-cpg-mssr.c                 | 1 +
 drivers/clk/renesas/rcar-gen3-cpg.h                     | 1 +
 drivers/clk/renesas/renesas-cpg-mssr.c                  | 1 +
 drivers/clk/renesas/renesas-cpg-mssr.h                  | 1 +
 drivers/clk/rockchip/clk_px30.c                         | 1 +
 drivers/clk/rockchip/clk_rk3036.c                       | 1 +
 drivers/clk/rockchip/clk_rk3128.c                       | 1 +
 drivers/clk/rockchip/clk_rk3188.c                       | 1 +
 drivers/clk/rockchip/clk_rk322x.c                       | 1 +
 drivers/clk/rockchip/clk_rk3288.c                       | 1 +
 drivers/clk/rockchip/clk_rk3308.c                       | 1 +
 drivers/clk/rockchip/clk_rk3328.c                       | 1 +
 drivers/clk/rockchip/clk_rk3368.c                       | 1 +
 drivers/clk/rockchip/clk_rk3399.c                       | 1 +
 drivers/clk/rockchip/clk_rv1108.c                       | 1 +
 drivers/clk/sifive/fu540-prci.c                         | 1 +
 drivers/clk/sunxi/clk_a10.c                             | 1 +
 drivers/clk/sunxi/clk_a10s.c                            | 1 +
 drivers/clk/sunxi/clk_a23.c                             | 1 +
 drivers/clk/sunxi/clk_a31.c                             | 1 +
 drivers/clk/sunxi/clk_a64.c                             | 1 +
 drivers/clk/sunxi/clk_a80.c                             | 1 +
 drivers/clk/sunxi/clk_a83t.c                            | 1 +
 drivers/clk/sunxi/clk_h3.c                              | 1 +
 drivers/clk/sunxi/clk_h6.c                              | 1 +
 drivers/clk/sunxi/clk_r40.c                             | 1 +
 drivers/clk/sunxi/clk_v3s.c                             | 1 +
 drivers/clk/uniphier/clk-uniphier-core.c                | 1 +
 drivers/core/device-remove.c                            | 1 +
 drivers/core/device.c                                   | 1 +
 drivers/core/lists.c                                    | 1 +
 drivers/core/of_access.c                                | 1 +
 drivers/core/of_addr.c                                  | 1 +
 drivers/core/read.c                                     | 1 +
 drivers/core/root.c                                     | 1 +
 drivers/core/simple-bus.c                               | 1 +
 drivers/core/syscon-uclass.c                            | 1 +
 drivers/core/uclass.c                                   | 1 +
 drivers/cpu/mpc83xx_cpu.c                               | 1 +
 drivers/crypto/fsl/desc_constr.h                        | 1 +
 drivers/crypto/fsl/error.c                              | 1 +
 drivers/crypto/fsl/fsl_blob.c                           | 1 +
 drivers/crypto/fsl/fsl_hash.c                           | 1 +
 drivers/crypto/fsl/jobdesc.c                            | 1 +
 drivers/crypto/fsl/sec.c                                | 1 +
 drivers/crypto/rsa_mod_exp/mod_exp_uclass.c             | 1 +
 drivers/ddr/altera/sdram_gen5.c                         | 1 +
 drivers/ddr/altera/sdram_s10.c                          | 1 +
 drivers/ddr/altera/sdram_soc64.c                        | 1 +
 drivers/ddr/altera/sequencer.c                          | 1 +
 drivers/ddr/altera/sequencer.h                          | 1 +
 drivers/ddr/fsl/ctrl_regs.c                             | 1 +
 drivers/ddr/fsl/ddr1_dimm_params.c                      | 1 +
 drivers/ddr/fsl/ddr2_dimm_params.c                      | 1 +
 drivers/ddr/fsl/ddr4_dimm_params.c                      | 1 +
 drivers/ddr/fsl/interactive.c                           | 1 +
 drivers/ddr/fsl/lc_common_dimm_params.c                 | 1 +
 drivers/ddr/fsl/main.c                                  | 1 +
 drivers/ddr/fsl/util.c                                  | 1 +
 drivers/ddr/imx/imx8m/helper.c                          | 1 +
 drivers/ddr/marvell/axp/ddr3_spd.c                      | 1 +
 drivers/demo/demo-shape.c                               | 1 +
 drivers/dfu/dfu.c                                       | 1 +
 drivers/dfu/dfu_mmc.c                                   | 1 +
 drivers/dfu/dfu_mtd.c                                   | 1 +
 drivers/dma/apbh_dma.c                                  | 1 +
 drivers/dma/bcm6348-iudma.c                             | 1 +
 drivers/dma/dma-uclass.c                                | 1 +
 drivers/dma/fsl_dma.c                                   | 1 +
 drivers/dma/sandbox-dma-test.c                          | 1 +
 drivers/dma/ti/k3-udma.c                                | 1 +
 drivers/fastboot/fb_getvar.c                            | 1 +
 drivers/fastboot/fb_mmc.c                               | 1 +
 drivers/firmware/firmware-zynqmp.c                      | 1 +
 drivers/firmware/ti_sci.c                               | 1 +
 drivers/fpga/altera.c                                   | 1 +
 drivers/fpga/cyclon2.c                                  | 1 +
 drivers/fpga/socfpga.c                                  | 1 +
 drivers/fpga/socfpga_arria10.c                          | 1 +
 drivers/fpga/spartan3.c                                 | 2 ++
 drivers/fpga/stratix10.c                                | 1 +
 drivers/fpga/versalpl.c                                 | 1 +
 drivers/fpga/zynqmppl.c                                 | 1 +
 drivers/fpga/zynqpl.c                                   | 1 +
 drivers/gpio/at91_gpio.c                                | 1 +
 drivers/gpio/bcm6345_gpio.c                             | 1 +
 drivers/gpio/gpio-rcar.c                                | 1 +
 drivers/gpio/gpio-rza1.c                                | 1 +
 drivers/gpio/gpio-uclass.c                              | 1 +
 drivers/gpio/intel_ich6_gpio.c                          | 1 +
 drivers/gpio/iproc_gpio.c                               | 1 +
 drivers/gpio/mscc_sgpio.c                               | 1 +
 drivers/gpio/mxc_gpio.c                                 | 1 +
 drivers/gpio/mxs_gpio.c                                 | 1 +
 drivers/gpio/pca953x.c                                  | 1 +
 drivers/gpio/pca953x_gpio.c                             | 1 +
 drivers/gpio/pm8916_gpio.c                              | 1 +
 drivers/gpio/rk_gpio.c                                  | 1 +
 drivers/gpio/sh_pfc.c                                   | 1 +
 drivers/gpio/sifive-gpio.c                              | 1 +
 drivers/gpio/tca642x.c                                  | 1 +
 drivers/gpio/tegra186_gpio.c                            | 1 +
 drivers/i2c/at91_i2c.c                                  | 1 +
 drivers/i2c/cros_ec_ldo.c                               | 1 +
 drivers/i2c/designware_i2c.c                            | 1 +
 drivers/i2c/designware_i2c.h                            | 1 +
 drivers/i2c/designware_i2c_pci.c                        | 1 +
 drivers/i2c/exynos_hs_i2c.c                             | 1 +
 drivers/i2c/fsl_i2c.c                                   | 1 +
 drivers/i2c/i2c-cdns.c                                  | 1 +
 drivers/i2c/i2c-gpio.c                                  | 1 +
 drivers/i2c/i2c-uclass.c                                | 1 +
 drivers/i2c/i2c-uniphier-f.c                            | 1 +
 drivers/i2c/i2c-uniphier.c                              | 1 +
 drivers/i2c/ihs_i2c.c                                   | 1 +
 drivers/i2c/imx_lpi2c.c                                 | 1 +
 drivers/i2c/meson_i2c.c                                 | 1 +
 drivers/i2c/mxc_i2c.c                                   | 1 +
 drivers/i2c/nx_i2c.c                                    | 1 +
 drivers/i2c/rcar_iic.c                                  | 1 +
 drivers/i2c/rk_i2c.c                                    | 1 +
 drivers/i2c/s3c24x0_i2c.c                               | 1 +
 drivers/i2c/s3c24x0_i2c.h                               | 1 +
 drivers/i2c/sandbox_i2c.c                               | 1 +
 drivers/i2c/stm32f7_i2c.c                               | 1 +
 drivers/i2c/tegra186_bpmp_i2c.c                         | 1 +
 drivers/i2c/tegra_i2c.c                                 | 1 +
 drivers/input/cros_ec_keyb.c                            | 1 +
 drivers/input/i8042.c                                   | 1 +
 drivers/input/input.c                                   | 1 +
 drivers/led/led_bcm6328.c                               | 1 +
 drivers/led/led_bcm6358.c                               | 1 +
 drivers/led/led_bcm6858.c                               | 1 +
 drivers/mailbox/k3-sec-proxy.c                          | 1 +
 drivers/mailbox/sandbox-mbox.c                          | 1 +
 drivers/misc/atsha204a-i2c.c                            | 1 +
 drivers/misc/cros_ec.c                                  | 1 +
 drivers/misc/cros_ec_i2c.c                              | 1 +
 drivers/misc/cros_ec_sandbox.c                          | 1 +
 drivers/misc/cros_ec_spi.c                              | 1 +
 drivers/misc/ds4510.c                                   | 1 +
 drivers/misc/fsl_ifc.c                                  | 1 +
 drivers/misc/fsl_iim.c                                  | 1 +
 drivers/misc/gdsys_ioep.c                               | 1 +
 drivers/misc/gdsys_rxaui_ctrl.c                         | 1 +
 drivers/misc/gpio_led.c                                 | 1 +
 drivers/misc/i2c_eeprom_emul.c                          | 1 +
 drivers/misc/ihs_fpga.c                                 | 1 +
 drivers/misc/irq-uclass.c                               | 1 +
 drivers/misc/irq_sandbox.c                              | 1 +
 drivers/misc/misc-uclass.c                              | 1 +
 drivers/misc/misc_sandbox.c                             | 1 +
 drivers/misc/mpc83xx_serdes.c                           | 1 +
 drivers/misc/mxc_ocotp.c                                | 2 ++
 drivers/misc/mxs_ocotp.c                                | 1 +
 drivers/misc/p2sb-uclass.c                              | 1 +
 drivers/misc/p2sb_emul.c                                | 1 +
 drivers/misc/pwrseq-uclass.c                            | 1 +
 drivers/misc/qfw.c                                      | 1 +
 drivers/misc/rockchip-efuse.c                           | 1 +
 drivers/misc/rockchip-otp.c                             | 1 +
 drivers/misc/spltest_sandbox.c                          | 1 +
 drivers/misc/swap_case.c                                | 1 +
 drivers/misc/tegra186_bpmp.c                            | 1 +
 drivers/misc/vexpress_config.c                          | 1 +
 drivers/mmc/bcm2835_sdhost.c                            | 1 +
 drivers/mmc/dw_mmc.c                                    | 1 +
 drivers/mmc/exynos_dw_mmc.c                             | 1 +
 drivers/mmc/fsl_esdhc.c                                 | 1 +
 drivers/mmc/fsl_esdhc_imx.c                             | 1 +
 drivers/mmc/fsl_esdhc_spl.c                             | 1 +
 drivers/mmc/ftsdc010_mci.h                              | 1 +
 drivers/mmc/gen_atmel_mci.c                             | 1 +
 drivers/mmc/hi6220_dw_mmc.c                             | 1 +
 drivers/mmc/jz_mmc.c                                    | 1 +
 drivers/mmc/meson_gx_mmc.c                              | 1 +
 drivers/mmc/mmc-uclass.c                                | 1 +
 drivers/mmc/mmc.c                                       | 1 +
 drivers/mmc/mmc_spi.c                                   | 1 +
 drivers/mmc/mmc_write.c                                 | 1 +
 drivers/mmc/mtk-sd.c                                    | 1 +
 drivers/mmc/mxsmmc.c                                    | 1 +
 drivers/mmc/nexell_dw_mmc.c                             | 1 +
 drivers/mmc/omap_hsmmc.c                                | 1 +
 drivers/mmc/pxa_mmc_gen.c                               | 1 +
 drivers/mmc/renesas-sdhi.c                              | 1 +
 drivers/mmc/rpmb.c                                      | 1 +
 drivers/mmc/sandbox_mmc.c                               | 1 +
 drivers/mmc/sdhci-cadence.c                             | 1 +
 drivers/mmc/sdhci.c                                     | 1 +
 drivers/mmc/sh_mmcif.c                                  | 1 +
 drivers/mmc/snps_dw_mmc.c                               | 1 +
 drivers/mmc/stm32_sdmmc2.c                              | 1 +
 drivers/mmc/sunxi_mmc.c                                 | 1 +
 drivers/mmc/tmio-common.c                               | 1 +
 drivers/mmc/tmio-common.h                               | 1 +
 drivers/mmc/uniphier-sd.c                               | 1 +
 drivers/mmc/xenon_sdhci.c                               | 1 +
 drivers/mtd/cfi_flash.c                                 | 1 +
 drivers/mtd/hbmc-am654.c                                | 1 +
 drivers/mtd/jedec_flash.c                               | 1 +
 drivers/mtd/nand/bbt.c                                  | 1 +
 drivers/mtd/nand/core.c                                 | 1 +
 drivers/mtd/nand/raw/arasan_nfc.c                       | 1 +
 drivers/mtd/nand/raw/brcmnand/bcm63158_nand.c           | 1 +
 drivers/mtd/nand/raw/brcmnand/bcm6368_nand.c            | 1 +
 drivers/mtd/nand/raw/brcmnand/bcm68360_nand.c           | 1 +
 drivers/mtd/nand/raw/brcmnand/bcm6838_nand.c            | 1 +
 drivers/mtd/nand/raw/brcmnand/bcm6858_nand.c            | 1 +
 drivers/mtd/nand/raw/brcmnand/brcmnand.c                | 1 +
 drivers/mtd/nand/raw/brcmnand/brcmnand.h                | 1 +
 drivers/mtd/nand/raw/davinci_nand.c                     | 1 +
 drivers/mtd/nand/raw/denali.c                           | 1 +
 drivers/mtd/nand/raw/denali_spl.c                       | 1 +
 drivers/mtd/nand/raw/fsl_elbc_nand.c                    | 1 +
 drivers/mtd/nand/raw/fsl_ifc_nand.c                     | 1 +
 drivers/mtd/nand/raw/fsmc_nand.c                        | 1 +
 drivers/mtd/nand/raw/lpc32xx_nand_mlc.c                 | 1 +
 drivers/mtd/nand/raw/lpc32xx_nand_slc.c                 | 1 +
 drivers/mtd/nand/raw/mxc_nand.c                         | 1 +
 drivers/mtd/nand/raw/mxc_nand_spl.c                     | 1 +
 drivers/mtd/nand/raw/mxs_nand.c                         | 1 +
 drivers/mtd/nand/raw/nand_base.c                        | 1 +
 drivers/mtd/nand/raw/nand_bbt.c                         | 1 +
 drivers/mtd/nand/raw/nand_bch.c                         | 1 +
 drivers/mtd/nand/raw/nand_spl_loaders.c                 | 1 +
 drivers/mtd/nand/raw/nand_util.c                        | 1 +
 drivers/mtd/nand/raw/pxa3xx_nand.c                      | 1 +
 drivers/mtd/nand/raw/pxa3xx_nand.h                      | 1 +
 drivers/mtd/nand/raw/stm32_fmc2_nand.c                  | 1 +
 drivers/mtd/nand/raw/sunxi_nand_spl.c                   | 1 +
 drivers/mtd/nand/raw/vf610_nfc.c                        | 1 +
 drivers/mtd/nand/raw/zynq_nand.c                        | 1 +
 drivers/mtd/onenand/onenand_base.c                      | 1 +
 drivers/mtd/onenand/onenand_spl.c                       | 1 +
 drivers/mtd/renesas_rpc_hf.c                            | 1 +
 drivers/mtd/spi/sandbox.c                               | 1 +
 drivers/mtd/spi/sf_dataflash.c                          | 1 +
 drivers/mtd/spi/sf_mtd.c                                | 1 +
 drivers/mtd/spi/spi-nor-core.c                          | 1 +
 drivers/mtd/spi/spi-nor-tiny.c                          | 1 +
 drivers/mtd/st_smi.c                                    | 1 +
 drivers/mtd/ubi/debug.c                                 | 1 +
 drivers/mtd/ubi/eba.c                                   | 1 +
 drivers/mtd/ubi/fastmap-wl.c                            | 1 +
 drivers/mtd/ubi/fastmap.c                               | 1 +
 drivers/mtd/ubi/io.c                                    | 1 +
 drivers/mtd/ubi/misc.c                                  | 1 +
 drivers/mtd/ubi/ubi.h                                   | 1 +
 drivers/mtd/ubi/upd.c                                   | 1 +
 drivers/mtd/ubi/vmt.c                                   | 1 +
 drivers/mtd/ubi/vtbl.c                                  | 1 +
 drivers/mtd/ubispl/ubispl.c                             | 1 +
 drivers/net/armada100_fec.h                             | 1 +
 drivers/net/ax88180.c                                   | 1 +
 drivers/net/bcm-sf2-eth-gmac.c                          | 1 +
 drivers/net/bcm-sf2-eth.h                               | 1 +
 drivers/net/bcm6348-eth.c                               | 1 +
 drivers/net/bcm6368-eth.c                               | 1 +
 drivers/net/bcmgenet.c                                  | 1 +
 drivers/net/dc2114x.c                                   | 1 +
 drivers/net/dnet.c                                      | 1 +
 drivers/net/dwc_eth_qos.c                               | 1 +
 drivers/net/e1000.c                                     | 1 +
 drivers/net/e1000.h                                     | 1 +
 drivers/net/e1000_spi.c                                 | 1 +
 drivers/net/eepro100.c                                  | 1 +
 drivers/net/fec_mxc.c                                   | 1 +
 drivers/net/fm/eth.c                                    | 1 +
 drivers/net/fm/init.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/ftgmac100.c                                 | 1 +
 drivers/net/ftmac110.c                                  | 1 +
 drivers/net/gmac_rockchip.c                             | 1 +
 drivers/net/ks8851_mll.c                                | 1 +
 drivers/net/lan91c96.c                                  | 1 +
 drivers/net/ldpaa_eth/ldpaa_eth.c                       | 1 +
 drivers/net/ldpaa_eth/ldpaa_eth.h                       | 1 +
 drivers/net/lpc32xx_eth.c                               | 1 +
 drivers/net/macb.c                                      | 1 +
 drivers/net/mcfmii.c                                    | 1 +
 drivers/net/mpc8xx_fec.c                                | 1 +
 drivers/net/mscc_eswitch/jr2_switch.c                   | 1 +
 drivers/net/mscc_eswitch/luton_switch.c                 | 1 +
 drivers/net/mscc_eswitch/mscc_xfer.c                    | 1 +
 drivers/net/mscc_eswitch/mscc_xfer.h                    | 1 +
 drivers/net/mscc_eswitch/ocelot_switch.c                | 1 +
 drivers/net/mscc_eswitch/serval_switch.c                | 1 +
 drivers/net/mscc_eswitch/servalt_switch.c               | 1 +
 drivers/net/mtk_eth.c                                   | 1 +
 drivers/net/mvgbe.h                                     | 1 +
 drivers/net/mvneta.c                                    | 1 +
 drivers/net/mvpp2.c                                     | 1 +
 drivers/net/ne2000.c                                    | 1 +
 drivers/net/ne2000_base.c                               | 1 +
 drivers/net/ne2000_base.h                               | 1 +
 drivers/net/netconsole.c                                | 1 +
 drivers/net/pch_gbe.h                                   | 1 +
 drivers/net/pfe_eth/pfe_mdio.c                          | 1 +
 drivers/net/phy/aquantia.c                              | 1 +
 drivers/net/phy/atheros.c                               | 1 +
 drivers/net/phy/dp83867.c                               | 1 +
 drivers/net/phy/micrel_ksz90x1.c                        | 1 +
 drivers/net/phy/mscc.c                                  | 1 +
 drivers/net/phy/mv88e61xx.c                             | 1 +
 drivers/net/phy/ncsi.c                                  | 1 +
 drivers/net/ravb.c                                      | 1 +
 drivers/net/rtl8139.c                                   | 1 +
 drivers/net/rtl8169.c                                   | 1 +
 drivers/net/sandbox.c                                   | 1 +
 drivers/net/sh_eth.c                                    | 1 +
 drivers/net/smc911x.c                                   | 1 +
 drivers/net/sni_ave.c                                   | 1 +
 drivers/net/sun8i_emac.c                                | 1 +
 drivers/net/ti/am65-cpsw-nuss.c                         | 1 +
 drivers/net/ti/cpsw.c                                   | 1 +
 drivers/net/ti/davinci_emac.c                           | 1 +
 drivers/net/ti/davinci_emac.h                           | 1 +
 drivers/net/ti/keystone_net.c                           | 1 +
 drivers/net/tsec.c                                      | 1 +
 drivers/net/zynq_gem.c                                  | 1 +
 drivers/nvme/nvme.c                                     | 1 +
 drivers/nvme/nvme.h                                     | 1 +
 drivers/pch/pch-uclass.c                                | 1 +
 drivers/pch/pch7.c                                      | 1 +
 drivers/pch/sandbox_pch.c                               | 1 +
 drivers/pci/fsl_pci_init.c                              | 1 +
 drivers/pci/pci-aardvark.c                              | 1 +
 drivers/pci/pci-rcar-gen3.c                             | 1 +
 drivers/pci/pci-uclass.c                                | 1 +
 drivers/pci/pci.c                                       | 1 +
 drivers/pci/pci_auto.c                                  | 1 +
 drivers/pci/pci_auto_common.c                           | 1 +
 drivers/pci/pci_auto_old.c                              | 1 +
 drivers/pci/pci_gt64120.c                               | 1 +
 drivers/pci/pci_msc01.c                                 | 1 +
 drivers/pci/pci_mvebu.c                                 | 1 +
 drivers/pci/pci_rom.c                                   | 1 +
 drivers/pci/pci_tegra.c                                 | 1 +
 drivers/pci/pcie_brcmstb.c                              | 1 +
 drivers/pci/pcie_dw_mvebu.c                             | 1 +
 drivers/pci/pcie_dw_ti.c                                | 1 +
 drivers/pci/pcie_ecam_generic.c                         | 1 +
 drivers/pci/pcie_fsl.c                                  | 1 +
 drivers/pci/pcie_fsl.h                                  | 1 +
 drivers/pci/pcie_imx.c                                  | 1 +
 drivers/pci/pcie_intel_fpga.c                           | 1 +
 drivers/pci/pcie_layerscape.h                           | 2 +-
 drivers/pci/pcie_layerscape_ep.c                        | 1 +
 drivers/pci/pcie_layerscape_fixup_common.c              | 1 +
 drivers/pci/pcie_layerscape_gen4.c                      | 1 +
 drivers/pci/pcie_layerscape_gen4.h                      | 1 +
 drivers/pci/pcie_xilinx.c                               | 1 +
 drivers/pci_endpoint/pci_ep-uclass.c                    | 1 +
 drivers/pci_endpoint/pcie-cadence-ep.c                  | 1 +
 drivers/phy/marvell/comphy_a3700.c                      | 1 +
 drivers/phy/marvell/comphy_cp110.c                      | 1 +
 drivers/phy/phy-stm32-usbphyc.c                         | 1 +
 drivers/phy/rockchip/phy-rockchip-inno-usb2.c           | 1 +
 drivers/phy/rockchip/phy-rockchip-typec.c               | 1 +
 drivers/phy/sandbox-phy.c                               | 1 +
 drivers/phy/sti_usb_phy.c                               | 1 +
 drivers/pinctrl/aspeed/pinctrl_ast2500.c                | 1 +
 drivers/pinctrl/ath79/pinctrl_ar933x.c                  | 1 +
 drivers/pinctrl/ath79/pinctrl_qca953x.c                 | 1 +
 drivers/pinctrl/exynos/pinctrl-exynos7420.c             | 1 +
 drivers/pinctrl/intel/pinctrl_apl.c                     | 1 +
 drivers/pinctrl/mediatek/pinctrl-mt7622.c               | 1 +
 drivers/pinctrl/mediatek/pinctrl-mt7623.c               | 1 +
 drivers/pinctrl/mediatek/pinctrl-mt7629.c               | 1 +
 drivers/pinctrl/mediatek/pinctrl-mt8512.c               | 1 +
 drivers/pinctrl/mediatek/pinctrl-mt8516.c               | 1 +
 drivers/pinctrl/mediatek/pinctrl-mt8518.c               | 1 +
 drivers/pinctrl/mediatek/pinctrl-mtk-common.c           | 1 +
 drivers/pinctrl/mediatek/pinctrl-mtk-common.h           | 1 +
 drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c           | 1 +
 drivers/pinctrl/meson/pinctrl-meson-axg.c               | 1 +
 drivers/pinctrl/meson/pinctrl-meson-g12a.c              | 1 +
 drivers/pinctrl/meson/pinctrl-meson-gx-pmx.c            | 1 +
 drivers/pinctrl/meson/pinctrl-meson-gxbb.c              | 1 +
 drivers/pinctrl/meson/pinctrl-meson-gxl.c               | 1 +
 drivers/pinctrl/meson/pinctrl-meson.h                   | 1 +
 drivers/pinctrl/mscc/pinctrl-jr2.c                      | 1 +
 drivers/pinctrl/mscc/pinctrl-luton.c                    | 1 +
 drivers/pinctrl/mscc/pinctrl-ocelot.c                   | 1 +
 drivers/pinctrl/mscc/pinctrl-serval.c                   | 1 +
 drivers/pinctrl/mscc/pinctrl-servalt.c                  | 1 +
 drivers/pinctrl/mtmips/pinctrl-mt7628.c                 | 1 +
 drivers/pinctrl/mtmips/pinctrl-mtmips-common.h          | 1 +
 drivers/pinctrl/mvebu/pinctrl-armada-37xx.c             | 1 +
 drivers/pinctrl/nexell/pinctrl-s5pxx18.c                | 1 +
 drivers/pinctrl/pinctrl-at91-pio4.c                     | 1 +
 drivers/pinctrl/pinctrl-at91.c                          | 1 +
 drivers/pinctrl/pinctrl-generic.c                       | 1 +
 drivers/pinctrl/pinctrl-sandbox.c                       | 1 +
 drivers/pinctrl/pinctrl-single.c                        | 1 +
 drivers/pinctrl/pinctrl-sti.c                           | 1 +
 drivers/pinctrl/pinctrl-stmfx.c                         | 1 +
 drivers/pinctrl/pinctrl_pic32.c                         | 1 +
 drivers/pinctrl/pinctrl_stm32.c                         | 1 +
 drivers/pinctrl/renesas/pfc-r7s72100.c                  | 1 +
 drivers/pinctrl/renesas/pfc.c                           | 1 +
 drivers/pinctrl/renesas/sh_pfc.h                        | 1 +
 drivers/pinctrl/rockchip/pinctrl-px30.c                 | 1 +
 drivers/pinctrl/rockchip/pinctrl-rk3036.c               | 1 +
 drivers/pinctrl/rockchip/pinctrl-rk3128.c               | 1 +
 drivers/pinctrl/rockchip/pinctrl-rk3188.c               | 1 +
 drivers/pinctrl/rockchip/pinctrl-rk322x.c               | 1 +
 drivers/pinctrl/rockchip/pinctrl-rk3288.c               | 1 +
 drivers/pinctrl/rockchip/pinctrl-rk3308.c               | 1 +
 drivers/pinctrl/rockchip/pinctrl-rk3328.c               | 1 +
 drivers/pinctrl/rockchip/pinctrl-rk3368.c               | 1 +
 drivers/pinctrl/rockchip/pinctrl-rk3399.c               | 1 +
 drivers/pinctrl/rockchip/pinctrl-rockchip-core.c        | 1 +
 drivers/pinctrl/rockchip/pinctrl-rockchip.h             | 1 +
 drivers/pinctrl/rockchip/pinctrl-rv1108.c               | 1 +
 drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c        | 1 +
 drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c        | 1 +
 drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c         | 1 +
 drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c        | 1 +
 drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c        | 1 +
 drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c        | 1 +
 drivers/pinctrl/uniphier/pinctrl-uniphier-pxs2.c        | 1 +
 drivers/pinctrl/uniphier/pinctrl-uniphier-pxs3.c        | 1 +
 drivers/pinctrl/uniphier/pinctrl-uniphier-sld8.c        | 1 +
 drivers/power/acpi_pmc/acpi-pmc-uclass.c                | 1 +
 drivers/power/acpi_pmc/pmc_emul.c                       | 1 +
 drivers/power/axp809.c                                  | 1 +
 drivers/power/axp818.c                                  | 1 +
 drivers/power/domain/imx8-power-domain-legacy.c         | 1 +
 drivers/power/domain/meson-ee-pwrc.c                    | 1 +
 drivers/power/domain/power-domain-uclass.c              | 1 +
 drivers/power/domain/sandbox-power-domain.c             | 1 +
 drivers/power/domain/tegra186-power-domain.c            | 1 +
 drivers/power/fuel_gauge/fg_max17042.c                  | 1 +
 drivers/power/pmic/da9063.c                             | 1 +
 drivers/power/pmic/i2c_pmic_emul.c                      | 1 +
 drivers/power/pmic/rk8xx.c                              | 1 +
 drivers/power/regulator/act8846.c                       | 1 +
 drivers/power/regulator/as3722_regulator.c              | 1 +
 drivers/power/regulator/bd71837.c                       | 1 +
 drivers/power/regulator/da9063.c                        | 1 +
 drivers/power/regulator/fan53555.c                      | 1 +
 drivers/power/regulator/fixed.c                         | 1 +
 drivers/power/regulator/gpio-regulator.c                | 1 +
 drivers/power/regulator/lp873x_regulator.c              | 1 +
 drivers/power/regulator/lp87565_regulator.c             | 1 +
 drivers/power/regulator/max77686.c                      | 1 +
 drivers/power/regulator/palmas_regulator.c              | 1 +
 drivers/power/regulator/pfuze100.c                      | 1 +
 drivers/power/regulator/pwm_regulator.c                 | 1 +
 drivers/power/regulator/regulator-uclass.c              | 1 +
 drivers/power/regulator/regulator_common.c              | 1 +
 drivers/power/regulator/regulator_common.h              | 2 ++
 drivers/power/regulator/rk8xx.c                         | 1 +
 drivers/power/regulator/s2mps11_regulator.c             | 1 +
 drivers/power/regulator/s5m8767.c                       | 1 +
 drivers/power/regulator/sandbox.c                       | 1 +
 drivers/power/regulator/stpmic1.c                       | 1 +
 drivers/power/regulator/tps62360_regulator.c            | 1 +
 drivers/power/regulator/tps65090_regulator.c            | 1 +
 drivers/power/regulator/tps65910_regulator.c            | 1 +
 drivers/power/regulator/tps65941_regulator.c            | 1 +
 drivers/power/tps6586x.c                                | 1 +
 drivers/pwm/exynos_pwm.c                                | 1 +
 drivers/pwm/pwm-imx.c                                   | 1 +
 drivers/pwm/pwm-mtk.c                                   | 1 +
 drivers/pwm/pwm-sifive.c                                | 1 +
 drivers/pwm/pwm-uclass.c                                | 1 +
 drivers/pwm/rk_pwm.c                                    | 1 +
 drivers/pwm/sandbox_pwm.c                               | 1 +
 drivers/pwm/sunxi_pwm.c                                 | 1 +
 drivers/pwm/tegra_pwm.c                                 | 1 +
 drivers/qe/uec.c                                        | 1 +
 drivers/qe/uec_phy.c                                    | 1 +
 drivers/ram/k3-j721e/lpddr4_if.h                        | 1 +
 drivers/ram/k3-j721e/lpddr4_sanity.h                    | 1 +
 drivers/ram/k3-j721e/lpddr4_structs_if.h                | 1 +
 drivers/ram/rockchip/dmc-rk3368.c                       | 1 +
 drivers/ram/rockchip/sdram_px30.c                       | 1 +
 drivers/ram/rockchip/sdram_rk3188.c                     | 1 +
 drivers/ram/rockchip/sdram_rk322x.c                     | 1 +
 drivers/ram/rockchip/sdram_rk3288.c                     | 1 +
 drivers/ram/rockchip/sdram_rk3328.c                     | 1 +
 drivers/ram/rockchip/sdram_rk3399.c                     | 1 +
 drivers/ram/stm32mp1/stm32mp1_ddr.c                     | 1 +
 drivers/ram/stm32mp1/stm32mp1_ddr.h                     | 1 +
 drivers/ram/stm32mp1/stm32mp1_interactive.c             | 1 +
 drivers/ram/stm32mp1/stm32mp1_ram.c                     | 1 +
 drivers/ram/stm32mp1/stm32mp1_tests.c                   | 1 +
 drivers/ram/stm32mp1/stm32mp1_tuning.c                  | 1 +
 drivers/remoteproc/rproc-elf-loader.c                   | 1 +
 drivers/remoteproc/rproc-uclass.c                       | 1 +
 drivers/remoteproc/ti_k3_dsp_rproc.c                    | 1 +
 drivers/reset/ast2500-reset.c                           | 1 +
 drivers/reset/reset-hsdk.c                              | 1 +
 drivers/reset/reset-meson.c                             | 1 +
 drivers/reset/reset-socfpga.c                           | 1 +
 drivers/reset/sandbox-reset.c                           | 1 +
 drivers/reset/sti-reset.c                               | 1 +
 drivers/rng/rockchip_rng.c                              | 1 +
 drivers/rtc/ds1374.c                                    | 1 +
 drivers/rtc/i2c_rtc_emul.c                              | 1 +
 drivers/rtc/rv3029.c                                    | 1 +
 drivers/scsi/scsi.c                                     | 1 +
 drivers/serial/altera_jtag_uart.c                       | 1 +
 drivers/serial/altera_uart.c                            | 1 +
 drivers/serial/arm_dcc.c                                | 1 +
 drivers/serial/atmel_usart.c                            | 1 +
 drivers/serial/lpc32xx_hsuart.c                         | 1 +
 drivers/serial/ns16550.c                                | 1 +
 drivers/serial/sandbox.c                                | 1 +
 drivers/serial/serial-uclass.c                          | 1 +
 drivers/serial/serial.c                                 | 1 +
 drivers/serial/serial_ar933x.c                          | 1 +
 drivers/serial/serial_arc.c                             | 1 +
 drivers/serial/serial_bcm283x_mu.c                      | 1 +
 drivers/serial/serial_bcm283x_pl011.c                   | 1 +
 drivers/serial/serial_bcm6345.c                         | 1 +
 drivers/serial/serial_cortina.c                         | 1 +
 drivers/serial/serial_efi.c                             | 1 +
 drivers/serial/serial_linflexuart.c                     | 1 +
 drivers/serial/serial_lpuart.c                          | 1 +
 drivers/serial/serial_mcf.c                             | 1 +
 drivers/serial/serial_meson.c                           | 1 +
 drivers/serial/serial_mpc8xx.c                          | 1 +
 drivers/serial/serial_msm.c                             | 1 +
 drivers/serial/serial_mtk.c                             | 1 +
 drivers/serial/serial_mvebu_a3700.c                     | 1 +
 drivers/serial/serial_mxc.c                             | 1 +
 drivers/serial/serial_nulldev.c                         | 1 +
 drivers/serial/serial_owl.c                             | 1 +
 drivers/serial/serial_pic32.c                           | 1 +
 drivers/serial/serial_pl01x.c                           | 1 +
 drivers/serial/serial_pl01x_internal.h                  | 1 +
 drivers/serial/serial_pxa.c                             | 1 +
 drivers/serial/serial_s5p.c                             | 1 +
 drivers/serial/serial_sh.c                              | 1 +
 drivers/serial/serial_sti_asc.c                         | 1 +
 drivers/serial/serial_stm32.c                           | 1 +
 drivers/serial/serial_stm32.h                           | 1 +
 drivers/serial/serial_uniphier.c                        | 1 +
 drivers/serial/serial_xuartlite.c                       | 1 +
 drivers/serial/usbtty.c                                 | 1 +
 drivers/smem/msm_smem.c                                 | 1 +
 drivers/soc/soc-uclass.c                                | 1 +
 drivers/soc/ti/k3-navss-ringacc.c                       | 1 +
 drivers/soc/ti/keystone_serdes.c                        | 1 +
 drivers/sound/da7219.c                                  | 1 +
 drivers/sound/max98088.c                                | 1 +
 drivers/sound/max98095.c                                | 1 +
 drivers/sound/max98357a.c                               | 1 +
 drivers/sound/rockchip_i2s.c                            | 1 +
 drivers/sound/rt5677.c                                  | 1 +
 drivers/sound/sandbox.c                                 | 1 +
 drivers/sound/tegra_ahub.c                              | 1 +
 drivers/sound/wm8994.c                                  | 1 +
 drivers/spi/atcspi200_spi.c                             | 1 +
 drivers/spi/atmel-quadspi.c                             | 1 +
 drivers/spi/atmel_spi.c                                 | 1 +
 drivers/spi/bcm63xx_hsspi.c                             | 1 +
 drivers/spi/bcmstb_spi.c                                | 1 +
 drivers/spi/cadence_qspi.h                              | 1 +
 drivers/spi/cadence_qspi_apb.c                          | 1 +
 drivers/spi/davinci_spi.c                               | 1 +
 drivers/spi/designware_spi.c                            | 1 +
 drivers/spi/exynos_spi.c                                | 1 +
 drivers/spi/fsl_dspi.c                                  | 1 +
 drivers/spi/fsl_espi.c                                  | 1 +
 drivers/spi/fsl_qspi.c                                  | 1 +
 drivers/spi/ich.c                                       | 1 +
 drivers/spi/kirkwood_spi.c                              | 1 +
 drivers/spi/meson_spifc.c                               | 1 +
 drivers/spi/mpc8xxx_spi.c                               | 1 +
 drivers/spi/mscc_bb_spi.c                               | 1 +
 drivers/spi/mt7621_spi.c                                | 1 +
 drivers/spi/mvebu_a3700_spi.c                           | 1 +
 drivers/spi/mxc_spi.c                                   | 1 +
 drivers/spi/mxs_spi.c                                   | 1 +
 drivers/spi/pic32_spi.c                                 | 1 +
 drivers/spi/pl022_spi.c                                 | 1 +
 drivers/spi/renesas_rpc_spi.c                           | 1 +
 drivers/spi/rk_spi.c                                    | 1 +
 drivers/spi/sh_qspi.c                                   | 1 +
 drivers/spi/spi-mem-nodm.c                              | 1 +
 drivers/spi/spi-mem.c                                   | 1 +
 drivers/spi/spi-sifive.c                                | 1 +
 drivers/spi/spi-sunxi.c                                 | 1 +
 drivers/spi/spi-uclass.c                                | 1 +
 drivers/spi/stm32_qspi.c                                | 1 +
 drivers/spi/stm32_spi.c                                 | 1 +
 drivers/spi/uniphier_spi.c                              | 1 +
 drivers/spi/zynqmp_gqspi.c                              | 1 +
 drivers/spmi/spmi-msm.c                                 | 1 +
 drivers/spmi/spmi-sandbox.c                             | 1 +
 drivers/sysreset/sysreset_mpc83xx.c                     | 1 +
 drivers/tee/broadcom/chimp_optee.c                      | 1 +
 drivers/tee/optee/core.c                                | 1 +
 drivers/tee/optee/optee_smc.h                           | 1 +
 drivers/tee/optee/rpmb.c                                | 1 +
 drivers/tee/sandbox.c                                   | 1 +
 drivers/tee/tee-uclass.c                                | 1 +
 drivers/thermal/imx_scu_thermal.c                       | 1 +
 drivers/thermal/imx_tmu.c                               | 1 +
 drivers/timer/sandbox_timer.c                           | 1 +
 drivers/timer/timer-uclass.c                            | 1 +
 drivers/timer/tsc_timer.c                               | 2 ++
 drivers/tpm/cr50_i2c.c                                  | 1 +
 drivers/tpm/tpm2_tis_sandbox.c                          | 1 +
 drivers/tpm/tpm2_tis_spi.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/ufs/ufs.c                                       | 1 +
 drivers/ufs/ufs.h                                       | 1 +
 drivers/usb/cdns3/cdns3-ti.c                            | 1 +
 drivers/usb/cdns3/core.h                                | 1 +
 drivers/usb/cdns3/ep0.c                                 | 1 +
 drivers/usb/cdns3/gadget.c                              | 1 +
 drivers/usb/cdns3/gadget.h                              | 1 +
 drivers/usb/common/common.c                             | 1 +
 drivers/usb/common/fsl-dt-fixup.c                       | 1 +
 drivers/usb/common/fsl-errata.c                         | 1 +
 drivers/usb/dwc3/core.c                                 | 1 +
 drivers/usb/dwc3/gadget.c                               | 1 +
 drivers/usb/dwc3/gadget.h                               | 1 +
 drivers/usb/dwc3/io.h                                   | 1 +
 drivers/usb/emul/sandbox_flash.c                        | 1 +
 drivers/usb/emul/sandbox_keyb.c                         | 1 +
 drivers/usb/emul/usb-emul-uclass.c                      | 1 +
 drivers/usb/eth/lan7x.c                                 | 1 +
 drivers/usb/eth/lan7x.h                                 | 1 +
 drivers/usb/eth/mcs7830.c                               | 1 +
 drivers/usb/eth/r8152.c                                 | 1 +
 drivers/usb/eth/r8152.h                                 | 1 +
 drivers/usb/eth/r8152_fw.c                              | 1 +
 drivers/usb/eth/smsc95xx.c                              | 1 +
 drivers/usb/eth/usb_ether.c                             | 1 +
 drivers/usb/gadget/at91_udc.c                           | 1 +
 drivers/usb/gadget/at91_udc.h                           | 1 +
 drivers/usb/gadget/atmel_usba_udc.c                     | 1 +
 drivers/usb/gadget/atmel_usba_udc.h                     | 1 +
 drivers/usb/gadget/ci_udc.c                             | 1 +
 drivers/usb/gadget/ci_udc.h                             | 1 +
 drivers/usb/gadget/composite.c                          | 1 +
 drivers/usb/gadget/designware_udc.c                     | 1 +
 drivers/usb/gadget/dwc2_udc_otg.c                       | 1 +
 drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c              | 1 +
 drivers/usb/gadget/ep0.c                                | 1 +
 drivers/usb/gadget/ether.c                              | 1 +
 drivers/usb/gadget/f_dfu.c                              | 1 +
 drivers/usb/gadget/f_fastboot.c                         | 1 +
 drivers/usb/gadget/f_mass_storage.c                     | 1 +
 drivers/usb/gadget/f_rockusb.c                          | 1 +
 drivers/usb/gadget/f_sdp.c                              | 1 +
 drivers/usb/gadget/f_thor.c                             | 1 +
 drivers/usb/gadget/fotg210.c                            | 1 +
 drivers/usb/gadget/g_dnl.c                              | 1 +
 drivers/usb/gadget/pxa25x_udc.c                         | 1 +
 drivers/usb/gadget/pxa27x_udc.c                         | 1 +
 drivers/usb/gadget/rndis.c                              | 1 +
 drivers/usb/gadget/udc/udc-core.c                       | 1 +
 drivers/usb/gadget/udc/udc-uclass.c                     | 1 +
 drivers/usb/gadget/usbstring.c                          | 1 +
 drivers/usb/host/dwc2.c                                 | 1 +
 drivers/usb/host/dwc3-sti-glue.c                        | 1 +
 drivers/usb/host/ehci-faraday.c                         | 1 +
 drivers/usb/host/ehci-fsl.c                             | 1 +
 drivers/usb/host/ehci-hcd.c                             | 1 +
 drivers/usb/host/ehci-msm.c                             | 1 +
 drivers/usb/host/ehci-mx6.c                             | 1 +
 drivers/usb/host/ehci-mxs.c                             | 1 +
 drivers/usb/host/ehci-rmobile.c                         | 1 +
 drivers/usb/host/ehci-tegra.c                           | 1 +
 drivers/usb/host/ehci-vf.c                              | 1 +
 drivers/usb/host/ohci-hcd.c                             | 1 +
 drivers/usb/host/r8a66597-hcd.c                         | 1 +
 drivers/usb/host/sl811-hcd.c                            | 1 +
 drivers/usb/host/usb-sandbox.c                          | 1 +
 drivers/usb/host/usb-uclass.c                           | 1 +
 drivers/usb/host/xhci-mem.c                             | 1 +
 drivers/usb/host/xhci-rcar.c                            | 1 +
 drivers/usb/host/xhci-ring.c                            | 1 +
 drivers/usb/host/xhci.c                                 | 1 +
 drivers/usb/musb-new/mt85xx.c                           | 1 +
 drivers/usb/musb-new/musb_core.h                        | 1 +
 drivers/usb/musb-new/musb_dma.h                         | 1 +
 drivers/usb/musb-new/musb_gadget.h                      | 1 +
 drivers/usb/musb-new/pic32.c                            | 1 +
 drivers/usb/musb-new/sunxi.c                            | 1 +
 drivers/usb/musb/musb_hcd.c                             | 1 +
 drivers/usb/musb/musb_udc.c                             | 1 +
 drivers/usb/phy/rockchip_usb2_phy.c                     | 1 +
 drivers/video/am335x-fb.c                               | 1 +
 drivers/video/ati_radeon_fb.c                           | 1 +
 drivers/video/atmel_hlcdfb.c                            | 1 +
 drivers/video/atmel_lcdfb.c                             | 1 +
 drivers/video/backlight_gpio.c                          | 1 +
 drivers/video/bcm2835.c                                 | 1 +
 drivers/video/bridge/video-bridge-uclass.c              | 1 +
 drivers/video/broadwell_igd.c                           | 1 +
 drivers/video/cfb_console.c                             | 1 +
 drivers/video/console_truetype.c                        | 1 +
 drivers/video/da8xx-fb.c                                | 1 +
 drivers/video/display-uclass.c                          | 1 +
 drivers/video/dw_hdmi.c                                 | 1 +
 drivers/video/dw_mipi_dsi.c                             | 1 +
 drivers/video/exynos/exynos_fb.c                        | 1 +
 drivers/video/exynos/exynos_mipi_dsi_common.c           | 1 +
 drivers/video/fsl_dcu_fb.c                              | 1 +
 drivers/video/fsl_diu_fb.c                              | 1 +
 drivers/video/hitachi_tx18d42vm_lcd.c                   | 1 +
 drivers/video/ihs_video_out.c                           | 1 +
 drivers/video/imx/ipu.h                                 | 1 +
 drivers/video/imx/mxc_ipuv3_fb.c                        | 1 +
 drivers/video/ivybridge_igd.c                           | 1 +
 drivers/video/ld9040.c                                  | 1 +
 drivers/video/lg4573.c                                  | 1 +
 drivers/video/logicore_dp_tx.c                          | 1 +
 drivers/video/logicore_dp_tx.h                          | 1 +
 drivers/video/mali_dp.c                                 | 1 +
 drivers/video/meson/meson_dw_hdmi.c                     | 1 +
 drivers/video/meson/meson_plane.c                       | 1 +
 drivers/video/meson/meson_vclk.c                        | 1 +
 drivers/video/meson/meson_venc.c                        | 1 +
 drivers/video/meson/meson_vpu.c                         | 1 +
 drivers/video/meson/meson_vpu.h                         | 1 +
 drivers/video/meson/meson_vpu_init.c                    | 1 +
 drivers/video/mipi_dsi.c                                | 1 +
 drivers/video/mvebu_lcd.c                               | 1 +
 drivers/video/mxsfb.c                                   | 1 +
 drivers/video/nexell/s5pxx18_dp_lvds.c                  | 2 ++
 drivers/video/nexell/s5pxx18_dp_mipi.c                  | 1 +
 drivers/video/nexell/s5pxx18_dp_rgb.c                   | 2 ++
 drivers/video/nexell/soc/s5pxx18_soc_disptop_clk.c      | 1 +
 drivers/video/nexell/soc/s5pxx18_soc_lvds.c             | 1 +
 drivers/video/orisetech_otm8009a.c                      | 1 +
 drivers/video/pwm_backlight.c                           | 1 +
 drivers/video/raydium-rm68200.c                         | 1 +
 drivers/video/rockchip/rk3288_hdmi.c                    | 1 +
 drivers/video/rockchip/rk3288_vop.c                     | 1 +
 drivers/video/rockchip/rk3399_hdmi.c                    | 1 +
 drivers/video/rockchip/rk3399_vop.c                     | 1 +
 drivers/video/rockchip/rk_edp.c                         | 1 +
 drivers/video/s6e8ax0.c                                 | 1 +
 drivers/video/scf0403_lcd.c                             | 1 +
 drivers/video/ssd2828.c                                 | 1 +
 drivers/video/stm32/stm32_dsi.c                         | 1 +
 drivers/video/stm32/stm32_ltdc.c                        | 1 +
 drivers/video/sunxi/lcdc.c                              | 1 +
 drivers/video/sunxi/sunxi_de2.c                         | 1 +
 drivers/video/sunxi/sunxi_display.c                     | 1 +
 drivers/video/sunxi/sunxi_dw_hdmi.c                     | 1 +
 drivers/video/tegra.c                                   | 1 +
 drivers/video/tegra124/display.c                        | 1 +
 drivers/video/tegra124/dp.c                             | 1 +
 drivers/video/vidconsole-uclass.c                       | 1 +
 drivers/video/video-uclass.c                            | 1 +
 drivers/video/video_bmp.c                               | 1 +
 drivers/virtio/virtio_net.c                             | 1 +
 drivers/virtio/virtio_ring.c                            | 1 +
 drivers/virtio/virtio_rng.c                             | 1 +
 drivers/w1/mxc_w1.c                                     | 1 +
 drivers/w1/w1-gpio.c                                    | 1 +
 drivers/w1/w1-uclass.c                                  | 1 +
 drivers/watchdog/ast_wdt.c                              | 1 +
 drivers/watchdog/at91sam9_wdt.c                         | 1 +
 drivers/watchdog/cdns_wdt.c                             | 1 +
 drivers/watchdog/designware_wdt.c                       | 1 +
 drivers/watchdog/imx_watchdog.c                         | 1 +
 drivers/watchdog/tangier_wdt.c                          | 1 +
 drivers/watchdog/xilinx_wwdt.c                          | 1 +
 env/common.c                                            | 1 +
 env/env.c                                               | 1 +
 env/flags.c                                             | 1 +
 env/mmc.c                                               | 1 +
 env/nand.c                                              | 1 +
 env/sata.c                                              | 1 +
 env/sf.c                                                | 1 +
 fs/btrfs/inode.c                                        | 1 +
 fs/btrfs/subvolume.c                                    | 2 +-
 fs/btrfs/super.c                                        | 1 +
 fs/cbfs/cbfs.c                                          | 1 +
 fs/ext4/ext4_common.c                                   | 1 +
 fs/ext4/ext4_write.c                                    | 1 +
 fs/fat/fat.c                                            | 1 +
 fs/fat/fat_write.c                                      | 1 +
 fs/fs.c                                                 | 1 +
 fs/fs_internal.c                                        | 1 +
 fs/jffs2/compr_lzo.c                                    | 1 +
 fs/jffs2/jffs2_1pass.c                                  | 1 +
 fs/ubifs/debug.c                                        | 1 +
 fs/ubifs/io.c                                           | 1 +
 fs/ubifs/key.h                                          | 1 +
 fs/ubifs/log.c                                          | 1 +
 fs/ubifs/lprops.c                                       | 1 +
 fs/ubifs/lpt_commit.c                                   | 1 +
 fs/ubifs/misc.h                                         | 1 +
 fs/ubifs/orphan.c                                       | 1 +
 fs/ubifs/recovery.c                                     | 1 +
 fs/ubifs/replay.c                                       | 1 +
 fs/ubifs/scan.c                                         | 1 +
 fs/ubifs/super.c                                        | 1 +
 fs/ubifs/tnc.c                                          | 1 +
 fs/ubifs/ubifs.h                                        | 1 +
 fs/zfs/zfs.c                                            | 1 +
 include/acpi/acpi_device.h                              | 1 +
 include/acpi/acpigen.h                                  | 1 +
 include/adc.h                                           | 2 ++
 include/ahci.h                                          | 1 +
 include/asm-generic/gpio.h                              | 1 +
 include/atsha204a-i2c.h                                 | 1 +
 include/avb_verify.h                                    | 1 +
 include/bmp_layout.h                                    | 2 ++
 include/board.h                                         | 1 +
 include/bootstage.h                                     | 2 ++
 include/cli.h                                           | 1 +
 include/clk.h                                           | 1 +
 include/command.h                                       | 2 ++
 include/common.h                                        | 1 -
 include/cpsw.h                                          | 1 +
 include/cros_ec.h                                       | 1 +
 include/crypto/pkcs7_parser.h                           | 1 +
 include/crypto/public_key.h                             | 1 +
 include/crypto/x509_parser.h                            | 1 +
 include/dfu.h                                           | 1 +
 include/display.h                                       | 2 ++
 include/display_options.h                               | 2 ++
 include/div64.h                                         | 1 +
 include/dm/device-internal.h                            | 1 +
 include/dm/device.h                                     | 1 +
 include/dm/devres.h                                     | 1 +
 include/dm/lists.h                                      | 1 +
 include/dm/of.h                                         | 1 +
 include/dm/of_access.h                                  | 1 +
 include/dm/ofnode.h                                     | 1 +
 include/dm/platform_data/serial_bcm283x_mu.h            | 1 +
 include/dm/platform_data/serial_mxc.h                   | 1 +
 include/dm/platform_data/serial_pl01x.h                 | 1 +
 include/dm/read.h                                       | 1 +
 include/dm/root.h                                       | 1 +
 include/dm/uclass-internal.h                            | 1 +
 include/dw_hdmi.h                                       | 1 +
 include/dwmmc.h                                         | 1 +
 include/edid.h                                          | 1 +
 include/efi.h                                           | 1 +
 include/efi_api.h                                       | 1 +
 include/efi_selftest.h                                  | 1 +
 include/efi_variable.h                                  | 1 +
 include/exception.h                                     | 1 +
 include/fdtdec.h                                        | 1 +
 include/fsl-mc/fsl_dpaa_fd.h                            | 1 +
 include/fsl_ddr_sdram.h                                 | 1 +
 include/fsl_errata.h                                    | 1 +
 include/fsl_usb.h                                       | 1 +
 include/g_dnl.h                                         | 1 +
 include/generic-phy.h                                   | 1 +
 include/hexdump.h                                       | 1 +
 include/i2c.h                                           | 1 +
 include/image-android-dt.h                              | 1 +
 include/image-sparse.h                                  | 1 +
 include/input.h                                         | 1 +
 include/irq.h                                           | 1 +
 include/kendryte/bypass.h                               | 2 ++
 include/kendryte/pll.h                                  | 1 +
 include/keys/asymmetric-type.h                          | 1 +
 include/lcd.h                                           | 1 +
 include/linux/err.h                                     | 2 +-
 include/linux/list.h                                    | 1 +
 include/linux/log2.h                                    | 1 +
 include/linux/soc/ti/cppi5.h                            | 1 +
 include/linux/soc/ti/ti_sci_protocol.h                  | 1 +
 include/linux/types.h                                   | 1 -
 include/log.h                                           | 1 +
 include/memalign.h                                      | 1 +
 include/membuff.h                                       | 2 ++
 include/mipi_dsi.h                                      | 1 +
 include/misc.h                                          | 1 +
 include/mmc.h                                           | 1 +
 include/mvebu/comphy.h                                  | 1 +
 include/mxs_nand.h                                      | 1 +
 include/net.h                                           | 1 +
 include/net/ncsi.h                                      | 1 +
 include/net/pcap.h                                      | 1 +
 include/os.h                                            | 1 +
 include/p2sb.h                                          | 1 +
 include/pch.h                                           | 1 +
 include/pci.h                                           | 2 ++
 include/phy-sun4i-usb.h                                 | 1 +
 include/phy.h                                           | 1 +
 include/phy_interface.h                                 | 2 ++
 include/power/acpi_pmc.h                                | 1 +
 include/power/regulator.h                               | 1 +
 include/pwm.h                                           | 1 +
 include/pwrseq.h                                        | 1 +
 include/qfw.h                                           | 1 +
 include/remoteproc.h                                    | 1 +
 include/reset.h                                         | 1 +
 include/rtc.h                                           | 1 +
 include/samsung/exynos5-dt-types.h                      | 1 +
 include/scsi.h                                          | 1 +
 include/sdhci.h                                         | 1 +
 include/serial.h                                        | 1 +
 include/spi-mem.h                                       | 2 ++
 include/spi_flash.h                                     | 1 +
 include/spl.h                                           | 1 +
 include/stm32_rcc.h                                     | 1 +
 include/tee.h                                           | 1 +
 include/test/ut.h                                       | 1 +
 include/tlv_eeprom.h                                    | 1 +
 include/usb.h                                           | 1 +
 include/usb/dwc2_udc.h                                  | 1 +
 include/usb/xhci.h                                      | 2 ++
 include/usb_defs.h                                      | 1 +
 include/vbe.h                                           | 1 +
 include/video.h                                         | 1 +
 include/video_bridge.h                                  | 1 +
 include/virtio.h                                        | 1 +
 include/virtio_ring.h                                   | 1 +
 include/w1.h                                            | 2 ++
 include/wait_bit.h                                      | 1 +
 include/xyzModem.h                                      | 1 +
 lib/acpi/acpi_device.c                                  | 1 +
 lib/acpi/acpi_table.c                                   | 1 +
 lib/acpi/acpigen.c                                      | 1 +
 lib/aes/aes-decrypt.c                                   | 1 +
 lib/bch.c                                               | 1 +
 lib/crypto/asymmetric_type.c                            | 1 +
 lib/display_options.c                                   | 1 +
 lib/efi/efi_stub.c                                      | 1 +
 lib/efi_loader/efi_acpi.c                               | 1 +
 lib/efi_loader/efi_boottime.c                           | 1 +
 lib/efi_loader/efi_console.c                            | 1 +
 lib/efi_loader/efi_device_path.c                        | 1 +
 lib/efi_loader/efi_device_path_to_text.c                | 1 +
 lib/efi_loader/efi_device_path_utilities.c              | 1 +
 lib/efi_loader/efi_disk.c                               | 1 +
 lib/efi_loader/efi_file.c                               | 1 +
 lib/efi_loader/efi_gop.c                                | 1 +
 lib/efi_loader/efi_hii.c                                | 1 +
 lib/efi_loader/efi_image_loader.c                       | 1 +
 lib/efi_loader/efi_load_initrd.c                        | 1 +
 lib/efi_loader/efi_memory.c                             | 1 +
 lib/efi_loader/efi_net.c                                | 1 +
 lib/efi_loader/efi_runtime.c                            | 1 +
 lib/efi_loader/efi_signature.c                          | 1 +
 lib/efi_loader/efi_smbios.c                             | 1 +
 lib/efi_loader/efi_unicode_collation.c                  | 1 +
 lib/efi_loader/efi_var_common.c                         | 1 +
 lib/efi_loader/efi_var_file.c                           | 1 +
 lib/efi_loader/efi_var_mem.c                            | 1 +
 lib/efi_loader/efi_variable.c                           | 1 +
 lib/efi_loader/efi_variable_tee.c                       | 1 +
 lib/efi_selftest/efi_selftest_loaded_image.c            | 1 +
 lib/efi_selftest/efi_selftest_memory.c                  | 1 +
 lib/efi_selftest/efi_selftest_set_virtual_address_map.c | 1 +
 lib/efi_selftest/efi_selftest_textinputex.c             | 1 +
 lib/efi_selftest/efi_selftest_unicode_collation.c       | 1 +
 lib/efi_selftest/efi_selftest_watchdog.c                | 1 +
 lib/elf.c                                               | 1 +
 lib/errno_str.c                                         | 1 +
 lib/fdtdec.c                                            | 1 +
 lib/fdtdec_test.c                                       | 1 +
 lib/hexdump.c                                           | 1 +
 lib/image-sparse.c                                      | 1 +
 lib/libavb/avb_sysdeps.h                                | 1 +
 lib/lmb.c                                               | 1 +
 lib/lzma/LzmaTools.c                                    | 1 +
 lib/lzo/lzo1x_decompress.c                              | 2 ++
 lib/membuff.c                                           | 1 +
 lib/of_live.c                                           | 1 +
 lib/smbios.c                                            | 1 +
 lib/time.c                                              | 1 +
 lib/tiny-printf.c                                       | 1 +
 lib/tpm-v1.c                                            | 1 +
 lib/tpm-v2.c                                            | 1 +
 lib/trace.c                                             | 1 +
 lib/uuid.c                                              | 1 +
 lib/vsprintf.c                                          | 1 +
 net/arp.c                                               | 1 +
 net/bootp.c                                             | 1 +
 net/eth-uclass.c                                        | 1 +
 net/eth_legacy.c                                        | 1 +
 net/fastboot.c                                          | 1 +
 net/mdio-mux-uclass.c                                   | 1 +
 net/net.c                                               | 1 +
 net/pcap.c                                              | 1 +
 net/tftp.c                                              | 1 +
 post/drivers/memory.c                                   | 1 +
 post/lib_powerpc/andi.c                                 | 1 +
 post/lib_powerpc/cmp.c                                  | 1 +
 post/lib_powerpc/cmpi.c                                 | 1 +
 post/lib_powerpc/cr.c                                   | 1 +
 post/lib_powerpc/fpu/mul-subnormal-single-1.c           | 1 +
 post/lib_powerpc/load.c                                 | 1 +
 post/lib_powerpc/multi.c                                | 1 +
 post/lib_powerpc/rlwimi.c                               | 1 +
 post/lib_powerpc/rlwinm.c                               | 1 +
 post/lib_powerpc/rlwnm.c                                | 1 +
 post/lib_powerpc/srawi.c                                | 1 +
 post/lib_powerpc/store.c                                | 1 +
 post/lib_powerpc/three.c                                | 1 +
 post/lib_powerpc/threei.c                               | 1 +
 post/lib_powerpc/threex.c                               | 1 +
 post/lib_powerpc/two.c                                  | 1 +
 post/lib_powerpc/twox.c                                 | 1 +
 post/post.c                                             | 1 +
 post/tests.c                                            | 1 +
 test/bloblist.c                                         | 1 +
 test/cmd_ut.c                                           | 1 +
 test/dm/acpi.c                                          | 1 +
 test/dm/acpi_dp.c                                       | 1 +
 test/dm/acpigen.c                                       | 1 +
 test/dm/axi.c                                           | 1 +
 test/dm/board.c                                         | 1 +
 test/dm/core.c                                          | 1 +
 test/dm/gpio.c                                          | 1 +
 test/dm/i2s.c                                           | 1 +
 test/dm/k210_pll.c                                      | 1 +
 test/dm/misc.c                                          | 1 +
 test/dm/panel.c                                         | 1 +
 test/dm/regulator.c                                     | 1 +
 test/dm/remoteproc.c                                    | 1 +
 test/dm/rtc.c                                           | 1 +
 test/dm/test-main.c                                     | 1 +
 test/lib/test_aes.c                                     | 1 +
 test/optee/cmd_ut_optee.c                               | 1 +
 test/str_ut.c                                           | 1 +
 test/time_ut.c                                          | 1 +
 test/unicode_ut.c                                       | 1 +
 1924 files changed, 1951 insertions(+), 8 deletions(-)

diff --git a/arch/arc/lib/cpu.c b/arch/arc/lib/cpu.c
index 903824615131..11b2e828088a 100644
--- a/arch/arc/lib/cpu.c
+++ b/arch/arc/lib/cpu.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <init.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/arcregs.h>
diff --git a/arch/arm/cpu/arm1136/mx31/generic.c b/arch/arm/cpu/arm1136/mx31/generic.c
index ef738d6cd845..c6814a82d769 100644
--- a/arch/arm/cpu/arm1136/mx31/generic.c
+++ b/arch/arm/cpu/arm1136/mx31/generic.c
@@ -12,6 +12,7 @@
 #include <asm/arch/clock.h>
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/kernel.h>
 
 static u32 mx31_decode_pll(u32 reg, u32 infreq)
 {
diff --git a/arch/arm/cpu/arm926ejs/mx25/generic.c b/arch/arm/cpu/arm926ejs/mx25/generic.c
index 8b74650b3647..71e143b8a929 100644
--- a/arch/arm/cpu/arm926ejs/mx25/generic.c
+++ b/arch/arm/cpu/arm926ejs/mx25/generic.c
@@ -14,6 +14,7 @@
 #include <init.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
diff --git a/arch/arm/cpu/arm926ejs/mx27/generic.c b/arch/arm/cpu/arm926ejs/mx27/generic.c
index ec5f5e12e1e7..376ab2eaeac1 100644
--- a/arch/arm/cpu/arm926ejs/mx27/generic.c
+++ b/arch/arm/cpu/arm926ejs/mx27/generic.c
@@ -19,6 +19,7 @@
 #include <asm/arch/mxcmmc.h>
 #endif
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 /*
  *  get the system pll clock in Hz
diff --git a/arch/arm/cpu/arm926ejs/mxs/spl_boot.c b/arch/arm/cpu/arm926ejs/mxs/spl_boot.c
index f24378305fc3..88386dbb20f7 100644
--- a/arch/arm/cpu/arm926ejs/mxs/spl_boot.c
+++ b/arch/arm/cpu/arm926ejs/mxs/spl_boot.c
@@ -18,6 +18,7 @@
 #include <asm/gpio.h>
 #include <asm/u-boot.h>
 #include <linux/compiler.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include "mxs_init.h"
diff --git a/arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c b/arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c
index a94803ee93d9..4d2d988c287e 100644
--- a/arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c
+++ b/arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c
@@ -14,6 +14,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
 #include <linux/compiler.h>
+#include <linux/kernel.h>
 
 #include "mxs_init.h"
 
diff --git a/arch/arm/cpu/arm926ejs/mxs/spl_power_init.c b/arch/arm/cpu/arm926ejs/mxs/spl_power_init.c
index 35ea71a5ba89..f57e1bb96c85 100644
--- a/arch/arm/cpu/arm926ejs/mxs/spl_power_init.c
+++ b/arch/arm/cpu/arm926ejs/mxs/spl_power_init.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
+#include <linux/kernel.h>
 
 #include "mxs_init.h"
 
diff --git a/arch/arm/cpu/arm926ejs/spear/spear600.c b/arch/arm/cpu/arm926ejs/spear/spear600.c
index b31ede5eb948..2b036215d1c1 100644
--- a/arch/arm/cpu/arm926ejs/spear/spear600.c
+++ b/arch/arm/cpu/arm926ejs/spear/spear600.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <stdbool.h>
 #include <asm/hardware.h>
 #include <asm/io.h>
 #include <asm/arch/spr_misc.h>
diff --git a/arch/arm/cpu/armv7/bcm235xx/clk-bcm235xx.c b/arch/arm/cpu/armv7/bcm235xx/clk-bcm235xx.c
index abdbcb068ee9..3c6cba611de6 100644
--- a/arch/arm/cpu/armv7/bcm235xx/clk-bcm235xx.c
+++ b/arch/arm/cpu/armv7/bcm235xx/clk-bcm235xx.c
@@ -14,6 +14,7 @@
 #include <linux/errno.h>
 #include <asm/arch/sysmap.h>
 #include <asm/kona-common/clk.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "clk-core.h"
 
diff --git a/arch/arm/cpu/armv7/bcm235xx/clk-core.c b/arch/arm/cpu/armv7/bcm235xx/clk-core.c
index 8c718bf5f0bd..098c5afb7313 100644
--- a/arch/arm/cpu/armv7/bcm235xx/clk-core.c
+++ b/arch/arm/cpu/armv7/bcm235xx/clk-core.c
@@ -18,6 +18,7 @@
 #include <bitfield.h>
 #include <asm/arch/sysmap.h>
 #include <asm/kona-common/clk.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "clk-core.h"
 
diff --git a/arch/arm/cpu/armv7/bcm235xx/clk-core.h b/arch/arm/cpu/armv7/bcm235xx/clk-core.h
index 91d38703fa77..6dfc4afb0067 100644
--- a/arch/arm/cpu/armv7/bcm235xx/clk-core.h
+++ b/arch/arm/cpu/armv7/bcm235xx/clk-core.h
@@ -4,6 +4,7 @@
  */
 
 #include <stdio.h>
+#include <linux/kernel.h>
 #include <linux/stddef.h>
 #include <linux/stringify.h>
 
diff --git a/arch/arm/cpu/armv7/bcm281xx/clk-bcm281xx.c b/arch/arm/cpu/armv7/bcm281xx/clk-bcm281xx.c
index ee0e75304807..96ce2333cdea 100644
--- a/arch/arm/cpu/armv7/bcm281xx/clk-bcm281xx.c
+++ b/arch/arm/cpu/armv7/bcm281xx/clk-bcm281xx.c
@@ -14,6 +14,7 @@
 #include <linux/errno.h>
 #include <asm/arch/sysmap.h>
 #include <asm/kona-common/clk.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "clk-core.h"
 
diff --git a/arch/arm/cpu/armv7/bcm281xx/clk-core.c b/arch/arm/cpu/armv7/bcm281xx/clk-core.c
index d1828d6234a9..2fb195bf8f9c 100644
--- a/arch/arm/cpu/armv7/bcm281xx/clk-core.c
+++ b/arch/arm/cpu/armv7/bcm281xx/clk-core.c
@@ -18,6 +18,7 @@
 #include <bitfield.h>
 #include <asm/arch/sysmap.h>
 #include <asm/kona-common/clk.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "clk-core.h"
 
diff --git a/arch/arm/cpu/armv7/bcm281xx/clk-core.h b/arch/arm/cpu/armv7/bcm281xx/clk-core.h
index 531d9a4f3eb7..74780012e24a 100644
--- a/arch/arm/cpu/armv7/bcm281xx/clk-core.h
+++ b/arch/arm/cpu/armv7/bcm281xx/clk-core.h
@@ -4,6 +4,7 @@
  */
 
 #include <stdio.h>
+#include <linux/kernel.h>
 #include <linux/stddef.h>
 #include <linux/stringify.h>
 
diff --git a/arch/arm/cpu/armv7/exception_level.c b/arch/arm/cpu/armv7/exception_level.c
index f6d25bb682c7..5845cca9a335 100644
--- a/arch/arm/cpu/armv7/exception_level.c
+++ b/arch/arm/cpu/armv7/exception_level.c
@@ -12,6 +12,7 @@
 #include <bootm.h>
 #include <cpu_func.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/armv7.h>
 #include <asm/secure.h>
 #include <asm/setjmp.h>
diff --git a/arch/arm/cpu/armv7/kona-common/clk-stubs.c b/arch/arm/cpu/armv7/kona-common/clk-stubs.c
index 2dfa3f7e7314..19aa6c07358f 100644
--- a/arch/arm/cpu/armv7/kona-common/clk-stubs.c
+++ b/arch/arm/cpu/armv7/kona-common/clk-stubs.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 
 /*
  * These weak functions are available to kona architectures that don't
diff --git a/arch/arm/cpu/armv7/ls102xa/cpu.c b/arch/arm/cpu/armv7/ls102xa/cpu.c
index b7ec5ccdd267..5e922953c960 100644
--- a/arch/arm/cpu/armv7/ls102xa/cpu.c
+++ b/arch/arm/cpu/armv7/ls102xa/cpu.c
@@ -22,6 +22,7 @@
 #include <fsl_wdog.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 
 #include "fsl_epu.h"
 
diff --git a/arch/arm/cpu/armv7/ls102xa/fdt.c b/arch/arm/cpu/armv7/ls102xa/fdt.c
index 684c0c91ef5c..aef54ebf3c86 100644
--- a/arch/arm/cpu/armv7/ls102xa/fdt.c
+++ b/arch/arm/cpu/armv7/ls102xa/fdt.c
@@ -10,6 +10,7 @@
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <asm/io.h>
diff --git a/arch/arm/cpu/armv7/ls102xa/ls102xa_serdes.c b/arch/arm/cpu/armv7/ls102xa/ls102xa_serdes.c
index 8c030be8b36f..3d313b1ad762 100644
--- a/arch/arm/cpu/armv7/ls102xa/ls102xa_serdes.c
+++ b/arch/arm/cpu/armv7/ls102xa/ls102xa_serdes.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <asm/arch/fsl_serdes.h>
 #include <asm/arch/immap_ls102xa.h>
+#include <linux/kernel.h>
 
 static u8 serdes_cfg_tbl[][SRDS_MAX_LANES] = {
 	[0x00] = {PCIE1, PCIE1, PCIE1, PCIE1},
diff --git a/arch/arm/cpu/armv7/ls102xa/soc.c b/arch/arm/cpu/armv7/ls102xa/soc.c
index 8a95ee86a9b7..bcee1c545d0a 100644
--- a/arch/arm/cpu/armv7/ls102xa/soc.c
+++ b/arch/arm/cpu/armv7/ls102xa/soc.c
@@ -13,6 +13,7 @@
 #include <asm/arch/ls102xa_stream_id.h>
 #include <fsl_csu.h>
 #include <fsl_ddr_sdram.h>
+#include <linux/kernel.h>
 
 struct liodn_id_table sec_liodn_tbl[] = {
 	SET_SEC_JR_LIODN_ENTRY(0, 0x10, 0x10),
diff --git a/arch/arm/cpu/armv7/sunxi/psci.c b/arch/arm/cpu/armv7/sunxi/psci.c
index 1ac50f558a40..5f21529bf2e0 100644
--- a/arch/arm/cpu/armv7/sunxi/psci.c
+++ b/arch/arm/cpu/armv7/sunxi/psci.c
@@ -8,6 +8,7 @@
  */
 #include <config.h>
 #include <common.h>
+#include <stdbool.h>
 #include <asm/cache.h>
 
 #include <asm/arch/cpu.h>
diff --git a/arch/arm/cpu/armv7/virt-v7.c b/arch/arm/cpu/armv7/virt-v7.c
index 0031bf859754..cf0954cb9b3b 100644
--- a/arch/arm/cpu/armv7/virt-v7.c
+++ b/arch/arm/cpu/armv7/virt-v7.c
@@ -16,6 +16,7 @@
 #include <asm/gic.h>
 #include <asm/io.h>
 #include <asm/secure.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 static unsigned int read_id_pfr1(void)
diff --git a/arch/arm/cpu/armv8/cache_v8.c b/arch/arm/cpu/armv8/cache_v8.c
index 052ba4d5407d..8add6ac333b2 100644
--- a/arch/arm/cpu/armv8/cache_v8.c
+++ b/arch/arm/cpu/armv8/cache_v8.c
@@ -17,6 +17,7 @@
 #include <asm/global_data.h>
 #include <asm/system.h>
 #include <asm/armv8/mmu.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
index bf38eacb8eb9..38ff2ce207d1 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
@@ -42,6 +42,7 @@
 #include <asm/arch/clock.h>
 #include <hwconfig.h>
 #include <fsl_qbman.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #ifdef CONFIG_TFABOOT
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 917ae991a525..f79328394c90 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <env.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/io.h>
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/icid.c b/arch/arm/cpu/armv8/fsl-layerscape/icid.c
index 84ca91a0cc8e..5c378da0636c 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/icid.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/icid.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <stdio.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls1012a_serdes.c b/arch/arm/cpu/armv8/fsl-layerscape/ls1012a_serdes.c
index 8d7beca7db38..33d9a64e6800 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/ls1012a_serdes.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/ls1012a_serdes.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <asm/arch/fsl_serdes.h>
 #include <asm/arch/immap_lsch2.h>
+#include <linux/kernel.h>
 
 struct serdes_config {
 	u32 protocol;
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls1028_ids.c b/arch/arm/cpu/armv8/fsl-layerscape/ls1028_ids.c
index 2d25c92c6ee1..4d12ffae1bd0 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/ls1028_ids.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/ls1028_ids.c
@@ -9,6 +9,7 @@
 #include <asm/arch-fsl-layerscape/immap_lsch3.h>
 #include <asm/arch-fsl-layerscape/fsl_icid.h>
 #include <asm/arch-fsl-layerscape/fsl_portals.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 struct icid_id_table icid_tbl[] = {
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls1028a_serdes.c b/arch/arm/cpu/armv8/fsl-layerscape/ls1028a_serdes.c
index 80d2910f679f..1079dd8b95fb 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/ls1028a_serdes.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/ls1028a_serdes.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <asm/arch/fsl_serdes.h>
+#include <linux/kernel.h>
 
 struct serdes_config {
 	u32 protocol;
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls1043_ids.c b/arch/arm/cpu/armv8/fsl-layerscape/ls1043_ids.c
index 3bd993bebfbc..780b11aff319 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/ls1043_ids.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/ls1043_ids.c
@@ -8,6 +8,7 @@
 #include <asm/arch-fsl-layerscape/fsl_icid.h>
 #include <asm/arch-fsl-layerscape/fsl_portals.h>
 #include <fsl_sec.h>
+#include <linux/kernel.h>
 
 #ifdef CONFIG_SYS_DPAA_QBMAN
 struct qportal_info qp_info[CONFIG_SYS_QMAN_NUM_PORTALS] = {
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls1043a_serdes.c b/arch/arm/cpu/armv8/fsl-layerscape/ls1043a_serdes.c
index 6c5e52ebaa69..8a9ef8fef937 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/ls1043a_serdes.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/ls1043a_serdes.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <asm/arch/fsl_serdes.h>
 #include <asm/arch/immap_lsch2.h>
+#include <linux/kernel.h>
 
 struct serdes_config {
 	u32 protocol;
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls1046_ids.c b/arch/arm/cpu/armv8/fsl-layerscape/ls1046_ids.c
index abd847b5be02..bb0814162e28 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/ls1046_ids.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/ls1046_ids.c
@@ -7,6 +7,7 @@
 #include <asm/arch-fsl-layerscape/immap_lsch2.h>
 #include <asm/arch-fsl-layerscape/fsl_icid.h>
 #include <asm/arch-fsl-layerscape/fsl_portals.h>
+#include <linux/kernel.h>
 
 #ifdef CONFIG_SYS_DPAA_QBMAN
 struct qportal_info qp_info[CONFIG_SYS_QMAN_NUM_PORTALS] = {
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls1046a_serdes.c b/arch/arm/cpu/armv8/fsl-layerscape/ls1046a_serdes.c
index 9347e516bf69..0c1c40d04b39 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/ls1046a_serdes.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/ls1046a_serdes.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <asm/arch/fsl_serdes.h>
 #include <asm/arch/immap_lsch2.h>
+#include <linux/kernel.h>
 
 struct serdes_config {
 	u32 protocol;
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls1088_ids.c b/arch/arm/cpu/armv8/fsl-layerscape/ls1088_ids.c
index 23743ae10cff..0fb0699768d5 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/ls1088_ids.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/ls1088_ids.c
@@ -7,6 +7,7 @@
 #include <asm/arch-fsl-layerscape/immap_lsch3.h>
 #include <asm/arch-fsl-layerscape/fsl_icid.h>
 #include <asm/arch-fsl-layerscape/fsl_portals.h>
+#include <linux/kernel.h>
 
 struct icid_id_table icid_tbl[] = {
 	SET_SDHC_ICID(1, FSL_SDMMC_STREAM_ID),
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls1088a_serdes.c b/arch/arm/cpu/armv8/fsl-layerscape/ls1088a_serdes.c
index 280afbbf98f7..fb7680fdc5f4 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/ls1088a_serdes.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/ls1088a_serdes.c
@@ -7,6 +7,7 @@
 #include <asm/arch/fsl_serdes.h>
 #include <asm/arch/soc.h>
 #include <asm/io.h>
+#include <linux/kernel.h>
 
 struct serdes_config {
 	u8 ip_protocol;
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls2080a_serdes.c b/arch/arm/cpu/armv8/fsl-layerscape/ls2080a_serdes.c
index 7997422840f2..b21da530dcfc 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/ls2080a_serdes.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/ls2080a_serdes.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <asm/arch/fsl_serdes.h>
+#include <linux/kernel.h>
 
 struct serdes_config {
 	u8 protocol;
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls2088_ids.c b/arch/arm/cpu/armv8/fsl-layerscape/ls2088_ids.c
index e6403b795263..f4af82abd862 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/ls2088_ids.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/ls2088_ids.c
@@ -7,6 +7,7 @@
 #include <asm/arch-fsl-layerscape/immap_lsch3.h>
 #include <asm/arch-fsl-layerscape/fsl_icid.h>
 #include <asm/arch-fsl-layerscape/fsl_portals.h>
+#include <linux/kernel.h>
 
 struct icid_id_table icid_tbl[] = {
 	SET_SDHC_ICID(1, FSL_SDMMC_STREAM_ID),
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/lx2160_ids.c b/arch/arm/cpu/armv8/fsl-layerscape/lx2160_ids.c
index 3a0ed1fa550c..90fe6889b9d6 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/lx2160_ids.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/lx2160_ids.c
@@ -7,6 +7,7 @@
 #include <asm/arch-fsl-layerscape/immap_lsch3.h>
 #include <asm/arch-fsl-layerscape/fsl_icid.h>
 #include <asm/arch-fsl-layerscape/fsl_portals.h>
+#include <linux/kernel.h>
 
 struct icid_id_table icid_tbl[] = {
 	SET_SDHC_ICID(1, FSL_SDMMC_STREAM_ID),
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/lx2160a_serdes.c b/arch/arm/cpu/armv8/fsl-layerscape/lx2160a_serdes.c
index a04a370268b1..67c8f6651466 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/lx2160a_serdes.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/lx2160a_serdes.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <asm/arch/fsl_serdes.h>
+#include <linux/kernel.h>
 
 struct serdes_config {
 	u8 protocol;
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/mp.c b/arch/arm/cpu/armv8/fsl-layerscape/mp.c
index a85fa358765f..f032f49279a1 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/mp.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/mp.c
@@ -16,6 +16,7 @@
 #include <asm/arch/mp.h>
 #include <asm/arch/soc.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "cpu.h"
 #include <asm/arch-fsl-layerscape/soc.h>
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ppa.c b/arch/arm/cpu/armv8/fsl-layerscape/ppa.c
index 60f2a4b002d4..4aaeda367bf2 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/ppa.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/ppa.c
@@ -25,6 +25,7 @@
 #include <fsl_validate.h>
 #endif
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #ifdef CONFIG_SYS_LS_PPA_FW_IN_NAND
 #include <nand.h>
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/soc.c b/arch/arm/cpu/armv8/fsl-layerscape/soc.c
index aaf0bb6440c8..85ae0c49df54 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/soc.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/soc.c
@@ -11,6 +11,7 @@
 #include <fsl_immap.h>
 #include <fsl_ifc.h>
 #include <init.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/errno.h>
diff --git a/arch/arm/cpu/armv8/fwcall.c b/arch/arm/cpu/armv8/fwcall.c
index b29bc30fc253..8085a0351f3a 100644
--- a/arch/arm/cpu/armv8/fwcall.c
+++ b/arch/arm/cpu/armv8/fwcall.c
@@ -7,6 +7,7 @@
 
 #include <asm-offsets.h>
 #include <config.h>
+#include <stdbool.h>
 #include <version.h>
 #include <asm/cache.h>
 #include <asm/macro.h>
diff --git a/arch/arm/include/asm/arch-fsl-layerscape/fsl_icid.h b/arch/arm/include/asm/arch-fsl-layerscape/fsl_icid.h
index 3c06a55cb853..24b249b0683d 100644
--- a/arch/arm/include/asm/arch-fsl-layerscape/fsl_icid.h
+++ b/arch/arm/include/asm/arch-fsl-layerscape/fsl_icid.h
@@ -6,6 +6,7 @@
 #ifndef _FSL_ICID_H_
 #define _FSL_ICID_H_
 
+#include <stdbool.h>
 #include <asm/types.h>
 #include <fsl_qbman.h>
 #include <fsl_sec.h>
diff --git a/arch/arm/include/asm/arch-fsl-layerscape/soc.h b/arch/arm/include/asm/arch-fsl-layerscape/soc.h
index 020548ac6ce6..52f0452cded9 100644
--- a/arch/arm/include/asm/arch-fsl-layerscape/soc.h
+++ b/arch/arm/include/asm/arch-fsl-layerscape/soc.h
@@ -8,6 +8,7 @@
 #define _ASM_ARMV8_FSL_LAYERSCAPE_SOC_H_
 
 #ifndef __ASSEMBLY__
+#include <stdbool.h>
 #include <linux/types.h>
 #ifdef CONFIG_FSL_LSCH2
 #include <asm/arch/immap_lsch2.h>
diff --git a/arch/arm/include/asm/arch-imx8/sys_proto.h b/arch/arm/include/asm/arch-imx8/sys_proto.h
index 6f1fc8f999d1..12f657186208 100644
--- a/arch/arm/include/asm/arch-imx8/sys_proto.h
+++ b/arch/arm/include/asm/arch-imx8/sys_proto.h
@@ -3,6 +3,7 @@
  * Copyright 2018 NXP
  */
 
+#include <stdbool.h>
 #include <asm/arch/sci/sci.h>
 #include <asm/mach-imx/sys_proto.h>
 #include <asm/arch/power-domain.h>
diff --git a/arch/arm/include/asm/arch-imx8m/clock.h b/arch/arm/include/asm/arch-imx8m/clock.h
index 87cc4d3b2b71..848a93ec3f20 100644
--- a/arch/arm/include/asm/arch-imx8m/clock.h
+++ b/arch/arm/include/asm/arch-imx8m/clock.h
@@ -5,6 +5,7 @@
  * Peng Fan <peng.fan@nxp.com>
  */
 
+#include <stdbool.h>
 #include <linux/bitops.h>
 
 #ifdef CONFIG_IMX8MQ
diff --git a/arch/arm/include/asm/arch-mx25/clock.h b/arch/arm/include/asm/arch-mx25/clock.h
index 3045b78d08f4..7baee4821149 100644
--- a/arch/arm/include/asm/arch-mx25/clock.h
+++ b/arch/arm/include/asm/arch-mx25/clock.h
@@ -21,6 +21,7 @@
 #define MXC_CLK32	32768
 #endif
 
+#include <stdbool.h>
 enum mxc_clock {
 	/* PER clocks (do not change order) */
 	MXC_CSI_CLK,
diff --git a/arch/arm/include/asm/arch-mx5/clock.h b/arch/arm/include/asm/arch-mx5/clock.h
index 63a51042e1eb..86aeb5d56103 100644
--- a/arch/arm/include/asm/arch-mx5/clock.h
+++ b/arch/arm/include/asm/arch-mx5/clock.h
@@ -19,6 +19,7 @@
 #define MXC_CLK32	32768
 #endif
 
+#include <stdbool.h>
 enum mxc_clock {
 	MXC_ARM_CLK = 0,
 	MXC_AHB_CLK,
diff --git a/arch/arm/include/asm/arch-mx6/clock.h b/arch/arm/include/asm/arch-mx6/clock.h
index 8ae49715789c..4bdb11a5b96b 100644
--- a/arch/arm/include/asm/arch-mx6/clock.h
+++ b/arch/arm/include/asm/arch-mx6/clock.h
@@ -7,6 +7,7 @@
 #ifndef __ASM_ARCH_CLOCK_H
 #define __ASM_ARCH_CLOCK_H
 
+#include <stdbool.h>
 #include <linux/types.h>
 
 #ifdef CONFIG_SYS_MX6_HCLK
diff --git a/arch/arm/include/asm/arch-mx7/clock_slice.h b/arch/arm/include/asm/arch-mx7/clock_slice.h
index 9a7c1f8237a8..1eac3bec5cb1 100644
--- a/arch/arm/include/asm/arch-mx7/clock_slice.h
+++ b/arch/arm/include/asm/arch-mx7/clock_slice.h
@@ -9,6 +9,7 @@
 #ifndef _ASM_ARCH_CLOCK_SLICE_H
 #define _ASM_ARCH_CLOCK_SLICE_H
 
+#include <stdbool.h>
 enum root_pre_div {
 	CLK_ROOT_PRE_DIV1 = 0,
 	CLK_ROOT_PRE_DIV2,
diff --git a/arch/arm/include/asm/arch-mx7ulp/pcc.h b/arch/arm/include/asm/arch-mx7ulp/pcc.h
index 8f0d7006286d..25d10fb7d1a9 100644
--- a/arch/arm/include/asm/arch-mx7ulp/pcc.h
+++ b/arch/arm/include/asm/arch-mx7ulp/pcc.h
@@ -6,6 +6,7 @@
 #ifndef _ASM_ARCH_PCC_H
 #define _ASM_ARCH_PCC_H
 
+#include <stdbool.h>
 #include <asm/arch/scg.h>
 
 /* PCC2 */
diff --git a/arch/arm/include/asm/arch-mx7ulp/scg.h b/arch/arm/include/asm/arch-mx7ulp/scg.h
index 71e241db288f..b4d92d1ed44f 100644
--- a/arch/arm/include/asm/arch-mx7ulp/scg.h
+++ b/arch/arm/include/asm/arch-mx7ulp/scg.h
@@ -6,6 +6,7 @@
 #ifndef _ASM_ARCH_SCG_H
 #define _ASM_ARCH_SCG_H
 
+#include <stdbool.h>
 #include <stdio.h>
 
 #ifdef CONFIG_CLK_DEBUG
diff --git a/arch/arm/include/asm/arch-rk3308/cru_rk3308.h b/arch/arm/include/asm/arch-rk3308/cru_rk3308.h
index 86c906bb0edd..08af4f547dd3 100644
--- a/arch/arm/include/asm/arch-rk3308/cru_rk3308.h
+++ b/arch/arm/include/asm/arch-rk3308/cru_rk3308.h
@@ -5,6 +5,7 @@
 #ifndef _ASM_ARCH_CRU_RK3308_H
 #define _ASM_ARCH_CRU_RK3308_H
 
+#include <linux/kernel.h>
 #define MHz		1000000
 #define OSC_HZ		(24 * MHz)
 
diff --git a/arch/arm/include/asm/arch-rk3308/grf_rk3308.h b/arch/arm/include/asm/arch-rk3308/grf_rk3308.h
index a995bb950d97..b268e4565725 100644
--- a/arch/arm/include/asm/arch-rk3308/grf_rk3308.h
+++ b/arch/arm/include/asm/arch-rk3308/grf_rk3308.h
@@ -5,6 +5,7 @@
 #ifndef _ASM_ARCH_GRF_rk3308_H
 #define _ASM_ARCH_GRF_rk3308_H
 
+#include <linux/kernel.h>
 struct rk3308_grf {
 	unsigned int gpio0a_iomux;
 	unsigned int reserved0;
diff --git a/arch/arm/include/asm/arch-rockchip/clock.h b/arch/arm/include/asm/arch-rockchip/clock.h
index 5108180ea77f..2b47b7a9d266 100644
--- a/arch/arm/include/asm/arch-rockchip/clock.h
+++ b/arch/arm/include/asm/arch-rockchip/clock.h
@@ -6,6 +6,8 @@
 #ifndef _ASM_ARCH_CLOCK_H
 #define _ASM_ARCH_CLOCK_H
 
+#include <linux/kernel.h>
+
 struct udevice;
 
 /* define pll mode */
diff --git a/arch/arm/include/asm/arch-rockchip/cpu_rk3288.h b/arch/arm/include/asm/arch-rockchip/cpu_rk3288.h
index 7445e64b8c72..3536f4449468 100644
--- a/arch/arm/include/asm/arch-rockchip/cpu_rk3288.h
+++ b/arch/arm/include/asm/arch-rockchip/cpu_rk3288.h
@@ -6,6 +6,7 @@
 #ifndef __ASM_ARCH_CPU_RK3288_H
 #define __ASM_ARCH_CPU_RK3288_H
 
+#include <stdbool.h>
 #include <asm/io.h>
 
 #define ROCKCHIP_CPU_MASK       0xffff0000
diff --git a/arch/arm/include/asm/arch-rockchip/cru_px30.h b/arch/arm/include/asm/arch-rockchip/cru_px30.h
index 732ca3704034..c76d5751ef53 100644
--- a/arch/arm/include/asm/arch-rockchip/cru_px30.h
+++ b/arch/arm/include/asm/arch-rockchip/cru_px30.h
@@ -5,6 +5,7 @@
 #ifndef _ASM_ARCH_CRU_PX30_H
 #define _ASM_ARCH_CRU_PX30_H
 
+#include <linux/kernel.h>
 #define MHz		1000000
 #define KHz		1000
 #define OSC_HZ		(24 * MHz)
diff --git a/arch/arm/include/asm/arch-rockchip/cru_rk3036.h b/arch/arm/include/asm/arch-rockchip/cru_rk3036.h
index 5db0407baa75..c580bf12034e 100644
--- a/arch/arm/include/asm/arch-rockchip/cru_rk3036.h
+++ b/arch/arm/include/asm/arch-rockchip/cru_rk3036.h
@@ -5,6 +5,7 @@
 #ifndef _ASM_ARCH_CRU_RK3036_H
 #define _ASM_ARCH_CRU_RK3036_H
 
+#include <linux/kernel.h>
 #define OSC_HZ		(24 * 1000 * 1000)
 
 #define APLL_HZ		(600 * 1000000)
diff --git a/arch/arm/include/asm/arch-rockchip/cru_rk3128.h b/arch/arm/include/asm/arch-rockchip/cru_rk3128.h
index cca812d29e40..e7dec3c7c9e4 100644
--- a/arch/arm/include/asm/arch-rockchip/cru_rk3128.h
+++ b/arch/arm/include/asm/arch-rockchip/cru_rk3128.h
@@ -8,6 +8,7 @@
 
 #ifndef __ASSEMBLY__
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 #endif
 
 #define MHz		1000000
diff --git a/arch/arm/include/asm/arch-rockchip/cru_rk3188.h b/arch/arm/include/asm/arch-rockchip/cru_rk3188.h
index eec4815bbc06..97268b8777ef 100644
--- a/arch/arm/include/asm/arch-rockchip/cru_rk3188.h
+++ b/arch/arm/include/asm/arch-rockchip/cru_rk3188.h
@@ -5,6 +5,8 @@
 #ifndef _ASM_ARCH_CRU_RK3188_H
 #define _ASM_ARCH_CRU_RK3188_H
 
+#include <stdbool.h>
+#include <linux/kernel.h>
 #define OSC_HZ		(24 * 1000 * 1000)
 
 #define APLL_HZ		(1608 * 1000000)
diff --git a/arch/arm/include/asm/arch-rockchip/cru_rk322x.h b/arch/arm/include/asm/arch-rockchip/cru_rk322x.h
index ee12fa831f28..ca4d727a6a70 100644
--- a/arch/arm/include/asm/arch-rockchip/cru_rk322x.h
+++ b/arch/arm/include/asm/arch-rockchip/cru_rk322x.h
@@ -5,6 +5,7 @@
 #ifndef _ASM_ARCH_CRU_RK322X_H
 #define _ASM_ARCH_CRU_RK322X_H
 
+#include <linux/kernel.h>
 #define MHz		1000000
 #define OSC_HZ		(24 * MHz)
 
diff --git a/arch/arm/include/asm/arch-rockchip/cru_rk3288.h b/arch/arm/include/asm/arch-rockchip/cru_rk3288.h
index 412b73e55fa1..7affb2f06448 100644
--- a/arch/arm/include/asm/arch-rockchip/cru_rk3288.h
+++ b/arch/arm/include/asm/arch-rockchip/cru_rk3288.h
@@ -8,6 +8,7 @@
 #ifndef _ASM_ARCH_CRU_RK3288_H
 #define _ASM_ARCH_CRU_RK3288_H
 
+#include <linux/kernel.h>
 #define OSC_HZ		(24 * 1000 * 1000)
 
 #define APLL_HZ		(1800 * 1000000)
diff --git a/arch/arm/include/asm/arch-rockchip/cru_rk3328.h b/arch/arm/include/asm/arch-rockchip/cru_rk3328.h
index 226744d67d9f..2cd984ad0098 100644
--- a/arch/arm/include/asm/arch-rockchip/cru_rk3328.h
+++ b/arch/arm/include/asm/arch-rockchip/cru_rk3328.h
@@ -6,6 +6,7 @@
 #ifndef __ASM_ARCH_CRU_RK3328_H_
 #define __ASM_ARCH_CRU_RK3328_H_
 
+#include <linux/kernel.h>
 struct rk3328_clk_priv {
 	struct rk3328_cru *cru;
 	ulong rate;
diff --git a/arch/arm/include/asm/arch-rockchip/cru_rk3368.h b/arch/arm/include/asm/arch-rockchip/cru_rk3368.h
index 316c67c62f9d..2db4e92301e2 100644
--- a/arch/arm/include/asm/arch-rockchip/cru_rk3368.h
+++ b/arch/arm/include/asm/arch-rockchip/cru_rk3368.h
@@ -8,6 +8,7 @@
 
 #ifndef __ASSEMBLY__
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 #endif
 
 /* RK3368 clock numbers */
diff --git a/arch/arm/include/asm/arch-rockchip/cru_rk3399.h b/arch/arm/include/asm/arch-rockchip/cru_rk3399.h
index d941a129f3e5..fdeb3735770a 100644
--- a/arch/arm/include/asm/arch-rockchip/cru_rk3399.h
+++ b/arch/arm/include/asm/arch-rockchip/cru_rk3399.h
@@ -7,6 +7,7 @@
 #define __ASM_ARCH_CRU_RK3399_H_
 
 /* Private data for the clock driver - used by rockchip_get_cru() */
+#include <linux/kernel.h>
 struct rk3399_clk_priv {
 	struct rockchip_cru *cru;
 };
diff --git a/arch/arm/include/asm/arch-rockchip/cru_rv1108.h b/arch/arm/include/asm/arch-rockchip/cru_rv1108.h
index 0ba5ff6a04f2..4499b453b684 100644
--- a/arch/arm/include/asm/arch-rockchip/cru_rv1108.h
+++ b/arch/arm/include/asm/arch-rockchip/cru_rv1108.h
@@ -8,6 +8,7 @@
 
 #ifndef __ASSEMBLY__
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 #endif
 
 #define OSC_HZ		(24 * 1000 * 1000)
diff --git a/arch/arm/include/asm/arch-rockchip/ddr_rk3188.h b/arch/arm/include/asm/arch-rockchip/ddr_rk3188.h
index db83d0e7d3ba..c60655fcae01 100644
--- a/arch/arm/include/asm/arch-rockchip/ddr_rk3188.h
+++ b/arch/arm/include/asm/arch-rockchip/ddr_rk3188.h
@@ -7,6 +7,7 @@
 #define _ASM_ARCH_DDR_RK3188_H
 
 #include <asm/arch-rockchip/ddr_rk3288.h>
+#include <linux/kernel.h>
 
 /*
  * RK3188 Memory scheduler register map.
diff --git a/arch/arm/include/asm/arch-rockchip/ddr_rk3288.h b/arch/arm/include/asm/arch-rockchip/ddr_rk3288.h
index 979d5470e7a2..ea3b6f48d907 100644
--- a/arch/arm/include/asm/arch-rockchip/ddr_rk3288.h
+++ b/arch/arm/include/asm/arch-rockchip/ddr_rk3288.h
@@ -6,6 +6,7 @@
 #ifndef _ASM_ARCH_DDR_RK3288_H
 #define _ASM_ARCH_DDR_RK3288_H
 
+#include <linux/kernel.h>
 struct rk3288_ddr_pctl {
 	u32 scfg;
 	u32 sctl;
diff --git a/arch/arm/include/asm/arch-rockchip/ddr_rk3368.h b/arch/arm/include/asm/arch-rockchip/ddr_rk3368.h
index 40cdcf4a45a0..a03d3318e020 100644
--- a/arch/arm/include/asm/arch-rockchip/ddr_rk3368.h
+++ b/arch/arm/include/asm/arch-rockchip/ddr_rk3368.h
@@ -8,6 +8,7 @@
 
 #ifndef __ASSEMBLY__
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 #endif
 
 /*
diff --git a/arch/arm/include/asm/arch-rockchip/edp_rk3288.h b/arch/arm/include/asm/arch-rockchip/edp_rk3288.h
index 105a335dabac..97383fce1904 100644
--- a/arch/arm/include/asm/arch-rockchip/edp_rk3288.h
+++ b/arch/arm/include/asm/arch-rockchip/edp_rk3288.h
@@ -7,6 +7,7 @@
 #ifndef _ASM_ARCH_EDP_H
 #define _ASM_ARCH_EDP_H
 
+#include <linux/kernel.h>
 struct rk3288_edp {
 	u8	res0[0x10];
 	u32	dp_tx_version;
diff --git a/arch/arm/include/asm/arch-rockchip/gpio.h b/arch/arm/include/asm/arch-rockchip/gpio.h
index 1aaec5faecc6..0ec09d40b4ea 100644
--- a/arch/arm/include/asm/arch-rockchip/gpio.h
+++ b/arch/arm/include/asm/arch-rockchip/gpio.h
@@ -6,6 +6,7 @@
 #ifndef _ASM_ARCH_GPIO_H
 #define _ASM_ARCH_GPIO_H
 
+#include <linux/kernel.h>
 struct rockchip_gpio_regs {
 	u32 swport_dr;
 	u32 swport_ddr;
diff --git a/arch/arm/include/asm/arch-rockchip/grf_px30.h b/arch/arm/include/asm/arch-rockchip/grf_px30.h
index d51e29b19eea..0834ae673c28 100644
--- a/arch/arm/include/asm/arch-rockchip/grf_px30.h
+++ b/arch/arm/include/asm/arch-rockchip/grf_px30.h
@@ -5,6 +5,7 @@
 #ifndef _ASM_ARCH_GRF_px30_H
 #define _ASM_ARCH_GRF_px30_H
 
+#include <linux/kernel.h>
 struct px30_grf {
 	unsigned int gpio1al_iomux;
 	unsigned int gpio1ah_iomux;
diff --git a/arch/arm/include/asm/arch-rockchip/grf_rk3036.h b/arch/arm/include/asm/arch-rockchip/grf_rk3036.h
index 08348d8228a1..e540f390d9a6 100644
--- a/arch/arm/include/asm/arch-rockchip/grf_rk3036.h
+++ b/arch/arm/include/asm/arch-rockchip/grf_rk3036.h
@@ -5,6 +5,7 @@
 #ifndef _ASM_ARCH_GRF_RK3036_H
 #define _ASM_ARCH_GRF_RK3036_H
 
+#include <linux/kernel.h>
 struct rk3036_grf {
 	unsigned int reserved[0x2a];
 	unsigned int gpio0a_iomux;
diff --git a/arch/arm/include/asm/arch-rockchip/grf_rk3128.h b/arch/arm/include/asm/arch-rockchip/grf_rk3128.h
index fe07d69b4280..71eb99246c19 100644
--- a/arch/arm/include/asm/arch-rockchip/grf_rk3128.h
+++ b/arch/arm/include/asm/arch-rockchip/grf_rk3128.h
@@ -5,6 +5,7 @@
 #ifndef _ASM_ARCH_GRF_RK3128_H
 #define _ASM_ARCH_GRF_RK3128_H
 
+#include <linux/kernel.h>
 struct rk3128_grf {
 	unsigned int reserved[0x2a];
 	unsigned int gpio0a_iomux;
diff --git a/arch/arm/include/asm/arch-rockchip/grf_rk3188.h b/arch/arm/include/asm/arch-rockchip/grf_rk3188.h
index d05197670d39..8e80749a76e8 100644
--- a/arch/arm/include/asm/arch-rockchip/grf_rk3188.h
+++ b/arch/arm/include/asm/arch-rockchip/grf_rk3188.h
@@ -6,6 +6,7 @@
 #ifndef _ASM_ARCH_GRF_RK3188_H
 #define _ASM_ARCH_GRF_RK3188_H
 
+#include <linux/kernel.h>
 struct rk3188_grf_gpio_lh {
 	u32 l;
 	u32 h;
diff --git a/arch/arm/include/asm/arch-rockchip/grf_rk322x.h b/arch/arm/include/asm/arch-rockchip/grf_rk322x.h
index 5f4d9d822495..9e0b9105924b 100644
--- a/arch/arm/include/asm/arch-rockchip/grf_rk322x.h
+++ b/arch/arm/include/asm/arch-rockchip/grf_rk322x.h
@@ -5,6 +5,7 @@
 #ifndef _ASM_ARCH_GRF_RK322X_H
 #define _ASM_ARCH_GRF_RK322X_H
 
+#include <linux/kernel.h>
 struct rk322x_grf {
 	unsigned int gpio0a_iomux;
 	unsigned int gpio0b_iomux;
diff --git a/arch/arm/include/asm/arch-rockchip/grf_rk3328.h b/arch/arm/include/asm/arch-rockchip/grf_rk3328.h
index d8a46800fd9d..663a3fa52e31 100644
--- a/arch/arm/include/asm/arch-rockchip/grf_rk3328.h
+++ b/arch/arm/include/asm/arch-rockchip/grf_rk3328.h
@@ -6,6 +6,7 @@
 #ifndef __SOC_ROCKCHIP_RK3328_GRF_H__
 #define __SOC_ROCKCHIP_RK3328_GRF_H__
 
+#include <linux/kernel.h>
 struct rk3328_grf_regs {
 	u32 gpio0a_iomux;
 	u32 gpio0b_iomux;
diff --git a/arch/arm/include/asm/arch-rockchip/grf_rk3368.h b/arch/arm/include/asm/arch-rockchip/grf_rk3368.h
index 0079d2007804..8e4b3ec481ca 100644
--- a/arch/arm/include/asm/arch-rockchip/grf_rk3368.h
+++ b/arch/arm/include/asm/arch-rockchip/grf_rk3368.h
@@ -8,6 +8,7 @@
 
 #ifndef __ASSEMBLY__
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 #endif
 
 struct rk3368_grf {
diff --git a/arch/arm/include/asm/arch-rockchip/grf_rk3399.h b/arch/arm/include/asm/arch-rockchip/grf_rk3399.h
index dd89cd205056..0a7249560f26 100644
--- a/arch/arm/include/asm/arch-rockchip/grf_rk3399.h
+++ b/arch/arm/include/asm/arch-rockchip/grf_rk3399.h
@@ -6,6 +6,7 @@
 #ifndef __SOC_ROCKCHIP_RK3399_GRF_H__
 #define __SOC_ROCKCHIP_RK3399_GRF_H__
 
+#include <linux/kernel.h>
 struct rk3399_grf_regs {
 	u32 reserved[0x800];
 	u32 usb3_perf_con0;
diff --git a/arch/arm/include/asm/arch-rockchip/grf_rv1108.h b/arch/arm/include/asm/arch-rockchip/grf_rv1108.h
index 92bbe34af68c..aefbe9b56e19 100644
--- a/arch/arm/include/asm/arch-rockchip/grf_rv1108.h
+++ b/arch/arm/include/asm/arch-rockchip/grf_rv1108.h
@@ -5,6 +5,7 @@
 #ifndef _ASM_ARCH_GRF_RV1108_H
 #define _ASM_ARCH_GRF_RV1108_H
 
+#include <linux/kernel.h>
 struct rv1108_grf {
 	u32 reserved[4];
 	u32 gpio1a_iomux;
diff --git a/arch/arm/include/asm/arch-rockchip/pmu_rk3188.h b/arch/arm/include/asm/arch-rockchip/pmu_rk3188.h
index f7b9a0674c1b..6227dc0ed5ab 100644
--- a/arch/arm/include/asm/arch-rockchip/pmu_rk3188.h
+++ b/arch/arm/include/asm/arch-rockchip/pmu_rk3188.h
@@ -6,6 +6,7 @@
 #ifndef _ASM_ARCH_PMU_RK3188_H
 #define _ASM_ARCH_PMU_RK3188_H
 
+#include <linux/kernel.h>
 struct rk3188_pmu {
 	u32 wakeup_cfg[2];
 	u32 pwrdn_con;
diff --git a/arch/arm/include/asm/arch-rockchip/pmu_rk3288.h b/arch/arm/include/asm/arch-rockchip/pmu_rk3288.h
index 8553d2eee4c2..1b50cd5326e2 100644
--- a/arch/arm/include/asm/arch-rockchip/pmu_rk3288.h
+++ b/arch/arm/include/asm/arch-rockchip/pmu_rk3288.h
@@ -8,6 +8,7 @@
 #ifndef _ASM_ARCH_PMU_RK3288_H
 #define _ASM_ARCH_PMU_RK3288_H
 
+#include <linux/kernel.h>
 struct rk3288_pmu {
 	u32 wakeup_cfg[2];
 	u32 pwrdn_con;
diff --git a/arch/arm/include/asm/arch-rockchip/pmu_rk3399.h b/arch/arm/include/asm/arch-rockchip/pmu_rk3399.h
index f1096dccced6..350559d5054c 100644
--- a/arch/arm/include/asm/arch-rockchip/pmu_rk3399.h
+++ b/arch/arm/include/asm/arch-rockchip/pmu_rk3399.h
@@ -7,6 +7,7 @@
 #ifndef __SOC_ROCKCHIP_RK3399_PMU_H__
 #define __SOC_ROCKCHIP_RK3399_PMU_H__
 
+#include <linux/kernel.h>
 struct rk3399_pmu_regs {
 	u32 pmu_wakeup_cfg[5];
 	u32 pmu_pwrdn_con;
diff --git a/arch/arm/include/asm/arch-rockchip/sdram_rk3036.h b/arch/arm/include/asm/arch-rockchip/sdram_rk3036.h
index 46298165fbcc..7f89d7f92116 100644
--- a/arch/arm/include/asm/arch-rockchip/sdram_rk3036.h
+++ b/arch/arm/include/asm/arch-rockchip/sdram_rk3036.h
@@ -5,6 +5,7 @@
 #ifndef _ASM_ARCH_SDRAM_RK3036_H
 #define _ASM_ARCH_SDRAM_RK3036_H
 
+#include <linux/kernel.h>
 struct rk3036_ddr_pctl {
 	u32 scfg;
 	u32 sctl;
diff --git a/arch/arm/include/asm/arch-rockchip/sdram_rk322x.h b/arch/arm/include/asm/arch-rockchip/sdram_rk322x.h
index 6f6c5c9954fb..2aaf66c1ab0c 100644
--- a/arch/arm/include/asm/arch-rockchip/sdram_rk322x.h
+++ b/arch/arm/include/asm/arch-rockchip/sdram_rk322x.h
@@ -7,6 +7,7 @@
 
 #ifndef __ASSEMBLY__
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 #endif
 
 struct rk322x_sdram_channel {
diff --git a/arch/arm/include/asm/arch-rockchip/sdram_rk3288.h b/arch/arm/include/asm/arch-rockchip/sdram_rk3288.h
index 9220763fa7fe..9dede8068439 100644
--- a/arch/arm/include/asm/arch-rockchip/sdram_rk3288.h
+++ b/arch/arm/include/asm/arch-rockchip/sdram_rk3288.h
@@ -8,6 +8,7 @@
 #ifndef _ASM_ARCH_RK3288_SDRAM_H__
 #define _ASM_ARCH_RK3288_SDRAM_H__
 
+#include <linux/kernel.h>
 struct rk3288_sdram_channel {
 	/*
 	 * bit width in address, eg:
diff --git a/arch/arm/include/asm/arch-rockchip/vop_rk3288.h b/arch/arm/include/asm/arch-rockchip/vop_rk3288.h
index 872a158b714b..c1aab4219e4c 100644
--- a/arch/arm/include/asm/arch-rockchip/vop_rk3288.h
+++ b/arch/arm/include/asm/arch-rockchip/vop_rk3288.h
@@ -7,6 +7,7 @@
 #ifndef _ASM_ARCH_VOP_RK3288_H
 #define _ASM_ARCH_VOP_RK3288_H
 
+#include <linux/kernel.h>
 struct rk3288_vop {
 	u32 reg_cfg_done;
 	u32 version_info;
diff --git a/arch/arm/include/asm/arch-sunxi/clock_sun6i.h b/arch/arm/include/asm/arch-sunxi/clock_sun6i.h
index ee387127f37e..3c3ebfd3a201 100644
--- a/arch/arm/include/asm/arch-sunxi/clock_sun6i.h
+++ b/arch/arm/include/asm/arch-sunxi/clock_sun6i.h
@@ -10,6 +10,7 @@
 #ifndef _SUNXI_CLOCK_SUN6I_H
 #define _SUNXI_CLOCK_SUN6I_H
 
+#include <stdbool.h>
 struct sunxi_ccm_reg {
 	u32 pll1_cfg;		/* 0x00 pll1 control */
 	u32 reserved0;
diff --git a/arch/arm/include/asm/arch-sunxi/dram.h b/arch/arm/include/asm/arch-sunxi/dram.h
index 8002b7efdc19..51c3139a6f90 100644
--- a/arch/arm/include/asm/arch-sunxi/dram.h
+++ b/arch/arm/include/asm/arch-sunxi/dram.h
@@ -11,6 +11,7 @@
 #ifndef _SUNXI_DRAM_H
 #define _SUNXI_DRAM_H
 
+#include <stdbool.h>
 #include <asm/io.h>
 #include <linux/types.h>
 
diff --git a/arch/arm/include/asm/arch-sunxi/dram_sun50i_h6.h b/arch/arm/include/asm/arch-sunxi/dram_sun50i_h6.h
index be02655cdd52..ddaa238c279f 100644
--- a/arch/arm/include/asm/arch-sunxi/dram_sun50i_h6.h
+++ b/arch/arm/include/asm/arch-sunxi/dram_sun50i_h6.h
@@ -12,6 +12,7 @@
 #include <stdbool.h>
 #ifndef __ASSEMBLY__
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 #endif
 
 enum sunxi_dram_type {
diff --git a/arch/arm/include/asm/arch-sunxi/dram_sunxi_dw.h b/arch/arm/include/asm/arch-sunxi/dram_sunxi_dw.h
index a5a7ebde44ee..3420f939f243 100644
--- a/arch/arm/include/asm/arch-sunxi/dram_sunxi_dw.h
+++ b/arch/arm/include/asm/arch-sunxi/dram_sunxi_dw.h
@@ -13,6 +13,7 @@
 #define _SUNXI_DRAM_SUN8I_H3_H
 
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 
 struct sunxi_mctl_com_reg {
 	u32 cr;			/* 0x00 control register */
diff --git a/arch/arm/include/asm/arch-sunxi/lcdc.h b/arch/arm/include/asm/arch-sunxi/lcdc.h
index 90216bcfd518..7fca301df964 100644
--- a/arch/arm/include/asm/arch-sunxi/lcdc.h
+++ b/arch/arm/include/asm/arch-sunxi/lcdc.h
@@ -10,6 +10,7 @@
 #define _LCDC_H
 
 #include <fdtdec.h>
+#include <stdbool.h>
 
 struct sunxi_lcdc_reg {
 	u32 ctrl;			/* 0x00 */
diff --git a/arch/arm/include/asm/arch-tegra/ap.h b/arch/arm/include/asm/arch-tegra/ap.h
index de21dffa55ab..9f0f92a38361 100644
--- a/arch/arm/include/asm/arch-tegra/ap.h
+++ b/arch/arm/include/asm/arch-tegra/ap.h
@@ -3,6 +3,7 @@
  * (C) Copyright 2010-2015
  * NVIDIA Corporation <www.nvidia.com>
  */
+#include <stdbool.h>
 #include <asm/types.h>
 
 /* Stabilization delays, in usec */
diff --git a/arch/arm/include/asm/arch-tegra/clock.h b/arch/arm/include/asm/arch-tegra/clock.h
index 1d80d9e94617..630287c1b780 100644
--- a/arch/arm/include/asm/arch-tegra/clock.h
+++ b/arch/arm/include/asm/arch-tegra/clock.h
@@ -38,6 +38,7 @@ enum {
 	MASK_BITS_31_28,
 };
 
+#include <stdbool.h>
 #include <asm/arch/clock-tables.h>
 /* PLL stabilization delay in usec */
 #define CLOCK_PLL_STABLE_DELAY_US 300
diff --git a/arch/arm/include/asm/armv7.h b/arch/arm/include/asm/armv7.h
index 2fb824b69e26..751f492a085d 100644
--- a/arch/arm/include/asm/armv7.h
+++ b/arch/arm/include/asm/armv7.h
@@ -56,6 +56,7 @@
 #define ARMV7_CLIDR_CTYPE_UNIFIED		4
 
 #ifndef __ASSEMBLY__
+#include <stdbool.h>
 #include <linux/types.h>
 #include <asm/io.h>
 #include <asm/barriers.h>
diff --git a/arch/arm/include/asm/armv8/sec_firmware.h b/arch/arm/include/asm/armv8/sec_firmware.h
index 0f86c72b24d3..9c010953f5f2 100644
--- a/arch/arm/include/asm/armv8/sec_firmware.h
+++ b/arch/arm/include/asm/armv8/sec_firmware.h
@@ -6,6 +6,8 @@
 #ifndef __SEC_FIRMWARE_H_
 #define __SEC_FIRMWARE_H_
 
+#include <stdbool.h>
+
 #define PSCI_INVALID_VER		0xffffffff
 #define SEC_JR3_OFFSET			0x40000
 #define WORD_MASK			0xffffffff
diff --git a/arch/arm/include/asm/mach-imx/hab.h b/arch/arm/include/asm/mach-imx/hab.h
index d8bd77075ae6..f89f750169b7 100644
--- a/arch/arm/include/asm/mach-imx/hab.h
+++ b/arch/arm/include/asm/mach-imx/hab.h
@@ -7,6 +7,7 @@
 #ifndef __SECURE_MX6Q_H__
 #define __SECURE_MX6Q_H__
 
+#include <stdbool.h>
 #include <linux/types.h>
 #include <linux/compiler.h>
 
diff --git a/arch/arm/include/asm/mach-imx/iomux-v3.h b/arch/arm/include/asm/mach-imx/iomux-v3.h
index 1de70933550f..f6c0044caff1 100644
--- a/arch/arm/include/asm/mach-imx/iomux-v3.h
+++ b/arch/arm/include/asm/mach-imx/iomux-v3.h
@@ -10,6 +10,7 @@
 #ifndef __MACH_IOMUX_V3_H__
 #define __MACH_IOMUX_V3_H__
 
+#include <linux/kernel.h>
 #include <linux/types.h>
 
 /*
diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c
index c9efede771e4..a11fe7ed31eb 100644
--- a/arch/arm/lib/bootm.c
+++ b/arch/arm/lib/bootm.c
@@ -19,6 +19,7 @@
 #include <hang.h>
 #include <lmb.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
diff --git a/arch/arm/lib/cache-cp15.c b/arch/arm/lib/cache-cp15.c
index e0e273495b30..39d51859ed76 100644
--- a/arch/arm/lib/cache-cp15.c
+++ b/arch/arm/lib/cache-cp15.c
@@ -14,6 +14,7 @@
 #include <asm/u-boot.h>
 #include <linux/compiler.h>
 #include <asm/armv7_mpu.h>
+#include <linux/kernel.h>
 
 #if !(CONFIG_IS_ENABLED(SYS_ICACHE_OFF) && CONFIG_IS_ENABLED(SYS_DCACHE_OFF))
 
diff --git a/arch/arm/lib/cache.c b/arch/arm/lib/cache.c
index 4956942002da..6509052ddcf3 100644
--- a/arch/arm/lib/cache.c
+++ b/arch/arm/lib/cache.c
@@ -13,6 +13,7 @@
 #include <stdio.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/lib/gic-v3-its.c b/arch/arm/lib/gic-v3-its.c
index 45c8ae093507..4fc9f9b78334 100644
--- a/arch/arm/lib/gic-v3-its.c
+++ b/arch/arm/lib/gic-v3-its.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/sizes.h>
 
diff --git a/arch/arm/lib/image.c b/arch/arm/lib/image.c
index 044fe573c127..6a8591488439 100644
--- a/arch/arm/lib/image.c
+++ b/arch/arm/lib/image.c
@@ -10,6 +10,7 @@
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-at91/atmel_sfr.c b/arch/arm/mach-at91/atmel_sfr.c
index b14222460f3a..c2677c51c0ce 100644
--- a/arch/arm/mach-at91/atmel_sfr.c
+++ b/arch/arm/mach-at91/atmel_sfr.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <stdbool.h>
 #include <asm/hardware.h>
 #include <asm/io.h>
 #include <asm/arch/at91_sfr.h>
diff --git a/arch/arm/mach-at91/include/mach/at91_common.h b/arch/arm/mach-at91/include/mach/at91_common.h
index 01e00c508a8a..f3551832f3aa 100644
--- a/arch/arm/mach-at91/include/mach/at91_common.h
+++ b/arch/arm/mach-at91/include/mach/at91_common.h
@@ -8,6 +8,7 @@
 #ifndef AT91_COMMON_H
 #define AT91_COMMON_H
 
+#include <stdbool.h>
 void at91_can_hw_init(void);
 void at91_gmac_hw_init(void);
 void at91_macb_hw_init(void);
diff --git a/arch/arm/mach-at91/include/mach/atmel_usba_udc.h b/arch/arm/mach-at91/include/mach/atmel_usba_udc.h
index 835b47d91bab..24ccea93df3b 100644
--- a/arch/arm/mach-at91/include/mach/atmel_usba_udc.h
+++ b/arch/arm/mach-at91/include/mach/atmel_usba_udc.h
@@ -7,6 +7,7 @@
 #ifndef __ATMEL_USBA_UDC_H__
 #define __ATMEL_USBA_UDC_H__
 
+#include <linux/kernel.h>
 #include <linux/usb/atmel_usba_udc.h>
 
 #define EP(nam, idx, maxpkt, maxbk, dma, isoc)		\
diff --git a/arch/arm/mach-bcm283x/mbox.c b/arch/arm/mach-bcm283x/mbox.c
index ed724497b0c5..0c8cf78c1888 100644
--- a/arch/arm/mach-bcm283x/mbox.c
+++ b/arch/arm/mach-bcm283x/mbox.c
@@ -13,6 +13,7 @@
 #include <asm/arch/base.h>
 #include <asm/arch/mbox.h>
 #include <phys2bus.h>
+#include <linux/kernel.h>
 
 #define TIMEOUT 1000 /* ms */
 
diff --git a/arch/arm/mach-davinci/include/mach/davinci_misc.h b/arch/arm/mach-davinci/include/mach/davinci_misc.h
index 48b11f7a5c82..41b2c6648ecc 100644
--- a/arch/arm/mach-davinci/include/mach/davinci_misc.h
+++ b/arch/arm/mach-davinci/include/mach/davinci_misc.h
@@ -7,6 +7,7 @@
 #define __MISC_H
 
 #include <asm/arch/hardware.h>
+#include <linux/kernel.h>
 
 /* pin muxer definitions */
 #define PIN_MUX_NUM_FIELDS	8	/* Per register */
diff --git a/arch/arm/mach-exynos/clock.c b/arch/arm/mach-exynos/clock.c
index 76bb97e37325..33995ff4ec6a 100644
--- a/arch/arm/mach-exynos/clock.c
+++ b/arch/arm/mach-exynos/clock.c
@@ -12,6 +12,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/clk.h>
 #include <asm/arch/periph.h>
+#include <linux/kernel.h>
 
 #define PLL_DIV_1024	1024
 #define PLL_DIV_65535	65535
diff --git a/arch/arm/mach-exynos/clock_init_exynos5.c b/arch/arm/mach-exynos/clock_init_exynos5.c
index 1cb8d391e7c9..cf83ef9391a5 100644
--- a/arch/arm/mach-exynos/clock_init_exynos5.c
+++ b/arch/arm/mach-exynos/clock_init_exynos5.c
@@ -12,6 +12,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/spl.h>
 #include <asm/arch/dwmmc.h>
+#include <linux/kernel.h>
 
 #include "clock_init.h"
 #include "common_setup.h"
diff --git a/arch/arm/mach-exynos/dmc_init_ddr3.c b/arch/arm/mach-exynos/dmc_init_ddr3.c
index 18c558f92a98..2cf3c2fa06a4 100644
--- a/arch/arm/mach-exynos/dmc_init_ddr3.c
+++ b/arch/arm/mach-exynos/dmc_init_ddr3.c
@@ -7,11 +7,13 @@
 
 #include <common.h>
 #include <config.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/dmc.h>
 #include <asm/arch/power.h>
+#include <linux/kernel.h>
 #include "common_setup.h"
 #include "exynos5_setup.h"
 #include "clock_init.h"
diff --git a/arch/arm/mach-exynos/pinmux.c b/arch/arm/mach-exynos/pinmux.c
index ad3fbf2da7a8..5d7738ae5ba6 100644
--- a/arch/arm/mach-exynos/pinmux.c
+++ b/arch/arm/mach-exynos/pinmux.c
@@ -10,6 +10,7 @@
 #include <asm/gpio.h>
 #include <asm/arch/pinmux.h>
 #include <asm/arch/sromc.h>
+#include <linux/kernel.h>
 
 static void exynos5_uart_config(int peripheral)
 {
diff --git a/arch/arm/mach-exynos/spl_boot.c b/arch/arm/mach-exynos/spl_boot.c
index 27f0dac182d3..3ed5d10f1ae5 100644
--- a/arch/arm/mach-exynos/spl_boot.c
+++ b/arch/arm/mach-exynos/spl_boot.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <log.h>
 #include <asm/global_data.h>
+#include <linux/kernel.h>
 
 #include <asm/cache.h>
 #include <asm/arch/clock.h>
diff --git a/arch/arm/mach-imx/cmd_bmode.c b/arch/arm/mach-imx/cmd_bmode.c
index 2ad9e6c5f2b9..9058127b2a5f 100644
--- a/arch/arm/mach-imx/cmd_bmode.c
+++ b/arch/arm/mach-imx/cmd_bmode.c
@@ -8,6 +8,7 @@
 #include <asm/mach-imx/boot_mode.h>
 #include <malloc.h>
 #include <command.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 static const struct boot_mode *modes[2];
diff --git a/arch/arm/mach-imx/cmd_nandbcb.c b/arch/arm/mach-imx/cmd_nandbcb.c
index beb538677d95..9165140e494f 100644
--- a/arch/arm/mach-imx/cmd_nandbcb.c
+++ b/arch/arm/mach-imx/cmd_nandbcb.c
@@ -21,6 +21,7 @@
 #include <dm/devres.h>
 #include <linux/bug.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include <asm/io.h>
diff --git a/arch/arm/mach-imx/ddrmc-vf610.c b/arch/arm/mach-imx/ddrmc-vf610.c
index 7895ee66f8a8..95fdf1cd4368 100644
--- a/arch/arm/mach-imx/ddrmc-vf610.c
+++ b/arch/arm/mach-imx/ddrmc-vf610.c
@@ -12,6 +12,7 @@
 #include <asm/arch/iomux-vf610.h>
 #include <asm/arch/ddrmc-vf610.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include "ddrmc-vf610-calibration.h"
 
 void ddrmc_setup_iomux(const iomux_v3_cfg_t *pads, int pads_count)
diff --git a/arch/arm/mach-imx/hab.c b/arch/arm/mach-imx/hab.c
index 3f3d47c13005..b576b032ec6e 100644
--- a/arch/arm/mach-imx/hab.c
+++ b/arch/arm/mach-imx/hab.c
@@ -10,6 +10,7 @@
 #include <fuse.h>
 #include <mapmem.h>
 #include <image.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/io.h>
diff --git a/arch/arm/mach-imx/i2c-mxv7.c b/arch/arm/mach-imx/i2c-mxv7.c
index bf0742e57e3d..1e1b14c1272c 100644
--- a/arch/arm/mach-imx/i2c-mxv7.c
+++ b/arch/arm/mach-imx/i2c-mxv7.c
@@ -14,6 +14,7 @@
 #include <asm/gpio.h>
 #include <asm/mach-imx/mxc_i2c.h>
 #include <watchdog.h>
+#include <linux/kernel.h>
 
 int force_idle_bus(void *priv)
 {
diff --git a/arch/arm/mach-imx/imx8/ahab.c b/arch/arm/mach-imx/imx8/ahab.c
index fb1d067f9c56..f3c370914c6f 100644
--- a/arch/arm/mach-imx/imx8/ahab.c
+++ b/arch/arm/mach-imx/imx8/ahab.c
@@ -19,6 +19,7 @@
 #include <console.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-imx/imx8/cpu.c b/arch/arm/mach-imx/imx8/cpu.c
index 8ae43f00bcb8..cdfc135904de 100644
--- a/arch/arm/mach-imx/imx8/cpu.c
+++ b/arch/arm/mach-imx/imx8/cpu.c
@@ -28,6 +28,7 @@
 #include <asm/mach-imx/boot_mode.h>
 #include <spl.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-imx/imx8/fdt.c b/arch/arm/mach-imx/imx8/fdt.c
index 239adfc2e5cd..eee6e529cdca 100644
--- a/arch/arm/mach-imx/imx8/fdt.c
+++ b/arch/arm/mach-imx/imx8/fdt.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/arch/sci/sci.h>
 #include <asm/arch/sys_proto.h>
diff --git a/arch/arm/mach-imx/imx8/image.c b/arch/arm/mach-imx/imx8/image.c
index 528a42a5996e..4258abecd080 100644
--- a/arch/arm/mach-imx/imx8/image.c
+++ b/arch/arm/mach-imx/imx8/image.c
@@ -16,6 +16,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/mach-imx/boot_mode.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #define MMC_DEV		0
diff --git a/arch/arm/mach-imx/imx8/parse-container.c b/arch/arm/mach-imx/imx8/parse-container.c
index 6a3a4eaa7c79..a5332358ca55 100644
--- a/arch/arm/mach-imx/imx8/parse-container.c
+++ b/arch/arm/mach-imx/imx8/parse-container.c
@@ -11,6 +11,7 @@
 #include <asm/arch/image.h>
 #include <asm/arch/sci/sci.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #define SEC_SECURE_RAM_BASE		0x31800000UL
diff --git a/arch/arm/mach-imx/imx8/snvs_security_sc.c b/arch/arm/mach-imx/imx8/snvs_security_sc.c
index 391d2d0e4b17..086e89b0e5c5 100644
--- a/arch/arm/mach-imx/imx8/snvs_security_sc.c
+++ b/arch/arm/mach-imx/imx8/snvs_security_sc.c
@@ -22,6 +22,7 @@
 #include <asm/arch-imx8/snvs_security_sc.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 /* Access to gd */
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-imx/imx8m/clock_imx8mm.c b/arch/arm/mach-imx/imx8m/clock_imx8mm.c
index 170e6c20853a..ac4d0766dab6 100644
--- a/arch/arm/mach-imx/imx8m/clock_imx8mm.c
+++ b/arch/arm/mach-imx/imx8m/clock_imx8mm.c
@@ -17,6 +17,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-imx/imx8m/clock_imx8mq.c b/arch/arm/mach-imx/imx8m/clock_imx8mq.c
index 0c74f99f440f..95a1dbb71800 100644
--- a/arch/arm/mach-imx/imx8m/clock_imx8mq.c
+++ b/arch/arm/mach-imx/imx8m/clock_imx8mq.c
@@ -16,6 +16,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/iopoll.h>
+#include <linux/kernel.h>
 
 static struct anamix_pll *ana_pll = (struct anamix_pll *)ANATOP_BASE_ADDR;
 
diff --git a/arch/arm/mach-imx/imx8m/clock_slice.c b/arch/arm/mach-imx/imx8m/clock_slice.c
index ad0d553c1cf7..4074e1e4c52f 100644
--- a/arch/arm/mach-imx/imx8m/clock_slice.c
+++ b/arch/arm/mach-imx/imx8m/clock_slice.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <errno.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 static struct ccm_reg *ccm_reg = (struct ccm_reg *)CCM_BASE_ADDR;
 
diff --git a/arch/arm/mach-imx/imx8m/soc.c b/arch/arm/mach-imx/imx8m/soc.c
index 4e3d12f9b3c7..99e268fa3fb0 100644
--- a/arch/arm/mach-imx/imx8m/soc.c
+++ b/arch/arm/mach-imx/imx8m/soc.c
@@ -33,6 +33,7 @@
 #include <linux/arm-smccc.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-imx/imxrt/soc.c b/arch/arm/mach-imx/imxrt/soc.c
index 8e7d15160dac..7928b45210d8 100644
--- a/arch/arm/mach-imx/imxrt/soc.c
+++ b/arch/arm/mach-imx/imxrt/soc.c
@@ -9,6 +9,7 @@
 #include <asm/io.h>
 #include <asm/armv7_mpu.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 
 int arch_cpu_init(void)
 {
diff --git a/arch/arm/mach-imx/mac.c b/arch/arm/mach-imx/mac.c
index 3b1496b20383..b23315cf90e8 100644
--- a/arch/arm/mach-imx/mac.c
+++ b/arch/arm/mach-imx/mac.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <stdbool.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
diff --git a/arch/arm/mach-imx/mx5/clock.c b/arch/arm/mach-imx/mx5/clock.c
index c6a14a6a7ec9..adc7dbee7d36 100644
--- a/arch/arm/mach-imx/mx5/clock.c
+++ b/arch/arm/mach-imx/mx5/clock.c
@@ -17,6 +17,7 @@
 #include <asm/arch/clock.h>
 #include <div64.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 enum pll_clocks {
diff --git a/arch/arm/mach-imx/mx6/clock.c b/arch/arm/mach-imx/mx6/clock.c
index c91259f4bec3..7e066d39b2d5 100644
--- a/arch/arm/mach-imx/mx6/clock.c
+++ b/arch/arm/mach-imx/mx6/clock.c
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <div64.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <asm/io.h>
diff --git a/arch/arm/mach-imx/mx6/ddr.c b/arch/arm/mach-imx/mx6/ddr.c
index fc1479629396..d5230d516a12 100644
--- a/arch/arm/mach-imx/mx6/ddr.c
+++ b/arch/arm/mach-imx/mx6/ddr.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <stdio.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/types.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/mx6-ddr.h>
diff --git a/arch/arm/mach-imx/mx6/litesom.c b/arch/arm/mach-imx/mx6/litesom.c
index 5514389ca2af..1e817233dfc5 100644
--- a/arch/arm/mach-imx/mx6/litesom.c
+++ b/arch/arm/mach-imx/mx6/litesom.c
@@ -22,6 +22,7 @@
 #include <fsl_esdhc_imx.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <mmc.h>
 
diff --git a/arch/arm/mach-imx/mx6/module_fuse.c b/arch/arm/mach-imx/mx6/module_fuse.c
index 569c8dc0b139..c1731a828562 100644
--- a/arch/arm/mach-imx/mx6/module_fuse.c
+++ b/arch/arm/mach-imx/mx6/module_fuse.c
@@ -12,6 +12,7 @@
 #include <asm/mach-imx/module_fuse.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 static struct fuse_entry_desc mx6_fuse_descs[] = {
diff --git a/arch/arm/mach-imx/mx6/soc.c b/arch/arm/mach-imx/mx6/soc.c
index e12928606560..2cdf576f25c5 100644
--- a/arch/arm/mach-imx/mx6/soc.c
+++ b/arch/arm/mach-imx/mx6/soc.c
@@ -25,6 +25,7 @@
 #include <fsl_sec.h>
 #include <imx_thermal.h>
 #include <mmc.h>
+#include <linux/kernel.h>
 
 struct scu_regs {
 	u32	ctrl;
diff --git a/arch/arm/mach-imx/mx7/clock_slice.c b/arch/arm/mach-imx/mx7/clock_slice.c
index ce2f59cd098e..c5aea2bffd65 100644
--- a/arch/arm/mach-imx/mx7/clock_slice.c
+++ b/arch/arm/mach-imx/mx7/clock_slice.c
@@ -15,6 +15,7 @@
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/kernel.h>
 
 struct mxc_ccm_reg *imx_ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR;
 
diff --git a/arch/arm/mach-imx/mx7/psci-mx7.c b/arch/arm/mach-imx/mx7/psci-mx7.c
index f32945ea3712..214e4043f449 100644
--- a/arch/arm/mach-imx/mx7/psci-mx7.c
+++ b/arch/arm/mach-imx/mx7/psci-mx7.c
@@ -5,6 +5,7 @@
  */
 
 #include <cpu_func.h>
+#include <stdbool.h>
 #include <asm/cache.h>
 #include <asm/io.h>
 #include <asm/psci.h>
diff --git a/arch/arm/mach-imx/mx7/soc.c b/arch/arm/mach-imx/mx7/soc.c
index 9cb61f5c3491..bc267d101fb0 100644
--- a/arch/arm/mach-imx/mx7/soc.c
+++ b/arch/arm/mach-imx/mx7/soc.c
@@ -20,6 +20,7 @@
 #include <fsl_sec.h>
 #include <asm/setup.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 
 #define IOMUXC_GPR1		0x4
 #define BM_IOMUXC_GPR1_IRQ	0x1000
diff --git a/arch/arm/mach-imx/mx7ulp/pcc.c b/arch/arm/mach-imx/mx7ulp/pcc.c
index 1fd8b0a540f7..9d06260bdfa5 100644
--- a/arch/arm/mach-imx/mx7ulp/pcc.c
+++ b/arch/arm/mach-imx/mx7ulp/pcc.c
@@ -13,6 +13,7 @@
 #include <asm/arch/pcc.h>
 #include <asm/arch/sys_proto.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #define PCC_CLKSRC_TYPES 2
 #define PCC_CLKSRC_NUM 7
diff --git a/arch/arm/mach-imx/mx7ulp/scg.c b/arch/arm/mach-imx/mx7ulp/scg.c
index 58bc3df1e78f..bc837aae33a3 100644
--- a/arch/arm/mach-imx/mx7ulp/scg.c
+++ b/arch/arm/mach-imx/mx7ulp/scg.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <div64.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/io.h>
 #include <errno.h>
diff --git a/arch/arm/mach-imx/mx7ulp/soc.c b/arch/arm/mach-imx/mx7ulp/soc.c
index c0feac134f23..e0717226f777 100644
--- a/arch/arm/mach-imx/mx7ulp/soc.c
+++ b/arch/arm/mach-imx/mx7ulp/soc.c
@@ -7,6 +7,7 @@
 #include <cpu_func.h>
 #include <init.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/io.h>
diff --git a/arch/arm/mach-imx/spl.c b/arch/arm/mach-imx/spl.c
index e78d2515e2bf..4c7614e9b719 100644
--- a/arch/arm/mach-imx/spl.c
+++ b/arch/arm/mach-imx/spl.c
@@ -20,6 +20,7 @@
 #include <asm/mach-imx/hab.h>
 #include <asm/mach-imx/boot_mode.h>
 #include <g_dnl.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-imx/spl_imx_romapi.c b/arch/arm/mach-imx/spl_imx_romapi.c
index 8750fbdaf4e9..336b3da62644 100644
--- a/arch/arm/mach-imx/spl_imx_romapi.c
+++ b/arch/arm/mach-imx/spl_imx_romapi.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <spl.h>
 #include <linux/string.h>
diff --git a/arch/arm/mach-ipq40xx/pinctrl-snapdragon.c b/arch/arm/mach-ipq40xx/pinctrl-snapdragon.c
index 08001da66f1b..9f73a62d7a1d 100644
--- a/arch/arm/mach-ipq40xx/pinctrl-snapdragon.c
+++ b/arch/arm/mach-ipq40xx/pinctrl-snapdragon.c
@@ -17,6 +17,7 @@
 #include <dm/pinctrl.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include "pinctrl-snapdragon.h"
 
 struct msm_pinctrl_priv {
diff --git a/arch/arm/mach-k3/am6_init.c b/arch/arm/mach-k3/am6_init.c
index 2e4bb59c4a26..2ffa383aa26c 100644
--- a/arch/arm/mach-k3/am6_init.c
+++ b/arch/arm/mach-k3/am6_init.c
@@ -16,6 +16,7 @@
 #include <asm/arch/hardware.h>
 #include <asm/arch/sysfw-loader.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/kernel.h>
 #include "common.h"
 #include <dm.h>
 #include <dm/uclass-internal.h>
diff --git a/arch/arm/mach-k3/common.c b/arch/arm/mach-k3/common.c
index 359dee5af86c..f063518acaf3 100644
--- a/arch/arm/mach-k3/common.c
+++ b/arch/arm/mach-k3/common.c
@@ -15,6 +15,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include "common.h"
diff --git a/arch/arm/mach-k3/j721e_init.c b/arch/arm/mach-k3/j721e_init.c
index 5c1f248b13bc..d9941580acfb 100644
--- a/arch/arm/mach-k3/j721e_init.c
+++ b/arch/arm/mach-k3/j721e_init.c
@@ -15,6 +15,7 @@
 #include <asm/armv7_mpu.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/sysfw-loader.h>
+#include <linux/kernel.h>
 #include "common.h"
 #include <asm/arch/sys_proto.h>
 #include <linux/soc/ti/ti_sci_protocol.h>
diff --git a/arch/arm/mach-k3/security.c b/arch/arm/mach-k3/security.c
index 484884819b4d..f4aef0a025b0 100644
--- a/arch/arm/mach-k3/security.c
+++ b/arch/arm/mach-k3/security.c
@@ -14,6 +14,7 @@
 #include <log.h>
 #include <stdio.h>
 #include <asm/cache.h>
+#include <linux/kernel.h>
 #include <linux/soc/ti/ti_sci_protocol.h>
 #include <mach/spl.h>
 #include <spl.h>
diff --git a/arch/arm/mach-k3/sysfw-loader.c b/arch/arm/mach-k3/sysfw-loader.c
index 3e76b26dc756..4f269db8e5ab 100644
--- a/arch/arm/mach-k3/sysfw-loader.c
+++ b/arch/arm/mach-k3/sysfw-loader.c
@@ -13,6 +13,7 @@
 #include <spl.h>
 #include <malloc.h>
 #include <remoteproc.h>
+#include <stdbool.h>
 #include <vsprintf.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
diff --git a/arch/arm/mach-keystone/include/mach/psc_defs.h b/arch/arm/mach-keystone/include/mach/psc_defs.h
index f164f95bf244..0864b37a5318 100644
--- a/arch/arm/mach-keystone/include/mach/psc_defs.h
+++ b/arch/arm/mach-keystone/include/mach/psc_defs.h
@@ -6,6 +6,7 @@
 #ifndef _PSC_DEFS_H_
 #define _PSC_DEFS_H_
 
+#include <stdbool.h>
 #include <asm/arch/hardware.h>
 
 /*
diff --git a/arch/arm/mach-keystone/psc.c b/arch/arm/mach-keystone/psc.c
index 6d68ecba4f8c..6005cbaeca8f 100644
--- a/arch/arm/mach-keystone/psc.c
+++ b/arch/arm/mach-keystone/psc.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/arch/arm/mach-kirkwood/cpu.c b/arch/arm/mach-kirkwood/cpu.c
index a202e83b08fe..48d4327be764 100644
--- a/arch/arm/mach-kirkwood/cpu.c
+++ b/arch/arm/mach-kirkwood/cpu.c
@@ -21,6 +21,7 @@
 #include <asm/arch/soc.h>
 #include <mvebu_mmc.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 void reset_cpu(unsigned long ignored)
 {
diff --git a/arch/arm/mach-mediatek/mt7623/init.c b/arch/arm/mach-mediatek/mt7623/init.c
index 7db7336494e3..fa7a05291bc9 100644
--- a/arch/arm/mach-mediatek/mt7623/init.c
+++ b/arch/arm/mach-mediatek/mt7623/init.c
@@ -8,6 +8,7 @@
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/io.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <asm/arch/misc.h>
 
diff --git a/arch/arm/mach-mediatek/mt7629/init.c b/arch/arm/mach-mediatek/mt7629/init.c
index 5cee055f94c1..a643810d2450 100644
--- a/arch/arm/mach-mediatek/mt7629/init.c
+++ b/arch/arm/mach-mediatek/mt7629/init.c
@@ -18,6 +18,7 @@
 #include <dm/uclass.h>
 #include <linux/bitops.h>
 #include <linux/io.h>
+#include <linux/kernel.h>
 
 #include <dt-bindings/clock/mt7629-clk.h>
 
diff --git a/arch/arm/mach-mediatek/mt8516/init.c b/arch/arm/mach-mediatek/mt8516/init.c
index a09874280a91..64b8f5fbcb65 100644
--- a/arch/arm/mach-mediatek/mt8516/init.c
+++ b/arch/arm/mach-mediatek/mt8516/init.c
@@ -20,6 +20,7 @@
 #include <asm/sections.h>
 #include <dm/uclass.h>
 #include <dt-bindings/clock/mt8516-clk.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-meson/board-g12a.c b/arch/arm/mach-meson/board-g12a.c
index cdaed763b426..250a9617c0d5 100644
--- a/arch/arm/mach-meson/board-g12a.c
+++ b/arch/arm/mach-meson/board-g12a.c
@@ -18,6 +18,7 @@
 #include <asm/io.h>
 #include <asm/armv8/mmu.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <usb.h>
 #include <linux/usb/otg.h>
diff --git a/arch/arm/mach-meson/board-info.c b/arch/arm/mach-meson/board-info.c
index fdc8df595568..94c523c17fda 100644
--- a/arch/arm/mach-meson/board-info.c
+++ b/arch/arm/mach-meson/board-info.c
@@ -15,6 +15,7 @@
 #include <syscon.h>
 #include <linux/bitops.h>
 #include <linux/err.h>
+#include <linux/kernel.h>
 
 #define AO_SEC_SD_CFG8		0xe0
 #define AO_SEC_SOCINFO_OFFSET	AO_SEC_SD_CFG8
diff --git a/arch/arm/mach-mvebu/cpu.c b/arch/arm/mach-mvebu/cpu.c
index d529407987e9..53c44ede7db6 100644
--- a/arch/arm/mach-mvebu/cpu.c
+++ b/arch/arm/mach-mvebu/cpu.c
@@ -11,6 +11,7 @@
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/mbus.h>
 #include <asm/io.h>
 #include <asm/pl310.h>
diff --git a/arch/arm/mach-nexell/clock.c b/arch/arm/mach-nexell/clock.c
index 38f6b1fc9010..cd66248cd65b 100644
--- a/arch/arm/mach-nexell/clock.c
+++ b/arch/arm/mach-nexell/clock.c
@@ -12,6 +12,7 @@
 #include <asm/arch/nexell.h>
 #include <asm/arch/clk.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 /*
  * clock generator macros
diff --git a/arch/arm/mach-nexell/nx_gpio.c b/arch/arm/mach-nexell/nx_gpio.c
index dfba3a2374cb..d7fdc968847c 100644
--- a/arch/arm/mach-nexell/nx_gpio.c
+++ b/arch/arm/mach-nexell/nx_gpio.c
@@ -7,6 +7,7 @@
 /*
  * FIXME : will be remove after support pinctrl
  */
+#include <stdbool.h>
 #include <linux/types.h>
 #include <asm/io.h>
 #include <asm/arch/nexell.h>
diff --git a/arch/arm/mach-nexell/timer.c b/arch/arm/mach-nexell/timer.c
index fecee67265cb..2f98bd7fa4a1 100644
--- a/arch/arm/mach-nexell/timer.c
+++ b/arch/arm/mach-nexell/timer.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <linux/kernel.h>
 
 #include <asm/io.h>
 #include <asm/arch/nexell.h>
diff --git a/arch/arm/mach-omap2/abb.c b/arch/arm/mach-omap2/abb.c
index c8c455fef1e0..24775bdc41ce 100644
--- a/arch/arm/mach-omap2/abb.c
+++ b/arch/arm/mach-omap2/abb.c
@@ -15,6 +15,7 @@
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 
 __weak s8 abb_setup_ldovbb(u32 fuse, u32 ldovbb)
 {
diff --git a/arch/arm/mach-omap2/am33xx/sys_info.c b/arch/arm/mach-omap2/am33xx/sys_info.c
index 0809664b7ecd..86078f856edc 100644
--- a/arch/arm/mach-omap2/am33xx/sys_info.c
+++ b/arch/arm/mach-omap2/am33xx/sys_info.c
@@ -18,6 +18,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/clock.h>
+#include <linux/kernel.h>
 #include <power/tps65910.h>
 #include <linux/compiler.h>
 
diff --git a/arch/arm/mach-omap2/emif-common.c b/arch/arm/mach-omap2/emif-common.c
index a6428a23db41..15c13463f905 100644
--- a/arch/arm/mach-omap2/emif-common.c
+++ b/arch/arm/mach-omap2/emif-common.c
@@ -24,6 +24,7 @@
 #include <linux/compiler.h>
 #include <asm/ti-common/ti-edma3.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 static int emif1_enabled = -1, emif2_enabled = -1;
diff --git a/arch/arm/mach-omap2/omap5/fdt.c b/arch/arm/mach-omap2/omap5/fdt.c
index d6259434a235..af9717801e44 100644
--- a/arch/arm/mach-omap2/omap5/fdt.c
+++ b/arch/arm/mach-omap2/omap5/fdt.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <stdio.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <malloc.h>
diff --git a/arch/arm/mach-omap2/omap5/sdram.c b/arch/arm/mach-omap2/omap5/sdram.c
index a35218ae600f..f6c8eb9f1bdd 100644
--- a/arch/arm/mach-omap2/omap5/sdram.c
+++ b/arch/arm/mach-omap2/omap5/sdram.c
@@ -14,6 +14,7 @@
 #include <stdio.h>
 #include <asm/emif.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/kernel.h>
 
 /*
  * This file provides details of the LPDDR2 SDRAM parts used on OMAP5
diff --git a/arch/arm/mach-omap2/sec-common.c b/arch/arm/mach-omap2/sec-common.c
index f24e0ad6366d..8dcaa1ac6c9e 100644
--- a/arch/arm/mach-omap2/sec-common.c
+++ b/arch/arm/mach-omap2/sec-common.c
@@ -22,6 +22,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include <asm/arch/sys_proto.h>
diff --git a/arch/arm/mach-rmobile/cpu_info.c b/arch/arm/mach-rmobile/cpu_info.c
index afecb6388c95..4d7fc0d9c71f 100644
--- a/arch/arm/mach-rmobile/cpu_info.c
+++ b/arch/arm/mach-rmobile/cpu_info.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <env.h>
 #include <linux/ctype.h>
+#include <linux/kernel.h>
 
 #ifdef CONFIG_ARCH_CPU_INIT
 int arch_cpu_init(void)
diff --git a/arch/arm/mach-rmobile/pfc-r8a7740.c b/arch/arm/mach-rmobile/pfc-r8a7740.c
index 5d42a68266b1..1bc72ee992e4 100644
--- a/arch/arm/mach-rmobile/pfc-r8a7740.c
+++ b/arch/arm/mach-rmobile/pfc-r8a7740.c
@@ -22,6 +22,7 @@
 #include <sh_pfc.h>
 #include <asm/gpio.h>
 #include <asm/arch/irqs.h>
+#include <linux/kernel.h>
 
 #define CPU_ALL_PORT(fn, pfx, sfx)					\
 	PORT_10(fn, pfx, sfx),		PORT_90(fn, pfx, sfx),		\
diff --git a/arch/arm/mach-rmobile/pfc-sh73a0.c b/arch/arm/mach-rmobile/pfc-sh73a0.c
index 55dab7c13894..11b91e3c79e5 100644
--- a/arch/arm/mach-rmobile/pfc-sh73a0.c
+++ b/arch/arm/mach-rmobile/pfc-sh73a0.c
@@ -22,6 +22,7 @@
 #include <common.h>
 #include <sh_pfc.h>
 #include <asm/arch/sh73a0-gpio.h>
+#include <linux/kernel.h>
 
 #define CPU_ALL_PORT(fn, pfx, sfx)				\
 	PORT_10(fn, pfx,    sfx), PORT_10(fn, pfx##1, sfx),	\
diff --git a/arch/arm/mach-rockchip/board.c b/arch/arm/mach-rockchip/board.c
index aaa7127d1abd..117aa030938c 100644
--- a/arch/arm/mach-rockchip/board.c
+++ b/arch/arm/mach-rockchip/board.c
@@ -9,6 +9,7 @@
 #include <init.h>
 #include <log.h>
 #include <ram.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <syscon.h>
 #include <asm/cache.h>
diff --git a/arch/arm/mach-rockchip/boot_mode.c b/arch/arm/mach-rockchip/boot_mode.c
index 20d44d424be7..69e64fb39c38 100644
--- a/arch/arm/mach-rockchip/boot_mode.c
+++ b/arch/arm/mach-rockchip/boot_mode.c
@@ -8,6 +8,7 @@
 #include <command.h>
 #include <env.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch-rockchip/boot_mode.h>
diff --git a/arch/arm/mach-rockchip/bootrom.c b/arch/arm/mach-rockchip/bootrom.c
index 71ac29ee435a..24ba39537cd2 100644
--- a/arch/arm/mach-rockchip/bootrom.c
+++ b/arch/arm/mach-rockchip/bootrom.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <hang.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/arch-rockchip/bootrom.h>
 #include <asm/arch-rockchip/boot_mode.h>
diff --git a/arch/arm/mach-rockchip/rk3288/rk3288.c b/arch/arm/mach-rockchip/rk3288/rk3288.c
index 97900fb3a311..1589ab1b2c70 100644
--- a/arch/arm/mach-rockchip/rk3288/rk3288.c
+++ b/arch/arm/mach-rockchip/rk3288/rk3288.c
@@ -24,6 +24,7 @@
 #include <asm/arch-rockchip/sdram.h>
 #include <asm/u-boot.h>
 #include <linux/err.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-rockchip/rk3399/rk3399.c b/arch/arm/mach-rockchip/rk3399/rk3399.c
index f8f6799a7fde..69eb741292a3 100644
--- a/arch/arm/mach-rockchip/rk3399/rk3399.c
+++ b/arch/arm/mach-rockchip/rk3399/rk3399.c
@@ -19,6 +19,7 @@
 #include <asm/arch-rockchip/grf_rk3399.h>
 #include <asm/arch-rockchip/hardware.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <power/regulator.h>
 
diff --git a/arch/arm/mach-rockchip/sdram.c b/arch/arm/mach-rockchip/sdram.c
index ed07ece15a4d..39c2ee2eedfa 100644
--- a/arch/arm/mach-rockchip/sdram.c
+++ b/arch/arm/mach-rockchip/sdram.c
@@ -12,6 +12,7 @@
 #include <asm/io.h>
 #include <asm/arch-rockchip/sdram.h>
 #include <dm/uclass-internal.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-rockchip/spl.c b/arch/arm/mach-rockchip/spl.c
index 6addcf4d962c..e20b83a490db 100644
--- a/arch/arm/mach-rockchip/spl.c
+++ b/arch/arm/mach-rockchip/spl.c
@@ -17,6 +17,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-snapdragon/pinctrl-apq8016.c b/arch/arm/mach-snapdragon/pinctrl-apq8016.c
index d261129a4dd4..42ac25a467a8 100644
--- a/arch/arm/mach-snapdragon/pinctrl-apq8016.c
+++ b/arch/arm/mach-snapdragon/pinctrl-apq8016.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <vsprintf.h>
+#include <linux/kernel.h>
 #include "pinctrl-snapdragon.h"
 
 #define MAX_PIN_NAME_LEN 32
diff --git a/arch/arm/mach-snapdragon/pinctrl-apq8096.c b/arch/arm/mach-snapdragon/pinctrl-apq8096.c
index da4a2d3901c5..9cd3e1f03a83 100644
--- a/arch/arm/mach-snapdragon/pinctrl-apq8096.c
+++ b/arch/arm/mach-snapdragon/pinctrl-apq8096.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <vsprintf.h>
+#include <linux/kernel.h>
 #include "pinctrl-snapdragon.h"
 
 #define MAX_PIN_NAME_LEN 32
diff --git a/arch/arm/mach-snapdragon/pinctrl-snapdragon.c b/arch/arm/mach-snapdragon/pinctrl-snapdragon.c
index b1c075a44ac7..1587d38cbfb6 100644
--- a/arch/arm/mach-snapdragon/pinctrl-snapdragon.c
+++ b/arch/arm/mach-snapdragon/pinctrl-snapdragon.c
@@ -13,6 +13,7 @@
 #include <dm/pinctrl.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include "pinctrl-snapdragon.h"
 
 struct msm_pinctrl_priv {
diff --git a/arch/arm/mach-socfpga/clock_manager_arria10.c b/arch/arm/mach-socfpga/clock_manager_arria10.c
index 82c90fb526c1..9d84871d4639 100644
--- a/arch/arm/mach-socfpga/clock_manager_arria10.c
+++ b/arch/arm/mach-socfpga/clock_manager_arria10.c
@@ -14,6 +14,7 @@
 #include <asm/arch/clock_manager.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #ifdef CONFIG_SPL_BUILD
diff --git a/arch/arm/mach-socfpga/firewall.c b/arch/arm/mach-socfpga/firewall.c
index 69229dc651e4..ed411c62c9c2 100644
--- a/arch/arm/mach-socfpga/firewall.c
+++ b/arch/arm/mach-socfpga/firewall.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <asm/arch/firewall.h>
 #include <asm/arch/system_manager.h>
+#include <linux/kernel.h>
 
 static void firewall_l4_per_disable(void)
 {
diff --git a/arch/arm/mach-socfpga/freeze_controller.c b/arch/arm/mach-socfpga/freeze_controller.c
index 561d3408cd8f..e994d38ba623 100644
--- a/arch/arm/mach-socfpga/freeze_controller.c
+++ b/arch/arm/mach-socfpga/freeze_controller.c
@@ -10,6 +10,7 @@
 #include <asm/arch/freeze_controller.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 static const struct socfpga_freeze_controller *freeze_controller_base =
 		(void *)(SOCFPGA_SYSMGR_ADDRESS + SYSMGR_FRZCTRL_ADDRESS);
diff --git a/arch/arm/mach-socfpga/include/mach/misc.h b/arch/arm/mach-socfpga/include/mach/misc.h
index a85c5aeef955..32bca6775e2c 100644
--- a/arch/arm/mach-socfpga/include/mach/misc.h
+++ b/arch/arm/mach-socfpga/include/mach/misc.h
@@ -6,6 +6,7 @@
 #ifndef _SOCFPGA_MISC_H_
 #define _SOCFPGA_MISC_H_
 
+#include <stdbool.h>
 #include <asm/sections.h>
 
 void dwmac_deassert_reset(const unsigned int of_reset_id, const u32 phymode);
diff --git a/arch/arm/mach-socfpga/include/mach/reset_manager_gen5.h b/arch/arm/mach-socfpga/include/mach/reset_manager_gen5.h
index d108eac1e21a..e46b48fdbb4c 100644
--- a/arch/arm/mach-socfpga/include/mach/reset_manager_gen5.h
+++ b/arch/arm/mach-socfpga/include/mach/reset_manager_gen5.h
@@ -6,6 +6,7 @@
 #ifndef _RESET_MANAGER_GEN5_H_
 #define _RESET_MANAGER_GEN5_H_
 
+#include <stdbool.h>
 #include <dt-bindings/reset/altr,rst-mgr.h>
 
 void socfpga_bridges_set_handoff_regs(bool h2f, bool lwh2f, bool f2h);
diff --git a/arch/arm/mach-socfpga/misc_gen5.c b/arch/arm/mach-socfpga/misc_gen5.c
index 22f113048149..c8c8c64476b4 100644
--- a/arch/arm/mach-socfpga/misc_gen5.c
+++ b/arch/arm/mach-socfpga/misc_gen5.c
@@ -14,6 +14,7 @@
 #include <fdtdec.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <altera.h>
 #include <miiphy.h>
diff --git a/arch/arm/mach-socfpga/misc_s10.c b/arch/arm/mach-socfpga/misc_s10.c
index 0addd436c2ba..107a873c1208 100644
--- a/arch/arm/mach-socfpga/misc_s10.c
+++ b/arch/arm/mach-socfpga/misc_s10.c
@@ -22,6 +22,7 @@
 #include <asm/arch/misc.h>
 #include <asm/pl310.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <asm/arch/mailbox_s10.h>
 #include <linux/string.h>
diff --git a/arch/arm/mach-socfpga/reset_manager_arria10.c b/arch/arm/mach-socfpga/reset_manager_arria10.c
index 27c030801134..461c45928002 100644
--- a/arch/arm/mach-socfpga/reset_manager_arria10.c
+++ b/arch/arm/mach-socfpga/reset_manager_arria10.c
@@ -13,6 +13,7 @@
 #include <errno.h>
 #include <fdtdec.h>
 #include <wait_bit.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-socfpga/reset_manager_gen5.c b/arch/arm/mach-socfpga/reset_manager_gen5.c
index 090567e9d8ab..e37325f2ac50 100644
--- a/arch/arm/mach-socfpga/reset_manager_gen5.c
+++ b/arch/arm/mach-socfpga/reset_manager_gen5.c
@@ -5,6 +5,7 @@
 
 
 #include <common.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/fpga_manager.h>
diff --git a/arch/arm/mach-socfpga/wrap_pinmux_config.c b/arch/arm/mach-socfpga/wrap_pinmux_config.c
index 33ca14c9dc76..f5a425db5592 100644
--- a/arch/arm/mach-socfpga/wrap_pinmux_config.c
+++ b/arch/arm/mach-socfpga/wrap_pinmux_config.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <errno.h>
+#include <linux/kernel.h>
 
 /* Board-specific header. */
 #include <qts/pinmux_config.h>
diff --git a/arch/arm/mach-socfpga/wrap_pinmux_config_s10.c b/arch/arm/mach-socfpga/wrap_pinmux_config_s10.c
index 0b497ec30c5d..8f3688dd19fa 100644
--- a/arch/arm/mach-socfpga/wrap_pinmux_config_s10.c
+++ b/arch/arm/mach-socfpga/wrap_pinmux_config_s10.c
@@ -8,6 +8,7 @@
 #include <errno.h>
 #include <asm/io.h>
 #include <asm/arch/handoff_s10.h>
+#include <linux/kernel.h>
 
 static void sysmgr_pinmux_handoff_read(void *handoff_address,
 				       const u32 **table,
diff --git a/arch/arm/mach-socfpga/wrap_sdram_config.c b/arch/arm/mach-socfpga/wrap_sdram_config.c
index 4ea32e72c7c9..50fec073b481 100644
--- a/arch/arm/mach-socfpga/wrap_sdram_config.c
+++ b/arch/arm/mach-socfpga/wrap_sdram_config.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <errno.h>
 #include <asm/arch/sdram.h>
+#include <linux/kernel.h>
 
 /* Board-specific header. */
 #include <qts/sdram_config.h>
diff --git a/arch/arm/mach-stm32/soc.c b/arch/arm/mach-stm32/soc.c
index 1f12da401c10..97d6318792a2 100644
--- a/arch/arm/mach-stm32/soc.c
+++ b/arch/arm/mach-stm32/soc.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <asm/io.h>
 #include <asm/armv7_mpu.h>
+#include <linux/kernel.h>
 
 int arch_cpu_init(void)
 {
diff --git a/arch/arm/mach-stm32mp/bsec.c b/arch/arm/mach-stm32mp/bsec.c
index d41382409c30..ed1a13b0a3a0 100644
--- a/arch/arm/mach-stm32mp/bsec.c
+++ b/arch/arm/mach-stm32mp/bsec.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <log.h>
 #include <misc.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <asm/arch/bsec.h>
 #include <asm/arch/stm32mp1_smc.h>
diff --git a/arch/arm/mach-stm32mp/cmd_stm32key.c b/arch/arm/mach-stm32mp/cmd_stm32key.c
index 7ce8a9dee69e..a5c94d331e65 100644
--- a/arch/arm/mach-stm32mp/cmd_stm32key.c
+++ b/arch/arm/mach-stm32mp/cmd_stm32key.c
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <console.h>
 #include <misc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <dm/device.h>
diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c b/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c
index 89baa9885a84..bc9767c8ccf4 100644
--- a/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c
+++ b/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <dfu.h>
 #include <image.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/arch/stm32prog.h>
diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c
index 0589cfcb31c7..f75050a0b4df 100644
--- a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c
+++ b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c
@@ -17,6 +17,7 @@
 #include <dm/uclass.h>
 #include <jffs2/load_kernel.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/list.h>
 #include <linux/list_sort.h>
 #include <linux/mtd/mtd.h>
diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.h b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.h
index de1361d9841d..46f014cb77f8 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 <stdbool.h>
 #include <vsprintf.h>
 #include <linux/printk.h>
 
diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_serial.c b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_serial.c
index be3eb230f1e9..1419d0f20e76 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 <dfu.h>
 #include <malloc.h>
 #include <serial.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <watchdog.h>
diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_usb.c b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_usb.c
index 15ca72043a33..a170fdfee94c 100644
--- a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_usb.c
+++ b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_usb.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <dfu.h>
 #include <g_dnl.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <usb.h>
 #include <vsprintf.h>
diff --git a/arch/arm/mach-stm32mp/cpu.c b/arch/arm/mach-stm32mp/cpu.c
index 8dcf4d4f8531..e275df5905c8 100644
--- a/arch/arm/mach-stm32mp/cpu.c
+++ b/arch/arm/mach-stm32mp/cpu.c
@@ -22,6 +22,7 @@
 #include <dm/uclass.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 
 /* RCC register */
diff --git a/arch/arm/mach-stm32mp/dram_init.c b/arch/arm/mach-stm32mp/dram_init.c
index 611e0ff0eb70..8685df3d06d1 100644
--- a/arch/arm/mach-stm32mp/dram_init.c
+++ b/arch/arm/mach-stm32mp/dram_init.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <ram.h>
 #include <asm/global_data.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-stm32mp/fdt.c b/arch/arm/mach-stm32mp/fdt.c
index 1bfa19207d11..e83885440b46 100644
--- a/arch/arm/mach-stm32mp/fdt.c
+++ b/arch/arm/mach-stm32mp/fdt.c
@@ -13,6 +13,7 @@
 #include <asm/u-boot.h>
 #include <dt-bindings/pinctrl/stm32-pinfunc.h>
 #include <linux/io.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #define ETZPC_DECPROT(n)	(STM32_ETZPC_BASE + 0x10 + 4 * (n))
diff --git a/arch/arm/mach-stm32mp/include/mach/bsec.h b/arch/arm/mach-stm32mp/include/mach/bsec.h
index 252eac3946a4..8a98312e126d 100644
--- a/arch/arm/mach-stm32mp/include/mach/bsec.h
+++ b/arch/arm/mach-stm32mp/include/mach/bsec.h
@@ -4,4 +4,5 @@
  */
 
 /* check self hosted debug status = BSEC_DENABLE.DBGSWENABLE */
+#include <stdbool.h>
 bool bsec_dbgswenable(void);
diff --git a/arch/arm/mach-stm32mp/include/mach/stm32prog.h b/arch/arm/mach-stm32mp/include/mach/stm32prog.h
index c080b9cc42ad..7d59c8a9f24b 100644
--- a/arch/arm/mach-stm32mp/include/mach/stm32prog.h
+++ b/arch/arm/mach-stm32mp/include/mach/stm32prog.h
@@ -3,6 +3,7 @@
  * Copyright (C) 2020, STMicroelectronics - All Rights Reserved
  */
 
+#include <stdbool.h>
 #define STM32PROG_VIRT_FIRST_DEV_NUM		0xF1
 
 int stm32prog_write_medium_virt(struct dfu_entity *dfu, u64 offset,
diff --git a/arch/arm/mach-sunxi/clock_sun4i.c b/arch/arm/mach-sunxi/clock_sun4i.c
index bd9f476543d8..7799c5750d34 100644
--- a/arch/arm/mach-sunxi/clock_sun4i.c
+++ b/arch/arm/mach-sunxi/clock_sun4i.c
@@ -15,6 +15,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/gpio.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/kernel.h>
 
 #ifdef CONFIG_SPL_BUILD
 void clock_init_safe(void)
diff --git a/arch/arm/mach-sunxi/clock_sun6i.c b/arch/arm/mach-sunxi/clock_sun6i.c
index 8e84062bd7c6..529fdd7754e2 100644
--- a/arch/arm/mach-sunxi/clock_sun6i.c
+++ b/arch/arm/mach-sunxi/clock_sun6i.c
@@ -10,6 +10,7 @@
  */
 
 #include <common.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/prcm.h>
diff --git a/arch/arm/mach-sunxi/dram_helpers.c b/arch/arm/mach-sunxi/dram_helpers.c
index de04e9d84282..ffadaa425703 100644
--- a/arch/arm/mach-sunxi/dram_helpers.c
+++ b/arch/arm/mach-sunxi/dram_helpers.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <stdbool.h>
 #include <time.h>
 #include <vsprintf.h>
 #include <asm/barriers.h>
diff --git a/arch/arm/mach-sunxi/dram_sun4i.c b/arch/arm/mach-sunxi/dram_sun4i.c
index f85f52898d12..6c406f111565 100644
--- a/arch/arm/mach-sunxi/dram_sun4i.c
+++ b/arch/arm/mach-sunxi/dram_sun4i.c
@@ -29,6 +29,7 @@
 #include <asm/arch/timer.h>
 #include <asm/arch/sys_proto.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 
 #define CPU_CFG_CHIP_VER(n) ((n) << 6)
 #define CPU_CFG_CHIP_VER_MASK CPU_CFG_CHIP_VER(0x3)
diff --git a/arch/arm/mach-sunxi/dram_sun50i_h6.c b/arch/arm/mach-sunxi/dram_sun50i_h6.c
index a877d655d86b..ea47fa86478c 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 <stdbool.h>
 #include <vsprintf.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
diff --git a/arch/arm/mach-sunxi/dram_sun6i.c b/arch/arm/mach-sunxi/dram_sun6i.c
index 9d1620c97588..53f8ac068ae6 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 <stdbool.h>
 #include <vsprintf.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
diff --git a/arch/arm/mach-sunxi/dram_sun8i_a33.c b/arch/arm/mach-sunxi/dram_sun8i_a33.c
index d5d324860e3f..5b993afe3efe 100644
--- a/arch/arm/mach-sunxi/dram_sun8i_a33.c
+++ b/arch/arm/mach-sunxi/dram_sun8i_a33.c
@@ -16,6 +16,7 @@
 #include <asm/arch/prcm.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 /* PLL runs at 2x dram-clk, controller runs at PLL / 4 (dram-clk / 2) */
 #define DRAM_CLK_MUL 2
diff --git a/arch/arm/mach-sunxi/dram_sun8i_a83t.c b/arch/arm/mach-sunxi/dram_sun8i_a83t.c
index 8a32ea4f0a17..bf6279214408 100644
--- a/arch/arm/mach-sunxi/dram_sun8i_a83t.c
+++ b/arch/arm/mach-sunxi/dram_sun8i_a83t.c
@@ -16,6 +16,7 @@
 #include <asm/arch/prcm.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #define DRAM_CLK_MUL 2
 #define DRAM_CLK_DIV 1
diff --git a/arch/arm/mach-sunxi/dram_sunxi_dw.c b/arch/arm/mach-sunxi/dram_sunxi_dw.c
index e3e40aaa5e6d..3fa8509efb9b 100644
--- a/arch/arm/mach-sunxi/dram_sunxi_dw.c
+++ b/arch/arm/mach-sunxi/dram_sunxi_dw.c
@@ -18,6 +18,7 @@
 #include <asm/arch/cpu.h>
 #include <linux/delay.h>
 #include <linux/kconfig.h>
+#include <linux/kernel.h>
 
 static void mctl_phy_init(u32 val)
 {
diff --git a/arch/arm/mach-sunxi/dram_timings/ddr2_v3s.c b/arch/arm/mach-sunxi/dram_timings/ddr2_v3s.c
index 9077f86a8b4c..14ee586e147a 100644
--- a/arch/arm/mach-sunxi/dram_timings/ddr2_v3s.c
+++ b/arch/arm/mach-sunxi/dram_timings/ddr2_v3s.c
@@ -1,6 +1,7 @@
 #include <common.h>
 #include <asm/arch/dram.h>
 #include <asm/arch/cpu.h>
+#include <linux/kernel.h>
 
 void mctl_set_timing_params(uint16_t socid, struct dram_para *para)
 {
diff --git a/arch/arm/mach-sunxi/dram_timings/ddr3_1333.c b/arch/arm/mach-sunxi/dram_timings/ddr3_1333.c
index 0471e8a49e58..a297d469a90e 100644
--- a/arch/arm/mach-sunxi/dram_timings/ddr3_1333.c
+++ b/arch/arm/mach-sunxi/dram_timings/ddr3_1333.c
@@ -1,6 +1,7 @@
 #include <common.h>
 #include <asm/arch/dram.h>
 #include <asm/arch/cpu.h>
+#include <linux/kernel.h>
 
 void mctl_set_timing_params(uint16_t socid, struct dram_para *para)
 {
diff --git a/arch/arm/mach-sunxi/dram_timings/h6_ddr3_1333.c b/arch/arm/mach-sunxi/dram_timings/h6_ddr3_1333.c
index 611eaa3024c4..6160518efee3 100644
--- a/arch/arm/mach-sunxi/dram_timings/h6_ddr3_1333.c
+++ b/arch/arm/mach-sunxi/dram_timings/h6_ddr3_1333.c
@@ -22,6 +22,7 @@
 #include <common.h>
 #include <asm/arch/dram.h>
 #include <asm/arch/cpu.h>
+#include <linux/kernel.h>
 
 /*
  * Only the first four are used for DDR3(?)
diff --git a/arch/arm/mach-sunxi/dram_timings/h6_lpddr3.c b/arch/arm/mach-sunxi/dram_timings/h6_lpddr3.c
index 10008601134a..497c59d8ae2b 100644
--- a/arch/arm/mach-sunxi/dram_timings/h6_lpddr3.c
+++ b/arch/arm/mach-sunxi/dram_timings/h6_lpddr3.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <asm/arch/dram.h>
 #include <asm/arch/cpu.h>
+#include <linux/kernel.h>
 
 static u32 mr_lpddr3[12] = {
 	0x00000000, 0x00000043, 0x0000001a, 0x00000001,
diff --git a/arch/arm/mach-sunxi/dram_timings/lpddr3_stock.c b/arch/arm/mach-sunxi/dram_timings/lpddr3_stock.c
index bd57e2f6aac2..6378bbc22a31 100644
--- a/arch/arm/mach-sunxi/dram_timings/lpddr3_stock.c
+++ b/arch/arm/mach-sunxi/dram_timings/lpddr3_stock.c
@@ -1,6 +1,7 @@
 #include <common.h>
 #include <asm/arch/dram.h>
 #include <asm/arch/cpu.h>
+#include <linux/kernel.h>
 
 void mctl_set_timing_params(uint16_t socid, struct dram_para *para)
 {
diff --git a/arch/arm/mach-sunxi/spl_spi_sunxi.c b/arch/arm/mach-sunxi/spl_spi_sunxi.c
index 15e86cbac8f4..f9e1f27363fc 100644
--- a/arch/arm/mach-sunxi/spl_spi_sunxi.c
+++ b/arch/arm/mach-sunxi/spl_spi_sunxi.c
@@ -7,6 +7,7 @@
 #include <image.h>
 #include <log.h>
 #include <spl.h>
+#include <stdbool.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
diff --git a/arch/arm/mach-tegra/board.c b/arch/arm/mach-tegra/board.c
index ecdfcdde921a..cd0eb258bf93 100644
--- a/arch/arm/mach-tegra/board.c
+++ b/arch/arm/mach-tegra/board.c
@@ -30,6 +30,7 @@
 #include <asm/arch-tegra/pmc.h>
 #include <asm/arch-tegra/sys_proto.h>
 #include <asm/arch-tegra/warmboot.h>
+#include <linux/kernel.h>
 
 void save_boot_params_ret(void);
 
diff --git a/arch/arm/mach-tegra/cboot.c b/arch/arm/mach-tegra/cboot.c
index 832a0ba1ca08..353fb49616ac 100644
--- a/arch/arm/mach-tegra/cboot.c
+++ b/arch/arm/mach-tegra/cboot.c
@@ -17,6 +17,7 @@
 #include <string.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/arch/arm/mach-tegra/clock.c b/arch/arm/mach-tegra/clock.c
index 9056fe0dd31c..567ba52ee88e 100644
--- a/arch/arm/mach-tegra/clock.c
+++ b/arch/arm/mach-tegra/clock.c
@@ -21,6 +21,7 @@
 #include <asm/arch-tegra/timer.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 /*
  * This is our record of the current clock rate of each clock. We don't
diff --git a/arch/arm/mach-tegra/dt-setup.c b/arch/arm/mach-tegra/dt-setup.c
index 237f184b7514..d3848f14985a 100644
--- a/arch/arm/mach-tegra/dt-setup.c
+++ b/arch/arm/mach-tegra/dt-setup.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <asm/arch-tegra/gpu.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 /*
  * This function is called right before the kernel is booted. "blob" is the
diff --git a/arch/arm/mach-tegra/gpu.c b/arch/arm/mach-tegra/gpu.c
index 13ffade0408e..928a00f222cc 100644
--- a/arch/arm/mach-tegra/gpu.c
+++ b/arch/arm/mach-tegra/gpu.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <asm/arch/tegra.h>
 #include <asm/arch/mc.h>
diff --git a/arch/arm/mach-tegra/pmc.c b/arch/arm/mach-tegra/pmc.c
index 0d4063ad1a27..f4747484f29f 100644
--- a/arch/arm/mach-tegra/pmc.c
+++ b/arch/arm/mach-tegra/pmc.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 
diff --git a/arch/arm/mach-tegra/powergate.c b/arch/arm/mach-tegra/powergate.c
index 5b3e3d8f56e8..3a96708c3045 100644
--- a/arch/arm/mach-tegra/powergate.c
+++ b/arch/arm/mach-tegra/powergate.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <errno.h>
+#include <stdbool.h>
 #include <time.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/arch/arm/mach-tegra/tegra114/cpu.c b/arch/arm/mach-tegra/tegra114/cpu.c
index 62c10536306b..7e529130ad51 100644
--- a/arch/arm/mach-tegra/tegra114/cpu.c
+++ b/arch/arm/mach-tegra/tegra114/cpu.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/flow.h>
diff --git a/arch/arm/mach-tegra/tegra124/clock.c b/arch/arm/mach-tegra/tegra124/clock.c
index 8dfdd2bc8add..edca9c3fdc38 100644
--- a/arch/arm/mach-tegra/tegra124/clock.c
+++ b/arch/arm/mach-tegra/tegra124/clock.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <init.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
diff --git a/arch/arm/mach-tegra/tegra124/cpu.c b/arch/arm/mach-tegra/tegra124/cpu.c
index d5f2683b266c..2fce060037a6 100644
--- a/arch/arm/mach-tegra/tegra124/cpu.c
+++ b/arch/arm/mach-tegra/tegra124/cpu.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <asm/arch/ahb.h>
 #include <asm/arch/clock.h>
diff --git a/arch/arm/mach-tegra/tegra124/xusb-padctl.c b/arch/arm/mach-tegra/tegra124/xusb-padctl.c
index 6985515499f1..52398eba3fab 100644
--- a/arch/arm/mach-tegra/tegra124/xusb-padctl.c
+++ b/arch/arm/mach-tegra/tegra124/xusb-padctl.c
@@ -14,6 +14,7 @@
 #include <dm/ofnode.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 
 #include "../xusb-padctl-common.h"
diff --git a/arch/arm/mach-tegra/tegra20/funcmux.c b/arch/arm/mach-tegra/tegra20/funcmux.c
index 90fe0cba8ea4..827ae4b748bf 100644
--- a/arch/arm/mach-tegra/tegra20/funcmux.c
+++ b/arch/arm/mach-tegra/tegra20/funcmux.c
@@ -9,6 +9,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/funcmux.h>
 #include <asm/arch/pinmux.h>
+#include <linux/kernel.h>
 
 /*
  * The PINMUX macro is used to set up pinmux tables.
diff --git a/arch/arm/mach-tegra/tegra20/warmboot.c b/arch/arm/mach-tegra/tegra20/warmboot.c
index 215cf5ae5613..f0050a4f8212 100644
--- a/arch/arm/mach-tegra/tegra20/warmboot.c
+++ b/arch/arm/mach-tegra/tegra20/warmboot.c
@@ -21,6 +21,7 @@
 #include <asm/arch-tegra/pmc.h>
 #include <asm/arch-tegra/fuse.h>
 #include <asm/arch-tegra/warmboot.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-tegra/tegra210/xusb-padctl.c b/arch/arm/mach-tegra/tegra210/xusb-padctl.c
index 572ba95d5b07..78cea2b9193f 100644
--- a/arch/arm/mach-tegra/tegra210/xusb-padctl.c
+++ b/arch/arm/mach-tegra/tegra210/xusb-padctl.c
@@ -14,6 +14,7 @@
 #include <dm/ofnode.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 
 #include "../xusb-padctl-common.h"
diff --git a/arch/arm/mach-tegra/xusb-padctl-dummy.c b/arch/arm/mach-tegra/xusb-padctl-dummy.c
index b3c5c9453b24..d04069993c69 100644
--- a/arch/arm/mach-tegra/xusb-padctl-dummy.c
+++ b/arch/arm/mach-tegra/xusb-padctl-dummy.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <errno.h>
 #include <linux/errno.h>
 
diff --git a/arch/arm/mach-uniphier/dram/ddrphy-init.h b/arch/arm/mach-uniphier/dram/ddrphy-init.h
index 09981f6e06f5..40a8523eb8e7 100644
--- a/arch/arm/mach-uniphier/dram/ddrphy-init.h
+++ b/arch/arm/mach-uniphier/dram/ddrphy-init.h
@@ -6,6 +6,7 @@
 #ifndef ARCH_DDRPHY_INIT_H
 #define ARCH_DDRPHY_INTT_H
 
+#include <stdbool.h>
 #include <linux/compiler.h>
 #include <linux/types.h>
 
diff --git a/arch/arm/mach-uniphier/dram/ddrphy-ld4.c b/arch/arm/mach-uniphier/dram/ddrphy-ld4.c
index 26f3ba9d5773..747bc64403db 100644
--- a/arch/arm/mach-uniphier/dram/ddrphy-ld4.c
+++ b/arch/arm/mach-uniphier/dram/ddrphy-ld4.c
@@ -4,6 +4,7 @@
  * Copyright (C) 2015-2016 Socionext Inc.
  */
 
+#include <stdbool.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/io.h>
diff --git a/arch/arm/mach-uniphier/dram/umc-ld4.c b/arch/arm/mach-uniphier/dram/umc-ld4.c
index 1eb15b611fd3..1109607abfda 100644
--- a/arch/arm/mach-uniphier/dram/umc-ld4.c
+++ b/arch/arm/mach-uniphier/dram/umc-ld4.c
@@ -5,6 +5,7 @@
  *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  */
 
+#include <stdbool.h>
 #include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/printk.h>
diff --git a/arch/arm/mach-uniphier/dram/umc-pro4.c b/arch/arm/mach-uniphier/dram/umc-pro4.c
index 0114df782b4f..b2666ef82492 100644
--- a/arch/arm/mach-uniphier/dram/umc-pro4.c
+++ b/arch/arm/mach-uniphier/dram/umc-pro4.c
@@ -5,6 +5,7 @@
  *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  */
 
+#include <stdbool.h>
 #include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/printk.h>
diff --git a/arch/arm/mach-uniphier/dram/umc-pxs2.c b/arch/arm/mach-uniphier/dram/umc-pxs2.c
index 73574201e31b..b39f3d79cdd5 100644
--- a/arch/arm/mach-uniphier/dram/umc-pxs2.c
+++ b/arch/arm/mach-uniphier/dram/umc-pxs2.c
@@ -11,6 +11,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/io.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/sizes.h>
 #include <asm/processor.h>
diff --git a/arch/arm/mach-uniphier/dram/umc-sld8.c b/arch/arm/mach-uniphier/dram/umc-sld8.c
index 583a1bad8b74..d60f70e9e031 100644
--- a/arch/arm/mach-uniphier/dram/umc-sld8.c
+++ b/arch/arm/mach-uniphier/dram/umc-sld8.c
@@ -5,6 +5,7 @@
  *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  */
 
+#include <stdbool.h>
 #include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/printk.h>
diff --git a/arch/arm/mach-uniphier/micro-support-card.c b/arch/arm/mach-uniphier/micro-support-card.c
index f3abb8554125..07ce46bd9ddb 100644
--- a/arch/arm/mach-uniphier/micro-support-card.c
+++ b/arch/arm/mach-uniphier/micro-support-card.c
@@ -7,6 +7,7 @@
 
 #include <dm.h>
 #include <fdt_support.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <linux/ctype.h>
 #include <linux/delay.h>
diff --git a/arch/arm/mach-uniphier/mmc-first-dev.c b/arch/arm/mach-uniphier/mmc-first-dev.c
index 45bb10f8eb1f..a70a00c7494e 100644
--- a/arch/arm/mach-uniphier/mmc-first-dev.c
+++ b/arch/arm/mach-uniphier/mmc-first-dev.c
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <env.h>
 #include <mmc.h>
+#include <stdbool.h>
 #include <linux/errno.h>
 
 static int find_first_mmc_device(bool is_sd)
diff --git a/arch/arm/mach-versal/mp.c b/arch/arm/mach-versal/mp.c
index df196460dd55..001c3e9518ab 100644
--- a/arch/arm/mach-versal/mp.c
+++ b/arch/arm/mach-versal/mp.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/arch/arm/mach-zynq/slcr.c b/arch/arm/mach-zynq/slcr.c
index d7c879dc82dc..67df265ba967 100644
--- a/arch/arm/mach-zynq/slcr.c
+++ b/arch/arm/mach-zynq/slcr.c
@@ -8,6 +8,7 @@
 #include <malloc.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #define SLCR_LOCK_MAGIC		0x767B
diff --git a/arch/arm/mach-zynqmp/include/mach/sys_proto.h b/arch/arm/mach-zynqmp/include/mach/sys_proto.h
index 2974ffbc2f56..05c81769d63d 100644
--- a/arch/arm/mach-zynqmp/include/mach/sys_proto.h
+++ b/arch/arm/mach-zynqmp/include/mach/sys_proto.h
@@ -7,6 +7,7 @@
 #ifndef _ASM_ARCH_SYS_PROTO_H
 #define _ASM_ARCH_SYS_PROTO_H
 
+#include <stdbool.h>
 #define PAYLOAD_ARG_CNT		5
 
 #define ZYNQMP_CSU_SILICON_VER_MASK	0xF
diff --git a/arch/arm/mach-zynqmp/mp.c b/arch/arm/mach-zynqmp/mp.c
index 589f9ec9ab22..b31da25933ed 100644
--- a/arch/arm/mach-zynqmp/mp.c
+++ b/arch/arm/mach-zynqmp/mp.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/arch/hardware.h>
diff --git a/arch/m68k/lib/cache.c b/arch/m68k/lib/cache.c
index 68f2eef584b7..22048d12d707 100644
--- a/arch/m68k/lib/cache.c
+++ b/arch/m68k/lib/cache.c
@@ -8,6 +8,7 @@
 #include <cpu_func.h>
 #include <asm/immap.h>
 #include <asm/cache.h>
+#include <linux/kernel.h>
 
 volatile int *cf_icache_status = (int *)ICACHE_STATUS;
 volatile int *cf_dcache_status = (int *)DCACHE_STATUS;
diff --git a/arch/m68k/lib/interrupts.c b/arch/m68k/lib/interrupts.c
index 1caef61d20e9..a5b808fbe20c 100644
--- a/arch/m68k/lib/interrupts.c
+++ b/arch/m68k/lib/interrupts.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <irq_func.h>
 #include <watchdog.h>
+#include <stdio.h>
 #include <asm/processor.h>
 #include <asm/immap.h>
 #include <asm/ptrace.h>
diff --git a/arch/microblaze/cpu/spl.c b/arch/microblaze/cpu/spl.c
index 86522f844794..9f25c2f39529 100644
--- a/arch/microblaze/cpu/spl.c
+++ b/arch/microblaze/cpu/spl.c
@@ -10,6 +10,7 @@
 #include <image.h>
 #include <log.h>
 #include <spl.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <asm/u-boot.h>
 
diff --git a/arch/microblaze/cpu/timer.c b/arch/microblaze/cpu/timer.c
index 05ab0e1b1570..3e6750ea7f44 100644
--- a/arch/microblaze/cpu/timer.c
+++ b/arch/microblaze/cpu/timer.c
@@ -14,6 +14,7 @@
 #include <asm/microblaze_timer.h>
 #include <asm/microblaze_intc.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/mips/cpu/time.c b/arch/mips/cpu/time.c
index 5e7a7144d027..aab92ec859bb 100644
--- a/arch/mips/cpu/time.c
+++ b/arch/mips/cpu/time.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <time.h>
 #include <asm/mipsregs.h>
 
diff --git a/arch/mips/lib/cache.c b/arch/mips/lib/cache.c
index 1eb1459184cb..7be0b559561f 100644
--- a/arch/mips/lib/cache.c
+++ b/arch/mips/lib/cache.c
@@ -15,6 +15,7 @@
 #include <asm/mipsregs.h>
 #include <asm/system.h>
 #include <linux/bug.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/mips/mach-ath79/ar934x/clk.c b/arch/mips/mach-ath79/ar934x/clk.c
index c2ccd35e8bb2..c2c594a32273 100644
--- a/arch/mips/mach-ath79/ar934x/clk.c
+++ b/arch/mips/mach-ath79/ar934x/clk.c
@@ -14,6 +14,7 @@
 #include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <mach/ar71xx_regs.h>
 #include <mach/ath79.h>
 #include <wait_bit.h>
diff --git a/arch/mips/mach-ath79/cpu.c b/arch/mips/mach-ath79/cpu.c
index 709fa7a9c3b0..55d051f8cb93 100644
--- a/arch/mips/mach-ath79/cpu.c
+++ b/arch/mips/mach-ath79/cpu.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <asm/addrspace.h>
 #include <asm/types.h>
+#include <linux/kernel.h>
 #include <mach/ath79.h>
 #include <mach/ar71xx_regs.h>
 
diff --git a/arch/mips/mach-jz47xx/jz4780/pll.c b/arch/mips/mach-jz47xx/jz4780/pll.c
index 9aada2ef15b9..ac76a507355e 100644
--- a/arch/mips/mach-jz47xx/jz4780/pll.c
+++ b/arch/mips/mach-jz47xx/jz4780/pll.c
@@ -12,6 +12,7 @@
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <mach/jz4780.h>
 
 #define CPM_CPCCR		0x00
diff --git a/arch/mips/mach-mscc/include/mach/ddr.h b/arch/mips/mach-mscc/include/mach/ddr.h
index d52eabbd2b1f..8c1f14773ecc 100644
--- a/arch/mips/mach-mscc/include/mach/ddr.h
+++ b/arch/mips/mach-mscc/include/mach/ddr.h
@@ -6,6 +6,7 @@
 #ifndef __ASM_MACH_DDR_H
 #define __ASM_MACH_DDR_H
 
+#include <stdbool.h>
 #include <asm/cacheops.h>
 #include <asm/io.h>
 #include <asm/reboot.h>
diff --git a/arch/mips/mach-mtmips/ddr_cal.c b/arch/mips/mach-mtmips/ddr_cal.c
index 762619a960f3..1f2f12879b2c 100644
--- a/arch/mips/mach-mtmips/ddr_cal.c
+++ b/arch/mips/mach-mtmips/ddr_cal.c
@@ -11,6 +11,7 @@
 #include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/io.h>
+#include <linux/kernel.h>
 #include <mach/mc.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/mips/mach-mtmips/mt7628/init.c b/arch/mips/mach-mtmips/mt7628/init.c
index c0b4387585fa..8bf918b3f259 100644
--- a/arch/mips/mach-mtmips/mt7628/init.c
+++ b/arch/mips/mach-mtmips/mt7628/init.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <dm.h>
 #include <stdio.h>
 #include <time.h>
diff --git a/arch/mips/mach-octeon/clock.c b/arch/mips/mach-octeon/clock.c
index 8984bfd74458..05a312b22985 100644
--- a/arch/mips/mach-octeon/clock.c
+++ b/arch/mips/mach-octeon/clock.c
@@ -3,6 +3,7 @@
  * Copyright (C) 2018, 2019 Marvell International Ltd.
  */
 
+#include <compiler.h>
 #include <time.h>
 #include <asm/global_data.h>
 #include <mach/clock.h>
diff --git a/arch/nios2/cpu/traps.c b/arch/nios2/cpu/traps.c
index 087a05097d9e..d87b8a4bb2ff 100644
--- a/arch/nios2/cpu/traps.c
+++ b/arch/nios2/cpu/traps.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <hang.h>
+#include <stdio.h>
 #include <asm/ptrace.h>
 
 void trap_handler (struct pt_regs *regs)
diff --git a/arch/powerpc/cpu/mpc83xx/cpu.c b/arch/powerpc/cpu/mpc83xx/cpu.c
index 5d3ff0e4d372..0954553d65b7 100644
--- a/arch/powerpc/cpu/mpc83xx/cpu.c
+++ b/arch/powerpc/cpu/mpc83xx/cpu.c
@@ -23,6 +23,7 @@
 #include <asm/ppc.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <tsec.h>
 #include <netdev.h>
diff --git a/arch/powerpc/cpu/mpc83xx/cpu_init.c b/arch/powerpc/cpu/mpc83xx/cpu_init.c
index b23647e91729..b9e5a90cfbd3 100644
--- a/arch/powerpc/cpu/mpc83xx/cpu_init.c
+++ b/arch/powerpc/cpu/mpc83xx/cpu_init.c
@@ -15,6 +15,7 @@
 #include <usb/ehci-ci.h>
 #endif
 #include <linux/delay.h>
+#include <linux/kernel.h>
 
 #include "lblaw/lblaw.h"
 #include "elbc/elbc.h"
diff --git a/arch/powerpc/cpu/mpc83xx/law.c b/arch/powerpc/cpu/mpc83xx/law.c
index 891a0d7727ef..ea338bcfe1cd 100644
--- a/arch/powerpc/cpu/mpc83xx/law.c
+++ b/arch/powerpc/cpu/mpc83xx/law.c
@@ -8,6 +8,7 @@
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
 #include <asm/ppc.h>
+#include <linux/kernel.h>
 #include <linux/log2.h>
 
 int set_ddr_laws(u64 start, u64 sz, enum law_trgt_if id)
diff --git a/arch/powerpc/cpu/mpc83xx/pcie.c b/arch/powerpc/cpu/mpc83xx/pcie.c
index 5b8322fadb87..38871cc0569f 100644
--- a/arch/powerpc/cpu/mpc83xx/pcie.c
+++ b/arch/powerpc/cpu/mpc83xx/pcie.c
@@ -15,6 +15,7 @@
 #include <asm/io.h>
 #include <asm/ppc.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/powerpc/cpu/mpc83xx/speed.c b/arch/powerpc/cpu/mpc83xx/speed.c
index a595c58e5bf8..d718a9a30730 100644
--- a/arch/powerpc/cpu/mpc83xx/speed.c
+++ b/arch/powerpc/cpu/mpc83xx/speed.c
@@ -603,4 +603,5 @@ U_BOOT_CMD(clocks, 1, 0, do_clocks,
 );
 
 #include <stdio.h>
+#include <linux/kernel.h>
 #endif
diff --git a/arch/powerpc/cpu/mpc85xx/b4860_ids.c b/arch/powerpc/cpu/mpc85xx/b4860_ids.c
index 3dccc0e1068e..dec9438ee8b8 100644
--- a/arch/powerpc/cpu/mpc85xx/b4860_ids.c
+++ b/arch/powerpc/cpu/mpc85xx/b4860_ids.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <asm/fsl_portals.h>
 #include <asm/fsl_liodn.h>
+#include <linux/kernel.h>
 
 #ifdef CONFIG_SYS_DPAA_QBMAN
 struct qportal_info qp_info[CONFIG_SYS_QMAN_NUM_PORTALS] = {
diff --git a/arch/powerpc/cpu/mpc85xx/b4860_serdes.c b/arch/powerpc/cpu/mpc85xx/b4860_serdes.c
index dae5bb83b922..eb28b08239db 100644
--- a/arch/powerpc/cpu/mpc85xx/b4860_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/b4860_serdes.c
@@ -7,6 +7,7 @@
 #include <asm/fsl_serdes.h>
 #include <asm/ppc.h>
 #include <asm/io.h>
+#include <linux/kernel.h>
 #include "fsl_corenet2_serdes.h"
 
 struct serdes_config {
diff --git a/arch/powerpc/cpu/mpc85xx/bsc9132_serdes.c b/arch/powerpc/cpu/mpc85xx/bsc9132_serdes.c
index e08484324d0e..f5c9d1d81755 100644
--- a/arch/powerpc/cpu/mpc85xx/bsc9132_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/bsc9132_serdes.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
+#include <linux/kernel.h>
 
 #define SRDS1_MAX_LANES		4
 
diff --git a/arch/powerpc/cpu/mpc85xx/c29x_serdes.c b/arch/powerpc/cpu/mpc85xx/c29x_serdes.c
index 10bc15c45ca8..8c61fd471bc7 100644
--- a/arch/powerpc/cpu/mpc85xx/c29x_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/c29x_serdes.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
+#include <linux/kernel.h>
 
 #define SRDS1_MAX_LANES		4
 
diff --git a/arch/powerpc/cpu/mpc85xx/cmd_errata.c b/arch/powerpc/cpu/mpc85xx/cmd_errata.c
index 42fcfb249966..1a3df5bff48b 100644
--- a/arch/powerpc/cpu/mpc85xx/cmd_errata.c
+++ b/arch/powerpc/cpu/mpc85xx/cmd_errata.c
@@ -12,6 +12,7 @@
 #include <asm/immap_85xx.h>
 #include <asm/ppc.h>
 #include <fsl_usb.h>
+#include <linux/kernel.h>
 #include "fsl_corenet_serdes.h"
 
 #ifdef CONFIG_SYS_FSL_ERRATUM_A004849
diff --git a/arch/powerpc/cpu/mpc85xx/cpu.c b/arch/powerpc/cpu/mpc85xx/cpu.c
index afcfc47554df..da578d6c9005 100644
--- a/arch/powerpc/cpu/mpc85xx/cpu.c
+++ b/arch/powerpc/cpu/mpc85xx/cpu.c
@@ -34,6 +34,7 @@
 #include <asm/ppc.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init.c b/arch/powerpc/cpu/mpc85xx/cpu_init.c
index be5381b47a50..7d52b2acc650 100644
--- a/arch/powerpc/cpu/mpc85xx/cpu_init.c
+++ b/arch/powerpc/cpu/mpc85xx/cpu_init.c
@@ -14,6 +14,7 @@
 #include <env.h>
 #include <init.h>
 #include <net.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <watchdog.h>
diff --git a/arch/powerpc/cpu/mpc85xx/ether_fcc.c b/arch/powerpc/cpu/mpc85xx/ether_fcc.c
index 5504ded9e059..df1981cc7aeb 100644
--- a/arch/powerpc/cpu/mpc85xx/ether_fcc.c
+++ b/arch/powerpc/cpu/mpc85xx/ether_fcc.c
@@ -34,6 +34,7 @@
 #include <net.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #if defined(CONFIG_MII) || defined(CONFIG_CMD_MII)
diff --git a/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c b/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c
index 61eba2e99355..0173fab44498 100644
--- a/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c
@@ -18,6 +18,7 @@
 #include <asm/fsl_law.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include "fsl_corenet_serdes.h"
 
 /*
diff --git a/arch/powerpc/cpu/mpc85xx/mpc8536_serdes.c b/arch/powerpc/cpu/mpc85xx/mpc8536_serdes.c
index 433d5cb136bb..763f452b069e 100644
--- a/arch/powerpc/cpu/mpc85xx/mpc8536_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/mpc8536_serdes.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
+#include <linux/kernel.h>
 
 /* PORDEVSR register */
 #define GUTS_PORDEVSR_OFFS		0xc
diff --git a/arch/powerpc/cpu/mpc85xx/mpc8544_serdes.c b/arch/powerpc/cpu/mpc85xx/mpc8544_serdes.c
index 1eb446eef182..cbbd6f3522cb 100644
--- a/arch/powerpc/cpu/mpc85xx/mpc8544_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/mpc8544_serdes.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
+#include <linux/kernel.h>
 
 #define SRDS1_MAX_LANES		8
 #define SRDS2_MAX_LANES		4
diff --git a/arch/powerpc/cpu/mpc85xx/mpc8548_serdes.c b/arch/powerpc/cpu/mpc85xx/mpc8548_serdes.c
index 2e21f69e5ad1..fad7afff88bb 100644
--- a/arch/powerpc/cpu/mpc85xx/mpc8548_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/mpc8548_serdes.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
+#include <linux/kernel.h>
 
 #define SRDS1_MAX_LANES		8
 
diff --git a/arch/powerpc/cpu/mpc85xx/mpc8568_serdes.c b/arch/powerpc/cpu/mpc85xx/mpc8568_serdes.c
index dd6231a47b9d..1f88d0e34682 100644
--- a/arch/powerpc/cpu/mpc85xx/mpc8568_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/mpc8568_serdes.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
+#include <linux/kernel.h>
 
 #define SRDS1_MAX_LANES		8
 
diff --git a/arch/powerpc/cpu/mpc85xx/mpc8569_serdes.c b/arch/powerpc/cpu/mpc85xx/mpc8569_serdes.c
index 148b4cd98192..88b8300f58c0 100644
--- a/arch/powerpc/cpu/mpc85xx/mpc8569_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/mpc8569_serdes.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
+#include <linux/kernel.h>
 
 #define SRDS1_MAX_LANES		4
 
diff --git a/arch/powerpc/cpu/mpc85xx/mpc8572_serdes.c b/arch/powerpc/cpu/mpc85xx/mpc8572_serdes.c
index d625f9041e98..d6bf5f314f6a 100644
--- a/arch/powerpc/cpu/mpc85xx/mpc8572_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/mpc8572_serdes.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
+#include <linux/kernel.h>
 
 #define SRDS1_MAX_LANES		8
 
diff --git a/arch/powerpc/cpu/mpc85xx/p1010_serdes.c b/arch/powerpc/cpu/mpc85xx/p1010_serdes.c
index 185445e46b93..7dc3512364de 100644
--- a/arch/powerpc/cpu/mpc85xx/p1010_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/p1010_serdes.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
+#include <linux/kernel.h>
 
 #define SRDS1_MAX_LANES		4
 #define SRDS2_MAX_LANES		2
diff --git a/arch/powerpc/cpu/mpc85xx/p1021_serdes.c b/arch/powerpc/cpu/mpc85xx/p1021_serdes.c
index 62e76c0c70ec..5bb06705829f 100644
--- a/arch/powerpc/cpu/mpc85xx/p1021_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/p1021_serdes.c
@@ -11,6 +11,7 @@
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 
 typedef struct serdes_85xx {
 	u32	srdscr0;	/* 0x00 - SRDS Control Register 0 */
diff --git a/arch/powerpc/cpu/mpc85xx/p1022_serdes.c b/arch/powerpc/cpu/mpc85xx/p1022_serdes.c
index 9fe4eb57cea4..368b5eaea4dc 100644
--- a/arch/powerpc/cpu/mpc85xx/p1022_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/p1022_serdes.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
+#include <linux/kernel.h>
 
 #define SRDS1_MAX_LANES		4
 #define SRDS2_MAX_LANES		2
diff --git a/arch/powerpc/cpu/mpc85xx/p1023_serdes.c b/arch/powerpc/cpu/mpc85xx/p1023_serdes.c
index 591637e2cfd6..b976b40e3339 100644
--- a/arch/powerpc/cpu/mpc85xx/p1023_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/p1023_serdes.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
+#include <linux/kernel.h>
 
 #define SRDS1_MAX_LANES		4
 
diff --git a/arch/powerpc/cpu/mpc85xx/p2020_serdes.c b/arch/powerpc/cpu/mpc85xx/p2020_serdes.c
index eb2324887537..3ff5715245d1 100644
--- a/arch/powerpc/cpu/mpc85xx/p2020_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/p2020_serdes.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
+#include <linux/kernel.h>
 
 #define SRDS1_MAX_LANES		4
 
diff --git a/arch/powerpc/cpu/mpc85xx/p2041_ids.c b/arch/powerpc/cpu/mpc85xx/p2041_ids.c
index 8a8334667824..b003e5037fa2 100644
--- a/arch/powerpc/cpu/mpc85xx/p2041_ids.c
+++ b/arch/powerpc/cpu/mpc85xx/p2041_ids.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <asm/fsl_portals.h>
 #include <asm/fsl_liodn.h>
+#include <linux/kernel.h>
 
 #ifdef CONFIG_SYS_DPAA_QBMAN
 struct qportal_info qp_info[CONFIG_SYS_QMAN_NUM_PORTALS] = {
diff --git a/arch/powerpc/cpu/mpc85xx/p2041_serdes.c b/arch/powerpc/cpu/mpc85xx/p2041_serdes.c
index 4461b3848442..c491d3d014f7 100644
--- a/arch/powerpc/cpu/mpc85xx/p2041_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/p2041_serdes.c
@@ -6,6 +6,7 @@
 #include <asm/fsl_serdes.h>
 #include <asm/ppc.h>
 #include <asm/io.h>
+#include <linux/kernel.h>
 #include "fsl_corenet_serdes.h"
 
 static u8 serdes_cfg_tbl[][SRDS_MAX_LANES] = {
diff --git a/arch/powerpc/cpu/mpc85xx/p3041_ids.c b/arch/powerpc/cpu/mpc85xx/p3041_ids.c
index 7db05d9672b8..c111fb584970 100644
--- a/arch/powerpc/cpu/mpc85xx/p3041_ids.c
+++ b/arch/powerpc/cpu/mpc85xx/p3041_ids.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <asm/fsl_portals.h>
 #include <asm/fsl_liodn.h>
+#include <linux/kernel.h>
 
 #ifdef CONFIG_SYS_DPAA_QBMAN
 struct qportal_info qp_info[CONFIG_SYS_QMAN_NUM_PORTALS] = {
diff --git a/arch/powerpc/cpu/mpc85xx/p3041_serdes.c b/arch/powerpc/cpu/mpc85xx/p3041_serdes.c
index 5fa3eb405698..53b6ee1927fb 100644
--- a/arch/powerpc/cpu/mpc85xx/p3041_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/p3041_serdes.c
@@ -6,6 +6,7 @@
 #include <asm/fsl_serdes.h>
 #include <asm/ppc.h>
 #include <asm/io.h>
+#include <linux/kernel.h>
 #include "fsl_corenet_serdes.h"
 
 static u8 serdes_cfg_tbl[][SRDS_MAX_LANES] = {
diff --git a/arch/powerpc/cpu/mpc85xx/p4080_ids.c b/arch/powerpc/cpu/mpc85xx/p4080_ids.c
index 5b766f1d5171..227d755cf460 100644
--- a/arch/powerpc/cpu/mpc85xx/p4080_ids.c
+++ b/arch/powerpc/cpu/mpc85xx/p4080_ids.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <asm/fsl_portals.h>
 #include <asm/fsl_liodn.h>
+#include <linux/kernel.h>
 
 #ifdef CONFIG_SYS_DPAA_QBMAN
 struct qportal_info qp_info[CONFIG_SYS_QMAN_NUM_PORTALS] = {
diff --git a/arch/powerpc/cpu/mpc85xx/p4080_serdes.c b/arch/powerpc/cpu/mpc85xx/p4080_serdes.c
index 7d3cb6cdefb8..6432b1973845 100644
--- a/arch/powerpc/cpu/mpc85xx/p4080_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/p4080_serdes.c
@@ -7,6 +7,7 @@
 #include <asm/fsl_serdes.h>
 #include <asm/ppc.h>
 #include <asm/io.h>
+#include <linux/kernel.h>
 #include "fsl_corenet_serdes.h"
 
 static u8 serdes_cfg_tbl[][SRDS_MAX_LANES] = {
diff --git a/arch/powerpc/cpu/mpc85xx/p5020_ids.c b/arch/powerpc/cpu/mpc85xx/p5020_ids.c
index 575b604c2115..fe274d3f102e 100644
--- a/arch/powerpc/cpu/mpc85xx/p5020_ids.c
+++ b/arch/powerpc/cpu/mpc85xx/p5020_ids.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <asm/fsl_portals.h>
 #include <asm/fsl_liodn.h>
+#include <linux/kernel.h>
 
 #ifdef CONFIG_SYS_DPAA_QBMAN
 struct qportal_info qp_info[CONFIG_SYS_QMAN_NUM_PORTALS] = {
diff --git a/arch/powerpc/cpu/mpc85xx/p5020_serdes.c b/arch/powerpc/cpu/mpc85xx/p5020_serdes.c
index 5fa3eb405698..53b6ee1927fb 100644
--- a/arch/powerpc/cpu/mpc85xx/p5020_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/p5020_serdes.c
@@ -6,6 +6,7 @@
 #include <asm/fsl_serdes.h>
 #include <asm/ppc.h>
 #include <asm/io.h>
+#include <linux/kernel.h>
 #include "fsl_corenet_serdes.h"
 
 static u8 serdes_cfg_tbl[][SRDS_MAX_LANES] = {
diff --git a/arch/powerpc/cpu/mpc85xx/p5040_ids.c b/arch/powerpc/cpu/mpc85xx/p5040_ids.c
index e3d163af9eb9..916f1b3a29a6 100644
--- a/arch/powerpc/cpu/mpc85xx/p5040_ids.c
+++ b/arch/powerpc/cpu/mpc85xx/p5040_ids.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <asm/fsl_portals.h>
 #include <asm/fsl_liodn.h>
+#include <linux/kernel.h>
 
 #ifdef CONFIG_SYS_DPAA_QBMAN
 struct qportal_info qp_info[CONFIG_SYS_QMAN_NUM_PORTALS] = {
diff --git a/arch/powerpc/cpu/mpc85xx/p5040_serdes.c b/arch/powerpc/cpu/mpc85xx/p5040_serdes.c
index 61d97f5e0453..5b02643ab5f8 100644
--- a/arch/powerpc/cpu/mpc85xx/p5040_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/p5040_serdes.c
@@ -6,6 +6,7 @@
 #include <asm/fsl_serdes.h>
 #include <asm/ppc.h>
 #include <asm/io.h>
+#include <linux/kernel.h>
 #include "fsl_corenet_serdes.h"
 
 /*
diff --git a/arch/powerpc/cpu/mpc85xx/t1024_ids.c b/arch/powerpc/cpu/mpc85xx/t1024_ids.c
index d2744bb9f82b..b0679aa3458a 100644
--- a/arch/powerpc/cpu/mpc85xx/t1024_ids.c
+++ b/arch/powerpc/cpu/mpc85xx/t1024_ids.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <asm/fsl_portals.h>
 #include <asm/fsl_liodn.h>
+#include <linux/kernel.h>
 
 #ifdef CONFIG_SYS_DPAA_QBMAN
 struct qportal_info qp_info[CONFIG_SYS_QMAN_NUM_PORTALS] = {
diff --git a/arch/powerpc/cpu/mpc85xx/t1024_serdes.c b/arch/powerpc/cpu/mpc85xx/t1024_serdes.c
index 3dfcf67ceba6..6530302e70cb 100644
--- a/arch/powerpc/cpu/mpc85xx/t1024_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/t1024_serdes.c
@@ -6,6 +6,7 @@
 #include <asm/fsl_serdes.h>
 #include <asm/ppc.h>
 #include <asm/io.h>
+#include <linux/kernel.h>
 
 static u8 serdes_cfg_tbl[][SRDS_MAX_LANES] = {
 	[0x40] = {PCIE1, PCIE1, PCIE1, PCIE1},
diff --git a/arch/powerpc/cpu/mpc85xx/t1040_ids.c b/arch/powerpc/cpu/mpc85xx/t1040_ids.c
index 99b52bacdad6..8c427c6ba6df 100644
--- a/arch/powerpc/cpu/mpc85xx/t1040_ids.c
+++ b/arch/powerpc/cpu/mpc85xx/t1040_ids.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <asm/fsl_portals.h>
 #include <asm/fsl_liodn.h>
+#include <linux/kernel.h>
 
 #ifdef CONFIG_SYS_DPAA_QBMAN
 struct qportal_info qp_info[CONFIG_SYS_QMAN_NUM_PORTALS] = {
diff --git a/arch/powerpc/cpu/mpc85xx/t1040_serdes.c b/arch/powerpc/cpu/mpc85xx/t1040_serdes.c
index a50397b4b3ac..299b01218913 100644
--- a/arch/powerpc/cpu/mpc85xx/t1040_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/t1040_serdes.c
@@ -6,6 +6,7 @@
 #include <asm/fsl_serdes.h>
 #include <asm/ppc.h>
 #include <asm/io.h>
+#include <linux/kernel.h>
 
 
 static u8 serdes_cfg_tbl[][SRDS_MAX_LANES] = {
diff --git a/arch/powerpc/cpu/mpc85xx/t2080_ids.c b/arch/powerpc/cpu/mpc85xx/t2080_ids.c
index 17521dc3a4a8..f9cebd94fd0f 100644
--- a/arch/powerpc/cpu/mpc85xx/t2080_ids.c
+++ b/arch/powerpc/cpu/mpc85xx/t2080_ids.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <asm/fsl_portals.h>
 #include <asm/fsl_liodn.h>
+#include <linux/kernel.h>
 
 #ifdef CONFIG_SYS_DPAA_QBMAN
 struct qportal_info qp_info[CONFIG_SYS_QMAN_NUM_PORTALS] = {
diff --git a/arch/powerpc/cpu/mpc85xx/t2080_serdes.c b/arch/powerpc/cpu/mpc85xx/t2080_serdes.c
index ecf4f6e1a877..1e60b039efd3 100644
--- a/arch/powerpc/cpu/mpc85xx/t2080_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/t2080_serdes.c
@@ -7,6 +7,7 @@
 
 #include <asm/fsl_serdes.h>
 #include <asm/ppc.h>
+#include <linux/kernel.h>
 #include "fsl_corenet2_serdes.h"
 
 struct serdes_config {
diff --git a/arch/powerpc/cpu/mpc85xx/t4240_ids.c b/arch/powerpc/cpu/mpc85xx/t4240_ids.c
index 172dbdbe4649..75a017fe7745 100644
--- a/arch/powerpc/cpu/mpc85xx/t4240_ids.c
+++ b/arch/powerpc/cpu/mpc85xx/t4240_ids.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <asm/fsl_portals.h>
 #include <asm/fsl_liodn.h>
+#include <linux/kernel.h>
 
 #ifdef CONFIG_SYS_DPAA_QBMAN
 struct qportal_info qp_info[CONFIG_SYS_QMAN_NUM_PORTALS] = {
diff --git a/arch/powerpc/cpu/mpc85xx/t4240_serdes.c b/arch/powerpc/cpu/mpc85xx/t4240_serdes.c
index 59f3e2285441..3eae06720070 100644
--- a/arch/powerpc/cpu/mpc85xx/t4240_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/t4240_serdes.c
@@ -6,6 +6,7 @@
 #include <asm/fsl_serdes.h>
 #include <asm/ppc.h>
 #include <asm/io.h>
+#include <linux/kernel.h>
 #include "fsl_corenet2_serdes.h"
 
 struct serdes_config {
diff --git a/arch/powerpc/cpu/mpc85xx/tlb.c b/arch/powerpc/cpu/mpc85xx/tlb.c
index 522454631300..54b55248c14f 100644
--- a/arch/powerpc/cpu/mpc85xx/tlb.c
+++ b/arch/powerpc/cpu/mpc85xx/tlb.c
@@ -16,6 +16,7 @@
 #ifdef CONFIG_ADDR_MAP
 #include <addr_map.h>
 #endif
+#include <linux/kernel.h>
 
 #include <linux/log2.h>
 
diff --git a/arch/powerpc/cpu/mpc86xx/cpu.c b/arch/powerpc/cpu/mpc86xx/cpu.c
index a14214ecb868..498469750f95 100644
--- a/arch/powerpc/cpu/mpc86xx/cpu.c
+++ b/arch/powerpc/cpu/mpc86xx/cpu.c
@@ -20,6 +20,7 @@
 #include <mpc86xx.h>
 #include <asm/fsl_law.h>
 #include <asm/ppc.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/powerpc/cpu/mpc86xx/mpc8610_serdes.c b/arch/powerpc/cpu/mpc86xx/mpc8610_serdes.c
index 2f755ac2012a..e91ebe4b1db0 100644
--- a/arch/powerpc/cpu/mpc86xx/mpc8610_serdes.c
+++ b/arch/powerpc/cpu/mpc86xx/mpc8610_serdes.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <asm/immap_86xx.h>
 #include <asm/fsl_serdes.h>
+#include <linux/kernel.h>
 
 #define SRDS1_MAX_LANES		4
 #define SRDS2_MAX_LANES		4
diff --git a/arch/powerpc/cpu/mpc86xx/mpc8641_serdes.c b/arch/powerpc/cpu/mpc86xx/mpc8641_serdes.c
index 1621fd116ddd..232f85c2ad9a 100644
--- a/arch/powerpc/cpu/mpc86xx/mpc8641_serdes.c
+++ b/arch/powerpc/cpu/mpc86xx/mpc8641_serdes.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <asm/immap_86xx.h>
 #include <asm/fsl_serdes.h>
+#include <linux/kernel.h>
 
 #define SRDS1_MAX_LANES		4
 #define SRDS2_MAX_LANES		4
diff --git a/arch/powerpc/cpu/mpc8xxx/cpu.c b/arch/powerpc/cpu/mpc8xxx/cpu.c
index 4c9da0293045..e9ff1d2aaf9f 100644
--- a/arch/powerpc/cpu/mpc8xxx/cpu.c
+++ b/arch/powerpc/cpu/mpc8xxx/cpu.c
@@ -21,6 +21,7 @@
 #include <asm/io.h>
 #include <vsc9953.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/powerpc/cpu/mpc8xxx/law.c b/arch/powerpc/cpu/mpc8xxx/law.c
index 0fba380cd40e..91b736456070 100644
--- a/arch/powerpc/cpu/mpc8xxx/law.c
+++ b/arch/powerpc/cpu/mpc8xxx/law.c
@@ -14,6 +14,7 @@
 #include <linux/compiler.h>
 #include <asm/fsl_law.h>
 #include <asm/io.h>
+#include <linux/kernel.h>
 #include <linux/log2.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/powerpc/cpu/mpc8xxx/pamu_table.c b/arch/powerpc/cpu/mpc8xxx/pamu_table.c
index d917e9dfb62f..bf559d0f833c 100644
--- a/arch/powerpc/cpu/mpc8xxx/pamu_table.c
+++ b/arch/powerpc/cpu/mpc8xxx/pamu_table.c
@@ -7,6 +7,7 @@
 #include <log.h>
 #include <asm/fsl_pamu.h>
 #include <asm/global_data.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/powerpc/include/asm/arch-mpc83xx/soc.h b/arch/powerpc/include/asm/arch-mpc83xx/soc.h
index 39bf7d5a7f9d..7064d1f9d61a 100644
--- a/arch/powerpc/include/asm/arch-mpc83xx/soc.h
+++ b/arch/powerpc/include/asm/arch-mpc83xx/soc.h
@@ -7,6 +7,7 @@
 #ifndef _MPC83XX_SOC_H_
 #define _MPC83XX_SOC_H_
 
+#include <stdbool.h>
 enum soc_type {
 	SOC_MPC8308,
 	SOC_MPC8309,
diff --git a/arch/powerpc/lib/bootm.c b/arch/powerpc/lib/bootm.c
index d72da1da2d28..f283c1a9a47d 100644
--- a/arch/powerpc/lib/bootm.c
+++ b/arch/powerpc/lib/bootm.c
@@ -21,6 +21,7 @@
 #include <malloc.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 #include <u-boot/zlib.h>
 #include <bzlib.h>
 #include <asm/byteorder.h>
diff --git a/arch/riscv/cpu/cpu.c b/arch/riscv/cpu/cpu.c
index 53fc9455f75d..487329fa2f0f 100644
--- a/arch/riscv/cpu/cpu.c
+++ b/arch/riscv/cpu/cpu.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <init.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/encoding.h>
 #include <dm/uclass-internal.h>
 #include <linux/bitops.h>
diff --git a/arch/riscv/lib/cache.c b/arch/riscv/lib/cache.c
index b1d42bcc2bb8..4de634b4fbd5 100644
--- a/arch/riscv/lib/cache.c
+++ b/arch/riscv/lib/cache.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <cpu_func.h>
 
 void invalidate_icache_all(void)
diff --git a/arch/riscv/lib/fdt_fixup.c b/arch/riscv/lib/fdt_fixup.c
index f83f49c67762..1ed86a38c728 100644
--- a/arch/riscv/lib/fdt_fixup.c
+++ b/arch/riscv/lib/fdt_fixup.c
@@ -10,6 +10,7 @@
 #include <fdt_support.h>
 #include <log.h>
 #include <mapmem.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/string.h>
diff --git a/arch/riscv/lib/image.c b/arch/riscv/lib/image.c
index 88563331b33b..2f78b25807a4 100644
--- a/arch/riscv/lib/image.c
+++ b/arch/riscv/lib/image.c
@@ -10,6 +10,7 @@
 #include <image.h>
 #include <mapmem.h>
 #include <errno.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
diff --git a/arch/riscv/lib/interrupts.c b/arch/riscv/lib/interrupts.c
index 7a961f937aec..b510e7aea8f8 100644
--- a/arch/riscv/lib/interrupts.c
+++ b/arch/riscv/lib/interrupts.c
@@ -18,6 +18,7 @@
 #include <asm/ptrace.h>
 #include <asm/system.h>
 #include <asm/encoding.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/sandbox/cpu/cpu.c b/arch/sandbox/cpu/cpu.c
index e606d56f0121..f4cc363927d1 100644
--- a/arch/sandbox/cpu/cpu.c
+++ b/arch/sandbox/cpu/cpu.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
diff --git a/arch/sandbox/cpu/os.c b/arch/sandbox/cpu/os.c
index 581a48ea9edb..cce8e911cc3e 100644
--- a/arch/sandbox/cpu/os.c
+++ b/arch/sandbox/cpu/os.c
@@ -9,6 +9,7 @@
 #include <getopt.h>
 #include <setjmp.h>
 #include <signal.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
diff --git a/arch/sandbox/cpu/start.c b/arch/sandbox/cpu/start.c
index 4cacd23d0cd8..c9e626100c60 100644
--- a/arch/sandbox/cpu/start.c
+++ b/arch/sandbox/cpu/start.c
@@ -20,6 +20,7 @@
 #include <asm/state.h>
 #include <linux/ctype.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/sandbox/cpu/state.c b/arch/sandbox/cpu/state.c
index 35bc7586fa57..849dfbd1d669 100644
--- a/arch/sandbox/cpu/state.c
+++ b/arch/sandbox/cpu/state.c
@@ -8,6 +8,7 @@
 #include <fdtdec.h>
 #include <log.h>
 #include <os.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/malloc.h>
 #include <asm/state.h>
diff --git a/arch/sandbox/include/asm/eth.h b/arch/sandbox/include/asm/eth.h
index b313bf57c63d..8c3c957b56fc 100644
--- a/arch/sandbox/include/asm/eth.h
+++ b/arch/sandbox/include/asm/eth.h
@@ -10,6 +10,7 @@
 #define __ETH_H
 
 #include <net.h>
+#include <stdbool.h>
 
 void sandbox_eth_disable_response(int index, bool disable);
 
diff --git a/arch/sandbox/include/asm/sdl.h b/arch/sandbox/include/asm/sdl.h
index 2a98a7f49b2a..a14e0a8f8a21 100644
--- a/arch/sandbox/include/asm/sdl.h
+++ b/arch/sandbox/include/asm/sdl.h
@@ -7,6 +7,7 @@
 #define __SANDBOX_SDL_H
 
 #include <errno.h>
+#include <stdbool.h>
 #include <linux/errno.h>
 
 #ifdef CONFIG_SANDBOX_SDL
diff --git a/arch/sandbox/include/asm/test.h b/arch/sandbox/include/asm/test.h
index 7f99d07c47fc..6ac8c1a8288d 100644
--- a/arch/sandbox/include/asm/test.h
+++ b/arch/sandbox/include/asm/test.h
@@ -9,6 +9,7 @@
 #define __ASM_TEST_H
 
 /* The sandbox driver always permits an I2C device with this address */
+#include <stdbool.h>
 #define SANDBOX_I2C_TEST_ADDR		0x59
 
 #define SANDBOX_PCI_VENDOR_ID		0x1234
diff --git a/arch/x86/cpu/apollolake/fsp_bindings.c b/arch/x86/cpu/apollolake/fsp_bindings.c
index b9880b56a8b3..db9290f5312d 100644
--- a/arch/x86/cpu/apollolake/fsp_bindings.c
+++ b/arch/x86/cpu/apollolake/fsp_bindings.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <asm/arch/fsp_bindings.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 /**
diff --git a/arch/x86/cpu/apollolake/fsp_s.c b/arch/x86/cpu/apollolake/fsp_s.c
index c6da4bbfce64..433dcf08c778 100644
--- a/arch/x86/cpu/apollolake/fsp_s.c
+++ b/arch/x86/cpu/apollolake/fsp_s.c
@@ -29,6 +29,7 @@
 #include <dm/uclass-internal.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #define PCH_P2SB_E0		0xe0
 #define HIDE_BIT		BIT(0)
diff --git a/arch/x86/cpu/apollolake/hostbridge.c b/arch/x86/cpu/apollolake/hostbridge.c
index cb46ec6c0bb8..99f1b441312c 100644
--- a/arch/x86/cpu/apollolake/hostbridge.c
+++ b/arch/x86/cpu/apollolake/hostbridge.c
@@ -12,6 +12,7 @@
 #include <asm/intel_regs.h>
 #include <asm/pci.h>
 #include <asm/arch/systemagent.h>
+#include <linux/kernel.h>
 
 /**
  * struct apl_hostbridge_platdata - platform data for hostbridge
diff --git a/arch/x86/cpu/apollolake/lpc.c b/arch/x86/cpu/apollolake/lpc.c
index 1de8c4a98044..07a64502061a 100644
--- a/arch/x86/cpu/apollolake/lpc.c
+++ b/arch/x86/cpu/apollolake/lpc.c
@@ -14,6 +14,7 @@
 #include <asm/arch/iomap.h>
 #include <asm/arch/lpc.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/log2.h>
 
 void lpc_enable_fixed_io_ranges(uint io_enables)
diff --git a/arch/x86/cpu/apollolake/pch.c b/arch/x86/cpu/apollolake/pch.c
index 1a5a985221f1..29ec955e19b5 100644
--- a/arch/x86/cpu/apollolake/pch.c
+++ b/arch/x86/cpu/apollolake/pch.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <pch.h>
 #include <spl.h>
+#include <stdbool.h>
 #include <asm/lpc_common.h>
 
 #define BIOS_CTRL	0xdc
diff --git a/arch/x86/cpu/apollolake/pmc.c b/arch/x86/cpu/apollolake/pmc.c
index 83d165c0d9b0..8adc33bfd30e 100644
--- a/arch/x86/cpu/apollolake/pmc.c
+++ b/arch/x86/cpu/apollolake/pmc.c
@@ -17,6 +17,7 @@
 #include <asm/io.h>
 #include <asm/pci.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <power/acpi_pmc.h>
 
diff --git a/arch/x86/cpu/apollolake/spl.c b/arch/x86/cpu/apollolake/spl.c
index 44cbe4590a71..618b20add162 100644
--- a/arch/x86/cpu/apollolake/spl.c
+++ b/arch/x86/cpu/apollolake/spl.c
@@ -13,6 +13,7 @@
 #include <spi.h>
 #include <spl.h>
 #include <spi_flash.h>
+#include <stdbool.h>
 #include <asm/fast_spi.h>
 #include <asm/spl.h>
 #include <asm/arch/cpu.h>
diff --git a/arch/x86/cpu/broadwell/adsp.c b/arch/x86/cpu/broadwell/adsp.c
index f5ae97c88ce0..beab06dee95d 100644
--- a/arch/x86/cpu/broadwell/adsp.c
+++ b/arch/x86/cpu/broadwell/adsp.c
@@ -13,6 +13,7 @@
 #include <dm.h>
 #include <log.h>
 #include <pci.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <asm/cpu.h>
 #include <asm/intel_regs.h>
diff --git a/arch/x86/cpu/broadwell/cpu_full.c b/arch/x86/cpu/broadwell/cpu_full.c
index 5fb6af3a3872..daf17af3b151 100644
--- a/arch/x86/cpu/broadwell/cpu_full.c
+++ b/arch/x86/cpu/broadwell/cpu_full.c
@@ -23,6 +23,7 @@
 #include <asm/arch/rcb.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 struct cpu_broadwell_priv {
 	bool ht_disabled;
diff --git a/arch/x86/cpu/broadwell/iobp.c b/arch/x86/cpu/broadwell/iobp.c
index 9805f8dbed48..68c57f4f18a4 100644
--- a/arch/x86/cpu/broadwell/iobp.c
+++ b/arch/x86/cpu/broadwell/iobp.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <errno.h>
 #include <stdio.h>
+#include <stdbool.h>
 #include <asm/intel_regs.h>
 #include <asm/io.h>
 #include <asm/arch/pch.h>
diff --git a/arch/x86/cpu/broadwell/pch.c b/arch/x86/cpu/broadwell/pch.c
index 6a5d9dc345e9..f7f975983e6b 100644
--- a/arch/x86/cpu/broadwell/pch.c
+++ b/arch/x86/cpu/broadwell/pch.c
@@ -27,6 +27,7 @@
 #include <dm/uclass-internal.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #define BIOS_CTRL	0xdc
 
diff --git a/arch/x86/cpu/broadwell/pinctrl_broadwell.c b/arch/x86/cpu/broadwell/pinctrl_broadwell.c
index 332d45fd088a..0bb28739fdc6 100644
--- a/arch/x86/cpu/broadwell/pinctrl_broadwell.c
+++ b/arch/x86/cpu/broadwell/pinctrl_broadwell.c
@@ -20,6 +20,7 @@
 #include <dm/pinctrl.h>
 #include <dm/uclass-internal.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/x86/cpu/coreboot/sdram.c b/arch/x86/cpu/coreboot/sdram.c
index cd8500827374..b8b803f643d7 100644
--- a/arch/x86/cpu/coreboot/sdram.c
+++ b/arch/x86/cpu/coreboot/sdram.c
@@ -12,6 +12,7 @@
 #include <asm/e820.h>
 #include <asm/arch/sysinfo.h>
 #include <asm/global_data.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/cpu.c b/arch/x86/cpu/cpu.c
index cd1a6832cb2d..ff4916431b4c 100644
--- a/arch/x86/cpu/cpu.c
+++ b/arch/x86/cpu/cpu.c
@@ -50,6 +50,7 @@
 #include <asm/tables.h>
 #include <linux/compiler.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/i386/cpu.c b/arch/x86/cpu/i386/cpu.c
index 6ac70c9ec9a8..ddb656f0fda5 100644
--- a/arch/x86/cpu/i386/cpu.c
+++ b/arch/x86/cpu/i386/cpu.c
@@ -34,6 +34,7 @@
 #include <asm/mtrr.h>
 #include <asm/processor-flags.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/x86/cpu/intel_common/cpu.c b/arch/x86/cpu/intel_common/cpu.c
index a292dd72a888..b5d907126af9 100644
--- a/arch/x86/cpu/intel_common/cpu.c
+++ b/arch/x86/cpu/intel_common/cpu.c
@@ -12,6 +12,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/cpu.h>
 #include <asm/cpu_common.h>
diff --git a/arch/x86/cpu/intel_common/itss.c b/arch/x86/cpu/intel_common/itss.c
index cc9111d7fc5a..732a4b4c4f43 100644
--- a/arch/x86/cpu/intel_common/itss.c
+++ b/arch/x86/cpu/intel_common/itss.c
@@ -20,6 +20,7 @@
 #include <asm/global_data.h>
 #include <asm/itss.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 struct itss_platdata {
diff --git a/arch/x86/cpu/intel_common/lpc.c b/arch/x86/cpu/intel_common/lpc.c
index eda4e58d608f..7eaea5c77c82 100644
--- a/arch/x86/cpu/intel_common/lpc.c
+++ b/arch/x86/cpu/intel_common/lpc.c
@@ -15,6 +15,7 @@
 #include <asm/lpc_common.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/intel_common/me_status.c b/arch/x86/cpu/intel_common/me_status.c
index abc5f6fbc77b..2557a9b26659 100644
--- a/arch/x86/cpu/intel_common/me_status.c
+++ b/arch/x86/cpu/intel_common/me_status.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <log.h>
 #include <asm/arch/me.h>
+#include <linux/kernel.h>
 
 /* HFS1[3:0] Current Working State Values */
 static const char *const me_cws_values[] = {
diff --git a/arch/x86/cpu/intel_common/mrc.c b/arch/x86/cpu/intel_common/mrc.c
index f9380015139b..a6e099f6e14b 100644
--- a/arch/x86/cpu/intel_common/mrc.c
+++ b/arch/x86/cpu/intel_common/mrc.c
@@ -21,6 +21,7 @@
 #include <asm/arch/me.h>
 #include <asm/report_platform.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 static const char *const ecc_decoder[] = {
 	"inactive",
diff --git a/arch/x86/cpu/intel_common/p2sb.c b/arch/x86/cpu/intel_common/p2sb.c
index 8b62cc5d7be0..53e2f21df965 100644
--- a/arch/x86/cpu/intel_common/p2sb.c
+++ b/arch/x86/cpu/intel_common/p2sb.c
@@ -16,6 +16,7 @@
 #include <asm/pci.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #define PCH_P2SB_E0		0xe0
 #define HIDE_BIT		BIT(0)
diff --git a/arch/x86/cpu/intel_common/report_platform.c b/arch/x86/cpu/intel_common/report_platform.c
index 2de29bbbe25e..9502b145490d 100644
--- a/arch/x86/cpu/intel_common/report_platform.c
+++ b/arch/x86/cpu/intel_common/report_platform.c
@@ -11,6 +11,7 @@
 #include <asm/pci.h>
 #include <asm/report_platform.h>
 #include <asm/arch/pch.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 static void report_cpu_info(void)
diff --git a/arch/x86/cpu/irq.c b/arch/x86/cpu/irq.c
index 547eedfbb859..920a799ec8e9 100644
--- a/arch/x86/cpu/irq.c
+++ b/arch/x86/cpu/irq.c
@@ -10,6 +10,7 @@
 #include <irq.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/arch/x86/cpu/ivybridge/bd82x6x.c b/arch/x86/cpu/ivybridge/bd82x6x.c
index fefea448ade0..7df278ddbc43 100644
--- a/arch/x86/cpu/ivybridge/bd82x6x.c
+++ b/arch/x86/cpu/ivybridge/bd82x6x.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <pch.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/cpu.h>
 #include <asm/global_data.h>
diff --git a/arch/x86/cpu/ivybridge/lpc.c b/arch/x86/cpu/ivybridge/lpc.c
index a579eb3b38e2..57c844359822 100644
--- a/arch/x86/cpu/ivybridge/lpc.c
+++ b/arch/x86/cpu/ivybridge/lpc.c
@@ -22,6 +22,7 @@
 #include <asm/pci.h>
 #include <asm/arch/pch.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/ivybridge/model_206ax.c b/arch/x86/cpu/ivybridge/model_206ax.c
index e11aa0001c48..087754a1dd99 100644
--- a/arch/x86/cpu/ivybridge/model_206ax.c
+++ b/arch/x86/cpu/ivybridge/model_206ax.c
@@ -24,6 +24,7 @@
 #include <asm/turbo.h>
 #include <asm/arch/model_206ax.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/mp_init.c b/arch/x86/cpu/mp_init.c
index 1a34c2f03756..7bf3935ba94a 100644
--- a/arch/x86/cpu/mp_init.c
+++ b/arch/x86/cpu/mp_init.c
@@ -32,6 +32,7 @@
 #include <dm/root.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/linkage.h>
 #include <linux/string.h>
 
diff --git a/arch/x86/cpu/mtrr.c b/arch/x86/cpu/mtrr.c
index fd86a4e105b2..da1f08eff819 100644
--- a/arch/x86/cpu/mtrr.c
+++ b/arch/x86/cpu/mtrr.c
@@ -19,6 +19,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/arch/x86/cpu/qemu/qemu.c b/arch/x86/cpu/qemu/qemu.c
index 044a429c13fb..5e431f21976d 100644
--- a/arch/x86/cpu/qemu/qemu.c
+++ b/arch/x86/cpu/qemu/qemu.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <pci.h>
 #include <qfw.h>
+#include <stdbool.h>
 #include <asm/irq.h>
 #include <asm/post.h>
 #include <asm/processor.h>
diff --git a/arch/x86/cpu/quark/mrc.c b/arch/x86/cpu/quark/mrc.c
index b55933ff9e55..7e8f31fb6b7c 100644
--- a/arch/x86/cpu/quark/mrc.c
+++ b/arch/x86/cpu/quark/mrc.c
@@ -37,6 +37,7 @@
 #include <asm/u-boot-x86.h>
 #include <asm/arch/mrc.h>
 #include <asm/arch/msg_port.h>
+#include <linux/kernel.h>
 #include "mrc_util.h"
 #include "smc.h"
 
diff --git a/arch/x86/cpu/quark/mrc_util.c b/arch/x86/cpu/quark/mrc_util.c
index ce56c54279e9..50fcd977bb41 100644
--- a/arch/x86/cpu/quark/mrc_util.c
+++ b/arch/x86/cpu/quark/mrc_util.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <hang.h>
+#include <stdbool.h>
 #include <asm/u-boot-x86.h>
 #include <asm/arch/device.h>
 #include <asm/arch/mrc.h>
diff --git a/arch/x86/cpu/quark/mrc_util.h b/arch/x86/cpu/quark/mrc_util.h
index e6e69c49d094..f4e3e87b6c37 100644
--- a/arch/x86/cpu/quark/mrc_util.h
+++ b/arch/x86/cpu/quark/mrc_util.h
@@ -11,6 +11,7 @@
 #define _MRC_UTIL_H_
 
 #include <log.h>
+#include <stdbool.h>
 
 /* Turn on this macro to enable MRC debugging output */
 #undef  MRC_DEBUG
diff --git a/arch/x86/cpu/quark/smc.c b/arch/x86/cpu/quark/smc.c
index b6167e934aa5..c95c09a67bad 100644
--- a/arch/x86/cpu/quark/smc.c
+++ b/arch/x86/cpu/quark/smc.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <pci.h>
+#include <stdbool.h>
 #include <asm/u-boot-x86.h>
 #include <asm/arch/device.h>
 #include <asm/arch/mrc.h>
diff --git a/arch/x86/cpu/slimbootloader/sdram.c b/arch/x86/cpu/slimbootloader/sdram.c
index 94d117e516ea..2c7be397adbb 100644
--- a/arch/x86/cpu/slimbootloader/sdram.c
+++ b/arch/x86/cpu/slimbootloader/sdram.c
@@ -7,6 +7,7 @@
 #include <init.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <asm/e820.h>
 #include <asm/arch/slimbootloader.h>
diff --git a/arch/x86/cpu/tangier/pinmux.c b/arch/x86/cpu/tangier/pinmux.c
index aba74a083d7f..41ad198a0609 100644
--- a/arch/x86/cpu/tangier/pinmux.c
+++ b/arch/x86/cpu/tangier/pinmux.c
@@ -14,6 +14,7 @@
 #include <asm/scu.h>
 #include <linux/errno.h>
 #include <linux/io.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 
 #define BUFCFG_OFFSET				0x100
diff --git a/arch/x86/include/asm/arch-apollolake/fsp_bindings.h b/arch/x86/include/asm/arch-apollolake/fsp_bindings.h
index a80e66bbfa64..7a3060d4b46d 100644
--- a/arch/x86/include/asm/arch-apollolake/fsp_bindings.h
+++ b/arch/x86/include/asm/arch-apollolake/fsp_bindings.h
@@ -9,6 +9,7 @@
 
 #include <asm/arch/fsp/fsp_m_upd.h>
 #include <asm/arch/fsp/fsp_s_upd.h>
+#include <linux/kernel.h>
 
 #define ARRAY_SIZE_OF_MEMBER(s, m) (ARRAY_SIZE((((s *)0)->m)))
 #define SIZE_OF_MEMBER(s, m) (sizeof((((s *)0)->m)))
diff --git a/arch/x86/include/asm/arch-broadwell/gpio.h b/arch/x86/include/asm/arch-broadwell/gpio.h
index a32e2db47e16..b5dd5ab4e7f8 100644
--- a/arch/x86/include/asm/arch-broadwell/gpio.h
+++ b/arch/x86/include/asm/arch-broadwell/gpio.h
@@ -8,6 +8,7 @@
 #ifndef __ASM_ARCH_GPIO
 #define __ASM_ARCH_GPIO
 
+#include <linux/kernel.h>
 #define GPIO_PER_BANK	32
 #define GPIO_BANKS	3
 
diff --git a/arch/x86/include/asm/arch-broadwell/pch.h b/arch/x86/include/asm/arch-broadwell/pch.h
index ecdf6d16f942..6b6f10ec6c86 100644
--- a/arch/x86/include/asm/arch-broadwell/pch.h
+++ b/arch/x86/include/asm/arch-broadwell/pch.h
@@ -6,6 +6,8 @@
 #ifndef __ASM_ARCH_PCH_H
 #define __ASM_ARCH_PCH_H
 
+#include <stdbool.h>
+
 #define PMBASE			0x40
 #define ACPI_CNTL		0x44
 #define  ACPI_EN		(1 << 7)
diff --git a/arch/x86/include/asm/arch-ivybridge/model_206ax.h b/arch/x86/include/asm/arch-ivybridge/model_206ax.h
index 5c066294bc23..d2d28746974f 100644
--- a/arch/x86/include/asm/arch-ivybridge/model_206ax.h
+++ b/arch/x86/include/asm/arch-ivybridge/model_206ax.h
@@ -8,6 +8,7 @@
 #ifndef _ASM_ARCH_MODEL_206AX_H
 #define _ASM_ARCH_MODEL_206AX_H
 
+#include <stdbool.h>
 #define  CPUID_VMX			(1 << 5)
 #define  CPUID_SMX			(1 << 6)
 #define MSR_FEATURE_CONFIG		0x13c
diff --git a/arch/x86/include/asm/bootm.h b/arch/x86/include/asm/bootm.h
index bd8ce55729c0..231d11340caf 100644
--- a/arch/x86/include/asm/bootm.h
+++ b/arch/x86/include/asm/bootm.h
@@ -6,6 +6,7 @@
 #ifndef ARM_BOOTM_H
 #define ARM_BOOTM_H
 
+#include <stdbool.h>
 void bootm_announce_and_cleanup(void);
 
 /**
diff --git a/arch/x86/include/asm/cpu_common.h b/arch/x86/include/asm/cpu_common.h
index 4a782a22956d..67d150b8d915 100644
--- a/arch/x86/include/asm/cpu_common.h
+++ b/arch/x86/include/asm/cpu_common.h
@@ -8,6 +8,8 @@
 #ifndef __ASM_CPU_COMMON_H
 #define __ASM_CPU_COMMON_H
 
+#include <stdbool.h>
+
 /* Standard Intel bus clock is fixed at 100MHz */
 enum {
 	INTEL_BCLK_MHZ		= 100
diff --git a/arch/x86/include/asm/fast_spi.h b/arch/x86/include/asm/fast_spi.h
index 82e3d8f63ef1..ed436a891135 100644
--- a/arch/x86/include/asm/fast_spi.h
+++ b/arch/x86/include/asm/fast_spi.h
@@ -8,6 +8,7 @@
 
 #include <pci.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 
 /* Register offsets from the MMIO region base (PCI_BASE_ADDRESS_0) */
 struct fast_spi_regs {
diff --git a/arch/x86/include/asm/fsp2/fsp_api.h b/arch/x86/include/asm/fsp2/fsp_api.h
index af1e8857b97d..16ffb1922cda 100644
--- a/arch/x86/include/asm/fsp2/fsp_api.h
+++ b/arch/x86/include/asm/fsp2/fsp_api.h
@@ -9,6 +9,7 @@
 #ifndef __ASM_FSP2_API_H
 #define __ASM_FSP2_API_H
 
+#include <stdbool.h>
 #include <asm/fsp/fsp_api.h>
 
 struct fspm_upd;
diff --git a/arch/x86/include/asm/fsp2/fsp_internal.h b/arch/x86/include/asm/fsp2/fsp_internal.h
index b4a4fbbd84d2..720d677c05d5 100644
--- a/arch/x86/include/asm/fsp2/fsp_internal.h
+++ b/arch/x86/include/asm/fsp2/fsp_internal.h
@@ -8,6 +8,7 @@
 #ifndef __ASM_FSP_INTERNAL_H
 #define __ASM_FSP_INTERNAL_H
 
+#include <stdbool.h>
 struct binman_entry;
 struct fsp_header;
 struct fspm_upd;
diff --git a/arch/x86/include/asm/global_data.h b/arch/x86/include/asm/global_data.h
index 3e4044593c87..7fcd21ee2d53 100644
--- a/arch/x86/include/asm/global_data.h
+++ b/arch/x86/include/asm/global_data.h
@@ -9,6 +9,7 @@
 
 #ifndef __ASSEMBLY__
 
+#include <stdbool.h>
 #include <asm/processor.h>
 #include <asm/mrccache.h>
 
diff --git a/arch/x86/include/asm/hob.h b/arch/x86/include/asm/hob.h
index 56e11dbb28f0..a58f422de72d 100644
--- a/arch/x86/include/asm/hob.h
+++ b/arch/x86/include/asm/hob.h
@@ -9,6 +9,7 @@
 
 #include <efi.h>
 #include <efi_loader.h>
+#include <stdbool.h>
 
 /* Type of HOB Header */
 #define HOB_TYPE_MEM_ALLOC	0x0002
diff --git a/arch/x86/include/asm/intel_pinctrl.h b/arch/x86/include/asm/intel_pinctrl.h
index 00868d17258e..bae5d22b8838 100644
--- a/arch/x86/include/asm/intel_pinctrl.h
+++ b/arch/x86/include/asm/intel_pinctrl.h
@@ -9,6 +9,7 @@
 #ifndef __ASM_INTEL_PINCTRL_H
 #define __ASM_INTEL_PINCTRL_H
 
+#include <stdbool.h>
 #include <dm/pinctrl.h>
 #include <linux/bitops.h>
 
diff --git a/arch/x86/include/asm/interrupt.h b/arch/x86/include/asm/interrupt.h
index fdeb85711323..d54295989e4b 100644
--- a/arch/x86/include/asm/interrupt.h
+++ b/arch/x86/include/asm/interrupt.h
@@ -10,6 +10,7 @@
 #ifndef __ASM_INTERRUPT_H_
 #define __ASM_INTERRUPT_H_ 1
 
+#include <stdbool.h>
 #include <asm/types.h>
 
 #define SYS_NUM_IRQS	16
diff --git a/arch/x86/include/asm/irq.h b/arch/x86/include/asm/irq.h
index bee0760c2d28..e7533925f29c 100644
--- a/arch/x86/include/asm/irq.h
+++ b/arch/x86/include/asm/irq.h
@@ -6,6 +6,7 @@
 #ifndef _ARCH_IRQ_H_
 #define _ARCH_IRQ_H_
 
+#include <stdbool.h>
 #include <dt-bindings/interrupt-router/intel-irq.h>
 
 /**
diff --git a/arch/x86/include/asm/itss.h b/arch/x86/include/asm/itss.h
index f7d32403849f..7b63b8435fe3 100644
--- a/arch/x86/include/asm/itss.h
+++ b/arch/x86/include/asm/itss.h
@@ -11,6 +11,7 @@
 #ifndef _ASM_ARCH_ITSS_H
 #define _ASM_ARCH_ITSS_H
 
+#include <linux/kernel.h>
 #define GPIO_IRQ_START	50
 #define GPIO_IRQ_END	ITSS_MAX_IRQ
 
diff --git a/arch/x86/include/asm/lpc_common.h b/arch/x86/include/asm/lpc_common.h
index d462c2ec6100..2dd19a3d6cfc 100644
--- a/arch/x86/include/asm/lpc_common.h
+++ b/arch/x86/include/asm/lpc_common.h
@@ -6,6 +6,7 @@
 #ifndef __ASM_LPC_COMMON_H
 #define __ASM_LPC_COMMON_H
 
+#include <stdbool.h>
 #define PCH_RCBA_BASE		0xf0
 
 #define RC		0x3400	/* 32bit */
diff --git a/arch/x86/include/asm/mrc_common.h b/arch/x86/include/asm/mrc_common.h
index d4e56bf37c1f..f060389f7890 100644
--- a/arch/x86/include/asm/mrc_common.h
+++ b/arch/x86/include/asm/mrc_common.h
@@ -6,6 +6,7 @@
 #ifndef __ASM_MRC_COMMON_H
 #define __ASM_MRC_COMMON_H
 
+#include <stdbool.h>
 #include <linux/linkage.h>
 
 /**
diff --git a/arch/x86/include/asm/mrccache.h b/arch/x86/include/asm/mrccache.h
index b60d1171f771..8b104a2f0b8e 100644
--- a/arch/x86/include/asm/mrccache.h
+++ b/arch/x86/include/asm/mrccache.h
@@ -7,6 +7,8 @@
 #ifndef _ASM_MRCCACHE_H
 #define _ASM_MRCCACHE_H
 
+#include <compiler.h>
+
 #define MRC_DATA_ALIGN		0x100
 #define MRC_DATA_SIGNATURE	(('M' << 0) | ('R' << 8) | \
 				 ('C' << 16) | ('D'<<24))
diff --git a/arch/x86/include/asm/mtrr.h b/arch/x86/include/asm/mtrr.h
index 48db1dd82f73..73edb4d86d32 100644
--- a/arch/x86/include/asm/mtrr.h
+++ b/arch/x86/include/asm/mtrr.h
@@ -9,6 +9,7 @@
 #define _ASM_MTRR_H
 
 /* MTRR region types */
+#include <stdbool.h>
 #define MTRR_TYPE_UNCACHEABLE	0
 #define MTRR_TYPE_WRCOMB	1
 #define MTRR_TYPE_WRTHROUGH	4
diff --git a/arch/x86/include/asm/pirq_routing.h b/arch/x86/include/asm/pirq_routing.h
index 67e5c447ab95..895fa793ef4d 100644
--- a/arch/x86/include/asm/pirq_routing.h
+++ b/arch/x86/include/asm/pirq_routing.h
@@ -18,6 +18,7 @@
  *
  * CAUTION: If you change this, PIRQ routing will not work correctly.
  */
+#include <stdbool.h>
 #define MAX_INTX_ENTRIES	4
 
 #define PIRQ_SIGNATURE		\
diff --git a/arch/x86/include/asm/pmu.h b/arch/x86/include/asm/pmu.h
index b76bdf64a309..13052771492b 100644
--- a/arch/x86/include/asm/pmu.h
+++ b/arch/x86/include/asm/pmu.h
@@ -5,6 +5,7 @@
 #ifndef _X86_ASM_PMU_IPC_H_
 #define _X86_ASM_PMU_IPC_H_
 
+#include <stdbool.h>
 int pmu_turn_power(unsigned int lss, bool on);
 
 #endif	/* _X86_ASM_PMU_IPC_H_ */
diff --git a/arch/x86/lib/acpi_nhlt.c b/arch/x86/lib/acpi_nhlt.c
index 83f110ebba80..f21d3e32b579 100644
--- a/arch/x86/lib/acpi_nhlt.c
+++ b/arch/x86/lib/acpi_nhlt.c
@@ -18,6 +18,7 @@
 #include <asm/unaligned.h>
 #include <dm/acpi.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #define NHLT_RID		1
diff --git a/arch/x86/lib/acpi_table.c b/arch/x86/lib/acpi_table.c
index 2de8ad0d6f45..db1840068302 100644
--- a/arch/x86/lib/acpi_table.c
+++ b/arch/x86/lib/acpi_table.c
@@ -27,6 +27,7 @@
 #include <dm/acpi.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 /*
diff --git a/arch/x86/lib/bootm.c b/arch/x86/lib/bootm.c
index 66fc8a69aaa4..0b20cdc16aba 100644
--- a/arch/x86/lib/bootm.c
+++ b/arch/x86/lib/bootm.c
@@ -12,6 +12,7 @@
 #include <command.h>
 #include <hang.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
diff --git a/arch/x86/lib/coreboot_table.c b/arch/x86/lib/coreboot_table.c
index b0377dcee177..f4736ecfc45a 100644
--- a/arch/x86/lib/coreboot_table.c
+++ b/arch/x86/lib/coreboot_table.c
@@ -11,6 +11,7 @@
 #include <asm/coreboot_tables.h>
 #include <asm/e820.h>
 #include <asm/global_data.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/x86/lib/e820.c b/arch/x86/lib/e820.c
index 12fcff123805..066bf9b154ba 100644
--- a/arch/x86/lib/e820.c
+++ b/arch/x86/lib/e820.c
@@ -7,6 +7,7 @@
 #include <efi_loader.h>
 #include <asm/e820.h>
 #include <asm/global_data.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/lib/fsp/fsp_dram.c b/arch/x86/lib/fsp/fsp_dram.c
index 9b796ba4f4ea..e73597567a48 100644
--- a/arch/x86/lib/fsp/fsp_dram.c
+++ b/arch/x86/lib/fsp/fsp_dram.c
@@ -13,6 +13,7 @@
 #include <asm/mrccache.h>
 #include <asm/mtrr.h>
 #include <asm/post.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/lib/fsp2/fsp_dram.c b/arch/x86/lib/fsp2/fsp_dram.c
index e81b35d8d72e..aae75ea1573d 100644
--- a/arch/x86/lib/fsp2/fsp_dram.c
+++ b/arch/x86/lib/fsp2/fsp_dram.c
@@ -9,6 +9,7 @@
 #include <init.h>
 #include <log.h>
 #include <spl.h>
+#include <stdbool.h>
 #include <acpi/acpi_s3.h>
 #include <asm/arch/cpu.h>
 #include <asm/fsp/fsp_support.h>
diff --git a/arch/x86/lib/fsp2/fsp_init.c b/arch/x86/lib/fsp2/fsp_init.c
index 31702b90fd74..eef321d62086 100644
--- a/arch/x86/lib/fsp2/fsp_init.c
+++ b/arch/x86/lib/fsp2/fsp_init.c
@@ -14,6 +14,7 @@
 #include <spi.h>
 #include <spl.h>
 #include <spi_flash.h>
+#include <stdbool.h>
 #include <asm/intel_pinctrl.h>
 #include <dm/uclass-internal.h>
 #include <asm/fsp2/fsp_internal.h>
diff --git a/arch/x86/lib/fsp2/fsp_meminit.c b/arch/x86/lib/fsp2/fsp_meminit.c
index 5dfaf73b12a8..dd3569895ff3 100644
--- a/arch/x86/lib/fsp2/fsp_meminit.c
+++ b/arch/x86/lib/fsp2/fsp_meminit.c
@@ -11,6 +11,7 @@
 #include <bootstage.h>
 #include <dm.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/mrccache.h>
diff --git a/arch/x86/lib/fsp2/fsp_silicon_init.c b/arch/x86/lib/fsp2/fsp_silicon_init.c
index 7d83ae2a1cb7..4ab49c5fe6fe 100644
--- a/arch/x86/lib/fsp2/fsp_silicon_init.c
+++ b/arch/x86/lib/fsp2/fsp_silicon_init.c
@@ -13,6 +13,7 @@
 #include <bootstage.h>
 #include <dm.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/arch/fsp/fsp_configs.h>
 #include <asm/arch/fsp/fsp_s_upd.h>
 #include <asm/fsp/fsp_infoheader.h>
diff --git a/arch/x86/lib/fsp2/fsp_support.c b/arch/x86/lib/fsp2/fsp_support.c
index b962487418b9..f597f7522136 100644
--- a/arch/x86/lib/fsp2/fsp_support.c
+++ b/arch/x86/lib/fsp2/fsp_support.c
@@ -12,6 +12,7 @@
 #include <asm/fsp2/fsp_internal.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 /* The amount of the FSP header to probe to obtain what we need */
diff --git a/arch/x86/lib/i8259.c b/arch/x86/lib/i8259.c
index a0e3c0925738..c002d103aef3 100644
--- a/arch/x86/lib/i8259.c
+++ b/arch/x86/lib/i8259.c
@@ -15,6 +15,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <asm/i8259.h>
 #include <asm/ibmpc.h>
diff --git a/arch/x86/lib/init_helpers.c b/arch/x86/lib/init_helpers.c
index 066dc404a2d8..6d61077f177b 100644
--- a/arch/x86/lib/init_helpers.c
+++ b/arch/x86/lib/init_helpers.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
 #include <asm/mtrr.h>
diff --git a/arch/x86/lib/mpspec.c b/arch/x86/lib/mpspec.c
index bda9b7f1a112..17568a03d5c8 100644
--- a/arch/x86/lib/mpspec.c
+++ b/arch/x86/lib/mpspec.c
@@ -20,6 +20,7 @@
 #include <asm/tables.h>
 #include <dm/uclass-internal.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/x86/lib/mrccache.c b/arch/x86/lib/mrccache.c
index 0488a261c654..63aace5d4fb8 100644
--- a/arch/x86/lib/mrccache.c
+++ b/arch/x86/lib/mrccache.c
@@ -21,6 +21,7 @@
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/x86/lib/physmem.c b/arch/x86/lib/physmem.c
index 1589a8873506..71039589dfdf 100644
--- a/arch/x86/lib/physmem.c
+++ b/arch/x86/lib/physmem.c
@@ -14,6 +14,7 @@
 #include <asm/cpu.h>
 #include <asm/global_data.h>
 #include <linux/compiler.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/x86/lib/pinctrl_ich6.c b/arch/x86/lib/pinctrl_ich6.c
index 82de4cbdc431..53228cd2848b 100644
--- a/arch/x86/lib/pinctrl_ich6.c
+++ b/arch/x86/lib/pinctrl_ich6.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <pch.h>
 #include <pci.h>
+#include <stdbool.h>
 #include <asm/cpu.h>
 #include <asm/global_data.h>
 #include <asm/gpio.h>
diff --git a/arch/x86/lib/pirq_routing.c b/arch/x86/lib/pirq_routing.c
index d99a90fb8269..3b5ee3837f84 100644
--- a/arch/x86/lib/pirq_routing.c
+++ b/arch/x86/lib/pirq_routing.c
@@ -12,6 +12,7 @@
 #include <asm/global_data.h>
 #include <asm/pci.h>
 #include <asm/pirq_routing.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/x86/lib/pmu.c b/arch/x86/lib/pmu.c
index 8f2649d9829b..314d9f0ecee5 100644
--- a/arch/x86/lib/pmu.c
+++ b/arch/x86/lib/pmu.c
@@ -5,6 +5,7 @@
 #include <common.h>
 #include <dm.h>
 #include <regmap.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <syscon.h>
 #include <asm/cpu.h>
diff --git a/arch/x86/lib/sfi.c b/arch/x86/lib/sfi.c
index 13029fc08cbd..b85a1b17e84b 100644
--- a/arch/x86/lib/sfi.c
+++ b/arch/x86/lib/sfi.c
@@ -21,6 +21,7 @@
 #include <asm/tables.h>
 #include <dm/uclass-internal.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 struct table_info {
diff --git a/arch/x86/lib/tables.c b/arch/x86/lib/tables.c
index 6c1464f4fa4e..6fd0ded397d0 100644
--- a/arch/x86/lib/tables.c
+++ b/arch/x86/lib/tables.c
@@ -14,6 +14,7 @@
 #include <asm/mpspec.h>
 #include <asm/tables.h>
 #include <asm/coreboot_tables.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 /**
diff --git a/arch/x86/lib/zimage.c b/arch/x86/lib/zimage.c
index a13eb78e2224..5e413200268f 100644
--- a/arch/x86/lib/zimage.c
+++ b/arch/x86/lib/zimage.c
@@ -31,6 +31,7 @@
 #endif
 #include <linux/compiler.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <linux/string.h>
 
diff --git a/board/AndesTech/ax25-ae350/ax25-ae350.c b/board/AndesTech/ax25-ae350/ax25-ae350.c
index 4e546adfc68a..b75e968ee1dc 100644
--- a/board/AndesTech/ax25-ae350/ax25-ae350.c
+++ b/board/AndesTech/ax25-ae350/ax25-ae350.c
@@ -20,6 +20,7 @@
 #include <fdtdec.h>
 #include <dm.h>
 #include <spl.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/Arcturus/ucp1020/law.c b/board/Arcturus/ucp1020/law.c
index cb53692a32be..b2b4618b2275 100644
--- a/board/Arcturus/ucp1020/law.c
+++ b/board/Arcturus/ucp1020/law.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
+#include <linux/kernel.h>
 
 struct law_entry law_table[] = {
 #ifdef CONFIG_VSC7385_ENET
diff --git a/board/Arcturus/ucp1020/tlb.c b/board/Arcturus/ucp1020/tlb.c
index 48035ff80270..0ae952f59293 100644
--- a/board/Arcturus/ucp1020/tlb.c
+++ b/board/Arcturus/ucp1020/tlb.c
@@ -9,6 +9,7 @@
 
 #include <asm/mmu.h>
 #include <asm/ppc.h>
+#include <linux/kernel.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/CZ.NIC/turris_mox/turris_mox.c b/board/CZ.NIC/turris_mox/turris_mox.c
index 9429806b673e..0c7926b5624e 100644
--- a/board/CZ.NIC/turris_mox/turris_mox.c
+++ b/board/CZ.NIC/turris_mox/turris_mox.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <stdarg.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/arch/cpu.h>
diff --git a/board/CZ.NIC/turris_omnia/turris_omnia.c b/board/CZ.NIC/turris_omnia/turris_omnia.c
index a466c8e9f86f..6e950f45f05b 100644
--- a/board/CZ.NIC/turris_omnia/turris_omnia.c
+++ b/board/CZ.NIC/turris_omnia/turris_omnia.c
@@ -25,6 +25,7 @@
 #include <time.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
 # include <atsha204a-i2c.h>
diff --git a/board/CarMediaLab/flea3/flea3.c b/board/CarMediaLab/flea3/flea3.c
index a0322219d438..1be57c844c80 100644
--- a/board/CarMediaLab/flea3/flea3.c
+++ b/board/CarMediaLab/flea3/flea3.c
@@ -20,6 +20,7 @@
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/iomux-mx35.h>
 #include <i2c.h>
+#include <linux/kernel.h>
 #include <linux/types.h>
 #include <asm/gpio.h>
 #include <asm/arch/sys_proto.h>
diff --git a/board/LaCie/net2big_v2/net2big_v2.c b/board/LaCie/net2big_v2/net2big_v2.c
index f3710681e51c..93de669f89d0 100644
--- a/board/LaCie/net2big_v2/net2big_v2.c
+++ b/board/LaCie/net2big_v2/net2big_v2.c
@@ -21,6 +21,7 @@
 #include <asm/arch/soc.h>
 #include <asm/arch/mpp.h>
 #include <asm/arch/gpio.h>
+#include <linux/kernel.h>
 
 #include "net2big_v2.h"
 #include "../common/common.h"
diff --git a/board/Marvell/db-88f6820-amc/db-88f6820-amc.c b/board/Marvell/db-88f6820-amc/db-88f6820-amc.c
index 62f59ecb7280..0fa0820d7be7 100644
--- a/board/Marvell/db-88f6820-amc/db-88f6820-amc.c
+++ b/board/Marvell/db-88f6820-amc/db-88f6820-amc.c
@@ -16,6 +16,7 @@
 #include <asm/arch/soc.h>
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 
 #include "../drivers/ddr/marvell/a38x/ddr3_init.h"
 #include <../serdes/a38x/high_speed_env_spec.h>
diff --git a/board/Marvell/db-88f6820-gp/db-88f6820-gp.c b/board/Marvell/db-88f6820-gp/db-88f6820-gp.c
index 8fbf78e6d8b6..b18ac9c2d0bc 100644
--- a/board/Marvell/db-88f6820-gp/db-88f6820-gp.c
+++ b/board/Marvell/db-88f6820-gp/db-88f6820-gp.c
@@ -16,6 +16,7 @@
 #include <asm/arch/soc.h>
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 
 #include "../drivers/ddr/marvell/a38x/ddr3_init.h"
 #include <../serdes/a38x/high_speed_env_spec.h>
diff --git a/board/Synology/ds414/ds414.c b/board/Synology/ds414/ds414.c
index f4a940676e8a..1ca2e300e085 100644
--- a/board/Synology/ds414/ds414.c
+++ b/board/Synology/ds414/ds414.c
@@ -13,6 +13,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 #include <linux/mbus.h>
 
 #include "../drivers/ddr/marvell/axp/ddr3_hw_training.h"
diff --git a/board/advantech/dms-ba16/dms-ba16.c b/board/advantech/dms-ba16/dms-ba16.c
index b59f42c6dafa..42bfa740f1b9 100644
--- a/board/advantech/dms-ba16/dms-ba16.c
+++ b/board/advantech/dms-ba16/dms-ba16.c
@@ -32,6 +32,7 @@
 #include <i2c.h>
 #include <input.h>
 #include <pwm.h>
+#include <linux/kernel.h>
 DECLARE_GLOBAL_DATA_PTR;
 
 #define NC_PAD_CTRL (PAD_CTL_PUS_100K_UP |	\
diff --git a/board/advantech/imx8qm_rom7720_a1/imx8qm_rom7720_a1.c b/board/advantech/imx8qm_rom7720_a1/imx8qm_rom7720_a1.c
index 8cd1a1642497..430c7d3745d2 100644
--- a/board/advantech/imx8qm_rom7720_a1/imx8qm_rom7720_a1.c
+++ b/board/advantech/imx8qm_rom7720_a1/imx8qm_rom7720_a1.c
@@ -12,6 +12,7 @@
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
diff --git a/board/advantech/imx8qm_rom7720_a1/spl.c b/board/advantech/imx8qm_rom7720_a1/spl.c
index 4d2f692b2940..8776a94ff079 100644
--- a/board/advantech/imx8qm_rom7720_a1/spl.c
+++ b/board/advantech/imx8qm_rom7720_a1/spl.c
@@ -12,6 +12,7 @@
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include <asm/io.h>
diff --git a/board/alliedtelesis/x530/x530.c b/board/alliedtelesis/x530/x530.c
index dff8a6b886c3..f4ff0b960d32 100644
--- a/board/alliedtelesis/x530/x530.c
+++ b/board/alliedtelesis/x530/x530.c
@@ -15,6 +15,7 @@
 #include <asm/gpio.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/mbus.h>
 #include <linux/io.h>
 #include <asm/arch/cpu.h>
diff --git a/board/aristainetos/aristainetos.c b/board/aristainetos/aristainetos.c
index f0c0b5d821c9..4451bed8a7dc 100644
--- a/board/aristainetos/aristainetos.c
+++ b/board/aristainetos/aristainetos.c
@@ -36,6 +36,7 @@
 #include <miiphy.h>
 #include <lcd.h>
 #include <led.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/board/armadeus/apf27/apf27.c b/board/armadeus/apf27/apf27.c
index 6536dd5fe9de..c78512ee5465 100644
--- a/board/armadeus/apf27/apf27.c
+++ b/board/armadeus/apf27/apf27.c
@@ -19,6 +19,7 @@
 #include <asm/arch/gpio.h>
 #include <asm/gpio.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <u-boot/crc.h>
 #include "apf27.h"
 #include "fpga.h"
diff --git a/board/armltd/vexpress/vexpress_tc2.c b/board/armltd/vexpress/vexpress_tc2.c
index f0bedda24a53..75f9d8203495 100644
--- a/board/armltd/vexpress/vexpress_tc2.c
+++ b/board/armltd/vexpress/vexpress_tc2.c
@@ -6,6 +6,7 @@
  * TC2 specific code for Versatile Express.
  */
 
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/armv7.h>
 #include <asm/io.h>
diff --git a/board/avionic-design/common/tamonten-ng.c b/board/avionic-design/common/tamonten-ng.c
index 29bde60228f9..1b509835d76a 100644
--- a/board/avionic-design/common/tamonten-ng.c
+++ b/board/avionic-design/common/tamonten-ng.c
@@ -11,6 +11,7 @@
 #include <asm/arch/gp_padctrl.h>
 #include <asm/arch/gpio.h>
 #include <asm/gpio.h>
+#include <linux/kernel.h>
 #include "pinmux-config-tamonten-ng.h"
 #include <i2c.h>
 
diff --git a/board/bachmann/ot1200/ot1200.c b/board/bachmann/ot1200/ot1200.c
index ac9eba85180c..47b592117d5b 100644
--- a/board/bachmann/ot1200/ot1200.c
+++ b/board/bachmann/ot1200/ot1200.c
@@ -31,6 +31,7 @@
 #include <phy.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/barco/platinum/platinum.c b/board/barco/platinum/platinum.c
index b98c577fbbac..03720a97d7d5 100644
--- a/board/barco/platinum/platinum.c
+++ b/board/barco/platinum/platinum.c
@@ -24,6 +24,7 @@
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/mach-imx/boot_mode.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 #include "platinum.h"
 
diff --git a/board/barco/platinum/platinum_picon.c b/board/barco/platinum/platinum_picon.c
index 3fc29f9e08c4..1eae9355bae0 100644
--- a/board/barco/platinum/platinum_picon.c
+++ b/board/barco/platinum/platinum_picon.c
@@ -15,6 +15,7 @@
 #include <i2c.h>
 #include <miiphy.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 
 #include "platinum.h"
 
diff --git a/board/barco/platinum/platinum_titanium.c b/board/barco/platinum/platinum_titanium.c
index 9f7c93b4d540..b7d7c4e828b6 100644
--- a/board/barco/platinum/platinum_titanium.c
+++ b/board/barco/platinum/platinum_titanium.c
@@ -13,6 +13,7 @@
 #include <miiphy.h>
 #include <micrel.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 
 #include "platinum.h"
 
diff --git a/board/barco/titanium/titanium.c b/board/barco/titanium/titanium.c
index 9cd88e2a72de..ae293ff42dcc 100644
--- a/board/barco/titanium/titanium.c
+++ b/board/barco/titanium/titanium.c
@@ -26,6 +26,7 @@
 #include <netdev.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/beacon/imx8mm/spl.c b/board/beacon/imx8mm/spl.c
index 6307d689ab58..2895ca24a3a6 100644
--- a/board/beacon/imx8mm/spl.c
+++ b/board/beacon/imx8mm/spl.c
@@ -16,6 +16,7 @@
 #include <asm/mach-imx/boot_mode.h>
 #include <asm/arch/ddr.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include <dm/uclass.h>
diff --git a/board/beckhoff/mx53cx9020/mx53cx9020_video.c b/board/beckhoff/mx53cx9020/mx53cx9020_video.c
index bf4729025622..3be2cd5f0ff4 100644
--- a/board/beckhoff/mx53cx9020/mx53cx9020_video.c
+++ b/board/beckhoff/mx53cx9020/mx53cx9020_video.c
@@ -11,6 +11,7 @@
 #include <asm/arch/iomux-mx53.h>
 #include <asm/gpio.h>
 #include <asm/mach-imx/video.h>
+#include <linux/kernel.h>
 
 #define CX9020_DVI_PWD	IMX_GPIO_NR(6, 1)
 
diff --git a/board/bluegiga/apx4devkit/spl_boot.c b/board/bluegiga/apx4devkit/spl_boot.c
index e5d5c4637b0c..d8ee1d0a63ec 100644
--- a/board/bluegiga/apx4devkit/spl_boot.c
+++ b/board/bluegiga/apx4devkit/spl_boot.c
@@ -20,6 +20,7 @@
 #include <asm/arch/iomux-mx28.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/kernel.h>
 
 #define	MUX_CONFIG_SSP0	(MXS_PAD_3V3 | MXS_PAD_8MA | MXS_PAD_PULLUP)
 #define	MUX_CONFIG_GPMI	(MXS_PAD_3V3 | MXS_PAD_4MA | MXS_PAD_NOPULL)
diff --git a/board/boundary/nitrogen6x/nitrogen6x.c b/board/boundary/nitrogen6x/nitrogen6x.c
index 79ba375cd2bc..c5a522aea256 100644
--- a/board/boundary/nitrogen6x/nitrogen6x.c
+++ b/board/boundary/nitrogen6x/nitrogen6x.c
@@ -38,6 +38,7 @@
 #include <i2c.h>
 #include <input.h>
 #include <netdev.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <usb/ehci-ci.h>
 
diff --git a/board/ccv/xpress/xpress.c b/board/ccv/xpress/xpress.c
index c7476ba197c7..dfc71ba91bed 100644
--- a/board/ccv/xpress/xpress.c
+++ b/board/ccv/xpress/xpress.c
@@ -30,6 +30,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <usb/ehci-ci.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/cei/cei-tk1-som/cei-tk1-som.c b/board/cei/cei-tk1-som/cei-tk1-som.c
index 95ee7bbfe29a..c0b9a1e5db4d 100644
--- a/board/cei/cei-tk1-som/cei-tk1-som.c
+++ b/board/cei/cei-tk1-som/cei-tk1-som.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <linux/kernel.h>
 #include <power/as3722.h>
 
 #include <asm/arch/gpio.h>
diff --git a/board/compulab/cl-som-imx7/mux.c b/board/compulab/cl-som-imx7/mux.c
index 18f16a48738c..4f316fe8b1d7 100644
--- a/board/compulab/cl-som-imx7/mux.c
+++ b/board/compulab/cl-som-imx7/mux.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/arch-mx7/mx7-pins.h>
+#include <linux/kernel.h>
 
 #define PADS_SET(pads_array)						       \
 void cl_som_imx7_##pads_array##_set(void)				       \
diff --git a/board/compulab/cm_fx6/cm_fx6.c b/board/compulab/cm_fx6/cm_fx6.c
index e39768378f90..b3862fcf3a73 100644
--- a/board/compulab/cm_fx6/cm_fx6.c
+++ b/board/compulab/cm_fx6/cm_fx6.c
@@ -40,6 +40,7 @@
 #include <jffs2/load_kernel.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "common.h"
 #include "../common/eeprom.h"
diff --git a/board/compulab/cm_fx6/spl.c b/board/compulab/cm_fx6/spl.c
index 0dab1cbd60aa..a66e60162377 100644
--- a/board/compulab/cm_fx6/spl.c
+++ b/board/compulab/cm_fx6/spl.c
@@ -12,6 +12,7 @@
 #include <hang.h>
 #include <init.h>
 #include <spl.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
diff --git a/board/compulab/cm_t43/spl.c b/board/compulab/cm_t43/spl.c
index 016c63a509a5..14a37b0f5689 100644
--- a/board/compulab/cm_t43/spl.c
+++ b/board/compulab/cm_t43/spl.c
@@ -11,6 +11,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/ddr_defs.h>
 #include <asm/gpio.h>
+#include <linux/kernel.h>
 #include <power/pmic.h>
 #include <power/tps65218.h>
 #include "board.h"
diff --git a/board/compulab/common/omap3_display.c b/board/compulab/common/omap3_display.c
index 4b580b70fbec..61641aa83755 100644
--- a/board/compulab/common/omap3_display.c
+++ b/board/compulab/common/omap3_display.c
@@ -18,6 +18,7 @@
 #include <lcd.h>
 #include <scf0403_lcd.h>
 #include <asm/arch-omap3/dss.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 enum display_type {
diff --git a/board/congatec/cgtqmx6eval/cgtqmx6eval.c b/board/congatec/cgtqmx6eval/cgtqmx6eval.c
index c857a73df742..6b37c27fabcd 100644
--- a/board/congatec/cgtqmx6eval/cgtqmx6eval.c
+++ b/board/congatec/cgtqmx6eval/cgtqmx6eval.c
@@ -32,6 +32,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <power/pmic.h>
 #include <power/pfuze100_pmic.h>
diff --git a/board/corscience/tricorder/tricorder-eeprom.c b/board/corscience/tricorder/tricorder-eeprom.c
index 1a878397007f..e239eeea1457 100644
--- a/board/corscience/tricorder/tricorder-eeprom.c
+++ b/board/corscience/tricorder/tricorder-eeprom.c
@@ -11,6 +11,7 @@
 #include <i2c.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
 
diff --git a/board/creative/xfi3/spl_boot.c b/board/creative/xfi3/spl_boot.c
index 64a13cef305c..dd31156e445f 100644
--- a/board/creative/xfi3/spl_boot.c
+++ b/board/creative/xfi3/spl_boot.c
@@ -11,6 +11,7 @@
 #include <asm/arch/iomux-mx23.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #define	MUX_CONFIG_EMI	(MXS_PAD_1V8 | MXS_PAD_12MA | MXS_PAD_PULLUP)
diff --git a/board/creative/xfi3/xfi3.c b/board/creative/xfi3/xfi3.c
index 3e7f7e6e1735..825a613aee4b 100644
--- a/board/creative/xfi3/xfi3.c
+++ b/board/creative/xfi3/xfi3.c
@@ -23,6 +23,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/davinci/da8xxevm/da850evm.c b/board/davinci/da8xxevm/da850evm.c
index 14f8f4d89a2f..8cc118cde5a4 100644
--- a/board/davinci/da8xxevm/da850evm.c
+++ b/board/davinci/da8xxevm/da850evm.c
@@ -30,6 +30,7 @@
 #include <hwconfig.h>
 #include <asm/mach-types.h>
 #include <asm/gpio.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #ifdef CONFIG_MMC_DAVINCI
diff --git a/board/davinci/da8xxevm/omapl138_lcdk.c b/board/davinci/da8xxevm/omapl138_lcdk.c
index 3694a034b73a..30182d02805f 100644
--- a/board/davinci/da8xxevm/omapl138_lcdk.c
+++ b/board/davinci/da8xxevm/omapl138_lcdk.c
@@ -29,6 +29,7 @@
 #include <mmc.h>
 #include <asm/arch/sdmmc_defs.h>
 #endif
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/dhelectronics/dh_stm32mp1/board.c b/board/dhelectronics/dh_stm32mp1/board.c
index 571168570e1a..3fdf69d14685 100644
--- a/board/dhelectronics/dh_stm32mp1/board.c
+++ b/board/dhelectronics/dh_stm32mp1/board.c
@@ -39,6 +39,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include <power/regulator.h>
diff --git a/board/ea/mx7ulp_com/mx7ulp_com.c b/board/ea/mx7ulp_com/mx7ulp_com.c
index 5b2d444366c7..61503a73bb00 100644
--- a/board/ea/mx7ulp_com/mx7ulp_com.c
+++ b/board/ea/mx7ulp_com/mx7ulp_com.c
@@ -11,6 +11,7 @@
 #include <asm/arch/mx7ulp-pins.h>
 #include <asm/arch/iomux.h>
 #include <asm/gpio.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/el/el6x/el6x.c b/board/el/el6x/el6x.c
index 8272e1459d2a..952ec9dae101 100644
--- a/board/el/el6x/el6x.c
+++ b/board/el/el6x/el6x.c
@@ -33,6 +33,7 @@
 #include <asm/arch/sys_proto.h>
 #include <i2c.h>
 #include <input.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <power/pmic.h>
 #include <power/pfuze100_pmic.h>
diff --git a/board/embest/mx6boards/mx6boards.c b/board/embest/mx6boards/mx6boards.c
index 6bd0b10a9e1b..b6d29adc5f40 100644
--- a/board/embest/mx6boards/mx6boards.c
+++ b/board/embest/mx6boards/mx6boards.c
@@ -42,6 +42,7 @@
 #include <linux/fb.h>
 #include <ipu_pixfmt.h>
 #include <asm/io.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/engicam/imx6q/imx6q.c b/board/engicam/imx6q/imx6q.c
index e6c888fcfde1..3405c7a09e41 100644
--- a/board/engicam/imx6q/imx6q.c
+++ b/board/engicam/imx6q/imx6q.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <linux/kernel.h>
 
 #include <asm/io.h>
 #include <asm/gpio.h>
diff --git a/board/firefly/roc-pc-rk3399/roc-pc-rk3399.c b/board/firefly/roc-pc-rk3399/roc-pc-rk3399.c
index 7029bf7bf869..e0d90f5f0e62 100644
--- a/board/firefly/roc-pc-rk3399/roc-pc-rk3399.c
+++ b/board/firefly/roc-pc-rk3399/roc-pc-rk3399.c
@@ -8,6 +8,7 @@
 #include <env.h>
 #include <log.h>
 #include <spl_gpio.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <linux/string.h>
 #include <power/regulator.h>
diff --git a/board/freescale/common/arm_sleep.c b/board/freescale/common/arm_sleep.c
index 733940860f55..ddcab9f9eef9 100644
--- a/board/freescale/common/arm_sleep.c
+++ b/board/freescale/common/arm_sleep.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #ifndef CONFIG_ARMV7_NONSEC
diff --git a/board/freescale/common/ics307_clk.c b/board/freescale/common/ics307_clk.c
index 2143395781a1..7a74239fb3a4 100644
--- a/board/freescale/common/ics307_clk.c
+++ b/board/freescale/common/ics307_clk.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <log.h>
 #include <asm/io.h>
+#include <linux/kernel.h>
 
 #include "ics307_clk.h"
 
diff --git a/board/freescale/common/mpc85xx_sleep.c b/board/freescale/common/mpc85xx_sleep.c
index d2bb173c1833..bfaf8eb2d6fd 100644
--- a/board/freescale/common/mpc85xx_sleep.c
+++ b/board/freescale/common/mpc85xx_sleep.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 #include <asm/immap_85xx.h>
 #include "sleep.h"
diff --git a/board/freescale/common/ns_access.c b/board/freescale/common/ns_access.c
index ee8ed616cb51..64eeb1159e76 100644
--- a/board/freescale/common/ns_access.c
+++ b/board/freescale/common/ns_access.c
@@ -10,6 +10,7 @@
 #include <fsl_csu.h>
 #include <asm/arch/ns_access.h>
 #include <asm/arch/fsl_serdes.h>
+#include <linux/kernel.h>
 
 #ifdef CONFIG_ARCH_LS1021A
 static struct csu_ns_dev ns_dev[] = {
diff --git a/board/freescale/common/p_corenet/law.c b/board/freescale/common/p_corenet/law.c
index 603384ac4f9f..82de7c6f7e30 100644
--- a/board/freescale/common/p_corenet/law.c
+++ b/board/freescale/common/p_corenet/law.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
+#include <linux/kernel.h>
 
 struct law_entry law_table[] = {
 	SET_LAW(CONFIG_SYS_FLASH_BASE_PHYS, LAW_SIZE_256M, LAW_TRGT_IF_LBC),
diff --git a/board/freescale/common/p_corenet/tlb.c b/board/freescale/common/p_corenet/tlb.c
index 6ca3758b0691..9ceca01b1e54 100644
--- a/board/freescale/common/p_corenet/tlb.c
+++ b/board/freescale/common/p_corenet/tlb.c
@@ -8,6 +8,7 @@
 
 #include <asm/mmu.h>
 #include <asm/ppc.h>
+#include <linux/kernel.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/freescale/common/qixis.c b/board/freescale/common/qixis.c
index e1716676a4ab..ee42a53dae16 100644
--- a/board/freescale/common/qixis.c
+++ b/board/freescale/common/qixis.c
@@ -12,6 +12,7 @@
 #include <stdio.h>
 #include <asm/io.h>
 #include <linux/compiler.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/time.h>
 #include <i2c.h>
diff --git a/board/freescale/common/sleep.h b/board/freescale/common/sleep.h
index 1450baa07255..276b06101dd2 100644
--- a/board/freescale/common/sleep.h
+++ b/board/freescale/common/sleep.h
@@ -6,6 +6,7 @@
 #ifndef __SLEEP_H
 #define __SLEEP_H
 
+#include <stdbool.h>
 #define DCFG_CCSR_CRSTSR_WDRFR	(1 << 3)
 #define DDR_BUFF_LEN			128
 
diff --git a/board/freescale/common/sys_eeprom.c b/board/freescale/common/sys_eeprom.c
index 5f07d28e8ec4..f04bec05a419 100644
--- a/board/freescale/common/sys_eeprom.c
+++ b/board/freescale/common/sys_eeprom.c
@@ -15,6 +15,7 @@
 #include <vsprintf.h>
 #include <linux/ctype.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
 
diff --git a/board/freescale/common/vid.c b/board/freescale/common/vid.c
index 6b68d03cecef..f1ef3142c0c2 100644
--- a/board/freescale/common/vid.c
+++ b/board/freescale/common/vid.c
@@ -20,6 +20,7 @@
 #include <asm/immap_85xx.h>
 #endif
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include "vid.h"
 
 int __weak i2c_multiplexer_select_vid_channel(u8 channel)
diff --git a/board/freescale/imx8mm_evk/spl.c b/board/freescale/imx8mm_evk/spl.c
index c3224c66192b..ef4526a7dca3 100644
--- a/board/freescale/imx8mm_evk/spl.c
+++ b/board/freescale/imx8mm_evk/spl.c
@@ -21,6 +21,7 @@
 #include <asm/mach-imx/boot_mode.h>
 #include <asm/arch/ddr.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include <dm/uclass.h>
diff --git a/board/freescale/imx8mn_evk/spl.c b/board/freescale/imx8mn_evk/spl.c
index 1d5e95e62d85..bd732c226be5 100644
--- a/board/freescale/imx8mn_evk/spl.c
+++ b/board/freescale/imx8mn_evk/spl.c
@@ -21,6 +21,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/mach-imx/boot_mode.h>
 #include <asm/arch/ddr.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include <dm/uclass.h>
diff --git a/board/freescale/imx8mp_evk/imx8mp_evk.c b/board/freescale/imx8mp_evk/imx8mp_evk.c
index 56da4d4c6a31..b9db31cd2bdf 100644
--- a/board/freescale/imx8mp_evk/imx8mp_evk.c
+++ b/board/freescale/imx8mp_evk/imx8mp_evk.c
@@ -13,6 +13,7 @@
 #include <asm/arch/imx8mp_pins.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/mach-imx/gpio.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/imx8mq_evk/imx8mq_evk.c b/board/freescale/imx8mq_evk/imx8mq_evk.c
index 93da67d77983..ecec63902904 100644
--- a/board/freescale/imx8mq_evk/imx8mq_evk.c
+++ b/board/freescale/imx8mq_evk/imx8mq_evk.c
@@ -23,6 +23,7 @@
 #include <asm/arch/clock.h>
 #include <spl.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 #include <power/pmic.h>
 #include <power/pfuze100_pmic.h>
 #include "../common/pfuze.h"
diff --git a/board/freescale/imx8mq_evk/spl.c b/board/freescale/imx8mq_evk/spl.c
index 6a37467314cc..ccb8f44f115c 100644
--- a/board/freescale/imx8mq_evk/spl.c
+++ b/board/freescale/imx8mq_evk/spl.c
@@ -27,6 +27,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <power/pmic.h>
 #include <power/pfuze100_pmic.h>
diff --git a/board/freescale/imx8qm_mek/imx8qm_mek.c b/board/freescale/imx8qm_mek/imx8qm_mek.c
index 4f0b0467da00..3aa6c2d7a23a 100644
--- a/board/freescale/imx8qm_mek/imx8qm_mek.c
+++ b/board/freescale/imx8qm_mek/imx8qm_mek.c
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <asm/io.h>
diff --git a/board/freescale/imx8qxp_mek/imx8qxp_mek.c b/board/freescale/imx8qxp_mek/imx8qxp_mek.c
index 9b70813281be..f0220b131009 100644
--- a/board/freescale/imx8qxp_mek/imx8qxp_mek.c
+++ b/board/freescale/imx8qxp_mek/imx8qxp_mek.c
@@ -12,6 +12,7 @@
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <fsl_esdhc_imx.h>
 #include <fdt_support.h>
diff --git a/board/freescale/imx8qxp_mek/spl.c b/board/freescale/imx8qxp_mek/spl.c
index 78d2856e3b43..5b3e87c25610 100644
--- a/board/freescale/imx8qxp_mek/spl.c
+++ b/board/freescale/imx8qxp_mek/spl.c
@@ -23,6 +23,7 @@
 #include <asm/arch/imx8-pins.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/ls1012ardb/ls1012ardb.c b/board/freescale/ls1012ardb/ls1012ardb.c
index 1ca23aef0ebf..8cc986ab01af 100644
--- a/board/freescale/ls1012ardb/ls1012ardb.c
+++ b/board/freescale/ls1012ardb/ls1012ardb.c
@@ -8,6 +8,7 @@
 #include <fdt_support.h>
 #include <hang.h>
 #include <i2c.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/cache.h>
 #include <init.h>
diff --git a/board/freescale/ls1021aiot/ls1021aiot.c b/board/freescale/ls1021aiot/ls1021aiot.c
index 09ef96e6bb4f..66c701e1e35d 100644
--- a/board/freescale/ls1021aiot/ls1021aiot.c
+++ b/board/freescale/ls1021aiot/ls1021aiot.c
@@ -16,6 +16,7 @@
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include <asm/arch/ls102xa_devdis.h>
diff --git a/board/freescale/ls1021aqds/ls1021aqds.c b/board/freescale/ls1021aqds/ls1021aqds.c
index 1b7dcf2d33d0..c13ec4127003 100644
--- a/board/freescale/ls1021aqds/ls1021aqds.c
+++ b/board/freescale/ls1021aqds/ls1021aqds.c
@@ -27,6 +27,7 @@
 #include <fsl_validate.h>
 #include <fsl_ddr.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "../common/sleep.h"
 #include "../common/qixis.h"
diff --git a/board/freescale/ls1021atsn/ls1021atsn.c b/board/freescale/ls1021atsn/ls1021atsn.c
index 16d9df1b7044..4ad4f1eb07a0 100644
--- a/board/freescale/ls1021atsn/ls1021atsn.c
+++ b/board/freescale/ls1021atsn/ls1021atsn.c
@@ -14,6 +14,7 @@
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "../common/sleep.h"
 #include <fsl_validate.h>
diff --git a/board/freescale/ls1021atwr/ls1021atwr.c b/board/freescale/ls1021atwr/ls1021atwr.c
index cf9c171889e2..8c21393a6e5f 100644
--- a/board/freescale/ls1021atwr/ls1021atwr.c
+++ b/board/freescale/ls1021atwr/ls1021atwr.c
@@ -32,6 +32,7 @@
 #include <spl.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "../common/sleep.h"
 #ifdef CONFIG_U_QE
diff --git a/board/freescale/ls1043aqds/ls1043aqds.c b/board/freescale/ls1043aqds/ls1043aqds.c
index 183fdcf12c37..6b377d0d997e 100644
--- a/board/freescale/ls1043aqds/ls1043aqds.c
+++ b/board/freescale/ls1043aqds/ls1043aqds.c
@@ -10,6 +10,7 @@
 #include <fsl_ddr_sdram.h>
 #include <init.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/board/freescale/ls1046aqds/ls1046aqds.c b/board/freescale/ls1046aqds/ls1046aqds.c
index 52266a594367..1d06c3038a6c 100644
--- a/board/freescale/ls1046aqds/ls1046aqds.c
+++ b/board/freescale/ls1046aqds/ls1046aqds.c
@@ -9,6 +9,7 @@
 #include <fdt_support.h>
 #include <fsl_ddr_sdram.h>
 #include <init.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/board/freescale/ls1046ardb/cpld.c b/board/freescale/ls1046ardb/cpld.c
index 4182baa4975e..1f6fcc116e54 100644
--- a/board/freescale/ls1046ardb/cpld.c
+++ b/board/freescale/ls1046ardb/cpld.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/io.h>
 #include <linux/string.h>
diff --git a/board/freescale/ls1046ardb/cpld.h b/board/freescale/ls1046ardb/cpld.h
index e87044f5c0dc..765962c89ae1 100644
--- a/board/freescale/ls1046ardb/cpld.h
+++ b/board/freescale/ls1046ardb/cpld.h
@@ -10,6 +10,7 @@
  * CPLD register set of LS1046ARDB board-specific.
  * CPLD Revision:  V2.1
  */
+#include <stdbool.h>
 struct cpld_data {
 	u8 cpld_ver;		/* 0x0 - CPLD Major Revision Register */
 	u8 cpld_ver_sub;	/* 0x1 - CPLD Minor Revision Register */
diff --git a/board/freescale/ls1046ardb/ls1046ardb.c b/board/freescale/ls1046ardb/ls1046ardb.c
index ad4caaa5044f..d2f88ea9d064 100644
--- a/board/freescale/ls1046ardb/ls1046ardb.c
+++ b/board/freescale/ls1046ardb/ls1046ardb.c
@@ -7,6 +7,7 @@
 #include <i2c.h>
 #include <fdt_support.h>
 #include <init.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/board/freescale/ls1088a/eth_ls1088aqds.c b/board/freescale/ls1088a/eth_ls1088aqds.c
index d5a1752c055b..fe0a890bb0c7 100644
--- a/board/freescale/ls1088a/eth_ls1088aqds.c
+++ b/board/freescale/ls1088a/eth_ls1088aqds.c
@@ -24,6 +24,7 @@
 #include <fsl-mc/fsl_mc.h>
 #include <fsl-mc/ldpaa_wriop.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include "../common/qixis.h"
diff --git a/board/freescale/ls1088a/ls1088a.c b/board/freescale/ls1088a/ls1088a.c
index 8d33151cdad9..b35266de231d 100644
--- a/board/freescale/ls1088a/ls1088a.c
+++ b/board/freescale/ls1088a/ls1088a.c
@@ -20,6 +20,7 @@
 #include <fdt_support.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <fsl-mc/fsl_mc.h>
 #include <env_internal.h>
diff --git a/board/freescale/ls2080aqds/eth.c b/board/freescale/ls2080aqds/eth.c
index 7756620bdfde..167bd1475c91 100644
--- a/board/freescale/ls2080aqds/eth.c
+++ b/board/freescale/ls2080aqds/eth.c
@@ -22,6 +22,7 @@
 #include <fsl-mc/fsl_mc.h>
 #include <fsl-mc/ldpaa_wriop.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include "../common/qixis.h"
diff --git a/board/freescale/ls2080aqds/ls2080aqds.c b/board/freescale/ls2080aqds/ls2080aqds.c
index 39724dcbcbab..8a44ea36003f 100644
--- a/board/freescale/ls2080aqds/ls2080aqds.c
+++ b/board/freescale/ls2080aqds/ls2080aqds.c
@@ -16,6 +16,7 @@
 #include <asm/io.h>
 #include <fdt_support.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <fsl-mc/fsl_mc.h>
 #include <env_internal.h>
diff --git a/board/freescale/ls2080ardb/ls2080ardb.c b/board/freescale/ls2080ardb/ls2080ardb.c
index 3a154564f3fe..a69f207c2130 100644
--- a/board/freescale/ls2080ardb/ls2080ardb.c
+++ b/board/freescale/ls2080ardb/ls2080ardb.c
@@ -12,6 +12,7 @@
 #include <netdev.h>
 #include <fsl_ifc.h>
 #include <fsl_ddr.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/board/freescale/lx2160a/eth_lx2160aqds.c b/board/freescale/lx2160a/eth_lx2160aqds.c
index e592ca12927a..74b31f9a8771 100644
--- a/board/freescale/lx2160a/eth_lx2160aqds.c
+++ b/board/freescale/lx2160a/eth_lx2160aqds.c
@@ -26,6 +26,7 @@
 #include <asm/u-boot.h>
 #include <fsl-mc/fsl_mc.h>
 #include <fsl-mc/ldpaa_wriop.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <linux/string.h>
 
diff --git a/board/freescale/lx2160a/eth_lx2160ardb.c b/board/freescale/lx2160a/eth_lx2160ardb.c
index ea2c8c5647a7..6c25108c8e3d 100644
--- a/board/freescale/lx2160a/eth_lx2160ardb.c
+++ b/board/freescale/lx2160a/eth_lx2160ardb.c
@@ -14,6 +14,7 @@
 #include <miiphy.h>
 #include <phy.h>
 #include <fm_eth.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/board/freescale/lx2160a/lx2160a.c b/board/freescale/lx2160a/lx2160a.c
index 313085256418..55a7e9b6f0be 100644
--- a/board/freescale/lx2160a/lx2160a.c
+++ b/board/freescale/lx2160a/lx2160a.c
@@ -21,6 +21,7 @@
 #include <asm/io.h>
 #include <fdt_support.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <linux/delay.h>
 #include <fsl-mc/fsl_mc.h>
diff --git a/board/freescale/mpc8541cds/law.c b/board/freescale/mpc8541cds/law.c
index 69f151b61513..c040449882b6 100644
--- a/board/freescale/mpc8541cds/law.c
+++ b/board/freescale/mpc8541cds/law.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
+#include <linux/kernel.h>
 
 /*
  * LAW(Local Access Window) configuration:
diff --git a/board/freescale/mpc8541cds/tlb.c b/board/freescale/mpc8541cds/tlb.c
index cde80667e9c7..e323cccb7769 100644
--- a/board/freescale/mpc8541cds/tlb.c
+++ b/board/freescale/mpc8541cds/tlb.c
@@ -8,6 +8,7 @@
 
 #include <asm/mmu.h>
 #include <asm/ppc.h>
+#include <linux/kernel.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/freescale/mpc8544ds/law.c b/board/freescale/mpc8544ds/law.c
index 52cec7fbb598..64254902a840 100644
--- a/board/freescale/mpc8544ds/law.c
+++ b/board/freescale/mpc8544ds/law.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
+#include <linux/kernel.h>
 
 struct law_entry law_table[] = {
 	SET_LAW(CONFIG_SYS_LBC_NONCACHE_BASE, LAW_SIZE_128M, LAW_TRGT_IF_LBC),
diff --git a/board/freescale/mpc8544ds/tlb.c b/board/freescale/mpc8544ds/tlb.c
index 05250d64849b..cc4180f38d57 100644
--- a/board/freescale/mpc8544ds/tlb.c
+++ b/board/freescale/mpc8544ds/tlb.c
@@ -8,6 +8,7 @@
 
 #include <asm/mmu.h>
 #include <asm/ppc.h>
+#include <linux/kernel.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/freescale/mpc8548cds/law.c b/board/freescale/mpc8548cds/law.c
index d19438899152..6f61ed95e8b3 100644
--- a/board/freescale/mpc8548cds/law.c
+++ b/board/freescale/mpc8548cds/law.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
+#include <linux/kernel.h>
 
 struct law_entry law_table[] = {
 	/* LBC window - maps 256M */
diff --git a/board/freescale/mpc8548cds/tlb.c b/board/freescale/mpc8548cds/tlb.c
index 59fea79d0ced..946359bb588a 100644
--- a/board/freescale/mpc8548cds/tlb.c
+++ b/board/freescale/mpc8548cds/tlb.c
@@ -8,6 +8,7 @@
 
 #include <asm/mmu.h>
 #include <asm/ppc.h>
+#include <linux/kernel.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/freescale/mpc8555cds/law.c b/board/freescale/mpc8555cds/law.c
index 69f151b61513..c040449882b6 100644
--- a/board/freescale/mpc8555cds/law.c
+++ b/board/freescale/mpc8555cds/law.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
+#include <linux/kernel.h>
 
 /*
  * LAW(Local Access Window) configuration:
diff --git a/board/freescale/mpc8555cds/tlb.c b/board/freescale/mpc8555cds/tlb.c
index cd72f9f110d3..6ea7021bd9f6 100644
--- a/board/freescale/mpc8555cds/tlb.c
+++ b/board/freescale/mpc8555cds/tlb.c
@@ -8,6 +8,7 @@
 
 #include <asm/mmu.h>
 #include <asm/ppc.h>
+#include <linux/kernel.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/freescale/mpc8568mds/law.c b/board/freescale/mpc8568mds/law.c
index c04c36b5d82c..01371480828c 100644
--- a/board/freescale/mpc8568mds/law.c
+++ b/board/freescale/mpc8568mds/law.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
+#include <linux/kernel.h>
 
 /*
  * LAW(Local Access Window) configuration:
diff --git a/board/freescale/mpc8568mds/tlb.c b/board/freescale/mpc8568mds/tlb.c
index ec22acfddf0a..dc0da95a3461 100644
--- a/board/freescale/mpc8568mds/tlb.c
+++ b/board/freescale/mpc8568mds/tlb.c
@@ -8,6 +8,7 @@
 
 #include <asm/mmu.h>
 #include <asm/ppc.h>
+#include <linux/kernel.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/freescale/mpc8569mds/law.c b/board/freescale/mpc8569mds/law.c
index 35cdd75d6e6a..a733dbee2d12 100644
--- a/board/freescale/mpc8569mds/law.c
+++ b/board/freescale/mpc8569mds/law.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
+#include <linux/kernel.h>
 
 /*
  * LAW(Local Access Window) configuration:
diff --git a/board/freescale/mpc8569mds/tlb.c b/board/freescale/mpc8569mds/tlb.c
index 21713f2f9da5..22fab6663328 100644
--- a/board/freescale/mpc8569mds/tlb.c
+++ b/board/freescale/mpc8569mds/tlb.c
@@ -8,6 +8,7 @@
 
 #include <asm/mmu.h>
 #include <asm/ppc.h>
+#include <linux/kernel.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/freescale/mpc8572ds/law.c b/board/freescale/mpc8572ds/law.c
index 10d1572c5de6..e2f35d87d23d 100644
--- a/board/freescale/mpc8572ds/law.c
+++ b/board/freescale/mpc8572ds/law.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
+#include <linux/kernel.h>
 
 struct law_entry law_table[] = {
 	SET_LAW(CONFIG_SYS_FLASH_BASE_PHYS, LAW_SIZE_256M, LAW_TRGT_IF_LBC),
diff --git a/board/freescale/mpc8572ds/tlb.c b/board/freescale/mpc8572ds/tlb.c
index 9558f3d1f7a2..f2fb4bfd2e36 100644
--- a/board/freescale/mpc8572ds/tlb.c
+++ b/board/freescale/mpc8572ds/tlb.c
@@ -8,6 +8,7 @@
 
 #include <asm/mmu.h>
 #include <asm/ppc.h>
+#include <linux/kernel.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/freescale/mpc8610hpcd/law.c b/board/freescale/mpc8610hpcd/law.c
index 7bf5e6815d7b..ddd875bb4890 100644
--- a/board/freescale/mpc8610hpcd/law.c
+++ b/board/freescale/mpc8610hpcd/law.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
+#include <linux/kernel.h>
 
 struct law_entry law_table[] = {
 #if !defined(CONFIG_SPD_EEPROM)
diff --git a/board/freescale/mpc8641hpcn/law.c b/board/freescale/mpc8641hpcn/law.c
index b73d66088318..2cd404080e66 100644
--- a/board/freescale/mpc8641hpcn/law.c
+++ b/board/freescale/mpc8641hpcn/law.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
+#include <linux/kernel.h>
 
 /*
  * LAW(Local Access Window) configuration:
diff --git a/board/freescale/mx23evk/spl_boot.c b/board/freescale/mx23evk/spl_boot.c
index 14e9b4a8634f..b7c67cc68831 100644
--- a/board/freescale/mx23evk/spl_boot.c
+++ b/board/freescale/mx23evk/spl_boot.c
@@ -12,6 +12,7 @@
 #include <asm/arch/iomux-mx23.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/kernel.h>
 
 #define	MUX_CONFIG_SSP1	(MXS_PAD_8MA | MXS_PAD_PULLUP)
 #define	MUX_CONFIG_EMI	(MXS_PAD_3V3 | MXS_PAD_12MA | MXS_PAD_PULLUP)
diff --git a/board/freescale/mx25pdk/mx25pdk.c b/board/freescale/mx25pdk/mx25pdk.c
index f20087328b3e..1532003ba0aa 100644
--- a/board/freescale/mx25pdk/mx25pdk.c
+++ b/board/freescale/mx25pdk/mx25pdk.c
@@ -20,6 +20,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <power/pmic.h>
 #include <fsl_pmic.h>
 #include <mc34704.h>
diff --git a/board/freescale/mx28evk/iomux.c b/board/freescale/mx28evk/iomux.c
index cc0c85885446..9a3f88abd36f 100644
--- a/board/freescale/mx28evk/iomux.c
+++ b/board/freescale/mx28evk/iomux.c
@@ -12,6 +12,7 @@
 #include <asm/arch/iomux-mx28.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/kernel.h>
 
 #define	MUX_CONFIG_SSP0	(MXS_PAD_3V3 | MXS_PAD_8MA | MXS_PAD_PULLUP)
 #define	MUX_CONFIG_GPMI	(MXS_PAD_3V3 | MXS_PAD_4MA | MXS_PAD_NOPULL)
diff --git a/board/freescale/mx35pdk/mx35pdk.c b/board/freescale/mx35pdk/mx35pdk.c
index 940ada7b1675..3ef1c781c169 100644
--- a/board/freescale/mx35pdk/mx35pdk.c
+++ b/board/freescale/mx35pdk/mx35pdk.c
@@ -19,6 +19,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/iomux-mx35.h>
 #include <i2c.h>
+#include <linux/kernel.h>
 #include <power/pmic.h>
 #include <fsl_pmic.h>
 #include <mmc.h>
diff --git a/board/freescale/mx51evk/mx51evk.c b/board/freescale/mx51evk/mx51evk.c
index 0a6561799014..d096948d4d3f 100644
--- a/board/freescale/mx51evk/mx51evk.c
+++ b/board/freescale/mx51evk/mx51evk.c
@@ -22,6 +22,7 @@
 #include <input.h>
 #include <mmc.h>
 #include <fsl_esdhc_imx.h>
+#include <linux/kernel.h>
 #include <power/pmic.h>
 #include <fsl_pmic.h>
 #include <mc13892.h>
diff --git a/board/freescale/mx53ard/mx53ard.c b/board/freescale/mx53ard/mx53ard.c
index cb4f063e95ae..325f17639760 100644
--- a/board/freescale/mx53ard/mx53ard.c
+++ b/board/freescale/mx53ard/mx53ard.c
@@ -20,6 +20,7 @@
 #include <mmc.h>
 #include <fsl_esdhc_imx.h>
 #include <asm/gpio.h>
+#include <linux/kernel.h>
 
 #define ETHERNET_INT		IMX_GPIO_NR(2, 31)
 
diff --git a/board/freescale/mx53evk/mx53evk.c b/board/freescale/mx53evk/mx53evk.c
index 37a946054082..1e43ea9cece4 100644
--- a/board/freescale/mx53evk/mx53evk.c
+++ b/board/freescale/mx53evk/mx53evk.c
@@ -20,6 +20,7 @@
 #include <i2c.h>
 #include <mmc.h>
 #include <fsl_esdhc_imx.h>
+#include <linux/kernel.h>
 #include <power/pmic.h>
 #include <fsl_pmic.h>
 #include <asm/gpio.h>
diff --git a/board/freescale/mx53loco/mx53loco.c b/board/freescale/mx53loco/mx53loco.c
index 67bb279104d3..02c6f76d3ab9 100644
--- a/board/freescale/mx53loco/mx53loco.c
+++ b/board/freescale/mx53loco/mx53loco.c
@@ -26,6 +26,7 @@
 #include <mmc.h>
 #include <fsl_esdhc_imx.h>
 #include <asm/gpio.h>
+#include <linux/kernel.h>
 #include <power/pmic.h>
 #include <dialog_pmic.h>
 #include <fsl_pmic.h>
diff --git a/board/freescale/mx53loco/mx53loco_video.c b/board/freescale/mx53loco/mx53loco_video.c
index 45a40a8959c9..475dc3e934fe 100644
--- a/board/freescale/mx53loco/mx53loco_video.c
+++ b/board/freescale/mx53loco/mx53loco_video.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <env.h>
 #include <stdio.h>
+#include <linux/kernel.h>
 #include <linux/list.h>
 #include <asm/gpio.h>
 #include <asm/arch/iomux-mx53.h>
diff --git a/board/freescale/mx53smd/mx53smd.c b/board/freescale/mx53smd/mx53smd.c
index 6a6549341407..24807f629167 100644
--- a/board/freescale/mx53smd/mx53smd.c
+++ b/board/freescale/mx53smd/mx53smd.c
@@ -19,6 +19,7 @@
 #include <mmc.h>
 #include <fsl_esdhc_imx.h>
 #include <asm/gpio.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/mx6qarm2/mx6qarm2.c b/board/freescale/mx6qarm2/mx6qarm2.c
index bdc2e2a146b3..d2f659d57329 100644
--- a/board/freescale/mx6qarm2/mx6qarm2.c
+++ b/board/freescale/mx6qarm2/mx6qarm2.c
@@ -21,6 +21,7 @@
 #include <miiphy.h>
 #include <netdev.h>
 #include <usb.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/mx6sabreauto/mx6sabreauto.c b/board/freescale/mx6sabreauto/mx6sabreauto.c
index 359f5bca17c6..2944220a9369 100644
--- a/board/freescale/mx6sabreauto/mx6sabreauto.c
+++ b/board/freescale/mx6sabreauto/mx6sabreauto.c
@@ -34,6 +34,7 @@
 #include <asm/mach-imx/video.h>
 #include <asm/arch/crm_regs.h>
 #include <pca953x.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <power/pmic.h>
 #include <power/pfuze100_pmic.h>
diff --git a/board/freescale/mx6sabresd/mx6sabresd.c b/board/freescale/mx6sabresd/mx6sabresd.c
index 01d6340c624c..6f85ba277243 100644
--- a/board/freescale/mx6sabresd/mx6sabresd.c
+++ b/board/freescale/mx6sabresd/mx6sabresd.c
@@ -32,6 +32,7 @@
 #include <asm/arch/sys_proto.h>
 #include <i2c.h>
 #include <input.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <power/pmic.h>
 #include <power/pfuze100_pmic.h>
diff --git a/board/freescale/mx6slevk/mx6slevk.c b/board/freescale/mx6slevk/mx6slevk.c
index 9e7a81d4bb52..da48f7cd6749 100644
--- a/board/freescale/mx6slevk/mx6slevk.c
+++ b/board/freescale/mx6slevk/mx6slevk.c
@@ -22,6 +22,7 @@
 #include <asm/io.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <common.h>
 #include <fsl_esdhc_imx.h>
diff --git a/board/freescale/mx6sllevk/mx6sllevk.c b/board/freescale/mx6sllevk/mx6sllevk.c
index 3887ec62848e..bd52d10b0ec9 100644
--- a/board/freescale/mx6sllevk/mx6sllevk.c
+++ b/board/freescale/mx6sllevk/mx6sllevk.c
@@ -18,6 +18,7 @@
 #include <asm/io.h>
 #include <common.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <mmc.h>
 #include <power/pmic.h>
diff --git a/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c b/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c
index aefc1ab2bd86..3e0e733bde3e 100644
--- a/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c
+++ b/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c
@@ -22,6 +22,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <common.h>
 #include <fsl_esdhc_imx.h>
diff --git a/board/freescale/mx6sxsabresd/mx6sxsabresd.c b/board/freescale/mx6sxsabresd/mx6sxsabresd.c
index ad3461c6661f..965a3808e737 100644
--- a/board/freescale/mx6sxsabresd/mx6sxsabresd.c
+++ b/board/freescale/mx6sxsabresd/mx6sxsabresd.c
@@ -23,6 +23,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <common.h>
 #include <fsl_esdhc_imx.h>
diff --git a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
index cb903798df54..044d1e97457f 100644
--- a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
+++ b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
@@ -27,6 +27,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <mmc.h>
 #include <netdev.h>
diff --git a/board/freescale/mx6ullevk/mx6ullevk.c b/board/freescale/mx6ullevk/mx6ullevk.c
index fbd14920519f..1d3628255475 100644
--- a/board/freescale/mx6ullevk/mx6ullevk.c
+++ b/board/freescale/mx6ullevk/mx6ullevk.c
@@ -19,6 +19,7 @@
 #include <common.h>
 #include <env.h>
 #include <fsl_esdhc_imx.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <mmc.h>
 #include <miiphy.h>
diff --git a/board/freescale/mx7dsabresd/mx7dsabresd.c b/board/freescale/mx7dsabresd/mx7dsabresd.c
index d0f2e5f99184..81c3ffd9f59f 100644
--- a/board/freescale/mx7dsabresd/mx7dsabresd.c
+++ b/board/freescale/mx7dsabresd/mx7dsabresd.c
@@ -16,6 +16,7 @@
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <common.h>
 #include <fsl_esdhc_imx.h>
diff --git a/board/freescale/mx7ulp_evk/mx7ulp_evk.c b/board/freescale/mx7ulp_evk/mx7ulp_evk.c
index da3f9e72d615..9cbb35424996 100644
--- a/board/freescale/mx7ulp_evk/mx7ulp_evk.c
+++ b/board/freescale/mx7ulp_evk/mx7ulp_evk.c
@@ -14,6 +14,7 @@
 #include <asm/arch/iomux.h>
 #include <asm/mach-imx/boot_mode.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/p1010rdb/law.c b/board/freescale/p1010rdb/law.c
index debf571482ba..3c7a936d9416 100644
--- a/board/freescale/p1010rdb/law.c
+++ b/board/freescale/p1010rdb/law.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
+#include <linux/kernel.h>
 
 struct law_entry law_table[] = {
 	SET_LAW(CONFIG_SYS_FLASH_BASE_PHYS, LAW_SIZE_32M, LAW_TRGT_IF_IFC),
diff --git a/board/freescale/p1010rdb/tlb.c b/board/freescale/p1010rdb/tlb.c
index 057ab4eb9be0..5304bf37670c 100644
--- a/board/freescale/p1010rdb/tlb.c
+++ b/board/freescale/p1010rdb/tlb.c
@@ -5,6 +5,7 @@
 
 #include <asm/mmu.h>
 #include <asm/ppc.h>
+#include <linux/kernel.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/freescale/p1023rdb/law.c b/board/freescale/p1023rdb/law.c
index 405fcd7b4902..c795fcd07eb0 100644
--- a/board/freescale/p1023rdb/law.c
+++ b/board/freescale/p1023rdb/law.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
+#include <linux/kernel.h>
 
 struct law_entry law_table[] = {
 	SET_LAW(CONFIG_SYS_NAND_BASE_PHYS, LAW_SIZE_1M, LAW_TRGT_IF_LBC),
diff --git a/board/freescale/p1023rdb/tlb.c b/board/freescale/p1023rdb/tlb.c
index be93c2c1bf30..f20d81f2e3cc 100644
--- a/board/freescale/p1023rdb/tlb.c
+++ b/board/freescale/p1023rdb/tlb.c
@@ -5,6 +5,7 @@
 
 #include <asm/mmu.h>
 #include <asm/ppc.h>
+#include <linux/kernel.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/freescale/p1_p2_rdb_pc/law.c b/board/freescale/p1_p2_rdb_pc/law.c
index 5f4d713ca569..181c09097398 100644
--- a/board/freescale/p1_p2_rdb_pc/law.c
+++ b/board/freescale/p1_p2_rdb_pc/law.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
+#include <linux/kernel.h>
 
 struct law_entry law_table[] = {
 	SET_LAW(CONFIG_SYS_CPLD_BASE_PHYS, LAW_SIZE_1M, LAW_TRGT_IF_LBC),
diff --git a/board/freescale/p1_p2_rdb_pc/tlb.c b/board/freescale/p1_p2_rdb_pc/tlb.c
index 8b7ae118b3f1..fb1e5eaab467 100644
--- a/board/freescale/p1_p2_rdb_pc/tlb.c
+++ b/board/freescale/p1_p2_rdb_pc/tlb.c
@@ -5,6 +5,7 @@
 
 #include <asm/mmu.h>
 #include <asm/ppc.h>
+#include <linux/kernel.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/freescale/t102xrdb/law.c b/board/freescale/t102xrdb/law.c
index 04a4239797c5..ecae4bf98283 100644
--- a/board/freescale/t102xrdb/law.c
+++ b/board/freescale/t102xrdb/law.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
+#include <linux/kernel.h>
 
 struct law_entry law_table[] = {
 #ifdef CONFIG_MTD_NOR_FLASH
diff --git a/board/freescale/t102xrdb/tlb.c b/board/freescale/t102xrdb/tlb.c
index 404033feeb17..10d07b69ef86 100644
--- a/board/freescale/t102xrdb/tlb.c
+++ b/board/freescale/t102xrdb/tlb.c
@@ -5,6 +5,7 @@
 
 #include <asm/mmu.h>
 #include <asm/ppc.h>
+#include <linux/kernel.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/freescale/t104xrdb/law.c b/board/freescale/t104xrdb/law.c
index 0f6b71a8c22f..519ed9c77cc8 100644
--- a/board/freescale/t104xrdb/law.c
+++ b/board/freescale/t104xrdb/law.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
+#include <linux/kernel.h>
 
 struct law_entry law_table[] = {
 #ifdef CONFIG_MTD_NOR_FLASH
diff --git a/board/freescale/t104xrdb/tlb.c b/board/freescale/t104xrdb/tlb.c
index 9661a8645852..6e954ebbefb7 100644
--- a/board/freescale/t104xrdb/tlb.c
+++ b/board/freescale/t104xrdb/tlb.c
@@ -5,6 +5,7 @@
 
 #include <asm/mmu.h>
 #include <asm/ppc.h>
+#include <linux/kernel.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/freescale/t208xqds/law.c b/board/freescale/t208xqds/law.c
index 40fdcf61c057..3040346c4e1b 100644
--- a/board/freescale/t208xqds/law.c
+++ b/board/freescale/t208xqds/law.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
+#include <linux/kernel.h>
 
 struct law_entry law_table[] = {
 	SET_LAW(CONFIG_SYS_FLASH_BASE_PHYS, LAW_SIZE_256M, LAW_TRGT_IF_IFC),
diff --git a/board/freescale/t208xqds/tlb.c b/board/freescale/t208xqds/tlb.c
index 884315373e1a..65e33201ab37 100644
--- a/board/freescale/t208xqds/tlb.c
+++ b/board/freescale/t208xqds/tlb.c
@@ -8,6 +8,7 @@
 
 #include <asm/mmu.h>
 #include <asm/ppc.h>
+#include <linux/kernel.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/freescale/t208xrdb/law.c b/board/freescale/t208xrdb/law.c
index d3b263f59d9d..a602170dd490 100644
--- a/board/freescale/t208xrdb/law.c
+++ b/board/freescale/t208xrdb/law.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
+#include <linux/kernel.h>
 
 struct law_entry law_table[] = {
 	SET_LAW(CONFIG_SYS_FLASH_BASE_PHYS, LAW_SIZE_256M, LAW_TRGT_IF_IFC),
diff --git a/board/freescale/t208xrdb/tlb.c b/board/freescale/t208xrdb/tlb.c
index 2cfe3b8ec9cc..d748aa98a04c 100644
--- a/board/freescale/t208xrdb/tlb.c
+++ b/board/freescale/t208xrdb/tlb.c
@@ -8,6 +8,7 @@
 
 #include <asm/mmu.h>
 #include <asm/ppc.h>
+#include <linux/kernel.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/freescale/t4rdb/law.c b/board/freescale/t4rdb/law.c
index 038f60565f7e..c52a5ff2e8a9 100644
--- a/board/freescale/t4rdb/law.c
+++ b/board/freescale/t4rdb/law.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
+#include <linux/kernel.h>
 
 struct law_entry law_table[] = {
 	SET_LAW(CONFIG_SYS_FLASH_BASE_PHYS, LAW_SIZE_256M, LAW_TRGT_IF_IFC),
diff --git a/board/freescale/t4rdb/tlb.c b/board/freescale/t4rdb/tlb.c
index bd27201140ac..b0460d8ce59b 100644
--- a/board/freescale/t4rdb/tlb.c
+++ b/board/freescale/t4rdb/tlb.c
@@ -5,6 +5,7 @@
 
 #include <asm/mmu.h>
 #include <asm/ppc.h>
+#include <linux/kernel.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/freescale/vf610twr/vf610twr.c b/board/freescale/vf610twr/vf610twr.c
index 342feb42d17a..3970f4b87a19 100644
--- a/board/freescale/vf610twr/vf610twr.c
+++ b/board/freescale/vf610twr/vf610twr.c
@@ -19,6 +19,7 @@
 #include <netdev.h>
 #include <i2c.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/friendlyarm/nanopi2/board.c b/board/friendlyarm/nanopi2/board.c
index c0fe2d546f63..c9c9beb86c78 100644
--- a/board/friendlyarm/nanopi2/board.c
+++ b/board/friendlyarm/nanopi2/board.c
@@ -14,6 +14,7 @@
 #endif
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <linux/kernel.h>
 
 #include <asm/arch/nexell.h>
 #include <asm/arch/nx_gpio.h>
diff --git a/board/friendlyarm/nanopi2/lcds.c b/board/friendlyarm/nanopi2/lcds.c
index 7303e53af925..5bec0684ad6a 100644
--- a/board/friendlyarm/nanopi2/lcds.c
+++ b/board/friendlyarm/nanopi2/lcds.c
@@ -9,6 +9,7 @@
 #include <fdtdec.h>
 #include <fdt_support.h>
 #include <asm/io.h>
+#include <linux/kernel.h>
 
 #include <asm/arch/nexell.h>
 #include <asm/arch/display.h>
diff --git a/board/gardena/smart-gateway-mt7688/board.c b/board/gardena/smart-gateway-mt7688/board.c
index 2e446f86753a..75677b11dd2d 100644
--- a/board/gardena/smart-gateway-mt7688/board.c
+++ b/board/gardena/smart-gateway-mt7688/board.c
@@ -15,6 +15,7 @@
 #include <net.h>
 #include <spi.h>
 #include <spi_flash.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/delay.h>
diff --git a/board/gateworks/gw_ventana/common.c b/board/gateworks/gw_ventana/common.c
index 299f92f68262..8e3c3e1ad7a8 100644
--- a/board/gateworks/gw_ventana/common.c
+++ b/board/gateworks/gw_ventana/common.c
@@ -19,6 +19,7 @@
 #include <hwconfig.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <power/pmic.h>
 #include <power/ltc3676_pmic.h>
 #include <power/pfuze100_pmic.h>
diff --git a/board/gateworks/gw_ventana/gw_ventana.c b/board/gateworks/gw_ventana/gw_ventana.c
index 800d9e76d38c..fe6a7efe3e32 100644
--- a/board/gateworks/gw_ventana/gw_ventana.c
+++ b/board/gateworks/gw_ventana/gw_ventana.c
@@ -41,6 +41,7 @@
 #include <pci.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <linux/string.h>
 #include <power/pmic.h>
diff --git a/board/gdsys/a38x/controlcenterdc.c b/board/gdsys/a38x/controlcenterdc.c
index 20c1a4fe3cce..8b16259adbef 100644
--- a/board/gdsys/a38x/controlcenterdc.c
+++ b/board/gdsys/a38x/controlcenterdc.c
@@ -18,6 +18,7 @@
 #include <asm/arch/cpu.h>
 #include <asm-generic/gpio.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 
 #include "../drivers/ddr/marvell/a38x/ddr3_init.h"
 #include "../arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec.h"
diff --git a/board/gdsys/a38x/dt_helpers.c b/board/gdsys/a38x/dt_helpers.c
index c859024a28bb..23525b7ed52e 100644
--- a/board/gdsys/a38x/dt_helpers.c
+++ b/board/gdsys/a38x/dt_helpers.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <i2c.h>
 #include <fdt_support.h>
+#include <stdbool.h>
 #include <asm-generic/gpio.h>
 #include <dm.h>
 
diff --git a/board/gdsys/a38x/dt_helpers.h b/board/gdsys/a38x/dt_helpers.h
index 245fadd0d791..30dbf298b69d 100644
--- a/board/gdsys/a38x/dt_helpers.h
+++ b/board/gdsys/a38x/dt_helpers.h
@@ -7,6 +7,7 @@
 #ifndef __DT_HELPERS_H
 #define __DT_HELPERS_H
 
+#include <stdbool.h>
 int fdt_disable_by_ofname(void *rw_fdt_blob, char *ofname);
 bool dm_i2c_simple_probe(struct udevice *bus, uint chip_addr);
 int request_gpio_by_name(struct gpio_desc *gpio, const char *gpio_dev_name,
diff --git a/board/gdsys/a38x/hre.c b/board/gdsys/a38x/hre.c
index 1e7d7e71f12e..93d8045d53b4 100644
--- a/board/gdsys/a38x/hre.c
+++ b/board/gdsys/a38x/hre.c
@@ -12,6 +12,7 @@
 #include <mmc.h>
 #include <stdio.h>
 #include <tpm-v1.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
 #include <u-boot/sha1.h>
diff --git a/board/gdsys/a38x/hre.h b/board/gdsys/a38x/hre.h
index da983aa452a9..154a02761dcb 100644
--- a/board/gdsys/a38x/hre.h
+++ b/board/gdsys/a38x/hre.h
@@ -7,6 +7,7 @@
 #ifndef __HRE_H
 #define __HRE_H
 
+#include <stdbool.h>
 struct key_program {
 	uint32_t magic;
 	uint32_t code_crc;
diff --git a/board/gdsys/a38x/ihs_phys.c b/board/gdsys/a38x/ihs_phys.c
index c4017a25af35..c784421a7018 100644
--- a/board/gdsys/a38x/ihs_phys.c
+++ b/board/gdsys/a38x/ihs_phys.c
@@ -7,6 +7,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include "ihs_phys.h"
diff --git a/board/gdsys/common/ch7301.h b/board/gdsys/common/ch7301.h
index e0e8a9e9d4db..c0f8fdf39366 100644
--- a/board/gdsys/common/ch7301.h
+++ b/board/gdsys/common/ch7301.h
@@ -7,6 +7,7 @@
 #ifndef _CH7301_H_
 #define _CH7301_H_
 
+#include <stdbool.h>
 int ch7301_probe(unsigned screen, bool power);
 
 #endif
diff --git a/board/gdsys/common/dp501.c b/board/gdsys/common/dp501.c
index ae82274a896f..55be6bc29577 100644
--- a/board/gdsys/common/dp501.c
+++ b/board/gdsys/common/dp501.c
@@ -158,5 +158,6 @@ int dp501_probe(unsigned screen, bool power)
 	return 0;
 }
 
+#include <stdbool.h>
 #include <stdio.h>
 #endif /* CONFIG_GDSYS_LEGACY_DRIVERS */
diff --git a/board/gdsys/common/dp501.h b/board/gdsys/common/dp501.h
index b98b54edc52d..9f3238638f1b 100644
--- a/board/gdsys/common/dp501.h
+++ b/board/gdsys/common/dp501.h
@@ -24,6 +24,7 @@
 #ifndef _DP501_H_
 #define _DP501_H_
 
+#include <stdbool.h>
 void dp501_powerup(u8 addr);
 void dp501_powerdown(u8 addr);
 int dp501_probe(unsigned screen, bool power);
diff --git a/board/gdsys/common/ioep-fpga.c b/board/gdsys/common/ioep-fpga.c
index a75de339b7a8..115f10c30c71 100644
--- a/board/gdsys/common/ioep-fpga.c
+++ b/board/gdsys/common/ioep-fpga.c
@@ -7,9 +7,12 @@
 #ifdef CONFIG_GDSYS_LEGACY_DRIVERS
 
 #include <common.h>
+#include <stdbool.h>
+#include <stdio.h>
 #include <string.h>
 #include <gdsys_fpga.h>
 #include <linux/bitops.h>
+#include <linux/string.h>
 
 enum pcb_video_type {
 	PCB_DVI_SL,
@@ -444,9 +447,6 @@ static int get_features(unsigned int fpga, struct fpga_features *features)
 	return 0;
 }
 
-#include <stdio.h>
-#include <linux/bitops.h>
-#include <linux/string.h>
 #endif
 
 bool ioep_fpga_has_osd(unsigned int fpga)
diff --git a/board/gdsys/common/ioep-fpga.h b/board/gdsys/common/ioep-fpga.h
index 53570b936a8e..947cdc450326 100644
--- a/board/gdsys/common/ioep-fpga.h
+++ b/board/gdsys/common/ioep-fpga.h
@@ -7,6 +7,7 @@
 #ifndef _IOEP_FPGA_H_
 #define _IOEP_FPGA_H_
 
+#include <stdbool.h>
 void ioep_fpga_print_info(unsigned int fpga);
 bool ioep_fpga_has_osd(unsigned int fpga);
 
diff --git a/board/gdsys/common/osd.c b/board/gdsys/common/osd.c
index fb9c7b8a6eca..a43031d513dd 100644
--- a/board/gdsys/common/osd.c
+++ b/board/gdsys/common/osd.c
@@ -504,6 +504,7 @@ U_BOOT_CMD(
 	") size_y(max. " __stringify(MAX_Y_CHARS) ")\n"
 );
 
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/string.h>
diff --git a/board/gdsys/common/osd.h b/board/gdsys/common/osd.h
index 4e8e53ab43cd..0367c59ef6b4 100644
--- a/board/gdsys/common/osd.h
+++ b/board/gdsys/common/osd.h
@@ -7,6 +7,7 @@
 #ifndef _OSD_H_
 #define _OSD_H_
 
+#include <stdbool.h>
 int ch7301_probe(unsigned screen, bool power);
 int osd_probe(unsigned screen);
 
diff --git a/board/gdsys/common/phy.c b/board/gdsys/common/phy.c
index 7b969853b3c0..cfa681c2e19e 100644
--- a/board/gdsys/common/phy.c
+++ b/board/gdsys/common/phy.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <stdio.h>
 #include <time.h>
+#include <linux/kernel.h>
 
 #include <miiphy.h>
 
diff --git a/board/gdsys/mpc8308/hrcon.c b/board/gdsys/mpc8308/hrcon.c
index ad231cace750..f0d01c1210d1 100644
--- a/board/gdsys/mpc8308/hrcon.c
+++ b/board/gdsys/mpc8308/hrcon.c
@@ -16,6 +16,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <pci.h>
diff --git a/board/gdsys/mpc8308/strider.c b/board/gdsys/mpc8308/strider.c
index 9fedf79eaa94..327e070aff22 100644
--- a/board/gdsys/mpc8308/strider.c
+++ b/board/gdsys/mpc8308/strider.c
@@ -16,6 +16,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <pci.h>
diff --git a/board/gdsys/p1022/controlcenterd-id.c b/board/gdsys/p1022/controlcenterd-id.c
index ddf419edab4c..713cb6456e80 100644
--- a/board/gdsys/p1022/controlcenterd-id.c
+++ b/board/gdsys/p1022/controlcenterd-id.c
@@ -25,6 +25,7 @@
 #include <stdio.h>
 #include <tpm-v1.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
 #include <u-boot/sha1.h>
diff --git a/board/gdsys/p1022/law.c b/board/gdsys/p1022/law.c
index 5214109943ab..e51934e4d8ba 100644
--- a/board/gdsys/p1022/law.c
+++ b/board/gdsys/p1022/law.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
+#include <linux/kernel.h>
 
 struct law_entry law_table[] = {
 	SET_LAW(CONFIG_SYS_ELBC_BASE_PHYS, LAW_SIZE_1M, LAW_TRGT_IF_LBC),
diff --git a/board/gdsys/p1022/tlb.c b/board/gdsys/p1022/tlb.c
index 10074d0df2f0..63b661ffe247 100644
--- a/board/gdsys/p1022/tlb.c
+++ b/board/gdsys/p1022/tlb.c
@@ -7,6 +7,7 @@
 
 #include <asm/mmu.h>
 #include <asm/ppc.h>
+#include <linux/kernel.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/ge/bx50v3/bx50v3.c b/board/ge/bx50v3/bx50v3.c
index 36489db79adb..a4ade1a9419e 100644
--- a/board/ge/bx50v3/bx50v3.c
+++ b/board/ge/bx50v3/bx50v3.c
@@ -18,6 +18,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <asm/gpio.h>
 #include <asm/mach-imx/iomux-v3.h>
diff --git a/board/ge/mx53ppd/mx53ppd.c b/board/ge/mx53ppd/mx53ppd.c
index a02c8a4de80f..bf813303ed41 100644
--- a/board/ge/mx53ppd/mx53ppd.c
+++ b/board/ge/mx53ppd/mx53ppd.c
@@ -22,6 +22,7 @@
 #include <env.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <asm/mach-imx/mxc_i2c.h>
 #include <asm/mach-imx/mx5_video.h>
diff --git a/board/ge/mx53ppd/mx53ppd_video.c b/board/ge/mx53ppd/mx53ppd_video.c
index 3c56120c0323..cf56983925f7 100644
--- a/board/ge/mx53ppd/mx53ppd_video.c
+++ b/board/ge/mx53ppd/mx53ppd_video.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <dm.h>
 #include <stdio.h>
+#include <linux/kernel.h>
 #include <linux/list.h>
 #include <asm/arch/iomux-mx53.h>
 #include <asm/mach-imx/video.h>
diff --git a/board/google/imx8mq_phanbell/imx8mq_phanbell.c b/board/google/imx8mq_phanbell/imx8mq_phanbell.c
index d0a740dd3f40..d78d2dced368 100644
--- a/board/google/imx8mq_phanbell/imx8mq_phanbell.c
+++ b/board/google/imx8mq_phanbell/imx8mq_phanbell.c
@@ -21,6 +21,7 @@
 #include <asm/mach-imx/gpio.h>
 #include <asm/arch/clock.h>
 #include <spl.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/google/imx8mq_phanbell/spl.c b/board/google/imx8mq_phanbell/spl.c
index 38045791f131..d309a72a52da 100644
--- a/board/google/imx8mq_phanbell/spl.c
+++ b/board/google/imx8mq_phanbell/spl.c
@@ -27,6 +27,7 @@
 #include <mmc.h>
 #include <spl.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/grinn/liteboard/board.c b/board/grinn/liteboard/board.c
index e6bcb08aadf1..986fbd6ef372 100644
--- a/board/grinn/liteboard/board.c
+++ b/board/grinn/liteboard/board.c
@@ -26,6 +26,7 @@
 #include <env.h>
 #include <fsl_esdhc_imx.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <linux/fb.h>
 #include <miiphy.h>
diff --git a/board/hisilicon/poplar/poplar.c b/board/hisilicon/poplar/poplar.c
index d0d8fa81b3bf..36c6c9292cc5 100644
--- a/board/hisilicon/poplar/poplar.c
+++ b/board/hisilicon/poplar/poplar.c
@@ -17,6 +17,7 @@
 #include <asm/armv8/mmu.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/imgtec/boston/ddr.c b/board/imgtec/boston/ddr.c
index 182f79b9182d..4e6afc13c66e 100644
--- a/board/imgtec/boston/ddr.c
+++ b/board/imgtec/boston/ddr.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <init.h>
 #include <asm/global_data.h>
+#include <linux/kernel.h>
 
 #include <asm/io.h>
 
diff --git a/board/imgtec/boston/dt.c b/board/imgtec/boston/dt.c
index 1d7a95073abe..2e899ec2ef25 100644
--- a/board/imgtec/boston/dt.c
+++ b/board/imgtec/boston/dt.c
@@ -7,6 +7,7 @@
 #include <fdt_support.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 int ft_board_setup(void *blob, struct bd_info *bd)
 {
diff --git a/board/imgtec/malta/malta.c b/board/imgtec/malta/malta.c
index 1edbf36ea903..dd64f9dffa94 100644
--- a/board/imgtec/malta/malta.c
+++ b/board/imgtec/malta/malta.c
@@ -18,6 +18,7 @@
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include <asm/addrspace.h>
diff --git a/board/imgtec/malta/superio.c b/board/imgtec/malta/superio.c
index aba11e25be31..cb5e0589a71a 100644
--- a/board/imgtec/malta/superio.c
+++ b/board/imgtec/malta/superio.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <asm/io.h>
+#include <linux/kernel.h>
 
 #define SIO_CONF_PORT		0x3f0
 #define SIO_DATA_PORT		0x3f1
diff --git a/board/inversepath/usbarmory/usbarmory.c b/board/inversepath/usbarmory/usbarmory.c
index 4eb30ae33746..1028f97ff3a7 100644
--- a/board/inversepath/usbarmory/usbarmory.c
+++ b/board/inversepath/usbarmory/usbarmory.c
@@ -26,6 +26,7 @@
 #include <mmc.h>
 #include <fsl_esdhc_imx.h>
 #include <asm/gpio.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/isee/igep003x/board.c b/board/isee/igep003x/board.c
index a3ae87537210..2f53925a9cfc 100644
--- a/board/isee/igep003x/board.c
+++ b/board/isee/igep003x/board.c
@@ -33,6 +33,7 @@
 #include <mtd_node.h>
 #include <asm/u-boot.h>
 #include <jffs2/load_kernel.h>
+#include <linux/kernel.h>
 #include "board.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/isee/igep00x0/igep00x0.c b/board/isee/igep00x0/igep00x0.c
index cb129dca03e6..3167b5c097f7 100644
--- a/board/isee/igep00x0/igep00x0.c
+++ b/board/isee/igep00x0/igep00x0.c
@@ -23,6 +23,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/rawnand.h>
 #include <linux/mtd/onenand.h>
diff --git a/board/keymile/common/ivm.c b/board/keymile/common/ivm.c
index 5aae1db2ad34..af4ccb023d4f 100644
--- a/board/keymile/common/ivm.c
+++ b/board/keymile/common/ivm.c
@@ -8,6 +8,7 @@
 #include <cli_hush.h>
 #include <env.h>
 #include <i2c.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/string.h>
diff --git a/board/keymile/common/qrio.c b/board/keymile/common/qrio.c
index b3b9c0691524..59c1a2eda10d 100644
--- a/board/keymile/common/qrio.c
+++ b/board/keymile/common/qrio.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <stdbool.h>
 #include <asm/ppc.h>
 #include <linux/bitops.h>
 
diff --git a/board/keymile/common/qrio.h b/board/keymile/common/qrio.h
index a04a73266fb8..ead6efcca51f 100644
--- a/board/keymile/common/qrio.h
+++ b/board/keymile/common/qrio.h
@@ -8,6 +8,7 @@
 #define __QRIO_H
 
 /* QRIO GPIO ports */
+#include <stdbool.h>
 #define QRIO_GPIO_A		0x40
 #define QRIO_GPIO_B		0x60
 
diff --git a/board/keymile/km_arm/km_arm.c b/board/keymile/km_arm/km_arm.c
index b7dd0243a5a1..560d3970a5b8 100644
--- a/board/keymile/km_arm/km_arm.c
+++ b/board/keymile/km_arm/km_arm.c
@@ -27,6 +27,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
 #include <asm/arch/mpp.h>
+#include <linux/kernel.h>
 
 #include "../common/common.h"
 
diff --git a/board/keymile/kmp204x/kmp204x.c b/board/keymile/kmp204x/kmp204x.c
index 0a977ca84ae2..ffb31b8a0c03 100644
--- a/board/keymile/kmp204x/kmp204x.c
+++ b/board/keymile/kmp204x/kmp204x.c
@@ -13,6 +13,7 @@
 #include <image.h>
 #include <init.h>
 #include <netdev.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/u-boot.h>
diff --git a/board/keymile/kmp204x/law.c b/board/keymile/kmp204x/law.c
index 2d83dfea15f8..a24344e59985 100644
--- a/board/keymile/kmp204x/law.c
+++ b/board/keymile/kmp204x/law.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
+#include <linux/kernel.h>
 
 struct law_entry law_table[] = {
 #ifdef CONFIG_SYS_BMAN_MEM_PHYS
diff --git a/board/keymile/kmp204x/pci.c b/board/keymile/kmp204x/pci.c
index 169c8bc6edba..7f92d6b322d3 100644
--- a/board/keymile/kmp204x/pci.c
+++ b/board/keymile/kmp204x/pci.c
@@ -10,6 +10,7 @@
 #include <command.h>
 #include <init.h>
 #include <pci.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/fsl_pci.h>
 #include <asm/u-boot.h>
diff --git a/board/keymile/kmp204x/tlb.c b/board/keymile/kmp204x/tlb.c
index ac9c9fb9021c..44a52bb866aa 100644
--- a/board/keymile/kmp204x/tlb.c
+++ b/board/keymile/kmp204x/tlb.c
@@ -11,6 +11,7 @@
 
 #include <asm/mmu.h>
 #include <asm/ppc.h>
+#include <linux/kernel.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/kobol/helios4/helios4.c b/board/kobol/helios4/helios4.c
index 560a2e393a45..4dd326402e88 100644
--- a/board/kobol/helios4/helios4.c
+++ b/board/kobol/helios4/helios4.c
@@ -16,6 +16,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 #include "../drivers/ddr/marvell/a38x/ddr3_init.h"
 #include <../serdes/a38x/high_speed_env_spec.h>
diff --git a/board/kosagi/novena/novena_spl.c b/board/kosagi/novena/novena_spl.c
index eddea6e29159..f79a2d46a698 100644
--- a/board/kosagi/novena/novena_spl.c
+++ b/board/kosagi/novena/novena_spl.c
@@ -25,6 +25,7 @@
 #include <spl.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 
 #include <asm/arch/mx6-ddr.h>
 
diff --git a/board/kosagi/novena/video.c b/board/kosagi/novena/video.c
index 8fc76d6347a5..f90a9f990c30 100644
--- a/board/kosagi/novena/video.c
+++ b/board/kosagi/novena/video.c
@@ -32,6 +32,7 @@
 #include <linux/input.h>
 #include <malloc.h>
 #include <stdio_dev.h>
+#include <linux/kernel.h>
 
 #include "novena.h"
 
diff --git a/board/lego/ev3/legoev3.c b/board/lego/ev3/legoev3.c
index 429dbbdcc458..f23e8563eb71 100644
--- a/board/lego/ev3/legoev3.c
+++ b/board/lego/ev3/legoev3.c
@@ -27,6 +27,7 @@
 #include <hwconfig.h>
 #include <asm/mach-types.h>
 #include <asm/setup.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/liebherr/display5/display5.c b/board/liebherr/display5/display5.c
index 727a4c036d3e..0ea25ab7ed10 100644
--- a/board/liebherr/display5/display5.c
+++ b/board/liebherr/display5/display5.c
@@ -29,6 +29,7 @@
 #include <i2c.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include <dm/platform_data/serial_mxc.h>
diff --git a/board/liebherr/xea/spl_xea.c b/board/liebherr/xea/spl_xea.c
index d88b75bb3a44..00c1c078f902 100644
--- a/board/liebherr/xea/spl_xea.c
+++ b/board/liebherr/xea/spl_xea.c
@@ -18,6 +18,7 @@
 #include <asm/arch/iomux-mx28.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/kernel.h>
 
 #define	MUX_CONFIG_LCD	(MXS_PAD_3V3 | MXS_PAD_4MA | MXS_PAD_NOPULL)
 #define	MUX_CONFIG_BOOT	(MXS_PAD_3V3 | MXS_PAD_PULLUP)
diff --git a/board/logicpd/imx6/imx6logic.c b/board/logicpd/imx6/imx6logic.c
index 0d53548dcb4b..3ecce8e7ab04 100644
--- a/board/logicpd/imx6/imx6logic.c
+++ b/board/logicpd/imx6/imx6logic.c
@@ -19,6 +19,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/crm_regs.h>
diff --git a/board/menlo/m53menlo/m53menlo.c b/board/menlo/m53menlo/m53menlo.c
index 41751f3d15c1..0a81b060b23f 100644
--- a/board/menlo/m53menlo/m53menlo.c
+++ b/board/menlo/m53menlo/m53menlo.c
@@ -37,6 +37,7 @@
 #include <netdev.h>
 #include <spl.h>
 #include <splash.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <usb/ehci-ci.h>
 #include <video_console.h>
diff --git a/board/mscc/common/spi.c b/board/mscc/common/spi.c
index 45b9649336db..b1a71f4c2928 100644
--- a/board/mscc/common/spi.c
+++ b/board/mscc/common/spi.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <spi.h>
 #include <linux/bitops.h>
diff --git a/board/mscc/ocelot/ocelot.c b/board/mscc/ocelot/ocelot.c
index d26b93f12bd9..1f7d9b4e5404 100644
--- a/board/mscc/ocelot/ocelot.c
+++ b/board/mscc/ocelot/ocelot.c
@@ -7,6 +7,7 @@
 #include <image.h>
 #include <init.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/addrspace.h>
diff --git a/board/novtech/meerkat96/meerkat96.c b/board/novtech/meerkat96/meerkat96.c
index 5211055edd65..9a94443db03b 100644
--- a/board/novtech/meerkat96/meerkat96.c
+++ b/board/novtech/meerkat96/meerkat96.c
@@ -14,6 +14,7 @@
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/io.h>
 #include <common.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/nvidia/cardhu/cardhu.c b/board/nvidia/cardhu/cardhu.c
index 6848e3400466..1fe5f8517314 100644
--- a/board/nvidia/cardhu/cardhu.c
+++ b/board/nvidia/cardhu/cardhu.c
@@ -12,6 +12,7 @@
 #include <asm/arch/gpio.h>
 #include <asm/gpio.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include "pinmux-config-cardhu.h"
 #include <i2c.h>
 
diff --git a/board/nvidia/dalmore/dalmore.c b/board/nvidia/dalmore/dalmore.c
index 21b00855eb57..ac8df9c38061 100644
--- a/board/nvidia/dalmore/dalmore.c
+++ b/board/nvidia/dalmore/dalmore.c
@@ -9,6 +9,7 @@
 #include <stdio.h>
 #include <asm/arch/pinmux.h>
 #include <asm/arch/gp_padctrl.h>
+#include <linux/kernel.h>
 #include "pinmux-config-dalmore.h"
 #include <i2c.h>
 
diff --git a/board/nvidia/jetson-tk1/jetson-tk1.c b/board/nvidia/jetson-tk1/jetson-tk1.c
index 06a8b390a0bf..b8fdcb3392a6 100644
--- a/board/nvidia/jetson-tk1/jetson-tk1.c
+++ b/board/nvidia/jetson-tk1/jetson-tk1.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <log.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <power/as3722.h>
 #include <power/pmic.h>
diff --git a/board/nvidia/nyan-big/nyan-big.c b/board/nvidia/nyan-big/nyan-big.c
index 71c71ed6ec23..3923f31f6a77 100644
--- a/board/nvidia/nyan-big/nyan-big.c
+++ b/board/nvidia/nyan-big/nyan-big.c
@@ -16,6 +16,7 @@
 #include <asm/arch-tegra/clk_rst.h>
 #include <asm/arch-tegra/pmc.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <power/as3722.h>
 #include <power/pmic.h>
 #include "pinmux-config-nyan-big.h"
diff --git a/board/nvidia/p2371-2180/p2371-2180.c b/board/nvidia/p2371-2180/p2371-2180.c
index e20a74943ff7..7cc163a467ee 100644
--- a/board/nvidia/p2371-2180/p2371-2180.c
+++ b/board/nvidia/p2371-2180/p2371-2180.c
@@ -13,6 +13,7 @@
 #include <stdio.h>
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <asm/arch/gpio.h>
 #include <asm/arch/pinmux.h>
diff --git a/board/nvidia/p2771-0000/p2771-0000.c b/board/nvidia/p2771-0000/p2771-0000.c
index c1d9b79d3e90..b5925f309323 100644
--- a/board/nvidia/p2771-0000/p2771-0000.c
+++ b/board/nvidia/p2771-0000/p2771-0000.c
@@ -11,6 +11,7 @@
 #include <net.h>
 #include <stdio.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <asm/arch-tegra/cboot.h>
 #include <linux/string.h>
diff --git a/board/nvidia/p3450-0000/p3450-0000.c b/board/nvidia/p3450-0000/p3450-0000.c
index f6751b65ab9f..868bab22ef4c 100644
--- a/board/nvidia/p3450-0000/p3450-0000.c
+++ b/board/nvidia/p3450-0000/p3450-0000.c
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <pca953x.h>
 #include <asm/arch-tegra/cboot.h>
diff --git a/board/nvidia/venice2/venice2.c b/board/nvidia/venice2/venice2.c
index d89bbe5ecce2..91380a4da8ca 100644
--- a/board/nvidia/venice2/venice2.c
+++ b/board/nvidia/venice2/venice2.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <asm/arch/gpio.h>
 #include <asm/arch/pinmux.h>
+#include <linux/kernel.h>
 #include "pinmux-config-venice2.h"
 
 /*
diff --git a/board/olimex/mx23_olinuxino/spl_boot.c b/board/olimex/mx23_olinuxino/spl_boot.c
index 248176c23cdc..31d148b885b8 100644
--- a/board/olimex/mx23_olinuxino/spl_boot.c
+++ b/board/olimex/mx23_olinuxino/spl_boot.c
@@ -11,6 +11,7 @@
 #include <asm/arch/iomux-mx23.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/kernel.h>
 
 #define	MUX_CONFIG_EMI	(MXS_PAD_3V3 | MXS_PAD_12MA | MXS_PAD_PULLUP)
 #define	MUX_CONFIG_SSP	(MXS_PAD_8MA | MXS_PAD_PULLUP)
diff --git a/board/phytec/pcl063/pcl063.c b/board/phytec/pcl063/pcl063.c
index f274519c0734..cabdaec4e862 100644
--- a/board/phytec/pcl063/pcl063.c
+++ b/board/phytec/pcl063/pcl063.c
@@ -20,6 +20,7 @@
 #include <miiphy.h>
 #include <netdev.h>
 #include <usb.h>
+#include <linux/kernel.h>
 #include <usb/ehci-ci.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/phytec/phycore_am335x_r2/board.c b/board/phytec/phycore_am335x_r2/board.c
index 19c1033c9d7a..19e15a7c73e9 100644
--- a/board/phytec/phycore_am335x_r2/board.c
+++ b/board/phytec/phycore_am335x_r2/board.c
@@ -19,6 +19,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 #include <power/tps65910.h>
 #include <jffs2/load_kernel.h>
 #include <mtd_node.h>
diff --git a/board/ppcag/bg0900/spl_boot.c b/board/ppcag/bg0900/spl_boot.c
index b46bc8939a38..7809c844df7d 100644
--- a/board/ppcag/bg0900/spl_boot.c
+++ b/board/ppcag/bg0900/spl_boot.c
@@ -11,6 +11,7 @@
 #include <asm/arch/iomux-mx28.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/kernel.h>
 
 #define	MUX_CONFIG_GPMI	(MXS_PAD_3V3 | MXS_PAD_4MA | MXS_PAD_NOPULL)
 #define	MUX_CONFIG_ENET	(MXS_PAD_3V3 | MXS_PAD_8MA | MXS_PAD_PULLUP)
diff --git a/board/qualcomm/dragonboard820c/dragonboard820c.c b/board/qualcomm/dragonboard820c/dragonboard820c.c
index dc70a8347f7f..f6115b8f42e4 100644
--- a/board/qualcomm/dragonboard820c/dragonboard820c.c
+++ b/board/qualcomm/dragonboard820c/dragonboard820c.c
@@ -13,6 +13,7 @@
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <linux/arm-smccc.h>
+#include <linux/kernel.h>
 #include <linux/psci.h>
 #include <common.h>
 #include <dm.h>
diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c
index 45586323f3af..c074726f1aee 100644
--- a/board/raspberrypi/rpi/rpi.c
+++ b/board/raspberrypi/rpi/rpi.c
@@ -28,6 +28,7 @@
 #endif
 #include <watchdog.h>
 #include <dm/pinctrl.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/renesas/alt/alt_spl.c b/board/renesas/alt/alt_spl.c
index 02e3ed3b563c..44a8d6c720e2 100644
--- a/board/renesas/alt/alt_spl.c
+++ b/board/renesas/alt/alt_spl.c
@@ -20,6 +20,7 @@
 #include <asm/gpio.h>
 #include <asm/arch/rmobile.h>
 #include <asm/arch/rcar-mstp.h>
+#include <linux/kernel.h>
 
 #include <spl.h>
 
diff --git a/board/renesas/blanche/blanche.c b/board/renesas/blanche/blanche.c
index e91cffaa8c5a..79bd867c9533 100644
--- a/board/renesas/blanche/blanche.c
+++ b/board/renesas/blanche/blanche.c
@@ -33,6 +33,7 @@
 #include <miiphy.h>
 #include <mmc.h>
 #include <netdev.h>
+#include <linux/kernel.h>
 #include "qos.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/renesas/gose/gose_spl.c b/board/renesas/gose/gose_spl.c
index a181ffd6dcf8..d4708c691b9e 100644
--- a/board/renesas/gose/gose_spl.c
+++ b/board/renesas/gose/gose_spl.c
@@ -20,6 +20,7 @@
 #include <asm/gpio.h>
 #include <asm/arch/rmobile.h>
 #include <asm/arch/rcar-mstp.h>
+#include <linux/kernel.h>
 
 #include <spl.h>
 
diff --git a/board/renesas/koelsch/koelsch_spl.c b/board/renesas/koelsch/koelsch_spl.c
index f5be6548738f..a690022f97bf 100644
--- a/board/renesas/koelsch/koelsch_spl.c
+++ b/board/renesas/koelsch/koelsch_spl.c
@@ -20,6 +20,7 @@
 #include <asm/gpio.h>
 #include <asm/arch/rmobile.h>
 #include <asm/arch/rcar-mstp.h>
+#include <linux/kernel.h>
 
 #include <spl.h>
 
diff --git a/board/renesas/lager/lager_spl.c b/board/renesas/lager/lager_spl.c
index 4dc47ecd5f73..7cb30ba7212d 100644
--- a/board/renesas/lager/lager_spl.c
+++ b/board/renesas/lager/lager_spl.c
@@ -20,6 +20,7 @@
 #include <asm/gpio.h>
 #include <asm/arch/rmobile.h>
 #include <asm/arch/rcar-mstp.h>
+#include <linux/kernel.h>
 
 #include <spl.h>
 
diff --git a/board/renesas/porter/porter_spl.c b/board/renesas/porter/porter_spl.c
index 9b4e787b5f16..d2a93fc54567 100644
--- a/board/renesas/porter/porter_spl.c
+++ b/board/renesas/porter/porter_spl.c
@@ -20,6 +20,7 @@
 #include <asm/gpio.h>
 #include <asm/arch/rmobile.h>
 #include <asm/arch/rcar-mstp.h>
+#include <linux/kernel.h>
 
 #include <spl.h>
 
diff --git a/board/renesas/silk/silk_spl.c b/board/renesas/silk/silk_spl.c
index 27f59ce9e4dc..b80c6b421ab2 100644
--- a/board/renesas/silk/silk_spl.c
+++ b/board/renesas/silk/silk_spl.c
@@ -20,6 +20,7 @@
 #include <asm/gpio.h>
 #include <asm/arch/rmobile.h>
 #include <asm/arch/rcar-mstp.h>
+#include <linux/kernel.h>
 
 #include <spl.h>
 
diff --git a/board/renesas/stout/stout_spl.c b/board/renesas/stout/stout_spl.c
index f3a5dbc8d0bb..10efd09139f2 100644
--- a/board/renesas/stout/stout_spl.c
+++ b/board/renesas/stout/stout_spl.c
@@ -20,6 +20,7 @@
 #include <asm/gpio.h>
 #include <asm/arch/rmobile.h>
 #include <asm/arch/rcar-mstp.h>
+#include <linux/kernel.h>
 
 #include <spl.h>
 
diff --git a/board/rockchip/evb_rk3308/evb_rk3308.c b/board/rockchip/evb_rk3308/evb_rk3308.c
index efe6363a4134..3ca4e925bbcd 100644
--- a/board/rockchip/evb_rk3308/evb_rk3308.c
+++ b/board/rockchip/evb_rk3308/evb_rk3308.c
@@ -7,6 +7,7 @@
 #include <adc.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/samsung/common/exynos5-dt-types.c b/board/samsung/common/exynos5-dt-types.c
index e2d5a7c9ba77..026fc4abf111 100644
--- a/board/samsung/common/exynos5-dt-types.c
+++ b/board/samsung/common/exynos5-dt-types.c
@@ -11,6 +11,7 @@
 #include <fdtdec.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/s2mps11.h>
diff --git a/board/samsung/common/misc.c b/board/samsung/common/misc.c
index 4438bff523e0..30a00892e0c3 100644
--- a/board/samsung/common/misc.c
+++ b/board/samsung/common/misc.c
@@ -13,6 +13,7 @@
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <samsung/misc.h>
 #include <errno.h>
diff --git a/board/sandisk/sansa_fuze_plus/sfp.c b/board/sandisk/sansa_fuze_plus/sfp.c
index b5052deb7acb..689cd799dd3b 100644
--- a/board/sandisk/sansa_fuze_plus/sfp.c
+++ b/board/sandisk/sansa_fuze_plus/sfp.c
@@ -23,6 +23,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/sandisk/sansa_fuze_plus/spl_boot.c b/board/sandisk/sansa_fuze_plus/spl_boot.c
index 37f866ccdc3a..59464877fbf6 100644
--- a/board/sandisk/sansa_fuze_plus/spl_boot.c
+++ b/board/sandisk/sansa_fuze_plus/spl_boot.c
@@ -11,6 +11,7 @@
 #include <asm/arch/iomux-mx23.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #define	MUX_CONFIG_EMI	(MXS_PAD_1V8 | MXS_PAD_12MA | MXS_PAD_PULLUP)
diff --git a/board/sbc8548/law.c b/board/sbc8548/law.c
index 97271ea6f66b..35679d5eec10 100644
--- a/board/sbc8548/law.c
+++ b/board/sbc8548/law.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
+#include <linux/kernel.h>
 
 /*
  * LAW(Local Access Window) configuration:
diff --git a/board/sbc8548/tlb.c b/board/sbc8548/tlb.c
index 31fd1539bf32..15223697b7be 100644
--- a/board/sbc8548/tlb.c
+++ b/board/sbc8548/tlb.c
@@ -8,6 +8,7 @@
 
 #include <asm/mmu.h>
 #include <asm/ppc.h>
+#include <linux/kernel.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/sbc8641d/law.c b/board/sbc8641d/law.c
index dc4696d123f4..84014611efae 100644
--- a/board/sbc8641d/law.c
+++ b/board/sbc8641d/law.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
+#include <linux/kernel.h>
 
 /*
  * LAW (Local Access Window) configuration:
diff --git a/board/schulercontrol/sc_sps_1/spl_boot.c b/board/schulercontrol/sc_sps_1/spl_boot.c
index 68758eb99701..a58fde351a18 100644
--- a/board/schulercontrol/sc_sps_1/spl_boot.c
+++ b/board/schulercontrol/sc_sps_1/spl_boot.c
@@ -12,6 +12,7 @@
 #include <asm/arch/iomux-mx28.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/kernel.h>
 
 #define	MUX_CONFIG_LED	(MXS_PAD_3V3 | MXS_PAD_4MA | MXS_PAD_NOPULL)
 #define	MUX_CONFIG_SSP0	(MXS_PAD_3V3 | MXS_PAD_12MA | MXS_PAD_PULLUP)
diff --git a/board/seco/common/mx6.c b/board/seco/common/mx6.c
index eaf7edf952dd..52d06d3638bd 100644
--- a/board/seco/common/mx6.c
+++ b/board/seco/common/mx6.c
@@ -29,6 +29,7 @@
 #include <micrel.h>
 #include <asm/mach-imx/mxc_i2c.h>
 #include <i2c.h>
+#include <linux/kernel.h>
 
 #define UART_PAD_CTRL  (PAD_CTL_PUS_100K_UP |			\
 	PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm |			\
diff --git a/board/siemens/capricorn/board.c b/board/siemens/capricorn/board.c
index ebd34939cb41..433fba067b96 100644
--- a/board/siemens/capricorn/board.c
+++ b/board/siemens/capricorn/board.c
@@ -31,6 +31,7 @@
 #endif
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "../common/factoryset.h"
 
diff --git a/board/siemens/rut/board.c b/board/siemens/rut/board.c
index 2da0560bd2be..7be23e97967b 100644
--- a/board/siemens/rut/board.c
+++ b/board/siemens/rut/board.c
@@ -38,6 +38,7 @@
 #include <watchdog.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "board.h"
 #include "../common/factoryset.h"
diff --git a/board/sipeed/maix/maix.c b/board/sipeed/maix/maix.c
index a859b086075c..6d38c382b5a4 100644
--- a/board/sipeed/maix/maix.c
+++ b/board/sipeed/maix/maix.c
@@ -9,6 +9,7 @@
 #include <fdt_support.h>
 #include <asm/io.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 phys_size_t get_effective_memsize(void)
 {
diff --git a/board/socrates/law.c b/board/socrates/law.c
index 840941b63e50..4103b204ab71 100644
--- a/board/socrates/law.c
+++ b/board/socrates/law.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
+#include <linux/kernel.h>
 
 /*
  * LAW(Local Access Window) configuration:
diff --git a/board/socrates/tlb.c b/board/socrates/tlb.c
index 392fbdfdab4e..2c82cf30c990 100644
--- a/board/socrates/tlb.c
+++ b/board/socrates/tlb.c
@@ -11,6 +11,7 @@
 
 #include <asm/mmu.h>
 #include <asm/ppc.h>
+#include <linux/kernel.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/softing/vining_2000/vining_2000.c b/board/softing/vining_2000/vining_2000.c
index 1c84539c1205..d72aee47ca9c 100644
--- a/board/softing/vining_2000/vining_2000.c
+++ b/board/softing/vining_2000/vining_2000.c
@@ -25,6 +25,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <common.h>
 #include <fsl_esdhc_imx.h>
diff --git a/board/solidrun/clearfog/clearfog.c b/board/solidrun/clearfog/clearfog.c
index 660962364f62..83e789b99f77 100644
--- a/board/solidrun/clearfog/clearfog.c
+++ b/board/solidrun/clearfog/clearfog.c
@@ -18,6 +18,7 @@
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "../common/tlv_data.h"
 
diff --git a/board/solidrun/common/tlv_data.c b/board/solidrun/common/tlv_data.c
index 1daf14812ef7..315faeb61404 100644
--- a/board/solidrun/common/tlv_data.c
+++ b/board/solidrun/common/tlv_data.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <compiler.h>
 #include <tlv_eeprom.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "tlv_data.h"
 
diff --git a/board/solidrun/common/tlv_data.h b/board/solidrun/common/tlv_data.h
index a1432e4b8e1d..2d05fa601be5 100644
--- a/board/solidrun/common/tlv_data.h
+++ b/board/solidrun/common/tlv_data.h
@@ -6,6 +6,7 @@
 #ifndef __BOARD_SR_COMMON_H_
 #define __BOARD_SR_COMMON_H_
 
+#include <stdbool.h>
 struct tlv_data {
 	/* Store product name of both SOM and carrier */
 	char tlv_product_name[2][32];
diff --git a/board/solidrun/mx6cuboxi/mx6cuboxi.c b/board/solidrun/mx6cuboxi/mx6cuboxi.c
index ad2d5d5998ca..40fbd85bde75 100644
--- a/board/solidrun/mx6cuboxi/mx6cuboxi.c
+++ b/board/solidrun/mx6cuboxi/mx6cuboxi.c
@@ -40,6 +40,7 @@
 #include <asm/arch/sys_proto.h>
 #include <spl.h>
 #include <usb.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <usb/ehci-ci.h>
 
diff --git a/board/somlabs/visionsom-6ull/visionsom-6ull.c b/board/somlabs/visionsom-6ull/visionsom-6ull.c
index 0146ba868db6..75e4dadd6e8a 100644
--- a/board/somlabs/visionsom-6ull/visionsom-6ull.c
+++ b/board/somlabs/visionsom-6ull/visionsom-6ull.c
@@ -23,6 +23,7 @@
 #include <fsl_esdhc_imx.h>
 #include <i2c.h>
 #include <miiphy.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <mmc.h>
 #include <netdev.h>
diff --git a/board/st/common/stm32mp_dfu.c b/board/st/common/stm32mp_dfu.c
index 2a0e9334e82d..0439e1d5bfe3 100644
--- a/board/st/common/stm32mp_dfu.c
+++ b/board/st/common/stm32mp_dfu.c
@@ -12,6 +12,7 @@
 #include <misc.h>
 #include <mtd.h>
 #include <mtd_node.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/arch/stm32prog.h>
diff --git a/board/st/common/stm32mp_mtdparts.c b/board/st/common/stm32mp_mtdparts.c
index b7dfd4cb741e..7a6db7c14cd0 100644
--- a/board/st/common/stm32mp_mtdparts.c
+++ b/board/st/common/stm32mp_mtdparts.c
@@ -10,6 +10,7 @@
 #include <env_internal.h>
 #include <mtd.h>
 #include <mtd_node.h>
+#include <stdbool.h>
 #include <tee.h>
 #include <asm/arch/stm32prog.h>
 #include <asm/arch/sys_proto.h>
diff --git a/board/st/common/stpmic1.c b/board/st/common/stpmic1.c
index 042476dc318e..7aa858517380 100644
--- a/board/st/common/stpmic1.c
+++ b/board/st/common/stpmic1.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/ddr.h>
diff --git a/board/st/stm32mp1/stm32mp1.c b/board/st/stm32mp1/stm32mp1.c
index 6669b4813058..9c3857a31b1c 100644
--- a/board/st/stm32mp1/stm32mp1.c
+++ b/board/st/stm32mp1/stm32mp1.c
@@ -43,6 +43,7 @@
 #include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/iopoll.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include <power/regulator.h>
diff --git a/board/synopsys/emsdp/emsdp.c b/board/synopsys/emsdp/emsdp.c
index 7a33440f273e..995514eab58f 100644
--- a/board/synopsys/emsdp/emsdp.c
+++ b/board/synopsys/emsdp/emsdp.c
@@ -12,6 +12,7 @@
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include <asm/arcregs.h>
diff --git a/board/synopsys/hsdk/env-lib.h b/board/synopsys/hsdk/env-lib.h
index 48c17c4d4f62..b745442775c1 100644
--- a/board/synopsys/hsdk/env-lib.h
+++ b/board/synopsys/hsdk/env-lib.h
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <config.h>
+#include <stdbool.h>
 #include <linux/kernel.h>
 
 enum env_type {
diff --git a/board/syteco/zmx25/zmx25.c b/board/syteco/zmx25/zmx25.c
index a3e5efad7c60..d3eea559a6c7 100644
--- a/board/syteco/zmx25/zmx25.c
+++ b/board/syteco/zmx25/zmx25.c
@@ -23,6 +23,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux-mx25.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/tbs/tbs2910/tbs2910.c b/board/tbs/tbs2910/tbs2910.c
index 56e0f378b6a9..83294a67a42c 100644
--- a/board/tbs/tbs2910/tbs2910.c
+++ b/board/tbs/tbs2910/tbs2910.c
@@ -22,6 +22,7 @@
 #include <asm/arch/crm_regs.h>
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/kernel.h>
 DECLARE_GLOBAL_DATA_PTR;
 
 #define UART_PAD_CTRL  (PAD_CTL_PUS_100K_UP |			\
diff --git a/board/technexion/pico-imx6/pico-imx6.c b/board/technexion/pico-imx6/pico-imx6.c
index 87a78f418431..24e8376d786e 100644
--- a/board/technexion/pico-imx6/pico-imx6.c
+++ b/board/technexion/pico-imx6/pico-imx6.c
@@ -25,6 +25,7 @@
 #include <asm/io.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <miiphy.h>
 #include <netdev.h>
diff --git a/board/technexion/pico-imx6ul/pico-imx6ul.c b/board/technexion/pico-imx6ul/pico-imx6ul.c
index fb3d9ee726a6..5ba16bcba585 100644
--- a/board/technexion/pico-imx6ul/pico-imx6ul.c
+++ b/board/technexion/pico-imx6ul/pico-imx6ul.c
@@ -24,6 +24,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <usb.h>
 #include <power/pmic.h>
diff --git a/board/technexion/pico-imx6ul/spl.c b/board/technexion/pico-imx6ul/spl.c
index 0c5b166b6539..55d19728af31 100644
--- a/board/technexion/pico-imx6ul/spl.c
+++ b/board/technexion/pico-imx6ul/spl.c
@@ -17,6 +17,7 @@
 #include <asm/mach-imx/boot_mode.h>
 #include <fsl_esdhc_imx.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <spl.h>
 #include <linux/string.h>
diff --git a/board/technexion/pico-imx7d/pico-imx7d.c b/board/technexion/pico-imx7d/pico-imx7d.c
index 5b59862be8a5..8cdc4f1fc34d 100644
--- a/board/technexion/pico-imx7d/pico-imx7d.c
+++ b/board/technexion/pico-imx7d/pico-imx7d.c
@@ -20,6 +20,7 @@
 #include <i2c.h>
 #include <miiphy.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <power/pmic.h>
 #include <power/pfuze3000_pmic.h>
 #include "../../freescale/common/pfuze.h"
diff --git a/board/technexion/pico-imx7d/spl.c b/board/technexion/pico-imx7d/spl.c
index 3739706dee1b..50604f196f2c 100644
--- a/board/technexion/pico-imx7d/spl.c
+++ b/board/technexion/pico-imx7d/spl.c
@@ -19,6 +19,7 @@
 #include <fsl_esdhc_imx.h>
 #include <spl.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #if defined(CONFIG_SPL_BUILD)
diff --git a/board/technexion/pico-imx8mq/pico-imx8mq.c b/board/technexion/pico-imx8mq/pico-imx8mq.c
index de1c7c52211f..2dc46c6186d6 100644
--- a/board/technexion/pico-imx8mq/pico-imx8mq.c
+++ b/board/technexion/pico-imx8mq/pico-imx8mq.c
@@ -24,6 +24,7 @@
 #include <asm/arch/clock.h>
 #include <linux/delay.h>
 #include <spl.h>
+#include <linux/kernel.h>
 #include <power/pmic.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/technexion/pico-imx8mq/spl.c b/board/technexion/pico-imx8mq/spl.c
index 048ffb48d3f6..e2d557732f66 100644
--- a/board/technexion/pico-imx8mq/spl.c
+++ b/board/technexion/pico-imx8mq/spl.c
@@ -23,6 +23,7 @@
 #include <fsl_esdhc_imx.h>
 #include <mmc.h>
 #include <spl.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include "lpddr4_timing.h"
diff --git a/board/technologic/ts4600/iomux.c b/board/technologic/ts4600/iomux.c
index 9bd3eacb0bdc..5ef69154254f 100644
--- a/board/technologic/ts4600/iomux.c
+++ b/board/technologic/ts4600/iomux.c
@@ -19,6 +19,7 @@
 #include <asm/arch/iomux-mx28.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/kernel.h>
 
 #define	MUX_CONFIG_SSP0	(MXS_PAD_3V3 | MXS_PAD_8MA | MXS_PAD_PULLUP)
 #define	MUX_CONFIG_EMI	(MXS_PAD_3V3 | MXS_PAD_12MA | MXS_PAD_NOPULL)
diff --git a/board/technologic/ts4800/ts4800.c b/board/technologic/ts4800/ts4800.c
index 37347949a38b..c2a28ccf63be 100644
--- a/board/technologic/ts4800/ts4800.c
+++ b/board/technologic/ts4800/ts4800.c
@@ -28,6 +28,7 @@
 #include <input.h>
 #include <fsl_esdhc_imx.h>
 #include <mc13892.h>
+#include <linux/kernel.h>
 
 #include <malloc.h>
 #include <netdev.h>
diff --git a/board/theadorable/fpga.c b/board/theadorable/fpga.c
index 904af3ed2e98..5a34244ea055 100644
--- a/board/theadorable/fpga.c
+++ b/board/theadorable/fpga.c
@@ -14,6 +14,7 @@
 #include <asm/arch/soc.h>
 #include <asm/arch-mvebu/spi.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "theadorable.h"
 
diff --git a/board/ti/am335x/board.c b/board/ti/am335x/board.c
index 17096159442a..21f90e0e7e89 100644
--- a/board/ti/am335x/board.c
+++ b/board/ti/am335x/board.c
@@ -17,6 +17,7 @@
 #include <net.h>
 #include <spl.h>
 #include <serial.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/arch/cpu.h>
diff --git a/board/ti/am43xx/board.c b/board/ti/am43xx/board.c
index 28bc5333c52d..e3e13421cd31 100644
--- a/board/ti/am43xx/board.c
+++ b/board/ti/am43xx/board.c
@@ -30,6 +30,7 @@
 #include <asm/arch/gpio.h>
 #include <asm/emif.h>
 #include <asm/omap_common.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "../common/board_detect.h"
 #include "board.h"
diff --git a/board/ti/am57xx/board.c b/board/ti/am57xx/board.c
index 808b99937031..4458ddec325d 100644
--- a/board/ti/am57xx/board.c
+++ b/board/ti/am57xx/board.c
@@ -37,6 +37,7 @@
 #include <usb.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/usb/gadget.h>
 #include <dwc3-uboot.h>
diff --git a/board/ti/am65x/evm.c b/board/ti/am65x/evm.c
index 5c2e8845057d..f64c7dd3a872 100644
--- a/board/ti/am65x/evm.c
+++ b/board/ti/am65x/evm.c
@@ -25,6 +25,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c
index fe8aeac9e46b..15b0d5149f82 100644
--- a/board/ti/beagle/beagle.c
+++ b/board/ti/beagle/beagle.c
@@ -23,6 +23,7 @@
 #ifdef CONFIG_LED_STATUS
 #include <status_led.h>
 #endif
+#include <stdbool.h>
 #include <stdio.h>
 #include <twl4030.h>
 #include <asm/global_data.h>
diff --git a/board/ti/common/board_detect.c b/board/ti/common/board_detect.c
index 5519d2d7e612..18b8a9671068 100644
--- a/board/ti/common/board_detect.c
+++ b/board/ti/common/board_detect.c
@@ -22,6 +22,7 @@
 #include <errno.h>
 #include <malloc.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/board/ti/common/board_detect.h b/board/ti/common/board_detect.h
index de7cb52dfcdd..d764d7a8d7a3 100644
--- a/board/ti/common/board_detect.h
+++ b/board/ti/common/board_detect.h
@@ -9,6 +9,7 @@
 #define __BOARD_DETECT_H
 
 /* TI EEPROM MAGIC Header identifier */
+#include <stdbool.h>
 #include <linux/bitops.h>
 #define TI_EEPROM_HEADER_MAGIC	0xEE3355AA
 #define TI_DEAD_EEPROM_MAGIC	0xADEAD12C
diff --git a/board/ti/dra7xx/evm.c b/board/ti/dra7xx/evm.c
index b283bb410399..baf47edc3046 100644
--- a/board/ti/dra7xx/evm.c
+++ b/board/ti/dra7xx/evm.c
@@ -23,6 +23,7 @@
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <asm/gpio.h>
 #include <usb.h>
diff --git a/board/ti/j721e/evm.c b/board/ti/j721e/evm.c
index bddffa049329..c70b58f0c8f2 100644
--- a/board/ti/j721e/evm.c
+++ b/board/ti/j721e/evm.c
@@ -27,6 +27,7 @@
 #include <asm/u-boot.h>
 #include <dm/uclass-internal.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/board/ti/ks2_evm/board.c b/board/ti/ks2_evm/board.c
index 1b9b79f65ae0..449073b6b7aa 100644
--- a/board/ti/ks2_evm/board.c
+++ b/board/ti/ks2_evm/board.c
@@ -11,6 +11,7 @@
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "board.h"
 #include <env.h>
diff --git a/board/ti/ks2_evm/board_k2g.c b/board/ti/ks2_evm/board_k2g.c
index e79497752a6f..eb115a818f46 100644
--- a/board/ti/ks2_evm/board_k2g.c
+++ b/board/ti/ks2_evm/board_k2g.c
@@ -11,6 +11,7 @@
 #include <hang.h>
 #include <image.h>
 #include <init.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/ti-common/keystone_net.h>
diff --git a/board/toradex/apalis-imx8/apalis-imx8.c b/board/toradex/apalis-imx8/apalis-imx8.c
index d46ab222f890..cae2b789bc71 100644
--- a/board/toradex/apalis-imx8/apalis-imx8.c
+++ b/board/toradex/apalis-imx8/apalis-imx8.c
@@ -9,6 +9,7 @@
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 #include <asm/arch/clock.h>
 #include <asm/arch/imx8-pins.h>
diff --git a/board/toradex/apalis-tk1/apalis-tk1.c b/board/toradex/apalis-tk1/apalis-tk1.c
index adc9bef31e7e..023c93c09298 100644
--- a/board/toradex/apalis-tk1/apalis-tk1.c
+++ b/board/toradex/apalis-tk1/apalis-tk1.c
@@ -19,6 +19,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include <power/as3722.h>
diff --git a/board/toradex/apalis_imx6/apalis_imx6.c b/board/toradex/apalis_imx6/apalis_imx6.c
index 62ae4dbf9225..6b319c043a6f 100644
--- a/board/toradex/apalis_imx6/apalis_imx6.c
+++ b/board/toradex/apalis_imx6/apalis_imx6.c
@@ -18,6 +18,7 @@
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include <ahci.h>
diff --git a/board/toradex/apalis_imx6/pf0100.c b/board/toradex/apalis_imx6/pf0100.c
index a720099f91e1..9247a7805446 100644
--- a/board/toradex/apalis_imx6/pf0100.c
+++ b/board/toradex/apalis_imx6/pf0100.c
@@ -17,6 +17,7 @@
 #include <asm/gpio.h>
 #include <asm/mach-imx/iomux-v3.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 
 #include "pf0100_otp.inc"
 #include "pf0100.h"
diff --git a/board/toradex/apalis_t30/apalis_t30.c b/board/toradex/apalis_t30/apalis_t30.c
index bdc0691755e7..49fb5d7a3701 100644
--- a/board/toradex/apalis_t30/apalis_t30.c
+++ b/board/toradex/apalis_t30/apalis_t30.c
@@ -20,6 +20,7 @@
 #include <pci_tegra.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include "../common/tdx-common.h"
 
 #include "pinmux-config-apalis_t30.h"
diff --git a/board/toradex/colibri-imx6ull/colibri-imx6ull.c b/board/toradex/colibri-imx6ull/colibri-imx6ull.c
index 81ec9e853267..0df73585edd4 100644
--- a/board/toradex/colibri-imx6ull/colibri-imx6ull.c
+++ b/board/toradex/colibri-imx6ull/colibri-imx6ull.c
@@ -8,6 +8,7 @@
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 
 #include <asm/arch/clock.h>
 #include <asm/arch/crm_regs.h>
diff --git a/board/toradex/colibri-imx8x/colibri-imx8x.c b/board/toradex/colibri-imx8x/colibri-imx8x.c
index d80762aec3c4..1a2a23337cfe 100644
--- a/board/toradex/colibri-imx8x/colibri-imx8x.c
+++ b/board/toradex/colibri-imx8x/colibri-imx8x.c
@@ -9,6 +9,7 @@
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 #include <asm/arch/clock.h>
 #include <asm/arch/imx8-pins.h>
diff --git a/board/toradex/colibri_imx6/colibri_imx6.c b/board/toradex/colibri_imx6/colibri_imx6.c
index 16bb57991375..99342e820e98 100644
--- a/board/toradex/colibri_imx6/colibri_imx6.c
+++ b/board/toradex/colibri_imx6/colibri_imx6.c
@@ -18,6 +18,7 @@
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include <asm/arch/clock.h>
diff --git a/board/toradex/colibri_imx6/pf0100.c b/board/toradex/colibri_imx6/pf0100.c
index caaf7553e5a1..d1bd0566b2aa 100644
--- a/board/toradex/colibri_imx6/pf0100.c
+++ b/board/toradex/colibri_imx6/pf0100.c
@@ -17,6 +17,7 @@
 #include <asm/gpio.h>
 #include <asm/mach-imx/iomux-v3.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 
 #include "pf0100_otp.inc"
 #include "pf0100.h"
diff --git a/board/toradex/colibri_imx7/colibri_imx7.c b/board/toradex/colibri_imx7/colibri_imx7.c
index 9d091f05501e..69a17c885502 100644
--- a/board/toradex/colibri_imx7/colibri_imx7.c
+++ b/board/toradex/colibri_imx7/colibri_imx7.c
@@ -26,6 +26,7 @@
 #include <jffs2/load_kernel.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <mmc.h>
 #include <miiphy.h>
diff --git a/board/toradex/colibri_t30/colibri_t30.c b/board/toradex/colibri_t30/colibri_t30.c
index 7a185ef8ec96..729369a96c03 100644
--- a/board/toradex/colibri_t30/colibri_t30.c
+++ b/board/toradex/colibri_t30/colibri_t30.c
@@ -16,6 +16,7 @@
 #include <i2c.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include "pinmux-config-colibri_t30.h"
 #include "../common/tdx-common.h"
 
diff --git a/board/toradex/colibri_vf/colibri_vf.c b/board/toradex/colibri_vf/colibri_vf.c
index 071c6b55b826..6361ffedb1fb 100644
--- a/board/toradex/colibri_vf/colibri_vf.c
+++ b/board/toradex/colibri_vf/colibri_vf.c
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 #include <asm/arch/clock.h>
 #include <asm/arch/crm_regs.h>
diff --git a/board/toradex/common/tdx-cfg-block.c b/board/toradex/common/tdx-cfg-block.c
index b0656501985e..4e4173c6d8e5 100644
--- a/board/toradex/common/tdx-cfg-block.c
+++ b/board/toradex/common/tdx-cfg-block.c
@@ -8,6 +8,7 @@
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "tdx-cfg-block.h"
 #include "tdx-eeprom.h"
diff --git a/board/toradex/verdin-imx8mm/spl.c b/board/toradex/verdin-imx8mm/spl.c
index 19e4bc02a3bd..6ece3136fda3 100644
--- a/board/toradex/verdin-imx8mm/spl.c
+++ b/board/toradex/verdin-imx8mm/spl.c
@@ -24,6 +24,7 @@
 #include <dm/uclass-internal.h>
 #include <hang.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <power/bd71837.h>
 #include <power/pmic.h>
diff --git a/board/tqc/tqma6/tqma6.c b/board/tqc/tqma6/tqma6.c
index 42dd0a8f173e..1b2855c9896e 100644
--- a/board/tqc/tqma6/tqma6.c
+++ b/board/tqc/tqma6/tqma6.c
@@ -26,6 +26,7 @@
 #include <asm/mach-imx/spi.h>
 #include <common.h>
 #include <fsl_esdhc_imx.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <i2c.h>
 #include <mmc.h>
diff --git a/board/tqc/tqma6/tqma6_mba6.c b/board/tqc/tqma6/tqma6_mba6.c
index e50bd9ecebd9..67e973ad7600 100644
--- a/board/tqc/tqma6/tqma6_mba6.c
+++ b/board/tqc/tqma6/tqma6_mba6.c
@@ -20,6 +20,7 @@
 #include <linux/errno.h>
 #include <asm/gpio.h>
 #include <asm/mach-imx/mxc_i2c.h>
+#include <linux/kernel.h>
 
 #include <common.h>
 #include <fsl_esdhc_imx.h>
diff --git a/board/tqc/tqma6/tqma6_wru4.c b/board/tqc/tqma6/tqma6_wru4.c
index 70b1626e9721..3d2bbb97dd26 100644
--- a/board/tqc/tqma6/tqma6_wru4.c
+++ b/board/tqc/tqma6/tqma6_wru4.c
@@ -24,6 +24,7 @@
 #include <asm/gpio.h>
 #include <asm/mach-imx/boot_mode.h>
 #include <asm/mach-imx/mxc_i2c.h>
+#include <linux/kernel.h>
 
 #include <common.h>
 #include <fsl_esdhc_imx.h>
diff --git a/board/udoo/neo/neo.c b/board/udoo/neo/neo.c
index 1853330e2ce3..4c004a755536 100644
--- a/board/udoo/neo/neo.c
+++ b/board/udoo/neo/neo.c
@@ -30,6 +30,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <common.h>
 #include <i2c.h>
diff --git a/board/variscite/dart_6ul/dart_6ul.c b/board/variscite/dart_6ul/dart_6ul.c
index ec1e1d262cfe..3f554381e7b1 100644
--- a/board/variscite/dart_6ul/dart_6ul.c
+++ b/board/variscite/dart_6ul/dart_6ul.c
@@ -20,6 +20,7 @@
 #include <miiphy.h>
 #include <netdev.h>
 #include <usb.h>
+#include <linux/kernel.h>
 #include <usb/ehci-ci.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/variscite/dart_6ul/spl.c b/board/variscite/dart_6ul/spl.c
index 7610182b725f..bf4c6bd573e9 100644
--- a/board/variscite/dart_6ul/spl.c
+++ b/board/variscite/dart_6ul/spl.c
@@ -15,6 +15,7 @@
 #include <asm/arch/crm_regs.h>
 #include <fsl_esdhc_imx.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #define UART_PAD_CTRL  (PAD_CTL_PKE | PAD_CTL_PUE |		\
diff --git a/board/varisys/common/sys_eeprom.c b/board/varisys/common/sys_eeprom.c
index 80cd3753cbf9..d285b0f36cdb 100644
--- a/board/varisys/common/sys_eeprom.c
+++ b/board/varisys/common/sys_eeprom.c
@@ -18,6 +18,7 @@
 #include <vsprintf.h>
 #include <linux/ctype.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
 
diff --git a/board/varisys/cyrus/law.c b/board/varisys/cyrus/law.c
index 8b1b118b5510..1cd9595246e3 100644
--- a/board/varisys/cyrus/law.c
+++ b/board/varisys/cyrus/law.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
+#include <linux/kernel.h>
 
 struct law_entry law_table[] = {
 	SET_LAW(CONFIG_SYS_LBC0_BASE_PHYS, LAW_SIZE_64K, LAW_TRGT_IF_LBC),
diff --git a/board/varisys/cyrus/tlb.c b/board/varisys/cyrus/tlb.c
index 381e898ad343..02f914b49772 100644
--- a/board/varisys/cyrus/tlb.c
+++ b/board/varisys/cyrus/tlb.c
@@ -6,6 +6,7 @@
 
 #include <asm/mmu.h>
 #include <asm/ppc.h>
+#include <linux/kernel.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/wandboard/wandboard.c b/board/wandboard/wandboard.c
index 8c44d6d18998..6a2c5718c66d 100644
--- a/board/wandboard/wandboard.c
+++ b/board/wandboard/wandboard.c
@@ -29,6 +29,7 @@
 #include <env.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <common.h>
 #include <miiphy.h>
diff --git a/board/warp/warp.c b/board/warp/warp.c
index a99e74b0c953..2d794b4344cd 100644
--- a/board/warp/warp.c
+++ b/board/warp/warp.c
@@ -21,6 +21,7 @@
 #include <asm/io.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <common.h>
 #include <watchdog.h>
diff --git a/board/warp7/warp7.c b/board/warp7/warp7.c
index db255f36788f..d696fcdaac57 100644
--- a/board/warp7/warp7.c
+++ b/board/warp7/warp7.c
@@ -23,6 +23,7 @@
 #include <netdev.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <power/pmic.h>
 #include <power/pfuze3000_pmic.h>
 #include "../freescale/common/pfuze.h"
diff --git a/board/xes/xpedite517x/ddr.c b/board/xes/xpedite517x/ddr.c
index 93bf7b9d5407..fc50740e2f16 100644
--- a/board/xes/xpedite517x/ddr.c
+++ b/board/xes/xpedite517x/ddr.c
@@ -10,6 +10,7 @@
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
 #include <log.h>
+#include <linux/kernel.h>
 
 void get_spd(ddr2_spd_eeprom_t *spd, u8 i2c_address)
 {
diff --git a/board/xes/xpedite517x/law.c b/board/xes/xpedite517x/law.c
index b82f9f0d3b11..bbe0f12bd6aa 100644
--- a/board/xes/xpedite517x/law.c
+++ b/board/xes/xpedite517x/law.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
+#include <linux/kernel.h>
 
 /*
  * Notes:
diff --git a/board/xes/xpedite520x/law.c b/board/xes/xpedite520x/law.c
index 10613ead3f21..4de72a0b76f9 100644
--- a/board/xes/xpedite520x/law.c
+++ b/board/xes/xpedite520x/law.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
+#include <linux/kernel.h>
 
 /*
  * Notes:
diff --git a/board/xes/xpedite520x/tlb.c b/board/xes/xpedite520x/tlb.c
index 4091e2a5d8ba..c3bdec6d3768 100644
--- a/board/xes/xpedite520x/tlb.c
+++ b/board/xes/xpedite520x/tlb.c
@@ -9,6 +9,7 @@
 
 #include <asm/mmu.h>
 #include <asm/ppc.h>
+#include <linux/kernel.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/xes/xpedite537x/ddr.c b/board/xes/xpedite537x/ddr.c
index f3454fe5790a..8ebb64793ba5 100644
--- a/board/xes/xpedite537x/ddr.c
+++ b/board/xes/xpedite537x/ddr.c
@@ -8,6 +8,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <asm/ppc.h>
+#include <linux/kernel.h>
 
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
diff --git a/board/xes/xpedite537x/law.c b/board/xes/xpedite537x/law.c
index a1f375900cbe..cc9360d497da 100644
--- a/board/xes/xpedite537x/law.c
+++ b/board/xes/xpedite537x/law.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
+#include <linux/kernel.h>
 
 /*
  * Notes:
diff --git a/board/xes/xpedite537x/tlb.c b/board/xes/xpedite537x/tlb.c
index 15c176a51b43..78fe9496d3a5 100644
--- a/board/xes/xpedite537x/tlb.c
+++ b/board/xes/xpedite537x/tlb.c
@@ -9,6 +9,7 @@
 
 #include <asm/mmu.h>
 #include <asm/ppc.h>
+#include <linux/kernel.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/xes/xpedite550x/law.c b/board/xes/xpedite550x/law.c
index 1e2d604d9d48..ce5658c4b113 100644
--- a/board/xes/xpedite550x/law.c
+++ b/board/xes/xpedite550x/law.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
+#include <linux/kernel.h>
 
 /*
  * Notes:
diff --git a/board/xes/xpedite550x/tlb.c b/board/xes/xpedite550x/tlb.c
index 5dc0c1e1460a..e99cd6806691 100644
--- a/board/xes/xpedite550x/tlb.c
+++ b/board/xes/xpedite550x/tlb.c
@@ -9,6 +9,7 @@
 
 #include <asm/mmu.h>
 #include <asm/ppc.h>
+#include <linux/kernel.h>
 
 struct fsl_e_tlb_entry tlb_table[] = {
 	/* TLB 0 - for temp stack in cache */
diff --git a/board/xilinx/common/board.c b/board/xilinx/common/board.c
index 83ff23dacdc1..19de01caf0c7 100644
--- a/board/xilinx/common/board.c
+++ b/board/xilinx/common/board.c
@@ -12,6 +12,7 @@
 #include <dm/uclass.h>
 #include <i2c.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 #include "board.h"
 
diff --git a/board/xilinx/microblaze-generic/microblaze-generic.c b/board/xilinx/microblaze-generic/microblaze-generic.c
index 385f5c752a57..7e21ffc1958f 100644
--- a/board/xilinx/microblaze-generic/microblaze-generic.c
+++ b/board/xilinx/microblaze-generic/microblaze-generic.c
@@ -20,6 +20,7 @@
 #include <dm/lists.h>
 #include <fdtdec.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/xilinx/zynq/cmds.c b/board/xilinx/zynq/cmds.c
index 00f2feba27b8..932c7c6f61e6 100644
--- a/board/xilinx/zynq/cmds.c
+++ b/board/xilinx/zynq/cmds.c
@@ -14,6 +14,7 @@
 #include <asm/arch/sys_proto.h>
 #include <malloc.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <u-boot/md5.h>
 #include <u-boot/rsa.h>
diff --git a/board/xilinx/zynqmp/cmds.c b/board/xilinx/zynqmp/cmds.c
index fe4ffba7fb63..52498147aef7 100644
--- a/board/xilinx/zynqmp/cmds.c
+++ b/board/xilinx/zynqmp/cmds.c
@@ -16,6 +16,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/io.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 static int do_zynqmp_verify_secure(struct cmd_tbl *cmdtp, int flag, int argc,
 				   char *const argv[])
diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c
index f185b17fc1b4..36208008d9b0 100644
--- a/board/xilinx/zynqmp/zynqmp.c
+++ b/board/xilinx/zynqmp/zynqmp.c
@@ -37,6 +37,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <linux/string.h>
 #include "../common/board.h"
diff --git a/cmd/abootimg.c b/cmd/abootimg.c
index 73b6053c65d9..3c6de9a8e80d 100644
--- a/cmd/abootimg.c
+++ b/cmd/abootimg.c
@@ -11,6 +11,7 @@
 #include <mapmem.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #define abootimg_addr() \
diff --git a/cmd/acpi.c b/cmd/acpi.c
index a11cf5c29ac1..c47cfdfd95b1 100644
--- a/cmd/acpi.c
+++ b/cmd/acpi.c
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <display_options.h>
 #include <mapmem.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <acpi/acpi_table.h>
diff --git a/cmd/adtimg.c b/cmd/adtimg.c
index e31a5b10b563..ea6230ba1f04 100644
--- a/cmd/adtimg.c
+++ b/cmd/adtimg.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #define OPT_INDEX	"--index"
diff --git a/cmd/aes.c b/cmd/aes.c
index db4cd114628b..b4a3dcc74c61 100644
--- a/cmd/aes.c
+++ b/cmd/aes.c
@@ -13,6 +13,7 @@
 #include <asm/byteorder.h>
 #include <linux/compiler.h>
 #include <mapmem.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 u32 aes_get_key_len(char *command)
diff --git a/cmd/avb.c b/cmd/avb.c
index 6cf9648670a4..08711e3240a9 100644
--- a/cmd/avb.c
+++ b/cmd/avb.c
@@ -13,6 +13,7 @@
 #include <mmc.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #define AVB_BOOTARGS	"avb_bootargs"
diff --git a/cmd/axi.c b/cmd/axi.c
index 68e8a06ae9ea..8a3a5f686692 100644
--- a/cmd/axi.c
+++ b/cmd/axi.c
@@ -19,6 +19,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 /* Currently selected AXI bus device */
 static struct udevice *axi_cur_bus;
diff --git a/cmd/bcb.c b/cmd/bcb.c
index d145856d14f2..e95111796c7b 100644
--- a/cmd/bcb.c
+++ b/cmd/bcb.c
@@ -14,6 +14,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 enum bcb_cmd {
diff --git a/cmd/bind.c b/cmd/bind.c
index 91202fbd4a96..795b33cd84de 100644
--- a/cmd/bind.c
+++ b/cmd/bind.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <command.h>
 #include <dm.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <dm/device-internal.h>
diff --git a/cmd/blkcache.c b/cmd/blkcache.c
index 632f73a58c0b..680bcd700a3e 100644
--- a/cmd/blkcache.c
+++ b/cmd/blkcache.c
@@ -11,6 +11,7 @@
 #include <part.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/kernel.h>
 
 static int blkc_show(struct cmd_tbl *cmdtp, int flag,
 		     int argc, char *const argv[])
diff --git a/cmd/bmp.c b/cmd/bmp.c
index a4c8c3f5c06c..d2ea39ed67a1 100644
--- a/cmd/bmp.c
+++ b/cmd/bmp.c
@@ -23,6 +23,7 @@
 #include <video.h>
 #include <vsprintf.h>
 #include <asm/byteorder.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 static int bmp_info (ulong addr);
diff --git a/cmd/bootcount.c b/cmd/bootcount.c
index a1ad62ad4191..d96e5099d246 100644
--- a/cmd/bootcount.c
+++ b/cmd/bootcount.c
@@ -4,6 +4,7 @@
 #include <command.h>
 #include <bootcount.h>
 #include <stdio.h>
+#include <linux/kernel.h>
 
 static int do_bootcount_print(struct cmd_tbl *cmdtp, int flag, int argc,
 			      char *const argv[])
diff --git a/cmd/bootm.c b/cmd/bootm.c
index 47272bf2cdc6..e253bdd9e927 100644
--- a/cmd/bootm.c
+++ b/cmd/bootm.c
@@ -22,6 +22,7 @@
 #include <linux/ctype.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <u-boot/zlib.h>
 #include <mapmem.h>
diff --git a/cmd/bootstage.c b/cmd/bootstage.c
index 3cf4138e2d42..3649e749cd90 100644
--- a/cmd/bootstage.c
+++ b/cmd/bootstage.c
@@ -8,6 +8,7 @@
 #include <command.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 static int do_bootstage_report(struct cmd_tbl *cmdtp, int flag, int argc,
diff --git a/cmd/clk.c b/cmd/clk.c
index 5946d527d35a..a2bfce12aed6 100644
--- a/cmd/clk.c
+++ b/cmd/clk.c
@@ -13,6 +13,7 @@
 #include <linux/clk-provider.h>
 #endif
 #include <stdio.h>
+#include <linux/kernel.h>
 
 #if defined(CONFIG_DM) && defined(CONFIG_CLK)
 static void show_clks(struct udevice *dev, int depth, int last_flag)
diff --git a/cmd/conitrace.c b/cmd/conitrace.c
index 0050831accfa..50efdcd26950 100644
--- a/cmd/conitrace.c
+++ b/cmd/conitrace.c
@@ -7,6 +7,7 @@
  */
 #include <common.h>
 #include <command.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <linux/delay.h>
 
diff --git a/cmd/cpu.c b/cmd/cpu.c
index 4066f764292b..a4b1ee5b5770 100644
--- a/cmd/cpu.c
+++ b/cmd/cpu.c
@@ -13,6 +13,7 @@
 #include <errno.h>
 #include <stdio.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 static const char *cpu_feature_name[CPU_FEAT_COUNT] = {
 	"L1 cache",
diff --git a/cmd/cros_ec.c b/cmd/cros_ec.c
index 38f89dd05f67..7f089d7644ff 100644
--- a/cmd/cros_ec.c
+++ b/cmd/cros_ec.c
@@ -16,6 +16,7 @@
 #include <vsprintf.h>
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 /* Note: depends on enum ec_current_image */
diff --git a/cmd/demo.c b/cmd/demo.c
index 39236e6955e0..52986bb8ee7d 100644
--- a/cmd/demo.c
+++ b/cmd/demo.c
@@ -14,6 +14,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/io.h>
+#include <linux/kernel.h>
 
 struct udevice *demo_dev;
 
diff --git a/cmd/dm.c b/cmd/dm.c
index 1dd19fe45b54..d606a8447c4f 100644
--- a/cmd/dm.c
+++ b/cmd/dm.c
@@ -15,6 +15,7 @@
 #include <asm/io.h>
 #include <dm/root.h>
 #include <dm/util.h>
+#include <linux/kernel.h>
 
 static int do_dm_dump_all(struct cmd_tbl *cmdtp, int flag, int argc,
 			  char *const argv[])
diff --git a/cmd/eeprom.c b/cmd/eeprom.c
index 5d6df466c1c2..d5b1ae536bba 100644
--- a/cmd/eeprom.c
+++ b/cmd/eeprom.c
@@ -25,6 +25,7 @@
 #include <eeprom.h>
 #include <i2c.h>
 #include <eeprom_layout.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/delay.h>
diff --git a/cmd/efi.c b/cmd/efi.c
index 762d4c1c3807..dd48101ae890 100644
--- a/cmd/efi.c
+++ b/cmd/efi.c
@@ -14,6 +14,7 @@
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 static const char *const type_name[] = {
diff --git a/cmd/efidebug.c b/cmd/efidebug.c
index ca3804c33154..cc7a00c2bf2e 100644
--- a/cmd/efidebug.c
+++ b/cmd/efidebug.c
@@ -18,6 +18,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/ctype.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #define BS systab.boottime
diff --git a/cmd/elf.c b/cmd/elf.c
index 3eaf1fe137dd..325fb19d8fca 100644
--- a/cmd/elf.c
+++ b/cmd/elf.c
@@ -22,6 +22,7 @@
 #include <linux/linkage.h>
 #endif
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 /* Allow ports to override the default behavior */
diff --git a/cmd/ethsw.c b/cmd/ethsw.c
index 83a229720deb..a9f43c0b09e8 100644
--- a/cmd/ethsw.c
+++ b/cmd/ethsw.c
@@ -15,6 +15,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 static const char *ethsw_name;
diff --git a/cmd/fdt.c b/cmd/fdt.c
index ba44460ea39d..8caff3e45ae6 100644
--- a/cmd/fdt.c
+++ b/cmd/fdt.c
@@ -14,6 +14,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/ctype.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/types.h>
 #include <asm/global_data.h>
diff --git a/cmd/fpga.c b/cmd/fpga.c
index b3ec2b25568e..d7e20a622d25 100644
--- a/cmd/fpga.c
+++ b/cmd/fpga.c
@@ -18,6 +18,7 @@
 #include <malloc.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 static long do_fpga_get_device(char *arg)
diff --git a/cmd/host.c b/cmd/host.c
index b06bbc922c93..50d953f7ff3d 100644
--- a/cmd/host.c
+++ b/cmd/host.c
@@ -13,6 +13,7 @@
 #include <vsprintf.h>
 #include <dm/device_compat.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 static int host_curr_device = -1;
 
diff --git a/cmd/i2c.c b/cmd/i2c.c
index b8f587a26faf..f21ed9ee354f 100644
--- a/cmd/i2c.c
+++ b/cmd/i2c.c
@@ -81,6 +81,7 @@
 #include <linux/compiler.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
 
diff --git a/cmd/ini.c b/cmd/ini.c
index 0c25c7ae5fea..7c3849bd50ba 100644
--- a/cmd/ini.c
+++ b/cmd/ini.c
@@ -17,6 +17,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/ctype.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #ifdef CONFIG_INI_MAX_LINE
diff --git a/cmd/io.c b/cmd/io.c
index d16bb4f8c618..62141846bab0 100644
--- a/cmd/io.c
+++ b/cmd/io.c
@@ -12,6 +12,7 @@
 #include <display_options.h>
 #include <vsprintf.h>
 #include <asm/io.h>
+#include <linux/kernel.h>
 
 /* Display values from last command */
 static ulong last_addr, last_size;
diff --git a/cmd/itest.c b/cmd/itest.c
index 0d0e1521953a..5824a7f18d4c 100644
--- a/cmd/itest.c
+++ b/cmd/itest.c
@@ -18,6 +18,7 @@
 #include <mapmem.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include <asm/io.h>
diff --git a/cmd/load.c b/cmd/load.c
index b2db540e8d1b..c550f7643a91 100644
--- a/cmd/load.c
+++ b/cmd/load.c
@@ -24,6 +24,7 @@
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/cmd/log.c b/cmd/log.c
index 88efad8a9f9f..d9c76ccdd2ba 100644
--- a/cmd/log.c
+++ b/cmd/log.c
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 static char log_fmt_chars[LOGF_COUNT] = "clFLfm";
diff --git a/cmd/mem.c b/cmd/mem.c
index 7e951323a7a9..634c35c149e9 100644
--- a/cmd/mem.c
+++ b/cmd/mem.c
@@ -32,6 +32,7 @@
 #include <linux/compiler.h>
 #include <linux/ctype.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/cmd/mii.c b/cmd/mii.c
index d1c377595e28..2db28bb8aceb 100644
--- a/cmd/mii.c
+++ b/cmd/mii.c
@@ -14,6 +14,7 @@
 #include <miiphy.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 typedef struct _MII_field_desc_t {
diff --git a/cmd/mmc.c b/cmd/mmc.c
index f76fbe28ea25..0e6dbd07f01a 100644
--- a/cmd/mmc.c
+++ b/cmd/mmc.c
@@ -16,6 +16,7 @@
 #include <image-sparse.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 static int curr_device = -1;
diff --git a/cmd/mtd.c b/cmd/mtd.c
index 70ba0d01c71e..24144546f9ab 100644
--- a/cmd/mtd.c
+++ b/cmd/mtd.c
@@ -19,6 +19,7 @@
 #include <dm/devres.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include <linux/ctype.h>
diff --git a/cmd/mvebu/bubt.c b/cmd/mvebu/bubt.c
index 43d0a5bb409f..f0c76c0b63d5 100644
--- a/cmd/mvebu/bubt.c
+++ b/cmd/mvebu/bubt.c
@@ -16,6 +16,7 @@
 #include <errno.h>
 #include <dm.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include <spi_flash.h>
diff --git a/cmd/nand.c b/cmd/nand.c
index f52343c42cdc..f2f29a326fe0 100644
--- a/cmd/nand.c
+++ b/cmd/nand.c
@@ -26,6 +26,7 @@
 #include <vsprintf.h>
 #include <asm/cache.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/mtd/mtd.h>
 #include <command.h>
 #include <console.h>
diff --git a/cmd/nvedit.c b/cmd/nvedit.c
index e450bb14a54b..2fbbe52371b0 100644
--- a/cmd/nvedit.c
+++ b/cmd/nvedit.c
@@ -40,6 +40,7 @@
 #include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
diff --git a/cmd/onenand.c b/cmd/onenand.c
index c71b8b98b9d3..252636012c1e 100644
--- a/cmd/onenand.c
+++ b/cmd/onenand.c
@@ -14,6 +14,7 @@
 #include <malloc.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/cmd/osd.c b/cmd/osd.c
index 6cccd8968c19..a7527f8a73d8 100644
--- a/cmd/osd.c
+++ b/cmd/osd.c
@@ -18,6 +18,7 @@
 #include <malloc.h>
 #include <vsprintf.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 /* Container for selected OSD device */
diff --git a/cmd/part.c b/cmd/part.c
index 796fb65baccc..69bac9824403 100644
--- a/cmd/part.c
+++ b/cmd/part.c
@@ -20,6 +20,7 @@
 #include <command.h>
 #include <env.h>
 #include <part.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/string.h>
diff --git a/cmd/pci.c b/cmd/pci.c
index ead55d46c21b..1ce1a7a36276 100644
--- a/cmd/pci.c
+++ b/cmd/pci.c
@@ -25,6 +25,7 @@
 #include <asm/io.h>
 #include <pci.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 struct pci_reg_info {
diff --git a/cmd/pinmux.c b/cmd/pinmux.c
index 84cbf564e8ad..1ca963501e13 100644
--- a/cmd/pinmux.c
+++ b/cmd/pinmux.c
@@ -11,6 +11,7 @@
 #include <dm/pinctrl.h>
 #include <dm/uclass-internal.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #define LIMIT_DEVNAME	30
diff --git a/cmd/pmc.c b/cmd/pmc.c
index 753d7b8fbf04..b73d68b63013 100644
--- a/cmd/pmc.c
+++ b/cmd/pmc.c
@@ -9,6 +9,7 @@
 #include <command.h>
 #include <dm.h>
 #include <stdio.h>
+#include <linux/kernel.h>
 #include <power/acpi_pmc.h>
 
 static int get_pmc_dev(struct udevice **devp)
diff --git a/cmd/pmic.c b/cmd/pmic.c
index 8e7956724f67..b26b13105582 100644
--- a/cmd/pmic.c
+++ b/cmd/pmic.c
@@ -11,6 +11,7 @@
 #include <vsprintf.h>
 #include <dm/uclass-internal.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <power/pmic.h>
 
 #define LIMIT_DEV	32
diff --git a/cmd/pxe.c b/cmd/pxe.c
index 8804faa170a9..43b074ab9769 100644
--- a/cmd/pxe.c
+++ b/cmd/pxe.c
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #include "pxe_utils.h"
 
diff --git a/cmd/pxe_utils.c b/cmd/pxe_utils.c
index af6071ed68a6..86f280bb1058 100644
--- a/cmd/pxe_utils.c
+++ b/cmd/pxe_utils.c
@@ -16,6 +16,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/ctype.h>
 #include <errno.h>
diff --git a/cmd/pxe_utils.h b/cmd/pxe_utils.h
index b5a7d2780116..1a25ca4e88e7 100644
--- a/cmd/pxe_utils.h
+++ b/cmd/pxe_utils.h
@@ -3,6 +3,7 @@
 #ifndef __PXE_UTILS_H
 #define __PXE_UTILS_H
 
+#include <stdbool.h>
 #include <linux/list.h>
 
 /*
diff --git a/cmd/qfw.c b/cmd/qfw.c
index 0cb6b85504d4..ca60a05f6b1a 100644
--- a/cmd/qfw.c
+++ b/cmd/qfw.c
@@ -10,6 +10,7 @@
 #include <qfw.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/kernel.h>
 
 /*
  * This function prepares kernel for zboot. It loads kernel data
diff --git a/cmd/regulator.c b/cmd/regulator.c
index e492da4f03c4..e4968b7b372d 100644
--- a/cmd/regulator.c
+++ b/cmd/regulator.c
@@ -11,6 +11,7 @@
 #include <vsprintf.h>
 #include <dm/uclass-internal.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include <power/regulator.h>
diff --git a/cmd/remoteproc.c b/cmd/remoteproc.c
index fbb40095aa67..48f0e4684ceb 100644
--- a/cmd/remoteproc.c
+++ b/cmd/remoteproc.c
@@ -11,6 +11,7 @@
 #include <remoteproc.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 /**
diff --git a/cmd/rtc.c b/cmd/rtc.c
index 66d18b5973f0..78af8534e4ab 100644
--- a/cmd/rtc.c
+++ b/cmd/rtc.c
@@ -10,6 +10,7 @@
 #include <rtc.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #define MAX_RTC_BYTES 32
diff --git a/cmd/sb.c b/cmd/sb.c
index 16e37c18cb5e..c1819d14c2b1 100644
--- a/cmd/sb.c
+++ b/cmd/sb.c
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/state.h>
+#include <linux/kernel.h>
 
 static int do_sb_handoff(struct cmd_tbl *cmdtp, int flag, int argc,
 			 char *const argv[])
diff --git a/cmd/sf.c b/cmd/sf.c
index c6a69422ebde..d57da5f8b0bc 100644
--- a/cmd/sf.c
+++ b/cmd/sf.c
@@ -21,6 +21,7 @@
 #include <vsprintf.h>
 #include <asm/cache.h>
 #include <jffs2/jffs2.h>
+#include <linux/kernel.h>
 #include <linux/mtd/mtd.h>
 #include <linux/string.h>
 
diff --git a/cmd/sound.c b/cmd/sound.c
index c01ee4bd4c9a..d3f3aecfc667 100644
--- a/cmd/sound.c
+++ b/cmd/sound.c
@@ -12,6 +12,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/cmd/spl.c b/cmd/spl.c
index f6b9f4744287..e1557cfc0cca 100644
--- a/cmd/spl.c
+++ b/cmd/spl.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/cmd/test.c b/cmd/test.c
index e95b8cb44067..d16f83ef1204 100644
--- a/cmd/test.c
+++ b/cmd/test.c
@@ -9,6 +9,7 @@
 #include <fs.h>
 #include <log.h>
 #include <vsprintf.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #define OP_INVALID	0
diff --git a/cmd/tlv_eeprom.c b/cmd/tlv_eeprom.c
index ca315dad0cc7..da052a9845ba 100644
--- a/cmd/tlv_eeprom.c
+++ b/cmd/tlv_eeprom.c
@@ -22,6 +22,7 @@
 #include <asm/global_data.h>
 #include <linux/ctype.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
 
diff --git a/cmd/tpm-v1.c b/cmd/tpm-v1.c
index 00d589fac072..0c96b10f06c1 100644
--- a/cmd/tpm-v1.c
+++ b/cmd/tpm-v1.c
@@ -12,6 +12,7 @@
 #include <asm/unaligned.h>
 #include <tpm-common.h>
 #include <tpm-v1.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "tpm-user-utils.h"
 
diff --git a/cmd/tpm-v2.c b/cmd/tpm-v2.c
index 56c5aca12c8a..2be09f547d58 100644
--- a/cmd/tpm-v2.c
+++ b/cmd/tpm-v2.c
@@ -14,6 +14,7 @@
 #include <tpm-v2.h>
 #include <vsprintf.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "tpm-user-utils.h"
 
diff --git a/cmd/tpm_test.c b/cmd/tpm_test.c
index 39d1ad2b4af9..3a345877a253 100644
--- a/cmd/tpm_test.c
+++ b/cmd/tpm_test.c
@@ -10,6 +10,7 @@
 #include <stdio.h>
 #include <time.h>
 #include <tpm-v1.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include "tpm-user-utils.h"
 
diff --git a/cmd/trace.c b/cmd/trace.c
index 0de1ac02ae2b..46b498700e90 100644
--- a/cmd/trace.c
+++ b/cmd/trace.c
@@ -11,6 +11,7 @@
 #include <trace.h>
 #include <vsprintf.h>
 #include <asm/io.h>
+#include <linux/kernel.h>
 
 static int get_args(int argc, char *const argv[], char **buff,
 		    size_t *buff_ptr, size_t *buff_size)
diff --git a/cmd/ubi.c b/cmd/ubi.c
index 54955f5ef2ff..80c175eec517 100644
--- a/cmd/ubi.c
+++ b/cmd/ubi.c
@@ -23,6 +23,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <dm/devres.h>
+#include <linux/kernel.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 #include <linux/err.h>
diff --git a/cmd/x86/fsp.c b/cmd/x86/fsp.c
index ef49b530b55e..933fe8af406f 100644
--- a/cmd/x86/fsp.c
+++ b/cmd/x86/fsp.c
@@ -8,6 +8,7 @@
 #include <stdio.h>
 #include <asm/fsp/fsp_support.h>
 #include <asm/global_data.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/cmd/x86/hob.c b/cmd/x86/hob.c
index 37f540521651..ed1c42f4934c 100644
--- a/cmd/x86/hob.c
+++ b/cmd/x86/hob.c
@@ -10,6 +10,7 @@
 #include <uuid.h>
 #include <asm/global_data.h>
 #include <asm/hob.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/cmd/x86/mtrr.c b/cmd/x86/mtrr.c
index 2f2e205d7100..a766eca7856d 100644
--- a/cmd/x86/mtrr.c
+++ b/cmd/x86/mtrr.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <command.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/msr.h>
diff --git a/cmd/ximg.c b/cmd/ximg.c
index 11acfaab4d9c..68f3d14c5b78 100644
--- a/cmd/ximg.c
+++ b/cmd/ximg.c
@@ -28,6 +28,7 @@
 #include <asm/byteorder.h>
 #include <asm/cache.h>
 #include <asm/io.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #ifndef CONFIG_SYS_XIMG_LEN
diff --git a/common/android_ab.c b/common/android_ab.c
index 4c58f7a75c85..5b0cb0b1d758 100644
--- a/common/android_ab.c
+++ b/common/android_ab.c
@@ -12,6 +12,7 @@
 #include <memalign.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
 #include <u-boot/crc.h>
diff --git a/common/autoboot.c b/common/autoboot.c
index 4ba7e25588ae..55bb2ee7adf6 100644
--- a/common/autoboot.c
+++ b/common/autoboot.c
@@ -18,6 +18,7 @@
 #include <memalign.h>
 #include <menu.h>
 #include <post.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <vsprintf.h>
diff --git a/common/avb_verify.c b/common/avb_verify.c
index 230d576835d7..4c825e8553be 100644
--- a/common/avb_verify.c
+++ b/common/avb_verify.c
@@ -14,6 +14,7 @@
 #include <stdio.h>
 #include <tee.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <tee/optee_ta_avb.h>
 
diff --git a/common/bloblist.c b/common/bloblist.c
index 20a29c82bb51..234c40e741a9 100644
--- a/common/bloblist.c
+++ b/common/bloblist.c
@@ -11,6 +11,7 @@
 #include <spl.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
 
diff --git a/common/board_f.c b/common/board_f.c
index 384e7a69c42c..c727f2015176 100644
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -57,6 +57,7 @@
 #include <asm/u-boot.h>
 #include <dm/root.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 /*
diff --git a/common/board_r.c b/common/board_r.c
index f272e1e46688..7a715afa0054 100644
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -27,6 +27,7 @@
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <u-boot/crc.h>
 /* TODO: can we just include all these headers whether needed or not? */
 #if defined(CONFIG_CMD_BEDBUG)
diff --git a/common/bootm.c b/common/bootm.c
index 8398054ab5c5..71ef3b44a1ee 100644
--- a/common/bootm.c
+++ b/common/bootm.c
@@ -26,6 +26,7 @@
 #include <usb.h>
 #endif
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #else
 #include "mkimage.h"
diff --git a/common/bootm_os.c b/common/bootm_os.c
index 2496a3cc6243..16c8a78722ad 100644
--- a/common/bootm_os.c
+++ b/common/bootm_os.c
@@ -18,6 +18,7 @@
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <malloc.h>
 #include <mapmem.h>
diff --git a/common/bootstage.c b/common/bootstage.c
index 9eaa65b009f5..ddb78a5dcea6 100644
--- a/common/bootstage.c
+++ b/common/bootstage.c
@@ -16,6 +16,7 @@
 #include <malloc.h>
 #include <sort.h>
 #include <spl.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
diff --git a/common/bouncebuf.c b/common/bouncebuf.c
index 519ca264992b..8051c016942e 100644
--- a/common/bouncebuf.c
+++ b/common/bouncebuf.c
@@ -13,6 +13,7 @@
 #include <bouncebuf.h>
 #include <asm/cache.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 static int addr_aligned(struct bounce_buffer *state)
diff --git a/common/cli.c b/common/cli.c
index 88053b587014..a83c606ee9eb 100644
--- a/common/cli.c
+++ b/common/cli.c
@@ -18,6 +18,7 @@
 #include <fdtdec.h>
 #include <hang.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/string.h>
diff --git a/common/cli_hush.c b/common/cli_hush.c
index 34facc8397eb..828b10db860e 100644
--- a/common/cli_hush.c
+++ b/common/cli_hush.c
@@ -90,6 +90,7 @@
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #endif
 #ifndef __U_BOOT__
diff --git a/common/console.c b/common/console.c
index c3007f575c20..489afe602ab6 100644
--- a/common/console.c
+++ b/common/console.c
@@ -16,6 +16,7 @@
 #include <mapmem.h>
 #include <os.h>
 #include <serial.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdio_dev.h>
 #include <exports.h>
diff --git a/common/dfu.c b/common/dfu.c
index 75fd3e088ef0..13a3591b0389 100644
--- a/common/dfu.c
+++ b/common/dfu.c
@@ -13,6 +13,7 @@
 #include <common.h>
 #include <command.h>
 #include <log.h>
+#include <stdbool.h>
 #include <time.h>
 #include <watchdog.h>
 #include <dfu.h>
diff --git a/common/dlmalloc.c b/common/dlmalloc.c
index 801d8633bae6..0f9e0d943785 100644
--- a/common/dlmalloc.c
+++ b/common/dlmalloc.c
@@ -3,6 +3,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #if CONFIG_IS_ENABLED(UNIT_TEST)
diff --git a/common/edid.c b/common/edid.c
index b047c7246300..a1b266e9c180 100644
--- a/common/edid.c
+++ b/common/edid.c
@@ -17,6 +17,7 @@
 #include <stdio.h>
 #include <linux/ctype.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 int edid_check_info(struct edid1_info *edid_info)
diff --git a/common/eeprom/eeprom_field.c b/common/eeprom/eeprom_field.c
index d67b0f4f0b81..7fd2a2fa4fad 100644
--- a/common/eeprom/eeprom_field.c
+++ b/common/eeprom/eeprom_field.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/string.h>
diff --git a/common/fdt_support.c b/common/fdt_support.c
index d506d580914a..230e599a44c5 100644
--- a/common/fdt_support.c
+++ b/common/fdt_support.c
@@ -15,6 +15,7 @@
 #include <stdio_dev.h>
 #include <vsprintf.h>
 #include <linux/ctype.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/types.h>
 #include <asm/global_data.h>
diff --git a/common/hash.c b/common/hash.c
index e44fdedc2fa4..91b2fc41eb57 100644
--- a/common/hash.c
+++ b/common/hash.c
@@ -23,6 +23,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
 #else
diff --git a/common/image-android-dt.c b/common/image-android-dt.c
index 74dcbdd1608e..456c4c584f0f 100644
--- a/common/image-android-dt.c
+++ b/common/image-android-dt.c
@@ -7,6 +7,7 @@
 #include <image-android-dt.h>
 #include <dt_table.h>
 #include <common.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <linux/libfdt.h>
 #include <mapmem.h>
diff --git a/common/image-android.c b/common/image-android.c
index 1615f2c415d5..a4dea76bde5d 100644
--- a/common/image-android.c
+++ b/common/image-android.c
@@ -14,6 +14,7 @@
 #include <asm/unaligned.h>
 #include <mapmem.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <linux/string.h>
 
diff --git a/common/image-cipher.c b/common/image-cipher.c
index d9a1230f26f5..7a9892b930c6 100644
--- a/common/image-cipher.c
+++ b/common/image-cipher.c
@@ -12,6 +12,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 DECLARE_GLOBAL_DATA_PTR;
 #endif /* !USE_HOSdTCC*/
diff --git a/common/image-fit-sig.c b/common/image-fit-sig.c
index e65e27f5109f..52e82777e3d0 100644
--- a/common/image-fit-sig.c
+++ b/common/image-fit-sig.c
@@ -13,6 +13,7 @@
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 DECLARE_GLOBAL_DATA_PTR;
 #endif /* !USE_HOSTCC*/
diff --git a/common/image-fit.c b/common/image-fit.c
index bc12b3fe0e6c..a0683072b43e 100644
--- a/common/image-fit.c
+++ b/common/image-fit.c
@@ -14,6 +14,7 @@
 #include <linux/libfdt.h>
 #include <u-boot/crc.h>
 #else
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/compiler.h>
diff --git a/common/image-sig.c b/common/image-sig.c
index 6cb5bedc8a95..aef02638d79f 100644
--- a/common/image-sig.c
+++ b/common/image-sig.c
@@ -13,6 +13,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <asm/global_data.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 DECLARE_GLOBAL_DATA_PTR;
 #endif /* !USE_HOSTCC*/
diff --git a/common/image.c b/common/image.c
index 565a5ebeed59..341807059ee9 100644
--- a/common/image.c
+++ b/common/image.c
@@ -19,6 +19,7 @@
 #include <vsprintf.h>
 #include <asm/cache.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
 #include <watchdog.h>
diff --git a/common/init/board_init.c b/common/init/board_init.c
index 319d59b51641..d3059c46bdcf 100644
--- a/common/init/board_init.c
+++ b/common/init/board_init.c
@@ -10,6 +10,7 @@
 #include <bootstage.h>
 #include <init.h>
 #include <asm/global_data.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/common/iotrace.c b/common/iotrace.c
index 63d0cca3a004..d342e317d632 100644
--- a/common/iotrace.c
+++ b/common/iotrace.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <mapmem.h>
+#include <stdbool.h>
 #include <time.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/common/lcd.c b/common/lcd.c
index f71477c2963c..b4352229c5b2 100644
--- a/common/lcd.c
+++ b/common/lcd.c
@@ -18,6 +18,7 @@
 #include <asm/cache.h>
 #include <init.h>
 #include <asm/global_data.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/types.h>
 #include <stdio_dev.h>
diff --git a/common/lcd_console.c b/common/lcd_console.c
index 6c70b88e10ee..fe2ef2f5b9e6 100644
--- a/common/lcd_console.c
+++ b/common/lcd_console.c
@@ -17,6 +17,7 @@
 #include <bmp_logo.h>
 #endif
 #include <vsprintf.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 static struct console_t cons;
diff --git a/common/log.c b/common/log.c
index 79e23aacece5..c8d13365caa3 100644
--- a/common/log.c
+++ b/common/log.c
@@ -14,6 +14,7 @@
 #include <asm/global_data.h>
 #include <dm/uclass.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/common/malloc_simple.c b/common/malloc_simple.c
index 805b044515fc..b8b9d7608cd5 100644
--- a/common/malloc_simple.c
+++ b/common/malloc_simple.c
@@ -13,6 +13,7 @@
 #include <mapmem.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/common/spl/spl.c b/common/spl/spl.c
index 671bda67ed7e..51d777f4ee7a 100644
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -25,6 +25,7 @@
 #include <nand.h>
 #include <fat.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
 #include <version.h>
diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c
index 4d588a85c8fe..7a65035ba869 100644
--- a/common/spl/spl_fit.c
+++ b/common/spl/spl_fit.c
@@ -13,6 +13,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <spl.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
diff --git a/common/spl/spl_sata.c b/common/spl/spl_sata.c
index 599243f1823f..33311c2813ad 100644
--- a/common/spl/spl_sata.c
+++ b/common/spl/spl_sata.c
@@ -18,6 +18,7 @@
 #include <fat.h>
 #include <image.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #ifndef CONFIG_SYS_SATA_FAT_BOOT_PARTITION
 #define CONFIG_SYS_SATA_FAT_BOOT_PARTITION	1
diff --git a/common/spl/spl_spi.c b/common/spl/spl_spi.c
index 1121813abf05..0974e9e6f5db 100644
--- a/common/spl/spl_spi.c
+++ b/common/spl/spl_spi.c
@@ -18,6 +18,7 @@
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/common/splash.c b/common/splash.c
index 174f82486eb7..575003e65613 100644
--- a/common/splash.c
+++ b/common/splash.c
@@ -28,6 +28,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/errno.h>
+#include <linux/kernel.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 9c5c285b76ed..be7e90c38809 100644
--- a/common/splash_source.c
+++ b/common/splash_source.c
@@ -24,6 +24,7 @@
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/common/update.c b/common/update.c
index ab92824c70f4..f5041c6171a8 100644
--- a/common/update.c
+++ b/common/update.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <image.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/errno.h>
diff --git a/common/usb.c b/common/usb.c
index 16b51e8f4c7c..98e7582c2a27 100644
--- a/common/usb.c
+++ b/common/usb.c
@@ -31,6 +31,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <memalign.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/processor.h>
 #include <linux/compiler.h>
diff --git a/common/usb_hub.c b/common/usb_hub.c
index 46d074f0b55d..5abbb1b0a400 100644
--- a/common/usb_hub.c
+++ b/common/usb_hub.c
@@ -37,6 +37,7 @@
 #include <linux/ctype.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/list.h>
 #include <asm/byteorder.h>
 #ifdef CONFIG_SANDBOX
diff --git a/common/usb_kbd.c b/common/usb_kbd.c
index 3fafbda40fd4..b2967330b698 100644
--- a/common/usb_kbd.c
+++ b/common/usb_kbd.c
@@ -20,6 +20,7 @@
 #include <watchdog.h>
 #include <asm/byteorder.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include <usb.h>
diff --git a/common/xyzModem.c b/common/xyzModem.c
index 46dbf7c7ee60..732548f4f2d3 100644
--- a/common/xyzModem.c
+++ b/common/xyzModem.c
@@ -22,6 +22,7 @@
  *==========================================================================
  */
 #include <common.h>
+#include <stdbool.h>
 #include <time.h>
 #include <vsprintf.h>
 #include <xyzModem.h>
diff --git a/drivers/adc/adc-uclass.c b/drivers/adc/adc-uclass.c
index fa88040126f7..f4d108477d70 100644
--- a/drivers/adc/adc-uclass.c
+++ b/drivers/adc/adc-uclass.c
@@ -8,6 +8,7 @@
 #include <errno.h>
 #include <div64.h>
 #include <dm.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <dm/lists.h>
 #include <dm/device-internal.h>
diff --git a/drivers/adc/meson-saradc.c b/drivers/adc/meson-saradc.c
index 785d37c238f5..cf2d0c144083 100644
--- a/drivers/adc/meson-saradc.c
+++ b/drivers/adc/meson-saradc.c
@@ -18,6 +18,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/math64.h>
 #include <linux/bitfield.h>
 #include <linux/printk.h>
diff --git a/drivers/adc/stm32-adc-core.c b/drivers/adc/stm32-adc-core.c
index a3d255d786c4..e4e348120616 100644
--- a/drivers/adc/stm32-adc-core.c
+++ b/drivers/adc/stm32-adc-core.c
@@ -12,6 +12,7 @@
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <power/regulator.h>
 #include "stm32-adc-core.h"
 
diff --git a/drivers/adc/stm32-adc.c b/drivers/adc/stm32-adc.c
index 8c90bb711ca8..d0ac0a8c0a9b 100644
--- a/drivers/adc/stm32-adc.c
+++ b/drivers/adc/stm32-adc.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <adc.h>
 #include <dm.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index e31e280f5416..1424708b59cf 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -16,6 +16,7 @@
 #include <time.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include <command.h>
diff --git a/drivers/ata/fsl_sata.c b/drivers/ata/fsl_sata.c
index 884ce4449d4d..f90835758b73 100644
--- a/drivers/ata/fsl_sata.c
+++ b/drivers/ata/fsl_sata.c
@@ -22,6 +22,7 @@
 #include <sata.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "fsl_sata.h"
 
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index 849b6892ba85..b459ac5aa3bf 100644
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -52,6 +52,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/io.h>
+#include <linux/kernel.h>
 #include <linux/mbus.h>
 #include <linux/string.h>
 
diff --git a/drivers/axi/axi-emul-uclass.c b/drivers/axi/axi-emul-uclass.c
index fb56b824513f..e4ba71f21f1b 100644
--- a/drivers/axi/axi-emul-uclass.c
+++ b/drivers/axi/axi-emul-uclass.c
@@ -11,6 +11,7 @@
 #include <dm/device-internal.h>
 #include <asm/axi.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 int axi_sandbox_get_emul(struct udevice *bus, ulong address,
 			 enum axi_size_t size, struct udevice **emulp)
diff --git a/drivers/axi/sandbox_store.c b/drivers/axi/sandbox_store.c
index 72a4191946e3..7342230eb7f3 100644
--- a/drivers/axi/sandbox_store.c
+++ b/drivers/axi/sandbox_store.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 /**
  * struct sandbox_store_priv - Private data structure of a AXI store device
diff --git a/drivers/bios_emulator/atibios.c b/drivers/bios_emulator/atibios.c
index d49839542a55..b57d512ebb7d 100644
--- a/drivers/bios_emulator/atibios.c
+++ b/drivers/bios_emulator/atibios.c
@@ -51,6 +51,7 @@
 #include <errno.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vbe.h>
 #include <linux/delay.h>
diff --git a/drivers/bios_emulator/x86emu/prim_ops.c b/drivers/bios_emulator/x86emu/prim_ops.c
index 5f6c795fb7ff..7fe968cb817c 100644
--- a/drivers/bios_emulator/x86emu/prim_ops.c
+++ b/drivers/bios_emulator/x86emu/prim_ops.c
@@ -98,6 +98,7 @@
 ****************************************************************************/
 
 #include <common.h>
+#include <linux/kernel.h>
 
 #define PRIM_OPS_NO_REDEFINE_ASM
 #include "x86emu/x86emui.h"
diff --git a/drivers/board/board-uclass.c b/drivers/board/board-uclass.c
index 57a28f065bfc..7a83862563cb 100644
--- a/drivers/board/board-uclass.c
+++ b/drivers/board/board-uclass.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <board.h>
+#include <stdbool.h>
 #include <linux/errno.h>
 
 int board_get(struct udevice **devp)
diff --git a/drivers/board/gazerbeam.c b/drivers/board/gazerbeam.c
index 7be676fff58c..8c0a70d15b65 100644
--- a/drivers/board/gazerbeam.c
+++ b/drivers/board/gazerbeam.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <asm/gpio.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #include "gazerbeam.h"
 
diff --git a/drivers/board/sandbox.c b/drivers/board/sandbox.c
index 5de827504188..0ed52a773969 100644
--- a/drivers/board/sandbox.c
+++ b/drivers/board/sandbox.c
@@ -9,6 +9,7 @@
 #include <board.h>
 #include <vsprintf.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #include "sandbox.h"
 
diff --git a/drivers/bootcount/bootcount.c b/drivers/bootcount/bootcount.c
index 0a2fb50efeae..82de6f720690 100644
--- a/drivers/bootcount/bootcount.c
+++ b/drivers/bootcount/bootcount.c
@@ -9,6 +9,7 @@
 #include <asm/cache.h>
 #include <linux/compiler.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #if !defined(CONFIG_DM_BOOTCOUNT)
 /* Now implement the generic default functions */
diff --git a/drivers/clk/altera/clk-agilex.c b/drivers/clk/altera/clk-agilex.c
index e6c01dd7b32f..358201e3d986 100644
--- a/drivers/clk/altera/clk-agilex.c
+++ b/drivers/clk/altera/clk-agilex.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <clk-uclass.h>
diff --git a/drivers/clk/altera/clk-arria10.c b/drivers/clk/altera/clk-arria10.c
index 85300e611785..53e28ed76d0a 100644
--- a/drivers/clk/altera/clk-arria10.c
+++ b/drivers/clk/altera/clk-arria10.c
@@ -15,6 +15,7 @@
 #include <dm/util.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include <asm/arch/clock_manager.h>
diff --git a/drivers/clk/analogbits/wrpll-cln28hpc.c b/drivers/clk/analogbits/wrpll-cln28hpc.c
index 291a23d93f70..664643003779 100644
--- a/drivers/clk/analogbits/wrpll-cln28hpc.c
+++ b/drivers/clk/analogbits/wrpll-cln28hpc.c
@@ -24,6 +24,7 @@
 #include <linux/bug.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/log2.h>
 #include <linux/math64.h>
 #include <linux/clk/analogbits-wrpll-cln28hpc.h>
diff --git a/drivers/clk/aspeed/clk_ast2500.c b/drivers/clk/aspeed/clk_ast2500.c
index e837e0cd19a7..038898abbb0e 100644
--- a/drivers/clk/aspeed/clk_ast2500.c
+++ b/drivers/clk/aspeed/clk_ast2500.c
@@ -15,6 +15,7 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 /*
  * MAC Clock Delay settings, taken from Aspeed SDK
diff --git a/drivers/clk/at91/clk-generated.c b/drivers/clk/at91/clk-generated.c
index a65cadee3729..4948f02c42fd 100644
--- a/drivers/clk/at91/clk-generated.c
+++ b/drivers/clk/at91/clk-generated.c
@@ -12,6 +12,7 @@
 #include <asm/global_data.h>
 #include <linux/err.h>
 #include <linux/io.h>
+#include <linux/kernel.h>
 #include <mach/at91_pmc.h>
 #include "pmc.h"
 
diff --git a/drivers/clk/at91/clk-usb.c b/drivers/clk/at91/clk-usb.c
index 416a5007f685..3b5fedd9bbe7 100644
--- a/drivers/clk/at91/clk-usb.c
+++ b/drivers/clk/at91/clk-usb.c
@@ -11,6 +11,7 @@
 #include <dm/device.h>
 #include <linux/err.h>
 #include <linux/io.h>
+#include <linux/kernel.h>
 #include <mach/at91_pmc.h>
 #include "pmc.h"
 
diff --git a/drivers/clk/at91/pmc.c b/drivers/clk/at91/pmc.c
index 91e57b387770..4b22c8192294 100644
--- a/drivers/clk/at91/pmc.c
+++ b/drivers/clk/at91/pmc.c
@@ -8,6 +8,7 @@
 #include <clk-uclass.h>
 #include <dm.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 #include <dm/lists.h>
 #include <dm/util.h>
diff --git a/drivers/clk/clk-divider.c b/drivers/clk/clk-divider.c
index d2039512b216..fb5029c40a30 100644
--- a/drivers/clk/clk-divider.c
+++ b/drivers/clk/clk-divider.c
@@ -22,6 +22,7 @@
 #include <linux/clk-provider.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/log2.h>
 #include <div64.h>
 #include <clk.h>
diff --git a/drivers/clk/clk-hsdk-cgu.c b/drivers/clk/clk-hsdk-cgu.c
index 6f4cd1ecf2ab..c2b33b41f84e 100644
--- a/drivers/clk/clk-hsdk-cgu.c
+++ b/drivers/clk/clk-hsdk-cgu.c
@@ -20,6 +20,7 @@
 #include <linux/errno.h>
 #include <linux/io.h>
 #include <asm/arcregs.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 
 #include <dt-bindings/clock/snps,hsdk-cgu.h>
diff --git a/drivers/clk/clk-ti-sci.c b/drivers/clk/clk-ti-sci.c
index 0f31ee73d9e3..45ce1995d033 100644
--- a/drivers/clk/clk-ti-sci.c
+++ b/drivers/clk/clk-ti-sci.c
@@ -17,6 +17,7 @@
 #include <dm/device_compat.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/soc/ti/ti_sci_protocol.h>
 #include <k3-avs.h>
 
diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
index 5dac14c185e5..f2d0981e1913 100644
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <clk-uclass.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <dm/device.h>
 #include <dm/uclass.h>
diff --git a/drivers/clk/clk_sandbox.c b/drivers/clk/clk_sandbox.c
index d1e2c0dab316..ad68c6174074 100644
--- a/drivers/clk/clk_sandbox.c
+++ b/drivers/clk/clk_sandbox.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <asm/clk.h>
 #include <linux/errno.h>
 
diff --git a/drivers/clk/clk_sandbox_ccf.c b/drivers/clk/clk_sandbox_ccf.c
index b282735c1d6e..b528c635552e 100644
--- a/drivers/clk/clk_sandbox_ccf.c
+++ b/drivers/clk/clk_sandbox_ccf.c
@@ -18,6 +18,7 @@
 #include <sandbox-clk.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 /*
  * Sandbox implementation of CCF primitives necessary for clk-uclass testing
diff --git a/drivers/clk/clk_stm32f.c b/drivers/clk/clk_stm32f.c
index 4d0eadf7e4f5..b0d5699e080b 100644
--- a/drivers/clk/clk_stm32f.c
+++ b/drivers/clk/clk_stm32f.c
@@ -11,6 +11,7 @@
 #include <stm32_rcc.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/clk/clk_stm32mp1.c b/drivers/clk/clk_stm32mp1.c
index e7e57ad73a95..a57f3f81f73c 100644
--- a/drivers/clk/clk_stm32mp1.c
+++ b/drivers/clk/clk_stm32mp1.c
@@ -23,6 +23,7 @@
 #include <asm/arch/sys_proto.h>
 #include <dt-bindings/clock/stm32mp1-clks.h>
 #include <dt-bindings/clock/stm32mp1-clksrc.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/clk/clk_versal.c b/drivers/clk/clk_versal.c
index b73dcc2980d6..de309923b10a 100644
--- a/drivers/clk/clk_versal.c
+++ b/drivers/clk/clk_versal.c
@@ -20,6 +20,7 @@
 #include <zynqmp_firmware.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #define MAX_PARENT			100
diff --git a/drivers/clk/clk_zynq.c b/drivers/clk/clk_zynq.c
index 2c8b851295cf..e20b668fd849 100644
--- a/drivers/clk/clk_zynq.c
+++ b/drivers/clk/clk_zynq.c
@@ -21,6 +21,7 @@
 #include <asm/arch/hardware.h>
 #include <asm/arch/sys_proto.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 /* Register bitfield defines */
 #define PLLCTRL_FBDIV_MASK	0x7f000
diff --git a/drivers/clk/clk_zynqmp.c b/drivers/clk/clk_zynqmp.c
index 3ebf6223c06d..0fb220022ca7 100644
--- a/drivers/clk/clk_zynqmp.c
+++ b/drivers/clk/clk_zynqmp.c
@@ -17,6 +17,7 @@
 #include <dm.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 static const resource_size_t zynqmp_crf_apb_clkc_base = 0xfd1a0020;
 static const resource_size_t zynqmp_crl_apb_clkc_base = 0xff5e0020;
diff --git a/drivers/clk/imx/clk-composite-8m.c b/drivers/clk/imx/clk-composite-8m.c
index 64756ed9e642..d03e48bfb3c2 100644
--- a/drivers/clk/imx/clk-composite-8m.c
+++ b/drivers/clk/imx/clk-composite-8m.c
@@ -13,6 +13,7 @@
 #include <linux/clk-provider.h>
 #include <clk.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include "clk.h"
 #include <linux/err.h>
 
diff --git a/drivers/clk/imx/clk-gate2.c b/drivers/clk/imx/clk-gate2.c
index 0e3678acc639..f1b06731bcea 100644
--- a/drivers/clk/imx/clk-gate2.c
+++ b/drivers/clk/imx/clk-gate2.c
@@ -23,6 +23,7 @@
 #include <linux/clk-provider.h>
 #include <clk.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include "clk.h"
 #include <linux/err.h>
 
diff --git a/drivers/clk/imx/clk-imx6q.c b/drivers/clk/imx/clk-imx6q.c
index 709c2883da58..ddfa3deccbd9 100644
--- a/drivers/clk/imx/clk-imx6q.c
+++ b/drivers/clk/imx/clk-imx6q.c
@@ -13,6 +13,7 @@
 #include <asm/arch/imx-regs.h>
 #include <dt-bindings/clock/imx6qdl-clock.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #include "clk.h"
 
diff --git a/drivers/clk/imx/clk-imx8.c b/drivers/clk/imx/clk-imx8.c
index 63fd42a29461..8b09554d3f4b 100644
--- a/drivers/clk/imx/clk-imx8.c
+++ b/drivers/clk/imx/clk-imx8.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/arch/sci/sci.h>
 #include <asm/arch/clock.h>
diff --git a/drivers/clk/imx/clk-imx8.h b/drivers/clk/imx/clk-imx8.h
index 68ad6755e80f..7a1433d2af65 100644
--- a/drivers/clk/imx/clk-imx8.h
+++ b/drivers/clk/imx/clk-imx8.h
@@ -4,6 +4,7 @@
  * Peng Fan <peng.fan@nxp.com>
  */
 
+#include <stdbool.h>
 struct imx8_clks {
 	ulong id;
 	const char *name;
diff --git a/drivers/clk/imx/clk-imx8mm.c b/drivers/clk/imx/clk-imx8mm.c
index 081d8aee01bd..02a006dd58e5 100644
--- a/drivers/clk/imx/clk-imx8mm.c
+++ b/drivers/clk/imx/clk-imx8mm.c
@@ -13,6 +13,7 @@
 #include <asm/arch/imx-regs.h>
 #include <dt-bindings/clock/imx8mm-clock.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #include "clk.h"
 
diff --git a/drivers/clk/imx/clk-imx8mn.c b/drivers/clk/imx/clk-imx8mn.c
index c35689bdea4c..e8286e5e1642 100644
--- a/drivers/clk/imx/clk-imx8mn.c
+++ b/drivers/clk/imx/clk-imx8mn.c
@@ -13,6 +13,7 @@
 #include <asm/arch/imx-regs.h>
 #include <dt-bindings/clock/imx8mn-clock.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #include "clk.h"
 
diff --git a/drivers/clk/imx/clk-imx8mp.c b/drivers/clk/imx/clk-imx8mp.c
index 883a29a4f315..b6a6ad73a683 100644
--- a/drivers/clk/imx/clk-imx8mp.c
+++ b/drivers/clk/imx/clk-imx8mp.c
@@ -13,6 +13,7 @@
 #include <asm/arch/imx-regs.h>
 #include <dt-bindings/clock/imx8mp-clock.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #include "clk.h"
 
diff --git a/drivers/clk/imx/clk-imx8qm.c b/drivers/clk/imx/clk-imx8qm.c
index 1a818694d252..e21102c319d4 100644
--- a/drivers/clk/imx/clk-imx8qm.c
+++ b/drivers/clk/imx/clk-imx8qm.c
@@ -15,6 +15,7 @@
 #include <dt-bindings/soc/imx_rsrc.h>
 #include <misc.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #include "clk-imx8.h"
 
diff --git a/drivers/clk/imx/clk-imx8qxp.c b/drivers/clk/imx/clk-imx8qxp.c
index 755d8518f645..d061f11a7563 100644
--- a/drivers/clk/imx/clk-imx8qxp.c
+++ b/drivers/clk/imx/clk-imx8qxp.c
@@ -15,6 +15,7 @@
 #include <dt-bindings/soc/imx_rsrc.h>
 #include <misc.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #include "clk-imx8.h"
 
diff --git a/drivers/clk/imx/clk-imxrt1020.c b/drivers/clk/imx/clk-imxrt1020.c
index 6bf82fee4eb5..898dfe310841 100644
--- a/drivers/clk/imx/clk-imxrt1020.c
+++ b/drivers/clk/imx/clk-imxrt1020.c
@@ -12,6 +12,7 @@
 #include <asm/arch/imx-regs.h>
 #include <dt-bindings/clock/imxrt1020-clock.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #include "clk.h"
 
diff --git a/drivers/clk/imx/clk-imxrt1050.c b/drivers/clk/imx/clk-imxrt1050.c
index 4127fa752364..fc022f54a75c 100644
--- a/drivers/clk/imx/clk-imxrt1050.c
+++ b/drivers/clk/imx/clk-imxrt1050.c
@@ -13,6 +13,7 @@
 #include <asm/arch/imx-regs.h>
 #include <dt-bindings/clock/imxrt1050-clock.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #include "clk.h"
 
diff --git a/drivers/clk/imx/clk-pfd.c b/drivers/clk/imx/clk-pfd.c
index 08f1234aab28..9b2fce7174af 100644
--- a/drivers/clk/imx/clk-pfd.c
+++ b/drivers/clk/imx/clk-pfd.c
@@ -24,6 +24,7 @@
 #include <div64.h>
 #include <clk.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include "clk.h"
 #include <linux/err.h>
 
diff --git a/drivers/clk/imx/clk-pll14xx.c b/drivers/clk/imx/clk-pll14xx.c
index a9b56b79027a..147bf3159805 100644
--- a/drivers/clk/imx/clk-pll14xx.c
+++ b/drivers/clk/imx/clk-pll14xx.c
@@ -19,6 +19,7 @@
 #include <linux/iopoll.h>
 #include <clk.h>
 #include <div64.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 
 #include "clk.h"
diff --git a/drivers/clk/imx/clk-pllv3.c b/drivers/clk/imx/clk-pllv3.c
index a0193e185195..ec690a24981c 100644
--- a/drivers/clk/imx/clk-pllv3.c
+++ b/drivers/clk/imx/clk-pllv3.c
@@ -14,6 +14,7 @@
 #include <dm/uclass.h>
 #include <clk.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include "clk.h"
 #include <linux/err.h>
 
diff --git a/drivers/clk/imx/clk.h b/drivers/clk/imx/clk.h
index 60f287046b9e..04b7bb78daef 100644
--- a/drivers/clk/imx/clk.h
+++ b/drivers/clk/imx/clk.h
@@ -7,6 +7,7 @@
 #define __MACH_IMX_CLK_H
 
 #include <linux/clk-provider.h>
+#include <linux/kernel.h>
 
 enum imx_pllv3_type {
 	IMX_PLLV3_GENERIC,
diff --git a/drivers/clk/kendryte/clk.c b/drivers/clk/kendryte/clk.c
index 5128cca10607..e8f764d792ba 100644
--- a/drivers/clk/kendryte/clk.c
+++ b/drivers/clk/kendryte/clk.c
@@ -4,6 +4,7 @@
  */
 #include <kendryte/clk.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #include <asm/io.h>
 #include <dt-bindings/clock/k210-sysctl.h>
diff --git a/drivers/clk/kendryte/pll.c b/drivers/clk/kendryte/pll.c
index 68c93a5f965a..d4788ba81406 100644
--- a/drivers/clk/kendryte/pll.c
+++ b/drivers/clk/kendryte/pll.c
@@ -5,6 +5,7 @@
 #define LOG_CATEGORY UCLASS_CLK
 #include <kendryte/pll.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #include <common.h>
 #include <dm.h>
diff --git a/drivers/clk/mediatek/clk-mtk.h b/drivers/clk/mediatek/clk-mtk.h
index 95a23d14a8e0..57a76e69432c 100644
--- a/drivers/clk/mediatek/clk-mtk.h
+++ b/drivers/clk/mediatek/clk-mtk.h
@@ -8,6 +8,7 @@
 #define __DRV_CLK_MTK_H
 
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 #define CLK_XTAL			0
 #define MHZ				(1000 * 1000)
 
diff --git a/drivers/clk/meson/axg.c b/drivers/clk/meson/axg.c
index 99b4da094174..ddf20ab3d8c2 100644
--- a/drivers/clk/meson/axg.c
+++ b/drivers/clk/meson/axg.c
@@ -17,6 +17,7 @@
 #include <dt-bindings/clock/axg-clkc.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include "clk_meson.h"
 #include <linux/err.h>
 
diff --git a/drivers/clk/meson/gxbb.c b/drivers/clk/meson/gxbb.c
index d66b23c2a90c..62e8e35d654f 100644
--- a/drivers/clk/meson/gxbb.c
+++ b/drivers/clk/meson/gxbb.c
@@ -17,6 +17,7 @@
 #include <dt-bindings/clock/gxbb-clkc.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include "clk_meson.h"
 #include <linux/err.h>
 
diff --git a/drivers/clk/mpc83xx_clk.c b/drivers/clk/mpc83xx_clk.c
index a390fea85f64..8dae8313db92 100644
--- a/drivers/clk/mpc83xx_clk.c
+++ b/drivers/clk/mpc83xx_clk.c
@@ -19,6 +19,7 @@
 #include <asm/ppc.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #include "mpc83xx_clk.h"
 
diff --git a/drivers/clk/mtmips/clk-mt7628.c b/drivers/clk/mtmips/clk-mt7628.c
index f013c77df289..12ae5a92354d 100644
--- a/drivers/clk/mtmips/clk-mt7628.c
+++ b/drivers/clk/mtmips/clk-mt7628.c
@@ -12,6 +12,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/io.h>
+#include <linux/kernel.h>
 
 /* SYSCFG0 */
 #define XTAL_40M_SEL			BIT(6)
diff --git a/drivers/clk/mvebu/armada-37xx-periph.c b/drivers/clk/mvebu/armada-37xx-periph.c
index dd2b0b9914b6..6f279939c519 100644
--- a/drivers/clk/mvebu/armada-37xx-periph.c
+++ b/drivers/clk/mvebu/armada-37xx-periph.c
@@ -19,6 +19,7 @@
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #define TBG_SEL		0x0
diff --git a/drivers/clk/renesas/clk-rcar-gen3.c b/drivers/clk/renesas/clk-rcar-gen3.c
index be230d1d923c..c4f5a63b7a3f 100644
--- a/drivers/clk/renesas/clk-rcar-gen3.c
+++ b/drivers/clk/renesas/clk-rcar-gen3.c
@@ -21,6 +21,7 @@
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #include <dt-bindings/clock/renesas-cpg-mssr.h>
 
diff --git a/drivers/clk/renesas/r8a774a1-cpg-mssr.c b/drivers/clk/renesas/r8a774a1-cpg-mssr.c
index 8935667736f7..f409e666a97d 100644
--- a/drivers/clk/renesas/r8a774a1-cpg-mssr.c
+++ b/drivers/clk/renesas/r8a774a1-cpg-mssr.c
@@ -13,6 +13,7 @@
 #include <common.h>
 #include <clk-uclass.h>
 #include <dm.h>
+#include <linux/kernel.h>
 
 #include <dt-bindings/clock/r8a774a1-cpg-mssr.h>
 
diff --git a/drivers/clk/renesas/r8a7790-cpg-mssr.c b/drivers/clk/renesas/r8a7790-cpg-mssr.c
index 7451f53ba39a..9eb30d9c9fb6 100644
--- a/drivers/clk/renesas/r8a7790-cpg-mssr.c
+++ b/drivers/clk/renesas/r8a7790-cpg-mssr.c
@@ -13,6 +13,7 @@
 #include <clk-uclass.h>
 #include <dm.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 
 #include <dt-bindings/clock/r8a7790-cpg-mssr.h>
 
diff --git a/drivers/clk/renesas/r8a7791-cpg-mssr.c b/drivers/clk/renesas/r8a7791-cpg-mssr.c
index 25fd48960945..7ddac6d20ad0 100644
--- a/drivers/clk/renesas/r8a7791-cpg-mssr.c
+++ b/drivers/clk/renesas/r8a7791-cpg-mssr.c
@@ -18,6 +18,7 @@
 #include <clk-uclass.h>
 #include <dm.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 
 #include <dt-bindings/clock/r8a7791-cpg-mssr.h>
 
diff --git a/drivers/clk/renesas/r8a7792-cpg-mssr.c b/drivers/clk/renesas/r8a7792-cpg-mssr.c
index d47ab99e8826..0d43004bfc42 100644
--- a/drivers/clk/renesas/r8a7792-cpg-mssr.c
+++ b/drivers/clk/renesas/r8a7792-cpg-mssr.c
@@ -13,6 +13,7 @@
 #include <clk-uclass.h>
 #include <dm.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 
 #include <dt-bindings/clock/r8a7792-cpg-mssr.h>
 
diff --git a/drivers/clk/renesas/r8a7794-cpg-mssr.c b/drivers/clk/renesas/r8a7794-cpg-mssr.c
index 7093e0d42cb7..eda0ae0f9d93 100644
--- a/drivers/clk/renesas/r8a7794-cpg-mssr.c
+++ b/drivers/clk/renesas/r8a7794-cpg-mssr.c
@@ -13,6 +13,7 @@
 #include <clk-uclass.h>
 #include <dm.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 
 #include <dt-bindings/clock/r8a7794-cpg-mssr.h>
 
diff --git a/drivers/clk/renesas/r8a7795-cpg-mssr.c b/drivers/clk/renesas/r8a7795-cpg-mssr.c
index dcd96ad01774..89794d2cf6c9 100644
--- a/drivers/clk/renesas/r8a7795-cpg-mssr.c
+++ b/drivers/clk/renesas/r8a7795-cpg-mssr.c
@@ -13,6 +13,7 @@
 #include <clk-uclass.h>
 #include <dm.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 
 #include <dt-bindings/clock/r8a7795-cpg-mssr.h>
 
diff --git a/drivers/clk/renesas/r8a7796-cpg-mssr.c b/drivers/clk/renesas/r8a7796-cpg-mssr.c
index 89dc141239de..029bd54b796c 100644
--- a/drivers/clk/renesas/r8a7796-cpg-mssr.c
+++ b/drivers/clk/renesas/r8a7796-cpg-mssr.c
@@ -19,6 +19,7 @@
 #include <clk-uclass.h>
 #include <dm.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 
 #include <dt-bindings/clock/r8a7796-cpg-mssr.h>
 
diff --git a/drivers/clk/renesas/r8a77965-cpg-mssr.c b/drivers/clk/renesas/r8a77965-cpg-mssr.c
index 6ed88295c98b..5962cb03d636 100644
--- a/drivers/clk/renesas/r8a77965-cpg-mssr.c
+++ b/drivers/clk/renesas/r8a77965-cpg-mssr.c
@@ -14,6 +14,7 @@
 #include <clk-uclass.h>
 #include <dm.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 
 #include <dt-bindings/clock/r8a77965-cpg-mssr.h>
 
diff --git a/drivers/clk/renesas/r8a77970-cpg-mssr.c b/drivers/clk/renesas/r8a77970-cpg-mssr.c
index df0712017187..ec246abf387b 100644
--- a/drivers/clk/renesas/r8a77970-cpg-mssr.c
+++ b/drivers/clk/renesas/r8a77970-cpg-mssr.c
@@ -14,6 +14,7 @@
 #include <clk-uclass.h>
 #include <dm.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 
 #include <dt-bindings/clock/r8a77970-cpg-mssr.h>
 
diff --git a/drivers/clk/renesas/r8a77980-cpg-mssr.c b/drivers/clk/renesas/r8a77980-cpg-mssr.c
index c8d7a9469bab..0c2050d1b28d 100644
--- a/drivers/clk/renesas/r8a77980-cpg-mssr.c
+++ b/drivers/clk/renesas/r8a77980-cpg-mssr.c
@@ -14,6 +14,7 @@
 #include <clk-uclass.h>
 #include <dm.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 
 #include <dt-bindings/clock/r8a77980-cpg-mssr.h>
 
diff --git a/drivers/clk/renesas/r8a77990-cpg-mssr.c b/drivers/clk/renesas/r8a77990-cpg-mssr.c
index 357e7b534da9..e3f62e1bc73f 100644
--- a/drivers/clk/renesas/r8a77990-cpg-mssr.c
+++ b/drivers/clk/renesas/r8a77990-cpg-mssr.c
@@ -14,6 +14,7 @@
 #include <clk-uclass.h>
 #include <dm.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 
 #include <dt-bindings/clock/r8a77990-cpg-mssr.h>
 
diff --git a/drivers/clk/renesas/r8a77995-cpg-mssr.c b/drivers/clk/renesas/r8a77995-cpg-mssr.c
index d62aeba635bb..25bec5ff1a7a 100644
--- a/drivers/clk/renesas/r8a77995-cpg-mssr.c
+++ b/drivers/clk/renesas/r8a77995-cpg-mssr.c
@@ -14,6 +14,7 @@
 #include <clk-uclass.h>
 #include <dm.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 
 #include <dt-bindings/clock/r8a77995-cpg-mssr.h>
 
diff --git a/drivers/clk/renesas/rcar-gen3-cpg.h b/drivers/clk/renesas/rcar-gen3-cpg.h
index 3beae7d82509..102d6955354e 100644
--- a/drivers/clk/renesas/rcar-gen3-cpg.h
+++ b/drivers/clk/renesas/rcar-gen3-cpg.h
@@ -11,6 +11,7 @@
 #ifndef __CLK_RENESAS_RCAR_GEN3_CPG_H__
 #define __CLK_RENESAS_RCAR_GEN3_CPG_H__
 
+#include <stdbool.h>
 enum rcar_gen3_clk_types {
 	CLK_TYPE_GEN3_MAIN = CLK_TYPE_CUSTOM,
 	CLK_TYPE_GEN3_PLL0,
diff --git a/drivers/clk/renesas/renesas-cpg-mssr.c b/drivers/clk/renesas/renesas-cpg-mssr.c
index e3e5d9640c91..544ea258747f 100644
--- a/drivers/clk/renesas/renesas-cpg-mssr.c
+++ b/drivers/clk/renesas/renesas-cpg-mssr.c
@@ -14,6 +14,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
+#include <stdbool.h>
 #include <wait_bit.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
diff --git a/drivers/clk/renesas/renesas-cpg-mssr.h b/drivers/clk/renesas/renesas-cpg-mssr.h
index b669dec594ff..70f6fb825c49 100644
--- a/drivers/clk/renesas/renesas-cpg-mssr.h
+++ b/drivers/clk/renesas/renesas-cpg-mssr.h
@@ -13,6 +13,7 @@
 #ifndef __DRIVERS_CLK_RENESAS_CPG_MSSR__
 #define __DRIVERS_CLK_RENESAS_CPG_MSSR__
 
+#include <stdbool.h>
 #include <linux/bitops.h>
 struct cpg_mssr_info {
 	const struct cpg_core_clk	*core_clk;
diff --git a/drivers/clk/rockchip/clk_px30.c b/drivers/clk/rockchip/clk_px30.c
index 8fc3b6e572f7..6e99191007dc 100644
--- a/drivers/clk/rockchip/clk_px30.c
+++ b/drivers/clk/rockchip/clk_px30.c
@@ -22,6 +22,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/clk/rockchip/clk_rk3036.c b/drivers/clk/rockchip/clk_rk3036.c
index 80aa7c2f39a0..ec60627ddeb5 100644
--- a/drivers/clk/rockchip/clk_rk3036.c
+++ b/drivers/clk/rockchip/clk_rk3036.c
@@ -18,6 +18,7 @@
 #include <dt-bindings/clock/rk3036-cru.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/log2.h>
 #include <linux/stringify.h>
 
diff --git a/drivers/clk/rockchip/clk_rk3128.c b/drivers/clk/rockchip/clk_rk3128.c
index b9c896460f0e..4dcb85f51091 100644
--- a/drivers/clk/rockchip/clk_rk3128.c
+++ b/drivers/clk/rockchip/clk_rk3128.c
@@ -20,6 +20,7 @@
 #include <dt-bindings/clock/rk3128-cru.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/log2.h>
 
 enum {
diff --git a/drivers/clk/rockchip/clk_rk3188.c b/drivers/clk/rockchip/clk_rk3188.c
index b77b92e4c5b7..7cee0c594f79 100644
--- a/drivers/clk/rockchip/clk_rk3188.c
+++ b/drivers/clk/rockchip/clk_rk3188.c
@@ -25,6 +25,7 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/log2.h>
 #include <linux/stringify.h>
 
diff --git a/drivers/clk/rockchip/clk_rk322x.c b/drivers/clk/rockchip/clk_rk322x.c
index 780fd7e725b2..f632dff1a71d 100644
--- a/drivers/clk/rockchip/clk_rk322x.c
+++ b/drivers/clk/rockchip/clk_rk322x.c
@@ -19,6 +19,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/log2.h>
 #include <linux/string.h>
 #include <linux/stringify.h>
diff --git a/drivers/clk/rockchip/clk_rk3288.c b/drivers/clk/rockchip/clk_rk3288.c
index da40f74d424d..ed6b4656e23e 100644
--- a/drivers/clk/rockchip/clk_rk3288.c
+++ b/drivers/clk/rockchip/clk_rk3288.c
@@ -29,6 +29,7 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/log2.h>
 #include <linux/string.h>
 #include <linux/stringify.h>
diff --git a/drivers/clk/rockchip/clk_rk3308.c b/drivers/clk/rockchip/clk_rk3308.c
index 7106685bb50d..151b6be5ee9c 100644
--- a/drivers/clk/rockchip/clk_rk3308.c
+++ b/drivers/clk/rockchip/clk_rk3308.c
@@ -21,6 +21,7 @@
 #include <dt-bindings/clock/rk3308-cru.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/clk/rockchip/clk_rk3328.c b/drivers/clk/rockchip/clk_rk3328.c
index 6c7626ab154a..5879541f3ce9 100644
--- a/drivers/clk/rockchip/clk_rk3328.c
+++ b/drivers/clk/rockchip/clk_rk3328.c
@@ -22,6 +22,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 struct pll_div {
diff --git a/drivers/clk/rockchip/clk_rk3368.c b/drivers/clk/rockchip/clk_rk3368.c
index 0d677f55ee17..c391ad02100c 100644
--- a/drivers/clk/rockchip/clk_rk3368.c
+++ b/drivers/clk/rockchip/clk_rk3368.c
@@ -23,6 +23,7 @@
 #include <dt-bindings/clock/rk3368-cru.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include <linux/stringify.h>
diff --git a/drivers/clk/rockchip/clk_rk3399.c b/drivers/clk/rockchip/clk_rk3399.c
index 016633c13820..1078a4c67b75 100644
--- a/drivers/clk/rockchip/clk_rk3399.c
+++ b/drivers/clk/rockchip/clk_rk3399.c
@@ -24,6 +24,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/clk/rockchip/clk_rv1108.c b/drivers/clk/rockchip/clk_rv1108.c
index 4297934b9810..fcc4ba6d94ad 100644
--- a/drivers/clk/rockchip/clk_rv1108.c
+++ b/drivers/clk/rockchip/clk_rv1108.c
@@ -22,6 +22,7 @@
 #include <dt-bindings/clock/rv1108-cru.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/stringify.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/clk/sifive/fu540-prci.c b/drivers/clk/sifive/fu540-prci.c
index e7b03e2c6e8d..93cf4adbb348 100644
--- a/drivers/clk/sifive/fu540-prci.c
+++ b/drivers/clk/sifive/fu540-prci.c
@@ -42,6 +42,7 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include <linux/math64.h>
diff --git a/drivers/clk/sunxi/clk_a10.c b/drivers/clk/sunxi/clk_a10.c
index 67507c5ab1da..797878eefa9c 100644
--- a/drivers/clk/sunxi/clk_a10.c
+++ b/drivers/clk/sunxi/clk_a10.c
@@ -12,6 +12,7 @@
 #include <dt-bindings/clock/sun4i-a10-ccu.h>
 #include <dt-bindings/reset/sun4i-a10-ccu.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 
 static struct ccu_clk_gate a10_gates[] = {
 	[CLK_AHB_OTG]		= GATE(0x060, BIT(0)),
diff --git a/drivers/clk/sunxi/clk_a10s.c b/drivers/clk/sunxi/clk_a10s.c
index d11a4b5f038d..24c20cf11f7f 100644
--- a/drivers/clk/sunxi/clk_a10s.c
+++ b/drivers/clk/sunxi/clk_a10s.c
@@ -12,6 +12,7 @@
 #include <dt-bindings/clock/sun5i-ccu.h>
 #include <dt-bindings/reset/sun5i-ccu.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 
 static struct ccu_clk_gate a10s_gates[] = {
 	[CLK_AHB_OTG]		= GATE(0x060, BIT(0)),
diff --git a/drivers/clk/sunxi/clk_a23.c b/drivers/clk/sunxi/clk_a23.c
index 4d562bfe4270..312288eef68d 100644
--- a/drivers/clk/sunxi/clk_a23.c
+++ b/drivers/clk/sunxi/clk_a23.c
@@ -12,6 +12,7 @@
 #include <dt-bindings/clock/sun8i-a23-a33-ccu.h>
 #include <dt-bindings/reset/sun8i-a23-a33-ccu.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 
 static struct ccu_clk_gate a23_gates[] = {
 	[CLK_BUS_MMC0]		= GATE(0x060, BIT(8)),
diff --git a/drivers/clk/sunxi/clk_a31.c b/drivers/clk/sunxi/clk_a31.c
index 4a9454eebe76..a3b3528abaeb 100644
--- a/drivers/clk/sunxi/clk_a31.c
+++ b/drivers/clk/sunxi/clk_a31.c
@@ -12,6 +12,7 @@
 #include <dt-bindings/clock/sun6i-a31-ccu.h>
 #include <dt-bindings/reset/sun6i-a31-ccu.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 
 static struct ccu_clk_gate a31_gates[] = {
 	[CLK_AHB1_MMC0]		= GATE(0x060, BIT(8)),
diff --git a/drivers/clk/sunxi/clk_a64.c b/drivers/clk/sunxi/clk_a64.c
index d96cb1aac1c9..68660cc7ae48 100644
--- a/drivers/clk/sunxi/clk_a64.c
+++ b/drivers/clk/sunxi/clk_a64.c
@@ -12,6 +12,7 @@
 #include <dt-bindings/clock/sun50i-a64-ccu.h>
 #include <dt-bindings/reset/sun50i-a64-ccu.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 
 static const struct ccu_clk_gate a64_gates[] = {
 	[CLK_BUS_MMC0]		= GATE(0x060, BIT(8)),
diff --git a/drivers/clk/sunxi/clk_a80.c b/drivers/clk/sunxi/clk_a80.c
index 80d7407037e5..ea38c819ea7f 100644
--- a/drivers/clk/sunxi/clk_a80.c
+++ b/drivers/clk/sunxi/clk_a80.c
@@ -12,6 +12,7 @@
 #include <dt-bindings/clock/sun9i-a80-ccu.h>
 #include <dt-bindings/reset/sun9i-a80-ccu.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 
 static const struct ccu_clk_gate a80_gates[] = {
 	[CLK_SPI0]		= GATE(0x430, BIT(31)),
diff --git a/drivers/clk/sunxi/clk_a83t.c b/drivers/clk/sunxi/clk_a83t.c
index d6f23ddc7781..ac82f22c7469 100644
--- a/drivers/clk/sunxi/clk_a83t.c
+++ b/drivers/clk/sunxi/clk_a83t.c
@@ -12,6 +12,7 @@
 #include <dt-bindings/clock/sun8i-a83t-ccu.h>
 #include <dt-bindings/reset/sun8i-a83t-ccu.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 
 static struct ccu_clk_gate a83t_gates[] = {
 	[CLK_BUS_MMC0]		= GATE(0x060, BIT(8)),
diff --git a/drivers/clk/sunxi/clk_h3.c b/drivers/clk/sunxi/clk_h3.c
index 7e844f4ff168..052fd008f590 100644
--- a/drivers/clk/sunxi/clk_h3.c
+++ b/drivers/clk/sunxi/clk_h3.c
@@ -12,6 +12,7 @@
 #include <dt-bindings/clock/sun8i-h3-ccu.h>
 #include <dt-bindings/reset/sun8i-h3-ccu.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 
 static struct ccu_clk_gate h3_gates[] = {
 	[CLK_BUS_MMC0]		= GATE(0x060, BIT(8)),
diff --git a/drivers/clk/sunxi/clk_h6.c b/drivers/clk/sunxi/clk_h6.c
index a1cb8952d39c..944aa4c55c4a 100644
--- a/drivers/clk/sunxi/clk_h6.c
+++ b/drivers/clk/sunxi/clk_h6.c
@@ -12,6 +12,7 @@
 #include <dt-bindings/clock/sun50i-h6-ccu.h>
 #include <dt-bindings/reset/sun50i-h6-ccu.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 
 static struct ccu_clk_gate h6_gates[] = {
 	[CLK_BUS_MMC0]		= GATE(0x84c, BIT(0)),
diff --git a/drivers/clk/sunxi/clk_r40.c b/drivers/clk/sunxi/clk_r40.c
index ac360b2bebd5..1d19c805ade3 100644
--- a/drivers/clk/sunxi/clk_r40.c
+++ b/drivers/clk/sunxi/clk_r40.c
@@ -12,6 +12,7 @@
 #include <dt-bindings/clock/sun8i-r40-ccu.h>
 #include <dt-bindings/reset/sun8i-r40-ccu.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 
 static struct ccu_clk_gate r40_gates[] = {
 	[CLK_BUS_MMC0]		= GATE(0x060, BIT(8)),
diff --git a/drivers/clk/sunxi/clk_v3s.c b/drivers/clk/sunxi/clk_v3s.c
index b79446cc4fdf..19673e43cf01 100644
--- a/drivers/clk/sunxi/clk_v3s.c
+++ b/drivers/clk/sunxi/clk_v3s.c
@@ -12,6 +12,7 @@
 #include <dt-bindings/clock/sun8i-v3s-ccu.h>
 #include <dt-bindings/reset/sun8i-v3s-ccu.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 
 static struct ccu_clk_gate v3s_gates[] = {
 	[CLK_BUS_MMC0]		= GATE(0x060, BIT(8)),
diff --git a/drivers/clk/uniphier/clk-uniphier-core.c b/drivers/clk/uniphier/clk-uniphier-core.c
index 13f2b76c890b..72335f271b8d 100644
--- a/drivers/clk/uniphier/clk-uniphier-core.c
+++ b/drivers/clk/uniphier/clk-uniphier-core.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <clk-uclass.h>
 #include <dm.h>
+#include <stdbool.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/bug.h>
diff --git a/drivers/core/device-remove.c b/drivers/core/device-remove.c
index 3de629d24dfa..0263284fc3f5 100644
--- a/drivers/core/device-remove.c
+++ b/drivers/core/device-remove.c
@@ -12,6 +12,7 @@
 #include <errno.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 #include <dm/device.h>
 #include <dm/device-internal.h>
diff --git a/drivers/core/device.c b/drivers/core/device.c
index ac6ce92bc0f6..8198750cd69b 100644
--- a/drivers/core/device.c
+++ b/drivers/core/device.c
@@ -30,6 +30,7 @@
 #include <dm/util.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/list.h>
 #include <power-domain.h>
 #include <linux/printk.h>
diff --git a/drivers/core/lists.c b/drivers/core/lists.c
index dcc1e4a4f951..dfb5e1de77ad 100644
--- a/drivers/core/lists.c
+++ b/drivers/core/lists.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <errno.h>
 #include <log.h>
+#include <stdbool.h>
 #include <dm/device.h>
 #include <dm/device-internal.h>
 #include <dm/lists.h>
diff --git a/drivers/core/of_access.c b/drivers/core/of_access.c
index ad9bd7dd5a2c..0ecc90890daf 100644
--- a/drivers/core/of_access.c
+++ b/drivers/core/of_access.c
@@ -26,6 +26,7 @@
 #include <asm/global_data.h>
 #include <linux/bug.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <dm/of_access.h>
 #include <linux/ctype.h>
diff --git a/drivers/core/of_addr.c b/drivers/core/of_addr.c
index 4fd4ee0c8893..a245194db43b 100644
--- a/drivers/core/of_addr.c
+++ b/drivers/core/of_addr.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <linux/bug.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <dm/of_access.h>
 #include <dm/of_addr.h>
diff --git a/drivers/core/read.c b/drivers/core/read.c
index ecd812566ceb..b84c9be24610 100644
--- a/drivers/core/read.c
+++ b/drivers/core/read.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 #include <dm/of_access.h>
 #include <mapmem.h>
diff --git a/drivers/core/root.c b/drivers/core/root.c
index 2d0deea9f78c..6eb934c4095c 100644
--- a/drivers/core/root.c
+++ b/drivers/core/root.c
@@ -13,6 +13,7 @@
 #include <malloc.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <dm/acpi.h>
 #include <dm/device.h>
diff --git a/drivers/core/simple-bus.c b/drivers/core/simple-bus.c
index 7cc1d46009ff..aa888b2e0c46 100644
--- a/drivers/core/simple-bus.c
+++ b/drivers/core/simple-bus.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <linux/kernel.h>
 
 struct simple_bus_plat {
 	u32 base;
diff --git a/drivers/core/syscon-uclass.c b/drivers/core/syscon-uclass.c
index 11ac1b177334..d8d26d772c74 100644
--- a/drivers/core/syscon-uclass.c
+++ b/drivers/core/syscon-uclass.c
@@ -16,6 +16,7 @@
 #include <dm/root.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 /*
  * Caution:
diff --git a/drivers/core/uclass.c b/drivers/core/uclass.c
index 3fae359866fa..242d9f4b30dd 100644
--- a/drivers/core/uclass.c
+++ b/drivers/core/uclass.c
@@ -13,6 +13,7 @@
 #include <errno.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 #include <dm/device.h>
 #include <dm/device-internal.h>
diff --git a/drivers/cpu/mpc83xx_cpu.c b/drivers/cpu/mpc83xx_cpu.c
index ced2213de10d..cd514e6e1ab7 100644
--- a/drivers/cpu/mpc83xx_cpu.c
+++ b/drivers/cpu/mpc83xx_cpu.c
@@ -10,6 +10,7 @@
 #include <cpu.h>
 #include <dm.h>
 #include <log.h>
+#include <stdbool.h>
 #include <vsprintf.h>
 #include <asm/ppc.h>
 #include <linux/bitops.h>
diff --git a/drivers/crypto/fsl/desc_constr.h b/drivers/crypto/fsl/desc_constr.h
index 7d6546fd9c0c..a11ce812d19b 100644
--- a/drivers/crypto/fsl/desc_constr.h
+++ b/drivers/crypto/fsl/desc_constr.h
@@ -9,6 +9,7 @@
 
 #include <stdio.h>
 #include <linux/compat.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "desc.h"
 
diff --git a/drivers/crypto/fsl/error.c b/drivers/crypto/fsl/error.c
index 9138de69e8a2..a83efe585e6e 100644
--- a/drivers/crypto/fsl/error.c
+++ b/drivers/crypto/fsl/error.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <vsprintf.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "desc.h"
 #include "jr.h"
diff --git a/drivers/crypto/fsl/fsl_blob.c b/drivers/crypto/fsl/fsl_blob.c
index 5bc0f3d5f22e..3cf03106174e 100644
--- a/drivers/crypto/fsl/fsl_blob.c
+++ b/drivers/crypto/fsl/fsl_blob.c
@@ -13,6 +13,7 @@
 #include <stdio.h>
 #include <asm/cache.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include "jobdesc.h"
 #include "desc.h"
 #include "jr.h"
diff --git a/drivers/crypto/fsl/fsl_hash.c b/drivers/crypto/fsl/fsl_hash.c
index 80640248c373..5bd6604e7772 100644
--- a/drivers/crypto/fsl/fsl_hash.c
+++ b/drivers/crypto/fsl/fsl_hash.c
@@ -10,6 +10,7 @@
 #include <malloc.h>
 #include <memalign.h>
 #include <stdio.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "jobdesc.h"
 #include "desc.h"
diff --git a/drivers/crypto/fsl/jobdesc.c b/drivers/crypto/fsl/jobdesc.c
index e85c2dd01d92..40f06e8f81bb 100644
--- a/drivers/crypto/fsl/jobdesc.c
+++ b/drivers/crypto/fsl/jobdesc.c
@@ -11,6 +11,7 @@
 #include <cpu_func.h>
 #include <fsl_sec.h>
 #include <stdio.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "desc_constr.h"
 #include "jobdesc.h"
diff --git a/drivers/crypto/fsl/sec.c b/drivers/crypto/fsl/sec.c
index b2a1e822feb9..4e52852d64bb 100644
--- a/drivers/crypto/fsl/sec.c
+++ b/drivers/crypto/fsl/sec.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/kernel.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/crypto/rsa_mod_exp/mod_exp_uclass.c b/drivers/crypto/rsa_mod_exp/mod_exp_uclass.c
index 8997980cacae..6826011fb313 100644
--- a/drivers/crypto/rsa_mod_exp/mod_exp_uclass.c
+++ b/drivers/crypto/rsa_mod_exp/mod_exp_uclass.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
 #include <u-boot/rsa-mod-exp.h>
diff --git a/drivers/ddr/altera/sdram_gen5.c b/drivers/ddr/altera/sdram_gen5.c
index bc20fa096454..723436cadcab 100644
--- a/drivers/ddr/altera/sdram_gen5.c
+++ b/drivers/ddr/altera/sdram_gen5.c
@@ -20,6 +20,7 @@
 #include <asm/io.h>
 #include <dm/device_compat.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include "sequencer.h"
diff --git a/drivers/ddr/altera/sdram_s10.c b/drivers/ddr/altera/sdram_s10.c
index 4c913e9b5b64..8fe96ee24656 100644
--- a/drivers/ddr/altera/sdram_s10.c
+++ b/drivers/ddr/altera/sdram_s10.c
@@ -18,6 +18,7 @@
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 #include "sdram_s10.h"
 #include <wait_bit.h>
 #include <asm/arch/firewall.h>
diff --git a/drivers/ddr/altera/sdram_soc64.c b/drivers/ddr/altera/sdram_soc64.c
index 778528bf8631..67fc9c14e3f6 100644
--- a/drivers/ddr/altera/sdram_soc64.c
+++ b/drivers/ddr/altera/sdram_soc64.c
@@ -20,6 +20,7 @@
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "sdram_soc64.h"
 #include <wait_bit.h>
diff --git a/drivers/ddr/altera/sequencer.c b/drivers/ddr/altera/sequencer.c
index 8d62f02660d3..aad40ad398d7 100644
--- a/drivers/ddr/altera/sequencer.c
+++ b/drivers/ddr/altera/sequencer.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <hang.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "sequencer.h"
 
diff --git a/drivers/ddr/altera/sequencer.h b/drivers/ddr/altera/sequencer.h
index c72a683ffef2..b655c25688dc 100644
--- a/drivers/ddr/altera/sequencer.h
+++ b/drivers/ddr/altera/sequencer.h
@@ -6,6 +6,7 @@
 #ifndef _SEQUENCER_H_
 #define _SEQUENCER_H_
 
+#include <stdbool.h>
 #define RW_MGR_NUM_DM_PER_WRITE_GROUP (seq->rwcfg->mem_data_mask_width \
 	/ seq->rwcfg->mem_if_write_dqs_width)
 #define RW_MGR_NUM_TRUE_DM_PER_WRITE_GROUP ( \
diff --git a/drivers/ddr/fsl/ctrl_regs.c b/drivers/ddr/fsl/ctrl_regs.c
index 1dd680e4f19b..a4b908ea5c79 100644
--- a/drivers/ddr/fsl/ctrl_regs.c
+++ b/drivers/ddr/fsl/ctrl_regs.c
@@ -23,6 +23,7 @@
 	defined(CONFIG_ARM)
 #include <asm/arch/clock.h>
 #endif
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 /*
diff --git a/drivers/ddr/fsl/ddr1_dimm_params.c b/drivers/ddr/fsl/ddr1_dimm_params.c
index 698324073dbb..36669152046a 100644
--- a/drivers/ddr/fsl/ddr1_dimm_params.c
+++ b/drivers/ddr/fsl/ddr1_dimm_params.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <stdio.h>
 #include <asm/bitops.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include <fsl_ddr.h>
diff --git a/drivers/ddr/fsl/ddr2_dimm_params.c b/drivers/ddr/fsl/ddr2_dimm_params.c
index 95a250c33f48..c654b1fd1f19 100644
--- a/drivers/ddr/fsl/ddr2_dimm_params.c
+++ b/drivers/ddr/fsl/ddr2_dimm_params.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <stdio.h>
 #include <asm/bitops.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include <fsl_ddr.h>
diff --git a/drivers/ddr/fsl/ddr4_dimm_params.c b/drivers/ddr/fsl/ddr4_dimm_params.c
index cc6c034747fd..fca5b433eb10 100644
--- a/drivers/ddr/fsl/ddr4_dimm_params.c
+++ b/drivers/ddr/fsl/ddr4_dimm_params.c
@@ -13,6 +13,7 @@
 #include <common.h>
 #include <fsl_ddr_sdram.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <linux/bug.h>
 #include <linux/string.h>
diff --git a/drivers/ddr/fsl/interactive.c b/drivers/ddr/fsl/interactive.c
index e3a7670e3d14..c7d99077d865 100644
--- a/drivers/ddr/fsl/interactive.c
+++ b/drivers/ddr/fsl/interactive.c
@@ -22,6 +22,7 @@
 #include <linux/ctype.h>
 #include <asm/types.h>
 #include <asm/io.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include <fsl_ddr_sdram.h>
diff --git a/drivers/ddr/fsl/lc_common_dimm_params.c b/drivers/ddr/fsl/lc_common_dimm_params.c
index d6a2ad99c427..cb56229fae2a 100644
--- a/drivers/ddr/fsl/lc_common_dimm_params.c
+++ b/drivers/ddr/fsl/lc_common_dimm_params.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <stdio.h>
 #include <asm/bitops.h>
+#include <linux/kernel.h>
 
 #include <fsl_ddr.h>
 
diff --git a/drivers/ddr/fsl/main.c b/drivers/ddr/fsl/main.c
index 92a29568342b..56c0de2004cf 100644
--- a/drivers/ddr/fsl/main.c
+++ b/drivers/ddr/fsl/main.c
@@ -20,6 +20,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/bitops.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 /*
diff --git a/drivers/ddr/fsl/util.c b/drivers/ddr/fsl/util.c
index f37846d8e60f..04266fb35ffb 100644
--- a/drivers/ddr/fsl/util.c
+++ b/drivers/ddr/fsl/util.c
@@ -9,6 +9,7 @@
 #include <asm/ppc.h>
 #endif
 #include <div64.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <linux/delay.h>
 
diff --git a/drivers/ddr/imx/imx8m/helper.c b/drivers/ddr/imx/imx8m/helper.c
index 8903ff146fc9..fca733ee3b2f 100644
--- a/drivers/ddr/imx/imx8m/helper.c
+++ b/drivers/ddr/imx/imx8m/helper.c
@@ -15,6 +15,7 @@
 #include <asm/arch/ddr.h>
 #include <asm/arch/lpddr4_define.h>
 #include <asm/sections.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/ddr/marvell/axp/ddr3_spd.c b/drivers/ddr/marvell/axp/ddr3_spd.c
index f96d2bdaeb91..d58d4961658a 100644
--- a/drivers/ddr/marvell/axp/ddr3_spd.c
+++ b/drivers/ddr/marvell/axp/ddr3_spd.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include "ddr3_init.h"
diff --git a/drivers/demo/demo-shape.c b/drivers/demo/demo-shape.c
index f35bc3e14922..1be18905890f 100644
--- a/drivers/demo/demo-shape.c
+++ b/drivers/demo/demo-shape.c
@@ -15,6 +15,7 @@
 #include <asm/io.h>
 #include <asm/gpio.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/dfu/dfu.c b/drivers/dfu/dfu.c
index 4cc2be16bb3e..b9d1dcbc1d2d 100644
--- a/drivers/dfu/dfu.c
+++ b/drivers/dfu/dfu.c
@@ -18,6 +18,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/errno.h>
+#include <linux/kernel.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 94989c2ba239..4431e34c10e6 100644
--- a/drivers/dfu/dfu_mmc.c
+++ b/drivers/dfu/dfu_mmc.c
@@ -19,6 +19,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/dfu/dfu_mtd.c b/drivers/dfu/dfu_mtd.c
index b93d99873749..7e5623674ca1 100644
--- a/drivers/dfu/dfu_mtd.c
+++ b/drivers/dfu/dfu_mtd.c
@@ -15,6 +15,7 @@
 #include <jffs2/load_kernel.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 static bool mtd_is_aligned_with_block_size(struct mtd_info *mtd, u64 size)
diff --git a/drivers/dma/apbh_dma.c b/drivers/dma/apbh_dma.c
index 8a7ef5013e86..697db0d7201b 100644
--- a/drivers/dma/apbh_dma.c
+++ b/drivers/dma/apbh_dma.c
@@ -14,6 +14,7 @@
 #include <cpu_func.h>
 #include <stdio.h>
 #include <asm/cache.h>
+#include <linux/kernel.h>
 #include <linux/list.h>
 #include <linux/string.h>
 
diff --git a/drivers/dma/bcm6348-iudma.c b/drivers/dma/bcm6348-iudma.c
index e1130f8f9fb8..e6fc0ac5ffb0 100644
--- a/drivers/dma/bcm6348-iudma.c
+++ b/drivers/dma/bcm6348-iudma.c
@@ -25,6 +25,7 @@
 #include <memalign.h>
 #include <net.h>
 #include <reset.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/drivers/dma/dma-uclass.c b/drivers/dma/dma-uclass.c
index cc872831b5f7..8a6fd825b136 100644
--- a/drivers/dma/dma-uclass.c
+++ b/drivers/dma/dma-uclass.c
@@ -20,6 +20,7 @@
 #include <dt-structs.h>
 #include <errno.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 
 #ifdef CONFIG_DMA_CHANNELS
diff --git a/drivers/dma/fsl_dma.c b/drivers/dma/fsl_dma.c
index b7eddf0f04c5..a818084a3bef 100644
--- a/drivers/dma/fsl_dma.c
+++ b/drivers/dma/fsl_dma.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <asm/io.h>
 #include <asm/fsl_dma.h>
+#include <linux/kernel.h>
 
 /* Controller can only transfer 2^26 - 1 bytes at a time */
 #define FSL_DMA_MAX_SIZE	(0x3ffffff)
diff --git a/drivers/dma/sandbox-dma-test.c b/drivers/dma/sandbox-dma-test.c
index 9a6904cd634f..460197ed67a0 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 <stdbool.h>
 #include <vsprintf.h>
 #include <dm/read.h>
 #include <dma-uclass.h>
diff --git a/drivers/dma/ti/k3-udma.c b/drivers/dma/ti/k3-udma.c
index 0b6de5bbbcc5..4d50dbc76e5d 100644
--- a/drivers/dma/ti/k3-udma.c
+++ b/drivers/dma/ti/k3-udma.c
@@ -27,6 +27,7 @@
 #include <linux/bitmap.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/soc/ti/k3-navss-ringacc.h>
 #include <linux/soc/ti/cppi5.h>
diff --git a/drivers/fastboot/fb_getvar.c b/drivers/fastboot/fb_getvar.c
index b8f4938f9d5b..5c188e1b5b53 100644
--- a/drivers/fastboot/fb_getvar.c
+++ b/drivers/fastboot/fb_getvar.c
@@ -14,6 +14,7 @@
 #include <version.h>
 #include <vsprintf.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/fastboot/fb_mmc.c b/drivers/fastboot/fb_mmc.c
index 37cef1890f26..5615dffa6d88 100644
--- a/drivers/fastboot/fb_mmc.c
+++ b/drivers/fastboot/fb_mmc.c
@@ -21,6 +21,7 @@
 #include <linux/compat.h>
 #include <android_image.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/firmware/firmware-zynqmp.c b/drivers/firmware/firmware-zynqmp.c
index 01d5ac72f8fc..0a815ec736ab 100644
--- a/drivers/firmware/firmware-zynqmp.c
+++ b/drivers/firmware/firmware-zynqmp.c
@@ -14,6 +14,7 @@
 #include <asm/cache.h>
 #include <asm/ptrace.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #if defined(CONFIG_ZYNQMP_IPI)
 #include <mailbox.h>
diff --git a/drivers/firmware/ti_sci.c b/drivers/firmware/ti_sci.c
index d2e1be9c9940..e156d5492687 100644
--- a/drivers/firmware/ti_sci.c
+++ b/drivers/firmware/ti_sci.c
@@ -20,6 +20,7 @@
 #include <linux/compat.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/soc/ti/k3-sec-proxy.h>
 #include <linux/soc/ti/ti_sci_protocol.h>
 #include <linux/string.h>
diff --git a/drivers/fpga/altera.c b/drivers/fpga/altera.c
index 9908630c2d40..4ce9a0581ade 100644
--- a/drivers/fpga/altera.c
+++ b/drivers/fpga/altera.c
@@ -17,6 +17,7 @@
 #include <stdio.h>
 #include <stratixII.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 /* Define FPGA_DEBUG to 1 to get debug printf's */
 #define FPGA_DEBUG	0
diff --git a/drivers/fpga/cyclon2.c b/drivers/fpga/cyclon2.c
index a163f7225155..de0880ff3d8d 100644
--- a/drivers/fpga/cyclon2.c
+++ b/drivers/fpga/cyclon2.c
@@ -8,6 +8,7 @@
 #include <common.h>		/* core U-Boot definitions */
 #include <altera.h>
 #include <ACEX1K.h>		/* ACEX device family */
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <linux/delay.h>
diff --git a/drivers/fpga/socfpga.c b/drivers/fpga/socfpga.c
index 685957626be6..357c74675d1e 100644
--- a/drivers/fpga/socfpga.c
+++ b/drivers/fpga/socfpga.c
@@ -10,6 +10,7 @@
 #include <asm/arch/fpga_manager.h>
 #include <asm/arch/reset_manager.h>
 #include <asm/arch/system_manager.h>
+#include <linux/kernel.h>
 
 /* Timeout count */
 #define FPGA_TIMEOUT_CNT		0x1000000
diff --git a/drivers/fpga/socfpga_arria10.c b/drivers/fpga/socfpga_arria10.c
index 0c26701e95d2..52361176b998 100644
--- a/drivers/fpga/socfpga_arria10.c
+++ b/drivers/fpga/socfpga_arria10.c
@@ -4,6 +4,7 @@
  */
 #include <image.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <asm/global_data.h>
diff --git a/drivers/fpga/spartan3.c b/drivers/fpga/spartan3.c
index 95a361b0e861..7374bb6f6b90 100644
--- a/drivers/fpga/spartan3.c
+++ b/drivers/fpga/spartan3.c
@@ -11,6 +11,8 @@
 
 #include <common.h>		/* core U-Boot definitions */
 #include <spartan3.h>		/* Spartan-II device family */
+#include <stdbool.h>
+#include <stdio.h>
 #include <time.h>
 
 /* Define FPGA_DEBUG to get debug printf's */
diff --git a/drivers/fpga/stratix10.c b/drivers/fpga/stratix10.c
index e4a513171eba..3477ddbfd6b6 100644
--- a/drivers/fpga/stratix10.c
+++ b/drivers/fpga/stratix10.c
@@ -11,6 +11,7 @@
 #include <asm/arch/mailbox_s10.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #define RECONFIG_STATUS_POLL_RESP_TIMEOUT_MS		60000
diff --git a/drivers/fpga/versalpl.c b/drivers/fpga/versalpl.c
index 7738cfaf1039..eeaa8e0a335c 100644
--- a/drivers/fpga/versalpl.c
+++ b/drivers/fpga/versalpl.c
@@ -13,6 +13,7 @@
 #include <versalpl.h>
 #include <zynqmp_firmware.h>
 #include <asm/cache.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 static ulong versal_align_dma_buffer(ulong *buf, u32 len)
diff --git a/drivers/fpga/zynqmppl.c b/drivers/fpga/zynqmppl.c
index fd92b47d67a8..9d3eb848266b 100644
--- a/drivers/fpga/zynqmppl.c
+++ b/drivers/fpga/zynqmppl.c
@@ -15,6 +15,7 @@
 #include <zynqmp_firmware.h>
 #include <asm/cache.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <asm/arch/sys_proto.h>
 #include <memalign.h>
diff --git a/drivers/fpga/zynqpl.c b/drivers/fpga/zynqpl.c
index 14de9c11d548..c887f3ddca61 100644
--- a/drivers/fpga/zynqpl.c
+++ b/drivers/fpga/zynqpl.c
@@ -17,6 +17,7 @@
 #include <fs.h>
 #include <zynqpl.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/sys_proto.h>
diff --git a/drivers/gpio/at91_gpio.c b/drivers/gpio/at91_gpio.c
index d738a04033a5..f808f5114b7b 100644
--- a/drivers/gpio/at91_gpio.c
+++ b/drivers/gpio/at91_gpio.c
@@ -12,6 +12,7 @@
 #include <clk.h>
 #include <dm.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/io.h>
 #include <linux/sizes.h>
diff --git a/drivers/gpio/bcm6345_gpio.c b/drivers/gpio/bcm6345_gpio.c
index 5eaad77dcb64..9b0f551b9504 100644
--- a/drivers/gpio/bcm6345_gpio.c
+++ b/drivers/gpio/bcm6345_gpio.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
+#include <stdbool.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
diff --git a/drivers/gpio/gpio-rcar.c b/drivers/gpio/gpio-rcar.c
index 2e80196905db..a940b9969c18 100644
--- a/drivers/gpio/gpio-rcar.c
+++ b/drivers/gpio/gpio-rcar.c
@@ -7,6 +7,7 @@
 #include <clk.h>
 #include <dm.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 #include <dm/device_compat.h>
 #include <dm/pinctrl.h>
diff --git a/drivers/gpio/gpio-rza1.c b/drivers/gpio/gpio-rza1.c
index 6407727b4533..13f525823eca 100644
--- a/drivers/gpio/gpio-rza1.c
+++ b/drivers/gpio/gpio-rza1.c
@@ -7,6 +7,7 @@
 #include <clk.h>
 #include <dm.h>
 #include <errno.h>
+#include <stdbool.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 44ba2ac2b3ce..68320c1e27c4 100644
--- a/drivers/gpio/gpio-uclass.c
+++ b/drivers/gpio/gpio-uclass.c
@@ -23,6 +23,7 @@
 #include <linux/bug.h>
 #include <linux/ctype.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/gpio/intel_ich6_gpio.c b/drivers/gpio/intel_ich6_gpio.c
index b3df925c7564..be371fdcc304 100644
--- a/drivers/gpio/intel_ich6_gpio.c
+++ b/drivers/gpio/intel_ich6_gpio.c
@@ -33,6 +33,7 @@
 #include <log.h>
 #include <pch.h>
 #include <pci.h>
+#include <stdbool.h>
 #include <asm/cpu.h>
 #include <asm/global_data.h>
 #include <asm/gpio.h>
diff --git a/drivers/gpio/iproc_gpio.c b/drivers/gpio/iproc_gpio.c
index 50eb95d25227..9672342bca33 100644
--- a/drivers/gpio/iproc_gpio.c
+++ b/drivers/gpio/iproc_gpio.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <errno.h>
+#include <stdbool.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <dm.h>
diff --git a/drivers/gpio/mscc_sgpio.c b/drivers/gpio/mscc_sgpio.c
index 0133e14bb735..9b7bb4b06027 100644
--- a/drivers/gpio/mscc_sgpio.c
+++ b/drivers/gpio/mscc_sgpio.c
@@ -18,6 +18,7 @@
 #include <linux/bitops.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #define MSCC_SGPIOS_PER_BANK	32
 #define MSCC_SGPIO_BANK_DEPTH	4
diff --git a/drivers/gpio/mxc_gpio.c b/drivers/gpio/mxc_gpio.c
index 95e1fd643423..fda331de143f 100644
--- a/drivers/gpio/mxc_gpio.c
+++ b/drivers/gpio/mxc_gpio.c
@@ -16,6 +16,7 @@
 #include <asm/io.h>
 #include <dt-structs.h>
 #include <mapmem.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 enum mxc_gpio_direction {
diff --git a/drivers/gpio/mxs_gpio.c b/drivers/gpio/mxs_gpio.c
index 310e04dd33e7..7a290fba0f73 100644
--- a/drivers/gpio/mxs_gpio.c
+++ b/drivers/gpio/mxs_gpio.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
diff --git a/drivers/gpio/pca953x.c b/drivers/gpio/pca953x.c
index adb2079e0835..c3a79b931b87 100644
--- a/drivers/gpio/pca953x.c
+++ b/drivers/gpio/pca953x.c
@@ -14,6 +14,7 @@
 #include <pca953x.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/kernel.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 1f7563531e77..a3ae0c49b984 100644
--- a/drivers/gpio/pca953x_gpio.c
+++ b/drivers/gpio/pca953x_gpio.c
@@ -31,6 +31,7 @@
 #include <dt-bindings/gpio/gpio.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #define PCA953X_INPUT           0
diff --git a/drivers/gpio/pm8916_gpio.c b/drivers/gpio/pm8916_gpio.c
index de150c44a54f..62fb3a39d3ea 100644
--- a/drivers/gpio/pm8916_gpio.c
+++ b/drivers/gpio/pm8916_gpio.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <stdbool.h>
 #include <linux/errno.h>
 #include <power/pmic.h>
 #include <spmi/spmi.h>
diff --git a/drivers/gpio/rk_gpio.c b/drivers/gpio/rk_gpio.c
index 29ef2dc2c858..fa79bacbd070 100644
--- a/drivers/gpio/rk_gpio.c
+++ b/drivers/gpio/rk_gpio.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <stdbool.h>
 #include <syscon.h>
 #include <vsprintf.h>
 #include <linux/errno.h>
diff --git a/drivers/gpio/sh_pfc.c b/drivers/gpio/sh_pfc.c
index 0653171af482..693aa873ba28 100644
--- a/drivers/gpio/sh_pfc.c
+++ b/drivers/gpio/sh_pfc.c
@@ -17,6 +17,7 @@
 #include <sh_pfc.h>
 #include <linux/bitops.h>
 #include <linux/bug.h>
+#include <linux/kernel.h>
 
 static struct pinmux_info *gpioc;
 
diff --git a/drivers/gpio/sifive-gpio.c b/drivers/gpio/sifive-gpio.c
index 76e3c702e21f..51c3ce610a1e 100644
--- a/drivers/gpio/sifive-gpio.c
+++ b/drivers/gpio/sifive-gpio.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <stdbool.h>
 #include <vsprintf.h>
 #include <asm/arch/gpio.h>
 #include <asm/io.h>
diff --git a/drivers/gpio/tca642x.c b/drivers/gpio/tca642x.c
index 9929eed5d1b0..8b2057607bc5 100644
--- a/drivers/gpio/tca642x.c
+++ b/drivers/gpio/tca642x.c
@@ -26,6 +26,7 @@
 #include <stdio.h>
 #include <tca642x.h>
 #include <vsprintf.h>
+#include <linux/kernel.h>
 
 /* tca642x register address definitions */
 struct tca642x_bank_info tca642x_regs[] = {
diff --git a/drivers/gpio/tegra186_gpio.c b/drivers/gpio/tegra186_gpio.c
index cf973e2d7f26..affabbbf9a60 100644
--- a/drivers/gpio/tegra186_gpio.c
+++ b/drivers/gpio/tegra186_gpio.c
@@ -15,6 +15,7 @@
 #include <dm/device-internal.h>
 #include <dt-bindings/gpio/gpio.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include "tegra186_gpio_priv.h"
 
 struct tegra186_gpio_port_data {
diff --git a/drivers/i2c/at91_i2c.c b/drivers/i2c/at91_i2c.c
index b825599dba54..c656db557067 100644
--- a/drivers/i2c/at91_i2c.c
+++ b/drivers/i2c/at91_i2c.c
@@ -17,6 +17,7 @@
 #include <i2c.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <mach/clk.h>
 
 #include "at91_i2c.h"
diff --git a/drivers/i2c/cros_ec_ldo.c b/drivers/i2c/cros_ec_ldo.c
index 13b9973b543d..e894a1a3eb25 100644
--- a/drivers/i2c/cros_ec_ldo.c
+++ b/drivers/i2c/cros_ec_ldo.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <i2c.h>
 #include <log.h>
+#include <stdbool.h>
 #include <linux/errno.h>
 #include <power/tps65090.h>
 
diff --git a/drivers/i2c/designware_i2c.c b/drivers/i2c/designware_i2c.c
index e32bfbc2c290..5aad1a299770 100644
--- a/drivers/i2c/designware_i2c.c
+++ b/drivers/i2c/designware_i2c.c
@@ -17,6 +17,7 @@
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include "designware_i2c.h"
 #include <dm/device_compat.h>
 #include <linux/err.h>
diff --git a/drivers/i2c/designware_i2c.h b/drivers/i2c/designware_i2c.h
index 18acf4e841b4..0f34cc8b5ab3 100644
--- a/drivers/i2c/designware_i2c.h
+++ b/drivers/i2c/designware_i2c.h
@@ -10,6 +10,7 @@
 #include <clk.h>
 #include <i2c.h>
 #include <reset.h>
+#include <stdbool.h>
 #include <linux/bitops.h>
 
 struct i2c_regs {
diff --git a/drivers/i2c/designware_i2c_pci.c b/drivers/i2c/designware_i2c_pci.c
index 50649710aae3..5f2084acda89 100644
--- a/drivers/i2c/designware_i2c_pci.c
+++ b/drivers/i2c/designware_i2c_pci.c
@@ -17,6 +17,7 @@
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include "designware_i2c.h"
 
 enum {
diff --git a/drivers/i2c/exynos_hs_i2c.c b/drivers/i2c/exynos_hs_i2c.c
index c334755a2764..f34c71125296 100644
--- a/drivers/i2c/exynos_hs_i2c.c
+++ b/drivers/i2c/exynos_hs_i2c.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/arch/clk.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/pinmux.h>
diff --git a/drivers/i2c/fsl_i2c.c b/drivers/i2c/fsl_i2c.c
index ad63c108a03d..7620e588d659 100644
--- a/drivers/i2c/fsl_i2c.c
+++ b/drivers/i2c/fsl_i2c.c
@@ -19,6 +19,7 @@
 #include <mapmem.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 /* The maximum number of microseconds we will wait until another master has
diff --git a/drivers/i2c/i2c-cdns.c b/drivers/i2c/i2c-cdns.c
index abbfdcbcc5c9..a5781bcfec23 100644
--- a/drivers/i2c/i2c-cdns.c
+++ b/drivers/i2c/i2c-cdns.c
@@ -13,6 +13,7 @@
 #include <stdio.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/types.h>
 #include <linux/io.h>
 #include <linux/errno.h>
diff --git a/drivers/i2c/i2c-gpio.c b/drivers/i2c/i2c-gpio.c
index c29e5d7def0f..7e47bed9f4bb 100644
--- a/drivers/i2c/i2c-gpio.c
+++ b/drivers/i2c/i2c-gpio.c
@@ -14,6 +14,7 @@
 #include <asm/gpio.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 
 #define DEFAULT_UDELAY	5
diff --git a/drivers/i2c/i2c-uclass.c b/drivers/i2c/i2c-uclass.c
index 9e2d5dd0b122..f5a1890d5c93 100644
--- a/drivers/i2c/i2c-uclass.c
+++ b/drivers/i2c/i2c-uclass.c
@@ -19,6 +19,7 @@
 #endif
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #define I2C_MAX_OFFSET_LEN	4
diff --git a/drivers/i2c/i2c-uniphier-f.c b/drivers/i2c/i2c-uniphier-f.c
index a110fe9e8d95..c78378fa1839 100644
--- a/drivers/i2c/i2c-uniphier-f.c
+++ b/drivers/i2c/i2c-uniphier-f.c
@@ -5,6 +5,7 @@
  *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  */
 
+#include <stdbool.h>
 #include <dm/device_compat.h>
 #include <linux/errno.h>
 #include <linux/io.h>
diff --git a/drivers/i2c/i2c-uniphier.c b/drivers/i2c/i2c-uniphier.c
index e7f44e14e9c2..c1f1eb0325bf 100644
--- a/drivers/i2c/i2c-uniphier.c
+++ b/drivers/i2c/i2c-uniphier.c
@@ -5,6 +5,7 @@
  *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  */
 
+#include <stdbool.h>
 #include <dm/device_compat.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/i2c/ihs_i2c.c b/drivers/i2c/ihs_i2c.c
index 31e8cc5d8eb2..5550da806222 100644
--- a/drivers/i2c/ihs_i2c.c
+++ b/drivers/i2c/ihs_i2c.c
@@ -18,6 +18,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #ifdef CONFIG_DM_I2C
diff --git a/drivers/i2c/imx_lpi2c.c b/drivers/i2c/imx_lpi2c.c
index f7186639d185..aa5c65728cd5 100644
--- a/drivers/i2c/imx_lpi2c.c
+++ b/drivers/i2c/imx_lpi2c.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <errno.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <asm/io.h>
diff --git a/drivers/i2c/meson_i2c.c b/drivers/i2c/meson_i2c.c
index 051b238e1668..3e4b10aff54f 100644
--- a/drivers/i2c/meson_i2c.c
+++ b/drivers/i2c/meson_i2c.c
@@ -13,6 +13,7 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #define I2C_TIMEOUT_MS		100
 
diff --git a/drivers/i2c/mxc_i2c.c b/drivers/i2c/mxc_i2c.c
index 683b45bd8fd4..dfa84836f53b 100644
--- a/drivers/i2c/mxc_i2c.c
+++ b/drivers/i2c/mxc_i2c.c
@@ -32,6 +32,7 @@
 #include <dm.h>
 #include <dm/pinctrl.h>
 #include <fdtdec.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/i2c/nx_i2c.c b/drivers/i2c/nx_i2c.c
index 738796788af8..54a7bc85f69a 100644
--- a/drivers/i2c/nx_i2c.c
+++ b/drivers/i2c/nx_i2c.c
@@ -10,6 +10,7 @@
 #include <asm/arch/nx_gpio.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #define I2C_WRITE       0
 #define I2C_READ        1
diff --git a/drivers/i2c/rcar_iic.c b/drivers/i2c/rcar_iic.c
index dd0e921725be..6899a68a8475 100644
--- a/drivers/i2c/rcar_iic.c
+++ b/drivers/i2c/rcar_iic.c
@@ -17,6 +17,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 struct rcar_iic_priv {
 	void __iomem		*base;
diff --git a/drivers/i2c/rk_i2c.c b/drivers/i2c/rk_i2c.c
index 98a0aee9b0ef..e430a790df03 100644
--- a/drivers/i2c/rk_i2c.c
+++ b/drivers/i2c/rk_i2c.c
@@ -20,6 +20,7 @@
 #include <dm/pinctrl.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 
 /* i2c timerout */
diff --git a/drivers/i2c/s3c24x0_i2c.c b/drivers/i2c/s3c24x0_i2c.c
index ae3084d549d8..6cc63b528dd8 100644
--- a/drivers/i2c/s3c24x0_i2c.c
+++ b/drivers/i2c/s3c24x0_i2c.c
@@ -16,6 +16,7 @@
 #else
 #include <asm/arch/s3c24x0_cpu.h>
 #endif
+#include <stdbool.h>
 #include <time.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/i2c/s3c24x0_i2c.h b/drivers/i2c/s3c24x0_i2c.h
index ec8f1acaef54..7a37b8071b67 100644
--- a/drivers/i2c/s3c24x0_i2c.h
+++ b/drivers/i2c/s3c24x0_i2c.h
@@ -6,6 +6,7 @@
 #ifndef _S3C24X0_I2C_H
 #define _S3C24X0_I2C_H
 
+#include <stdbool.h>
 struct s3c24x0_i2c {
 	u32	iiccon;
 	u32	iicstat;
diff --git a/drivers/i2c/sandbox_i2c.c b/drivers/i2c/sandbox_i2c.c
index 2afd17f92fc5..10dee15a667f 100644
--- a/drivers/i2c/sandbox_i2c.c
+++ b/drivers/i2c/sandbox_i2c.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <i2c.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/test.h>
 #include <dm/acpi.h>
 #include <dm/lists.h>
diff --git a/drivers/i2c/stm32f7_i2c.c b/drivers/i2c/stm32f7_i2c.c
index a353f063ed96..94c0cf6f342c 100644
--- a/drivers/i2c/stm32f7_i2c.c
+++ b/drivers/i2c/stm32f7_i2c.c
@@ -15,6 +15,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/i2c/tegra186_bpmp_i2c.c b/drivers/i2c/tegra186_bpmp_i2c.c
index 188821bb8789..c9446ed783f8 100644
--- a/drivers/i2c/tegra186_bpmp_i2c.c
+++ b/drivers/i2c/tegra186_bpmp_i2c.c
@@ -12,6 +12,7 @@
 #include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/i2c/tegra_i2c.c b/drivers/i2c/tegra_i2c.c
index 03687b7532be..5b05290224ae 100644
--- a/drivers/i2c/tegra_i2c.c
+++ b/drivers/i2c/tegra_i2c.c
@@ -22,6 +22,7 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/input/cros_ec_keyb.c b/drivers/input/cros_ec_keyb.c
index 60f89562fadf..dea523145428 100644
--- a/drivers/input/cros_ec_keyb.c
+++ b/drivers/input/cros_ec_keyb.c
@@ -13,6 +13,7 @@
 #include <keyboard.h>
 #include <key_matrix.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio_dev.h>
 #include <linux/errno.h>
 #include <linux/string.h>
diff --git a/drivers/input/i8042.c b/drivers/input/i8042.c
index b2320d648f3e..b28e3621870b 100644
--- a/drivers/input/i8042.c
+++ b/drivers/input/i8042.c
@@ -14,6 +14,7 @@
 #include <input.h>
 #include <keyboard.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/delay.h>
diff --git a/drivers/input/input.c b/drivers/input/input.c
index 37dae11d97a3..4b54df8a8710 100644
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -19,6 +19,7 @@
 #endif
 #include <time.h>
 #include <linux/input.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 enum {
diff --git a/drivers/led/led_bcm6328.c b/drivers/led/led_bcm6328.c
index 4a07bcc8a705..84f9a4ceca68 100644
--- a/drivers/led/led_bcm6328.c
+++ b/drivers/led/led_bcm6328.c
@@ -8,6 +8,7 @@
 #include <errno.h>
 #include <led.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <dm/lists.h>
 #include <linux/errno.h>
diff --git a/drivers/led/led_bcm6358.c b/drivers/led/led_bcm6358.c
index 019a84813ac5..f8fdfcc23dec 100644
--- a/drivers/led/led_bcm6358.c
+++ b/drivers/led/led_bcm6358.c
@@ -8,6 +8,7 @@
 #include <errno.h>
 #include <led.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <dm/lists.h>
 #include <linux/delay.h>
diff --git a/drivers/led/led_bcm6858.c b/drivers/led/led_bcm6858.c
index c0f5a1a7bb65..b44232773b64 100644
--- a/drivers/led/led_bcm6858.c
+++ b/drivers/led/led_bcm6858.c
@@ -16,6 +16,7 @@
 #include <dm/lists.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #define LEDS_MAX		32
 #define LEDS_WAIT		100
diff --git a/drivers/mailbox/k3-sec-proxy.c b/drivers/mailbox/k3-sec-proxy.c
index d9516bd59e40..c2c77b64244a 100644
--- a/drivers/mailbox/k3-sec-proxy.c
+++ b/drivers/mailbox/k3-sec-proxy.c
@@ -14,6 +14,7 @@
 #include <asm/io.h>
 #include <dm/device_compat.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/types.h>
 #include <linux/bitops.h>
 #include <linux/soc/ti/k3-sec-proxy.h>
diff --git a/drivers/mailbox/sandbox-mbox.c b/drivers/mailbox/sandbox-mbox.c
index 4dd5371fc198..27d2b7b99760 100644
--- a/drivers/mailbox/sandbox-mbox.c
+++ b/drivers/mailbox/sandbox-mbox.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <mailbox-uclass.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <asm/mbox.h>
 #include <linux/errno.h>
diff --git a/drivers/misc/atsha204a-i2c.c b/drivers/misc/atsha204a-i2c.c
index 5262c005a04e..2df8d1070c0a 100644
--- a/drivers/misc/atsha204a-i2c.c
+++ b/drivers/misc/atsha204a-i2c.c
@@ -16,6 +16,7 @@
 #include <errno.h>
 #include <atsha204a-i2c.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/misc/cros_ec.c b/drivers/misc/cros_ec.c
index a3ae33acd053..7979989e1a65 100644
--- a/drivers/misc/cros_ec.c
+++ b/drivers/misc/cros_ec.c
@@ -34,6 +34,7 @@
 #include <dm/device-internal.h>
 #include <dm/of_extra.h>
 #include <dm/uclass-internal.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #ifdef DEBUG_TRACE
diff --git a/drivers/misc/cros_ec_i2c.c b/drivers/misc/cros_ec_i2c.c
index 782ee703eb60..2118afee76a9 100644
--- a/drivers/misc/cros_ec_i2c.c
+++ b/drivers/misc/cros_ec_i2c.c
@@ -19,6 +19,7 @@
 #include <log.h>
 #include <stdio.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #ifdef DEBUG_TRACE
diff --git a/drivers/misc/cros_ec_sandbox.c b/drivers/misc/cros_ec_sandbox.c
index 5a5af51eb39f..b32822432437 100644
--- a/drivers/misc/cros_ec_sandbox.c
+++ b/drivers/misc/cros_ec_sandbox.c
@@ -16,6 +16,7 @@
 #include <stdio.h>
 #include <time.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <u-boot/sha256.h>
 #include <spi.h>
diff --git a/drivers/misc/cros_ec_spi.c b/drivers/misc/cros_ec_spi.c
index bb7b8c1b1de6..3c3db889d61e 100644
--- a/drivers/misc/cros_ec_spi.c
+++ b/drivers/misc/cros_ec_spi.c
@@ -21,6 +21,7 @@
 #include <stdio.h>
 #include <time.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 int cros_ec_spi_packet(struct udevice *udev, int out_bytes, int in_bytes)
diff --git a/drivers/misc/ds4510.c b/drivers/misc/ds4510.c
index 4cf609bdad4c..8d3a690aa1bc 100644
--- a/drivers/misc/ds4510.c
+++ b/drivers/misc/ds4510.c
@@ -14,6 +14,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "ds4510.h"
 
diff --git a/drivers/misc/fsl_ifc.c b/drivers/misc/fsl_ifc.c
index 27666a71fb36..bf2f9a1ac8ee 100644
--- a/drivers/misc/fsl_ifc.c
+++ b/drivers/misc/fsl_ifc.c
@@ -8,6 +8,7 @@
 #include <fsl_ifc.h>
 #include <part.h>
 #include <stdio.h>
+#include <linux/kernel.h>
 
 #ifdef CONFIG_TFABOOT
 struct ifc_regs ifc_cfg_default_boot[CONFIG_SYS_FSL_IFC_BANK_COUNT] = {
diff --git a/drivers/misc/fsl_iim.c b/drivers/misc/fsl_iim.c
index be6d03444d5f..07c7a492081c 100644
--- a/drivers/misc/fsl_iim.c
+++ b/drivers/misc/fsl_iim.c
@@ -18,6 +18,7 @@
 #if defined(CONFIG_MX51) || defined(CONFIG_MX53)
 #include <asm/arch/clock.h>
 #endif
+#include <linux/kernel.h>
 
 /* FSL IIM-specific constants */
 #define STAT_BUSY		0x80
diff --git a/drivers/misc/gdsys_ioep.c b/drivers/misc/gdsys_ioep.c
index 22afebd9ab07..ebcd4d91e89d 100644
--- a/drivers/misc/gdsys_ioep.c
+++ b/drivers/misc/gdsys_ioep.c
@@ -16,6 +16,7 @@
 #include <log.h>
 #include <misc.h>
 #include <regmap.h>
+#include <stdbool.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 
diff --git a/drivers/misc/gdsys_rxaui_ctrl.c b/drivers/misc/gdsys_rxaui_ctrl.c
index c56abce4d4c1..7cc350d3cc98 100644
--- a/drivers/misc/gdsys_rxaui_ctrl.c
+++ b/drivers/misc/gdsys_rxaui_ctrl.c
@@ -11,6 +11,7 @@
 #include <dm.h>
 #include <regmap.h>
 #include <misc.h>
+#include <stdbool.h>
 
 struct gdsys_rxaui_ctrl_regs {
 	u16 gen_cnt;
diff --git a/drivers/misc/gpio_led.c b/drivers/misc/gpio_led.c
index acf3ec8c017f..68f46fd59d93 100644
--- a/drivers/misc/gpio_led.c
+++ b/drivers/misc/gpio_led.c
@@ -9,6 +9,7 @@
 #include <status_led.h>
 #include <stdio.h>
 #include <asm/gpio.h>
+#include <linux/kernel.h>
 
 #ifndef CONFIG_GPIO_LED_INVERTED_TABLE
 #define CONFIG_GPIO_LED_INVERTED_TABLE {}
diff --git a/drivers/misc/i2c_eeprom_emul.c b/drivers/misc/i2c_eeprom_emul.c
index 9f0d89673d97..e7f9ccdf8483 100644
--- a/drivers/misc/i2c_eeprom_emul.c
+++ b/drivers/misc/i2c_eeprom_emul.c
@@ -13,6 +13,7 @@
 #include <malloc.h>
 #include <asm/test.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #ifdef DEBUG
diff --git a/drivers/misc/ihs_fpga.c b/drivers/misc/ihs_fpga.c
index 9dbb857101d0..fd9c0f937ff8 100644
--- a/drivers/misc/ihs_fpga.c
+++ b/drivers/misc/ihs_fpga.c
@@ -13,6 +13,7 @@
 #include <dm.h>
 #include <log.h>
 #include <regmap.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/gpio.h>
 #include <linux/bitops.h>
diff --git a/drivers/misc/irq-uclass.c b/drivers/misc/irq-uclass.c
index 6b6813e1fc50..3795f5eaa1bb 100644
--- a/drivers/misc/irq-uclass.c
+++ b/drivers/misc/irq-uclass.c
@@ -11,6 +11,7 @@
 #include <dt-structs.h>
 #include <irq.h>
 #include <log.h>
+#include <stdbool.h>
 #include <dm/device-internal.h>
 #include <linux/errno.h>
 
diff --git a/drivers/misc/irq_sandbox.c b/drivers/misc/irq_sandbox.c
index 14366febd382..625aa1406514 100644
--- a/drivers/misc/irq_sandbox.c
+++ b/drivers/misc/irq_sandbox.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <dm.h>
 #include <irq.h>
+#include <stdbool.h>
 #include <acpi/acpi_device.h>
 #include <asm/test.h>
 #include <linux/errno.h>
diff --git a/drivers/misc/misc-uclass.c b/drivers/misc/misc-uclass.c
index c0db58b89679..11ecfc44839c 100644
--- a/drivers/misc/misc-uclass.c
+++ b/drivers/misc/misc-uclass.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <misc.h>
+#include <stdbool.h>
 #include <linux/errno.h>
 
 /*
diff --git a/drivers/misc/misc_sandbox.c b/drivers/misc/misc_sandbox.c
index 4e3e8a4a3640..0149e8d9a796 100644
--- a/drivers/misc/misc_sandbox.c
+++ b/drivers/misc/misc_sandbox.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <misc.h>
+#include <stdbool.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 
diff --git a/drivers/misc/mpc83xx_serdes.c b/drivers/misc/mpc83xx_serdes.c
index 925e6ec3ab83..0f182de1568d 100644
--- a/drivers/misc/mpc83xx_serdes.c
+++ b/drivers/misc/mpc83xx_serdes.c
@@ -14,6 +14,7 @@
 #include <log.h>
 #include <mapmem.h>
 #include <misc.h>
+#include <stdbool.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/string.h>
diff --git a/drivers/misc/mxc_ocotp.c b/drivers/misc/mxc_ocotp.c
index 5d7a74afe2c2..cce6cb72c5e5 100644
--- a/drivers/misc/mxc_ocotp.c
+++ b/drivers/misc/mxc_ocotp.c
@@ -13,6 +13,7 @@
 
 #include <common.h>
 #include <fuse.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
@@ -20,6 +21,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/mach-imx/sys_proto.h>
+#include <linux/kernel.h>
 
 #define BO_CTRL_WR_UNLOCK		16
 #define BM_CTRL_WR_UNLOCK		0xffff0000
diff --git a/drivers/misc/mxs_ocotp.c b/drivers/misc/mxs_ocotp.c
index fa185612b2c1..ede9d9e74239 100644
--- a/drivers/misc/mxs_ocotp.c
+++ b/drivers/misc/mxs_ocotp.c
@@ -13,6 +13,7 @@
 
 #include <common.h>
 #include <fuse.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/misc/p2sb-uclass.c b/drivers/misc/p2sb-uclass.c
index 149f3d28ebf2..eea0e0f528fd 100644
--- a/drivers/misc/p2sb-uclass.c
+++ b/drivers/misc/p2sb-uclass.c
@@ -16,6 +16,7 @@
 #include <asm/io.h>
 #include <dm/uclass-internal.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #define PCR_COMMON_IOSF_1_0	1
 
diff --git a/drivers/misc/p2sb_emul.c b/drivers/misc/p2sb_emul.c
index 3c17f6de3f6a..ae68cd9c71af 100644
--- a/drivers/misc/p2sb_emul.c
+++ b/drivers/misc/p2sb_emul.c
@@ -17,6 +17,7 @@
 #include <asm/test.h>
 #include <p2sb.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 /**
  * struct p2sb_emul_platdata - platform data for this device
diff --git a/drivers/misc/pwrseq-uclass.c b/drivers/misc/pwrseq-uclass.c
index 220567ee2798..8ad5c1b5a6b8 100644
--- a/drivers/misc/pwrseq-uclass.c
+++ b/drivers/misc/pwrseq-uclass.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <dm.h>
 #include <pwrseq.h>
+#include <stdbool.h>
 #include <linux/errno.h>
 
 int pwrseq_set_power(struct udevice *dev, bool enable)
diff --git a/drivers/misc/qfw.c b/drivers/misc/qfw.c
index c5629183f860..cd845a71bf60 100644
--- a/drivers/misc/qfw.c
+++ b/drivers/misc/qfw.c
@@ -15,6 +15,7 @@
 #include <asm/tables.h>
 #endif
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/list.h>
 #include <linux/string.h>
 
diff --git a/drivers/misc/rockchip-efuse.c b/drivers/misc/rockchip-efuse.c
index d5c1a62ba644..ad825e940f1c 100644
--- a/drivers/misc/rockchip-efuse.c
+++ b/drivers/misc/rockchip-efuse.c
@@ -15,6 +15,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <misc.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #define RK3399_A_SHIFT          16
diff --git a/drivers/misc/rockchip-otp.c b/drivers/misc/rockchip-otp.c
index a8563a305d0c..6f438c41df59 100644
--- a/drivers/misc/rockchip-otp.c
+++ b/drivers/misc/rockchip-otp.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/io.h>
 #include <command.h>
diff --git a/drivers/misc/spltest_sandbox.c b/drivers/misc/spltest_sandbox.c
index 8a5e6b1975ec..1bb4120a06d2 100644
--- a/drivers/misc/spltest_sandbox.c
+++ b/drivers/misc/spltest_sandbox.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <dt-structs.h>
 #include <stdio.h>
+#include <linux/kernel.h>
 
 static int sandbox_spl_probe(struct udevice *dev)
 {
diff --git a/drivers/misc/swap_case.c b/drivers/misc/swap_case.c
index 64f29f86baa3..fa3ed8671c27 100644
--- a/drivers/misc/swap_case.c
+++ b/drivers/misc/swap_case.c
@@ -14,6 +14,7 @@
 #include <asm/test.h>
 #include <linux/ctype.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 /**
  * struct swap_case_platdata - platform data for this device
diff --git a/drivers/misc/tegra186_bpmp.c b/drivers/misc/tegra186_bpmp.c
index 24ff0cd120d0..969132859272 100644
--- a/drivers/misc/tegra186_bpmp.c
+++ b/drivers/misc/tegra186_bpmp.c
@@ -18,6 +18,7 @@
 #include <linux/bitops.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/misc/vexpress_config.c b/drivers/misc/vexpress_config.c
index 2b1d19a14a7e..3a74ffcaddad 100644
--- a/drivers/misc/vexpress_config.c
+++ b/drivers/misc/vexpress_config.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <dm/read.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
diff --git a/drivers/mmc/bcm2835_sdhost.c b/drivers/mmc/bcm2835_sdhost.c
index 97ca2ce029af..315a829f2055 100644
--- a/drivers/mmc/bcm2835_sdhost.c
+++ b/drivers/mmc/bcm2835_sdhost.c
@@ -46,6 +46,7 @@
 #include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/iopoll.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <mach/gpio.h>
 #include <power/regulator.h>
diff --git a/drivers/mmc/dw_mmc.c b/drivers/mmc/dw_mmc.c
index 8c690c3ce127..d77e13784549 100644
--- a/drivers/mmc/dw_mmc.c
+++ b/drivers/mmc/dw_mmc.c
@@ -19,6 +19,7 @@
 #include <asm/cache.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <power/regulator.h>
 
 #define PAGE_SIZE 4096
diff --git a/drivers/mmc/exynos_dw_mmc.c b/drivers/mmc/exynos_dw_mmc.c
index f54413aa9e5c..9fcb416b0421 100644
--- a/drivers/mmc/exynos_dw_mmc.c
+++ b/drivers/mmc/exynos_dw_mmc.c
@@ -10,6 +10,7 @@
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <malloc.h>
 #include <errno.h>
diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c
index 6ad270e7c2d8..ebe672a41f08 100644
--- a/drivers/mmc/fsl_esdhc.c
+++ b/drivers/mmc/fsl_esdhc.c
@@ -35,6 +35,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/mmc/fsl_esdhc_imx.c b/drivers/mmc/fsl_esdhc_imx.c
index ffd21684d3f6..0fa066e86197 100644
--- a/drivers/mmc/fsl_esdhc_imx.c
+++ b/drivers/mmc/fsl_esdhc_imx.c
@@ -30,6 +30,7 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include <power/regulator.h>
diff --git a/drivers/mmc/fsl_esdhc_spl.c b/drivers/mmc/fsl_esdhc_spl.c
index 4c725436de45..3359d67fafa6 100644
--- a/drivers/mmc/fsl_esdhc_spl.c
+++ b/drivers/mmc/fsl_esdhc_spl.c
@@ -9,6 +9,7 @@
 #include <mmc.h>
 #include <malloc.h>
 #include <stdio.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 /*
diff --git a/drivers/mmc/ftsdc010_mci.h b/drivers/mmc/ftsdc010_mci.h
index 782d92be2f5f..2c487b4176d0 100644
--- a/drivers/mmc/ftsdc010_mci.h
+++ b/drivers/mmc/ftsdc010_mci.h
@@ -6,6 +6,7 @@
  * Macpaul Lin, Andes Technology Corporation <macpaul@andestech.com>
  */
 #include <mmc.h>
+#include <stdbool.h>
 
 #ifndef __FTSDC010_MCI_H
 #define __FTSDC010_MCI_H
diff --git a/drivers/mmc/gen_atmel_mci.c b/drivers/mmc/gen_atmel_mci.c
index 19ba2b51182f..4b1869ae65c4 100644
--- a/drivers/mmc/gen_atmel_mci.c
+++ b/drivers/mmc/gen_atmel_mci.c
@@ -23,6 +23,7 @@
 #include <asm/byteorder.h>
 #include <asm/arch/clk.h>
 #include <asm/arch/hardware.h>
+#include <linux/kernel.h>
 #include "atmel_mci.h"
 
 #ifndef CONFIG_SYS_MMC_CLK_OD
diff --git a/drivers/mmc/hi6220_dw_mmc.c b/drivers/mmc/hi6220_dw_mmc.c
index 61c209cb0a7f..b3a8c5d50d8c 100644
--- a/drivers/mmc/hi6220_dw_mmc.c
+++ b/drivers/mmc/hi6220_dw_mmc.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <fdtdec.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/mmc/jz_mmc.c b/drivers/mmc/jz_mmc.c
index 608e56239764..c8c7127cbe85 100644
--- a/drivers/mmc/jz_mmc.c
+++ b/drivers/mmc/jz_mmc.c
@@ -17,6 +17,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <mach/jz4780.h>
 #include <wait_bit.h>
 
diff --git a/drivers/mmc/meson_gx_mmc.c b/drivers/mmc/meson_gx_mmc.c
index b804a0c83648..2df20418be3d 100644
--- a/drivers/mmc/meson_gx_mmc.c
+++ b/drivers/mmc/meson_gx_mmc.c
@@ -17,6 +17,7 @@
 #include <asm/arch/sd_emmc.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/log2.h>
 #include <linux/string.h>
 
diff --git a/drivers/mmc/mmc-uclass.c b/drivers/mmc/mmc-uclass.c
index cdc93c756c0b..da06aa9e7b6a 100644
--- a/drivers/mmc/mmc-uclass.c
+++ b/drivers/mmc/mmc-uclass.c
@@ -15,6 +15,7 @@
 #include <dm/lists.h>
 #include <linux/compat.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include "mmc_private.h"
 
 int dm_mmc_get_b_max(struct udevice *dev, void *dst, lbaint_t blkcnt)
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index 932205968960..e38950dd6e0e 100644
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@ -24,6 +24,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include <power/regulator.h>
diff --git a/drivers/mmc/mmc_spi.c b/drivers/mmc/mmc_spi.c
index 0581adb08415..ac8a127029cb 100644
--- a/drivers/mmc/mmc_spi.c
+++ b/drivers/mmc/mmc_spi.c
@@ -12,6 +12,7 @@
 #include <malloc.h>
 #include <part.h>
 #include <mmc.h>
+#include <stdbool.h>
 #include <stdlib.h>
 #include <vsprintf.h>
 #include <linux/bitops.h>
diff --git a/drivers/mmc/mmc_write.c b/drivers/mmc/mmc_write.c
index 68d872fd142b..93eb1404def4 100644
--- a/drivers/mmc/mmc_write.c
+++ b/drivers/mmc/mmc_write.c
@@ -13,6 +13,7 @@
 #include <part.h>
 #include <div64.h>
 #include <stdio.h>
+#include <linux/kernel.h>
 #include <linux/math64.h>
 #include "mmc_private.h"
 
diff --git a/drivers/mmc/mtk-sd.c b/drivers/mmc/mtk-sd.c
index 2ec53e853a97..b6632a32d363 100644
--- a/drivers/mmc/mtk-sd.c
+++ b/drivers/mmc/mtk-sd.c
@@ -21,6 +21,7 @@
 #include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/iopoll.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 
 /* MSDC_CFG */
diff --git a/drivers/mmc/mxsmmc.c b/drivers/mmc/mxsmmc.c
index a54e1e128359..615ed6b17006 100644
--- a/drivers/mmc/mxsmmc.c
+++ b/drivers/mmc/mxsmmc.c
@@ -35,6 +35,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/mach-imx/dma.h>
 #include <bouncebuf.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #define	MXSMMC_MAX_TIMEOUT	10000
diff --git a/drivers/mmc/nexell_dw_mmc.c b/drivers/mmc/nexell_dw_mmc.c
index e5df2920242f..35704e74d6b6 100644
--- a/drivers/mmc/nexell_dw_mmc.c
+++ b/drivers/mmc/nexell_dw_mmc.c
@@ -11,6 +11,7 @@
 #include <dt-structs.h>
 #include <dwmmc.h>
 #include <log.h>
+#include <stdbool.h>
 #include <syscon.h>
 #include <asm/arch/reset.h>
 #include <asm/arch/clk.h>
diff --git a/drivers/mmc/omap_hsmmc.c b/drivers/mmc/omap_hsmmc.c
index 606c4a5c1c6c..4de6bb1d9725 100644
--- a/drivers/mmc/omap_hsmmc.c
+++ b/drivers/mmc/omap_hsmmc.c
@@ -58,6 +58,7 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <power/regulator.h>
 #include <thermal.h>
 
diff --git a/drivers/mmc/pxa_mmc_gen.c b/drivers/mmc/pxa_mmc_gen.c
index 854d346a7469..5a4652e2461b 100644
--- a/drivers/mmc/pxa_mmc_gen.c
+++ b/drivers/mmc/pxa_mmc_gen.c
@@ -19,6 +19,7 @@
 #include <dm/platform_data/pxa_mmc_gen.h>
 #include <malloc.h>
 #include <mmc.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 /* PXAMMC Generic default config for various CPUs */
diff --git a/drivers/mmc/renesas-sdhi.c b/drivers/mmc/renesas-sdhi.c
index 4e8d2a9e509a..1c4ce0ff02a9 100644
--- a/drivers/mmc/renesas-sdhi.c
+++ b/drivers/mmc/renesas-sdhi.c
@@ -19,6 +19,7 @@
 #include <linux/dma-direction.h>
 #include <linux/errno.h>
 #include <linux/io.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <power/regulator.h>
 #include <asm/unaligned.h>
diff --git a/drivers/mmc/rpmb.c b/drivers/mmc/rpmb.c
index 93fdf72f3444..b07a10c0f781 100644
--- a/drivers/mmc/rpmb.c
+++ b/drivers/mmc/rpmb.c
@@ -13,6 +13,7 @@
 #include <memalign.h>
 #include <mmc.h>
 #include <sdhci.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <linux/errno.h>
 #include <linux/string.h>
diff --git a/drivers/mmc/sandbox_mmc.c b/drivers/mmc/sandbox_mmc.c
index d4780271fc30..58c79a8821b3 100644
--- a/drivers/mmc/sandbox_mmc.c
+++ b/drivers/mmc/sandbox_mmc.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <mmc.h>
 #include <asm/test.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 struct sandbox_mmc_plat {
diff --git a/drivers/mmc/sdhci-cadence.c b/drivers/mmc/sdhci-cadence.c
index 96901bce72da..fd5b77351a25 100644
--- a/drivers/mmc/sdhci-cadence.c
+++ b/drivers/mmc/sdhci-cadence.c
@@ -14,6 +14,7 @@
 #include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/iopoll.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <linux/libfdt.h>
 #include <mmc.h>
diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c
index f6b8625c21eb..917856a45d2c 100644
--- a/drivers/mmc/sdhci.c
+++ b/drivers/mmc/sdhci.c
@@ -23,6 +23,7 @@
 #include <linux/dma-mapping.h>
 #include <phys2bus.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/mmc/sh_mmcif.c b/drivers/mmc/sh_mmcif.c
index e9ff31b4afe5..ede46d1b6acc 100644
--- a/drivers/mmc/sh_mmcif.c
+++ b/drivers/mmc/sh_mmcif.c
@@ -22,6 +22,7 @@
 #include <linux/errno.h>
 #include <linux/compat.h>
 #include <linux/io.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <linux/string.h>
 #include "sh_mmcif.h"
diff --git a/drivers/mmc/snps_dw_mmc.c b/drivers/mmc/snps_dw_mmc.c
index f123d3fe2222..5572afa1e487 100644
--- a/drivers/mmc/snps_dw_mmc.c
+++ b/drivers/mmc/snps_dw_mmc.c
@@ -15,6 +15,7 @@
 #include <fdtdec.h>
 #include <dm/device_compat.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <linux/err.h>
 #include <malloc.h>
diff --git a/drivers/mmc/stm32_sdmmc2.c b/drivers/mmc/stm32_sdmmc2.c
index f46c9a8e5bf2..62f9c7a6f5dd 100644
--- a/drivers/mmc/stm32_sdmmc2.c
+++ b/drivers/mmc/stm32_sdmmc2.c
@@ -17,6 +17,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <mmc.h>
 #include <reset.h>
diff --git a/drivers/mmc/sunxi_mmc.c b/drivers/mmc/sunxi_mmc.c
index 7164db122fa8..b562595e2f3a 100644
--- a/drivers/mmc/sunxi_mmc.c
+++ b/drivers/mmc/sunxi_mmc.c
@@ -15,6 +15,7 @@
 #include <mmc.h>
 #include <clk.h>
 #include <reset.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <asm/io.h>
diff --git a/drivers/mmc/tmio-common.c b/drivers/mmc/tmio-common.c
index ff563cf97734..5e8076fcd972 100644
--- a/drivers/mmc/tmio-common.c
+++ b/drivers/mmc/tmio-common.c
@@ -18,6 +18,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/errno.h>
 #include <linux/io.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <power/regulator.h>
 #include <asm/unaligned.h>
diff --git a/drivers/mmc/tmio-common.h b/drivers/mmc/tmio-common.h
index 9062300c64f7..4160cbe0f5ca 100644
--- a/drivers/mmc/tmio-common.h
+++ b/drivers/mmc/tmio-common.h
@@ -7,6 +7,7 @@
 #ifndef __TMIO_COMMON_H__
 #define __TMIO_COMMON_H__
 
+#include <stdbool.h>
 #include <linux/bitops.h>
 #define TMIO_SD_CMD			0x000	/* command */
 #define   TMIO_SD_CMD_NOSTOP		BIT(14)	/* No automatic CMD12 issue */
diff --git a/drivers/mmc/uniphier-sd.c b/drivers/mmc/uniphier-sd.c
index 4dbe71fa2e1e..088e1d9a900f 100644
--- a/drivers/mmc/uniphier-sd.c
+++ b/drivers/mmc/uniphier-sd.c
@@ -14,6 +14,7 @@
 #include <linux/compat.h>
 #include <linux/dma-direction.h>
 #include <linux/io.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <power/regulator.h>
 #include <asm/unaligned.h>
diff --git a/drivers/mmc/xenon_sdhci.c b/drivers/mmc/xenon_sdhci.c
index 355b4eecb093..46c8db49547f 100644
--- a/drivers/mmc/xenon_sdhci.c
+++ b/drivers/mmc/xenon_sdhci.c
@@ -17,6 +17,7 @@
 #include <common.h>
 #include <dm.h>
 #include <fdtdec.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c
index 53f605084a5b..5280fb96db18 100644
--- a/drivers/mtd/cfi_flash.c
+++ b/drivers/mtd/cfi_flash.c
@@ -37,6 +37,7 @@
 #include <env_internal.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <mtd/cfi_flash.h>
 #include <watchdog.h>
diff --git a/drivers/mtd/hbmc-am654.c b/drivers/mtd/hbmc-am654.c
index 1583efd267de..848c5ede4139 100644
--- a/drivers/mtd/hbmc-am654.c
+++ b/drivers/mtd/hbmc-am654.c
@@ -4,6 +4,7 @@
 // Author: Vignesh Raghavendra <vigneshr@ti.com>
 
 #include <common.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <dm.h>
 #include <regmap.h>
diff --git a/drivers/mtd/jedec_flash.c b/drivers/mtd/jedec_flash.c
index 790373dac8fc..9456c9abbc3a 100644
--- a/drivers/mtd/jedec_flash.c
+++ b/drivers/mtd/jedec_flash.c
@@ -18,6 +18,7 @@
 #include <asm/processor.h>
 #include <asm/io.h>
 #include <asm/byteorder.h>
+#include <linux/kernel.h>
 
 #define P_ID_AMD_STD CFI_CMDSET_AMD_LEGACY
 
diff --git a/drivers/mtd/nand/bbt.c b/drivers/mtd/nand/bbt.c
index 674b9c98b097..18cd7c9d0164 100644
--- a/drivers/mtd/nand/bbt.c
+++ b/drivers/mtd/nand/bbt.c
@@ -13,6 +13,7 @@
 #include <dm/devres.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/mtd/nand.h>
 #ifndef __UBOOT__
 #include <linux/slab.h>
diff --git a/drivers/mtd/nand/core.c b/drivers/mtd/nand/core.c
index 1d9d13dfe1e3..57e296f59cff 100644
--- a/drivers/mtd/nand/core.c
+++ b/drivers/mtd/nand/core.c
@@ -14,6 +14,7 @@
 #include <linux/compat.h>
 #include <linux/module.h>
 #endif
+#include <stdbool.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/mtd/nand.h>
diff --git a/drivers/mtd/nand/raw/arasan_nfc.c b/drivers/mtd/nand/raw/arasan_nfc.c
index 978174ffa8d8..c604db376c15 100644
--- a/drivers/mtd/nand/raw/arasan_nfc.c
+++ b/drivers/mtd/nand/raw/arasan_nfc.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
diff --git a/drivers/mtd/nand/raw/brcmnand/bcm63158_nand.c b/drivers/mtd/nand/raw/brcmnand/bcm63158_nand.c
index 89c981096ba9..acfe2ba0bd21 100644
--- a/drivers/mtd/nand/raw/brcmnand/bcm63158_nand.c
+++ b/drivers/mtd/nand/raw/brcmnand/bcm63158_nand.c
@@ -10,6 +10,7 @@
 #include <linux/io.h>
 #include <linux/ioport.h>
 #include <dm.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 
 #include "brcmnand.h"
diff --git a/drivers/mtd/nand/raw/brcmnand/bcm6368_nand.c b/drivers/mtd/nand/raw/brcmnand/bcm6368_nand.c
index 3223d9aacfff..4c886e1533f8 100644
--- a/drivers/mtd/nand/raw/brcmnand/bcm6368_nand.c
+++ b/drivers/mtd/nand/raw/brcmnand/bcm6368_nand.c
@@ -9,6 +9,7 @@
 #include <linux/io.h>
 #include <linux/ioport.h>
 #include <dm.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 
 #include "brcmnand.h"
diff --git a/drivers/mtd/nand/raw/brcmnand/bcm68360_nand.c b/drivers/mtd/nand/raw/brcmnand/bcm68360_nand.c
index b8e7b6b2921e..a649b1a89636 100644
--- a/drivers/mtd/nand/raw/brcmnand/bcm68360_nand.c
+++ b/drivers/mtd/nand/raw/brcmnand/bcm68360_nand.c
@@ -9,6 +9,7 @@
 #include <linux/io.h>
 #include <linux/ioport.h>
 #include <dm.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 
 #include "brcmnand.h"
diff --git a/drivers/mtd/nand/raw/brcmnand/bcm6838_nand.c b/drivers/mtd/nand/raw/brcmnand/bcm6838_nand.c
index 071b16c217ae..25bfe253f297 100644
--- a/drivers/mtd/nand/raw/brcmnand/bcm6838_nand.c
+++ b/drivers/mtd/nand/raw/brcmnand/bcm6838_nand.c
@@ -10,6 +10,7 @@
 #include <linux/io.h>
 #include <linux/ioport.h>
 #include <dm.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 
 #include "brcmnand.h"
diff --git a/drivers/mtd/nand/raw/brcmnand/bcm6858_nand.c b/drivers/mtd/nand/raw/brcmnand/bcm6858_nand.c
index e9d23377d47a..926c59eb1485 100644
--- a/drivers/mtd/nand/raw/brcmnand/bcm6858_nand.c
+++ b/drivers/mtd/nand/raw/brcmnand/bcm6858_nand.c
@@ -10,6 +10,7 @@
 #include <linux/io.h>
 #include <linux/ioport.h>
 #include <dm.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 
 #include "brcmnand.h"
diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand.c b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
index cefe65654c5d..b90f26978ffb 100644
--- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c
+++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
@@ -27,6 +27,7 @@
 #include <linux/ioport.h>
 #include <linux/completion.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/log2.h>
 #include <asm/processor.h>
 #include <dm.h>
diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand.h b/drivers/mtd/nand/raw/brcmnand/brcmnand.h
index 6946a62b0679..2a48dfea90c1 100644
--- a/drivers/mtd/nand/raw/brcmnand/brcmnand.h
+++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.h
@@ -3,6 +3,7 @@
 #ifndef __BRCMNAND_H__
 #define __BRCMNAND_H__
 
+#include <stdbool.h>
 #include <linux/types.h>
 #include <linux/io.h>
 
diff --git a/drivers/mtd/nand/raw/davinci_nand.c b/drivers/mtd/nand/raw/davinci_nand.c
index 6c4eb58abb60..c00fc65b6a0d 100644
--- a/drivers/mtd/nand/raw/davinci_nand.c
+++ b/drivers/mtd/nand/raw/davinci_nand.c
@@ -35,6 +35,7 @@
 #include <dm/uclass.h>
 #include <asm/ti-common/davinci_nand.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 
 /* Definitions for 4-bit hardware ECC */
diff --git a/drivers/mtd/nand/raw/denali.c b/drivers/mtd/nand/raw/denali.c
index ca99aa88b3d4..0e84f37784d7 100644
--- a/drivers/mtd/nand/raw/denali.c
+++ b/drivers/mtd/nand/raw/denali.c
@@ -21,6 +21,7 @@
 #include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/io.h>
+#include <linux/kernel.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/rawnand.h>
 #include <linux/string.h>
diff --git a/drivers/mtd/nand/raw/denali_spl.c b/drivers/mtd/nand/raw/denali_spl.c
index 504f773e4dec..ed077fd06bc0 100644
--- a/drivers/mtd/nand/raw/denali_spl.c
+++ b/drivers/mtd/nand/raw/denali_spl.c
@@ -10,6 +10,7 @@
 #include <asm/unaligned.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/mtd/rawnand.h>
 #include <linux/string.h>
 #include "denali.h"
diff --git a/drivers/mtd/nand/raw/fsl_elbc_nand.c b/drivers/mtd/nand/raw/fsl_elbc_nand.c
index 99749f9e50a9..eb95cb003038 100644
--- a/drivers/mtd/nand/raw/fsl_elbc_nand.c
+++ b/drivers/mtd/nand/raw/fsl_elbc_nand.c
@@ -14,6 +14,7 @@
 #include <stdio.h>
 #include <time.h>
 #include <dm/devres.h>
+#include <linux/kernel.h>
 
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/rawnand.h>
diff --git a/drivers/mtd/nand/raw/fsl_ifc_nand.c b/drivers/mtd/nand/raw/fsl_ifc_nand.c
index 33c80d032091..291dda8fb480 100644
--- a/drivers/mtd/nand/raw/fsl_ifc_nand.c
+++ b/drivers/mtd/nand/raw/fsl_ifc_nand.c
@@ -13,6 +13,7 @@
 #include <stdio.h>
 #include <time.h>
 #include <dm/devres.h>
+#include <linux/kernel.h>
 
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/rawnand.h>
diff --git a/drivers/mtd/nand/raw/fsmc_nand.c b/drivers/mtd/nand/raw/fsmc_nand.c
index 0991a398f452..5994c321cacc 100644
--- a/drivers/mtd/nand/raw/fsmc_nand.c
+++ b/drivers/mtd/nand/raw/fsmc_nand.c
@@ -15,6 +15,7 @@
 #include <linux/bitops.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/fsmc_nand.h>
 #include <asm/arch/hardware.h>
diff --git a/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c b/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c
index cfa2510b038f..368ce3e54edf 100644
--- a/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c
+++ b/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c
@@ -27,6 +27,7 @@
 #include <nand.h>
 #include <asm/arch/clk.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/mtd/nand/raw/lpc32xx_nand_slc.c b/drivers/mtd/nand/raw/lpc32xx_nand_slc.c
index 5e8e76c3e5f0..07a44a565ad3 100644
--- a/drivers/mtd/nand/raw/lpc32xx_nand_slc.c
+++ b/drivers/mtd/nand/raw/lpc32xx_nand_slc.c
@@ -14,6 +14,7 @@
 #include <log.h>
 #include <nand.h>
 #include <linux/bug.h>
+#include <linux/kernel.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/errno.h>
 #include <asm/io.h>
diff --git a/drivers/mtd/nand/raw/mxc_nand.c b/drivers/mtd/nand/raw/mxc_nand.c
index a90d30bd1003..f012f7329c9d 100644
--- a/drivers/mtd/nand/raw/mxc_nand.c
+++ b/drivers/mtd/nand/raw/mxc_nand.c
@@ -16,6 +16,7 @@
 #include <asm/arch/imx-regs.h>
 #endif
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include "mxc_nand.h"
 
diff --git a/drivers/mtd/nand/raw/mxc_nand_spl.c b/drivers/mtd/nand/raw/mxc_nand_spl.c
index ad01cdce2607..c3e136899f92 100644
--- a/drivers/mtd/nand/raw/mxc_nand_spl.c
+++ b/drivers/mtd/nand/raw/mxc_nand_spl.c
@@ -16,6 +16,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/io.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include "mxc_nand.h"
 
 #if defined(MXC_NFC_V1) || defined(MXC_NFC_V2_1)
diff --git a/drivers/mtd/nand/raw/mxs_nand.c b/drivers/mtd/nand/raw/mxs_nand.c
index d59528e27fd3..8ab4dab32c02 100644
--- a/drivers/mtd/nand/raw/mxs_nand.c
+++ b/drivers/mtd/nand/raw/mxs_nand.c
@@ -18,6 +18,7 @@
 #include <dm.h>
 #include <stdio.h>
 #include <asm/cache.h>
+#include <linux/kernel.h>
 #include <linux/mtd/rawnand.h>
 #include <linux/sizes.h>
 #include <linux/string.h>
diff --git a/drivers/mtd/nand/raw/nand_base.c b/drivers/mtd/nand/raw/nand_base.c
index a6b3504facd5..115f5a771bed 100644
--- a/drivers/mtd/nand/raw/nand_base.c
+++ b/drivers/mtd/nand/raw/nand_base.c
@@ -43,6 +43,7 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/compat.h>
+#include <linux/kernel.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
diff --git a/drivers/mtd/nand/raw/nand_bbt.c b/drivers/mtd/nand/raw/nand_bbt.c
index 82b925e57c80..22454253f3c4 100644
--- a/drivers/mtd/nand/raw/nand_bbt.c
+++ b/drivers/mtd/nand/raw/nand_bbt.c
@@ -64,6 +64,7 @@
 #include <linux/bug.h>
 #include <linux/compat.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/bbm.h>
 #include <linux/mtd/rawnand.h>
diff --git a/drivers/mtd/nand/raw/nand_bch.c b/drivers/mtd/nand/raw/nand_bch.c
index 94e03e9ba5ec..eaca67da1b89 100644
--- a/drivers/mtd/nand/raw/nand_bch.c
+++ b/drivers/mtd/nand/raw/nand_bch.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <dm/devres.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 /*#include <asm/io.h>*/
diff --git a/drivers/mtd/nand/raw/nand_spl_loaders.c b/drivers/mtd/nand/raw/nand_spl_loaders.c
index f297205bc795..75ded89893a4 100644
--- a/drivers/mtd/nand/raw/nand_spl_loaders.c
+++ b/drivers/mtd/nand/raw/nand_spl_loaders.c
@@ -1,3 +1,4 @@
+#include <linux/kernel.h>
 #include <linux/string.h>
 int nand_spl_load_image(uint32_t offs, unsigned int size, void *dst)
 {
diff --git a/drivers/mtd/nand/raw/nand_util.c b/drivers/mtd/nand/raw/nand_util.c
index 162f6fe1f0cf..f753970d9e78 100644
--- a/drivers/mtd/nand/raw/nand_util.c
+++ b/drivers/mtd/nand/raw/nand_util.c
@@ -28,6 +28,7 @@
 #include <div64.h>
 #include <asm/cache.h>
 #include <dm/devres.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include <linux/errno.h>
diff --git a/drivers/mtd/nand/raw/pxa3xx_nand.c b/drivers/mtd/nand/raw/pxa3xx_nand.c
index e222fb994b0a..8678866d3dd0 100644
--- a/drivers/mtd/nand/raw/pxa3xx_nand.c
+++ b/drivers/mtd/nand/raw/pxa3xx_nand.c
@@ -21,6 +21,7 @@
 #include <linux/errno.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
+#include <linux/kernel.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/rawnand.h>
 #include <linux/printk.h>
diff --git a/drivers/mtd/nand/raw/pxa3xx_nand.h b/drivers/mtd/nand/raw/pxa3xx_nand.h
index 8f24ae6d18a9..d7304d0b34e9 100644
--- a/drivers/mtd/nand/raw/pxa3xx_nand.h
+++ b/drivers/mtd/nand/raw/pxa3xx_nand.h
@@ -1,6 +1,7 @@
 #ifndef __ASM_ARCH_PXA3XX_NAND_H
 #define __ASM_ARCH_PXA3XX_NAND_H
 
+#include <stdbool.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 
diff --git a/drivers/mtd/nand/raw/stm32_fmc2_nand.c b/drivers/mtd/nand/raw/stm32_fmc2_nand.c
index 1b8003fd73c0..e5dbb970f1b4 100644
--- a/drivers/mtd/nand/raw/stm32_fmc2_nand.c
+++ b/drivers/mtd/nand/raw/stm32_fmc2_nand.c
@@ -17,6 +17,7 @@
 #include <linux/errno.h>
 #include <linux/iopoll.h>
 #include <linux/ioport.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 
 /* Bad block marker length */
diff --git a/drivers/mtd/nand/raw/sunxi_nand_spl.c b/drivers/mtd/nand/raw/sunxi_nand_spl.c
index 9b54d007f8e4..e24bd384c267 100644
--- a/drivers/mtd/nand/raw/sunxi_nand_spl.c
+++ b/drivers/mtd/nand/raw/sunxi_nand_spl.c
@@ -14,6 +14,7 @@
 #include <linux/ctype.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 /* registers */
diff --git a/drivers/mtd/nand/raw/vf610_nfc.c b/drivers/mtd/nand/raw/vf610_nfc.c
index ceec8c81e94d..49cf29a7abe4 100644
--- a/drivers/mtd/nand/raw/vf610_nfc.c
+++ b/drivers/mtd/nand/raw/vf610_nfc.c
@@ -27,6 +27,7 @@
 #include <time.h>
 #include <dm/device_compat.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/mtd/nand/raw/zynq_nand.c b/drivers/mtd/nand/raw/zynq_nand.c
index 47435cfdccc3..6af6b7bd844f 100644
--- a/drivers/mtd/nand/raw/zynq_nand.c
+++ b/drivers/mtd/nand/raw/zynq_nand.c
@@ -15,6 +15,7 @@
 #include <linux/errno.h>
 #include <nand.h>
 #include <linux/ioport.h>
+#include <linux/kernel.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
diff --git a/drivers/mtd/onenand/onenand_base.c b/drivers/mtd/onenand/onenand_base.c
index 7e5aaac23727..f576aea331ca 100644
--- a/drivers/mtd/onenand/onenand_base.c
+++ b/drivers/mtd/onenand/onenand_base.c
@@ -27,6 +27,7 @@
 #include <dm/devres.h>
 #include <linux/bitops.h>
 #include <linux/compat.h>
+#include <linux/kernel.h>
 #include <linux/mtd/mtd.h>
 #include <linux/printk.h>
 #include <linux/string.h>
diff --git a/drivers/mtd/onenand/onenand_spl.c b/drivers/mtd/onenand/onenand_spl.c
index 463ec9b8d50c..69c529e658de 100644
--- a/drivers/mtd/onenand/onenand_spl.c
+++ b/drivers/mtd/onenand/onenand_spl.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 #include <linux/mtd/onenand_regs.h>
 #include <onenand_uboot.h>
 #include <linux/string.h>
diff --git a/drivers/mtd/renesas_rpc_hf.c b/drivers/mtd/renesas_rpc_hf.c
index 7dc795c06aba..60f8dbc676a7 100644
--- a/drivers/mtd/renesas_rpc_hf.c
+++ b/drivers/mtd/renesas_rpc_hf.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/mtd/spi/sandbox.c b/drivers/mtd/spi/sandbox.c
index 0ab3596a2a1f..424c74d74fdd 100644
--- a/drivers/mtd/spi/sandbox.c
+++ b/drivers/mtd/spi/sandbox.c
@@ -18,6 +18,7 @@
 #include <os.h>
 #include <stdio.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include <spi_flash.h>
diff --git a/drivers/mtd/spi/sf_dataflash.c b/drivers/mtd/spi/sf_dataflash.c
index c65d62e7cdb2..558cf39ba672 100644
--- a/drivers/mtd/spi/sf_dataflash.c
+++ b/drivers/mtd/spi/sf_dataflash.c
@@ -21,6 +21,7 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/math64.h>
 #include <linux/string.h>
 
diff --git a/drivers/mtd/spi/sf_mtd.c b/drivers/mtd/spi/sf_mtd.c
index 5f80e115f4db..cf9d79c95572 100644
--- a/drivers/mtd/spi/sf_mtd.c
+++ b/drivers/mtd/spi/sf_mtd.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <flash.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/errno.h>
diff --git a/drivers/mtd/spi/spi-nor-core.c b/drivers/mtd/spi/spi-nor-core.c
index fd49d6ae4d19..b11c61ee9c9a 100644
--- a/drivers/mtd/spi/spi-nor-core.c
+++ b/drivers/mtd/spi/spi-nor-core.c
@@ -19,6 +19,7 @@
 #include <linux/bitops.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/log2.h>
 #include <linux/math64.h>
 #include <linux/printk.h>
diff --git a/drivers/mtd/spi/spi-nor-tiny.c b/drivers/mtd/spi/spi-nor-tiny.c
index 0cddd1068448..323897d20e83 100644
--- a/drivers/mtd/spi/spi-nor-tiny.c
+++ b/drivers/mtd/spi/spi-nor-tiny.c
@@ -16,6 +16,7 @@
 #include <dm/device_compat.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/log2.h>
 #include <linux/math64.h>
 #include <linux/printk.h>
diff --git a/drivers/mtd/st_smi.c b/drivers/mtd/st_smi.c
index a6c1a0e1c78a..6488897b4380 100644
--- a/drivers/mtd/st_smi.c
+++ b/drivers/mtd/st_smi.c
@@ -11,6 +11,7 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/mtd/st_smi.h>
 
 #include <asm/io.h>
diff --git a/drivers/mtd/ubi/debug.c b/drivers/mtd/ubi/debug.c
index 213061847d73..705a05ae77d9 100644
--- a/drivers/mtd/ubi/debug.c
+++ b/drivers/mtd/ubi/debug.c
@@ -11,6 +11,7 @@
 #include <ubi_uboot.h>
 #include <vsprintf.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include "ubi.h"
diff --git a/drivers/mtd/ubi/eba.c b/drivers/mtd/ubi/eba.c
index 23a72d6a325c..7f797c517b2a 100644
--- a/drivers/mtd/ubi/eba.c
+++ b/drivers/mtd/ubi/eba.c
@@ -37,6 +37,7 @@
 #else
 #include <ubi_uboot.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #endif
 
diff --git a/drivers/mtd/ubi/fastmap-wl.c b/drivers/mtd/ubi/fastmap-wl.c
index df5fab00e1a3..4a0f8a3db980 100644
--- a/drivers/mtd/ubi/fastmap-wl.c
+++ b/drivers/mtd/ubi/fastmap-wl.c
@@ -7,6 +7,7 @@
  */
 
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 /**
  * update_fastmap_work_fn - calls ubi_update_fastmap from a work queue
diff --git a/drivers/mtd/ubi/fastmap.c b/drivers/mtd/ubi/fastmap.c
index 6812b122d651..38983fb7356b 100644
--- a/drivers/mtd/ubi/fastmap.c
+++ b/drivers/mtd/ubi/fastmap.c
@@ -18,6 +18,7 @@
 #include <ubi_uboot.h>
 #include <linux/bug.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #endif
 
diff --git a/drivers/mtd/ubi/io.c b/drivers/mtd/ubi/io.c
index f88bafd35d3e..e5dafaf5ff6c 100644
--- a/drivers/mtd/ubi/io.c
+++ b/drivers/mtd/ubi/io.c
@@ -84,6 +84,7 @@
 #include <hexdump.h>
 #include <ubi_uboot.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #endif
 
diff --git a/drivers/mtd/ubi/misc.c b/drivers/mtd/ubi/misc.c
index b9bad95cf6f8..6574760288d5 100644
--- a/drivers/mtd/ubi/misc.c
+++ b/drivers/mtd/ubi/misc.c
@@ -11,6 +11,7 @@
 #include <malloc.h>
 #include <ubi_uboot.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include "ubi.h"
 
 /**
diff --git a/drivers/mtd/ubi/ubi.h b/drivers/mtd/ubi/ubi.h
index d91c9effd070..2314ca7df1fc 100644
--- a/drivers/mtd/ubi/ubi.h
+++ b/drivers/mtd/ubi/ubi.h
@@ -29,6 +29,7 @@
 #else
 #include <ubi_uboot.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #endif
 #include <linux/mtd/mtd.h>
diff --git a/drivers/mtd/ubi/upd.c b/drivers/mtd/ubi/upd.c
index 96ecaf60c040..fff703a0f6c2 100644
--- a/drivers/mtd/ubi/upd.c
+++ b/drivers/mtd/ubi/upd.c
@@ -33,6 +33,7 @@
 #include <div64.h>
 #include <ubi_uboot.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #endif
 #include <linux/err.h>
diff --git a/drivers/mtd/ubi/vmt.c b/drivers/mtd/ubi/vmt.c
index 806abc9122e8..c9d28bb4d520 100644
--- a/drivers/mtd/ubi/vmt.c
+++ b/drivers/mtd/ubi/vmt.c
@@ -21,6 +21,7 @@
 #include <ubi_uboot.h>
 #include <vsprintf.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #endif
 #include <linux/math64.h>
diff --git a/drivers/mtd/ubi/vtbl.c b/drivers/mtd/ubi/vtbl.c
index 91c0589bb62d..b8e07872716c 100644
--- a/drivers/mtd/ubi/vtbl.c
+++ b/drivers/mtd/ubi/vtbl.c
@@ -57,6 +57,7 @@
 #include <ubi_uboot.h>
 #include <linux/bug.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #endif
 
diff --git a/drivers/mtd/ubispl/ubispl.c b/drivers/mtd/ubispl/ubispl.c
index 96afa7dec115..2a1ad2ca1579 100644
--- a/drivers/mtd/ubispl/ubispl.c
+++ b/drivers/mtd/ubispl/ubispl.c
@@ -11,6 +11,7 @@
 #include <errno.h>
 #include <linux/bug.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
 #include <ubispl.h>
diff --git a/drivers/net/armada100_fec.h b/drivers/net/armada100_fec.h
index e6f286cfd387..b0e6d02b4af5 100644
--- a/drivers/net/armada100_fec.h
+++ b/drivers/net/armada100_fec.h
@@ -12,6 +12,7 @@
 #ifndef __ARMADA100_FEC_H__
 #define __ARMADA100_FEC_H__
 
+#include <linux/kernel.h>
 #define PORT_NUM		0x0
 
 /* RX & TX descriptor command */
diff --git a/drivers/net/ax88180.c b/drivers/net/ax88180.c
index 5783c42aa234..fada006f84b9 100644
--- a/drivers/net/ax88180.c
+++ b/drivers/net/ax88180.c
@@ -45,6 +45,7 @@
 #include <stdio.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/mii.h>
 #include <linux/string.h>
 #include "ax88180.h"
diff --git a/drivers/net/bcm-sf2-eth-gmac.c b/drivers/net/bcm-sf2-eth-gmac.c
index 67c8498f0f63..8540b13951bf 100644
--- a/drivers/net/bcm-sf2-eth-gmac.c
+++ b/drivers/net/bcm-sf2-eth-gmac.c
@@ -9,6 +9,7 @@
 #include <linux/printk.h>
 #endif
 #include <stdio.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #endif
 
diff --git a/drivers/net/bcm-sf2-eth.h b/drivers/net/bcm-sf2-eth.h
index f4dbb4e1952d..4f81e0431c1d 100644
--- a/drivers/net/bcm-sf2-eth.h
+++ b/drivers/net/bcm-sf2-eth.h
@@ -7,6 +7,7 @@
 #define _BCM_SF2_ETH_H_
 
 #include <phy.h>
+#include <stdbool.h>
 
 #define RX_BUF_SIZE	2048
 /* RX_BUF_NUM must be power of 2 */
diff --git a/drivers/net/bcm6348-eth.c b/drivers/net/bcm6348-eth.c
index eeea3dc579f8..afb81ab187b8 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 <stdbool.h>
 #include <vsprintf.h>
 #include <wait_bit.h>
 #include <asm/io.h>
diff --git a/drivers/net/bcm6368-eth.c b/drivers/net/bcm6368-eth.c
index 0e6d266f1037..3f18c5c52251 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 <stdbool.h>
 #include <vsprintf.h>
 #include <wait_bit.h>
 #include <asm/io.h>
diff --git a/drivers/net/bcmgenet.c b/drivers/net/bcmgenet.c
index cd3dac49e7ea..ca7888af89c2 100644
--- a/drivers/net/bcmgenet.c
+++ b/drivers/net/bcmgenet.c
@@ -35,6 +35,7 @@
 #include <dm/ofnode.h>
 #include <linux/errno.h>
 #include <linux/iopoll.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <asm/dma-mapping.h>
 #include <wait_bit.h>
diff --git a/drivers/net/dc2114x.c b/drivers/net/dc2114x.c
index 8bc75baf97f1..3f45aebcd039 100644
--- a/drivers/net/dc2114x.c
+++ b/drivers/net/dc2114x.c
@@ -13,6 +13,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #define SROM_DLEVEL	0
diff --git a/drivers/net/dnet.c b/drivers/net/dnet.c
index 485e6c0cdcc6..675eb88c3d9b 100644
--- a/drivers/net/dnet.c
+++ b/drivers/net/dnet.c
@@ -14,6 +14,7 @@
 #include <vsprintf.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #ifndef CONFIG_DNET_AUTONEG_TIMEOUT
diff --git a/drivers/net/dwc_eth_qos.c b/drivers/net/dwc_eth_qos.c
index 68d80bafa1e3..22b5dff2f6dc 100644
--- a/drivers/net/dwc_eth_qos.c
+++ b/drivers/net/dwc_eth_qos.c
@@ -52,6 +52,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c
index 1705dde9d2c1..3d87e05c5b2f 100644
--- a/drivers/net/e1000.c
+++ b/drivers/net/e1000.c
@@ -44,6 +44,7 @@ tested on both gig copper and gig fiber boards
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "e1000.h"
 #include <asm/cache.h>
diff --git a/drivers/net/e1000.h b/drivers/net/e1000.h
index 641502ea9286..2adfd38f2731 100644
--- a/drivers/net/e1000.h
+++ b/drivers/net/e1000.h
@@ -18,6 +18,7 @@
 #ifndef _E1000_HW_H_
 #define _E1000_HW_H_
 
+#include <stdbool.h>
 #include <stdio.h>
 #include <linux/list.h>
 #include <malloc.h>
diff --git a/drivers/net/e1000_spi.c b/drivers/net/e1000_spi.c
index 7e37ade1e9c0..8200d428615e 100644
--- a/drivers/net/e1000_spi.c
+++ b/drivers/net/e1000_spi.c
@@ -4,6 +4,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "e1000.h"
 #include <malloc.h>
diff --git a/drivers/net/eepro100.c b/drivers/net/eepro100.c
index 3d7decd126ae..d152063008bb 100644
--- a/drivers/net/eepro100.c
+++ b/drivers/net/eepro100.c
@@ -17,6 +17,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 /* Ethernet chip registers. */
diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c
index 669f3af7aeeb..bdf14afcd75f 100644
--- a/drivers/net/fec_mxc.c
+++ b/drivers/net/fec_mxc.c
@@ -24,6 +24,7 @@
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <power/regulator.h>
 
diff --git a/drivers/net/fm/eth.c b/drivers/net/fm/eth.c
index c451b136ae3f..0728ad6cacf3 100644
--- a/drivers/net/fm/eth.c
+++ b/drivers/net/fm/eth.c
@@ -29,6 +29,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include "fm.h"
diff --git a/drivers/net/fm/init.c b/drivers/net/fm/init.c
index 1829517d024f..de4db412704f 100644
--- a/drivers/net/fm/init.c
+++ b/drivers/net/fm/init.c
@@ -16,6 +16,7 @@
 #endif
 #include <asm/u-boot.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include "fm.h"
diff --git a/drivers/net/fsl-mc/dpio/qbman_private.h b/drivers/net/fsl-mc/dpio/qbman_private.h
index e7ba37c0e665..033ecd7139f5 100644
--- a/drivers/net/fsl-mc/dpio/qbman_private.h
+++ b/drivers/net/fsl-mc/dpio/qbman_private.h
@@ -9,6 +9,7 @@
 #include <vsprintf.h>
 #include <asm/io.h>
 #include <linux/bug.h>
+#include <linux/kernel.h>
 #include <linux/types.h>
 #include <asm/atomic.h>
 #include <malloc.h>
diff --git a/drivers/net/fsl-mc/mc.c b/drivers/net/fsl-mc/mc.c
index d2f8869a3408..3a82f4f065f7 100644
--- a/drivers/net/fsl-mc/mc.c
+++ b/drivers/net/fsl-mc/mc.c
@@ -19,6 +19,7 @@
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <net.h>
 #include <fdt_support.h>
diff --git a/drivers/net/fsl_enetc.c b/drivers/net/fsl_enetc.c
index 7b9730a84463..a6c6e5781930 100644
--- a/drivers/net/fsl_enetc.c
+++ b/drivers/net/fsl_enetc.c
@@ -19,6 +19,7 @@
 #include <linux/bug.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include "fsl_enetc.h"
diff --git a/drivers/net/ftgmac100.c b/drivers/net/ftgmac100.c
index af58d04da231..5a057ebb46ba 100644
--- a/drivers/net/ftgmac100.c
+++ b/drivers/net/ftgmac100.c
@@ -27,6 +27,7 @@
 #include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/iopoll.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 
 #include "ftgmac100.h"
diff --git a/drivers/net/ftmac110.c b/drivers/net/ftmac110.c
index 2ff318cb9a9e..e7c7a5e885a8 100644
--- a/drivers/net/ftmac110.c
+++ b/drivers/net/ftmac110.c
@@ -19,6 +19,7 @@
 #include <linux/errno.h>
 #include <asm/io.h>
 #include <linux/dma-mapping.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #if defined(CONFIG_MII) || defined(CONFIG_CMD_MII)
diff --git a/drivers/net/gmac_rockchip.c b/drivers/net/gmac_rockchip.c
index 8aed219d9eda..55ce931cd2d4 100644
--- a/drivers/net/gmac_rockchip.c
+++ b/drivers/net/gmac_rockchip.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <net.h>
 #include <phy.h>
+#include <stdbool.h>
 #include <syscon.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/net/ks8851_mll.c b/drivers/net/ks8851_mll.c
index f357fec5cc9a..86a97cdf5737 100644
--- a/drivers/net/ks8851_mll.c
+++ b/drivers/net/ks8851_mll.c
@@ -16,6 +16,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #include "ks8851_mll.h"
 
diff --git a/drivers/net/lan91c96.c b/drivers/net/lan91c96.c
index 7c26c60ff2b0..559273e67608 100644
--- a/drivers/net/lan91c96.c
+++ b/drivers/net/lan91c96.c
@@ -53,6 +53,7 @@
 #include <vsprintf.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "lan91c96.h"
 #include <net.h>
diff --git a/drivers/net/ldpaa_eth/ldpaa_eth.c b/drivers/net/ldpaa_eth/ldpaa_eth.c
index 5da5582200d4..4b62225968f7 100644
--- a/drivers/net/ldpaa_eth/ldpaa_eth.c
+++ b/drivers/net/ldpaa_eth/ldpaa_eth.c
@@ -24,6 +24,7 @@
 #include <fsl-mc/fsl_dpmac.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include <fsl-mc/ldpaa_wriop.h>
diff --git a/drivers/net/ldpaa_eth/ldpaa_eth.h b/drivers/net/ldpaa_eth/ldpaa_eth.h
index e90513e56f9a..2b3d31f70430 100644
--- a/drivers/net/ldpaa_eth/ldpaa_eth.h
+++ b/drivers/net/ldpaa_eth/ldpaa_eth.h
@@ -7,6 +7,7 @@
 #ifndef __LDPAA_ETH_H
 #define __LDPAA_ETH_H
 
+#include <stdbool.h>
 #include <linux/netdevice.h>
 #include <fsl-mc/fsl_mc.h>
 #include <fsl-mc/fsl_dpaa_fd.h>
diff --git a/drivers/net/lpc32xx_eth.c b/drivers/net/lpc32xx_eth.c
index a43623a1adf6..dd7b2e5a0078 100644
--- a/drivers/net/lpc32xx_eth.c
+++ b/drivers/net/lpc32xx_eth.c
@@ -21,6 +21,7 @@
 #include <asm/byteorder.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/config.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 /*
diff --git a/drivers/net/macb.c b/drivers/net/macb.c
index 3d6b2fa8eb4b..783a90cb1fa1 100644
--- a/drivers/net/macb.c
+++ b/drivers/net/macb.c
@@ -12,6 +12,7 @@
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 /*
diff --git a/drivers/net/mcfmii.c b/drivers/net/mcfmii.c
index 0e906e85670d..21e558ee816c 100644
--- a/drivers/net/mcfmii.c
+++ b/drivers/net/mcfmii.c
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #ifdef CONFIG_MCF547x_8x
diff --git a/drivers/net/mpc8xx_fec.c b/drivers/net/mpc8xx_fec.c
index 5c86710cfdb1..758864eed3fb 100644
--- a/drivers/net/mpc8xx_fec.c
+++ b/drivers/net/mpc8xx_fec.c
@@ -19,6 +19,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include <phy.h>
diff --git a/drivers/net/mscc_eswitch/jr2_switch.c b/drivers/net/mscc_eswitch/jr2_switch.c
index 0e0a4d7037ca..1aff591e3a4d 100644
--- a/drivers/net/mscc_eswitch/jr2_switch.c
+++ b/drivers/net/mscc_eswitch/jr2_switch.c
@@ -19,6 +19,7 @@
 #include <miiphy.h>
 #include <net.h>
 #include <wait_bit.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/net/mscc_eswitch/luton_switch.c b/drivers/net/mscc_eswitch/luton_switch.c
index 6ceb250688ad..afc6260577ed 100644
--- a/drivers/net/mscc_eswitch/luton_switch.c
+++ b/drivers/net/mscc_eswitch/luton_switch.c
@@ -18,6 +18,7 @@
 #include <miiphy.h>
 #include <net.h>
 #include <wait_bit.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include "mscc_xfer.h"
diff --git a/drivers/net/mscc_eswitch/mscc_xfer.c b/drivers/net/mscc_eswitch/mscc_xfer.c
index a2827b5377e6..55abd5a984e0 100644
--- a/drivers/net/mscc_eswitch/mscc_xfer.c
+++ b/drivers/net/mscc_eswitch/mscc_xfer.c
@@ -4,6 +4,7 @@
  */
 
 #include <log.h>
+#include <stdbool.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/net/mscc_eswitch/mscc_xfer.h b/drivers/net/mscc_eswitch/mscc_xfer.h
index c880a4e7e6a6..df507e518cf2 100644
--- a/drivers/net/mscc_eswitch/mscc_xfer.h
+++ b/drivers/net/mscc_eswitch/mscc_xfer.h
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <stdbool.h>
 
 enum mscc_regs_qs {
 	MSCC_QS_XTR_RD,
diff --git a/drivers/net/mscc_eswitch/ocelot_switch.c b/drivers/net/mscc_eswitch/ocelot_switch.c
index b787524af163..170393c03f7b 100644
--- a/drivers/net/mscc_eswitch/ocelot_switch.c
+++ b/drivers/net/mscc_eswitch/ocelot_switch.c
@@ -18,6 +18,7 @@
 #include <miiphy.h>
 #include <net.h>
 #include <wait_bit.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/net/mscc_eswitch/serval_switch.c b/drivers/net/mscc_eswitch/serval_switch.c
index 9b6e5d8743de..8f5c43660bdb 100644
--- a/drivers/net/mscc_eswitch/serval_switch.c
+++ b/drivers/net/mscc_eswitch/serval_switch.c
@@ -18,6 +18,7 @@
 #include <miiphy.h>
 #include <net.h>
 #include <wait_bit.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/net/mscc_eswitch/servalt_switch.c b/drivers/net/mscc_eswitch/servalt_switch.c
index eecf6153245a..f393ea7f504b 100644
--- a/drivers/net/mscc_eswitch/servalt_switch.c
+++ b/drivers/net/mscc_eswitch/servalt_switch.c
@@ -18,6 +18,7 @@
 #include <miiphy.h>
 #include <net.h>
 #include <wait_bit.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/net/mtk_eth.c b/drivers/net/mtk_eth.c
index 8cf78422f7d2..f2f070548d43 100644
--- a/drivers/net/mtk_eth.c
+++ b/drivers/net/mtk_eth.c
@@ -28,6 +28,7 @@
 #include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/ioport.h>
+#include <linux/kernel.h>
 #include <linux/mdio.h>
 #include <linux/mii.h>
 #include <linux/printk.h>
diff --git a/drivers/net/mvgbe.h b/drivers/net/mvgbe.h
index 44541c0a85e3..4376efbfbc06 100644
--- a/drivers/net/mvgbe.h
+++ b/drivers/net/mvgbe.h
@@ -19,6 +19,7 @@
 #endif
 
 /* Constants */
+#include <linux/kernel.h>
 #define INT_CAUSE_UNMASK_ALL		0x0007ffff
 #define INT_CAUSE_UNMASK_ALL_EXT	0x0011ffff
 #define MRU_MASK			0xfff1ffff
diff --git a/drivers/net/mvneta.c b/drivers/net/mvneta.c
index ce7cf045f735..f001ae73208f 100644
--- a/drivers/net/mvneta.c
+++ b/drivers/net/mvneta.c
@@ -37,6 +37,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
 #include <linux/compat.h>
+#include <linux/kernel.h>
 #include <linux/mbus.h>
 #include <asm-generic/gpio.h>
 #include <linux/string.h>
diff --git a/drivers/net/mvpp2.c b/drivers/net/mvpp2.c
index 9baa1004bf36..2d53a5cc5a82 100644
--- a/drivers/net/mvpp2.c
+++ b/drivers/net/mvpp2.c
@@ -40,6 +40,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
 #include <linux/compat.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <linux/mbus.h>
 #include <asm-generic/gpio.h>
diff --git a/drivers/net/ne2000.c b/drivers/net/ne2000.c
index 85da482b8ffe..828bc957fca7 100644
--- a/drivers/net/ne2000.c
+++ b/drivers/net/ne2000.c
@@ -76,6 +76,7 @@ Add SNMP
 #include <command.h>
 #include <stdio.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 
 /* NE2000 base header file */
 #include "ne2000_base.h"
diff --git a/drivers/net/ne2000_base.c b/drivers/net/ne2000_base.c
index 7ed8721bc803..34600b822bab 100644
--- a/drivers/net/ne2000_base.c
+++ b/drivers/net/ne2000_base.c
@@ -78,6 +78,7 @@ Add SNMP
 #include <log.h>
 #include <net.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <asm/u-boot.h>
diff --git a/drivers/net/ne2000_base.h b/drivers/net/ne2000_base.h
index 21c1a8c15b55..0d289444b3ec 100644
--- a/drivers/net/ne2000_base.h
+++ b/drivers/net/ne2000_base.h
@@ -106,6 +106,7 @@ are GPL, so this is, of course, GPL.
 #endif
 
 /* timeout for tx/rx in s */
+#include <stdbool.h>
 #include <stdio.h>
 #include <linux/delay.h>
 #define TOUT 5
diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c
index b4bbd9429fd3..701fc73c91e4 100644
--- a/drivers/net/netconsole.c
+++ b/drivers/net/netconsole.c
@@ -11,6 +11,7 @@
 #include <stdio_dev.h>
 #include <net.h>
 #include <vsprintf.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #ifndef CONFIG_NETCONSOLE_BUFFER_SIZE
diff --git a/drivers/net/pch_gbe.h b/drivers/net/pch_gbe.h
index 7e0fdbfd5a33..57d54d4b0d5f 100644
--- a/drivers/net/pch_gbe.h
+++ b/drivers/net/pch_gbe.h
@@ -9,6 +9,7 @@
 #ifndef _PCH_GBE_H_
 #define _PCH_GBE_H_
 
+#include <linux/kernel.h>
 #define PCH_GBE_TIMEOUT		(3 * CONFIG_SYS_HZ)
 
 #define PCH_GBE_DESC_NUM	4
diff --git a/drivers/net/pfe_eth/pfe_mdio.c b/drivers/net/pfe_eth/pfe_mdio.c
index 08536dea67ef..429ca8791126 100644
--- a/drivers/net/pfe_eth/pfe_mdio.c
+++ b/drivers/net/pfe_eth/pfe_mdio.c
@@ -13,6 +13,7 @@
 #include <net.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <net/pfe_eth/pfe_eth.h>
 
 extern struct gemac_s gem_info[];
diff --git a/drivers/net/phy/aquantia.c b/drivers/net/phy/aquantia.c
index 1395af5444d3..cfd2424ff114 100644
--- a/drivers/net/phy/aquantia.c
+++ b/drivers/net/phy/aquantia.c
@@ -15,6 +15,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
 #include <malloc.h>
diff --git a/drivers/net/phy/atheros.c b/drivers/net/phy/atheros.c
index 7577ebdbe833..dab348ccf9cb 100644
--- a/drivers/net/phy/atheros.c
+++ b/drivers/net/phy/atheros.c
@@ -8,6 +8,7 @@
  */
 #include <common.h>
 #include <phy.h>
+#include <stdbool.h>
 #include <dm/device_compat.h>
 #include <linux/bitfield.h>
 #include <linux/bitops.h>
diff --git a/drivers/net/phy/dp83867.c b/drivers/net/phy/dp83867.c
index 9f07045007c7..3951cb00f414 100644
--- a/drivers/net/phy/dp83867.c
+++ b/drivers/net/phy/dp83867.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <log.h>
 #include <phy.h>
+#include <stdbool.h>
 #include <dm/devres.h>
 #include <linux/bitops.h>
 #include <linux/compat.h>
diff --git a/drivers/net/phy/micrel_ksz90x1.c b/drivers/net/phy/micrel_ksz90x1.c
index 4c0b2f4af85e..2b7bbc8f419c 100644
--- a/drivers/net/phy/micrel_ksz90x1.c
+++ b/drivers/net/phy/micrel_ksz90x1.c
@@ -15,6 +15,7 @@
 #include <micrel.h>
 #include <phy.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 /*
  * KSZ9021 - KSZ9031 common
diff --git a/drivers/net/phy/mscc.c b/drivers/net/phy/mscc.c
index f0d37d1b81fa..08214ccc2f68 100644
--- a/drivers/net/phy/mscc.c
+++ b/drivers/net/phy/mscc.c
@@ -17,6 +17,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 
 /* Microsemi PHY ID's */
diff --git a/drivers/net/phy/mv88e61xx.c b/drivers/net/phy/mv88e61xx.c
index 927edb62a2ea..7e3c76923cb4 100644
--- a/drivers/net/phy/mv88e61xx.c
+++ b/drivers/net/phy/mv88e61xx.c
@@ -31,6 +31,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/drivers/net/phy/ncsi.c b/drivers/net/phy/ncsi.c
index 9f68d14bf53f..ed557355b917 100644
--- a/drivers/net/phy/ncsi.c
+++ b/drivers/net/phy/ncsi.c
@@ -11,6 +11,7 @@
 #include <phy.h>
 #include <stdio.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <net/ncsi.h>
 #include <net/ncsi-pkt.h>
diff --git a/drivers/net/ravb.c b/drivers/net/ravb.c
index d9d376c09ec9..4fb1c7b5f6bc 100644
--- a/drivers/net/ravb.c
+++ b/drivers/net/ravb.c
@@ -23,6 +23,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/mii.h>
 #include <wait_bit.h>
 #include <asm/io.h>
diff --git a/drivers/net/rtl8139.c b/drivers/net/rtl8139.c
index 7c0bb2372d3c..db9f75de48a1 100644
--- a/drivers/net/rtl8139.c
+++ b/drivers/net/rtl8139.c
@@ -83,6 +83,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/types.h>
 
diff --git a/drivers/net/rtl8169.c b/drivers/net/rtl8169.c
index 9cc5cc8acf9f..f3d6ea89b997 100644
--- a/drivers/net/rtl8169.c
+++ b/drivers/net/rtl8169.c
@@ -58,6 +58,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/net/sandbox.c b/drivers/net/sandbox.c
index 37eeaab4e82c..6e119f77b293 100644
--- a/drivers/net/sandbox.c
+++ b/drivers/net/sandbox.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <net.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <asm/eth.h>
diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c
index 69f895f720b3..3a1a7fee4bc9 100644
--- a/drivers/net/sh_eth.c
+++ b/drivers/net/sh_eth.c
@@ -25,6 +25,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/io.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #ifdef CONFIG_DM_ETH
diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
index 8b1aae24467b..2f3b8fa80790 100644
--- a/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.c
@@ -16,6 +16,7 @@
 #include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/types.h>
 
diff --git a/drivers/net/sni_ave.c b/drivers/net/sni_ave.c
index eb422f33b706..21096bd6d32a 100644
--- a/drivers/net/sni_ave.c
+++ b/drivers/net/sni_ave.c
@@ -25,6 +25,7 @@
 #include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/iopoll.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/net/sun8i_emac.c b/drivers/net/sun8i_emac.c
index 8b94322ae746..3216360db15b 100644
--- a/drivers/net/sun8i_emac.c
+++ b/drivers/net/sun8i_emac.c
@@ -37,6 +37,7 @@
 #include <asm-generic/gpio.h>
 #endif
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #define MDIO_CMD_MII_BUSY		BIT(0)
diff --git a/drivers/net/ti/am65-cpsw-nuss.c b/drivers/net/ti/am65-cpsw-nuss.c
index 14956af45804..950d1ca21229 100644
--- a/drivers/net/ti/am65-cpsw-nuss.c
+++ b/drivers/net/ti/am65-cpsw-nuss.c
@@ -24,6 +24,7 @@
 #include <power-domain.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/soc/ti/ti-udma.h>
 
diff --git a/drivers/net/ti/cpsw.c b/drivers/net/ti/cpsw.c
index 02dd3bc984fe..52155df2c540 100644
--- a/drivers/net/ti/cpsw.c
+++ b/drivers/net/ti/cpsw.c
@@ -26,6 +26,7 @@
 #include <phy.h>
 #include <asm/arch/cpu.h>
 #include <dm.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/net/ti/davinci_emac.c b/drivers/net/ti/davinci_emac.c
index 272127903f50..f909ee7aa384 100644
--- a/drivers/net/ti/davinci_emac.c
+++ b/drivers/net/ti/davinci_emac.c
@@ -36,6 +36,7 @@
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "davinci_emac.h"
 
diff --git a/drivers/net/ti/davinci_emac.h b/drivers/net/ti/davinci_emac.h
index 695855b4d543..d235275772e9 100644
--- a/drivers/net/ti/davinci_emac.h
+++ b/drivers/net/ti/davinci_emac.h
@@ -9,6 +9,7 @@
 #ifndef _DAVINCI_EMAC_H_
 #define _DAVINCI_EMAC_H_
 /* Ethernet Min/Max packet size */
+#include <linux/kernel.h>
 #define EMAC_MIN_ETHERNET_PKT_SIZE	60
 #define EMAC_MAX_ETHERNET_PKT_SIZE	1518
 /* Buffer size (should be aligned on 32 byte and cache line) */
diff --git a/drivers/net/ti/keystone_net.c b/drivers/net/ti/keystone_net.c
index a6062e336383..af67ec4a1c82 100644
--- a/drivers/net/ti/keystone_net.c
+++ b/drivers/net/ti/keystone_net.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <command.h>
 #include <console.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
diff --git a/drivers/net/tsec.c b/drivers/net/tsec.c
index afcb170be329..2f9ff5ec07f1 100644
--- a/drivers/net/tsec.c
+++ b/drivers/net/tsec.c
@@ -23,6 +23,7 @@
 #include <linux/errno.h>
 #include <asm/processor.h>
 #include <asm/io.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #ifndef CONFIG_DM_ETH
diff --git a/drivers/net/zynq_gem.c b/drivers/net/zynq_gem.c
index 8e3a96c51efb..f31ce696ff07 100644
--- a/drivers/net/zynq_gem.c
+++ b/drivers/net/zynq_gem.c
@@ -32,6 +32,7 @@
 #include <linux/bitops.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 /* Bit/mask specification */
diff --git a/drivers/nvme/nvme.c b/drivers/nvme/nvme.c
index 47a401cc96f1..95c1d5065b3d 100644
--- a/drivers/nvme/nvme.c
+++ b/drivers/nvme/nvme.c
@@ -19,6 +19,7 @@
 #include <dm/device-internal.h>
 #include <linux/compat.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "nvme.h"
 
diff --git a/drivers/nvme/nvme.h b/drivers/nvme/nvme.h
index 0e8cb221a7a2..c2914e2cb05b 100644
--- a/drivers/nvme/nvme.h
+++ b/drivers/nvme/nvme.h
@@ -8,6 +8,7 @@
 #define __DRIVER_NVME_H__
 
 #include <asm/io.h>
+#include <linux/kernel.h>
 
 struct nvme_id_power_state {
 	__le16			max_power;	/* centiwatts */
diff --git a/drivers/pch/pch-uclass.c b/drivers/pch/pch-uclass.c
index be9b89539f01..9bc45b5ddc93 100644
--- a/drivers/pch/pch-uclass.c
+++ b/drivers/pch/pch-uclass.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <pch.h>
+#include <stdbool.h>
 #include <linux/errno.h>
 
 int pch_get_spi_base(struct udevice *dev, ulong *sbasep)
diff --git a/drivers/pch/pch7.c b/drivers/pch/pch7.c
index 8fc6388593f2..9eb985225c84 100644
--- a/drivers/pch/pch7.c
+++ b/drivers/pch/pch7.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <log.h>
 #include <pch.h>
+#include <stdbool.h>
 #include <linux/errno.h>
 
 #define GPIO_BASE	0x44
diff --git a/drivers/pch/sandbox_pch.c b/drivers/pch/sandbox_pch.c
index c9317f1fda2c..28dfc03d793d 100644
--- a/drivers/pch/sandbox_pch.c
+++ b/drivers/pch/sandbox_pch.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <dm.h>
 #include <pch.h>
+#include <stdbool.h>
 #include <linux/errno.h>
 
 struct sandbox_pch_priv {
diff --git a/drivers/pci/fsl_pci_init.c b/drivers/pci/fsl_pci_init.c
index 0f51109e7a3b..5d8125e1e07c 100644
--- a/drivers/pci/fsl_pci_init.c
+++ b/drivers/pci/fsl_pci_init.c
@@ -14,6 +14,7 @@
 #include <asm/global_data.h>
 #include <asm/ppc.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/pci/pci-aardvark.c b/drivers/pci/pci-aardvark.c
index f2c2eb3870f3..b39a6d715b70 100644
--- a/drivers/pci/pci-aardvark.c
+++ b/drivers/pci/pci-aardvark.c
@@ -27,6 +27,7 @@
 #include <common.h>
 #include <dm.h>
 #include <pci.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/io.h>
 #include <asm-generic/gpio.h>
diff --git a/drivers/pci/pci-rcar-gen3.c b/drivers/pci/pci-rcar-gen3.c
index 9a990a063245..e630a2a6300e 100644
--- a/drivers/pci/pci-rcar-gen3.c
+++ b/drivers/pci/pci-rcar-gen3.c
@@ -24,6 +24,7 @@
 #include <wait_bit.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #define PCIECAR			0x000010
 #define PCIECCTLR		0x000018
diff --git a/drivers/pci/pci-uclass.c b/drivers/pci/pci-uclass.c
index f3c243be31ae..88570d740f32 100644
--- a/drivers/pci/pci-uclass.c
+++ b/drivers/pci/pci-uclass.c
@@ -23,6 +23,7 @@
 #endif
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include "pci_internal.h"
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 4eac485f2788..dea111380038 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -21,6 +21,7 @@
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 
 #include <command.h>
 #include <env.h>
diff --git a/drivers/pci/pci_auto.c b/drivers/pci/pci_auto.c
index e0e325755e18..7a9ef884c787 100644
--- a/drivers/pci/pci_auto.c
+++ b/drivers/pci/pci_auto.c
@@ -12,6 +12,7 @@
 #include <errno.h>
 #include <log.h>
 #include <pci.h>
+#include <stdbool.h>
 #include <stdio.h>
 
 /* the user can define CONFIG_SYS_PCI_CACHE_LINE_SIZE to avoid problems */
diff --git a/drivers/pci/pci_auto_common.c b/drivers/pci/pci_auto_common.c
index c0a53dcc929a..7b756b7583aa 100644
--- a/drivers/pci/pci_auto_common.c
+++ b/drivers/pci/pci_auto_common.c
@@ -16,6 +16,7 @@
 #include <errno.h>
 #include <log.h>
 #include <pci.h>
+#include <linux/kernel.h>
 
 void pciauto_region_init(struct pci_region *res)
 {
diff --git a/drivers/pci/pci_auto_old.c b/drivers/pci/pci_auto_old.c
index 8b67cfa92b41..b32f7ea1f833 100644
--- a/drivers/pci/pci_auto_old.c
+++ b/drivers/pci/pci_auto_old.c
@@ -11,6 +11,7 @@
 #include <errno.h>
 #include <log.h>
 #include <pci.h>
+#include <linux/kernel.h>
 
 /*
  * Do not change this file. Instead, convert your board to use CONFIG_DM_PCI
diff --git a/drivers/pci/pci_gt64120.c b/drivers/pci/pci_gt64120.c
index 80f11fedd168..bcadf4e4d889 100644
--- a/drivers/pci/pci_gt64120.c
+++ b/drivers/pci/pci_gt64120.c
@@ -14,6 +14,7 @@
 #include <log.h>
 #include <pci.h>
 #include <pci_gt64120.h>
+#include <linux/kernel.h>
 
 #include <asm/io.h>
 
diff --git a/drivers/pci/pci_msc01.c b/drivers/pci/pci_msc01.c
index 04838200a8de..ae312534c873 100644
--- a/drivers/pci/pci_msc01.c
+++ b/drivers/pci/pci_msc01.c
@@ -10,6 +10,7 @@
 #include <pci.h>
 #include <pci_msc01.h>
 #include <asm/io.h>
+#include <linux/kernel.h>
 
 #define PCI_ACCESS_READ  0
 #define PCI_ACCESS_WRITE 1
diff --git a/drivers/pci/pci_mvebu.c b/drivers/pci/pci_mvebu.c
index 57edb22d8192..157924001ab6 100644
--- a/drivers/pci/pci_mvebu.c
+++ b/drivers/pci/pci_mvebu.c
@@ -26,6 +26,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/ioport.h>
+#include <linux/kernel.h>
 #include <linux/mbus.h>
 #include <linux/printk.h>
 
diff --git a/drivers/pci/pci_rom.c b/drivers/pci/pci_rom.c
index 85ad27322f9c..7bc1a7f4deff 100644
--- a/drivers/pci/pci_rom.c
+++ b/drivers/pci/pci_rom.c
@@ -42,6 +42,7 @@
 #include <acpi/acpi_s3.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/screen_info.h>
 #include <linux/string.h>
 
diff --git a/drivers/pci/pci_tegra.c b/drivers/pci/pci_tegra.c
index 5f8cde34bdf5..28b6aa026b15 100644
--- a/drivers/pci/pci_tegra.c
+++ b/drivers/pci/pci_tegra.c
@@ -21,6 +21,7 @@
 #include <pci_tegra.h>
 #include <power-domain.h>
 #include <reset.h>
+#include <stdbool.h>
 #include <time.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/pci/pcie_brcmstb.c b/drivers/pci/pcie_brcmstb.c
index 10a19bdc9502..3f207f0de118 100644
--- a/drivers/pci/pcie_brcmstb.c
+++ b/drivers/pci/pcie_brcmstb.c
@@ -21,6 +21,7 @@
 #include <asm/io.h>
 #include <linux/bitfield.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/log2.h>
 #include <linux/iopoll.h>
 
diff --git a/drivers/pci/pcie_dw_mvebu.c b/drivers/pci/pcie_dw_mvebu.c
index 287736cd88c0..7eb4461ce26b 100644
--- a/drivers/pci/pcie_dw_mvebu.c
+++ b/drivers/pci/pcie_dw_mvebu.c
@@ -21,6 +21,7 @@
 #include <asm-generic/gpio.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/pci/pcie_dw_ti.c b/drivers/pci/pcie_dw_ti.c
index 00b9a2418ab1..cc968fe2a3f5 100644
--- a/drivers/pci/pcie_dw_ti.c
+++ b/drivers/pci/pcie_dw_ti.c
@@ -21,6 +21,7 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/pci/pcie_ecam_generic.c b/drivers/pci/pcie_ecam_generic.c
index 6e18d5ba5527..4039284f5392 100644
--- a/drivers/pci/pcie_ecam_generic.c
+++ b/drivers/pci/pcie_ecam_generic.c
@@ -11,6 +11,7 @@
 #include <dm.h>
 #include <pci.h>
 #include <asm/global_data.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 
 #include <asm/io.h>
diff --git a/drivers/pci/pcie_fsl.c b/drivers/pci/pcie_fsl.c
index 89a1490e2aca..1aa1fb649a9f 100644
--- a/drivers/pci/pcie_fsl.c
+++ b/drivers/pci/pcie_fsl.c
@@ -19,6 +19,7 @@
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include "pcie_fsl.h"
 #include <dm/device_compat.h>
diff --git a/drivers/pci/pcie_fsl.h b/drivers/pci/pcie_fsl.h
index dc8368d55923..381185133d8b 100644
--- a/drivers/pci/pcie_fsl.h
+++ b/drivers/pci/pcie_fsl.h
@@ -10,6 +10,7 @@
 #define _PCIE_FSL_H_
 
 /* GPEX CSR */
+#include <stdbool.h>
 #define CSR_CLASSCODE			0x474
 
 #ifdef CONFIG_SYS_FSL_PCI_VER_3_X
diff --git a/drivers/pci/pcie_imx.c b/drivers/pci/pcie_imx.c
index 928f624da9a7..07c0695409ce 100644
--- a/drivers/pci/pcie_imx.c
+++ b/drivers/pci/pcie_imx.c
@@ -23,6 +23,7 @@
 #include <dm.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <errno.h>
 #include <asm/arch/sys_proto.h>
diff --git a/drivers/pci/pcie_intel_fpga.c b/drivers/pci/pcie_intel_fpga.c
index bc9375326426..9af0b8a105f8 100644
--- a/drivers/pci/pcie_intel_fpga.c
+++ b/drivers/pci/pcie_intel_fpga.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <dm.h>
 #include <pci.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm/device_compat.h>
diff --git a/drivers/pci/pcie_layerscape.h b/drivers/pci/pcie_layerscape.h
index 0124e8e05184..20b86aa382c5 100644
--- a/drivers/pci/pcie_layerscape.h
+++ b/drivers/pci/pcie_layerscape.h
@@ -8,7 +8,7 @@
 #ifndef _PCIE_LAYERSCAPE_H_
 #define _PCIE_LAYERSCAPE_H_
 #include <pci.h>
-
+#include <stdbool.h>
 #include <linux/sizes.h>
 
 #ifndef CONFIG_SYS_PCI_MEMORY_BUS
diff --git a/drivers/pci/pcie_layerscape_ep.c b/drivers/pci/pcie_layerscape_ep.c
index f6d4ae25cbe5..ad622b8b5a21 100644
--- a/drivers/pci/pcie_layerscape_ep.c
+++ b/drivers/pci/pcie_layerscape_ep.c
@@ -13,6 +13,7 @@
 #include <pci_ep.h>
 #include <asm/io.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <linux/log2.h>
 #include "pcie_layerscape.h"
diff --git a/drivers/pci/pcie_layerscape_fixup_common.c b/drivers/pci/pcie_layerscape_fixup_common.c
index 05b5f76cf2c1..d4d5bba8523e 100644
--- a/drivers/pci/pcie_layerscape_fixup_common.c
+++ b/drivers/pci/pcie_layerscape_fixup_common.c
@@ -13,6 +13,7 @@
 #include <asm/arch/soc.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <linux/string.h>
 #include "pcie_layerscape_fixup_common.h"
diff --git a/drivers/pci/pcie_layerscape_gen4.c b/drivers/pci/pcie_layerscape_gen4.c
index dcb991596b0e..7046960c77a2 100644
--- a/drivers/pci/pcie_layerscape_gen4.c
+++ b/drivers/pci/pcie_layerscape_gen4.c
@@ -17,6 +17,7 @@
 #include <malloc.h>
 #include <dm.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 
 #include "pcie_layerscape_gen4.h"
diff --git a/drivers/pci/pcie_layerscape_gen4.h b/drivers/pci/pcie_layerscape_gen4.h
index 483eb538b5c5..12669c5d8cf9 100644
--- a/drivers/pci/pcie_layerscape_gen4.h
+++ b/drivers/pci/pcie_layerscape_gen4.h
@@ -9,6 +9,7 @@
 #ifndef _PCIE_LAYERSCAPE_GEN4_H_
 #define _PCIE_LAYERSCAPE_GEN4_H_
 #include <pci.h>
+#include <stdbool.h>
 #include <linux/bitops.h>
 
 #ifndef CONFIG_SYS_PCI_MEMORY_SIZE
diff --git a/drivers/pci/pcie_xilinx.c b/drivers/pci/pcie_xilinx.c
index 442a21c11152..1bce36bc95e9 100644
--- a/drivers/pci/pcie_xilinx.c
+++ b/drivers/pci/pcie_xilinx.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <dm.h>
 #include <pci.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
diff --git a/drivers/pci_endpoint/pci_ep-uclass.c b/drivers/pci_endpoint/pci_ep-uclass.c
index aba38c3fe79a..8e672e812d16 100644
--- a/drivers/pci_endpoint/pci_ep-uclass.c
+++ b/drivers/pci_endpoint/pci_ep-uclass.c
@@ -14,6 +14,7 @@
 #include <errno.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/log2.h>
 #include <pci_ep.h>
 
diff --git a/drivers/pci_endpoint/pcie-cadence-ep.c b/drivers/pci_endpoint/pcie-cadence-ep.c
index 44cce69a9aa1..66c7dece3105 100644
--- a/drivers/pci_endpoint/pcie-cadence-ep.c
+++ b/drivers/pci_endpoint/pcie-cadence-ep.c
@@ -10,6 +10,7 @@
 #include <pci_ep.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <linux/log2.h>
 #include "pcie-cadence.h"
diff --git a/drivers/phy/marvell/comphy_a3700.c b/drivers/phy/marvell/comphy_a3700.c
index b106fd3e1321..696b36d40c94 100644
--- a/drivers/phy/marvell/comphy_a3700.c
+++ b/drivers/phy/marvell/comphy_a3700.c
@@ -12,6 +12,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 
 #include "comphy_a3700.h"
 
diff --git a/drivers/phy/marvell/comphy_cp110.c b/drivers/phy/marvell/comphy_cp110.c
index 90d2d283c0e7..532ae928a8c1 100644
--- a/drivers/phy/marvell/comphy_cp110.c
+++ b/drivers/phy/marvell/comphy_cp110.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <fdtdec.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/phy/phy-stm32-usbphyc.c b/drivers/phy/phy-stm32-usbphyc.c
index c66d185cc82d..4b7cd602c264 100644
--- a/drivers/phy/phy-stm32-usbphyc.c
+++ b/drivers/phy/phy-stm32-usbphyc.c
@@ -11,6 +11,7 @@
 #include <generic-phy.h>
 #include <log.h>
 #include <reset.h>
+#include <stdbool.h>
 #include <syscon.h>
 #include <usb.h>
 #include <asm/io.h>
diff --git a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
index 93d3696b133e..008f1f629a8f 100644
--- a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
+++ b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <clk.h>
 #include <dm.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 #include <dm/device_compat.h>
 #include <dm/lists.h>
diff --git a/drivers/phy/rockchip/phy-rockchip-typec.c b/drivers/phy/rockchip/phy-rockchip-typec.c
index f018a95497da..00a0e4d4313d 100644
--- a/drivers/phy/rockchip/phy-rockchip-typec.c
+++ b/drivers/phy/rockchip/phy-rockchip-typec.c
@@ -22,6 +22,7 @@
 #include <linux/errno.h>
 #include <linux/iopoll.h>
 #include <asm/arch-rockchip/clock.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/phy/sandbox-phy.c b/drivers/phy/sandbox-phy.c
index 5b867a6294e9..467575d6e84e 100644
--- a/drivers/phy/sandbox-phy.c
+++ b/drivers/phy/sandbox-phy.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <generic-phy.h>
+#include <stdbool.h>
 #include <linux/errno.h>
 
 struct sandbox_phy_priv {
diff --git a/drivers/phy/sti_usb_phy.c b/drivers/phy/sti_usb_phy.c
index 03a4d61434e0..91ba53f8bdb9 100644
--- a/drivers/phy/sti_usb_phy.c
+++ b/drivers/phy/sti_usb_phy.c
@@ -14,6 +14,7 @@
 #include <fdtdec.h>
 #include <generic-phy.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <regmap.h>
 #include <reset-uclass.h>
diff --git a/drivers/pinctrl/aspeed/pinctrl_ast2500.c b/drivers/pinctrl/aspeed/pinctrl_ast2500.c
index 3f57aabea1d3..040247c68a1c 100644
--- a/drivers/pinctrl/aspeed/pinctrl_ast2500.c
+++ b/drivers/pinctrl/aspeed/pinctrl_ast2500.c
@@ -12,6 +12,7 @@
 #include <asm/arch/scu_ast2500.h>
 #include <dm/pinctrl.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 /*
  * This driver works with very simple configuration that has the same name
diff --git a/drivers/pinctrl/ath79/pinctrl_ar933x.c b/drivers/pinctrl/ath79/pinctrl_ar933x.c
index 9f8ecf49ca46..dce174024405 100644
--- a/drivers/pinctrl/ath79/pinctrl_ar933x.c
+++ b/drivers/pinctrl/ath79/pinctrl_ar933x.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <dm/pinctrl.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <mach/ar71xx_regs.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/pinctrl/ath79/pinctrl_qca953x.c b/drivers/pinctrl/ath79/pinctrl_qca953x.c
index 409ab0411739..1e11eb863ca2 100644
--- a/drivers/pinctrl/ath79/pinctrl_qca953x.c
+++ b/drivers/pinctrl/ath79/pinctrl_qca953x.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <dm/pinctrl.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <mach/ar71xx_regs.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/pinctrl/exynos/pinctrl-exynos7420.c b/drivers/pinctrl/exynos/pinctrl-exynos7420.c
index 7f1aeeda940e..18de9f7762ca 100644
--- a/drivers/pinctrl/exynos/pinctrl-exynos7420.c
+++ b/drivers/pinctrl/exynos/pinctrl-exynos7420.c
@@ -14,6 +14,7 @@
 #include <fdtdec.h>
 #include <asm/arch/pinmux.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include "pinctrl-exynos.h"
 
 #define	GPD1_OFFSET	0xc0
diff --git a/drivers/pinctrl/intel/pinctrl_apl.c b/drivers/pinctrl/intel/pinctrl_apl.c
index 7624a9974fe3..ee8430b1629a 100644
--- a/drivers/pinctrl/intel/pinctrl_apl.c
+++ b/drivers/pinctrl/intel/pinctrl_apl.c
@@ -16,6 +16,7 @@
 #include <asm/intel_pinctrl.h>
 #include <asm-generic/gpio.h>
 #include <asm/intel_pinctrl_defs.h>
+#include <linux/kernel.h>
 
 /**
  * struct apl_gpio_platdata - platform data for each device
diff --git a/drivers/pinctrl/mediatek/pinctrl-mt7622.c b/drivers/pinctrl/mediatek/pinctrl-mt7622.c
index 1aa323c009a1..4f2a44f6dc51 100644
--- a/drivers/pinctrl/mediatek/pinctrl-mt7622.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mt7622.c
@@ -5,6 +5,7 @@
  */
 
 #include <dm.h>
+#include <linux/kernel.h>
 
 #include "pinctrl-mtk-common.h"
 
diff --git a/drivers/pinctrl/mediatek/pinctrl-mt7623.c b/drivers/pinctrl/mediatek/pinctrl-mt7623.c
index 0f5dcb2c6390..5bbbbc784f43 100644
--- a/drivers/pinctrl/mediatek/pinctrl-mt7623.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mt7623.c
@@ -5,6 +5,7 @@
  */
 
 #include <dm.h>
+#include <linux/kernel.h>
 
 #include "pinctrl-mtk-common.h"
 
diff --git a/drivers/pinctrl/mediatek/pinctrl-mt7629.c b/drivers/pinctrl/mediatek/pinctrl-mt7629.c
index 37640dd2b6d4..058754caf278 100644
--- a/drivers/pinctrl/mediatek/pinctrl-mt7629.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mt7629.c
@@ -5,6 +5,7 @@
  */
 
 #include <dm.h>
+#include <linux/kernel.h>
 
 #include "pinctrl-mtk-common.h"
 
diff --git a/drivers/pinctrl/mediatek/pinctrl-mt8512.c b/drivers/pinctrl/mediatek/pinctrl-mt8512.c
index af43754a4d37..d3af578afdff 100644
--- a/drivers/pinctrl/mediatek/pinctrl-mt8512.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mt8512.c
@@ -5,6 +5,7 @@
  */
 
 #include <dm.h>
+#include <linux/kernel.h>
 
 #include "pinctrl-mtk-common.h"
 
diff --git a/drivers/pinctrl/mediatek/pinctrl-mt8516.c b/drivers/pinctrl/mediatek/pinctrl-mt8516.c
index 62e339e93104..1aabf11f08d3 100644
--- a/drivers/pinctrl/mediatek/pinctrl-mt8516.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mt8516.c
@@ -5,6 +5,7 @@
  */
 
 #include <dm.h>
+#include <linux/kernel.h>
 
 #include "pinctrl-mtk-common.h"
 
diff --git a/drivers/pinctrl/mediatek/pinctrl-mt8518.c b/drivers/pinctrl/mediatek/pinctrl-mt8518.c
index 91427aed4b96..c8797773d44b 100644
--- a/drivers/pinctrl/mediatek/pinctrl-mt8518.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mt8518.c
@@ -5,6 +5,7 @@
  */
 
 #include <dm.h>
+#include <linux/kernel.h>
 
 #include "pinctrl-mtk-common.h"
 
diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
index 9227e5948c8f..362c7d477265 100644
--- a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
@@ -13,6 +13,7 @@
 #include <asm-generic/gpio.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #include "pinctrl-mtk-common.h"
 
diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common.h b/drivers/pinctrl/mediatek/pinctrl-mtk-common.h
index 5e51a9a90c12..def643c5d5b9 100644
--- a/drivers/pinctrl/mediatek/pinctrl-mtk-common.h
+++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common.h
@@ -6,6 +6,7 @@
 #ifndef __PINCTRL_MEDIATEK_H__
 #define __PINCTRL_MEDIATEK_H__
 
+#include <linux/kernel.h>
 #define MTK_PINCTRL_V0 0x0
 #define MTK_PINCTRL_V1 0x1
 
diff --git a/drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c b/drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c
index 0ed4b50b4589..26a9f1e0ebfa 100644
--- a/drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c
+++ b/drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c
@@ -12,6 +12,7 @@
 #include <dm/pinctrl.h>
 #include <linux/errno.h>
 #include <linux/io.h>
+#include <linux/kernel.h>
 #include "pinctrl-meson-axg.h"
 
 static int meson_axg_pmx_get_bank(struct udevice *dev, unsigned int pin,
diff --git a/drivers/pinctrl/meson/pinctrl-meson-axg.c b/drivers/pinctrl/meson/pinctrl-meson-axg.c
index 8f23c8cef1d6..a2bed97accf7 100644
--- a/drivers/pinctrl/meson/pinctrl-meson-axg.c
+++ b/drivers/pinctrl/meson/pinctrl-meson-axg.c
@@ -11,6 +11,7 @@
 #include <dm.h>
 #include <dm/pinctrl.h>
 #include <dt-bindings/gpio/meson-axg-gpio.h>
+#include <linux/kernel.h>
 
 #include "pinctrl-meson-axg.h"
 
diff --git a/drivers/pinctrl/meson/pinctrl-meson-g12a.c b/drivers/pinctrl/meson/pinctrl-meson-g12a.c
index 115e8b5616d6..2a38e321496d 100644
--- a/drivers/pinctrl/meson/pinctrl-meson-g12a.c
+++ b/drivers/pinctrl/meson/pinctrl-meson-g12a.c
@@ -12,6 +12,7 @@
 #include <dm.h>
 #include <dm/pinctrl.h>
 #include <dt-bindings/gpio/meson-g12a-gpio.h>
+#include <linux/kernel.h>
 
 #include "pinctrl-meson-axg.h"
 
diff --git a/drivers/pinctrl/meson/pinctrl-meson-gx-pmx.c b/drivers/pinctrl/meson/pinctrl-meson-gx-pmx.c
index 90c5e1648967..3d896cc1303a 100644
--- a/drivers/pinctrl/meson/pinctrl-meson-gx-pmx.c
+++ b/drivers/pinctrl/meson/pinctrl-meson-gx-pmx.c
@@ -11,6 +11,7 @@
 #include <dm/pinctrl.h>
 #include <linux/bitops.h>
 #include <linux/io.h>
+#include <linux/kernel.h>
 #include "pinctrl-meson-gx.h"
 
 static void meson_gx_pinmux_disable_other_groups(struct meson_pinctrl *priv,
diff --git a/drivers/pinctrl/meson/pinctrl-meson-gxbb.c b/drivers/pinctrl/meson/pinctrl-meson-gxbb.c
index 9e2e15116458..cb755d6cfc5c 100644
--- a/drivers/pinctrl/meson/pinctrl-meson-gxbb.c
+++ b/drivers/pinctrl/meson/pinctrl-meson-gxbb.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <dm/pinctrl.h>
 #include <dt-bindings/gpio/meson-gxbb-gpio.h>
+#include <linux/kernel.h>
 
 #include "pinctrl-meson-gx.h"
 
diff --git a/drivers/pinctrl/meson/pinctrl-meson-gxl.c b/drivers/pinctrl/meson/pinctrl-meson-gxl.c
index 5acc21b9c2e6..f28f07bce1aa 100644
--- a/drivers/pinctrl/meson/pinctrl-meson-gxl.c
+++ b/drivers/pinctrl/meson/pinctrl-meson-gxl.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <dm/pinctrl.h>
 #include <dt-bindings/gpio/meson-gxl-gpio.h>
+#include <linux/kernel.h>
 
 #include "pinctrl-meson-gx.h"
 
diff --git a/drivers/pinctrl/meson/pinctrl-meson.h b/drivers/pinctrl/meson/pinctrl-meson.h
index 98010cdaf965..eb33d93f506f 100644
--- a/drivers/pinctrl/meson/pinctrl-meson.h
+++ b/drivers/pinctrl/meson/pinctrl-meson.h
@@ -6,6 +6,7 @@
 #ifndef __PINCTRL_MESON_H__
 #define __PINCTRL_MESON_H__
 
+#include <linux/kernel.h>
 #include <linux/types.h>
 
 struct meson_pmx_group {
diff --git a/drivers/pinctrl/mscc/pinctrl-jr2.c b/drivers/pinctrl/mscc/pinctrl-jr2.c
index 72a9470854eb..8bb7ba593e28 100644
--- a/drivers/pinctrl/mscc/pinctrl-jr2.c
+++ b/drivers/pinctrl/mscc/pinctrl-jr2.c
@@ -18,6 +18,7 @@
 #include <linux/io.h>
 #include <asm/gpio.h>
 #include <asm/system.h>
+#include <linux/kernel.h>
 #include "mscc-common.h"
 
 enum {
diff --git a/drivers/pinctrl/mscc/pinctrl-luton.c b/drivers/pinctrl/mscc/pinctrl-luton.c
index 17fbc53c2578..4be36449d37c 100644
--- a/drivers/pinctrl/mscc/pinctrl-luton.c
+++ b/drivers/pinctrl/mscc/pinctrl-luton.c
@@ -19,6 +19,7 @@
 #include <linux/io.h>
 #include <asm/gpio.h>
 #include <asm/system.h>
+#include <linux/kernel.h>
 #include "mscc-common.h"
 
 enum {
diff --git a/drivers/pinctrl/mscc/pinctrl-ocelot.c b/drivers/pinctrl/mscc/pinctrl-ocelot.c
index 49e026bc98b8..39b95cbb7105 100644
--- a/drivers/pinctrl/mscc/pinctrl-ocelot.c
+++ b/drivers/pinctrl/mscc/pinctrl-ocelot.c
@@ -20,6 +20,7 @@
 #include <errno.h>
 #include <fdtdec.h>
 #include <linux/io.h>
+#include <linux/kernel.h>
 #include "mscc-common.h"
 
 enum {
diff --git a/drivers/pinctrl/mscc/pinctrl-serval.c b/drivers/pinctrl/mscc/pinctrl-serval.c
index d59f08d4eb78..c9104a6e7bc2 100644
--- a/drivers/pinctrl/mscc/pinctrl-serval.c
+++ b/drivers/pinctrl/mscc/pinctrl-serval.c
@@ -18,6 +18,7 @@
 #include <linux/io.h>
 #include <asm/gpio.h>
 #include <asm/system.h>
+#include <linux/kernel.h>
 #include "mscc-common.h"
 
 enum {
diff --git a/drivers/pinctrl/mscc/pinctrl-servalt.c b/drivers/pinctrl/mscc/pinctrl-servalt.c
index 592b7c547b7c..55eb7821da14 100644
--- a/drivers/pinctrl/mscc/pinctrl-servalt.c
+++ b/drivers/pinctrl/mscc/pinctrl-servalt.c
@@ -18,6 +18,7 @@
 #include <linux/io.h>
 #include <asm/gpio.h>
 #include <asm/system.h>
+#include <linux/kernel.h>
 #include "mscc-common.h"
 
 enum {
diff --git a/drivers/pinctrl/mtmips/pinctrl-mt7628.c b/drivers/pinctrl/mtmips/pinctrl-mt7628.c
index 2e043509cf84..4ea1e853f783 100644
--- a/drivers/pinctrl/mtmips/pinctrl-mt7628.c
+++ b/drivers/pinctrl/mtmips/pinctrl-mt7628.c
@@ -12,6 +12,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/io.h>
+#include <linux/kernel.h>
 
 #include "pinctrl-mtmips-common.h"
 
diff --git a/drivers/pinctrl/mtmips/pinctrl-mtmips-common.h b/drivers/pinctrl/mtmips/pinctrl-mtmips-common.h
index b51d8f009c03..25ca19ff6aba 100644
--- a/drivers/pinctrl/mtmips/pinctrl-mtmips-common.h
+++ b/drivers/pinctrl/mtmips/pinctrl-mtmips-common.h
@@ -9,6 +9,7 @@
 #define _PINCTRL_MTMIPS_COMMON_H_
 
 #include <common.h>
+#include <linux/kernel.h>
 
 struct mtmips_pmx_func {
 	const char *name;
diff --git a/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c b/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c
index c52b8f5df337..52b6c9242ae0 100644
--- a/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c
+++ b/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c
@@ -37,6 +37,7 @@
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <linux/printk.h>
 #include <linux/string.h>
diff --git a/drivers/pinctrl/nexell/pinctrl-s5pxx18.c b/drivers/pinctrl/nexell/pinctrl-s5pxx18.c
index 5bb012b197fc..08a97ae378ba 100644
--- a/drivers/pinctrl/nexell/pinctrl-s5pxx18.c
+++ b/drivers/pinctrl/nexell/pinctrl-s5pxx18.c
@@ -14,6 +14,7 @@
 #include <dm/pinctrl.h>
 #include <dm/root.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include "pinctrl-nexell.h"
 #include "pinctrl-s5pxx18.h"
 
diff --git a/drivers/pinctrl/pinctrl-at91-pio4.c b/drivers/pinctrl/pinctrl-at91-pio4.c
index 49eb9078f150..02f8d94f12d0 100644
--- a/drivers/pinctrl/pinctrl-at91-pio4.c
+++ b/drivers/pinctrl/pinctrl-at91-pio4.c
@@ -15,6 +15,7 @@
 #include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/err.h>
+#include <linux/kernel.h>
 #include <mach/atmel_pio4.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/pinctrl/pinctrl-at91.c b/drivers/pinctrl/pinctrl-at91.c
index aa5d05d93e9c..819c5723fa54 100644
--- a/drivers/pinctrl/pinctrl-at91.c
+++ b/drivers/pinctrl/pinctrl-at91.c
@@ -16,6 +16,7 @@
 #include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/err.h>
+#include <linux/kernel.h>
 #include <mach/at91_pio.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/pinctrl/pinctrl-generic.c b/drivers/pinctrl/pinctrl-generic.c
index 45b3ad5d793c..a8a78020d0a2 100644
--- a/drivers/pinctrl/pinctrl-generic.c
+++ b/drivers/pinctrl/pinctrl-generic.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <stdbool.h>
 #include <dm/device_compat.h>
 #include <linux/compat.h>
 #include <dm/pinctrl.h>
diff --git a/drivers/pinctrl/pinctrl-sandbox.c b/drivers/pinctrl/pinctrl-sandbox.c
index 28db1116387e..6b6ad35b351a 100644
--- a/drivers/pinctrl/pinctrl-sandbox.c
+++ b/drivers/pinctrl/pinctrl-sandbox.c
@@ -11,6 +11,7 @@
 #include <vsprintf.h>
 #include <dm/pinctrl.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 static const char * const sandbox_pins[] = {
diff --git a/drivers/pinctrl/pinctrl-single.c b/drivers/pinctrl/pinctrl-single.c
index e4a05f5cce67..24387e59f1ee 100644
--- a/drivers/pinctrl/pinctrl-single.c
+++ b/drivers/pinctrl/pinctrl-single.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <stdbool.h>
 #include <dm/device_compat.h>
 #include <dm/pinctrl.h>
 #include <linux/errno.h>
diff --git a/drivers/pinctrl/pinctrl-sti.c b/drivers/pinctrl/pinctrl-sti.c
index f6444181671d..7549253e0612 100644
--- a/drivers/pinctrl/pinctrl-sti.c
+++ b/drivers/pinctrl/pinctrl-sti.c
@@ -18,6 +18,7 @@
 #include <dm/pinctrl.h>
 #include <linux/bug.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <linux/printk.h>
 
diff --git a/drivers/pinctrl/pinctrl-stmfx.c b/drivers/pinctrl/pinctrl-stmfx.c
index bdf852c5f024..b72374cd09cd 100644
--- a/drivers/pinctrl/pinctrl-stmfx.c
+++ b/drivers/pinctrl/pinctrl-stmfx.c
@@ -19,6 +19,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <power/regulator.h>
 
diff --git a/drivers/pinctrl/pinctrl_pic32.c b/drivers/pinctrl/pinctrl_pic32.c
index 6f2b34f2813e..939760d5bb1b 100644
--- a/drivers/pinctrl/pinctrl_pic32.c
+++ b/drivers/pinctrl/pinctrl_pic32.c
@@ -14,6 +14,7 @@
 #include <dm/pinctrl.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <mach/pic32.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/pinctrl/pinctrl_stm32.c b/drivers/pinctrl/pinctrl_stm32.c
index faec68c3b2ef..98cf5b5aa5bb 100644
--- a/drivers/pinctrl/pinctrl_stm32.c
+++ b/drivers/pinctrl/pinctrl_stm32.c
@@ -14,6 +14,7 @@
 #include <linux/bitops.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <linux/printk.h>
 
diff --git a/drivers/pinctrl/renesas/pfc-r7s72100.c b/drivers/pinctrl/renesas/pfc-r7s72100.c
index db4dea111040..91d220fe4756 100644
--- a/drivers/pinctrl/renesas/pfc-r7s72100.c
+++ b/drivers/pinctrl/renesas/pfc-r7s72100.c
@@ -15,6 +15,7 @@
 #include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/err.h>
+#include <linux/kernel.h>
 
 #define P(bank)			(0x0000 + (bank) * 4)
 #define PSR(bank)		(0x0100 + (bank) * 4)
diff --git a/drivers/pinctrl/renesas/pfc.c b/drivers/pinctrl/renesas/pfc.c
index 1a7e686a4653..5d7486574ccd 100644
--- a/drivers/pinctrl/renesas/pfc.c
+++ b/drivers/pinctrl/renesas/pfc.c
@@ -22,6 +22,7 @@
 #include <linux/bug.h>
 #include <linux/errno.h>
 #include <linux/io.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 
 #include "sh_pfc.h"
diff --git a/drivers/pinctrl/renesas/sh_pfc.h b/drivers/pinctrl/renesas/sh_pfc.h
index 81c017994825..feea8a45ff60 100644
--- a/drivers/pinctrl/renesas/sh_pfc.h
+++ b/drivers/pinctrl/renesas/sh_pfc.h
@@ -11,6 +11,7 @@
 #ifndef __SH_PFC_H
 #define __SH_PFC_H
 
+#include <linux/kernel.h>
 #include <linux/stringify.h>
 
 enum {
diff --git a/drivers/pinctrl/rockchip/pinctrl-px30.c b/drivers/pinctrl/rockchip/pinctrl-px30.c
index bf1ee07c5fe0..bbe501607228 100644
--- a/drivers/pinctrl/rockchip/pinctrl-px30.c
+++ b/drivers/pinctrl/rockchip/pinctrl-px30.c
@@ -11,6 +11,7 @@
 #include <syscon.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #include "pinctrl-rockchip.h"
 
diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3036.c b/drivers/pinctrl/rockchip/pinctrl-rk3036.c
index 11d4e784d02a..77bd12e4c796 100644
--- a/drivers/pinctrl/rockchip/pinctrl-rk3036.c
+++ b/drivers/pinctrl/rockchip/pinctrl-rk3036.c
@@ -10,6 +10,7 @@
 #include <syscon.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #include "pinctrl-rockchip.h"
 
diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3128.c b/drivers/pinctrl/rockchip/pinctrl-rk3128.c
index 445dbf85d4f8..dc44f7840802 100644
--- a/drivers/pinctrl/rockchip/pinctrl-rk3128.c
+++ b/drivers/pinctrl/rockchip/pinctrl-rk3128.c
@@ -10,6 +10,7 @@
 #include <syscon.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #include "pinctrl-rockchip.h"
 
diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3188.c b/drivers/pinctrl/rockchip/pinctrl-rk3188.c
index c4ff4e585312..4b919e9cffc4 100644
--- a/drivers/pinctrl/rockchip/pinctrl-rk3188.c
+++ b/drivers/pinctrl/rockchip/pinctrl-rk3188.c
@@ -10,6 +10,7 @@
 #include <regmap.h>
 #include <syscon.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #include "pinctrl-rockchip.h"
 
diff --git a/drivers/pinctrl/rockchip/pinctrl-rk322x.c b/drivers/pinctrl/rockchip/pinctrl-rk322x.c
index 3e925837ee85..2ae92e258b72 100644
--- a/drivers/pinctrl/rockchip/pinctrl-rk322x.c
+++ b/drivers/pinctrl/rockchip/pinctrl-rk322x.c
@@ -11,6 +11,7 @@
 #include <syscon.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #include "pinctrl-rockchip.h"
 
diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3288.c b/drivers/pinctrl/rockchip/pinctrl-rk3288.c
index e8cdca1bd280..8c22a56b6200 100644
--- a/drivers/pinctrl/rockchip/pinctrl-rk3288.c
+++ b/drivers/pinctrl/rockchip/pinctrl-rk3288.c
@@ -10,6 +10,7 @@
 #include <regmap.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #include "pinctrl-rockchip.h"
 
diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3308.c b/drivers/pinctrl/rockchip/pinctrl-rk3308.c
index 088617de5db9..afd9bd3e85d3 100644
--- a/drivers/pinctrl/rockchip/pinctrl-rk3308.c
+++ b/drivers/pinctrl/rockchip/pinctrl-rk3308.c
@@ -11,6 +11,7 @@
 #include <syscon.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #include "pinctrl-rockchip.h"
 
diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3328.c b/drivers/pinctrl/rockchip/pinctrl-rk3328.c
index 342d67d06d91..42075627f968 100644
--- a/drivers/pinctrl/rockchip/pinctrl-rk3328.c
+++ b/drivers/pinctrl/rockchip/pinctrl-rk3328.c
@@ -11,6 +11,7 @@
 #include <syscon.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #include "pinctrl-rockchip.h"
 
diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3368.c b/drivers/pinctrl/rockchip/pinctrl-rk3368.c
index d66b62d91361..5fbc06359648 100644
--- a/drivers/pinctrl/rockchip/pinctrl-rk3368.c
+++ b/drivers/pinctrl/rockchip/pinctrl-rk3368.c
@@ -10,6 +10,7 @@
 #include <regmap.h>
 #include <syscon.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #include "pinctrl-rockchip.h"
 
diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3399.c b/drivers/pinctrl/rockchip/pinctrl-rk3399.c
index ec33f89bb829..084941c67062 100644
--- a/drivers/pinctrl/rockchip/pinctrl-rk3399.c
+++ b/drivers/pinctrl/rockchip/pinctrl-rk3399.c
@@ -11,6 +11,7 @@
 #include <syscon.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #include "pinctrl-rockchip.h"
 
diff --git a/drivers/pinctrl/rockchip/pinctrl-rockchip-core.c b/drivers/pinctrl/rockchip/pinctrl-rockchip-core.c
index 389d584078f8..f36e49f36a4d 100644
--- a/drivers/pinctrl/rockchip/pinctrl-rockchip-core.c
+++ b/drivers/pinctrl/rockchip/pinctrl-rockchip-core.c
@@ -13,6 +13,7 @@
 #include <fdtdec.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <linux/string.h>
 
diff --git a/drivers/pinctrl/rockchip/pinctrl-rockchip.h b/drivers/pinctrl/rockchip/pinctrl-rockchip.h
index d969c200826c..5231e646521e 100644
--- a/drivers/pinctrl/rockchip/pinctrl-rockchip.h
+++ b/drivers/pinctrl/rockchip/pinctrl-rockchip.h
@@ -6,6 +6,7 @@
 #ifndef __DRIVERS_PINCTRL_ROCKCHIP_H
 #define __DRIVERS_PINCTRL_ROCKCHIP_H
 
+#include <stdbool.h>
 #include <linux/bitops.h>
 #include <linux/types.h>
 
diff --git a/drivers/pinctrl/rockchip/pinctrl-rv1108.c b/drivers/pinctrl/rockchip/pinctrl-rv1108.c
index c0fb962ef059..42db3375d042 100644
--- a/drivers/pinctrl/rockchip/pinctrl-rv1108.c
+++ b/drivers/pinctrl/rockchip/pinctrl-rv1108.c
@@ -11,6 +11,7 @@
 #include <syscon.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #include "pinctrl-rockchip.h"
 
diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c
index 5efaa2f66b03..a1d41cc48ff5 100644
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <dm/pinctrl.h>
+#include <linux/kernel.h>
 
 #include "pinctrl-uniphier.h"
 
diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c
index d3c5833c993a..7bd359f95afb 100644
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <dm/pinctrl.h>
+#include <linux/kernel.h>
 
 #include "pinctrl-uniphier.h"
 
diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c
index bf1a9e9e9899..ddea6ab9d040 100644
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <dm/pinctrl.h>
+#include <linux/kernel.h>
 
 #include "pinctrl-uniphier.h"
 
diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c
index f22c046804a0..4f9692ac1b6f 100644
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <dm/pinctrl.h>
+#include <linux/kernel.h>
 
 #include "pinctrl-uniphier.h"
 
diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c
index 8bae163a8e9b..93a57eac7692 100644
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <dm/pinctrl.h>
+#include <linux/kernel.h>
 
 #include "pinctrl-uniphier.h"
 
diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c
index 1f4931bcf0da..48a6f854f91e 100644
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <dm/pinctrl.h>
+#include <linux/kernel.h>
 
 #include "pinctrl-uniphier.h"
 
diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-pxs2.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-pxs2.c
index 038a7dd7be06..7f9387c25ff3 100644
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier-pxs2.c
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-pxs2.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <dm/pinctrl.h>
+#include <linux/kernel.h>
 
 #include "pinctrl-uniphier.h"
 
diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-pxs3.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-pxs3.c
index 452d76d721d4..a929ef38a98b 100644
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier-pxs3.c
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-pxs3.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <dm/pinctrl.h>
+#include <linux/kernel.h>
 
 #include "pinctrl-uniphier.h"
 
diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-sld8.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-sld8.c
index 1e38ba16f930..3bb9c2920786 100644
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier-sld8.c
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-sld8.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <dm/pinctrl.h>
+#include <linux/kernel.h>
 
 #include "pinctrl-uniphier.h"
 
diff --git a/drivers/power/acpi_pmc/acpi-pmc-uclass.c b/drivers/power/acpi_pmc/acpi-pmc-uclass.c
index d713dc81f0a5..f13e27f34cb2 100644
--- a/drivers/power/acpi_pmc/acpi-pmc-uclass.c
+++ b/drivers/power/acpi_pmc/acpi-pmc-uclass.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <acpi/acpi_s3.h>
 #ifdef CONFIG_X86
diff --git a/drivers/power/acpi_pmc/pmc_emul.c b/drivers/power/acpi_pmc/pmc_emul.c
index 93ba847e2eca..de6afccea12c 100644
--- a/drivers/power/acpi_pmc/pmc_emul.c
+++ b/drivers/power/acpi_pmc/pmc_emul.c
@@ -12,6 +12,7 @@
 #include <pci.h>
 #include <asm/test.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <power/acpi_pmc.h>
 
 /**
diff --git a/drivers/power/axp809.c b/drivers/power/axp809.c
index fd85b7341457..7999ab593a8f 100644
--- a/drivers/power/axp809.c
+++ b/drivers/power/axp809.c
@@ -13,6 +13,7 @@
 #include <common.h>
 #include <command.h>
 #include <errno.h>
+#include <stdbool.h>
 #include <asm/arch/gpio.h>
 #include <asm/arch/pmic_bus.h>
 #include <axp_pmic.h>
diff --git a/drivers/power/axp818.c b/drivers/power/axp818.c
index bfdc3d93caf0..340472d75c78 100644
--- a/drivers/power/axp818.c
+++ b/drivers/power/axp818.c
@@ -13,6 +13,7 @@
 #include <common.h>
 #include <command.h>
 #include <errno.h>
+#include <stdbool.h>
 #include <asm/arch/gpio.h>
 #include <asm/arch/pmic_bus.h>
 #include <axp_pmic.h>
diff --git a/drivers/power/domain/imx8-power-domain-legacy.c b/drivers/power/domain/imx8-power-domain-legacy.c
index 37167b334603..2b07855fb116 100644
--- a/drivers/power/domain/imx8-power-domain-legacy.c
+++ b/drivers/power/domain/imx8-power-domain-legacy.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <power-domain-uclass.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/power/domain/meson-ee-pwrc.c b/drivers/power/domain/meson-ee-pwrc.c
index 7e131d325534..f6082f2a4c09 100644
--- a/drivers/power/domain/meson-ee-pwrc.c
+++ b/drivers/power/domain/meson-ee-pwrc.c
@@ -19,6 +19,7 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 /* AO Offsets */
 
diff --git a/drivers/power/domain/power-domain-uclass.c b/drivers/power/domain/power-domain-uclass.c
index cf9227572f98..2ea428607949 100644
--- a/drivers/power/domain/power-domain-uclass.c
+++ b/drivers/power/domain/power-domain-uclass.c
@@ -9,6 +9,7 @@
 #include <malloc.h>
 #include <power-domain.h>
 #include <power-domain-uclass.h>
+#include <stdbool.h>
 #include <dm/device-internal.h>
 #include <linux/errno.h>
 
diff --git a/drivers/power/domain/sandbox-power-domain.c b/drivers/power/domain/sandbox-power-domain.c
index 373db61ba0f9..c58b80e63a0f 100644
--- a/drivers/power/domain/sandbox-power-domain.c
+++ b/drivers/power/domain/sandbox-power-domain.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <power-domain-uclass.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <asm/power-domain.h>
 #include <linux/errno.h>
diff --git a/drivers/power/domain/tegra186-power-domain.c b/drivers/power/domain/tegra186-power-domain.c
index 707735cf8516..3649858e0f21 100644
--- a/drivers/power/domain/tegra186-power-domain.c
+++ b/drivers/power/domain/tegra186-power-domain.c
@@ -9,6 +9,7 @@
 #include <malloc.h>
 #include <misc.h>
 #include <power-domain-uclass.h>
+#include <stdbool.h>
 #include <asm/arch-tegra/bpmp_abi.h>
 #include <linux/bitops.h>
 
diff --git a/drivers/power/fuel_gauge/fg_max17042.c b/drivers/power/fuel_gauge/fg_max17042.c
index 89a170aea609..a0614e229a14 100644
--- a/drivers/power/fuel_gauge/fg_max17042.c
+++ b/drivers/power/fuel_gauge/fg_max17042.c
@@ -9,6 +9,7 @@
 #include <stdio.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <power/pmic.h>
 #include <power/max17042_fg.h>
 #include <i2c.h>
diff --git a/drivers/power/pmic/da9063.c b/drivers/power/pmic/da9063.c
index b88e79f43143..13b7503aedb7 100644
--- a/drivers/power/pmic/da9063.c
+++ b/drivers/power/pmic/da9063.c
@@ -11,6 +11,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/pmic/i2c_pmic_emul.c b/drivers/power/pmic/i2c_pmic_emul.c
index 1a044ea5b17d..ce68fdb043ae 100644
--- a/drivers/power/pmic/i2c_pmic_emul.c
+++ b/drivers/power/pmic/i2c_pmic_emul.c
@@ -10,6 +10,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
diff --git a/drivers/power/pmic/rk8xx.c b/drivers/power/pmic/rk8xx.c
index 991a94b41ab4..db0968ac0f51 100644
--- a/drivers/power/pmic/rk8xx.c
+++ b/drivers/power/pmic/rk8xx.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <stdio.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <power/rk8xx_pmic.h>
 #include <power/pmic.h>
 
diff --git a/drivers/power/regulator/act8846.c b/drivers/power/regulator/act8846.c
index 0140231214a8..175966293c29 100644
--- a/drivers/power/regulator/act8846.c
+++ b/drivers/power/regulator/act8846.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
+#include <stdbool.h>
 #include <linux/errno.h>
 #include <power/act8846_pmic.h>
 #include <power/pmic.h>
diff --git a/drivers/power/regulator/as3722_regulator.c b/drivers/power/regulator/as3722_regulator.c
index da25e58dec9f..55b61cd7a9f0 100644
--- a/drivers/power/regulator/as3722_regulator.c
+++ b/drivers/power/regulator/as3722_regulator.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
+#include <stdbool.h>
 #include <linux/errno.h>
 #include <power/as3722.h>
 #include <power/pmic.h>
diff --git a/drivers/power/regulator/bd71837.c b/drivers/power/regulator/bd71837.c
index 7ebba28a9927..2a74bfcc79e2 100644
--- a/drivers/power/regulator/bd71837.c
+++ b/drivers/power/regulator/bd71837.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include <power/bd71837.h>
diff --git a/drivers/power/regulator/da9063.c b/drivers/power/regulator/da9063.c
index ae069e602a31..bfe77d6814ac 100644
--- a/drivers/power/regulator/da9063.c
+++ b/drivers/power/regulator/da9063.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <power/da9063_pmic.h>
 #include <power/pmic.h>
diff --git a/drivers/power/regulator/fan53555.c b/drivers/power/regulator/fan53555.c
index fa8dc96f9da0..93aa04f7aeed 100644
--- a/drivers/power/regulator/fan53555.c
+++ b/drivers/power/regulator/fan53555.c
@@ -13,6 +13,7 @@
 #include <asm/gpio.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <power/fan53555.h>
 #include <power/pmic.h>
diff --git a/drivers/power/regulator/fixed.c b/drivers/power/regulator/fixed.c
index 629b61c766c6..53387c2f7c92 100644
--- a/drivers/power/regulator/fixed.c
+++ b/drivers/power/regulator/fixed.c
@@ -9,6 +9,7 @@
 #include <errno.h>
 #include <dm.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/gpio.h>
 #include <linux/errno.h>
 #include <power/pmic.h>
diff --git a/drivers/power/regulator/gpio-regulator.c b/drivers/power/regulator/gpio-regulator.c
index 05b12f4fe8c8..2874236b989a 100644
--- a/drivers/power/regulator/gpio-regulator.c
+++ b/drivers/power/regulator/gpio-regulator.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/gpio.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
diff --git a/drivers/power/regulator/lp873x_regulator.c b/drivers/power/regulator/lp873x_regulator.c
index c47a4a9a7786..38bf4f53b27f 100644
--- a/drivers/power/regulator/lp873x_regulator.c
+++ b/drivers/power/regulator/lp873x_regulator.c
@@ -11,6 +11,7 @@
 #include <errno.h>
 #include <dm.h>
 #include <i2c.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <linux/errno.h>
 #include <power/pmic.h>
diff --git a/drivers/power/regulator/lp87565_regulator.c b/drivers/power/regulator/lp87565_regulator.c
index 2275a7367b0a..96b0f36c4151 100644
--- a/drivers/power/regulator/lp87565_regulator.c
+++ b/drivers/power/regulator/lp87565_regulator.c
@@ -12,6 +12,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <linux/errno.h>
 #include <power/pmic.h>
diff --git a/drivers/power/regulator/max77686.c b/drivers/power/regulator/max77686.c
index bcbe257f53fd..e4c099fb8b4a 100644
--- a/drivers/power/regulator/max77686.c
+++ b/drivers/power/regulator/max77686.c
@@ -12,6 +12,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/regulator/palmas_regulator.c b/drivers/power/regulator/palmas_regulator.c
index 9f1ae1d246fd..5eeed77b29e4 100644
--- a/drivers/power/regulator/palmas_regulator.c
+++ b/drivers/power/regulator/palmas_regulator.c
@@ -11,6 +11,7 @@
 #include <errno.h>
 #include <dm.h>
 #include <i2c.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <linux/errno.h>
 #include <linux/string.h>
diff --git a/drivers/power/regulator/pfuze100.c b/drivers/power/regulator/pfuze100.c
index b874d58961cc..1f9eab05cbe3 100644
--- a/drivers/power/regulator/pfuze100.c
+++ b/drivers/power/regulator/pfuze100.c
@@ -12,6 +12,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/regulator/pwm_regulator.c b/drivers/power/regulator/pwm_regulator.c
index 451ce106e4f9..9bf65e9685f9 100644
--- a/drivers/power/regulator/pwm_regulator.c
+++ b/drivers/power/regulator/pwm_regulator.c
@@ -12,6 +12,7 @@
 #include <errno.h>
 #include <log.h>
 #include <pwm.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <dm/device_compat.h>
diff --git a/drivers/power/regulator/regulator-uclass.c b/drivers/power/regulator/regulator-uclass.c
index 704a33d057a4..251fc78bc89f 100644
--- a/drivers/power/regulator/regulator-uclass.c
+++ b/drivers/power/regulator/regulator-uclass.c
@@ -12,6 +12,7 @@
 #include <dm/uclass-internal.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/regulator/regulator_common.c b/drivers/power/regulator/regulator_common.c
index 575b631597e1..b2a2e1eef5d5 100644
--- a/drivers/power/regulator/regulator_common.c
+++ b/drivers/power/regulator/regulator_common.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/gpio.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/power/regulator/regulator_common.h b/drivers/power/regulator/regulator_common.h
index 946401f5e24e..0d3d05c40b3e 100644
--- a/drivers/power/regulator/regulator_common.h
+++ b/drivers/power/regulator/regulator_common.h
@@ -7,6 +7,8 @@
 #ifndef _REGULATOR_COMMON_H
 #define _REGULATOR_COMMON_H
 
+#include <stdbool.h>
+
 struct regulator_common_platdata {
 	struct gpio_desc gpio; /* GPIO for regulator enable control */
 	unsigned int startup_delay_us;
diff --git a/drivers/power/regulator/rk8xx.c b/drivers/power/regulator/rk8xx.c
index 03e6ffcc978e..e6b0bbac7cfb 100644
--- a/drivers/power/regulator/rk8xx.c
+++ b/drivers/power/regulator/rk8xx.c
@@ -13,6 +13,7 @@
 #include <errno.h>
 #include <log.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <power/rk8xx_pmic.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/regulator/s2mps11_regulator.c b/drivers/power/regulator/s2mps11_regulator.c
index ffbc06d9b794..728a67bf8d40 100644
--- a/drivers/power/regulator/s2mps11_regulator.c
+++ b/drivers/power/regulator/s2mps11_regulator.c
@@ -11,6 +11,7 @@
 #include <i2c.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/regulator/s5m8767.c b/drivers/power/regulator/s5m8767.c
index 7e1d08b8d11d..6d4f8caa3bb7 100644
--- a/drivers/power/regulator/s5m8767.c
+++ b/drivers/power/regulator/s5m8767.c
@@ -8,6 +8,7 @@
 #include <errno.h>
 #include <dm.h>
 #include <i2c.h>
+#include <stdbool.h>
 #include <linux/errno.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/regulator/sandbox.c b/drivers/power/regulator/sandbox.c
index 88c6f3ca3b24..196092c7260c 100644
--- a/drivers/power/regulator/sandbox.c
+++ b/drivers/power/regulator/sandbox.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/regulator/stpmic1.c b/drivers/power/regulator/stpmic1.c
index 38cd18b0d4f0..119e8d3ffbb5 100644
--- a/drivers/power/regulator/stpmic1.c
+++ b/drivers/power/regulator/stpmic1.c
@@ -9,6 +9,7 @@
 #include <errno.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/stpmic1.h>
diff --git a/drivers/power/regulator/tps62360_regulator.c b/drivers/power/regulator/tps62360_regulator.c
index 5d7d3d43ed51..44c26e868d3a 100644
--- a/drivers/power/regulator/tps62360_regulator.c
+++ b/drivers/power/regulator/tps62360_regulator.c
@@ -9,6 +9,7 @@
 #include <i2c.h>
 #include <dm/device_compat.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <power/regulator.h>
 
 #define TPS62360_REG_SET0	0
diff --git a/drivers/power/regulator/tps65090_regulator.c b/drivers/power/regulator/tps65090_regulator.c
index 95db2d60e504..cbab544e2bc6 100644
--- a/drivers/power/regulator/tps65090_regulator.c
+++ b/drivers/power/regulator/tps65090_regulator.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
+#include <stdbool.h>
 #include <time.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/power/regulator/tps65910_regulator.c b/drivers/power/regulator/tps65910_regulator.c
index a2bd9c6c18ab..bc9ec2dcb270 100644
--- a/drivers/power/regulator/tps65910_regulator.c
+++ b/drivers/power/regulator/tps65910_regulator.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <log.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/regulator/tps65941_regulator.c b/drivers/power/regulator/tps65941_regulator.c
index 535d88a7e19c..1767a72ac0d2 100644
--- a/drivers/power/regulator/tps65941_regulator.c
+++ b/drivers/power/regulator/tps65941_regulator.c
@@ -12,6 +12,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/power/tps6586x.c b/drivers/power/tps6586x.c
index acf0d5cfa4f4..ac9d0986040f 100644
--- a/drivers/power/tps6586x.c
+++ b/drivers/power/tps6586x.c
@@ -11,6 +11,7 @@
 #include <i2c.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 static struct udevice *tps6586x_dev;
 
diff --git a/drivers/pwm/exynos_pwm.c b/drivers/pwm/exynos_pwm.c
index 5417e95ef7b1..59a07e593b94 100644
--- a/drivers/pwm/exynos_pwm.c
+++ b/drivers/pwm/exynos_pwm.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <log.h>
 #include <pwm.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <asm/arch/clk.h>
 #include <asm/arch/clock.h>
diff --git a/drivers/pwm/pwm-imx.c b/drivers/pwm/pwm-imx.c
index 77a1907fd3ba..70bf5851e54e 100644
--- a/drivers/pwm/pwm-imx.c
+++ b/drivers/pwm/pwm-imx.c
@@ -11,6 +11,7 @@
 #include <dm.h>
 #include <log.h>
 #include <pwm.h>
+#include <stdbool.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/io.h>
 #include "pwm-imx-util.h"
diff --git a/drivers/pwm/pwm-mtk.c b/drivers/pwm/pwm-mtk.c
index 1459e7fa6738..9b997ec88f76 100644
--- a/drivers/pwm/pwm-mtk.c
+++ b/drivers/pwm/pwm-mtk.c
@@ -15,6 +15,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/io.h>
+#include <linux/kernel.h>
 
 /* PWM registers and bits definitions */
 #define PWMCON			0x00
diff --git a/drivers/pwm/pwm-sifive.c b/drivers/pwm/pwm-sifive.c
index 866b243c0046..cf3c723aceb9 100644
--- a/drivers/pwm/pwm-sifive.c
+++ b/drivers/pwm/pwm-sifive.c
@@ -21,6 +21,7 @@
 #include <asm/global_data.h>
 #include <linux/errno.h>
 #include <linux/io.h>
+#include <linux/kernel.h>
 #include <linux/log2.h>
 #include <linux/bitfield.h>
 
diff --git a/drivers/pwm/pwm-uclass.c b/drivers/pwm/pwm-uclass.c
index ab2df85e3ea2..e3bfcc837dc3 100644
--- a/drivers/pwm/pwm-uclass.c
+++ b/drivers/pwm/pwm-uclass.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <pwm.h>
+#include <stdbool.h>
 #include <linux/errno.h>
 
 int pwm_set_invert(struct udevice *dev, uint channel, bool polarity)
diff --git a/drivers/pwm/rk_pwm.c b/drivers/pwm/rk_pwm.c
index 04c16ff36d8e..afe480710472 100644
--- a/drivers/pwm/rk_pwm.c
+++ b/drivers/pwm/rk_pwm.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <pwm.h>
 #include <regmap.h>
+#include <stdbool.h>
 #include <syscon.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/pwm/sandbox_pwm.c b/drivers/pwm/sandbox_pwm.c
index 0e267064b146..44e7f2356506 100644
--- a/drivers/pwm/sandbox_pwm.c
+++ b/drivers/pwm/sandbox_pwm.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <pwm.h>
+#include <stdbool.h>
 #include <asm/test.h>
 #include <linux/errno.h>
 
diff --git a/drivers/pwm/sunxi_pwm.c b/drivers/pwm/sunxi_pwm.c
index d3e714a6ab3c..55472103fcc9 100644
--- a/drivers/pwm/sunxi_pwm.c
+++ b/drivers/pwm/sunxi_pwm.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <pwm.h>
 #include <regmap.h>
+#include <stdbool.h>
 #include <syscon.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/pwm/tegra_pwm.c b/drivers/pwm/tegra_pwm.c
index 2cfb3787dc4d..11378bb2e3bf 100644
--- a/drivers/pwm/tegra_pwm.c
+++ b/drivers/pwm/tegra_pwm.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <log.h>
 #include <pwm.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/pwm.h>
diff --git a/drivers/qe/uec.c b/drivers/qe/uec.c
index 49adc58165d7..cb11e99faf8d 100644
--- a/drivers/qe/uec.c
+++ b/drivers/qe/uec.c
@@ -16,6 +16,7 @@
 #include <linux/errno.h>
 #include <asm/io.h>
 #include <linux/immap_qe.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "uccf.h"
 #include "uec.h"
diff --git a/drivers/qe/uec_phy.c b/drivers/qe/uec_phy.c
index c9beb852defd..ff9ed5d01ae9 100644
--- a/drivers/qe/uec_phy.c
+++ b/drivers/qe/uec_phy.c
@@ -17,6 +17,7 @@
 #include <linux/errno.h>
 #include <linux/immap_qe.h>
 #include <asm/io.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "uccf.h"
 #include "uec.h"
diff --git a/drivers/ram/k3-j721e/lpddr4_if.h b/drivers/ram/k3-j721e/lpddr4_if.h
index 66ec3c5a27f6..56a1c926985f 100644
--- a/drivers/ram/k3-j721e/lpddr4_if.h
+++ b/drivers/ram/k3-j721e/lpddr4_if.h
@@ -13,6 +13,7 @@
 #ifndef LPDDR4_IF_H
 #define LPDDR4_IF_H
 
+#include <stdbool.h>
 #include <linux/types.h>
 
 /** @defgroup ConfigInfo  Configuration and Hardware Operation Information
diff --git a/drivers/ram/k3-j721e/lpddr4_sanity.h b/drivers/ram/k3-j721e/lpddr4_sanity.h
index 84050d72c4a3..1ee052bffb9e 100644
--- a/drivers/ram/k3-j721e/lpddr4_sanity.h
+++ b/drivers/ram/k3-j721e/lpddr4_sanity.h
@@ -21,6 +21,7 @@
 #define LPDDR4_SANITY_H
 
 #include <errno.h>
+#include <stdbool.h>
 #include <linux/errno.h>
 #include <linux/types.h>
 #include "lpddr4_if.h"
diff --git a/drivers/ram/k3-j721e/lpddr4_structs_if.h b/drivers/ram/k3-j721e/lpddr4_structs_if.h
index dc6dd3570e00..c3a308e2af6f 100644
--- a/drivers/ram/k3-j721e/lpddr4_structs_if.h
+++ b/drivers/ram/k3-j721e/lpddr4_structs_if.h
@@ -12,6 +12,7 @@
 #ifndef LPDDR4_STRUCTS_IF_H
 #define LPDDR4_STRUCTS_IF_H
 
+#include <stdbool.h>
 #include <linux/types.h>
 #include "lpddr4_if.h"
 
diff --git a/drivers/ram/rockchip/dmc-rk3368.c b/drivers/ram/rockchip/dmc-rk3368.c
index 1c3d95d7d632..9f13363e634a 100644
--- a/drivers/ram/rockchip/dmc-rk3368.c
+++ b/drivers/ram/rockchip/dmc-rk3368.c
@@ -26,6 +26,7 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 
 struct dram_info {
diff --git a/drivers/ram/rockchip/sdram_px30.c b/drivers/ram/rockchip/sdram_px30.c
index fd5763d0a0df..a4f8980bfd76 100644
--- a/drivers/ram/rockchip/sdram_px30.c
+++ b/drivers/ram/rockchip/sdram_px30.c
@@ -18,6 +18,7 @@
 #include <asm/arch-rockchip/sdram.h>
 #include <asm/arch-rockchip/sdram_px30.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 
 struct dram_info {
 #ifdef CONFIG_TPL_BUILD
diff --git a/drivers/ram/rockchip/sdram_rk3188.c b/drivers/ram/rockchip/sdram_rk3188.c
index a8db0e341222..cfa6d0ebf19e 100644
--- a/drivers/ram/rockchip/sdram_rk3188.c
+++ b/drivers/ram/rockchip/sdram_rk3188.c
@@ -29,6 +29,7 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 struct chan_info {
diff --git a/drivers/ram/rockchip/sdram_rk322x.c b/drivers/ram/rockchip/sdram_rk322x.c
index 92fe235be5a5..89b4fc2acb64 100644
--- a/drivers/ram/rockchip/sdram_rk322x.c
+++ b/drivers/ram/rockchip/sdram_rk322x.c
@@ -25,6 +25,7 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/ram/rockchip/sdram_rk3288.c b/drivers/ram/rockchip/sdram_rk3288.c
index 4f48da4b4e58..80abe9c9b20c 100644
--- a/drivers/ram/rockchip/sdram_rk3288.c
+++ b/drivers/ram/rockchip/sdram_rk3288.c
@@ -29,6 +29,7 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <power/regulator.h>
 #include <power/rk8xx_pmic.h>
diff --git a/drivers/ram/rockchip/sdram_rk3328.c b/drivers/ram/rockchip/sdram_rk3328.c
index e61972e322c7..827d52e7a5c7 100644
--- a/drivers/ram/rockchip/sdram_rk3328.c
+++ b/drivers/ram/rockchip/sdram_rk3328.c
@@ -21,6 +21,7 @@
 #include <asm/arch-rockchip/sdram_rk3328.h>
 #include <asm/arch-rockchip/uart.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 struct dram_info {
diff --git a/drivers/ram/rockchip/sdram_rk3399.c b/drivers/ram/rockchip/sdram_rk3399.c
index 45c20b7cfa3b..690b8c3f3b29 100644
--- a/drivers/ram/rockchip/sdram_rk3399.c
+++ b/drivers/ram/rockchip/sdram_rk3399.c
@@ -27,6 +27,7 @@
 #include <linux/err.h>
 #include <time.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #define PRESET_SGRF_HOLD(n)	((0x1 << (6 + 16)) | ((n) << 6))
 #define PRESET_GPIO0_HOLD(n)	((0x1 << (7 + 16)) | ((n) << 7))
diff --git a/drivers/ram/stm32mp1/stm32mp1_ddr.c b/drivers/ram/stm32mp1/stm32mp1_ddr.c
index 6742aa6a9869..d122dadd6dc2 100644
--- a/drivers/ram/stm32mp1/stm32mp1_ddr.c
+++ b/drivers/ram/stm32mp1/stm32mp1_ddr.c
@@ -17,6 +17,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/iopoll.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include "stm32mp1_ddr.h"
diff --git a/drivers/ram/stm32mp1/stm32mp1_ddr.h b/drivers/ram/stm32mp1/stm32mp1_ddr.h
index 4998f0443944..5f15196b2da3 100644
--- a/drivers/ram/stm32mp1/stm32mp1_ddr.h
+++ b/drivers/ram/stm32mp1/stm32mp1_ddr.h
@@ -6,6 +6,7 @@
 #ifndef _RAM_STM32MP1_DDR_H
 #define _RAM_STM32MP1_DDR_H
 
+#include <stdbool.h>
 enum stm32mp1_ddr_interact_step {
 	STEP_DDR_RESET,
 	STEP_CTL_INIT,
diff --git a/drivers/ram/stm32mp1/stm32mp1_interactive.c b/drivers/ram/stm32mp1/stm32mp1_interactive.c
index 34c9af7214b9..d45071d3ed32 100644
--- a/drivers/ram/stm32mp1/stm32mp1_interactive.c
+++ b/drivers/ram/stm32mp1/stm32mp1_interactive.c
@@ -16,6 +16,7 @@
 #include <time.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "stm32mp1_ddr.h"
 #include "stm32mp1_tests.h"
diff --git a/drivers/ram/stm32mp1/stm32mp1_ram.c b/drivers/ram/stm32mp1/stm32mp1_ram.c
index 347ff769e405..8b49730e6331 100644
--- a/drivers/ram/stm32mp1/stm32mp1_ram.c
+++ b/drivers/ram/stm32mp1/stm32mp1_ram.c
@@ -14,6 +14,7 @@
 #include <syscon.h>
 #include <asm/io.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.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 02ee683303d8..00bdbe6762ab 100644
--- a/drivers/ram/stm32mp1/stm32mp1_tests.c
+++ b/drivers/ram/stm32mp1/stm32mp1_tests.c
@@ -12,6 +12,7 @@
 #include <watchdog.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <linux/kernel.h>
 #include <linux/log2.h>
 #include <linux/string.h>
 #include "stm32mp1_tests.h"
diff --git a/drivers/ram/stm32mp1/stm32mp1_tuning.c b/drivers/ram/stm32mp1/stm32mp1_tuning.c
index 822c890031ad..8da11d0629a9 100644
--- a/drivers/ram/stm32mp1/stm32mp1_tuning.c
+++ b/drivers/ram/stm32mp1/stm32mp1_tuning.c
@@ -15,6 +15,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/iopoll.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/remoteproc/rproc-elf-loader.c b/drivers/remoteproc/rproc-elf-loader.c
index d4064a311b52..bb82de08da70 100644
--- a/drivers/remoteproc/rproc-elf-loader.c
+++ b/drivers/remoteproc/rproc-elf-loader.c
@@ -12,6 +12,7 @@
 #include <dm/device_compat.h>
 #include <linux/compat.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/remoteproc/rproc-uclass.c b/drivers/remoteproc/rproc-uclass.c
index 950dc3f9b11c..e7513240ec5d 100644
--- a/drivers/remoteproc/rproc-uclass.c
+++ b/drivers/remoteproc/rproc-uclass.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <remoteproc.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm/device-internal.h>
diff --git a/drivers/remoteproc/ti_k3_dsp_rproc.c b/drivers/remoteproc/ti_k3_dsp_rproc.c
index 722b9432491a..a341ef84e8af 100644
--- a/drivers/remoteproc/ti_k3_dsp_rproc.c
+++ b/drivers/remoteproc/ti_k3_dsp_rproc.c
@@ -20,6 +20,7 @@
 #include <dm/device_compat.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <linux/soc/ti/ti_sci_protocol.h>
 #include <linux/string.h>
diff --git a/drivers/reset/ast2500-reset.c b/drivers/reset/ast2500-reset.c
index beb5cd8fa8c8..d1e687bc1352 100644
--- a/drivers/reset/ast2500-reset.c
+++ b/drivers/reset/ast2500-reset.c
@@ -9,6 +9,7 @@
 #include <misc.h>
 #include <reset.h>
 #include <reset-uclass.h>
+#include <stdbool.h>
 #include <wdt.h>
 #include <asm/io.h>
 #include <asm/arch/scu_ast2500.h>
diff --git a/drivers/reset/reset-hsdk.c b/drivers/reset/reset-hsdk.c
index 531e2cfb5fa4..c9cfa6bc7d36 100644
--- a/drivers/reset/reset-hsdk.c
+++ b/drivers/reset/reset-hsdk.c
@@ -14,6 +14,7 @@
 #include <linux/errno.h>
 #include <linux/iopoll.h>
 #include <reset-uclass.h>
+#include <linux/kernel.h>
 
 struct hsdk_rst {
 	void __iomem		*regs_ctl;
diff --git a/drivers/reset/reset-meson.c b/drivers/reset/reset-meson.c
index 8322a48a8aeb..ee53df94eca2 100644
--- a/drivers/reset/reset-meson.c
+++ b/drivers/reset/reset-meson.c
@@ -12,6 +12,7 @@
 #include <malloc.h>
 #include <reset-uclass.h>
 #include <regmap.h>
+#include <stdbool.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 
diff --git a/drivers/reset/reset-socfpga.c b/drivers/reset/reset-socfpga.c
index f01b1e53e981..370353e6cba0 100644
--- a/drivers/reset/reset-socfpga.c
+++ b/drivers/reset/reset-socfpga.c
@@ -16,6 +16,7 @@
 #include <dm.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <dm/lists.h>
diff --git a/drivers/reset/sandbox-reset.c b/drivers/reset/sandbox-reset.c
index a6936e81877e..142724856e65 100644
--- a/drivers/reset/sandbox-reset.c
+++ b/drivers/reset/sandbox-reset.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <reset-uclass.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <asm/reset.h>
 #include <linux/errno.h>
diff --git a/drivers/reset/sti-reset.c b/drivers/reset/sti-reset.c
index 75d972a5fa2f..d80e985711e8 100644
--- a/drivers/reset/sti-reset.c
+++ b/drivers/reset/sti-reset.c
@@ -17,6 +17,7 @@
 #include <dt-bindings/reset/stih407-resets.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/rng/rockchip_rng.c b/drivers/rng/rockchip_rng.c
index efc1980e4497..35f999c447d5 100644
--- a/drivers/rng/rockchip_rng.c
+++ b/drivers/rng/rockchip_rng.c
@@ -9,6 +9,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/iopoll.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <rng.h>
 
diff --git a/drivers/rtc/ds1374.c b/drivers/rtc/ds1374.c
index 5ca0e32b50c7..dc8e370a402c 100644
--- a/drivers/rtc/ds1374.c
+++ b/drivers/rtc/ds1374.c
@@ -17,6 +17,7 @@
 #include <command.h>
 #include <rtc.h>
 #include <i2c.h>
+#include <stdbool.h>
 #include <stdio.h>
 
 /*---------------------------------------------------------------------*/
diff --git a/drivers/rtc/i2c_rtc_emul.c b/drivers/rtc/i2c_rtc_emul.c
index a78dc78cfcc4..93b9ecc18db0 100644
--- a/drivers/rtc/i2c_rtc_emul.c
+++ b/drivers/rtc/i2c_rtc_emul.c
@@ -19,6 +19,7 @@
 #include <log.h>
 #include <os.h>
 #include <rtc.h>
+#include <stdbool.h>
 #include <asm/rtc.h>
 #include <asm/test.h>
 #include <linux/string.h>
diff --git a/drivers/rtc/rv3029.c b/drivers/rtc/rv3029.c
index ffed37ad5aa3..bda19d6853fa 100644
--- a/drivers/rtc/rv3029.c
+++ b/drivers/rtc/rv3029.c
@@ -20,6 +20,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #define RTC_RV3029_PAGE_LEN             7
 
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
index ad7ca9e8784a..0a68ef4a187f 100644
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -18,6 +18,7 @@
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #if !defined(CONFIG_DM_SCSI)
diff --git a/drivers/serial/altera_jtag_uart.c b/drivers/serial/altera_jtag_uart.c
index 6b20d3d487be..bd2b65b028f4 100644
--- a/drivers/serial/altera_jtag_uart.c
+++ b/drivers/serial/altera_jtag_uart.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <serial.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
diff --git a/drivers/serial/altera_uart.c b/drivers/serial/altera_uart.c
index ea9eb206a109..3d309885c2c2 100644
--- a/drivers/serial/altera_uart.c
+++ b/drivers/serial/altera_uart.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <serial.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
diff --git a/drivers/serial/arm_dcc.c b/drivers/serial/arm_dcc.c
index 270f61cc0741..a8faa58f2719 100644
--- a/drivers/serial/arm_dcc.c
+++ b/drivers/serial/arm_dcc.c
@@ -18,6 +18,7 @@
 #include <common.h>
 #include <dm.h>
 #include <serial.h>
+#include <stdbool.h>
 #include <linux/errno.h>
 
 #if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_V7A) || defined(CONFIG_CPU_V7R)
diff --git a/drivers/serial/atmel_usart.c b/drivers/serial/atmel_usart.c
index f6e14cc90216..84bf36f3be59 100644
--- a/drivers/serial/atmel_usart.c
+++ b/drivers/serial/atmel_usart.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <watchdog.h>
 #include <serial.h>
 #include <debug_uart.h>
diff --git a/drivers/serial/lpc32xx_hsuart.c b/drivers/serial/lpc32xx_hsuart.c
index 598ae08c668e..49ca3ff1320b 100644
--- a/drivers/serial/lpc32xx_hsuart.c
+++ b/drivers/serial/lpc32xx_hsuart.c
@@ -7,6 +7,7 @@
 #include <clock_legacy.h>
 #include <dm.h>
 #include <serial.h>
+#include <stdbool.h>
 #include <dm/platform_data/lpc32xx_hsuart.h>
 #include <linux/errno.h>
 
diff --git a/drivers/serial/ns16550.c b/drivers/serial/ns16550.c
index 603a8cb59774..b0b69cf96f75 100644
--- a/drivers/serial/ns16550.c
+++ b/drivers/serial/ns16550.c
@@ -17,6 +17,7 @@
 #include <asm/global_data.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/types.h>
 #include <asm/io.h>
 
diff --git a/drivers/serial/sandbox.c b/drivers/serial/sandbox.c
index aef4c75d3880..c811524e3579 100644
--- a/drivers/serial/sandbox.c
+++ b/drivers/serial/sandbox.c
@@ -21,6 +21,7 @@
 #include <linux/compiler.h>
 #include <asm/state.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/serial/serial-uclass.c b/drivers/serial/serial-uclass.c
index 9b679a5a6af2..2eae95fd62bf 100644
--- a/drivers/serial/serial-uclass.c
+++ b/drivers/serial/serial-uclass.c
@@ -20,6 +20,7 @@
 #include <dm/of_access.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/serial/serial.c b/drivers/serial/serial.c
index a6839f465dc5..0301288b5ef0 100644
--- a/drivers/serial/serial.c
+++ b/drivers/serial/serial.c
@@ -17,6 +17,7 @@
 #include <errno.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/serial/serial_ar933x.c b/drivers/serial/serial_ar933x.c
index a16d6a6eca61..fdcd62705ad5 100644
--- a/drivers/serial/serial_ar933x.c
+++ b/drivers/serial/serial_ar933x.c
@@ -15,6 +15,7 @@
 #include <dm/pinctrl.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <mach/ar71xx_regs.h>
 
 #define AR933X_UART_DATA_REG            0x00
diff --git a/drivers/serial/serial_arc.c b/drivers/serial/serial_arc.c
index c1be34960ecf..4205ffdd0dff 100644
--- a/drivers/serial/serial_arc.c
+++ b/drivers/serial/serial_arc.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <dm.h>
 #include <serial.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/serial/serial_bcm283x_mu.c b/drivers/serial/serial_bcm283x_mu.c
index d9ebb273ddc5..6e54e4ca72f0 100644
--- a/drivers/serial/serial_bcm283x_mu.c
+++ b/drivers/serial/serial_bcm283x_mu.c
@@ -17,6 +17,7 @@
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
+#include <stdbool.h>
 #include <watchdog.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
diff --git a/drivers/serial/serial_bcm283x_pl011.c b/drivers/serial/serial_bcm283x_pl011.c
index efb6eb60b356..f2a35e4b4d06 100644
--- a/drivers/serial/serial_bcm283x_pl011.c
+++ b/drivers/serial/serial_bcm283x_pl011.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <stdbool.h>
 #include <asm/gpio.h>
 #include <dm/pinctrl.h>
 #include <dm/platform_data/serial_pl01x.h>
diff --git a/drivers/serial/serial_bcm6345.c b/drivers/serial/serial_bcm6345.c
index 309cbf63af9f..a90bfc7f5ed7 100644
--- a/drivers/serial/serial_bcm6345.c
+++ b/drivers/serial/serial_bcm6345.c
@@ -12,6 +12,7 @@
 #include <errno.h>
 #include <malloc.h>
 #include <serial.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <asm/types.h>
 #include <linux/errno.h>
diff --git a/drivers/serial/serial_cortina.c b/drivers/serial/serial_cortina.c
index c0beba19f58a..001fca79f980 100644
--- a/drivers/serial/serial_cortina.c
+++ b/drivers/serial/serial_cortina.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
+#include <stdbool.h>
 #include <watchdog.h>
 #include <asm/io.h>
 #include <serial.h>
diff --git a/drivers/serial/serial_efi.c b/drivers/serial/serial_efi.c
index df3a09010243..4739c5a20e8d 100644
--- a/drivers/serial/serial_efi.c
+++ b/drivers/serial/serial_efi.c
@@ -12,6 +12,7 @@
 #include <errno.h>
 #include <fdtdec.h>
 #include <log.h>
+#include <stdbool.h>
 #include <linux/compiler.h>
 #include <asm/io.h>
 #include <serial.h>
diff --git a/drivers/serial/serial_linflexuart.c b/drivers/serial/serial_linflexuart.c
index d9be526ffe2e..b9b947a930af 100644
--- a/drivers/serial/serial_linflexuart.c
+++ b/drivers/serial/serial_linflexuart.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
+#include <stdbool.h>
 #include <watchdog.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/serial/serial_lpuart.c b/drivers/serial/serial_lpuart.c
index 1017981f97c2..45ae154b6330 100644
--- a/drivers/serial/serial_lpuart.c
+++ b/drivers/serial/serial_lpuart.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <fsl_lpuart.h>
 #include <log.h>
+#include <stdbool.h>
 #include <watchdog.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/serial/serial_mcf.c b/drivers/serial/serial_mcf.c
index 2d2f07e369b7..f1670a0eddd7 100644
--- a/drivers/serial/serial_mcf.c
+++ b/drivers/serial/serial_mcf.c
@@ -17,6 +17,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 #include <dm/platform_data/serial_coldfire.h>
 #include <serial.h>
diff --git a/drivers/serial/serial_meson.c b/drivers/serial/serial_meson.c
index 80141642af84..63875c626cdd 100644
--- a/drivers/serial/serial_meson.c
+++ b/drivers/serial/serial_meson.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <fdtdec.h>
+#include <stdbool.h>
 #include <linux/bitops.h>
 #include <linux/compiler.h>
 #include <serial.h>
diff --git a/drivers/serial/serial_mpc8xx.c b/drivers/serial/serial_mpc8xx.c
index 7f0d130963d5..7e64e415fb6d 100644
--- a/drivers/serial/serial_mpc8xx.c
+++ b/drivers/serial/serial_mpc8xx.c
@@ -8,6 +8,7 @@
 #include <command.h>
 #include <dm.h>
 #include <serial.h>
+#include <stdbool.h>
 #include <watchdog.h>
 #include <asm/cpm_8xx.h>
 #include <asm/global_data.h>
diff --git a/drivers/serial/serial_msm.c b/drivers/serial/serial_msm.c
index 0809f1ff8a9f..a86563e8d8fc 100644
--- a/drivers/serial/serial_msm.c
+++ b/drivers/serial/serial_msm.c
@@ -14,6 +14,7 @@
 #include <errno.h>
 #include <malloc.h>
 #include <serial.h>
+#include <stdbool.h>
 #include <watchdog.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/serial/serial_mtk.c b/drivers/serial/serial_mtk.c
index 74b5cc880c19..c028d760f2f1 100644
--- a/drivers/serial/serial_mtk.c
+++ b/drivers/serial/serial_mtk.c
@@ -19,6 +19,7 @@
 #include <asm/types.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 
 struct mtk_serial_regs {
diff --git a/drivers/serial/serial_mvebu_a3700.c b/drivers/serial/serial_mvebu_a3700.c
index 7e4cd6c4b49b..a5674e6b13bc 100644
--- a/drivers/serial/serial_mvebu_a3700.c
+++ b/drivers/serial/serial_mvebu_a3700.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <dm.h>
 #include <serial.h>
+#include <stdbool.h>
 #include <asm/io.h>
 
 struct mvebu_platdata {
diff --git a/drivers/serial/serial_mxc.c b/drivers/serial/serial_mxc.c
index 1c08f3ec7957..d13dbeb3cef5 100644
--- a/drivers/serial/serial_mxc.c
+++ b/drivers/serial/serial_mxc.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
+#include <stdbool.h>
 #include <watchdog.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/clock.h>
diff --git a/drivers/serial/serial_nulldev.c b/drivers/serial/serial_nulldev.c
index c92ae698088a..f7ce9f5b5114 100644
--- a/drivers/serial/serial_nulldev.c
+++ b/drivers/serial/serial_nulldev.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <dm.h>
 #include <serial.h>
+#include <stdbool.h>
 #include <linux/errno.h>
 
 static int nulldev_serial_setbrg(struct udevice *dev, int baudrate)
diff --git a/drivers/serial/serial_owl.c b/drivers/serial/serial_owl.c
index d721e24e4bfe..4ac5d78753bc 100644
--- a/drivers/serial/serial_owl.c
+++ b/drivers/serial/serial_owl.c
@@ -12,6 +12,7 @@
 #include <errno.h>
 #include <fdtdec.h>
 #include <serial.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <asm/types.h>
 #include <linux/bitops.h>
diff --git a/drivers/serial/serial_pic32.c b/drivers/serial/serial_pic32.c
index 8e420fb764bc..f1473d6cffab 100644
--- a/drivers/serial/serial_pic32.c
+++ b/drivers/serial/serial_pic32.c
@@ -12,6 +12,7 @@
 #include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <mach/pic32.h>
 #include <dt-bindings/clock/microchip,clock.h>
 
diff --git a/drivers/serial/serial_pl01x.c b/drivers/serial/serial_pl01x.c
index a472e8ca5de9..1f4e54628fa2 100644
--- a/drivers/serial/serial_pl01x.c
+++ b/drivers/serial/serial_pl01x.c
@@ -11,6 +11,7 @@
 /* Simple U-Boot driver for the PrimeCell PL010/PL011 UARTs */
 
 #include <common.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
 /* For get_bus_freq() */
diff --git a/drivers/serial/serial_pl01x_internal.h b/drivers/serial/serial_pl01x_internal.h
index c5c706b153e0..a2d696e6c274 100644
--- a/drivers/serial/serial_pl01x_internal.h
+++ b/drivers/serial/serial_pl01x_internal.h
@@ -18,6 +18,7 @@
  * We can use a combined structure for PL010 and PL011, because they overlap
  * only in common registers.
  */
+#include <stdbool.h>
 struct pl01x_regs {
 	u32	dr;		/* 0x00 Data register */
 	u32	ecr;		/* 0x04 Error clear register (Write) */
diff --git a/drivers/serial/serial_pxa.c b/drivers/serial/serial_pxa.c
index e20f0c87540a..459ce7817127 100644
--- a/drivers/serial/serial_pxa.c
+++ b/drivers/serial/serial_pxa.c
@@ -21,6 +21,7 @@
 
 #include <common.h>
 #include <hang.h>
+#include <stdbool.h>
 #include <vsprintf.h>
 #include <asm/arch/pxa-regs.h>
 #include <asm/arch/regs-uart.h>
diff --git a/drivers/serial/serial_s5p.c b/drivers/serial/serial_s5p.c
index 1a939628a5aa..0e8006334522 100644
--- a/drivers/serial/serial_s5p.c
+++ b/drivers/serial/serial_s5p.c
@@ -11,6 +11,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <fdtdec.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 #include <linux/compiler.h>
 #include <asm/io.h>
diff --git a/drivers/serial/serial_sh.c b/drivers/serial/serial_sh.c
index e596c042ca6b..e87f1d0ecfe0 100644
--- a/drivers/serial/serial_sh.c
+++ b/drivers/serial/serial_sh.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <clk.h>
 #include <dm.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/processor.h>
diff --git a/drivers/serial/serial_sti_asc.c b/drivers/serial/serial_sti_asc.c
index 0cb53d7ae3f1..d3d1b74478a6 100644
--- a/drivers/serial/serial_sti_asc.c
+++ b/drivers/serial/serial_sti_asc.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <log.h>
 #include <serial.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
diff --git a/drivers/serial/serial_stm32.c b/drivers/serial/serial_stm32.c
index 5cd4c815cfd9..c5d8d3f3dde3 100644
--- a/drivers/serial/serial_stm32.c
+++ b/drivers/serial/serial_stm32.c
@@ -16,6 +16,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include "serial_stm32.h"
 #include <dm/device_compat.h>
 
diff --git a/drivers/serial/serial_stm32.h b/drivers/serial/serial_stm32.h
index 57376518880a..0c541ead06e1 100644
--- a/drivers/serial/serial_stm32.h
+++ b/drivers/serial/serial_stm32.h
@@ -7,6 +7,7 @@
 #ifndef _SERIAL_STM32_
 #define _SERIAL_STM32_
 
+#include <stdbool.h>
 #include <linux/bitops.h>
 #define CR1_OFFSET(x)	(x ? 0x0c : 0x00)
 #define CR3_OFFSET(x)	(x ? 0x14 : 0x08)
diff --git a/drivers/serial/serial_uniphier.c b/drivers/serial/serial_uniphier.c
index a098028ca001..10becca74537 100644
--- a/drivers/serial/serial_uniphier.c
+++ b/drivers/serial/serial_uniphier.c
@@ -11,6 +11,7 @@
 #include <linux/bitops.h>
 #include <linux/bug.h>
 #include <linux/io.h>
+#include <linux/kernel.h>
 #include <linux/serial_reg.h>
 #include <linux/sizes.h>
 #include <linux/errno.h>
diff --git a/drivers/serial/serial_xuartlite.c b/drivers/serial/serial_xuartlite.c
index fd9e227557f2..f91be0c220a3 100644
--- a/drivers/serial/serial_xuartlite.c
+++ b/drivers/serial/serial_xuartlite.c
@@ -10,6 +10,7 @@
 #include <config.h>
 #include <common.h>
 #include <dm.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/compiler.h>
diff --git a/drivers/serial/usbtty.c b/drivers/serial/usbtty.c
index f0b64809560e..4e2e09edd3fc 100644
--- a/drivers/serial/usbtty.c
+++ b/drivers/serial/usbtty.c
@@ -14,6 +14,7 @@
 #include <serial.h>
 #include <stdio_dev.h>
 #include <asm/unaligned.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "usbtty.h"
 #include "usb_cdc_acm.h"
diff --git a/drivers/smem/msm_smem.c b/drivers/smem/msm_smem.c
index ba9d108173cd..3a5ee3bbce04 100644
--- a/drivers/smem/msm_smem.c
+++ b/drivers/smem/msm_smem.c
@@ -20,6 +20,7 @@
 #include <linux/ioport.h>
 #include <linux/io.h>
 #include <smem.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/soc/soc-uclass.c b/drivers/soc/soc-uclass.c
index 29d586e0bcdd..417a682e6499 100644
--- a/drivers/soc/soc-uclass.c
+++ b/drivers/soc/soc-uclass.c
@@ -8,6 +8,7 @@
 #include <soc.h>
 #include <dm.h>
 #include <errno.h>
+#include <stdbool.h>
 #include <dm/lists.h>
 #include <dm/root.h>
 #include <linux/errno.h>
diff --git a/drivers/soc/ti/k3-navss-ringacc.c b/drivers/soc/ti/k3-navss-ringacc.c
index 21c4b3fe1945..c9a8b1ed0199 100644
--- a/drivers/soc/ti/k3-navss-ringacc.c
+++ b/drivers/soc/ti/k3-navss-ringacc.c
@@ -22,6 +22,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/soc/ti/k3-navss-ringacc.h>
 #include <linux/soc/ti/ti_sci_protocol.h>
diff --git a/drivers/soc/ti/keystone_serdes.c b/drivers/soc/ti/keystone_serdes.c
index c121fec52d43..68fa28a6f803 100644
--- a/drivers/soc/ti/keystone_serdes.c
+++ b/drivers/soc/ti/keystone_serdes.c
@@ -12,6 +12,7 @@
 #include <asm/ti-common/keystone_serdes.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #define SERDES_CMU_REGS(x)		(0x0000 + (0x0c00 * (x)))
 #define SERDES_LANE_REGS(x)		(0x0200 + (0x200 * (x)))
diff --git a/drivers/sound/da7219.c b/drivers/sound/da7219.c
index 41aa338b55f5..e9d56b1f869c 100644
--- a/drivers/sound/da7219.c
+++ b/drivers/sound/da7219.c
@@ -21,6 +21,7 @@
 #include <dt-bindings/sound/nhlt.h>
 #include <dm/acpi.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #define DA7219_ACPI_HID		"DLGS7219"
 
diff --git a/drivers/sound/max98088.c b/drivers/sound/max98088.c
index 6c2caf3f77fd..d1d560ae6da2 100644
--- a/drivers/sound/max98088.c
+++ b/drivers/sound/max98088.c
@@ -18,6 +18,7 @@
 #include <sound.h>
 #include <asm/gpio.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include "maxim_codec.h"
 #include "max98088.h"
 
diff --git a/drivers/sound/max98095.c b/drivers/sound/max98095.c
index db52ccdea3b2..18632511499c 100644
--- a/drivers/sound/max98095.c
+++ b/drivers/sound/max98095.c
@@ -17,6 +17,7 @@
 #include <sound.h>
 #include <asm/gpio.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include "i2s.h"
 #include "max98095.h"
 
diff --git a/drivers/sound/max98357a.c b/drivers/sound/max98357a.c
index 8fbcf80abcba..318dfe76e39f 100644
--- a/drivers/sound/max98357a.c
+++ b/drivers/sound/max98357a.c
@@ -21,6 +21,7 @@
 #include <dt-bindings/sound/nhlt.h>
 #include <dm/acpi.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 struct max98357a_priv {
 	struct gpio_desc sdmode_gpio;
diff --git a/drivers/sound/rockchip_i2s.c b/drivers/sound/rockchip_i2s.c
index a20c8e78b88b..37fb5a5d3405 100644
--- a/drivers/sound/rockchip_i2s.c
+++ b/drivers/sound/rockchip_i2s.c
@@ -15,6 +15,7 @@
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 struct rk_i2s_regs {
 	u32 txcr;		/* I2S_TXCR, 0x00 */
diff --git a/drivers/sound/rt5677.c b/drivers/sound/rt5677.c
index bfe78ff6b4f6..3eb99f31a4a9 100644
--- a/drivers/sound/rt5677.c
+++ b/drivers/sound/rt5677.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include "rt5677.h"
 #include <log.h>
 
diff --git a/drivers/sound/sandbox.c b/drivers/sound/sandbox.c
index 1c30f06350f6..b1c1fca004f2 100644
--- a/drivers/sound/sandbox.c
+++ b/drivers/sound/sandbox.c
@@ -11,6 +11,7 @@
 #include <i2s.h>
 #include <log.h>
 #include <sound.h>
+#include <stdbool.h>
 #include <asm/sdl.h>
 #include <linux/errno.h>
 
diff --git a/drivers/sound/tegra_ahub.c b/drivers/sound/tegra_ahub.c
index cb27be0a7cb3..345d9746f256 100644
--- a/drivers/sound/tegra_ahub.c
+++ b/drivers/sound/tegra_ahub.c
@@ -12,6 +12,7 @@
 #include <i2s.h>
 #include <log.h>
 #include <misc.h>
+#include <stdbool.h>
 #include <time.h>
 #include <asm/io.h>
 #include <asm/arch-tegra/tegra_ahub.h>
diff --git a/drivers/sound/wm8994.c b/drivers/sound/wm8994.c
index c37c787549d5..e8ec0517d158 100644
--- a/drivers/sound/wm8994.c
+++ b/drivers/sound/wm8994.c
@@ -18,6 +18,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/sound.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include "wm8994.h"
 #include "wm8994_registers.h"
 
diff --git a/drivers/spi/atcspi200_spi.c b/drivers/spi/atcspi200_spi.c
index aed5f64eabba..ab60a47945d6 100644
--- a/drivers/spi/atcspi200_spi.c
+++ b/drivers/spi/atcspi200_spi.c
@@ -16,6 +16,7 @@
 #include <asm/io.h>
 #include <dm.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/spi/atmel-quadspi.c b/drivers/spi/atmel-quadspi.c
index f270eea61e84..c69d7154cb5a 100644
--- a/drivers/spi/atmel-quadspi.c
+++ b/drivers/spi/atmel-quadspi.c
@@ -24,6 +24,7 @@
 #include <linux/io.h>
 #include <linux/iopoll.h>
 #include <linux/ioport.h>
+#include <linux/kernel.h>
 #include <mach/clk.h>
 #include <spi.h>
 #include <spi-mem.h>
diff --git a/drivers/spi/atmel_spi.c b/drivers/spi/atmel_spi.c
index 1a95cfb9f65b..5e4ae989c183 100644
--- a/drivers/spi/atmel_spi.c
+++ b/drivers/spi/atmel_spi.c
@@ -18,6 +18,7 @@
 #endif
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 
 /*
diff --git a/drivers/spi/bcm63xx_hsspi.c b/drivers/spi/bcm63xx_hsspi.c
index f45214fbda4a..6e2c476d2814 100644
--- a/drivers/spi/bcm63xx_hsspi.c
+++ b/drivers/spi/bcm63xx_hsspi.c
@@ -19,6 +19,7 @@
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #define HSSPI_PP			0
 
diff --git a/drivers/spi/bcmstb_spi.c b/drivers/spi/bcmstb_spi.c
index 539abcfd953f..27ed0203addb 100644
--- a/drivers/spi/bcmstb_spi.c
+++ b/drivers/spi/bcmstb_spi.c
@@ -5,6 +5,7 @@
  * Author: Thomas Fitzsimmons <fitzsim@fitzsim.org>
  */
 
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/spi/cadence_qspi.h b/drivers/spi/cadence_qspi.h
index ae459c74a192..0ecd461b79a1 100644
--- a/drivers/spi/cadence_qspi.h
+++ b/drivers/spi/cadence_qspi.h
@@ -8,6 +8,7 @@
 #define __CADENCE_QSPI_H__
 
 #include <reset.h>
+#include <stdbool.h>
 
 #define CQSPI_IS_ADDR(cmd_len)		(cmd_len > 1 ? 1 : 0)
 
diff --git a/drivers/spi/cadence_qspi_apb.c b/drivers/spi/cadence_qspi_apb.c
index d97b299a93c8..dc066f17e3d0 100644
--- a/drivers/spi/cadence_qspi_apb.c
+++ b/drivers/spi/cadence_qspi_apb.c
@@ -38,6 +38,7 @@
 #include <spi.h>
 #include <spi-mem.h>
 #include <malloc.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "cadence_qspi.h"
 
diff --git a/drivers/spi/davinci_spi.c b/drivers/spi/davinci_spi.c
index 7058ba9acf52..4ea77a150513 100644
--- a/drivers/spi/davinci_spi.c
+++ b/drivers/spi/davinci_spi.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <spi.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/spi/designware_spi.c b/drivers/spi/designware_spi.c
index f6c63435147e..a960c61f350e 100644
--- a/drivers/spi/designware_spi.c
+++ b/drivers/spi/designware_spi.c
@@ -26,6 +26,7 @@
 #include <linux/errno.h>
 #include <linux/iopoll.h>
 #include <asm/io.h>
+#include <linux/kernel.h>
 
 /* Register offsets */
 #define DW_SPI_CTRL0			0x00
diff --git a/drivers/spi/exynos_spi.c b/drivers/spi/exynos_spi.c
index cec59208395d..400269fa39d5 100644
--- a/drivers/spi/exynos_spi.c
+++ b/drivers/spi/exynos_spi.c
@@ -22,6 +22,7 @@
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/spi/fsl_dspi.c b/drivers/spi/fsl_dspi.c
index 190b60b3c4f0..b5f7d3e08a70 100644
--- a/drivers/spi/fsl_dspi.c
+++ b/drivers/spi/fsl_dspi.c
@@ -11,6 +11,7 @@
 
 #include <asm/global_data.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/math64.h>
 #include <common.h>
 #include <dm.h>
diff --git a/drivers/spi/fsl_espi.c b/drivers/spi/fsl_espi.c
index 2e85c25907d5..9eae577656ce 100644
--- a/drivers/spi/fsl_espi.c
+++ b/drivers/spi/fsl_espi.c
@@ -14,6 +14,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include <malloc.h>
diff --git a/drivers/spi/fsl_qspi.c b/drivers/spi/fsl_qspi.c
index 195808c4066f..314d3f894844 100644
--- a/drivers/spi/fsl_qspi.c
+++ b/drivers/spi/fsl_qspi.c
@@ -30,6 +30,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <linux/sizes.h>
 #include <linux/iopoll.h>
diff --git a/drivers/spi/ich.c b/drivers/spi/ich.c
index 51d283c5e6fa..bf6cd061b533 100644
--- a/drivers/spi/ich.c
+++ b/drivers/spi/ich.c
@@ -30,6 +30,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <linux/string.h>
 
diff --git a/drivers/spi/kirkwood_spi.c b/drivers/spi/kirkwood_spi.c
index 3659e5e8adec..a127135323d4 100644
--- a/drivers/spi/kirkwood_spi.c
+++ b/drivers/spi/kirkwood_spi.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <spi.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/soc.h>
diff --git a/drivers/spi/meson_spifc.c b/drivers/spi/meson_spifc.c
index 08b3859678fd..f61bcd5e2de9 100644
--- a/drivers/spi/meson_spifc.c
+++ b/drivers/spi/meson_spifc.c
@@ -18,6 +18,7 @@
 #include <linux/bitfield.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 /* register map */
diff --git a/drivers/spi/mpc8xxx_spi.c b/drivers/spi/mpc8xxx_spi.c
index eedb29216cb6..f5ceeaac97d0 100644
--- a/drivers/spi/mpc8xxx_spi.c
+++ b/drivers/spi/mpc8xxx_spi.c
@@ -19,6 +19,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 enum {
 	SPI_EV_NE = BIT(31 - 22),	/* Receiver Not Empty */
diff --git a/drivers/spi/mscc_bb_spi.c b/drivers/spi/mscc_bb_spi.c
index e77447b65564..a3bbdf848cda 100644
--- a/drivers/spi/mscc_bb_spi.c
+++ b/drivers/spi/mscc_bb_spi.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <spi.h>
+#include <stdbool.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
diff --git a/drivers/spi/mt7621_spi.c b/drivers/spi/mt7621_spi.c
index 581a9bd44c4a..f4b5ad892455 100644
--- a/drivers/spi/mt7621_spi.c
+++ b/drivers/spi/mt7621_spi.c
@@ -18,6 +18,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/io.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 
 #define MT7621_RX_FIFO_LEN	32
diff --git a/drivers/spi/mvebu_a3700_spi.c b/drivers/spi/mvebu_a3700_spi.c
index 502f5153cc43..f3e28d0ed694 100644
--- a/drivers/spi/mvebu_a3700_spi.c
+++ b/drivers/spi/mvebu_a3700_spi.c
@@ -16,6 +16,7 @@
 #include <asm/io.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/spi/mxc_spi.c b/drivers/spi/mxc_spi.c
index 00e3b5962279..db1673fa57df 100644
--- a/drivers/spi/mxc_spi.c
+++ b/drivers/spi/mxc_spi.c
@@ -20,6 +20,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/clock.h>
 #include <asm/mach-imx/spi.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/spi/mxs_spi.c b/drivers/spi/mxs_spi.c
index 8c541dc03e69..abc7f014d7d5 100644
--- a/drivers/spi/mxs_spi.c
+++ b/drivers/spi/mxs_spi.c
@@ -30,6 +30,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/mach-imx/dma.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #define	MXS_SPI_MAX_TIMEOUT	1000000
diff --git a/drivers/spi/pic32_spi.c b/drivers/spi/pic32_spi.c
index 222c30a1ebdd..e1fc52578399 100644
--- a/drivers/spi/pic32_spi.c
+++ b/drivers/spi/pic32_spi.c
@@ -18,6 +18,7 @@
 #include <malloc.h>
 #include <spi.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #include <asm/types.h>
 #include <asm/io.h>
diff --git a/drivers/spi/pl022_spi.c b/drivers/spi/pl022_spi.c
index 236de5b54a3f..5618ab21638e 100644
--- a/drivers/spi/pl022_spi.c
+++ b/drivers/spi/pl022_spi.c
@@ -17,6 +17,7 @@
 #include <linux/errno.h>
 #include <linux/io.h>
 #include <spi.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 
 #define SSP_CR0		0x000
diff --git a/drivers/spi/renesas_rpc_spi.c b/drivers/spi/renesas_rpc_spi.c
index 9090667bf0fb..95fcb5723f2d 100644
--- a/drivers/spi/renesas_rpc_spi.c
+++ b/drivers/spi/renesas_rpc_spi.c
@@ -19,6 +19,7 @@
 #include <linux/errno.h>
 #include <spi.h>
 #include <wait_bit.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #define RPC_CMNCR		0x0000	/* R/W */
diff --git a/drivers/spi/rk_spi.c b/drivers/spi/rk_spi.c
index c5363c24190d..ec998eda0829 100644
--- a/drivers/spi/rk_spi.c
+++ b/drivers/spi/rk_spi.c
@@ -24,6 +24,7 @@
 #include <asm/arch-rockchip/clock.h>
 #include <asm/arch-rockchip/periph.h>
 #include <dm/pinctrl.h>
+#include <linux/kernel.h>
 #include "rk_spi.h"
 
 /* Change to 1 to output registers at the start of each transaction */
diff --git a/drivers/spi/sh_qspi.c b/drivers/spi/sh_qspi.c
index 49f3fdb6928c..bf3a7bf919ce 100644
--- a/drivers/spi/sh_qspi.c
+++ b/drivers/spi/sh_qspi.c
@@ -15,6 +15,7 @@
 #include <asm/arch/rmobile.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 
 /* SH QSPI register bit masks <REG>_<BIT> */
 #define SPCR_MSTR	0x08
diff --git a/drivers/spi/spi-mem-nodm.c b/drivers/spi/spi-mem-nodm.c
index 42a6126dd7bc..6cc908dcdf87 100644
--- a/drivers/spi/spi-mem-nodm.c
+++ b/drivers/spi/spi-mem-nodm.c
@@ -8,6 +8,7 @@
 #include <spi.h>
 #include <spi-mem.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 int spi_mem_exec_op(struct spi_slave *slave,
diff --git a/drivers/spi/spi-mem.c b/drivers/spi/spi-mem.c
index 01e9b6928cfc..da759b6907cf 100644
--- a/drivers/spi/spi-mem.c
+++ b/drivers/spi/spi-mem.c
@@ -21,6 +21,7 @@
 #include <spi.h>
 #include <spi-mem.h>
 #include <dm/device_compat.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #endif
 
diff --git a/drivers/spi/spi-sifive.c b/drivers/spi/spi-sifive.c
index 3c0300d68d6d..708bf8989a8a 100644
--- a/drivers/spi/spi-sifive.c
+++ b/drivers/spi/spi-sifive.c
@@ -17,6 +17,7 @@
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/log2.h>
 #include <clk.h>
 #include <linux/string.h>
diff --git a/drivers/spi/spi-sunxi.c b/drivers/spi/spi-sunxi.c
index c19a24a1c64c..80c406d7b368 100644
--- a/drivers/spi/spi-sunxi.c
+++ b/drivers/spi/spi-sunxi.c
@@ -32,6 +32,7 @@
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #include <asm/bitops.h>
 #include <asm/gpio.h>
diff --git a/drivers/spi/spi-uclass.c b/drivers/spi/spi-uclass.c
index c59ae3ff9b30..6d397f2ebd2d 100644
--- a/drivers/spi/spi-uclass.c
+++ b/drivers/spi/spi-uclass.c
@@ -16,6 +16,7 @@
 #include <dm/lists.h>
 #include <dm/util.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/spi/stm32_qspi.c b/drivers/spi/stm32_qspi.c
index 704a66d0c77f..882bc1bdfc54 100644
--- a/drivers/spi/stm32_qspi.c
+++ b/drivers/spi/stm32_qspi.c
@@ -20,6 +20,7 @@
 #include <linux/errno.h>
 #include <linux/iopoll.h>
 #include <linux/ioport.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/sizes.h>
 
diff --git a/drivers/spi/stm32_spi.c b/drivers/spi/stm32_spi.c
index d37404f0c8cc..635ead98dbda 100644
--- a/drivers/spi/stm32_spi.c
+++ b/drivers/spi/stm32_spi.c
@@ -16,6 +16,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 
 #include <asm/io.h>
diff --git a/drivers/spi/uniphier_spi.c b/drivers/spi/uniphier_spi.c
index 742554a09ab4..22cf974a905d 100644
--- a/drivers/spi/uniphier_spi.c
+++ b/drivers/spi/uniphier_spi.c
@@ -18,6 +18,7 @@
 #include <linux/io.h>
 #include <spi.h>
 #include <wait_bit.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/spi/zynqmp_gqspi.c b/drivers/spi/zynqmp_gqspi.c
index 1386dc86ed62..de988f4e9754 100644
--- a/drivers/spi/zynqmp_gqspi.c
+++ b/drivers/spi/zynqmp_gqspi.c
@@ -24,6 +24,7 @@
 #include <linux/bitops.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #define GQSPI_GFIFO_STRT_MODE_MASK	BIT(29)
diff --git a/drivers/spmi/spmi-msm.c b/drivers/spmi/spmi-msm.c
index d06fc34c6973..9212449a7ee8 100644
--- a/drivers/spmi/spmi-msm.c
+++ b/drivers/spmi/spmi-msm.c
@@ -11,6 +11,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <fdtdec.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/spmi/spmi-sandbox.c b/drivers/spmi/spmi-sandbox.c
index f1e0d6915030..e2f6fc17e717 100644
--- a/drivers/spmi/spmi-sandbox.c
+++ b/drivers/spmi/spmi-sandbox.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
+#include <stdbool.h>
 #include <linux/errno.h>
 #include <spmi/spmi.h>
 #include <asm/gpio.h>
diff --git a/drivers/sysreset/sysreset_mpc83xx.c b/drivers/sysreset/sysreset_mpc83xx.c
index 603dbbaea4ac..c358a3b490c5 100644
--- a/drivers/sysreset/sysreset_mpc83xx.c
+++ b/drivers/sysreset/sysreset_mpc83xx.c
@@ -16,6 +16,7 @@
 #include <asm/ppc.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #include "sysreset_mpc83xx.h"
 
diff --git a/drivers/tee/broadcom/chimp_optee.c b/drivers/tee/broadcom/chimp_optee.c
index a92fd9c95627..545bb3fe2227 100644
--- a/drivers/tee/broadcom/chimp_optee.c
+++ b/drivers/tee/broadcom/chimp_optee.c
@@ -8,6 +8,7 @@
 #include <tee.h>
 #include <broadcom/chimp.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #ifdef CONFIG_CHIMP_OPTEE
 
diff --git a/drivers/tee/optee/core.c b/drivers/tee/optee/core.c
index c1460999cbec..fb656bed92f3 100644
--- a/drivers/tee/optee/core.c
+++ b/drivers/tee/optee/core.c
@@ -12,6 +12,7 @@
 #include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/io.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include "optee_smc.h"
diff --git a/drivers/tee/optee/optee_smc.h b/drivers/tee/optee/optee_smc.h
index 4d643b2599d6..ba8a43d5c091 100644
--- a/drivers/tee/optee/optee_smc.h
+++ b/drivers/tee/optee/optee_smc.h
@@ -6,6 +6,7 @@
 #ifndef OPTEE_SMC_H
 #define OPTEE_SMC_H
 
+#include <stdbool.h>
 #include <linux/arm-smccc.h>
 #include <linux/bitops.h>
 
diff --git a/drivers/tee/optee/rpmb.c b/drivers/tee/optee/rpmb.c
index 0804fc963cf5..a9ea53854fca 100644
--- a/drivers/tee/optee/rpmb.c
+++ b/drivers/tee/optee/rpmb.c
@@ -9,6 +9,7 @@
 #include <tee.h>
 #include <mmc.h>
 #include <dm/device_compat.h>
+#include <linux/kernel.h>
 
 #include "optee_msg.h"
 #include "optee_private.h"
diff --git a/drivers/tee/sandbox.c b/drivers/tee/sandbox.c
index 14df3ce01304..3a5d106f9567 100644
--- a/drivers/tee/sandbox.c
+++ b/drivers/tee/sandbox.c
@@ -8,6 +8,7 @@
 #include <stdio.h>
 #include <tee.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <tee/optee_ta_avb.h>
 
diff --git a/drivers/tee/tee-uclass.c b/drivers/tee/tee-uclass.c
index f42cc1becb83..1dc806db89be 100644
--- a/drivers/tee/tee-uclass.c
+++ b/drivers/tee/tee-uclass.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <tee.h>
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
diff --git a/drivers/thermal/imx_scu_thermal.c b/drivers/thermal/imx_scu_thermal.c
index 17c92ae0635e..6b822f18854c 100644
--- a/drivers/thermal/imx_scu_thermal.c
+++ b/drivers/thermal/imx_scu_thermal.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <thermal.h>
 #include <asm/global_data.h>
diff --git a/drivers/thermal/imx_tmu.c b/drivers/thermal/imx_tmu.c
index 279ea5a322ea..8a67d9aa58cc 100644
--- a/drivers/thermal/imx_tmu.c
+++ b/drivers/thermal/imx_tmu.c
@@ -6,6 +6,7 @@
 
 #include <config.h>
 #include <common.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/timer/sandbox_timer.c b/drivers/timer/sandbox_timer.c
index 2120b02d4444..fd0472485304 100644
--- a/drivers/timer/sandbox_timer.c
+++ b/drivers/timer/sandbox_timer.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <errno.h>
 #include <time.h>
diff --git a/drivers/timer/timer-uclass.c b/drivers/timer/timer-uclass.c
index 01b3a42f3e07..7dea5b326371 100644
--- a/drivers/timer/timer-uclass.c
+++ b/drivers/timer/timer-uclass.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <init.h>
 #include <asm/global_data.h>
diff --git a/drivers/timer/tsc_timer.c b/drivers/timer/tsc_timer.c
index f211f9fe142f..2ebd6032b91a 100644
--- a/drivers/timer/tsc_timer.c
+++ b/drivers/timer/tsc_timer.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <bootstage.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
 #include <malloc.h>
@@ -22,6 +23,7 @@
 #include <asm/msr.h>
 #include <asm/u-boot-x86.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 
 #define MAX_NUM_FREQS	9
 
diff --git a/drivers/tpm/cr50_i2c.c b/drivers/tpm/cr50_i2c.c
index 9ba0466f9298..6fbde9f2553e 100644
--- a/drivers/tpm/cr50_i2c.c
+++ b/drivers/tpm/cr50_i2c.c
@@ -23,6 +23,7 @@
 #include <asm/arch/pm.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 enum {
diff --git a/drivers/tpm/tpm2_tis_sandbox.c b/drivers/tpm/tpm2_tis_sandbox.c
index 6b61dbb88b55..f9d1205d3216 100644
--- a/drivers/tpm/tpm2_tis_sandbox.c
+++ b/drivers/tpm/tpm2_tis_sandbox.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <tpm-v2.h>
 #include <vsprintf.h>
diff --git a/drivers/tpm/tpm2_tis_spi.c b/drivers/tpm/tpm2_tis_spi.c
index 6303187180f1..48b59f8c36f9 100644
--- a/drivers/tpm/tpm2_tis_spi.c
+++ b/drivers/tpm/tpm2_tis_spi.c
@@ -26,6 +26,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/compiler.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/types.h>
 #include <linux/unaligned/be_byteshift.h>
diff --git a/drivers/tpm/tpm_tis_lpc.c b/drivers/tpm/tpm_tis_lpc.c
index e6eec6bca9e8..9b81ec98aa8a 100644
--- a/drivers/tpm/tpm_tis_lpc.c
+++ b/drivers/tpm/tpm_tis_lpc.c
@@ -22,6 +22,7 @@
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #define PREFIX "lpc_tpm: "
diff --git a/drivers/tpm/tpm_tis_sandbox.c b/drivers/tpm/tpm_tis_sandbox.c
index da31ec3ff561..433b21d49e7a 100644
--- a/drivers/tpm/tpm_tis_sandbox.c
+++ b/drivers/tpm/tpm_tis_sandbox.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <display_options.h>
 #include <dm.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <tpm-v1.h>
 #include <vsprintf.h>
diff --git a/drivers/tpm/tpm_tis_st33zp24_i2c.c b/drivers/tpm/tpm_tis_st33zp24_i2c.c
index b5c706b7ccf5..2759c86e1823 100644
--- a/drivers/tpm/tpm_tis_st33zp24_i2c.c
+++ b/drivers/tpm/tpm_tis_st33zp24_i2c.c
@@ -23,6 +23,7 @@
 #include <vsprintf.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/types.h>
 #include <asm/unaligned.h>
diff --git a/drivers/tpm/tpm_tis_st33zp24_spi.c b/drivers/tpm/tpm_tis_st33zp24_spi.c
index 33f7392431f5..c1da351ae492 100644
--- a/drivers/tpm/tpm_tis_st33zp24_spi.c
+++ b/drivers/tpm/tpm_tis_st33zp24_spi.c
@@ -23,6 +23,7 @@
 #include <vsprintf.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/types.h>
 #include <asm/unaligned.h>
diff --git a/drivers/ufs/ufs.c b/drivers/ufs/ufs.c
index 666a0a547978..419c8a16b36a 100644
--- a/drivers/ufs/ufs.c
+++ b/drivers/ufs/ufs.c
@@ -26,6 +26,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include <linux/dma-mapping.h>
diff --git a/drivers/ufs/ufs.h b/drivers/ufs/ufs.h
index 069888fdd906..0328db88caed 100644
--- a/drivers/ufs/ufs.h
+++ b/drivers/ufs/ufs.h
@@ -2,6 +2,7 @@
 #ifndef __UFS_H
 #define __UFS_H
 
+#include <stdbool.h>
 #include "unipro.h"
 
 struct udevice;
diff --git a/drivers/usb/cdns3/cdns3-ti.c b/drivers/usb/cdns3/cdns3-ti.c
index 5130b4c70d23..370856c9bfef 100644
--- a/drivers/usb/cdns3/cdns3-ti.c
+++ b/drivers/usb/cdns3/cdns3-ti.c
@@ -13,6 +13,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/io.h>
+#include <linux/kernel.h>
 #include <linux/usb/otg.h>
 #include <malloc.h>
 
diff --git a/drivers/usb/cdns3/core.h b/drivers/usb/cdns3/core.h
index 0668d646fc49..70cc38666434 100644
--- a/drivers/usb/cdns3/core.h
+++ b/drivers/usb/cdns3/core.h
@@ -8,6 +8,7 @@
  * Authors: Peter Chen <peter.chen@nxp.com>
  *          Pawel Laszczak <pawell@cadence.com>
  */
+#include <stdbool.h>
 #include <linux/compiler.h>
 #include <linux/types.h>
 #include <linux/usb/otg.h>
diff --git a/drivers/usb/cdns3/ep0.c b/drivers/usb/cdns3/ep0.c
index 7be5c8de4e2f..f41d4a162cc7 100644
--- a/drivers/usb/cdns3/ep0.c
+++ b/drivers/usb/cdns3/ep0.c
@@ -17,6 +17,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/usb/composite.h>
 #include <linux/iopoll.h>
 
diff --git a/drivers/usb/cdns3/gadget.c b/drivers/usb/cdns3/gadget.c
index e42b82d0c2ba..a04e5fd61016 100644
--- a/drivers/usb/cdns3/gadget.c
+++ b/drivers/usb/cdns3/gadget.c
@@ -64,6 +64,7 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include <linux/usb/gadget.h>
diff --git a/drivers/usb/cdns3/gadget.h b/drivers/usb/cdns3/gadget.h
index 8803fa48bd39..42216fdc259c 100644
--- a/drivers/usb/cdns3/gadget.h
+++ b/drivers/usb/cdns3/gadget.h
@@ -12,6 +12,7 @@
 #ifndef __LINUX_CDNS3_GADGET
 #define __LINUX_CDNS3_GADGET
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 #include <linux/usb/gadget.h>
 
 /*
diff --git a/drivers/usb/common/common.c b/drivers/usb/common/common.c
index 5a8d24da8218..7ac83b6dece2 100644
--- a/drivers/usb/common/common.c
+++ b/drivers/usb/common/common.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <dm.h>
 #include <asm/global_data.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include <linux/usb/otg.h>
diff --git a/drivers/usb/common/fsl-dt-fixup.c b/drivers/usb/common/fsl-dt-fixup.c
index a279c28bdad2..0299e5adb0c0 100644
--- a/drivers/usb/common/fsl-dt-fixup.c
+++ b/drivers/usb/common/fsl-dt-fixup.c
@@ -19,6 +19,7 @@
 #include <fdt_support.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #ifndef CONFIG_USB_MAX_CONTROLLER_COUNT
diff --git a/drivers/usb/common/fsl-errata.c b/drivers/usb/common/fsl-errata.c
index 9eb1d2306725..e7552f1b9dfb 100644
--- a/drivers/usb/common/fsl-errata.c
+++ b/drivers/usb/common/fsl-errata.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <hwconfig.h>
 #include <fsl_errata.h>
+#include <stdbool.h>
 #include<fsl_usb.h>
 #if defined(CONFIG_FSL_LSCH2) || defined(CONFIG_FSL_LSCH3) || \
 	defined(CONFIG_ARM)
diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
index f79f9c931664..9889a6c9e81d 100644
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -27,6 +27,7 @@
 #include <linux/ioport.h>
 #include <dm.h>
 #include <generic-phy.h>
+#include <linux/kernel.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
 
diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
index fa338119de62..e4c6042bee8d 100644
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@ -24,6 +24,7 @@
 #include <linux/delay.h>
 #include <linux/dma-mapping.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/list.h>
 #include <linux/printk.h>
 #include <linux/string.h>
diff --git a/drivers/usb/dwc3/gadget.h b/drivers/usb/dwc3/gadget.h
index 7806ce59a27f..2f2eb18b99fc 100644
--- a/drivers/usb/dwc3/gadget.h
+++ b/drivers/usb/dwc3/gadget.h
@@ -18,6 +18,7 @@
 #ifndef __DRIVERS_USB_DWC3_GADGET_H
 #define __DRIVERS_USB_DWC3_GADGET_H
 
+#include <linux/kernel.h>
 #include <linux/list.h>
 #include <linux/usb/gadget.h>
 #include "io.h"
diff --git a/drivers/usb/dwc3/io.h b/drivers/usb/dwc3/io.h
index 2407f826c161..f5268d752c32 100644
--- a/drivers/usb/dwc3/io.h
+++ b/drivers/usb/dwc3/io.h
@@ -19,6 +19,7 @@
 
 #include <cpu_func.h>
 #include <asm/io.h>
+#include <linux/kernel.h>
 
 #define	CACHELINE_SIZE		CONFIG_SYS_CACHELINE_SIZE
 static inline u32 dwc3_readl(void __iomem *base, u32 offset)
diff --git a/drivers/usb/emul/sandbox_flash.c b/drivers/usb/emul/sandbox_flash.c
index e63720f2550f..f7090195c146 100644
--- a/drivers/usb/emul/sandbox_flash.c
+++ b/drivers/usb/emul/sandbox_flash.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <os.h>
 #include <scsi.h>
+#include <stdbool.h>
 #include <usb.h>
 #include <linux/errno.h>
 #include <linux/string.h>
diff --git a/drivers/usb/emul/sandbox_keyb.c b/drivers/usb/emul/sandbox_keyb.c
index 1c8de6d37feb..68e5f12f35d0 100644
--- a/drivers/usb/emul/sandbox_keyb.c
+++ b/drivers/usb/emul/sandbox_keyb.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <os.h>
 #include <scsi.h>
+#include <stdbool.h>
 #include <usb.h>
 #include <linux/errno.h>
 #include <linux/string.h>
diff --git a/drivers/usb/emul/usb-emul-uclass.c b/drivers/usb/emul/usb-emul-uclass.c
index 6b309592f6bb..8d24556c2c45 100644
--- a/drivers/usb/emul/usb-emul-uclass.c
+++ b/drivers/usb/emul/usb-emul-uclass.c
@@ -10,6 +10,7 @@
 #include <usb.h>
 #include <dm/device-internal.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 static int copy_to_unicode(char *buff, int length, const char *str)
diff --git a/drivers/usb/eth/lan7x.c b/drivers/usb/eth/lan7x.c
index c3c1ebb1cb6b..503d36c8d9fc 100644
--- a/drivers/usb/eth/lan7x.c
+++ b/drivers/usb/eth/lan7x.c
@@ -14,6 +14,7 @@
 #include <vsprintf.h>
 #include <linux/errno.h>
 #include <linux/ethtool.h>
+#include <linux/kernel.h>
 #include <linux/mii.h>
 #include <linux/string.h>
 #include "usb_ether.h"
diff --git a/drivers/usb/eth/lan7x.h b/drivers/usb/eth/lan7x.h
index feec7427a418..57c8293a8956 100644
--- a/drivers/usb/eth/lan7x.h
+++ b/drivers/usb/eth/lan7x.h
@@ -4,6 +4,7 @@
  */
 
 #include <console.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <watchdog.h>
diff --git a/drivers/usb/eth/mcs7830.c b/drivers/usb/eth/mcs7830.c
index 02a241414ff1..f223d96559f7 100644
--- a/drivers/usb/eth/mcs7830.c
+++ b/drivers/usb/eth/mcs7830.c
@@ -18,6 +18,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/mii.h>
 #include <malloc.h>
 #include <memalign.h>
diff --git a/drivers/usb/eth/r8152.c b/drivers/usb/eth/r8152.c
index da0b285077a6..f7c46fbc25fa 100644
--- a/drivers/usb/eth/r8152.c
+++ b/drivers/usb/eth/r8152.c
@@ -17,6 +17,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/mii.h>
 #include <linux/bitops.h>
 #include <linux/string.h>
diff --git a/drivers/usb/eth/r8152.h b/drivers/usb/eth/r8152.h
index 10e0da8eb105..378eb8c81248 100644
--- a/drivers/usb/eth/r8152.h
+++ b/drivers/usb/eth/r8152.h
@@ -8,6 +8,7 @@
 #define _RTL8152_ETH_H
 
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 #define R8152_BASE_NAME		"r8152"
 
 #define PLA_IDR			0xc000
diff --git a/drivers/usb/eth/r8152_fw.c b/drivers/usb/eth/r8152_fw.c
index 7e9b13de0447..2211dc9489ec 100644
--- a/drivers/usb/eth/r8152_fw.c
+++ b/drivers/usb/eth/r8152_fw.c
@@ -9,6 +9,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include "usb_ether.h"
 #include "r8152.h"
 
diff --git a/drivers/usb/eth/smsc95xx.c b/drivers/usb/eth/smsc95xx.c
index 435224c71979..482160254484 100644
--- a/drivers/usb/eth/smsc95xx.c
+++ b/drivers/usb/eth/smsc95xx.c
@@ -21,6 +21,7 @@
 #include <asm/unaligned.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/mii.h>
 #include <linux/string.h>
 #include "usb_ether.h"
diff --git a/drivers/usb/eth/usb_ether.c b/drivers/usb/eth/usb_ether.c
index 54bb0118228c..ce86d2cd2551 100644
--- a/drivers/usb/eth/usb_ether.c
+++ b/drivers/usb/eth/usb_ether.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <net.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <usb.h>
 #include <asm/cache.h>
diff --git a/drivers/usb/gadget/at91_udc.c b/drivers/usb/gadget/at91_udc.c
index 64682355daa6..e5a8872f7156 100644
--- a/drivers/usb/gadget/at91_udc.c
+++ b/drivers/usb/gadget/at91_udc.c
@@ -22,6 +22,7 @@
 #include <asm/io.h>
 #include <asm/gpio.h>
 #include <asm/hardware.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include <mach/at91_matrix.h>
diff --git a/drivers/usb/gadget/at91_udc.h b/drivers/usb/gadget/at91_udc.h
index 668b8c4a7c63..2b2e73420add 100644
--- a/drivers/usb/gadget/at91_udc.h
+++ b/drivers/usb/gadget/at91_udc.h
@@ -13,6 +13,7 @@
  * Based on AT91RM9200 datasheet revision E.
  */
 
+#include <linux/kernel.h>
 #define AT91_UDP_FRM_NUM	0x00		/* Frame Number Register */
 #define     AT91_UDP_NUM	(0x7ff <<  0)	/* Frame Number */
 #define     AT91_UDP_FRM_ERR	(1     << 16)	/* Frame Error */
diff --git a/drivers/usb/gadget/atmel_usba_udc.c b/drivers/usb/gadget/atmel_usba_udc.c
index a586e16347d0..03bbe1edb620 100644
--- a/drivers/usb/gadget/atmel_usba_udc.c
+++ b/drivers/usb/gadget/atmel_usba_udc.c
@@ -8,6 +8,7 @@
  */
 
 #include <common.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
diff --git a/drivers/usb/gadget/atmel_usba_udc.h b/drivers/usb/gadget/atmel_usba_udc.h
index f6cb48c1cffc..b0692e279542 100644
--- a/drivers/usb/gadget/atmel_usba_udc.h
+++ b/drivers/usb/gadget/atmel_usba_udc.h
@@ -11,6 +11,7 @@
 #define __LINUX_USB_GADGET_USBA_UDC_H__
 
 /* USB register offsets */
+#include <linux/kernel.h>
 #define USBA_CTRL				0x0000
 #define USBA_FNUM				0x0004
 #define USBA_INT_ENB				0x0010
diff --git a/drivers/usb/gadget/ci_udc.c b/drivers/usb/gadget/ci_udc.c
index e119fd6a0337..5f92c484b936 100644
--- a/drivers/usb/gadget/ci_udc.c
+++ b/drivers/usb/gadget/ci_udc.c
@@ -20,6 +20,7 @@
 #include <linux/errno.h>
 #include <asm/io.h>
 #include <asm/unaligned.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/types.h>
 #include <linux/usb/ch9.h>
diff --git a/drivers/usb/gadget/ci_udc.h b/drivers/usb/gadget/ci_udc.h
index 95cc07992b41..c5ef74d74f8a 100644
--- a/drivers/usb/gadget/ci_udc.h
+++ b/drivers/usb/gadget/ci_udc.h
@@ -6,6 +6,7 @@
 #ifndef __GADGET__CI_UDC_H__
 #define __GADGET__CI_UDC_H__
 
+#include <stdbool.h>
 #define NUM_ENDPOINTS		6
 
 #ifdef CONFIG_CI_UDC_HAS_HOSTPC
diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
index d5b3d1d40e4f..30c26a641051 100644
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@ -12,6 +12,7 @@
 #include <linux/bitops.h>
 #include <linux/bug.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/usb/composite.h>
 
diff --git a/drivers/usb/gadget/designware_udc.c b/drivers/usb/gadget/designware_udc.c
index d4b94a7cfce0..82d07349e47b 100644
--- a/drivers/usb/gadget/designware_udc.c
+++ b/drivers/usb/gadget/designware_udc.c
@@ -11,6 +11,7 @@
 #include <serial.h>
 #include <asm/io.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include <env.h>
diff --git a/drivers/usb/gadget/dwc2_udc_otg.c b/drivers/usb/gadget/dwc2_udc_otg.c
index 867f31be7b49..04a6b7129bb7 100644
--- a/drivers/usb/gadget/dwc2_udc_otg.c
+++ b/drivers/usb/gadget/dwc2_udc_otg.c
@@ -29,6 +29,7 @@
 #include <dm/devres.h>
 #include <linux/bug.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c b/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c
index 6b6fe0a5040b..ceb3a09840da 100644
--- a/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c
+++ b/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c
@@ -23,6 +23,7 @@
 #include <stdio.h>
 #include <linux/bug.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 static u8 clear_feature_num;
diff --git a/drivers/usb/gadget/ep0.c b/drivers/usb/gadget/ep0.c
index 6fabee24ce98..7b1bc4e38db0 100644
--- a/drivers/usb/gadget/ep0.c
+++ b/drivers/usb/gadget/ep0.c
@@ -39,6 +39,7 @@
 #include <common.h>
 #include <serial.h>
 #include <usbdevice.h>
+#include <linux/kernel.h>
 
 #if 0
 #define dbg_ep0(lvl,fmt,args...) serial_printf("[%s] %s:%d: "fmt"\n",__FILE__,__FUNCTION__,__LINE__,##args)
diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c
index 9ddbb5c0f214..1c0c1693d2d2 100644
--- a/drivers/usb/gadget/ether.c
+++ b/drivers/usb/gadget/ether.c
@@ -17,6 +17,7 @@
 #include <vsprintf.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/netdevice.h>
 #include <linux/printk.h>
 #include <linux/string.h>
diff --git a/drivers/usb/gadget/f_dfu.c b/drivers/usb/gadget/f_dfu.c
index a1f13b6ec22a..281c0f29f2a5 100644
--- a/drivers/usb/gadget/f_dfu.c
+++ b/drivers/usb/gadget/f_dfu.c
@@ -21,6 +21,7 @@
 #include <malloc.h>
 #include <stdio.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include <linux/usb/ch9.h>
diff --git a/drivers/usb/gadget/f_fastboot.c b/drivers/usb/gadget/f_fastboot.c
index 40648ef38bdb..1e17b8df3fab 100644
--- a/drivers/usb/gadget/f_fastboot.c
+++ b/drivers/usb/gadget/f_fastboot.c
@@ -19,6 +19,7 @@
 #include <malloc.h>
 #include <stdio.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include <linux/usb/ch9.h>
diff --git a/drivers/usb/gadget/f_mass_storage.c b/drivers/usb/gadget/f_mass_storage.c
index e0b898db214c..12ca77299f6c 100644
--- a/drivers/usb/gadget/f_mass_storage.c
+++ b/drivers/usb/gadget/f_mass_storage.c
@@ -251,6 +251,7 @@
 #include <dm/devres.h>
 #include <linux/bug.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include <linux/err.h>
diff --git a/drivers/usb/gadget/f_rockusb.c b/drivers/usb/gadget/f_rockusb.c
index a852707525a4..e6aa089aa77e 100644
--- a/drivers/usb/gadget/f_rockusb.c
+++ b/drivers/usb/gadget/f_rockusb.c
@@ -15,6 +15,7 @@
 #include <part.h>
 #include <stdio.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
diff --git a/drivers/usb/gadget/f_sdp.c b/drivers/usb/gadget/f_sdp.c
index fde5c2c690ee..5eb6474072c1 100644
--- a/drivers/usb/gadget/f_sdp.c
+++ b/drivers/usb/gadget/f_sdp.c
@@ -24,6 +24,7 @@
 #include <malloc.h>
 #include <stdio.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/usb/gadget/f_thor.c b/drivers/usb/gadget/f_thor.c
index 4a70bdcc5c33..667f1e19c362 100644
--- a/drivers/usb/gadget/f_thor.c
+++ b/drivers/usb/gadget/f_thor.c
@@ -27,6 +27,7 @@
 #include <vsprintf.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include <linux/usb/ch9.h>
diff --git a/drivers/usb/gadget/fotg210.c b/drivers/usb/gadget/fotg210.c
index ff9e98a7566d..66952aab4fbd 100644
--- a/drivers/usb/gadget/fotg210.c
+++ b/drivers/usb/gadget/fotg210.c
@@ -18,6 +18,7 @@
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/types.h>
 #include <linux/usb/ch9.h>
diff --git a/drivers/usb/gadget/g_dnl.c b/drivers/usb/gadget/g_dnl.c
index 1a0160b5836c..9397f915a44a 100644
--- a/drivers/usb/gadget/g_dnl.c
+++ b/drivers/usb/gadget/g_dnl.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <linux/errno.h>
 #include <linux/string.h>
diff --git a/drivers/usb/gadget/pxa25x_udc.c b/drivers/usb/gadget/pxa25x_udc.c
index 3e35e0fa45f1..71c918a64e4f 100644
--- a/drivers/usb/gadget/pxa25x_udc.c
+++ b/drivers/usb/gadget/pxa25x_udc.c
@@ -33,6 +33,7 @@
 #include <asm/arch/pxa.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include <linux/usb/ch9.h>
diff --git a/drivers/usb/gadget/pxa27x_udc.c b/drivers/usb/gadget/pxa27x_udc.c
index 7c67c2e3b3e3..03a067888e4b 100644
--- a/drivers/usb/gadget/pxa27x_udc.c
+++ b/drivers/usb/gadget/pxa27x_udc.c
@@ -15,6 +15,7 @@
 #include <asm/io.h>
 #include <usbdevice.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <usb/pxa27x_udc.h>
 #include <usb/udc.h>
 
diff --git a/drivers/usb/gadget/rndis.c b/drivers/usb/gadget/rndis.c
index 92c01adb75d1..78f4b345e736 100644
--- a/drivers/usb/gadget/rndis.c
+++ b/drivers/usb/gadget/rndis.c
@@ -22,6 +22,7 @@
 #include <log.h>
 #include <net.h>
 #include <malloc.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/types.h>
 #include <linux/list.h>
diff --git a/drivers/usb/gadget/udc/udc-core.c b/drivers/usb/gadget/udc/udc-core.c
index 74d66fd77b24..1e428b3c5e53 100644
--- a/drivers/usb/gadget/udc/udc-core.c
+++ b/drivers/usb/gadget/udc/udc-core.c
@@ -24,6 +24,7 @@
 #include <dm.h>
 #include <dm/device-internal.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
 
diff --git a/drivers/usb/gadget/udc/udc-uclass.c b/drivers/usb/gadget/udc/udc-uclass.c
index 7fa4aae4d2b7..c27271905fa6 100644
--- a/drivers/usb/gadget/udc/udc-uclass.c
+++ b/drivers/usb/gadget/udc/udc-uclass.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <dm/device-internal.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/usb/gadget.h>
 
diff --git a/drivers/usb/gadget/usbstring.c b/drivers/usb/gadget/usbstring.c
index 2870052fec3f..1a5917e0cc54 100644
--- a/drivers/usb/gadget/usbstring.c
+++ b/drivers/usb/gadget/usbstring.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
diff --git a/drivers/usb/host/dwc2.c b/drivers/usb/host/dwc2.c
index b8c92f52b2fd..1095df170c7f 100644
--- a/drivers/usb/host/dwc2.c
+++ b/drivers/usb/host/dwc2.c
@@ -24,6 +24,7 @@
 #include <dm/device_compat.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <power/regulator.h>
 #include <reset.h>
diff --git a/drivers/usb/host/dwc3-sti-glue.c b/drivers/usb/host/dwc3-sti-glue.c
index 1989881ae84e..876ebdfc40d4 100644
--- a/drivers/usb/host/dwc3-sti-glue.c
+++ b/drivers/usb/host/dwc3-sti-glue.c
@@ -18,6 +18,7 @@
 #include <syscon.h>
 #include <usb.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 
 #include <linux/usb/dwc3.h>
diff --git a/drivers/usb/host/ehci-faraday.c b/drivers/usb/host/ehci-faraday.c
index fe28aec8a85c..df81d5605a4e 100644
--- a/drivers/usb/host/ehci-faraday.c
+++ b/drivers/usb/host/ehci-faraday.c
@@ -12,6 +12,7 @@
 #include <asm/io.h>
 #include <usb.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <usb/fusbh200.h>
 #include <usb/fotg210.h>
 
diff --git a/drivers/usb/host/ehci-fsl.c b/drivers/usb/host/ehci-fsl.c
index b929eb9781b1..c9303bfba2a9 100644
--- a/drivers/usb/host/ehci-fsl.c
+++ b/drivers/usb/host/ehci-fsl.c
@@ -18,6 +18,7 @@
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <usb/ehci-ci.h>
 #include <hwconfig.h>
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index 4ef54a53d83f..05fe83c399c7 100644
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -25,6 +25,7 @@
 #include <linux/compiler.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include "ehci.h"
diff --git a/drivers/usb/host/ehci-msm.c b/drivers/usb/host/ehci-msm.c
index 458472b7b2e2..4c4d0a48bc1e 100644
--- a/drivers/usb/host/ehci-msm.c
+++ b/drivers/usb/host/ehci-msm.c
@@ -13,6 +13,7 @@
 #include <stdio.h>
 #include <usb.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <usb/ehci-ci.h>
 #include <usb/ulpi.h>
 #include <wait_bit.h>
diff --git a/drivers/usb/host/ehci-mx6.c b/drivers/usb/host/ehci-mx6.c
index 7ca106520dbe..bb96c11f355a 100644
--- a/drivers/usb/host/ehci-mx6.c
+++ b/drivers/usb/host/ehci-mx6.c
@@ -14,6 +14,7 @@
 #include <linux/compiler.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <usb/ehci-ci.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
diff --git a/drivers/usb/host/ehci-mxs.c b/drivers/usb/host/ehci-mxs.c
index 7698c7761fee..f951e5d3a829 100644
--- a/drivers/usb/host/ehci-mxs.c
+++ b/drivers/usb/host/ehci-mxs.c
@@ -13,6 +13,7 @@
 #include <errno.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #include "ehci.h"
 
diff --git a/drivers/usb/host/ehci-rmobile.c b/drivers/usb/host/ehci-rmobile.c
index 72ae211d6271..8e826163aa87 100644
--- a/drivers/usb/host/ehci-rmobile.c
+++ b/drivers/usb/host/ehci-rmobile.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <asm/arch/ehci-rmobile.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include "ehci.h"
 
 #if defined(CONFIG_R8A7740)
diff --git a/drivers/usb/host/ehci-tegra.c b/drivers/usb/host/ehci-tegra.c
index d71e455446f1..605a0a1dc808 100644
--- a/drivers/usb/host/ehci-tegra.c
+++ b/drivers/usb/host/ehci-tegra.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/usb/host/ehci-vf.c b/drivers/usb/host/ehci-vf.c
index 3f140521c9c5..816d105087e5 100644
--- a/drivers/usb/host/ehci-vf.c
+++ b/drivers/usb/host/ehci-vf.c
@@ -22,6 +22,7 @@
 #include <asm/mach-imx/regs-usbphy.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <usb/ehci-ci.h>
 #include <linux/libfdt.h>
diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c
index 3b204efdd690..ecdd64c48cdc 100644
--- a/drivers/usb/host/ohci-hcd.c
+++ b/drivers/usb/host/ohci-hcd.c
@@ -36,6 +36,7 @@
 #include <asm/cache.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #if defined(CONFIG_PCI_OHCI)
diff --git a/drivers/usb/host/r8a66597-hcd.c b/drivers/usb/host/r8a66597-hcd.c
index f977b3336f05..66c20c103c09 100644
--- a/drivers/usb/host/r8a66597-hcd.c
+++ b/drivers/usb/host/r8a66597-hcd.c
@@ -16,6 +16,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/iopoll.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <power/regulator.h>
 
diff --git a/drivers/usb/host/sl811-hcd.c b/drivers/usb/host/sl811-hcd.c
index c87b02f97471..0b786e1d13ec 100644
--- a/drivers/usb/host/sl811-hcd.c
+++ b/drivers/usb/host/sl811-hcd.c
@@ -24,6 +24,7 @@
 #include <time.h>
 #include <usb.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "sl811.h"
 
diff --git a/drivers/usb/host/usb-sandbox.c b/drivers/usb/host/usb-sandbox.c
index beb62ebc0c24..090cb2ae84e3 100644
--- a/drivers/usb/host/usb-sandbox.c
+++ b/drivers/usb/host/usb-sandbox.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <stdbool.h>
 #include <usb.h>
 #include <dm/root.h>
 
diff --git a/drivers/usb/host/usb-uclass.c b/drivers/usb/host/usb-uclass.c
index 36c676a1e5cb..2d3321df3cd6 100644
--- a/drivers/usb/host/usb-uclass.c
+++ b/drivers/usb/host/usb-uclass.c
@@ -11,6 +11,7 @@
 #include <errno.h>
 #include <log.h>
 #include <memalign.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <usb.h>
 #include <vsprintf.h>
diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c
index aa9063098c2a..09d301ed9562 100644
--- a/drivers/usb/host/xhci-mem.c
+++ b/drivers/usb/host/xhci-mem.c
@@ -24,6 +24,7 @@
 #include <asm/cache.h>
 #include <linux/bug.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include <usb/xhci.h>
diff --git a/drivers/usb/host/xhci-rcar.c b/drivers/usb/host/xhci-rcar.c
index 28eea930cc21..a343d4d098cd 100644
--- a/drivers/usb/host/xhci-rcar.c
+++ b/drivers/usb/host/xhci-rcar.c
@@ -16,6 +16,7 @@
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #include <usb/xhci.h>
 #include "xhci-rcar-r8a779x_usb3_v3.h"
diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
index 6a8f42a974a1..7f9286a52a08 100644
--- a/drivers/usb/host/xhci-ring.c
+++ b/drivers/usb/host/xhci-ring.c
@@ -23,6 +23,7 @@
 #include <asm/unaligned.h>
 #include <linux/bug.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #include <usb/xhci.h>
 
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index 4d9ba91da8ce..64a0c9d52c88 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -34,6 +34,7 @@
 #include <linux/bug.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <usb/xhci.h>
 
diff --git a/drivers/usb/musb-new/mt85xx.c b/drivers/usb/musb-new/mt85xx.c
index c5b994d906bf..6bf1909f1ad7 100644
--- a/drivers/usb/musb-new/mt85xx.c
+++ b/drivers/usb/musb-new/mt85xx.c
@@ -17,6 +17,7 @@
 #include <dm/root.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include <linux/usb/musb.h>
diff --git a/drivers/usb/musb-new/musb_core.h b/drivers/usb/musb-new/musb_core.h
index 821d0e06f619..91b1ec330454 100644
--- a/drivers/usb/musb-new/musb_core.h
+++ b/drivers/usb/musb-new/musb_core.h
@@ -21,6 +21,7 @@
 #include <linux/usb/otg.h>
 #else
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #endif
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
diff --git a/drivers/usb/musb-new/musb_dma.h b/drivers/usb/musb-new/musb_dma.h
index 5f99356ca797..5ad64ed34363 100644
--- a/drivers/usb/musb-new/musb_dma.h
+++ b/drivers/usb/musb-new/musb_dma.h
@@ -10,6 +10,7 @@
 #ifndef __MUSB_DMA_H__
 #define __MUSB_DMA_H__
 
+#include <stdbool.h>
 struct musb_hw_ep;
 
 /*
diff --git a/drivers/usb/musb-new/musb_gadget.h b/drivers/usb/musb-new/musb_gadget.h
index 7cb7a5cd6dc4..4ae18f910fcc 100644
--- a/drivers/usb/musb-new/musb_gadget.h
+++ b/drivers/usb/musb-new/musb_gadget.h
@@ -10,6 +10,7 @@
 #ifndef __MUSB_GADGET_H
 #define __MUSB_GADGET_H
 
+#include <linux/kernel.h>
 #include <linux/list.h>
 #ifdef __UBOOT__
 #include <asm/byteorder.h>
diff --git a/drivers/usb/musb-new/pic32.c b/drivers/usb/musb-new/pic32.c
index b4ee18442239..c4fd7f0da076 100644
--- a/drivers/usb/musb-new/pic32.c
+++ b/drivers/usb/musb-new/pic32.c
@@ -17,6 +17,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/usb/musb.h>
 #include "linux-compat.h"
diff --git a/drivers/usb/musb-new/sunxi.c b/drivers/usb/musb-new/sunxi.c
index 1ab74d4be394..b49954fe146d 100644
--- a/drivers/usb/musb-new/sunxi.c
+++ b/drivers/usb/musb-new/sunxi.c
@@ -34,6 +34,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include <linux/usb/musb.h>
diff --git a/drivers/usb/musb/musb_hcd.c b/drivers/usb/musb/musb_hcd.c
index 99514419e5f8..8942ed31fc42 100644
--- a/drivers/usb/musb/musb_hcd.c
+++ b/drivers/usb/musb/musb_hcd.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <usb.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "musb_hcd.h"
 
diff --git a/drivers/usb/musb/musb_udc.c b/drivers/usb/musb/musb_udc.c
index d901f8777c2c..56a92cc613ab 100644
--- a/drivers/usb/musb/musb_udc.c
+++ b/drivers/usb/musb/musb_udc.c
@@ -42,6 +42,7 @@
 #include <serial.h>
 #include <usbdevice.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <usb/udc.h>
 #include "../gadget/ep0.h"
 #include "musb_core.h"
diff --git a/drivers/usb/phy/rockchip_usb2_phy.c b/drivers/usb/phy/rockchip_usb2_phy.c
index 93caa821a1d2..d1d92ddfe7a3 100644
--- a/drivers/usb/phy/rockchip_usb2_phy.c
+++ b/drivers/usb/phy/rockchip_usb2_phy.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 
 #include "../gadget/dwc2_udc_otg_priv.h"
 
diff --git a/drivers/video/am335x-fb.c b/drivers/video/am335x-fb.c
index 4d74e96e2a3f..1e96f5bd35d7 100644
--- a/drivers/video/am335x-fb.c
+++ b/drivers/video/am335x-fb.c
@@ -27,6 +27,7 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include "am335x-fb.h"
diff --git a/drivers/video/ati_radeon_fb.c b/drivers/video/ati_radeon_fb.c
index 6ac6d0e69ac0..acee5ae35357 100644
--- a/drivers/video/ati_radeon_fb.c
+++ b/drivers/video/ati_radeon_fb.c
@@ -18,6 +18,7 @@
 #include <common.h>
 #include <stdio.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include <command.h>
diff --git a/drivers/video/atmel_hlcdfb.c b/drivers/video/atmel_hlcdfb.c
index bee082508b6d..1891ec0117a0 100644
--- a/drivers/video/atmel_hlcdfb.c
+++ b/drivers/video/atmel_hlcdfb.c
@@ -24,6 +24,7 @@
 #include <atmel_hlcdc.h>
 #include <linux/bug.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #if defined(CONFIG_LCD_LOGO)
 #include <bmp_logo.h>
diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c
index 20b9ba661c2d..c734a44ba801 100644
--- a/drivers/video/atmel_lcdfb.c
+++ b/drivers/video/atmel_lcdfb.c
@@ -11,6 +11,7 @@
 #include <fdtdec.h>
 #include <log.h>
 #include <part.h>
+#include <stdbool.h>
 #include <video.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/video/backlight_gpio.c b/drivers/video/backlight_gpio.c
index 67fed7f224a3..b72d6df88916 100644
--- a/drivers/video/backlight_gpio.c
+++ b/drivers/video/backlight_gpio.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <backlight.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/gpio.h>
 
 struct gpio_backlight_priv {
diff --git a/drivers/video/bcm2835.c b/drivers/video/bcm2835.c
index 7d2a452fd6fd..c949246a9872 100644
--- a/drivers/video/bcm2835.c
+++ b/drivers/video/bcm2835.c
@@ -11,6 +11,7 @@
 #include <asm/arch/msg.h>
 #include <asm/cache.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 static int bcm2835_video_probe(struct udevice *dev)
 {
diff --git a/drivers/video/bridge/video-bridge-uclass.c b/drivers/video/bridge/video-bridge-uclass.c
index d606342d8472..960f93840420 100644
--- a/drivers/video/bridge/video-bridge-uclass.c
+++ b/drivers/video/bridge/video-bridge-uclass.c
@@ -9,6 +9,7 @@
 #include <errno.h>
 #include <edid.h>
 #include <log.h>
+#include <stdbool.h>
 #include <video_bridge.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/video/broadwell_igd.c b/drivers/video/broadwell_igd.c
index 77a4dc158304..430e4fd7da10 100644
--- a/drivers/video/broadwell_igd.c
+++ b/drivers/video/broadwell_igd.c
@@ -25,6 +25,7 @@
 #include <asm/arch/pch.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include "i915_reg.h"
 
 struct broadwell_igd_priv {
diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c
index 5edef8924e8d..db64e18d13b0 100644
--- a/drivers/video/cfb_console.c
+++ b/drivers/video/cfb_console.c
@@ -79,6 +79,7 @@
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/compiler.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #if defined(CONFIG_VIDEO_MXS)
diff --git a/drivers/video/console_truetype.c b/drivers/video/console_truetype.c
index 17e040bc9261..01fcc03456bc 100644
--- a/drivers/video/console_truetype.c
+++ b/drivers/video/console_truetype.c
@@ -10,6 +10,7 @@
 #include <video.h>
 #include <video_console.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 /* Functions needed by stb_truetype.h */
diff --git a/drivers/video/da8xx-fb.c b/drivers/video/da8xx-fb.c
index 27234e7adee4..d9909e178674 100644
--- a/drivers/video/da8xx-fb.c
+++ b/drivers/video/da8xx-fb.c
@@ -16,6 +16,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <memalign.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <video_fb.h>
 #include <asm/global_data.h>
diff --git a/drivers/video/display-uclass.c b/drivers/video/display-uclass.c
index 8b49a7ba028c..8b9131590fec 100644
--- a/drivers/video/display-uclass.c
+++ b/drivers/video/display-uclass.c
@@ -8,6 +8,7 @@
 #include <display.h>
 #include <edid.h>
 #include <errno.h>
+#include <stdbool.h>
 #include <linux/errno.h>
 
 int display_read_edid(struct udevice *dev, u8 *buf, int buf_size)
diff --git a/drivers/video/dw_hdmi.c b/drivers/video/dw_hdmi.c
index b2868413144a..3f61c5ef02bb 100644
--- a/drivers/video/dw_hdmi.c
+++ b/drivers/video/dw_hdmi.c
@@ -13,6 +13,7 @@
 #include <i2c.h>
 #include <media_bus_format.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "dw_hdmi.h"
 
diff --git a/drivers/video/dw_mipi_dsi.c b/drivers/video/dw_mipi_dsi.c
index 1a2d2b3b7f5d..343732e2be0b 100644
--- a/drivers/video/dw_mipi_dsi.c
+++ b/drivers/video/dw_mipi_dsi.c
@@ -25,6 +25,7 @@
 #include <linux/errno.h>
 #include <linux/iopoll.h>
 #include <video_bridge.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #define HWVER_131			0x31333100	/* IP version 1.31 */
diff --git a/drivers/video/exynos/exynos_fb.c b/drivers/video/exynos/exynos_fb.c
index 42ec0494fa06..a266b78b24ac 100644
--- a/drivers/video/exynos/exynos_fb.c
+++ b/drivers/video/exynos/exynos_fb.c
@@ -13,6 +13,7 @@
 #include <dm.h>
 #include <fdtdec.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/libfdt.h>
diff --git a/drivers/video/exynos/exynos_mipi_dsi_common.c b/drivers/video/exynos/exynos_mipi_dsi_common.c
index 26e5d24314bb..cf284dc24700 100644
--- a/drivers/video/exynos/exynos_mipi_dsi_common.c
+++ b/drivers/video/exynos/exynos_mipi_dsi_common.c
@@ -14,6 +14,7 @@
 #include <asm/arch/dsim.h>
 #include <asm/arch/mipi_dsim.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #include "exynos_mipi_dsi_lowlevel.h"
 
diff --git a/drivers/video/fsl_dcu_fb.c b/drivers/video/fsl_dcu_fb.c
index be6b62bfa838..d1d553647c83 100644
--- a/drivers/video/fsl_dcu_fb.c
+++ b/drivers/video/fsl_dcu_fb.c
@@ -20,6 +20,7 @@
 #include <malloc.h>
 #include <video.h>
 #include <video_fb.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "videomodes.h"
 
diff --git a/drivers/video/fsl_diu_fb.c b/drivers/video/fsl_diu_fb.c
index 7e62e4f41ce5..3f8e357cc257 100644
--- a/drivers/video/fsl_diu_fb.c
+++ b/drivers/video/fsl_diu_fb.c
@@ -13,6 +13,7 @@
 #include <vsprintf.h>
 #include <asm/io.h>
 #include <asm/ppc.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include "videomodes.h"
diff --git a/drivers/video/hitachi_tx18d42vm_lcd.c b/drivers/video/hitachi_tx18d42vm_lcd.c
index fd51761485d7..284c65274747 100644
--- a/drivers/video/hitachi_tx18d42vm_lcd.c
+++ b/drivers/video/hitachi_tx18d42vm_lcd.c
@@ -10,6 +10,7 @@
 #include <stdio.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #include <asm/gpio.h>
 #include <errno.h>
diff --git a/drivers/video/ihs_video_out.c b/drivers/video/ihs_video_out.c
index dcbfbde688ff..5b1413699f9c 100644
--- a/drivers/video/ihs_video_out.c
+++ b/drivers/video/ihs_video_out.c
@@ -17,6 +17,7 @@
 #include <video_osd.h>
 #include <asm/gpio.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 static const uint MAX_X_CHARS = 53;
diff --git a/drivers/video/imx/ipu.h b/drivers/video/imx/ipu.h
index 1e02c7ab6d5f..85d9efe53244 100644
--- a/drivers/video/imx/ipu.h
+++ b/drivers/video/imx/ipu.h
@@ -13,6 +13,7 @@
 #ifndef __ASM_ARCH_IPU_H__
 #define __ASM_ARCH_IPU_H__
 
+#include <stdbool.h>
 #include <linux/types.h>
 #include <ipu_pixfmt.h>
 
diff --git a/drivers/video/imx/mxc_ipuv3_fb.c b/drivers/video/imx/mxc_ipuv3_fb.c
index b06e9f29a56c..9fa4c1a98d2b 100644
--- a/drivers/video/imx/mxc_ipuv3_fb.c
+++ b/drivers/video/imx/mxc_ipuv3_fb.c
@@ -17,6 +17,7 @@
 #include <asm/cache.h>
 #include <linux/errno.h>
 #include <asm/global_data.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/list.h>
 #include <linux/fb.h>
diff --git a/drivers/video/ivybridge_igd.c b/drivers/video/ivybridge_igd.c
index 47aa55ebdfcb..40a8cd1fa590 100644
--- a/drivers/video/ivybridge_igd.c
+++ b/drivers/video/ivybridge_igd.c
@@ -22,6 +22,7 @@
 #include <asm/arch/sandybridge.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/video/ld9040.c b/drivers/video/ld9040.c
index a36bc2f06cb3..3ff30eece441 100644
--- a/drivers/video/ld9040.c
+++ b/drivers/video/ld9040.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <spi.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 
 static const unsigned char SEQ_USER_SETTING[] = {
 	0xF0, 0x5A, 0x5A
diff --git a/drivers/video/lg4573.c b/drivers/video/lg4573.c
index 7d4ddca1573e..b47756bb13da 100644
--- a/drivers/video/lg4573.c
+++ b/drivers/video/lg4573.c
@@ -18,6 +18,7 @@
 #include <asm/gpio.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #define PWR_ON_DELAY_MSECS  120
diff --git a/drivers/video/logicore_dp_tx.c b/drivers/video/logicore_dp_tx.c
index 938455c0e4a6..fe806fd7e567 100644
--- a/drivers/video/logicore_dp_tx.c
+++ b/drivers/video/logicore_dp_tx.c
@@ -14,6 +14,7 @@
 #include <display.h>
 #include <dm.h>
 #include <errno.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/video/logicore_dp_tx.h b/drivers/video/logicore_dp_tx.h
index d8d82b2b13f8..b760cad12cc5 100644
--- a/drivers/video/logicore_dp_tx.h
+++ b/drivers/video/logicore_dp_tx.h
@@ -34,6 +34,7 @@
  * This is a stripped down version of struct main_stream_attributes that
  * contains only the parameters that are not set by cfg_msa_recalculate()
  */
+#include <stdbool.h>
 struct logicore_dp_tx_msa {
 	u32 pixel_clock_hz;
 	u32 bits_per_color;
diff --git a/drivers/video/mali_dp.c b/drivers/video/mali_dp.c
index 44841a9f9296..1b58b355264d 100644
--- a/drivers/video/mali_dp.c
+++ b/drivers/video/mali_dp.c
@@ -22,6 +22,7 @@
 #include <dm/device_compat.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <linux/string.h>
 
diff --git a/drivers/video/meson/meson_dw_hdmi.c b/drivers/video/meson/meson_dw_hdmi.c
index 0fa1178415a9..6a2b439afb6f 100644
--- a/drivers/video/meson/meson_dw_hdmi.c
+++ b/drivers/video/meson/meson_dw_hdmi.c
@@ -15,6 +15,7 @@
 #include <dm/uclass-internal.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <power/regulator.h>
 #include <clk.h>
diff --git a/drivers/video/meson/meson_plane.c b/drivers/video/meson/meson_plane.c
index b367276f2373..58dd5500ad69 100644
--- a/drivers/video/meson/meson_plane.c
+++ b/drivers/video/meson/meson_plane.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <linux/bitfield.h>
 #include <linux/bitops.h>
diff --git a/drivers/video/meson/meson_vclk.c b/drivers/video/meson/meson_vclk.c
index e096b437a384..dee5c90bd27f 100644
--- a/drivers/video/meson/meson_vclk.c
+++ b/drivers/video/meson/meson_vclk.c
@@ -11,6 +11,7 @@
 #include <edid.h>
 #include <stdio.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include "meson_vpu.h"
 #include <log.h>
diff --git a/drivers/video/meson/meson_venc.c b/drivers/video/meson/meson_venc.c
index ce64865d591a..166eaab4df14 100644
--- a/drivers/video/meson/meson_venc.c
+++ b/drivers/video/meson/meson_venc.c
@@ -11,6 +11,7 @@
 #include <edid.h>
 #include <fdtdec.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <linux/string.h>
 #include "meson_vpu.h"
diff --git a/drivers/video/meson/meson_vpu.c b/drivers/video/meson/meson_vpu.c
index 84171befb993..db959d996344 100644
--- a/drivers/video/meson/meson_vpu.c
+++ b/drivers/video/meson/meson_vpu.c
@@ -15,6 +15,7 @@
 #include <part.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <asm/arch/mem.h>
 #include <dm/device-internal.h>
diff --git a/drivers/video/meson/meson_vpu.h b/drivers/video/meson/meson_vpu.h
index d9588c3775c8..0a29e23093c8 100644
--- a/drivers/video/meson/meson_vpu.h
+++ b/drivers/video/meson/meson_vpu.h
@@ -9,6 +9,7 @@
 #ifndef __MESON_VPU_H__
 #define __MESON_VPU_H__
 
+#include <stdbool.h>
 #include <video.h>
 #include "meson_registers.h"
 
diff --git a/drivers/video/meson/meson_vpu_init.c b/drivers/video/meson/meson_vpu_init.c
index c9808e1c6317..3f13c55ee28a 100644
--- a/drivers/video/meson/meson_vpu_init.c
+++ b/drivers/video/meson/meson_vpu_init.c
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
 
diff --git a/drivers/video/mipi_dsi.c b/drivers/video/mipi_dsi.c
index 7f9e2c8357fb..405db2ca49aa 100644
--- a/drivers/video/mipi_dsi.c
+++ b/drivers/video/mipi_dsi.c
@@ -38,6 +38,7 @@
 #include <dm.h>
 #include <mipi_display.h>
 #include <mipi_dsi.h>
+#include <stdbool.h>
 #include <dm/devres.h>
 #include <linux/errno.h>
 #include <linux/string.h>
diff --git a/drivers/video/mvebu_lcd.c b/drivers/video/mvebu_lcd.c
index 142ae2355998..22483f182994 100644
--- a/drivers/video/mvebu_lcd.c
+++ b/drivers/video/mvebu_lcd.c
@@ -13,6 +13,7 @@
 #include <dm/device_compat.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/mbus.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
diff --git a/drivers/video/mxsfb.c b/drivers/video/mxsfb.c
index bb1eb3778272..7a1fbed877ae 100644
--- a/drivers/video/mxsfb.c
+++ b/drivers/video/mxsfb.c
@@ -19,6 +19,7 @@
 #include <malloc.h>
 #include <video.h>
 #include <video_fb.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include <asm/arch/clock.h>
diff --git a/drivers/video/nexell/s5pxx18_dp_lvds.c b/drivers/video/nexell/s5pxx18_dp_lvds.c
index cc95de13f511..72be625604bf 100644
--- a/drivers/video/nexell/s5pxx18_dp_lvds.c
+++ b/drivers/video/nexell/s5pxx18_dp_lvds.c
@@ -8,6 +8,8 @@
 #include <config.h>
 #include <common.h>
 #include <errno.h>
+#include <stdbool.h>
+#include <stdio.h>
 #include <linux/errno.h>
 
 #include <asm/arch/nexell.h>
diff --git a/drivers/video/nexell/s5pxx18_dp_mipi.c b/drivers/video/nexell/s5pxx18_dp_mipi.c
index 0eb1ebb377a3..2515add4fe76 100644
--- a/drivers/video/nexell/s5pxx18_dp_mipi.c
+++ b/drivers/video/nexell/s5pxx18_dp_mipi.c
@@ -8,6 +8,7 @@
 #include <config.h>
 #include <common.h>
 #include <errno.h>
+#include <stdbool.h>
 #include <linux/errno.h>
 
 #include <asm/arch/nexell.h>
diff --git a/drivers/video/nexell/s5pxx18_dp_rgb.c b/drivers/video/nexell/s5pxx18_dp_rgb.c
index 44e8edb02a22..349542c71b46 100644
--- a/drivers/video/nexell/s5pxx18_dp_rgb.c
+++ b/drivers/video/nexell/s5pxx18_dp_rgb.c
@@ -8,6 +8,8 @@
 #include <config.h>
 #include <common.h>
 #include <errno.h>
+#include <stdbool.h>
+#include <stdio.h>
 
 #include <asm/arch/display.h>
 
diff --git a/drivers/video/nexell/soc/s5pxx18_soc_disptop_clk.c b/drivers/video/nexell/soc/s5pxx18_soc_disptop_clk.c
index 02361ba41101..263133e7317f 100644
--- a/drivers/video/nexell/soc/s5pxx18_soc_disptop_clk.c
+++ b/drivers/video/nexell/soc/s5pxx18_soc_disptop_clk.c
@@ -5,6 +5,7 @@
  * Author: junghyun, kim <jhkim@nexell.co.kr>
  */
 
+#include <stdbool.h>
 #include <linux/types.h>
 #include <linux/io.h>
 
diff --git a/drivers/video/nexell/soc/s5pxx18_soc_lvds.c b/drivers/video/nexell/soc/s5pxx18_soc_lvds.c
index 18c101bda7ba..1c2fb6711cbb 100644
--- a/drivers/video/nexell/soc/s5pxx18_soc_lvds.c
+++ b/drivers/video/nexell/soc/s5pxx18_soc_lvds.c
@@ -5,6 +5,7 @@
  * Author: junghyun, kim <jhkim@nexell.co.kr>
  */
 
+#include <stdbool.h>
 #include <linux/types.h>
 #include <linux/io.h>
 
diff --git a/drivers/video/orisetech_otm8009a.c b/drivers/video/orisetech_otm8009a.c
index b6a8527533cb..8bff8e75cb85 100644
--- a/drivers/video/orisetech_otm8009a.c
+++ b/drivers/video/orisetech_otm8009a.c
@@ -16,6 +16,7 @@
 #include <dm/device_compat.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <power/regulator.h>
 
diff --git a/drivers/video/pwm_backlight.c b/drivers/video/pwm_backlight.c
index 6aacb067ad3a..45b2bc17a7ac 100644
--- a/drivers/video/pwm_backlight.c
+++ b/drivers/video/pwm_backlight.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <pwm.h>
+#include <stdbool.h>
 #include <asm/gpio.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/video/raydium-rm68200.c b/drivers/video/raydium-rm68200.c
index d31cbb4c34a9..33852ec5b4ce 100644
--- a/drivers/video/raydium-rm68200.c
+++ b/drivers/video/raydium-rm68200.c
@@ -16,6 +16,7 @@
 #include <dm/device_compat.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <power/regulator.h>
 
diff --git a/drivers/video/rockchip/rk3288_hdmi.c b/drivers/video/rockchip/rk3288_hdmi.c
index f835f4d517a5..c1331a81fae2 100644
--- a/drivers/video/rockchip/rk3288_hdmi.c
+++ b/drivers/video/rockchip/rk3288_hdmi.c
@@ -18,6 +18,7 @@
 #include <asm/arch-rockchip/clock.h>
 #include <asm/arch-rockchip/hardware.h>
 #include <asm/arch-rockchip/grf_rk3288.h>
+#include <linux/kernel.h>
 #include <power/regulator.h>
 #include "rk_hdmi.h"
 
diff --git a/drivers/video/rockchip/rk3288_vop.c b/drivers/video/rockchip/rk3288_vop.c
index d1bf82c5b27a..e1f7850040b4 100644
--- a/drivers/video/rockchip/rk3288_vop.c
+++ b/drivers/video/rockchip/rk3288_vop.c
@@ -17,6 +17,7 @@
 #include <asm/arch-rockchip/grf_rk3288.h>
 #include <asm/arch-rockchip/hardware.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include "rk_vop.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/video/rockchip/rk3399_hdmi.c b/drivers/video/rockchip/rk3399_hdmi.c
index a62be9832750..d72c82ad0315 100644
--- a/drivers/video/rockchip/rk3399_hdmi.c
+++ b/drivers/video/rockchip/rk3399_hdmi.c
@@ -16,6 +16,7 @@
 #include <asm/arch-rockchip/clock.h>
 #include <asm/arch-rockchip/hardware.h>
 #include <asm/arch-rockchip/grf_rk3399.h>
+#include <linux/kernel.h>
 #include <power/regulator.h>
 #include "rk_hdmi.h"
 
diff --git a/drivers/video/rockchip/rk3399_vop.c b/drivers/video/rockchip/rk3399_vop.c
index fe424d51f73b..db1fb8093d74 100644
--- a/drivers/video/rockchip/rk3399_vop.c
+++ b/drivers/video/rockchip/rk3399_vop.c
@@ -14,6 +14,7 @@
 #include <asm/arch-rockchip/hardware.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <linux/kernel.h>
 #include "rk_vop.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/video/rockchip/rk_edp.c b/drivers/video/rockchip/rk_edp.c
index d6478d4f3986..49fe635229d4 100644
--- a/drivers/video/rockchip/rk_edp.c
+++ b/drivers/video/rockchip/rk_edp.c
@@ -25,6 +25,7 @@
 #include <dt-bindings/clock/rk3288-cru.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #define MAX_CR_LOOP 5
diff --git a/drivers/video/s6e8ax0.c b/drivers/video/s6e8ax0.c
index 497258f3de92..c3a8d43c0041 100644
--- a/drivers/video/s6e8ax0.c
+++ b/drivers/video/s6e8ax0.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <asm/arch/mipi_dsim.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 
 #include "exynos/exynos_mipi_dsi_lowlevel.h"
 #include "exynos/exynos_mipi_dsi_common.h"
diff --git a/drivers/video/scf0403_lcd.c b/drivers/video/scf0403_lcd.c
index dcf0504ae561..0d5de4c4ddae 100644
--- a/drivers/video/scf0403_lcd.c
+++ b/drivers/video/scf0403_lcd.c
@@ -19,6 +19,7 @@
 #include <asm/gpio.h>
 #include <spi.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 
 struct scf0403_cmd {
 	u16 cmd;
diff --git a/drivers/video/ssd2828.c b/drivers/video/ssd2828.c
index 84479b3ded90..a620a579fd73 100644
--- a/drivers/video/ssd2828.c
+++ b/drivers/video/ssd2828.c
@@ -16,6 +16,7 @@
 #include <asm/arch/gpio.h>
 #include <asm/gpio.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 
 #include "videomodes.h"
 #include "ssd2828.h"
diff --git a/drivers/video/stm32/stm32_dsi.c b/drivers/video/stm32/stm32_dsi.c
index 617d900343ca..f58aa885f321 100644
--- a/drivers/video/stm32/stm32_dsi.c
+++ b/drivers/video/stm32/stm32_dsi.c
@@ -27,6 +27,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/iopoll.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <power/regulator.h>
 
diff --git a/drivers/video/stm32/stm32_ltdc.c b/drivers/video/stm32/stm32_ltdc.c
index 3767792a399f..a763f13fe156 100644
--- a/drivers/video/stm32/stm32_ltdc.c
+++ b/drivers/video/stm32/stm32_ltdc.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <panel.h>
 #include <reset.h>
+#include <stdbool.h>
 #include <video.h>
 #include <video_bridge.h>
 #include <asm/global_data.h>
diff --git a/drivers/video/sunxi/lcdc.c b/drivers/video/sunxi/lcdc.c
index 73033c3b8589..8814bc368145 100644
--- a/drivers/video/sunxi/lcdc.c
+++ b/drivers/video/sunxi/lcdc.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdbool.h>
 #include <linux/delay.h>
 
 #include <asm/arch/clock.h>
diff --git a/drivers/video/sunxi/sunxi_de2.c b/drivers/video/sunxi/sunxi_de2.c
index 13a23f4ff63e..3586d1bd93be 100644
--- a/drivers/video/sunxi/sunxi_de2.c
+++ b/drivers/video/sunxi/sunxi_de2.c
@@ -14,6 +14,7 @@
 #include <fdt_support.h>
 #include <log.h>
 #include <part.h>
+#include <stdbool.h>
 #include <video.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/video/sunxi/sunxi_display.c b/drivers/video/sunxi/sunxi_display.c
index 8285ccd70a45..227b46e0b97d 100644
--- a/drivers/video/sunxi/sunxi_display.c
+++ b/drivers/video/sunxi/sunxi_display.c
@@ -14,6 +14,7 @@
 #include <time.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include <asm/arch/clock.h>
diff --git a/drivers/video/sunxi/sunxi_dw_hdmi.c b/drivers/video/sunxi/sunxi_dw_hdmi.c
index 418b429ce0e8..b601328b6b35 100644
--- a/drivers/video/sunxi/sunxi_dw_hdmi.c
+++ b/drivers/video/sunxi/sunxi_dw_hdmi.c
@@ -18,6 +18,7 @@
 #include <asm/arch/lcdc.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 
 struct sunxi_dw_hdmi_priv {
 	struct dw_hdmi hdmi;
diff --git a/drivers/video/tegra.c b/drivers/video/tegra.c
index f10c509345d0..2bacfa86dade 100644
--- a/drivers/video/tegra.c
+++ b/drivers/video/tegra.c
@@ -18,6 +18,7 @@
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #include <asm/arch/clock.h>
 #include <asm/arch/funcmux.h>
diff --git a/drivers/video/tegra124/display.c b/drivers/video/tegra124/display.c
index c16110f1191e..bb2f46be5583 100644
--- a/drivers/video/tegra124/display.c
+++ b/drivers/video/tegra124/display.c
@@ -26,6 +26,7 @@
 #include <dm/uclass-internal.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include "displayport.h"
 
 /* return in 1000ths of a Hertz */
diff --git a/drivers/video/tegra124/dp.c b/drivers/video/tegra124/dp.c
index 52b06f32ea85..ed1f9022babf 100644
--- a/drivers/video/tegra124/dp.c
+++ b/drivers/video/tegra124/dp.c
@@ -17,6 +17,7 @@
 #include <asm/arch-tegra/dc.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "display.h"
 #include "edid.h"
diff --git a/drivers/video/vidconsole-uclass.c b/drivers/video/vidconsole-uclass.c
index 7262cc0a65ce..204828d594af 100644
--- a/drivers/video/vidconsole-uclass.c
+++ b/drivers/video/vidconsole-uclass.c
@@ -18,6 +18,7 @@
 #include <vsprintf.h>
 #include <linux/ctype.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 /*
diff --git a/drivers/video/video-uclass.c b/drivers/video/video-uclass.c
index 722a9c8765a6..dcbe2480084d 100644
--- a/drivers/video/video-uclass.c
+++ b/drivers/video/video-uclass.c
@@ -25,6 +25,7 @@
 #include <asm/sdl.h>
 #endif
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 /*
diff --git a/drivers/video/video_bmp.c b/drivers/video/video_bmp.c
index e854e3a3bfec..c83f41631b69 100644
--- a/drivers/video/video_bmp.c
+++ b/drivers/video/video_bmp.c
@@ -14,6 +14,7 @@
 #include <watchdog.h>
 #include <asm/unaligned.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #ifdef CONFIG_VIDEO_BMP_RLE8
 #define BMP_RLE8_ESCAPE		0
diff --git a/drivers/virtio/virtio_net.c b/drivers/virtio/virtio_net.c
index 277d4832fbb2..d20ea6325f4d 100644
--- a/drivers/virtio/virtio_net.c
+++ b/drivers/virtio/virtio_net.c
@@ -11,6 +11,7 @@
 #include <virtio.h>
 #include <virtio_ring.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "virtio_net.h"
 
diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c
index 76dc7d3a7620..a5dbb0dd7f8d 100644
--- a/drivers/virtio/virtio_ring.c
+++ b/drivers/virtio/virtio_ring.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <virtio_types.h>
 #include <virtio.h>
diff --git a/drivers/virtio/virtio_rng.c b/drivers/virtio/virtio_rng.c
index 111f8de2855e..dadaaa449ce1 100644
--- a/drivers/virtio/virtio_rng.c
+++ b/drivers/virtio/virtio_rng.c
@@ -10,6 +10,7 @@
 #include <virtio_types.h>
 #include <virtio.h>
 #include <virtio_ring.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #define BUFFER_SIZE	16UL
diff --git a/drivers/w1/mxc_w1.c b/drivers/w1/mxc_w1.c
index 92b18606c824..44047ea2bfe2 100644
--- a/drivers/w1/mxc_w1.c
+++ b/drivers/w1/mxc_w1.c
@@ -17,6 +17,7 @@
  * Martin Fuzzey <martin.fuzzey@flowbird.group>
  */
 
+#include <stdbool.h>
 #include <asm/arch/clock.h>
 #include <common.h>
 #include <dm.h>
diff --git a/drivers/w1/w1-gpio.c b/drivers/w1/w1-gpio.c
index ba3dd688e6eb..b54f169adfbf 100644
--- a/drivers/w1/w1-gpio.c
+++ b/drivers/w1/w1-gpio.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <w1.h>
 #include <linux/delay.h>
diff --git a/drivers/w1/w1-uclass.c b/drivers/w1/w1-uclass.c
index a40beaefd67c..9b9913a90d00 100644
--- a/drivers/w1/w1-uclass.c
+++ b/drivers/w1/w1-uclass.c
@@ -13,6 +13,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <w1.h>
 #include <w1-eeprom.h>
diff --git a/drivers/watchdog/ast_wdt.c b/drivers/watchdog/ast_wdt.c
index 7e11465a570c..0f858b181c33 100644
--- a/drivers/watchdog/ast_wdt.c
+++ b/drivers/watchdog/ast_wdt.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <asm/arch/wdt.h>
 #include <linux/err.h>
+#include <linux/kernel.h>
 
 #define WDT_AST2500	2500
 #define WDT_AST2400	2400
diff --git a/drivers/watchdog/at91sam9_wdt.c b/drivers/watchdog/at91sam9_wdt.c
index c116a011263d..ad602a8eb342 100644
--- a/drivers/watchdog/at91sam9_wdt.c
+++ b/drivers/watchdog/at91sam9_wdt.c
@@ -25,6 +25,7 @@
 #include <errno.h>
 #include <wdt.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/watchdog/cdns_wdt.c b/drivers/watchdog/cdns_wdt.c
index 2abd5524f61d..a7f9095e2cda 100644
--- a/drivers/watchdog/cdns_wdt.c
+++ b/drivers/watchdog/cdns_wdt.c
@@ -15,6 +15,7 @@
 #include <dm/device_compat.h>
 #include <linux/err.h>
 #include <linux/io.h>
+#include <linux/kernel.h>
 
 struct cdns_regs {
 	u32 zmr;	/* WD Zero mode register, offset - 0x0 */
diff --git a/drivers/watchdog/designware_wdt.c b/drivers/watchdog/designware_wdt.c
index b2d17f6e335d..06783650bed7 100644
--- a/drivers/watchdog/designware_wdt.c
+++ b/drivers/watchdog/designware_wdt.c
@@ -12,6 +12,7 @@
 #include <asm/utils.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #define DW_WDT_CR	0x00
 #define DW_WDT_TORR	0x04
diff --git a/drivers/watchdog/imx_watchdog.c b/drivers/watchdog/imx_watchdog.c
index e17d9217cc0a..d36b8b14931f 100644
--- a/drivers/watchdog/imx_watchdog.c
+++ b/drivers/watchdog/imx_watchdog.c
@@ -18,6 +18,7 @@
 #include <fsl_wdog.h>
 #include <div64.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #define TIMEOUT_MAX	128000
 #define TIMEOUT_MIN	500
diff --git a/drivers/watchdog/tangier_wdt.c b/drivers/watchdog/tangier_wdt.c
index 358a9b90fddb..050e97f392a2 100644
--- a/drivers/watchdog/tangier_wdt.c
+++ b/drivers/watchdog/tangier_wdt.c
@@ -8,6 +8,7 @@
 #include <wdt.h>
 #include <div64.h>
 #include <asm/scu.h>
+#include <linux/kernel.h>
 
 /* Hardware timeout in seconds */
 #define WDT_PRETIMEOUT		15
diff --git a/drivers/watchdog/xilinx_wwdt.c b/drivers/watchdog/xilinx_wwdt.c
index a486e032624d..b688ebf09384 100644
--- a/drivers/watchdog/xilinx_wwdt.c
+++ b/drivers/watchdog/xilinx_wwdt.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <dm.h>
 #include <regmap.h>
+#include <stdbool.h>
 #include <wdt.h>
 #include <linux/compat.h>
 #include <linux/errno.h>
diff --git a/env/common.c b/env/common.c
index b8ac49cf4998..7b0a7b38e24b 100644
--- a/env/common.c
+++ b/env/common.c
@@ -14,6 +14,7 @@
 #include <env_internal.h>
 #include <log.h>
 #include <sort.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
diff --git a/env/env.c b/env/env.c
index 60c0295affbf..e1a36b658fcb 100644
--- a/env/env.c
+++ b/env/env.c
@@ -13,6 +13,7 @@
 #include <linux/bitops.h>
 #include <linux/bug.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/env/flags.c b/env/flags.c
index df4aed26b2c6..8cd03336a3f1 100644
--- a/env/flags.c
+++ b/env/flags.c
@@ -5,6 +5,7 @@
  */
 
 #include <env.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/ctype.h>
 
diff --git a/env/mmc.c b/env/mmc.c
index 63287ec398e9..009a79ac00ce 100644
--- a/env/mmc.c
+++ b/env/mmc.c
@@ -10,6 +10,7 @@
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include <command.h>
diff --git a/env/nand.c b/env/nand.c
index 730baf0095c1..18d43c0503a8 100644
--- a/env/nand.c
+++ b/env/nand.c
@@ -20,6 +20,7 @@
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/stddef.h>
 #include <malloc.h>
 #include <memalign.h>
diff --git a/env/sata.c b/env/sata.c
index 56109397d533..a4af49ed8e2b 100644
--- a/env/sata.c
+++ b/env/sata.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <stdio.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #include <command.h>
 #include <env.h>
diff --git a/env/sf.c b/env/sf.c
index 4bf67dcc8a9d..6f874f43986f 100644
--- a/env/sf.c
+++ b/env/sf.c
@@ -24,6 +24,7 @@
 #include <asm/global_data.h>
 #include <dm/device-internal.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <u-boot/crc.h>
 
 #ifndef CONFIG_SPL_BUILD
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index f1e185b2a9ea..6216761b5653 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -8,6 +8,7 @@
 #include "btrfs.h"
 #include <malloc.h>
 #include <stdio.h>
+#include <linux/kernel.h>
 
 u64 btrfs_lookup_inode_ref(struct btrfs_root *root, u64 inr,
 			   struct btrfs_inode_ref *refp, char *name)
diff --git a/fs/btrfs/subvolume.c b/fs/btrfs/subvolume.c
index 72f9b01d3b3c..bc488183cd34 100644
--- a/fs/btrfs/subvolume.c
+++ b/fs/btrfs/subvolume.c
@@ -8,7 +8,7 @@
 #include "btrfs.h"
 #include <malloc.h>
 #include <stdio.h>
-
+#include <linux/kernel.h>
 static int get_subvol_name(u64 subvolid, char *name, int max_len)
 {
 	struct btrfs_root_ref rref;
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index 0b6def086ea2..41f2193d51c9 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -11,6 +11,7 @@
 #include <part.h>
 #include <stdio.h>
 #include <linux/compat.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "btrfs.h"
 
diff --git a/fs/cbfs/cbfs.c b/fs/cbfs/cbfs.c
index 1b27320a7601..3f4899101801 100644
--- a/fs/cbfs/cbfs.c
+++ b/fs/cbfs/cbfs.c
@@ -7,6 +7,7 @@
 #include <cbfs.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <asm/byteorder.h>
 #include <linux/errno.h>
 #include <linux/string.h>
diff --git a/fs/ext4/ext4_common.c b/fs/ext4/ext4_common.c
index c3ca193a1906..8d1cec27cb76 100644
--- a/fs/ext4/ext4_common.c
+++ b/fs/ext4/ext4_common.c
@@ -29,6 +29,7 @@
 #include <stddef.h>
 #include <stdio.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/stat.h>
 #include <linux/string.h>
 #include <linux/time.h>
diff --git a/fs/ext4/ext4_write.c b/fs/ext4/ext4_write.c
index a38e0edd6a73..933e8b19b1b5 100644
--- a/fs/ext4/ext4_write.c
+++ b/fs/ext4/ext4_write.c
@@ -29,6 +29,7 @@
 #include <part.h>
 #include <stdio.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/stat.h>
 #include <div64.h>
 #include <linux/string.h>
diff --git a/fs/fat/fat.c b/fs/fat/fat.c
index e25416674b79..af202cfe9053 100644
--- a/fs/fat/fat.c
+++ b/fs/fat/fat.c
@@ -24,6 +24,7 @@
 #include <linux/compiler.h>
 #include <linux/ctype.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 /*
diff --git a/fs/fat/fat_write.c b/fs/fat/fat_write.c
index 42ddb2857897..7da319365420 100644
--- a/fs/fat/fat_write.c
+++ b/fs/fat/fat_write.c
@@ -18,6 +18,7 @@
 #include <linux/ctype.h>
 #include <div64.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/math64.h>
 #include <linux/string.h>
 #include "fat.c"
diff --git a/fs/fs.c b/fs/fs.c
index 71dbad6103b5..c657f92afb51 100644
--- a/fs/fs.c
+++ b/fs/fs.c
@@ -26,6 +26,7 @@
 #include <asm/io.h>
 #include <div64.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/math64.h>
 #include <efi_loader.h>
 #include <squashfs.h>
diff --git a/fs/fs_internal.c b/fs/fs_internal.c
index 37223573a7c6..b626ffaecbed 100644
--- a/fs/fs_internal.c
+++ b/fs/fs_internal.c
@@ -12,6 +12,7 @@
 #include <part.h>
 #include <memalign.h>
 #include <stdio.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 int fs_devread(struct blk_desc *blk, struct disk_partition *partition,
diff --git a/fs/jffs2/compr_lzo.c b/fs/jffs2/compr_lzo.c
index e648ec4fb2e2..da9a17ecaf66 100644
--- a/fs/jffs2/compr_lzo.c
+++ b/fs/jffs2/compr_lzo.c
@@ -67,6 +67,7 @@
 
 
 #include <config.h>
+#include <linux/kernel.h>
 #include <linux/stddef.h>
 #include <jffs2/jffs2.h>
 #include <jffs2/compr_rubin.h>
diff --git a/fs/jffs2/jffs2_1pass.c b/fs/jffs2/jffs2_1pass.c
index af3a0fc48aaa..40e8ff663771 100644
--- a/fs/jffs2/jffs2_1pass.c
+++ b/fs/jffs2/jffs2_1pass.c
@@ -118,6 +118,7 @@
 #include <div64.h>
 #include <stdio.h>
 #include <linux/compiler.h>
+#include <linux/kernel.h>
 #include <linux/stat.h>
 #include <linux/string.h>
 #include <linux/time.h>
diff --git a/fs/ubifs/debug.c b/fs/ubifs/debug.c
index 07196c52e4f8..a20407688cde 100644
--- a/fs/ubifs/debug.c
+++ b/fs/ubifs/debug.c
@@ -21,6 +21,7 @@
 #include <vsprintf.h>
 #include <dm/devres.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/fs/ubifs/io.c b/fs/ubifs/io.c
index 4ef1381fc7d0..5a0fa3aa4e4c 100644
--- a/fs/ubifs/io.c
+++ b/fs/ubifs/io.c
@@ -69,6 +69,7 @@
 #include <linux/compat.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #endif
 #include "ubifs.h"
diff --git a/fs/ubifs/key.h b/fs/ubifs/key.h
index f5b19525621e..6677ff06a268 100644
--- a/fs/ubifs/key.h
+++ b/fs/ubifs/key.h
@@ -33,6 +33,7 @@
  * reserved for "." and "..". %2 is reserved for "end of readdir" marker. This
  * function makes sure the reserved values are not used.
  */
+#include <linux/kernel.h>
 #include <linux/string.h>
 static inline uint32_t key_mask_hash(uint32_t hash)
 {
diff --git a/fs/ubifs/log.c b/fs/ubifs/log.c
index 6e43a9c62b4b..01edae8ff45a 100644
--- a/fs/ubifs/log.c
+++ b/fs/ubifs/log.c
@@ -20,6 +20,7 @@
 #include <dm/devres.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #endif
 #include "ubifs.h"
diff --git a/fs/ubifs/lprops.c b/fs/ubifs/lprops.c
index b5ddde857c38..2e4678cfaa85 100644
--- a/fs/ubifs/lprops.c
+++ b/fs/ubifs/lprops.c
@@ -21,6 +21,7 @@
 #include <malloc.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #endif
 #include "ubifs.h"
diff --git a/fs/ubifs/lpt_commit.c b/fs/ubifs/lpt_commit.c
index 7c5f5d9a246e..2f0d1c6eb512 100644
--- a/fs/ubifs/lpt_commit.c
+++ b/fs/ubifs/lpt_commit.c
@@ -24,6 +24,7 @@
 #include <linux/compat.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include "crc16.h"
diff --git a/fs/ubifs/misc.h b/fs/ubifs/misc.h
index 449bcfccbb46..a54e4928fc0a 100644
--- a/fs/ubifs/misc.h
+++ b/fs/ubifs/misc.h
@@ -21,6 +21,7 @@
  *
  * This helper function returns %1 if @znode is dirty and %0 otherwise.
  */
+#include <linux/kernel.h>
 static inline int ubifs_zn_dirty(const struct ubifs_znode *znode)
 {
 	return !!test_bit(DIRTY_ZNODE, &znode->flags);
diff --git a/fs/ubifs/orphan.c b/fs/ubifs/orphan.c
index 1d7b8b6a181f..a7df0364a17f 100644
--- a/fs/ubifs/orphan.c
+++ b/fs/ubifs/orphan.c
@@ -11,6 +11,7 @@
 #include <dm/devres.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include "ubifs.h"
 
 /*
diff --git a/fs/ubifs/recovery.c b/fs/ubifs/recovery.c
index 8d342766221d..24c66ce16886 100644
--- a/fs/ubifs/recovery.c
+++ b/fs/ubifs/recovery.c
@@ -44,6 +44,7 @@
 #else
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #endif
 #include "ubifs.h"
diff --git a/fs/ubifs/replay.c b/fs/ubifs/replay.c
index 248a80659257..845a270ce513 100644
--- a/fs/ubifs/replay.c
+++ b/fs/ubifs/replay.c
@@ -26,6 +26,7 @@
 #include <linux/compat.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #endif
 #include "ubifs.h"
diff --git a/fs/ubifs/scan.c b/fs/ubifs/scan.c
index 9332a61ff34a..218cbfade109 100644
--- a/fs/ubifs/scan.c
+++ b/fs/ubifs/scan.c
@@ -21,6 +21,7 @@
 #include <dm/devres.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #endif
 #include "ubifs.h"
 
diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c
index 8f219ba85333..9c37fa2254c8 100644
--- a/fs/ubifs/super.c
+++ b/fs/ubifs/super.c
@@ -37,6 +37,7 @@
 #include <linux/bitops.h>
 #include <linux/bug.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/log2.h>
 #include <linux/printk.h>
 #include <linux/stat.h>
diff --git a/fs/ubifs/tnc.c b/fs/ubifs/tnc.c
index 72bcd4227462..b9174c8798f3 100644
--- a/fs/ubifs/tnc.c
+++ b/fs/ubifs/tnc.c
@@ -30,6 +30,7 @@
 #include <linux/compat.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/stat.h>
 #include <linux/string.h>
 #endif
diff --git a/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h
index efa7a69cb6dd..c8a33fa36edb 100644
--- a/fs/ubifs/ubifs.h
+++ b/fs/ubifs/ubifs.h
@@ -35,6 +35,7 @@
 #include <asm-generic/atomic-long.h>
 #include <ubi_uboot.h>
 #include <ubifs_uboot.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 
 #include <linux/ctype.h>
diff --git a/fs/zfs/zfs.c b/fs/zfs/zfs.c
index b63022aae32d..0bc872175e5c 100644
--- a/fs/zfs/zfs.c
+++ b/fs/zfs/zfs.c
@@ -14,6 +14,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <stdio.h>
+#include <linux/kernel.h>
 #include <linux/stat.h>
 #include <linux/string.h>
 #include <linux/time.h>
diff --git a/include/acpi/acpi_device.h b/include/acpi/acpi_device.h
index 11461e168d38..1c6aceb20af2 100644
--- a/include/acpi/acpi_device.h
+++ b/include/acpi/acpi_device.h
@@ -11,6 +11,7 @@
 
 #include <i2c.h>
 #include <spi.h>
+#include <stdbool.h>
 #include <linux/bitops.h>
 
 struct acpi_ctx;
diff --git a/include/acpi/acpigen.h b/include/acpi/acpigen.h
index 228ac9c404b3..3dfdc962510b 100644
--- a/include/acpi/acpigen.h
+++ b/include/acpi/acpigen.h
@@ -10,6 +10,7 @@
 #ifndef __ACPI_ACPIGEN_H
 #define __ACPI_ACPIGEN_H
 
+#include <stdbool.h>
 #include <linux/types.h>
 
 struct acpi_ctx;
diff --git a/include/adc.h b/include/adc.h
index 5841dfb54b9f..6596059df85a 100644
--- a/include/adc.h
+++ b/include/adc.h
@@ -7,6 +7,8 @@
 #ifndef _ADC_H_
 #define _ADC_H_
 
+#include <stdbool.h>
+
 /* ADC_CHANNEL() - ADC channel bit mask, to select only required channels */
 #define ADC_CHANNEL(x)		(1 << x)
 
diff --git a/include/ahci.h b/include/ahci.h
index fb96dd886115..a6f32010ca28 100644
--- a/include/ahci.h
+++ b/include/ahci.h
@@ -7,6 +7,7 @@
 #ifndef _AHCI_H_
 #define _AHCI_H_
 
+#include <compiler.h>
 #include <pci.h>
 
 #define AHCI_PCI_BAR		0x24
diff --git a/include/asm-generic/gpio.h b/include/asm-generic/gpio.h
index a57dd2665cee..acbe791c84bf 100644
--- a/include/asm-generic/gpio.h
+++ b/include/asm-generic/gpio.h
@@ -7,6 +7,7 @@
 #ifndef _ASM_GENERIC_GPIO_H_
 #define _ASM_GENERIC_GPIO_H_
 
+#include <stdbool.h>
 #include <dm/ofnode.h>
 #include <linux/bitops.h>
 
diff --git a/include/atsha204a-i2c.h b/include/atsha204a-i2c.h
index 344fd8ace7d4..5c1ab65eef78 100644
--- a/include/atsha204a-i2c.h
+++ b/include/atsha204a-i2c.h
@@ -12,6 +12,7 @@
 #ifndef _ATSHA204_I2C_H_
 #define _ATSHA204_I2C_H_
 
+#include <stdbool.h>
 enum atsha204a_zone
 {
 	ATSHA204A_ZONE_CONFIG	= 0,
diff --git a/include/avb_verify.h b/include/avb_verify.h
index a8d7090f7944..8aebe75ac911 100644
--- a/include/avb_verify.h
+++ b/include/avb_verify.h
@@ -98,4 +98,5 @@ static inline int get_boot_device(AvbOps *ops)
 	return -1;
 }
 
+#include <stdbool.h>
 #endif /* _AVB_VERIFY_H */
diff --git a/include/bmp_layout.h b/include/bmp_layout.h
index a5c9498dc9fb..556f5db3c46b 100644
--- a/include/bmp_layout.h
+++ b/include/bmp_layout.h
@@ -10,6 +10,8 @@
 #ifndef _BMP_H_
 #define _BMP_H_
 
+#include <compiler.h>
+
 struct __packed bmp_color_table_entry {
 	__u8	blue;
 	__u8	green;
diff --git a/include/board.h b/include/board.h
index 755a888e3382..d9f7aafb49b3 100644
--- a/include/board.h
+++ b/include/board.h
@@ -4,6 +4,7 @@
  * Mario Six,  Guntermann & Drunck GmbH, mario.six at gdsys.cc
  */
 
+#include <stdbool.h>
 #include <linux/errno.h>
 struct udevice;
 
diff --git a/include/bootstage.h b/include/bootstage.h
index 00c85fb86aa2..670f785c89e2 100644
--- a/include/bootstage.h
+++ b/include/bootstage.h
@@ -11,6 +11,8 @@
 #ifndef _BOOTSTAGE_H
 #define _BOOTSTAGE_H
 
+#include <stdbool.h>
+
 /* Flags for each bootstage record */
 enum bootstage_flags {
 	BOOTSTAGEF_ERROR	= 1 << 0,	/* Error record */
diff --git a/include/cli.h b/include/cli.h
index 06355767f6dd..8a0b02cf1da6 100644
--- a/include/cli.h
+++ b/include/cli.h
@@ -7,6 +7,7 @@
 #ifndef __CLI_H
 #define __CLI_H
 
+#include <stdbool.h>
 #include <time.h>
 
 /**
diff --git a/include/clk.h b/include/clk.h
index a62e2efa2ca4..c28f67471464 100644
--- a/include/clk.h
+++ b/include/clk.h
@@ -8,6 +8,7 @@
 #ifndef _CLK_H_
 #define _CLK_H_
 
+#include <stdbool.h>
 #include <dm/ofnode.h>
 #include <linux/err.h>
 #include <linux/errno.h>
diff --git a/include/command.h b/include/command.h
index b9b5ec1afa04..bc7786dd4a4c 100644
--- a/include/command.h
+++ b/include/command.h
@@ -12,6 +12,8 @@
 
 #include <env.h>
 #include <linker_lists.h>
+#include <stdbool.h>
+#include <linux/kernel.h>
 
 #ifndef NULL
 #define NULL	0
diff --git a/include/common.h b/include/common.h
index 4fa613216ef2..868576038a76 100644
--- a/include/common.h
+++ b/include/common.h
@@ -15,7 +15,6 @@
 #ifndef __ASSEMBLY__		/* put C only stuff in this section */
 #include <config.h>
 #include <linux/types.h>
-#include <linux/kernel.h>
 #endif	/* __ASSEMBLY__ */
 
 /* Pull in stuff for the build system */
diff --git a/include/cpsw.h b/include/cpsw.h
index 786f8b385b75..9a237d9abe8e 100644
--- a/include/cpsw.h
+++ b/include/cpsw.h
@@ -16,6 +16,7 @@
 #ifndef _CPSW_H_
 #define _CPSW_H_
 
+#include <stdbool.h>
 #include <dm/ofnode.h>
 
 /* reg offset */
diff --git a/include/cros_ec.h b/include/cros_ec.h
index f4b9b7a5c26e..ceb3916ae894 100644
--- a/include/cros_ec.h
+++ b/include/cros_ec.h
@@ -13,6 +13,7 @@
 #include <cros_ec_message.h>
 #include <asm/gpio.h>
 #include <dm/of_extra.h>
+#include <linux/kernel.h>
 
 /* Our configuration information */
 struct cros_ec_dev {
diff --git a/include/crypto/pkcs7_parser.h b/include/crypto/pkcs7_parser.h
index 2c45cce52348..053ba7826a37 100644
--- a/include/crypto/pkcs7_parser.h
+++ b/include/crypto/pkcs7_parser.h
@@ -8,6 +8,7 @@
 #ifndef _PKCS7_PARSER_H
 #define _PKCS7_PARSER_H
 
+#include <stdbool.h>
 #include <linux/oid_registry.h>
 #include <crypto/pkcs7.h>
 #include <crypto/x509_parser.h>
diff --git a/include/crypto/public_key.h b/include/crypto/public_key.h
index 3ba90fcc3483..2ef675b57e07 100644
--- a/include/crypto/public_key.h
+++ b/include/crypto/public_key.h
@@ -11,6 +11,7 @@
 #define _LINUX_PUBLIC_KEY_H
 
 #ifdef __UBOOT__
+#include <stdbool.h>
 #include <linux/types.h>
 #else
 #include <linux/keyctl.h>
diff --git a/include/crypto/x509_parser.h b/include/crypto/x509_parser.h
index 4cbdc1d6612d..b793cbde735d 100644
--- a/include/crypto/x509_parser.h
+++ b/include/crypto/x509_parser.h
@@ -8,6 +8,7 @@
 #ifndef _X509_PARSER_H
 #define _X509_PARSER_H
 
+#include <stdbool.h>
 #include <linux/time.h>
 #include <crypto/public_key.h>
 #include <keys/asymmetric-type.h>
diff --git a/include/dfu.h b/include/dfu.h
index 475b2a254d6b..764b7757289b 100644
--- a/include/dfu.h
+++ b/include/dfu.h
@@ -11,6 +11,7 @@
 #define __DFU_ENTITY_H_
 
 #include <common.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <linux/errno.h>
 #include <linux/list.h>
diff --git a/include/display.h b/include/display.h
index 66294616ea29..2c8aca4e48bc 100644
--- a/include/display.h
+++ b/include/display.h
@@ -6,6 +6,8 @@
 #ifndef _DISPLAY_H
 #define _DISPLAY_H
 
+#include <stdbool.h>
+
 struct udevice;
 struct display_timing;
 
diff --git a/include/display_options.h b/include/display_options.h
index 990ea844ec23..002469551215 100644
--- a/include/display_options.h
+++ b/include/display_options.h
@@ -9,6 +9,8 @@
 #ifndef __DISPLAY_OPTIONS_H
 #define __DISPLAY_OPTIONS_H
 
+#include <stdbool.h>
+
 /**
  * print_size() - Print a size with a suffix
  *
diff --git a/include/div64.h b/include/div64.h
index 8b92d2b18347..823caf6bf2d7 100644
--- a/include/div64.h
+++ b/include/div64.h
@@ -20,6 +20,7 @@
  *       beware of side effects!
  */
 
+#include <stdbool.h>
 #include <linux/types.h>
 #include <linux/compiler.h>
 
diff --git a/include/dm/device-internal.h b/include/dm/device-internal.h
index c29134976aa0..07857cf1be75 100644
--- a/include/dm/device-internal.h
+++ b/include/dm/device-internal.h
@@ -10,6 +10,7 @@
 #ifndef _DM_DEVICE_INTERNAL_H
 #define _DM_DEVICE_INTERNAL_H
 
+#include <stdbool.h>
 #include <asm/global_data.h>
 #include <dm/ofnode.h>
 
diff --git a/include/dm/device.h b/include/dm/device.h
index 953706cf5256..90fb96599b25 100644
--- a/include/dm/device.h
+++ b/include/dm/device.h
@@ -10,6 +10,7 @@
 #ifndef _DM_DEVICE_H
 #define _DM_DEVICE_H
 
+#include <stdbool.h>
 #include <dm/ofnode.h>
 #include <dm/uclass-id.h>
 #include <fdtdec.h>
diff --git a/include/dm/devres.h b/include/dm/devres.h
index 17bb1ee8dad1..daeefd7ea3ea 100644
--- a/include/dm/devres.h
+++ b/include/dm/devres.h
@@ -12,6 +12,7 @@
 #define _DM_DEVRES_H
 
 #include <linux/compat.h>
+#include <linux/kernel.h>
 
 struct udevice;
 
diff --git a/include/dm/lists.h b/include/dm/lists.h
index 810e244d9ef3..85e9a5dd6950 100644
--- a/include/dm/lists.h
+++ b/include/dm/lists.h
@@ -9,6 +9,7 @@
 #ifndef _DM_LISTS_H_
 #define _DM_LISTS_H_
 
+#include <stdbool.h>
 #include <dm/ofnode.h>
 #include <dm/uclass-id.h>
 
diff --git a/include/dm/of.h b/include/dm/of.h
index a64822f7e91f..3d6e23a93408 100644
--- a/include/dm/of.h
+++ b/include/dm/of.h
@@ -7,6 +7,7 @@
 #ifndef _DM_OF_H
 #define _DM_OF_H
 
+#include <stdbool.h>
 #include <asm/u-boot.h>
 #include <asm/global_data.h>
 #include <linux/string.h>
diff --git a/include/dm/of_access.h b/include/dm/of_access.h
index f95a00d06550..6f01196b76ce 100644
--- a/include/dm/of_access.h
+++ b/include/dm/of_access.h
@@ -17,6 +17,7 @@
 #ifndef _DM_OF_ACCESS_H
 #define _DM_OF_ACCESS_H
 
+#include <stdbool.h>
 #include <dm/of.h>
 
 /**
diff --git a/include/dm/ofnode.h b/include/dm/ofnode.h
index 8df2facf9985..cc700d2b6584 100644
--- a/include/dm/ofnode.h
+++ b/include/dm/ofnode.h
@@ -9,6 +9,7 @@
 
 /* TODO(sjg at chromium.org): Drop fdtdec.h include */
 #include <fdtdec.h>
+#include <stdbool.h>
 #include <dm/of.h>
 
 /* Enable checks to protect against invalid calls */
diff --git a/include/dm/platform_data/serial_bcm283x_mu.h b/include/dm/platform_data/serial_bcm283x_mu.h
index 37f5174dbf2e..661988b37f16 100644
--- a/include/dm/platform_data/serial_bcm283x_mu.h
+++ b/include/dm/platform_data/serial_bcm283x_mu.h
@@ -14,6 +14,7 @@
  *
  * @base: Register base address
  */
+#include <stdbool.h>
 struct bcm283x_mu_serial_platdata {
 	unsigned long base;
 	unsigned int clock;
diff --git a/include/dm/platform_data/serial_mxc.h b/include/dm/platform_data/serial_mxc.h
index 86cd3bcf628d..b2c6c5b08cb4 100644
--- a/include/dm/platform_data/serial_mxc.h
+++ b/include/dm/platform_data/serial_mxc.h
@@ -7,6 +7,7 @@
 #define __serial_mxc_h
 
 /* Information about a serial port */
+#include <stdbool.h>
 struct mxc_serial_platdata {
 	struct mxc_uart *reg;  /* address of registers in physical memory */
 	bool use_dte;
diff --git a/include/dm/platform_data/serial_pl01x.h b/include/dm/platform_data/serial_pl01x.h
index 77d96c49f03a..1d30e02c3495 100644
--- a/include/dm/platform_data/serial_pl01x.h
+++ b/include/dm/platform_data/serial_pl01x.h
@@ -6,6 +6,7 @@
 #ifndef __serial_pl01x_h
 #define __serial_pl01x_h
 
+#include <stdbool.h>
 enum pl01x_type {
 	TYPE_PL010,
 	TYPE_PL011,
diff --git a/include/dm/read.h b/include/dm/read.h
index 487ec9e9c933..2d0312fc8c58 100644
--- a/include/dm/read.h
+++ b/include/dm/read.h
@@ -9,6 +9,7 @@
 #ifndef _DM_READ_H
 #define _DM_READ_H
 
+#include <stdbool.h>
 #include <linux/errno.h>
 
 #include <dm/device.h>
diff --git a/include/dm/root.h b/include/dm/root.h
index c8d629ba9bfb..f2c735556710 100644
--- a/include/dm/root.h
+++ b/include/dm/root.h
@@ -9,6 +9,7 @@
 #ifndef _DM_ROOT_H_
 #define _DM_ROOT_H_
 
+#include <stdbool.h>
 struct udevice;
 
 /**
diff --git a/include/dm/uclass-internal.h b/include/dm/uclass-internal.h
index 6e3f15c2b080..0583f1ab57f5 100644
--- a/include/dm/uclass-internal.h
+++ b/include/dm/uclass-internal.h
@@ -9,6 +9,7 @@
 #ifndef _DM_UCLASS_INTERNAL_H
 #define _DM_UCLASS_INTERNAL_H
 
+#include <stdbool.h>
 #include <dm/ofnode.h>
 
 /**
diff --git a/include/dw_hdmi.h b/include/dw_hdmi.h
index 8acae3839fb3..4c4024ef19fb 100644
--- a/include/dw_hdmi.h
+++ b/include/dw_hdmi.h
@@ -10,6 +10,7 @@
 #define _DW_HDMI_H
 
 #include <edid.h>
+#include <stdbool.h>
 
 #define HDMI_EDID_BLOCK_SIZE            128
 
diff --git a/include/dwmmc.h b/include/dwmmc.h
index d8a8355a0ada..46a9ca25bec2 100644
--- a/include/dwmmc.h
+++ b/include/dwmmc.h
@@ -7,6 +7,7 @@
 #ifndef __DWMMC_HW_H
 #define __DWMMC_HW_H
 
+#include <stdbool.h>
 #include <asm/cache.h>
 #include <asm/io.h>
 #include <mmc.h>
diff --git a/include/edid.h b/include/edid.h
index 2562733061c0..9a0612bf0727 100644
--- a/include/edid.h
+++ b/include/edid.h
@@ -12,6 +12,7 @@
 #ifndef __EDID_H_
 #define __EDID_H_
 
+#include <stdbool.h>
 #include <linux/types.h>
 
 /* Size of the EDID data */
diff --git a/include/efi.h b/include/efi.h
index 0c99e1707d0a..155dbc339cb5 100644
--- a/include/efi.h
+++ b/include/efi.h
@@ -17,6 +17,7 @@
 #define _EFI_H
 
 #include <stdarg.h>
+#include <stdbool.h>
 #include <vsprintf.h>
 #include <linux/linkage.h>
 #include <linux/string.h>
diff --git a/include/efi_api.h b/include/efi_api.h
index 5744f6aed86d..268d980b11fb 100644
--- a/include/efi_api.h
+++ b/include/efi_api.h
@@ -19,6 +19,7 @@
 #include <efi.h>
 #include <charset.h>
 #include <pe.h>
+#include <stdbool.h>
 
 #ifdef CONFIG_EFI_LOADER
 #include <asm/setjmp.h>
diff --git a/include/efi_selftest.h b/include/efi_selftest.h
index 1515fdaa02b0..25e5f56121ef 100644
--- a/include/efi_selftest.h
+++ b/include/efi_selftest.h
@@ -13,6 +13,7 @@
 #include <efi_api.h>
 #include <efi_loader.h>
 #include <linker_lists.h>
+#include <stdbool.h>
 
 #define EFI_ST_SUCCESS 0
 #define EFI_ST_FAILURE 1
diff --git a/include/efi_variable.h b/include/efi_variable.h
index 60491cb64025..454325396fab 100644
--- a/include/efi_variable.h
+++ b/include/efi_variable.h
@@ -6,6 +6,7 @@
 #ifndef _EFI_VARIABLE_H
 #define _EFI_VARIABLE_H
 
+#include <stdbool.h>
 #include <linux/bitops.h>
 
 #define EFI_VARIABLE_READ_ONLY BIT(31)
diff --git a/include/exception.h b/include/exception.h
index 7f4638e42523..53bde10a62b6 100644
--- a/include/exception.h
+++ b/include/exception.h
@@ -6,6 +6,7 @@
  */
 
 #include <command.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 static int do_exception(struct cmd_tbl *cmdtp, int flag, int argc,
diff --git a/include/fdtdec.h b/include/fdtdec.h
index 138c1e9b5908..258a171dc7e6 100644
--- a/include/fdtdec.h
+++ b/include/fdtdec.h
@@ -14,6 +14,7 @@
  * changes to support FDT are minimized.
  */
 
+#include <stdbool.h>
 #include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <pci.h>
diff --git a/include/fsl-mc/fsl_dpaa_fd.h b/include/fsl-mc/fsl_dpaa_fd.h
index 159756f71af0..5c092af15c8f 100644
--- a/include/fsl-mc/fsl_dpaa_fd.h
+++ b/include/fsl-mc/fsl_dpaa_fd.h
@@ -10,6 +10,7 @@
  * is impractical to define One True Struct, because the resulting encoding
  * routines (lots of read-modify-writes) would be worst-case performance whether
  * or not circumstances required them.) */
+#include <linux/kernel.h>
 struct dpaa_fd {
 	union {
 		u32 words[8];
diff --git a/include/fsl_ddr_sdram.h b/include/fsl_ddr_sdram.h
index 56c9db2594c0..1523e80d29f1 100644
--- a/include/fsl_ddr_sdram.h
+++ b/include/fsl_ddr_sdram.h
@@ -12,6 +12,7 @@
  */
 #include <ddr_spd.h>
 #include <fsl_ddrc_version.h>
+#include <stdbool.h>
 
 #define SDRAM_TYPE_DDR1		2
 #define SDRAM_TYPE_DDR2		3
diff --git a/include/fsl_errata.h b/include/fsl_errata.h
index 4d3ce3b1eb1c..ad3f299361f5 100644
--- a/include/fsl_errata.h
+++ b/include/fsl_errata.h
@@ -14,6 +14,7 @@
 #elif defined(CONFIG_FSL_LAYERSCAPE)
 #include <asm/arch/soc.h>
 #endif
+#include <stdbool.h>
 
 
 #ifdef CONFIG_SYS_FSL_ERRATUM_A006379
diff --git a/include/fsl_usb.h b/include/fsl_usb.h
index c0f076b06daf..5e3a935e9d8f 100644
--- a/include/fsl_usb.h
+++ b/include/fsl_usb.h
@@ -52,6 +52,7 @@ struct ccsr_usb_phy {
 #define CONFIG_SYS_FSL_USB_PLLPRG2_MFI_INTERNAL_CLK (6 << 16)
 #define CONFIG_SYS_FSL_USB_INTERNAL_SOC_CLK_EN (1 << 20)
 #endif
+#include <stdbool.h>
 #define CONFIG_SYS_FSL_USB_PLLPRG2_REF_DIV (1 << 4)
 #define CONFIG_SYS_FSL_USB_PLLPRG2_MFI (5 << 16)
 #define CONFIG_SYS_FSL_USB_PLLPRG2_PLL_EN (1 << 21)
diff --git a/include/g_dnl.h b/include/g_dnl.h
index 836ee602c8da..7f78438f1cea 100644
--- a/include/g_dnl.h
+++ b/include/g_dnl.h
@@ -7,6 +7,7 @@
 #ifndef __G_DOWNLOAD_H_
 #define __G_DOWNLOAD_H_
 
+#include <stdbool.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
 #include <linux/usb/composite.h>
diff --git a/include/generic-phy.h b/include/generic-phy.h
index 5ab34cda03d8..9312711a2b3c 100644
--- a/include/generic-phy.h
+++ b/include/generic-phy.h
@@ -7,6 +7,7 @@
 #ifndef __GENERIC_PHY_H
 #define __GENERIC_PHY_H
 
+#include <stdbool.h>
 #include <dm/ofnode.h>
 
 struct ofnode_phandle_args;
diff --git a/include/hexdump.h b/include/hexdump.h
index f7b76ff71213..12dd4ad0462c 100644
--- a/include/hexdump.h
+++ b/include/hexdump.h
@@ -7,6 +7,7 @@
 #ifndef HEXDUMP_H
 #define HEXDUMP_H
 
+#include <stdbool.h>
 #include <linux/ctype.h>
 #include <linux/types.h>
 
diff --git a/include/i2c.h b/include/i2c.h
index 7ea6b9a14cbc..b8ee77d98bce 100644
--- a/include/i2c.h
+++ b/include/i2c.h
@@ -17,6 +17,7 @@
 #define _I2C_H_
 
 #include <linker_lists.h>
+#include <stdbool.h>
 #include <stdio.h>
 
 /*
diff --git a/include/image-android-dt.h b/include/image-android-dt.h
index 9a3aa8fa30fb..0764eabcb4bb 100644
--- a/include/image-android-dt.h
+++ b/include/image-android-dt.h
@@ -7,6 +7,7 @@
 #ifndef IMAGE_ANDROID_DT_H
 #define IMAGE_ANDROID_DT_H
 
+#include <stdbool.h>
 #include <linux/types.h>
 
 bool android_dt_check_header(ulong hdr_addr);
diff --git a/include/image-sparse.h b/include/image-sparse.h
index 0572dbd0a283..42b28bb6146e 100644
--- a/include/image-sparse.h
+++ b/include/image-sparse.h
@@ -6,6 +6,7 @@
 #include <compiler.h>
 #include <part.h>
 #include <sparse_format.h>
+#include <linux/kernel.h>
 
 #define ROUNDUP(x, y)	(((x) + ((y) - 1)) & ~((y) - 1))
 
diff --git a/include/input.h b/include/input.h
index 3285a3ffa289..973d13f53b9c 100644
--- a/include/input.h
+++ b/include/input.h
@@ -8,6 +8,7 @@
 #ifndef _INPUT_H
 #define _INPUT_H
 
+#include <stdbool.h>
 enum {
 	INPUT_MAX_MODIFIERS	= 4,
 	INPUT_BUFFER_LEN	= 16,
diff --git a/include/irq.h b/include/irq.h
index 8527e4dd797b..150d7ce20c24 100644
--- a/include/irq.h
+++ b/include/irq.h
@@ -8,6 +8,7 @@
 #ifndef __irq_H
 #define __irq_H
 
+#include <stdbool.h>
 struct acpi_irq;
 struct ofnode_phandle_args;
 
diff --git a/include/kendryte/bypass.h b/include/kendryte/bypass.h
index ab85bbcbfca8..439eab81b3aa 100644
--- a/include/kendryte/bypass.h
+++ b/include/kendryte/bypass.h
@@ -5,6 +5,8 @@
 #ifndef K210_BYPASS_H
 #define K210_BYPASS_H
 
+#include <linux/kernel.h>
+
 struct clk;
 
 struct k210_bypass {
diff --git a/include/kendryte/pll.h b/include/kendryte/pll.h
index c8e3200799ee..083f388c1280 100644
--- a/include/kendryte/pll.h
+++ b/include/kendryte/pll.h
@@ -6,6 +6,7 @@
 #define K210_PLL_H
 
 #include <clk.h>
+#include <linux/kernel.h>
 #include <test/export.h>
 
 #define K210_PLL_CLKR GENMASK(3, 0)
diff --git a/include/keys/asymmetric-type.h b/include/keys/asymmetric-type.h
index 47d83917df2f..2e8b0224b83f 100644
--- a/include/keys/asymmetric-type.h
+++ b/include/keys/asymmetric-type.h
@@ -85,4 +85,5 @@ extern struct key *find_asymmetric_key(struct key *keyring,
  * The payload is at the discretion of the subtype.
  */
 
+#include <stdbool.h>
 #endif /* _KEYS_ASYMMETRIC_TYPE_H */
diff --git a/include/lcd.h b/include/lcd.h
index 9a4c0da5baca..08086008694b 100644
--- a/include/lcd.h
+++ b/include/lcd.h
@@ -11,6 +11,7 @@
 
 #ifndef _LCD_H_
 #define _LCD_H_
+#include <compiler.h>
 #include <lcd_console.h>
 #if defined(CONFIG_CMD_BMP) || defined(CONFIG_SPLASH_SCREEN)
 #include <bmp_layout.h>
diff --git a/include/linux/err.h b/include/linux/err.h
index 5ede82432d2d..3fc5a323e8f0 100644
--- a/include/linux/err.h
+++ b/include/linux/err.h
@@ -1,12 +1,12 @@
 #ifndef _LINUX_ERR_H
 #define _LINUX_ERR_H
 
+#include <stdbool.h>
 #include <linux/compiler.h>
 #include <linux/compat.h>
 
 #include <linux/errno.h>
 
-
 /*
  * Kernel pointers have redundant information, so we can use a
  * scheme where we can return either an error code or a dentry
diff --git a/include/linux/list.h b/include/linux/list.h
index f62afa092c63..d06f14166052 100644
--- a/include/linux/list.h
+++ b/include/linux/list.h
@@ -1,6 +1,7 @@
 #ifndef _LINUX_LIST_H
 #define _LINUX_LIST_H
 
+#include <linux/kernel.h>
 #include <linux/stddef.h>
 #include <linux/poison.h>
 
diff --git a/include/linux/log2.h b/include/linux/log2.h
index d4e32ecfc644..123bb99447fe 100644
--- a/include/linux/log2.h
+++ b/include/linux/log2.h
@@ -13,6 +13,7 @@
 #ifndef _LINUX_LOG2_H
 #define _LINUX_LOG2_H
 
+#include <stdbool.h>
 #include <linux/types.h>
 #include <linux/bitops.h>
 
diff --git a/include/linux/soc/ti/cppi5.h b/include/linux/soc/ti/cppi5.h
index 3a55c3ec46f5..7447881eb266 100644
--- a/include/linux/soc/ti/cppi5.h
+++ b/include/linux/soc/ti/cppi5.h
@@ -9,6 +9,7 @@
 #define __TI_CPPI5_H__
 
 #include <hexdump.h>
+#include <stdbool.h>
 #include <linux/bitops.h>
 #include <linux/bug.h>
 #include <linux/printk.h>
diff --git a/include/linux/soc/ti/ti_sci_protocol.h b/include/linux/soc/ti/ti_sci_protocol.h
index 0d02ca82aef7..1ae73240c80d 100644
--- a/include/linux/soc/ti/ti_sci_protocol.h
+++ b/include/linux/soc/ti/ti_sci_protocol.h
@@ -20,6 +20,7 @@
  * @firmware_revision:	Firmware revision (not usually used).
  * @firmware_description: Firmware description (not usually used).
  */
+#include <stdbool.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 struct ti_sci_version_info {
diff --git a/include/linux/types.h b/include/linux/types.h
index baa2c491ea5b..c9e582edd432 100644
--- a/include/linux/types.h
+++ b/include/linux/types.h
@@ -3,7 +3,6 @@
 
 #include <linux/posix_types.h>
 #include <asm/types.h>
-#include <stdbool.h>
 
 #ifndef __KERNEL_STRICT_NAMES
 
diff --git a/include/log.h b/include/log.h
index 2859ce1f2e72..2e64a8eab614 100644
--- a/include/log.h
+++ b/include/log.h
@@ -9,6 +9,7 @@
 #ifndef __LOG_H
 #define __LOG_H
 
+#include <stdbool.h>
 #include <stdio.h>
 #include <linker_lists.h>
 #include <dm/uclass-id.h>
diff --git a/include/memalign.h b/include/memalign.h
index 44f4a86241ab..cb0dcf39b41c 100644
--- a/include/memalign.h
+++ b/include/memalign.h
@@ -13,6 +13,7 @@
 #ifndef __ASSEMBLY__
 #include <asm/cache.h>
 #include <malloc.h>
+#include <linux/kernel.h>
 
 /*
  * The ALLOC_CACHE_ALIGN_BUFFER macro is used to allocate a buffer on the
diff --git a/include/membuff.h b/include/membuff.h
index c992067133b8..d05656ad963d 100644
--- a/include/membuff.h
+++ b/include/membuff.h
@@ -9,6 +9,8 @@
 #ifndef _MEMBUFF_H
 #define _MEMBUFF_H
 
+#include <stdbool.h>
+
 /**
  * @struct membuff: holds the state of a membuff - it is used for input and
  * output buffers. The buffer extends from @start to (@start + @size - 1).
diff --git a/include/mipi_dsi.h b/include/mipi_dsi.h
index 33eae9fb6d00..2abbbfa949b0 100644
--- a/include/mipi_dsi.h
+++ b/include/mipi_dsi.h
@@ -16,6 +16,7 @@
 #define MIPI_DSI_H
 
 #include <mipi_display.h>
+#include <stdbool.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 
diff --git a/include/misc.h b/include/misc.h
index 82ec2ce79368..b1c8d307d27d 100644
--- a/include/misc.h
+++ b/include/misc.h
@@ -6,6 +6,7 @@
 #ifndef _MISC_H_
 #define _MISC_H_
 
+#include <stdbool.h>
 struct udevice;
 
 /**
diff --git a/include/mmc.h b/include/mmc.h
index c1562a61ea5b..d319f46e355f 100644
--- a/include/mmc.h
+++ b/include/mmc.h
@@ -9,6 +9,7 @@
 #ifndef _MMC_H_
 #define _MMC_H_
 
+#include <stdbool.h>
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/list.h>
diff --git a/include/mvebu/comphy.h b/include/mvebu/comphy.h
index cde7a022af1c..4a007ccb0f53 100644
--- a/include/mvebu/comphy.h
+++ b/include/mvebu/comphy.h
@@ -6,6 +6,7 @@
 #ifndef _MVEBU_COMPHY_H_
 #define _MVEBU_COMPHY_H_
 
+#include <stdbool.h>
 #include <dt-bindings/comphy/comphy_data.h>
 
 struct comphy_map {
diff --git a/include/mxs_nand.h b/include/mxs_nand.h
index c0cefaca90b6..92af891c1871 100644
--- a/include/mxs_nand.h
+++ b/include/mxs_nand.h
@@ -7,6 +7,7 @@
  * Stefan Agner <stefan.agner@toradex.com>
  */
 
+#include <stdbool.h>
 #include <linux/mtd/mtd.h>
 #include <asm/cache.h>
 #include <nand.h>
diff --git a/include/net.h b/include/net.h
index bf6e2f052272..035dcb520ccc 100644
--- a/include/net.h
+++ b/include/net.h
@@ -12,6 +12,7 @@
 #ifndef __NET_H__
 #define __NET_H__
 
+#include <stdbool.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
 #include <linux/types.h>
diff --git a/include/net/ncsi.h b/include/net/ncsi.h
index 2800c842b72e..40563028c259 100644
--- a/include/net/ncsi.h
+++ b/include/net/ncsi.h
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <phy.h>
+#include <stdbool.h>
 
 bool ncsi_active(void);
 void ncsi_receive(struct ethernet_hdr *et, struct ip_udp_hdr *ip,
diff --git a/include/net/pcap.h b/include/net/pcap.h
index 512ba982f104..db9b2c4f69fb 100644
--- a/include/net/pcap.h
+++ b/include/net/pcap.h
@@ -12,6 +12,7 @@
  *
  * @return	0 on success, -ERROR on error
  */
+#include <stdbool.h>
 int pcap_init(phys_addr_t paddr, unsigned long size);
 
 /**
diff --git a/include/os.h b/include/os.h
index 1874ae674f2b..22ecb2adfb3a 100644
--- a/include/os.h
+++ b/include/os.h
@@ -11,6 +11,7 @@
 #ifndef __OS_H__
 #define __OS_H__
 
+#include <stdbool.h>
 #include <linux/types.h>
 
 struct rtc_time;
diff --git a/include/p2sb.h b/include/p2sb.h
index 93e1155dca6c..a0f34496dd76 100644
--- a/include/p2sb.h
+++ b/include/p2sb.h
@@ -8,6 +8,7 @@
 #define __p2sb_h
 
 /* Port Id lives in bits 23:16 and register offset lives in 15:0 of address */
+#include <stdbool.h>
 #define PCR_PORTID_SHIFT	16
 
 /**
diff --git a/include/pch.h b/include/pch.h
index 620566819ce3..aefd2b69f5c2 100644
--- a/include/pch.h
+++ b/include/pch.h
@@ -7,6 +7,7 @@
 #ifndef __pch_h
 #define __pch_h
 
+#include <stdbool.h>
 #include <linux/bitops.h>
 #define PCH_RCBA		0xf0
 
diff --git a/include/pci.h b/include/pci.h
index a98ac209eac8..34d97a23a895 100644
--- a/include/pci.h
+++ b/include/pci.h
@@ -10,6 +10,8 @@
 #ifndef _PCI_H
 #define _PCI_H
 
+#include <stdbool.h>
+
 #define PCI_CFG_SPACE_SIZE	256
 #define PCI_CFG_SPACE_EXP_SIZE	4096
 
diff --git a/include/phy-sun4i-usb.h b/include/phy-sun4i-usb.h
index b0a45b205803..33058b1662d8 100644
--- a/include/phy-sun4i-usb.h
+++ b/include/phy-sun4i-usb.h
@@ -13,6 +13,7 @@
  * @phy:	USB PHY port to detect ID pin
  * @return 0 if OK, or a negative error code
  */
+#include <stdbool.h>
 int sun4i_usb_phy_id_detect(struct phy *phy);
 
 /**
diff --git a/include/phy.h b/include/phy.h
index 1dbbf6511138..2ac49ea8dbbb 100644
--- a/include/phy.h
+++ b/include/phy.h
@@ -13,6 +13,7 @@
 #include <phy_interface.h>
 #include <dm/ofnode.h>
 #include <dm/read.h>
+#include <stdbool.h>
 #include <linux/errno.h>
 #include <linux/list.h>
 #include <linux/mii.h>
diff --git a/include/phy_interface.h b/include/phy_interface.h
index 841ade311efb..078c4ee16a0c 100644
--- a/include/phy_interface.h
+++ b/include/phy_interface.h
@@ -11,6 +11,8 @@
 #define _PHY_INTERFACE_H
 
 #include <string.h>
+#include <stdbool.h>
+#include <linux/kernel.h>
 
 typedef enum {
 	PHY_INTERFACE_MODE_MII,
diff --git a/include/power/acpi_pmc.h b/include/power/acpi_pmc.h
index 5fbf7451369e..2993edcdb54e 100644
--- a/include/power/acpi_pmc.h
+++ b/include/power/acpi_pmc.h
@@ -196,4 +196,5 @@ int pmc_gpe_init(struct udevice *dev);
 
 #endif /* !__ACPI__ */
 
+#include <stdbool.h>
 #endif
diff --git a/include/power/regulator.h b/include/power/regulator.h
index d9eb9cae2b79..6f5b8b058dfe 100644
--- a/include/power/regulator.h
+++ b/include/power/regulator.h
@@ -7,6 +7,7 @@
 #ifndef _INCLUDE_REGULATOR_H_
 #define _INCLUDE_REGULATOR_H_
 
+#include <stdbool.h>
 struct udevice;
 
 /**
diff --git a/include/pwm.h b/include/pwm.h
index f9959706ceb6..1791afec5513 100644
--- a/include/pwm.h
+++ b/include/pwm.h
@@ -10,6 +10,7 @@
 #ifndef _pwm_h_
 #define _pwm_h_
 
+#include <stdbool.h>
 struct udevice;
 
 /* struct pwm_ops: Operations for the PWM uclass */
diff --git a/include/pwrseq.h b/include/pwrseq.h
index fbf6376d24c3..ff208ad25e72 100644
--- a/include/pwrseq.h
+++ b/include/pwrseq.h
@@ -6,6 +6,7 @@
 #ifndef __pwrseq_h
 #define __pwrseq_h
 
+#include <stdbool.h>
 struct pwrseq_ops {
 	int (*set_power)(struct udevice *dev, bool enable);
 };
diff --git a/include/qfw.h b/include/qfw.h
index cea8e11d4431..cb56ea58192a 100644
--- a/include/qfw.h
+++ b/include/qfw.h
@@ -6,6 +6,7 @@
 #ifndef __FW_CFG__
 #define __FW_CFG__
 
+#include <stdbool.h>
 #include <linux/list.h>
 
 enum qemu_fwcfg_items {
diff --git a/include/remoteproc.h b/include/remoteproc.h
index 92de5604a800..c8c286e27f12 100644
--- a/include/remoteproc.h
+++ b/include/remoteproc.h
@@ -13,6 +13,7 @@
  * initialization *will* be eventually removed once all necessary
  * platforms have moved to dm/fdt.
  */
+#include <stdbool.h>
 #include <dm/platdata.h>	/* For platform data support - non dt world */
 #include <linux/errno.h>
 
diff --git a/include/reset.h b/include/reset.h
index 4fac4e6a202a..dcb7563488c1 100644
--- a/include/reset.h
+++ b/include/reset.h
@@ -6,6 +6,7 @@
 #ifndef _RESET_H
 #define _RESET_H
 
+#include <stdbool.h>
 #include <dm/ofnode.h>
 #include <linux/errno.h>
 
diff --git a/include/rtc.h b/include/rtc.h
index 1efc0db3de60..5033fde5ac89 100644
--- a/include/rtc.h
+++ b/include/rtc.h
@@ -13,6 +13,7 @@
 /* bcd<->bin functions are needed by almost all the RTC drivers, let's include
  * it there instead of in evey single driver */
 
+#include <stdbool.h>
 #include <bcd.h>
 #include <rtc_def.h>
 
diff --git a/include/samsung/exynos5-dt-types.h b/include/samsung/exynos5-dt-types.h
index 8fe08fe21183..791f9dca1962 100644
--- a/include/samsung/exynos5-dt-types.h
+++ b/include/samsung/exynos5-dt-types.h
@@ -1,6 +1,7 @@
 #ifndef _EXYNOS5_DT_H_
 #define _EXYNOS5_DT_H_
 
+#include <stdbool.h>
 enum {
 	EXYNOS5_BOARD_GENERIC,
 
diff --git a/include/scsi.h b/include/scsi.h
index 61619e89a7f5..1f427c61101f 100644
--- a/include/scsi.h
+++ b/include/scsi.h
@@ -6,6 +6,7 @@
  #ifndef _SCSI_H
  #define _SCSI_H
 
+#include <stdbool.h>
 #include <asm/cache.h>
 #include <linux/dma-direction.h>
 
diff --git a/include/sdhci.h b/include/sdhci.h
index 94fc3ed56ace..c47dda8dae3b 100644
--- a/include/sdhci.h
+++ b/include/sdhci.h
@@ -9,6 +9,7 @@
 #ifndef __SDHCI_HW_H
 #define __SDHCI_HW_H
 
+#include <stdbool.h>
 #include <linux/bitops.h>
 #include <linux/types.h>
 #include <asm/io.h>
diff --git a/include/serial.h b/include/serial.h
index 6d1e62c6770c..8ce32bc70ef6 100644
--- a/include/serial.h
+++ b/include/serial.h
@@ -1,6 +1,7 @@
 #ifndef __SERIAL_H__
 #define __SERIAL_H__
 
+#include <stdbool.h>
 #include <post.h>
 
 struct serial_device {
diff --git a/include/spi-mem.h b/include/spi-mem.h
index ca0f55c8fdf3..918e7a1659c6 100644
--- a/include/spi-mem.h
+++ b/include/spi-mem.h
@@ -13,6 +13,8 @@
 
 struct udevice;
 
+#include <stdbool.h>
+
 #define SPI_MEM_OP_CMD(__opcode, __buswidth)			\
 	{							\
 		.buswidth = __buswidth,				\
diff --git a/include/spi_flash.h b/include/spi_flash.h
index 2ee4dbb1322a..559e7e7852ca 100644
--- a/include/spi_flash.h
+++ b/include/spi_flash.h
@@ -9,6 +9,7 @@
 #ifndef _SPI_FLASH_H_
 #define _SPI_FLASH_H_
 
+#include <stdbool.h>
 #include <stdio.h>
 #include <linux/errno.h>
 #include <linux/string.h>
diff --git a/include/spl.h b/include/spl.h
index b72dfc7e3d49..7185cc344f04 100644
--- a/include/spl.h
+++ b/include/spl.h
@@ -601,4 +601,5 @@ void spl_perform_fixups(struct spl_image_info *spl_image);
 struct image_header *spl_get_load_buffer(ssize_t offset, size_t size);
 
 void spl_save_restore_data(void);
+#include <stdbool.h>
 #endif
diff --git a/include/stm32_rcc.h b/include/stm32_rcc.h
index a09a09ff9550..dc3039d11ac5 100644
--- a/include/stm32_rcc.h
+++ b/include/stm32_rcc.h
@@ -7,6 +7,7 @@
 #ifndef __STM32_RCC_H_
 #define __STM32_RCC_H_
 
+#include <stdbool.h>
 #define AHB_PSC_1			0
 #define AHB_PSC_2			0x8
 #define AHB_PSC_4			0x9
diff --git a/include/tee.h b/include/tee.h
index 99367b258e29..a73ec5a48c23 100644
--- a/include/tee.h
+++ b/include/tee.h
@@ -6,6 +6,7 @@
 #ifndef __TEE_H
 #define __TEE_H
 
+#include <stdbool.h>
 #include <linux/bitops.h>
 #include <linux/list.h>
 
diff --git a/include/test/ut.h b/include/test/ut.h
index 96456386d214..28c3f3fba750 100644
--- a/include/test/ut.h
+++ b/include/test/ut.h
@@ -11,6 +11,7 @@
 #include <command.h>
 #include <hexdump.h>
 #include <linux/err.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <test/test.h>
 
diff --git a/include/tlv_eeprom.h b/include/tlv_eeprom.h
index 99cefa61dfa5..f523d972d06e 100644
--- a/include/tlv_eeprom.h
+++ b/include/tlv_eeprom.h
@@ -8,6 +8,7 @@
 #define __TLV_EEPROM_H_
 
 #include <compiler.h>
+#include <stdbool.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 
diff --git a/include/usb.h b/include/usb.h
index fa9e09607e2c..89b219486c25 100644
--- a/include/usb.h
+++ b/include/usb.h
@@ -12,6 +12,7 @@
 #define _USB_H_
 
 #include <fdtdec.h>
+#include <stdbool.h>
 #include <usb_defs.h>
 #include <linux/usb/ch9.h>
 #include <asm/cache.h>
diff --git a/include/usb/dwc2_udc.h b/include/usb/dwc2_udc.h
index a2af381a6677..1d8c624d375f 100644
--- a/include/usb/dwc2_udc.h
+++ b/include/usb/dwc2_udc.h
@@ -8,6 +8,7 @@
 #ifndef __DWC2_USB_GADGET
 #define __DWC2_USB_GADGET
 
+#include <stdbool.h>
 #include <dm/ofnode.h>
 
 #define PHY0_SLEEP              (1 << 5)
diff --git a/include/usb/xhci.h b/include/usb/xhci.h
index 7d34103fd5ca..8d9c7917cb85 100644
--- a/include/usb/xhci.h
+++ b/include/usb/xhci.h
@@ -17,9 +17,11 @@
 #define HOST_XHCI_H_
 
 #include <reset.h>
+#include <stdbool.h>
 #include <asm/types.h>
 #include <asm/cache.h>
 #include <asm/io.h>
+#include <linux/kernel.h>
 #include <linux/list.h>
 #include <linux/compat.h>
 
diff --git a/include/usb_defs.h b/include/usb_defs.h
index 6dd2c997f9b3..e31ebc5c28c7 100644
--- a/include/usb_defs.h
+++ b/include/usb_defs.h
@@ -11,6 +11,7 @@
 /* USB constants */
 
 /* Device and/or Interface Class codes */
+#include <stdbool.h>
 #define USB_CLASS_PER_INTERFACE  0	/* for DeviceClass */
 #define USB_CLASS_AUDIO          1
 #define USB_CLASS_COMM           2
diff --git a/include/vbe.h b/include/vbe.h
index f420f493ee1b..6e71610b8a86 100644
--- a/include/vbe.h
+++ b/include/vbe.h
@@ -11,6 +11,7 @@
 #define _VBE_H
 
 /* these structs are for input from and output to OF */
+#include <stdbool.h>
 struct __packed vbe_screen_info {
 	u8 display_type;	/* 0=NONE, 1= analog, 2=digital */
 	u16 screen_width;
diff --git a/include/video.h b/include/video.h
index 1a0ffd80379b..03e342c64051 100644
--- a/include/video.h
+++ b/include/video.h
@@ -243,6 +243,7 @@ static inline int video_sync_copy(struct udevice *dev, void *from, void *to)
 }
 #endif
 
+#include <stdbool.h>
 #endif /* CONFIG_DM_VIDEO */
 
 #ifndef CONFIG_DM_VIDEO
diff --git a/include/video_bridge.h b/include/video_bridge.h
index 22e93dbb53b3..b47cae664597 100644
--- a/include/video_bridge.h
+++ b/include/video_bridge.h
@@ -7,6 +7,7 @@
 #ifndef __VIDEO_BRIDGE
 #define __VIDEO_BRIDGE
 
+#include <stdbool.h>
 #include <asm/gpio.h>
 
 /**
diff --git a/include/virtio.h b/include/virtio.h
index 6a2932e391fb..fb8528de283c 100644
--- a/include/virtio.h
+++ b/include/virtio.h
@@ -21,6 +21,7 @@
 #define __VIRTIO_H__
 
 #include <compiler.h>
+#include <stdbool.h>
 #include <linux/bitops.h>
 #include <linux/bug.h>
 #include <linux/typecheck.h>
diff --git a/include/virtio_ring.h b/include/virtio_ring.h
index 6fc0593b14b7..fff2d180d1b9 100644
--- a/include/virtio_ring.h
+++ b/include/virtio_ring.h
@@ -9,6 +9,7 @@
 #ifndef _LINUX_VIRTIO_RING_H
 #define _LINUX_VIRTIO_RING_H
 
+#include <stdbool.h>
 #include <virtio_types.h>
 
 /* This marks a buffer as continuing via the next field */
diff --git a/include/w1.h b/include/w1.h
index 77f439e587f7..a247e87dce15 100644
--- a/include/w1.h
+++ b/include/w1.h
@@ -10,6 +10,8 @@
 
 struct udevice;
 
+#include <stdbool.h>
+
 #define W1_FAMILY_DS24B33	0x23
 #define W1_FAMILY_DS2431	0x2d
 #define W1_FAMILY_DS2502	0x09
diff --git a/include/wait_bit.h b/include/wait_bit.h
index a9bf4d90a8f9..96a97bc327ef 100644
--- a/include/wait_bit.h
+++ b/include/wait_bit.h
@@ -10,6 +10,7 @@
 
 #include <console.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <watchdog.h>
diff --git a/include/xyzModem.h b/include/xyzModem.h
index a8911b6bf574..eb0be111c149 100644
--- a/include/xyzModem.h
+++ b/include/xyzModem.h
@@ -25,6 +25,7 @@
 #ifndef _XYZMODEM_H_
 #define _XYZMODEM_H_
 
+#include <stdbool.h>
 #include <linux/delay.h>
 
 #define xyzModem_xmodem 1
diff --git a/lib/acpi/acpi_device.c b/lib/acpi/acpi_device.c
index 9e31a69c20f9..b2cbf9093613 100644
--- a/lib/acpi/acpi_device.c
+++ b/lib/acpi/acpi_device.c
@@ -18,6 +18,7 @@
 #include <asm-generic/gpio.h>
 #include <dm/acpi.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 /**
diff --git a/lib/acpi/acpi_table.c b/lib/acpi/acpi_table.c
index 0f6cb8728cd8..f0b49c96e7f3 100644
--- a/lib/acpi/acpi_table.c
+++ b/lib/acpi/acpi_table.c
@@ -16,6 +16,7 @@
 #include <asm/global_data.h>
 #include <dm/acpi.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 int acpi_create_dmar(struct acpi_dmar *dmar, enum dmar_flags flags)
diff --git a/lib/acpi/acpigen.c b/lib/acpi/acpigen.c
index f119de2bca6d..3b04aa992e1a 100644
--- a/lib/acpi/acpigen.c
+++ b/lib/acpi/acpigen.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <stdbool.h>
 #include <uuid.h>
 #include <acpi/acpigen.h>
 #include <acpi/acpi_device.h>
diff --git a/lib/aes/aes-decrypt.c b/lib/aes/aes-decrypt.c
index 3b01d1c8cbb5..de67f0f32a7f 100644
--- a/lib/aes/aes-decrypt.c
+++ b/lib/aes/aes-decrypt.c
@@ -8,6 +8,7 @@
 #include <malloc.h>
 #include <stdio.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #endif
 #include <image.h>
diff --git a/lib/bch.c b/lib/bch.c
index 578f4191309c..0f68568c60bd 100644
--- a/lib/bch.c
+++ b/lib/bch.c
@@ -60,6 +60,7 @@
 #include <ubi_uboot.h>
 #include <dm/devres.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #include <linux/bitops.h>
diff --git a/lib/crypto/asymmetric_type.c b/lib/crypto/asymmetric_type.c
index 46d0dd468e5c..d0dd2529536d 100644
--- a/lib/crypto/asymmetric_type.c
+++ b/lib/crypto/asymmetric_type.c
@@ -19,6 +19,7 @@
 #include <linux/ctype.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #else
diff --git a/lib/display_options.c b/lib/display_options.c
index 826668505ca4..8dcbd75e9148 100644
--- a/lib/display_options.c
+++ b/lib/display_options.c
@@ -14,6 +14,7 @@
 #include <vsprintf.h>
 #include <linux/ctype.h>
 #include <asm/io.h>
+#include <linux/kernel.h>
 
 char *display_options_get_banner_priv(bool newlines, const char *build_tag,
 				      char *buf, int size)
diff --git a/lib/efi/efi_stub.c b/lib/efi/efi_stub.c
index ef8b80a46257..42b24139dbee 100644
--- a/lib/efi/efi_stub.c
+++ b/lib/efi/efi_stub.c
@@ -21,6 +21,7 @@
 #include <asm/io.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/types.h>
 
diff --git a/lib/efi_loader/efi_acpi.c b/lib/efi_loader/efi_acpi.c
index 585b2d2b6365..87a02d59b9c9 100644
--- a/lib/efi_loader/efi_acpi.c
+++ b/lib/efi_loader/efi_acpi.c
@@ -9,6 +9,7 @@
 #include <efi_loader.h>
 #include <log.h>
 #include <acpi/acpi_table.h>
+#include <linux/kernel.h>
 
 static const efi_guid_t acpi_guid = EFI_ACPI_TABLE_GUID;
 
diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c
index 063067c05c05..05b7cceb3e32 100644
--- a/lib/efi_loader/efi_boottime.c
+++ b/lib/efi_loader/efi_boottime.c
@@ -15,6 +15,7 @@
 #include <time.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
+#include <linux/kernel.h>
 #include <linux/libfdt_env.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
diff --git a/lib/efi_loader/efi_console.c b/lib/efi_loader/efi_console.c
index 088e3eacb829..ae0ee7ee9091 100644
--- a/lib/efi_loader/efi_console.c
+++ b/lib/efi_loader/efi_console.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <charset.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <dm/device.h>
diff --git a/lib/efi_loader/efi_device_path.c b/lib/efi_loader/efi_device_path.c
index d4820fa5f0b0..68e344ee3448 100644
--- a/lib/efi_loader/efi_device_path.c
+++ b/lib/efi_loader/efi_device_path.c
@@ -19,6 +19,7 @@
 #include <vsprintf.h>
 #include <asm-generic/unaligned.h>
 #include <linux/compat.h> /* U16_MAX */
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #ifdef CONFIG_SANDBOX
diff --git a/lib/efi_loader/efi_device_path_to_text.c b/lib/efi_loader/efi_device_path_to_text.c
index b0f213d72b97..b923ff348483 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 <stdbool.h>
 #include <vsprintf.h>
 #include <linux/string.h>
 
diff --git a/lib/efi_loader/efi_device_path_utilities.c b/lib/efi_loader/efi_device_path_utilities.c
index 94015329c8cb..405e87f3a01d 100644
--- a/lib/efi_loader/efi_device_path_utilities.c
+++ b/lib/efi_loader/efi_device_path_utilities.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <efi_loader.h>
+#include <stdbool.h>
 
 const efi_guid_t efi_guid_device_path_utilities_protocol =
 		EFI_DEVICE_PATH_UTILITIES_PROTOCOL_GUID;
diff --git a/lib/efi_loader/efi_disk.c b/lib/efi_loader/efi_disk.c
index ecbd14817ad3..43704826fb79 100644
--- a/lib/efi_loader/efi_disk.c
+++ b/lib/efi_loader/efi_disk.c
@@ -16,6 +16,7 @@
 #include <part.h>
 #include <malloc.h>
 #include <vsprintf.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 struct efi_system_partition efi_system_partition;
diff --git a/lib/efi_loader/efi_file.c b/lib/efi_loader/efi_file.c
index 0226e65ef54c..023a91a37086 100644
--- a/lib/efi_loader/efi_file.c
+++ b/lib/efi_loader/efi_file.c
@@ -14,6 +14,7 @@
 #include <fs.h>
 #include <part.h>
 #include <stdio.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 /* GUID for file system information */
diff --git a/lib/efi_loader/efi_gop.c b/lib/efi_loader/efi_gop.c
index 44ffed05c69f..42d985b25860 100644
--- a/lib/efi_loader/efi_gop.c
+++ b/lib/efi_loader/efi_gop.c
@@ -14,6 +14,7 @@
 #include <stdio.h>
 #include <video.h>
 #include <asm/global_data.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/lib/efi_loader/efi_hii.c b/lib/efi_loader/efi_hii.c
index 92ae7e44e0a4..05ad99260980 100644
--- a/lib/efi_loader/efi_hii.c
+++ b/lib/efi_loader/efi_hii.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <efi_loader.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <asm/unaligned.h>
 #include <linux/string.h>
 
diff --git a/lib/efi_loader/efi_image_loader.c b/lib/efi_loader/efi_image_loader.c
index ba9a4a3505fc..506a92ea727b 100644
--- a/lib/efi_loader/efi_image_loader.c
+++ b/lib/efi_loader/efi_image_loader.c
@@ -16,6 +16,7 @@
 #include <stdio.h>
 #include <crypto/pkcs7_parser.h>
 #include <linux/err.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 const efi_guid_t efi_global_variable_guid = EFI_GLOBAL_VARIABLE_GUID;
diff --git a/lib/efi_loader/efi_load_initrd.c b/lib/efi_loader/efi_load_initrd.c
index 800ff9fc41a6..372654172506 100644
--- a/lib/efi_loader/efi_load_initrd.c
+++ b/lib/efi_loader/efi_load_initrd.c
@@ -11,6 +11,7 @@
 #include <fs.h>
 #include <efi_loader.h>
 #include <efi_load_initrd.h>
+#include <stdbool.h>
 #include <linux/string.h>
 
 static const efi_guid_t efi_guid_load_file2_protocol =
diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c
index 169f239de8eb..60af4abd2df7 100644
--- a/lib/efi_loader/efi_memory.c
+++ b/lib/efi_loader/efi_memory.c
@@ -14,6 +14,7 @@
 #include <watchdog.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
+#include <linux/kernel.h>
 #include <linux/list_sort.h>
 #include <linux/sizes.h>
 
diff --git a/lib/efi_loader/efi_net.c b/lib/efi_loader/efi_net.c
index 51c1bd2f6065..5c29d00b451e 100644
--- a/lib/efi_loader/efi_net.c
+++ b/lib/efi_loader/efi_net.c
@@ -20,6 +20,7 @@
 #include <malloc.h>
 #include <net.h>
 #include <stdio.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 static const efi_guid_t efi_net_guid = EFI_SIMPLE_NETWORK_PROTOCOL_GUID;
diff --git a/lib/efi_loader/efi_runtime.c b/lib/efi_loader/efi_runtime.c
index 5b6ab297cbb7..93bbd2702349 100644
--- a/lib/efi_loader/efi_runtime.c
+++ b/lib/efi_loader/efi_runtime.c
@@ -16,6 +16,7 @@
 #include <rtc.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
 
diff --git a/lib/efi_loader/efi_signature.c b/lib/efi_loader/efi_signature.c
index 3d18edd04d79..ef652f394c54 100644
--- a/lib/efi_loader/efi_signature.c
+++ b/lib/efi_loader/efi_signature.c
@@ -11,6 +11,7 @@
 #include <hexdump.h>
 #include <malloc.h>
 #include <crypto/pkcs7.h>
+#include <stdbool.h>
 #include <crypto/pkcs7_parser.h>
 #include <crypto/public_key.h>
 #include <linux/compat.h>
diff --git a/lib/efi_loader/efi_smbios.c b/lib/efi_loader/efi_smbios.c
index 719d3e8880ab..b77ac76935a1 100644
--- a/lib/efi_loader/efi_smbios.c
+++ b/lib/efi_loader/efi_smbios.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <mapmem.h>
 #include <smbios.h>
+#include <linux/kernel.h>
 
 static const efi_guid_t smbios_guid = SMBIOS_TABLE_GUID;
 
diff --git a/lib/efi_loader/efi_unicode_collation.c b/lib/efi_loader/efi_unicode_collation.c
index e002ed6a3925..caa65f06d734 100644
--- a/lib/efi_loader/efi_unicode_collation.c
+++ b/lib/efi_loader/efi_unicode_collation.c
@@ -10,6 +10,7 @@
 #include <cp1250.h>
 #include <cp437.h>
 #include <efi_loader.h>
+#include <stdbool.h>
 #include <linux/string.h>
 
 /* Characters that may not be used in FAT 8.3 file names */
diff --git a/lib/efi_loader/efi_var_common.c b/lib/efi_loader/efi_var_common.c
index 36860e66e895..2da25766a4db 100644
--- a/lib/efi_loader/efi_var_common.c
+++ b/lib/efi_loader/efi_var_common.c
@@ -10,6 +10,7 @@
 #include <efi_loader.h>
 #include <efi_variable.h>
 #include <stdio.h>
+#include <linux/kernel.h>
 
 enum efi_secure_mode {
 	EFI_MODE_SETUP,
diff --git a/lib/efi_loader/efi_var_file.c b/lib/efi_loader/efi_var_file.c
index 4a668eab8429..09831b6af3bd 100644
--- a/lib/efi_loader/efi_var_file.c
+++ b/lib/efi_loader/efi_var_file.c
@@ -16,6 +16,7 @@
 #include <efi_loader.h>
 #include <efi_variable.h>
 #include <vsprintf.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
 
diff --git a/lib/efi_loader/efi_var_mem.c b/lib/efi_loader/efi_var_mem.c
index 33501ad0c061..020d43102b9e 100644
--- a/lib/efi_loader/efi_var_mem.c
+++ b/lib/efi_loader/efi_var_mem.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <efi_loader.h>
 #include <efi_variable.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
 
diff --git a/lib/efi_loader/efi_variable.c b/lib/efi_loader/efi_variable.c
index d613de2ebb34..c76431cc5493 100644
--- a/lib/efi_loader/efi_variable.c
+++ b/lib/efi_loader/efi_variable.c
@@ -17,6 +17,7 @@
 #include <malloc.h>
 #include <rtc.h>
 #include <search.h>
+#include <stdbool.h>
 #include <uuid.h>
 #include <crypto/pkcs7_parser.h>
 #include <linux/compat.h>
diff --git a/lib/efi_loader/efi_variable_tee.c b/lib/efi_loader/efi_variable_tee.c
index c1f88c28244f..783ed90404ad 100644
--- a/lib/efi_loader/efi_variable_tee.c
+++ b/lib/efi_loader/efi_variable_tee.c
@@ -11,6 +11,7 @@
 #include <efi_api.h>
 #include <efi_loader.h>
 #include <efi_variable.h>
+#include <stdbool.h>
 #include <tee.h>
 #include <malloc.h>
 #include <mm_communication.h>
diff --git a/lib/efi_selftest/efi_selftest_loaded_image.c b/lib/efi_selftest/efi_selftest_loaded_image.c
index 01f6dee2ea6e..f10c9348b900 100644
--- a/lib/efi_selftest/efi_selftest_loaded_image.c
+++ b/lib/efi_selftest/efi_selftest_loaded_image.c
@@ -8,6 +8,7 @@
  */
 
 #include <efi_selftest.h>
+#include <stdbool.h>
 #include <linux/string.h>
 
 static efi_guid_t loaded_image_protocol_guid =
diff --git a/lib/efi_selftest/efi_selftest_memory.c b/lib/efi_selftest/efi_selftest_memory.c
index 2efb6e42aa25..31ca3f3beb65 100644
--- a/lib/efi_selftest/efi_selftest_memory.c
+++ b/lib/efi_selftest/efi_selftest_memory.c
@@ -11,6 +11,7 @@
  */
 
 #include <efi_selftest.h>
+#include <stdbool.h>
 #include <linux/string.h>
 
 #define EFI_ST_NUM_PAGES 8
diff --git a/lib/efi_selftest/efi_selftest_set_virtual_address_map.c b/lib/efi_selftest/efi_selftest_set_virtual_address_map.c
index b9045fe1143b..6a22d99e834e 100644
--- a/lib/efi_selftest/efi_selftest_set_virtual_address_map.c
+++ b/lib/efi_selftest/efi_selftest_set_virtual_address_map.c
@@ -9,6 +9,7 @@
  */
 
 #include <efi_selftest.h>
+#include <stdbool.h>
 #include <linux/string.h>
 
 static const struct efi_boot_services *boottime;
diff --git a/lib/efi_selftest/efi_selftest_textinputex.c b/lib/efi_selftest/efi_selftest_textinputex.c
index de44224ce1c0..2b0b3cfd7221 100644
--- a/lib/efi_selftest/efi_selftest_textinputex.c
+++ b/lib/efi_selftest/efi_selftest_textinputex.c
@@ -13,6 +13,7 @@
  */
 
 #include <efi_selftest.h>
+#include <stdbool.h>
 
 static const efi_guid_t text_input_ex_protocol_guid =
 		EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL_GUID;
diff --git a/lib/efi_selftest/efi_selftest_unicode_collation.c b/lib/efi_selftest/efi_selftest_unicode_collation.c
index 75294307d9f4..b3f7c623e8b4 100644
--- a/lib/efi_selftest/efi_selftest_unicode_collation.c
+++ b/lib/efi_selftest/efi_selftest_unicode_collation.c
@@ -8,6 +8,7 @@
  */
 
 #include <efi_selftest.h>
+#include <stdbool.h>
 
 static const efi_guid_t unicode_collation_protocol_guid =
 	EFI_UNICODE_COLLATION_PROTOCOL2_GUID;
diff --git a/lib/efi_selftest/efi_selftest_watchdog.c b/lib/efi_selftest/efi_selftest_watchdog.c
index cbc6761721ce..666c0309be19 100644
--- a/lib/efi_selftest/efi_selftest_watchdog.c
+++ b/lib/efi_selftest/efi_selftest_watchdog.c
@@ -17,6 +17,7 @@
  */
 
 #include <efi_selftest.h>
+#include <stdbool.h>
 
 /*
  * This is the communication structure for the notification function.
diff --git a/lib/elf.c b/lib/elf.c
index 7b24ca685a49..623e46867cda 100644
--- a/lib/elf.c
+++ b/lib/elf.c
@@ -16,6 +16,7 @@
 #include <asm/e820.h>
 #include <linux/linkage.h>
 #endif
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 /*
diff --git a/lib/errno_str.c b/lib/errno_str.c
index d342ed70b603..fb6868f2ff18 100644
--- a/lib/errno_str.c
+++ b/lib/errno_str.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <errno.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 #define ERRNO_MSG(errno, msg)	msg
 #define SAME_AS(x)		(const char *)&errno_message[x]
diff --git a/lib/fdtdec.c b/lib/fdtdec.c
index 3ac889ba730e..ee8ae8d27640 100644
--- a/lib/fdtdec.c
+++ b/lib/fdtdec.c
@@ -24,6 +24,7 @@
 #include <gzip.h>
 #include <mapmem.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <serial.h>
 #include <asm/global_data.h>
diff --git a/lib/fdtdec_test.c b/lib/fdtdec_test.c
index 50e773260ef7..15c60ee08cf6 100644
--- a/lib/fdtdec_test.c
+++ b/lib/fdtdec_test.c
@@ -11,6 +11,7 @@
 #include <fdtdec.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <malloc.h>
 #include <os.h>
diff --git a/lib/hexdump.c b/lib/hexdump.c
index 285610562285..74940dd02494 100644
--- a/lib/hexdump.c
+++ b/lib/hexdump.c
@@ -14,6 +14,7 @@
 #include <vsprintf.h>
 #include <linux/ctype.h>
 #include <linux/compat.h>
+#include <linux/kernel.h>
 #include <linux/log2.h>
 #include <asm/unaligned.h>
 
diff --git a/lib/image-sparse.c b/lib/image-sparse.c
index 5f985a0aa5c2..24741b8d8eca 100644
--- a/lib/image-sparse.c
+++ b/lib/image-sparse.c
@@ -45,6 +45,7 @@
 #include <sparse_format.h>
 #include <stdio.h>
 #include <asm/cache.h>
+#include <linux/kernel.h>
 
 #include <linux/math64.h>
 
diff --git a/lib/libavb/avb_sysdeps.h b/lib/libavb/avb_sysdeps.h
index f52428cc622f..85ff8e1de3e8 100644
--- a/lib/libavb/avb_sysdeps.h
+++ b/lib/libavb/avb_sysdeps.h
@@ -20,6 +20,7 @@ extern "C" {
  * must be present.
  */
 #include <common.h>
+#include <stdbool.h>
 
 /* If you don't have gcc or clang, these attribute macros may need to
  * be adjusted.
diff --git a/lib/lmb.c b/lib/lmb.c
index 71665332689d..a9d10b7b26bf 100644
--- a/lib/lmb.c
+++ b/lib/lmb.c
@@ -13,6 +13,7 @@
 #include <malloc.h>
 #include <stdio.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 #define LMB_ALLOC_ANYWHERE	0
 
diff --git a/lib/lzma/LzmaTools.c b/lib/lzma/LzmaTools.c
index 521258e623f5..5ce03bbbb756 100644
--- a/lib/lzma/LzmaTools.c
+++ b/lib/lzma/LzmaTools.c
@@ -21,6 +21,7 @@
 #include <common.h>
 #include <log.h>
 #include <watchdog.h>
+#include <linux/kernel.h>
 
 #ifdef CONFIG_LZMA
 
diff --git a/lib/lzo/lzo1x_decompress.c b/lib/lzo/lzo1x_decompress.c
index 48800c91ccff..393f31566bd1 100644
--- a/lib/lzo/lzo1x_decompress.c
+++ b/lib/lzo/lzo1x_decompress.c
@@ -12,6 +12,8 @@
  */
 
 #include <common.h>
+#include <stdbool.h>
+#include <linux/kernel.h>
 #include <linux/lzo.h>
 #include <asm/byteorder.h>
 #include <asm/unaligned.h>
diff --git a/lib/membuff.c b/lib/membuff.c
index 6abac4114f96..94f6e25e8266 100644
--- a/lib/membuff.c
+++ b/lib/membuff.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "membuff.h"
 
diff --git a/lib/of_live.c b/lib/of_live.c
index fd83a6ba420f..208f6ada5717 100644
--- a/lib/of_live.c
+++ b/lib/of_live.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <log.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <of_live.h>
 #include <malloc.h>
diff --git a/lib/smbios.c b/lib/smbios.c
index 489a0d61ee27..73cd07b599e0 100644
--- a/lib/smbios.c
+++ b/lib/smbios.c
@@ -17,6 +17,7 @@
 #include <dm.h>
 #include <dm/uclass-internal.h>
 #endif
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 /**
diff --git a/lib/time.c b/lib/time.c
index 1a2a1166cf8a..733beb7dcc20 100644
--- a/lib/time.c
+++ b/lib/time.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <bootstage.h>
+#include <compiler.h>
 #include <dm.h>
 #include <errno.h>
 #include <init.h>
diff --git a/lib/tiny-printf.c b/lib/tiny-printf.c
index 60a0619aafc9..9e16f5350632 100644
--- a/lib/tiny-printf.c
+++ b/lib/tiny-printf.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <stdarg.h>
 #include <serial.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/ctype.h>
diff --git a/lib/tpm-v1.c b/lib/tpm-v1.c
index e7221dd8f2e9..c3f9dde9e865 100644
--- a/lib/tpm-v1.c
+++ b/lib/tpm-v1.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <log.h>
 #include <asm/unaligned.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <u-boot/sha1.h>
 #include <tpm-common.h>
diff --git a/lib/tpm-v2.c b/lib/tpm-v2.c
index 594ccb6c2348..d278acfb436e 100644
--- a/lib/tpm-v2.c
+++ b/lib/tpm-v2.c
@@ -9,6 +9,7 @@
 #include <tpm-common.h>
 #include <tpm-v2.h>
 #include <linux/bitops.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include "tpm-utils.h"
 
diff --git a/lib/trace.c b/lib/trace.c
index 8ab4258b35a9..8f666133caa0 100644
--- a/lib/trace.c
+++ b/lib/trace.c
@@ -13,6 +13,7 @@
 #include <asm/io.h>
 #include <asm/sections.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/lib/uuid.c b/lib/uuid.c
index 3a6cd7e87fda..3111318808ca 100644
--- a/lib/uuid.c
+++ b/lib/uuid.c
@@ -18,6 +18,7 @@
 #include <part_efi.h>
 #include <malloc.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 /*
diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index 7be3127c2a10..c8f663cf4da2 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -25,6 +25,7 @@
 #include <linux/ctype.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/types.h>
 #include <linux/string.h>
 
diff --git a/net/arp.c b/net/arp.c
index 2a4449489ff9..aaf5d3c27fd6 100644
--- a/net/arp.c
+++ b/net/arp.c
@@ -13,6 +13,7 @@
 #include <env.h>
 #include <log.h>
 #include <net.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <vsprintf.h>
diff --git a/net/bootp.c b/net/bootp.c
index 6e9f2fc57d15..6fde55fe8628 100644
--- a/net/bootp.c
+++ b/net/bootp.c
@@ -21,6 +21,7 @@
 #include <uuid.h>
 #include <vsprintf.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <net/tftp.h>
 #include "bootp.h"
diff --git a/net/eth-uclass.c b/net/eth-uclass.c
index a20b896170cd..05f35cdfb5fb 100644
--- a/net/eth-uclass.c
+++ b/net/eth-uclass.c
@@ -11,6 +11,7 @@
 #include <env.h>
 #include <log.h>
 #include <net.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
diff --git a/net/eth_legacy.c b/net/eth_legacy.c
index f2e906dfe8cf..46b318a971db 100644
--- a/net/eth_legacy.c
+++ b/net/eth_legacy.c
@@ -19,6 +19,7 @@
 #include <asm/u-boot.h>
 #include <linux/bug.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <net/pcap.h>
 #include "eth_internal.h"
diff --git a/net/fastboot.c b/net/fastboot.c
index 93b4863d476c..b6006ddd2a9d 100644
--- a/net/fastboot.c
+++ b/net/fastboot.c
@@ -9,6 +9,7 @@
 #include <net.h>
 #include <stdio.h>
 #include <time.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include <net/fastboot.h>
diff --git a/net/mdio-mux-uclass.c b/net/mdio-mux-uclass.c
index 1325484e0d99..5766c33ebbd4 100644
--- a/net/mdio-mux-uclass.c
+++ b/net/mdio-mux-uclass.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <log.h>
 #include <miiphy.h>
+#include <stdbool.h>
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
 #include <dm/lists.h>
diff --git a/net/net.c b/net/net.c
index c05117cf6b61..1a17cc7c7a29 100644
--- a/net/net.c
+++ b/net/net.c
@@ -97,6 +97,7 @@
 #include <image.h>
 #include <log.h>
 #include <net.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <vsprintf.h>
diff --git a/net/pcap.c b/net/pcap.c
index 907aa1cda095..4ddc55801d7f 100644
--- a/net/pcap.c
+++ b/net/pcap.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <net.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <linux/errno.h>
 #include <linux/string.h>
diff --git a/net/tftp.c b/net/tftp.c
index 5b600800a050..294ab1bbfe6c 100644
--- a/net/tftp.c
+++ b/net/tftp.c
@@ -19,6 +19,7 @@
 #include <time.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <net/tftp.h>
 #include "bootp.h"
diff --git a/post/drivers/memory.c b/post/drivers/memory.c
index 05dbfc144c84..e8cded75223f 100644
--- a/post/drivers/memory.c
+++ b/post/drivers/memory.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
+#include <linux/kernel.h>
 
 /* Memory test
  *
diff --git a/post/lib_powerpc/andi.c b/post/lib_powerpc/andi.c
index d4f60aa73880..cea61eb87a60 100644
--- a/post/lib_powerpc/andi.c
+++ b/post/lib_powerpc/andi.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <irq_func.h>
+#include <linux/kernel.h>
 
 /*
  * CPU test
diff --git a/post/lib_powerpc/cmp.c b/post/lib_powerpc/cmp.c
index e70869774ceb..bcfd18929914 100644
--- a/post/lib_powerpc/cmp.c
+++ b/post/lib_powerpc/cmp.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <irq_func.h>
+#include <linux/kernel.h>
 
 /*
  * CPU test
diff --git a/post/lib_powerpc/cmpi.c b/post/lib_powerpc/cmpi.c
index 85a9b0ad36b2..29a65895306e 100644
--- a/post/lib_powerpc/cmpi.c
+++ b/post/lib_powerpc/cmpi.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <irq_func.h>
+#include <linux/kernel.h>
 
 /*
  * CPU test
diff --git a/post/lib_powerpc/cr.c b/post/lib_powerpc/cr.c
index 56ed355dde71..1c1c1e3700bc 100644
--- a/post/lib_powerpc/cr.c
+++ b/post/lib_powerpc/cr.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <irq_func.h>
+#include <linux/kernel.h>
 
 /*
  * CPU test
diff --git a/post/lib_powerpc/fpu/mul-subnormal-single-1.c b/post/lib_powerpc/fpu/mul-subnormal-single-1.c
index cb61c9114d7b..2517a4f0af5d 100644
--- a/post/lib_powerpc/fpu/mul-subnormal-single-1.c
+++ b/post/lib_powerpc/fpu/mul-subnormal-single-1.c
@@ -10,6 +10,7 @@
  */
 
 #include <common.h>
+#include <linux/kernel.h>
 
 #include <post.h>
 
diff --git a/post/lib_powerpc/load.c b/post/lib_powerpc/load.c
index 5269563b1e17..19f88d07d7f0 100644
--- a/post/lib_powerpc/load.c
+++ b/post/lib_powerpc/load.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <irq_func.h>
+#include <linux/kernel.h>
 
 /*
  * CPU test
diff --git a/post/lib_powerpc/multi.c b/post/lib_powerpc/multi.c
index 31134a9f1b56..29c102d70ee6 100644
--- a/post/lib_powerpc/multi.c
+++ b/post/lib_powerpc/multi.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <irq_func.h>
 #include <log.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 /*
diff --git a/post/lib_powerpc/rlwimi.c b/post/lib_powerpc/rlwimi.c
index 7b4dc79fb17d..be63f960ed6c 100644
--- a/post/lib_powerpc/rlwimi.c
+++ b/post/lib_powerpc/rlwimi.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <irq_func.h>
+#include <linux/kernel.h>
 
 /*
  * CPU test
diff --git a/post/lib_powerpc/rlwinm.c b/post/lib_powerpc/rlwinm.c
index 8a03e9b9bcb6..13577f858e11 100644
--- a/post/lib_powerpc/rlwinm.c
+++ b/post/lib_powerpc/rlwinm.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <irq_func.h>
+#include <linux/kernel.h>
 
 /*
  * CPU test
diff --git a/post/lib_powerpc/rlwnm.c b/post/lib_powerpc/rlwnm.c
index e2beb4e41713..2a3525466c3f 100644
--- a/post/lib_powerpc/rlwnm.c
+++ b/post/lib_powerpc/rlwnm.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <irq_func.h>
+#include <linux/kernel.h>
 
 /*
  * CPU test
diff --git a/post/lib_powerpc/srawi.c b/post/lib_powerpc/srawi.c
index d4a8fabc4257..22a747b63ea8 100644
--- a/post/lib_powerpc/srawi.c
+++ b/post/lib_powerpc/srawi.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <irq_func.h>
+#include <linux/kernel.h>
 
 /*
  * CPU test
diff --git a/post/lib_powerpc/store.c b/post/lib_powerpc/store.c
index 8e278fee885a..a8bf67ea9e2b 100644
--- a/post/lib_powerpc/store.c
+++ b/post/lib_powerpc/store.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <irq_func.h>
+#include <linux/kernel.h>
 
 /*
  * CPU test
diff --git a/post/lib_powerpc/three.c b/post/lib_powerpc/three.c
index fc6f1f5674ad..a4f7262698c1 100644
--- a/post/lib_powerpc/three.c
+++ b/post/lib_powerpc/three.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <irq_func.h>
+#include <linux/kernel.h>
 
 /*
  * CPU test
diff --git a/post/lib_powerpc/threei.c b/post/lib_powerpc/threei.c
index f49c85e6b9da..74d6a3f29997 100644
--- a/post/lib_powerpc/threei.c
+++ b/post/lib_powerpc/threei.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <irq_func.h>
+#include <linux/kernel.h>
 
 /*
  * CPU test
diff --git a/post/lib_powerpc/threex.c b/post/lib_powerpc/threex.c
index 6bc5a54706b4..e8c6959bf90e 100644
--- a/post/lib_powerpc/threex.c
+++ b/post/lib_powerpc/threex.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <irq_func.h>
+#include <linux/kernel.h>
 
 /*
  * CPU test
diff --git a/post/lib_powerpc/two.c b/post/lib_powerpc/two.c
index fa376c76b1bb..a576452f6f25 100644
--- a/post/lib_powerpc/two.c
+++ b/post/lib_powerpc/two.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <irq_func.h>
+#include <linux/kernel.h>
 
 /*
  * CPU test
diff --git a/post/lib_powerpc/twox.c b/post/lib_powerpc/twox.c
index 5c36012a9b79..4e53fff27749 100644
--- a/post/lib_powerpc/twox.c
+++ b/post/lib_powerpc/twox.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <irq_func.h>
+#include <linux/kernel.h>
 
 /*
  * CPU test
diff --git a/post/post.c b/post/post.c
index dee7ff1ce142..758e4ecba199 100644
--- a/post/post.c
+++ b/post/post.c
@@ -18,6 +18,7 @@
 #include <div64.h>
 #include <post.h>
 #include <asm/global_data.h>
+#include <linux/kernel.h>
 #include <linux/string.h>
 
 #ifdef CONFIG_SYS_POST_HOTKEYS_GPIO
diff --git a/post/tests.c b/post/tests.c
index 5c019b643df9..3b9af1cdc543 100644
--- a/post/tests.c
+++ b/post/tests.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <linux/kernel.h>
 
 #include <post.h>
 
diff --git a/test/bloblist.c b/test/bloblist.c
index 19b8f65b81b9..fed3e60d2111 100644
--- a/test/bloblist.c
+++ b/test/bloblist.c
@@ -9,6 +9,7 @@
 #include <mapmem.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <test/suites.h>
 #include <test/test.h>
 #include <test/ut.h>
diff --git a/test/cmd_ut.c b/test/cmd_ut.c
index b49c2e9a1f00..73a499c289f7 100644
--- a/test/cmd_ut.c
+++ b/test/cmd_ut.c
@@ -8,6 +8,7 @@
 #include <command.h>
 #include <console.h>
 #include <stdio.h>
+#include <linux/kernel.h>
 #include <test/suites.h>
 #include <test/test.h>
 
diff --git a/test/dm/acpi.c b/test/dm/acpi.c
index 003b0f4ca979..cb6bbd7719d7 100644
--- a/test/dm/acpi.c
+++ b/test/dm/acpi.c
@@ -21,6 +21,7 @@
 #include <dm/acpi.h>
 #include <dm/test.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <test/ut.h>
 #include "acpi.h"
 
diff --git a/test/dm/acpi_dp.c b/test/dm/acpi_dp.c
index ce96441faa5a..2c2dd20bf9c6 100644
--- a/test/dm/acpi_dp.c
+++ b/test/dm/acpi_dp.c
@@ -15,6 +15,7 @@
 #include <dm/acpi.h>
 #include <dm/test.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <test/ut.h>
 #include "acpi.h"
 
diff --git a/test/dm/acpigen.c b/test/dm/acpigen.c
index 51c846081f90..1aa614fedc3d 100644
--- a/test/dm/acpigen.c
+++ b/test/dm/acpigen.c
@@ -19,6 +19,7 @@
 #include <dm/test.h>
 #include <dm/uclass-internal.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <test/ut.h>
 #include "acpi.h"
 
diff --git a/test/dm/axi.c b/test/dm/axi.c
index dc029df5e443..998c1a5b83eb 100644
--- a/test/dm/axi.c
+++ b/test/dm/axi.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <asm/axi.h>
 #include <dm/test.h>
+#include <linux/kernel.h>
 #include <test/test.h>
 #include <test/ut.h>
 
diff --git a/test/dm/board.c b/test/dm/board.c
index f3e7f63f258c..59291ab8f83b 100644
--- a/test/dm/board.c
+++ b/test/dm/board.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <stdbool.h>
 #include <dm/test.h>
 #include <board.h>
 #include <test/test.h>
diff --git a/test/dm/core.c b/test/dm/core.c
index 7f45bc506ea4..f70263202841 100644
--- a/test/dm/core.c
+++ b/test/dm/core.c
@@ -20,6 +20,7 @@
 #include <dm/uclass-internal.h>
 #include <test/test.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <test/ut.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/test/dm/gpio.c b/test/dm/gpio.c
index 8abf8c7964ed..13df4745402a 100644
--- a/test/dm/gpio.c
+++ b/test/dm/gpio.c
@@ -15,6 +15,7 @@
 #include <dm/util.h>
 #include <test/test.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <test/ut.h>
 
 /* Test that sandbox GPIOs work correctly */
diff --git a/test/dm/i2s.c b/test/dm/i2s.c
index c2bf4d5604b9..f3ba00aaef56 100644
--- a/test/dm/i2s.c
+++ b/test/dm/i2s.c
@@ -9,6 +9,7 @@
 #include <i2s.h>
 #include <asm/test.h>
 #include <dm/test.h>
+#include <linux/kernel.h>
 #include <test/test.h>
 #include <test/ut.h>
 
diff --git a/test/dm/k210_pll.c b/test/dm/k210_pll.c
index 94740ce09261..076dc770b87e 100644
--- a/test/dm/k210_pll.c
+++ b/test/dm/k210_pll.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 /* For DIV_ROUND_DOWN_ULL, defined in linux/kernel.h */
 #include <div64.h>
 #include <dm/test.h>
diff --git a/test/dm/misc.c b/test/dm/misc.c
index 1506fdefe324..7b0d3e983244 100644
--- a/test/dm/misc.c
+++ b/test/dm/misc.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <stdbool.h>
 #include <dm/test.h>
 #include <misc.h>
 #include <test/test.h>
diff --git a/test/dm/panel.c b/test/dm/panel.c
index a840fb4951df..7504fd5f5c8a 100644
--- a/test/dm/panel.c
+++ b/test/dm/panel.c
@@ -10,6 +10,7 @@
 #include <backlight.h>
 #include <dm.h>
 #include <panel.h>
+#include <stdbool.h>
 #include <video.h>
 #include <asm/gpio.h>
 #include <asm/test.h>
diff --git a/test/dm/regulator.c b/test/dm/regulator.c
index f713fb8c34fd..5c025541d7aa 100644
--- a/test/dm/regulator.c
+++ b/test/dm/regulator.c
@@ -18,6 +18,7 @@
 #include <dm/test.h>
 #include <dm/uclass-internal.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/sandbox_pmic.h>
diff --git a/test/dm/remoteproc.c b/test/dm/remoteproc.c
index d45deec0a0ed..9d22a2d1edbc 100644
--- a/test/dm/remoteproc.c
+++ b/test/dm/remoteproc.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <dm/test.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <test/test.h>
 #include <test/ut.h>
 
diff --git a/test/dm/rtc.c b/test/dm/rtc.c
index 69f712752359..e4f2354af82c 100644
--- a/test/dm/rtc.c
+++ b/test/dm/rtc.c
@@ -10,6 +10,7 @@
 #include <i2c.h>
 #include <log.h>
 #include <rtc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/io.h>
 #include <asm/rtc.h>
diff --git a/test/dm/test-main.c b/test/dm/test-main.c
index 2bc27c8b9c48..8eac2190940a 100644
--- a/test/dm/test-main.c
+++ b/test/dm/test-main.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/state.h>
diff --git a/test/lib/test_aes.c b/test/lib/test_aes.c
index d287aedbdd10..2ba300e4a544 100644
--- a/test/lib/test_aes.c
+++ b/test/lib/test_aes.c
@@ -11,6 +11,7 @@
 #include <rand.h>
 #include <stdio.h>
 #include <uboot_aes.h>
+#include <linux/kernel.h>
 #include <test/lib.h>
 #include <test/test.h>
 #include <test/ut.h>
diff --git a/test/optee/cmd_ut_optee.c b/test/optee/cmd_ut_optee.c
index 9153d7159188..7ad13a930a21 100644
--- a/test/optee/cmd_ut_optee.c
+++ b/test/optee/cmd_ut_optee.c
@@ -9,6 +9,7 @@
 #include <fdt_support.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <linux/errno.h>
 #include <tee/optee.h>
 
diff --git a/test/str_ut.c b/test/str_ut.c
index ef1205dbbd0f..990f356227cd 100644
--- a/test/str_ut.c
+++ b/test/str_ut.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <vsprintf.h>
+#include <linux/kernel.h>
 #include <test/suites.h>
 #include <test/test.h>
 #include <test/ut.h>
diff --git a/test/time_ut.c b/test/time_ut.c
index 1670c5d2184b..456186e08e90 100644
--- a/test/time_ut.c
+++ b/test/time_ut.c
@@ -11,6 +11,7 @@
 #include <time.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 static int test_get_timer(void)
 {
diff --git a/test/unicode_ut.c b/test/unicode_ut.c
index ace35c18a428..cfea5a9798ad 100644
--- a/test/unicode_ut.c
+++ b/test/unicode_ut.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <vsprintf.h>
+#include <linux/kernel.h>
 #include <test/test.h>
 #include <test/suites.h>
 #include <test/ut.h>
-- 
2.17.1

^ permalink raw reply related	[flat|nested] 35+ messages in thread

* [RFCv2 13/16] common: Drop linux/types.h from common header
  2020-08-19 13:08 ` [RFCv2] common: Drop remaining includes in common.h Tom Rini
                     ` (11 preceding siblings ...)
  2020-08-19 13:09   ` [RFCv2 12/16] common: Drop linux/kernel.h " Tom Rini
@ 2020-08-19 13:09   ` Tom Rini
  2020-08-19 13:09   ` [RFCv2 14/16] common: Move the build-system includes to a separate file Tom Rini
                     ` (3 subsequent siblings)
  16 siblings, 0 replies; 35+ messages in thread
From: Tom Rini @ 2020-08-19 13:09 UTC (permalink / raw)
  To: u-boot

From: Simon Glass <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_display.c                                             | 1 +
 api/api_private.h                                             | 1 +
 api/api_storage.c                                             | 1 +
 arch/arc/include/asm/sections.h                               | 1 +
 arch/arc/include/asm/u-boot-arc.h                             | 1 +
 arch/arc/lib/bootm.c                                          | 2 ++
 arch/arc/lib/cache.c                                          | 1 +
 arch/arc/lib/cpu.c                                            | 1 +
 arch/arc/lib/relocate.c                                       | 1 +
 arch/arc/lib/reset.c                                          | 2 ++
 arch/arm/cpu/arm1136/mx31/generic.c                           | 1 +
 arch/arm/cpu/arm1136/mx35/generic.c                           | 1 +
 arch/arm/cpu/arm720t/interrupts.c                             | 1 +
 arch/arm/cpu/arm920t/ep93xx/cpu.c                             | 1 +
 arch/arm/cpu/arm920t/ep93xx/led.c                             | 1 +
 arch/arm/cpu/arm920t/ep93xx/speed.c                           | 1 +
 arch/arm/cpu/arm926ejs/armada100/cpu.c                        | 1 +
 arch/arm/cpu/arm926ejs/armada100/dram.c                       | 1 +
 arch/arm/cpu/arm926ejs/armada100/timer.c                      | 1 +
 arch/arm/cpu/arm926ejs/cache.c                                | 1 +
 arch/arm/cpu/arm926ejs/mx25/generic.c                         | 1 +
 arch/arm/cpu/arm926ejs/mx25/reset.c                           | 1 +
 arch/arm/cpu/arm926ejs/mx27/generic.c                         | 1 +
 arch/arm/cpu/arm926ejs/mx27/reset.c                           | 1 +
 arch/arm/cpu/arm926ejs/mx27/timer.c                           | 1 +
 arch/arm/cpu/arm926ejs/mxs/clock.c                            | 1 +
 arch/arm/cpu/arm926ejs/mxs/iomux.c                            | 1 +
 arch/arm/cpu/arm926ejs/mxs/mxs.c                              | 2 ++
 arch/arm/cpu/arm926ejs/mxs/mxs_init.h                         | 1 +
 arch/arm/cpu/arm926ejs/mxs/spl_boot.c                         | 1 +
 arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c                     | 2 ++
 arch/arm/cpu/arm926ejs/mxs/spl_power_init.c                   | 2 ++
 arch/arm/cpu/arm926ejs/mxs/timer.c                            | 1 +
 arch/arm/cpu/arm926ejs/spear/cpu.c                            | 1 +
 arch/arm/cpu/arm926ejs/spear/reset.c                          | 1 +
 arch/arm/cpu/arm926ejs/spear/spear600.c                       | 1 +
 arch/arm/cpu/arm926ejs/spear/spl.c                            | 1 +
 .../cpu/arm926ejs/spear/spr600_mt47h128m8_3_266_cl5_async.c   | 1 +
 .../arm/cpu/arm926ejs/spear/spr600_mt47h32m16_333_cl5_psync.c | 1 +
 .../cpu/arm926ejs/spear/spr600_mt47h32m16_37e_166_cl4_sync.c  | 1 +
 .../cpu/arm926ejs/spear/spr600_mt47h64m16_3_333_cl5_psync.c   | 1 +
 arch/arm/cpu/arm926ejs/spear/spr_misc.c                       | 1 +
 arch/arm/cpu/arm926ejs/spear/timer.c                          | 1 +
 arch/arm/cpu/arm946es/cpu.c                                   | 1 +
 arch/arm/cpu/armv7/arch_timer.c                               | 1 +
 arch/arm/cpu/armv7/bcm235xx/clk-bsc.c                         | 1 +
 arch/arm/cpu/armv7/bcm235xx/clk-core.c                        | 2 ++
 arch/arm/cpu/armv7/bcm235xx/clk-core.h                        | 1 +
 arch/arm/cpu/armv7/bcm235xx/clk-sdio.c                        | 1 +
 arch/arm/cpu/armv7/bcm235xx/clk-usb-otg.c                     | 1 +
 arch/arm/cpu/armv7/bcm281xx/clk-bsc.c                         | 1 +
 arch/arm/cpu/armv7/bcm281xx/clk-core.c                        | 2 ++
 arch/arm/cpu/armv7/bcm281xx/clk-core.h                        | 1 +
 arch/arm/cpu/armv7/bcm281xx/clk-sdio.c                        | 1 +
 arch/arm/cpu/armv7/bcm281xx/clk-usb-otg.c                     | 1 +
 arch/arm/cpu/armv7/bcm281xx/reset.c                           | 1 +
 arch/arm/cpu/armv7/bcmcygnus/reset.c                          | 1 +
 arch/arm/cpu/armv7/bcmnsp/reset.c                             | 1 +
 arch/arm/cpu/armv7/cache_v7.c                                 | 1 +
 arch/arm/cpu/armv7/cp15.c                                     | 2 ++
 arch/arm/cpu/armv7/cpu.c                                      | 1 +
 arch/arm/cpu/armv7/exception_level.c                          | 1 +
 arch/arm/cpu/armv7/iproc-common/armpll.c                      | 1 +
 arch/arm/cpu/armv7/iproc-common/timer.c                       | 1 +
 arch/arm/cpu/armv7/kona-common/clk-stubs.c                    | 1 +
 arch/arm/cpu/armv7/ls102xa/clock.c                            | 2 ++
 arch/arm/cpu/armv7/ls102xa/cpu.c                              | 2 ++
 arch/arm/cpu/armv7/ls102xa/fdt.c                              | 2 ++
 arch/arm/cpu/armv7/ls102xa/fsl_epu.c                          | 1 +
 arch/arm/cpu/armv7/ls102xa/fsl_ls1_serdes.c                   | 2 ++
 arch/arm/cpu/armv7/ls102xa/fsl_ls1_serdes.h                   | 1 +
 arch/arm/cpu/armv7/ls102xa/ls102xa_psci.c                     | 2 ++
 arch/arm/cpu/armv7/ls102xa/ls102xa_serdes.c                   | 1 +
 arch/arm/cpu/armv7/ls102xa/soc.c                              | 2 ++
 arch/arm/cpu/armv7/ls102xa/spl.c                              | 1 +
 arch/arm/cpu/armv7/ls102xa/timer.c                            | 1 +
 arch/arm/cpu/armv7/mpu_v7r.c                                  | 1 +
 arch/arm/cpu/armv7/psci-common.c                              | 1 +
 arch/arm/cpu/armv7/s5p-common/cpu_info.c                      | 1 +
 arch/arm/cpu/armv7/s5p-common/pwm.c                           | 1 +
 arch/arm/cpu/armv7/s5p-common/sromc.c                         | 1 +
 arch/arm/cpu/armv7/s5p-common/timer.c                         | 1 +
 arch/arm/cpu/armv7/s5p4418/cpu.c                              | 1 +
 arch/arm/cpu/armv7/stv0991/reset.c                            | 1 +
 arch/arm/cpu/armv7/stv0991/timer.c                            | 1 +
 arch/arm/cpu/armv7/sunxi/psci.c                               | 1 +
 arch/arm/cpu/armv7/sunxi/timer.c                              | 1 +
 arch/arm/cpu/armv7/syslib.c                                   | 1 +
 arch/arm/cpu/armv7/vf610/generic.c                            | 2 ++
 arch/arm/cpu/armv7/vf610/timer.c                              | 1 +
 arch/arm/cpu/armv7/virt-v7.c                                  | 2 ++
 arch/arm/cpu/armv7m/cache.c                                   | 1 +
 arch/arm/cpu/armv7m/cpu.c                                     | 1 +
 arch/arm/cpu/armv7m/mpu.c                                     | 1 +
 arch/arm/cpu/armv7m/systick-timer.c                           | 1 +
 arch/arm/cpu/armv8/cache_v8.c                                 | 3 +++
 arch/arm/cpu/armv8/cpu.c                                      | 2 ++
 arch/arm/cpu/armv8/exception_level.c                          | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/cpu.c                       | 2 ++
 arch/arm/cpu/armv8/fsl-layerscape/cpu.h                       | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/fdt.c                       | 2 ++
 arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_serdes.c          | 2 ++
 arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c           | 2 ++
 arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c          | 2 ++
 arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c           | 2 ++
 arch/arm/cpu/armv8/fsl-layerscape/icid.c                      | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/ls1012a_serdes.c            | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/ls1028_ids.c                | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/ls1028a_serdes.c            | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/ls1043a_serdes.c            | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/ls1046a_serdes.c            | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/ls1088a_serdes.c            | 3 +++
 arch/arm/cpu/armv8/fsl-layerscape/ls2080a_serdes.c            | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/lx2160a_serdes.c            | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/mp.c                        | 2 ++
 arch/arm/cpu/armv8/fsl-layerscape/ppa.c                       | 2 ++
 arch/arm/cpu/armv8/fsl-layerscape/soc.c                       | 2 ++
 arch/arm/cpu/armv8/fsl-layerscape/spl.c                       | 2 ++
 arch/arm/cpu/armv8/fwcall.c                                   | 1 +
 arch/arm/cpu/armv8/generic_timer.c                            | 1 +
 arch/arm/cpu/armv8/hisilicon/pinmux.c                         | 1 +
 arch/arm/cpu/armv8/s32v234/cpu.c                              | 1 +
 arch/arm/cpu/armv8/s32v234/cpu.h                              | 1 +
 arch/arm/cpu/armv8/s32v234/generic.c                          | 1 +
 arch/arm/cpu/armv8/sec_firmware.c                             | 3 +++
 arch/arm/cpu/armv8/spl_data.c                                 | 1 +
 arch/arm/cpu/pxa/cache.c                                      | 1 +
 arch/arm/cpu/pxa/cpuinfo.c                                    | 1 +
 arch/arm/cpu/pxa/pxa2xx.c                                     | 1 +
 arch/arm/cpu/sa1100/cpu.c                                     | 1 +
 arch/arm/cpu/sa1100/timer.c                                   | 1 +
 arch/arm/include/asm/arch-am33xx/clk_synthesizer.h            | 1 +
 arch/arm/include/asm/arch-am33xx/clock.h                      | 1 +
 arch/arm/include/asm/arch-am33xx/ddr_defs.h                   | 1 +
 arch/arm/include/asm/arch-am33xx/sys_proto.h                  | 1 +
 arch/arm/include/asm/arch-armada100/cpu.h                     | 1 +
 arch/arm/include/asm/arch-armada100/spi.h                     | 1 +
 arch/arm/include/asm/arch-armada100/utmi-armada100.h          | 1 +
 arch/arm/include/asm/arch-armv7/globaltimer.h                 | 1 +
 arch/arm/include/asm/arch-armv7/sysctrl.h                     | 1 +
 arch/arm/include/asm/arch-armv7/systimer.h                    | 1 +
 arch/arm/include/asm/arch-armv7/wdt.h                         | 1 +
 arch/arm/include/asm/arch-aspeed/scu_ast2500.h                | 1 +
 arch/arm/include/asm/arch-aspeed/sdram_ast2500.h              | 1 +
 arch/arm/include/asm/arch-aspeed/timer.h                      | 1 +
 arch/arm/include/asm/arch-aspeed/wdt.h                        | 1 +
 arch/arm/include/asm/arch-ep93xx/ep93xx.h                     | 1 +
 arch/arm/include/asm/arch-fsl-layerscape/clock.h              | 1 +
 arch/arm/include/asm/arch-fsl-layerscape/cpu.h                | 1 +
 arch/arm/include/asm/arch-fsl-layerscape/fsl_portals.h        | 1 +
 arch/arm/include/asm/arch-fsl-layerscape/fsl_serdes.h         | 1 +
 arch/arm/include/asm/arch-fsl-layerscape/gpio.h               | 1 +
 arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h        | 1 +
 arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h        | 1 +
 arch/arm/include/asm/arch-fsl-layerscape/mp.h                 | 1 +
 arch/arm/include/asm/arch-hi6220/dwmmc.h                      | 1 +
 arch/arm/include/asm/arch-hi6220/gpio.h                       | 1 +
 arch/arm/include/asm/arch-hi6220/hi6220_regs_alwayson.h       | 1 +
 arch/arm/include/asm/arch-hi6220/pinmux.h                     | 1 +
 arch/arm/include/asm/arch-imx/cpu.h                           | 1 +
 arch/arm/include/asm/arch-imx8/clock.h                        | 1 +
 arch/arm/include/asm/arch-imx8/gpio.h                         | 1 +
 arch/arm/include/asm/arch-imx8/image.h                        | 1 +
 arch/arm/include/asm/arch-imx8/iomux.h                        | 1 +
 arch/arm/include/asm/arch-imx8/sci/rpc.h                      | 1 +
 arch/arm/include/asm/arch-imx8/sci/sci.h                      | 1 +
 arch/arm/include/asm/arch-imx8/sci/svc/misc/api.h             | 1 +
 arch/arm/include/asm/arch-imx8/sci/svc/pm/api.h               | 1 +
 arch/arm/include/asm/arch-imx8/sci/svc/rm/api.h               | 1 +
 arch/arm/include/asm/arch-imx8/sci/svc/seco/api.h             | 1 +
 arch/arm/include/asm/arch-imx8m/clock.h                       | 1 +
 arch/arm/include/asm/arch-imx8m/clock_imx8mm.h                | 1 +
 arch/arm/include/asm/arch-imx8m/ddr.h                         | 1 +
 arch/arm/include/asm/arch-imxrt/gpio.h                        | 1 +
 arch/arm/include/asm/arch-lpc32xx/dma.h                       | 1 +
 arch/arm/include/asm/arch-lpc32xx/gpio.h                      | 1 +
 arch/arm/include/asm/arch-lpc32xx/i2c.h                       | 1 +
 arch/arm/include/asm/arch-lpc32xx/mux.h                       | 1 +
 arch/arm/include/asm/arch-ls102xa/clock.h                     | 1 +
 arch/arm/include/asm/arch-ls102xa/fsl_serdes.h                | 1 +
 arch/arm/include/asm/arch-ls102xa/immap_ls102xa.h             | 1 +
 arch/arm/include/asm/arch-ls102xa/ls102xa_stream_id.h         | 1 +
 arch/arm/include/asm/arch-mediatek/reset.h                    | 2 ++
 arch/arm/include/asm/arch-meson/clock-gx.h                    | 1 +
 arch/arm/include/asm/arch-meson/sm.h                          | 1 +
 arch/arm/include/asm/arch-mvebu/spi.h                         | 1 +
 arch/arm/include/asm/arch-mx27/gpio.h                         | 1 +
 arch/arm/include/asm/arch-mx27/imx-regs.h                     | 1 +
 arch/arm/include/asm/arch-mx27/regs-rtc.h                     | 1 +
 arch/arm/include/asm/arch-mx31/clock.h                        | 1 +
 arch/arm/include/asm/arch-mx31/sys_proto.h                    | 1 +
 arch/arm/include/asm/arch-mx35/clock.h                        | 1 +
 arch/arm/include/asm/arch-mx35/sys_proto.h                    | 1 +
 arch/arm/include/asm/arch-mx5/clock.h                         | 1 +
 arch/arm/include/asm/arch-mx5/crm_regs.h                      | 1 +
 arch/arm/include/asm/arch-mx6/crm_regs.h                      | 1 +
 arch/arm/include/asm/arch-mx6/mx6-ddr.h                       | 1 +
 arch/arm/include/asm/arch-mx6/mxc_hdmi.h                      | 1 +
 arch/arm/include/asm/arch-mx6/sys_proto.h                     | 1 +
 arch/arm/include/asm/arch-mx7/clock.h                         | 1 +
 arch/arm/include/asm/arch-mx7/clock_slice.h                   | 1 +
 arch/arm/include/asm/arch-mx7/crm_regs.h                      | 1 +
 arch/arm/include/asm/arch-mx7/imx-regs.h                      | 1 +
 arch/arm/include/asm/arch-mx7/mx7-ddr.h                       | 1 +
 arch/arm/include/asm/arch-mx7ulp/clock.h                      | 1 +
 arch/arm/include/asm/arch-mx7ulp/gpio.h                       | 1 +
 arch/arm/include/asm/arch-mx7ulp/pcc.h                        | 1 +
 arch/arm/include/asm/arch-mx7ulp/scg.h                        | 1 +
 arch/arm/include/asm/arch-mxs/clock.h                         | 1 +
 arch/arm/include/asm/arch-mxs/regs-clkctrl-mx23.h             | 1 +
 arch/arm/include/asm/arch-mxs/regs-clkctrl-mx28.h             | 1 +
 arch/arm/include/asm/arch-mxs/regs-digctl.h                   | 1 +
 arch/arm/include/asm/arch-mxs/regs-pinctrl.h                  | 1 +
 arch/arm/include/asm/arch-mxs/regs-power-mx23.h               | 1 +
 arch/arm/include/asm/arch-mxs/regs-power-mx28.h               | 1 +
 arch/arm/include/asm/arch-mxs/regs-ssp.h                      | 1 +
 arch/arm/include/asm/arch-mxs/regs-usb.h                      | 1 +
 arch/arm/include/asm/arch-mxs/sys_proto.h                     | 1 +
 arch/arm/include/asm/arch-omap3/dma.h                         | 1 +
 arch/arm/include/asm/arch-omap3/dss.h                         | 1 +
 arch/arm/include/asm/arch-omap3/mem.h                         | 1 +
 arch/arm/include/asm/arch-omap3/musb.h                        | 1 +
 arch/arm/include/asm/arch-omap3/sys_proto.h                   | 1 +
 arch/arm/include/asm/arch-omap4/clock.h                       | 1 +
 arch/arm/include/asm/arch-omap4/sys_proto.h                   | 1 +
 arch/arm/include/asm/arch-omap5/dra7xx_iodelay.h              | 1 +
 arch/arm/include/asm/arch-omap5/sys_proto.h                   | 1 +
 arch/arm/include/asm/arch-pxa/pxa.h                           | 1 +
 arch/arm/include/asm/arch-pxa/regs-mmc.h                      | 1 +
 arch/arm/include/asm/arch-pxa/regs-uart.h                     | 1 +
 arch/arm/include/asm/arch-pxa/regs-usb.h                      | 1 +
 arch/arm/include/asm/arch-rk3308/cru_rk3308.h                 | 1 +
 arch/arm/include/asm/arch-rockchip/bootrom.h                  | 1 +
 arch/arm/include/asm/arch-rockchip/clock.h                    | 2 ++
 arch/arm/include/asm/arch-rockchip/cpu_rk3288.h               | 1 +
 arch/arm/include/asm/arch-rockchip/cru_px30.h                 | 1 +
 arch/arm/include/asm/arch-rockchip/cru_rk3036.h               | 1 +
 arch/arm/include/asm/arch-rockchip/cru_rk3128.h               | 1 +
 arch/arm/include/asm/arch-rockchip/cru_rk3188.h               | 1 +
 arch/arm/include/asm/arch-rockchip/cru_rk322x.h               | 1 +
 arch/arm/include/asm/arch-rockchip/cru_rk3288.h               | 1 +
 arch/arm/include/asm/arch-rockchip/cru_rk3328.h               | 1 +
 arch/arm/include/asm/arch-rockchip/cru_rk3399.h               | 1 +
 arch/arm/include/asm/arch-rockchip/cru_rv1108.h               | 1 +
 arch/arm/include/asm/arch-rockchip/ddr_rk3188.h               | 1 +
 arch/arm/include/asm/arch-rockchip/ddr_rk3288.h               | 1 +
 arch/arm/include/asm/arch-rockchip/ddr_rk3368.h               | 1 +
 arch/arm/include/asm/arch-rockchip/edp_rk3288.h               | 1 +
 arch/arm/include/asm/arch-rockchip/f_rockusb.h                | 1 +
 arch/arm/include/asm/arch-rockchip/gpio.h                     | 1 +
 arch/arm/include/asm/arch-rockchip/grf_rk3188.h               | 1 +
 arch/arm/include/asm/arch-rockchip/grf_rk3288.h               | 1 +
 arch/arm/include/asm/arch-rockchip/grf_rk3328.h               | 1 +
 arch/arm/include/asm/arch-rockchip/grf_rk3368.h               | 1 +
 arch/arm/include/asm/arch-rockchip/grf_rk3399.h               | 1 +
 arch/arm/include/asm/arch-rockchip/grf_rv1108.h               | 1 +
 arch/arm/include/asm/arch-rockchip/i2c.h                      | 1 +
 arch/arm/include/asm/arch-rockchip/misc.h                     | 1 +
 arch/arm/include/asm/arch-rockchip/pmu_rk3188.h               | 1 +
 arch/arm/include/asm/arch-rockchip/pmu_rk3288.h               | 1 +
 arch/arm/include/asm/arch-rockchip/pmu_rk3399.h               | 1 +
 arch/arm/include/asm/arch-rockchip/sdram.h                    | 1 +
 arch/arm/include/asm/arch-rockchip/sdram_common.h             | 1 +
 arch/arm/include/asm/arch-rockchip/sdram_msch.h               | 1 +
 arch/arm/include/asm/arch-rockchip/sdram_pctl_px30.h          | 2 ++
 arch/arm/include/asm/arch-rockchip/sdram_phy_px30.h           | 2 ++
 arch/arm/include/asm/arch-rockchip/sdram_px30.h               | 1 +
 arch/arm/include/asm/arch-rockchip/sdram_rk3036.h             | 1 +
 arch/arm/include/asm/arch-rockchip/sdram_rk322x.h             | 1 +
 arch/arm/include/asm/arch-rockchip/sdram_rk3288.h             | 1 +
 arch/arm/include/asm/arch-rockchip/sdram_rk3328.h             | 1 +
 arch/arm/include/asm/arch-rockchip/sdram_rk3399.h             | 1 +
 arch/arm/include/asm/arch-rockchip/timer.h                    | 1 +
 arch/arm/include/asm/arch-rockchip/vop_rk3288.h               | 1 +
 arch/arm/include/asm/arch-s32v234/lpddr2.h                    | 1 +
 arch/arm/include/asm/arch-spear/gpio.h                        | 1 +
 arch/arm/include/asm/arch-spear/spr_defs.h                    | 1 +
 arch/arm/include/asm/arch-spear/spr_emi.h                     | 1 +
 arch/arm/include/asm/arch-spear/spr_gpt.h                     | 1 +
 arch/arm/include/asm/arch-spear/spr_misc.h                    | 1 +
 arch/arm/include/asm/arch-spear/spr_ssp.h                     | 1 +
 arch/arm/include/asm/arch-spear/spr_syscntl.h                 | 1 +
 arch/arm/include/asm/arch-stm32/gpio.h                        | 1 +
 arch/arm/include/asm/arch-stm32f4/stm32.h                     | 1 +
 arch/arm/include/asm/arch-stm32f4/stm32_pwr.h                 | 1 +
 arch/arm/include/asm/arch-stm32f7/stm32.h                     | 1 +
 arch/arm/include/asm/arch-stm32f7/stm32_pwr.h                 | 1 +
 arch/arm/include/asm/arch-stm32f7/syscfg.h                    | 1 +
 arch/arm/include/asm/arch-stv0991/gpio.h                      | 1 +
 arch/arm/include/asm/arch-stv0991/stv0991_cgu.h               | 1 +
 arch/arm/include/asm/arch-stv0991/stv0991_creg.h              | 1 +
 arch/arm/include/asm/arch-stv0991/stv0991_gpt.h               | 1 +
 arch/arm/include/asm/arch-stv0991/stv0991_wdru.h              | 1 +
 arch/arm/include/asm/arch-sunxi/ccu.h                         | 1 +
 arch/arm/include/asm/arch-sunxi/clock_sun4i.h                 | 1 +
 arch/arm/include/asm/arch-sunxi/clock_sun50i_h6.h             | 1 +
 arch/arm/include/asm/arch-sunxi/clock_sun6i.h                 | 1 +
 arch/arm/include/asm/arch-sunxi/clock_sun8i_a83t.h            | 1 +
 arch/arm/include/asm/arch-sunxi/clock_sun9i.h                 | 1 +
 arch/arm/include/asm/arch-sunxi/cpucfg.h                      | 1 +
 arch/arm/include/asm/arch-sunxi/display.h                     | 1 +
 arch/arm/include/asm/arch-sunxi/display2.h                    | 1 +
 arch/arm/include/asm/arch-sunxi/dma_sun4i.h                   | 1 +
 arch/arm/include/asm/arch-sunxi/dram_sun4i.h                  | 1 +
 arch/arm/include/asm/arch-sunxi/dram_sun50i_h6.h              | 1 +
 arch/arm/include/asm/arch-sunxi/dram_sun6i.h                  | 1 +
 arch/arm/include/asm/arch-sunxi/dram_sun8i_a23.h              | 1 +
 arch/arm/include/asm/arch-sunxi/dram_sun8i_a33.h              | 1 +
 arch/arm/include/asm/arch-sunxi/dram_sun8i_a83t.h             | 1 +
 arch/arm/include/asm/arch-sunxi/dram_sun9i.h                  | 1 +
 arch/arm/include/asm/arch-sunxi/dram_sunxi_dw.h               | 1 +
 arch/arm/include/asm/arch-sunxi/lcdc.h                        | 1 +
 arch/arm/include/asm/arch-sunxi/prcm.h                        | 1 +
 arch/arm/include/asm/arch-sunxi/pwm.h                         | 1 +
 arch/arm/include/asm/arch-sunxi/rsb.h                         | 1 +
 arch/arm/include/asm/arch-sunxi/spl.h                         | 1 +
 arch/arm/include/asm/arch-sunxi/tve.h                         | 1 +
 arch/arm/include/asm/arch-sunxi/tzpc.h                        | 1 +
 arch/arm/include/asm/arch-sunxi/watchdog.h                    | 1 +
 arch/arm/include/asm/arch-tegra/apb_misc.h                    | 1 +
 arch/arm/include/asm/arch-tegra/bpmp_abi.h                    | 1 +
 arch/arm/include/asm/arch-tegra/cboot.h                       | 1 +
 arch/arm/include/asm/arch-tegra/clk_rst.h                     | 1 +
 arch/arm/include/asm/arch-tegra/clock.h                       | 1 +
 arch/arm/include/asm/arch-tegra/dc.h                          | 1 +
 arch/arm/include/asm/arch-tegra/fuse.h                        | 1 +
 arch/arm/include/asm/arch-tegra/gpio.h                        | 1 +
 arch/arm/include/asm/arch-tegra/ivc.h                         | 1 +
 arch/arm/include/asm/arch-tegra/pmc.h                         | 1 +
 arch/arm/include/asm/arch-tegra/pwm.h                         | 1 +
 arch/arm/include/asm/arch-tegra/scu.h                         | 1 +
 arch/arm/include/asm/arch-tegra/tegra_ahub.h                  | 1 +
 arch/arm/include/asm/arch-tegra/tegra_i2s.h                   | 1 +
 arch/arm/include/asm/arch-tegra/uart.h                        | 1 +
 arch/arm/include/asm/arch-tegra/usb.h                         | 1 +
 arch/arm/include/asm/arch-tegra/warmboot.h                    | 1 +
 arch/arm/include/asm/arch-tegra114/flow.h                     | 1 +
 arch/arm/include/asm/arch-tegra114/gp_padctrl.h               | 1 +
 arch/arm/include/asm/arch-tegra114/mc.h                       | 1 +
 arch/arm/include/asm/arch-tegra114/sysctr.h                   | 1 +
 arch/arm/include/asm/arch-tegra124/ahb.h                      | 1 +
 arch/arm/include/asm/arch-tegra124/clock.h                    | 1 +
 arch/arm/include/asm/arch-tegra124/flow.h                     | 1 +
 arch/arm/include/asm/arch-tegra124/gp_padctrl.h               | 1 +
 arch/arm/include/asm/arch-tegra124/gpio.h                     | 1 +
 arch/arm/include/asm/arch-tegra124/mc.h                       | 1 +
 arch/arm/include/asm/arch-tegra124/sysctr.h                   | 1 +
 arch/arm/include/asm/arch-tegra20/display.h                   | 1 +
 arch/arm/include/asm/arch-tegra20/flow.h                      | 1 +
 arch/arm/include/asm/arch-tegra20/gp_padctrl.h                | 1 +
 arch/arm/include/asm/arch-tegra20/gpio.h                      | 1 +
 arch/arm/include/asm/arch-tegra20/mc.h                        | 1 +
 arch/arm/include/asm/arch-tegra20/sdram_param.h               | 1 +
 arch/arm/include/asm/arch-tegra210/ahb.h                      | 1 +
 arch/arm/include/asm/arch-tegra210/flow.h                     | 1 +
 arch/arm/include/asm/arch-tegra210/gp_padctrl.h               | 1 +
 arch/arm/include/asm/arch-tegra210/gpio.h                     | 1 +
 arch/arm/include/asm/arch-tegra210/mc.h                       | 1 +
 arch/arm/include/asm/arch-tegra210/sysctr.h                   | 1 +
 arch/arm/include/asm/arch-tegra30/flow.h                      | 1 +
 arch/arm/include/asm/arch-tegra30/gp_padctrl.h                | 1 +
 arch/arm/include/asm/arch-tegra30/gpio.h                      | 1 +
 arch/arm/include/asm/arch-tegra30/mc.h                        | 1 +
 arch/arm/include/asm/arch-vf610/clock.h                       | 1 +
 arch/arm/include/asm/arch-vf610/ddrmc-vf610.h                 | 1 +
 arch/arm/include/asm/arch-vf610/gpio.h                        | 1 +
 arch/arm/include/asm/armv7_mpu.h                              | 1 +
 arch/arm/include/asm/armv7m.h                                 | 1 +
 arch/arm/include/asm/armv8/mmu.h                              | 2 ++
 arch/arm/include/asm/armv8/sec_firmware.h                     | 1 +
 arch/arm/include/asm/bootm.h                                  | 1 +
 arch/arm/include/asm/ehci-omap.h                              | 1 +
 arch/arm/include/asm/handoff.h                                | 1 +
 arch/arm/include/asm/io.h                                     | 1 +
 arch/arm/include/asm/iproc-common/iproc_sdhci.h               | 1 +
 arch/arm/include/asm/kona-common/kona_sdhci.h                 | 1 +
 arch/arm/include/asm/mach-imx/dma.h                           | 1 +
 arch/arm/include/asm/mach-imx/gpio.h                          | 1 +
 arch/arm/include/asm/mach-imx/hab.h                           | 1 +
 arch/arm/include/asm/mach-imx/imx-nandbcb.h                   | 1 +
 arch/arm/include/asm/mach-imx/module_fuse.h                   | 1 +
 arch/arm/include/asm/mach-imx/mxc_i2c.h                       | 1 +
 arch/arm/include/asm/mach-imx/rdc-sema.h                      | 1 +
 arch/arm/include/asm/mach-imx/regs-apbh.h                     | 1 +
 arch/arm/include/asm/mach-imx/regs-bch.h                      | 1 +
 arch/arm/include/asm/mach-imx/regs-gpmi.h                     | 1 +
 arch/arm/include/asm/mach-imx/regs-lcdif.h                    | 1 +
 arch/arm/include/asm/mach-imx/sys_proto.h                     | 1 +
 arch/arm/include/asm/mach-imx/syscounter.h                    | 1 +
 arch/arm/include/asm/mach-imx/video.h                         | 1 +
 arch/arm/include/asm/omap_gpio.h                              | 1 +
 arch/arm/include/asm/omap_i2c.h                               | 1 +
 arch/arm/include/asm/omap_mmc.h                               | 1 +
 arch/arm/include/asm/omap_musb.h                              | 1 +
 arch/arm/include/asm/omap_sec_common.h                        | 1 +
 arch/arm/include/asm/secure.h                                 | 1 +
 arch/arm/include/asm/setjmp.h                                 | 1 +
 arch/arm/include/asm/setup.h                                  | 1 +
 arch/arm/include/asm/system.h                                 | 1 +
 arch/arm/include/asm/ti-common/davinci_nand.h                 | 1 +
 arch/arm/include/asm/ti-common/keystone_nav.h                 | 1 +
 arch/arm/include/asm/ti-common/keystone_net.h                 | 1 +
 arch/arm/include/asm/ti-common/keystone_serdes.h              | 1 +
 arch/arm/include/asm/ti-common/sys_proto.h                    | 1 +
 arch/arm/include/asm/ti-common/ti-edma3.h                     | 2 ++
 arch/arm/include/asm/u-boot-arm.h                             | 1 +
 arch/arm/include/asm/utils.h                                  | 1 +
 arch/arm/lib/bootm-fdt.c                                      | 1 +
 arch/arm/lib/bootm.c                                          | 2 ++
 arch/arm/lib/cache-cp15.c                                     | 2 ++
 arch/arm/lib/cache.c                                          | 2 ++
 arch/arm/lib/cmd_boot.c                                       | 1 +
 arch/arm/lib/eabi_compat.c                                    | 1 +
 arch/arm/lib/gic-v3-its.c                                     | 1 +
 arch/arm/lib/image.c                                          | 2 ++
 arch/arm/lib/interrupts.c                                     | 1 +
 arch/arm/lib/interrupts_64.c                                  | 2 ++
 arch/arm/lib/reloc_aarch64_efi.c                              | 1 +
 arch/arm/lib/reloc_arm_efi.c                                  | 1 +
 arch/arm/lib/reset.c                                          | 1 +
 arch/arm/lib/semihosting.c                                    | 1 +
 arch/arm/lib/spl.c                                            | 2 ++
 arch/arm/lib/zimage.c                                         | 2 ++
 arch/arm/mach-aspeed/ast2500/sdram_ast2500.c                  | 1 +
 arch/arm/mach-aspeed/ast_wdt.c                                | 1 +
 arch/arm/mach-at91/arm920t/clock.c                            | 1 +
 arch/arm/mach-at91/arm920t/reset.c                            | 1 +
 arch/arm/mach-at91/arm920t/timer.c                            | 1 +
 arch/arm/mach-at91/arm926ejs/clock.c                          | 1 +
 arch/arm/mach-at91/arm926ejs/cpu.c                            | 1 +
 arch/arm/mach-at91/arm926ejs/eflash.c                         | 1 +
 arch/arm/mach-at91/arm926ejs/reset.c                          | 1 +
 arch/arm/mach-at91/arm926ejs/timer.c                          | 1 +
 arch/arm/mach-at91/armv7/clock.c                              | 1 +
 arch/arm/mach-at91/armv7/cpu.c                                | 1 +
 arch/arm/mach-at91/armv7/reset.c                              | 1 +
 arch/arm/mach-at91/armv7/timer.c                              | 1 +
 arch/arm/mach-at91/atmel_sfr.c                                | 1 +
 arch/arm/mach-at91/clock.c                                    | 1 +
 arch/arm/mach-at91/include/mach/at91_common.h                 | 1 +
 arch/arm/mach-at91/include/mach/at91_dbu.h                    | 1 +
 arch/arm/mach-at91/include/mach/at91_eefc.h                   | 1 +
 arch/arm/mach-at91/include/mach/at91_emac.h                   | 1 +
 arch/arm/mach-at91/include/mach/at91_gpbr.h                   | 1 +
 arch/arm/mach-at91/include/mach/at91_matrix.h                 | 1 +
 arch/arm/mach-at91/include/mach/at91_mc.h                     | 1 +
 arch/arm/mach-at91/include/mach/at91_pdc.h                    | 1 +
 arch/arm/mach-at91/include/mach/at91_pio.h                    | 1 +
 arch/arm/mach-at91/include/mach/at91_pit.h                    | 1 +
 arch/arm/mach-at91/include/mach/at91_rstc.h                   | 1 +
 arch/arm/mach-at91/include/mach/at91_rtt.h                    | 1 +
 arch/arm/mach-at91/include/mach/at91_sfr.h                    | 1 +
 arch/arm/mach-at91/include/mach/at91_spi.h                    | 1 +
 arch/arm/mach-at91/include/mach/at91_st.h                     | 1 +
 arch/arm/mach-at91/include/mach/at91_tc.h                     | 1 +
 arch/arm/mach-at91/include/mach/at91_wdt.h                    | 2 ++
 arch/arm/mach-at91/include/mach/at91sam9260_matrix.h          | 1 +
 arch/arm/mach-at91/include/mach/at91sam9261_matrix.h          | 1 +
 arch/arm/mach-at91/include/mach/at91sam9263_matrix.h          | 1 +
 arch/arm/mach-at91/include/mach/at91sam9_sdramc.h             | 1 +
 arch/arm/mach-at91/include/mach/at91sam9_smc.h                | 1 +
 arch/arm/mach-at91/include/mach/at91sam9g45_matrix.h          | 1 +
 arch/arm/mach-at91/include/mach/at91sam9rl_matrix.h           | 1 +
 arch/arm/mach-at91/include/mach/at91sam9x5_matrix.h           | 1 +
 arch/arm/mach-at91/include/mach/atmel_mpddrc.h                | 1 +
 arch/arm/mach-at91/include/mach/atmel_pio4.h                  | 1 +
 arch/arm/mach-at91/include/mach/atmel_sdhci.h                 | 1 +
 arch/arm/mach-at91/include/mach/atmel_serial.h                | 1 +
 arch/arm/mach-at91/include/mach/clk.h                         | 1 +
 arch/arm/mach-at91/include/mach/gpio.h                        | 1 +
 arch/arm/mach-at91/include/mach/sama5_matrix.h                | 1 +
 arch/arm/mach-at91/include/mach/sama5d2_smc.h                 | 1 +
 arch/arm/mach-at91/include/mach/sama5d3_smc.h                 | 1 +
 arch/arm/mach-at91/mpddrc.c                                   | 1 +
 arch/arm/mach-at91/spl.c                                      | 1 +
 arch/arm/mach-at91/spl_at91.c                                 | 2 ++
 arch/arm/mach-at91/spl_atmel.c                                | 2 ++
 arch/arm/mach-bcm283x/include/mach/gpio.h                     | 1 +
 arch/arm/mach-bcm283x/include/mach/mbox.h                     | 2 ++
 arch/arm/mach-bcm283x/include/mach/msg.h                      | 1 +
 arch/arm/mach-bcm283x/include/mach/sdhci.h                    | 1 +
 arch/arm/mach-bcm283x/include/mach/wdog.h                     | 1 +
 arch/arm/mach-bcm283x/init.c                                  | 1 +
 arch/arm/mach-bcm283x/mbox.c                                  | 1 +
 arch/arm/mach-bcm283x/msg.c                                   | 1 +
 arch/arm/mach-bcm283x/reset.c                                 | 1 +
 arch/arm/mach-bcmstb/include/mach/timer.h                     | 1 +
 arch/arm/mach-davinci/include/mach/davinci_misc.h             | 1 +
 arch/arm/mach-davinci/include/mach/dm365_lowlevel.h           | 1 +
 arch/arm/mach-davinci/include/mach/sdmmc_defs.h               | 1 +
 arch/arm/mach-davinci/include/mach/timer_defs.h               | 1 +
 arch/arm/mach-davinci/misc.c                                  | 1 +
 arch/arm/mach-davinci/spl.c                                   | 1 +
 arch/arm/mach-davinci/timer.c                                 | 1 +
 arch/arm/mach-exynos/clock.c                                  | 1 +
 arch/arm/mach-exynos/clock_init.h                             | 1 +
 arch/arm/mach-exynos/clock_init_exynos5.c                     | 1 +
 arch/arm/mach-exynos/common_setup.h                           | 1 +
 arch/arm/mach-exynos/dmc_common.c                             | 1 +
 arch/arm/mach-exynos/dmc_init_ddr3.c                          | 1 +
 arch/arm/mach-exynos/exynos5_setup.h                          | 1 +
 arch/arm/mach-exynos/include/mach/mmc.h                       | 1 +
 arch/arm/mach-exynos/include/mach/power.h                     | 1 +
 arch/arm/mach-exynos/include/mach/spl.h                       | 2 ++
 arch/arm/mach-exynos/include/mach/sromc.h                     | 1 +
 arch/arm/mach-exynos/include/mach/sys_proto.h                 | 1 +
 arch/arm/mach-exynos/include/mach/tmu.h                       | 1 +
 arch/arm/mach-exynos/lowlevel_init.c                          | 1 +
 arch/arm/mach-exynos/pinmux.c                                 | 1 +
 arch/arm/mach-exynos/power.c                                  | 1 +
 arch/arm/mach-exynos/soc.c                                    | 1 +
 arch/arm/mach-exynos/spl_boot.c                               | 1 +
 arch/arm/mach-imx/cache.c                                     | 1 +
 arch/arm/mach-imx/cmd_dek.c                                   | 1 +
 arch/arm/mach-imx/cmd_nandbcb.c                               | 2 ++
 arch/arm/mach-imx/cpu.c                                       | 1 +
 arch/arm/mach-imx/ddrmc-vf610-calibration.c                   | 1 +
 arch/arm/mach-imx/hab.c                                       | 1 +
 arch/arm/mach-imx/i2c-mxv7.c                                  | 1 +
 arch/arm/mach-imx/imx8/ahab.c                                 | 2 ++
 arch/arm/mach-imx/imx8/clock.c                                | 1 +
 arch/arm/mach-imx/imx8/cpu.c                                  | 3 +++
 arch/arm/mach-imx/imx8/fdt.c                                  | 1 +
 arch/arm/mach-imx/imx8/image.c                                | 1 +
 arch/arm/mach-imx/imx8/iomux.c                                | 1 +
 arch/arm/mach-imx/imx8/misc.c                                 | 1 +
 arch/arm/mach-imx/imx8/parse-container.c                      | 1 +
 arch/arm/mach-imx/imx8/snvs_security_sc.c                     | 1 +
 arch/arm/mach-imx/imx8m/clock_imx8mm.c                        | 2 ++
 arch/arm/mach-imx/imx8m/clock_imx8mq.c                        | 2 ++
 arch/arm/mach-imx/imx8m/clock_slice.c                         | 3 +++
 arch/arm/mach-imx/imx8m/soc.c                                 | 3 +++
 arch/arm/mach-imx/imx_bootaux.c                               | 1 +
 arch/arm/mach-imx/init.c                                      | 1 +
 arch/arm/mach-imx/iomux-v3.c                                  | 1 +
 arch/arm/mach-imx/mac.c                                       | 1 +
 arch/arm/mach-imx/misc.c                                      | 1 +
 arch/arm/mach-imx/mmc_env.c                                   | 2 ++
 arch/arm/mach-imx/mmdc_size.c                                 | 1 +
 arch/arm/mach-imx/mx5/clock.c                                 | 2 ++
 arch/arm/mach-imx/mx5/soc.c                                   | 2 ++
 arch/arm/mach-imx/mx6/clock.c                                 | 2 ++
 arch/arm/mach-imx/mx6/ddr.c                                   | 1 +
 arch/arm/mach-imx/mx6/module_fuse.c                           | 1 +
 arch/arm/mach-imx/mx6/mp.c                                    | 1 +
 arch/arm/mach-imx/mx6/opos6ul.c                               | 2 ++
 arch/arm/mach-imx/mx6/soc.c                                   | 2 ++
 arch/arm/mach-imx/mx7/clock.c                                 | 1 +
 arch/arm/mach-imx/mx7/clock_slice.c                           | 2 ++
 arch/arm/mach-imx/mx7/psci-mx7.c                              | 1 +
 arch/arm/mach-imx/mx7/snvs.c                                  | 1 +
 arch/arm/mach-imx/mx7/soc.c                                   | 3 +++
 arch/arm/mach-imx/mx7ulp/clock.c                              | 1 +
 arch/arm/mach-imx/mx7ulp/iomux.c                              | 1 +
 arch/arm/mach-imx/mx7ulp/pcc.c                                | 2 ++
 arch/arm/mach-imx/mx7ulp/scg.c                                | 1 +
 arch/arm/mach-imx/mx7ulp/soc.c                                | 2 ++
 arch/arm/mach-imx/rdc-sema.c                                  | 1 +
 arch/arm/mach-imx/spl.c                                       | 2 ++
 arch/arm/mach-imx/spl_imx_romapi.c                            | 1 +
 arch/arm/mach-imx/syscounter.c                                | 1 +
 arch/arm/mach-imx/timer.c                                     | 1 +
 arch/arm/mach-ipq40xx/clock-ipq4019.c                         | 1 +
 arch/arm/mach-ipq40xx/pinctrl-snapdragon.c                    | 1 +
 arch/arm/mach-k3/am6_init.c                                   | 1 +
 arch/arm/mach-k3/common.c                                     | 2 ++
 arch/arm/mach-k3/common.h                                     | 1 +
 arch/arm/mach-k3/include/mach/sys_proto.h                     | 1 +
 arch/arm/mach-k3/j721e_init.c                                 | 1 +
 arch/arm/mach-k3/r5_mpu.c                                     | 1 +
 arch/arm/mach-k3/security.c                                   | 1 +
 arch/arm/mach-k3/sysfw-loader.c                               | 1 +
 arch/arm/mach-keystone/clock.c                                | 2 ++
 arch/arm/mach-keystone/cmd_mon.c                              | 1 +
 arch/arm/mach-keystone/ddr3.c                                 | 1 +
 arch/arm/mach-keystone/ddr3_spd.c                             | 1 +
 arch/arm/mach-keystone/include/mach/clock_defs.h              | 1 +
 arch/arm/mach-keystone/include/mach/ddr3.h                    | 1 +
 arch/arm/mach-keystone/include/mach/hardware-k2g.h            | 1 +
 arch/arm/mach-keystone/include/mach/hardware.h                | 1 +
 arch/arm/mach-keystone/include/mach/mon.h                     | 1 +
 arch/arm/mach-keystone/include/mach/msmc.h                    | 1 +
 arch/arm/mach-keystone/include/mach/mux-k2g.h                 | 1 +
 arch/arm/mach-keystone/include/mach/psc_defs.h                | 1 +
 arch/arm/mach-keystone/init.c                                 | 1 +
 arch/arm/mach-keystone/keystone.c                             | 1 +
 arch/arm/mach-keystone/mon.c                                  | 1 +
 arch/arm/mach-keystone/msmc.c                                 | 1 +
 arch/arm/mach-keystone/psc.c                                  | 1 +
 arch/arm/mach-kirkwood/cache.c                                | 1 +
 arch/arm/mach-kirkwood/cpu.c                                  | 1 +
 arch/arm/mach-kirkwood/include/mach/cpu.h                     | 1 +
 arch/arm/mach-kirkwood/mpp.c                                  | 1 +
 arch/arm/mach-lpc32xx/clk.c                                   | 1 +
 arch/arm/mach-lpc32xx/cpu.c                                   | 1 +
 arch/arm/mach-lpc32xx/devices.c                               | 1 +
 arch/arm/mach-lpc32xx/dram.c                                  | 1 +
 arch/arm/mach-lpc32xx/timer.c                                 | 1 +
 arch/arm/mach-mediatek/mt7622/init.c                          | 1 +
 arch/arm/mach-mediatek/mt7623/init.c                          | 2 ++
 arch/arm/mach-mediatek/mt7623/preloader.h                     | 1 +
 arch/arm/mach-mediatek/mt7629/init.c                          | 2 ++
 arch/arm/mach-mediatek/mt8512/init.c                          | 1 +
 arch/arm/mach-mediatek/mt8516/init.c                          | 1 +
 arch/arm/mach-mediatek/mt8518/init.c                          | 1 +
 arch/arm/mach-mediatek/spl.c                                  | 1 +
 arch/arm/mach-meson/board-axg.c                               | 1 +
 arch/arm/mach-meson/board-common.c                            | 2 ++
 arch/arm/mach-meson/board-g12a.c                              | 1 +
 arch/arm/mach-meson/board-gx.c                                | 1 +
 arch/arm/mach-meson/board-info.c                              | 1 +
 arch/arm/mach-meson/sm.c                                      | 1 +
 arch/arm/mach-mvebu/arm64-common.c                            | 2 ++
 arch/arm/mach-mvebu/armada3700/cpu.c                          | 1 +
 arch/arm/mach-mvebu/armada8k/cpu.c                            | 1 +
 arch/arm/mach-mvebu/cpu.c                                     | 2 ++
 arch/arm/mach-mvebu/dram.c                                    | 1 +
 arch/arm/mach-mvebu/efuse.c                                   | 1 +
 arch/arm/mach-mvebu/gpio.c                                    | 1 +
 arch/arm/mach-mvebu/include/mach/cpu.h                        | 1 +
 arch/arm/mach-mvebu/include/mach/efuse.h                      | 1 +
 arch/arm/mach-mvebu/mbus.c                                    | 2 ++
 arch/arm/mach-mvebu/serdes/a38x/ctrl_pex.c                    | 2 ++
 arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec-38x.c     | 1 +
 arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec.c         | 1 +
 arch/arm/mach-mvebu/serdes/a38x/seq_exec.c                    | 1 +
 arch/arm/mach-mvebu/serdes/a38x/seq_exec.h                    | 1 +
 arch/arm/mach-mvebu/serdes/a38x/sys_env_lib.c                 | 1 +
 arch/arm/mach-mvebu/serdes/axp/high_speed_env_lib.c           | 2 ++
 arch/arm/mach-mvebu/serdes/axp/high_speed_env_spec.c          | 1 +
 arch/arm/mach-mvebu/spl.c                                     | 1 +
 arch/arm/mach-nexell/clock.c                                  | 2 ++
 arch/arm/mach-nexell/cmd_boot_linux.c                         | 1 +
 arch/arm/mach-nexell/include/mach/display.h                   | 1 +
 arch/arm/mach-nexell/include/mach/display_dev.h               | 1 +
 arch/arm/mach-nexell/include/mach/mipi_display.h              | 1 +
 arch/arm/mach-nexell/include/mach/reset.h                     | 1 +
 arch/arm/mach-nexell/include/mach/sec_reg.h                   | 1 +
 arch/arm/mach-nexell/include/mach/tieoff.h                    | 1 +
 arch/arm/mach-nexell/nx_sec_reg.c                             | 1 +
 arch/arm/mach-nexell/reset.c                                  | 1 +
 arch/arm/mach-nexell/tieoff.c                                 | 2 ++
 arch/arm/mach-nexell/timer.c                                  | 2 ++
 arch/arm/mach-omap2/abb.c                                     | 2 ++
 arch/arm/mach-omap2/am33xx/board.c                            | 2 ++
 arch/arm/mach-omap2/am33xx/clk_synthesizer.c                  | 1 +
 arch/arm/mach-omap2/am33xx/clock.c                            | 2 ++
 arch/arm/mach-omap2/am33xx/clock_am33xx.c                     | 2 ++
 arch/arm/mach-omap2/am33xx/clock_am43xx.c                     | 1 +
 arch/arm/mach-omap2/am33xx/clock_ti814x.c                     | 1 +
 arch/arm/mach-omap2/am33xx/clock_ti816x.c                     | 1 +
 arch/arm/mach-omap2/am33xx/ddr.c                              | 1 +
 arch/arm/mach-omap2/am33xx/emif4.c                            | 1 +
 arch/arm/mach-omap2/am33xx/mux.c                              | 1 +
 arch/arm/mach-omap2/am33xx/sys_info.c                         | 1 +
 arch/arm/mach-omap2/boot-common.c                             | 2 ++
 arch/arm/mach-omap2/clocks-common.c                           | 2 ++
 arch/arm/mach-omap2/emif-common.c                             | 2 ++
 arch/arm/mach-omap2/fdt-common.c                              | 1 +
 arch/arm/mach-omap2/hwinit-common.c                           | 2 ++
 arch/arm/mach-omap2/mem-common.c                              | 1 +
 arch/arm/mach-omap2/omap-cache.c                              | 1 +
 arch/arm/mach-omap2/omap3/am35x_musb.c                        | 3 ++-
 arch/arm/mach-omap2/omap3/board.c                             | 2 ++
 arch/arm/mach-omap2/omap3/boot.c                              | 1 +
 arch/arm/mach-omap2/omap3/clock.c                             | 1 +
 arch/arm/mach-omap2/omap3/emac.c                              | 1 +
 arch/arm/mach-omap2/omap3/emif4.c                             | 1 +
 arch/arm/mach-omap2/omap3/sdrc.c                              | 1 +
 arch/arm/mach-omap2/omap3/sys_info.c                          | 2 ++
 arch/arm/mach-omap2/omap4/boot.c                              | 1 +
 arch/arm/mach-omap2/omap4/emif.c                              | 1 +
 arch/arm/mach-omap2/omap4/hw_data.c                           | 1 +
 arch/arm/mach-omap2/omap4/hwinit.c                            | 1 +
 arch/arm/mach-omap2/omap4/sdram_elpida.c                      | 2 ++
 arch/arm/mach-omap2/omap5/abb.c                               | 1 +
 arch/arm/mach-omap2/omap5/boot.c                              | 1 +
 arch/arm/mach-omap2/omap5/dra7xx_iodelay.c                    | 1 +
 arch/arm/mach-omap2/omap5/emif.c                              | 1 +
 arch/arm/mach-omap2/omap5/fdt.c                               | 1 +
 arch/arm/mach-omap2/omap5/hw_data.c                           | 2 ++
 arch/arm/mach-omap2/omap5/hwinit.c                            | 2 ++
 arch/arm/mach-omap2/omap5/prcm-regs.c                         | 1 +
 arch/arm/mach-omap2/omap5/sdram.c                             | 2 ++
 arch/arm/mach-omap2/pipe3-phy.c                               | 2 ++
 arch/arm/mach-omap2/pipe3-phy.h                               | 2 ++
 arch/arm/mach-omap2/reset.c                                   | 2 ++
 arch/arm/mach-omap2/sata.c                                    | 2 ++
 arch/arm/mach-omap2/sec-common.c                              | 1 +
 arch/arm/mach-omap2/sysinfo-common.c                          | 1 +
 arch/arm/mach-omap2/timer.c                                   | 1 +
 arch/arm/mach-omap2/utils.c                                   | 2 ++
 arch/arm/mach-omap2/vc.c                                      | 1 +
 arch/arm/mach-orion5x/cpu.c                                   | 1 +
 arch/arm/mach-orion5x/dram.c                                  | 1 +
 arch/arm/mach-orion5x/include/mach/cpu.h                      | 1 +
 arch/arm/mach-orion5x/timer.c                                 | 1 +
 arch/arm/mach-owl/soc.c                                       | 1 +
 arch/arm/mach-rmobile/cpu_info-r8a7740.c                      | 1 +
 arch/arm/mach-rmobile/cpu_info-rcar.c                         | 1 +
 arch/arm/mach-rmobile/cpu_info-sh73a0.c                       | 1 +
 arch/arm/mach-rmobile/cpu_info.c                              | 1 +
 arch/arm/mach-rmobile/include/mach/ehci-rmobile.h             | 1 +
 arch/arm/mach-rmobile/include/mach/rcar-mstp.h                | 1 +
 arch/arm/mach-rmobile/include/mach/rmobile.h                  | 1 +
 arch/arm/mach-rmobile/timer.c                                 | 1 +
 arch/arm/mach-rockchip/board.c                                | 2 ++
 arch/arm/mach-rockchip/boot_mode.c                            | 1 +
 arch/arm/mach-rockchip/bootrom.c                              | 1 +
 arch/arm/mach-rockchip/misc.c                                 | 1 +
 arch/arm/mach-rockchip/px30-board-tpl.c                       | 1 +
 arch/arm/mach-rockchip/px30/px30.c                            | 1 +
 arch/arm/mach-rockchip/px30/syscon_px30.c                     | 1 +
 arch/arm/mach-rockchip/rk3036-board-spl.c                     | 1 +
 arch/arm/mach-rockchip/rk3036/sdram_rk3036.c                  | 1 +
 arch/arm/mach-rockchip/rk3188/rk3188.c                        | 1 +
 arch/arm/mach-rockchip/rk3188/syscon_rk3188.c                 | 1 +
 arch/arm/mach-rockchip/rk3288/rk3288.c                        | 2 ++
 arch/arm/mach-rockchip/rk3288/syscon_rk3288.c                 | 1 +
 arch/arm/mach-rockchip/rk3308/rk3308.c                        | 2 ++
 arch/arm/mach-rockchip/rk3368/rk3368.c                        | 1 +
 arch/arm/mach-rockchip/rk3368/syscon_rk3368.c                 | 1 +
 arch/arm/mach-rockchip/rk3399/rk3399.c                        | 2 ++
 arch/arm/mach-rockchip/rk3399/syscon_rk3399.c                 | 1 +
 arch/arm/mach-rockchip/sdram.c                                | 1 +
 arch/arm/mach-rockchip/spl-boot-order.c                       | 2 ++
 arch/arm/mach-rockchip/spl.c                                  | 2 ++
 arch/arm/mach-rockchip/tpl.c                                  | 2 ++
 arch/arm/mach-s5pc1xx/clock.c                                 | 1 +
 arch/arm/mach-s5pc1xx/include/mach/gpio.h                     | 1 +
 arch/arm/mach-s5pc1xx/include/mach/mmc.h                      | 1 +
 arch/arm/mach-s5pc1xx/include/mach/sromc.h                    | 1 +
 arch/arm/mach-s5pc1xx/include/mach/sys_proto.h                | 1 +
 arch/arm/mach-snapdragon/clock-apq8016.c                      | 1 +
 arch/arm/mach-snapdragon/clock-apq8096.c                      | 1 +
 arch/arm/mach-snapdragon/clock-snapdragon.c                   | 1 +
 arch/arm/mach-snapdragon/clock-snapdragon.h                   | 1 +
 arch/arm/mach-snapdragon/dram.c                               | 2 ++
 arch/arm/mach-snapdragon/include/mach/misc.h                  | 1 +
 arch/arm/mach-snapdragon/misc.c                               | 1 +
 arch/arm/mach-snapdragon/pinctrl-snapdragon.c                 | 1 +
 arch/arm/mach-socfpga/clock_manager.c                         | 1 +
 arch/arm/mach-socfpga/clock_manager_agilex.c                  | 1 +
 arch/arm/mach-socfpga/clock_manager_arria10.c                 | 1 +
 arch/arm/mach-socfpga/clock_manager_gen5.c                    | 1 +
 arch/arm/mach-socfpga/clock_manager_s10.c                     | 1 +
 arch/arm/mach-socfpga/firewall.c                              | 1 +
 arch/arm/mach-socfpga/freeze_controller.c                     | 1 +
 arch/arm/mach-socfpga/include/mach/clock_manager.h            | 4 ++--
 arch/arm/mach-socfpga/include/mach/clock_manager_gen5.h       | 1 +
 arch/arm/mach-socfpga/include/mach/clock_manager_s10.h        | 1 +
 arch/arm/mach-socfpga/include/mach/firewall.h                 | 1 +
 arch/arm/mach-socfpga/include/mach/fpga_manager.h             | 1 +
 arch/arm/mach-socfpga/include/mach/fpga_manager_arria10.h     | 1 +
 arch/arm/mach-socfpga/include/mach/fpga_manager_gen5.h        | 1 +
 arch/arm/mach-socfpga/include/mach/freeze_controller.h        | 1 +
 arch/arm/mach-socfpga/include/mach/mailbox_s10.h              | 1 +
 arch/arm/mach-socfpga/include/mach/misc.h                     | 1 +
 arch/arm/mach-socfpga/include/mach/nic301.h                   | 1 +
 arch/arm/mach-socfpga/include/mach/reset_manager.h            | 1 +
 arch/arm/mach-socfpga/include/mach/scan_manager.h             | 1 +
 arch/arm/mach-socfpga/include/mach/scu.h                      | 1 +
 arch/arm/mach-socfpga/include/mach/sdram_arria10.h            | 1 +
 arch/arm/mach-socfpga/include/mach/sdram_gen5.h               | 1 +
 arch/arm/mach-socfpga/include/mach/system_manager.h           | 1 +
 arch/arm/mach-socfpga/include/mach/system_manager_gen5.h      | 1 +
 arch/arm/mach-socfpga/include/mach/system_manager_soc64.h     | 1 +
 arch/arm/mach-socfpga/include/mach/timer.h                    | 1 +
 arch/arm/mach-socfpga/mailbox_s10.c                           | 1 +
 arch/arm/mach-socfpga/misc.c                                  | 1 +
 arch/arm/mach-socfpga/misc_arria10.c                          | 1 +
 arch/arm/mach-socfpga/misc_gen5.c                             | 2 ++
 arch/arm/mach-socfpga/misc_s10.c                              | 1 +
 arch/arm/mach-socfpga/pinmux_arria10.c                        | 1 +
 arch/arm/mach-socfpga/reset_manager_arria10.c                 | 1 +
 arch/arm/mach-socfpga/reset_manager_gen5.c                    | 1 +
 arch/arm/mach-socfpga/reset_manager_s10.c                     | 1 +
 arch/arm/mach-socfpga/scan_manager.c                          | 1 +
 arch/arm/mach-socfpga/spl_a10.c                               | 1 +
 arch/arm/mach-socfpga/spl_agilex.c                            | 1 +
 arch/arm/mach-socfpga/spl_gen5.c                              | 1 +
 arch/arm/mach-socfpga/spl_s10.c                               | 1 +
 arch/arm/mach-socfpga/system_manager_gen5.c                   | 1 +
 arch/arm/mach-socfpga/system_manager_s10.c                    | 1 +
 arch/arm/mach-socfpga/wrap_pinmux_config.c                    | 1 +
 arch/arm/mach-socfpga/wrap_pinmux_config_s10.c                | 1 +
 arch/arm/mach-socfpga/wrap_pll_config_s10.c                   | 1 +
 arch/arm/mach-socfpga/wrap_sdram_config.c                     | 1 +
 arch/arm/mach-stm32mp/bsec.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               | 2 ++
 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                                   | 2 ++
 arch/arm/mach-stm32mp/dram_init.c                             | 1 +
 arch/arm/mach-stm32mp/fdt.c                                   | 2 ++
 arch/arm/mach-stm32mp/include/mach/gpio.h                     | 1 +
 arch/arm/mach-stm32mp/include/mach/stm32mp1_smc.h             | 1 +
 arch/arm/mach-stm32mp/include/mach/sys_proto.h                | 1 +
 arch/arm/mach-stm32mp/psci.c                                  | 1 +
 arch/arm/mach-stm32mp/pwr_regulator.c                         | 2 ++
 arch/arm/mach-stm32mp/spl.c                                   | 2 ++
 arch/arm/mach-sunxi/board.c                                   | 1 +
 arch/arm/mach-sunxi/clock.c                                   | 2 ++
 arch/arm/mach-sunxi/clock_sun4i.c                             | 1 +
 arch/arm/mach-sunxi/clock_sun50i_h6.c                         | 1 +
 arch/arm/mach-sunxi/clock_sun6i.c                             | 1 +
 arch/arm/mach-sunxi/clock_sun8i_a83t.c                        | 1 +
 arch/arm/mach-sunxi/clock_sun9i.c                             | 1 +
 arch/arm/mach-sunxi/cpu_info.c                                | 1 +
 arch/arm/mach-sunxi/dram_helpers.c                            | 1 +
 arch/arm/mach-sunxi/dram_sun4i.c                              | 2 ++
 arch/arm/mach-sunxi/dram_sun50i_h6.c                          | 1 +
 arch/arm/mach-sunxi/dram_sun6i.c                              | 1 +
 arch/arm/mach-sunxi/dram_sun8i_a23.c                          | 1 +
 arch/arm/mach-sunxi/dram_sun8i_a33.c                          | 1 +
 arch/arm/mach-sunxi/dram_sun8i_a83t.c                         | 1 +
 arch/arm/mach-sunxi/dram_sun9i.c                              | 1 +
 arch/arm/mach-sunxi/dram_sunxi_dw.c                           | 2 ++
 arch/arm/mach-sunxi/dram_timings/ddr2_v3s.c                   | 1 +
 arch/arm/mach-sunxi/dram_timings/ddr3_1333.c                  | 1 +
 arch/arm/mach-sunxi/dram_timings/h6_ddr3_1333.c               | 1 +
 arch/arm/mach-sunxi/dram_timings/h6_lpddr3.c                  | 1 +
 arch/arm/mach-sunxi/dram_timings/lpddr3_stock.c               | 1 +
 arch/arm/mach-sunxi/p2wi.c                                    | 1 +
 arch/arm/mach-sunxi/pinmux.c                                  | 1 +
 arch/arm/mach-sunxi/pmic_bus.c                                | 1 +
 arch/arm/mach-sunxi/prcm.c                                    | 1 +
 arch/arm/mach-sunxi/rsb.c                                     | 1 +
 arch/arm/mach-sunxi/spl_spi_sunxi.c                           | 1 +
 arch/arm/mach-tegra/ap.c                                      | 1 +
 arch/arm/mach-tegra/board.c                                   | 2 ++
 arch/arm/mach-tegra/board2.c                                  | 2 ++
 arch/arm/mach-tegra/cache.c                                   | 1 +
 arch/arm/mach-tegra/cboot.c                                   | 2 ++
 arch/arm/mach-tegra/clock.c                                   | 3 +++
 arch/arm/mach-tegra/cpu.c                                     | 1 +
 arch/arm/mach-tegra/ivc.c                                     | 1 +
 arch/arm/mach-tegra/pinmux-common.c                           | 1 +
 arch/arm/mach-tegra/pmc.c                                     | 1 +
 arch/arm/mach-tegra/spl.c                                     | 1 +
 arch/arm/mach-tegra/tegra114/clock.c                          | 1 +
 arch/arm/mach-tegra/tegra114/cpu.c                            | 1 +
 arch/arm/mach-tegra/tegra124/clock.c                          | 1 +
 arch/arm/mach-tegra/tegra124/cpu.c                            | 1 +
 arch/arm/mach-tegra/tegra124/psci.c                           | 1 +
 arch/arm/mach-tegra/tegra124/xusb-padctl.c                    | 1 +
 arch/arm/mach-tegra/tegra20/clock.c                           | 1 +
 arch/arm/mach-tegra/tegra20/cpu.c                             | 1 +
 arch/arm/mach-tegra/tegra20/crypto.c                          | 1 +
 arch/arm/mach-tegra/tegra20/crypto.h                          | 1 +
 arch/arm/mach-tegra/tegra20/emc.c                             | 1 +
 arch/arm/mach-tegra/tegra20/warmboot.c                        | 1 +
 arch/arm/mach-tegra/tegra20/warmboot_avp.c                    | 1 +
 arch/arm/mach-tegra/tegra210/clock.c                          | 1 +
 arch/arm/mach-tegra/tegra210/xusb-padctl.c                    | 1 +
 arch/arm/mach-tegra/tegra30/clock.c                           | 1 +
 arch/arm/mach-tegra/tegra30/cpu.c                             | 1 +
 arch/arm/mach-tegra/xusb-padctl-common.c                      | 1 +
 arch/arm/mach-tegra/xusb-padctl-common.h                      | 1 +
 arch/arm/mach-u8500/cpuinfo.c                                 | 1 +
 arch/arm/mach-uniphier/arm32/cache-uniphier.c                 | 2 ++
 arch/arm/mach-uniphier/arm32/psci.c                           | 1 +
 arch/arm/mach-uniphier/base-address.c                         | 1 +
 arch/arm/mach-uniphier/board_init.c                           | 1 +
 arch/arm/mach-uniphier/boot-device/boot-device-ld11.c         | 1 +
 arch/arm/mach-uniphier/boot-device/boot-device-pxs2.c         | 1 +
 arch/arm/mach-uniphier/boot-device/boot-device-pxs3.c         | 1 +
 arch/arm/mach-uniphier/boot-device/boot-device.c              | 2 ++
 arch/arm/mach-uniphier/boot-device/boot-device.h              | 1 +
 arch/arm/mach-uniphier/clk/clk-dram-ld4.c                     | 1 +
 arch/arm/mach-uniphier/clk/clk-dram-pro5.c                    | 1 +
 arch/arm/mach-uniphier/clk/clk-dram-pxs2.c                    | 1 +
 arch/arm/mach-uniphier/clk/clk-early-ld4.c                    | 1 +
 arch/arm/mach-uniphier/clk/clk-ld11.c                         | 1 +
 arch/arm/mach-uniphier/clk/clk-ld20.c                         | 1 +
 arch/arm/mach-uniphier/clk/clk-pro4.c                         | 1 +
 arch/arm/mach-uniphier/clk/clk-pro5.c                         | 1 +
 arch/arm/mach-uniphier/clk/clk-pxs2.c                         | 1 +
 arch/arm/mach-uniphier/clk/clk-pxs3.c                         | 1 +
 arch/arm/mach-uniphier/clk/dpll-ld4.c                         | 1 +
 arch/arm/mach-uniphier/clk/dpll-pro4.c                        | 1 +
 arch/arm/mach-uniphier/clk/dpll-sld8.c                        | 1 +
 arch/arm/mach-uniphier/clk/dpll-tail.c                        | 1 +
 arch/arm/mach-uniphier/clk/pll-base-ld20.c                    | 2 ++
 arch/arm/mach-uniphier/clk/pll-ld4.c                          | 1 +
 arch/arm/mach-uniphier/clk/pll-pro4.c                         | 1 +
 arch/arm/mach-uniphier/debug-uart/debug-uart-ld6b.c           | 1 +
 arch/arm/mach-uniphier/debug-uart/debug-uart-pro4.c           | 1 +
 arch/arm/mach-uniphier/debug-uart/debug-uart-pro5.c           | 1 +
 arch/arm/mach-uniphier/debug-uart/debug-uart-pxs2.c           | 1 +
 arch/arm/mach-uniphier/debug-uart/debug-uart.c                | 2 ++
 arch/arm/mach-uniphier/debug.h                                | 1 +
 arch/arm/mach-uniphier/dram/cmd_ddrmphy.c                     | 2 ++
 arch/arm/mach-uniphier/dram/cmd_ddrphy.c                      | 2 ++
 arch/arm/mach-uniphier/dram/ddrphy-ld4.c                      | 2 ++
 arch/arm/mach-uniphier/dram/ddrphy-training.c                 | 2 ++
 arch/arm/mach-uniphier/dram/umc-ld4.c                         | 2 ++
 arch/arm/mach-uniphier/dram/umc-pro4.c                        | 2 ++
 arch/arm/mach-uniphier/dram/umc-pxs2.c                        | 2 ++
 arch/arm/mach-uniphier/dram/umc-sld8.c                        | 2 ++
 arch/arm/mach-uniphier/dram_init.c                            | 2 ++
 arch/arm/mach-uniphier/memconf.c                              | 1 +
 arch/arm/mach-uniphier/micro-support-card.c                   | 2 ++
 arch/arm/mach-uniphier/mmc-boot-mode.c                        | 1 +
 arch/arm/mach-uniphier/reset.c                                | 1 +
 arch/arm/mach-uniphier/sc-regs.h                              | 1 +
 arch/arm/mach-uniphier/sc64-regs.h                            | 1 +
 arch/arm/mach-uniphier/sg-regs.h                              | 1 +
 arch/arm/mach-versal/include/mach/hardware.h                  | 1 +
 arch/arm/mach-versal/include/mach/sys_proto.h                 | 1 +
 arch/arm/mach-versal/mp.c                                     | 1 +
 arch/arm/mach-versatile/timer.c                               | 1 +
 arch/arm/mach-zynq/clk.c                                      | 1 +
 arch/arm/mach-zynq/cpu.c                                      | 1 +
 arch/arm/mach-zynq/ddrc.c                                     | 1 +
 arch/arm/mach-zynq/include/mach/hardware.h                    | 1 +
 arch/arm/mach-zynq/include/mach/sys_proto.h                   | 1 +
 arch/arm/mach-zynq/ps7_spl_init.c                             | 1 +
 arch/arm/mach-zynq/slcr.c                                     | 1 +
 arch/arm/mach-zynq/spl.c                                      | 1 +
 arch/arm/mach-zynq/timer.c                                    | 1 +
 arch/arm/mach-zynqmp-r5/cpu.c                                 | 1 +
 arch/arm/mach-zynqmp/clk.c                                    | 1 +
 arch/arm/mach-zynqmp/cpu.c                                    | 1 +
 arch/arm/mach-zynqmp/handoff.c                                | 1 +
 arch/arm/mach-zynqmp/include/mach/hardware.h                  | 1 +
 arch/arm/mach-zynqmp/include/mach/sys_proto.h                 | 1 +
 arch/arm/mach-zynqmp/mp.c                                     | 1 +
 arch/arm/mach-zynqmp/psu_spl_init.c                           | 2 ++
 arch/arm/mach-zynqmp/spl.c                                    | 1 +
 arch/m68k/cpu/mcf5227x/cpu.c                                  | 1 +
 arch/m68k/cpu/mcf5227x/speed.c                                | 1 +
 arch/m68k/cpu/mcf523x/cpu.c                                   | 1 +
 arch/m68k/cpu/mcf52x2/cpu.c                                   | 1 +
 arch/m68k/cpu/mcf52x2/cpu.h                                   | 1 +
 arch/m68k/cpu/mcf52x2/cpu_init.c                              | 1 +
 arch/m68k/cpu/mcf532x/cpu.c                                   | 1 +
 arch/m68k/cpu/mcf532x/cpu_init.c                              | 1 +
 arch/m68k/cpu/mcf532x/speed.c                                 | 1 +
 arch/m68k/cpu/mcf5445x/cpu.c                                  | 1 +
 arch/m68k/cpu/mcf5445x/cpu_init.c                             | 1 +
 arch/m68k/cpu/mcf5445x/pci.c                                  | 1 +
 arch/m68k/cpu/mcf5445x/speed.c                                | 1 +
 arch/m68k/cpu/mcf547x_8x/cpu.c                                | 1 +
 arch/m68k/cpu/mcf547x_8x/cpu_init.c                           | 1 +
 arch/m68k/cpu/mcf547x_8x/pci.c                                | 1 +
 arch/m68k/cpu/mcf547x_8x/slicetimer.c                         | 1 +
 arch/m68k/include/asm/coldfire/ata.h                          | 1 +
 arch/m68k/include/asm/coldfire/crossbar.h                     | 1 +
 arch/m68k/include/asm/coldfire/dspi.h                         | 1 +
 arch/m68k/include/asm/coldfire/edma.h                         | 1 +
 arch/m68k/include/asm/coldfire/eport.h                        | 1 +
 arch/m68k/include/asm/coldfire/flexbus.h                      | 1 +
 arch/m68k/include/asm/coldfire/flexcan.h                      | 1 +
 arch/m68k/include/asm/coldfire/intctrl.h                      | 1 +
 arch/m68k/include/asm/coldfire/lcd.h                          | 1 +
 arch/m68k/include/asm/coldfire/mdha.h                         | 1 +
 arch/m68k/include/asm/coldfire/pwm.h                          | 1 +
 arch/m68k/include/asm/coldfire/qspi.h                         | 1 +
 arch/m68k/include/asm/coldfire/rng.h                          | 1 +
 arch/m68k/include/asm/coldfire/skha.h                         | 1 +
 arch/m68k/include/asm/coldfire/ssi.h                          | 1 +
 arch/m68k/include/asm/fec.h                                   | 1 +
 arch/m68k/include/asm/fsl_mcdmafec.h                          | 1 +
 arch/m68k/include/asm/immap_520x.h                            | 1 +
 arch/m68k/include/asm/immap_5227x.h                           | 1 +
 arch/m68k/include/asm/immap_5235.h                            | 1 +
 arch/m68k/include/asm/immap_5272.h                            | 1 +
 arch/m68k/include/asm/immap_5275.h                            | 1 +
 arch/m68k/include/asm/immap_5282.h                            | 1 +
 arch/m68k/include/asm/immap_5301x.h                           | 1 +
 arch/m68k/include/asm/immap_5307.h                            | 1 +
 arch/m68k/include/asm/immap_5329.h                            | 1 +
 arch/m68k/include/asm/immap_5441x.h                           | 1 +
 arch/m68k/include/asm/immap_5445x.h                           | 1 +
 arch/m68k/include/asm/immap_547x_8x.h                         | 1 +
 arch/m68k/include/asm/io.h                                    | 1 +
 arch/m68k/include/asm/m5282.h                                 | 1 +
 arch/m68k/include/asm/ptrace.h                                | 1 +
 arch/m68k/include/asm/rtc.h                                   | 1 +
 arch/m68k/include/asm/timer.h                                 | 1 +
 arch/m68k/include/asm/uart.h                                  | 1 +
 arch/m68k/lib/bdinfo.c                                        | 1 +
 arch/m68k/lib/bootm.c                                         | 1 +
 arch/m68k/lib/cache.c                                         | 2 ++
 arch/m68k/lib/fec.c                                           | 1 +
 arch/m68k/lib/time.c                                          | 1 +
 arch/m68k/lib/traps.c                                         | 1 +
 arch/microblaze/cpu/cache.c                                   | 1 +
 arch/microblaze/cpu/interrupts.c                              | 1 +
 arch/microblaze/cpu/spl.c                                     | 1 +
 arch/microblaze/cpu/timer.c                                   | 1 +
 arch/microblaze/lib/bootm.c                                   | 1 +
 arch/mips/cpu/cpu.c                                           | 1 +
 arch/mips/cpu/time.c                                          | 1 +
 arch/mips/include/asm/cacheops.h                              | 1 +
 arch/mips/include/asm/io.h                                    | 1 +
 arch/mips/include/asm/mach-generic/ioremap.h                  | 1 +
 arch/mips/include/asm/mipsregs.h                              | 1 +
 arch/mips/include/asm/pgtable-bits.h                          | 1 +
 arch/mips/include/asm/sections.h                              | 1 +
 arch/mips/lib/boot.c                                          | 1 +
 arch/mips/lib/bootm.c                                         | 1 +
 arch/mips/lib/cache.c                                         | 3 +++
 arch/mips/lib/reloc.c                                         | 1 +
 arch/mips/lib/traps.c                                         | 1 +
 arch/mips/mach-ath79/ar933x/clk.c                             | 2 ++
 arch/mips/mach-ath79/ar933x/ddr.c                             | 1 +
 arch/mips/mach-ath79/ar934x/clk.c                             | 2 ++
 arch/mips/mach-ath79/ar934x/ddr.c                             | 1 +
 arch/mips/mach-ath79/cpu.c                                    | 1 +
 arch/mips/mach-ath79/qca953x/clk.c                            | 2 ++
 arch/mips/mach-ath79/qca953x/ddr.c                            | 1 +
 arch/mips/mach-ath79/qca956x/clk.c                            | 2 ++
 arch/mips/mach-ath79/qca956x/ddr.c                            | 1 +
 arch/mips/mach-ath79/reset.c                                  | 1 +
 arch/mips/mach-bmips/include/ioremap.h                        | 1 +
 arch/mips/mach-jz47xx/include/mach/jz4780.h                   | 2 ++
 arch/mips/mach-jz47xx/include/mach/jz4780_dram.h              | 1 +
 arch/mips/mach-jz47xx/jz4780/gpio.c                           | 1 +
 arch/mips/mach-jz47xx/jz4780/jz4780.c                         | 1 +
 arch/mips/mach-jz47xx/jz4780/pll.c                            | 2 ++
 arch/mips/mach-jz47xx/jz4780/reset.c                          | 1 +
 arch/mips/mach-jz47xx/jz4780/sdram.c                          | 2 ++
 arch/mips/mach-jz47xx/jz4780/timer.c                          | 2 ++
 arch/mips/mach-mscc/gpio.c                                    | 1 +
 arch/mips/mach-mscc/include/ioremap.h                         | 1 +
 arch/mips/mach-mscc/include/mach/common.h                     | 1 +
 arch/mips/mach-mscc/include/mach/ddr.h                        | 2 ++
 arch/mips/mach-mscc/include/mach/jr2/jr2.h                    | 1 +
 arch/mips/mach-mscc/include/mach/luton/luton.h                | 2 ++
 arch/mips/mach-mscc/include/mach/ocelot/ocelot.h              | 2 ++
 arch/mips/mach-mscc/include/mach/serval/serval.h              | 2 ++
 arch/mips/mach-mscc/include/mach/servalt/servalt.h            | 2 ++
 arch/mips/mach-mscc/include/mach/tlb.h                        | 1 +
 arch/mips/mach-mscc/phy.c                                     | 1 +
 arch/mips/mach-mscc/reset.c                                   | 1 +
 arch/mips/mach-mtmips/ddr_cal.c                               | 3 +++
 arch/mips/mach-mtmips/ddr_init.c                              | 2 ++
 arch/mips/mach-mtmips/include/mach/ddr.h                      | 1 +
 arch/mips/mach-mtmips/mt7628/ddr.c                            | 2 ++
 arch/mips/mach-mtmips/mt7628/init.c                           | 1 +
 arch/mips/mach-mtmips/mt7628/serial.c                         | 1 +
 arch/mips/mach-mtmips/spl.c                                   | 1 +
 arch/mips/mach-octeon/cache.c                                 | 1 +
 arch/mips/mach-octeon/clock.c                                 | 1 +
 arch/mips/mach-octeon/cpu.c                                   | 1 +
 arch/mips/mach-octeon/dram.c                                  | 1 +
 arch/mips/mach-octeon/include/ioremap.h                       | 1 +
 arch/mips/mach-pic32/cpu.c                                    | 2 ++
 arch/mips/mach-pic32/include/mach/ddr.h                       | 1 +
 arch/mips/mach-pic32/include/mach/pic32.h                     | 2 ++
 arch/mips/mach-pic32/reset.c                                  | 1 +
 arch/nds32/cpu/n1213/ag101/timer.c                            | 1 +
 arch/nds32/include/asm/bootm.h                                | 1 +
 arch/nds32/include/asm/io.h                                   | 1 +
 arch/nds32/include/asm/setup.h                                | 1 +
 arch/nds32/lib/boot.c                                         | 1 +
 arch/nds32/lib/bootm.c                                        | 1 +
 arch/nios2/cpu/interrupts.c                                   | 1 +
 arch/nios2/include/asm/dma-mapping.h                          | 1 +
 arch/nios2/include/asm/global_data.h                          | 1 +
 arch/nios2/include/asm/io.h                                   | 1 +
 arch/nios2/lib/bootm.c                                        | 1 +
 arch/powerpc/cpu/mpc83xx/arbiter/arbiter.h                    | 1 +
 arch/powerpc/cpu/mpc83xx/cpu.c                                | 1 +
 arch/powerpc/cpu/mpc83xx/cpu_init.c                           | 1 +
 arch/powerpc/cpu/mpc83xx/ecc.c                                | 2 ++
 arch/powerpc/cpu/mpc83xx/fdt.c                                | 1 +
 arch/powerpc/cpu/mpc83xx/initreg/initreg.h                    | 1 +
 arch/powerpc/cpu/mpc83xx/interrupts.c                         | 1 +
 arch/powerpc/cpu/mpc83xx/pci.c                                | 1 +
 arch/powerpc/cpu/mpc83xx/pcie.c                               | 1 +
 arch/powerpc/cpu/mpc83xx/qe_io.c                              | 1 +
 arch/powerpc/cpu/mpc83xx/spd_sdram.c                          | 1 +
 arch/powerpc/cpu/mpc83xx/speed.c                              | 1 +
 arch/powerpc/cpu/mpc83xx/spl_minimal.c                        | 1 +
 arch/powerpc/cpu/mpc83xx/traps.c                              | 1 +
 arch/powerpc/cpu/mpc85xx/b4860_serdes.c                       | 1 +
 arch/powerpc/cpu/mpc85xx/bsc9132_serdes.c                     | 1 +
 arch/powerpc/cpu/mpc85xx/c29x_serdes.c                        | 1 +
 arch/powerpc/cpu/mpc85xx/cmd_errata.c                         | 2 ++
 arch/powerpc/cpu/mpc85xx/commproc.c                           | 1 +
 arch/powerpc/cpu/mpc85xx/cpu.c                                | 2 ++
 arch/powerpc/cpu/mpc85xx/cpu_init.c                           | 2 ++
 arch/powerpc/cpu/mpc85xx/cpu_init_early.c                     | 1 +
 arch/powerpc/cpu/mpc85xx/ether_fcc.c                          | 1 +
 arch/powerpc/cpu/mpc85xx/fdt.c                                | 2 ++
 arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c                | 2 ++
 arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.h                | 1 +
 arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c                 | 1 +
 arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.h                 | 1 +
 arch/powerpc/cpu/mpc85xx/interrupts.c                         | 2 ++
 arch/powerpc/cpu/mpc85xx/liodn.c                              | 1 +
 arch/powerpc/cpu/mpc85xx/mp.c                                 | 1 +
 arch/powerpc/cpu/mpc85xx/mp.h                                 | 1 +
 arch/powerpc/cpu/mpc85xx/mpc8536_serdes.c                     | 1 +
 arch/powerpc/cpu/mpc85xx/mpc8544_serdes.c                     | 1 +
 arch/powerpc/cpu/mpc85xx/mpc8548_serdes.c                     | 1 +
 arch/powerpc/cpu/mpc85xx/mpc8568_serdes.c                     | 1 +
 arch/powerpc/cpu/mpc85xx/mpc8569_serdes.c                     | 1 +
 arch/powerpc/cpu/mpc85xx/mpc8572_serdes.c                     | 1 +
 arch/powerpc/cpu/mpc85xx/p1010_serdes.c                       | 1 +
 arch/powerpc/cpu/mpc85xx/p1021_serdes.c                       | 1 +
 arch/powerpc/cpu/mpc85xx/p1022_serdes.c                       | 1 +
 arch/powerpc/cpu/mpc85xx/p1023_serdes.c                       | 1 +
 arch/powerpc/cpu/mpc85xx/p2020_serdes.c                       | 1 +
 arch/powerpc/cpu/mpc85xx/p2041_serdes.c                       | 1 +
 arch/powerpc/cpu/mpc85xx/p3041_serdes.c                       | 1 +
 arch/powerpc/cpu/mpc85xx/p4080_serdes.c                       | 1 +
 arch/powerpc/cpu/mpc85xx/p5020_serdes.c                       | 1 +
 arch/powerpc/cpu/mpc85xx/p5040_serdes.c                       | 1 +
 arch/powerpc/cpu/mpc85xx/pci.c                                | 1 +
 arch/powerpc/cpu/mpc85xx/portals.c                            | 1 +
 arch/powerpc/cpu/mpc85xx/qe_io.c                              | 1 +
 arch/powerpc/cpu/mpc85xx/serial_scc.c                         | 2 ++
 arch/powerpc/cpu/mpc85xx/speed.c                              | 1 +
 arch/powerpc/cpu/mpc85xx/spl_minimal.c                        | 1 +
 arch/powerpc/cpu/mpc85xx/t1024_serdes.c                       | 1 +
 arch/powerpc/cpu/mpc85xx/t1040_serdes.c                       | 1 +
 arch/powerpc/cpu/mpc85xx/t4240_serdes.c                       | 1 +
 arch/powerpc/cpu/mpc85xx/tlb.c                                | 2 ++
 arch/powerpc/cpu/mpc85xx/traps.c                              | 1 +
 arch/powerpc/cpu/mpc86xx/cpu.c                                | 1 +
 arch/powerpc/cpu/mpc86xx/fdt.c                                | 1 +
 arch/powerpc/cpu/mpc86xx/interrupts.c                         | 1 +
 arch/powerpc/cpu/mpc86xx/mp.c                                 | 1 +
 arch/powerpc/cpu/mpc86xx/mpc8610_serdes.c                     | 1 +
 arch/powerpc/cpu/mpc86xx/mpc8641_serdes.c                     | 1 +
 arch/powerpc/cpu/mpc86xx/speed.c                              | 1 +
 arch/powerpc/cpu/mpc86xx/traps.c                              | 1 +
 arch/powerpc/cpu/mpc8xx/cpu.c                                 | 2 ++
 arch/powerpc/cpu/mpc8xx/cpu_init.c                            | 2 ++
 arch/powerpc/cpu/mpc8xx/immap.c                               | 2 ++
 arch/powerpc/cpu/mpc8xx/interrupts.c                          | 2 ++
 arch/powerpc/cpu/mpc8xx/speed.c                               | 2 ++
 arch/powerpc/cpu/mpc8xx/traps.c                               | 1 +
 arch/powerpc/cpu/mpc8xxx/cpu.c                                | 2 ++
 arch/powerpc/cpu/mpc8xxx/fdt.c                                | 1 +
 arch/powerpc/cpu/mpc8xxx/fsl_lbc.c                            | 1 +
 arch/powerpc/cpu/mpc8xxx/fsl_pamu.c                           | 1 +
 arch/powerpc/cpu/mpc8xxx/law.c                                | 1 +
 arch/powerpc/cpu/mpc8xxx/pamu_table.c                         | 1 +
 arch/powerpc/cpu/mpc8xxx/srio.c                               | 1 +
 arch/powerpc/include/asm/arch-mpc83xx/gpio.h                  | 1 +
 arch/powerpc/include/asm/arch-mpc85xx/gpio.h                  | 1 +
 arch/powerpc/include/asm/cache.h                              | 1 +
 arch/powerpc/include/asm/cpm_85xx.h                           | 1 +
 arch/powerpc/include/asm/cpm_8xx.h                            | 1 +
 arch/powerpc/include/asm/fsl_dma.h                            | 1 +
 arch/powerpc/include/asm/fsl_i2c.h                            | 2 ++
 arch/powerpc/include/asm/fsl_law.h                            | 1 +
 arch/powerpc/include/asm/fsl_lbc.h                            | 1 +
 arch/powerpc/include/asm/fsl_mpc83xx_serdes.h                 | 1 +
 arch/powerpc/include/asm/fsl_pamu.h                           | 1 +
 arch/powerpc/include/asm/fsl_pci.h                            | 1 +
 arch/powerpc/include/asm/fsl_portals.h                        | 1 +
 arch/powerpc/include/asm/fsl_serdes.h                         | 1 +
 arch/powerpc/include/asm/global_data.h                        | 2 +-
 arch/powerpc/include/asm/immap_86xx.h                         | 1 +
 arch/powerpc/include/asm/immap_8xx.h                          | 1 +
 arch/powerpc/include/asm/io.h                                 | 2 ++
 arch/powerpc/include/asm/iopin_8xx.h                          | 1 +
 arch/powerpc/include/asm/mmu.h                                | 1 +
 arch/powerpc/include/asm/mp.h                                 | 1 +
 arch/powerpc/include/asm/ppc.h                                | 1 +
 arch/powerpc/lib/bdinfo.c                                     | 2 ++
 arch/powerpc/lib/bootm.c                                      | 1 +
 arch/powerpc/lib/cache.c                                      | 1 +
 arch/powerpc/lib/interrupts.c                                 | 1 +
 arch/powerpc/lib/spl.c                                        | 1 +
 arch/powerpc/lib/stack.c                                      | 1 +
 arch/powerpc/lib/time.c                                       | 1 +
 arch/riscv/cpu/cpu.c                                          | 1 +
 arch/riscv/cpu/fu540/cache.c                                  | 1 +
 arch/riscv/cpu/fu540/dram.c                                   | 1 +
 arch/riscv/cpu/generic/dram.c                                 | 1 +
 arch/riscv/include/asm/global_data.h                          | 1 +
 arch/riscv/include/asm/io.h                                   | 1 +
 arch/riscv/include/asm/ptrace.h                               | 1 +
 arch/riscv/include/asm/smp.h                                  | 1 +
 arch/riscv/lib/andes_plic.c                                   | 2 ++
 arch/riscv/lib/andes_plmt.c                                   | 2 ++
 arch/riscv/lib/boot.c                                         | 1 +
 arch/riscv/lib/bootm.c                                        | 2 ++
 arch/riscv/lib/fdt_fixup.c                                    | 1 +
 arch/riscv/lib/image.c                                        | 1 +
 arch/riscv/lib/interrupts.c                                   | 1 +
 arch/riscv/lib/rdtime.c                                       | 2 ++
 arch/riscv/lib/reloc_riscv_efi.c                              | 1 +
 arch/riscv/lib/sbi.c                                          | 1 +
 arch/riscv/lib/sbi_ipi.c                                      | 1 +
 arch/riscv/lib/sifive_clint.c                                 | 2 ++
 arch/riscv/lib/smp.c                                          | 1 +
 arch/riscv/lib/spl.c                                          | 2 ++
 arch/sandbox/cpu/cpu.c                                        | 1 +
 arch/sandbox/cpu/sdl.c                                        | 1 +
 arch/sandbox/cpu/spl.c                                        | 1 +
 arch/sandbox/cpu/start.c                                      | 1 +
 arch/sandbox/cpu/state.c                                      | 1 +
 arch/sandbox/include/asm/axi.h                                | 1 +
 arch/sandbox/include/asm/clk.h                                | 1 +
 arch/sandbox/include/asm/eth.h                                | 1 +
 arch/sandbox/include/asm/global_data.h                        | 1 +
 arch/sandbox/include/asm/gpio.h                               | 1 +
 arch/sandbox/include/asm/handoff.h                            | 1 +
 arch/sandbox/include/asm/io.h                                 | 1 +
 arch/sandbox/include/asm/mbox.h                               | 1 +
 arch/sandbox/include/asm/sdl.h                                | 1 +
 arch/sandbox/include/asm/sections.h                           | 1 +
 arch/sandbox/include/asm/setjmp.h                             | 1 +
 arch/sandbox/include/asm/state.h                              | 1 +
 arch/sandbox/include/asm/test.h                               | 1 +
 arch/sandbox/include/asm/u-boot-sandbox.h                     | 1 +
 arch/sandbox/lib/bootm.c                                      | 2 ++
 arch/sandbox/lib/pci_io.c                                     | 1 +
 arch/sh/cpu/sh4/cache.c                                       | 1 +
 arch/sh/include/asm/pci.h                                     | 1 +
 arch/sh/include/asm/string.h                                  | 1 +
 arch/sh/lib/board.c                                           | 1 +
 arch/sh/lib/time_sh2.c                                        | 1 +
 arch/sh/lib/zimageboot.c                                      | 1 +
 arch/x86/cpu/acpi_gpe.c                                       | 1 +
 arch/x86/cpu/apollolake/cpu_spl.c                             | 1 +
 arch/x86/cpu/apollolake/fsp_bindings.c                        | 1 +
 arch/x86/cpu/apollolake/fsp_s.c                               | 2 ++
 arch/x86/cpu/apollolake/hostbridge.c                          | 1 +
 arch/x86/cpu/apollolake/lpc.c                                 | 1 +
 arch/x86/cpu/apollolake/pmc.c                                 | 2 ++
 arch/x86/cpu/apollolake/punit.c                               | 1 +
 arch/x86/cpu/apollolake/spl.c                                 | 1 +
 arch/x86/cpu/apollolake/uart.c                                | 1 +
 arch/x86/cpu/baytrail/acpi.c                                  | 1 +
 arch/x86/cpu/baytrail/cpu.c                                   | 1 +
 arch/x86/cpu/baytrail/early_uart.c                            | 1 +
 arch/x86/cpu/baytrail/fsp_configs.c                           | 1 +
 arch/x86/cpu/braswell/early_uart.c                            | 1 +
 arch/x86/cpu/braswell/fsp_configs.c                           | 1 +
 arch/x86/cpu/broadwell/adsp.c                                 | 1 +
 arch/x86/cpu/broadwell/cpu_full.c                             | 2 ++
 arch/x86/cpu/broadwell/iobp.c                                 | 1 +
 arch/x86/cpu/broadwell/lpc.c                                  | 1 +
 arch/x86/cpu/broadwell/me.c                                   | 1 +
 arch/x86/cpu/broadwell/northbridge.c                          | 2 ++
 arch/x86/cpu/broadwell/pch.c                                  | 2 ++
 arch/x86/cpu/broadwell/pinctrl_broadwell.c                    | 2 ++
 arch/x86/cpu/broadwell/refcode.c                              | 2 ++
 arch/x86/cpu/broadwell/sata.c                                 | 1 +
 arch/x86/cpu/broadwell/sdram.c                                | 1 +
 arch/x86/cpu/coreboot/coreboot.c                              | 1 +
 arch/x86/cpu/coreboot/sdram.c                                 | 1 +
 arch/x86/cpu/coreboot/tables.c                                | 2 ++
 arch/x86/cpu/coreboot/timestamp.c                             | 2 ++
 arch/x86/cpu/cpu.c                                            | 2 ++
 arch/x86/cpu/efi/payload.c                                    | 1 +
 arch/x86/cpu/efi/sdram.c                                      | 1 +
 arch/x86/cpu/i386/cpu.c                                       | 3 +++
 arch/x86/cpu/i386/interrupt.c                                 | 2 ++
 arch/x86/cpu/intel_common/cpu.c                               | 1 +
 arch/x86/cpu/intel_common/fast_spi.c                          | 1 +
 arch/x86/cpu/intel_common/itss.c                              | 2 ++
 arch/x86/cpu/intel_common/lpc.c                               | 2 ++
 arch/x86/cpu/intel_common/microcode.c                         | 1 +
 arch/x86/cpu/intel_common/mrc.c                               | 2 ++
 arch/x86/cpu/intel_common/p2sb.c                              | 2 ++
 arch/x86/cpu/intel_common/pch.c                               | 1 +
 arch/x86/cpu/intel_common/report_platform.c                   | 1 +
 arch/x86/cpu/ioapic.c                                         | 1 +
 arch/x86/cpu/irq.c                                            | 1 +
 arch/x86/cpu/ivybridge/bd82x6x.c                              | 1 +
 arch/x86/cpu/ivybridge/cpu.c                                  | 1 +
 arch/x86/cpu/ivybridge/early_me.c                             | 1 +
 arch/x86/cpu/ivybridge/lpc.c                                  | 1 +
 arch/x86/cpu/ivybridge/model_206ax.c                          | 2 ++
 arch/x86/cpu/ivybridge/northbridge.c                          | 1 +
 arch/x86/cpu/ivybridge/sata.c                                 | 1 +
 arch/x86/cpu/ivybridge/sdram.c                                | 1 +
 arch/x86/cpu/mp_init.c                                        | 2 ++
 arch/x86/cpu/mtrr.c                                           | 1 +
 arch/x86/cpu/pci.c                                            | 1 +
 arch/x86/cpu/qemu/dram.c                                      | 1 +
 arch/x86/cpu/qemu/qemu.c                                      | 1 +
 arch/x86/cpu/quark/acpi.c                                     | 1 +
 arch/x86/cpu/quark/dram.c                                     | 1 +
 arch/x86/cpu/quark/hte.c                                      | 1 +
 arch/x86/cpu/quark/hte.h                                      | 1 +
 arch/x86/cpu/quark/mrc.c                                      | 1 +
 arch/x86/cpu/quark/mrc_util.c                                 | 1 +
 arch/x86/cpu/quark/mrc_util.h                                 | 1 +
 arch/x86/cpu/quark/msg_port.c                                 | 1 +
 arch/x86/cpu/quark/quark.c                                    | 1 +
 arch/x86/cpu/quark/smc.c                                      | 1 +
 arch/x86/cpu/quark/smc.h                                      | 1 +
 arch/x86/cpu/queensbay/tnc.c                                  | 1 +
 arch/x86/cpu/slimbootloader/sdram.c                           | 1 +
 arch/x86/cpu/tangier/acpi.c                                   | 1 +
 arch/x86/cpu/tangier/pinmux.c                                 | 3 +++
 arch/x86/cpu/tangier/sdram.c                                  | 1 +
 arch/x86/include/asm/acpi_nhlt.h                              | 1 +
 arch/x86/include/asm/acpi_table.h                             | 1 +
 arch/x86/include/asm/arch-apollolake/fsp/fsp_m_upd.h          | 2 ++
 arch/x86/include/asm/arch-apollolake/fsp/fsp_s_upd.h          | 2 ++
 arch/x86/include/asm/arch-apollolake/fsp_bindings.h           | 1 +
 arch/x86/include/asm/arch-apollolake/global_nvs.h             | 2 ++
 arch/x86/include/asm/arch-apollolake/lpc.h                    | 1 +
 arch/x86/include/asm/arch-apollolake/uart.h                   | 1 +
 arch/x86/include/asm/arch-baytrail/fsp/fsp_vpd.h              | 2 ++
 arch/x86/include/asm/arch-baytrail/global_nvs.h               | 2 ++
 arch/x86/include/asm/arch-braswell/fsp/fsp_vpd.h              | 2 ++
 arch/x86/include/asm/arch-broadwell/gpio.h                    | 1 +
 arch/x86/include/asm/arch-broadwell/me.h                      | 2 ++
 arch/x86/include/asm/arch-broadwell/pch.h                     | 1 +
 arch/x86/include/asm/arch-broadwell/pei_data.h                | 2 ++
 arch/x86/include/asm/arch-broadwell/pm.h                      | 1 +
 arch/x86/include/asm/arch-coreboot/sysinfo.h                  | 1 +
 arch/x86/include/asm/arch-coreboot/timestamp.h                | 1 +
 arch/x86/include/asm/arch-ivybridge/fsp/fsp_configs.h         | 1 +
 arch/x86/include/asm/arch-ivybridge/me.h                      | 2 ++
 arch/x86/include/asm/arch-ivybridge/model_206ax.h             | 1 +
 arch/x86/include/asm/arch-ivybridge/pch.h                     | 1 +
 arch/x86/include/asm/arch-ivybridge/pei_data.h                | 2 ++
 arch/x86/include/asm/arch-qemu/qemu.h                         | 1 +
 arch/x86/include/asm/arch-quark/global_nvs.h                  | 2 ++
 arch/x86/include/asm/arch-quark/mrc.h                         | 1 +
 arch/x86/include/asm/arch-quark/msg_port.h                    | 1 +
 arch/x86/include/asm/arch-quark/quark.h                       | 1 +
 arch/x86/include/asm/arch-queensbay/fsp/fsp_vpd.h             | 2 ++
 arch/x86/include/asm/arch-queensbay/tnc.h                     | 1 +
 arch/x86/include/asm/arch-slimbootloader/slimbootloader.h     | 1 +
 arch/x86/include/asm/arch-tangier/global_nvs.h                | 2 ++
 arch/x86/include/asm/bootm.h                                  | 1 +
 arch/x86/include/asm/coreboot_tables.h                        | 2 ++
 arch/x86/include/asm/cpu.h                                    | 1 +
 arch/x86/include/asm/cpu_common.h                             | 1 +
 arch/x86/include/asm/early_cmos.h                             | 1 +
 arch/x86/include/asm/fast_spi.h                               | 1 +
 arch/x86/include/asm/fsp/fsp_api.h                            | 1 +
 arch/x86/include/asm/fsp/fsp_azalia.h                         | 2 ++
 arch/x86/include/asm/fsp/fsp_fv.h                             | 1 +
 arch/x86/include/asm/fsp/fsp_hob.h                            | 2 ++
 arch/x86/include/asm/fsp/fsp_infoheader.h                     | 2 ++
 arch/x86/include/asm/fsp/fsp_support.h                        | 1 +
 arch/x86/include/asm/fsp1/fsp_api.h                           | 1 +
 arch/x86/include/asm/fsp1/fsp_ffs.h                           | 2 ++
 arch/x86/include/asm/fsp1/fsp_support.h                       | 1 +
 arch/x86/include/asm/fsp2/fsp_api.h                           | 2 ++
 arch/x86/include/asm/fsp2/fsp_internal.h                      | 1 +
 arch/x86/include/asm/global_data.h                            | 2 ++
 arch/x86/include/asm/gpio.h                                   | 1 +
 arch/x86/include/asm/handoff.h                                | 2 ++
 arch/x86/include/asm/hob.h                                    | 1 +
 arch/x86/include/asm/intel_pinctrl.h                          | 1 +
 arch/x86/include/asm/io.h                                     | 1 +
 arch/x86/include/asm/ioapic.h                                 | 1 +
 arch/x86/include/asm/irq.h                                    | 1 +
 arch/x86/include/asm/me_common.h                              | 1 +
 arch/x86/include/asm/microcode.h                              | 1 +
 arch/x86/include/asm/mpspec.h                                 | 1 +
 arch/x86/include/asm/mrc_common.h                             | 1 +
 arch/x86/include/asm/mrccache.h                               | 1 +
 arch/x86/include/asm/mtrr.h                                   | 2 ++
 arch/x86/include/asm/pch_common.h                             | 1 +
 arch/x86/include/asm/pci.h                                    | 1 +
 arch/x86/include/asm/pirq_routing.h                           | 2 ++
 arch/x86/include/asm/pnp_def.h                                | 1 +
 arch/x86/include/asm/processor.h                              | 1 +
 arch/x86/include/asm/scu.h                                    | 1 +
 arch/x86/include/asm/sfi.h                                    | 1 +
 arch/x86/include/asm/sipi.h                                   | 2 ++
 arch/x86/include/asm/speedstep.h                              | 1 +
 arch/x86/include/asm/spl.h                                    | 1 +
 arch/x86/include/asm/tables.h                                 | 1 +
 arch/x86/include/asm/u-boot-x86.h                             | 1 +
 arch/x86/include/asm/zimage.h                                 | 1 +
 arch/x86/lib/acpi.c                                           | 1 +
 arch/x86/lib/acpi_nhlt.c                                      | 1 +
 arch/x86/lib/acpi_table.c                                     | 2 ++
 arch/x86/lib/bios.c                                           | 1 +
 arch/x86/lib/bios.h                                           | 3 +++
 arch/x86/lib/bios_interrupts.c                                | 1 +
 arch/x86/lib/bootm.c                                          | 1 +
 arch/x86/lib/cmd_boot.c                                       | 1 +
 arch/x86/lib/coreboot_table.c                                 | 1 +
 arch/x86/lib/div64.c                                          | 2 ++
 arch/x86/lib/e820.c                                           | 1 +
 arch/x86/lib/early_cmos.c                                     | 1 +
 arch/x86/lib/fsp/fsp_common.c                                 | 1 +
 arch/x86/lib/fsp/fsp_dram.c                                   | 1 +
 arch/x86/lib/fsp/fsp_graphics.c                               | 1 +
 arch/x86/lib/fsp/fsp_support.c                                | 1 +
 arch/x86/lib/fsp1/fsp_dram.c                                  | 1 +
 arch/x86/lib/fsp1/fsp_support.c                               | 1 +
 arch/x86/lib/fsp2/fsp_dram.c                                  | 1 +
 arch/x86/lib/fsp2/fsp_init.c                                  | 1 +
 arch/x86/lib/fsp2/fsp_meminit.c                               | 1 +
 arch/x86/lib/fsp2/fsp_silicon_init.c                          | 1 +
 arch/x86/lib/fsp2/fsp_support.c                               | 2 ++
 arch/x86/lib/hob.c                                            | 1 +
 arch/x86/lib/i8254.c                                          | 1 +
 arch/x86/lib/i8259.c                                          | 1 +
 arch/x86/lib/interrupts.c                                     | 1 +
 arch/x86/lib/mpspec.c                                         | 3 +++
 arch/x86/lib/mrccache.c                                       | 1 +
 arch/x86/lib/physmem.c                                        | 1 +
 arch/x86/lib/pinctrl_ich6.c                                   | 1 +
 arch/x86/lib/pirq_routing.c                                   | 2 ++
 arch/x86/lib/pmu.c                                            | 1 +
 arch/x86/lib/ramtest.c                                        | 1 +
 arch/x86/lib/relocate.c                                       | 1 +
 arch/x86/lib/scu.c                                            | 1 +
 arch/x86/lib/sfi.c                                            | 1 +
 arch/x86/lib/spl.c                                            | 2 ++
 arch/x86/lib/tables.c                                         | 1 +
 arch/x86/lib/tpl.c                                            | 2 ++
 arch/x86/lib/zimage.c                                         | 1 +
 arch/xtensa/cpu/cpu.c                                         | 1 +
 arch/xtensa/include/asm/ldscript.h                            | 1 +
 arch/xtensa/lib/bootm.c                                       | 1 +
 arch/xtensa/lib/cache.c                                       | 1 +
 arch/xtensa/lib/relocate.c                                    | 1 +
 arch/xtensa/lib/time.c                                        | 1 +
 board/AndesTech/adp-ae3xx/adp-ae3xx.c                         | 1 +
 board/AndesTech/adp-ag101p/adp-ag101p.c                       | 1 +
 board/AndesTech/ax25-ae350/ax25-ae350.c                       | 1 +
 board/Arcturus/ucp1020/cmd_arc.c                              | 1 +
 board/Arcturus/ucp1020/ddr.c                                  | 1 +
 board/Arcturus/ucp1020/spl.c                                  | 1 +
 board/Arcturus/ucp1020/spl_minimal.c                          | 1 +
 board/Arcturus/ucp1020/ucp1020.c                              | 1 +
 board/BuR/brppt1/board.c                                      | 1 +
 board/BuR/brppt2/board.c                                      | 1 +
 board/BuR/brsmarc1/board.c                                    | 1 +
 board/BuR/brxre1/board.c                                      | 1 +
 board/BuR/common/br_resetc.c                                  | 2 ++
 board/BuR/common/br_resetc.h                                  | 1 +
 board/BuR/common/bur_common.h                                 | 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/mox_sp.h                              | 1 +
 board/CZ.NIC/turris_mox/turris_mox.c                          | 1 +
 board/CZ.NIC/turris_omnia/turris_omnia.c                      | 2 ++
 board/LaCie/common/common.c                                   | 1 +
 board/LaCie/common/common.h                                   | 1 +
 board/LaCie/edminiv2/edminiv2.c                               | 1 +
 board/LaCie/net2big_v2/net2big_v2.c                           | 1 +
 board/LaCie/netspace_v2/netspace_v2.c                         | 1 +
 board/Marvell/aspenite/aspenite.c                             | 1 +
 board/Marvell/db-88f6281-bp/db-88f6281-bp.c                   | 1 +
 board/Marvell/db-88f6820-amc/db-88f6820-amc.c                 | 1 +
 board/Marvell/db-88f6820-gp/db-88f6820-gp.c                   | 1 +
 board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c                   | 1 +
 board/Marvell/dreamplug/dreamplug.c                           | 1 +
 board/Marvell/gplugd/gplugd.c                                 | 1 +
 board/Marvell/guruplug/guruplug.c                             | 1 +
 board/Marvell/mvebu_armada-37xx/board.c                       | 1 +
 board/Marvell/mvebu_armada-8k/board.c                         | 1 +
 board/Marvell/openrd/openrd.c                                 | 1 +
 board/Marvell/sheevaplug/sheevaplug.c                         | 1 +
 board/Seagate/dockstar/dockstar.c                             | 1 +
 board/Seagate/goflexhome/goflexhome.c                         | 1 +
 board/Seagate/nas220/nas220.c                                 | 1 +
 board/Synology/ds109/ds109.c                                  | 1 +
 board/Synology/ds109/ds109.h                                  | 1 +
 board/Synology/ds414/cmd_syno.c                               | 1 +
 board/Synology/ds414/ds414.c                                  | 1 +
 board/abilis/tb100/tb100.c                                    | 1 +
 board/advantech/dms-ba16/dms-ba16.c                           | 1 +
 board/advantech/imx8qm_rom7720_a1/imx8qm_rom7720_a1.c         | 1 +
 board/advantech/imx8qm_rom7720_a1/spl.c                       | 1 +
 board/advantech/som-db5800-som-6867/som-db5800-som-6867.c     | 1 +
 board/alliedtelesis/SBx81LIFKW/sbx81lifkw.c                   | 1 +
 board/alliedtelesis/SBx81LIFXCAT/sbx81lifxcat.c               | 1 +
 board/alliedtelesis/x530/x530.c                               | 1 +
 board/altera/arria5-socdk/qts/pinmux_config.h                 | 1 +
 board/altera/arria5-socdk/qts/sdram_config.h                  | 1 +
 board/altera/cyclone5-socdk/qts/pinmux_config.h               | 1 +
 board/altera/cyclone5-socdk/qts/sdram_config.h                | 1 +
 board/amazon/kc1/kc1.c                                        | 1 +
 board/amlogic/odroid-n2/odroid-n2.c                           | 1 +
 board/amlogic/p200/p200.c                                     | 1 +
 board/amlogic/p201/p201.c                                     | 1 +
 board/amlogic/p212/p212.c                                     | 1 +
 board/amlogic/q200/q200.c                                     | 1 +
 board/aries/mcvevk/qts/pinmux_config.h                        | 1 +
 board/aries/mcvevk/qts/sdram_config.h                         | 1 +
 board/aristainetos/aristainetos.c                             | 1 +
 board/armadeus/apf27/apf27.c                                  | 1 +
 board/armltd/integrator/integrator.c                          | 1 +
 board/armltd/integrator/pci.c                                 | 1 +
 board/armltd/integrator/timer.c                               | 1 +
 board/armltd/vexpress/vexpress_common.c                       | 1 +
 board/armltd/vexpress/vexpress_tc2.c                          | 1 +
 board/armltd/vexpress64/pcie.c                                | 1 +
 board/armltd/vexpress64/vexpress64.c                          | 2 ++
 board/astro/mcf5373l/fpga.c                                   | 1 +
 board/astro/mcf5373l/mcf5373l.c                               | 1 +
 board/atmark-techno/armadillo-800eva/armadillo-800eva.c       | 1 +
 board/atmel/at91rm9200ek/at91rm9200ek.c                       | 1 +
 board/atmel/at91sam9261ek/at91sam9261ek.c                     | 1 +
 board/atmel/at91sam9263ek/at91sam9263ek.c                     | 1 +
 board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c               | 1 +
 board/atmel/at91sam9n12ek/at91sam9n12ek.c                     | 1 +
 board/atmel/at91sam9rlek/at91sam9rlek.c                       | 1 +
 board/atmel/common/board.c                                    | 1 +
 board/atmel/common/mac-spi-nor.c                              | 1 +
 board/atmel/common/video_display.c                            | 1 +
 board/atmel/sama5d27_som1_ek/sama5d27_som1_ek.c               | 1 +
 board/atmel/sama5d27_wlsom1_ek/sama5d27_wlsom1_ek.c           | 1 +
 board/atmel/sama5d2_icp/sama5d2_icp.c                         | 1 +
 board/atmel/sama5d2_xplained/sama5d2_xplained.c               | 1 +
 board/atmel/sama5d3_xplained/sama5d3_xplained.c               | 1 +
 board/atmel/sama5d3xek/sama5d3xek.c                           | 1 +
 board/atmel/sama5d4_xplained/sama5d4_xplained.c               | 1 +
 board/atmel/sama5d4ek/sama5d4ek.c                             | 1 +
 board/avionic-design/common/tamonten-ng.c                     | 1 +
 board/bachmann/ot1200/ot1200.c                                | 1 +
 board/bachmann/ot1200/ot1200_spl.c                            | 1 +
 board/barco/platinum/spl_picon.c                              | 1 +
 board/barco/platinum/spl_titanium.c                           | 1 +
 board/beacon/beacon-rzg2m/beacon-rzg2m.c                      | 1 +
 board/beacon/imx8mm/spl.c                                     | 1 +
 board/beckhoff/mx53cx9020/mx53cx9020.c                        | 1 +
 board/beckhoff/mx53cx9020/mx53cx9020_video.c                  | 1 +
 board/bluegiga/apx4devkit/apx4devkit.c                        | 1 +
 board/bluegiga/apx4devkit/spl_boot.c                          | 1 +
 board/bluewater/gurnard/gurnard.c                             | 1 +
 board/bosch/shc/board.c                                       | 1 +
 board/bosch/shc/board.h                                       | 1 +
 board/boundary/nitrogen6x/nitrogen6x.c                        | 1 +
 board/broadcom/bcm_ep/board.c                                 | 1 +
 board/broadcom/bcmns2/northstar2.c                            | 1 +
 board/broadcom/bcmns3/ns3.c                                   | 1 +
 board/bticino/mamoj/spl.c                                     | 1 +
 board/buffalo/lsxl/lsxl.c                                     | 1 +
 board/cadence/xtfpga/xtfpga.c                                 | 1 +
 board/cavium/thunderx/atf.c                                   | 1 +
 board/cavium/thunderx/thunderx.c                              | 1 +
 board/ccv/xpress/spl.c                                        | 1 +
 board/ccv/xpress/xpress.c                                     | 1 +
 board/cirrus/edb93xx/edb93xx.c                                | 1 +
 board/cloudengines/pogo_e02/pogo_e02.c                        | 1 +
 board/cobra5272/flash.c                                       | 1 +
 board/compulab/cl-som-imx7/cl-som-imx7.c                      | 1 +
 board/compulab/cl-som-imx7/spl.c                              | 1 +
 board/compulab/cm_fx6/cm_fx6.c                                | 1 +
 board/compulab/cm_fx6/spl.c                                   | 1 +
 board/compulab/cm_t335/cm_t335.c                              | 1 +
 board/compulab/cm_t43/cm_t43.c                                | 1 +
 board/compulab/cm_t43/spl.c                                   | 1 +
 board/compulab/common/common.c                                | 2 ++
 board/compulab/common/common.h                                | 1 +
 board/compulab/common/eeprom.c                                | 1 +
 board/compulab/common/eeprom.h                                | 1 +
 board/compulab/common/omap3_display.c                         | 1 +
 board/compulab/common/omap3_smc911x.c                         | 1 +
 board/congatec/cgtqmx6eval/cgtqmx6eval.c                      | 2 ++
 board/congatec/conga-qeval20-qa3-e3845/conga-qeval20-qa3.c    | 1 +
 board/corscience/tricorder/led.c                              | 1 +
 board/corscience/tricorder/tricorder-eeprom.c                 | 2 ++
 board/corscience/tricorder/tricorder-eeprom.h                 | 2 ++
 board/corscience/tricorder/tricorder.c                        | 1 +
 board/cortina/presidio-asic/presidio.c                        | 1 +
 board/creative/xfi3/spl_boot.c                                | 1 +
 board/creative/xfi3/xfi3.c                                    | 1 +
 board/cssi/MCR3000/MCR3000.c                                  | 2 ++
 board/cssi/MCR3000/nand.c                                     | 1 +
 board/d-link/dns325/dns325.c                                  | 1 +
 board/davinci/da8xxevm/da850evm.c                             | 1 +
 board/davinci/da8xxevm/omapl138_lcdk.c                        | 1 +
 board/devboards/dbm-soc1/qts/pinmux_config.h                  | 1 +
 board/devboards/dbm-soc1/qts/sdram_config.h                   | 1 +
 board/dhelectronics/dh_imx6/dh_imx6.c                         | 1 +
 board/dhelectronics/dh_imx6/dh_imx6_spl.c                     | 1 +
 board/dhelectronics/dh_stm32mp1/board.c                       | 2 ++
 board/ebv/socrates/qts/pinmux_config.h                        | 1 +
 board/ebv/socrates/qts/sdram_config.h                         | 1 +
 board/eets/pdu001/board.c                                     | 1 +
 board/eets/pdu001/board.h                                     | 1 +
 board/eets/pdu001/mux.c                                       | 1 +
 board/egnite/ethernut5/ethernut5_pwrman.c                     | 1 +
 board/el/el6x/el6x.c                                          | 1 +
 board/embest/mx6boards/mx6boards.c                            | 1 +
 board/emulation/qemu-arm/qemu-arm.c                           | 1 +
 board/emulation/qemu-riscv/qemu-riscv.c                       | 1 +
 board/engicam/common/board.c                                  | 1 +
 board/engicam/common/spl.c                                    | 1 +
 board/engicam/imx6q/imx6q.c                                   | 1 +
 board/esd/meesc/meesc.c                                       | 1 +
 board/esd/vme8349/caddy.c                                     | 1 +
 board/esd/vme8349/caddy.h                                     | 1 +
 board/esd/vme8349/pci.c                                       | 1 +
 board/esd/vme8349/vme8349.c                                   | 1 +
 board/freescale/common/arm_sleep.c                            | 2 ++
 board/freescale/common/cadmus.c                               | 1 +
 board/freescale/common/cds_pci_ft.c                           | 1 +
 board/freescale/common/cmd_esbc_validate.c                    | 1 +
 board/freescale/common/dcu_sii9022a.c                         | 1 +
 board/freescale/common/diu_ch7301.c                           | 1 +
 board/freescale/common/emc2305.c                              | 1 +
 board/freescale/common/emc2305.h                              | 1 +
 board/freescale/common/fman.c                                 | 1 +
 board/freescale/common/fman.h                                 | 1 +
 board/freescale/common/fsl_chain_of_trust.c                   | 2 ++
 board/freescale/common/fsl_validate.c                         | 2 ++
 board/freescale/common/ics307_clk.c                           | 1 +
 board/freescale/common/idt8t49n222a_serdes_clk.h              | 1 +
 board/freescale/common/ls102xa_stream_id.c                    | 1 +
 board/freescale/common/mc34vr500.c                            | 1 +
 board/freescale/common/mpc85xx_sleep.c                        | 2 ++
 board/freescale/common/ngpixis.c                              | 1 +
 board/freescale/common/ngpixis.h                              | 1 +
 board/freescale/common/ns_access.c                            | 1 +
 board/freescale/common/pfuze.c                                | 1 +
 board/freescale/common/pfuze.h                                | 1 +
 board/freescale/common/pixis.c                                | 1 +
 board/freescale/common/pixis.h                                | 1 +
 board/freescale/common/pq-mds-pib.c                           | 1 +
 board/freescale/common/qixis.c                                | 2 ++
 board/freescale/common/qixis.h                                | 1 +
 board/freescale/common/sdhc_boot.c                            | 1 +
 board/freescale/common/sgmii_riser.c                          | 1 +
 board/freescale/common/spl.h                                  | 1 +
 board/freescale/common/sys_eeprom.c                           | 2 ++
 board/freescale/common/vid.c                                  | 2 ++
 board/freescale/common/vid.h                                  | 1 +
 board/freescale/corenet_ds/corenet_ds.c                       | 1 +
 board/freescale/corenet_ds/ddr.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/imx8mm_evk/spl.c                              | 1 +
 board/freescale/imx8mn_evk/spl.c                              | 1 +
 board/freescale/imx8mp_evk/spl.c                              | 1 +
 board/freescale/imx8mq_evk/spl.c                              | 1 +
 board/freescale/imx8qm_mek/imx8qm_mek.c                       | 2 ++
 board/freescale/imx8qm_mek/spl.c                              | 1 +
 board/freescale/imx8qxp_mek/imx8qxp_mek.c                     | 2 ++
 board/freescale/imx8qxp_mek/spl.c                             | 1 +
 board/freescale/imxrt1020-evk/imxrt1020-evk.c                 | 1 +
 board/freescale/imxrt1050-evk/imxrt1050-evk.c                 | 1 +
 board/freescale/ls1012afrdm/ls1012afrdm.c                     | 1 +
 board/freescale/ls1012aqds/eth.c                              | 1 +
 board/freescale/ls1012aqds/ls1012aqds.c                       | 2 ++
 board/freescale/ls1012ardb/eth.c                              | 1 +
 board/freescale/ls1012ardb/ls1012ardb.c                       | 1 +
 board/freescale/ls1021aiot/ls1021aiot.c                       | 1 +
 board/freescale/ls1021aqds/dcu.c                              | 1 +
 board/freescale/ls1021aqds/ddr.c                              | 2 ++
 board/freescale/ls1021aqds/ddr.h                              | 1 +
 board/freescale/ls1021aqds/eth.c                              | 1 +
 board/freescale/ls1021aqds/ls1021aqds.c                       | 2 ++
 board/freescale/ls1021atsn/ls1021atsn.c                       | 1 +
 board/freescale/ls1021atwr/ls1021atwr.c                       | 2 ++
 board/freescale/ls1028a/ls1028a.c                             | 2 ++
 board/freescale/ls1043aqds/ddr.c                              | 1 +
 board/freescale/ls1043aqds/ddr.h                              | 1 +
 board/freescale/ls1043aqds/eth.c                              | 1 +
 board/freescale/ls1043aqds/ls1043aqds.c                       | 2 ++
 board/freescale/ls1043ardb/cpld.c                             | 1 +
 board/freescale/ls1043ardb/cpld.h                             | 1 +
 board/freescale/ls1043ardb/ddr.c                              | 1 +
 board/freescale/ls1043ardb/ddr.h                              | 1 +
 board/freescale/ls1043ardb/eth.c                              | 1 +
 board/freescale/ls1043ardb/ls1043ardb.c                       | 1 +
 board/freescale/ls1046afrwy/eth.c                             | 1 +
 board/freescale/ls1046afrwy/ls1046afrwy.c                     | 1 +
 board/freescale/ls1046aqds/ddr.c                              | 1 +
 board/freescale/ls1046aqds/ddr.h                              | 1 +
 board/freescale/ls1046aqds/eth.c                              | 1 +
 board/freescale/ls1046aqds/ls1046aqds.c                       | 2 ++
 board/freescale/ls1046ardb/cpld.c                             | 1 +
 board/freescale/ls1046ardb/cpld.h                             | 1 +
 board/freescale/ls1046ardb/ddr.c                              | 1 +
 board/freescale/ls1046ardb/ddr.h                              | 1 +
 board/freescale/ls1046ardb/eth.c                              | 1 +
 board/freescale/ls1046ardb/ls1046ardb.c                       | 1 +
 board/freescale/ls1088a/ddr.c                                 | 1 +
 board/freescale/ls1088a/ddr.h                                 | 1 +
 board/freescale/ls1088a/eth_ls1088aqds.c                      | 3 +++
 board/freescale/ls1088a/eth_ls1088ardb.c                      | 1 +
 board/freescale/ls1088a/ls1088a.c                             | 3 +++
 board/freescale/ls2080a/ddr.c                                 | 1 +
 board/freescale/ls2080a/ddr.h                                 | 1 +
 board/freescale/ls2080a/ls2080a.c                             | 1 +
 board/freescale/ls2080aqds/ddr.c                              | 1 +
 board/freescale/ls2080aqds/ddr.h                              | 1 +
 board/freescale/ls2080aqds/eth.c                              | 3 +++
 board/freescale/ls2080aqds/ls2080aqds.c                       | 2 ++
 board/freescale/ls2080ardb/ddr.c                              | 1 +
 board/freescale/ls2080ardb/ddr.h                              | 1 +
 board/freescale/ls2080ardb/eth_ls2080rdb.c                    | 1 +
 board/freescale/ls2080ardb/ls2080ardb.c                       | 2 ++
 board/freescale/lx2160a/eth_lx2160aqds.c                      | 2 ++
 board/freescale/lx2160a/eth_lx2160ardb.c                      | 1 +
 board/freescale/lx2160a/lx2160a.c                             | 2 ++
 board/freescale/m5208evbe/m5208evbe.c                         | 1 +
 board/freescale/m52277evb/m52277evb.c                         | 1 +
 board/freescale/m5235evb/m5235evb.c                           | 1 +
 board/freescale/m5249evb/m5249evb.c                           | 1 +
 board/freescale/m5253demo/flash.c                             | 1 +
 board/freescale/m5253demo/m5253demo.c                         | 1 +
 board/freescale/m5282evb/m5282evb.c                           | 1 +
 board/freescale/m53017evb/m53017evb.c                         | 1 +
 board/freescale/m5329evb/m5329evb.c                           | 1 +
 board/freescale/m5329evb/nand.c                               | 1 +
 board/freescale/m5373evb/m5373evb.c                           | 1 +
 board/freescale/m5373evb/nand.c                               | 1 +
 board/freescale/m54418twr/m54418twr.c                         | 1 +
 board/freescale/m54451evb/m54451evb.c                         | 1 +
 board/freescale/m54455evb/m54455evb.c                         | 1 +
 board/freescale/m547xevb/m547xevb.c                           | 1 +
 board/freescale/m548xevb/m548xevb.c                           | 1 +
 board/freescale/mpc8308rdb/mpc8308rdb.c                       | 1 +
 board/freescale/mpc8308rdb/sdram.c                            | 1 +
 board/freescale/mpc8313erdb/mpc8313erdb.c                     | 1 +
 board/freescale/mpc8313erdb/sdram.c                           | 1 +
 board/freescale/mpc8315erdb/mpc8315erdb.c                     | 1 +
 board/freescale/mpc8315erdb/sdram.c                           | 1 +
 board/freescale/mpc8323erdb/mpc8323erdb.c                     | 1 +
 board/freescale/mpc832xemds/mpc832xemds.c                     | 1 +
 board/freescale/mpc8349emds/ddr.c                             | 1 +
 board/freescale/mpc8349emds/mpc8349emds.c                     | 1 +
 board/freescale/mpc8349emds/pci.c                             | 1 +
 board/freescale/mpc8349itx/mpc8349itx.c                       | 1 +
 board/freescale/mpc8349itx/pci.c                              | 1 +
 board/freescale/mpc837xemds/mpc837xemds.c                     | 2 ++
 board/freescale/mpc837xemds/pci.c                             | 1 +
 board/freescale/mpc837xerdb/mpc837xerdb.c                     | 2 ++
 board/freescale/mpc837xerdb/pci.c                             | 1 +
 board/freescale/mpc8541cds/mpc8541cds.c                       | 1 +
 board/freescale/mpc8544ds/mpc8544ds.c                         | 1 +
 board/freescale/mpc8548cds/mpc8548cds.c                       | 1 +
 board/freescale/mpc8555cds/mpc8555cds.c                       | 1 +
 board/freescale/mpc8568mds/bcsr.c                             | 1 +
 board/freescale/mpc8568mds/mpc8568mds.c                       | 1 +
 board/freescale/mpc8569mds/bcsr.c                             | 1 +
 board/freescale/mpc8569mds/mpc8569mds.c                       | 2 ++
 board/freescale/mpc8572ds/ddr.c                               | 1 +
 board/freescale/mpc8572ds/mpc8572ds.c                         | 2 ++
 board/freescale/mpc8610hpcd/mpc8610hpcd.c                     | 2 ++
 board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c                 | 1 +
 board/freescale/mpc8641hpcn/ddr.c                             | 1 +
 board/freescale/mpc8641hpcn/mpc8641hpcn.c                     | 2 ++
 board/freescale/mx23evk/spl_boot.c                            | 1 +
 board/freescale/mx28evk/iomux.c                               | 1 +
 board/freescale/mx51evk/mx51evk.c                             | 1 +
 board/freescale/mx53ard/mx53ard.c                             | 1 +
 board/freescale/mx53evk/mx53evk.c                             | 1 +
 board/freescale/mx53loco/mx53loco.c                           | 1 +
 board/freescale/mx53smd/mx53smd.c                             | 1 +
 board/freescale/mx6memcal/spl.c                               | 1 +
 board/freescale/mx6qarm2/mx6qarm2.c                           | 1 +
 board/freescale/mx6sabreauto/mx6sabreauto.c                   | 1 +
 board/freescale/mx6sabresd/mx6sabresd.c                       | 1 +
 board/freescale/mx6slevk/mx6slevk.c                           | 1 +
 board/freescale/mx6sllevk/mx6sllevk.c                         | 1 +
 board/freescale/mx6sxsabreauto/mx6sxsabreauto.c               | 1 +
 board/freescale/mx6sxsabresd/mx6sxsabresd.c                   | 1 +
 board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c             | 1 +
 board/freescale/p1010rdb/ddr.c                                | 1 +
 board/freescale/p1010rdb/p1010rdb.c                           | 2 ++
 board/freescale/p1010rdb/spl.c                                | 1 +
 board/freescale/p1010rdb/spl_minimal.c                        | 1 +
 board/freescale/p1023rdb/p1023rdb.c                           | 1 +
 board/freescale/p1_p2_rdb_pc/ddr.c                            | 1 +
 board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c                   | 1 +
 board/freescale/p1_p2_rdb_pc/spl.c                            | 1 +
 board/freescale/p1_p2_rdb_pc/spl_minimal.c                    | 1 +
 board/freescale/p2041rdb/cpld.c                               | 1 +
 board/freescale/p2041rdb/cpld.h                               | 1 +
 board/freescale/p2041rdb/ddr.c                                | 1 +
 board/freescale/p2041rdb/eth.c                                | 1 +
 board/freescale/p2041rdb/p2041rdb.c                           | 1 +
 board/freescale/qemu-ppce500/qemu-ppce500.c                   | 1 +
 board/freescale/s32v234evb/clock.c                            | 1 +
 board/freescale/s32v234evb/lpddr2.c                           | 1 +
 board/freescale/t102xrdb/cpld.c                               | 1 +
 board/freescale/t102xrdb/cpld.h                               | 1 +
 board/freescale/t102xrdb/ddr.c                                | 2 ++
 board/freescale/t102xrdb/eth_t102xrdb.c                       | 1 +
 board/freescale/t102xrdb/spl.c                                | 2 ++
 board/freescale/t102xrdb/t102xrdb.c                           | 2 ++
 board/freescale/t102xrdb/t102xrdb.h                           | 1 +
 board/freescale/t104xrdb/cpld.c                               | 1 +
 board/freescale/t104xrdb/cpld.h                               | 1 +
 board/freescale/t104xrdb/ddr.c                                | 2 ++
 board/freescale/t104xrdb/ddr.h                                | 1 +
 board/freescale/t104xrdb/diu.c                                | 1 +
 board/freescale/t104xrdb/spl.c                                | 1 +
 board/freescale/t104xrdb/t104xrdb.c                           | 2 ++
 board/freescale/t208xqds/ddr.c                                | 1 +
 board/freescale/t208xqds/ddr.h                                | 1 +
 board/freescale/t208xqds/eth_t208xqds.c                       | 1 +
 board/freescale/t208xqds/spl.c                                | 1 +
 board/freescale/t208xqds/t208xqds.c                           | 1 +
 board/freescale/t208xrdb/cpld.c                               | 1 +
 board/freescale/t208xrdb/cpld.h                               | 1 +
 board/freescale/t208xrdb/ddr.c                                | 1 +
 board/freescale/t208xrdb/ddr.h                                | 1 +
 board/freescale/t208xrdb/eth_t208xrdb.c                       | 1 +
 board/freescale/t208xrdb/spl.c                                | 1 +
 board/freescale/t208xrdb/t208xrdb.c                           | 1 +
 board/freescale/t4rdb/cpld.c                                  | 1 +
 board/freescale/t4rdb/cpld.h                                  | 1 +
 board/freescale/t4rdb/ddr.c                                   | 1 +
 board/freescale/t4rdb/ddr.h                                   | 1 +
 board/freescale/t4rdb/eth.c                                   | 1 +
 board/freescale/t4rdb/spl.c                                   | 1 +
 board/freescale/t4rdb/t4240rdb.c                              | 1 +
 board/friendlyarm/nanopi2/board.c                             | 1 +
 board/friendlyarm/nanopi2/hwrev.c                             | 1 +
 board/friendlyarm/nanopi2/hwrev.h                             | 1 +
 board/gardena/smart-gateway-mt7688/board.c                    | 2 ++
 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/gsc.h                              | 1 +
 board/gateworks/gw_ventana/gw_ventana.c                       | 1 +
 board/gateworks/gw_ventana/gw_ventana_spl.c                   | 1 +
 board/gateworks/gw_ventana/ventana_eeprom.h                   | 1 +
 board/gdsys/a38x/controlcenterdc.c                            | 1 +
 board/gdsys/a38x/dt_helpers.c                                 | 1 +
 board/gdsys/a38x/dt_helpers.h                                 | 1 +
 board/gdsys/a38x/hre.c                                        | 2 ++
 board/gdsys/a38x/hre.h                                        | 1 +
 board/gdsys/a38x/hydra.c                                      | 2 ++
 board/gdsys/a38x/hydra.h                                      | 1 +
 board/gdsys/a38x/ihs_phys.c                                   | 2 ++
 board/gdsys/a38x/ihs_phys.h                                   | 1 +
 board/gdsys/a38x/keyprogram.c                                 | 1 +
 board/gdsys/a38x/spl.c                                        | 1 +
 board/gdsys/common/cmd_ioloop.c                               | 2 ++
 board/gdsys/common/dp501.c                                    | 1 +
 board/gdsys/common/dp501.h                                    | 1 +
 board/gdsys/common/fanctrl.h                                  | 1 +
 board/gdsys/common/ihs_mdio.c                                 | 1 +
 board/gdsys/common/ihs_mdio.h                                 | 1 +
 board/gdsys/common/ioep-fpga.c                                | 1 +
 board/gdsys/common/mclink.h                                   | 1 +
 board/gdsys/common/osd.c                                      | 1 +
 board/gdsys/common/osd_cmd.c                                  | 1 +
 board/gdsys/common/phy.c                                      | 1 +
 board/gdsys/mpc8308/hrcon.c                                   | 2 ++
 board/gdsys/mpc8308/mpc8308.c                                 | 1 +
 board/gdsys/mpc8308/mpc8308.h                                 | 1 +
 board/gdsys/mpc8308/strider.c                                 | 2 ++
 board/gdsys/p1022/controlcenterd-id.c                         | 2 ++
 board/gdsys/p1022/controlcenterd.c                            | 1 +
 board/gdsys/p1022/ddr.c                                       | 1 +
 board/gdsys/p1022/diu.c                                       | 1 +
 board/gdsys/p1022/sdhc_boot.c                                 | 1 +
 board/ge/bx50v3/bx50v3.c                                      | 2 ++
 board/ge/common/ge_common.c                                   | 1 +
 board/ge/common/vpd_reader.c                                  | 1 +
 board/ge/common/vpd_reader.h                                  | 1 +
 board/ge/mx53ppd/mx53ppd.c                                    | 1 +
 board/ge/mx53ppd/mx53ppd_video.c                              | 1 +
 board/google/imx8mq_phanbell/spl.c                            | 1 +
 board/grinn/chiliboard/board.c                                | 1 +
 board/grinn/liteboard/board.c                                 | 1 +
 board/highbank/ahci.c                                         | 1 +
 board/highbank/highbank.c                                     | 2 ++
 board/hisilicon/hikey/hikey.c                                 | 1 +
 board/hisilicon/hikey960/hikey960.c                           | 1 +
 board/hisilicon/poplar/poplar.c                               | 1 +
 board/ids/ids8313/ids8313.c                                   | 1 +
 board/imgtec/boston/checkboard.c                              | 1 +
 board/imgtec/boston/ddr.c                                     | 1 +
 board/imgtec/ci20/ci20.c                                      | 2 ++
 board/imgtec/malta/malta.c                                    | 2 ++
 board/imgtec/malta/superio.c                                  | 1 +
 board/intel/edison/edison.c                                   | 1 +
 board/intel/galileo/galileo.c                                 | 1 +
 board/inversepath/usbarmory/usbarmory.c                       | 1 +
 board/iomega/iconnect/iconnect.c                              | 1 +
 board/is1/qts/pinmux_config.h                                 | 1 +
 board/is1/qts/sdram_config.h                                  | 1 +
 board/isee/igep003x/board.c                                   | 1 +
 board/isee/igep00x0/igep00x0.c                                | 1 +
 board/k+p/kp_imx53/kp_id_rev.c                                | 1 +
 board/k+p/kp_imx53/kp_id_rev.h                                | 2 ++
 board/k+p/kp_imx53/kp_imx53.c                                 | 1 +
 board/k+p/kp_imx6q_tpc/kp_imx6q_tpc_spl.c                     | 1 +
 board/keymile/common/common.c                                 | 1 +
 board/keymile/common/common.h                                 | 1 +
 board/keymile/common/qrio.c                                   | 2 ++
 board/keymile/common/qrio.h                                   | 1 +
 board/keymile/km83xx/km83xx.c                                 | 2 ++
 board/keymile/km83xx/km83xx_i2c.c                             | 1 +
 board/keymile/km_arm/fpga_config.c                            | 1 +
 board/keymile/km_arm/km_arm.c                                 | 1 +
 board/keymile/kmp204x/kmp204x.c                               | 1 +
 board/keymile/kmp204x/pci.c                                   | 1 +
 board/keymile/secu1/qts/pinmux_config.h                       | 1 +
 board/keymile/secu1/qts/sdram_config.h                        | 1 +
 board/keymile/secu1/socfpga.c                                 | 1 +
 board/kmc/kzm9g/kzm9g.c                                       | 1 +
 board/kobol/helios4/helios4.c                                 | 1 +
 board/kosagi/novena/novena.c                                  | 1 +
 board/kosagi/novena/novena_spl.c                              | 1 +
 board/kosagi/novena/video.c                                   | 1 +
 board/laird/wb50n/wb50n.c                                     | 1 +
 board/lego/ev3/legoev3.c                                      | 1 +
 board/lg/sniper/sniper.c                                      | 1 +
 board/liebherr/display5/display5.c                            | 2 ++
 board/liebherr/display5/spl.c                                 | 1 +
 board/liebherr/mccmon6/spl.c                                  | 1 +
 board/liebherr/xea/spl_xea.c                                  | 1 +
 board/liebherr/xea/xea.c                                      | 1 +
 board/logicpd/am3517evm/am3517evm.c                           | 1 +
 board/logicpd/imx6/imx6logic.c                                | 1 +
 board/logicpd/omap3som/omap3logic.c                           | 1 +
 board/menlo/m53menlo/m53menlo.c                               | 1 +
 board/microchip/pic32mzda/pic32mzda.c                         | 1 +
 board/mini-box/picosam9g45/picosam9g45.c                      | 1 +
 board/mpc8308_p1m/sdram.c                                     | 1 +
 board/mscc/common/spi.c                                       | 1 +
 board/mscc/jr2/jr2.c                                          | 2 ++
 board/mscc/luton/luton.c                                      | 1 +
 board/mscc/serval/serval.c                                    | 1 +
 board/netgear/dgnd3700v2/dgnd3700v2.c                         | 1 +
 board/nokia/rx51/rx51.c                                       | 1 +
 board/nokia/rx51/rx51.h                                       | 1 +
 board/nokia/rx51/tag_omap.h                                   | 1 +
 board/nvidia/cardhu/cardhu.c                                  | 1 +
 board/nvidia/dalmore/dalmore.c                                | 1 +
 board/nvidia/e2220-1170/e2220-1170.c                          | 1 +
 board/nvidia/p2371-0000/p2371-0000.c                          | 1 +
 board/nvidia/p2371-2180/p2371-2180.c                          | 1 +
 board/nvidia/p2571/p2571.c                                    | 1 +
 board/nvidia/p2771-0000/p2771-0000.c                          | 1 +
 board/nvidia/p3450-0000/p3450-0000.c                          | 1 +
 board/nvidia/venice2/as3722_init.c                            | 1 +
 board/olimex/mx23_olinuxino/spl_boot.c                        | 1 +
 board/phytec/pcl063/pcl063.c                                  | 1 +
 board/phytec/pcl063/spl.c                                     | 1 +
 board/phytec/pcm052/pcm052.c                                  | 1 +
 board/phytec/pcm058/pcm058.c                                  | 1 +
 board/phytec/pfla02/pfla02.c                                  | 1 +
 board/phytec/phycore_rk3288/phycore-rk3288.c                  | 1 +
 board/phytec/phycore_rk3288/som.h                             | 1 +
 board/phytium/durian/durian.c                                 | 1 +
 board/pine64/pinebook-pro-rk3399/pinebook-pro-rk3399.c        | 1 +
 board/pine64/rockpro64_rk3399/rockpro64-rk3399.c              | 1 +
 board/ppcag/bg0900/spl_boot.c                                 | 1 +
 board/qca/ap121/ap121.c                                       | 1 +
 board/qca/ap143/ap143.c                                       | 1 +
 board/qca/ap152/ap152.c                                       | 1 +
 board/qemu-mips/qemu-mips.c                                   | 1 +
 board/qualcomm/dragonboard410c/dragonboard410c.c              | 1 +
 board/qualcomm/dragonboard820c/dragonboard820c.c              | 1 +
 board/raidsonic/ib62x0/ib62x0.c                               | 1 +
 board/raspberrypi/rpi/rpi.c                                   | 2 ++
 board/renesas/alt/alt.c                                       | 1 +
 board/renesas/alt/alt_spl.c                                   | 1 +
 board/renesas/alt/qos.c                                       | 1 +
 board/renesas/blanche/blanche.c                               | 1 +
 board/renesas/blanche/qos.c                                   | 1 +
 board/renesas/condor/condor.c                                 | 1 +
 board/renesas/draak/draak.c                                   | 1 +
 board/renesas/eagle/eagle.c                                   | 1 +
 board/renesas/ebisu/ebisu.c                                   | 1 +
 board/renesas/gose/gose.c                                     | 1 +
 board/renesas/gose/gose_spl.c                                 | 1 +
 board/renesas/gose/qos.c                                      | 1 +
 board/renesas/grpeach/grpeach.c                               | 1 +
 board/renesas/koelsch/koelsch.c                               | 1 +
 board/renesas/koelsch/koelsch_spl.c                           | 1 +
 board/renesas/koelsch/qos.c                                   | 1 +
 board/renesas/lager/lager.c                                   | 1 +
 board/renesas/lager/lager_spl.c                               | 1 +
 board/renesas/lager/qos.c                                     | 1 +
 board/renesas/porter/porter.c                                 | 1 +
 board/renesas/porter/porter_spl.c                             | 1 +
 board/renesas/porter/qos.c                                    | 1 +
 board/renesas/rcar-common/gen3-spl.c                          | 1 +
 board/renesas/salvator-x/salvator-x.c                         | 1 +
 board/renesas/sh7757lcr/sh7757lcr.c                           | 1 +
 board/renesas/sh7763rdp/sh7763rdp.c                           | 1 +
 board/renesas/silk/qos.c                                      | 1 +
 board/renesas/silk/silk.c                                     | 1 +
 board/renesas/silk/silk_spl.c                                 | 1 +
 board/renesas/stout/cpld.c                                    | 1 +
 board/renesas/stout/qos.c                                     | 1 +
 board/renesas/stout/stout.c                                   | 1 +
 board/renesas/stout/stout_spl.c                               | 1 +
 board/renesas/ulcb/cpld.c                                     | 1 +
 board/renesas/ulcb/ulcb.c                                     | 1 +
 board/rockchip/tinker_rk3288/tinker-rk3288.c                  | 1 +
 board/samsung/arndale/arndale.c                               | 1 +
 board/samsung/common/board.c                                  | 2 ++
 board/samsung/common/exynos5-dt-types.c                       | 2 ++
 board/samsung/common/exynos5-dt.c                             | 1 +
 board/samsung/common/misc.c                                   | 1 +
 board/samsung/goni/goni.c                                     | 1 +
 board/samsung/origen/origen.c                                 | 1 +
 board/samsung/smdkc100/smdkc100.c                             | 1 +
 board/samsung/smdkv310/smdkv310.c                             | 1 +
 board/samsung/trats/trats.c                                   | 1 +
 board/samsung/trats2/trats2.c                                 | 1 +
 board/samsung/universal_c210/universal.c                      | 1 +
 board/sandbox/sandbox.c                                       | 1 +
 board/sandisk/sansa_fuze_plus/sfp.c                           | 1 +
 board/sandisk/sansa_fuze_plus/spl_boot.c                      | 1 +
 board/sbc8349/sbc8349.c                                       | 1 +
 board/sbc8548/ddr.c                                           | 2 ++
 board/sbc8548/sbc8548.c                                       | 1 +
 board/sbc8641d/sbc8641d.c                                     | 1 +
 board/schulercontrol/sc_sps_1/spl_boot.c                      | 1 +
 board/seco/mx6quq7/mx6quq7.c                                  | 1 +
 board/seeed/linkit-smart-7688/board.c                         | 1 +
 board/siemens/capricorn/board.c                               | 2 ++
 board/siemens/capricorn/spl.c                                 | 1 +
 board/siemens/common/factoryset.c                             | 1 +
 board/siemens/common/factoryset.h                             | 1 +
 board/siemens/corvus/board.c                                  | 1 +
 board/siemens/draco/board.c                                   | 1 +
 board/siemens/pxm2/board.c                                    | 1 +
 board/siemens/rut/board.c                                     | 2 ++
 board/sifive/fu540/fu540.c                                    | 1 +
 board/sifive/fu540/spl.c                                      | 1 +
 board/sks-kinkel/sksimx6/sksimx6.c                            | 1 +
 board/socrates/nand.c                                         | 1 +
 board/socrates/sdram.c                                        | 2 ++
 board/socrates/socrates.c                                     | 1 +
 board/softing/vining_2000/vining_2000.c                       | 2 ++
 board/softing/vining_fpga/qts/pinmux_config.h                 | 1 +
 board/softing/vining_fpga/qts/sdram_config.h                  | 1 +
 board/softing/vining_fpga/socfpga.c                           | 1 +
 board/solidrun/clearfog/clearfog.c                            | 2 ++
 board/solidrun/common/tlv_data.c                              | 2 ++
 board/solidrun/mx6cuboxi/mx6cuboxi.c                          | 2 ++
 board/spear/spear300/spear300.c                               | 1 +
 board/spear/spear310/spear310.c                               | 1 +
 board/spear/spear320/spear320.c                               | 1 +
 board/spear/spear600/spear600.c                               | 1 +
 board/spear/x600/fpga.c                                       | 1 +
 board/sr1500/qts/pinmux_config.h                              | 1 +
 board/sr1500/qts/sdram_config.h                               | 1 +
 board/st/common/stm32mp_dfu.c                                 | 2 ++
 board/st/common/stpmic1.c                                     | 1 +
 board/st/common/stpmic1.h                                     | 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/stm32f746-disco/stm32f746-disco.c                    | 1 +
 board/st/stm32h743-disco/stm32h743-disco.c                    | 1 +
 board/st/stm32h743-eval/stm32h743-eval.c                      | 1 +
 board/st/stm32mp1/spl.c                                       | 1 +
 board/st/stm32mp1/stm32mp1.c                                  | 2 ++
 board/st/stv0991/stv0991.c                                    | 1 +
 board/sunxi/board.c                                           | 1 +
 board/synopsys/axs10x/axs10x.c                                | 2 ++
 board/synopsys/emsdp/emsdp.c                                  | 1 +
 board/synopsys/hsdk/clk-lib.c                                 | 1 +
 board/synopsys/hsdk/clk-lib.h                                 | 1 +
 board/synopsys/hsdk/env-lib.h                                 | 1 +
 board/synopsys/hsdk/hsdk.c                                    | 3 +++
 board/synopsys/iot_devkit/iot_devkit.c                        | 1 +
 board/sysam/amcore/amcore.c                                   | 1 +
 board/sysam/stmark2/stmark2.c                                 | 1 +
 board/tbs/tbs2910/tbs2910.c                                   | 1 +
 board/tcl/sl50/board.c                                        | 1 +
 board/technexion/pico-imx6/pico-imx6.c                        | 1 +
 board/technexion/pico-imx6/spl.c                              | 1 +
 board/technexion/pico-imx6ul/pico-imx6ul.c                    | 1 +
 board/technexion/pico-imx6ul/spl.c                            | 1 +
 board/technexion/pico-imx7d/spl.c                             | 2 ++
 board/technexion/pico-imx8mq/spl.c                            | 1 +
 board/technologic/ts4600/iomux.c                              | 1 +
 board/technologic/ts4800/ts4800.c                             | 1 +
 board/technologic/ts4800/ts4800.h                             | 1 +
 board/terasic/de0-nano-soc/qts/pinmux_config.h                | 1 +
 board/terasic/de0-nano-soc/qts/sdram_config.h                 | 1 +
 board/terasic/de1-soc/qts/pinmux_config.h                     | 1 +
 board/terasic/de1-soc/qts/sdram_config.h                      | 1 +
 board/terasic/de1-soc/socfpga.c                               | 1 +
 board/terasic/de10-nano/qts/pinmux_config.h                   | 1 +
 board/terasic/de10-nano/qts/sdram_config.h                    | 1 +
 board/terasic/sockit/qts/pinmux_config.h                      | 1 +
 board/terasic/sockit/qts/sdram_config.h                       | 1 +
 board/theadorable/fpga.c                                      | 1 +
 board/theadorable/theadorable.c                               | 1 +
 board/theobroma-systems/puma_rk3399/puma-rk3399.c             | 1 +
 board/ti/am335x/board.c                                       | 1 +
 board/ti/am43xx/board.c                                       | 2 ++
 board/ti/am57xx/board.c                                       | 2 ++
 board/ti/am65x/evm.c                                          | 1 +
 board/ti/beagle/beagle.c                                      | 1 +
 board/ti/common/board_detect.c                                | 3 +++
 board/ti/common/board_detect.h                                | 2 ++
 board/ti/dra7xx/evm.c                                         | 1 +
 board/ti/evm/evm.c                                            | 1 +
 board/ti/evm/evm.h                                            | 1 +
 board/ti/j721e/evm.c                                          | 2 ++
 board/ti/ks2_evm/board.c                                      | 2 ++
 board/ti/ks2_evm/board_k2e.c                                  | 1 +
 board/ti/ks2_evm/board_k2g.c                                  | 1 +
 board/ti/ks2_evm/board_k2hk.c                                 | 1 +
 board/ti/ks2_evm/board_k2l.c                                  | 1 +
 board/ti/ks2_evm/ddr3_k2e.c                                   | 1 +
 board/ti/ks2_evm/ddr3_k2g.c                                   | 1 +
 board/ti/ks2_evm/ddr3_k2hk.c                                  | 1 +
 board/ti/ks2_evm/ddr3_k2l.c                                   | 1 +
 board/ti/omap5_uevm/evm.c                                     | 1 +
 board/ti/panda/panda.c                                        | 1 +
 board/ti/sdp4430/sdp.c                                        | 1 +
 board/ti/ti816x/evm.c                                         | 1 +
 board/timll/devkit3250/devkit3250_spl.c                       | 1 +
 board/timll/devkit8000/devkit8000.c                           | 1 +
 board/toradex/apalis-imx8/apalis-imx8.c                       | 1 +
 board/toradex/apalis-tk1/apalis-tk1.c                         | 1 +
 board/toradex/apalis-tk1/as3722_init.c                        | 1 +
 board/toradex/apalis_imx6/apalis_imx6.c                       | 1 +
 board/toradex/apalis_imx6/pf0100.c                            | 1 +
 board/toradex/apalis_t30/apalis_t30.c                         | 1 +
 board/toradex/colibri-imx8x/colibri-imx8x.c                   | 1 +
 board/toradex/colibri_imx6/colibri_imx6.c                     | 1 +
 board/toradex/colibri_imx6/pf0100.c                           | 1 +
 board/toradex/colibri_imx7/colibri_imx7.c                     | 1 +
 board/toradex/colibri_t20/colibri_t20.c                       | 1 +
 board/toradex/colibri_vf/colibri_vf.c                         | 1 +
 board/toradex/common/tdx-cfg-block.c                          | 2 ++
 board/toradex/common/tdx-common.c                             | 1 +
 board/toradex/verdin-imx8mm/spl.c                             | 1 +
 board/tplink/wdr4300/wdr4300.c                                | 1 +
 board/tqc/tqm834x/pci.c                                       | 1 +
 board/tqc/tqm834x/tqm834x.c                                   | 1 +
 board/tqc/tqma6/tqma6.c                                       | 2 ++
 board/udoo/neo/neo.c                                          | 1 +
 board/udoo/udoo.c                                             | 1 +
 board/udoo/udoo_spl.c                                         | 1 +
 board/variscite/dart_6ul/spl.c                                | 1 +
 board/varisys/common/sys_eeprom.c                             | 2 ++
 board/varisys/cyrus/cyrus.c                                   | 1 +
 board/varisys/cyrus/ddr.c                                     | 1 +
 board/ve8313/ve8313.c                                         | 1 +
 board/vscom/baltos/board.c                                    | 1 +
 board/vscom/baltos/board.h                                    | 1 +
 board/wandboard/spl.c                                         | 1 +
 board/wandboard/wandboard.c                                   | 2 ++
 board/work-microwave/work_92105/work_92105_display.c          | 1 +
 board/work-microwave/work_92105/work_92105_spl.c              | 1 +
 board/xes/common/actl_nand.c                                  | 1 +
 board/xes/common/fsl_8xxx_clk.c                               | 1 +
 board/xes/common/fsl_8xxx_misc.c                              | 1 +
 board/xes/common/fsl_8xxx_misc.h                              | 1 +
 board/xes/common/fsl_8xxx_pci.c                               | 1 +
 board/xes/xpedite517x/ddr.c                                   | 1 +
 board/xes/xpedite520x/ddr.c                                   | 1 +
 board/xes/xpedite537x/ddr.c                                   | 1 +
 board/xes/xpedite550x/ddr.c                                   | 1 +
 board/xilinx/common/board.c                                   | 1 +
 board/xilinx/microblaze-generic/microblaze-generic.c          | 1 +
 board/xilinx/versal/board.c                                   | 1 +
 board/xilinx/zynq/bootimg.c                                   | 1 +
 board/xilinx/zynq/cmds.c                                      | 2 ++
 board/xilinx/zynqmp/cmds.c                                    | 1 +
 board/xilinx/zynqmp/pm_cfg_obj.h                              | 1 +
 board/xilinx/zynqmp/tap_delays.c                              | 1 +
 board/xilinx/zynqmp/zynqmp.c                                  | 2 ++
 board/zyxel/nsa310s/nsa310s.c                                 | 1 +
 cmd/abootimg.c                                                | 1 +
 cmd/acpi.c                                                    | 1 +
 cmd/adtimg.c                                                  | 1 +
 cmd/aes.c                                                     | 1 +
 cmd/armflash.c                                                | 1 +
 cmd/avb.c                                                     | 2 ++
 cmd/axi.c                                                     | 1 +
 cmd/bcb.c                                                     | 1 +
 cmd/bdinfo.c                                                  | 2 ++
 cmd/bedbug.c                                                  | 1 +
 cmd/binop.c                                                   | 1 +
 cmd/blk_common.c                                              | 1 +
 cmd/blob.c                                                    | 2 ++
 cmd/bmp.c                                                     | 2 ++
 cmd/boot.c                                                    | 1 +
 cmd/bootefi.c                                                 | 1 +
 cmd/booti.c                                                   | 1 +
 cmd/bootm.c                                                   | 1 +
 cmd/bootstage.c                                               | 1 +
 cmd/bootz.c                                                   | 2 ++
 cmd/cache.c                                                   | 1 +
 cmd/cbfs.c                                                    | 1 +
 cmd/clk.c                                                     | 2 ++
 cmd/cpu.c                                                     | 1 +
 cmd/cramfs.c                                                  | 1 +
 cmd/cros_ec.c                                                 | 1 +
 cmd/demo.c                                                    | 1 +
 cmd/disk.c                                                    | 1 +
 cmd/eeprom.c                                                  | 2 ++
 cmd/efi.c                                                     | 2 ++
 cmd/efidebug.c                                                | 1 +
 cmd/elf.c                                                     | 1 +
 cmd/fastboot.c                                                | 1 +
 cmd/fat.c                                                     | 1 +
 cmd/flash.c                                                   | 1 +
 cmd/fpga.c                                                    | 1 +
 cmd/fpgad.c                                                   | 1 +
 cmd/fuse.c                                                    | 1 +
 cmd/gpio.c                                                    | 2 ++
 cmd/gpt.c                                                     | 2 ++
 cmd/i2c.c                                                     | 2 ++
 cmd/ini.c                                                     | 1 +
 cmd/io.c                                                      | 1 +
 cmd/iotrace.c                                                 | 1 +
 cmd/itest.c                                                   | 1 +
 cmd/jffs2.c                                                   | 1 +
 cmd/legacy-mtd-utils.c                                        | 1 +
 cmd/legacy-mtd-utils.h                                        | 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                                                     | 2 ++
 cmd/mii.c                                                     | 2 ++
 cmd/misc.c                                                    | 1 +
 cmd/mmc.c                                                     | 2 ++
 cmd/mtd.c                                                     | 2 ++
 cmd/mtdparts.c                                                | 1 +
 cmd/mvebu/bubt.c                                              | 1 +
 cmd/nand.c                                                    | 1 +
 cmd/net.c                                                     | 1 +
 cmd/nvedit.c                                                  | 2 ++
 cmd/nvedit_efi.c                                              | 2 ++
 cmd/onenand.c                                                 | 1 +
 cmd/osd.c                                                     | 1 +
 cmd/pcap.c                                                    | 1 +
 cmd/pci.c                                                     | 2 ++
 cmd/pmic.c                                                    | 1 +
 cmd/pxe_utils.c                                               | 2 ++
 cmd/pxe_utils.h                                               | 1 +
 cmd/qfw.c                                                     | 1 +
 cmd/read.c                                                    | 1 +
 cmd/regulator.c                                               | 1 +
 cmd/reiser.c                                                  | 1 +
 cmd/remoteproc.c                                              | 1 +
 cmd/rng.c                                                     | 1 +
 cmd/rtc.c                                                     | 1 +
 cmd/setexpr.c                                                 | 1 +
 cmd/sf.c                                                      | 2 ++
 cmd/source.c                                                  | 1 +
 cmd/spi.c                                                     | 1 +
 cmd/ti/ddr3.c                                                 | 1 +
 cmd/time.c                                                    | 1 +
 cmd/tlv_eeprom.c                                              | 2 ++
 cmd/tpm-common.c                                              | 1 +
 cmd/tpm-user-utils.h                                          | 1 +
 cmd/tpm-v1.c                                                  | 1 +
 cmd/tpm-v2.c                                                  | 1 +
 cmd/tpm_test.c                                                | 1 +
 cmd/trace.c                                                   | 1 +
 cmd/tsi148.c                                                  | 1 +
 cmd/ubi.c                                                     | 2 ++
 cmd/ubifs.c                                                   | 1 +
 cmd/universe.c                                                | 1 +
 cmd/unlz4.c                                                   | 1 +
 cmd/usb.c                                                     | 1 +
 cmd/usb_mass_storage.c                                        | 1 +
 cmd/version.c                                                 | 1 +
 cmd/w1.c                                                      | 1 +
 cmd/wdt.c                                                     | 1 +
 cmd/wol.c                                                     | 1 +
 cmd/x86/fsp.c                                                 | 1 +
 cmd/x86/hob.c                                                 | 1 +
 cmd/x86/mtrr.c                                                | 1 +
 cmd/ximg.c                                                    | 1 +
 cmd/yaffs2.c                                                  | 1 +
 cmd/zfs.c                                                     | 1 +
 common/android_ab.c                                           | 2 ++
 common/autoboot.c                                             | 1 +
 common/avb_verify.c                                           | 2 ++
 common/bloblist.c                                             | 2 ++
 common/board_f.c                                              | 3 +++
 common/board_info.c                                           | 1 +
 common/board_r.c                                              | 2 ++
 common/bootm.c                                                | 3 +++
 common/bootm_os.c                                             | 3 +++
 common/bootretry.c                                            | 1 +
 common/bootstage.c                                            | 1 +
 common/bouncebuf.c                                            | 1 +
 common/cli.c                                                  | 1 +
 common/cli_hush.c                                             | 1 +
 common/cli_readline.c                                         | 1 +
 common/command.c                                              | 1 +
 common/common_fit.c                                           | 1 +
 common/console.c                                              | 1 +
 common/ddr_spd.c                                              | 1 +
 common/dlmalloc.c                                             | 1 +
 common/edid.c                                                 | 2 ++
 common/eeprom/eeprom_layout.c                                 | 1 +
 common/fdt_support.c                                          | 1 +
 common/flash.c                                                | 1 +
 common/hash.c                                                 | 2 ++
 common/hwconfig.c                                             | 1 +
 common/image-android-dt.c                                     | 1 +
 common/image-android.c                                        | 2 ++
 common/image-cipher.c                                         | 1 +
 common/image-fdt.c                                            | 2 ++
 common/image-fit-sig.c                                        | 2 ++
 common/image-fit.c                                            | 1 +
 common/image-sig.c                                            | 1 +
 common/image.c                                                | 2 ++
 common/init/board_init.c                                      | 2 ++
 common/iotrace.c                                              | 1 +
 common/lcd.c                                                  | 1 +
 common/lcd_console.c                                          | 2 ++
 common/lcd_console_rotation.c                                 | 1 +
 common/lcd_simplefb.c                                         | 1 +
 common/log.c                                                  | 1 +
 common/log_syslog.c                                           | 1 +
 common/malloc_simple.c                                        | 1 +
 common/memsize.c                                              | 1 +
 common/s_record.c                                             | 1 +
 common/spl/spl.c                                              | 3 +++
 common/spl/spl_atf.c                                          | 2 ++
 common/spl/spl_bootrom.c                                      | 1 +
 common/spl/spl_ext.c                                          | 1 +
 common/spl/spl_fat.c                                          | 1 +
 common/spl/spl_fit.c                                          | 2 ++
 common/spl/spl_legacy.c                                       | 1 +
 common/spl/spl_mmc.c                                          | 2 ++
 common/spl/spl_nand.c                                         | 2 ++
 common/spl/spl_net.c                                          | 1 +
 common/spl/spl_nor.c                                          | 2 ++
 common/spl/spl_opensbi.c                                      | 1 +
 common/spl/spl_ram.c                                          | 1 +
 common/spl/spl_sata.c                                         | 1 +
 common/spl/spl_spi.c                                          | 2 ++
 common/spl/spl_ymodem.c                                       | 1 +
 common/splash.c                                               | 2 ++
 common/splash_source.c                                        | 2 ++
 common/stdio.c                                                | 1 +
 common/update.c                                               | 1 +
 common/usb.c                                                  | 2 ++
 common/usb_hub.c                                              | 3 +++
 common/usb_kbd.c                                              | 1 +
 common/usb_storage.c                                          | 1 +
 common/xyzModem.c                                             | 1 +
 disk/part.c                                                   | 1 +
 disk/part_amiga.c                                             | 1 +
 disk/part_amiga.h                                             | 1 +
 disk/part_dos.c                                               | 1 +
 disk/part_efi.c                                               | 1 +
 disk/part_iso.c                                               | 1 +
 disk/part_mac.c                                               | 1 +
 disk/part_mac.h                                               | 1 +
 drivers/adc/meson-saradc.c                                    | 2 ++
 drivers/adc/rockchip-saradc.c                                 | 1 +
 drivers/adc/stm32-adc-core.c                                  | 1 +
 drivers/adc/stm32-adc-core.h                                  | 1 +
 drivers/adc/stm32-adc.c                                       | 2 ++
 drivers/ata/ahci.c                                            | 2 ++
 drivers/ata/ahci_mvebu.c                                      | 2 ++
 drivers/ata/ahci_sunxi.c                                      | 1 +
 drivers/ata/dwc_ahci.c                                        | 1 +
 drivers/ata/dwc_ahsata.c                                      | 2 ++
 drivers/ata/fsl_sata.c                                        | 2 ++
 drivers/ata/fsl_sata.h                                        | 1 +
 drivers/ata/libata.c                                          | 1 +
 drivers/ata/mvsata_ide.c                                      | 1 +
 drivers/ata/sata.c                                            | 1 +
 drivers/ata/sata_ceva.c                                       | 1 +
 drivers/ata/sata_mv.c                                         | 1 +
 drivers/ata/sata_sandbox.c                                    | 1 +
 drivers/ata/sata_sil.c                                        | 1 +
 drivers/ata/sata_sil.h                                        | 1 +
 drivers/ata/sata_sil3114.c                                    | 1 +
 drivers/axi/axi-emul-uclass.c                                 | 1 +
 drivers/axi/axi-uclass.c                                      | 1 +
 drivers/axi/axi_sandbox.c                                     | 1 +
 drivers/axi/ihs_axi.c                                         | 1 +
 drivers/axi/sandbox_store.c                                   | 1 +
 drivers/bios_emulator/atibios.c                               | 1 +
 drivers/bios_emulator/besys.c                                 | 1 +
 drivers/bios_emulator/bios.c                                  | 1 +
 drivers/bios_emulator/biosemu.c                               | 1 +
 drivers/bios_emulator/include/biosemu.h                       | 1 +
 drivers/bios_emulator/include/x86emu/debug.h                  | 1 +
 drivers/bios_emulator/include/x86emu/decode.h                 | 1 +
 drivers/bios_emulator/include/x86emu/ops.h                    | 1 +
 drivers/bios_emulator/include/x86emu/prim_ops.h               | 1 +
 drivers/bios_emulator/include/x86emu/regs.h                   | 1 +
 drivers/bios_emulator/x86emu/debug.c                          | 1 +
 drivers/bios_emulator/x86emu/decode.c                         | 1 +
 drivers/bios_emulator/x86emu/ops.c                            | 1 +
 drivers/bios_emulator/x86emu/ops2.c                           | 1 +
 drivers/bios_emulator/x86emu/prim_ops.c                       | 1 +
 drivers/bios_emulator/x86emu/sys.c                            | 1 +
 drivers/block/blk-uclass.c                                    | 2 ++
 drivers/block/blk_legacy.c                                    | 2 ++
 drivers/block/ide.c                                           | 2 ++
 drivers/block/sandbox.c                                       | 1 +
 drivers/board/board-uclass.c                                  | 1 +
 drivers/board/sandbox.c                                       | 2 ++
 drivers/bootcount/bootcount-uclass.c                          | 1 +
 drivers/bootcount/bootcount.c                                 | 3 +++
 drivers/bootcount/bootcount_at91.c                            | 1 +
 drivers/bootcount/bootcount_davinci.c                         | 1 +
 drivers/bootcount/bootcount_env.c                             | 1 +
 drivers/bootcount/bootcount_ext.c                             | 1 +
 drivers/bootcount/bootcount_i2c.c                             | 1 +
 drivers/bootcount/bootcount_ram.c                             | 1 +
 drivers/bootcount/i2c-eeprom.c                                | 1 +
 drivers/bootcount/rtc.c                                       | 1 +
 drivers/bus/uniphier-system-bus.c                             | 1 +
 drivers/cache/cache-l2x0.c                                    | 1 +
 drivers/cache/cache-ncore.c                                   | 2 ++
 drivers/cache/cache-v5l2.c                                    | 2 ++
 drivers/clk/altera/clk-agilex.c                               | 2 ++
 drivers/clk/altera/clk-agilex.h                               | 1 +
 drivers/clk/altera/clk-arria10.c                              | 2 ++
 drivers/clk/analogbits/wrpll-cln28hpc.c                       | 1 +
 drivers/clk/aspeed/clk_ast2500.c                              | 2 ++
 drivers/clk/at91/clk-generated.c                              | 1 +
 drivers/clk/at91/clk-h32mx.c                                  | 1 +
 drivers/clk/at91/clk-main.c                                   | 1 +
 drivers/clk/at91/clk-master.c                                 | 1 +
 drivers/clk/at91/clk-peripheral.c                             | 1 +
 drivers/clk/at91/clk-plla.c                                   | 1 +
 drivers/clk/at91/clk-plladiv.c                                | 1 +
 drivers/clk/at91/clk-slow.c                                   | 1 +
 drivers/clk/at91/clk-system.c                                 | 1 +
 drivers/clk/at91/clk-usb.c                                    | 1 +
 drivers/clk/at91/clk-utmi.c                                   | 1 +
 drivers/clk/clk-cdce9xx.c                                     | 1 +
 drivers/clk/clk-composite.c                                   | 1 +
 drivers/clk/clk-divider.c                                     | 3 +++
 drivers/clk/clk-fixed-factor.c                                | 1 +
 drivers/clk/clk-gate.c                                        | 2 ++
 drivers/clk/clk-hsdk-cgu.c                                    | 3 +++
 drivers/clk/clk-mux.c                                         | 2 ++
 drivers/clk/clk-ti-sci.c                                      | 1 +
 drivers/clk/clk-uclass.c                                      | 2 ++
 drivers/clk/clk.c                                             | 1 +
 drivers/clk/clk_bcm6345.c                                     | 1 +
 drivers/clk/clk_boston.c                                      | 1 +
 drivers/clk/clk_fixed_factor.c                                | 1 +
 drivers/clk/clk_fixed_rate.c                                  | 1 +
 drivers/clk/clk_pic32.c                                       | 2 ++
 drivers/clk/clk_sandbox.c                                     | 1 +
 drivers/clk/clk_sandbox_ccf.c                                 | 3 +++
 drivers/clk/clk_sandbox_test.c                                | 1 +
 drivers/clk/clk_stm32f.c                                      | 2 ++
 drivers/clk/clk_stm32h7.c                                     | 1 +
 drivers/clk/clk_stm32mp1.c                                    | 3 +++
 drivers/clk/clk_versal.c                                      | 1 +
 drivers/clk/clk_vexpress_osc.c                                | 1 +
 drivers/clk/clk_zynq.c                                        | 2 ++
 drivers/clk/clk_zynqmp.c                                      | 2 ++
 drivers/clk/exynos/clk-exynos7420.c                           | 1 +
 drivers/clk/exynos/clk-pll.c                                  | 1 +
 drivers/clk/ics8n3qv01.c                                      | 1 +
 drivers/clk/imx/clk-composite-8m.c                            | 2 ++
 drivers/clk/imx/clk-gate2.c                                   | 2 ++
 drivers/clk/imx/clk-imx6q.c                                   | 2 ++
 drivers/clk/imx/clk-imx8.c                                    | 2 ++
 drivers/clk/imx/clk-imx8.h                                    | 1 +
 drivers/clk/imx/clk-imx8mm.c                                  | 3 +++
 drivers/clk/imx/clk-imx8mn.c                                  | 3 +++
 drivers/clk/imx/clk-imx8mp.c                                  | 3 +++
 drivers/clk/imx/clk-imx8qm.c                                  | 2 ++
 drivers/clk/imx/clk-imx8qxp.c                                 | 2 ++
 drivers/clk/imx/clk-imxrt1020.c                               | 2 ++
 drivers/clk/imx/clk-imxrt1050.c                               | 2 ++
 drivers/clk/imx/clk-pfd.c                                     | 2 ++
 drivers/clk/imx/clk-pll14xx.c                                 | 3 +++
 drivers/clk/imx/clk-pllv3.c                                   | 3 +++
 drivers/clk/imx/clk.h                                         | 2 ++
 drivers/clk/intel/clk_intel.c                                 | 1 +
 drivers/clk/kendryte/bypass.c                                 | 1 +
 drivers/clk/kendryte/clk.c                                    | 2 ++
 drivers/clk/kendryte/pll.c                                    | 3 +++
 drivers/clk/mediatek/clk-mt7622.c                             | 1 +
 drivers/clk/mediatek/clk-mt7623.c                             | 1 +
 drivers/clk/mediatek/clk-mt7629.c                             | 1 +
 drivers/clk/mediatek/clk-mtk.c                                | 2 ++
 drivers/clk/mediatek/clk-mtk.h                                | 2 ++
 drivers/clk/meson/axg.c                                       | 2 ++
 drivers/clk/meson/clk_meson.h                                 | 1 +
 drivers/clk/meson/g12a.c                                      | 2 ++
 drivers/clk/meson/gxbb.c                                      | 2 ++
 drivers/clk/mpc83xx_clk.c                                     | 2 ++
 drivers/clk/mpc83xx_clk.h                                     | 1 +
 drivers/clk/mtmips/clk-mt7628.c                               | 2 ++
 drivers/clk/mvebu/armada-37xx-periph.c                        | 3 +++
 drivers/clk/mvebu/armada-37xx-tbg.c                           | 2 ++
 drivers/clk/owl/clk_owl.c                                     | 1 +
 drivers/clk/owl/clk_owl.h                                     | 1 +
 drivers/clk/renesas/clk-rcar-gen2.c                           | 1 +
 drivers/clk/renesas/clk-rcar-gen3.c                           | 1 +
 drivers/clk/renesas/r8a774a1-cpg-mssr.c                       | 1 +
 drivers/clk/renesas/r8a7790-cpg-mssr.c                        | 1 +
 drivers/clk/renesas/r8a7791-cpg-mssr.c                        | 1 +
 drivers/clk/renesas/r8a7792-cpg-mssr.c                        | 1 +
 drivers/clk/renesas/r8a7794-cpg-mssr.c                        | 1 +
 drivers/clk/renesas/r8a7795-cpg-mssr.c                        | 1 +
 drivers/clk/renesas/r8a7796-cpg-mssr.c                        | 1 +
 drivers/clk/renesas/r8a77965-cpg-mssr.c                       | 1 +
 drivers/clk/renesas/r8a77970-cpg-mssr.c                       | 1 +
 drivers/clk/renesas/r8a77980-cpg-mssr.c                       | 1 +
 drivers/clk/renesas/r8a77990-cpg-mssr.c                       | 1 +
 drivers/clk/renesas/r8a77995-cpg-mssr.c                       | 1 +
 drivers/clk/renesas/rcar-gen2-cpg.h                           | 1 +
 drivers/clk/renesas/rcar-gen3-cpg.h                           | 2 ++
 drivers/clk/renesas/renesas-cpg-mssr.c                        | 2 ++
 drivers/clk/renesas/renesas-cpg-mssr.h                        | 2 ++
 drivers/clk/rockchip/clk_pll.c                                | 2 ++
 drivers/clk/rockchip/clk_px30.c                               | 1 +
 drivers/clk/rockchip/clk_rk3036.c                             | 1 +
 drivers/clk/rockchip/clk_rk3128.c                             | 1 +
 drivers/clk/rockchip/clk_rk3188.c                             | 2 ++
 drivers/clk/rockchip/clk_rk322x.c                             | 1 +
 drivers/clk/rockchip/clk_rk3288.c                             | 2 ++
 drivers/clk/rockchip/clk_rk3308.c                             | 1 +
 drivers/clk/rockchip/clk_rk3328.c                             | 1 +
 drivers/clk/rockchip/clk_rk3368.c                             | 1 +
 drivers/clk/rockchip/clk_rk3399.c                             | 1 +
 drivers/clk/rockchip/clk_rv1108.c                             | 1 +
 drivers/clk/sifive/fu540-prci.c                               | 2 ++
 drivers/clk/sunxi/clk_a10.c                                   | 1 +
 drivers/clk/sunxi/clk_a10s.c                                  | 1 +
 drivers/clk/sunxi/clk_a23.c                                   | 1 +
 drivers/clk/sunxi/clk_a31.c                                   | 1 +
 drivers/clk/sunxi/clk_a64.c                                   | 1 +
 drivers/clk/sunxi/clk_a80.c                                   | 1 +
 drivers/clk/sunxi/clk_a83t.c                                  | 1 +
 drivers/clk/sunxi/clk_h3.c                                    | 1 +
 drivers/clk/sunxi/clk_h6.c                                    | 1 +
 drivers/clk/sunxi/clk_r40.c                                   | 1 +
 drivers/clk/sunxi/clk_sunxi.c                                 | 2 ++
 drivers/clk/sunxi/clk_v3s.c                                   | 1 +
 drivers/clk/tegra/tegra-car-clk.c                             | 1 +
 drivers/clk/tegra/tegra186-clk.c                              | 1 +
 drivers/clk/uniphier/clk-uniphier-core.c                      | 2 ++
 drivers/core/acpi.c                                           | 1 +
 drivers/core/device-remove.c                                  | 1 +
 drivers/core/device.c                                         | 2 ++
 drivers/core/devres.c                                         | 2 ++
 drivers/core/dump.c                                           | 1 +
 drivers/core/fdtaddr.c                                        | 1 +
 drivers/core/of_access.c                                      | 2 ++
 drivers/core/of_addr.c                                        | 1 +
 drivers/core/of_extra.c                                       | 1 +
 drivers/core/ofnode.c                                         | 2 ++
 drivers/core/read.c                                           | 1 +
 drivers/core/regmap.c                                         | 1 +
 drivers/core/root.c                                           | 3 +++
 drivers/core/simple-bus.c                                     | 1 +
 drivers/core/syscon-uclass.c                                  | 1 +
 drivers/core/uclass.c                                         | 1 +
 drivers/cpu/bmips_cpu.c                                       | 2 ++
 drivers/cpu/imx8_cpu.c                                        | 1 +
 drivers/cpu/mpc83xx_cpu.c                                     | 1 +
 drivers/cpu/riscv_cpu.c                                       | 1 +
 drivers/crypto/ace_sha.h                                      | 1 +
 drivers/crypto/fsl/desc.h                                     | 2 ++
 drivers/crypto/fsl/desc_constr.h                              | 1 +
 drivers/crypto/fsl/error.c                                    | 1 +
 drivers/crypto/fsl/fsl_blob.c                                 | 1 +
 drivers/crypto/fsl/fsl_hash.c                                 | 1 +
 drivers/crypto/fsl/fsl_hash.h                                 | 1 +
 drivers/crypto/fsl/fsl_rsa.c                                  | 1 +
 drivers/crypto/fsl/jobdesc.c                                  | 1 +
 drivers/crypto/fsl/jobdesc.h                                  | 1 +
 drivers/crypto/fsl/jr.c                                       | 2 ++
 drivers/crypto/fsl/jr.h                                       | 2 ++
 drivers/crypto/fsl/rng.c                                      | 1 +
 drivers/crypto/fsl/rsa_caam.h                                 | 1 +
 drivers/crypto/fsl/sec.c                                      | 2 ++
 drivers/crypto/rsa_mod_exp/mod_exp_sw.c                       | 1 +
 drivers/crypto/rsa_mod_exp/mod_exp_uclass.c                   | 1 +
 drivers/ddr/altera/sdram_agilex.c                             | 1 +
 drivers/ddr/altera/sdram_arria10.c                            | 1 +
 drivers/ddr/altera/sdram_gen5.c                               | 1 +
 drivers/ddr/altera/sdram_s10.c                                | 1 +
 drivers/ddr/altera/sdram_soc64.c                              | 2 ++
 drivers/ddr/altera/sdram_soc64.h                              | 2 ++
 drivers/ddr/altera/sequencer.c                                | 2 ++
 drivers/ddr/altera/sequencer.h                                | 1 +
 drivers/ddr/fsl/arm_ddr_gen3.c                                | 2 ++
 drivers/ddr/fsl/ctrl_regs.c                                   | 3 +++
 drivers/ddr/fsl/ddr3_dimm_params.c                            | 1 +
 drivers/ddr/fsl/ddr4_dimm_params.c                            | 1 +
 drivers/ddr/fsl/fsl_ddr_gen4.c                                | 2 ++
 drivers/ddr/fsl/fsl_mmdc.c                                    | 1 +
 drivers/ddr/fsl/interactive.c                                 | 1 +
 drivers/ddr/fsl/main.c                                        | 3 +++
 drivers/ddr/fsl/mpc85xx_ddr_gen1.c                            | 1 +
 drivers/ddr/fsl/mpc85xx_ddr_gen2.c                            | 2 ++
 drivers/ddr/fsl/mpc85xx_ddr_gen3.c                            | 2 ++
 drivers/ddr/fsl/mpc86xx_ddr.c                                 | 1 +
 drivers/ddr/fsl/options.c                                     | 2 ++
 drivers/ddr/fsl/util.c                                        | 2 ++
 drivers/ddr/imx/imx8m/ddr_init.c                              | 1 +
 drivers/ddr/imx/imx8m/ddrphy_csr.c                            | 1 +
 drivers/ddr/imx/imx8m/ddrphy_utils.c                          | 1 +
 drivers/ddr/imx/imx8m/helper.c                                | 1 +
 drivers/ddr/marvell/a38x/ddr3_logging_def.h                   | 1 +
 drivers/ddr/marvell/a38x/ddr3_patterns_64bit.h                | 1 +
 drivers/ddr/marvell/a38x/ddr3_training_hw_algo.h              | 1 +
 drivers/ddr/marvell/a38x/ddr3_training_ip_centralization.h    | 1 +
 drivers/ddr/marvell/a38x/ddr3_training_ip_db.h                | 1 +
 drivers/ddr/marvell/a38x/ddr3_training_ip_pbs.h               | 1 +
 drivers/ddr/marvell/a38x/ddr3_training_leveling.h             | 1 +
 drivers/ddr/marvell/a38x/ddr_ml_wrapper.h                     | 1 +
 drivers/ddr/marvell/a38x/mv_ddr_common.h                      | 1 +
 drivers/ddr/marvell/a38x/seq_exec.h                           | 1 +
 drivers/ddr/marvell/a38x/xor.h                                | 1 +
 drivers/ddr/marvell/axp/ddr3_dfs.c                            | 1 +
 drivers/ddr/marvell/axp/ddr3_dqs.c                            | 1 +
 drivers/ddr/marvell/axp/ddr3_hw_training.c                    | 1 +
 drivers/ddr/marvell/axp/ddr3_init.c                           | 2 ++
 drivers/ddr/marvell/axp/ddr3_patterns_64bit.h                 | 1 +
 drivers/ddr/marvell/axp/ddr3_pbs.c                            | 1 +
 drivers/ddr/marvell/axp/ddr3_read_leveling.c                  | 1 +
 drivers/ddr/marvell/axp/ddr3_sdram.c                          | 1 +
 drivers/ddr/marvell/axp/ddr3_spd.c                            | 1 +
 drivers/ddr/marvell/axp/ddr3_write_leveling.c                 | 1 +
 drivers/ddr/marvell/axp/xor.c                                 | 1 +
 drivers/ddr/microchip/ddr2.c                                  | 2 ++
 drivers/ddr/microchip/ddr2_regs.h                             | 1 +
 drivers/demo/demo-shape.c                                     | 1 +
 drivers/demo/demo-simple.c                                    | 1 +
 drivers/dfu/dfu.c                                             | 3 +++
 drivers/dfu/dfu_mmc.c                                         | 1 +
 drivers/dfu/dfu_mtd.c                                         | 2 ++
 drivers/dfu/dfu_nand.c                                        | 1 +
 drivers/dfu/dfu_ram.c                                         | 1 +
 drivers/dfu/dfu_sf.c                                          | 1 +
 drivers/dfu/dfu_tftp.c                                        | 1 +
 drivers/dfu/dfu_virt.c                                        | 2 ++
 drivers/dma/MCD_dmaApi.c                                      | 1 +
 drivers/dma/MCD_tasks.c                                       | 1 +
 drivers/dma/MCD_tasksInit.c                                   | 1 +
 drivers/dma/apbh_dma.c                                        | 1 +
 drivers/dma/bcm6348-iudma.c                                   | 2 ++
 drivers/dma/dma-uclass.c                                      | 1 +
 drivers/dma/fsl_dma.c                                         | 1 +
 drivers/dma/keystone_nav.c                                    | 1 +
 drivers/dma/keystone_nav_cfg.c                                | 1 +
 drivers/dma/lpc32xx_dma.c                                     | 1 +
 drivers/dma/sandbox-dma-test.c                                | 1 +
 drivers/dma/ti-edma3.c                                        | 1 +
 drivers/dma/ti/k3-psil.c                                      | 1 +
 drivers/dma/ti/k3-udma.c                                      | 3 +++
 drivers/fastboot/fb_command.c                                 | 1 +
 drivers/fastboot/fb_common.c                                  | 2 ++
 drivers/fastboot/fb_getvar.c                                  | 1 +
 drivers/fastboot/fb_mmc.c                                     | 1 +
 drivers/fastboot/fb_nand.c                                    | 2 ++
 drivers/firmware/firmware-zynqmp.c                            | 1 +
 drivers/firmware/ti_sci.c                                     | 2 ++
 drivers/firmware/ti_sci.h                                     | 2 ++
 drivers/fpga/ACEX1K.c                                         | 1 +
 drivers/fpga/altera.c                                         | 1 +
 drivers/fpga/cyclon2.c                                        | 1 +
 drivers/fpga/fpga.c                                           | 2 ++
 drivers/fpga/lattice.c                                        | 1 +
 drivers/fpga/socfpga.c                                        | 1 +
 drivers/fpga/socfpga_arria10.c                                | 1 +
 drivers/fpga/socfpga_gen5.c                                   | 1 +
 drivers/fpga/spartan2.c                                       | 1 +
 drivers/fpga/spartan3.c                                       | 1 +
 drivers/fpga/stratix10.c                                      | 1 +
 drivers/fpga/stratixII.c                                      | 1 +
 drivers/fpga/stratixv.c                                       | 1 +
 drivers/fpga/versalpl.c                                       | 1 +
 drivers/fpga/virtex2.c                                        | 1 +
 drivers/fpga/xilinx.c                                         | 1 +
 drivers/fpga/zynqmppl.c                                       | 2 ++
 drivers/fpga/zynqpl.c                                         | 1 +
 drivers/gpio/74x164_gpio.c                                    | 1 +
 drivers/gpio/adi_gpio2.c                                      | 1 +
 drivers/gpio/altera_pio.c                                     | 1 +
 drivers/gpio/at91_gpio.c                                      | 1 +
 drivers/gpio/atmel_pio4.c                                     | 1 +
 drivers/gpio/axp_gpio.c                                       | 1 +
 drivers/gpio/bcm2835_gpio.c                                   | 1 +
 drivers/gpio/bcm6345_gpio.c                                   | 1 +
 drivers/gpio/cortina_gpio.c                                   | 1 +
 drivers/gpio/da8xx_gpio.h                                     | 1 +
 drivers/gpio/db8500_gpio.c                                    | 2 ++
 drivers/gpio/dwapb_gpio.c                                     | 1 +
 drivers/gpio/gpio-rcar.c                                      | 2 ++
 drivers/gpio/gpio-rza1.c                                      | 1 +
 drivers/gpio/gpio-uclass.c                                    | 2 ++
 drivers/gpio/gpio-uniphier.c                                  | 2 ++
 drivers/gpio/hi6220_gpio.c                                    | 1 +
 drivers/gpio/hsdk-creg-gpio.c                                 | 1 +
 drivers/gpio/imx_rgpio2p.c                                    | 1 +
 drivers/gpio/intel_broadwell_gpio.c                           | 1 +
 drivers/gpio/intel_gpio.c                                     | 1 +
 drivers/gpio/intel_ich6_gpio.c                                | 1 +
 drivers/gpio/iproc_gpio.c                                     | 2 ++
 drivers/gpio/kona_gpio.c                                      | 1 +
 drivers/gpio/kw_gpio.c                                        | 1 +
 drivers/gpio/mpc83xx_spisel_boot.c                            | 2 ++
 drivers/gpio/mpc8xxx_gpio.c                                   | 2 ++
 drivers/gpio/mscc_sgpio.c                                     | 2 ++
 drivers/gpio/msm_gpio.c                                       | 1 +
 drivers/gpio/mt7621_gpio.c                                    | 2 ++
 drivers/gpio/mvebu_gpio.c                                     | 1 +
 drivers/gpio/mvgpio.c                                         | 1 +
 drivers/gpio/mvgpio.h                                         | 1 +
 drivers/gpio/mvmfp.c                                          | 1 +
 drivers/gpio/mxc_gpio.c                                       | 1 +
 drivers/gpio/mxs_gpio.c                                       | 1 +
 drivers/gpio/nx_gpio.c                                        | 1 +
 drivers/gpio/omap_gpio.c                                      | 1 +
 drivers/gpio/pca953x.c                                        | 1 +
 drivers/gpio/pca953x_gpio.c                                   | 1 +
 drivers/gpio/pca9698.c                                        | 1 +
 drivers/gpio/pcf8575_gpio.c                                   | 1 +
 drivers/gpio/pm8916_gpio.c                                    | 1 +
 drivers/gpio/rk_gpio.c                                        | 1 +
 drivers/gpio/s5p_gpio.c                                       | 1 +
 drivers/gpio/sandbox.c                                        | 1 +
 drivers/gpio/sh_pfc.c                                         | 1 +
 drivers/gpio/sifive-gpio.c                                    | 2 ++
 drivers/gpio/spear_gpio.c                                     | 1 +
 drivers/gpio/stm32_gpio.c                                     | 1 +
 drivers/gpio/sunxi_gpio.c                                     | 1 +
 drivers/gpio/tca642x.c                                        | 1 +
 drivers/gpio/tegra186_gpio.c                                  | 2 ++
 drivers/gpio/tegra_gpio.c                                     | 1 +
 drivers/gpio/vybrid_gpio.c                                    | 1 +
 drivers/gpio/xilinx_gpio.c                                    | 1 +
 drivers/gpio/zynq_gpio.c                                      | 1 +
 drivers/hwspinlock/hwspinlock-uclass.c                        | 1 +
 drivers/hwspinlock/stm32_hwspinlock.c                         | 1 +
 drivers/i2c/ast_i2c.c                                         | 2 ++
 drivers/i2c/ast_i2c.h                                         | 1 +
 drivers/i2c/at91_i2c.c                                        | 2 ++
 drivers/i2c/at91_i2c.h                                        | 1 +
 drivers/i2c/cros_ec_ldo.c                                     | 1 +
 drivers/i2c/davinci_i2c.c                                     | 1 +
 drivers/i2c/davinci_i2c.h                                     | 1 +
 drivers/i2c/designware_i2c.c                                  | 2 ++
 drivers/i2c/designware_i2c.h                                  | 1 +
 drivers/i2c/designware_i2c_pci.c                              | 2 ++
 drivers/i2c/exynos_hs_i2c.c                                   | 1 +
 drivers/i2c/fsl_i2c.c                                         | 1 +
 drivers/i2c/i2c-cdns.c                                        | 2 ++
 drivers/i2c/i2c-cortina.c                                     | 1 +
 drivers/i2c/i2c-cortina.h                                     | 1 +
 drivers/i2c/i2c-gpio.c                                        | 2 ++
 drivers/i2c/i2c-uclass.c                                      | 1 +
 drivers/i2c/i2c-uniphier-f.c                                  | 1 +
 drivers/i2c/i2c-uniphier.c                                    | 1 +
 drivers/i2c/i2c-versatile.c                                   | 1 +
 drivers/i2c/i2c_core.c                                        | 2 ++
 drivers/i2c/ihs_i2c.c                                         | 2 ++
 drivers/i2c/imx_lpi2c.c                                       | 2 ++
 drivers/i2c/intel_i2c.c                                       | 1 +
 drivers/i2c/iproc_i2c.c                                       | 2 ++
 drivers/i2c/kona_i2c.c                                        | 1 +
 drivers/i2c/lpc32xx_i2c.c                                     | 1 +
 drivers/i2c/meson_i2c.c                                       | 2 ++
 drivers/i2c/muxes/i2c-arb-gpio-challenge.c                    | 1 +
 drivers/i2c/muxes/i2c-mux-gpio.c                              | 1 +
 drivers/i2c/muxes/i2c-mux-uclass.c                            | 1 +
 drivers/i2c/muxes/pca954x.c                                   | 1 +
 drivers/i2c/mv_i2c.c                                          | 2 ++
 drivers/i2c/mvtwsi.c                                          | 1 +
 drivers/i2c/mxc_i2c.c                                         | 2 ++
 drivers/i2c/nx_i2c.c                                          | 1 +
 drivers/i2c/octeon_i2c.c                                      | 2 ++
 drivers/i2c/omap24xx_i2c.c                                    | 2 ++
 drivers/i2c/rcar_i2c.c                                        | 2 ++
 drivers/i2c/rcar_iic.c                                        | 2 ++
 drivers/i2c/rk_i2c.c                                          | 2 ++
 drivers/i2c/s3c24x0_i2c.c                                     | 1 +
 drivers/i2c/s3c24x0_i2c.h                                     | 1 +
 drivers/i2c/sh_i2c.c                                          | 1 +
 drivers/i2c/soft_i2c.c                                        | 1 +
 drivers/i2c/stm32f7_i2c.c                                     | 2 ++
 drivers/i2c/tegra186_bpmp_i2c.c                               | 1 +
 drivers/i2c/tegra_i2c.c                                       | 2 ++
 drivers/i2c/xilinx_xiic.c                                     | 2 ++
 drivers/input/input.c                                         | 2 ++
 drivers/input/key_matrix.c                                    | 1 +
 drivers/input/tegra-kbc.c                                     | 1 +
 drivers/input/twl4030.c                                       | 1 +
 drivers/input/twl6030.c                                       | 1 +
 drivers/led/led_bcm6328.c                                     | 2 ++
 drivers/led/led_bcm6358.c                                     | 2 ++
 drivers/led/led_bcm6858.c                                     | 2 ++
 drivers/mailbox/k3-sec-proxy.c                                | 1 +
 drivers/mailbox/mailbox-uclass.c                              | 1 +
 drivers/mailbox/sandbox-mbox-test.c                           | 1 +
 drivers/mailbox/sandbox-mbox.c                                | 1 +
 drivers/mailbox/stm32-ipcc.c                                  | 2 ++
 drivers/mailbox/tegra-hsp.c                                   | 1 +
 drivers/mailbox/zynqmp-ipi.c                                  | 2 ++
 drivers/misc/ali512x.c                                        | 1 +
 drivers/misc/altera_sysid.c                                   | 1 +
 drivers/misc/atsha204a-i2c.c                                  | 1 +
 drivers/misc/cbmem_console.c                                  | 2 ++
 drivers/misc/cros_ec.c                                        | 2 ++
 drivers/misc/cros_ec_i2c.c                                    | 2 ++
 drivers/misc/cros_ec_lpc.c                                    | 1 +
 drivers/misc/cros_ec_sandbox.c                                | 2 ++
 drivers/misc/cros_ec_spi.c                                    | 1 +
 drivers/misc/ds4510.c                                         | 1 +
 drivers/misc/fs_loader.c                                      | 1 +
 drivers/misc/fsl_devdis.c                                     | 2 ++
 drivers/misc/fsl_ifc.c                                        | 1 +
 drivers/misc/fsl_iim.c                                        | 1 +
 drivers/misc/fsl_portals.c                                    | 2 ++
 drivers/misc/fsl_sec_mon.c                                    | 1 +
 drivers/misc/gdsys_ioep.c                                     | 1 +
 drivers/misc/gdsys_ioep.h                                     | 2 ++
 drivers/misc/gdsys_rxaui_ctrl.c                               | 1 +
 drivers/misc/i2c_eeprom.c                                     | 1 +
 drivers/misc/i2c_eeprom_emul.c                                | 1 +
 drivers/misc/ihs_fpga.c                                       | 1 +
 drivers/misc/ihs_fpga.h                                       | 1 +
 drivers/misc/imx8/fuse.c                                      | 1 +
 drivers/misc/imx8/scu.c                                       | 1 +
 drivers/misc/imx8/scu_api.c                                   | 1 +
 drivers/misc/irq-uclass.c                                     | 1 +
 drivers/misc/irq_sandbox.c                                    | 1 +
 drivers/misc/jz4780_efuse.c                                   | 2 ++
 drivers/misc/k3_avs.c                                         | 1 +
 drivers/misc/k3_esm.c                                         | 2 ++
 drivers/misc/microchip_flexcom.c                              | 1 +
 drivers/misc/misc_sandbox.c                                   | 1 +
 drivers/misc/mpc83xx_serdes.c                                 | 1 +
 drivers/misc/mpc83xx_serdes.h                                 | 1 +
 drivers/misc/mxc_ocotp.c                                      | 1 +
 drivers/misc/mxs_ocotp.c                                      | 1 +
 drivers/misc/p2sb-uclass.c                                    | 2 ++
 drivers/misc/p2sb_emul.c                                      | 1 +
 drivers/misc/p2sb_sandbox.c                                   | 1 +
 drivers/misc/pca9551_led.c                                    | 1 +
 drivers/misc/qfw.c                                            | 2 ++
 drivers/misc/rockchip-efuse.c                                 | 2 ++
 drivers/misc/rockchip-otp.c                                   | 2 ++
 drivers/misc/sandbox_adder.c                                  | 1 +
 drivers/misc/sifive-otp.c                                     | 2 ++
 drivers/misc/smsc_lpc47m.c                                    | 1 +
 drivers/misc/smsc_sio1007.c                                   | 1 +
 drivers/misc/spltest_sandbox.c                                | 1 +
 drivers/misc/status_led.c                                     | 1 +
 drivers/misc/stm32_rcc.c                                      | 1 +
 drivers/misc/stm32mp_fuse.c                                   | 1 +
 drivers/misc/swap_case.c                                      | 1 +
 drivers/misc/tegra186_bpmp.c                                  | 1 +
 drivers/misc/vexpress_config.c                                | 1 +
 drivers/misc/winbond_w83627.c                                 | 1 +
 drivers/mmc/am654_sdhci.c                                     | 2 ++
 drivers/mmc/arm_pl180_mmci.h                                  | 1 +
 drivers/mmc/aspeed_sdhci.c                                    | 1 +
 drivers/mmc/atmel_sdhci.c                                     | 1 +
 drivers/mmc/bcm2835_sdhci.c                                   | 1 +
 drivers/mmc/bcm2835_sdhost.c                                  | 3 +++
 drivers/mmc/ca_dw_mmc.c                                       | 2 ++
 drivers/mmc/davinci_mmc.c                                     | 1 +
 drivers/mmc/dw_mmc.c                                          | 1 +
 drivers/mmc/exynos_dw_mmc.c                                   | 1 +
 drivers/mmc/fsl_esdhc.c                                       | 3 +++
 drivers/mmc/fsl_esdhc_imx.c                                   | 2 ++
 drivers/mmc/fsl_esdhc_spl.c                                   | 1 +
 drivers/mmc/ftsdc010_mci.c                                    | 3 +++
 drivers/mmc/ftsdc010_mci.h                                    | 2 ++
 drivers/mmc/gen_atmel_mci.c                                   | 1 +
 drivers/mmc/hi6220_dw_mmc.c                                   | 1 +
 drivers/mmc/iproc_sdhci.c                                     | 1 +
 drivers/mmc/jz_mmc.c                                          | 2 ++
 drivers/mmc/kona_sdhci.c                                      | 1 +
 drivers/mmc/meson_gx_mmc.c                                    | 2 ++
 drivers/mmc/mmc-uclass.c                                      | 2 ++
 drivers/mmc/mmc.c                                             | 3 +++
 drivers/mmc/mmc_boot.c                                        | 1 +
 drivers/mmc/mmc_private.h                                     | 1 +
 drivers/mmc/mmc_spi.c                                         | 1 +
 drivers/mmc/mmc_write.c                                       | 1 +
 drivers/mmc/msm_sdhci.c                                       | 1 +
 drivers/mmc/mtk-sd.c                                          | 2 ++
 drivers/mmc/mv_sdhci.c                                        | 2 ++
 drivers/mmc/mvebu_mmc.c                                       | 1 +
 drivers/mmc/mxcmmc.c                                          | 1 +
 drivers/mmc/mxsmmc.c                                          | 1 +
 drivers/mmc/nexell_dw_mmc.c                                   | 1 +
 drivers/mmc/omap_hsmmc.c                                      | 3 +++
 drivers/mmc/pic32_sdhci.c                                     | 1 +
 drivers/mmc/pxa_mmc_gen.c                                     | 1 +
 drivers/mmc/renesas-sdhi.c                                    | 2 ++
 drivers/mmc/rockchip_dw_mmc.c                                 | 2 ++
 drivers/mmc/s5p_sdhci.c                                       | 1 +
 drivers/mmc/sandbox_mmc.c                                     | 1 +
 drivers/mmc/sdhci-cadence.c                                   | 2 ++
 drivers/mmc/sdhci.c                                           | 2 ++
 drivers/mmc/sh_mmcif.c                                        | 1 +
 drivers/mmc/sh_mmcif.h                                        | 1 +
 drivers/mmc/sh_sdhi.c                                         | 2 ++
 drivers/mmc/snps_dw_mmc.c                                     | 1 +
 drivers/mmc/socfpga_dw_mmc.c                                  | 1 +
 drivers/mmc/stm32_sdmmc2.c                                    | 2 ++
 drivers/mmc/sunxi_mmc.c                                       | 1 +
 drivers/mmc/tangier_sdhci.c                                   | 1 +
 drivers/mmc/tegra_mmc.c                                       | 1 +
 drivers/mmc/tmio-common.c                                     | 2 ++
 drivers/mmc/tmio-common.h                                     | 2 ++
 drivers/mmc/uniphier-sd.c                                     | 1 +
 drivers/mmc/xenon_sdhci.c                                     | 1 +
 drivers/mmc/zynq_sdhci.c                                      | 1 +
 drivers/mtd/altera_qspi.c                                     | 1 +
 drivers/mtd/cfi_flash.c                                       | 2 ++
 drivers/mtd/cfi_mtd.c                                         | 1 +
 drivers/mtd/hbmc-am654.c                                      | 2 ++
 drivers/mtd/jedec_flash.c                                     | 1 +
 drivers/mtd/mtd_uboot.c                                       | 1 +
 drivers/mtd/mtdcore.c                                         | 2 ++
 drivers/mtd/mtdpart.c                                         | 1 +
 drivers/mtd/mw_eeprom.c                                       | 1 +
 drivers/mtd/nand/raw/am335x_spl_bch.c                         | 2 ++
 drivers/mtd/nand/raw/arasan_nfc.c                             | 3 +++
 drivers/mtd/nand/raw/atmel_nand.c                             | 2 ++
 drivers/mtd/nand/raw/atmel_nand_ecc.h                         | 1 +
 drivers/mtd/nand/raw/brcmnand/bcm63158_nand.c                 | 3 +++
 drivers/mtd/nand/raw/brcmnand/bcm6368_nand.c                  | 3 +++
 drivers/mtd/nand/raw/brcmnand/bcm68360_nand.c                 | 3 +++
 drivers/mtd/nand/raw/brcmnand/bcm6838_nand.c                  | 3 +++
 drivers/mtd/nand/raw/brcmnand/bcm6858_nand.c                  | 3 +++
 drivers/mtd/nand/raw/brcmnand/brcmnand.c                      | 3 +++
 drivers/mtd/nand/raw/brcmnand/brcmnand.h                      | 1 +
 drivers/mtd/nand/raw/brcmnand/brcmnand_compat.c               | 1 +
 drivers/mtd/nand/raw/brcmnand/brcmnand_compat.h               | 2 ++
 drivers/mtd/nand/raw/davinci_nand.c                           | 2 ++
 drivers/mtd/nand/raw/denali.c                                 | 1 +
 drivers/mtd/nand/raw/denali.h                                 | 1 +
 drivers/mtd/nand/raw/denali_spl.c                             | 2 ++
 drivers/mtd/nand/raw/fsl_elbc_nand.c                          | 2 ++
 drivers/mtd/nand/raw/fsl_elbc_spl.c                           | 1 +
 drivers/mtd/nand/raw/fsl_ifc_nand.c                           | 2 ++
 drivers/mtd/nand/raw/fsl_ifc_spl.c                            | 1 +
 drivers/mtd/nand/raw/fsl_upm.c                                | 2 ++
 drivers/mtd/nand/raw/fsmc_nand.c                              | 2 ++
 drivers/mtd/nand/raw/kb9202_nand.c                            | 1 +
 drivers/mtd/nand/raw/kirkwood_nand.c                          | 1 +
 drivers/mtd/nand/raw/kmeter1_nand.c                           | 1 +
 drivers/mtd/nand/raw/lpc32xx_nand_mlc.c                       | 2 ++
 drivers/mtd/nand/raw/lpc32xx_nand_slc.c                       | 2 ++
 drivers/mtd/nand/raw/mxc_nand.c                               | 2 ++
 drivers/mtd/nand/raw/mxc_nand.h                               | 1 +
 drivers/mtd/nand/raw/mxc_nand_spl.c                           | 1 +
 drivers/mtd/nand/raw/mxs_nand.c                               | 1 +
 drivers/mtd/nand/raw/mxs_nand_spl.c                           | 1 +
 drivers/mtd/nand/raw/nand.c                                   | 2 ++
 drivers/mtd/nand/raw/nand_base.c                              | 2 ++
 drivers/mtd/nand/raw/nand_bbt.c                               | 1 +
 drivers/mtd/nand/raw/nand_ecc.c                               | 1 +
 drivers/mtd/nand/raw/nand_spl_loaders.c                       | 1 +
 drivers/mtd/nand/raw/nand_spl_simple.c                        | 2 ++
 drivers/mtd/nand/raw/nand_util.c                              | 1 +
 drivers/mtd/nand/raw/omap_elm.c                               | 1 +
 drivers/mtd/nand/raw/omap_gpmc.c                              | 2 ++
 drivers/mtd/nand/raw/pxa3xx_nand.c                            | 1 +
 drivers/mtd/nand/raw/pxa3xx_nand.h                            | 1 +
 drivers/mtd/nand/raw/stm32_fmc2_nand.c                        | 3 +++
 drivers/mtd/nand/raw/sunxi_nand.c                             | 3 +++
 drivers/mtd/nand/raw/sunxi_nand_spl.c                         | 2 ++
 drivers/mtd/nand/raw/tegra_nand.c                             | 1 +
 drivers/mtd/nand/raw/tegra_nand.h                             | 1 +
 drivers/mtd/nand/raw/vf610_nfc.c                              | 2 ++
 drivers/mtd/nand/raw/zynq_nand.c                              | 3 +++
 drivers/mtd/nand/spi/core.c                                   | 2 ++
 drivers/mtd/nand/spi/gigadevice.c                             | 1 +
 drivers/mtd/nand/spi/macronix.c                               | 1 +
 drivers/mtd/nand/spi/micron.c                                 | 1 +
 drivers/mtd/nand/spi/toshiba.c                                | 1 +
 drivers/mtd/nand/spi/winbond.c                                | 1 +
 drivers/mtd/onenand/onenand_base.c                            | 2 ++
 drivers/mtd/onenand/onenand_bbt.c                             | 1 +
 drivers/mtd/onenand/onenand_spl.c                             | 1 +
 drivers/mtd/onenand/samsung.c                                 | 2 ++
 drivers/mtd/pic32_flash.c                                     | 2 ++
 drivers/mtd/renesas_rpc_hf.c                                  | 2 ++
 drivers/mtd/spi/fsl_espi_spl.c                                | 1 +
 drivers/mtd/spi/sandbox.c                                     | 1 +
 drivers/mtd/spi/sf-uclass.c                                   | 1 +
 drivers/mtd/spi/sf_dataflash.c                                | 1 +
 drivers/mtd/spi/sf_mtd.c                                      | 1 +
 drivers/mtd/spi/sf_probe.c                                    | 1 +
 drivers/mtd/spi/spi-nor-core.c                                | 2 ++
 drivers/mtd/spi/spi-nor-tiny.c                                | 2 ++
 drivers/mtd/st_smi.c                                          | 1 +
 drivers/mtd/stm32_flash.c                                     | 1 +
 drivers/mtd/stm32_flash.h                                     | 1 +
 drivers/mtd/ubi/attach.c                                      | 1 +
 drivers/mtd/ubi/build.c                                       | 2 ++
 drivers/mtd/ubi/crc32table.h                                  | 1 +
 drivers/mtd/ubi/debug.c                                       | 1 +
 drivers/mtd/ubi/eba.c                                         | 1 +
 drivers/mtd/ubi/fastmap.c                                     | 1 +
 drivers/mtd/ubi/io.c                                          | 1 +
 drivers/mtd/ubi/misc.c                                        | 1 +
 drivers/mtd/ubi/ubi-media.h                                   | 2 ++
 drivers/mtd/ubi/upd.c                                         | 1 +
 drivers/mtd/ubi/vmt.c                                         | 1 +
 drivers/mtd/ubi/vtbl.c                                        | 1 +
 drivers/mtd/ubispl/ubispl.c                                   | 1 +
 drivers/net/ag7xxx.c                                          | 2 ++
 drivers/net/altera_tse.c                                      | 1 +
 drivers/net/altera_tse.h                                      | 2 ++
 drivers/net/armada100_fec.h                                   | 1 +
 drivers/net/at91_emac.c                                       | 1 +
 drivers/net/ax88796.c                                         | 1 +
 drivers/net/ax88796.h                                         | 1 +
 drivers/net/bcm-sf2-eth-gmac.c                                | 2 ++
 drivers/net/bcm-sf2-eth-gmac.h                                | 1 +
 drivers/net/bcm-sf2-eth.c                                     | 1 +
 drivers/net/bcm-sf2-eth.h                                     | 1 +
 drivers/net/bcm6348-eth.c                                     | 2 ++
 drivers/net/bcm6368-eth.c                                     | 2 ++
 drivers/net/bcmgenet.c                                        | 1 +
 drivers/net/calxedaxgmac.c                                    | 1 +
 drivers/net/cs8900.c                                          | 1 +
 drivers/net/cs8900.h                                          | 1 +
 drivers/net/dc2114x.c                                         | 2 ++
 drivers/net/designware.c                                      | 1 +
 drivers/net/designware.h                                      | 1 +
 drivers/net/dm9000x.c                                         | 1 +
 drivers/net/dnet.c                                            | 1 +
 drivers/net/dnet.h                                            | 1 +
 drivers/net/dwc_eth_qos.c                                     | 3 +++
 drivers/net/dwmac_socfpga.c                                   | 1 +
 drivers/net/e1000.c                                           | 2 ++
 drivers/net/e1000.h                                           | 1 +
 drivers/net/e1000_spi.c                                       | 2 ++
 drivers/net/eepro100.c                                        | 2 ++
 drivers/net/ep93xx_eth.h                                      | 1 +
 drivers/net/ethoc.c                                           | 2 ++
 drivers/net/fec_mxc.c                                         | 2 ++
 drivers/net/fec_mxc.h                                         | 1 +
 drivers/net/fm/b4860.c                                        | 1 +
 drivers/net/fm/eth.c                                          | 2 ++
 drivers/net/fm/fdt.c                                          | 1 +
 drivers/net/fm/fm.c                                           | 1 +
 drivers/net/fm/fm.h                                           | 1 +
 drivers/net/fm/init.c                                         | 1 +
 drivers/net/fm/ls1043.c                                       | 1 +
 drivers/net/fm/ls1046.c                                       | 1 +
 drivers/net/fm/memac_phy.c                                    | 1 +
 drivers/net/fm/p1023.c                                        | 1 +
 drivers/net/fm/p4080.c                                        | 1 +
 drivers/net/fm/p5020.c                                        | 1 +
 drivers/net/fm/p5040.c                                        | 1 +
 drivers/net/fm/t1024.c                                        | 2 ++
 drivers/net/fm/t1040.c                                        | 1 +
 drivers/net/fm/t2080.c                                        | 2 ++
 drivers/net/fm/t4240.c                                        | 2 ++
 drivers/net/fm/tgec_phy.c                                     | 1 +
 drivers/net/fsl-mc/dpbp.c                                     | 1 +
 drivers/net/fsl-mc/dpio/dpio.c                                | 1 +
 drivers/net/fsl-mc/dpio/qbman_portal.c                        | 1 +
 drivers/net/fsl-mc/dpio/qbman_sys.h                           | 2 ++
 drivers/net/fsl-mc/dpmac.c                                    | 1 +
 drivers/net/fsl-mc/dpmng.c                                    | 1 +
 drivers/net/fsl-mc/dpni.c                                     | 1 +
 drivers/net/fsl-mc/dprc.c                                     | 1 +
 drivers/net/fsl-mc/dpsparser.c                                | 1 +
 drivers/net/fsl-mc/fsl_dpmng_cmd.h                            | 1 +
 drivers/net/fsl-mc/mc.c                                       | 3 +++
 drivers/net/fsl-mc/mc_sys.c                                   | 1 +
 drivers/net/fsl_enetc.c                                       | 2 ++
 drivers/net/fsl_enetc.h                                       | 1 +
 drivers/net/fsl_enetc_mdio.c                                  | 1 +
 drivers/net/fsl_ls_mdio.c                                     | 1 +
 drivers/net/fsl_mcdmafec.c                                    | 1 +
 drivers/net/fsl_mdio.c                                        | 2 ++
 drivers/net/ftgmac100.c                                       | 1 +
 drivers/net/ftmac100.c                                        | 1 +
 drivers/net/ftmac110.c                                        | 2 ++
 drivers/net/ftmac110.h                                        | 1 +
 drivers/net/gmac_rockchip.c                                   | 1 +
 drivers/net/higmacv300.c                                      | 2 ++
 drivers/net/ks8851_mll.c                                      | 1 +
 drivers/net/lan91c96.c                                        | 1 +
 drivers/net/ldpaa_eth/ldpaa_eth.c                             | 1 +
 drivers/net/ldpaa_eth/ldpaa_eth.h                             | 2 ++
 drivers/net/ldpaa_eth/ldpaa_wriop.c                           | 1 +
 drivers/net/ldpaa_eth/ls1088a.c                               | 2 ++
 drivers/net/ldpaa_eth/ls2080a.c                               | 2 ++
 drivers/net/ldpaa_eth/lx2160a.c                               | 2 ++
 drivers/net/lpc32xx_eth.c                                     | 1 +
 drivers/net/macb.c                                            | 3 +++
 drivers/net/mcffec.c                                          | 1 +
 drivers/net/mcfmii.c                                          | 1 +
 drivers/net/mdio_mux_i2creg.c                                 | 1 +
 drivers/net/mdio_mux_sandbox.c                                | 1 +
 drivers/net/mdio_sandbox.c                                    | 1 +
 drivers/net/mpc8xx_fec.c                                      | 2 ++
 drivers/net/mscc_eswitch/jr2_switch.c                         | 2 ++
 drivers/net/mscc_eswitch/luton_switch.c                       | 2 ++
 drivers/net/mscc_eswitch/mscc_mac_table.c                     | 2 ++
 drivers/net/mscc_eswitch/mscc_mac_table.h                     | 1 +
 drivers/net/mscc_eswitch/mscc_miim.c                          | 1 +
 drivers/net/mscc_eswitch/mscc_miim.h                          | 2 ++
 drivers/net/mscc_eswitch/mscc_xfer.c                          | 2 ++
 drivers/net/mscc_eswitch/mscc_xfer.h                          | 2 ++
 drivers/net/mscc_eswitch/ocelot_switch.c                      | 2 ++
 drivers/net/mscc_eswitch/serval_switch.c                      | 2 ++
 drivers/net/mscc_eswitch/servalt_switch.c                     | 2 ++
 drivers/net/mt7628-eth.c                                      | 3 +++
 drivers/net/mtk_eth.c                                         | 2 ++
 drivers/net/mvgbe.c                                           | 2 ++
 drivers/net/mvgbe.h                                           | 1 +
 drivers/net/mvmdio.c                                          | 1 +
 drivers/net/mvneta.c                                          | 2 ++
 drivers/net/mvpp2.c                                           | 3 +++
 drivers/net/natsemi.c                                         | 1 +
 drivers/net/ne2000.c                                          | 1 +
 drivers/net/ne2000.h                                          | 1 +
 drivers/net/ne2000_base.c                                     | 1 +
 drivers/net/ne2000_base.h                                     | 1 +
 drivers/net/netconsole.c                                      | 1 +
 drivers/net/ns8382x.c                                         | 1 +
 drivers/net/pch_gbe.c                                         | 1 +
 drivers/net/pch_gbe.h                                         | 1 +
 drivers/net/pcnet.c                                           | 2 ++
 drivers/net/pfe_eth/pfe_cmd.c                                 | 1 +
 drivers/net/pfe_eth/pfe_driver.c                              | 1 +
 drivers/net/pfe_eth/pfe_eth.c                                 | 1 +
 drivers/net/pfe_eth/pfe_firmware.c                            | 1 +
 drivers/net/pfe_eth/pfe_hw.c                                  | 1 +
 drivers/net/pfe_eth/pfe_mdio.c                                | 1 +
 drivers/net/phy/aquantia.c                                    | 2 ++
 drivers/net/phy/atheros.c                                     | 1 +
 drivers/net/phy/b53.c                                         | 1 +
 drivers/net/phy/broadcom.c                                    | 1 +
 drivers/net/phy/cortina.c                                     | 1 +
 drivers/net/phy/dp83867.c                                     | 1 +
 drivers/net/phy/fixed.c                                       | 1 +
 drivers/net/phy/generic_10g.c                                 | 1 +
 drivers/net/phy/marvell.c                                     | 1 +
 drivers/net/phy/micrel_ksz90x1.c                              | 1 +
 drivers/net/phy/miiphybb.c                                    | 1 +
 drivers/net/phy/mscc.c                                        | 2 ++
 drivers/net/phy/mv88e61xx.c                                   | 2 ++
 drivers/net/phy/mv88e6352.c                                   | 1 +
 drivers/net/phy/ncsi.c                                        | 2 ++
 drivers/net/phy/phy.c                                         | 3 +++
 drivers/net/phy/realtek.c                                     | 1 +
 drivers/net/phy/teranetics.c                                  | 1 +
 drivers/net/phy/vitesse.c                                     | 1 +
 drivers/net/phy/xilinx_gmii2rgmii.c                           | 1 +
 drivers/net/phy/xilinx_phy.c                                  | 1 +
 drivers/net/pic32_eth.c                                       | 2 ++
 drivers/net/pic32_eth.h                                       | 1 +
 drivers/net/pic32_mdio.c                                      | 1 +
 drivers/net/ravb.c                                            | 2 ++
 drivers/net/rtl8169.c                                         | 1 +
 drivers/net/sandbox-raw-bus.c                                 | 1 +
 drivers/net/sandbox-raw.c                                     | 1 +
 drivers/net/sandbox.c                                         | 1 +
 drivers/net/sh_eth.c                                          | 2 ++
 drivers/net/sh_eth.h                                          | 2 ++
 drivers/net/smc91111.c                                        | 1 +
 drivers/net/smc911x.c                                         | 1 +
 drivers/net/sni_ave.c                                         | 2 ++
 drivers/net/sun8i_emac.c                                      | 2 ++
 drivers/net/sunxi_emac.c                                      | 1 +
 drivers/net/ti/am65-cpsw-nuss.c                               | 2 ++
 drivers/net/ti/cpsw-common.c                                  | 1 +
 drivers/net/ti/cpsw.c                                         | 2 ++
 drivers/net/ti/cpsw_mdio.c                                    | 1 +
 drivers/net/ti/cpsw_mdio.h                                    | 1 +
 drivers/net/ti/davinci_emac.c                                 | 1 +
 drivers/net/ti/davinci_emac.h                                 | 1 +
 drivers/net/ti/keystone_net.c                                 | 1 +
 drivers/net/tsec.c                                            | 2 ++
 drivers/net/uli526x.c                                         | 1 +
 drivers/net/vsc7385.c                                         | 1 +
 drivers/net/vsc9953.c                                         | 1 +
 drivers/net/xilinx_axi_emac.c                                 | 1 +
 drivers/net/xilinx_emaclite.c                                 | 2 ++
 drivers/net/zynq_gem.c                                        | 3 +++
 drivers/nvme/nvme.c                                           | 3 +++
 drivers/nvme/nvme.h                                           | 2 ++
 drivers/nvme/nvme_show.c                                      | 1 +
 drivers/pch/pch-uclass.c                                      | 1 +
 drivers/pch/pch7.c                                            | 1 +
 drivers/pch/pch9.c                                            | 1 +
 drivers/pch/sandbox_pch.c                                     | 1 +
 drivers/pci/fsl_pci_init.c                                    | 1 +
 drivers/pci/pci-aardvark.c                                    | 1 +
 drivers/pci/pci-emul-uclass.c                                 | 1 +
 drivers/pci/pci-rcar-gen2.c                                   | 1 +
 drivers/pci/pci-rcar-gen3.c                                   | 1 +
 drivers/pci/pci-uclass.c                                      | 2 ++
 drivers/pci/pci.c                                             | 2 ++
 drivers/pci/pci_auto.c                                        | 1 +
 drivers/pci/pci_auto_common.c                                 | 1 +
 drivers/pci/pci_auto_old.c                                    | 1 +
 drivers/pci/pci_common.c                                      | 2 ++
 drivers/pci/pci_compat.c                                      | 1 +
 drivers/pci/pci_gt64120.c                                     | 1 +
 drivers/pci/pci_indirect.c                                    | 1 +
 drivers/pci/pci_mpc85xx.c                                     | 2 ++
 drivers/pci/pci_msc01.c                                       | 1 +
 drivers/pci/pci_mvebu.c                                       | 3 +++
 drivers/pci/pci_rom.c                                         | 3 +++
 drivers/pci/pci_sandbox.c                                     | 1 +
 drivers/pci/pci_sh7751.c                                      | 1 +
 drivers/pci/pci_sh7780.c                                      | 1 +
 drivers/pci/pci_tegra.c                                       | 2 ++
 drivers/pci/pci_x86.c                                         | 1 +
 drivers/pci/pcie_brcmstb.c                                    | 3 +++
 drivers/pci/pcie_dw_mvebu.c                                   | 1 +
 drivers/pci/pcie_dw_ti.c                                      | 3 +++
 drivers/pci/pcie_ecam_generic.c                               | 2 ++
 drivers/pci/pcie_fsl.c                                        | 2 ++
 drivers/pci/pcie_fsl.h                                        | 2 ++
 drivers/pci/pcie_imx.c                                        | 3 +++
 drivers/pci/pcie_intel_fpga.c                                 | 2 ++
 drivers/pci/pcie_layerscape.c                                 | 1 +
 drivers/pci/pcie_layerscape.h                                 | 2 ++
 drivers/pci/pcie_layerscape_ep.c                              | 2 ++
 drivers/pci/pcie_layerscape_fixup.c                           | 1 +
 drivers/pci/pcie_layerscape_fixup_common.c                    | 1 +
 drivers/pci/pcie_layerscape_gen4.c                            | 2 ++
 drivers/pci/pcie_layerscape_gen4.h                            | 2 ++
 drivers/pci/pcie_layerscape_gen4_fixup.c                      | 1 +
 drivers/pci/pcie_layerscape_rc.c                              | 1 +
 drivers/pci/pcie_mediatek.c                                   | 2 ++
 drivers/pci/pcie_phytium.c                                    | 1 +
 drivers/pci/pcie_rockchip.c                                   | 1 +
 drivers/pci/pcie_xilinx.c                                     | 1 +
 drivers/pci_endpoint/pci_ep-uclass.c                          | 1 +
 drivers/pci_endpoint/pcie-cadence-ep.c                        | 2 ++
 drivers/pci_endpoint/pcie-cadence.h                           | 2 ++
 drivers/pci_endpoint/sandbox-pci_ep.c                         | 1 +
 drivers/phy/allwinner/phy-sun4i-usb.c                         | 3 +++
 drivers/phy/bcm6318-usbh-phy.c                                | 1 +
 drivers/phy/bcm6348-usbh-phy.c                                | 1 +
 drivers/phy/bcm6358-usbh-phy.c                                | 1 +
 drivers/phy/bcm6368-usbh-phy.c                                | 2 ++
 drivers/phy/keystone-usb-phy.c                                | 2 ++
 drivers/phy/marvell/comphy_a3700.c                            | 1 +
 drivers/phy/marvell/comphy_core.c                             | 2 ++
 drivers/phy/marvell/comphy_core.h                             | 2 ++
 drivers/phy/marvell/comphy_cp110.c                            | 2 ++
 drivers/phy/marvell/comphy_mux.c                              | 2 ++
 drivers/phy/meson-g12a-usb3-pcie.c                            | 1 +
 drivers/phy/meson-gxbb-usb2.c                                 | 1 +
 drivers/phy/meson-gxl-usb2.c                                  | 1 +
 drivers/phy/meson-gxl-usb3.c                                  | 1 +
 drivers/phy/msm8916-usbh-phy.c                                | 2 ++
 drivers/phy/mt76x8-usb-phy.c                                  | 2 ++
 drivers/phy/omap-usb2-phy.c                                   | 2 ++
 drivers/phy/phy-mtk-tphy.c                                    | 2 ++
 drivers/phy/phy-rcar-gen2.c                                   | 1 +
 drivers/phy/phy-stm32-usbphyc.c                               | 1 +
 drivers/phy/phy-ti-am654.c                                    | 1 +
 drivers/phy/rockchip/phy-rockchip-inno-usb2.c                 | 1 +
 drivers/phy/rockchip/phy-rockchip-pcie.c                      | 1 +
 drivers/phy/rockchip/phy-rockchip-typec.c                     | 3 +++
 drivers/phy/sti_usb_phy.c                                     | 2 ++
 drivers/phy/ti-pipe3-phy.c                                    | 2 ++
 drivers/pinctrl/aspeed/pinctrl_ast2500.c                      | 1 +
 drivers/pinctrl/ath79/pinctrl_ar933x.c                        | 2 ++
 drivers/pinctrl/ath79/pinctrl_qca953x.c                       | 2 ++
 drivers/pinctrl/broadcom/pinctrl-bcm283x.c                    | 1 +
 drivers/pinctrl/broadcom/pinctrl-bcm6838.c                    | 1 +
 drivers/pinctrl/exynos/pinctrl-exynos.c                       | 1 +
 drivers/pinctrl/exynos/pinctrl-exynos7420.c                   | 1 +
 drivers/pinctrl/intel/pinctrl.c                               | 1 +
 drivers/pinctrl/mediatek/pinctrl-mtk-common.c                 | 1 +
 drivers/pinctrl/mediatek/pinctrl-mtk-common.h                 | 2 ++
 drivers/pinctrl/meson/pinctrl-meson-axg.c                     | 1 +
 drivers/pinctrl/meson/pinctrl-meson-g12a.c                    | 1 +
 drivers/pinctrl/meson/pinctrl-meson-gx-pmx.c                  | 2 ++
 drivers/pinctrl/meson/pinctrl-meson-gxbb.c                    | 1 +
 drivers/pinctrl/meson/pinctrl-meson-gxl.c                     | 1 +
 drivers/pinctrl/meson/pinctrl-meson.c                         | 1 +
 drivers/pinctrl/meson/pinctrl-meson.h                         | 1 +
 drivers/pinctrl/mscc/mscc-common.c                            | 1 +
 drivers/pinctrl/mscc/mscc-common.h                            | 1 +
 drivers/pinctrl/mtmips/pinctrl-mt7628.c                       | 2 ++
 drivers/pinctrl/mtmips/pinctrl-mtmips-common.c                | 1 +
 drivers/pinctrl/mtmips/pinctrl-mtmips-common.h                | 2 ++
 drivers/pinctrl/mvebu/pinctrl-armada-37xx.c                   | 2 ++
 drivers/pinctrl/mvebu/pinctrl-mvebu.c                         | 1 +
 drivers/pinctrl/mvebu/pinctrl-mvebu.h                         | 1 +
 drivers/pinctrl/nexell/pinctrl-nexell.c                       | 1 +
 drivers/pinctrl/nexell/pinctrl-nexell.h                       | 1 +
 drivers/pinctrl/nexell/pinctrl-s5pxx18.c                      | 2 ++
 drivers/pinctrl/nxp/pinctrl-imx.c                             | 1 +
 drivers/pinctrl/nxp/pinctrl-imx.h                             | 2 ++
 drivers/pinctrl/nxp/pinctrl-imx5.c                            | 1 +
 drivers/pinctrl/nxp/pinctrl-imx6.c                            | 1 +
 drivers/pinctrl/nxp/pinctrl-imx7.c                            | 1 +
 drivers/pinctrl/nxp/pinctrl-imx7ulp.c                         | 1 +
 drivers/pinctrl/nxp/pinctrl-imx8.c                            | 1 +
 drivers/pinctrl/nxp/pinctrl-imx8m.c                           | 1 +
 drivers/pinctrl/nxp/pinctrl-imxrt.c                           | 1 +
 drivers/pinctrl/nxp/pinctrl-mxs.c                             | 2 ++
 drivers/pinctrl/nxp/pinctrl-mxs.h                             | 2 ++
 drivers/pinctrl/nxp/pinctrl-scu.c                             | 1 +
 drivers/pinctrl/nxp/pinctrl-vf610.c                           | 1 +
 drivers/pinctrl/pinctrl-at91-pio4.c                           | 1 +
 drivers/pinctrl/pinctrl-at91.c                                | 2 ++
 drivers/pinctrl/pinctrl-generic.c                             | 1 +
 drivers/pinctrl/pinctrl-single.c                              | 1 +
 drivers/pinctrl/pinctrl-sti.c                                 | 1 +
 drivers/pinctrl/pinctrl-stmfx.c                               | 1 +
 drivers/pinctrl/pinctrl-uclass.c                              | 2 ++
 drivers/pinctrl/pinctrl_pic32.c                               | 2 ++
 drivers/pinctrl/pinctrl_stm32.c                               | 1 +
 drivers/pinctrl/renesas/pfc-r7s72100.c                        | 2 ++
 drivers/pinctrl/renesas/pfc-r8a7790.c                         | 1 +
 drivers/pinctrl/renesas/pfc-r8a7791.c                         | 1 +
 drivers/pinctrl/renesas/pfc-r8a7792.c                         | 1 +
 drivers/pinctrl/renesas/pfc-r8a7794.c                         | 1 +
 drivers/pinctrl/renesas/pfc-r8a7795.c                         | 1 +
 drivers/pinctrl/renesas/pfc-r8a7796.c                         | 1 +
 drivers/pinctrl/renesas/pfc-r8a77965.c                        | 1 +
 drivers/pinctrl/renesas/pfc-r8a77970.c                        | 1 +
 drivers/pinctrl/renesas/pfc-r8a77980.c                        | 1 +
 drivers/pinctrl/renesas/pfc-r8a77990.c                        | 1 +
 drivers/pinctrl/renesas/pfc-r8a77995.c                        | 1 +
 drivers/pinctrl/renesas/pfc.c                                 | 3 +++
 drivers/pinctrl/renesas/sh_pfc.h                              | 2 ++
 drivers/pinctrl/rockchip/pinctrl-px30.c                       | 1 +
 drivers/pinctrl/rockchip/pinctrl-rk3036.c                     | 1 +
 drivers/pinctrl/rockchip/pinctrl-rk3128.c                     | 1 +
 drivers/pinctrl/rockchip/pinctrl-rk3188.c                     | 1 +
 drivers/pinctrl/rockchip/pinctrl-rk322x.c                     | 1 +
 drivers/pinctrl/rockchip/pinctrl-rk3288.c                     | 1 +
 drivers/pinctrl/rockchip/pinctrl-rk3308.c                     | 1 +
 drivers/pinctrl/rockchip/pinctrl-rk3328.c                     | 1 +
 drivers/pinctrl/rockchip/pinctrl-rk3368.c                     | 1 +
 drivers/pinctrl/rockchip/pinctrl-rk3399.c                     | 1 +
 drivers/pinctrl/rockchip/pinctrl-rockchip-core.c              | 2 ++
 drivers/pinctrl/rockchip/pinctrl-rv1108.c                     | 1 +
 drivers/pinctrl/uniphier/pinctrl-uniphier-core.c              | 2 ++
 drivers/pinctrl/uniphier/pinctrl-uniphier.h                   | 1 +
 drivers/power/acpi_pmc/acpi-pmc-uclass.c                      | 1 +
 drivers/power/acpi_pmc/pmc_emul.c                             | 1 +
 drivers/power/acpi_pmc/sandbox.c                              | 1 +
 drivers/power/axp152.c                                        | 1 +
 drivers/power/axp209.c                                        | 1 +
 drivers/power/axp221.c                                        | 1 +
 drivers/power/axp809.c                                        | 1 +
 drivers/power/axp818.c                                        | 1 +
 drivers/power/domain/bcm6328-power-domain.c                   | 1 +
 drivers/power/domain/imx8-power-domain.c                      | 1 +
 drivers/power/domain/meson-ee-pwrc.c                          | 2 ++
 drivers/power/domain/meson-gx-pwrc-vpu.c                      | 1 +
 drivers/power/domain/mtk-power-domain.c                       | 2 ++
 drivers/power/domain/ti-sci-power-domain.c                    | 1 +
 drivers/power/exynos-tmu.c                                    | 1 +
 drivers/power/fuel_gauge/fg_max17042.c                        | 1 +
 drivers/power/mfd/fg_max77693.c                               | 1 +
 drivers/power/mt6323.c                                        | 1 +
 drivers/power/palmas.c                                        | 1 +
 drivers/power/pmic/act8846.c                                  | 1 +
 drivers/power/pmic/as3722.c                                   | 1 +
 drivers/power/pmic/as3722_gpio.c                              | 1 +
 drivers/power/pmic/bd71837.c                                  | 1 +
 drivers/power/pmic/da9063.c                                   | 2 ++
 drivers/power/pmic/fan53555.c                                 | 1 +
 drivers/power/pmic/i2c_pmic_emul.c                            | 1 +
 drivers/power/pmic/lp873x.c                                   | 1 +
 drivers/power/pmic/lp87565.c                                  | 1 +
 drivers/power/pmic/max77686.c                                 | 1 +
 drivers/power/pmic/max8997.c                                  | 1 +
 drivers/power/pmic/max8998.c                                  | 1 +
 drivers/power/pmic/mc34708.c                                  | 1 +
 drivers/power/pmic/palmas.c                                   | 1 +
 drivers/power/pmic/pca9450.c                                  | 1 +
 drivers/power/pmic/pfuze100.c                                 | 1 +
 drivers/power/pmic/pm8916.c                                   | 1 +
 drivers/power/pmic/pmic-uclass.c                              | 1 +
 drivers/power/pmic/pmic_hi6553.c                              | 1 +
 drivers/power/pmic/pmic_max8997.c                             | 1 +
 drivers/power/pmic/pmic_tps65217.c                            | 1 +
 drivers/power/pmic/pmic_tps65218.c                            | 1 +
 drivers/power/pmic/pmic_tps65910.c                            | 1 +
 drivers/power/pmic/pmic_tps65910_dm.c                         | 1 +
 drivers/power/pmic/rk8xx.c                                    | 1 +
 drivers/power/pmic/rn5t567.c                                  | 1 +
 drivers/power/pmic/s2mps11.c                                  | 1 +
 drivers/power/pmic/s5m8767.c                                  | 1 +
 drivers/power/pmic/sandbox.c                                  | 1 +
 drivers/power/pmic/stpmic1.c                                  | 1 +
 drivers/power/pmic/tps65090.c                                 | 1 +
 drivers/power/pmic/tps65941.c                                 | 1 +
 drivers/power/power_fsl.c                                     | 1 +
 drivers/power/regulator/act8846.c                             | 1 +
 drivers/power/regulator/as3722_regulator.c                    | 1 +
 drivers/power/regulator/bd71837.c                             | 2 ++
 drivers/power/regulator/da9063.c                              | 2 ++
 drivers/power/regulator/fan53555.c                            | 2 ++
 drivers/power/regulator/gpio-regulator.c                      | 1 +
 drivers/power/regulator/max77686.c                            | 1 +
 drivers/power/regulator/palmas_regulator.c                    | 1 +
 drivers/power/regulator/pbias_regulator.c                     | 2 ++
 drivers/power/regulator/pfuze100.c                            | 1 +
 drivers/power/regulator/regulator-uclass.c                    | 1 +
 drivers/power/regulator/rk8xx.c                               | 2 ++
 drivers/power/regulator/s2mps11_regulator.c                   | 2 ++
 drivers/power/regulator/sandbox.c                             | 2 ++
 drivers/power/regulator/stm32-vrefbuf.c                       | 3 +++
 drivers/power/regulator/stpmic1.c                             | 2 ++
 drivers/power/regulator/tps62360_regulator.c                  | 1 +
 drivers/power/regulator/tps65090_regulator.c                  | 1 +
 drivers/power/regulator/tps65910_regulator.c                  | 2 ++
 drivers/power/sy8106a.c                                       | 1 +
 drivers/power/tps6586x.c                                      | 1 +
 drivers/power/twl4030.c                                       | 1 +
 drivers/power/twl6030.c                                       | 1 +
 drivers/pwm/exynos_pwm.c                                      | 1 +
 drivers/pwm/pwm-imx.c                                         | 1 +
 drivers/pwm/pwm-mtk.c                                         | 3 +++
 drivers/pwm/pwm-sifive.c                                      | 3 +++
 drivers/pwm/pwm-uclass.c                                      | 1 +
 drivers/pwm/rk_pwm.c                                          | 1 +
 drivers/pwm/sandbox_pwm.c                                     | 1 +
 drivers/pwm/sunxi_pwm.c                                       | 1 +
 drivers/pwm/tegra_pwm.c                                       | 1 +
 drivers/qe/qe.c                                               | 2 ++
 drivers/qe/uccf.c                                             | 1 +
 drivers/qe/uec.c                                              | 1 +
 drivers/qe/uec_phy.c                                          | 1 +
 drivers/qe/uec_phy.h                                          | 1 +
 drivers/ram/bmips_ram.c                                       | 2 ++
 drivers/ram/imxrt_sdram.c                                     | 1 +
 drivers/ram/k3-am654-ddrss.c                                  | 2 ++
 drivers/ram/k3-am654-ddrss.h                                  | 1 +
 drivers/ram/k3-j721e/cps_drv_lpddr4.h                         | 1 +
 drivers/ram/k3-j721e/k3-j721e-ddrss.c                         | 2 ++
 drivers/ram/k3-j721e/lpddr4_private.h                         | 1 +
 drivers/ram/mediatek/ddr3-mt7629.c                            | 1 +
 drivers/ram/mpc83xx_sdram.c                                   | 1 +
 drivers/ram/rockchip/dmc-rk3368.c                             | 2 ++
 drivers/ram/rockchip/sdram_common.c                           | 2 ++
 drivers/ram/rockchip/sdram_pctl_px30.c                        | 2 ++
 drivers/ram/rockchip/sdram_phy_px30.c                         | 2 ++
 drivers/ram/rockchip/sdram_px30.c                             | 2 ++
 drivers/ram/rockchip/sdram_rk3128.c                           | 1 +
 drivers/ram/rockchip/sdram_rk3188.c                           | 2 ++
 drivers/ram/rockchip/sdram_rk3288.c                           | 2 ++
 drivers/ram/rockchip/sdram_rk3308.c                           | 1 +
 drivers/ram/rockchip/sdram_rk3328.c                           | 2 ++
 drivers/ram/rockchip/sdram_rk3399.c                           | 3 +++
 drivers/ram/sifive/fu540_ddr.c                                | 1 +
 drivers/ram/stm32_sdram.c                                     | 1 +
 drivers/ram/stm32mp1/stm32mp1_ddr.c                           | 3 +++
 drivers/ram/stm32mp1/stm32mp1_ddr.h                           | 1 +
 drivers/ram/stm32mp1/stm32mp1_ddr_regs.h                      | 1 +
 drivers/ram/stm32mp1/stm32mp1_interactive.c                   | 2 ++
 drivers/ram/stm32mp1/stm32mp1_ram.c                           | 3 +++
 drivers/ram/stm32mp1/stm32mp1_tests.c                         | 2 ++
 drivers/ram/stm32mp1/stm32mp1_tuning.c                        | 2 ++
 drivers/remoteproc/k3_system_controller.c                     | 2 ++
 drivers/remoteproc/rproc-elf-loader.c                         | 2 ++
 drivers/remoteproc/rproc-uclass.c                             | 1 +
 drivers/remoteproc/sandbox_testproc.c                         | 1 +
 drivers/remoteproc/stm32_copro.c                              | 2 ++
 drivers/remoteproc/ti_k3_arm64_rproc.c                        | 1 +
 drivers/remoteproc/ti_k3_dsp_rproc.c                          | 3 +++
 drivers/remoteproc/ti_k3_r5f_rproc.c                          | 3 +++
 drivers/remoteproc/ti_power_proc.c                            | 1 +
 drivers/remoteproc/ti_sci_proc.h                              | 1 +
 drivers/reset/ast2500-reset.c                                 | 1 +
 drivers/reset/reset-bcm6345.c                                 | 1 +
 drivers/reset/reset-hisilicon.c                               | 2 ++
 drivers/reset/reset-hsdk.c                                    | 2 ++
 drivers/reset/reset-imx7.c                                    | 2 ++
 drivers/reset/reset-mediatek.c                                | 1 +
 drivers/reset/reset-meson.c                                   | 1 +
 drivers/reset/reset-mtmips.c                                  | 1 +
 drivers/reset/reset-rockchip.c                                | 2 ++
 drivers/reset/reset-socfpga.c                                 | 2 ++
 drivers/reset/reset-sunxi.c                                   | 2 ++
 drivers/reset/reset-syscon.c                                  | 2 ++
 drivers/reset/reset-ti-sci.c                                  | 2 ++
 drivers/reset/reset-uniphier.c                                | 2 ++
 drivers/reset/sti-reset.c                                     | 3 +++
 drivers/rng/meson-rng.c                                       | 1 +
 drivers/rng/rng-uclass.c                                      | 1 +
 drivers/rng/rockchip_rng.c                                    | 1 +
 drivers/rng/sandbox_rng.c                                     | 1 +
 drivers/rng/stm32mp1_rng.c                                    | 1 +
 drivers/rtc/at91sam9_rtt.c                                    | 1 +
 drivers/rtc/ds1306.c                                          | 1 +
 drivers/rtc/ds1307.c                                          | 1 +
 drivers/rtc/ds1337.c                                          | 1 +
 drivers/rtc/ds1374.c                                          | 1 +
 drivers/rtc/ds1556.c                                          | 1 +
 drivers/rtc/ds164x.c                                          | 1 +
 drivers/rtc/ds174x.c                                          | 1 +
 drivers/rtc/ds3231.c                                          | 1 +
 drivers/rtc/ds3232.c                                          | 1 +
 drivers/rtc/i2c_rtc_emul.c                                    | 1 +
 drivers/rtc/imxdi.c                                           | 2 ++
 drivers/rtc/isl1208.c                                         | 1 +
 drivers/rtc/m41t11.c                                          | 1 +
 drivers/rtc/m41t60.c                                          | 1 +
 drivers/rtc/m41t62.c                                          | 1 +
 drivers/rtc/m41t94.c                                          | 1 +
 drivers/rtc/m48t35ax.c                                        | 1 +
 drivers/rtc/max6900.c                                         | 1 +
 drivers/rtc/mc13xxx-rtc.c                                     | 1 +
 drivers/rtc/mc146818.c                                        | 1 +
 drivers/rtc/mk48t59.c                                         | 1 +
 drivers/rtc/mvrtc.c                                           | 1 +
 drivers/rtc/mvrtc.h                                           | 1 +
 drivers/rtc/mx27rtc.c                                         | 1 +
 drivers/rtc/mxsrtc.c                                          | 1 +
 drivers/rtc/pcf2127.c                                         | 1 +
 drivers/rtc/pcf8563.c                                         | 1 +
 drivers/rtc/pt7c4338.c                                        | 1 +
 drivers/rtc/rtc-uclass.c                                      | 1 +
 drivers/rtc/rv3029.c                                          | 1 +
 drivers/rtc/rv8803.c                                          | 1 +
 drivers/rtc/rx8010sj.c                                        | 1 +
 drivers/rtc/rx8025.c                                          | 1 +
 drivers/rtc/s35392a.c                                         | 1 +
 drivers/rtc/s3c24x0_rtc.c                                     | 1 +
 drivers/rtc/sandbox_rtc.c                                     | 1 +
 drivers/rtc/stm32_rtc.c                                       | 1 +
 drivers/rtc/x1205.c                                           | 1 +
 drivers/scsi/scsi.c                                           | 2 ++
 drivers/serial/altera_jtag_uart.c                             | 1 +
 drivers/serial/altera_uart.c                                  | 1 +
 drivers/serial/atmel_usart.c                                  | 2 ++
 drivers/serial/atmel_usart.h                                  | 1 +
 drivers/serial/lpc32xx_hsuart.c                               | 1 +
 drivers/serial/ns16550.c                                      | 1 +
 drivers/serial/sandbox.c                                      | 2 ++
 drivers/serial/serial-uclass.c                                | 1 +
 drivers/serial/serial.c                                       | 1 +
 drivers/serial/serial_ar933x.c                                | 2 ++
 drivers/serial/serial_arc.c                                   | 1 +
 drivers/serial/serial_bcm283x_mu.c                            | 1 +
 drivers/serial/serial_bcm6345.c                               | 2 ++
 drivers/serial/serial_cortina.c                               | 2 ++
 drivers/serial/serial_efi.c                                   | 1 +
 drivers/serial/serial_linflexuart.c                           | 1 +
 drivers/serial/serial_lpuart.c                                | 2 ++
 drivers/serial/serial_mcf.c                                   | 1 +
 drivers/serial/serial_meson.c                                 | 1 +
 drivers/serial/serial_mpc8xx.c                                | 2 ++
 drivers/serial/serial_msm.c                                   | 1 +
 drivers/serial/serial_mtk.c                                   | 2 ++
 drivers/serial/serial_mvebu_a3700.c                           | 1 +
 drivers/serial/serial_mxc.c                                   | 2 ++
 drivers/serial/serial_ns16550.c                               | 1 +
 drivers/serial/serial_omap.c                                  | 1 +
 drivers/serial/serial_pic32.c                                 | 3 +++
 drivers/serial/serial_pl01x.c                                 | 1 +
 drivers/serial/serial_pl01x_internal.h                        | 1 +
 drivers/serial/serial_pxa.c                                   | 2 ++
 drivers/serial/serial_s5p.c                                   | 1 +
 drivers/serial/serial_sh.c                                    | 1 +
 drivers/serial/serial_sifive.c                                | 2 ++
 drivers/serial/serial_sti_asc.c                               | 1 +
 drivers/serial/serial_stm32.c                                 | 2 ++
 drivers/serial/serial_stm32.h                                 | 1 +
 drivers/serial/serial_uniphier.c                              | 3 +++
 drivers/serial/serial_zynq.c                                  | 2 ++
 drivers/serial/usbtty.c                                       | 1 +
 drivers/smem/msm_smem.c                                       | 2 ++
 drivers/smem/sandbox_smem.c                                   | 1 +
 drivers/smem/smem-uclass.c                                    | 1 +
 drivers/soc/soc_ti_k3.c                                       | 1 +
 drivers/soc/ti/k3-navss-ringacc.c                             | 3 +++
 drivers/soc/ti/keystone_serdes.c                              | 1 +
 drivers/sound/broadwell_i2s.c                                 | 1 +
 drivers/sound/broadwell_i2s.h                                 | 1 +
 drivers/sound/broadwell_sound.c                               | 1 +
 drivers/sound/codec-uclass.c                                  | 1 +
 drivers/sound/da7219.c                                        | 1 +
 drivers/sound/hda_codec.c                                     | 1 +
 drivers/sound/i2s-uclass.c                                    | 1 +
 drivers/sound/ivybridge_sound.c                               | 1 +
 drivers/sound/max98088.c                                      | 1 +
 drivers/sound/max98090.c                                      | 1 +
 drivers/sound/max98095.c                                      | 1 +
 drivers/sound/max98357a.c                                     | 1 +
 drivers/sound/rockchip_i2s.c                                  | 1 +
 drivers/sound/rockchip_sound.c                                | 1 +
 drivers/sound/rt5677.c                                        | 1 +
 drivers/sound/samsung-i2s.c                                   | 1 +
 drivers/sound/samsung_sound.c                                 | 1 +
 drivers/sound/sandbox.c                                       | 1 +
 drivers/sound/sound-uclass.c                                  | 1 +
 drivers/sound/sound.c                                         | 1 +
 drivers/sound/tegra_ahub.c                                    | 1 +
 drivers/sound/tegra_i2s.c                                     | 1 +
 drivers/sound/tegra_i2s_priv.h                                | 1 +
 drivers/sound/tegra_sound.c                                   | 1 +
 drivers/sound/wm8994.c                                        | 1 +
 drivers/spi/altera_spi.c                                      | 1 +
 drivers/spi/atcspi200_spi.c                                   | 1 +
 drivers/spi/ath79_spi.c                                       | 1 +
 drivers/spi/atmel-quadspi.c                                   | 3 +++
 drivers/spi/atmel_spi.c                                       | 1 +
 drivers/spi/bcm63xx_hsspi.c                                   | 2 ++
 drivers/spi/bcm63xx_spi.c                                     | 2 ++
 drivers/spi/bcmstb_spi.c                                      | 1 +
 drivers/spi/cadence_qspi.c                                    | 1 +
 drivers/spi/cadence_qspi.h                                    | 1 +
 drivers/spi/cadence_qspi_apb.c                                | 1 +
 drivers/spi/cf_spi.c                                          | 1 +
 drivers/spi/davinci_spi.c                                     | 1 +
 drivers/spi/designware_spi.c                                  | 3 +++
 drivers/spi/exynos_spi.c                                      | 1 +
 drivers/spi/fsl_dspi.c                                        | 2 ++
 drivers/spi/fsl_espi.c                                        | 1 +
 drivers/spi/fsl_qspi.c                                        | 3 +++
 drivers/spi/ich.c                                             | 2 ++
 drivers/spi/ich.h                                             | 2 ++
 drivers/spi/kirkwood_spi.c                                    | 1 +
 drivers/spi/meson_spifc.c                                     | 2 ++
 drivers/spi/mpc8xx_spi.c                                      | 2 ++
 drivers/spi/mpc8xxx_spi.c                                     | 2 ++
 drivers/spi/mscc_bb_spi.c                                     | 2 ++
 drivers/spi/mt7621_spi.c                                      | 2 ++
 drivers/spi/mtk_snfi_spi.c                                    | 2 ++
 drivers/spi/mvebu_a3700_spi.c                                 | 1 +
 drivers/spi/mxc_spi.c                                         | 2 ++
 drivers/spi/mxs_spi.c                                         | 1 +
 drivers/spi/nxp_fspi.c                                        | 3 +++
 drivers/spi/omap3_spi.c                                       | 1 +
 drivers/spi/pic32_spi.c                                       | 1 +
 drivers/spi/pl022_spi.c                                       | 2 ++
 drivers/spi/renesas_rpc_spi.c                                 | 2 ++
 drivers/spi/rk_spi.c                                          | 2 ++
 drivers/spi/rk_spi.h                                          | 1 +
 drivers/spi/sandbox_spi.c                                     | 2 ++
 drivers/spi/sh_qspi.c                                         | 1 +
 drivers/spi/soft_spi.c                                        | 1 +
 drivers/spi/spi-mem-nodm.c                                    | 1 +
 drivers/spi/spi-mem.c                                         | 2 ++
 drivers/spi/spi-sifive.c                                      | 1 +
 drivers/spi/spi-sunxi.c                                       | 2 ++
 drivers/spi/spi-uclass.c                                      | 2 ++
 drivers/spi/spi.c                                             | 1 +
 drivers/spi/stm32_qspi.c                                      | 3 +++
 drivers/spi/stm32_spi.c                                       | 3 +++
 drivers/spi/tegra114_spi.c                                    | 1 +
 drivers/spi/tegra20_sflash.c                                  | 1 +
 drivers/spi/tegra20_slink.c                                   | 1 +
 drivers/spi/tegra210_qspi.c                                   | 1 +
 drivers/spi/tegra_spi.h                                       | 1 +
 drivers/spi/ti_qspi.c                                         | 2 ++
 drivers/spi/uniphier_spi.c                                    | 2 ++
 drivers/spi/xilinx_spi.c                                      | 1 +
 drivers/spi/zynq_qspi.c                                       | 1 +
 drivers/spi/zynq_spi.c                                        | 1 +
 drivers/spi/zynqmp_gqspi.c                                    | 1 +
 drivers/spmi/spmi-msm.c                                       | 1 +
 drivers/spmi/spmi-sandbox.c                                   | 1 +
 drivers/spmi/spmi-uclass.c                                    | 1 +
 drivers/sysreset/sysreset-uclass.c                            | 1 +
 drivers/sysreset/sysreset_ast.c                               | 1 +
 drivers/sysreset/sysreset_mpc83xx.c                           | 2 ++
 drivers/sysreset/sysreset_octeon.c                            | 1 +
 drivers/sysreset/sysreset_socfpga.c                           | 1 +
 drivers/sysreset/sysreset_sti.c                               | 2 ++
 drivers/sysreset/sysreset_syscon.c                            | 1 +
 drivers/sysreset/sysreset_x86.c                               | 1 +
 drivers/tee/broadcom/chimp_optee.c                            | 1 +
 drivers/tee/optee/core.c                                      | 2 ++
 drivers/tee/optee/optee_private.h                             | 1 +
 drivers/tee/optee/optee_smc.h                                 | 1 +
 drivers/tee/optee/rpmb.c                                      | 1 +
 drivers/tee/sandbox.c                                         | 1 +
 drivers/tee/tee-uclass.c                                      | 1 +
 drivers/thermal/imx_scu_thermal.c                             | 1 +
 drivers/thermal/imx_thermal.c                                 | 1 +
 drivers/thermal/imx_tmu.c                                     | 2 ++
 drivers/thermal/ti-bandgap.c                                  | 1 +
 drivers/timer/ag101p_timer.c                                  | 1 +
 drivers/timer/altera_timer.c                                  | 1 +
 drivers/timer/arc_timer.c                                     | 1 +
 drivers/timer/atcpit100_timer.c                               | 1 +
 drivers/timer/atmel_pit_timer.c                               | 1 +
 drivers/timer/cadence-ttc.c                                   | 1 +
 drivers/timer/mpc83xx_timer.c                                 | 1 +
 drivers/timer/mtk_timer.c                                     | 2 ++
 drivers/timer/nomadik-mtu-timer.c                             | 1 +
 drivers/timer/rockchip_timer.c                                | 1 +
 drivers/timer/sti-timer.c                                     | 1 +
 drivers/timer/stm32_timer.c                                   | 1 +
 drivers/timer/timer-uclass.c                                  | 1 +
 drivers/timer/tsc_timer.c                                     | 2 ++
 drivers/tpm/cr50_i2c.c                                        | 2 ++
 drivers/tpm/tpm-uclass.c                                      | 1 +
 drivers/tpm/tpm2_ftpm_tee.c                                   | 1 +
 drivers/tpm/tpm2_ftpm_tee.h                                   | 1 +
 drivers/tpm/tpm2_tis_sandbox.c                                | 1 +
 drivers/tpm/tpm2_tis_spi.c                                    | 1 +
 drivers/tpm/tpm_atmel_twi.c                                   | 1 +
 drivers/tpm/tpm_internal.h                                    | 1 +
 drivers/tpm/tpm_tis.h                                         | 1 +
 drivers/tpm/tpm_tis_lpc.c                                     | 1 +
 drivers/tpm/tpm_tis_sandbox.c                                 | 2 ++
 drivers/ufs/cdns-platform.c                                   | 1 +
 drivers/ufs/ti-j721e-ufs.c                                    | 2 ++
 drivers/ufs/ufs.c                                             | 2 ++
 drivers/ufs/ufs.h                                             | 3 +++
 drivers/usb/cdns3/cdns3-ti.c                                  | 2 ++
 drivers/usb/cdns3/core.h                                      | 1 +
 drivers/usb/cdns3/drd.c                                       | 2 ++
 drivers/usb/cdns3/ep0.c                                       | 3 +++
 drivers/usb/cdns3/gadget.c                                    | 3 +++
 drivers/usb/cdns3/gadget.h                                    | 2 ++
 drivers/usb/common/fsl-dt-fixup.c                             | 1 +
 drivers/usb/common/fsl-errata.c                               | 1 +
 drivers/usb/dwc3/core.c                                       | 1 +
 drivers/usb/dwc3/core.h                                       | 2 ++
 drivers/usb/dwc3/dwc3-generic.c                               | 1 +
 drivers/usb/dwc3/dwc3-omap.c                                  | 2 ++
 drivers/usb/dwc3/dwc3-uniphier.c                              | 2 ++
 drivers/usb/dwc3/ep0.c                                        | 2 ++
 drivers/usb/dwc3/gadget.c                                     | 2 ++
 drivers/usb/dwc3/gadget.h                                     | 1 +
 drivers/usb/dwc3/io.h                                         | 2 ++
 drivers/usb/dwc3/linux-compat.h                               | 1 +
 drivers/usb/dwc3/samsung_usb_phy.c                            | 1 +
 drivers/usb/dwc3/ti_usb_phy.c                                 | 2 ++
 drivers/usb/emul/sandbox_flash.c                              | 2 ++
 drivers/usb/emul/sandbox_keyb.c                               | 1 +
 drivers/usb/emul/usb-emul-uclass.c                            | 2 ++
 drivers/usb/eth/asix.c                                        | 1 +
 drivers/usb/eth/asix88179.c                                   | 1 +
 drivers/usb/eth/lan75xx.c                                     | 1 +
 drivers/usb/eth/lan78xx.c                                     | 1 +
 drivers/usb/eth/lan7x.c                                       | 1 +
 drivers/usb/eth/lan7x.h                                       | 1 +
 drivers/usb/eth/mcs7830.c                                     | 2 ++
 drivers/usb/eth/r8152.c                                       | 2 ++
 drivers/usb/eth/r8152.h                                       | 2 ++
 drivers/usb/eth/r8152_fw.c                                    | 1 +
 drivers/usb/eth/smsc95xx.c                                    | 1 +
 drivers/usb/eth/usb_ether.c                                   | 1 +
 drivers/usb/gadget/at91_udc.c                                 | 2 ++
 drivers/usb/gadget/at91_udc.h                                 | 2 ++
 drivers/usb/gadget/atmel_usba_udc.c                           | 1 +
 drivers/usb/gadget/atmel_usba_udc.h                           | 1 +
 drivers/usb/gadget/bcm_udc_otg.h                              | 1 +
 drivers/usb/gadget/ci_udc.c                                   | 2 ++
 drivers/usb/gadget/ci_udc.h                                   | 1 +
 drivers/usb/gadget/composite.c                                | 2 ++
 drivers/usb/gadget/config.c                                   | 1 +
 drivers/usb/gadget/core.c                                     | 1 +
 drivers/usb/gadget/designware_udc.c                           | 1 +
 drivers/usb/gadget/dwc2_udc_otg.c                             | 3 +++
 drivers/usb/gadget/dwc2_udc_otg_priv.h                        | 1 +
 drivers/usb/gadget/dwc2_udc_otg_regs.h                        | 1 +
 drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c                    | 1 +
 drivers/usb/gadget/epautoconf.c                               | 1 +
 drivers/usb/gadget/ether.c                                    | 1 +
 drivers/usb/gadget/f_dfu.c                                    | 1 +
 drivers/usb/gadget/f_dfu.h                                    | 2 ++
 drivers/usb/gadget/f_mass_storage.c                           | 1 +
 drivers/usb/gadget/f_rockusb.c                                | 2 ++
 drivers/usb/gadget/f_sdp.c                                    | 3 +++
 drivers/usb/gadget/f_thor.c                                   | 1 +
 drivers/usb/gadget/f_thor.h                                   | 1 +
 drivers/usb/gadget/fotg210.c                                  | 1 +
 drivers/usb/gadget/g_dnl.c                                    | 1 +
 drivers/usb/gadget/ndis.h                                     | 1 +
 drivers/usb/gadget/pxa25x_udc.c                               | 1 +
 drivers/usb/gadget/pxa27x_udc.c                               | 1 +
 drivers/usb/gadget/storage_common.c                           | 1 +
 drivers/usb/gadget/usbstring.c                                | 1 +
 drivers/usb/host/dwc2.c                                       | 2 ++
 drivers/usb/host/dwc2.h                                       | 1 +
 drivers/usb/host/dwc3-sti-glue.c                              | 1 +
 drivers/usb/host/ehci-armada100.c                             | 1 +
 drivers/usb/host/ehci-atmel.c                                 | 1 +
 drivers/usb/host/ehci-exynos.c                                | 1 +
 drivers/usb/host/ehci-faraday.c                               | 2 ++
 drivers/usb/host/ehci-fsl.c                                   | 1 +
 drivers/usb/host/ehci-generic.c                               | 1 +
 drivers/usb/host/ehci-hcd.c                                   | 2 ++
 drivers/usb/host/ehci-marvell.c                               | 1 +
 drivers/usb/host/ehci-msm.c                                   | 1 +
 drivers/usb/host/ehci-mx5.c                                   | 2 ++
 drivers/usb/host/ehci-mx6.c                                   | 2 ++
 drivers/usb/host/ehci-mxc.c                                   | 1 +
 drivers/usb/host/ehci-mxs.c                                   | 2 ++
 drivers/usb/host/ehci-omap.c                                  | 1 +
 drivers/usb/host/ehci-pci.c                                   | 1 +
 drivers/usb/host/ehci-rmobile.c                               | 1 +
 drivers/usb/host/ehci-spear.c                                 | 1 +
 drivers/usb/host/ehci-tegra.c                                 | 1 +
 drivers/usb/host/ehci-vct.c                                   | 1 +
 drivers/usb/host/ehci-vf.c                                    | 2 ++
 drivers/usb/host/ehci-zynq.c                                  | 1 +
 drivers/usb/host/ehci.h                                       | 1 +
 drivers/usb/host/ohci-hcd.c                                   | 2 ++
 drivers/usb/host/ohci-lpc32xx.c                               | 1 +
 drivers/usb/host/ohci.h                                       | 1 +
 drivers/usb/host/r8a66597-hcd.c                               | 1 +
 drivers/usb/host/r8a66597.h                                   | 1 +
 drivers/usb/host/sl811-hcd.c                                  | 2 ++
 drivers/usb/host/usb-sandbox.c                                | 1 +
 drivers/usb/host/usb-uclass.c                                 | 1 +
 drivers/usb/host/xhci-brcm.c                                  | 1 +
 drivers/usb/host/xhci-dwc3.c                                  | 1 +
 drivers/usb/host/xhci-exynos5.c                               | 1 +
 drivers/usb/host/xhci-fsl.c                                   | 2 ++
 drivers/usb/host/xhci-mem.c                                   | 2 ++
 drivers/usb/host/xhci-mtk.c                                   | 2 ++
 drivers/usb/host/xhci-mvebu.c                                 | 2 ++
 drivers/usb/host/xhci-omap.c                                  | 1 +
 drivers/usb/host/xhci-pci.c                                   | 1 +
 drivers/usb/host/xhci-rcar-r8a779x_usb3_v3.h                  | 1 +
 drivers/usb/host/xhci-rcar.c                                  | 2 ++
 drivers/usb/host/xhci-ring.c                                  | 2 ++
 drivers/usb/host/xhci.c                                       | 2 ++
 drivers/usb/musb-new/am35x.c                                  | 2 ++
 drivers/usb/musb-new/da8xx.c                                  | 2 ++
 drivers/usb/musb-new/mt85xx.c                                 | 2 ++
 drivers/usb/musb-new/musb_core.c                              | 3 +++
 drivers/usb/musb-new/musb_core.h                              | 3 +++
 drivers/usb/musb-new/musb_dma.h                               | 2 ++
 drivers/usb/musb-new/musb_dsps.c                              | 2 ++
 drivers/usb/musb-new/musb_gadget.c                            | 2 ++
 drivers/usb/musb-new/musb_gadget.h                            | 1 +
 drivers/usb/musb-new/musb_gadget_ep0.c                        | 2 ++
 drivers/usb/musb-new/musb_host.c                              | 3 +++
 drivers/usb/musb-new/musb_io.h                                | 2 ++
 drivers/usb/musb-new/musb_regs.h                              | 2 ++
 drivers/usb/musb-new/musb_uboot.c                             | 2 ++
 drivers/usb/musb-new/omap2430.c                               | 1 +
 drivers/usb/musb-new/pic32.c                                  | 2 ++
 drivers/usb/musb-new/sunxi.c                                  | 3 +++
 drivers/usb/musb-new/ti-musb.c                                | 1 +
 drivers/usb/musb-new/usb-compat.h                             | 1 +
 drivers/usb/musb/am35x.c                                      | 1 +
 drivers/usb/musb/am35x.h                                      | 1 +
 drivers/usb/musb/musb_core.c                                  | 1 +
 drivers/usb/musb/musb_core.h                                  | 1 +
 drivers/usb/musb/musb_hcd.c                                   | 2 ++
 drivers/usb/musb/musb_udc.c                                   | 1 +
 drivers/usb/musb/omap3.c                                      | 1 +
 drivers/usb/musb/omap3.h                                      | 1 +
 drivers/usb/phy/omap_usb_phy.c                                | 1 +
 drivers/usb/phy/rockchip_usb2_phy.c                           | 1 +
 drivers/usb/phy/twl4030.c                                     | 1 +
 drivers/usb/ulpi/omap-ulpi-viewport.c                         | 1 +
 drivers/usb/ulpi/ulpi-viewport.c                              | 1 +
 drivers/usb/ulpi/ulpi.c                                       | 1 +
 drivers/video/am335x-fb.c                                     | 2 ++
 drivers/video/anx9804.c                                       | 1 +
 drivers/video/anx9804.h                                       | 1 +
 drivers/video/ati_radeon_fb.c                                 | 1 +
 drivers/video/ati_radeon_fb.h                                 | 1 +
 drivers/video/atmel_hlcdfb.c                                  | 1 +
 drivers/video/atmel_lcdfb.c                                   | 1 +
 drivers/video/bcm2835.c                                       | 1 +
 drivers/video/bridge/anx6345.c                                | 1 +
 drivers/video/bridge/ps862x.c                                 | 1 +
 drivers/video/bridge/video-bridge-uclass.c                    | 1 +
 drivers/video/broadwell_igd.c                                 | 2 ++
 drivers/video/bus_vcxk.c                                      | 1 +
 drivers/video/cfb_console.c                                   | 2 ++
 drivers/video/console_normal.c                                | 1 +
 drivers/video/console_rotate.c                                | 1 +
 drivers/video/console_truetype.c                              | 1 +
 drivers/video/da8xx-fb.c                                      | 1 +
 drivers/video/display-uclass.c                                | 1 +
 drivers/video/dw_hdmi.c                                       | 2 ++
 drivers/video/dw_mipi_dsi.c                                   | 3 +++
 drivers/video/efi.c                                           | 1 +
 drivers/video/exynos/exynos_dp.c                              | 1 +
 drivers/video/exynos/exynos_dp_lowlevel.c                     | 1 +
 drivers/video/exynos/exynos_dp_lowlevel.h                     | 1 +
 drivers/video/exynos/exynos_fb.c                              | 1 +
 drivers/video/exynos/exynos_mipi_dsi_common.c                 | 1 +
 drivers/video/exynos/exynos_mipi_dsi_lowlevel.c               | 1 +
 drivers/video/formike.c                                       | 1 +
 drivers/video/fsl_dcu_fb.c                                    | 1 +
 drivers/video/fsl_diu_fb.c                                    | 1 +
 drivers/video/hitachi_tx18d42vm_lcd.c                         | 1 +
 drivers/video/ihs_video_out.c                                 | 1 +
 drivers/video/imx/ipu_common.c                                | 1 +
 drivers/video/imx/ipu_regs.h                                  | 1 +
 drivers/video/imx/mxc_ipuv3_fb.c                              | 1 +
 drivers/video/ivybridge_igd.c                                 | 1 +
 drivers/video/lg4573.c                                        | 1 +
 drivers/video/logicore_dp_tx.c                                | 1 +
 drivers/video/logicore_dp_tx.h                                | 1 +
 drivers/video/logicore_dp_tx_regif.h                          | 1 +
 drivers/video/mali_dp.c                                       | 1 +
 drivers/video/mb862xx.c                                       | 1 +
 drivers/video/meson/meson_canvas.c                            | 1 +
 drivers/video/meson/meson_dw_hdmi.c                           | 3 +++
 drivers/video/meson/meson_plane.c                             | 1 +
 drivers/video/meson/meson_registers.h                         | 1 +
 drivers/video/meson/meson_vclk.c                              | 2 ++
 drivers/video/meson/meson_venc.c                              | 1 +
 drivers/video/meson/meson_vpu.c                               | 1 +
 drivers/video/meson/meson_vpu.h                               | 2 ++
 drivers/video/meson/meson_vpu_init.c                          | 1 +
 drivers/video/mipi_dsi.c                                      | 1 +
 drivers/video/mvebu_lcd.c                                     | 1 +
 drivers/video/mx3fb.c                                         | 1 +
 drivers/video/mxsfb.c                                         | 2 ++
 drivers/video/nexell/s5pxx18_dp.c                             | 1 +
 drivers/video/nexell/s5pxx18_dp_hdmi.c                        | 1 +
 drivers/video/nexell/s5pxx18_dp_lvds.c                        | 1 +
 drivers/video/nexell/s5pxx18_dp_mipi.c                        | 2 ++
 drivers/video/nexell/soc/s5pxx18_soc_lvds.h                   | 1 +
 drivers/video/nexell/soc/s5pxx18_soc_mipi.h                   | 1 +
 drivers/video/nexell_display.c                                | 2 ++
 drivers/video/omap3_dss.c                                     | 1 +
 drivers/video/orisetech_otm8009a.c                            | 1 +
 drivers/video/pwm_backlight.c                                 | 1 +
 drivers/video/pxa_lcd.c                                       | 1 +
 drivers/video/raydium-rm68200.c                               | 1 +
 drivers/video/rockchip/rk3288_vop.c                           | 1 +
 drivers/video/rockchip/rk3399_vop.c                           | 1 +
 drivers/video/rockchip/rk_edp.c                               | 2 ++
 drivers/video/rockchip/rk_hdmi.c                              | 1 +
 drivers/video/rockchip/rk_hdmi.h                              | 1 +
 drivers/video/rockchip/rk_lvds.c                              | 2 ++
 drivers/video/rockchip/rk_mipi.c                              | 1 +
 drivers/video/rockchip/rk_mipi.h                              | 1 +
 drivers/video/rockchip/rk_vop.c                               | 1 +
 drivers/video/rockchip/rk_vop.h                               | 1 +
 drivers/video/sandbox_osd.c                                   | 1 +
 drivers/video/scf0403_lcd.c                                   | 1 +
 drivers/video/ssd2828.c                                       | 1 +
 drivers/video/stb_truetype.h                                  | 1 +
 drivers/video/stm32/stm32_dsi.c                               | 2 ++
 drivers/video/stm32/stm32_ltdc.c                              | 2 ++
 drivers/video/sunxi/lcdc.c                                    | 1 +
 drivers/video/sunxi/sunxi_de2.c                               | 1 +
 drivers/video/sunxi/sunxi_display.c                           | 2 ++
 drivers/video/sunxi/sunxi_dw_hdmi.c                           | 1 +
 drivers/video/sunxi/sunxi_lcd.c                               | 1 +
 drivers/video/tda19988.c                                      | 1 +
 drivers/video/tegra.c                                         | 1 +
 drivers/video/tegra124/display.c                              | 1 +
 drivers/video/tegra124/displayport.h                          | 1 +
 drivers/video/tegra124/dp.c                                   | 2 ++
 drivers/video/tegra124/sor.c                                  | 2 ++
 drivers/video/tegra124/sor.h                                  | 1 +
 drivers/video/vesa.c                                          | 1 +
 drivers/video/vidconsole-uclass.c                             | 1 +
 drivers/video/video-uclass.c                                  | 2 ++
 drivers/video/video_bmp.c                                     | 3 +++
 drivers/video/video_osd-uclass.c                              | 1 +
 drivers/virtio/virtio-uclass.c                                | 1 +
 drivers/virtio/virtio_blk.c                                   | 1 +
 drivers/virtio/virtio_blk.h                                   | 1 +
 drivers/virtio/virtio_mmio.c                                  | 2 ++
 drivers/virtio/virtio_mmio.h                                  | 2 ++
 drivers/virtio/virtio_net.c                                   | 2 ++
 drivers/virtio/virtio_net.h                                   | 1 +
 drivers/virtio/virtio_pci.h                                   | 1 +
 drivers/virtio/virtio_pci_legacy.c                            | 2 ++
 drivers/virtio/virtio_pci_modern.c                            | 2 ++
 drivers/virtio/virtio_ring.c                                  | 1 +
 drivers/virtio/virtio_rng.c                                   | 1 +
 drivers/virtio/virtio_sandbox.c                               | 1 +
 drivers/w1-eeprom/ds24xxx.c                                   | 1 +
 drivers/w1-eeprom/ds2502.c                                    | 1 +
 drivers/w1-eeprom/eep_sandbox.c                               | 1 +
 drivers/w1-eeprom/w1-eeprom-uclass.c                          | 1 +
 drivers/w1/mxc_w1.c                                           | 1 +
 drivers/w1/w1-gpio.c                                          | 1 +
 drivers/w1/w1-uclass.c                                        | 1 +
 drivers/watchdog/armada-37xx-wdt.c                            | 2 ++
 drivers/watchdog/ast_wdt.c                                    | 1 +
 drivers/watchdog/at91sam9_wdt.c                               | 1 +
 drivers/watchdog/bcm6345_wdt.c                                | 2 ++
 drivers/watchdog/cdns_wdt.c                                   | 2 ++
 drivers/watchdog/cortina_wdt.c                                | 2 ++
 drivers/watchdog/designware_wdt.c                             | 2 ++
 drivers/watchdog/imx_watchdog.c                               | 3 +++
 drivers/watchdog/mpc8xx_wdt.c                                 | 2 ++
 drivers/watchdog/mt7621_wdt.c                                 | 2 ++
 drivers/watchdog/mtk_wdt.c                                    | 2 ++
 drivers/watchdog/omap_wdt.c                                   | 1 +
 drivers/watchdog/orion_wdt.c                                  | 3 +++
 drivers/watchdog/sandbox_wdt.c                                | 1 +
 drivers/watchdog/sbsa_gwdt.c                                  | 2 ++
 drivers/watchdog/sp805_wdt.c                                  | 2 ++
 drivers/watchdog/stm32mp_wdt.c                                | 1 +
 drivers/watchdog/tangier_wdt.c                                | 1 +
 drivers/watchdog/ulp_wdog.c                                   | 1 +
 drivers/watchdog/wdt-uclass.c                                 | 1 +
 drivers/watchdog/xilinx_tb_wdt.c                              | 2 ++
 drivers/watchdog/xilinx_wwdt.c                                | 1 +
 env/common.c                                                  | 1 +
 env/eeprom.c                                                  | 1 +
 env/env.c                                                     | 3 +++
 env/ext4.c                                                    | 2 ++
 env/fat.c                                                     | 2 ++
 env/flags.c                                                   | 1 +
 env/flash.c                                                   | 1 +
 env/mmc.c                                                     | 2 ++
 env/nand.c                                                    | 1 +
 env/nowhere.c                                                 | 1 +
 env/nvram.c                                                   | 1 +
 env/onenand.c                                                 | 1 +
 env/remote.c                                                  | 1 +
 env/sata.c                                                    | 2 ++
 env/sf.c                                                      | 2 ++
 examples/api/glue.c                                           | 1 +
 examples/api/glue.h                                           | 1 +
 examples/standalone/atmel_df_pow2.c                           | 1 +
 examples/standalone/sched.c                                   | 1 +
 fs/btrfs/btrfs.c                                              | 1 +
 fs/btrfs/btrfs.h                                              | 1 +
 fs/btrfs/btrfs_tree.h                                         | 1 +
 fs/btrfs/ctree.h                                              | 1 +
 fs/btrfs/subvolume.c                                          | 1 +
 fs/btrfs/super.c                                              | 1 +
 fs/cbfs/cbfs.c                                                | 1 +
 fs/cramfs/cramfs.c                                            | 1 +
 fs/ext4/dev.c                                                 | 1 +
 fs/ext4/ext4_common.c                                         | 1 +
 fs/ext4/ext4_common.h                                         | 1 +
 fs/ext4/ext4_journal.c                                        | 1 +
 fs/ext4/ext4_journal.h                                        | 1 +
 fs/ext4/ext4_write.c                                          | 2 ++
 fs/ext4/ext4fs.c                                              | 1 +
 fs/fat/fat.c                                                  | 1 +
 fs/fat/fat_write.c                                            | 1 +
 fs/fs.c                                                       | 2 ++
 fs/fs_internal.c                                              | 1 +
 fs/jffs2/compr_lzo.c                                          | 1 +
 fs/jffs2/compr_rtime.c                                        | 1 +
 fs/jffs2/compr_rubin.c                                        | 1 +
 fs/jffs2/jffs2_1pass.c                                        | 1 +
 fs/jffs2/jffs2_private.h                                      | 1 +
 fs/jffs2/summary.h                                            | 1 +
 fs/reiserfs/mode_string.c                                     | 1 +
 fs/reiserfs/reiserfs.c                                        | 1 +
 fs/reiserfs/reiserfs_private.h                                | 1 +
 fs/sandbox/sandboxfs.c                                        | 1 +
 fs/squashfs/sqfs_filesystem.h                                 | 1 +
 fs/ubifs/debug.c                                              | 1 +
 fs/ubifs/debug.h                                              | 1 +
 fs/ubifs/io.c                                                 | 1 +
 fs/ubifs/key.h                                                | 1 +
 fs/ubifs/lprops.c                                             | 1 +
 fs/ubifs/lpt_commit.c                                         | 1 +
 fs/ubifs/misc.h                                               | 1 +
 fs/ubifs/orphan.c                                             | 1 +
 fs/ubifs/recovery.c                                           | 1 +
 fs/ubifs/replay.c                                             | 1 +
 fs/ubifs/scan.c                                               | 1 +
 fs/ubifs/super.c                                              | 1 +
 fs/ubifs/tnc.c                                                | 1 +
 fs/ubifs/tnc_misc.c                                           | 1 +
 fs/ubifs/ubifs-media.h                                        | 2 ++
 fs/ubifs/ubifs.c                                              | 1 +
 fs/ubifs/ubifs.h                                              | 1 +
 fs/yaffs2/yaffs_uboot_glue.c                                  | 1 +
 fs/yaffs2/yaffsfs.c                                           | 1 +
 fs/yaffs2/ydirectenv.h                                        | 1 +
 fs/zfs/zfs.c                                                  | 1 +
 fs/zfs/zfs_fletcher.c                                         | 1 +
 fs/zfs/zfs_lzjb.c                                             | 1 +
 fs/zfs/zfs_sha256.c                                           | 1 +
 include/ACEX1K.h                                              | 1 +
 include/MCD_dma.h                                             | 3 +++
 include/acpi/acpi_device.h                                    | 1 +
 include/acpi/acpi_s3.h                                        | 1 +
 include/acpi/acpi_table.h                                     | 2 ++
 include/ahci.h                                                | 1 +
 include/ali512x.h                                             | 1 +
 include/altera.h                                              | 1 +
 include/android_bootloader_message.h                          | 1 +
 include/api_public.h                                          | 1 +
 include/asm-generic/global_data.h                             | 1 +
 include/asm-generic/gpio.h                                    | 1 +
 include/asm-generic/int-ll64.h                                | 1 +
 include/asm-generic/io.h                                      | 1 +
 include/ata.h                                                 | 1 +
 include/atf_common.h                                          | 1 +
 include/atmel_hlcdc.h                                         | 1 +
 include/atmel_lcd.h                                           | 3 +++
 include/atmel_mci.h                                           | 1 +
 include/atsha204a-i2c.h                                       | 1 +
 include/audio_codec.h                                         | 1 +
 include/autoboot.h                                            | 2 ++
 include/avb_verify.h                                          | 1 +
 include/axi.h                                                 | 1 +
 include/binman.h                                              | 1 +
 include/blk.h                                                 | 1 +
 include/bloblist.h                                            | 1 +
 include/board.h                                               | 1 +
 include/bootcount.h                                           | 1 +
 include/bootm.h                                               | 1 +
 include/bootstage.h                                           | 1 +
 include/broadcom/chimp.h                                      | 1 +
 include/btrfs.h                                               | 1 +
 include/bus_vcxk.h                                            | 1 +
 include/cache.h                                               | 2 ++
 include/capitalization.h                                      | 1 +
 include/cavium/atf.h                                          | 1 +
 include/cbfs.h                                                | 1 +
 include/cli.h                                                 | 1 +
 include/clk-uclass.h                                          | 1 +
 include/command.h                                             | 1 +
 include/common.h                                              | 1 -
 include/cpsw.h                                                | 1 +
 include/cpu.h                                                 | 1 +
 include/cramfs/cramfs_fs.h                                    | 1 +
 include/cros_ec.h                                             | 1 +
 include/crypto/pkcs7.h                                        | 1 +
 include/crypto/pkcs7_parser.h                                 | 1 +
 include/crypto/x509_parser.h                                  | 1 +
 include/ddr_spd.h                                             | 1 +
 include/dfu.h                                                 | 1 +
 include/display.h                                             | 1 +
 include/display_options.h                                     | 1 +
 include/dm/device-internal.h                                  | 1 +
 include/dm/device.h                                           | 1 +
 include/dm/devres.h                                           | 1 +
 include/dm/of.h                                               | 1 +
 include/dm/of_access.h                                        | 1 +
 include/dm/of_addr.h                                          | 1 +
 include/dm/of_extra.h                                         | 1 +
 include/dm/ofnode.h                                           | 1 +
 include/dm/pci.h                                              | 1 +
 include/dm/pinctrl.h                                          | 1 +
 include/dm/platdata.h                                         | 1 +
 include/dm/platform_data/fsl_espi.h                           | 1 +
 include/dm/platform_data/net_ethoc.h                          | 1 +
 include/dm/platform_data/spi_coldfire.h                       | 1 +
 include/dm/platform_data/spi_davinci.h                        | 1 +
 include/dm/read.h                                             | 1 +
 include/dm/root.h                                             | 1 +
 include/dm/test.h                                             | 1 +
 include/dm/uclass.h                                           | 1 +
 include/dm9000.h                                              | 1 +
 include/dma-uclass.h                                          | 1 +
 include/dw_hdmi.h                                             | 1 +
 include/dwc3-uboot.h                                          | 1 +
 include/dwmmc.h                                               | 1 +
 include/ec_commands.h                                         | 2 ++
 include/edid.h                                                | 1 +
 include/eeprom.h                                              | 4 +++-
 include/eeprom_layout.h                                       | 1 +
 include/efi_api.h                                             | 2 ++
 include/efi_loader.h                                          | 2 ++
 include/efi_selftest.h                                        | 1 +
 include/efi_variable.h                                        | 1 +
 include/env_default.h                                         | 1 +
 include/env_internal.h                                        | 1 +
 include/ethsw.h                                               | 1 +
 include/exports.h                                             | 1 +
 include/ext4fs.h                                              | 1 +
 include/ext_common.h                                          | 1 +
 include/exynos_lcd.h                                          | 1 +
 include/fastboot-internal.h                                   | 1 +
 include/fastboot.h                                            | 1 +
 include/fat.h                                                 | 1 +
 include/fb_mmc.h                                              | 1 +
 include/fb_nand.h                                             | 1 +
 include/fdt_support.h                                         | 1 +
 include/fdtdec.h                                              | 1 +
 include/fis.h                                                 | 1 +
 include/flash.h                                               | 1 +
 include/fs.h                                                  | 1 +
 include/fs_loader.h                                           | 2 ++
 include/fsl-mc/fsl_dpaa_fd.h                                  | 1 +
 include/fsl-mc/fsl_dpbp.h                                     | 1 +
 include/fsl-mc/fsl_dpio.h                                     | 1 +
 include/fsl-mc/fsl_dpmac.h                                    | 1 +
 include/fsl-mc/fsl_dpmng.h                                    | 1 +
 include/fsl-mc/fsl_dpni.h                                     | 1 +
 include/fsl-mc/fsl_dprc.h                                     | 1 +
 include/fsl-mc/fsl_dpsparser.h                                | 1 +
 include/fsl-mc/fsl_mc.h                                       | 2 ++
 include/fsl-mc/fsl_mc_cmd.h                                   | 2 ++
 include/fsl-mc/fsl_mc_sys.h                                   | 1 +
 include/fsl-mc/fsl_qbman_base.h                               | 1 +
 include/fsl-mc/fsl_qbman_portal.h                             | 1 +
 include/fsl-mc/ldpaa_wriop.h                                  | 1 +
 include/fsl_csu.h                                             | 1 +
 include/fsl_ddr.h                                             | 1 +
 include/fsl_ddr_sdram.h                                       | 1 +
 include/fsl_devdis.h                                          | 1 +
 include/fsl_diu_fb.h                                          | 1 +
 include/fsl_dspi.h                                            | 1 +
 include/fsl_errata.h                                          | 1 +
 include/fsl_esdhc.h                                           | 1 +
 include/fsl_esdhc_imx.h                                       | 1 +
 include/fsl_ifc.h                                             | 1 +
 include/fsl_immap.h                                           | 1 +
 include/fsl_lpuart.h                                          | 1 +
 include/fsl_mdio.h                                            | 2 ++
 include/fsl_memac.h                                           | 1 +
 include/fsl_mmdc.h                                            | 1 +
 include/fsl_qbman.h                                           | 2 ++
 include/fsl_sec.h                                             | 1 +
 include/fsl_sec_mon.h                                         | 1 +
 include/fsl_sfp.h                                             | 1 +
 include/fsl_tgec.h                                            | 1 +
 include/fsl_usb.h                                             | 1 +
 include/fsl_wdog.h                                            | 1 +
 include/fuse.h                                                | 1 +
 include/gdsys_fpga.h                                          | 1 +
 include/gzip.h                                                | 1 +
 include/hash.h                                                | 1 +
 include/hda_codec.h                                           | 1 +
 include/hw_sha.h                                              | 1 +
 include/i2c.h                                                 | 1 +
 include/i2c_eeprom.h                                          | 1 +
 include/i2s.h                                                 | 1 +
 include/ide.h                                                 | 1 +
 include/imx8image.h                                           | 2 ++
 include/imx_lpi2c.h                                           | 1 +
 include/imximage.h                                            | 1 +
 include/input.h                                               | 1 +
 include/ioports.h                                             | 1 +
 include/ipu_pixfmt.h                                          | 1 +
 include/irq.h                                                 | 1 +
 include/jffs2/jffs2_1pass.h                                   | 1 +
 include/jffs2/load_kernel.h                                   | 1 +
 include/k3-avs.h                                              | 2 ++
 include/kendryte/bypass.h                                     | 1 +
 include/kendryte/clk.h                                        | 1 +
 include/kendryte/pll.h                                        | 2 ++
 include/key_matrix.h                                          | 1 +
 include/keys/asymmetric-type.h                                | 1 +
 include/lattice.h                                             | 1 +
 include/lcd.h                                                 | 1 +
 include/lcd_console.h                                         | 1 +
 include/lcdvideo.h                                            | 1 +
 include/libata.h                                              | 1 +
 include/linux/mtd/omap_gpmc.h                                 | 2 ++
 include/linux/soc/ti/cppi5.h                                  | 3 +++
 include/linux/soc/ti/k3-navss-ringacc.h                       | 1 +
 include/linux/soc/ti/k3-sec-proxy.h                           | 1 +
 include/linux/soc/ti/ti-udma.h                                | 1 +
 include/linux/soc/ti/ti_sci_protocol.h                        | 2 ++
 include/lmb.h                                                 | 1 +
 include/lynxkdi.h                                             | 1 +
 include/lz4.h                                                 | 1 +
 include/mailbox.h                                             | 1 +
 include/malloc.h                                              | 1 +
 include/mapmem.h                                              | 1 +
 include/mc9sdz60.h                                            | 1 +
 include/memalign.h                                            | 1 +
 include/miiphy.h                                              | 1 +
 include/mipi_dsi.h                                            | 1 +
 include/mm_communication.h                                    | 1 +
 include/mmc.h                                                 | 1 +
 include/mpc86xx.h                                             | 1 +
 include/mtd/cfi_flash.h                                       | 1 +
 include/mtd/ubi-user.h                                        | 1 +
 include/mv88e6352.h                                           | 1 +
 include/mvebu/comphy.h                                        | 1 +
 include/mvebu_mmc.h                                           | 1 +
 include/mvmfp.h                                               | 1 +
 include/mxs_nand.h                                            | 1 +
 include/nand.h                                                | 1 +
 include/net/ncsi-pkt.h                                        | 1 +
 include/net/pcap.h                                            | 1 +
 include/net/pfe_eth/pfe/cbus/bmu.h                            | 1 +
 include/net/pfe_eth/pfe/cbus/class_csr.h                      | 1 +
 include/net/pfe_eth/pfe/cbus/gpi.h                            | 1 +
 include/net/pfe_eth/pfe/cbus/tmu_csr.h                        | 1 +
 include/net/pfe_eth/pfe/pfe_hw.h                              | 1 +
 include/net/pfe_eth/pfe_driver.h                              | 2 ++
 include/net/tftp.h                                            | 1 +
 include/netdev.h                                              | 1 +
 include/nvme.h                                                | 1 +
 include/opensbi.h                                             | 1 +
 include/p2sb.h                                                | 1 +
 include/palmas.h                                              | 1 +
 include/part.h                                                | 1 +
 include/part_efi.h                                            | 2 ++
 include/pca953x.h                                             | 1 +
 include/pca9698.h                                             | 1 +
 include/pch.h                                                 | 1 +
 include/pci.h                                                 | 1 +
 include/pci_ep.h                                              | 1 +
 include/pci_rom.h                                             | 1 +
 include/pe.h                                                  | 1 +
 include/phy.h                                                 | 1 +
 include/physmem.h                                             | 1 +
 include/post.h                                                | 1 +
 include/power/acpi_pmc.h                                      | 1 +
 include/power/as3722.h                                        | 1 +
 include/power/battery.h                                       | 1 +
 include/power/fg_battery_cell_params.h                        | 1 +
 include/power/hi6553_pmic.h                                   | 1 +
 include/power/max77686_pmic.h                                 | 1 +
 include/power/mc34vr500_pmic.h                                | 1 +
 include/power/pmic.h                                          | 1 +
 include/power/regulator.h                                     | 1 +
 include/power/rk8xx_pmic.h                                    | 1 +
 include/power/s5m8767.h                                       | 1 +
 include/power/tps65217.h                                      | 1 +
 include/power/tps65218.h                                      | 1 +
 include/power/tps65910_pmic.h                                 | 1 +
 include/pwm.h                                                 | 1 +
 include/pxa_lcd.h                                             | 1 +
 include/qfw.h                                                 | 2 ++
 include/ram.h                                                 | 1 +
 include/regmap.h                                              | 1 +
 include/remoteproc.h                                          | 1 +
 include/rng.h                                                 | 2 ++
 include/rtc.h                                                 | 1 +
 include/s_record.h                                            | 1 +
 include/samsung/misc.h                                        | 1 +
 include/sandbox-clk.h                                         | 2 ++
 include/sandboxfs.h                                           | 1 +
 include/sandboxtee.h                                          | 1 +
 include/sata.h                                                | 1 +
 include/sdhci.h                                               | 1 +
 include/search.h                                              | 1 +
 include/serial.h                                              | 1 +
 include/sja1000.h                                             | 1 +
 include/smbios.h                                              | 2 ++
 include/smem.h                                                | 1 +
 include/smsc_lpc47m.h                                         | 1 +
 include/sort.h                                                | 1 +
 include/sound.h                                               | 1 +
 include/spi-mem.h                                             | 1 +
 include/spi.h                                                 | 1 +
 include/spl.h                                                 | 1 +
 include/spl_gpio.h                                            | 1 +
 include/splash.h                                              | 1 +
 include/spmi/spmi.h                                           | 1 +
 include/stm32_rcc.h                                           | 1 +
 include/stratixII.h                                           | 1 +
 include/syscon.h                                              | 1 +
 include/sysreset.h                                            | 1 +
 include/tables_csum.h                                         | 1 +
 include/tca642x.h                                             | 1 +
 include/tee.h                                                 | 1 +
 include/tee/optee.h                                           | 1 +
 include/tegra-kbc.h                                           | 1 +
 include/test/ut.h                                             | 1 +
 include/timer.h                                               | 1 +
 include/tlv_eeprom.h                                          | 1 +
 include/tpm-common.h                                          | 1 +
 include/tpm-v1.h                                              | 2 ++
 include/tpm-v2.h                                              | 1 +
 include/trace.h                                               | 1 +
 include/tsec.h                                                | 2 ++
 include/twl4030.h                                             | 1 +
 include/twl6030.h                                             | 1 +
 include/u-boot/aes.h                                          | 1 +
 include/u-boot/crc.h                                          | 1 +
 include/u-boot/rsa-checksum.h                                 | 1 +
 include/u-boot/rsa-mod-exp.h                                  | 1 +
 include/u-boot/rsa.h                                          | 1 +
 include/u-boot/sha1.h                                         | 1 +
 include/u-boot/sha256.h                                       | 1 +
 include/u-boot/sha512.h                                       | 1 +
 include/u-boot/zlib.h                                         | 1 +
 include/ubifs_uboot.h                                         | 1 +
 include/ubispl.h                                              | 1 +
 include/uboot_aes.h                                           | 1 +
 include/usb.h                                                 | 1 +
 include/usb/designware_udc.h                                  | 1 +
 include/usb/dwc2_udc.h                                        | 1 +
 include/usb/ehci-ci.h                                         | 1 +
 include/usb/fotg210.h                                         | 1 +
 include/usb/fusbh200.h                                        | 1 +
 include/usb/ulpi.h                                            | 1 +
 include/usb/xhci.h                                            | 1 +
 include/usb_ether.h                                           | 1 +
 include/usb_mass_storage.h                                    | 1 +
 include/usbdevice.h                                           | 1 +
 include/uuid.h                                                | 1 +
 include/vbe.h                                                 | 2 ++
 include/video.h                                               | 1 +
 include/video_bridge.h                                        | 1 +
 include/video_console.h                                       | 1 +
 include/video_osd.h                                           | 1 +
 include/virtio.h                                              | 1 +
 include/virtio_ring.h                                         | 1 +
 include/vxworks.h                                             | 1 +
 include/w1-eeprom.h                                           | 1 +
 include/w1.h                                                  | 1 +
 include/wait_bit.h                                            | 1 +
 include/wdt.h                                                 | 2 ++
 include/winbond_w83627.h                                      | 1 +
 include/xilinx.h                                              | 1 +
 include/zfs/dmu_objset.h                                      | 1 +
 include/zfs/dnode.h                                           | 1 +
 include/zfs/dsl_dataset.h                                     | 1 +
 include/zfs/dsl_dir.h                                         | 1 +
 include/zfs/sa_impl.h                                         | 1 +
 include/zfs/spa.h                                             | 1 +
 include/zfs/uberblock_impl.h                                  | 1 +
 include/zfs/vdev_impl.h                                       | 1 +
 include/zfs/zap_impl.h                                        | 1 +
 include/zfs/zap_leaf.h                                        | 1 +
 include/zfs/zfs.h                                             | 1 +
 include/zfs/zfs_acl.h                                         | 1 +
 include/zfs/zfs_znode.h                                       | 1 +
 include/zfs/zil.h                                             | 1 +
 include/zfs/zio.h                                             | 1 +
 include/zfs/zio_checksum.h                                    | 1 +
 include/zfs_common.h                                          | 1 +
 include/zynq_bootimg.h                                        | 1 +
 include/zynqmp_firmware.h                                     | 1 +
 include/zynqmp_tap_delay.h                                    | 1 +
 include/zynqpl.h                                              | 1 +
 lib/acpi/acpi_device.c                                        | 2 ++
 lib/acpi/acpi_dp.c                                            | 1 +
 lib/acpi/acpi_table.c                                         | 1 +
 lib/acpi/acpigen.c                                            | 1 +
 lib/addr_map.c                                                | 1 +
 lib/aes.c                                                     | 1 +
 lib/aes/aes-decrypt.c                                         | 1 +
 lib/asn1_decoder.c                                            | 1 +
 lib/at91/at91.c                                               | 1 +
 lib/charset.c                                                 | 1 +
 lib/crc16.c                                                   | 1 +
 lib/crc32.c                                                   | 1 +
 lib/crc32c.c                                                  | 1 +
 lib/crypto/asymmetric_type.c                                  | 2 ++
 lib/crypto/pkcs7_parser.c                                     | 2 ++
 lib/crypto/pkcs7_verify.c                                     | 1 +
 lib/crypto/public_key.c                                       | 1 +
 lib/crypto/rsa_helper.c                                       | 1 +
 lib/crypto/x509_cert_parser.c                                 | 1 +
 lib/crypto/x509_public_key.c                                  | 2 ++
 lib/dhry/cmd_dhry.c                                           | 1 +
 lib/display_options.c                                         | 2 ++
 lib/div64.c                                                   | 1 +
 lib/efi/efi_info.c                                            | 1 +
 lib/efi/efi_stub.c                                            | 2 ++
 lib/efi_driver/efi_block_device.c                             | 1 +
 lib/efi_driver/efi_uclass.c                                   | 1 +
 lib/efi_loader/efi_acpi.c                                     | 1 +
 lib/efi_loader/efi_bootmgr.c                                  | 1 +
 lib/efi_loader/efi_boottime.c                                 | 2 ++
 lib/efi_loader/efi_console.c                                  | 1 +
 lib/efi_loader/efi_device_path.c                              | 2 ++
 lib/efi_loader/efi_device_path_to_text.c                      | 1 +
 lib/efi_loader/efi_device_path_utilities.c                    | 1 +
 lib/efi_loader/efi_disk.c                                     | 2 ++
 lib/efi_loader/efi_file.c                                     | 1 +
 lib/efi_loader/efi_freestanding.c                             | 1 +
 lib/efi_loader/efi_gop.c                                      | 1 +
 lib/efi_loader/efi_hii.c                                      | 1 +
 lib/efi_loader/efi_hii_config.c                               | 1 +
 lib/efi_loader/efi_image_loader.c                             | 3 +++
 lib/efi_loader/efi_load_initrd.c                              | 1 +
 lib/efi_loader/efi_memory.c                                   | 3 +++
 lib/efi_loader/efi_net.c                                      | 2 ++
 lib/efi_loader/efi_rng.c                                      | 2 ++
 lib/efi_loader/efi_root_node.c                                | 1 +
 lib/efi_loader/efi_runtime.c                                  | 3 +++
 lib/efi_loader/efi_setup.c                                    | 1 +
 lib/efi_loader/efi_signature.c                                | 1 +
 lib/efi_loader/efi_smbios.c                                   | 1 +
 lib/efi_loader/efi_unicode_collation.c                        | 1 +
 lib/efi_loader/efi_var_common.c                               | 2 ++
 lib/efi_loader/efi_var_file.c                                 | 1 +
 lib/efi_loader/efi_var_mem.c                                  | 2 ++
 lib/efi_loader/efi_variable.c                                 | 1 +
 lib/efi_loader/efi_variable_tee.c                             | 1 +
 lib/efi_loader/helloworld.c                                   | 1 +
 lib/efi_selftest/efi_selftest.c                               | 1 +
 lib/efi_selftest/efi_selftest_bitblt.c                        | 1 +
 lib/efi_selftest/efi_selftest_block_device.c                  | 1 +
 lib/efi_selftest/efi_selftest_config_table.c                  | 1 +
 lib/efi_selftest/efi_selftest_console.c                       | 1 +
 lib/efi_selftest/efi_selftest_controllers.c                   | 1 +
 lib/efi_selftest/efi_selftest_crc32.c                         | 1 +
 lib/efi_selftest/efi_selftest_devicepath.c                    | 2 ++
 lib/efi_selftest/efi_selftest_event_groups.c                  | 1 +
 lib/efi_selftest/efi_selftest_exception.c                     | 1 +
 lib/efi_selftest/efi_selftest_fdt.c                           | 1 +
 lib/efi_selftest/efi_selftest_gop.c                           | 1 +
 lib/efi_selftest/efi_selftest_hii.c                           | 1 +
 lib/efi_selftest/efi_selftest_hii_data.c                      | 1 +
 lib/efi_selftest/efi_selftest_load_initrd.c                   | 1 +
 lib/efi_selftest/efi_selftest_loadimage.c                     | 2 ++
 lib/efi_selftest/efi_selftest_manageprotocols.c               | 1 +
 lib/efi_selftest/efi_selftest_mem.c                           | 1 +
 lib/efi_selftest/efi_selftest_memory.c                        | 1 +
 lib/efi_selftest/efi_selftest_miniapp_exit.c                  | 1 +
 lib/efi_selftest/efi_selftest_rng.c                           | 1 +
 lib/efi_selftest/efi_selftest_set_virtual_address_map.c       | 1 +
 lib/efi_selftest/efi_selftest_snp.c                           | 2 ++
 lib/efi_selftest/efi_selftest_startimage_exit.c               | 1 +
 lib/efi_selftest/efi_selftest_startimage_return.c             | 1 +
 lib/efi_selftest/efi_selftest_textinputex.c                   | 1 +
 lib/efi_selftest/efi_selftest_textoutput.c                    | 1 +
 lib/efi_selftest/efi_selftest_unaligned.c                     | 1 +
 lib/efi_selftest/efi_selftest_unicode_collation.c             | 1 +
 lib/efi_selftest/efi_selftest_util.c                          | 1 +
 lib/efi_selftest/efi_selftest_variables.c                     | 1 +
 lib/efi_selftest/efi_selftest_variables_runtime.c             | 1 +
 lib/efi_selftest/efi_selftest_watchdog.c                      | 1 +
 lib/elf.c                                                     | 1 +
 lib/fdtdec.c                                                  | 3 +++
 lib/fdtdec_test.c                                             | 1 +
 lib/gunzip.c                                                  | 2 ++
 lib/hexdump.c                                                 | 2 ++
 lib/image-sparse.c                                            | 1 +
 lib/libavb/avb_sysdeps.h                                      | 1 +
 lib/libavb/avb_sysdeps_posix.c                                | 1 +
 lib/linux_compat.c                                            | 1 +
 lib/linux_string.c                                            | 1 +
 lib/lmb.c                                                     | 2 ++
 lib/lz4.c                                                     | 1 +
 lib/lzma/LzmaDec.c                                            | 1 +
 lib/lzma/LzmaTools.c                                          | 1 +
 lib/lzma/Types.h                                              | 1 +
 lib/lzo/lzo1x_decompress.c                                    | 1 +
 lib/lzo/lzodefs.h                                             | 1 +
 lib/membuff.c                                                 | 2 ++
 lib/net_utils.c                                               | 1 +
 lib/of_live.c                                                 | 2 ++
 lib/oid_registry.c                                            | 1 +
 lib/optee/optee.c                                             | 1 +
 lib/physmem.c                                                 | 2 ++
 lib/rsa/rsa-checksum.c                                        | 1 +
 lib/rsa/rsa-keyprop.c                                         | 1 +
 lib/rsa/rsa-mod-exp.c                                         | 1 +
 lib/rsa/rsa-verify.c                                          | 1 +
 lib/sha1.c                                                    | 1 +
 lib/sha256.c                                                  | 1 +
 lib/sha512.c                                                  | 1 +
 lib/smbios.c                                                  | 1 +
 lib/strto.c                                                   | 1 +
 lib/tables_csum.c                                             | 1 +
 lib/time.c                                                    | 1 +
 lib/tiny-printf.c                                             | 1 +
 lib/tizen/tizen.c                                             | 1 +
 lib/tpm-common.c                                              | 1 +
 lib/tpm-utils.h                                               | 1 +
 lib/tpm-v1.c                                                  | 1 +
 lib/tpm-v2.c                                                  | 1 +
 lib/trace.c                                                   | 1 +
 lib/uuid.c                                                    | 1 +
 lib/vsprintf.c                                                | 1 +
 lib/xxhash.c                                                  | 1 +
 lib/zstd/zstd_opt.h                                           | 1 +
 net/arp.c                                                     | 1 +
 net/arp.h                                                     | 1 +
 net/bootp.c                                                   | 2 ++
 net/bootp.h                                                   | 1 +
 net/cdp.c                                                     | 1 +
 net/cdp.h                                                     | 1 +
 net/dns.c                                                     | 1 +
 net/dns.h                                                     | 1 +
 net/eth-uclass.c                                              | 1 +
 net/eth_common.c                                              | 1 +
 net/eth_internal.h                                            | 1 +
 net/eth_legacy.c                                              | 1 +
 net/fastboot.c                                                | 3 +++
 net/mdio-mux-uclass.c                                         | 1 +
 net/mdio-uclass.c                                             | 1 +
 net/net.c                                                     | 1 +
 net/nfs.c                                                     | 1 +
 net/nfs.h                                                     | 1 +
 net/pcap.c                                                    | 1 +
 net/rarp.c                                                    | 1 +
 net/sntp.c                                                    | 1 +
 net/sntp.h                                                    | 1 +
 net/tftp.c                                                    | 2 ++
 net/wol.c                                                     | 1 +
 net/wol.h                                                     | 1 +
 post/cpu/mpc83xx/ecc.c                                        | 1 +
 post/drivers/flash.c                                          | 1 +
 post/drivers/memory.c                                         | 1 +
 post/drivers/rtc.c                                            | 1 +
 post/lib_powerpc/andi.c                                       | 1 +
 post/lib_powerpc/b.c                                          | 1 +
 post/lib_powerpc/cmp.c                                        | 1 +
 post/lib_powerpc/cmpi.c                                       | 1 +
 post/lib_powerpc/cpu.c                                        | 1 +
 post/lib_powerpc/cr.c                                         | 1 +
 post/lib_powerpc/load.c                                       | 1 +
 post/lib_powerpc/multi.c                                      | 1 +
 post/lib_powerpc/rlwimi.c                                     | 1 +
 post/lib_powerpc/rlwinm.c                                     | 1 +
 post/lib_powerpc/rlwnm.c                                      | 1 +
 post/lib_powerpc/srawi.c                                      | 1 +
 post/lib_powerpc/store.c                                      | 1 +
 post/lib_powerpc/string.c                                     | 1 +
 post/lib_powerpc/three.c                                      | 1 +
 post/lib_powerpc/threei.c                                     | 1 +
 post/lib_powerpc/threex.c                                     | 1 +
 post/lib_powerpc/two.c                                        | 1 +
 post/lib_powerpc/twox.c                                       | 1 +
 post/post.c                                                   | 2 ++
 test/bloblist.c                                               | 1 +
 test/cmd/mem_search.c                                         | 1 +
 test/compression.c                                            | 1 +
 test/dm/acpi.c                                                | 2 ++
 test/dm/acpi.h                                                | 1 +
 test/dm/acpi_dp.c                                             | 1 +
 test/dm/acpigen.c                                             | 1 +
 test/dm/audio.c                                               | 1 +
 test/dm/axi.c                                                 | 1 +
 test/dm/bootcount.c                                           | 1 +
 test/dm/clk.c                                                 | 1 +
 test/dm/core.c                                                | 1 +
 test/dm/devres.c                                              | 1 +
 test/dm/dma.c                                                 | 1 +
 test/dm/dsi_host.c                                            | 1 +
 test/dm/fdtdec.c                                              | 1 +
 test/dm/gpio.c                                                | 1 +
 test/dm/i2c.c                                                 | 1 +
 test/dm/i2s.c                                                 | 1 +
 test/dm/k210_pll.c                                            | 1 +
 test/dm/mailbox.c                                             | 1 +
 test/dm/mdio.c                                                | 1 +
 test/dm/mdio_mux.c                                            | 1 +
 test/dm/misc.c                                                | 1 +
 test/dm/ofnode.c                                              | 1 +
 test/dm/osd.c                                                 | 1 +
 test/dm/panel.c                                               | 1 +
 test/dm/pch.c                                                 | 1 +
 test/dm/pci.c                                                 | 1 +
 test/dm/pmic.c                                                | 1 +
 test/dm/power-domain.c                                        | 1 +
 test/dm/regmap.c                                              | 1 +
 test/dm/regulator.c                                           | 1 +
 test/dm/remoteproc.c                                          | 1 +
 test/dm/reset.c                                               | 1 +
 test/dm/rtc.c                                                 | 1 +
 test/dm/serial.c                                              | 1 +
 test/dm/sf.c                                                  | 1 +
 test/dm/smem.c                                                | 1 +
 test/dm/syscon-reset.c                                        | 1 +
 test/dm/tee.c                                                 | 1 +
 test/dm/test-fdt.c                                            | 1 +
 test/dm/video.c                                               | 1 +
 test/dm/virtio.c                                              | 1 +
 test/dm/wdt.c                                                 | 1 +
 test/env/hashtable.c                                          | 1 +
 test/lib/hexdump.c                                            | 1 +
 test/lib/lmb.c                                                | 1 +
 test/lib/string.c                                             | 1 +
 test/lib/test_aes.c                                           | 1 +
 test/optee/cmd_ut_optee.c                                     | 1 +
 test/overlay/cmd_ut_overlay.c                                 | 1 +
 test/print_ut.c                                               | 1 +
 test/stdint/int-types.c                                       | 1 +
 test/str_ut.c                                                 | 2 ++
 test/time_ut.c                                                | 1 +
 test/unicode_ut.c                                             | 1 +
 test/ut.c                                                     | 1 +
 4660 files changed, 5738 insertions(+), 6 deletions(-)

diff --git a/api/api_display.c b/api/api_display.c
index 4f2cdd7330e2..499a75d9e04d 100644
--- a/api/api_display.c
+++ b/api/api_display.c
@@ -8,6 +8,7 @@
 #include <lcd.h>
 #include <log.h>
 #include <video_font.h> /* Get font width and height */
+#include <linux/types.h>
 
 /* lcd.h needs BMP_LOGO_HEIGHT to calculate CONSOLE_ROWS */
 #if defined(CONFIG_LCD_LOGO) && !defined(CONFIG_LCD_INFO_BELOW_LOGO)
diff --git a/api/api_private.h b/api/api_private.h
index 07fd50ad3a36..11499e45d338 100644
--- a/api/api_private.h
+++ b/api/api_private.h
@@ -8,6 +8,7 @@
 #ifndef _API_PRIVATE_H_
 #define _API_PRIVATE_H_
 
+#include <linux/types.h>
 void	api_init(void);
 void	platform_set_mr(struct sys_info *, unsigned long, unsigned long, int);
 int	platform_sys_info(struct sys_info *);
diff --git a/api/api_storage.c b/api/api_storage.c
index d4474d7d55cf..49a1637d4d31 100644
--- a/api/api_storage.c
+++ b/api/api_storage.c
@@ -10,6 +10,7 @@
 #include <api_public.h>
 #include <part.h>
 #include <stdio.h>
+#include <linux/types.h>
 
 #if defined(CONFIG_CMD_USB) && defined(CONFIG_USB_STORAGE)
 #include <usb.h>
diff --git a/arch/arc/include/asm/sections.h b/arch/arc/include/asm/sections.h
index 1c9c9db13868..62cbe9b79045 100644
--- a/arch/arc/include/asm/sections.h
+++ b/arch/arc/include/asm/sections.h
@@ -7,6 +7,7 @@
 #define __ASM_ARC_SECTIONS_H
 
 #include <asm-generic/sections.h>
+#include <linux/types.h>
 
 extern ulong __ivt_start;
 extern ulong __ivt_end;
diff --git a/arch/arc/include/asm/u-boot-arc.h b/arch/arc/include/asm/u-boot-arc.h
index dd2c0949c681..17e558769965 100644
--- a/arch/arc/include/asm/u-boot-arc.h
+++ b/arch/arc/include/asm/u-boot-arc.h
@@ -6,6 +6,7 @@
 #ifndef __ASM_ARC_U_BOOT_ARC_H__
 #define __ASM_ARC_U_BOOT_ARC_H__
 
+#include <linux/types.h>
 int arch_early_init_r(void);
 
 void	board_init_f_r_trampoline(ulong) __attribute__ ((noreturn));
diff --git a/arch/arc/lib/bootm.c b/arch/arc/lib/bootm.c
index 28550041984f..0953f1e2169b 100644
--- a/arch/arc/lib/bootm.c
+++ b/arch/arc/lib/bootm.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <bootstage.h>
+#include <compiler.h>
 #include <env.h>
 #include <image.h>
 #include <irq_func.h>
@@ -13,6 +14,7 @@
 #include <stdio.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arc/lib/cache.c b/arch/arc/lib/cache.c
index 1bdffd052e46..fa58e5216abe 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 <stdbool.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
diff --git a/arch/arc/lib/cpu.c b/arch/arc/lib/cpu.c
index 11b2e828088a..21bfb764e976 100644
--- a/arch/arc/lib/cpu.c
+++ b/arch/arc/lib/cpu.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <init.h>
 #include <malloc.h>
 #include <stdbool.h>
diff --git a/arch/arc/lib/relocate.c b/arch/arc/lib/relocate.c
index a1663c1eb393..f55ff930a873 100644
--- a/arch/arc/lib/relocate.c
+++ b/arch/arc/lib/relocate.c
@@ -9,6 +9,7 @@
 #include <asm-generic/sections.h>
 #include <asm/global_data.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 extern ulong __image_copy_start;
 extern ulong __ivt_start;
diff --git a/arch/arc/lib/reset.c b/arch/arc/lib/reset.c
index 4869fa936bfb..13fa8849ac8f 100644
--- a/arch/arc/lib/reset.c
+++ b/arch/arc/lib/reset.c
@@ -5,8 +5,10 @@
 
 #include <command.h>
 #include <common.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <stdio.h>
+#include <linux/types.h>
 
 __weak void reset_cpu(ulong addr)
 {
diff --git a/arch/arm/cpu/arm1136/mx31/generic.c b/arch/arm/cpu/arm1136/mx31/generic.c
index c6814a82d769..095f2dad226a 100644
--- a/arch/arm/cpu/arm1136/mx31/generic.c
+++ b/arch/arm/cpu/arm1136/mx31/generic.c
@@ -12,6 +12,7 @@
 #include <asm/arch/clock.h>
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 
 static u32 mx31_decode_pll(u32 reg, u32 infreq)
diff --git a/arch/arm/cpu/arm1136/mx35/generic.c b/arch/arm/cpu/arm1136/mx35/generic.c
index a001dee838d6..160787d8af39 100644
--- a/arch/arm/cpu/arm1136/mx35/generic.c
+++ b/arch/arm/cpu/arm1136/mx35/generic.c
@@ -15,6 +15,7 @@
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <asm/arch/imx-regs.h>
diff --git a/arch/arm/cpu/arm720t/interrupts.c b/arch/arm/cpu/arm720t/interrupts.c
index f0fc58deadba..ed5313ce469e 100644
--- a/arch/arm/cpu/arm720t/interrupts.c
+++ b/arch/arm/cpu/arm720t/interrupts.c
@@ -10,6 +10,7 @@
  */
 
 #include <common.h>
+#include <linux/types.h>
 
 #if defined(CONFIG_ARCH_TEGRA)
 static ulong timestamp;
diff --git a/arch/arm/cpu/arm920t/ep93xx/cpu.c b/arch/arm/cpu/arm920t/ep93xx/cpu.c
index c9ea4e46a870..a53d4c6d1f3e 100644
--- a/arch/arm/cpu/arm920t/ep93xx/cpu.c
+++ b/arch/arm/cpu/arm920t/ep93xx/cpu.c
@@ -12,6 +12,7 @@
 #include <cpu_func.h>
 #include <asm/arch/ep93xx.h>
 #include <asm/io.h>
+#include <linux/types.h>
 
 /* We reset the CPU by generating a 1-->0 transition on DeviceCfg bit 31. */
 extern void reset_cpu(ulong addr)
diff --git a/arch/arm/cpu/arm920t/ep93xx/led.c b/arch/arm/cpu/arm920t/ep93xx/led.c
index 862663acbab5..6eadb157e6ea 100644
--- a/arch/arm/cpu/arm920t/ep93xx/led.c
+++ b/arch/arm/cpu/arm920t/ep93xx/led.c
@@ -7,6 +7,7 @@
 #include <asm/arch/ep93xx.h>
 #include <config.h>
 #include <status_led.h>
+#include <linux/types.h>
 
 static uint8_t saved_state[2] = {CONFIG_LED_STATUS_OFF, CONFIG_LED_STATUS_OFF};
 static uint32_t gpio_pin[2] = {1 << CONFIG_LED_STATUS_GREEN,
diff --git a/arch/arm/cpu/arm920t/ep93xx/speed.c b/arch/arm/cpu/arm920t/ep93xx/speed.c
index 51e9dda0550d..69832d7138ab 100644
--- a/arch/arm/cpu/arm920t/ep93xx/speed.c
+++ b/arch/arm/cpu/arm920t/ep93xx/speed.c
@@ -9,6 +9,7 @@
 #include <asm/arch/ep93xx.h>
 #include <asm/io.h>
 #include <div64.h>
+#include <linux/types.h>
 
 /*
  * CONFIG_SYS_CLK_FREQ should be defined as the input frequency of the PLL.
diff --git a/arch/arm/cpu/arm926ejs/armada100/cpu.c b/arch/arm/cpu/arm926ejs/armada100/cpu.c
index 734e4d92a8fc..9e6a08ec9567 100644
--- a/arch/arm/cpu/arm926ejs/armada100/cpu.c
+++ b/arch/arm/cpu/arm926ejs/armada100/cpu.c
@@ -12,6 +12,7 @@
 #include <stdio.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/armada100.h>
+#include <asm/types.h>
 
 #define UARTCLK14745KHZ	(APBC_APBCLK | APBC_FNCLK | APBC_FNCLKSEL(1))
 #define SET_MRVL_ID	(1<<8)
diff --git a/arch/arm/cpu/arm926ejs/armada100/dram.c b/arch/arm/cpu/arm926ejs/armada100/dram.c
index 4b50d448ab11..eece5664ec78 100644
--- a/arch/arm/cpu/arm926ejs/armada100/dram.c
+++ b/arch/arm/cpu/arm926ejs/armada100/dram.c
@@ -12,6 +12,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/armada100.h>
+#include <asm/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/cpu/arm926ejs/armada100/timer.c b/arch/arm/cpu/arm926ejs/armada100/timer.c
index ec73393d0fc7..54289331a7e1 100644
--- a/arch/arm/cpu/arm926ejs/armada100/timer.c
+++ b/arch/arm/cpu/arm926ejs/armada100/timer.c
@@ -14,6 +14,7 @@
 #include <asm/arch/armada100.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 /*
  * Timer registers
diff --git a/arch/arm/cpu/arm926ejs/cache.c b/arch/arm/cpu/arm926ejs/cache.c
index acab9bccc01a..67d80774ae40 100644
--- a/arch/arm/cpu/arm926ejs/cache.c
+++ b/arch/arm/cpu/arm926ejs/cache.c
@@ -3,6 +3,7 @@
  * (C) Copyright 2011
  * Ilya Yanok, EmCraft Systems
  */
+#include <compiler.h>
 #include <cpu_func.h>
 #include <asm/cache.h>
 #include <linux/types.h>
diff --git a/arch/arm/cpu/arm926ejs/mx25/generic.c b/arch/arm/cpu/arm926ejs/mx25/generic.c
index 71e143b8a929..f22b37df3ca9 100644
--- a/arch/arm/cpu/arm926ejs/mx25/generic.c
+++ b/arch/arm/cpu/arm926ejs/mx25/generic.c
@@ -24,6 +24,7 @@
 #include <asm/arch/clock.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_FSL_ESDHC_IMX
 #include <fsl_esdhc_imx.h>
diff --git a/arch/arm/cpu/arm926ejs/mx25/reset.c b/arch/arm/cpu/arm926ejs/mx25/reset.c
index 38df1c940227..6148adbaa4e8 100644
--- a/arch/arm/cpu/arm926ejs/mx25/reset.c
+++ b/arch/arm/cpu/arm926ejs/mx25/reset.c
@@ -19,6 +19,7 @@
 #include <cpu_func.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
+#include <linux/types.h>
 
 /*
  * Reset the cpu by setting up the watchdog timer and let it time out
diff --git a/arch/arm/cpu/arm926ejs/mx27/generic.c b/arch/arm/cpu/arm926ejs/mx27/generic.c
index 376ab2eaeac1..7d080b9bddeb 100644
--- a/arch/arm/cpu/arm926ejs/mx27/generic.c
+++ b/arch/arm/cpu/arm926ejs/mx27/generic.c
@@ -20,6 +20,7 @@
 #endif
 #include <asm/u-boot.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 /*
  *  get the system pll clock in Hz
diff --git a/arch/arm/cpu/arm926ejs/mx27/reset.c b/arch/arm/cpu/arm926ejs/mx27/reset.c
index 320b0a65e70b..bcfb8834210d 100644
--- a/arch/arm/cpu/arm926ejs/mx27/reset.c
+++ b/arch/arm/cpu/arm926ejs/mx27/reset.c
@@ -19,6 +19,7 @@
 #include <cpu_func.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
+#include <linux/types.h>
 
 /*
  * Reset the cpu by setting up the watchdog timer and let it time out
diff --git a/arch/arm/cpu/arm926ejs/mx27/timer.c b/arch/arm/cpu/arm926ejs/mx27/timer.c
index 4fd6a8059685..d486585f8a4a 100644
--- a/arch/arm/cpu/arm926ejs/mx27/timer.c
+++ b/arch/arm/cpu/arm926ejs/mx27/timer.c
@@ -24,6 +24,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/ptrace.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 /* General purpose timers bitfields */
 #define GPTCR_SWR		(1 << 15)	/* Software reset	*/
diff --git a/arch/arm/cpu/arm926ejs/mxs/clock.c b/arch/arm/cpu/arm926ejs/mxs/clock.c
index 4e1cf3a1e32b..52208774ce0c 100644
--- a/arch/arm/cpu/arm926ejs/mxs/clock.c
+++ b/arch/arm/cpu/arm926ejs/mxs/clock.c
@@ -15,6 +15,7 @@
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
+#include <linux/types.h>
 
 /*
  * The PLL frequency is 480MHz and XTAL frequency is 24MHz
diff --git a/arch/arm/cpu/arm926ejs/mxs/iomux.c b/arch/arm/cpu/arm926ejs/mxs/iomux.c
index 381264b8a18d..4c80dd5d36ae 100644
--- a/arch/arm/cpu/arm926ejs/mxs/iomux.c
+++ b/arch/arm/cpu/arm926ejs/mxs/iomux.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
diff --git a/arch/arm/cpu/arm926ejs/mxs/mxs.c b/arch/arm/cpu/arm926ejs/mxs/mxs.c
index 84d672286312..1094477aeb3d 100644
--- a/arch/arm/cpu/arm926ejs/mxs/mxs.c
+++ b/arch/arm/cpu/arm926ejs/mxs/mxs.c
@@ -11,6 +11,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <hang.h>
 #include <init.h>
@@ -29,6 +30,7 @@
 #include <asm/arch/sys_proto.h>
 #include <linux/compiler.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/cpu/arm926ejs/mxs/mxs_init.h b/arch/arm/cpu/arm926ejs/mxs/mxs_init.h
index 062deb7793f6..31836d7d8d1d 100644
--- a/arch/arm/cpu/arm926ejs/mxs/mxs_init.h
+++ b/arch/arm/cpu/arm926ejs/mxs/mxs_init.h
@@ -9,6 +9,7 @@
 #ifndef	__M28_INIT_H__
 #define	__M28_INIT_H__
 
+#include <linux/types.h>
 void early_delay(int delay);
 
 void mxs_power_init(void);
diff --git a/arch/arm/cpu/arm926ejs/mxs/spl_boot.c b/arch/arm/cpu/arm926ejs/mxs/spl_boot.c
index 88386dbb20f7..3fe7d79b905b 100644
--- a/arch/arm/cpu/arm926ejs/mxs/spl_boot.c
+++ b/arch/arm/cpu/arm926ejs/mxs/spl_boot.c
@@ -20,6 +20,7 @@
 #include <linux/compiler.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "mxs_init.h"
 
diff --git a/arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c b/arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c
index 4d2d988c287e..ff46c86b620d 100644
--- a/arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c
+++ b/arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <config.h>
 #include <init.h>
 #include <log.h>
@@ -15,6 +16,7 @@
 #include <asm/arch/sys_proto.h>
 #include <linux/compiler.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include "mxs_init.h"
 
diff --git a/arch/arm/cpu/arm926ejs/mxs/spl_power_init.c b/arch/arm/cpu/arm926ejs/mxs/spl_power_init.c
index f57e1bb96c85..dcab4c120935 100644
--- a/arch/arm/cpu/arm926ejs/mxs/spl_power_init.c
+++ b/arch/arm/cpu/arm926ejs/mxs/spl_power_init.c
@@ -7,12 +7,14 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <config.h>
 #include <hang.h>
 #include <log.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include "mxs_init.h"
 
diff --git a/arch/arm/cpu/arm926ejs/mxs/timer.c b/arch/arm/cpu/arm926ejs/mxs/timer.c
index 3dff3d768d1c..58b1d0415851 100644
--- a/arch/arm/cpu/arm926ejs/mxs/timer.c
+++ b/arch/arm/cpu/arm926ejs/mxs/timer.c
@@ -17,6 +17,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 /* Maximum fixed count */
 #if defined(CONFIG_MX23)
diff --git a/arch/arm/cpu/arm926ejs/spear/cpu.c b/arch/arm/cpu/arm926ejs/spear/cpu.c
index 3b1e80252512..4bb03db88f81 100644
--- a/arch/arm/cpu/arm926ejs/spear/cpu.c
+++ b/arch/arm/cpu/arm926ejs/spear/cpu.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/spr_misc.h>
+#include <asm/types.h>
 #include <linux/string.h>
 
 int arch_cpu_init(void)
diff --git a/arch/arm/cpu/arm926ejs/spear/reset.c b/arch/arm/cpu/arm926ejs/spear/reset.c
index 7c3ba8b2dbd5..38dfa0234978 100644
--- a/arch/arm/cpu/arm926ejs/spear/reset.c
+++ b/arch/arm/cpu/arm926ejs/spear/reset.c
@@ -11,6 +11,7 @@
 #include <asm/arch/hardware.h>
 #include <asm/arch/spr_syscntl.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 void reset_cpu(ulong ignored)
 {
diff --git a/arch/arm/cpu/arm926ejs/spear/spear600.c b/arch/arm/cpu/arm926ejs/spear/spear600.c
index 2b036215d1c1..ca5c770f42a2 100644
--- a/arch/arm/cpu/arm926ejs/spear/spear600.c
+++ b/arch/arm/cpu/arm926ejs/spear/spear600.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <asm/arch/spr_misc.h>
 #include <asm/arch/spr_defs.h>
+#include <asm/types.h>
 
 void spear_late_init(void)
 {
diff --git a/arch/arm/cpu/arm926ejs/spear/spl.c b/arch/arm/cpu/arm926ejs/spear/spl.c
index 54c540b7bf25..5abcb71dd992 100644
--- a/arch/arm/cpu/arm926ejs/spear/spl.c
+++ b/arch/arm/cpu/arm926ejs/spear/spl.c
@@ -18,6 +18,7 @@
 #include <asm/arch/spr_misc.h>
 #include <asm/arch/spr_syscntl.h>
 #include <linux/mtd/st_smi.h>
+#include <linux/types.h>
 
 /* Reserve some space to store the BootROM's stack pointer during SPL operation.
  * The BSS cannot be used for this purpose because it will be zeroed after
diff --git a/arch/arm/cpu/arm926ejs/spear/spr600_mt47h128m8_3_266_cl5_async.c b/arch/arm/cpu/arm926ejs/spear/spr600_mt47h128m8_3_266_cl5_async.c
index 79ab2a70dc54..9b761c8d1f60 100644
--- a/arch/arm/cpu/arm926ejs/spear/spr600_mt47h128m8_3_266_cl5_async.c
+++ b/arch/arm/cpu/arm926ejs/spear/spr600_mt47h128m8_3_266_cl5_async.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <asm/types.h>
 
 #if (CONFIG_DDR_PLL2)
 
diff --git a/arch/arm/cpu/arm926ejs/spear/spr600_mt47h32m16_333_cl5_psync.c b/arch/arm/cpu/arm926ejs/spear/spr600_mt47h32m16_333_cl5_psync.c
index 121b63607783..2e6bb0c8a69b 100644
--- a/arch/arm/cpu/arm926ejs/spear/spr600_mt47h32m16_333_cl5_psync.c
+++ b/arch/arm/cpu/arm926ejs/spear/spr600_mt47h32m16_333_cl5_psync.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <asm/types.h>
 
 #if (CONFIG_DDR_PLL2 || CONFIG_DDR_2HCLK)
 
diff --git a/arch/arm/cpu/arm926ejs/spear/spr600_mt47h32m16_37e_166_cl4_sync.c b/arch/arm/cpu/arm926ejs/spear/spr600_mt47h32m16_37e_166_cl4_sync.c
index 64c8bab9bfa1..d0473d0d6807 100644
--- a/arch/arm/cpu/arm926ejs/spear/spr600_mt47h32m16_37e_166_cl4_sync.c
+++ b/arch/arm/cpu/arm926ejs/spear/spr600_mt47h32m16_37e_166_cl4_sync.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <asm/types.h>
 
 #if (CONFIG_DDR_HCLK)
 
diff --git a/arch/arm/cpu/arm926ejs/spear/spr600_mt47h64m16_3_333_cl5_psync.c b/arch/arm/cpu/arm926ejs/spear/spr600_mt47h64m16_3_333_cl5_psync.c
index 87654663fcf8..0bcedb197580 100644
--- a/arch/arm/cpu/arm926ejs/spear/spr600_mt47h64m16_3_333_cl5_psync.c
+++ b/arch/arm/cpu/arm926ejs/spear/spr600_mt47h64m16_3_333_cl5_psync.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <asm/types.h>
 
 #if (CONFIG_DDR_PLL2 || CONFIG_DDR_2HCLK)
 
diff --git a/arch/arm/cpu/arm926ejs/spear/spr_misc.c b/arch/arm/cpu/arm926ejs/spear/spr_misc.c
index 6a7d63d09848..e1bcafc43ebc 100644
--- a/arch/arm/cpu/arm926ejs/spear/spr_misc.c
+++ b/arch/arm/cpu/arm926ejs/spear/spr_misc.c
@@ -20,6 +20,7 @@
 #include <asm/arch/spr_emi.h>
 #include <asm/arch/spr_defs.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define CPU		0
 #define DDR		1
diff --git a/arch/arm/cpu/arm926ejs/spear/timer.c b/arch/arm/cpu/arm926ejs/spear/timer.c
index b42baa71506f..b5b7814d130c 100644
--- a/arch/arm/cpu/arm926ejs/spear/timer.c
+++ b/arch/arm/cpu/arm926ejs/spear/timer.c
@@ -14,6 +14,7 @@
 #include <asm/arch/spr_misc.h>
 #include <asm/ptrace.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 #define GPT_RESOLUTION	(CONFIG_SPEAR_HZ_CLOCK / CONFIG_SPEAR_HZ)
 #define READ_TIMER()	(readl(&gpt_regs_p->count) & GPT_FREE_RUNNING)
diff --git a/arch/arm/cpu/arm946es/cpu.c b/arch/arm/cpu/arm946es/cpu.c
index fb0ea5e817ff..cb8adf58ecea 100644
--- a/arch/arm/cpu/arm946es/cpu.c
+++ b/arch/arm/cpu/arm946es/cpu.c
@@ -18,6 +18,7 @@
 #include <irq_func.h>
 #include <asm/system.h>
 #include <asm/io.h>
+#include <linux/types.h>
 
 static void cache_flush(void);
 
diff --git a/arch/arm/cpu/armv7/arch_timer.c b/arch/arm/cpu/armv7/arch_timer.c
index d96406f7626f..774c5ad52c3a 100644
--- a/arch/arm/cpu/armv7/arch_timer.c
+++ b/arch/arm/cpu/armv7/arch_timer.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <div64.h>
 #include <bootstage.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/cpu/armv7/bcm235xx/clk-bsc.c b/arch/arm/cpu/armv7/bcm235xx/clk-bsc.c
index c8a8e358f744..40eda46d954e 100644
--- a/arch/arm/cpu/armv7/bcm235xx/clk-bsc.c
+++ b/arch/arm/cpu/armv7/bcm235xx/clk-bsc.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <stdio.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <asm/arch/sysmap.h>
 #include <asm/kona-common/clk.h>
diff --git a/arch/arm/cpu/armv7/bcm235xx/clk-core.c b/arch/arm/cpu/armv7/bcm235xx/clk-core.c
index 098c5afb7313..059a2464c1be 100644
--- a/arch/arm/cpu/armv7/bcm235xx/clk-core.c
+++ b/arch/arm/cpu/armv7/bcm235xx/clk-core.c
@@ -11,8 +11,10 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <bitfield.h>
diff --git a/arch/arm/cpu/armv7/bcm235xx/clk-core.h b/arch/arm/cpu/armv7/bcm235xx/clk-core.h
index 6dfc4afb0067..e654d4a7aecc 100644
--- a/arch/arm/cpu/armv7/bcm235xx/clk-core.h
+++ b/arch/arm/cpu/armv7/bcm235xx/clk-core.h
@@ -4,6 +4,7 @@
  */
 
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 #include <linux/stddef.h>
 #include <linux/stringify.h>
diff --git a/arch/arm/cpu/armv7/bcm235xx/clk-sdio.c b/arch/arm/cpu/armv7/bcm235xx/clk-sdio.c
index c21a23c2abeb..301e24f359c8 100644
--- a/arch/arm/cpu/armv7/bcm235xx/clk-sdio.c
+++ b/arch/arm/cpu/armv7/bcm235xx/clk-sdio.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <stdio.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <asm/arch/sysmap.h>
 #include <asm/kona-common/clk.h>
diff --git a/arch/arm/cpu/armv7/bcm235xx/clk-usb-otg.c b/arch/arm/cpu/armv7/bcm235xx/clk-usb-otg.c
index f065560d2d0b..99a45c6f8708 100644
--- a/arch/arm/cpu/armv7/bcm235xx/clk-usb-otg.c
+++ b/arch/arm/cpu/armv7/bcm235xx/clk-usb-otg.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <asm/arch/sysmap.h>
 #include "clk-core.h"
diff --git a/arch/arm/cpu/armv7/bcm281xx/clk-bsc.c b/arch/arm/cpu/armv7/bcm281xx/clk-bsc.c
index c8a8e358f744..40eda46d954e 100644
--- a/arch/arm/cpu/armv7/bcm281xx/clk-bsc.c
+++ b/arch/arm/cpu/armv7/bcm281xx/clk-bsc.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <stdio.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <asm/arch/sysmap.h>
 #include <asm/kona-common/clk.h>
diff --git a/arch/arm/cpu/armv7/bcm281xx/clk-core.c b/arch/arm/cpu/armv7/bcm281xx/clk-core.c
index 2fb195bf8f9c..17530c8b7395 100644
--- a/arch/arm/cpu/armv7/bcm281xx/clk-core.c
+++ b/arch/arm/cpu/armv7/bcm281xx/clk-core.c
@@ -11,8 +11,10 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <bitfield.h>
diff --git a/arch/arm/cpu/armv7/bcm281xx/clk-core.h b/arch/arm/cpu/armv7/bcm281xx/clk-core.h
index 74780012e24a..1ce30b3e0920 100644
--- a/arch/arm/cpu/armv7/bcm281xx/clk-core.h
+++ b/arch/arm/cpu/armv7/bcm281xx/clk-core.h
@@ -4,6 +4,7 @@
  */
 
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 #include <linux/stddef.h>
 #include <linux/stringify.h>
diff --git a/arch/arm/cpu/armv7/bcm281xx/clk-sdio.c b/arch/arm/cpu/armv7/bcm281xx/clk-sdio.c
index c21a23c2abeb..301e24f359c8 100644
--- a/arch/arm/cpu/armv7/bcm281xx/clk-sdio.c
+++ b/arch/arm/cpu/armv7/bcm281xx/clk-sdio.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <stdio.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <asm/arch/sysmap.h>
 #include <asm/kona-common/clk.h>
diff --git a/arch/arm/cpu/armv7/bcm281xx/clk-usb-otg.c b/arch/arm/cpu/armv7/bcm281xx/clk-usb-otg.c
index f065560d2d0b..99a45c6f8708 100644
--- a/arch/arm/cpu/armv7/bcm281xx/clk-usb-otg.c
+++ b/arch/arm/cpu/armv7/bcm281xx/clk-usb-otg.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <asm/arch/sysmap.h>
 #include "clk-core.h"
diff --git a/arch/arm/cpu/armv7/bcm281xx/reset.c b/arch/arm/cpu/armv7/bcm281xx/reset.c
index fda5a9527ec3..281d2e46eee4 100644
--- a/arch/arm/cpu/armv7/bcm281xx/reset.c
+++ b/arch/arm/cpu/armv7/bcm281xx/reset.c
@@ -7,6 +7,7 @@
 #include <cpu_func.h>
 #include <asm/io.h>
 #include <asm/arch/sysmap.h>
+#include <linux/types.h>
 
 #define EN_MASK		0x08000000	/* Enable timer */
 #define SRSTEN_MASK	0x04000000	/* Enable soft reset */
diff --git a/arch/arm/cpu/armv7/bcmcygnus/reset.c b/arch/arm/cpu/armv7/bcmcygnus/reset.c
index 3bfed34533bd..023cbd64299a 100644
--- a/arch/arm/cpu/armv7/bcmcygnus/reset.c
+++ b/arch/arm/cpu/armv7/bcmcygnus/reset.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <asm/io.h>
+#include <linux/types.h>
 
 #define CRMU_MAIL_BOX1		0x03024028
 #define CRMU_SOFT_RESET_CMD	0xFFFFFFFF
diff --git a/arch/arm/cpu/armv7/bcmnsp/reset.c b/arch/arm/cpu/armv7/bcmnsp/reset.c
index 675f99fe998f..547defa92b45 100644
--- a/arch/arm/cpu/armv7/bcmnsp/reset.c
+++ b/arch/arm/cpu/armv7/bcmnsp/reset.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <asm/io.h>
+#include <linux/types.h>
 
 #define CRU_RESET_OFFSET	0x1803F184
 
diff --git a/arch/arm/cpu/armv7/cache_v7.c b/arch/arm/cpu/armv7/cache_v7.c
index 146cf526089f..a19aea275db3 100644
--- a/arch/arm/cpu/armv7/cache_v7.c
+++ b/arch/arm/cpu/armv7/cache_v7.c
@@ -4,6 +4,7 @@
  * Texas Instruments, <www.ti.com>
  * Aneesh V <aneesh@ti.com>
  */
+#include <compiler.h>
 #include <cpu_func.h>
 #include <asm/cache.h>
 #include <linux/types.h>
diff --git a/arch/arm/cpu/armv7/cp15.c b/arch/arm/cpu/armv7/cp15.c
index 0ac4e7ba8c80..482d1969a969 100644
--- a/arch/arm/cpu/armv7/cp15.c
+++ b/arch/arm/cpu/armv7/cp15.c
@@ -9,9 +9,11 @@
 
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <asm/system.h>
 #include <asm/cache.h>
 #include <asm/armv7.h>
+#include <asm/types.h>
 #include <linux/compiler.h>
 
 void __weak v7_arch_cp15_set_l2aux_ctrl(u32 l2actlr, u32 cpu_midr,
diff --git a/arch/arm/cpu/armv7/cpu.c b/arch/arm/cpu/armv7/cpu.c
index 68807d209978..ce278c0503ca 100644
--- a/arch/arm/cpu/armv7/cpu.c
+++ b/arch/arm/cpu/armv7/cpu.c
@@ -16,6 +16,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <irq_func.h>
 #include <asm/system.h>
diff --git a/arch/arm/cpu/armv7/exception_level.c b/arch/arm/cpu/armv7/exception_level.c
index 5845cca9a335..08e558817f6e 100644
--- a/arch/arm/cpu/armv7/exception_level.c
+++ b/arch/arm/cpu/armv7/exception_level.c
@@ -16,6 +16,7 @@
 #include <asm/armv7.h>
 #include <asm/secure.h>
 #include <asm/setjmp.h>
+#include <linux/types.h>
 
 /**
  * entry_non_secure() - entry point when switching to non-secure mode
diff --git a/arch/arm/cpu/armv7/iproc-common/armpll.c b/arch/arm/cpu/armv7/iproc-common/armpll.c
index 2ac598cee7bb..89a5e37d39bb 100644
--- a/arch/arm/cpu/armv7/iproc-common/armpll.c
+++ b/arch/arm/cpu/armv7/iproc-common/armpll.c
@@ -8,6 +8,7 @@
 #include <asm/io.h>
 #include <asm/iproc-common/armpll.h>
 #include <asm/iproc-common/sysmap.h>
+#include <linux/types.h>
 
 #define NELEMS(x)	(sizeof(x) / sizeof(x[0]))
 
diff --git a/arch/arm/cpu/armv7/iproc-common/timer.c b/arch/arm/cpu/armv7/iproc-common/timer.c
index a4255a44c001..057071b56817 100644
--- a/arch/arm/cpu/armv7/iproc-common/timer.c
+++ b/arch/arm/cpu/armv7/iproc-common/timer.c
@@ -11,6 +11,7 @@
 #include <asm/iproc-common/timer.h>
 #include <asm/iproc-common/sysmap.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 static inline uint64_t timer_global_read(void)
 {
diff --git a/arch/arm/cpu/armv7/kona-common/clk-stubs.c b/arch/arm/cpu/armv7/kona-common/clk-stubs.c
index 19aa6c07358f..634937d5b217 100644
--- a/arch/arm/cpu/armv7/kona-common/clk-stubs.c
+++ b/arch/arm/cpu/armv7/kona-common/clk-stubs.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <compiler.h>
+#include <asm/types.h>
 
 /*
  * These weak functions are available to kona architectures that don't
diff --git a/arch/arm/cpu/armv7/ls102xa/clock.c b/arch/arm/cpu/armv7/ls102xa/clock.c
index d0f349618d4b..bb0d876e0bba 100644
--- a/arch/arm/cpu/armv7/ls102xa/clock.c
+++ b/arch/arm/cpu/armv7/ls102xa/clock.c
@@ -5,12 +5,14 @@
 
 #include <common.h>
 #include <clock_legacy.h>
+#include <compiler.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/immap_ls102xa.h>
 #include <asm/arch/clock.h>
 #include <fsl_ifc.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/cpu/armv7/ls102xa/cpu.c b/arch/arm/cpu/armv7/ls102xa/cpu.c
index 5e922953c960..4548feca08cd 100644
--- a/arch/arm/cpu/armv7/ls102xa/cpu.c
+++ b/arch/arm/cpu/armv7/ls102xa/cpu.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <init.h>
 #include <net.h>
@@ -23,6 +24,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include "fsl_epu.h"
 
diff --git a/arch/arm/cpu/armv7/ls102xa/fdt.c b/arch/arm/cpu/armv7/ls102xa/fdt.c
index aef54ebf3c86..a70bbc1be1ae 100644
--- a/arch/arm/cpu/armv7/ls102xa/fdt.c
+++ b/arch/arm/cpu/armv7/ls102xa/fdt.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <clock_legacy.h>
+#include <compiler.h>
 #include <net.h>
 #include <stdio.h>
 #include <vsprintf.h>
@@ -25,6 +26,7 @@
 #include <fsl_sec.h>
 #include <dm.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/cpu/armv7/ls102xa/fsl_epu.c b/arch/arm/cpu/armv7/ls102xa/fsl_epu.c
index e31a4fb6c31b..c6c6fb4e4117 100644
--- a/arch/arm/cpu/armv7/ls102xa/fsl_epu.c
+++ b/arch/arm/cpu/armv7/ls102xa/fsl_epu.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <asm/io.h>
+#include <asm/types.h>
 
 #include "fsl_epu.h"
 
diff --git a/arch/arm/cpu/armv7/ls102xa/fsl_ls1_serdes.c b/arch/arm/cpu/armv7/ls102xa/fsl_ls1_serdes.c
index 2683b59a2a0a..bf789cd62089 100644
--- a/arch/arm/cpu/armv7/ls102xa/fsl_ls1_serdes.c
+++ b/arch/arm/cpu/armv7/ls102xa/fsl_ls1_serdes.c
@@ -4,9 +4,11 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <stdio.h>
 #include <asm/arch/fsl_serdes.h>
 #include <asm/arch/immap_ls102xa.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <asm/io.h>
 #include "fsl_ls1_serdes.h"
diff --git a/arch/arm/cpu/armv7/ls102xa/fsl_ls1_serdes.h b/arch/arm/cpu/armv7/ls102xa/fsl_ls1_serdes.h
index 7382aef8ee38..6500f183c459 100644
--- a/arch/arm/cpu/armv7/ls102xa/fsl_ls1_serdes.h
+++ b/arch/arm/cpu/armv7/ls102xa/fsl_ls1_serdes.h
@@ -6,6 +6,7 @@
 #ifndef __FSL_LS1_SERDES_H
 #define __FSL_LS1_SERDES_H
 
+#include <asm/types.h>
 int is_serdes_prtcl_valid(int serdes, u32 prtcl);
 int serdes_lane_enabled(int lane);
 #endif /* __FSL_LS1_SERDES_H */
diff --git a/arch/arm/cpu/armv7/ls102xa/ls102xa_psci.c b/arch/arm/cpu/armv7/ls102xa/ls102xa_psci.c
index 4a4b3c6f2328..e1c417926bb6 100644
--- a/arch/arm/cpu/armv7/ls102xa/ls102xa_psci.c
+++ b/arch/arm/cpu/armv7/ls102xa/ls102xa_psci.c
@@ -5,12 +5,14 @@
  * This file implements LS102X platform PSCI SYSTEM-SUSPEND function
  */
 
+#include <compiler.h>
 #include <config.h>
 #include <cpu_func.h>
 #include <asm/io.h>
 #include <asm/psci.h>
 #include <asm/arch/immap_ls102xa.h>
 #include <fsl_immap.h>
+#include <asm/types.h>
 #include "fsl_epu.h"
 
 #define __secure __attribute__((section("._secure.text")))
diff --git a/arch/arm/cpu/armv7/ls102xa/ls102xa_serdes.c b/arch/arm/cpu/armv7/ls102xa/ls102xa_serdes.c
index 3d313b1ad762..c29f7563b337 100644
--- a/arch/arm/cpu/armv7/ls102xa/ls102xa_serdes.c
+++ b/arch/arm/cpu/armv7/ls102xa/ls102xa_serdes.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <asm/arch/fsl_serdes.h>
 #include <asm/arch/immap_ls102xa.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 
 static u8 serdes_cfg_tbl[][SRDS_MAX_LANES] = {
diff --git a/arch/arm/cpu/armv7/ls102xa/soc.c b/arch/arm/cpu/armv7/ls102xa/soc.c
index bcee1c545d0a..f8d09680281c 100644
--- a/arch/arm/cpu/armv7/ls102xa/soc.c
+++ b/arch/arm/cpu/armv7/ls102xa/soc.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <log.h>
 #include <asm/arch/clock.h>
 #include <asm/io.h>
@@ -13,6 +14,7 @@
 #include <asm/arch/ls102xa_stream_id.h>
 #include <fsl_csu.h>
 #include <fsl_ddr_sdram.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 
 struct liodn_id_table sec_liodn_tbl[] = {
diff --git a/arch/arm/cpu/armv7/ls102xa/spl.c b/arch/arm/cpu/armv7/ls102xa/spl.c
index 308536c3362f..03a879a44c67 100644
--- a/arch/arm/cpu/armv7/ls102xa/spl.c
+++ b/arch/arm/cpu/armv7/ls102xa/spl.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <spl.h>
+#include <asm/types.h>
 
 u32 spl_boot_device(void)
 {
diff --git a/arch/arm/cpu/armv7/ls102xa/timer.c b/arch/arm/cpu/armv7/ls102xa/timer.c
index d79bf105f13a..02f96ac2ea5c 100644
--- a/arch/arm/cpu/armv7/ls102xa/timer.c
+++ b/arch/arm/cpu/armv7/ls102xa/timer.c
@@ -12,6 +12,7 @@
 #include <asm/arch/immap_ls102xa.h>
 #include <asm/arch/clock.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/cpu/armv7/mpu_v7r.c b/arch/arm/cpu/armv7/mpu_v7r.c
index 57ab640e2633..eba9d3f86ddc 100644
--- a/arch/arm/cpu/armv7/mpu_v7r.c
+++ b/arch/arm/cpu/armv7/mpu_v7r.c
@@ -12,6 +12,7 @@
 #include <asm/armv7.h>
 #include <asm/system.h>
 #include <asm/barriers.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/compiler.h>
 
diff --git a/arch/arm/cpu/armv7/psci-common.c b/arch/arm/cpu/armv7/psci-common.c
index a328b2bc0e83..ce7d339eb209 100644
--- a/arch/arm/cpu/armv7/psci-common.c
+++ b/arch/arm/cpu/armv7/psci-common.c
@@ -22,6 +22,7 @@
 #include <asm/macro.h>
 #include <asm/psci.h>
 #include <asm/secure.h>
+#include <asm/types.h>
 #include <linux/linkage.h>
 
 static u32 psci_target_pc[CONFIG_ARMV7_PSCI_NR_CPUS] __secure_data = { 0 };
diff --git a/arch/arm/cpu/armv7/s5p-common/cpu_info.c b/arch/arm/cpu/armv7/s5p-common/cpu_info.c
index 722810276dec..4da6621c2196 100644
--- a/arch/arm/cpu/armv7/s5p-common/cpu_info.c
+++ b/arch/arm/cpu/armv7/s5p-common/cpu_info.c
@@ -11,6 +11,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clk.h>
+#include <asm/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/cpu/armv7/s5p-common/pwm.c b/arch/arm/cpu/armv7/s5p-common/pwm.c
index 67c9208084db..8a48dc11eb1f 100644
--- a/arch/arm/cpu/armv7/s5p-common/pwm.c
+++ b/arch/arm/cpu/armv7/s5p-common/pwm.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <asm/arch/pwm.h>
 #include <asm/arch/clk.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 
 int pwm_enable(int pwm_id)
diff --git a/arch/arm/cpu/armv7/s5p-common/sromc.c b/arch/arm/cpu/armv7/s5p-common/sromc.c
index 0fc170936ae4..0aed9e947e69 100644
--- a/arch/arm/cpu/armv7/s5p-common/sromc.c
+++ b/arch/arm/cpu/armv7/s5p-common/sromc.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <asm/io.h>
 #include <asm/arch/sromc.h>
+#include <asm/types.h>
 
 /*
  * s5p_config_sromc() - select the proper SROMC Bank and configure the
diff --git a/arch/arm/cpu/armv7/s5p-common/timer.c b/arch/arm/cpu/armv7/s5p-common/timer.c
index 8141f40d5c09..1f88b145f1a5 100644
--- a/arch/arm/cpu/armv7/s5p-common/timer.c
+++ b/arch/arm/cpu/armv7/s5p-common/timer.c
@@ -15,6 +15,7 @@
 #include <asm/arch/pwm.h>
 #include <asm/arch/clk.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 /* Use the old PWM interface for now */
 #undef CONFIG_DM_PWM
diff --git a/arch/arm/cpu/armv7/s5p4418/cpu.c b/arch/arm/cpu/armv7/s5p4418/cpu.c
index 3c71a37a74bf..699918d06257 100644
--- a/arch/arm/cpu/armv7/s5p4418/cpu.c
+++ b/arch/arm/cpu/armv7/s5p4418/cpu.c
@@ -17,6 +17,7 @@
 #include <asm/arch/tieoff.h>
 #include <cpu_func.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/cpu/armv7/stv0991/reset.c b/arch/arm/cpu/armv7/stv0991/reset.c
index 1be1dc486d44..58098d296e5b 100644
--- a/arch/arm/cpu/armv7/stv0991/reset.c
+++ b/arch/arm/cpu/armv7/stv0991/reset.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <asm/arch/stv0991_wdru.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 void reset_cpu(ulong ignored)
 {
 	puts("System is going to reboot ...\n");
diff --git a/arch/arm/cpu/armv7/stv0991/timer.c b/arch/arm/cpu/armv7/stv0991/timer.c
index 07033acb5c18..aad61d72add8 100644
--- a/arch/arm/cpu/armv7/stv0991/timer.c
+++ b/arch/arm/cpu/armv7/stv0991/timer.c
@@ -13,6 +13,7 @@
 #include <asm/arch-stv0991/stv0991_cgu.h>
 #include <asm/arch-stv0991/stv0991_gpt.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 static struct stv0991_cgu_regs *const stv0991_cgu_regs = \
 				(struct stv0991_cgu_regs *) (CGU_BASE_ADDR);
diff --git a/arch/arm/cpu/armv7/sunxi/psci.c b/arch/arm/cpu/armv7/sunxi/psci.c
index 5f21529bf2e0..8f6532e344d1 100644
--- a/arch/arm/cpu/armv7/sunxi/psci.c
+++ b/arch/arm/cpu/armv7/sunxi/psci.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <stdbool.h>
 #include <asm/cache.h>
+#include <asm/types.h>
 
 #include <asm/arch/cpu.h>
 #include <asm/arch/cpucfg.h>
diff --git a/arch/arm/cpu/armv7/sunxi/timer.c b/arch/arm/cpu/armv7/sunxi/timer.c
index b7585996369f..29193cf3ed61 100644
--- a/arch/arm/cpu/armv7/sunxi/timer.c
+++ b/arch/arm/cpu/armv7/sunxi/timer.c
@@ -12,6 +12,7 @@
 #include <asm/io.h>
 #include <asm/arch/timer.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/cpu/armv7/syslib.c b/arch/arm/cpu/armv7/syslib.c
index 7e29636972d9..7e0b7b0da98e 100644
--- a/arch/arm/cpu/armv7/syslib.c
+++ b/arch/arm/cpu/armv7/syslib.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <asm/io.h>
+#include <asm/types.h>
 
 /************************************************************
  * sdelay() - simple spin loop.  Will be constant time as
diff --git a/arch/arm/cpu/armv7/vf610/generic.c b/arch/arm/cpu/armv7/vf610/generic.c
index 93418ce9a8c5..80e22fcd6242 100644
--- a/arch/arm/cpu/armv7/vf610/generic.c
+++ b/arch/arm/cpu/armv7/vf610/generic.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <clock_legacy.h>
 #include <command.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <init.h>
 #include <net.h>
@@ -22,6 +23,7 @@
 #ifdef CONFIG_FSL_ESDHC_IMX
 #include <fsl_esdhc_imx.h>
 #endif
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <linux/string.h>
diff --git a/arch/arm/cpu/armv7/vf610/timer.c b/arch/arm/cpu/armv7/vf610/timer.c
index a9c1a8fcebc1..1afa86b558c6 100644
--- a/arch/arm/cpu/armv7/vf610/timer.c
+++ b/arch/arm/cpu/armv7/vf610/timer.c
@@ -12,6 +12,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/clock.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 static struct pit_reg *cur_pit = (struct pit_reg *)PIT_BASE_ADDR;
 
diff --git a/arch/arm/cpu/armv7/virt-v7.c b/arch/arm/cpu/armv7/virt-v7.c
index cf0954cb9b3b..7aadb18cf1b4 100644
--- a/arch/arm/cpu/armv7/virt-v7.c
+++ b/arch/arm/cpu/armv7/virt-v7.c
@@ -9,6 +9,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <stdio.h>
 #include <asm/armv7.h>
@@ -18,6 +19,7 @@
 #include <asm/secure.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static unsigned int read_id_pfr1(void)
 {
diff --git a/arch/arm/cpu/armv7m/cache.c b/arch/arm/cpu/armv7m/cache.c
index abed2e36df44..d81c0b12154c 100644
--- a/arch/arm/cpu/armv7m/cache.c
+++ b/arch/arm/cpu/armv7m/cache.c
@@ -14,6 +14,7 @@
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 /* Cache maintenance operation registers */
 
diff --git a/arch/arm/cpu/armv7m/cpu.c b/arch/arm/cpu/armv7m/cpu.c
index 7f827da033bf..eabc5789e875 100644
--- a/arch/arm/cpu/armv7m/cpu.c
+++ b/arch/arm/cpu/armv7m/cpu.c
@@ -12,6 +12,7 @@
 #include <irq_func.h>
 #include <asm/io.h>
 #include <asm/armv7m.h>
+#include <linux/types.h>
 
 /*
  * This is called right before passing control to
diff --git a/arch/arm/cpu/armv7m/mpu.c b/arch/arm/cpu/armv7m/mpu.c
index 81e7492f1c86..cdd4b7d25185 100644
--- a/arch/arm/cpu/armv7m/mpu.c
+++ b/arch/arm/cpu/armv7m/mpu.c
@@ -8,6 +8,7 @@
 #include <asm/armv7m.h>
 #include <asm/armv7_mpu.h>
 #include <asm/io.h>
+#include <linux/types.h>
 
 #define V7M_MPU_CTRL_ENABLE		BIT(0)
 #define V7M_MPU_CTRL_DISABLE		(0 << 0)
diff --git a/arch/arm/cpu/armv7m/systick-timer.c b/arch/arm/cpu/armv7m/systick-timer.c
index 556eaf8c74ad..cc1e13d74d25 100644
--- a/arch/arm/cpu/armv7m/systick-timer.c
+++ b/arch/arm/cpu/armv7m/systick-timer.c
@@ -27,6 +27,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/cpu/armv8/cache_v8.c b/arch/arm/cpu/armv8/cache_v8.c
index 8add6ac333b2..b128367e82fe 100644
--- a/arch/arm/cpu/armv8/cache_v8.c
+++ b/arch/arm/cpu/armv8/cache_v8.c
@@ -8,9 +8,11 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <hang.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/cache.h>
@@ -19,6 +21,7 @@
 #include <asm/armv8/mmu.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/cpu/armv8/cpu.c b/arch/arm/cpu/armv8/cpu.c
index 21c10cf6c7ca..9cd76d4a7ffb 100644
--- a/arch/arm/cpu/armv8/cpu.c
+++ b/arch/arm/cpu/armv8/cpu.c
@@ -12,6 +12,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <irq_func.h>
 #include <asm/cache.h>
@@ -19,6 +20,7 @@
 #include <asm/secure.h>
 #include <linux/compiler.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /*
  * sdelay() - simple spin loop.
diff --git a/arch/arm/cpu/armv8/exception_level.c b/arch/arm/cpu/armv8/exception_level.c
index b11936548fb3..edb7ef89a6c1 100644
--- a/arch/arm/cpu/armv8/exception_level.c
+++ b/arch/arm/cpu/armv8/exception_level.c
@@ -14,6 +14,7 @@
 #include <log.h>
 #include <asm/cache.h>
 #include <asm/setjmp.h>
+#include <linux/types.h>
 
 /**
  * entry_non_secure() - entry point when switching to non-secure mode
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
index 38ff2ce207d1..56c076b70a91 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <env.h>
 #include <fsl_ddr_sdram.h>
@@ -44,6 +45,7 @@
 #include <fsl_qbman.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_TFABOOT
 #include <env_internal.h>
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/cpu.h b/arch/arm/cpu/armv8/fsl-layerscape/cpu.h
index dca5fd0f7dcd..99f48597e2e6 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/cpu.h
+++ b/arch/arm/cpu/armv8/fsl-layerscape/cpu.h
@@ -3,6 +3,7 @@
  * Copyright 2014-2015, Freescale Semiconductor
  */
 
+#include <asm/types.h>
 int fsl_qoriq_core_to_cluster(unsigned int core);
 u32 initiator_type(u32 cluster, int init_id);
 u32 cpu_mask(void);
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/fdt.c b/arch/arm/cpu/armv8/fsl-layerscape/fdt.c
index 09750dc2e884..9ef6ca33b47b 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/fdt.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/fdt.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <clock_legacy.h>
+#include <compiler.h>
 #include <efi_loader.h>
 #include <log.h>
 #include <stdio.h>
@@ -34,6 +35,7 @@
 #include <asm/arch/speed.h>
 #include <fsl_qbman.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 int fdt_fixup_phy_connection(void *blob, int offset, phy_interface_t phyc)
 {
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_serdes.c b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_serdes.c
index 86b2d335ab08..88f80433ab44 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_serdes.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_serdes.c
@@ -4,9 +4,11 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <log.h>
 #include <stdio.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/arch/fsl_serdes.h>
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c
index c32e7f20962e..f61fef4bb878 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <clock_legacy.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <stdio.h>
 #include <asm/global_data.h>
@@ -15,6 +16,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/soc.h>
 #include <fsl_ifc.h>
+#include <linux/types.h>
 #include "cpu.h"
 
 DECLARE_GLOBAL_DATA_PTR;
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 f79328394c90..806ac73b1a69 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c
@@ -5,12 +5,14 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <env.h>
 #include <log.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c
index 3240f8ef97f8..cff3c8989739 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <clock_legacy.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <stdio.h>
 #include <asm/global_data.h>
@@ -18,6 +19,7 @@
 #include <asm/arch-fsl-layerscape/immap_lsch3.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/soc.h>
+#include <linux/types.h>
 #include "cpu.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/icid.c b/arch/arm/cpu/armv8/fsl-layerscape/icid.c
index 5c378da0636c..f4801173466f 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/icid.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/icid.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls1012a_serdes.c b/arch/arm/cpu/armv8/fsl-layerscape/ls1012a_serdes.c
index 33d9a64e6800..3db03fc450e7 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/ls1012a_serdes.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/ls1012a_serdes.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <asm/arch/fsl_serdes.h>
 #include <asm/arch/immap_lsch2.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 
 struct serdes_config {
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls1028_ids.c b/arch/arm/cpu/armv8/fsl-layerscape/ls1028_ids.c
index 4d12ffae1bd0..57c3652e3769 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/ls1028_ids.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/ls1028_ids.c
@@ -11,6 +11,7 @@
 #include <asm/arch-fsl-layerscape/fsl_portals.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 struct icid_id_table icid_tbl[] = {
 	SET_USB_ICID(1, "snps,dwc3", FSL_USB1_STREAM_ID),
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls1028a_serdes.c b/arch/arm/cpu/armv8/fsl-layerscape/ls1028a_serdes.c
index 1079dd8b95fb..0785c3999a21 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/ls1028a_serdes.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/ls1028a_serdes.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <asm/arch/fsl_serdes.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 
 struct serdes_config {
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls1043a_serdes.c b/arch/arm/cpu/armv8/fsl-layerscape/ls1043a_serdes.c
index 8a9ef8fef937..f3c5341d1aa7 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/ls1043a_serdes.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/ls1043a_serdes.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <asm/arch/fsl_serdes.h>
 #include <asm/arch/immap_lsch2.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 
 struct serdes_config {
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls1046a_serdes.c b/arch/arm/cpu/armv8/fsl-layerscape/ls1046a_serdes.c
index 0c1c40d04b39..0a5bd79ed109 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/ls1046a_serdes.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/ls1046a_serdes.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <asm/arch/fsl_serdes.h>
 #include <asm/arch/immap_lsch2.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 
 struct serdes_config {
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls1088a_serdes.c b/arch/arm/cpu/armv8/fsl-layerscape/ls1088a_serdes.c
index fb7680fdc5f4..4fdbb7960697 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/ls1088a_serdes.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/ls1088a_serdes.c
@@ -4,9 +4,12 @@
  */
 
 #include <common.h>
+#include <compiler.h>
+#include <stdbool.h>
 #include <asm/arch/fsl_serdes.h>
 #include <asm/arch/soc.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 
 struct serdes_config {
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls2080a_serdes.c b/arch/arm/cpu/armv8/fsl-layerscape/ls2080a_serdes.c
index b21da530dcfc..fea83f0cce13 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/ls2080a_serdes.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/ls2080a_serdes.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <asm/arch/fsl_serdes.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 
 struct serdes_config {
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/lx2160a_serdes.c b/arch/arm/cpu/armv8/fsl-layerscape/lx2160a_serdes.c
index 67c8f6651466..6b2b0b4d79a5 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/lx2160a_serdes.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/lx2160a_serdes.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <asm/arch/fsl_serdes.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 
 struct serdes_config {
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/mp.c b/arch/arm/cpu/armv8/fsl-layerscape/mp.c
index f032f49279a1..7e75bc1380ff 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/mp.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/mp.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <image.h>
 #include <log.h>
@@ -18,6 +19,7 @@
 #include <linux/delay.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "cpu.h"
 #include <asm/arch-fsl-layerscape/soc.h>
 #include <efi_loader.h>
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ppa.c b/arch/arm/cpu/armv8/fsl-layerscape/ppa.c
index 4aaeda367bf2..3b5298b708b2 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/ppa.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/ppa.c
@@ -3,6 +3,7 @@
  * Copyright 2016 NXP Semiconductor, Inc.
  */
 #include <common.h>
+#include <compiler.h>
 #include <log.h>
 #include <malloc.h>
 #include <config.h>
@@ -26,6 +27,7 @@
 #endif
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_SYS_LS_PPA_FW_IN_NAND
 #include <nand.h>
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/soc.c b/arch/arm/cpu/armv8/fsl-layerscape/soc.c
index 85ae0c49df54..d1ebce74ac9e 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/soc.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/soc.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <clock_legacy.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <env.h>
 #include <fsl_immap.h>
@@ -43,6 +44,7 @@
 #if defined(CONFIG_TFABOOT) || defined(CONFIG_GIC_V3_ITS)
 DECLARE_GLOBAL_DATA_PTR;
 #endif
+#include <linux/types.h>
 
 #ifdef CONFIG_GIC_V3_ITS
 int ls_gic_rd_tables_init(void *blob)
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/spl.c b/arch/arm/cpu/armv8/fsl-layerscape/spl.c
index 7c44dc7a95a8..29e28e4b03bd 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/spl.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/spl.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <clock_legacy.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <env.h>
 #include <image.h>
@@ -21,6 +22,7 @@
 #include <asm/arch/ppa.h>
 #include <asm/arch/soc.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/cpu/armv8/fwcall.c b/arch/arm/cpu/armv8/fwcall.c
index 8085a0351f3a..d57680892c9b 100644
--- a/arch/arm/cpu/armv8/fwcall.c
+++ b/arch/arm/cpu/armv8/fwcall.c
@@ -14,6 +14,7 @@
 #include <asm/psci.h>
 #include <asm/ptrace.h>
 #include <asm/system.h>
+#include <asm/types.h>
 
 /*
  * Issue the hypervisor call
diff --git a/arch/arm/cpu/armv8/generic_timer.c b/arch/arm/cpu/armv8/generic_timer.c
index f27a74b9d09b..2f7fbc20e496 100644
--- a/arch/arm/cpu/armv8/generic_timer.c
+++ b/arch/arm/cpu/armv8/generic_timer.c
@@ -11,6 +11,7 @@
 #include <asm/global_data.h>
 #include <asm/system.h>
 #include <linux/bitops.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/cpu/armv8/hisilicon/pinmux.c b/arch/arm/cpu/armv8/hisilicon/pinmux.c
index 5183e00a44cb..4d90ea1130ff 100644
--- a/arch/arm/cpu/armv8/hisilicon/pinmux.c
+++ b/arch/arm/cpu/armv8/hisilicon/pinmux.c
@@ -10,6 +10,7 @@
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <asm/arch/pinmux.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 
 struct hi6220_pinmux0_regs *pmx0 =
diff --git a/arch/arm/cpu/armv8/s32v234/cpu.c b/arch/arm/cpu/armv8/s32v234/cpu.c
index 8912eb725e20..6f0168823a89 100644
--- a/arch/arm/cpu/armv8/s32v234/cpu.c
+++ b/arch/arm/cpu/armv8/s32v234/cpu.c
@@ -13,6 +13,7 @@
 #include <asm/armv8/mmu.h>
 #include <asm/io.h>
 #include <asm/arch/mc_me_regs.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include "cpu.h"
 
diff --git a/arch/arm/cpu/armv8/s32v234/cpu.h b/arch/arm/cpu/armv8/s32v234/cpu.h
index 11c3a6b435e9..a066661d90a9 100644
--- a/arch/arm/cpu/armv8/s32v234/cpu.h
+++ b/arch/arm/cpu/armv8/s32v234/cpu.h
@@ -3,5 +3,6 @@
  * (C) Copyright 2014-2016, Freescale Semiconductor, Inc.
  */
 
+#include <asm/types.h>
 u32 cpu_mask(void);
 int cpu_numcores(void);
diff --git a/arch/arm/cpu/armv8/s32v234/generic.c b/arch/arm/cpu/armv8/s32v234/generic.c
index 575dbb1f6098..0f43135b2064 100644
--- a/arch/arm/cpu/armv8/s32v234/generic.c
+++ b/arch/arm/cpu/armv8/s32v234/generic.c
@@ -21,6 +21,7 @@
 #include <errno.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 u32 get_cpu_rev(void)
 {
diff --git a/arch/arm/cpu/armv8/sec_firmware.c b/arch/arm/cpu/armv8/sec_firmware.c
index 1b273db4f988..a2a7e52a9755 100644
--- a/arch/arm/cpu/armv8/sec_firmware.c
+++ b/arch/arm/cpu/armv8/sec_firmware.c
@@ -4,11 +4,13 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <errno.h>
 #include <fdt_support.h>
 #include <image.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
@@ -21,6 +23,7 @@
 #include <asm/macro.h>
 #include <asm/armv8/sec_firmware.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 extern void c_runtime_cpu_setup(void);
diff --git a/arch/arm/cpu/armv8/spl_data.c b/arch/arm/cpu/armv8/spl_data.c
index f8f9fe2e0260..864b2ebe7a7c 100644
--- a/arch/arm/cpu/armv8/spl_data.c
+++ b/arch/arm/cpu/armv8/spl_data.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <spl.h>
+#include <asm/types.h>
 #include <linux/string.h>
 
 char __data_save_start[0] __section(.__data_save_start);
diff --git a/arch/arm/cpu/pxa/cache.c b/arch/arm/cpu/pxa/cache.c
index a2ec5e28c7dc..97b6b3a0fd65 100644
--- a/arch/arm/cpu/pxa/cache.c
+++ b/arch/arm/cpu/pxa/cache.c
@@ -3,6 +3,7 @@
  * (C) Copyright 2016 Vasily Khoruzhick <anarsoul@gmail.com>
  */
 
+#include <compiler.h>
 #include <cpu_func.h>
 #include <asm/cache.h>
 #include <linux/types.h>
diff --git a/arch/arm/cpu/pxa/cpuinfo.c b/arch/arm/cpu/pxa/cpuinfo.c
index ff56c3a82be1..e54d06210d55 100644
--- a/arch/arm/cpu/pxa/cpuinfo.c
+++ b/arch/arm/cpu/pxa/cpuinfo.c
@@ -12,6 +12,7 @@
 #include <errno.h>
 #include <linux/compiler.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_CPU_PXA25X
 #if ((CONFIG_SYS_INIT_SP_ADDR) != 0xfffff800)
diff --git a/arch/arm/cpu/pxa/pxa2xx.c b/arch/arm/cpu/pxa/pxa2xx.c
index ea91d8aaec2b..f75f32148238 100644
--- a/arch/arm/cpu/pxa/pxa2xx.c
+++ b/arch/arm/cpu/pxa/pxa2xx.c
@@ -18,6 +18,7 @@
 #include <asm/io.h>
 #include <asm/system.h>
 #include <command.h>
+#include <linux/types.h>
 
 /* Flush I/D-cache */
 static void cache_flush(void)
diff --git a/arch/arm/cpu/sa1100/cpu.c b/arch/arm/cpu/sa1100/cpu.c
index 91e100af1b67..f264d1b5601f 100644
--- a/arch/arm/cpu/sa1100/cpu.c
+++ b/arch/arm/cpu/sa1100/cpu.c
@@ -19,6 +19,7 @@
 #include <irq_func.h>
 #include <asm/system.h>
 #include <asm/io.h>
+#include <linux/types.h>
 
 static void cache_flush(void);
 
diff --git a/arch/arm/cpu/sa1100/timer.c b/arch/arm/cpu/sa1100/timer.c
index 5d597dd1ab4c..e3227d7c25c6 100644
--- a/arch/arm/cpu/sa1100/timer.c
+++ b/arch/arm/cpu/sa1100/timer.c
@@ -13,6 +13,7 @@
 #include <SA-1100.h>
 #include <time.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 static ulong get_timer_masked (void)
 {
diff --git a/arch/arm/include/asm/arch-am33xx/clk_synthesizer.h b/arch/arm/include/asm/arch-am33xx/clk_synthesizer.h
index 7bcafba6f0b5..6d09b53fb93d 100644
--- a/arch/arm/include/asm/arch-am33xx/clk_synthesizer.h
+++ b/arch/arm/include/asm/arch-am33xx/clk_synthesizer.h
@@ -10,6 +10,7 @@
 #ifndef __CLK_SYNTHESIZER_H
 #define __CLK_SYNTHESIZER_H
 
+#include <asm/types.h>
 #define CLK_SYNTHESIZER_ID_REG		0x0
 #define CLK_SYNTHESIZER_XCSEL		0x05
 #define CLK_SYNTHESIZER_MUX_REG		0x14
diff --git a/arch/arm/include/asm/arch-am33xx/clock.h b/arch/arm/include/asm/arch-am33xx/clock.h
index dc7a9b188d34..a5b14ca45632 100644
--- a/arch/arm/include/asm/arch-am33xx/clock.h
+++ b/arch/arm/include/asm/arch-am33xx/clock.h
@@ -12,6 +12,7 @@
 
 #include <asm/arch/clocks_am33xx.h>
 #include <asm/arch/hardware.h>
+#include <linux/types.h>
 
 #if defined(CONFIG_TI816X) || defined(CONFIG_TI814X)
 #include <asm/arch/clock_ti81xx.h>
diff --git a/arch/arm/include/asm/arch-am33xx/ddr_defs.h b/arch/arm/include/asm/arch-am33xx/ddr_defs.h
index 15a5b641ffa2..4fd111ef7008 100644
--- a/arch/arm/include/asm/arch-am33xx/ddr_defs.h
+++ b/arch/arm/include/asm/arch-am33xx/ddr_defs.h
@@ -12,6 +12,7 @@
 
 #include <asm/arch/hardware.h>
 #include <asm/emif.h>
+#include <asm/types.h>
 
 /* AM335X EMIF Register values */
 #define VTP_CTRL_READY		(0x1 << 5)
diff --git a/arch/arm/include/asm/arch-am33xx/sys_proto.h b/arch/arm/include/asm/arch-am33xx/sys_proto.h
index be17aad29ee6..46fef0da51fe 100644
--- a/arch/arm/include/asm/arch-am33xx/sys_proto.h
+++ b/arch/arm/include/asm/arch-am33xx/sys_proto.h
@@ -11,6 +11,7 @@
 #define _SYS_PROTO_H_
 #include <linux/mtd/omap_gpmc.h>
 #include <asm/arch/cpu.h>
+#include <linux/types.h>
 
 u32 get_cpu_rev(void);
 u32 get_sysboot_value(void);
diff --git a/arch/arm/include/asm/arch-armada100/cpu.h b/arch/arm/include/asm/arch-armada100/cpu.h
index cd5e5051d51d..1565e1018324 100644
--- a/arch/arm/include/asm/arch-armada100/cpu.h
+++ b/arch/arm/include/asm/arch-armada100/cpu.h
@@ -10,6 +10,7 @@
 
 #include <asm/io.h>
 #include <asm/system.h>
+#include <asm/types.h>
 
 /*
  * Main Power Management (MPMU) Registers
diff --git a/arch/arm/include/asm/arch-armada100/spi.h b/arch/arm/include/asm/arch-armada100/spi.h
index 873ba6e91c9d..4a4dcd95f948 100644
--- a/arch/arm/include/asm/arch-armada100/spi.h
+++ b/arch/arm/include/asm/arch-armada100/spi.h
@@ -12,6 +12,7 @@
 #define __ARMADA100_SPI_H_
 
 #include <asm/arch/armada100.h>
+#include <asm/types.h>
 
 #define CAT_BASE_ADDR(x)	ARMD1_SSP ## x ## _BASE
 #define SSP_REG_BASE(x)		CAT_BASE_ADDR(x)
diff --git a/arch/arm/include/asm/arch-armada100/utmi-armada100.h b/arch/arm/include/asm/arch-armada100/utmi-armada100.h
index 28147f42acf7..8511b875ea6e 100644
--- a/arch/arm/include/asm/arch-armada100/utmi-armada100.h
+++ b/arch/arm/include/asm/arch-armada100/utmi-armada100.h
@@ -11,6 +11,7 @@
 #ifndef __UTMI_ARMADA100__
 #define __UTMI_ARMADA100__
 
+#include <asm/types.h>
 #define UTMI_PHY_BASE		0xD4206000
 
 /* utmi_ctrl - bits */
diff --git a/arch/arm/include/asm/arch-armv7/globaltimer.h b/arch/arm/include/asm/arch-armv7/globaltimer.h
index 2d9cf77980cc..a4e8eaa4f967 100644
--- a/arch/arm/include/asm/arch-armv7/globaltimer.h
+++ b/arch/arm/include/asm/arch-armv7/globaltimer.h
@@ -6,6 +6,7 @@
 #ifndef _GLOBALTIMER_H_
 #define _GLOBALTIMER_H_
 
+#include <asm/types.h>
 struct globaltimer {
 	u32 cnt_l; /* 0x00 */
 	u32 cnt_h;
diff --git a/arch/arm/include/asm/arch-armv7/sysctrl.h b/arch/arm/include/asm/arch-armv7/sysctrl.h
index fc72fac8d87f..e7e660362cfc 100644
--- a/arch/arm/include/asm/arch-armv7/sysctrl.h
+++ b/arch/arm/include/asm/arch-armv7/sysctrl.h
@@ -7,6 +7,7 @@
 #define _SYSCTRL_H_
 
 /* System controller (SP810) register definitions */
+#include <asm/types.h>
 #define SP810_TIMER0_ENSEL	(1 << 15)
 #define SP810_TIMER1_ENSEL	(1 << 17)
 #define SP810_TIMER2_ENSEL	(1 << 19)
diff --git a/arch/arm/include/asm/arch-armv7/systimer.h b/arch/arm/include/asm/arch-armv7/systimer.h
index 04c413045816..4b9a29b0b4c2 100644
--- a/arch/arm/include/asm/arch-armv7/systimer.h
+++ b/arch/arm/include/asm/arch-armv7/systimer.h
@@ -7,6 +7,7 @@
 #define _SYSTIMER_H_
 
 /* AMBA timer register base address */
+#include <asm/types.h>
 #define SYSTIMER_BASE		0x10011000
 
 #define SYSHZ_CLOCK		1000000		/* Timers -> 1Mhz */
diff --git a/arch/arm/include/asm/arch-armv7/wdt.h b/arch/arm/include/asm/arch-armv7/wdt.h
index e3fa16ffab58..593ec779490d 100644
--- a/arch/arm/include/asm/arch-armv7/wdt.h
+++ b/arch/arm/include/asm/arch-armv7/wdt.h
@@ -7,6 +7,7 @@
 #define _WDT_H_
 
 /* Watchdog timer (SP805) register base address */
+#include <asm/types.h>
 #define WDT_BASE	0x100E5000
 
 #define WDT_EN		0x2
diff --git a/arch/arm/include/asm/arch-aspeed/scu_ast2500.h b/arch/arm/include/asm/arch-aspeed/scu_ast2500.h
index 8db4901cc9b5..c2a1e122f9b0 100644
--- a/arch/arm/include/asm/arch-aspeed/scu_ast2500.h
+++ b/arch/arm/include/asm/arch-aspeed/scu_ast2500.h
@@ -141,6 +141,7 @@
 
 #ifndef __ASSEMBLY__
 
+#include <asm/types.h>
 struct ast2500_clk_priv {
 	struct ast2500_scu *scu;
 };
diff --git a/arch/arm/include/asm/arch-aspeed/sdram_ast2500.h b/arch/arm/include/asm/arch-aspeed/sdram_ast2500.h
index 0bc551fbecf8..e66dff74e6be 100644
--- a/arch/arm/include/asm/arch-aspeed/sdram_ast2500.h
+++ b/arch/arm/include/asm/arch-aspeed/sdram_ast2500.h
@@ -97,6 +97,7 @@
 
 #ifndef __ASSEMBLY__
 
+#include <asm/types.h>
 struct ast2500_sdrammc_regs {
 	u32 protection_key;
 	u32 config;
diff --git a/arch/arm/include/asm/arch-aspeed/timer.h b/arch/arm/include/asm/arch-aspeed/timer.h
index ff24e2f86e37..332c0f850b22 100644
--- a/arch/arm/include/asm/arch-aspeed/timer.h
+++ b/arch/arm/include/asm/arch-aspeed/timer.h
@@ -28,6 +28,7 @@
  * it this just one device.
  */
 
+#include <asm/types.h>
 struct ast_timer_counter {
 	u32 status;
 	u32 reload_val;
diff --git a/arch/arm/include/asm/arch-aspeed/wdt.h b/arch/arm/include/asm/arch-aspeed/wdt.h
index fb04d41d3cbf..f71fcaad9696 100644
--- a/arch/arm/include/asm/arch-aspeed/wdt.h
+++ b/arch/arm/include/asm/arch-aspeed/wdt.h
@@ -67,6 +67,7 @@
 	 WDT_RESET_ADC | WDT_RESET_GPIO | WDT_RESET_MISC)
 
 #ifndef __ASSEMBLY__
+#include <linux/types.h>
 struct ast_wdt {
 	u32 counter_status;
 	u32 counter_reload_val;
diff --git a/arch/arm/include/asm/arch-ep93xx/ep93xx.h b/arch/arm/include/asm/arch-ep93xx/ep93xx.h
index 272b64480d1f..4f7561a74fe5 100644
--- a/arch/arm/include/asm/arch-ep93xx/ep93xx.h
+++ b/arch/arm/include/asm/arch-ep93xx/ep93xx.h
@@ -31,6 +31,7 @@
 #define DMA_BASE			(EP93XX_AHB_BASE | DMA_OFFSET)
 
 #ifndef __ASSEMBLY__
+#include <linux/types.h>
 struct dma_channel {
 	uint32_t control;
 	uint32_t interrupt;
diff --git a/arch/arm/include/asm/arch-fsl-layerscape/clock.h b/arch/arm/include/asm/arch-fsl-layerscape/clock.h
index d5616914374a..c72a8dbd61d2 100644
--- a/arch/arm/include/asm/arch-fsl-layerscape/clock.h
+++ b/arch/arm/include/asm/arch-fsl-layerscape/clock.h
@@ -8,6 +8,7 @@
 #ifndef __ASM_ARCH_FSL_LAYERSCAPE_CLOCK_H_
 #define __ASM_ARCH_FSL_LAYERSCAPE_CLOCK_H_
 
+#include <linux/types.h>
 enum mxc_clock {
 	MXC_ARM_CLK = 0,
 	MXC_BUS_CLK,
diff --git a/arch/arm/include/asm/arch-fsl-layerscape/cpu.h b/arch/arm/include/asm/arch-fsl-layerscape/cpu.h
index 7759acdb8f6b..6ef62fb8eeac 100644
--- a/arch/arm/include/asm/arch-fsl-layerscape/cpu.h
+++ b/arch/arm/include/asm/arch-fsl-layerscape/cpu.h
@@ -17,6 +17,7 @@
 #define CONFIG_SYS_FSL_IFC_SIZE1	0x10000000
 #define CONFIG_SYS_FSL_IFC_SIZE1_1	0x400000
 #endif
+#include <asm/types.h>
 #define CONFIG_SYS_FSL_DRAM_BASE1	0x80000000
 #define CONFIG_SYS_FSL_DRAM_SIZE1	0x80000000
 #define CONFIG_SYS_FSL_QSPI_BASE2	0x400000000
diff --git a/arch/arm/include/asm/arch-fsl-layerscape/fsl_portals.h b/arch/arm/include/asm/arch-fsl-layerscape/fsl_portals.h
index 1577e935a606..7713a515023c 100644
--- a/arch/arm/include/asm/arch-fsl-layerscape/fsl_portals.h
+++ b/arch/arm/include/asm/arch-fsl-layerscape/fsl_portals.h
@@ -6,6 +6,7 @@
 #ifndef _FSL_PORTALS_H_
 #define _FSL_PORTALS_H_
 
+#include <asm/types.h>
 struct qportal_info {
 	u16	dicid;	/* DQRR ICID */
 	u16	ficid;	/* frame data ICID */
diff --git a/arch/arm/include/asm/arch-fsl-layerscape/fsl_serdes.h b/arch/arm/include/asm/arch-fsl-layerscape/fsl_serdes.h
index 8f4365175697..86ef17b6283d 100644
--- a/arch/arm/include/asm/arch-fsl-layerscape/fsl_serdes.h
+++ b/arch/arm/include/asm/arch-fsl-layerscape/fsl_serdes.h
@@ -8,6 +8,7 @@
 #define __FSL_SERDES_H__
 
 #include <config.h>
+#include <asm/types.h>
 
 #ifdef CONFIG_FSL_LSCH3
 enum srds_prtcl {
diff --git a/arch/arm/include/asm/arch-fsl-layerscape/gpio.h b/arch/arm/include/asm/arch-fsl-layerscape/gpio.h
index 7ae5eee8b669..0b959b00fd13 100644
--- a/arch/arm/include/asm/arch-fsl-layerscape/gpio.h
+++ b/arch/arm/include/asm/arch-fsl-layerscape/gpio.h
@@ -13,6 +13,7 @@
 #ifndef __ASM_ARCH_MX85XX_GPIO_H
 #define __ASM_ARCH_MX85XX_GPIO_H
 
+#include <linux/types.h>
 struct mpc8xxx_gpio_plat {
 	ulong addr;
 	ulong size;
diff --git a/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h b/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h
index c9be0768e34f..7e2e5917d68e 100644
--- a/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h
+++ b/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h
@@ -9,6 +9,7 @@
 #include <fsl_immap.h>
 #ifndef __ASSEMBLY__
 #include <linux/bitops.h>
+#include <linux/types.h>
 #endif
 
 #define CONFIG_SYS_IMMR				0x01000000
diff --git a/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h b/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h
index baa9fa8529cd..73d50e08926a 100644
--- a/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h
+++ b/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h
@@ -292,6 +292,7 @@
 #define TP_INIT_PER_CLUSTER     4
 /* This is chassis generation 3 */
 #ifndef __ASSEMBLY__
+#include <asm/types.h>
 struct sys_info {
 	unsigned long freq_processor[CONFIG_MAX_CPUS];
 	/* frequency of platform PLL */
diff --git a/arch/arm/include/asm/arch-fsl-layerscape/mp.h b/arch/arm/include/asm/arch-fsl-layerscape/mp.h
index faac8f11286f..ad70074d18d5 100644
--- a/arch/arm/include/asm/arch-fsl-layerscape/mp.h
+++ b/arch/arm/include/asm/arch-fsl-layerscape/mp.h
@@ -32,6 +32,7 @@
 
 #define id_to_core(x)	((x & 3) | (x >> 6))
 #ifndef __ASSEMBLY__
+#include <linux/types.h>
 extern u64 __real_cntfrq;
 extern void *secondary_boot_addr;
 extern void *secondary_boot_code_start;
diff --git a/arch/arm/include/asm/arch-hi6220/dwmmc.h b/arch/arm/include/asm/arch-hi6220/dwmmc.h
index cf51c178c3f0..ae61e7109f64 100644
--- a/arch/arm/include/asm/arch-hi6220/dwmmc.h
+++ b/arch/arm/include/asm/arch-hi6220/dwmmc.h
@@ -4,4 +4,5 @@
  * Peter Griffin <peter.griffin@linaro.org>
  */
 
+#include <asm/types.h>
 int hi6220_dwmci_add_port(int index, u32 regbase, int bus_width);
diff --git a/arch/arm/include/asm/arch-hi6220/gpio.h b/arch/arm/include/asm/arch-hi6220/gpio.h
index c5ee359a3a17..c02a1fcb9926 100644
--- a/arch/arm/include/asm/arch-hi6220/gpio.h
+++ b/arch/arm/include/asm/arch-hi6220/gpio.h
@@ -7,6 +7,7 @@
 #ifndef _HI6220_GPIO_H_
 #define _HI6220_GPIO_H_
 
+#include <linux/types.h>
 #define HI6220_GPIO_BASE(bank)	(((bank < 4) ? 0xf8011000 : \
 				0xf7020000 - 0x4000) + (0x1000 * bank))
 
diff --git a/arch/arm/include/asm/arch-hi6220/hi6220_regs_alwayson.h b/arch/arm/include/asm/arch-hi6220/hi6220_regs_alwayson.h
index 4b9a0d44acb1..d719169c77f1 100644
--- a/arch/arm/include/asm/arch-hi6220/hi6220_regs_alwayson.h
+++ b/arch/arm/include/asm/arch-hi6220/hi6220_regs_alwayson.h
@@ -7,6 +7,7 @@
 #ifndef __HI6220_ALWAYSON_H__
 #define __HI6220_ALWAYSON_H__
 
+#include <asm/types.h>
 #define ALWAYSON_CTRL_BASE			0xF7800000
 
 struct alwayson_sc_regs {
diff --git a/arch/arm/include/asm/arch-hi6220/pinmux.h b/arch/arm/include/asm/arch-hi6220/pinmux.h
index b4a9957e8073..2673c1acc99d 100644
--- a/arch/arm/include/asm/arch-hi6220/pinmux.h
+++ b/arch/arm/include/asm/arch-hi6220/pinmux.h
@@ -57,6 +57,7 @@
 /* maybe more registers, but highest used is 123 */
 #define REG_NUM 123
 
+#include <linux/types.h>
 struct hi6220_pinmux0_regs {
 	uint32_t	iomg[REG_NUM];
 };
diff --git a/arch/arm/include/asm/arch-imx/cpu.h b/arch/arm/include/asm/arch-imx/cpu.h
index 75ff991248c7..4e95c8a7a12d 100644
--- a/arch/arm/include/asm/arch-imx/cpu.h
+++ b/arch/arm/include/asm/arch-imx/cpu.h
@@ -3,6 +3,7 @@
  * (C) Copyright 2014 Freescale Semiconductor, Inc.
  */
 
+#include <linux/types.h>
 #define MXC_CPU_MX23		0x23
 #define MXC_CPU_MX25		0x25
 #define MXC_CPU_MX27		0x27
diff --git a/arch/arm/include/asm/arch-imx8/clock.h b/arch/arm/include/asm/arch-imx8/clock.h
index bea157171fbc..ce2d65a69d6a 100644
--- a/arch/arm/include/asm/arch-imx8/clock.h
+++ b/arch/arm/include/asm/arch-imx8/clock.h
@@ -7,6 +7,7 @@
 #define __ASM_ARCH_IMX8_CLOCK_H__
 
 /* Mainly for compatible to imx common code. */
+#include <asm/types.h>
 enum mxc_clock {
 	MXC_ARM_CLK = 0,
 	MXC_AHB_CLK,
diff --git a/arch/arm/include/asm/arch-imx8/gpio.h b/arch/arm/include/asm/arch-imx8/gpio.h
index 24cfde3c2972..3ba211b0a610 100644
--- a/arch/arm/include/asm/arch-imx8/gpio.h
+++ b/arch/arm/include/asm/arch-imx8/gpio.h
@@ -18,4 +18,5 @@ struct gpio_regs {
 /* IMX8 the GPIO index is from 0 not 1 */
 #define IMX_GPIO_NR(port, index)		(((port) * 32) + ((index) & 31))
 
+#include <asm/types.h>
 #endif /* __ASM_ARCH_IMX8_GPIO_H */
diff --git a/arch/arm/include/asm/arch-imx8/image.h b/arch/arm/include/asm/arch-imx8/image.h
index c1e5700859dc..1c6e05b49eb1 100644
--- a/arch/arm/include/asm/arch-imx8/image.h
+++ b/arch/arm/include/asm/arch-imx8/image.h
@@ -6,6 +6,7 @@
 #ifndef __CONTAINER_HEADER_H_
 #define __CONTAINER_HEADER_H_
 
+#include <compiler.h>
 #include <linux/sizes.h>
 #include <linux/types.h>
 
diff --git a/arch/arm/include/asm/arch-imx8/iomux.h b/arch/arm/include/asm/arch-imx8/iomux.h
index 3acef1ea6bad..c7cab5770d3c 100644
--- a/arch/arm/include/asm/arch-imx8/iomux.h
+++ b/arch/arm/include/asm/arch-imx8/iomux.h
@@ -7,6 +7,7 @@
 #define __ASM_ARCH_IMX8_IOMUX_H__
 
 #ifndef __ASSEMBLY__
+#include <asm/types.h>
 #include <linux/bitops.h>
 #endif
 
diff --git a/arch/arm/include/asm/arch-imx8/sci/rpc.h b/arch/arm/include/asm/arch-imx8/sci/rpc.h
index 9f55904f4422..04dd413aa049 100644
--- a/arch/arm/include/asm/arch-imx8/sci/rpc.h
+++ b/arch/arm/include/asm/arch-imx8/sci/rpc.h
@@ -10,6 +10,7 @@
 /* Note: Check SCFW API Released DOC before you want to modify something */
 /* Defines */
 
+#include <asm/types.h>
 #define SCFW_API_VERSION_MAJOR  1U
 #define SCFW_API_VERSION_MINOR  15U
 
diff --git a/arch/arm/include/asm/arch-imx8/sci/sci.h b/arch/arm/include/asm/arch-imx8/sci/sci.h
index 1c29209b3990..ff7be2184f36 100644
--- a/arch/arm/include/asm/arch-imx8/sci/sci.h
+++ b/arch/arm/include/asm/arch-imx8/sci/sci.h
@@ -16,6 +16,7 @@
 #include <asm/arch/sci/rpc.h>
 #include <dt-bindings/soc/imx_rsrc.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 static inline int sc_err_to_linux(sc_err_t err)
 {
diff --git a/arch/arm/include/asm/arch-imx8/sci/svc/misc/api.h b/arch/arm/include/asm/arch-imx8/sci/svc/misc/api.h
index 3629eb68d7ab..4fb7c01f9c49 100644
--- a/arch/arm/include/asm/arch-imx8/sci/svc/misc/api.h
+++ b/arch/arm/include/asm/arch-imx8/sci/svc/misc/api.h
@@ -7,6 +7,7 @@
 #define SC_MISC_API_H
 
 /* Defines for sc_misc_boot_status_t */
+#include <asm/types.h>
 #define SC_MISC_BOOT_STATUS_SUCCESS	0U	/* Success */
 #define SC_MISC_BOOT_STATUS_SECURITY	1U	/* Security violation */
 
diff --git a/arch/arm/include/asm/arch-imx8/sci/svc/pm/api.h b/arch/arm/include/asm/arch-imx8/sci/svc/pm/api.h
index 9008b85c6f67..ca80fd3927f5 100644
--- a/arch/arm/include/asm/arch-imx8/sci/svc/pm/api.h
+++ b/arch/arm/include/asm/arch-imx8/sci/svc/pm/api.h
@@ -7,6 +7,7 @@
 #define SC_PM_API_H
 
 /* Defines for sc_pm_power_mode_t */
+#include <asm/types.h>
 #define SC_PM_PW_MODE_OFF	0U /* Power off */
 #define SC_PM_PW_MODE_STBY	1U /* Power in standby */
 #define SC_PM_PW_MODE_LP	2U /* Power in low-power */
diff --git a/arch/arm/include/asm/arch-imx8/sci/svc/rm/api.h b/arch/arm/include/asm/arch-imx8/sci/svc/rm/api.h
index ed303881e736..4783682e4de2 100644
--- a/arch/arm/include/asm/arch-imx8/sci/svc/rm/api.h
+++ b/arch/arm/include/asm/arch-imx8/sci/svc/rm/api.h
@@ -7,6 +7,7 @@
 #define SC_RM_API_H
 
 #include <asm/arch/sci/types.h>
+#include <asm/types.h>
 
 /* Defines for type widths */
 #define SC_RM_PARTITION_W   5U      /* Width of sc_rm_pt_t */
diff --git a/arch/arm/include/asm/arch-imx8/sci/svc/seco/api.h b/arch/arm/include/asm/arch-imx8/sci/svc/seco/api.h
index 3ed05842d992..524f857bfb77 100644
--- a/arch/arm/include/asm/arch-imx8/sci/svc/seco/api.h
+++ b/arch/arm/include/asm/arch-imx8/sci/svc/seco/api.h
@@ -9,6 +9,7 @@
 /* Includes */
 
 #include <asm/arch/sci/types.h>
+#include <asm/types.h>
 
 /* Defines */
 #define SC_SECO_AUTH_CONTAINER          0U   /* Authenticate container */
diff --git a/arch/arm/include/asm/arch-imx8m/clock.h b/arch/arm/include/asm/arch-imx8m/clock.h
index 848a93ec3f20..2bb81f2bddf6 100644
--- a/arch/arm/include/asm/arch-imx8m/clock.h
+++ b/arch/arm/include/asm/arch-imx8m/clock.h
@@ -7,6 +7,7 @@
 
 #include <stdbool.h>
 #include <linux/bitops.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_IMX8MQ
 #include <asm/arch/clock_imx8mq.h>
diff --git a/arch/arm/include/asm/arch-imx8m/clock_imx8mm.h b/arch/arm/include/asm/arch-imx8m/clock_imx8mm.h
index 63b14b9ca58f..c2f530bf090f 100644
--- a/arch/arm/include/asm/arch-imx8m/clock_imx8mm.h
+++ b/arch/arm/include/asm/arch-imx8m/clock_imx8mm.h
@@ -9,6 +9,7 @@
 #define _ASM_ARCH_IMX8MM_CLOCK_H
 
 #ifndef __ASSEMBLY__
+#include <asm/types.h>
 #include <linux/bitops.h>
 #endif
 
diff --git a/arch/arm/include/asm/arch-imx8m/ddr.h b/arch/arm/include/asm/arch-imx8m/ddr.h
index 0f1e832c038a..790e9d9dfb21 100644
--- a/arch/arm/include/asm/arch-imx8m/ddr.h
+++ b/arch/arm/include/asm/arch-imx8m/ddr.h
@@ -9,6 +9,7 @@
 #include <asm/io.h>
 #include <asm/types.h>
 #include <asm/arch/ddr.h>
+#include <linux/types.h>
 
 #define DDRC_DDR_SS_GPR0		0x3d000000
 #define DDRC_IPS_BASE_ADDR_0		0x3f400000
diff --git a/arch/arm/include/asm/arch-imxrt/gpio.h b/arch/arm/include/asm/arch-imxrt/gpio.h
index da31a7438aa1..1752bd23fe85 100644
--- a/arch/arm/include/asm/arch-imxrt/gpio.h
+++ b/arch/arm/include/asm/arch-imxrt/gpio.h
@@ -16,4 +16,5 @@ struct gpio_regs {
 };
 #endif
 
+#include <asm/types.h>
 #endif /* __ASM_ARCH_GPIO_H__ */
diff --git a/arch/arm/include/asm/arch-lpc32xx/dma.h b/arch/arm/include/asm/arch-lpc32xx/dma.h
index d69e3c4664de..f480f7c7cd8c 100644
--- a/arch/arm/include/asm/arch-lpc32xx/dma.h
+++ b/arch/arm/include/asm/arch-lpc32xx/dma.h
@@ -12,6 +12,7 @@
 #define _LPC32XX_DMA_H
 
 /*
+#include <asm/types.h>
  * DMA linked list structure used with a channel's LLI register;
  * refer to UM10326, "LPC32x0 and LPC32x0/01 User manual" - Rev. 3
  * tables 84, 85, 86 & 87 for details.
diff --git a/arch/arm/include/asm/arch-lpc32xx/gpio.h b/arch/arm/include/asm/arch-lpc32xx/gpio.h
index 93e7a8875215..332ae6f88506 100644
--- a/arch/arm/include/asm/arch-lpc32xx/gpio.h
+++ b/arch/arm/include/asm/arch-lpc32xx/gpio.h
@@ -10,6 +10,7 @@
  * GPIO Register map for LPC32xx
  */
 
+#include <asm/types.h>
 struct gpio_regs {
 	u32 p3_inp_state;
 	u32 p3_outp_set;
diff --git a/arch/arm/include/asm/arch-lpc32xx/i2c.h b/arch/arm/include/asm/arch-lpc32xx/i2c.h
index f39b14001b67..3f9ef1096d33 100644
--- a/arch/arm/include/asm/arch-lpc32xx/i2c.h
+++ b/arch/arm/include/asm/arch-lpc32xx/i2c.h
@@ -2,6 +2,7 @@
 #define _LPC32XX_I2C_H
 
 #include <asm/types.h>
+#include <linux/types.h>
 
 /* i2c register set */
 struct lpc32xx_i2c_base {
diff --git a/arch/arm/include/asm/arch-lpc32xx/mux.h b/arch/arm/include/asm/arch-lpc32xx/mux.h
index d661e8236f32..aff08caae196 100644
--- a/arch/arm/include/asm/arch-lpc32xx/mux.h
+++ b/arch/arm/include/asm/arch-lpc32xx/mux.h
@@ -10,6 +10,7 @@
  * MUX register map for LPC32xx
  */
 
+#include <asm/types.h>
 struct mux_regs {
 	u32 reserved1[10];
 	u32 p2_mux_set;
diff --git a/arch/arm/include/asm/arch-ls102xa/clock.h b/arch/arm/include/asm/arch-ls102xa/clock.h
index 01978c08f5e3..ee19feb02712 100644
--- a/arch/arm/include/asm/arch-ls102xa/clock.h
+++ b/arch/arm/include/asm/arch-ls102xa/clock.h
@@ -7,6 +7,7 @@
 #ifndef __ASM_ARCH_LS102XA_CLOCK_H_
 #define __ASM_ARCH_LS102XA_CLOCK_H_
 
+#include <linux/types.h>
 enum mxc_clock {
 	MXC_ARM_CLK = 0,
 	MXC_UART_CLK,
diff --git a/arch/arm/include/asm/arch-ls102xa/fsl_serdes.h b/arch/arm/include/asm/arch-ls102xa/fsl_serdes.h
index d99a6f318f8b..b418a906f9cf 100644
--- a/arch/arm/include/asm/arch-ls102xa/fsl_serdes.h
+++ b/arch/arm/include/asm/arch-ls102xa/fsl_serdes.h
@@ -7,6 +7,7 @@
 #define __FSL_SERDES_H
 
 #include <config.h>
+#include <asm/types.h>
 
 enum srds_prtcl {
 	/*
diff --git a/arch/arm/include/asm/arch-ls102xa/immap_ls102xa.h b/arch/arm/include/asm/arch-ls102xa/immap_ls102xa.h
index f2ba182346ef..fcdf8380b329 100644
--- a/arch/arm/include/asm/arch-ls102xa/immap_ls102xa.h
+++ b/arch/arm/include/asm/arch-ls102xa/immap_ls102xa.h
@@ -6,6 +6,7 @@
 #ifndef __ASM_ARCH_LS102XA_IMMAP_H_
 #define __ASM_ARCH_LS102XA_IMMAP_H_
 #include <fsl_immap.h>
+#include <linux/types.h>
 
 #define SVR_MAJ(svr)		(((svr) >>  4) & 0xf)
 #define SVR_MIN(svr)		(((svr) >>  0) & 0xf)
diff --git a/arch/arm/include/asm/arch-ls102xa/ls102xa_stream_id.h b/arch/arm/include/asm/arch-ls102xa/ls102xa_stream_id.h
index 93b0a26091e7..06df4c590434 100644
--- a/arch/arm/include/asm/arch-ls102xa/ls102xa_stream_id.h
+++ b/arch/arm/include/asm/arch-ls102xa/ls102xa_stream_id.h
@@ -7,6 +7,7 @@
 #define __FSL_LS102XA_STREAM_ID_H_
 
 #include <fsl_sec.h>
+#include <linux/types.h>
 
 #define SET_LIODN_ENTRY_1(name, idA, off, compatoff) \
 	{ .compat = name, \
diff --git a/arch/arm/include/asm/arch-mediatek/reset.h b/arch/arm/include/asm/arch-mediatek/reset.h
index 4ba0bad94ee6..bcf69b476a0c 100644
--- a/arch/arm/include/asm/arch-mediatek/reset.h
+++ b/arch/arm/include/asm/arch-mediatek/reset.h
@@ -8,6 +8,8 @@
 
 struct udevice;
 
+#include <asm/types.h>
+
 int mediatek_reset_bind(struct udevice *pdev, u32 regofs, u32 num_regs);
 
 #endif	/* __MEDIATEK_RESET_H */
diff --git a/arch/arm/include/asm/arch-meson/clock-gx.h b/arch/arm/include/asm/arch-meson/clock-gx.h
index 13a2e7688fc5..2a9bd52102a9 100644
--- a/arch/arm/include/asm/arch-meson/clock-gx.h
+++ b/arch/arm/include/asm/arch-meson/clock-gx.h
@@ -13,6 +13,7 @@
  * Those offsets must be multiplied by 4 before adding them to the base address
  * to get the right value
  */
+#include <linux/types.h>
 #define SCR				0x2C /* 0x0b offset in data sheet */
 #define TIMEOUT_VALUE			0x3c /* 0x0f offset in data sheet */
 
diff --git a/arch/arm/include/asm/arch-meson/sm.h b/arch/arm/include/asm/arch-meson/sm.h
index f3ae46a6d6b5..53a93347c187 100644
--- a/arch/arm/include/asm/arch-meson/sm.h
+++ b/arch/arm/include/asm/arch-meson/sm.h
@@ -6,6 +6,7 @@
 #ifndef __MESON_SM_H__
 #define __MESON_SM_H__
 
+#include <linux/types.h>
 ssize_t meson_sm_read_efuse(uintptr_t offset, void *buffer, size_t size);
 
 #define SM_SERIAL_SIZE	12
diff --git a/arch/arm/include/asm/arch-mvebu/spi.h b/arch/arm/include/asm/arch-mvebu/spi.h
index 58b6c32c4d81..7c0d55bfe6cf 100644
--- a/arch/arm/include/asm/arch-mvebu/spi.h
+++ b/arch/arm/include/asm/arch-mvebu/spi.h
@@ -11,6 +11,7 @@
 #define __KW_SPI_H__
 
 /* SPI Registers on kirkwood SOC */
+#include <asm/types.h>
 struct kwspi_registers {
 	u32 ctrl;	/* 0x10600 */
 	u32 cfg;	/* 0x10604 */
diff --git a/arch/arm/include/asm/arch-mx27/gpio.h b/arch/arm/include/asm/arch-mx27/gpio.h
index 9f342eb7f71a..fcc57071ce92 100644
--- a/arch/arm/include/asm/arch-mx27/gpio.h
+++ b/arch/arm/include/asm/arch-mx27/gpio.h
@@ -9,6 +9,7 @@
 #define __ASM_ARCH_MX27_GPIO_H
 
 /* GPIO registers */
+#include <asm/types.h>
 struct gpio_regs {
 	u32 gpio_dir; /* DDIR */
 	u32 ocr1;
diff --git a/arch/arm/include/asm/arch-mx27/imx-regs.h b/arch/arm/include/asm/arch-mx27/imx-regs.h
index d39f6b03508f..dd2773a88782 100644
--- a/arch/arm/include/asm/arch-mx27/imx-regs.h
+++ b/arch/arm/include/asm/arch-mx27/imx-regs.h
@@ -11,6 +11,7 @@
 
 #ifndef __ASSEMBLY__
 
+#include <asm/types.h>
 extern void imx_gpio_mode (int gpio_mode);
 
 #ifdef CONFIG_MXC_UART
diff --git a/arch/arm/include/asm/arch-mx27/regs-rtc.h b/arch/arm/include/asm/arch-mx27/regs-rtc.h
index 8434f4c1cb1a..ee7a8c29008b 100644
--- a/arch/arm/include/asm/arch-mx27/regs-rtc.h
+++ b/arch/arm/include/asm/arch-mx27/regs-rtc.h
@@ -9,6 +9,7 @@
 #define __MX27_REGS_RTC_H__
 
 #ifndef	__ASSEMBLY__
+#include <asm/types.h>
 struct rtc_regs {
 	u32 hourmin;
 	u32 seconds;
diff --git a/arch/arm/include/asm/arch-mx31/clock.h b/arch/arm/include/asm/arch-mx31/clock.h
index e99e115f79e7..5b084dc359be 100644
--- a/arch/arm/include/asm/arch-mx31/clock.h
+++ b/arch/arm/include/asm/arch-mx31/clock.h
@@ -7,6 +7,7 @@
 #ifndef __ASM_ARCH_CLOCK_H
 #define __ASM_ARCH_CLOCK_H
 
+#include <asm/types.h>
 #define MXC_HCLK	CONFIG_MX31_HCLK_FREQ
 
 #define MXC_CLK32	CONFIG_MX31_CLK32
diff --git a/arch/arm/include/asm/arch-mx31/sys_proto.h b/arch/arm/include/asm/arch-mx31/sys_proto.h
index a530afcbc91a..72ce987ab202 100644
--- a/arch/arm/include/asm/arch-mx31/sys_proto.h
+++ b/arch/arm/include/asm/arch-mx31/sys_proto.h
@@ -8,6 +8,7 @@
 #define _MX31_SYS_PROTO_H_
 
 #include <asm/mach-imx/sys_proto.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 
 struct mxc_weimcs {
diff --git a/arch/arm/include/asm/arch-mx35/clock.h b/arch/arm/include/asm/arch-mx35/clock.h
index cb0b53a69f4d..e2b0f661cc7e 100644
--- a/arch/arm/include/asm/arch-mx35/clock.h
+++ b/arch/arm/include/asm/arch-mx35/clock.h
@@ -19,6 +19,7 @@
 #define MXC_CLK32	32768
 #endif
 
+#include <asm/types.h>
 enum mxc_clock {
 	MXC_ARM_CLK,
 	MXC_AHB_CLK,
diff --git a/arch/arm/include/asm/arch-mx35/sys_proto.h b/arch/arm/include/asm/arch-mx35/sys_proto.h
index 6e8b84128bc4..20b18d058cb3 100644
--- a/arch/arm/include/asm/arch-mx35/sys_proto.h
+++ b/arch/arm/include/asm/arch-mx35/sys_proto.h
@@ -8,6 +8,7 @@
 #define _MX35_SYS_PROTO_H_
 
 #include <asm/mach-imx/sys_proto.h>
+#include <asm/types.h>
 
 void mx3_setup_sdram_bank(u32 start_address, u32 ddr2_config, u32 row,
 			  u32 col, u32 dsize, u32 refresh);
diff --git a/arch/arm/include/asm/arch-mx5/clock.h b/arch/arm/include/asm/arch-mx5/clock.h
index 86aeb5d56103..ad6b56c9baba 100644
--- a/arch/arm/include/asm/arch-mx5/clock.h
+++ b/arch/arm/include/asm/arch-mx5/clock.h
@@ -20,6 +20,7 @@
 #endif
 
 #include <stdbool.h>
+#include <asm/types.h>
 enum mxc_clock {
 	MXC_ARM_CLK = 0,
 	MXC_AHB_CLK,
diff --git a/arch/arm/include/asm/arch-mx5/crm_regs.h b/arch/arm/include/asm/arch-mx5/crm_regs.h
index 9d54ab7fb07a..913318e314f8 100644
--- a/arch/arm/include/asm/arch-mx5/crm_regs.h
+++ b/arch/arm/include/asm/arch-mx5/crm_regs.h
@@ -6,6 +6,7 @@
 #ifndef __ARCH_ARM_MACH_MX51_CRM_REGS_H__
 #define __ARCH_ARM_MACH_MX51_CRM_REGS_H__
 
+#include <asm/types.h>
 #define MXC_CCM_BASE	CCM_BASE_ADDR
 
 /* DPLL register mapping structure */
diff --git a/arch/arm/include/asm/arch-mx6/crm_regs.h b/arch/arm/include/asm/arch-mx6/crm_regs.h
index 4174f244afa1..3bbd049dd916 100644
--- a/arch/arm/include/asm/arch-mx6/crm_regs.h
+++ b/arch/arm/include/asm/arch-mx6/crm_regs.h
@@ -18,6 +18,7 @@
 #define PMU_MISC2		0x020C8170
 
 #ifndef __ASSEMBLY__
+#include <asm/types.h>
 struct mxc_ccm_reg {
 	u32 ccr;	/* 0x0000 */
 	u32 ccdr;
diff --git a/arch/arm/include/asm/arch-mx6/mx6-ddr.h b/arch/arm/include/asm/arch-mx6/mx6-ddr.h
index dbc97b25df80..069dd7ce8fcd 100644
--- a/arch/arm/include/asm/arch-mx6/mx6-ddr.h
+++ b/arch/arm/include/asm/arch-mx6/mx6-ddr.h
@@ -23,6 +23,7 @@
 #else
 #error "Please select cpu"
 #endif	/* CONFIG_MX6SL */
+#include <asm/types.h>
 #endif	/* CONFIG_MX6UL */
 #endif	/* CONFIG_MX6SX */
 #endif	/* CONFIG_MX6DL or CONFIG_MX6S */
diff --git a/arch/arm/include/asm/arch-mx6/mxc_hdmi.h b/arch/arm/include/asm/arch-mx6/mxc_hdmi.h
index 71ad0e307c48..5009609022ef 100644
--- a/arch/arm/include/asm/arch-mx6/mxc_hdmi.h
+++ b/arch/arm/include/asm/arch-mx6/mxc_hdmi.h
@@ -14,6 +14,7 @@ void imx_setup_hdmi(void);
 /*
  * Hdmi controller registers
  */
+#include <asm/types.h>
 struct hdmi_regs {
 	/*Identification Registers */
 	u8 design_id;			/* 0x000 */
diff --git a/arch/arm/include/asm/arch-mx6/sys_proto.h b/arch/arm/include/asm/arch-mx6/sys_proto.h
index 1e5fa1a75ebc..eddce1aeba9f 100644
--- a/arch/arm/include/asm/arch-mx6/sys_proto.h
+++ b/arch/arm/include/asm/arch-mx6/sys_proto.h
@@ -9,6 +9,7 @@
 
 #include <asm/mach-imx/sys_proto.h>
 #include <asm/arch/iomux.h>
+#include <asm/types.h>
 
 #define USBPHY_PWD		0x00000000
 
diff --git a/arch/arm/include/asm/arch-mx7/clock.h b/arch/arm/include/asm/arch-mx7/clock.h
index 48c7c3367a53..cf0b0ce9654a 100644
--- a/arch/arm/include/asm/arch-mx7/clock.h
+++ b/arch/arm/include/asm/arch-mx7/clock.h
@@ -10,6 +10,7 @@
 #define _ASM_ARCH_CLOCK_H
 
 #include <asm/arch/crm_regs.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_SYS_MX7_HCLK
 #define MXC_HCLK	CONFIG_SYS_MX7_HCLK
diff --git a/arch/arm/include/asm/arch-mx7/clock_slice.h b/arch/arm/include/asm/arch-mx7/clock_slice.h
index 1eac3bec5cb1..d7910a8d96cb 100644
--- a/arch/arm/include/asm/arch-mx7/clock_slice.h
+++ b/arch/arm/include/asm/arch-mx7/clock_slice.h
@@ -10,6 +10,7 @@
 #define _ASM_ARCH_CLOCK_SLICE_H
 
 #include <stdbool.h>
+#include <asm/types.h>
 enum root_pre_div {
 	CLK_ROOT_PRE_DIV1 = 0,
 	CLK_ROOT_PRE_DIV2,
diff --git a/arch/arm/include/asm/arch-mx7/crm_regs.h b/arch/arm/include/asm/arch-mx7/crm_regs.h
index f3515fab0310..7c72f294e63d 100644
--- a/arch/arm/include/asm/arch-mx7/crm_regs.h
+++ b/arch/arm/include/asm/arch-mx7/crm_regs.h
@@ -20,6 +20,7 @@
 
 #ifndef __ASSEMBLY__
 
+#include <linux/types.h>
 struct mxc_ccm_ccgr {
 	uint32_t ccgr;
 	uint32_t ccgr_set;
diff --git a/arch/arm/include/asm/arch-mx7/imx-regs.h b/arch/arm/include/asm/arch-mx7/imx-regs.h
index f37419c07f18..f3b0a3f9be5b 100644
--- a/arch/arm/include/asm/arch-mx7/imx-regs.h
+++ b/arch/arm/include/asm/arch-mx7/imx-regs.h
@@ -226,6 +226,7 @@
 #include <asm/mach-imx/regs-lcdif.h>
 #include <asm/types.h>
 #include <linux/bitops.h>
+#include <linux/types.h>
 
 extern void imx_get_mac_from_fuse(int dev_id, unsigned char *mac);
 
diff --git a/arch/arm/include/asm/arch-mx7/mx7-ddr.h b/arch/arm/include/asm/arch-mx7/mx7-ddr.h
index bea5dd8ec5ef..8a4d21ed8196 100644
--- a/arch/arm/include/asm/arch-mx7/mx7-ddr.h
+++ b/arch/arm/include/asm/arch-mx7/mx7-ddr.h
@@ -11,6 +11,7 @@
 #define __ASM_ARCH_MX7_DDR_H__
 
 #ifndef __ASSEMBLY__
+#include <asm/types.h>
 #include <linux/bitops.h>
 #endif
 
diff --git a/arch/arm/include/asm/arch-mx7ulp/clock.h b/arch/arm/include/asm/arch-mx7ulp/clock.h
index 92d4463dff5f..5025fa39cfdf 100644
--- a/arch/arm/include/asm/arch-mx7ulp/clock.h
+++ b/arch/arm/include/asm/arch-mx7ulp/clock.h
@@ -8,6 +8,7 @@
 
 #include <asm/arch/pcc.h>
 #include <asm/arch/scg.h>
+#include <asm/types.h>
 
 /* Mainly for compatible to imx common code. */
 enum mxc_clock {
diff --git a/arch/arm/include/asm/arch-mx7ulp/gpio.h b/arch/arm/include/asm/arch-mx7ulp/gpio.h
index 7c625609bacf..b20b8ba26b99 100644
--- a/arch/arm/include/asm/arch-mx7ulp/gpio.h
+++ b/arch/arm/include/asm/arch-mx7ulp/gpio.h
@@ -6,6 +6,7 @@
 #ifndef __ASM_ARCH_MX7ULP_GPIO_H
 #define __ASM_ARCH_MX7ULP_GPIO_H
 
+#include <asm/types.h>
 struct gpio_regs {
 	u32 gpio_pdor;
 	u32 gpio_psor;
diff --git a/arch/arm/include/asm/arch-mx7ulp/pcc.h b/arch/arm/include/asm/arch-mx7ulp/pcc.h
index 25d10fb7d1a9..c1e12009a2e0 100644
--- a/arch/arm/include/asm/arch-mx7ulp/pcc.h
+++ b/arch/arm/include/asm/arch-mx7ulp/pcc.h
@@ -8,6 +8,7 @@
 
 #include <stdbool.h>
 #include <asm/arch/scg.h>
+#include <asm/types.h>
 
 /* PCC2 */
 
diff --git a/arch/arm/include/asm/arch-mx7ulp/scg.h b/arch/arm/include/asm/arch-mx7ulp/scg.h
index b4d92d1ed44f..0be3ae1dc273 100644
--- a/arch/arm/include/asm/arch-mx7ulp/scg.h
+++ b/arch/arm/include/asm/arch-mx7ulp/scg.h
@@ -8,6 +8,7 @@
 
 #include <stdbool.h>
 #include <stdio.h>
+#include <asm/types.h>
 
 #ifdef CONFIG_CLK_DEBUG
 #define clk_debug(fmt, args...)	printf(fmt, ##args)
diff --git a/arch/arm/include/asm/arch-mxs/clock.h b/arch/arm/include/asm/arch-mxs/clock.h
index ee56d10fec2b..bfaa72ce3f2e 100644
--- a/arch/arm/include/asm/arch-mxs/clock.h
+++ b/arch/arm/include/asm/arch-mxs/clock.h
@@ -9,6 +9,7 @@
 #ifndef __CLOCK_H__
 #define __CLOCK_H__
 
+#include <linux/types.h>
 enum mxc_clock {
 	MXC_ARM_CLK = 0,
 	MXC_AHB_CLK,
diff --git a/arch/arm/include/asm/arch-mxs/regs-clkctrl-mx23.h b/arch/arm/include/asm/arch-mxs/regs-clkctrl-mx23.h
index 50fdc9cd0326..96976ed0a4af 100644
--- a/arch/arm/include/asm/arch-mxs/regs-clkctrl-mx23.h
+++ b/arch/arm/include/asm/arch-mxs/regs-clkctrl-mx23.h
@@ -15,6 +15,7 @@
 #include <asm/mach-imx/regs-common.h>
 
 #ifndef	__ASSEMBLY__
+#include <linux/types.h>
 struct mxs_clkctrl_regs {
 	mxs_reg_32(hw_clkctrl_pll0ctrl0)	/* 0x00 */
 	uint32_t	hw_clkctrl_pll0ctrl1;	/* 0x10 */
diff --git a/arch/arm/include/asm/arch-mxs/regs-clkctrl-mx28.h b/arch/arm/include/asm/arch-mxs/regs-clkctrl-mx28.h
index caef9e4b1fc7..494757fe622c 100644
--- a/arch/arm/include/asm/arch-mxs/regs-clkctrl-mx28.h
+++ b/arch/arm/include/asm/arch-mxs/regs-clkctrl-mx28.h
@@ -15,6 +15,7 @@
 #include <asm/mach-imx/regs-common.h>
 
 #ifndef	__ASSEMBLY__
+#include <linux/types.h>
 struct mxs_clkctrl_regs {
 	mxs_reg_32(hw_clkctrl_pll0ctrl0)	/* 0x00 */
 	uint32_t	hw_clkctrl_pll0ctrl1;	/* 0x10 */
diff --git a/arch/arm/include/asm/arch-mxs/regs-digctl.h b/arch/arm/include/asm/arch-mxs/regs-digctl.h
index 219f58ba75fd..63735af5ec35 100644
--- a/arch/arm/include/asm/arch-mxs/regs-digctl.h
+++ b/arch/arm/include/asm/arch-mxs/regs-digctl.h
@@ -11,6 +11,7 @@
 #include <asm/mach-imx/regs-common.h>
 
 #ifndef	__ASSEMBLY__
+#include <linux/types.h>
 struct mxs_digctl_regs {
 	mxs_reg_32(hw_digctl_ctrl)				/* 0x000 */
 	mxs_reg_32(hw_digctl_status)				/* 0x010 */
diff --git a/arch/arm/include/asm/arch-mxs/regs-pinctrl.h b/arch/arm/include/asm/arch-mxs/regs-pinctrl.h
index 134d436ee920..d06b3b839145 100644
--- a/arch/arm/include/asm/arch-mxs/regs-pinctrl.h
+++ b/arch/arm/include/asm/arch-mxs/regs-pinctrl.h
@@ -15,6 +15,7 @@
 #include <asm/mach-imx/regs-common.h>
 
 #ifndef	__ASSEMBLY__
+#include <linux/types.h>
 struct mxs_pinctrl_regs {
 	mxs_reg_32(hw_pinctrl_ctrl)		/* 0x0 */
 
diff --git a/arch/arm/include/asm/arch-mxs/regs-power-mx23.h b/arch/arm/include/asm/arch-mxs/regs-power-mx23.h
index a0dc78102301..9cfb7223b99b 100644
--- a/arch/arm/include/asm/arch-mxs/regs-power-mx23.h
+++ b/arch/arm/include/asm/arch-mxs/regs-power-mx23.h
@@ -11,6 +11,7 @@
 #include <asm/mach-imx/regs-common.h>
 
 #ifndef	__ASSEMBLY__
+#include <linux/types.h>
 struct mxs_power_regs {
 	mxs_reg_32(hw_power_ctrl)
 	mxs_reg_32(hw_power_5vctrl)
diff --git a/arch/arm/include/asm/arch-mxs/regs-power-mx28.h b/arch/arm/include/asm/arch-mxs/regs-power-mx28.h
index 39250c506d02..7ceb576e6f54 100644
--- a/arch/arm/include/asm/arch-mxs/regs-power-mx28.h
+++ b/arch/arm/include/asm/arch-mxs/regs-power-mx28.h
@@ -11,6 +11,7 @@
 #include <asm/mach-imx/regs-common.h>
 
 #ifndef	__ASSEMBLY__
+#include <linux/types.h>
 struct mxs_power_regs {
 	mxs_reg_32(hw_power_ctrl)
 	mxs_reg_32(hw_power_5vctrl)
diff --git a/arch/arm/include/asm/arch-mxs/regs-ssp.h b/arch/arm/include/asm/arch-mxs/regs-ssp.h
index eeb7e7f44c06..947a3624c2ff 100644
--- a/arch/arm/include/asm/arch-mxs/regs-ssp.h
+++ b/arch/arm/include/asm/arch-mxs/regs-ssp.h
@@ -86,6 +86,7 @@ static inline int mxs_ssp_clock_by_bus(unsigned int clock)
 #endif
 }
 
+#include <linux/types.h>
 static inline struct mxs_ssp_regs *mxs_ssp_regs_by_bus(unsigned int port)
 {
 	switch (port) {
diff --git a/arch/arm/include/asm/arch-mxs/regs-usb.h b/arch/arm/include/asm/arch-mxs/regs-usb.h
index 8d5168dd8ea9..d21c26428b07 100644
--- a/arch/arm/include/asm/arch-mxs/regs-usb.h
+++ b/arch/arm/include/asm/arch-mxs/regs-usb.h
@@ -9,6 +9,7 @@
 #ifndef __REGS_USB_H__
 #define __REGS_USB_H__
 
+#include <linux/types.h>
 struct mxs_usb_regs {
 	uint32_t		hw_usbctrl_id;			/* 0x000 */
 	uint32_t		hw_usbctrl_hwgeneral;		/* 0x004 */
diff --git a/arch/arm/include/asm/arch-mxs/sys_proto.h b/arch/arm/include/asm/arch-mxs/sys_proto.h
index 85374e2b87c6..5ade99aa5dcc 100644
--- a/arch/arm/include/asm/arch-mxs/sys_proto.h
+++ b/arch/arm/include/asm/arch-mxs/sys_proto.h
@@ -11,6 +11,7 @@
 
 #include <asm/mach-imx/sys_proto.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 int mxsmmc_initialize(struct bd_info *bis, int id, int (*wp)(int),
 		      int (*cd)(int));
diff --git a/arch/arm/include/asm/arch-omap3/dma.h b/arch/arm/include/asm/arch-omap3/dma.h
index d26e490d2db2..2df9d0758700 100644
--- a/arch/arm/include/asm/arch-omap3/dma.h
+++ b/arch/arm/include/asm/arch-omap3/dma.h
@@ -7,6 +7,7 @@
  */
 
 /* Functions */
+#include <linux/types.h>
 void omap3_dma_init(void);
 int omap3_dma_conf_transfer(uint32_t chan, uint32_t *src, uint32_t *dst,
 		uint32_t sze);
diff --git a/arch/arm/include/asm/arch-omap3/dss.h b/arch/arm/include/asm/arch-omap3/dss.h
index 8bf6b4895fcb..c16156b749ea 100644
--- a/arch/arm/include/asm/arch-omap3/dss.h
+++ b/arch/arm/include/asm/arch-omap3/dss.h
@@ -29,6 +29,7 @@
 #define DSS_H
 
 /* DSS Base Registers */
+#include <asm/types.h>
 #define OMAP3_DSS_BASE		0x48050000
 #define OMAP3_DISPC_BASE	0x48050400
 #define OMAP3_VENC_BASE		0x48050C00
diff --git a/arch/arm/include/asm/arch-omap3/mem.h b/arch/arm/include/asm/arch-omap3/mem.h
index 7adc134a7524..a09b5a2ca799 100644
--- a/arch/arm/include/asm/arch-omap3/mem.h
+++ b/arch/arm/include/asm/arch-omap3/mem.h
@@ -12,6 +12,7 @@
 #define CS1		0x1 /* mirror CS1 regs appear offset 0x30 from CS0 */
 
 #ifndef __ASSEMBLY__
+#include <asm/types.h>
 enum {
 	STACKED = 0,
 	IP_DDR = 1,
diff --git a/arch/arm/include/asm/arch-omap3/musb.h b/arch/arm/include/asm/arch-omap3/musb.h
index cb3f5d89daa7..58a5616ee08b 100644
--- a/arch/arm/include/asm/arch-omap3/musb.h
+++ b/arch/arm/include/asm/arch-omap3/musb.h
@@ -6,6 +6,7 @@
 
 #ifndef __ASM_ARCH_OMAP3_MUSB_H
 #define __ASM_ARCH_OMAP3_MUSB_H
+#include <asm/types.h>
 void am35x_musb_reset(struct udevice *dev);
 void am35x_musb_phy_power(struct udevice *dev, u8 on);
 void am35x_musb_clear_irq(struct udevice *dev);
diff --git a/arch/arm/include/asm/arch-omap3/sys_proto.h b/arch/arm/include/asm/arch-omap3/sys_proto.h
index 32ac0335158d..7fc9b09337a0 100644
--- a/arch/arm/include/asm/arch-omap3/sys_proto.h
+++ b/arch/arm/include/asm/arch-omap3/sys_proto.h
@@ -8,6 +8,7 @@
 #define _SYS_PROTO_H_
 #include <linux/mtd/omap_gpmc.h>
 #include <asm/omap_common.h>
+#include <linux/types.h>
 
 typedef struct {
 	u32 mtype;
diff --git a/arch/arm/include/asm/arch-omap4/clock.h b/arch/arm/include/asm/arch-omap4/clock.h
index 0a626fe647a2..d2e14ff89628 100644
--- a/arch/arm/include/asm/arch-omap4/clock.h
+++ b/arch/arm/include/asm/arch-omap4/clock.h
@@ -8,6 +8,7 @@
 #ifndef _CLOCKS_OMAP4_H_
 #define _CLOCKS_OMAP4_H_
 #include <asm/omap_common.h>
+#include <asm/types.h>
 
 /*
  * Assuming a maximum of 1.5 GHz ARM speed and a minimum of 2 cycles per
diff --git a/arch/arm/include/asm/arch-omap4/sys_proto.h b/arch/arm/include/asm/arch-omap4/sys_proto.h
index b2a688765850..51bc1b829489 100644
--- a/arch/arm/include/asm/arch-omap4/sys_proto.h
+++ b/arch/arm/include/asm/arch-omap4/sys_proto.h
@@ -11,6 +11,7 @@
 #include <asm/arch/clock.h>
 #include <asm/io.h>
 #include <asm/omap_common.h>
+#include <asm/types.h>
 #include <linux/mtd/omap_gpmc.h>
 #include <asm/arch/mux_omap4.h>
 #include <asm/ti-common/sys_proto.h>
diff --git a/arch/arm/include/asm/arch-omap5/dra7xx_iodelay.h b/arch/arm/include/asm/arch-omap5/dra7xx_iodelay.h
index ea2f113f98de..bdfc026dc050 100644
--- a/arch/arm/include/asm/arch-omap5/dra7xx_iodelay.h
+++ b/arch/arm/include/asm/arch-omap5/dra7xx_iodelay.h
@@ -10,6 +10,7 @@
 #define _DRA7_IODELAY_H_
 
 #include <asm/arch/sys_proto.h>
+#include <asm/types.h>
 
 /* CONFIG_REG_0 */
 #define CFG_REG_0_OFFSET		0xC
diff --git a/arch/arm/include/asm/arch-omap5/sys_proto.h b/arch/arm/include/asm/arch-omap5/sys_proto.h
index 80b0c93b5eb3..069515e253da 100644
--- a/arch/arm/include/asm/arch-omap5/sys_proto.h
+++ b/arch/arm/include/asm/arch-omap5/sys_proto.h
@@ -14,6 +14,7 @@
 #include <linux/mtd/omap_gpmc.h>
 #include <asm/arch/clock.h>
 #include <asm/ti-common/sys_proto.h>
+#include <linux/types.h>
 
 /*
  * Structure for Iodelay configuration registers.
diff --git a/arch/arm/include/asm/arch-pxa/pxa.h b/arch/arm/include/asm/arch-pxa/pxa.h
index 428a848e1573..7fd0ebad5c0c 100644
--- a/arch/arm/include/asm/arch-pxa/pxa.h
+++ b/arch/arm/include/asm/arch-pxa/pxa.h
@@ -8,6 +8,7 @@
 #ifndef	__PXA_H__
 #define	__PXA_H__
 
+#include <linux/types.h>
 #define PXA255_A0	0x00000106
 #define PXA250_C0	0x00000105
 #define PXA250_B2	0x00000104
diff --git a/arch/arm/include/asm/arch-pxa/regs-mmc.h b/arch/arm/include/asm/arch-pxa/regs-mmc.h
index 6d9a736d9c06..7ed111cf99a7 100644
--- a/arch/arm/include/asm/arch-pxa/regs-mmc.h
+++ b/arch/arm/include/asm/arch-pxa/regs-mmc.h
@@ -6,6 +6,7 @@
 #ifndef __REGS_MMC_H__
 #define __REGS_MMC_H__
 
+#include <linux/types.h>
 #define MMC0_BASE	0x41100000
 #define MMC1_BASE	0x42000000
 
diff --git a/arch/arm/include/asm/arch-pxa/regs-uart.h b/arch/arm/include/asm/arch-pxa/regs-uart.h
index bdd0a4757b53..fc7690ee4f3c 100644
--- a/arch/arm/include/asm/arch-pxa/regs-uart.h
+++ b/arch/arm/include/asm/arch-pxa/regs-uart.h
@@ -6,6 +6,7 @@
 #ifndef	__REGS_UART_H__
 #define	__REGS_UART_H__
 
+#include <linux/types.h>
 #define	FFUART_BASE		0x40100000
 #define	BTUART_BASE		0x40200000
 #define	STUART_BASE		0x40700000
diff --git a/arch/arm/include/asm/arch-pxa/regs-usb.h b/arch/arm/include/asm/arch-pxa/regs-usb.h
index e46887c9ed45..60e564580871 100644
--- a/arch/arm/include/asm/arch-pxa/regs-usb.h
+++ b/arch/arm/include/asm/arch-pxa/regs-usb.h
@@ -8,6 +8,7 @@
 #ifndef __REGS_USB_H__
 #define __REGS_USB_H__
 
+#include <linux/types.h>
 struct pxa25x_udc_regs {
 	/* UDC Control Register */
 	uint32_t	udccr; /* 0x000 */
diff --git a/arch/arm/include/asm/arch-rk3308/cru_rk3308.h b/arch/arm/include/asm/arch-rk3308/cru_rk3308.h
index 08af4f547dd3..d8feb8bff4e6 100644
--- a/arch/arm/include/asm/arch-rk3308/cru_rk3308.h
+++ b/arch/arm/include/asm/arch-rk3308/cru_rk3308.h
@@ -6,6 +6,7 @@
 #define _ASM_ARCH_CRU_RK3308_H
 
 #include <linux/kernel.h>
+#include <linux/types.h>
 #define MHz		1000000
 #define OSC_HZ		(24 * MHz)
 
diff --git a/arch/arm/include/asm/arch-rockchip/bootrom.h b/arch/arm/include/asm/arch-rockchip/bootrom.h
index 0da78f30b619..a1937c251f1f 100644
--- a/arch/arm/include/asm/arch-rockchip/bootrom.h
+++ b/arch/arm/include/asm/arch-rockchip/bootrom.h
@@ -11,6 +11,7 @@
  * Saved Stack pointer address.
  * Access might be needed in some special cases.
  */
+#include <asm/types.h>
 extern u32 SAVE_SP_ADDR;
 
 /**
diff --git a/arch/arm/include/asm/arch-rockchip/clock.h b/arch/arm/include/asm/arch-rockchip/clock.h
index 2b47b7a9d266..f05d88bc0a6d 100644
--- a/arch/arm/include/asm/arch-rockchip/clock.h
+++ b/arch/arm/include/asm/arch-rockchip/clock.h
@@ -6,7 +6,9 @@
 #ifndef _ASM_ARCH_CLOCK_H
 #define _ASM_ARCH_CLOCK_H
 
+#include <compiler.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 struct udevice;
 
diff --git a/arch/arm/include/asm/arch-rockchip/cpu_rk3288.h b/arch/arm/include/asm/arch-rockchip/cpu_rk3288.h
index 3536f4449468..0180290cad40 100644
--- a/arch/arm/include/asm/arch-rockchip/cpu_rk3288.h
+++ b/arch/arm/include/asm/arch-rockchip/cpu_rk3288.h
@@ -8,6 +8,7 @@
 
 #include <stdbool.h>
 #include <asm/io.h>
+#include <asm/types.h>
 
 #define ROCKCHIP_CPU_MASK       0xffff0000
 #define ROCKCHIP_CPU_RK3288     0x32880000
diff --git a/arch/arm/include/asm/arch-rockchip/cru_px30.h b/arch/arm/include/asm/arch-rockchip/cru_px30.h
index c76d5751ef53..3c58db1d2630 100644
--- a/arch/arm/include/asm/arch-rockchip/cru_px30.h
+++ b/arch/arm/include/asm/arch-rockchip/cru_px30.h
@@ -6,6 +6,7 @@
 #define _ASM_ARCH_CRU_PX30_H
 
 #include <linux/kernel.h>
+#include <linux/types.h>
 #define MHz		1000000
 #define KHz		1000
 #define OSC_HZ		(24 * MHz)
diff --git a/arch/arm/include/asm/arch-rockchip/cru_rk3036.h b/arch/arm/include/asm/arch-rockchip/cru_rk3036.h
index c580bf12034e..ac62de5b9f14 100644
--- a/arch/arm/include/asm/arch-rockchip/cru_rk3036.h
+++ b/arch/arm/include/asm/arch-rockchip/cru_rk3036.h
@@ -6,6 +6,7 @@
 #define _ASM_ARCH_CRU_RK3036_H
 
 #include <linux/kernel.h>
+#include <linux/types.h>
 #define OSC_HZ		(24 * 1000 * 1000)
 
 #define APLL_HZ		(600 * 1000000)
diff --git a/arch/arm/include/asm/arch-rockchip/cru_rk3128.h b/arch/arm/include/asm/arch-rockchip/cru_rk3128.h
index e7dec3c7c9e4..63c697b98397 100644
--- a/arch/arm/include/asm/arch-rockchip/cru_rk3128.h
+++ b/arch/arm/include/asm/arch-rockchip/cru_rk3128.h
@@ -7,6 +7,7 @@
 #define _ASM_ARCH_CRU_RK3128_H
 
 #ifndef __ASSEMBLY__
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/kernel.h>
 #endif
diff --git a/arch/arm/include/asm/arch-rockchip/cru_rk3188.h b/arch/arm/include/asm/arch-rockchip/cru_rk3188.h
index 97268b8777ef..62120dc25897 100644
--- a/arch/arm/include/asm/arch-rockchip/cru_rk3188.h
+++ b/arch/arm/include/asm/arch-rockchip/cru_rk3188.h
@@ -7,6 +7,7 @@
 
 #include <stdbool.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #define OSC_HZ		(24 * 1000 * 1000)
 
 #define APLL_HZ		(1608 * 1000000)
diff --git a/arch/arm/include/asm/arch-rockchip/cru_rk322x.h b/arch/arm/include/asm/arch-rockchip/cru_rk322x.h
index ca4d727a6a70..706fca369b0e 100644
--- a/arch/arm/include/asm/arch-rockchip/cru_rk322x.h
+++ b/arch/arm/include/asm/arch-rockchip/cru_rk322x.h
@@ -6,6 +6,7 @@
 #define _ASM_ARCH_CRU_RK322X_H
 
 #include <linux/kernel.h>
+#include <linux/types.h>
 #define MHz		1000000
 #define OSC_HZ		(24 * MHz)
 
diff --git a/arch/arm/include/asm/arch-rockchip/cru_rk3288.h b/arch/arm/include/asm/arch-rockchip/cru_rk3288.h
index 7affb2f06448..82ba61abcbe4 100644
--- a/arch/arm/include/asm/arch-rockchip/cru_rk3288.h
+++ b/arch/arm/include/asm/arch-rockchip/cru_rk3288.h
@@ -9,6 +9,7 @@
 #define _ASM_ARCH_CRU_RK3288_H
 
 #include <linux/kernel.h>
+#include <linux/types.h>
 #define OSC_HZ		(24 * 1000 * 1000)
 
 #define APLL_HZ		(1800 * 1000000)
diff --git a/arch/arm/include/asm/arch-rockchip/cru_rk3328.h b/arch/arm/include/asm/arch-rockchip/cru_rk3328.h
index 2cd984ad0098..5a95a0173c58 100644
--- a/arch/arm/include/asm/arch-rockchip/cru_rk3328.h
+++ b/arch/arm/include/asm/arch-rockchip/cru_rk3328.h
@@ -7,6 +7,7 @@
 #define __ASM_ARCH_CRU_RK3328_H_
 
 #include <linux/kernel.h>
+#include <linux/types.h>
 struct rk3328_clk_priv {
 	struct rk3328_cru *cru;
 	ulong rate;
diff --git a/arch/arm/include/asm/arch-rockchip/cru_rk3399.h b/arch/arm/include/asm/arch-rockchip/cru_rk3399.h
index fdeb3735770a..97e44815621e 100644
--- a/arch/arm/include/asm/arch-rockchip/cru_rk3399.h
+++ b/arch/arm/include/asm/arch-rockchip/cru_rk3399.h
@@ -7,6 +7,7 @@
 #define __ASM_ARCH_CRU_RK3399_H_
 
 /* Private data for the clock driver - used by rockchip_get_cru() */
+#include <asm/types.h>
 #include <linux/kernel.h>
 struct rk3399_clk_priv {
 	struct rockchip_cru *cru;
diff --git a/arch/arm/include/asm/arch-rockchip/cru_rv1108.h b/arch/arm/include/asm/arch-rockchip/cru_rv1108.h
index 4499b453b684..3a69195ce519 100644
--- a/arch/arm/include/asm/arch-rockchip/cru_rv1108.h
+++ b/arch/arm/include/asm/arch-rockchip/cru_rv1108.h
@@ -9,6 +9,7 @@
 #ifndef __ASSEMBLY__
 #include <linux/bitops.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #endif
 
 #define OSC_HZ		(24 * 1000 * 1000)
diff --git a/arch/arm/include/asm/arch-rockchip/ddr_rk3188.h b/arch/arm/include/asm/arch-rockchip/ddr_rk3188.h
index c60655fcae01..be3d9d4d36bf 100644
--- a/arch/arm/include/asm/arch-rockchip/ddr_rk3188.h
+++ b/arch/arm/include/asm/arch-rockchip/ddr_rk3188.h
@@ -7,6 +7,7 @@
 #define _ASM_ARCH_DDR_RK3188_H
 
 #include <asm/arch-rockchip/ddr_rk3288.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 
 /*
diff --git a/arch/arm/include/asm/arch-rockchip/ddr_rk3288.h b/arch/arm/include/asm/arch-rockchip/ddr_rk3288.h
index ea3b6f48d907..312bdbc6de58 100644
--- a/arch/arm/include/asm/arch-rockchip/ddr_rk3288.h
+++ b/arch/arm/include/asm/arch-rockchip/ddr_rk3288.h
@@ -6,6 +6,7 @@
 #ifndef _ASM_ARCH_DDR_RK3288_H
 #define _ASM_ARCH_DDR_RK3288_H
 
+#include <asm/types.h>
 #include <linux/kernel.h>
 struct rk3288_ddr_pctl {
 	u32 scfg;
diff --git a/arch/arm/include/asm/arch-rockchip/ddr_rk3368.h b/arch/arm/include/asm/arch-rockchip/ddr_rk3368.h
index a03d3318e020..7ee787c526bf 100644
--- a/arch/arm/include/asm/arch-rockchip/ddr_rk3368.h
+++ b/arch/arm/include/asm/arch-rockchip/ddr_rk3368.h
@@ -7,6 +7,7 @@
 #define __ASM_ARCH_DDR_RK3368_H__
 
 #ifndef __ASSEMBLY__
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/kernel.h>
 #endif
diff --git a/arch/arm/include/asm/arch-rockchip/edp_rk3288.h b/arch/arm/include/asm/arch-rockchip/edp_rk3288.h
index 97383fce1904..d51094f1bfc4 100644
--- a/arch/arm/include/asm/arch-rockchip/edp_rk3288.h
+++ b/arch/arm/include/asm/arch-rockchip/edp_rk3288.h
@@ -7,6 +7,7 @@
 #ifndef _ASM_ARCH_EDP_H
 #define _ASM_ARCH_EDP_H
 
+#include <asm/types.h>
 #include <linux/kernel.h>
 struct rk3288_edp {
 	u8	res0[0x10];
diff --git a/arch/arm/include/asm/arch-rockchip/f_rockusb.h b/arch/arm/include/asm/arch-rockchip/f_rockusb.h
index 9772321023b3..46bcbf7fce44 100644
--- a/arch/arm/include/asm/arch-rockchip/f_rockusb.h
+++ b/arch/arm/include/asm/arch-rockchip/f_rockusb.h
@@ -8,6 +8,7 @@
 #ifndef _F_ROCKUSB_H_
 #define _F_ROCKUSB_H_
 #include <blk.h>
+#include <linux/types.h>
 
 #define ROCKUSB_VERSION		"0.1"
 
diff --git a/arch/arm/include/asm/arch-rockchip/gpio.h b/arch/arm/include/asm/arch-rockchip/gpio.h
index 0ec09d40b4ea..810b292329c4 100644
--- a/arch/arm/include/asm/arch-rockchip/gpio.h
+++ b/arch/arm/include/asm/arch-rockchip/gpio.h
@@ -6,6 +6,7 @@
 #ifndef _ASM_ARCH_GPIO_H
 #define _ASM_ARCH_GPIO_H
 
+#include <asm/types.h>
 #include <linux/kernel.h>
 struct rockchip_gpio_regs {
 	u32 swport_dr;
diff --git a/arch/arm/include/asm/arch-rockchip/grf_rk3188.h b/arch/arm/include/asm/arch-rockchip/grf_rk3188.h
index 8e80749a76e8..6899f652408d 100644
--- a/arch/arm/include/asm/arch-rockchip/grf_rk3188.h
+++ b/arch/arm/include/asm/arch-rockchip/grf_rk3188.h
@@ -6,6 +6,7 @@
 #ifndef _ASM_ARCH_GRF_RK3188_H
 #define _ASM_ARCH_GRF_RK3188_H
 
+#include <asm/types.h>
 #include <linux/kernel.h>
 struct rk3188_grf_gpio_lh {
 	u32 l;
diff --git a/arch/arm/include/asm/arch-rockchip/grf_rk3288.h b/arch/arm/include/asm/arch-rockchip/grf_rk3288.h
index 894d3a40b091..f30e3c05dc08 100644
--- a/arch/arm/include/asm/arch-rockchip/grf_rk3288.h
+++ b/arch/arm/include/asm/arch-rockchip/grf_rk3288.h
@@ -7,6 +7,7 @@
 #ifndef _ASM_ARCH_GRF_RK3288_H
 #define _ASM_ARCH_GRF_RK3288_H
 
+#include <asm/types.h>
 struct rk3288_grf_gpio_lh {
 	u32 l;
 	u32 h;
diff --git a/arch/arm/include/asm/arch-rockchip/grf_rk3328.h b/arch/arm/include/asm/arch-rockchip/grf_rk3328.h
index 663a3fa52e31..312f6f4193c3 100644
--- a/arch/arm/include/asm/arch-rockchip/grf_rk3328.h
+++ b/arch/arm/include/asm/arch-rockchip/grf_rk3328.h
@@ -6,6 +6,7 @@
 #ifndef __SOC_ROCKCHIP_RK3328_GRF_H__
 #define __SOC_ROCKCHIP_RK3328_GRF_H__
 
+#include <asm/types.h>
 #include <linux/kernel.h>
 struct rk3328_grf_regs {
 	u32 gpio0a_iomux;
diff --git a/arch/arm/include/asm/arch-rockchip/grf_rk3368.h b/arch/arm/include/asm/arch-rockchip/grf_rk3368.h
index 8e4b3ec481ca..62fd8792cfab 100644
--- a/arch/arm/include/asm/arch-rockchip/grf_rk3368.h
+++ b/arch/arm/include/asm/arch-rockchip/grf_rk3368.h
@@ -7,6 +7,7 @@
 #define _ASM_ARCH_GRF_RK3368_H
 
 #ifndef __ASSEMBLY__
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/kernel.h>
 #endif
diff --git a/arch/arm/include/asm/arch-rockchip/grf_rk3399.h b/arch/arm/include/asm/arch-rockchip/grf_rk3399.h
index 0a7249560f26..7d7708576edc 100644
--- a/arch/arm/include/asm/arch-rockchip/grf_rk3399.h
+++ b/arch/arm/include/asm/arch-rockchip/grf_rk3399.h
@@ -6,6 +6,7 @@
 #ifndef __SOC_ROCKCHIP_RK3399_GRF_H__
 #define __SOC_ROCKCHIP_RK3399_GRF_H__
 
+#include <asm/types.h>
 #include <linux/kernel.h>
 struct rk3399_grf_regs {
 	u32 reserved[0x800];
diff --git a/arch/arm/include/asm/arch-rockchip/grf_rv1108.h b/arch/arm/include/asm/arch-rockchip/grf_rv1108.h
index aefbe9b56e19..470e91c2970d 100644
--- a/arch/arm/include/asm/arch-rockchip/grf_rv1108.h
+++ b/arch/arm/include/asm/arch-rockchip/grf_rv1108.h
@@ -5,6 +5,7 @@
 #ifndef _ASM_ARCH_GRF_RV1108_H
 #define _ASM_ARCH_GRF_RV1108_H
 
+#include <asm/types.h>
 #include <linux/kernel.h>
 struct rv1108_grf {
 	u32 reserved[4];
diff --git a/arch/arm/include/asm/arch-rockchip/i2c.h b/arch/arm/include/asm/arch-rockchip/i2c.h
index b0e1936f608b..4da432372148 100644
--- a/arch/arm/include/asm/arch-rockchip/i2c.h
+++ b/arch/arm/include/asm/arch-rockchip/i2c.h
@@ -7,6 +7,7 @@
 #ifndef __ASM_ARCH_I2C_H
 #define __ASM_ARCH_I2C_H
 
+#include <asm/types.h>
 struct i2c_regs {
 	u32 con;
 	u32 clkdiv;
diff --git a/arch/arm/include/asm/arch-rockchip/misc.h b/arch/arm/include/asm/arch-rockchip/misc.h
index b6b03c934ed9..8689e3dadacd 100644
--- a/arch/arm/include/asm/arch-rockchip/misc.h
+++ b/arch/arm/include/asm/arch-rockchip/misc.h
@@ -6,6 +6,7 @@
  *      Rohan Garg <rohan.garg@collabora.com>
  */
 
+#include <asm/types.h>
 int rockchip_cpuid_from_efuse(const u32 cpuid_offset,
 			      const u32 cpuid_length,
 			      u8 *cpuid);
diff --git a/arch/arm/include/asm/arch-rockchip/pmu_rk3188.h b/arch/arm/include/asm/arch-rockchip/pmu_rk3188.h
index 6227dc0ed5ab..24de34758fbd 100644
--- a/arch/arm/include/asm/arch-rockchip/pmu_rk3188.h
+++ b/arch/arm/include/asm/arch-rockchip/pmu_rk3188.h
@@ -6,6 +6,7 @@
 #ifndef _ASM_ARCH_PMU_RK3188_H
 #define _ASM_ARCH_PMU_RK3188_H
 
+#include <asm/types.h>
 #include <linux/kernel.h>
 struct rk3188_pmu {
 	u32 wakeup_cfg[2];
diff --git a/arch/arm/include/asm/arch-rockchip/pmu_rk3288.h b/arch/arm/include/asm/arch-rockchip/pmu_rk3288.h
index 1b50cd5326e2..7574eb975c31 100644
--- a/arch/arm/include/asm/arch-rockchip/pmu_rk3288.h
+++ b/arch/arm/include/asm/arch-rockchip/pmu_rk3288.h
@@ -8,6 +8,7 @@
 #ifndef _ASM_ARCH_PMU_RK3288_H
 #define _ASM_ARCH_PMU_RK3288_H
 
+#include <asm/types.h>
 #include <linux/kernel.h>
 struct rk3288_pmu {
 	u32 wakeup_cfg[2];
diff --git a/arch/arm/include/asm/arch-rockchip/pmu_rk3399.h b/arch/arm/include/asm/arch-rockchip/pmu_rk3399.h
index 350559d5054c..0408683765ce 100644
--- a/arch/arm/include/asm/arch-rockchip/pmu_rk3399.h
+++ b/arch/arm/include/asm/arch-rockchip/pmu_rk3399.h
@@ -7,6 +7,7 @@
 #ifndef __SOC_ROCKCHIP_RK3399_PMU_H__
 #define __SOC_ROCKCHIP_RK3399_PMU_H__
 
+#include <asm/types.h>
 #include <linux/kernel.h>
 struct rk3399_pmu_regs {
 	u32 pmu_wakeup_cfg[5];
diff --git a/arch/arm/include/asm/arch-rockchip/sdram.h b/arch/arm/include/asm/arch-rockchip/sdram.h
index cf2a7b7d105f..e02fea9f4fa1 100644
--- a/arch/arm/include/asm/arch-rockchip/sdram.h
+++ b/arch/arm/include/asm/arch-rockchip/sdram.h
@@ -6,6 +6,7 @@
 #ifndef _ASM_ARCH_SDRAM_H
 #define _ASM_ARCH_SDRAM_H
 
+#include <linux/types.h>
 enum {
 	DDR4 = 0,
 	DDR3 = 0x3,
diff --git a/arch/arm/include/asm/arch-rockchip/sdram_common.h b/arch/arm/include/asm/arch-rockchip/sdram_common.h
index 5efa6e9445d5..6d8c93092f3a 100644
--- a/arch/arm/include/asm/arch-rockchip/sdram_common.h
+++ b/arch/arm/include/asm/arch-rockchip/sdram_common.h
@@ -10,6 +10,7 @@
 #define MHZ		(1000 * 1000)
 #endif
 
+#include <asm/types.h>
 #define PATTERN		(0x5aa5f00f)
 
 #define MIN(a, b)	(((a) > (b)) ? (b) : (a))
diff --git a/arch/arm/include/asm/arch-rockchip/sdram_msch.h b/arch/arm/include/asm/arch-rockchip/sdram_msch.h
index cfb3d9cc8698..9ae4d2715922 100644
--- a/arch/arm/include/asm/arch-rockchip/sdram_msch.h
+++ b/arch/arm/include/asm/arch-rockchip/sdram_msch.h
@@ -6,6 +6,7 @@
 #ifndef _ASM_ARCH_SDRAM_MSCH_H
 #define _ASM_ARCH_SDRAM_MSCH_H
 
+#include <asm/types.h>
 union noc_ddrtiminga0 {
 	u32 d32;
 	struct {
diff --git a/arch/arm/include/asm/arch-rockchip/sdram_pctl_px30.h b/arch/arm/include/asm/arch-rockchip/sdram_pctl_px30.h
index 3a3657789f6b..e48a6b87f737 100644
--- a/arch/arm/include/asm/arch-rockchip/sdram_pctl_px30.h
+++ b/arch/arm/include/asm/arch-rockchip/sdram_pctl_px30.h
@@ -8,6 +8,8 @@
 #include <asm/arch-rockchip/sdram_common.h>
 
 #ifndef __ASSEMBLY__
+#include <compiler.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #endif
 
diff --git a/arch/arm/include/asm/arch-rockchip/sdram_phy_px30.h b/arch/arm/include/asm/arch-rockchip/sdram_phy_px30.h
index a033a1853882..548f076ef76d 100644
--- a/arch/arm/include/asm/arch-rockchip/sdram_phy_px30.h
+++ b/arch/arm/include/asm/arch-rockchip/sdram_phy_px30.h
@@ -9,6 +9,8 @@
 #include <asm/arch-rockchip/sdram_phy_ron_rtt_px30.h>
 
 #ifndef __ASSEMBLY__
+#include <compiler.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #endif
 
diff --git a/arch/arm/include/asm/arch-rockchip/sdram_px30.h b/arch/arm/include/asm/arch-rockchip/sdram_px30.h
index 2ab8e97ae1df..2a4353976f1a 100644
--- a/arch/arm/include/asm/arch-rockchip/sdram_px30.h
+++ b/arch/arm/include/asm/arch-rockchip/sdram_px30.h
@@ -10,6 +10,7 @@
 #include <asm/arch-rockchip/sdram_pctl_px30.h>
 #include <asm/arch-rockchip/sdram_phy_px30.h>
 #include <asm/arch-rockchip/sdram_phy_ron_rtt_px30.h>
+#include <asm/types.h>
 
 #define SR_IDLE				93
 #define PD_IDLE				13
diff --git a/arch/arm/include/asm/arch-rockchip/sdram_rk3036.h b/arch/arm/include/asm/arch-rockchip/sdram_rk3036.h
index 7f89d7f92116..85a9f54e6d61 100644
--- a/arch/arm/include/asm/arch-rockchip/sdram_rk3036.h
+++ b/arch/arm/include/asm/arch-rockchip/sdram_rk3036.h
@@ -6,6 +6,7 @@
 #define _ASM_ARCH_SDRAM_RK3036_H
 
 #include <linux/kernel.h>
+#include <linux/types.h>
 struct rk3036_ddr_pctl {
 	u32 scfg;
 	u32 sctl;
diff --git a/arch/arm/include/asm/arch-rockchip/sdram_rk322x.h b/arch/arm/include/asm/arch-rockchip/sdram_rk322x.h
index 2aaf66c1ab0c..60c68f751a5b 100644
--- a/arch/arm/include/asm/arch-rockchip/sdram_rk322x.h
+++ b/arch/arm/include/asm/arch-rockchip/sdram_rk322x.h
@@ -6,6 +6,7 @@
 #define _ASM_ARCH_SDRAM_RK322X_H
 
 #ifndef __ASSEMBLY__
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/kernel.h>
 #endif
diff --git a/arch/arm/include/asm/arch-rockchip/sdram_rk3288.h b/arch/arm/include/asm/arch-rockchip/sdram_rk3288.h
index 9dede8068439..75a465c3c0da 100644
--- a/arch/arm/include/asm/arch-rockchip/sdram_rk3288.h
+++ b/arch/arm/include/asm/arch-rockchip/sdram_rk3288.h
@@ -8,6 +8,7 @@
 #ifndef _ASM_ARCH_RK3288_SDRAM_H__
 #define _ASM_ARCH_RK3288_SDRAM_H__
 
+#include <asm/types.h>
 #include <linux/kernel.h>
 struct rk3288_sdram_channel {
 	/*
diff --git a/arch/arm/include/asm/arch-rockchip/sdram_rk3328.h b/arch/arm/include/asm/arch-rockchip/sdram_rk3328.h
index 10923505d6e1..cfb07c646af1 100644
--- a/arch/arm/include/asm/arch-rockchip/sdram_rk3328.h
+++ b/arch/arm/include/asm/arch-rockchip/sdram_rk3328.h
@@ -10,6 +10,7 @@
 #include <asm/arch-rockchip/sdram_pctl_px30.h>
 #include <asm/arch-rockchip/sdram_phy_px30.h>
 #include <asm/arch-rockchip/sdram_phy_ron_rtt_px30.h>
+#include <asm/types.h>
 
 #define SR_IDLE		93
 #define PD_IDLE		13
diff --git a/arch/arm/include/asm/arch-rockchip/sdram_rk3399.h b/arch/arm/include/asm/arch-rockchip/sdram_rk3399.h
index c76372ee826a..6123cd2b9a56 100644
--- a/arch/arm/include/asm/arch-rockchip/sdram_rk3399.h
+++ b/arch/arm/include/asm/arch-rockchip/sdram_rk3399.h
@@ -8,6 +8,7 @@
 #include <asm/arch-rockchip/sdram_common.h>
 #include <asm/arch-rockchip/sdram_msch.h>
 #ifndef __ASSEMBLY__
+#include <asm/types.h>
 #include <linux/bitops.h>
 #endif
 
diff --git a/arch/arm/include/asm/arch-rockchip/timer.h b/arch/arm/include/asm/arch-rockchip/timer.h
index 77b542204476..befe0b66b403 100644
--- a/arch/arm/include/asm/arch-rockchip/timer.h
+++ b/arch/arm/include/asm/arch-rockchip/timer.h
@@ -6,6 +6,7 @@
 #ifndef __ASM_ARCH_TIMER_H
 #define __ASM_ARCH_TIMER_H
 
+#include <asm/types.h>
 struct rk_timer {
 	u32 timer_load_count0;
 	u32 timer_load_count1;
diff --git a/arch/arm/include/asm/arch-rockchip/vop_rk3288.h b/arch/arm/include/asm/arch-rockchip/vop_rk3288.h
index c1aab4219e4c..5e6fa4f32d7f 100644
--- a/arch/arm/include/asm/arch-rockchip/vop_rk3288.h
+++ b/arch/arm/include/asm/arch-rockchip/vop_rk3288.h
@@ -7,6 +7,7 @@
 #ifndef _ASM_ARCH_VOP_RK3288_H
 #define _ASM_ARCH_VOP_RK3288_H
 
+#include <asm/types.h>
 #include <linux/kernel.h>
 struct rk3288_vop {
 	u32 reg_cfg_done;
diff --git a/arch/arm/include/asm/arch-s32v234/lpddr2.h b/arch/arm/include/asm/arch-s32v234/lpddr2.h
index c5efee5b75d0..6b215738ec23 100644
--- a/arch/arm/include/asm/arch-s32v234/lpddr2.h
+++ b/arch/arm/include/asm/arch-s32v234/lpddr2.h
@@ -7,6 +7,7 @@
 #define __ARCH_ARM_MACH_S32V234_LPDDR2_H__
 
 /* definitions for LPDDR2 PAD values */
+#include <linux/types.h>
 #define LPDDR2_CLK0_PAD	\
 	(SIUL2_MSCR_DDR_SEL_LPDDR2 | SIUL2_MSCR_DDR_INPUT_DIFF_DDR | SIUL2_MSCR_DDR_ODT_120ohm |\
 	 SIUL2_MSCR_DSE_48ohm | SIUL2_MSCR_PUS_100K_UP | SIUL2_MSCR_CRPOINT_TRIM_1 |			\
diff --git a/arch/arm/include/asm/arch-spear/gpio.h b/arch/arm/include/asm/arch-spear/gpio.h
index 4c8c40b1c997..69a1fd0d9e21 100644
--- a/arch/arm/include/asm/arch-spear/gpio.h
+++ b/arch/arm/include/asm/arch-spear/gpio.h
@@ -7,6 +7,7 @@
 #ifndef __ASM_ARCH_SPEAR_GPIO_H
 #define __ASM_ARCH_SPEAR_GPIO_H
 
+#include <asm/types.h>
 enum gpio_direction {
 	GPIO_DIRECTION_IN,
 	GPIO_DIRECTION_OUT,
diff --git a/arch/arm/include/asm/arch-spear/spr_defs.h b/arch/arm/include/asm/arch-spear/spr_defs.h
index d09e7eb63a47..1a37dd72efa6 100644
--- a/arch/arm/include/asm/arch-spear/spr_defs.h
+++ b/arch/arm/include/asm/arch-spear/spr_defs.h
@@ -7,6 +7,7 @@
 #ifndef __SPR_DEFS_H__
 #define __SPR_DEFS_H__
 
+#include <linux/types.h>
 extern int spear_board_init(ulong);
 extern void setfreq(unsigned int, unsigned int);
 extern unsigned int setfreq_sz;
diff --git a/arch/arm/include/asm/arch-spear/spr_emi.h b/arch/arm/include/asm/arch-spear/spr_emi.h
index 7b1cf35d3ab8..1667929de29a 100644
--- a/arch/arm/include/asm/arch-spear/spr_emi.h
+++ b/arch/arm/include/asm/arch-spear/spr_emi.h
@@ -34,4 +34,5 @@ struct emi_regs {
 
 #endif
 
+#include <asm/types.h>
 #endif
diff --git a/arch/arm/include/asm/arch-spear/spr_gpt.h b/arch/arm/include/asm/arch-spear/spr_gpt.h
index dced0a17a62b..cb63e314b57c 100644
--- a/arch/arm/include/asm/arch-spear/spr_gpt.h
+++ b/arch/arm/include/asm/arch-spear/spr_gpt.h
@@ -7,6 +7,7 @@
 #ifndef _SPR_GPT_H
 #define _SPR_GPT_H
 
+#include <asm/types.h>
 struct gpt_regs {
 	u8 reserved[0x80];
 	u32 control;
diff --git a/arch/arm/include/asm/arch-spear/spr_misc.h b/arch/arm/include/asm/arch-spear/spr_misc.h
index 017111935193..a177d69c7fb7 100644
--- a/arch/arm/include/asm/arch-spear/spr_misc.h
+++ b/arch/arm/include/asm/arch-spear/spr_misc.h
@@ -7,6 +7,7 @@
 #ifndef _SPR_MISC_H
 #define _SPR_MISC_H
 
+#include <linux/types.h>
 struct misc_regs {
 	u32 auto_cfg_reg;	/* 0x0 */
 	u32 armdbg_ctr_reg;	/* 0x4 */
diff --git a/arch/arm/include/asm/arch-spear/spr_ssp.h b/arch/arm/include/asm/arch-spear/spr_ssp.h
index 088d34b405ea..48344f6b9f26 100644
--- a/arch/arm/include/asm/arch-spear/spr_ssp.h
+++ b/arch/arm/include/asm/arch-spear/spr_ssp.h
@@ -6,6 +6,7 @@
 #ifndef _SPR_SSP_H
 #define _SPR_SSP_H
 
+#include <asm/types.h>
 struct ssp_regs {
 	u32 sspcr0;
 	u32 sspcr1;
diff --git a/arch/arm/include/asm/arch-spear/spr_syscntl.h b/arch/arm/include/asm/arch-spear/spr_syscntl.h
index 6a83d87d1340..d4b259e3fae9 100644
--- a/arch/arm/include/asm/arch-spear/spr_syscntl.h
+++ b/arch/arm/include/asm/arch-spear/spr_syscntl.h
@@ -7,6 +7,7 @@
 #ifndef __SYSCTRL_H
 #define __SYSCTRL_H
 
+#include <asm/types.h>
 struct syscntl_regs {
 	u32 scctrl;
 	u32 scsysstat;
diff --git a/arch/arm/include/asm/arch-stm32/gpio.h b/arch/arm/include/asm/arch-stm32/gpio.h
index 570e80a6ba80..1b4f560ba701 100644
--- a/arch/arm/include/asm/arch-stm32/gpio.h
+++ b/arch/arm/include/asm/arch-stm32/gpio.h
@@ -7,6 +7,7 @@
 #ifndef _GPIO_H_
 #define _GPIO_H_
 
+#include <asm/types.h>
 #define STM32_GPIOS_PER_BANK		16
 
 enum stm32_gpio_port {
diff --git a/arch/arm/include/asm/arch-stm32f4/stm32.h b/arch/arm/include/asm/arch-stm32f4/stm32.h
index 2094bd732123..74ee7130fb8c 100644
--- a/arch/arm/include/asm/arch-stm32f4/stm32.h
+++ b/arch/arm/include/asm/arch-stm32f4/stm32.h
@@ -11,6 +11,7 @@
 #define _MACH_STM32_H_
 
 #include <asm/arch-stm32/stm32f.h>
+#include <asm/types.h>
 
 /*
  * Peripheral memory map
diff --git a/arch/arm/include/asm/arch-stm32f4/stm32_pwr.h b/arch/arm/include/asm/arch-stm32f4/stm32_pwr.h
index 8af6de220d8b..a199b4ec53e7 100644
--- a/arch/arm/include/asm/arch-stm32f4/stm32_pwr.h
+++ b/arch/arm/include/asm/arch-stm32f4/stm32_pwr.h
@@ -8,6 +8,7 @@
 #define __STM32_PWR_H_
 
 #ifndef __ASSEMBLY__
+#include <asm/types.h>
 #include <linux/bitops.h>
 #endif
 
diff --git a/arch/arm/include/asm/arch-stm32f7/stm32.h b/arch/arm/include/asm/arch-stm32f7/stm32.h
index 3451e74a3d0e..83893393f407 100644
--- a/arch/arm/include/asm/arch-stm32f7/stm32.h
+++ b/arch/arm/include/asm/arch-stm32f7/stm32.h
@@ -8,6 +8,7 @@
 #define _ASM_ARCH_HARDWARE_H
 
 #include <asm/arch-stm32/stm32f.h>
+#include <asm/types.h>
 
 static const u32 sect_sz_kb[CONFIG_SYS_MAX_FLASH_SECT] = {
 	[0 ... 3] =	32 * 1024,
diff --git a/arch/arm/include/asm/arch-stm32f7/stm32_pwr.h b/arch/arm/include/asm/arch-stm32f7/stm32_pwr.h
index 02faaeb663cd..fe244e7ed5c6 100644
--- a/arch/arm/include/asm/arch-stm32f7/stm32_pwr.h
+++ b/arch/arm/include/asm/arch-stm32f7/stm32_pwr.h
@@ -8,6 +8,7 @@
 #define __STM32_PWR_H_
 
 #ifndef __ASSEMBLY__
+#include <asm/types.h>
 #include <linux/bitops.h>
 #endif
 
diff --git a/arch/arm/include/asm/arch-stm32f7/syscfg.h b/arch/arm/include/asm/arch-stm32f7/syscfg.h
index 985ae2544deb..c1f7ebeb7b9b 100644
--- a/arch/arm/include/asm/arch-stm32f7/syscfg.h
+++ b/arch/arm/include/asm/arch-stm32f7/syscfg.h
@@ -8,6 +8,7 @@
 #define _STM32_SYSCFG_H
 
 #ifndef __ASSEMBLY__
+#include <asm/types.h>
 #include <linux/bitops.h>
 #endif
 
diff --git a/arch/arm/include/asm/arch-stv0991/gpio.h b/arch/arm/include/asm/arch-stv0991/gpio.h
index b27f4078582c..0dd9f8f0fdf8 100644
--- a/arch/arm/include/asm/arch-stv0991/gpio.h
+++ b/arch/arm/include/asm/arch-stv0991/gpio.h
@@ -7,6 +7,7 @@
 #ifndef __ASM_ARCH_STV0991_GPIO_H
 #define __ASM_ARCH_STV0991_GPIO_H
 
+#include <asm/types.h>
 enum gpio_direction {
 	GPIO_DIRECTION_IN,
 	GPIO_DIRECTION_OUT,
diff --git a/arch/arm/include/asm/arch-stv0991/stv0991_cgu.h b/arch/arm/include/asm/arch-stv0991/stv0991_cgu.h
index df9dd54e5a85..81c80dc2afb3 100644
--- a/arch/arm/include/asm/arch-stv0991/stv0991_cgu.h
+++ b/arch/arm/include/asm/arch-stv0991/stv0991_cgu.h
@@ -7,6 +7,7 @@
 #ifndef _STV0991_CGU_H
 #define _STV0991_CGU_H
 
+#include <asm/types.h>
 struct stv0991_cgu_regs {
 	u32 cpu_freq;		/* offset 0x0 */
 	u32 icn2_freq;		/* offset 0x4 */
diff --git a/arch/arm/include/asm/arch-stv0991/stv0991_creg.h b/arch/arm/include/asm/arch-stv0991/stv0991_creg.h
index 4d444a6df16c..ed6ebbfbff9a 100644
--- a/arch/arm/include/asm/arch-stv0991/stv0991_creg.h
+++ b/arch/arm/include/asm/arch-stv0991/stv0991_creg.h
@@ -7,6 +7,7 @@
 #ifndef _STV0991_CREG_H
 #define _STV0991_CREG_H
 
+#include <asm/types.h>
 struct stv0991_creg {
 	u32 version;		/* offset 0x0 */
 	u32 hdpctl;		/* offset 0x4 */
diff --git a/arch/arm/include/asm/arch-stv0991/stv0991_gpt.h b/arch/arm/include/asm/arch-stv0991/stv0991_gpt.h
index cd27472ad7e1..0dbc88db1d8e 100644
--- a/arch/arm/include/asm/arch-stv0991/stv0991_gpt.h
+++ b/arch/arm/include/asm/arch-stv0991/stv0991_gpt.h
@@ -8,6 +8,7 @@
 #define _STV0991_GPT_H
 
 #include <asm/arch-stv0991/hardware.h>
+#include <asm/types.h>
 
 struct gpt_regs {
 	u32 cr1;
diff --git a/arch/arm/include/asm/arch-stv0991/stv0991_wdru.h b/arch/arm/include/asm/arch-stv0991/stv0991_wdru.h
index 8cb8a8a61375..b90fa1cd5a25 100644
--- a/arch/arm/include/asm/arch-stv0991/stv0991_wdru.h
+++ b/arch/arm/include/asm/arch-stv0991/stv0991_wdru.h
@@ -7,6 +7,7 @@
 #ifndef _STV0991_WD_RST_H
 #define _STV0991_WD_RST_H
 #include <asm/arch-stv0991/hardware.h>
+#include <asm/types.h>
 
 struct stv0991_wd_ru {
 	u32 wdru_config;
diff --git a/arch/arm/include/asm/arch-sunxi/ccu.h b/arch/arm/include/asm/arch-sunxi/ccu.h
index cac5c5faf056..161fbd0eabe2 100644
--- a/arch/arm/include/asm/arch-sunxi/ccu.h
+++ b/arch/arm/include/asm/arch-sunxi/ccu.h
@@ -9,6 +9,7 @@
 
 #ifndef __ASSEMBLY__
 #include <linux/bitops.h>
+#include <linux/types.h>
 #endif
 
 /**
diff --git a/arch/arm/include/asm/arch-sunxi/clock_sun4i.h b/arch/arm/include/asm/arch-sunxi/clock_sun4i.h
index 2cec91cb20e5..67d84f60bb68 100644
--- a/arch/arm/include/asm/arch-sunxi/clock_sun4i.h
+++ b/arch/arm/include/asm/arch-sunxi/clock_sun4i.h
@@ -352,6 +352,7 @@ struct sunxi_ccm_reg {
 #define CCM_DE_CTRL_GATE		(1 << 31)
 
 #ifndef __ASSEMBLY__
+#include <asm/types.h>
 void clock_set_pll1(unsigned int hz);
 void clock_set_pll3(unsigned int hz);
 unsigned int clock_get_pll3(void);
diff --git a/arch/arm/include/asm/arch-sunxi/clock_sun50i_h6.h b/arch/arm/include/asm/arch-sunxi/clock_sun50i_h6.h
index 426069fc69a4..1c4a8bc589fe 100644
--- a/arch/arm/include/asm/arch-sunxi/clock_sun50i_h6.h
+++ b/arch/arm/include/asm/arch-sunxi/clock_sun50i_h6.h
@@ -10,6 +10,7 @@
 #define _SUNXI_CLOCK_SUN50I_H6_H
 
 #ifndef __ASSEMBLY__
+#include <asm/types.h>
 #include <linux/bitops.h>
 #endif
 
diff --git a/arch/arm/include/asm/arch-sunxi/clock_sun6i.h b/arch/arm/include/asm/arch-sunxi/clock_sun6i.h
index 3c3ebfd3a201..cf2f5bfcee9a 100644
--- a/arch/arm/include/asm/arch-sunxi/clock_sun6i.h
+++ b/arch/arm/include/asm/arch-sunxi/clock_sun6i.h
@@ -519,6 +519,7 @@ struct sunxi_ccm_reg {
 #define CCM_SEC_SWITCH_PLL_NONSEC	(1 << 0)
 
 #ifndef __ASSEMBLY__
+#include <asm/types.h>
 void clock_set_pll1(unsigned int hz);
 void clock_set_pll3(unsigned int hz);
 void clock_set_pll3_factors(int m, int n);
diff --git a/arch/arm/include/asm/arch-sunxi/clock_sun8i_a83t.h b/arch/arm/include/asm/arch-sunxi/clock_sun8i_a83t.h
index 14df3cc8f46b..7c6f14f49cdc 100644
--- a/arch/arm/include/asm/arch-sunxi/clock_sun8i_a83t.h
+++ b/arch/arm/include/asm/arch-sunxi/clock_sun8i_a83t.h
@@ -297,6 +297,7 @@ struct sunxi_ccm_reg {
 
 
 #ifndef __ASSEMBLY__
+#include <asm/types.h>
 void clock_set_pll1(unsigned int hz);
 void clock_set_pll5(unsigned int clk);
 unsigned int clock_get_pll6(void);
diff --git a/arch/arm/include/asm/arch-sunxi/clock_sun9i.h b/arch/arm/include/asm/arch-sunxi/clock_sun9i.h
index fe6b8ba27328..6b990940d6a9 100644
--- a/arch/arm/include/asm/arch-sunxi/clock_sun9i.h
+++ b/arch/arm/include/asm/arch-sunxi/clock_sun9i.h
@@ -9,6 +9,7 @@
 #define _SUNXI_CLOCK_SUN9I_H
 
 #ifndef __ASSEMBLY__
+#include <asm/types.h>
 #include <linux/bitops.h>
 #endif
 
diff --git a/arch/arm/include/asm/arch-sunxi/cpucfg.h b/arch/arm/include/asm/arch-sunxi/cpucfg.h
index 4aaebe0a9761..a5911e77a7a6 100644
--- a/arch/arm/include/asm/arch-sunxi/cpucfg.h
+++ b/arch/arm/include/asm/arch-sunxi/cpucfg.h
@@ -13,6 +13,7 @@
 
 #ifndef __ASSEMBLY__
 
+#include <compiler.h>
 struct __packed sunxi_cpucfg_cpu {
 	u32 rst;		/* base + 0x0 */
 	u32 ctrl;		/* base + 0x4 */
diff --git a/arch/arm/include/asm/arch-sunxi/display.h b/arch/arm/include/asm/arch-sunxi/display.h
index 525f9cb839d2..87a9237cc7f7 100644
--- a/arch/arm/include/asm/arch-sunxi/display.h
+++ b/arch/arm/include/asm/arch-sunxi/display.h
@@ -8,6 +8,7 @@
 #ifndef _SUNXI_DISPLAY_H
 #define _SUNXI_DISPLAY_H
 
+#include <asm/types.h>
 struct sunxi_de_fe_reg {
 	u32 enable;			/* 0x000 */
 	u32 frame_ctrl;			/* 0x004 */
diff --git a/arch/arm/include/asm/arch-sunxi/display2.h b/arch/arm/include/asm/arch-sunxi/display2.h
index 7202d2756cf5..d7912aa8c7f6 100644
--- a/arch/arm/include/asm/arch-sunxi/display2.h
+++ b/arch/arm/include/asm/arch-sunxi/display2.h
@@ -13,6 +13,7 @@
 #define _SUNXI_DISPLAY2_H
 
 /* internal clock settings */
+#include <asm/types.h>
 struct de_clk {
 	u32 gate_cfg;
 	u32 bus_cfg;
diff --git a/arch/arm/include/asm/arch-sunxi/dma_sun4i.h b/arch/arm/include/asm/arch-sunxi/dma_sun4i.h
index 309dc4f7cfd6..bcf4ecf3c510 100644
--- a/arch/arm/include/asm/arch-sunxi/dma_sun4i.h
+++ b/arch/arm/include/asm/arch-sunxi/dma_sun4i.h
@@ -6,6 +6,7 @@
 #ifndef _SUNXI_DMA_SUN4I_H
 #define _SUNXI_DMA_SUN4I_H
 
+#include <asm/types.h>
 struct sunxi_dma_cfg
 {
 	u32 ctl;		/* 0x00 Control */
diff --git a/arch/arm/include/asm/arch-sunxi/dram_sun4i.h b/arch/arm/include/asm/arch-sunxi/dram_sun4i.h
index 69c6600e9817..8881a9721f1b 100644
--- a/arch/arm/include/asm/arch-sunxi/dram_sun4i.h
+++ b/arch/arm/include/asm/arch-sunxi/dram_sun4i.h
@@ -11,6 +11,7 @@
 #ifndef _SUNXI_DRAM_SUN4I_H
 #define _SUNXI_DRAM_SUN4I_H
 
+#include <asm/types.h>
 struct sunxi_dram_reg {
 	u32 ccr;		/* 0x00 controller configuration register */
 	u32 dcr;		/* 0x04 dram configuration register */
diff --git a/arch/arm/include/asm/arch-sunxi/dram_sun50i_h6.h b/arch/arm/include/asm/arch-sunxi/dram_sun50i_h6.h
index ddaa238c279f..a524ac72d27b 100644
--- a/arch/arm/include/asm/arch-sunxi/dram_sun50i_h6.h
+++ b/arch/arm/include/asm/arch-sunxi/dram_sun50i_h6.h
@@ -11,6 +11,7 @@
 
 #include <stdbool.h>
 #ifndef __ASSEMBLY__
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/kernel.h>
 #endif
diff --git a/arch/arm/include/asm/arch-sunxi/dram_sun6i.h b/arch/arm/include/asm/arch-sunxi/dram_sun6i.h
index b66d58cd73b6..b5392faa6898 100644
--- a/arch/arm/include/asm/arch-sunxi/dram_sun6i.h
+++ b/arch/arm/include/asm/arch-sunxi/dram_sun6i.h
@@ -14,6 +14,7 @@
 #define _SUNXI_DRAM_SUN6I_H
 
 #ifndef __ASSEMBLY__
+#include <asm/types.h>
 #include <linux/bitops.h>
 #endif
 
diff --git a/arch/arm/include/asm/arch-sunxi/dram_sun8i_a23.h b/arch/arm/include/asm/arch-sunxi/dram_sun8i_a23.h
index ca98597f1f87..611f881467e8 100644
--- a/arch/arm/include/asm/arch-sunxi/dram_sun8i_a23.h
+++ b/arch/arm/include/asm/arch-sunxi/dram_sun8i_a23.h
@@ -13,6 +13,7 @@
 #ifndef _SUNXI_DRAM_SUN8I_H
 #define _SUNXI_DRAM_SUN8I_H
 
+#include <asm/types.h>
 struct dram_para {
 	u32 clock;
 	u32 type;
diff --git a/arch/arm/include/asm/arch-sunxi/dram_sun8i_a33.h b/arch/arm/include/asm/arch-sunxi/dram_sun8i_a33.h
index 3f65306cc68a..d66d933db3be 100644
--- a/arch/arm/include/asm/arch-sunxi/dram_sun8i_a33.h
+++ b/arch/arm/include/asm/arch-sunxi/dram_sun8i_a33.h
@@ -12,6 +12,7 @@
 #define _SUNXI_DRAM_SUN8I_A33_H
 
 #ifndef __ASSEMBLY__
+#include <asm/types.h>
 #include <linux/bitops.h>
 #endif
 
diff --git a/arch/arm/include/asm/arch-sunxi/dram_sun8i_a83t.h b/arch/arm/include/asm/arch-sunxi/dram_sun8i_a83t.h
index 2a8799635473..afc128ce80fd 100644
--- a/arch/arm/include/asm/arch-sunxi/dram_sun8i_a83t.h
+++ b/arch/arm/include/asm/arch-sunxi/dram_sun8i_a83t.h
@@ -12,6 +12,7 @@
 #define _SUNXI_DRAM_SUN8I_A83T_H
 
 #ifndef __ASSEMBLY__
+#include <asm/types.h>
 #include <linux/bitops.h>
 #endif
 
diff --git a/arch/arm/include/asm/arch-sunxi/dram_sun9i.h b/arch/arm/include/asm/arch-sunxi/dram_sun9i.h
index 41df5fe5b6f9..21f8f6613710 100644
--- a/arch/arm/include/asm/arch-sunxi/dram_sun9i.h
+++ b/arch/arm/include/asm/arch-sunxi/dram_sun9i.h
@@ -12,6 +12,7 @@
 #define _SUNXI_DRAM_SUN9I_H
 
 #ifndef __ASSEMBLY__
+#include <asm/types.h>
 #include <linux/bitops.h>
 #endif
 
diff --git a/arch/arm/include/asm/arch-sunxi/dram_sunxi_dw.h b/arch/arm/include/asm/arch-sunxi/dram_sunxi_dw.h
index 3420f939f243..8fc2c12c6e4b 100644
--- a/arch/arm/include/asm/arch-sunxi/dram_sunxi_dw.h
+++ b/arch/arm/include/asm/arch-sunxi/dram_sunxi_dw.h
@@ -14,6 +14,7 @@
 
 #include <linux/bitops.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 struct sunxi_mctl_com_reg {
 	u32 cr;			/* 0x00 control register */
diff --git a/arch/arm/include/asm/arch-sunxi/lcdc.h b/arch/arm/include/asm/arch-sunxi/lcdc.h
index 7fca301df964..a971de332050 100644
--- a/arch/arm/include/asm/arch-sunxi/lcdc.h
+++ b/arch/arm/include/asm/arch-sunxi/lcdc.h
@@ -11,6 +11,7 @@
 
 #include <fdtdec.h>
 #include <stdbool.h>
+#include <asm/types.h>
 
 struct sunxi_lcdc_reg {
 	u32 ctrl;			/* 0x00 */
diff --git a/arch/arm/include/asm/arch-sunxi/prcm.h b/arch/arm/include/asm/arch-sunxi/prcm.h
index 767d1ff98d74..43a7a532ea96 100644
--- a/arch/arm/include/asm/arch-sunxi/prcm.h
+++ b/arch/arm/include/asm/arch-sunxi/prcm.h
@@ -200,6 +200,7 @@
 #define PRCM_SEC_SWITCH_PWR_GATE_NONSEC (0x1 << 2)
 
 #ifndef __ASSEMBLY__
+#include <asm/types.h>
 #include <linux/compiler.h>
 
 struct sunxi_prcm_reg {
diff --git a/arch/arm/include/asm/arch-sunxi/pwm.h b/arch/arm/include/asm/arch-sunxi/pwm.h
index b89bddd2e898..15e8381b5aca 100644
--- a/arch/arm/include/asm/arch-sunxi/pwm.h
+++ b/arch/arm/include/asm/arch-sunxi/pwm.h
@@ -7,6 +7,7 @@
 #define _SUNXI_PWM_H
 
 #ifndef __ASSEMBLY__
+#include <asm/types.h>
 #include <linux/bitops.h>
 #endif
 
diff --git a/arch/arm/include/asm/arch-sunxi/rsb.h b/arch/arm/include/asm/arch-sunxi/rsb.h
index 8c64a995f255..1fab543dce49 100644
--- a/arch/arm/include/asm/arch-sunxi/rsb.h
+++ b/arch/arm/include/asm/arch-sunxi/rsb.h
@@ -12,6 +12,7 @@
 #define __SUNXI_RSB_H
 
 #include <asm/io.h>
+#include <asm/types.h>
 
 struct sunxi_rsb_reg {
 	u32 ctrl;	/* 0x00 */
diff --git a/arch/arm/include/asm/arch-sunxi/spl.h b/arch/arm/include/asm/arch-sunxi/spl.h
index 8c916e8c7529..de1a9c21d3fa 100644
--- a/arch/arm/include/asm/arch-sunxi/spl.h
+++ b/arch/arm/include/asm/arch-sunxi/spl.h
@@ -7,6 +7,7 @@
 #ifndef	_ASM_ARCH_SPL_H_
 #define	_ASM_ARCH_SPL_H_
 
+#include <linux/types.h>
 #define BOOT0_MAGIC		"eGON.BT0"
 #define SPL_SIGNATURE		"SPL" /* marks "sunxi" SPL header */
 #define SPL_MAJOR_BITS		3
diff --git a/arch/arm/include/asm/arch-sunxi/tve.h b/arch/arm/include/asm/arch-sunxi/tve.h
index 46cd87e79e8d..109e46bf455e 100644
--- a/arch/arm/include/asm/arch-sunxi/tve.h
+++ b/arch/arm/include/asm/arch-sunxi/tve.h
@@ -9,6 +9,7 @@
 #ifndef _TVE_H
 #define _TVE_H
 
+#include <asm/types.h>
 enum tve_mode {
 	tve_mode_vga,
 	tve_mode_composite_pal,
diff --git a/arch/arm/include/asm/arch-sunxi/tzpc.h b/arch/arm/include/asm/arch-sunxi/tzpc.h
index 7a6fcaebdb51..6a94083ae037 100644
--- a/arch/arm/include/asm/arch-sunxi/tzpc.h
+++ b/arch/arm/include/asm/arch-sunxi/tzpc.h
@@ -7,6 +7,7 @@
 #define _SUNXI_TZPC_H
 
 #ifndef __ASSEMBLY__
+#include <asm/types.h>
 struct sunxi_tzpc {
 	u32 r0size;		/* 0x00 Size of secure RAM region */
 	u32 decport0_status;	/* 0x04 Status of decode protection port 0 */
diff --git a/arch/arm/include/asm/arch-sunxi/watchdog.h b/arch/arm/include/asm/arch-sunxi/watchdog.h
index 38e2ef2aca3d..c30bb276ae95 100644
--- a/arch/arm/include/asm/arch-sunxi/watchdog.h
+++ b/arch/arm/include/asm/arch-sunxi/watchdog.h
@@ -9,6 +9,7 @@
 #ifndef _SUNXI_WATCHDOG_H_
 #define _SUNXI_WATCHDOG_H_
 
+#include <asm/types.h>
 #define WDT_CTRL_RESTART	(0x1 << 0)
 #define WDT_CTRL_KEY		(0x0a57 << 1)
 
diff --git a/arch/arm/include/asm/arch-tegra/apb_misc.h b/arch/arm/include/asm/arch-tegra/apb_misc.h
index d438966afbe5..af98f984c9f9 100644
--- a/arch/arm/include/asm/arch-tegra/apb_misc.h
+++ b/arch/arm/include/asm/arch-tegra/apb_misc.h
@@ -7,6 +7,7 @@
 #define _GP_PADCTRL_H_
 
 /* APB_MISC_PP registers */
+#include <asm/types.h>
 struct apb_misc_pp_ctlr {
 	u32	reserved0[2];
 	u32	strapping_opt_a;/* 0x08: APB_MISC_PP_STRAPPING_OPT_A */
diff --git a/arch/arm/include/asm/arch-tegra/bpmp_abi.h b/arch/arm/include/asm/arch-tegra/bpmp_abi.h
index 373da526ed6d..599982a5f022 100644
--- a/arch/arm/include/asm/arch-tegra/bpmp_abi.h
+++ b/arch/arm/include/asm/arch-tegra/bpmp_abi.h
@@ -73,6 +73,7 @@
  *
  * @todo document the flags
  */
+#include <linux/types.h>
 struct mrq_request {
 	/** @brief MRQ number of the request */
 	uint32_t mrq;
diff --git a/arch/arm/include/asm/arch-tegra/cboot.h b/arch/arm/include/asm/arch-tegra/cboot.h
index d89e784f2d26..03ba29859bde 100644
--- a/arch/arm/include/asm/arch-tegra/cboot.h
+++ b/arch/arm/include/asm/arch-tegra/cboot.h
@@ -8,6 +8,7 @@
 
 #include <net.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_ARM64
 
diff --git a/arch/arm/include/asm/arch-tegra/clk_rst.h b/arch/arm/include/asm/arch-tegra/clk_rst.h
index 2359e142fb7f..7771dc5cbee6 100644
--- a/arch/arm/include/asm/arch-tegra/clk_rst.h
+++ b/arch/arm/include/asm/arch-tegra/clk_rst.h
@@ -8,6 +8,7 @@
 #define _TEGRA_CLK_RST_H_
 
 /* PLL registers - there are several PLLs in the clock controller */
+#include <linux/types.h>
 struct clk_pll {
 	uint pll_base;		/* the control register */
 	/* pll_out[0] is output A control, pll_out[1] is output B control */
diff --git a/arch/arm/include/asm/arch-tegra/clock.h b/arch/arm/include/asm/arch-tegra/clock.h
index 630287c1b780..cd35095cb109 100644
--- a/arch/arm/include/asm/arch-tegra/clock.h
+++ b/arch/arm/include/asm/arch-tegra/clock.h
@@ -8,6 +8,7 @@
 #ifndef _TEGRA_CLOCK_H_
 #define _TEGRA_CLOCK_H_
 
+#include <linux/types.h>
 struct udevice;
 
 /* Set of oscillator frequencies supported in the internal API. */
diff --git a/arch/arm/include/asm/arch-tegra/dc.h b/arch/arm/include/asm/arch-tegra/dc.h
index 6444af2993a0..d8a079e3221f 100644
--- a/arch/arm/include/asm/arch-tegra/dc.h
+++ b/arch/arm/include/asm/arch-tegra/dc.h
@@ -9,6 +9,7 @@
 
 #ifndef __ASSEMBLY__
 #include <linux/bitops.h>
+#include <linux/types.h>
 #endif
 
 /* Register definitions for the Tegra display controller */
diff --git a/arch/arm/include/asm/arch-tegra/fuse.h b/arch/arm/include/asm/arch-tegra/fuse.h
index 5b8e0bd8d16c..e2412d0676fc 100644
--- a/arch/arm/include/asm/arch-tegra/fuse.h
+++ b/arch/arm/include/asm/arch-tegra/fuse.h
@@ -8,6 +8,7 @@
 #define _FUSE_H_
 
 /* FUSE registers */
+#include <asm/types.h>
 struct fuse_regs {
 	u32 reserved0[64];		/* 0x00 - 0xFC: */
 	u32 production_mode;		/* 0x100: FUSE_PRODUCTION_MODE */
diff --git a/arch/arm/include/asm/arch-tegra/gpio.h b/arch/arm/include/asm/arch-tegra/gpio.h
index fe7b3a50e0d9..15384670c950 100644
--- a/arch/arm/include/asm/arch-tegra/gpio.h
+++ b/arch/arm/include/asm/arch-tegra/gpio.h
@@ -6,6 +6,7 @@
 #ifndef _TEGRA_GPIO_H_
 #define _TEGRA_GPIO_H_
 
+#include <asm/types.h>
 #include <dt-bindings/gpio/tegra-gpio.h>
 
 #define TEGRA_GPIOS_PER_PORT	8
diff --git a/arch/arm/include/asm/arch-tegra/ivc.h b/arch/arm/include/asm/arch-tegra/ivc.h
index 52c10b8fab3e..4f0e6a1300ab 100644
--- a/arch/arm/include/asm/arch-tegra/ivc.h
+++ b/arch/arm/include/asm/arch-tegra/ivc.h
@@ -28,6 +28,7 @@
  */
 
 /**
+#include <linux/types.h>
  * struct tegra_ivc - In-memory shared memory layout.
  *
  * This is described in detail in ivc.c.
diff --git a/arch/arm/include/asm/arch-tegra/pmc.h b/arch/arm/include/asm/arch-tegra/pmc.h
index e1f5a7381357..e4ab21552a87 100644
--- a/arch/arm/include/asm/arch-tegra/pmc.h
+++ b/arch/arm/include/asm/arch-tegra/pmc.h
@@ -9,6 +9,7 @@
 
 #ifndef __ASSEMBLY__
 #include <linux/bitops.h>
+#include <linux/types.h>
 #endif
 
 /* Power Management Controller (APBDEV_PMC_) registers */
diff --git a/arch/arm/include/asm/arch-tegra/pwm.h b/arch/arm/include/asm/arch-tegra/pwm.h
index eebd104de9d6..77de14782939 100644
--- a/arch/arm/include/asm/arch-tegra/pwm.h
+++ b/arch/arm/include/asm/arch-tegra/pwm.h
@@ -9,6 +9,7 @@
 #define __ASM_ARCH_TEGRA_PWM_H
 
 /* This is a single PWM channel */
+#include <linux/types.h>
 struct pwm_ctlr {
 	uint control;		/* Control register */
 	uint reserved[3];	/* Space space */
diff --git a/arch/arm/include/asm/arch-tegra/scu.h b/arch/arm/include/asm/arch-tegra/scu.h
index afe076419cf3..942f644cc3ba 100644
--- a/arch/arm/include/asm/arch-tegra/scu.h
+++ b/arch/arm/include/asm/arch-tegra/scu.h
@@ -8,6 +8,7 @@
 #define _SCU_H_
 
 /* ARM Snoop Control Unit (SCU) registers */
+#include <linux/types.h>
 struct scu_ctlr {
 	uint scu_ctrl;		/* SCU Control Register, offset 00 */
 	uint scu_cfg;		/* SCU Config Register, offset 04 */
diff --git a/arch/arm/include/asm/arch-tegra/tegra_ahub.h b/arch/arm/include/asm/arch-tegra/tegra_ahub.h
index 96d542a91cab..36de87033e79 100644
--- a/arch/arm/include/asm/arch-tegra/tegra_ahub.h
+++ b/arch/arm/include/asm/arch-tegra/tegra_ahub.h
@@ -14,6 +14,7 @@
  * Each TX CIF transmits data into the XBAR. Each RX CIF can receive audio
  * transmitted by a particular TX CIF.
  */
+#include <asm/types.h>
 struct xbar_regs {
 	u32 apbif_rx0;		/* AUDIO_APBIF_RX0, offset 0x00 */
 	u32 apbif_rx1;		/* AUDIO_APBIF_RX1, offset 0x04 */
diff --git a/arch/arm/include/asm/arch-tegra/tegra_i2s.h b/arch/arm/include/asm/arch-tegra/tegra_i2s.h
index 9319383f7c1e..55bd31acc7ef 100644
--- a/arch/arm/include/asm/arch-tegra/tegra_i2s.h
+++ b/arch/arm/include/asm/arch-tegra/tegra_i2s.h
@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0 */
 /*
  * tegra_i2s.h - Definitions for Tegra124 I2S driver.
+#include <asm/types.h>
  * Note, some structures (ex, CIF) are different in Tegra114.
  *
  * NVIDIA Tegra I2S controller
diff --git a/arch/arm/include/asm/arch-tegra/uart.h b/arch/arm/include/asm/arch-tegra/uart.h
index 24f0bdd51b8d..01404dd12fdb 100644
--- a/arch/arm/include/asm/arch-tegra/uart.h
+++ b/arch/arm/include/asm/arch-tegra/uart.h
@@ -8,6 +8,7 @@
 #define _UART_H_
 
 /* UART registers */
+#include <linux/types.h>
 struct uart_ctlr {
 	uint uart_thr_dlab_0;		/* UART_THR_DLAB_0_0, offset 00 */
 	uint uart_ier_dlab_0;		/* UART_IER_DLAB_0_0, offset 04 */
diff --git a/arch/arm/include/asm/arch-tegra/usb.h b/arch/arm/include/asm/arch-tegra/usb.h
index 6e6ea1443cb0..9fc96dc251ba 100644
--- a/arch/arm/include/asm/arch-tegra/usb.h
+++ b/arch/arm/include/asm/arch-tegra/usb.h
@@ -8,6 +8,7 @@
 #define _TEGRA_USB_H_
 
 /* USB Controller (USBx_CONTROLLER_) regs */
+#include <linux/types.h>
 struct usb_ctlr {
 	/* 0x000 */
 	uint id;
diff --git a/arch/arm/include/asm/arch-tegra/warmboot.h b/arch/arm/include/asm/arch-tegra/warmboot.h
index 3f02073ee494..0c2f0a56c258 100644
--- a/arch/arm/include/asm/arch-tegra/warmboot.h
+++ b/arch/arm/include/asm/arch-tegra/warmboot.h
@@ -7,6 +7,7 @@
 #ifndef _WARM_BOOT_H_
 #define _WARM_BOOT_H_
 
+#include <asm/types.h>
 #define STRAP_OPT_A_RAM_CODE_SHIFT	4
 #define STRAP_OPT_A_RAM_CODE_MASK	(0xf << STRAP_OPT_A_RAM_CODE_SHIFT)
 
diff --git a/arch/arm/include/asm/arch-tegra114/flow.h b/arch/arm/include/asm/arch-tegra114/flow.h
index 4f0fc3b7fb3d..4c5fcfbb4d33 100644
--- a/arch/arm/include/asm/arch-tegra114/flow.h
+++ b/arch/arm/include/asm/arch-tegra114/flow.h
@@ -6,6 +6,7 @@
 #ifndef _TEGRA114_FLOW_H_
 #define _TEGRA114_FLOW_H_
 
+#include <asm/types.h>
 struct flow_ctlr {
 	u32 halt_cpu_events;
 	u32 halt_cop_events;
diff --git a/arch/arm/include/asm/arch-tegra114/gp_padctrl.h b/arch/arm/include/asm/arch-tegra114/gp_padctrl.h
index 69b35a1411ec..9a09456dc58b 100644
--- a/arch/arm/include/asm/arch-tegra114/gp_padctrl.h
+++ b/arch/arm/include/asm/arch-tegra114/gp_padctrl.h
@@ -7,6 +7,7 @@
 #define _TEGRA114_GP_PADCTRL_H_
 
 #include <asm/arch-tegra/gp_padctrl.h>
+#include <asm/types.h>
 
 /* APB_MISC_GP and padctrl registers */
 struct apb_misc_gp_ctlr {
diff --git a/arch/arm/include/asm/arch-tegra114/mc.h b/arch/arm/include/asm/arch-tegra114/mc.h
index 3930bab571ff..7d60efe43834 100644
--- a/arch/arm/include/asm/arch-tegra114/mc.h
+++ b/arch/arm/include/asm/arch-tegra114/mc.h
@@ -10,6 +10,7 @@
 /**
  * Defines the memory controller registers we need/care about
  */
+#include <asm/types.h>
 struct mc_ctlr {
 	u32 reserved0[4];			/* offset 0x00 - 0x0C */
 	u32 mc_smmu_config;			/* offset 0x10 */
diff --git a/arch/arm/include/asm/arch-tegra114/sysctr.h b/arch/arm/include/asm/arch-tegra114/sysctr.h
index 228f423bed0b..67731bbc05f7 100644
--- a/arch/arm/include/asm/arch-tegra114/sysctr.h
+++ b/arch/arm/include/asm/arch-tegra114/sysctr.h
@@ -6,6 +6,7 @@
 #ifndef _TEGRA114_SYSCTR_H_
 #define _TEGRA114_SYSCTR_H_
 
+#include <asm/types.h>
 struct sysctr_ctlr {
 	u32 cntcr;		/* 0x00: SYSCTR0_CNTCR Counter Control */
 	u32 cntsr;		/* 0x04: SYSCTR0_CNTSR Counter Status */
diff --git a/arch/arm/include/asm/arch-tegra124/ahb.h b/arch/arm/include/asm/arch-tegra124/ahb.h
index d88cdfecea43..5180925d6fdd 100644
--- a/arch/arm/include/asm/arch-tegra124/ahb.h
+++ b/arch/arm/include/asm/arch-tegra124/ahb.h
@@ -7,6 +7,7 @@
 #ifndef _TEGRA124_AHB_H_
 #define _TEGRA124_AHB_H_
 
+#include <asm/types.h>
 struct ahb_ctlr {
 	u32 reserved0;			/* 00h */
 	u32 arbitration_disable;	/* _ARBITRATION_DISABLE_0,	04h */
diff --git a/arch/arm/include/asm/arch-tegra124/clock.h b/arch/arm/include/asm/arch-tegra124/clock.h
index 3f54d3627778..7c24026cce49 100644
--- a/arch/arm/include/asm/arch-tegra124/clock.h
+++ b/arch/arm/include/asm/arch-tegra124/clock.h
@@ -10,6 +10,7 @@
 #define _TEGRA124_CLOCK_H_
 
 #include <asm/arch-tegra/clock.h>
+#include <asm/types.h>
 
 /* CLK_RST_CONTROLLER_OSC_CTRL_0 */
 #define OSC_FREQ_SHIFT          28
diff --git a/arch/arm/include/asm/arch-tegra124/flow.h b/arch/arm/include/asm/arch-tegra124/flow.h
index ebcb22f1cb90..8b060acd756c 100644
--- a/arch/arm/include/asm/arch-tegra124/flow.h
+++ b/arch/arm/include/asm/arch-tegra124/flow.h
@@ -8,6 +8,7 @@
 #define _TEGRA124_FLOW_H_
 
 #ifndef __ASSEMBLY__
+#include <asm/types.h>
 #include <linux/bitops.h>
 #endif
 
diff --git a/arch/arm/include/asm/arch-tegra124/gp_padctrl.h b/arch/arm/include/asm/arch-tegra124/gp_padctrl.h
index 750a2dc649ae..85628af19f77 100644
--- a/arch/arm/include/asm/arch-tegra124/gp_padctrl.h
+++ b/arch/arm/include/asm/arch-tegra124/gp_padctrl.h
@@ -8,6 +8,7 @@
 #define _TEGRA124_GP_PADCTRL_H_
 
 #include <asm/arch-tegra/gp_padctrl.h>
+#include <asm/types.h>
 
 /* APB_MISC_GP and padctrl registers */
 struct apb_misc_gp_ctlr {
diff --git a/arch/arm/include/asm/arch-tegra124/gpio.h b/arch/arm/include/asm/arch-tegra124/gpio.h
index e5ea2815afa4..2ec69bb57eb0 100644
--- a/arch/arm/include/asm/arch-tegra124/gpio.h
+++ b/arch/arm/include/asm/arch-tegra124/gpio.h
@@ -15,6 +15,7 @@
 #define TEGRA_GPIO_BANKS	8	/* number of banks */
 
 #include <asm/arch-tegra/gpio.h>
+#include <linux/types.h>
 
 /* GPIO Controller registers for a single bank */
 struct gpio_ctlr_bank {
diff --git a/arch/arm/include/asm/arch-tegra124/mc.h b/arch/arm/include/asm/arch-tegra124/mc.h
index 617e55af20e2..26b44574f66b 100644
--- a/arch/arm/include/asm/arch-tegra124/mc.h
+++ b/arch/arm/include/asm/arch-tegra124/mc.h
@@ -9,6 +9,7 @@
 /**
  * Defines the memory controller registers we need/care about
  */
+#include <asm/types.h>
 struct mc_ctlr {
 	u32 reserved0[4];			/* offset 0x00 - 0x0C */
 	u32 mc_smmu_config;			/* offset 0x10 */
diff --git a/arch/arm/include/asm/arch-tegra124/sysctr.h b/arch/arm/include/asm/arch-tegra124/sysctr.h
index 6567104d0832..f5b3ab565ff5 100644
--- a/arch/arm/include/asm/arch-tegra124/sysctr.h
+++ b/arch/arm/include/asm/arch-tegra124/sysctr.h
@@ -7,6 +7,7 @@
 #ifndef _TEGRA124_SYSCTR_H_
 #define _TEGRA124_SYSCTR_H_
 
+#include <asm/types.h>
 struct sysctr_ctlr {
 	u32 cntcr;		/* 0x00: SYSCTR0_CNTCR Counter Control */
 	u32 cntsr;		/* 0x04: SYSCTR0_CNTSR Counter Status */
diff --git a/arch/arm/include/asm/arch-tegra20/display.h b/arch/arm/include/asm/arch-tegra20/display.h
index e7b3cffd4664..26b0fa9d7666 100644
--- a/arch/arm/include/asm/arch-tegra20/display.h
+++ b/arch/arm/include/asm/arch-tegra20/display.h
@@ -8,6 +8,7 @@
 #define __ASM_ARCH_TEGRA_DISPLAY_H
 
 #include <asm/arch-tegra/dc.h>
+#include <asm/types.h>
 
 /* This holds information about a window which can be displayed */
 struct disp_ctl_win {
diff --git a/arch/arm/include/asm/arch-tegra20/flow.h b/arch/arm/include/asm/arch-tegra20/flow.h
index 33be841ddbd6..3bf0d0d1aa2f 100644
--- a/arch/arm/include/asm/arch-tegra20/flow.h
+++ b/arch/arm/include/asm/arch-tegra20/flow.h
@@ -7,6 +7,7 @@
 #ifndef _FLOW_H_
 #define _FLOW_H_
 
+#include <asm/types.h>
 struct flow_ctlr {
 	u32	halt_cpu_events;
 	u32	halt_cop_events;
diff --git a/arch/arm/include/asm/arch-tegra20/gp_padctrl.h b/arch/arm/include/asm/arch-tegra20/gp_padctrl.h
index dd2ee126550b..ab06bfb4cba7 100644
--- a/arch/arm/include/asm/arch-tegra20/gp_padctrl.h
+++ b/arch/arm/include/asm/arch-tegra20/gp_padctrl.h
@@ -8,6 +8,7 @@
 #define _TEGRA20_GP_PADCTRL_H_
 
 #include <asm/arch-tegra/gp_padctrl.h>
+#include <asm/types.h>
 
 /* APB_MISC_GP and padctrl registers */
 struct apb_misc_gp_ctlr {
diff --git a/arch/arm/include/asm/arch-tegra20/gpio.h b/arch/arm/include/asm/arch-tegra20/gpio.h
index 6818c28723bf..fb203d21468c 100644
--- a/arch/arm/include/asm/arch-tegra20/gpio.h
+++ b/arch/arm/include/asm/arch-tegra20/gpio.h
@@ -15,6 +15,7 @@
 #define TEGRA_GPIO_BANKS	7	/* number of banks */
 
 #include <asm/arch-tegra/gpio.h>
+#include <linux/types.h>
 
 /* GPIO Controller registers for a single bank */
 struct gpio_ctlr_bank {
diff --git a/arch/arm/include/asm/arch-tegra20/mc.h b/arch/arm/include/asm/arch-tegra20/mc.h
index 71283e4e21e0..67c5742e0826 100644
--- a/arch/arm/include/asm/arch-tegra20/mc.h
+++ b/arch/arm/include/asm/arch-tegra20/mc.h
@@ -10,6 +10,7 @@
 /**
  * Defines the memory controller registers we need/care about
  */
+#include <asm/types.h>
 struct mc_ctlr {
 	u32 reserved0[3];			/* offset 0x00 - 0x08 */
 	u32 mc_emem_cfg;			/* offset 0x0C */
diff --git a/arch/arm/include/asm/arch-tegra20/sdram_param.h b/arch/arm/include/asm/arch-tegra20/sdram_param.h
index 3d1405fa3bae..75c1182a869d 100644
--- a/arch/arm/include/asm/arch-tegra20/sdram_param.h
+++ b/arch/arm/include/asm/arch-tegra20/sdram_param.h
@@ -11,6 +11,7 @@
  * Defines the number of 32-bit words provided in each set of SDRAM parameters
  * for arbitration configuration data.
  */
+#include <asm/types.h>
 #define BCT_SDRAM_ARB_CONFIG_WORDS 27
 
 enum memory_type {
diff --git a/arch/arm/include/asm/arch-tegra210/ahb.h b/arch/arm/include/asm/arch-tegra210/ahb.h
index 8ecd6d9bae22..7b4a8994d8bf 100644
--- a/arch/arm/include/asm/arch-tegra210/ahb.h
+++ b/arch/arm/include/asm/arch-tegra210/ahb.h
@@ -7,6 +7,7 @@
 #ifndef _TEGRA210_AHB_H_
 #define _TEGRA210_AHB_H_
 
+#include <asm/types.h>
 struct ahb_ctlr {
 	u32 reserved0;			/* 00h */
 	u32 arbitration_disable;	/* _ARBITRATION_DISABLE_0,	04h */
diff --git a/arch/arm/include/asm/arch-tegra210/flow.h b/arch/arm/include/asm/arch-tegra210/flow.h
index ef0be19e5876..73ee94ef7386 100644
--- a/arch/arm/include/asm/arch-tegra210/flow.h
+++ b/arch/arm/include/asm/arch-tegra210/flow.h
@@ -7,6 +7,7 @@
 #ifndef _TEGRA210_FLOW_H_
 #define _TEGRA210_FLOW_H_
 
+#include <asm/types.h>
 struct flow_ctlr {
 	u32 halt_cpu_events;	/* offset 0x00 */
 	u32 halt_cop_events;	/* offset 0x04 */
diff --git a/arch/arm/include/asm/arch-tegra210/gp_padctrl.h b/arch/arm/include/asm/arch-tegra210/gp_padctrl.h
index e9ff9037526b..92a315f34fd0 100644
--- a/arch/arm/include/asm/arch-tegra210/gp_padctrl.h
+++ b/arch/arm/include/asm/arch-tegra210/gp_padctrl.h
@@ -8,6 +8,7 @@
 #define _TEGRA210_GP_PADCTRL_H_
 
 #include <asm/arch-tegra/gp_padctrl.h>
+#include <asm/types.h>
 
 /* APB_MISC_GP and padctrl registers */
 struct apb_misc_gp_ctlr {
diff --git a/arch/arm/include/asm/arch-tegra210/gpio.h b/arch/arm/include/asm/arch-tegra210/gpio.h
index cb91b10bed8f..9a3b5be72eed 100644
--- a/arch/arm/include/asm/arch-tegra210/gpio.h
+++ b/arch/arm/include/asm/arch-tegra210/gpio.h
@@ -15,6 +15,7 @@
 #define TEGRA_GPIO_BANKS	8	/* number of banks */
 
 #include <asm/arch-tegra/gpio.h>
+#include <linux/types.h>
 
 /* GPIO Controller registers for a single bank */
 struct gpio_ctlr_bank {
diff --git a/arch/arm/include/asm/arch-tegra210/mc.h b/arch/arm/include/asm/arch-tegra210/mc.h
index 5a2a5681d7a9..a80e36c011f4 100644
--- a/arch/arm/include/asm/arch-tegra210/mc.h
+++ b/arch/arm/include/asm/arch-tegra210/mc.h
@@ -9,6 +9,7 @@
 /**
  * Defines the memory controller registers we need/care about
  */
+#include <asm/types.h>
 struct mc_ctlr {
 	u32 reserved0[4];			/* offset 0x00 - 0x0C */
 	u32 mc_smmu_config;			/* offset 0x10 */
diff --git a/arch/arm/include/asm/arch-tegra210/sysctr.h b/arch/arm/include/asm/arch-tegra210/sysctr.h
index cb1c4997fac0..8ada6e5c60cf 100644
--- a/arch/arm/include/asm/arch-tegra210/sysctr.h
+++ b/arch/arm/include/asm/arch-tegra210/sysctr.h
@@ -7,6 +7,7 @@
 #ifndef _TEGRA210_SYSCTR_H_
 #define _TEGRA210_SYSCTR_H_
 
+#include <asm/types.h>
 struct sysctr_ctlr {
 	u32 cntcr;		/* 0x00: SYSCTR0_CNTCR Counter Control */
 	u32 cntsr;		/* 0x04: SYSCTR0_CNTSR Counter Status */
diff --git a/arch/arm/include/asm/arch-tegra30/flow.h b/arch/arm/include/asm/arch-tegra30/flow.h
index f3e947e9eee5..3924b418040d 100644
--- a/arch/arm/include/asm/arch-tegra30/flow.h
+++ b/arch/arm/include/asm/arch-tegra30/flow.h
@@ -6,6 +6,7 @@
 #ifndef _TEGRA30_FLOW_H_
 #define _TEGRA30_FLOW_H_
 
+#include <asm/types.h>
 struct flow_ctlr {
 	u32 halt_cpu_events;
 	u32 halt_cop_events;
diff --git a/arch/arm/include/asm/arch-tegra30/gp_padctrl.h b/arch/arm/include/asm/arch-tegra30/gp_padctrl.h
index 4ff785de8eaa..65e811ababa7 100644
--- a/arch/arm/include/asm/arch-tegra30/gp_padctrl.h
+++ b/arch/arm/include/asm/arch-tegra30/gp_padctrl.h
@@ -7,6 +7,7 @@
 #define _TEGRA30_GP_PADCTRL_H_
 
 #include <asm/arch-tegra/gp_padctrl.h>
+#include <asm/types.h>
 
 /* APB_MISC_GP and padctrl registers */
 struct apb_misc_gp_ctlr {
diff --git a/arch/arm/include/asm/arch-tegra30/gpio.h b/arch/arm/include/asm/arch-tegra30/gpio.h
index 1dd2e426ba68..5289e33fd920 100644
--- a/arch/arm/include/asm/arch-tegra30/gpio.h
+++ b/arch/arm/include/asm/arch-tegra30/gpio.h
@@ -14,6 +14,7 @@
 #define TEGRA_GPIO_BANKS	8	/* number of banks */
 
 #include <asm/arch-tegra/gpio.h>
+#include <linux/types.h>
 
 /* GPIO Controller registers for a single bank */
 struct gpio_ctlr_bank {
diff --git a/arch/arm/include/asm/arch-tegra30/mc.h b/arch/arm/include/asm/arch-tegra30/mc.h
index bbb0fe77bc43..9643ed81f903 100644
--- a/arch/arm/include/asm/arch-tegra30/mc.h
+++ b/arch/arm/include/asm/arch-tegra30/mc.h
@@ -10,6 +10,7 @@
 /**
  * Defines the memory controller registers we need/care about
  */
+#include <asm/types.h>
 struct mc_ctlr {
 	u32 reserved0[4];			/* offset 0x00 - 0x0C */
 	u32 mc_smmu_config;			/* offset 0x10 */
diff --git a/arch/arm/include/asm/arch-vf610/clock.h b/arch/arm/include/asm/arch-vf610/clock.h
index ec9786ce4fef..6cdad57e78f2 100644
--- a/arch/arm/include/asm/arch-vf610/clock.h
+++ b/arch/arm/include/asm/arch-vf610/clock.h
@@ -6,6 +6,7 @@
 #ifndef __ASM_ARCH_CLOCK_H
 #define __ASM_ARCH_CLOCK_H
 
+#include <asm/types.h>
 enum mxc_clock {
 	MXC_ARM_CLK = 0,
 	MXC_BUS_CLK,
diff --git a/arch/arm/include/asm/arch-vf610/ddrmc-vf610.h b/arch/arm/include/asm/arch-vf610/ddrmc-vf610.h
index 03e3cecb95a0..8adfbefd0c81 100644
--- a/arch/arm/include/asm/arch-vf610/ddrmc-vf610.h
+++ b/arch/arm/include/asm/arch-vf610/ddrmc-vf610.h
@@ -11,6 +11,7 @@
 #define __ASM_ARCH_VF610_DDRMC_H
 
 #include <asm/arch/iomux-vf610.h>
+#include <asm/types.h>
 
 struct ddr3_jedec_timings {
 	u8 tinit;
diff --git a/arch/arm/include/asm/arch-vf610/gpio.h b/arch/arm/include/asm/arch-vf610/gpio.h
index 9bfdf1687308..07ae0e4f64fb 100644
--- a/arch/arm/include/asm/arch-vf610/gpio.h
+++ b/arch/arm/include/asm/arch-vf610/gpio.h
@@ -7,6 +7,7 @@
 #ifndef __ASM_ARCH_VF610_GPIO_H
 #define __ASM_ARCH_VF610_GPIO_H
 
+#include <asm/types.h>
 #define VYBRID_GPIO_COUNT		32
 #define VF610_GPIO_DIRECTION_IN	0x0
 #define VF610_GPIO_DIRECTION_OUT	0x1
diff --git a/arch/arm/include/asm/armv7_mpu.h b/arch/arm/include/asm/armv7_mpu.h
index 16b9d0d1aeb3..bbad00406cd2 100644
--- a/arch/arm/include/asm/armv7_mpu.h
+++ b/arch/arm/include/asm/armv7_mpu.h
@@ -9,6 +9,7 @@
 
 #ifndef __ASSEMBLY__
 #include <linux/bitops.h>
+#include <linux/types.h>
 #endif
 
 #ifdef CONFIG_CPU_V7M
diff --git a/arch/arm/include/asm/armv7m.h b/arch/arm/include/asm/armv7m.h
index ad67b4fa34e0..c8411475eb26 100644
--- a/arch/arm/include/asm/armv7m.h
+++ b/arch/arm/include/asm/armv7m.h
@@ -23,6 +23,7 @@
 #define V7M_SCB_VTOR		0x08
 
 #if !defined(__ASSEMBLY__)
+#include <linux/types.h>
 struct v7m_scb {
 	uint32_t cpuid;		/* CPUID Base Register */
 	uint32_t icsr;		/* Interrupt Control and State Register */
diff --git a/arch/arm/include/asm/armv8/mmu.h b/arch/arm/include/asm/armv8/mmu.h
index fc97c5511468..5af66bea1448 100644
--- a/arch/arm/include/asm/armv8/mmu.h
+++ b/arch/arm/include/asm/armv8/mmu.h
@@ -104,6 +104,8 @@
 #define TCR_EL3_RSVD		(1 << 31 | 1 << 23)
 
 #ifndef __ASSEMBLY__
+#include <linux/types.h>
+
 static inline void set_ttbr_tcr_mair(int el, u64 table, u64 tcr, u64 attr)
 {
 	asm volatile("dsb sy");
diff --git a/arch/arm/include/asm/armv8/sec_firmware.h b/arch/arm/include/asm/armv8/sec_firmware.h
index 9c010953f5f2..b83f93f44153 100644
--- a/arch/arm/include/asm/armv8/sec_firmware.h
+++ b/arch/arm/include/asm/armv8/sec_firmware.h
@@ -7,6 +7,7 @@
 #define __SEC_FIRMWARE_H_
 
 #include <stdbool.h>
+#include <linux/types.h>
 
 #define PSCI_INVALID_VER		0xffffffff
 #define SEC_JR3_OFFSET			0x40000
diff --git a/arch/arm/include/asm/bootm.h b/arch/arm/include/asm/bootm.h
index a2131ca07c52..5a41f0e52ccc 100644
--- a/arch/arm/include/asm/bootm.h
+++ b/arch/arm/include/asm/bootm.h
@@ -8,6 +8,7 @@
 #ifndef ARM_BOOTM_H
 #define ARM_BOOTM_H
 
+#include <asm/types.h>
 extern void udc_disconnect(void);
 
 #if defined(CONFIG_SETUP_MEMORY_TAGS) || \
diff --git a/arch/arm/include/asm/ehci-omap.h b/arch/arm/include/asm/ehci-omap.h
index f970bba93758..fc8b619ecdb5 100644
--- a/arch/arm/include/asm/ehci-omap.h
+++ b/arch/arm/include/asm/ehci-omap.h
@@ -11,6 +11,7 @@
 #ifndef _OMAP_COMMON_EHCI_H_
 #define _OMAP_COMMON_EHCI_H_
 
+#include <asm/types.h>
 enum usbhs_omap_port_mode {
 	OMAP_USBHS_PORT_MODE_UNUSED,
 	OMAP_EHCI_PORT_MODE_PHY,
diff --git a/arch/arm/include/asm/handoff.h b/arch/arm/include/asm/handoff.h
index 0790d2ab1e25..e1e1708b241a 100644
--- a/arch/arm/include/asm/handoff.h
+++ b/arch/arm/include/asm/handoff.h
@@ -10,6 +10,7 @@
 #define __asm_handoff_h
 
 /**
+#include <linux/types.h>
  * struct arch_spl_handoff - architecture-specific handoff info
  *
  * @usable_ram_top: Value returned by board_get_usable_ram_top() in SPL
diff --git a/arch/arm/include/asm/io.h b/arch/arm/include/asm/io.h
index 994b47579924..e74aad6ad9d7 100644
--- a/arch/arm/include/asm/io.h
+++ b/arch/arm/include/asm/io.h
@@ -30,6 +30,7 @@
 #if 0	/* XXX###XXX */
 #include <asm/arch/hardware.h>
 #endif	/* XXX###XXX */
+#include <compiler.h>
 #include <linux/string.h>
 
 static inline void sync(void)
diff --git a/arch/arm/include/asm/iproc-common/iproc_sdhci.h b/arch/arm/include/asm/iproc-common/iproc_sdhci.h
index 4e299217fcf1..7c4f35d23bc4 100644
--- a/arch/arm/include/asm/iproc-common/iproc_sdhci.h
+++ b/arch/arm/include/asm/iproc-common/iproc_sdhci.h
@@ -7,6 +7,7 @@
 #ifndef __IPROC_SDHCI_H
 #define __IPROC_SDHCI_H
 
+#include <asm/types.h>
 int iproc_sdhci_init(int dev_index, u32 quirks);
 
 #endif
diff --git a/arch/arm/include/asm/kona-common/kona_sdhci.h b/arch/arm/include/asm/kona-common/kona_sdhci.h
index 22db651a4eb2..f8887ceb4c9a 100644
--- a/arch/arm/include/asm/kona-common/kona_sdhci.h
+++ b/arch/arm/include/asm/kona-common/kona_sdhci.h
@@ -6,6 +6,7 @@
 #ifndef __KONA_SDHCI_H
 #define __KONA_SDHCI_H
 
+#include <asm/types.h>
 int kona_sdhci_init(int dev_index, u32 min_clk, u32 quirks);
 
 #endif
diff --git a/arch/arm/include/asm/mach-imx/dma.h b/arch/arm/include/asm/mach-imx/dma.h
index 55eb84cb8e7e..c4f76e93291c 100644
--- a/arch/arm/include/asm/mach-imx/dma.h
+++ b/arch/arm/include/asm/mach-imx/dma.h
@@ -14,6 +14,7 @@
 #define __DMA_H__
 
 #include <asm/cache.h>
+#include <asm/types.h>
 #include <linux/list.h>
 #include <linux/compiler.h>
 
diff --git a/arch/arm/include/asm/mach-imx/gpio.h b/arch/arm/include/asm/mach-imx/gpio.h
index 1b7c9cd52499..fa6d2e0e7f47 100644
--- a/arch/arm/include/asm/mach-imx/gpio.h
+++ b/arch/arm/include/asm/mach-imx/gpio.h
@@ -9,6 +9,7 @@
 #define __ASM_ARCH_IMX_GPIO_H
 
 #if !(defined(__KERNEL_STRICT_NAMES) || defined(__ASSEMBLY__))
+#include <asm/types.h>
 /* GPIO registers */
 struct gpio_regs {
 	u32 gpio_dr;	/* data */
diff --git a/arch/arm/include/asm/mach-imx/hab.h b/arch/arm/include/asm/mach-imx/hab.h
index f89f750169b7..41e209290198 100644
--- a/arch/arm/include/asm/mach-imx/hab.h
+++ b/arch/arm/include/asm/mach-imx/hab.h
@@ -7,6 +7,7 @@
 #ifndef __SECURE_MX6Q_H__
 #define __SECURE_MX6Q_H__
 
+#include <compiler.h>
 #include <stdbool.h>
 #include <linux/types.h>
 #include <linux/compiler.h>
diff --git a/arch/arm/include/asm/mach-imx/imx-nandbcb.h b/arch/arm/include/asm/mach-imx/imx-nandbcb.h
index 74c9031d4e7c..4b3f4a53578e 100644
--- a/arch/arm/include/asm/mach-imx/imx-nandbcb.h
+++ b/arch/arm/include/asm/mach-imx/imx-nandbcb.h
@@ -7,6 +7,7 @@
 #ifndef _IMX_NAND_BCB_H_
 #define _IMX_NAND_BCB_H_
 
+#include <asm/types.h>
 #define FCB_FINGERPRINT		0x20424346      /* 'FCB' */
 #define FCB_VERSION_1		0x01000000
 #define FCB_FINGERPRINT_OFF	0x4		/* FCB fingerprint offset*/
diff --git a/arch/arm/include/asm/mach-imx/module_fuse.h b/arch/arm/include/asm/mach-imx/module_fuse.h
index a46fc3f1f8e0..781e62d6147e 100644
--- a/arch/arm/include/asm/mach-imx/module_fuse.h
+++ b/arch/arm/include/asm/mach-imx/module_fuse.h
@@ -6,6 +6,7 @@
 #ifndef __MODULE_FUSE_H__
 #define __MODULE_FUSE_H__
 
+#include <linux/types.h>
 enum fuse_module_type {
 	MODULE_TSC,
 	MODULE_ADC1,
diff --git a/arch/arm/include/asm/mach-imx/mxc_i2c.h b/arch/arm/include/asm/mach-imx/mxc_i2c.h
index 81fd9814447c..9a934c517b57 100644
--- a/arch/arm/include/asm/mach-imx/mxc_i2c.h
+++ b/arch/arm/include/asm/mach-imx/mxc_i2c.h
@@ -9,6 +9,7 @@
 #if CONFIG_IS_ENABLED(CLK)
 #include <clk.h>
 #endif
+#include <linux/types.h>
 
 struct i2c_pin_ctrl {
 	iomux_v3_cfg_t i2c_mode;
diff --git a/arch/arm/include/asm/mach-imx/rdc-sema.h b/arch/arm/include/asm/mach-imx/rdc-sema.h
index 70d6a76a9d7e..7b4d1fdf9525 100644
--- a/arch/arm/include/asm/mach-imx/rdc-sema.h
+++ b/arch/arm/include/asm/mach-imx/rdc-sema.h
@@ -13,6 +13,7 @@
  *      d3      d2      d1       d0    | master id  |  peri id
  *   d[x] means domain[x], x can be [3 - 0].
  */
+#include <asm/types.h>
 typedef u32 rdc_peri_cfg_t;
 typedef u32 rdc_ma_cfg_t;
 
diff --git a/arch/arm/include/asm/mach-imx/regs-apbh.h b/arch/arm/include/asm/mach-imx/regs-apbh.h
index 94c330c7f928..917e72e35ad5 100644
--- a/arch/arm/include/asm/mach-imx/regs-apbh.h
+++ b/arch/arm/include/asm/mach-imx/regs-apbh.h
@@ -237,6 +237,7 @@ struct mxs_apbh_regs {
 };
 #endif
 
+#include <linux/types.h>
 #endif
 
 #define	APBH_CTRL0_SFTRST				(1 << 31)
diff --git a/arch/arm/include/asm/mach-imx/regs-bch.h b/arch/arm/include/asm/mach-imx/regs-bch.h
index 5a149002e2a7..37b2e97f8e0d 100644
--- a/arch/arm/include/asm/mach-imx/regs-bch.h
+++ b/arch/arm/include/asm/mach-imx/regs-bch.h
@@ -17,6 +17,7 @@
 #include <asm/mach-imx/regs-common.h>
 
 #ifndef	__ASSEMBLY__
+#include <linux/types.h>
 struct mxs_bch_regs {
 	mxs_reg_32(hw_bch_ctrl)
 	mxs_reg_32(hw_bch_status0)
diff --git a/arch/arm/include/asm/mach-imx/regs-gpmi.h b/arch/arm/include/asm/mach-imx/regs-gpmi.h
index 33daa53c45df..6723caef6a10 100644
--- a/arch/arm/include/asm/mach-imx/regs-gpmi.h
+++ b/arch/arm/include/asm/mach-imx/regs-gpmi.h
@@ -15,6 +15,7 @@
 #include <asm/mach-imx/regs-common.h>
 
 #ifndef	__ASSEMBLY__
+#include <linux/types.h>
 struct mxs_gpmi_regs {
 	mxs_reg_32(hw_gpmi_ctrl0)
 	mxs_reg_32(hw_gpmi_compare)
diff --git a/arch/arm/include/asm/mach-imx/regs-lcdif.h b/arch/arm/include/asm/mach-imx/regs-lcdif.h
index 587463879661..67b961931a69 100644
--- a/arch/arm/include/asm/mach-imx/regs-lcdif.h
+++ b/arch/arm/include/asm/mach-imx/regs-lcdif.h
@@ -14,6 +14,7 @@
 
 #ifndef	__ASSEMBLY__
 #include <asm/mach-imx/regs-common.h>
+#include <linux/types.h>
 
 struct mxs_lcdif_regs {
 	mxs_reg_32(hw_lcdif_ctrl)		/* 0x00 */
diff --git a/arch/arm/include/asm/mach-imx/sys_proto.h b/arch/arm/include/asm/mach-imx/sys_proto.h
index ae33d6a9a495..5c87a0fcf1a8 100644
--- a/arch/arm/include/asm/mach-imx/sys_proto.h
+++ b/arch/arm/include/asm/mach-imx/sys_proto.h
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <asm/mach-imx/regs-common.h>
 #include <asm/mach-imx/module_fuse.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include "../arch-imx/cpu.h"
diff --git a/arch/arm/include/asm/mach-imx/syscounter.h b/arch/arm/include/asm/mach-imx/syscounter.h
index a2cae1edb81b..a291b8ebec36 100644
--- a/arch/arm/include/asm/mach-imx/syscounter.h
+++ b/arch/arm/include/asm/mach-imx/syscounter.h
@@ -7,6 +7,7 @@
 #define _ASM_ARCH_SYSTEM_COUNTER_H
 
 /* System Counter */
+#include <asm/types.h>
 struct sctr_regs {
 	u32 cntcr;
 	u32 cntsr;
diff --git a/arch/arm/include/asm/mach-imx/video.h b/arch/arm/include/asm/mach-imx/video.h
index 1fdc2de662a3..e31c68d12b9d 100644
--- a/arch/arm/include/asm/mach-imx/video.h
+++ b/arch/arm/include/asm/mach-imx/video.h
@@ -5,6 +5,7 @@
 
 #include <linux/fb.h>
 #include <ipu_pixfmt.h>
+#include <linux/types.h>
 
 struct display_info_t {
 	int	bus;
diff --git a/arch/arm/include/asm/omap_gpio.h b/arch/arm/include/asm/omap_gpio.h
index 151afa8f44ca..c25032453a83 100644
--- a/arch/arm/include/asm/omap_gpio.h
+++ b/arch/arm/include/asm/omap_gpio.h
@@ -21,6 +21,7 @@
 #define _GPIO_H
 
 #include <asm/arch/cpu.h>
+#include <linux/types.h>
 
 #if CONFIG_IS_ENABLED(DM_GPIO)
 
diff --git a/arch/arm/include/asm/omap_i2c.h b/arch/arm/include/asm/omap_i2c.h
index a6975401dabd..582d9c438672 100644
--- a/arch/arm/include/asm/omap_i2c.h
+++ b/arch/arm/include/asm/omap_i2c.h
@@ -14,6 +14,7 @@ struct omap_i2c_platdata {
 
 #endif
 
+#include <linux/types.h>
 enum {
 	OMAP_I2C_REV_V1 = 0,
 	OMAP_I2C_REV_V2 = 1,
diff --git a/arch/arm/include/asm/omap_mmc.h b/arch/arm/include/asm/omap_mmc.h
index 7933ad5a867a..fbc83164a2bd 100644
--- a/arch/arm/include/asm/omap_mmc.h
+++ b/arch/arm/include/asm/omap_mmc.h
@@ -28,6 +28,7 @@
 #include <mmc.h>
 #ifndef __ASSEMBLY__
 #include <linux/bitops.h>
+#include <linux/types.h>
 #endif
 
 struct hsmmc {
diff --git a/arch/arm/include/asm/omap_musb.h b/arch/arm/include/asm/omap_musb.h
index b40ea005bec2..feedd2725afe 100644
--- a/arch/arm/include/asm/omap_musb.h
+++ b/arch/arm/include/asm/omap_musb.h
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
 /*
+#include <asm/types.h>
  * Board data structure for musb gadget on OMAPs
  *
  * Copyright (C) 2012, Ilya Yanok <ilya.yanok@gmail.com>
diff --git a/arch/arm/include/asm/omap_sec_common.h b/arch/arm/include/asm/omap_sec_common.h
index 30f0a9f5cbc8..3331dcb55c64 100644
--- a/arch/arm/include/asm/omap_sec_common.h
+++ b/arch/arm/include/asm/omap_sec_common.h
@@ -13,6 +13,7 @@
  * the variable argument list into the format expected by the ROM code before
  * triggering the actual low-level smc entry.
  */
+#include <linux/types.h>
 u32 secure_rom_call(u32 service, u32 proc_id, u32 flag, ...);
 
 /*
diff --git a/arch/arm/include/asm/secure.h b/arch/arm/include/asm/secure.h
index 64e5582c1f2a..ce332e6558f9 100644
--- a/arch/arm/include/asm/secure.h
+++ b/arch/arm/include/asm/secure.h
@@ -9,6 +9,7 @@
 
 #ifndef __ASSEMBLY__
 
+#include <asm/types.h>
 typedef struct secure_svc_tbl {
 	u32	id;
 #ifdef CONFIG_ARMV8_PSCI
diff --git a/arch/arm/include/asm/setjmp.h b/arch/arm/include/asm/setjmp.h
index 662bec863219..1e86def1de66 100644
--- a/arch/arm/include/asm/setjmp.h
+++ b/arch/arm/include/asm/setjmp.h
@@ -9,6 +9,7 @@
 
 /*
  * This really should be opaque, but the EFI implementation wrongly
+#include <asm/types.h>
  * assumes that a 'struct jmp_buf_data' is defined.
  */
 struct jmp_buf_data {
diff --git a/arch/arm/include/asm/setup.h b/arch/arm/include/asm/setup.h
index 3a4e902af146..a4e3c69c6b9a 100644
--- a/arch/arm/include/asm/setup.h
+++ b/arch/arm/include/asm/setup.h
@@ -13,6 +13,7 @@
  *
  * NOTE:
  *  This file contains two ways to pass information from the boot
+#include <asm/types.h>
  *  loader to the kernel. The old struct param_struct is deprecated,
  *  but it will be kept in the kernel for 5 years from now
  *  (2001). This will allow boot loaders to convert to the new struct
diff --git a/arch/arm/include/asm/system.h b/arch/arm/include/asm/system.h
index ce552944b701..2d5084b6d169 100644
--- a/arch/arm/include/asm/system.h
+++ b/arch/arm/include/asm/system.h
@@ -109,6 +109,7 @@
 
 #ifndef __ASSEMBLY__
 
+#include <linux/types.h>
 struct pt_regs;
 
 u64 get_page_table_size(void);
diff --git a/arch/arm/include/asm/ti-common/davinci_nand.h b/arch/arm/include/asm/ti-common/davinci_nand.h
index 28842c3b1552..dffcd9250baa 100644
--- a/arch/arm/include/asm/ti-common/davinci_nand.h
+++ b/arch/arm/include/asm/ti-common/davinci_nand.h
@@ -11,6 +11,7 @@
 
 #include <linux/mtd/rawnand.h>
 #include <asm/arch/hardware.h>
+#include <linux/types.h>
 
 #define NAND_READ_START  	0x00
 #define NAND_READ_END    	0x30
diff --git a/arch/arm/include/asm/ti-common/keystone_nav.h b/arch/arm/include/asm/ti-common/keystone_nav.h
index e577514428ad..b61b8a64183b 100644
--- a/arch/arm/include/asm/ti-common/keystone_nav.h
+++ b/arch/arm/include/asm/ti-common/keystone_nav.h
@@ -11,6 +11,7 @@
 
 #include <asm/arch/hardware.h>
 #include <asm/io.h>
+#include <asm/types.h>
 
 #define QM_OK                    0
 #define QM_ERR                  -1
diff --git a/arch/arm/include/asm/ti-common/keystone_net.h b/arch/arm/include/asm/ti-common/keystone_net.h
index 0852ce80a641..90884643c391 100644
--- a/arch/arm/include/asm/ti-common/keystone_net.h
+++ b/arch/arm/include/asm/ti-common/keystone_net.h
@@ -13,6 +13,7 @@
 #include <phy.h>
 #ifndef __ASSEMBLY__
 #include <linux/bitops.h>
+#include <linux/types.h>
 #endif
 
 /* EMAC */
diff --git a/arch/arm/include/asm/ti-common/keystone_serdes.h b/arch/arm/include/asm/ti-common/keystone_serdes.h
index 623438856d59..a3ca1eff2c3c 100644
--- a/arch/arm/include/asm/ti-common/keystone_serdes.h
+++ b/arch/arm/include/asm/ti-common/keystone_serdes.h
@@ -10,6 +10,7 @@
 #define __TI_KEYSTONE_SERDES_H__
 
 /* SERDES Reference clock */
+#include <asm/types.h>
 enum ks2_serdes_clock {
 	SERDES_CLOCK_100M,		/* 100 MHz */
 	SERDES_CLOCK_122P88M,		/* 122.88 MHz */
diff --git a/arch/arm/include/asm/ti-common/sys_proto.h b/arch/arm/include/asm/ti-common/sys_proto.h
index a96a8382fb6e..f3db16e54d62 100644
--- a/arch/arm/include/asm/ti-common/sys_proto.h
+++ b/arch/arm/include/asm/ti-common/sys_proto.h
@@ -7,6 +7,7 @@
 #define _TI_COMMON_SYS_PROTO_H_
 
 #include <asm/global_data.h>
+#include <asm/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/include/asm/ti-common/ti-edma3.h b/arch/arm/include/asm/ti-common/ti-edma3.h
index 9abdbc88e40b..d5b98815a682 100644
--- a/arch/arm/include/asm/ti-common/ti-edma3.h
+++ b/arch/arm/include/asm/ti-common/ti-edma3.h
@@ -10,7 +10,9 @@
 #define _EDMA3_H_
 
 #ifndef __ASSEMBLY__
+#include <compiler.h>
 #include <linux/bitops.h>
+#include <linux/types.h>
 #endif
 #include <linux/stddef.h>
 
diff --git a/arch/arm/include/asm/u-boot-arm.h b/arch/arm/include/asm/u-boot-arm.h
index 0b93cc48c50d..afb55b488187 100644
--- a/arch/arm/include/asm/u-boot-arm.h
+++ b/arch/arm/include/asm/u-boot-arm.h
@@ -15,6 +15,7 @@
 #ifndef __ASSEMBLY__
 
 /* for the following variables, see start.S */
+#include <linux/types.h>
 extern ulong IRQ_STACK_START;	/* top of IRQ stack */
 extern ulong FIQ_STACK_START;	/* top of FIQ stack */
 extern ulong _datarel_start_ofs;
diff --git a/arch/arm/include/asm/utils.h b/arch/arm/include/asm/utils.h
index eee60c50e993..481cbd64ff86 100644
--- a/arch/arm/include/asm/utils.h
+++ b/arch/arm/include/asm/utils.h
@@ -7,6 +7,7 @@
 #ifndef _UTILS_H_
 #define _UTILS_H_
 
+#include <asm/types.h>
 static inline s32 log_2_n_round_up(u32 n)
 {
 	s32 log2n = -1;
diff --git a/arch/arm/lib/bootm-fdt.c b/arch/arm/lib/bootm-fdt.c
index 72a86f7defe5..e21cf6c1a500 100644
--- a/arch/arm/lib/bootm-fdt.c
+++ b/arch/arm/lib/bootm-fdt.c
@@ -15,6 +15,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <fdt_support.h>
 #ifdef CONFIG_ARMV7_NONSEC
 #include <asm/armv7.h>
diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c
index a11fe7ed31eb..40ce3c7a04b7 100644
--- a/arch/arm/lib/bootm.c
+++ b/arch/arm/lib/bootm.c
@@ -14,6 +14,7 @@
 #include <common.h>
 #include <bootstage.h>
 #include <command.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <dm.h>
 #include <hang.h>
@@ -28,6 +29,7 @@
 #include <env.h>
 #include <image.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <u-boot/zlib.h>
 #include <asm/byteorder.h>
 #include <linux/libfdt.h>
diff --git a/arch/arm/lib/cache-cp15.c b/arch/arm/lib/cache-cp15.c
index 39d51859ed76..b7f9baa74ac4 100644
--- a/arch/arm/lib/cache-cp15.c
+++ b/arch/arm/lib/cache-cp15.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <log.h>
 #include <stdio.h>
@@ -15,6 +16,7 @@
 #include <linux/compiler.h>
 #include <asm/armv7_mpu.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #if !(CONFIG_IS_ENABLED(SYS_ICACHE_OFF) && CONFIG_IS_ENABLED(SYS_DCACHE_OFF))
 
diff --git a/arch/arm/lib/cache.c b/arch/arm/lib/cache.c
index 6509052ddcf3..870d4c7d659f 100644
--- a/arch/arm/lib/cache.c
+++ b/arch/arm/lib/cache.c
@@ -7,6 +7,7 @@
 /* for now: just dummy functions to satisfy the linker */
 
 #include <common.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <log.h>
 #include <malloc.h>
@@ -14,6 +15,7 @@
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/lib/cmd_boot.c b/arch/arm/lib/cmd_boot.c
index c905ecc4bd94..00d58816dca8 100644
--- a/arch/arm/lib/cmd_boot.c
+++ b/arch/arm/lib/cmd_boot.c
@@ -19,6 +19,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <linux/types.h>
 
 /*
  * ARMv7M does not support ARM instruction mode. However, the
diff --git a/arch/arm/lib/eabi_compat.c b/arch/arm/lib/eabi_compat.c
index 9e2912ffe393..3e13dbb6ab64 100644
--- a/arch/arm/lib/eabi_compat.c
+++ b/arch/arm/lib/eabi_compat.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <stdio.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 int raise (int signum)
 {
diff --git a/arch/arm/lib/gic-v3-its.c b/arch/arm/lib/gic-v3-its.c
index 4fc9f9b78334..6b884ac375ac 100644
--- a/arch/arm/lib/gic-v3-its.c
+++ b/arch/arm/lib/gic-v3-its.c
@@ -14,6 +14,7 @@
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/sizes.h>
+#include <linux/types.h>
 
 static u32 lpi_id_bits;
 
diff --git a/arch/arm/lib/image.c b/arch/arm/lib/image.c
index 6a8591488439..9e8a7d671fba 100644
--- a/arch/arm/lib/image.c
+++ b/arch/arm/lib/image.c
@@ -7,11 +7,13 @@
 #include <common.h>
 #include <image.h>
 #include <mapmem.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/kernel.h>
 #include <linux/sizes.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/lib/interrupts.c b/arch/arm/lib/interrupts.c
index af65144f7a78..fafe4b04d9b9 100644
--- a/arch/arm/lib/interrupts.c
+++ b/arch/arm/lib/interrupts.c
@@ -27,6 +27,7 @@
 #include <asm/proc-armv/ptrace.h>
 #include <asm/ptrace.h>
 #include <asm/u-boot-arm.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/lib/interrupts_64.c b/arch/arm/lib/interrupts_64.c
index 00e052d9a862..4f342c9da3eb 100644
--- a/arch/arm/lib/interrupts_64.c
+++ b/arch/arm/lib/interrupts_64.c
@@ -5,11 +5,13 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/ptrace.h>
 #include <irq_func.h>
+#include <asm/types.h>
 #include <linux/compiler.h>
 #include <efi_loader.h>
 
diff --git a/arch/arm/lib/reloc_aarch64_efi.c b/arch/arm/lib/reloc_aarch64_efi.c
index 1aa57dbc80de..5aab6acec5aa 100644
--- a/arch/arm/lib/reloc_aarch64_efi.c
+++ b/arch/arm/lib/reloc_aarch64_efi.c
@@ -35,6 +35,7 @@
 */
 
 #include <efi.h>
+#include <linux/types.h>
 
 #include <elf.h>
 
diff --git a/arch/arm/lib/reloc_arm_efi.c b/arch/arm/lib/reloc_arm_efi.c
index 9103c035c541..bf07a63c4873 100644
--- a/arch/arm/lib/reloc_arm_efi.c
+++ b/arch/arm/lib/reloc_arm_efi.c
@@ -13,6 +13,7 @@
 
 #include <efi.h>
 #include <elf.h>
+#include <linux/types.h>
 
 efi_status_t EFIAPI _relocate(long ldbase, Elf32_Dyn *dyn)
 {
diff --git a/arch/arm/lib/reset.c b/arch/arm/lib/reset.c
index 4f1a768bfe13..f427c60deca5 100644
--- a/arch/arm/lib/reset.c
+++ b/arch/arm/lib/reset.c
@@ -22,6 +22,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <irq_func.h>
 #include <linux/delay.h>
diff --git a/arch/arm/lib/semihosting.c b/arch/arm/lib/semihosting.c
index 8b09d87cb169..685351c59f99 100644
--- a/arch/arm/lib/semihosting.c
+++ b/arch/arm/lib/semihosting.c
@@ -18,6 +18,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define SYSOPEN		0x01
 #define SYSCLOSE	0x02
diff --git a/arch/arm/lib/spl.c b/arch/arm/lib/spl.c
index b2b54f28fc4b..d0c370270d5a 100644
--- a/arch/arm/lib/spl.c
+++ b/arch/arm/lib/spl.c
@@ -8,6 +8,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <config.h>
 #include <init.h>
 #include <log.h>
@@ -17,6 +18,7 @@
 #include <asm/global_data.h>
 #include <linux/compiler.h>
 #include <asm/mach-types.h>
+#include <linux/types.h>
 
 #ifndef CONFIG_SPL_DM
 /* Pointer to as well as the global data structure for SPL */
diff --git a/arch/arm/lib/zimage.c b/arch/arm/lib/zimage.c
index b5155c2a9143..08f55927db51 100644
--- a/arch/arm/lib/zimage.c
+++ b/arch/arm/lib/zimage.c
@@ -7,8 +7,10 @@
  * Copyright (C) 2012 Marek Vasut <marek.vasut@gmail.com>
  */
 #include <common.h>
+#include <compiler.h>
 #include <image.h>
 #include <stdio.h>
+#include <linux/types.h>
 
 #define	LINUX_ARM_ZIMAGE_MAGIC	0x016f2818
 #define	BAREBOX_IMAGE_MAGIC	0x00786f62
diff --git a/arch/arm/mach-aspeed/ast2500/sdram_ast2500.c b/arch/arm/mach-aspeed/ast2500/sdram_ast2500.c
index 9eefeef5fb33..e6618d4c76eb 100644
--- a/arch/arm/mach-aspeed/ast2500/sdram_ast2500.c
+++ b/arch/arm/mach-aspeed/ast2500/sdram_ast2500.c
@@ -22,6 +22,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <dt-bindings/clock/ast2500-scu.h>
+#include <linux/types.h>
 
 /* These configuration parameters are taken from Aspeed SDK */
 #define DDR4_MR46_MODE		0x08000000
diff --git a/arch/arm/mach-aspeed/ast_wdt.c b/arch/arm/mach-aspeed/ast_wdt.c
index 5bc442ef33ce..461d20303e36 100644
--- a/arch/arm/mach-aspeed/ast_wdt.c
+++ b/arch/arm/mach-aspeed/ast_wdt.c
@@ -7,6 +7,7 @@
 #include <asm/io.h>
 #include <asm/arch/wdt.h>
 #include <linux/err.h>
+#include <linux/types.h>
 
 u32 ast_reset_mode_from_flags(ulong flags)
 {
diff --git a/arch/arm/mach-at91/arm920t/clock.c b/arch/arm/mach-at91/arm920t/clock.c
index 57cb159d1f60..b73864c69775 100644
--- a/arch/arm/mach-at91/arm920t/clock.c
+++ b/arch/arm/mach-at91/arm920t/clock.c
@@ -15,6 +15,7 @@
 #include <asm/arch/hardware.h>
 #include <asm/arch/at91_pmc.h>
 #include <asm/arch/clk.h>
+#include <linux/types.h>
 
 #if !defined(CONFIG_AT91FAMILY)
 # error You need to define CONFIG_AT91FAMILY in your board config!
diff --git a/arch/arm/mach-at91/arm920t/reset.c b/arch/arm/mach-at91/arm920t/reset.c
index d92bc57d6690..a264b2b1c54c 100644
--- a/arch/arm/mach-at91/arm920t/reset.c
+++ b/arch/arm/mach-at91/arm920t/reset.c
@@ -18,6 +18,7 @@
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/at91_st.h>
+#include <linux/types.h>
 
 void  __attribute__((weak)) board_reset(void)
 {
diff --git a/arch/arm/mach-at91/arm920t/timer.c b/arch/arm/mach-at91/arm920t/timer.c
index c400e8781356..fa0e582f062b 100644
--- a/arch/arm/mach-at91/arm920t/timer.c
+++ b/arch/arm/mach-at91/arm920t/timer.c
@@ -18,6 +18,7 @@
 #include <time.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
diff --git a/arch/arm/mach-at91/arm926ejs/clock.c b/arch/arm/mach-at91/arm926ejs/clock.c
index 97e45fffd1d1..6a742766d4ec 100644
--- a/arch/arm/mach-at91/arm926ejs/clock.c
+++ b/arch/arm/mach-at91/arm926ejs/clock.c
@@ -15,6 +15,7 @@
 #include <asm/arch/hardware.h>
 #include <asm/arch/at91_pmc.h>
 #include <asm/arch/clk.h>
+#include <linux/types.h>
 
 #if !defined(CONFIG_AT91FAMILY)
 # error You need to define CONFIG_AT91FAMILY in your board config!
diff --git a/arch/arm/mach-at91/arm926ejs/cpu.c b/arch/arm/mach-at91/arm926ejs/cpu.c
index 4dbb806979de..0b9cdfac7f6e 100644
--- a/arch/arm/mach-at91/arm926ejs/cpu.c
+++ b/arch/arm/mach-at91/arm926ejs/cpu.c
@@ -15,6 +15,7 @@
 #include <asm/arch/at91_pit.h>
 #include <asm/arch/at91_gpbr.h>
 #include <asm/arch/clk.h>
+#include <linux/types.h>
 
 #ifndef CONFIG_SYS_AT91_MAIN_CLOCK
 #define CONFIG_SYS_AT91_MAIN_CLOCK 0
diff --git a/arch/arm/mach-at91/arm926ejs/eflash.c b/arch/arm/mach-at91/arm926ejs/eflash.c
index ca52791d5bc4..9a727b5c1635 100644
--- a/arch/arm/mach-at91/arm926ejs/eflash.c
+++ b/arch/arm/mach-at91/arm926ejs/eflash.c
@@ -52,6 +52,7 @@
 #include <asm/arch/at91_common.h>
 #include <asm/arch/at91_eefc.h>
 #include <asm/arch/at91_dbu.h>
+#include <linux/types.h>
 
 /* checks to detect configuration errors */
 #if CONFIG_SYS_MAX_FLASH_BANKS!=1
diff --git a/arch/arm/mach-at91/arm926ejs/reset.c b/arch/arm/mach-at91/arm926ejs/reset.c
index 56fbbd991e5d..6a604d2432c1 100644
--- a/arch/arm/mach-at91/arm926ejs/reset.c
+++ b/arch/arm/mach-at91/arm926ejs/reset.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/at91_rstc.h>
+#include <linux/types.h>
 
 /* Reset the cpu by telling the reset controller to do so */
 void reset_cpu(ulong ignored)
diff --git a/arch/arm/mach-at91/arm926ejs/timer.c b/arch/arm/mach-at91/arm926ejs/timer.c
index a8cf0e4bd799..b479feeca4d3 100644
--- a/arch/arm/mach-at91/arm926ejs/timer.c
+++ b/arch/arm/mach-at91/arm926ejs/timer.c
@@ -14,6 +14,7 @@
 #include <asm/arch/at91_pit.h>
 #include <asm/arch/clk.h>
 #include <div64.h>
+#include <linux/types.h>
 
 #if !defined(CONFIG_AT91FAMILY)
 # error You need to define CONFIG_AT91FAMILY in your board config!
diff --git a/arch/arm/mach-at91/armv7/clock.c b/arch/arm/mach-at91/armv7/clock.c
index 7fab52d1e7e3..984b9033e414 100644
--- a/arch/arm/mach-at91/armv7/clock.c
+++ b/arch/arm/mach-at91/armv7/clock.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/io.h>
diff --git a/arch/arm/mach-at91/armv7/cpu.c b/arch/arm/mach-at91/armv7/cpu.c
index 22a03c82a2a0..a1fa2ab9e597 100644
--- a/arch/arm/mach-at91/armv7/cpu.c
+++ b/arch/arm/mach-at91/armv7/cpu.c
@@ -18,6 +18,7 @@
 #include <asm/arch/at91_pit.h>
 #include <asm/arch/at91_gpbr.h>
 #include <asm/arch/clk.h>
+#include <linux/types.h>
 
 #ifndef CONFIG_SYS_AT91_MAIN_CLOCK
 #define CONFIG_SYS_AT91_MAIN_CLOCK 0
diff --git a/arch/arm/mach-at91/armv7/reset.c b/arch/arm/mach-at91/armv7/reset.c
index 8f4c81d1afd5..08e0e69359de 100644
--- a/arch/arm/mach-at91/armv7/reset.c
+++ b/arch/arm/mach-at91/armv7/reset.c
@@ -13,6 +13,7 @@
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/at91_rstc.h>
+#include <linux/types.h>
 
 /* Reset the cpu by telling the reset controller to do so */
 void reset_cpu(ulong ignored)
diff --git a/arch/arm/mach-at91/armv7/timer.c b/arch/arm/mach-at91/armv7/timer.c
index 1f54c5dcad98..edb9eefe71e5 100644
--- a/arch/arm/mach-at91/armv7/timer.c
+++ b/arch/arm/mach-at91/armv7/timer.c
@@ -17,6 +17,7 @@
 #include <asm/arch/at91_pit.h>
 #include <asm/arch/clk.h>
 #include <div64.h>
+#include <linux/types.h>
 
 #if !defined(CONFIG_AT91FAMILY)
 # error You need to define CONFIG_AT91FAMILY in your board config!
diff --git a/arch/arm/mach-at91/atmel_sfr.c b/arch/arm/mach-at91/atmel_sfr.c
index c2677c51c0ce..a80afaa90a12 100644
--- a/arch/arm/mach-at91/atmel_sfr.c
+++ b/arch/arm/mach-at91/atmel_sfr.c
@@ -9,6 +9,7 @@
 #include <asm/hardware.h>
 #include <asm/io.h>
 #include <asm/arch/at91_sfr.h>
+#include <asm/types.h>
 
 #if defined(CONFIG_SAMA5D2) || defined(CONFIG_SAMA5D4)
 void redirect_int_from_saic_to_aic(void)
diff --git a/arch/arm/mach-at91/clock.c b/arch/arm/mach-at91/clock.c
index f9723bd145e4..714ff6b0d31c 100644
--- a/arch/arm/mach-at91/clock.c
+++ b/arch/arm/mach-at91/clock.c
@@ -13,6 +13,7 @@
 #include <asm/arch/hardware.h>
 #include <asm/arch/at91_pmc.h>
 #include <asm/arch/at91_wdt.h>
+#include <linux/types.h>
 
 #define EN_UPLL_TIMEOUT		500
 
diff --git a/arch/arm/mach-at91/include/mach/at91_common.h b/arch/arm/mach-at91/include/mach/at91_common.h
index f3551832f3aa..a226f7eea729 100644
--- a/arch/arm/mach-at91/include/mach/at91_common.h
+++ b/arch/arm/mach-at91/include/mach/at91_common.h
@@ -9,6 +9,7 @@
 #define AT91_COMMON_H
 
 #include <stdbool.h>
+#include <asm/types.h>
 void at91_can_hw_init(void);
 void at91_gmac_hw_init(void);
 void at91_macb_hw_init(void);
diff --git a/arch/arm/mach-at91/include/mach/at91_dbu.h b/arch/arm/mach-at91/include/mach/at91_dbu.h
index 91bb686bc10a..5592cb903ce3 100644
--- a/arch/arm/mach-at91/include/mach/at91_dbu.h
+++ b/arch/arm/mach-at91/include/mach/at91_dbu.h
@@ -12,6 +12,7 @@
 
 #ifndef __ASSEMBLY__
 
+#include <asm/types.h>
 typedef struct at91_dbu {
 	u32	cr;	/* Control Register WO */
 	u32	mr;	/* Mode Register  RW */
diff --git a/arch/arm/mach-at91/include/mach/at91_eefc.h b/arch/arm/mach-at91/include/mach/at91_eefc.h
index e7bb2bfecbad..6c38f51e980d 100644
--- a/arch/arm/mach-at91/include/mach/at91_eefc.h
+++ b/arch/arm/mach-at91/include/mach/at91_eefc.h
@@ -12,6 +12,7 @@
 
 #ifndef __ASSEMBLY__
 
+#include <asm/types.h>
 typedef struct at91_eefc {
 	u32	fmr;	/* Flash Mode Register RW */
 	u32	fcr;	/* Flash Command Register WO */
diff --git a/arch/arm/mach-at91/include/mach/at91_emac.h b/arch/arm/mach-at91/include/mach/at91_emac.h
index 44b943be3dc3..397ed032d446 100644
--- a/arch/arm/mach-at91/include/mach/at91_emac.h
+++ b/arch/arm/mach-at91/include/mach/at91_emac.h
@@ -8,6 +8,7 @@
 #ifndef AT91_H
 #define AT91_H
 
+#include <asm/types.h>
 typedef struct at91_emac {
 	u32	 ctl;
 	u32	 cfg;
diff --git a/arch/arm/mach-at91/include/mach/at91_gpbr.h b/arch/arm/mach-at91/include/mach/at91_gpbr.h
index ac1bb1cf01a9..576685a29209 100644
--- a/arch/arm/mach-at91/include/mach/at91_gpbr.h
+++ b/arch/arm/mach-at91/include/mach/at91_gpbr.h
@@ -32,6 +32,7 @@
 
 #ifndef __ASSEMBLY__
 
+#include <asm/types.h>
 typedef struct at91_gpbr {
 	u32 reg[4];
 } at91_gpbr_t;
diff --git a/arch/arm/mach-at91/include/mach/at91_matrix.h b/arch/arm/mach-at91/include/mach/at91_matrix.h
index d98fcf51051d..a7c9281356fc 100644
--- a/arch/arm/mach-at91/include/mach/at91_matrix.h
+++ b/arch/arm/mach-at91/include/mach/at91_matrix.h
@@ -23,6 +23,7 @@
 #define AT91_ASM_MATRIX_MCFG	ATMEL_BASE_MATRIX
 
 #else
+#include <asm/types.h>
 #if defined(CONFIG_AT91SAM9260) || defined(CONFIG_AT91SAM9G20)
 #define AT91_MATRIX_MASTERS	6
 #define AT91_MATRIX_SLAVES	5
diff --git a/arch/arm/mach-at91/include/mach/at91_mc.h b/arch/arm/mach-at91/include/mach/at91_mc.h
index 18b0e163c099..4d7dd361b149 100644
--- a/arch/arm/mach-at91/include/mach/at91_mc.h
+++ b/arch/arm/mach-at91/include/mach/at91_mc.h
@@ -15,6 +15,7 @@
 
 #ifndef __ASSEMBLY__
 
+#include <asm/types.h>
 typedef struct at91_ebi {
 	u32 	csa;		/* 0x00 Chip Select Assignment Register */
 	u32	cfgr;		/* 0x04 Configuration Register */
diff --git a/arch/arm/mach-at91/include/mach/at91_pdc.h b/arch/arm/mach-at91/include/mach/at91_pdc.h
index a855a7177ac8..16115b2e81b9 100644
--- a/arch/arm/mach-at91/include/mach/at91_pdc.h
+++ b/arch/arm/mach-at91/include/mach/at91_pdc.h
@@ -6,6 +6,7 @@
 #ifndef AT91_PDC_H
 #define AT91_PDC_H
 
+#include <asm/types.h>
 typedef struct at91_pdc {
 	u32	rpr;		/* 0x100 Receive Pointer Register */
 	u32	rcr;		/* 0x104 Receive Counter Register */
diff --git a/arch/arm/mach-at91/include/mach/at91_pio.h b/arch/arm/mach-at91/include/mach/at91_pio.h
index f51e47e55d53..60e36e753e8c 100644
--- a/arch/arm/mach-at91/include/mach/at91_pio.h
+++ b/arch/arm/mach-at91/include/mach/at91_pio.h
@@ -35,6 +35,7 @@
 
 #ifndef __ASSEMBLY__
 
+#include <asm/types.h>
 typedef struct at91_port {
 	u32	per;		/* 0x00 PIO Enable Register */
 	u32	pdr;		/* 0x04 PIO Disable Register */
diff --git a/arch/arm/mach-at91/include/mach/at91_pit.h b/arch/arm/mach-at91/include/mach/at91_pit.h
index dfaf2e02608e..bed0304a47f0 100644
--- a/arch/arm/mach-at91/include/mach/at91_pit.h
+++ b/arch/arm/mach-at91/include/mach/at91_pit.h
@@ -12,6 +12,7 @@
 #ifndef AT91_PIT_H
 #define AT91_PIT_H
 
+#include <asm/types.h>
 typedef struct at91_pit {
 	u32	mr;	/* 0x00 Mode Register */
 	u32	sr;	/* 0x04 Status Register */
diff --git a/arch/arm/mach-at91/include/mach/at91_rstc.h b/arch/arm/mach-at91/include/mach/at91_rstc.h
index 11ffe4454a6e..c1846de3ae15 100644
--- a/arch/arm/mach-at91/include/mach/at91_rstc.h
+++ b/arch/arm/mach-at91/include/mach/at91_rstc.h
@@ -18,6 +18,7 @@
 
 #ifndef __ASSEMBLY__
 
+#include <asm/types.h>
 typedef struct at91_rstc {
 	u32	cr;	/* Reset Controller Control Register */
 	u32	sr;	/* Reset Controller Status Register */
diff --git a/arch/arm/mach-at91/include/mach/at91_rtt.h b/arch/arm/mach-at91/include/mach/at91_rtt.h
index ba88c441e330..3d39328873f4 100644
--- a/arch/arm/mach-at91/include/mach/at91_rtt.h
+++ b/arch/arm/mach-at91/include/mach/at91_rtt.h
@@ -12,6 +12,7 @@
 
 #ifndef __ASSEMBLY__
 
+#include <asm/types.h>
 typedef struct at91_rtt {
 	u32	mr;	/* Mode Register   RW 0x00008000 */
 	u32	ar;	/* Alarm Register  RW 0xFFFFFFFF */
diff --git a/arch/arm/mach-at91/include/mach/at91_sfr.h b/arch/arm/mach-at91/include/mach/at91_sfr.h
index 4517df41bce0..1044f6b77a9d 100644
--- a/arch/arm/mach-at91/include/mach/at91_sfr.h
+++ b/arch/arm/mach-at91/include/mach/at91_sfr.h
@@ -9,6 +9,7 @@
 #ifndef __AT91_SFR_H
 #define __AT91_SFR_H
 
+#include <asm/types.h>
 #include <linux/bitops.h>
 struct atmel_sfr {
 	u32 reserved1;	/* 0x00 */
diff --git a/arch/arm/mach-at91/include/mach/at91_spi.h b/arch/arm/mach-at91/include/mach/at91_spi.h
index ce7bbf276d04..4f1f5fca3ba2 100644
--- a/arch/arm/mach-at91/include/mach/at91_spi.h
+++ b/arch/arm/mach-at91/include/mach/at91_spi.h
@@ -13,6 +13,7 @@
 #define AT91_SPI_H
 
 #include <asm/arch/at91_pdc.h>
+#include <asm/types.h>
 
 typedef struct at91_spi {
 	u32		cr;		/* 0x00 Control Register */
diff --git a/arch/arm/mach-at91/include/mach/at91_st.h b/arch/arm/mach-at91/include/mach/at91_st.h
index ec4658a39177..24f5bad60174 100644
--- a/arch/arm/mach-at91/include/mach/at91_st.h
+++ b/arch/arm/mach-at91/include/mach/at91_st.h
@@ -6,6 +6,7 @@
 #ifndef AT91_ST_H
 #define AT91_ST_H
 
+#include <asm/types.h>
 typedef struct at91_st {
 
 	u32	cr;
diff --git a/arch/arm/mach-at91/include/mach/at91_tc.h b/arch/arm/mach-at91/include/mach/at91_tc.h
index eb6950ab28c1..0ddc01034293 100644
--- a/arch/arm/mach-at91/include/mach/at91_tc.h
+++ b/arch/arm/mach-at91/include/mach/at91_tc.h
@@ -6,6 +6,7 @@
 #ifndef AT91_TC_H
 #define AT91_TC_H
 
+#include <asm/types.h>
 typedef struct at91_tcc {
 	u32		ccr;	/* 0x00 Channel Control Register */
 	u32		cmr;	/* 0x04 Channel Mode Register */
diff --git a/arch/arm/mach-at91/include/mach/at91_wdt.h b/arch/arm/mach-at91/include/mach/at91_wdt.h
index 8ef8e007d776..1f1d81ef1ca5 100644
--- a/arch/arm/mach-at91/include/mach/at91_wdt.h
+++ b/arch/arm/mach-at91/include/mach/at91_wdt.h
@@ -19,6 +19,8 @@
 
 #else
 
+#include <compiler.h>
+#include <asm/types.h>
 typedef struct at91_wdt {
 	u32	cr;
 	u32	mr;
diff --git a/arch/arm/mach-at91/include/mach/at91sam9260_matrix.h b/arch/arm/mach-at91/include/mach/at91sam9260_matrix.h
index 7271129f6be9..bb39119d55f4 100644
--- a/arch/arm/mach-at91/include/mach/at91sam9260_matrix.h
+++ b/arch/arm/mach-at91/include/mach/at91sam9260_matrix.h
@@ -14,6 +14,7 @@
 #ifndef __ASSEMBLY__
 
 /*
+#include <asm/types.h>
  * This struct defines access to the matrix' maximum of
  * 16 masters and 16 slaves.
  * However, on the AT91SAM9260/9G20/9XE there exist only
diff --git a/arch/arm/mach-at91/include/mach/at91sam9261_matrix.h b/arch/arm/mach-at91/include/mach/at91sam9261_matrix.h
index b856759b1db4..d2f3345b4bde 100644
--- a/arch/arm/mach-at91/include/mach/at91sam9261_matrix.h
+++ b/arch/arm/mach-at91/include/mach/at91sam9261_matrix.h
@@ -13,6 +13,7 @@
 
 #ifndef __ASSEMBLY__
 
+#include <asm/types.h>
 struct at91_matrix {
 	u32	mcfg;	/* Master Configuration Registers */
 	u32	scfg[5];	/* Slave Configuration Registers */
diff --git a/arch/arm/mach-at91/include/mach/at91sam9263_matrix.h b/arch/arm/mach-at91/include/mach/at91sam9263_matrix.h
index f08d2eb1fac9..fd2aaad5a176 100644
--- a/arch/arm/mach-at91/include/mach/at91sam9263_matrix.h
+++ b/arch/arm/mach-at91/include/mach/at91sam9263_matrix.h
@@ -14,6 +14,7 @@
 #ifndef __ASSEMBLY__
 
 /*
+#include <asm/types.h>
  * This struct defines access to the matrix' maximum of
  * 16 masters and 16 slaves.
  * Note: not all masters/slaves are available
diff --git a/arch/arm/mach-at91/include/mach/at91sam9_sdramc.h b/arch/arm/mach-at91/include/mach/at91sam9_sdramc.h
index 64abf70c5b4d..9feabe9252f8 100644
--- a/arch/arm/mach-at91/include/mach/at91sam9_sdramc.h
+++ b/arch/arm/mach-at91/include/mach/at91sam9_sdramc.h
@@ -25,6 +25,7 @@
 #define AT91_ASM_SDRAMC_MDR	(ATMEL_BASE_SDRAMC + 0x24)
 
 #else
+#include <asm/types.h>
 struct sdramc_reg {
 	u32	mr;
 	u32	tr;
diff --git a/arch/arm/mach-at91/include/mach/at91sam9_smc.h b/arch/arm/mach-at91/include/mach/at91sam9_smc.h
index 404ffaad4426..f4045b1173e8 100644
--- a/arch/arm/mach-at91/include/mach/at91sam9_smc.h
+++ b/arch/arm/mach-at91/include/mach/at91sam9_smc.h
@@ -24,6 +24,7 @@
 #define AT91_ASM_SMC_MODE0	(ATMEL_BASE_SMC + 0x0C)
 
 #else
+#include <asm/types.h>
 
 typedef struct	at91_cs {
 	u32	setup;		/* 0x00 SMC Setup Register */
diff --git a/arch/arm/mach-at91/include/mach/at91sam9g45_matrix.h b/arch/arm/mach-at91/include/mach/at91sam9g45_matrix.h
index 62d4901bc1c9..fde18a212e88 100644
--- a/arch/arm/mach-at91/include/mach/at91sam9g45_matrix.h
+++ b/arch/arm/mach-at91/include/mach/at91sam9g45_matrix.h
@@ -13,6 +13,7 @@
 
 #ifndef __ASSEMBLY__
 
+#include <asm/types.h>
 struct at91_matrix {
 	u32	mcfg[16];
 	u32	scfg[16];
diff --git a/arch/arm/mach-at91/include/mach/at91sam9rl_matrix.h b/arch/arm/mach-at91/include/mach/at91sam9rl_matrix.h
index 295f768b5526..b798c181b465 100644
--- a/arch/arm/mach-at91/include/mach/at91sam9rl_matrix.h
+++ b/arch/arm/mach-at91/include/mach/at91sam9rl_matrix.h
@@ -16,6 +16,7 @@
 
 #ifndef __ASSEMBLY__
 
+#include <asm/types.h>
 struct at91_matrix {
 	u32	mcfg[16];	/* Master Configuration Registers */
 	u32	scfg[16];	/* Slave Configuration Registers */
diff --git a/arch/arm/mach-at91/include/mach/at91sam9x5_matrix.h b/arch/arm/mach-at91/include/mach/at91sam9x5_matrix.h
index 8288090d5a15..ddb6b1aec89e 100644
--- a/arch/arm/mach-at91/include/mach/at91sam9x5_matrix.h
+++ b/arch/arm/mach-at91/include/mach/at91sam9x5_matrix.h
@@ -14,6 +14,7 @@
 #ifndef __ASSEMBLY__
 
 /* AT91SAM9N12 Matrix definition is a subset of AT91SAM9X5. */
+#include <asm/types.h>
 struct at91_matrix {
 	u32	mcfg[16];
 	u32	scfg[16];
diff --git a/arch/arm/mach-at91/include/mach/atmel_mpddrc.h b/arch/arm/mach-at91/include/mach/atmel_mpddrc.h
index 40ec87e2ff94..d68c93cdd3cf 100644
--- a/arch/arm/mach-at91/include/mach/atmel_mpddrc.h
+++ b/arch/arm/mach-at91/include/mach/atmel_mpddrc.h
@@ -10,6 +10,7 @@
 #ifndef __ATMEL_MPDDRC_H__
 #define __ATMEL_MPDDRC_H__
 
+#include <asm/types.h>
 struct atmel_mpddrc_config {
 	u32 mr;
 	u32 rtr;
diff --git a/arch/arm/mach-at91/include/mach/atmel_pio4.h b/arch/arm/mach-at91/include/mach/atmel_pio4.h
index f348b05bc852..c87ca43d9f92 100644
--- a/arch/arm/mach-at91/include/mach/atmel_pio4.h
+++ b/arch/arm/mach-at91/include/mach/atmel_pio4.h
@@ -9,6 +9,7 @@
 
 #ifndef __ASSEMBLY__
 
+#include <asm/types.h>
 #include <linux/bitops.h>
 struct atmel_pio4_port {
 	u32 mskr;		/* 0x00 PIO Mask Register */
diff --git a/arch/arm/mach-at91/include/mach/atmel_sdhci.h b/arch/arm/mach-at91/include/mach/atmel_sdhci.h
index 48b6bd22368e..5c237a0a6876 100644
--- a/arch/arm/mach-at91/include/mach/atmel_sdhci.h
+++ b/arch/arm/mach-at91/include/mach/atmel_sdhci.h
@@ -7,6 +7,7 @@
 #ifndef __ATMEL_SDHCI_H
 #define __ATMEL_SDHCI_H
 
+#include <asm/types.h>
 int atmel_sdhci_init(void *regbase, u32 id);
 
 #endif
diff --git a/arch/arm/mach-at91/include/mach/atmel_serial.h b/arch/arm/mach-at91/include/mach/atmel_serial.h
index c53a509ff8bb..6f348225645d 100644
--- a/arch/arm/mach-at91/include/mach/atmel_serial.h
+++ b/arch/arm/mach-at91/include/mach/atmel_serial.h
@@ -7,6 +7,7 @@
 #define _ATMEL_SERIAL_H
 
 /* Information about a serial port */
+#include <linux/types.h>
 struct atmel_serial_platdata {
 	uint32_t base_addr;
 };
diff --git a/arch/arm/mach-at91/include/mach/clk.h b/arch/arm/mach-at91/include/mach/clk.h
index c1d92739e472..f6ceea2b2b28 100644
--- a/arch/arm/mach-at91/include/mach/clk.h
+++ b/arch/arm/mach-at91/include/mach/clk.h
@@ -11,6 +11,7 @@
 #include <asm/arch/hardware.h>
 #include <asm/arch/at91_pmc.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 
 #define GCK_CSS_SLOW_CLK	0
 #define GCK_CSS_MAIN_CLK	1
diff --git a/arch/arm/mach-at91/include/mach/gpio.h b/arch/arm/mach-at91/include/mach/gpio.h
index 575c6436ad3d..1cbe1fcba168 100644
--- a/arch/arm/mach-at91/include/mach/gpio.h
+++ b/arch/arm/mach-at91/include/mach/gpio.h
@@ -12,6 +12,7 @@
 #include <linux/errno.h>
 #include <asm/arch/at91_pio.h>
 #include <asm/arch/hardware.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_ATMEL_LEGACY
 
diff --git a/arch/arm/mach-at91/include/mach/sama5_matrix.h b/arch/arm/mach-at91/include/mach/sama5_matrix.h
index 2a92d7016103..8f315efdb10b 100644
--- a/arch/arm/mach-at91/include/mach/sama5_matrix.h
+++ b/arch/arm/mach-at91/include/mach/sama5_matrix.h
@@ -9,6 +9,7 @@
 #ifndef __SAMA5_MATRIX_H
 #define __SAMA5_MATRIX_H
 
+#include <asm/types.h>
 struct atmel_matrix {
 	u32 mcfg[16];	/* 0x00 ~ 0x3c: Master Configuration Register */
 	u32 scfg[16];	/* 0x40 ~ 0x7c: Slave Configuration Register */
diff --git a/arch/arm/mach-at91/include/mach/sama5d2_smc.h b/arch/arm/mach-at91/include/mach/sama5d2_smc.h
index 928a078f5f49..03f04af93026 100644
--- a/arch/arm/mach-at91/include/mach/sama5d2_smc.h
+++ b/arch/arm/mach-at91/include/mach/sama5d2_smc.h
@@ -16,6 +16,7 @@
 #define AT91_ASM_SMC_TIMINGS0	(ATMEL_BASE_SMC + 0x70c)
 #define AT91_ASM_SMC_MODE0	(ATMEL_BASE_SMC + 0x710)
 #else
+#include <asm/types.h>
 struct at91_cs {
 	u32	setup;		/* 0x600 SMC Setup Register */
 	u32	pulse;		/* 0x604 SMC Pulse Register */
diff --git a/arch/arm/mach-at91/include/mach/sama5d3_smc.h b/arch/arm/mach-at91/include/mach/sama5d3_smc.h
index 547e7b72f4a0..9c2b8461b704 100644
--- a/arch/arm/mach-at91/include/mach/sama5d3_smc.h
+++ b/arch/arm/mach-at91/include/mach/sama5d3_smc.h
@@ -16,6 +16,7 @@
 #define AT91_ASM_SMC_TIMINGS0	(ATMEL_BASE_SMC + 0x60c)
 #define AT91_ASM_SMC_MODE0	(ATMEL_BASE_SMC + 0x610)
 #else
+#include <asm/types.h>
 struct at91_cs {
 	u32	setup;		/* 0x600 SMC Setup Register */
 	u32	pulse;		/* 0x604 SMC Pulse Register */
diff --git a/arch/arm/mach-at91/mpddrc.c b/arch/arm/mach-at91/mpddrc.c
index 5422c05456e0..a2bcf4924c81 100644
--- a/arch/arm/mach-at91/mpddrc.c
+++ b/arch/arm/mach-at91/mpddrc.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <asm/arch/atmel_mpddrc.h>
 #include <asm/arch/at91_common.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 #define SAMA5D3_MPDDRC_VERSION		0x140
diff --git a/arch/arm/mach-at91/spl.c b/arch/arm/mach-at91/spl.c
index 217fcfa66895..32e154922bea 100644
--- a/arch/arm/mach-at91/spl.c
+++ b/arch/arm/mach-at91/spl.c
@@ -12,6 +12,7 @@
 #include <asm/arch/at91_wdt.h>
 #include <asm/arch/clk.h>
 #include <spl.h>
+#include <asm/types.h>
 
 #if !defined(CONFIG_WDT_AT91)
 void at91_disable_wdt(void)
diff --git a/arch/arm/mach-at91/spl_at91.c b/arch/arm/mach-at91/spl_at91.c
index d0c732539248..e3b85d3c541a 100644
--- a/arch/arm/mach-at91/spl_at91.c
+++ b/arch/arm/mach-at91/spl_at91.c
@@ -9,6 +9,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <hang.h>
 #include <init.h>
 #include <log.h>
@@ -21,6 +22,7 @@
 #include <asm/arch/at91_wdt.h>
 #include <asm/arch/clk.h>
 #include <spl.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-at91/spl_atmel.c b/arch/arm/mach-at91/spl_atmel.c
index 23588e79f949..9442de6ee5f7 100644
--- a/arch/arm/mach-at91/spl_atmel.c
+++ b/arch/arm/mach-at91/spl_atmel.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <hang.h>
 #include <init.h>
 #include <log.h>
@@ -16,6 +17,7 @@
 #include <asm/arch/at91_wdt.h>
 #include <asm/arch/clk.h>
 #include <spl.h>
+#include <linux/types.h>
 
 static void switch_to_main_crystal_osc(void)
 {
diff --git a/arch/arm/mach-bcm283x/include/mach/gpio.h b/arch/arm/mach-bcm283x/include/mach/gpio.h
index 3263de9a352b..840388815a1b 100644
--- a/arch/arm/mach-bcm283x/include/mach/gpio.h
+++ b/arch/arm/mach-bcm283x/include/mach/gpio.h
@@ -8,6 +8,7 @@
 #ifndef _BCM2835_GPIO_H_
 #define _BCM2835_GPIO_H_
 
+#include <asm/types.h>
 #define BCM2835_GPIO_COUNT		54
 
 #define BCM2835_GPIO_FSEL_MASK		0x7
diff --git a/arch/arm/mach-bcm283x/include/mach/mbox.h b/arch/arm/mach-bcm283x/include/mach/mbox.h
index 70029eefdedf..61586eb85914 100644
--- a/arch/arm/mach-bcm283x/include/mach/mbox.h
+++ b/arch/arm/mach-bcm283x/include/mach/mbox.h
@@ -6,7 +6,9 @@
 #ifndef _BCM2835_MBOX_H
 #define _BCM2835_MBOX_H
 
+#include <compiler.h>
 #include <asm/arch/base.h>
+#include <asm/types.h>
 #include <linux/compiler.h>
 #include <linux/string.h>
 
diff --git a/arch/arm/mach-bcm283x/include/mach/msg.h b/arch/arm/mach-bcm283x/include/mach/msg.h
index e45c1bf010f1..483fb5b0e148 100644
--- a/arch/arm/mach-bcm283x/include/mach/msg.h
+++ b/arch/arm/mach-bcm283x/include/mach/msg.h
@@ -12,6 +12,7 @@
  * @module: ID of module to power on (BCM2835_MBOX_POWER_DEVID_...)
  * @return 0 if OK, -EIO on error
  */
+#include <linux/types.h>
 int bcm2835_power_on_module(u32 module);
 
 /**
diff --git a/arch/arm/mach-bcm283x/include/mach/sdhci.h b/arch/arm/mach-bcm283x/include/mach/sdhci.h
index 732369068705..481dc091439f 100644
--- a/arch/arm/mach-bcm283x/include/mach/sdhci.h
+++ b/arch/arm/mach-bcm283x/include/mach/sdhci.h
@@ -7,6 +7,7 @@
 #define _BCM2835_SDHCI_H_
 
 #include <asm/arch/base.h>
+#include <asm/types.h>
 
 #define BCM2835_SDHCI_PHYSADDR ({ BUG_ON(!rpi_bcm283x_base); \
 				  rpi_bcm283x_base + 0x00300000; })
diff --git a/arch/arm/mach-bcm283x/include/mach/wdog.h b/arch/arm/mach-bcm283x/include/mach/wdog.h
index 994266672057..2d8d7e0b0a37 100644
--- a/arch/arm/mach-bcm283x/include/mach/wdog.h
+++ b/arch/arm/mach-bcm283x/include/mach/wdog.h
@@ -7,6 +7,7 @@
 #define _BCM2835_WDOG_H
 
 #include <asm/arch/base.h>
+#include <asm/types.h>
 
 #define BCM2835_WDOG_PHYSADDR ({ BUG_ON(!rpi_bcm283x_base); \
 				 rpi_bcm283x_base + 0x00100000; })
diff --git a/arch/arm/mach-bcm283x/init.c b/arch/arm/mach-bcm283x/init.c
index b2708e4876ed..8ca9e3b8ff16 100644
--- a/arch/arm/mach-bcm283x/init.c
+++ b/arch/arm/mach-bcm283x/init.c
@@ -12,6 +12,7 @@
 #include <asm/global_data.h>
 #include <dm/device.h>
 #include <fdt_support.h>
+#include <linux/types.h>
 
 #define BCM2711_RPI4_PCIE_XHCI_MMIO_PHYS	0x600000000UL
 #define BCM2711_RPI4_PCIE_XHCI_MMIO_SIZE	0x800000UL
diff --git a/arch/arm/mach-bcm283x/mbox.c b/arch/arm/mach-bcm283x/mbox.c
index 0c8cf78c1888..8d036a187551 100644
--- a/arch/arm/mach-bcm283x/mbox.c
+++ b/arch/arm/mach-bcm283x/mbox.c
@@ -14,6 +14,7 @@
 #include <asm/arch/mbox.h>
 #include <phys2bus.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #define TIMEOUT 1000 /* ms */
 
diff --git a/arch/arm/mach-bcm283x/msg.c b/arch/arm/mach-bcm283x/msg.c
index 3c3eac9025b0..57411b9d6009 100644
--- a/arch/arm/mach-bcm283x/msg.c
+++ b/arch/arm/mach-bcm283x/msg.c
@@ -10,6 +10,7 @@
 #include <asm/arch/mbox.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 struct msg_set_power_state {
 	struct bcm2835_mbox_hdr hdr;
diff --git a/arch/arm/mach-bcm283x/reset.c b/arch/arm/mach-bcm283x/reset.c
index 2b4ccd47279f..0d39bbdcf46d 100644
--- a/arch/arm/mach-bcm283x/reset.c
+++ b/arch/arm/mach-bcm283x/reset.c
@@ -12,6 +12,7 @@
 #include <asm/arch/base.h>
 #include <asm/arch/wdog.h>
 #include <efi_loader.h>
+#include <linux/types.h>
 
 #define RESET_TIMEOUT 10
 
diff --git a/arch/arm/mach-bcmstb/include/mach/timer.h b/arch/arm/mach-bcmstb/include/mach/timer.h
index 039dd664c2c0..8767a4602f60 100644
--- a/arch/arm/mach-bcmstb/include/mach/timer.h
+++ b/arch/arm/mach-bcmstb/include/mach/timer.h
@@ -8,6 +8,7 @@
 #ifndef _BCMSTB_TIMER_H
 #define _BCMSTB_TIMER_H
 
+#include <linux/types.h>
 uint64_t get_ticks(void);
 
 #endif /* _BCMSTB_TIMER_H */
diff --git a/arch/arm/mach-davinci/include/mach/davinci_misc.h b/arch/arm/mach-davinci/include/mach/davinci_misc.h
index 41b2c6648ecc..711fb4b3d142 100644
--- a/arch/arm/mach-davinci/include/mach/davinci_misc.h
+++ b/arch/arm/mach-davinci/include/mach/davinci_misc.h
@@ -8,6 +8,7 @@
 
 #include <asm/arch/hardware.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 /* pin muxer definitions */
 #define PIN_MUX_NUM_FIELDS	8	/* Per register */
diff --git a/arch/arm/mach-davinci/include/mach/dm365_lowlevel.h b/arch/arm/mach-davinci/include/mach/dm365_lowlevel.h
index eb1488e74425..000e32f05747 100644
--- a/arch/arm/mach-davinci/include/mach/dm365_lowlevel.h
+++ b/arch/arm/mach-davinci/include/mach/dm365_lowlevel.h
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <asm/arch/hardware.h>
 #include <asm/io.h>
+#include <linux/types.h>
 
 void dm365_waitloop(unsigned long loopcnt);
 int dm365_pll1_init(unsigned long pllmult, unsigned long prediv);
diff --git a/arch/arm/mach-davinci/include/mach/sdmmc_defs.h b/arch/arm/mach-davinci/include/mach/sdmmc_defs.h
index e1851c5ae4e4..6c28974f68d2 100644
--- a/arch/arm/mach-davinci/include/mach/sdmmc_defs.h
+++ b/arch/arm/mach-davinci/include/mach/sdmmc_defs.h
@@ -10,6 +10,7 @@
 
 #include <asm/arch/hardware.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 /* MMC Control Reg fields */
 #define MMCCTL_DATRST		(1 << 0)
diff --git a/arch/arm/mach-davinci/include/mach/timer_defs.h b/arch/arm/mach-davinci/include/mach/timer_defs.h
index 110e67e454ce..f880b7ef9274 100644
--- a/arch/arm/mach-davinci/include/mach/timer_defs.h
+++ b/arch/arm/mach-davinci/include/mach/timer_defs.h
@@ -6,6 +6,7 @@
 #ifndef _TIMER_DEFS_H_
 #define _TIMER_DEFS_H_
 
+#include <linux/types.h>
 struct davinci_timer {
 	u_int32_t	pid12;
 	u_int32_t	emumgt;
diff --git a/arch/arm/mach-davinci/misc.c b/arch/arm/mach-davinci/misc.c
index d8a424fd028f..f59c2c220fda 100644
--- a/arch/arm/mach-davinci/misc.c
+++ b/arch/arm/mach-davinci/misc.c
@@ -19,6 +19,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/davinci_misc.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-davinci/spl.c b/arch/arm/mach-davinci/spl.c
index 9e14284ab02f..a9732fc5264d 100644
--- a/arch/arm/mach-davinci/spl.c
+++ b/arch/arm/mach-davinci/spl.c
@@ -17,6 +17,7 @@
 #include <malloc.h>
 #include <spi_flash.h>
 #include <mmc.h>
+#include <linux/types.h>
 
 #ifndef CONFIG_SPL_LIBCOMMON_SUPPORT
 void puts(const char *str)
diff --git a/arch/arm/mach-davinci/timer.c b/arch/arm/mach-davinci/timer.c
index 43e0574901ee..562363af34f0 100644
--- a/arch/arm/mach-davinci/timer.c
+++ b/arch/arm/mach-davinci/timer.c
@@ -28,6 +28,7 @@
 #include <asm/arch/timer_defs.h>
 #include <div64.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-exynos/clock.c b/arch/arm/mach-exynos/clock.c
index 33995ff4ec6a..bd570b9e3418 100644
--- a/arch/arm/mach-exynos/clock.c
+++ b/arch/arm/mach-exynos/clock.c
@@ -13,6 +13,7 @@
 #include <asm/arch/clk.h>
 #include <asm/arch/periph.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #define PLL_DIV_1024	1024
 #define PLL_DIV_65535	65535
diff --git a/arch/arm/mach-exynos/clock_init.h b/arch/arm/mach-exynos/clock_init.h
index a4d3fdae8518..6d0fe3a5bcc7 100644
--- a/arch/arm/mach-exynos/clock_init.h
+++ b/arch/arm/mach-exynos/clock_init.h
@@ -8,6 +8,7 @@
 #ifndef __EXYNOS_CLOCK_INIT_H
 #define __EXYNOS_CLOCK_INIT_H
 
+#include <linux/types.h>
 enum {
 #ifdef CONFIG_EXYNOS5420
 	MEM_TIMINGS_MSR_COUNT	= 5,
diff --git a/arch/arm/mach-exynos/clock_init_exynos5.c b/arch/arm/mach-exynos/clock_init_exynos5.c
index cf83ef9391a5..c5e2380e5160 100644
--- a/arch/arm/mach-exynos/clock_init_exynos5.c
+++ b/arch/arm/mach-exynos/clock_init_exynos5.c
@@ -12,6 +12,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/spl.h>
 #include <asm/arch/dwmmc.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 
 #include "clock_init.h"
diff --git a/arch/arm/mach-exynos/common_setup.h b/arch/arm/mach-exynos/common_setup.h
index 4e3702b92859..afae76531a95 100644
--- a/arch/arm/mach-exynos/common_setup.h
+++ b/arch/arm/mach-exynos/common_setup.h
@@ -24,6 +24,7 @@
  */
 
 #include <asm/arch/system.h>
+#include <linux/types.h>
 
 #define DMC_OFFSET	0x10000
 
diff --git a/arch/arm/mach-exynos/dmc_common.c b/arch/arm/mach-exynos/dmc_common.c
index 44923dd5520f..880e9fc2b66c 100644
--- a/arch/arm/mach-exynos/dmc_common.c
+++ b/arch/arm/mach-exynos/dmc_common.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <asm/arch/spl.h>
+#include <linux/types.h>
 
 #include "clock_init.h"
 #include "common_setup.h"
diff --git a/arch/arm/mach-exynos/dmc_init_ddr3.c b/arch/arm/mach-exynos/dmc_init_ddr3.c
index 2cf3c2fa06a4..0c0b68391b66 100644
--- a/arch/arm/mach-exynos/dmc_init_ddr3.c
+++ b/arch/arm/mach-exynos/dmc_init_ddr3.c
@@ -14,6 +14,7 @@
 #include <asm/arch/dmc.h>
 #include <asm/arch/power.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include "common_setup.h"
 #include "exynos5_setup.h"
 #include "clock_init.h"
diff --git a/arch/arm/mach-exynos/exynos5_setup.h b/arch/arm/mach-exynos/exynos5_setup.h
index bf4cca9e1939..7bb31e917dca 100644
--- a/arch/arm/mach-exynos/exynos5_setup.h
+++ b/arch/arm/mach-exynos/exynos5_setup.h
@@ -10,6 +10,7 @@
 
 #include <config.h>
 #include <asm/arch/dmc.h>
+#include <linux/types.h>
 
 #define NOT_AVAILABLE		0
 #define DATA_MASK		0xFFFFF
diff --git a/arch/arm/mach-exynos/include/mach/mmc.h b/arch/arm/mach-exynos/include/mach/mmc.h
index eece44ea1aa0..88e23b1138e8 100644
--- a/arch/arm/mach-exynos/include/mach/mmc.h
+++ b/arch/arm/mach-exynos/include/mach/mmc.h
@@ -7,6 +7,7 @@
 #ifndef __ASM_ARCH_MMC_H_
 #define __ASM_ARCH_MMC_H_
 
+#include <asm/types.h>
 #define S5P_MMC_DEV_OFFSET	0x10000
 
 #define SDHCI_CONTROL2		0x80
diff --git a/arch/arm/mach-exynos/include/mach/power.h b/arch/arm/mach-exynos/include/mach/power.h
index a3d8974dcb5b..27960c619b55 100644
--- a/arch/arm/mach-exynos/include/mach/power.h
+++ b/arch/arm/mach-exynos/include/mach/power.h
@@ -8,6 +8,7 @@
 #define __ASM_ARM_ARCH_POWER_H_
 
 #ifndef __ASSEMBLY__
+#include <linux/types.h>
 struct exynos4_power {
 	unsigned int	om_stat;
 	unsigned char	res1[0x8];
diff --git a/arch/arm/mach-exynos/include/mach/spl.h b/arch/arm/mach-exynos/include/mach/spl.h
index 9d642461bd62..7675d4dc724a 100644
--- a/arch/arm/mach-exynos/include/mach/spl.h
+++ b/arch/arm/mach-exynos/include/mach/spl.h
@@ -11,6 +11,8 @@
 
 #ifndef __ASSEMBLY__
 /* Parameters of early board initialization in SPL */
+#include <compiler.h>
+#include <asm/types.h>
 struct spl_machine_param {
 	/* Add fields as and when required */
 	u32		signature;
diff --git a/arch/arm/mach-exynos/include/mach/sromc.h b/arch/arm/mach-exynos/include/mach/sromc.h
index 15c9ccc723d8..81776988961e 100644
--- a/arch/arm/mach-exynos/include/mach/sromc.h
+++ b/arch/arm/mach-exynos/include/mach/sromc.h
@@ -24,6 +24,7 @@
 #define SROMC_BC_PMC(x)  (x << 0)  /* normal(1data)page mode configuration */
 
 #ifndef __ASSEMBLY__
+#include <asm/types.h>
 struct s5p_sromc {
 	unsigned int	bw;
 	unsigned int	bc[4];
diff --git a/arch/arm/mach-exynos/include/mach/sys_proto.h b/arch/arm/mach-exynos/include/mach/sys_proto.h
index 53d53bc6b6d7..23c8b643e2c7 100644
--- a/arch/arm/mach-exynos/include/mach/sys_proto.h
+++ b/arch/arm/mach-exynos/include/mach/sys_proto.h
@@ -7,6 +7,7 @@
 #ifndef _SYS_PROTO_H_
 #define _SYS_PROTO_H_
 
+#include <asm/types.h>
 u32 get_device_type(void);
 void invalidate_dcache(u32);
 void l2_cache_disable(void);
diff --git a/arch/arm/mach-exynos/include/mach/tmu.h b/arch/arm/mach-exynos/include/mach/tmu.h
index cad35694f644..b301f17b8742 100644
--- a/arch/arm/mach-exynos/include/mach/tmu.h
+++ b/arch/arm/mach-exynos/include/mach/tmu.h
@@ -20,6 +20,7 @@
 #ifndef __ASM_ARCH_TMU_H
 #define __ASM_ARCH_TMU_H
 
+#include <asm/types.h>
 struct exynos5_tmu_reg {
 	u32 triminfo;
 	u32 rsvd1[4];
diff --git a/arch/arm/mach-exynos/lowlevel_init.c b/arch/arm/mach-exynos/lowlevel_init.c
index 97d6ca8fc2a0..ecd23bf7a976 100644
--- a/arch/arm/mach-exynos/lowlevel_init.c
+++ b/arch/arm/mach-exynos/lowlevel_init.c
@@ -36,6 +36,7 @@
 #include <asm/arch/pinmux.h>
 #include <asm/arch/system.h>
 #include <asm/armv7.h>
+#include <linux/types.h>
 #include "common_setup.h"
 #include "exynos5_setup.h"
 
diff --git a/arch/arm/mach-exynos/pinmux.c b/arch/arm/mach-exynos/pinmux.c
index 5d7738ae5ba6..5a818ac2b1e8 100644
--- a/arch/arm/mach-exynos/pinmux.c
+++ b/arch/arm/mach-exynos/pinmux.c
@@ -10,6 +10,7 @@
 #include <asm/gpio.h>
 #include <asm/arch/pinmux.h>
 #include <asm/arch/sromc.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 
 static void exynos5_uart_config(int peripheral)
diff --git a/arch/arm/mach-exynos/power.c b/arch/arm/mach-exynos/power.c
index f2a6c00dd629..b36c395bebc6 100644
--- a/arch/arm/mach-exynos/power.c
+++ b/arch/arm/mach-exynos/power.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <asm/io.h>
 #include <asm/arch/power.h>
+#include <linux/types.h>
 
 static void exynos4_mipi_phy_control(unsigned int dev_index,
 					unsigned int enable)
diff --git a/arch/arm/mach-exynos/soc.c b/arch/arm/mach-exynos/soc.c
index 810fa348eeaf..388d50ff64d5 100644
--- a/arch/arm/mach-exynos/soc.c
+++ b/arch/arm/mach-exynos/soc.c
@@ -9,6 +9,7 @@
 #include <asm/cache.h>
 #include <asm/io.h>
 #include <asm/system.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_TARGET_ESPRESSO7420
 /*
diff --git a/arch/arm/mach-exynos/spl_boot.c b/arch/arm/mach-exynos/spl_boot.c
index 3ed5d10f1ae5..4c19cce1a473 100644
--- a/arch/arm/mach-exynos/spl_boot.c
+++ b/arch/arm/mach-exynos/spl_boot.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <asm/global_data.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include <asm/cache.h>
 #include <asm/arch/clock.h>
diff --git a/arch/arm/mach-imx/cache.c b/arch/arm/mach-imx/cache.c
index ce49253d0b40..c35720502bc3 100644
--- a/arch/arm/mach-imx/cache.c
+++ b/arch/arm/mach-imx/cache.c
@@ -11,6 +11,7 @@
 #include <asm/pl310.h>
 #include <asm/io.h>
 #include <asm/mach-imx/sys_proto.h>
+#include <asm/types.h>
 
 static void enable_ca7_smp(void)
 {
diff --git a/arch/arm/mach-imx/cmd_dek.c b/arch/arm/mach-imx/cmd_dek.c
index a8199497a916..62a9afe8b107 100644
--- a/arch/arm/mach-imx/cmd_dek.c
+++ b/arch/arm/mach-imx/cmd_dek.c
@@ -15,6 +15,7 @@
 #include <fsl_sec.h>
 #include <asm/arch/clock.h>
 #include <mapmem.h>
+#include <linux/types.h>
 
 /**
 * blob_dek() - Encapsulate the DEK as a blob using CAM's Key
diff --git a/arch/arm/mach-imx/cmd_nandbcb.c b/arch/arm/mach-imx/cmd_nandbcb.c
index 9165140e494f..882e71aee4ce 100644
--- a/arch/arm/mach-imx/cmd_nandbcb.c
+++ b/arch/arm/mach-imx/cmd_nandbcb.c
@@ -16,6 +16,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <nand.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <dm/devres.h>
@@ -23,6 +24,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <asm/io.h>
 #include <jffs2/jffs2.h>
diff --git a/arch/arm/mach-imx/cpu.c b/arch/arm/mach-imx/cpu.c
index c2f0f510e83a..a100054d24af 100644
--- a/arch/arm/mach-imx/cpu.c
+++ b/arch/arm/mach-imx/cpu.c
@@ -26,6 +26,7 @@
 #include <ipu_pixfmt.h>
 #include <thermal.h>
 #include <sata.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_FSL_ESDHC_IMX
 #include <fsl_esdhc_imx.h>
diff --git a/arch/arm/mach-imx/ddrmc-vf610-calibration.c b/arch/arm/mach-imx/ddrmc-vf610-calibration.c
index cd7e95e61d00..fbe3bfd07f2c 100644
--- a/arch/arm/mach-imx/ddrmc-vf610-calibration.c
+++ b/arch/arm/mach-imx/ddrmc-vf610-calibration.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
+#include <asm/types.h>
 #include <linux/bitmap.h>
 
 #include "ddrmc-vf610-calibration.h"
diff --git a/arch/arm/mach-imx/hab.c b/arch/arm/mach-imx/hab.c
index b576b032ec6e..73ae2b12a02c 100644
--- a/arch/arm/mach-imx/hab.c
+++ b/arch/arm/mach-imx/hab.c
@@ -18,6 +18,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/mach-imx/hab.h>
+#include <linux/types.h>
 
 #define ALIGN_SIZE		0x1000
 #define MX6DQ_PU_IROM_MMU_EN_VAR	0x009024a8
diff --git a/arch/arm/mach-imx/i2c-mxv7.c b/arch/arm/mach-imx/i2c-mxv7.c
index 1e1b14c1272c..963946769b8e 100644
--- a/arch/arm/mach-imx/i2c-mxv7.c
+++ b/arch/arm/mach-imx/i2c-mxv7.c
@@ -15,6 +15,7 @@
 #include <asm/mach-imx/mxc_i2c.h>
 #include <watchdog.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 int force_idle_bus(void *priv)
 {
diff --git a/arch/arm/mach-imx/imx8/ahab.c b/arch/arm/mach-imx/imx8/ahab.c
index f3c370914c6f..d779b476ecec 100644
--- a/arch/arm/mach-imx/imx8/ahab.c
+++ b/arch/arm/mach-imx/imx8/ahab.c
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <errno.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
@@ -21,6 +22,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-imx/imx8/clock.c b/arch/arm/mach-imx/imx8/clock.c
index 9288282dfb03..96a7d8bdcf37 100644
--- a/arch/arm/mach-imx/imx8/clock.c
+++ b/arch/arm/mach-imx/imx8/clock.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <asm/arch/clock.h>
 
diff --git a/arch/arm/mach-imx/imx8/cpu.c b/arch/arm/mach-imx/imx8/cpu.c
index cdfc135904de..f7be1603f43a 100644
--- a/arch/arm/mach-imx/imx8/cpu.c
+++ b/arch/arm/mach-imx/imx8/cpu.c
@@ -5,14 +5,17 @@
 
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <cpu.h>
 #include <cpu_func.h>
 #include <dm.h>
 #include <init.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <dm/device-internal.h>
 #include <dm/lists.h>
 #include <dm/uclass.h>
diff --git a/arch/arm/mach-imx/imx8/fdt.c b/arch/arm/mach-imx/imx8/fdt.c
index eee6e529cdca..4ffdc5e57276 100644
--- a/arch/arm/mach-imx/imx8/fdt.c
+++ b/arch/arm/mach-imx/imx8/fdt.c
@@ -10,6 +10,7 @@
 #include <asm/arch/sci/sci.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <dm/ofnode.h>
 #include <fdt_support.h>
diff --git a/arch/arm/mach-imx/imx8/image.c b/arch/arm/mach-imx/imx8/image.c
index 4258abecd080..d685c9f5e7d1 100644
--- a/arch/arm/mach-imx/imx8/image.c
+++ b/arch/arm/mach-imx/imx8/image.c
@@ -18,6 +18,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define MMC_DEV		0
 #define QSPI_DEV	1
diff --git a/arch/arm/mach-imx/imx8/iomux.c b/arch/arm/mach-imx/imx8/iomux.c
index 0f4f0cac1077..4c00622c3818 100644
--- a/arch/arm/mach-imx/imx8/iomux.c
+++ b/arch/arm/mach-imx/imx8/iomux.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/sci/sci.h>
+#include <asm/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-imx/imx8/misc.c b/arch/arm/mach-imx/imx8/misc.c
index e83c0517fca7..29566ad7c786 100644
--- a/arch/arm/mach-imx/imx8/misc.c
+++ b/arch/arm/mach-imx/imx8/misc.c
@@ -6,6 +6,7 @@
 #include <asm/mach-imx/sys_proto.h>
 #include <imx_sip.h>
 #include <linux/arm-smccc.h>
+#include <linux/types.h>
 
 int sc_pm_setup_uart(sc_rsrc_t uart_rsrc, sc_pm_clock_rate_t clk_rate)
 {
diff --git a/arch/arm/mach-imx/imx8/parse-container.c b/arch/arm/mach-imx/imx8/parse-container.c
index a5332358ca55..ba254516c2d1 100644
--- a/arch/arm/mach-imx/imx8/parse-container.c
+++ b/arch/arm/mach-imx/imx8/parse-container.c
@@ -13,6 +13,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define SEC_SECURE_RAM_BASE		0x31800000UL
 #define SEC_SECURE_RAM_END_BASE		(SEC_SECURE_RAM_BASE + 0xFFFFUL)
diff --git a/arch/arm/mach-imx/imx8/snvs_security_sc.c b/arch/arm/mach-imx/imx8/snvs_security_sc.c
index 086e89b0e5c5..cb8153953149 100644
--- a/arch/arm/mach-imx/imx8/snvs_security_sc.c
+++ b/arch/arm/mach-imx/imx8/snvs_security_sc.c
@@ -21,6 +21,7 @@
 #include <asm/arch-imx8/imx8-pins.h>
 #include <asm/arch-imx8/snvs_security_sc.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 
diff --git a/arch/arm/mach-imx/imx8m/clock_imx8mm.c b/arch/arm/mach-imx/imx8m/clock_imx8mm.c
index ac4d0766dab6..20f450c440b1 100644
--- a/arch/arm/mach-imx/imx8m/clock_imx8mm.c
+++ b/arch/arm/mach-imx/imx8m/clock_imx8mm.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
@@ -18,6 +19,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-imx/imx8m/clock_imx8mq.c b/arch/arm/mach-imx/imx8m/clock_imx8mq.c
index 95a1dbb71800..9b1956cf3780 100644
--- a/arch/arm/mach-imx/imx8m/clock_imx8mq.c
+++ b/arch/arm/mach-imx/imx8m/clock_imx8mq.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
@@ -17,6 +18,7 @@
 #include <linux/errno.h>
 #include <linux/iopoll.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 static struct anamix_pll *ana_pll = (struct anamix_pll *)ANATOP_BASE_ADDR;
 
diff --git a/arch/arm/mach-imx/imx8m/clock_slice.c b/arch/arm/mach-imx/imx8m/clock_slice.c
index 4074e1e4c52f..ff8bd35cf9a0 100644
--- a/arch/arm/mach-imx/imx8m/clock_slice.c
+++ b/arch/arm/mach-imx/imx8m/clock_slice.c
@@ -6,10 +6,13 @@
  */
 
 #include <common.h>
+#include <compiler.h>
+#include <stdbool.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/io.h>
 #include <errno.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 
diff --git a/arch/arm/mach-imx/imx8m/soc.c b/arch/arm/mach-imx/imx8m/soc.c
index 99e268fa3fb0..64781e0c687e 100644
--- a/arch/arm/mach-imx/imx8m/soc.c
+++ b/arch/arm/mach-imx/imx8m/soc.c
@@ -6,9 +6,11 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <init.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/arch/imx-regs.h>
@@ -35,6 +37,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-imx/imx_bootaux.c b/arch/arm/mach-imx/imx_bootaux.c
index 02fa1d7b62b2..e24f430e3c4d 100644
--- a/arch/arm/mach-imx/imx_bootaux.c
+++ b/arch/arm/mach-imx/imx_bootaux.c
@@ -16,6 +16,7 @@
 #include <linux/compiler.h>
 #include <cpu_func.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 int arch_auxiliary_core_up(u32 core_id, ulong addr)
 {
diff --git a/arch/arm/mach-imx/init.c b/arch/arm/mach-imx/init.c
index 693b72442994..be9aac6e2214 100644
--- a/arch/arm/mach-imx/init.c
+++ b/arch/arm/mach-imx/init.c
@@ -9,6 +9,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/mach-imx/boot_mode.h>
 #include <asm/arch/crm_regs.h>
+#include <asm/types.h>
 
 void init_aips(void)
 {
diff --git a/arch/arm/mach-imx/iomux-v3.c b/arch/arm/mach-imx/iomux-v3.c
index 18131a20f438..219dd98a549b 100644
--- a/arch/arm/mach-imx/iomux-v3.c
+++ b/arch/arm/mach-imx/iomux-v3.c
@@ -12,6 +12,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/mach-imx/sys_proto.h>
+#include <asm/types.h>
 
 static void *base = (void *)IOMUXC_BASE_ADDR;
 
diff --git a/arch/arm/mach-imx/mac.c b/arch/arm/mach-imx/mac.c
index b23315cf90e8..d054f2e37f09 100644
--- a/arch/arm/mach-imx/mac.c
+++ b/arch/arm/mach-imx/mac.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
 #include <errno.h>
+#include <linux/types.h>
 
 struct imx_mac_fuse {
 	u32 mac_addr0;
diff --git a/arch/arm/mach-imx/misc.c b/arch/arm/mach-imx/misc.c
index d82efa7f8f0a..e142855fdba5 100644
--- a/arch/arm/mach-imx/misc.c
+++ b/arch/arm/mach-imx/misc.c
@@ -12,6 +12,7 @@
 #include <linux/errno.h>
 #include <asm/io.h>
 #include <asm/mach-imx/regs-common.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-imx/mmc_env.c b/arch/arm/mach-imx/mmc_env.c
index 9c822f721c60..9ad2cf4dc8f0 100644
--- a/arch/arm/mach-imx/mmc_env.c
+++ b/arch/arm/mach-imx/mmc_env.c
@@ -4,10 +4,12 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/io.h>
 #include <asm/mach-imx/boot_mode.h>
+#include <linux/types.h>
 
 __weak int board_mmc_get_env_dev(int devno)
 {
diff --git a/arch/arm/mach-imx/mmdc_size.c b/arch/arm/mach-imx/mmdc_size.c
index 1a094726aad5..05d71b236bcf 100644
--- a/arch/arm/mach-imx/mmdc_size.c
+++ b/arch/arm/mach-imx/mmdc_size.c
@@ -2,6 +2,7 @@
 
 #include <common.h>
 #include <asm/io.h>
+#include <asm/types.h>
 
 #if defined(CONFIG_MX53)
 #define MEMCTL_BASE	ESDCTL_BASE_ADDR
diff --git a/arch/arm/mach-imx/mx5/clock.c b/arch/arm/mach-imx/mx5/clock.c
index adc7dbee7d36..0b4fa84db791 100644
--- a/arch/arm/mach-imx/mx5/clock.c
+++ b/arch/arm/mach-imx/mx5/clock.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <command.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/io.h>
 #include <linux/errno.h>
@@ -19,6 +20,7 @@
 #include <asm/arch/sys_proto.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 enum pll_clocks {
 	PLL1_CLOCK = 0,
diff --git a/arch/arm/mach-imx/mx5/soc.c b/arch/arm/mach-imx/mx5/soc.c
index c61fcce3eb42..d4431a44fc6f 100644
--- a/arch/arm/mach-imx/mx5/soc.c
+++ b/arch/arm/mach-imx/mx5/soc.c
@@ -7,11 +7,13 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/cache.h>
+#include <asm/types.h>
 
 #include <linux/errno.h>
 #include <asm/io.h>
diff --git a/arch/arm/mach-imx/mx6/clock.c b/arch/arm/mach-imx/mx6/clock.c
index 7e066d39b2d5..4fdcb7b3f5a5 100644
--- a/arch/arm/mach-imx/mx6/clock.c
+++ b/arch/arm/mach-imx/mx6/clock.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <div64.h>
 #include <log.h>
 #include <stdbool.h>
@@ -16,6 +17,7 @@
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/types.h>
 
 enum pll_clocks {
 	PLL_SYS,	/* System PLL */
diff --git a/arch/arm/mach-imx/mx6/ddr.c b/arch/arm/mach-imx/mx6/ddr.c
index d5230d516a12..c02bcabc7440 100644
--- a/arch/arm/mach-imx/mx6/ddr.c
+++ b/arch/arm/mach-imx/mx6/ddr.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <hang.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
diff --git a/arch/arm/mach-imx/mx6/module_fuse.c b/arch/arm/mach-imx/mx6/module_fuse.c
index c1731a828562..c162b9c528aa 100644
--- a/arch/arm/mach-imx/mx6/module_fuse.c
+++ b/arch/arm/mach-imx/mx6/module_fuse.c
@@ -14,6 +14,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static struct fuse_entry_desc mx6_fuse_descs[] = {
 #if defined(CONFIG_MX6ULL)
diff --git a/arch/arm/mach-imx/mx6/mp.c b/arch/arm/mach-imx/mx6/mp.c
index d28d55d4be5c..1791bd294663 100644
--- a/arch/arm/mach-imx/mx6/mp.c
+++ b/arch/arm/mach-imx/mx6/mp.c
@@ -14,6 +14,7 @@
 #include <linux/errno.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/imx-regs.h>
+#include <linux/types.h>
 
 #define MAX_CPUS 4
 static struct src *src = (struct src *)SRC_BASE_ADDR;
diff --git a/arch/arm/mach-imx/mx6/opos6ul.c b/arch/arm/mach-imx/mx6/opos6ul.c
index e9d78740a157..a99e7326b9cc 100644
--- a/arch/arm/mach-imx/mx6/opos6ul.c
+++ b/arch/arm/mach-imx/mx6/opos6ul.c
@@ -3,6 +3,7 @@
  * Copyright (C) 2018 Armadeus Systems
  */
 
+#include <compiler.h>
 #include <init.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/crm_regs.h>
@@ -12,6 +13,7 @@
 #include <asm/io.h>
 #include <common.h>
 #include <env.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-imx/mx6/soc.c b/arch/arm/mach-imx/mx6/soc.c
index 2cdf576f25c5..4de384b0bd1d 100644
--- a/arch/arm/mach-imx/mx6/soc.c
+++ b/arch/arm/mach-imx/mx6/soc.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <init.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
@@ -26,6 +27,7 @@
 #include <imx_thermal.h>
 #include <mmc.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 struct scu_regs {
 	u32	ctrl;
diff --git a/arch/arm/mach-imx/mx7/clock.c b/arch/arm/mach-imx/mx7/clock.c
index b2d566737a40..6f6dbc9fabaa 100644
--- a/arch/arm/mach-imx/mx7/clock.c
+++ b/arch/arm/mach-imx/mx7/clock.c
@@ -20,6 +20,7 @@
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/types.h>
 
 struct mxc_ccm_anatop_reg *ccm_anatop = (struct mxc_ccm_anatop_reg *)
 					 ANATOP_BASE_ADDR;
diff --git a/arch/arm/mach-imx/mx7/clock_slice.c b/arch/arm/mach-imx/mx7/clock_slice.c
index c5aea2bffd65..b7ad9e4a4060 100644
--- a/arch/arm/mach-imx/mx7/clock_slice.c
+++ b/arch/arm/mach-imx/mx7/clock_slice.c
@@ -8,8 +8,10 @@
 
 #include <common.h>
 #include <div64.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/crm_regs.h>
diff --git a/arch/arm/mach-imx/mx7/psci-mx7.c b/arch/arm/mach-imx/mx7/psci-mx7.c
index 214e4043f449..0b93af399779 100644
--- a/arch/arm/mach-imx/mx7/psci-mx7.c
+++ b/arch/arm/mach-imx/mx7/psci-mx7.c
@@ -13,6 +13,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/armv7.h>
 #include <asm/gic.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <common.h>
 #include <fsl_wdog.h>
diff --git a/arch/arm/mach-imx/mx7/snvs.c b/arch/arm/mach-imx/mx7/snvs.c
index 359bbbb41c7a..acc3356c3be9 100644
--- a/arch/arm/mach-imx/mx7/snvs.c
+++ b/arch/arm/mach-imx/mx7/snvs.c
@@ -5,6 +5,7 @@
 
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 
 #define SNVS_HPCOMR		0x04
diff --git a/arch/arm/mach-imx/mx7/soc.c b/arch/arm/mach-imx/mx7/soc.c
index bc267d101fb0..681f1d8c950d 100644
--- a/arch/arm/mach-imx/mx7/soc.c
+++ b/arch/arm/mach-imx/mx7/soc.c
@@ -4,7 +4,9 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <init.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/clock.h>
@@ -19,6 +21,7 @@
 #include <imx_thermal.h>
 #include <fsl_sec.h>
 #include <asm/setup.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
 
diff --git a/arch/arm/mach-imx/mx7ulp/clock.c b/arch/arm/mach-imx/mx7ulp/clock.c
index c7dfa798b454..0b39cf14dba4 100644
--- a/arch/arm/mach-imx/mx7ulp/clock.c
+++ b/arch/arm/mach-imx/mx7ulp/clock.c
@@ -14,6 +14,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/sys_proto.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-imx/mx7ulp/iomux.c b/arch/arm/mach-imx/mx7ulp/iomux.c
index 05ddeed2a64b..24a31d648c45 100644
--- a/arch/arm/mach-imx/mx7ulp/iomux.c
+++ b/arch/arm/mach-imx/mx7ulp/iomux.c
@@ -7,6 +7,7 @@
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux.h>
+#include <asm/types.h>
 
 static void *base = (void *)IOMUXC_BASE_ADDR;
 
diff --git a/arch/arm/mach-imx/mx7ulp/pcc.c b/arch/arm/mach-imx/mx7ulp/pcc.c
index 9d06260bdfa5..61dfd6b01e0d 100644
--- a/arch/arm/mach-imx/mx7ulp/pcc.c
+++ b/arch/arm/mach-imx/mx7ulp/pcc.c
@@ -6,12 +6,14 @@
 #include <common.h>
 #include <div64.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/io.h>
 #include <errno.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/pcc.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 
diff --git a/arch/arm/mach-imx/mx7ulp/scg.c b/arch/arm/mach-imx/mx7ulp/scg.c
index bc837aae33a3..c9be289706d3 100644
--- a/arch/arm/mach-imx/mx7ulp/scg.c
+++ b/arch/arm/mach-imx/mx7ulp/scg.c
@@ -13,6 +13,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/pcc.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 
diff --git a/arch/arm/mach-imx/mx7ulp/soc.c b/arch/arm/mach-imx/mx7ulp/soc.c
index e0717226f777..33f80b48171f 100644
--- a/arch/arm/mach-imx/mx7ulp/soc.c
+++ b/arch/arm/mach-imx/mx7ulp/soc.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <init.h>
 #include <log.h>
@@ -17,6 +18,7 @@
 #include <asm/mach-imx/boot_mode.h>
 #include <asm/mach-imx/hab.h>
 #include <linux/bitops.h>
+#include <linux/types.h>
 
 #define PMC0_BASE_ADDR		0x410a1000
 #define PMC0_CTRL		0x28
diff --git a/arch/arm/mach-imx/rdc-sema.c b/arch/arm/mach-imx/rdc-sema.c
index e683673753e1..d184406cd13d 100644
--- a/arch/arm/mach-imx/rdc-sema.c
+++ b/arch/arm/mach-imx/rdc-sema.c
@@ -7,6 +7,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/mach-imx/rdc-sema.h>
 #include <asm/arch/imx-rdc.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 
 /*
diff --git a/arch/arm/mach-imx/spl.c b/arch/arm/mach-imx/spl.c
index 4c7614e9b719..9f5022c3e3e2 100644
--- a/arch/arm/mach-imx/spl.c
+++ b/arch/arm/mach-imx/spl.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <hang.h>
 #include <init.h>
 #include <log.h>
@@ -21,6 +22,7 @@
 #include <asm/mach-imx/boot_mode.h>
 #include <g_dnl.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-imx/spl_imx_romapi.c b/arch/arm/mach-imx/spl_imx_romapi.c
index 336b3da62644..07b76565392d 100644
--- a/arch/arm/mach-imx/spl_imx_romapi.c
+++ b/arch/arm/mach-imx/spl_imx_romapi.c
@@ -13,6 +13,7 @@
 #include <linux/libfdt.h>
 #include <spl.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <asm/arch/sys_proto.h>
 
diff --git a/arch/arm/mach-imx/syscounter.c b/arch/arm/mach-imx/syscounter.c
index 6dfed365d295..33572b943a7b 100644
--- a/arch/arm/mach-imx/syscounter.c
+++ b/arch/arm/mach-imx/syscounter.c
@@ -15,6 +15,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/mach-imx/syscounter.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-imx/timer.c b/arch/arm/mach-imx/timer.c
index fa1941aec42e..569c05fad253 100644
--- a/arch/arm/mach-imx/timer.c
+++ b/arch/arm/mach-imx/timer.c
@@ -14,6 +14,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/types.h>
 
 /* General purpose timers registers */
 struct mxc_gpt {
diff --git a/arch/arm/mach-ipq40xx/clock-ipq4019.c b/arch/arm/mach-ipq40xx/clock-ipq4019.c
index dae070f0ed62..a15a6871ce4e 100644
--- a/arch/arm/mach-ipq40xx/clock-ipq4019.c
+++ b/arch/arm/mach-ipq40xx/clock-ipq4019.c
@@ -13,6 +13,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 struct msm_clk_priv {
 	phys_addr_t base;
diff --git a/arch/arm/mach-ipq40xx/pinctrl-snapdragon.c b/arch/arm/mach-ipq40xx/pinctrl-snapdragon.c
index 9f73a62d7a1d..c18b87d923a7 100644
--- a/arch/arm/mach-ipq40xx/pinctrl-snapdragon.c
+++ b/arch/arm/mach-ipq40xx/pinctrl-snapdragon.c
@@ -18,6 +18,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include "pinctrl-snapdragon.h"
 
 struct msm_pinctrl_priv {
diff --git a/arch/arm/mach-k3/am6_init.c b/arch/arm/mach-k3/am6_init.c
index 2ffa383aa26c..ccb718d40bba 100644
--- a/arch/arm/mach-k3/am6_init.c
+++ b/arch/arm/mach-k3/am6_init.c
@@ -17,6 +17,7 @@
 #include <asm/arch/sysfw-loader.h>
 #include <asm/arch/sys_proto.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include "common.h"
 #include <dm.h>
 #include <dm/uclass-internal.h>
diff --git a/arch/arm/mach-k3/common.c b/arch/arm/mach-k3/common.c
index f063518acaf3..088dace5f923 100644
--- a/arch/arm/mach-k3/common.c
+++ b/arch/arm/mach-k3/common.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <image.h>
 #include <init.h>
@@ -18,6 +19,7 @@
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "common.h"
 #include <dm.h>
 #include <remoteproc.h>
diff --git a/arch/arm/mach-k3/common.h b/arch/arm/mach-k3/common.h
index a6dbc7808b85..40ce5f8fc6de 100644
--- a/arch/arm/mach-k3/common.h
+++ b/arch/arm/mach-k3/common.h
@@ -8,6 +8,7 @@
 
 #include <asm/armv7_mpu.h>
 #include <asm/hardware.h>
+#include <linux/types.h>
 
 #define J721E  0xbb64
 #define J7200  0xbb6d
diff --git a/arch/arm/mach-k3/include/mach/sys_proto.h b/arch/arm/mach-k3/include/mach/sys_proto.h
index 60287b261c8e..ac7097421e71 100644
--- a/arch/arm/mach-k3/include/mach/sys_proto.h
+++ b/arch/arm/mach-k3/include/mach/sys_proto.h
@@ -7,6 +7,7 @@
 #ifndef _SYS_PROTO_H_
 #define _SYS_PROTO_H_
 
+#include <asm/types.h>
 void sdelay(unsigned long loops);
 u32 wait_on_value(u32 read_bit_mask, u32 match_value, void *read_addr,
 		  u32 bound);
diff --git a/arch/arm/mach-k3/j721e_init.c b/arch/arm/mach-k3/j721e_init.c
index d9941580acfb..33e253013af6 100644
--- a/arch/arm/mach-k3/j721e_init.c
+++ b/arch/arm/mach-k3/j721e_init.c
@@ -16,6 +16,7 @@
 #include <asm/arch/hardware.h>
 #include <asm/arch/sysfw-loader.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include "common.h"
 #include <asm/arch/sys_proto.h>
 #include <linux/soc/ti/ti_sci_protocol.h>
diff --git a/arch/arm/mach-k3/r5_mpu.c b/arch/arm/mach-k3/r5_mpu.c
index 3d2ff6775a3f..b7a6aa61aec5 100644
--- a/arch/arm/mach-k3/r5_mpu.c
+++ b/arch/arm/mach-k3/r5_mpu.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <linux/kernel.h>
 #include "common.h"
diff --git a/arch/arm/mach-k3/security.c b/arch/arm/mach-k3/security.c
index f4aef0a025b0..7655c9a3205a 100644
--- a/arch/arm/mach-k3/security.c
+++ b/arch/arm/mach-k3/security.c
@@ -16,6 +16,7 @@
 #include <asm/cache.h>
 #include <linux/kernel.h>
 #include <linux/soc/ti/ti_sci_protocol.h>
+#include <linux/types.h>
 #include <mach/spl.h>
 #include <spl.h>
 #include <asm/arch/sys_proto.h>
diff --git a/arch/arm/mach-k3/sysfw-loader.c b/arch/arm/mach-k3/sysfw-loader.c
index 4f269db8e5ab..52d6fb119e70 100644
--- a/arch/arm/mach-k3/sysfw-loader.c
+++ b/arch/arm/mach-k3/sysfw-loader.c
@@ -24,6 +24,7 @@
 #include <dfu.h>
 #include <dm/uclass-internal.h>
 #include <spi_flash.h>
+#include <linux/types.h>
 
 #include <asm/arch/sys_proto.h>
 #include "common.h"
diff --git a/arch/arm/mach-keystone/clock.c b/arch/arm/mach-keystone/clock.c
index 0c59515d2eb7..69a7c010dc15 100644
--- a/arch/arm/mach-keystone/clock.c
+++ b/arch/arm/mach-keystone/clock.c
@@ -7,8 +7,10 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/clock_defs.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 
 /* DEV and ARM speed definitions as specified in DEVSPEED register */
diff --git a/arch/arm/mach-keystone/cmd_mon.c b/arch/arm/mach-keystone/cmd_mon.c
index 5887a89ff114..42935007dc04 100644
--- a/arch/arm/mach-keystone/cmd_mon.c
+++ b/arch/arm/mach-keystone/cmd_mon.c
@@ -11,6 +11,7 @@
 #include <image.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <mach/mon.h>
diff --git a/arch/arm/mach-keystone/ddr3.c b/arch/arm/mach-keystone/ddr3.c
index 99c394cd91d6..a589935c222d 100644
--- a/arch/arm/mach-keystone/ddr3.c
+++ b/arch/arm/mach-keystone/ddr3.c
@@ -15,6 +15,7 @@
 #include <asm/arch/msmc.h>
 #include <asm/arch/ddr3.h>
 #include <asm/arch/psc_defs.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 #include <asm/ti-common/ti-edma3.h>
diff --git a/arch/arm/mach-keystone/ddr3_spd.c b/arch/arm/mach-keystone/ddr3_spd.c
index a7aa7f365210..85dcac05d3ea 100644
--- a/arch/arm/mach-keystone/ddr3_spd.c
+++ b/arch/arm/mach-keystone/ddr3_spd.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <log.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/string.h>
 
 #include <i2c.h>
diff --git a/arch/arm/mach-keystone/include/mach/clock_defs.h b/arch/arm/mach-keystone/include/mach/clock_defs.h
index 336b103dc8c9..ced9265d0a9c 100644
--- a/arch/arm/mach-keystone/include/mach/clock_defs.h
+++ b/arch/arm/mach-keystone/include/mach/clock_defs.h
@@ -10,6 +10,7 @@
 
 #include <asm/arch/hardware.h>
 #ifndef __ASSEMBLY__
+#include <asm/types.h>
 #include <linux/bitops.h>
 #endif
 
diff --git a/arch/arm/mach-keystone/include/mach/ddr3.h b/arch/arm/mach-keystone/include/mach/ddr3.h
index cb28068db7db..4d68f5628144 100644
--- a/arch/arm/mach-keystone/include/mach/ddr3.h
+++ b/arch/arm/mach-keystone/include/mach/ddr3.h
@@ -10,6 +10,7 @@
 #define _DDR3_H_
 
 #include <asm/arch/hardware.h>
+#include <asm/types.h>
 
 struct ddr3_phy_config {
 	unsigned int pllcr;
diff --git a/arch/arm/mach-keystone/include/mach/hardware-k2g.h b/arch/arm/mach-keystone/include/mach/hardware-k2g.h
index 971c081bb3c3..8361d459df98 100644
--- a/arch/arm/mach-keystone/include/mach/hardware-k2g.h
+++ b/arch/arm/mach-keystone/include/mach/hardware-k2g.h
@@ -103,6 +103,7 @@
 #define MAX_SYSCLK	4
 
 #ifndef __ASSEMBLY__
+#include <asm/types.h>
 static inline u8 get_sysclk_index(void)
 {
 	u32 dev_stat = __raw_readl(KS2_DEVSTAT);
diff --git a/arch/arm/mach-keystone/include/mach/hardware.h b/arch/arm/mach-keystone/include/mach/hardware.h
index 0c5dc6a73951..4044ae65a0c1 100644
--- a/arch/arm/mach-keystone/include/mach/hardware.h
+++ b/arch/arm/mach-keystone/include/mach/hardware.h
@@ -11,6 +11,7 @@
 #include <config.h>
 
 #ifndef __ASSEMBLY__
+#include <asm/types.h>
 #include <linux/bitops.h>
 
 #include <linux/sizes.h>
diff --git a/arch/arm/mach-keystone/include/mach/mon.h b/arch/arm/mach-keystone/include/mach/mon.h
index e1bef216d996..d23d31d6b74c 100644
--- a/arch/arm/mach-keystone/include/mach/mon.h
+++ b/arch/arm/mach-keystone/include/mach/mon.h
@@ -9,6 +9,7 @@
 #ifndef _MACH_MON_H_
 #define _MACH_MON_H_
 
+#include <asm/types.h>
 int mon_install(u32 addr, u32 dpsc, u32 freq, u32 bm_addr);
 int mon_power_on(int core_id, void *ep);
 int mon_power_off(int core_id);
diff --git a/arch/arm/mach-keystone/include/mach/msmc.h b/arch/arm/mach-keystone/include/mach/msmc.h
index 3fe09ea59684..d4a9303bd382 100644
--- a/arch/arm/mach-keystone/include/mach/msmc.h
+++ b/arch/arm/mach-keystone/include/mach/msmc.h
@@ -10,6 +10,7 @@
 #define _MSMC_H_
 
 #include <asm/arch/hardware.h>
+#include <asm/types.h>
 
 enum mpax_seg_size {
 	MPAX_SEG_4K = 0x0b,
diff --git a/arch/arm/mach-keystone/include/mach/mux-k2g.h b/arch/arm/mach-keystone/include/mach/mux-k2g.h
index 67d47f817216..8030ccfabb05 100644
--- a/arch/arm/mach-keystone/include/mach/mux-k2g.h
+++ b/arch/arm/mach-keystone/include/mach/mux-k2g.h
@@ -11,6 +11,7 @@
 
 #include <common.h>
 #include <asm/io.h>
+#include <asm/types.h>
 
 #define K2G_PADCFG_REG	(KS2_DEVICE_STATE_CTRL_BASE + 0x1000)
 
diff --git a/arch/arm/mach-keystone/include/mach/psc_defs.h b/arch/arm/mach-keystone/include/mach/psc_defs.h
index 0864b37a5318..1966adb0fe34 100644
--- a/arch/arm/mach-keystone/include/mach/psc_defs.h
+++ b/arch/arm/mach-keystone/include/mach/psc_defs.h
@@ -8,6 +8,7 @@
 
 #include <stdbool.h>
 #include <asm/arch/hardware.h>
+#include <asm/types.h>
 
 /*
  * FILE PURPOSE: Local Power Sleep Controller definitions
diff --git a/arch/arm/mach-keystone/init.c b/arch/arm/mach-keystone/init.c
index 1c67a1fdfe8c..03e24290a517 100644
--- a/arch/arm/mach-keystone/init.c
+++ b/arch/arm/mach-keystone/init.c
@@ -18,6 +18,7 @@
 #include <asm/arch/hardware.h>
 #include <asm/arch/psc_defs.h>
 #include <linux/bitops.h>
+#include <linux/types.h>
 
 #define MAX_PCI_PORTS		2
 enum pci_mode	{
diff --git a/arch/arm/mach-keystone/keystone.c b/arch/arm/mach-keystone/keystone.c
index a74c4d995b18..e8b805acb60d 100644
--- a/arch/arm/mach-keystone/keystone.c
+++ b/arch/arm/mach-keystone/keystone.c
@@ -14,6 +14,7 @@
 #include <asm/io.h>
 #include <asm/arch/psc_defs.h>
 #include <asm/arch/hardware.h>
+#include <asm/types.h>
 
 /**
  * cpu_to_bus - swap bytes of the 32-bit data if the device is BE
diff --git a/arch/arm/mach-keystone/mon.c b/arch/arm/mach-keystone/mon.c
index af038dec7ae6..f92078964a57 100644
--- a/arch/arm/mach-keystone/mon.c
+++ b/arch/arm/mach-keystone/mon.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <command.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <mach/mon.h>
 #include <spl.h>
 asm(".arch_extension sec\n\t");
diff --git a/arch/arm/mach-keystone/msmc.c b/arch/arm/mach-keystone/msmc.c
index f5cadfbf6692..ba9e16d0f0c9 100644
--- a/arch/arm/mach-keystone/msmc.c
+++ b/arch/arm/mach-keystone/msmc.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <asm/arch/msmc.h>
+#include <asm/types.h>
 
 struct mpax {
 	u32	mpaxl;
diff --git a/arch/arm/mach-keystone/psc.c b/arch/arm/mach-keystone/psc.c
index 6005cbaeca8f..f47b08e4bbe6 100644
--- a/arch/arm/mach-keystone/psc.c
+++ b/arch/arm/mach-keystone/psc.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <stdbool.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/io.h>
diff --git a/arch/arm/mach-kirkwood/cache.c b/arch/arm/mach-kirkwood/cache.c
index 009b7deeca64..13ee22afdc0f 100644
--- a/arch/arm/mach-kirkwood/cache.c
+++ b/arch/arm/mach-kirkwood/cache.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <asm/arch/cpu.h>
 #include <asm/cache.h>
+#include <asm/types.h>
 
 #define FEROCEON_EXTRA_FEATURE_L2C_EN (1<<22)
 
diff --git a/arch/arm/mach-kirkwood/cpu.c b/arch/arm/mach-kirkwood/cpu.c
index 48d4327be764..5bdc2d9b56d7 100644
--- a/arch/arm/mach-kirkwood/cpu.c
+++ b/arch/arm/mach-kirkwood/cpu.c
@@ -20,6 +20,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
 #include <mvebu_mmc.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/kernel.h>
 
diff --git a/arch/arm/mach-kirkwood/include/mach/cpu.h b/arch/arm/mach-kirkwood/include/mach/cpu.h
index ea42182cf9c6..ade2ccc82899 100644
--- a/arch/arm/mach-kirkwood/include/mach/cpu.h
+++ b/arch/arm/mach-kirkwood/include/mach/cpu.h
@@ -25,6 +25,7 @@
 #define SYSRST_CNT_1SEC_VAL		(25*1000000)
 #define KW_REG_MPP_OUT_DRV_REG		(KW_MPP_BASE + 0xE0)
 
+#include <asm/types.h>
 enum memory_bank {
 	BANK0,
 	BANK1,
diff --git a/arch/arm/mach-kirkwood/mpp.c b/arch/arm/mach-kirkwood/mpp.c
index 4fdad99cadef..9525de119cdf 100644
--- a/arch/arm/mach-kirkwood/mpp.c
+++ b/arch/arm/mach-kirkwood/mpp.c
@@ -15,6 +15,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
 #include <asm/arch/mpp.h>
+#include <asm/types.h>
 
 static u32 kirkwood_variant(void)
 {
diff --git a/arch/arm/mach-lpc32xx/clk.c b/arch/arm/mach-lpc32xx/clk.c
index cb2344d79fec..d6060800f16a 100644
--- a/arch/arm/mach-lpc32xx/clk.c
+++ b/arch/arm/mach-lpc32xx/clk.c
@@ -9,6 +9,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/clk.h>
 #include <asm/io.h>
+#include <asm/types.h>
 
 static struct clk_pm_regs *clk = (struct clk_pm_regs *)CLK_PM_BASE;
 
diff --git a/arch/arm/mach-lpc32xx/cpu.c b/arch/arm/mach-lpc32xx/cpu.c
index cdc069639d5b..65cb6110430b 100644
--- a/arch/arm/mach-lpc32xx/cpu.c
+++ b/arch/arm/mach-lpc32xx/cpu.c
@@ -15,6 +15,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/io.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 static struct clk_pm_regs *clk = (struct clk_pm_regs *)CLK_PM_BASE;
 static struct wdt_regs  *wdt = (struct wdt_regs *)WDT_BASE;
diff --git a/arch/arm/mach-lpc32xx/devices.c b/arch/arm/mach-lpc32xx/devices.c
index 7e7646a2e15a..545236b57b67 100644
--- a/arch/arm/mach-lpc32xx/devices.c
+++ b/arch/arm/mach-lpc32xx/devices.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <ns16550.h>
 #include <dm/platform_data/lpc32xx_hsuart.h>
+#include <linux/types.h>
 
 #include <asm/arch/clk.h>
 #include <asm/arch/uart.h>
diff --git a/arch/arm/mach-lpc32xx/dram.c b/arch/arm/mach-lpc32xx/dram.c
index 160223792353..495458af540a 100644
--- a/arch/arm/mach-lpc32xx/dram.c
+++ b/arch/arm/mach-lpc32xx/dram.c
@@ -18,6 +18,7 @@
 #include <asm/arch/emc.h>
 #include <asm/io.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 static struct clk_pm_regs *clk = (struct clk_pm_regs *)CLK_PM_BASE;
 static struct emc_regs *emc = (struct emc_regs *)EMC_BASE;
diff --git a/arch/arm/mach-lpc32xx/timer.c b/arch/arm/mach-lpc32xx/timer.c
index 90183e3014eb..cf5d3de1b580 100644
--- a/arch/arm/mach-lpc32xx/timer.c
+++ b/arch/arm/mach-lpc32xx/timer.c
@@ -11,6 +11,7 @@
 #include <asm/arch/timer.h>
 #include <asm/io.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 static struct timer_regs  *timer0 = (struct timer_regs *)TIMER0_BASE;
 static struct timer_regs  *timer1 = (struct timer_regs *)TIMER1_BASE;
diff --git a/arch/arm/mach-mediatek/mt7622/init.c b/arch/arm/mach-mediatek/mt7622/init.c
index ff07936be34c..2ae23c649245 100644
--- a/arch/arm/mach-mediatek/mt7622/init.c
+++ b/arch/arm/mach-mediatek/mt7622/init.c
@@ -10,6 +10,7 @@
 #include <stdio.h>
 #include <asm/armv8/mmu.h>
 #include <asm/cache.h>
+#include <linux/types.h>
 
 int print_cpuinfo(void)
 {
diff --git a/arch/arm/mach-mediatek/mt7623/init.c b/arch/arm/mach-mediatek/mt7623/init.c
index fa7a05291bc9..78813545eeed 100644
--- a/arch/arm/mach-mediatek/mt7623/init.c
+++ b/arch/arm/mach-mediatek/mt7623/init.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <init.h>
 #include <stdio.h>
 #include <asm/global_data.h>
@@ -11,6 +12,7 @@
 #include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <asm/arch/misc.h>
+#include <linux/types.h>
 
 #include "preloader.h"
 
diff --git a/arch/arm/mach-mediatek/mt7623/preloader.h b/arch/arm/mach-mediatek/mt7623/preloader.h
index 2d2c71ad4c49..a696bf12b883 100644
--- a/arch/arm/mach-mediatek/mt7623/preloader.h
+++ b/arch/arm/mach-mediatek/mt7623/preloader.h
@@ -6,6 +6,7 @@
 #ifndef __PRELOADER_H_
 #define __PRELOADER_H_
 
+#include <asm/types.h>
 enum forbidden_mode {
 	F_FACTORY_MODE = 0x0001
 };
diff --git a/arch/arm/mach-mediatek/mt7629/init.c b/arch/arm/mach-mediatek/mt7629/init.c
index a643810d2450..cddc82d26e4a 100644
--- a/arch/arm/mach-mediatek/mt7629/init.c
+++ b/arch/arm/mach-mediatek/mt7629/init.c
@@ -6,6 +6,7 @@
 
 #include <clk.h>
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <fdtdec.h>
 #include <init.h>
@@ -15,6 +16,7 @@
 #include <asm/arch/misc.h>
 #include <asm/global_data.h>
 #include <asm/sections.h>
+#include <asm/types.h>
 #include <dm/uclass.h>
 #include <linux/bitops.h>
 #include <linux/io.h>
diff --git a/arch/arm/mach-mediatek/mt8512/init.c b/arch/arm/mach-mediatek/mt8512/init.c
index c14e7d22e6fc..94b2f95146a2 100644
--- a/arch/arm/mach-mediatek/mt8512/init.c
+++ b/arch/arm/mach-mediatek/mt8512/init.c
@@ -21,6 +21,7 @@
 #include <asm/sections.h>
 #include <dm/uclass.h>
 #include <dt-bindings/clock/mt8512-clk.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-mediatek/mt8516/init.c b/arch/arm/mach-mediatek/mt8516/init.c
index 64b8f5fbcb65..174ddf2578df 100644
--- a/arch/arm/mach-mediatek/mt8516/init.c
+++ b/arch/arm/mach-mediatek/mt8516/init.c
@@ -21,6 +21,7 @@
 #include <dm/uclass.h>
 #include <dt-bindings/clock/mt8516-clk.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-mediatek/mt8518/init.c b/arch/arm/mach-mediatek/mt8518/init.c
index 2e4ab1fa37ab..4d55a9effacb 100644
--- a/arch/arm/mach-mediatek/mt8518/init.c
+++ b/arch/arm/mach-mediatek/mt8518/init.c
@@ -21,6 +21,7 @@
 #include <asm/sections.h>
 #include <dm/uclass.h>
 #include <dt-bindings/clock/mt8518-clk.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-mediatek/spl.c b/arch/arm/mach-mediatek/spl.c
index 927175c5a319..6b9635976874 100644
--- a/arch/arm/mach-mediatek/spl.c
+++ b/arch/arm/mach-mediatek/spl.c
@@ -9,6 +9,7 @@
 #include <hang.h>
 #include <init.h>
 #include <spl.h>
+#include <linux/types.h>
 
 #include "init.h"
 
diff --git a/arch/arm/mach-meson/board-axg.c b/arch/arm/mach-meson/board-axg.c
index 7e07465d2540..3507cda0c44e 100644
--- a/arch/arm/mach-meson/board-axg.c
+++ b/arch/arm/mach-meson/board-axg.c
@@ -15,6 +15,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/armv8/mmu.h>
+#include <asm/types.h>
 #include <linux/sizes.h>
 #include <phy.h>
 
diff --git a/arch/arm/mach-meson/board-common.c b/arch/arm/mach-meson/board-common.c
index cdae5f987708..fb92a9c46d6f 100644
--- a/arch/arm/mach-meson/board-common.c
+++ b/arch/arm/mach-meson/board-common.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <init.h>
 #include <net.h>
@@ -22,6 +23,7 @@
 #include <asm/armv8/mmu.h>
 #include <asm/unaligned.h>
 #include <efi_loader.h>
+#include <linux/types.h>
 #include <u-boot/crc.h>
 
 #if CONFIG_IS_ENABLED(FASTBOOT)
diff --git a/arch/arm/mach-meson/board-g12a.c b/arch/arm/mach-meson/board-g12a.c
index 250a9617c0d5..b40b5641490b 100644
--- a/arch/arm/mach-meson/board-g12a.c
+++ b/arch/arm/mach-meson/board-g12a.c
@@ -17,6 +17,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/armv8/mmu.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/sizes.h>
diff --git a/arch/arm/mach-meson/board-gx.c b/arch/arm/mach-meson/board-gx.c
index b38811fb9510..47c1279a548d 100644
--- a/arch/arm/mach-meson/board-gx.c
+++ b/arch/arm/mach-meson/board-gx.c
@@ -16,6 +16,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/armv8/mmu.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/sizes.h>
diff --git a/arch/arm/mach-meson/board-info.c b/arch/arm/mach-meson/board-info.c
index 94c523c17fda..226254038de0 100644
--- a/arch/arm/mach-meson/board-info.c
+++ b/arch/arm/mach-meson/board-info.c
@@ -10,6 +10,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm.h>
+#include <asm/types.h>
 #include <linux/bitfield.h>
 #include <regmap.h>
 #include <syscon.h>
diff --git a/arch/arm/mach-meson/sm.c b/arch/arm/mach-meson/sm.c
index 62feaccfce05..76c62ec6f1b2 100644
--- a/arch/arm/mach-meson/sm.c
+++ b/arch/arm/mach-meson/sm.c
@@ -24,6 +24,7 @@
 #include <regmap.h>
 #include <syscon.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define FN_GET_SHARE_MEM_INPUT_BASE	0x82000020
 #define FN_GET_SHARE_MEM_OUTPUT_BASE	0x82000021
diff --git a/arch/arm/mach-mvebu/arm64-common.c b/arch/arm/mach-mvebu/arm64-common.c
index aecdbb86a9d7..f4be7c76f7b8 100644
--- a/arch/arm/mach-mvebu/arm64-common.c
+++ b/arch/arm/mach-mvebu/arm64-common.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <fdtdec.h>
 #include <init.h>
@@ -19,6 +20,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
 #include <asm/armv8/mmu.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-mvebu/armada3700/cpu.c b/arch/arm/mach-mvebu/armada3700/cpu.c
index b98f78fde3b7..e3772f0b5bd3 100644
--- a/arch/arm/mach-mvebu/armada3700/cpu.c
+++ b/arch/arm/mach-mvebu/armada3700/cpu.c
@@ -21,6 +21,7 @@
 #include <asm/armv8/mmu.h>
 #include <sort.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /* Armada 3700 */
 #define MVEBU_GPIO_NB_REG_BASE		(MVEBU_REGISTER(0x13800))
diff --git a/arch/arm/mach-mvebu/armada8k/cpu.c b/arch/arm/mach-mvebu/armada8k/cpu.c
index 529dac905951..81959bb51f0f 100644
--- a/arch/arm/mach-mvebu/armada8k/cpu.c
+++ b/arch/arm/mach-mvebu/armada8k/cpu.c
@@ -13,6 +13,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
 #include <asm/armv8/mmu.h>
+#include <linux/types.h>
 
 /* Armada 7k/8k */
 #define MVEBU_RFU_BASE			(MVEBU_REGISTER(0x6f0000))
diff --git a/arch/arm/mach-mvebu/cpu.c b/arch/arm/mach-mvebu/cpu.c
index 53c44ede7db6..56ef4f3309d7 100644
--- a/arch/arm/mach-mvebu/cpu.c
+++ b/arch/arm/mach-mvebu/cpu.c
@@ -5,9 +5,11 @@
 
 #include <common.h>
 #include <ahci.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <init.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/arch/arm/mach-mvebu/dram.c b/arch/arm/mach-mvebu/dram.c
index 8241926fad01..763aa83a3525 100644
--- a/arch/arm/mach-mvebu/dram.c
+++ b/arch/arm/mach-mvebu/dram.c
@@ -13,6 +13,7 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <asm/types.h>
 
 #if defined(CONFIG_ARCH_MVEBU)
 /* Use common XOR definitions for A3x and AXP */
diff --git a/arch/arm/mach-mvebu/efuse.c b/arch/arm/mach-mvebu/efuse.c
index 8ada3cf93e72..322e2e3db388 100644
--- a/arch/arm/mach-mvebu/efuse.c
+++ b/arch/arm/mach-mvebu/efuse.c
@@ -10,6 +10,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/efuse.h>
 #include <asm/arch/soc.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/arch/arm/mach-mvebu/gpio.c b/arch/arm/mach-mvebu/gpio.c
index 1d1e3df8ba90..97e5c11865ab 100644
--- a/arch/arm/mach-mvebu/gpio.c
+++ b/arch/arm/mach-mvebu/gpio.c
@@ -9,6 +9,7 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <asm/types.h>
 
 /*
  * mvebu_config_gpio - GPIO configuration
diff --git a/arch/arm/mach-mvebu/include/mach/cpu.h b/arch/arm/mach-mvebu/include/mach/cpu.h
index c3f8ad850651..a58a0d706de9 100644
--- a/arch/arm/mach-mvebu/include/mach/cpu.h
+++ b/arch/arm/mach-mvebu/include/mach/cpu.h
@@ -15,6 +15,7 @@
 #define MVEBU_REG_PCIE_DEVID		(MVEBU_REG_PCIE_BASE + 0x00)
 #define MVEBU_REG_PCIE_REVID		(MVEBU_REG_PCIE_BASE + 0x08)
 
+#include <asm/types.h>
 enum memory_bank {
 	BANK0,
 	BANK1,
diff --git a/arch/arm/mach-mvebu/include/mach/efuse.h b/arch/arm/mach-mvebu/include/mach/efuse.h
index bbc5844d849c..c965b62dcd7a 100644
--- a/arch/arm/mach-mvebu/include/mach/efuse.h
+++ b/arch/arm/mach-mvebu/include/mach/efuse.h
@@ -7,6 +7,7 @@
 #define _MVEBU_EFUSE_H
 
 #include <common.h>
+#include <asm/types.h>
 
 struct efuse_val {
 	union {
diff --git a/arch/arm/mach-mvebu/mbus.c b/arch/arm/mach-mvebu/mbus.c
index e754f122b1c4..cd51e38aed62 100644
--- a/arch/arm/mach-mvebu/mbus.c
+++ b/arch/arm/mach-mvebu/mbus.c
@@ -30,6 +30,8 @@
  * This driver:
  *
  * - Reads out the SDRAM address decoding windows at initialization
+#include <compiler.h>
+#include <linux/types.h>
  *   time, and fills the mbus_dram_info structure with these
  *   informations. The exported function mv_mbus_dram_info() allow
  *   device drivers to get those informations related to the SDRAM
diff --git a/arch/arm/mach-mvebu/serdes/a38x/ctrl_pex.c b/arch/arm/mach-mvebu/serdes/a38x/ctrl_pex.c
index adef3331a7c5..4768d0537d74 100644
--- a/arch/arm/mach-mvebu/serdes/a38x/ctrl_pex.c
+++ b/arch/arm/mach-mvebu/serdes/a38x/ctrl_pex.c
@@ -4,10 +4,12 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <spl.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 
diff --git a/arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec-38x.c b/arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec-38x.c
index 98354da9b273..b774e62f856e 100644
--- a/arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec-38x.c
+++ b/arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec-38x.c
@@ -9,6 +9,7 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <asm/types.h>
 
 #include "high_speed_env_spec.h"
 #include "sys_env_lib.h"
diff --git a/arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec.c b/arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec.c
index e4bec786429b..5457868c18ee 100644
--- a/arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec.c
+++ b/arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec.c
@@ -9,6 +9,7 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 #include "high_speed_env_spec.h"
diff --git a/arch/arm/mach-mvebu/serdes/a38x/seq_exec.c b/arch/arm/mach-mvebu/serdes/a38x/seq_exec.c
index a8f491b5b414..d4157b1ea722 100644
--- a/arch/arm/mach-mvebu/serdes/a38x/seq_exec.c
+++ b/arch/arm/mach-mvebu/serdes/a38x/seq_exec.c
@@ -9,6 +9,7 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 #include "seq_exec.h"
diff --git a/arch/arm/mach-mvebu/serdes/a38x/seq_exec.h b/arch/arm/mach-mvebu/serdes/a38x/seq_exec.h
index fe0cb8f75df2..71b3a75fb839 100644
--- a/arch/arm/mach-mvebu/serdes/a38x/seq_exec.h
+++ b/arch/arm/mach-mvebu/serdes/a38x/seq_exec.h
@@ -6,6 +6,7 @@
 #ifndef _SEQ_EXEC_H
 #define _SEQ_EXEC_H
 
+#include <asm/types.h>
 #define NA			0xff
 #define DEFAULT_PARAM		0
 #define MV_BOARD_TCLK_ERROR	0xffffffff
diff --git a/arch/arm/mach-mvebu/serdes/a38x/sys_env_lib.c b/arch/arm/mach-mvebu/serdes/a38x/sys_env_lib.c
index 1be86bc4ae1d..71a1e61f3824 100644
--- a/arch/arm/mach-mvebu/serdes/a38x/sys_env_lib.c
+++ b/arch/arm/mach-mvebu/serdes/a38x/sys_env_lib.c
@@ -9,6 +9,7 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <asm/types.h>
 
 #include "seq_exec.h"
 #include "sys_env_lib.h"
diff --git a/arch/arm/mach-mvebu/serdes/axp/high_speed_env_lib.c b/arch/arm/mach-mvebu/serdes/axp/high_speed_env_lib.c
index 3ebda4ec6841..85f4b90706e5 100644
--- a/arch/arm/mach-mvebu/serdes/axp/high_speed_env_lib.c
+++ b/arch/arm/mach-mvebu/serdes/axp/high_speed_env_lib.c
@@ -4,11 +4,13 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <i2c.h>
 #include <spl.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 
diff --git a/arch/arm/mach-mvebu/serdes/axp/high_speed_env_spec.c b/arch/arm/mach-mvebu/serdes/axp/high_speed_env_spec.c
index 539d237623a1..b4a69374b432 100644
--- a/arch/arm/mach-mvebu/serdes/axp/high_speed_env_spec.c
+++ b/arch/arm/mach-mvebu/serdes/axp/high_speed_env_spec.c
@@ -8,6 +8,7 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <asm/types.h>
 
 #include "high_speed_env_spec.h"
 
diff --git a/arch/arm/mach-mvebu/spl.c b/arch/arm/mach-mvebu/spl.c
index 16ebb7a59e55..b97401c26ac0 100644
--- a/arch/arm/mach-mvebu/spl.c
+++ b/arch/arm/mach-mvebu/spl.c
@@ -15,6 +15,7 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <linux/types.h>
 
 static u32 get_boot_device(void)
 {
diff --git a/arch/arm/mach-nexell/clock.c b/arch/arm/mach-nexell/clock.c
index cd66248cd65b..56e2540fdd86 100644
--- a/arch/arm/mach-nexell/clock.c
+++ b/arch/arm/mach-nexell/clock.c
@@ -6,7 +6,9 @@
 
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <vsprintf.h>
+#include <asm/types.h>
 #include <linux/err.h>
 #include <asm/io.h>
 #include <asm/arch/nexell.h>
diff --git a/arch/arm/mach-nexell/cmd_boot_linux.c b/arch/arm/mach-nexell/cmd_boot_linux.c
index f2dedfe16257..03815a9c09c8 100644
--- a/arch/arm/mach-nexell/cmd_boot_linux.c
+++ b/arch/arm/mach-nexell/cmd_boot_linux.c
@@ -11,6 +11,7 @@
 #include <errno.h>
 #include <image.h>
 #include <fdt_support.h>
+#include <linux/types.h>
 
 #if !defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_CLI_FRAMEWORK)
 
diff --git a/arch/arm/mach-nexell/include/mach/display.h b/arch/arm/mach-nexell/include/mach/display.h
index b167e63a5a4c..192341278b1b 100644
--- a/arch/arm/mach-nexell/include/mach/display.h
+++ b/arch/arm/mach-nexell/include/mach/display.h
@@ -60,6 +60,7 @@
 #define	DPC_PADCLKSEL_VCLK2		1	/* VCLK2 */
 
 /* display sync info for DPC */
+#include <linux/types.h>
 struct dp_sync_info {
 	int interlace;
 	int h_active_len;
diff --git a/arch/arm/mach-nexell/include/mach/display_dev.h b/arch/arm/mach-nexell/include/mach/display_dev.h
index 77eb614768c7..ed5b1a641ee0 100644
--- a/arch/arm/mach-nexell/include/mach/display_dev.h
+++ b/arch/arm/mach-nexell/include/mach/display_dev.h
@@ -14,6 +14,7 @@
 #include <lcd.h>
 #endif
 
+#include <linux/types.h>
 struct nx_display_dev {
 #if defined CONFIG_VIDEO || defined CONFIG_DM_VIDEO
 	GraphicDevice graphic_device;
diff --git a/arch/arm/mach-nexell/include/mach/mipi_display.h b/arch/arm/mach-nexell/include/mach/mipi_display.h
index f3fdec64647c..a1cfde273888 100644
--- a/arch/arm/mach-nexell/include/mach/mipi_display.h
+++ b/arch/arm/mach-nexell/include/mach/mipi_display.h
@@ -12,6 +12,7 @@
 #define MIPI_DISPLAY_H
 
 /* MIPI DSI Processor-to-Peripheral transaction types */
+#include <linux/types.h>
 enum {
 	MIPI_DSI_V_SYNC_START				= 0x01,
 	MIPI_DSI_V_SYNC_END				= 0x11,
diff --git a/arch/arm/mach-nexell/include/mach/reset.h b/arch/arm/mach-nexell/include/mach/reset.h
index e1301d4e53d3..a533e42fa037 100644
--- a/arch/arm/mach-nexell/include/mach/reset.h
+++ b/arch/arm/mach-nexell/include/mach/reset.h
@@ -7,6 +7,7 @@
 #ifndef __NEXELL_RESET__
 #define __NEXELL_RESET__
 
+#include <asm/types.h>
 #define NUMBER_OF_RESET_MODULE_PIN      69
 
 enum rstcon {
diff --git a/arch/arm/mach-nexell/include/mach/sec_reg.h b/arch/arm/mach-nexell/include/mach/sec_reg.h
index e3ae5ac1bb40..f8396c460fd4 100644
--- a/arch/arm/mach-nexell/include/mach/sec_reg.h
+++ b/arch/arm/mach-nexell/include/mach/sec_reg.h
@@ -4,6 +4,7 @@
  * Youngbok, Park <park@nexell.co.kr>
  */
 
+#include <compiler.h>
 #define NEXELL_L2C_SEC_ID	0
 #define NEXELL_MALI_SEC_ID	2
 #define NEXELL_MIPI_SEC_ID	4
diff --git a/arch/arm/mach-nexell/include/mach/tieoff.h b/arch/arm/mach-nexell/include/mach/tieoff.h
index 70e9652b6dca..598ffdd18011 100644
--- a/arch/arm/mach-nexell/include/mach/tieoff.h
+++ b/arch/arm/mach-nexell/include/mach/tieoff.h
@@ -7,6 +7,7 @@
 #ifndef _NEXELL_TIEOFF_H
 #define _NEXELL_TIEOFF_H
 
+#include <asm/types.h>
 void nx_tieoff_set(u32 tieoff_index, u32 tieoff_value);
 u32 nx_tieoff_get(u32 tieoff_index);
 
diff --git a/arch/arm/mach-nexell/nx_sec_reg.c b/arch/arm/mach-nexell/nx_sec_reg.c
index 3d3dd9fd8b6a..09d2eed48ae3 100644
--- a/arch/arm/mach-nexell/nx_sec_reg.c
+++ b/arch/arm/mach-nexell/nx_sec_reg.c
@@ -4,6 +4,7 @@
  * Youngbok, Park <park@nexell.co.kr>
  */
 
+#include <compiler.h>
 #include <linux/types.h>
 #include <asm/io.h>
 #include <asm/arch/nexell.h>
diff --git a/arch/arm/mach-nexell/reset.c b/arch/arm/mach-nexell/reset.c
index 1f732a3d3732..97155d8ffd0e 100644
--- a/arch/arm/mach-nexell/reset.c
+++ b/arch/arm/mach-nexell/reset.c
@@ -12,6 +12,7 @@
 #include <asm/io.h>
 #include <asm/arch/nexell.h>
 #include <asm/arch/reset.h>
+#include <asm/types.h>
 
 struct	nx_rstcon_registerset {
 	u32	regrst[(NUMBER_OF_RESET_MODULE_PIN + 31) >> 5];
diff --git a/arch/arm/mach-nexell/tieoff.c b/arch/arm/mach-nexell/tieoff.c
index 5a4744c296a2..2c2db9f6ce6c 100644
--- a/arch/arm/mach-nexell/tieoff.c
+++ b/arch/arm/mach-nexell/tieoff.c
@@ -5,12 +5,14 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <asm/arch/nexell.h>
 #include <asm/arch/clk.h>
 #include <asm/arch/reset.h>
 #include <asm/arch/nx_gpio.h>
 #include <asm/arch/tieoff.h>
 #include <asm/arch/sec_reg.h>
+#include <asm/types.h>
 
 #define	NX_PIN_FN_SIZE	4
 #define TIEOFF_REG_NUM 33
diff --git a/arch/arm/mach-nexell/timer.c b/arch/arm/mach-nexell/timer.c
index 2f98bd7fa4a1..1119ce746459 100644
--- a/arch/arm/mach-nexell/timer.c
+++ b/arch/arm/mach-nexell/timer.c
@@ -5,8 +5,10 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <log.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include <asm/io.h>
 #include <asm/arch/nexell.h>
diff --git a/arch/arm/mach-omap2/abb.c b/arch/arm/mach-omap2/abb.c
index 24775bdc41ce..c3487f83b75a 100644
--- a/arch/arm/mach-omap2/abb.c
+++ b/arch/arm/mach-omap2/abb.c
@@ -9,11 +9,13 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <stdio.h>
 #include <asm/omap_common.h>
 #include <asm/arch/clock.h>
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/kernel.h>
 
diff --git a/arch/arm/mach-omap2/am33xx/board.c b/arch/arm/mach-omap2/am33xx/board.c
index 0b0372e22cad..ce399663191c 100644
--- a/arch/arm/mach-omap2/am33xx/board.c
+++ b/arch/arm/mach-omap2/am33xx/board.c
@@ -8,6 +8,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <debug_uart.h>
 #include <errno.h>
@@ -38,6 +39,7 @@
 #include <linux/errno.h>
 #include <linux/compiler.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
 #include <linux/usb/musb.h>
diff --git a/arch/arm/mach-omap2/am33xx/clk_synthesizer.c b/arch/arm/mach-omap2/am33xx/clk_synthesizer.c
index b2493d8179be..ac97bfa69c0b 100644
--- a/arch/arm/mach-omap2/am33xx/clk_synthesizer.c
+++ b/arch/arm/mach-omap2/am33xx/clk_synthesizer.c
@@ -12,6 +12,7 @@
 #include <stdio.h>
 #include <asm/arch/clk_synthesizer.h>
 #include <i2c.h>
+#include <asm/types.h>
 
 /**
  * clk_synthesizer_reg_read - Read register from synthesizer.
diff --git a/arch/arm/mach-omap2/am33xx/clock.c b/arch/arm/mach-omap2/am33xx/clock.c
index 4339817b556a..d665da8856f4 100644
--- a/arch/arm/mach-omap2/am33xx/clock.c
+++ b/arch/arm/mach-omap2/am33xx/clock.c
@@ -8,6 +8,7 @@
  * Copyright (C) 2013, Texas Instruments, Incorporated - http://www.ti.com/
  */
 #include <common.h>
+#include <compiler.h>
 #include <hang.h>
 #include <init.h>
 #include <log.h>
@@ -17,6 +18,7 @@
 #include <asm/arch/hardware.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/io.h>
+#include <asm/types.h>
 
 static void setup_post_dividers(const struct dpll_regs *dpll_regs,
 			 const struct dpll_params *params)
diff --git a/arch/arm/mach-omap2/am33xx/clock_am33xx.c b/arch/arm/mach-omap2/am33xx/clock_am33xx.c
index b5136f8f46c9..5a483a9e3d03 100644
--- a/arch/arm/mach-omap2/am33xx/clock_am33xx.c
+++ b/arch/arm/mach-omap2/am33xx/clock_am33xx.c
@@ -8,12 +8,14 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <stdio.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/hardware.h>
 #include <asm/io.h>
+#include <asm/types.h>
 
 #define OSC	(V_OSCK/1000000)
 
diff --git a/arch/arm/mach-omap2/am33xx/clock_am43xx.c b/arch/arm/mach-omap2/am33xx/clock_am43xx.c
index b98bb9989c0b..ef4b79f272de 100644
--- a/arch/arm/mach-omap2/am33xx/clock_am43xx.c
+++ b/arch/arm/mach-omap2/am33xx/clock_am43xx.c
@@ -14,6 +14,7 @@
 #include <asm/arch/hardware.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/io.h>
+#include <asm/types.h>
 
 struct cm_perpll *const cmper = (struct cm_perpll *)CM_PER;
 struct cm_wkuppll *const cmwkup = (struct cm_wkuppll *)CM_WKUP;
diff --git a/arch/arm/mach-omap2/am33xx/clock_ti814x.c b/arch/arm/mach-omap2/am33xx/clock_ti814x.c
index 27abaff48fce..8e2c224bf7ed 100644
--- a/arch/arm/mach-omap2/am33xx/clock_ti814x.c
+++ b/arch/arm/mach-omap2/am33xx/clock_ti814x.c
@@ -12,6 +12,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/hardware.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 /* PRCM */
diff --git a/arch/arm/mach-omap2/am33xx/clock_ti816x.c b/arch/arm/mach-omap2/am33xx/clock_ti816x.c
index ec4cc753812d..c551a5d7cc61 100644
--- a/arch/arm/mach-omap2/am33xx/clock_ti816x.c
+++ b/arch/arm/mach-omap2/am33xx/clock_ti816x.c
@@ -27,6 +27,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/hardware.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 
 #include <asm/emif.h>
diff --git a/arch/arm/mach-omap2/am33xx/ddr.c b/arch/arm/mach-omap2/am33xx/ddr.c
index 4caa2d62ab25..cb30d65bca7e 100644
--- a/arch/arm/mach-omap2/am33xx/ddr.c
+++ b/arch/arm/mach-omap2/am33xx/ddr.c
@@ -13,6 +13,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/io.h>
 #include <asm/emif.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 /**
diff --git a/arch/arm/mach-omap2/am33xx/emif4.c b/arch/arm/mach-omap2/am33xx/emif4.c
index a5fdb0433dc7..1d5fb5340886 100644
--- a/arch/arm/mach-omap2/am33xx/emif4.c
+++ b/arch/arm/mach-omap2/am33xx/emif4.c
@@ -8,6 +8,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/ddr_defs.h>
 #include <asm/arch/hardware.h>
diff --git a/arch/arm/mach-omap2/am33xx/mux.c b/arch/arm/mach-omap2/am33xx/mux.c
index aad3ec855697..06534cb1db4d 100644
--- a/arch/arm/mach-omap2/am33xx/mux.c
+++ b/arch/arm/mach-omap2/am33xx/mux.c
@@ -14,6 +14,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <asm/arch/mux.h>
 #include <asm/arch/hardware.h>
 #include <asm/io.h>
diff --git a/arch/arm/mach-omap2/am33xx/sys_info.c b/arch/arm/mach-omap2/am33xx/sys_info.c
index 86078f856edc..ba81baa914cf 100644
--- a/arch/arm/mach-omap2/am33xx/sys_info.c
+++ b/arch/arm/mach-omap2/am33xx/sys_info.c
@@ -19,6 +19,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/clock.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include <power/tps65910.h>
 #include <linux/compiler.h>
 
diff --git a/arch/arm/mach-omap2/boot-common.c b/arch/arm/mach-omap2/boot-common.c
index 05efe04dc359..be6e02ee4db7 100644
--- a/arch/arm/mach-omap2/boot-common.c
+++ b/arch/arm/mach-omap2/boot-common.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <ahci.h>
+#include <compiler.h>
 #include <log.h>
 #include <spl.h>
 #include <asm/global_data.h>
@@ -19,6 +20,7 @@
 #include <watchdog.h>
 #include <scsi.h>
 #include <i2c.h>
+#include <asm/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-omap2/clocks-common.c b/arch/arm/mach-omap2/clocks-common.c
index a151358f6e0f..bf31d893c571 100644
--- a/arch/arm/mach-omap2/clocks-common.c
+++ b/arch/arm/mach-omap2/clocks-common.c
@@ -13,6 +13,7 @@
  *	Rajendra Nayak <rnayak@ti.com>
  */
 #include <common.h>
+#include <compiler.h>
 #include <hang.h>
 #include <i2c.h>
 #include <init.h>
@@ -22,6 +23,7 @@
 #include <asm/gpio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/types.h>
 #include <asm/utils.h>
 #include <asm/omap_gpio.h>
 #include <asm/emif.h>
diff --git a/arch/arm/mach-omap2/emif-common.c b/arch/arm/mach-omap2/emif-common.c
index 15c13463f905..bfd2c158486a 100644
--- a/arch/arm/mach-omap2/emif-common.c
+++ b/arch/arm/mach-omap2/emif-common.c
@@ -9,6 +9,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <hang.h>
 #include <init.h>
 #include <log.h>
@@ -20,6 +21,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/omap_common.h>
 #include <asm/omap_sec_common.h>
+#include <asm/types.h>
 #include <asm/utils.h>
 #include <linux/compiler.h>
 #include <asm/ti-common/ti-edma3.h>
diff --git a/arch/arm/mach-omap2/fdt-common.c b/arch/arm/mach-omap2/fdt-common.c
index e1d3a72ec6d7..4efccd0d7fc0 100644
--- a/arch/arm/mach-omap2/fdt-common.c
+++ b/arch/arm/mach-omap2/fdt-common.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <log.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
diff --git a/arch/arm/mach-omap2/hwinit-common.c b/arch/arm/mach-omap2/hwinit-common.c
index b3ada7af6b86..ae7b98096849 100644
--- a/arch/arm/mach-omap2/hwinit-common.c
+++ b/arch/arm/mach-omap2/hwinit-common.c
@@ -11,6 +11,7 @@
  *	Steve Sakoman	<steve@sakoman.com>
  */
 #include <common.h>
+#include <compiler.h>
 #include <debug_uart.h>
 #include <fdtdec.h>
 #include <init.h>
@@ -24,6 +25,7 @@
 #include <linux/compiler.h>
 #include <asm/system.h>
 #include <dm/root.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-omap2/mem-common.c b/arch/arm/mach-omap2/mem-common.c
index 50d5f3e9ebaf..2a15692f681a 100644
--- a/arch/arm/mach-omap2/mem-common.c
+++ b/arch/arm/mach-omap2/mem-common.c
@@ -18,6 +18,7 @@
 #include <asm/arch/mem.h>
 #include <asm/arch/sys_proto.h>
 #include <command.h>
+#include <asm/types.h>
 #include <linux/mtd/omap_gpmc.h>
 #include <jffs2/load_kernel.h>
 
diff --git a/arch/arm/mach-omap2/omap-cache.c b/arch/arm/mach-omap2/omap-cache.c
index 5034404801aa..a07e138b110d 100644
--- a/arch/arm/mach-omap2/omap-cache.c
+++ b/arch/arm/mach-omap2/omap-cache.c
@@ -16,6 +16,7 @@
 #include <log.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-omap2/omap3/am35x_musb.c b/arch/arm/mach-omap2/omap3/am35x_musb.c
index 23b55d8d7059..e655d6fb9451 100644
--- a/arch/arm/mach-omap2/omap3/am35x_musb.c
+++ b/arch/arm/mach-omap2/omap3/am35x_musb.c
@@ -9,12 +9,13 @@
  */
 
 #include <common.h>
-#include <dm.h>
 #include <log.h>
 #include <stdio.h>
 #include <time.h>
+#include <dm/device.h>
 #include <asm/io.h>
 #include <asm/arch/am35x_def.h>
+#include <asm/types.h>
 
 void am35x_musb_reset(struct udevice *dev)
 {
diff --git a/arch/arm/mach-omap2/omap3/board.c b/arch/arm/mach-omap2/omap3/board.c
index 30a3b02bb289..8c9f0b7a9e30 100644
--- a/arch/arm/mach-omap2/omap3/board.c
+++ b/arch/arm/mach-omap2/omap3/board.c
@@ -17,6 +17,7 @@
  */
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <dm.h>
 #include <init.h>
 #include <spl.h>
@@ -30,6 +31,7 @@
 #include <asm/omap_common.h>
 #include <linux/compiler.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /* Declarations */
 extern omap3_sysinfo sysinfo;
diff --git a/arch/arm/mach-omap2/omap3/boot.c b/arch/arm/mach-omap2/omap3/boot.c
index ea26115b7118..5544b87894a1 100644
--- a/arch/arm/mach-omap2/omap3/boot.c
+++ b/arch/arm/mach-omap2/omap3/boot.c
@@ -9,6 +9,7 @@
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
 #include <spl.h>
+#include <asm/types.h>
 
 static u32 boot_devices[] = {
 	BOOT_DEVICE_ONENAND,
diff --git a/arch/arm/mach-omap2/omap3/clock.c b/arch/arm/mach-omap2/omap3/clock.c
index 71f73492c6c4..2cb751269cce 100644
--- a/arch/arm/mach-omap2/omap3/clock.c
+++ b/arch/arm/mach-omap2/omap3/clock.c
@@ -18,6 +18,7 @@
 #include <asm/arch/mem.h>
 #include <asm/arch/sys_proto.h>
 #include <command.h>
+#include <asm/types.h>
 
 /******************************************************************************
  * get_sys_clk_speed() - determine reference oscillator speed
diff --git a/arch/arm/mach-omap2/omap3/emac.c b/arch/arm/mach-omap2/omap3/emac.c
index 4c102dadf42d..d96acfed2e54 100644
--- a/arch/arm/mach-omap2/omap3/emac.c
+++ b/arch/arm/mach-omap2/omap3/emac.c
@@ -10,6 +10,7 @@
 #include <net.h>
 #include <asm/io.h>
 #include <asm/arch/am35x_def.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 
 /*
diff --git a/arch/arm/mach-omap2/omap3/emif4.c b/arch/arm/mach-omap2/omap3/emif4.c
index df6e9ce1d6ce..40f2209d9f9c 100644
--- a/arch/arm/mach-omap2/omap3/emif4.c
+++ b/arch/arm/mach-omap2/omap3/emif4.c
@@ -16,6 +16,7 @@
 #include <asm/arch/mem.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/emif4.h>
+#include <asm/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 extern omap3_sysinfo sysinfo;
diff --git a/arch/arm/mach-omap2/omap3/sdrc.c b/arch/arm/mach-omap2/omap3/sdrc.c
index 4d85b1dee991..7a9b95c3e755 100644
--- a/arch/arm/mach-omap2/omap3/sdrc.c
+++ b/arch/arm/mach-omap2/omap3/sdrc.c
@@ -27,6 +27,7 @@
 #include <asm/io.h>
 #include <asm/arch/mem.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 extern omap3_sysinfo sysinfo;
diff --git a/arch/arm/mach-omap2/omap3/sys_info.c b/arch/arm/mach-omap2/omap3/sys_info.c
index 5ed2c6bdeeeb..526d3d60dba9 100644
--- a/arch/arm/mach-omap2/omap3/sys_info.c
+++ b/arch/arm/mach-omap2/omap3/sys_info.c
@@ -12,12 +12,14 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/mem.h>	/* get mem tables */
 #include <asm/arch/sys_proto.h>
 #include <asm/bootm.h>
 #include <asm/omap_common.h>
+#include <asm/types.h>
 
 #include <i2c.h>
 #include <linux/compiler.h>
diff --git a/arch/arm/mach-omap2/omap4/boot.c b/arch/arm/mach-omap2/omap4/boot.c
index 90b5380ae398..95f57366b52e 100644
--- a/arch/arm/mach-omap2/omap4/boot.c
+++ b/arch/arm/mach-omap2/omap4/boot.c
@@ -10,6 +10,7 @@
 #include <asm/omap_common.h>
 #include <asm/arch/sys_proto.h>
 #include <spl.h>
+#include <asm/types.h>
 
 static u32 boot_devices[] = {
 	BOOT_DEVICE_MMC2,
diff --git a/arch/arm/mach-omap2/omap4/emif.c b/arch/arm/mach-omap2/omap4/emif.c
index 35a51645be7f..6fe3fa4e40a0 100644
--- a/arch/arm/mach-omap2/omap4/emif.c
+++ b/arch/arm/mach-omap2/omap4/emif.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <asm/emif.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/types.h>
 #include <asm/utils.h>
 
 #ifndef CONFIG_SYS_EMIF_PRECALCULATED_TIMING_REGS
diff --git a/arch/arm/mach-omap2/omap4/hw_data.c b/arch/arm/mach-omap2/omap4/hw_data.c
index 5f15e086c644..91608d9fed97 100644
--- a/arch/arm/mach-omap2/omap4/hw_data.c
+++ b/arch/arm/mach-omap2/omap4/hw_data.c
@@ -16,6 +16,7 @@
 #include <asm/arch/clock.h>
 #include <asm/omap_gpio.h>
 #include <asm/io.h>
+#include <asm/types.h>
 
 struct prcm_regs const **prcm =
 			(struct prcm_regs const **) OMAP_SRAM_SCRATCH_PRCM_PTR;
diff --git a/arch/arm/mach-omap2/omap4/hwinit.c b/arch/arm/mach-omap2/omap4/hwinit.c
index 27dfa9142dcd..efb4d6a80480 100644
--- a/arch/arm/mach-omap2/omap4/hwinit.c
+++ b/arch/arm/mach-omap2/omap4/hwinit.c
@@ -19,6 +19,7 @@
 #include <asm/emif.h>
 #include <asm/arch/gpio.h>
 #include <asm/omap_common.h>
+#include <linux/types.h>
 
 u32 *const omap_si_rev = (u32 *)OMAP_SRAM_SCRATCH_OMAP_REV;
 
diff --git a/arch/arm/mach-omap2/omap4/sdram_elpida.c b/arch/arm/mach-omap2/omap4/sdram_elpida.c
index 2a18cf0215d9..a775494e4073 100644
--- a/arch/arm/mach-omap2/omap4/sdram_elpida.c
+++ b/arch/arm/mach-omap2/omap4/sdram_elpida.c
@@ -10,8 +10,10 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <asm/emif.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/types.h>
 
 /*
  * This file provides details of the LPDDR2 SDRAM parts used on OMAP4430
diff --git a/arch/arm/mach-omap2/omap5/abb.c b/arch/arm/mach-omap2/omap5/abb.c
index 2f9f8e65d03e..730ab832db5b 100644
--- a/arch/arm/mach-omap2/omap5/abb.c
+++ b/arch/arm/mach-omap2/omap5/abb.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <asm/omap_common.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 
 /*
diff --git a/arch/arm/mach-omap2/omap5/boot.c b/arch/arm/mach-omap2/omap5/boot.c
index 15d6836c6eae..bbc9a90fe69b 100644
--- a/arch/arm/mach-omap2/omap5/boot.c
+++ b/arch/arm/mach-omap2/omap5/boot.c
@@ -9,6 +9,7 @@
 #include <asm/io.h>
 #include <asm/omap_common.h>
 #include <spl.h>
+#include <asm/types.h>
 
 static u32 boot_devices[] = {
 #if defined(CONFIG_DRA7XX)
diff --git a/arch/arm/mach-omap2/omap5/dra7xx_iodelay.c b/arch/arm/mach-omap2/omap5/dra7xx_iodelay.c
index c5d51aabfc94..509f6617c593 100644
--- a/arch/arm/mach-omap2/omap5/dra7xx_iodelay.c
+++ b/arch/arm/mach-omap2/omap5/dra7xx_iodelay.c
@@ -10,6 +10,7 @@
 #include <hang.h>
 #include <log.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <asm/utils.h>
 #include <asm/arch/dra7xx_iodelay.h>
 #include <asm/arch/omap.h>
diff --git a/arch/arm/mach-omap2/omap5/emif.c b/arch/arm/mach-omap2/omap5/emif.c
index 2de36b6feca6..5348921c060d 100644
--- a/arch/arm/mach-omap2/omap5/emif.c
+++ b/arch/arm/mach-omap2/omap5/emif.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <asm/emif.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/types.h>
 #include <asm/utils.h>
 
 #ifndef CONFIG_SYS_EMIF_PRECALCULATED_TIMING_REGS
diff --git a/arch/arm/mach-omap2/omap5/fdt.c b/arch/arm/mach-omap2/omap5/fdt.c
index af9717801e44..c1321f6dc1fc 100644
--- a/arch/arm/mach-omap2/omap5/fdt.c
+++ b/arch/arm/mach-omap2/omap5/fdt.c
@@ -12,6 +12,7 @@
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <malloc.h>
+#include <linux/types.h>
 
 #include <asm/omap_common.h>
 #include <asm/arch-omap5/sys_proto.h>
diff --git a/arch/arm/mach-omap2/omap5/hw_data.c b/arch/arm/mach-omap2/omap5/hw_data.c
index d9c447c0e8d2..171155ddef61 100644
--- a/arch/arm/mach-omap2/omap5/hw_data.c
+++ b/arch/arm/mach-omap2/omap5/hw_data.c
@@ -9,6 +9,7 @@
  * Sricharan R <r.sricharan@ti.com>
  */
 #include <common.h>
+#include <compiler.h>
 #include <palmas.h>
 #include <stdio.h>
 #include <asm/arch/omap.h>
@@ -18,6 +19,7 @@
 #include <asm/omap_gpio.h>
 #include <asm/io.h>
 #include <asm/emif.h>
+#include <asm/types.h>
 
 struct prcm_regs const **prcm =
 			(struct prcm_regs const **) OMAP_SRAM_SCRATCH_PRCM_PTR;
diff --git a/arch/arm/mach-omap2/omap5/hwinit.c b/arch/arm/mach-omap2/omap5/hwinit.c
index 47ac8656bfe1..9773bc29e7df 100644
--- a/arch/arm/mach-omap2/omap5/hwinit.c
+++ b/arch/arm/mach-omap2/omap5/hwinit.c
@@ -12,6 +12,7 @@
  *	Sricharan	<r.sricharan@ti.com>
  */
 #include <common.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <palmas.h>
 #include <asm/armv7.h>
@@ -24,6 +25,7 @@
 #include <asm/arch/gpio.h>
 #include <asm/emif.h>
 #include <asm/omap_common.h>
+#include <linux/types.h>
 
 u32 *const omap_si_rev = (u32 *)OMAP_SRAM_SCRATCH_OMAP_REV;
 
diff --git a/arch/arm/mach-omap2/omap5/prcm-regs.c b/arch/arm/mach-omap2/omap5/prcm-regs.c
index b5baebc06926..3e8086dddb15 100644
--- a/arch/arm/mach-omap2/omap5/prcm-regs.c
+++ b/arch/arm/mach-omap2/omap5/prcm-regs.c
@@ -11,6 +11,7 @@
 
 #include <asm/omap_common.h>
 #include <asm/io.h>
+#include <asm/types.h>
 
 struct prcm_regs const omap5_es1_prcm = {
 	/* cm1.ckgen */
diff --git a/arch/arm/mach-omap2/omap5/sdram.c b/arch/arm/mach-omap2/omap5/sdram.c
index f6c8eb9f1bdd..4306ea3a63fd 100644
--- a/arch/arm/mach-omap2/omap5/sdram.c
+++ b/arch/arm/mach-omap2/omap5/sdram.c
@@ -11,9 +11,11 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <stdio.h>
 #include <asm/emif.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 
 /*
diff --git a/arch/arm/mach-omap2/pipe3-phy.c b/arch/arm/mach-omap2/pipe3-phy.c
index fb64961db4ba..f6e50f92e9fa 100644
--- a/arch/arm/mach-omap2/pipe3-phy.c
+++ b/arch/arm/mach-omap2/pipe3-phy.c
@@ -7,11 +7,13 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <sata.h>
 #include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/arch/arm/mach-omap2/pipe3-phy.h b/arch/arm/mach-omap2/pipe3-phy.h
index 182bdcd4c81f..3999d7b60f57 100644
--- a/arch/arm/mach-omap2/pipe3-phy.h
+++ b/arch/arm/mach-omap2/pipe3-phy.h
@@ -9,6 +9,8 @@
 #ifndef __OMAP_PIPE3_PHY_H
 #define __OMAP_PIPE3_PHY_H
 
+#include <compiler.h>
+#include <asm/types.h>
 struct pipe3_dpll_params {
 	u16     m;
 	u8      n;
diff --git a/arch/arm/mach-omap2/reset.c b/arch/arm/mach-omap2/reset.c
index 2bbd5fcb9b8e..194e01163aaa 100644
--- a/arch/arm/mach-omap2/reset.c
+++ b/arch/arm/mach-omap2/reset.c
@@ -8,10 +8,12 @@
  *
  * Sricharan R <r.sricharan@ti.com>
  */
+#include <compiler.h>
 #include <config.h>
 #include <cpu_func.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
+#include <asm/types.h>
 #include <linux/compiler.h>
 
 void __weak reset_cpu(unsigned long ignored)
diff --git a/arch/arm/mach-omap2/sata.c b/arch/arm/mach-omap2/sata.c
index 4672dc534c5e..636cfb42aced 100644
--- a/arch/arm/mach-omap2/sata.c
+++ b/arch/arm/mach-omap2/sata.c
@@ -8,11 +8,13 @@
 
 #include <common.h>
 #include <ahci.h>
+#include <compiler.h>
 #include <scsi.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/sata.h>
 #include <sata.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include "pipe3-phy.h"
 
 static struct pipe3_dpll_map dpll_map_sata[] = {
diff --git a/arch/arm/mach-omap2/sec-common.c b/arch/arm/mach-omap2/sec-common.c
index 8dcaa1ac6c9e..d0cf68e30be3 100644
--- a/arch/arm/mach-omap2/sec-common.c
+++ b/arch/arm/mach-omap2/sec-common.c
@@ -24,6 +24,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <asm/arch/sys_proto.h>
 #include <asm/cache.h>
diff --git a/arch/arm/mach-omap2/sysinfo-common.c b/arch/arm/mach-omap2/sysinfo-common.c
index 49bc3a634fb8..6bce3a1c7ce2 100644
--- a/arch/arm/mach-omap2/sysinfo-common.c
+++ b/arch/arm/mach-omap2/sysinfo-common.c
@@ -9,6 +9,7 @@
 #include <asm/arch/omap.h>
 #include <asm/io.h>
 #include <asm/omap_common.h>
+#include <asm/types.h>
 
 /**
  * Tell if device is GP/HS/EMU/TST.
diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c
index 82b10f6b2487..c5565a741eb6 100644
--- a/arch/arm/mach-omap2/timer.c
+++ b/arch/arm/mach-omap2/timer.c
@@ -23,6 +23,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/clock.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-omap2/utils.c b/arch/arm/mach-omap2/utils.c
index 4ee409521ef7..be082cf2c977 100644
--- a/arch/arm/mach-omap2/utils.c
+++ b/arch/arm/mach-omap2/utils.c
@@ -4,6 +4,7 @@
  * Aneesh V <aneesh@ti.com>
  */
 #include <common.h>
+#include <compiler.h>
 #include <env.h>
 #include <part.h>
 #include <stdio.h>
@@ -11,6 +12,7 @@
 #include <asm/setup.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/omap_common.h>
+#include <asm/types.h>
 #include <linux/printk.h>
 
 static void do_cancel_out(u32 *num, u32 *den, u32 factor)
diff --git a/arch/arm/mach-omap2/vc.c b/arch/arm/mach-omap2/vc.c
index 5888bc86752c..b72c7823716f 100644
--- a/arch/arm/mach-omap2/vc.c
+++ b/arch/arm/mach-omap2/vc.c
@@ -19,6 +19,7 @@
 #include <asm/omap_common.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/clock.h>
+#include <asm/types.h>
 
 /* Register defines and masks for VC IP Block */
 /* PRM_VC_CFG_I2C_MODE */
diff --git a/arch/arm/mach-orion5x/cpu.c b/arch/arm/mach-orion5x/cpu.c
index 81f3bd37ea35..f050a30d983a 100644
--- a/arch/arm/mach-orion5x/cpu.c
+++ b/arch/arm/mach-orion5x/cpu.c
@@ -17,6 +17,7 @@
 #include <vsprintf.h>
 #include <asm/cache.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <u-boot/md5.h>
 #include <asm/arch/cpu.h>
diff --git a/arch/arm/mach-orion5x/dram.c b/arch/arm/mach-orion5x/dram.c
index c9a3750e48de..34bf24a96de1 100644
--- a/arch/arm/mach-orion5x/dram.c
+++ b/arch/arm/mach-orion5x/dram.c
@@ -13,6 +13,7 @@
 #include <init.h>
 #include <asm/arch/cpu.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-orion5x/include/mach/cpu.h b/arch/arm/mach-orion5x/include/mach/cpu.h
index c3ff89669e45..6118f42313ff 100644
--- a/arch/arm/mach-orion5x/include/mach/cpu.h
+++ b/arch/arm/mach-orion5x/include/mach/cpu.h
@@ -21,6 +21,7 @@
 #define ORION5XGBE_PORT_SERIAL_CONTROL1_REG(_x)	\
 		((_x ? ORION5X_EGIGA0_BASE : ORION5X_EGIGA1_BASE) + 0x44c)
 
+#include <asm/types.h>
 enum memory_bank {
 	BANK0,
 	BANK1,
diff --git a/arch/arm/mach-orion5x/timer.c b/arch/arm/mach-orion5x/timer.c
index 0adf3dcc6483..3f9f0f9b6255 100644
--- a/arch/arm/mach-orion5x/timer.c
+++ b/arch/arm/mach-orion5x/timer.c
@@ -13,6 +13,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 #define UBOOT_CNTR	0	/* counter to use for uboot timer */
 
diff --git a/arch/arm/mach-owl/soc.c b/arch/arm/mach-owl/soc.c
index 8ac35b56d42b..4c081c67e256 100644
--- a/arch/arm/mach-owl/soc.c
+++ b/arch/arm/mach-owl/soc.c
@@ -16,6 +16,7 @@
 #include <asm/io.h>
 #include <asm/mach-types.h>
 #include <asm/psci.h>
+#include <linux/types.h>
 
 #define DMM_INTERLEAVE_PER_CH_CFG	0xe0290028
 
diff --git a/arch/arm/mach-rmobile/cpu_info-r8a7740.c b/arch/arm/mach-rmobile/cpu_info-r8a7740.c
index dcbe25f37ab9..16a5a8ae29a4 100644
--- a/arch/arm/mach-rmobile/cpu_info-r8a7740.c
+++ b/arch/arm/mach-rmobile/cpu_info-r8a7740.c
@@ -5,6 +5,7 @@
  */
 #include <common.h>
 #include <asm/io.h>
+#include <asm/types.h>
 
 u32 rmobile_get_cpu_type(void)
 {
diff --git a/arch/arm/mach-rmobile/cpu_info-rcar.c b/arch/arm/mach-rmobile/cpu_info-rcar.c
index ce9312f9d828..724d3c67d590 100644
--- a/arch/arm/mach-rmobile/cpu_info-rcar.c
+++ b/arch/arm/mach-rmobile/cpu_info-rcar.c
@@ -6,6 +6,7 @@
  */
 #include <common.h>
 #include <asm/io.h>
+#include <asm/types.h>
 
 #define PRR_MASK		0x7fff
 #define R8A7796_REV_1_0		0x5200
diff --git a/arch/arm/mach-rmobile/cpu_info-sh73a0.c b/arch/arm/mach-rmobile/cpu_info-sh73a0.c
index 0c7ee8acf5a7..7f01201629bd 100644
--- a/arch/arm/mach-rmobile/cpu_info-sh73a0.c
+++ b/arch/arm/mach-rmobile/cpu_info-sh73a0.c
@@ -5,6 +5,7 @@
  */
 #include <common.h>
 #include <asm/io.h>
+#include <asm/types.h>
 
 u32 rmobile_get_cpu_type(void)
 {
diff --git a/arch/arm/mach-rmobile/cpu_info.c b/arch/arm/mach-rmobile/cpu_info.c
index 4d7fc0d9c71f..f491aaad0a8b 100644
--- a/arch/arm/mach-rmobile/cpu_info.c
+++ b/arch/arm/mach-rmobile/cpu_info.c
@@ -10,6 +10,7 @@
 #include <init.h>
 #include <asm/io.h>
 #include <env.h>
+#include <asm/types.h>
 #include <linux/ctype.h>
 #include <linux/kernel.h>
 
diff --git a/arch/arm/mach-rmobile/include/mach/ehci-rmobile.h b/arch/arm/mach-rmobile/include/mach/ehci-rmobile.h
index ca8c5f370637..641872cbbcd3 100644
--- a/arch/arm/mach-rmobile/include/mach/ehci-rmobile.h
+++ b/arch/arm/mach-rmobile/include/mach/ehci-rmobile.h
@@ -8,6 +8,7 @@
 #define __EHCI_RMOBILE_H__
 
 /* Register offset */
+#include <asm/types.h>
 #define OHCI_OFFSET	0x00
 #define OHCI_SIZE	0x1000
 #define EHCI_OFFSET	0x1000
diff --git a/arch/arm/mach-rmobile/include/mach/rcar-mstp.h b/arch/arm/mach-rmobile/include/mach/rcar-mstp.h
index f2f8ce95992c..f408b1e76e35 100644
--- a/arch/arm/mach-rmobile/include/mach/rcar-mstp.h
+++ b/arch/arm/mach-rmobile/include/mach/rcar-mstp.h
@@ -9,6 +9,7 @@
 #ifndef __ASM_ARCH_RCAR_MSTP_H
 #define __ASM_ARCH_RCAR_MSTP_H
 
+#include <asm/types.h>
 #define mstp_setbits(type, addr, saddr, set) \
 		out_##type((saddr), in_##type(addr) | (set))
 #define mstp_clrbits(type, addr, saddr, clear) \
diff --git a/arch/arm/mach-rmobile/include/mach/rmobile.h b/arch/arm/mach-rmobile/include/mach/rmobile.h
index a50249dc9638..e41004eb4371 100644
--- a/arch/arm/mach-rmobile/include/mach/rmobile.h
+++ b/arch/arm/mach-rmobile/include/mach/rmobile.h
@@ -41,6 +41,7 @@
 #define RMOBILE_CPU_TYPE_R8A77995	0x58
 
 #ifndef __ASSEMBLY__
+#include <asm/types.h>
 u32 rmobile_get_cpu_type(void);
 u32 rmobile_get_cpu_rev_integer(void);
 u32 rmobile_get_cpu_rev_fraction(void);
diff --git a/arch/arm/mach-rmobile/timer.c b/arch/arm/mach-rmobile/timer.c
index ba06535e4c2a..d911dbea51f5 100644
--- a/arch/arm/mach-rmobile/timer.c
+++ b/arch/arm/mach-rmobile/timer.c
@@ -12,6 +12,7 @@
 #include <asm/arch-armv7/globaltimer.h>
 #include <asm/arch/rmobile.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 static struct globaltimer *global_timer = \
 		(struct globaltimer *)GLOBAL_TIMER_BASE_ADDR;
diff --git a/arch/arm/mach-rockchip/board.c b/arch/arm/mach-rockchip/board.c
index 117aa030938c..de59ae383d7a 100644
--- a/arch/arm/mach-rockchip/board.c
+++ b/arch/arm/mach-rockchip/board.c
@@ -4,6 +4,7 @@
  */
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <dm.h>
 #include <init.h>
@@ -19,6 +20,7 @@
 #include <asm/arch-rockchip/clock.h>
 #include <asm/arch-rockchip/periph.h>
 #include <asm/arch-rockchip/misc.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <power/regulator.h>
diff --git a/arch/arm/mach-rockchip/boot_mode.c b/arch/arm/mach-rockchip/boot_mode.c
index 69e64fb39c38..3c52b94e0d0c 100644
--- a/arch/arm/mach-rockchip/boot_mode.c
+++ b/arch/arm/mach-rockchip/boot_mode.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <adc.h>
 #include <command.h>
+#include <compiler.h>
 #include <env.h>
 #include <log.h>
 #include <stdbool.h>
diff --git a/arch/arm/mach-rockchip/bootrom.c b/arch/arm/mach-rockchip/bootrom.c
index 24ba39537cd2..3a557e0a1019 100644
--- a/arch/arm/mach-rockchip/bootrom.c
+++ b/arch/arm/mach-rockchip/bootrom.c
@@ -13,6 +13,7 @@
 #include <asm/io.h>
 #include <asm/setjmp.h>
 #include <asm/system.h>
+#include <asm/types.h>
 
 /*
  * Force the jmp_buf to the data-section, as .bss will not be valid
diff --git a/arch/arm/mach-rockchip/misc.c b/arch/arm/mach-rockchip/misc.c
index 82a106e786e8..17a0579bddc6 100644
--- a/arch/arm/mach-rockchip/misc.c
+++ b/arch/arm/mach-rockchip/misc.c
@@ -16,6 +16,7 @@
 #include <log.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <asm/types.h>
 #include <dm/uclass-internal.h>
 #include <misc.h>
 #include <linux/string.h>
diff --git a/arch/arm/mach-rockchip/px30-board-tpl.c b/arch/arm/mach-rockchip/px30-board-tpl.c
index 085e65062011..bb9aac92e5b1 100644
--- a/arch/arm/mach-rockchip/px30-board-tpl.c
+++ b/arch/arm/mach-rockchip/px30-board-tpl.c
@@ -13,6 +13,7 @@
 #include <asm/io.h>
 #include <asm/arch-rockchip/bootrom.h>
 #include <asm/arch-rockchip/sdram_px30.h>
+#include <linux/types.h>
 
 #define TIMER_LOAD_COUNT0	0x00
 #define TIMER_LOAD_COUNT1	0x04
diff --git a/arch/arm/mach-rockchip/px30/px30.c b/arch/arm/mach-rockchip/px30/px30.c
index 6fcef63c1b09..fd72b9a51c5c 100644
--- a/arch/arm/mach-rockchip/px30/px30.c
+++ b/arch/arm/mach-rockchip/px30/px30.c
@@ -13,6 +13,7 @@
 #include <asm/arch-rockchip/uart.h>
 #include <asm/arch-rockchip/clock.h>
 #include <asm/arch-rockchip/cru_px30.h>
+#include <asm/types.h>
 #include <dt-bindings/clock/px30-cru.h>
 
 static struct mm_region px30_mem_map[] = {
diff --git a/arch/arm/mach-rockchip/px30/syscon_px30.c b/arch/arm/mach-rockchip/px30/syscon_px30.c
index 4672bdbf0092..ce387f007e88 100644
--- a/arch/arm/mach-rockchip/px30/syscon_px30.c
+++ b/arch/arm/mach-rockchip/px30/syscon_px30.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <syscon.h>
 #include <asm/arch-rockchip/clock.h>
+#include <linux/types.h>
 
 static const struct udevice_id px30_syscon_ids[] = {
 	{ .compatible = "rockchip,px30-pmu", .data = ROCKCHIP_SYSCON_PMU },
diff --git a/arch/arm/mach-rockchip/rk3036-board-spl.c b/arch/arm/mach-rockchip/rk3036-board-spl.c
index 964e981b8637..1fbbab9a71ce 100644
--- a/arch/arm/mach-rockchip/rk3036-board-spl.c
+++ b/arch/arm/mach-rockchip/rk3036-board-spl.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <asm/arch-rockchip/bootrom.h>
 #include <asm/arch-rockchip/sdram_rk3036.h>
+#include <linux/types.h>
 
 #define TIMER_LOAD_COUNT_L	0x00
 #define TIMER_LOAD_COUNT_H	0x04
diff --git a/arch/arm/mach-rockchip/rk3036/sdram_rk3036.c b/arch/arm/mach-rockchip/rk3036/sdram_rk3036.c
index 6ae254e99af5..38f6f2cba374 100644
--- a/arch/arm/mach-rockchip/rk3036/sdram_rk3036.c
+++ b/arch/arm/mach-rockchip/rk3036/sdram_rk3036.c
@@ -12,6 +12,7 @@
 #include <asm/arch-rockchip/sdram_rk3036.h>
 #include <asm/arch-rockchip/uart.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 /*
  * we can not fit the code to access the device tree in SPL
diff --git a/arch/arm/mach-rockchip/rk3188/rk3188.c b/arch/arm/mach-rockchip/rk3188/rk3188.c
index 1338979febb3..91bbafa29bfd 100644
--- a/arch/arm/mach-rockchip/rk3188/rk3188.c
+++ b/arch/arm/mach-rockchip/rk3188/rk3188.c
@@ -3,6 +3,7 @@
  * (C) Copyright 2019 Rockchip Electronics Co., Ltd
  */
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <hang.h>
 #include <init.h>
diff --git a/arch/arm/mach-rockchip/rk3188/syscon_rk3188.c b/arch/arm/mach-rockchip/rk3188/syscon_rk3188.c
index ea7d7b5b1acc..81677f9485a4 100644
--- a/arch/arm/mach-rockchip/rk3188/syscon_rk3188.c
+++ b/arch/arm/mach-rockchip/rk3188/syscon_rk3188.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <syscon.h>
 #include <asm/arch-rockchip/clock.h>
+#include <linux/types.h>
 
 static const struct udevice_id rk3188_syscon_ids[] = {
 	{ .compatible = "rockchip,rk3188-noc", .data = ROCKCHIP_SYSCON_NOC },
diff --git a/arch/arm/mach-rockchip/rk3288/rk3288.c b/arch/arm/mach-rockchip/rk3288/rk3288.c
index 1589ab1b2c70..37d9fa020372 100644
--- a/arch/arm/mach-rockchip/rk3288/rk3288.c
+++ b/arch/arm/mach-rockchip/rk3288/rk3288.c
@@ -4,6 +4,7 @@
  */
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <dm.h>
 #include <env.h>
 #include <clk.h>
@@ -25,6 +26,7 @@
 #include <asm/u-boot.h>
 #include <linux/err.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-rockchip/rk3288/syscon_rk3288.c b/arch/arm/mach-rockchip/rk3288/syscon_rk3288.c
index e3da0a019476..c4142ef75ad4 100644
--- a/arch/arm/mach-rockchip/rk3288/syscon_rk3288.c
+++ b/arch/arm/mach-rockchip/rk3288/syscon_rk3288.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <syscon.h>
 #include <asm/arch-rockchip/clock.h>
+#include <linux/types.h>
 
 static const struct udevice_id rk3288_syscon_ids[] = {
 	{ .compatible = "rockchip,rk3288-noc", .data = ROCKCHIP_SYSCON_NOC },
diff --git a/arch/arm/mach-rockchip/rk3308/rk3308.c b/arch/arm/mach-rockchip/rk3308/rk3308.c
index 60566d092f62..eab9e851b5eb 100644
--- a/arch/arm/mach-rockchip/rk3308/rk3308.c
+++ b/arch/arm/mach-rockchip/rk3308/rk3308.c
@@ -3,6 +3,7 @@
  *Copyright (c) 2018 Rockchip Electronics Co., Ltd
  */
 #include <common.h>
+#include <compiler.h>
 #include <init.h>
 #include <malloc.h>
 #include <stdio.h>
@@ -12,6 +13,7 @@
 #include <asm/arch-rockchip/hardware.h>
 #include <asm/gpio.h>
 #include <debug_uart.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-rockchip/rk3368/rk3368.c b/arch/arm/mach-rockchip/rk3368/rk3368.c
index 9b7132d471c3..28f0fc89115b 100644
--- a/arch/arm/mach-rockchip/rk3368/rk3368.c
+++ b/arch/arm/mach-rockchip/rk3368/rk3368.c
@@ -17,6 +17,7 @@
 #include <asm/arch-rockchip/hardware.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-rockchip/rk3368/syscon_rk3368.c b/arch/arm/mach-rockchip/rk3368/syscon_rk3368.c
index cba0dda3e80a..2b02387cc4a8 100644
--- a/arch/arm/mach-rockchip/rk3368/syscon_rk3368.c
+++ b/arch/arm/mach-rockchip/rk3368/syscon_rk3368.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <syscon.h>
 #include <asm/arch-rockchip/clock.h>
+#include <linux/types.h>
 
 static const struct udevice_id rk3368_syscon_ids[] = {
 	{ .compatible = "rockchip,rk3368-grf",
diff --git a/arch/arm/mach-rockchip/rk3399/rk3399.c b/arch/arm/mach-rockchip/rk3399/rk3399.c
index 69eb741292a3..9ec470557410 100644
--- a/arch/arm/mach-rockchip/rk3399/rk3399.c
+++ b/arch/arm/mach-rockchip/rk3399/rk3399.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <fdt_support.h>
 #include <init.h>
 #include <log.h>
@@ -18,6 +19,7 @@
 #include <asm/arch-rockchip/gpio.h>
 #include <asm/arch-rockchip/grf_rk3399.h>
 #include <asm/arch-rockchip/hardware.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/kernel.h>
 #include <linux/printk.h>
diff --git a/arch/arm/mach-rockchip/rk3399/syscon_rk3399.c b/arch/arm/mach-rockchip/rk3399/syscon_rk3399.c
index 690cbe7f2789..296998a11bca 100644
--- a/arch/arm/mach-rockchip/rk3399/syscon_rk3399.c
+++ b/arch/arm/mach-rockchip/rk3399/syscon_rk3399.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <syscon.h>
 #include <asm/arch-rockchip/clock.h>
+#include <linux/types.h>
 
 static const struct udevice_id rk3399_syscon_ids[] = {
 	{ .compatible = "rockchip,rk3399-grf", .data = ROCKCHIP_SYSCON_GRF },
diff --git a/arch/arm/mach-rockchip/sdram.c b/arch/arm/mach-rockchip/sdram.c
index 39c2ee2eedfa..d627a9921617 100644
--- a/arch/arm/mach-rockchip/sdram.c
+++ b/arch/arm/mach-rockchip/sdram.c
@@ -13,6 +13,7 @@
 #include <asm/arch-rockchip/sdram.h>
 #include <dm/uclass-internal.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-rockchip/spl-boot-order.c b/arch/arm/mach-rockchip/spl-boot-order.c
index 57ea84a9346e..f67fbe23a3bc 100644
--- a/arch/arm/mach-rockchip/spl-boot-order.c
+++ b/arch/arm/mach-rockchip/spl-boot-order.c
@@ -4,11 +4,13 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
 #include <mmc.h>
 #include <spl.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 
diff --git a/arch/arm/mach-rockchip/spl.c b/arch/arm/mach-rockchip/spl.c
index e20b83a490db..6f7c9c9e6228 100644
--- a/arch/arm/mach-rockchip/spl.c
+++ b/arch/arm/mach-rockchip/spl.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <debug_uart.h>
 #include <dm.h>
 #include <hang.h>
@@ -18,6 +19,7 @@
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-rockchip/tpl.c b/arch/arm/mach-rockchip/tpl.c
index df052b82f2f4..37f7c493a233 100644
--- a/arch/arm/mach-rockchip/tpl.c
+++ b/arch/arm/mach-rockchip/tpl.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <debug_uart.h>
 #include <dm.h>
 #include <hang.h>
@@ -16,6 +17,7 @@
 #include <asm/io.h>
 #include <asm/arch-rockchip/bootrom.h>
 #include <linux/bitops.h>
+#include <linux/types.h>
 
 #define TIMER_LOAD_COUNT_L	0x00
 #define TIMER_LOAD_COUNT_H	0x04
diff --git a/arch/arm/mach-s5pc1xx/clock.c b/arch/arm/mach-s5pc1xx/clock.c
index e8809aa8ce2b..28e8130ed6a6 100644
--- a/arch/arm/mach-s5pc1xx/clock.c
+++ b/arch/arm/mach-s5pc1xx/clock.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/clk.h>
+#include <linux/types.h>
 
 #define CLK_M	0
 #define CLK_D	1
diff --git a/arch/arm/mach-s5pc1xx/include/mach/gpio.h b/arch/arm/mach-s5pc1xx/include/mach/gpio.h
index c8dfbdd642a7..93e1f0c5320c 100644
--- a/arch/arm/mach-s5pc1xx/include/mach/gpio.h
+++ b/arch/arm/mach-s5pc1xx/include/mach/gpio.h
@@ -8,6 +8,7 @@
 #define __ASM_ARCH_GPIO_H
 
 #ifndef __ASSEMBLY__
+#include <asm/types.h>
 struct s5p_gpio_bank {
 	unsigned int	con;
 	unsigned int	dat;
diff --git a/arch/arm/mach-s5pc1xx/include/mach/mmc.h b/arch/arm/mach-s5pc1xx/include/mach/mmc.h
index 70787908600d..e32a3c9f9d83 100644
--- a/arch/arm/mach-s5pc1xx/include/mach/mmc.h
+++ b/arch/arm/mach-s5pc1xx/include/mach/mmc.h
@@ -7,6 +7,7 @@
 #ifndef __ASM_ARCH_MMC_H_
 #define __ASM_ARCH_MMC_H_
 
+#include <asm/types.h>
 #define S5P_MMC_DEV_OFFSET	0x100000
 
 #define SDHCI_CONTROL2		0x80
diff --git a/arch/arm/mach-s5pc1xx/include/mach/sromc.h b/arch/arm/mach-s5pc1xx/include/mach/sromc.h
index 45de4a799d30..cd484edb4cab 100644
--- a/arch/arm/mach-s5pc1xx/include/mach/sromc.h
+++ b/arch/arm/mach-s5pc1xx/include/mach/sromc.h
@@ -27,6 +27,7 @@
 #define SMC_BC_PMC(x)  (x << 0)  /* normal(1data)page mode configuration */
 
 #ifndef __ASSEMBLY__
+#include <asm/types.h>
 struct s5p_sromc {
 	unsigned int	bw;
 	unsigned int	bc[6];
diff --git a/arch/arm/mach-s5pc1xx/include/mach/sys_proto.h b/arch/arm/mach-s5pc1xx/include/mach/sys_proto.h
index 89de400043a9..d3f6735c8e7c 100644
--- a/arch/arm/mach-s5pc1xx/include/mach/sys_proto.h
+++ b/arch/arm/mach-s5pc1xx/include/mach/sys_proto.h
@@ -7,6 +7,7 @@
 #ifndef _SYS_PROTO_H_
 #define _SYS_PROTO_H_
 
+#include <asm/types.h>
 u32 get_device_type(void);
 
 #endif
diff --git a/arch/arm/mach-snapdragon/clock-apq8016.c b/arch/arm/mach-snapdragon/clock-apq8016.c
index 6e4a0ccb90a1..8a5e0d5f5577 100644
--- a/arch/arm/mach-snapdragon/clock-apq8016.c
+++ b/arch/arm/mach-snapdragon/clock-apq8016.c
@@ -13,6 +13,7 @@
 #include <errno.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
+#include <linux/types.h>
 #include "clock-snapdragon.h"
 
 /* GPLL0 clock control registers */
diff --git a/arch/arm/mach-snapdragon/clock-apq8096.c b/arch/arm/mach-snapdragon/clock-apq8096.c
index e5011be8f2e2..c0116b434d5c 100644
--- a/arch/arm/mach-snapdragon/clock-apq8096.c
+++ b/arch/arm/mach-snapdragon/clock-apq8096.c
@@ -13,6 +13,7 @@
 #include <errno.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
+#include <linux/types.h>
 #include "clock-snapdragon.h"
 
 /* GPLL0 clock control registers */
diff --git a/arch/arm/mach-snapdragon/clock-snapdragon.c b/arch/arm/mach-snapdragon/clock-snapdragon.c
index 78e30ea5bab6..efc3d9493fb8 100644
--- a/arch/arm/mach-snapdragon/clock-snapdragon.c
+++ b/arch/arm/mach-snapdragon/clock-snapdragon.c
@@ -14,6 +14,7 @@
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include "clock-snapdragon.h"
 
 /* CBCR register fields */
diff --git a/arch/arm/mach-snapdragon/clock-snapdragon.h b/arch/arm/mach-snapdragon/clock-snapdragon.h
index 58fab40a2e45..32f247a1aaa9 100644
--- a/arch/arm/mach-snapdragon/clock-snapdragon.h
+++ b/arch/arm/mach-snapdragon/clock-snapdragon.h
@@ -7,6 +7,7 @@
 #ifndef _CLOCK_SNAPDRAGON_H
 #define _CLOCK_SNAPDRAGON_H
 
+#include <linux/types.h>
 #define CFG_CLK_SRC_CXO   (0 << 8)
 #define CFG_CLK_SRC_GPLL0 (1 << 8)
 #define CFG_CLK_SRC_MASK  (7 << 8)
diff --git a/arch/arm/mach-snapdragon/dram.c b/arch/arm/mach-snapdragon/dram.c
index df7148fee11e..c168dd23e2db 100644
--- a/arch/arm/mach-snapdragon/dram.c
+++ b/arch/arm/mach-snapdragon/dram.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
 #include <part.h>
@@ -15,6 +16,7 @@
 #include <stdio.h>
 #include <asm/arch/dram.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #define SMEM_USABLE_RAM_PARTITION_TABLE 402
 #define RAM_PART_NAME_LENGTH            16
diff --git a/arch/arm/mach-snapdragon/include/mach/misc.h b/arch/arm/mach-snapdragon/include/mach/misc.h
index c60e3e472470..5f7d74ba123f 100644
--- a/arch/arm/mach-snapdragon/include/mach/misc.h
+++ b/arch/arm/mach-snapdragon/include/mach/misc.h
@@ -7,6 +7,7 @@
 #ifndef MISC_H
 #define MISC_H
 
+#include <asm/types.h>
 u32 msm_board_serial(void);
 void msm_generate_mac_addr(u8 *mac);
 
diff --git a/arch/arm/mach-snapdragon/misc.c b/arch/arm/mach-snapdragon/misc.c
index 03515f6d2bf2..1af4734bfb7e 100644
--- a/arch/arm/mach-snapdragon/misc.c
+++ b/arch/arm/mach-snapdragon/misc.c
@@ -10,6 +10,7 @@
 #include <mmc.h>
 #include <vsprintf.h>
 #include <asm/arch/misc.h>
+#include <asm/types.h>
 
 /* UNSTUFF_BITS macro taken from Linux Kernel: drivers/mmc/core/sd.c */
 #define UNSTUFF_BITS(resp, start, size) \
diff --git a/arch/arm/mach-snapdragon/pinctrl-snapdragon.c b/arch/arm/mach-snapdragon/pinctrl-snapdragon.c
index 1587d38cbfb6..92d46702fa33 100644
--- a/arch/arm/mach-snapdragon/pinctrl-snapdragon.c
+++ b/arch/arm/mach-snapdragon/pinctrl-snapdragon.c
@@ -14,6 +14,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include "pinctrl-snapdragon.h"
 
 struct msm_pinctrl_priv {
diff --git a/arch/arm/mach-socfpga/clock_manager.c b/arch/arm/mach-socfpga/clock_manager.c
index f0b15f770cc5..e4c979a4f462 100644
--- a/arch/arm/mach-socfpga/clock_manager.c
+++ b/arch/arm/mach-socfpga/clock_manager.c
@@ -10,6 +10,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock_manager.h>
+#include <asm/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-socfpga/clock_manager_agilex.c b/arch/arm/mach-socfpga/clock_manager_agilex.c
index 9c229de4b92f..7b525ab30891 100644
--- a/arch/arm/mach-socfpga/clock_manager_agilex.c
+++ b/arch/arm/mach-socfpga/clock_manager_agilex.c
@@ -16,6 +16,7 @@
 #include <asm/io.h>
 #include <dt-bindings/clock/agilex-clock.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-socfpga/clock_manager_arria10.c b/arch/arm/mach-socfpga/clock_manager_arria10.c
index 9d84871d4639..b86eaeb8e3d8 100644
--- a/arch/arm/mach-socfpga/clock_manager_arria10.c
+++ b/arch/arm/mach-socfpga/clock_manager_arria10.c
@@ -16,6 +16,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_SPL_BUILD
 
diff --git a/arch/arm/mach-socfpga/clock_manager_gen5.c b/arch/arm/mach-socfpga/clock_manager_gen5.c
index 85a3d1926c1d..9c3de1657dd7 100644
--- a/arch/arm/mach-socfpga/clock_manager_gen5.c
+++ b/arch/arm/mach-socfpga/clock_manager_gen5.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <asm/arch/clock_manager.h>
 #include <wait_bit.h>
+#include <linux/types.h>
 
 /*
  * function to write the bypass register which requires a poll of the
diff --git a/arch/arm/mach-socfpga/clock_manager_s10.c b/arch/arm/mach-socfpga/clock_manager_s10.c
index 6355a3128330..35ea1b382ef9 100644
--- a/arch/arm/mach-socfpga/clock_manager_s10.c
+++ b/arch/arm/mach-socfpga/clock_manager_s10.c
@@ -11,6 +11,7 @@
 #include <asm/arch/clock_manager.h>
 #include <asm/arch/handoff_s10.h>
 #include <asm/arch/system_manager.h>
+#include <asm/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-socfpga/firewall.c b/arch/arm/mach-socfpga/firewall.c
index ed411c62c9c2..b3e9e01a1376 100644
--- a/arch/arm/mach-socfpga/firewall.c
+++ b/arch/arm/mach-socfpga/firewall.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <asm/arch/firewall.h>
 #include <asm/arch/system_manager.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 
 static void firewall_l4_per_disable(void)
diff --git a/arch/arm/mach-socfpga/freeze_controller.c b/arch/arm/mach-socfpga/freeze_controller.c
index e994d38ba623..23930fbb7048 100644
--- a/arch/arm/mach-socfpga/freeze_controller.c
+++ b/arch/arm/mach-socfpga/freeze_controller.c
@@ -11,6 +11,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 static const struct socfpga_freeze_controller *freeze_controller_base =
 		(void *)(SOCFPGA_SYSMGR_ADDRESS + SYSMGR_FRZCTRL_ADDRESS);
diff --git a/arch/arm/mach-socfpga/include/mach/clock_manager.h b/arch/arm/mach-socfpga/include/mach/clock_manager.h
index 1f734bcd65ef..51e3d83c6dc3 100644
--- a/arch/arm/mach-socfpga/include/mach/clock_manager.h
+++ b/arch/arm/mach-socfpga/include/mach/clock_manager.h
@@ -6,9 +6,9 @@
 #ifndef _CLOCK_MANAGER_H_
 #define _CLOCK_MANAGER_H_
 
-phys_addr_t socfpga_get_clkmgr_addr(void);
-
 #ifndef __ASSEMBLY__
+#include <asm/types.h>
+phys_addr_t socfpga_get_clkmgr_addr(void);
 void cm_wait_for_lock(u32 mask);
 int cm_wait_for_fsm(void);
 void cm_print_clock_quick_summary(void);
diff --git a/arch/arm/mach-socfpga/include/mach/clock_manager_gen5.h b/arch/arm/mach-socfpga/include/mach/clock_manager_gen5.h
index 5c9abe619b90..2f60680d952c 100644
--- a/arch/arm/mach-socfpga/include/mach/clock_manager_gen5.h
+++ b/arch/arm/mach-socfpga/include/mach/clock_manager_gen5.h
@@ -8,6 +8,7 @@
 
 #ifndef __ASSEMBLY__
 
+#include <asm/types.h>
 #include <linux/bitops.h>
 
 struct cm_config {
diff --git a/arch/arm/mach-socfpga/include/mach/clock_manager_s10.h b/arch/arm/mach-socfpga/include/mach/clock_manager_s10.h
index cb7923baef8c..2d09fc194e2b 100644
--- a/arch/arm/mach-socfpga/include/mach/clock_manager_s10.h
+++ b/arch/arm/mach-socfpga/include/mach/clock_manager_s10.h
@@ -8,6 +8,7 @@
 #define	_CLOCK_MANAGER_S10_
 
 #include <asm/arch/clock_manager_soc64.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 
 /* Clock speed accessors */
diff --git a/arch/arm/mach-socfpga/include/mach/firewall.h b/arch/arm/mach-socfpga/include/mach/firewall.h
index adab65bc9681..f7ff82d3e8ae 100644
--- a/arch/arm/mach-socfpga/include/mach/firewall.h
+++ b/arch/arm/mach-socfpga/include/mach/firewall.h
@@ -7,6 +7,7 @@
 #ifndef	_FIREWALL_H_
 #define	_FIREWALL_H_
 
+#include <asm/types.h>
 #include <linux/bitops.h>
 
 struct socfpga_firwall_l4_per {
diff --git a/arch/arm/mach-socfpga/include/mach/fpga_manager.h b/arch/arm/mach-socfpga/include/mach/fpga_manager.h
index 481b66bbd861..3f33e35cb287 100644
--- a/arch/arm/mach-socfpga/include/mach/fpga_manager.h
+++ b/arch/arm/mach-socfpga/include/mach/fpga_manager.h
@@ -24,6 +24,7 @@
 #ifndef __ASSEMBLY__
 
 /* Common prototypes */
+#include <linux/types.h>
 int fpgamgr_get_mode(void);
 int fpgamgr_poll_fpga_ready(void);
 void fpgamgr_program_write(const void *rbf_data, size_t rbf_size);
diff --git a/arch/arm/mach-socfpga/include/mach/fpga_manager_arria10.h b/arch/arm/mach-socfpga/include/mach/fpga_manager_arria10.h
index 048708202cc7..edb5d4644f79 100644
--- a/arch/arm/mach-socfpga/include/mach/fpga_manager_arria10.h
+++ b/arch/arm/mach-socfpga/include/mach/fpga_manager_arria10.h
@@ -62,6 +62,7 @@
 #define FPGA_SOCFPGA_A10_RBF_CORE		0x8001
 #ifndef __ASSEMBLY__
 
+#include <linux/types.h>
 struct socfpga_fpga_manager {
 	u32  _pad_0x0_0x7[2];
 	u32  dclkcnt;
diff --git a/arch/arm/mach-socfpga/include/mach/fpga_manager_gen5.h b/arch/arm/mach-socfpga/include/mach/fpga_manager_gen5.h
index e08c0056286f..9519544ec897 100644
--- a/arch/arm/mach-socfpga/include/mach/fpga_manager_gen5.h
+++ b/arch/arm/mach-socfpga/include/mach/fpga_manager_gen5.h
@@ -34,6 +34,7 @@
 
 #ifndef __ASSEMBLY__
 
+#include <asm/types.h>
 struct socfpga_fpga_manager {
 	/* FPGA Manager Module */
 	u32	stat;			/* 0x00 */
diff --git a/arch/arm/mach-socfpga/include/mach/freeze_controller.h b/arch/arm/mach-socfpga/include/mach/freeze_controller.h
index 80846a67f193..65119929ee53 100644
--- a/arch/arm/mach-socfpga/include/mach/freeze_controller.h
+++ b/arch/arm/mach-socfpga/include/mach/freeze_controller.h
@@ -6,6 +6,7 @@
 #ifndef	_FREEZE_CONTROLLER_H_
 #define	_FREEZE_CONTROLLER_H_
 
+#include <asm/types.h>
 struct socfpga_freeze_controller {
 	u32	vioctrl;
 	u32	padding[3];
diff --git a/arch/arm/mach-socfpga/include/mach/mailbox_s10.h b/arch/arm/mach-socfpga/include/mach/mailbox_s10.h
index 55707ab9c587..e8fa9d1f0b99 100644
--- a/arch/arm/mach-socfpga/include/mach/mailbox_s10.h
+++ b/arch/arm/mach-socfpga/include/mach/mailbox_s10.h
@@ -8,6 +8,7 @@
 #define _MAILBOX_S10_H_
 
 /* user define Uboot ID */
+#include <asm/types.h>
 #include <linux/bitops.h>
 #define MBOX_CLIENT_ID_UBOOT	0xB
 #define MBOX_ID_UBOOT		0x1
diff --git a/arch/arm/mach-socfpga/include/mach/misc.h b/arch/arm/mach-socfpga/include/mach/misc.h
index 32bca6775e2c..ac023b89bbc0 100644
--- a/arch/arm/mach-socfpga/include/mach/misc.h
+++ b/arch/arm/mach-socfpga/include/mach/misc.h
@@ -8,6 +8,7 @@
 
 #include <stdbool.h>
 #include <asm/sections.h>
+#include <asm/types.h>
 
 void dwmac_deassert_reset(const unsigned int of_reset_id, const u32 phymode);
 
diff --git a/arch/arm/mach-socfpga/include/mach/nic301.h b/arch/arm/mach-socfpga/include/mach/nic301.h
index 20bebb8c81c3..0489e5fe1ada 100644
--- a/arch/arm/mach-socfpga/include/mach/nic301.h
+++ b/arch/arm/mach-socfpga/include/mach/nic301.h
@@ -6,6 +6,7 @@
 #ifndef	_NIC301_REGISTERS_H_
 #define	_NIC301_REGISTERS_H_
 
+#include <asm/types.h>
 struct nic301_registers {
 	u32	remap;				/* 0x0 */
 	/* Security Register Group */
diff --git a/arch/arm/mach-socfpga/include/mach/reset_manager.h b/arch/arm/mach-socfpga/include/mach/reset_manager.h
index 7844ad14cb66..3af2c1f9e029 100644
--- a/arch/arm/mach-socfpga/include/mach/reset_manager.h
+++ b/arch/arm/mach-socfpga/include/mach/reset_manager.h
@@ -6,6 +6,7 @@
 #ifndef _RESET_MANAGER_H_
 #define _RESET_MANAGER_H_
 
+#include <linux/types.h>
 phys_addr_t socfpga_get_rstmgr_addr(void);
 
 void reset_cpu(ulong addr);
diff --git a/arch/arm/mach-socfpga/include/mach/scan_manager.h b/arch/arm/mach-socfpga/include/mach/scan_manager.h
index 4d8d649be068..7d369aa1b5bd 100644
--- a/arch/arm/mach-socfpga/include/mach/scan_manager.h
+++ b/arch/arm/mach-socfpga/include/mach/scan_manager.h
@@ -6,6 +6,7 @@
 #ifndef	_SCAN_MANAGER_H_
 #define	_SCAN_MANAGER_H_
 
+#include <asm/types.h>
 struct socfpga_scan_manager {
 	u32	stat;
 	u32	en;
diff --git a/arch/arm/mach-socfpga/include/mach/scu.h b/arch/arm/mach-socfpga/include/mach/scu.h
index b684a5501928..7891318486aa 100644
--- a/arch/arm/mach-socfpga/include/mach/scu.h
+++ b/arch/arm/mach-socfpga/include/mach/scu.h
@@ -6,6 +6,7 @@
 #ifndef __SOCFPGA_SCU_H__
 #define __SOCFPGA_SCU_H__
 
+#include <asm/types.h>
 struct scu_registers {
 	u32	ctrl;			/* 0x00 */
 	u32	cfg;
diff --git a/arch/arm/mach-socfpga/include/mach/sdram_arria10.h b/arch/arm/mach-socfpga/include/mach/sdram_arria10.h
index ff05994ccc33..1af29b11cf7a 100644
--- a/arch/arm/mach-socfpga/include/mach/sdram_arria10.h
+++ b/arch/arm/mach-socfpga/include/mach/sdram_arria10.h
@@ -7,6 +7,7 @@
 #define _SOCFPGA_SDRAM_ARRIA10_H_
 
 #ifndef __ASSEMBLY__
+#include <asm/types.h>
 #include <linux/bitops.h>
 int ddr_calibration_sequence(void);
 
diff --git a/arch/arm/mach-socfpga/include/mach/sdram_gen5.h b/arch/arm/mach-socfpga/include/mach/sdram_gen5.h
index 8818a6b967fc..05627eeed5e9 100644
--- a/arch/arm/mach-socfpga/include/mach/sdram_gen5.h
+++ b/arch/arm/mach-socfpga/include/mach/sdram_gen5.h
@@ -7,6 +7,7 @@
 
 #ifndef __ASSEMBLY__
 
+#include <asm/types.h>
 const struct socfpga_sdram_config *socfpga_get_sdram_config(void);
 
 void socfpga_get_seq_ac_init(const u32 **init, unsigned int *nelem);
diff --git a/arch/arm/mach-socfpga/include/mach/system_manager.h b/arch/arm/mach-socfpga/include/mach/system_manager.h
index f81695471727..45ea62a7067c 100644
--- a/arch/arm/mach-socfpga/include/mach/system_manager.h
+++ b/arch/arm/mach-socfpga/include/mach/system_manager.h
@@ -6,6 +6,7 @@
 #ifndef _SYSTEM_MANAGER_H_
 #define _SYSTEM_MANAGER_H_
 
+#include <asm/types.h>
 phys_addr_t socfpga_get_sysmgr_addr(void);
 
 #if defined(CONFIG_TARGET_SOCFPGA_STRATIX10) || \
diff --git a/arch/arm/mach-socfpga/include/mach/system_manager_gen5.h b/arch/arm/mach-socfpga/include/mach/system_manager_gen5.h
index 90cb465d1370..3dce656ccb43 100644
--- a/arch/arm/mach-socfpga/include/mach/system_manager_gen5.h
+++ b/arch/arm/mach-socfpga/include/mach/system_manager_gen5.h
@@ -8,6 +8,7 @@
 
 #ifndef __ASSEMBLY__
 
+#include <asm/types.h>
 void sysmgr_pinmux_init(void);
 void sysmgr_config_warmrstcfgio(int enable);
 
diff --git a/arch/arm/mach-socfpga/include/mach/system_manager_soc64.h b/arch/arm/mach-socfpga/include/mach/system_manager_soc64.h
index c90f63a754c0..b6ae059a8cf9 100644
--- a/arch/arm/mach-socfpga/include/mach/system_manager_soc64.h
+++ b/arch/arm/mach-socfpga/include/mach/system_manager_soc64.h
@@ -6,6 +6,7 @@
 #ifndef _SYSTEM_MANAGER_SOC64_H_
 #define _SYSTEM_MANAGER_SOC64_H_
 
+#include <asm/types.h>
 #include <linux/bitops.h>
 void sysmgr_pinmux_init(void);
 void populate_sysmgr_fpgaintf_module(void);
diff --git a/arch/arm/mach-socfpga/include/mach/timer.h b/arch/arm/mach-socfpga/include/mach/timer.h
index 82596e412e36..b853f208d739 100644
--- a/arch/arm/mach-socfpga/include/mach/timer.h
+++ b/arch/arm/mach-socfpga/include/mach/timer.h
@@ -6,6 +6,7 @@
 #ifndef _SOCFPGA_TIMER_H_
 #define _SOCFPGA_TIMER_H_
 
+#include <asm/types.h>
 struct socfpga_timer {
 	u32	load_val;
 	u32	curr_val;
diff --git a/arch/arm/mach-socfpga/mailbox_s10.c b/arch/arm/mach-socfpga/mailbox_s10.c
index 85df32968d85..46f944237268 100644
--- a/arch/arm/mach-socfpga/mailbox_s10.c
+++ b/arch/arm/mach-socfpga/mailbox_s10.c
@@ -13,6 +13,7 @@
 #include <asm/arch/mailbox_s10.h>
 #include <asm/arch/system_manager.h>
 #include <asm/secure.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-socfpga/misc.c b/arch/arm/mach-socfpga/misc.c
index 8bb924b6b5dd..a23837c65f5f 100644
--- a/arch/arm/mach-socfpga/misc.c
+++ b/arch/arm/mach-socfpga/misc.c
@@ -14,6 +14,7 @@
 #include <asm/io.h>
 #include <errno.h>
 #include <fdtdec.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <altera.h>
diff --git a/arch/arm/mach-socfpga/misc_arria10.c b/arch/arm/mach-socfpga/misc_arria10.c
index dffe53a1a2e5..dcd343ba02f9 100644
--- a/arch/arm/mach-socfpga/misc_arria10.c
+++ b/arch/arm/mach-socfpga/misc_arria10.c
@@ -22,6 +22,7 @@
 #include <asm/arch/nic301.h>
 #include <asm/io.h>
 #include <asm/pl310.h>
+#include <asm/types.h>
 
 #define PINMUX_UART0_TX_SHARED_IO_OFFSET_Q1_3	0x08
 #define PINMUX_UART0_TX_SHARED_IO_OFFSET_Q2_11	0x58
diff --git a/arch/arm/mach-socfpga/misc_gen5.c b/arch/arm/mach-socfpga/misc_gen5.c
index c8c8c64476b4..e6a3e297966a 100644
--- a/arch/arm/mach-socfpga/misc_gen5.c
+++ b/arch/arm/mach-socfpga/misc_gen5.c
@@ -6,12 +6,14 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <init.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <env.h>
 #include <errno.h>
 #include <fdtdec.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
diff --git a/arch/arm/mach-socfpga/misc_s10.c b/arch/arm/mach-socfpga/misc_s10.c
index 107a873c1208..7010eb60cf1a 100644
--- a/arch/arm/mach-socfpga/misc_s10.c
+++ b/arch/arm/mach-socfpga/misc_s10.c
@@ -21,6 +21,7 @@
 #include <asm/arch/system_manager.h>
 #include <asm/arch/misc.h>
 #include <asm/pl310.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/libfdt.h>
diff --git a/arch/arm/mach-socfpga/pinmux_arria10.c b/arch/arm/mach-socfpga/pinmux_arria10.c
index aee51c039c9c..bcb715c355bd 100644
--- a/arch/arm/mach-socfpga/pinmux_arria10.c
+++ b/arch/arm/mach-socfpga/pinmux_arria10.c
@@ -8,6 +8,7 @@
 #include <asm/io.h>
 #include <common.h>
 #include <fdtdec.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 
diff --git a/arch/arm/mach-socfpga/reset_manager_arria10.c b/arch/arm/mach-socfpga/reset_manager_arria10.c
index 461c45928002..150e71858dfb 100644
--- a/arch/arm/mach-socfpga/reset_manager_arria10.c
+++ b/arch/arm/mach-socfpga/reset_manager_arria10.c
@@ -13,6 +13,7 @@
 #include <errno.h>
 #include <fdtdec.h>
 #include <wait_bit.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-socfpga/reset_manager_gen5.c b/arch/arm/mach-socfpga/reset_manager_gen5.c
index e37325f2ac50..7ca52b829173 100644
--- a/arch/arm/mach-socfpga/reset_manager_gen5.c
+++ b/arch/arm/mach-socfpga/reset_manager_gen5.c
@@ -11,6 +11,7 @@
 #include <asm/arch/fpga_manager.h>
 #include <asm/arch/reset_manager.h>
 #include <asm/arch/system_manager.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 
 /* Assert or de-assert SoCFPGA reset manager reset. */
diff --git a/arch/arm/mach-socfpga/reset_manager_s10.c b/arch/arm/mach-socfpga/reset_manager_s10.c
index 81e4c67fba61..a9179940e57d 100644
--- a/arch/arm/mach-socfpga/reset_manager_s10.c
+++ b/arch/arm/mach-socfpga/reset_manager_s10.c
@@ -9,6 +9,7 @@
 #include <asm/io.h>
 #include <asm/arch/reset_manager.h>
 #include <asm/arch/system_manager.h>
+#include <asm/types.h>
 #include <dt-bindings/reset/altr,rst-mgr-s10.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-socfpga/scan_manager.c b/arch/arm/mach-socfpga/scan_manager.c
index d5601739ef68..85c113f50516 100644
--- a/arch/arm/mach-socfpga/scan_manager.c
+++ b/arch/arm/mach-socfpga/scan_manager.c
@@ -9,6 +9,7 @@
 #include <asm/arch/freeze_controller.h>
 #include <asm/arch/scan_manager.h>
 #include <asm/arch/system_manager.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 
diff --git a/arch/arm/mach-socfpga/spl_a10.c b/arch/arm/mach-socfpga/spl_a10.c
index daf75addde71..cda0ba5be50f 100644
--- a/arch/arm/mach-socfpga/spl_a10.c
+++ b/arch/arm/mach-socfpga/spl_a10.c
@@ -31,6 +31,7 @@
 #include <asm/arch/fpga_manager.h>
 #include <mmc.h>
 #include <memalign.h>
+#include <linux/types.h>
 
 #define FPGA_BUFSIZ	16 * 1024
 
diff --git a/arch/arm/mach-socfpga/spl_agilex.c b/arch/arm/mach-socfpga/spl_agilex.c
index 9871d1b6c8bc..0364f5a5d0fb 100644
--- a/arch/arm/mach-socfpga/spl_agilex.c
+++ b/arch/arm/mach-socfpga/spl_agilex.c
@@ -22,6 +22,7 @@
 #include <asm/arch/system_manager.h>
 #include <watchdog.h>
 #include <dm/uclass.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-socfpga/spl_gen5.c b/arch/arm/mach-socfpga/spl_gen5.c
index 2cffc2ef778a..54f2674b399d 100644
--- a/arch/arm/mach-socfpga/spl_gen5.c
+++ b/arch/arm/mach-socfpga/spl_gen5.c
@@ -27,6 +27,7 @@
 #include <watchdog.h>
 #include <dm/uclass.h>
 #include <linux/bitops.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-socfpga/spl_s10.c b/arch/arm/mach-socfpga/spl_s10.c
index cbffa6699368..93d203917732 100644
--- a/arch/arm/mach-socfpga/spl_s10.c
+++ b/arch/arm/mach-socfpga/spl_s10.c
@@ -23,6 +23,7 @@
 #include <asm/arch/system_manager.h>
 #include <watchdog.h>
 #include <dm/uclass.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-socfpga/system_manager_gen5.c b/arch/arm/mach-socfpga/system_manager_gen5.c
index 09caebb3c882..ce95062ea807 100644
--- a/arch/arm/mach-socfpga/system_manager_gen5.c
+++ b/arch/arm/mach-socfpga/system_manager_gen5.c
@@ -7,6 +7,7 @@
 #include <asm/io.h>
 #include <asm/arch/system_manager.h>
 #include <asm/arch/fpga_manager.h>
+#include <asm/types.h>
 
 /*
  * Populate the value for SYSMGR.FPGAINTF.MODULE based on pinmux setting.
diff --git a/arch/arm/mach-socfpga/system_manager_s10.c b/arch/arm/mach-socfpga/system_manager_s10.c
index c123cc96445d..dba1b95ba811 100644
--- a/arch/arm/mach-socfpga/system_manager_s10.c
+++ b/arch/arm/mach-socfpga/system_manager_s10.c
@@ -8,6 +8,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/system_manager.h>
+#include <asm/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-socfpga/wrap_pinmux_config.c b/arch/arm/mach-socfpga/wrap_pinmux_config.c
index f5a425db5592..b4c1a5cd83aa 100644
--- a/arch/arm/mach-socfpga/wrap_pinmux_config.c
+++ b/arch/arm/mach-socfpga/wrap_pinmux_config.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <errno.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 
 /* Board-specific header. */
diff --git a/arch/arm/mach-socfpga/wrap_pinmux_config_s10.c b/arch/arm/mach-socfpga/wrap_pinmux_config_s10.c
index 8f3688dd19fa..877c7a21c7f7 100644
--- a/arch/arm/mach-socfpga/wrap_pinmux_config_s10.c
+++ b/arch/arm/mach-socfpga/wrap_pinmux_config_s10.c
@@ -8,6 +8,7 @@
 #include <errno.h>
 #include <asm/io.h>
 #include <asm/arch/handoff_s10.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 
 static void sysmgr_pinmux_handoff_read(void *handoff_address,
diff --git a/arch/arm/mach-socfpga/wrap_pll_config_s10.c b/arch/arm/mach-socfpga/wrap_pll_config_s10.c
index 3da85791a1ff..bd754ced8c52 100644
--- a/arch/arm/mach-socfpga/wrap_pll_config_s10.c
+++ b/arch/arm/mach-socfpga/wrap_pll_config_s10.c
@@ -9,6 +9,7 @@
 #include <asm/io.h>
 #include <asm/arch/handoff_s10.h>
 #include <asm/arch/system_manager.h>
+#include <asm/types.h>
 
 const struct cm_config * const cm_get_default_config(void)
 {
diff --git a/arch/arm/mach-socfpga/wrap_sdram_config.c b/arch/arm/mach-socfpga/wrap_sdram_config.c
index 50fec073b481..3fe77f55cfaa 100644
--- a/arch/arm/mach-socfpga/wrap_sdram_config.c
+++ b/arch/arm/mach-socfpga/wrap_sdram_config.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <errno.h>
 #include <asm/arch/sdram.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 
 /* Board-specific header. */
diff --git a/arch/arm/mach-stm32mp/bsec.c b/arch/arm/mach-stm32mp/bsec.c
index ed1a13b0a3a0..12575844ff6f 100644
--- a/arch/arm/mach-stm32mp/bsec.c
+++ b/arch/arm/mach-stm32mp/bsec.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <asm/arch/bsec.h>
 #include <asm/arch/stm32mp1_smc.h>
+#include <asm/types.h>
 #include <linux/arm-smccc.h>
 #include <linux/errno.h>
 #include <linux/iopoll.h>
diff --git a/arch/arm/mach-stm32mp/cmd_stm32key.c b/arch/arm/mach-stm32mp/cmd_stm32key.c
index a5c94d331e65..6260099af16f 100644
--- a/arch/arm/mach-stm32mp/cmd_stm32key.c
+++ b/arch/arm/mach-stm32mp/cmd_stm32key.c
@@ -14,6 +14,7 @@
 #include <dm/uclass.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define STM32_OTP_HASH_KEY_START 24
 #define STM32_OTP_HASH_KEY_SIZE 8
diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c b/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c
index bc9767c8ccf4..8ef840668c8d 100644
--- a/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c
+++ b/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c
@@ -13,6 +13,7 @@
 #include <asm/arch/stm32prog.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "stm32prog.h"
 
 struct stm32prog_data *stm32prog_data;
diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c
index f75050a0b4df..dd669ca7480d 100644
--- a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c
+++ b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c
@@ -10,6 +10,7 @@
 #include <misc.h>
 #include <mmc.h>
 #include <part.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/arch/stm32mp1_smc.h>
@@ -24,6 +25,7 @@
 #include <linux/printk.h>
 #include <linux/sizes.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "stm32prog.h"
 
diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.h b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.h
index 46f014cb77f8..29e524ef36f8 100644
--- a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.h
+++ b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.h
@@ -9,6 +9,7 @@
 #include <stdbool.h>
 #include <vsprintf.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 /* - phase defines ------------------------------------------------*/
 #define PHASE_FLASHLAYOUT	0x00
diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_serial.c b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_serial.c
index 1419d0f20e76..25fb6b2b4658 100644
--- a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_serial.c
+++ b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_serial.c
@@ -14,6 +14,7 @@
 #include <vsprintf.h>
 #include <watchdog.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <dm/lists.h>
 #include <dm/device-internal.h>
 #include <linux/delay.h>
diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_usb.c b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_usb.c
index a170fdfee94c..8afdaffc2409 100644
--- a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_usb.c
+++ b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_usb.c
@@ -15,6 +15,7 @@
 #include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "stm32prog.h"
 
 static int stm32prog_set_phase(struct stm32prog_data *data, u8 phase,
diff --git a/arch/arm/mach-stm32mp/cpu.c b/arch/arm/mach-stm32mp/cpu.c
index e275df5905c8..092304896ce4 100644
--- a/arch/arm/mach-stm32mp/cpu.c
+++ b/arch/arm/mach-stm32mp/cpu.c
@@ -4,6 +4,7 @@
  */
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <debug_uart.h>
 #include <env.h>
@@ -24,6 +25,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 /* RCC register */
 #define RCC_TZCR		(STM32_RCC_BASE + 0x00)
diff --git a/arch/arm/mach-stm32mp/dram_init.c b/arch/arm/mach-stm32mp/dram_init.c
index 8685df3d06d1..4b1fa11f5895 100644
--- a/arch/arm/mach-stm32mp/dram_init.c
+++ b/arch/arm/mach-stm32mp/dram_init.c
@@ -12,6 +12,7 @@
 #include <ram.h>
 #include <asm/global_data.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-stm32mp/fdt.c b/arch/arm/mach-stm32mp/fdt.c
index e83885440b46..61d633d31b42 100644
--- a/arch/arm/mach-stm32mp/fdt.c
+++ b/arch/arm/mach-stm32mp/fdt.c
@@ -7,9 +7,11 @@
 #include <fdtdec.h>
 #include <fdt_support.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <tee.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <dt-bindings/pinctrl/stm32-pinfunc.h>
 #include <linux/io.h>
diff --git a/arch/arm/mach-stm32mp/include/mach/gpio.h b/arch/arm/mach-stm32mp/include/mach/gpio.h
index 5ca76d21ff1e..ba383e82c3a1 100644
--- a/arch/arm/mach-stm32mp/include/mach/gpio.h
+++ b/arch/arm/mach-stm32mp/include/mach/gpio.h
@@ -7,6 +7,7 @@
 #ifndef _STM32_GPIO_H_
 #define _STM32_GPIO_H_
 #include <asm/gpio.h>
+#include <asm/types.h>
 
 #define STM32_GPIOS_PER_BANK		16
 
diff --git a/arch/arm/mach-stm32mp/include/mach/stm32mp1_smc.h b/arch/arm/mach-stm32mp/include/mach/stm32mp1_smc.h
index fbc082703dc2..353ec1b75872 100644
--- a/arch/arm/mach-stm32mp/include/mach/stm32mp1_smc.h
+++ b/arch/arm/mach-stm32mp/include/mach/stm32mp1_smc.h
@@ -6,6 +6,7 @@
 #ifndef __STM32MP1_SMC_H__
 #define __STM32MP1_SMC_H__
 
+#include <asm/types.h>
 #include <linux/arm-smccc.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
diff --git a/arch/arm/mach-stm32mp/include/mach/sys_proto.h b/arch/arm/mach-stm32mp/include/mach/sys_proto.h
index 4149d3a13379..ffb2ea2019d5 100644
--- a/arch/arm/mach-stm32mp/include/mach/sys_proto.h
+++ b/arch/arm/mach-stm32mp/include/mach/sys_proto.h
@@ -4,6 +4,7 @@
  */
 
 /* ID = Device Version (bit31:16) + Device Part Number (RPN) (bit7:0) */
+#include <asm/types.h>
 #define CPU_STM32MP157Cxx	0x05000000
 #define CPU_STM32MP157Axx	0x05000001
 #define CPU_STM32MP153Cxx	0x05000024
diff --git a/arch/arm/mach-stm32mp/psci.c b/arch/arm/mach-stm32mp/psci.c
index 155aa79cd5ed..beca18d6fbcc 100644
--- a/arch/arm/mach-stm32mp/psci.c
+++ b/arch/arm/mach-stm32mp/psci.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <asm/psci.h>
 #include <asm/secure.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 
 #define BOOT_API_A7_CORE0_MAGIC_NUMBER	0xCA7FACE0
diff --git a/arch/arm/mach-stm32mp/pwr_regulator.c b/arch/arm/mach-stm32mp/pwr_regulator.c
index 954603f67455..f478c3b8b008 100644
--- a/arch/arm/mach-stm32mp/pwr_regulator.c
+++ b/arch/arm/mach-stm32mp/pwr_regulator.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
+#include <stdbool.h>
 #include <syscon.h>
 #include <time.h>
 #include <asm/io.h>
@@ -13,6 +14,7 @@
 #include <linux/bitops.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 
diff --git a/arch/arm/mach-stm32mp/spl.c b/arch/arm/mach-stm32mp/spl.c
index fdaaeb27abaf..a6d3456b86ea 100644
--- a/arch/arm/mach-stm32mp/spl.c
+++ b/arch/arm/mach-stm32mp/spl.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <dm.h>
 #include <hang.h>
@@ -17,6 +18,7 @@
 #include <asm/arch/sys_proto.h>
 #include <linux/errno.h>
 #include <linux/libfdt.h>
+#include <linux/types.h>
 
 u32 spl_boot_device(void)
 {
diff --git a/arch/arm/mach-sunxi/board.c b/arch/arm/mach-sunxi/board.c
index 1a720a0858d0..fcae107165e6 100644
--- a/arch/arm/mach-sunxi/board.c
+++ b/arch/arm/mach-sunxi/board.c
@@ -28,6 +28,7 @@
 #include <asm/arch/timer.h>
 #include <asm/arch/tzpc.h>
 #include <asm/arch/mmc.h>
+#include <linux/types.h>
 
 #include <linux/compiler.h>
 
diff --git a/arch/arm/mach-sunxi/clock.c b/arch/arm/mach-sunxi/clock.c
index f591affebf7b..e804cacf186a 100644
--- a/arch/arm/mach-sunxi/clock.c
+++ b/arch/arm/mach-sunxi/clock.c
@@ -8,12 +8,14 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/gpio.h>
 #include <asm/arch/prcm.h>
 #include <asm/arch/gtbus.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/types.h>
 
 __weak void clock_init_sec(void)
 {
diff --git a/arch/arm/mach-sunxi/clock_sun4i.c b/arch/arm/mach-sunxi/clock_sun4i.c
index 7799c5750d34..4646d4cff59a 100644
--- a/arch/arm/mach-sunxi/clock_sun4i.c
+++ b/arch/arm/mach-sunxi/clock_sun4i.c
@@ -16,6 +16,7 @@
 #include <asm/arch/gpio.h>
 #include <asm/arch/sys_proto.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_SPL_BUILD
 void clock_init_safe(void)
diff --git a/arch/arm/mach-sunxi/clock_sun50i_h6.c b/arch/arm/mach-sunxi/clock_sun50i_h6.c
index ba8a26eb0d36..10fe7748f030 100644
--- a/arch/arm/mach-sunxi/clock_sun50i_h6.c
+++ b/arch/arm/mach-sunxi/clock_sun50i_h6.c
@@ -2,6 +2,7 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/clock.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_SPL_BUILD
 void clock_init_safe(void)
diff --git a/arch/arm/mach-sunxi/clock_sun6i.c b/arch/arm/mach-sunxi/clock_sun6i.c
index 529fdd7754e2..5e79a1a2e573 100644
--- a/arch/arm/mach-sunxi/clock_sun6i.c
+++ b/arch/arm/mach-sunxi/clock_sun6i.c
@@ -17,6 +17,7 @@
 #include <asm/arch/sys_proto.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_SPL_BUILD
 void clock_init_safe(void)
diff --git a/arch/arm/mach-sunxi/clock_sun8i_a83t.c b/arch/arm/mach-sunxi/clock_sun8i_a83t.c
index 31e4281529ad..c29cf314023a 100644
--- a/arch/arm/mach-sunxi/clock_sun8i_a83t.c
+++ b/arch/arm/mach-sunxi/clock_sun8i_a83t.c
@@ -15,6 +15,7 @@
 #include <asm/arch/prcm.h>
 #include <asm/arch/sys_proto.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_SPL_BUILD
 void clock_init_safe(void)
diff --git a/arch/arm/mach-sunxi/clock_sun9i.c b/arch/arm/mach-sunxi/clock_sun9i.c
index 8ba4802f3b36..1765ac31eb78 100644
--- a/arch/arm/mach-sunxi/clock_sun9i.c
+++ b/arch/arm/mach-sunxi/clock_sun9i.c
@@ -14,6 +14,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/prcm.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/types.h>
 
 
 #ifdef CONFIG_SPL_BUILD
diff --git a/arch/arm/mach-sunxi/cpu_info.c b/arch/arm/mach-sunxi/cpu_info.c
index 5a7d03dce898..1e10defc0758 100644
--- a/arch/arm/mach-sunxi/cpu_info.c
+++ b/arch/arm/mach-sunxi/cpu_info.c
@@ -14,6 +14,7 @@
 #include <axp_pmic.h>
 #include <errno.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_MACH_SUN6I
 int sunxi_get_ss_bonding_id(void)
diff --git a/arch/arm/mach-sunxi/dram_helpers.c b/arch/arm/mach-sunxi/dram_helpers.c
index ffadaa425703..cc61d5747aa0 100644
--- a/arch/arm/mach-sunxi/dram_helpers.c
+++ b/arch/arm/mach-sunxi/dram_helpers.c
@@ -12,6 +12,7 @@
 #include <asm/barriers.h>
 #include <asm/io.h>
 #include <asm/arch/dram.h>
+#include <linux/types.h>
 
 /*
  * Wait up to 1s for value to be set in given part of reg.
diff --git a/arch/arm/mach-sunxi/dram_sun4i.c b/arch/arm/mach-sunxi/dram_sun4i.c
index 6c406f111565..d51fd207001f 100644
--- a/arch/arm/mach-sunxi/dram_sun4i.c
+++ b/arch/arm/mach-sunxi/dram_sun4i.c
@@ -22,12 +22,14 @@
 
 #include <common.h>
 #include <init.h>
+#include <stdbool.h>
 #include <vsprintf.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/dram.h>
 #include <asm/arch/timer.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
 
diff --git a/arch/arm/mach-sunxi/dram_sun50i_h6.c b/arch/arm/mach-sunxi/dram_sun50i_h6.c
index ea47fa86478c..ec351079037e 100644
--- a/arch/arm/mach-sunxi/dram_sun50i_h6.c
+++ b/arch/arm/mach-sunxi/dram_sun50i_h6.c
@@ -14,6 +14,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/dram.h>
 #include <asm/arch/cpu.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/kconfig.h>
diff --git a/arch/arm/mach-sunxi/dram_sun6i.c b/arch/arm/mach-sunxi/dram_sun6i.c
index 53f8ac068ae6..ba310e1192f1 100644
--- a/arch/arm/mach-sunxi/dram_sun6i.c
+++ b/arch/arm/mach-sunxi/dram_sun6i.c
@@ -18,6 +18,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/dram.h>
 #include <asm/arch/prcm.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 #define DRAM_CLK (CONFIG_DRAM_CLK * 1000000)
diff --git a/arch/arm/mach-sunxi/dram_sun8i_a23.c b/arch/arm/mach-sunxi/dram_sun8i_a23.c
index 3ed97b59a32c..25084956ebb1 100644
--- a/arch/arm/mach-sunxi/dram_sun8i_a23.c
+++ b/arch/arm/mach-sunxi/dram_sun8i_a23.c
@@ -26,6 +26,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/dram.h>
 #include <asm/arch/prcm.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 static const struct dram_para dram_para = {
diff --git a/arch/arm/mach-sunxi/dram_sun8i_a33.c b/arch/arm/mach-sunxi/dram_sun8i_a33.c
index 5b993afe3efe..c2ea86ffd62b 100644
--- a/arch/arm/mach-sunxi/dram_sun8i_a33.c
+++ b/arch/arm/mach-sunxi/dram_sun8i_a33.c
@@ -14,6 +14,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/dram.h>
 #include <asm/arch/prcm.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
diff --git a/arch/arm/mach-sunxi/dram_sun8i_a83t.c b/arch/arm/mach-sunxi/dram_sun8i_a83t.c
index bf6279214408..93c90ccbb0f1 100644
--- a/arch/arm/mach-sunxi/dram_sun8i_a83t.c
+++ b/arch/arm/mach-sunxi/dram_sun8i_a83t.c
@@ -14,6 +14,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/dram.h>
 #include <asm/arch/prcm.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
diff --git a/arch/arm/mach-sunxi/dram_sun9i.c b/arch/arm/mach-sunxi/dram_sun9i.c
index e2ab5d2fafb8..b499b8416492 100644
--- a/arch/arm/mach-sunxi/dram_sun9i.c
+++ b/arch/arm/mach-sunxi/dram_sun9i.c
@@ -21,6 +21,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/dram.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/types.h>
 
 #define DRAM_CLK (CONFIG_DRAM_CLK * 1000000)
 
diff --git a/arch/arm/mach-sunxi/dram_sunxi_dw.c b/arch/arm/mach-sunxi/dram_sunxi_dw.c
index 3fa8509efb9b..6147d0f745f1 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 <stdbool.h>
 #include <vsprintf.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
@@ -19,6 +20,7 @@
 #include <linux/delay.h>
 #include <linux/kconfig.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 static void mctl_phy_init(u32 val)
 {
diff --git a/arch/arm/mach-sunxi/dram_timings/ddr2_v3s.c b/arch/arm/mach-sunxi/dram_timings/ddr2_v3s.c
index 14ee586e147a..eef6e0b66daf 100644
--- a/arch/arm/mach-sunxi/dram_timings/ddr2_v3s.c
+++ b/arch/arm/mach-sunxi/dram_timings/ddr2_v3s.c
@@ -2,6 +2,7 @@
 #include <asm/arch/dram.h>
 #include <asm/arch/cpu.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 void mctl_set_timing_params(uint16_t socid, struct dram_para *para)
 {
diff --git a/arch/arm/mach-sunxi/dram_timings/ddr3_1333.c b/arch/arm/mach-sunxi/dram_timings/ddr3_1333.c
index a297d469a90e..d2fb72038225 100644
--- a/arch/arm/mach-sunxi/dram_timings/ddr3_1333.c
+++ b/arch/arm/mach-sunxi/dram_timings/ddr3_1333.c
@@ -2,6 +2,7 @@
 #include <asm/arch/dram.h>
 #include <asm/arch/cpu.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 void mctl_set_timing_params(uint16_t socid, struct dram_para *para)
 {
diff --git a/arch/arm/mach-sunxi/dram_timings/h6_ddr3_1333.c b/arch/arm/mach-sunxi/dram_timings/h6_ddr3_1333.c
index 6160518efee3..bceae65edb0d 100644
--- a/arch/arm/mach-sunxi/dram_timings/h6_ddr3_1333.c
+++ b/arch/arm/mach-sunxi/dram_timings/h6_ddr3_1333.c
@@ -22,6 +22,7 @@
 #include <common.h>
 #include <asm/arch/dram.h>
 #include <asm/arch/cpu.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 
 /*
diff --git a/arch/arm/mach-sunxi/dram_timings/h6_lpddr3.c b/arch/arm/mach-sunxi/dram_timings/h6_lpddr3.c
index 497c59d8ae2b..641abdbd9dba 100644
--- a/arch/arm/mach-sunxi/dram_timings/h6_lpddr3.c
+++ b/arch/arm/mach-sunxi/dram_timings/h6_lpddr3.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <asm/arch/dram.h>
 #include <asm/arch/cpu.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 
 static u32 mr_lpddr3[12] = {
diff --git a/arch/arm/mach-sunxi/dram_timings/lpddr3_stock.c b/arch/arm/mach-sunxi/dram_timings/lpddr3_stock.c
index 6378bbc22a31..071628657c04 100644
--- a/arch/arm/mach-sunxi/dram_timings/lpddr3_stock.c
+++ b/arch/arm/mach-sunxi/dram_timings/lpddr3_stock.c
@@ -2,6 +2,7 @@
 #include <asm/arch/dram.h>
 #include <asm/arch/cpu.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 void mctl_set_timing_params(uint16_t socid, struct dram_para *para)
 {
diff --git a/arch/arm/mach-sunxi/p2wi.c b/arch/arm/mach-sunxi/p2wi.c
index 550b37b36635..f8fc04c96ebf 100644
--- a/arch/arm/mach-sunxi/p2wi.c
+++ b/arch/arm/mach-sunxi/p2wi.c
@@ -23,6 +23,7 @@
 #include <asm/arch/prcm.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 
 void p2wi_init(void)
diff --git a/arch/arm/mach-sunxi/pinmux.c b/arch/arm/mach-sunxi/pinmux.c
index 642483f06c5e..ab8fc8126357 100644
--- a/arch/arm/mach-sunxi/pinmux.c
+++ b/arch/arm/mach-sunxi/pinmux.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <asm/io.h>
 #include <asm/arch/gpio.h>
+#include <asm/types.h>
 
 void sunxi_gpio_set_cfgbank(struct sunxi_gpio *pio, int bank_offset, u32 val)
 {
diff --git a/arch/arm/mach-sunxi/pmic_bus.c b/arch/arm/mach-sunxi/pmic_bus.c
index dea42de833f1..0e23f7fa2f04 100644
--- a/arch/arm/mach-sunxi/pmic_bus.c
+++ b/arch/arm/mach-sunxi/pmic_bus.c
@@ -13,6 +13,7 @@
 #include <asm/arch/rsb.h>
 #include <i2c.h>
 #include <asm/arch/pmic_bus.h>
+#include <asm/types.h>
 
 #define AXP152_I2C_ADDR			0x30
 
diff --git a/arch/arm/mach-sunxi/prcm.c b/arch/arm/mach-sunxi/prcm.c
index 71a2e44918eb..4970022fe5b0 100644
--- a/arch/arm/mach-sunxi/prcm.c
+++ b/arch/arm/mach-sunxi/prcm.c
@@ -19,6 +19,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/prcm.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/types.h>
 
 /* APB0 clock gate and reset bit offsets are the same. */
 void prcm_apb0_enable(u32 flags)
diff --git a/arch/arm/mach-sunxi/rsb.c b/arch/arm/mach-sunxi/rsb.c
index 2ec63f5a5689..781f22053ea3 100644
--- a/arch/arm/mach-sunxi/rsb.c
+++ b/arch/arm/mach-sunxi/rsb.c
@@ -15,6 +15,7 @@
 #include <asm/arch/gpio.h>
 #include <asm/arch/prcm.h>
 #include <asm/arch/rsb.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 
 static int rsb_set_device_mode(void);
diff --git a/arch/arm/mach-sunxi/spl_spi_sunxi.c b/arch/arm/mach-sunxi/spl_spi_sunxi.c
index f9e1f27363fc..aa8416d3e6af 100644
--- a/arch/arm/mach-sunxi/spl_spi_sunxi.c
+++ b/arch/arm/mach-sunxi/spl_spi_sunxi.c
@@ -13,6 +13,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_SPL_OS_BOOT
 #error CONFIG_SPL_OS_BOOT is not supported yet
diff --git a/arch/arm/mach-tegra/ap.c b/arch/arm/mach-tegra/ap.c
index f3876927e3a1..a5835097cec5 100644
--- a/arch/arm/mach-tegra/ap.c
+++ b/arch/arm/mach-tegra/ap.c
@@ -20,6 +20,7 @@
 #include <asm/arch-tegra/scu.h>
 #include <asm/arch-tegra/tegra.h>
 #include <asm/arch-tegra/warmboot.h>
+#include <linux/types.h>
 
 int tegra_get_chip(void)
 {
diff --git a/arch/arm/mach-tegra/board.c b/arch/arm/mach-tegra/board.c
index cd0eb258bf93..8d5d5e25f807 100644
--- a/arch/arm/mach-tegra/board.c
+++ b/arch/arm/mach-tegra/board.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <ns16550.h>
 #include <spl.h>
+#include <stdbool.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
@@ -31,6 +32,7 @@
 #include <asm/arch-tegra/sys_proto.h>
 #include <asm/arch-tegra/warmboot.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 void save_boot_params_ret(void);
 
diff --git a/arch/arm/mach-tegra/board2.c b/arch/arm/mach-tegra/board2.c
index 1ae686dbd05c..3223cb7e36c2 100644
--- a/arch/arm/mach-tegra/board2.c
+++ b/arch/arm/mach-tegra/board2.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <env.h>
 #include <errno.h>
@@ -38,6 +39,7 @@
 #ifdef CONFIG_TEGRA_CLOCK_SCALING
 #include <asm/arch/emc.h>
 #endif
+#include <linux/types.h>
 #include "emc.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-tegra/cache.c b/arch/arm/mach-tegra/cache.c
index d7063490e222..bea1013f8911 100644
--- a/arch/arm/mach-tegra/cache.c
+++ b/arch/arm/mach-tegra/cache.c
@@ -11,6 +11,7 @@
 #if IS_ENABLED(CONFIG_TEGRA_GP_PADCTRL)
 #include <asm/arch/gp_padctrl.h>
 #endif
+#include <asm/types.h>
 
 #ifndef CONFIG_ARM64
 void config_cache(void)
diff --git a/arch/arm/mach-tegra/cboot.c b/arch/arm/mach-tegra/cboot.c
index 353fb49616ac..538d408f71b8 100644
--- a/arch/arm/mach-tegra/cboot.c
+++ b/arch/arm/mach-tegra/cboot.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <net.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -20,6 +21,7 @@
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <linux/ctype.h>
 #include <linux/sizes.h>
diff --git a/arch/arm/mach-tegra/clock.c b/arch/arm/mach-tegra/clock.c
index 567ba52ee88e..17b88423dddb 100644
--- a/arch/arm/mach-tegra/clock.c
+++ b/arch/arm/mach-tegra/clock.c
@@ -6,10 +6,12 @@
 /* Tegra SoC common clock control functions */
 
 #include <common.h>
+#include <compiler.h>
 #include <div64.h>
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <asm/io.h>
@@ -22,6 +24,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 /*
  * This is our record of the current clock rate of each clock. We don't
diff --git a/arch/arm/mach-tegra/cpu.c b/arch/arm/mach-tegra/cpu.c
index 216e307ccb2c..22a04e30aee3 100644
--- a/arch/arm/mach-tegra/cpu.c
+++ b/arch/arm/mach-tegra/cpu.c
@@ -15,6 +15,7 @@
 #include <asm/arch-tegra/pmc.h>
 #include <asm/arch-tegra/scu.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 #include "cpu.h"
 
 int get_num_cpus(void)
diff --git a/arch/arm/mach-tegra/ivc.c b/arch/arm/mach-tegra/ivc.c
index 216673e43673..2e75b8bd0597 100644
--- a/arch/arm/mach-tegra/ivc.c
+++ b/arch/arm/mach-tegra/ivc.c
@@ -10,6 +10,7 @@
 #include <linux/bug.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 #define TEGRA_IVC_ALIGN 64
 
diff --git a/arch/arm/mach-tegra/pinmux-common.c b/arch/arm/mach-tegra/pinmux-common.c
index 64c397fa4979..67645261907e 100644
--- a/arch/arm/mach-tegra/pinmux-common.c
+++ b/arch/arm/mach-tegra/pinmux-common.c
@@ -9,6 +9,7 @@
 #include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/pinmux.h>
+#include <asm/types.h>
 
 /* return 1 if a pingrp is in range */
 #define pmux_pingrp_isvalid(pin) (((pin) >= 0) && ((pin) < PMUX_PINGRP_COUNT))
diff --git a/arch/arm/mach-tegra/pmc.c b/arch/arm/mach-tegra/pmc.c
index f4747484f29f..225ff46d6608 100644
--- a/arch/arm/mach-tegra/pmc.c
+++ b/arch/arm/mach-tegra/pmc.c
@@ -9,6 +9,7 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <linux/types.h>
 
 #include <linux/arm-smccc.h>
 
diff --git a/arch/arm/mach-tegra/spl.c b/arch/arm/mach-tegra/spl.c
index ed897efc5f07..15e8031efe1e 100644
--- a/arch/arm/mach-tegra/spl.c
+++ b/arch/arm/mach-tegra/spl.c
@@ -9,6 +9,7 @@
 #include <debug_uart.h>
 #include <log.h>
 #include <spl.h>
+#include <asm/types.h>
 
 #include <asm/io.h>
 #include <asm/arch/clock.h>
diff --git a/arch/arm/mach-tegra/tegra114/clock.c b/arch/arm/mach-tegra/tegra114/clock.c
index 53d958e82dd6..10265cc57370 100644
--- a/arch/arm/mach-tegra/tegra114/clock.c
+++ b/arch/arm/mach-tegra/tegra114/clock.c
@@ -19,6 +19,7 @@
 #include <div64.h>
 #include <fdtdec.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 /*
  * Clock types that we can use as a source. The Tegra114 has muxes for the
diff --git a/arch/arm/mach-tegra/tegra114/cpu.c b/arch/arm/mach-tegra/tegra114/cpu.c
index 7e529130ad51..04c11747ea98 100644
--- a/arch/arm/mach-tegra/tegra114/cpu.c
+++ b/arch/arm/mach-tegra/tegra114/cpu.c
@@ -14,6 +14,7 @@
 #include <asm/arch/tegra.h>
 #include <asm/arch-tegra/clk_rst.h>
 #include <asm/arch-tegra/pmc.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include "../cpu.h"
 
diff --git a/arch/arm/mach-tegra/tegra124/clock.c b/arch/arm/mach-tegra/tegra124/clock.c
index edca9c3fdc38..6ae992469658 100644
--- a/arch/arm/mach-tegra/tegra124/clock.c
+++ b/arch/arm/mach-tegra/tegra124/clock.c
@@ -20,6 +20,7 @@
 #include <div64.h>
 #include <fdtdec.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 /*
  * Clock types that we can use as a source. The Tegra124 has muxes for the
diff --git a/arch/arm/mach-tegra/tegra124/cpu.c b/arch/arm/mach-tegra/tegra124/cpu.c
index 2fce060037a6..0adc4ccb2333 100644
--- a/arch/arm/mach-tegra/tegra124/cpu.c
+++ b/arch/arm/mach-tegra/tegra124/cpu.c
@@ -16,6 +16,7 @@
 #include <asm/arch-tegra/clk_rst.h>
 #include <asm/arch-tegra/pmc.h>
 #include <asm/arch-tegra/ap.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include "../cpu.h"
 
diff --git a/arch/arm/mach-tegra/tegra124/psci.c b/arch/arm/mach-tegra/tegra124/psci.c
index ab102a622611..98e556b3169a 100644
--- a/arch/arm/mach-tegra/tegra124/psci.c
+++ b/arch/arm/mach-tegra/tegra124/psci.c
@@ -11,6 +11,7 @@
 #include <asm/arch/powergate.h>
 #include <asm/arch-tegra/ap.h>
 #include <asm/arch-tegra/pmc.h>
+#include <asm/types.h>
 
 static void park_cpu(void)
 {
diff --git a/arch/arm/mach-tegra/tegra124/xusb-padctl.c b/arch/arm/mach-tegra/tegra124/xusb-padctl.c
index 52398eba3fab..a4b7b1e25ed9 100644
--- a/arch/arm/mach-tegra/tegra124/xusb-padctl.c
+++ b/arch/arm/mach-tegra/tegra124/xusb-padctl.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <time.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <dm/of_access.h>
 #include <dm/ofnode.h>
 #include <linux/delay.h>
diff --git a/arch/arm/mach-tegra/tegra20/clock.c b/arch/arm/mach-tegra/tegra20/clock.c
index c8db06cf66c7..2bc7f9338ee9 100644
--- a/arch/arm/mach-tegra/tegra20/clock.c
+++ b/arch/arm/mach-tegra/tegra20/clock.c
@@ -22,6 +22,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 /*
  * Clock types that we can use as a source. The Tegra20 has muxes for the
diff --git a/arch/arm/mach-tegra/tegra20/cpu.c b/arch/arm/mach-tegra/tegra20/cpu.c
index e5b60598f7f7..9d182acc45f3 100644
--- a/arch/arm/mach-tegra/tegra20/cpu.c
+++ b/arch/arm/mach-tegra/tegra20/cpu.c
@@ -7,6 +7,7 @@
 #include <asm/io.h>
 #include <asm/arch/tegra.h>
 #include <asm/arch-tegra/pmc.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include "../cpu.h"
 
diff --git a/arch/arm/mach-tegra/tegra20/crypto.c b/arch/arm/mach-tegra/tegra20/crypto.c
index 1efaa5c3ecd7..e151daa2b271 100644
--- a/arch/arm/mach-tegra/tegra20/crypto.c
+++ b/arch/arm/mach-tegra/tegra20/crypto.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include "crypto.h"
 #include "uboot_aes.h"
diff --git a/arch/arm/mach-tegra/tegra20/crypto.h b/arch/arm/mach-tegra/tegra20/crypto.h
index a773d03fc742..ecd11272c58e 100644
--- a/arch/arm/mach-tegra/tegra20/crypto.h
+++ b/arch/arm/mach-tegra/tegra20/crypto.h
@@ -14,6 +14,7 @@
  * \param length	Size of source data
  * \param signature	Destination address for signature, AES_KEY_LENGTH bytes
  */
+#include <asm/types.h>
 int sign_data_block(u8 *source, unsigned length, u8 *signature);
 
 #endif /* #ifndef _CRYPTO_H_ */
diff --git a/arch/arm/mach-tegra/tegra20/emc.c b/arch/arm/mach-tegra/tegra20/emc.c
index 58abf790bd1b..116393fcc069 100644
--- a/arch/arm/mach-tegra/tegra20/emc.c
+++ b/arch/arm/mach-tegra/tegra20/emc.c
@@ -13,6 +13,7 @@
 #include <asm/arch/emc.h>
 #include <asm/arch/tegra.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /*
  * The EMC registers have shadow registers.  When the EMC clock is updated
diff --git a/arch/arm/mach-tegra/tegra20/warmboot.c b/arch/arm/mach-tegra/tegra20/warmboot.c
index f0050a4f8212..404b93dffd34 100644
--- a/arch/arm/mach-tegra/tegra20/warmboot.c
+++ b/arch/arm/mach-tegra/tegra20/warmboot.c
@@ -8,6 +8,7 @@
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/emc.h>
diff --git a/arch/arm/mach-tegra/tegra20/warmboot_avp.c b/arch/arm/mach-tegra/tegra20/warmboot_avp.c
index be801d108e37..10ed02bd32ff 100644
--- a/arch/arm/mach-tegra/tegra20/warmboot_avp.c
+++ b/arch/arm/mach-tegra/tegra20/warmboot_avp.c
@@ -15,6 +15,7 @@
 #include <asm/arch-tegra/clk_rst.h>
 #include <asm/arch-tegra/pmc.h>
 #include <asm/arch-tegra/warmboot.h>
+#include <asm/types.h>
 #include "warmboot_avp.h"
 
 #define DEBUG_RESET_CORESIGHT
diff --git a/arch/arm/mach-tegra/tegra210/clock.c b/arch/arm/mach-tegra/tegra210/clock.c
index 48f7e354108b..5597016b8d3d 100644
--- a/arch/arm/mach-tegra/tegra210/clock.c
+++ b/arch/arm/mach-tegra/tegra210/clock.c
@@ -24,6 +24,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 /*
  * Clock types that we can use as a source. The Tegra210 has muxes for the
diff --git a/arch/arm/mach-tegra/tegra210/xusb-padctl.c b/arch/arm/mach-tegra/tegra210/xusb-padctl.c
index 78cea2b9193f..9b4bff7c97ea 100644
--- a/arch/arm/mach-tegra/tegra210/xusb-padctl.c
+++ b/arch/arm/mach-tegra/tegra210/xusb-padctl.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <time.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <dm/of_access.h>
 #include <dm/ofnode.h>
 #include <linux/delay.h>
diff --git a/arch/arm/mach-tegra/tegra30/clock.c b/arch/arm/mach-tegra/tegra30/clock.c
index b35f02eedd4c..a256a068625e 100644
--- a/arch/arm/mach-tegra/tegra30/clock.c
+++ b/arch/arm/mach-tegra/tegra30/clock.c
@@ -21,6 +21,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 /*
  * Clock types that we can use as a source. The Tegra30 has muxes for the
diff --git a/arch/arm/mach-tegra/tegra30/cpu.c b/arch/arm/mach-tegra/tegra30/cpu.c
index 651edd27ee87..bb2e711d63ee 100644
--- a/arch/arm/mach-tegra/tegra30/cpu.c
+++ b/arch/arm/mach-tegra/tegra30/cpu.c
@@ -13,6 +13,7 @@
 #include <asm/arch-tegra/pmc.h>
 #include <asm/arch-tegra/tegra_i2c.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 #include "../cpu.h"
 
 /* Tegra30-specific CPU init code */
diff --git a/arch/arm/mach-tegra/xusb-padctl-common.c b/arch/arm/mach-tegra/xusb-padctl-common.c
index 94a271311ce3..d22f1d48759c 100644
--- a/arch/arm/mach-tegra/xusb-padctl-common.c
+++ b/arch/arm/mach-tegra/xusb-padctl-common.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <errno.h>
 #include <log.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
diff --git a/arch/arm/mach-tegra/xusb-padctl-common.h b/arch/arm/mach-tegra/xusb-padctl-common.h
index e3fd613f2be1..1899f5aee5db 100644
--- a/arch/arm/mach-tegra/xusb-padctl-common.h
+++ b/arch/arm/mach-tegra/xusb-padctl-common.h
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <fdtdec.h>
+#include <asm/types.h>
 #include <dm/ofnode.h>
 
 #include <asm/io.h>
diff --git a/arch/arm/mach-u8500/cpuinfo.c b/arch/arm/mach-u8500/cpuinfo.c
index bc3fd036035d..9c386005aad6 100644
--- a/arch/arm/mach-u8500/cpuinfo.c
+++ b/arch/arm/mach-u8500/cpuinfo.c
@@ -7,6 +7,7 @@
 #include <init.h>
 #include <stdio.h>
 #include <asm/io.h>
+#include <asm/types.h>
 
 #define U8500_BOOTROM_BASE	0x90000000
 #define U8500_ASIC_ID_LOC_V2	(U8500_BOOTROM_BASE + 0x1DBF4)
diff --git a/arch/arm/mach-uniphier/arm32/cache-uniphier.c b/arch/arm/mach-uniphier/arm32/cache-uniphier.c
index cde2a8124fe2..78b1ad98adfe 100644
--- a/arch/arm/mach-uniphier/arm32/cache-uniphier.c
+++ b/arch/arm/mach-uniphier/arm32/cache-uniphier.c
@@ -5,7 +5,9 @@
  *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  */
 
+#include <compiler.h>
 #include <cpu_func.h>
+#include <asm/types.h>
 #include <linux/io.h>
 #include <linux/kernel.h>
 #include <asm/armv7.h>
diff --git a/arch/arm/mach-uniphier/arm32/psci.c b/arch/arm/mach-uniphier/arm32/psci.c
index a4d260aecedc..e099c91bb6a1 100644
--- a/arch/arm/mach-uniphier/arm32/psci.c
+++ b/arch/arm/mach-uniphier/arm32/psci.c
@@ -16,6 +16,7 @@
 #include <asm/psci.h>
 #include <asm/secure.h>
 #include <asm/system.h>
+#include <linux/types.h>
 
 #include "../debug.h"
 #include "../soc-info.h"
diff --git a/arch/arm/mach-uniphier/base-address.c b/arch/arm/mach-uniphier/base-address.c
index 1ba55eb7ebba..344209f63da8 100644
--- a/arch/arm/mach-uniphier/base-address.c
+++ b/arch/arm/mach-uniphier/base-address.c
@@ -3,6 +3,7 @@
 // Copyright (C) 2019 Socionext Inc.
 //   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
 
+#include <compiler.h>
 #include <dm/of.h>
 #include <fdt_support.h>
 #include <linux/errno.h>
diff --git a/arch/arm/mach-uniphier/board_init.c b/arch/arm/mach-uniphier/board_init.c
index 30e4e23a6438..da2f96593063 100644
--- a/arch/arm/mach-uniphier/board_init.c
+++ b/arch/arm/mach-uniphier/board_init.c
@@ -5,6 +5,7 @@
  *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  */
 
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/printk.h>
diff --git a/arch/arm/mach-uniphier/boot-device/boot-device-ld11.c b/arch/arm/mach-uniphier/boot-device/boot-device-ld11.c
index 4689ed79fdc8..85539ea4aa67 100644
--- a/arch/arm/mach-uniphier/boot-device/boot-device-ld11.c
+++ b/arch/arm/mach-uniphier/boot-device/boot-device-ld11.c
@@ -5,6 +5,7 @@
  */
 
 #include <spl.h>
+#include <asm/types.h>
 #include <linux/io.h>
 #include <linux/kernel.h>
 
diff --git a/arch/arm/mach-uniphier/boot-device/boot-device-pxs2.c b/arch/arm/mach-uniphier/boot-device/boot-device-pxs2.c
index 677470cdc649..e0724021b91c 100644
--- a/arch/arm/mach-uniphier/boot-device/boot-device-pxs2.c
+++ b/arch/arm/mach-uniphier/boot-device/boot-device-pxs2.c
@@ -5,6 +5,7 @@
  */
 
 #include <spl.h>
+#include <asm/types.h>
 #include <linux/io.h>
 #include <linux/kernel.h>
 
diff --git a/arch/arm/mach-uniphier/boot-device/boot-device-pxs3.c b/arch/arm/mach-uniphier/boot-device/boot-device-pxs3.c
index 688809931279..9076f55039ca 100644
--- a/arch/arm/mach-uniphier/boot-device/boot-device-pxs3.c
+++ b/arch/arm/mach-uniphier/boot-device/boot-device-pxs3.c
@@ -5,6 +5,7 @@
  */
 
 #include <spl.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/io.h>
 #include <linux/kernel.h>
diff --git a/arch/arm/mach-uniphier/boot-device/boot-device.c b/arch/arm/mach-uniphier/boot-device/boot-device.c
index 1e6bc8433f7d..fc7404e1f3e4 100644
--- a/arch/arm/mach-uniphier/boot-device/boot-device.c
+++ b/arch/arm/mach-uniphier/boot-device/boot-device.c
@@ -6,7 +6,9 @@
 
 #include <command.h>
 #include <spl.h>
+#include <stdbool.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/bug.h>
 #include <linux/errno.h>
diff --git a/arch/arm/mach-uniphier/boot-device/boot-device.h b/arch/arm/mach-uniphier/boot-device/boot-device.h
index bbb634316b3a..43ec10947609 100644
--- a/arch/arm/mach-uniphier/boot-device/boot-device.h
+++ b/arch/arm/mach-uniphier/boot-device/boot-device.h
@@ -7,6 +7,7 @@
 #ifndef _UNIPHIER_BOOT_DEVICE_H_
 #define _UNIPHIER_BOOT_DEVICE_H_
 
+#include <asm/types.h>
 struct uniphier_boot_device {
 	unsigned int boot_device;
 	const char *desc;
diff --git a/arch/arm/mach-uniphier/clk/clk-dram-ld4.c b/arch/arm/mach-uniphier/clk/clk-dram-ld4.c
index 3b721eaf2340..004a32f29a8a 100644
--- a/arch/arm/mach-uniphier/clk/clk-dram-ld4.c
+++ b/arch/arm/mach-uniphier/clk/clk-dram-ld4.c
@@ -5,6 +5,7 @@
  */
 
 #include <spl.h>
+#include <asm/types.h>
 #include <linux/io.h>
 
 #include "../init.h"
diff --git a/arch/arm/mach-uniphier/clk/clk-dram-pro5.c b/arch/arm/mach-uniphier/clk/clk-dram-pro5.c
index 808d1ebfe190..43e215d3dedb 100644
--- a/arch/arm/mach-uniphier/clk/clk-dram-pro5.c
+++ b/arch/arm/mach-uniphier/clk/clk-dram-pro5.c
@@ -3,6 +3,7 @@
  * Copyright (C) 2015-2017 Socionext Inc.
  */
 
+#include <asm/types.h>
 #include <linux/io.h>
 
 #include "../init.h"
diff --git a/arch/arm/mach-uniphier/clk/clk-dram-pxs2.c b/arch/arm/mach-uniphier/clk/clk-dram-pxs2.c
index 75d3e70d6aad..27629be76560 100644
--- a/arch/arm/mach-uniphier/clk/clk-dram-pxs2.c
+++ b/arch/arm/mach-uniphier/clk/clk-dram-pxs2.c
@@ -4,6 +4,7 @@
  */
 
 #include <spl.h>
+#include <asm/types.h>
 #include <linux/io.h>
 
 #include "../init.h"
diff --git a/arch/arm/mach-uniphier/clk/clk-early-ld4.c b/arch/arm/mach-uniphier/clk/clk-early-ld4.c
index 25b72d8926c8..1ba584d09bea 100644
--- a/arch/arm/mach-uniphier/clk/clk-early-ld4.c
+++ b/arch/arm/mach-uniphier/clk/clk-early-ld4.c
@@ -5,6 +5,7 @@
  */
 
 #include <spl.h>
+#include <asm/types.h>
 #include <linux/io.h>
 
 #include "../init.h"
diff --git a/arch/arm/mach-uniphier/clk/clk-ld11.c b/arch/arm/mach-uniphier/clk/clk-ld11.c
index d241a65382f6..cf2205c9a1fe 100644
--- a/arch/arm/mach-uniphier/clk/clk-ld11.c
+++ b/arch/arm/mach-uniphier/clk/clk-ld11.c
@@ -3,6 +3,7 @@
  * Copyright (C) 2016 Socionext Inc.
  */
 
+#include <compiler.h>
 #include <spl.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/arch/arm/mach-uniphier/clk/clk-ld20.c b/arch/arm/mach-uniphier/clk/clk-ld20.c
index 397b2d7384fd..1d077dd0f1db 100644
--- a/arch/arm/mach-uniphier/clk/clk-ld20.c
+++ b/arch/arm/mach-uniphier/clk/clk-ld20.c
@@ -3,6 +3,7 @@
  * Copyright (C) 2017 Socionext Inc.
  */
 
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/io.h>
 
diff --git a/arch/arm/mach-uniphier/clk/clk-pro4.c b/arch/arm/mach-uniphier/clk/clk-pro4.c
index 798128b30247..34d6d90fe687 100644
--- a/arch/arm/mach-uniphier/clk/clk-pro4.c
+++ b/arch/arm/mach-uniphier/clk/clk-pro4.c
@@ -5,6 +5,7 @@
  *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  */
 
+#include <asm/types.h>
 #include <linux/io.h>
 
 #include "../init.h"
diff --git a/arch/arm/mach-uniphier/clk/clk-pro5.c b/arch/arm/mach-uniphier/clk/clk-pro5.c
index 36006fd256ca..821689b12db8 100644
--- a/arch/arm/mach-uniphier/clk/clk-pro5.c
+++ b/arch/arm/mach-uniphier/clk/clk-pro5.c
@@ -3,6 +3,7 @@
  * Copyright (C) 2015 Masahiro Yamada <yamada.masahiro@socionext.com>
  */
 
+#include <asm/types.h>
 #include <linux/io.h>
 
 #include "../init.h"
diff --git a/arch/arm/mach-uniphier/clk/clk-pxs2.c b/arch/arm/mach-uniphier/clk/clk-pxs2.c
index c2a75ce00010..e1b867ac3b0d 100644
--- a/arch/arm/mach-uniphier/clk/clk-pxs2.c
+++ b/arch/arm/mach-uniphier/clk/clk-pxs2.c
@@ -3,6 +3,7 @@
  * Copyright (C) 2015 Masahiro Yamada <yamada.masahiro@socionext.com>
  */
 
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/io.h>
 
diff --git a/arch/arm/mach-uniphier/clk/clk-pxs3.c b/arch/arm/mach-uniphier/clk/clk-pxs3.c
index 33b9c5b73d1b..0d6f6a5c6669 100644
--- a/arch/arm/mach-uniphier/clk/clk-pxs3.c
+++ b/arch/arm/mach-uniphier/clk/clk-pxs3.c
@@ -3,6 +3,7 @@
  * Copyright (C) 2017 Socionext Inc.
  */
 
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/io.h>
 
diff --git a/arch/arm/mach-uniphier/clk/dpll-ld4.c b/arch/arm/mach-uniphier/clk/dpll-ld4.c
index f24a0eb0b827..dec158401518 100644
--- a/arch/arm/mach-uniphier/clk/dpll-ld4.c
+++ b/arch/arm/mach-uniphier/clk/dpll-ld4.c
@@ -4,6 +4,7 @@
  * Copyright (C) 2015-2016 Socionext Inc.
  */
 
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/io.h>
diff --git a/arch/arm/mach-uniphier/clk/dpll-pro4.c b/arch/arm/mach-uniphier/clk/dpll-pro4.c
index 204aee1a62c0..0a37297de846 100644
--- a/arch/arm/mach-uniphier/clk/dpll-pro4.c
+++ b/arch/arm/mach-uniphier/clk/dpll-pro4.c
@@ -4,6 +4,7 @@
  * Copyright (C) 2015-2016 Socionext Inc.
  */
 
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/io.h>
diff --git a/arch/arm/mach-uniphier/clk/dpll-sld8.c b/arch/arm/mach-uniphier/clk/dpll-sld8.c
index 1ac52d11f34a..526b1c4cbbd3 100644
--- a/arch/arm/mach-uniphier/clk/dpll-sld8.c
+++ b/arch/arm/mach-uniphier/clk/dpll-sld8.c
@@ -4,6 +4,7 @@
  * Copyright (C) 2015-2016 Socionext Inc.
  */
 
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/io.h>
 
diff --git a/arch/arm/mach-uniphier/clk/dpll-tail.c b/arch/arm/mach-uniphier/clk/dpll-tail.c
index 6ba5a3672743..ac99313e8c0c 100644
--- a/arch/arm/mach-uniphier/clk/dpll-tail.c
+++ b/arch/arm/mach-uniphier/clk/dpll-tail.c
@@ -5,6 +5,7 @@
  *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  */
 
+#include <asm/types.h>
 #include <linux/io.h>
 
 #include "../sc-regs.h"
diff --git a/arch/arm/mach-uniphier/clk/pll-base-ld20.c b/arch/arm/mach-uniphier/clk/pll-base-ld20.c
index ea96d739c53d..8b5b53da4392 100644
--- a/arch/arm/mach-uniphier/clk/pll-base-ld20.c
+++ b/arch/arm/mach-uniphier/clk/pll-base-ld20.c
@@ -4,6 +4,8 @@
  *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  */
 
+#include <compiler.h>
+#include <asm/types.h>
 #include <linux/bitfield.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/arch/arm/mach-uniphier/clk/pll-ld4.c b/arch/arm/mach-uniphier/clk/pll-ld4.c
index c66031bdd05a..91eab0d0565d 100644
--- a/arch/arm/mach-uniphier/clk/pll-ld4.c
+++ b/arch/arm/mach-uniphier/clk/pll-ld4.c
@@ -4,6 +4,7 @@
  * Copyright (C) 2015-2016 Socionext Inc.
  */
 
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/io.h>
 
diff --git a/arch/arm/mach-uniphier/clk/pll-pro4.c b/arch/arm/mach-uniphier/clk/pll-pro4.c
index b7dc3e261f81..4b27bead1cf4 100644
--- a/arch/arm/mach-uniphier/clk/pll-pro4.c
+++ b/arch/arm/mach-uniphier/clk/pll-pro4.c
@@ -4,6 +4,7 @@
  * Copyright (C) 2015-2016 Socionext Inc.
  */
 
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/io.h>
 
diff --git a/arch/arm/mach-uniphier/debug-uart/debug-uart-ld6b.c b/arch/arm/mach-uniphier/debug-uart/debug-uart-ld6b.c
index f64ff39c9e65..77b6143b8d38 100644
--- a/arch/arm/mach-uniphier/debug-uart/debug-uart-ld6b.c
+++ b/arch/arm/mach-uniphier/debug-uart/debug-uart-ld6b.c
@@ -4,6 +4,7 @@
  */
 
 #include <config.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 #include <linux/io.h>
 
diff --git a/arch/arm/mach-uniphier/debug-uart/debug-uart-pro4.c b/arch/arm/mach-uniphier/debug-uart/debug-uart-pro4.c
index 79c6c101e229..66a0d3226e48 100644
--- a/arch/arm/mach-uniphier/debug-uart/debug-uart-pro4.c
+++ b/arch/arm/mach-uniphier/debug-uart/debug-uart-pro4.c
@@ -4,6 +4,7 @@
  */
 
 #include <config.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 #include <linux/io.h>
 
diff --git a/arch/arm/mach-uniphier/debug-uart/debug-uart-pro5.c b/arch/arm/mach-uniphier/debug-uart/debug-uart-pro5.c
index ef3b383ee431..347e91871a24 100644
--- a/arch/arm/mach-uniphier/debug-uart/debug-uart-pro5.c
+++ b/arch/arm/mach-uniphier/debug-uart/debug-uart-pro5.c
@@ -4,6 +4,7 @@
  */
 
 #include <config.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 #include <linux/io.h>
 
diff --git a/arch/arm/mach-uniphier/debug-uart/debug-uart-pxs2.c b/arch/arm/mach-uniphier/debug-uart/debug-uart-pxs2.c
index ee8caad1d458..5a6674e5cbbe 100644
--- a/arch/arm/mach-uniphier/debug-uart/debug-uart-pxs2.c
+++ b/arch/arm/mach-uniphier/debug-uart/debug-uart-pxs2.c
@@ -4,6 +4,7 @@
  */
 
 #include <config.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 #include <linux/io.h>
 
diff --git a/arch/arm/mach-uniphier/debug-uart/debug-uart.c b/arch/arm/mach-uniphier/debug-uart/debug-uart.c
index d116d46812d5..cbe61e614a4c 100644
--- a/arch/arm/mach-uniphier/debug-uart/debug-uart.c
+++ b/arch/arm/mach-uniphier/debug-uart/debug-uart.c
@@ -3,7 +3,9 @@
  * Copyright (C) 2016 Masahiro Yamada <yamada.masahiro@socionext.com>
  */
 
+#include <compiler.h>
 #include <debug_uart.h>
+#include <asm/types.h>
 #include <linux/io.h>
 #include <linux/serial_reg.h>
 
diff --git a/arch/arm/mach-uniphier/debug.h b/arch/arm/mach-uniphier/debug.h
index 466dc9b03bf7..7f699fdb6c76 100644
--- a/arch/arm/mach-uniphier/debug.h
+++ b/arch/arm/mach-uniphier/debug.h
@@ -7,6 +7,7 @@
 #ifndef __DEBUG_H__
 #define __DEBUG_H__
 
+#include <compiler.h>
 #include <linux/io.h>
 #include <linux/serial_reg.h>
 
diff --git a/arch/arm/mach-uniphier/dram/cmd_ddrmphy.c b/arch/arm/mach-uniphier/dram/cmd_ddrmphy.c
index be4ce3265bb8..d36bc4834b54 100644
--- a/arch/arm/mach-uniphier/dram/cmd_ddrmphy.c
+++ b/arch/arm/mach-uniphier/dram/cmd_ddrmphy.c
@@ -5,11 +5,13 @@
  */
 
 #include <command.h>
+#include <compiler.h>
 #include <stdio.h>
 #include <linux/io.h>
 #include <linux/printk.h>
 #include <linux/sizes.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "../soc-info.h"
 #include "ddrmphy-regs.h"
diff --git a/arch/arm/mach-uniphier/dram/cmd_ddrphy.c b/arch/arm/mach-uniphier/dram/cmd_ddrphy.c
index 3ccafe206382..0d4f88327c80 100644
--- a/arch/arm/mach-uniphier/dram/cmd_ddrphy.c
+++ b/arch/arm/mach-uniphier/dram/cmd_ddrphy.c
@@ -6,11 +6,13 @@
  */
 
 #include <command.h>
+#include <compiler.h>
 #include <stdio.h>
 #include <linux/io.h>
 #include <linux/printk.h>
 #include <linux/sizes.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "../soc-info.h"
 #include "ddrphy-regs.h"
diff --git a/arch/arm/mach-uniphier/dram/ddrphy-ld4.c b/arch/arm/mach-uniphier/dram/ddrphy-ld4.c
index 747bc64403db..a5ee11da47de 100644
--- a/arch/arm/mach-uniphier/dram/ddrphy-ld4.c
+++ b/arch/arm/mach-uniphier/dram/ddrphy-ld4.c
@@ -4,7 +4,9 @@
  * Copyright (C) 2015-2016 Socionext Inc.
  */
 
+#include <compiler.h>
 #include <stdbool.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/io.h>
diff --git a/arch/arm/mach-uniphier/dram/ddrphy-training.c b/arch/arm/mach-uniphier/dram/ddrphy-training.c
index 1decdf1cbff5..afe70f00bb1c 100644
--- a/arch/arm/mach-uniphier/dram/ddrphy-training.c
+++ b/arch/arm/mach-uniphier/dram/ddrphy-training.c
@@ -4,6 +4,7 @@
  * Copyright (C) 2015-2016 Socionext Inc.
  */
 
+#include <compiler.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
@@ -11,6 +12,7 @@
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <time.h>
+#include <linux/types.h>
 
 #include "ddrphy-init.h"
 #include "ddrphy-regs.h"
diff --git a/arch/arm/mach-uniphier/dram/umc-ld4.c b/arch/arm/mach-uniphier/dram/umc-ld4.c
index 1109607abfda..517bec221acd 100644
--- a/arch/arm/mach-uniphier/dram/umc-ld4.c
+++ b/arch/arm/mach-uniphier/dram/umc-ld4.c
@@ -5,7 +5,9 @@
  *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  */
 
+#include <compiler.h>
 #include <stdbool.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/printk.h>
diff --git a/arch/arm/mach-uniphier/dram/umc-pro4.c b/arch/arm/mach-uniphier/dram/umc-pro4.c
index b2666ef82492..dba313d836dd 100644
--- a/arch/arm/mach-uniphier/dram/umc-pro4.c
+++ b/arch/arm/mach-uniphier/dram/umc-pro4.c
@@ -5,7 +5,9 @@
  *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  */
 
+#include <compiler.h>
 #include <stdbool.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/printk.h>
diff --git a/arch/arm/mach-uniphier/dram/umc-pxs2.c b/arch/arm/mach-uniphier/dram/umc-pxs2.c
index b39f3d79cdd5..5889c9ae9220 100644
--- a/arch/arm/mach-uniphier/dram/umc-pxs2.c
+++ b/arch/arm/mach-uniphier/dram/umc-pxs2.c
@@ -7,6 +7,8 @@
  * Copyright (C) 2015 Socionext Inc.
  */
 
+#include <compiler.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/arch/arm/mach-uniphier/dram/umc-sld8.c b/arch/arm/mach-uniphier/dram/umc-sld8.c
index d60f70e9e031..877b948fb749 100644
--- a/arch/arm/mach-uniphier/dram/umc-sld8.c
+++ b/arch/arm/mach-uniphier/dram/umc-sld8.c
@@ -5,7 +5,9 @@
  *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  */
 
+#include <compiler.h>
 #include <stdbool.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/printk.h>
diff --git a/arch/arm/mach-uniphier/dram_init.c b/arch/arm/mach-uniphier/dram_init.c
index 7f2753190c23..b71ba75d33c4 100644
--- a/arch/arm/mach-uniphier/dram_init.c
+++ b/arch/arm/mach-uniphier/dram_init.c
@@ -6,6 +6,8 @@
  */
 
 #include <init.h>
+#include <stdbool.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/kernel.h>
diff --git a/arch/arm/mach-uniphier/memconf.c b/arch/arm/mach-uniphier/memconf.c
index ab0d187a1faa..16f8436e87f4 100644
--- a/arch/arm/mach-uniphier/memconf.c
+++ b/arch/arm/mach-uniphier/memconf.c
@@ -5,6 +5,7 @@
  *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  */
 
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/printk.h>
diff --git a/arch/arm/mach-uniphier/micro-support-card.c b/arch/arm/mach-uniphier/micro-support-card.c
index 07ce46bd9ddb..7d2e08fd6eb4 100644
--- a/arch/arm/mach-uniphier/micro-support-card.c
+++ b/arch/arm/mach-uniphier/micro-support-card.c
@@ -5,10 +5,12 @@
  *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  */
 
+#include <compiler.h>
 #include <dm.h>
 #include <fdt_support.h>
 #include <stdbool.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/ctype.h>
 #include <linux/delay.h>
 #include <linux/io.h>
diff --git a/arch/arm/mach-uniphier/mmc-boot-mode.c b/arch/arm/mach-uniphier/mmc-boot-mode.c
index e47e5df6480a..264a3c2a00c0 100644
--- a/arch/arm/mach-uniphier/mmc-boot-mode.c
+++ b/arch/arm/mach-uniphier/mmc-boot-mode.c
@@ -6,6 +6,7 @@
 
 #include <mmc.h>
 #include <spl.h>
+#include <asm/types.h>
 
 u32 spl_mmc_boot_mode(const u32 boot_device)
 {
diff --git a/arch/arm/mach-uniphier/reset.c b/arch/arm/mach-uniphier/reset.c
index 5fffd23e9a5a..a065935af323 100644
--- a/arch/arm/mach-uniphier/reset.c
+++ b/arch/arm/mach-uniphier/reset.c
@@ -6,6 +6,7 @@
  */
 
 #include <cpu_func.h>
+#include <asm/types.h>
 #include <linux/io.h>
 #include <asm/secure.h>
 
diff --git a/arch/arm/mach-uniphier/sc-regs.h b/arch/arm/mach-uniphier/sc-regs.h
index e43116e064bd..c6ce432c597b 100644
--- a/arch/arm/mach-uniphier/sc-regs.h
+++ b/arch/arm/mach-uniphier/sc-regs.h
@@ -11,6 +11,7 @@
 #define ARCH_SC_REGS_H
 
 #ifndef __ASSEMBLY__
+#include <compiler.h>
 #include <linux/compiler.h>
 #define sc_base			((void __iomem *)SC_BASE)
 #endif
diff --git a/arch/arm/mach-uniphier/sc64-regs.h b/arch/arm/mach-uniphier/sc64-regs.h
index fdcca232b61c..ee34465aa48a 100644
--- a/arch/arm/mach-uniphier/sc64-regs.h
+++ b/arch/arm/mach-uniphier/sc64-regs.h
@@ -10,6 +10,7 @@
 #define SC64_REGS_H
 
 #ifndef __ASSEMBLY__
+#include <compiler.h>
 #include <linux/compiler.h>
 extern void __iomem *sc_base;
 #endif
diff --git a/arch/arm/mach-uniphier/sg-regs.h b/arch/arm/mach-uniphier/sg-regs.h
index a0fa51a8b7be..2b6bc50b775c 100644
--- a/arch/arm/mach-uniphier/sg-regs.h
+++ b/arch/arm/mach-uniphier/sg-regs.h
@@ -13,6 +13,7 @@
 #include <linux/bitops.h>
 
 #ifndef __ASSEMBLY__
+#include <compiler.h>
 #include <linux/compiler.h>
 #ifdef CONFIG_ARCH_UNIPHIER_V8_MULTI
 extern void __iomem *sg_base;
diff --git a/arch/arm/mach-versal/include/mach/hardware.h b/arch/arm/mach-versal/include/mach/hardware.h
index 9af5afd3f3f4..64b858e79db8 100644
--- a/arch/arm/mach-versal/include/mach/hardware.h
+++ b/arch/arm/mach-versal/include/mach/hardware.h
@@ -4,6 +4,7 @@
  */
 
 #ifndef __ASSEMBLY__
+#include <asm/types.h>
 #include <linux/bitops.h>
 #endif
 
diff --git a/arch/arm/mach-versal/include/mach/sys_proto.h b/arch/arm/mach-versal/include/mach/sys_proto.h
index 31af049a21c9..1f4dc80d8fd1 100644
--- a/arch/arm/mach-versal/include/mach/sys_proto.h
+++ b/arch/arm/mach-versal/include/mach/sys_proto.h
@@ -3,6 +3,7 @@
  * Copyright 2016 - 2018 Xilinx, Inc.
  */
 
+#include <asm/types.h>
 enum {
 	TCM_LOCK,
 	TCM_SPLIT,
diff --git a/arch/arm/mach-versal/mp.c b/arch/arm/mach-versal/mp.c
index 001c3e9518ab..0eada1838d4e 100644
--- a/arch/arm/mach-versal/mp.c
+++ b/arch/arm/mach-versal/mp.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/types.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-versatile/timer.c b/arch/arm/mach-versatile/timer.c
index a0babce7baad..108a86d8919a 100644
--- a/arch/arm/mach-versatile/timer.c
+++ b/arch/arm/mach-versatile/timer.c
@@ -19,6 +19,7 @@
  */
 
 #include <common.h>
+#include <linux/types.h>
 
 #define TIMER_ENABLE	(1 << 7)
 #define TIMER_MODE_MSK	(1 << 6)
diff --git a/arch/arm/mach-zynq/clk.c b/arch/arm/mach-zynq/clk.c
index 04d6607f591a..73880a4fd577 100644
--- a/arch/arm/mach-zynq/clk.c
+++ b/arch/arm/mach-zynq/clk.c
@@ -12,6 +12,7 @@
 #include <asm/arch/clk.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-zynq/cpu.c b/arch/arm/mach-zynq/cpu.c
index 0c214f71fae4..6cada4d20471 100644
--- a/arch/arm/mach-zynq/cpu.c
+++ b/arch/arm/mach-zynq/cpu.c
@@ -15,6 +15,7 @@
 #include <asm/arch/ps7_init_gpl.h>
 #include <asm/arch/sys_proto.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #define ZYNQ_SILICON_VER_MASK	0xF0000000
 #define ZYNQ_SILICON_VER_SHIFT	28
diff --git a/arch/arm/mach-zynq/ddrc.c b/arch/arm/mach-zynq/ddrc.c
index f601c927f1ae..bca7d3d62df6 100644
--- a/arch/arm/mach-zynq/ddrc.c
+++ b/arch/arm/mach-zynq/ddrc.c
@@ -9,6 +9,7 @@
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/hardware.h>
+#include <asm/types.h>
 #include <linux/string.h>
 
 #ifndef CONFIG_ZYNQ_DDRC_INIT
diff --git a/arch/arm/mach-zynq/include/mach/hardware.h b/arch/arm/mach-zynq/include/mach/hardware.h
index 89eb565c9412..9b9c1e8f2dc9 100644
--- a/arch/arm/mach-zynq/include/mach/hardware.h
+++ b/arch/arm/mach-zynq/include/mach/hardware.h
@@ -6,6 +6,7 @@
 #ifndef _ASM_ARCH_HARDWARE_H
 #define _ASM_ARCH_HARDWARE_H
 
+#include <asm/types.h>
 #define ZYNQ_SYS_CTRL_BASEADDR		0xF8000000
 #define ZYNQ_DEV_CFG_APB_BASEADDR	0xF8007000
 #define ZYNQ_SCU_BASEADDR		0xF8F00000
diff --git a/arch/arm/mach-zynq/include/mach/sys_proto.h b/arch/arm/mach-zynq/include/mach/sys_proto.h
index 1dc16d479ea0..3451517793b7 100644
--- a/arch/arm/mach-zynq/include/mach/sys_proto.h
+++ b/arch/arm/mach-zynq/include/mach/sys_proto.h
@@ -6,6 +6,7 @@
 #ifndef _SYS_PROTO_H_
 #define _SYS_PROTO_H_
 
+#include <asm/types.h>
 extern void zynq_slcr_lock(void);
 extern void zynq_slcr_unlock(void);
 extern void zynq_slcr_cpu_reset(void);
diff --git a/arch/arm/mach-zynq/ps7_spl_init.c b/arch/arm/mach-zynq/ps7_spl_init.c
index 4c38724d4d7c..35314960cfa1 100644
--- a/arch/arm/mach-zynq/ps7_spl_init.c
+++ b/arch/arm/mach-zynq/ps7_spl_init.c
@@ -4,6 +4,7 @@
  * (c) Copyright 2016 Topic Embedded Products.
  */
 
+#include <compiler.h>
 #include <asm/io.h>
 #include <asm/spl.h>
 #include <asm/arch/sys_proto.h>
diff --git a/arch/arm/mach-zynq/slcr.c b/arch/arm/mach-zynq/slcr.c
index 67df265ba967..30d6aee8bd1e 100644
--- a/arch/arm/mach-zynq/slcr.c
+++ b/arch/arm/mach-zynq/slcr.c
@@ -8,6 +8,7 @@
 #include <malloc.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
 
diff --git a/arch/arm/mach-zynq/spl.c b/arch/arm/mach-zynq/spl.c
index dd5535a06508..207560832943 100644
--- a/arch/arm/mach-zynq/spl.c
+++ b/arch/arm/mach-zynq/spl.c
@@ -12,6 +12,7 @@
 #include <stdio.h>
 #include <generated/dt.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <asm/io.h>
 #include <asm/spl.h>
diff --git a/arch/arm/mach-zynq/timer.c b/arch/arm/mach-zynq/timer.c
index 08cb4406cc35..1854ee351083 100644
--- a/arch/arm/mach-zynq/timer.c
+++ b/arch/arm/mach-zynq/timer.c
@@ -38,6 +38,7 @@
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/clk.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-zynqmp-r5/cpu.c b/arch/arm/mach-zynqmp-r5/cpu.c
index b95749978595..d02c64528c4a 100644
--- a/arch/arm/mach-zynqmp-r5/cpu.c
+++ b/arch/arm/mach-zynqmp-r5/cpu.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <asm/armv7_mpu.h>
 #include <asm/global_data.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-zynqmp/clk.c b/arch/arm/mach-zynqmp/clk.c
index 1e6e726e8792..c239b5219a3b 100644
--- a/arch/arm/mach-zynqmp/clk.c
+++ b/arch/arm/mach-zynqmp/clk.c
@@ -11,6 +11,7 @@
 #include <asm/arch/hardware.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-zynqmp/cpu.c b/arch/arm/mach-zynqmp/cpu.c
index b17145155eaa..6b1ee7197cd6 100644
--- a/arch/arm/mach-zynqmp/cpu.c
+++ b/arch/arm/mach-zynqmp/cpu.c
@@ -18,6 +18,7 @@
 #include <asm/cache.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define ZYNQ_SILICON_VER_MASK	0xF000
 #define ZYNQ_SILICON_VER_SHIFT	12
diff --git a/arch/arm/mach-zynqmp/handoff.c b/arch/arm/mach-zynqmp/handoff.c
index 64e5320acc68..0318de61a799 100644
--- a/arch/arm/mach-zynqmp/handoff.c
+++ b/arch/arm/mach-zynqmp/handoff.c
@@ -9,6 +9,7 @@
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/types.h>
 
 /*
  * atfhandoffparams
diff --git a/arch/arm/mach-zynqmp/include/mach/hardware.h b/arch/arm/mach-zynqmp/include/mach/hardware.h
index c5ba42124b04..682b4e326016 100644
--- a/arch/arm/mach-zynqmp/include/mach/hardware.h
+++ b/arch/arm/mach-zynqmp/include/mach/hardware.h
@@ -8,6 +8,7 @@
 #define _ASM_ARCH_HARDWARE_H
 
 #ifndef __ASSEMBLY__
+#include <asm/types.h>
 #include <linux/bitops.h>
 #endif
 
diff --git a/arch/arm/mach-zynqmp/include/mach/sys_proto.h b/arch/arm/mach-zynqmp/include/mach/sys_proto.h
index 05c81769d63d..f874db3f9232 100644
--- a/arch/arm/mach-zynqmp/include/mach/sys_proto.h
+++ b/arch/arm/mach-zynqmp/include/mach/sys_proto.h
@@ -8,6 +8,7 @@
 #define _ASM_ARCH_SYS_PROTO_H
 
 #include <stdbool.h>
+#include <linux/types.h>
 #define PAYLOAD_ARG_CNT		5
 
 #define ZYNQMP_CSU_SILICON_VER_MASK	0xF
diff --git a/arch/arm/mach-zynqmp/mp.c b/arch/arm/mach-zynqmp/mp.c
index b31da25933ed..258cf27323c0 100644
--- a/arch/arm/mach-zynqmp/mp.c
+++ b/arch/arm/mach-zynqmp/mp.c
@@ -13,6 +13,7 @@
 #include <asm/arch/hardware.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 
diff --git a/arch/arm/mach-zynqmp/psu_spl_init.c b/arch/arm/mach-zynqmp/psu_spl_init.c
index 5c5c7d136e77..ddda997165ee 100644
--- a/arch/arm/mach-zynqmp/psu_spl_init.c
+++ b/arch/arm/mach-zynqmp/psu_spl_init.c
@@ -5,8 +5,10 @@
  * Michal Simek <michal.simek@xilinx.com>
  */
 #include <common.h>
+#include <compiler.h>
 #include <asm/io.h>
 #include <asm/arch/psu_init_gpl.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 #define PSU_MASK_POLL_TIME 1100000
diff --git a/arch/arm/mach-zynqmp/spl.c b/arch/arm/mach-zynqmp/spl.c
index cddc8a3fc1e8..c1c039f77165 100644
--- a/arch/arm/mach-zynqmp/spl.c
+++ b/arch/arm/mach-zynqmp/spl.c
@@ -12,6 +12,7 @@
 #include <spl.h>
 #include <stdio.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 #include <asm/io.h>
 #include <asm/spl.h>
diff --git a/arch/m68k/cpu/mcf5227x/cpu.c b/arch/m68k/cpu/mcf5227x/cpu.c
index e4c7041c4214..b9a6cd51cbf4 100644
--- a/arch/m68k/cpu/mcf5227x/cpu.c
+++ b/arch/m68k/cpu/mcf5227x/cpu.c
@@ -15,6 +15,7 @@
 #include <watchdog.h>
 #include <command.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 #include <asm/immap.h>
diff --git a/arch/m68k/cpu/mcf5227x/speed.c b/arch/m68k/cpu/mcf5227x/speed.c
index fa9d5cb7887c..13f2fa553f8d 100644
--- a/arch/m68k/cpu/mcf5227x/speed.c
+++ b/arch/m68k/cpu/mcf5227x/speed.c
@@ -9,6 +9,7 @@
 #include <clock_legacy.h>
 #include <asm/global_data.h>
 #include <asm/processor.h>
+#include <asm/types.h>
 
 #include <asm/immap.h>
 #include <asm/io.h>
diff --git a/arch/m68k/cpu/mcf523x/cpu.c b/arch/m68k/cpu/mcf523x/cpu.c
index bf3acb8f8930..499b6dbc35fb 100644
--- a/arch/m68k/cpu/mcf523x/cpu.c
+++ b/arch/m68k/cpu/mcf523x/cpu.c
@@ -17,6 +17,7 @@
 #include <command.h>
 #include <netdev.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 
 #include <asm/immap.h>
diff --git a/arch/m68k/cpu/mcf52x2/cpu.c b/arch/m68k/cpu/mcf52x2/cpu.c
index 82f5b3c2f801..823221c0ea9c 100644
--- a/arch/m68k/cpu/mcf52x2/cpu.c
+++ b/arch/m68k/cpu/mcf52x2/cpu.c
@@ -26,6 +26,7 @@
 #include <netdev.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 #include "cpu.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/m68k/cpu/mcf52x2/cpu.h b/arch/m68k/cpu/mcf52x2/cpu.h
index 9bba7810e05c..2d24333afef4 100644
--- a/arch/m68k/cpu/mcf52x2/cpu.h
+++ b/arch/m68k/cpu/mcf52x2/cpu.h
@@ -9,6 +9,7 @@
 #define _CPU_H_
 
 #include <command.h>
+#include <compiler.h>
 
 /* Use this to create board specific reset functions */
 void board_reset(void) __attribute__((__weak__));
diff --git a/arch/m68k/cpu/mcf52x2/cpu_init.c b/arch/m68k/cpu/mcf52x2/cpu_init.c
index 9d4a10f028d1..11e8e56f8f5e 100644
--- a/arch/m68k/cpu/mcf52x2/cpu_init.c
+++ b/arch/m68k/cpu/mcf52x2/cpu_init.c
@@ -23,6 +23,7 @@
 #include <watchdog.h>
 #include <asm/immap.h>
 #include <asm/io.h>
+#include <asm/types.h>
 
 #if defined(CONFIG_CMD_NET)
 #include <config.h>
diff --git a/arch/m68k/cpu/mcf532x/cpu.c b/arch/m68k/cpu/mcf532x/cpu.c
index 776543f06a96..20ed945a4070 100644
--- a/arch/m68k/cpu/mcf532x/cpu.c
+++ b/arch/m68k/cpu/mcf532x/cpu.c
@@ -17,6 +17,7 @@
 #include <command.h>
 #include <netdev.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 
diff --git a/arch/m68k/cpu/mcf532x/cpu_init.c b/arch/m68k/cpu/mcf532x/cpu_init.c
index 1311f3967c9a..4b8318556f61 100644
--- a/arch/m68k/cpu/mcf532x/cpu_init.c
+++ b/arch/m68k/cpu/mcf532x/cpu_init.c
@@ -14,6 +14,7 @@
 #include <watchdog.h>
 #include <asm/immap.h>
 #include <asm/io.h>
+#include <asm/types.h>
 
 #if defined(CONFIG_MCFFEC)
 #include <config.h>
diff --git a/arch/m68k/cpu/mcf532x/speed.c b/arch/m68k/cpu/mcf532x/speed.c
index e2985792d96f..065938701e3d 100644
--- a/arch/m68k/cpu/mcf532x/speed.c
+++ b/arch/m68k/cpu/mcf532x/speed.c
@@ -12,6 +12,7 @@
 #include <clock_legacy.h>
 #include <asm/global_data.h>
 #include <asm/processor.h>
+#include <asm/types.h>
 
 #include <asm/immap.h>
 #include <asm/io.h>
diff --git a/arch/m68k/cpu/mcf5445x/cpu.c b/arch/m68k/cpu/mcf5445x/cpu.c
index aa9af8a5a2a8..70bf764abb29 100644
--- a/arch/m68k/cpu/mcf5445x/cpu.c
+++ b/arch/m68k/cpu/mcf5445x/cpu.c
@@ -17,6 +17,7 @@
 #include <command.h>
 #include <netdev.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 
diff --git a/arch/m68k/cpu/mcf5445x/cpu_init.c b/arch/m68k/cpu/mcf5445x/cpu_init.c
index 9deab51d07e8..64764d5bd71d 100644
--- a/arch/m68k/cpu/mcf5445x/cpu_init.c
+++ b/arch/m68k/cpu/mcf5445x/cpu_init.c
@@ -16,6 +16,7 @@
 #include <asm/processor.h>
 #include <asm/rtc.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/compiler.h>
 
 #if defined(CONFIG_CMD_NET)
diff --git a/arch/m68k/cpu/mcf5445x/pci.c b/arch/m68k/cpu/mcf5445x/pci.c
index af02c4934c97..9868ece5cc26 100644
--- a/arch/m68k/cpu/mcf5445x/pci.c
+++ b/arch/m68k/cpu/mcf5445x/pci.c
@@ -11,6 +11,7 @@
 #include <pci.h>
 #include <asm/io.h>
 #include <asm/immap.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 #if defined(CONFIG_PCI)
diff --git a/arch/m68k/cpu/mcf5445x/speed.c b/arch/m68k/cpu/mcf5445x/speed.c
index a0b9af8866b3..b2e373f9e1ae 100644
--- a/arch/m68k/cpu/mcf5445x/speed.c
+++ b/arch/m68k/cpu/mcf5445x/speed.c
@@ -9,6 +9,7 @@
 #include <clock_legacy.h>
 #include <asm/global_data.h>
 #include <asm/processor.h>
+#include <asm/types.h>
 
 #include <asm/immap.h>
 #include <asm/io.h>
diff --git a/arch/m68k/cpu/mcf547x_8x/cpu.c b/arch/m68k/cpu/mcf547x_8x/cpu.c
index e1a7f360e777..b99e16a213ec 100644
--- a/arch/m68k/cpu/mcf547x_8x/cpu.c
+++ b/arch/m68k/cpu/mcf547x_8x/cpu.c
@@ -17,6 +17,7 @@
 #include <command.h>
 #include <netdev.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 
 #include <asm/immap.h>
diff --git a/arch/m68k/cpu/mcf547x_8x/cpu_init.c b/arch/m68k/cpu/mcf547x_8x/cpu_init.c
index 8e42b6314123..00676b5f4135 100644
--- a/arch/m68k/cpu/mcf547x_8x/cpu_init.c
+++ b/arch/m68k/cpu/mcf547x_8x/cpu_init.c
@@ -14,6 +14,7 @@
 #include <init.h>
 #include <asm/immap.h>
 #include <asm/io.h>
+#include <asm/types.h>
 
 #if defined(CONFIG_CMD_NET)
 #include <config.h>
diff --git a/arch/m68k/cpu/mcf547x_8x/pci.c b/arch/m68k/cpu/mcf547x_8x/pci.c
index 74ba68124f1a..d83ad111ceff 100644
--- a/arch/m68k/cpu/mcf547x_8x/pci.c
+++ b/arch/m68k/cpu/mcf547x_8x/pci.c
@@ -11,6 +11,7 @@
 #include <pci.h>
 #include <asm/io.h>
 #include <asm/immap.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 #if defined(CONFIG_PCI)
diff --git a/arch/m68k/cpu/mcf547x_8x/slicetimer.c b/arch/m68k/cpu/mcf547x_8x/slicetimer.c
index 49f246b62e1e..9439f51ebfe8 100644
--- a/arch/m68k/cpu/mcf547x_8x/slicetimer.c
+++ b/arch/m68k/cpu/mcf547x_8x/slicetimer.c
@@ -10,6 +10,7 @@
 #include <time.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 #include <asm/timer.h>
 #include <asm/immap.h>
diff --git a/arch/m68k/include/asm/coldfire/ata.h b/arch/m68k/include/asm/coldfire/ata.h
index d85c052c2ebd..6cc7b3733034 100644
--- a/arch/m68k/include/asm/coldfire/ata.h
+++ b/arch/m68k/include/asm/coldfire/ata.h
@@ -10,6 +10,7 @@
 #define __ATA_H__
 
 /* ATA */
+#include <asm/types.h>
 typedef struct atac {
 	/* PIO */
 	u8 toff;		/* 0x00 */
diff --git a/arch/m68k/include/asm/coldfire/crossbar.h b/arch/m68k/include/asm/coldfire/crossbar.h
index e26da133725d..eb1dd3ee0138 100644
--- a/arch/m68k/include/asm/coldfire/crossbar.h
+++ b/arch/m68k/include/asm/coldfire/crossbar.h
@@ -12,6 +12,7 @@
 /*********************************************************************
 * Cross-bar switch (XBS)
 *********************************************************************/
+#include <asm/types.h>
 typedef struct xbs {
 	u32 prs1;		/* 0x100 Priority Register Slave 1 */
 	u32 res1[3];		/* 0x104 - 0F */
diff --git a/arch/m68k/include/asm/coldfire/dspi.h b/arch/m68k/include/asm/coldfire/dspi.h
index ddd8f3380542..5c08bcb6f1c0 100644
--- a/arch/m68k/include/asm/coldfire/dspi.h
+++ b/arch/m68k/include/asm/coldfire/dspi.h
@@ -10,6 +10,7 @@
 #define __DSPI_H__
 
 /* DMA Serial Peripheral Interface (DSPI) */
+#include <asm/types.h>
 typedef struct dspi {
 	u32 mcr;	/* 0x00 */
 	u32 resv0;	/* 0x04 */
diff --git a/arch/m68k/include/asm/coldfire/edma.h b/arch/m68k/include/asm/coldfire/edma.h
index a89d02ab2102..8d86e30e5737 100644
--- a/arch/m68k/include/asm/coldfire/edma.h
+++ b/arch/m68k/include/asm/coldfire/edma.h
@@ -14,6 +14,7 @@
 *********************************************************************/
 
 /* eDMA module registers */
+#include <asm/types.h>
 typedef struct edma_ctrl {
 	u32 cr;			/* 0x00 Control Register */
 	u32 es;			/* 0x04 Error Status Register */
diff --git a/arch/m68k/include/asm/coldfire/eport.h b/arch/m68k/include/asm/coldfire/eport.h
index 0e64bef5ed62..c8f67c6bd664 100644
--- a/arch/m68k/include/asm/coldfire/eport.h
+++ b/arch/m68k/include/asm/coldfire/eport.h
@@ -10,6 +10,7 @@
 #define __EPORT_H__
 
 /* Edge Port Module (EPORT) */
+#include <asm/types.h>
 typedef struct eport {
 #ifdef CONFIG_MCF547x_8x
 	u16 par;	/* 0x00 */
diff --git a/arch/m68k/include/asm/coldfire/flexbus.h b/arch/m68k/include/asm/coldfire/flexbus.h
index c47787a87e73..0be751bec13e 100644
--- a/arch/m68k/include/asm/coldfire/flexbus.h
+++ b/arch/m68k/include/asm/coldfire/flexbus.h
@@ -91,6 +91,7 @@ typedef struct fbcs {
 } fbcs_t;
 #endif
 
+#include <asm/types.h>
 #define FBCS_CSAR_BA(x)			((x) & 0xFFFF0000)
 
 #define FBCS_CSMR_BAM(x)		(((x) & 0xFFFF) << 16)
diff --git a/arch/m68k/include/asm/coldfire/flexcan.h b/arch/m68k/include/asm/coldfire/flexcan.h
index 7d8e9e269b6e..6604e3502d35 100644
--- a/arch/m68k/include/asm/coldfire/flexcan.h
+++ b/arch/m68k/include/asm/coldfire/flexcan.h
@@ -10,6 +10,7 @@
 #define __FLEXCAN_H__
 
 /* FlexCan Message Buffer */
+#include <asm/types.h>
 typedef struct can_msgbuf_ctrl {
 #ifdef CONFIG_M5282
 	u8 tmstamp;		/* 0x00 Timestamp */
diff --git a/arch/m68k/include/asm/coldfire/intctrl.h b/arch/m68k/include/asm/coldfire/intctrl.h
index 7b42e65bc82f..1f80a593446e 100644
--- a/arch/m68k/include/asm/coldfire/intctrl.h
+++ b/arch/m68k/include/asm/coldfire/intctrl.h
@@ -15,6 +15,7 @@
 #	define	CONFIG_SYS_CF_INTC_REG1
 #endif
 
+#include <asm/types.h>
 typedef struct int0_ctrl {
 	/* Interrupt Controller 0 */
 	u32 iprh0;		/* 0x00 Pending High */
diff --git a/arch/m68k/include/asm/coldfire/lcd.h b/arch/m68k/include/asm/coldfire/lcd.h
index a347bed8382f..e3124fc8b4fc 100644
--- a/arch/m68k/include/asm/coldfire/lcd.h
+++ b/arch/m68k/include/asm/coldfire/lcd.h
@@ -10,6 +10,7 @@
 #define __LCDC_H__
 
 /* LCD module registers */
+#include <asm/types.h>
 typedef struct lcd_ctrl {
 	u32 ssar;		/* 0x00 Screen Start Address Register */
 	u32 sr;			/* 0x04 LCD Size Register */
diff --git a/arch/m68k/include/asm/coldfire/mdha.h b/arch/m68k/include/asm/coldfire/mdha.h
index be3dae972ab9..647a246b9eb0 100644
--- a/arch/m68k/include/asm/coldfire/mdha.h
+++ b/arch/m68k/include/asm/coldfire/mdha.h
@@ -10,6 +10,7 @@
 #define __MDHA_H__
 
 /* Message Digest Hardware Accelerator */
+#include <asm/types.h>
 typedef struct mdha_ctrl {
 	u32 mr;			/* 0x00 MDHA Mode */
 	u32 cr;			/* 0x04 Control */
diff --git a/arch/m68k/include/asm/coldfire/pwm.h b/arch/m68k/include/asm/coldfire/pwm.h
index 1b83acfe37bd..570d110b737c 100644
--- a/arch/m68k/include/asm/coldfire/pwm.h
+++ b/arch/m68k/include/asm/coldfire/pwm.h
@@ -10,6 +10,7 @@
 #define __ATA_H__
 
 /* Pulse Width Modulation (PWM) */
+#include <asm/types.h>
 typedef struct pwm_ctrl {
 #ifdef CONFIG_M5272
 	u8 cr0;
diff --git a/arch/m68k/include/asm/coldfire/qspi.h b/arch/m68k/include/asm/coldfire/qspi.h
index dd4565ae96e0..13d7b9d364bd 100644
--- a/arch/m68k/include/asm/coldfire/qspi.h
+++ b/arch/m68k/include/asm/coldfire/qspi.h
@@ -10,6 +10,7 @@
 #define __QSPI_H__
 
 /* QSPI module registers */
+#include <asm/types.h>
 typedef struct qspi_ctrl {
 	u16 mr;			/* 0x00 Mode */
 	u16 res1;
diff --git a/arch/m68k/include/asm/coldfire/rng.h b/arch/m68k/include/asm/coldfire/rng.h
index 88124e36e2ea..2b3b8d26dc2e 100644
--- a/arch/m68k/include/asm/coldfire/rng.h
+++ b/arch/m68k/include/asm/coldfire/rng.h
@@ -10,6 +10,7 @@
 #define __RNG_H__
 
 /* Random Number Generator */
+#include <asm/types.h>
 typedef struct rng_ctrl {
 	u32 cr;			/* 0x00 Control */
 	u32 sr;			/* 0x04 Status */
diff --git a/arch/m68k/include/asm/coldfire/skha.h b/arch/m68k/include/asm/coldfire/skha.h
index 3b48dc970c99..d6168e186da6 100644
--- a/arch/m68k/include/asm/coldfire/skha.h
+++ b/arch/m68k/include/asm/coldfire/skha.h
@@ -9,6 +9,7 @@
 #ifndef __SKHA_H__
 #define __SKHA_H__
 
+#include <asm/types.h>
 typedef struct skha_ctrl {
 	u32 mr;			/* 0x00 Mode */
 	u32 cr;			/* 0x04 Control */
diff --git a/arch/m68k/include/asm/coldfire/ssi.h b/arch/m68k/include/asm/coldfire/ssi.h
index 900d6bdcf657..01167cb5caa1 100644
--- a/arch/m68k/include/asm/coldfire/ssi.h
+++ b/arch/m68k/include/asm/coldfire/ssi.h
@@ -9,6 +9,7 @@
 #ifndef __SSI_H__
 #define __SSI_H__
 
+#include <asm/types.h>
 typedef struct ssi {
 	u32 tx0;
 	u32 tx1;
diff --git a/arch/m68k/include/asm/fec.h b/arch/m68k/include/asm/fec.h
index cdb8119d3ea9..7f1c34ebd157 100644
--- a/arch/m68k/include/asm/fec.h
+++ b/arch/m68k/include/asm/fec.h
@@ -15,6 +15,7 @@
 #define	fec_h
 
 #include <phy.h>
+#include <linux/types.h>
 
 /* Buffer descriptors used FEC.
 */
diff --git a/arch/m68k/include/asm/fsl_mcdmafec.h b/arch/m68k/include/asm/fsl_mcdmafec.h
index de6c548fafd7..fdc4fd7daf7d 100644
--- a/arch/m68k/include/asm/fsl_mcdmafec.h
+++ b/arch/m68k/include/asm/fsl_mcdmafec.h
@@ -11,6 +11,7 @@
 
 /* Re-use of the definitions */
 #include <asm/fec.h>
+#include <linux/types.h>
 
 typedef struct fecdma {
 	u32 rsvd0;		/* 0x000 */
diff --git a/arch/m68k/include/asm/immap_520x.h b/arch/m68k/include/asm/immap_520x.h
index bb1237453ff1..f4db2666d482 100644
--- a/arch/m68k/include/asm/immap_520x.h
+++ b/arch/m68k/include/asm/immap_520x.h
@@ -42,6 +42,7 @@
 #include <asm/coldfire/flexbus.h>
 #include <asm/coldfire/intctrl.h>
 #include <asm/coldfire/qspi.h>
+#include <asm/types.h>
 
 /* System Controller Module */
 typedef struct scm1 {
diff --git a/arch/m68k/include/asm/immap_5227x.h b/arch/m68k/include/asm/immap_5227x.h
index 710d6f5c0ddf..e75f4c2d2537 100644
--- a/arch/m68k/include/asm/immap_5227x.h
+++ b/arch/m68k/include/asm/immap_5227x.h
@@ -59,6 +59,7 @@
 #include <asm/coldfire/lcd.h>
 #include <asm/coldfire/pwm.h>
 #include <asm/coldfire/ssi.h>
+#include <asm/types.h>
 
 /* Reset Controller Module (RCM) */
 typedef struct rcm {
diff --git a/arch/m68k/include/asm/immap_5235.h b/arch/m68k/include/asm/immap_5235.h
index 27d905ef9419..3fbca550209b 100644
--- a/arch/m68k/include/asm/immap_5235.h
+++ b/arch/m68k/include/asm/immap_5235.h
@@ -54,6 +54,7 @@
 #include <asm/coldfire/qspi.h>
 #include <asm/coldfire/rng.h>
 #include <asm/coldfire/skha.h>
+#include <asm/types.h>
 
 /* System Control Module register */
 typedef struct scm_ctrl {
diff --git a/arch/m68k/include/asm/immap_5272.h b/arch/m68k/include/asm/immap_5272.h
index cd7b67256cfb..9b6d5cd04ad8 100644
--- a/arch/m68k/include/asm/immap_5272.h
+++ b/arch/m68k/include/asm/immap_5272.h
@@ -28,6 +28,7 @@
 #define MMAP_USB	(CONFIG_SYS_MBAR + 0x00001000)
 
 #include <asm/coldfire/pwm.h>
+#include <linux/types.h>
 
 /* System configuration registers */
 typedef struct sys_ctrl {
diff --git a/arch/m68k/include/asm/immap_5275.h b/arch/m68k/include/asm/immap_5275.h
index 8b1a08b4f24f..90a39a83b2fd 100644
--- a/arch/m68k/include/asm/immap_5275.h
+++ b/arch/m68k/include/asm/immap_5275.h
@@ -57,6 +57,7 @@
 #include <asm/coldfire/qspi.h>
 #include <asm/coldfire/rng.h>
 #include <asm/coldfire/skha.h>
+#include <asm/types.h>
 
 /* System configuration registers
 */
diff --git a/arch/m68k/include/asm/immap_5282.h b/arch/m68k/include/asm/immap_5282.h
index d7c68f5749a2..20c551de1317 100644
--- a/arch/m68k/include/asm/immap_5282.h
+++ b/arch/m68k/include/asm/immap_5282.h
@@ -50,6 +50,7 @@
 #include <asm/coldfire/flexcan.h>
 #include <asm/coldfire/intctrl.h>
 #include <asm/coldfire/qspi.h>
+#include <linux/types.h>
 
 /* System Control Module */
 typedef struct scm_ctrl {
diff --git a/arch/m68k/include/asm/immap_5301x.h b/arch/m68k/include/asm/immap_5301x.h
index 29e60863bfde..3500a09e0e1c 100644
--- a/arch/m68k/include/asm/immap_5301x.h
+++ b/arch/m68k/include/asm/immap_5301x.h
@@ -59,6 +59,7 @@
 #include <asm/coldfire/ssi.h>
 #include <asm/coldfire/rng.h>
 #include <asm/rtc.h>
+#include <asm/types.h>
 
 /* System Controller Module */
 typedef struct scm1 {
diff --git a/arch/m68k/include/asm/immap_5307.h b/arch/m68k/include/asm/immap_5307.h
index e041e7e0afbd..b01a1e6243d5 100644
--- a/arch/m68k/include/asm/immap_5307.h
+++ b/arch/m68k/include/asm/immap_5307.h
@@ -7,6 +7,7 @@
 #ifndef __IMMAP_5307__
 #define __IMMAP_5307__
 
+#include <asm/types.h>
 #define MMAP_SIM	(CONFIG_SYS_MBAR + 0x00000000)
 #define MMAP_INTC	(CONFIG_SYS_MBAR + 0x00000040)
 #define MMAP_CSM	(CONFIG_SYS_MBAR + 0x00000080)
diff --git a/arch/m68k/include/asm/immap_5329.h b/arch/m68k/include/asm/immap_5329.h
index dbf3a2260eed..460d2c2fdf04 100644
--- a/arch/m68k/include/asm/immap_5329.h
+++ b/arch/m68k/include/asm/immap_5329.h
@@ -63,6 +63,7 @@
 #include <asm/coldfire/pwm.h>
 #include <asm/coldfire/ssi.h>
 #include <asm/coldfire/skha.h>
+#include <asm/types.h>
 
 /* System control module registers */
 typedef struct scm1_ctrl {
diff --git a/arch/m68k/include/asm/immap_5441x.h b/arch/m68k/include/asm/immap_5441x.h
index 708d0db755a8..c4e61b751719 100644
--- a/arch/m68k/include/asm/immap_5441x.h
+++ b/arch/m68k/include/asm/immap_5441x.h
@@ -84,6 +84,7 @@
 #include <asm/coldfire/flexcan.h>
 #include <asm/coldfire/intctrl.h>
 #include <asm/coldfire/ssi.h>
+#include <asm/types.h>
 
 /* Serial Boot Facility (SBF) */
 typedef struct sbf {
diff --git a/arch/m68k/include/asm/immap_5445x.h b/arch/m68k/include/asm/immap_5445x.h
index 3111d00d3ee7..76e8d2dc0a93 100644
--- a/arch/m68k/include/asm/immap_5445x.h
+++ b/arch/m68k/include/asm/immap_5445x.h
@@ -60,6 +60,7 @@
 #include <asm/coldfire/flexbus.h>
 #include <asm/coldfire/intctrl.h>
 #include <asm/coldfire/ssi.h>
+#include <asm/types.h>
 
 /* Watchdog Timer Modules (WTM) */
 typedef struct wtm {
diff --git a/arch/m68k/include/asm/immap_547x_8x.h b/arch/m68k/include/asm/immap_547x_8x.h
index 5e1345684de0..8dee82e9e50a 100644
--- a/arch/m68k/include/asm/immap_547x_8x.h
+++ b/arch/m68k/include/asm/immap_547x_8x.h
@@ -45,6 +45,7 @@
 #include <asm/coldfire/flexbus.h>
 #include <asm/coldfire/flexcan.h>
 #include <asm/coldfire/intctrl.h>
+#include <asm/types.h>
 
 typedef struct siu {
 	u32 mbar;		/* 0x00 */
diff --git a/arch/m68k/include/asm/io.h b/arch/m68k/include/asm/io.h
index 35ad4a1c0444..95fcddb075e7 100644
--- a/arch/m68k/include/asm/io.h
+++ b/arch/m68k/include/asm/io.h
@@ -10,6 +10,7 @@
 #define __ASM_M68K_IO_H__
 
 #include <asm/byteorder.h>
+#include <asm/types.h>
 
 #ifndef _IO_BASE
 #define _IO_BASE 0
diff --git a/arch/m68k/include/asm/m5282.h b/arch/m68k/include/asm/m5282.h
index 0c91cf491e24..261f49fdf20c 100644
--- a/arch/m68k/include/asm/m5282.h
+++ b/arch/m68k/include/asm/m5282.h
@@ -11,6 +11,7 @@
 * PLL Clock Module
 *********************************************************************/
 /* Bit definitions and macros for PLL_SYNCR */
+#include <linux/types.h>
 #define PLL_SYNCR_LOLRE			(0x8000)
 #define PLL_SYNCR_MFD2			(0x4000)
 #define PLL_SYNCR_MFD1			(0x2000)
diff --git a/arch/m68k/include/asm/ptrace.h b/arch/m68k/include/asm/ptrace.h
index d419824806c3..a17708195ead 100644
--- a/arch/m68k/include/asm/ptrace.h
+++ b/arch/m68k/include/asm/ptrace.h
@@ -9,6 +9,7 @@
  */
 #ifndef __ASSEMBLY__
 
+#include <linux/types.h>
 struct pt_regs {
 	ulong d0;
 	ulong d1;
diff --git a/arch/m68k/include/asm/rtc.h b/arch/m68k/include/asm/rtc.h
index 1fb492c76e1b..544fa8215718 100644
--- a/arch/m68k/include/asm/rtc.h
+++ b/arch/m68k/include/asm/rtc.h
@@ -10,6 +10,7 @@
 #define __MCFRTC_H__
 
 /* Real time Clock */
+#include <asm/types.h>
 typedef struct rtc_ctrl {
 	u32 hourmin;		/* 0x00 Hours and Minutes Counter Register */
 	u32 seconds;		/* 0x04 Seconds Counter Register */
diff --git a/arch/m68k/include/asm/timer.h b/arch/m68k/include/asm/timer.h
index 982d71a542e8..47b75989633e 100644
--- a/arch/m68k/include/asm/timer.h
+++ b/arch/m68k/include/asm/timer.h
@@ -12,6 +12,7 @@
 /****************************************************************************/
 
 /****************************************************************************/
+#include <asm/types.h>
 /* Timer structure */
 /****************************************************************************/
 /* DMA Timer module registers */
diff --git a/arch/m68k/include/asm/uart.h b/arch/m68k/include/asm/uart.h
index e4a9650a03c5..2a41f7e507ed 100644
--- a/arch/m68k/include/asm/uart.h
+++ b/arch/m68k/include/asm/uart.h
@@ -12,6 +12,7 @@
 /****************************************************************************/
 
 /* UART module registers */
+#include <asm/types.h>
 /* Register read/write struct */
 typedef struct uart {
 	u8 umr;			/* 0x00 Mode Register */
diff --git a/arch/m68k/lib/bdinfo.c b/arch/m68k/lib/bdinfo.c
index 7b410e7743cd..48d4f35d4659 100644
--- a/arch/m68k/lib/bdinfo.c
+++ b/arch/m68k/lib/bdinfo.c
@@ -10,6 +10,7 @@
 #include <init.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/m68k/lib/bootm.c b/arch/m68k/lib/bootm.c
index 20ff33f7532a..c70b24944e6d 100644
--- a/arch/m68k/lib/bootm.c
+++ b/arch/m68k/lib/bootm.c
@@ -14,6 +14,7 @@
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 #include <u-boot/zlib.h>
 #include <bzlib.h>
 #include <watchdog.h>
diff --git a/arch/m68k/lib/cache.c b/arch/m68k/lib/cache.c
index 22048d12d707..afd8e3531d75 100644
--- a/arch/m68k/lib/cache.c
+++ b/arch/m68k/lib/cache.c
@@ -5,10 +5,12 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <asm/immap.h>
 #include <asm/cache.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 volatile int *cf_icache_status = (int *)ICACHE_STATUS;
 volatile int *cf_dcache_status = (int *)DCACHE_STATUS;
diff --git a/arch/m68k/lib/fec.c b/arch/m68k/lib/fec.c
index 4f0132389288..053ced254528 100644
--- a/arch/m68k/lib/fec.c
+++ b/arch/m68k/lib/fec.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
diff --git a/arch/m68k/lib/time.c b/arch/m68k/lib/time.c
index cbe29e72a86e..36056d25ebb8 100644
--- a/arch/m68k/lib/time.c
+++ b/arch/m68k/lib/time.c
@@ -12,6 +12,7 @@
 #include <time.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 #include <asm/timer.h>
 #include <asm/immap.h>
diff --git a/arch/m68k/lib/traps.c b/arch/m68k/lib/traps.c
index f724be3a63c9..f933982acb3e 100644
--- a/arch/m68k/lib/traps.c
+++ b/arch/m68k/lib/traps.c
@@ -14,6 +14,7 @@
 #include <command.h>
 #include <asm/processor.h>
 #include <asm/ptrace.h>
+#include <linux/types.h>
 
 
 extern void _exc_handler(void);
diff --git a/arch/microblaze/cpu/cache.c b/arch/microblaze/cpu/cache.c
index aa832d6be6d4..20dea1abbee4 100644
--- a/arch/microblaze/cpu/cache.c
+++ b/arch/microblaze/cpu/cache.c
@@ -9,6 +9,7 @@
 #include <cpu_func.h>
 #include <asm/asm.h>
 #include <asm/cache.h>
+#include <linux/types.h>
 
 int dcache_status(void)
 {
diff --git a/arch/microblaze/cpu/interrupts.c b/arch/microblaze/cpu/interrupts.c
index e86f0cda9dfd..56ac0c50a87a 100644
--- a/arch/microblaze/cpu/interrupts.c
+++ b/arch/microblaze/cpu/interrupts.c
@@ -17,6 +17,7 @@
 #include <asm/global_data.h>
 #include <asm/microblaze_intc.h>
 #include <asm/asm.h>
+#include <asm/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/microblaze/cpu/spl.c b/arch/microblaze/cpu/spl.c
index 9f25c2f39529..87eea3725392 100644
--- a/arch/microblaze/cpu/spl.c
+++ b/arch/microblaze/cpu/spl.c
@@ -13,6 +13,7 @@
 #include <stdbool.h>
 #include <asm/io.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 bool boot_linux;
 
diff --git a/arch/microblaze/cpu/timer.c b/arch/microblaze/cpu/timer.c
index 3e6750ea7f44..5e7a397188ea 100644
--- a/arch/microblaze/cpu/timer.c
+++ b/arch/microblaze/cpu/timer.c
@@ -15,6 +15,7 @@
 #include <asm/microblaze_intc.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/microblaze/lib/bootm.c b/arch/microblaze/lib/bootm.c
index 1a30635c87f5..7bc4417cafe4 100644
--- a/arch/microblaze/lib/bootm.c
+++ b/arch/microblaze/lib/bootm.c
@@ -20,6 +20,7 @@
 #include <stdio.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
+#include <linux/types.h>
 #include <u-boot/zlib.h>
 #include <asm/byteorder.h>
 
diff --git a/arch/mips/cpu/cpu.c b/arch/mips/cpu/cpu.c
index 7d5c9fd83aee..bfce17fd36ca 100644
--- a/arch/mips/cpu/cpu.c
+++ b/arch/mips/cpu/cpu.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <init.h>
 #include <linux/compiler.h>
 #include <asm/cache.h>
diff --git a/arch/mips/cpu/time.c b/arch/mips/cpu/time.c
index aab92ec859bb..764b74ce9705 100644
--- a/arch/mips/cpu/time.c
+++ b/arch/mips/cpu/time.c
@@ -8,6 +8,7 @@
 #include <compiler.h>
 #include <time.h>
 #include <asm/mipsregs.h>
+#include <linux/types.h>
 
 unsigned long notrace timer_read_counter(void)
 {
diff --git a/arch/mips/include/asm/cacheops.h b/arch/mips/include/asm/cacheops.h
index 641e2ad58dec..abb3c5018ea0 100644
--- a/arch/mips/include/asm/cacheops.h
+++ b/arch/mips/include/asm/cacheops.h
@@ -12,6 +12,7 @@
 
 #ifndef __ASSEMBLY__
 
+#include <linux/types.h>
 static inline void mips_cache(int op, const volatile void *addr)
 {
 #ifdef __GCC_HAVE_BUILTIN_MIPS_CACHE
diff --git a/arch/mips/include/asm/io.h b/arch/mips/include/asm/io.h
index 836cd436872d..71f6d2da9907 100644
--- a/arch/mips/include/asm/io.h
+++ b/arch/mips/include/asm/io.h
@@ -9,6 +9,7 @@
 #ifndef _ASM_IO_H
 #define _ASM_IO_H
 
+#include <compiler.h>
 #include <linux/bug.h>
 #include <linux/compiler.h>
 #include <linux/string.h>
diff --git a/arch/mips/include/asm/mach-generic/ioremap.h b/arch/mips/include/asm/mach-generic/ioremap.h
index d6258f5bce57..a9cfee53c15b 100644
--- a/arch/mips/include/asm/mach-generic/ioremap.h
+++ b/arch/mips/include/asm/mach-generic/ioremap.h
@@ -2,6 +2,7 @@
 #ifndef __ASM_MACH_GENERIC_IOREMAP_H
 #define __ASM_MACH_GENERIC_IOREMAP_H
 
+#include <compiler.h>
 #include <linux/types.h>
 
 /*
diff --git a/arch/mips/include/asm/mipsregs.h b/arch/mips/include/asm/mipsregs.h
index e65485b4fff3..fecd7e7de409 100644
--- a/arch/mips/include/asm/mipsregs.h
+++ b/arch/mips/include/asm/mipsregs.h
@@ -32,6 +32,7 @@
 #else
 #define _ULCAST_ (unsigned long)
 #define _U64CAST_ (u64)
+#include <asm/types.h>
 #endif
 
 /*
diff --git a/arch/mips/include/asm/pgtable-bits.h b/arch/mips/include/asm/pgtable-bits.h
index 481d2ef6c2fa..1d20cde07ed4 100644
--- a/arch/mips/include/asm/pgtable-bits.h
+++ b/arch/mips/include/asm/pgtable-bits.h
@@ -146,6 +146,7 @@
 #define _PAGE_READ		(cpu_has_rixi ? 0 : (1 << _PAGE_READ_SHIFT))
 #define _PAGE_NO_READ_SHIFT	_PAGE_READ_SHIFT
 #define _PAGE_NO_READ		(cpu_has_rixi ? (1 << _PAGE_READ_SHIFT) : 0)
+#include <linux/types.h>
 #endif	/* defined(CONFIG_CPU_MIPSR2) || defined(CONFIG_CPU_MIPSR6) */
 
 #if defined(_PAGE_NO_READ_SHIFT)
diff --git a/arch/mips/include/asm/sections.h b/arch/mips/include/asm/sections.h
index 93c30e9724fd..1b1897510afa 100644
--- a/arch/mips/include/asm/sections.h
+++ b/arch/mips/include/asm/sections.h
@@ -7,6 +7,7 @@
 #define __ASM_MIPS_SECTIONS_H
 
 #include <asm-generic/sections.h>
+#include <linux/types.h>
 
 /**
  * __rel_start: Relocation data generated by the mips-relocs tool
diff --git a/arch/mips/lib/boot.c b/arch/mips/lib/boot.c
index d5a139ef5ec2..1d1d3809107f 100644
--- a/arch/mips/lib/boot.c
+++ b/arch/mips/lib/boot.c
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <cpu_func.h>
 #include <asm/global_data.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/mips/lib/bootm.c b/arch/mips/lib/bootm.c
index 7a9afcb0b18e..9ac8e7eca97c 100644
--- a/arch/mips/lib/bootm.c
+++ b/arch/mips/lib/bootm.c
@@ -16,6 +16,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/mips/lib/cache.c b/arch/mips/lib/cache.c
index 7be0b559561f..9cdac4f52456 100644
--- a/arch/mips/lib/cache.c
+++ b/arch/mips/lib/cache.c
@@ -5,7 +5,9 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <cpu_func.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/cache.h>
 #include <asm/cacheops.h>
@@ -16,6 +18,7 @@
 #include <asm/system.h>
 #include <linux/bug.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/mips/lib/reloc.c b/arch/mips/lib/reloc.c
index d6ea2f5730d0..edb6b6113773 100644
--- a/arch/mips/lib/reloc.c
+++ b/arch/mips/lib/reloc.c
@@ -35,6 +35,7 @@
 #include <asm/sections.h>
 #include <linux/bitops.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /**
  * read_uint() - Read an unsigned integer from the buffer
diff --git a/arch/mips/lib/traps.c b/arch/mips/lib/traps.c
index 76d50f99a14c..1890fb26113f 100644
--- a/arch/mips/lib/traps.c
+++ b/arch/mips/lib/traps.c
@@ -22,6 +22,7 @@
 #include <asm/addrspace.h>
 #include <asm/system.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/mips/mach-ath79/ar933x/clk.c b/arch/mips/mach-ath79/ar933x/clk.c
index 68d48939d7d2..d052d4e86753 100644
--- a/arch/mips/mach-ath79/ar933x/clk.c
+++ b/arch/mips/mach-ath79/ar933x/clk.c
@@ -5,10 +5,12 @@
 
 #include <common.h>
 #include <clock_legacy.h>
+#include <compiler.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/addrspace.h>
 #include <asm/types.h>
+#include <linux/types.h>
 #include <mach/ar71xx_regs.h>
 #include <mach/ath79.h>
 
diff --git a/arch/mips/mach-ath79/ar933x/ddr.c b/arch/mips/mach-ath79/ar933x/ddr.c
index 09166ecf8f07..3ab0199fe10e 100644
--- a/arch/mips/mach-ath79/ar933x/ddr.c
+++ b/arch/mips/mach-ath79/ar933x/ddr.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <asm/io.h>
 #include <asm/addrspace.h>
 #include <asm/types.h>
diff --git a/arch/mips/mach-ath79/ar934x/clk.c b/arch/mips/mach-ath79/ar934x/clk.c
index c2c594a32273..7e82899f67aa 100644
--- a/arch/mips/mach-ath79/ar934x/clk.c
+++ b/arch/mips/mach-ath79/ar934x/clk.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <clock_legacy.h>
 #include <command.h>
+#include <compiler.h>
 #include <hang.h>
 #include <stdio.h>
 #include <asm/global_data.h>
@@ -15,6 +16,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include <mach/ar71xx_regs.h>
 #include <mach/ath79.h>
 #include <wait_bit.h>
diff --git a/arch/mips/mach-ath79/ar934x/ddr.c b/arch/mips/mach-ath79/ar934x/ddr.c
index 9df48b97ef46..e626ffa72541 100644
--- a/arch/mips/mach-ath79/ar934x/ddr.c
+++ b/arch/mips/mach-ath79/ar934x/ddr.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/addrspace.h>
diff --git a/arch/mips/mach-ath79/cpu.c b/arch/mips/mach-ath79/cpu.c
index 55d051f8cb93..d18b239d1b0b 100644
--- a/arch/mips/mach-ath79/cpu.c
+++ b/arch/mips/mach-ath79/cpu.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <init.h>
 #include <stdio.h>
 #include <asm/global_data.h>
diff --git a/arch/mips/mach-ath79/qca953x/clk.c b/arch/mips/mach-ath79/qca953x/clk.c
index f5438ef1c8d9..386685bc5502 100644
--- a/arch/mips/mach-ath79/qca953x/clk.c
+++ b/arch/mips/mach-ath79/qca953x/clk.c
@@ -5,10 +5,12 @@
 
 #include <common.h>
 #include <clock_legacy.h>
+#include <compiler.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/addrspace.h>
 #include <asm/types.h>
+#include <linux/types.h>
 #include <mach/ar71xx_regs.h>
 #include <mach/ath79.h>
 
diff --git a/arch/mips/mach-ath79/qca953x/ddr.c b/arch/mips/mach-ath79/qca953x/ddr.c
index 78f2370e09ce..36a9eeb18bd4 100644
--- a/arch/mips/mach-ath79/qca953x/ddr.c
+++ b/arch/mips/mach-ath79/qca953x/ddr.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <asm/io.h>
 #include <asm/addrspace.h>
 #include <asm/types.h>
diff --git a/arch/mips/mach-ath79/qca956x/clk.c b/arch/mips/mach-ath79/qca956x/clk.c
index 6a58dba91f3f..b30984f8a3f6 100644
--- a/arch/mips/mach-ath79/qca956x/clk.c
+++ b/arch/mips/mach-ath79/qca956x/clk.c
@@ -5,11 +5,13 @@
 
 #include <common.h>
 #include <clock_legacy.h>
+#include <compiler.h>
 #include <log.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/addrspace.h>
 #include <asm/types.h>
+#include <linux/types.h>
 #include <mach/ar71xx_regs.h>
 #include <mach/ath79.h>
 #include <wait_bit.h>
diff --git a/arch/mips/mach-ath79/qca956x/ddr.c b/arch/mips/mach-ath79/qca956x/ddr.c
index f9cf8daa2242..8231c142de39 100644
--- a/arch/mips/mach-ath79/qca956x/ddr.c
+++ b/arch/mips/mach-ath79/qca956x/ddr.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/addrspace.h>
diff --git a/arch/mips/mach-ath79/reset.c b/arch/mips/mach-ath79/reset.c
index 6ecde8a39ff1..d4d6b02808ce 100644
--- a/arch/mips/mach-ath79/reset.c
+++ b/arch/mips/mach-ath79/reset.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <stdio.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/arch/mips/mach-bmips/include/ioremap.h b/arch/mips/mach-bmips/include/ioremap.h
index 99ea03e6a708..fea55d8287a8 100644
--- a/arch/mips/mach-bmips/include/ioremap.h
+++ b/arch/mips/mach-bmips/include/ioremap.h
@@ -2,6 +2,7 @@
 #ifndef __ASM_MACH_BMIPS_IOREMAP_H
 #define __ASM_MACH_BMIPS_IOREMAP_H
 
+#include <compiler.h>
 #include <linux/types.h>
 
 /*
diff --git a/arch/mips/mach-jz47xx/include/mach/jz4780.h b/arch/mips/mach-jz47xx/include/mach/jz4780.h
index 4422e503ed2a..6f75b38901f0 100644
--- a/arch/mips/mach-jz47xx/include/mach/jz4780.h
+++ b/arch/mips/mach-jz47xx/include/mach/jz4780.h
@@ -82,6 +82,8 @@
 
 #ifndef __ASSEMBLY__
 
+#include <compiler.h>
+#include <linux/types.h>
 u32 sdram_size(int bank);
 
 const u32 jz4780_clk_get_efuse_clk(void);
diff --git a/arch/mips/mach-jz47xx/include/mach/jz4780_dram.h b/arch/mips/mach-jz47xx/include/mach/jz4780_dram.h
index 61cc1489889a..4ac0d61f5d1d 100644
--- a/arch/mips/mach-jz47xx/include/mach/jz4780_dram.h
+++ b/arch/mips/mach-jz47xx/include/mach/jz4780_dram.h
@@ -12,6 +12,7 @@
 /*
  * DDR
  */
+#include <asm/types.h>
 #include <linux/bitops.h>
 #define DDRC_ST				0x0
 #define DDRC_CFG			0x4
diff --git a/arch/mips/mach-jz47xx/jz4780/gpio.c b/arch/mips/mach-jz47xx/jz4780/gpio.c
index d4884e7fa9f1..1787de5fe4c6 100644
--- a/arch/mips/mach-jz47xx/jz4780/gpio.c
+++ b/arch/mips/mach-jz47xx/jz4780/gpio.c
@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0+
 
+#include <compiler.h>
 #include <config.h>
 #include <common.h>
 #include <asm/io.h>
diff --git a/arch/mips/mach-jz47xx/jz4780/jz4780.c b/arch/mips/mach-jz47xx/jz4780/jz4780.c
index 63a87635c25a..4cc2f02b0fd2 100644
--- a/arch/mips/mach-jz47xx/jz4780/jz4780.c
+++ b/arch/mips/mach-jz47xx/jz4780/jz4780.c
@@ -17,6 +17,7 @@
 #include <asm/io.h>
 #include <asm/sections.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <mach/jz4780.h>
 #include <mach/jz4780_dram.h>
 #include <mmc.h>
diff --git a/arch/mips/mach-jz47xx/jz4780/pll.c b/arch/mips/mach-jz47xx/jz4780/pll.c
index ac76a507355e..e839db78df8c 100644
--- a/arch/mips/mach-jz47xx/jz4780/pll.c
+++ b/arch/mips/mach-jz47xx/jz4780/pll.c
@@ -6,10 +6,12 @@
  * Author: Paul Burton <paul.burton@imgtec.com>
  */
 
+#include <compiler.h>
 #include <config.h>
 #include <common.h>
 #include <stdio.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
diff --git a/arch/mips/mach-jz47xx/jz4780/reset.c b/arch/mips/mach-jz47xx/jz4780/reset.c
index bf6addccb5de..ef0f77b43c8e 100644
--- a/arch/mips/mach-jz47xx/jz4780/reset.c
+++ b/arch/mips/mach-jz47xx/jz4780/reset.c
@@ -6,6 +6,7 @@
  * Author: Paul Burton <paul.burton@imgtec.com>
  */
 
+#include <compiler.h>
 #include <config.h>
 #include <common.h>
 #include <asm/io.h>
diff --git a/arch/mips/mach-jz47xx/jz4780/sdram.c b/arch/mips/mach-jz47xx/jz4780/sdram.c
index 690f3c5601da..c0d69aa455eb 100644
--- a/arch/mips/mach-jz47xx/jz4780/sdram.c
+++ b/arch/mips/mach-jz47xx/jz4780/sdram.c
@@ -10,9 +10,11 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <hang.h>
 #include <init.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <mach/jz4780.h>
diff --git a/arch/mips/mach-jz47xx/jz4780/timer.c b/arch/mips/mach-jz47xx/jz4780/timer.c
index 82bb9e8c3bfa..aadbe040921c 100644
--- a/arch/mips/mach-jz47xx/jz4780/timer.c
+++ b/arch/mips/mach-jz47xx/jz4780/timer.c
@@ -6,6 +6,7 @@
  * Author: Paul Burton <paul.burton@imgtec.com>
  */
 
+#include <compiler.h>
 #include <config.h>
 #include <common.h>
 #include <div64.h>
@@ -16,6 +17,7 @@
 #include <asm/mipsregs.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 #include <mach/jz4780.h>
 
 #define TCU_TSR		0x1C	/* Timer Stop Register */
diff --git a/arch/mips/mach-mscc/gpio.c b/arch/mips/mach-mscc/gpio.c
index d6b4c5d7684b..cbc74dd66021 100644
--- a/arch/mips/mach-mscc/gpio.c
+++ b/arch/mips/mach-mscc/gpio.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 
 void mscc_gpio_set_alternate(int gpio, int mode)
diff --git a/arch/mips/mach-mscc/include/ioremap.h b/arch/mips/mach-mscc/include/ioremap.h
index 9024364a57f2..d5fc97ba8fa5 100644
--- a/arch/mips/mach-mscc/include/ioremap.h
+++ b/arch/mips/mach-mscc/include/ioremap.h
@@ -6,6 +6,7 @@
 #ifndef __ASM_MACH_MSCC_IOREMAP_H
 #define __ASM_MACH_MSCC_IOREMAP_H
 
+#include <compiler.h>
 #include <linux/types.h>
 #include <mach/common.h>
 
diff --git a/arch/mips/mach-mscc/include/mach/common.h b/arch/mips/mach-mscc/include/mach/common.h
index 8f9a9c280b4a..e701d325d1c9 100644
--- a/arch/mips/mach-mscc/include/mach/common.h
+++ b/arch/mips/mach-mscc/include/mach/common.h
@@ -45,6 +45,7 @@
 /* Common utility functions */
 
 /*
+#include <asm/types.h>
  * Perform a number of NOP instructions, blocks of 8 instructions.
  * The (inlined) function will not affect cache or processor state.
  */
diff --git a/arch/mips/mach-mscc/include/mach/ddr.h b/arch/mips/mach-mscc/include/mach/ddr.h
index 8c1f14773ecc..d4461d74e30d 100644
--- a/arch/mips/mach-mscc/include/mach/ddr.h
+++ b/arch/mips/mach-mscc/include/mach/ddr.h
@@ -6,10 +6,12 @@
 #ifndef __ASM_MACH_DDR_H
 #define __ASM_MACH_DDR_H
 
+#include <compiler.h>
 #include <stdbool.h>
 #include <asm/cacheops.h>
 #include <asm/io.h>
 #include <asm/reboot.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <mach/common.h>
 
diff --git a/arch/mips/mach-mscc/include/mach/jr2/jr2.h b/arch/mips/mach-mscc/include/mach/jr2/jr2.h
index 3a779e703549..1677916f10d6 100644
--- a/arch/mips/mach-mscc/include/mach/jr2/jr2.h
+++ b/arch/mips/mach-mscc/include/mach/jr2/jr2.h
@@ -8,6 +8,7 @@
 #ifndef _MSCC_JR2_H_
 #define _MSCC_JR2_H_
 
+#include <compiler.h>
 /*
  * Target offset base(s)
  */
diff --git a/arch/mips/mach-mscc/include/mach/luton/luton.h b/arch/mips/mach-mscc/include/mach/luton/luton.h
index dda665fc154f..5ea6a364eeec 100644
--- a/arch/mips/mach-mscc/include/mach/luton/luton.h
+++ b/arch/mips/mach-mscc/include/mach/luton/luton.h
@@ -8,6 +8,8 @@
 #ifndef _MSCC_OCELOT_H_
 #define _MSCC_OCELOT_H_
 
+#include <compiler.h>
+
 /*
  * Target offset base(s)
  */
diff --git a/arch/mips/mach-mscc/include/mach/ocelot/ocelot.h b/arch/mips/mach-mscc/include/mach/ocelot/ocelot.h
index 72b07c33cd0a..b73e37feef67 100644
--- a/arch/mips/mach-mscc/include/mach/ocelot/ocelot.h
+++ b/arch/mips/mach-mscc/include/mach/ocelot/ocelot.h
@@ -8,6 +8,8 @@
 #ifndef _MSCC_OCELOT_H_
 #define _MSCC_OCELOT_H_
 
+#include <compiler.h>
+
 /*
  * Target offset base(s)
  */
diff --git a/arch/mips/mach-mscc/include/mach/serval/serval.h b/arch/mips/mach-mscc/include/mach/serval/serval.h
index a78c6e59bb05..62eb1f697409 100644
--- a/arch/mips/mach-mscc/include/mach/serval/serval.h
+++ b/arch/mips/mach-mscc/include/mach/serval/serval.h
@@ -8,6 +8,8 @@
 #ifndef _MSCC_SERVAL_H_
 #define _MSCC_SERVAL_H_
 
+#include <compiler.h>
+
 /*
  * Target offset base(s)
  */
diff --git a/arch/mips/mach-mscc/include/mach/servalt/servalt.h b/arch/mips/mach-mscc/include/mach/servalt/servalt.h
index 4d7d0886dd69..a8eab372a92f 100644
--- a/arch/mips/mach-mscc/include/mach/servalt/servalt.h
+++ b/arch/mips/mach-mscc/include/mach/servalt/servalt.h
@@ -8,6 +8,8 @@
 #ifndef _MSCC_SERVALT_H_
 #define _MSCC_SERVALT_H_
 
+#include <compiler.h>
+
 /*
  * Target offset base(s)
  */
diff --git a/arch/mips/mach-mscc/include/mach/tlb.h b/arch/mips/mach-mscc/include/mach/tlb.h
index ebd8ad0dc1a5..18266b14dc68 100644
--- a/arch/mips/mach-mscc/include/mach/tlb.h
+++ b/arch/mips/mach-mscc/include/mach/tlb.h
@@ -7,6 +7,7 @@
 #define __ASM_MACH_TLB_H
 
 #include <asm/mipsregs.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <mach/common.h>
 #include <linux/sizes.h>
diff --git a/arch/mips/mach-mscc/phy.c b/arch/mips/mach-mscc/phy.c
index 83d3e5bdd28f..acfe6bb131b6 100644
--- a/arch/mips/mach-mscc/phy.c
+++ b/arch/mips/mach-mscc/phy.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <log.h>
 #include <asm/io.h>
+#include <asm/types.h>
 
 int mscc_phy_rd_wr(u8 read,
 		   u32 miimdev,
diff --git a/arch/mips/mach-mscc/reset.c b/arch/mips/mach-mscc/reset.c
index a1214573b51a..6bd5da4ef67f 100644
--- a/arch/mips/mach-mscc/reset.c
+++ b/arch/mips/mach-mscc/reset.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <asm/types.h>
 
 #include <asm/sections.h>
 #include <asm/io.h>
diff --git a/arch/mips/mach-mtmips/ddr_cal.c b/arch/mips/mach-mtmips/ddr_cal.c
index 1f2f12879b2c..1b0cd2fc6d87 100644
--- a/arch/mips/mach-mtmips/ddr_cal.c
+++ b/arch/mips/mach-mtmips/ddr_cal.c
@@ -6,9 +6,12 @@
  */
 
 #include <common.h>
+#include <compiler.h>
+#include <stdbool.h>
 #include <asm/addrspace.h>
 #include <asm/cacheops.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/io.h>
 #include <linux/kernel.h>
diff --git a/arch/mips/mach-mtmips/ddr_init.c b/arch/mips/mach-mtmips/ddr_init.c
index 6c6d0933f2ea..290355f538e3 100644
--- a/arch/mips/mach-mtmips/ddr_init.c
+++ b/arch/mips/mach-mtmips/ddr_init.c
@@ -6,10 +6,12 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/io.h>
 #include <linux/sizes.h>
+#include <linux/types.h>
 #include <mach/ddr.h>
 #include <mach/mc.h>
 
diff --git a/arch/mips/mach-mtmips/include/mach/ddr.h b/arch/mips/mach-mtmips/include/mach/ddr.h
index f92198137b1a..e0ecb42726e5 100644
--- a/arch/mips/mach-mtmips/include/mach/ddr.h
+++ b/arch/mips/mach-mtmips/include/mach/ddr.h
@@ -8,6 +8,7 @@
 #ifndef _MTMIPS_DDR_H_
 #define _MTMIPS_DDR_H_
 
+#include <compiler.h>
 #include <linux/io.h>
 #include <linux/types.h>
 
diff --git a/arch/mips/mach-mtmips/mt7628/ddr.c b/arch/mips/mach-mtmips/mt7628/ddr.c
index b091f2ecffc7..c63f7bcb4e46 100644
--- a/arch/mips/mach-mtmips/mt7628/ddr.c
+++ b/arch/mips/mach-mtmips/mt7628/ddr.c
@@ -6,8 +6,10 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <asm/addrspace.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/sizes.h>
diff --git a/arch/mips/mach-mtmips/mt7628/init.c b/arch/mips/mach-mtmips/mt7628/init.c
index 8bf918b3f259..4c2623a360f6 100644
--- a/arch/mips/mach-mtmips/mt7628/init.c
+++ b/arch/mips/mach-mtmips/mt7628/init.c
@@ -15,6 +15,7 @@
 #include <dm/uclass.h>
 #include <dt-bindings/clock/mt7628-clk.h>
 #include <linux/io.h>
+#include <linux/types.h>
 #include "mt7628.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/mips/mach-mtmips/mt7628/serial.c b/arch/mips/mach-mtmips/mt7628/serial.c
index a7d324792d73..17793927ed77 100644
--- a/arch/mips/mach-mtmips/mt7628/serial.c
+++ b/arch/mips/mach-mtmips/mt7628/serial.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <asm/io.h>
 #include "mt7628.h"
 
diff --git a/arch/mips/mach-mtmips/spl.c b/arch/mips/mach-mtmips/spl.c
index 95201b8d7ab2..2cb2ecf0e59f 100644
--- a/arch/mips/mach-mtmips/spl.c
+++ b/arch/mips/mach-mtmips/spl.c
@@ -11,6 +11,7 @@
 #include <asm/sections.h>
 #include <linux/libfdt.h>
 #include <linux/sizes.h>
+#include <linux/types.h>
 #include <mach/serial.h>
 
 void __noreturn board_init_f(ulong dummy)
diff --git a/arch/mips/mach-octeon/cache.c b/arch/mips/mach-octeon/cache.c
index 9a88bb97c73a..8ccaa2a7f3f1 100644
--- a/arch/mips/mach-octeon/cache.c
+++ b/arch/mips/mach-octeon/cache.c
@@ -4,6 +4,7 @@
  */
 
 #include <cpu_func.h>
+#include <linux/types.h>
 
 /*
  * The Octeon platform is cache coherent and cache flushes and invalidates
diff --git a/arch/mips/mach-octeon/clock.c b/arch/mips/mach-octeon/clock.c
index 05a312b22985..eb341b1ac382 100644
--- a/arch/mips/mach-octeon/clock.c
+++ b/arch/mips/mach-octeon/clock.c
@@ -6,6 +6,7 @@
 #include <compiler.h>
 #include <time.h>
 #include <asm/global_data.h>
+#include <linux/types.h>
 #include <mach/clock.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/mips/mach-octeon/cpu.c b/arch/mips/mach-octeon/cpu.c
index 1831f1dfa8c2..5ac8b5047e26 100644
--- a/arch/mips/mach-octeon/cpu.c
+++ b/arch/mips/mach-octeon/cpu.c
@@ -3,6 +3,7 @@
  * Copyright (C) 2020 Marvell International Ltd.
  */
 
+#include <compiler.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/bitfield.h>
diff --git a/arch/mips/mach-octeon/dram.c b/arch/mips/mach-octeon/dram.c
index ff7a59f2ab8a..0d0c9f358d49 100644
--- a/arch/mips/mach-octeon/dram.c
+++ b/arch/mips/mach-octeon/dram.c
@@ -7,6 +7,7 @@
 #include <ram.h>
 #include <asm/global_data.h>
 #include <linux/compat.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/mips/mach-octeon/include/ioremap.h b/arch/mips/mach-octeon/include/ioremap.h
index 59b75008a259..43b241220849 100644
--- a/arch/mips/mach-octeon/include/ioremap.h
+++ b/arch/mips/mach-octeon/include/ioremap.h
@@ -2,6 +2,7 @@
 #ifndef __ASM_MACH_OCTEON_IOREMAP_H
 #define __ASM_MACH_OCTEON_IOREMAP_H
 
+#include <compiler.h>
 #include <linux/types.h>
 
 /*
diff --git a/arch/mips/mach-pic32/cpu.c b/arch/mips/mach-pic32/cpu.c
index bc76152ed3da..739ecec666cd 100644
--- a/arch/mips/mach-pic32/cpu.c
+++ b/arch/mips/mach-pic32/cpu.c
@@ -6,11 +6,13 @@
  */
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <dm.h>
 #include <init.h>
 #include <malloc.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <linux/types.h>
 #include <mach/pic32.h>
 #include <mach/ddr.h>
 #include <dt-bindings/clock/microchip,clock.h>
diff --git a/arch/mips/mach-pic32/include/mach/ddr.h b/arch/mips/mach-pic32/include/mach/ddr.h
index 1b2391e01600..fe15bb1504eb 100644
--- a/arch/mips/mach-pic32/include/mach/ddr.h
+++ b/arch/mips/mach-pic32/include/mach/ddr.h
@@ -8,6 +8,7 @@
 #define __MICROCHIP_PIC32_DDR_H
 
 /* called by dram_init() function */
+#include <asm/types.h>
 void ddr2_phy_init(void);
 void ddr2_ctrl_init(void);
 phys_size_t ddr2_calculate_size(void);
diff --git a/arch/mips/mach-pic32/include/mach/pic32.h b/arch/mips/mach-pic32/include/mach/pic32.h
index 69015334b946..1fdfec5aa544 100644
--- a/arch/mips/mach-pic32/include/mach/pic32.h
+++ b/arch/mips/mach-pic32/include/mach/pic32.h
@@ -7,7 +7,9 @@
 #ifndef __PIC32_REGS_H__
 #define __PIC32_REGS_H__
 
+#include <compiler.h>
 #include <asm/io.h>
+#include <asm/types.h>
 
 /* System Configuration */
 #define PIC32_CFG_BASE		0x1f800000
diff --git a/arch/mips/mach-pic32/reset.c b/arch/mips/mach-pic32/reset.c
index 8071b13f7b48..8c33ff7faf9d 100644
--- a/arch/mips/mach-pic32/reset.c
+++ b/arch/mips/mach-pic32/reset.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <asm/io.h>
 #include <mach/pic32.h>
 
diff --git a/arch/nds32/cpu/n1213/ag101/timer.c b/arch/nds32/cpu/n1213/ag101/timer.c
index 394fc10ec3ad..5a153a5995ef 100644
--- a/arch/nds32/cpu/n1213/ag101/timer.c
+++ b/arch/nds32/cpu/n1213/ag101/timer.c
@@ -67,6 +67,7 @@ int timer_init(void)
 /*
  * reset time
  */
+#include <linux/types.h>
 void reset_timer_masked(void)
 {
 	struct fttmr010 *tmr = (struct fttmr010 *)CONFIG_FTTMR010_BASE;
diff --git a/arch/nds32/include/asm/bootm.h b/arch/nds32/include/asm/bootm.h
index 804f8581b6e7..aa8009fc8b7d 100644
--- a/arch/nds32/include/asm/bootm.h
+++ b/arch/nds32/include/asm/bootm.h
@@ -9,6 +9,7 @@
 #define NDS32_BOOTM_H
 
 #include <asm/setup.h>
+#include <asm/types.h>
 
 extern void udc_disconnect(void);
 
diff --git a/arch/nds32/include/asm/io.h b/arch/nds32/include/asm/io.h
index fdfc574afc05..6555d3605b72 100644
--- a/arch/nds32/include/asm/io.h
+++ b/arch/nds32/include/asm/io.h
@@ -71,6 +71,7 @@ static inline phys_addr_t map_to_sysmem(const void *ptr)
 #define __arch_putw(v, a)		(*(unsigned short *)(a) = (v))
 #define __arch_putl(v, a)		(*(unsigned int *)(a) = (v))
 
+#include <compiler.h>
 extern void __raw_writesb(unsigned int addr, const void *data, int bytelen);
 extern void __raw_writesw(unsigned int addr, const void *data, int wordlen);
 extern void __raw_writesl(unsigned int addr, const void *data, int longlen);
diff --git a/arch/nds32/include/asm/setup.h b/arch/nds32/include/asm/setup.h
index 8217bbf6fe0e..fcaa43a82474 100644
--- a/arch/nds32/include/asm/setup.h
+++ b/arch/nds32/include/asm/setup.h
@@ -13,6 +13,7 @@
 #ifndef __ASMNDS32_SETUP_H
 #define __ASMNDS32_SETUP_H
 
+#include <asm/types.h>
 #define COMMAND_LINE_SIZE 256
 
 /* The list ends with an ATAG_NONE node. */
diff --git a/arch/nds32/lib/boot.c b/arch/nds32/lib/boot.c
index da2fd36a16c4..5d6d267d7e58 100644
--- a/arch/nds32/lib/boot.c
+++ b/arch/nds32/lib/boot.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <linux/types.h>
 
 unsigned long do_go_exec(ulong (*entry)(int, char * const []),
 			 int argc, char *const argv[])
diff --git a/arch/nds32/lib/bootm.c b/arch/nds32/lib/bootm.c
index 5532d515b733..47e8f90c4179 100644
--- a/arch/nds32/lib/bootm.c
+++ b/arch/nds32/lib/bootm.c
@@ -17,6 +17,7 @@
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <u-boot/zlib.h>
 #include <asm/byteorder.h>
 #include <asm/bootm.h>
diff --git a/arch/nios2/cpu/interrupts.c b/arch/nios2/cpu/interrupts.c
index 90cabb67571b..fe40eaaa02e6 100644
--- a/arch/nios2/cpu/interrupts.c
+++ b/arch/nios2/cpu/interrupts.c
@@ -14,6 +14,7 @@
 #include <asm/types.h>
 #include <asm/io.h>
 #include <asm/ptrace.h>
+#include <linux/types.h>
 
 /*************************************************************************/
 struct	irq_action {
diff --git a/arch/nios2/include/asm/dma-mapping.h b/arch/nios2/include/asm/dma-mapping.h
index 65f67bc1f442..1dd7aa96e409 100644
--- a/arch/nios2/include/asm/dma-mapping.h
+++ b/arch/nios2/include/asm/dma-mapping.h
@@ -3,6 +3,7 @@
 
 #include <memalign.h>
 #include <asm/io.h>
+#include <linux/types.h>
 
 /*
  * dma_alloc_coherent() return cache-line aligned allocation which is mapped
diff --git a/arch/nios2/include/asm/global_data.h b/arch/nios2/include/asm/global_data.h
index 1a0e7d25fa3b..4c9b6db070ae 100644
--- a/arch/nios2/include/asm/global_data.h
+++ b/arch/nios2/include/asm/global_data.h
@@ -7,6 +7,7 @@
 #define __ASM_NIOS2_GLOBALDATA_H_
 
 /* Architecture-specific global data */
+#include <asm/types.h>
 struct arch_global_data {
 	u32 dcache_line_size;
 	u32 icache_line_size;
diff --git a/arch/nios2/include/asm/io.h b/arch/nios2/include/asm/io.h
index b22134cf29c4..1e989c1e657e 100644
--- a/arch/nios2/include/asm/io.h
+++ b/arch/nios2/include/asm/io.h
@@ -8,6 +8,7 @@
 #define __ASM_NIOS2_IO_H_
 
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <linux/string.h>
 
 static inline void sync(void)
diff --git a/arch/nios2/lib/bootm.c b/arch/nios2/lib/bootm.c
index 59099a4d5eae..d1be89a99174 100644
--- a/arch/nios2/lib/bootm.c
+++ b/arch/nios2/lib/bootm.c
@@ -11,6 +11,7 @@
 #include <irq_func.h>
 #include <log.h>
 #include <vsprintf.h>
+#include <linux/types.h>
 
 #define NIOS_MAGIC 0x534f494e /* enable command line and initrd passing */
 
diff --git a/arch/powerpc/cpu/mpc83xx/arbiter/arbiter.h b/arch/powerpc/cpu/mpc83xx/arbiter/arbiter.h
index 10a47e498768..b0740019e464 100644
--- a/arch/powerpc/cpu/mpc83xx/arbiter/arbiter.h
+++ b/arch/powerpc/cpu/mpc83xx/arbiter/arbiter.h
@@ -1,3 +1,4 @@
+#include <linux/types.h>
 	const __be32 acr_mask =
 #ifndef CONFIG_ACR_PIPE_DEP_UNSET
 		ACR_PIPE_DEP |
diff --git a/arch/powerpc/cpu/mpc83xx/cpu.c b/arch/powerpc/cpu/mpc83xx/cpu.c
index 0954553d65b7..866ff0b6d3dd 100644
--- a/arch/powerpc/cpu/mpc83xx/cpu.c
+++ b/arch/powerpc/cpu/mpc83xx/cpu.c
@@ -32,6 +32,7 @@
 #include <linux/immap_qe.h>
 #include <asm/io.h>
 #endif
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/powerpc/cpu/mpc83xx/cpu_init.c b/arch/powerpc/cpu/mpc83xx/cpu_init.c
index b9e5a90cfbd3..38e2785ebfff 100644
--- a/arch/powerpc/cpu/mpc83xx/cpu_init.c
+++ b/arch/powerpc/cpu/mpc83xx/cpu_init.c
@@ -16,6 +16,7 @@
 #endif
 #include <linux/delay.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include "lblaw/lblaw.h"
 #include "elbc/elbc.h"
diff --git a/arch/powerpc/cpu/mpc83xx/ecc.c b/arch/powerpc/cpu/mpc83xx/ecc.c
index b32370fa4d9c..54d6d6fdb460 100644
--- a/arch/powerpc/cpu/mpc83xx/ecc.c
+++ b/arch/powerpc/cpu/mpc83xx/ecc.c
@@ -7,12 +7,14 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <irq_func.h>
 #include <mpc83xx.h>
 #include <command.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/ppc.h>
+#include <asm/types.h>
 #include <linux/string.h>
 
 #if defined(CONFIG_DDR_ECC) && defined(CONFIG_DDR_ECC_CMD)
diff --git a/arch/powerpc/cpu/mpc83xx/fdt.c b/arch/powerpc/cpu/mpc83xx/fdt.c
index a2705b2b0e35..b9fe1185850f 100644
--- a/arch/powerpc/cpu/mpc83xx/fdt.c
+++ b/arch/powerpc/cpu/mpc83xx/fdt.c
@@ -13,6 +13,7 @@
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <asm/ppc.h>
+#include <linux/types.h>
 
 extern void ft_qe_setup(void *blob);
 
diff --git a/arch/powerpc/cpu/mpc83xx/initreg/initreg.h b/arch/powerpc/cpu/mpc83xx/initreg/initreg.h
index 63aa5c946696..1d4984bfc306 100644
--- a/arch/powerpc/cpu/mpc83xx/initreg/initreg.h
+++ b/arch/powerpc/cpu/mpc83xx/initreg/initreg.h
@@ -1,3 +1,4 @@
+#include <linux/types.h>
 #define SPCR_PCIHPE_MASK	0x10000000
 #define SPCR_PCIPR_MASK		0x03000000
 #define SPCR_OPT_MASK		0x00800000
diff --git a/arch/powerpc/cpu/mpc83xx/interrupts.c b/arch/powerpc/cpu/mpc83xx/interrupts.c
index 878d88321a1d..f5cbf4f09d6b 100644
--- a/arch/powerpc/cpu/mpc83xx/interrupts.c
+++ b/arch/powerpc/cpu/mpc83xx/interrupts.c
@@ -14,6 +14,7 @@
 #include <asm/ppc.h>
 #include <asm/ptrace.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/powerpc/cpu/mpc83xx/pci.c b/arch/powerpc/cpu/mpc83xx/pci.c
index 4d3bbc1dfc91..f3ec20483b38 100644
--- a/arch/powerpc/cpu/mpc83xx/pci.c
+++ b/arch/powerpc/cpu/mpc83xx/pci.c
@@ -13,6 +13,7 @@
 #include <asm/bitops.h>
 #include <asm/global_data.h>
 #include <asm/ppc.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 
diff --git a/arch/powerpc/cpu/mpc83xx/pcie.c b/arch/powerpc/cpu/mpc83xx/pcie.c
index 38871cc0569f..a106c5789287 100644
--- a/arch/powerpc/cpu/mpc83xx/pcie.c
+++ b/arch/powerpc/cpu/mpc83xx/pcie.c
@@ -14,6 +14,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/ppc.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
 
diff --git a/arch/powerpc/cpu/mpc83xx/qe_io.c b/arch/powerpc/cpu/mpc83xx/qe_io.c
index 88aa68955111..d111def6f1de 100644
--- a/arch/powerpc/cpu/mpc83xx/qe_io.c
+++ b/arch/powerpc/cpu/mpc83xx/qe_io.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <asm/io.h>
 #include <asm/immap_83xx.h>
diff --git a/arch/powerpc/cpu/mpc83xx/spd_sdram.c b/arch/powerpc/cpu/mpc83xx/spd_sdram.c
index 7c8cfd7f2346..cadfc11d9ab4 100644
--- a/arch/powerpc/cpu/mpc83xx/spd_sdram.c
+++ b/arch/powerpc/cpu/mpc83xx/spd_sdram.c
@@ -169,6 +169,7 @@ long int spd_sdram()
 
 	/* Read SPD parameters with I2C */
 	CONFIG_SYS_READ_SPD(SPD_EEPROM_ADDRESS, SPD_EEPROM_OFFSET,
+#include <linux/types.h>
 		SPD_EEPROM_ADDR_LEN, (uchar *) &spd, sizeof(spd));
 #ifdef SPD_DEBUG
 	spd_debug(&spd);
diff --git a/arch/powerpc/cpu/mpc83xx/speed.c b/arch/powerpc/cpu/mpc83xx/speed.c
index d718a9a30730..0e883e9b22f3 100644
--- a/arch/powerpc/cpu/mpc83xx/speed.c
+++ b/arch/powerpc/cpu/mpc83xx/speed.c
@@ -505,6 +505,7 @@ int get_clocks(void)
  * get_bus_freq
  * return system bus freq in Hz
  *********************************************/
+#include <linux/types.h>
 ulong get_bus_freq(ulong dummy)
 {
 	return gd->arch.csb_clk;
diff --git a/arch/powerpc/cpu/mpc83xx/spl_minimal.c b/arch/powerpc/cpu/mpc83xx/spl_minimal.c
index d116b6c43297..5c1184c111ae 100644
--- a/arch/powerpc/cpu/mpc83xx/spl_minimal.c
+++ b/arch/powerpc/cpu/mpc83xx/spl_minimal.c
@@ -11,6 +11,7 @@
 #include <time.h>
 #include <asm/global_data.h>
 #include <asm/ppc.h>
+#include <linux/types.h>
 
 #include "lblaw/lblaw.h"
 #include "elbc/elbc.h"
diff --git a/arch/powerpc/cpu/mpc83xx/traps.c b/arch/powerpc/cpu/mpc83xx/traps.c
index 2ee72517ca2f..d06fc48d7132 100644
--- a/arch/powerpc/cpu/mpc83xx/traps.c
+++ b/arch/powerpc/cpu/mpc83xx/traps.c
@@ -20,6 +20,7 @@
 #include <kgdb.h>
 #include <asm/ppc.h>
 #include <asm/mpc8349_pci.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/powerpc/cpu/mpc85xx/b4860_serdes.c b/arch/powerpc/cpu/mpc85xx/b4860_serdes.c
index eb28b08239db..aec47036f135 100644
--- a/arch/powerpc/cpu/mpc85xx/b4860_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/b4860_serdes.c
@@ -7,6 +7,7 @@
 #include <asm/fsl_serdes.h>
 #include <asm/ppc.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 #include "fsl_corenet2_serdes.h"
 
diff --git a/arch/powerpc/cpu/mpc85xx/bsc9132_serdes.c b/arch/powerpc/cpu/mpc85xx/bsc9132_serdes.c
index f5c9d1d81755..9a446535ed8e 100644
--- a/arch/powerpc/cpu/mpc85xx/bsc9132_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/bsc9132_serdes.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 
 #define SRDS1_MAX_LANES		4
diff --git a/arch/powerpc/cpu/mpc85xx/c29x_serdes.c b/arch/powerpc/cpu/mpc85xx/c29x_serdes.c
index 8c61fd471bc7..8bff23cbbf80 100644
--- a/arch/powerpc/cpu/mpc85xx/c29x_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/c29x_serdes.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 
 #define SRDS1_MAX_LANES		4
diff --git a/arch/powerpc/cpu/mpc85xx/cmd_errata.c b/arch/powerpc/cpu/mpc85xx/cmd_errata.c
index 1a3df5bff48b..27dbdf50b656 100644
--- a/arch/powerpc/cpu/mpc85xx/cmd_errata.c
+++ b/arch/powerpc/cpu/mpc85xx/cmd_errata.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <init.h>
 #include <stdio.h>
 #include <linux/compiler.h>
@@ -13,6 +14,7 @@
 #include <asm/ppc.h>
 #include <fsl_usb.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include "fsl_corenet_serdes.h"
 
 #ifdef CONFIG_SYS_FSL_ERRATUM_A004849
diff --git a/arch/powerpc/cpu/mpc85xx/commproc.c b/arch/powerpc/cpu/mpc85xx/commproc.c
index 79ad806dbdf0..9c6b8b759937 100644
--- a/arch/powerpc/cpu/mpc85xx/commproc.c
+++ b/arch/powerpc/cpu/mpc85xx/commproc.c
@@ -27,6 +27,7 @@
 #include <asm/cpm_85xx.h>
 #include <asm/global_data.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/powerpc/cpu/mpc85xx/cpu.c b/arch/powerpc/cpu/mpc85xx/cpu.c
index da578d6c9005..f61ad7c740b5 100644
--- a/arch/powerpc/cpu/mpc85xx/cpu.c
+++ b/arch/powerpc/cpu/mpc85xx/cpu.c
@@ -8,6 +8,7 @@
  * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
  */
 
+#include <compiler.h>
 #include <config.h>
 #include <common.h>
 #include <cpu_func.h>
@@ -35,6 +36,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init.c b/arch/powerpc/cpu/mpc85xx/cpu_init.c
index 7d52b2acc650..44d004dce5eb 100644
--- a/arch/powerpc/cpu/mpc85xx/cpu_init.c
+++ b/arch/powerpc/cpu/mpc85xx/cpu_init.c
@@ -10,6 +10,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <display_options.h>
 #include <env.h>
 #include <init.h>
@@ -39,6 +40,7 @@
 #include <linux/compiler.h>
 #include <linux/delay.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "mp.h"
 #ifdef CONFIG_CHAIN_OF_TRUST
 #include <fsl_validate.h>
diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init_early.c b/arch/powerpc/cpu/mpc85xx/cpu_init_early.c
index 4195ecc5c98f..867fe124292a 100644
--- a/arch/powerpc/cpu/mpc85xx/cpu_init_early.c
+++ b/arch/powerpc/cpu/mpc85xx/cpu_init_early.c
@@ -10,6 +10,7 @@
 #include <asm/mmu.h>
 #include <asm/fsl_law.h>
 #include <asm/io.h>
+#include <asm/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/powerpc/cpu/mpc85xx/ether_fcc.c b/arch/powerpc/cpu/mpc85xx/ether_fcc.c
index df1981cc7aeb..f2b108038ce6 100644
--- a/arch/powerpc/cpu/mpc85xx/ether_fcc.c
+++ b/arch/powerpc/cpu/mpc85xx/ether_fcc.c
@@ -15,6 +15,7 @@
  * Basic ET HW initialization and packet RX/TX routines
  *
  * This code will not perform the IO port configuration. This should be
+#include <linux/types.h>
  * done in the iop_conf_t structure specific for the board.
  *
  * TODO:
diff --git a/arch/powerpc/cpu/mpc85xx/fdt.c b/arch/powerpc/cpu/mpc85xx/fdt.c
index 4864a6809a49..184ff257d492 100644
--- a/arch/powerpc/cpu/mpc85xx/fdt.c
+++ b/arch/powerpc/cpu/mpc85xx/fdt.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <clock_legacy.h>
+#include <compiler.h>
 #include <env.h>
 #include <log.h>
 #include <stdio.h>
@@ -31,6 +32,7 @@
 #include <fsl_fman.h>
 #endif
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c b/arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c
index c6a7995e873d..e73f3d08b2e8 100644
--- a/arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c
@@ -4,12 +4,14 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <log.h>
 #include <stdio.h>
 #include <asm/fsl_serdes.h>
 #include <asm/io.h>
 #include <asm/ppc.h>
 #include <asm/fsl_law.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <fsl_errata.h>
diff --git a/arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.h b/arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.h
index 4e2d44427464..76118b45cc17 100644
--- a/arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.h
+++ b/arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.h
@@ -6,6 +6,7 @@
 #ifndef __FSL_CORENET2_SERDES_H
 #define __FSL_CORENET2_SERDES_H
 
+#include <asm/types.h>
 int is_serdes_prtcl_valid(int serdes, u32 prtcl);
 int serdes_lane_enabled(int lane);
 #endif /* __FSL_CORENET2_SERDES_H */
diff --git a/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c b/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c
index 0173fab44498..ddfc5cf8e4e7 100644
--- a/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c
@@ -19,6 +19,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include "fsl_corenet_serdes.h"
 
 /*
diff --git a/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.h b/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.h
index e95dc485814f..705632eaa395 100644
--- a/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.h
+++ b/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.h
@@ -8,6 +8,7 @@
 #ifndef __FSL_CORENET_SERDES_H
 #define __FSL_CORENET_SERDES_H
 
+#include <linux/types.h>
 enum srds_bank {
 	FSL_SRDS_BANK_1  = 0,
 	FSL_SRDS_BANK_2  = 1,
diff --git a/arch/powerpc/cpu/mpc85xx/interrupts.c b/arch/powerpc/cpu/mpc85xx/interrupts.c
index 5a491399d998..c314c65ff463 100644
--- a/arch/powerpc/cpu/mpc85xx/interrupts.c
+++ b/arch/powerpc/cpu/mpc85xx/interrupts.c
@@ -11,6 +11,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <irq_func.h>
 #include <log.h>
 #include <time.h>
@@ -23,6 +24,7 @@
 #endif
 #include <asm/ptrace.h>
 #include <asm/ppc.h>
+#include <linux/types.h>
 
 void interrupt_init_cpu(unsigned *decrementer_count)
 {
diff --git a/arch/powerpc/cpu/mpc85xx/liodn.c b/arch/powerpc/cpu/mpc85xx/liodn.c
index 340d563d7d4d..8703748cc2bf 100644
--- a/arch/powerpc/cpu/mpc85xx/liodn.c
+++ b/arch/powerpc/cpu/mpc85xx/liodn.c
@@ -10,6 +10,7 @@
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <asm/immap_85xx.h>
 #include <asm/io.h>
diff --git a/arch/powerpc/cpu/mpc85xx/mp.c b/arch/powerpc/cpu/mpc85xx/mp.c
index 4c7e2f8612a7..542914842480 100644
--- a/arch/powerpc/cpu/mpc85xx/mp.c
+++ b/arch/powerpc/cpu/mpc85xx/mp.c
@@ -20,6 +20,7 @@
 #include <fsl_ddr_sdram.h>
 #include <linux/delay.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "mp.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/powerpc/cpu/mpc85xx/mp.h b/arch/powerpc/cpu/mpc85xx/mp.h
index ad9950bcf590..d8cd535b0667 100644
--- a/arch/powerpc/cpu/mpc85xx/mp.h
+++ b/arch/powerpc/cpu/mpc85xx/mp.h
@@ -2,6 +2,7 @@
 #define __MPC85XX_MP_H_
 
 #include <asm/mp.h>
+#include <asm/types.h>
 
 phys_addr_t get_spin_phys_addr(void);
 u32 get_my_id(void);
diff --git a/arch/powerpc/cpu/mpc85xx/mpc8536_serdes.c b/arch/powerpc/cpu/mpc85xx/mpc8536_serdes.c
index 763f452b069e..4029075c46d8 100644
--- a/arch/powerpc/cpu/mpc85xx/mpc8536_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/mpc8536_serdes.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 
 /* PORDEVSR register */
diff --git a/arch/powerpc/cpu/mpc85xx/mpc8544_serdes.c b/arch/powerpc/cpu/mpc85xx/mpc8544_serdes.c
index cbbd6f3522cb..7636aa036582 100644
--- a/arch/powerpc/cpu/mpc85xx/mpc8544_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/mpc8544_serdes.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 
 #define SRDS1_MAX_LANES		8
diff --git a/arch/powerpc/cpu/mpc85xx/mpc8548_serdes.c b/arch/powerpc/cpu/mpc85xx/mpc8548_serdes.c
index fad7afff88bb..c9714b77641e 100644
--- a/arch/powerpc/cpu/mpc85xx/mpc8548_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/mpc8548_serdes.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 
 #define SRDS1_MAX_LANES		8
diff --git a/arch/powerpc/cpu/mpc85xx/mpc8568_serdes.c b/arch/powerpc/cpu/mpc85xx/mpc8568_serdes.c
index 1f88d0e34682..c389c06833d2 100644
--- a/arch/powerpc/cpu/mpc85xx/mpc8568_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/mpc8568_serdes.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 
 #define SRDS1_MAX_LANES		8
diff --git a/arch/powerpc/cpu/mpc85xx/mpc8569_serdes.c b/arch/powerpc/cpu/mpc85xx/mpc8569_serdes.c
index 88b8300f58c0..dd8301798a4d 100644
--- a/arch/powerpc/cpu/mpc85xx/mpc8569_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/mpc8569_serdes.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 
 #define SRDS1_MAX_LANES		4
diff --git a/arch/powerpc/cpu/mpc85xx/mpc8572_serdes.c b/arch/powerpc/cpu/mpc85xx/mpc8572_serdes.c
index d6bf5f314f6a..208ceca1f826 100644
--- a/arch/powerpc/cpu/mpc85xx/mpc8572_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/mpc8572_serdes.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 
 #define SRDS1_MAX_LANES		8
diff --git a/arch/powerpc/cpu/mpc85xx/p1010_serdes.c b/arch/powerpc/cpu/mpc85xx/p1010_serdes.c
index 7dc3512364de..b97ee95b57db 100644
--- a/arch/powerpc/cpu/mpc85xx/p1010_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/p1010_serdes.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 
 #define SRDS1_MAX_LANES		4
diff --git a/arch/powerpc/cpu/mpc85xx/p1021_serdes.c b/arch/powerpc/cpu/mpc85xx/p1021_serdes.c
index 5bb06705829f..3775fb48901d 100644
--- a/arch/powerpc/cpu/mpc85xx/p1021_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/p1021_serdes.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
 
diff --git a/arch/powerpc/cpu/mpc85xx/p1022_serdes.c b/arch/powerpc/cpu/mpc85xx/p1022_serdes.c
index 368b5eaea4dc..4aa28ae99c1e 100644
--- a/arch/powerpc/cpu/mpc85xx/p1022_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/p1022_serdes.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 
 #define SRDS1_MAX_LANES		4
diff --git a/arch/powerpc/cpu/mpc85xx/p1023_serdes.c b/arch/powerpc/cpu/mpc85xx/p1023_serdes.c
index b976b40e3339..8fa7ed5c8840 100644
--- a/arch/powerpc/cpu/mpc85xx/p1023_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/p1023_serdes.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 
 #define SRDS1_MAX_LANES		4
diff --git a/arch/powerpc/cpu/mpc85xx/p2020_serdes.c b/arch/powerpc/cpu/mpc85xx/p2020_serdes.c
index 3ff5715245d1..d453aa9f4398 100644
--- a/arch/powerpc/cpu/mpc85xx/p2020_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/p2020_serdes.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 
 #define SRDS1_MAX_LANES		4
diff --git a/arch/powerpc/cpu/mpc85xx/p2041_serdes.c b/arch/powerpc/cpu/mpc85xx/p2041_serdes.c
index c491d3d014f7..999955832a1d 100644
--- a/arch/powerpc/cpu/mpc85xx/p2041_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/p2041_serdes.c
@@ -6,6 +6,7 @@
 #include <asm/fsl_serdes.h>
 #include <asm/ppc.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 #include "fsl_corenet_serdes.h"
 
diff --git a/arch/powerpc/cpu/mpc85xx/p3041_serdes.c b/arch/powerpc/cpu/mpc85xx/p3041_serdes.c
index 53b6ee1927fb..a1828e590e16 100644
--- a/arch/powerpc/cpu/mpc85xx/p3041_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/p3041_serdes.c
@@ -6,6 +6,7 @@
 #include <asm/fsl_serdes.h>
 #include <asm/ppc.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 #include "fsl_corenet_serdes.h"
 
diff --git a/arch/powerpc/cpu/mpc85xx/p4080_serdes.c b/arch/powerpc/cpu/mpc85xx/p4080_serdes.c
index 6432b1973845..eb6ce58a87eb 100644
--- a/arch/powerpc/cpu/mpc85xx/p4080_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/p4080_serdes.c
@@ -8,6 +8,7 @@
 #include <asm/ppc.h>
 #include <asm/io.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include "fsl_corenet_serdes.h"
 
 static u8 serdes_cfg_tbl[][SRDS_MAX_LANES] = {
diff --git a/arch/powerpc/cpu/mpc85xx/p5020_serdes.c b/arch/powerpc/cpu/mpc85xx/p5020_serdes.c
index 53b6ee1927fb..a1828e590e16 100644
--- a/arch/powerpc/cpu/mpc85xx/p5020_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/p5020_serdes.c
@@ -6,6 +6,7 @@
 #include <asm/fsl_serdes.h>
 #include <asm/ppc.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 #include "fsl_corenet_serdes.h"
 
diff --git a/arch/powerpc/cpu/mpc85xx/p5040_serdes.c b/arch/powerpc/cpu/mpc85xx/p5040_serdes.c
index 5b02643ab5f8..8014352809df 100644
--- a/arch/powerpc/cpu/mpc85xx/p5040_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/p5040_serdes.c
@@ -6,6 +6,7 @@
 #include <asm/fsl_serdes.h>
 #include <asm/ppc.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 #include "fsl_corenet_serdes.h"
 
diff --git a/arch/powerpc/cpu/mpc85xx/pci.c b/arch/powerpc/cpu/mpc85xx/pci.c
index af340f2a63bb..8d28427d9d0b 100644
--- a/arch/powerpc/cpu/mpc85xx/pci.c
+++ b/arch/powerpc/cpu/mpc85xx/pci.c
@@ -12,6 +12,7 @@
 #include <stdio.h>
 #include <asm/bitops.h>
 #include <asm/cpm_85xx.h>
+#include <asm/types.h>
 #include <pci.h>
 
 #if !defined(CONFIG_FSL_PCI_INIT) && !defined(CONFIG_DM_PCI)
diff --git a/arch/powerpc/cpu/mpc85xx/portals.c b/arch/powerpc/cpu/mpc85xx/portals.c
index add179be3853..34994e31c629 100644
--- a/arch/powerpc/cpu/mpc85xx/portals.c
+++ b/arch/powerpc/cpu/mpc85xx/portals.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <asm/types.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <linux/string.h>
diff --git a/arch/powerpc/cpu/mpc85xx/qe_io.c b/arch/powerpc/cpu/mpc85xx/qe_io.c
index c5b1443058e2..985b25df708e 100644
--- a/arch/powerpc/cpu/mpc85xx/qe_io.c
+++ b/arch/powerpc/cpu/mpc85xx/qe_io.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
diff --git a/arch/powerpc/cpu/mpc85xx/serial_scc.c b/arch/powerpc/cpu/mpc85xx/serial_scc.c
index a2505d1ffc1d..858f93d5dd8b 100644
--- a/arch/powerpc/cpu/mpc85xx/serial_scc.c
+++ b/arch/powerpc/cpu/mpc85xx/serial_scc.c
@@ -16,10 +16,12 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <asm/cpm_85xx.h>
 #include <serial.h>
 #include <asm/global_data.h>
 #include <linux/compiler.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/powerpc/cpu/mpc85xx/speed.c b/arch/powerpc/cpu/mpc85xx/speed.c
index f3c6da306c49..57f99632440f 100644
--- a/arch/powerpc/cpu/mpc85xx/speed.c
+++ b/arch/powerpc/cpu/mpc85xx/speed.c
@@ -17,6 +17,7 @@
 #include <linux/compiler.h>
 #include <asm/processor.h>
 #include <asm/io.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/powerpc/cpu/mpc85xx/spl_minimal.c b/arch/powerpc/cpu/mpc85xx/spl_minimal.c
index 21b35db08df1..e79ef4ba0381 100644
--- a/arch/powerpc/cpu/mpc85xx/spl_minimal.c
+++ b/arch/powerpc/cpu/mpc85xx/spl_minimal.c
@@ -9,6 +9,7 @@
 #include <fsl_ifc.h>
 #include <asm/io.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/powerpc/cpu/mpc85xx/t1024_serdes.c b/arch/powerpc/cpu/mpc85xx/t1024_serdes.c
index 6530302e70cb..94344aafd490 100644
--- a/arch/powerpc/cpu/mpc85xx/t1024_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/t1024_serdes.c
@@ -6,6 +6,7 @@
 #include <asm/fsl_serdes.h>
 #include <asm/ppc.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 
 static u8 serdes_cfg_tbl[][SRDS_MAX_LANES] = {
diff --git a/arch/powerpc/cpu/mpc85xx/t1040_serdes.c b/arch/powerpc/cpu/mpc85xx/t1040_serdes.c
index 299b01218913..07845ac0cbd4 100644
--- a/arch/powerpc/cpu/mpc85xx/t1040_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/t1040_serdes.c
@@ -6,6 +6,7 @@
 #include <asm/fsl_serdes.h>
 #include <asm/ppc.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 
 
diff --git a/arch/powerpc/cpu/mpc85xx/t4240_serdes.c b/arch/powerpc/cpu/mpc85xx/t4240_serdes.c
index 3eae06720070..dc76f1227aba 100644
--- a/arch/powerpc/cpu/mpc85xx/t4240_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/t4240_serdes.c
@@ -6,6 +6,7 @@
 #include <asm/fsl_serdes.h>
 #include <asm/ppc.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 #include "fsl_corenet2_serdes.h"
 
diff --git a/arch/powerpc/cpu/mpc85xx/tlb.c b/arch/powerpc/cpu/mpc85xx/tlb.c
index 54b55248c14f..fef6a3155b2e 100644
--- a/arch/powerpc/cpu/mpc85xx/tlb.c
+++ b/arch/powerpc/cpu/mpc85xx/tlb.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <display_options.h>
 #include <stdio.h>
 #include <asm/bitops.h>
@@ -17,6 +18,7 @@
 #include <addr_map.h>
 #endif
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include <linux/log2.h>
 
diff --git a/arch/powerpc/cpu/mpc85xx/traps.c b/arch/powerpc/cpu/mpc85xx/traps.c
index 91021e718662..129570f87faa 100644
--- a/arch/powerpc/cpu/mpc85xx/traps.c
+++ b/arch/powerpc/cpu/mpc85xx/traps.c
@@ -29,6 +29,7 @@
 #include <irq_func.h>
 #include <kgdb.h>
 #include <asm/processor.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/powerpc/cpu/mpc86xx/cpu.c b/arch/powerpc/cpu/mpc86xx/cpu.c
index 498469750f95..6ecae3ee3c53 100644
--- a/arch/powerpc/cpu/mpc86xx/cpu.c
+++ b/arch/powerpc/cpu/mpc86xx/cpu.c
@@ -21,6 +21,7 @@
 #include <asm/fsl_law.h>
 #include <asm/ppc.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/powerpc/cpu/mpc86xx/fdt.c b/arch/powerpc/cpu/mpc86xx/fdt.c
index be6292dd6a3e..5b1fbb4ea44f 100644
--- a/arch/powerpc/cpu/mpc86xx/fdt.c
+++ b/arch/powerpc/cpu/mpc86xx/fdt.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
diff --git a/arch/powerpc/cpu/mpc86xx/interrupts.c b/arch/powerpc/cpu/mpc86xx/interrupts.c
index 3288f3913cc1..9631c5f63fd9 100644
--- a/arch/powerpc/cpu/mpc86xx/interrupts.c
+++ b/arch/powerpc/cpu/mpc86xx/interrupts.c
@@ -26,6 +26,7 @@
 #include <post.h>
 #endif
 #include <asm/ptrace.h>
+#include <linux/types.h>
 
 void interrupt_init_cpu(unsigned *decrementer_count)
 {
diff --git a/arch/powerpc/cpu/mpc86xx/mp.c b/arch/powerpc/cpu/mpc86xx/mp.c
index 9f41a32d29a9..815a79fbb2b3 100644
--- a/arch/powerpc/cpu/mpc86xx/mp.c
+++ b/arch/powerpc/cpu/mpc86xx/mp.c
@@ -14,6 +14,7 @@
 #include <asm/io.h>
 #include <asm/mp.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/powerpc/cpu/mpc86xx/mpc8610_serdes.c b/arch/powerpc/cpu/mpc86xx/mpc8610_serdes.c
index e91ebe4b1db0..ec34a717d8ba 100644
--- a/arch/powerpc/cpu/mpc86xx/mpc8610_serdes.c
+++ b/arch/powerpc/cpu/mpc86xx/mpc8610_serdes.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <asm/immap_86xx.h>
 #include <asm/fsl_serdes.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 
 #define SRDS1_MAX_LANES		4
diff --git a/arch/powerpc/cpu/mpc86xx/mpc8641_serdes.c b/arch/powerpc/cpu/mpc86xx/mpc8641_serdes.c
index 232f85c2ad9a..4983d8cd8377 100644
--- a/arch/powerpc/cpu/mpc86xx/mpc8641_serdes.c
+++ b/arch/powerpc/cpu/mpc86xx/mpc8641_serdes.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <asm/immap_86xx.h>
 #include <asm/fsl_serdes.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 
 #define SRDS1_MAX_LANES		4
diff --git a/arch/powerpc/cpu/mpc86xx/speed.c b/arch/powerpc/cpu/mpc86xx/speed.c
index 87e6e5957826..e0e35c2ea6fd 100644
--- a/arch/powerpc/cpu/mpc86xx/speed.c
+++ b/arch/powerpc/cpu/mpc86xx/speed.c
@@ -14,6 +14,7 @@
 #include <asm/global_data.h>
 #include <asm/ppc.h>
 #include <asm/io.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/powerpc/cpu/mpc86xx/traps.c b/arch/powerpc/cpu/mpc86xx/traps.c
index d0b7fa75248c..d03112c3245b 100644
--- a/arch/powerpc/cpu/mpc86xx/traps.c
+++ b/arch/powerpc/cpu/mpc86xx/traps.c
@@ -22,6 +22,7 @@
 #include <init.h>
 #include <kgdb.h>
 #include <asm/processor.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/powerpc/cpu/mpc8xx/cpu.c b/arch/powerpc/cpu/mpc8xx/cpu.c
index dbebe7b30e12..41e6685e62d4 100644
--- a/arch/powerpc/cpu/mpc8xx/cpu.c
+++ b/arch/powerpc/cpu/mpc8xx/cpu.c
@@ -17,6 +17,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <display_options.h>
 #include <net.h>
@@ -34,6 +35,7 @@
 #include <asm/u-boot.h>
 #include <linux/compiler.h>
 #include <asm/io.h>
+#include <linux/types.h>
 
 #if defined(CONFIG_OF_LIBFDT)
 #include <linux/libfdt.h>
diff --git a/arch/powerpc/cpu/mpc8xx/cpu_init.c b/arch/powerpc/cpu/mpc8xx/cpu_init.c
index f5a3b02558f8..4e615c4ed7d8 100644
--- a/arch/powerpc/cpu/mpc8xx/cpu_init.c
+++ b/arch/powerpc/cpu/mpc8xx/cpu_init.c
@@ -5,8 +5,10 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <init.h>
 #include <watchdog.h>
+#include <linux/types.h>
 
 #include <mpc8xx.h>
 #include <asm/cpm_8xx.h>
diff --git a/arch/powerpc/cpu/mpc8xx/immap.c b/arch/powerpc/cpu/mpc8xx/immap.c
index bc131f85b26b..954768426f7d 100644
--- a/arch/powerpc/cpu/mpc8xx/immap.c
+++ b/arch/powerpc/cpu/mpc8xx/immap.c
@@ -10,9 +10,11 @@
 
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
+#include <linux/types.h>
 
 #include <asm/immap_8xx.h>
 #include <asm/cpm_8xx.h>
diff --git a/arch/powerpc/cpu/mpc8xx/interrupts.c b/arch/powerpc/cpu/mpc8xx/interrupts.c
index c2627aa9791e..7309af41da04 100644
--- a/arch/powerpc/cpu/mpc8xx/interrupts.c
+++ b/arch/powerpc/cpu/mpc8xx/interrupts.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <irq_func.h>
 #include <mpc8xx.h>
 #include <mpc8xx_irq.h>
@@ -14,6 +15,7 @@
 #include <asm/ppc.h>
 #include <asm/io.h>
 #include <asm/ptrace.h>
+#include <linux/types.h>
 
 /************************************************************************/
 
diff --git a/arch/powerpc/cpu/mpc8xx/speed.c b/arch/powerpc/cpu/mpc8xx/speed.c
index 49699c3e4a7b..a5360c444e2f 100644
--- a/arch/powerpc/cpu/mpc8xx/speed.c
+++ b/arch/powerpc/cpu/mpc8xx/speed.c
@@ -6,10 +6,12 @@
 
 #include <common.h>
 #include <clock_legacy.h>
+#include <compiler.h>
 #include <mpc8xx.h>
 #include <asm/global_data.h>
 #include <asm/ppc.h>
 #include <asm/io.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/powerpc/cpu/mpc8xx/traps.c b/arch/powerpc/cpu/mpc8xx/traps.c
index fdc6b110412d..83a1f06c3905 100644
--- a/arch/powerpc/cpu/mpc8xx/traps.c
+++ b/arch/powerpc/cpu/mpc8xx/traps.c
@@ -21,6 +21,7 @@
 #include <asm/ptrace.h>
 #include <command.h>
 #include <asm/processor.h>
+#include <linux/types.h>
 
 /* Returns 0 if exception not found and fixup otherwise.  */
 extern unsigned long search_exception_table(unsigned long);
diff --git a/arch/powerpc/cpu/mpc8xxx/cpu.c b/arch/powerpc/cpu/mpc8xxx/cpu.c
index e9ff1d2aaf9f..8a4a42be4f40 100644
--- a/arch/powerpc/cpu/mpc8xxx/cpu.c
+++ b/arch/powerpc/cpu/mpc8xxx/cpu.c
@@ -7,6 +7,7 @@
  * cpu specific common code for 85xx/86xx processors.
  */
 
+#include <compiler.h>
 #include <config.h>
 #include <common.h>
 #include <command.h>
@@ -22,6 +23,7 @@
 #include <vsc9953.h>
 #include <asm/u-boot.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/powerpc/cpu/mpc8xxx/fdt.c b/arch/powerpc/cpu/mpc8xxx/fdt.c
index 5322c64808e5..6075467d4f6e 100644
--- a/arch/powerpc/cpu/mpc8xxx/fdt.c
+++ b/arch/powerpc/cpu/mpc8xxx/fdt.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <asm/mp.h>
diff --git a/arch/powerpc/cpu/mpc8xxx/fsl_lbc.c b/arch/powerpc/cpu/mpc8xxx/fsl_lbc.c
index 6f2b64948a52..95c3fcf6e25b 100644
--- a/arch/powerpc/cpu/mpc8xxx/fsl_lbc.c
+++ b/arch/powerpc/cpu/mpc8xxx/fsl_lbc.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <stdio.h>
 #include <asm/fsl_lbc.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_MPC83xx
 #include "../mpc83xx/elbc/elbc.h"
diff --git a/arch/powerpc/cpu/mpc8xxx/fsl_pamu.c b/arch/powerpc/cpu/mpc8xxx/fsl_pamu.c
index a10969576b12..9559a029589a 100644
--- a/arch/powerpc/cpu/mpc8xxx/fsl_pamu.c
+++ b/arch/powerpc/cpu/mpc8xxx/fsl_pamu.c
@@ -14,6 +14,7 @@
 #include <asm/ppc.h>
 #include <asm/fsl_pamu.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 struct paace *ppaact;
 struct paace *sec;
diff --git a/arch/powerpc/cpu/mpc8xxx/law.c b/arch/powerpc/cpu/mpc8xxx/law.c
index 91b736456070..ee85cd2e3aaf 100644
--- a/arch/powerpc/cpu/mpc8xxx/law.c
+++ b/arch/powerpc/cpu/mpc8xxx/law.c
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <asm/bitops.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <linux/compiler.h>
 #include <asm/fsl_law.h>
 #include <asm/io.h>
diff --git a/arch/powerpc/cpu/mpc8xxx/pamu_table.c b/arch/powerpc/cpu/mpc8xxx/pamu_table.c
index bf559d0f833c..21b92a390b09 100644
--- a/arch/powerpc/cpu/mpc8xxx/pamu_table.c
+++ b/arch/powerpc/cpu/mpc8xxx/pamu_table.c
@@ -8,6 +8,7 @@
 #include <asm/fsl_pamu.h>
 #include <asm/global_data.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/powerpc/cpu/mpc8xxx/srio.c b/arch/powerpc/cpu/mpc8xxx/srio.c
index 71178b47bc18..bcb69c3e05be 100644
--- a/arch/powerpc/cpu/mpc8xxx/srio.c
+++ b/arch/powerpc/cpu/mpc8xxx/srio.c
@@ -12,6 +12,7 @@
 #include <asm/fsl_serdes.h>
 #include <asm/fsl_srio.h>
 #include <asm/ppc.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 
diff --git a/arch/powerpc/include/asm/arch-mpc83xx/gpio.h b/arch/powerpc/include/asm/arch-mpc83xx/gpio.h
index 8a6896e6229c..7450468304f0 100644
--- a/arch/powerpc/include/asm/arch-mpc83xx/gpio.h
+++ b/arch/powerpc/include/asm/arch-mpc83xx/gpio.h
@@ -16,6 +16,7 @@
 #define MPC83XX_GPIO_CTRLRS 0
 #endif
 
+#include <linux/types.h>
 #define MAX_NUM_GPIOS (32 * MPC83XX_GPIO_CTRLRS)
 
 struct mpc8xxx_gpio_plat {
diff --git a/arch/powerpc/include/asm/arch-mpc85xx/gpio.h b/arch/powerpc/include/asm/arch-mpc85xx/gpio.h
index c7086a8361e1..12da481f745e 100644
--- a/arch/powerpc/include/asm/arch-mpc85xx/gpio.h
+++ b/arch/powerpc/include/asm/arch-mpc85xx/gpio.h
@@ -17,6 +17,7 @@
 #include <asm/mpc85xx_gpio.h>
 #endif
 
+#include <linux/types.h>
 struct mpc8xxx_gpio_plat {
 	ulong addr;
 	unsigned long size;
diff --git a/arch/powerpc/include/asm/cache.h b/arch/powerpc/include/asm/cache.h
index 445a366807db..b7c223b35c69 100644
--- a/arch/powerpc/include/asm/cache.h
+++ b/arch/powerpc/include/asm/cache.h
@@ -55,6 +55,7 @@ extern void invalidate_icache(void);
 #ifdef CONFIG_SYS_INIT_RAM_LOCK
 extern void unlock_ram_in_cache(void);
 #endif /* CONFIG_SYS_INIT_RAM_LOCK */
+#include <linux/types.h>
 #endif /* __ASSEMBLY__ */
 
 #if defined(__KERNEL__) && !defined(__ASSEMBLY__)
diff --git a/arch/powerpc/include/asm/cpm_85xx.h b/arch/powerpc/include/asm/cpm_85xx.h
index b46e20e5ce89..d9dd28d2fced 100644
--- a/arch/powerpc/include/asm/cpm_85xx.h
+++ b/arch/powerpc/include/asm/cpm_85xx.h
@@ -6,6 +6,7 @@
  * MPC8260 Communication Processor Module.
  * Copyright (c) 1999 Dan Malek (dmalek at jlc.net)
  *
+#include <linux/types.h>
  * This file contains structures and information for the communication
  * processor channels found in the dual port RAM or parameter RAM.
  * All CPM control and status is available through the MPC8260 internal
diff --git a/arch/powerpc/include/asm/cpm_8xx.h b/arch/powerpc/include/asm/cpm_8xx.h
index 85903d210880..5d804b231338 100644
--- a/arch/powerpc/include/asm/cpm_8xx.h
+++ b/arch/powerpc/include/asm/cpm_8xx.h
@@ -5,6 +5,7 @@
  * (C) Copyright 2000-2006
  * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
  *
+#include <linux/types.h>
  * This file contains structures and information for the communication
  * processor channels.  Some CPM control and status is available
  * through the MPC8xx internal memory map.  See immap.h for details.
diff --git a/arch/powerpc/include/asm/fsl_dma.h b/arch/powerpc/include/asm/fsl_dma.h
index 727f4a7e92c2..9e0cdf8028b1 100644
--- a/arch/powerpc/include/asm/fsl_dma.h
+++ b/arch/powerpc/include/asm/fsl_dma.h
@@ -9,6 +9,7 @@
 #define _ASM_FSL_DMA_H_
 
 #include <asm/types.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_MPC83xx
 typedef struct fsl_dma {
diff --git a/arch/powerpc/include/asm/fsl_i2c.h b/arch/powerpc/include/asm/fsl_i2c.h
index 73105fa8e484..55226a3c059f 100644
--- a/arch/powerpc/include/asm/fsl_i2c.h
+++ b/arch/powerpc/include/asm/fsl_i2c.h
@@ -13,8 +13,10 @@
 #ifndef _ASM_FSL_I2C_H_
 #define _ASM_FSL_I2C_H_
 
+#include <compiler.h>
 #include <asm/types.h>
 #include <linux/compiler.h>
+#include <linux/types.h>
 
 typedef struct fsl_i2c_base {
 
diff --git a/arch/powerpc/include/asm/fsl_law.h b/arch/powerpc/include/asm/fsl_law.h
index 888640df6f81..7dde8dcf4126 100644
--- a/arch/powerpc/include/asm/fsl_law.h
+++ b/arch/powerpc/include/asm/fsl_law.h
@@ -7,6 +7,7 @@
 #define _FSL_LAW_H_
 
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/log2.h>
 
 #define LAW_EN	0x80000000
diff --git a/arch/powerpc/include/asm/fsl_lbc.h b/arch/powerpc/include/asm/fsl_lbc.h
index bf352d9a5617..c3a0ee5424cc 100644
--- a/arch/powerpc/include/asm/fsl_lbc.h
+++ b/arch/powerpc/include/asm/fsl_lbc.h
@@ -465,6 +465,7 @@ void lbc_sdram_init(void);
 
 #ifndef __ASSEMBLY__
 #include <asm/io.h>
+#include <linux/types.h>
 
 extern void print_lbc_regs(void);
 extern void init_early_memctl_regs(void);
diff --git a/arch/powerpc/include/asm/fsl_mpc83xx_serdes.h b/arch/powerpc/include/asm/fsl_mpc83xx_serdes.h
index a02b59926547..67f47076768f 100644
--- a/arch/powerpc/include/asm/fsl_mpc83xx_serdes.h
+++ b/arch/powerpc/include/asm/fsl_mpc83xx_serdes.h
@@ -23,4 +23,5 @@ extern void fsl_setup_serdes(u32 offset, char proto, u32 rfcks, char vdd);
 
 #endif /* !CONFIG_MPC83XX_SERDES */
 
+#include <asm/types.h>
 #endif /* __FSL_MPC83XX_SERDES_H */
diff --git a/arch/powerpc/include/asm/fsl_pamu.h b/arch/powerpc/include/asm/fsl_pamu.h
index 07e822b796ed..cd711fb86136 100644
--- a/arch/powerpc/include/asm/fsl_pamu.h
+++ b/arch/powerpc/include/asm/fsl_pamu.h
@@ -6,6 +6,7 @@
 #ifndef __PAMU_H
 #define __PAMU_H
 
+#include <linux/types.h>
 #define CONFIG_NUM_PAMU		16
 #define NUM_PPAACT_ENTRIES	512
 #define NUM_SPAACT_ENTRIES	256
diff --git a/arch/powerpc/include/asm/fsl_pci.h b/arch/powerpc/include/asm/fsl_pci.h
index 508834829b95..5ebad5c7e5e4 100644
--- a/arch/powerpc/include/asm/fsl_pci.h
+++ b/arch/powerpc/include/asm/fsl_pci.h
@@ -9,6 +9,7 @@
 #include <asm/fsl_law.h>
 #include <asm/fsl_serdes.h>
 #include <pci.h>
+#include <asm/types.h>
 
 #define PEX_IP_BLK_REV_2_2	0x02080202
 #define PEX_IP_BLK_REV_2_3	0x02080203
diff --git a/arch/powerpc/include/asm/fsl_portals.h b/arch/powerpc/include/asm/fsl_portals.h
index b1fd6bd5cef6..f277b20260e3 100644
--- a/arch/powerpc/include/asm/fsl_portals.h
+++ b/arch/powerpc/include/asm/fsl_portals.h
@@ -7,6 +7,7 @@
 #define _FSL_PORTALS_H_
 
 /* entries must be in order and contiguous */
+#include <asm/types.h>
 enum fsl_dpaa_dev {
 	FSL_HW_PORTAL_SEC,
 #ifdef CONFIG_SYS_DPAA_FMAN
diff --git a/arch/powerpc/include/asm/fsl_serdes.h b/arch/powerpc/include/asm/fsl_serdes.h
index ddde4f80c632..8588006b7af7 100644
--- a/arch/powerpc/include/asm/fsl_serdes.h
+++ b/arch/powerpc/include/asm/fsl_serdes.h
@@ -7,6 +7,7 @@
 #define __FSL_SERDES_H
 
 #include <config.h>
+#include <asm/types.h>
 
 enum srds_prtcl {
 	/*
diff --git a/arch/powerpc/include/asm/global_data.h b/arch/powerpc/include/asm/global_data.h
index 192a02d347e7..04e0c38b848b 100644
--- a/arch/powerpc/include/asm/global_data.h
+++ b/arch/powerpc/include/asm/global_data.h
@@ -9,7 +9,7 @@
 #define __ASM_GBL_DATA_H
 
 #include "config.h"
-#include "asm/types.h"
+#include "linux/types.h"
 
 /* Architecture-specific global data */
 struct arch_global_data {
diff --git a/arch/powerpc/include/asm/immap_86xx.h b/arch/powerpc/include/asm/immap_86xx.h
index 30c296d5b7c6..4088b6443a0c 100644
--- a/arch/powerpc/include/asm/immap_86xx.h
+++ b/arch/powerpc/include/asm/immap_86xx.h
@@ -16,6 +16,7 @@
 #include <asm/fsl_lbc.h>
 #include <asm/fsl_i2c.h>
 #include <asm/ppc.h>
+#include <linux/types.h>
 
 /* Local-Access Registers and MCM Registers(0x0000-0x2000) */
 typedef struct ccsr_local_mcm {
diff --git a/arch/powerpc/include/asm/immap_8xx.h b/arch/powerpc/include/asm/immap_8xx.h
index 3999a02b9c7d..6f9f9a250c70 100644
--- a/arch/powerpc/include/asm/immap_8xx.h
+++ b/arch/powerpc/include/asm/immap_8xx.h
@@ -14,6 +14,7 @@
 
 /* System configuration registers.
 */
+#include <linux/types.h>
 typedef	struct sys_conf {
 	uint	sc_siumcr;
 	uint	sc_sypcr;
diff --git a/arch/powerpc/include/asm/io.h b/arch/powerpc/include/asm/io.h
index ccc5e664cf47..e8d86574a5d2 100644
--- a/arch/powerpc/include/asm/io.h
+++ b/arch/powerpc/include/asm/io.h
@@ -7,7 +7,9 @@
 #ifndef _PPC_IO_H
 #define _PPC_IO_H
 
+#include <compiler.h>
 #include <asm/byteorder.h>
+#include <asm/types.h>
 #include <linux/string.h>
 
 #ifdef CONFIG_ADDR_MAP
diff --git a/arch/powerpc/include/asm/iopin_8xx.h b/arch/powerpc/include/asm/iopin_8xx.h
index a41b33233256..82d5a1802722 100644
--- a/arch/powerpc/include/asm/iopin_8xx.h
+++ b/arch/powerpc/include/asm/iopin_8xx.h
@@ -8,6 +8,7 @@
 #ifndef _ASM_IOPIN_8XX_H_
 #define _ASM_IOPIN_8XX_H_
 
+#include <compiler.h>
 #include <linux/types.h>
 #include <asm/immap_8xx.h>
 #include <asm/io.h>
diff --git a/arch/powerpc/include/asm/mmu.h b/arch/powerpc/include/asm/mmu.h
index 353dc4e8748d..901ed9329dfa 100644
--- a/arch/powerpc/include/asm/mmu.h
+++ b/arch/powerpc/include/asm/mmu.h
@@ -8,6 +8,7 @@
 #ifndef __ASSEMBLY__
 /* Hardware Page Table Entry */
 #include <linux/bitops.h>
+#include <linux/types.h>
 typedef struct _PTE {
 #ifdef CONFIG_PPC64BRIDGE
 	unsigned long long vsid:52;
diff --git a/arch/powerpc/include/asm/mp.h b/arch/powerpc/include/asm/mp.h
index 8dacd2781d44..619053cd01f2 100644
--- a/arch/powerpc/include/asm/mp.h
+++ b/arch/powerpc/include/asm/mp.h
@@ -7,6 +7,7 @@
 #define _ASM_MP_H_
 
 #include <lmb.h>
+#include <asm/types.h>
 
 void setup_mp(void);
 void cpu_mp_lmb_reserve(struct lmb *lmb);
diff --git a/arch/powerpc/include/asm/ppc.h b/arch/powerpc/include/asm/ppc.h
index 055364c58fd9..7f6c52cc3760 100644
--- a/arch/powerpc/include/asm/ppc.h
+++ b/arch/powerpc/include/asm/ppc.h
@@ -38,6 +38,7 @@
 #endif
 
 #include <asm/processor.h>
+#include <linux/types.h>
 
 static inline uint get_immr(void)
 {
diff --git a/arch/powerpc/lib/bdinfo.c b/arch/powerpc/lib/bdinfo.c
index 22acf76dedb0..71451e0d9a49 100644
--- a/arch/powerpc/lib/bdinfo.c
+++ b/arch/powerpc/lib/bdinfo.c
@@ -7,10 +7,12 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <init.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/powerpc/lib/bootm.c b/arch/powerpc/lib/bootm.c
index f283c1a9a47d..6ff9eae75357 100644
--- a/arch/powerpc/lib/bootm.c
+++ b/arch/powerpc/lib/bootm.c
@@ -22,6 +22,7 @@
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include <u-boot/zlib.h>
 #include <bzlib.h>
 #include <asm/byteorder.h>
diff --git a/arch/powerpc/lib/cache.c b/arch/powerpc/lib/cache.c
index 3c3c470bbbda..86fff84f978f 100644
--- a/arch/powerpc/lib/cache.c
+++ b/arch/powerpc/lib/cache.c
@@ -8,6 +8,7 @@
 #include <cpu_func.h>
 #include <asm/cache.h>
 #include <watchdog.h>
+#include <linux/types.h>
 
 void flush_cache(ulong start_addr, ulong size)
 {
diff --git a/arch/powerpc/lib/interrupts.c b/arch/powerpc/lib/interrupts.c
index b85f7dc79172..be361549e710 100644
--- a/arch/powerpc/lib/interrupts.c
+++ b/arch/powerpc/lib/interrupts.c
@@ -17,6 +17,7 @@
 #endif
 #include <asm/ptrace.h>
 #include <asm/ppc.h>
+#include <linux/types.h>
 
 #ifndef CONFIG_MPC83XX_TIMER
 #ifndef CONFIG_SYS_WATCHDOG_FREQ
diff --git a/arch/powerpc/lib/spl.c b/arch/powerpc/lib/spl.c
index d4a6057527c2..d01b68436895 100644
--- a/arch/powerpc/lib/spl.c
+++ b/arch/powerpc/lib/spl.c
@@ -8,6 +8,7 @@
 #include <spl.h>
 #include <image.h>
 #include <linux/compiler.h>
+#include <linux/types.h>
 
 /*
  * This function jumps to an image with argument. Normally an FDT or ATAGS
diff --git a/arch/powerpc/lib/stack.c b/arch/powerpc/lib/stack.c
index f2a4652e081d..438b70c82b14 100644
--- a/arch/powerpc/lib/stack.c
+++ b/arch/powerpc/lib/stack.c
@@ -13,6 +13,7 @@
 #include <common.h>
 #include <init.h>
 #include <asm/global_data.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/powerpc/lib/time.c b/arch/powerpc/lib/time.c
index d27432c23af8..702766a788a5 100644
--- a/arch/powerpc/lib/time.c
+++ b/arch/powerpc/lib/time.c
@@ -9,6 +9,7 @@
 #include <time.h>
 #include <asm/io.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 /* ------------------------------------------------------------------------- */
 
diff --git a/arch/riscv/cpu/cpu.c b/arch/riscv/cpu/cpu.c
index 487329fa2f0f..4792ac4a9c19 100644
--- a/arch/riscv/cpu/cpu.c
+++ b/arch/riscv/cpu/cpu.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <stdbool.h>
 #include <asm/encoding.h>
+#include <asm/types.h>
 #include <dm/uclass-internal.h>
 #include <linux/bitops.h>
 #include <linux/string.h>
diff --git a/arch/riscv/cpu/fu540/cache.c b/arch/riscv/cpu/fu540/cache.c
index 714b405e843e..1667ebea5b5b 100644
--- a/arch/riscv/cpu/fu540/cache.c
+++ b/arch/riscv/cpu/fu540/cache.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 
 /* Register offsets */
diff --git a/arch/riscv/cpu/fu540/dram.c b/arch/riscv/cpu/fu540/dram.c
index cec130ec8dc6..feb9d41131f6 100644
--- a/arch/riscv/cpu/fu540/dram.c
+++ b/arch/riscv/cpu/fu540/dram.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <asm/global_data.h>
 #include <linux/sizes.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/riscv/cpu/generic/dram.c b/arch/riscv/cpu/generic/dram.c
index cec130ec8dc6..feb9d41131f6 100644
--- a/arch/riscv/cpu/generic/dram.c
+++ b/arch/riscv/cpu/generic/dram.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <asm/global_data.h>
 #include <linux/sizes.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/riscv/include/asm/global_data.h b/arch/riscv/include/asm/global_data.h
index 2eb14815bcf0..73d76c362ddc 100644
--- a/arch/riscv/include/asm/global_data.h
+++ b/arch/riscv/include/asm/global_data.h
@@ -13,6 +13,7 @@
 #include <asm/smp.h>
 #include <asm/u-boot.h>
 #include <compiler.h>
+#include <linux/types.h>
 
 /* Architecture-specific global data */
 struct arch_global_data {
diff --git a/arch/riscv/include/asm/io.h b/arch/riscv/include/asm/io.h
index acf5a96449c1..f823f1fb18b8 100644
--- a/arch/riscv/include/asm/io.h
+++ b/arch/riscv/include/asm/io.h
@@ -68,6 +68,7 @@ static inline phys_addr_t map_to_sysmem(const void *ptr)
 #define __iormb()	rmb()
 #define __iowmb()	wmb()
 
+#include <compiler.h>
 static inline void writeb(u8 val, volatile void __iomem *addr)
 {
 	__iowmb();
diff --git a/arch/riscv/include/asm/ptrace.h b/arch/riscv/include/asm/ptrace.h
index 651078fcfda3..19984e34de86 100644
--- a/arch/riscv/include/asm/ptrace.h
+++ b/arch/riscv/include/asm/ptrace.h
@@ -9,6 +9,7 @@
 #ifndef __ASM_RISCV_PTRACE_H
 #define __ASM_RISCV_PTRACE_H
 
+#include <linux/types.h>
 struct pt_regs {
 	unsigned long sepc;
 	unsigned long ra;
diff --git a/arch/riscv/include/asm/smp.h b/arch/riscv/include/asm/smp.h
index 1b428856b26d..0cbe7bf24ee4 100644
--- a/arch/riscv/include/asm/smp.h
+++ b/arch/riscv/include/asm/smp.h
@@ -7,6 +7,7 @@
 #ifndef _ASM_RISCV_SMP_H
 #define _ASM_RISCV_SMP_H
 
+#include <linux/types.h>
 /**
  * struct ipi_data - Inter-processor interrupt (IPI) data structure
  *
diff --git a/arch/riscv/lib/andes_plic.c b/arch/riscv/lib/andes_plic.c
index 445a39798b91..cebf72c93c7e 100644
--- a/arch/riscv/lib/andes_plic.c
+++ b/arch/riscv/lib/andes_plic.c
@@ -8,6 +8,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <asm/global_data.h>
 #include <dm/device-internal.h>
@@ -21,6 +22,7 @@
 #include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /* pending register */
 #define PENDING_REG(base, hart)	((ulong)(base) + 0x1000 + ((hart) / 4) * 4)
diff --git a/arch/riscv/lib/andes_plmt.c b/arch/riscv/lib/andes_plmt.c
index c453d9042c8f..a38d6cfe38cc 100644
--- a/arch/riscv/lib/andes_plmt.c
+++ b/arch/riscv/lib/andes_plmt.c
@@ -8,6 +8,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <regmap.h>
 #include <syscon.h>
@@ -15,6 +16,7 @@
 #include <asm/io.h>
 #include <asm/syscon.h>
 #include <linux/err.h>
+#include <linux/types.h>
 
 /* mtime register */
 #define MTIME_REG(base)			((ulong)(base))
diff --git a/arch/riscv/lib/boot.c b/arch/riscv/lib/boot.c
index 80ac3e58fd80..158f2944ee97 100644
--- a/arch/riscv/lib/boot.c
+++ b/arch/riscv/lib/boot.c
@@ -6,6 +6,7 @@
 
 #include <command.h>
 #include <asm/u-boot-riscv.h>
+#include <linux/types.h>
 
 unsigned long do_go_exec(ulong (*entry)(int, char * const []),
 			 int argc, char *const argv[])
diff --git a/arch/riscv/lib/bootm.c b/arch/riscv/lib/bootm.c
index 14a09eee717f..c30a6ff0260b 100644
--- a/arch/riscv/lib/bootm.c
+++ b/arch/riscv/lib/bootm.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <bootstage.h>
 #include <command.h>
+#include <compiler.h>
 #include <dm.h>
 #include <fdt_support.h>
 #include <hang.h>
@@ -23,6 +24,7 @@
 #include <asm/u-boot-riscv.h>
 #include <dm/device.h>
 #include <dm/root.h>
+#include <linux/types.h>
 #include <u-boot/zlib.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/riscv/lib/fdt_fixup.c b/arch/riscv/lib/fdt_fixup.c
index 1ed86a38c728..6a6e2cbe269f 100644
--- a/arch/riscv/lib/fdt_fixup.c
+++ b/arch/riscv/lib/fdt_fixup.c
@@ -13,6 +13,7 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/riscv/lib/image.c b/arch/riscv/lib/image.c
index 2f78b25807a4..8cca200416f5 100644
--- a/arch/riscv/lib/image.c
+++ b/arch/riscv/lib/image.c
@@ -16,6 +16,7 @@
 #include <linux/errno.h>
 #include <linux/sizes.h>
 #include <linux/stddef.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/riscv/lib/interrupts.c b/arch/riscv/lib/interrupts.c
index b510e7aea8f8..5070565dc1d5 100644
--- a/arch/riscv/lib/interrupts.c
+++ b/arch/riscv/lib/interrupts.c
@@ -19,6 +19,7 @@
 #include <asm/system.h>
 #include <asm/encoding.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/riscv/lib/rdtime.c b/arch/riscv/lib/rdtime.c
index e128d7fce692..f05977019d6c 100644
--- a/arch/riscv/lib/rdtime.c
+++ b/arch/riscv/lib/rdtime.c
@@ -4,10 +4,12 @@
  * Copyright (C) 2018, Bin Meng <bmeng.cn@gmail.com>
  *
  * The riscv_get_time() API implementation that is using the
+#include <asm/types.h>
  * standard rdtime instruction.
  */
 
 #include <common.h>
+#include <linux/types.h>
 
 /* Implement the API required by RISC-V timer driver */
 int riscv_get_time(u64 *time)
diff --git a/arch/riscv/lib/reloc_riscv_efi.c b/arch/riscv/lib/reloc_riscv_efi.c
index c1039dd165d9..0520ddd6e384 100644
--- a/arch/riscv/lib/reloc_riscv_efi.c
+++ b/arch/riscv/lib/reloc_riscv_efi.c
@@ -37,6 +37,7 @@
 */
 
 #include <efi.h>
+#include <linux/types.h>
 
 #include <elf.h>
 
diff --git a/arch/riscv/lib/sbi.c b/arch/riscv/lib/sbi.c
index 984499960a1a..a3b56a1dbd35 100644
--- a/arch/riscv/lib/sbi.c
+++ b/arch/riscv/lib/sbi.c
@@ -11,6 +11,7 @@
 #include <asm/encoding.h>
 #include <asm/sbi.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 struct sbiret sbi_ecall(int ext, int fid, unsigned long arg0,
 			unsigned long arg1, unsigned long arg2,
diff --git a/arch/riscv/lib/sbi_ipi.c b/arch/riscv/lib/sbi_ipi.c
index d02e2b4c4882..fe5eeaad1d5c 100644
--- a/arch/riscv/lib/sbi_ipi.c
+++ b/arch/riscv/lib/sbi_ipi.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <asm/encoding.h>
 #include <asm/sbi.h>
+#include <linux/types.h>
 
 int riscv_init_ipi(void)
 {
diff --git a/arch/riscv/lib/sifive_clint.c b/arch/riscv/lib/sifive_clint.c
index 97b7169a02cf..a22229643bd3 100644
--- a/arch/riscv/lib/sifive_clint.c
+++ b/arch/riscv/lib/sifive_clint.c
@@ -8,6 +8,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <regmap.h>
 #include <syscon.h>
@@ -15,6 +16,7 @@
 #include <asm/io.h>
 #include <asm/syscon.h>
 #include <linux/err.h>
+#include <linux/types.h>
 
 /* MSIP registers */
 #define MSIP_REG(base, hart)		((ulong)(base) + (hart) * 4)
diff --git a/arch/riscv/lib/smp.c b/arch/riscv/lib/smp.c
index 09dd439b59aa..a229a84fc9df 100644
--- a/arch/riscv/lib/smp.c
+++ b/arch/riscv/lib/smp.c
@@ -12,6 +12,7 @@
 #include <asm/smp.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/riscv/lib/spl.c b/arch/riscv/lib/spl.c
index b8771cb61c22..ddb81363fb3c 100644
--- a/arch/riscv/lib/spl.c
+++ b/arch/riscv/lib/spl.c
@@ -4,6 +4,7 @@
  * Lukas Auer <lukas.auer@aisec.fraunhofer.de>
  */
 #include <common.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <hang.h>
 #include <init.h>
@@ -12,6 +13,7 @@
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/smp.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/sandbox/cpu/cpu.c b/arch/sandbox/cpu/cpu.c
index f4cc363927d1..18345fcd1ffc 100644
--- a/arch/sandbox/cpu/cpu.c
+++ b/arch/sandbox/cpu/cpu.c
@@ -21,6 +21,7 @@
 #include <asm/setjmp.h>
 #include <asm/state.h>
 #include <dm/root.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/sandbox/cpu/sdl.c b/arch/sandbox/cpu/sdl.c
index c1c9bb68e0a9..e37bf3addbd1 100644
--- a/arch/sandbox/cpu/sdl.c
+++ b/arch/sandbox/cpu/sdl.c
@@ -12,6 +12,7 @@
 #include <SDL2/SDL.h>
 #include <asm/state.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /**
  * struct buf_info - a data buffer holding audio data
diff --git a/arch/sandbox/cpu/spl.c b/arch/sandbox/cpu/spl.c
index 52cabd7ff12b..e4fe62a1c438 100644
--- a/arch/sandbox/cpu/spl.c
+++ b/arch/sandbox/cpu/spl.c
@@ -16,6 +16,7 @@
 #include <asm/state.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/sandbox/cpu/start.c b/arch/sandbox/cpu/start.c
index c9e626100c60..2ef54a9753bb 100644
--- a/arch/sandbox/cpu/start.c
+++ b/arch/sandbox/cpu/start.c
@@ -22,6 +22,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/sandbox/cpu/state.c b/arch/sandbox/cpu/state.c
index 849dfbd1d669..d99a8d27c828 100644
--- a/arch/sandbox/cpu/state.c
+++ b/arch/sandbox/cpu/state.c
@@ -14,6 +14,7 @@
 #include <asm/state.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /* Main state record for the sandbox */
 static struct sandbox_state main_state;
diff --git a/arch/sandbox/include/asm/axi.h b/arch/sandbox/include/asm/axi.h
index d483f7b65a02..b533a46dc8f0 100644
--- a/arch/sandbox/include/asm/axi.h
+++ b/arch/sandbox/include/asm/axi.h
@@ -7,6 +7,7 @@
 #ifndef __asm_axi_h
 #define __asm_axi_h
 
+#include <linux/types.h>
 #define axi_emul_get_ops(dev)	((struct axi_emul_ops *)(dev)->driver->ops)
 
 /**
diff --git a/arch/sandbox/include/asm/clk.h b/arch/sandbox/include/asm/clk.h
index c184c4bffcf7..9e6b96700a23 100644
--- a/arch/sandbox/include/asm/clk.h
+++ b/arch/sandbox/include/asm/clk.h
@@ -7,6 +7,7 @@
 #define __SANDBOX_CLK_H
 
 #include <common.h>
+#include <linux/types.h>
 
 struct udevice;
 
diff --git a/arch/sandbox/include/asm/eth.h b/arch/sandbox/include/asm/eth.h
index 8c3c957b56fc..62bbd9afea0d 100644
--- a/arch/sandbox/include/asm/eth.h
+++ b/arch/sandbox/include/asm/eth.h
@@ -11,6 +11,7 @@
 
 #include <net.h>
 #include <stdbool.h>
+#include <linux/types.h>
 
 void sandbox_eth_disable_response(int index, bool disable);
 
diff --git a/arch/sandbox/include/asm/global_data.h b/arch/sandbox/include/asm/global_data.h
index f95ddb058a22..00a53e570b30 100644
--- a/arch/sandbox/include/asm/global_data.h
+++ b/arch/sandbox/include/asm/global_data.h
@@ -10,6 +10,7 @@
 #define __ASM_GBL_DATA_H
 
 /* Architecture-specific global data */
+#include <linux/types.h>
 struct arch_global_data {
 	uint8_t		*ram_buf;	/* emulated RAM buffer */
 	void		*text_base;	/* pointer to base of text region */
diff --git a/arch/sandbox/include/asm/gpio.h b/arch/sandbox/include/asm/gpio.h
index df4ba4fb5f3e..967fe9ad2139 100644
--- a/arch/sandbox/include/asm/gpio.h
+++ b/arch/sandbox/include/asm/gpio.h
@@ -22,6 +22,7 @@
  * NOTE: DO NOT use the functions in this file except in test code!
  */
 #include <asm-generic/gpio.h>
+#include <linux/types.h>
 
 /**
  * Return the simulated value of a GPIO (used only in sandbox test code)
diff --git a/arch/sandbox/include/asm/handoff.h b/arch/sandbox/include/asm/handoff.h
index be4e7b0fae2d..f8a72cd87a57 100644
--- a/arch/sandbox/include/asm/handoff.h
+++ b/arch/sandbox/include/asm/handoff.h
@@ -9,6 +9,7 @@
 #ifndef __handoff_h
 #define __handoff_h
 
+#include <linux/types.h>
 #define TEST_HANDOFF_MAGIC	0x14f93c7b
 
 struct arch_spl_handoff {
diff --git a/arch/sandbox/include/asm/io.h b/arch/sandbox/include/asm/io.h
index ad6c29a4e26c..e671262b5d60 100644
--- a/arch/sandbox/include/asm/io.h
+++ b/arch/sandbox/include/asm/io.h
@@ -6,6 +6,7 @@
 #ifndef __SANDBOX_ASM_IO_H
 #define __SANDBOX_ASM_IO_H
 
+#include <linux/types.h>
 enum sandboxio_size_t {
 	SB_SIZE_8,
 	SB_SIZE_16,
diff --git a/arch/sandbox/include/asm/mbox.h b/arch/sandbox/include/asm/mbox.h
index 70f36d7afef6..c3b8a9f14adf 100644
--- a/arch/sandbox/include/asm/mbox.h
+++ b/arch/sandbox/include/asm/mbox.h
@@ -7,6 +7,7 @@
 #define __SANDBOX_MBOX_H
 
 #include <common.h>
+#include <linux/types.h>
 
 #define SANDBOX_MBOX_PING_XOR 0x12345678
 
diff --git a/arch/sandbox/include/asm/sdl.h b/arch/sandbox/include/asm/sdl.h
index a14e0a8f8a21..75904d9fad25 100644
--- a/arch/sandbox/include/asm/sdl.h
+++ b/arch/sandbox/include/asm/sdl.h
@@ -9,6 +9,7 @@
 #include <errno.h>
 #include <stdbool.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_SANDBOX_SDL
 
diff --git a/arch/sandbox/include/asm/sections.h b/arch/sandbox/include/asm/sections.h
index fbc1bd11a341..32667b7cf163 100644
--- a/arch/sandbox/include/asm/sections.h
+++ b/arch/sandbox/include/asm/sections.h
@@ -10,6 +10,7 @@
 #define __SANDBOX_SECTIONS_H
 
 #include <asm-generic/sections.h>
+#include <linux/types.h>
 
 struct sandbox_cmdline_option;
 
diff --git a/arch/sandbox/include/asm/setjmp.h b/arch/sandbox/include/asm/setjmp.h
index 001c7ea322d2..27168ca18505 100644
--- a/arch/sandbox/include/asm/setjmp.h
+++ b/arch/sandbox/include/asm/setjmp.h
@@ -7,6 +7,7 @@
 #ifndef _SETJMP_H_
 #define _SETJMP_H_
 
+#include <linux/types.h>
 struct jmp_buf_data {
 	/*
 	 * We're not sure how long this should be:
diff --git a/arch/sandbox/include/asm/state.h b/arch/sandbox/include/asm/state.h
index 1bfad305f1af..0a0322c39779 100644
--- a/arch/sandbox/include/asm/state.h
+++ b/arch/sandbox/include/asm/state.h
@@ -11,6 +11,7 @@
 #include <stdbool.h>
 #include <linux/list.h>
 #include <linux/stringify.h>
+#include <linux/types.h>
 
 /**
  * Selects the behavior of the serial terminal.
diff --git a/arch/sandbox/include/asm/test.h b/arch/sandbox/include/asm/test.h
index 6ac8c1a8288d..1be290ea7101 100644
--- a/arch/sandbox/include/asm/test.h
+++ b/arch/sandbox/include/asm/test.h
@@ -10,6 +10,7 @@
 
 /* The sandbox driver always permits an I2C device with this address */
 #include <stdbool.h>
+#include <linux/types.h>
 #define SANDBOX_I2C_TEST_ADDR		0x59
 
 #define SANDBOX_PCI_VENDOR_ID		0x1234
diff --git a/arch/sandbox/include/asm/u-boot-sandbox.h b/arch/sandbox/include/asm/u-boot-sandbox.h
index 798d0030773e..9433e5258e53 100644
--- a/arch/sandbox/include/asm/u-boot-sandbox.h
+++ b/arch/sandbox/include/asm/u-boot-sandbox.h
@@ -15,6 +15,7 @@
 #define _U_BOOT_SANDBOX_H_
 
 /* board/.../... */
+#include <asm/types.h>
 int board_init(void);
 
 /* start.c */
diff --git a/arch/sandbox/lib/bootm.c b/arch/sandbox/lib/bootm.c
index d9378f019c09..116ec10ae267 100644
--- a/arch/sandbox/lib/bootm.c
+++ b/arch/sandbox/lib/bootm.c
@@ -6,10 +6,12 @@
 
 #include <common.h>
 #include <bootstage.h>
+#include <compiler.h>
 #include <image.h>
 #include <stdio.h>
 #include <asm/io.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define	LINUX_ARM_ZIMAGE_MAGIC	0x016f2818
 
diff --git a/arch/sandbox/lib/pci_io.c b/arch/sandbox/lib/pci_io.c
index cfc5291ab7b6..f16f992420d2 100644
--- a/arch/sandbox/lib/pci_io.c
+++ b/arch/sandbox/lib/pci_io.c
@@ -14,6 +14,7 @@
 #include <log.h>
 #include <asm/io.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 int pci_map_physmem(phys_addr_t paddr, unsigned long *lenp,
 		    struct udevice **devp, void **ptrp)
diff --git a/arch/sh/cpu/sh4/cache.c b/arch/sh/cpu/sh4/cache.c
index 0f7dfdd3cf79..037d24f4ab3f 100644
--- a/arch/sh/cpu/sh4/cache.c
+++ b/arch/sh/cpu/sh4/cache.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <asm/processor.h>
 #include <asm/system.h>
+#include <asm/types.h>
 
 #define CACHE_VALID       1
 #define CACHE_UPDATED     2
diff --git a/arch/sh/include/asm/pci.h b/arch/sh/include/asm/pci.h
index 5d79d0ec58ed..dfa6184e0b97 100644
--- a/arch/sh/include/asm/pci.h
+++ b/arch/sh/include/asm/pci.h
@@ -18,6 +18,7 @@ int pci_sh7780_init(struct pci_controller *hose);
 #else
 #error "Not support PCI."
 #endif
+#include <asm/types.h>
 
 int pci_sh4_init(struct pci_controller *hose);
 /* PCI dword read for sh4 */
diff --git a/arch/sh/include/asm/string.h b/arch/sh/include/asm/string.h
index 999febcb6b7d..cc1f28af19df 100644
--- a/arch/sh/include/asm/string.h
+++ b/arch/sh/include/asm/string.h
@@ -130,4 +130,5 @@ extern int strcasecmp(const char *, const char *);
 #define __HAVE_ARCH_STRTOK      1
 
 #endif /* KERNEL */
+#include <linux/types.h>
 #endif /* __ASM_SH_STRING_H */
diff --git a/arch/sh/lib/board.c b/arch/sh/lib/board.c
index f43213a50e99..105f204a70b8 100644
--- a/arch/sh/lib/board.c
+++ b/arch/sh/lib/board.c
@@ -7,6 +7,7 @@
 #include <init.h>
 #include <asm/global_data.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/sh/lib/time_sh2.c b/arch/sh/lib/time_sh2.c
index 5484c543c6c8..5788c552abd5 100644
--- a/arch/sh/lib/time_sh2.c
+++ b/arch/sh/lib/time_sh2.c
@@ -13,6 +13,7 @@
 #include <asm/io.h>
 #include <asm/processor.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 #define CMT_CMCSR_INIT	0x0001	/* PCLK/32 */
 #define CMT_CMCSR_CALIB 0x0000
diff --git a/arch/sh/lib/zimageboot.c b/arch/sh/lib/zimageboot.c
index 8567d390376a..20eab6bbbffe 100644
--- a/arch/sh/lib/zimageboot.c
+++ b/arch/sh/lib/zimageboot.c
@@ -17,6 +17,7 @@
 #include <asm/io.h>
 #include <asm/zimage.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 int do_sh_zimageboot(struct cmd_tbl *cmdtp, int flag, int argc,
 		     char *const argv[])
diff --git a/arch/x86/cpu/acpi_gpe.c b/arch/x86/cpu/acpi_gpe.c
index 5610d5437236..1b51b44e8c68 100644
--- a/arch/x86/cpu/acpi_gpe.c
+++ b/arch/x86/cpu/acpi_gpe.c
@@ -15,6 +15,7 @@
 #include <dt-bindings/interrupt-controller/x86-irq.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /**
  * struct acpi_gpe_priv - private driver information
diff --git a/arch/x86/cpu/apollolake/cpu_spl.c b/arch/x86/cpu/apollolake/cpu_spl.c
index 00cfcd2f4a2d..e13f8391fa8e 100644
--- a/arch/x86/cpu/apollolake/cpu_spl.c
+++ b/arch/x86/cpu/apollolake/cpu_spl.c
@@ -35,6 +35,7 @@
 #include <asm/arch/uart.h>
 #include <asm/fsp2/fsp_api.h>
 #include <linux/sizes.h>
+#include <linux/types.h>
 #include <power/acpi_pmc.h>
 
 /* Define this here to avoid referencing any drivers for the debug UART 1 */
diff --git a/arch/x86/cpu/apollolake/fsp_bindings.c b/arch/x86/cpu/apollolake/fsp_bindings.c
index db9290f5312d..abec50644b4e 100644
--- a/arch/x86/cpu/apollolake/fsp_bindings.c
+++ b/arch/x86/cpu/apollolake/fsp_bindings.c
@@ -10,6 +10,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /**
  * read_u8_prop() - Read an u8 property from devicetree (scalar or array)
diff --git a/arch/x86/cpu/apollolake/fsp_s.c b/arch/x86/cpu/apollolake/fsp_s.c
index 433dcf08c778..5876edaa007f 100644
--- a/arch/x86/cpu/apollolake/fsp_s.c
+++ b/arch/x86/cpu/apollolake/fsp_s.c
@@ -13,6 +13,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <p2sb.h>
+#include <stdbool.h>
 #include <acpi/acpi_s3.h>
 #include <asm/global_data.h>
 #include <asm/intel_pinctrl.h>
@@ -30,6 +31,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #define PCH_P2SB_E0		0xe0
 #define HIDE_BIT		BIT(0)
diff --git a/arch/x86/cpu/apollolake/hostbridge.c b/arch/x86/cpu/apollolake/hostbridge.c
index 99f1b441312c..4477e580fbbd 100644
--- a/arch/x86/cpu/apollolake/hostbridge.c
+++ b/arch/x86/cpu/apollolake/hostbridge.c
@@ -13,6 +13,7 @@
 #include <asm/pci.h>
 #include <asm/arch/systemagent.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 /**
  * struct apl_hostbridge_platdata - platform data for hostbridge
diff --git a/arch/x86/cpu/apollolake/lpc.c b/arch/x86/cpu/apollolake/lpc.c
index 07a64502061a..4c12d80b38bc 100644
--- a/arch/x86/cpu/apollolake/lpc.c
+++ b/arch/x86/cpu/apollolake/lpc.c
@@ -16,6 +16,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/log2.h>
+#include <linux/types.h>
 
 void lpc_enable_fixed_io_ranges(uint io_enables)
 {
diff --git a/arch/x86/cpu/apollolake/pmc.c b/arch/x86/cpu/apollolake/pmc.c
index 8adc33bfd30e..96b3845a2977 100644
--- a/arch/x86/cpu/apollolake/pmc.c
+++ b/arch/x86/cpu/apollolake/pmc.c
@@ -13,12 +13,14 @@
 #include <dm.h>
 #include <log.h>
 #include <spl.h>
+#include <stdbool.h>
 #include <acpi/acpi_s3.h>
 #include <asm/io.h>
 #include <asm/pci.h>
 #include <linux/bitops.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <power/acpi_pmc.h>
 
 #define GPIO_GPE_CFG		0x1050
diff --git a/arch/x86/cpu/apollolake/punit.c b/arch/x86/cpu/apollolake/punit.c
index 632309f69015..ecc2fe1ca20f 100644
--- a/arch/x86/cpu/apollolake/punit.c
+++ b/arch/x86/cpu/apollolake/punit.c
@@ -16,6 +16,7 @@
 #include <asm/arch/systemagent.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 /*
  * Punit Initialisation code. This all isn't documented, but
diff --git a/arch/x86/cpu/apollolake/spl.c b/arch/x86/cpu/apollolake/spl.c
index 618b20add162..a8cd253deec9 100644
--- a/arch/x86/cpu/apollolake/spl.c
+++ b/arch/x86/cpu/apollolake/spl.c
@@ -22,6 +22,7 @@
 #include <dm/uclass-internal.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /* This reads the next phase from mapped SPI flash */
 static int rom_load_image(struct spl_image_info *spl_image,
diff --git a/arch/x86/cpu/apollolake/uart.c b/arch/x86/cpu/apollolake/uart.c
index 2a2010229455..8c031445b952 100644
--- a/arch/x86/cpu/apollolake/uart.c
+++ b/arch/x86/cpu/apollolake/uart.c
@@ -17,6 +17,7 @@
 #include <asm/pci.h>
 #include <asm/lpss.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 /* Low-power Subsystem (LPSS) clock register */
 enum {
diff --git a/arch/x86/cpu/baytrail/acpi.c b/arch/x86/cpu/baytrail/acpi.c
index e6c721a16ba9..fe7139e6509c 100644
--- a/arch/x86/cpu/baytrail/acpi.c
+++ b/arch/x86/cpu/baytrail/acpi.c
@@ -13,6 +13,7 @@
 #include <asm/tables.h>
 #include <asm/arch/global_nvs.h>
 #include <asm/arch/iomap.h>
+#include <asm/types.h>
 #include <dm/uclass-internal.h>
 #include <linux/string.h>
 
diff --git a/arch/x86/cpu/baytrail/cpu.c b/arch/x86/cpu/baytrail/cpu.c
index 309a50a11611..8cc19c02e2b6 100644
--- a/arch/x86/cpu/baytrail/cpu.c
+++ b/arch/x86/cpu/baytrail/cpu.c
@@ -17,6 +17,7 @@
 #include <asm/lapic.h>
 #include <asm/msr.h>
 #include <asm/turbo.h>
+#include <linux/types.h>
 
 #define BYT_PRV_CLK			0x800
 #define BYT_PRV_CLK_EN			(1 << 0)
diff --git a/arch/x86/cpu/baytrail/early_uart.c b/arch/x86/cpu/baytrail/early_uart.c
index 08dbd5538f7a..6a1bb87854c1 100644
--- a/arch/x86/cpu/baytrail/early_uart.c
+++ b/arch/x86/cpu/baytrail/early_uart.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <errno.h>
 #include <asm/io.h>
+#include <linux/types.h>
 
 #define PCI_DEV_CONFIG(segbus, dev, fn) ( \
 		(((segbus) & 0xfff) << 20) | \
diff --git a/arch/x86/cpu/baytrail/fsp_configs.c b/arch/x86/cpu/baytrail/fsp_configs.c
index fb3f946c45f9..da89f6db4c15 100644
--- a/arch/x86/cpu/baytrail/fsp_configs.c
+++ b/arch/x86/cpu/baytrail/fsp_configs.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <fdtdec.h>
 #include <log.h>
 #include <asm/fsp1/fsp_support.h>
diff --git a/arch/x86/cpu/braswell/early_uart.c b/arch/x86/cpu/braswell/early_uart.c
index d78c6b0feb6a..b8cd6a81e12a 100644
--- a/arch/x86/cpu/braswell/early_uart.c
+++ b/arch/x86/cpu/braswell/early_uart.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <asm/io.h>
+#include <linux/types.h>
 
 #define PCI_DEV_CONFIG(segbus, dev, fn) ( \
 		(((segbus) & 0xfff) << 20) | \
diff --git a/arch/x86/cpu/braswell/fsp_configs.c b/arch/x86/cpu/braswell/fsp_configs.c
index 243298fd5718..70a9fa004a78 100644
--- a/arch/x86/cpu/braswell/fsp_configs.c
+++ b/arch/x86/cpu/braswell/fsp_configs.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <fdtdec.h>
 #include <log.h>
 #include <asm/fsp1/fsp_support.h>
diff --git a/arch/x86/cpu/broadwell/adsp.c b/arch/x86/cpu/broadwell/adsp.c
index beab06dee95d..b7a615fc37e5 100644
--- a/arch/x86/cpu/broadwell/adsp.c
+++ b/arch/x86/cpu/broadwell/adsp.c
@@ -20,6 +20,7 @@
 #include <asm/arch/adsp.h>
 #include <asm/arch/pch.h>
 #include <asm/arch/rcb.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 
 enum pci_type_t {
diff --git a/arch/x86/cpu/broadwell/cpu_full.c b/arch/x86/cpu/broadwell/cpu_full.c
index daf17af3b151..2c676ad2ce2b 100644
--- a/arch/x86/cpu/broadwell/cpu_full.c
+++ b/arch/x86/cpu/broadwell/cpu_full.c
@@ -10,6 +10,7 @@
 #include <cpu.h>
 #include <init.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/cpu.h>
 #include <asm/cpu_x86.h>
 #include <asm/cpu_common.h>
@@ -24,6 +25,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 struct cpu_broadwell_priv {
 	bool ht_disabled;
diff --git a/arch/x86/cpu/broadwell/iobp.c b/arch/x86/cpu/broadwell/iobp.c
index 68c57f4f18a4..68c41695eb52 100644
--- a/arch/x86/cpu/broadwell/iobp.c
+++ b/arch/x86/cpu/broadwell/iobp.c
@@ -12,6 +12,7 @@
 #include <asm/intel_regs.h>
 #include <asm/io.h>
 #include <asm/arch/pch.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 
diff --git a/arch/x86/cpu/broadwell/lpc.c b/arch/x86/cpu/broadwell/lpc.c
index d2638a4e7a6b..280eeb6c745b 100644
--- a/arch/x86/cpu/broadwell/lpc.c
+++ b/arch/x86/cpu/broadwell/lpc.c
@@ -15,6 +15,7 @@
 #include <asm/lpc_common.h>
 #include <asm/arch/pch.h>
 #include <asm/arch/spi.h>
+#include <asm/types.h>
 
 static void set_spi_speed(void)
 {
diff --git a/arch/x86/cpu/broadwell/me.c b/arch/x86/cpu/broadwell/me.c
index 89b7bd15082b..397cba6d343a 100644
--- a/arch/x86/cpu/broadwell/me.c
+++ b/arch/x86/cpu/broadwell/me.c
@@ -12,6 +12,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static inline void me_read_dword_ptr(struct udevice *dev, void *ptr, int offset)
 {
diff --git a/arch/x86/cpu/broadwell/northbridge.c b/arch/x86/cpu/broadwell/northbridge.c
index 4b0dd46f7fe4..2d851ed4fe8c 100644
--- a/arch/x86/cpu/broadwell/northbridge.c
+++ b/arch/x86/cpu/broadwell/northbridge.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <stdio.h>
 #include <asm/global_data.h>
@@ -13,6 +14,7 @@
 #include <asm/arch/pch.h>
 #include <asm/arch/pei_data.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 __weak asmlinkage void sdram_console_tx_byte(unsigned char byte)
 {
diff --git a/arch/x86/cpu/broadwell/pch.c b/arch/x86/cpu/broadwell/pch.c
index f7f975983e6b..b834c8471b95 100644
--- a/arch/x86/cpu/broadwell/pch.c
+++ b/arch/x86/cpu/broadwell/pch.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <log.h>
 #include <pch.h>
+#include <stdbool.h>
 #include <asm/cpu.h>
 #include <asm/global_data.h>
 #include <asm/gpio.h>
@@ -28,6 +29,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #define BIOS_CTRL	0xdc
 
diff --git a/arch/x86/cpu/broadwell/pinctrl_broadwell.c b/arch/x86/cpu/broadwell/pinctrl_broadwell.c
index 0bb28739fdc6..60453956e509 100644
--- a/arch/x86/cpu/broadwell/pinctrl_broadwell.c
+++ b/arch/x86/cpu/broadwell/pinctrl_broadwell.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <pch.h>
 #include <pci.h>
+#include <stdbool.h>
 #include <asm/cpu.h>
 #include <asm/global_data.h>
 #include <asm/gpio.h>
@@ -22,6 +23,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/broadwell/refcode.c b/arch/x86/cpu/broadwell/refcode.c
index ba4a23ac58ff..626b124d942b 100644
--- a/arch/x86/cpu/broadwell/refcode.c
+++ b/arch/x86/cpu/broadwell/refcode.c
@@ -1,6 +1,8 @@
 // SPDX-License-Identifier: GPL-2.0
 /*
  * Read a coreboot rmodule and execute it.
+#include <compiler.h>
+#include <linux/types.h>
  * The rmodule_header struct is from coreboot.
  *
  * Copyright (c) 2016 Google, Inc
diff --git a/arch/x86/cpu/broadwell/sata.c b/arch/x86/cpu/broadwell/sata.c
index 27d6bf706e2f..2bdb1ffae228 100644
--- a/arch/x86/cpu/broadwell/sata.c
+++ b/arch/x86/cpu/broadwell/sata.c
@@ -17,6 +17,7 @@
 #include <asm/pch_common.h>
 #include <asm/arch/pch.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 struct sata_platdata {
 	int port_map;
diff --git a/arch/x86/cpu/broadwell/sdram.c b/arch/x86/cpu/broadwell/sdram.c
index 1d48741f473a..3f1827b7eec7 100644
--- a/arch/x86/cpu/broadwell/sdram.c
+++ b/arch/x86/cpu/broadwell/sdram.c
@@ -27,6 +27,7 @@
 #include <asm/arch/pm.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 ulong board_get_usable_ram_top(ulong total_size)
 {
diff --git a/arch/x86/cpu/coreboot/coreboot.c b/arch/x86/cpu/coreboot/coreboot.c
index cfd97a153199..7f974b766146 100644
--- a/arch/x86/cpu/coreboot/coreboot.c
+++ b/arch/x86/cpu/coreboot/coreboot.c
@@ -17,6 +17,7 @@
 #include <asm/mtrr.h>
 #include <asm/arch/sysinfo.h>
 #include <asm/arch/timestamp.h>
+#include <asm/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/coreboot/sdram.c b/arch/x86/cpu/coreboot/sdram.c
index b8b803f643d7..2c2e656dff00 100644
--- a/arch/x86/cpu/coreboot/sdram.c
+++ b/arch/x86/cpu/coreboot/sdram.c
@@ -13,6 +13,7 @@
 #include <asm/arch/sysinfo.h>
 #include <asm/global_data.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/coreboot/tables.c b/arch/x86/cpu/coreboot/tables.c
index f0c350605e19..68d2805a7bc9 100644
--- a/arch/x86/cpu/coreboot/tables.c
+++ b/arch/x86/cpu/coreboot/tables.c
@@ -7,10 +7,12 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <net.h>
 #include <asm/arch/sysinfo.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/coreboot/timestamp.c b/arch/x86/cpu/coreboot/timestamp.c
index c2072535658a..c7e54de0b2a7 100644
--- a/arch/x86/cpu/coreboot/timestamp.c
+++ b/arch/x86/cpu/coreboot/timestamp.c
@@ -7,10 +7,12 @@
 
 #include <common.h>
 #include <bootstage.h>
+#include <compiler.h>
 #include <asm/arch/timestamp.h>
 #include <asm/arch/sysinfo.h>
 #include <asm/u-boot-x86.h>
 #include <linux/compiler.h>
+#include <linux/types.h>
 
 struct timestamp_entry {
 	uint32_t	entry_id;
diff --git a/arch/x86/cpu/cpu.c b/arch/x86/cpu/cpu.c
index ff4916431b4c..0c4aec8a5891 100644
--- a/arch/x86/cpu/cpu.c
+++ b/arch/x86/cpu/cpu.c
@@ -21,6 +21,7 @@
 #include <common.h>
 #include <bootstage.h>
 #include <command.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <dm.h>
 #include <errno.h>
@@ -51,6 +52,7 @@
 #include <linux/compiler.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/efi/payload.c b/arch/x86/cpu/efi/payload.c
index 9b87cf02418a..2fc09b095517 100644
--- a/arch/x86/cpu/efi/payload.c
+++ b/arch/x86/cpu/efi/payload.c
@@ -19,6 +19,7 @@
 #include <asm/post.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/efi/sdram.c b/arch/x86/cpu/efi/sdram.c
index af65982fd0c0..dadbb87e5ace 100644
--- a/arch/x86/cpu/efi/sdram.c
+++ b/arch/x86/cpu/efi/sdram.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <asm/global_data.h>
 #include <asm/u-boot-x86.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/i386/cpu.c b/arch/x86/cpu/i386/cpu.c
index ddb656f0fda5..6b29644e326a 100644
--- a/arch/x86/cpu/i386/cpu.c
+++ b/arch/x86/cpu/i386/cpu.c
@@ -19,11 +19,13 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <init.h>
 #include <log.h>
 #include <malloc.h>
 #include <spl.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/control_regs.h>
 #include <asm/coreboot_tables.h>
@@ -36,6 +38,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/i386/interrupt.c b/arch/x86/cpu/i386/interrupt.c
index c7d3570a986b..916d5c606e21 100644
--- a/arch/x86/cpu/i386/interrupt.c
+++ b/arch/x86/cpu/i386/interrupt.c
@@ -11,6 +11,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <efi_loader.h>
 #include <hang.h>
@@ -27,6 +28,7 @@
 #include <asm/processor-flags.h>
 #include <asm/ptrace.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/intel_common/cpu.c b/arch/x86/cpu/intel_common/cpu.c
index b5d907126af9..0f7129fb87ed 100644
--- a/arch/x86/cpu/intel_common/cpu.c
+++ b/arch/x86/cpu/intel_common/cpu.c
@@ -25,6 +25,7 @@
 #include <asm/post.h>
 #include <asm/microcode.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/intel_common/fast_spi.c b/arch/x86/cpu/intel_common/fast_spi.c
index 5d3944dee2c8..bb5946450194 100644
--- a/arch/x86/cpu/intel_common/fast_spi.c
+++ b/arch/x86/cpu/intel_common/fast_spi.c
@@ -8,6 +8,7 @@
 #include <asm/cpu_common.h>
 #include <asm/fast_spi.h>
 #include <asm/pci.h>
+#include <linux/types.h>
 
 /*
  * Returns bios_start and fills in size of the BIOS region.
diff --git a/arch/x86/cpu/intel_common/itss.c b/arch/x86/cpu/intel_common/itss.c
index 732a4b4c4f43..0c20b5598f5e 100644
--- a/arch/x86/cpu/intel_common/itss.c
+++ b/arch/x86/cpu/intel_common/itss.c
@@ -17,11 +17,13 @@
 #include <malloc.h>
 #include <p2sb.h>
 #include <spl.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 #include <asm/itss.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 struct itss_platdata {
 #if CONFIG_IS_ENABLED(OF_PLATDATA)
diff --git a/arch/x86/cpu/intel_common/lpc.c b/arch/x86/cpu/intel_common/lpc.c
index 7eaea5c77c82..d6885b683035 100644
--- a/arch/x86/cpu/intel_common/lpc.c
+++ b/arch/x86/cpu/intel_common/lpc.c
@@ -9,6 +9,7 @@
 #include <fdtdec.h>
 #include <pch.h>
 #include <pci.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 #include <asm/intel_regs.h>
 #include <asm/io.h>
@@ -16,6 +17,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/intel_common/microcode.c b/arch/x86/cpu/intel_common/microcode.c
index 157350a89491..aeb23d2941e0 100644
--- a/arch/x86/cpu/intel_common/microcode.c
+++ b/arch/x86/cpu/intel_common/microcode.c
@@ -19,6 +19,7 @@
 #include <asm/msr.h>
 #include <asm/msr-index.h>
 #include <asm/processor.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/intel_common/mrc.c b/arch/x86/cpu/intel_common/mrc.c
index a6e099f6e14b..cf3ac1884e8b 100644
--- a/arch/x86/cpu/intel_common/mrc.c
+++ b/arch/x86/cpu/intel_common/mrc.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <init.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <syscon.h>
 #include <time.h>
@@ -22,6 +23,7 @@
 #include <asm/report_platform.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 static const char *const ecc_decoder[] = {
 	"inactive",
diff --git a/arch/x86/cpu/intel_common/p2sb.c b/arch/x86/cpu/intel_common/p2sb.c
index 53e2f21df965..7a505b29fed7 100644
--- a/arch/x86/cpu/intel_common/p2sb.c
+++ b/arch/x86/cpu/intel_common/p2sb.c
@@ -13,10 +13,12 @@
 #include <log.h>
 #include <p2sb.h>
 #include <spl.h>
+#include <stdbool.h>
 #include <asm/pci.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #define PCH_P2SB_E0		0xe0
 #define HIDE_BIT		BIT(0)
diff --git a/arch/x86/cpu/intel_common/pch.c b/arch/x86/cpu/intel_common/pch.c
index af82b64a13c7..c30ba15855b4 100644
--- a/arch/x86/cpu/intel_common/pch.c
+++ b/arch/x86/cpu/intel_common/pch.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <dm.h>
 #include <asm/pch_common.h>
+#include <asm/types.h>
 
 u32 pch_common_sir_read(struct udevice *dev, int idx)
 {
diff --git a/arch/x86/cpu/intel_common/report_platform.c b/arch/x86/cpu/intel_common/report_platform.c
index 9502b145490d..28284ff2f7d4 100644
--- a/arch/x86/cpu/intel_common/report_platform.c
+++ b/arch/x86/cpu/intel_common/report_platform.c
@@ -13,6 +13,7 @@
 #include <asm/arch/pch.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static void report_cpu_info(void)
 {
diff --git a/arch/x86/cpu/ioapic.c b/arch/x86/cpu/ioapic.c
index 4f99de6ece2b..749ab1a22c3b 100644
--- a/arch/x86/cpu/ioapic.c
+++ b/arch/x86/cpu/ioapic.c
@@ -8,6 +8,7 @@
 #include <asm/io.h>
 #include <asm/ioapic.h>
 #include <asm/lapic.h>
+#include <asm/types.h>
 
 u32 io_apic_read(u32 reg)
 {
diff --git a/arch/x86/cpu/irq.c b/arch/x86/cpu/irq.c
index 920a799ec8e9..6755e8bb89b0 100644
--- a/arch/x86/cpu/irq.c
+++ b/arch/x86/cpu/irq.c
@@ -19,6 +19,7 @@
 #include <asm/pirq_routing.h>
 #include <asm/tables.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/ivybridge/bd82x6x.c b/arch/x86/cpu/ivybridge/bd82x6x.c
index 7df278ddbc43..0bc6f83665a4 100644
--- a/arch/x86/cpu/ivybridge/bd82x6x.c
+++ b/arch/x86/cpu/ivybridge/bd82x6x.c
@@ -24,6 +24,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/ivybridge/cpu.c b/arch/x86/cpu/ivybridge/cpu.c
index 209be6877be5..f7f752977273 100644
--- a/arch/x86/cpu/ivybridge/cpu.c
+++ b/arch/x86/cpu/ivybridge/cpu.c
@@ -36,6 +36,7 @@
 #include <asm/arch/pch.h>
 #include <asm/arch/sandybridge.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/ivybridge/early_me.c b/arch/x86/cpu/ivybridge/early_me.c
index 9758c9a653dc..143a0cda4163 100644
--- a/arch/x86/cpu/ivybridge/early_me.c
+++ b/arch/x86/cpu/ivybridge/early_me.c
@@ -19,6 +19,7 @@
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 static const char *const me_ack_values[] = {
 	[ME_HFS_ACK_NO_DID]	= "No DID Ack received",
diff --git a/arch/x86/cpu/ivybridge/lpc.c b/arch/x86/cpu/ivybridge/lpc.c
index 57c844359822..a901a21456fc 100644
--- a/arch/x86/cpu/ivybridge/lpc.c
+++ b/arch/x86/cpu/ivybridge/lpc.c
@@ -23,6 +23,7 @@
 #include <asm/arch/pch.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/ivybridge/model_206ax.c b/arch/x86/cpu/ivybridge/model_206ax.c
index 087754a1dd99..e4313a1811f6 100644
--- a/arch/x86/cpu/ivybridge/model_206ax.c
+++ b/arch/x86/cpu/ivybridge/model_206ax.c
@@ -12,6 +12,7 @@
 #include <fdtdec.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <asm/cpu.h>
 #include <asm/cpu_common.h>
 #include <asm/cpu_x86.h>
@@ -25,6 +26,7 @@
 #include <asm/arch/model_206ax.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/ivybridge/northbridge.c b/arch/x86/cpu/ivybridge/northbridge.c
index 994f8a4ff6a5..a0c4b29b664e 100644
--- a/arch/x86/cpu/ivybridge/northbridge.c
+++ b/arch/x86/cpu/ivybridge/northbridge.c
@@ -19,6 +19,7 @@
 #include <asm/arch/pch.h>
 #include <asm/arch/model_206ax.h>
 #include <asm/arch/sandybridge.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/x86/cpu/ivybridge/sata.c b/arch/x86/cpu/ivybridge/sata.c
index 40cb04158681..b74f7a796d71 100644
--- a/arch/x86/cpu/ivybridge/sata.c
+++ b/arch/x86/cpu/ivybridge/sata.c
@@ -15,6 +15,7 @@
 #include <asm/pci.h>
 #include <asm/arch/pch.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/ivybridge/sdram.c b/arch/x86/cpu/ivybridge/sdram.c
index 4c1ec37c6005..4ed7db12b1ff 100644
--- a/arch/x86/cpu/ivybridge/sdram.c
+++ b/arch/x86/cpu/ivybridge/sdram.c
@@ -40,6 +40,7 @@
 #include <asm/arch/sandybridge.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/mp_init.c b/arch/x86/cpu/mp_init.c
index 7bf3935ba94a..7225c3392bb2 100644
--- a/arch/x86/cpu/mp_init.c
+++ b/arch/x86/cpu/mp_init.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <cpu.h>
 #include <dm.h>
 #include <errno.h>
@@ -35,6 +36,7 @@
 #include <linux/kernel.h>
 #include <linux/linkage.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/mtrr.c b/arch/x86/cpu/mtrr.c
index da1f08eff819..cbc289888dca 100644
--- a/arch/x86/cpu/mtrr.c
+++ b/arch/x86/cpu/mtrr.c
@@ -27,6 +27,7 @@
 #include <asm/msr.h>
 #include <asm/mtrr.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/pci.c b/arch/x86/cpu/pci.c
index d4f9290ca73b..04877094ad12 100644
--- a/arch/x86/cpu/pci.c
+++ b/arch/x86/cpu/pci.c
@@ -16,6 +16,7 @@
 #include <pci.h>
 #include <asm/io.h>
 #include <asm/pci.h>
+#include <linux/types.h>
 
 int pci_x86_read_config(pci_dev_t bdf, uint offset, ulong *valuep,
 			enum pci_size_t size)
diff --git a/arch/x86/cpu/qemu/dram.c b/arch/x86/cpu/qemu/dram.c
index c1745501294c..3a29de6cc31d 100644
--- a/arch/x86/cpu/qemu/dram.c
+++ b/arch/x86/cpu/qemu/dram.c
@@ -8,6 +8,7 @@
 #include <asm/global_data.h>
 #include <asm/post.h>
 #include <asm/arch/qemu.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/qemu/qemu.c b/arch/x86/cpu/qemu/qemu.c
index 5e431f21976d..786906dee5b8 100644
--- a/arch/x86/cpu/qemu/qemu.c
+++ b/arch/x86/cpu/qemu/qemu.c
@@ -14,6 +14,7 @@
 #include <asm/processor.h>
 #include <asm/arch/device.h>
 #include <asm/arch/qemu.h>
+#include <linux/types.h>
 
 static bool i440fx;
 
diff --git a/arch/x86/cpu/quark/acpi.c b/arch/x86/cpu/quark/acpi.c
index 655f2a1ce6ac..013b1d943b1a 100644
--- a/arch/x86/cpu/quark/acpi.c
+++ b/arch/x86/cpu/quark/acpi.c
@@ -9,6 +9,7 @@
 #include <asm/tables.h>
 #include <asm/arch/global_nvs.h>
 #include <asm/arch/iomap.h>
+#include <asm/types.h>
 #include <linux/string.h>
 
 void acpi_create_fadt(struct acpi_fadt *fadt, struct acpi_facs *facs,
diff --git a/arch/x86/cpu/quark/dram.c b/arch/x86/cpu/quark/dram.c
index e2a36ceffd41..2feb0e894365 100644
--- a/arch/x86/cpu/quark/dram.c
+++ b/arch/x86/cpu/quark/dram.c
@@ -20,6 +20,7 @@
 #include <asm/arch/quark.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/quark/hte.c b/arch/x86/cpu/quark/hte.c
index df14779357d5..489208d0b9bb 100644
--- a/arch/x86/cpu/quark/hte.c
+++ b/arch/x86/cpu/quark/hte.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <asm/arch/mrc.h>
 #include <asm/arch/msg_port.h>
+#include <asm/types.h>
 #include "mrc_util.h"
 #include "hte.h"
 
diff --git a/arch/x86/cpu/quark/hte.h b/arch/x86/cpu/quark/hte.h
index b4ea488f30f3..322b556c22c1 100644
--- a/arch/x86/cpu/quark/hte.h
+++ b/arch/x86/cpu/quark/hte.h
@@ -10,6 +10,7 @@
 #ifndef _HTE_H_
 #define _HTE_H_
 
+#include <asm/types.h>
 enum {
 	MRC_MEM_INIT,
 	MRC_MEM_TEST
diff --git a/arch/x86/cpu/quark/mrc.c b/arch/x86/cpu/quark/mrc.c
index 7e8f31fb6b7c..7a7d69a6a114 100644
--- a/arch/x86/cpu/quark/mrc.c
+++ b/arch/x86/cpu/quark/mrc.c
@@ -12,6 +12,7 @@
  *
  * These functions are generic and should work for any Quark-based board.
  *
+#include <linux/types.h>
  * MRC requires two data structures to be passed in which are initialized by
  * mrc_adjust_params().
  *
diff --git a/arch/x86/cpu/quark/mrc_util.c b/arch/x86/cpu/quark/mrc_util.c
index 50fcd977bb41..bc19718ef72f 100644
--- a/arch/x86/cpu/quark/mrc_util.c
+++ b/arch/x86/cpu/quark/mrc_util.c
@@ -15,6 +15,7 @@
 #include <asm/arch/mrc.h>
 #include <asm/arch/msg_port.h>
 #include <asm/arch/quark.h>
+#include <linux/types.h>
 #include "mrc_util.h"
 #include "hte.h"
 #include "smc.h"
diff --git a/arch/x86/cpu/quark/mrc_util.h b/arch/x86/cpu/quark/mrc_util.h
index f4e3e87b6c37..89d2f6351fd2 100644
--- a/arch/x86/cpu/quark/mrc_util.h
+++ b/arch/x86/cpu/quark/mrc_util.h
@@ -12,6 +12,7 @@
 
 #include <log.h>
 #include <stdbool.h>
+#include <linux/types.h>
 
 /* Turn on this macro to enable MRC debugging output */
 #undef  MRC_DEBUG
diff --git a/arch/x86/cpu/quark/msg_port.c b/arch/x86/cpu/quark/msg_port.c
index d4f8c082ffc2..f270eb7bb83f 100644
--- a/arch/x86/cpu/quark/msg_port.c
+++ b/arch/x86/cpu/quark/msg_port.c
@@ -7,6 +7,7 @@
 #include <asm/arch/device.h>
 #include <asm/arch/msg_port.h>
 #include <asm/arch/quark.h>
+#include <asm/types.h>
 
 void msg_port_setup(int op, int port, int reg)
 {
diff --git a/arch/x86/cpu/quark/quark.c b/arch/x86/cpu/quark/quark.c
index 30b4711b9a59..2099cb1a17e5 100644
--- a/arch/x86/cpu/quark/quark.c
+++ b/arch/x86/cpu/quark/quark.c
@@ -18,6 +18,7 @@
 #include <asm/arch/device.h>
 #include <asm/arch/msg_port.h>
 #include <asm/arch/quark.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 static void quark_setup_mtrr(void)
diff --git a/arch/x86/cpu/quark/smc.c b/arch/x86/cpu/quark/smc.c
index c95c09a67bad..2e27463c3cb1 100644
--- a/arch/x86/cpu/quark/smc.c
+++ b/arch/x86/cpu/quark/smc.c
@@ -15,6 +15,7 @@
 #include <asm/arch/mrc.h>
 #include <asm/arch/msg_port.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "mrc_util.h"
 #include "hte.h"
 #include "smc.h"
diff --git a/arch/x86/cpu/quark/smc.h b/arch/x86/cpu/quark/smc.h
index eee27564c877..5c4917ee0b49 100644
--- a/arch/x86/cpu/quark/smc.h
+++ b/arch/x86/cpu/quark/smc.h
@@ -13,6 +13,7 @@
 /* System Memory Controller Register Defines */
 
 /* Memory Controller Message Bus Registers Offsets */
+#include <linux/types.h>
 #define DRP			0x00
 #define DTR0			0x01
 #define DTR1			0x02
diff --git a/arch/x86/cpu/queensbay/tnc.c b/arch/x86/cpu/queensbay/tnc.c
index 782ed863fe7c..a5a963f0b76f 100644
--- a/arch/x86/cpu/queensbay/tnc.c
+++ b/arch/x86/cpu/queensbay/tnc.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <dm.h>
 #include <init.h>
+#include <asm/types.h>
 #include <dm/device-internal.h>
 #include <pci.h>
 #include <asm/io.h>
diff --git a/arch/x86/cpu/slimbootloader/sdram.c b/arch/x86/cpu/slimbootloader/sdram.c
index 2c7be397adbb..ac73ef43b9b0 100644
--- a/arch/x86/cpu/slimbootloader/sdram.c
+++ b/arch/x86/cpu/slimbootloader/sdram.c
@@ -11,6 +11,7 @@
 #include <linux/sizes.h>
 #include <asm/e820.h>
 #include <asm/arch/slimbootloader.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/tangier/acpi.c b/arch/x86/cpu/tangier/acpi.c
index 8aa5efdcab9c..404c891de63c 100644
--- a/arch/x86/cpu/tangier/acpi.c
+++ b/arch/x86/cpu/tangier/acpi.c
@@ -15,6 +15,7 @@
 #include <asm/tables.h>
 #include <asm/arch/global_nvs.h>
 #include <asm/arch/iomap.h>
+#include <asm/types.h>
 #include <dm/uclass-internal.h>
 #include <linux/string.h>
 
diff --git a/arch/x86/cpu/tangier/pinmux.c b/arch/x86/cpu/tangier/pinmux.c
index 41ad198a0609..42c682788203 100644
--- a/arch/x86/cpu/tangier/pinmux.c
+++ b/arch/x86/cpu/tangier/pinmux.c
@@ -4,8 +4,10 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
+#include <stdbool.h>
 #include <dm/pinctrl.h>
 #include <dm/read.h>
 #include <regmap.h>
@@ -16,6 +18,7 @@
 #include <linux/io.h>
 #include <linux/kernel.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 #define BUFCFG_OFFSET				0x100
 
diff --git a/arch/x86/cpu/tangier/sdram.c b/arch/x86/cpu/tangier/sdram.c
index a8760263cf4b..0553c9033a0d 100644
--- a/arch/x86/cpu/tangier/sdram.c
+++ b/arch/x86/cpu/tangier/sdram.c
@@ -9,6 +9,7 @@
 #include <asm/e820.h>
 #include <asm/global_data.h>
 #include <asm/sfi.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
diff --git a/arch/x86/include/asm/acpi_nhlt.h b/arch/x86/include/asm/acpi_nhlt.h
index 47203213818f..cf28370aa16c 100644
--- a/arch/x86/include/asm/acpi_nhlt.h
+++ b/arch/x86/include/asm/acpi_nhlt.h
@@ -8,6 +8,7 @@
 #ifndef _NHLT_H_
 #define _NHLT_H_
 
+#include <linux/types.h>
 struct acpi_ctx;
 struct nhlt;
 struct nhlt_endpoint;
diff --git a/arch/x86/include/asm/acpi_table.h b/arch/x86/include/asm/acpi_table.h
index 733085c17851..199d7314060b 100644
--- a/arch/x86/include/asm/acpi_table.h
+++ b/arch/x86/include/asm/acpi_table.h
@@ -9,6 +9,7 @@
 #ifndef __ASM_ACPI_TABLE_H__
 #define __ASM_ACPI_TABLE_H__
 
+#include <linux/types.h>
 struct acpi_facs;
 struct acpi_fadt;
 struct acpi_global_nvs;
diff --git a/arch/x86/include/asm/arch-apollolake/fsp/fsp_m_upd.h b/arch/x86/include/asm/arch-apollolake/fsp/fsp_m_upd.h
index 78c338e9ffa9..c7d2b4aa6323 100644
--- a/arch/x86/include/asm/arch-apollolake/fsp/fsp_m_upd.h
+++ b/arch/x86/include/asm/arch-apollolake/fsp/fsp_m_upd.h
@@ -8,7 +8,9 @@
 #define	__ASM_ARCH_FSP_M_UDP_H
 
 #ifndef __ASSEMBLY__
+#include <compiler.h>
 #include <asm/fsp2/fsp_api.h>
+#include <asm/types.h>
 
 #define FSP_DRAM_CHANNELS	4
 
diff --git a/arch/x86/include/asm/arch-apollolake/fsp/fsp_s_upd.h b/arch/x86/include/asm/arch-apollolake/fsp/fsp_s_upd.h
index be80f5db09a9..aadfcb3687fa 100644
--- a/arch/x86/include/asm/arch-apollolake/fsp/fsp_s_upd.h
+++ b/arch/x86/include/asm/arch-apollolake/fsp/fsp_s_upd.h
@@ -7,7 +7,9 @@
 #define __ASM_ARCH_FSP_S_UDP_H
 
 #ifndef __ASSEMBLY__
+#include <compiler.h>
 #include <asm/fsp2/fsp_api.h>
+#include <asm/types.h>
 
 /**
  * struct fsp_s_config - FSP-S configuration
diff --git a/arch/x86/include/asm/arch-apollolake/fsp_bindings.h b/arch/x86/include/asm/arch-apollolake/fsp_bindings.h
index 7a3060d4b46d..9c298a58fd9c 100644
--- a/arch/x86/include/asm/arch-apollolake/fsp_bindings.h
+++ b/arch/x86/include/asm/arch-apollolake/fsp_bindings.h
@@ -10,6 +10,7 @@
 #include <asm/arch/fsp/fsp_m_upd.h>
 #include <asm/arch/fsp/fsp_s_upd.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #define ARRAY_SIZE_OF_MEMBER(s, m) (ARRAY_SIZE((((s *)0)->m)))
 #define SIZE_OF_MEMBER(s, m) (sizeof((((s *)0)->m)))
diff --git a/arch/x86/include/asm/arch-apollolake/global_nvs.h b/arch/x86/include/asm/arch-apollolake/global_nvs.h
index fe62194b02ee..917d34621b9d 100644
--- a/arch/x86/include/asm/arch-apollolake/global_nvs.h
+++ b/arch/x86/include/asm/arch-apollolake/global_nvs.h
@@ -10,6 +10,8 @@
 #ifndef _GLOBAL_NVS_H_
 #define _GLOBAL_NVS_H_
 
+#include <compiler.h>
+#include <asm/types.h>
 struct __packed acpi_global_nvs {
 	/* Miscellaneous */
 	u8	pcnt; /* 0x00 - Processor Count */
diff --git a/arch/x86/include/asm/arch-apollolake/lpc.h b/arch/x86/include/asm/arch-apollolake/lpc.h
index 977b7eccd884..c22e6903b8ee 100644
--- a/arch/x86/include/asm/arch-apollolake/lpc.h
+++ b/arch/x86/include/asm/arch-apollolake/lpc.h
@@ -8,6 +8,7 @@
 #define _ASM_ARCH_LPC_H
 
 #include <linux/bitops.h>
+#include <linux/types.h>
 #define LPC_SERIRQ_CTL			0x64
 #define  LPC_SCNT_EN			BIT(7)
 #define  LPC_SCNT_MODE			BIT(6)
diff --git a/arch/x86/include/asm/arch-apollolake/uart.h b/arch/x86/include/asm/arch-apollolake/uart.h
index d4fffe6525c7..35e5d24b6f3c 100644
--- a/arch/x86/include/asm/arch-apollolake/uart.h
+++ b/arch/x86/include/asm/arch-apollolake/uart.h
@@ -15,6 +15,7 @@
  * The UART won't actually work unless the GPIO settings are correct and the
  * signals actually exit the SoC. See board_debug_uart_init() for that.
  */
+#include <linux/types.h>
 int apl_uart_init(pci_dev_t bdf, ulong base);
 
 #endif
diff --git a/arch/x86/include/asm/arch-baytrail/fsp/fsp_vpd.h b/arch/x86/include/asm/arch-baytrail/fsp/fsp_vpd.h
index c6544ea409ca..b561fb38e938 100644
--- a/arch/x86/include/asm/arch-baytrail/fsp/fsp_vpd.h
+++ b/arch/x86/include/asm/arch-baytrail/fsp/fsp_vpd.h
@@ -7,6 +7,8 @@
 #ifndef __FSP_VPD_H
 #define __FSP_VPD_H
 
+#include <compiler.h>
+#include <linux/types.h>
 struct memory_down_data {
 	uint8_t enable_memory_down;
 	uint8_t dram_speed;
diff --git a/arch/x86/include/asm/arch-baytrail/global_nvs.h b/arch/x86/include/asm/arch-baytrail/global_nvs.h
index 1072e3ddf40d..777591b72c2b 100644
--- a/arch/x86/include/asm/arch-baytrail/global_nvs.h
+++ b/arch/x86/include/asm/arch-baytrail/global_nvs.h
@@ -6,6 +6,8 @@
 #ifndef _GLOBAL_NVS_H_
 #define _GLOBAL_NVS_H_
 
+#include <compiler.h>
+#include <asm/types.h>
 struct __packed acpi_global_nvs {
 	u8	pcnt;		/* processor count */
 	u8	iuart_en;	/* internal UART enabled */
diff --git a/arch/x86/include/asm/arch-braswell/fsp/fsp_vpd.h b/arch/x86/include/asm/arch-braswell/fsp/fsp_vpd.h
index f2260ae90e88..eec075154d1b 100644
--- a/arch/x86/include/asm/arch-braswell/fsp/fsp_vpd.h
+++ b/arch/x86/include/asm/arch-braswell/fsp/fsp_vpd.h
@@ -7,7 +7,9 @@
 #ifndef __FSP_VPD_H__
 #define __FSP_VPD_H__
 
+#include <compiler.h>
 #include <stddef.h>
+#include <asm/types.h>
 
 struct __packed memory_upd {
 	u64 signature;				/* Offset 0x0020 */
diff --git a/arch/x86/include/asm/arch-broadwell/gpio.h b/arch/x86/include/asm/arch-broadwell/gpio.h
index b5dd5ab4e7f8..33cb942bcc81 100644
--- a/arch/x86/include/asm/arch-broadwell/gpio.h
+++ b/arch/x86/include/asm/arch-broadwell/gpio.h
@@ -9,6 +9,7 @@
 #define __ASM_ARCH_GPIO
 
 #include <linux/kernel.h>
+#include <linux/types.h>
 #define GPIO_PER_BANK	32
 #define GPIO_BANKS	3
 
diff --git a/arch/x86/include/asm/arch-broadwell/me.h b/arch/x86/include/asm/arch-broadwell/me.h
index 58f16ba54c57..ceaa0f2bd311 100644
--- a/arch/x86/include/asm/arch-broadwell/me.h
+++ b/arch/x86/include/asm/arch-broadwell/me.h
@@ -8,7 +8,9 @@
 #ifndef _asm_arch_me_h
 #define _asm_arch_me_h
 
+#include <compiler.h>
 #include <asm/me_common.h>
+#include <asm/types.h>
 
 #define  ME_INIT_STATUS_SUCCESS_OTHER 3 /* SEE ME9 BWG */
 
diff --git a/arch/x86/include/asm/arch-broadwell/pch.h b/arch/x86/include/asm/arch-broadwell/pch.h
index 6b6f10ec6c86..9e991c35cc68 100644
--- a/arch/x86/include/asm/arch-broadwell/pch.h
+++ b/arch/x86/include/asm/arch-broadwell/pch.h
@@ -7,6 +7,7 @@
 #define __ASM_ARCH_PCH_H
 
 #include <stdbool.h>
+#include <asm/types.h>
 
 #define PMBASE			0x40
 #define ACPI_CNTL		0x44
diff --git a/arch/x86/include/asm/arch-broadwell/pei_data.h b/arch/x86/include/asm/arch-broadwell/pei_data.h
index 4442beac5e44..5eee0502bbab 100644
--- a/arch/x86/include/asm/arch-broadwell/pei_data.h
+++ b/arch/x86/include/asm/arch-broadwell/pei_data.h
@@ -8,7 +8,9 @@
 #ifndef ASM_ARCH_PEI_DATA_H
 #define ASM_ARCH_PEI_DATA_H
 
+#include <compiler.h>
 #include <linux/linkage.h>
+#include <linux/types.h>
 
 #define PEI_VERSION 22
 
diff --git a/arch/x86/include/asm/arch-broadwell/pm.h b/arch/x86/include/asm/arch-broadwell/pm.h
index df350808379a..6a14ebecaae7 100644
--- a/arch/x86/include/asm/arch-broadwell/pm.h
+++ b/arch/x86/include/asm/arch-broadwell/pm.h
@@ -8,6 +8,7 @@
 #ifndef __ASM_ARCH_PM_H
 #define __ASM_ARCH_PM_H
 
+#include <linux/types.h>
 #define PM1_STS			0x00
 #define  WAK_STS		(1 << 15)
 #define  PCIEXPWAK_STS		(1 << 14)
diff --git a/arch/x86/include/asm/arch-coreboot/sysinfo.h b/arch/x86/include/asm/arch-coreboot/sysinfo.h
index 419ec5293350..f9096ba7c18d 100644
--- a/arch/x86/include/asm/arch-coreboot/sysinfo.h
+++ b/arch/x86/include/asm/arch-coreboot/sysinfo.h
@@ -9,6 +9,7 @@
 #define _COREBOOT_SYSINFO_H
 
 #include <asm/coreboot_tables.h>
+#include <asm/types.h>
 
 /* Maximum number of memory range definitions */
 #define SYSINFO_MAX_MEM_RANGES	32
diff --git a/arch/x86/include/asm/arch-coreboot/timestamp.h b/arch/x86/include/asm/arch-coreboot/timestamp.h
index 85d42c02c46a..d6db2ea0e5db 100644
--- a/arch/x86/include/asm/arch-coreboot/timestamp.h
+++ b/arch/x86/include/asm/arch-coreboot/timestamp.h
@@ -8,6 +8,7 @@
 #ifndef __COREBOOT_TIMESTAMP_H__
 #define __COREBOOT_TIMESTAMP_H__
 
+#include <linux/types.h>
 enum timestamp_id {
 	/* coreboot specific timestamp IDs */
 	TS_START_ROMSTAGE = 1,
diff --git a/arch/x86/include/asm/arch-ivybridge/fsp/fsp_configs.h b/arch/x86/include/asm/arch-ivybridge/fsp/fsp_configs.h
index ae9105b6ef16..2c290b5d293e 100644
--- a/arch/x86/include/asm/arch-ivybridge/fsp/fsp_configs.h
+++ b/arch/x86/include/asm/arch-ivybridge/fsp/fsp_configs.h
@@ -6,6 +6,7 @@
 #ifndef __FSP_CONFIGS_H__
 #define __FSP_CONFIGS_H__
 
+#include <asm/types.h>
 struct platform_config {
 	u8 enable_ht;
 	u8 enable_turbo;
diff --git a/arch/x86/include/asm/arch-ivybridge/me.h b/arch/x86/include/asm/arch-ivybridge/me.h
index 518c308d59b6..c832b0293046 100644
--- a/arch/x86/include/asm/arch-ivybridge/me.h
+++ b/arch/x86/include/asm/arch-ivybridge/me.h
@@ -8,7 +8,9 @@
 #ifndef _ASM_INTEL_ME_H
 #define _ASM_INTEL_ME_H
 
+#include <compiler.h>
 #include <asm/me_common.h>
+#include <asm/types.h>
 
 struct __packed mbp_fw_version_name {
 	u32 major_version:16;
diff --git a/arch/x86/include/asm/arch-ivybridge/model_206ax.h b/arch/x86/include/asm/arch-ivybridge/model_206ax.h
index d2d28746974f..3df4b37bb58d 100644
--- a/arch/x86/include/asm/arch-ivybridge/model_206ax.h
+++ b/arch/x86/include/asm/arch-ivybridge/model_206ax.h
@@ -9,6 +9,7 @@
 #define _ASM_ARCH_MODEL_206AX_H
 
 #include <stdbool.h>
+#include <asm/types.h>
 #define  CPUID_VMX			(1 << 5)
 #define  CPUID_SMX			(1 << 6)
 #define MSR_FEATURE_CONFIG		0x13c
diff --git a/arch/x86/include/asm/arch-ivybridge/pch.h b/arch/x86/include/asm/arch-ivybridge/pch.h
index 8018bc097d0c..8630ec581e1f 100644
--- a/arch/x86/include/asm/arch-ivybridge/pch.h
+++ b/arch/x86/include/asm/arch-ivybridge/pch.h
@@ -12,6 +12,7 @@
 #define _ASM_ARCH_PCH_H
 
 #include <pci.h>
+#include <asm/types.h>
 
 /* PCH types */
 #define PCH_TYPE_CPT	0x1c /* CougarPoint */
diff --git a/arch/x86/include/asm/arch-ivybridge/pei_data.h b/arch/x86/include/asm/arch-ivybridge/pei_data.h
index b8da21bed7bf..6b7fd6ce4607 100644
--- a/arch/x86/include/asm/arch-ivybridge/pei_data.h
+++ b/arch/x86/include/asm/arch-ivybridge/pei_data.h
@@ -6,7 +6,9 @@
 #ifndef ASM_ARCH_PEI_DATA_H
 #define ASM_ARCH_PEI_DATA_H
 
+#include <compiler.h>
 #include <linux/linkage.h>
+#include <linux/types.h>
 
 struct pch_usb3_controller_settings {
 	/* 0: Disable, 1: Enable, 2: Auto, 3: Smart Auto */
diff --git a/arch/x86/include/asm/arch-qemu/qemu.h b/arch/x86/include/asm/arch-qemu/qemu.h
index 061735b29858..8b0df2998b0b 100644
--- a/arch/x86/include/asm/arch-qemu/qemu.h
+++ b/arch/x86/include/asm/arch-qemu/qemu.h
@@ -7,6 +7,7 @@
 #define _ARCH_QEMU_H_
 
 /* Programmable Attribute Map (PAM) Registers */
+#include <asm/types.h>
 #define I440FX_PAM		0x59
 #define Q35_PAM			0x90
 #define PAM_NUM			7
diff --git a/arch/x86/include/asm/arch-quark/global_nvs.h b/arch/x86/include/asm/arch-quark/global_nvs.h
index 6e99e6737dd3..45c35dcaadea 100644
--- a/arch/x86/include/asm/arch-quark/global_nvs.h
+++ b/arch/x86/include/asm/arch-quark/global_nvs.h
@@ -6,6 +6,8 @@
 #ifndef _GLOBAL_NVS_H_
 #define _GLOBAL_NVS_H_
 
+#include <compiler.h>
+#include <asm/types.h>
 struct __packed acpi_global_nvs {
 	u8	pcnt;		/* processor count */
 
diff --git a/arch/x86/include/asm/arch-quark/mrc.h b/arch/x86/include/asm/arch-quark/mrc.h
index 2353426cd6d2..e817dba55c64 100644
--- a/arch/x86/include/asm/arch-quark/mrc.h
+++ b/arch/x86/include/asm/arch-quark/mrc.h
@@ -10,6 +10,7 @@
 #ifndef _MRC_H_
 #define _MRC_H_
 
+#include <linux/types.h>
 #define MRC_VERSION	0x0111
 
 /* architectural definitions */
diff --git a/arch/x86/include/asm/arch-quark/msg_port.h b/arch/x86/include/asm/arch-quark/msg_port.h
index 9527fdad3fd4..093e8c7a14aa 100644
--- a/arch/x86/include/asm/arch-quark/msg_port.h
+++ b/arch/x86/include/asm/arch-quark/msg_port.h
@@ -41,6 +41,7 @@
  * @port:   port number on the message bus
  * @reg:    register number within a port
  */
+#include <asm/types.h>
 void msg_port_setup(int op, int port, int reg);
 
 /**
diff --git a/arch/x86/include/asm/arch-quark/quark.h b/arch/x86/include/asm/arch-quark/quark.h
index feca1983ba89..7a42db59b1a7 100644
--- a/arch/x86/include/asm/arch-quark/quark.h
+++ b/arch/x86/include/asm/arch-quark/quark.h
@@ -72,6 +72,7 @@
 #ifndef __ASSEMBLY__
 
 /* variable range MTRR usage */
+#include <asm/types.h>
 enum {
 	MTRR_VAR_ROM,
 	MTRR_VAR_ESRAM,
diff --git a/arch/x86/include/asm/arch-queensbay/fsp/fsp_vpd.h b/arch/x86/include/asm/arch-queensbay/fsp/fsp_vpd.h
index 7572fc7e40fd..fe793efce940 100644
--- a/arch/x86/include/asm/arch-queensbay/fsp/fsp_vpd.h
+++ b/arch/x86/include/asm/arch-queensbay/fsp/fsp_vpd.h
@@ -9,6 +9,8 @@
 #ifndef __VPDHEADER_H__
 #define __VPDHEADER_H__
 
+#include <compiler.h>
+#include <asm/types.h>
 struct __packed upd_region {
 	u64	sign;			/* Offset 0x0000 */
 	u64	reserved;		/* Offset 0x0008 */
diff --git a/arch/x86/include/asm/arch-queensbay/tnc.h b/arch/x86/include/asm/arch-queensbay/tnc.h
index 8d151509ab97..70d810959a75 100644
--- a/arch/x86/include/asm/arch-queensbay/tnc.h
+++ b/arch/x86/include/asm/arch-queensbay/tnc.h
@@ -7,6 +7,7 @@
 #define _X86_ARCH_TNC_H_
 
 /* IGD Function Disable Register */
+#include <asm/types.h>
 #define IGD_FD		0xc4
 #define FUNC_DISABLE	0x00000001
 
diff --git a/arch/x86/include/asm/arch-slimbootloader/slimbootloader.h b/arch/x86/include/asm/arch-slimbootloader/slimbootloader.h
index 05dd1b2b4471..05c683445eca 100644
--- a/arch/x86/include/asm/arch-slimbootloader/slimbootloader.h
+++ b/arch/x86/include/asm/arch-slimbootloader/slimbootloader.h
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <asm/hob.h>
+#include <asm/types.h>
 
 /**
  * A GUID to get MemoryMap info hob which is provided by Slim Bootloader
diff --git a/arch/x86/include/asm/arch-tangier/global_nvs.h b/arch/x86/include/asm/arch-tangier/global_nvs.h
index a7811a331a1c..31794b9d3c1b 100644
--- a/arch/x86/include/asm/arch-tangier/global_nvs.h
+++ b/arch/x86/include/asm/arch-tangier/global_nvs.h
@@ -8,6 +8,8 @@
 #ifndef _GLOBAL_NVS_H_
 #define _GLOBAL_NVS_H_
 
+#include <compiler.h>
+#include <asm/types.h>
 struct __packed acpi_global_nvs {
 	u8	pcnt;		/* processor count */
 
diff --git a/arch/x86/include/asm/bootm.h b/arch/x86/include/asm/bootm.h
index 231d11340caf..61e66b51db6f 100644
--- a/arch/x86/include/asm/bootm.h
+++ b/arch/x86/include/asm/bootm.h
@@ -7,6 +7,7 @@
 #define ARM_BOOTM_H
 
 #include <stdbool.h>
+#include <linux/types.h>
 void bootm_announce_and_cleanup(void);
 
 /**
diff --git a/arch/x86/include/asm/coreboot_tables.h b/arch/x86/include/asm/coreboot_tables.h
index 7e1576768bee..5db5f8d00c5d 100644
--- a/arch/x86/include/asm/coreboot_tables.h
+++ b/arch/x86/include/asm/coreboot_tables.h
@@ -8,6 +8,8 @@
 #ifndef _COREBOOT_TABLES_H
 #define _COREBOOT_TABLES_H
 
+#include <compiler.h>
+#include <linux/types.h>
 struct memory_area;
 
 struct cbuint64 {
diff --git a/arch/x86/include/asm/cpu.h b/arch/x86/include/asm/cpu.h
index 21a05dab7de8..a0ecce304cfb 100644
--- a/arch/x86/include/asm/cpu.h
+++ b/arch/x86/include/asm/cpu.h
@@ -10,6 +10,7 @@
 #ifndef _ASM_CPU_H
 #define _ASM_CPU_H
 
+#include <linux/types.h>
 enum {
 	X86_VENDOR_INVALID = 0,
 	X86_VENDOR_INTEL,
diff --git a/arch/x86/include/asm/cpu_common.h b/arch/x86/include/asm/cpu_common.h
index 67d150b8d915..526d3fbcbab0 100644
--- a/arch/x86/include/asm/cpu_common.h
+++ b/arch/x86/include/asm/cpu_common.h
@@ -9,6 +9,7 @@
 #define __ASM_CPU_COMMON_H
 
 #include <stdbool.h>
+#include <linux/types.h>
 
 /* Standard Intel bus clock is fixed at 100MHz */
 enum {
diff --git a/arch/x86/include/asm/early_cmos.h b/arch/x86/include/asm/early_cmos.h
index 543a9e69f03a..42dca5a0787f 100644
--- a/arch/x86/include/asm/early_cmos.h
+++ b/arch/x86/include/asm/early_cmos.h
@@ -7,6 +7,7 @@
 #define __EARLY_CMOS_H
 
 /* CMOS actually resides in the RTC SRAM */
+#include <asm/types.h>
 #define CMOS_IO_PORT	0x70
 
 /**
diff --git a/arch/x86/include/asm/fast_spi.h b/arch/x86/include/asm/fast_spi.h
index ed436a891135..0a059bf0b1eb 100644
--- a/arch/x86/include/asm/fast_spi.h
+++ b/arch/x86/include/asm/fast_spi.h
@@ -9,6 +9,7 @@
 #include <pci.h>
 #include <linux/bitops.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 /* Register offsets from the MMIO region base (PCI_BASE_ADDRESS_0) */
 struct fast_spi_regs {
diff --git a/arch/x86/include/asm/fsp/fsp_api.h b/arch/x86/include/asm/fsp/fsp_api.h
index 4941e2d74f09..1a0d3f8ffa58 100644
--- a/arch/x86/include/asm/fsp/fsp_api.h
+++ b/arch/x86/include/asm/fsp/fsp_api.h
@@ -6,6 +6,7 @@
 #ifndef __ASM_FSP_API_H
 #define __ASM_FSP_API_H
 
+#include <asm/types.h>
 #include <linux/linkage.h>
 
 enum fsp_phase {
diff --git a/arch/x86/include/asm/fsp/fsp_azalia.h b/arch/x86/include/asm/fsp/fsp_azalia.h
index e59180bdae20..9b71c79f7b52 100644
--- a/arch/x86/include/asm/fsp/fsp_azalia.h
+++ b/arch/x86/include/asm/fsp/fsp_azalia.h
@@ -7,6 +7,8 @@
 #ifndef _FSP_AZALIA_H_
 #define _FSP_AZALIA_H_
 
+#include <compiler.h>
+#include <asm/types.h>
 struct __packed azalia_verb_table_header {
 	u32 vendor_device_id;
 	u16 sub_system_id;
diff --git a/arch/x86/include/asm/fsp/fsp_fv.h b/arch/x86/include/asm/fsp/fsp_fv.h
index 7492c87c34ab..862627f137f4 100644
--- a/arch/x86/include/asm/fsp/fsp_fv.h
+++ b/arch/x86/include/asm/fsp/fsp_fv.h
@@ -8,6 +8,7 @@
 #define __FSP_FV___
 
 #include <efi.h>
+#include <asm/types.h>
 
 /* Value of EFI_FV_FILE_ATTRIBUTES */
 #define EFI_FV_FILE_ATTR_ALIGNMENT	0x0000001F
diff --git a/arch/x86/include/asm/fsp/fsp_hob.h b/arch/x86/include/asm/fsp/fsp_hob.h
index d248520e9726..d2eeecf2e39b 100644
--- a/arch/x86/include/asm/fsp/fsp_hob.h
+++ b/arch/x86/include/asm/fsp/fsp_hob.h
@@ -7,7 +7,9 @@
 #ifndef __FSP_HOB_H__
 #define __FSP_HOB_H__
 
+#include <compiler.h>
 #include <asm/hob.h>
+#include <asm/types.h>
 
 enum pixel_format {
 	pixel_rgbx_8bpc,	/* RGB 8 bit per color */
diff --git a/arch/x86/include/asm/fsp/fsp_infoheader.h b/arch/x86/include/asm/fsp/fsp_infoheader.h
index e72c052ed1ec..691c135ae35a 100644
--- a/arch/x86/include/asm/fsp/fsp_infoheader.h
+++ b/arch/x86/include/asm/fsp/fsp_infoheader.h
@@ -7,6 +7,8 @@
 #ifndef _FSP_HEADER_H_
 #define _FSP_HEADER_H_
 
+#include <compiler.h>
+#include <asm/types.h>
 #define FSP_HEADER_OFF	0x94	/* Fixed FSP header offset in the FSP image */
 
 struct __packed fsp_header {
diff --git a/arch/x86/include/asm/fsp/fsp_support.h b/arch/x86/include/asm/fsp/fsp_support.h
index 29e511415cdc..8d1fc0ef296f 100644
--- a/arch/x86/include/asm/fsp/fsp_support.h
+++ b/arch/x86/include/asm/fsp/fsp_support.h
@@ -14,6 +14,7 @@
 #include <asm/fsp/fsp_types.h>
 #include <asm/fsp_arch.h>
 #include <asm/fsp/fsp_azalia.h>
+#include <asm/types.h>
 
 #define FSP_LOWMEM_BASE		0x100000UL
 #define FSP_HIGHMEM_BASE	0x100000000ULL
diff --git a/arch/x86/include/asm/fsp1/fsp_api.h b/arch/x86/include/asm/fsp1/fsp_api.h
index 524da5feb750..e4881d6a93db 100644
--- a/arch/x86/include/asm/fsp1/fsp_api.h
+++ b/arch/x86/include/asm/fsp1/fsp_api.h
@@ -7,6 +7,7 @@
 #ifndef __FSP1_API_H__
 #define __FSP1_API_H__
 
+#include <asm/types.h>
 #include <linux/linkage.h>
 #include <asm/fsp/fsp_api.h>
 /*
diff --git a/arch/x86/include/asm/fsp1/fsp_ffs.h b/arch/x86/include/asm/fsp1/fsp_ffs.h
index b7558e5a17fb..6447ab96a70b 100644
--- a/arch/x86/include/asm/fsp1/fsp_ffs.h
+++ b/arch/x86/include/asm/fsp1/fsp_ffs.h
@@ -8,6 +8,8 @@
 #define __FSP_FFS_H__
 
 /* Used to verify the integrity of the file */
+#include <compiler.h>
+#include <asm/types.h>
 union __packed ffs_integrity {
 	struct {
 		/*
diff --git a/arch/x86/include/asm/fsp1/fsp_support.h b/arch/x86/include/asm/fsp1/fsp_support.h
index a44a5504a4f8..cec7db49811a 100644
--- a/arch/x86/include/asm/fsp1/fsp_support.h
+++ b/arch/x86/include/asm/fsp1/fsp_support.h
@@ -8,6 +8,7 @@
 #define __FSP1_SUPPORT_H__
 
 #include <asm/fsp/fsp_support.h>
+#include <asm/types.h>
 #include "fsp_ffs.h"
 
 /**
diff --git a/arch/x86/include/asm/fsp2/fsp_api.h b/arch/x86/include/asm/fsp2/fsp_api.h
index 16ffb1922cda..28f4b97ae011 100644
--- a/arch/x86/include/asm/fsp2/fsp_api.h
+++ b/arch/x86/include/asm/fsp2/fsp_api.h
@@ -9,8 +9,10 @@
 #ifndef __ASM_FSP2_API_H
 #define __ASM_FSP2_API_H
 
+#include <compiler.h>
 #include <stdbool.h>
 #include <asm/fsp/fsp_api.h>
+#include <asm/types.h>
 
 struct fspm_upd;
 struct fsps_upd;
diff --git a/arch/x86/include/asm/fsp2/fsp_internal.h b/arch/x86/include/asm/fsp2/fsp_internal.h
index 720d677c05d5..6ab78bf053b5 100644
--- a/arch/x86/include/asm/fsp2/fsp_internal.h
+++ b/arch/x86/include/asm/fsp2/fsp_internal.h
@@ -9,6 +9,7 @@
 #define __ASM_FSP_INTERNAL_H
 
 #include <stdbool.h>
+#include <linux/types.h>
 struct binman_entry;
 struct fsp_header;
 struct fspm_upd;
diff --git a/arch/x86/include/asm/global_data.h b/arch/x86/include/asm/global_data.h
index 7fcd21ee2d53..8987df975c9e 100644
--- a/arch/x86/include/asm/global_data.h
+++ b/arch/x86/include/asm/global_data.h
@@ -9,9 +9,11 @@
 
 #ifndef __ASSEMBLY__
 
+#include <compiler.h>
 #include <stdbool.h>
 #include <asm/processor.h>
 #include <asm/mrccache.h>
+#include <linux/types.h>
 
 enum pei_boot_mode_t {
 	PEI_BOOT_NONE = 0,
diff --git a/arch/x86/include/asm/gpio.h b/arch/x86/include/asm/gpio.h
index 58e4d7b831ef..7810aee155fa 100644
--- a/arch/x86/include/asm/gpio.h
+++ b/arch/x86/include/asm/gpio.h
@@ -7,6 +7,7 @@
 #define _X86_GPIO_H_
 
 #include <asm-generic/gpio.h>
+#include <linux/types.h>
 
 struct ich6_bank_platdata {
 	uint16_t base_addr;
diff --git a/arch/x86/include/asm/handoff.h b/arch/x86/include/asm/handoff.h
index aec49b9b815c..5f6691939eb5 100644
--- a/arch/x86/include/asm/handoff.h
+++ b/arch/x86/include/asm/handoff.h
@@ -9,6 +9,8 @@
 #ifndef __x86_asm_handoff_h
 #define __x86_asm_handoff_h
 
+#include <linux/types.h>
+
 /**
  * struct arch_spl_handoff - architecture-specific handoff info
  *
diff --git a/arch/x86/include/asm/hob.h b/arch/x86/include/asm/hob.h
index a58f422de72d..4860179a33f7 100644
--- a/arch/x86/include/asm/hob.h
+++ b/arch/x86/include/asm/hob.h
@@ -10,6 +10,7 @@
 #include <efi.h>
 #include <efi_loader.h>
 #include <stdbool.h>
+#include <linux/types.h>
 
 /* Type of HOB Header */
 #define HOB_TYPE_MEM_ALLOC	0x0002
diff --git a/arch/x86/include/asm/intel_pinctrl.h b/arch/x86/include/asm/intel_pinctrl.h
index bae5d22b8838..060e5b5f9be3 100644
--- a/arch/x86/include/asm/intel_pinctrl.h
+++ b/arch/x86/include/asm/intel_pinctrl.h
@@ -12,6 +12,7 @@
 #include <stdbool.h>
 #include <dm/pinctrl.h>
 #include <linux/bitops.h>
+#include <linux/types.h>
 
 /**
  * struct pad_config - config for a pad
diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h
index f0119c47b856..7d6d6ded9991 100644
--- a/arch/x86/include/asm/io.h
+++ b/arch/x86/include/asm/io.h
@@ -9,6 +9,7 @@
 
 #include <compiler.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /*
  * This file contains the definitions for the x86 IO instructions
diff --git a/arch/x86/include/asm/ioapic.h b/arch/x86/include/asm/ioapic.h
index 9e004e9b5b08..c4106c9b721b 100644
--- a/arch/x86/include/asm/ioapic.h
+++ b/arch/x86/include/asm/ioapic.h
@@ -8,6 +8,7 @@
 #ifndef __ASM_IOAPIC_H
 #define __ASM_IOAPIC_H
 
+#include <asm/types.h>
 #define IO_APIC_ADDR		0xfec00000
 
 /* Direct addressed register */
diff --git a/arch/x86/include/asm/irq.h b/arch/x86/include/asm/irq.h
index e7533925f29c..7bab07da15f5 100644
--- a/arch/x86/include/asm/irq.h
+++ b/arch/x86/include/asm/irq.h
@@ -7,6 +7,7 @@
 #define _ARCH_IRQ_H_
 
 #include <stdbool.h>
+#include <asm/types.h>
 #include <dt-bindings/interrupt-router/intel-irq.h>
 
 /**
diff --git a/arch/x86/include/asm/me_common.h b/arch/x86/include/asm/me_common.h
index 56e328846cfd..44f99b32b6ae 100644
--- a/arch/x86/include/asm/me_common.h
+++ b/arch/x86/include/asm/me_common.h
@@ -12,6 +12,7 @@
 #ifndef __ASM_ME_COMMON_H
 #define __ASM_ME_COMMON_H
 
+#include <compiler.h>
 #include <linux/compiler.h>
 #include <linux/string.h>
 #include <linux/types.h>
diff --git a/arch/x86/include/asm/microcode.h b/arch/x86/include/asm/microcode.h
index 4ab75049315d..5598cefb0bea 100644
--- a/arch/x86/include/asm/microcode.h
+++ b/arch/x86/include/asm/microcode.h
@@ -9,6 +9,7 @@
 #ifndef __ASSEMBLY__
 
 /* This is a declaration for ucode_base in start.S */
+#include <asm/types.h>
 extern u32 ucode_base;
 extern u32 ucode_size;
 
diff --git a/arch/x86/include/asm/mpspec.h b/arch/x86/include/asm/mpspec.h
index a25f8f03a12d..377f94b204e4 100644
--- a/arch/x86/include/asm/mpspec.h
+++ b/arch/x86/include/asm/mpspec.h
@@ -13,6 +13,7 @@
  * Intel MultiProcessor Specification 1.4
  */
 
+#include <linux/types.h>
 #define MPSPEC_V14	4
 
 #define MPF_SIGNATURE	"_MP_"
diff --git a/arch/x86/include/asm/mrc_common.h b/arch/x86/include/asm/mrc_common.h
index f060389f7890..ec5f7ab84f9d 100644
--- a/arch/x86/include/asm/mrc_common.h
+++ b/arch/x86/include/asm/mrc_common.h
@@ -8,6 +8,7 @@
 
 #include <stdbool.h>
 #include <linux/linkage.h>
+#include <linux/types.h>
 
 /**
  * mrc_common_init() - Set up SDRAM
diff --git a/arch/x86/include/asm/mrccache.h b/arch/x86/include/asm/mrccache.h
index 8b104a2f0b8e..2f41e003dbab 100644
--- a/arch/x86/include/asm/mrccache.h
+++ b/arch/x86/include/asm/mrccache.h
@@ -8,6 +8,7 @@
 #define _ASM_MRCCACHE_H
 
 #include <compiler.h>
+#include <asm/types.h>
 
 #define MRC_DATA_ALIGN		0x100
 #define MRC_DATA_SIGNATURE	(('M' << 0) | ('R' << 8) | \
diff --git a/arch/x86/include/asm/mtrr.h b/arch/x86/include/asm/mtrr.h
index 73edb4d86d32..cb5abbcc9081 100644
--- a/arch/x86/include/asm/mtrr.h
+++ b/arch/x86/include/asm/mtrr.h
@@ -60,6 +60,8 @@
 
 #if !defined(__ASSEMBLY__)
 
+#include <linux/types.h>
+
 /**
  * Information about the previous MTRR state, set up by mtrr_open()
  *
diff --git a/arch/x86/include/asm/pch_common.h b/arch/x86/include/asm/pch_common.h
index c4614d3f42c4..713630de1bd6 100644
--- a/arch/x86/include/asm/pch_common.h
+++ b/arch/x86/include/asm/pch_common.h
@@ -7,6 +7,7 @@
 #define __asm_pch_common_h
 
 /* Common Intel SATA registers */
+#include <asm/types.h>
 #define SATA_SIRI		0xa0 /* SATA Indexed Register Index */
 #define SATA_SIRD		0xa4 /* SATA Indexed Register Data */
 #define SATA_SP			0xd0 /* Scratchpad */
diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h
index 2a7207357284..1a5319185dec 100644
--- a/arch/x86/include/asm/pci.h
+++ b/arch/x86/include/asm/pci.h
@@ -28,6 +28,7 @@
  * @size:	Access size
  * @return 0 if OK, -ve on error
  */
+#include <linux/types.h>
 int pci_x86_read_config(pci_dev_t bdf, uint offset, ulong *valuep,
 			enum pci_size_t size);
 
diff --git a/arch/x86/include/asm/pirq_routing.h b/arch/x86/include/asm/pirq_routing.h
index 895fa793ef4d..679ed750e2aa 100644
--- a/arch/x86/include/asm/pirq_routing.h
+++ b/arch/x86/include/asm/pirq_routing.h
@@ -18,7 +18,9 @@
  *
  * CAUTION: If you change this, PIRQ routing will not work correctly.
  */
+#include <compiler.h>
 #include <stdbool.h>
+#include <asm/types.h>
 #define MAX_INTX_ENTRIES	4
 
 #define PIRQ_SIGNATURE		\
diff --git a/arch/x86/include/asm/pnp_def.h b/arch/x86/include/asm/pnp_def.h
index 0345d195c69d..560f26098d67 100644
--- a/arch/x86/include/asm/pnp_def.h
+++ b/arch/x86/include/asm/pnp_def.h
@@ -10,6 +10,7 @@
 #define _ASM_PNP_DEF_H_
 
 #include <asm/io.h>
+#include <linux/types.h>
 
 #define PNP_IDX_EN   0x30
 #define PNP_IDX_IO0  0x60
diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
index d7b68367861d..3eb16fd11d69 100644
--- a/arch/x86/include/asm/processor.h
+++ b/arch/x86/include/asm/processor.h
@@ -41,6 +41,7 @@
 
 #ifndef __ASSEMBLY__
 
+#include <linux/types.h>
 static inline __attribute__((always_inline)) void cpu_hlt(void)
 {
 	asm("hlt");
diff --git a/arch/x86/include/asm/scu.h b/arch/x86/include/asm/scu.h
index f5ec5a19d9d0..75c2cbae6b7b 100644
--- a/arch/x86/include/asm/scu.h
+++ b/arch/x86/include/asm/scu.h
@@ -6,6 +6,7 @@
 #define _X86_ASM_SCU_IPC_H_
 
 /* IPC defines the following message types */
+#include <asm/types.h>
 #define IPCMSG_INDIRECT_READ	0x02
 #define IPCMSG_INDIRECT_WRITE	0x05
 #define IPCMSG_WARM_RESET	0xf0
diff --git a/arch/x86/include/asm/sfi.h b/arch/x86/include/asm/sfi.h
index 09d470081200..6725ea69b2ed 100644
--- a/arch/x86/include/asm/sfi.h
+++ b/arch/x86/include/asm/sfi.h
@@ -6,6 +6,7 @@
 #ifndef _LINUX_SFI_H
 #define _LINUX_SFI_H
 
+#include <compiler.h>
 #include <errno.h>
 #include <linux/types.h>
 
diff --git a/arch/x86/include/asm/sipi.h b/arch/x86/include/asm/sipi.h
index 24834225287e..9e11f20e0306 100644
--- a/arch/x86/include/asm/sipi.h
+++ b/arch/x86/include/asm/sipi.h
@@ -13,6 +13,8 @@
 #ifndef __ASSEMBLY__
 
 /**
+#include <compiler.h>
+#include <asm/types.h>
  * struct sipi_params_16bit - 16-bit SIPI entry-point parameters
  *
  * These are set up in the same space as the SIPI 16-bit code so that each AP
diff --git a/arch/x86/include/asm/speedstep.h b/arch/x86/include/asm/speedstep.h
index 43bfabffcc93..513e4107c82e 100644
--- a/arch/x86/include/asm/speedstep.h
+++ b/arch/x86/include/asm/speedstep.h
@@ -10,6 +10,7 @@
 #define _ASM_SPEEDSTEP_H
 
 /* Magic value used to locate speedstep configuration in the device tree */
+#include <linux/types.h>
 #define SPEEDSTEP_APIC_MAGIC 0xACAC
 
 /* MWAIT coordination I/O base address. This must match
diff --git a/arch/x86/include/asm/spl.h b/arch/x86/include/asm/spl.h
index cc6cac08f23b..8d844f664d9a 100644
--- a/arch/x86/include/asm/spl.h
+++ b/arch/x86/include/asm/spl.h
@@ -7,6 +7,7 @@
 #ifndef __asm_spl_h
 #define __asm_spl_h
 
+#include <linux/types.h>
 #define CONFIG_SPL_BOARD_LOAD_IMAGE
 
 enum {
diff --git a/arch/x86/include/asm/tables.h b/arch/x86/include/asm/tables.h
index f7c72ed3db03..92ccaf4c7f57 100644
--- a/arch/x86/include/asm/tables.h
+++ b/arch/x86/include/asm/tables.h
@@ -7,6 +7,7 @@
 #define _X86_TABLES_H_
 
 #include <tables_csum.h>
+#include <linux/types.h>
 
 #define ROM_TABLE_ADDR	CONFIG_ROM_TABLE_ADDR
 #define ROM_TABLE_END	(CONFIG_ROM_TABLE_ADDR + CONFIG_ROM_TABLE_SIZE - 1)
diff --git a/arch/x86/include/asm/u-boot-x86.h b/arch/x86/include/asm/u-boot-x86.h
index d732661f6d47..114a8cf5582a 100644
--- a/arch/x86/include/asm/u-boot-x86.h
+++ b/arch/x86/include/asm/u-boot-x86.h
@@ -7,6 +7,7 @@
 #ifndef _U_BOOT_I386_H_
 #define _U_BOOT_I386_H_	1
 
+#include <linux/types.h>
 struct global_data;
 
 extern char gdt_rom[];
diff --git a/arch/x86/include/asm/zimage.h b/arch/x86/include/asm/zimage.h
index 80e128ccf36f..df232e336f62 100644
--- a/arch/x86/include/asm/zimage.h
+++ b/arch/x86/include/asm/zimage.h
@@ -9,6 +9,7 @@
 
 #include <asm/bootparam.h>
 #include <asm/e820.h>
+#include <linux/types.h>
 
 /* linux i386 zImage/bzImage header. Offsets relative to
  * the start of the image */
diff --git a/arch/x86/lib/acpi.c b/arch/x86/lib/acpi.c
index ffdc9e8257e1..166a3f4256e2 100644
--- a/arch/x86/lib/acpi.c
+++ b/arch/x86/lib/acpi.c
@@ -9,6 +9,7 @@
 #include <asm/io.h>
 #include <asm/tables.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static struct acpi_rsdp *acpi_valid_rsdp(struct acpi_rsdp *rsdp)
 {
diff --git a/arch/x86/lib/acpi_nhlt.c b/arch/x86/lib/acpi_nhlt.c
index f21d3e32b579..041248e7c8f1 100644
--- a/arch/x86/lib/acpi_nhlt.c
+++ b/arch/x86/lib/acpi_nhlt.c
@@ -20,6 +20,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define NHLT_RID		1
 #define NHLT_SSID		1
diff --git a/arch/x86/lib/acpi_table.c b/arch/x86/lib/acpi_table.c
index db1840068302..6fb12c03d24d 100644
--- a/arch/x86/lib/acpi_table.c
+++ b/arch/x86/lib/acpi_table.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <cpu.h>
 #include <dm.h>
 #include <log.h>
@@ -29,6 +30,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /*
  * IASL compiles the dsdt entries and writes the hex values
diff --git a/arch/x86/lib/bios.c b/arch/x86/lib/bios.c
index a4499972c322..5a8daa1d3226 100644
--- a/arch/x86/lib/bios.c
+++ b/arch/x86/lib/bios.c
@@ -18,6 +18,7 @@
 #include <asm/io.h>
 #include <asm/post.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "bios.h"
 
 /* Interrupt handlers for each interrupt the ROM can call */
diff --git a/arch/x86/lib/bios.h b/arch/x86/lib/bios.h
index 2e51b9fbf677..4c44c0fc9053 100644
--- a/arch/x86/lib/bios.h
+++ b/arch/x86/lib/bios.h
@@ -19,6 +19,9 @@
 
 #else
 
+#include <compiler.h>
+#include <linux/types.h>
+
 /* Convert a symbol address to our real mode area */
 #define PTR_TO_REAL_MODE(sym)\
 	(void *)(REALMODE_BASE + ((char *)&(sym) - (char *)&asm_realmode_code))
diff --git a/arch/x86/lib/bios_interrupts.c b/arch/x86/lib/bios_interrupts.c
index 2582ac1b8408..dcdb0e9690b7 100644
--- a/arch/x86/lib/bios_interrupts.c
+++ b/arch/x86/lib/bios_interrupts.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <stdio.h>
 #include <asm/pci.h>
+#include <asm/types.h>
 #include "bios_emul.h"
 
 /* errors go in AH. Just set these up so that word assigns will work */
diff --git a/arch/x86/lib/bootm.c b/arch/x86/lib/bootm.c
index 0b20cdc16aba..302d2c1b5c9c 100644
--- a/arch/x86/lib/bootm.c
+++ b/arch/x86/lib/bootm.c
@@ -22,6 +22,7 @@
 #include <fdt_support.h>
 #include <image.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <u-boot/zlib.h>
 #include <asm/bootparam.h>
 #include <asm/cpu.h>
diff --git a/arch/x86/lib/cmd_boot.c b/arch/x86/lib/cmd_boot.c
index b128b43cebe5..fa26fe806529 100644
--- a/arch/x86/lib/cmd_boot.c
+++ b/arch/x86/lib/cmd_boot.c
@@ -20,6 +20,7 @@
 #include <asm/global_data.h>
 #include <asm/u-boot-x86.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/lib/coreboot_table.c b/arch/x86/lib/coreboot_table.c
index f4736ecfc45a..b98b9d8b2dfa 100644
--- a/arch/x86/lib/coreboot_table.c
+++ b/arch/x86/lib/coreboot_table.c
@@ -13,6 +13,7 @@
 #include <asm/global_data.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/lib/div64.c b/arch/x86/lib/div64.c
index 2bea205f60f9..a8a3d36f5113 100644
--- a/arch/x86/lib/div64.c
+++ b/arch/x86/lib/div64.c
@@ -7,6 +7,8 @@
  */
 
 #include <common.h>
+#include <asm/types.h>
+#include <linux/stddef.h>
 
 union overlay64 {
 	u64 longw;
diff --git a/arch/x86/lib/e820.c b/arch/x86/lib/e820.c
index 066bf9b154ba..4cc55c1c2f30 100644
--- a/arch/x86/lib/e820.c
+++ b/arch/x86/lib/e820.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <efi_loader.h>
 #include <asm/e820.h>
 #include <asm/global_data.h>
diff --git a/arch/x86/lib/early_cmos.c b/arch/x86/lib/early_cmos.c
index f7b3bb2a8e19..821abe160a47 100644
--- a/arch/x86/lib/early_cmos.c
+++ b/arch/x86/lib/early_cmos.c
@@ -13,6 +13,7 @@
 #include <common.h>
 #include <asm/early_cmos.h>
 #include <asm/io.h>
+#include <asm/types.h>
 
 u8 cmos_read8(u8 addr)
 {
diff --git a/arch/x86/lib/fsp/fsp_common.c b/arch/x86/lib/fsp/fsp_common.c
index 0f81d54f52c0..5c06c725e540 100644
--- a/arch/x86/lib/fsp/fsp_common.c
+++ b/arch/x86/lib/fsp/fsp_common.c
@@ -19,6 +19,7 @@
 #include <asm/post.h>
 #include <asm/processor.h>
 #include <asm/fsp/fsp_support.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/x86/lib/fsp/fsp_dram.c b/arch/x86/lib/fsp/fsp_dram.c
index e73597567a48..33e374dcd243 100644
--- a/arch/x86/lib/fsp/fsp_dram.c
+++ b/arch/x86/lib/fsp/fsp_dram.c
@@ -14,6 +14,7 @@
 #include <asm/mtrr.h>
 #include <asm/post.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/lib/fsp/fsp_graphics.c b/arch/x86/lib/fsp/fsp_graphics.c
index 6e4368d4184d..292af2abe903 100644
--- a/arch/x86/lib/fsp/fsp_graphics.c
+++ b/arch/x86/lib/fsp/fsp_graphics.c
@@ -13,6 +13,7 @@
 #include <asm/fsp/fsp_support.h>
 #include <asm/global_data.h>
 #include <asm/mtrr.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/x86/lib/fsp/fsp_support.c b/arch/x86/lib/fsp/fsp_support.c
index fd4d98ef6274..8afdb1b287b5 100644
--- a/arch/x86/lib/fsp/fsp_support.c
+++ b/arch/x86/lib/fsp/fsp_support.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <asm/fsp/fsp_support.h>
 #include <asm/post.h>
+#include <asm/types.h>
 
 u32 fsp_get_usable_lowmem_top(const void *hob_list)
 {
diff --git a/arch/x86/lib/fsp1/fsp_dram.c b/arch/x86/lib/fsp1/fsp_dram.c
index cfd9b9f48c34..c27b7a674abd 100644
--- a/arch/x86/lib/fsp1/fsp_dram.c
+++ b/arch/x86/lib/fsp1/fsp_dram.c
@@ -7,6 +7,7 @@
 #include <init.h>
 #include <asm/fsp/fsp_support.h>
 #include <asm/global_data.h>
+#include <linux/types.h>
 
 int dram_init(void)
 {
diff --git a/arch/x86/lib/fsp1/fsp_support.c b/arch/x86/lib/fsp1/fsp_support.c
index 6850b9b73334..9b15ae396ac1 100644
--- a/arch/x86/lib/fsp1/fsp_support.c
+++ b/arch/x86/lib/fsp1/fsp_support.c
@@ -9,6 +9,7 @@
 #include <vsprintf.h>
 #include <asm/fsp1/fsp_support.h>
 #include <asm/post.h>
+#include <asm/types.h>
 #include <linux/string.h>
 
 struct fsp_header *__attribute__((optimize("O0"))) fsp_find_header(void)
diff --git a/arch/x86/lib/fsp2/fsp_dram.c b/arch/x86/lib/fsp2/fsp_dram.c
index aae75ea1573d..27d98e1105fc 100644
--- a/arch/x86/lib/fsp2/fsp_dram.c
+++ b/arch/x86/lib/fsp2/fsp_dram.c
@@ -18,6 +18,7 @@
 #include <asm/global_data.h>
 #include <linux/errno.h>
 #include <linux/sizes.h>
+#include <linux/types.h>
 
 int dram_init(void)
 {
diff --git a/arch/x86/lib/fsp2/fsp_init.c b/arch/x86/lib/fsp2/fsp_init.c
index eef321d62086..07bbf6cc06fb 100644
--- a/arch/x86/lib/fsp2/fsp_init.c
+++ b/arch/x86/lib/fsp2/fsp_init.c
@@ -19,6 +19,7 @@
 #include <dm/uclass-internal.h>
 #include <asm/fsp2/fsp_internal.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 int arch_cpu_init_dm(void)
 {
diff --git a/arch/x86/lib/fsp2/fsp_meminit.c b/arch/x86/lib/fsp2/fsp_meminit.c
index dd3569895ff3..4820661ca369 100644
--- a/arch/x86/lib/fsp2/fsp_meminit.c
+++ b/arch/x86/lib/fsp2/fsp_meminit.c
@@ -22,6 +22,7 @@
 #include <asm/arch/fsp/fsp_m_upd.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static int prepare_mrc_cache_type(enum mrc_type_t type,
 				  struct mrc_data_container **cachep)
diff --git a/arch/x86/lib/fsp2/fsp_silicon_init.c b/arch/x86/lib/fsp2/fsp_silicon_init.c
index 4ab49c5fe6fe..326808dd6d6f 100644
--- a/arch/x86/lib/fsp2/fsp_silicon_init.c
+++ b/arch/x86/lib/fsp2/fsp_silicon_init.c
@@ -21,6 +21,7 @@
 #include <asm/global_data.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 int fsp_silicon_init(bool s3wake, bool use_spi_flash)
 {
diff --git a/arch/x86/lib/fsp2/fsp_support.c b/arch/x86/lib/fsp2/fsp_support.c
index f597f7522136..8c6445b2ebd9 100644
--- a/arch/x86/lib/fsp2/fsp_support.c
+++ b/arch/x86/lib/fsp2/fsp_support.c
@@ -8,12 +8,14 @@
 #include <dm.h>
 #include <log.h>
 #include <spi_flash.h>
+#include <stdbool.h>
 #include <asm/fsp/fsp_support.h>
 #include <asm/fsp2/fsp_internal.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /* The amount of the FSP header to probe to obtain what we need */
 #define PROBE_BUF_SIZE 0x180
diff --git a/arch/x86/lib/hob.c b/arch/x86/lib/hob.c
index f2c47240ee8e..5c10b655a6f0 100644
--- a/arch/x86/lib/hob.c
+++ b/arch/x86/lib/hob.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <asm/hob.h>
+#include <linux/types.h>
 
 /**
  * Returns the next instance of a HOB type from the starting HOB.
diff --git a/arch/x86/lib/i8254.c b/arch/x86/lib/i8254.c
index 7aa41ede74b7..0af133daf409 100644
--- a/arch/x86/lib/i8254.c
+++ b/arch/x86/lib/i8254.c
@@ -8,6 +8,7 @@
 #include <asm/io.h>
 #include <asm/i8254.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #define TIMER1_VALUE		18	/* 15.6us */
 #define BEEP_FREQUENCY_HZ	440
diff --git a/arch/x86/lib/i8259.c b/arch/x86/lib/i8259.c
index c002d103aef3..cb396b8ac3e3 100644
--- a/arch/x86/lib/i8259.c
+++ b/arch/x86/lib/i8259.c
@@ -20,6 +20,7 @@
 #include <asm/i8259.h>
 #include <asm/ibmpc.h>
 #include <asm/interrupt.h>
+#include <asm/types.h>
 
 int i8259_init(void)
 {
diff --git a/arch/x86/lib/interrupts.c b/arch/x86/lib/interrupts.c
index 11c1a01f0715..90e387277ace 100644
--- a/arch/x86/lib/interrupts.c
+++ b/arch/x86/lib/interrupts.c
@@ -34,6 +34,7 @@
 #include <irq_func.h>
 #include <stdio.h>
 #include <asm/interrupt.h>
+#include <linux/types.h>
 
 #if !CONFIG_IS_ENABLED(X86_64)
 
diff --git a/arch/x86/lib/mpspec.c b/arch/x86/lib/mpspec.c
index 17568a03d5c8..2dc658cdb372 100644
--- a/arch/x86/lib/mpspec.c
+++ b/arch/x86/lib/mpspec.c
@@ -6,11 +6,13 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <cpu.h>
 #include <dm.h>
 #include <errno.h>
 #include <fdtdec.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/cpu.h>
 #include <asm/global_data.h>
 #include <asm/irq.h>
@@ -22,6 +24,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/lib/mrccache.c b/arch/x86/lib/mrccache.c
index 63aace5d4fb8..e6742b65cfb2 100644
--- a/arch/x86/lib/mrccache.c
+++ b/arch/x86/lib/mrccache.c
@@ -23,6 +23,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/lib/physmem.c b/arch/x86/lib/physmem.c
index 71039589dfdf..6409d5c1c11a 100644
--- a/arch/x86/lib/physmem.c
+++ b/arch/x86/lib/physmem.c
@@ -16,6 +16,7 @@
 #include <linux/compiler.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/lib/pinctrl_ich6.c b/arch/x86/lib/pinctrl_ich6.c
index 53228cd2848b..2cace9c5b420 100644
--- a/arch/x86/lib/pinctrl_ich6.c
+++ b/arch/x86/lib/pinctrl_ich6.c
@@ -18,6 +18,7 @@
 #include <asm/pci.h>
 #include <dm/pinctrl.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/lib/pirq_routing.c b/arch/x86/lib/pirq_routing.c
index 3b5ee3837f84..d6b435efd6d3 100644
--- a/arch/x86/lib/pirq_routing.c
+++ b/arch/x86/lib/pirq_routing.c
@@ -8,12 +8,14 @@
 #include <common.h>
 #include <log.h>
 #include <pci.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/pci.h>
 #include <asm/pirq_routing.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/lib/pmu.c b/arch/x86/lib/pmu.c
index 314d9f0ecee5..ce054cc4cee3 100644
--- a/arch/x86/lib/pmu.c
+++ b/arch/x86/lib/pmu.c
@@ -10,6 +10,7 @@
 #include <syscon.h>
 #include <asm/cpu.h>
 #include <asm/pmu.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/io.h>
diff --git a/arch/x86/lib/ramtest.c b/arch/x86/lib/ramtest.c
index 17729eb8aa0b..ce6c7442d5bd 100644
--- a/arch/x86/lib/ramtest.c
+++ b/arch/x86/lib/ramtest.c
@@ -9,6 +9,7 @@
 #include <vsprintf.h>
 #include <asm/io.h>
 #include <asm/post.h>
+#include <asm/types.h>
 
 static void write_phys(unsigned long addr, u32 value)
 {
diff --git a/arch/x86/lib/relocate.c b/arch/x86/lib/relocate.c
index e31565a589e0..6f5870345565 100644
--- a/arch/x86/lib/relocate.c
+++ b/arch/x86/lib/relocate.c
@@ -24,6 +24,7 @@
 #include <asm/sections.h>
 #include <elf.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/lib/scu.c b/arch/x86/lib/scu.c
index 792b87c2f1b2..c476d12c1497 100644
--- a/arch/x86/lib/scu.c
+++ b/arch/x86/lib/scu.c
@@ -16,6 +16,7 @@
 #include <syscon.h>
 #include <asm/cpu.h>
 #include <asm/scu.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/arch/x86/lib/sfi.c b/arch/x86/lib/sfi.c
index b85a1b17e84b..cbba94c8bb24 100644
--- a/arch/x86/lib/sfi.c
+++ b/arch/x86/lib/sfi.c
@@ -23,6 +23,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 struct table_info {
 	u32 base;
diff --git a/arch/x86/lib/spl.c b/arch/x86/lib/spl.c
index 36c92b7b1489..1fc86dabd249 100644
--- a/arch/x86/lib/spl.c
+++ b/arch/x86/lib/spl.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <debug_uart.h>
 #include <dm.h>
@@ -27,6 +28,7 @@
 #include <asm-generic/sections.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/lib/tables.c b/arch/x86/lib/tables.c
index 6fd0ded397d0..7409eb3b8199 100644
--- a/arch/x86/lib/tables.c
+++ b/arch/x86/lib/tables.c
@@ -16,6 +16,7 @@
 #include <asm/coreboot_tables.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /**
  * Function prototype to write a specific configuration table
diff --git a/arch/x86/lib/tpl.c b/arch/x86/lib/tpl.c
index 140e36f037a8..1d42dda81aa7 100644
--- a/arch/x86/lib/tpl.c
+++ b/arch/x86/lib/tpl.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <debug_uart.h>
 #include <dm.h>
 #include <hang.h>
@@ -19,6 +20,7 @@
 #include <asm/processor.h>
 #include <asm-generic/sections.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/lib/zimage.c b/arch/x86/lib/zimage.c
index 5e413200268f..f0c97b6cf895 100644
--- a/arch/x86/lib/zimage.c
+++ b/arch/x86/lib/zimage.c
@@ -34,6 +34,7 @@
 #include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /*
  * Memory lay-out:
diff --git a/arch/xtensa/cpu/cpu.c b/arch/xtensa/cpu/cpu.c
index 50e330686652..54f3d80f680e 100644
--- a/arch/xtensa/cpu/cpu.c
+++ b/arch/xtensa/cpu/cpu.c
@@ -18,6 +18,7 @@
 #include <asm/cache.h>
 #include <asm/string.h>
 #include <asm/misc.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/xtensa/include/asm/ldscript.h b/arch/xtensa/include/asm/ldscript.h
index 08f5d0135ed0..fdf38c225d02 100644
--- a/arch/xtensa/include/asm/ldscript.h
+++ b/arch/xtensa/include/asm/ldscript.h
@@ -8,6 +8,7 @@
 #define _XTENSA_LDSCRIPT_H
 
 /*
+#include <linux/kernel.h>
  * This linker script is pre-processed with CPP to avoid hard-coding
  * addresses that depend on the Xtensa core configuration, because
  * this FPGA board can be used with a huge variety of Xtensa cores.
diff --git a/arch/xtensa/lib/bootm.c b/arch/xtensa/lib/bootm.c
index 0299534728ca..00b5e0a46562 100644
--- a/arch/xtensa/lib/bootm.c
+++ b/arch/xtensa/lib/bootm.c
@@ -13,6 +13,7 @@
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <u-boot/zlib.h>
 #include <asm/byteorder.h>
 #include <asm/addrspace.h>
diff --git a/arch/xtensa/lib/cache.c b/arch/xtensa/lib/cache.c
index 4e0c0acc3bbe..f0f7ea2d330f 100644
--- a/arch/xtensa/lib/cache.c
+++ b/arch/xtensa/lib/cache.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <asm/cache.h>
+#include <linux/types.h>
 
 /*
  * We currently run always with caches enabled when running from memory.
diff --git a/arch/xtensa/lib/relocate.c b/arch/xtensa/lib/relocate.c
index ffe39d4a03ca..7fc9cf76f6e2 100644
--- a/arch/xtensa/lib/relocate.c
+++ b/arch/xtensa/lib/relocate.c
@@ -7,6 +7,7 @@
 #include <asm/sections.h>
 #include <asm/string.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 int clear_bss(void)
 {
diff --git a/arch/xtensa/lib/time.c b/arch/xtensa/lib/time.c
index 3a02c384934c..af37eddd51de 100644
--- a/arch/xtensa/lib/time.c
+++ b/arch/xtensa/lib/time.c
@@ -8,6 +8,7 @@
 #include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/stringify.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/AndesTech/adp-ae3xx/adp-ae3xx.c b/board/AndesTech/adp-ae3xx/adp-ae3xx.c
index 69611c788320..49ca9a835bda 100644
--- a/board/AndesTech/adp-ae3xx/adp-ae3xx.c
+++ b/board/AndesTech/adp-ae3xx/adp-ae3xx.c
@@ -18,6 +18,7 @@
 #include <asm/u-boot.h>
 #include <linux/io.h>
 #include <faraday/ftsmc020.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/AndesTech/adp-ag101p/adp-ag101p.c b/board/AndesTech/adp-ag101p/adp-ag101p.c
index 9ba4f732223e..2d88db3186fd 100644
--- a/board/AndesTech/adp-ag101p/adp-ag101p.c
+++ b/board/AndesTech/adp-ag101p/adp-ag101p.c
@@ -18,6 +18,7 @@
 #include <linux/io.h>
 #include <asm/io.h>
 #include <asm/mach-types.h>
+#include <linux/types.h>
 
 #include <faraday/ftsmc020.h>
 
diff --git a/board/AndesTech/ax25-ae350/ax25-ae350.c b/board/AndesTech/ax25-ae350/ax25-ae350.c
index b75e968ee1dc..4575e8929ef8 100644
--- a/board/AndesTech/ax25-ae350/ax25-ae350.c
+++ b/board/AndesTech/ax25-ae350/ax25-ae350.c
@@ -21,6 +21,7 @@
 #include <dm.h>
 #include <spl.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/Arcturus/ucp1020/cmd_arc.c b/board/Arcturus/ucp1020/cmd_arc.c
index 2cd51d0aa873..f0b0ac1494c8 100644
--- a/board/Arcturus/ucp1020/cmd_arc.c
+++ b/board/Arcturus/ucp1020/cmd_arc.c
@@ -22,6 +22,7 @@
 #include <asm/io.h>
 #include <linux/string.h>
 #include <linux/stringify.h>
+#include <linux/types.h>
 
 static ulong fwenv_addr[MAX_FWENV_ADDR];
 const char mystrerr[] = "ERROR: Failed to save factory info";
diff --git a/board/Arcturus/ucp1020/ddr.c b/board/Arcturus/ucp1020/ddr.c
index 7549d4341bbe..6806fa4453a2 100644
--- a/board/Arcturus/ucp1020/ddr.c
+++ b/board/Arcturus/ucp1020/ddr.c
@@ -18,6 +18,7 @@
 #include <asm/io.h>
 #include <asm/fsl_law.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_SYS_DDR_RAW_TIMING
 #if defined(CONFIG_UCP1020) || defined(CONFIG_UCP1020T1)
diff --git a/board/Arcturus/ucp1020/spl.c b/board/Arcturus/ucp1020/spl.c
index 9a6b465bf96d..8cbe90062542 100644
--- a/board/Arcturus/ucp1020/spl.c
+++ b/board/Arcturus/ucp1020/spl.c
@@ -24,6 +24,7 @@
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/Arcturus/ucp1020/spl_minimal.c b/board/Arcturus/ucp1020/spl_minimal.c
index 718139688bf4..f938e345ac15 100644
--- a/board/Arcturus/ucp1020/spl_minimal.c
+++ b/board/Arcturus/ucp1020/spl_minimal.c
@@ -17,6 +17,7 @@
 #include <asm/fsl_law.h>
 #include <fsl_ddr_sdram.h>
 #include <asm/global_data.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/Arcturus/ucp1020/ucp1020.c b/board/Arcturus/ucp1020/ucp1020.c
index ccd5f8ae1e4e..ce10bdaab696 100644
--- a/board/Arcturus/ucp1020/ucp1020.c
+++ b/board/Arcturus/ucp1020/ucp1020.c
@@ -44,6 +44,7 @@
 #include <asm/fsl_lbc.h>
 #include <asm/mp.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "ucp1020.h"
 
 void spi_set_speed(struct spi_slave *slave, uint hz)
diff --git a/board/BuR/brppt1/board.c b/board/BuR/brppt1/board.c
index b5a1dccb19bd..bff7ba2191f7 100644
--- a/board/BuR/brppt1/board.c
+++ b/board/BuR/brppt1/board.c
@@ -29,6 +29,7 @@
 #include <asm/emif.h>
 #include <asm/gpio.h>
 #include <i2c.h>
+#include <linux/types.h>
 #include <power/tps65217.h>
 #include "../common/bur_common.h"
 #include <watchdog.h>
diff --git a/board/BuR/brppt2/board.c b/board/BuR/brppt2/board.c
index 01bdbc12abb0..e462e4c63ba5 100644
--- a/board/BuR/brppt2/board.c
+++ b/board/BuR/brppt2/board.c
@@ -25,6 +25,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
+#include <linux/types.h>
 
 #define USBHUB_RSTN	IMX_GPIO_NR(1, 16)
 #define BKLT_EN		IMX_GPIO_NR(1, 15)
diff --git a/board/BuR/brsmarc1/board.c b/board/BuR/brsmarc1/board.c
index b4b1c327f947..149e34ce0bec 100644
--- a/board/BuR/brsmarc1/board.c
+++ b/board/BuR/brsmarc1/board.c
@@ -24,6 +24,7 @@
 #include <asm/io.h>
 #include <asm/gpio.h>
 #include <asm/emif.h>
+#include <asm/types.h>
 #include <power/tps65217.h>
 #include "../common/bur_common.h"
 #include "../common/br_resetc.h"
diff --git a/board/BuR/brxre1/board.c b/board/BuR/brxre1/board.c
index f6f35f6750df..9b2acfd06e59 100644
--- a/board/BuR/brxre1/board.c
+++ b/board/BuR/brxre1/board.c
@@ -28,6 +28,7 @@
 #include <asm/emif.h>
 #include <asm/gpio.h>
 #include <dm.h>
+#include <asm/types.h>
 #include <power/tps65217.h>
 #include "../common/bur_common.h"
 #include "../common/br_resetc.h"
diff --git a/board/BuR/common/br_resetc.c b/board/BuR/common/br_resetc.c
index 6bbea816a0e5..b6f7cf38fd44 100644
--- a/board/BuR/common/br_resetc.c
+++ b/board/BuR/common/br_resetc.c
@@ -6,10 +6,12 @@
  * B&R Industrial Automation GmbH - http://www.br-automation.com/ *
  */
 #include <common.h>
+#include <compiler.h>
 #include <env.h>
 #include <errno.h>
 #include <i2c.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <dm/uclass.h>
 #include <linux/delay.h>
 #include "br_resetc.h"
diff --git a/board/BuR/common/br_resetc.h b/board/BuR/common/br_resetc.h
index ba0689bf2050..66aa12798b25 100644
--- a/board/BuR/common/br_resetc.h
+++ b/board/BuR/common/br_resetc.h
@@ -8,6 +8,7 @@
 #ifndef __CONFIG_BRRESETC_H__
 #define __CONFIG_BRRESETC_H__
 #include <common.h>
+#include <asm/types.h>
 
 int br_resetc_regget(u8 reg, u8 *dst);
 int br_resetc_regset(u8 reg, u8 val);
diff --git a/board/BuR/common/bur_common.h b/board/BuR/common/bur_common.h
index 4db630668e29..a76f17d0ef75 100644
--- a/board/BuR/common/bur_common.h
+++ b/board/BuR/common/bur_common.h
@@ -17,6 +17,7 @@
 int load_lcdtiming(struct am335x_lcdpanel *panel);
 #endif
 
+#include <asm/types.h>
 void br_summaryscreen(void);
 void pmicsetup(u32 mpupll, unsigned int bus);
 void enable_uart0_pin_mux(void);
diff --git a/board/BuR/common/common.c b/board/BuR/common/common.c
index 9b96b0c30b97..2456501b7ab8 100644
--- a/board/BuR/common/common.c
+++ b/board/BuR/common/common.c
@@ -18,6 +18,7 @@
 #include <lcd.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
diff --git a/board/BuS/eb_cpu5282/eb_cpu5282.c b/board/BuS/eb_cpu5282/eb_cpu5282.c
index 863372e06e01..2d816927482b 100644
--- a/board/BuS/eb_cpu5282/eb_cpu5282.c
+++ b/board/BuS/eb_cpu5282/eb_cpu5282.c
@@ -13,6 +13,7 @@
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "asm/m5282.h"
 #include <bmp_layout.h>
 #include <env.h>
diff --git a/board/CZ.NIC/turris_mox/mox_sp.c b/board/CZ.NIC/turris_mox/mox_sp.c
index c15f8ee5b512..4521e703ed86 100644
--- a/board/CZ.NIC/turris_mox/mox_sp.c
+++ b/board/CZ.NIC/turris_mox/mox_sp.c
@@ -10,6 +10,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #define RWTM_BASE		(MVEBU_REGISTER(0xb0000))
 #define RWTM_CMD_PARAM(i)	(size_t)(RWTM_BASE + (i) * 4)
diff --git a/board/CZ.NIC/turris_mox/mox_sp.h b/board/CZ.NIC/turris_mox/mox_sp.h
index 49a4ed80ea61..45e7f24a6072 100644
--- a/board/CZ.NIC/turris_mox/mox_sp.h
+++ b/board/CZ.NIC/turris_mox/mox_sp.h
@@ -7,6 +7,7 @@
 #define _BOARD_CZNIC_TURRIS_MOX_MOX_SP_H_
 
 #include <common.h>
+#include <asm/types.h>
 
 const char *mox_sp_get_ecdsa_public_key(void);
 int mbox_sp_get_board_info(u64 *sn, u8 *mac1, u8 *mac2, int *bv,
diff --git a/board/CZ.NIC/turris_mox/turris_mox.c b/board/CZ.NIC/turris_mox/turris_mox.c
index 0c7926b5624e..b34bde8a2941 100644
--- a/board/CZ.NIC/turris_mox/turris_mox.c
+++ b/board/CZ.NIC/turris_mox/turris_mox.c
@@ -25,6 +25,7 @@
 #include <linux/libfdt.h>
 #include <linux/string.h>
 #include <miiphy.h>
+#include <linux/types.h>
 #include <mvebu/comphy.h>
 #include <spi.h>
 
diff --git a/board/CZ.NIC/turris_omnia/turris_omnia.c b/board/CZ.NIC/turris_omnia/turris_omnia.c
index 6e950f45f05b..7bf238a5c462 100644
--- a/board/CZ.NIC/turris_omnia/turris_omnia.c
+++ b/board/CZ.NIC/turris_omnia/turris_omnia.c
@@ -15,6 +15,7 @@
 #include <miiphy.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
@@ -27,6 +28,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <u-boot/crc.h>
 # include <atsha204a-i2c.h>
 
diff --git a/board/LaCie/common/common.c b/board/LaCie/common/common.c
index 325bc9b3bf7d..395c10758cb7 100644
--- a/board/LaCie/common/common.c
+++ b/board/LaCie/common/common.c
@@ -7,6 +7,7 @@
 #include <i2c.h>
 #include <miiphy.h>
 #include <stdio.h>
+#include <linux/types.h>
 
 #if defined(CONFIG_CMD_NET) && defined(CONFIG_RESET_PHY_R)
 
diff --git a/board/LaCie/common/common.h b/board/LaCie/common/common.h
index bf75d0a09782..43cb59c8ff73 100644
--- a/board/LaCie/common/common.h
+++ b/board/LaCie/common/common.h
@@ -14,4 +14,5 @@ void mv_phy_88e1318_init(const char *name, u16 phyaddr);
 int lacie_read_mac_address(uchar *mac);
 #endif
 
+#include <linux/types.h>
 #endif /* _LACIE_COMMON_H */
diff --git a/board/LaCie/edminiv2/edminiv2.c b/board/LaCie/edminiv2/edminiv2.c
index 9c066a283c99..fc437b6c9942 100644
--- a/board/LaCie/edminiv2/edminiv2.c
+++ b/board/LaCie/edminiv2/edminiv2.c
@@ -12,6 +12,7 @@
 #include <net.h>
 #include <asm/arch/orion5x.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include "../common/common.h"
 #include <spl.h>
 #include <ns16550.h>
diff --git a/board/LaCie/net2big_v2/net2big_v2.c b/board/LaCie/net2big_v2/net2big_v2.c
index 93de669f89d0..d5e5844019f6 100644
--- a/board/LaCie/net2big_v2/net2big_v2.c
+++ b/board/LaCie/net2big_v2/net2big_v2.c
@@ -22,6 +22,7 @@
 #include <asm/arch/mpp.h>
 #include <asm/arch/gpio.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include "net2big_v2.h"
 #include "../common/common.h"
diff --git a/board/LaCie/netspace_v2/netspace_v2.c b/board/LaCie/netspace_v2/netspace_v2.c
index 730eab7e7031..6bea0fd06e5a 100644
--- a/board/LaCie/netspace_v2/netspace_v2.c
+++ b/board/LaCie/netspace_v2/netspace_v2.c
@@ -19,6 +19,7 @@
 #include <asm/arch/soc.h>
 #include <asm/arch/mpp.h>
 #include <asm/arch/gpio.h>
+#include <linux/types.h>
 
 #include "netspace_v2.h"
 #include "../common/common.h"
diff --git a/board/Marvell/aspenite/aspenite.c b/board/Marvell/aspenite/aspenite.c
index 1f9389c0a7ab..05d95d072982 100644
--- a/board/Marvell/aspenite/aspenite.c
+++ b/board/Marvell/aspenite/aspenite.c
@@ -14,6 +14,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/mfp.h>
 #include <asm/arch/armada100.h>
+#include <asm/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/Marvell/db-88f6281-bp/db-88f6281-bp.c b/board/Marvell/db-88f6281-bp/db-88f6281-bp.c
index 08f79d4b5320..c41513c9e79e 100644
--- a/board/Marvell/db-88f6281-bp/db-88f6281-bp.c
+++ b/board/Marvell/db-88f6281-bp/db-88f6281-bp.c
@@ -4,6 +4,7 @@
 #include <init.h>
 #include <net.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/io.h>
 #include <miiphy.h>
diff --git a/board/Marvell/db-88f6820-amc/db-88f6820-amc.c b/board/Marvell/db-88f6820-amc/db-88f6820-amc.c
index 0fa0820d7be7..b49121e426d8 100644
--- a/board/Marvell/db-88f6820-amc/db-88f6820-amc.c
+++ b/board/Marvell/db-88f6820-amc/db-88f6820-amc.c
@@ -14,6 +14,7 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/kernel.h>
diff --git a/board/Marvell/db-88f6820-gp/db-88f6820-gp.c b/board/Marvell/db-88f6820-gp/db-88f6820-gp.c
index b18ac9c2d0bc..ef9f3aa7ed22 100644
--- a/board/Marvell/db-88f6820-gp/db-88f6820-gp.c
+++ b/board/Marvell/db-88f6820-gp/db-88f6820-gp.c
@@ -14,6 +14,7 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/kernel.h>
diff --git a/board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c b/board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c
index 39a1a52f704d..8a8167503dda 100644
--- a/board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c
+++ b/board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c
@@ -13,6 +13,7 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
 
diff --git a/board/Marvell/dreamplug/dreamplug.c b/board/Marvell/dreamplug/dreamplug.c
index ff02a72b3bb8..c7cbe7409548 100644
--- a/board/Marvell/dreamplug/dreamplug.c
+++ b/board/Marvell/dreamplug/dreamplug.c
@@ -17,6 +17,7 @@
 #include <asm/arch/soc.h>
 #include <asm/arch/mpp.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include "dreamplug.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/Marvell/gplugd/gplugd.c b/board/Marvell/gplugd/gplugd.c
index 8909fba88374..7de585f74c53 100644
--- a/board/Marvell/gplugd/gplugd.c
+++ b/board/Marvell/gplugd/gplugd.c
@@ -23,6 +23,7 @@
 #include <asm/gpio.h>
 #include <miiphy.h>
 #include <asm/mach-types.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 
diff --git a/board/Marvell/guruplug/guruplug.c b/board/Marvell/guruplug/guruplug.c
index ee4aa24150ca..29e5b2a66bf3 100644
--- a/board/Marvell/guruplug/guruplug.c
+++ b/board/Marvell/guruplug/guruplug.c
@@ -15,6 +15,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
 #include <asm/arch/mpp.h>
+#include <asm/types.h>
 #include "guruplug.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/Marvell/mvebu_armada-37xx/board.c b/board/Marvell/mvebu_armada-37xx/board.c
index 1ae867e5816d..f164bd5e2b74 100644
--- a/board/Marvell/mvebu_armada-37xx/board.c
+++ b/board/Marvell/mvebu_armada-37xx/board.c
@@ -13,6 +13,7 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 
diff --git a/board/Marvell/mvebu_armada-8k/board.c b/board/Marvell/mvebu_armada-8k/board.c
index 00c0d21782ae..370c756a49a1 100644
--- a/board/Marvell/mvebu_armada-8k/board.c
+++ b/board/Marvell/mvebu_armada-8k/board.c
@@ -12,6 +12,7 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 
diff --git a/board/Marvell/openrd/openrd.c b/board/Marvell/openrd/openrd.c
index 5d5447c394e3..18313affb2b8 100644
--- a/board/Marvell/openrd/openrd.c
+++ b/board/Marvell/openrd/openrd.c
@@ -20,6 +20,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
 #include <asm/arch/mpp.h>
+#include <asm/types.h>
 #include "openrd.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/Marvell/sheevaplug/sheevaplug.c b/board/Marvell/sheevaplug/sheevaplug.c
index 4b126a5808d1..cc9a064d0f0e 100644
--- a/board/Marvell/sheevaplug/sheevaplug.c
+++ b/board/Marvell/sheevaplug/sheevaplug.c
@@ -15,6 +15,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
 #include <asm/arch/mpp.h>
+#include <asm/types.h>
 #include "sheevaplug.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/Seagate/dockstar/dockstar.c b/board/Seagate/dockstar/dockstar.c
index 5797e3df7d5c..d98c4b2b0d8b 100644
--- a/board/Seagate/dockstar/dockstar.c
+++ b/board/Seagate/dockstar/dockstar.c
@@ -20,6 +20,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/mach-types.h>
+#include <asm/types.h>
 #include "dockstar.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/Seagate/goflexhome/goflexhome.c b/board/Seagate/goflexhome/goflexhome.c
index 1a00eb0cb1f4..d608b94c05f8 100644
--- a/board/Seagate/goflexhome/goflexhome.c
+++ b/board/Seagate/goflexhome/goflexhome.c
@@ -23,6 +23,7 @@
 #include <asm/arch/mpp.h>
 #include <asm/arch/cpu.h>
 #include <asm/io.h>
+#include <asm/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/Seagate/nas220/nas220.c b/board/Seagate/nas220/nas220.c
index 7f561b01dac0..51d0d6a99e57 100644
--- a/board/Seagate/nas220/nas220.c
+++ b/board/Seagate/nas220/nas220.c
@@ -19,6 +19,7 @@
 #include <asm/arch/mpp.h>
 #include <asm/arch/cpu.h>
 #include <asm/io.h>
+#include <asm/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/Synology/ds109/ds109.c b/board/Synology/ds109/ds109.c
index c15f8c38b9d2..1667a76f6e2d 100644
--- a/board/Synology/ds109/ds109.c
+++ b/board/Synology/ds109/ds109.c
@@ -15,6 +15,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
 #include <asm/arch/mpp.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 #include "ds109.h"
diff --git a/board/Synology/ds109/ds109.h b/board/Synology/ds109/ds109.h
index cc6ef991f397..a91c90683fa0 100644
--- a/board/Synology/ds109/ds109.h
+++ b/board/Synology/ds109/ds109.h
@@ -8,6 +8,7 @@
 #ifndef __DS109_H
 #define __DS109_H
 
+#include <asm/types.h>
 #define DS109_OE_LOW			(0)
 #define DS109_OE_HIGH			(0)
 #define DS109_OE_VAL_LOW		((1 << 22)|(1 << 23))
diff --git a/board/Synology/ds414/cmd_syno.c b/board/Synology/ds414/cmd_syno.c
index f6a434d08c93..39e28291d75f 100644
--- a/board/Synology/ds414/cmd_syno.c
+++ b/board/Synology/ds414/cmd_syno.c
@@ -16,6 +16,7 @@
 #include <vsprintf.h>
 #include <linux/mtd/mtd.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <asm/io.h>
 #include "../drivers/ddr/marvell/axp/ddr3_init.h"
diff --git a/board/Synology/ds414/ds414.c b/board/Synology/ds414/ds414.c
index 1ca2e300e085..083fba8e9488 100644
--- a/board/Synology/ds414/ds414.c
+++ b/board/Synology/ds414/ds414.c
@@ -12,6 +12,7 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/kernel.h>
 #include <linux/mbus.h>
diff --git a/board/abilis/tb100/tb100.c b/board/abilis/tb100/tb100.c
index 9ef7ed6e7f45..44fe5f6910ff 100644
--- a/board/abilis/tb100/tb100.c
+++ b/board/abilis/tb100/tb100.c
@@ -9,6 +9,7 @@
 #include <netdev.h>
 #include <asm/io.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 void reset_cpu(ulong addr)
 {
diff --git a/board/advantech/dms-ba16/dms-ba16.c b/board/advantech/dms-ba16/dms-ba16.c
index 42bfa740f1b9..80f86e669bc1 100644
--- a/board/advantech/dms-ba16/dms-ba16.c
+++ b/board/advantech/dms-ba16/dms-ba16.c
@@ -33,6 +33,7 @@
 #include <input.h>
 #include <pwm.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 DECLARE_GLOBAL_DATA_PTR;
 
 #define NC_PAD_CTRL (PAD_CTL_PUS_100K_UP |	\
diff --git a/board/advantech/imx8qm_rom7720_a1/imx8qm_rom7720_a1.c b/board/advantech/imx8qm_rom7720_a1/imx8qm_rom7720_a1.c
index 430c7d3745d2..ce47e9bbd7fb 100644
--- a/board/advantech/imx8qm_rom7720_a1/imx8qm_rom7720_a1.c
+++ b/board/advantech/imx8qm_rom7720_a1/imx8qm_rom7720_a1.c
@@ -21,6 +21,7 @@
 #include <asm/arch/imx8-pins.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/advantech/imx8qm_rom7720_a1/spl.c b/board/advantech/imx8qm_rom7720_a1/spl.c
index 8776a94ff079..4ef3609e4d4b 100644
--- a/board/advantech/imx8qm_rom7720_a1/spl.c
+++ b/board/advantech/imx8qm_rom7720_a1/spl.c
@@ -14,6 +14,7 @@
 #include <asm/u-boot.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <asm/io.h>
 #include <asm/gpio.h>
diff --git a/board/advantech/som-db5800-som-6867/som-db5800-som-6867.c b/board/advantech/som-db5800-som-6867/som-db5800-som-6867.c
index 8499fc541fa7..4ec8881e800a 100644
--- a/board/advantech/som-db5800-som-6867/som-db5800-som-6867.c
+++ b/board/advantech/som-db5800-som-6867/som-db5800-som-6867.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <init.h>
 #include <asm/fsp1/fsp_support.h>
+#include <asm/types.h>
 
 /* ALC262 Verb Table - 10EC0262 */
 static const u32 verb_table_data13[] = {
diff --git a/board/alliedtelesis/SBx81LIFKW/sbx81lifkw.c b/board/alliedtelesis/SBx81LIFKW/sbx81lifkw.c
index d8b9fdfe356f..4ca4ce390a54 100644
--- a/board/alliedtelesis/SBx81LIFKW/sbx81lifkw.c
+++ b/board/alliedtelesis/SBx81LIFKW/sbx81lifkw.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <net.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/io.h>
diff --git a/board/alliedtelesis/SBx81LIFXCAT/sbx81lifxcat.c b/board/alliedtelesis/SBx81LIFXCAT/sbx81lifxcat.c
index 52b8eba92fc1..259c646fe0c7 100644
--- a/board/alliedtelesis/SBx81LIFXCAT/sbx81lifxcat.c
+++ b/board/alliedtelesis/SBx81LIFXCAT/sbx81lifxcat.c
@@ -11,6 +11,7 @@
 #include <netdev.h>
 #include <led.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/io.h>
 #include <asm/arch/cpu.h>
diff --git a/board/alliedtelesis/x530/x530.c b/board/alliedtelesis/x530/x530.c
index f4ff0b960d32..6ca84904fc5f 100644
--- a/board/alliedtelesis/x530/x530.c
+++ b/board/alliedtelesis/x530/x530.c
@@ -13,6 +13,7 @@
 #include <wdt.h>
 #include <asm/global_data.h>
 #include <asm/gpio.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
diff --git a/board/altera/arria5-socdk/qts/pinmux_config.h b/board/altera/arria5-socdk/qts/pinmux_config.h
index 78a032582490..a80d94290076 100644
--- a/board/altera/arria5-socdk/qts/pinmux_config.h
+++ b/board/altera/arria5-socdk/qts/pinmux_config.h
@@ -6,6 +6,7 @@
 #ifndef __SOCFPGA_PINMUX_CONFIG_H__
 #define __SOCFPGA_PINMUX_CONFIG_H__
 
+#include <asm/types.h>
 const u8 sys_mgr_init_table[] = {
 	0, /* EMACIO0 */
 	2, /* EMACIO1 */
diff --git a/board/altera/arria5-socdk/qts/sdram_config.h b/board/altera/arria5-socdk/qts/sdram_config.h
index 927a7a4f8e04..3519c3a204af 100644
--- a/board/altera/arria5-socdk/qts/sdram_config.h
+++ b/board/altera/arria5-socdk/qts/sdram_config.h
@@ -7,6 +7,7 @@
 #define __SOCFPGA_SDRAM_CONFIG_H__
 
 /* SDRAM configuration */
+#include <asm/types.h>
 #define CONFIG_HPS_SDR_CTRLCFG_CPORTRDWR_CPORTRDWR		0x5A56A
 #define CONFIG_HPS_SDR_CTRLCFG_CPORTRMAP_CPORTRMAP		0xB00088
 #define CONFIG_HPS_SDR_CTRLCFG_CPORTWIDTH_CPORTWIDTH		0x44555
diff --git a/board/altera/cyclone5-socdk/qts/pinmux_config.h b/board/altera/cyclone5-socdk/qts/pinmux_config.h
index ec64ae17a167..1426db42bea3 100644
--- a/board/altera/cyclone5-socdk/qts/pinmux_config.h
+++ b/board/altera/cyclone5-socdk/qts/pinmux_config.h
@@ -6,6 +6,7 @@
 #ifndef __SOCFPGA_PINMUX_CONFIG_H__
 #define __SOCFPGA_PINMUX_CONFIG_H__
 
+#include <asm/types.h>
 const u8 sys_mgr_init_table[] = {
 	0, /* EMACIO0 */
 	2, /* EMACIO1 */
diff --git a/board/altera/cyclone5-socdk/qts/sdram_config.h b/board/altera/cyclone5-socdk/qts/sdram_config.h
index 8adbfec11f95..3607260e25fc 100644
--- a/board/altera/cyclone5-socdk/qts/sdram_config.h
+++ b/board/altera/cyclone5-socdk/qts/sdram_config.h
@@ -7,6 +7,7 @@
 #define __SOCFPGA_SDRAM_CONFIG_H__
 
 /* SDRAM configuration */
+#include <asm/types.h>
 #define CONFIG_HPS_SDR_CTRLCFG_CPORTRDWR_CPORTRDWR		0x5A56A
 #define CONFIG_HPS_SDR_CTRLCFG_CPORTRMAP_CPORTRMAP		0xB00088
 #define CONFIG_HPS_SDR_CTRLCFG_CPORTWIDTH_CPORTWIDTH		0x44555
diff --git a/board/amazon/kc1/kc1.c b/board/amazon/kc1/kc1.c
index a1b179d1a3c4..783a0a18e12f 100644
--- a/board/amazon/kc1/kc1.c
+++ b/board/amazon/kc1/kc1.c
@@ -10,6 +10,7 @@
 #include <env.h>
 #include <init.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/ctype.h>
 #include <linux/usb/musb.h>
diff --git a/board/amlogic/odroid-n2/odroid-n2.c b/board/amlogic/odroid-n2/odroid-n2.c
index 005e4bebf13f..c7a174080ef1 100644
--- a/board/amlogic/odroid-n2/odroid-n2.c
+++ b/board/amlogic/odroid-n2/odroid-n2.c
@@ -13,6 +13,7 @@
 #include <asm/io.h>
 #include <asm/arch/sm.h>
 #include <asm/arch/eth.h>
+#include <linux/types.h>
 
 #define EFUSE_MAC_OFFSET	20
 #define EFUSE_MAC_SIZE		12
diff --git a/board/amlogic/p200/p200.c b/board/amlogic/p200/p200.c
index 8f1bf8bfda47..dfa0d0f834aa 100644
--- a/board/amlogic/p200/p200.c
+++ b/board/amlogic/p200/p200.c
@@ -13,6 +13,7 @@
 #include <asm/arch/sm.h>
 #include <asm/arch/eth.h>
 #include <asm/arch/mem.h>
+#include <linux/types.h>
 
 #define EFUSE_SN_OFFSET		20
 #define EFUSE_SN_SIZE		16
diff --git a/board/amlogic/p201/p201.c b/board/amlogic/p201/p201.c
index 597bb71cbf7f..27e1caae0246 100644
--- a/board/amlogic/p201/p201.c
+++ b/board/amlogic/p201/p201.c
@@ -13,6 +13,7 @@
 #include <asm/arch/sm.h>
 #include <asm/arch/eth.h>
 #include <asm/arch/mem.h>
+#include <linux/types.h>
 
 #define EFUSE_SN_OFFSET		20
 #define EFUSE_SN_SIZE		16
diff --git a/board/amlogic/p212/p212.c b/board/amlogic/p212/p212.c
index fbc49e95651f..8ce9ff70aa94 100644
--- a/board/amlogic/p212/p212.c
+++ b/board/amlogic/p212/p212.c
@@ -14,6 +14,7 @@
 #include <asm/arch/sm.h>
 #include <asm/arch/eth.h>
 #include <asm/arch/mem.h>
+#include <linux/types.h>
 
 #define EFUSE_SN_OFFSET		20
 #define EFUSE_SN_SIZE		16
diff --git a/board/amlogic/q200/q200.c b/board/amlogic/q200/q200.c
index 62e6fa3d1992..8cd367cb384e 100644
--- a/board/amlogic/q200/q200.c
+++ b/board/amlogic/q200/q200.c
@@ -14,6 +14,7 @@
 #include <asm/arch/mem.h>
 #include <asm/arch/sm.h>
 #include <asm/arch/eth.h>
+#include <linux/types.h>
 
 #define EFUSE_SN_OFFSET		20
 #define EFUSE_SN_SIZE		16
diff --git a/board/aries/mcvevk/qts/pinmux_config.h b/board/aries/mcvevk/qts/pinmux_config.h
index 85f892ae473c..c4b8c501b237 100644
--- a/board/aries/mcvevk/qts/pinmux_config.h
+++ b/board/aries/mcvevk/qts/pinmux_config.h
@@ -6,6 +6,7 @@
 #ifndef __SOCFPGA_PINMUX_CONFIG_H__
 #define __SOCFPGA_PINMUX_CONFIG_H__
 
+#include <asm/types.h>
 const u8 sys_mgr_init_table[] = {
 	3, /* EMACIO0 */
 	3, /* EMACIO1 */
diff --git a/board/aries/mcvevk/qts/sdram_config.h b/board/aries/mcvevk/qts/sdram_config.h
index fd72926a89e3..9275164f148d 100644
--- a/board/aries/mcvevk/qts/sdram_config.h
+++ b/board/aries/mcvevk/qts/sdram_config.h
@@ -7,6 +7,7 @@
 #define __SOCFPGA_SDRAM_CONFIG_H__
 
 /* SDRAM configuration */
+#include <asm/types.h>
 #define CONFIG_HPS_SDR_CTRLCFG_CPORTRDWR_CPORTRDWR		0x5A56A
 #define CONFIG_HPS_SDR_CTRLCFG_CPORTRMAP_CPORTRMAP		0xB00088
 #define CONFIG_HPS_SDR_CTRLCFG_CPORTWIDTH_CPORTWIDTH		0x44555
diff --git a/board/aristainetos/aristainetos.c b/board/aristainetos/aristainetos.c
index 4451bed8a7dc..2e5200faae90 100644
--- a/board/aristainetos/aristainetos.c
+++ b/board/aristainetos/aristainetos.c
@@ -38,6 +38,7 @@
 #include <led.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/da9063_pmic.h>
diff --git a/board/armadeus/apf27/apf27.c b/board/armadeus/apf27/apf27.c
index c78512ee5465..a66de0f7fdcf 100644
--- a/board/armadeus/apf27/apf27.c
+++ b/board/armadeus/apf27/apf27.c
@@ -20,6 +20,7 @@
 #include <asm/gpio.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include <u-boot/crc.h>
 #include "apf27.h"
 #include "fpga.h"
diff --git a/board/armltd/integrator/integrator.c b/board/armltd/integrator/integrator.c
index a85ac69962ba..7c1e02645ce5 100644
--- a/board/armltd/integrator/integrator.c
+++ b/board/armltd/integrator/integrator.c
@@ -27,6 +27,7 @@
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <dm/platform_data/serial_pl01x.h>
 #include "arm-ebi.h"
diff --git a/board/armltd/integrator/pci.c b/board/armltd/integrator/pci.c
index 28efc33f1f42..5f03a81e3489 100644
--- a/board/armltd/integrator/pci.c
+++ b/board/armltd/integrator/pci.c
@@ -24,6 +24,7 @@
 #include <log.h>
 #include <pci.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/bug.h>
 #include <linux/delay.h>
 #include "integrator-sc.h"
diff --git a/board/armltd/integrator/timer.c b/board/armltd/integrator/timer.c
index 53d1c0ec3038..102c413b511b 100644
--- a/board/armltd/integrator/timer.c
+++ b/board/armltd/integrator/timer.c
@@ -20,6 +20,7 @@
 #include <div64.h>
 #include <time.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_ARCH_CINTEGRATOR
 #define DIV_CLOCK_INIT	1
diff --git a/board/armltd/vexpress/vexpress_common.c b/board/armltd/vexpress/vexpress_common.c
index ee9f61f2b7ac..013a70a3cb94 100644
--- a/board/armltd/vexpress/vexpress_common.c
+++ b/board/armltd/vexpress/vexpress_common.c
@@ -33,6 +33,7 @@
 #include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "../drivers/mmc/arm_pl180_mmci.h"
 
 static struct systimer *systimer_base = (struct systimer *)V2M_TIMER01;
diff --git a/board/armltd/vexpress/vexpress_tc2.c b/board/armltd/vexpress/vexpress_tc2.c
index 75f9d8203495..cbb0a4e51fe6 100644
--- a/board/armltd/vexpress/vexpress_tc2.c
+++ b/board/armltd/vexpress/vexpress_tc2.c
@@ -10,6 +10,7 @@
 #include <stdio.h>
 #include <asm/armv7.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <common.h>
 #include <linux/libfdt.h>
diff --git a/board/armltd/vexpress64/pcie.c b/board/armltd/vexpress64/pcie.c
index 1ad320df3a9e..ad10f5ce5ed7 100644
--- a/board/armltd/vexpress64/pcie.c
+++ b/board/armltd/vexpress64/pcie.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <stdio.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <pci_ids.h>
 #include <linux/delay.h>
diff --git a/board/armltd/vexpress64/vexpress64.c b/board/armltd/vexpress64/vexpress64.c
index 2a44828d6e6d..300cb44f8e9f 100644
--- a/board/armltd/vexpress64/vexpress64.c
+++ b/board/armltd/vexpress64/vexpress64.c
@@ -5,6 +5,7 @@
  * Sharma Bhupesh <bhupesh.sharma@freescale.com>
  */
 #include <common.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <dm.h>
 #include <init.h>
@@ -19,6 +20,7 @@
 #include <linux/compiler.h>
 #include <dm/platform_data/serial_pl01x.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "pcie.h"
 #include <asm/armv8/mmu.h>
 
diff --git a/board/astro/mcf5373l/fpga.c b/board/astro/mcf5373l/fpga.c
index 871700ebfe8a..91ae8c528d6a 100644
--- a/board/astro/mcf5373l/fpga.c
+++ b/board/astro/mcf5373l/fpga.c
@@ -23,6 +23,7 @@
 #include <command.h>
 #include <asm/immap_5329.h>
 #include <asm/io.h>
+#include <linux/types.h>
 #include "fpga.h"
 
 int altera_pre_fn(int cookie)
diff --git a/board/astro/mcf5373l/mcf5373l.c b/board/astro/mcf5373l/mcf5373l.c
index 3eabf924c4a5..38616036bb72 100644
--- a/board/astro/mcf5373l/mcf5373l.c
+++ b/board/astro/mcf5373l/mcf5373l.c
@@ -16,6 +16,7 @@
 #include <asm/m5329.h>
 #include <asm/immap_5329.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 /* needed for astro bus: */
diff --git a/board/atmark-techno/armadillo-800eva/armadillo-800eva.c b/board/atmark-techno/armadillo-800eva/armadillo-800eva.c
index 1bae2832522f..97e18270a82a 100644
--- a/board/atmark-techno/armadillo-800eva/armadillo-800eva.c
+++ b/board/atmark-techno/armadillo-800eva/armadillo-800eva.c
@@ -31,6 +31,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/gpio.h>
 #include <asm/arch/rmobile.h>
+#include <linux/types.h>
 
 #define s_init_wait(cnt) \
 		({	\
diff --git a/board/atmel/at91rm9200ek/at91rm9200ek.c b/board/atmel/at91rm9200ek/at91rm9200ek.c
index 5838e36c7a47..a085c1b448ed 100644
--- a/board/atmel/at91rm9200ek/at91rm9200ek.c
+++ b/board/atmel/at91rm9200ek/at91rm9200ek.c
@@ -19,6 +19,7 @@
 #include <asm/arch/at91_pio.h>
 #include <asm/arch/at91_common.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/atmel/at91sam9261ek/at91sam9261ek.c b/board/atmel/at91sam9261ek/at91sam9261ek.c
index 3a36a23a4d35..728909cc7a1e 100644
--- a/board/atmel/at91sam9261ek/at91sam9261ek.c
+++ b/board/atmel/at91sam9261ek/at91sam9261ek.c
@@ -26,6 +26,7 @@
 #endif
 #include <asm/mach-types.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/atmel/at91sam9263ek/at91sam9263ek.c b/board/atmel/at91sam9263ek/at91sam9263ek.c
index 3218e14e860a..b09b423b9127 100644
--- a/board/atmel/at91sam9263ek/at91sam9263ek.c
+++ b/board/atmel/at91sam9263ek/at91sam9263ek.c
@@ -25,6 +25,7 @@
 #include <lcd.h>
 #include <atmel_lcdc.h>
 #include <asm/mach-types.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c b/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c
index 8cb2808e058a..9ee9ad773769 100644
--- a/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c
+++ b/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c
@@ -22,6 +22,7 @@
 #include <linux/mtd/rawnand.h>
 #include <atmel_lcdc.h>
 #include <asm/mach-types.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/atmel/at91sam9n12ek/at91sam9n12ek.c b/board/atmel/at91sam9n12ek/at91sam9n12ek.c
index 75d5ffa88ae1..5e87553df02a 100644
--- a/board/atmel/at91sam9n12ek/at91sam9n12ek.c
+++ b/board/atmel/at91sam9n12ek/at91sam9n12ek.c
@@ -21,6 +21,7 @@
 #include <atmel_hlcdc.h>
 #include <netdev.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_LCD_INFO
 #include <nand.h>
diff --git a/board/atmel/at91sam9rlek/at91sam9rlek.c b/board/atmel/at91sam9rlek/at91sam9rlek.c
index f427ee658bff..2431c32cba62 100644
--- a/board/atmel/at91sam9rlek/at91sam9rlek.c
+++ b/board/atmel/at91sam9rlek/at91sam9rlek.c
@@ -19,6 +19,7 @@
 #include <asm/arch/at91_rstc.h>
 #include <asm/arch/clk.h>
 #include <asm/arch/gpio.h>
+#include <linux/types.h>
 
 #include <lcd.h>
 #include <atmel_lcdc.h>
diff --git a/board/atmel/common/board.c b/board/atmel/common/board.c
index 46cb5e407bb0..a7752629ec15 100644
--- a/board/atmel/common/board.c
+++ b/board/atmel/common/board.c
@@ -11,6 +11,7 @@
 #include <vsprintf.h>
 #include <w1.h>
 #include <w1-eeprom.h>
+#include <asm/types.h>
 #include <dm/device-internal.h>
 
 #define AT91_PDA_EEPROM_ID_OFFSET		15
diff --git a/board/atmel/common/mac-spi-nor.c b/board/atmel/common/mac-spi-nor.c
index 67bfd3785b70..e631b98a6d47 100644
--- a/board/atmel/common/mac-spi-nor.c
+++ b/board/atmel/common/mac-spi-nor.c
@@ -13,6 +13,7 @@
 #include <linux/mtd/spi-nor.h>
 #include <netdev.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define ETH_ADDR_SIZE			6
 
diff --git a/board/atmel/common/video_display.c b/board/atmel/common/video_display.c
index 33725a01f505..35f764005584 100644
--- a/board/atmel/common/video_display.c
+++ b/board/atmel/common/video_display.c
@@ -17,6 +17,7 @@
 #include <asm/io.h>
 #include <asm/arch/clk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/atmel/sama5d27_som1_ek/sama5d27_som1_ek.c b/board/atmel/sama5d27_som1_ek/sama5d27_som1_ek.c
index 1b7d946b50c3..6ce59620b42b 100644
--- a/board/atmel/sama5d27_som1_ek/sama5d27_som1_ek.c
+++ b/board/atmel/sama5d27_som1_ek/sama5d27_som1_ek.c
@@ -16,6 +16,7 @@
 #include <asm/arch/clk.h>
 #include <asm/arch/gpio.h>
 #include <asm/arch/sama5d2.h>
+#include <asm/types.h>
 
 extern void at91_pda_detect(void);
 
diff --git a/board/atmel/sama5d27_wlsom1_ek/sama5d27_wlsom1_ek.c b/board/atmel/sama5d27_wlsom1_ek/sama5d27_wlsom1_ek.c
index 32d51bba7d96..6a662a12b458 100644
--- a/board/atmel/sama5d27_wlsom1_ek/sama5d27_wlsom1_ek.c
+++ b/board/atmel/sama5d27_wlsom1_ek/sama5d27_wlsom1_ek.c
@@ -17,6 +17,7 @@
 #include <asm/arch/clk.h>
 #include <asm/arch/gpio.h>
 #include <asm/arch/sama5d2.h>
+#include <asm/types.h>
 
 extern void at91_pda_detect(void);
 
diff --git a/board/atmel/sama5d2_icp/sama5d2_icp.c b/board/atmel/sama5d2_icp/sama5d2_icp.c
index 3f33fcfc4665..79bdd63f3af6 100644
--- a/board/atmel/sama5d2_icp/sama5d2_icp.c
+++ b/board/atmel/sama5d2_icp/sama5d2_icp.c
@@ -16,6 +16,7 @@
 #include <asm/arch/clk.h>
 #include <asm/arch/gpio.h>
 #include <asm/arch/sama5d2.h>
+#include <asm/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/atmel/sama5d2_xplained/sama5d2_xplained.c b/board/atmel/sama5d2_xplained/sama5d2_xplained.c
index 5110ec89697f..9111b05578d5 100644
--- a/board/atmel/sama5d2_xplained/sama5d2_xplained.c
+++ b/board/atmel/sama5d2_xplained/sama5d2_xplained.c
@@ -16,6 +16,7 @@
 #include <asm/arch/clk.h>
 #include <asm/arch/gpio.h>
 #include <asm/arch/sama5d2.h>
+#include <asm/types.h>
 
 extern void at91_pda_detect(void);
 
diff --git a/board/atmel/sama5d3_xplained/sama5d3_xplained.c b/board/atmel/sama5d3_xplained/sama5d3_xplained.c
index db9603f58477..2e42841023cb 100644
--- a/board/atmel/sama5d3_xplained/sama5d3_xplained.c
+++ b/board/atmel/sama5d3_xplained/sama5d3_xplained.c
@@ -17,6 +17,7 @@
 #include <spl.h>
 #include <asm/arch/atmel_mpddrc.h>
 #include <asm/arch/at91_wdt.h>
+#include <asm/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/atmel/sama5d3xek/sama5d3xek.c b/board/atmel/sama5d3xek/sama5d3xek.c
index 4fe979bc8a56..d5c593d95cb9 100644
--- a/board/atmel/sama5d3xek/sama5d3xek.c
+++ b/board/atmel/sama5d3xek/sama5d3xek.c
@@ -15,6 +15,7 @@
 #include <asm/arch/clk.h>
 #include <debug_uart.h>
 #include <env.h>
+#include <asm/types.h>
 #include <linux/ctype.h>
 #include <spl.h>
 #include <asm/arch/atmel_mpddrc.h>
diff --git a/board/atmel/sama5d4_xplained/sama5d4_xplained.c b/board/atmel/sama5d4_xplained/sama5d4_xplained.c
index 2088b48b7ee2..25d88538855a 100644
--- a/board/atmel/sama5d4_xplained/sama5d4_xplained.c
+++ b/board/atmel/sama5d4_xplained/sama5d4_xplained.c
@@ -16,6 +16,7 @@
 #include <asm/arch/sama5d3_smc.h>
 #include <asm/arch/sama5d4.h>
 #include <debug_uart.h>
+#include <asm/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/atmel/sama5d4ek/sama5d4ek.c b/board/atmel/sama5d4ek/sama5d4ek.c
index 46ec1eb32467..6215cd6634b1 100644
--- a/board/atmel/sama5d4ek/sama5d4ek.c
+++ b/board/atmel/sama5d4ek/sama5d4ek.c
@@ -16,6 +16,7 @@
 #include <asm/arch/sama5d3_smc.h>
 #include <asm/arch/sama5d4.h>
 #include <debug_uart.h>
+#include <asm/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/avionic-design/common/tamonten-ng.c b/board/avionic-design/common/tamonten-ng.c
index 1b509835d76a..af6c2bd93ccf 100644
--- a/board/avionic-design/common/tamonten-ng.c
+++ b/board/avionic-design/common/tamonten-ng.c
@@ -12,6 +12,7 @@
 #include <asm/arch/gpio.h>
 #include <asm/gpio.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include "pinmux-config-tamonten-ng.h"
 #include <i2c.h>
 
diff --git a/board/bachmann/ot1200/ot1200.c b/board/bachmann/ot1200/ot1200.c
index 47b592117d5b..acf108a89dbb 100644
--- a/board/bachmann/ot1200/ot1200.c
+++ b/board/bachmann/ot1200/ot1200.c
@@ -32,6 +32,7 @@
 #include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/bachmann/ot1200/ot1200_spl.c b/board/bachmann/ot1200/ot1200_spl.c
index 7fbd6f2c5d3e..dbb4121df979 100644
--- a/board/bachmann/ot1200/ot1200_spl.c
+++ b/board/bachmann/ot1200/ot1200_spl.c
@@ -7,6 +7,7 @@
 #include <init.h>
 #include <spl.h>
 #include <asm/arch/mx6-ddr.h>
+#include <linux/types.h>
 
 /* Configure MX6Q/DUAL mmdc DDR io registers */
 static struct mx6dq_iomux_ddr_regs ot1200_ddr_ioregs = {
diff --git a/board/barco/platinum/spl_picon.c b/board/barco/platinum/spl_picon.c
index aa33d1feb32c..79ee212f4ca0 100644
--- a/board/barco/platinum/spl_picon.c
+++ b/board/barco/platinum/spl_picon.c
@@ -19,6 +19,7 @@
 #include <asm/mach-imx/mxc_i2c.h>
 #include <spl.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "platinum.h"
 
diff --git a/board/barco/platinum/spl_titanium.c b/board/barco/platinum/spl_titanium.c
index ef1e2c419b46..ddb14e72b799 100644
--- a/board/barco/platinum/spl_titanium.c
+++ b/board/barco/platinum/spl_titanium.c
@@ -19,6 +19,7 @@
 #include <asm/mach-imx/mxc_i2c.h>
 #include <spl.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "platinum.h"
 
diff --git a/board/beacon/beacon-rzg2m/beacon-rzg2m.c b/board/beacon/beacon-rzg2m/beacon-rzg2m.c
index 4b31d8ff57cd..5e2ff717a5f4 100644
--- a/board/beacon/beacon-rzg2m/beacon-rzg2m.c
+++ b/board/beacon/beacon-rzg2m/beacon-rzg2m.c
@@ -8,6 +8,7 @@
 #include <asm/io.h>
 #include <asm/arch/rcar-mstp.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/beacon/imx8mm/spl.c b/board/beacon/imx8mm/spl.c
index 2895ca24a3a6..516111684760 100644
--- a/board/beacon/imx8mm/spl.c
+++ b/board/beacon/imx8mm/spl.c
@@ -18,6 +18,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <dm/uclass.h>
 #include <dm/device.h>
diff --git a/board/beckhoff/mx53cx9020/mx53cx9020.c b/board/beckhoff/mx53cx9020/mx53cx9020.c
index cbaa4a68f9ed..e961f0570fa3 100644
--- a/board/beckhoff/mx53cx9020/mx53cx9020.c
+++ b/board/beckhoff/mx53cx9020/mx53cx9020.c
@@ -20,6 +20,7 @@
 #include <asm/gpio.h>
 #include <linux/delay.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 enum LED_GPIOS {
 	GPIO_SD1_CD = IMX_GPIO_NR(1, 1),
diff --git a/board/beckhoff/mx53cx9020/mx53cx9020_video.c b/board/beckhoff/mx53cx9020/mx53cx9020_video.c
index 3be2cd5f0ff4..d4a9fa12fdc4 100644
--- a/board/beckhoff/mx53cx9020/mx53cx9020_video.c
+++ b/board/beckhoff/mx53cx9020/mx53cx9020_video.c
@@ -12,6 +12,7 @@
 #include <asm/gpio.h>
 #include <asm/mach-imx/video.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #define CX9020_DVI_PWD	IMX_GPIO_NR(6, 1)
 
diff --git a/board/bluegiga/apx4devkit/apx4devkit.c b/board/bluegiga/apx4devkit/apx4devkit.c
index 2d4437fbfe0f..d1694954759d 100644
--- a/board/bluegiga/apx4devkit/apx4devkit.c
+++ b/board/bluegiga/apx4devkit/apx4devkit.c
@@ -27,6 +27,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/sys_proto.h>
 #include <env.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <linux/mii.h>
diff --git a/board/bluegiga/apx4devkit/spl_boot.c b/board/bluegiga/apx4devkit/spl_boot.c
index d8ee1d0a63ec..ececbcc89112 100644
--- a/board/bluegiga/apx4devkit/spl_boot.c
+++ b/board/bluegiga/apx4devkit/spl_boot.c
@@ -21,6 +21,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #define	MUX_CONFIG_SSP0	(MXS_PAD_3V3 | MXS_PAD_8MA | MXS_PAD_PULLUP)
 #define	MUX_CONFIG_GPMI	(MXS_PAD_3V3 | MXS_PAD_4MA | MXS_PAD_NOPULL)
diff --git a/board/bluewater/gurnard/gurnard.c b/board/bluewater/gurnard/gurnard.c
index da597bbfb0a3..ff4d61fe23dc 100644
--- a/board/bluewater/gurnard/gurnard.c
+++ b/board/bluewater/gurnard/gurnard.c
@@ -39,6 +39,7 @@
 #include <dm/uclass-internal.h>
 #include <linux/delay.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_GURNARD_SPLASH
 #include "splash_logo.h"
diff --git a/board/bosch/shc/board.c b/board/bosch/shc/board.c
index ac8665fc77b8..9213cefa2b6b 100644
--- a/board/bosch/shc/board.c
+++ b/board/bosch/shc/board.c
@@ -40,6 +40,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <power/tps65217.h>
 #include <env_internal.h>
 #include <watchdog.h>
diff --git a/board/bosch/shc/board.h b/board/bosch/shc/board.h
index 997595bf42b5..bdbd6d1260a3 100644
--- a/board/bosch/shc/board.h
+++ b/board/bosch/shc/board.h
@@ -15,6 +15,7 @@
 #define _BOARD_H_
 
 /* Definition to control the GPIOs (for LEDs and Reset) */
+#include <linux/types.h>
 #define GPIO_TO_PIN(bank, gpio) (32 * (bank) + (gpio))
 
 static inline int board_is_b_sample(void)
diff --git a/board/boundary/nitrogen6x/nitrogen6x.c b/board/boundary/nitrogen6x/nitrogen6x.c
index c5a522aea256..761a64812d4a 100644
--- a/board/boundary/nitrogen6x/nitrogen6x.c
+++ b/board/boundary/nitrogen6x/nitrogen6x.c
@@ -40,6 +40,7 @@
 #include <netdev.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <usb/ehci-ci.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/broadcom/bcm_ep/board.c b/board/broadcom/bcm_ep/board.c
index 3776d00b8d88..9efa3158ab7d 100644
--- a/board/broadcom/bcm_ep/board.c
+++ b/board/broadcom/bcm_ep/board.c
@@ -16,6 +16,7 @@
 #include <asm/system.h>
 #include <asm/iproc-common/armpll.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/broadcom/bcmns2/northstar2.c b/board/broadcom/bcmns2/northstar2.c
index 494e457ff65b..98b4da2b9dc5 100644
--- a/board/broadcom/bcmns2/northstar2.c
+++ b/board/broadcom/bcmns2/northstar2.c
@@ -9,6 +9,7 @@
 #include <asm/global_data.h>
 #include <asm/system.h>
 #include <asm/armv8/mmu.h>
+#include <linux/types.h>
 
 static struct mm_region ns2_mem_map[] = {
 	{
diff --git a/board/broadcom/bcmns3/ns3.c b/board/broadcom/bcmns3/ns3.c
index ac9ca20f8adc..711fee16f7a8 100644
--- a/board/broadcom/bcmns3/ns3.c
+++ b/board/broadcom/bcmns3/ns3.c
@@ -14,6 +14,7 @@
 #include <asm/arch-bcmns3/bl33_info.h>
 #include <dt-bindings/memory/bcm-ns3-mc.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 /* Default reset-level = 3 and strap-val = 0 */
 #define L3_RESET	30
diff --git a/board/bticino/mamoj/spl.c b/board/bticino/mamoj/spl.c
index 883b7f4133b9..9e3f2b28224f 100644
--- a/board/bticino/mamoj/spl.c
+++ b/board/bticino/mamoj/spl.c
@@ -11,6 +11,7 @@
 #include <spl.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 #include <asm/io.h>
 #include <linux/sizes.h>
diff --git a/board/buffalo/lsxl/lsxl.c b/board/buffalo/lsxl/lsxl.c
index 97656dd2a7d1..c1d881a2c8c5 100644
--- a/board/buffalo/lsxl/lsxl.c
+++ b/board/buffalo/lsxl/lsxl.c
@@ -27,6 +27,7 @@
 #include <asm/arch/gpio.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 #include "lsxl.h"
 
diff --git a/board/cadence/xtfpga/xtfpga.c b/board/cadence/xtfpga/xtfpga.c
index f61e6bb93012..4101ee0c3240 100644
--- a/board/cadence/xtfpga/xtfpga.c
+++ b/board/cadence/xtfpga/xtfpga.c
@@ -10,6 +10,7 @@
 #include <init.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <asm/types.h>
 #include <dm/platform_data/net_ethoc.h>
 #include <env.h>
 #include <linux/ctype.h>
diff --git a/board/cavium/thunderx/atf.c b/board/cavium/thunderx/atf.c
index 1c91cfe5f061..eabb753e97f7 100644
--- a/board/cavium/thunderx/atf.c
+++ b/board/cavium/thunderx/atf.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <asm/ptrace.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <asm/system.h>
 #include <cavium/thunderx_svc.h>
diff --git a/board/cavium/thunderx/thunderx.c b/board/cavium/thunderx/thunderx.c
index 71444324f317..2aa5b716c41a 100644
--- a/board/cavium/thunderx/thunderx.c
+++ b/board/cavium/thunderx/thunderx.c
@@ -14,6 +14,7 @@
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/compiler.h>
+#include <linux/types.h>
 
 #include <cavium/atf.h>
 #include <asm/armv8/mmu.h>
diff --git a/board/ccv/xpress/spl.c b/board/ccv/xpress/spl.c
index 38bda8d1847c..a1dc38db5e75 100644
--- a/board/ccv/xpress/spl.c
+++ b/board/ccv/xpress/spl.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <asm/arch/mx6-ddr.h>
 #include <asm/arch/crm_regs.h>
+#include <linux/types.h>
 
 /* Configuration for IM IME1G16D3EEBG-15EI, 64M x 16 -> 128MiB */
 
diff --git a/board/ccv/xpress/xpress.c b/board/ccv/xpress/xpress.c
index dfc71ba91bed..060b8372b78e 100644
--- a/board/ccv/xpress/xpress.c
+++ b/board/ccv/xpress/xpress.c
@@ -27,6 +27,7 @@
 #include <mmc.h>
 #include <netdev.h>
 #include <usb.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/board/cirrus/edb93xx/edb93xx.c b/board/cirrus/edb93xx/edb93xx.c
index d33861f229c1..6b4dc61de28a 100644
--- a/board/cirrus/edb93xx/edb93xx.c
+++ b/board/cirrus/edb93xx/edb93xx.c
@@ -27,6 +27,7 @@
 #include <asm/mach-types.h>
 #include <asm/arch/ep93xx.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/cloudengines/pogo_e02/pogo_e02.c b/board/cloudengines/pogo_e02/pogo_e02.c
index fbb88a7150a7..b6fb6241ba9d 100644
--- a/board/cloudengines/pogo_e02/pogo_e02.c
+++ b/board/cloudengines/pogo_e02/pogo_e02.c
@@ -19,6 +19,7 @@
 #include <asm/arch/soc.h>
 #include <asm/arch/mpp.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include "pogo_e02.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/cobra5272/flash.c b/board/cobra5272/flash.c
index f1874e35ff46..09a2a14b67f9 100644
--- a/board/cobra5272/flash.c
+++ b/board/cobra5272/flash.c
@@ -14,6 +14,7 @@
 #include <vsprintf.h>
 #include <linux/delay.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define PHYS_FLASH_1 CONFIG_SYS_FLASH_BASE
 #define FLASH_BANK_SIZE 0x200000
diff --git a/board/compulab/cl-som-imx7/cl-som-imx7.c b/board/compulab/cl-som-imx7/cl-som-imx7.c
index 28f4859f6491..1846c9bf4cfa 100644
--- a/board/compulab/cl-som-imx7/cl-som-imx7.c
+++ b/board/compulab/cl-som-imx7/cl-som-imx7.c
@@ -20,6 +20,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/pfuze3000_pmic.h>
 #include <asm/mach-imx/mxc_i2c.h>
diff --git a/board/compulab/cl-som-imx7/spl.c b/board/compulab/cl-som-imx7/spl.c
index d75951615be4..b00d7c9052f9 100644
--- a/board/compulab/cl-som-imx7/spl.c
+++ b/board/compulab/cl-som-imx7/spl.c
@@ -19,6 +19,7 @@
 #include <asm/arch-mx7/mx7-ddr.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "common.h"
 
 #ifdef CONFIG_FSL_ESDHC_IMX
diff --git a/board/compulab/cm_fx6/cm_fx6.c b/board/compulab/cm_fx6/cm_fx6.c
index b3862fcf3a73..b7401748899b 100644
--- a/board/compulab/cm_fx6/cm_fx6.c
+++ b/board/compulab/cm_fx6/cm_fx6.c
@@ -42,6 +42,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "common.h"
 #include "../common/eeprom.h"
 #include "../common/common.h"
diff --git a/board/compulab/cm_fx6/spl.c b/board/compulab/cm_fx6/spl.c
index a66e60162377..e0f995762e57 100644
--- a/board/compulab/cm_fx6/spl.c
+++ b/board/compulab/cm_fx6/spl.c
@@ -24,6 +24,7 @@
 #include <fsl_esdhc_imx.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 #include "common.h"
 
 enum ddr_config {
diff --git a/board/compulab/cm_t335/cm_t335.c b/board/compulab/cm_t335/cm_t335.c
index 26ba6711c934..ee9f93a735a0 100644
--- a/board/compulab/cm_t335/cm_t335.c
+++ b/board/compulab/cm_t335/cm_t335.c
@@ -18,6 +18,7 @@
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/hardware_am33xx.h>
diff --git a/board/compulab/cm_t43/cm_t43.c b/board/compulab/cm_t43/cm_t43.c
index c035f3643103..4a1afd3727b4 100644
--- a/board/compulab/cm_t43/cm_t43.c
+++ b/board/compulab/cm_t43/cm_t43.c
@@ -15,6 +15,7 @@
 #include <asm/emif.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/tps65218.h>
 #include "board.h"
diff --git a/board/compulab/cm_t43/spl.c b/board/compulab/cm_t43/spl.c
index 14a37b0f5689..6665ee1f8402 100644
--- a/board/compulab/cm_t43/spl.c
+++ b/board/compulab/cm_t43/spl.c
@@ -11,6 +11,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/ddr_defs.h>
 #include <asm/gpio.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 #include <power/pmic.h>
 #include <power/tps65218.h>
diff --git a/board/compulab/common/common.c b/board/compulab/common/common.c
index 7021e73b0820..cae98d2597f4 100644
--- a/board/compulab/common/common.c
+++ b/board/compulab/common/common.c
@@ -6,11 +6,13 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <malloc.h>
 #include <stdio.h>
 #include <asm/bootm.h>
 #include <asm/gpio.h>
 #include <asm/setup.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 #include "common.h"
diff --git a/board/compulab/common/common.h b/board/compulab/common/common.h
index 17cfbb6f27a1..cc3c9dace240 100644
--- a/board/compulab/common/common.h
+++ b/board/compulab/common/common.h
@@ -8,6 +8,7 @@
 #ifndef _CL_COMMON_
 #define _CL_COMMON_
 
+#include <asm/types.h>
 #include <linux/errno.h>
 
 void cl_print_pcb_info(void);
diff --git a/board/compulab/common/eeprom.c b/board/compulab/common/eeprom.c
index cc190103c4cf..7b772b0c1043 100644
--- a/board/compulab/common/eeprom.c
+++ b/board/compulab/common/eeprom.c
@@ -17,6 +17,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "eeprom.h"
 
 #ifndef CONFIG_SYS_I2C_EEPROM_ADDR
diff --git a/board/compulab/common/eeprom.h b/board/compulab/common/eeprom.h
index 5e5aa41074dc..373087a86ce9 100644
--- a/board/compulab/common/eeprom.h
+++ b/board/compulab/common/eeprom.h
@@ -10,6 +10,7 @@
 #define _EEPROM_
 #include <errno.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_SYS_I2C
 int cl_eeprom_read_mac_addr(uchar *buf, uint eeprom_bus);
diff --git a/board/compulab/common/omap3_display.c b/board/compulab/common/omap3_display.c
index 61641aa83755..1af06666603c 100644
--- a/board/compulab/common/omap3_display.c
+++ b/board/compulab/common/omap3_display.c
@@ -20,6 +20,7 @@
 #include <asm/arch-omap3/dss.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 enum display_type {
 	NONE,
diff --git a/board/compulab/common/omap3_smc911x.c b/board/compulab/common/omap3_smc911x.c
index a6a03bc58237..f5d92553fb97 100644
--- a/board/compulab/common/omap3_smc911x.c
+++ b/board/compulab/common/omap3_smc911x.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <netdev.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 #include <asm/io.h>
diff --git a/board/congatec/cgtqmx6eval/cgtqmx6eval.c b/board/congatec/cgtqmx6eval/cgtqmx6eval.c
index 6b37c27fabcd..f56875734e9b 100644
--- a/board/congatec/cgtqmx6eval/cgtqmx6eval.c
+++ b/board/congatec/cgtqmx6eval/cgtqmx6eval.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <init.h>
 #include <net.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
@@ -34,6 +35,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/pfuze100_pmic.h>
 #include <linux/fb.h>
diff --git a/board/congatec/conga-qeval20-qa3-e3845/conga-qeval20-qa3.c b/board/congatec/conga-qeval20-qa3-e3845/conga-qeval20-qa3.c
index 4184c34ace04..89d01b89782a 100644
--- a/board/congatec/conga-qeval20-qa3-e3845/conga-qeval20-qa3.c
+++ b/board/congatec/conga-qeval20-qa3-e3845/conga-qeval20-qa3.c
@@ -11,6 +11,7 @@
 #include <asm/gpio.h>
 #include <asm/ibmpc.h>
 #include <asm/pnp_def.h>
+#include <asm/types.h>
 
 int board_early_init_f(void)
 {
diff --git a/board/corscience/tricorder/led.c b/board/corscience/tricorder/led.c
index d876dd7b9f57..80387cd8116e 100644
--- a/board/corscience/tricorder/led.c
+++ b/board/corscience/tricorder/led.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/gpio.h>
+#include <linux/types.h>
 
 #define TRICORDER_STATUS_LED_YELLOW 42
 #define TRICORDER_STATUS_LED_GREEN  43
diff --git a/board/corscience/tricorder/tricorder-eeprom.c b/board/corscience/tricorder/tricorder-eeprom.c
index e239eeea1457..6444c096fbfc 100644
--- a/board/corscience/tricorder/tricorder-eeprom.c
+++ b/board/corscience/tricorder/tricorder-eeprom.c
@@ -6,6 +6,7 @@
  */
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <display_options.h>
 #include <eeprom.h>
 #include <i2c.h>
@@ -13,6 +14,7 @@
 #include <vsprintf.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <u-boot/crc.h>
 
 #include "tricorder-eeprom.h"
diff --git a/board/corscience/tricorder/tricorder-eeprom.h b/board/corscience/tricorder/tricorder-eeprom.h
index 7107b02a2c10..4906d241f09f 100644
--- a/board/corscience/tricorder/tricorder-eeprom.h
+++ b/board/corscience/tricorder/tricorder-eeprom.h
@@ -7,7 +7,9 @@
 #ifndef TRICORDER_EEPROM_H_
 #define TRICORDER_EEPROM_H_
 
+#include <compiler.h>
 #include <linux/compiler.h>
+#include <linux/types.h>
 
 #define TRICORDER_EEPROM_MAGIC 0xc2a94f52
 #define TRICORDER_EEPROM_VERSION 1
diff --git a/board/corscience/tricorder/tricorder.c b/board/corscience/tricorder/tricorder.c
index 08b8e7f4d04e..2d918acbe04d 100644
--- a/board/corscience/tricorder/tricorder.c
+++ b/board/corscience/tricorder/tricorder.c
@@ -25,6 +25,7 @@
 #include <asm/arch/mem.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "tricorder.h"
 #include "tricorder-eeprom.h"
 
diff --git a/board/cortina/presidio-asic/presidio.c b/board/cortina/presidio-asic/presidio.c
index f26ad2a5d9c1..a929350412a5 100644
--- a/board/cortina/presidio-asic/presidio.c
+++ b/board/cortina/presidio-asic/presidio.c
@@ -18,6 +18,7 @@
 #include <asm/psci.h>
 #include <cpu_func.h>
 #include <asm/armv8/mmu.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/creative/xfi3/spl_boot.c b/board/creative/xfi3/spl_boot.c
index dd31156e445f..b88ddcefe2e5 100644
--- a/board/creative/xfi3/spl_boot.c
+++ b/board/creative/xfi3/spl_boot.c
@@ -13,6 +13,7 @@
 #include <asm/arch/sys_proto.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define	MUX_CONFIG_EMI	(MXS_PAD_1V8 | MXS_PAD_12MA | MXS_PAD_PULLUP)
 #define	MUX_CONFIG_SSP	(MXS_PAD_3V3 | MXS_PAD_8MA | MXS_PAD_PULLUP)
diff --git a/board/creative/xfi3/xfi3.c b/board/creative/xfi3/xfi3.c
index 825a613aee4b..ce5ff83e084c 100644
--- a/board/creative/xfi3/xfi3.c
+++ b/board/creative/xfi3/xfi3.c
@@ -24,6 +24,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/cssi/MCR3000/MCR3000.c b/board/cssi/MCR3000/MCR3000.c
index 3bce44ef4305..c95163345206 100644
--- a/board/cssi/MCR3000/MCR3000.c
+++ b/board/cssi/MCR3000/MCR3000.c
@@ -8,6 +8,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <env.h>
 #include <hwconfig.h>
 #include <init.h>
@@ -23,6 +24,7 @@
 #include <wdt.h>
 #include <linux/delay.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/cssi/MCR3000/nand.c b/board/cssi/MCR3000/nand.c
index d2ed0fc7d49d..700b43113d1b 100644
--- a/board/cssi/MCR3000/nand.c
+++ b/board/cssi/MCR3000/nand.c
@@ -5,6 +5,7 @@
  * Christophe Leroy <christophe.leroy@c-s.fr>
  */
 
+#include <compiler.h>
 #include <config.h>
 #include <common.h>
 #include <nand.h>
diff --git a/board/d-link/dns325/dns325.c b/board/d-link/dns325/dns325.c
index a50220576f12..a1054d2f10c3 100644
--- a/board/d-link/dns325/dns325.c
+++ b/board/d-link/dns325/dns325.c
@@ -21,6 +21,7 @@
 #include <asm/arch/mpp.h>
 #include <asm/arch/gpio.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include "dns325.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/davinci/da8xxevm/da850evm.c b/board/davinci/da8xxevm/da850evm.c
index 8cc118cde5a4..cfb6d0ffdffd 100644
--- a/board/davinci/da8xxevm/da850evm.c
+++ b/board/davinci/da8xxevm/da850evm.c
@@ -32,6 +32,7 @@
 #include <asm/gpio.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_MMC_DAVINCI
 #include <mmc.h>
diff --git a/board/davinci/da8xxevm/omapl138_lcdk.c b/board/davinci/da8xxevm/omapl138_lcdk.c
index 30182d02805f..559ad93c9efe 100644
--- a/board/davinci/da8xxevm/omapl138_lcdk.c
+++ b/board/davinci/da8xxevm/omapl138_lcdk.c
@@ -31,6 +31,7 @@
 #endif
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/devboards/dbm-soc1/qts/pinmux_config.h b/board/devboards/dbm-soc1/qts/pinmux_config.h
index 3f34b131f330..90473c1828e2 100644
--- a/board/devboards/dbm-soc1/qts/pinmux_config.h
+++ b/board/devboards/dbm-soc1/qts/pinmux_config.h
@@ -6,6 +6,7 @@
 #ifndef __SOCFPGA_PINMUX_CONFIG_H__
 #define __SOCFPGA_PINMUX_CONFIG_H__
 
+#include <asm/types.h>
 const u8 sys_mgr_init_table[] = {
 	0, /* EMACIO0 */
 	2, /* EMACIO1 */
diff --git a/board/devboards/dbm-soc1/qts/sdram_config.h b/board/devboards/dbm-soc1/qts/sdram_config.h
index 2022969bed9b..ba77e006161b 100644
--- a/board/devboards/dbm-soc1/qts/sdram_config.h
+++ b/board/devboards/dbm-soc1/qts/sdram_config.h
@@ -7,6 +7,7 @@
 #define __SOCFPGA_SDRAM_CONFIG_H__
 
 /* SDRAM configuration */
+#include <asm/types.h>
 #define CONFIG_HPS_SDR_CTRLCFG_CPORTRDWR_CPORTRDWR		0x5A56A
 #define CONFIG_HPS_SDR_CTRLCFG_CPORTRMAP_CPORTRMAP		0xB00088
 #define CONFIG_HPS_SDR_CTRLCFG_CPORTWIDTH_CPORTWIDTH		0x44555
diff --git a/board/dhelectronics/dh_imx6/dh_imx6.c b/board/dhelectronics/dh_imx6/dh_imx6.c
index 8badac1d682e..d05aa65728ff 100644
--- a/board/dhelectronics/dh_imx6/dh_imx6.c
+++ b/board/dhelectronics/dh_imx6/dh_imx6.c
@@ -14,6 +14,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <dm/device-internal.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/crm_regs.h>
diff --git a/board/dhelectronics/dh_imx6/dh_imx6_spl.c b/board/dhelectronics/dh_imx6/dh_imx6_spl.c
index fdf915fead49..d289f0917cb1 100644
--- a/board/dhelectronics/dh_imx6/dh_imx6_spl.c
+++ b/board/dhelectronics/dh_imx6/dh_imx6_spl.c
@@ -29,6 +29,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define ENET_PAD_CTRL							\
 	(PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm |	\
diff --git a/board/dhelectronics/dh_stm32mp1/board.c b/board/dhelectronics/dh_stm32mp1/board.c
index 3fdf69d14685..5bebdbdea9ca 100644
--- a/board/dhelectronics/dh_stm32mp1/board.c
+++ b/board/dhelectronics/dh_stm32mp1/board.c
@@ -7,6 +7,7 @@
 #include <adc.h>
 #include <log.h>
 #include <net.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/arch/stm32.h>
@@ -42,6 +43,7 @@
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <power/regulator.h>
 #include <remoteproc.h>
 #include <reset.h>
diff --git a/board/ebv/socrates/qts/pinmux_config.h b/board/ebv/socrates/qts/pinmux_config.h
index 41b634315bfb..950b72aa6179 100644
--- a/board/ebv/socrates/qts/pinmux_config.h
+++ b/board/ebv/socrates/qts/pinmux_config.h
@@ -6,6 +6,7 @@
 #ifndef __SOCFPGA_PINMUX_CONFIG_H__
 #define __SOCFPGA_PINMUX_CONFIG_H__
 
+#include <asm/types.h>
 const u8 sys_mgr_init_table[] = {
 	0, /* EMACIO0 */
 	2, /* EMACIO1 */
diff --git a/board/ebv/socrates/qts/sdram_config.h b/board/ebv/socrates/qts/sdram_config.h
index 2f8465bf77ca..1bf1e8708ea6 100644
--- a/board/ebv/socrates/qts/sdram_config.h
+++ b/board/ebv/socrates/qts/sdram_config.h
@@ -7,6 +7,7 @@
 #define __SOCFPGA_SDRAM_CONFIG_H__
 
 /* SDRAM configuration */
+#include <asm/types.h>
 #define CONFIG_HPS_SDR_CTRLCFG_CPORTRDWR_CPORTRDWR		0x5A56A
 #define CONFIG_HPS_SDR_CTRLCFG_CPORTRMAP_CPORTRMAP		0xB00088
 #define CONFIG_HPS_SDR_CTRLCFG_CPORTWIDTH_CPORTWIDTH		0x44555
diff --git a/board/eets/pdu001/board.c b/board/eets/pdu001/board.c
index 4268885e29e5..351af43b6d7e 100644
--- a/board/eets/pdu001/board.c
+++ b/board/eets/pdu001/board.c
@@ -20,6 +20,7 @@
 #include <watchdog.h>
 #include <debug_uart.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <dm/ofnode.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/board/eets/pdu001/board.h b/board/eets/pdu001/board.h
index bfea96e5f02a..034a24ac67c3 100644
--- a/board/eets/pdu001/board.h
+++ b/board/eets/pdu001/board.h
@@ -25,6 +25,7 @@
  * However we relay on the ROM to configure the pins of MMC0 (eMMC) as well
  * as MMC1 (microSD card-cage) since these are our boot devices.
  */
+#include <asm/types.h>
 void enable_uart0_pin_mux(void);
 void enable_uart1_pin_mux(void);
 void enable_uart2_pin_mux(void);
diff --git a/board/eets/pdu001/mux.c b/board/eets/pdu001/mux.c
index f0f9e262ebdb..4466775c8119 100644
--- a/board/eets/pdu001/mux.c
+++ b/board/eets/pdu001/mux.c
@@ -13,6 +13,7 @@
 #include <asm/arch/hardware.h>
 #include <asm/arch/mux.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include "board.h"
 
 static struct module_pin_mux uart0_pin_mux[] = {
diff --git a/board/egnite/ethernut5/ethernut5_pwrman.c b/board/egnite/ethernut5/ethernut5_pwrman.c
index ad5285f8ca98..93a8f1c9a77d 100644
--- a/board/egnite/ethernut5/ethernut5_pwrman.c
+++ b/board/egnite/ethernut5/ethernut5_pwrman.c
@@ -20,6 +20,7 @@
  * which allows to manually deal with the PMC.
  *
  * Two distinct registers are provided by the PMC for enabling
+#include <asm/types.h>
  * and disabling specific features. This avoids the often seen
  * read-modify-write cycle or shadow register requirement.
  * Additional registers are available to query the board
diff --git a/board/el/el6x/el6x.c b/board/el/el6x/el6x.c
index 952ec9dae101..e5ff2dab705c 100644
--- a/board/el/el6x/el6x.c
+++ b/board/el/el6x/el6x.c
@@ -35,6 +35,7 @@
 #include <input.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/pfuze100_pmic.h>
 #include <asm/arch/mx6-ddr.h>
diff --git a/board/embest/mx6boards/mx6boards.c b/board/embest/mx6boards/mx6boards.c
index b6d29adc5f40..e4ae166ea5b0 100644
--- a/board/embest/mx6boards/mx6boards.c
+++ b/board/embest/mx6boards/mx6boards.c
@@ -43,6 +43,7 @@
 #include <ipu_pixfmt.h>
 #include <asm/io.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/emulation/qemu-arm/qemu-arm.c b/board/emulation/qemu-arm/qemu-arm.c
index e6b8776bfafc..4bbde528de70 100644
--- a/board/emulation/qemu-arm/qemu-arm.c
+++ b/board/emulation/qemu-arm/qemu-arm.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <virtio_types.h>
 #include <virtio.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 
 #ifdef CONFIG_ARM64
diff --git a/board/emulation/qemu-riscv/qemu-riscv.c b/board/emulation/qemu-riscv/qemu-riscv.c
index dcfd3f20bee6..80a137595697 100644
--- a/board/emulation/qemu-riscv/qemu-riscv.c
+++ b/board/emulation/qemu-riscv/qemu-riscv.c
@@ -13,6 +13,7 @@
 #include <init.h>
 #include <virtio_types.h>
 #include <virtio.h>
+#include <linux/types.h>
 
 int board_init(void)
 {
diff --git a/board/engicam/common/board.c b/board/engicam/common/board.c
index 174266397048..971b08f6349b 100644
--- a/board/engicam/common/board.c
+++ b/board/engicam/common/board.c
@@ -18,6 +18,7 @@
 #include <asm/arch/sys_proto.h>
 #include <watchdog.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 
diff --git a/board/engicam/common/spl.c b/board/engicam/common/spl.c
index fc01fabd521f..a859522646a8 100644
--- a/board/engicam/common/spl.c
+++ b/board/engicam/common/spl.c
@@ -13,6 +13,7 @@
 #include <stdio.h>
 #include <linux/delay.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <asm/io.h>
 #include <asm/gpio.h>
diff --git a/board/engicam/imx6q/imx6q.c b/board/engicam/imx6q/imx6q.c
index 3405c7a09e41..eb8322a7848b 100644
--- a/board/engicam/imx6q/imx6q.c
+++ b/board/engicam/imx6q/imx6q.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include <asm/io.h>
 #include <asm/gpio.h>
diff --git a/board/esd/meesc/meesc.c b/board/esd/meesc/meesc.c
index 6ddaed412ed8..9936733ee4d6 100644
--- a/board/esd/meesc/meesc.c
+++ b/board/esd/meesc/meesc.c
@@ -31,6 +31,7 @@
 #include <netdev.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/esd/vme8349/caddy.c b/board/esd/vme8349/caddy.c
index 7ced22e8430d..67538bf8a006 100644
--- a/board/esd/vme8349/caddy.c
+++ b/board/esd/vme8349/caddy.c
@@ -18,6 +18,7 @@
 #include <asm/mmu.h>
 #include <asm/io.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "caddy.h"
 
diff --git a/board/esd/vme8349/caddy.h b/board/esd/vme8349/caddy.h
index 8e3033ba20ee..3d0df1e1c0e7 100644
--- a/board/esd/vme8349/caddy.h
+++ b/board/esd/vme8349/caddy.h
@@ -9,6 +9,7 @@
 #ifndef __CADDY_H__
 #define __CADDY_H__
 
+#include <linux/types.h>
 #define CMD_SIZE	1024
 #define ANSWER_SIZE	1024
 #define CADDY_MAGIC	"esd vme8349 V1.0"
diff --git a/board/esd/vme8349/pci.c b/board/esd/vme8349/pci.c
index bf59cc8d8c2d..8db2062a0491 100644
--- a/board/esd/vme8349/pci.c
+++ b/board/esd/vme8349/pci.c
@@ -20,6 +20,7 @@
 #include <i2c.h>
 #include <asm/fsl_i2c.h>
 #include <asm/ppc.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include "vme8349pin.h"
 
diff --git a/board/esd/vme8349/vme8349.c b/board/esd/vme8349/vme8349.c
index 014578673656..e4a2dd491486 100644
--- a/board/esd/vme8349/vme8349.c
+++ b/board/esd/vme8349/vme8349.c
@@ -33,6 +33,7 @@
 #include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/common/arm_sleep.c b/board/freescale/common/arm_sleep.c
index ddcab9f9eef9..2e51b43de3cf 100644
--- a/board/freescale/common/arm_sleep.c
+++ b/board/freescale/common/arm_sleep.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <log.h>
 #include <stdbool.h>
 #include <asm/global_data.h>
@@ -14,6 +15,7 @@
 #include <asm/secure.h>
 #endif
 #include <asm/armv7.h>
+#include <asm/types.h>
 
 #if defined(CONFIG_ARCH_LS1021A)
 #include <asm/arch/immap_ls102xa.h>
diff --git a/board/freescale/common/cadmus.c b/board/freescale/common/cadmus.c
index 7e7394f333e7..2b5b62e5bc06 100644
--- a/board/freescale/common/cadmus.c
+++ b/board/freescale/common/cadmus.c
@@ -5,6 +5,7 @@
 
 
 #include <common.h>
+#include <linux/types.h>
 
 
 /*
diff --git a/board/freescale/common/cds_pci_ft.c b/board/freescale/common/cds_pci_ft.c
index 6b3690610d99..c5d673c2db97 100644
--- a/board/freescale/common/cds_pci_ft.c
+++ b/board/freescale/common/cds_pci_ft.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
diff --git a/board/freescale/common/cmd_esbc_validate.c b/board/freescale/common/cmd_esbc_validate.c
index 72b58360c271..1a77528a5ede 100644
--- a/board/freescale/common/cmd_esbc_validate.c
+++ b/board/freescale/common/cmd_esbc_validate.c
@@ -9,6 +9,7 @@
 #include <fsl_validate.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/types.h>
 
 int do_esbc_halt(struct cmd_tbl *cmdtp, int flag, int argc,
 		 char *const argv[])
diff --git a/board/freescale/common/dcu_sii9022a.c b/board/freescale/common/dcu_sii9022a.c
index dc0f27bfe71d..3170444c8f52 100644
--- a/board/freescale/common/dcu_sii9022a.c
+++ b/board/freescale/common/dcu_sii9022a.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <fsl_dcu_fb.h>
 #include <i2c.h>
+#include <asm/types.h>
 #include <linux/fb.h>
 
 #define PIXEL_CLK_LSB_REG		0x00
diff --git a/board/freescale/common/diu_ch7301.c b/board/freescale/common/diu_ch7301.c
index cd6264b354f5..8305a5c6af62 100644
--- a/board/freescale/common/diu_ch7301.c
+++ b/board/freescale/common/diu_ch7301.c
@@ -13,6 +13,7 @@
 #include <stdio.h>
 #include <stdio_dev.h>
 #include <i2c.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 #define I2C_DVI_INPUT_DATA_FORMAT_REG		0x1F
diff --git a/board/freescale/common/emc2305.c b/board/freescale/common/emc2305.c
index b8f2bbd2b5a9..82544d4f55a6 100644
--- a/board/freescale/common/emc2305.c
+++ b/board/freescale/common/emc2305.c
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <asm/types.h>
 
 #include "emc2305.h"
 
diff --git a/board/freescale/common/emc2305.h b/board/freescale/common/emc2305.h
index eddf53713844..5608f72f5101 100644
--- a/board/freescale/common/emc2305.h
+++ b/board/freescale/common/emc2305.h
@@ -8,6 +8,7 @@
 #ifndef __EMC2305_H_
 #define __EMC2305_H_
 
+#include <asm/types.h>
 #define I2C_EMC2305_CONF		0x20
 #define I2C_EMC2305_FAN1		0x30
 #define I2C_EMC2305_FAN2		0x40
diff --git a/board/freescale/common/fman.c b/board/freescale/common/fman.c
index 358303108d8d..af45f3429a78 100644
--- a/board/freescale/common/fman.c
+++ b/board/freescale/common/fman.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <asm/types.h>
 #include <linux/libfdt.h>
 #include <linux/libfdt_env.h>
 #include <fdt_support.h>
diff --git a/board/freescale/common/fman.h b/board/freescale/common/fman.h
index 16afc34b03e3..976a09f1e142 100644
--- a/board/freescale/common/fman.h
+++ b/board/freescale/common/fman.h
@@ -6,6 +6,7 @@
 #ifndef __FMAN_BOARD_HELPER__
 #define __FMAN_BOARD_HELPER__
 
+#include <asm/types.h>
 int fdt_set_phy_handle(void *fdt, char *compat, phys_addr_t addr,
 			const char *alias);
 
diff --git a/board/freescale/common/fsl_chain_of_trust.c b/board/freescale/common/fsl_chain_of_trust.c
index 7567ea2c1c29..dd8dcba41574 100644
--- a/board/freescale/common/fsl_chain_of_trust.c
+++ b/board/freescale/common/fsl_chain_of_trust.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <env.h>
 #include <fsl_validate.h>
@@ -12,6 +13,7 @@
 #include <log.h>
 #include <stdio.h>
 #include <dm/root.h>
+#include <linux/types.h>
 
 #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_FRAMEWORK)
 #include <spl.h>
diff --git a/board/freescale/common/fsl_validate.c b/board/freescale/common/fsl_validate.c
index a228c82bc8e0..7b962025c603 100644
--- a/board/freescale/common/fsl_validate.c
+++ b/board/freescale/common/fsl_validate.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <flash.h>
 #include <fsl_validate.h>
@@ -17,6 +18,7 @@
 #include <vsprintf.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <u-boot/rsa-mod-exp.h>
 #include <hash.h>
 #include <fsl_secboot_err.h>
diff --git a/board/freescale/common/ics307_clk.c b/board/freescale/common/ics307_clk.c
index 7a74239fb3a4..2cd8adf24cb9 100644
--- a/board/freescale/common/ics307_clk.c
+++ b/board/freescale/common/ics307_clk.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <log.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 
 #include "ics307_clk.h"
diff --git a/board/freescale/common/idt8t49n222a_serdes_clk.h b/board/freescale/common/idt8t49n222a_serdes_clk.h
index b1528e326693..4e21403e9146 100644
--- a/board/freescale/common/idt8t49n222a_serdes_clk.h
+++ b/board/freescale/common/idt8t49n222a_serdes_clk.h
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <i2c.h>
+#include <asm/types.h>
 #include "qixis.h"
 #include "../b4860qds/b4860qds_qixis.h"
 #include <errno.h>
diff --git a/board/freescale/common/ls102xa_stream_id.c b/board/freescale/common/ls102xa_stream_id.c
index a6ee87da9f55..f1f86e5cc294 100644
--- a/board/freescale/common/ls102xa_stream_id.c
+++ b/board/freescale/common/ls102xa_stream_id.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <asm/io.h>
 #include <asm/arch/ls102xa_stream_id.h>
+#include <linux/types.h>
 
 void ls102xa_config_smmu_stream_id(struct smmu_stream_id *id, uint32_t num)
 {
diff --git a/board/freescale/common/mc34vr500.c b/board/freescale/common/mc34vr500.c
index d96d1e2293f2..12ad0057c236 100644
--- a/board/freescale/common/mc34vr500.c
+++ b/board/freescale/common/mc34vr500.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <stdio.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/mc34vr500_pmic.h>
 
diff --git a/board/freescale/common/mpc85xx_sleep.c b/board/freescale/common/mpc85xx_sleep.c
index bfaf8eb2d6fd..f2daa50150ba 100644
--- a/board/freescale/common/mpc85xx_sleep.c
+++ b/board/freescale/common/mpc85xx_sleep.c
@@ -4,10 +4,12 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <log.h>
 #include <stdbool.h>
 #include <asm/global_data.h>
 #include <asm/immap_85xx.h>
+#include <asm/types.h>
 #include "sleep.h"
 #ifdef CONFIG_U_QE
 #include <fsl_qe.h>
diff --git a/board/freescale/common/ngpixis.c b/board/freescale/common/ngpixis.c
index 6938c2c2ead4..45d61caaae22 100644
--- a/board/freescale/common/ngpixis.c
+++ b/board/freescale/common/ngpixis.c
@@ -34,6 +34,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/string.h>
 
 #include "ngpixis.h"
diff --git a/board/freescale/common/ngpixis.h b/board/freescale/common/ngpixis.h
index 7a20ee015fa3..7342220bc040 100644
--- a/board/freescale/common/ngpixis.h
+++ b/board/freescale/common/ngpixis.h
@@ -10,6 +10,7 @@
 /* ngPIXIS register set. Hopefully, this won't change too much over time.
  * Feel free to add board-specific #ifdefs where necessary.
  */
+#include <asm/types.h>
 typedef struct ngpixis {
 	u8 id;
 	u8 arch;
diff --git a/board/freescale/common/ns_access.c b/board/freescale/common/ns_access.c
index 64eeb1159e76..16fb8d44adda 100644
--- a/board/freescale/common/ns_access.c
+++ b/board/freescale/common/ns_access.c
@@ -11,6 +11,7 @@
 #include <asm/arch/ns_access.h>
 #include <asm/arch/fsl_serdes.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_ARCH_LS1021A
 static struct csu_ns_dev ns_dev[] = {
diff --git a/board/freescale/common/pfuze.c b/board/freescale/common/pfuze.c
index 2011738fe215..95a21e1cb9b6 100644
--- a/board/freescale/common/pfuze.c
+++ b/board/freescale/common/pfuze.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <errno.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <power/pmic.h>
 #include <power/pfuze100_pmic.h>
diff --git a/board/freescale/common/pfuze.h b/board/freescale/common/pfuze.h
index 45b49afaeb77..8cb94f8885c5 100644
--- a/board/freescale/common/pfuze.h
+++ b/board/freescale/common/pfuze.h
@@ -14,4 +14,5 @@ struct pmic *pfuze_common_init(unsigned char i2cbus);
 int pfuze_mode_init(struct pmic *p, u32 mode);
 #endif
 
+#include <asm/types.h>
 #endif
diff --git a/board/freescale/common/pixis.c b/board/freescale/common/pixis.c
index 2d232958c5ba..3dc5a3bf3caa 100644
--- a/board/freescale/common/pixis.c
+++ b/board/freescale/common/pixis.c
@@ -10,6 +10,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/string.h>
 
 #define pixis_base (u8 *)PIXIS_BASE
diff --git a/board/freescale/common/pixis.h b/board/freescale/common/pixis.h
index 40053c45bb75..78a2cd926e79 100644
--- a/board/freescale/common/pixis.h
+++ b/board/freescale/common/pixis.h
@@ -160,6 +160,7 @@ typedef struct pixis {
 #endif
 
 /* Pointer to the PIXIS register set */
+#include <asm/types.h>
 #define pixis ((pixis_t *)PIXIS_BASE)
 
 #endif	/* __PIXIS_H_ */
diff --git a/board/freescale/common/pq-mds-pib.c b/board/freescale/common/pq-mds-pib.c
index 10e1dfe43f97..8143f042c5bb 100644
--- a/board/freescale/common/pq-mds-pib.c
+++ b/board/freescale/common/pq-mds-pib.c
@@ -12,6 +12,7 @@
 #include <i2c.h>
 #include <stdio.h>
 #include <asm/io.h>
+#include <asm/types.h>
 
 #include "pq-mds-pib.h"
 
diff --git a/board/freescale/common/qixis.c b/board/freescale/common/qixis.c
index ee42a53dae16..07e1d0ef18e2 100644
--- a/board/freescale/common/qixis.c
+++ b/board/freescale/common/qixis.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <stdio.h>
 #include <asm/io.h>
 #include <linux/compiler.h>
@@ -16,6 +17,7 @@
 #include <linux/string.h>
 #include <linux/time.h>
 #include <i2c.h>
+#include <linux/types.h>
 #include "qixis.h"
 
 #ifndef QIXIS_LBMAP_BRDCFG_REG
diff --git a/board/freescale/common/qixis.h b/board/freescale/common/qixis.h
index 93638d24524d..339980cbf011 100644
--- a/board/freescale/common/qixis.h
+++ b/board/freescale/common/qixis.h
@@ -10,6 +10,7 @@
 #ifndef __QIXIS_H_
 #define __QIXIS_H_
 
+#include <asm/types.h>
 struct qixis {
 	u8 id;      /* ID value uniquely identifying each QDS board type */
 	u8 arch;    /* Board version information */
diff --git a/board/freescale/common/sdhc_boot.c b/board/freescale/common/sdhc_boot.c
index a1c7a94a90e3..903c6535097d 100644
--- a/board/freescale/common/sdhc_boot.c
+++ b/board/freescale/common/sdhc_boot.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <mmc.h>
 #include <malloc.h>
+#include <asm/types.h>
 
 /*
  * The environment variables are written to just after the u-boot image
diff --git a/board/freescale/common/sgmii_riser.c b/board/freescale/common/sgmii_riser.c
index 5e486a98e848..2f689b7783ed 100644
--- a/board/freescale/common/sgmii_riser.c
+++ b/board/freescale/common/sgmii_riser.c
@@ -21,6 +21,7 @@
 #include <tsec.h>
 #include <fdt_support.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 void fsl_sgmii_riser_init(struct tsec_info_struct *tsec_info, int num)
 {
diff --git a/board/freescale/common/spl.h b/board/freescale/common/spl.h
index d4689d3d7269..b0e7abf76cbe 100644
--- a/board/freescale/common/spl.h
+++ b/board/freescale/common/spl.h
@@ -6,6 +6,7 @@
 #ifndef __FREESCALE_BOARD_SPL_H
 #define __FREESCALE_BOARD_SPL_H
 
+#include <linux/types.h>
 void fsl_spi_spl_load_image(uint32_t offs, unsigned int size, void *vdst);
 void fsl_spi_boot(void) __noreturn;
 
diff --git a/board/freescale/common/sys_eeprom.c b/board/freescale/common/sys_eeprom.c
index f04bec05a419..3eeabf616d4b 100644
--- a/board/freescale/common/sys_eeprom.c
+++ b/board/freescale/common/sys_eeprom.c
@@ -8,11 +8,13 @@
 
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <env.h>
 #include <i2c.h>
 #include <init.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <asm/types.h>
 #include <linux/ctype.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
diff --git a/board/freescale/common/vid.c b/board/freescale/common/vid.c
index f1ef3142c0c2..0a738e9e2d40 100644
--- a/board/freescale/common/vid.c
+++ b/board/freescale/common/vid.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <env.h>
 #include <i2c.h>
 #include <irq_func.h>
@@ -21,6 +22,7 @@
 #endif
 #include <linux/delay.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include "vid.h"
 
 int __weak i2c_multiplexer_select_vid_channel(u8 channel)
diff --git a/board/freescale/common/vid.h b/board/freescale/common/vid.h
index 99778e9a934b..a74f517c098c 100644
--- a/board/freescale/common/vid.h
+++ b/board/freescale/common/vid.h
@@ -6,6 +6,7 @@
 #ifndef __VID_H_
 #define __VID_H_
 
+#include <linux/types.h>
 #define IR36021_LOOP1_MANUAL_ID_OFFSET	0x6A
 #define IR36021_LOOP1_VOUT_OFFSET	0x9A
 #define IR36021_MFR_ID_OFFSET		0x92
diff --git a/board/freescale/corenet_ds/corenet_ds.c b/board/freescale/corenet_ds/corenet_ds.c
index a6b93bab4e89..89dac9f46c89 100644
--- a/board/freescale/corenet_ds/corenet_ds.c
+++ b/board/freescale/corenet_ds/corenet_ds.c
@@ -12,6 +12,7 @@
 #include <netdev.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/compiler.h>
 #include <asm/mmu.h>
diff --git a/board/freescale/corenet_ds/ddr.c b/board/freescale/corenet_ds/ddr.c
index ea1419efa700..473217b33b22 100644
--- a/board/freescale/corenet_ds/ddr.c
+++ b/board/freescale/corenet_ds/ddr.c
@@ -17,6 +17,7 @@
 #include <fsl_ddr_dimm_params.h>
 #include <asm/fsl_law.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/corenet_ds/eth_hydra.c b/board/freescale/corenet_ds/eth_hydra.c
index f7c337d677af..e38c1d59dca3 100644
--- a/board/freescale/corenet_ds/eth_hydra.c
+++ b/board/freescale/corenet_ds/eth_hydra.c
@@ -58,6 +58,7 @@
 #include <malloc.h>
 #include <fdt_support.h>
 #include <fsl_dtsec.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
 
diff --git a/board/freescale/corenet_ds/eth_p4080.c b/board/freescale/corenet_ds/eth_p4080.c
index 30b7912c270f..64066851c6bc 100644
--- a/board/freescale/corenet_ds/eth_p4080.c
+++ b/board/freescale/corenet_ds/eth_p4080.c
@@ -26,6 +26,7 @@
 #include <phy.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 #include "../common/ngpixis.h"
 #include "../common/fman.h"
diff --git a/board/freescale/corenet_ds/eth_superhydra.c b/board/freescale/corenet_ds/eth_superhydra.c
index bda97fbd6bd8..71b95e5cd720 100644
--- a/board/freescale/corenet_ds/eth_superhydra.c
+++ b/board/freescale/corenet_ds/eth_superhydra.c
@@ -59,6 +59,7 @@
 #include <malloc.h>
 #include <fdt_support.h>
 #include <fsl_dtsec.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
 
diff --git a/board/freescale/imx8mm_evk/spl.c b/board/freescale/imx8mm_evk/spl.c
index ef4526a7dca3..0cdf2b0d2003 100644
--- a/board/freescale/imx8mm_evk/spl.c
+++ b/board/freescale/imx8mm_evk/spl.c
@@ -23,6 +23,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <dm/uclass.h>
 #include <dm/device.h>
diff --git a/board/freescale/imx8mn_evk/spl.c b/board/freescale/imx8mn_evk/spl.c
index bd732c226be5..1fd731ce65a3 100644
--- a/board/freescale/imx8mn_evk/spl.c
+++ b/board/freescale/imx8mn_evk/spl.c
@@ -23,6 +23,7 @@
 #include <asm/arch/ddr.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <dm/uclass.h>
 #include <dm/device.h>
diff --git a/board/freescale/imx8mp_evk/spl.c b/board/freescale/imx8mp_evk/spl.c
index 244d04c18a5a..ecbc6be6abac 100644
--- a/board/freescale/imx8mp_evk/spl.c
+++ b/board/freescale/imx8mp_evk/spl.c
@@ -21,6 +21,7 @@
 #include <asm/arch/imx8mp_pins.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/mach-imx/boot_mode.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 
 #include <power/pca9450.h>
diff --git a/board/freescale/imx8mq_evk/spl.c b/board/freescale/imx8mq_evk/spl.c
index ccb8f44f115c..929470cf285d 100644
--- a/board/freescale/imx8mq_evk/spl.c
+++ b/board/freescale/imx8mq_evk/spl.c
@@ -29,6 +29,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/pfuze100_pmic.h>
 #include <spl.h>
diff --git a/board/freescale/imx8qm_mek/imx8qm_mek.c b/board/freescale/imx8qm_mek/imx8qm_mek.c
index 3aa6c2d7a23a..fac21ec5af3f 100644
--- a/board/freescale/imx8qm_mek/imx8qm_mek.c
+++ b/board/freescale/imx8qm_mek/imx8qm_mek.c
@@ -8,6 +8,7 @@
 #include <env.h>
 #include <errno.h>
 #include <init.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
@@ -22,6 +23,7 @@
 #include <asm/arch/iomux.h>
 #include <asm/arch/sys_proto.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/imx8qm_mek/spl.c b/board/freescale/imx8qm_mek/spl.c
index d3d3431fe63f..de7582ac4f46 100644
--- a/board/freescale/imx8qm_mek/spl.c
+++ b/board/freescale/imx8qm_mek/spl.c
@@ -19,6 +19,7 @@
 #include <dm/lists.h>
 #include <asm/arch/sys_proto.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/imx8qxp_mek/imx8qxp_mek.c b/board/freescale/imx8qxp_mek/imx8qxp_mek.c
index f0220b131009..5e0bb68402f0 100644
--- a/board/freescale/imx8qxp_mek/imx8qxp_mek.c
+++ b/board/freescale/imx8qxp_mek/imx8qxp_mek.c
@@ -8,6 +8,7 @@
 #include <env.h>
 #include <errno.h>
 #include <init.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
@@ -25,6 +26,7 @@
 #include <asm/arch/iomux.h>
 #include <asm/arch/sys_proto.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/imx8qxp_mek/spl.c b/board/freescale/imx8qxp_mek/spl.c
index 5b3e87c25610..35ed37dc6094 100644
--- a/board/freescale/imx8qxp_mek/spl.c
+++ b/board/freescale/imx8qxp_mek/spl.c
@@ -25,6 +25,7 @@
 #include <asm/arch/sys_proto.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/imxrt1020-evk/imxrt1020-evk.c b/board/freescale/imxrt1020-evk/imxrt1020-evk.c
index 35241acd224c..d67c4d309de3 100644
--- a/board/freescale/imxrt1020-evk/imxrt1020-evk.c
+++ b/board/freescale/imxrt1020-evk/imxrt1020-evk.c
@@ -13,6 +13,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/armv7m.h>
+#include <asm/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/imxrt1050-evk/imxrt1050-evk.c b/board/freescale/imxrt1050-evk/imxrt1050-evk.c
index b8d852f097b0..463cc37085fc 100644
--- a/board/freescale/imxrt1050-evk/imxrt1050-evk.c
+++ b/board/freescale/imxrt1050-evk/imxrt1050-evk.c
@@ -13,6 +13,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/armv7m.h>
+#include <asm/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/ls1012afrdm/ls1012afrdm.c b/board/freescale/ls1012afrdm/ls1012afrdm.c
index 3100aee2715e..6fb630ab64cd 100644
--- a/board/freescale/ls1012afrdm/ls1012afrdm.c
+++ b/board/freescale/ls1012afrdm/ls1012afrdm.c
@@ -25,6 +25,7 @@
 #include <netdev.h>
 #include <fsl_sec.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/ls1012aqds/eth.c b/board/freescale/ls1012aqds/eth.c
index 35d7bfcb2ff8..a0b44735dd8e 100644
--- a/board/freescale/ls1012aqds/eth.c
+++ b/board/freescale/ls1012aqds/eth.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <stdio.h>
 #include <vsprintf.h>
diff --git a/board/freescale/ls1012aqds/ls1012aqds.c b/board/freescale/ls1012aqds/ls1012aqds.c
index 50e04204c688..4bb80717636a 100644
--- a/board/freescale/ls1012aqds/ls1012aqds.c
+++ b/board/freescale/ls1012aqds/ls1012aqds.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <i2c.h>
 #include <fdt_support.h>
 #include <stdio.h>
@@ -32,6 +33,7 @@
 #include <fsl_sec.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "../common/qixis.h"
 #include "ls1012aqds_qixis.h"
 #include "ls1012aqds_pfe.h"
diff --git a/board/freescale/ls1012ardb/eth.c b/board/freescale/ls1012ardb/eth.c
index 7d4d4017e925..d208686ffc8e 100644
--- a/board/freescale/ls1012ardb/eth.c
+++ b/board/freescale/ls1012ardb/eth.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <net.h>
 #include <stdio.h>
diff --git a/board/freescale/ls1012ardb/ls1012ardb.c b/board/freescale/ls1012ardb/ls1012ardb.c
index 8cc986ab01af..7c38a8b8ccf7 100644
--- a/board/freescale/ls1012ardb/ls1012ardb.c
+++ b/board/freescale/ls1012ardb/ls1012ardb.c
@@ -33,6 +33,7 @@
 #include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/ls1021aiot/ls1021aiot.c b/board/freescale/ls1021aiot/ls1021aiot.c
index 66c701e1e35d..988b0bad937c 100644
--- a/board/freescale/ls1021aiot/ls1021aiot.c
+++ b/board/freescale/ls1021aiot/ls1021aiot.c
@@ -18,6 +18,7 @@
 #include <linux/delay.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <asm/arch/ls102xa_devdis.h>
 #include <asm/arch/ls102xa_soc.h>
diff --git a/board/freescale/ls1021aqds/dcu.c b/board/freescale/ls1021aqds/dcu.c
index 7f0ae42e92b6..175ce7ce5ba6 100644
--- a/board/freescale/ls1021aqds/dcu.c
+++ b/board/freescale/ls1021aqds/dcu.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <fsl_dcu_fb.h>
 #include <i2c.h>
+#include <asm/types.h>
 #include <linux/string.h>
 #include "div64.h"
 #include "../common/diu_ch7301.h"
diff --git a/board/freescale/ls1021aqds/ddr.c b/board/freescale/ls1021aqds/ddr.c
index b35f98b46d15..7b4e0e1e58a7 100644
--- a/board/freescale/ls1021aqds/ddr.c
+++ b/board/freescale/ls1021aqds/ddr.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
 #include <init.h>
@@ -15,6 +16,7 @@
 #include <asm/arch/clock.h>
 #include <linux/delay.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "ddr.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/ls1021aqds/ddr.h b/board/freescale/ls1021aqds/ddr.h
index 58a883843671..b7233dd7a2ac 100644
--- a/board/freescale/ls1021aqds/ddr.h
+++ b/board/freescale/ls1021aqds/ddr.h
@@ -6,6 +6,7 @@
 #ifndef __DDR_H__
 #define __DDR_H__
 
+#include <asm/types.h>
 void erratum_a008850_post(void);
 
 struct board_specific_parameters {
diff --git a/board/freescale/ls1021aqds/eth.c b/board/freescale/ls1021aqds/eth.c
index 786935b8b335..bda159bfb7b7 100644
--- a/board/freescale/ls1021aqds/eth.c
+++ b/board/freescale/ls1021aqds/eth.c
@@ -21,6 +21,7 @@
 #include <fsl_mdio.h>
 #include <tsec.h>
 #include <malloc.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
 
diff --git a/board/freescale/ls1021aqds/ls1021aqds.c b/board/freescale/ls1021aqds/ls1021aqds.c
index c13ec4127003..21c82e4ce536 100644
--- a/board/freescale/ls1021aqds/ls1021aqds.c
+++ b/board/freescale/ls1021aqds/ls1021aqds.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <clock_legacy.h>
+#include <compiler.h>
 #include <fdt_support.h>
 #include <i2c.h>
 #include <init.h>
@@ -29,6 +30,7 @@
 #include <asm/u-boot.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "../common/sleep.h"
 #include "../common/qixis.h"
 #include "ls1021aqds_qixis.h"
diff --git a/board/freescale/ls1021atsn/ls1021atsn.c b/board/freescale/ls1021atsn/ls1021atsn.c
index 4ad4f1eb07a0..72228133e9b9 100644
--- a/board/freescale/ls1021atsn/ls1021atsn.c
+++ b/board/freescale/ls1021atsn/ls1021atsn.c
@@ -16,6 +16,7 @@
 #include <linux/delay.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "../common/sleep.h"
 #include <fsl_validate.h>
 #include <fsl_immap.h>
diff --git a/board/freescale/ls1021atwr/ls1021atwr.c b/board/freescale/ls1021atwr/ls1021atwr.c
index 8c21393a6e5f..38eebc268a68 100644
--- a/board/freescale/ls1021atwr/ls1021atwr.c
+++ b/board/freescale/ls1021atwr/ls1021atwr.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <clock_legacy.h>
 #include <command.h>
+#include <compiler.h>
 #include <fdt_support.h>
 #include <i2c.h>
 #include <init.h>
@@ -34,6 +35,7 @@
 #include <linux/delay.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "../common/sleep.h"
 #ifdef CONFIG_U_QE
 #include <fsl_qe.h>
diff --git a/board/freescale/ls1028a/ls1028a.c b/board/freescale/ls1028a/ls1028a.c
index 220d0b0befaa..bb60b980add5 100644
--- a/board/freescale/ls1028a/ls1028a.c
+++ b/board/freescale/ls1028a/ls1028a.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <display_options.h>
 #include <init.h>
 #include <malloc.h>
@@ -27,6 +28,7 @@
 #endif
 #include <fsl_immap.h>
 #include <netdev.h>
+#include <linux/types.h>
 
 #include <fdtdec.h>
 #include <miiphy.h>
diff --git a/board/freescale/ls1043aqds/ddr.c b/board/freescale/ls1043aqds/ddr.c
index d4e7c4093078..cecf0f903a07 100644
--- a/board/freescale/ls1043aqds/ddr.c
+++ b/board/freescale/ls1043aqds/ddr.c
@@ -14,6 +14,7 @@
 #include <vsprintf.h>
 #include <asm/arch/clock.h>
 #include <asm/global_data.h>
+#include <linux/types.h>
 #include "ddr.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/ls1043aqds/ddr.h b/board/freescale/ls1043aqds/ddr.h
index 65b0250d3706..4e5f0b42611d 100644
--- a/board/freescale/ls1043aqds/ddr.h
+++ b/board/freescale/ls1043aqds/ddr.h
@@ -6,6 +6,7 @@
 #ifndef __DDR_H__
 #define __DDR_H__
 
+#include <asm/types.h>
 extern void erratum_a008850_post(void);
 
 struct board_specific_parameters {
diff --git a/board/freescale/ls1043aqds/eth.c b/board/freescale/ls1043aqds/eth.c
index ba56512ec96e..0355a6aa89f3 100644
--- a/board/freescale/ls1043aqds/eth.c
+++ b/board/freescale/ls1043aqds/eth.c
@@ -14,6 +14,7 @@
 #include <fm_eth.h>
 #include <fsl_mdio.h>
 #include <fsl_dtsec.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <malloc.h>
diff --git a/board/freescale/ls1043aqds/ls1043aqds.c b/board/freescale/ls1043aqds/ls1043aqds.c
index 6b377d0d997e..8db0d0e510c2 100644
--- a/board/freescale/ls1043aqds/ls1043aqds.c
+++ b/board/freescale/ls1043aqds/ls1043aqds.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <i2c.h>
 #include <fdt_support.h>
 #include <fsl_ddr_sdram.h>
@@ -30,6 +31,7 @@
 #include <fsl_esdhc.h>
 #include <fsl_ifc.h>
 #include <spl.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 
 #include "../common/qixis.h"
diff --git a/board/freescale/ls1043ardb/cpld.c b/board/freescale/ls1043ardb/cpld.c
index c230dcdca5df..52ab566f056a 100644
--- a/board/freescale/ls1043ardb/cpld.c
+++ b/board/freescale/ls1043ardb/cpld.c
@@ -9,6 +9,7 @@
 #include <command.h>
 #include <stdio.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/string.h>
 #include "cpld.h"
 
diff --git a/board/freescale/ls1043ardb/cpld.h b/board/freescale/ls1043ardb/cpld.h
index 2e757b557f4b..dce9682e42b2 100644
--- a/board/freescale/ls1043ardb/cpld.h
+++ b/board/freescale/ls1043ardb/cpld.h
@@ -9,6 +9,7 @@
 /*
  * CPLD register set of LS1043ARDB board-specific.
  */
+#include <asm/types.h>
 struct cpld_data {
 	u8 cpld_ver;		/* 0x0 - CPLD Major Revision Register */
 	u8 cpld_ver_sub;	/* 0x1 - CPLD Minor Revision Register */
diff --git a/board/freescale/ls1043ardb/ddr.c b/board/freescale/ls1043ardb/ddr.c
index d4442e6d8ff6..89f96500684d 100644
--- a/board/freescale/ls1043ardb/ddr.c
+++ b/board/freescale/ls1043ardb/ddr.c
@@ -9,6 +9,7 @@
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "ddr.h"
 #include <log.h>
 #include <vsprintf.h>
diff --git a/board/freescale/ls1043ardb/ddr.h b/board/freescale/ls1043ardb/ddr.h
index 85ed920ca6d9..373ce08afacb 100644
--- a/board/freescale/ls1043ardb/ddr.h
+++ b/board/freescale/ls1043ardb/ddr.h
@@ -6,6 +6,7 @@
 #ifndef __DDR_H__
 #define __DDR_H__
 
+#include <asm/types.h>
 extern void erratum_a008850_post(void);
 
 struct board_specific_parameters {
diff --git a/board/freescale/ls1043ardb/eth.c b/board/freescale/ls1043ardb/eth.c
index a89978bbd7dd..8e1e6f46c3ba 100644
--- a/board/freescale/ls1043ardb/eth.c
+++ b/board/freescale/ls1043ardb/eth.c
@@ -11,6 +11,7 @@
 #include <fsl_dtsec.h>
 #include <fsl_mdio.h>
 #include <malloc.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 
 #include "../common/fman.h"
diff --git a/board/freescale/ls1043ardb/ls1043ardb.c b/board/freescale/ls1043ardb/ls1043ardb.c
index 86309266a047..1e38cdee765d 100644
--- a/board/freescale/ls1043ardb/ls1043ardb.c
+++ b/board/freescale/ls1043ardb/ls1043ardb.c
@@ -22,6 +22,7 @@
 #include <fsl_esdhc.h>
 #include <fsl_ifc.h>
 #include <fsl_sec.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include "cpld.h"
 #ifdef CONFIG_U_QE
diff --git a/board/freescale/ls1046afrwy/eth.c b/board/freescale/ls1046afrwy/eth.c
index 278856f56d73..eb869a1d4ad6 100644
--- a/board/freescale/ls1046afrwy/eth.c
+++ b/board/freescale/ls1046afrwy/eth.c
@@ -12,6 +12,7 @@
 #include <fsl_dtsec.h>
 #include <fsl_mdio.h>
 #include <malloc.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
 
diff --git a/board/freescale/ls1046afrwy/ls1046afrwy.c b/board/freescale/ls1046afrwy/ls1046afrwy.c
index 550c901a76bf..34b601bc64ec 100644
--- a/board/freescale/ls1046afrwy/ls1046afrwy.c
+++ b/board/freescale/ls1046afrwy/ls1046afrwy.c
@@ -24,6 +24,7 @@
 #include <fsl_sec.h>
 #include <fsl_dspi.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 #define LS1046A_PORSR1_REG 0x1EE0000
 #define BOOT_SRC_SD        0x20000000
diff --git a/board/freescale/ls1046aqds/ddr.c b/board/freescale/ls1046aqds/ddr.c
index 5a85383d9451..170be7f54484 100644
--- a/board/freescale/ls1046aqds/ddr.c
+++ b/board/freescale/ls1046aqds/ddr.c
@@ -14,6 +14,7 @@
 #include <vsprintf.h>
 #include <asm/arch/clock.h>
 #include <asm/global_data.h>
+#include <linux/types.h>
 #include "ddr.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/ls1046aqds/ddr.h b/board/freescale/ls1046aqds/ddr.h
index e55446f2b29a..de38f96c1a97 100644
--- a/board/freescale/ls1046aqds/ddr.h
+++ b/board/freescale/ls1046aqds/ddr.h
@@ -6,6 +6,7 @@
 #ifndef __DDR_H__
 #define __DDR_H__
 
+#include <asm/types.h>
 void erratum_a008850_post(void);
 
 struct board_specific_parameters {
diff --git a/board/freescale/ls1046aqds/eth.c b/board/freescale/ls1046aqds/eth.c
index 1977b08eca27..7293d5eadeba 100644
--- a/board/freescale/ls1046aqds/eth.c
+++ b/board/freescale/ls1046aqds/eth.c
@@ -17,6 +17,7 @@
 #include <fsl_dtsec.h>
 #include <malloc.h>
 #include <asm/arch/fsl_serdes.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 
 #include "../common/qixis.h"
diff --git a/board/freescale/ls1046aqds/ls1046aqds.c b/board/freescale/ls1046aqds/ls1046aqds.c
index 1d06c3038a6c..facc92ff437b 100644
--- a/board/freescale/ls1046aqds/ls1046aqds.c
+++ b/board/freescale/ls1046aqds/ls1046aqds.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <i2c.h>
 #include <fdt_support.h>
 #include <fsl_ddr_sdram.h>
@@ -31,6 +32,7 @@
 #include <fsl_ifc.h>
 #include <fsl_sec.h>
 #include <spl.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 
 #include "../common/vid.h"
diff --git a/board/freescale/ls1046ardb/cpld.c b/board/freescale/ls1046ardb/cpld.c
index 1f6fcc116e54..7f84bc06fbc3 100644
--- a/board/freescale/ls1046ardb/cpld.c
+++ b/board/freescale/ls1046ardb/cpld.c
@@ -10,6 +10,7 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/string.h>
 #include "cpld.h"
 
diff --git a/board/freescale/ls1046ardb/cpld.h b/board/freescale/ls1046ardb/cpld.h
index 765962c89ae1..7d2509e8cbed 100644
--- a/board/freescale/ls1046ardb/cpld.h
+++ b/board/freescale/ls1046ardb/cpld.h
@@ -11,6 +11,7 @@
  * CPLD Revision:  V2.1
  */
 #include <stdbool.h>
+#include <asm/types.h>
 struct cpld_data {
 	u8 cpld_ver;		/* 0x0 - CPLD Major Revision Register */
 	u8 cpld_ver_sub;	/* 0x1 - CPLD Minor Revision Register */
diff --git a/board/freescale/ls1046ardb/ddr.c b/board/freescale/ls1046ardb/ddr.c
index 53f788d2e149..8312eec7a105 100644
--- a/board/freescale/ls1046ardb/ddr.c
+++ b/board/freescale/ls1046ardb/ddr.c
@@ -9,6 +9,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
+#include <linux/types.h>
 #include "ddr.h"
 #ifdef CONFIG_FSL_DEEP_SLEEP
 #include <fsl_sleep.h>
diff --git a/board/freescale/ls1046ardb/ddr.h b/board/freescale/ls1046ardb/ddr.h
index 05baef232abe..47f5bb0c3807 100644
--- a/board/freescale/ls1046ardb/ddr.h
+++ b/board/freescale/ls1046ardb/ddr.h
@@ -6,6 +6,7 @@
 #ifndef __DDR_H__
 #define __DDR_H__
 
+#include <asm/types.h>
 void erratum_a008850_post(void);
 
 struct board_specific_parameters {
diff --git a/board/freescale/ls1046ardb/eth.c b/board/freescale/ls1046ardb/eth.c
index 6d05c964bd0f..4f1cc233c0fa 100644
--- a/board/freescale/ls1046ardb/eth.c
+++ b/board/freescale/ls1046ardb/eth.c
@@ -12,6 +12,7 @@
 #include <fsl_dtsec.h>
 #include <fsl_mdio.h>
 #include <malloc.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
 
diff --git a/board/freescale/ls1046ardb/ls1046ardb.c b/board/freescale/ls1046ardb/ls1046ardb.c
index d2f88ea9d064..69d1edfa61ea 100644
--- a/board/freescale/ls1046ardb/ls1046ardb.c
+++ b/board/freescale/ls1046ardb/ls1046ardb.c
@@ -23,6 +23,7 @@
 #include <fm_eth.h>
 #include <fsl_csu.h>
 #include <fsl_esdhc.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <power/mc34vr500_pmic.h>
 #include "cpld.h"
diff --git a/board/freescale/ls1088a/ddr.c b/board/freescale/ls1088a/ddr.c
index 091dbafd8717..829d699de3e7 100644
--- a/board/freescale/ls1088a/ddr.c
+++ b/board/freescale/ls1088a/ddr.c
@@ -12,6 +12,7 @@
 #include <asm/arch/soc.h>
 #include <asm/arch/clock.h>
 #include <asm/global_data.h>
+#include <linux/types.h>
 #include "ddr.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/ls1088a/ddr.h b/board/freescale/ls1088a/ddr.h
index b35c4ae2dad4..5c50bbf9439d 100644
--- a/board/freescale/ls1088a/ddr.h
+++ b/board/freescale/ls1088a/ddr.h
@@ -5,6 +5,7 @@
 
 #ifndef __LS1088A_DDR_H__
 #define __LS1088A_DDR_H__
+#include <asm/types.h>
 struct board_specific_parameters {
 	u32 n_ranks;
 	u32 datarate_mhz_high;
diff --git a/board/freescale/ls1088a/eth_ls1088aqds.c b/board/freescale/ls1088a/eth_ls1088aqds.c
index fe0a890bb0c7..52a7d65f65b2 100644
--- a/board/freescale/ls1088a/eth_ls1088aqds.c
+++ b/board/freescale/ls1088a/eth_ls1088aqds.c
@@ -5,10 +5,12 @@
 
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <env.h>
 #include <log.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/io.h>
@@ -26,6 +28,7 @@
 #include <linux/delay.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "../common/qixis.h"
 
diff --git a/board/freescale/ls1088a/eth_ls1088ardb.c b/board/freescale/ls1088a/eth_ls1088ardb.c
index 6898dfc6f395..349a092e177b 100644
--- a/board/freescale/ls1088a/eth_ls1088ardb.c
+++ b/board/freescale/ls1088a/eth_ls1088ardb.c
@@ -16,6 +16,7 @@
 #include <asm/io.h>
 #include <exports.h>
 #include <asm/arch/fsl_serdes.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <fsl-mc/fsl_mc.h>
 #include <fsl-mc/ldpaa_wriop.h>
diff --git a/board/freescale/ls1088a/ls1088a.c b/board/freescale/ls1088a/ls1088a.c
index b35266de231d..852748ce32d7 100644
--- a/board/freescale/ls1088a/ls1088a.c
+++ b/board/freescale/ls1088a/ls1088a.c
@@ -3,6 +3,7 @@
  * Copyright 2017-2018 NXP
  */
 #include <common.h>
+#include <compiler.h>
 #include <display_options.h>
 #include <env.h>
 #include <i2c.h>
@@ -14,6 +15,7 @@
 #include <fsl_ifc.h>
 #include <fsl_ddr.h>
 #include <fsl_sec.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
@@ -31,6 +33,7 @@
 #include <asm/arch/soc.h>
 #include <asm/arch-fsl-layerscape/fsl_icid.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "../common/qixis.h"
 #include "ls1088a_qixis.h"
diff --git a/board/freescale/ls2080a/ddr.c b/board/freescale/ls2080a/ddr.c
index 473468e53df8..ddded063529f 100644
--- a/board/freescale/ls2080a/ddr.c
+++ b/board/freescale/ls2080a/ddr.c
@@ -13,6 +13,7 @@
 #include <asm/arch/clock.h>
 #include <asm/global_data.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "ddr.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/ls2080a/ddr.h b/board/freescale/ls2080a/ddr.h
index d21b9265586d..6152099c49d6 100644
--- a/board/freescale/ls2080a/ddr.h
+++ b/board/freescale/ls2080a/ddr.h
@@ -5,6 +5,7 @@
 
 #ifndef __DDR_H__
 #define __DDR_H__
+#include <asm/types.h>
 struct board_specific_parameters {
 	u32 n_ranks;
 	u32 datarate_mhz_high;
diff --git a/board/freescale/ls2080a/ls2080a.c b/board/freescale/ls2080a/ls2080a.c
index b2fb47eaaa50..44e925ee446c 100644
--- a/board/freescale/ls2080a/ls2080a.c
+++ b/board/freescale/ls2080a/ls2080a.c
@@ -20,6 +20,7 @@
 #include <fsl-mc/fsl_mc.h>
 #include <env_internal.h>
 #include <asm/arch/soc.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/ls2080aqds/ddr.c b/board/freescale/ls2080aqds/ddr.c
index 6933066e826e..72e21de252ff 100644
--- a/board/freescale/ls2080aqds/ddr.c
+++ b/board/freescale/ls2080aqds/ddr.c
@@ -12,6 +12,7 @@
 #include <asm/arch/soc.h>
 #include <asm/arch/clock.h>
 #include <asm/global_data.h>
+#include <linux/types.h>
 #include "ddr.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/ls2080aqds/ddr.h b/board/freescale/ls2080aqds/ddr.h
index b5d790a4a057..a65f7e071836 100644
--- a/board/freescale/ls2080aqds/ddr.h
+++ b/board/freescale/ls2080aqds/ddr.h
@@ -5,6 +5,7 @@
 
 #ifndef __DDR_H__
 #define __DDR_H__
+#include <asm/types.h>
 struct board_specific_parameters {
 	u32 n_ranks;
 	u32 datarate_mhz_high;
diff --git a/board/freescale/ls2080aqds/eth.c b/board/freescale/ls2080aqds/eth.c
index 167bd1475c91..a7a2eaaf4b03 100644
--- a/board/freescale/ls2080aqds/eth.c
+++ b/board/freescale/ls2080aqds/eth.c
@@ -4,10 +4,12 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <env.h>
 #include <log.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/io.h>
@@ -24,6 +26,7 @@
 #include <linux/delay.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "../common/qixis.h"
 
diff --git a/board/freescale/ls2080aqds/ls2080aqds.c b/board/freescale/ls2080aqds/ls2080aqds.c
index 8a44ea36003f..63addf576d68 100644
--- a/board/freescale/ls2080aqds/ls2080aqds.c
+++ b/board/freescale/ls2080aqds/ls2080aqds.c
@@ -3,6 +3,7 @@
  * Copyright 2015 Freescale Semiconductor
  */
 #include <common.h>
+#include <compiler.h>
 #include <display_options.h>
 #include <env.h>
 #include <init.h>
@@ -28,6 +29,7 @@
 #include <asm/arch/ppa.h>
 #include <asm/arch-fsl-layerscape/fsl_icid.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 
 #include "../common/qixis.h"
diff --git a/board/freescale/ls2080ardb/ddr.c b/board/freescale/ls2080ardb/ddr.c
index e29cef3d2722..5bb98a00e921 100644
--- a/board/freescale/ls2080ardb/ddr.c
+++ b/board/freescale/ls2080ardb/ddr.c
@@ -12,6 +12,7 @@
 #include <asm/arch/soc.h>
 #include <asm/arch/clock.h>
 #include <asm/global_data.h>
+#include <linux/types.h>
 #include "ddr.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/ls2080ardb/ddr.h b/board/freescale/ls2080ardb/ddr.h
index c5f2a95211b0..584821d6b8db 100644
--- a/board/freescale/ls2080ardb/ddr.h
+++ b/board/freescale/ls2080ardb/ddr.h
@@ -5,6 +5,7 @@
 
 #ifndef __DDR_H__
 #define __DDR_H__
+#include <asm/types.h>
 struct board_specific_parameters {
 	u32 n_ranks;
 	u32 datarate_mhz_high;
diff --git a/board/freescale/ls2080ardb/eth_ls2080rdb.c b/board/freescale/ls2080ardb/eth_ls2080rdb.c
index b4f718b1ae6a..6624c3d63741 100644
--- a/board/freescale/ls2080ardb/eth_ls2080rdb.c
+++ b/board/freescale/ls2080ardb/eth_ls2080rdb.c
@@ -18,6 +18,7 @@
 #include <asm/io.h>
 #include <exports.h>
 #include <asm/arch/fsl_serdes.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <fsl-mc/fsl_mc.h>
 #include <fsl-mc/ldpaa_wriop.h>
diff --git a/board/freescale/ls2080ardb/ls2080ardb.c b/board/freescale/ls2080ardb/ls2080ardb.c
index a69f207c2130..c4a5a8902ce9 100644
--- a/board/freescale/ls2080ardb/ls2080ardb.c
+++ b/board/freescale/ls2080ardb/ls2080ardb.c
@@ -4,6 +4,7 @@
  * Copyright 2017 NXP
  */
 #include <common.h>
+#include <compiler.h>
 #include <display_options.h>
 #include <env.h>
 #include <init.h>
@@ -29,6 +30,7 @@
 #include <asm/arch/ppa.h>
 #include <fsl_sec.h>
 #include <asm/arch-fsl-layerscape/fsl_icid.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_FSL_QIXIS
 #include "../common/qixis.h"
diff --git a/board/freescale/lx2160a/eth_lx2160aqds.c b/board/freescale/lx2160a/eth_lx2160aqds.c
index 74b31f9a8771..1901366fc4fe 100644
--- a/board/freescale/lx2160a/eth_lx2160aqds.c
+++ b/board/freescale/lx2160a/eth_lx2160aqds.c
@@ -17,6 +17,7 @@
 #include <miiphy.h>
 #include <phy.h>
 #include <fm_eth.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
@@ -29,6 +30,7 @@
 #include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "../common/qixis.h"
 
diff --git a/board/freescale/lx2160a/eth_lx2160ardb.c b/board/freescale/lx2160a/eth_lx2160ardb.c
index 6c25108c8e3d..96d992910336 100644
--- a/board/freescale/lx2160a/eth_lx2160ardb.c
+++ b/board/freescale/lx2160a/eth_lx2160ardb.c
@@ -20,6 +20,7 @@
 #include <asm/io.h>
 #include <exports.h>
 #include <asm/arch/fsl_serdes.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <fsl-mc/fsl_mc.h>
 #include <fsl-mc/ldpaa_wriop.h>
diff --git a/board/freescale/lx2160a/lx2160a.c b/board/freescale/lx2160a/lx2160a.c
index 55a7e9b6f0be..d6bd5b715f31 100644
--- a/board/freescale/lx2160a/lx2160a.c
+++ b/board/freescale/lx2160a/lx2160a.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <clock_legacy.h>
+#include <compiler.h>
 #include <display_options.h>
 #include <dm.h>
 #include <init.h>
@@ -34,6 +35,7 @@
 #include <asm/arch/fsl_serdes.h>
 #include <asm/arch/soc.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "../common/qixis.h"
 #include "../common/vid.h"
 #include <fsl_immap.h>
diff --git a/board/freescale/m5208evbe/m5208evbe.c b/board/freescale/m5208evbe/m5208evbe.c
index 594728a2dd6c..4a2d4b347c27 100644
--- a/board/freescale/m5208evbe/m5208evbe.c
+++ b/board/freescale/m5208evbe/m5208evbe.c
@@ -14,6 +14,7 @@
 #include <asm/global_data.h>
 #include <asm/immap.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/m52277evb/m52277evb.c b/board/freescale/m52277evb/m52277evb.c
index 1ecdfb393124..c366205fd994 100644
--- a/board/freescale/m52277evb/m52277evb.c
+++ b/board/freescale/m52277evb/m52277evb.c
@@ -13,6 +13,7 @@
 #include <asm/global_data.h>
 #include <asm/immap.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/m5235evb/m5235evb.c b/board/freescale/m5235evb/m5235evb.c
index 6050d5c621d4..a9995a88535c 100644
--- a/board/freescale/m5235evb/m5235evb.c
+++ b/board/freescale/m5235evb/m5235evb.c
@@ -14,6 +14,7 @@
 #include <asm/global_data.h>
 #include <asm/immap.h>
 #include <asm/io.h>
+#include <asm/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/m5249evb/m5249evb.c b/board/freescale/m5249evb/m5249evb.c
index 9cb08d85cc7a..a02aceb20667 100644
--- a/board/freescale/m5249evb/m5249evb.c
+++ b/board/freescale/m5249evb/m5249evb.c
@@ -12,6 +12,7 @@
 #include <asm/global_data.h>
 #include <asm/immap.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/m5253demo/flash.c b/board/freescale/m5253demo/flash.c
index 025e9dbcf52c..2bc65a4313dc 100644
--- a/board/freescale/m5253demo/flash.c
+++ b/board/freescale/m5253demo/flash.c
@@ -13,6 +13,7 @@
 #include <irq_func.h>
 #include <stdio.h>
 #include <time.h>
+#include <linux/types.h>
 
 #include <asm/immap.h>
 
diff --git a/board/freescale/m5253demo/m5253demo.c b/board/freescale/m5253demo/m5253demo.c
index 90c79a60f833..c834170c3f14 100644
--- a/board/freescale/m5253demo/m5253demo.c
+++ b/board/freescale/m5253demo/m5253demo.c
@@ -15,6 +15,7 @@
 #include <asm/immap.h>
 #include <netdev.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 
diff --git a/board/freescale/m5282evb/m5282evb.c b/board/freescale/m5282evb/m5282evb.c
index e1ea9b3a58f8..e7ed2a46f2ed 100644
--- a/board/freescale/m5282evb/m5282evb.c
+++ b/board/freescale/m5282evb/m5282evb.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <asm/global_data.h>
 #include <asm/immap.h>
+#include <asm/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/m53017evb/m53017evb.c b/board/freescale/m53017evb/m53017evb.c
index e1c5dca70042..f7cebcbbc724 100644
--- a/board/freescale/m53017evb/m53017evb.c
+++ b/board/freescale/m53017evb/m53017evb.c
@@ -14,6 +14,7 @@
 #include <asm/global_data.h>
 #include <asm/immap.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/m5329evb/m5329evb.c b/board/freescale/m5329evb/m5329evb.c
index ccbcbeb342e0..55d21de1b97c 100644
--- a/board/freescale/m5329evb/m5329evb.c
+++ b/board/freescale/m5329evb/m5329evb.c
@@ -14,6 +14,7 @@
 #include <asm/global_data.h>
 #include <asm/immap.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/m5329evb/nand.c b/board/freescale/m5329evb/nand.c
index 58b8ee51d378..ad004fbc25ba 100644
--- a/board/freescale/m5329evb/nand.c
+++ b/board/freescale/m5329evb/nand.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <asm/io.h>
 #include <asm/immap.h>
+#include <linux/types.h>
 
 #if defined(CONFIG_CMD_NAND)
 #include <nand.h>
diff --git a/board/freescale/m5373evb/m5373evb.c b/board/freescale/m5373evb/m5373evb.c
index bd65509ac608..dc0f24d35679 100644
--- a/board/freescale/m5373evb/m5373evb.c
+++ b/board/freescale/m5373evb/m5373evb.c
@@ -14,6 +14,7 @@
 #include <asm/global_data.h>
 #include <asm/immap.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/m5373evb/nand.c b/board/freescale/m5373evb/nand.c
index 4c30d5100181..b706cbc5c752 100644
--- a/board/freescale/m5373evb/nand.c
+++ b/board/freescale/m5373evb/nand.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <asm/io.h>
 #include <asm/immap.h>
+#include <linux/types.h>
 
 #if defined(CONFIG_CMD_NAND)
 #include <nand.h>
diff --git a/board/freescale/m54418twr/m54418twr.c b/board/freescale/m54418twr/m54418twr.c
index b931b869326b..ee695091ce69 100644
--- a/board/freescale/m54418twr/m54418twr.c
+++ b/board/freescale/m54418twr/m54418twr.c
@@ -13,6 +13,7 @@
 #include <asm/immap.h>
 #include <mmc.h>
 #include <fsl_esdhc_imx.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/m54451evb/m54451evb.c b/board/freescale/m54451evb/m54451evb.c
index deaf62530a1e..84c1f01bca0d 100644
--- a/board/freescale/m54451evb/m54451evb.c
+++ b/board/freescale/m54451evb/m54451evb.c
@@ -14,6 +14,7 @@
 #include <asm/global_data.h>
 #include <asm/immap.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/m54455evb/m54455evb.c b/board/freescale/m54455evb/m54455evb.c
index 64ff296ad806..045fbac3cac0 100644
--- a/board/freescale/m54455evb/m54455evb.c
+++ b/board/freescale/m54455evb/m54455evb.c
@@ -15,6 +15,7 @@
 #include <asm/immap.h>
 #include <asm/io.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/m547xevb/m547xevb.c b/board/freescale/m547xevb/m547xevb.c
index 255a42baeee7..cb9bb1636a44 100644
--- a/board/freescale/m547xevb/m547xevb.c
+++ b/board/freescale/m547xevb/m547xevb.c
@@ -15,6 +15,7 @@
 #include <asm/global_data.h>
 #include <asm/immap.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/m548xevb/m548xevb.c b/board/freescale/m548xevb/m548xevb.c
index 9228ccbb06f4..cb049269de4d 100644
--- a/board/freescale/m548xevb/m548xevb.c
+++ b/board/freescale/m548xevb/m548xevb.c
@@ -15,6 +15,7 @@
 #include <asm/global_data.h>
 #include <asm/immap.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/mpc8308rdb/mpc8308rdb.c b/board/freescale/mpc8308rdb/mpc8308rdb.c
index 7a8895c80123..637fb688c0c3 100644
--- a/board/freescale/mpc8308rdb/mpc8308rdb.c
+++ b/board/freescale/mpc8308rdb/mpc8308rdb.c
@@ -11,6 +11,7 @@
 #include <net.h>
 #include <spi.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
diff --git a/board/freescale/mpc8308rdb/sdram.c b/board/freescale/mpc8308rdb/sdram.c
index d0c359f639d8..72704364f940 100644
--- a/board/freescale/mpc8308rdb/sdram.c
+++ b/board/freescale/mpc8308rdb/sdram.c
@@ -15,6 +15,7 @@
 #include <init.h>
 #include <mpc83xx.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 
 #include <asm/bitops.h>
diff --git a/board/freescale/mpc8313erdb/mpc8313erdb.c b/board/freescale/mpc8313erdb/mpc8313erdb.c
index e23317597cac..ea028bd17508 100644
--- a/board/freescale/mpc8313erdb/mpc8313erdb.c
+++ b/board/freescale/mpc8313erdb/mpc8313erdb.c
@@ -24,6 +24,7 @@
 #include <asm/global_data.h>
 #include <asm/ppc.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/mpc8313erdb/sdram.c b/board/freescale/mpc8313erdb/sdram.c
index 80b24cb7d168..24fac77ba9b8 100644
--- a/board/freescale/mpc8313erdb/sdram.c
+++ b/board/freescale/mpc8313erdb/sdram.c
@@ -13,6 +13,7 @@
 #include <spd_sdram.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 
diff --git a/board/freescale/mpc8315erdb/mpc8315erdb.c b/board/freescale/mpc8315erdb/mpc8315erdb.c
index c664e5ea80d0..ebb555db1806 100644
--- a/board/freescale/mpc8315erdb/mpc8315erdb.c
+++ b/board/freescale/mpc8315erdb/mpc8315erdb.c
@@ -24,6 +24,7 @@
 #include <asm/io.h>
 #include <ns16550.h>
 #include <nand.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/mpc8315erdb/sdram.c b/board/freescale/mpc8315erdb/sdram.c
index bda9421977b8..15e5101b9ff8 100644
--- a/board/freescale/mpc8315erdb/sdram.c
+++ b/board/freescale/mpc8315erdb/sdram.c
@@ -13,6 +13,7 @@
 #include <spd_sdram.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 
diff --git a/board/freescale/mpc8323erdb/mpc8323erdb.c b/board/freescale/mpc8323erdb/mpc8323erdb.c
index a96f4ecca205..1be8bb3dd499 100644
--- a/board/freescale/mpc8323erdb/mpc8323erdb.c
+++ b/board/freescale/mpc8323erdb/mpc8323erdb.c
@@ -28,6 +28,7 @@
 #include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <u-boot/crc.h>
 #if defined(CONFIG_PCI)
 #include <pci.h>
diff --git a/board/freescale/mpc832xemds/mpc832xemds.c b/board/freescale/mpc832xemds/mpc832xemds.c
index 0ed0d8e137d7..797b9b978a57 100644
--- a/board/freescale/mpc832xemds/mpc832xemds.c
+++ b/board/freescale/mpc832xemds/mpc832xemds.c
@@ -26,6 +26,7 @@
 #if defined(CONFIG_PQ_MDS_PIB)
 #include "../common/pq-mds-pib.h"
 #endif
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/board/freescale/mpc8349emds/ddr.c b/board/freescale/mpc8349emds/ddr.c
index 39731d4bf733..74190a8bb36b 100644
--- a/board/freescale/mpc8349emds/ddr.c
+++ b/board/freescale/mpc8349emds/ddr.c
@@ -7,6 +7,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/ppc.h>
+#include <linux/types.h>
 
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
diff --git a/board/freescale/mpc8349emds/mpc8349emds.c b/board/freescale/mpc8349emds/mpc8349emds.c
index 1b10fea9c6d6..7467e35f5709 100644
--- a/board/freescale/mpc8349emds/mpc8349emds.c
+++ b/board/freescale/mpc8349emds/mpc8349emds.c
@@ -25,6 +25,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #if defined(CONFIG_OF_LIBFDT)
 #include <linux/libfdt.h>
diff --git a/board/freescale/mpc8349emds/pci.c b/board/freescale/mpc8349emds/pci.c
index 0408dfff554b..c5ef0f043ada 100644
--- a/board/freescale/mpc8349emds/pci.c
+++ b/board/freescale/mpc8349emds/pci.c
@@ -13,6 +13,7 @@
 #include <pci.h>
 #include <i2c.h>
 #include <asm/fsl_i2c.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 static struct pci_region pci1_regions[] = {
diff --git a/board/freescale/mpc8349itx/mpc8349itx.c b/board/freescale/mpc8349itx/mpc8349itx.c
index d21bd4aa16b4..1c3d948882ae 100644
--- a/board/freescale/mpc8349itx/mpc8349itx.c
+++ b/board/freescale/mpc8349itx/mpc8349itx.c
@@ -29,6 +29,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "../../../arch/powerpc/cpu/mpc83xx/hrcw/hrcw.h"
 #include "../../../arch/powerpc/cpu/mpc83xx/elbc/elbc.h"
diff --git a/board/freescale/mpc8349itx/pci.c b/board/freescale/mpc8349itx/pci.c
index c98772b59452..7c9836ea5c78 100644
--- a/board/freescale/mpc8349itx/pci.c
+++ b/board/freescale/mpc8349itx/pci.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 #include <asm/mmu.h>
diff --git a/board/freescale/mpc837xemds/mpc837xemds.c b/board/freescale/mpc837xemds/mpc837xemds.c
index bd283076b1e2..14bbe925b8a4 100644
--- a/board/freescale/mpc837xemds/mpc837xemds.c
+++ b/board/freescale/mpc837xemds/mpc837xemds.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <hwconfig.h>
 #include <i2c.h>
 #include <init.h>
@@ -17,6 +18,7 @@
 #include <asm/ppc.h>
 #include <spd_sdram.h>
 #include <tsec.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/board/freescale/mpc837xemds/pci.c b/board/freescale/mpc837xemds/pci.c
index db22938773c5..7592e4214d4c 100644
--- a/board/freescale/mpc837xemds/pci.c
+++ b/board/freescale/mpc837xemds/pci.c
@@ -15,6 +15,7 @@
 #include <asm/fsl_i2c.h>
 #include <asm/fsl_mpc83xx_serdes.h>
 #include <asm/ppc.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
diff --git a/board/freescale/mpc837xerdb/mpc837xerdb.c b/board/freescale/mpc837xerdb/mpc837xerdb.c
index 5679f932c903..b9dff05cfbff 100644
--- a/board/freescale/mpc837xerdb/mpc837xerdb.c
+++ b/board/freescale/mpc837xerdb/mpc837xerdb.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <env.h>
 #include <hwconfig.h>
 #include <i2c.h>
@@ -23,6 +24,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/mpc837xerdb/pci.c b/board/freescale/mpc837xerdb/pci.c
index 35e825f4778b..e192fec13f93 100644
--- a/board/freescale/mpc837xerdb/pci.c
+++ b/board/freescale/mpc837xerdb/pci.c
@@ -9,6 +9,7 @@
 #include <pci.h>
 #include <asm/io.h>
 #include <asm/ppc.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 static struct pci_region pci_regions[] = {
diff --git a/board/freescale/mpc8541cds/mpc8541cds.c b/board/freescale/mpc8541cds/mpc8541cds.c
index ed71fa4d3846..01ecadbae37e 100644
--- a/board/freescale/mpc8541cds/mpc8541cds.c
+++ b/board/freescale/mpc8541cds/mpc8541cds.c
@@ -21,6 +21,7 @@
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
+#include <linux/types.h>
 
 #include "../common/cadmus.h"
 #include "../common/eeprom.h"
diff --git a/board/freescale/mpc8544ds/mpc8544ds.c b/board/freescale/mpc8544ds/mpc8544ds.c
index a495e0818005..eccf7c198d42 100644
--- a/board/freescale/mpc8544ds/mpc8544ds.c
+++ b/board/freescale/mpc8544ds/mpc8544ds.c
@@ -23,6 +23,7 @@
 #include <fsl_mdio.h>
 #include <tsec.h>
 #include <netdev.h>
+#include <linux/types.h>
 
 #include "../common/sgmii_riser.h"
 
diff --git a/board/freescale/mpc8548cds/mpc8548cds.c b/board/freescale/mpc8548cds/mpc8548cds.c
index 08ac02b4923f..03e6b25e79fb 100644
--- a/board/freescale/mpc8548cds/mpc8548cds.c
+++ b/board/freescale/mpc8548cds/mpc8548cds.c
@@ -26,6 +26,7 @@
 #include <tsec.h>
 #include <fsl_mdio.h>
 #include <netdev.h>
+#include <linux/types.h>
 
 #include "../common/cadmus.h"
 #include "../common/eeprom.h"
diff --git a/board/freescale/mpc8555cds/mpc8555cds.c b/board/freescale/mpc8555cds/mpc8555cds.c
index e3c96ae162f5..d170c04a433a 100644
--- a/board/freescale/mpc8555cds/mpc8555cds.c
+++ b/board/freescale/mpc8555cds/mpc8555cds.c
@@ -19,6 +19,7 @@
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
+#include <linux/types.h>
 
 #include "../common/cadmus.h"
 #include "../common/eeprom.h"
diff --git a/board/freescale/mpc8568mds/bcsr.c b/board/freescale/mpc8568mds/bcsr.c
index b1e638af5aec..cbdccebb5702 100644
--- a/board/freescale/mpc8568mds/bcsr.c
+++ b/board/freescale/mpc8568mds/bcsr.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <flash.h>
 #include <asm/io.h>
+#include <linux/types.h>
 
 #include "bcsr.h"
 
diff --git a/board/freescale/mpc8568mds/mpc8568mds.c b/board/freescale/mpc8568mds/mpc8568mds.c
index 8ea51e1f2362..74530c2e55f0 100644
--- a/board/freescale/mpc8568mds/mpc8568mds.c
+++ b/board/freescale/mpc8568mds/mpc8568mds.c
@@ -25,6 +25,7 @@
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
+#include <linux/types.h>
 
 #include "bcsr.h"
 
diff --git a/board/freescale/mpc8569mds/bcsr.c b/board/freescale/mpc8569mds/bcsr.c
index 9ed00f6e5b17..0e373244ad0d 100644
--- a/board/freescale/mpc8569mds/bcsr.c
+++ b/board/freescale/mpc8569mds/bcsr.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <flash.h>
 #include <asm/io.h>
+#include <asm/types.h>
 
 #include "bcsr.h"
 
diff --git a/board/freescale/mpc8569mds/mpc8569mds.c b/board/freescale/mpc8569mds/mpc8569mds.c
index 012fd54c3fe0..fd1f0e1a72fc 100644
--- a/board/freescale/mpc8569mds/mpc8569mds.c
+++ b/board/freescale/mpc8569mds/mpc8569mds.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <console.h>
 #include <flash.h>
 #include <hwconfig.h>
@@ -31,6 +32,7 @@
 #include <fsl_esdhc.h>
 #include <phy.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "bcsr.h"
 #if defined(CONFIG_PQ_MDS_PIB)
diff --git a/board/freescale/mpc8572ds/ddr.c b/board/freescale/mpc8572ds/ddr.c
index 941a85ed927b..6da3b9b16141 100644
--- a/board/freescale/mpc8572ds/ddr.c
+++ b/board/freescale/mpc8572ds/ddr.c
@@ -7,6 +7,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/ppc.h>
+#include <linux/types.h>
 
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
diff --git a/board/freescale/mpc8572ds/mpc8572ds.c b/board/freescale/mpc8572ds/mpc8572ds.c
index c62862f1db07..da93076dd0fa 100644
--- a/board/freescale/mpc8572ds/mpc8572ds.c
+++ b/board/freescale/mpc8572ds/mpc8572ds.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <env.h>
 #include <image.h>
 #include <init.h>
@@ -28,6 +29,7 @@
 #include <tsec.h>
 #include <fsl_mdio.h>
 #include <netdev.h>
+#include <linux/types.h>
 
 #include "../common/sgmii_riser.h"
 
diff --git a/board/freescale/mpc8610hpcd/mpc8610hpcd.c b/board/freescale/mpc8610hpcd/mpc8610hpcd.c
index d696e23bc53c..687189e4005b 100644
--- a/board/freescale/mpc8610hpcd/mpc8610hpcd.c
+++ b/board/freescale/mpc8610hpcd/mpc8610hpcd.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <init.h>
 #include <log.h>
 #include <net.h>
@@ -24,6 +25,7 @@
 #include <fdt_support.h>
 #include <spd_sdram.h>
 #include <netdev.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c b/board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c
index 642f6ca15c58..7b4c092aa26c 100644
--- a/board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c
+++ b/board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c
@@ -15,6 +15,7 @@
 #include <asm/io.h>
 #include <fsl_diu_fb.h>
 #include <asm/ppc.h>
+#include <asm/types.h>
 #include <linux/string.h>
 #include "../common/pixis.h"
 
diff --git a/board/freescale/mpc8641hpcn/ddr.c b/board/freescale/mpc8641hpcn/ddr.c
index 8d25628709b5..071a5d05ff49 100644
--- a/board/freescale/mpc8641hpcn/ddr.c
+++ b/board/freescale/mpc8641hpcn/ddr.c
@@ -7,6 +7,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/ppc.h>
+#include <linux/types.h>
 
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
diff --git a/board/freescale/mpc8641hpcn/mpc8641hpcn.c b/board/freescale/mpc8641hpcn/mpc8641hpcn.c
index 209c354dda45..450ec18bf20a 100644
--- a/board/freescale/mpc8641hpcn/mpc8641hpcn.c
+++ b/board/freescale/mpc8641hpcn/mpc8641hpcn.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <init.h>
 #include <log.h>
 #include <net.h>
@@ -21,6 +22,7 @@
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <netdev.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/mx23evk/spl_boot.c b/board/freescale/mx23evk/spl_boot.c
index b7c67cc68831..c640fed717d2 100644
--- a/board/freescale/mx23evk/spl_boot.c
+++ b/board/freescale/mx23evk/spl_boot.c
@@ -13,6 +13,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #define	MUX_CONFIG_SSP1	(MXS_PAD_8MA | MXS_PAD_PULLUP)
 #define	MUX_CONFIG_EMI	(MXS_PAD_3V3 | MXS_PAD_12MA | MXS_PAD_PULLUP)
diff --git a/board/freescale/mx28evk/iomux.c b/board/freescale/mx28evk/iomux.c
index 9a3f88abd36f..876325e27926 100644
--- a/board/freescale/mx28evk/iomux.c
+++ b/board/freescale/mx28evk/iomux.c
@@ -13,6 +13,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #define	MUX_CONFIG_SSP0	(MXS_PAD_3V3 | MXS_PAD_8MA | MXS_PAD_PULLUP)
 #define	MUX_CONFIG_GPMI	(MXS_PAD_3V3 | MXS_PAD_4MA | MXS_PAD_NOPULL)
diff --git a/board/freescale/mx51evk/mx51evk.c b/board/freescale/mx51evk/mx51evk.c
index d096948d4d3f..aa45e3c74383 100644
--- a/board/freescale/mx51evk/mx51evk.c
+++ b/board/freescale/mx51evk/mx51evk.c
@@ -11,6 +11,7 @@
 #include <asm/gpio.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux-mx51.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/board/freescale/mx53ard/mx53ard.c b/board/freescale/mx53ard/mx53ard.c
index 325f17639760..1460be1fbfee 100644
--- a/board/freescale/mx53ard/mx53ard.c
+++ b/board/freescale/mx53ard/mx53ard.c
@@ -14,6 +14,7 @@
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/iomux-mx53.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <netdev.h>
diff --git a/board/freescale/mx53evk/mx53evk.c b/board/freescale/mx53evk/mx53evk.c
index 1e43ea9cece4..36c7d1e86ee1 100644
--- a/board/freescale/mx53evk/mx53evk.c
+++ b/board/freescale/mx53evk/mx53evk.c
@@ -13,6 +13,7 @@
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/iomux-mx53.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <asm/mach-imx/boot_mode.h>
diff --git a/board/freescale/mx53loco/mx53loco.c b/board/freescale/mx53loco/mx53loco.c
index 02c6f76d3ab9..7c5196a2139d 100644
--- a/board/freescale/mx53loco/mx53loco.c
+++ b/board/freescale/mx53loco/mx53loco.c
@@ -17,6 +17,7 @@
 #include <asm/arch/iomux-mx53.h>
 #include <asm/arch/clock.h>
 #include <env.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <asm/mach-imx/mx5_video.h>
diff --git a/board/freescale/mx53smd/mx53smd.c b/board/freescale/mx53smd/mx53smd.c
index 24807f629167..feafcd2c1815 100644
--- a/board/freescale/mx53smd/mx53smd.c
+++ b/board/freescale/mx53smd/mx53smd.c
@@ -13,6 +13,7 @@
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/iomux-mx53.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <netdev.h>
diff --git a/board/freescale/mx6memcal/spl.c b/board/freescale/mx6memcal/spl.c
index f10b12cedc23..2fefdb83c306 100644
--- a/board/freescale/mx6memcal/spl.c
+++ b/board/freescale/mx6memcal/spl.c
@@ -18,6 +18,7 @@
 #include <asm/arch/sys_proto.h>
 #include <spl.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/mx6qarm2/mx6qarm2.c b/board/freescale/mx6qarm2/mx6qarm2.c
index d2f659d57329..212d3eda9dcd 100644
--- a/board/freescale/mx6qarm2/mx6qarm2.c
+++ b/board/freescale/mx6qarm2/mx6qarm2.c
@@ -12,6 +12,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/mx6-pins.h>
 #include <asm/arch/clock.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
diff --git a/board/freescale/mx6sabreauto/mx6sabreauto.c b/board/freescale/mx6sabreauto/mx6sabreauto.c
index 2944220a9369..1598f802125f 100644
--- a/board/freescale/mx6sabreauto/mx6sabreauto.c
+++ b/board/freescale/mx6sabreauto/mx6sabreauto.c
@@ -36,6 +36,7 @@
 #include <pca953x.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/pfuze100_pmic.h>
 #include "../common/pfuze.h"
diff --git a/board/freescale/mx6sabresd/mx6sabresd.c b/board/freescale/mx6sabresd/mx6sabresd.c
index 6f85ba277243..532be2c8e46c 100644
--- a/board/freescale/mx6sabresd/mx6sabresd.c
+++ b/board/freescale/mx6sabresd/mx6sabresd.c
@@ -34,6 +34,7 @@
 #include <input.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/pfuze100_pmic.h>
 #include "../common/pfuze.h"
diff --git a/board/freescale/mx6slevk/mx6slevk.c b/board/freescale/mx6slevk/mx6slevk.c
index da48f7cd6749..35f45309a50e 100644
--- a/board/freescale/mx6slevk/mx6slevk.c
+++ b/board/freescale/mx6slevk/mx6slevk.c
@@ -29,6 +29,7 @@
 #include <i2c.h>
 #include <mmc.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/pfuze100_pmic.h>
 #include "../common/pfuze.h"
diff --git a/board/freescale/mx6sllevk/mx6sllevk.c b/board/freescale/mx6sllevk/mx6sllevk.c
index bd52d10b0ec9..ebf6902019de 100644
--- a/board/freescale/mx6sllevk/mx6sllevk.c
+++ b/board/freescale/mx6sllevk/mx6sllevk.c
@@ -17,6 +17,7 @@
 #include <asm/mach-imx/boot_mode.h>
 #include <asm/io.h>
 #include <common.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/sizes.h>
diff --git a/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c b/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c
index 3e0e733bde3e..5e2347a9848e 100644
--- a/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c
+++ b/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c
@@ -19,6 +19,7 @@
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/mach-imx/boot_mode.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/board/freescale/mx6sxsabresd/mx6sxsabresd.c b/board/freescale/mx6sxsabresd/mx6sxsabresd.c
index 965a3808e737..6423a813ea98 100644
--- a/board/freescale/mx6sxsabresd/mx6sxsabresd.c
+++ b/board/freescale/mx6sxsabresd/mx6sxsabresd.c
@@ -7,6 +7,7 @@
 
 #include <init.h>
 #include <net.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/crm_regs.h>
diff --git a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
index 044d1e97457f..751f2aff8777 100644
--- a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
+++ b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
@@ -32,6 +32,7 @@
 #include <mmc.h>
 #include <netdev.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/pfuze3000_pmic.h>
 #include "../common/pfuze.h"
diff --git a/board/freescale/p1010rdb/ddr.c b/board/freescale/p1010rdb/ddr.c
index 9ecba83a393e..5f73d7a5f428 100644
--- a/board/freescale/p1010rdb/ddr.c
+++ b/board/freescale/p1010rdb/ddr.c
@@ -14,6 +14,7 @@
 #include <asm/io.h>
 #include <asm/fsl_law.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/p1010rdb/p1010rdb.c b/board/freescale/p1010rdb/p1010rdb.c
index a57b564f5efc..397155a93309 100644
--- a/board/freescale/p1010rdb/p1010rdb.c
+++ b/board/freescale/p1010rdb/p1010rdb.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <image.h>
 #include <init.h>
 #include <net.h>
@@ -32,6 +33,7 @@
 #include <hwconfig.h>
 #include <i2c.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/p1010rdb/spl.c b/board/freescale/p1010rdb/spl.c
index a11ec6b0c981..6bfa092f5f3a 100644
--- a/board/freescale/p1010rdb/spl.c
+++ b/board/freescale/p1010rdb/spl.c
@@ -19,6 +19,7 @@
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "../common/spl.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/p1010rdb/spl_minimal.c b/board/freescale/p1010rdb/spl_minimal.c
index 4d72665dbb78..aaf58e11ff34 100644
--- a/board/freescale/p1010rdb/spl_minimal.c
+++ b/board/freescale/p1010rdb/spl_minimal.c
@@ -14,6 +14,7 @@
 #include <fsl_ddr_sdram.h>
 #include <asm/fsl_law.h>
 #include <asm/global_data.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/p1023rdb/p1023rdb.c b/board/freescale/p1023rdb/p1023rdb.c
index e7862d18498b..8479487b8ae7 100644
--- a/board/freescale/p1023rdb/p1023rdb.c
+++ b/board/freescale/p1023rdb/p1023rdb.c
@@ -34,6 +34,7 @@
 #include <miiphy.h>
 #include <phy.h>
 #include <fsl_dtsec.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/p1_p2_rdb_pc/ddr.c b/board/freescale/p1_p2_rdb_pc/ddr.c
index 8de6f7b54820..28d31521d56d 100644
--- a/board/freescale/p1_p2_rdb_pc/ddr.c
+++ b/board/freescale/p1_p2_rdb_pc/ddr.c
@@ -14,6 +14,7 @@
 #include <asm/io.h>
 #include <asm/fsl_law.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_SYS_DDR_RAW_TIMING
 #if	defined(CONFIG_P1020RDB_PROTO) || \
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 7fec510c8caa..9a9cefed14e6 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
@@ -27,6 +27,7 @@
 #include <asm/fsl_lbc.h>
 #include <asm/mp.h>
 #include <miiphy.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/board/freescale/p1_p2_rdb_pc/spl.c b/board/freescale/p1_p2_rdb_pc/spl.c
index f69f7fced31c..fef2910f4b52 100644
--- a/board/freescale/p1_p2_rdb_pc/spl.c
+++ b/board/freescale/p1_p2_rdb_pc/spl.c
@@ -20,6 +20,7 @@
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "../common/spl.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/p1_p2_rdb_pc/spl_minimal.c b/board/freescale/p1_p2_rdb_pc/spl_minimal.c
index 3079e21d1c14..7f1fbf7a03ac 100644
--- a/board/freescale/p1_p2_rdb_pc/spl_minimal.c
+++ b/board/freescale/p1_p2_rdb_pc/spl_minimal.c
@@ -13,6 +13,7 @@
 #include <asm/fsl_law.h>
 #include <fsl_ddr_sdram.h>
 #include <asm/global_data.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/p2041rdb/cpld.c b/board/freescale/p2041rdb/cpld.c
index 4e1254dd1344..c668fce02331 100644
--- a/board/freescale/p2041rdb/cpld.c
+++ b/board/freescale/p2041rdb/cpld.c
@@ -16,6 +16,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/string.h>
 
 #include "cpld.h"
diff --git a/board/freescale/p2041rdb/cpld.h b/board/freescale/p2041rdb/cpld.h
index 8c90c1ccf32d..b4733fd64f5e 100644
--- a/board/freescale/p2041rdb/cpld.h
+++ b/board/freescale/p2041rdb/cpld.h
@@ -10,6 +10,7 @@
 /*
  * CPLD register set. Feel free to add board-specific #ifdefs where necessary.
  */
+#include <asm/types.h>
 typedef struct cpld_data {
 	u8 cpld_ver;		/* 0x0 - CPLD Major Revision Register */
 	u8 cpld_ver_sub;	/* 0x1 - CPLD Minor Revision Register */
diff --git a/board/freescale/p2041rdb/ddr.c b/board/freescale/p2041rdb/ddr.c
index f539002e3e1b..71e4cf762fd6 100644
--- a/board/freescale/p2041rdb/ddr.c
+++ b/board/freescale/p2041rdb/ddr.c
@@ -17,6 +17,7 @@
 #include <fsl_ddr_dimm_params.h>
 #include <asm/fsl_law.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/p2041rdb/eth.c b/board/freescale/p2041rdb/eth.c
index 94b050200500..ce855e8c2778 100644
--- a/board/freescale/p2041rdb/eth.c
+++ b/board/freescale/p2041rdb/eth.c
@@ -22,6 +22,7 @@
 #include <fsl_mdio.h>
 #include <malloc.h>
 #include <fsl_dtsec.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 
 #include "cpld.h"
diff --git a/board/freescale/p2041rdb/p2041rdb.c b/board/freescale/p2041rdb/p2041rdb.c
index ca2a8eb95973..afeffb8b66ab 100644
--- a/board/freescale/p2041rdb/p2041rdb.c
+++ b/board/freescale/p2041rdb/p2041rdb.c
@@ -12,6 +12,7 @@
 #include <netdev.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/compiler.h>
 #include <asm/mmu.h>
diff --git a/board/freescale/qemu-ppce500/qemu-ppce500.c b/board/freescale/qemu-ppce500/qemu-ppce500.c
index 5c84b404e0e4..a98bce8773ca 100644
--- a/board/freescale/qemu-ppce500/qemu-ppce500.c
+++ b/board/freescale/qemu-ppce500/qemu-ppce500.c
@@ -28,6 +28,7 @@
 #include <errno.h>
 #include <malloc.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/s32v234evb/clock.c b/board/freescale/s32v234evb/clock.c
index 21c619fa1adc..49159b293b6b 100644
--- a/board/freescale/s32v234evb/clock.c
+++ b/board/freescale/s32v234evb/clock.c
@@ -8,6 +8,7 @@
 #include <asm/arch/mc_cgm_regs.h>
 #include <asm/arch/mc_me_regs.h>
 #include <asm/arch/clock.h>
+#include <linux/types.h>
 
 /*
  * Select the clock reference for required pll.
diff --git a/board/freescale/s32v234evb/lpddr2.c b/board/freescale/s32v234evb/lpddr2.c
index b3775d3763ee..d41bc10bd155 100644
--- a/board/freescale/s32v234evb/lpddr2.c
+++ b/board/freescale/s32v234evb/lpddr2.c
@@ -8,6 +8,7 @@
 #include <asm/arch/siul.h>
 #include <asm/arch/lpddr2.h>
 #include <asm/arch/mmdc.h>
+#include <linux/types.h>
 
 volatile int mscr_offset_ck0;
 
diff --git a/board/freescale/t102xrdb/cpld.c b/board/freescale/t102xrdb/cpld.c
index 601afbc336d1..1b794fbffce4 100644
--- a/board/freescale/t102xrdb/cpld.c
+++ b/board/freescale/t102xrdb/cpld.c
@@ -11,6 +11,7 @@
 #include <command.h>
 #include <stdio.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/string.h>
 #include "cpld.h"
 
diff --git a/board/freescale/t102xrdb/cpld.h b/board/freescale/t102xrdb/cpld.h
index c05f536806fb..969c20ed1d19 100644
--- a/board/freescale/t102xrdb/cpld.h
+++ b/board/freescale/t102xrdb/cpld.h
@@ -4,6 +4,7 @@
  *
  */
 
+#include <asm/types.h>
 struct cpld_data {
 	u8 cpld_ver;		/* 0x00 - CPLD Major Revision Register */
 	u8 cpld_ver_sub;	/* 0x01 - CPLD Minor Revision Register */
diff --git a/board/freescale/t102xrdb/ddr.c b/board/freescale/t102xrdb/ddr.c
index 8e6bb29877d9..4bbd9bae6cb0 100644
--- a/board/freescale/t102xrdb/ddr.c
+++ b/board/freescale/t102xrdb/ddr.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <i2c.h>
 #include <hwconfig.h>
 #include <init.h>
@@ -19,6 +20,7 @@
 #include <asm/mpc85xx_gpio.h>
 #include <linux/delay.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/t102xrdb/eth_t102xrdb.c b/board/freescale/t102xrdb/eth_t102xrdb.c
index 95d49e26f449..a7dd0182aca7 100644
--- a/board/freescale/t102xrdb/eth_t102xrdb.c
+++ b/board/freescale/t102xrdb/eth_t102xrdb.c
@@ -25,6 +25,7 @@
 #include <phy.h>
 #include <fsl_dtsec.h>
 #include <asm/fsl_serdes.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include "../common/fman.h"
 
diff --git a/board/freescale/t102xrdb/spl.c b/board/freescale/t102xrdb/spl.c
index 1d8da1116680..1bb7f4f7eeee 100644
--- a/board/freescale/t102xrdb/spl.c
+++ b/board/freescale/t102xrdb/spl.c
@@ -4,6 +4,7 @@
 
 #include <common.h>
 #include <clock_legacy.h>
+#include <compiler.h>
 #include <console.h>
 #include <env_internal.h>
 #include <init.h>
@@ -18,6 +19,7 @@
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "../common/sleep.h"
 #include "../common/spl.h"
 
diff --git a/board/freescale/t102xrdb/t102xrdb.c b/board/freescale/t102xrdb/t102xrdb.c
index cdecfb087065..f570973609cf 100644
--- a/board/freescale/t102xrdb/t102xrdb.c
+++ b/board/freescale/t102xrdb/t102xrdb.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <env.h>
 #include <fdt_support.h>
 #include <i2c.h>
@@ -14,6 +15,7 @@
 #include <netdev.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/compiler.h>
 #include <asm/mmu.h>
diff --git a/board/freescale/t102xrdb/t102xrdb.h b/board/freescale/t102xrdb/t102xrdb.h
index a567ae18dabc..b81eebbbc1f3 100644
--- a/board/freescale/t102xrdb/t102xrdb.h
+++ b/board/freescale/t102xrdb/t102xrdb.h
@@ -6,6 +6,7 @@
 #ifndef __T1024_RDB_H__
 #define __T1024_RDB_H__
 
+#include <asm/types.h>
 #include <asm/u-boot.h>
 void fdt_fixup_board_enet(void *blob);
 void pci_of_setup(void *blob, struct bd_info *bd);
diff --git a/board/freescale/t104xrdb/cpld.c b/board/freescale/t104xrdb/cpld.c
index c2dfb17a1cf9..0a8e1a64e3b5 100644
--- a/board/freescale/t104xrdb/cpld.c
+++ b/board/freescale/t104xrdb/cpld.c
@@ -14,6 +14,7 @@
 #include <command.h>
 #include <stdio.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/string.h>
 
 #include "cpld.h"
diff --git a/board/freescale/t104xrdb/cpld.h b/board/freescale/t104xrdb/cpld.h
index a816aef10a42..70015ebc4811 100644
--- a/board/freescale/t104xrdb/cpld.h
+++ b/board/freescale/t104xrdb/cpld.h
@@ -9,6 +9,7 @@
 /*
  * CPLD register set. Feel free to add board-specific #ifdefs where necessary.
  */
+#include <asm/types.h>
 struct cpld_data {
 	u8 cpld_ver;		/* 0x00 - CPLD Major Revision Register */
 	u8 cpld_ver_sub;	/* 0x01 - CPLD Minor Revision Register */
diff --git a/board/freescale/t104xrdb/ddr.c b/board/freescale/t104xrdb/ddr.c
index e2c8492138ec..26bb873276d4 100644
--- a/board/freescale/t104xrdb/ddr.c
+++ b/board/freescale/t104xrdb/ddr.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <i2c.h>
 #include <hwconfig.h>
 #include <init.h>
@@ -18,6 +19,7 @@
 #include <asm/fsl_law.h>
 #include <asm/mpc85xx_gpio.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 #include "ddr.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/t104xrdb/ddr.h b/board/freescale/t104xrdb/ddr.h
index f9d667f6174b..496fe3a8b12b 100644
--- a/board/freescale/t104xrdb/ddr.h
+++ b/board/freescale/t104xrdb/ddr.h
@@ -5,6 +5,7 @@
 
 #ifndef __DDR_H__
 #define __DDR_H__
+#include <asm/types.h>
 struct board_specific_parameters {
 	u32 n_ranks;
 	u32 datarate_mhz_high;
diff --git a/board/freescale/t104xrdb/diu.c b/board/freescale/t104xrdb/diu.c
index 4e941fbfc931..c57dc37f0353 100644
--- a/board/freescale/t104xrdb/diu.c
+++ b/board/freescale/t104xrdb/diu.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <command.h>
 #include <fsl_diu_fb.h>
+#include <asm/types.h>
 #include <linux/ctype.h>
 #include <video_fb.h>
 
diff --git a/board/freescale/t104xrdb/spl.c b/board/freescale/t104xrdb/spl.c
index 4a3f02d10fc1..e1a348ed9bd9 100644
--- a/board/freescale/t104xrdb/spl.c
+++ b/board/freescale/t104xrdb/spl.c
@@ -18,6 +18,7 @@
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "../common/sleep.h"
 #include "../common/spl.h"
 
diff --git a/board/freescale/t104xrdb/t104xrdb.c b/board/freescale/t104xrdb/t104xrdb.c
index 292c31246c44..9360fdc4d1d8 100644
--- a/board/freescale/t104xrdb/t104xrdb.c
+++ b/board/freescale/t104xrdb/t104xrdb.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <env.h>
 #include <fdt_support.h>
 #include <hwconfig.h>
@@ -14,6 +15,7 @@
 #include <netdev.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/compiler.h>
 #include <asm/mmu.h>
diff --git a/board/freescale/t208xqds/ddr.c b/board/freescale/t208xqds/ddr.c
index ca9ab0013d04..9d5a4d7f98e1 100644
--- a/board/freescale/t208xqds/ddr.c
+++ b/board/freescale/t208xqds/ddr.c
@@ -16,6 +16,7 @@
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
 #include <asm/fsl_law.h>
+#include <linux/types.h>
 #include "ddr.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/t208xqds/ddr.h b/board/freescale/t208xqds/ddr.h
index 9dd39813bf04..609790c10d38 100644
--- a/board/freescale/t208xqds/ddr.h
+++ b/board/freescale/t208xqds/ddr.h
@@ -5,6 +5,7 @@
 
 #ifndef __DDR_H__
 #define __DDR_H__
+#include <asm/types.h>
 struct board_specific_parameters {
 	u32 n_ranks;
 	u32 datarate_mhz_high;
diff --git a/board/freescale/t208xqds/eth_t208xqds.c b/board/freescale/t208xqds/eth_t208xqds.c
index c2fcbfeedf67..35371cb4f246 100644
--- a/board/freescale/t208xqds/eth_t208xqds.c
+++ b/board/freescale/t208xqds/eth_t208xqds.c
@@ -29,6 +29,7 @@
 #include <fsl_dtsec.h>
 #include <asm/fsl_serdes.h>
 #include <hwconfig.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
 #include "../common/qixis.h"
diff --git a/board/freescale/t208xqds/spl.c b/board/freescale/t208xqds/spl.c
index 7902b746d565..2e7b2e20a449 100644
--- a/board/freescale/t208xqds/spl.c
+++ b/board/freescale/t208xqds/spl.c
@@ -18,6 +18,7 @@
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "../common/qixis.h"
 #include "t208xqds_qixis.h"
 #include "../common/spl.h"
diff --git a/board/freescale/t208xqds/t208xqds.c b/board/freescale/t208xqds/t208xqds.c
index c25b0a72ce5e..a20242a0b6cd 100644
--- a/board/freescale/t208xqds/t208xqds.c
+++ b/board/freescale/t208xqds/t208xqds.c
@@ -15,6 +15,7 @@
 #include <netdev.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/compiler.h>
 #include <asm/mmu.h>
diff --git a/board/freescale/t208xrdb/cpld.c b/board/freescale/t208xrdb/cpld.c
index cf39623b7ae0..5d5ba5dbbd76 100644
--- a/board/freescale/t208xrdb/cpld.c
+++ b/board/freescale/t208xrdb/cpld.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <command.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/string.h>
 #include "cpld.h"
 
diff --git a/board/freescale/t208xrdb/cpld.h b/board/freescale/t208xrdb/cpld.h
index bd6c203742e3..39530084aa9f 100644
--- a/board/freescale/t208xrdb/cpld.h
+++ b/board/freescale/t208xrdb/cpld.h
@@ -6,6 +6,7 @@
 /*
  * CPLD register set of T2080RDB board-specific.
  */
+#include <asm/types.h>
 struct cpld_data {
 	u8 chip_id1;		/* 0x00 - Chip ID1 register */
 	u8 chip_id2;		/* 0x01 - Chip ID2 register */
diff --git a/board/freescale/t208xrdb/ddr.c b/board/freescale/t208xrdb/ddr.c
index 3ce072ce6810..b253a46938b4 100644
--- a/board/freescale/t208xrdb/ddr.c
+++ b/board/freescale/t208xrdb/ddr.c
@@ -16,6 +16,7 @@
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
 #include <asm/fsl_law.h>
+#include <linux/types.h>
 #include "ddr.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/t208xrdb/ddr.h b/board/freescale/t208xrdb/ddr.h
index c00f17816675..7d23c361af38 100644
--- a/board/freescale/t208xrdb/ddr.h
+++ b/board/freescale/t208xrdb/ddr.h
@@ -5,6 +5,7 @@
 
 #ifndef __DDR_H__
 #define __DDR_H__
+#include <asm/types.h>
 struct board_specific_parameters {
 	u32 n_ranks;
 	u32 datarate_mhz_high;
diff --git a/board/freescale/t208xrdb/eth_t208xrdb.c b/board/freescale/t208xrdb/eth_t208xrdb.c
index fda113f01562..91d52c66b39a 100644
--- a/board/freescale/t208xrdb/eth_t208xrdb.c
+++ b/board/freescale/t208xrdb/eth_t208xrdb.c
@@ -25,6 +25,7 @@
 #include <phy.h>
 #include <fsl_dtsec.h>
 #include <asm/fsl_serdes.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 
 int board_eth_init(struct bd_info *bis)
diff --git a/board/freescale/t208xrdb/spl.c b/board/freescale/t208xrdb/spl.c
index 8ef46a09c958..dcf61b455dfb 100644
--- a/board/freescale/t208xrdb/spl.c
+++ b/board/freescale/t208xrdb/spl.c
@@ -18,6 +18,7 @@
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "../common/spl.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/t208xrdb/t208xrdb.c b/board/freescale/t208xrdb/t208xrdb.c
index bc5152810efd..248912a6a653 100644
--- a/board/freescale/t208xrdb/t208xrdb.c
+++ b/board/freescale/t208xrdb/t208xrdb.c
@@ -13,6 +13,7 @@
 #include <netdev.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/compiler.h>
 #include <asm/mmu.h>
diff --git a/board/freescale/t4rdb/cpld.c b/board/freescale/t4rdb/cpld.c
index 023b39852a78..ab8354bff60c 100644
--- a/board/freescale/t4rdb/cpld.c
+++ b/board/freescale/t4rdb/cpld.c
@@ -18,6 +18,7 @@
 #include <command.h>
 #include <stdio.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/string.h>
 
 #include "cpld.h"
diff --git a/board/freescale/t4rdb/cpld.h b/board/freescale/t4rdb/cpld.h
index dc3f9f3c26ca..7bbd32ba811d 100644
--- a/board/freescale/t4rdb/cpld.h
+++ b/board/freescale/t4rdb/cpld.h
@@ -11,6 +11,7 @@
 /*
  * CPLD register set. Feel free to add board-specific #ifdefs where necessary.
  */
+#include <asm/types.h>
 struct cpld_data {
 	u8 chip_id1;	/* 0x00 - CPLD Chip ID1 Register */
 	u8 chip_id2;	/* 0x01 - CPLD Chip ID2 Register */
diff --git a/board/freescale/t4rdb/ddr.c b/board/freescale/t4rdb/ddr.c
index c3b1c7e0fe19..f25903c5e2b4 100644
--- a/board/freescale/t4rdb/ddr.c
+++ b/board/freescale/t4rdb/ddr.c
@@ -16,6 +16,7 @@
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
 #include <asm/fsl_law.h>
+#include <linux/types.h>
 #include "ddr.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/t4rdb/ddr.h b/board/freescale/t4rdb/ddr.h
index 74a277961144..0fb8d6faa613 100644
--- a/board/freescale/t4rdb/ddr.h
+++ b/board/freescale/t4rdb/ddr.h
@@ -5,6 +5,7 @@
 
 #ifndef __DDR_H__
 #define __DDR_H__
+#include <asm/types.h>
 struct board_specific_parameters {
 	u32 n_ranks;
 	u32 datarate_mhz_high;
diff --git a/board/freescale/t4rdb/eth.c b/board/freescale/t4rdb/eth.c
index def5e6c8b32c..9b09087d7320 100644
--- a/board/freescale/t4rdb/eth.c
+++ b/board/freescale/t4rdb/eth.c
@@ -28,6 +28,7 @@
 #include <fsl_dtsec.h>
 #include <asm/fsl_serdes.h>
 #include <hwconfig.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 
 #include "../common/fman.h"
diff --git a/board/freescale/t4rdb/spl.c b/board/freescale/t4rdb/spl.c
index 8ae19d006850..c7da9612d75a 100644
--- a/board/freescale/t4rdb/spl.c
+++ b/board/freescale/t4rdb/spl.c
@@ -21,6 +21,7 @@
 #include <i2c.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "t4rdb.h"
 
diff --git a/board/freescale/t4rdb/t4240rdb.c b/board/freescale/t4rdb/t4240rdb.c
index 3cd6eb8e8bb6..3afcfc4e302e 100644
--- a/board/freescale/t4rdb/t4240rdb.c
+++ b/board/freescale/t4rdb/t4240rdb.c
@@ -13,6 +13,7 @@
 #include <netdev.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/compiler.h>
 #include <asm/mmu.h>
diff --git a/board/friendlyarm/nanopi2/board.c b/board/friendlyarm/nanopi2/board.c
index c9c9beb86c78..7e300bcf2a69 100644
--- a/board/friendlyarm/nanopi2/board.c
+++ b/board/friendlyarm/nanopi2/board.c
@@ -15,6 +15,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include <asm/arch/nexell.h>
 #include <asm/arch/nx_gpio.h>
diff --git a/board/friendlyarm/nanopi2/hwrev.c b/board/friendlyarm/nanopi2/hwrev.c
index b1e23a48a803..61a07dc6547c 100644
--- a/board/friendlyarm/nanopi2/hwrev.c
+++ b/board/friendlyarm/nanopi2/hwrev.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <i2c.h>
 #include <asm/io.h>
+#include <asm/types.h>
 
 #include <asm/arch/nexell.h>
 #include <asm/arch/nx_gpio.h>
diff --git a/board/friendlyarm/nanopi2/hwrev.h b/board/friendlyarm/nanopi2/hwrev.h
index 1b1a828afb34..7bb43bbfe4a4 100644
--- a/board/friendlyarm/nanopi2/hwrev.h
+++ b/board/friendlyarm/nanopi2/hwrev.h
@@ -7,6 +7,7 @@
 #ifndef __BD_HW_REV_H__
 #define __BD_HW_REV_H__
 
+#include <asm/types.h>
 extern void bd_hwrev_init(void);
 extern void bd_base_rev_init(void);
 extern u32 get_board_rev(void);
diff --git a/board/gardena/smart-gateway-mt7688/board.c b/board/gardena/smart-gateway-mt7688/board.c
index 75677b11dd2d..03a69882e303 100644
--- a/board/gardena/smart-gateway-mt7688/board.c
+++ b/board/gardena/smart-gateway-mt7688/board.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <env.h>
 #include <env_internal.h>
 #include <flash.h>
@@ -18,6 +19,7 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <asm/types.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 8e3c3e1ad7a8..66ee4f1edcd1 100644
--- a/board/gateworks/gw_ventana/common.c
+++ b/board/gateworks/gw_ventana/common.c
@@ -20,6 +20,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/ltc3676_pmic.h>
 #include <power/pfuze100_pmic.h>
diff --git a/board/gateworks/gw_ventana/eeprom.c b/board/gateworks/gw_ventana/eeprom.c
index 7d6509be77bf..aeec4d2955e1 100644
--- a/board/gateworks/gw_ventana/eeprom.c
+++ b/board/gateworks/gw_ventana/eeprom.c
@@ -14,6 +14,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/bitops.h>
+#include <asm/types.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 d98fa4bf2ee5..d00cdf644f32 100644
--- a/board/gateworks/gw_ventana/gsc.c
+++ b/board/gateworks/gw_ventana/gsc.c
@@ -16,6 +16,7 @@
 #include <i2c.h>
 #include <linux/ctype.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "ventana_eeprom.h"
 #include "gsc.h"
diff --git a/board/gateworks/gw_ventana/gsc.h b/board/gateworks/gw_ventana/gsc.h
index 6dcaafadf376..51128416ab99 100644
--- a/board/gateworks/gw_ventana/gsc.h
+++ b/board/gateworks/gw_ventana/gsc.h
@@ -8,6 +8,7 @@
 #ifndef __ASSEMBLY__
 
 /* i2c slave addresses */
+#include <linux/types.h>
 #define GSC_SC_ADDR		0x20
 #define GSC_RTC_ADDR		0x68
 #define GSC_HWMON_ADDR		0x29
diff --git a/board/gateworks/gw_ventana/gw_ventana.c b/board/gateworks/gw_ventana/gw_ventana.c
index fe6a7efe3e32..bcb7d0edbd2c 100644
--- a/board/gateworks/gw_ventana/gw_ventana.c
+++ b/board/gateworks/gw_ventana/gw_ventana.c
@@ -44,6 +44,7 @@
 #include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/ltc3676_pmic.h>
 #include <power/pfuze100_pmic.h>
diff --git a/board/gateworks/gw_ventana/gw_ventana_spl.c b/board/gateworks/gw_ventana/gw_ventana_spl.c
index 11a845e4f0e0..ef654b2de90b 100644
--- a/board/gateworks/gw_ventana/gw_ventana_spl.c
+++ b/board/gateworks/gw_ventana/gw_ventana_spl.c
@@ -21,6 +21,7 @@
 #include <env.h>
 #include <i2c.h>
 #include <spl.h>
+#include <linux/types.h>
 
 #include "gsc.h"
 #include "common.h"
diff --git a/board/gateworks/gw_ventana/ventana_eeprom.h b/board/gateworks/gw_ventana/ventana_eeprom.h
index 4fa085b320cc..61bfeb2b4906 100644
--- a/board/gateworks/gw_ventana/ventana_eeprom.h
+++ b/board/gateworks/gw_ventana/ventana_eeprom.h
@@ -6,6 +6,7 @@
 #ifndef _VENTANA_EEPROM_
 #define _VENTANA_EEPROM_
 
+#include <asm/types.h>
 struct ventana_board_info {
 	u8 mac0[6];          /* 0x00: MAC1 */
 	u8 mac1[6];          /* 0x06: MAC2 */
diff --git a/board/gdsys/a38x/controlcenterdc.c b/board/gdsys/a38x/controlcenterdc.c
index 8b16259adbef..2e07b0a5431d 100644
--- a/board/gdsys/a38x/controlcenterdc.c
+++ b/board/gdsys/a38x/controlcenterdc.c
@@ -19,6 +19,7 @@
 #include <asm-generic/gpio.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include "../drivers/ddr/marvell/a38x/ddr3_init.h"
 #include "../arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec.h"
diff --git a/board/gdsys/a38x/dt_helpers.c b/board/gdsys/a38x/dt_helpers.c
index 23525b7ed52e..0ff146c1713b 100644
--- a/board/gdsys/a38x/dt_helpers.c
+++ b/board/gdsys/a38x/dt_helpers.c
@@ -10,6 +10,7 @@
 #include <stdbool.h>
 #include <asm-generic/gpio.h>
 #include <dm.h>
+#include <linux/types.h>
 
 int fdt_disable_by_ofname(void *rw_fdt_blob, char *ofname)
 {
diff --git a/board/gdsys/a38x/dt_helpers.h b/board/gdsys/a38x/dt_helpers.h
index 30dbf298b69d..bdd19c9c271a 100644
--- a/board/gdsys/a38x/dt_helpers.h
+++ b/board/gdsys/a38x/dt_helpers.h
@@ -8,6 +8,7 @@
 #define __DT_HELPERS_H
 
 #include <stdbool.h>
+#include <linux/types.h>
 int fdt_disable_by_ofname(void *rw_fdt_blob, char *ofname);
 bool dm_i2c_simple_probe(struct udevice *bus, uint chip_addr);
 int request_gpio_by_name(struct gpio_desc *gpio, const char *gpio_dev_name,
diff --git a/board/gdsys/a38x/hre.c b/board/gdsys/a38x/hre.c
index 93d8045d53b4..aaa5b2bdb0f8 100644
--- a/board/gdsys/a38x/hre.c
+++ b/board/gdsys/a38x/hre.c
@@ -10,10 +10,12 @@
 #include <fs.h>
 #include <i2c.h>
 #include <mmc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <tpm-v1.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <u-boot/crc.h>
 #include <u-boot/sha1.h>
 #include <asm/byteorder.h>
diff --git a/board/gdsys/a38x/hre.h b/board/gdsys/a38x/hre.h
index 154a02761dcb..b4b6f3c04e10 100644
--- a/board/gdsys/a38x/hre.h
+++ b/board/gdsys/a38x/hre.h
@@ -8,6 +8,7 @@
 #define __HRE_H
 
 #include <stdbool.h>
+#include <linux/types.h>
 struct key_program {
 	uint32_t magic;
 	uint32_t code_crc;
diff --git a/board/gdsys/a38x/hydra.c b/board/gdsys/a38x/hydra.c
index bd66cd52b86b..902b3714ec2b 100644
--- a/board/gdsys/a38x/hydra.c
+++ b/board/gdsys/a38x/hydra.c
@@ -1,9 +1,11 @@
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <console.h> /* ctrlc */
 #include <pci.h>
 #include <stdio.h>
 #include <asm/io.h>
+#include <linux/types.h>
 
 #include "hydra.h"
 
diff --git a/board/gdsys/a38x/hydra.h b/board/gdsys/a38x/hydra.h
index 26562a560a0c..8aec2cf513b6 100644
--- a/board/gdsys/a38x/hydra.h
+++ b/board/gdsys/a38x/hydra.h
@@ -1,3 +1,4 @@
+#include <linux/types.h>
 struct ihs_fpga {
 	u32 reflection_low;		/* 0x0000 */
 	u32 versions;			/* 0x0004 */
diff --git a/board/gdsys/a38x/ihs_phys.c b/board/gdsys/a38x/ihs_phys.c
index c784421a7018..ddbeb22d7d4e 100644
--- a/board/gdsys/a38x/ihs_phys.c
+++ b/board/gdsys/a38x/ihs_phys.c
@@ -1,6 +1,7 @@
 #include <common.h>
 #include <dm.h>
 #include <miiphy.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm-generic/gpio.h>
@@ -9,6 +10,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "ihs_phys.h"
 #include "dt_helpers.h"
diff --git a/board/gdsys/a38x/ihs_phys.h b/board/gdsys/a38x/ihs_phys.h
index c4bec4d46c06..37ec758ffd37 100644
--- a/board/gdsys/a38x/ihs_phys.h
+++ b/board/gdsys/a38x/ihs_phys.h
@@ -1,2 +1,3 @@
+#include <linux/types.h>
 uint calculate_octo_phy_mask(void);
 int init_octo_phys(uint octo_phy_mask);
diff --git a/board/gdsys/a38x/keyprogram.c b/board/gdsys/a38x/keyprogram.c
index be41844dcf13..70ed70eaeefc 100644
--- a/board/gdsys/a38x/keyprogram.c
+++ b/board/gdsys/a38x/keyprogram.c
@@ -13,6 +13,7 @@
 #include <linux/ctype.h>
 #include <asm/unaligned.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "hre.h"
 
diff --git a/board/gdsys/a38x/spl.c b/board/gdsys/a38x/spl.c
index a06acd64f9f5..552c60a8edbc 100644
--- a/board/gdsys/a38x/spl.c
+++ b/board/gdsys/a38x/spl.c
@@ -8,6 +8,7 @@
 #include <config.h>
 #include <stdio.h>
 #include <asm/arch/cpu.h>
+#include <asm/types.h>
 
 void spl_board_init(void)
 {
diff --git a/board/gdsys/common/cmd_ioloop.c b/board/gdsys/common/cmd_ioloop.c
index 881f2cc7bf25..5a3ffa217355 100644
--- a/board/gdsys/common/cmd_ioloop.c
+++ b/board/gdsys/common/cmd_ioloop.c
@@ -6,12 +6,14 @@
 
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <console.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <gdsys_fpga.h>
 
diff --git a/board/gdsys/common/dp501.c b/board/gdsys/common/dp501.c
index 55be6bc29577..38938cc767c1 100644
--- a/board/gdsys/common/dp501.c
+++ b/board/gdsys/common/dp501.c
@@ -23,6 +23,7 @@ int dp501_i2c[] = CONFIG_SYS_DP501_I2C;
 int dp501_base[] = CONFIG_SYS_DP501_BASE;
 #endif
 
+#include <linux/types.h>
 static void dp501_setbits(u8 addr, u8 reg, u8 mask)
 {
 	u8 val;
diff --git a/board/gdsys/common/dp501.h b/board/gdsys/common/dp501.h
index 9f3238638f1b..3eb8b113459c 100644
--- a/board/gdsys/common/dp501.h
+++ b/board/gdsys/common/dp501.h
@@ -25,6 +25,7 @@
 #define _DP501_H_
 
 #include <stdbool.h>
+#include <asm/types.h>
 void dp501_powerup(u8 addr);
 void dp501_powerdown(u8 addr);
 int dp501_probe(unsigned screen, bool power);
diff --git a/board/gdsys/common/fanctrl.h b/board/gdsys/common/fanctrl.h
index ab7e58def5a0..e246b5d304f0 100644
--- a/board/gdsys/common/fanctrl.h
+++ b/board/gdsys/common/fanctrl.h
@@ -7,6 +7,7 @@
 #ifndef _FANCTRL_H_
 #define _FANCTRL_H_
 
+#include <asm/types.h>
 void init_fan_controller(u8 addr);
 
 #endif
diff --git a/board/gdsys/common/ihs_mdio.c b/board/gdsys/common/ihs_mdio.c
index ea91d767d5b6..6dc057ccca8b 100644
--- a/board/gdsys/common/ihs_mdio.c
+++ b/board/gdsys/common/ihs_mdio.c
@@ -8,6 +8,7 @@
 #include <stdio.h>
 #include <linux/delay.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <miiphy.h>
 #ifdef CONFIG_GDSYS_LEGACY_DRIVERS
diff --git a/board/gdsys/common/ihs_mdio.h b/board/gdsys/common/ihs_mdio.h
index d0a4b0d7a88a..7fd07f6c9747 100644
--- a/board/gdsys/common/ihs_mdio.h
+++ b/board/gdsys/common/ihs_mdio.h
@@ -7,6 +7,7 @@
 #ifndef _IHS_MDIO_H_
 #define _IHS_MDIO_H_
 
+#include <asm/types.h>
 struct ihs_mdio_info {
 #ifdef CONFIG_GDSYS_LEGACY_DRIVERS
 	u32 fpga;
diff --git a/board/gdsys/common/ioep-fpga.c b/board/gdsys/common/ioep-fpga.c
index 115f10c30c71..d8d6df756436 100644
--- a/board/gdsys/common/ioep-fpga.c
+++ b/board/gdsys/common/ioep-fpga.c
@@ -384,6 +384,7 @@ static int get_features(unsigned int fpga, struct fpga_features *features)
 	u16 raw_extended_features;
 #endif
 
+#include <asm/types.h>
 	memset(features, 0, sizeof(struct fpga_features));
 
 	FPGA_GET_REG(fpga, fpga_features, &raw_features);
diff --git a/board/gdsys/common/mclink.h b/board/gdsys/common/mclink.h
index 4dc405889243..6baf8e1d0f59 100644
--- a/board/gdsys/common/mclink.h
+++ b/board/gdsys/common/mclink.h
@@ -7,6 +7,7 @@
 #ifndef _MCLINK_H_
 #define _MCLINK_H_
 
+#include <asm/types.h>
 int mclink_probe(void);
 int mclink_send(u8 slave, u16 addr, u16 data);
 int mclink_receive(u8 slave, u16 addr, u16 *data);
diff --git a/board/gdsys/common/osd.c b/board/gdsys/common/osd.c
index a43031d513dd..d435d1e23c86 100644
--- a/board/gdsys/common/osd.c
+++ b/board/gdsys/common/osd.c
@@ -67,6 +67,7 @@
 
 unsigned int base_width;
 unsigned int base_height;
+#include <linux/types.h>
 size_t bufsize;
 u16 *buf;
 
diff --git a/board/gdsys/common/osd_cmd.c b/board/gdsys/common/osd_cmd.c
index e306d7e82fed..cca6cb02c54a 100644
--- a/board/gdsys/common/osd_cmd.c
+++ b/board/gdsys/common/osd_cmd.c
@@ -18,6 +18,7 @@
 #include <malloc.h>
 #include <vsprintf.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static int do_osd_write(struct cmd_tbl *cmdtp, int flag, int argc,
 			char *const argv[])
diff --git a/board/gdsys/common/phy.c b/board/gdsys/common/phy.c
index cfa681c2e19e..d3fd35414402 100644
--- a/board/gdsys/common/phy.c
+++ b/board/gdsys/common/phy.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <stdio.h>
 #include <time.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 
 #include <miiphy.h>
diff --git a/board/gdsys/mpc8308/hrcon.c b/board/gdsys/mpc8308/hrcon.c
index f0d01c1210d1..b1d37ef61b81 100644
--- a/board/gdsys/mpc8308/hrcon.c
+++ b/board/gdsys/mpc8308/hrcon.c
@@ -11,6 +11,7 @@
 #include <i2c.h>
 #include <init.h>
 #include <spi.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
@@ -27,6 +28,7 @@
 #include <asm/fsl_mpc83xx_serdes.h>
 #include <asm/ppc.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "mpc8308.h"
 
diff --git a/board/gdsys/mpc8308/mpc8308.c b/board/gdsys/mpc8308/mpc8308.c
index d2401d09b14f..971b3b18d54e 100644
--- a/board/gdsys/mpc8308/mpc8308.c
+++ b/board/gdsys/mpc8308/mpc8308.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 #include "mpc8308.h"
 #include <gdsys_fpga.h>
diff --git a/board/gdsys/mpc8308/mpc8308.h b/board/gdsys/mpc8308/mpc8308.h
index 1e4f24fb2ae8..dfd3160f145e 100644
--- a/board/gdsys/mpc8308/mpc8308.h
+++ b/board/gdsys/mpc8308/mpc8308.h
@@ -1,6 +1,7 @@
 #ifndef __MPC8308_H_
 #define __MPC8308_H_
 
+#include <asm/types.h>
 void setbits_gpio0_out(u32 mask);
 void clrbits_gpio0_out(u32 mask);
 
diff --git a/board/gdsys/mpc8308/strider.c b/board/gdsys/mpc8308/strider.c
index 327e070aff22..fb203824d919 100644
--- a/board/gdsys/mpc8308/strider.c
+++ b/board/gdsys/mpc8308/strider.c
@@ -11,6 +11,7 @@
 #include <i2c.h>
 #include <init.h>
 #include <spi.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
@@ -27,6 +28,7 @@
 #include <asm/fsl_mpc83xx_serdes.h>
 #include <asm/ppc.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "mpc8308.h"
 
diff --git a/board/gdsys/p1022/controlcenterd-id.c b/board/gdsys/p1022/controlcenterd-id.c
index 713cb6456e80..56b63d6b23f6 100644
--- a/board/gdsys/p1022/controlcenterd-id.c
+++ b/board/gdsys/p1022/controlcenterd-id.c
@@ -4,6 +4,8 @@
  * Reinhard Pfau, Guntermann & Drunck GmbH, reinhard.pfau at gdsys.cc
  */
 
+#include <stdbool.h>
+#include <linux/types.h>
 /* TODO: some more #ifdef's to avoid unneeded code for stage 1 / stage 2 */
 
 #ifdef CCDM_ID_DEBUG
diff --git a/board/gdsys/p1022/controlcenterd.c b/board/gdsys/p1022/controlcenterd.c
index 619e8073253d..4161f55c8976 100644
--- a/board/gdsys/p1022/controlcenterd.c
+++ b/board/gdsys/p1022/controlcenterd.c
@@ -37,6 +37,7 @@
 #include <fsl_ddr_sdram.h>
 #include <asm/fsl_serdes.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
diff --git a/board/gdsys/p1022/ddr.c b/board/gdsys/p1022/ddr.c
index 1ed8b9ff2831..9b4c97987d19 100644
--- a/board/gdsys/p1022/ddr.c
+++ b/board/gdsys/p1022/ddr.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <stdio.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
diff --git a/board/gdsys/p1022/diu.c b/board/gdsys/p1022/diu.c
index d96ac2d0ab6a..35ed64b2c9a6 100644
--- a/board/gdsys/p1022/diu.c
+++ b/board/gdsys/p1022/diu.c
@@ -11,6 +11,7 @@
 #include <command.h>
 #include <log.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/ctype.h>
 #include <asm/io.h>
 #include <asm/ppc.h>
diff --git a/board/gdsys/p1022/sdhc_boot.c b/board/gdsys/p1022/sdhc_boot.c
index 6a4a6ef6af24..2211c7b7f5e3 100644
--- a/board/gdsys/p1022/sdhc_boot.c
+++ b/board/gdsys/p1022/sdhc_boot.c
@@ -23,6 +23,7 @@
 #include <common.h>
 #include <mmc.h>
 #include <malloc.h>
+#include <asm/types.h>
 
 /*
  * The environment variables are written to just after the u-boot image
diff --git a/board/ge/bx50v3/bx50v3.c b/board/ge/bx50v3/bx50v3.c
index a4ade1a9419e..387229691dca 100644
--- a/board/ge/bx50v3/bx50v3.c
+++ b/board/ge/bx50v3/bx50v3.c
@@ -7,6 +7,7 @@
 
 #include <image.h>
 #include <init.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/arch/clock.h>
@@ -34,6 +35,7 @@
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <power/regulator.h>
 #include <power/da9063_pmic.h>
 #include <input.h>
diff --git a/board/ge/common/ge_common.c b/board/ge/common/ge_common.c
index 4885c9979294..6fd4e87f6775 100644
--- a/board/ge/common/ge_common.c
+++ b/board/ge/common/ge_common.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <env.h>
+#include <asm/types.h>
 #include <dm/uclass.h>
 #include <rtc.h>
 #include <linux/errno.h>
diff --git a/board/ge/common/vpd_reader.c b/board/ge/common/vpd_reader.c
index cdf96802d9e5..0937a4b3a8d1 100644
--- a/board/ge/common/vpd_reader.c
+++ b/board/ge/common/vpd_reader.c
@@ -12,6 +12,7 @@
 #include <dm/uclass.h>
 #include <linux/bch.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include "vpd_reader.h"
 
 /* BCH configuration */
diff --git a/board/ge/common/vpd_reader.h b/board/ge/common/vpd_reader.h
index 2c1028bfbe28..d3ee4f9e301f 100644
--- a/board/ge/common/vpd_reader.h
+++ b/board/ge/common/vpd_reader.h
@@ -3,6 +3,7 @@
  * Copyright 2016 General Electric Company
  */
 
+#include <linux/types.h>
 struct vpd_cache;
 
 /*
diff --git a/board/ge/mx53ppd/mx53ppd.c b/board/ge/mx53ppd/mx53ppd.c
index bf813303ed41..8959b61d6af2 100644
--- a/board/ge/mx53ppd/mx53ppd.c
+++ b/board/ge/mx53ppd/mx53ppd.c
@@ -32,6 +32,7 @@
 #include <fsl_esdhc_imx.h>
 #include <asm/gpio.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <dialog_pmic.h>
 #include <fsl_pmic.h>
diff --git a/board/ge/mx53ppd/mx53ppd_video.c b/board/ge/mx53ppd/mx53ppd_video.c
index cf56983925f7..792f5896e109 100644
--- a/board/ge/mx53ppd/mx53ppd_video.c
+++ b/board/ge/mx53ppd/mx53ppd_video.c
@@ -21,6 +21,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/io.h>
 #include <panel.h>
+#include <linux/types.h>
 
 static int detect_lcd(struct display_info_t const *dev)
 {
diff --git a/board/google/imx8mq_phanbell/spl.c b/board/google/imx8mq_phanbell/spl.c
index d309a72a52da..379ee57c6518 100644
--- a/board/google/imx8mq_phanbell/spl.c
+++ b/board/google/imx8mq_phanbell/spl.c
@@ -29,6 +29,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/grinn/chiliboard/board.c b/board/grinn/chiliboard/board.c
index d2544abab576..e8b3007f8c11 100644
--- a/board/grinn/chiliboard/board.c
+++ b/board/grinn/chiliboard/board.c
@@ -25,6 +25,7 @@
 #include <miiphy.h>
 #include <spl.h>
 #include <watchdog.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/grinn/liteboard/board.c b/board/grinn/liteboard/board.c
index 986fbd6ef372..449a323847b9 100644
--- a/board/grinn/liteboard/board.c
+++ b/board/grinn/liteboard/board.c
@@ -34,6 +34,7 @@
 #include <netdev.h>
 #include <spl.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/highbank/ahci.c b/board/highbank/ahci.c
index 9c057278ace1..f2dd9a01e276 100644
--- a/board/highbank/ahci.c
+++ b/board/highbank/ahci.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <ahci.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 #define CPHY_MAP(dev, addr) ((((dev) & 0x1f) << 7) | (((addr) >> 9) & 0x7f))
diff --git a/board/highbank/highbank.c b/board/highbank/highbank.c
index 144193f44552..bf7859d2a7a1 100644
--- a/board/highbank/highbank.c
+++ b/board/highbank/highbank.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <ahci.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <env.h>
 #include <fdt_support.h>
@@ -15,6 +16,7 @@
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 #include <linux/sizes.h>
 #include <asm/io.h>
diff --git a/board/hisilicon/hikey/hikey.c b/board/hisilicon/hikey/hikey.c
index 5525ec91872b..bc6c559a789c 100644
--- a/board/hisilicon/hikey/hikey.c
+++ b/board/hisilicon/hikey/hikey.c
@@ -19,6 +19,7 @@
 #include <asm/io.h>
 #include <usb.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 #include <power/hi6553_pmic.h>
 #include <asm-generic/gpio.h>
 #include <asm/arch/dwmmc.h>
diff --git a/board/hisilicon/hikey960/hikey960.c b/board/hisilicon/hikey960/hikey960.c
index 3282ee9824a2..412d883d45d0 100644
--- a/board/hisilicon/hikey960/hikey960.c
+++ b/board/hisilicon/hikey960/hikey960.c
@@ -19,6 +19,7 @@
 #include <linux/arm-smccc.h>
 #include <linux/delay.h>
 #include <linux/psci.h>
+#include <linux/types.h>
 
 #define PMIC_REG_TO_BUS_ADDR(x) (x << 2)
 #define PMIC_VSEL_MASK		0x7
diff --git a/board/hisilicon/poplar/poplar.c b/board/hisilicon/poplar/poplar.c
index 36c6c9292cc5..c344dcb06c06 100644
--- a/board/hisilicon/poplar/poplar.c
+++ b/board/hisilicon/poplar/poplar.c
@@ -18,6 +18,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/ids/ids8313/ids8313.c b/board/ids/ids8313/ids8313.c
index 0aec6e6ca853..79bbb1ae6b1c 100644
--- a/board/ids/ids8313/ids8313.c
+++ b/board/ids/ids8313/ids8313.c
@@ -20,6 +20,7 @@
 #include <asm/bitops.h>
 #include <asm/global_data.h>
 #include <asm/ppc.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/board/imgtec/boston/checkboard.c b/board/imgtec/boston/checkboard.c
index 9d3a90282a07..a8462ab0ae38 100644
--- a/board/imgtec/boston/checkboard.c
+++ b/board/imgtec/boston/checkboard.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <init.h>
 #include <stdio.h>
+#include <linux/types.h>
 
 #include <asm/io.h>
 #include <asm/mipsregs.h>
diff --git a/board/imgtec/boston/ddr.c b/board/imgtec/boston/ddr.c
index 4e6afc13c66e..0c7c1da68eff 100644
--- a/board/imgtec/boston/ddr.c
+++ b/board/imgtec/boston/ddr.c
@@ -7,6 +7,7 @@
 #include <init.h>
 #include <asm/global_data.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include <asm/io.h>
 
diff --git a/board/imgtec/ci20/ci20.c b/board/imgtec/ci20/ci20.c
index 11f140f172ea..8aa910998c3e 100644
--- a/board/imgtec/ci20/ci20.c
+++ b/board/imgtec/ci20/ci20.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <env.h>
 #include <init.h>
 #include <net.h>
@@ -15,6 +16,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/board/imgtec/malta/malta.c b/board/imgtec/malta/malta.c
index dd64f9dffa94..3b60400be7e6 100644
--- a/board/imgtec/malta/malta.c
+++ b/board/imgtec/malta/malta.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <ide.h>
 #include <init.h>
 #include <net.h>
@@ -20,6 +21,7 @@
 #include <linux/delay.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <asm/addrspace.h>
 #include <asm/io.h>
diff --git a/board/imgtec/malta/superio.c b/board/imgtec/malta/superio.c
index cb5e0589a71a..c5550f1b599e 100644
--- a/board/imgtec/malta/superio.c
+++ b/board/imgtec/malta/superio.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 
 #define SIO_CONF_PORT		0x3f0
diff --git a/board/intel/edison/edison.c b/board/intel/edison/edison.c
index 755162070cd6..e9fdad0c6fc6 100644
--- a/board/intel/edison/edison.c
+++ b/board/intel/edison/edison.c
@@ -9,6 +9,7 @@
 #include <mmc.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <u-boot/md5.h>
 #include <usb.h>
diff --git a/board/intel/galileo/galileo.c b/board/intel/galileo/galileo.c
index 720350d0f7f3..c4b0e97bb9fc 100644
--- a/board/intel/galileo/galileo.c
+++ b/board/intel/galileo/galileo.c
@@ -7,6 +7,7 @@
 #include <asm/io.h>
 #include <asm/arch/device.h>
 #include <asm/arch/quark.h>
+#include <asm/types.h>
 
 /*
  * Intel Galileo gen2 board uses GPIO Resume Well bank pin0 as the PERST# pin.
diff --git a/board/inversepath/usbarmory/usbarmory.c b/board/inversepath/usbarmory/usbarmory.c
index 1028f97ff3a7..bd35784d26a3 100644
--- a/board/inversepath/usbarmory/usbarmory.c
+++ b/board/inversepath/usbarmory/usbarmory.c
@@ -27,6 +27,7 @@
 #include <fsl_esdhc_imx.h>
 #include <asm/gpio.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/iomega/iconnect/iconnect.c b/board/iomega/iconnect/iconnect.c
index fe4be28b13ce..3ad6629ae2c9 100644
--- a/board/iomega/iconnect/iconnect.c
+++ b/board/iomega/iconnect/iconnect.c
@@ -12,6 +12,7 @@
 #include <asm/arch/soc.h>
 #include <asm/arch/mpp.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include "iconnect.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/is1/qts/pinmux_config.h b/board/is1/qts/pinmux_config.h
index bf79975b9189..3deeac12a5e4 100644
--- a/board/is1/qts/pinmux_config.h
+++ b/board/is1/qts/pinmux_config.h
@@ -6,6 +6,7 @@
 #ifndef __SOCFPGA_PINMUX_CONFIG_H__
 #define __SOCFPGA_PINMUX_CONFIG_H__
 
+#include <asm/types.h>
 const u8 sys_mgr_init_table[] = {
 	0, /* EMACIO0 */
 	2, /* EMACIO1 */
diff --git a/board/is1/qts/sdram_config.h b/board/is1/qts/sdram_config.h
index 2573171abeb1..c45660729d03 100644
--- a/board/is1/qts/sdram_config.h
+++ b/board/is1/qts/sdram_config.h
@@ -7,6 +7,7 @@
 #define __SOCFPGA_SDRAM_CONFIG_H__
 
 /* SDRAM configuration */
+#include <asm/types.h>
 #define CONFIG_HPS_SDR_CTRLCFG_CPORTRDWR_CPORTRDWR		0x5A56A
 #define CONFIG_HPS_SDR_CTRLCFG_CPORTRMAP_CPORTRMAP		0xB00088
 #define CONFIG_HPS_SDR_CTRLCFG_CPORTWIDTH_CPORTWIDTH		0x44555
diff --git a/board/isee/igep003x/board.c b/board/isee/igep003x/board.c
index 2f53925a9cfc..2e0bf59d31a4 100644
--- a/board/isee/igep003x/board.c
+++ b/board/isee/igep003x/board.c
@@ -34,6 +34,7 @@
 #include <asm/u-boot.h>
 #include <jffs2/load_kernel.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include "board.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/isee/igep00x0/igep00x0.c b/board/isee/igep00x0/igep00x0.c
index 3167b5c097f7..91e8ead3d95b 100644
--- a/board/isee/igep00x0/igep00x0.c
+++ b/board/isee/igep00x0/igep00x0.c
@@ -21,6 +21,7 @@
 #include <asm/arch/mmc_host_def.h>
 #include <asm/arch/mux.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
diff --git a/board/k+p/kp_imx53/kp_id_rev.c b/board/k+p/kp_imx53/kp_id_rev.c
index 387c2271046f..eca81f8b2b0f 100644
--- a/board/k+p/kp_imx53/kp_id_rev.c
+++ b/board/k+p/kp_imx53/kp_id_rev.c
@@ -15,6 +15,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "kp_id_rev.h"
 #include <net.h>
 
diff --git a/board/k+p/kp_imx53/kp_id_rev.h b/board/k+p/kp_imx53/kp_id_rev.h
index aa64173926cc..6fe29fdefed3 100644
--- a/board/k+p/kp_imx53/kp_id_rev.h
+++ b/board/k+p/kp_imx53/kp_id_rev.h
@@ -12,6 +12,8 @@
 #ifndef __KP_ID_REV_H_
 #define __KP_ID_REV_H_
 
+#include <compiler.h>
+#include <asm/types.h>
 struct id_eeprom {
 	u8 hrcw_primary[0x20];
 	u8 mac[6];              /* 0x20 ... 0x25 */
diff --git a/board/k+p/kp_imx53/kp_imx53.c b/board/k+p/kp_imx53/kp_imx53.c
index a2dc296cc8b6..379b06119a40 100644
--- a/board/k+p/kp_imx53/kp_imx53.c
+++ b/board/k+p/kp_imx53/kp_imx53.c
@@ -17,6 +17,7 @@
 #include <asm/arch/clock.h>
 #include <asm/gpio.h>
 #include <env.h>
+#include <asm/types.h>
 #include <power/pmic.h>
 #include <fsl_pmic.h>
 #include "kp_id_rev.h"
diff --git a/board/k+p/kp_imx6q_tpc/kp_imx6q_tpc_spl.c b/board/k+p/kp_imx6q_tpc/kp_imx6q_tpc_spl.c
index d8d0b5c9aac6..465584b6cd52 100644
--- a/board/k+p/kp_imx6q_tpc/kp_imx6q_tpc_spl.c
+++ b/board/k+p/kp_imx6q_tpc/kp_imx6q_tpc_spl.c
@@ -20,6 +20,7 @@
 #include <spl.h>
 #include <linux/delay.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/keymile/common/common.c b/board/keymile/common/common.c
index d87c0ac8f153..df6f15142a9d 100644
--- a/board/keymile/common/common.c
+++ b/board/keymile/common/common.c
@@ -23,6 +23,7 @@
 #include <linux/ctype.h>
 #include <linux/delay.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #if defined(CONFIG_POST)
 #include "post.h"
diff --git a/board/keymile/common/common.h b/board/keymile/common/common.h
index 8251de4db8f3..fa7796fc6392 100644
--- a/board/keymile/common/common.h
+++ b/board/keymile/common/common.h
@@ -7,6 +7,7 @@
 #ifndef __KEYMILE_COMMON_H
 #define __KEYMILE_COMMON_H
 
+#include <asm/types.h>
 #define WRG_RESET	0x80
 #define H_OPORTS_14	0x40
 #define WRG_LED		0x02
diff --git a/board/keymile/common/qrio.c b/board/keymile/common/qrio.c
index 59c1a2eda10d..83cc97a1ef16 100644
--- a/board/keymile/common/qrio.c
+++ b/board/keymile/common/qrio.c
@@ -5,8 +5,10 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <stdbool.h>
 #include <asm/ppc.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 
 #include "common.h"
diff --git a/board/keymile/common/qrio.h b/board/keymile/common/qrio.h
index ead6efcca51f..3317594c450e 100644
--- a/board/keymile/common/qrio.h
+++ b/board/keymile/common/qrio.h
@@ -9,6 +9,7 @@
 
 /* QRIO GPIO ports */
 #include <stdbool.h>
+#include <asm/types.h>
 #define QRIO_GPIO_A		0x40
 #define QRIO_GPIO_B		0x60
 
diff --git a/board/keymile/km83xx/km83xx.c b/board/keymile/km83xx/km83xx.c
index 54a6787c13d7..a42d40ac9090 100644
--- a/board/keymile/km83xx/km83xx.c
+++ b/board/keymile/km83xx/km83xx.c
@@ -14,6 +14,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <env.h>
 #include <fdt_support.h>
 #include <init.h>
@@ -33,6 +34,7 @@
 #include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <post.h>
+#include <linux/types.h>
 
 #include "../common/common.h"
 
diff --git a/board/keymile/km83xx/km83xx_i2c.c b/board/keymile/km83xx/km83xx_i2c.c
index 55c993481c22..e0887940a34b 100644
--- a/board/keymile/km83xx/km83xx_i2c.c
+++ b/board/keymile/km83xx/km83xx_i2c.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <linux/ctype.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 #include "../common/common.h"
 
 static void i2c_write_start_seq(void)
diff --git a/board/keymile/km_arm/fpga_config.c b/board/keymile/km_arm/fpga_config.c
index 2e60221f2284..ae528a719fb7 100644
--- a/board/keymile/km_arm/fpga_config.c
+++ b/board/keymile/km_arm/fpga_config.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <i2c.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 
diff --git a/board/keymile/km_arm/km_arm.c b/board/keymile/km_arm/km_arm.c
index 560d3970a5b8..f8b1de384093 100644
--- a/board/keymile/km_arm/km_arm.c
+++ b/board/keymile/km_arm/km_arm.c
@@ -28,6 +28,7 @@
 #include <asm/arch/soc.h>
 #include <asm/arch/mpp.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include "../common/common.h"
 
diff --git a/board/keymile/kmp204x/kmp204x.c b/board/keymile/kmp204x/kmp204x.c
index ffb31b8a0c03..d03035e6ec79 100644
--- a/board/keymile/kmp204x/kmp204x.c
+++ b/board/keymile/kmp204x/kmp204x.c
@@ -27,6 +27,7 @@
 #include <asm/fsl_portals.h>
 #include <asm/fsl_liodn.h>
 #include <fm_eth.h>
+#include <linux/types.h>
 
 #include "../common/common.h"
 #include "../common/qrio.h"
diff --git a/board/keymile/kmp204x/pci.c b/board/keymile/kmp204x/pci.c
index 7f92d6b322d3..630a4e424421 100644
--- a/board/keymile/kmp204x/pci.c
+++ b/board/keymile/kmp204x/pci.c
@@ -13,6 +13,7 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include <asm/fsl_pci.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
diff --git a/board/keymile/secu1/qts/pinmux_config.h b/board/keymile/secu1/qts/pinmux_config.h
index a9406060edc3..e14c0956e38c 100644
--- a/board/keymile/secu1/qts/pinmux_config.h
+++ b/board/keymile/secu1/qts/pinmux_config.h
@@ -6,6 +6,7 @@
 #ifndef __SOCFPGA_PINMUX_CONFIG_H__
 #define __SOCFPGA_PINMUX_CONFIG_H__
 
+#include <asm/types.h>
 const u8 sys_mgr_init_table[] = {
 	3, /* EMACIO0 */
 	3, /* EMACIO1 */
diff --git a/board/keymile/secu1/qts/sdram_config.h b/board/keymile/secu1/qts/sdram_config.h
index b0ff86ef3814..740573887eec 100644
--- a/board/keymile/secu1/qts/sdram_config.h
+++ b/board/keymile/secu1/qts/sdram_config.h
@@ -8,6 +8,7 @@
 #define __SOCFPGA_SDRAM_CONFIG_H__
 
 /* SDRAM configuration */
+#include <asm/types.h>
 #define CONFIG_HPS_SDR_CTRLCFG_CPORTRDWR_CPORTRDWR		0x5A56A
 #define CONFIG_HPS_SDR_CTRLCFG_CPORTRMAP_CPORTRMAP		0xB00088
 #define CONFIG_HPS_SDR_CTRLCFG_CPORTWIDTH_CPORTWIDTH		0x44555
diff --git a/board/keymile/secu1/socfpga.c b/board/keymile/secu1/socfpga.c
index 4afaf0dec729..2ce7396ceb93 100644
--- a/board/keymile/secu1/socfpga.c
+++ b/board/keymile/secu1/socfpga.c
@@ -6,6 +6,7 @@
 #include <i2c.h>
 #include <stdio.h>
 #include <asm/gpio.h>
+#include <linux/types.h>
 
 #include "../common/common.h"
 
diff --git a/board/kmc/kzm9g/kzm9g.c b/board/kmc/kzm9g/kzm9g.c
index 5b0c198940aa..bd41389fe95c 100644
--- a/board/kmc/kzm9g/kzm9g.c
+++ b/board/kmc/kzm9g/kzm9g.c
@@ -15,6 +15,7 @@
 #include <netdev.h>
 #include <i2c.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/kobol/helios4/helios4.c b/board/kobol/helios4/helios4.c
index 4dd326402e88..98c6447ba64e 100644
--- a/board/kobol/helios4/helios4.c
+++ b/board/kobol/helios4/helios4.c
@@ -15,6 +15,7 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/kernel.h>
 
diff --git a/board/kosagi/novena/novena.c b/board/kosagi/novena/novena.c
index 114cd9e1f14a..5e935be93f43 100644
--- a/board/kosagi/novena/novena.c
+++ b/board/kosagi/novena/novena.c
@@ -41,6 +41,7 @@
 #include <mmc.h>
 #include <netdev.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/pfuze100_pmic.h>
 #include <stdio_dev.h>
diff --git a/board/kosagi/novena/novena_spl.c b/board/kosagi/novena/novena_spl.c
index f79a2d46a698..4aa78fb7b382 100644
--- a/board/kosagi/novena/novena_spl.c
+++ b/board/kosagi/novena/novena_spl.c
@@ -26,6 +26,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include <asm/arch/mx6-ddr.h>
 
diff --git a/board/kosagi/novena/video.c b/board/kosagi/novena/video.c
index f90a9f990c30..c06a4eac506f 100644
--- a/board/kosagi/novena/video.c
+++ b/board/kosagi/novena/video.c
@@ -33,6 +33,7 @@
 #include <malloc.h>
 #include <stdio_dev.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include "novena.h"
 
diff --git a/board/laird/wb50n/wb50n.c b/board/laird/wb50n/wb50n.c
index 13ac53ab21a8..830e0a51c1c2 100644
--- a/board/laird/wb50n/wb50n.c
+++ b/board/laird/wb50n/wb50n.c
@@ -20,6 +20,7 @@
 #include <spl.h>
 #include <asm/arch/atmel_mpddrc.h>
 #include <asm/arch/at91_wdt.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
 
diff --git a/board/lego/ev3/legoev3.c b/board/lego/ev3/legoev3.c
index f23e8563eb71..ab0bc19b03bb 100644
--- a/board/lego/ev3/legoev3.c
+++ b/board/lego/ev3/legoev3.c
@@ -23,6 +23,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/davinci_misc.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <hwconfig.h>
 #include <asm/mach-types.h>
diff --git a/board/lg/sniper/sniper.c b/board/lg/sniper/sniper.c
index 3de18af2a1da..6653ced5be57 100644
--- a/board/lg/sniper/sniper.c
+++ b/board/lg/sniper/sniper.c
@@ -11,6 +11,7 @@
 #include <env.h>
 #include <init.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/ctype.h>
 #include <linux/usb/musb.h>
diff --git a/board/liebherr/display5/display5.c b/board/liebherr/display5/display5.c
index 0ea25ab7ed10..34a0beff580e 100644
--- a/board/liebherr/display5/display5.c
+++ b/board/liebherr/display5/display5.c
@@ -9,6 +9,7 @@
 #include <fdt_support.h>
 #include <init.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
@@ -27,6 +28,7 @@
 #include <miiphy.h>
 #include <netdev.h>
 #include <i2c.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
diff --git a/board/liebherr/display5/spl.c b/board/liebherr/display5/spl.c
index 1580b8d3cf98..1d403eaa9476 100644
--- a/board/liebherr/display5/spl.c
+++ b/board/liebherr/display5/spl.c
@@ -23,6 +23,7 @@
 #include <asm/arch/mx6-ddr.h>
 #include <asm/arch/mx6-pins.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "asm/arch/crm_regs.h"
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/liebherr/mccmon6/spl.c b/board/liebherr/mccmon6/spl.c
index 1da59eb0668c..c412fb5c4342 100644
--- a/board/liebherr/mccmon6/spl.c
+++ b/board/liebherr/mccmon6/spl.c
@@ -27,6 +27,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <asm/arch/mx6-ddr.h>
 /*
diff --git a/board/liebherr/xea/spl_xea.c b/board/liebherr/xea/spl_xea.c
index 00c1c078f902..a70e2828d499 100644
--- a/board/liebherr/xea/spl_xea.c
+++ b/board/liebherr/xea/spl_xea.c
@@ -18,6 +18,7 @@
 #include <asm/arch/iomux-mx28.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 
 #define	MUX_CONFIG_LCD	(MXS_PAD_3V3 | MXS_PAD_4MA | MXS_PAD_NOPULL)
diff --git a/board/liebherr/xea/xea.c b/board/liebherr/xea/xea.c
index 7dd6cc34156d..8bee42a5be28 100644
--- a/board/liebherr/xea/xea.c
+++ b/board/liebherr/xea/xea.c
@@ -34,6 +34,7 @@
 #include <errno.h>
 #include <usb.h>
 #include <serial.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_SPL_BUILD
 #include <spl.h>
diff --git a/board/logicpd/am3517evm/am3517evm.c b/board/logicpd/am3517evm/am3517evm.c
index e0e578685462..4c259189fd32 100644
--- a/board/logicpd/am3517evm/am3517evm.c
+++ b/board/logicpd/am3517evm/am3517evm.c
@@ -26,6 +26,7 @@
 #include <asm/arch/mmc_host_def.h>
 #include <asm/arch/musb.h>
 #include <asm/mach-types.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
diff --git a/board/logicpd/imx6/imx6logic.c b/board/logicpd/imx6/imx6logic.c
index 3ecce8e7ab04..8cfd1e4f15d1 100644
--- a/board/logicpd/imx6/imx6logic.c
+++ b/board/logicpd/imx6/imx6logic.c
@@ -29,6 +29,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/mach-imx/boot_mode.h>
 #include <asm/mach-imx/iomux-v3.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/logicpd/omap3som/omap3logic.c b/board/logicpd/omap3som/omap3logic.c
index 2379b521904a..32572d74d2b6 100644
--- a/board/logicpd/omap3som/omap3logic.c
+++ b/board/logicpd/omap3som/omap3logic.c
@@ -29,6 +29,7 @@
 #include <asm/gpio.h>
 #include <asm/omap_mmc.h>
 #include <asm/mach-types.h>
+#include <asm/types.h>
 #include <linux/mtd/rawnand.h>
 #include <asm/omap_musb.h>
 #include <linux/errno.h>
diff --git a/board/menlo/m53menlo/m53menlo.c b/board/menlo/m53menlo/m53menlo.c
index 0a81b060b23f..3ab935a33585 100644
--- a/board/menlo/m53menlo/m53menlo.c
+++ b/board/menlo/m53menlo/m53menlo.c
@@ -39,6 +39,7 @@
 #include <splash.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <usb/ehci-ci.h>
 #include <video_console.h>
 
diff --git a/board/microchip/pic32mzda/pic32mzda.c b/board/microchip/pic32mzda/pic32mzda.c
index 96bb8c8f4252..25e73bd95066 100644
--- a/board/microchip/pic32mzda/pic32mzda.c
+++ b/board/microchip/pic32mzda/pic32mzda.c
@@ -14,6 +14,7 @@
 #include <malloc.h>
 #include <stdio.h>
 #include <dt-bindings/clock/microchip,clock.h>
+#include <linux/types.h>
 #include <mach/pic32.h>
 
 #ifdef CONFIG_DISPLAY_BOARDINFO
diff --git a/board/mini-box/picosam9g45/picosam9g45.c b/board/mini-box/picosam9g45/picosam9g45.c
index d4af394670ce..380114a99a51 100644
--- a/board/mini-box/picosam9g45/picosam9g45.c
+++ b/board/mini-box/picosam9g45/picosam9g45.c
@@ -31,6 +31,7 @@
 #endif
 #include <netdev.h>
 #include <asm/mach-types.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/mpc8308_p1m/sdram.c b/board/mpc8308_p1m/sdram.c
index 93614a82d46e..af06824e0a8b 100644
--- a/board/mpc8308_p1m/sdram.c
+++ b/board/mpc8308_p1m/sdram.c
@@ -11,6 +11,7 @@
 #include <init.h>
 #include <mpc83xx.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 
 #include <asm/bitops.h>
 #include <asm/io.h>
diff --git a/board/mscc/common/spi.c b/board/mscc/common/spi.c
index b1a71f4c2928..78b9b962db1d 100644
--- a/board/mscc/common/spi.c
+++ b/board/mscc/common/spi.c
@@ -7,6 +7,7 @@
 #include <stdbool.h>
 #include <asm/io.h>
 #include <spi.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 
 void external_cs_manage(struct udevice *dev, bool enable)
diff --git a/board/mscc/jr2/jr2.c b/board/mscc/jr2/jr2.c
index 2aca78ac7941..de064c5b1a89 100644
--- a/board/mscc/jr2/jr2.c
+++ b/board/mscc/jr2/jr2.c
@@ -4,12 +4,14 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <image.h>
 #include <init.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <led.h>
 #include <miiphy.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/string.h>
diff --git a/board/mscc/luton/luton.c b/board/mscc/luton/luton.c
index ebb9060f3d75..35ada49ff242 100644
--- a/board/mscc/luton/luton.c
+++ b/board/mscc/luton/luton.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <led.h>
 #include <miiphy.h>
+#include <asm/types.h>
 #include <linux/string.h>
 
 enum {
diff --git a/board/mscc/serval/serval.c b/board/mscc/serval/serval.c
index 0da835828f85..1c1da7976fb9 100644
--- a/board/mscc/serval/serval.c
+++ b/board/mscc/serval/serval.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <led.h>
 #include <miiphy.h>
+#include <asm/types.h>
 #include <linux/string.h>
 
 enum {
diff --git a/board/netgear/dgnd3700v2/dgnd3700v2.c b/board/netgear/dgnd3700v2/dgnd3700v2.c
index cfc3529c3488..cb7d902d007e 100644
--- a/board/netgear/dgnd3700v2/dgnd3700v2.c
+++ b/board/netgear/dgnd3700v2/dgnd3700v2.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <init.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
diff --git a/board/nokia/rx51/rx51.c b/board/nokia/rx51/rx51.c
index 6d9f8c988bf6..23f63c7d72f5 100644
--- a/board/nokia/rx51/rx51.c
+++ b/board/nokia/rx51/rx51.c
@@ -39,6 +39,7 @@
 #include <asm/arch/mux.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/mmc_host_def.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
 
diff --git a/board/nokia/rx51/rx51.h b/board/nokia/rx51/rx51.h
index fa1b42bf21e9..41d8b32e2ec5 100644
--- a/board/nokia/rx51/rx51.h
+++ b/board/nokia/rx51/rx51.h
@@ -13,6 +13,7 @@
 #define _RX51_H_
 
 /* Needed for ROM SMC call */
+#include <asm/types.h>
 struct emu_hal_params_rx51 {
 	u32 num_params;
 	u32 param1;
diff --git a/board/nokia/rx51/tag_omap.h b/board/nokia/rx51/tag_omap.h
index b99d6b7de17f..24ad47297812 100644
--- a/board/nokia/rx51/tag_omap.h
+++ b/board/nokia/rx51/tag_omap.h
@@ -15,6 +15,7 @@
  *  Code copied from maemo kernel 2.6.28 file
  *  arch/arm/plat-omap/include/mach/board.h
  *
+#include <asm/types.h>
  *  Information structures for board-specific data
  *
  *  Copyright (C) 2004	Nokia Corporation
diff --git a/board/nvidia/cardhu/cardhu.c b/board/nvidia/cardhu/cardhu.c
index 1fe5f8517314..3d27d75c7b47 100644
--- a/board/nvidia/cardhu/cardhu.c
+++ b/board/nvidia/cardhu/cardhu.c
@@ -13,6 +13,7 @@
 #include <asm/gpio.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include "pinmux-config-cardhu.h"
 #include <i2c.h>
 
diff --git a/board/nvidia/dalmore/dalmore.c b/board/nvidia/dalmore/dalmore.c
index ac8df9c38061..e3b53f89d65c 100644
--- a/board/nvidia/dalmore/dalmore.c
+++ b/board/nvidia/dalmore/dalmore.c
@@ -10,6 +10,7 @@
 #include <asm/arch/pinmux.h>
 #include <asm/arch/gp_padctrl.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include "pinmux-config-dalmore.h"
 #include <i2c.h>
 
diff --git a/board/nvidia/e2220-1170/e2220-1170.c b/board/nvidia/e2220-1170/e2220-1170.c
index 4c59b61e5da0..b6747ed093fe 100644
--- a/board/nvidia/e2220-1170/e2220-1170.c
+++ b/board/nvidia/e2220-1170/e2220-1170.c
@@ -10,6 +10,7 @@
 #include <stdio.h>
 #include <asm/arch/gpio.h>
 #include <asm/arch/pinmux.h>
+#include <linux/types.h>
 #include "../p2571/max77620_init.h"
 
 void pin_mux_mmc(void)
diff --git a/board/nvidia/p2371-0000/p2371-0000.c b/board/nvidia/p2371-0000/p2371-0000.c
index 4c59b61e5da0..b6747ed093fe 100644
--- a/board/nvidia/p2371-0000/p2371-0000.c
+++ b/board/nvidia/p2371-0000/p2371-0000.c
@@ -10,6 +10,7 @@
 #include <stdio.h>
 #include <asm/arch/gpio.h>
 #include <asm/arch/pinmux.h>
+#include <linux/types.h>
 #include "../p2571/max77620_init.h"
 
 void pin_mux_mmc(void)
diff --git a/board/nvidia/p2371-2180/p2371-2180.c b/board/nvidia/p2371-2180/p2371-2180.c
index 7cc163a467ee..ce3cfad6071a 100644
--- a/board/nvidia/p2371-2180/p2371-2180.c
+++ b/board/nvidia/p2371-2180/p2371-2180.c
@@ -19,6 +19,7 @@
 #include <asm/arch/pinmux.h>
 #include <asm/arch-tegra/cboot.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "../p2571/max77620_init.h"
 
 void pin_mux_mmc(void)
diff --git a/board/nvidia/p2571/p2571.c b/board/nvidia/p2571/p2571.c
index e8760ca51727..ca148425a8e5 100644
--- a/board/nvidia/p2571/p2571.c
+++ b/board/nvidia/p2571/p2571.c
@@ -11,6 +11,7 @@
 #include <asm/arch/gpio.h>
 #include <asm/arch/pinmux.h>
 #include <asm/gpio.h>
+#include <linux/types.h>
 #include "max77620_init.h"
 
 void pin_mux_mmc(void)
diff --git a/board/nvidia/p2771-0000/p2771-0000.c b/board/nvidia/p2771-0000/p2771-0000.c
index b5925f309323..9d60f4bb919d 100644
--- a/board/nvidia/p2771-0000/p2771-0000.c
+++ b/board/nvidia/p2771-0000/p2771-0000.c
@@ -15,6 +15,7 @@
 #include <linux/libfdt.h>
 #include <asm/arch-tegra/cboot.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "../p2571/max77620_init.h"
 
 void pin_mux_mmc(void)
diff --git a/board/nvidia/p3450-0000/p3450-0000.c b/board/nvidia/p3450-0000/p3450-0000.c
index 868bab22ef4c..bb8f86581f9f 100644
--- a/board/nvidia/p3450-0000/p3450-0000.c
+++ b/board/nvidia/p3450-0000/p3450-0000.c
@@ -18,6 +18,7 @@
 #include <asm/arch/gpio.h>
 #include <asm/arch/pinmux.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "../p2571/max77620_init.h"
 
 void pin_mux_mmc(void)
diff --git a/board/nvidia/venice2/as3722_init.c b/board/nvidia/venice2/as3722_init.c
index ba676547d3ec..7b2daed843a6 100644
--- a/board/nvidia/venice2/as3722_init.c
+++ b/board/nvidia/venice2/as3722_init.c
@@ -9,6 +9,7 @@
 #include <asm/io.h>
 #include <asm/arch-tegra/tegra_i2c.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 #include "as3722_init.h"
 
 /* AS3722-PMIC-specific early init code - get CPU rails up, etc */
diff --git a/board/olimex/mx23_olinuxino/spl_boot.c b/board/olimex/mx23_olinuxino/spl_boot.c
index 31d148b885b8..d7b0e3aeb0e2 100644
--- a/board/olimex/mx23_olinuxino/spl_boot.c
+++ b/board/olimex/mx23_olinuxino/spl_boot.c
@@ -12,6 +12,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #define	MUX_CONFIG_EMI	(MXS_PAD_3V3 | MXS_PAD_12MA | MXS_PAD_PULLUP)
 #define	MUX_CONFIG_SSP	(MXS_PAD_8MA | MXS_PAD_PULLUP)
diff --git a/board/phytec/pcl063/pcl063.c b/board/phytec/pcl063/pcl063.c
index cabdaec4e862..45abe371b0be 100644
--- a/board/phytec/pcl063/pcl063.c
+++ b/board/phytec/pcl063/pcl063.c
@@ -16,6 +16,7 @@
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/mach-imx/mxc_i2c.h>
 #include <fsl_esdhc_imx.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <miiphy.h>
 #include <netdev.h>
diff --git a/board/phytec/pcl063/spl.c b/board/phytec/pcl063/spl.c
index 662f3d7e12d3..7242cdc0d8bc 100644
--- a/board/phytec/pcl063/spl.c
+++ b/board/phytec/pcl063/spl.c
@@ -18,6 +18,7 @@
 #include <asm/arch/sys_proto.h>
 #include <fsl_esdhc_imx.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 /* Configuration for Micron MT41K256M16TW-107 IT:P, 32M x 16 x 8 -> 256MiB */
 
diff --git a/board/phytec/pcm052/pcm052.c b/board/phytec/pcm052/pcm052.c
index 4acfa7c1fbc5..f8fea18afaad 100644
--- a/board/phytec/pcm052/pcm052.c
+++ b/board/phytec/pcm052/pcm052.c
@@ -19,6 +19,7 @@
 #include <env.h>
 #include <led.h>
 #include <miiphy.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/phytec/pcm058/pcm058.c b/board/phytec/pcm058/pcm058.c
index 113369b5eacd..201fa57c2391 100644
--- a/board/phytec/pcm058/pcm058.c
+++ b/board/phytec/pcm058/pcm058.c
@@ -20,6 +20,7 @@
 #include <asm/arch/sys_proto.h>
 #include <dm.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/phytec/pfla02/pfla02.c b/board/phytec/pfla02/pfla02.c
index 97986b67f1c4..37e60188c107 100644
--- a/board/phytec/pfla02/pfla02.c
+++ b/board/phytec/pfla02/pfla02.c
@@ -36,6 +36,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/sections.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/phytec/phycore_rk3288/phycore-rk3288.c b/board/phytec/phycore_rk3288/phycore-rk3288.c
index 141707c7b9a0..920f90417667 100644
--- a/board/phytec/phycore_rk3288/phycore-rk3288.c
+++ b/board/phytec/phycore_rk3288/phycore-rk3288.c
@@ -19,6 +19,7 @@
 #include <i2c_eeprom.h>
 #include <netdev.h>
 #include <linux/bitops.h>
+#include <linux/types.h>
 #include "som.h"
 #include <power/regulator.h>
 #include <power/rk8xx_pmic.h>
diff --git a/board/phytec/phycore_rk3288/som.h b/board/phytec/phycore_rk3288/som.h
index f627264f5f61..74604c8ec6c3 100644
--- a/board/phytec/phycore_rk3288/som.h
+++ b/board/phytec/phycore_rk3288/som.h
@@ -5,6 +5,7 @@
  */
 
 /*
+#include <compiler.h>
  * rk3288_som struct represents the eeprom layout for PHYTEC RK3288 based SoMs
  */
 struct rk3288_som {
diff --git a/board/phytium/durian/durian.c b/board/phytium/durian/durian.c
index f694eb099136..34ced5aabaff 100644
--- a/board/phytium/durian/durian.c
+++ b/board/phytium/durian/durian.c
@@ -19,6 +19,7 @@
 #include <linux/arm-smccc.h>
 #include <linux/kernel.h>
 #include <scsi.h>
+#include <linux/types.h>
 #include "cpu.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/pine64/pinebook-pro-rk3399/pinebook-pro-rk3399.c b/board/pine64/pinebook-pro-rk3399/pinebook-pro-rk3399.c
index 4ad780767ead..dfbd96e876fb 100644
--- a/board/pine64/pinebook-pro-rk3399/pinebook-pro-rk3399.c
+++ b/board/pine64/pinebook-pro-rk3399/pinebook-pro-rk3399.c
@@ -12,6 +12,7 @@
 #include <asm/arch-rockchip/grf_rk3399.h>
 #include <asm/arch-rockchip/hardware.h>
 #include <asm/arch-rockchip/misc.h>
+#include <asm/types.h>
 #include <linux/printk.h>
 #include <power/regulator.h>
 
diff --git a/board/pine64/rockpro64_rk3399/rockpro64-rk3399.c b/board/pine64/rockpro64_rk3399/rockpro64-rk3399.c
index d79084614f1f..2215d659d7d3 100644
--- a/board/pine64/rockpro64_rk3399/rockpro64-rk3399.c
+++ b/board/pine64/rockpro64_rk3399/rockpro64-rk3399.c
@@ -12,6 +12,7 @@
 #include <asm/arch-rockchip/grf_rk3399.h>
 #include <asm/arch-rockchip/hardware.h>
 #include <asm/arch-rockchip/misc.h>
+#include <asm/types.h>
 
 #define GRF_IO_VSEL_BT565_SHIFT 0
 #define PMUGRF_CON0_VSEL_SHIFT 8
diff --git a/board/ppcag/bg0900/spl_boot.c b/board/ppcag/bg0900/spl_boot.c
index 7809c844df7d..41ae7b9bdfdd 100644
--- a/board/ppcag/bg0900/spl_boot.c
+++ b/board/ppcag/bg0900/spl_boot.c
@@ -12,6 +12,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #define	MUX_CONFIG_GPMI	(MXS_PAD_3V3 | MXS_PAD_4MA | MXS_PAD_NOPULL)
 #define	MUX_CONFIG_ENET	(MXS_PAD_3V3 | MXS_PAD_8MA | MXS_PAD_PULLUP)
diff --git a/board/qca/ap121/ap121.c b/board/qca/ap121/ap121.c
index 60a2e19143db..15a1da2d6e1b 100644
--- a/board/qca/ap121/ap121.c
+++ b/board/qca/ap121/ap121.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <init.h>
 #include <asm/io.h>
 #include <asm/addrspace.h>
diff --git a/board/qca/ap143/ap143.c b/board/qca/ap143/ap143.c
index ac65054136ca..fa1e2d49332a 100644
--- a/board/qca/ap143/ap143.c
+++ b/board/qca/ap143/ap143.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <init.h>
 #include <asm/io.h>
 #include <asm/addrspace.h>
diff --git a/board/qca/ap152/ap152.c b/board/qca/ap152/ap152.c
index 1064705d2625..f21b7a2c44b0 100644
--- a/board/qca/ap152/ap152.c
+++ b/board/qca/ap152/ap152.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <init.h>
 #include <asm/io.h>
 #include <asm/addrspace.h>
diff --git a/board/qemu-mips/qemu-mips.c b/board/qemu-mips/qemu-mips.c
index 7d00176ffe6a..06eb3c071c41 100644
--- a/board/qemu-mips/qemu-mips.c
+++ b/board/qemu-mips/qemu-mips.c
@@ -13,6 +13,7 @@
 #include <asm/mipsregs.h>
 #include <asm/io.h>
 #include <netdev.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/qualcomm/dragonboard410c/dragonboard410c.c b/board/qualcomm/dragonboard410c/dragonboard410c.c
index ebb7ddb1fb73..b24fcf6077bb 100644
--- a/board/qualcomm/dragonboard410c/dragonboard410c.c
+++ b/board/qualcomm/dragonboard410c/dragonboard410c.c
@@ -23,6 +23,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/qualcomm/dragonboard820c/dragonboard820c.c b/board/qualcomm/dragonboard820c/dragonboard820c.c
index f6115b8f42e4..45d763f2e5bd 100644
--- a/board/qualcomm/dragonboard820c/dragonboard820c.c
+++ b/board/qualcomm/dragonboard820c/dragonboard820c.c
@@ -21,6 +21,7 @@
 #include <linux/bitops.h>
 #include <asm/psci.h>
 #include <asm/gpio.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/raidsonic/ib62x0/ib62x0.c b/board/raidsonic/ib62x0/ib62x0.c
index f9bc07649e0a..fd4ff2ac4a7d 100644
--- a/board/raidsonic/ib62x0/ib62x0.c
+++ b/board/raidsonic/ib62x0/ib62x0.c
@@ -14,6 +14,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
 #include <asm/arch/mpp.h>
+#include <asm/types.h>
 #include "ib62x0.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c
index c074726f1aee..7ab2965724c1 100644
--- a/board/raspberrypi/rpi/rpi.c
+++ b/board/raspberrypi/rpi/rpi.c
@@ -14,6 +14,7 @@
 #include <lcd.h>
 #include <memalign.h>
 #include <mmc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/gpio.h>
@@ -29,6 +30,7 @@
 #include <watchdog.h>
 #include <dm/pinctrl.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/renesas/alt/alt.c b/board/renesas/alt/alt.c
index 854c47636d3f..f19daed3b5be 100644
--- a/board/renesas/alt/alt.c
+++ b/board/renesas/alt/alt.c
@@ -31,6 +31,7 @@
 #include <miiphy.h>
 #include <i2c.h>
 #include <div64.h>
+#include <linux/types.h>
 #include "qos.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/renesas/alt/alt_spl.c b/board/renesas/alt/alt_spl.c
index 44a8d6c720e2..77d627062154 100644
--- a/board/renesas/alt/alt_spl.c
+++ b/board/renesas/alt/alt_spl.c
@@ -21,6 +21,7 @@
 #include <asm/arch/rmobile.h>
 #include <asm/arch/rcar-mstp.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include <spl.h>
 
diff --git a/board/renesas/alt/qos.c b/board/renesas/alt/qos.c
index 2f657505ceb1..ae77996d9b53 100644
--- a/board/renesas/alt/qos.c
+++ b/board/renesas/alt/qos.c
@@ -11,6 +11,7 @@
 #include <asm/mach-types.h>
 #include <asm/io.h>
 #include <asm/arch/rmobile.h>
+#include <asm/types.h>
 
 #if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT)
 /* QoS version 0.311 for ES1 and version 0.321 for ES2 */
diff --git a/board/renesas/blanche/blanche.c b/board/renesas/blanche/blanche.c
index 79bd867c9533..af0fefe93d42 100644
--- a/board/renesas/blanche/blanche.c
+++ b/board/renesas/blanche/blanche.c
@@ -34,6 +34,7 @@
 #include <mmc.h>
 #include <netdev.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include "qos.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/renesas/blanche/qos.c b/board/renesas/blanche/qos.c
index e3ad83ee0c26..98bf0fbc74f1 100644
--- a/board/renesas/blanche/qos.c
+++ b/board/renesas/blanche/qos.c
@@ -10,6 +10,7 @@
 #include <asm/mach-types.h>
 #include <asm/io.h>
 #include <asm/arch/rmobile.h>
+#include <asm/types.h>
 
 #if defined(CONFIG_RMOBILE_EXTRAM_BOOT)
 enum {
diff --git a/board/renesas/condor/condor.c b/board/renesas/condor/condor.c
index 99e7dd6e1e16..7c07ebe767d8 100644
--- a/board/renesas/condor/condor.c
+++ b/board/renesas/condor/condor.c
@@ -16,6 +16,7 @@
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/renesas/draak/draak.c b/board/renesas/draak/draak.c
index bc4ce95a727f..8ecc73d3fda3 100644
--- a/board/renesas/draak/draak.c
+++ b/board/renesas/draak/draak.c
@@ -28,6 +28,7 @@
 #include <asm/arch/sh_sdhi.h>
 #include <i2c.h>
 #include <mmc.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/renesas/eagle/eagle.c b/board/renesas/eagle/eagle.c
index f9e553feaa70..690ebdf5a174 100644
--- a/board/renesas/eagle/eagle.c
+++ b/board/renesas/eagle/eagle.c
@@ -27,6 +27,7 @@
 #include <asm/arch/sh_sdhi.h>
 #include <i2c.h>
 #include <mmc.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/renesas/ebisu/ebisu.c b/board/renesas/ebisu/ebisu.c
index 620d250284a0..ca84aba67633 100644
--- a/board/renesas/ebisu/ebisu.c
+++ b/board/renesas/ebisu/ebisu.c
@@ -27,6 +27,7 @@
 #include <asm/arch/sh_sdhi.h>
 #include <i2c.h>
 #include <mmc.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/renesas/gose/gose.c b/board/renesas/gose/gose.c
index 56cdc73b1a77..c6fc5cf412c8 100644
--- a/board/renesas/gose/gose.c
+++ b/board/renesas/gose/gose.c
@@ -29,6 +29,7 @@
 #include <netdev.h>
 #include <miiphy.h>
 #include <i2c.h>
+#include <linux/types.h>
 #include "qos.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/renesas/gose/gose_spl.c b/board/renesas/gose/gose_spl.c
index d4708c691b9e..916a7880420b 100644
--- a/board/renesas/gose/gose_spl.c
+++ b/board/renesas/gose/gose_spl.c
@@ -21,6 +21,7 @@
 #include <asm/arch/rmobile.h>
 #include <asm/arch/rcar-mstp.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include <spl.h>
 
diff --git a/board/renesas/gose/qos.c b/board/renesas/gose/qos.c
index 1c4ebfc6a8ad..97c9eaf0fc1e 100644
--- a/board/renesas/gose/qos.c
+++ b/board/renesas/gose/qos.c
@@ -11,6 +11,7 @@
 #include <asm/mach-types.h>
 #include <asm/io.h>
 #include <asm/arch/rmobile.h>
+#include <asm/types.h>
 
 #if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT)
 /* QoS version 0.311 */
diff --git a/board/renesas/grpeach/grpeach.c b/board/renesas/grpeach/grpeach.c
index d60a496c958f..e2fca0b46240 100644
--- a/board/renesas/grpeach/grpeach.c
+++ b/board/renesas/grpeach/grpeach.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #define RZA1_WDT_BASE	0xfcfe0000
 #define WTCSR		0x00
diff --git a/board/renesas/koelsch/koelsch.c b/board/renesas/koelsch/koelsch.c
index b0a66ea2669e..4f281dfedb61 100644
--- a/board/renesas/koelsch/koelsch.c
+++ b/board/renesas/koelsch/koelsch.c
@@ -31,6 +31,7 @@
 #include <miiphy.h>
 #include <i2c.h>
 #include <div64.h>
+#include <linux/types.h>
 #include "qos.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/renesas/koelsch/koelsch_spl.c b/board/renesas/koelsch/koelsch_spl.c
index a690022f97bf..ca510511a56d 100644
--- a/board/renesas/koelsch/koelsch_spl.c
+++ b/board/renesas/koelsch/koelsch_spl.c
@@ -21,6 +21,7 @@
 #include <asm/arch/rmobile.h>
 #include <asm/arch/rcar-mstp.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include <spl.h>
 
diff --git a/board/renesas/koelsch/qos.c b/board/renesas/koelsch/qos.c
index f884e5fe6509..f46c69ee4aa5 100644
--- a/board/renesas/koelsch/qos.c
+++ b/board/renesas/koelsch/qos.c
@@ -11,6 +11,7 @@
 #include <asm/mach-types.h>
 #include <asm/io.h>
 #include <asm/arch/rmobile.h>
+#include <asm/types.h>
 
 /* QoS version 0.240 for ES1 and version 0.411 for ES2 */
 #if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT)
diff --git a/board/renesas/lager/lager.c b/board/renesas/lager/lager.c
index add4eef3d53c..c3be543c0849 100644
--- a/board/renesas/lager/lager.c
+++ b/board/renesas/lager/lager.c
@@ -33,6 +33,7 @@
 #include <miiphy.h>
 #include <i2c.h>
 #include <mmc.h>
+#include <linux/types.h>
 #include "qos.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/renesas/lager/lager_spl.c b/board/renesas/lager/lager_spl.c
index 7cb30ba7212d..8f0734e8a287 100644
--- a/board/renesas/lager/lager_spl.c
+++ b/board/renesas/lager/lager_spl.c
@@ -21,6 +21,7 @@
 #include <asm/arch/rmobile.h>
 #include <asm/arch/rcar-mstp.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include <spl.h>
 
diff --git a/board/renesas/lager/qos.c b/board/renesas/lager/qos.c
index f01ca2fac71b..bb5933c2a344 100644
--- a/board/renesas/lager/qos.c
+++ b/board/renesas/lager/qos.c
@@ -10,6 +10,7 @@
 #include <asm/mach-types.h>
 #include <asm/io.h>
 #include <asm/arch/rmobile.h>
+#include <asm/types.h>
 
 /* QoS version 0.955 for ES1 and version 0.973 for ES2 */
 #if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT)
diff --git a/board/renesas/porter/porter.c b/board/renesas/porter/porter.c
index b3e4c08d74d3..8a8d72a20aa9 100644
--- a/board/renesas/porter/porter.c
+++ b/board/renesas/porter/porter.c
@@ -31,6 +31,7 @@
 #include <miiphy.h>
 #include <i2c.h>
 #include <div64.h>
+#include <linux/types.h>
 #include "qos.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/renesas/porter/porter_spl.c b/board/renesas/porter/porter_spl.c
index d2a93fc54567..a007a566da53 100644
--- a/board/renesas/porter/porter_spl.c
+++ b/board/renesas/porter/porter_spl.c
@@ -21,6 +21,7 @@
 #include <asm/arch/rmobile.h>
 #include <asm/arch/rcar-mstp.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include <spl.h>
 
diff --git a/board/renesas/porter/qos.c b/board/renesas/porter/qos.c
index bca54f7f74c6..564f8430fb69 100644
--- a/board/renesas/porter/qos.c
+++ b/board/renesas/porter/qos.c
@@ -12,6 +12,7 @@
 #include <asm/mach-types.h>
 #include <asm/io.h>
 #include <asm/arch/rmobile.h>
+#include <asm/types.h>
 
 /* QoS version 0.240 for ES1 and version 0.334 for ES2 */
 #if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT)
diff --git a/board/renesas/rcar-common/gen3-spl.c b/board/renesas/rcar-common/gen3-spl.c
index fd6e5054a6d1..14dd39e3fccb 100644
--- a/board/renesas/rcar-common/gen3-spl.c
+++ b/board/renesas/rcar-common/gen3-spl.c
@@ -13,6 +13,7 @@
 #include <asm/io.h>
 #include <spl.h>
 #include <linux/bitops.h>
+#include <linux/types.h>
 
 #define RCAR_CNTC_BASE	0xE6080000
 #define CNTCR_EN	BIT(0)
diff --git a/board/renesas/salvator-x/salvator-x.c b/board/renesas/salvator-x/salvator-x.c
index 305968222997..74922ec854c5 100644
--- a/board/renesas/salvator-x/salvator-x.c
+++ b/board/renesas/salvator-x/salvator-x.c
@@ -30,6 +30,7 @@
 #include <i2c.h>
 #include <mmc.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/renesas/sh7757lcr/sh7757lcr.c b/board/renesas/sh7757lcr/sh7757lcr.c
index fca730212f06..aef42e031fe6 100644
--- a/board/renesas/sh7757lcr/sh7757lcr.c
+++ b/board/renesas/sh7757lcr/sh7757lcr.c
@@ -19,6 +19,7 @@
 #include <spi_flash.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 int checkboard(void)
 {
diff --git a/board/renesas/sh7763rdp/sh7763rdp.c b/board/renesas/sh7763rdp/sh7763rdp.c
index 2f11643bb101..b582f78d5811 100644
--- a/board/renesas/sh7763rdp/sh7763rdp.c
+++ b/board/renesas/sh7763rdp/sh7763rdp.c
@@ -12,6 +12,7 @@
 #include <stdio.h>
 #include <asm/io.h>
 #include <asm/processor.h>
+#include <linux/types.h>
 
 #define CPU_CMDREG	0xB1000006
 #define PDCR        0xffef0006
diff --git a/board/renesas/silk/qos.c b/board/renesas/silk/qos.c
index 43a298986573..a153673d1b0d 100644
--- a/board/renesas/silk/qos.c
+++ b/board/renesas/silk/qos.c
@@ -12,6 +12,7 @@
 #include <asm/mach-types.h>
 #include <asm/io.h>
 #include <asm/arch/rmobile.h>
+#include <asm/types.h>
 
 #if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT)
 /* QoS version 0.11 */
diff --git a/board/renesas/silk/silk.c b/board/renesas/silk/silk.c
index 05af5f4d68b1..bb7e78297fbb 100644
--- a/board/renesas/silk/silk.c
+++ b/board/renesas/silk/silk.c
@@ -32,6 +32,7 @@
 #include <miiphy.h>
 #include <i2c.h>
 #include <div64.h>
+#include <linux/types.h>
 #include "qos.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/renesas/silk/silk_spl.c b/board/renesas/silk/silk_spl.c
index b80c6b421ab2..a43c7e973344 100644
--- a/board/renesas/silk/silk_spl.c
+++ b/board/renesas/silk/silk_spl.c
@@ -21,6 +21,7 @@
 #include <asm/arch/rmobile.h>
 #include <asm/arch/rcar-mstp.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include <spl.h>
 
diff --git a/board/renesas/stout/cpld.c b/board/renesas/stout/cpld.c
index 71a3f5dd39cb..27bfcbf2f961 100644
--- a/board/renesas/stout/cpld.c
+++ b/board/renesas/stout/cpld.c
@@ -15,6 +15,7 @@
 #include <asm/io.h>
 #include <asm/gpio.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "cpld.h"
 
 #define SCLK			(92 + 24)
diff --git a/board/renesas/stout/qos.c b/board/renesas/stout/qos.c
index c2f0b8538710..3b09740ac557 100644
--- a/board/renesas/stout/qos.c
+++ b/board/renesas/stout/qos.c
@@ -12,6 +12,7 @@
 #include <asm/mach-types.h>
 #include <asm/io.h>
 #include <asm/arch/rmobile.h>
+#include <asm/types.h>
 
 /* QoS version 0.955 for ES1 and version 0.973 for ES2 */
 #if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT)
diff --git a/board/renesas/stout/stout.c b/board/renesas/stout/stout.c
index 3fdf936ddcac..3be47a1f4a84 100644
--- a/board/renesas/stout/stout.c
+++ b/board/renesas/stout/stout.c
@@ -15,6 +15,7 @@
 #include <netdev.h>
 #include <dm.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <dm/platform_data/serial_sh.h>
 #include <env_internal.h>
 #include <asm/processor.h>
diff --git a/board/renesas/stout/stout_spl.c b/board/renesas/stout/stout_spl.c
index 10efd09139f2..738443ea380c 100644
--- a/board/renesas/stout/stout_spl.c
+++ b/board/renesas/stout/stout_spl.c
@@ -21,6 +21,7 @@
 #include <asm/arch/rmobile.h>
 #include <asm/arch/rcar-mstp.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include <spl.h>
 
diff --git a/board/renesas/ulcb/cpld.c b/board/renesas/ulcb/cpld.c
index 30f96966b574..e281d4910067 100644
--- a/board/renesas/ulcb/cpld.c
+++ b/board/renesas/ulcb/cpld.c
@@ -14,6 +14,7 @@
 #include <asm/io.h>
 #include <dm.h>
 #include <errno.h>
+#include <asm/types.h>
 #include <linux/err.h>
 #include <sysreset.h>
 #include <linux/errno.h>
diff --git a/board/renesas/ulcb/ulcb.c b/board/renesas/ulcb/ulcb.c
index 09711559aef4..d2a8fae28975 100644
--- a/board/renesas/ulcb/ulcb.c
+++ b/board/renesas/ulcb/ulcb.c
@@ -13,6 +13,7 @@
 #include <netdev.h>
 #include <dm.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <dm/platform_data/serial_sh.h>
 #include <asm/processor.h>
 #include <asm/mach-types.h>
diff --git a/board/rockchip/tinker_rk3288/tinker-rk3288.c b/board/rockchip/tinker_rk3288/tinker-rk3288.c
index f85209c6498d..c1418e4593c8 100644
--- a/board/rockchip/tinker_rk3288/tinker-rk3288.c
+++ b/board/rockchip/tinker_rk3288/tinker-rk3288.c
@@ -13,6 +13,7 @@
 #include <netdev.h>
 #include <asm/arch-rockchip/bootrom.h>
 #include <asm/io.h>
+#include <asm/types.h>
 
 static int get_ethaddr_from_eeprom(u8 *addr)
 {
diff --git a/board/samsung/arndale/arndale.c b/board/samsung/arndale/arndale.c
index fa568f76c66e..f715df30a468 100644
--- a/board/samsung/arndale/arndale.c
+++ b/board/samsung/arndale/arndale.c
@@ -14,6 +14,7 @@
 #include <asm/arch/pinmux.h>
 #include <asm/arch/dwmmc.h>
 #include <asm/arch/power.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/samsung/common/board.c b/board/samsung/common/board.c
index e79f5ddd2c9f..fd727330f20e 100644
--- a/board/samsung/common/board.c
+++ b/board/samsung/common/board.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <cros_ec.h>
 #include <env.h>
 #include <errno.h>
@@ -38,6 +39,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <samsung/misc.h>
 #include <dm/pinctrl.h>
 #include <dm.h>
diff --git a/board/samsung/common/exynos5-dt-types.c b/board/samsung/common/exynos5-dt-types.c
index 026fc4abf111..50b36c1b4409 100644
--- a/board/samsung/common/exynos5-dt-types.c
+++ b/board/samsung/common/exynos5-dt-types.c
@@ -9,7 +9,9 @@
 #include <dm.h>
 #include <errno.h>
 #include <fdtdec.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
 #include <power/pmic.h>
diff --git a/board/samsung/common/exynos5-dt.c b/board/samsung/common/exynos5-dt.c
index 1783983ab115..f6e0c2020f78 100644
--- a/board/samsung/common/exynos5-dt.c
+++ b/board/samsung/common/exynos5-dt.c
@@ -29,6 +29,7 @@
 #include <asm/arch/sromc.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/max77686_pmic.h>
 #include <power/regulator.h>
diff --git a/board/samsung/common/misc.c b/board/samsung/common/misc.c
index 30a00892e0c3..80a3109823a8 100644
--- a/board/samsung/common/misc.c
+++ b/board/samsung/common/misc.c
@@ -15,6 +15,7 @@
 #include <linux/delay.h>
 #include <linux/kernel.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 #include <samsung/misc.h>
 #include <errno.h>
 #include <version.h>
diff --git a/board/samsung/goni/goni.c b/board/samsung/goni/goni.c
index 183579c4e3e1..c4661ad43475 100644
--- a/board/samsung/goni/goni.c
+++ b/board/samsung/goni/goni.c
@@ -13,6 +13,7 @@
 #include <asm/gpio.h>
 #include <asm/arch/mmc.h>
 #include <dm.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/board/samsung/origen/origen.c b/board/samsung/origen/origen.c
index e17454ad77da..1e0da03f8b6a 100644
--- a/board/samsung/origen/origen.c
+++ b/board/samsung/origen/origen.c
@@ -11,6 +11,7 @@
 #include <asm/arch/periph.h>
 #include <asm/arch/pinmux.h>
 #include <usb.h>
+#include <asm/types.h>
 
 u32 get_board_rev(void)
 {
diff --git a/board/samsung/smdkc100/smdkc100.c b/board/samsung/smdkc100/smdkc100.c
index 38cfde4f1366..35de29370ad2 100644
--- a/board/samsung/smdkc100/smdkc100.c
+++ b/board/samsung/smdkc100/smdkc100.c
@@ -15,6 +15,7 @@
 #include <asm/arch/sromc.h>
 #include <netdev.h>
 #include <asm/mach-types.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/samsung/smdkv310/smdkv310.c b/board/samsung/smdkv310/smdkv310.c
index 58b71df0817c..2f921acb0aec 100644
--- a/board/samsung/smdkv310/smdkv310.c
+++ b/board/samsung/smdkv310/smdkv310.c
@@ -17,6 +17,7 @@
 #include <asm/arch/periph.h>
 #include <asm/arch/pinmux.h>
 #include <asm/arch/sromc.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/samsung/trats/trats.c b/board/samsung/trats/trats.c
index 18f311da9794..f7862d9d62d5 100644
--- a/board/samsung/trats/trats.c
+++ b/board/samsung/trats/trats.c
@@ -20,6 +20,7 @@
 #include <asm/arch/mipi_dsim.h>
 #include <asm/arch/watchdog.h>
 #include <asm/arch/power.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <power/pmic.h>
diff --git a/board/samsung/trats2/trats2.c b/board/samsung/trats2/trats2.c
index 6b008943da17..6ea1dfd9819a 100644
--- a/board/samsung/trats2/trats2.c
+++ b/board/samsung/trats2/trats2.c
@@ -14,6 +14,7 @@
 #include <asm/arch/pinmux.h>
 #include <asm/arch/power.h>
 #include <asm/arch/mipi_dsim.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <power/pmic.h>
diff --git a/board/samsung/universal_c210/universal.c b/board/samsung/universal_c210/universal.c
index dddf8d279bc7..a4ca5ae18095 100644
--- a/board/samsung/universal_c210/universal.c
+++ b/board/samsung/universal_c210/universal.c
@@ -18,6 +18,7 @@
 #include <asm/arch/pinmux.h>
 #include <asm/arch/watchdog.h>
 #include <ld9040.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <power/pmic.h>
diff --git a/board/sandbox/sandbox.c b/board/sandbox/sandbox.c
index deee7b147df9..6fbcc28e2213 100644
--- a/board/sandbox/sandbox.c
+++ b/board/sandbox/sandbox.c
@@ -19,6 +19,7 @@
 #include <asm/u-boot-sandbox.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 
 /*
  * Pointer to initial global data area
diff --git a/board/sandisk/sansa_fuze_plus/sfp.c b/board/sandisk/sansa_fuze_plus/sfp.c
index 689cd799dd3b..6caf53c532b4 100644
--- a/board/sandisk/sansa_fuze_plus/sfp.c
+++ b/board/sandisk/sansa_fuze_plus/sfp.c
@@ -24,6 +24,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/sandisk/sansa_fuze_plus/spl_boot.c b/board/sandisk/sansa_fuze_plus/spl_boot.c
index 59464877fbf6..9c526865fba0 100644
--- a/board/sandisk/sansa_fuze_plus/spl_boot.c
+++ b/board/sandisk/sansa_fuze_plus/spl_boot.c
@@ -13,6 +13,7 @@
 #include <asm/arch/sys_proto.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define	MUX_CONFIG_EMI	(MXS_PAD_1V8 | MXS_PAD_12MA | MXS_PAD_PULLUP)
 #define	MUX_CONFIG_SSP	(MXS_PAD_3V3 | MXS_PAD_4MA | MXS_PAD_PULLUP)
diff --git a/board/sbc8349/sbc8349.c b/board/sbc8349/sbc8349.c
index f7e7ae7405c2..dc2605ca0e7f 100644
--- a/board/sbc8349/sbc8349.c
+++ b/board/sbc8349/sbc8349.c
@@ -25,6 +25,7 @@
 #endif
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/sbc8548/ddr.c b/board/sbc8548/ddr.c
index 8351a9ca9333..2912413a395f 100644
--- a/board/sbc8548/ddr.c
+++ b/board/sbc8548/ddr.c
@@ -4,11 +4,13 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <i2c.h>
 #include <stdio.h>
 #include <asm/ppc.h>
 #include <linux/delay.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
diff --git a/board/sbc8548/sbc8548.c b/board/sbc8548/sbc8548.c
index 7780b53a2046..20f3e7d229c0 100644
--- a/board/sbc8548/sbc8548.c
+++ b/board/sbc8548/sbc8548.c
@@ -29,6 +29,7 @@
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
+#include <linux/types.h>
 
 void local_bus_init(void);
 
diff --git a/board/sbc8641d/sbc8641d.c b/board/sbc8641d/sbc8641d.c
index cc17f80d07db..ad1502c9297a 100644
--- a/board/sbc8641d/sbc8641d.c
+++ b/board/sbc8641d/sbc8641d.c
@@ -26,6 +26,7 @@
 #include <linux/delay.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/schulercontrol/sc_sps_1/spl_boot.c b/board/schulercontrol/sc_sps_1/spl_boot.c
index a58fde351a18..dbd1833bdd36 100644
--- a/board/schulercontrol/sc_sps_1/spl_boot.c
+++ b/board/schulercontrol/sc_sps_1/spl_boot.c
@@ -13,6 +13,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #define	MUX_CONFIG_LED	(MXS_PAD_3V3 | MXS_PAD_4MA | MXS_PAD_NOPULL)
 #define	MUX_CONFIG_SSP0	(MXS_PAD_3V3 | MXS_PAD_12MA | MXS_PAD_PULLUP)
diff --git a/board/seco/mx6quq7/mx6quq7.c b/board/seco/mx6quq7/mx6quq7.c
index e022e057b643..87577514dced 100644
--- a/board/seco/mx6quq7/mx6quq7.c
+++ b/board/seco/mx6quq7/mx6quq7.c
@@ -34,6 +34,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/mach-imx/mxc_i2c.h>
 #include <i2c.h>
+#include <linux/types.h>
 
 #include "../common/mx6.h"
 
diff --git a/board/seeed/linkit-smart-7688/board.c b/board/seeed/linkit-smart-7688/board.c
index bf7c69ea8389..2653fac73c6b 100644
--- a/board/seeed/linkit-smart-7688/board.c
+++ b/board/seeed/linkit-smart-7688/board.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <init.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
diff --git a/board/siemens/capricorn/board.c b/board/siemens/capricorn/board.c
index 433fba067b96..641f0c29ba91 100644
--- a/board/siemens/capricorn/board.c
+++ b/board/siemens/capricorn/board.c
@@ -7,6 +7,7 @@
  */
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <dm.h>
 #include <env.h>
 #include <errno.h>
@@ -33,6 +34,7 @@
 #include <linux/delay.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "../common/factoryset.h"
 
 #define GPIO_PAD_CTRL \
diff --git a/board/siemens/capricorn/spl.c b/board/siemens/capricorn/spl.c
index da8936291725..511bcc92f905 100644
--- a/board/siemens/capricorn/spl.c
+++ b/board/siemens/capricorn/spl.c
@@ -15,6 +15,7 @@
 #include <dm/uclass-internal.h>
 #include <dm/device-internal.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/siemens/common/factoryset.c b/board/siemens/common/factoryset.c
index d60ef4e87cd7..dbd09292d002 100644
--- a/board/siemens/common/factoryset.c
+++ b/board/siemens/common/factoryset.c
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
  *
+#include <linux/types.h>
  * Read FactorySet information from EEPROM into global structure.
  * (C) Copyright 2013 Siemens Schweiz AG
  */
diff --git a/board/siemens/common/factoryset.h b/board/siemens/common/factoryset.h
index 261a21768791..fb9da221a1b6 100644
--- a/board/siemens/common/factoryset.h
+++ b/board/siemens/common/factoryset.h
@@ -7,6 +7,7 @@
 #ifndef __FACTORYSET_H
 #define __FACTORYSET_H
 
+#include <linux/types.h>
 #define MAX_STRING_LENGTH	32
 
 struct factorysetcontainer {
diff --git a/board/siemens/corvus/board.c b/board/siemens/corvus/board.c
index fbccbb0f6da1..88631131cd9e 100644
--- a/board/siemens/corvus/board.c
+++ b/board/siemens/corvus/board.c
@@ -31,6 +31,7 @@
 #include <netdev.h>
 #endif
 #include <spi.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 
 #ifdef CONFIG_USB_GADGET_ATMEL_USBA
diff --git a/board/siemens/draco/board.c b/board/siemens/draco/board.c
index 7fa7d632ae2d..159901231c5b 100644
--- a/board/siemens/draco/board.c
+++ b/board/siemens/draco/board.c
@@ -39,6 +39,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include "board.h"
 #include "../common/factoryset.h"
 #include <nand.h>
diff --git a/board/siemens/pxm2/board.c b/board/siemens/pxm2/board.c
index 18b397c61d40..55dac4a7b929 100644
--- a/board/siemens/pxm2/board.c
+++ b/board/siemens/pxm2/board.c
@@ -32,6 +32,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "../../../drivers/video/da8xx-fb.h"
 #include <asm/io.h>
 #include <asm/emif.h>
diff --git a/board/siemens/rut/board.c b/board/siemens/rut/board.c
index 7be23e97967b..4311877aff3c 100644
--- a/board/siemens/rut/board.c
+++ b/board/siemens/rut/board.c
@@ -18,6 +18,7 @@
 #include <net.h>
 #include <spi.h>
 #include <spl.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/arch/cpu.h>
@@ -36,6 +37,7 @@
 #include <cpsw.h>
 #include <video.h>
 #include <watchdog.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
diff --git a/board/sifive/fu540/fu540.c b/board/sifive/fu540/fu540.c
index 2ca4dcbe492e..ab769c99fdfc 100644
--- a/board/sifive/fu540/fu540.c
+++ b/board/sifive/fu540/fu540.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/bug.h>
 #include <linux/delay.h>
diff --git a/board/sifive/fu540/spl.c b/board/sifive/fu540/spl.c
index f60acc87b2c6..9d5d3c390031 100644
--- a/board/sifive/fu540/spl.c
+++ b/board/sifive/fu540/spl.c
@@ -16,6 +16,7 @@
 #include <asm/gpio.h>
 #include <asm/arch/gpio.h>
 #include <asm/arch/spl.h>
+#include <linux/types.h>
 
 #define GEM_PHY_RESET		SIFIVE_GENERIC_GPIO_NR(0, 12)
 
diff --git a/board/sks-kinkel/sksimx6/sksimx6.c b/board/sks-kinkel/sksimx6/sksimx6.c
index 15c75959e6ad..ffea5a53ce23 100644
--- a/board/sks-kinkel/sksimx6/sksimx6.c
+++ b/board/sks-kinkel/sksimx6/sksimx6.c
@@ -29,6 +29,7 @@
 #include <miiphy.h>
 #include <micrel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <common.h>
 #include <malloc.h>
diff --git a/board/socrates/nand.c b/board/socrates/nand.c
index 3fca5d063caf..c82806b0ef5a 100644
--- a/board/socrates/nand.c
+++ b/board/socrates/nand.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <stdio.h>
+#include <linux/types.h>
 
 #if defined(CONFIG_SYS_NAND_BASE)
 #include <nand.h>
diff --git a/board/socrates/sdram.c b/board/socrates/sdram.c
index d358a209a4a3..4775684dd617 100644
--- a/board/socrates/sdram.c
+++ b/board/socrates/sdram.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <init.h>
 #include <asm/processor.h>
 #include <asm/immap_85xx.h>
@@ -13,6 +14,7 @@
 #include <asm/mmu.h>
 #include <spd_sdram.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 
 #if !defined(CONFIG_SPD_EEPROM)
diff --git a/board/socrates/socrates.c b/board/socrates/socrates.c
index 96cde5afcbee..96a59b92697b 100644
--- a/board/socrates/socrates.c
+++ b/board/socrates/socrates.c
@@ -30,6 +30,7 @@
 #include <i2c.h>
 #include <mb862xx.h>
 #include <video_fb.h>
+#include <linux/types.h>
 #include "upm_table.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/softing/vining_2000/vining_2000.c b/board/softing/vining_2000/vining_2000.c
index d72aee47ca9c..74e646ad781f 100644
--- a/board/softing/vining_2000/vining_2000.c
+++ b/board/softing/vining_2000/vining_2000.c
@@ -6,6 +6,7 @@
  * Author: Christoph Fritz <chf.fritz@googlemail.com>
  */
 
+#include <compiler.h>
 #include <init.h>
 #include <net.h>
 #include <stdio.h>
@@ -34,6 +35,7 @@
 #include <miiphy.h>
 #include <netdev.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/pfuze100_pmic.h>
 #include <usb.h>
diff --git a/board/softing/vining_fpga/qts/pinmux_config.h b/board/softing/vining_fpga/qts/pinmux_config.h
index f73ccbbabee3..42c807cebc8f 100644
--- a/board/softing/vining_fpga/qts/pinmux_config.h
+++ b/board/softing/vining_fpga/qts/pinmux_config.h
@@ -6,6 +6,7 @@
 #ifndef __SOCFPGA_PINMUX_CONFIG_H__
 #define __SOCFPGA_PINMUX_CONFIG_H__
 
+#include <asm/types.h>
 const u8 sys_mgr_init_table[] = {
 	0, /* EMACIO0 */
 	2, /* EMACIO1 */
diff --git a/board/softing/vining_fpga/qts/sdram_config.h b/board/softing/vining_fpga/qts/sdram_config.h
index ec067eb473d1..22e0e4d5e281 100644
--- a/board/softing/vining_fpga/qts/sdram_config.h
+++ b/board/softing/vining_fpga/qts/sdram_config.h
@@ -7,6 +7,7 @@
 #define __SOCFPGA_SDRAM_CONFIG_H__
 
 /* SDRAM configuration */
+#include <asm/types.h>
 #define CONFIG_HPS_SDR_CTRLCFG_CPORTRDWR_CPORTRDWR		0x5A56A
 #define CONFIG_HPS_SDR_CTRLCFG_CPORTRMAP_CPORTRMAP		0xB00088
 #define CONFIG_HPS_SDR_CTRLCFG_CPORTWIDTH_CPORTWIDTH		0x44555
diff --git a/board/softing/vining_fpga/socfpga.c b/board/softing/vining_fpga/socfpga.c
index ade287493bc2..992976fce2b1 100644
--- a/board/softing/vining_fpga/socfpga.c
+++ b/board/softing/vining_fpga/socfpga.c
@@ -18,6 +18,7 @@
 #include <i2c.h>
 #include <linux/delay.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/solidrun/clearfog/clearfog.c b/board/solidrun/clearfog/clearfog.c
index 83e789b99f77..4c762b39c834 100644
--- a/board/solidrun/clearfog/clearfog.c
+++ b/board/solidrun/clearfog/clearfog.c
@@ -10,11 +10,13 @@
 #include <miiphy.h>
 #include <net.h>
 #include <netdev.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/board/solidrun/common/tlv_data.c b/board/solidrun/common/tlv_data.c
index 315faeb61404..ab1106949ec0 100644
--- a/board/solidrun/common/tlv_data.c
+++ b/board/solidrun/common/tlv_data.c
@@ -5,7 +5,9 @@
 
 #include <common.h>
 #include <compiler.h>
+#include <stdbool.h>
 #include <tlv_eeprom.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include "tlv_data.h"
diff --git a/board/solidrun/mx6cuboxi/mx6cuboxi.c b/board/solidrun/mx6cuboxi/mx6cuboxi.c
index 40fbd85bde75..401b9cc4924a 100644
--- a/board/solidrun/mx6cuboxi/mx6cuboxi.c
+++ b/board/solidrun/mx6cuboxi/mx6cuboxi.c
@@ -17,6 +17,7 @@
 #include <image.h>
 #include <init.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/arch/clock.h>
@@ -42,6 +43,7 @@
 #include <usb.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <usb/ehci-ci.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/spear/spear300/spear300.c b/board/spear/spear300/spear300.c
index 1fe825182f33..a29c59c2d8d7 100644
--- a/board/spear/spear300/spear300.c
+++ b/board/spear/spear300/spear300.c
@@ -10,6 +10,7 @@
 #include <netdev.h>
 #include <nand.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/mtd/fsmc_nand.h>
 #include <asm/mach-types.h>
diff --git a/board/spear/spear310/spear310.c b/board/spear/spear310/spear310.c
index 721b1dd4aa54..06a697b9a405 100644
--- a/board/spear/spear310/spear310.c
+++ b/board/spear/spear310/spear310.c
@@ -11,6 +11,7 @@
 #include <netdev.h>
 #include <nand.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/mtd/fsmc_nand.h>
 #include <asm/mach-types.h>
diff --git a/board/spear/spear320/spear320.c b/board/spear/spear320/spear320.c
index f726f8fccf0c..23fc12cdfa49 100644
--- a/board/spear/spear320/spear320.c
+++ b/board/spear/spear320/spear320.c
@@ -11,6 +11,7 @@
 #include <netdev.h>
 #include <nand.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/mtd/fsmc_nand.h>
 #include <asm/mach-types.h>
diff --git a/board/spear/spear600/spear600.c b/board/spear/spear600/spear600.c
index 0c01f1fbf9ee..101c8f15c099 100644
--- a/board/spear/spear600/spear600.c
+++ b/board/spear/spear600/spear600.c
@@ -10,6 +10,7 @@
 #include <netdev.h>
 #include <nand.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/mtd/fsmc_nand.h>
 #include <asm/mach-types.h>
diff --git a/board/spear/x600/fpga.c b/board/spear/x600/fpga.c
index 5140694b9e85..f8f3581c730d 100644
--- a/board/spear/x600/fpga.c
+++ b/board/spear/x600/fpga.c
@@ -12,6 +12,7 @@
 #include <asm/arch/hardware.h>
 #include <asm/arch/spr_misc.h>
 #include <asm/arch/spr_ssp.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 /*
diff --git a/board/sr1500/qts/pinmux_config.h b/board/sr1500/qts/pinmux_config.h
index a8b8dbadeffb..65857d10a1ba 100644
--- a/board/sr1500/qts/pinmux_config.h
+++ b/board/sr1500/qts/pinmux_config.h
@@ -6,6 +6,7 @@
 #ifndef __SOCFPGA_PINMUX_CONFIG_H__
 #define __SOCFPGA_PINMUX_CONFIG_H__
 
+#include <asm/types.h>
 const u8 sys_mgr_init_table[] = {
 	0, /* EMACIO0 */
 	2, /* EMACIO1 */
diff --git a/board/sr1500/qts/sdram_config.h b/board/sr1500/qts/sdram_config.h
index d25354bb49cd..711a71ba9b3f 100644
--- a/board/sr1500/qts/sdram_config.h
+++ b/board/sr1500/qts/sdram_config.h
@@ -7,6 +7,7 @@
 #define __SOCFPGA_SDRAM_CONFIG_H__
 
 /* SDRAM configuration */
+#include <asm/types.h>
 #define CONFIG_HPS_SDR_CTRLCFG_CPORTRDWR_CPORTRDWR		0x5A56A
 #define CONFIG_HPS_SDR_CTRLCFG_CPORTRMAP_CPORTRMAP		0xB00088
 #define CONFIG_HPS_SDR_CTRLCFG_CPORTWIDTH_CPORTWIDTH		0x44555
diff --git a/board/st/common/stm32mp_dfu.c b/board/st/common/stm32mp_dfu.c
index 0439e1d5bfe3..0f30381854ed 100644
--- a/board/st/common/stm32mp_dfu.c
+++ b/board/st/common/stm32mp_dfu.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <blk.h>
+#include <compiler.h>
 #include <dm.h>
 #include <dfu.h>
 #include <env.h>
@@ -16,6 +17,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/arch/stm32prog.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
diff --git a/board/st/common/stpmic1.c b/board/st/common/stpmic1.c
index 7aa858517380..d7c8890eb3f4 100644
--- a/board/st/common/stpmic1.c
+++ b/board/st/common/stpmic1.c
@@ -9,6 +9,7 @@
 #include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/ddr.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <power/pmic.h>
diff --git a/board/st/common/stpmic1.h b/board/st/common/stpmic1.h
index b17d6f163381..6d172aae467e 100644
--- a/board/st/common/stpmic1.h
+++ b/board/st/common/stpmic1.h
@@ -3,4 +3,5 @@
  * Copyright (C) 2020, STMicroelectronics - All Rights Reserved
  */
 
+#include <asm/types.h>
 void stpmic1_init(u32 voltage_mv);
diff --git a/board/st/stm32f429-discovery/stm32f429-discovery.c b/board/st/stm32f429-discovery/stm32f429-discovery.c
index c0e8c7575e2b..f0f2278a7a8a 100644
--- a/board/st/stm32f429-discovery/stm32f429-discovery.c
+++ b/board/st/stm32f429-discovery/stm32f429-discovery.c
@@ -18,6 +18,7 @@
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #include <asm/io.h>
 #include <asm/arch/stm32.h>
diff --git a/board/st/stm32f429-evaluation/stm32f429-evaluation.c b/board/st/stm32f429-evaluation/stm32f429-evaluation.c
index af34d9cea3cb..ee377ffba6c6 100644
--- a/board/st/stm32f429-evaluation/stm32f429-evaluation.c
+++ b/board/st/stm32f429-evaluation/stm32f429-evaluation.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 
 #include <asm/io.h>
diff --git a/board/st/stm32f469-discovery/stm32f469-discovery.c b/board/st/stm32f469-discovery/stm32f469-discovery.c
index 18da5ed2bcdf..d7d55d30cba0 100644
--- a/board/st/stm32f469-discovery/stm32f469-discovery.c
+++ b/board/st/stm32f469-discovery/stm32f469-discovery.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 
 #include <asm/io.h>
diff --git a/board/st/stm32f746-disco/stm32f746-disco.c b/board/st/stm32f746-disco/stm32f746-disco.c
index ba3a1682d6cd..383ec73f8468 100644
--- a/board/st/stm32f746-disco/stm32f746-disco.c
+++ b/board/st/stm32f746-disco/stm32f746-disco.c
@@ -26,6 +26,7 @@
 #include <asm/arch/syscfg.h>
 #include <asm/gpio.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/st/stm32h743-disco/stm32h743-disco.c b/board/st/stm32h743-disco/stm32h743-disco.c
index f1a72e1d22e2..1a219c9c336d 100644
--- a/board/st/stm32h743-disco/stm32h743-disco.c
+++ b/board/st/stm32h743-disco/stm32h743-disco.c
@@ -9,6 +9,7 @@
 #include <init.h>
 #include <log.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/st/stm32h743-eval/stm32h743-eval.c b/board/st/stm32h743-eval/stm32h743-eval.c
index f1a72e1d22e2..1a219c9c336d 100644
--- a/board/st/stm32h743-eval/stm32h743-eval.c
+++ b/board/st/stm32h743-eval/stm32h743-eval.c
@@ -9,6 +9,7 @@
 #include <init.h>
 #include <log.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/st/stm32mp1/spl.c b/board/st/stm32mp1/spl.c
index a6a41780c96f..d6c8bddad856 100644
--- a/board/st/stm32mp1/spl.c
+++ b/board/st/stm32mp1/spl.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include "../common/stpmic1.h"
diff --git a/board/st/stm32mp1/stm32mp1.c b/board/st/stm32mp1/stm32mp1.c
index 9c3857a31b1c..4740a5ec5e08 100644
--- a/board/st/stm32mp1/stm32mp1.c
+++ b/board/st/stm32mp1/stm32mp1.c
@@ -26,6 +26,7 @@
 #include <phy.h>
 #include <remoteproc.h>
 #include <reset.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <syscon.h>
 #include <usb.h>
@@ -46,6 +47,7 @@
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <power/regulator.h>
 #include <usb/dwc2_udc.h>
 
diff --git a/board/st/stv0991/stv0991.c b/board/st/stv0991/stv0991.c
index bd2d56d6d59b..8e44c8e2ad75 100644
--- a/board/st/stv0991/stv0991.c
+++ b/board/st/stv0991/stv0991.c
@@ -18,6 +18,7 @@
 #include <netdev.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <dm/platform_data/serial_pl01x.h>
 
diff --git a/board/sunxi/board.c b/board/sunxi/board.c
index f49984238f1c..fb547d304550 100644
--- a/board/sunxi/board.c
+++ b/board/sunxi/board.c
@@ -36,6 +36,7 @@
 #include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <u-boot/crc.h>
 #ifndef CONFIG_ARM64
 #include <asm/armv7.h>
diff --git a/board/synopsys/axs10x/axs10x.c b/board/synopsys/axs10x/axs10x.c
index 8faaf8045c1d..7fb1ff2722e9 100644
--- a/board/synopsys/axs10x/axs10x.c
+++ b/board/synopsys/axs10x/axs10x.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <dwmmc.h>
 #include <init.h>
@@ -11,6 +12,7 @@
 #include <stdio.h>
 #include <asm/arcregs.h>
 #include <asm/global_data.h>
+#include <linux/types.h>
 #include "axs10x.h"
 #include <asm/cache.h>
 
diff --git a/board/synopsys/emsdp/emsdp.c b/board/synopsys/emsdp/emsdp.c
index 995514eab58f..db9d2514389a 100644
--- a/board/synopsys/emsdp/emsdp.c
+++ b/board/synopsys/emsdp/emsdp.c
@@ -14,6 +14,7 @@
 #include <linux/bitops.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <asm/arcregs.h>
 
diff --git a/board/synopsys/hsdk/clk-lib.c b/board/synopsys/hsdk/clk-lib.c
index 295e80afe722..d8da3ceed3f3 100644
--- a/board/synopsys/hsdk/clk-lib.c
+++ b/board/synopsys/hsdk/clk-lib.c
@@ -11,6 +11,7 @@
 #include <dm/device.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 #include "clk-lib.h"
 
diff --git a/board/synopsys/hsdk/clk-lib.h b/board/synopsys/hsdk/clk-lib.h
index 970bcd4a17e7..3d48ac5485f2 100644
--- a/board/synopsys/hsdk/clk-lib.h
+++ b/board/synopsys/hsdk/clk-lib.h
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <linux/bitops.h>
+#include <linux/types.h>
 
 enum clk_ctl_ops {
 	CLK_SET		= BIT(0), /* set frequency */
diff --git a/board/synopsys/hsdk/env-lib.h b/board/synopsys/hsdk/env-lib.h
index b745442775c1..545a19a05521 100644
--- a/board/synopsys/hsdk/env-lib.h
+++ b/board/synopsys/hsdk/env-lib.h
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <config.h>
 #include <stdbool.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 
 enum env_type {
diff --git a/board/synopsys/hsdk/hsdk.c b/board/synopsys/hsdk/hsdk.c
index 0812126a98d4..9b21315eedb9 100644
--- a/board/synopsys/hsdk/hsdk.c
+++ b/board/synopsys/hsdk/hsdk.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <config.h>
 #include <cpu_func.h>
 #include <env.h>
@@ -13,6 +14,7 @@
 #include <init.h>
 #include <irq_func.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/cache.h>
@@ -29,6 +31,7 @@
 #include <malloc.h>
 #include <usb.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "clk-lib.h"
 #include "env-lib.h"
diff --git a/board/synopsys/iot_devkit/iot_devkit.c b/board/synopsys/iot_devkit/iot_devkit.c
index 50af75fb7e27..96b01e7ff1e0 100644
--- a/board/synopsys/iot_devkit/iot_devkit.c
+++ b/board/synopsys/iot_devkit/iot_devkit.c
@@ -14,6 +14,7 @@
 #include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <fdtdec.h>
+#include <linux/types.h>
 
 #include <asm/arcregs.h>
 
diff --git a/board/sysam/amcore/amcore.c b/board/sysam/amcore/amcore.c
index 183a78d9ed77..4936f6d9daac 100644
--- a/board/sysam/amcore/amcore.c
+++ b/board/sysam/amcore/amcore.c
@@ -14,6 +14,7 @@
 #include <asm/immap.h>
 #include <asm/io.h>
 #include <dm.h>
+#include <asm/types.h>
 #include <dm/platform_data/serial_coldfire.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/sysam/stmark2/stmark2.c b/board/sysam/stmark2/stmark2.c
index 4c75bd6a5bec..d17bd83e0208 100644
--- a/board/sysam/stmark2/stmark2.c
+++ b/board/sysam/stmark2/stmark2.c
@@ -14,6 +14,7 @@
 #include <asm/immap.h>
 #include <mmc.h>
 #include <fsl_esdhc.h>
+#include <asm/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/tbs/tbs2910/tbs2910.c b/board/tbs/tbs2910/tbs2910.c
index 83294a67a42c..b794e4978af1 100644
--- a/board/tbs/tbs2910/tbs2910.c
+++ b/board/tbs/tbs2910/tbs2910.c
@@ -23,6 +23,7 @@
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 DECLARE_GLOBAL_DATA_PTR;
 
 #define UART_PAD_CTRL  (PAD_CTL_PUS_100K_UP |			\
diff --git a/board/tcl/sl50/board.c b/board/tcl/sl50/board.c
index 7adaea5d5874..0f846e1eb24a 100644
--- a/board/tcl/sl50/board.c
+++ b/board/tcl/sl50/board.c
@@ -32,6 +32,7 @@
 #include <miiphy.h>
 #include <cpsw.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 #include <power/tps65217.h>
 #include <power/tps65910.h>
 #include <env_internal.h>
diff --git a/board/technexion/pico-imx6/pico-imx6.c b/board/technexion/pico-imx6/pico-imx6.c
index 24e8376d786e..05ff535cbfe0 100644
--- a/board/technexion/pico-imx6/pico-imx6.c
+++ b/board/technexion/pico-imx6/pico-imx6.c
@@ -30,6 +30,7 @@
 #include <miiphy.h>
 #include <netdev.h>
 #include <phy.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/technexion/pico-imx6/spl.c b/board/technexion/pico-imx6/spl.c
index dd5e154e6711..32f7fa24e634 100644
--- a/board/technexion/pico-imx6/spl.c
+++ b/board/technexion/pico-imx6/spl.c
@@ -26,6 +26,7 @@
 #include <asm/arch/sys_proto.h>
 #include <spl.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #if defined(CONFIG_SPL_BUILD)
 #include <asm/arch/mx6-ddr.h>
diff --git a/board/technexion/pico-imx6ul/pico-imx6ul.c b/board/technexion/pico-imx6ul/pico-imx6ul.c
index 5ba16bcba585..0793efd80eff 100644
--- a/board/technexion/pico-imx6ul/pico-imx6ul.c
+++ b/board/technexion/pico-imx6ul/pico-imx6ul.c
@@ -21,6 +21,7 @@
 #include <common.h>
 #include <miiphy.h>
 #include <netdev.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/board/technexion/pico-imx6ul/spl.c b/board/technexion/pico-imx6ul/spl.c
index 55d19728af31..989c6919e7ae 100644
--- a/board/technexion/pico-imx6ul/spl.c
+++ b/board/technexion/pico-imx6ul/spl.c
@@ -21,6 +21,7 @@
 #include <linux/libfdt.h>
 #include <spl.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #if defined(CONFIG_SPL_BUILD)
 
diff --git a/board/technexion/pico-imx7d/spl.c b/board/technexion/pico-imx7d/spl.c
index 50604f196f2c..811e84de9687 100644
--- a/board/technexion/pico-imx7d/spl.c
+++ b/board/technexion/pico-imx7d/spl.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <init.h>
+#include <stdbool.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/crm_regs.h>
@@ -21,6 +22,7 @@
 #include <asm/u-boot.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #if defined(CONFIG_SPL_BUILD)
 
diff --git a/board/technexion/pico-imx8mq/spl.c b/board/technexion/pico-imx8mq/spl.c
index e2d557732f66..f5ed05f234e5 100644
--- a/board/technexion/pico-imx8mq/spl.c
+++ b/board/technexion/pico-imx8mq/spl.c
@@ -25,6 +25,7 @@
 #include <spl.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "lpddr4_timing.h"
 
diff --git a/board/technologic/ts4600/iomux.c b/board/technologic/ts4600/iomux.c
index 5ef69154254f..0ba85499142c 100644
--- a/board/technologic/ts4600/iomux.c
+++ b/board/technologic/ts4600/iomux.c
@@ -20,6 +20,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #define	MUX_CONFIG_SSP0	(MXS_PAD_3V3 | MXS_PAD_8MA | MXS_PAD_PULLUP)
 #define	MUX_CONFIG_EMI	(MXS_PAD_3V3 | MXS_PAD_12MA | MXS_PAD_NOPULL)
diff --git a/board/technologic/ts4800/ts4800.c b/board/technologic/ts4800/ts4800.c
index c2a28ccf63be..72e3091c1b82 100644
--- a/board/technologic/ts4800/ts4800.c
+++ b/board/technologic/ts4800/ts4800.c
@@ -29,6 +29,7 @@
 #include <fsl_esdhc_imx.h>
 #include <mc13892.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include <malloc.h>
 #include <netdev.h>
diff --git a/board/technologic/ts4800/ts4800.h b/board/technologic/ts4800/ts4800.h
index 25644f523acb..df3813e363b1 100644
--- a/board/technologic/ts4800/ts4800.h
+++ b/board/technologic/ts4800/ts4800.h
@@ -6,6 +6,7 @@
 #ifndef _TS4800_H
 #define _TS4800_H
 
+#include <asm/types.h>
 #define TS4800_SYSCON_BASE 0xb0010000
 
 struct ts4800_wtd_regs {
diff --git a/board/terasic/de0-nano-soc/qts/pinmux_config.h b/board/terasic/de0-nano-soc/qts/pinmux_config.h
index 3058ee3a5942..f9fb07b5e057 100644
--- a/board/terasic/de0-nano-soc/qts/pinmux_config.h
+++ b/board/terasic/de0-nano-soc/qts/pinmux_config.h
@@ -7,6 +7,7 @@
 #define __SOCFPGA_PINMUX_CONFIG_H__
 
 /* pin MUX configuration data */
+#include <asm/types.h>
 const u8 sys_mgr_init_table[] = {
 	0, /* EMACIO0 */
 	2, /* EMACIO1 */
diff --git a/board/terasic/de0-nano-soc/qts/sdram_config.h b/board/terasic/de0-nano-soc/qts/sdram_config.h
index 0504dd688f9b..b9363d87e686 100644
--- a/board/terasic/de0-nano-soc/qts/sdram_config.h
+++ b/board/terasic/de0-nano-soc/qts/sdram_config.h
@@ -5,6 +5,7 @@
 #ifndef __SDRAM_CONFIG_H
 #define __SDRAM_CONFIG_H
 
+#include <asm/types.h>
 #define CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_MEMTYPE			2
 #define CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_MEMBL			8
 #define CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_ADDRORDER		0
diff --git a/board/terasic/de1-soc/qts/pinmux_config.h b/board/terasic/de1-soc/qts/pinmux_config.h
index c75635005cc7..f5bf0567b00c 100644
--- a/board/terasic/de1-soc/qts/pinmux_config.h
+++ b/board/terasic/de1-soc/qts/pinmux_config.h
@@ -6,6 +6,7 @@
 #ifndef __SOCFPGA_PINMUX_CONFIG_H__
 #define __SOCFPGA_PINMUX_CONFIG_H__
 
+#include <asm/types.h>
 const u8 sys_mgr_init_table[] = {
 	0, /* EMACIO0 */
 	2, /* EMACIO1 */
diff --git a/board/terasic/de1-soc/qts/sdram_config.h b/board/terasic/de1-soc/qts/sdram_config.h
index c60426f2ff66..550bd50f7a67 100644
--- a/board/terasic/de1-soc/qts/sdram_config.h
+++ b/board/terasic/de1-soc/qts/sdram_config.h
@@ -7,6 +7,7 @@
 #define __SOCFPGA_SDRAM_CONFIG_H__
 
 /* SDRAM configuration */
+#include <asm/types.h>
 #define CONFIG_HPS_SDR_CTRLCFG_CPORTRDWR_CPORTRDWR		0x5A56A
 #define CONFIG_HPS_SDR_CTRLCFG_CPORTRMAP_CPORTRMAP		0xB00088
 #define CONFIG_HPS_SDR_CTRLCFG_CPORTWIDTH_CPORTWIDTH		0x44555
diff --git a/board/terasic/de1-soc/socfpga.c b/board/terasic/de1-soc/socfpga.c
index 22fbee40aba9..2e516ed53bea 100644
--- a/board/terasic/de1-soc/socfpga.c
+++ b/board/terasic/de1-soc/socfpga.c
@@ -4,6 +4,7 @@
  */
 #include <common.h>
 #include <spl.h>
+#include <asm/types.h>
 
 void board_boot_order(u32 *spl_boot_list)
 {
diff --git a/board/terasic/de10-nano/qts/pinmux_config.h b/board/terasic/de10-nano/qts/pinmux_config.h
index 6a9c4150296f..ca5b3e746a68 100644
--- a/board/terasic/de10-nano/qts/pinmux_config.h
+++ b/board/terasic/de10-nano/qts/pinmux_config.h
@@ -6,6 +6,7 @@
 #ifndef __SOCFPGA_PINMUX_CONFIG_H__
 #define __SOCFPGA_PINMUX_CONFIG_H__
 
+#include <asm/types.h>
 const u8 sys_mgr_init_table[] = {
 	0, /* EMACIO0 */
 	2, /* EMACIO1 */
diff --git a/board/terasic/de10-nano/qts/sdram_config.h b/board/terasic/de10-nano/qts/sdram_config.h
index 26910ef348b7..2fa5e537b1a3 100644
--- a/board/terasic/de10-nano/qts/sdram_config.h
+++ b/board/terasic/de10-nano/qts/sdram_config.h
@@ -7,6 +7,7 @@
 #define __SOCFPGA_SDRAM_CONFIG_H__
 
 /* SDRAM configuration */
+#include <asm/types.h>
 #define CONFIG_HPS_SDR_CTRLCFG_CPORTRDWR_CPORTRDWR		0x5A56A
 #define CONFIG_HPS_SDR_CTRLCFG_CPORTRMAP_CPORTRMAP		0xB00088
 #define CONFIG_HPS_SDR_CTRLCFG_CPORTWIDTH_CPORTWIDTH		0x44555
diff --git a/board/terasic/sockit/qts/pinmux_config.h b/board/terasic/sockit/qts/pinmux_config.h
index f8e458f3dd4c..896358352d01 100644
--- a/board/terasic/sockit/qts/pinmux_config.h
+++ b/board/terasic/sockit/qts/pinmux_config.h
@@ -6,6 +6,7 @@
 #ifndef __SOCFPGA_PINMUX_CONFIG_H__
 #define __SOCFPGA_PINMUX_CONFIG_H__
 
+#include <asm/types.h>
 const u8 sys_mgr_init_table[] = {
 	0, /* EMACIO0 */
 	2, /* EMACIO1 */
diff --git a/board/terasic/sockit/qts/sdram_config.h b/board/terasic/sockit/qts/sdram_config.h
index 96cc35703413..e5965d734b18 100644
--- a/board/terasic/sockit/qts/sdram_config.h
+++ b/board/terasic/sockit/qts/sdram_config.h
@@ -7,6 +7,7 @@
 #define __SOCFPGA_SDRAM_CONFIG_H__
 
 /* SDRAM configuration */
+#include <asm/types.h>
 #define CONFIG_HPS_SDR_CTRLCFG_CPORTRDWR_CPORTRDWR		0x5A56A
 #define CONFIG_HPS_SDR_CTRLCFG_CPORTRMAP_CPORTRMAP		0xB00088
 #define CONFIG_HPS_SDR_CTRLCFG_CPORTWIDTH_CPORTWIDTH		0x44555
diff --git a/board/theadorable/fpga.c b/board/theadorable/fpga.c
index 5a34244ea055..6e12e4f9c08d 100644
--- a/board/theadorable/fpga.c
+++ b/board/theadorable/fpga.c
@@ -16,6 +16,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "theadorable.h"
 
 /*
diff --git a/board/theadorable/theadorable.c b/board/theadorable/theadorable.c
index 2f3df5209284..909bc6f39bab 100644
--- a/board/theadorable/theadorable.c
+++ b/board/theadorable/theadorable.c
@@ -27,6 +27,7 @@
 #ifdef CONFIG_NET
 #include <netdev.h>
 #endif
+#include <linux/types.h>
 #include <u-boot/crc.h>
 #include "theadorable.h"
 
diff --git a/board/theobroma-systems/puma_rk3399/puma-rk3399.c b/board/theobroma-systems/puma_rk3399/puma-rk3399.c
index 7edfd2a2b92e..71bfb3677bfe 100644
--- a/board/theobroma-systems/puma_rk3399/puma-rk3399.c
+++ b/board/theobroma-systems/puma_rk3399/puma-rk3399.c
@@ -12,6 +12,7 @@
 #include <spl.h>
 #include <syscon.h>
 #include <vsprintf.h>
+#include <asm/types.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 21f90e0e7e89..13c84de23b9f 100644
--- a/board/ti/am335x/board.c
+++ b/board/ti/am335x/board.c
@@ -45,6 +45,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <power/tps65217.h>
 #include <power/tps65910.h>
 #include <env_internal.h>
diff --git a/board/ti/am43xx/board.c b/board/ti/am43xx/board.c
index e3e13421cd31..8d2652dfcdc8 100644
--- a/board/ti/am43xx/board.c
+++ b/board/ti/am43xx/board.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <eeprom.h>
 #include <image.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
@@ -32,6 +33,7 @@
 #include <asm/omap_common.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "../common/board_detect.h"
 #include "board.h"
 #include <power/pmic.h>
diff --git a/board/ti/am57xx/board.c b/board/ti/am57xx/board.c
index 4458ddec325d..62d1265643ac 100644
--- a/board/ti/am57xx/board.c
+++ b/board/ti/am57xx/board.c
@@ -17,6 +17,7 @@
 #include <palmas.h>
 #include <sata.h>
 #include <serial.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <usb.h>
 #include <errno.h>
@@ -39,6 +40,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <linux/usb/gadget.h>
 #include <dwc3-uboot.h>
 #include <dwc3-omap-uboot.h>
diff --git a/board/ti/am65x/evm.c b/board/ti/am65x/evm.c
index f64c7dd3a872..b57a57a4f433 100644
--- a/board/ti/am65x/evm.c
+++ b/board/ti/am65x/evm.c
@@ -28,6 +28,7 @@
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "../common/board_detect.h"
 
diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c
index 15b0d5149f82..331bb6e2279b 100644
--- a/board/ti/beagle/beagle.c
+++ b/board/ti/beagle/beagle.c
@@ -39,6 +39,7 @@
 #include <asm/omap_musb.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
 #include <linux/usb/musb.h>
diff --git a/board/ti/common/board_detect.c b/board/ti/common/board_detect.c
index 18b8a9671068..1687997abac2 100644
--- a/board/ti/common/board_detect.c
+++ b/board/ti/common/board_detect.c
@@ -8,9 +8,11 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <eeprom.h>
 #include <log.h>
 #include <net.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/arch/hardware.h>
@@ -25,6 +27,7 @@
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "board_detect.h"
 
diff --git a/board/ti/common/board_detect.h b/board/ti/common/board_detect.h
index d764d7a8d7a3..5f7875b1b443 100644
--- a/board/ti/common/board_detect.h
+++ b/board/ti/common/board_detect.h
@@ -9,7 +9,9 @@
 #define __BOARD_DETECT_H
 
 /* TI EEPROM MAGIC Header identifier */
+#include <compiler.h>
 #include <stdbool.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #define TI_EEPROM_HEADER_MAGIC	0xEE3355AA
 #define TI_DEAD_EEPROM_MAGIC	0xADEAD12C
diff --git a/board/ti/dra7xx/evm.c b/board/ti/dra7xx/evm.c
index baf47edc3046..956de9d619c2 100644
--- a/board/ti/dra7xx/evm.c
+++ b/board/ti/dra7xx/evm.c
@@ -27,6 +27,7 @@
 #include <linux/string.h>
 #include <asm/gpio.h>
 #include <usb.h>
+#include <linux/types.h>
 #include <linux/usb/gadget.h>
 #include <asm/omap_common.h>
 #include <asm/omap_sec_common.h>
diff --git a/board/ti/evm/evm.c b/board/ti/evm/evm.c
index e84014b7c1c3..cdea269746f0 100644
--- a/board/ti/evm/evm.c
+++ b/board/ti/evm/evm.c
@@ -28,6 +28,7 @@
 #include <twl4030.h>
 #include <asm/mach-types.h>
 #include <asm/omap_musb.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/mtd/rawnand.h>
 #include "evm.h"
diff --git a/board/ti/evm/evm.h b/board/ti/evm/evm.h
index 09b08b490aeb..a9542c92299f 100644
--- a/board/ti/evm/evm.h
+++ b/board/ti/evm/evm.h
@@ -6,6 +6,7 @@
 #ifndef _EVM_H_
 #define _EVM_H_
 
+#include <asm/types.h>
 const omap3_sysinfo sysinfo = {
 	DDR_DISCRETE,
 	"OMAP3 EVM board",
diff --git a/board/ti/j721e/evm.c b/board/ti/j721e/evm.c
index c70b58f0c8f2..53d8a799759e 100644
--- a/board/ti/j721e/evm.c
+++ b/board/ti/j721e/evm.c
@@ -14,6 +14,7 @@
 #include <init.h>
 #include <log.h>
 #include <net.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/arch/sys_proto.h>
@@ -30,6 +31,7 @@
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "../common/board_detect.h"
 
diff --git a/board/ti/ks2_evm/board.c b/board/ti/ks2_evm/board.c
index 449073b6b7aa..de120c48dcf2 100644
--- a/board/ti/ks2_evm/board.c
+++ b/board/ti/ks2_evm/board.c
@@ -7,12 +7,14 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "board.h"
 #include <env.h>
 #include <hang.h>
diff --git a/board/ti/ks2_evm/board_k2e.c b/board/ti/ks2_evm/board_k2e.c
index b5258b66e102..8d0032e55ca3 100644
--- a/board/ti/ks2_evm/board_k2e.c
+++ b/board/ti/ks2_evm/board_k2e.c
@@ -12,6 +12,7 @@
 #include <asm/arch/ddr3.h>
 #include <asm/arch/hardware.h>
 #include <asm/ti-common/keystone_net.h>
+#include <asm/types.h>
 #include <linux/string.h>
 
 unsigned int get_external_clk(u32 clk)
diff --git a/board/ti/ks2_evm/board_k2g.c b/board/ti/ks2_evm/board_k2g.c
index eb115a818f46..23c6e93ab5f0 100644
--- a/board/ti/ks2_evm/board_k2g.c
+++ b/board/ti/ks2_evm/board_k2g.c
@@ -24,6 +24,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "mux-k2g.h"
 #include "../common/board_detect.h"
 
diff --git a/board/ti/ks2_evm/board_k2hk.c b/board/ti/ks2_evm/board_k2hk.c
index 6a9935c7ef5c..3648db6af0cb 100644
--- a/board/ti/ks2_evm/board_k2hk.c
+++ b/board/ti/ks2_evm/board_k2hk.c
@@ -12,6 +12,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/hardware.h>
 #include <asm/ti-common/keystone_net.h>
+#include <asm/types.h>
 #include <linux/string.h>
 
 unsigned int external_clk[ext_clk_count] = {
diff --git a/board/ti/ks2_evm/board_k2l.c b/board/ti/ks2_evm/board_k2l.c
index 459530ecb9de..2d9da4e3a7dd 100644
--- a/board/ti/ks2_evm/board_k2l.c
+++ b/board/ti/ks2_evm/board_k2l.c
@@ -12,6 +12,7 @@
 #include <asm/arch/ddr3.h>
 #include <asm/arch/hardware.h>
 #include <asm/ti-common/keystone_net.h>
+#include <asm/types.h>
 #include <linux/string.h>
 
 unsigned int get_external_clk(u32 clk)
diff --git a/board/ti/ks2_evm/ddr3_k2e.c b/board/ti/ks2_evm/ddr3_k2e.c
index 85e70fc67761..b1065f53d30d 100644
--- a/board/ti/ks2_evm/ddr3_k2e.c
+++ b/board/ti/ks2_evm/ddr3_k2e.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include "ddr3_cfg.h"
 #include <asm/arch/ddr3.h>
 
diff --git a/board/ti/ks2_evm/ddr3_k2g.c b/board/ti/ks2_evm/ddr3_k2g.c
index 563c5e9950ce..a8a306d61cc8 100644
--- a/board/ti/ks2_evm/ddr3_k2g.c
+++ b/board/ti/ks2_evm/ddr3_k2g.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <asm/types.h>
 #include "ddr3_cfg.h"
 #include <asm/arch/ddr3.h>
 #include <asm/arch/hardware.h>
diff --git a/board/ti/ks2_evm/ddr3_k2hk.c b/board/ti/ks2_evm/ddr3_k2hk.c
index 03bae4bf91eb..eee64753bb99 100644
--- a/board/ti/ks2_evm/ddr3_k2hk.c
+++ b/board/ti/ks2_evm/ddr3_k2hk.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include "ddr3_cfg.h"
 #include <asm/arch/ddr3.h>
 #include <asm/arch/hardware.h>
diff --git a/board/ti/ks2_evm/ddr3_k2l.c b/board/ti/ks2_evm/ddr3_k2l.c
index 36babcc5e116..62daa49d32e2 100644
--- a/board/ti/ks2_evm/ddr3_k2l.c
+++ b/board/ti/ks2_evm/ddr3_k2l.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include "ddr3_cfg.h"
 #include <asm/arch/ddr3.h>
 
diff --git a/board/ti/omap5_uevm/evm.c b/board/ti/omap5_uevm/evm.c
index dd9217f0fba5..0d551b1b4e90 100644
--- a/board/ti/omap5_uevm/evm.c
+++ b/board/ti/omap5_uevm/evm.c
@@ -17,6 +17,7 @@
 #include <tca642x.h>
 #include <usb.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/board/ti/panda/panda.c b/board/ti/panda/panda.c
index c36690eec172..0a64a3098226 100644
--- a/board/ti/panda/panda.c
+++ b/board/ti/panda/panda.c
@@ -18,6 +18,7 @@
 #include <asm/gpio.h>
 #include <env.h>
 #include <twl6030.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 
 #include "panda_mux_data.h"
diff --git a/board/ti/sdp4430/sdp.c b/board/ti/sdp4430/sdp.c
index fe12d6e89139..ed9b50cc7001 100644
--- a/board/ti/sdp4430/sdp.c
+++ b/board/ti/sdp4430/sdp.c
@@ -13,6 +13,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/mmc_host_def.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 
 #include "sdp4430_mux_data.h"
diff --git a/board/ti/ti816x/evm.c b/board/ti/ti816x/evm.c
index 2689e48c8cef..8cc91def5e43 100644
--- a/board/ti/ti816x/evm.c
+++ b/board/ti/ti816x/evm.c
@@ -24,6 +24,7 @@
 #include <asm/arch/mem.h>
 #include <asm/arch/mux.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/timll/devkit3250/devkit3250_spl.c b/board/timll/devkit3250/devkit3250_spl.c
index 47af78ae0b1d..327103087fbb 100644
--- a/board/timll/devkit3250/devkit3250_spl.c
+++ b/board/timll/devkit3250/devkit3250_spl.c
@@ -12,6 +12,7 @@
 #include <asm/arch/emc.h>
 #include <asm/arch-lpc32xx/gpio.h>
 #include <spl.h>
+#include <asm/types.h>
 
 static struct gpio_regs *gpio = (struct gpio_regs *)GPIO_BASE;
 
diff --git a/board/timll/devkit8000/devkit8000.c b/board/timll/devkit8000/devkit8000.c
index 4c05c9a8b7fc..f9b35733f509 100644
--- a/board/timll/devkit8000/devkit8000.c
+++ b/board/timll/devkit8000/devkit8000.c
@@ -31,6 +31,7 @@
 #include <asm/arch/mem.h>
 #include <asm/mach-types.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 #include "devkit8000.h"
 #include <asm/gpio.h>
 #ifdef CONFIG_DRIVER_DM9000
diff --git a/board/toradex/apalis-imx8/apalis-imx8.c b/board/toradex/apalis-imx8/apalis-imx8.c
index cae2b789bc71..0789e8362258 100644
--- a/board/toradex/apalis-imx8/apalis-imx8.c
+++ b/board/toradex/apalis-imx8/apalis-imx8.c
@@ -10,6 +10,7 @@
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include <asm/arch/clock.h>
 #include <asm/arch/imx8-pins.h>
diff --git a/board/toradex/apalis-tk1/apalis-tk1.c b/board/toradex/apalis-tk1/apalis-tk1.c
index 023c93c09298..eebba48f0151 100644
--- a/board/toradex/apalis-tk1/apalis-tk1.c
+++ b/board/toradex/apalis-tk1/apalis-tk1.c
@@ -16,6 +16,7 @@
 #include <asm/arch/pinmux.h>
 #include <env_internal.h>
 #include <pci_tegra.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/board/toradex/apalis-tk1/as3722_init.c b/board/toradex/apalis-tk1/as3722_init.c
index 68169f554808..dea80ed4a8a4 100644
--- a/board/toradex/apalis-tk1/as3722_init.c
+++ b/board/toradex/apalis-tk1/as3722_init.c
@@ -8,6 +8,7 @@
 #include <asm/io.h>
 #include <asm/arch-tegra/tegra_i2c.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 #include "as3722_init.h"
 
 /* AS3722-PMIC-specific early init code - get CPU rails up, etc */
diff --git a/board/toradex/apalis_imx6/apalis_imx6.c b/board/toradex/apalis_imx6/apalis_imx6.c
index 6b319c043a6f..b075b620585e 100644
--- a/board/toradex/apalis_imx6/apalis_imx6.c
+++ b/board/toradex/apalis_imx6/apalis_imx6.c
@@ -20,6 +20,7 @@
 #include <linux/delay.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <ahci.h>
 #include <asm/arch/clock.h>
diff --git a/board/toradex/apalis_imx6/pf0100.c b/board/toradex/apalis_imx6/pf0100.c
index 9247a7805446..5961d6179d28 100644
--- a/board/toradex/apalis_imx6/pf0100.c
+++ b/board/toradex/apalis_imx6/pf0100.c
@@ -18,6 +18,7 @@
 #include <asm/mach-imx/iomux-v3.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include "pf0100_otp.inc"
 #include "pf0100.h"
diff --git a/board/toradex/apalis_t30/apalis_t30.c b/board/toradex/apalis_t30/apalis_t30.c
index 49fb5d7a3701..7fefc2fd1c40 100644
--- a/board/toradex/apalis_t30/apalis_t30.c
+++ b/board/toradex/apalis_t30/apalis_t30.c
@@ -18,6 +18,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <pci_tegra.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
diff --git a/board/toradex/colibri-imx8x/colibri-imx8x.c b/board/toradex/colibri-imx8x/colibri-imx8x.c
index 1a2a23337cfe..b9df96df053b 100644
--- a/board/toradex/colibri-imx8x/colibri-imx8x.c
+++ b/board/toradex/colibri-imx8x/colibri-imx8x.c
@@ -10,6 +10,7 @@
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include <asm/arch/clock.h>
 #include <asm/arch/imx8-pins.h>
diff --git a/board/toradex/colibri_imx6/colibri_imx6.c b/board/toradex/colibri_imx6/colibri_imx6.c
index 99342e820e98..6b001c5450db 100644
--- a/board/toradex/colibri_imx6/colibri_imx6.c
+++ b/board/toradex/colibri_imx6/colibri_imx6.c
@@ -20,6 +20,7 @@
 #include <linux/delay.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <asm/arch/clock.h>
 #include <asm/arch/crm_regs.h>
diff --git a/board/toradex/colibri_imx6/pf0100.c b/board/toradex/colibri_imx6/pf0100.c
index d1bd0566b2aa..31e4620edb3b 100644
--- a/board/toradex/colibri_imx6/pf0100.c
+++ b/board/toradex/colibri_imx6/pf0100.c
@@ -18,6 +18,7 @@
 #include <asm/mach-imx/iomux-v3.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include "pf0100_otp.inc"
 #include "pf0100.h"
diff --git a/board/toradex/colibri_imx7/colibri_imx7.c b/board/toradex/colibri_imx7/colibri_imx7.c
index 69a17c885502..c6b1501467dd 100644
--- a/board/toradex/colibri_imx7/colibri_imx7.c
+++ b/board/toradex/colibri_imx7/colibri_imx7.c
@@ -32,6 +32,7 @@
 #include <miiphy.h>
 #include <mtd_node.h>
 #include <netdev.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/rn5t567_pmic.h>
 #include <usb.h>
diff --git a/board/toradex/colibri_t20/colibri_t20.c b/board/toradex/colibri_t20/colibri_t20.c
index f809260aa217..b4f32a335450 100644
--- a/board/toradex/colibri_t20/colibri_t20.c
+++ b/board/toradex/colibri_t20/colibri_t20.c
@@ -18,6 +18,7 @@
 #include <asm/io.h>
 #include <i2c.h>
 #include <nand.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include "../common/tdx-common.h"
diff --git a/board/toradex/colibri_vf/colibri_vf.c b/board/toradex/colibri_vf/colibri_vf.c
index 6361ffedb1fb..9b966da7429d 100644
--- a/board/toradex/colibri_vf/colibri_vf.c
+++ b/board/toradex/colibri_vf/colibri_vf.c
@@ -10,6 +10,7 @@
 #include <init.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/kernel.h>
 
diff --git a/board/toradex/common/tdx-cfg-block.c b/board/toradex/common/tdx-cfg-block.c
index 4e4173c6d8e5..530dfddbba7b 100644
--- a/board/toradex/common/tdx-cfg-block.c
+++ b/board/toradex/common/tdx-cfg-block.c
@@ -4,12 +4,14 @@
  */
 
 #include <common.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "tdx-cfg-block.h"
 #include "tdx-eeprom.h"
 
diff --git a/board/toradex/common/tdx-common.c b/board/toradex/common/tdx-common.c
index 7c7f15d19915..225c406cfe43 100644
--- a/board/toradex/common/tdx-common.c
+++ b/board/toradex/common/tdx-common.c
@@ -9,6 +9,7 @@
 #include <init.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <linux/string.h>
diff --git a/board/toradex/verdin-imx8mm/spl.c b/board/toradex/verdin-imx8mm/spl.c
index 6ece3136fda3..2863324575d9 100644
--- a/board/toradex/verdin-imx8mm/spl.c
+++ b/board/toradex/verdin-imx8mm/spl.c
@@ -26,6 +26,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <power/bd71837.h>
 #include <power/pmic.h>
 #include <spl.h>
diff --git a/board/tplink/wdr4300/wdr4300.c b/board/tplink/wdr4300/wdr4300.c
index 9134d6bf6d43..9124ec7964ae 100644
--- a/board/tplink/wdr4300/wdr4300.c
+++ b/board/tplink/wdr4300/wdr4300.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <init.h>
 #include <asm/io.h>
 #include <asm/addrspace.h>
diff --git a/board/tqc/tqm834x/pci.c b/board/tqc/tqm834x/pci.c
index eac1b7f2df81..97e60ff0cae0 100644
--- a/board/tqc/tqm834x/pci.c
+++ b/board/tqc/tqm834x/pci.c
@@ -14,6 +14,7 @@
 #include <i2c.h>
 #include <asm/fsl_i2c.h>
 #include <asm/ppc.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 static struct pci_region pci1_regions[] = {
diff --git a/board/tqc/tqm834x/tqm834x.c b/board/tqc/tqm834x/tqm834x.c
index f5e3bc5bf975..2bcd7fc42634 100644
--- a/board/tqc/tqm834x/tqm834x.c
+++ b/board/tqc/tqm834x/tqm834x.c
@@ -21,6 +21,7 @@
 #include <flash.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 #include <mtd/cfi_flash.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/tqc/tqma6/tqma6.c b/board/tqc/tqma6/tqma6.c
index 1b2855c9896e..4681690d7f35 100644
--- a/board/tqc/tqma6/tqma6.c
+++ b/board/tqc/tqma6/tqma6.c
@@ -7,6 +7,7 @@
  * Author: Markus Niebel <markus.niebel@tq-group.com>
  */
 
+#include <compiler.h>
 #include <init.h>
 #include <stdio.h>
 #include <vsprintf.h>
@@ -30,6 +31,7 @@
 #include <linux/libfdt.h>
 #include <i2c.h>
 #include <mmc.h>
+#include <linux/types.h>
 #include <power/pfuze100_pmic.h>
 #include <power/pmic.h>
 #include <spi_flash.h>
diff --git a/board/udoo/neo/neo.c b/board/udoo/neo/neo.c
index 4c004a755536..a263843f4aa8 100644
--- a/board/udoo/neo/neo.c
+++ b/board/udoo/neo/neo.c
@@ -37,6 +37,7 @@
 #include <miiphy.h>
 #include <netdev.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/pfuze3000_pmic.h>
 #include <malloc.h>
diff --git a/board/udoo/udoo.c b/board/udoo/udoo.c
index c0cd357845ee..37bbd497babf 100644
--- a/board/udoo/udoo.c
+++ b/board/udoo/udoo.c
@@ -29,6 +29,7 @@
 #include <micrel.h>
 #include <miiphy.h>
 #include <netdev.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/udoo/udoo_spl.c b/board/udoo/udoo_spl.c
index d9afbbb74198..7ac6154219ac 100644
--- a/board/udoo/udoo_spl.c
+++ b/board/udoo/udoo_spl.c
@@ -23,6 +23,7 @@
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
 #include <spl.h>
+#include <linux/types.h>
 
 #if defined(CONFIG_SPL_BUILD)
 #include <asm/arch/mx6-ddr.h>
diff --git a/board/variscite/dart_6ul/spl.c b/board/variscite/dart_6ul/spl.c
index bf4c6bd573e9..0efa57b85434 100644
--- a/board/variscite/dart_6ul/spl.c
+++ b/board/variscite/dart_6ul/spl.c
@@ -17,6 +17,7 @@
 #include <asm/u-boot.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define UART_PAD_CTRL  (PAD_CTL_PKE | PAD_CTL_PUE |		\
 	PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED |		\
diff --git a/board/varisys/common/sys_eeprom.c b/board/varisys/common/sys_eeprom.c
index d285b0f36cdb..ec850a8c1de9 100644
--- a/board/varisys/common/sys_eeprom.c
+++ b/board/varisys/common/sys_eeprom.c
@@ -12,10 +12,12 @@
 
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <env.h>
 #include <i2c.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <asm/types.h>
 #include <linux/ctype.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
diff --git a/board/varisys/cyrus/cyrus.c b/board/varisys/cyrus/cyrus.c
index a7721274aed0..c7b17a9caf21 100644
--- a/board/varisys/cyrus/cyrus.c
+++ b/board/varisys/cyrus/cyrus.c
@@ -11,6 +11,7 @@
 #include <init.h>
 #include <netdev.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/compiler.h>
 #include <asm/mmu.h>
diff --git a/board/varisys/cyrus/ddr.c b/board/varisys/cyrus/ddr.c
index 5221b6174d76..0e6161eac6e3 100644
--- a/board/varisys/cyrus/ddr.c
+++ b/board/varisys/cyrus/ddr.c
@@ -16,6 +16,7 @@
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
 #include <asm/fsl_law.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/ve8313/ve8313.c b/board/ve8313/ve8313.c
index 2f78b475d393..56ddd70b893b 100644
--- a/board/ve8313/ve8313.c
+++ b/board/ve8313/ve8313.c
@@ -14,6 +14,7 @@
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/ppc.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
diff --git a/board/vscom/baltos/board.c b/board/vscom/baltos/board.c
index a7ba5393183e..e4c742a98cb1 100644
--- a/board/vscom/baltos/board.c
+++ b/board/vscom/baltos/board.c
@@ -37,6 +37,7 @@
 #include <miiphy.h>
 #include <cpsw.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <power/tps65910.h>
 #include <watchdog.h>
 #include "board.h"
diff --git a/board/vscom/baltos/board.h b/board/vscom/baltos/board.h
index 630c9bba73b3..93768571bb2c 100644
--- a/board/vscom/baltos/board.h
+++ b/board/vscom/baltos/board.h
@@ -10,6 +10,7 @@
 #ifndef _BOARD_H_
 #define _BOARD_H_
 
+#include <linux/types.h>
 typedef struct _BSP_VS_HWPARAM    // v1.0
 {
 	uint32_t Magic;
diff --git a/board/wandboard/spl.c b/board/wandboard/spl.c
index e6ba35612171..7c0680bfa476 100644
--- a/board/wandboard/spl.c
+++ b/board/wandboard/spl.c
@@ -24,6 +24,7 @@
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
 #include <spl.h>
+#include <linux/types.h>
 
 #include <asm/arch/mx6-ddr.h>
 /*
diff --git a/board/wandboard/wandboard.c b/board/wandboard/wandboard.c
index 6a2c5718c66d..0d89de16e57d 100644
--- a/board/wandboard/wandboard.c
+++ b/board/wandboard/wandboard.c
@@ -10,6 +10,7 @@
 #include <image.h>
 #include <init.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/crm_regs.h>
@@ -37,6 +38,7 @@
 #include <phy.h>
 #include <i2c.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/pfuze100_pmic.h>
 
diff --git a/board/work-microwave/work_92105/work_92105_display.c b/board/work-microwave/work_92105/work_92105_display.c
index 53d5d3c5a835..77fa813600b0 100644
--- a/board/work-microwave/work_92105/work_92105_display.c
+++ b/board/work-microwave/work_92105/work_92105_display.c
@@ -25,6 +25,7 @@
 #include <vsprintf.h>
 #include <linux/delay.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /*
  * GPO 15 in port 3 is gpio 3*32+15 = 111
diff --git a/board/work-microwave/work_92105/work_92105_spl.c b/board/work-microwave/work_92105/work_92105_spl.c
index a31553a2d25b..69a324bb288f 100644
--- a/board/work-microwave/work_92105/work_92105_spl.c
+++ b/board/work-microwave/work_92105/work_92105_spl.c
@@ -13,6 +13,7 @@
 #include <asm/arch/emc.h>
 #include <asm/gpio.h>
 #include <spl.h>
+#include <asm/types.h>
 #include "work_92105_display.h"
 
 struct emc_dram_settings dram_64mb = {
diff --git a/board/xes/common/actl_nand.c b/board/xes/common/actl_nand.c
index 4e52838c9095..2ae209eb7aa2 100644
--- a/board/xes/common/actl_nand.c
+++ b/board/xes/common/actl_nand.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <nand.h>
 #include <asm/io.h>
+#include <linux/types.h>
 
 /*
  * Hardware specific access to control-lines
diff --git a/board/xes/common/fsl_8xxx_clk.c b/board/xes/common/fsl_8xxx_clk.c
index c73ec1d21ba0..d5c9b3bd6c83 100644
--- a/board/xes/common/fsl_8xxx_clk.c
+++ b/board/xes/common/fsl_8xxx_clk.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <asm/io.h>
 #include <asm/ppc.h>
+#include <linux/types.h>
 
 /*
  * Return SYSCLK input frequency - 50 MHz or 66 MHz depending on POR config
diff --git a/board/xes/common/fsl_8xxx_misc.c b/board/xes/common/fsl_8xxx_misc.c
index d39cd7e8b65b..fb835b4fb75d 100644
--- a/board/xes/common/fsl_8xxx_misc.c
+++ b/board/xes/common/fsl_8xxx_misc.c
@@ -21,6 +21,7 @@ int board_flash_wp_on(void)
 	return 0;
 }
 #endif
+#include <linux/types.h>
 
 /*
  * Return a board's derivative model number.  For example:
diff --git a/board/xes/common/fsl_8xxx_misc.h b/board/xes/common/fsl_8xxx_misc.h
index 6e4858f15c39..2bcc765726b8 100644
--- a/board/xes/common/fsl_8xxx_misc.h
+++ b/board/xes/common/fsl_8xxx_misc.h
@@ -6,6 +6,7 @@
 #ifndef __FSL_8XXX_MISC_H___
 #define __FSL_8XXX_MISC_H___
 
+#include <linux/types.h>
 uint get_board_derivative(void);
 
 #endif /* __FSL_8XXX_MISC_H__ */
diff --git a/board/xes/common/fsl_8xxx_pci.c b/board/xes/common/fsl_8xxx_pci.c
index 6c6db6c2fcf8..d3190c7ae3d3 100644
--- a/board/xes/common/fsl_8xxx_pci.c
+++ b/board/xes/common/fsl_8xxx_pci.c
@@ -15,6 +15,7 @@
 #include <linux/compiler.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
+#include <linux/types.h>
 
 
 #ifdef CONFIG_PCI1
diff --git a/board/xes/xpedite517x/ddr.c b/board/xes/xpedite517x/ddr.c
index fc50740e2f16..74ec19207d06 100644
--- a/board/xes/xpedite517x/ddr.c
+++ b/board/xes/xpedite517x/ddr.c
@@ -11,6 +11,7 @@
 #include <fsl_ddr_dimm_params.h>
 #include <log.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 void get_spd(ddr2_spd_eeprom_t *spd, u8 i2c_address)
 {
diff --git a/board/xes/xpedite520x/ddr.c b/board/xes/xpedite520x/ddr.c
index c142bec406e5..e96dc89fda9b 100644
--- a/board/xes/xpedite520x/ddr.c
+++ b/board/xes/xpedite520x/ddr.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <i2c.h>
+#include <linux/types.h>
 
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
diff --git a/board/xes/xpedite537x/ddr.c b/board/xes/xpedite537x/ddr.c
index 8ebb64793ba5..b5a938325991 100644
--- a/board/xes/xpedite537x/ddr.c
+++ b/board/xes/xpedite537x/ddr.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <asm/ppc.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
diff --git a/board/xes/xpedite550x/ddr.c b/board/xes/xpedite550x/ddr.c
index b1abd3d54dcf..090ff6af8696 100644
--- a/board/xes/xpedite550x/ddr.c
+++ b/board/xes/xpedite550x/ddr.c
@@ -8,6 +8,7 @@
 #include <i2c.h>
 #include <stdio.h>
 #include <asm/ppc.h>
+#include <linux/types.h>
 
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
diff --git a/board/xilinx/common/board.c b/board/xilinx/common/board.c
index 19de01caf0c7..79b8f2f01365 100644
--- a/board/xilinx/common/board.c
+++ b/board/xilinx/common/board.c
@@ -14,6 +14,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/sizes.h>
+#include <linux/types.h>
 #include "board.h"
 
 int zynq_board_read_rom_ethaddr(unsigned char *ethaddr)
diff --git a/board/xilinx/microblaze-generic/microblaze-generic.c b/board/xilinx/microblaze-generic/microblaze-generic.c
index 7e21ffc1958f..e5e23ebd1f29 100644
--- a/board/xilinx/microblaze-generic/microblaze-generic.c
+++ b/board/xilinx/microblaze-generic/microblaze-generic.c
@@ -22,6 +22,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/sizes.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/xilinx/versal/board.c b/board/xilinx/versal/board.c
index f310f0e56930..325c89e07102 100644
--- a/board/xilinx/versal/board.c
+++ b/board/xilinx/versal/board.c
@@ -24,6 +24,7 @@
 #include <versalpl.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "../common/board.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/xilinx/zynq/bootimg.c b/board/xilinx/zynq/bootimg.c
index 332500bdc721..5decf572fc0f 100644
--- a/board/xilinx/zynq/bootimg.c
+++ b/board/xilinx/zynq/bootimg.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/types.h>
 #include <linux/string.h>
 #include <u-boot/md5.h>
 #include <zynq_bootimg.h>
diff --git a/board/xilinx/zynq/cmds.c b/board/xilinx/zynq/cmds.c
index 932c7c6f61e6..f2703b17ae82 100644
--- a/board/xilinx/zynq/cmds.c
+++ b/board/xilinx/zynq/cmds.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <command.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
@@ -16,6 +17,7 @@
 #include <linux/bitops.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <u-boot/md5.h>
 #include <u-boot/rsa.h>
 #include <u-boot/rsa-mod-exp.h>
diff --git a/board/xilinx/zynqmp/cmds.c b/board/xilinx/zynqmp/cmds.c
index 52498147aef7..a4d4d72c2b47 100644
--- a/board/xilinx/zynqmp/cmds.c
+++ b/board/xilinx/zynqmp/cmds.c
@@ -17,6 +17,7 @@
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 static int do_zynqmp_verify_secure(struct cmd_tbl *cmdtp, int flag, int argc,
 				   char *const argv[])
diff --git a/board/xilinx/zynqmp/pm_cfg_obj.h b/board/xilinx/zynqmp/pm_cfg_obj.h
index 86e785490ced..acbad46b5327 100644
--- a/board/xilinx/zynqmp/pm_cfg_obj.h
+++ b/board/xilinx/zynqmp/pm_cfg_obj.h
@@ -5,5 +5,6 @@
  * Declaration of PMU config object binary blob linked in at build time.
  */
 
+#include <asm/types.h>
 extern const u32 zynqmp_pm_cfg_obj[];
 extern const int zynqmp_pm_cfg_obj_size;
diff --git a/board/xilinx/zynqmp/tap_delays.c b/board/xilinx/zynqmp/tap_delays.c
index 5fde0aed7dbe..041521c6dad4 100644
--- a/board/xilinx/zynqmp/tap_delays.c
+++ b/board/xilinx/zynqmp/tap_delays.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 #define SD_DLL_CTRL			0xFF180358
diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c
index 36208008d9b0..8d1ab10a4a8a 100644
--- a/board/xilinx/zynqmp/zynqmp.c
+++ b/board/xilinx/zynqmp/zynqmp.c
@@ -16,6 +16,7 @@
 #include <ahci.h>
 #include <scsi.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <wdt.h>
@@ -40,6 +41,7 @@
 #include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "../common/board.h"
 
 #include "pm_cfg_obj.h"
diff --git a/board/zyxel/nsa310s/nsa310s.c b/board/zyxel/nsa310s/nsa310s.c
index b8b896d717cb..fd2cd84026dc 100644
--- a/board/zyxel/nsa310s/nsa310s.c
+++ b/board/zyxel/nsa310s/nsa310s.c
@@ -15,6 +15,7 @@
 #include <asm/arch/mpp.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include "nsa310s.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/cmd/abootimg.c b/cmd/abootimg.c
index 3c6de9a8e80d..1b1a4b3a2628 100644
--- a/cmd/abootimg.c
+++ b/cmd/abootimg.c
@@ -13,6 +13,7 @@
 #include <vsprintf.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define abootimg_addr() \
 	(_abootimg_addr == -1 ? image_load_addr : _abootimg_addr)
diff --git a/cmd/acpi.c b/cmd/acpi.c
index c47cfdfd95b1..93c3f8f7a11c 100644
--- a/cmd/acpi.c
+++ b/cmd/acpi.c
@@ -16,6 +16,7 @@
 #include <dm/acpi.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/cmd/adtimg.c b/cmd/adtimg.c
index ea6230ba1f04..f3728aa386d0 100644
--- a/cmd/adtimg.c
+++ b/cmd/adtimg.c
@@ -13,6 +13,7 @@
 #include <vsprintf.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define OPT_INDEX	"--index"
 
diff --git a/cmd/aes.c b/cmd/aes.c
index b4a3dcc74c61..24d97a758829 100644
--- a/cmd/aes.c
+++ b/cmd/aes.c
@@ -15,6 +15,7 @@
 #include <mapmem.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 u32 aes_get_key_len(char *command)
 {
diff --git a/cmd/armflash.c b/cmd/armflash.c
index e76838c55c29..8436980125fc 100644
--- a/cmd/armflash.c
+++ b/cmd/armflash.c
@@ -13,6 +13,7 @@
 #include <vsprintf.h>
 #include <asm/io.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define MAX_REGIONS 4
 #define MAX_IMAGES 32
diff --git a/cmd/avb.c b/cmd/avb.c
index 08711e3240a9..7434b4b0d69a 100644
--- a/cmd/avb.c
+++ b/cmd/avb.c
@@ -11,10 +11,12 @@
 #include <image.h>
 #include <malloc.h>
 #include <mmc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define AVB_BOOTARGS	"avb_bootargs"
 static struct AvbOps *avb_ops;
diff --git a/cmd/axi.c b/cmd/axi.c
index 8a3a5f686692..8d268ad61053 100644
--- a/cmd/axi.c
+++ b/cmd/axi.c
@@ -20,6 +20,7 @@
 #include <vsprintf.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 /* Currently selected AXI bus device */
 static struct udevice *axi_cur_bus;
diff --git a/cmd/bcb.c b/cmd/bcb.c
index e95111796c7b..f6be4fa357be 100644
--- a/cmd/bcb.c
+++ b/cmd/bcb.c
@@ -16,6 +16,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 enum bcb_cmd {
 	BCB_CMD_LOAD,
diff --git a/cmd/bdinfo.c b/cmd/bdinfo.c
index c80395a50f46..c313fae128b3 100644
--- a/cmd/bdinfo.c
+++ b/cmd/bdinfo.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <env.h>
 #include <lmb.h>
 #include <net.h>
@@ -17,6 +18,7 @@
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/cmd/bedbug.c b/cmd/bedbug.c
index 6dc3bab74da3..d6cdf74dd108 100644
--- a/cmd/bedbug.c
+++ b/cmd/bedbug.c
@@ -14,6 +14,7 @@
 #include <bedbug/bedbug.h>
 #include <bedbug/regs.h>
 #include <bedbug/ppc.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/cmd/binop.c b/cmd/binop.c
index 9fde726b5cb9..9710f9569e93 100644
--- a/cmd/binop.c
+++ b/cmd/binop.c
@@ -10,6 +10,7 @@
 #include <vsprintf.h>
 #include <linux/ctype.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 enum {
 	OP_ID_XOR,
diff --git a/cmd/blk_common.c b/cmd/blk_common.c
index 4bf7a582b52e..9f6b936d9e30 100644
--- a/cmd/blk_common.c
+++ b/cmd/blk_common.c
@@ -14,6 +14,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 int blk_common_cmd(int argc, char *const argv[], enum if_type if_type,
 		   int *cur_devnump)
diff --git a/cmd/blob.c b/cmd/blob.c
index d4ee6966e975..27878e99639c 100644
--- a/cmd/blob.c
+++ b/cmd/blob.c
@@ -6,11 +6,13 @@
 
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <malloc.h>
 #include <vsprintf.h>
 #include <asm/byteorder.h>
 #include <linux/compiler.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /**
  * blob_decap() - Decapsulate the data as a blob
diff --git a/cmd/bmp.c b/cmd/bmp.c
index d2ea39ed67a1..0c2f916be142 100644
--- a/cmd/bmp.c
+++ b/cmd/bmp.c
@@ -19,12 +19,14 @@
 #include <malloc.h>
 #include <mapmem.h>
 #include <splash.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <video.h>
 #include <vsprintf.h>
 #include <asm/byteorder.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static int bmp_info (ulong addr);
 
diff --git a/cmd/boot.c b/cmd/boot.c
index 8b079b31714c..179ddc6a1e85 100644
--- a/cmd/boot.c
+++ b/cmd/boot.c
@@ -11,6 +11,7 @@
 #include <command.h>
 #include <net.h>
 #include <vsprintf.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_CMD_GO
 
diff --git a/cmd/bootefi.c b/cmd/bootefi.c
index 63902ef730dc..28320b36618a 100644
--- a/cmd/bootefi.c
+++ b/cmd/bootefi.c
@@ -27,6 +27,7 @@
 #include <asm-generic/sections.h>
 #include <linux/linkage.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/cmd/booti.c b/cmd/booti.c
index 405152c80ebe..baf7d7f80b6e 100644
--- a/cmd/booti.c
+++ b/cmd/booti.c
@@ -19,6 +19,7 @@
 #include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 /*
diff --git a/cmd/bootm.c b/cmd/bootm.c
index e253bdd9e927..9692a3660719 100644
--- a/cmd/bootm.c
+++ b/cmd/bootm.c
@@ -24,6 +24,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <u-boot/zlib.h>
 #include <mapmem.h>
 
diff --git a/cmd/bootstage.c b/cmd/bootstage.c
index 3649e749cd90..c0783bcb4780 100644
--- a/cmd/bootstage.c
+++ b/cmd/bootstage.c
@@ -10,6 +10,7 @@
 #include <vsprintf.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static int do_bootstage_report(struct cmd_tbl *cmdtp, int flag, int argc,
 			       char *const argv[])
diff --git a/cmd/bootz.c b/cmd/bootz.c
index e34ed63b4dfe..71494f4cf328 100644
--- a/cmd/bootz.c
+++ b/cmd/bootz.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <bootm.h>
 #include <command.h>
+#include <compiler.h>
 #include <image.h>
 #include <irq_func.h>
 #include <lmb.h>
@@ -14,6 +15,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/compiler.h>
+#include <linux/types.h>
 
 int __weak bootz_setup(ulong image, ulong *start, ulong *end)
 {
diff --git a/cmd/cache.c b/cmd/cache.c
index 19890c2566c9..fab3091bd2dd 100644
--- a/cmd/cache.c
+++ b/cmd/cache.c
@@ -9,6 +9,7 @@
  */
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <stdio.h>
 #include <linux/compiler.h>
diff --git a/cmd/cbfs.c b/cmd/cbfs.c
index 8f7a10751f7b..a0a0e6b107a9 100644
--- a/cmd/cbfs.c
+++ b/cmd/cbfs.c
@@ -12,6 +12,7 @@
 #include <cbfs.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/types.h>
 
 static int do_cbfs_init(struct cmd_tbl *cmdtp, int flag, int argc,
 			char *const argv[])
diff --git a/cmd/clk.c b/cmd/clk.c
index a2bfce12aed6..d51b987dde5a 100644
--- a/cmd/clk.c
+++ b/cmd/clk.c
@@ -12,7 +12,9 @@
 #include <dm/device-internal.h>
 #include <linux/clk-provider.h>
 #endif
+#include <compiler.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 
 #if defined(CONFIG_DM) && defined(CONFIG_CLK)
diff --git a/cmd/cpu.c b/cmd/cpu.c
index a4b1ee5b5770..cd502ef528cc 100644
--- a/cmd/cpu.c
+++ b/cmd/cpu.c
@@ -11,6 +11,7 @@
 #include <display_options.h>
 #include <dm.h>
 #include <errno.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
diff --git a/cmd/cramfs.c b/cmd/cramfs.c
index b34a4dde0799..460717637718 100644
--- a/cmd/cramfs.c
+++ b/cmd/cramfs.c
@@ -24,6 +24,7 @@
 #include <jffs2/load_kernel.h>
 #include <cramfs/cramfs_fs.h>
 #include <asm/io.h>
+#include <linux/types.h>
 
 /* enable/disable debugging messages */
 #define	DEBUG_CRAMFS
diff --git a/cmd/cros_ec.c b/cmd/cros_ec.c
index 7f089d7644ff..8e0f63eadb45 100644
--- a/cmd/cros_ec.c
+++ b/cmd/cros_ec.c
@@ -18,6 +18,7 @@
 #include <dm/uclass-internal.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /* Note: depends on enum ec_current_image */
 static const char * const ec_current_image_name[] = {"unknown", "RO", "RW"};
diff --git a/cmd/demo.c b/cmd/demo.c
index 52986bb8ee7d..4e0503050109 100644
--- a/cmd/demo.c
+++ b/cmd/demo.c
@@ -15,6 +15,7 @@
 #include <vsprintf.h>
 #include <asm/io.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 struct udevice *demo_dev;
 
diff --git a/cmd/disk.c b/cmd/disk.c
index fcb19ee02e44..80a23385b19c 100644
--- a/cmd/disk.c
+++ b/cmd/disk.c
@@ -12,6 +12,7 @@
 #include <part.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/types.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 d5b1ae536bba..49e35e678cc6 100644
--- a/cmd/eeprom.c
+++ b/cmd/eeprom.c
@@ -20,6 +20,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <config.h>
 #include <command.h>
 #include <eeprom.h>
@@ -30,6 +31,7 @@
 #include <vsprintf.h>
 #include <linux/delay.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #ifndef	CONFIG_SYS_I2C_SPEED
 #define	CONFIG_SYS_I2C_SPEED	50000
diff --git a/cmd/efi.c b/cmd/efi.c
index dd48101ae890..fba91a3d9354 100644
--- a/cmd/efi.c
+++ b/cmd/efi.c
@@ -11,11 +11,13 @@
 #include <log.h>
 #include <malloc.h>
 #include <sort.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static const char *const type_name[] = {
 	"reserved",
diff --git a/cmd/efidebug.c b/cmd/efidebug.c
index cc7a00c2bf2e..6557080e6581 100644
--- a/cmd/efidebug.c
+++ b/cmd/efidebug.c
@@ -20,6 +20,7 @@
 #include <linux/ctype.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define BS systab.boottime
 
diff --git a/cmd/elf.c b/cmd/elf.c
index 325fb19d8fca..2fc1977cad67 100644
--- a/cmd/elf.c
+++ b/cmd/elf.c
@@ -24,6 +24,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /* Allow ports to override the default behavior */
 static unsigned long do_bootelf_exec(ulong (*entry)(int, char * const[]),
diff --git a/cmd/fastboot.c b/cmd/fastboot.c
index 0a6cfe453097..aa1710d4ee21 100644
--- a/cmd/fastboot.c
+++ b/cmd/fastboot.c
@@ -19,6 +19,7 @@
 #include <linux/printk.h>
 #include <linux/string.h>
 #include <linux/stringify.h>
+#include <linux/types.h>
 
 static int do_fastboot_udp(int argc, char *const argv[],
 			   uintptr_t buf_addr, size_t buf_size)
diff --git a/cmd/fat.c b/cmd/fat.c
index e3bee99ec9b0..b916b99c797a 100644
--- a/cmd/fat.c
+++ b/cmd/fat.c
@@ -16,6 +16,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/cache.h>
+#include <linux/types.h>
 
 int do_fat_size(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 {
diff --git a/cmd/flash.c b/cmd/flash.c
index 56995822cb7b..8d70c4d9a9d7 100644
--- a/cmd/flash.c
+++ b/cmd/flash.c
@@ -14,6 +14,7 @@
 #include <uuid.h>
 #include <vsprintf.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #if defined(CONFIG_CMD_MTDPARTS)
 #include <jffs2/jffs2.h>
diff --git a/cmd/fpga.c b/cmd/fpga.c
index d7e20a622d25..31630c2701c6 100644
--- a/cmd/fpga.c
+++ b/cmd/fpga.c
@@ -20,6 +20,7 @@
 #include <vsprintf.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static long do_fpga_get_device(char *arg)
 {
diff --git a/cmd/fpgad.c b/cmd/fpgad.c
index 96901b684a6f..77be4e1e7672 100644
--- a/cmd/fpgad.c
+++ b/cmd/fpgad.c
@@ -13,6 +13,7 @@
 #include <console.h>
 #include <display_options.h>
 #include <vsprintf.h>
+#include <linux/types.h>
 
 #include <gdsys_fpga.h>
 
diff --git a/cmd/fuse.c b/cmd/fuse.c
index b75676e641e5..50f0d25e1e10 100644
--- a/cmd/fuse.c
+++ b/cmd/fuse.c
@@ -14,6 +14,7 @@
 #include <fuse.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 
diff --git a/cmd/gpio.c b/cmd/gpio.c
index 570c17d5bac4..b614c75e2b59 100644
--- a/cmd/gpio.c
+++ b/cmd/gpio.c
@@ -8,10 +8,12 @@
 
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <errno.h>
 #include <dm.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/gpio.h>
diff --git a/cmd/gpt.c b/cmd/gpt.c
index 11ad5f7de462..7f60bf6f1f5a 100644
--- a/cmd/gpt.c
+++ b/cmd/gpt.c
@@ -19,6 +19,7 @@
 #include <part.h>
 #include <part_efi.h>
 #include <exports.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <uuid.h>
 #include <vsprintf.h>
@@ -31,6 +32,7 @@
 #include <linux/sizes.h>
 #include <stdlib.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static LIST_HEAD(disk_partitions);
 
diff --git a/cmd/i2c.c b/cmd/i2c.c
index f21ed9ee354f..5735ea3fdd40 100644
--- a/cmd/i2c.c
+++ b/cmd/i2c.c
@@ -68,6 +68,7 @@
 #include <bootretry.h>
 #include <cli.h>
 #include <command.h>
+#include <compiler.h>
 #include <console.h>
 #include <dm.h>
 #include <edid.h>
@@ -83,6 +84,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <u-boot/crc.h>
 
 /* Display values from last command.
diff --git a/cmd/ini.c b/cmd/ini.c
index 7c3849bd50ba..54315adce79e 100644
--- a/cmd/ini.c
+++ b/cmd/ini.c
@@ -19,6 +19,7 @@
 #include <linux/ctype.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_INI_MAX_LINE
 #define MAX_LINE CONFIG_INI_MAX_LINE
diff --git a/cmd/io.c b/cmd/io.c
index 62141846bab0..af23f3fc6289 100644
--- a/cmd/io.c
+++ b/cmd/io.c
@@ -13,6 +13,7 @@
 #include <vsprintf.h>
 #include <asm/io.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 /* Display values from last command */
 static ulong last_addr, last_size;
diff --git a/cmd/iotrace.c b/cmd/iotrace.c
index f6db7ad48eaa..05cea98612a4 100644
--- a/cmd/iotrace.c
+++ b/cmd/iotrace.c
@@ -8,6 +8,7 @@
 #include <iotrace.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/types.h>
 
 static void do_print_stats(void)
 {
diff --git a/cmd/itest.c b/cmd/itest.c
index 5824a7f18d4c..125652446886 100644
--- a/cmd/itest.c
+++ b/cmd/itest.c
@@ -18,6 +18,7 @@
 #include <mapmem.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
 
diff --git a/cmd/jffs2.c b/cmd/jffs2.c
index b2dba80cf2c8..5c59964feaa0 100644
--- a/cmd/jffs2.c
+++ b/cmd/jffs2.c
@@ -84,6 +84,7 @@
 #include <linux/ctype.h>
 #include <cramfs/cramfs_fs.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #if defined(CONFIG_CMD_NAND)
 #include <linux/mtd/rawnand.h>
diff --git a/cmd/legacy-mtd-utils.c b/cmd/legacy-mtd-utils.c
index 2918ee6d28de..def89fa0fc83 100644
--- a/cmd/legacy-mtd-utils.c
+++ b/cmd/legacy-mtd-utils.c
@@ -8,6 +8,7 @@
 #include <linux/mtd/partitions.h>
 #include <linux/string.h>
 #include <mtd.h>
+#include <linux/types.h>
 
 static int get_part(const char *partname, int *idx, loff_t *off, loff_t *size,
 	     loff_t *maxsize, int devtype)
diff --git a/cmd/legacy-mtd-utils.h b/cmd/legacy-mtd-utils.h
index ac441d5558a1..a158439b9c05 100644
--- a/cmd/legacy-mtd-utils.h
+++ b/cmd/legacy-mtd-utils.h
@@ -3,6 +3,7 @@
 #ifndef __LEGACY_MTD_UTILS_H
 #define __LEGACY_MTD_UTILS_H
 
+#include <linux/types.h>
 int mtd_arg_off(const char *arg, int *idx, loff_t *off, loff_t *size,
 		loff_t *maxsize, int devtype, uint64_t chipsize);
 int mtd_arg_off_size(int argc, char *const argv[], int *idx, loff_t *off,
diff --git a/cmd/legacy_led.c b/cmd/legacy_led.c
index d70f6d11462c..2a1a6b669e35 100644
--- a/cmd/legacy_led.c
+++ b/cmd/legacy_led.c
@@ -10,6 +10,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <config.h>
 #include <command.h>
 #include <status_led.h>
diff --git a/cmd/load.c b/cmd/load.c
index c550f7643a91..dec8612d2d1a 100644
--- a/cmd/load.c
+++ b/cmd/load.c
@@ -26,6 +26,7 @@
 #include <linux/delay.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/cmd/log.c b/cmd/log.c
index d9c76ccdd2ba..1ef1422d6b83 100644
--- a/cmd/log.c
+++ b/cmd/log.c
@@ -13,6 +13,7 @@
 #include <asm/global_data.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static char log_fmt_chars[LOGF_COUNT] = "clFLfm";
 
diff --git a/cmd/lzmadec.c b/cmd/lzmadec.c
index 1452a7ac558d..5b13d385ffac 100644
--- a/cmd/lzmadec.c
+++ b/cmd/lzmadec.c
@@ -16,6 +16,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/io.h>
+#include <linux/types.h>
 
 #include <lzma/LzmaTools.h>
 
diff --git a/cmd/md5sum.c b/cmd/md5sum.c
index 2fb8d7b27597..26e7acddd5a8 100644
--- a/cmd/md5sum.c
+++ b/cmd/md5sum.c
@@ -15,6 +15,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <u-boot/md5.h>
 #include <asm/io.h>
 
diff --git a/cmd/mdio.c b/cmd/mdio.c
index 50e3919487aa..9d5ddfdb1aaa 100644
--- a/cmd/mdio.c
+++ b/cmd/mdio.c
@@ -16,6 +16,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static char last_op[2];
 static uint last_data;
diff --git a/cmd/mem.c b/cmd/mem.c
index 634c35c149e9..bc6f13a529be 100644
--- a/cmd/mem.c
+++ b/cmd/mem.c
@@ -22,6 +22,7 @@
 #include <log.h>
 #include <mapmem.h>
 #include <rand.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <vsprintf.h>
@@ -34,6 +35,7 @@
 #include <linux/delay.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/cmd/mii.c b/cmd/mii.c
index 2db28bb8aceb..e72e230e78d4 100644
--- a/cmd/mii.c
+++ b/cmd/mii.c
@@ -12,10 +12,12 @@
 #include <command.h>
 #include <dm.h>
 #include <miiphy.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 typedef struct _MII_field_desc_t {
 	ushort hi;
diff --git a/cmd/misc.c b/cmd/misc.c
index 65bc67f6da05..09e161a0ccfa 100644
--- a/cmd/misc.c
+++ b/cmd/misc.c
@@ -15,6 +15,7 @@
 #include <vsprintf.h>
 #include <linux/delay.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static int do_sleep(struct cmd_tbl *cmdtp, int flag, int argc,
 		    char *const argv[])
diff --git a/cmd/mmc.c b/cmd/mmc.c
index 0e6dbd07f01a..2df918cd1bd0 100644
--- a/cmd/mmc.c
+++ b/cmd/mmc.c
@@ -14,8 +14,10 @@
 #include <part.h>
 #include <sparse_format.h>
 #include <image-sparse.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
 
diff --git a/cmd/mtd.c b/cmd/mtd.c
index 24144546f9ab..b619cf5fd617 100644
--- a/cmd/mtd.c
+++ b/cmd/mtd.c
@@ -14,6 +14,7 @@
 #include <malloc.h>
 #include <mapmem.h>
 #include <mtd.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <dm/devres.h>
@@ -21,6 +22,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <linux/ctype.h>
 
diff --git a/cmd/mtdparts.c b/cmd/mtdparts.c
index f18a6e70f100..2a97f61e50ac 100644
--- a/cmd/mtdparts.c
+++ b/cmd/mtdparts.c
@@ -84,6 +84,7 @@
 #include <linux/err.h>
 #include <linux/mtd/mtd.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #if defined(CONFIG_CMD_NAND)
 #include <linux/mtd/rawnand.h>
diff --git a/cmd/mvebu/bubt.c b/cmd/mvebu/bubt.c
index f0c76c0b63d5..6d3e9802ba38 100644
--- a/cmd/mvebu/bubt.c
+++ b/cmd/mvebu/bubt.c
@@ -18,6 +18,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <spi_flash.h>
 #include <spi.h>
diff --git a/cmd/nand.c b/cmd/nand.c
index f2f29a326fe0..a7d6505bfb51 100644
--- a/cmd/nand.c
+++ b/cmd/nand.c
@@ -37,6 +37,7 @@
 #include <jffs2/jffs2.h>
 #include <nand.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "legacy-mtd-utils.h"
 
diff --git a/cmd/net.c b/cmd/net.c
index 691cef173682..d1f71def5e34 100644
--- a/cmd/net.c
+++ b/cmd/net.c
@@ -16,6 +16,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/string.h>
+#include <linux/types.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 2fbbe52371b0..7279154c2732 100644
--- a/cmd/nvedit.c
+++ b/cmd/nvedit.c
@@ -35,6 +35,7 @@
 #include <errno.h>
 #include <malloc.h>
 #include <mapmem.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
@@ -43,6 +44,7 @@
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <u-boot/crc.h>
 #include <watchdog.h>
 #include <linux/stddef.h>
diff --git a/cmd/nvedit_efi.c b/cmd/nvedit_efi.c
index 91214c93e225..c8f3015e0620 100644
--- a/cmd/nvedit_efi.c
+++ b/cmd/nvedit_efi.c
@@ -16,11 +16,13 @@
 #include <malloc.h>
 #include <mapmem.h>
 #include <rtc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <uuid.h>
 #include <vsprintf.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /*
  * From efi_variable.c,
diff --git a/cmd/onenand.c b/cmd/onenand.c
index 252636012c1e..05bdf2b95caa 100644
--- a/cmd/onenand.c
+++ b/cmd/onenand.c
@@ -17,6 +17,7 @@
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <linux/compat.h>
 #include <linux/mtd/mtd.h>
diff --git a/cmd/osd.c b/cmd/osd.c
index a7527f8a73d8..d5bbfef3a949 100644
--- a/cmd/osd.c
+++ b/cmd/osd.c
@@ -20,6 +20,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /* Container for selected OSD device */
 static struct udevice *osd_cur;
diff --git a/cmd/pcap.c b/cmd/pcap.c
index b5a3b3c0444c..2a03d8ffb16c 100644
--- a/cmd/pcap.c
+++ b/cmd/pcap.c
@@ -8,6 +8,7 @@
 #include <command.h>
 #include <net.h>
 #include <vsprintf.h>
+#include <asm/types.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 1ce1a7a36276..9a063a91dbc1 100644
--- a/cmd/pci.c
+++ b/cmd/pci.c
@@ -19,6 +19,7 @@
 #include <console.h>
 #include <dm.h>
 #include <init.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/processor.h>
@@ -27,6 +28,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 struct pci_reg_info {
 	const char *name;
diff --git a/cmd/pmic.c b/cmd/pmic.c
index b26b13105582..3fd6245ae310 100644
--- a/cmd/pmic.c
+++ b/cmd/pmic.c
@@ -12,6 +12,7 @@
 #include <dm/uclass-internal.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 
 #define LIMIT_DEV	32
diff --git a/cmd/pxe_utils.c b/cmd/pxe_utils.c
index 86f280bb1058..1b26bf4f55a2 100644
--- a/cmd/pxe_utils.c
+++ b/cmd/pxe_utils.c
@@ -13,6 +13,7 @@
 #include <mapmem.h>
 #include <lcd.h>
 #include <net.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/errno.h>
@@ -21,6 +22,7 @@
 #include <linux/ctype.h>
 #include <errno.h>
 #include <linux/list.h>
+#include <linux/types.h>
 
 #include <splash.h>
 #include <asm/io.h>
diff --git a/cmd/pxe_utils.h b/cmd/pxe_utils.h
index 1a25ca4e88e7..8976a392a8a3 100644
--- a/cmd/pxe_utils.h
+++ b/cmd/pxe_utils.h
@@ -5,6 +5,7 @@
 
 #include <stdbool.h>
 #include <linux/list.h>
+#include <linux/types.h>
 
 /*
  * A note on the pxe file parser.
diff --git a/cmd/qfw.c b/cmd/qfw.c
index ca60a05f6b1a..d45ba93e2b6a 100644
--- a/cmd/qfw.c
+++ b/cmd/qfw.c
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 /*
  * This function prepares kernel for zboot. It loads kernel data
diff --git a/cmd/read.c b/cmd/read.c
index 254925c1f78f..61dd5ceb13fa 100644
--- a/cmd/read.c
+++ b/cmd/read.c
@@ -13,6 +13,7 @@
 #include <part.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/types.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 e4968b7b372d..98286a4dfc75 100644
--- a/cmd/regulator.c
+++ b/cmd/regulator.c
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <errno.h>
 #include <dm.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <dm/uclass-internal.h>
diff --git a/cmd/reiser.c b/cmd/reiser.c
index 8a2f976a2138..4bf069f7425f 100644
--- a/cmd/reiser.c
+++ b/cmd/reiser.c
@@ -18,6 +18,7 @@
 #include <asm/byteorder.h>
 #include <reiserfs.h>
 #include <part.h>
+#include <linux/types.h>
 
 #if !CONFIG_IS_ENABLED(DOS_PARTITION)
 #error DOS partition support must be selected
diff --git a/cmd/remoteproc.c b/cmd/remoteproc.c
index 48f0e4684ceb..fff698668054 100644
--- a/cmd/remoteproc.c
+++ b/cmd/remoteproc.c
@@ -13,6 +13,7 @@
 #include <vsprintf.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /**
  * print_remoteproc_list() - print all the remote processor devices
diff --git a/cmd/rng.c b/cmd/rng.c
index 92d7c0de639d..f498c35fdb37 100644
--- a/cmd/rng.c
+++ b/cmd/rng.c
@@ -12,6 +12,7 @@
 #include <rng.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/types.h>
 
 static int do_rng(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 {
diff --git a/cmd/rtc.c b/cmd/rtc.c
index 78af8534e4ab..db7341d5a612 100644
--- a/cmd/rtc.c
+++ b/cmd/rtc.c
@@ -10,6 +10,7 @@
 #include <rtc.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
 
diff --git a/cmd/setexpr.c b/cmd/setexpr.c
index 9aefaeb14131..03beb0c1f539 100644
--- a/cmd/setexpr.c
+++ b/cmd/setexpr.c
@@ -17,6 +17,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static ulong get_arg(char *s, int w)
 {
diff --git a/cmd/sf.c b/cmd/sf.c
index d57da5f8b0bc..f85f60774ae9 100644
--- a/cmd/sf.c
+++ b/cmd/sf.c
@@ -16,6 +16,7 @@
 #include <mapmem.h>
 #include <spi.h>
 #include <spi_flash.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <vsprintf.h>
@@ -24,6 +25,7 @@
 #include <linux/kernel.h>
 #include <linux/mtd/mtd.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <asm/io.h>
 #include <dm/device-internal.h>
diff --git a/cmd/source.c b/cmd/source.c
index d5488a903ef1..d980d3ca62a5 100644
--- a/cmd/source.c
+++ b/cmd/source.c
@@ -25,6 +25,7 @@
 #include <vsprintf.h>
 #include <asm/byteorder.h>
 #include <asm/io.h>
+#include <linux/types.h>
 
 #if defined(CONFIG_FIT)
 /**
diff --git a/cmd/spi.c b/cmd/spi.c
index 2079ed0e1bea..9698e0d042af 100644
--- a/cmd/spi.c
+++ b/cmd/spi.c
@@ -17,6 +17,7 @@
 #include <vsprintf.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /*-----------------------------------------------------------------------
  * Definitions
diff --git a/cmd/ti/ddr3.c b/cmd/ti/ddr3.c
index c036df8a1f8c..903d6235050f 100644
--- a/cmd/ti/ddr3.c
+++ b/cmd/ti/ddr3.c
@@ -17,6 +17,7 @@
 #include <common.h>
 #include <command.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <linux/string.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/cmd/time.c b/cmd/time.c
index 7d4345bbf74d..4672fe9d3755 100644
--- a/cmd/time.c
+++ b/cmd/time.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <command.h>
 #include <stdio.h>
+#include <linux/types.h>
 
 static void report_time(ulong cycles)
 {
diff --git a/cmd/tlv_eeprom.c b/cmd/tlv_eeprom.c
index da052a9845ba..7944e8daa3b1 100644
--- a/cmd/tlv_eeprom.c
+++ b/cmd/tlv_eeprom.c
@@ -17,6 +17,7 @@
 #include <env.h>
 #include <init.h>
 #include <net.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
@@ -24,6 +25,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <u-boot/crc.h>
 
 #include "tlv_eeprom.h"
diff --git a/cmd/tpm-common.c b/cmd/tpm-common.c
index 2df4dc069200..6296c9d9da75 100644
--- a/cmd/tpm-common.c
+++ b/cmd/tpm-common.c
@@ -13,6 +13,7 @@
 #include <asm/unaligned.h>
 #include <linux/string.h>
 #include <tpm-common.h>
+#include <linux/types.h>
 #include "tpm-user-utils.h"
 
 static struct udevice *tpm_dev;
diff --git a/cmd/tpm-user-utils.h b/cmd/tpm-user-utils.h
index 358ddff57610..7a763d2b4cca 100644
--- a/cmd/tpm-user-utils.h
+++ b/cmd/tpm-user-utils.h
@@ -7,6 +7,7 @@
 #ifndef __TPM_USER_UTILS_H
 #define __TPM_USER_UTILS_H
 
+#include <linux/types.h>
 void print_byte_string(u8 *data, size_t count);
 void *parse_byte_string(char *bytes, u8 *data, size_t *count_ptr);
 int report_return_code(int return_code);
diff --git a/cmd/tpm-v1.c b/cmd/tpm-v1.c
index 0c96b10f06c1..495c17ef12b6 100644
--- a/cmd/tpm-v1.c
+++ b/cmd/tpm-v1.c
@@ -14,6 +14,7 @@
 #include <tpm-v1.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "tpm-user-utils.h"
 
 static int do_tpm_startup(struct cmd_tbl *cmdtp, int flag, int argc,
diff --git a/cmd/tpm-v2.c b/cmd/tpm-v2.c
index 2be09f547d58..d7201df3a29e 100644
--- a/cmd/tpm-v2.c
+++ b/cmd/tpm-v2.c
@@ -16,6 +16,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "tpm-user-utils.h"
 
 static int do_tpm2_startup(struct cmd_tbl *cmdtp, int flag, int argc,
diff --git a/cmd/tpm_test.c b/cmd/tpm_test.c
index 3a345877a253..5d4aafa67cbc 100644
--- a/cmd/tpm_test.c
+++ b/cmd/tpm_test.c
@@ -12,6 +12,7 @@
 #include <tpm-v1.h>
 #include <linux/kernel.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 #include "tpm-user-utils.h"
 
 /* Prints error and returns on failure */
diff --git a/cmd/trace.c b/cmd/trace.c
index 46b498700e90..063012082fe0 100644
--- a/cmd/trace.c
+++ b/cmd/trace.c
@@ -12,6 +12,7 @@
 #include <vsprintf.h>
 #include <asm/io.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 static int get_args(int argc, char *const argv[], char **buff,
 		    size_t *buff_ptr, size_t *buff_size)
diff --git a/cmd/tsi148.c b/cmd/tsi148.c
index 17f7f192f963..928eedc08c9b 100644
--- a/cmd/tsi148.c
+++ b/cmd/tsi148.c
@@ -16,6 +16,7 @@
 #include <asm/io.h>
 #include <pci.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <tsi148.h>
 
diff --git a/cmd/ubi.c b/cmd/ubi.c
index 80c175eec517..d8f54fdc8288 100644
--- a/cmd/ubi.c
+++ b/cmd/ubi.c
@@ -20,6 +20,7 @@
 #include <mtd.h>
 #include <nand.h>
 #include <onenand_uboot.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <dm/devres.h>
@@ -31,6 +32,7 @@
 #include <linux/errno.h>
 #include <jffs2/load_kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #undef ubi_msg
 #define ubi_msg(fmt, ...) printf("UBI: " fmt "\n", ##__VA_ARGS__)
diff --git a/cmd/ubifs.c b/cmd/ubifs.c
index 191199c07625..0f1aebde0f2a 100644
--- a/cmd/ubifs.c
+++ b/cmd/ubifs.c
@@ -18,6 +18,7 @@
 #include <stdio.h>
 #include <ubifs_uboot.h>
 #include <vsprintf.h>
+#include <asm/types.h>
 
 static int ubifs_initialized;
 static int ubifs_mounted;
diff --git a/cmd/universe.c b/cmd/universe.c
index b1eeff7a6608..39eaf9af9ab4 100644
--- a/cmd/universe.c
+++ b/cmd/universe.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <pci.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <universe.h>
 
diff --git a/cmd/unlz4.c b/cmd/unlz4.c
index a885c93dc4b8..3c3d928243a6 100644
--- a/cmd/unlz4.c
+++ b/cmd/unlz4.c
@@ -10,6 +10,7 @@
 #include <lz4.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/types.h>
 
 static int do_unlz4(struct cmd_tbl *cmdtp, int flag, int argc,
 		    char *const argv[])
diff --git a/cmd/usb.c b/cmd/usb.c
index 6a6d20096ad0..27cf810ade84 100644
--- a/cmd/usb.c
+++ b/cmd/usb.c
@@ -25,6 +25,7 @@
 #include <part.h>
 #include <usb.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_USB_STORAGE
 static int usb_stor_curr_dev = -1; /* current device */
diff --git a/cmd/usb_mass_storage.c b/cmd/usb_mass_storage.c
index 36a905cd7716..24979bd97d7c 100644
--- a/cmd/usb_mass_storage.c
+++ b/cmd/usb_mass_storage.c
@@ -23,6 +23,7 @@
 #include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static int ums_read_sector(struct ums *ums_dev,
 			   ulong start, lbaint_t blkcnt, void *buf)
diff --git a/cmd/version.c b/cmd/version.c
index dcd91f09fa13..874fd68e186a 100644
--- a/cmd/version.c
+++ b/cmd/version.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <display_options.h>
 #include <stdio.h>
 #include <version.h>
diff --git a/cmd/w1.c b/cmd/w1.c
index be6d076a8841..699336f4b55e 100644
--- a/cmd/w1.c
+++ b/cmd/w1.c
@@ -11,6 +11,7 @@
 #include <vsprintf.h>
 #include <w1.h>
 #include <w1-eeprom.h>
+#include <asm/types.h>
 #include <dm/device-internal.h>
 #include <linux/string.h>
 
diff --git a/cmd/wdt.c b/cmd/wdt.c
index c9c7a610efd3..0a8ef782811c 100644
--- a/cmd/wdt.c
+++ b/cmd/wdt.c
@@ -12,6 +12,7 @@
 #include <vsprintf.h>
 #include <wdt.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 static struct udevice *currdev;
 
diff --git a/cmd/wol.c b/cmd/wol.c
index 61a9d95e0eb5..48359adb6e92 100644
--- a/cmd/wol.c
+++ b/cmd/wol.c
@@ -11,6 +11,7 @@
 #include <command.h>
 #include <net.h>
 #include <vsprintf.h>
+#include <linux/types.h>
 
 #if defined(CONFIG_CMD_WOL)
 void wol_set_timeout(ulong);
diff --git a/cmd/x86/fsp.c b/cmd/x86/fsp.c
index 933fe8af406f..d71298948365 100644
--- a/cmd/x86/fsp.c
+++ b/cmd/x86/fsp.c
@@ -9,6 +9,7 @@
 #include <asm/fsp/fsp_support.h>
 #include <asm/global_data.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/cmd/x86/hob.c b/cmd/x86/hob.c
index ed1c42f4934c..fcb3dee2e606 100644
--- a/cmd/x86/hob.c
+++ b/cmd/x86/hob.c
@@ -11,6 +11,7 @@
 #include <asm/global_data.h>
 #include <asm/hob.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/cmd/x86/mtrr.c b/cmd/x86/mtrr.c
index a766eca7856d..cccdc3afbfcb 100644
--- a/cmd/x86/mtrr.c
+++ b/cmd/x86/mtrr.c
@@ -13,6 +13,7 @@
 #include <asm/mp.h>
 #include <asm/mtrr.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static const char *const mtrr_type_name[MTRR_TYPE_COUNT] = {
 	"Uncacheable",
diff --git a/cmd/ximg.c b/cmd/ximg.c
index 68f3d14c5b78..f9032bea3e1e 100644
--- a/cmd/ximg.c
+++ b/cmd/ximg.c
@@ -30,6 +30,7 @@
 #include <asm/io.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #ifndef CONFIG_SYS_XIMG_LEN
 /* use 8MByte as default max gunzip size */
diff --git a/cmd/yaffs2.c b/cmd/yaffs2.c
index 29b52f7ceda3..fe9a2bb6c957 100644
--- a/cmd/yaffs2.c
+++ b/cmd/yaffs2.c
@@ -17,6 +17,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <config.h>
 #include <command.h>
diff --git a/cmd/zfs.c b/cmd/zfs.c
index dde1c097c63f..5c59d44337ba 100644
--- a/cmd/zfs.c
+++ b/cmd/zfs.c
@@ -22,6 +22,7 @@
 #include <linux/stat.h>
 #include <malloc.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #if defined(CONFIG_CMD_USB) && defined(CONFIG_USB_STORAGE)
 #include <usb.h>
diff --git a/common/android_ab.c b/common/android_ab.c
index 5b0cb0b1d758..6e85b0f67c2d 100644
--- a/common/android_ab.c
+++ b/common/android_ab.c
@@ -10,10 +10,12 @@
 #include <malloc.h>
 #include <part.h>
 #include <memalign.h>
+#include <stdbool.h>
 #include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <u-boot/crc.h>
 #include <u-boot/crc.h>
 
diff --git a/common/autoboot.c b/common/autoboot.c
index 55bb2ee7adf6..1b0ab9ced76b 100644
--- a/common/autoboot.c
+++ b/common/autoboot.c
@@ -25,6 +25,7 @@
 #include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <u-boot/sha256.h>
 #include <bootcount.h>
 
diff --git a/common/avb_verify.c b/common/avb_verify.c
index 4c825e8553be..75a6c1f0ff00 100644
--- a/common/avb_verify.c
+++ b/common/avb_verify.c
@@ -11,11 +11,13 @@
 #include <image.h>
 #include <malloc.h>
 #include <part.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <tee.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <tee/optee_ta_avb.h>
 
 static const unsigned char avb_root_pub[1032] = {
diff --git a/common/bloblist.c b/common/bloblist.c
index 234c40e741a9..186815a93108 100644
--- a/common/bloblist.c
+++ b/common/bloblist.c
@@ -9,10 +9,12 @@
 #include <log.h>
 #include <mapmem.h>
 #include <spl.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <u-boot/crc.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/common/board_f.c b/common/board_f.c
index c727f2015176..def3b25571a2 100644
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -13,6 +13,7 @@
 #include <bloblist.h>
 #include <bootstage.h>
 #include <clock_legacy.h>
+#include <compiler.h>
 #include <console.h>
 #include <cpu.h>
 #include <cpu_func.h>
@@ -38,6 +39,7 @@
 #include <spl.h>
 #endif
 #include <status_led.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <sysreset.h>
 #include <timer.h>
@@ -59,6 +61,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /*
  * Pointer to initial global data area
diff --git a/common/board_info.c b/common/board_info.c
index bfa5324e8217..3e9ee4b9604b 100644
--- a/common/board_info.c
+++ b/common/board_info.c
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0+
 
 #include <common.h>
+#include <compiler.h>
 #include <init.h>
 #include <stdio.h>
 #include <asm/global_data.h>
diff --git a/common/board_r.c b/common/board_r.c
index 7a715afa0054..cb5d3c343b32 100644
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <api.h>
 #include <bootstage.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <display_options.h>
 #include <exports.h>
@@ -28,6 +29,7 @@
 #include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include <u-boot/crc.h>
 /* TODO: can we just include all these headers whether needed or not? */
 #if defined(CONFIG_CMD_BEDBUG)
diff --git a/common/bootm.c b/common/bootm.c
index 71ef3b44a1ee..8c940729800a 100644
--- a/common/bootm.c
+++ b/common/bootm.c
@@ -7,6 +7,7 @@
 #ifndef USE_HOSTCC
 #include <common.h>
 #include <bootstage.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <env.h>
 #include <errno.h>
@@ -17,6 +18,7 @@
 #include <malloc.h>
 #include <mapmem.h>
 #include <net.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/cache.h>
@@ -28,6 +30,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #else
 #include "mkimage.h"
 #endif
diff --git a/common/bootm_os.c b/common/bootm_os.c
index 16c8a78722ad..d76533dd0b56 100644
--- a/common/bootm_os.c
+++ b/common/bootm_os.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <bootm.h>
 #include <bootstage.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <efi_loader.h>
 #include <env.h>
@@ -14,6 +15,7 @@
 #include <image.h>
 #include <lmb.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
@@ -24,6 +26,7 @@
 #include <mapmem.h>
 #include <vxworks.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <tee/optee.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/common/bootretry.c b/common/bootretry.c
index 41d52a7b9c14..6f4fb4b2afdc 100644
--- a/common/bootretry.c
+++ b/common/bootretry.c
@@ -14,6 +14,7 @@
 #include <vsprintf.h>
 #include <watchdog.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #ifndef CONFIG_BOOT_RETRY_MIN
 #define CONFIG_BOOT_RETRY_MIN CONFIG_BOOT_RETRY_TIME
diff --git a/common/bootstage.c b/common/bootstage.c
index ddb78a5dcea6..721003a3a42e 100644
--- a/common/bootstage.c
+++ b/common/bootstage.c
@@ -24,6 +24,7 @@
 #include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/common/bouncebuf.c b/common/bouncebuf.c
index 8051c016942e..39b27d6540dc 100644
--- a/common/bouncebuf.c
+++ b/common/bouncebuf.c
@@ -15,6 +15,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static int addr_aligned(struct bounce_buffer *state)
 {
diff --git a/common/cli.c b/common/cli.c
index a83c606ee9eb..f1bc0f621c45 100644
--- a/common/cli.c
+++ b/common/cli.c
@@ -13,6 +13,7 @@
 #include <cli.h>
 #include <cli_hush.h>
 #include <command.h>
+#include <compiler.h>
 #include <console.h>
 #include <env.h>
 #include <fdtdec.h>
diff --git a/common/cli_hush.c b/common/cli_hush.c
index 828b10db860e..a6b6c5e5ee6f 100644
--- a/common/cli_hush.c
+++ b/common/cli_hush.c
@@ -92,6 +92,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #endif
 #ifndef __U_BOOT__
 #include <ctype.h>     /* isalpha, isdigit */
diff --git a/common/cli_readline.c b/common/cli_readline.c
index 78c1faad8f75..066b9089f1fe 100644
--- a/common/cli_readline.c
+++ b/common/cli_readline.c
@@ -17,6 +17,7 @@
 #include <watchdog.h>
 #include <asm/global_data.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/common/command.c b/common/command.c
index dfad65d735cd..528d353aca43 100644
--- a/common/command.c
+++ b/common/command.c
@@ -19,6 +19,7 @@
 #include <asm/global_data.h>
 #include <linux/ctype.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /*
  * Use puts() instead of printf() to avoid printf buffer overflow
diff --git a/common/common_fit.c b/common/common_fit.c
index 8872b83646af..0db92f48320a 100644
--- a/common/common_fit.c
+++ b/common/common_fit.c
@@ -12,6 +12,7 @@
 #include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 ulong fdt_getprop_u32(const void *fdt, int node, const char *prop)
 {
diff --git a/common/console.c b/common/console.c
index 489afe602ab6..fd0786714d0c 100644
--- a/common/console.c
+++ b/common/console.c
@@ -26,6 +26,7 @@
 #include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/common/ddr_spd.c b/common/ddr_spd.c
index 241549bd4856..ad94e54b73b3 100644
--- a/common/ddr_spd.c
+++ b/common/ddr_spd.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <ddr_spd.h>
 #include <stdio.h>
+#include <linux/types.h>
 
 /* used for ddr1 and ddr2 spd */
 static int
diff --git a/common/dlmalloc.c b/common/dlmalloc.c
index 0f9e0d943785..be4c1b273dfd 100644
--- a/common/dlmalloc.c
+++ b/common/dlmalloc.c
@@ -5,6 +5,7 @@
 #include <asm/global_data.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #if CONFIG_IS_ENABLED(UNIT_TEST)
 #define DEBUG
diff --git a/common/edid.c b/common/edid.c
index a1b266e9c180..a6c6170f2e37 100644
--- a/common/edid.c
+++ b/common/edid.c
@@ -14,11 +14,13 @@
 #include <errno.h>
 #include <fdtdec.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <linux/ctype.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 int edid_check_info(struct edid1_info *edid_info)
 {
diff --git a/common/eeprom/eeprom_layout.c b/common/eeprom/eeprom_layout.c
index cfe457c7444d..d2f87f4f2518 100644
--- a/common/eeprom/eeprom_layout.c
+++ b/common/eeprom/eeprom_layout.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <stdio.h>
 #include <linux/kernel.h>
 #include <eeprom_layout.h>
diff --git a/common/fdt_support.c b/common/fdt_support.c
index 230e599a44c5..e78999f6dafa 100644
--- a/common/fdt_support.c
+++ b/common/fdt_support.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <mapmem.h>
 #include <net.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdio_dev.h>
 #include <vsprintf.h>
diff --git a/common/flash.c b/common/flash.c
index c01cb28b92f9..18b6f89b0c33 100644
--- a/common/flash.c
+++ b/common/flash.c
@@ -12,6 +12,7 @@
 #include <stdio.h>
 #include <uuid.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <mtd/cfi_flash.h>
 
diff --git a/common/hash.c b/common/hash.c
index 91b2fc41eb57..a37172be8be7 100644
--- a/common/hash.c
+++ b/common/hash.c
@@ -17,6 +17,7 @@
 #include <malloc.h>
 #include <mapmem.h>
 #include <hw_sha.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/cache.h>
@@ -25,6 +26,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <u-boot/crc.h>
 #else
 #include "mkimage.h"
diff --git a/common/hwconfig.c b/common/hwconfig.c
index 26a561c365b7..1ecb5596cfa1 100644
--- a/common/hwconfig.c
+++ b/common/hwconfig.c
@@ -56,6 +56,7 @@ next:
 
 		arg_end = strpbrk(str, stopchs);
 		if (!arg_end)
+#include <linux/kernel.h>
 			*arglen = min(maxlen, strlen(str)) - optlen - 1;
 		else
 			*arglen = arg_end - end - 1;
diff --git a/common/image-android-dt.c b/common/image-android-dt.c
index 456c4c584f0f..eb1150552cbd 100644
--- a/common/image-android-dt.c
+++ b/common/image-android-dt.c
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <linux/libfdt.h>
 #include <mapmem.h>
+#include <linux/types.h>
 
 /**
  * Check if image header is correct.
diff --git a/common/image-android.c b/common/image-android.c
index a4dea76bde5d..fd115c7a3b49 100644
--- a/common/image-android.c
+++ b/common/image-android.c
@@ -10,6 +10,7 @@
 #include <android_image.h>
 #include <malloc.h>
 #include <errno.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/unaligned.h>
 #include <mapmem.h>
@@ -17,6 +18,7 @@
 #include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define ANDROID_IMAGE_DEFAULT_KERNEL_ADDR	0x10008000
 
diff --git a/common/image-cipher.c b/common/image-cipher.c
index 7a9892b930c6..6ac263af8abb 100644
--- a/common/image-cipher.c
+++ b/common/image-cipher.c
@@ -14,6 +14,7 @@
 #include <asm/global_data.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 DECLARE_GLOBAL_DATA_PTR;
 #endif /* !USE_HOSdTCC*/
 #include <image.h>
diff --git a/common/image-fdt.c b/common/image-fdt.c
index c05495ee36c2..c44bad2f65fb 100644
--- a/common/image-fdt.c
+++ b/common/image-fdt.c
@@ -9,6 +9,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <fdt_support.h>
 #include <fdtdec.h>
 #include <env.h>
@@ -25,6 +26,7 @@
 #include <mapmem.h>
 #include <asm/io.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <tee/optee.h>
 
 #ifndef CONFIG_SYS_FDT_PAD
diff --git a/common/image-fit-sig.c b/common/image-fit-sig.c
index 52e82777e3d0..8272fbd6734f 100644
--- a/common/image-fit-sig.c
+++ b/common/image-fit-sig.c
@@ -10,11 +10,13 @@
 #include <common.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 DECLARE_GLOBAL_DATA_PTR;
 #endif /* !USE_HOSTCC*/
 #include <fdt_region.h>
diff --git a/common/image-fit.c b/common/image-fit.c
index a0683072b43e..f7a5bb95ec4e 100644
--- a/common/image-fit.c
+++ b/common/image-fit.c
@@ -28,6 +28,7 @@
 #include <malloc.h>
 #include <asm/global_data.h>
 #include <linux/string.h>
+#include <linux/types.h>
 DECLARE_GLOBAL_DATA_PTR;
 #endif /* !USE_HOSTCC*/
 
diff --git a/common/image-sig.c b/common/image-sig.c
index aef02638d79f..a177b26b96b5 100644
--- a/common/image-sig.c
+++ b/common/image-sig.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
diff --git a/common/image.c b/common/image.c
index 341807059ee9..5e01da530318 100644
--- a/common/image.c
+++ b/common/image.c
@@ -15,12 +15,14 @@
 #include <lmb.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/cache.h>
 #include <asm/u-boot.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <u-boot/crc.h>
 #include <watchdog.h>
 
diff --git a/common/init/board_init.c b/common/init/board_init.c
index d3059c46bdcf..93f618f69a57 100644
--- a/common/init/board_init.c
+++ b/common/init/board_init.c
@@ -8,10 +8,12 @@
 
 #include <common.h>
 #include <bootstage.h>
+#include <compiler.h>
 #include <init.h>
 #include <asm/global_data.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/common/iotrace.c b/common/iotrace.c
index d342e317d632..ebc7c29d3f02 100644
--- a/common/iotrace.c
+++ b/common/iotrace.c
@@ -12,6 +12,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/bug.h>
+#include <linux/types.h>
 #include <u-boot/crc.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/common/lcd.c b/common/lcd.c
index b4352229c5b2..4f38de6863f7 100644
--- a/common/lcd.c
+++ b/common/lcd.c
@@ -7,6 +7,7 @@
  */
 
 /* #define DEBUG */
+#include <compiler.h>
 #include <config.h>
 #include <common.h>
 #include <command.h>
diff --git a/common/lcd_console.c b/common/lcd_console.c
index fe2ef2f5b9e6..3ce4d9806717 100644
--- a/common/lcd_console.c
+++ b/common/lcd_console.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <lcd.h>
 #include <log.h>
 #include <serial.h>
@@ -19,6 +20,7 @@
 #include <vsprintf.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static struct console_t cons;
 
diff --git a/common/lcd_console_rotation.c b/common/lcd_console_rotation.c
index 8fc333d4e323..8bbaafa4d8c6 100644
--- a/common/lcd_console_rotation.c
+++ b/common/lcd_console_rotation.c
@@ -8,6 +8,7 @@
 #include <lcd.h>
 #include <stdio.h>
 #include <video_font.h>		/* Get font data, width and height */
+#include <linux/types.h>
 
 static void lcd_putc_xy90(struct console_t *pcons, ushort x, ushort y, char c)
 {
diff --git a/common/lcd_simplefb.c b/common/lcd_simplefb.c
index 7a2f0056fd4e..4c4ec25a47c9 100644
--- a/common/lcd_simplefb.c
+++ b/common/lcd_simplefb.c
@@ -14,6 +14,7 @@
 #include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <video.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/common/log.c b/common/log.c
index c8d13365caa3..1d42fb34b1bc 100644
--- a/common/log.c
+++ b/common/log.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <stdarg.h>
+#include <stdbool.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <dm/uclass.h>
diff --git a/common/log_syslog.c b/common/log_syslog.c
index 21c10511df15..af2a78d4f951 100644
--- a/common/log_syslog.c
+++ b/common/log_syslog.c
@@ -12,6 +12,7 @@
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/common/malloc_simple.c b/common/malloc_simple.c
index b8b9d7608cd5..fc436f3e1121 100644
--- a/common/malloc_simple.c
+++ b/common/malloc_simple.c
@@ -15,6 +15,7 @@
 #include <asm/io.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/common/memsize.c b/common/memsize.c
index d5d13d51bf1f..30a090ce5d3e 100644
--- a/common/memsize.c
+++ b/common/memsize.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <init.h>
 #include <asm/global_data.h>
 
diff --git a/common/s_record.c b/common/s_record.c
index 2b7651fcffca..07fad02961e9 100644
--- a/common/s_record.c
+++ b/common/s_record.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <s_record.h>
+#include <linux/types.h>
 
 static int hex1_bin (char  c);
 static int hex2_bin (char *s);
diff --git a/common/spl/spl.c b/common/spl/spl.c
index 51d777f4ee7a..8d8f5c019e51 100644
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -10,6 +10,7 @@
 #include <bloblist.h>
 #include <binman_sym.h>
 #include <bootstage.h>
+#include <compiler.h>
 #include <dm.h>
 #include <handoff.h>
 #include <hang.h>
@@ -18,6 +19,7 @@
 #include <log.h>
 #include <serial.h>
 #include <spl.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
@@ -27,6 +29,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <u-boot/crc.h>
 #include <version.h>
 #include <image.h>
diff --git a/common/spl/spl_atf.c b/common/spl/spl_atf.c
index 6c3e839e8558..cbb6194fb0a4 100644
--- a/common/spl/spl_atf.c
+++ b/common/spl/spl_atf.c
@@ -11,6 +11,7 @@
 
 #include <common.h>
 #include <atf_common.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <errno.h>
 #include <image.h>
@@ -18,6 +19,7 @@
 #include <spl.h>
 #include <asm/cache.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static struct bl2_to_bl31_params_mem bl31_params_mem;
 static struct bl31_params *bl2_to_bl31_params;
diff --git a/common/spl/spl_bootrom.c b/common/spl/spl_bootrom.c
index 0eefd39a5198..cef23ca2a598 100644
--- a/common/spl/spl_bootrom.c
+++ b/common/spl/spl_bootrom.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <spl.h>
 
 __weak int board_return_to_bootrom(struct spl_image_info *spl_image,
diff --git a/common/spl/spl_ext.c b/common/spl/spl_ext.c
index 4f152270da77..6b37653d5586 100644
--- a/common/spl/spl_ext.c
+++ b/common/spl/spl_ext.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <image.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 int spl_load_image_ext(struct spl_image_info *spl_image,
 		       struct blk_desc *block_dev, int partition,
diff --git a/common/spl/spl_fat.c b/common/spl/spl_fat.c
index f31fdee02bac..8ed7567f0f28 100644
--- a/common/spl/spl_fat.c
+++ b/common/spl/spl_fat.c
@@ -19,6 +19,7 @@
 #include <image.h>
 #include <linux/errno.h>
 #include <linux/libfdt.h>
+#include <linux/types.h>
 
 static int fat_registered;
 
diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c
index 7a65035ba869..9afde9abefbc 100644
--- a/common/spl/spl_fit.c
+++ b/common/spl/spl_fit.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <errno.h>
 #include <board.h>
 #include <fpga.h>
@@ -21,6 +22,7 @@
 #include <linux/libfdt.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/common/spl/spl_legacy.c b/common/spl/spl_legacy.c
index d8ca3e9873bd..390fa72b7cf9 100644
--- a/common/spl/spl_legacy.c
+++ b/common/spl/spl_legacy.c
@@ -10,6 +10,7 @@
 #include <spl.h>
 #include <stdio.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #include <lzma/LzmaTypes.h>
 #include <lzma/LzmaDec.h>
diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c
index 897ea3fbfa6f..2c6ccb20bf91 100644
--- a/common/spl/spl_mmc.c
+++ b/common/spl/spl_mmc.c
@@ -6,6 +6,7 @@
  * Aneesh V <aneesh@ti.com>
  */
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
 #include <part.h>
@@ -18,6 +19,7 @@
 #include <mmc.h>
 #include <image.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 static int mmc_load_legacy(struct spl_image_info *spl_image, struct mmc *mmc,
 			   ulong sector, struct image_header *header)
diff --git a/common/spl/spl_nand.c b/common/spl/spl_nand.c
index 15101f394233..6fb7001c2810 100644
--- a/common/spl/spl_nand.c
+++ b/common/spl/spl_nand.c
@@ -4,6 +4,7 @@
  * Corscience GmbH & Co. KG - Simon Schwarz <schwarz@corscience.de>
  */
 #include <common.h>
+#include <compiler.h>
 #include <config.h>
 #include <fdt_support.h>
 #include <image.h>
@@ -14,6 +15,7 @@
 #include <nand.h>
 #include <linux/libfdt_env.h>
 #include <fdt.h>
+#include <linux/types.h>
 
 uint32_t __weak spl_nand_get_uboot_raw_page(void)
 {
diff --git a/common/spl/spl_net.c b/common/spl/spl_net.c
index b4a0a56b7016..102d64cd50f7 100644
--- a/common/spl/spl_net.c
+++ b/common/spl/spl_net.c
@@ -17,6 +17,7 @@
 #include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #if defined(CONFIG_SPL_ETH_SUPPORT) || defined(CONFIG_SPL_USB_ETHER)
 static ulong spl_net_load_read(struct spl_load_info *load, ulong sector,
diff --git a/common/spl/spl_nor.c b/common/spl/spl_nor.c
index a198577a2bdf..3201b09720c4 100644
--- a/common/spl/spl_nor.c
+++ b/common/spl/spl_nor.c
@@ -4,11 +4,13 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <image.h>
 #include <log.h>
 #include <spl.h>
 #include <stdio.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static ulong spl_nor_load_read(struct spl_load_info *load, ulong sector,
 			       ulong count, void *buf)
diff --git a/common/spl/spl_opensbi.c b/common/spl/spl_opensbi.c
index 086759d63f2d..e75d94b6df7b 100644
--- a/common/spl/spl_opensbi.c
+++ b/common/spl/spl_opensbi.c
@@ -17,6 +17,7 @@
 #include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/common/spl/spl_ram.c b/common/spl/spl_ram.c
index 7ea0a32b0d72..e993c643f20e 100644
--- a/common/spl/spl_ram.c
+++ b/common/spl/spl_ram.c
@@ -17,6 +17,7 @@
 #include <spl.h>
 #include <linux/libfdt.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #ifndef CONFIG_SPL_LOAD_FIT_ADDRESS
 # define CONFIG_SPL_LOAD_FIT_ADDRESS	0
diff --git a/common/spl/spl_sata.c b/common/spl/spl_sata.c
index 33311c2813ad..029c23e91018 100644
--- a/common/spl/spl_sata.c
+++ b/common/spl/spl_sata.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <spl.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <sata.h>
 #include <scsi.h>
diff --git a/common/spl/spl_spi.c b/common/spl/spl_spi.c
index 0974e9e6f5db..8ca3d99af6a7 100644
--- a/common/spl/spl_spi.c
+++ b/common/spl/spl_spi.c
@@ -9,6 +9,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <image.h>
 #include <log.h>
 #include <spi.h>
@@ -19,6 +20,7 @@
 #include <asm/global_data.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/common/spl/spl_ymodem.c b/common/spl/spl_ymodem.c
index f9c7c2b04fc9..f197a96ca40d 100644
--- a/common/spl/spl_ymodem.c
+++ b/common/spl/spl_ymodem.c
@@ -19,6 +19,7 @@
 #include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define BUF_SIZE 1024
 
diff --git a/common/splash.c b/common/splash.c
index 575003e65613..e6d177ec9b5f 100644
--- a/common/splash.c
+++ b/common/splash.c
@@ -21,6 +21,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <display_options.h>
 #include <env.h>
 #include <splash.h>
@@ -30,6 +31,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static struct splash_location default_splash_locations[] = {
 	{
diff --git a/common/splash_source.c b/common/splash_source.c
index be7e90c38809..33989d876b3b 100644
--- a/common/splash_source.c
+++ b/common/splash_source.c
@@ -19,6 +19,7 @@
 #include <spi.h>
 #include <spi_flash.h>
 #include <splash.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <usb.h>
 #include <vsprintf.h>
@@ -26,6 +27,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/common/stdio.c b/common/stdio.c
index 634ab9203af2..413c4880df10 100644
--- a/common/stdio.c
+++ b/common/stdio.c
@@ -23,6 +23,7 @@
 #include <asm/global_data.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #if defined(CONFIG_SYS_I2C)
 #include <i2c.h>
diff --git a/common/update.c b/common/update.c
index f5041c6171a8..4520519c6676 100644
--- a/common/update.c
+++ b/common/update.c
@@ -15,6 +15,7 @@
 #include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #if !(defined(CONFIG_FIT) && defined(CONFIG_OF_LIBFDT))
 #error "CONFIG_FIT and CONFIG_OF_LIBFDT are required for auto-update feature"
diff --git a/common/usb.c b/common/usb.c
index 98e7582c2a27..73bfe24dc3cf 100644
--- a/common/usb.c
+++ b/common/usb.c
@@ -27,6 +27,7 @@
  */
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
 #include <malloc.h>
@@ -43,6 +44,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define USB_BUFSIZ	512
 
diff --git a/common/usb_hub.c b/common/usb_hub.c
index 5abbb1b0a400..921e8b7cdbf0 100644
--- a/common/usb_hub.c
+++ b/common/usb_hub.c
@@ -23,16 +23,19 @@
 
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <dm.h>
 #include <env.h>
 #include <errno.h>
 #include <log.h>
 #include <malloc.h>
 #include <memalign.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <vsprintf.h>
 #include <asm/processor.h>
+#include <asm/types.h>
 #include <asm/unaligned.h>
 #include <linux/ctype.h>
 #include <linux/delay.h>
diff --git a/common/usb_kbd.c b/common/usb_kbd.c
index b2967330b698..c5236eacb369 100644
--- a/common/usb_kbd.c
+++ b/common/usb_kbd.c
@@ -22,6 +22,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <usb.h>
 
diff --git a/common/usb_storage.c b/common/usb_storage.c
index d46e9288c05f..34f57cf26bd1 100644
--- a/common/usb_storage.c
+++ b/common/usb_storage.c
@@ -50,6 +50,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <part.h>
 #include <usb.h>
diff --git a/common/xyzModem.c b/common/xyzModem.c
index 732548f4f2d3..8868f0e23111 100644
--- a/common/xyzModem.c
+++ b/common/xyzModem.c
@@ -27,6 +27,7 @@
 #include <vsprintf.h>
 #include <xyzModem.h>
 #include <stdarg.h>
+#include <linux/types.h>
 #include <u-boot/crc.h>
 #include <watchdog.h>
 
diff --git a/disk/part.c b/disk/part.c
index aa10ed3134b3..118fa9e1e1d1 100644
--- a/disk/part.c
+++ b/disk/part.c
@@ -18,6 +18,7 @@
 #include <vsprintf.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #undef	PART_DEBUG
 
diff --git a/disk/part_amiga.c b/disk/part_amiga.c
index 40ae1466788f..22d248dafb05 100644
--- a/disk/part_amiga.c
+++ b/disk/part_amiga.c
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "part_amiga.h"
 #include <part.h>
 
diff --git a/disk/part_amiga.h b/disk/part_amiga.h
index 42f5eb0f941c..3c519ac420a6 100644
--- a/disk/part_amiga.h
+++ b/disk/part_amiga.h
@@ -8,6 +8,7 @@
 #ifndef _DISK_PART_AMIGA_H
 #define _DISK_PART_AMIGA_H
 #include <common.h>
+#include <asm/types.h>
 
 #if CONFIG_IS_ENABLED(ISO_PARTITION)
 /* Make the buffers bigger if ISO partition support is enabled -- CD-ROMS
diff --git a/disk/part_dos.c b/disk/part_dos.c
index 4c4e5dfe11c7..e19e82783322 100644
--- a/disk/part_dos.c
+++ b/disk/part_dos.c
@@ -21,6 +21,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "part_dos.h"
 #include <part.h>
 
diff --git a/disk/part_efi.c b/disk/part_efi.c
index f062bc383ea8..d69d6ef152c4 100644
--- a/disk/part_efi.c
+++ b/disk/part_efi.c
@@ -30,6 +30,7 @@
 #include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <u-boot/crc.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/disk/part_iso.c b/disk/part_iso.c
index accb95da3bc2..82074226fe50 100644
--- a/disk/part_iso.c
+++ b/disk/part_iso.c
@@ -12,6 +12,7 @@
 #include <asm/cache.h>
 #include <asm/unaligned.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "part_iso.h"
 
 #ifdef CONFIG_HAVE_BLOCK_DEVICE
diff --git a/disk/part_mac.c b/disk/part_mac.c
index 2d9aa380168c..f5f5f510214f 100644
--- a/disk/part_mac.c
+++ b/disk/part_mac.c
@@ -18,6 +18,7 @@
 #include <memalign.h>
 #include <ide.h>
 #include <stdio.h>
+#include <linux/types.h>
 #include "part_mac.h"
 #include <part.h>
 
diff --git a/disk/part_mac.h b/disk/part_mac.h
index 5f396c94089d..884494b1acdb 100644
--- a/disk/part_mac.h
+++ b/disk/part_mac.h
@@ -7,6 +7,7 @@
 /*
  * See also Linux sources, fs/partitions/mac.h
  *
+#include <linux/types.h>
  * This file describes structures and values related to the standard
  * Apple SCSI disk partitioning scheme. For more information see:
  * http://developer.apple.com/techpubs/mac/Devices/Devices-126.html#MARKER-14-92
diff --git a/drivers/adc/meson-saradc.c b/drivers/adc/meson-saradc.c
index cf2d0c144083..4148d5322394 100644
--- a/drivers/adc/meson-saradc.c
+++ b/drivers/adc/meson-saradc.c
@@ -13,6 +13,7 @@
 #include <dm.h>
 #include <regmap.h>
 #include <errno.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
@@ -22,6 +23,7 @@
 #include <linux/math64.h>
 #include <linux/bitfield.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 #define MESON_SAR_ADC_REG0					0x00
 	#define MESON_SAR_ADC_REG0_PANEL_DETECT			BIT(31)
diff --git a/drivers/adc/rockchip-saradc.c b/drivers/adc/rockchip-saradc.c
index 26e037509cdc..307a263d36ec 100644
--- a/drivers/adc/rockchip-saradc.c
+++ b/drivers/adc/rockchip-saradc.c
@@ -15,6 +15,7 @@
 #include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 #define SARADC_CTRL_CHN_MASK		GENMASK(2, 0)
 #define SARADC_CTRL_POWER_CTRL		BIT(3)
diff --git a/drivers/adc/stm32-adc-core.c b/drivers/adc/stm32-adc-core.c
index e4e348120616..676e420c7449 100644
--- a/drivers/adc/stm32-adc-core.c
+++ b/drivers/adc/stm32-adc-core.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <dm.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
diff --git a/drivers/adc/stm32-adc-core.h b/drivers/adc/stm32-adc-core.h
index 05968dbcc8b4..cb5087f28c67 100644
--- a/drivers/adc/stm32-adc-core.h
+++ b/drivers/adc/stm32-adc-core.h
@@ -27,6 +27,7 @@
 #define STM32_ADCX_COMN_OFFSET		0x300
 
 #include <clk.h>
+#include <compiler.h>
 
 struct udevice;
 
diff --git a/drivers/adc/stm32-adc.c b/drivers/adc/stm32-adc.c
index d0ac0a8c0a9b..4a9b15a48ac6 100644
--- a/drivers/adc/stm32-adc.c
+++ b/drivers/adc/stm32-adc.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <adc.h>
+#include <compiler.h>
 #include <dm.h>
 #include <stdbool.h>
 #include <asm/io.h>
@@ -16,6 +17,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/iopoll.h>
+#include <linux/types.h>
 #include "stm32-adc-core.h"
 
 /* STM32H7 - Registers for each ADC instance */
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index 1424708b59cf..847d5a60f295 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -10,6 +10,7 @@
  */
 #include <common.h>
 #include <blk.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <log.h>
 #include <stdio.h>
@@ -18,6 +19,7 @@
 #include <linux/delay.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <command.h>
 #include <dm.h>
diff --git a/drivers/ata/ahci_mvebu.c b/drivers/ata/ahci_mvebu.c
index 8be1826d4055..58e2ef2904c2 100644
--- a/drivers/ata/ahci_mvebu.c
+++ b/drivers/ata/ahci_mvebu.c
@@ -5,8 +5,10 @@
 
 #include <common.h>
 #include <ahci.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
+#include <linux/types.h>
 
 /*
  * Dummy implementation that can be overwritten by a board
diff --git a/drivers/ata/ahci_sunxi.c b/drivers/ata/ahci_sunxi.c
index f584317ab23b..f282b88c4ba0 100644
--- a/drivers/ata/ahci_sunxi.c
+++ b/drivers/ata/ahci_sunxi.c
@@ -9,6 +9,7 @@
 #include <asm/gpio.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #define AHCI_PHYCS0R 0x00c0
 #define AHCI_PHYCS1R 0x00c4
diff --git a/drivers/ata/dwc_ahci.c b/drivers/ata/dwc_ahci.c
index 5f37fc92784d..557232491e7f 100644
--- a/drivers/ata/dwc_ahci.c
+++ b/drivers/ata/dwc_ahci.c
@@ -17,6 +17,7 @@
 #include <asm/io.h>
 #include <generic-phy.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 struct dwc_ahci_priv {
 	void *base;
diff --git a/drivers/ata/dwc_ahsata.c b/drivers/ata/dwc_ahsata.c
index 90db0d210148..069c5c5d188a 100644
--- a/drivers/ata/dwc_ahsata.c
+++ b/drivers/ata/dwc_ahsata.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <ahci.h>
 #include <blk.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <dm.h>
 #include <dwc_ahsata.h>
@@ -28,6 +29,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "dwc_ahsata_priv.h"
 
 struct sata_port_regs {
diff --git a/drivers/ata/fsl_sata.c b/drivers/ata/fsl_sata.c
index f90835758b73..f977abd7973c 100644
--- a/drivers/ata/fsl_sata.c
+++ b/drivers/ata/fsl_sata.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <blk.h>
 #include <command.h>
+#include <compiler.h>
 #include <console.h>
 #include <cpu_func.h>
 #include <log.h>
@@ -24,6 +25,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "fsl_sata.h"
 
 #if CONFIG_IS_ENABLED(BLK)
diff --git a/drivers/ata/fsl_sata.h b/drivers/ata/fsl_sata.h
index 5b9daa79e023..cf57e69c1b0d 100644
--- a/drivers/ata/fsl_sata.h
+++ b/drivers/ata/fsl_sata.h
@@ -8,6 +8,7 @@
 #ifndef __FSL_SATA_H__
 #define __FSL_SATA_H__
 
+#include <linux/types.h>
 #define SATA_HC_MAX_NUM		4 /* Max host controller numbers */
 #define SATA_HC_MAX_CMD		16 /* Max command queue depth per host controller */
 #define SATA_HC_MAX_PORT	16 /* Max port number per host controller */
diff --git a/drivers/ata/libata.c b/drivers/ata/libata.c
index c830ef490252..3af7034708aa 100644
--- a/drivers/ata/libata.c
+++ b/drivers/ata/libata.c
@@ -9,6 +9,7 @@
 #include <compiler.h>
 #include <libata.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/string.h>
 
 u64 ata_id_n_sectors(u16 *id)
diff --git a/drivers/ata/mvsata_ide.c b/drivers/ata/mvsata_ide.c
index 41f9a91617d4..b312570387c9 100644
--- a/drivers/ata/mvsata_ide.c
+++ b/drivers/ata/mvsata_ide.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 #if defined(CONFIG_ARCH_ORION5X)
diff --git a/drivers/ata/sata.c b/drivers/ata/sata.c
index 453338e944b7..4c2446e6cf66 100644
--- a/drivers/ata/sata.c
+++ b/drivers/ata/sata.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <ahci.h>
 #include <blk.h>
+#include <compiler.h>
 #include <dm.h>
 #include <part.h>
 #include <sata.h>
diff --git a/drivers/ata/sata_ceva.c b/drivers/ata/sata_ceva.c
index cd10d228964a..dd6440062827 100644
--- a/drivers/ata/sata_ceva.c
+++ b/drivers/ata/sata_ceva.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <linux/ioport.h>
+#include <linux/types.h>
 
 /* Vendor Specific Register Offsets */
 #define AHCI_VEND_PCFG  0xA4
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index b459ac5aa3bf..c5e8bd264a69 100644
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -55,6 +55,7 @@
 #include <linux/kernel.h>
 #include <linux/mbus.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <asm/arch/soc.h>
 #if defined(CONFIG_ARCH_KIRKWOOD)
diff --git a/drivers/ata/sata_sandbox.c b/drivers/ata/sata_sandbox.c
index e64cc4a5c10c..721fbabfb173 100644
--- a/drivers/ata/sata_sandbox.c
+++ b/drivers/ata/sata_sandbox.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <blk.h>
+#include <linux/types.h>
 
 int init_sata(int dev)
 {
diff --git a/drivers/ata/sata_sil.c b/drivers/ata/sata_sil.c
index 54a9141808b5..2f7b9189bab3 100644
--- a/drivers/ata/sata_sil.c
+++ b/drivers/ata/sata_sil.c
@@ -22,6 +22,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #if CONFIG_IS_ENABLED(BLK)
 #include <dm.h>
diff --git a/drivers/ata/sata_sil.h b/drivers/ata/sata_sil.h
index a300c0c38875..a26bdf209cca 100644
--- a/drivers/ata/sata_sil.h
+++ b/drivers/ata/sata_sil.h
@@ -8,6 +8,7 @@
 #ifndef SATA_SIL3132_H
 #define SATA_SIL3132_H
 
+#include <linux/types.h>
 #define READ_CMD	0
 #define WRITE_CMD	1
 
diff --git a/drivers/ata/sata_sil3114.c b/drivers/ata/sata_sil3114.c
index 4d3a680f17f0..56cee31754bd 100644
--- a/drivers/ata/sata_sil3114.c
+++ b/drivers/ata/sata_sil3114.c
@@ -20,6 +20,7 @@
 #include <sata.h>
 #include <libata.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 #include "sata_sil3114.h"
 
 /* Convert sectorsize to wordsize */
diff --git a/drivers/axi/axi-emul-uclass.c b/drivers/axi/axi-emul-uclass.c
index e4ba71f21f1b..7b4ee9c9248a 100644
--- a/drivers/axi/axi-emul-uclass.c
+++ b/drivers/axi/axi-emul-uclass.c
@@ -12,6 +12,7 @@
 #include <asm/axi.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 int axi_sandbox_get_emul(struct udevice *bus, ulong address,
 			 enum axi_size_t size, struct udevice **emulp)
diff --git a/drivers/axi/axi-uclass.c b/drivers/axi/axi-uclass.c
index 3d642e710784..e0667957bf3e 100644
--- a/drivers/axi/axi-uclass.c
+++ b/drivers/axi/axi-uclass.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <axi.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 int axi_read(struct udevice *dev, ulong address, void *data,
 	     enum axi_size_t size)
diff --git a/drivers/axi/axi_sandbox.c b/drivers/axi/axi_sandbox.c
index 41f62065e8ed..9ac065df1b9d 100644
--- a/drivers/axi/axi_sandbox.c
+++ b/drivers/axi/axi_sandbox.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <asm/axi.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 /*
  * This driver implements a AXI bus for the sandbox architecture for testing
diff --git a/drivers/axi/ihs_axi.c b/drivers/axi/ihs_axi.c
index 0e4cbab9762c..0b9eaf842fb2 100644
--- a/drivers/axi/ihs_axi.c
+++ b/drivers/axi/ihs_axi.c
@@ -15,6 +15,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 /**
  * struct ihs_axi_regs - Structure for the register map of a IHS AXI device
diff --git a/drivers/axi/sandbox_store.c b/drivers/axi/sandbox_store.c
index 7342230eb7f3..14eaddf2a776 100644
--- a/drivers/axi/sandbox_store.c
+++ b/drivers/axi/sandbox_store.c
@@ -11,6 +11,7 @@
 #include <malloc.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 /**
  * struct sandbox_store_priv - Private data structure of a AXI store device
diff --git a/drivers/bios_emulator/atibios.c b/drivers/bios_emulator/atibios.c
index b57d512ebb7d..1444ffe446af 100644
--- a/drivers/bios_emulator/atibios.c
+++ b/drivers/bios_emulator/atibios.c
@@ -57,6 +57,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "biosemui.h"
 
 /* Length of the BIOS image */
diff --git a/drivers/bios_emulator/besys.c b/drivers/bios_emulator/besys.c
index a8475b138866..d78a128372a5 100644
--- a/drivers/bios_emulator/besys.c
+++ b/drivers/bios_emulator/besys.c
@@ -51,6 +51,7 @@
 #include <common.h>
 #include <stdio.h>
 #include <asm/io.h>
+#include <linux/types.h>
 #include "biosemui.h"
 
 /*------------------------- Global Variables ------------------------------*/
diff --git a/drivers/bios_emulator/bios.c b/drivers/bios_emulator/bios.c
index af27582275b0..ff942c39a0d5 100644
--- a/drivers/bios_emulator/bios.c
+++ b/drivers/bios_emulator/bios.c
@@ -45,6 +45,7 @@
 #include <common.h>
 #include <stdio.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include "biosemui.h"
 
 /*----------------------------- Implementation ----------------------------*/
diff --git a/drivers/bios_emulator/biosemu.c b/drivers/bios_emulator/biosemu.c
index ca083a4d6467..b73723337fc9 100644
--- a/drivers/bios_emulator/biosemu.c
+++ b/drivers/bios_emulator/biosemu.c
@@ -49,6 +49,7 @@
 #include <common.h>
 #include <stdio.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "biosemui.h"
 
 BE_sysEnv _BE_env = {{0}};
diff --git a/drivers/bios_emulator/include/biosemu.h b/drivers/bios_emulator/include/biosemu.h
index 124d79d80e1c..2857cb9bf391 100644
--- a/drivers/bios_emulator/include/biosemu.h
+++ b/drivers/bios_emulator/include/biosemu.h
@@ -44,6 +44,7 @@
 #define __BIOSEMU_H
 
 #include <bios_emul.h>
+#include <linux/types.h>
 
 #ifdef __KERNEL__
 #include "x86emu.h"
diff --git a/drivers/bios_emulator/include/x86emu/debug.h b/drivers/bios_emulator/include/x86emu/debug.h
index e80c89d763db..b09d30cea551 100644
--- a/drivers/bios_emulator/include/x86emu/debug.h
+++ b/drivers/bios_emulator/include/x86emu/debug.h
@@ -40,6 +40,7 @@
 #define __X86EMU_DEBUG_H
 
 #include <stdio.h>
+#include <linux/types.h>
 
 /*---------------------- Macros and type definitions ----------------------*/
 
diff --git a/drivers/bios_emulator/include/x86emu/decode.h b/drivers/bios_emulator/include/x86emu/decode.h
index 77769f0094c1..5d4b47fd5427 100644
--- a/drivers/bios_emulator/include/x86emu/decode.h
+++ b/drivers/bios_emulator/include/x86emu/decode.h
@@ -32,6 +32,7 @@
 * Environment:  Any
 * Developer:    Kendall Bennett
 *
+#include <linux/types.h>
 * Description:  Header file for instruction decoding logic.
 *
 ****************************************************************************/
diff --git a/drivers/bios_emulator/include/x86emu/ops.h b/drivers/bios_emulator/include/x86emu/ops.h
index a4f2316ba0d4..eea9f306065a 100644
--- a/drivers/bios_emulator/include/x86emu/ops.h
+++ b/drivers/bios_emulator/include/x86emu/ops.h
@@ -39,6 +39,7 @@
 #ifndef __X86EMU_OPS_H
 #define __X86EMU_OPS_H
 
+#include <asm/types.h>
 extern void (*x86emu_optab[0x100])(u8 op1);
 extern void (*x86emu_optab2[0x100])(u8 op2);
 
diff --git a/drivers/bios_emulator/include/x86emu/prim_ops.h b/drivers/bios_emulator/include/x86emu/prim_ops.h
index 2291e8488a5a..4a1e24e44a4e 100644
--- a/drivers/bios_emulator/include/x86emu/prim_ops.h
+++ b/drivers/bios_emulator/include/x86emu/prim_ops.h
@@ -43,6 +43,7 @@
 extern "C" {                        /* Use "C" linkage when in C++ mode */
 #endif
 
+#include <asm/types.h>
 u16     aaa_word (u16 d);
 u16     aas_word (u16 d);
 u16     aad_word (u16 d);
diff --git a/drivers/bios_emulator/include/x86emu/regs.h b/drivers/bios_emulator/include/x86emu/regs.h
index 4b4c59089239..d92ed8e8f04c 100644
--- a/drivers/bios_emulator/include/x86emu/regs.h
+++ b/drivers/bios_emulator/include/x86emu/regs.h
@@ -41,6 +41,7 @@
 
 /*---------------------- Macros and type definitions ----------------------*/
 
+#include <asm/types.h>
 #include <linux/printk.h>
 #pragma pack(1)
 
diff --git a/drivers/bios_emulator/x86emu/debug.c b/drivers/bios_emulator/x86emu/debug.c
index 0ada5b693b10..3314927eae67 100644
--- a/drivers/bios_emulator/x86emu/debug.c
+++ b/drivers/bios_emulator/x86emu/debug.c
@@ -43,6 +43,7 @@
 #include <linux/ctype.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "x86emu/x86emui.h"
 
 /*----------------------------- Implementation ----------------------------*/
diff --git a/drivers/bios_emulator/x86emu/decode.c b/drivers/bios_emulator/x86emu/decode.c
index e2028eaf0833..a2aa9c16cd42 100644
--- a/drivers/bios_emulator/x86emu/decode.c
+++ b/drivers/bios_emulator/x86emu/decode.c
@@ -33,6 +33,7 @@
 * Developer:	Kendall Bennett
 *
 * Description:	This file includes subroutines which are related to
+#include <linux/types.h>
 *		instruction decoding and accessess of immediate data via IP.  etc.
 *
 ****************************************************************************/
diff --git a/drivers/bios_emulator/x86emu/ops.c b/drivers/bios_emulator/x86emu/ops.c
index 9c8c1eecdda1..a0ce26c59672 100644
--- a/drivers/bios_emulator/x86emu/ops.c
+++ b/drivers/bios_emulator/x86emu/ops.c
@@ -35,6 +35,7 @@
 * Developer:	Kendall Bennett
 *
 * Description:	This file includes subroutines to implement the decoding
+#include <linux/types.h>
 *		and emulation of all the x86 processor instructions.
 *
 * There are approximately 250 subroutines in here, which correspond
diff --git a/drivers/bios_emulator/x86emu/ops2.c b/drivers/bios_emulator/x86emu/ops2.c
index 6cd1ac398252..a933d8db7d0a 100644
--- a/drivers/bios_emulator/x86emu/ops2.c
+++ b/drivers/bios_emulator/x86emu/ops2.c
@@ -37,6 +37,7 @@
 *
 * Description:	This file includes subroutines to implement the decoding
 *		and emulation of all the x86 extended two-byte processor
+#include <linux/types.h>
 *		instructions.
 *
 ****************************************************************************/
diff --git a/drivers/bios_emulator/x86emu/prim_ops.c b/drivers/bios_emulator/x86emu/prim_ops.c
index 7fe968cb817c..a54d68e2ef94 100644
--- a/drivers/bios_emulator/x86emu/prim_ops.c
+++ b/drivers/bios_emulator/x86emu/prim_ops.c
@@ -58,6 +58,7 @@
 * 1   1	  0	0     1
 * 1   1	  1	1     1
 *
+#include <asm/types.h>
 * Construction of table for cout:
 *
 * ab
diff --git a/drivers/bios_emulator/x86emu/sys.c b/drivers/bios_emulator/x86emu/sys.c
index 53891960c0c6..f34da2e238b1 100644
--- a/drivers/bios_emulator/x86emu/sys.c
+++ b/drivers/bios_emulator/x86emu/sys.c
@@ -40,6 +40,7 @@
 ****************************************************************************/
 
 #include <common.h>
+#include <asm/types.h>
 #include <linux/printk.h>
 #include "x86emu/x86emui.h"
 
diff --git a/drivers/block/blk-uclass.c b/drivers/block/blk-uclass.c
index 10fffb096757..9663cf9d6052 100644
--- a/drivers/block/blk-uclass.c
+++ b/drivers/block/blk-uclass.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <part.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <dm/device-internal.h>
@@ -18,6 +19,7 @@
 #include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static const char *if_typename_str[IF_TYPE_COUNT] = {
 	[IF_TYPE_IDE]		= "ide",
diff --git a/drivers/block/blk_legacy.c b/drivers/block/blk_legacy.c
index c1a78f72a368..6ceeb52c808e 100644
--- a/drivers/block/blk_legacy.c
+++ b/drivers/block/blk_legacy.c
@@ -7,10 +7,12 @@
 #include <common.h>
 #include <blk.h>
 #include <part.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 struct blk_driver *blk_driver_lookup_type(int if_type)
 {
diff --git a/drivers/block/ide.c b/drivers/block/ide.c
index c7b37bfe11bb..6db3ccb3cf3c 100644
--- a/drivers/block/ide.c
+++ b/drivers/block/ide.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <ata.h>
 #include <blk.h>
+#include <compiler.h>
 #include <dm.h>
 #include <ide.h>
 #include <log.h>
@@ -17,6 +18,7 @@
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #ifdef __PPC__
 # define EIEIO		__asm__ volatile ("eieio")
diff --git a/drivers/block/sandbox.c b/drivers/block/sandbox.c
index 08c9b6a3b36c..8c471ea24b10 100644
--- a/drivers/block/sandbox.c
+++ b/drivers/block/sandbox.c
@@ -18,6 +18,7 @@
 #include <linux/errno.h>
 #include <dm/device-internal.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/board/board-uclass.c b/drivers/board/board-uclass.c
index 7a83862563cb..efcb7e296911 100644
--- a/drivers/board/board-uclass.c
+++ b/drivers/board/board-uclass.c
@@ -9,6 +9,7 @@
 #include <board.h>
 #include <stdbool.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 int board_get(struct udevice **devp)
 {
diff --git a/drivers/board/sandbox.c b/drivers/board/sandbox.c
index 0ed52a773969..722e322f3026 100644
--- a/drivers/board/sandbox.c
+++ b/drivers/board/sandbox.c
@@ -7,9 +7,11 @@
 #include <common.h>
 #include <dm.h>
 #include <board.h>
+#include <stdbool.h>
 #include <vsprintf.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include "sandbox.h"
 
diff --git a/drivers/bootcount/bootcount-uclass.c b/drivers/bootcount/bootcount-uclass.c
index 81ca0027ebd8..58ba6ef87d46 100644
--- a/drivers/bootcount/bootcount-uclass.c
+++ b/drivers/bootcount/bootcount-uclass.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 int dm_bootcount_get(struct udevice *dev, u32 *bootcount)
 {
diff --git a/drivers/bootcount/bootcount.c b/drivers/bootcount/bootcount.c
index 82de6f720690..093dfd8caae9 100644
--- a/drivers/bootcount/bootcount.c
+++ b/drivers/bootcount/bootcount.c
@@ -5,11 +5,14 @@
  */
 
 #include <bootcount.h>
+#include <compiler.h>
 #include <cpu_func.h>
+#include <stdbool.h>
 #include <asm/cache.h>
 #include <linux/compiler.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #if !defined(CONFIG_DM_BOOTCOUNT)
 /* Now implement the generic default functions */
diff --git a/drivers/bootcount/bootcount_at91.c b/drivers/bootcount/bootcount_at91.c
index c4ab5ceafabd..571d2c26ccdb 100644
--- a/drivers/bootcount/bootcount_at91.c
+++ b/drivers/bootcount/bootcount_at91.c
@@ -4,6 +4,7 @@
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/at91_gpbr.h>
+#include <linux/types.h>
 
 /*
  * We combine the CONFIG_SYS_BOOTCOUNT_MAGIC and bootcount in one 32-bit
diff --git a/drivers/bootcount/bootcount_davinci.c b/drivers/bootcount/bootcount_davinci.c
index 6326957d7b04..279ac660f5d8 100644
--- a/drivers/bootcount/bootcount_davinci.c
+++ b/drivers/bootcount/bootcount_davinci.c
@@ -10,6 +10,7 @@
 
 #include <bootcount.h>
 #include <asm/davinci_rtc.h>
+#include <linux/types.h>
 
 void bootcount_store(ulong a)
 {
diff --git a/drivers/bootcount/bootcount_env.c b/drivers/bootcount/bootcount_env.c
index b75c9002b2c0..7a3e091d5cc6 100644
--- a/drivers/bootcount/bootcount_env.c
+++ b/drivers/bootcount/bootcount_env.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <env.h>
+#include <linux/types.h>
 
 void bootcount_store(ulong a)
 {
diff --git a/drivers/bootcount/bootcount_ext.c b/drivers/bootcount/bootcount_ext.c
index 44f97a1054fd..f20e6632dcce 100644
--- a/drivers/bootcount/bootcount_ext.c
+++ b/drivers/bootcount/bootcount_ext.c
@@ -7,6 +7,7 @@
 #include <fs.h>
 #include <mapmem.h>
 #include <stdio.h>
+#include <linux/types.h>
 
 #define BC_MAGIC	0xbd
 #define BC_VERSION	1
diff --git a/drivers/bootcount/bootcount_i2c.c b/drivers/bootcount/bootcount_i2c.c
index 6f8d12e8fdd5..d0ffe56516db 100644
--- a/drivers/bootcount/bootcount_i2c.c
+++ b/drivers/bootcount/bootcount_i2c.c
@@ -8,6 +8,7 @@
 #include <stdio.h>
 #include <linux/compiler.h>
 #include <i2c.h>
+#include <linux/types.h>
 
 #define BC_MAGIC	0xbc
 
diff --git a/drivers/bootcount/bootcount_ram.c b/drivers/bootcount/bootcount_ram.c
index 8cc30cf40eff..0da8e4e90ef8 100644
--- a/drivers/bootcount/bootcount_ram.c
+++ b/drivers/bootcount/bootcount_ram.c
@@ -9,6 +9,7 @@
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/bootcount/i2c-eeprom.c b/drivers/bootcount/i2c-eeprom.c
index 141713c3d526..ab1ef70986be 100644
--- a/drivers/bootcount/i2c-eeprom.c
+++ b/drivers/bootcount/i2c-eeprom.c
@@ -10,6 +10,7 @@
 #include <i2c_eeprom.h>
 #include <log.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 static const u8 bootcount_magic = 0xbc;
 
diff --git a/drivers/bootcount/rtc.c b/drivers/bootcount/rtc.c
index c6b30cd1483e..c3da933565e5 100644
--- a/drivers/bootcount/rtc.c
+++ b/drivers/bootcount/rtc.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <log.h>
 #include <rtc.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 
 static const u8 bootcount_magic = 0xbc;
diff --git a/drivers/bus/uniphier-system-bus.c b/drivers/bus/uniphier-system-bus.c
index ea08d66a070f..0fbbe3b5a51a 100644
--- a/drivers/bus/uniphier-system-bus.c
+++ b/drivers/bus/uniphier-system-bus.c
@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include <compiler.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/io.h>
diff --git a/drivers/cache/cache-l2x0.c b/drivers/cache/cache-l2x0.c
index a1556fbf1740..5a61ab2c5a2c 100644
--- a/drivers/cache/cache-l2x0.c
+++ b/drivers/cache/cache-l2x0.c
@@ -5,6 +5,7 @@
 #include <common.h>
 #include <command.h>
 #include <dm.h>
+#include <asm/types.h>
 
 #include <asm/io.h>
 #include <asm/pl310.h>
diff --git a/drivers/cache/cache-ncore.c b/drivers/cache/cache-ncore.c
index 279e3c2801bf..24d92e8b04fc 100644
--- a/drivers/cache/cache-ncore.c
+++ b/drivers/cache/cache-ncore.c
@@ -3,11 +3,13 @@
  * Copyright (C) 2019 Intel Corporation <www.intel.com>
  *
  */
+#include <compiler.h>
 #include <dm.h>
 #include <hang.h>
 #include <stdio.h>
 #include <wait_bit.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #include <asm/io.h>
 #include <linux/bitops.h>
diff --git a/drivers/cache/cache-v5l2.c b/drivers/cache/cache-v5l2.c
index 298eadb4af12..5ecb565c1b2f 100644
--- a/drivers/cache/cache-v5l2.c
+++ b/drivers/cache/cache-v5l2.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <command.h>
 #include <cache.h>
+#include <compiler.h>
 #include <dm.h>
 #include <hang.h>
 #include <stdio.h>
@@ -15,6 +16,7 @@
 #include <dm/ofnode.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 struct l2cache {
 	volatile u64	configure;
diff --git a/drivers/clk/altera/clk-agilex.c b/drivers/clk/altera/clk-agilex.c
index 358201e3d986..e3ec96a47e9a 100644
--- a/drivers/clk/altera/clk-agilex.c
+++ b/drivers/clk/altera/clk-agilex.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <log.h>
 #include <stdbool.h>
 #include <asm/global_data.h>
@@ -15,6 +16,7 @@
 #include <dt-bindings/clock/agilex-clock.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #include <asm/arch/clock_manager.h>
 
diff --git a/drivers/clk/altera/clk-agilex.h b/drivers/clk/altera/clk-agilex.h
index cd68ebc4387e..2df7844963cd 100644
--- a/drivers/clk/altera/clk-agilex.h
+++ b/drivers/clk/altera/clk-agilex.h
@@ -7,6 +7,7 @@
 #define	_CLK_AGILEX_
 
 #ifndef __ASSEMBLY__
+#include <asm/types.h>
 #include <linux/bitops.h>
 #endif
 
diff --git a/drivers/clk/altera/clk-arria10.c b/drivers/clk/altera/clk-arria10.c
index 53e28ed76d0a..5c195bdb1b24 100644
--- a/drivers/clk/altera/clk-arria10.c
+++ b/drivers/clk/altera/clk-arria10.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <clk-uclass.h>
@@ -17,6 +18,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <asm/arch/clock_manager.h>
 
diff --git a/drivers/clk/analogbits/wrpll-cln28hpc.c b/drivers/clk/analogbits/wrpll-cln28hpc.c
index 664643003779..ba746ed7e387 100644
--- a/drivers/clk/analogbits/wrpll-cln28hpc.c
+++ b/drivers/clk/analogbits/wrpll-cln28hpc.c
@@ -7,6 +7,7 @@
  * This library supports configuration parsing and reprogramming of
  * the CLN28HPC variant of the Analog Bits Wide Range PLL.  The
  * intention is for this library to be reusable for any device that
+#include <asm/types.h>
  * integrates this PLL; thus the register structure and programming
  * details are expected to be provided by a separate IP block driver.
  *
diff --git a/drivers/clk/aspeed/clk_ast2500.c b/drivers/clk/aspeed/clk_ast2500.c
index 038898abbb0e..b1f5e2668d8d 100644
--- a/drivers/clk/aspeed/clk_ast2500.c
+++ b/drivers/clk/aspeed/clk_ast2500.c
@@ -7,6 +7,7 @@
 #include <clk-uclass.h>
 #include <dm.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/scu_ast2500.h>
@@ -16,6 +17,7 @@
 #include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 /*
  * MAC Clock Delay settings, taken from Aspeed SDK
diff --git a/drivers/clk/at91/clk-generated.c b/drivers/clk/at91/clk-generated.c
index 4948f02c42fd..86e026ca1abc 100644
--- a/drivers/clk/at91/clk-generated.c
+++ b/drivers/clk/at91/clk-generated.c
@@ -13,6 +13,7 @@
 #include <linux/err.h>
 #include <linux/io.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include <mach/at91_pmc.h>
 #include "pmc.h"
 
diff --git a/drivers/clk/at91/clk-h32mx.c b/drivers/clk/at91/clk-h32mx.c
index b27aeacc7e93..94aea636e52a 100644
--- a/drivers/clk/at91/clk-h32mx.c
+++ b/drivers/clk/at91/clk-h32mx.c
@@ -11,6 +11,7 @@
 #include <dm/device_compat.h>
 #include <dm/util.h>
 #include <linux/io.h>
+#include <linux/types.h>
 #include <mach/at91_pmc.h>
 #include "pmc.h"
 
diff --git a/drivers/clk/at91/clk-main.c b/drivers/clk/at91/clk-main.c
index 85ec506de128..cff796e5477b 100644
--- a/drivers/clk/at91/clk-main.c
+++ b/drivers/clk/at91/clk-main.c
@@ -10,6 +10,7 @@
 #include <asm/global_data.h>
 #include <linux/errno.h>
 #include <linux/io.h>
+#include <linux/types.h>
 #include <mach/at91_pmc.h>
 #include "pmc.h"
 
diff --git a/drivers/clk/at91/clk-master.c b/drivers/clk/at91/clk-master.c
index 87a7d1ea8f28..9bb88576b64b 100644
--- a/drivers/clk/at91/clk-master.c
+++ b/drivers/clk/at91/clk-master.c
@@ -8,6 +8,7 @@
 #include <clk-uclass.h>
 #include <dm.h>
 #include <asm/global_data.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/clk/at91/clk-peripheral.c b/drivers/clk/at91/clk-peripheral.c
index cd9d5e77c027..0bf2132abfe7 100644
--- a/drivers/clk/at91/clk-peripheral.c
+++ b/drivers/clk/at91/clk-peripheral.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <malloc.h>
 #include <linux/io.h>
+#include <linux/types.h>
 #include <mach/at91_pmc.h>
 #include "pmc.h"
 
diff --git a/drivers/clk/at91/clk-plla.c b/drivers/clk/at91/clk-plla.c
index ae7df40f20d0..8715732764de 100644
--- a/drivers/clk/at91/clk-plla.c
+++ b/drivers/clk/at91/clk-plla.c
@@ -10,6 +10,7 @@
 #include <asm/global_data.h>
 #include <linux/errno.h>
 #include <linux/io.h>
+#include <linux/types.h>
 #include <mach/at91_pmc.h>
 #include "pmc.h"
 
diff --git a/drivers/clk/at91/clk-plladiv.c b/drivers/clk/at91/clk-plladiv.c
index 7c074327e27c..5b8d5a80513a 100644
--- a/drivers/clk/at91/clk-plladiv.c
+++ b/drivers/clk/at91/clk-plladiv.c
@@ -9,6 +9,7 @@
 #include <dm/device.h>
 #include <linux/errno.h>
 #include <linux/io.h>
+#include <linux/types.h>
 #include <mach/at91_pmc.h>
 #include "pmc.h"
 
diff --git a/drivers/clk/at91/clk-slow.c b/drivers/clk/at91/clk-slow.c
index 1f8665768b00..0a45ab507813 100644
--- a/drivers/clk/at91/clk-slow.c
+++ b/drivers/clk/at91/clk-slow.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <clk-uclass.h>
 #include <dm.h>
+#include <linux/types.h>
 
 static int at91_slow_clk_enable(struct clk *clk)
 {
diff --git a/drivers/clk/at91/clk-system.c b/drivers/clk/at91/clk-system.c
index 8e1a5f757742..4a27be6a692e 100644
--- a/drivers/clk/at91/clk-system.c
+++ b/drivers/clk/at91/clk-system.c
@@ -10,6 +10,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/io.h>
+#include <linux/types.h>
 #include <mach/at91_pmc.h>
 #include "pmc.h"
 
diff --git a/drivers/clk/at91/clk-usb.c b/drivers/clk/at91/clk-usb.c
index 3b5fedd9bbe7..ea77ae0e3cfb 100644
--- a/drivers/clk/at91/clk-usb.c
+++ b/drivers/clk/at91/clk-usb.c
@@ -12,6 +12,7 @@
 #include <linux/err.h>
 #include <linux/io.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include <mach/at91_pmc.h>
 #include "pmc.h"
 
diff --git a/drivers/clk/at91/clk-utmi.c b/drivers/clk/at91/clk-utmi.c
index 99a1ae865353..60f461ce7f66 100644
--- a/drivers/clk/at91/clk-utmi.c
+++ b/drivers/clk/at91/clk-utmi.c
@@ -11,6 +11,7 @@
 #include <syscon.h>
 #include <linux/errno.h>
 #include <linux/io.h>
+#include <linux/types.h>
 #include <mach/at91_pmc.h>
 #include <mach/at91_sfr.h>
 #include "pmc.h"
diff --git a/drivers/clk/clk-cdce9xx.c b/drivers/clk/clk-cdce9xx.c
index a6e49a7765e4..6782f9e14bc1 100644
--- a/drivers/clk/clk-cdce9xx.c
+++ b/drivers/clk/clk-cdce9xx.c
@@ -16,6 +16,7 @@
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #define MAX_NUMBER_OF_PLLS		4
 #define MAX_NUMER_OF_OUTPUTS		9
diff --git a/drivers/clk/clk-composite.c b/drivers/clk/clk-composite.c
index 62d404d791db..f31cdf246a14 100644
--- a/drivers/clk/clk-composite.c
+++ b/drivers/clk/clk-composite.c
@@ -14,6 +14,7 @@
 #include <clk.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #include "clk.h"
 
diff --git a/drivers/clk/clk-divider.c b/drivers/clk/clk-divider.c
index fb5029c40a30..749d56aecec5 100644
--- a/drivers/clk/clk-divider.c
+++ b/drivers/clk/clk-divider.c
@@ -10,6 +10,8 @@
  */
 
 #include <common.h>
+#include <compiler.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <malloc.h>
 #include <clk-uclass.h>
@@ -27,6 +29,7 @@
 #include <div64.h>
 #include <clk.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 #include "clk.h"
 
 #define UBOOT_DM_CLK_CCF_DIVIDER "ccf_clk_divider"
diff --git a/drivers/clk/clk-fixed-factor.c b/drivers/clk/clk-fixed-factor.c
index c181c0b6ea5f..0197debd9c37 100644
--- a/drivers/clk/clk-fixed-factor.c
+++ b/drivers/clk/clk-fixed-factor.c
@@ -14,6 +14,7 @@
 #include <div64.h>
 #include <clk.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include "clk.h"
 #include <linux/err.h>
 
diff --git a/drivers/clk/clk-gate.c b/drivers/clk/clk-gate.c
index 221db043abcc..0d42326a0464 100644
--- a/drivers/clk/clk-gate.c
+++ b/drivers/clk/clk-gate.c
@@ -8,9 +8,11 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <asm/io.h>
 #include <malloc.h>
 #include <clk-uclass.h>
+#include <asm/types.h>
 #include <dm/device.h>
 #include <dm/devres.h>
 #include <linux/bitops.h>
diff --git a/drivers/clk/clk-hsdk-cgu.c b/drivers/clk/clk-hsdk-cgu.c
index c2b33b41f84e..ac2cb5a86f1f 100644
--- a/drivers/clk/clk-hsdk-cgu.c
+++ b/drivers/clk/clk-hsdk-cgu.c
@@ -11,9 +11,11 @@
 
 #include <common.h>
 #include <clk-uclass.h>
+#include <compiler.h>
 #include <div64.h>
 #include <dm.h>
 #include <log.h>
+#include <stdbool.h>
 #include <linux/bitops.h>
 #include <linux/bug.h>
 #include <linux/delay.h>
@@ -22,6 +24,7 @@
 #include <asm/arcregs.h>
 #include <linux/kernel.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 #include <dt-bindings/clock/snps,hsdk-cgu.h>
 
diff --git a/drivers/clk/clk-mux.c b/drivers/clk/clk-mux.c
index cba7113f3b63..7c6d35643bdc 100644
--- a/drivers/clk/clk-mux.c
+++ b/drivers/clk/clk-mux.c
@@ -22,10 +22,12 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <stdio.h>
 #include <asm/io.h>
 #include <malloc.h>
 #include <clk-uclass.h>
+#include <asm/types.h>
 #include <dm/device.h>
 #include <dm/devres.h>
 #include <linux/bitops.h>
diff --git a/drivers/clk/clk-ti-sci.c b/drivers/clk/clk-ti-sci.c
index 45ce1995d033..76f6bd701698 100644
--- a/drivers/clk/clk-ti-sci.c
+++ b/drivers/clk/clk-ti-sci.c
@@ -20,6 +20,7 @@
 #include <linux/kernel.h>
 #include <linux/soc/ti/ti_sci_protocol.h>
 #include <k3-avs.h>
+#include <linux/types.h>
 
 /**
  * struct ti_sci_clk_data - clock controller information structure
diff --git a/drivers/clk/clk-uclass.c b/drivers/clk/clk-uclass.c
index d11edf6058fd..29f968fd64c8 100644
--- a/drivers/clk/clk-uclass.c
+++ b/drivers/clk/clk-uclass.c
@@ -14,6 +14,7 @@
 #include <errno.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <dm/devres.h>
@@ -22,6 +23,7 @@
 #include <linux/clk-provider.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 static inline const struct clk_ops *clk_dev_ops(struct udevice *dev)
 {
diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
index f2d0981e1913..305e2f085dc7 100644
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@ -15,6 +15,7 @@
 #include <dm/device-internal.h>
 #include <clk.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 int clk_register(struct clk *clk, const char *drv_name,
 		 const char *name, const char *parent_name)
diff --git a/drivers/clk/clk_bcm6345.c b/drivers/clk/clk_bcm6345.c
index a03cee546c72..27fd147fc1bc 100644
--- a/drivers/clk/clk_bcm6345.c
+++ b/drivers/clk/clk_bcm6345.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <clk-uclass.h>
+#include <compiler.h>
 #include <dm.h>
 #include <errno.h>
 #include <asm/io.h>
diff --git a/drivers/clk/clk_boston.c b/drivers/clk/clk_boston.c
index c97d457062c6..ec1159e6c826 100644
--- a/drivers/clk/clk_boston.c
+++ b/drivers/clk/clk_boston.c
@@ -12,6 +12,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 struct clk_boston {
 	struct regmap *regmap;
diff --git a/drivers/clk/clk_fixed_factor.c b/drivers/clk/clk_fixed_factor.c
index cf9c4ae367fd..d73c1acc570a 100644
--- a/drivers/clk/clk_fixed_factor.c
+++ b/drivers/clk/clk_fixed_factor.c
@@ -10,6 +10,7 @@
 #include <div64.h>
 #include <dm.h>
 #include <linux/err.h>
+#include <linux/types.h>
 
 struct clk_fixed_factor {
 	struct clk parent;
diff --git a/drivers/clk/clk_fixed_rate.c b/drivers/clk/clk_fixed_rate.c
index 2c20eddb0b5c..8303d8da0102 100644
--- a/drivers/clk/clk_fixed_rate.c
+++ b/drivers/clk/clk_fixed_rate.c
@@ -7,6 +7,7 @@
 #include <clk-uclass.h>
 #include <dm.h>
 #include <linux/clk-provider.h>
+#include <linux/types.h>
 
 static ulong clk_fixed_rate_get_rate(struct clk *clk)
 {
diff --git a/drivers/clk/clk_pic32.c b/drivers/clk/clk_pic32.c
index c9b047914a4b..6c46a6ab323d 100644
--- a/drivers/clk/clk_pic32.c
+++ b/drivers/clk/clk_pic32.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <clk-uclass.h>
+#include <compiler.h>
 #include <dm.h>
 #include <div64.h>
 #include <stdio.h>
@@ -18,6 +19,7 @@
 #include <linux/bitops.h>
 #include <linux/bug.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <mach/pic32.h>
 #include <dt-bindings/clock/microchip,clock.h>
 
diff --git a/drivers/clk/clk_sandbox.c b/drivers/clk/clk_sandbox.c
index ad68c6174074..4cca81b9fd7b 100644
--- a/drivers/clk/clk_sandbox.c
+++ b/drivers/clk/clk_sandbox.c
@@ -11,6 +11,7 @@
 #include <stdbool.h>
 #include <asm/clk.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 struct sandbox_clk_priv {
 	bool probed;
diff --git a/drivers/clk/clk_sandbox_ccf.c b/drivers/clk/clk_sandbox_ccf.c
index b528c635552e..3f5a823d8d2d 100644
--- a/drivers/clk/clk_sandbox_ccf.c
+++ b/drivers/clk/clk_sandbox_ccf.c
@@ -7,9 +7,11 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <clk.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <asm/clk.h>
 #include <clk-uclass.h>
 #include <dm/devres.h>
@@ -19,6 +21,7 @@
 #include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 /*
  * Sandbox implementation of CCF primitives necessary for clk-uclass testing
diff --git a/drivers/clk/clk_sandbox_test.c b/drivers/clk/clk_sandbox_test.c
index 6eef29f9dc3b..ac4c13dc9a51 100644
--- a/drivers/clk/clk_sandbox_test.c
+++ b/drivers/clk/clk_sandbox_test.c
@@ -11,6 +11,7 @@
 #include <dm/device_compat.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 struct sandbox_clk_test {
 	struct clk clks[SANDBOX_CLK_TEST_NON_DEVM_COUNT];
diff --git a/drivers/clk/clk_stm32f.c b/drivers/clk/clk_stm32f.c
index b0d5699e080b..e923559ef3ce 100644
--- a/drivers/clk/clk_stm32f.c
+++ b/drivers/clk/clk_stm32f.c
@@ -8,12 +8,14 @@
 #include <clk-uclass.h>
 #include <dm.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stm32_rcc.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <asm/io.h>
 #include <asm/arch/stm32.h>
diff --git a/drivers/clk/clk_stm32h7.c b/drivers/clk/clk_stm32h7.c
index d97a211423c3..e43ff595d68d 100644
--- a/drivers/clk/clk_stm32h7.c
+++ b/drivers/clk/clk_stm32h7.c
@@ -15,6 +15,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 #include <dt-bindings/clock/stm32h7-clks.h>
 
diff --git a/drivers/clk/clk_stm32mp1.c b/drivers/clk/clk_stm32mp1.c
index a57f3f81f73c..2d4a4ec308f1 100644
--- a/drivers/clk/clk_stm32mp1.c
+++ b/drivers/clk/clk_stm32mp1.c
@@ -5,12 +5,14 @@
 
 #include <common.h>
 #include <clk-uclass.h>
+#include <compiler.h>
 #include <div64.h>
 #include <dm.h>
 #include <init.h>
 #include <log.h>
 #include <regmap.h>
 #include <spl.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <syscon.h>
 #include <time.h>
@@ -25,6 +27,7 @@
 #include <dt-bindings/clock/stm32mp1-clksrc.h>
 #include <linux/kernel.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/clk/clk_versal.c b/drivers/clk/clk_versal.c
index de309923b10a..58f8deccedac 100644
--- a/drivers/clk/clk_versal.c
+++ b/drivers/clk/clk_versal.c
@@ -22,6 +22,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define MAX_PARENT			100
 #define MAX_NODES			6
diff --git a/drivers/clk/clk_vexpress_osc.c b/drivers/clk/clk_vexpress_osc.c
index 950c72d573a7..6fd8450c5bfb 100644
--- a/drivers/clk/clk_vexpress_osc.c
+++ b/drivers/clk/clk_vexpress_osc.c
@@ -15,6 +15,7 @@
 #include <misc.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #define CLK_FUNCTION		BIT(20)
 
diff --git a/drivers/clk/clk_zynq.c b/drivers/clk/clk_zynq.c
index e20b668fd849..0dde3c435aad 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 <stdbool.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <dm/device_compat.h>
@@ -22,6 +23,7 @@
 #include <asm/arch/sys_proto.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 /* Register bitfield defines */
 #define PLLCTRL_FBDIV_MASK	0x7f000
diff --git a/drivers/clk/clk_zynqmp.c b/drivers/clk/clk_zynqmp.c
index 0fb220022ca7..5975b11dd598 100644
--- a/drivers/clk/clk_zynqmp.c
+++ b/drivers/clk/clk_zynqmp.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
@@ -18,6 +19,7 @@
 #include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 static const resource_size_t zynqmp_crf_apb_clkc_base = 0xfd1a0020;
 static const resource_size_t zynqmp_crl_apb_clkc_base = 0xff5e0020;
diff --git a/drivers/clk/exynos/clk-exynos7420.c b/drivers/clk/exynos/clk-exynos7420.c
index d86f84acef11..4b8cd3700ffa 100644
--- a/drivers/clk/exynos/clk-exynos7420.c
+++ b/drivers/clk/exynos/clk-exynos7420.c
@@ -12,6 +12,7 @@
 #include <asm/io.h>
 #include <dt-bindings/clock/exynos7420-clk.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include "clk-pll.h"
 
 #define DIVIDER(reg, shift, mask)	\
diff --git a/drivers/clk/exynos/clk-pll.c b/drivers/clk/exynos/clk-pll.c
index 407fc71d415b..3ede604f59e1 100644
--- a/drivers/clk/exynos/clk-pll.c
+++ b/drivers/clk/exynos/clk-pll.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <asm/io.h>
 #include <div64.h>
+#include <linux/types.h>
 
 #define PLL145X_MDIV_SHIFT	16
 #define PLL145X_MDIV_MASK	0x3ff
diff --git a/drivers/clk/ics8n3qv01.c b/drivers/clk/ics8n3qv01.c
index 7d551b7c8d85..bc2fd15a5125 100644
--- a/drivers/clk/ics8n3qv01.c
+++ b/drivers/clk/ics8n3qv01.c
@@ -16,6 +16,7 @@
 #include <log.h>
 #include <stdio.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 const long long ICS8N3QV01_FREF = 114285000;
 const long long ICS8N3QV01_FREF_LL = 114285000LL;
diff --git a/drivers/clk/imx/clk-composite-8m.c b/drivers/clk/imx/clk-composite-8m.c
index d03e48bfb3c2..8a8e2d5a858b 100644
--- a/drivers/clk/imx/clk-composite-8m.c
+++ b/drivers/clk/imx/clk-composite-8m.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <log.h>
 #include <asm/io.h>
 #include <malloc.h>
@@ -14,6 +15,7 @@
 #include <clk.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include "clk.h"
 #include <linux/err.h>
 
diff --git a/drivers/clk/imx/clk-gate2.c b/drivers/clk/imx/clk-gate2.c
index f1b06731bcea..12e7864f6786 100644
--- a/drivers/clk/imx/clk-gate2.c
+++ b/drivers/clk/imx/clk-gate2.c
@@ -15,6 +15,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <asm/io.h>
 #include <malloc.h>
 #include <clk-uclass.h>
@@ -24,6 +25,7 @@
 #include <clk.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include "clk.h"
 #include <linux/err.h>
 
diff --git a/drivers/clk/imx/clk-imx6q.c b/drivers/clk/imx/clk-imx6q.c
index ddfa3deccbd9..ccc4adf2e5e2 100644
--- a/drivers/clk/imx/clk-imx6q.c
+++ b/drivers/clk/imx/clk-imx6q.c
@@ -8,12 +8,14 @@
 #include <clk-uclass.h>
 #include <dm.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <dt-bindings/clock/imx6qdl-clock.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include "clk.h"
 
diff --git a/drivers/clk/imx/clk-imx8.c b/drivers/clk/imx/clk-imx8.c
index 8b09554d3f4b..4692dc7f39f0 100644
--- a/drivers/clk/imx/clk-imx8.c
+++ b/drivers/clk/imx/clk-imx8.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <clk-uclass.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
 #include <malloc.h>
@@ -17,6 +18,7 @@
 #include <dt-bindings/soc/imx_rsrc.h>
 #include <misc.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #include "clk-imx8.h"
 
diff --git a/drivers/clk/imx/clk-imx8.h b/drivers/clk/imx/clk-imx8.h
index 7a1433d2af65..cbf88f98816e 100644
--- a/drivers/clk/imx/clk-imx8.h
+++ b/drivers/clk/imx/clk-imx8.h
@@ -5,6 +5,7 @@
  */
 
 #include <stdbool.h>
+#include <linux/types.h>
 struct imx8_clks {
 	ulong id;
 	const char *name;
diff --git a/drivers/clk/imx/clk-imx8mm.c b/drivers/clk/imx/clk-imx8mm.c
index 02a006dd58e5..386180b96e34 100644
--- a/drivers/clk/imx/clk-imx8mm.c
+++ b/drivers/clk/imx/clk-imx8mm.c
@@ -7,13 +7,16 @@
 #include <common.h>
 #include <clk.h>
 #include <clk-uclass.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <dt-bindings/clock/imx8mm-clock.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include "clk.h"
 
diff --git a/drivers/clk/imx/clk-imx8mn.c b/drivers/clk/imx/clk-imx8mn.c
index e8286e5e1642..ab0b3eb2d222 100644
--- a/drivers/clk/imx/clk-imx8mn.c
+++ b/drivers/clk/imx/clk-imx8mn.c
@@ -7,13 +7,16 @@
 #include <common.h>
 #include <clk.h>
 #include <clk-uclass.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <dt-bindings/clock/imx8mn-clock.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include "clk.h"
 
diff --git a/drivers/clk/imx/clk-imx8mp.c b/drivers/clk/imx/clk-imx8mp.c
index b6a6ad73a683..cb0eb4113e7d 100644
--- a/drivers/clk/imx/clk-imx8mp.c
+++ b/drivers/clk/imx/clk-imx8mp.c
@@ -7,13 +7,16 @@
 #include <common.h>
 #include <clk.h>
 #include <clk-uclass.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <dt-bindings/clock/imx8mp-clock.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include "clk.h"
 
diff --git a/drivers/clk/imx/clk-imx8qm.c b/drivers/clk/imx/clk-imx8qm.c
index e21102c319d4..38d9e110f9a7 100644
--- a/drivers/clk/imx/clk-imx8qm.c
+++ b/drivers/clk/imx/clk-imx8qm.c
@@ -8,6 +8,7 @@
 #include <clk-uclass.h>
 #include <dm.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/arch/sci/sci.h>
 #include <asm/arch/clock.h>
@@ -16,6 +17,7 @@
 #include <misc.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include "clk-imx8.h"
 
diff --git a/drivers/clk/imx/clk-imx8qxp.c b/drivers/clk/imx/clk-imx8qxp.c
index d061f11a7563..0fd8b1c61061 100644
--- a/drivers/clk/imx/clk-imx8qxp.c
+++ b/drivers/clk/imx/clk-imx8qxp.c
@@ -8,6 +8,7 @@
 #include <clk-uclass.h>
 #include <dm.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/arch/sci/sci.h>
 #include <asm/arch/clock.h>
@@ -16,6 +17,7 @@
 #include <misc.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include "clk-imx8.h"
 
diff --git a/drivers/clk/imx/clk-imxrt1020.c b/drivers/clk/imx/clk-imxrt1020.c
index 898dfe310841..d337f73d1fa6 100644
--- a/drivers/clk/imx/clk-imxrt1020.c
+++ b/drivers/clk/imx/clk-imxrt1020.c
@@ -8,11 +8,13 @@
 #include <clk.h>
 #include <clk-uclass.h>
 #include <dm.h>
+#include <stdbool.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <dt-bindings/clock/imxrt1020-clock.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include "clk.h"
 
diff --git a/drivers/clk/imx/clk-imxrt1050.c b/drivers/clk/imx/clk-imxrt1050.c
index fc022f54a75c..bfc66dafac3e 100644
--- a/drivers/clk/imx/clk-imxrt1050.c
+++ b/drivers/clk/imx/clk-imxrt1050.c
@@ -9,11 +9,13 @@
 #include <clk-uclass.h>
 #include <dm.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <dt-bindings/clock/imxrt1050-clock.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include "clk.h"
 
diff --git a/drivers/clk/imx/clk-pfd.c b/drivers/clk/imx/clk-pfd.c
index 9b2fce7174af..2e2514d26a31 100644
--- a/drivers/clk/imx/clk-pfd.c
+++ b/drivers/clk/imx/clk-pfd.c
@@ -15,9 +15,11 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <asm/io.h>
 #include <malloc.h>
 #include <clk-uclass.h>
+#include <asm/types.h>
 #include <dm/device.h>
 #include <dm/devres.h>
 #include <linux/clk-provider.h>
diff --git a/drivers/clk/imx/clk-pll14xx.c b/drivers/clk/imx/clk-pll14xx.c
index 147bf3159805..d091597c7603 100644
--- a/drivers/clk/imx/clk-pll14xx.c
+++ b/drivers/clk/imx/clk-pll14xx.c
@@ -6,6 +6,8 @@
  */
 
 #include <common.h>
+#include <compiler.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <malloc.h>
 #include <clk-uclass.h>
@@ -21,6 +23,7 @@
 #include <div64.h>
 #include <linux/kernel.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 #include "clk.h"
 
diff --git a/drivers/clk/imx/clk-pllv3.c b/drivers/clk/imx/clk-pllv3.c
index ec690a24981c..8cb02c172a21 100644
--- a/drivers/clk/imx/clk-pllv3.c
+++ b/drivers/clk/imx/clk-pllv3.c
@@ -5,6 +5,8 @@
  */
 
 #include <common.h>
+#include <compiler.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <div64.h>
 #include <malloc.h>
@@ -15,6 +17,7 @@
 #include <clk.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include "clk.h"
 #include <linux/err.h>
 
diff --git a/drivers/clk/imx/clk.h b/drivers/clk/imx/clk.h
index 04b7bb78daef..3eb2769da309 100644
--- a/drivers/clk/imx/clk.h
+++ b/drivers/clk/imx/clk.h
@@ -6,6 +6,8 @@
 #ifndef __MACH_IMX_CLK_H
 #define __MACH_IMX_CLK_H
 
+#include <compiler.h>
+#include <asm/types.h>
 #include <linux/clk-provider.h>
 #include <linux/kernel.h>
 
diff --git a/drivers/clk/intel/clk_intel.c b/drivers/clk/intel/clk_intel.c
index 371898f27443..cfea9780bd56 100644
--- a/drivers/clk/intel/clk_intel.c
+++ b/drivers/clk/intel/clk_intel.c
@@ -9,6 +9,7 @@
 #include <clk-uclass.h>
 #include <dt-bindings/clock/intel-clock.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 static ulong intel_clk_get_rate(struct clk *clk)
 {
diff --git a/drivers/clk/kendryte/bypass.c b/drivers/clk/kendryte/bypass.c
index c48014c80e83..2144c4faacac 100644
--- a/drivers/clk/kendryte/bypass.c
+++ b/drivers/clk/kendryte/bypass.c
@@ -14,6 +14,7 @@
 #include <linux/clk-provider.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #define CLK_K210_BYPASS "k210_clk_bypass"
 
diff --git a/drivers/clk/kendryte/clk.c b/drivers/clk/kendryte/clk.c
index e8f764d792ba..a08a7ae32f61 100644
--- a/drivers/clk/kendryte/clk.c
+++ b/drivers/clk/kendryte/clk.c
@@ -2,9 +2,11 @@
 /*
  * Copyright (C) 2019-20 Sean Anderson <seanga2@gmail.com>
  */
+#include <stdbool.h>
 #include <kendryte/clk.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include <asm/io.h>
 #include <dt-bindings/clock/k210-sysctl.h>
diff --git a/drivers/clk/kendryte/pll.c b/drivers/clk/kendryte/pll.c
index d4788ba81406..865f75301f9e 100644
--- a/drivers/clk/kendryte/pll.c
+++ b/drivers/clk/kendryte/pll.c
@@ -3,9 +3,12 @@
  * Copyright (C) 2019-20 Sean Anderson <seanga2@gmail.com>
  */
 #define LOG_CATEGORY UCLASS_CLK
+#include <compiler.h>
+#include <stdbool.h>
 #include <kendryte/pll.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include <common.h>
 #include <dm.h>
diff --git a/drivers/clk/mediatek/clk-mt7622.c b/drivers/clk/mediatek/clk-mt7622.c
index 3462b49c69df..6db187b59702 100644
--- a/drivers/clk/mediatek/clk-mt7622.c
+++ b/drivers/clk/mediatek/clk-mt7622.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
 #include <asm/arch-mediatek/reset.h>
diff --git a/drivers/clk/mediatek/clk-mt7623.c b/drivers/clk/mediatek/clk-mt7623.c
index 042031dd70fd..3ae286390873 100644
--- a/drivers/clk/mediatek/clk-mt7623.c
+++ b/drivers/clk/mediatek/clk-mt7623.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
 #include <asm/arch-mediatek/reset.h>
diff --git a/drivers/clk/mediatek/clk-mt7629.c b/drivers/clk/mediatek/clk-mt7629.c
index 94b83a532818..249d97b46700 100644
--- a/drivers/clk/mediatek/clk-mt7629.c
+++ b/drivers/clk/mediatek/clk-mt7629.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
 #include <asm/arch-mediatek/reset.h>
diff --git a/drivers/clk/mediatek/clk-mtk.c b/drivers/clk/mediatek/clk-mtk.c
index e4217bd96271..0c1d347ad873 100644
--- a/drivers/clk/mediatek/clk-mtk.c
+++ b/drivers/clk/mediatek/clk-mtk.c
@@ -8,12 +8,14 @@
 
 #include <common.h>
 #include <clk-uclass.h>
+#include <compiler.h>
 #include <div64.h>
 #include <dm.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #include "clk-mtk.h"
 
diff --git a/drivers/clk/mediatek/clk-mtk.h b/drivers/clk/mediatek/clk-mtk.h
index 57a76e69432c..6f7000b268da 100644
--- a/drivers/clk/mediatek/clk-mtk.h
+++ b/drivers/clk/mediatek/clk-mtk.h
@@ -7,6 +7,8 @@
 #ifndef __DRV_CLK_MTK_H
 #define __DRV_CLK_MTK_H
 
+#include <compiler.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/kernel.h>
 #define CLK_XTAL			0
diff --git a/drivers/clk/meson/axg.c b/drivers/clk/meson/axg.c
index ddf20ab3d8c2..4be6b6dab910 100644
--- a/drivers/clk/meson/axg.c
+++ b/drivers/clk/meson/axg.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/arch/clock-axg.h>
 #include <asm/io.h>
 #include <clk-uclass.h>
@@ -18,6 +19,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include "clk_meson.h"
 #include <linux/err.h>
 
diff --git a/drivers/clk/meson/clk_meson.h b/drivers/clk/meson/clk_meson.h
index ef72a416c151..154ec71347fa 100644
--- a/drivers/clk/meson/clk_meson.h
+++ b/drivers/clk/meson/clk_meson.h
@@ -10,6 +10,7 @@
 
 /* Gate Structure */
 
+#include <asm/types.h>
 #include <linux/bitops.h>
 struct meson_gate {
 	unsigned int reg;
diff --git a/drivers/clk/meson/g12a.c b/drivers/clk/meson/g12a.c
index ba9ec818de6d..599d6dc57ce6 100644
--- a/drivers/clk/meson/g12a.c
+++ b/drivers/clk/meson/g12a.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/arch/clock-g12a.h>
 #include <asm/io.h>
 #include <clk-uclass.h>
@@ -20,6 +21,7 @@
 #include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include "clk_meson.h"
 
 /* This driver support only basic clock tree operations :
diff --git a/drivers/clk/meson/gxbb.c b/drivers/clk/meson/gxbb.c
index 62e8e35d654f..af4668e3e424 100644
--- a/drivers/clk/meson/gxbb.c
+++ b/drivers/clk/meson/gxbb.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/arch/clock-gx.h>
 #include <asm/io.h>
 #include <clk-uclass.h>
@@ -18,6 +19,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include "clk_meson.h"
 #include <linux/err.h>
 
diff --git a/drivers/clk/mpc83xx_clk.c b/drivers/clk/mpc83xx_clk.c
index 8dae8313db92..7c3811b7cb31 100644
--- a/drivers/clk/mpc83xx_clk.c
+++ b/drivers/clk/mpc83xx_clk.c
@@ -10,6 +10,7 @@
 #include <command.h>
 #include <dm.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
@@ -20,6 +21,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include "mpc83xx_clk.h"
 
diff --git a/drivers/clk/mpc83xx_clk.h b/drivers/clk/mpc83xx_clk.h
index b03b35a87842..b1d32ce84115 100644
--- a/drivers/clk/mpc83xx_clk.h
+++ b/drivers/clk/mpc83xx_clk.h
@@ -5,6 +5,7 @@
  */
 
 /**
+#include <linux/types.h>
  * enum ratio - Description of a core clock ratio
  * @RAT_UNK:      Unknown ratio
  * @RAT_BYP:      Bypass
diff --git a/drivers/clk/mtmips/clk-mt7628.c b/drivers/clk/mtmips/clk-mt7628.c
index 12ae5a92354d..ce39cf0b2543 100644
--- a/drivers/clk/mtmips/clk-mt7628.c
+++ b/drivers/clk/mtmips/clk-mt7628.c
@@ -7,12 +7,14 @@
 
 #include <common.h>
 #include <clk-uclass.h>
+#include <compiler.h>
 #include <dm.h>
 #include <dt-bindings/clock/mt7628-clk.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 /* SYSCFG0 */
 #define XTAL_40M_SEL			BIT(6)
diff --git a/drivers/clk/mvebu/armada-37xx-periph.c b/drivers/clk/mvebu/armada-37xx-periph.c
index 6f279939c519..9d45436b8330 100644
--- a/drivers/clk/mvebu/armada-37xx-periph.c
+++ b/drivers/clk/mvebu/armada-37xx-periph.c
@@ -9,10 +9,12 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <malloc.h>
 #include <clk-uclass.h>
 #include <clk.h>
 #include <dm.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
@@ -21,6 +23,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define TBG_SEL		0x0
 #define DIV_SEL0	0x4
diff --git a/drivers/clk/mvebu/armada-37xx-tbg.c b/drivers/clk/mvebu/armada-37xx-tbg.c
index 512a1f5824f8..d6fa702b24ec 100644
--- a/drivers/clk/mvebu/armada-37xx-tbg.c
+++ b/drivers/clk/mvebu/armada-37xx-tbg.c
@@ -11,12 +11,14 @@
 #include <common.h>
 #include <clk-uclass.h>
 #include <clk.h>
+#include <compiler.h>
 #include <dm.h>
 #include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <dm/device_compat.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #define NUM_TBG	    4
 
diff --git a/drivers/clk/owl/clk_owl.c b/drivers/clk/owl/clk_owl.c
index d596c0cf1617..eb262e4673d9 100644
--- a/drivers/clk/owl/clk_owl.c
+++ b/drivers/clk/owl/clk_owl.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include "clk_owl.h"
 #include <asm/io.h>
diff --git a/drivers/clk/owl/clk_owl.h b/drivers/clk/owl/clk_owl.h
index a01f81a6a7be..e755b5c56951 100644
--- a/drivers/clk/owl/clk_owl.h
+++ b/drivers/clk/owl/clk_owl.h
@@ -12,6 +12,7 @@
 
 #include <clk-uclass.h>
 #ifndef __ASSEMBLY__
+#include <asm/types.h>
 #include <linux/bitops.h>
 #endif
 
diff --git a/drivers/clk/renesas/clk-rcar-gen2.c b/drivers/clk/renesas/clk-rcar-gen2.c
index 52d7bba0cff3..943bd6cb4fe5 100644
--- a/drivers/clk/renesas/clk-rcar-gen2.c
+++ b/drivers/clk/renesas/clk-rcar-gen2.c
@@ -20,6 +20,7 @@
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <dt-bindings/clock/renesas-cpg-mssr.h>
 
diff --git a/drivers/clk/renesas/clk-rcar-gen3.c b/drivers/clk/renesas/clk-rcar-gen3.c
index c4f5a63b7a3f..542f2888f85e 100644
--- a/drivers/clk/renesas/clk-rcar-gen3.c
+++ b/drivers/clk/renesas/clk-rcar-gen3.c
@@ -22,6 +22,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include <dt-bindings/clock/renesas-cpg-mssr.h>
 
diff --git a/drivers/clk/renesas/r8a774a1-cpg-mssr.c b/drivers/clk/renesas/r8a774a1-cpg-mssr.c
index f409e666a97d..2f9fc8202d1b 100644
--- a/drivers/clk/renesas/r8a774a1-cpg-mssr.c
+++ b/drivers/clk/renesas/r8a774a1-cpg-mssr.c
@@ -14,6 +14,7 @@
 #include <clk-uclass.h>
 #include <dm.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include <dt-bindings/clock/r8a774a1-cpg-mssr.h>
 
diff --git a/drivers/clk/renesas/r8a7790-cpg-mssr.c b/drivers/clk/renesas/r8a7790-cpg-mssr.c
index 9eb30d9c9fb6..db22f3d05af1 100644
--- a/drivers/clk/renesas/r8a7790-cpg-mssr.c
+++ b/drivers/clk/renesas/r8a7790-cpg-mssr.c
@@ -14,6 +14,7 @@
 #include <dm.h>
 #include <linux/bitops.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include <dt-bindings/clock/r8a7790-cpg-mssr.h>
 
diff --git a/drivers/clk/renesas/r8a7791-cpg-mssr.c b/drivers/clk/renesas/r8a7791-cpg-mssr.c
index 7ddac6d20ad0..4da13cab1584 100644
--- a/drivers/clk/renesas/r8a7791-cpg-mssr.c
+++ b/drivers/clk/renesas/r8a7791-cpg-mssr.c
@@ -19,6 +19,7 @@
 #include <dm.h>
 #include <linux/bitops.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include <dt-bindings/clock/r8a7791-cpg-mssr.h>
 
diff --git a/drivers/clk/renesas/r8a7792-cpg-mssr.c b/drivers/clk/renesas/r8a7792-cpg-mssr.c
index 0d43004bfc42..9372b8a41115 100644
--- a/drivers/clk/renesas/r8a7792-cpg-mssr.c
+++ b/drivers/clk/renesas/r8a7792-cpg-mssr.c
@@ -14,6 +14,7 @@
 #include <dm.h>
 #include <linux/bitops.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include <dt-bindings/clock/r8a7792-cpg-mssr.h>
 
diff --git a/drivers/clk/renesas/r8a7794-cpg-mssr.c b/drivers/clk/renesas/r8a7794-cpg-mssr.c
index eda0ae0f9d93..d8bdc32773f1 100644
--- a/drivers/clk/renesas/r8a7794-cpg-mssr.c
+++ b/drivers/clk/renesas/r8a7794-cpg-mssr.c
@@ -14,6 +14,7 @@
 #include <dm.h>
 #include <linux/bitops.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include <dt-bindings/clock/r8a7794-cpg-mssr.h>
 
diff --git a/drivers/clk/renesas/r8a7795-cpg-mssr.c b/drivers/clk/renesas/r8a7795-cpg-mssr.c
index 89794d2cf6c9..8ebd256c3729 100644
--- a/drivers/clk/renesas/r8a7795-cpg-mssr.c
+++ b/drivers/clk/renesas/r8a7795-cpg-mssr.c
@@ -14,6 +14,7 @@
 #include <dm.h>
 #include <linux/bitops.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include <dt-bindings/clock/r8a7795-cpg-mssr.h>
 
diff --git a/drivers/clk/renesas/r8a7796-cpg-mssr.c b/drivers/clk/renesas/r8a7796-cpg-mssr.c
index 029bd54b796c..88bd46a0ab2e 100644
--- a/drivers/clk/renesas/r8a7796-cpg-mssr.c
+++ b/drivers/clk/renesas/r8a7796-cpg-mssr.c
@@ -20,6 +20,7 @@
 #include <dm.h>
 #include <linux/bitops.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include <dt-bindings/clock/r8a7796-cpg-mssr.h>
 
diff --git a/drivers/clk/renesas/r8a77965-cpg-mssr.c b/drivers/clk/renesas/r8a77965-cpg-mssr.c
index 5962cb03d636..ab62e101c037 100644
--- a/drivers/clk/renesas/r8a77965-cpg-mssr.c
+++ b/drivers/clk/renesas/r8a77965-cpg-mssr.c
@@ -15,6 +15,7 @@
 #include <dm.h>
 #include <linux/bitops.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include <dt-bindings/clock/r8a77965-cpg-mssr.h>
 
diff --git a/drivers/clk/renesas/r8a77970-cpg-mssr.c b/drivers/clk/renesas/r8a77970-cpg-mssr.c
index ec246abf387b..dffb663347d3 100644
--- a/drivers/clk/renesas/r8a77970-cpg-mssr.c
+++ b/drivers/clk/renesas/r8a77970-cpg-mssr.c
@@ -15,6 +15,7 @@
 #include <dm.h>
 #include <linux/bitops.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include <dt-bindings/clock/r8a77970-cpg-mssr.h>
 
diff --git a/drivers/clk/renesas/r8a77980-cpg-mssr.c b/drivers/clk/renesas/r8a77980-cpg-mssr.c
index 0c2050d1b28d..41b71fe81ab8 100644
--- a/drivers/clk/renesas/r8a77980-cpg-mssr.c
+++ b/drivers/clk/renesas/r8a77980-cpg-mssr.c
@@ -15,6 +15,7 @@
 #include <dm.h>
 #include <linux/bitops.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include <dt-bindings/clock/r8a77980-cpg-mssr.h>
 
diff --git a/drivers/clk/renesas/r8a77990-cpg-mssr.c b/drivers/clk/renesas/r8a77990-cpg-mssr.c
index e3f62e1bc73f..11962516979e 100644
--- a/drivers/clk/renesas/r8a77990-cpg-mssr.c
+++ b/drivers/clk/renesas/r8a77990-cpg-mssr.c
@@ -15,6 +15,7 @@
 #include <dm.h>
 #include <linux/bitops.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include <dt-bindings/clock/r8a77990-cpg-mssr.h>
 
diff --git a/drivers/clk/renesas/r8a77995-cpg-mssr.c b/drivers/clk/renesas/r8a77995-cpg-mssr.c
index 25bec5ff1a7a..24f6c5b7bb97 100644
--- a/drivers/clk/renesas/r8a77995-cpg-mssr.c
+++ b/drivers/clk/renesas/r8a77995-cpg-mssr.c
@@ -15,6 +15,7 @@
 #include <dm.h>
 #include <linux/bitops.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include <dt-bindings/clock/r8a77995-cpg-mssr.h>
 
diff --git a/drivers/clk/renesas/rcar-gen2-cpg.h b/drivers/clk/renesas/rcar-gen2-cpg.h
index 913c93262038..626fb43654bc 100644
--- a/drivers/clk/renesas/rcar-gen2-cpg.h
+++ b/drivers/clk/renesas/rcar-gen2-cpg.h
@@ -11,6 +11,7 @@
 #ifndef __CLK_RENESAS_RCAR_GEN2_CPG_H__
 #define __CLK_RENESAS_RCAR_GEN2_CPG_H__
 
+#include <compiler.h>
 enum rcar_gen2_clk_types {
 	CLK_TYPE_GEN2_MAIN = CLK_TYPE_CUSTOM,
 	CLK_TYPE_GEN2_PLL0,
diff --git a/drivers/clk/renesas/rcar-gen3-cpg.h b/drivers/clk/renesas/rcar-gen3-cpg.h
index 102d6955354e..95933d11eefc 100644
--- a/drivers/clk/renesas/rcar-gen3-cpg.h
+++ b/drivers/clk/renesas/rcar-gen3-cpg.h
@@ -11,7 +11,9 @@
 #ifndef __CLK_RENESAS_RCAR_GEN3_CPG_H__
 #define __CLK_RENESAS_RCAR_GEN3_CPG_H__
 
+#include <compiler.h>
 #include <stdbool.h>
+#include <asm/types.h>
 enum rcar_gen3_clk_types {
 	CLK_TYPE_GEN3_MAIN = CLK_TYPE_CUSTOM,
 	CLK_TYPE_GEN3_PLL0,
diff --git a/drivers/clk/renesas/renesas-cpg-mssr.c b/drivers/clk/renesas/renesas-cpg-mssr.c
index 544ea258747f..162eb7b32eb1 100644
--- a/drivers/clk/renesas/renesas-cpg-mssr.c
+++ b/drivers/clk/renesas/renesas-cpg-mssr.c
@@ -11,12 +11,14 @@
  */
 #include <common.h>
 #include <clk-uclass.h>
+#include <compiler.h>
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
 #include <stdbool.h>
 #include <wait_bit.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 
diff --git a/drivers/clk/renesas/renesas-cpg-mssr.h b/drivers/clk/renesas/renesas-cpg-mssr.h
index 70f6fb825c49..81ea356cdfbc 100644
--- a/drivers/clk/renesas/renesas-cpg-mssr.h
+++ b/drivers/clk/renesas/renesas-cpg-mssr.h
@@ -13,7 +13,9 @@
 #ifndef __DRIVERS_CLK_RENESAS_CPG_MSSR__
 #define __DRIVERS_CLK_RENESAS_CPG_MSSR__
 
+#include <compiler.h>
 #include <stdbool.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 struct cpg_mssr_info {
 	const struct cpg_core_clk	*core_clk;
diff --git a/drivers/clk/rockchip/clk_pll.c b/drivers/clk/rockchip/clk_pll.c
index 65da88b5109a..f55c01472617 100644
--- a/drivers/clk/rockchip/clk_pll.c
+++ b/drivers/clk/rockchip/clk_pll.c
@@ -5,6 +5,7 @@
  #include <common.h>
 #include <bitfield.h>
 #include <clk-uclass.h>
+#include <compiler.h>
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
@@ -15,6 +16,7 @@
 #include <div64.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 static struct rockchip_pll_rate_table rockchip_auto_table;
 
diff --git a/drivers/clk/rockchip/clk_px30.c b/drivers/clk/rockchip/clk_px30.c
index 6e99191007dc..cef0f7b2c9a6 100644
--- a/drivers/clk/rockchip/clk_px30.c
+++ b/drivers/clk/rockchip/clk_px30.c
@@ -23,6 +23,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/clk/rockchip/clk_rk3036.c b/drivers/clk/rockchip/clk_rk3036.c
index ec60627ddeb5..0ce397b9b9e9 100644
--- a/drivers/clk/rockchip/clk_rk3036.c
+++ b/drivers/clk/rockchip/clk_rk3036.c
@@ -21,6 +21,7 @@
 #include <linux/kernel.h>
 #include <linux/log2.h>
 #include <linux/stringify.h>
+#include <linux/types.h>
 
 enum {
 	VCO_MAX_HZ	= 2400U * 1000000,
diff --git a/drivers/clk/rockchip/clk_rk3128.c b/drivers/clk/rockchip/clk_rk3128.c
index 4dcb85f51091..5a182c2c9db7 100644
--- a/drivers/clk/rockchip/clk_rk3128.c
+++ b/drivers/clk/rockchip/clk_rk3128.c
@@ -22,6 +22,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/log2.h>
+#include <linux/types.h>
 
 enum {
 	VCO_MAX_HZ	= 2400U * 1000000,
diff --git a/drivers/clk/rockchip/clk_rk3188.c b/drivers/clk/rockchip/clk_rk3188.c
index 7cee0c594f79..3ebcaaffcfd7 100644
--- a/drivers/clk/rockchip/clk_rk3188.c
+++ b/drivers/clk/rockchip/clk_rk3188.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <mapmem.h>
+#include <stdbool.h>
 #include <syscon.h>
 #include <asm/io.h>
 #include <asm/arch-rockchip/clock.h>
@@ -28,6 +29,7 @@
 #include <linux/kernel.h>
 #include <linux/log2.h>
 #include <linux/stringify.h>
+#include <linux/types.h>
 
 enum rk3188_clk_type {
 	RK3188_CRU,
diff --git a/drivers/clk/rockchip/clk_rk322x.c b/drivers/clk/rockchip/clk_rk322x.c
index f632dff1a71d..b078da278921 100644
--- a/drivers/clk/rockchip/clk_rk322x.c
+++ b/drivers/clk/rockchip/clk_rk322x.c
@@ -23,6 +23,7 @@
 #include <linux/log2.h>
 #include <linux/string.h>
 #include <linux/stringify.h>
+#include <linux/types.h>
 
 enum {
 	VCO_MAX_HZ	= 3200U * 1000000,
diff --git a/drivers/clk/rockchip/clk_rk3288.c b/drivers/clk/rockchip/clk_rk3288.c
index ed6b4656e23e..a6e145862fff 100644
--- a/drivers/clk/rockchip/clk_rk3288.c
+++ b/drivers/clk/rockchip/clk_rk3288.c
@@ -13,6 +13,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <mapmem.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <syscon.h>
 #include <asm/global_data.h>
@@ -33,6 +34,7 @@
 #include <linux/log2.h>
 #include <linux/string.h>
 #include <linux/stringify.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/clk/rockchip/clk_rk3308.c b/drivers/clk/rockchip/clk_rk3308.c
index 151b6be5ee9c..fb5b7d3ad956 100644
--- a/drivers/clk/rockchip/clk_rk3308.c
+++ b/drivers/clk/rockchip/clk_rk3308.c
@@ -22,6 +22,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/clk/rockchip/clk_rk3328.c b/drivers/clk/rockchip/clk_rk3328.c
index 5879541f3ce9..8d831e1bf836 100644
--- a/drivers/clk/rockchip/clk_rk3328.c
+++ b/drivers/clk/rockchip/clk_rk3328.c
@@ -24,6 +24,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 struct pll_div {
 	u32 refdiv;
diff --git a/drivers/clk/rockchip/clk_rk3368.c b/drivers/clk/rockchip/clk_rk3368.c
index c391ad02100c..2e40ca98d334 100644
--- a/drivers/clk/rockchip/clk_rk3368.c
+++ b/drivers/clk/rockchip/clk_rk3368.c
@@ -27,6 +27,7 @@
 #include <linux/printk.h>
 #include <linux/string.h>
 #include <linux/stringify.h>
+#include <linux/types.h>
 
 #if CONFIG_IS_ENABLED(OF_PLATDATA)
 struct rk3368_clk_plat {
diff --git a/drivers/clk/rockchip/clk_rk3399.c b/drivers/clk/rockchip/clk_rk3399.c
index 1078a4c67b75..3efe5e139a9f 100644
--- a/drivers/clk/rockchip/clk_rk3399.c
+++ b/drivers/clk/rockchip/clk_rk3399.c
@@ -27,6 +27,7 @@
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #if CONFIG_IS_ENABLED(OF_PLATDATA)
 struct rk3399_clk_plat {
diff --git a/drivers/clk/rockchip/clk_rv1108.c b/drivers/clk/rockchip/clk_rv1108.c
index fcc4ba6d94ad..c2708cb48fe0 100644
--- a/drivers/clk/rockchip/clk_rv1108.c
+++ b/drivers/clk/rockchip/clk_rv1108.c
@@ -24,6 +24,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/stringify.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/clk/sifive/fu540-prci.c b/drivers/clk/sifive/fu540-prci.c
index 93cf4adbb348..ab313b2c05e1 100644
--- a/drivers/clk/sifive/fu540-prci.c
+++ b/drivers/clk/sifive/fu540-prci.c
@@ -29,6 +29,7 @@
  */
 
 #include <common.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <asm/arch/reset.h>
 #include <clk-uclass.h>
@@ -44,6 +45,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <linux/math64.h>
 #include <linux/clk/analogbits-wrpll-cln28hpc.h>
diff --git a/drivers/clk/sunxi/clk_a10.c b/drivers/clk/sunxi/clk_a10.c
index 797878eefa9c..91e6f10e8025 100644
--- a/drivers/clk/sunxi/clk_a10.c
+++ b/drivers/clk/sunxi/clk_a10.c
@@ -13,6 +13,7 @@
 #include <dt-bindings/reset/sun4i-a10-ccu.h>
 #include <linux/bitops.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 static struct ccu_clk_gate a10_gates[] = {
 	[CLK_AHB_OTG]		= GATE(0x060, BIT(0)),
diff --git a/drivers/clk/sunxi/clk_a10s.c b/drivers/clk/sunxi/clk_a10s.c
index 24c20cf11f7f..4b6bfd898921 100644
--- a/drivers/clk/sunxi/clk_a10s.c
+++ b/drivers/clk/sunxi/clk_a10s.c
@@ -13,6 +13,7 @@
 #include <dt-bindings/reset/sun5i-ccu.h>
 #include <linux/bitops.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 static struct ccu_clk_gate a10s_gates[] = {
 	[CLK_AHB_OTG]		= GATE(0x060, BIT(0)),
diff --git a/drivers/clk/sunxi/clk_a23.c b/drivers/clk/sunxi/clk_a23.c
index 312288eef68d..7afd0b796bcc 100644
--- a/drivers/clk/sunxi/clk_a23.c
+++ b/drivers/clk/sunxi/clk_a23.c
@@ -13,6 +13,7 @@
 #include <dt-bindings/reset/sun8i-a23-a33-ccu.h>
 #include <linux/bitops.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 static struct ccu_clk_gate a23_gates[] = {
 	[CLK_BUS_MMC0]		= GATE(0x060, BIT(8)),
diff --git a/drivers/clk/sunxi/clk_a31.c b/drivers/clk/sunxi/clk_a31.c
index a3b3528abaeb..ec0592b5ef2d 100644
--- a/drivers/clk/sunxi/clk_a31.c
+++ b/drivers/clk/sunxi/clk_a31.c
@@ -13,6 +13,7 @@
 #include <dt-bindings/reset/sun6i-a31-ccu.h>
 #include <linux/bitops.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 static struct ccu_clk_gate a31_gates[] = {
 	[CLK_AHB1_MMC0]		= GATE(0x060, BIT(8)),
diff --git a/drivers/clk/sunxi/clk_a64.c b/drivers/clk/sunxi/clk_a64.c
index 68660cc7ae48..0b974aa07a1f 100644
--- a/drivers/clk/sunxi/clk_a64.c
+++ b/drivers/clk/sunxi/clk_a64.c
@@ -13,6 +13,7 @@
 #include <dt-bindings/reset/sun50i-a64-ccu.h>
 #include <linux/bitops.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 static const struct ccu_clk_gate a64_gates[] = {
 	[CLK_BUS_MMC0]		= GATE(0x060, BIT(8)),
diff --git a/drivers/clk/sunxi/clk_a80.c b/drivers/clk/sunxi/clk_a80.c
index ea38c819ea7f..4e41418ac46d 100644
--- a/drivers/clk/sunxi/clk_a80.c
+++ b/drivers/clk/sunxi/clk_a80.c
@@ -13,6 +13,7 @@
 #include <dt-bindings/reset/sun9i-a80-ccu.h>
 #include <linux/bitops.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 static const struct ccu_clk_gate a80_gates[] = {
 	[CLK_SPI0]		= GATE(0x430, BIT(31)),
diff --git a/drivers/clk/sunxi/clk_a83t.c b/drivers/clk/sunxi/clk_a83t.c
index ac82f22c7469..0799ec622d05 100644
--- a/drivers/clk/sunxi/clk_a83t.c
+++ b/drivers/clk/sunxi/clk_a83t.c
@@ -13,6 +13,7 @@
 #include <dt-bindings/reset/sun8i-a83t-ccu.h>
 #include <linux/bitops.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 static struct ccu_clk_gate a83t_gates[] = {
 	[CLK_BUS_MMC0]		= GATE(0x060, BIT(8)),
diff --git a/drivers/clk/sunxi/clk_h3.c b/drivers/clk/sunxi/clk_h3.c
index 052fd008f590..bdc7c30c6b3e 100644
--- a/drivers/clk/sunxi/clk_h3.c
+++ b/drivers/clk/sunxi/clk_h3.c
@@ -13,6 +13,7 @@
 #include <dt-bindings/reset/sun8i-h3-ccu.h>
 #include <linux/bitops.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 static struct ccu_clk_gate h3_gates[] = {
 	[CLK_BUS_MMC0]		= GATE(0x060, BIT(8)),
diff --git a/drivers/clk/sunxi/clk_h6.c b/drivers/clk/sunxi/clk_h6.c
index 944aa4c55c4a..2c519561f799 100644
--- a/drivers/clk/sunxi/clk_h6.c
+++ b/drivers/clk/sunxi/clk_h6.c
@@ -13,6 +13,7 @@
 #include <dt-bindings/reset/sun50i-h6-ccu.h>
 #include <linux/bitops.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 static struct ccu_clk_gate h6_gates[] = {
 	[CLK_BUS_MMC0]		= GATE(0x84c, BIT(0)),
diff --git a/drivers/clk/sunxi/clk_r40.c b/drivers/clk/sunxi/clk_r40.c
index 1d19c805ade3..60ccab430405 100644
--- a/drivers/clk/sunxi/clk_r40.c
+++ b/drivers/clk/sunxi/clk_r40.c
@@ -13,6 +13,7 @@
 #include <dt-bindings/reset/sun8i-r40-ccu.h>
 #include <linux/bitops.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 static struct ccu_clk_gate r40_gates[] = {
 	[CLK_BUS_MMC0]		= GATE(0x060, BIT(8)),
diff --git a/drivers/clk/sunxi/clk_sunxi.c b/drivers/clk/sunxi/clk_sunxi.c
index 1b70f15ab9a7..1126dbec05fe 100644
--- a/drivers/clk/sunxi/clk_sunxi.c
+++ b/drivers/clk/sunxi/clk_sunxi.c
@@ -10,9 +10,11 @@
 #include <errno.h>
 #include <log.h>
 #include <reset.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/ccu.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/log2.h>
diff --git a/drivers/clk/sunxi/clk_v3s.c b/drivers/clk/sunxi/clk_v3s.c
index 19673e43cf01..29ca566164d5 100644
--- a/drivers/clk/sunxi/clk_v3s.c
+++ b/drivers/clk/sunxi/clk_v3s.c
@@ -13,6 +13,7 @@
 #include <dt-bindings/reset/sun8i-v3s-ccu.h>
 #include <linux/bitops.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 static struct ccu_clk_gate v3s_gates[] = {
 	[CLK_BUS_MMC0]		= GATE(0x060, BIT(8)),
diff --git a/drivers/clk/tegra/tegra-car-clk.c b/drivers/clk/tegra/tegra-car-clk.c
index d6abf0d6c11a..8086116d0818 100644
--- a/drivers/clk/tegra/tegra-car-clk.c
+++ b/drivers/clk/tegra/tegra-car-clk.c
@@ -11,6 +11,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch-tegra/clk_rst.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 static int tegra_car_clk_request(struct clk *clk)
 {
diff --git a/drivers/clk/tegra/tegra186-clk.c b/drivers/clk/tegra/tegra186-clk.c
index 5a98a3f3f0e6..c1197e7d82df 100644
--- a/drivers/clk/tegra/tegra186-clk.c
+++ b/drivers/clk/tegra/tegra186-clk.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <misc.h>
 #include <asm/arch-tegra/bpmp_abi.h>
+#include <linux/types.h>
 
 static ulong tegra186_clk_get_rate(struct clk *clk)
 {
diff --git a/drivers/clk/uniphier/clk-uniphier-core.c b/drivers/clk/uniphier/clk-uniphier-core.c
index 72335f271b8d..65f6945271c2 100644
--- a/drivers/clk/uniphier/clk-uniphier-core.c
+++ b/drivers/clk/uniphier/clk-uniphier-core.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <clk-uclass.h>
+#include <compiler.h>
 #include <dm.h>
 #include <stdbool.h>
 #include <dm/device_compat.h>
@@ -14,6 +15,7 @@
 #include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/sizes.h>
+#include <linux/types.h>
 
 #include "clk-uniphier.h"
 
diff --git a/drivers/core/acpi.c b/drivers/core/acpi.c
index 356cf0862a51..6654275a1c9f 100644
--- a/drivers/core/acpi.c
+++ b/drivers/core/acpi.c
@@ -15,6 +15,7 @@
 #include <malloc.h>
 #include <stdio.h>
 #include <acpi/acpi_device.h>
+#include <asm/types.h>
 #include <dm/acpi.h>
 #include <dm/device-internal.h>
 #include <dm/root.h>
diff --git a/drivers/core/device-remove.c b/drivers/core/device-remove.c
index 0263284fc3f5..2f1d0a29b351 100644
--- a/drivers/core/device-remove.c
+++ b/drivers/core/device-remove.c
@@ -21,6 +21,7 @@
 #include <dm/util.h>
 #include <power-domain.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 int device_chld_unbind(struct udevice *dev, struct driver *drv)
 {
diff --git a/drivers/core/device.c b/drivers/core/device.c
index 8198750cd69b..8b47af6eee56 100644
--- a/drivers/core/device.c
+++ b/drivers/core/device.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <clk.h>
@@ -35,6 +36,7 @@
 #include <power-domain.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/core/devres.c b/drivers/core/devres.c
index 9507ecb9a80e..eda7dd37ac4a 100644
--- a/drivers/core/devres.c
+++ b/drivers/core/devres.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <linux/compat.h>
 #include <linux/errno.h>
@@ -21,6 +22,7 @@
 #include <dm/devres.h>
 #include <dm/root.h>
 #include <dm/util.h>
+#include <linux/types.h>
 
 /** enum devres_phase - Shows where resource was allocated
  *
diff --git a/drivers/core/dump.c b/drivers/core/dump.c
index 3b707eb49335..588ba2b9c020 100644
--- a/drivers/core/dump.c
+++ b/drivers/core/dump.c
@@ -10,6 +10,7 @@
 #include <dm/root.h>
 #include <dm/util.h>
 #include <dm/uclass-internal.h>
+#include <linux/types.h>
 
 static void show_devices(struct udevice *dev, int depth, int last_flag)
 {
diff --git a/drivers/core/fdtaddr.c b/drivers/core/fdtaddr.c
index 0cb78d64c5ee..ed7a7587df17 100644
--- a/drivers/core/fdtaddr.c
+++ b/drivers/core/fdtaddr.c
@@ -15,6 +15,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm/device-internal.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/core/of_access.c b/drivers/core/of_access.c
index 0ecc90890daf..21a51625959a 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 <stdbool.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <linux/bug.h>
@@ -33,6 +34,7 @@
 #include <linux/err.h>
 #include <linux/ioport.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/core/of_addr.c b/drivers/core/of_addr.c
index a245194db43b..52ac82238b09 100644
--- a/drivers/core/of_addr.c
+++ b/drivers/core/of_addr.c
@@ -18,6 +18,7 @@
 #include <linux/ioport.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /* Max address size we deal with */
 #define OF_MAX_ADDR_CELLS	4
diff --git a/drivers/core/of_extra.c b/drivers/core/of_extra.c
index f2efc0c8ad9d..87e304a78e4f 100644
--- a/drivers/core/of_extra.c
+++ b/drivers/core/of_extra.c
@@ -13,6 +13,7 @@
 #include <dm/of_extra.h>
 #include <dm/ofnode.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 int ofnode_read_fmap_entry(ofnode node, struct fmap_entry *entry)
 {
diff --git a/drivers/core/ofnode.c b/drivers/core/ofnode.c
index d68be142e681..cb05a7348b1a 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 <stdbool.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
@@ -20,6 +21,7 @@
 #include <linux/err.h>
 #include <linux/ioport.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 int ofnode_read_u32(ofnode node, const char *propname, u32 *outp)
 {
diff --git a/drivers/core/read.c b/drivers/core/read.c
index b84c9be24610..f069029136b4 100644
--- a/drivers/core/read.c
+++ b/drivers/core/read.c
@@ -13,6 +13,7 @@
 #include <asm/types.h>
 #include <asm/io.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 int dev_read_u32(const struct udevice *dev, const char *propname, u32 *outp)
 {
diff --git a/drivers/core/regmap.c b/drivers/core/regmap.c
index 37fff77dc09a..b9ab90518450 100644
--- a/drivers/core/regmap.c
+++ b/drivers/core/regmap.c
@@ -17,6 +17,7 @@
 #include <asm/io.h>
 #include <dm/of_addr.h>
 #include <linux/ioport.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/core/root.c b/drivers/core/root.c
index 6eb934c4095c..719c9dcb2a9f 100644
--- a/drivers/core/root.c
+++ b/drivers/core/root.c
@@ -7,10 +7,12 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <errno.h>
 #include <fdtdec.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
@@ -28,6 +30,7 @@
 #include <dm/util.h>
 #include <linux/list.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/core/simple-bus.c b/drivers/core/simple-bus.c
index aa888b2e0c46..ea98ee17a2f4 100644
--- a/drivers/core/simple-bus.c
+++ b/drivers/core/simple-bus.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 
 struct simple_bus_plat {
diff --git a/drivers/core/syscon-uclass.c b/drivers/core/syscon-uclass.c
index d8d26d772c74..3ab4345455a0 100644
--- a/drivers/core/syscon-uclass.c
+++ b/drivers/core/syscon-uclass.c
@@ -17,6 +17,7 @@
 #include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 /*
  * Caution:
diff --git a/drivers/core/uclass.c b/drivers/core/uclass.c
index 242d9f4b30dd..54c3fc9b1c83 100644
--- a/drivers/core/uclass.c
+++ b/drivers/core/uclass.c
@@ -23,6 +23,7 @@
 #include <dm/util.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/cpu/bmips_cpu.c b/drivers/cpu/bmips_cpu.c
index 44110e1d8ecd..f47a20e72123 100644
--- a/drivers/cpu/bmips_cpu.c
+++ b/drivers/cpu/bmips_cpu.c
@@ -8,6 +8,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <cpu.h>
 #include <display_options.h>
 #include <dm.h>
@@ -18,6 +19,7 @@
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #define REV_CHIPID_SHIFT		16
 #define REV_CHIPID_MASK			(0xffff << REV_CHIPID_SHIFT)
diff --git a/drivers/cpu/imx8_cpu.c b/drivers/cpu/imx8_cpu.c
index 0c660f81227f..75a005150473 100644
--- a/drivers/cpu/imx8_cpu.c
+++ b/drivers/cpu/imx8_cpu.c
@@ -18,6 +18,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/cpu/mpc83xx_cpu.c b/drivers/cpu/mpc83xx_cpu.c
index cd514e6e1ab7..1776e163081a 100644
--- a/drivers/cpu/mpc83xx_cpu.c
+++ b/drivers/cpu/mpc83xx_cpu.c
@@ -15,6 +15,7 @@
 #include <asm/ppc.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #include "mpc83xx_cpu.h"
 
diff --git a/drivers/cpu/riscv_cpu.c b/drivers/cpu/riscv_cpu.c
index 2fd18901dd4f..e2f0a28fcaf5 100644
--- a/drivers/cpu/riscv_cpu.c
+++ b/drivers/cpu/riscv_cpu.c
@@ -11,6 +11,7 @@
 #include <errno.h>
 #include <log.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <dm/device-internal.h>
 #include <dm/lists.h>
 #include <linux/bitops.h>
diff --git a/drivers/crypto/ace_sha.h b/drivers/crypto/ace_sha.h
index a671b925b6e7..7101b4d415bb 100644
--- a/drivers/crypto/ace_sha.h
+++ b/drivers/crypto/ace_sha.h
@@ -8,6 +8,7 @@
 #ifndef __ACE_SHA_H
 #define __ACE_SHA_H
 
+#include <linux/types.h>
 struct exynos_ace_sfr {
 	unsigned int	fc_intstat;	/* base + 0 */
 	unsigned int	fc_intenset;
diff --git a/drivers/crypto/fsl/desc.h b/drivers/crypto/fsl/desc.h
index 3589e6ea0241..35f1b1ddaa3e 100644
--- a/drivers/crypto/fsl/desc.h
+++ b/drivers/crypto/fsl/desc.h
@@ -1,6 +1,8 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * CAAM descriptor composition header
+#include <compiler.h>
+#include <linux/types.h>
  * Definitions to support CAAM descriptor instruction generation
  *
  * Copyright 2008-2014 Freescale Semiconductor, Inc.
diff --git a/drivers/crypto/fsl/desc_constr.h b/drivers/crypto/fsl/desc_constr.h
index a11ce812d19b..0e14ca510d07 100644
--- a/drivers/crypto/fsl/desc_constr.h
+++ b/drivers/crypto/fsl/desc_constr.h
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
 /*
+#include <linux/types.h>
  * caam descriptor construction helper functions
  *
  * Copyright 2008-2014 Freescale Semiconductor, Inc.
diff --git a/drivers/crypto/fsl/error.c b/drivers/crypto/fsl/error.c
index a83efe585e6e..f23649bf6f24 100644
--- a/drivers/crypto/fsl/error.c
+++ b/drivers/crypto/fsl/error.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <vsprintf.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include "desc.h"
diff --git a/drivers/crypto/fsl/fsl_blob.c b/drivers/crypto/fsl/fsl_blob.c
index 3cf03106174e..e62f4c818330 100644
--- a/drivers/crypto/fsl/fsl_blob.c
+++ b/drivers/crypto/fsl/fsl_blob.c
@@ -14,6 +14,7 @@
 #include <asm/cache.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include "jobdesc.h"
 #include "desc.h"
 #include "jr.h"
diff --git a/drivers/crypto/fsl/fsl_hash.c b/drivers/crypto/fsl/fsl_hash.c
index 5bd6604e7772..cdd067582aeb 100644
--- a/drivers/crypto/fsl/fsl_hash.c
+++ b/drivers/crypto/fsl/fsl_hash.c
@@ -12,6 +12,7 @@
 #include <stdio.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "jobdesc.h"
 #include "desc.h"
 #include "jr.h"
diff --git a/drivers/crypto/fsl/fsl_hash.h b/drivers/crypto/fsl/fsl_hash.h
index 82057c83c355..6890536bcc92 100644
--- a/drivers/crypto/fsl/fsl_hash.h
+++ b/drivers/crypto/fsl/fsl_hash.h
@@ -9,6 +9,7 @@
 
 #include <fsl_sec.h>
 #include <hash.h>
+#include <linux/types.h>
 #include "jr.h"
 
 /* We support at most 32 Scatter/Gather Entries.*/
diff --git a/drivers/crypto/fsl/fsl_rsa.c b/drivers/crypto/fsl/fsl_rsa.c
index 2658f8c04343..a26d68932c9c 100644
--- a/drivers/crypto/fsl/fsl_rsa.c
+++ b/drivers/crypto/fsl/fsl_rsa.c
@@ -11,6 +11,7 @@
 #include <asm/types.h>
 #include <malloc.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include "jobdesc.h"
 #include "desc.h"
 #include "jr.h"
diff --git a/drivers/crypto/fsl/jobdesc.c b/drivers/crypto/fsl/jobdesc.c
index 40f06e8f81bb..359f127561b9 100644
--- a/drivers/crypto/fsl/jobdesc.c
+++ b/drivers/crypto/fsl/jobdesc.c
@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
+#include <linux/types.h>
  * SEC Descriptor Construction Library
  * Basic job descriptor construction
  *
diff --git a/drivers/crypto/fsl/jobdesc.h b/drivers/crypto/fsl/jobdesc.h
index c4501abd26b2..7aa4cb2f58fc 100644
--- a/drivers/crypto/fsl/jobdesc.h
+++ b/drivers/crypto/fsl/jobdesc.h
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <asm/io.h>
+#include <linux/types.h>
 #include "rsa_caam.h"
 
 #define KEY_IDNFR_SZ_BYTES		16
diff --git a/drivers/crypto/fsl/jr.c b/drivers/crypto/fsl/jr.c
index 9ac4817d4489..fda540388bd9 100644
--- a/drivers/crypto/fsl/jr.c
+++ b/drivers/crypto/fsl/jr.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <stdio.h>
 #include <linux/errno.h>
@@ -13,6 +14,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "fsl_sec.h"
 #include "jr.h"
 #include "jobdesc.h"
diff --git a/drivers/crypto/fsl/jr.h b/drivers/crypto/fsl/jr.h
index ffd3a1927385..1006ce12d555 100644
--- a/drivers/crypto/fsl/jr.h
+++ b/drivers/crypto/fsl/jr.h
@@ -7,7 +7,9 @@
 #ifndef __JR_H
 #define __JR_H
 
+#include <compiler.h>
 #include <linux/compiler.h>
+#include <linux/types.h>
 
 #define JR_SIZE 4
 /* Timeout currently defined as 90 sec */
diff --git a/drivers/crypto/fsl/rng.c b/drivers/crypto/fsl/rng.c
index 77f8e8a055f7..19c6f9d5b91f 100644
--- a/drivers/crypto/fsl/rng.c
+++ b/drivers/crypto/fsl/rng.c
@@ -14,6 +14,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "desc_constr.h"
 #include "jobdesc.h"
 #include "jr.h"
diff --git a/drivers/crypto/fsl/rsa_caam.h b/drivers/crypto/fsl/rsa_caam.h
index 9a6a8afa4aa7..8e39607b9324 100644
--- a/drivers/crypto/fsl/rsa_caam.h
+++ b/drivers/crypto/fsl/rsa_caam.h
@@ -7,6 +7,7 @@
 #define __RSA_CAAM_H
 
 #include <common.h>
+#include <linux/types.h>
 
 /**
  * struct pk_in_params - holder for input to PKHA block in CAAM
diff --git a/drivers/crypto/fsl/sec.c b/drivers/crypto/fsl/sec.c
index 4e52852d64bb..32cfafea6798 100644
--- a/drivers/crypto/fsl/sec.c
+++ b/drivers/crypto/fsl/sec.c
@@ -4,8 +4,10 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
diff --git a/drivers/crypto/rsa_mod_exp/mod_exp_sw.c b/drivers/crypto/rsa_mod_exp/mod_exp_sw.c
index 4ce85b322446..359470e1cc4e 100644
--- a/drivers/crypto/rsa_mod_exp/mod_exp_sw.c
+++ b/drivers/crypto/rsa_mod_exp/mod_exp_sw.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <linux/types.h>
 #include <u-boot/rsa-mod-exp.h>
 
 static int mod_exp_sw(struct udevice *dev, const uint8_t *sig, uint32_t sig_len,
diff --git a/drivers/crypto/rsa_mod_exp/mod_exp_uclass.c b/drivers/crypto/rsa_mod_exp/mod_exp_uclass.c
index 6826011fb313..4fee492f090a 100644
--- a/drivers/crypto/rsa_mod_exp/mod_exp_uclass.c
+++ b/drivers/crypto/rsa_mod_exp/mod_exp_uclass.c
@@ -9,6 +9,7 @@
 #include <stdbool.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <u-boot/rsa-mod-exp.h>
 #include <errno.h>
 #include <fdtdec.h>
diff --git a/drivers/ddr/altera/sdram_agilex.c b/drivers/ddr/altera/sdram_agilex.c
index 8cc648bc98e6..539fdf90afa2 100644
--- a/drivers/ddr/altera/sdram_agilex.c
+++ b/drivers/ddr/altera/sdram_agilex.c
@@ -15,6 +15,7 @@
 #include <reset.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
 #include "sdram_soc64.h"
diff --git a/drivers/ddr/altera/sdram_arria10.c b/drivers/ddr/altera/sdram_arria10.c
index 7d51bfd83c50..23ca7bcc1600 100644
--- a/drivers/ddr/altera/sdram_arria10.c
+++ b/drivers/ddr/altera/sdram_arria10.c
@@ -21,6 +21,7 @@
 #include <asm/arch/misc.h>
 #include <asm/arch/reset_manager.h>
 #include <asm/arch/sdram.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/ddr/altera/sdram_gen5.c b/drivers/ddr/altera/sdram_gen5.c
index 723436cadcab..30adfe61cdc2 100644
--- a/drivers/ddr/altera/sdram_gen5.c
+++ b/drivers/ddr/altera/sdram_gen5.c
@@ -18,6 +18,7 @@
 #include <asm/arch/system_manager.h>
 #include <asm/bitops.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <dm/device_compat.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
diff --git a/drivers/ddr/altera/sdram_s10.c b/drivers/ddr/altera/sdram_s10.c
index 8fe96ee24656..e0c4b87514c8 100644
--- a/drivers/ddr/altera/sdram_s10.c
+++ b/drivers/ddr/altera/sdram_s10.c
@@ -17,6 +17,7 @@
 #include <reset.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/kernel.h>
 #include "sdram_s10.h"
diff --git a/drivers/ddr/altera/sdram_soc64.c b/drivers/ddr/altera/sdram_soc64.c
index 67fc9c14e3f6..b4823503c012 100644
--- a/drivers/ddr/altera/sdram_soc64.c
+++ b/drivers/ddr/altera/sdram_soc64.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <dm.h>
 #include <errno.h>
@@ -18,6 +19,7 @@
 #include <stdio.h>
 #include <time.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
diff --git a/drivers/ddr/altera/sdram_soc64.h b/drivers/ddr/altera/sdram_soc64.h
index 4a830e7ec187..d7a5a57b0e2d 100644
--- a/drivers/ddr/altera/sdram_soc64.h
+++ b/drivers/ddr/altera/sdram_soc64.h
@@ -7,6 +7,8 @@
 #define	_SDRAM_SOC64_H_
 
 #include <common.h>
+#include <compiler.h>
+#include <asm/types.h>
 #include <linux/sizes.h>
 
 struct altera_sdram_priv {
diff --git a/drivers/ddr/altera/sequencer.c b/drivers/ddr/altera/sequencer.c
index aad40ad398d7..861e0282f9fe 100644
--- a/drivers/ddr/altera/sequencer.c
+++ b/drivers/ddr/altera/sequencer.c
@@ -5,10 +5,12 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <asm/arch/sdram.h>
 #include <errno.h>
 #include <hang.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
diff --git a/drivers/ddr/altera/sequencer.h b/drivers/ddr/altera/sequencer.h
index b655c25688dc..72236531cce7 100644
--- a/drivers/ddr/altera/sequencer.h
+++ b/drivers/ddr/altera/sequencer.h
@@ -7,6 +7,7 @@
 #define _SEQUENCER_H_
 
 #include <stdbool.h>
+#include <linux/types.h>
 #define RW_MGR_NUM_DM_PER_WRITE_GROUP (seq->rwcfg->mem_data_mask_width \
 	/ seq->rwcfg->mem_if_write_dqs_width)
 #define RW_MGR_NUM_TRUE_DM_PER_WRITE_GROUP ( \
diff --git a/drivers/ddr/fsl/arm_ddr_gen3.c b/drivers/ddr/fsl/arm_ddr_gen3.c
index 15799011c9b5..0fd9b2e5df7e 100644
--- a/drivers/ddr/fsl/arm_ddr_gen3.c
+++ b/drivers/ddr/fsl/arm_ddr_gen3.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <log.h>
 #include <stdio.h>
 #include <asm/io.h>
@@ -14,6 +15,7 @@
 #include <fsl_immap.h>
 #include <fsl_ddr.h>
 #include <asm/arch/clock.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 #if (CONFIG_CHIP_SELECTS_PER_CTRL > 4)
diff --git a/drivers/ddr/fsl/ctrl_regs.c b/drivers/ddr/fsl/ctrl_regs.c
index a4b908ea5c79..9dc08acf1962 100644
--- a/drivers/ddr/fsl/ctrl_regs.c
+++ b/drivers/ddr/fsl/ctrl_regs.c
@@ -11,11 +11,13 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <fsl_ddr_sdram.h>
 #include <fsl_errata.h>
 #include <fsl_ddr.h>
 #include <fsl_immap.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/bitops.h>
 #include <asm/io.h>
@@ -23,6 +25,7 @@
 	defined(CONFIG_ARM)
 #include <asm/arch/clock.h>
 #endif
+#include <asm/types.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
 
diff --git a/drivers/ddr/fsl/ddr3_dimm_params.c b/drivers/ddr/fsl/ddr3_dimm_params.c
index b3e42519e86b..6833b981ce82 100644
--- a/drivers/ddr/fsl/ddr3_dimm_params.c
+++ b/drivers/ddr/fsl/ddr3_dimm_params.c
@@ -12,6 +12,7 @@
 #include <fsl_ddr_sdram.h>
 #include <log.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/string.h>
 
 #include <fsl_ddr.h>
diff --git a/drivers/ddr/fsl/ddr4_dimm_params.c b/drivers/ddr/fsl/ddr4_dimm_params.c
index fca5b433eb10..251facdb8582 100644
--- a/drivers/ddr/fsl/ddr4_dimm_params.c
+++ b/drivers/ddr/fsl/ddr4_dimm_params.c
@@ -15,6 +15,7 @@
 #include <log.h>
 #include <stdbool.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/bug.h>
 #include <linux/string.h>
 
diff --git a/drivers/ddr/fsl/fsl_ddr_gen4.c b/drivers/ddr/fsl/fsl_ddr_gen4.c
index 5e092e3e9241..3fc7c0dad835 100644
--- a/drivers/ddr/fsl/fsl_ddr_gen4.c
+++ b/drivers/ddr/fsl/fsl_ddr_gen4.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <env.h>
 #include <log.h>
 #include <stdio.h>
@@ -17,6 +18,7 @@
 	defined(CONFIG_ARM)
 #include <asm/arch/clock.h>
 #endif
+#include <asm/types.h>
 #include <linux/delay.h>
 
 #define CTLR_INTLV_MASK	0x20000000
diff --git a/drivers/ddr/fsl/fsl_mmdc.c b/drivers/ddr/fsl/fsl_mmdc.c
index b88c65cd2e47..51c078f00081 100644
--- a/drivers/ddr/fsl/fsl_mmdc.c
+++ b/drivers/ddr/fsl/fsl_mmdc.c
@@ -11,6 +11,7 @@
 #include <fsl_mmdc.h>
 #include <stdio.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 static void set_wait_for_bits_clear(void *ptr, u32 value, u32 bits)
diff --git a/drivers/ddr/fsl/interactive.c b/drivers/ddr/fsl/interactive.c
index c7d99077d865..f8209d3aa862 100644
--- a/drivers/ddr/fsl/interactive.c
+++ b/drivers/ddr/fsl/interactive.c
@@ -24,6 +24,7 @@
 #include <asm/io.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr.h>
diff --git a/drivers/ddr/fsl/main.c b/drivers/ddr/fsl/main.c
index 56c0de2004cf..45c50331b363 100644
--- a/drivers/ddr/fsl/main.c
+++ b/drivers/ddr/fsl/main.c
@@ -10,6 +10,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <display_options.h>
 #include <dm.h>
 #include <i2c.h>
@@ -17,11 +18,13 @@
 #include <fsl_ddr.h>
 #include <init.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/bitops.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /*
  * CONFIG_SYS_FSL_DDR_SDRAM_BASE_PHY is the physical address from the view
diff --git a/drivers/ddr/fsl/mpc85xx_ddr_gen1.c b/drivers/ddr/fsl/mpc85xx_ddr_gen1.c
index 930dd72abce1..e1859a77510a 100644
--- a/drivers/ddr/fsl/mpc85xx_ddr_gen1.c
+++ b/drivers/ddr/fsl/mpc85xx_ddr_gen1.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <log.h>
 #include <stdio.h>
 #include <asm/io.h>
diff --git a/drivers/ddr/fsl/mpc85xx_ddr_gen2.c b/drivers/ddr/fsl/mpc85xx_ddr_gen2.c
index 799243f7fc60..9acc822fb2b0 100644
--- a/drivers/ddr/fsl/mpc85xx_ddr_gen2.c
+++ b/drivers/ddr/fsl/mpc85xx_ddr_gen2.c
@@ -4,11 +4,13 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <stdio.h>
 #include <asm/io.h>
 #include <asm/ppc.h>
 #include <fsl_ddr_sdram.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 #if (CONFIG_CHIP_SELECTS_PER_CTRL > 4)
 #error Invalid setting for CONFIG_CHIP_SELECTS_PER_CTRL
diff --git a/drivers/ddr/fsl/mpc85xx_ddr_gen3.c b/drivers/ddr/fsl/mpc85xx_ddr_gen3.c
index 1e1648592323..9f7553906be8 100644
--- a/drivers/ddr/fsl/mpc85xx_ddr_gen3.c
+++ b/drivers/ddr/fsl/mpc85xx_ddr_gen3.c
@@ -4,12 +4,14 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <log.h>
 #include <stdio.h>
 #include <asm/io.h>
 #include <asm/ppc.h>
 #include <fsl_ddr_sdram.h>
 #include <asm/processor.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 #if (CONFIG_CHIP_SELECTS_PER_CTRL > 4)
diff --git a/drivers/ddr/fsl/mpc86xx_ddr.c b/drivers/ddr/fsl/mpc86xx_ddr.c
index cebe07308f3d..781c9c2eb47a 100644
--- a/drivers/ddr/fsl/mpc86xx_ddr.c
+++ b/drivers/ddr/fsl/mpc86xx_ddr.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <log.h>
 #include <stdio.h>
 #include <asm/io.h>
diff --git a/drivers/ddr/fsl/options.c b/drivers/ddr/fsl/options.c
index 481b1914c001..b6c0f1488695 100644
--- a/drivers/ddr/fsl/options.c
+++ b/drivers/ddr/fsl/options.c
@@ -5,12 +5,14 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <env.h>
 #include <hwconfig.h>
 #include <fsl_ddr_sdram.h>
 #include <log.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/types.h>
 
 #include <fsl_ddr.h>
 /* For get_ddr_freq() */
diff --git a/drivers/ddr/fsl/util.c b/drivers/ddr/fsl/util.c
index 04266fb35ffb..b385cc433cd0 100644
--- a/drivers/ddr/fsl/util.c
+++ b/drivers/ddr/fsl/util.c
@@ -8,10 +8,12 @@
 #include <asm/fsl_law.h>
 #include <asm/ppc.h>
 #endif
+#include <compiler.h>
 #include <div64.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 #include <fsl_ddr.h>
 #include <fsl_immap.h>
diff --git a/drivers/ddr/imx/imx8m/ddr_init.c b/drivers/ddr/imx/imx8m/ddr_init.c
index 99a67edfb0a8..45a6878cb51c 100644
--- a/drivers/ddr/imx/imx8m/ddr_init.c
+++ b/drivers/ddr/imx/imx8m/ddr_init.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <errno.h>
 #include <log.h>
 #include <asm/io.h>
diff --git a/drivers/ddr/imx/imx8m/ddrphy_csr.c b/drivers/ddr/imx/imx8m/ddrphy_csr.c
index 67dd4e7059f0..7cbd0ba8200c 100644
--- a/drivers/ddr/imx/imx8m/ddrphy_csr.c
+++ b/drivers/ddr/imx/imx8m/ddrphy_csr.c
@@ -5,6 +5,7 @@
 
 #include <linux/kernel.h>
 #include <asm/arch/ddr.h>
+#include <linux/types.h>
 
 /* ddr phy trained csr */
 struct dram_cfg_param ddrphy_trained_csr[] = {
diff --git a/drivers/ddr/imx/imx8m/ddrphy_utils.c b/drivers/ddr/imx/imx8m/ddrphy_utils.c
index 0f8baefb1f89..6b94d82dddce 100644
--- a/drivers/ddr/imx/imx8m/ddrphy_utils.c
+++ b/drivers/ddr/imx/imx8m/ddrphy_utils.c
@@ -12,6 +12,7 @@
 #include <asm/arch/ddr.h>
 #include <asm/arch/lpddr4_define.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/types.h>
 
 static unsigned int g_cdd_rr_max[4];
 static unsigned int g_cdd_rw_max[4];
diff --git a/drivers/ddr/imx/imx8m/helper.c b/drivers/ddr/imx/imx8m/helper.c
index fca733ee3b2f..cd6d0c372040 100644
--- a/drivers/ddr/imx/imx8m/helper.c
+++ b/drivers/ddr/imx/imx8m/helper.c
@@ -15,6 +15,7 @@
 #include <asm/arch/ddr.h>
 #include <asm/arch/lpddr4_define.h>
 #include <asm/sections.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/ddr/marvell/a38x/ddr3_logging_def.h b/drivers/ddr/marvell/a38x/ddr3_logging_def.h
index ad9da1cfffb4..9c34054a7971 100644
--- a/drivers/ddr/marvell/a38x/ddr3_logging_def.h
+++ b/drivers/ddr/marvell/a38x/ddr3_logging_def.h
@@ -71,6 +71,7 @@
 	if (level >= debug_training_access)	\
 		printf s
 #endif
+#include <asm/types.h>
 #endif
 
 
diff --git a/drivers/ddr/marvell/a38x/ddr3_patterns_64bit.h b/drivers/ddr/marvell/a38x/ddr3_patterns_64bit.h
index 1e2260b8710e..39fa85258190 100644
--- a/drivers/ddr/marvell/a38x/ddr3_patterns_64bit.h
+++ b/drivers/ddr/marvell/a38x/ddr3_patterns_64bit.h
@@ -6,6 +6,7 @@
 #ifndef __DDR3_PATTERNS_64_H
 #define __DDR3_PATTERNS_64_H
 
+#include <asm/types.h>
 #define FAB_OPT		21
 /*
  * Patterns Declerations
diff --git a/drivers/ddr/marvell/a38x/ddr3_training_hw_algo.h b/drivers/ddr/marvell/a38x/ddr3_training_hw_algo.h
index fe0436668e9a..6dba8575281e 100644
--- a/drivers/ddr/marvell/a38x/ddr3_training_hw_algo.h
+++ b/drivers/ddr/marvell/a38x/ddr3_training_hw_algo.h
@@ -6,6 +6,7 @@
 #ifndef _DDR3_TRAINING_HW_ALGO_H_
 #define _DDR3_TRAINING_HW_ALGO_H_
 
+#include <asm/types.h>
 int ddr3_tip_vref(u32 dev_num);
 int ddr3_tip_write_additional_odt_setting(u32 dev_num, u32 if_id);
 int ddr3_tip_cmd_addr_init_delay(u32 dev_num, u32 adll_tap);
diff --git a/drivers/ddr/marvell/a38x/ddr3_training_ip_centralization.h b/drivers/ddr/marvell/a38x/ddr3_training_ip_centralization.h
index 392842a102d1..319fe1eebe6a 100644
--- a/drivers/ddr/marvell/a38x/ddr3_training_ip_centralization.h
+++ b/drivers/ddr/marvell/a38x/ddr3_training_ip_centralization.h
@@ -6,6 +6,7 @@
 #ifndef _DDR3_TRAINING_IP_CENTRALIZATION_H
 #define _DDR3_TRAINING_IP_CENTRALIZATION_H
 
+#include <asm/types.h>
 int ddr3_tip_centralization_tx(u32 dev_num);
 int ddr3_tip_centralization_rx(u32 dev_num);
 int ddr3_tip_print_centralization_result(u32 dev_num);
diff --git a/drivers/ddr/marvell/a38x/ddr3_training_ip_db.h b/drivers/ddr/marvell/a38x/ddr3_training_ip_db.h
index e28b7ecee15c..a1cb285a2cf1 100644
--- a/drivers/ddr/marvell/a38x/ddr3_training_ip_db.h
+++ b/drivers/ddr/marvell/a38x/ddr3_training_ip_db.h
@@ -6,6 +6,7 @@
 #ifndef _DDR3_TRAINING_IP_DB_H_
 #define _DDR3_TRAINING_IP_DB_H_
 
+#include <asm/types.h>
 enum hws_pattern {
 	PATTERN_PBS1,
 	PATTERN_PBS2,
diff --git a/drivers/ddr/marvell/a38x/ddr3_training_ip_pbs.h b/drivers/ddr/marvell/a38x/ddr3_training_ip_pbs.h
index 323c67aa5912..1a8d9d1ad89d 100644
--- a/drivers/ddr/marvell/a38x/ddr3_training_ip_pbs.h
+++ b/drivers/ddr/marvell/a38x/ddr3_training_ip_pbs.h
@@ -6,6 +6,7 @@
 #ifndef _DDR3_TRAINING_IP_PBS_H_
 #define _DDR3_TRAINING_IP_PBS_H_
 
+#include <asm/types.h>
 enum {
 	EBA_CONFIG,
 	EEBA_CONFIG,
diff --git a/drivers/ddr/marvell/a38x/ddr3_training_leveling.h b/drivers/ddr/marvell/a38x/ddr3_training_leveling.h
index 6719fb83f518..73851570e0a9 100644
--- a/drivers/ddr/marvell/a38x/ddr3_training_leveling.h
+++ b/drivers/ddr/marvell/a38x/ddr3_training_leveling.h
@@ -6,6 +6,7 @@
 #ifndef _DDR3_TRAINING_LEVELING_H_
 #define _DDR3_TRAINING_LEVELING_H_
 
+#include <asm/types.h>
 #define MAX_DQ_READ_LEVELING_DELAY 15
 
 int ddr3_tip_print_wl_supp_result(u32 dev_num);
diff --git a/drivers/ddr/marvell/a38x/ddr_ml_wrapper.h b/drivers/ddr/marvell/a38x/ddr_ml_wrapper.h
index 688cbbeefc5f..88beb5c83123 100644
--- a/drivers/ddr/marvell/a38x/ddr_ml_wrapper.h
+++ b/drivers/ddr/marvell/a38x/ddr_ml_wrapper.h
@@ -13,6 +13,7 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <asm/types.h>
 
 #if defined(CONFIG_ARMADA_38X) || defined(CONFIG_ARMADA_39X)
 #define INTER_REGS_BASE	SOC_REGS_PHY_BASE
diff --git a/drivers/ddr/marvell/a38x/mv_ddr_common.h b/drivers/ddr/marvell/a38x/mv_ddr_common.h
index 321a390c0d30..109d3e170906 100644
--- a/drivers/ddr/marvell/a38x/mv_ddr_common.h
+++ b/drivers/ddr/marvell/a38x/mv_ddr_common.h
@@ -6,6 +6,7 @@
 #ifndef _MV_DDR_COMMON_H
 #define _MV_DDR_COMMON_H
 
+#include <linux/types.h>
 extern const char mv_ddr_build_message[];
 extern const char mv_ddr_version_string[];
 
diff --git a/drivers/ddr/marvell/a38x/seq_exec.h b/drivers/ddr/marvell/a38x/seq_exec.h
index fe0cb8f75df2..71b3a75fb839 100644
--- a/drivers/ddr/marvell/a38x/seq_exec.h
+++ b/drivers/ddr/marvell/a38x/seq_exec.h
@@ -6,6 +6,7 @@
 #ifndef _SEQ_EXEC_H
 #define _SEQ_EXEC_H
 
+#include <asm/types.h>
 #define NA			0xff
 #define DEFAULT_PARAM		0
 #define MV_BOARD_TCLK_ERROR	0xffffffff
diff --git a/drivers/ddr/marvell/a38x/xor.h b/drivers/ddr/marvell/a38x/xor.h
index 1e0265036934..59a7bafa5ab5 100644
--- a/drivers/ddr/marvell/a38x/xor.h
+++ b/drivers/ddr/marvell/a38x/xor.h
@@ -6,6 +6,7 @@
 #ifndef _XOR_H
 #define _XOR_H
 
+#include <asm/types.h>
 #define SRAM_BASE		0x40000000
 
 #define MV_XOR_MAX_UNIT		2	/* XOR unit == XOR engine */
diff --git a/drivers/ddr/marvell/axp/ddr3_dfs.c b/drivers/ddr/marvell/axp/ddr3_dfs.c
index 86abdf70db71..e118b44e4d07 100644
--- a/drivers/ddr/marvell/axp/ddr3_dfs.c
+++ b/drivers/ddr/marvell/axp/ddr3_dfs.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 #include "ddr3_hw_training.h"
diff --git a/drivers/ddr/marvell/axp/ddr3_dqs.c b/drivers/ddr/marvell/axp/ddr3_dqs.c
index 33187fbc64fd..0f662d1fab43 100644
--- a/drivers/ddr/marvell/axp/ddr3_dqs.c
+++ b/drivers/ddr/marvell/axp/ddr3_dqs.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <asm/types.h>
 
 #include "ddr3_hw_training.h"
 
diff --git a/drivers/ddr/marvell/axp/ddr3_hw_training.c b/drivers/ddr/marvell/axp/ddr3_hw_training.c
index cc36f29ff862..a4771fbd46de 100644
--- a/drivers/ddr/marvell/axp/ddr3_hw_training.c
+++ b/drivers/ddr/marvell/axp/ddr3_hw_training.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 
diff --git a/drivers/ddr/marvell/axp/ddr3_init.c b/drivers/ddr/marvell/axp/ddr3_init.c
index f934957a0f3d..b30a43ee6801 100644
--- a/drivers/ddr/marvell/axp/ddr3_init.c
+++ b/drivers/ddr/marvell/axp/ddr3_init.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <i2c.h>
 #include <log.h>
 #include <spl.h>
@@ -11,6 +12,7 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 #include "ddr3_init.h"
diff --git a/drivers/ddr/marvell/axp/ddr3_patterns_64bit.h b/drivers/ddr/marvell/axp/ddr3_patterns_64bit.h
index 00dc9e3559a6..b5b91cd0f0bf 100644
--- a/drivers/ddr/marvell/axp/ddr3_patterns_64bit.h
+++ b/drivers/ddr/marvell/axp/ddr3_patterns_64bit.h
@@ -10,6 +10,7 @@
  * Patterns Declerations
  */
 
+#include <asm/types.h>
 u32 wl_sup_pattern[LEN_WL_SUP_PATTERN] __aligned(32) = {
 	0x04030201, 0x08070605, 0x0c0b0a09, 0x100f0e0d,
 	0x14131211, 0x18171615, 0x1c1b1a19, 0x201f1e1d,
diff --git a/drivers/ddr/marvell/axp/ddr3_pbs.c b/drivers/ddr/marvell/axp/ddr3_pbs.c
index dd7905dd7f47..adcdc91b9391 100644
--- a/drivers/ddr/marvell/axp/ddr3_pbs.c
+++ b/drivers/ddr/marvell/axp/ddr3_pbs.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 
diff --git a/drivers/ddr/marvell/axp/ddr3_read_leveling.c b/drivers/ddr/marvell/axp/ddr3_read_leveling.c
index 03dae99107a4..3d4992f91608 100644
--- a/drivers/ddr/marvell/axp/ddr3_read_leveling.c
+++ b/drivers/ddr/marvell/axp/ddr3_read_leveling.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <asm/types.h>
 
 #include "ddr3_hw_training.h"
 
diff --git a/drivers/ddr/marvell/axp/ddr3_sdram.c b/drivers/ddr/marvell/axp/ddr3_sdram.c
index 3a266c6de458..3fb1f89a0909 100644
--- a/drivers/ddr/marvell/axp/ddr3_sdram.c
+++ b/drivers/ddr/marvell/axp/ddr3_sdram.c
@@ -9,6 +9,7 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <asm/types.h>
 
 #include "ddr3_hw_training.h"
 #include "xor.h"
diff --git a/drivers/ddr/marvell/axp/ddr3_spd.c b/drivers/ddr/marvell/axp/ddr3_spd.c
index d58d4961658a..f35df5a7e959 100644
--- a/drivers/ddr/marvell/axp/ddr3_spd.c
+++ b/drivers/ddr/marvell/axp/ddr3_spd.c
@@ -12,6 +12,7 @@
 #include <asm/arch/soc.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "ddr3_init.h"
 
diff --git a/drivers/ddr/marvell/axp/ddr3_write_leveling.c b/drivers/ddr/marvell/axp/ddr3_write_leveling.c
index 8c875287b4c5..c3c0a87ac458 100644
--- a/drivers/ddr/marvell/axp/ddr3_write_leveling.c
+++ b/drivers/ddr/marvell/axp/ddr3_write_leveling.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 
diff --git a/drivers/ddr/marvell/axp/xor.c b/drivers/ddr/marvell/axp/xor.c
index 17bfe6a7bf38..9c323685dc89 100644
--- a/drivers/ddr/marvell/axp/xor.c
+++ b/drivers/ddr/marvell/axp/xor.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <asm/types.h>
 
 #include "xor.h"
 #include "xor_regs.h"
diff --git a/drivers/ddr/microchip/ddr2.c b/drivers/ddr/microchip/ddr2.c
index 90ebf4642d5d..0dd725c4ac18 100644
--- a/drivers/ddr/microchip/ddr2.c
+++ b/drivers/ddr/microchip/ddr2.c
@@ -4,8 +4,10 @@
  *
  */
 #include <common.h>
+#include <compiler.h>
 #include <stdio.h>
 #include <wait_bit.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 #include <linux/bitops.h>
 #include <mach/pic32.h>
diff --git a/drivers/ddr/microchip/ddr2_regs.h b/drivers/ddr/microchip/ddr2_regs.h
index 0734585dc2ff..5c3b70fc3ce8 100644
--- a/drivers/ddr/microchip/ddr2_regs.h
+++ b/drivers/ddr/microchip/ddr2_regs.h
@@ -7,6 +7,7 @@
 #ifndef __MICROCHIP_DDR2_REGS_H
 #define __MICROCHIP_DDR2_REGS_H
 
+#include <asm/types.h>
 #include <linux/bitops.h>
 
 /* DDR2 Controller */
diff --git a/drivers/demo/demo-shape.c b/drivers/demo/demo-shape.c
index 1be18905890f..d9e61029e393 100644
--- a/drivers/demo/demo-shape.c
+++ b/drivers/demo/demo-shape.c
@@ -16,6 +16,7 @@
 #include <asm/gpio.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/demo/demo-simple.c b/drivers/demo/demo-simple.c
index 325f653877f2..e02dde63d6c8 100644
--- a/drivers/demo/demo-simple.c
+++ b/drivers/demo/demo-simple.c
@@ -12,6 +12,7 @@
 #include <mapmem.h>
 #include <stdio.h>
 #include <asm/io.h>
+#include <linux/types.h>
 
 static int simple_hello(struct udevice *dev, int ch)
 {
diff --git a/drivers/dfu/dfu.c b/drivers/dfu/dfu.c
index b9d1dcbc1d2d..7df96cd136f3 100644
--- a/drivers/dfu/dfu.c
+++ b/drivers/dfu/dfu.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <env.h>
 #include <errno.h>
 #include <log.h>
@@ -15,6 +16,7 @@
 #include <fat.h>
 #include <dfu.h>
 #include <hash.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/errno.h>
@@ -23,6 +25,7 @@
 #include <linux/compiler.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static LIST_HEAD(dfu_list);
 static int dfu_alt_num;
diff --git a/drivers/dfu/dfu_mmc.c b/drivers/dfu/dfu_mmc.c
index 4431e34c10e6..e4894c5968d9 100644
--- a/drivers/dfu/dfu_mmc.c
+++ b/drivers/dfu/dfu_mmc.c
@@ -22,6 +22,7 @@
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static unsigned char *dfu_file_buf;
 static u64 dfu_file_buf_len;
diff --git a/drivers/dfu/dfu_mtd.c b/drivers/dfu/dfu_mtd.c
index 7e5623674ca1..9b850560721c 100644
--- a/drivers/dfu/dfu_mtd.c
+++ b/drivers/dfu/dfu_mtd.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <dfu.h>
 #include <mtd.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <jffs2/load_kernel.h>
@@ -17,6 +18,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static bool mtd_is_aligned_with_block_size(struct mtd_info *mtd, u64 size)
 {
diff --git a/drivers/dfu/dfu_nand.c b/drivers/dfu/dfu_nand.c
index 848a9d81d11b..e4bcdde86688 100644
--- a/drivers/dfu/dfu_nand.c
+++ b/drivers/dfu/dfu_nand.c
@@ -21,6 +21,7 @@
 #include <jffs2/load_kernel.h>
 #include <nand.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static int nand_block_op(enum dfu_op op, struct dfu_entity *dfu,
 			u64 offset, void *buf, long *len)
diff --git a/drivers/dfu/dfu_ram.c b/drivers/dfu/dfu_ram.c
index 55c3dc9eb193..ac07730b84c9 100644
--- a/drivers/dfu/dfu_ram.c
+++ b/drivers/dfu/dfu_ram.c
@@ -16,6 +16,7 @@
 #include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static int dfu_transfer_medium_ram(enum dfu_op op, struct dfu_entity *dfu,
 				   u64 offset, void *buf, long *len)
diff --git a/drivers/dfu/dfu_sf.c b/drivers/dfu/dfu_sf.c
index 3d0a4f989715..af4a90a8b427 100644
--- a/drivers/dfu/dfu_sf.c
+++ b/drivers/dfu/dfu_sf.c
@@ -17,6 +17,7 @@
 #include <linux/errno.h>
 #include <linux/mtd/mtd.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static int dfu_get_medium_size_sf(struct dfu_entity *dfu, u64 *size)
 {
diff --git a/drivers/dfu/dfu_tftp.c b/drivers/dfu/dfu_tftp.c
index 61efb11a5452..d90a1a2f38ee 100644
--- a/drivers/dfu/dfu_tftp.c
+++ b/drivers/dfu/dfu_tftp.c
@@ -12,6 +12,7 @@
 #include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 int dfu_tftp_write(char *dfu_entity_name, unsigned int addr, unsigned int len,
 		   char *interface, char *devstring)
diff --git a/drivers/dfu/dfu_virt.c b/drivers/dfu/dfu_virt.c
index 4d9a56bbf5c7..7b47c1eed26c 100644
--- a/drivers/dfu/dfu_virt.c
+++ b/drivers/dfu/dfu_virt.c
@@ -3,11 +3,13 @@
  * Copyright (C) 2019, STMicroelectronics - All Rights Reserved
  */
 #include <common.h>
+#include <compiler.h>
 #include <dfu.h>
 #include <errno.h>
 #include <log.h>
 #include <malloc.h>
 #include <vsprintf.h>
+#include <linux/types.h>
 
 int __weak dfu_write_medium_virt(struct dfu_entity *dfu, u64 offset,
 				 void *buf, long *len)
diff --git a/drivers/dma/MCD_dmaApi.c b/drivers/dma/MCD_dmaApi.c
index d3c79e122cb7..feee0a5421a4 100644
--- a/drivers/dma/MCD_dmaApi.c
+++ b/drivers/dma/MCD_dmaApi.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <stdio.h>
+#include <asm/types.h>
 
 #include <MCD_dma.h>
 #include <MCD_tasksInit.h>
diff --git a/drivers/dma/MCD_tasks.c b/drivers/dma/MCD_tasks.c
index 453d95413da8..9d320ea1dcd6 100644
--- a/drivers/dma/MCD_tasks.c
+++ b/drivers/dma/MCD_tasks.c
@@ -3,6 +3,7 @@
  * Copyright (C) 2004-2007 Freescale Semiconductor, Inc.
  */
 
+#include <asm/types.h>
 /* Contains task code and structures for Multi-channel DMA */
 
 #include <common.h>
diff --git a/drivers/dma/MCD_tasksInit.c b/drivers/dma/MCD_tasksInit.c
index 079cd0af3c02..20ad4c241cad 100644
--- a/drivers/dma/MCD_tasksInit.c
+++ b/drivers/dma/MCD_tasksInit.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <asm/types.h>
 
 /* Functions for initializing variable tables of different types of tasks. */
 
diff --git a/drivers/dma/apbh_dma.c b/drivers/dma/apbh_dma.c
index 697db0d7201b..967c614c852f 100644
--- a/drivers/dma/apbh_dma.c
+++ b/drivers/dma/apbh_dma.c
@@ -17,6 +17,7 @@
 #include <linux/kernel.h>
 #include <linux/list.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <common.h>
 #include <malloc.h>
diff --git a/drivers/dma/bcm6348-iudma.c b/drivers/dma/bcm6348-iudma.c
index e6fc0ac5ffb0..43b93b26b333 100644
--- a/drivers/dma/bcm6348-iudma.c
+++ b/drivers/dma/bcm6348-iudma.c
@@ -17,6 +17,7 @@
 
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <dm.h>
 #include <dma-uclass.h>
@@ -31,6 +32,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 #define DMA_RX_DESC	6
 #define DMA_TX_DESC	1
diff --git a/drivers/dma/dma-uclass.c b/drivers/dma/dma-uclass.c
index 8a6fd825b136..62f3d60465cf 100644
--- a/drivers/dma/dma-uclass.c
+++ b/drivers/dma/dma-uclass.c
@@ -22,6 +22,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_DMA_CHANNELS
 static inline struct dma_ops *dma_dev_ops(struct udevice *dev)
diff --git a/drivers/dma/fsl_dma.c b/drivers/dma/fsl_dma.c
index a818084a3bef..53a31461ac26 100644
--- a/drivers/dma/fsl_dma.c
+++ b/drivers/dma/fsl_dma.c
@@ -13,6 +13,7 @@
 #include <asm/io.h>
 #include <asm/fsl_dma.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 /* Controller can only transfer 2^26 - 1 bytes at a time */
 #define FSL_DMA_MAX_SIZE	(0x3ffffff)
diff --git a/drivers/dma/keystone_nav.c b/drivers/dma/keystone_nav.c
index 72b0a7736fcd..7dedd52698e4 100644
--- a/drivers/dma/keystone_nav.c
+++ b/drivers/dma/keystone_nav.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <asm/io.h>
 #include <asm/ti-common/keystone_nav.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 
diff --git a/drivers/dma/keystone_nav_cfg.c b/drivers/dma/keystone_nav_cfg.c
index 9a64801cf9b2..cd84b42b954b 100644
--- a/drivers/dma/keystone_nav_cfg.c
+++ b/drivers/dma/keystone_nav_cfg.c
@@ -7,6 +7,7 @@
  */
 
 #include <asm/ti-common/keystone_nav.h>
+#include <asm/types.h>
 
 #ifdef CONFIG_KSNAV_PKTDMA_NETCP
 /* NETCP Pktdma */
diff --git a/drivers/dma/lpc32xx_dma.c b/drivers/dma/lpc32xx_dma.c
index 7078d3e7c6aa..996fc1bdc859 100644
--- a/drivers/dma/lpc32xx_dma.c
+++ b/drivers/dma/lpc32xx_dma.c
@@ -16,6 +16,7 @@
 #include <asm/arch/clk.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/dma/sandbox-dma-test.c b/drivers/dma/sandbox-dma-test.c
index 460197ed67a0..b5a37c74d5a2 100644
--- a/drivers/dma/sandbox-dma-test.c
+++ b/drivers/dma/sandbox-dma-test.c
@@ -20,6 +20,7 @@
 #include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define SANDBOX_DMA_CH_CNT 3
 #define SANDBOX_DMA_BUF_SIZE 1024
diff --git a/drivers/dma/ti-edma3.c b/drivers/dma/ti-edma3.c
index aba4efc15c2e..878dbdfe59ee 100644
--- a/drivers/dma/ti-edma3.c
+++ b/drivers/dma/ti-edma3.c
@@ -17,6 +17,7 @@
 #include <asm/ti-common/ti-edma3.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define EDMA3_SL_BASE(slot)			(0x4000 + ((slot) << 5))
 #define EDMA3_SL_MAX_NUM			512
diff --git a/drivers/dma/ti/k3-psil.c b/drivers/dma/ti/k3-psil.c
index 56da1e605c33..783a413b3875 100644
--- a/drivers/dma/ti/k3-psil.c
+++ b/drivers/dma/ti/k3-psil.c
@@ -4,6 +4,7 @@
  *  Author: Peter Ujfalusi <peter.ujfalusi@ti.com>
  */
 
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/err.h>
diff --git a/drivers/dma/ti/k3-udma.c b/drivers/dma/ti/k3-udma.c
index 4d50dbc76e5d..1f4b16782a6f 100644
--- a/drivers/dma/ti/k3-udma.c
+++ b/drivers/dma/ti/k3-udma.c
@@ -6,8 +6,10 @@
 #define pr_fmt(fmt) "udma: " fmt
 
 #include <common.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/cache.h>
@@ -34,6 +36,7 @@
 #include <linux/soc/ti/ti-udma.h>
 #include <linux/soc/ti/ti_sci_protocol.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "k3-udma-hwdef.h"
 #include "k3-psil-priv.h"
diff --git a/drivers/fastboot/fb_command.c b/drivers/fastboot/fb_command.c
index 966c0024579e..b3db6a84aa16 100644
--- a/drivers/fastboot/fb_command.c
+++ b/drivers/fastboot/fb_command.c
@@ -15,6 +15,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <vsprintf.h>
+#include <asm/types.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/fastboot/fb_common.c b/drivers/fastboot/fb_common.c
index 74a5bce22f78..3a4d020e3fa3 100644
--- a/drivers/fastboot/fb_common.c
+++ b/drivers/fastboot/fb_common.c
@@ -12,11 +12,13 @@
 
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <env.h>
 #include <fastboot.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <net/fastboot.h>
diff --git a/drivers/fastboot/fb_getvar.c b/drivers/fastboot/fb_getvar.c
index 5c188e1b5b53..ee9df2e102ac 100644
--- a/drivers/fastboot/fb_getvar.c
+++ b/drivers/fastboot/fb_getvar.c
@@ -17,6 +17,7 @@
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static void getvar_version(char *var_parameter, char *response);
 static void getvar_version_bootloader(char *var_parameter, char *response);
diff --git a/drivers/fastboot/fb_mmc.c b/drivers/fastboot/fb_mmc.c
index 5615dffa6d88..185fd81d4952 100644
--- a/drivers/fastboot/fb_mmc.c
+++ b/drivers/fastboot/fb_mmc.c
@@ -24,6 +24,7 @@
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define FASTBOOT_MAX_BLK_WRITE 16384
 
diff --git a/drivers/fastboot/fb_nand.c b/drivers/fastboot/fb_nand.c
index 074aa2aeb2ba..1b89d25d3a66 100644
--- a/drivers/fastboot/fb_nand.c
+++ b/drivers/fastboot/fb_nand.c
@@ -4,6 +4,7 @@
  * Copyright 2015 Free Electrons.
  */
 
+#include <compiler.h>
 #include <config.h>
 #include <common.h>
 #include <blk.h>
@@ -12,6 +13,7 @@
 #include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <fastboot.h>
 #include <image-sparse.h>
diff --git a/drivers/firmware/firmware-zynqmp.c b/drivers/firmware/firmware-zynqmp.c
index 0a815ec736ab..4082675ad910 100644
--- a/drivers/firmware/firmware-zynqmp.c
+++ b/drivers/firmware/firmware-zynqmp.c
@@ -15,6 +15,7 @@
 #include <asm/ptrace.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #if defined(CONFIG_ZYNQMP_IPI)
 #include <mailbox.h>
diff --git a/drivers/firmware/ti_sci.c b/drivers/firmware/ti_sci.c
index e156d5492687..17e739463a82 100644
--- a/drivers/firmware/ti_sci.c
+++ b/drivers/firmware/ti_sci.c
@@ -13,6 +13,7 @@
 #include <log.h>
 #include <mailbox.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <dm/device.h>
 #include <dm/device_compat.h>
 #include <dm/devres.h>
@@ -24,6 +25,7 @@
 #include <linux/soc/ti/k3-sec-proxy.h>
 #include <linux/soc/ti/ti_sci_protocol.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "ti_sci.h"
 
diff --git a/drivers/firmware/ti_sci.h b/drivers/firmware/ti_sci.h
index 327bb820f3a7..341f727f0b77 100644
--- a/drivers/firmware/ti_sci.h
+++ b/drivers/firmware/ti_sci.h
@@ -15,6 +15,8 @@
 #define __TI_SCI_H
 
 /* Generic Messages */
+#include <compiler.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #define TI_SCI_MSG_ENABLE_WDT		0x0000
 #define TI_SCI_MSG_WAKE_RESET		0x0001
diff --git a/drivers/fpga/ACEX1K.c b/drivers/fpga/ACEX1K.c
index 6c5097d94c72..6cbcf1aa1bc2 100644
--- a/drivers/fpga/ACEX1K.c
+++ b/drivers/fpga/ACEX1K.c
@@ -12,6 +12,7 @@
 #include <ACEX1K.h>		/* ACEX device family */
 #include <time.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 /* Define FPGA_DEBUG to get debug printf's */
 #ifdef	FPGA_DEBUG
diff --git a/drivers/fpga/altera.c b/drivers/fpga/altera.c
index 4ce9a0581ade..f63fc0b2ed6f 100644
--- a/drivers/fpga/altera.c
+++ b/drivers/fpga/altera.c
@@ -18,6 +18,7 @@
 #include <stratixII.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 /* Define FPGA_DEBUG to 1 to get debug printf's */
 #define FPGA_DEBUG	0
diff --git a/drivers/fpga/cyclon2.c b/drivers/fpga/cyclon2.c
index de0880ff3d8d..d85c6601ee2d 100644
--- a/drivers/fpga/cyclon2.c
+++ b/drivers/fpga/cyclon2.c
@@ -12,6 +12,7 @@
 #include <stdio.h>
 #include <time.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 /* Define FPGA_DEBUG to get debug printf's */
 #ifdef	FPGA_DEBUG
diff --git a/drivers/fpga/fpga.c b/drivers/fpga/fpga.c
index 1d76e1232124..b4ee5235b412 100644
--- a/drivers/fpga/fpga.c
+++ b/drivers/fpga/fpga.c
@@ -6,6 +6,7 @@
 
 /* Generic FPGA support */
 #include <common.h>             /* core U-Boot definitions */
+#include <compiler.h>
 #include <init.h>
 #include <log.h>
 #include <stdio.h>
@@ -14,6 +15,7 @@
 #include <lattice.h>
 #include <dm/device_compat.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /* Local definitions */
 #ifndef CONFIG_MAX_FPGA_DEVICES
diff --git a/drivers/fpga/lattice.c b/drivers/fpga/lattice.c
index cbdf00d3a2e3..b88d5c222ba2 100644
--- a/drivers/fpga/lattice.c
+++ b/drivers/fpga/lattice.c
@@ -17,6 +17,7 @@
 #include <lattice.h>
 #include <stdio.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 static lattice_board_specific_func *pfns;
 static const char *fpga_image;
diff --git a/drivers/fpga/socfpga.c b/drivers/fpga/socfpga.c
index 357c74675d1e..75e5d9479f1e 100644
--- a/drivers/fpga/socfpga.c
+++ b/drivers/fpga/socfpga.c
@@ -11,6 +11,7 @@
 #include <asm/arch/reset_manager.h>
 #include <asm/arch/system_manager.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 /* Timeout count */
 #define FPGA_TIMEOUT_CNT		0x1000000
diff --git a/drivers/fpga/socfpga_arria10.c b/drivers/fpga/socfpga_arria10.c
index 52361176b998..0d7f6655ebf0 100644
--- a/drivers/fpga/socfpga_arria10.c
+++ b/drivers/fpga/socfpga_arria10.c
@@ -27,6 +27,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define CFGWDTH_32	1
 #define MIN_BITSTREAM_SIZECHECK	230
diff --git a/drivers/fpga/socfpga_gen5.c b/drivers/fpga/socfpga_gen5.c
index 1edd494a5b0e..9e7b6232560c 100644
--- a/drivers/fpga/socfpga_gen5.c
+++ b/drivers/fpga/socfpga_gen5.c
@@ -11,6 +11,7 @@
 #include <asm/arch/fpga_manager.h>
 #include <asm/arch/reset_manager.h>
 #include <asm/arch/system_manager.h>
+#include <linux/types.h>
 
 #define FPGA_TIMEOUT_CNT	0x1000000
 
diff --git a/drivers/fpga/spartan2.c b/drivers/fpga/spartan2.c
index 355104f77d93..4f131ade668a 100644
--- a/drivers/fpga/spartan2.c
+++ b/drivers/fpga/spartan2.c
@@ -7,6 +7,7 @@
 #include <common.h>		/* core U-Boot definitions */
 #include <spartan2.h>		/* Spartan-II device family */
 #include <time.h>
+#include <linux/types.h>
 
 /* Define FPGA_DEBUG to get debug printf's */
 #ifdef	FPGA_DEBUG
diff --git a/drivers/fpga/spartan3.c b/drivers/fpga/spartan3.c
index 7374bb6f6b90..6975f6c3554a 100644
--- a/drivers/fpga/spartan3.c
+++ b/drivers/fpga/spartan3.c
@@ -14,6 +14,7 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
+#include <linux/types.h>
 
 /* Define FPGA_DEBUG to get debug printf's */
 #ifdef	FPGA_DEBUG
diff --git a/drivers/fpga/stratix10.c b/drivers/fpga/stratix10.c
index 3477ddbfd6b6..cf3214d82404 100644
--- a/drivers/fpga/stratix10.c
+++ b/drivers/fpga/stratix10.c
@@ -13,6 +13,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define RECONFIG_STATUS_POLL_RESP_TIMEOUT_MS		60000
 #define RECONFIG_STATUS_INTERVAL_DELAY_US		1000000
diff --git a/drivers/fpga/stratixII.c b/drivers/fpga/stratixII.c
index b450a81072ed..d0b5645e1215 100644
--- a/drivers/fpga/stratixII.c
+++ b/drivers/fpga/stratixII.c
@@ -7,6 +7,7 @@
 #include <common.h>		/* core U-Boot definitions */
 #include <altera.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 int StratixII_ps_fpp_load (Altera_desc * desc, void *buf, size_t bsize,
 			   int isSerial, int isSecure);
diff --git a/drivers/fpga/stratixv.c b/drivers/fpga/stratixv.c
index 403865c1e370..5becb528dc08 100644
--- a/drivers/fpga/stratixv.c
+++ b/drivers/fpga/stratixv.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 /* Write the RBF data to FPGA via SPI */
 static int program_write(int spi_bus, int spi_dev, const void *rbf_data,
diff --git a/drivers/fpga/versalpl.c b/drivers/fpga/versalpl.c
index eeaa8e0a335c..94d4788ffbf5 100644
--- a/drivers/fpga/versalpl.c
+++ b/drivers/fpga/versalpl.c
@@ -15,6 +15,7 @@
 #include <asm/cache.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static ulong versal_align_dma_buffer(ulong *buf, u32 len)
 {
diff --git a/drivers/fpga/virtex2.c b/drivers/fpga/virtex2.c
index c6449cfc60f4..e234c63eb3b6 100644
--- a/drivers/fpga/virtex2.c
+++ b/drivers/fpga/virtex2.c
@@ -18,6 +18,7 @@
 #include <time.h>
 #include <virtex2.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 #if 0
 #define FPGA_DEBUG
diff --git a/drivers/fpga/xilinx.c b/drivers/fpga/xilinx.c
index 302596074107..dc1d1c5fa091 100644
--- a/drivers/fpga/xilinx.c
+++ b/drivers/fpga/xilinx.c
@@ -20,6 +20,7 @@
 #include <spartan3.h>
 #include <zynqpl.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /* Local Static Functions */
 static int xilinx_validate(xilinx_desc *desc, char *fn);
diff --git a/drivers/fpga/zynqmppl.c b/drivers/fpga/zynqmppl.c
index 9d3eb848266b..3a84e7f26ef9 100644
--- a/drivers/fpga/zynqmppl.c
+++ b/drivers/fpga/zynqmppl.c
@@ -10,6 +10,7 @@
 #include <compiler.h>
 #include <cpu_func.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <zynqmppl.h>
 #include <zynqmp_firmware.h>
@@ -19,6 +20,7 @@
 #include <linux/sizes.h>
 #include <asm/arch/sys_proto.h>
 #include <memalign.h>
+#include <linux/types.h>
 
 #define DUMMY_WORD	0xffffffff
 
diff --git a/drivers/fpga/zynqpl.c b/drivers/fpga/zynqpl.c
index c887f3ddca61..6bb1e44fab11 100644
--- a/drivers/fpga/zynqpl.c
+++ b/drivers/fpga/zynqpl.c
@@ -21,6 +21,7 @@
 #include <linux/sizes.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/types.h>
 
 #define DEVCFG_CTRL_PCFG_PROG_B		0x40000000
 #define DEVCFG_CTRL_PCFG_AES_EFUSE_MASK	0x00001000
diff --git a/drivers/gpio/74x164_gpio.c b/drivers/gpio/74x164_gpio.c
index a6d360a04e1f..860c62903eaf 100644
--- a/drivers/gpio/74x164_gpio.c
+++ b/drivers/gpio/74x164_gpio.c
@@ -22,6 +22,7 @@
 #include <spi.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/gpio/adi_gpio2.c b/drivers/gpio/adi_gpio2.c
index fc508093d6f2..11c6b709e46b 100644
--- a/drivers/gpio/adi_gpio2.c
+++ b/drivers/gpio/adi_gpio2.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <malloc.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/bug.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
diff --git a/drivers/gpio/altera_pio.c b/drivers/gpio/altera_pio.c
index e52124dbd501..3609cc293806 100644
--- a/drivers/gpio/altera_pio.c
+++ b/drivers/gpio/altera_pio.c
@@ -12,6 +12,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
+#include <asm/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/gpio/at91_gpio.c b/drivers/gpio/at91_gpio.c
index f808f5114b7b..c1cfd0e1c11e 100644
--- a/drivers/gpio/at91_gpio.c
+++ b/drivers/gpio/at91_gpio.c
@@ -19,6 +19,7 @@
 #include <asm/gpio.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/at91_pio.h>
+#include <linux/types.h>
 
 #define GPIO_PER_BANK	32
 
diff --git a/drivers/gpio/atmel_pio4.c b/drivers/gpio/atmel_pio4.c
index 9b291ae976ad..e9925e815d4e 100644
--- a/drivers/gpio/atmel_pio4.c
+++ b/drivers/gpio/atmel_pio4.c
@@ -16,6 +16,7 @@
 #include <asm/gpio.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <mach/gpio.h>
 #include <mach/atmel_pio4.h>
 
diff --git a/drivers/gpio/axp_gpio.c b/drivers/gpio/axp_gpio.c
index 76008670e0be..31f15a471295 100644
--- a/drivers/gpio/axp_gpio.c
+++ b/drivers/gpio/axp_gpio.c
@@ -11,6 +11,7 @@
 #include <asm/gpio.h>
 #include <axp_pmic.h>
 #include <dm.h>
+#include <asm/types.h>
 #include <dm/device-internal.h>
 #include <dm/lists.h>
 #include <dm/root.h>
diff --git a/drivers/gpio/bcm2835_gpio.c b/drivers/gpio/bcm2835_gpio.c
index c7d120246fc0..f66554912c9f 100644
--- a/drivers/gpio/bcm2835_gpio.c
+++ b/drivers/gpio/bcm2835_gpio.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <asm/types.h>
 #include <dm/pinctrl.h>
 #include <errno.h>
 #include <asm/gpio.h>
diff --git a/drivers/gpio/bcm6345_gpio.c b/drivers/gpio/bcm6345_gpio.c
index 9b0f551b9504..9f13543682cb 100644
--- a/drivers/gpio/bcm6345_gpio.c
+++ b/drivers/gpio/bcm6345_gpio.c
@@ -8,6 +8,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <errno.h>
 #include <stdbool.h>
diff --git a/drivers/gpio/cortina_gpio.c b/drivers/gpio/cortina_gpio.c
index 3b093c87568b..5e7ca9de4a85 100644
--- a/drivers/gpio/cortina_gpio.c
+++ b/drivers/gpio/cortina_gpio.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
 #include <asm/io.h>
diff --git a/drivers/gpio/da8xx_gpio.h b/drivers/gpio/da8xx_gpio.h
index 849e8d2dcf3d..81e0ab630284 100644
--- a/drivers/gpio/da8xx_gpio.h
+++ b/drivers/gpio/da8xx_gpio.h
@@ -3,6 +3,7 @@
 #ifndef _GPIO_DA8XX_DEFS_H_
 #define _GPIO_DA8XX_DEFS_H_
 
+#include <linux/types.h>
 struct davinci_gpio {
 	unsigned int dir;
 	unsigned int out_data;
diff --git a/drivers/gpio/db8500_gpio.c b/drivers/gpio/db8500_gpio.c
index 4e79571aa4e7..18ab33b80603 100644
--- a/drivers/gpio/db8500_gpio.c
+++ b/drivers/gpio/db8500_gpio.c
@@ -17,8 +17,10 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <stdio.h>
 #include <asm/io.h>
+#include <linux/types.h>
 
 #include <asm/arch/db8500_gpio.h>
 #include <asm/arch/db8500_pincfg.h>
diff --git a/drivers/gpio/dwapb_gpio.c b/drivers/gpio/dwapb_gpio.c
index 3ab3b399c6b7..4dc347a23158 100644
--- a/drivers/gpio/dwapb_gpio.c
+++ b/drivers/gpio/dwapb_gpio.c
@@ -12,6 +12,7 @@
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <dm.h>
+#include <asm/types.h>
 #include <dm/device-internal.h>
 #include <dm/device_compat.h>
 #include <dm/devres.h>
diff --git a/drivers/gpio/gpio-rcar.c b/drivers/gpio/gpio-rcar.c
index a940b9969c18..b73288566885 100644
--- a/drivers/gpio/gpio-rcar.c
+++ b/drivers/gpio/gpio-rcar.c
@@ -5,10 +5,12 @@
 
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <dm.h>
 #include <malloc.h>
 #include <stdbool.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <dm/device_compat.h>
 #include <dm/pinctrl.h>
 #include <errno.h>
diff --git a/drivers/gpio/gpio-rza1.c b/drivers/gpio/gpio-rza1.c
index 13f525823eca..86fa2534787d 100644
--- a/drivers/gpio/gpio-rza1.c
+++ b/drivers/gpio/gpio-rza1.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <dm.h>
 #include <errno.h>
 #include <stdbool.h>
diff --git a/drivers/gpio/gpio-uclass.c b/drivers/gpio/gpio-uclass.c
index 68320c1e27c4..7714fe9375ea 100644
--- a/drivers/gpio/gpio-uclass.c
+++ b/drivers/gpio/gpio-uclass.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <log.h>
 #include <stdarg.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
@@ -25,6 +26,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/gpio/gpio-uniphier.c b/drivers/gpio/gpio-uniphier.c
index 54a38da0f104..f693700c9dbe 100644
--- a/drivers/gpio/gpio-uniphier.c
+++ b/drivers/gpio/gpio-uniphier.c
@@ -5,7 +5,9 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/io.h>
 #include <linux/sizes.h>
diff --git a/drivers/gpio/hi6220_gpio.c b/drivers/gpio/hi6220_gpio.c
index eb369195c8d7..f41af01fd979 100644
--- a/drivers/gpio/hi6220_gpio.c
+++ b/drivers/gpio/hi6220_gpio.c
@@ -10,6 +10,7 @@
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <errno.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/string.h>
diff --git a/drivers/gpio/hsdk-creg-gpio.c b/drivers/gpio/hsdk-creg-gpio.c
index 82ce0a813ba4..75c686e4deb9 100644
--- a/drivers/gpio/hsdk-creg-gpio.c
+++ b/drivers/gpio/hsdk-creg-gpio.c
@@ -15,6 +15,7 @@
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
diff --git a/drivers/gpio/imx_rgpio2p.c b/drivers/gpio/imx_rgpio2p.c
index fe171af18c56..807f06c9c4b1 100644
--- a/drivers/gpio/imx_rgpio2p.c
+++ b/drivers/gpio/imx_rgpio2p.c
@@ -13,6 +13,7 @@
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <malloc.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 
diff --git a/drivers/gpio/intel_broadwell_gpio.c b/drivers/gpio/intel_broadwell_gpio.c
index 4fc345c755e7..af68d1161ef6 100644
--- a/drivers/gpio/intel_broadwell_gpio.c
+++ b/drivers/gpio/intel_broadwell_gpio.c
@@ -19,6 +19,7 @@
 #include <asm/arch/gpio.h>
 #include <dt-bindings/gpio/x86-gpio.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/gpio/intel_gpio.c b/drivers/gpio/intel_gpio.c
index 360ec685249e..6075f23d184e 100644
--- a/drivers/gpio/intel_gpio.c
+++ b/drivers/gpio/intel_gpio.c
@@ -24,6 +24,7 @@
 #include <dt-bindings/gpio/x86-gpio.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static int intel_gpio_direction_input(struct udevice *dev, uint offset)
 {
diff --git a/drivers/gpio/intel_ich6_gpio.c b/drivers/gpio/intel_ich6_gpio.c
index be371fdcc304..4b57a34eae4c 100644
--- a/drivers/gpio/intel_ich6_gpio.c
+++ b/drivers/gpio/intel_ich6_gpio.c
@@ -40,6 +40,7 @@
 #include <asm/io.h>
 #include <asm/pci.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/gpio/iproc_gpio.c b/drivers/gpio/iproc_gpio.c
index 9672342bca33..06b5809c245d 100644
--- a/drivers/gpio/iproc_gpio.c
+++ b/drivers/gpio/iproc_gpio.c
@@ -4,11 +4,13 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <errno.h>
 #include <stdbool.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <dm.h>
+#include <asm/types.h>
 #include <dm/device_compat.h>
 #include <dm/devres.h>
 #include <dm/pinctrl.h>
diff --git a/drivers/gpio/kona_gpio.c b/drivers/gpio/kona_gpio.c
index 9b8e6240f5a1..a9acb52f032f 100644
--- a/drivers/gpio/kona_gpio.c
+++ b/drivers/gpio/kona_gpio.c
@@ -8,6 +8,7 @@
 #include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/sysmap.h>
+#include <asm/types.h>
 
 #define GPIO_BASE				(void *)GPIO2_BASE_ADDR
 
diff --git a/drivers/gpio/kw_gpio.c b/drivers/gpio/kw_gpio.c
index 39a73ccfb748..e341e86201a9 100644
--- a/drivers/gpio/kw_gpio.c
+++ b/drivers/gpio/kw_gpio.c
@@ -7,6 +7,7 @@
 
 /*
  * Based on (mostly copied from) plat-orion based Linux 2.6 kernel driver.
+#include <asm/types.h>
  * Removed orion_gpiochip struct and kernel level irq handling.
  *
  * Dieter Kiermaier dk-arm-linux at gmx.de
diff --git a/drivers/gpio/mpc83xx_spisel_boot.c b/drivers/gpio/mpc83xx_spisel_boot.c
index 34705769cbf8..9b57c699a58e 100644
--- a/drivers/gpio/mpc83xx_spisel_boot.c
+++ b/drivers/gpio/mpc83xx_spisel_boot.c
@@ -6,12 +6,14 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <mapmem.h>
 #include <vsprintf.h>
 #include <asm/gpio.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 struct mpc83xx_spisel_boot {
 	u32 __iomem *spi_cs;
diff --git a/drivers/gpio/mpc8xxx_gpio.c b/drivers/gpio/mpc8xxx_gpio.c
index 6959f1c5d62f..d4c8e8857bee 100644
--- a/drivers/gpio/mpc8xxx_gpio.c
+++ b/drivers/gpio/mpc8xxx_gpio.c
@@ -9,12 +9,14 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <mapmem.h>
 #include <vsprintf.h>
 #include <asm/gpio.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 struct ccsr_gpio {
 	u32	gpdir;
diff --git a/drivers/gpio/mscc_sgpio.c b/drivers/gpio/mscc_sgpio.c
index 9b7bb4b06027..10b4e6046aeb 100644
--- a/drivers/gpio/mscc_sgpio.c
+++ b/drivers/gpio/mscc_sgpio.c
@@ -8,6 +8,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
 #include <asm/gpio.h>
@@ -19,6 +20,7 @@
 #include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #define MSCC_SGPIOS_PER_BANK	32
 #define MSCC_SGPIO_BANK_DEPTH	4
diff --git a/drivers/gpio/msm_gpio.c b/drivers/gpio/msm_gpio.c
index d08774850852..f7a9ee9c22e8 100644
--- a/drivers/gpio/msm_gpio.c
+++ b/drivers/gpio/msm_gpio.c
@@ -11,6 +11,7 @@
 #include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/gpio/mt7621_gpio.c b/drivers/gpio/mt7621_gpio.c
index e569c67a6150..a6c58d7906ff 100644
--- a/drivers/gpio/mt7621_gpio.c
+++ b/drivers/gpio/mt7621_gpio.c
@@ -8,10 +8,12 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <errno.h>
 #include <fdtdec.h>
 #include <malloc.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/io.h>
diff --git a/drivers/gpio/mvebu_gpio.c b/drivers/gpio/mvebu_gpio.c
index 65eaa71c201c..06910e0a7da9 100644
--- a/drivers/gpio/mvebu_gpio.c
+++ b/drivers/gpio/mvebu_gpio.c
@@ -8,6 +8,7 @@
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <errno.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 
 #define MVEBU_GPIOS_PER_BANK	32
diff --git a/drivers/gpio/mvgpio.c b/drivers/gpio/mvgpio.c
index bf1842ccf7ec..7072064092e3 100644
--- a/drivers/gpio/mvgpio.c
+++ b/drivers/gpio/mvgpio.c
@@ -12,6 +12,7 @@
 #include <malloc.h>
 #include <stdio.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include "mvgpio.h"
 #include <asm/gpio.h>
diff --git a/drivers/gpio/mvgpio.h b/drivers/gpio/mvgpio.h
index d68c48e63737..c8857b1ef928 100644
--- a/drivers/gpio/mvgpio.h
+++ b/drivers/gpio/mvgpio.h
@@ -12,6 +12,7 @@
 #define __MVGPIO_H__
 
 #include <common.h>
+#include <asm/types.h>
 
 /*
  * GPIO Register map for Marvell SOCs
diff --git a/drivers/gpio/mvmfp.c b/drivers/gpio/mvmfp.c
index 511042c19905..fc7cbebde8e2 100644
--- a/drivers/gpio/mvmfp.c
+++ b/drivers/gpio/mvmfp.c
@@ -9,6 +9,7 @@
 #include <asm/io.h>
 #include <mvmfp.h>
 #include <asm/arch/mfp.h>
+#include <asm/types.h>
 
 /*
  * mfp_config
diff --git a/drivers/gpio/mxc_gpio.c b/drivers/gpio/mxc_gpio.c
index fda331de143f..d71ca53e320f 100644
--- a/drivers/gpio/mxc_gpio.c
+++ b/drivers/gpio/mxc_gpio.c
@@ -14,6 +14,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <dt-structs.h>
 #include <mapmem.h>
 #include <linux/kernel.h>
diff --git a/drivers/gpio/mxs_gpio.c b/drivers/gpio/mxs_gpio.c
index 7a290fba0f73..597f5c8604d1 100644
--- a/drivers/gpio/mxs_gpio.c
+++ b/drivers/gpio/mxs_gpio.c
@@ -19,6 +19,7 @@
 #include <asm/arch/iomux.h>
 #include <asm/arch/imx-regs.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #if	defined(CONFIG_MX23)
 #define	PINCTRL_BANKS		3
diff --git a/drivers/gpio/nx_gpio.c b/drivers/gpio/nx_gpio.c
index 5ec73c43599e..71e8f06a8a93 100644
--- a/drivers/gpio/nx_gpio.c
+++ b/drivers/gpio/nx_gpio.c
@@ -10,6 +10,7 @@
 #include <malloc.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
+#include <asm/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/gpio/omap_gpio.c b/drivers/gpio/omap_gpio.c
index 8d9cee050670..fb0046b39e39 100644
--- a/drivers/gpio/omap_gpio.c
+++ b/drivers/gpio/omap_gpio.c
@@ -25,6 +25,7 @@
 #include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <malloc.h>
 #include <linux/string.h>
diff --git a/drivers/gpio/pca953x.c b/drivers/gpio/pca953x.c
index c3a79b931b87..31f3621d6177 100644
--- a/drivers/gpio/pca953x.c
+++ b/drivers/gpio/pca953x.c
@@ -15,6 +15,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/kernel.h>
+#include <linux/types.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 a3ae0c49b984..a3218d15006e 100644
--- a/drivers/gpio/pca953x_gpio.c
+++ b/drivers/gpio/pca953x_gpio.c
@@ -33,6 +33,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define PCA953X_INPUT           0
 #define PCA953X_OUTPUT          1
diff --git a/drivers/gpio/pca9698.c b/drivers/gpio/pca9698.c
index 11274c781017..3f53c8043044 100644
--- a/drivers/gpio/pca9698.c
+++ b/drivers/gpio/pca9698.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <i2c.h>
 #include <malloc.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <pca9698.h>
 
diff --git a/drivers/gpio/pcf8575_gpio.c b/drivers/gpio/pcf8575_gpio.c
index 7eeacd77c2a6..5e79ac4bd3a5 100644
--- a/drivers/gpio/pcf8575_gpio.c
+++ b/drivers/gpio/pcf8575_gpio.c
@@ -30,6 +30,7 @@
 #include <stdio.h>
 #include <asm-generic/gpio.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/gpio/pm8916_gpio.c b/drivers/gpio/pm8916_gpio.c
index 62fb3a39d3ea..d28375e9e4e3 100644
--- a/drivers/gpio/pm8916_gpio.c
+++ b/drivers/gpio/pm8916_gpio.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <stdbool.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <spmi/spmi.h>
 #include <asm/io.h>
diff --git a/drivers/gpio/rk_gpio.c b/drivers/gpio/rk_gpio.c
index fa79bacbd070..f3f77e24be83 100644
--- a/drivers/gpio/rk_gpio.c
+++ b/drivers/gpio/rk_gpio.c
@@ -19,6 +19,7 @@
 #include <dm/pinctrl.h>
 #include <dt-bindings/clock/rk3288-cru.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 enum {
 	ROCKCHIP_GPIOS_PER_BANK		= 32,
diff --git a/drivers/gpio/s5p_gpio.c b/drivers/gpio/s5p_gpio.c
index 0d87c6be7f27..ff9131d4eca8 100644
--- a/drivers/gpio/s5p_gpio.c
+++ b/drivers/gpio/s5p_gpio.c
@@ -15,6 +15,7 @@
 #include <asm/gpio.h>
 #include <dm/device-internal.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/gpio/sandbox.c b/drivers/gpio/sandbox.c
index acbc6495c837..e0b620109a43 100644
--- a/drivers/gpio/sandbox.c
+++ b/drivers/gpio/sandbox.c
@@ -20,6 +20,7 @@
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/gpio/sandbox-gpio.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 
 struct gpio_state {
diff --git a/drivers/gpio/sh_pfc.c b/drivers/gpio/sh_pfc.c
index 693aa873ba28..e9d320af3db4 100644
--- a/drivers/gpio/sh_pfc.c
+++ b/drivers/gpio/sh_pfc.c
@@ -10,6 +10,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <log.h>
 #include <malloc.h>
 #include <asm/bitops.h>
diff --git a/drivers/gpio/sifive-gpio.c b/drivers/gpio/sifive-gpio.c
index 51c3ce610a1e..cc54c0d70d4f 100644
--- a/drivers/gpio/sifive-gpio.c
+++ b/drivers/gpio/sifive-gpio.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <stdbool.h>
 #include <vsprintf.h>
@@ -16,6 +17,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static int sifive_gpio_probe(struct udevice *dev)
 {
diff --git a/drivers/gpio/spear_gpio.c b/drivers/gpio/spear_gpio.c
index 2aed08781d76..2f66dfc8fd45 100644
--- a/drivers/gpio/spear_gpio.c
+++ b/drivers/gpio/spear_gpio.c
@@ -13,6 +13,7 @@
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <errno.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 
 static int gpio_direction(unsigned gpio,
diff --git a/drivers/gpio/stm32_gpio.c b/drivers/gpio/stm32_gpio.c
index 5bff27f75b50..16a2bb8054e5 100644
--- a/drivers/gpio/stm32_gpio.c
+++ b/drivers/gpio/stm32_gpio.c
@@ -17,6 +17,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/io.h>
+#include <linux/types.h>
 
 #define MODE_BITS(gpio_pin)		((gpio_pin) * 2)
 #define MODE_BITS_MASK			3
diff --git a/drivers/gpio/sunxi_gpio.c b/drivers/gpio/sunxi_gpio.c
index d7ba86cc1511..74002e53c4db 100644
--- a/drivers/gpio/sunxi_gpio.c
+++ b/drivers/gpio/sunxi_gpio.c
@@ -22,6 +22,7 @@
 #include <dt-bindings/gpio/gpio.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define SUNXI_GPIOS_PER_BANK	SUNXI_GPIO_A_NR
 
diff --git a/drivers/gpio/tca642x.c b/drivers/gpio/tca642x.c
index 8b2057607bc5..6b038e4553dd 100644
--- a/drivers/gpio/tca642x.c
+++ b/drivers/gpio/tca642x.c
@@ -27,6 +27,7 @@
 #include <tca642x.h>
 #include <vsprintf.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 /* tca642x register address definitions */
 struct tca642x_bank_info tca642x_regs[] = {
diff --git a/drivers/gpio/tegra186_gpio.c b/drivers/gpio/tegra186_gpio.c
index affabbbf9a60..19d4e5b18e92 100644
--- a/drivers/gpio/tegra186_gpio.c
+++ b/drivers/gpio/tegra186_gpio.c
@@ -9,6 +9,7 @@
 #include <malloc.h>
 #include <errno.h>
 #include <fdtdec.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <asm/bitops.h>
 #include <asm/gpio.h>
@@ -16,6 +17,7 @@
 #include <dt-bindings/gpio/gpio.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include "tegra186_gpio_priv.h"
 
 struct tegra186_gpio_port_data {
diff --git a/drivers/gpio/tegra_gpio.c b/drivers/gpio/tegra_gpio.c
index c002e6864dd6..fdc20e66c4bc 100644
--- a/drivers/gpio/tegra_gpio.c
+++ b/drivers/gpio/tegra_gpio.c
@@ -23,6 +23,7 @@
 #include <dm/device-internal.h>
 #include <dt-bindings/gpio/gpio.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 static const int CONFIG_SFIO = 0;
 static const int CONFIG_GPIO = 1;
diff --git a/drivers/gpio/vybrid_gpio.c b/drivers/gpio/vybrid_gpio.c
index 99f5d07cca0d..11fbc6191a15 100644
--- a/drivers/gpio/vybrid_gpio.c
+++ b/drivers/gpio/vybrid_gpio.c
@@ -13,6 +13,7 @@
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/io.h>
 #include <malloc.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/gpio/xilinx_gpio.c b/drivers/gpio/xilinx_gpio.c
index 2fb39ca0382b..32b1e3e8d9f9 100644
--- a/drivers/gpio/xilinx_gpio.c
+++ b/drivers/gpio/xilinx_gpio.c
@@ -15,6 +15,7 @@
 #include <dm.h>
 #include <dt-bindings/gpio/gpio.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define XILINX_GPIO_MAX_BANK	2
 
diff --git a/drivers/gpio/zynq_gpio.c b/drivers/gpio/zynq_gpio.c
index 91b8cd945e33..8754749c1b96 100644
--- a/drivers/gpio/zynq_gpio.c
+++ b/drivers/gpio/zynq_gpio.c
@@ -17,6 +17,7 @@
 #include <dm.h>
 #include <fdtdec.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /* Maximum banks */
 #define ZYNQ_GPIO_MAX_BANK	4
diff --git a/drivers/hwspinlock/hwspinlock-uclass.c b/drivers/hwspinlock/hwspinlock-uclass.c
index 14bfc6ae1b69..b61fd98909ce 100644
--- a/drivers/hwspinlock/hwspinlock-uclass.c
+++ b/drivers/hwspinlock/hwspinlock-uclass.c
@@ -14,6 +14,7 @@
 #include <dm/device_compat.h>
 #include <linux/compat.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 static inline const struct hwspinlock_ops *
 hwspinlock_dev_ops(struct udevice *dev)
diff --git a/drivers/hwspinlock/stm32_hwspinlock.c b/drivers/hwspinlock/stm32_hwspinlock.c
index ea54063c19b3..50851fcddeaa 100644
--- a/drivers/hwspinlock/stm32_hwspinlock.c
+++ b/drivers/hwspinlock/stm32_hwspinlock.c
@@ -9,6 +9,7 @@
 #include <hwspinlock.h>
 #include <malloc.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 
diff --git a/drivers/i2c/ast_i2c.c b/drivers/i2c/ast_i2c.c
index f0d830e5636e..8cf49b16aeb6 100644
--- a/drivers/i2c/ast_i2c.c
+++ b/drivers/i2c/ast_i2c.c
@@ -12,11 +12,13 @@
 #include <fdtdec.h>
 #include <i2c.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <asm/arch/scu_ast2500.h>
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #include "ast_i2c.h"
 
diff --git a/drivers/i2c/ast_i2c.h b/drivers/i2c/ast_i2c.h
index 928785989e78..fc6df80a889b 100644
--- a/drivers/i2c/ast_i2c.h
+++ b/drivers/i2c/ast_i2c.h
@@ -7,6 +7,7 @@
 #ifndef __AST_I2C_H_
 #define __AST_I2C_H_
 
+#include <asm/types.h>
 struct ast_i2c_regs {
 	u32 fcr;
 	u32 cactcr1;
diff --git a/drivers/i2c/at91_i2c.c b/drivers/i2c/at91_i2c.c
index c656db557067..515a433492db 100644
--- a/drivers/i2c/at91_i2c.c
+++ b/drivers/i2c/at91_i2c.c
@@ -6,6 +6,7 @@
  */
 
 #include <malloc.h>
+#include <stdbool.h>
 #include <time.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
@@ -18,6 +19,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include <mach/clk.h>
 
 #include "at91_i2c.h"
diff --git a/drivers/i2c/at91_i2c.h b/drivers/i2c/at91_i2c.h
index 3915af83723e..f4b8c40464b5 100644
--- a/drivers/i2c/at91_i2c.h
+++ b/drivers/i2c/at91_i2c.h
@@ -2,6 +2,7 @@
 #define _AT91_I2C_H
 
 #include <linux/bitops.h>
+#include <linux/types.h>
 #define	TWI_CR_START		BIT(0)	/* Send a Start Condition */
 #define	TWI_CR_MSEN		BIT(2)	/* Master Transfer Enable */
 #define	TWI_CR_STOP		BIT(1)	/* Send a Stop Condition */
diff --git a/drivers/i2c/cros_ec_ldo.c b/drivers/i2c/cros_ec_ldo.c
index e894a1a3eb25..943470ce7081 100644
--- a/drivers/i2c/cros_ec_ldo.c
+++ b/drivers/i2c/cros_ec_ldo.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <stdbool.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <power/tps65090.h>
 
 static int cros_ec_ldo_set_bus_speed(struct udevice *dev, unsigned int speed)
diff --git a/drivers/i2c/davinci_i2c.c b/drivers/i2c/davinci_i2c.c
index 694172106c1c..4b1c1cfaf035 100644
--- a/drivers/i2c/davinci_i2c.c
+++ b/drivers/i2c/davinci_i2c.c
@@ -8,6 +8,7 @@
  * --------------------------------------------------------
  *
  * NOTE: This driver should be converted to driver model before June 2017.
+#include <linux/types.h>
  * Please see doc/driver-model/i2c-howto.rst for instructions.
  */
 
diff --git a/drivers/i2c/davinci_i2c.h b/drivers/i2c/davinci_i2c.h
index 57377ce9416f..c645a4274995 100644
--- a/drivers/i2c/davinci_i2c.h
+++ b/drivers/i2c/davinci_i2c.h
@@ -8,6 +8,7 @@
 #ifndef _DAVINCI_I2C_H_
 #define _DAVINCI_I2C_H_
 
+#include <asm/types.h>
 #define I2C_WRITE		0
 #define I2C_READ		1
 
diff --git a/drivers/i2c/designware_i2c.c b/drivers/i2c/designware_i2c.c
index 5aad1a299770..69b36b0fc4d0 100644
--- a/drivers/i2c/designware_i2c.c
+++ b/drivers/i2c/designware_i2c.c
@@ -12,12 +12,14 @@
 #include <malloc.h>
 #include <pci.h>
 #include <reset.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include "designware_i2c.h"
 #include <dm/device_compat.h>
 #include <linux/err.h>
diff --git a/drivers/i2c/designware_i2c.h b/drivers/i2c/designware_i2c.h
index 0f34cc8b5ab3..b07c1fd6511c 100644
--- a/drivers/i2c/designware_i2c.h
+++ b/drivers/i2c/designware_i2c.h
@@ -11,6 +11,7 @@
 #include <i2c.h>
 #include <reset.h>
 #include <stdbool.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 
 struct i2c_regs {
diff --git a/drivers/i2c/designware_i2c_pci.c b/drivers/i2c/designware_i2c_pci.c
index 5f2084acda89..fd69e3cb862b 100644
--- a/drivers/i2c/designware_i2c_pci.c
+++ b/drivers/i2c/designware_i2c_pci.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
 #include <spl.h>
@@ -18,6 +19,7 @@
 #include <dm/uclass-internal.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include "designware_i2c.h"
 
 enum {
diff --git a/drivers/i2c/exynos_hs_i2c.c b/drivers/i2c/exynos_hs_i2c.c
index f34c71125296..4be5c667d44c 100644
--- a/drivers/i2c/exynos_hs_i2c.c
+++ b/drivers/i2c/exynos_hs_i2c.c
@@ -17,6 +17,7 @@
 #include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include "s3c24x0_i2c.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/i2c/fsl_i2c.c b/drivers/i2c/fsl_i2c.c
index 7620e588d659..35048474bfdd 100644
--- a/drivers/i2c/fsl_i2c.c
+++ b/drivers/i2c/fsl_i2c.c
@@ -21,6 +21,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /* The maximum number of microseconds we will wait until another master has
  * released the bus.  If not defined in the board header file, then use a
diff --git a/drivers/i2c/i2c-cdns.c b/drivers/i2c/i2c-cdns.c
index a5781bcfec23..0482f6a0102c 100644
--- a/drivers/i2c/i2c-cdns.c
+++ b/drivers/i2c/i2c-cdns.c
@@ -8,8 +8,10 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/drivers/i2c/i2c-cortina.c b/drivers/i2c/i2c-cortina.c
index aa7f3a0264ec..bad6a4159bff 100644
--- a/drivers/i2c/i2c-cortina.c
+++ b/drivers/i2c/i2c-cortina.c
@@ -13,6 +13,7 @@
 #include <dm.h>
 #include <mapmem.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include "i2c-cortina.h"
 
 static void set_speed(struct i2c_regs *regs, int i2c_spd)
diff --git a/drivers/i2c/i2c-cortina.h b/drivers/i2c/i2c-cortina.h
index 7e406b580ea3..3d14a35a7a09 100644
--- a/drivers/i2c/i2c-cortina.h
+++ b/drivers/i2c/i2c-cortina.h
@@ -84,4 +84,5 @@ struct ca_i2c {
 #define I2C_STOPDET_TO		(CONFIG_SYS_HZ / 500)
 #define I2C_BYTE_TO_BB		(10)
 
+#include <asm/types.h>
 #endif							/* __CA_I2C_H_ */
diff --git a/drivers/i2c/i2c-gpio.c b/drivers/i2c/i2c-gpio.c
index 7e47bed9f4bb..981664016669 100644
--- a/drivers/i2c/i2c-gpio.c
+++ b/drivers/i2c/i2c-gpio.c
@@ -10,12 +10,14 @@
 #include <dm.h>
 #include <i2c.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 #define DEFAULT_UDELAY	5
 #define RETRIES		0
diff --git a/drivers/i2c/i2c-uclass.c b/drivers/i2c/i2c-uclass.c
index f5a1890d5c93..12123e6a853d 100644
--- a/drivers/i2c/i2c-uclass.c
+++ b/drivers/i2c/i2c-uclass.c
@@ -21,6 +21,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define I2C_MAX_OFFSET_LEN	4
 
diff --git a/drivers/i2c/i2c-uniphier-f.c b/drivers/i2c/i2c-uniphier-f.c
index c78378fa1839..1288d03c6be2 100644
--- a/drivers/i2c/i2c-uniphier-f.c
+++ b/drivers/i2c/i2c-uniphier-f.c
@@ -5,6 +5,7 @@
  *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  */
 
+#include <compiler.h>
 #include <stdbool.h>
 #include <dm/device_compat.h>
 #include <linux/errno.h>
diff --git a/drivers/i2c/i2c-uniphier.c b/drivers/i2c/i2c-uniphier.c
index c1f1eb0325bf..273fcbea8c93 100644
--- a/drivers/i2c/i2c-uniphier.c
+++ b/drivers/i2c/i2c-uniphier.c
@@ -5,6 +5,7 @@
  *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  */
 
+#include <compiler.h>
 #include <stdbool.h>
 #include <dm/device_compat.h>
 #include <linux/delay.h>
diff --git a/drivers/i2c/i2c-versatile.c b/drivers/i2c/i2c-versatile.c
index f78b12a560c3..98f6dd0c8f54 100644
--- a/drivers/i2c/i2c-versatile.c
+++ b/drivers/i2c/i2c-versatile.c
@@ -15,6 +15,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/io.h>
+#include <linux/types.h>
 
 #define I2C_CONTROL_REG		0x00
 #define I2C_SET_REG		0x00
diff --git a/drivers/i2c/i2c_core.c b/drivers/i2c/i2c_core.c
index 40096e95aa06..acecc4783c49 100644
--- a/drivers/i2c/i2c_core.c
+++ b/drivers/i2c/i2c_core.c
@@ -8,10 +8,12 @@
  * Multibus/multiadapter I2C core functions (wrappers)
  */
 #include <common.h>
+#include <compiler.h>
 #include <i2c.h>
 #include <linker_lists.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <linux/types.h>
 
 struct i2c_adapter *i2c_get_adapter(int index)
 {
diff --git a/drivers/i2c/ihs_i2c.c b/drivers/i2c/ihs_i2c.c
index 5550da806222..af4e79d907f1 100644
--- a/drivers/i2c/ihs_i2c.c
+++ b/drivers/i2c/ihs_i2c.c
@@ -13,6 +13,7 @@
 #include <gdsys_fpga.h>
 #endif
 #include <log.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 #include <asm/unaligned.h>
 #include <linux/bitops.h>
@@ -20,6 +21,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_DM_I2C
 struct ihs_i2c_priv {
diff --git a/drivers/i2c/imx_lpi2c.c b/drivers/i2c/imx_lpi2c.c
index aa5c65728cd5..e3465f7bce3d 100644
--- a/drivers/i2c/imx_lpi2c.c
+++ b/drivers/i2c/imx_lpi2c.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <errno.h>
 #include <log.h>
 #include <stdbool.h>
@@ -19,6 +20,7 @@
 #include <i2c.h>
 #include <dm/device_compat.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #define LPI2C_FIFO_SIZE 4
 #define LPI2C_NACK_TOUT_MS 1
diff --git a/drivers/i2c/intel_i2c.c b/drivers/i2c/intel_i2c.c
index cbda069131ac..5b65dae71759 100644
--- a/drivers/i2c/intel_i2c.c
+++ b/drivers/i2c/intel_i2c.c
@@ -18,6 +18,7 @@
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /* PCI Configuration Space (D31:F3): SMBus */
 #define SMB_BASE		0x20
diff --git a/drivers/i2c/iproc_i2c.c b/drivers/i2c/iproc_i2c.c
index b5d865d66ba6..802f9dbb83db 100644
--- a/drivers/i2c/iproc_i2c.c
+++ b/drivers/i2c/iproc_i2c.c
@@ -4,6 +4,7 @@
  *
  */
 
+#include <compiler.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <common.h>
@@ -11,6 +12,7 @@
 #include <dm.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 #include "errno.h"
 #include <i2c.h>
 #include "iproc_i2c.h"
diff --git a/drivers/i2c/kona_i2c.c b/drivers/i2c/kona_i2c.c
index e2632a6e36c5..d163b3e730c5 100644
--- a/drivers/i2c/kona_i2c.c
+++ b/drivers/i2c/kona_i2c.c
@@ -3,6 +3,7 @@
  * Copyright 2013 Broadcom Corporation.
  *
  * NOTE: This driver should be converted to driver model before June 2017.
+#include <linux/types.h>
  * Please see doc/driver-model/i2c-howto.rst for instructions.
  */
 
diff --git a/drivers/i2c/lpc32xx_i2c.c b/drivers/i2c/lpc32xx_i2c.c
index 8aef939981f0..6abf1ceea09e 100644
--- a/drivers/i2c/lpc32xx_i2c.c
+++ b/drivers/i2c/lpc32xx_i2c.c
@@ -16,6 +16,7 @@
 #include <dm.h>
 #include <mapmem.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /*
  * Provide default speed and slave if target did not
diff --git a/drivers/i2c/meson_i2c.c b/drivers/i2c/meson_i2c.c
index 3e4b10aff54f..6238167633e2 100644
--- a/drivers/i2c/meson_i2c.c
+++ b/drivers/i2c/meson_i2c.c
@@ -4,6 +4,7 @@
  */
 #include <common.h>
 #include <log.h>
+#include <stdbool.h>
 #include <time.h>
 #include <asm/io.h>
 #include <clk.h>
@@ -14,6 +15,7 @@
 #include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #define I2C_TIMEOUT_MS		100
 
diff --git a/drivers/i2c/muxes/i2c-arb-gpio-challenge.c b/drivers/i2c/muxes/i2c-arb-gpio-challenge.c
index 2b9e0ba585ae..73a23b61c438 100644
--- a/drivers/i2c/muxes/i2c-arb-gpio-challenge.c
+++ b/drivers/i2c/muxes/i2c-arb-gpio-challenge.c
@@ -16,6 +16,7 @@
 #include <asm/gpio.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/i2c/muxes/i2c-mux-gpio.c b/drivers/i2c/muxes/i2c-mux-gpio.c
index 52da26ab1823..c9b07a68dc4c 100644
--- a/drivers/i2c/muxes/i2c-mux-gpio.c
+++ b/drivers/i2c/muxes/i2c-mux-gpio.c
@@ -19,6 +19,7 @@
 #include <i2c.h>
 #include <linux/errno.h>
 #include <linux/libfdt.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/i2c/muxes/i2c-mux-uclass.c b/drivers/i2c/muxes/i2c-mux-uclass.c
index 1af7b68e2052..2d8db8a3caf7 100644
--- a/drivers/i2c/muxes/i2c-mux-uclass.c
+++ b/drivers/i2c/muxes/i2c-mux-uclass.c
@@ -14,6 +14,7 @@
 #include <dm/root.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /**
  * struct i2c_mux: Information the uclass stores about an I2C mux
diff --git a/drivers/i2c/muxes/pca954x.c b/drivers/i2c/muxes/pca954x.c
index 3140a1abb6c6..ceb6516cbc4c 100644
--- a/drivers/i2c/muxes/pca954x.c
+++ b/drivers/i2c/muxes/pca954x.c
@@ -13,6 +13,7 @@
 #include <malloc.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #include <asm-generic/gpio.h>
 
diff --git a/drivers/i2c/mv_i2c.c b/drivers/i2c/mv_i2c.c
index 37d04bf11e95..853372595ce1 100644
--- a/drivers/i2c/mv_i2c.c
+++ b/drivers/i2c/mv_i2c.c
@@ -17,6 +17,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <i2c.h>
 #include <log.h>
@@ -25,6 +26,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "mv_i2c.h"
 
 /* All transfers are described by this data structure */
diff --git a/drivers/i2c/mvtwsi.c b/drivers/i2c/mvtwsi.c
index 775f02403460..03fc42aef7bb 100644
--- a/drivers/i2c/mvtwsi.c
+++ b/drivers/i2c/mvtwsi.c
@@ -21,6 +21,7 @@
 #include <dm.h>
 #endif
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/i2c/mxc_i2c.c b/drivers/i2c/mxc_i2c.c
index dfa84836f53b..1fa1187ba3e1 100644
--- a/drivers/i2c/mxc_i2c.c
+++ b/drivers/i2c/mxc_i2c.c
@@ -16,6 +16,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <asm/arch/clock.h>
@@ -33,6 +34,7 @@
 #include <dm/pinctrl.h>
 #include <fdtdec.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/i2c/nx_i2c.c b/drivers/i2c/nx_i2c.c
index 54a7bc85f69a..9d14fabeb458 100644
--- a/drivers/i2c/nx_i2c.c
+++ b/drivers/i2c/nx_i2c.c
@@ -11,6 +11,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #define I2C_WRITE       0
 #define I2C_READ        1
diff --git a/drivers/i2c/octeon_i2c.c b/drivers/i2c/octeon_i2c.c
index 19b7622b4181..2a152e37264b 100644
--- a/drivers/i2c/octeon_i2c.c
+++ b/drivers/i2c/octeon_i2c.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <dm.h>
 #include <i2c.h>
 #include <pci_ids.h>
@@ -14,6 +15,7 @@
 #include <linux/compat.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #define TWSI_SW_TWSI		0x00
 #define TWSI_TWSI_SW		0x08
diff --git a/drivers/i2c/omap24xx_i2c.c b/drivers/i2c/omap24xx_i2c.c
index b8cfc69c6cc9..9ca8d2ef283e 100644
--- a/drivers/i2c/omap24xx_i2c.c
+++ b/drivers/i2c/omap24xx_i2c.c
@@ -39,6 +39,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <i2c.h>
 #include <log.h>
@@ -46,6 +47,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 #include <asm/io.h>
 #include <asm/omap_i2c.h>
diff --git a/drivers/i2c/rcar_i2c.c b/drivers/i2c/rcar_i2c.c
index 1fe207e7bc8f..a3adefddff69 100644
--- a/drivers/i2c/rcar_i2c.c
+++ b/drivers/i2c/rcar_i2c.c
@@ -13,6 +13,7 @@
 
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <dm.h>
 #include <i2c.h>
 #include <asm/io.h>
@@ -21,6 +22,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #define RCAR_I2C_ICSCR			0x00 /* slave ctrl */
 #define RCAR_I2C_ICMCR			0x04 /* master ctrl */
diff --git a/drivers/i2c/rcar_iic.c b/drivers/i2c/rcar_iic.c
index 6899a68a8475..37d86c9d9501 100644
--- a/drivers/i2c/rcar_iic.c
+++ b/drivers/i2c/rcar_iic.c
@@ -11,6 +11,7 @@
 
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <dm.h>
 #include <i2c.h>
 #include <asm/io.h>
@@ -18,6 +19,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 struct rcar_iic_priv {
 	void __iomem		*base;
diff --git a/drivers/i2c/rk_i2c.c b/drivers/i2c/rk_i2c.c
index e430a790df03..b5ecf2fa776f 100644
--- a/drivers/i2c/rk_i2c.c
+++ b/drivers/i2c/rk_i2c.c
@@ -12,6 +12,7 @@
 #include <errno.h>
 #include <i2c.h>
 #include <log.h>
+#include <stdbool.h>
 #include <time.h>
 #include <asm/io.h>
 #include <asm/arch-rockchip/clock.h>
@@ -22,6 +23,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/sizes.h>
+#include <linux/types.h>
 
 /* i2c timerout */
 #define I2C_TIMEOUT_MS		100
diff --git a/drivers/i2c/s3c24x0_i2c.c b/drivers/i2c/s3c24x0_i2c.c
index 6cc63b528dd8..c7c489f68c9c 100644
--- a/drivers/i2c/s3c24x0_i2c.c
+++ b/drivers/i2c/s3c24x0_i2c.c
@@ -22,6 +22,7 @@
 #include <asm/io.h>
 #include <i2c.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include "s3c24x0_i2c.h"
 
 #ifndef CONFIG_SYS_I2C_S3C24X0_SLAVE
diff --git a/drivers/i2c/s3c24x0_i2c.h b/drivers/i2c/s3c24x0_i2c.h
index 7a37b8071b67..cf438dfb3bdc 100644
--- a/drivers/i2c/s3c24x0_i2c.h
+++ b/drivers/i2c/s3c24x0_i2c.h
@@ -7,6 +7,7 @@
 #define _S3C24X0_I2C_H
 
 #include <stdbool.h>
+#include <asm/types.h>
 struct s3c24x0_i2c {
 	u32	iiccon;
 	u32	iicstat;
diff --git a/drivers/i2c/sh_i2c.c b/drivers/i2c/sh_i2c.c
index 26a87006698e..e664080d616c 100644
--- a/drivers/i2c/sh_i2c.c
+++ b/drivers/i2c/sh_i2c.c
@@ -4,6 +4,7 @@
  * Copyright (C) 2011, 2013 Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
  *
  * NOTE: This driver should be converted to driver model before June 2017.
+#include <linux/types.h>
  * Please see doc/driver-model/i2c-howto.rst for instructions.
  */
 
diff --git a/drivers/i2c/soft_i2c.c b/drivers/i2c/soft_i2c.c
index db69c18cb6de..26f00766c08a 100644
--- a/drivers/i2c/soft_i2c.c
+++ b/drivers/i2c/soft_i2c.c
@@ -12,6 +12,7 @@
  * Neil Russell.
  *
  * NOTE: This driver should be converted to driver model before June 2017.
+#include <linux/types.h>
  * Please see doc/driver-model/i2c-howto.rst for instructions.
  */
 
diff --git a/drivers/i2c/stm32f7_i2c.c b/drivers/i2c/stm32f7_i2c.c
index 94c0cf6f342c..9de35125ce98 100644
--- a/drivers/i2c/stm32f7_i2c.c
+++ b/drivers/i2c/stm32f7_i2c.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <regmap.h>
 #include <reset.h>
+#include <stdbool.h>
 #include <syscon.h>
 #include <time.h>
 #include <linux/bitops.h>
@@ -18,6 +19,7 @@
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <dm/device.h>
 #include <linux/err.h>
diff --git a/drivers/i2c/tegra186_bpmp_i2c.c b/drivers/i2c/tegra186_bpmp_i2c.c
index c9446ed783f8..a87e3b40ad53 100644
--- a/drivers/i2c/tegra186_bpmp_i2c.c
+++ b/drivers/i2c/tegra186_bpmp_i2c.c
@@ -14,6 +14,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/i2c/tegra_i2c.c b/drivers/i2c/tegra_i2c.c
index 5b05290224ae..007ce2ef3029 100644
--- a/drivers/i2c/tegra_i2c.c
+++ b/drivers/i2c/tegra_i2c.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <i2c.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <clk.h>
 #include <reset.h>
@@ -25,6 +26,7 @@
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 enum i2c_type {
 	TYPE_114,
diff --git a/drivers/i2c/xilinx_xiic.c b/drivers/i2c/xilinx_xiic.c
index aa86c6308855..8771ffc4bad1 100644
--- a/drivers/i2c/xilinx_xiic.c
+++ b/drivers/i2c/xilinx_xiic.c
@@ -11,12 +11,14 @@
 
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <dm.h>
 #include <i2c.h>
 #include <wait_bit.h>
 #include <asm/io.h>
 #include <dm/device_compat.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 struct xilinx_xiic_priv {
 	void __iomem		*base;
diff --git a/drivers/input/input.c b/drivers/input/input.c
index 4b54df8a8710..afb94f84391a 100644
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -12,6 +12,7 @@
 #include <env.h>
 #include <errno.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio_dev.h>
 #include <input.h>
 #ifdef CONFIG_DM_KEYBOARD
@@ -21,6 +22,7 @@
 #include <linux/input.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 enum {
 	/* These correspond to the lights on the keyboard */
diff --git a/drivers/input/key_matrix.c b/drivers/input/key_matrix.c
index 4742d5759844..732adad26761 100644
--- a/drivers/input/key_matrix.c
+++ b/drivers/input/key_matrix.c
@@ -13,6 +13,7 @@
 #include <malloc.h>
 #include <linux/input.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /**
  * Determine if the current keypress configuration can cause key ghosting
diff --git a/drivers/input/tegra-kbc.c b/drivers/input/tegra-kbc.c
index af289c8badbc..9bb1cd5e55be 100644
--- a/drivers/input/tegra-kbc.c
+++ b/drivers/input/tegra-kbc.c
@@ -18,6 +18,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/funcmux.h>
 #include <asm/arch-tegra/timer.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/input.h>
diff --git a/drivers/input/twl4030.c b/drivers/input/twl4030.c
index 3a1c46b3046b..045de57abe95 100644
--- a/drivers/input/twl4030.c
+++ b/drivers/input/twl4030.c
@@ -6,6 +6,7 @@
  */
 
 #include <twl4030.h>
+#include <asm/types.h>
 
 int twl4030_input_power_button(void)
 {
diff --git a/drivers/input/twl6030.c b/drivers/input/twl6030.c
index 76bd3488fc64..2515ebffab65 100644
--- a/drivers/input/twl6030.c
+++ b/drivers/input/twl6030.c
@@ -6,6 +6,7 @@
  */
 
 #include <twl6030.h>
+#include <asm/types.h>
 
 int twl6030_input_power_button(void)
 {
diff --git a/drivers/led/led_bcm6328.c b/drivers/led/led_bcm6328.c
index 84f9a4ceca68..4888d0d34126 100644
--- a/drivers/led/led_bcm6328.c
+++ b/drivers/led/led_bcm6328.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <errno.h>
 #include <led.h>
@@ -12,6 +13,7 @@
 #include <asm/io.h>
 #include <dm/lists.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #define LEDS_MAX			24
 
diff --git a/drivers/led/led_bcm6358.c b/drivers/led/led_bcm6358.c
index f8fdfcc23dec..d52badc0951f 100644
--- a/drivers/led/led_bcm6358.c
+++ b/drivers/led/led_bcm6358.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <errno.h>
 #include <led.h>
@@ -13,6 +14,7 @@
 #include <dm/lists.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #define LEDS_MAX		32
 #define LEDS_WAIT		100
diff --git a/drivers/led/led_bcm6858.c b/drivers/led/led_bcm6858.c
index b44232773b64..ec5bd532e008 100644
--- a/drivers/led/led_bcm6858.c
+++ b/drivers/led/led_bcm6858.c
@@ -8,11 +8,13 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <errno.h>
 #include <led.h>
 #include <log.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <dm/lists.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
diff --git a/drivers/mailbox/k3-sec-proxy.c b/drivers/mailbox/k3-sec-proxy.c
index c2c77b64244a..1259fa4fb5ba 100644
--- a/drivers/mailbox/k3-sec-proxy.c
+++ b/drivers/mailbox/k3-sec-proxy.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <log.h>
 #include <malloc.h>
 #include <stdio.h>
diff --git a/drivers/mailbox/mailbox-uclass.c b/drivers/mailbox/mailbox-uclass.c
index 233fa4f715fe..e081e808ab4b 100644
--- a/drivers/mailbox/mailbox-uclass.c
+++ b/drivers/mailbox/mailbox-uclass.c
@@ -11,6 +11,7 @@
 #include <malloc.h>
 #include <time.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 static inline struct mbox_ops *mbox_dev_ops(struct udevice *dev)
 {
diff --git a/drivers/mailbox/sandbox-mbox-test.c b/drivers/mailbox/sandbox-mbox-test.c
index faca8fcc441c..0fd650c7812c 100644
--- a/drivers/mailbox/sandbox-mbox-test.c
+++ b/drivers/mailbox/sandbox-mbox-test.c
@@ -8,6 +8,7 @@
 #include <mailbox.h>
 #include <malloc.h>
 #include <asm/io.h>
+#include <linux/types.h>
 
 struct sandbox_mbox_test {
 	struct mbox_chan chan;
diff --git a/drivers/mailbox/sandbox-mbox.c b/drivers/mailbox/sandbox-mbox.c
index 27d2b7b99760..0336d0dc4bdf 100644
--- a/drivers/mailbox/sandbox-mbox.c
+++ b/drivers/mailbox/sandbox-mbox.c
@@ -12,6 +12,7 @@
 #include <asm/io.h>
 #include <asm/mbox.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #define SANDBOX_MBOX_CHANNELS 2
 
diff --git a/drivers/mailbox/stm32-ipcc.c b/drivers/mailbox/stm32-ipcc.c
index 0c72f5e7c3d8..c5ec800abf76 100644
--- a/drivers/mailbox/stm32-ipcc.c
+++ b/drivers/mailbox/stm32-ipcc.c
@@ -5,11 +5,13 @@
 
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
 #include <mailbox-uclass.h>
 #include <malloc.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
diff --git a/drivers/mailbox/tegra-hsp.c b/drivers/mailbox/tegra-hsp.c
index 4b71e3ca7efb..7f287370a85b 100644
--- a/drivers/mailbox/tegra-hsp.c
+++ b/drivers/mailbox/tegra-hsp.c
@@ -12,6 +12,7 @@
 #include <dt-bindings/mailbox/tegra186-hsp.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #define TEGRA_HSP_INT_DIMENSIONING		0x380
 #define TEGRA_HSP_INT_DIMENSIONING_NSI_SHIFT	16
diff --git a/drivers/mailbox/zynqmp-ipi.c b/drivers/mailbox/zynqmp-ipi.c
index ef8c93fa4607..864a64c3cc2f 100644
--- a/drivers/mailbox/zynqmp-ipi.c
+++ b/drivers/mailbox/zynqmp-ipi.c
@@ -6,12 +6,14 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <log.h>
 #include <asm/io.h>
 #include <dm.h>
 #include <mailbox-uclass.h>
 #include <dm/device_compat.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <mach/sys_proto.h>
 #include <linux/ioport.h>
 #include <linux/io.h>
diff --git a/drivers/misc/ali512x.c b/drivers/misc/ali512x.c
index e714e28bdc30..ee9a156c1a2f 100644
--- a/drivers/misc/ali512x.c
+++ b/drivers/misc/ali512x.c
@@ -14,6 +14,7 @@
  */
 
 #include <config.h>
+#include <asm/types.h>
 
 #include <common.h>
 #include <asm/io.h>
diff --git a/drivers/misc/altera_sysid.c b/drivers/misc/altera_sysid.c
index 600315be5eac..2769b3953aa9 100644
--- a/drivers/misc/altera_sysid.c
+++ b/drivers/misc/altera_sysid.c
@@ -12,6 +12,7 @@
 #include <stdio.h>
 #include <linux/time.h>
 #include <asm/io.h>
+#include <linux/types.h>
 
 struct altera_sysid_regs {
 	u32	id;		/* The system build id */
diff --git a/drivers/misc/atsha204a-i2c.c b/drivers/misc/atsha204a-i2c.c
index 2df8d1070c0a..c2aa6d153309 100644
--- a/drivers/misc/atsha204a-i2c.c
+++ b/drivers/misc/atsha204a-i2c.c
@@ -21,6 +21,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <u-boot/crc.h>
 
 #define ATSHA204A_TWLO			60
diff --git a/drivers/misc/cbmem_console.c b/drivers/misc/cbmem_console.c
index dfa99175d3d0..bdc62cba787d 100644
--- a/drivers/misc/cbmem_console.c
+++ b/drivers/misc/cbmem_console.c
@@ -4,10 +4,12 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <console.h>
 #ifndef CONFIG_SYS_COREBOOT
 #error This driver requires coreboot
 #endif
+#include <asm/types.h>
 #include <linux/string.h>
 
 #include <asm/arch/sysinfo.h>
diff --git a/drivers/misc/cros_ec.c b/drivers/misc/cros_ec.c
index 7979989e1a65..21ea2242c65c 100644
--- a/drivers/misc/cros_ec.c
+++ b/drivers/misc/cros_ec.c
@@ -25,6 +25,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <spi.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <linux/delay.h>
@@ -36,6 +37,7 @@
 #include <dm/uclass-internal.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #ifdef DEBUG_TRACE
 #define debug_trace(fmt, b...)	debug(fmt, #b)
diff --git a/drivers/misc/cros_ec_i2c.c b/drivers/misc/cros_ec_i2c.c
index 2118afee76a9..2a37b8e4bb64 100644
--- a/drivers/misc/cros_ec_i2c.c
+++ b/drivers/misc/cros_ec_i2c.c
@@ -13,6 +13,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <i2c.h>
 #include <cros_ec.h>
@@ -21,6 +22,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #ifdef DEBUG_TRACE
 #define debug_trace(fmt, b...)	debug(fmt, #b)
diff --git a/drivers/misc/cros_ec_lpc.c b/drivers/misc/cros_ec_lpc.c
index 6c9c9593a7c0..722fc59040dc 100644
--- a/drivers/misc/cros_ec_lpc.c
+++ b/drivers/misc/cros_ec_lpc.c
@@ -21,6 +21,7 @@
 #include <time.h>
 #include <asm/io.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #ifdef DEBUG_TRACE
 #define debug_trace(fmt, b...)	debug(fmt, ##b)
diff --git a/drivers/misc/cros_ec_sandbox.c b/drivers/misc/cros_ec_sandbox.c
index b32822432437..1fba1abfb92c 100644
--- a/drivers/misc/cros_ec_sandbox.c
+++ b/drivers/misc/cros_ec_sandbox.c
@@ -13,11 +13,13 @@
 #include <hash.h>
 #include <log.h>
 #include <os.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <u-boot/sha256.h>
 #include <spi.h>
 #include <asm/malloc.h>
diff --git a/drivers/misc/cros_ec_spi.c b/drivers/misc/cros_ec_spi.c
index 3c3db889d61e..532c48ef8b8e 100644
--- a/drivers/misc/cros_ec_spi.c
+++ b/drivers/misc/cros_ec_spi.c
@@ -23,6 +23,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 int cros_ec_spi_packet(struct udevice *udev, int out_bytes, int in_bytes)
 {
diff --git a/drivers/misc/ds4510.c b/drivers/misc/ds4510.c
index 8d3a690aa1bc..ad024bbd7be0 100644
--- a/drivers/misc/ds4510.c
+++ b/drivers/misc/ds4510.c
@@ -16,6 +16,7 @@
 #include <linux/delay.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "ds4510.h"
 
 enum {
diff --git a/drivers/misc/fs_loader.c b/drivers/misc/fs_loader.c
index a4d048afd7f6..d03279a4c4d4 100644
--- a/drivers/misc/fs_loader.c
+++ b/drivers/misc/fs_loader.c
@@ -17,6 +17,7 @@
 #include <mapmem.h>
 #include <malloc.h>
 #include <spl.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/misc/fsl_devdis.c b/drivers/misc/fsl_devdis.c
index abd20b4d61f5..9c7f4ab314ca 100644
--- a/drivers/misc/fsl_devdis.c
+++ b/drivers/misc/fsl_devdis.c
@@ -4,12 +4,14 @@
  * Author: Zhuoyu Zhang <Zhuoyu.Zhang@freescale.com>
  */
 #include <common.h>
+#include <compiler.h>
 #include <asm/io.h>
 #include <asm/arch-ls102xa/immap_ls102xa.h>
 #include <asm/arch-ls102xa/config.h>
 #include <linux/compiler.h>
 #include <hwconfig.h>
 #include <fsl_devdis.h>
+#include <linux/types.h>
 
 void device_disable(const struct devdis_table *tbl, uint32_t num)
 {
diff --git a/drivers/misc/fsl_ifc.c b/drivers/misc/fsl_ifc.c
index bf2f9a1ac8ee..e3e6e1f371a0 100644
--- a/drivers/misc/fsl_ifc.c
+++ b/drivers/misc/fsl_ifc.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <fsl_ifc.h>
 #include <part.h>
 #include <stdio.h>
diff --git a/drivers/misc/fsl_iim.c b/drivers/misc/fsl_iim.c
index 07c7a492081c..6b781d735097 100644
--- a/drivers/misc/fsl_iim.c
+++ b/drivers/misc/fsl_iim.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <fuse.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/io.h>
diff --git a/drivers/misc/fsl_portals.c b/drivers/misc/fsl_portals.c
index 672d39c4733e..0b3117eb0705 100644
--- a/drivers/misc/fsl_portals.c
+++ b/drivers/misc/fsl_portals.c
@@ -5,9 +5,11 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <log.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <asm/types.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <linux/string.h>
diff --git a/drivers/misc/fsl_sec_mon.c b/drivers/misc/fsl_sec_mon.c
index 039e3b77f710..ea84af4c4de8 100644
--- a/drivers/misc/fsl_sec_mon.c
+++ b/drivers/misc/fsl_sec_mon.c
@@ -9,6 +9,7 @@
 #ifdef CONFIG_PPC
 #include <asm/ppc.h>
 #endif
+#include <asm/types.h>
 #include <linux/delay.h>
 
 static u32 get_sec_mon_state(void)
diff --git a/drivers/misc/gdsys_ioep.c b/drivers/misc/gdsys_ioep.c
index ebcd4d91e89d..f0f4311436ea 100644
--- a/drivers/misc/gdsys_ioep.c
+++ b/drivers/misc/gdsys_ioep.c
@@ -19,6 +19,7 @@
 #include <stdbool.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "gdsys_ioep.h"
 
diff --git a/drivers/misc/gdsys_ioep.h b/drivers/misc/gdsys_ioep.h
index f195388edaf8..2f90ca752011 100644
--- a/drivers/misc/gdsys_ioep.h
+++ b/drivers/misc/gdsys_ioep.h
@@ -8,6 +8,8 @@
 #define __GDSYS_IOEP_H_
 
 /**
+#include <compiler.h>
+#include <asm/types.h>
  * struct io_generic_packet - header structure for GDSYS IOEP packets
  * @target_address:     Target protocol address of the packet.
  * @source_address:     Source protocol address of the packet.
diff --git a/drivers/misc/gdsys_rxaui_ctrl.c b/drivers/misc/gdsys_rxaui_ctrl.c
index 7cc350d3cc98..f30da6a7e6a8 100644
--- a/drivers/misc/gdsys_rxaui_ctrl.c
+++ b/drivers/misc/gdsys_rxaui_ctrl.c
@@ -12,6 +12,7 @@
 #include <regmap.h>
 #include <misc.h>
 #include <stdbool.h>
+#include <asm/types.h>
 
 struct gdsys_rxaui_ctrl_regs {
 	u16 gen_cnt;
diff --git a/drivers/misc/i2c_eeprom.c b/drivers/misc/i2c_eeprom.c
index 0e1ba165f91d..8af5842ab969 100644
--- a/drivers/misc/i2c_eeprom.c
+++ b/drivers/misc/i2c_eeprom.c
@@ -13,6 +13,7 @@
 #include <dm/device-internal.h>
 #include <i2c.h>
 #include <i2c_eeprom.h>
+#include <linux/types.h>
 
 struct i2c_eeprom_drv_data {
 	u32 size; /* size in bytes */
diff --git a/drivers/misc/i2c_eeprom_emul.c b/drivers/misc/i2c_eeprom_emul.c
index e7f9ccdf8483..e2a90268304b 100644
--- a/drivers/misc/i2c_eeprom_emul.c
+++ b/drivers/misc/i2c_eeprom_emul.c
@@ -15,6 +15,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #ifdef DEBUG
 #define debug_buffer print_buffer
diff --git a/drivers/misc/ihs_fpga.c b/drivers/misc/ihs_fpga.c
index fd9c0f937ff8..29e875d7ef04 100644
--- a/drivers/misc/ihs_fpga.c
+++ b/drivers/misc/ihs_fpga.c
@@ -20,6 +20,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "ihs_fpga.h"
 
diff --git a/drivers/misc/ihs_fpga.h b/drivers/misc/ihs_fpga.h
index efb5dabb9c94..9541bbec12e1 100644
--- a/drivers/misc/ihs_fpga.h
+++ b/drivers/misc/ihs_fpga.h
@@ -5,6 +5,7 @@
  */
 
 /**
+#include <asm/types.h>
  * struct ihs_fpga_regs - IHS FPGA register map structure
  * @reflection_low:	  Lower reflection register
  * @versions:		  PCB versions register
diff --git a/drivers/misc/imx8/fuse.c b/drivers/misc/imx8/fuse.c
index c3a7d3a40b3b..b786c2f669f0 100644
--- a/drivers/misc/imx8/fuse.c
+++ b/drivers/misc/imx8/fuse.c
@@ -11,6 +11,7 @@
 #include <asm/arch/sci/sci.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <linux/arm-smccc.h>
 #include <linux/errno.h>
 
diff --git a/drivers/misc/imx8/scu.c b/drivers/misc/imx8/scu.c
index 74cab6294820..f87adb65cc9a 100644
--- a/drivers/misc/imx8/scu.c
+++ b/drivers/misc/imx8/scu.c
@@ -11,6 +11,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm.h>
+#include <asm/types.h>
 #include <dm/lists.h>
 #include <dm/root.h>
 #include <dm/device-internal.h>
diff --git a/drivers/misc/imx8/scu_api.c b/drivers/misc/imx8/scu_api.c
index bc0d8f7ae5c5..6164085b3c5e 100644
--- a/drivers/misc/imx8/scu_api.c
+++ b/drivers/misc/imx8/scu_api.c
@@ -14,6 +14,7 @@
 #include <dm.h>
 #include <asm/arch/sci/sci.h>
 #include <misc.h>
+#include <asm/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/misc/irq-uclass.c b/drivers/misc/irq-uclass.c
index 3795f5eaa1bb..ed9f04c78471 100644
--- a/drivers/misc/irq-uclass.c
+++ b/drivers/misc/irq-uclass.c
@@ -14,6 +14,7 @@
 #include <stdbool.h>
 #include <dm/device-internal.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 int irq_route_pmc_gpio_gpe(struct udevice *dev, uint pmc_gpe_num)
 {
diff --git a/drivers/misc/irq_sandbox.c b/drivers/misc/irq_sandbox.c
index 625aa1406514..a1ec1197f0b8 100644
--- a/drivers/misc/irq_sandbox.c
+++ b/drivers/misc/irq_sandbox.c
@@ -12,6 +12,7 @@
 #include <acpi/acpi_device.h>
 #include <asm/test.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 /**
  * struct sandbox_irq_priv - private data for this driver
diff --git a/drivers/misc/jz4780_efuse.c b/drivers/misc/jz4780_efuse.c
index 1fba3271db61..d1151495d965 100644
--- a/drivers/misc/jz4780_efuse.c
+++ b/drivers/misc/jz4780_efuse.c
@@ -7,10 +7,12 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <asm/io.h>
 #include <asm/unaligned.h>
 #include <errno.h>
 #include <linux/bitops.h>
+#include <linux/types.h>
 #include <mach/jz4780.h>
 #include <wait_bit.h>
 
diff --git a/drivers/misc/k3_avs.c b/drivers/misc/k3_avs.c
index 621ce8b28d9c..b951026fc23a 100644
--- a/drivers/misc/k3_avs.c
+++ b/drivers/misc/k3_avs.c
@@ -18,6 +18,7 @@
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <power/regulator.h>
 
 #define AM6_VTM_DEVINFO(i)	(priv->base + 0x100 + 0x20 * (i))
diff --git a/drivers/misc/k3_esm.c b/drivers/misc/k3_esm.c
index 82aa2545c084..1974c9f3a78e 100644
--- a/drivers/misc/k3_esm.c
+++ b/drivers/misc/k3_esm.c
@@ -8,9 +8,11 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <errno.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
diff --git a/drivers/misc/microchip_flexcom.c b/drivers/misc/microchip_flexcom.c
index 0886fbdd8654..fae073303d57 100644
--- a/drivers/misc/microchip_flexcom.c
+++ b/drivers/misc/microchip_flexcom.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <misc.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/err.h>
 #include <linux/errno.h>
 
diff --git a/drivers/misc/misc_sandbox.c b/drivers/misc/misc_sandbox.c
index 0149e8d9a796..2703ac4f1173 100644
--- a/drivers/misc/misc_sandbox.c
+++ b/drivers/misc/misc_sandbox.c
@@ -10,6 +10,7 @@
 #include <stdbool.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 struct misc_sandbox_priv {
 	u8 mem[128];
diff --git a/drivers/misc/mpc83xx_serdes.c b/drivers/misc/mpc83xx_serdes.c
index 0f182de1568d..f74004e75b77 100644
--- a/drivers/misc/mpc83xx_serdes.c
+++ b/drivers/misc/mpc83xx_serdes.c
@@ -15,6 +15,7 @@
 #include <mapmem.h>
 #include <misc.h>
 #include <stdbool.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/string.h>
diff --git a/drivers/misc/mpc83xx_serdes.h b/drivers/misc/mpc83xx_serdes.h
index 2a13c5892bf2..1a2e094d2175 100644
--- a/drivers/misc/mpc83xx_serdes.h
+++ b/drivers/misc/mpc83xx_serdes.h
@@ -5,6 +5,7 @@
  */
 
 /**
+#include <asm/types.h>
  * enum srdscr0_mask - Bit masks for SRDSCR0 (SerDes Control Register 0)
  * @SRDSCR0_DPPA:       Bitmask for the DPPA (diff pk-pk swing for lane A)
  *			field of the SRCSCR0
diff --git a/drivers/misc/mxc_ocotp.c b/drivers/misc/mxc_ocotp.c
index cce6cb72c5e5..a3fa60665995 100644
--- a/drivers/misc/mxc_ocotp.c
+++ b/drivers/misc/mxc_ocotp.c
@@ -15,6 +15,7 @@
 #include <fuse.h>
 #include <stdbool.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/io.h>
diff --git a/drivers/misc/mxs_ocotp.c b/drivers/misc/mxs_ocotp.c
index ede9d9e74239..982cdb66cc12 100644
--- a/drivers/misc/mxs_ocotp.c
+++ b/drivers/misc/mxs_ocotp.c
@@ -21,6 +21,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/types.h>
 
 #define MXS_OCOTP_TIMEOUT	100000
 
diff --git a/drivers/misc/p2sb-uclass.c b/drivers/misc/p2sb-uclass.c
index eea0e0f528fd..4d3a39660881 100644
--- a/drivers/misc/p2sb-uclass.c
+++ b/drivers/misc/p2sb-uclass.c
@@ -13,10 +13,12 @@
 #include <mapmem.h>
 #include <p2sb.h>
 #include <spl.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <dm/uclass-internal.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #define PCR_COMMON_IOSF_1_0	1
 
diff --git a/drivers/misc/p2sb_emul.c b/drivers/misc/p2sb_emul.c
index ae68cd9c71af..5a74d6acbe0c 100644
--- a/drivers/misc/p2sb_emul.c
+++ b/drivers/misc/p2sb_emul.c
@@ -18,6 +18,7 @@
 #include <p2sb.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 /**
  * struct p2sb_emul_platdata - platform data for this device
diff --git a/drivers/misc/p2sb_sandbox.c b/drivers/misc/p2sb_sandbox.c
index ce50a9732ee7..546fa7482567 100644
--- a/drivers/misc/p2sb_sandbox.c
+++ b/drivers/misc/p2sb_sandbox.c
@@ -11,6 +11,7 @@
 #include <dm.h>
 #include <asm/io.h>
 #include <p2sb.h>
+#include <linux/types.h>
 
 struct sandbox_p2sb_priv {
 	ulong base;
diff --git a/drivers/misc/pca9551_led.c b/drivers/misc/pca9551_led.c
index 312192fd62d3..f3807397fa4c 100644
--- a/drivers/misc/pca9551_led.c
+++ b/drivers/misc/pca9551_led.c
@@ -7,6 +7,7 @@
 #include <errno.h>
 #include <i2c.h>
 #include <status_led.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 
 #ifndef CONFIG_PCA9551_I2C_ADDR
diff --git a/drivers/misc/qfw.c b/drivers/misc/qfw.c
index cd845a71bf60..0669a8d73488 100644
--- a/drivers/misc/qfw.c
+++ b/drivers/misc/qfw.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <qfw.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/io.h>
 #ifdef CONFIG_GENERATE_ACPI_TABLE
@@ -18,6 +19,7 @@
 #include <linux/kernel.h>
 #include <linux/list.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static bool fwcfg_present;
 static bool fwcfg_dma_present;
diff --git a/drivers/misc/rockchip-efuse.c b/drivers/misc/rockchip-efuse.c
index ad825e940f1c..412390041745 100644
--- a/drivers/misc/rockchip-efuse.c
+++ b/drivers/misc/rockchip-efuse.c
@@ -7,11 +7,13 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <stdio.h>
 #include <asm/io.h>
 #include <command.h>
 #include <display_options.h>
 #include <dm.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <misc.h>
diff --git a/drivers/misc/rockchip-otp.c b/drivers/misc/rockchip-otp.c
index 6f438c41df59..585a90f61dc3 100644
--- a/drivers/misc/rockchip-otp.c
+++ b/drivers/misc/rockchip-otp.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <asm/io.h>
@@ -13,6 +14,7 @@
 #include <linux/delay.h>
 #include <misc.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 /* OTP Register Offsets */
 #define OTPC_SBPI_CTRL			0x0020
diff --git a/drivers/misc/sandbox_adder.c b/drivers/misc/sandbox_adder.c
index df262e62555b..4f53d6b0230d 100644
--- a/drivers/misc/sandbox_adder.c
+++ b/drivers/misc/sandbox_adder.c
@@ -13,6 +13,7 @@
 #include <misc.h>
 #include <p2sb.h>
 #include <asm/io.h>
+#include <linux/types.h>
 
 struct sandbox_adder_priv {
 	ulong base;
diff --git a/drivers/misc/sifive-otp.c b/drivers/misc/sifive-otp.c
index 97cb40b542ca..0a94658a7fdb 100644
--- a/drivers/misc/sifive-otp.c
+++ b/drivers/misc/sifive-otp.c
@@ -18,7 +18,9 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <dm/device.h>
 #include <dm/read.h>
 #include <linux/bitops.h>
diff --git a/drivers/misc/smsc_lpc47m.c b/drivers/misc/smsc_lpc47m.c
index bda064f1365b..e6ee39d5c938 100644
--- a/drivers/misc/smsc_lpc47m.c
+++ b/drivers/misc/smsc_lpc47m.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <asm/io.h>
 #include <asm/pnp_def.h>
+#include <linux/types.h>
 
 static void pnp_enter_conf_state(u16 dev)
 {
diff --git a/drivers/misc/smsc_sio1007.c b/drivers/misc/smsc_sio1007.c
index 9fe6a18f59e8..01a97dd5cce7 100644
--- a/drivers/misc/smsc_sio1007.c
+++ b/drivers/misc/smsc_sio1007.c
@@ -7,6 +7,7 @@
 #include <asm/io.h>
 #include <errno.h>
 #include <smsc_sio1007.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 
 static inline u8 sio1007_read(int port, int reg)
diff --git a/drivers/misc/spltest_sandbox.c b/drivers/misc/spltest_sandbox.c
index 1bb4120a06d2..511dd9970de0 100644
--- a/drivers/misc/spltest_sandbox.c
+++ b/drivers/misc/spltest_sandbox.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <dt-structs.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <linux/kernel.h>
 
diff --git a/drivers/misc/status_led.c b/drivers/misc/status_led.c
index a6e9c03a02ec..6720886e14e8 100644
--- a/drivers/misc/status_led.c
+++ b/drivers/misc/status_led.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <status_led.h>
+#include <linux/types.h>
 
 /*
  * The purpose of this code is to signal the operational status of a
diff --git a/drivers/misc/stm32_rcc.c b/drivers/misc/stm32_rcc.c
index 9a03679d21ad..d5e6f801623e 100644
--- a/drivers/misc/stm32_rcc.c
+++ b/drivers/misc/stm32_rcc.c
@@ -13,6 +13,7 @@
 #include <dm/device_compat.h>
 #include <dm/lists.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 struct stm32_rcc_clk stm32_rcc_clk_f42x = {
 	.drv_name = "stm32fx_rcc_clock",
diff --git a/drivers/misc/stm32mp_fuse.c b/drivers/misc/stm32mp_fuse.c
index 2d8c43b123fc..1e2d8df75dc7 100644
--- a/drivers/misc/stm32mp_fuse.c
+++ b/drivers/misc/stm32mp_fuse.c
@@ -9,6 +9,7 @@
 #include <misc.h>
 #include <errno.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <dm/device.h>
 #include <dm/uclass.h>
 #include <linux/errno.h>
diff --git a/drivers/misc/swap_case.c b/drivers/misc/swap_case.c
index fa3ed8671c27..566e076eb50e 100644
--- a/drivers/misc/swap_case.c
+++ b/drivers/misc/swap_case.c
@@ -15,6 +15,7 @@
 #include <linux/ctype.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 /**
  * struct swap_case_platdata - platform data for this device
diff --git a/drivers/misc/tegra186_bpmp.c b/drivers/misc/tegra186_bpmp.c
index 969132859272..dad726a1b471 100644
--- a/drivers/misc/tegra186_bpmp.c
+++ b/drivers/misc/tegra186_bpmp.c
@@ -21,6 +21,7 @@
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define BPMP_IVC_FRAME_COUNT 1
 #define BPMP_IVC_FRAME_SIZE 128
diff --git a/drivers/misc/vexpress_config.c b/drivers/misc/vexpress_config.c
index 3a74ffcaddad..f72780f96b80 100644
--- a/drivers/misc/vexpress_config.c
+++ b/drivers/misc/vexpress_config.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <malloc.h>
 #include <stdbool.h>
+#include <asm/types.h>
 #include <dm/read.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
diff --git a/drivers/misc/winbond_w83627.c b/drivers/misc/winbond_w83627.c
index 3838b3f74f40..c3c331bc1cf2 100644
--- a/drivers/misc/winbond_w83627.c
+++ b/drivers/misc/winbond_w83627.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <asm/io.h>
 #include <asm/pnp_def.h>
+#include <linux/types.h>
 
 #define WINBOND_ENTRY_KEY	0x87
 #define WINBOND_EXIT_KEY	0xaa
diff --git a/drivers/mmc/am654_sdhci.c b/drivers/mmc/am654_sdhci.c
index eea327ace76e..54dfcbcd174c 100644
--- a/drivers/mmc/am654_sdhci.c
+++ b/drivers/mmc/am654_sdhci.c
@@ -12,11 +12,13 @@
 #include <power-domain.h>
 #include <regmap.h>
 #include <sdhci.h>
+#include <stdbool.h>
 #include <time.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 /* CTL_CFG Registers */
 #define CTL_CFG_2		0x14
diff --git a/drivers/mmc/arm_pl180_mmci.h b/drivers/mmc/arm_pl180_mmci.h
index 61ee96a112d9..c068dc086cc1 100644
--- a/drivers/mmc/arm_pl180_mmci.h
+++ b/drivers/mmc/arm_pl180_mmci.h
@@ -12,6 +12,7 @@
 #ifndef __ARM_PL180_MMCI_H__
 #define __ARM_PL180_MMCI_H__
 
+#include <asm/types.h>
 /* need definition of struct mmc_config */
 #include <mmc.h>
 
diff --git a/drivers/mmc/aspeed_sdhci.c b/drivers/mmc/aspeed_sdhci.c
index 543c65a8e359..c48cfae42e09 100644
--- a/drivers/mmc/aspeed_sdhci.c
+++ b/drivers/mmc/aspeed_sdhci.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <malloc.h>
 #include <sdhci.h>
+#include <asm/types.h>
 #include <linux/err.h>
 
 struct aspeed_sdhci_plat {
diff --git a/drivers/mmc/atmel_sdhci.c b/drivers/mmc/atmel_sdhci.c
index cb838a398a63..0022aebf8291 100644
--- a/drivers/mmc/atmel_sdhci.c
+++ b/drivers/mmc/atmel_sdhci.c
@@ -12,6 +12,7 @@
 #include <stdio.h>
 #include <asm/arch/clk.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 
 #define ATMEL_SDHC_MIN_FREQ	400000
diff --git a/drivers/mmc/bcm2835_sdhci.c b/drivers/mmc/bcm2835_sdhci.c
index ac1a421cd3e9..05756170d3b7 100644
--- a/drivers/mmc/bcm2835_sdhci.c
+++ b/drivers/mmc/bcm2835_sdhci.c
@@ -46,6 +46,7 @@
 #include <asm/arch/msg.h>
 #include <asm/arch/mbox.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <mach/sdhci.h>
 #include <mach/timer.h>
 
diff --git a/drivers/mmc/bcm2835_sdhost.c b/drivers/mmc/bcm2835_sdhost.c
index 315a829f2055..12029be39a0a 100644
--- a/drivers/mmc/bcm2835_sdhost.c
+++ b/drivers/mmc/bcm2835_sdhost.c
@@ -31,8 +31,10 @@
  */
 #include <clk.h>
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <mmc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <asm/arch/msg.h>
@@ -48,6 +50,7 @@
 #include <linux/iopoll.h>
 #include <linux/kernel.h>
 #include <linux/sizes.h>
+#include <linux/types.h>
 #include <mach/gpio.h>
 #include <power/regulator.h>
 
diff --git a/drivers/mmc/ca_dw_mmc.c b/drivers/mmc/ca_dw_mmc.c
index fcb2700a7a8f..745829790dc7 100644
--- a/drivers/mmc/ca_dw_mmc.c
+++ b/drivers/mmc/ca_dw_mmc.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dwmmc.h>
 #include <fdtdec.h>
 #include <asm/global_data.h>
@@ -15,6 +16,7 @@
 #include <dm.h>
 #include <mapmem.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define SD_CLK_SEL_MASK (0x3)
 #define SD_DLL_DEFAULT  (0x143000)
diff --git a/drivers/mmc/davinci_mmc.c b/drivers/mmc/davinci_mmc.c
index f8dc47bc2398..1f0177b26bad 100644
--- a/drivers/mmc/davinci_mmc.c
+++ b/drivers/mmc/davinci_mmc.c
@@ -21,6 +21,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define WATCHDOG_COUNT		(100000)
 
diff --git a/drivers/mmc/dw_mmc.c b/drivers/mmc/dw_mmc.c
index d77e13784549..1ba8d528f0c1 100644
--- a/drivers/mmc/dw_mmc.c
+++ b/drivers/mmc/dw_mmc.c
@@ -20,6 +20,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include <power/regulator.h>
 
 #define PAGE_SIZE 4096
diff --git a/drivers/mmc/exynos_dw_mmc.c b/drivers/mmc/exynos_dw_mmc.c
index 9fcb416b0421..3a764d50e1df 100644
--- a/drivers/mmc/exynos_dw_mmc.c
+++ b/drivers/mmc/exynos_dw_mmc.c
@@ -20,6 +20,7 @@
 #include <asm/arch/power.h>
 #include <asm/gpio.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 #define	DWMMC_MAX_CH_NUM		4
 #define	DWMMC_MAX_FREQ			52000000
diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c
index ebe672a41f08..7c4e7773056c 100644
--- a/drivers/mmc/fsl_esdhc.c
+++ b/drivers/mmc/fsl_esdhc.c
@@ -9,6 +9,7 @@
  * Kyle Harris, Nexus Technologies, Inc. kharris at nexus-tech.net
  */
 
+#include <compiler.h>
 #include <config.h>
 #include <common.h>
 #include <command.h>
@@ -20,6 +21,7 @@
 #include <malloc.h>
 #include <fsl_esdhc.h>
 #include <fdt_support.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <vsprintf.h>
@@ -36,6 +38,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/mmc/fsl_esdhc_imx.c b/drivers/mmc/fsl_esdhc_imx.c
index 0fa066e86197..475ba2cf9de6 100644
--- a/drivers/mmc/fsl_esdhc_imx.c
+++ b/drivers/mmc/fsl_esdhc_imx.c
@@ -10,6 +10,7 @@
  * Kyle Harris, Nexus Technologies, Inc. kharris at nexus-tech.net
  */
 
+#include <compiler.h>
 #include <config.h>
 #include <common.h>
 #include <command.h>
@@ -33,6 +34,7 @@
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <power/regulator.h>
 #include <malloc.h>
 #include <fsl_esdhc_imx.h>
diff --git a/drivers/mmc/fsl_esdhc_spl.c b/drivers/mmc/fsl_esdhc_spl.c
index 3359d67fafa6..0f17058e9f1f 100644
--- a/drivers/mmc/fsl_esdhc_spl.c
+++ b/drivers/mmc/fsl_esdhc_spl.c
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /*
  * The environment variables are written to just after the u-boot image
diff --git a/drivers/mmc/ftsdc010_mci.c b/drivers/mmc/ftsdc010_mci.c
index cc0348d46633..da81fb6343db 100644
--- a/drivers/mmc/ftsdc010_mci.c
+++ b/drivers/mmc/ftsdc010_mci.c
@@ -11,10 +11,12 @@
 
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <log.h>
 #include <malloc.h>
 #include <part.h>
 #include <mmc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <asm/global_data.h>
@@ -24,6 +26,7 @@
 #include <asm/byteorder.h>
 #include <faraday/ftsdc010.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "ftsdc010_mci.h"
 #include <dm.h>
 #include <dt-structs.h>
diff --git a/drivers/mmc/ftsdc010_mci.h b/drivers/mmc/ftsdc010_mci.h
index 2c487b4176d0..885ec8f8e1b9 100644
--- a/drivers/mmc/ftsdc010_mci.h
+++ b/drivers/mmc/ftsdc010_mci.h
@@ -5,8 +5,10 @@
  * Copyright (C) 2011 Andes Technology Corporation
  * Macpaul Lin, Andes Technology Corporation <macpaul@andestech.com>
  */
+#include <compiler.h>
 #include <mmc.h>
 #include <stdbool.h>
+#include <linux/types.h>
 
 #ifndef __FTSDC010_MCI_H
 #define __FTSDC010_MCI_H
diff --git a/drivers/mmc/gen_atmel_mci.c b/drivers/mmc/gen_atmel_mci.c
index 4b1869ae65c4..799d17e58710 100644
--- a/drivers/mmc/gen_atmel_mci.c
+++ b/drivers/mmc/gen_atmel_mci.c
@@ -24,6 +24,7 @@
 #include <asm/arch/clk.h>
 #include <asm/arch/hardware.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include "atmel_mci.h"
 
 #ifndef CONFIG_SYS_MMC_CLK_OD
diff --git a/drivers/mmc/hi6220_dw_mmc.c b/drivers/mmc/hi6220_dw_mmc.c
index b3a8c5d50d8c..f1b94b8958f4 100644
--- a/drivers/mmc/hi6220_dw_mmc.c
+++ b/drivers/mmc/hi6220_dw_mmc.c
@@ -12,6 +12,7 @@
 #include <malloc.h>
 #include <stdbool.h>
 #include <asm/global_data.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/mmc/iproc_sdhci.c b/drivers/mmc/iproc_sdhci.c
index 216538d435a8..60b6cd0bfdcc 100644
--- a/drivers/mmc/iproc_sdhci.c
+++ b/drivers/mmc/iproc_sdhci.c
@@ -11,6 +11,7 @@
 #include <sdhci.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/string.h>
diff --git a/drivers/mmc/jz_mmc.c b/drivers/mmc/jz_mmc.c
index c8c7127cbe85..495f1edd5b50 100644
--- a/drivers/mmc/jz_mmc.c
+++ b/drivers/mmc/jz_mmc.c
@@ -7,10 +7,12 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <malloc.h>
 #include <mmc.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <asm/unaligned.h>
 #include <errno.h>
 #include <dm/device_compat.h>
diff --git a/drivers/mmc/kona_sdhci.c b/drivers/mmc/kona_sdhci.c
index dc7a203f1f0f..9f79851f80ad 100644
--- a/drivers/mmc/kona_sdhci.c
+++ b/drivers/mmc/kona_sdhci.c
@@ -7,6 +7,7 @@
 #include <malloc.h>
 #include <sdhci.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/kona-common/clk.h>
diff --git a/drivers/mmc/meson_gx_mmc.c b/drivers/mmc/meson_gx_mmc.c
index 2df20418be3d..883932f5c89b 100644
--- a/drivers/mmc/meson_gx_mmc.c
+++ b/drivers/mmc/meson_gx_mmc.c
@@ -11,6 +11,7 @@
 #include <malloc.h>
 #include <pwrseq.h>
 #include <mmc.h>
+#include <stdbool.h>
 #include <time.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
@@ -20,6 +21,7 @@
 #include <linux/kernel.h>
 #include <linux/log2.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static inline void *get_regbase(const struct mmc *mmc)
 {
diff --git a/drivers/mmc/mmc-uclass.c b/drivers/mmc/mmc-uclass.c
index da06aa9e7b6a..1463a375947f 100644
--- a/drivers/mmc/mmc-uclass.c
+++ b/drivers/mmc/mmc-uclass.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <mmc.h>
 #include <dm.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <dm/device-internal.h>
 #include <dm/device_compat.h>
@@ -16,6 +17,7 @@
 #include <linux/compat.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include "mmc_private.h"
 
 int dm_mmc_get_b_max(struct udevice *dev, void *dst, lbaint_t blkcnt)
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index e38950dd6e0e..fb2964fb5b66 100644
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@ -7,12 +7,14 @@
  * Based vaguely on the Linux code
  */
 
+#include <compiler.h>
 #include <config.h>
 #include <common.h>
 #include <blk.h>
 #include <command.h>
 #include <dm.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <vsprintf.h>
@@ -27,6 +29,7 @@
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <power/regulator.h>
 #include <malloc.h>
 #include <memalign.h>
diff --git a/drivers/mmc/mmc_boot.c b/drivers/mmc/mmc_boot.c
index 0a74b1fb776a..546f7c975a8c 100644
--- a/drivers/mmc/mmc_boot.c
+++ b/drivers/mmc/mmc_boot.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <log.h>
 #include <mmc.h>
+#include <asm/types.h>
 #include "mmc_private.h"
 
 /*
diff --git a/drivers/mmc/mmc_private.h b/drivers/mmc/mmc_private.h
index a0900e8cadd8..df6b1e8178f2 100644
--- a/drivers/mmc/mmc_private.h
+++ b/drivers/mmc/mmc_private.h
@@ -11,6 +11,7 @@
 #define _MMC_PRIVATE_H_
 
 #include <mmc.h>
+#include <linux/types.h>
 
 int mmc_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd, struct mmc_data *data);
 int mmc_send_status(struct mmc *mmc, unsigned int *status);
diff --git a/drivers/mmc/mmc_spi.c b/drivers/mmc/mmc_spi.c
index ac8a127029cb..15584710c32d 100644
--- a/drivers/mmc/mmc_spi.c
+++ b/drivers/mmc/mmc_spi.c
@@ -18,6 +18,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <u-boot/crc.h>
 #include <linux/crc7.h>
 #include <asm/byteorder.h>
diff --git a/drivers/mmc/mmc_write.c b/drivers/mmc/mmc_write.c
index 93eb1404def4..963627ab1ce6 100644
--- a/drivers/mmc/mmc_write.c
+++ b/drivers/mmc/mmc_write.c
@@ -15,6 +15,7 @@
 #include <stdio.h>
 #include <linux/kernel.h>
 #include <linux/math64.h>
+#include <linux/types.h>
 #include "mmc_private.h"
 
 static ulong mmc_erase_t(struct mmc *mmc, ulong start, lbaint_t blkcnt)
diff --git a/drivers/mmc/msm_sdhci.c b/drivers/mmc/msm_sdhci.c
index 0ac7529f01a2..49446cb5a656 100644
--- a/drivers/mmc/msm_sdhci.c
+++ b/drivers/mmc/msm_sdhci.c
@@ -19,6 +19,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /* Non-standard registers needed for SDHCI startup */
 #define SDCC_MCI_POWER   0x0
diff --git a/drivers/mmc/mtk-sd.c b/drivers/mmc/mtk-sd.c
index b6632a32d363..178fe1af43d2 100644
--- a/drivers/mmc/mtk-sd.c
+++ b/drivers/mmc/mtk-sd.c
@@ -8,6 +8,7 @@
 
 #include <clk.h>
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <mmc.h>
 #include <errno.h>
@@ -23,6 +24,7 @@
 #include <linux/iopoll.h>
 #include <linux/kernel.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 /* MSDC_CFG */
 #define MSDC_CFG_HS400_CK_MODE_EXT	BIT(22)
diff --git a/drivers/mmc/mv_sdhci.c b/drivers/mmc/mv_sdhci.c
index f3e44f53cb41..d8515c6e6f12 100644
--- a/drivers/mmc/mv_sdhci.c
+++ b/drivers/mmc/mv_sdhci.c
@@ -4,11 +4,13 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <malloc.h>
 #include <sdhci.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/mbus.h>
 #include <linux/string.h>
diff --git a/drivers/mmc/mvebu_mmc.c b/drivers/mmc/mvebu_mmc.c
index 3a967ac7720e..c6df83fb02e9 100644
--- a/drivers/mmc/mvebu_mmc.c
+++ b/drivers/mmc/mvebu_mmc.c
@@ -22,6 +22,7 @@
 #include <mvebu_mmc.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/mmc/mxcmmc.c b/drivers/mmc/mxcmmc.c
index 01d57d4c778c..ef8ef6325637 100644
--- a/drivers/mmc/mxcmmc.c
+++ b/drivers/mmc/mxcmmc.c
@@ -25,6 +25,7 @@
 #include <mmc.h>
 #include <stdio.h>
 #include <time.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <asm/io.h>
diff --git a/drivers/mmc/mxsmmc.c b/drivers/mmc/mxsmmc.c
index 615ed6b17006..177a4bbc2977 100644
--- a/drivers/mmc/mxsmmc.c
+++ b/drivers/mmc/mxsmmc.c
@@ -37,6 +37,7 @@
 #include <bouncebuf.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define	MXSMMC_MAX_TIMEOUT	10000
 #define MXSMMC_SMALL_TRANSFER	512
diff --git a/drivers/mmc/nexell_dw_mmc.c b/drivers/mmc/nexell_dw_mmc.c
index 35704e74d6b6..b721264c7a19 100644
--- a/drivers/mmc/nexell_dw_mmc.c
+++ b/drivers/mmc/nexell_dw_mmc.c
@@ -16,6 +16,7 @@
 #include <asm/arch/reset.h>
 #include <asm/arch/clk.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #define DWMCI_CLKSEL			0x09C
 #define DWMCI_SHIFT_0			0x0
diff --git a/drivers/mmc/omap_hsmmc.c b/drivers/mmc/omap_hsmmc.c
index 4de6bb1d9725..f12af49257bb 100644
--- a/drivers/mmc/omap_hsmmc.c
+++ b/drivers/mmc/omap_hsmmc.c
@@ -22,6 +22,7 @@
  * MA 02111-1307 USA
  */
 
+#include <compiler.h>
 #include <config.h>
 #include <common.h>
 #include <cpu_func.h>
@@ -34,6 +35,7 @@
 #if defined(CONFIG_OMAP54XX) || defined(CONFIG_OMAP44XX)
 #include <palmas.h>
 #endif
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <vsprintf.h>
@@ -59,6 +61,7 @@
 #include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include <power/regulator.h>
 #include <thermal.h>
 
diff --git a/drivers/mmc/pic32_sdhci.c b/drivers/mmc/pic32_sdhci.c
index 009bf00a7f81..9e5ddc44aa7c 100644
--- a/drivers/mmc/pic32_sdhci.c
+++ b/drivers/mmc/pic32_sdhci.c
@@ -11,6 +11,7 @@
 #include <sdhci.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <mach/pic32.h>
 
diff --git a/drivers/mmc/pxa_mmc_gen.c b/drivers/mmc/pxa_mmc_gen.c
index 5a4652e2461b..cc1d8c640c18 100644
--- a/drivers/mmc/pxa_mmc_gen.c
+++ b/drivers/mmc/pxa_mmc_gen.c
@@ -21,6 +21,7 @@
 #include <mmc.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /* PXAMMC Generic default config for various CPUs */
 #if defined(CONFIG_CPU_PXA25X)
diff --git a/drivers/mmc/renesas-sdhi.c b/drivers/mmc/renesas-sdhi.c
index 1c4ce0ff02a9..245c5310eab9 100644
--- a/drivers/mmc/renesas-sdhi.c
+++ b/drivers/mmc/renesas-sdhi.c
@@ -11,6 +11,7 @@
 #include <malloc.h>
 #include <mmc.h>
 #include <dm.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
@@ -21,6 +22,7 @@
 #include <linux/io.h>
 #include <linux/kernel.h>
 #include <linux/sizes.h>
+#include <linux/types.h>
 #include <power/regulator.h>
 #include <asm/unaligned.h>
 #include "tmio-common.h"
diff --git a/drivers/mmc/rockchip_dw_mmc.c b/drivers/mmc/rockchip_dw_mmc.c
index 6d31f9f3d306..7f1c63f84765 100644
--- a/drivers/mmc/rockchip_dw_mmc.c
+++ b/drivers/mmc/rockchip_dw_mmc.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <mapmem.h>
 #include <pwrseq.h>
+#include <stdbool.h>
 #include <syscon.h>
 #include <asm/gpio.h>
 #include <asm/arch-rockchip/clock.h>
@@ -19,6 +20,7 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 struct rockchip_mmc_plat {
 #if CONFIG_IS_ENABLED(OF_PLATDATA)
diff --git a/drivers/mmc/s5p_sdhci.c b/drivers/mmc/s5p_sdhci.c
index cf32ca808211..cabada7acc62 100644
--- a/drivers/mmc/s5p_sdhci.c
+++ b/drivers/mmc/s5p_sdhci.c
@@ -12,6 +12,7 @@
 #include <fdtdec.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <asm/gpio.h>
diff --git a/drivers/mmc/sandbox_mmc.c b/drivers/mmc/sandbox_mmc.c
index 58c79a8821b3..79d7da1dc031 100644
--- a/drivers/mmc/sandbox_mmc.c
+++ b/drivers/mmc/sandbox_mmc.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <mmc.h>
 #include <asm/test.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
 
diff --git a/drivers/mmc/sdhci-cadence.c b/drivers/mmc/sdhci-cadence.c
index fd5b77351a25..239badca5820 100644
--- a/drivers/mmc/sdhci-cadence.c
+++ b/drivers/mmc/sdhci-cadence.c
@@ -5,8 +5,10 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <dm/device_compat.h>
 #include <linux/bitfield.h>
 #include <linux/bitops.h>
diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c
index 917856a45d2c..76e37c3d0e12 100644
--- a/drivers/mmc/sdhci.c
+++ b/drivers/mmc/sdhci.c
@@ -15,6 +15,7 @@
 #include <malloc.h>
 #include <mmc.h>
 #include <sdhci.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <asm/cache.h>
@@ -26,6 +27,7 @@
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static void sdhci_reset(struct sdhci_host *host, u8 mask)
 {
diff --git a/drivers/mmc/sh_mmcif.c b/drivers/mmc/sh_mmcif.c
index ede46d1b6acc..15b2b0533f1d 100644
--- a/drivers/mmc/sh_mmcif.c
+++ b/drivers/mmc/sh_mmcif.c
@@ -16,6 +16,7 @@
 #include <dm.h>
 #include <malloc.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/drivers/mmc/sh_mmcif.h b/drivers/mmc/sh_mmcif.h
index 66341e51d266..4a9896cd8363 100644
--- a/drivers/mmc/sh_mmcif.h
+++ b/drivers/mmc/sh_mmcif.h
@@ -8,6 +8,7 @@
 #ifndef _SH_MMCIF_H_
 #define _SH_MMCIF_H_
 
+#include <asm/types.h>
 struct sh_mmcif_regs {
 	unsigned long ce_cmd_set;
 	unsigned long reserved;
diff --git a/drivers/mmc/sh_sdhi.c b/drivers/mmc/sh_sdhi.c
index 97fb1ee48ecc..c62315565d68 100644
--- a/drivers/mmc/sh_sdhi.c
+++ b/drivers/mmc/sh_sdhi.c
@@ -10,6 +10,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <log.h>
 #include <malloc.h>
 #include <mmc.h>
@@ -17,6 +18,7 @@
 #include <part.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/drivers/mmc/snps_dw_mmc.c b/drivers/mmc/snps_dw_mmc.c
index 5572afa1e487..08571ccd263f 100644
--- a/drivers/mmc/snps_dw_mmc.c
+++ b/drivers/mmc/snps_dw_mmc.c
@@ -13,6 +13,7 @@
 #include <dwmmc.h>
 #include <errno.h>
 #include <fdtdec.h>
+#include <asm/types.h>
 #include <dm/device_compat.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
diff --git a/drivers/mmc/socfpga_dw_mmc.c b/drivers/mmc/socfpga_dw_mmc.c
index 9877919f4f1b..72f2e193158e 100644
--- a/drivers/mmc/socfpga_dw_mmc.c
+++ b/drivers/mmc/socfpga_dw_mmc.c
@@ -14,6 +14,7 @@
 #include <errno.h>
 #include <fdtdec.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <dm/device_compat.h>
 #include <linux/errno.h>
 #include <linux/libfdt.h>
diff --git a/drivers/mmc/stm32_sdmmc2.c b/drivers/mmc/stm32_sdmmc2.c
index 62f9c7a6f5dd..7819b2820e77 100644
--- a/drivers/mmc/stm32_sdmmc2.c
+++ b/drivers/mmc/stm32_sdmmc2.c
@@ -11,9 +11,11 @@
 #include <fdtdec.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/bitops.h>
 #include <asm/cache.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/mmc/sunxi_mmc.c b/drivers/mmc/sunxi_mmc.c
index b562595e2f3a..6e3b5ff9324e 100644
--- a/drivers/mmc/sunxi_mmc.c
+++ b/drivers/mmc/sunxi_mmc.c
@@ -27,6 +27,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_DM_MMC
 struct sunxi_mmc_variant {
diff --git a/drivers/mmc/tangier_sdhci.c b/drivers/mmc/tangier_sdhci.c
index 622cc3ef1bea..fe1bb77177c3 100644
--- a/drivers/mmc/tangier_sdhci.c
+++ b/drivers/mmc/tangier_sdhci.c
@@ -3,6 +3,7 @@
  * Copyright (c) 2017 Intel Corporation
  */
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <dm/device.h>
 #include <linux/errno.h>
diff --git a/drivers/mmc/tegra_mmc.c b/drivers/mmc/tegra_mmc.c
index 4cf183864340..039ea551e7b5 100644
--- a/drivers/mmc/tegra_mmc.c
+++ b/drivers/mmc/tegra_mmc.c
@@ -24,6 +24,7 @@
 #include <asm/arch/clock.h>
 #endif
 #include <linux/errno.h>
+#include <linux/types.h>
 
 struct tegra_mmc_plat {
 	struct mmc_config cfg;
diff --git a/drivers/mmc/tmio-common.c b/drivers/mmc/tmio-common.c
index 5e8076fcd972..be54dcf635a2 100644
--- a/drivers/mmc/tmio-common.c
+++ b/drivers/mmc/tmio-common.c
@@ -10,6 +10,7 @@
 #include <fdtdec.h>
 #include <mmc.h>
 #include <dm.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 #include <dm/device_compat.h>
 #include <dm/pinctrl.h>
@@ -20,6 +21,7 @@
 #include <linux/io.h>
 #include <linux/kernel.h>
 #include <linux/sizes.h>
+#include <linux/types.h>
 #include <power/regulator.h>
 #include <asm/unaligned.h>
 
diff --git a/drivers/mmc/tmio-common.h b/drivers/mmc/tmio-common.h
index 4160cbe0f5ca..f5e0b98d438d 100644
--- a/drivers/mmc/tmio-common.h
+++ b/drivers/mmc/tmio-common.h
@@ -7,8 +7,10 @@
 #ifndef __TMIO_COMMON_H__
 #define __TMIO_COMMON_H__
 
+#include <compiler.h>
 #include <stdbool.h>
 #include <linux/bitops.h>
+#include <linux/types.h>
 #define TMIO_SD_CMD			0x000	/* command */
 #define   TMIO_SD_CMD_NOSTOP		BIT(14)	/* No automatic CMD12 issue */
 #define   TMIO_SD_CMD_MULTI		BIT(13)	/* multiple block transfer */
diff --git a/drivers/mmc/uniphier-sd.c b/drivers/mmc/uniphier-sd.c
index 088e1d9a900f..6e6c267fcd27 100644
--- a/drivers/mmc/uniphier-sd.c
+++ b/drivers/mmc/uniphier-sd.c
@@ -16,6 +16,7 @@
 #include <linux/io.h>
 #include <linux/kernel.h>
 #include <linux/sizes.h>
+#include <linux/types.h>
 #include <power/regulator.h>
 #include <asm/unaligned.h>
 
diff --git a/drivers/mmc/xenon_sdhci.c b/drivers/mmc/xenon_sdhci.c
index 46c8db49547f..a0eb9f370b07 100644
--- a/drivers/mmc/xenon_sdhci.c
+++ b/drivers/mmc/xenon_sdhci.c
@@ -28,6 +28,7 @@
 #include <sdhci.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/mmc/zynq_sdhci.c b/drivers/mmc/zynq_sdhci.c
index 923a10f11ecd..d1beb3a2a57a 100644
--- a/drivers/mmc/zynq_sdhci.c
+++ b/drivers/mmc/zynq_sdhci.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <fdtdec.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include "mmc_private.h"
diff --git a/drivers/mtd/altera_qspi.c b/drivers/mtd/altera_qspi.c
index eb901c8c93bf..5615084e436f 100644
--- a/drivers/mtd/altera_qspi.c
+++ b/drivers/mtd/altera_qspi.c
@@ -17,6 +17,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c
index 5280fb96db18..60491629b416 100644
--- a/drivers/mtd/cfi_flash.c
+++ b/drivers/mtd/cfi_flash.c
@@ -17,6 +17,7 @@
 /* #define DEBUG	*/
 
 #include <common.h>
+#include <compiler.h>
 #include <console.h>
 #include <dm.h>
 #include <env.h>
@@ -39,6 +40,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <mtd/cfi_flash.h>
 #include <watchdog.h>
 
diff --git a/drivers/mtd/cfi_mtd.c b/drivers/mtd/cfi_mtd.c
index 02b4277bd235..dedb740a6506 100644
--- a/drivers/mtd/cfi_mtd.c
+++ b/drivers/mtd/cfi_mtd.c
@@ -10,6 +10,7 @@
 #include <malloc.h>
 #include <vsprintf.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <linux/errno.h>
 #include <linux/mtd/mtd.h>
diff --git a/drivers/mtd/hbmc-am654.c b/drivers/mtd/hbmc-am654.c
index 848c5ede4139..366d4b80e852 100644
--- a/drivers/mtd/hbmc-am654.c
+++ b/drivers/mtd/hbmc-am654.c
@@ -4,11 +4,13 @@
 // Author: Vignesh Raghavendra <vigneshr@ti.com>
 
 #include <common.h>
+#include <compiler.h>
 #include <stdbool.h>
 #include <asm/io.h>
 #include <dm.h>
 #include <regmap.h>
 #include <syscon.h>
+#include <asm/types.h>
 #include <dm/device_compat.h>
 #include <linux/errno.h>
 
diff --git a/drivers/mtd/jedec_flash.c b/drivers/mtd/jedec_flash.c
index 9456c9abbc3a..0edbe6064a1f 100644
--- a/drivers/mtd/jedec_flash.c
+++ b/drivers/mtd/jedec_flash.c
@@ -19,6 +19,7 @@
 #include <asm/io.h>
 #include <asm/byteorder.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #define P_ID_AMD_STD CFI_CMDSET_AMD_LEGACY
 
diff --git a/drivers/mtd/mtd_uboot.c b/drivers/mtd/mtd_uboot.c
index cdf4600cd31e..70242ce382ca 100644
--- a/drivers/mtd/mtd_uboot.c
+++ b/drivers/mtd/mtd_uboot.c
@@ -7,6 +7,7 @@
 #include <env.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <dm/device.h>
diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c
index b995fb8abab3..de624825478b 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 <stdbool.h>
 #include <vsprintf.h>
 #include <linux/bitops.h>
 #include <linux/bug.h>
@@ -35,6 +36,7 @@
 #include <ubi_uboot.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 #endif
 
 #include <linux/log2.h>
diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c
index ea31330bf112..d238788c17b7 100644
--- a/drivers/mtd/mtdpart.c
+++ b/drivers/mtd/mtdpart.c
@@ -21,6 +21,7 @@
 
 #include <common.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/bug.h>
diff --git a/drivers/mtd/mw_eeprom.c b/drivers/mtd/mw_eeprom.c
index 5d1a35732417..58b8d671c919 100644
--- a/drivers/mtd/mw_eeprom.c
+++ b/drivers/mtd/mw_eeprom.c
@@ -4,6 +4,7 @@
 #include <eeprom.h>
 #include <stdio.h>
 #include <asm/ic/ssi.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 /*
diff --git a/drivers/mtd/nand/raw/am335x_spl_bch.c b/drivers/mtd/nand/raw/am335x_spl_bch.c
index b6fc5f29c7a8..7b40689cc64d 100644
--- a/drivers/mtd/nand/raw/am335x_spl_bch.c
+++ b/drivers/mtd/nand/raw/am335x_spl_bch.c
@@ -10,10 +10,12 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <nand.h>
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <linux/mtd/nand_ecc.h>
+#include <linux/types.h>
 
 static int nand_ecc_pos[] = CONFIG_SYS_NAND_ECCPOS;
 static struct mtd_info *mtd;
diff --git a/drivers/mtd/nand/raw/arasan_nfc.c b/drivers/mtd/nand/raw/arasan_nfc.c
index c604db376c15..e56b0603867b 100644
--- a/drivers/mtd/nand/raw/arasan_nfc.c
+++ b/drivers/mtd/nand/raw/arasan_nfc.c
@@ -6,9 +6,12 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
diff --git a/drivers/mtd/nand/raw/atmel_nand.c b/drivers/mtd/nand/raw/atmel_nand.c
index 75c21ff7852e..78c3ab2dc06d 100644
--- a/drivers/mtd/nand/raw/atmel_nand.c
+++ b/drivers/mtd/nand/raw/atmel_nand.c
@@ -11,6 +11,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <log.h>
 #include <asm/gpio.h>
 #include <asm/arch/gpio.h>
@@ -22,6 +23,7 @@
 #include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <malloc.h>
 #include <nand.h>
diff --git a/drivers/mtd/nand/raw/atmel_nand_ecc.h b/drivers/mtd/nand/raw/atmel_nand_ecc.h
index 05eeedb3f841..1ece825186c2 100644
--- a/drivers/mtd/nand/raw/atmel_nand_ecc.h
+++ b/drivers/mtd/nand/raw/atmel_nand_ecc.h
@@ -7,6 +7,7 @@
 #ifndef ATMEL_NAND_ECC_H
 #define ATMEL_NAND_ECC_H
 
+#include <asm/types.h>
 #define ATMEL_ECC_CR		0x00			/* Control register */
 #define		ATMEL_ECC_RST		(1 << 0)		/* Reset parity */
 
diff --git a/drivers/mtd/nand/raw/brcmnand/bcm63158_nand.c b/drivers/mtd/nand/raw/brcmnand/bcm63158_nand.c
index acfe2ba0bd21..f07498fe2613 100644
--- a/drivers/mtd/nand/raw/brcmnand/bcm63158_nand.c
+++ b/drivers/mtd/nand/raw/brcmnand/bcm63158_nand.c
@@ -1,9 +1,12 @@
 // SPDX-License-Identifier: GPL-2.0+
 
 #include <common.h>
+#include <compiler.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <memalign.h>
 #include <nand.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/err.h>
 #include <linux/errno.h>
diff --git a/drivers/mtd/nand/raw/brcmnand/bcm6368_nand.c b/drivers/mtd/nand/raw/brcmnand/bcm6368_nand.c
index 4c886e1533f8..d17b80e507a6 100644
--- a/drivers/mtd/nand/raw/brcmnand/bcm6368_nand.c
+++ b/drivers/mtd/nand/raw/brcmnand/bcm6368_nand.c
@@ -1,9 +1,12 @@
 // SPDX-License-Identifier: GPL-2.0+
 
 #include <common.h>
+#include <compiler.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <memalign.h>
 #include <nand.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/io.h>
diff --git a/drivers/mtd/nand/raw/brcmnand/bcm68360_nand.c b/drivers/mtd/nand/raw/brcmnand/bcm68360_nand.c
index a649b1a89636..d93a11c0c98b 100644
--- a/drivers/mtd/nand/raw/brcmnand/bcm68360_nand.c
+++ b/drivers/mtd/nand/raw/brcmnand/bcm68360_nand.c
@@ -1,9 +1,12 @@
 // SPDX-License-Identifier: GPL-2.0+
 
 #include <common.h>
+#include <compiler.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <memalign.h>
 #include <nand.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/io.h>
diff --git a/drivers/mtd/nand/raw/brcmnand/bcm6838_nand.c b/drivers/mtd/nand/raw/brcmnand/bcm6838_nand.c
index 25bfe253f297..de19a16e61c8 100644
--- a/drivers/mtd/nand/raw/brcmnand/bcm6838_nand.c
+++ b/drivers/mtd/nand/raw/brcmnand/bcm6838_nand.c
@@ -1,9 +1,12 @@
 // SPDX-License-Identifier: GPL-2.0+
 
 #include <common.h>
+#include <compiler.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <memalign.h>
 #include <nand.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/err.h>
 #include <linux/errno.h>
diff --git a/drivers/mtd/nand/raw/brcmnand/bcm6858_nand.c b/drivers/mtd/nand/raw/brcmnand/bcm6858_nand.c
index 926c59eb1485..2d0bbea727c8 100644
--- a/drivers/mtd/nand/raw/brcmnand/bcm6858_nand.c
+++ b/drivers/mtd/nand/raw/brcmnand/bcm6858_nand.c
@@ -1,9 +1,12 @@
 // SPDX-License-Identifier: GPL-2.0+
 
 #include <common.h>
+#include <compiler.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <memalign.h>
 #include <nand.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/err.h>
 #include <linux/errno.h>
diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand.c b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
index b90f26978ffb..65159d9e0215 100644
--- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c
+++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
@@ -13,6 +13,8 @@
  */
 
 #include <common.h>
+#include <compiler.h>
+#include <stdbool.h>
 #include <time.h>
 #include <vsprintf.h>
 #include <asm/io.h>
@@ -32,6 +34,7 @@
 #include <asm/processor.h>
 #include <dm.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "brcmnand.h"
 #include "brcmnand_compat.h"
diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand.h b/drivers/mtd/nand/raw/brcmnand/brcmnand.h
index 2a48dfea90c1..90b24f95ca03 100644
--- a/drivers/mtd/nand/raw/brcmnand/brcmnand.h
+++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.h
@@ -3,6 +3,7 @@
 #ifndef __BRCMNAND_H__
 #define __BRCMNAND_H__
 
+#include <compiler.h>
 #include <stdbool.h>
 #include <linux/types.h>
 #include <linux/io.h>
diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand_compat.c b/drivers/mtd/nand/raw/brcmnand/brcmnand_compat.c
index d8d752d6080a..8ae0dbcf7b8f 100644
--- a/drivers/mtd/nand/raw/brcmnand/brcmnand_compat.c
+++ b/drivers/mtd/nand/raw/brcmnand/brcmnand_compat.c
@@ -6,6 +6,7 @@
 #include <stdarg.h>
 #include <vsprintf.h>
 #include <dm/devres.h>
+#include <linux/types.h>
 #include "brcmnand_compat.h"
 
 static char *devm_kvasprintf(struct udevice *dev, gfp_t gfp, const char *fmt,
diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand_compat.h b/drivers/mtd/nand/raw/brcmnand/brcmnand_compat.h
index 52711d4978b7..d7e80a000a79 100644
--- a/drivers/mtd/nand/raw/brcmnand/brcmnand_compat.h
+++ b/drivers/mtd/nand/raw/brcmnand/brcmnand_compat.h
@@ -6,6 +6,8 @@
 struct clk;
 struct udevice;
 
+#include <linux/types.h>
+
 char *devm_kasprintf(struct udevice *dev, gfp_t gfp, const char *fmt, ...);
 
 #endif /* __BRCMNAND_COMPAT_H */
diff --git a/drivers/mtd/nand/raw/davinci_nand.c b/drivers/mtd/nand/raw/davinci_nand.c
index c00fc65b6a0d..fea7147054a7 100644
--- a/drivers/mtd/nand/raw/davinci_nand.c
+++ b/drivers/mtd/nand/raw/davinci_nand.c
@@ -29,6 +29,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <log.h>
 #include <asm/io.h>
 #include <nand.h>
@@ -37,6 +38,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 /* Definitions for 4-bit hardware ECC */
 #define NAND_TIMEOUT			10240
diff --git a/drivers/mtd/nand/raw/denali.c b/drivers/mtd/nand/raw/denali.c
index 0e84f37784d7..92361e637bc7 100644
--- a/drivers/mtd/nand/raw/denali.c
+++ b/drivers/mtd/nand/raw/denali.c
@@ -25,6 +25,7 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/rawnand.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "denali.h"
 
diff --git a/drivers/mtd/nand/raw/denali.h b/drivers/mtd/nand/raw/denali.h
index 6cd02b2e26ee..afc018809982 100644
--- a/drivers/mtd/nand/raw/denali.h
+++ b/drivers/mtd/nand/raw/denali.h
@@ -7,6 +7,7 @@
 #ifndef __DENALI_H__
 #define __DENALI_H__
 
+#include <compiler.h>
 #include <linux/bitops.h>
 #include <linux/mtd/rawnand.h>
 #include <linux/types.h>
diff --git a/drivers/mtd/nand/raw/denali_spl.c b/drivers/mtd/nand/raw/denali_spl.c
index ed077fd06bc0..ad164139ed51 100644
--- a/drivers/mtd/nand/raw/denali_spl.c
+++ b/drivers/mtd/nand/raw/denali_spl.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <log.h>
 #include <asm/io.h>
 #include <asm/unaligned.h>
@@ -13,6 +14,7 @@
 #include <linux/kernel.h>
 #include <linux/mtd/rawnand.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "denali.h"
 
 #define DENALI_MAP01		(1 << 26)	/* read/write pages in PIO */
diff --git a/drivers/mtd/nand/raw/fsl_elbc_nand.c b/drivers/mtd/nand/raw/fsl_elbc_nand.c
index eb95cb003038..0c0b1dec55de 100644
--- a/drivers/mtd/nand/raw/fsl_elbc_nand.c
+++ b/drivers/mtd/nand/raw/fsl_elbc_nand.c
@@ -9,12 +9,14 @@
 
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <malloc.h>
 #include <nand.h>
 #include <stdio.h>
 #include <time.h>
 #include <dm/devres.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/rawnand.h>
diff --git a/drivers/mtd/nand/raw/fsl_elbc_spl.c b/drivers/mtd/nand/raw/fsl_elbc_spl.c
index e8b9f40f3b0a..0564d270e06a 100644
--- a/drivers/mtd/nand/raw/fsl_elbc_spl.c
+++ b/drivers/mtd/nand/raw/fsl_elbc_spl.c
@@ -15,6 +15,7 @@
 #include <asm/io.h>
 #include <asm/fsl_lbc.h>
 #include <nand.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_MPC83xx
 #include "../../../arch/powerpc/cpu/mpc83xx/elbc/elbc.h"
diff --git a/drivers/mtd/nand/raw/fsl_ifc_nand.c b/drivers/mtd/nand/raw/fsl_ifc_nand.c
index 291dda8fb480..720f8fcbd35d 100644
--- a/drivers/mtd/nand/raw/fsl_ifc_nand.c
+++ b/drivers/mtd/nand/raw/fsl_ifc_nand.c
@@ -8,12 +8,14 @@
 
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <malloc.h>
 #include <nand.h>
 #include <stdio.h>
 #include <time.h>
 #include <dm/devres.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/rawnand.h>
diff --git a/drivers/mtd/nand/raw/fsl_ifc_spl.c b/drivers/mtd/nand/raw/fsl_ifc_spl.c
index cf09fce3fbbf..180fa82ddb71 100644
--- a/drivers/mtd/nand/raw/fsl_ifc_spl.c
+++ b/drivers/mtd/nand/raw/fsl_ifc_spl.c
@@ -16,6 +16,7 @@
 #ifdef CONFIG_CHAIN_OF_TRUST
 #include <fsl_validate.h>
 #endif
+#include <linux/types.h>
 
 static inline int is_blank(uchar *addr, int page_size)
 {
diff --git a/drivers/mtd/nand/raw/fsl_upm.c b/drivers/mtd/nand/raw/fsl_upm.c
index 6c86a7e76712..be9d40a07a05 100644
--- a/drivers/mtd/nand/raw/fsl_upm.c
+++ b/drivers/mtd/nand/raw/fsl_upm.c
@@ -6,6 +6,7 @@
  *                    Anton Vorontsov <avorontsov@ru.mvista.com>
  */
 
+#include <compiler.h>
 #include <config.h>
 #include <common.h>
 #include <log.h>
@@ -15,6 +16,7 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/fsl_upm.h>
 #include <nand.h>
+#include <linux/types.h>
 
 static void fsl_upm_start_pattern(struct fsl_upm *upm, u32 pat_offset)
 {
diff --git a/drivers/mtd/nand/raw/fsmc_nand.c b/drivers/mtd/nand/raw/fsmc_nand.c
index 5994c321cacc..8fcf00f91075 100644
--- a/drivers/mtd/nand/raw/fsmc_nand.c
+++ b/drivers/mtd/nand/raw/fsmc_nand.c
@@ -8,6 +8,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <nand.h>
 #include <stdio.h>
 #include <time.h>
@@ -20,6 +21,7 @@
 #include <linux/mtd/fsmc_nand.h>
 #include <asm/arch/hardware.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static u32 fsmc_version;
 static struct fsmc_regs *const fsmc_regs_p = (struct fsmc_regs *)
diff --git a/drivers/mtd/nand/raw/kb9202_nand.c b/drivers/mtd/nand/raw/kb9202_nand.c
index 0f68f1cd867c..4b759dd25e62 100644
--- a/drivers/mtd/nand/raw/kb9202_nand.c
+++ b/drivers/mtd/nand/raw/kb9202_nand.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <asm/arch/AT91RM9200.h>
 #include <asm/arch/hardware.h>
+#include <linux/types.h>
 
 #include <nand.h>
 
diff --git a/drivers/mtd/nand/raw/kirkwood_nand.c b/drivers/mtd/nand/raw/kirkwood_nand.c
index 0757fa840b88..6b0cd581eade 100644
--- a/drivers/mtd/nand/raw/kirkwood_nand.c
+++ b/drivers/mtd/nand/raw/kirkwood_nand.c
@@ -10,6 +10,7 @@
 #include <asm/arch/soc.h>
 #include <asm/arch/mpp.h>
 #include <nand.h>
+#include <asm/types.h>
 
 /* NAND Flash Soc registers */
 struct kwnandf_registers {
diff --git a/drivers/mtd/nand/raw/kmeter1_nand.c b/drivers/mtd/nand/raw/kmeter1_nand.c
index cf33f2863e1b..c2252464ad64 100644
--- a/drivers/mtd/nand/raw/kmeter1_nand.c
+++ b/drivers/mtd/nand/raw/kmeter1_nand.c
@@ -8,6 +8,7 @@
 #include <nand.h>
 #include <asm/io.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 #define CONFIG_NAND_MODE_REG	(void *)(CONFIG_SYS_NAND_BASE + 0x20000)
 #define CONFIG_NAND_DATA_REG	(void *)(CONFIG_SYS_NAND_BASE + 0x30000)
diff --git a/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c b/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c
index 368ce3e54edf..af93baf38bac 100644
--- a/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c
+++ b/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c
@@ -13,6 +13,8 @@
  *
  * Consequently, pages with meaningful in-band data are written with
  * blank (all-ones) out-of-band data and a valid ECC, and any later
+#include <compiler.h>
+#include <linux/types.h>
  * out-of-band data write will void the ECC.
  *
  * Therefore, code which reads such late-written out-of-band data
diff --git a/drivers/mtd/nand/raw/lpc32xx_nand_slc.c b/drivers/mtd/nand/raw/lpc32xx_nand_slc.c
index 07a44a565ad3..018acbdf8a03 100644
--- a/drivers/mtd/nand/raw/lpc32xx_nand_slc.c
+++ b/drivers/mtd/nand/raw/lpc32xx_nand_slc.c
@@ -11,6 +11,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <log.h>
 #include <nand.h>
 #include <linux/bug.h>
@@ -24,6 +25,7 @@
 #include <asm/arch/dma.h>
 #include <asm/arch/cpu.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 struct lpc32xx_nand_slc_regs {
 	u32 data;
diff --git a/drivers/mtd/nand/raw/mxc_nand.c b/drivers/mtd/nand/raw/mxc_nand.c
index f012f7329c9d..61da84f7e79c 100644
--- a/drivers/mtd/nand/raw/mxc_nand.c
+++ b/drivers/mtd/nand/raw/mxc_nand.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <log.h>
 #include <nand.h>
 #include <linux/delay.h>
@@ -18,6 +19,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 #include "mxc_nand.h"
 
 #define DRIVER_NAME "mxc_nand"
diff --git a/drivers/mtd/nand/raw/mxc_nand.h b/drivers/mtd/nand/raw/mxc_nand.h
index 1c7f3a2e227d..fd008b294b61 100644
--- a/drivers/mtd/nand/raw/mxc_nand.h
+++ b/drivers/mtd/nand/raw/mxc_nand.h
@@ -43,6 +43,7 @@
 #else
 #error "MXC NFC implementation not supported"
 #endif
+#include <asm/types.h>
 #define is_mxc_nfc_3()		is_mxc_nfc_32()
 
 #if defined(MXC_NFC_V1)
diff --git a/drivers/mtd/nand/raw/mxc_nand_spl.c b/drivers/mtd/nand/raw/mxc_nand_spl.c
index c3e136899f92..22bd476479ad 100644
--- a/drivers/mtd/nand/raw/mxc_nand_spl.c
+++ b/drivers/mtd/nand/raw/mxc_nand_spl.c
@@ -17,6 +17,7 @@
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include "mxc_nand.h"
 
 #if defined(MXC_NFC_V1) || defined(MXC_NFC_V2_1)
diff --git a/drivers/mtd/nand/raw/mxs_nand.c b/drivers/mtd/nand/raw/mxs_nand.c
index 8ab4dab32c02..d6e1273a74cf 100644
--- a/drivers/mtd/nand/raw/mxs_nand.c
+++ b/drivers/mtd/nand/raw/mxs_nand.c
@@ -16,6 +16,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <dm.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/cache.h>
 #include <linux/kernel.h>
diff --git a/drivers/mtd/nand/raw/mxs_nand_spl.c b/drivers/mtd/nand/raw/mxs_nand_spl.c
index 0fe538e7d6d8..e7e5683d90f7 100644
--- a/drivers/mtd/nand/raw/mxs_nand_spl.c
+++ b/drivers/mtd/nand/raw/mxs_nand_spl.c
@@ -17,6 +17,7 @@
 #include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static struct mtd_info *mtd;
 static struct nand_chip nand_chip;
diff --git a/drivers/mtd/nand/raw/nand.c b/drivers/mtd/nand/raw/nand.c
index 486c1b4a8bdc..b43f3f5d9ca4 100644
--- a/drivers/mtd/nand/raw/nand.c
+++ b/drivers/mtd/nand/raw/nand.c
@@ -6,11 +6,13 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <nand.h>
 #include <errno.h>
 #include <vsprintf.h>
 #include <linux/errno.h>
 #include <linux/mtd/concat.h>
+#include <linux/types.h>
 
 #ifndef CONFIG_SYS_NAND_BASE_LIST
 #define CONFIG_SYS_NAND_BASE_LIST { CONFIG_SYS_NAND_BASE }
diff --git a/drivers/mtd/nand/raw/nand_base.c b/drivers/mtd/nand/raw/nand_base.c
index 115f5a771bed..79e872b0ca17 100644
--- a/drivers/mtd/nand/raw/nand_base.c
+++ b/drivers/mtd/nand/raw/nand_base.c
@@ -34,6 +34,7 @@
 #endif
 #include <log.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <time.h>
 #include <watchdog.h>
 #include <asm/global_data.h>
@@ -55,6 +56,7 @@
 #include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /* Define default oob placement schemes for large and small page devices */
 #ifndef CONFIG_SYS_NAND_DRIVER_ECC_LAYOUT
diff --git a/drivers/mtd/nand/raw/nand_bbt.c b/drivers/mtd/nand/raw/nand_bbt.c
index 22454253f3c4..98d8db5bfcc9 100644
--- a/drivers/mtd/nand/raw/nand_bbt.c
+++ b/drivers/mtd/nand/raw/nand_bbt.c
@@ -71,6 +71,7 @@
 #include <linux/bitops.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define BBT_BLOCK_GOOD		0x00
 #define BBT_BLOCK_WORN		0x01
diff --git a/drivers/mtd/nand/raw/nand_ecc.c b/drivers/mtd/nand/raw/nand_ecc.c
index 2bc329be1a3b..d31fd2d0c4b7 100644
--- a/drivers/mtd/nand/raw/nand_ecc.c
+++ b/drivers/mtd/nand/raw/nand_ecc.c
@@ -23,6 +23,7 @@
  */
 
 #include <common.h>
+#include <linux/types.h>
 
 #include <linux/errno.h>
 #include <linux/mtd/mtd.h>
diff --git a/drivers/mtd/nand/raw/nand_spl_loaders.c b/drivers/mtd/nand/raw/nand_spl_loaders.c
index 75ded89893a4..08797e0d40a1 100644
--- a/drivers/mtd/nand/raw/nand_spl_loaders.c
+++ b/drivers/mtd/nand/raw/nand_spl_loaders.c
@@ -1,5 +1,6 @@
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 int nand_spl_load_image(uint32_t offs, unsigned int size, void *dst)
 {
 	unsigned int block, lastblock;
diff --git a/drivers/mtd/nand/raw/nand_spl_simple.c b/drivers/mtd/nand/raw/nand_spl_simple.c
index 09e053541a9d..1f1261fd9486 100644
--- a/drivers/mtd/nand/raw/nand_spl_simple.c
+++ b/drivers/mtd/nand/raw/nand_spl_simple.c
@@ -5,9 +5,11 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <nand.h>
 #include <asm/io.h>
 #include <linux/mtd/nand_ecc.h>
+#include <linux/types.h>
 
 static int nand_ecc_pos[] = CONFIG_SYS_NAND_ECCPOS;
 static struct mtd_info *mtd;
diff --git a/drivers/mtd/nand/raw/nand_util.c b/drivers/mtd/nand/raw/nand_util.c
index f753970d9e78..95169503c2ce 100644
--- a/drivers/mtd/nand/raw/nand_util.c
+++ b/drivers/mtd/nand/raw/nand_util.c
@@ -30,6 +30,7 @@
 #include <dm/devres.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <linux/errno.h>
 #include <linux/mtd/mtd.h>
diff --git a/drivers/mtd/nand/raw/omap_elm.c b/drivers/mtd/nand/raw/omap_elm.c
index 87368743a9a0..87dd2feccd59 100644
--- a/drivers/mtd/nand/raw/omap_elm.c
+++ b/drivers/mtd/nand/raw/omap_elm.c
@@ -15,6 +15,7 @@
 #include <common.h>
 #include <stdio.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/mtd/omap_elm.h>
 #include <asm/arch/hardware.h>
diff --git a/drivers/mtd/nand/raw/omap_gpmc.c b/drivers/mtd/nand/raw/omap_gpmc.c
index 2863b1de1b63..f83cee142126 100644
--- a/drivers/mtd/nand/raw/omap_gpmc.c
+++ b/drivers/mtd/nand/raw/omap_gpmc.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <log.h>
 #include <stdio.h>
 #include <asm/io.h>
@@ -17,6 +18,7 @@
 #include <nand.h>
 #include <linux/mtd/omap_elm.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define BADBLOCK_MARKER_LENGTH	2
 #define SECTOR_BYTES		512
diff --git a/drivers/mtd/nand/raw/pxa3xx_nand.c b/drivers/mtd/nand/raw/pxa3xx_nand.c
index 8678866d3dd0..7287cc32f436 100644
--- a/drivers/mtd/nand/raw/pxa3xx_nand.c
+++ b/drivers/mtd/nand/raw/pxa3xx_nand.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <malloc.h>
 #include <fdtdec.h>
 #include <nand.h>
diff --git a/drivers/mtd/nand/raw/pxa3xx_nand.h b/drivers/mtd/nand/raw/pxa3xx_nand.h
index d7304d0b34e9..5d8c886855fb 100644
--- a/drivers/mtd/nand/raw/pxa3xx_nand.h
+++ b/drivers/mtd/nand/raw/pxa3xx_nand.h
@@ -4,6 +4,7 @@
 #include <stdbool.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
+#include <linux/types.h>
 
 struct pxa3xx_nand_timing {
 	unsigned int	tCH;  /* Enable signal hold time */
diff --git a/drivers/mtd/nand/raw/stm32_fmc2_nand.c b/drivers/mtd/nand/raw/stm32_fmc2_nand.c
index e5dbb970f1b4..fe4c8a0889e7 100644
--- a/drivers/mtd/nand/raw/stm32_fmc2_nand.c
+++ b/drivers/mtd/nand/raw/stm32_fmc2_nand.c
@@ -6,10 +6,13 @@
 
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
 #include <nand.h>
 #include <reset.h>
+#include <stdbool.h>
+#include <asm/types.h>
 #include <linux/bitfield.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/drivers/mtd/nand/raw/sunxi_nand.c b/drivers/mtd/nand/raw/sunxi_nand.c
index 025f18ad49dd..4d17d138619d 100644
--- a/drivers/mtd/nand/raw/sunxi_nand.c
+++ b/drivers/mtd/nand/raw/sunxi_nand.c
@@ -25,10 +25,12 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <fdtdec.h>
 #include <malloc.h>
 #include <memalign.h>
 #include <nand.h>
+#include <stdbool.h>
 #include <time.h>
 #include <asm/global_data.h>
 #include <dm/device_compat.h>
@@ -39,6 +41,7 @@
 #include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <linux/kernel.h>
 #include <linux/mtd/mtd.h>
diff --git a/drivers/mtd/nand/raw/sunxi_nand_spl.c b/drivers/mtd/nand/raw/sunxi_nand_spl.c
index e24bd384c267..7ad486c5dbd3 100644
--- a/drivers/mtd/nand/raw/sunxi_nand_spl.c
+++ b/drivers/mtd/nand/raw/sunxi_nand_spl.c
@@ -4,6 +4,7 @@
  * Copyright (c) 2015, AW-SOM Technologies <www.aw-som.com>
  */
 
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/io.h>
@@ -16,6 +17,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /* registers */
 #define NFC_CTL                    0x00000000
diff --git a/drivers/mtd/nand/raw/tegra_nand.c b/drivers/mtd/nand/raw/tegra_nand.c
index ace59249b9ef..c8a31f29688f 100644
--- a/drivers/mtd/nand/raw/tegra_nand.c
+++ b/drivers/mtd/nand/raw/tegra_nand.c
@@ -26,6 +26,7 @@
 #include <dm.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "tegra_nand.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/mtd/nand/raw/tegra_nand.h b/drivers/mtd/nand/raw/tegra_nand.h
index 77401606617d..e65a36851ca2 100644
--- a/drivers/mtd/nand/raw/tegra_nand.h
+++ b/drivers/mtd/nand/raw/tegra_nand.h
@@ -4,6 +4,7 @@
  */
 
 /* register offset */
+#include <asm/types.h>
 #define COMMAND_0		0x00
 #define CMD_GO			(1 << 31)
 #define CMD_CLE			(1 << 30)
diff --git a/drivers/mtd/nand/raw/vf610_nfc.c b/drivers/mtd/nand/raw/vf610_nfc.c
index 49cf29a7abe4..df86cc6b48d9 100644
--- a/drivers/mtd/nand/raw/vf610_nfc.c
+++ b/drivers/mtd/nand/raw/vf610_nfc.c
@@ -22,6 +22,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <malloc.h>
 #include <stdio.h>
 #include <time.h>
@@ -30,6 +31,7 @@
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/rawnand.h>
diff --git a/drivers/mtd/nand/raw/zynq_nand.c b/drivers/mtd/nand/raw/zynq_nand.c
index 6af6b7bd844f..2b177a4cf837 100644
--- a/drivers/mtd/nand/raw/zynq_nand.c
+++ b/drivers/mtd/nand/raw/zynq_nand.c
@@ -7,10 +7,13 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <nand.h>
diff --git a/drivers/mtd/nand/spi/core.c b/drivers/mtd/nand/spi/core.c
index 99622a335a3d..123cb6dc1236 100644
--- a/drivers/mtd/nand/spi/core.c
+++ b/drivers/mtd/nand/spi/core.c
@@ -24,6 +24,7 @@
 #include <errno.h>
 #include <spi.h>
 #include <spi-mem.h>
+#include <stdbool.h>
 #include <time.h>
 #include <vsprintf.h>
 #include <dm/device_compat.h>
@@ -34,6 +35,7 @@
 #include <linux/mtd/spinand.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #endif
 
 /* SPI NAND index visible in MTD names */
diff --git a/drivers/mtd/nand/spi/gigadevice.c b/drivers/mtd/nand/spi/gigadevice.c
index 465f18642b06..c291f02b9b58 100644
--- a/drivers/mtd/nand/spi/gigadevice.c
+++ b/drivers/mtd/nand/spi/gigadevice.c
@@ -11,6 +11,7 @@
 #include <linux/device.h>
 #include <linux/kernel.h>
 #endif
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/mtd/spinand.h>
 
diff --git a/drivers/mtd/nand/spi/macronix.c b/drivers/mtd/nand/spi/macronix.c
index 83f9daaf5791..0929d2b5dc29 100644
--- a/drivers/mtd/nand/spi/macronix.c
+++ b/drivers/mtd/nand/spi/macronix.c
@@ -10,6 +10,7 @@
 #include <linux/device.h>
 #include <linux/kernel.h>
 #endif
+#include <asm/types.h>
 #include <linux/bug.h>
 #include <linux/errno.h>
 #include <linux/mtd/spinand.h>
diff --git a/drivers/mtd/nand/spi/micron.c b/drivers/mtd/nand/spi/micron.c
index 5fde4a78d23d..b2978b59a118 100644
--- a/drivers/mtd/nand/spi/micron.c
+++ b/drivers/mtd/nand/spi/micron.c
@@ -11,6 +11,7 @@
 #include <linux/device.h>
 #include <linux/kernel.h>
 #endif
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/mtd/spinand.h>
diff --git a/drivers/mtd/nand/spi/toshiba.c b/drivers/mtd/nand/spi/toshiba.c
index d0b003d2957d..6895f3648000 100644
--- a/drivers/mtd/nand/spi/toshiba.c
+++ b/drivers/mtd/nand/spi/toshiba.c
@@ -11,6 +11,7 @@
 #include <linux/device.h>
 #include <linux/kernel.h>
 #endif
+#include <asm/types.h>
 #include <linux/bug.h>
 #include <linux/errno.h>
 #include <linux/mtd/spinand.h>
diff --git a/drivers/mtd/nand/spi/winbond.c b/drivers/mtd/nand/spi/winbond.c
index 4e1c8883b383..ac7fc3d13113 100644
--- a/drivers/mtd/nand/spi/winbond.c
+++ b/drivers/mtd/nand/spi/winbond.c
@@ -12,6 +12,7 @@
 #include <linux/device.h>
 #include <linux/kernel.h>
 #endif
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/mtd/spinand.h>
diff --git a/drivers/mtd/onenand/onenand_base.c b/drivers/mtd/onenand/onenand_base.c
index f576aea331ca..80fb722e3574 100644
--- a/drivers/mtd/onenand/onenand_base.c
+++ b/drivers/mtd/onenand/onenand_base.c
@@ -20,6 +20,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <log.h>
 #include <time.h>
 #include <vsprintf.h>
@@ -31,6 +32,7 @@
 #include <linux/mtd/mtd.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "linux/mtd/flashchip.h"
 #include <linux/mtd/onenand.h>
 
diff --git a/drivers/mtd/onenand/onenand_bbt.c b/drivers/mtd/onenand/onenand_bbt.c
index 026280e5e629..0a73fe5afbb1 100644
--- a/drivers/mtd/onenand/onenand_bbt.c
+++ b/drivers/mtd/onenand/onenand_bbt.c
@@ -22,6 +22,7 @@
 #include <malloc.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <linux/errno.h>
 
diff --git a/drivers/mtd/onenand/onenand_spl.c b/drivers/mtd/onenand/onenand_spl.c
index 69c529e658de..715938220593 100644
--- a/drivers/mtd/onenand/onenand_spl.c
+++ b/drivers/mtd/onenand/onenand_spl.c
@@ -14,6 +14,7 @@
 #include <linux/mtd/onenand_regs.h>
 #include <onenand_uboot.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /*
  * Device geometry:
diff --git a/drivers/mtd/onenand/samsung.c b/drivers/mtd/onenand/samsung.c
index be6c8e1def39..7f6f9a450263 100644
--- a/drivers/mtd/onenand/samsung.c
+++ b/drivers/mtd/onenand/samsung.c
@@ -10,6 +10,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <malloc.h>
 #include <stdio.h>
 #include <linux/compat.h>
@@ -19,6 +20,7 @@
 #include <linux/mtd/samsung_onenand.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <asm/io.h>
 #include <linux/errno.h>
diff --git a/drivers/mtd/pic32_flash.c b/drivers/mtd/pic32_flash.c
index 3daa76f949ab..3c36297d0461 100644
--- a/drivers/mtd/pic32_flash.c
+++ b/drivers/mtd/pic32_flash.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <dm.h>
 #include <fdt_support.h>
@@ -17,6 +18,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <mach/pic32.h>
 #include <wait_bit.h>
 
diff --git a/drivers/mtd/renesas_rpc_hf.c b/drivers/mtd/renesas_rpc_hf.c
index 60f8dbc676a7..fd305bc10d74 100644
--- a/drivers/mtd/renesas_rpc_hf.c
+++ b/drivers/mtd/renesas_rpc_hf.c
@@ -8,6 +8,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <malloc.h>
 #include <stdbool.h>
 #include <stdio.h>
@@ -24,6 +25,7 @@
 #include <wait_bit.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <mtd/cfi_flash.h>
 
 #define RPC_CMNCR		0x0000	/* R/W */
diff --git a/drivers/mtd/spi/fsl_espi_spl.c b/drivers/mtd/spi/fsl_espi_spl.c
index 5a3b5abd5c7d..802c1f51b4d3 100644
--- a/drivers/mtd/spi/fsl_espi_spl.c
+++ b/drivers/mtd/spi/fsl_espi_spl.c
@@ -10,6 +10,7 @@
 #include <malloc.h>
 #include <stdio.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define ESPI_BOOT_IMAGE_SIZE	0x48
 #define ESPI_BOOT_IMAGE_ADDR	0x50
diff --git a/drivers/mtd/spi/sandbox.c b/drivers/mtd/spi/sandbox.c
index 424c74d74fdd..8d70f7a82356 100644
--- a/drivers/mtd/spi/sandbox.c
+++ b/drivers/mtd/spi/sandbox.c
@@ -20,6 +20,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <spi_flash.h>
 #include "sf_internal.h"
diff --git a/drivers/mtd/spi/sf-uclass.c b/drivers/mtd/spi/sf-uclass.c
index 354d7b47f0f9..47bb546ff11d 100644
--- a/drivers/mtd/spi/sf-uclass.c
+++ b/drivers/mtd/spi/sf-uclass.c
@@ -13,6 +13,7 @@
 #include <asm/global_data.h>
 #include <dm/device-internal.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "sf_internal.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/mtd/spi/sf_dataflash.c b/drivers/mtd/spi/sf_dataflash.c
index 558cf39ba672..e7e57e59d0b0 100644
--- a/drivers/mtd/spi/sf_dataflash.c
+++ b/drivers/mtd/spi/sf_dataflash.c
@@ -24,6 +24,7 @@
 #include <linux/kernel.h>
 #include <linux/math64.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "sf_internal.h"
 
diff --git a/drivers/mtd/spi/sf_mtd.c b/drivers/mtd/spi/sf_mtd.c
index cf9d79c95572..6f7c7fe9e46c 100644
--- a/drivers/mtd/spi/sf_mtd.c
+++ b/drivers/mtd/spi/sf_mtd.c
@@ -13,6 +13,7 @@
 #include <linux/mtd/mtd.h>
 #include <spi_flash.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static struct mtd_info sf_mtd_info;
 static bool sf_mtd_registered;
diff --git a/drivers/mtd/spi/sf_probe.c b/drivers/mtd/spi/sf_probe.c
index dd5e624f4b2c..67041de87c65 100644
--- a/drivers/mtd/spi/sf_probe.c
+++ b/drivers/mtd/spi/sf_probe.c
@@ -17,6 +17,7 @@
 #include <stdio.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "sf_internal.h"
 
diff --git a/drivers/mtd/spi/spi-nor-core.c b/drivers/mtd/spi/spi-nor-core.c
index b11c61ee9c9a..b72715b3d0ac 100644
--- a/drivers/mtd/spi/spi-nor-core.c
+++ b/drivers/mtd/spi/spi-nor-core.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <display_options.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <dm/device_compat.h>
@@ -25,6 +26,7 @@
 #include <linux/printk.h>
 #include <linux/sizes.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/spi-nor.h>
diff --git a/drivers/mtd/spi/spi-nor-tiny.c b/drivers/mtd/spi/spi-nor-tiny.c
index 323897d20e83..63f2bd54bbc5 100644
--- a/drivers/mtd/spi/spi-nor-tiny.c
+++ b/drivers/mtd/spi/spi-nor-tiny.c
@@ -11,6 +11,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <dm/device_compat.h>
@@ -22,6 +23,7 @@
 #include <linux/printk.h>
 #include <linux/sizes.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/spi-nor.h>
diff --git a/drivers/mtd/st_smi.c b/drivers/mtd/st_smi.c
index 6488897b4380..9ed46e137b57 100644
--- a/drivers/mtd/st_smi.c
+++ b/drivers/mtd/st_smi.c
@@ -13,6 +13,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/mtd/st_smi.h>
+#include <linux/types.h>
 
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
diff --git a/drivers/mtd/stm32_flash.c b/drivers/mtd/stm32_flash.c
index 703afc7a07eb..f47976a32380 100644
--- a/drivers/mtd/stm32_flash.c
+++ b/drivers/mtd/stm32_flash.c
@@ -9,6 +9,7 @@
 #include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/stm32.h>
+#include <linux/types.h>
 #include "stm32_flash.h"
 
 flash_info_t flash_info[CONFIG_SYS_MAX_FLASH_BANKS];
diff --git a/drivers/mtd/stm32_flash.h b/drivers/mtd/stm32_flash.h
index 8cb81ef68c75..d8a95006d9ee 100644
--- a/drivers/mtd/stm32_flash.h
+++ b/drivers/mtd/stm32_flash.h
@@ -1,3 +1,4 @@
+#include <asm/types.h>
 struct stm32_flash_regs {
 	u32 acr;
 	u32 key;
diff --git a/drivers/mtd/ubi/attach.c b/drivers/mtd/ubi/attach.c
index 2fdf3dbc6583..f3423fc2b1a1 100644
--- a/drivers/mtd/ubi/attach.c
+++ b/drivers/mtd/ubi/attach.c
@@ -11,6 +11,7 @@
  * This sub-system is responsible for attaching MTD devices and it also
  * implements flash media scanning.
  *
+#include <linux/types.h>
  * The attaching information is represented by a &struct ubi_attach_info'
  * object. Information about volumes is represented by &struct ubi_ainf_volume
  * objects which are kept in volume RB-tree with root at the @volumes field.
diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c
index f0f63ae7df03..e06f79e20f26 100644
--- a/drivers/mtd/ubi/build.c
+++ b/drivers/mtd/ubi/build.c
@@ -31,12 +31,14 @@
 #include <linux/slab.h>
 #include <linux/major.h>
 #else
+#include <stdbool.h>
 #include <vsprintf.h>
 #include <linux/bug.h>
 #include <linux/errno.h>
 #include <linux/log2.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #endif
 #include <linux/err.h>
 #include <ubi_uboot.h>
diff --git a/drivers/mtd/ubi/crc32table.h b/drivers/mtd/ubi/crc32table.h
index 02ce6fd90173..3b18c1833821 100644
--- a/drivers/mtd/ubi/crc32table.h
+++ b/drivers/mtd/ubi/crc32table.h
@@ -1,5 +1,6 @@
 /* this file is generated - do not edit */
 
+#include <asm/types.h>
 static const u32 crc32table_le[] = {
 tole(0x00000000L), tole(0x77073096L), tole(0xee0e612cL), tole(0x990951baL),
 tole(0x076dc419L), tole(0x706af48fL), tole(0xe963a535L), tole(0x9e6495a3L),
diff --git a/drivers/mtd/ubi/debug.c b/drivers/mtd/ubi/debug.c
index 705a05ae77d9..b095abb878d2 100644
--- a/drivers/mtd/ubi/debug.c
+++ b/drivers/mtd/ubi/debug.c
@@ -14,6 +14,7 @@
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "ubi.h"
 #ifndef __UBOOT__
 #include <linux/debugfs.h>
diff --git a/drivers/mtd/ubi/eba.c b/drivers/mtd/ubi/eba.c
index 7f797c517b2a..0cf5a6914dbb 100644
--- a/drivers/mtd/ubi/eba.c
+++ b/drivers/mtd/ubi/eba.c
@@ -18,6 +18,7 @@
  * accessing a logical eraseblock it is locked for reading or writing. The
  * per-logical eraseblock locking is implemented by means of the lock tree. The
  * lock tree is an RB-tree which refers all the currently locked logical
+#include <linux/types.h>
  * eraseblocks. The lock tree elements are &struct ubi_ltree_entry objects.
  * They are indexed by (@vol_id, @lnum) pairs.
  *
diff --git a/drivers/mtd/ubi/fastmap.c b/drivers/mtd/ubi/fastmap.c
index 38983fb7356b..0e01f06c8490 100644
--- a/drivers/mtd/ubi/fastmap.c
+++ b/drivers/mtd/ubi/fastmap.c
@@ -20,6 +20,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #endif
 
 #include <linux/compat.h>
diff --git a/drivers/mtd/ubi/io.c b/drivers/mtd/ubi/io.c
index e5dafaf5ff6c..9076707baef5 100644
--- a/drivers/mtd/ubi/io.c
+++ b/drivers/mtd/ubi/io.c
@@ -66,6 +66,7 @@
  * 512-byte chunks, we have to allocate one more buffer and copy our VID header
  * to offset 448 of this buffer.
  *
+#include <linux/types.h>
  * The I/O sub-system does the following trick in order to avoid this extra
  * copy. It always allocates a @ubi->vid_hdr_alsize bytes buffer for the VID
  * header and returns a pointer to offset @ubi->vid_hdr_shift of this buffer.
diff --git a/drivers/mtd/ubi/misc.c b/drivers/mtd/ubi/misc.c
index 6574760288d5..a5dcd9dd5688 100644
--- a/drivers/mtd/ubi/misc.c
+++ b/drivers/mtd/ubi/misc.c
@@ -12,6 +12,7 @@
 #include <ubi_uboot.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include "ubi.h"
 
 /**
diff --git a/drivers/mtd/ubi/ubi-media.h b/drivers/mtd/ubi/ubi-media.h
index 4af85c4247bd..9d0e1d7889f9 100644
--- a/drivers/mtd/ubi/ubi-media.h
+++ b/drivers/mtd/ubi/ubi-media.h
@@ -11,6 +11,8 @@
 
 /*
  * This file defines the layout of UBI headers and all the other UBI on-flash
+#include <compiler.h>
+#include <linux/types.h>
  * data structures.
  */
 
diff --git a/drivers/mtd/ubi/upd.c b/drivers/mtd/ubi/upd.c
index fff703a0f6c2..da5298e570b5 100644
--- a/drivers/mtd/ubi/upd.c
+++ b/drivers/mtd/ubi/upd.c
@@ -32,6 +32,7 @@
 #else
 #include <div64.h>
 #include <ubi_uboot.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
diff --git a/drivers/mtd/ubi/vmt.c b/drivers/mtd/ubi/vmt.c
index c9d28bb4d520..42b40d42f131 100644
--- a/drivers/mtd/ubi/vmt.c
+++ b/drivers/mtd/ubi/vmt.c
@@ -23,6 +23,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #endif
 #include <linux/math64.h>
 
diff --git a/drivers/mtd/ubi/vtbl.c b/drivers/mtd/ubi/vtbl.c
index b8e07872716c..80d291d5c861 100644
--- a/drivers/mtd/ubi/vtbl.c
+++ b/drivers/mtd/ubi/vtbl.c
@@ -59,6 +59,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #endif
 
 #include <linux/err.h>
diff --git a/drivers/mtd/ubispl/ubispl.c b/drivers/mtd/ubispl/ubispl.c
index 2a1ad2ca1579..a353cecddf96 100644
--- a/drivers/mtd/ubispl/ubispl.c
+++ b/drivers/mtd/ubispl/ubispl.c
@@ -13,6 +13,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <u-boot/crc.h>
 #include <ubispl.h>
 
diff --git a/drivers/net/ag7xxx.c b/drivers/net/ag7xxx.c
index c73c95ce6153..9a9d113d9fd2 100644
--- a/drivers/net/ag7xxx.c
+++ b/drivers/net/ag7xxx.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <clock_legacy.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <dm.h>
 #include <errno.h>
@@ -29,6 +30,7 @@
 #include <wait_bit.h>
 #include <asm/io.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <mach/ath79.h>
 
diff --git a/drivers/net/altera_tse.c b/drivers/net/altera_tse.c
index bf17d1fb29ae..ca4cfba73894 100644
--- a/drivers/net/altera_tse.c
+++ b/drivers/net/altera_tse.c
@@ -26,6 +26,7 @@
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "altera_tse.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/net/altera_tse.h b/drivers/net/altera_tse.h
index 79509b80847b..497e2082f5a8 100644
--- a/drivers/net/altera_tse.h
+++ b/drivers/net/altera_tse.h
@@ -11,7 +11,9 @@
 #ifndef _ALTERA_TSE_H_
 #define _ALTERA_TSE_H_
 
+#include <compiler.h>
 #include <linux/bitops.h>
+#include <linux/types.h>
 #define __packed_1_    __packed __aligned(1)
 
 /* dma type */
diff --git a/drivers/net/armada100_fec.h b/drivers/net/armada100_fec.h
index b0e6d02b4af5..a0f4b9f6c3af 100644
--- a/drivers/net/armada100_fec.h
+++ b/drivers/net/armada100_fec.h
@@ -12,6 +12,7 @@
 #ifndef __ARMADA100_FEC_H__
 #define __ARMADA100_FEC_H__
 
+#include <asm/types.h>
 #include <linux/kernel.h>
 #define PORT_NUM		0x0
 
diff --git a/drivers/net/at91_emac.c b/drivers/net/at91_emac.c
index 26381a1bc6e3..4113ab684488 100644
--- a/drivers/net/at91_emac.c
+++ b/drivers/net/at91_emac.c
@@ -19,6 +19,7 @@
 #include <netdev.h>
 #include <malloc.h>
 #include <miiphy.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/net/ax88796.c b/drivers/net/ax88796.c
index d161f0e09c36..75e85742aec5 100644
--- a/drivers/net/ax88796.c
+++ b/drivers/net/ax88796.c
@@ -4,6 +4,7 @@
  */
 #include <common.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 #include "ax88796.h"
 
 /*
diff --git a/drivers/net/ax88796.h b/drivers/net/ax88796.h
index 510606610662..462de3ce1059 100644
--- a/drivers/net/ax88796.h
+++ b/drivers/net/ax88796.h
@@ -8,6 +8,7 @@
 #ifndef __DRIVERS_AX88796L_H__
 #define __DRIVERS_AX88796L_H__
 
+#include <linux/types.h>
 #define DP_DATA		(0x10 << 1)
 #define START_PG	0x40	/* First page of TX buffer */
 #define START_PG2	0x48
diff --git a/drivers/net/bcm-sf2-eth-gmac.c b/drivers/net/bcm-sf2-eth-gmac.c
index 8540b13951bf..c75564dbe71d 100644
--- a/drivers/net/bcm-sf2-eth-gmac.c
+++ b/drivers/net/bcm-sf2-eth-gmac.c
@@ -8,9 +8,11 @@
 #define DEBUG
 #include <linux/printk.h>
 #endif
+#include <stdbool.h>
 #include <stdio.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #endif
 
 #include <config.h>
diff --git a/drivers/net/bcm-sf2-eth-gmac.h b/drivers/net/bcm-sf2-eth-gmac.h
index 477667f4eaab..01ebccf8525e 100644
--- a/drivers/net/bcm-sf2-eth-gmac.h
+++ b/drivers/net/bcm-sf2-eth-gmac.h
@@ -6,6 +6,7 @@
 #ifndef _BCM_SF2_ETH_GMAC_H_
 #define _BCM_SF2_ETH_GMAC_H_
 
+#include <linux/types.h>
 #define BCM_SF2_ETH_MAC_NAME	"gmac"
 
 #ifndef ETHHW_PORT_INT
diff --git a/drivers/net/bcm-sf2-eth.c b/drivers/net/bcm-sf2-eth.c
index db7930fb88eb..63faf4bef13f 100644
--- a/drivers/net/bcm-sf2-eth.c
+++ b/drivers/net/bcm-sf2-eth.c
@@ -15,6 +15,7 @@
 #include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <phy.h>
 #include <miiphy.h>
diff --git a/drivers/net/bcm-sf2-eth.h b/drivers/net/bcm-sf2-eth.h
index 4f81e0431c1d..b7bc1e4244aa 100644
--- a/drivers/net/bcm-sf2-eth.h
+++ b/drivers/net/bcm-sf2-eth.h
@@ -8,6 +8,7 @@
 
 #include <phy.h>
 #include <stdbool.h>
+#include <linux/types.h>
 
 #define RX_BUF_SIZE	2048
 /* RX_BUF_NUM must be power of 2 */
diff --git a/drivers/net/bcm6348-eth.c b/drivers/net/bcm6348-eth.c
index afb81ab187b8..d87677737ed5 100644
--- a/drivers/net/bcm6348-eth.c
+++ b/drivers/net/bcm6348-eth.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <dm.h>
 #include <dma.h>
 #include <log.h>
@@ -22,6 +23,7 @@
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 #define ETH_RX_DESC			PKTBUFSRX
 #define ETH_MAX_MTU_SIZE		1518
diff --git a/drivers/net/bcm6368-eth.c b/drivers/net/bcm6368-eth.c
index 3f18c5c52251..d3eb8e8b6cf9 100644
--- a/drivers/net/bcm6368-eth.c
+++ b/drivers/net/bcm6368-eth.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <dm.h>
 #include <dma.h>
 #include <log.h>
@@ -24,6 +25,7 @@
 #include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define ETH_PORT_STR			"brcm,enetsw-port"
 
diff --git a/drivers/net/bcmgenet.c b/drivers/net/bcmgenet.c
index ca7888af89c2..5ac8054694bd 100644
--- a/drivers/net/bcmgenet.c
+++ b/drivers/net/bcmgenet.c
@@ -39,6 +39,7 @@
 #include <linux/sizes.h>
 #include <asm/dma-mapping.h>
 #include <wait_bit.h>
+#include <linux/types.h>
 
 /* Register definitions derived from Linux source */
 #define SYS_REV_CTRL			0x00
diff --git a/drivers/net/calxedaxgmac.c b/drivers/net/calxedaxgmac.c
index 37c3a54761b6..c24056390d88 100644
--- a/drivers/net/calxedaxgmac.c
+++ b/drivers/net/calxedaxgmac.c
@@ -15,6 +15,7 @@
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define TX_NUM_DESC			1
 #define RX_NUM_DESC			32
diff --git a/drivers/net/cs8900.c b/drivers/net/cs8900.c
index d58ae075830c..78dadd9d162e 100644
--- a/drivers/net/cs8900.c
+++ b/drivers/net/cs8900.c
@@ -31,6 +31,7 @@
 #include <net.h>
 #include <malloc.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 #include "cs8900.h"
 
 #undef DEBUG
diff --git a/drivers/net/cs8900.h b/drivers/net/cs8900.h
index 1a566ff7b2ec..bfe1946a3ae6 100644
--- a/drivers/net/cs8900.h
+++ b/drivers/net/cs8900.h
@@ -23,6 +23,7 @@
 
 #include <asm/types.h>
 #include <config.h>
+#include <linux/types.h>
 
 #define CS8900_DRIVERNAME "CS8900"
 /* although the registers are 16 bit, they are 32-bit aligned on the
diff --git a/drivers/net/dc2114x.c b/drivers/net/dc2114x.c
index 3f45aebcd039..ad14a07bdb02 100644
--- a/drivers/net/dc2114x.c
+++ b/drivers/net/dc2114x.c
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0+
 
 #include <common.h>
+#include <compiler.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/io.h>
@@ -15,6 +16,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define SROM_DLEVEL	0
 
diff --git a/drivers/net/designware.c b/drivers/net/designware.c
index ffb41e8bf1f4..ca32b7e89799 100644
--- a/drivers/net/designware.c
+++ b/drivers/net/designware.c
@@ -34,6 +34,7 @@
 #include <asm/io.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <power/regulator.h>
 #include "designware.h"
 
diff --git a/drivers/net/designware.h b/drivers/net/designware.h
index ffaf5a14d074..de051c46dd86 100644
--- a/drivers/net/designware.h
+++ b/drivers/net/designware.h
@@ -9,6 +9,7 @@
 
 #include <asm/cache.h>
 #include <net.h>
+#include <linux/types.h>
 
 #if CONFIG_IS_ENABLED(DM_GPIO)
 #include <asm-generic/gpio.h>
diff --git a/drivers/net/dm9000x.c b/drivers/net/dm9000x.c
index 33cd6c72e19d..d4eac00bae65 100644
--- a/drivers/net/dm9000x.c
+++ b/drivers/net/dm9000x.c
@@ -59,6 +59,7 @@ TODO: external MII is not functional, only internal at the moment.
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "dm9000x.h"
 
diff --git a/drivers/net/dnet.c b/drivers/net/dnet.c
index 675eb88c3d9b..652127f9f30e 100644
--- a/drivers/net/dnet.c
+++ b/drivers/net/dnet.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
diff --git a/drivers/net/dnet.h b/drivers/net/dnet.h
index fdb4fd2d391a..c93c9714d09a 100644
--- a/drivers/net/dnet.h
+++ b/drivers/net/dnet.h
@@ -11,6 +11,7 @@
 #ifndef __DRIVERS_DNET_H__
 #define __DRIVERS_DNET_H__
 
+#include <asm/types.h>
 #define DRIVERNAME "dnet"
 
 struct dnet_registers {
diff --git a/drivers/net/dwc_eth_qos.c b/drivers/net/dwc_eth_qos.c
index 22b5dff2f6dc..059b94b174df 100644
--- a/drivers/net/dwc_eth_qos.c
+++ b/drivers/net/dwc_eth_qos.c
@@ -8,6 +8,9 @@
 /*
  * This driver supports the Synopsys Designware Ethernet QOS (Quality Of
  * Service) IP block. The IP supports multiple options for bus type, clocking/
+#include <compiler.h>
+#include <stdbool.h>
+#include <linux/types.h>
  * reset structure, and feature list.
  *
  * The driver is written such that generic core logic is kept separate from
diff --git a/drivers/net/dwmac_socfpga.c b/drivers/net/dwmac_socfpga.c
index cddbd56ac7dc..126ba1fe93de 100644
--- a/drivers/net/dwmac_socfpga.c
+++ b/drivers/net/dwmac_socfpga.c
@@ -13,6 +13,7 @@
 #include <regmap.h>
 #include <reset.h>
 #include <syscon.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include "designware.h"
 #include <dm/device_compat.h>
diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c
index 3d87e05c5b2f..a157512cd965 100644
--- a/drivers/net/e1000.c
+++ b/drivers/net/e1000.c
@@ -39,6 +39,7 @@ tested on both gig copper and gig fiber boards
 #include <memalign.h>
 #include <net.h>
 #include <pci.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/u-boot.h>
@@ -46,6 +47,7 @@ tested on both gig copper and gig fiber boards
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "e1000.h"
 #include <asm/cache.h>
 
diff --git a/drivers/net/e1000.h b/drivers/net/e1000.h
index 2adfd38f2731..75b2fff945c4 100644
--- a/drivers/net/e1000.h
+++ b/drivers/net/e1000.h
@@ -12,6 +12,7 @@
 *******************************************************************************/
 
 /* e1000_hw.h
+#include <linux/types.h>
  * Structures, enums, and macros for the MAC
  */
 
diff --git a/drivers/net/e1000_spi.c b/drivers/net/e1000_spi.c
index 8200d428615e..b5355adcb9fa 100644
--- a/drivers/net/e1000_spi.c
+++ b/drivers/net/e1000_spi.c
@@ -1,11 +1,13 @@
 #include <common.h>
 #include <command.h>
 #include <console.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "e1000.h"
 #include <malloc.h>
 #include <linux/compiler.h>
diff --git a/drivers/net/eepro100.c b/drivers/net/eepro100.c
index d152063008bb..b5c928f9425e 100644
--- a/drivers/net/eepro100.c
+++ b/drivers/net/eepro100.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/io.h>
@@ -19,6 +20,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /* Ethernet chip registers. */
 #define SCB_STATUS		0	/* Rx/Command Unit Status *Word* */
diff --git a/drivers/net/ep93xx_eth.h b/drivers/net/ep93xx_eth.h
index 074fe25f347c..69cd0c00c175 100644
--- a/drivers/net/ep93xx_eth.h
+++ b/drivers/net/ep93xx_eth.h
@@ -10,6 +10,7 @@
 #define _EP93XX_ETH_H
 
 #include <net.h>
+#include <linux/types.h>
 
 /**
  * #define this to dump device status and queue info during initialization and
diff --git a/drivers/net/ethoc.c b/drivers/net/ethoc.c
index c331cd9e97ca..95f202e3b515 100644
--- a/drivers/net/ethoc.c
+++ b/drivers/net/ethoc.c
@@ -10,6 +10,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <dm.h>
 #include <log.h>
@@ -26,6 +27,7 @@
 #include <asm/cache.h>
 #include <wait_bit.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /* register offsets */
 #define	MODER		0x00
diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c
index bdf14afcd75f..d37fc0d81d50 100644
--- a/drivers/net/fec_mxc.c
+++ b/drivers/net/fec_mxc.c
@@ -8,6 +8,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <dm.h>
 #include <env.h>
@@ -26,6 +27,7 @@
 #include <linux/delay.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <power/regulator.h>
 
 #include <asm/io.h>
diff --git a/drivers/net/fec_mxc.h b/drivers/net/fec_mxc.h
index 20e1712a077c..485c270ef569 100644
--- a/drivers/net/fec_mxc.h
+++ b/drivers/net/fec_mxc.h
@@ -18,6 +18,7 @@
 
 #include <clk.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 /* Layout description of the FEC */
 struct ethernet_regs {
diff --git a/drivers/net/fm/b4860.c b/drivers/net/fm/b4860.c
index 5be0ad2ab3db..43e4bde900f4 100644
--- a/drivers/net/fm/b4860.c
+++ b/drivers/net/fm/b4860.c
@@ -11,6 +11,7 @@
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
 #include <hwconfig.h>
+#include <asm/types.h>
 
 u32 port_to_devdisr[] = {
 	[FM1_DTSEC1] = FSL_CORENET_DEVDISR2_DTSEC1_1,
diff --git a/drivers/net/fm/eth.c b/drivers/net/fm/eth.c
index 0728ad6cacf3..849b8c24a323 100644
--- a/drivers/net/fm/eth.c
+++ b/drivers/net/fm/eth.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <log.h>
 #include <part.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/io.h>
@@ -31,6 +32,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "fm.h"
 
diff --git a/drivers/net/fm/fdt.c b/drivers/net/fm/fdt.c
index 924632c39913..6a32f538d992 100644
--- a/drivers/net/fm/fdt.c
+++ b/drivers/net/fm/fdt.c
@@ -8,6 +8,7 @@
 #include <env.h>
 #include <fdt_support.h>
 #include <fsl_qe.h>	/* For struct qe_firmware */
+#include <linux/types.h>
 #include <u-boot/crc.h>
 
 #ifdef CONFIG_SYS_DPAA_FMAN
diff --git a/drivers/net/fm/fm.c b/drivers/net/fm/fm.c
index 964dc01884bd..64e0a6928109 100644
--- a/drivers/net/fm/fm.c
+++ b/drivers/net/fm/fm.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <u-boot/crc.h>
 #ifdef CONFIG_DM_ETH
 #include <dm.h>
diff --git a/drivers/net/fm/fm.h b/drivers/net/fm/fm.h
index 2379b3a11cab..b31c515fe82c 100644
--- a/drivers/net/fm/fm.h
+++ b/drivers/net/fm/fm.h
@@ -10,6 +10,7 @@
 #include <phy.h>
 #include <fm_eth.h>
 #include <fsl_fman.h>
+#include <linux/types.h>
 
 /* Port ID */
 #define OH_PORT_ID_BASE		0x01
diff --git a/drivers/net/fm/init.c b/drivers/net/fm/init.c
index de4db412704f..fe56b986514b 100644
--- a/drivers/net/fm/init.c
+++ b/drivers/net/fm/init.c
@@ -18,6 +18,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "fm.h"
 
diff --git a/drivers/net/fm/ls1043.c b/drivers/net/fm/ls1043.c
index ba4da69423aa..d476a7f14e33 100644
--- a/drivers/net/fm/ls1043.c
+++ b/drivers/net/fm/ls1043.c
@@ -7,6 +7,7 @@
 #include <fm_eth.h>
 #include <asm/io.h>
 #include <asm/arch/fsl_serdes.h>
+#include <asm/types.h>
 
 #define FSL_CHASSIS2_RCWSR13_EC1		0xe0000000 /* bits 416..418 */
 #define FSL_CHASSIS2_RCWSR13_EC1_DTSEC3_RGMII	0x00000000
diff --git a/drivers/net/fm/ls1046.c b/drivers/net/fm/ls1046.c
index 49b540bd30b0..63d8804c11cc 100644
--- a/drivers/net/fm/ls1046.c
+++ b/drivers/net/fm/ls1046.c
@@ -7,6 +7,7 @@
 #include <fm_eth.h>
 #include <asm/io.h>
 #include <asm/arch/fsl_serdes.h>
+#include <asm/types.h>
 
 #define FSL_CHASSIS2_RCWSR13_EC1		0xe0000000 /* bits 416..418 */
 #define FSL_CHASSIS2_RCWSR13_EC1_DTSEC3_RGMII	0x00000000
diff --git a/drivers/net/fm/memac_phy.c b/drivers/net/fm/memac_phy.c
index 79a15989ad94..85f2156efcc8 100644
--- a/drivers/net/fm/memac_phy.c
+++ b/drivers/net/fm/memac_phy.c
@@ -15,6 +15,7 @@
 #include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_SYS_MEMAC_LITTLE_ENDIAN
 #define memac_out_32(a, v)	out_le32(a, v)
diff --git a/drivers/net/fm/p1023.c b/drivers/net/fm/p1023.c
index d4167e4d696f..de3bc19f46a7 100644
--- a/drivers/net/fm/p1023.c
+++ b/drivers/net/fm/p1023.c
@@ -8,6 +8,7 @@
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
+#include <asm/types.h>
 
 static u32 port_to_devdisr[] = {
 	[FM1_DTSEC1] = MPC85xx_DEVDISR_TSEC1,
diff --git a/drivers/net/fm/p4080.c b/drivers/net/fm/p4080.c
index b78b02d8284f..255e0680f341 100644
--- a/drivers/net/fm/p4080.c
+++ b/drivers/net/fm/p4080.c
@@ -8,6 +8,7 @@
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
+#include <asm/types.h>
 
 static u32 port_to_devdisr[] = {
 	[FM1_DTSEC1] = FSL_CORENET_DEVDISR2_DTSEC1_1,
diff --git a/drivers/net/fm/p5020.c b/drivers/net/fm/p5020.c
index 818953121531..ba59775776f5 100644
--- a/drivers/net/fm/p5020.c
+++ b/drivers/net/fm/p5020.c
@@ -8,6 +8,7 @@
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
+#include <asm/types.h>
 
 static u32 port_to_devdisr[] = {
 	[FM1_DTSEC1] = FSL_CORENET_DEVDISR2_DTSEC1_1,
diff --git a/drivers/net/fm/p5040.c b/drivers/net/fm/p5040.c
index 38744e7b7b31..9d1b6bd590e2 100644
--- a/drivers/net/fm/p5040.c
+++ b/drivers/net/fm/p5040.c
@@ -8,6 +8,7 @@
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
+#include <asm/types.h>
 
 u32 port_to_devdisr[] = {
 	[FM1_DTSEC1] = FSL_CORENET_DEVDISR2_DTSEC1_1,
diff --git a/drivers/net/fm/t1024.c b/drivers/net/fm/t1024.c
index 6fc3b9033701..405b3dec7ef9 100644
--- a/drivers/net/fm/t1024.c
+++ b/drivers/net/fm/t1024.c
@@ -5,10 +5,12 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <phy.h>
 #include <fm_eth.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
+#include <asm/types.h>
 
 u32 port_to_devdisr[] = {
 	[FM1_DTSEC1] = FSL_CORENET_DEVDISR2_DTSEC1_1,
diff --git a/drivers/net/fm/t1040.c b/drivers/net/fm/t1040.c
index af4f5c561075..ee6625d9afaa 100644
--- a/drivers/net/fm/t1040.c
+++ b/drivers/net/fm/t1040.c
@@ -8,6 +8,7 @@
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
+#include <asm/types.h>
 
 phy_interface_t fman_port_enet_if(enum fm_port port)
 {
diff --git a/drivers/net/fm/t2080.c b/drivers/net/fm/t2080.c
index f4d8d2d869a3..b893ae0931c6 100644
--- a/drivers/net/fm/t2080.c
+++ b/drivers/net/fm/t2080.c
@@ -6,10 +6,12 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <phy.h>
 #include <fm_eth.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
+#include <asm/types.h>
 
 u32 port_to_devdisr[] = {
 	[FM1_DTSEC1] = FSL_CORENET_DEVDISR2_DTSEC1_1,
diff --git a/drivers/net/fm/t4240.c b/drivers/net/fm/t4240.c
index f8e63c3d7197..fbcfd1d6429d 100644
--- a/drivers/net/fm/t4240.c
+++ b/drivers/net/fm/t4240.c
@@ -4,11 +4,13 @@
  *	Roy Zang <tie-fei.zang@freescale.com>
  */
 #include <common.h>
+#include <compiler.h>
 #include <phy.h>
 #include <fm_eth.h>
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
+#include <asm/types.h>
 
 u32 port_to_devdisr[] = {
 	[FM1_DTSEC1] = FSL_CORENET_DEVDISR2_DTSEC1_1,
diff --git a/drivers/net/fm/tgec_phy.c b/drivers/net/fm/tgec_phy.c
index 7afcf01916ff..deef335ce174 100644
--- a/drivers/net/fm/tgec_phy.c
+++ b/drivers/net/fm/tgec_phy.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <fsl_tgec.h>
 #include <fm_eth.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
 
diff --git a/drivers/net/fsl-mc/dpbp.c b/drivers/net/fsl-mc/dpbp.c
index c609efb9abcc..191fd8e4a724 100644
--- a/drivers/net/fsl-mc/dpbp.c
+++ b/drivers/net/fsl-mc/dpbp.c
@@ -8,6 +8,7 @@
 #include <fsl-mc/fsl_mc_sys.h>
 #include <fsl-mc/fsl_mc_cmd.h>
 #include <fsl-mc/fsl_dpbp.h>
+#include <linux/types.h>
 
 int dpbp_open(struct fsl_mc_io *mc_io,
 	      uint32_t cmd_flags,
diff --git a/drivers/net/fsl-mc/dpio/dpio.c b/drivers/net/fsl-mc/dpio/dpio.c
index 8884455963de..415f49ce8b18 100644
--- a/drivers/net/fsl-mc/dpio/dpio.c
+++ b/drivers/net/fsl-mc/dpio/dpio.c
@@ -7,6 +7,7 @@
 #include <fsl-mc/fsl_mc_sys.h>
 #include <fsl-mc/fsl_mc_cmd.h>
 #include <fsl-mc/fsl_dpio.h>
+#include <linux/types.h>
 
 int dpio_open(struct fsl_mc_io *mc_io,
 	      uint32_t cmd_flags,
diff --git a/drivers/net/fsl-mc/dpio/qbman_portal.c b/drivers/net/fsl-mc/dpio/qbman_portal.c
index fb325846322e..56eb6a08c2a8 100644
--- a/drivers/net/fsl-mc/dpio/qbman_portal.c
+++ b/drivers/net/fsl-mc/dpio/qbman_portal.c
@@ -10,6 +10,7 @@
 #include <linux/bug.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "qbman_portal.h"
 
 /* QBMan portal management command codes */
diff --git a/drivers/net/fsl-mc/dpio/qbman_sys.h b/drivers/net/fsl-mc/dpio/qbman_sys.h
index 2d94d91129db..1a94ba5912fe 100644
--- a/drivers/net/fsl-mc/dpio/qbman_sys.h
+++ b/drivers/net/fsl-mc/dpio/qbman_sys.h
@@ -20,10 +20,12 @@
 
 /* Trace the 3 different classes of read/write access to QBMan. #undef as
  * required. */
+#include <compiler.h>
 #include <stdio.h>
 #include <linux/bug.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #undef QBMAN_CCSR_TRACE
 #undef QBMAN_CINH_TRACE
 #undef QBMAN_CENA_TRACE
diff --git a/drivers/net/fsl-mc/dpmac.c b/drivers/net/fsl-mc/dpmac.c
index 43a2ff43f888..dce22ac75314 100644
--- a/drivers/net/fsl-mc/dpmac.c
+++ b/drivers/net/fsl-mc/dpmac.c
@@ -10,6 +10,7 @@
 #include <fsl-mc/fsl_mc_sys.h>
 #include <fsl-mc/fsl_mc_cmd.h>
 #include <fsl-mc/fsl_dpmac.h>
+#include <linux/types.h>
 
 int dpmac_open(struct fsl_mc_io *mc_io,
 	       uint32_t cmd_flags,
diff --git a/drivers/net/fsl-mc/dpmng.c b/drivers/net/fsl-mc/dpmng.c
index 8314243f3561..5ec493f5c363 100644
--- a/drivers/net/fsl-mc/dpmng.c
+++ b/drivers/net/fsl-mc/dpmng.c
@@ -4,6 +4,7 @@
 #include <fsl-mc/fsl_mc_sys.h>
 #include <fsl-mc/fsl_mc_cmd.h>
 #include <fsl-mc/fsl_dpmng.h>
+#include <linux/types.h>
 #include "fsl_dpmng_cmd.h"
 
 int mc_get_version(struct fsl_mc_io *mc_io,
diff --git a/drivers/net/fsl-mc/dpni.c b/drivers/net/fsl-mc/dpni.c
index 443e430695ec..60e0e55270e6 100644
--- a/drivers/net/fsl-mc/dpni.c
+++ b/drivers/net/fsl-mc/dpni.c
@@ -7,6 +7,7 @@
 #include <fsl-mc/fsl_mc_sys.h>
 #include <fsl-mc/fsl_mc_cmd.h>
 #include <fsl-mc/fsl_dpni.h>
+#include <linux/types.h>
 
 int dpni_prepare_cfg(const struct dpni_cfg	*cfg,
 		     uint8_t			*cfg_buf)
diff --git a/drivers/net/fsl-mc/dprc.c b/drivers/net/fsl-mc/dprc.c
index e0a2865ab8f5..bf96188d19d5 100644
--- a/drivers/net/fsl-mc/dprc.c
+++ b/drivers/net/fsl-mc/dprc.c
@@ -9,6 +9,7 @@
 #include <fsl-mc/fsl_mc_sys.h>
 #include <fsl-mc/fsl_mc_cmd.h>
 #include <fsl-mc/fsl_dprc.h>
+#include <linux/types.h>
 
 int dprc_get_container_id(struct fsl_mc_io *mc_io,
 			  uint32_t cmd_flags,
diff --git a/drivers/net/fsl-mc/dpsparser.c b/drivers/net/fsl-mc/dpsparser.c
index cfd1ba66a058..7a5e05c7cd39 100644
--- a/drivers/net/fsl-mc/dpsparser.c
+++ b/drivers/net/fsl-mc/dpsparser.c
@@ -4,6 +4,7 @@
  *
  * Copyright 2018 NXP
  */
+#include <asm/types.h>
 #include <fsl-mc/fsl_mc_sys.h>
 #include <fsl-mc/fsl_mc_cmd.h>
 #include <fsl-mc/fsl_dpsparser.h>
diff --git a/drivers/net/fsl-mc/fsl_dpmng_cmd.h b/drivers/net/fsl-mc/fsl_dpmng_cmd.h
index e18c88da0972..f1ad0f3c422e 100644
--- a/drivers/net/fsl-mc/fsl_dpmng_cmd.h
+++ b/drivers/net/fsl-mc/fsl_dpmng_cmd.h
@@ -6,6 +6,7 @@
 #define __FSL_DPMNG_CMD_H
 
 /* Command IDs */
+#include <linux/types.h>
 #define DPMNG_CMDID_GET_VERSION			0x8311
 
 /*                cmd, param, offset, width, type, arg_name */
diff --git a/drivers/net/fsl-mc/mc.c b/drivers/net/fsl-mc/mc.c
index 3a82f4f065f7..889f6e6f2dc8 100644
--- a/drivers/net/fsl-mc/mc.c
+++ b/drivers/net/fsl-mc/mc.c
@@ -5,12 +5,14 @@
  */
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <env.h>
 #include <errno.h>
 #include <image.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
@@ -34,6 +36,7 @@
 #include <fsl-mc/fsl_qbman_portal.h>
 #include <fsl-mc/ldpaa_wriop.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define MC_RAM_BASE_ADDR_ALIGNMENT  (512UL * 1024 * 1024)
 #define MC_RAM_BASE_ADDR_ALIGNMENT_MASK	(~(MC_RAM_BASE_ADDR_ALIGNMENT - 1))
diff --git a/drivers/net/fsl-mc/mc_sys.c b/drivers/net/fsl-mc/mc_sys.c
index aa50e64bced0..5d379d26a9e3 100644
--- a/drivers/net/fsl-mc/mc_sys.c
+++ b/drivers/net/fsl-mc/mc_sys.c
@@ -14,6 +14,7 @@
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #define MC_CMD_HDR_READ_CMDID(_hdr) \
 	((uint16_t)mc_dec((_hdr), MC_CMD_HDR_CMDID_O, MC_CMD_HDR_CMDID_S))
diff --git a/drivers/net/fsl_enetc.c b/drivers/net/fsl_enetc.c
index a6c6e5781930..9f1920c3b8cb 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 <stdbool.h>
 #include <vsprintf.h>
 #include <asm/cache.h>
 #include <asm/io.h>
@@ -21,6 +22,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "fsl_enetc.h"
 
diff --git a/drivers/net/fsl_enetc.h b/drivers/net/fsl_enetc.h
index 37e7e858435b..f659470da37e 100644
--- a/drivers/net/fsl_enetc.h
+++ b/drivers/net/fsl_enetc.h
@@ -8,6 +8,7 @@
 #define _ENETC_H
 
 #include <linux/bitops.h>
+#include <linux/types.h>
 #define enetc_dbg(dev, fmt, args...)	debug("%s:" fmt, dev->name, ##args)
 
 /* PCI function IDs */
diff --git a/drivers/net/fsl_enetc_mdio.c b/drivers/net/fsl_enetc_mdio.c
index 282c08c82f55..8a7eff48087d 100644
--- a/drivers/net/fsl_enetc_mdio.c
+++ b/drivers/net/fsl_enetc_mdio.c
@@ -14,6 +14,7 @@
 #include <asm/io.h>
 #include <asm/processor.h>
 #include <miiphy.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 
 #include "fsl_enetc.h"
diff --git a/drivers/net/fsl_ls_mdio.c b/drivers/net/fsl_ls_mdio.c
index 6d8332d19ae0..12978665905d 100644
--- a/drivers/net/fsl_ls_mdio.c
+++ b/drivers/net/fsl_ls_mdio.c
@@ -9,6 +9,7 @@
 #include <miiphy.h>
 #include <asm/io.h>
 #include <fsl_memac.h>
+#include <asm/types.h>
 
 #ifdef CONFIG_SYS_MEMAC_LITTLE_ENDIAN
 #define memac_out_32(a, v)	out_le32(a, v)
diff --git a/drivers/net/fsl_mcdmafec.c b/drivers/net/fsl_mcdmafec.c
index 64c1e71ebbe7..c55fd6ff3e29 100644
--- a/drivers/net/fsl_mcdmafec.c
+++ b/drivers/net/fsl_mcdmafec.c
@@ -27,6 +27,7 @@
 #include <asm/immap.h>
 #include <asm/fsl_mcdmafec.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "MCD_dma.h"
 
diff --git a/drivers/net/fsl_mdio.c b/drivers/net/fsl_mdio.c
index 36fa90766c28..e7e2b941d16a 100644
--- a/drivers/net/fsl_mdio.c
+++ b/drivers/net/fsl_mdio.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <miiphy.h>
 #include <phy.h>
 #include <fsl_mdio.h>
@@ -14,6 +15,7 @@
 #include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_DM_MDIO
 struct tsec_mdio_priv {
diff --git a/drivers/net/ftgmac100.c b/drivers/net/ftgmac100.c
index 5a057ebb46ba..e6454b975bc5 100644
--- a/drivers/net/ftgmac100.c
+++ b/drivers/net/ftgmac100.c
@@ -29,6 +29,7 @@
 #include <linux/iopoll.h>
 #include <linux/kernel.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 #include "ftgmac100.h"
 
diff --git a/drivers/net/ftmac100.c b/drivers/net/ftmac100.c
index 569f1e400473..42247cbf37d8 100644
--- a/drivers/net/ftmac100.c
+++ b/drivers/net/ftmac100.c
@@ -21,6 +21,7 @@
 #include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "ftmac100.h"
 #ifdef CONFIG_DM_ETH
diff --git a/drivers/net/ftmac110.c b/drivers/net/ftmac110.c
index e7c7a5e885a8..ebcff74fd4e0 100644
--- a/drivers/net/ftmac110.c
+++ b/drivers/net/ftmac110.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <log.h>
 #include <malloc.h>
 #include <net.h>
@@ -21,6 +22,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #if defined(CONFIG_MII) || defined(CONFIG_CMD_MII)
 #include <miiphy.h>
diff --git a/drivers/net/ftmac110.h b/drivers/net/ftmac110.h
index a792b515b446..863dff44b6af 100644
--- a/drivers/net/ftmac110.h
+++ b/drivers/net/ftmac110.h
@@ -9,6 +9,7 @@
 #ifndef _FTMAC110_H
 #define _FTMAC110_H
 
+#include <linux/types.h>
 struct ftmac110_regs {
 	uint32_t isr;    /* 0x00: Interrups Status Register */
 	uint32_t imr;    /* 0x04: Interrupt Mask Register */
diff --git a/drivers/net/gmac_rockchip.c b/drivers/net/gmac_rockchip.c
index 55ce931cd2d4..6d0e1363cbd5 100644
--- a/drivers/net/gmac_rockchip.c
+++ b/drivers/net/gmac_rockchip.c
@@ -31,6 +31,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "designware.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/net/higmacv300.c b/drivers/net/higmacv300.c
index 7310d6a04267..8a8b6dc6aed9 100644
--- a/drivers/net/higmacv300.c
+++ b/drivers/net/higmacv300.c
@@ -3,6 +3,7 @@
  * Copyright (c) 2019, Linaro Limited
  */
 
+#include <compiler.h>
 #include <cpu_func.h>
 #include <log.h>
 #include <malloc.h>
@@ -20,6 +21,7 @@
 #include <reset.h>
 #include <wait_bit.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define STATION_ADDR_LOW		0x0000
 #define STATION_ADDR_HIGH		0x0004
diff --git a/drivers/net/ks8851_mll.c b/drivers/net/ks8851_mll.c
index 86a97cdf5737..f4ca7a1df95d 100644
--- a/drivers/net/ks8851_mll.c
+++ b/drivers/net/ks8851_mll.c
@@ -17,6 +17,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include "ks8851_mll.h"
 
diff --git a/drivers/net/lan91c96.c b/drivers/net/lan91c96.c
index 559273e67608..1b0470a4896b 100644
--- a/drivers/net/lan91c96.c
+++ b/drivers/net/lan91c96.c
@@ -55,6 +55,7 @@
 #include <linux/delay.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "lan91c96.h"
 #include <net.h>
 #include <linux/compiler.h>
diff --git a/drivers/net/ldpaa_eth/ldpaa_eth.c b/drivers/net/ldpaa_eth/ldpaa_eth.c
index 4b62225968f7..615c767362bb 100644
--- a/drivers/net/ldpaa_eth/ldpaa_eth.c
+++ b/drivers/net/ldpaa_eth/ldpaa_eth.c
@@ -26,6 +26,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <fsl-mc/ldpaa_wriop.h>
 #include "ldpaa_eth.h"
diff --git a/drivers/net/ldpaa_eth/ldpaa_eth.h b/drivers/net/ldpaa_eth/ldpaa_eth.h
index 2b3d31f70430..70f984dc61e7 100644
--- a/drivers/net/ldpaa_eth/ldpaa_eth.h
+++ b/drivers/net/ldpaa_eth/ldpaa_eth.h
@@ -7,6 +7,7 @@
 #ifndef __LDPAA_ETH_H
 #define __LDPAA_ETH_H
 
+#include <compiler.h>
 #include <stdbool.h>
 #include <linux/netdevice.h>
 #include <fsl-mc/fsl_mc.h>
@@ -17,6 +18,7 @@
 #include <fsl-mc/fsl_dpio.h>
 #include <fsl-mc/fsl_qbman_portal.h>
 #include <fsl-mc/fsl_mc_private.h>
+#include <linux/types.h>
 
 
 enum ldpaa_eth_type {
diff --git a/drivers/net/ldpaa_eth/ldpaa_wriop.c b/drivers/net/ldpaa_eth/ldpaa_wriop.c
index e2ad13b89757..f58bb63e3a7e 100644
--- a/drivers/net/ldpaa_eth/ldpaa_wriop.c
+++ b/drivers/net/ldpaa_eth/ldpaa_wriop.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <asm/io.h>
 #include <asm/types.h>
 #include <malloc.h>
diff --git a/drivers/net/ldpaa_eth/ls1088a.c b/drivers/net/ldpaa_eth/ls1088a.c
index 54cb16e51b1f..d6ac0f40b850 100644
--- a/drivers/net/ldpaa_eth/ls1088a.c
+++ b/drivers/net/ldpaa_eth/ls1088a.c
@@ -3,7 +3,9 @@
  * Copyright 2017 NXP
  */
 #include <common.h>
+#include <compiler.h>
 #include <phy.h>
+#include <asm/types.h>
 #include <fsl-mc/ldpaa_wriop.h>
 #include <asm/io.h>
 #include <asm/arch/fsl_serdes.h>
diff --git a/drivers/net/ldpaa_eth/ls2080a.c b/drivers/net/ldpaa_eth/ls2080a.c
index 49eee044f35b..efe558f536e9 100644
--- a/drivers/net/ldpaa_eth/ls2080a.c
+++ b/drivers/net/ldpaa_eth/ls2080a.c
@@ -3,7 +3,9 @@
  * Copyright 2015 Freescale Semiconductor, Inc.
  */
 #include <common.h>
+#include <compiler.h>
 #include <phy.h>
+#include <asm/types.h>
 #include <fsl-mc/ldpaa_wriop.h>
 #include <asm/io.h>
 #include <asm/arch/fsl_serdes.h>
diff --git a/drivers/net/ldpaa_eth/lx2160a.c b/drivers/net/ldpaa_eth/lx2160a.c
index a61508befc81..8d66a5fb9143 100644
--- a/drivers/net/ldpaa_eth/lx2160a.c
+++ b/drivers/net/ldpaa_eth/lx2160a.c
@@ -3,7 +3,9 @@
  * Copyright 2018 NXP
  */
 #include <common.h>
+#include <compiler.h>
 #include <phy.h>
+#include <asm/types.h>
 #include <fsl-mc/ldpaa_wriop.h>
 #include <asm/io.h>
 #include <asm/arch/fsl_serdes.h>
diff --git a/drivers/net/lpc32xx_eth.c b/drivers/net/lpc32xx_eth.c
index dd7b2e5a0078..976a69c365ca 100644
--- a/drivers/net/lpc32xx_eth.c
+++ b/drivers/net/lpc32xx_eth.c
@@ -11,6 +11,7 @@
 #include <net.h>
 #include <malloc.h>
 #include <miiphy.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/io.h>
 #include <asm/u-boot.h>
diff --git a/drivers/net/macb.c b/drivers/net/macb.c
index 783a90cb1fa1..836019ea9179 100644
--- a/drivers/net/macb.c
+++ b/drivers/net/macb.c
@@ -4,9 +4,11 @@
  */
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <dm.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
@@ -14,6 +16,7 @@
 #include <linux/delay.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /*
  * The u-boot networking stack is a little weird.  It seems like the
diff --git a/drivers/net/mcffec.c b/drivers/net/mcffec.c
index 91ca0e03216b..083f622b3f07 100644
--- a/drivers/net/mcffec.c
+++ b/drivers/net/mcffec.c
@@ -26,6 +26,7 @@
 #include <linux/errno.h>
 #include <linux/mii.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #undef	ET_DEBUG
 #undef	MII_DEBUG
diff --git a/drivers/net/mcfmii.c b/drivers/net/mcfmii.c
index 21e558ee816c..30b843c1b10a 100644
--- a/drivers/net/mcfmii.c
+++ b/drivers/net/mcfmii.c
@@ -13,6 +13,7 @@
 #include <linux/delay.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_MCF547x_8x
 #include <asm/fsl_mcdmafec.h>
diff --git a/drivers/net/mdio_mux_i2creg.c b/drivers/net/mdio_mux_i2creg.c
index cc02b5ffd45b..5f03e7cffd99 100644
--- a/drivers/net/mdio_mux_i2creg.c
+++ b/drivers/net/mdio_mux_i2creg.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <miiphy.h>
 #include <i2c.h>
+#include <linux/types.h>
 
 /*
  * This driver is used for MDIO muxes driven by writing to a register of an I2C
diff --git a/drivers/net/mdio_mux_sandbox.c b/drivers/net/mdio_mux_sandbox.c
index c22882c6e8db..a8ef9e72cb6b 100644
--- a/drivers/net/mdio_mux_sandbox.c
+++ b/drivers/net/mdio_mux_sandbox.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <miiphy.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 
 /* macros copied over from mdio_sandbox.c */
diff --git a/drivers/net/mdio_sandbox.c b/drivers/net/mdio_sandbox.c
index 2d7c845a098e..9598f0be2faa 100644
--- a/drivers/net/mdio_sandbox.c
+++ b/drivers/net/mdio_sandbox.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <miiphy.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 
 #define SANDBOX_PHY_ADDR	5
diff --git a/drivers/net/mpc8xx_fec.c b/drivers/net/mpc8xx_fec.c
index 758864eed3fb..e2f73aeda180 100644
--- a/drivers/net/mpc8xx_fec.c
+++ b/drivers/net/mpc8xx_fec.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <hang.h>
 #include <malloc.h>
 #include <net.h>
@@ -21,6 +22,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <phy.h>
 #include <linux/mii.h>
diff --git a/drivers/net/mscc_eswitch/jr2_switch.c b/drivers/net/mscc_eswitch/jr2_switch.c
index 1aff591e3a4d..4b00dca3d79d 100644
--- a/drivers/net/mscc_eswitch/jr2_switch.c
+++ b/drivers/net/mscc_eswitch/jr2_switch.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <config.h>
 #include <dm.h>
 #include <malloc.h>
@@ -22,6 +23,7 @@
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <dt-bindings/mscc/jr2_data.h>
 #include "mscc_xfer.h"
diff --git a/drivers/net/mscc_eswitch/luton_switch.c b/drivers/net/mscc_eswitch/luton_switch.c
index afc6260577ed..81e9be4dc5d8 100644
--- a/drivers/net/mscc_eswitch/luton_switch.c
+++ b/drivers/net/mscc_eswitch/luton_switch.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <config.h>
 #include <dm.h>
 #include <malloc.h>
@@ -20,6 +21,7 @@
 #include <wait_bit.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "mscc_xfer.h"
 #include "mscc_mac_table.h"
diff --git a/drivers/net/mscc_eswitch/mscc_mac_table.c b/drivers/net/mscc_eswitch/mscc_mac_table.c
index dba44318f529..49746c793182 100644
--- a/drivers/net/mscc_eswitch/mscc_mac_table.c
+++ b/drivers/net/mscc_eswitch/mscc_mac_table.c
@@ -3,6 +3,8 @@
  * Copyright (c) 2018 Microsemi Corporation
  */
 
+#include <compiler.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/io.h>
diff --git a/drivers/net/mscc_eswitch/mscc_mac_table.h b/drivers/net/mscc_eswitch/mscc_mac_table.h
index 17fed2e79253..ab01763b7089 100644
--- a/drivers/net/mscc_eswitch/mscc_mac_table.h
+++ b/drivers/net/mscc_eswitch/mscc_mac_table.h
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 
 #define ETH_LEN 6
 #define MAC_VID 1
diff --git a/drivers/net/mscc_eswitch/mscc_miim.c b/drivers/net/mscc_eswitch/mscc_miim.c
index 9d59fc53ee9d..34190e71a2e9 100644
--- a/drivers/net/mscc_eswitch/mscc_miim.c
+++ b/drivers/net/mscc_eswitch/mscc_miim.c
@@ -6,6 +6,7 @@
 #include <miiphy.h>
 #include <vsprintf.h>
 #include <wait_bit.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include "mscc_miim.h"
diff --git a/drivers/net/mscc_eswitch/mscc_miim.h b/drivers/net/mscc_eswitch/mscc_miim.h
index feb1f40ae552..7b67476f8335 100644
--- a/drivers/net/mscc_eswitch/mscc_miim.h
+++ b/drivers/net/mscc_eswitch/mscc_miim.h
@@ -6,6 +6,8 @@
 #ifndef _MSCC_MIIM_H_
 #define _MSCC_MIIM_H_
 
+#include <compiler.h>
+#include <asm/types.h>
 struct mscc_miim_dev {
 	void __iomem *regs;
 	phys_addr_t miim_base;
diff --git a/drivers/net/mscc_eswitch/mscc_xfer.c b/drivers/net/mscc_eswitch/mscc_xfer.c
index 55abd5a984e0..5234447854fd 100644
--- a/drivers/net/mscc_eswitch/mscc_xfer.c
+++ b/drivers/net/mscc_eswitch/mscc_xfer.c
@@ -3,12 +3,14 @@
  * Copyright (c) 2018 Microsemi Corporation
  */
 
+#include <compiler.h>
 #include <log.h>
 #include <stdbool.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/io.h>
+#include <linux/types.h>
 #include "mscc_xfer.h"
 
 #define QS_XTR_FLUSH_FLUSH		GENMASK(1, 0)
diff --git a/drivers/net/mscc_eswitch/mscc_xfer.h b/drivers/net/mscc_eswitch/mscc_xfer.h
index df507e518cf2..3a46a7553e69 100644
--- a/drivers/net/mscc_eswitch/mscc_xfer.h
+++ b/drivers/net/mscc_eswitch/mscc_xfer.h
@@ -4,7 +4,9 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <stdbool.h>
+#include <linux/types.h>
 
 enum mscc_regs_qs {
 	MSCC_QS_XTR_RD,
diff --git a/drivers/net/mscc_eswitch/ocelot_switch.c b/drivers/net/mscc_eswitch/ocelot_switch.c
index 170393c03f7b..71b7f21f6d00 100644
--- a/drivers/net/mscc_eswitch/ocelot_switch.c
+++ b/drivers/net/mscc_eswitch/ocelot_switch.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <config.h>
 #include <dm.h>
 #include <log.h>
@@ -21,6 +22,7 @@
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "mscc_xfer.h"
 #include "mscc_mac_table.h"
diff --git a/drivers/net/mscc_eswitch/serval_switch.c b/drivers/net/mscc_eswitch/serval_switch.c
index 8f5c43660bdb..cb46a274f4d8 100644
--- a/drivers/net/mscc_eswitch/serval_switch.c
+++ b/drivers/net/mscc_eswitch/serval_switch.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <config.h>
 #include <dm.h>
 #include <log.h>
@@ -21,6 +22,7 @@
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "mscc_xfer.h"
 #include "mscc_mac_table.h"
diff --git a/drivers/net/mscc_eswitch/servalt_switch.c b/drivers/net/mscc_eswitch/servalt_switch.c
index f393ea7f504b..babde2feac3c 100644
--- a/drivers/net/mscc_eswitch/servalt_switch.c
+++ b/drivers/net/mscc_eswitch/servalt_switch.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <config.h>
 #include <dm.h>
 #include <malloc.h>
@@ -21,6 +22,7 @@
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "mscc_xfer.h"
 #include "mscc_miim.h"
diff --git a/drivers/net/mt7628-eth.c b/drivers/net/mt7628-eth.c
index fd6193617275..105f5f18cebf 100644
--- a/drivers/net/mt7628-eth.c
+++ b/drivers/net/mt7628-eth.c
@@ -14,6 +14,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <dm.h>
 #include <log.h>
@@ -21,6 +22,7 @@
 #include <miiphy.h>
 #include <net.h>
 #include <reset.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <wait_bit.h>
@@ -33,6 +35,7 @@
 #include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /* Ethernet frame engine register */
 #define PDMA_RELATED		0x0800
diff --git a/drivers/net/mtk_eth.c b/drivers/net/mtk_eth.c
index f2f070548d43..aad0c609f281 100644
--- a/drivers/net/mtk_eth.c
+++ b/drivers/net/mtk_eth.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <dm.h>
 #include <log.h>
@@ -33,6 +34,7 @@
 #include <linux/mii.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "mtk_eth.h"
 
diff --git a/drivers/net/mvgbe.c b/drivers/net/mvgbe.c
index 45f4e004c9ca..ba510d89ac04 100644
--- a/drivers/net/mvgbe.c
+++ b/drivers/net/mvgbe.c
@@ -12,6 +12,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
 #include <net.h>
@@ -30,6 +31,7 @@
 #include <asm/byteorder.h>
 #include <asm/arch/cpu.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #if defined(CONFIG_ARCH_KIRKWOOD)
 #include <asm/arch/soc.h>
diff --git a/drivers/net/mvgbe.h b/drivers/net/mvgbe.h
index 4376efbfbc06..9032d323a366 100644
--- a/drivers/net/mvgbe.h
+++ b/drivers/net/mvgbe.h
@@ -19,6 +19,7 @@
 #endif
 
 /* Constants */
+#include <asm/types.h>
 #include <linux/kernel.h>
 #define INT_CAUSE_UNMASK_ALL		0x0007ffff
 #define INT_CAUSE_UNMASK_ALL_EXT	0x0011ffff
diff --git a/drivers/net/mvmdio.c b/drivers/net/mvmdio.c
index c712043dc7d0..55fed6a3df6a 100644
--- a/drivers/net/mvmdio.c
+++ b/drivers/net/mvmdio.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <asm/types.h>
 #include <dm/device-internal.h>
 #include <dm/lists.h>
 #include <miiphy.h>
diff --git a/drivers/net/mvneta.c b/drivers/net/mvneta.c
index f001ae73208f..d47e9a1b0d06 100644
--- a/drivers/net/mvneta.c
+++ b/drivers/net/mvneta.c
@@ -13,6 +13,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <dm.h>
 #include <log.h>
@@ -41,6 +42,7 @@
 #include <linux/mbus.h>
 #include <asm-generic/gpio.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/net/mvpp2.c b/drivers/net/mvpp2.c
index 2d53a5cc5a82..65b7b7b87d6c 100644
--- a/drivers/net/mvpp2.c
+++ b/drivers/net/mvpp2.c
@@ -14,8 +14,10 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <dm.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/cache.h>
@@ -47,6 +49,7 @@
 #include <fdt_support.h>
 #include <linux/mdio.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/net/natsemi.c b/drivers/net/natsemi.c
index f705a0264319..f2997925ffa0 100644
--- a/drivers/net/natsemi.c
+++ b/drivers/net/natsemi.c
@@ -61,6 +61,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /* defines */
 #define EEPROM_SIZE 0xb /*12 16-bit chunks, or 24 bytes*/
diff --git a/drivers/net/ne2000.c b/drivers/net/ne2000.c
index 828bc957fca7..fa0a1329256f 100644
--- a/drivers/net/ne2000.c
+++ b/drivers/net/ne2000.c
@@ -77,6 +77,7 @@ Add SNMP
 #include <stdio.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 /* NE2000 base header file */
 #include "ne2000_base.h"
diff --git a/drivers/net/ne2000.h b/drivers/net/ne2000.h
index 2cde6be4377d..d23e186466a7 100644
--- a/drivers/net/ne2000.h
+++ b/drivers/net/ne2000.h
@@ -77,6 +77,7 @@ are GPL, so this is, of course, GPL.
 #define __DRIVERS_NE2000_H__
 
 /* Enable NE2000 basic init function */
+#include <linux/types.h>
 #define NE2000_BASIC_INIT
 
 #define DP_DATA		0x10
diff --git a/drivers/net/ne2000_base.c b/drivers/net/ne2000_base.c
index 34600b822bab..1dec015ba156 100644
--- a/drivers/net/ne2000_base.c
+++ b/drivers/net/ne2000_base.c
@@ -81,6 +81,7 @@ Add SNMP
 #include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/compiler.h>
 #include <linux/string.h>
diff --git a/drivers/net/ne2000_base.h b/drivers/net/ne2000_base.h
index 0d289444b3ec..70be44298230 100644
--- a/drivers/net/ne2000_base.h
+++ b/drivers/net/ne2000_base.h
@@ -108,6 +108,7 @@ are GPL, so this is, of course, GPL.
 /* timeout for tx/rx in s */
 #include <stdbool.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #define TOUT 5
 /* Ether MAC address size */
diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c
index 701fc73c91e4..8a92ba3004ab 100644
--- a/drivers/net/netconsole.c
+++ b/drivers/net/netconsole.c
@@ -13,6 +13,7 @@
 #include <vsprintf.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #ifndef CONFIG_NETCONSOLE_BUFFER_SIZE
 #define CONFIG_NETCONSOLE_BUFFER_SIZE 512
diff --git a/drivers/net/ns8382x.c b/drivers/net/ns8382x.c
index bb07369d32f9..fc92175e9f95 100644
--- a/drivers/net/ns8382x.c
+++ b/drivers/net/ns8382x.c
@@ -62,6 +62,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /* defines */
 #define DSIZE     0x00000FFF
diff --git a/drivers/net/pch_gbe.c b/drivers/net/pch_gbe.c
index 887958fef546..3e422ff9fc82 100644
--- a/drivers/net/pch_gbe.c
+++ b/drivers/net/pch_gbe.c
@@ -19,6 +19,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "pch_gbe.h"
 
 #if !defined(CONFIG_PHYLIB)
diff --git a/drivers/net/pch_gbe.h b/drivers/net/pch_gbe.h
index 57d54d4b0d5f..15e35fda4b52 100644
--- a/drivers/net/pch_gbe.h
+++ b/drivers/net/pch_gbe.h
@@ -9,6 +9,7 @@
 #ifndef _PCH_GBE_H_
 #define _PCH_GBE_H_
 
+#include <asm/types.h>
 #include <linux/kernel.h>
 #define PCH_GBE_TIMEOUT		(3 * CONFIG_SYS_HZ)
 
diff --git a/drivers/net/pcnet.c b/drivers/net/pcnet.c
index d574aff8327a..0f1389561e12 100644
--- a/drivers/net/pcnet.c
+++ b/drivers/net/pcnet.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <dm.h>
 #include <log.h>
@@ -23,6 +24,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define	PCNET_DEBUG_LEVEL	0	/* 0=off, 1=init, 2=rx/tx */
 
diff --git a/drivers/net/pfe_eth/pfe_cmd.c b/drivers/net/pfe_eth/pfe_cmd.c
index 4a189f7b280a..7946120d56c9 100644
--- a/drivers/net/pfe_eth/pfe_cmd.c
+++ b/drivers/net/pfe_eth/pfe_cmd.c
@@ -16,6 +16,7 @@
 #include <vsprintf.h>
 #include <linux/delay.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <net/pfe_eth/pfe_eth.h>
 
 static inline void pfe_command_help(void)
diff --git a/drivers/net/pfe_eth/pfe_driver.c b/drivers/net/pfe_eth/pfe_driver.c
index 64d570e361eb..58159c4b569e 100644
--- a/drivers/net/pfe_eth/pfe_driver.c
+++ b/drivers/net/pfe_eth/pfe_driver.c
@@ -10,6 +10,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <net/pfe_eth/pfe_eth.h>
 #include <net/pfe_eth/pfe_firmware.h>
 
diff --git a/drivers/net/pfe_eth/pfe_eth.c b/drivers/net/pfe_eth/pfe_eth.c
index f582f8c5af5b..e79b1c0a89b1 100644
--- a/drivers/net/pfe_eth/pfe_eth.c
+++ b/drivers/net/pfe_eth/pfe_eth.c
@@ -14,6 +14,7 @@
 #include <net.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <net/pfe_eth/pfe_eth.h>
 #include <net/pfe_eth/pfe_mdio.h>
 
diff --git a/drivers/net/pfe_eth/pfe_firmware.c b/drivers/net/pfe_eth/pfe_firmware.c
index 286594d91b94..c11eb8b8ec02 100644
--- a/drivers/net/pfe_eth/pfe_firmware.c
+++ b/drivers/net/pfe_eth/pfe_firmware.c
@@ -17,6 +17,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <net/pfe_eth/pfe_eth.h>
 #include <net/pfe_eth/pfe_firmware.h>
 #include <spi_flash.h>
diff --git a/drivers/net/pfe_eth/pfe_hw.c b/drivers/net/pfe_eth/pfe_hw.c
index fb60e605b194..93b61eadd0d6 100644
--- a/drivers/net/pfe_eth/pfe_hw.c
+++ b/drivers/net/pfe_eth/pfe_hw.c
@@ -5,6 +5,7 @@
  */
 #include <log.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/string.h>
 #include <net/pfe_eth/pfe_eth.h>
diff --git a/drivers/net/pfe_eth/pfe_mdio.c b/drivers/net/pfe_eth/pfe_mdio.c
index 429ca8791126..55c563c846b7 100644
--- a/drivers/net/pfe_eth/pfe_mdio.c
+++ b/drivers/net/pfe_eth/pfe_mdio.c
@@ -9,6 +9,7 @@
 #include <malloc.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <asm/types.h>
 #include <dm/platform_data/pfe_dm_eth.h>
 #include <net.h>
 #include <linux/delay.h>
diff --git a/drivers/net/phy/aquantia.c b/drivers/net/phy/aquantia.c
index cfd2424ff114..5f317af8d269 100644
--- a/drivers/net/phy/aquantia.c
+++ b/drivers/net/phy/aquantia.c
@@ -11,12 +11,14 @@
 #include <log.h>
 #include <net.h>
 #include <phy.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <u-boot/crc.h>
 #include <malloc.h>
 #include <asm/byteorder.h>
diff --git a/drivers/net/phy/atheros.c b/drivers/net/phy/atheros.c
index dab348ccf9cb..5ab45728de92 100644
--- a/drivers/net/phy/atheros.c
+++ b/drivers/net/phy/atheros.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <phy.h>
 #include <stdbool.h>
+#include <asm/types.h>
 #include <dm/device_compat.h>
 #include <linux/bitfield.h>
 #include <linux/bitops.h>
diff --git a/drivers/net/phy/b53.c b/drivers/net/phy/b53.c
index 1bc9b2e4e7c8..94de3d80b9ac 100644
--- a/drivers/net/phy/b53.c
+++ b/drivers/net/phy/b53.c
@@ -26,6 +26,7 @@
 #include <command.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c
index 91e8f6123deb..f7b70f6c7b09 100644
--- a/drivers/net/phy/broadcom.c
+++ b/drivers/net/phy/broadcom.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <phy.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 /* Broadcom BCM54xx -- taken from linux sungem_phy */
diff --git a/drivers/net/phy/cortina.c b/drivers/net/phy/cortina.c
index 8ab483cdd58d..b3e84a5e2a0d 100644
--- a/drivers/net/phy/cortina.c
+++ b/drivers/net/phy/cortina.c
@@ -27,6 +27,7 @@
 #elif defined(CONFIG_SYS_CORTINA_FW_IN_MMC)
 #include <mmc.h>
 #endif
+#include <linux/types.h>
 
 #ifndef CONFIG_PHYLIB_10G
 #error The Cortina PHY needs 10G support
diff --git a/drivers/net/phy/dp83867.c b/drivers/net/phy/dp83867.c
index 3951cb00f414..08ff23f26fff 100644
--- a/drivers/net/phy/dp83867.c
+++ b/drivers/net/phy/dp83867.c
@@ -7,6 +7,7 @@
 #include <log.h>
 #include <phy.h>
 #include <stdbool.h>
+#include <asm/types.h>
 #include <dm/devres.h>
 #include <linux/bitops.h>
 #include <linux/compat.h>
diff --git a/drivers/net/phy/fixed.c b/drivers/net/phy/fixed.c
index 987cde1fc129..499a8c193ce9 100644
--- a/drivers/net/phy/fixed.c
+++ b/drivers/net/phy/fixed.c
@@ -13,6 +13,7 @@
 #include <fdt_support.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 
diff --git a/drivers/net/phy/generic_10g.c b/drivers/net/phy/generic_10g.c
index b4384e1f7818..778066a46b60 100644
--- a/drivers/net/phy/generic_10g.c
+++ b/drivers/net/phy/generic_10g.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <miiphy.h>
 #include <phy.h>
+#include <asm/types.h>
 
 int gen10g_shutdown(struct phy_device *phydev)
 {
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
index f03b5541a97e..caa245f0f649 100644
--- a/drivers/net/phy/marvell.c
+++ b/drivers/net/phy/marvell.c
@@ -9,6 +9,7 @@
 #include <errno.h>
 #include <phy.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/net/phy/micrel_ksz90x1.c b/drivers/net/phy/micrel_ksz90x1.c
index 2b7bbc8f419c..57753b354351 100644
--- a/drivers/net/phy/micrel_ksz90x1.c
+++ b/drivers/net/phy/micrel_ksz90x1.c
@@ -14,6 +14,7 @@
 #include <errno.h>
 #include <micrel.h>
 #include <phy.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 
diff --git a/drivers/net/phy/miiphybb.c b/drivers/net/phy/miiphybb.c
index d19a13dd62b6..9c8eec99de43 100644
--- a/drivers/net/phy/miiphybb.c
+++ b/drivers/net/phy/miiphybb.c
@@ -18,6 +18,7 @@
 #include <miiphy.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <linux/string.h>
 
 #define BB_MII_RELOCATE(v,off) (v += (v?off:0))
diff --git a/drivers/net/phy/mscc.c b/drivers/net/phy/mscc.c
index 08214ccc2f68..d0ea61b4f20d 100644
--- a/drivers/net/phy/mscc.c
+++ b/drivers/net/phy/mscc.c
@@ -12,8 +12,10 @@
 #include <log.h>
 #include <miiphy.h>
 #include <bitfield.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/net/phy/mv88e61xx.c b/drivers/net/phy/mv88e61xx.c
index 7e3c76923cb4..69fcab12ba4c 100644
--- a/drivers/net/phy/mv88e61xx.c
+++ b/drivers/net/phy/mv88e61xx.c
@@ -30,9 +30,11 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <log.h>
 #include <stdbool.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/net/phy/mv88e6352.c b/drivers/net/phy/mv88e6352.c
index c11ddf765f62..c8bb62fba9ce 100644
--- a/drivers/net/phy/mv88e6352.c
+++ b/drivers/net/phy/mv88e6352.c
@@ -10,6 +10,7 @@
 #include <miiphy.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <mv88e6352.h>
diff --git a/drivers/net/phy/ncsi.c b/drivers/net/phy/ncsi.c
index ed557355b917..d3e4082b4f9b 100644
--- a/drivers/net/phy/ncsi.c
+++ b/drivers/net/phy/ncsi.c
@@ -9,10 +9,12 @@
 #include <log.h>
 #include <malloc.h>
 #include <phy.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <net/ncsi.h>
 #include <net/ncsi-pkt.h>
 #include <asm/unaligned.h>
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index bda41672cc97..23d534ba4f0e 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -8,6 +8,7 @@
  * Based loosely off of Linux's PHY Lib
  */
 #include <common.h>
+#include <compiler.h>
 #include <console.h>
 #include <dm.h>
 #include <log.h>
@@ -17,6 +18,7 @@
 #include <miiphy.h>
 #include <phy.h>
 #include <errno.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
@@ -25,6 +27,7 @@
 #include <linux/compiler.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/net/phy/realtek.c b/drivers/net/phy/realtek.c
index 2f9b50e168ad..2963c21d3073 100644
--- a/drivers/net/phy/realtek.c
+++ b/drivers/net/phy/realtek.c
@@ -8,6 +8,7 @@
  */
 #include <common.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <phy.h>
 #include <linux/delay.h>
diff --git a/drivers/net/phy/teranetics.c b/drivers/net/phy/teranetics.c
index 7b5494eea98b..d1b1f4f2fc07 100644
--- a/drivers/net/phy/teranetics.c
+++ b/drivers/net/phy/teranetics.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <phy.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 #ifndef CONFIG_PHYLIB_10G
diff --git a/drivers/net/phy/vitesse.c b/drivers/net/phy/vitesse.c
index fdc676102369..9dbc1febbfad 100644
--- a/drivers/net/phy/vitesse.c
+++ b/drivers/net/phy/vitesse.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <miiphy.h>
 #include <stdio.h>
+#include <asm/types.h>
 
 /* Cicada Auxiliary Control/Status Register */
 #define MIIM_CIS82xx_AUX_CONSTAT	0x1c
diff --git a/drivers/net/phy/xilinx_gmii2rgmii.c b/drivers/net/phy/xilinx_gmii2rgmii.c
index 1a7b24f0f683..68e03dc7e91b 100644
--- a/drivers/net/phy/xilinx_gmii2rgmii.c
+++ b/drivers/net/phy/xilinx_gmii2rgmii.c
@@ -11,6 +11,7 @@
 #include <phy.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/net/phy/xilinx_phy.c b/drivers/net/phy/xilinx_phy.c
index 84fb1f0fe2e6..9c91e3468f9e 100644
--- a/drivers/net/phy/xilinx_phy.c
+++ b/drivers/net/phy/xilinx_phy.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <phy.h>
 #include <dm.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 
 #define MII_PHY_STATUS_SPD_MASK		0x0C00
diff --git a/drivers/net/pic32_eth.c b/drivers/net/pic32_eth.c
index 3be550e64d5b..cd562286db17 100644
--- a/drivers/net/pic32_eth.c
+++ b/drivers/net/pic32_eth.c
@@ -4,6 +4,7 @@
  *
  */
 #include <common.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <errno.h>
 #include <dm.h>
@@ -20,6 +21,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/mii.h>
+#include <linux/types.h>
 
 #include "pic32_eth.h"
 
diff --git a/drivers/net/pic32_eth.h b/drivers/net/pic32_eth.h
index 7b873bc7728b..bea05c9cb8dc 100644
--- a/drivers/net/pic32_eth.h
+++ b/drivers/net/pic32_eth.h
@@ -8,6 +8,7 @@
 #define __MICROCHIP_PIC32_ETH_H_
 
 #include <linux/bitops.h>
+#include <linux/types.h>
 #include <mach/pic32.h>
 
 /* Ethernet */
diff --git a/drivers/net/pic32_mdio.c b/drivers/net/pic32_mdio.c
index d30bceb4e53e..8fda01c82c53 100644
--- a/drivers/net/pic32_mdio.c
+++ b/drivers/net/pic32_mdio.c
@@ -15,6 +15,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "pic32_eth.h"
 
 static int pic32_mdio_write(struct mii_dev *bus,
diff --git a/drivers/net/ravb.c b/drivers/net/ravb.c
index 4fb1c7b5f6bc..31d9c50bab4b 100644
--- a/drivers/net/ravb.c
+++ b/drivers/net/ravb.c
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <dm.h>
 #include <errno.h>
@@ -29,6 +30,7 @@
 #include <asm/io.h>
 #include <asm/gpio.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /* Registers */
 #define RAVB_REG_CCC		0x000
diff --git a/drivers/net/rtl8169.c b/drivers/net/rtl8169.c
index f3d6ea89b997..129234426f16 100644
--- a/drivers/net/rtl8169.c
+++ b/drivers/net/rtl8169.c
@@ -61,6 +61,7 @@
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #undef DEBUG_RTL8169
 #undef DEBUG_RTL8169_TX
diff --git a/drivers/net/sandbox-raw-bus.c b/drivers/net/sandbox-raw-bus.c
index 1509630b8350..7b8806f91d31 100644
--- a/drivers/net/sandbox-raw-bus.c
+++ b/drivers/net/sandbox-raw-bus.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <malloc.h>
+#include <asm/types.h>
 #include <dm/device-internal.h>
 #include <dm/lists.h>
 #include <linux/errno.h>
diff --git a/drivers/net/sandbox-raw.c b/drivers/net/sandbox-raw.c
index cc358428a366..c5de94108236 100644
--- a/drivers/net/sandbox-raw.c
+++ b/drivers/net/sandbox-raw.c
@@ -16,6 +16,7 @@
 #include <net.h>
 #include <asm/global_data.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/net/sandbox.c b/drivers/net/sandbox.c
index 6e119f77b293..624aed2fc3a4 100644
--- a/drivers/net/sandbox.c
+++ b/drivers/net/sandbox.c
@@ -19,6 +19,7 @@
 #include <asm/test.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c
index 3a1a7fee4bc9..9d584c8934ce 100644
--- a/drivers/net/sh_eth.c
+++ b/drivers/net/sh_eth.c
@@ -8,6 +8,7 @@
  * Copyright (C) 2013, 2014 Renesas Electronics Corporation
  */
 
+#include <compiler.h>
 #include <config.h>
 #include <common.h>
 #include <cpu_func.h>
@@ -27,6 +28,7 @@
 #include <asm/io.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_DM_ETH
 #include <clk.h>
diff --git a/drivers/net/sh_eth.h b/drivers/net/sh_eth.h
index d197dfdc4015..8ab4643772b1 100644
--- a/drivers/net/sh_eth.h
+++ b/drivers/net/sh_eth.h
@@ -7,8 +7,10 @@
  * Copyright (c) 2007 Carlos Munoz <carlos@kenati.com>
  */
 
+#include <compiler.h>
 #include <netdev.h>
 #include <asm/types.h>
+#include <linux/types.h>
 
 #define SHETHER_NAME "sh_eth"
 
diff --git a/drivers/net/smc91111.c b/drivers/net/smc91111.c
index 036642b223b8..cc18c69e25ae 100644
--- a/drivers/net/smc91111.c
+++ b/drivers/net/smc91111.c
@@ -57,6 +57,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "smc91111.h"
 #include <net.h>
 
diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
index 2f3b8fa80790..f6bf03efbf1a 100644
--- a/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.c
@@ -10,6 +10,7 @@
 #include <malloc.h>
 #include <net.h>
 #include <miiphy.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/u-boot.h>
diff --git a/drivers/net/sni_ave.c b/drivers/net/sni_ave.c
index 21096bd6d32a..ea55c5e063ec 100644
--- a/drivers/net/sni_ave.c
+++ b/drivers/net/sni_ave.c
@@ -14,6 +14,7 @@
 #include <net.h>
 #include <regmap.h>
 #include <reset.h>
+#include <stdbool.h>
 #include <syscon.h>
 #include <vsprintf.h>
 #include <asm/cache.h>
@@ -28,6 +29,7 @@
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define AVE_GRST_DELAY_MSEC	40
 #define AVE_MIN_XMITSIZE	60
diff --git a/drivers/net/sun8i_emac.c b/drivers/net/sun8i_emac.c
index 3216360db15b..717aefeea455 100644
--- a/drivers/net/sun8i_emac.c
+++ b/drivers/net/sun8i_emac.c
@@ -12,6 +12,7 @@
 
 #include <cpu_func.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <vsprintf.h>
@@ -39,6 +40,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define MDIO_CMD_MII_BUSY		BIT(0)
 #define MDIO_CMD_MII_WRITE		BIT(1)
diff --git a/drivers/net/sunxi_emac.c b/drivers/net/sunxi_emac.c
index 4470c741fa9e..84d1c30afd42 100644
--- a/drivers/net/sunxi_emac.c
+++ b/drivers/net/sunxi_emac.c
@@ -21,6 +21,7 @@
 #include <asm/arch/gpio.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /* EMAC register  */
 struct emac_regs {
diff --git a/drivers/net/ti/am65-cpsw-nuss.c b/drivers/net/ti/am65-cpsw-nuss.c
index 950d1ca21229..f2dbd8b9f772 100644
--- a/drivers/net/ti/am65-cpsw-nuss.c
+++ b/drivers/net/ti/am65-cpsw-nuss.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/cache.h>
 #include <asm/io.h>
@@ -27,6 +28,7 @@
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/soc/ti/ti-udma.h>
+#include <linux/types.h>
 
 #include "cpsw_mdio.h"
 
diff --git a/drivers/net/ti/cpsw-common.c b/drivers/net/ti/cpsw-common.c
index 0b4adb1aa61d..01facc156b58 100644
--- a/drivers/net/ti/cpsw-common.c
+++ b/drivers/net/ti/cpsw-common.c
@@ -11,6 +11,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <cpsw.h>
+#include <asm/types.h>
 #include <dm/device_compat.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
diff --git a/drivers/net/ti/cpsw.c b/drivers/net/ti/cpsw.c
index 52155df2c540..2ed2ed26021d 100644
--- a/drivers/net/ti/cpsw.c
+++ b/drivers/net/ti/cpsw.c
@@ -15,6 +15,7 @@
 #include <net.h>
 #include <netdev.h>
 #include <cpsw.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/u-boot.h>
 #include <dm/device_compat.h>
@@ -29,6 +30,7 @@
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "cpsw_mdio.h"
 
diff --git a/drivers/net/ti/cpsw_mdio.c b/drivers/net/ti/cpsw_mdio.c
index 2e70477756ac..949062681890 100644
--- a/drivers/net/ti/cpsw_mdio.c
+++ b/drivers/net/ti/cpsw_mdio.c
@@ -15,6 +15,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 struct cpsw_mdio_regs {
 	u32	version;
diff --git a/drivers/net/ti/cpsw_mdio.h b/drivers/net/ti/cpsw_mdio.h
index dbf4a2dcacb0..f8ad72216e12 100644
--- a/drivers/net/ti/cpsw_mdio.h
+++ b/drivers/net/ti/cpsw_mdio.h
@@ -8,6 +8,7 @@
 #ifndef CPSW_MDIO_H_
 #define CPSW_MDIO_H_
 
+#include <asm/types.h>
 struct cpsw_mdio;
 
 struct mii_dev *cpsw_mdio_init(const char *name, phys_addr_t mdio_base,
diff --git a/drivers/net/ti/davinci_emac.c b/drivers/net/ti/davinci_emac.c
index f909ee7aa384..dddf78187d4b 100644
--- a/drivers/net/ti/davinci_emac.c
+++ b/drivers/net/ti/davinci_emac.c
@@ -38,6 +38,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "davinci_emac.h"
 
 unsigned int	emac_dbg = 0;
diff --git a/drivers/net/ti/davinci_emac.h b/drivers/net/ti/davinci_emac.h
index d235275772e9..fdc3946ee40c 100644
--- a/drivers/net/ti/davinci_emac.h
+++ b/drivers/net/ti/davinci_emac.h
@@ -10,6 +10,7 @@
 #define _DAVINCI_EMAC_H_
 /* Ethernet Min/Max packet size */
 #include <linux/kernel.h>
+#include <linux/types.h>
 #define EMAC_MIN_ETHERNET_PKT_SIZE	60
 #define EMAC_MAX_ETHERNET_PKT_SIZE	1518
 /* Buffer size (should be aligned on 32 byte and cache line) */
diff --git a/drivers/net/ti/keystone_net.c b/drivers/net/ti/keystone_net.c
index af67ec4a1c82..b30fef96b383 100644
--- a/drivers/net/ti/keystone_net.c
+++ b/drivers/net/ti/keystone_net.c
@@ -15,6 +15,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 #include <dm.h>
 #include <dm/lists.h>
diff --git a/drivers/net/tsec.c b/drivers/net/tsec.c
index 2f9ff5ec07f1..ab99cedaec56 100644
--- a/drivers/net/tsec.c
+++ b/drivers/net/tsec.c
@@ -7,6 +7,7 @@
  * author Andy Fleming
  */
 
+#include <compiler.h>
 #include <config.h>
 #include <common.h>
 #include <dm.h>
@@ -25,6 +26,7 @@
 #include <asm/io.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #ifndef CONFIG_DM_ETH
 /* Default initializations for TSEC controllers. */
diff --git a/drivers/net/uli526x.c b/drivers/net/uli526x.c
index 530341faa3f3..01ceac638735 100644
--- a/drivers/net/uli526x.c
+++ b/drivers/net/uli526x.c
@@ -21,6 +21,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /* some kernel function compatible define */
 
diff --git a/drivers/net/vsc7385.c b/drivers/net/vsc7385.c
index ba4793122ea8..be8ff7bbd0bc 100644
--- a/drivers/net/vsc7385.c
+++ b/drivers/net/vsc7385.c
@@ -18,6 +18,7 @@
 #include <log.h>
 #include <stdio.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include "vsc7385.h"
diff --git a/drivers/net/vsc9953.c b/drivers/net/vsc9953.c
index 36960bf12340..10163fc62a0e 100644
--- a/drivers/net/vsc9953.c
+++ b/drivers/net/vsc9953.c
@@ -22,6 +22,7 @@
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 static struct vsc9953_info vsc9953_l2sw = {
 		.port[0] = VSC9953_PORT_INFO_INITIALIZER(0),
diff --git a/drivers/net/xilinx_axi_emac.c b/drivers/net/xilinx_axi_emac.c
index 0da2385a92e9..fd9009d444ab 100644
--- a/drivers/net/xilinx_axi_emac.c
+++ b/drivers/net/xilinx_axi_emac.c
@@ -22,6 +22,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/net/xilinx_emaclite.c b/drivers/net/xilinx_emaclite.c
index 5334b61c7aad..6c0aba0e08d7 100644
--- a/drivers/net/xilinx_emaclite.c
+++ b/drivers/net/xilinx_emaclite.c
@@ -13,6 +13,7 @@
 #include <dm.h>
 #include <console.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <asm/global_data.h>
@@ -24,6 +25,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <asm/io.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/net/zynq_gem.c b/drivers/net/zynq_gem.c
index f31ce696ff07..ccb49a1fa665 100644
--- a/drivers/net/zynq_gem.c
+++ b/drivers/net/zynq_gem.c
@@ -10,6 +10,7 @@
 
 #include <clk.h>
 #include <common.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <dm.h>
 #include <log.h>
@@ -18,6 +19,7 @@
 #include <config.h>
 #include <console.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/cache.h>
 #include <asm/io.h>
@@ -34,6 +36,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /* Bit/mask specification */
 #define ZYNQ_GEM_PHYMNTNC_OP_MASK	0x40020000 /* operation mask bits */
diff --git a/drivers/nvme/nvme.c b/drivers/nvme/nvme.c
index 95c1d5065b3d..9a37f3b9e624 100644
--- a/drivers/nvme/nvme.c
+++ b/drivers/nvme/nvme.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <blk.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <dm.h>
 #include <errno.h>
@@ -13,6 +14,7 @@
 #include <malloc.h>
 #include <memalign.h>
 #include <pci.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <vsprintf.h>
@@ -21,6 +23,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "nvme.h"
 
 #define NVME_Q_DEPTH		2
diff --git a/drivers/nvme/nvme.h b/drivers/nvme/nvme.h
index c2914e2cb05b..cbc2fbe0395c 100644
--- a/drivers/nvme/nvme.h
+++ b/drivers/nvme/nvme.h
@@ -7,8 +7,10 @@
 #ifndef __DRIVER_NVME_H__
 #define __DRIVER_NVME_H__
 
+#include <compiler.h>
 #include <asm/io.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 struct nvme_id_power_state {
 	__le16			max_power;	/* centiwatts */
diff --git a/drivers/nvme/nvme_show.c b/drivers/nvme/nvme_show.c
index 2c3d7bcfa006..531c12b3b546 100644
--- a/drivers/nvme/nvme_show.c
+++ b/drivers/nvme/nvme_show.c
@@ -10,6 +10,7 @@
 #include <memalign.h>
 #include <nvme.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include "nvme.h"
 
diff --git a/drivers/pch/pch-uclass.c b/drivers/pch/pch-uclass.c
index 9bc45b5ddc93..794fcee4dfea 100644
--- a/drivers/pch/pch-uclass.c
+++ b/drivers/pch/pch-uclass.c
@@ -9,6 +9,7 @@
 #include <pch.h>
 #include <stdbool.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 int pch_get_spi_base(struct udevice *dev, ulong *sbasep)
 {
diff --git a/drivers/pch/pch7.c b/drivers/pch/pch7.c
index 9eb985225c84..2ea566b4b062 100644
--- a/drivers/pch/pch7.c
+++ b/drivers/pch/pch7.c
@@ -9,6 +9,7 @@
 #include <pch.h>
 #include <stdbool.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #define GPIO_BASE	0x44
 #define BIOS_CTRL	0xd8
diff --git a/drivers/pch/pch9.c b/drivers/pch/pch9.c
index f36b70c53ab7..6cea83e7bcfb 100644
--- a/drivers/pch/pch9.c
+++ b/drivers/pch/pch9.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <pch.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #define GPIO_BASE	0x48
 #define IO_BASE		0x4c
diff --git a/drivers/pch/sandbox_pch.c b/drivers/pch/sandbox_pch.c
index 28dfc03d793d..f1d28013b14f 100644
--- a/drivers/pch/sandbox_pch.c
+++ b/drivers/pch/sandbox_pch.c
@@ -8,6 +8,7 @@
 #include <pch.h>
 #include <stdbool.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 struct sandbox_pch_priv {
 	bool protect;
diff --git a/drivers/pci/fsl_pci_init.c b/drivers/pci/fsl_pci_init.c
index 5d8125e1e07c..621b6f6b6ec5 100644
--- a/drivers/pci/fsl_pci_init.c
+++ b/drivers/pci/fsl_pci_init.c
@@ -13,6 +13,7 @@
 #include <asm/fsl_serdes.h>
 #include <asm/global_data.h>
 #include <asm/ppc.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
diff --git a/drivers/pci/pci-aardvark.c b/drivers/pci/pci-aardvark.c
index b39a6d715b70..d18fc96cb645 100644
--- a/drivers/pci/pci-aardvark.c
+++ b/drivers/pci/pci-aardvark.c
@@ -36,6 +36,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/ioport.h>
+#include <linux/types.h>
 
 /* PCIe core registers */
 #define PCIE_CORE_CMD_STATUS_REG				0x4
diff --git a/drivers/pci/pci-emul-uclass.c b/drivers/pci/pci-emul-uclass.c
index 6a2242ab00cb..ec97625b6a47 100644
--- a/drivers/pci/pci-emul-uclass.c
+++ b/drivers/pci/pci-emul-uclass.c
@@ -12,6 +12,7 @@
 #include <linux/libfdt.h>
 #include <pci.h>
 #include <dm/lists.h>
+#include <linux/types.h>
 
 struct sandbox_pci_emul_priv {
 	int dev_count;
diff --git a/drivers/pci/pci-rcar-gen2.c b/drivers/pci/pci-rcar-gen2.c
index d73c171846f8..cd00023ac9bc 100644
--- a/drivers/pci/pci-rcar-gen2.c
+++ b/drivers/pci/pci-rcar-gen2.c
@@ -13,6 +13,7 @@
 #include <pci.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 /* AHB-PCI Bridge PCI communication registers */
 #define RCAR_AHBPCI_PCICOM_OFFSET	0x800
diff --git a/drivers/pci/pci-rcar-gen3.c b/drivers/pci/pci-rcar-gen3.c
index e630a2a6300e..b23ca71c6f84 100644
--- a/drivers/pci/pci-rcar-gen3.c
+++ b/drivers/pci/pci-rcar-gen3.c
@@ -25,6 +25,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #define PCIECAR			0x000010
 #define PCIECCTLR		0x000018
diff --git a/drivers/pci/pci-uclass.c b/drivers/pci/pci-uclass.c
index 88570d740f32..1d78a795ab7a 100644
--- a/drivers/pci/pci-uclass.c
+++ b/drivers/pci/pci-uclass.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <pci.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
@@ -26,6 +27,7 @@
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "pci_internal.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index dea111380038..8b1c38725824 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -15,6 +15,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <init.h>
 #include <log.h>
 #include <stdio.h>
@@ -22,6 +23,7 @@
 #include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include <command.h>
 #include <env.h>
diff --git a/drivers/pci/pci_auto.c b/drivers/pci/pci_auto.c
index 7a9ef884c787..e284e13ff2b3 100644
--- a/drivers/pci/pci_auto.c
+++ b/drivers/pci/pci_auto.c
@@ -14,6 +14,7 @@
 #include <pci.h>
 #include <stdbool.h>
 #include <stdio.h>
+#include <asm/types.h>
 
 /* the user can define CONFIG_SYS_PCI_CACHE_LINE_SIZE to avoid problems */
 #ifndef CONFIG_SYS_PCI_CACHE_LINE_SIZE
diff --git a/drivers/pci/pci_auto_common.c b/drivers/pci/pci_auto_common.c
index 7b756b7583aa..6dee803a6a4a 100644
--- a/drivers/pci/pci_auto_common.c
+++ b/drivers/pci/pci_auto_common.c
@@ -16,6 +16,7 @@
 #include <errno.h>
 #include <log.h>
 #include <pci.h>
+#include <stdbool.h>
 #include <linux/kernel.h>
 
 void pciauto_region_init(struct pci_region *res)
diff --git a/drivers/pci/pci_auto_old.c b/drivers/pci/pci_auto_old.c
index b32f7ea1f833..7eac27a32b63 100644
--- a/drivers/pci/pci_auto_old.c
+++ b/drivers/pci/pci_auto_old.c
@@ -11,6 +11,7 @@
 #include <errno.h>
 #include <log.h>
 #include <pci.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 
 /*
diff --git a/drivers/pci/pci_common.c b/drivers/pci/pci_common.c
index 7ee0980bb759..4772632b280d 100644
--- a/drivers/pci/pci_common.c
+++ b/drivers/pci/pci_common.c
@@ -10,6 +10,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <env.h>
 #include <errno.h>
@@ -17,6 +18,7 @@
 #include <stdio.h>
 #include <asm/io.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 const char *pci_class_str(u8 class)
 {
diff --git a/drivers/pci/pci_compat.c b/drivers/pci/pci_compat.c
index 9dddca8efe07..07178516e8ba 100644
--- a/drivers/pci/pci_compat.c
+++ b/drivers/pci/pci_compat.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <pci.h>
+#include <asm/types.h>
 #include <dm/device-internal.h>
 #include <dm/lists.h>
 #include "pci_internal.h"
diff --git a/drivers/pci/pci_gt64120.c b/drivers/pci/pci_gt64120.c
index bcadf4e4d889..738569042bfd 100644
--- a/drivers/pci/pci_gt64120.c
+++ b/drivers/pci/pci_gt64120.c
@@ -14,6 +14,7 @@
 #include <log.h>
 #include <pci.h>
 #include <pci_gt64120.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 
 #include <asm/io.h>
diff --git a/drivers/pci/pci_indirect.c b/drivers/pci/pci_indirect.c
index 6134c22d1bcc..092ee0424b9b 100644
--- a/drivers/pci/pci_indirect.c
+++ b/drivers/pci/pci_indirect.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <asm/types.h>
 
 #if !defined(__I386__) && !defined(CONFIG_DM_PCI)
 
diff --git a/drivers/pci/pci_mpc85xx.c b/drivers/pci/pci_mpc85xx.c
index d207f8e645ba..c18bfec1abd8 100644
--- a/drivers/pci/pci_mpc85xx.c
+++ b/drivers/pci/pci_mpc85xx.c
@@ -5,6 +5,7 @@
  *
  */
 #include <common.h>
+#include <compiler.h>
 #include <stdio.h>
 #include <asm/bitops.h>
 #include <asm/cpm_85xx.h>
@@ -12,6 +13,7 @@
 #include <dm.h>
 #include <asm/fsl_law.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 struct mpc85xx_pci_priv {
 	void __iomem		*cfg_addr;
diff --git a/drivers/pci/pci_msc01.c b/drivers/pci/pci_msc01.c
index ae312534c873..89118187dc12 100644
--- a/drivers/pci/pci_msc01.c
+++ b/drivers/pci/pci_msc01.c
@@ -10,6 +10,7 @@
 #include <pci.h>
 #include <pci_msc01.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 
 #define PCI_ACCESS_READ  0
diff --git a/drivers/pci/pci_mvebu.c b/drivers/pci/pci_mvebu.c
index 157924001ab6..e7ab4efd0bde 100644
--- a/drivers/pci/pci_mvebu.c
+++ b/drivers/pci/pci_mvebu.c
@@ -10,9 +10,11 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
@@ -29,6 +31,7 @@
 #include <linux/kernel.h>
 #include <linux/mbus.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/pci/pci_rom.c b/drivers/pci/pci_rom.c
index 7bc1a7f4deff..292b91c88e75 100644
--- a/drivers/pci/pci_rom.c
+++ b/drivers/pci/pci_rom.c
@@ -27,6 +27,7 @@
 #include <common.h>
 #include <bios_emul.h>
 #include <bootstage.h>
+#include <compiler.h>
 #include <dm.h>
 #include <errno.h>
 #include <init.h>
@@ -34,6 +35,7 @@
 #include <malloc.h>
 #include <pci.h>
 #include <pci_rom.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <vbe.h>
@@ -45,6 +47,7 @@
 #include <linux/kernel.h>
 #include <linux/screen_info.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/pci/pci_sandbox.c b/drivers/pci/pci_sandbox.c
index 4af0bf730347..253f47926a08 100644
--- a/drivers/pci/pci_sandbox.c
+++ b/drivers/pci/pci_sandbox.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <pci.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #define FDT_DEV_INFO_CELLS	4
 #define FDT_DEV_INFO_SIZE	(FDT_DEV_INFO_CELLS * sizeof(u32))
diff --git a/drivers/pci/pci_sh7751.c b/drivers/pci/pci_sh7751.c
index d5d1147f37db..0c7644fdfad2 100644
--- a/drivers/pci/pci_sh7751.c
+++ b/drivers/pci/pci_sh7751.c
@@ -15,6 +15,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 /* Register addresses and such */
 #define SH7751_BCR1	(vu_long *)0xFF800000
diff --git a/drivers/pci/pci_sh7780.c b/drivers/pci/pci_sh7780.c
index ed0834a984ec..f9a5b1127f05 100644
--- a/drivers/pci/pci_sh7780.c
+++ b/drivers/pci/pci_sh7780.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <stdio.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 #include <pci.h>
 #include <asm/processor.h>
diff --git a/drivers/pci/pci_tegra.c b/drivers/pci/pci_tegra.c
index 28b6aa026b15..c07b43901883 100644
--- a/drivers/pci/pci_tegra.c
+++ b/drivers/pci/pci_tegra.c
@@ -13,6 +13,7 @@
 
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
@@ -27,6 +28,7 @@
 #include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <asm/io.h>
 #include <asm/gpio.h>
diff --git a/drivers/pci/pci_x86.c b/drivers/pci/pci_x86.c
index 8d036930e73b..15da7bafdcf2 100644
--- a/drivers/pci/pci_x86.c
+++ b/drivers/pci/pci_x86.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <pci.h>
 #include <asm/pci.h>
+#include <linux/types.h>
 
 static int _pci_x86_read_config(const struct udevice *bus, pci_dev_t bdf,
 				uint offset, ulong *valuep,
diff --git a/drivers/pci/pcie_brcmstb.c b/drivers/pci/pcie_brcmstb.c
index 3f207f0de118..aef50954b18a 100644
--- a/drivers/pci/pcie_brcmstb.c
+++ b/drivers/pci/pcie_brcmstb.c
@@ -13,8 +13,10 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <errno.h>
 #include <dm.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <dm/ofnode.h>
 #include <pci.h>
@@ -24,6 +26,7 @@
 #include <linux/kernel.h>
 #include <linux/log2.h>
 #include <linux/iopoll.h>
+#include <linux/types.h>
 
 /* Offset of the mandatory PCIe capability config registers */
 #define BRCM_PCIE_CAP_REGS				0x00ac
diff --git a/drivers/pci/pcie_dw_mvebu.c b/drivers/pci/pcie_dw_mvebu.c
index 7eb4461ce26b..2f85d98d774f 100644
--- a/drivers/pci/pcie_dw_mvebu.c
+++ b/drivers/pci/pcie_dw_mvebu.c
@@ -22,6 +22,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/pci/pcie_dw_ti.c b/drivers/pci/pcie_dw_ti.c
index cc968fe2a3f5..4e45f8f5ca28 100644
--- a/drivers/pci/pcie_dw_ti.c
+++ b/drivers/pci/pcie_dw_ti.c
@@ -4,12 +4,14 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
 #include <pci.h>
 #include <generic-phy.h>
 #include <power-domain.h>
 #include <regmap.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <syscon.h>
 #include <time.h>
@@ -22,6 +24,7 @@
 #include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/pci/pcie_ecam_generic.c b/drivers/pci/pcie_ecam_generic.c
index 4039284f5392..605b0cbd315e 100644
--- a/drivers/pci/pcie_ecam_generic.c
+++ b/drivers/pci/pcie_ecam_generic.c
@@ -10,9 +10,11 @@
 #include <common.h>
 #include <dm.h>
 #include <pci.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 #include <linux/kernel.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 #include <asm/io.h>
 
diff --git a/drivers/pci/pcie_fsl.c b/drivers/pci/pcie_fsl.c
index 1aa1fb649a9f..f59781285afa 100644
--- a/drivers/pci/pcie_fsl.c
+++ b/drivers/pci/pcie_fsl.c
@@ -11,6 +11,7 @@
 #include <malloc.h>
 #include <mapmem.h>
 #include <pci.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/immap_85xx.h>
 #include <asm/fsl_pci.h>
@@ -21,6 +22,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 #include "pcie_fsl.h"
 #include <dm/device_compat.h>
 
diff --git a/drivers/pci/pcie_fsl.h b/drivers/pci/pcie_fsl.h
index 381185133d8b..6631d5d9c8cc 100644
--- a/drivers/pci/pcie_fsl.h
+++ b/drivers/pci/pcie_fsl.h
@@ -10,7 +10,9 @@
 #define _PCIE_FSL_H_
 
 /* GPEX CSR */
+#include <compiler.h>
 #include <stdbool.h>
+#include <asm/types.h>
 #define CSR_CLASSCODE			0x474
 
 #ifdef CONFIG_SYS_FSL_PCI_VER_3_X
diff --git a/drivers/pci/pcie_imx.c b/drivers/pci/pcie_imx.c
index 07c0695409ce..e7278809a5fe 100644
--- a/drivers/pci/pcie_imx.c
+++ b/drivers/pci/pcie_imx.c
@@ -10,10 +10,12 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <init.h>
 #include <log.h>
 #include <malloc.h>
 #include <pci.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/iomux.h>
@@ -28,6 +30,7 @@
 #include <errno.h>
 #include <asm/arch/sys_proto.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define PCI_ACCESS_READ  0
 #define PCI_ACCESS_WRITE 1
diff --git a/drivers/pci/pcie_intel_fpga.c b/drivers/pci/pcie_intel_fpga.c
index 9af0b8a105f8..7c118f7cdd37 100644
--- a/drivers/pci/pcie_intel_fpga.c
+++ b/drivers/pci/pcie_intel_fpga.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <pci.h>
 #include <stdbool.h>
@@ -16,6 +17,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #define RP_TX_REG0			0x2000
 #define RP_TX_CNTRL			0x2004
diff --git a/drivers/pci/pcie_layerscape.c b/drivers/pci/pcie_layerscape.c
index 3c7c4ca18e8b..5425708e7706 100644
--- a/drivers/pci/pcie_layerscape.c
+++ b/drivers/pci/pcie_layerscape.c
@@ -15,6 +15,7 @@
 	defined(CONFIG_ARM)
 #include <asm/arch/clock.h>
 #endif
+#include <linux/types.h>
 #include "pcie_layerscape.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/pci/pcie_layerscape.h b/drivers/pci/pcie_layerscape.h
index 20b86aa382c5..54129c71ef5f 100644
--- a/drivers/pci/pcie_layerscape.h
+++ b/drivers/pci/pcie_layerscape.h
@@ -7,8 +7,10 @@
 
 #ifndef _PCIE_LAYERSCAPE_H_
 #define _PCIE_LAYERSCAPE_H_
+#include <compiler.h>
 #include <pci.h>
 #include <stdbool.h>
+#include <asm/types.h>
 #include <linux/sizes.h>
 
 #ifndef CONFIG_SYS_PCI_MEMORY_BUS
diff --git a/drivers/pci/pcie_layerscape_ep.c b/drivers/pci/pcie_layerscape_ep.c
index ad622b8b5a21..c093409f67c2 100644
--- a/drivers/pci/pcie_layerscape_ep.c
+++ b/drivers/pci/pcie_layerscape_ep.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <stdio.h>
 #include <asm/global_data.h>
@@ -16,6 +17,7 @@
 #include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <linux/log2.h>
+#include <linux/types.h>
 #include "pcie_layerscape.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/pci/pcie_layerscape_fixup.c b/drivers/pci/pcie_layerscape_fixup.c
index 2adc2aa251bb..fdc424b897aa 100644
--- a/drivers/pci/pcie_layerscape_fixup.c
+++ b/drivers/pci/pcie_layerscape_fixup.c
@@ -21,6 +21,7 @@
 #endif
 #include <asm/u-boot.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include "pcie_layerscape.h"
 #include "pcie_layerscape_fixup_common.h"
 
diff --git a/drivers/pci/pcie_layerscape_fixup_common.c b/drivers/pci/pcie_layerscape_fixup_common.c
index d4d5bba8523e..0eed44c689d5 100644
--- a/drivers/pci/pcie_layerscape_fixup_common.c
+++ b/drivers/pci/pcie_layerscape_fixup_common.c
@@ -16,6 +16,7 @@
 #include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "pcie_layerscape_fixup_common.h"
 
 void ft_pci_setup(void *blob, struct bd_info *bd)
diff --git a/drivers/pci/pcie_layerscape_gen4.c b/drivers/pci/pcie_layerscape_gen4.c
index 7046960c77a2..ea68f39d50b4 100644
--- a/drivers/pci/pcie_layerscape_gen4.c
+++ b/drivers/pci/pcie_layerscape_gen4.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/arch/fsl_serdes.h>
 #include <pci.h>
@@ -19,6 +20,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/sizes.h>
+#include <linux/types.h>
 
 #include "pcie_layerscape_gen4.h"
 
diff --git a/drivers/pci/pcie_layerscape_gen4.h b/drivers/pci/pcie_layerscape_gen4.h
index 12669c5d8cf9..07617498a221 100644
--- a/drivers/pci/pcie_layerscape_gen4.h
+++ b/drivers/pci/pcie_layerscape_gen4.h
@@ -8,8 +8,10 @@
 
 #ifndef _PCIE_LAYERSCAPE_GEN4_H_
 #define _PCIE_LAYERSCAPE_GEN4_H_
+#include <compiler.h>
 #include <pci.h>
 #include <stdbool.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 
 #ifndef CONFIG_SYS_PCI_MEMORY_SIZE
diff --git a/drivers/pci/pcie_layerscape_gen4_fixup.c b/drivers/pci/pcie_layerscape_gen4_fixup.c
index e16c0daa7858..7c0eb4213f65 100644
--- a/drivers/pci/pcie_layerscape_gen4_fixup.c
+++ b/drivers/pci/pcie_layerscape_gen4_fixup.c
@@ -20,6 +20,7 @@
 #ifdef CONFIG_ARM
 #include <asm/arch/clock.h>
 #endif
+#include <asm/types.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
 #include "pcie_layerscape_gen4.h"
diff --git a/drivers/pci/pcie_layerscape_rc.c b/drivers/pci/pcie_layerscape_rc.c
index 973a481c3b43..b1834958e8f6 100644
--- a/drivers/pci/pcie_layerscape_rc.c
+++ b/drivers/pci/pcie_layerscape_rc.c
@@ -19,6 +19,7 @@
 #include <asm/arch/clock.h>
 #endif
 #include <linux/errno.h>
+#include <linux/types.h>
 #include "pcie_layerscape.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/pci/pcie_mediatek.c b/drivers/pci/pcie_mediatek.c
index 29d82739486e..775e6a463bd6 100644
--- a/drivers/pci/pcie_mediatek.c
+++ b/drivers/pci/pcie_mediatek.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <dm.h>
 #include <generic-phy.h>
 #include <log.h>
@@ -23,6 +24,7 @@
 #include <linux/iopoll.h>
 #include <linux/list.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 /* PCIe shared registers */
 #define PCIE_SYS_CFG		0x00
diff --git a/drivers/pci/pcie_phytium.c b/drivers/pci/pcie_phytium.c
index 3d91706ccf1c..39c65fe074a3 100644
--- a/drivers/pci/pcie_phytium.c
+++ b/drivers/pci/pcie_phytium.c
@@ -14,6 +14,7 @@
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 /**
  * struct phytium_pcie - phytium PCIe controller state
diff --git a/drivers/pci/pcie_rockchip.c b/drivers/pci/pcie_rockchip.c
index 460d74a3088b..e6b90167796b 100644
--- a/drivers/pci/pcie_rockchip.c
+++ b/drivers/pci/pcie_rockchip.c
@@ -20,6 +20,7 @@
 #include <pci.h>
 #include <power-domain.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <power/regulator.h>
 #include <reset.h>
 #include <syscon.h>
diff --git a/drivers/pci/pcie_xilinx.c b/drivers/pci/pcie_xilinx.c
index 1bce36bc95e9..a1fd61179a7f 100644
--- a/drivers/pci/pcie_xilinx.c
+++ b/drivers/pci/pcie_xilinx.c
@@ -13,6 +13,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 #include <asm/io.h>
 
diff --git a/drivers/pci_endpoint/pci_ep-uclass.c b/drivers/pci_endpoint/pci_ep-uclass.c
index 8e672e812d16..0d0912f1bc32 100644
--- a/drivers/pci_endpoint/pci_ep-uclass.c
+++ b/drivers/pci_endpoint/pci_ep-uclass.c
@@ -17,6 +17,7 @@
 #include <linux/kernel.h>
 #include <linux/log2.h>
 #include <pci_ep.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/pci_endpoint/pcie-cadence-ep.c b/drivers/pci_endpoint/pcie-cadence-ep.c
index 66c7dece3105..268cda83a432 100644
--- a/drivers/pci_endpoint/pcie-cadence-ep.c
+++ b/drivers/pci_endpoint/pcie-cadence-ep.c
@@ -8,11 +8,13 @@
 #include <dm.h>
 #include <errno.h>
 #include <pci_ep.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <linux/log2.h>
+#include <linux/types.h>
 #include "pcie-cadence.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/pci_endpoint/pcie-cadence.h b/drivers/pci_endpoint/pcie-cadence.h
index 8a659c36aa24..b74e37d1cae0 100644
--- a/drivers/pci_endpoint/pcie-cadence.h
+++ b/drivers/pci_endpoint/pcie-cadence.h
@@ -12,8 +12,10 @@
 #define PCIE_CADENCE_H
 
 #include <common.h>
+#include <compiler.h>
 #include <pci_ep.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 
 /*
diff --git a/drivers/pci_endpoint/sandbox-pci_ep.c b/drivers/pci_endpoint/sandbox-pci_ep.c
index 59c330066d7f..f5b26de5e3ac 100644
--- a/drivers/pci_endpoint/sandbox-pci_ep.c
+++ b/drivers/pci_endpoint/sandbox-pci_ep.c
@@ -11,6 +11,7 @@
 #include <asm/test.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /**
  * struct sandbox_pci_ep_priv - private data for driver
diff --git a/drivers/phy/allwinner/phy-sun4i-usb.c b/drivers/phy/allwinner/phy-sun4i-usb.c
index 17c2de2caee0..89c466e10d88 100644
--- a/drivers/phy/allwinner/phy-sun4i-usb.c
+++ b/drivers/phy/allwinner/phy-sun4i-usb.c
@@ -12,8 +12,10 @@
 
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
+#include <stdbool.h>
 #include <vsprintf.h>
 #include <dm/device.h>
 #include <generic-phy.h>
@@ -29,6 +31,7 @@
 #include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define REG_ISCR			0x00
 #define REG_PHYCTL_A10			0x04
diff --git a/drivers/phy/bcm6318-usbh-phy.c b/drivers/phy/bcm6318-usbh-phy.c
index f6b7e4c1ca58..f26ff381c1aa 100644
--- a/drivers/phy/bcm6318-usbh-phy.c
+++ b/drivers/phy/bcm6318-usbh-phy.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <dm.h>
 #include <generic-phy.h>
 #include <log.h>
diff --git a/drivers/phy/bcm6348-usbh-phy.c b/drivers/phy/bcm6348-usbh-phy.c
index 13031b886d47..b3f02eb5fc15 100644
--- a/drivers/phy/bcm6348-usbh-phy.c
+++ b/drivers/phy/bcm6348-usbh-phy.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <dm.h>
 #include <generic-phy.h>
 #include <log.h>
diff --git a/drivers/phy/bcm6358-usbh-phy.c b/drivers/phy/bcm6358-usbh-phy.c
index aaa32315fa74..d8b9fcec85ba 100644
--- a/drivers/phy/bcm6358-usbh-phy.c
+++ b/drivers/phy/bcm6358-usbh-phy.c
@@ -8,6 +8,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <generic-phy.h>
 #include <log.h>
diff --git a/drivers/phy/bcm6368-usbh-phy.c b/drivers/phy/bcm6368-usbh-phy.c
index 3bd4d6884193..eaeba233ce72 100644
--- a/drivers/phy/bcm6368-usbh-phy.c
+++ b/drivers/phy/bcm6368-usbh-phy.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <dm.h>
 #include <generic-phy.h>
 #include <log.h>
@@ -20,6 +21,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 /* USBH PLL Control register */
 #define USBH_PLL_REG		0x18
diff --git a/drivers/phy/keystone-usb-phy.c b/drivers/phy/keystone-usb-phy.c
index 2806ee50ead4..f4c07430025d 100644
--- a/drivers/phy/keystone-usb-phy.c
+++ b/drivers/phy/keystone-usb-phy.c
@@ -5,8 +5,10 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
+#include <asm/types.h>
 #include <dm/device.h>
 #include <generic-phy.h>
 #include <asm/io.h>
diff --git a/drivers/phy/marvell/comphy_a3700.c b/drivers/phy/marvell/comphy_a3700.c
index 696b36d40c94..6a20d1721e42 100644
--- a/drivers/phy/marvell/comphy_a3700.c
+++ b/drivers/phy/marvell/comphy_a3700.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
 
diff --git a/drivers/phy/marvell/comphy_core.c b/drivers/phy/marvell/comphy_core.c
index 99f68fff12cf..f5f9d5799805 100644
--- a/drivers/phy/marvell/comphy_core.c
+++ b/drivers/phy/marvell/comphy_core.c
@@ -6,11 +6,13 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <fdtdec.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <dm/device_compat.h>
 #include <linux/err.h>
 #include <linux/errno.h>
diff --git a/drivers/phy/marvell/comphy_core.h b/drivers/phy/marvell/comphy_core.h
index 58c5c2fabdc8..12a19bc83cc9 100644
--- a/drivers/phy/marvell/comphy_core.h
+++ b/drivers/phy/marvell/comphy_core.h
@@ -6,8 +6,10 @@
 #ifndef _COMPHY_CORE_H_
 #define _COMPHY_CORE_H_
 
+#include <compiler.h>
 #include <fdtdec.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <mvebu/comphy.h>
 
 #if defined(DEBUG)
diff --git a/drivers/phy/marvell/comphy_cp110.c b/drivers/phy/marvell/comphy_cp110.c
index 532ae928a8c1..ab2163978d28 100644
--- a/drivers/phy/marvell/comphy_cp110.c
+++ b/drivers/phy/marvell/comphy_cp110.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <fdtdec.h>
 #include <log.h>
 #include <stdbool.h>
@@ -12,6 +13,7 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/printk.h>
 
diff --git a/drivers/phy/marvell/comphy_mux.c b/drivers/phy/marvell/comphy_mux.c
index 98327557a899..96ff0399b433 100644
--- a/drivers/phy/marvell/comphy_mux.c
+++ b/drivers/phy/marvell/comphy_mux.c
@@ -4,8 +4,10 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <log.h>
 #include <asm/io.h>
+#include <asm/types.h>
 
 #include "comphy_core.h"
 #include "comphy_hpipe.h"
diff --git a/drivers/phy/meson-g12a-usb3-pcie.c b/drivers/phy/meson-g12a-usb3-pcie.c
index 02feae1e2cd8..f354fd58414f 100644
--- a/drivers/phy/meson-g12a-usb3-pcie.c
+++ b/drivers/phy/meson-g12a-usb3-pcie.c
@@ -20,6 +20,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 #include <linux/bitops.h>
 #include <linux/compat.h>
diff --git a/drivers/phy/meson-gxbb-usb2.c b/drivers/phy/meson-gxbb-usb2.c
index 8a06bc5aadb9..770422dddf18 100644
--- a/drivers/phy/meson-gxbb-usb2.c
+++ b/drivers/phy/meson-gxbb-usb2.c
@@ -14,6 +14,7 @@
 #include <generic-phy.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 #include <power/regulator.h>
 #include <regmap.h>
 #include <reset.h>
diff --git a/drivers/phy/meson-gxl-usb2.c b/drivers/phy/meson-gxl-usb2.c
index ebfde063ee8b..476a6f15ecca 100644
--- a/drivers/phy/meson-gxl-usb2.c
+++ b/drivers/phy/meson-gxl-usb2.c
@@ -18,6 +18,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 #include <power/regulator.h>
 #include <clk.h>
 #include <linux/usb/otg.h>
diff --git a/drivers/phy/meson-gxl-usb3.c b/drivers/phy/meson-gxl-usb3.c
index f566ef786638..3afab512acc8 100644
--- a/drivers/phy/meson-gxl-usb3.c
+++ b/drivers/phy/meson-gxl-usb3.c
@@ -18,6 +18,7 @@
 #include <clk.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 #include <linux/usb/otg.h>
 
 #include <asm/arch/usb-gx.h>
diff --git a/drivers/phy/msm8916-usbh-phy.c b/drivers/phy/msm8916-usbh-phy.c
index 5883926f0877..e3e2d90da372 100644
--- a/drivers/phy/msm8916-usbh-phy.c
+++ b/drivers/phy/msm8916-usbh-phy.c
@@ -4,8 +4,10 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <generic-phy.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <usb/ehci-ci.h>
diff --git a/drivers/phy/mt76x8-usb-phy.c b/drivers/phy/mt76x8-usb-phy.c
index 8c05e5e00df2..292c6e055f00 100644
--- a/drivers/phy/mt76x8-usb-phy.c
+++ b/drivers/phy/mt76x8-usb-phy.c
@@ -8,11 +8,13 @@
 
 #include <clk.h>
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <generic-phy.h>
 #include <log.h>
 #include <reset.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/phy/omap-usb2-phy.c b/drivers/phy/omap-usb2-phy.c
index df9ee1402917..aec83a96d936 100644
--- a/drivers/phy/omap-usb2-phy.c
+++ b/drivers/phy/omap-usb2-phy.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
@@ -18,6 +19,7 @@
 #include <linux/bitops.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #define OMAP_USB2_CALIBRATE_FALSE_DISCONNECT	BIT(0)
 #define OMAP_USB2_DISABLE_CHG_DET		BIT(1)
diff --git a/drivers/phy/phy-mtk-tphy.c b/drivers/phy/phy-mtk-tphy.c
index 375a7575b779..745b616c2f93 100644
--- a/drivers/phy/phy-mtk-tphy.c
+++ b/drivers/phy/phy-mtk-tphy.c
@@ -7,11 +7,13 @@
 
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <dm.h>
 #include <generic-phy.h>
 #include <malloc.h>
 #include <mapmem.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <dm/device_compat.h>
 #include <dm/devres.h>
 #include <linux/bitops.h>
diff --git a/drivers/phy/phy-rcar-gen2.c b/drivers/phy/phy-rcar-gen2.c
index db32d3b1a41c..16edcc9e0362 100644
--- a/drivers/phy/phy-rcar-gen2.c
+++ b/drivers/phy/phy-rcar-gen2.c
@@ -16,6 +16,7 @@
 #include <syscon.h>
 #include <usb.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/drivers/phy/phy-stm32-usbphyc.c b/drivers/phy/phy-stm32-usbphyc.c
index 4b7cd602c264..e3c13c5585c0 100644
--- a/drivers/phy/phy-stm32-usbphyc.c
+++ b/drivers/phy/phy-stm32-usbphyc.c
@@ -15,6 +15,7 @@
 #include <syscon.h>
 #include <usb.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/drivers/phy/phy-ti-am654.c b/drivers/phy/phy-ti-am654.c
index fa22b7145405..11d5f7346d16 100644
--- a/drivers/phy/phy-ti-am654.c
+++ b/drivers/phy/phy-ti-am654.c
@@ -10,6 +10,7 @@
 #include <clk-uclass.h>
 #include <dm.h>
 #include <log.h>
+#include <asm/types.h>
 #include <dm/device.h>
 #include <dm/device_compat.h>
 #include <dm/lists.h>
diff --git a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
index 008f1f629a8f..b78712bbbb58 100644
--- a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
+++ b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
@@ -22,6 +22,7 @@
 #include <linux/iopoll.h>
 #include <asm/arch-rockchip/clock.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/phy/rockchip/phy-rockchip-pcie.c b/drivers/phy/rockchip/phy-rockchip-pcie.c
index fc7801224ace..c9106f19f4f4 100644
--- a/drivers/phy/rockchip/phy-rockchip-pcie.c
+++ b/drivers/phy/rockchip/phy-rockchip-pcie.c
@@ -20,6 +20,7 @@
 #include <linux/errno.h>
 #include <linux/iopoll.h>
 #include <asm/arch-rockchip/clock.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/phy/rockchip/phy-rockchip-typec.c b/drivers/phy/rockchip/phy-rockchip-typec.c
index 00a0e4d4313d..682cb141d338 100644
--- a/drivers/phy/rockchip/phy-rockchip-typec.c
+++ b/drivers/phy/rockchip/phy-rockchip-typec.c
@@ -10,7 +10,9 @@
 
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <dm.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 #include <dm/device_compat.h>
 #include <dm/lists.h>
@@ -24,6 +26,7 @@
 #include <asm/arch-rockchip/clock.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/phy/sti_usb_phy.c b/drivers/phy/sti_usb_phy.c
index 91ba53f8bdb9..fe352c59fe6f 100644
--- a/drivers/phy/sti_usb_phy.c
+++ b/drivers/phy/sti_usb_phy.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <log.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
@@ -13,6 +14,7 @@
 #include <errno.h>
 #include <fdtdec.h>
 #include <generic-phy.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/libfdt.h>
diff --git a/drivers/phy/ti-pipe3-phy.c b/drivers/phy/ti-pipe3-phy.c
index 96a573add48f..f1a5824811b2 100644
--- a/drivers/phy/ti-pipe3-phy.c
+++ b/drivers/phy/ti-pipe3-phy.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <stdio.h>
 #include <asm/global_data.h>
@@ -19,6 +20,7 @@
 #include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 /* PLLCTRL Registers */
 #define PLL_STATUS              0x00000004
diff --git a/drivers/pinctrl/aspeed/pinctrl_ast2500.c b/drivers/pinctrl/aspeed/pinctrl_ast2500.c
index 040247c68a1c..3ba3a67f118f 100644
--- a/drivers/pinctrl/aspeed/pinctrl_ast2500.c
+++ b/drivers/pinctrl/aspeed/pinctrl_ast2500.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <asm/arch/pinctrl.h>
 #include <asm/arch/scu_ast2500.h>
+#include <asm/types.h>
 #include <dm/pinctrl.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
diff --git a/drivers/pinctrl/ath79/pinctrl_ar933x.c b/drivers/pinctrl/ath79/pinctrl_ar933x.c
index dce174024405..6fb80f2ea734 100644
--- a/drivers/pinctrl/ath79/pinctrl_ar933x.c
+++ b/drivers/pinctrl/ath79/pinctrl_ar933x.c
@@ -4,11 +4,13 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <dm/pinctrl.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
diff --git a/drivers/pinctrl/ath79/pinctrl_qca953x.c b/drivers/pinctrl/ath79/pinctrl_qca953x.c
index 1e11eb863ca2..b6a9e4a00288 100644
--- a/drivers/pinctrl/ath79/pinctrl_qca953x.c
+++ b/drivers/pinctrl/ath79/pinctrl_qca953x.c
@@ -4,11 +4,13 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <dm/pinctrl.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
diff --git a/drivers/pinctrl/broadcom/pinctrl-bcm283x.c b/drivers/pinctrl/broadcom/pinctrl-bcm283x.c
index a7c928c71e39..ea1477dcbc86 100644
--- a/drivers/pinctrl/broadcom/pinctrl-bcm283x.c
+++ b/drivers/pinctrl/broadcom/pinctrl-bcm283x.c
@@ -16,6 +16,7 @@
 #include <dm.h>
 #include <log.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <dm/pinctrl.h>
 #include <dm/root.h>
 #include <dm/device-internal.h>
diff --git a/drivers/pinctrl/broadcom/pinctrl-bcm6838.c b/drivers/pinctrl/broadcom/pinctrl-bcm6838.c
index 2f871b611fd5..fc17d4c6f01a 100644
--- a/drivers/pinctrl/broadcom/pinctrl-bcm6838.c
+++ b/drivers/pinctrl/broadcom/pinctrl-bcm6838.c
@@ -8,6 +8,7 @@
 #include <dm/device_compat.h>
 #include <dm/pinctrl.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #define BCM6838_CMD_LOAD_MUX            0x21
 
diff --git a/drivers/pinctrl/exynos/pinctrl-exynos.c b/drivers/pinctrl/exynos/pinctrl-exynos.c
index 4a49519416c3..d53eeed756e6 100644
--- a/drivers/pinctrl/exynos/pinctrl-exynos.c
+++ b/drivers/pinctrl/exynos/pinctrl-exynos.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 #include "pinctrl-exynos.h"
diff --git a/drivers/pinctrl/exynos/pinctrl-exynos7420.c b/drivers/pinctrl/exynos/pinctrl-exynos7420.c
index 18de9f7762ca..5f6064f3a7e9 100644
--- a/drivers/pinctrl/exynos/pinctrl-exynos7420.c
+++ b/drivers/pinctrl/exynos/pinctrl-exynos7420.c
@@ -15,6 +15,7 @@
 #include <asm/arch/pinmux.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include "pinctrl-exynos.h"
 
 #define	GPD1_OFFSET	0xc0
diff --git a/drivers/pinctrl/intel/pinctrl.c b/drivers/pinctrl/intel/pinctrl.c
index aa261a8bdc5d..9000a97427f9 100644
--- a/drivers/pinctrl/intel/pinctrl.c
+++ b/drivers/pinctrl/intel/pinctrl.c
@@ -33,6 +33,7 @@
 #include <dt-bindings/gpio/gpio.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #define GPIO_DW_SIZE(x)			(sizeof(u32) * (x))
 #define PAD_CFG_OFFSET(x, dw_num)	((x) + GPIO_DW_SIZE(dw_num))
diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
index 362c7d477265..1672e6242d95 100644
--- a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <asm/types.h>
 #include <dm/device-internal.h>
 #include <dm/lists.h>
 #include <dm/pinctrl.h>
diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common.h b/drivers/pinctrl/mediatek/pinctrl-mtk-common.h
index def643c5d5b9..5c51acfb6c26 100644
--- a/drivers/pinctrl/mediatek/pinctrl-mtk-common.h
+++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common.h
@@ -6,6 +6,8 @@
 #ifndef __PINCTRL_MEDIATEK_H__
 #define __PINCTRL_MEDIATEK_H__
 
+#include <compiler.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 #define MTK_PINCTRL_V0 0x0
 #define MTK_PINCTRL_V1 0x1
diff --git a/drivers/pinctrl/meson/pinctrl-meson-axg.c b/drivers/pinctrl/meson/pinctrl-meson-axg.c
index a2bed97accf7..7987b176bc60 100644
--- a/drivers/pinctrl/meson/pinctrl-meson-axg.c
+++ b/drivers/pinctrl/meson/pinctrl-meson-axg.c
@@ -12,6 +12,7 @@
 #include <dm/pinctrl.h>
 #include <dt-bindings/gpio/meson-axg-gpio.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include "pinctrl-meson-axg.h"
 
diff --git a/drivers/pinctrl/meson/pinctrl-meson-g12a.c b/drivers/pinctrl/meson/pinctrl-meson-g12a.c
index 2a38e321496d..dcdafa114b93 100644
--- a/drivers/pinctrl/meson/pinctrl-meson-g12a.c
+++ b/drivers/pinctrl/meson/pinctrl-meson-g12a.c
@@ -13,6 +13,7 @@
 #include <dm/pinctrl.h>
 #include <dt-bindings/gpio/meson-g12a-gpio.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include "pinctrl-meson-axg.h"
 
diff --git a/drivers/pinctrl/meson/pinctrl-meson-gx-pmx.c b/drivers/pinctrl/meson/pinctrl-meson-gx-pmx.c
index 3d896cc1303a..1c053c4d9086 100644
--- a/drivers/pinctrl/meson/pinctrl-meson-gx-pmx.c
+++ b/drivers/pinctrl/meson/pinctrl-meson-gx-pmx.c
@@ -3,11 +3,13 @@
  * (C) Copyright 2016 - Beniamino Galvani <b.galvani@gmail.com>
  */
 
+#include <compiler.h>
 #include <log.h>
 #include <vsprintf.h>
 #include <asm/gpio.h>
 #include <common.h>
 #include <dm.h>
+#include <asm/types.h>
 #include <dm/pinctrl.h>
 #include <linux/bitops.h>
 #include <linux/io.h>
diff --git a/drivers/pinctrl/meson/pinctrl-meson-gxbb.c b/drivers/pinctrl/meson/pinctrl-meson-gxbb.c
index cb755d6cfc5c..f77ca812050c 100644
--- a/drivers/pinctrl/meson/pinctrl-meson-gxbb.c
+++ b/drivers/pinctrl/meson/pinctrl-meson-gxbb.c
@@ -11,6 +11,7 @@
 #include <dm/pinctrl.h>
 #include <dt-bindings/gpio/meson-gxbb-gpio.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include "pinctrl-meson-gx.h"
 
diff --git a/drivers/pinctrl/meson/pinctrl-meson-gxl.c b/drivers/pinctrl/meson/pinctrl-meson-gxl.c
index f28f07bce1aa..77d8edd161d5 100644
--- a/drivers/pinctrl/meson/pinctrl-meson-gxl.c
+++ b/drivers/pinctrl/meson/pinctrl-meson-gxl.c
@@ -11,6 +11,7 @@
 #include <dm/pinctrl.h>
 #include <dt-bindings/gpio/meson-gxl-gpio.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include "pinctrl-meson-gx.h"
 
diff --git a/drivers/pinctrl/meson/pinctrl-meson.c b/drivers/pinctrl/meson/pinctrl-meson.c
index ad44da1e8bba..7c5922d41c76 100644
--- a/drivers/pinctrl/meson/pinctrl-meson.c
+++ b/drivers/pinctrl/meson/pinctrl-meson.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
 #include <malloc.h>
diff --git a/drivers/pinctrl/meson/pinctrl-meson.h b/drivers/pinctrl/meson/pinctrl-meson.h
index eb33d93f506f..4dc963387a2e 100644
--- a/drivers/pinctrl/meson/pinctrl-meson.h
+++ b/drivers/pinctrl/meson/pinctrl-meson.h
@@ -6,6 +6,7 @@
 #ifndef __PINCTRL_MESON_H__
 #define __PINCTRL_MESON_H__
 
+#include <compiler.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
 
diff --git a/drivers/pinctrl/mscc/mscc-common.c b/drivers/pinctrl/mscc/mscc-common.c
index 308f23b742df..84f154b61672 100644
--- a/drivers/pinctrl/mscc/mscc-common.c
+++ b/drivers/pinctrl/mscc/mscc-common.c
@@ -13,6 +13,7 @@
 #include <common.h>
 #include <config.h>
 #include <dm.h>
+#include <asm/types.h>
 #include <dm/device-internal.h>
 #include <dm/device_compat.h>
 #include <dm/devres.h>
diff --git a/drivers/pinctrl/mscc/mscc-common.h b/drivers/pinctrl/mscc/mscc-common.h
index 3c5c1faf840f..ddd41adc2b87 100644
--- a/drivers/pinctrl/mscc/mscc-common.h
+++ b/drivers/pinctrl/mscc/mscc-common.h
@@ -7,6 +7,7 @@
  * Copyright (c) 2017 Microsemi Corporation
  */
 
+#include <compiler.h>
 #define MSCC_FUNC_PER_PIN	4
 
 enum mscc_regs_gpio {
diff --git a/drivers/pinctrl/mtmips/pinctrl-mt7628.c b/drivers/pinctrl/mtmips/pinctrl-mt7628.c
index 4ea1e853f783..49a26b9afc3a 100644
--- a/drivers/pinctrl/mtmips/pinctrl-mt7628.c
+++ b/drivers/pinctrl/mtmips/pinctrl-mt7628.c
@@ -6,8 +6,10 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <dm/pinctrl.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
diff --git a/drivers/pinctrl/mtmips/pinctrl-mtmips-common.c b/drivers/pinctrl/mtmips/pinctrl-mtmips-common.c
index ad9bd0311cc7..1964d8012fe1 100644
--- a/drivers/pinctrl/mtmips/pinctrl-mtmips-common.c
+++ b/drivers/pinctrl/mtmips/pinctrl-mtmips-common.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <dm.h>
 #include <malloc.h>
+#include <asm/types.h>
 #include <dm/pinctrl.h>
 #include <linux/errno.h>
 #include <linux/io.h>
diff --git a/drivers/pinctrl/mtmips/pinctrl-mtmips-common.h b/drivers/pinctrl/mtmips/pinctrl-mtmips-common.h
index 25ca19ff6aba..540e4d7a85a2 100644
--- a/drivers/pinctrl/mtmips/pinctrl-mtmips-common.h
+++ b/drivers/pinctrl/mtmips/pinctrl-mtmips-common.h
@@ -9,6 +9,8 @@
 #define _PINCTRL_MTMIPS_COMMON_H_
 
 #include <common.h>
+#include <compiler.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 
 struct mtmips_pmx_func {
diff --git a/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c b/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c
index 52b6c9242ae0..343139533b1f 100644
--- a/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c
+++ b/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c
@@ -17,6 +17,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <config.h>
 #include <dm.h>
 #include <malloc.h>
@@ -41,6 +42,7 @@
 #include <linux/libfdt.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/pinctrl/mvebu/pinctrl-mvebu.c b/drivers/pinctrl/mvebu/pinctrl-mvebu.c
index e5820375393a..5f40b00daef5 100644
--- a/drivers/pinctrl/mvebu/pinctrl-mvebu.c
+++ b/drivers/pinctrl/mvebu/pinctrl-mvebu.c
@@ -11,6 +11,7 @@
 #include <dm.h>
 #include <log.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <dm/pinctrl.h>
 #include <dm/root.h>
 #include <asm/system.h>
diff --git a/drivers/pinctrl/mvebu/pinctrl-mvebu.h b/drivers/pinctrl/mvebu/pinctrl-mvebu.h
index 54ad69e8ba8d..5ed0b63a49b7 100644
--- a/drivers/pinctrl/mvebu/pinctrl-mvebu.h
+++ b/drivers/pinctrl/mvebu/pinctrl-mvebu.h
@@ -4,6 +4,7 @@
  * https://spdx.org/licenses
  */
 
+#include <linux/types.h>
  #ifndef __PINCTRL_MVEBU_H_
  #define __PINCTRL_MVEBU_H_
 
diff --git a/drivers/pinctrl/nexell/pinctrl-nexell.c b/drivers/pinctrl/nexell/pinctrl-nexell.c
index da5ca6846cf2..0e379ce98fe1 100644
--- a/drivers/pinctrl/nexell/pinctrl-nexell.c
+++ b/drivers/pinctrl/nexell/pinctrl-nexell.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include "pinctrl-nexell.h"
 #include "pinctrl-s5pxx18.h"
diff --git a/drivers/pinctrl/nexell/pinctrl-nexell.h b/drivers/pinctrl/nexell/pinctrl-nexell.h
index b21eefcabef7..35c870808f2f 100644
--- a/drivers/pinctrl/nexell/pinctrl-nexell.h
+++ b/drivers/pinctrl/nexell/pinctrl-nexell.h
@@ -10,6 +10,7 @@
 #define __PINCTRL_NEXELL_H_
 
 /**
+#include <asm/types.h>
  * struct nexell_pin_bank_data: represent a controller pin-bank data.
  * @offset: starting offset of the pin-bank registers.
  * @nr_pins: number of pins included in this bank.
diff --git a/drivers/pinctrl/nexell/pinctrl-s5pxx18.c b/drivers/pinctrl/nexell/pinctrl-s5pxx18.c
index 08a97ae378ba..93a01cb91011 100644
--- a/drivers/pinctrl/nexell/pinctrl-s5pxx18.c
+++ b/drivers/pinctrl/nexell/pinctrl-s5pxx18.c
@@ -10,11 +10,13 @@
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <dm/pinctrl.h>
 #include <dm/root.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include "pinctrl-nexell.h"
 #include "pinctrl-s5pxx18.h"
 
diff --git a/drivers/pinctrl/nxp/pinctrl-imx.c b/drivers/pinctrl/nxp/pinctrl-imx.c
index 6db7313aecda..09cdb17ea795 100644
--- a/drivers/pinctrl/nxp/pinctrl-imx.c
+++ b/drivers/pinctrl/nxp/pinctrl-imx.c
@@ -7,6 +7,7 @@
 #include <malloc.h>
 #include <mapmem.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <dm/device_compat.h>
 #include <dm/devres.h>
 #include <linux/bitops.h>
diff --git a/drivers/pinctrl/nxp/pinctrl-imx.h b/drivers/pinctrl/nxp/pinctrl-imx.h
index 947975ee72a7..0cb1f03c4603 100644
--- a/drivers/pinctrl/nxp/pinctrl-imx.h
+++ b/drivers/pinctrl/nxp/pinctrl-imx.h
@@ -12,6 +12,8 @@
  * @flags: flags specific for each soc
  * @mux_mask: Used when SHARE_MUX_CONF_REG flag is added
  */
+#include <compiler.h>
+#include <asm/types.h>
 struct imx_pinctrl_soc_info {
 	void __iomem *base;
 	void __iomem *input_sel_base;
diff --git a/drivers/pinctrl/nxp/pinctrl-imx5.c b/drivers/pinctrl/nxp/pinctrl-imx5.c
index 9c3423bef37b..645cd2f660c5 100644
--- a/drivers/pinctrl/nxp/pinctrl-imx5.c
+++ b/drivers/pinctrl/nxp/pinctrl-imx5.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <dm/pinctrl.h>
+#include <linux/types.h>
 
 #include "pinctrl-imx.h"
 
diff --git a/drivers/pinctrl/nxp/pinctrl-imx6.c b/drivers/pinctrl/nxp/pinctrl-imx6.c
index 84004e592127..1ac2c47144da 100644
--- a/drivers/pinctrl/nxp/pinctrl-imx6.c
+++ b/drivers/pinctrl/nxp/pinctrl-imx6.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <dm/pinctrl.h>
+#include <linux/types.h>
 
 #include "pinctrl-imx.h"
 
diff --git a/drivers/pinctrl/nxp/pinctrl-imx7.c b/drivers/pinctrl/nxp/pinctrl-imx7.c
index 66b58ba472ca..4b67e43aecaa 100644
--- a/drivers/pinctrl/nxp/pinctrl-imx7.c
+++ b/drivers/pinctrl/nxp/pinctrl-imx7.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <dm.h>
 #include <dm/pinctrl.h>
+#include <linux/types.h>
 
 #include "pinctrl-imx.h"
 
diff --git a/drivers/pinctrl/nxp/pinctrl-imx7ulp.c b/drivers/pinctrl/nxp/pinctrl-imx7ulp.c
index 598bbfaf3505..f2fcb93e7e4e 100644
--- a/drivers/pinctrl/nxp/pinctrl-imx7ulp.c
+++ b/drivers/pinctrl/nxp/pinctrl-imx7ulp.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <dm.h>
 #include <dm/pinctrl.h>
+#include <linux/types.h>
 
 #include "pinctrl-imx.h"
 
diff --git a/drivers/pinctrl/nxp/pinctrl-imx8.c b/drivers/pinctrl/nxp/pinctrl-imx8.c
index 7af9506d5049..8a76eafa79e4 100644
--- a/drivers/pinctrl/nxp/pinctrl-imx8.c
+++ b/drivers/pinctrl/nxp/pinctrl-imx8.c
@@ -7,6 +7,7 @@
 #include <asm/global_data.h>
 #include <dm/device.h>
 #include <dm/pinctrl.h>
+#include <linux/types.h>
 
 #include "pinctrl-imx.h"
 
diff --git a/drivers/pinctrl/nxp/pinctrl-imx8m.c b/drivers/pinctrl/nxp/pinctrl-imx8m.c
index 0626fde58f1a..4703c902c2c1 100644
--- a/drivers/pinctrl/nxp/pinctrl-imx8m.c
+++ b/drivers/pinctrl/nxp/pinctrl-imx8m.c
@@ -5,6 +5,7 @@
 
 #include <dm/device.h>
 #include <dm/pinctrl.h>
+#include <linux/types.h>
 
 #include "pinctrl-imx.h"
 
diff --git a/drivers/pinctrl/nxp/pinctrl-imxrt.c b/drivers/pinctrl/nxp/pinctrl-imxrt.c
index 4a9394192754..f06e4d0cc39f 100644
--- a/drivers/pinctrl/nxp/pinctrl-imxrt.c
+++ b/drivers/pinctrl/nxp/pinctrl-imxrt.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <dm/pinctrl.h>
+#include <linux/types.h>
 
 #include "pinctrl-imx.h"
 
diff --git a/drivers/pinctrl/nxp/pinctrl-mxs.c b/drivers/pinctrl/nxp/pinctrl-mxs.c
index 6cb6977812a6..5ed65fb5269f 100644
--- a/drivers/pinctrl/nxp/pinctrl-mxs.c
+++ b/drivers/pinctrl/nxp/pinctrl-mxs.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <log.h>
 #include <asm/global_data.h>
 #include <dm/device_compat.h>
@@ -15,6 +16,7 @@
 #include <dm.h>
 #include <dm/pinctrl.h>
 #include <dm/read.h>
+#include <linux/types.h>
 #include "pinctrl-mxs.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/pinctrl/nxp/pinctrl-mxs.h b/drivers/pinctrl/nxp/pinctrl-mxs.h
index a398e43cbebb..62f8e1393617 100644
--- a/drivers/pinctrl/nxp/pinctrl-mxs.h
+++ b/drivers/pinctrl/nxp/pinctrl-mxs.h
@@ -6,6 +6,8 @@
 #ifndef __PINCTRL_MXS_H
 #define __PINCTRL_MXS_H
 
+#include <compiler.h>
+#include <asm/types.h>
 #include <dm/pinctrl.h>
 
 #define SET	0x4
diff --git a/drivers/pinctrl/nxp/pinctrl-scu.c b/drivers/pinctrl/nxp/pinctrl-scu.c
index 81f6eb56db39..7981f24a9527 100644
--- a/drivers/pinctrl/nxp/pinctrl-scu.c
+++ b/drivers/pinctrl/nxp/pinctrl-scu.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <errno.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <asm/io.h>
 #include <asm/arch/sci/sci.h>
diff --git a/drivers/pinctrl/nxp/pinctrl-vf610.c b/drivers/pinctrl/nxp/pinctrl-vf610.c
index e795b5fd8ac2..eed6717122b2 100644
--- a/drivers/pinctrl/nxp/pinctrl-vf610.c
+++ b/drivers/pinctrl/nxp/pinctrl-vf610.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <dm/pinctrl.h>
+#include <linux/types.h>
 
 #include "pinctrl-imx.h"
 
diff --git a/drivers/pinctrl/pinctrl-at91-pio4.c b/drivers/pinctrl/pinctrl-at91-pio4.c
index 02f8d94f12d0..0d701e79eac0 100644
--- a/drivers/pinctrl/pinctrl-at91-pio4.c
+++ b/drivers/pinctrl/pinctrl-at91-pio4.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <dm/pinctrl.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
diff --git a/drivers/pinctrl/pinctrl-at91.c b/drivers/pinctrl/pinctrl-at91.c
index 819c5723fa54..9b3251e957ae 100644
--- a/drivers/pinctrl/pinctrl-at91.c
+++ b/drivers/pinctrl/pinctrl-at91.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 #include <dm/pinctrl.h>
 #include <asm/hardware.h>
@@ -17,6 +18,7 @@
 #include <linux/io.h>
 #include <linux/err.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include <mach/at91_pio.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/pinctrl/pinctrl-generic.c b/drivers/pinctrl/pinctrl-generic.c
index a8a78020d0a2..896869e6a832 100644
--- a/drivers/pinctrl/pinctrl-generic.c
+++ b/drivers/pinctrl/pinctrl-generic.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <dm.h>
 #include <stdbool.h>
+#include <asm/types.h>
 #include <dm/device_compat.h>
 #include <linux/compat.h>
 #include <dm/pinctrl.h>
diff --git a/drivers/pinctrl/pinctrl-single.c b/drivers/pinctrl/pinctrl-single.c
index 24387e59f1ee..298a8dda03ef 100644
--- a/drivers/pinctrl/pinctrl-single.c
+++ b/drivers/pinctrl/pinctrl-single.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <dm.h>
 #include <stdbool.h>
+#include <asm/types.h>
 #include <dm/device_compat.h>
 #include <dm/pinctrl.h>
 #include <linux/errno.h>
diff --git a/drivers/pinctrl/pinctrl-sti.c b/drivers/pinctrl/pinctrl-sti.c
index 7549253e0612..1a3c892e83a3 100644
--- a/drivers/pinctrl/pinctrl-sti.c
+++ b/drivers/pinctrl/pinctrl-sti.c
@@ -15,6 +15,7 @@
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <dm/pinctrl.h>
 #include <linux/bug.h>
 #include <linux/errno.h>
diff --git a/drivers/pinctrl/pinctrl-stmfx.c b/drivers/pinctrl/pinctrl-stmfx.c
index b72374cd09cd..ac6bad745e6f 100644
--- a/drivers/pinctrl/pinctrl-stmfx.c
+++ b/drivers/pinctrl/pinctrl-stmfx.c
@@ -21,6 +21,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <power/regulator.h>
 
 /* STMFX pins = GPIO[15:0] + aGPIO[7:0] */
diff --git a/drivers/pinctrl/pinctrl-uclass.c b/drivers/pinctrl/pinctrl-uclass.c
index 817ea3f33232..40afc7cb0f76 100644
--- a/drivers/pinctrl/pinctrl-uclass.c
+++ b/drivers/pinctrl/pinctrl-uclass.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <dm/device_compat.h>
@@ -17,6 +18,7 @@
 #include <dm/pinctrl.h>
 #include <dm/util.h>
 #include <dm/of_access.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/pinctrl/pinctrl_pic32.c b/drivers/pinctrl/pinctrl_pic32.c
index 939760d5bb1b..8789e4e6337a 100644
--- a/drivers/pinctrl/pinctrl_pic32.c
+++ b/drivers/pinctrl/pinctrl_pic32.c
@@ -5,12 +5,14 @@
  * Written by Purna Chandra Mandal <purna.mandal@microchip.com>
  */
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <dm/pinctrl.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
diff --git a/drivers/pinctrl/pinctrl_stm32.c b/drivers/pinctrl/pinctrl_stm32.c
index 98cf5b5aa5bb..d9f018e78530 100644
--- a/drivers/pinctrl/pinctrl_stm32.c
+++ b/drivers/pinctrl/pinctrl_stm32.c
@@ -17,6 +17,7 @@
 #include <linux/kernel.h>
 #include <linux/libfdt.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/pinctrl/renesas/pfc-r7s72100.c b/drivers/pinctrl/renesas/pfc-r7s72100.c
index 91d220fe4756..5677f4e51f58 100644
--- a/drivers/pinctrl/renesas/pfc-r7s72100.c
+++ b/drivers/pinctrl/renesas/pfc-r7s72100.c
@@ -6,9 +6,11 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <dm/lists.h>
 #include <dm/pinctrl.h>
 #include <linux/bitops.h>
diff --git a/drivers/pinctrl/renesas/pfc-r8a7790.c b/drivers/pinctrl/renesas/pfc-r8a7790.c
index 30e9a117f8d0..230a5b8569c2 100644
--- a/drivers/pinctrl/renesas/pfc-r8a7790.c
+++ b/drivers/pinctrl/renesas/pfc-r8a7790.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
+#include <asm/types.h>
 #include <dm/pinctrl.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
diff --git a/drivers/pinctrl/renesas/pfc-r8a7791.c b/drivers/pinctrl/renesas/pfc-r8a7791.c
index 7ae6e4081c00..722c6e677a25 100644
--- a/drivers/pinctrl/renesas/pfc-r8a7791.c
+++ b/drivers/pinctrl/renesas/pfc-r8a7791.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
+#include <asm/types.h>
 #include <dm/pinctrl.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
diff --git a/drivers/pinctrl/renesas/pfc-r8a7792.c b/drivers/pinctrl/renesas/pfc-r8a7792.c
index 1c9041209375..e2babffc6aa6 100644
--- a/drivers/pinctrl/renesas/pfc-r8a7792.c
+++ b/drivers/pinctrl/renesas/pfc-r8a7792.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
+#include <asm/types.h>
 #include <dm/pinctrl.h>
 #include <linux/kernel.h>
 
diff --git a/drivers/pinctrl/renesas/pfc-r8a7794.c b/drivers/pinctrl/renesas/pfc-r8a7794.c
index e59fd7656e01..c823af776a75 100644
--- a/drivers/pinctrl/renesas/pfc-r8a7794.c
+++ b/drivers/pinctrl/renesas/pfc-r8a7794.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
+#include <asm/types.h>
 #include <dm/pinctrl.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
diff --git a/drivers/pinctrl/renesas/pfc-r8a7795.c b/drivers/pinctrl/renesas/pfc-r8a7795.c
index ba17a5577524..1e7e5f0d91a1 100644
--- a/drivers/pinctrl/renesas/pfc-r8a7795.c
+++ b/drivers/pinctrl/renesas/pfc-r8a7795.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
+#include <asm/types.h>
 #include <dm/pinctrl.h>
 #include <linux/kernel.h>
 
diff --git a/drivers/pinctrl/renesas/pfc-r8a7796.c b/drivers/pinctrl/renesas/pfc-r8a7796.c
index a92c8ad18c17..75b68c7bde67 100644
--- a/drivers/pinctrl/renesas/pfc-r8a7796.c
+++ b/drivers/pinctrl/renesas/pfc-r8a7796.c
@@ -14,6 +14,7 @@
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
+#include <asm/types.h>
 #include <dm/pinctrl.h>
 #include <linux/kernel.h>
 
diff --git a/drivers/pinctrl/renesas/pfc-r8a77965.c b/drivers/pinctrl/renesas/pfc-r8a77965.c
index 2523904aec12..8733ca80f39c 100644
--- a/drivers/pinctrl/renesas/pfc-r8a77965.c
+++ b/drivers/pinctrl/renesas/pfc-r8a77965.c
@@ -15,6 +15,7 @@
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
+#include <asm/types.h>
 #include <dm/pinctrl.h>
 #include <linux/kernel.h>
 
diff --git a/drivers/pinctrl/renesas/pfc-r8a77970.c b/drivers/pinctrl/renesas/pfc-r8a77970.c
index 9996eb9298c5..808a82f56b8a 100644
--- a/drivers/pinctrl/renesas/pfc-r8a77970.c
+++ b/drivers/pinctrl/renesas/pfc-r8a77970.c
@@ -15,6 +15,7 @@
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
+#include <asm/types.h>
 #include <dm/pinctrl.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
diff --git a/drivers/pinctrl/renesas/pfc-r8a77980.c b/drivers/pinctrl/renesas/pfc-r8a77980.c
index 1b04250e527a..da5718ec0db8 100644
--- a/drivers/pinctrl/renesas/pfc-r8a77980.c
+++ b/drivers/pinctrl/renesas/pfc-r8a77980.c
@@ -15,6 +15,7 @@
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
+#include <asm/types.h>
 #include <dm/pinctrl.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
diff --git a/drivers/pinctrl/renesas/pfc-r8a77990.c b/drivers/pinctrl/renesas/pfc-r8a77990.c
index e0bf1e4a3003..e3957d2f1f94 100644
--- a/drivers/pinctrl/renesas/pfc-r8a77990.c
+++ b/drivers/pinctrl/renesas/pfc-r8a77990.c
@@ -14,6 +14,7 @@
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
+#include <asm/types.h>
 #include <dm/pinctrl.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
diff --git a/drivers/pinctrl/renesas/pfc-r8a77995.c b/drivers/pinctrl/renesas/pfc-r8a77995.c
index 724cf4ae3c99..f5701c5fc9f5 100644
--- a/drivers/pinctrl/renesas/pfc-r8a77995.c
+++ b/drivers/pinctrl/renesas/pfc-r8a77995.c
@@ -14,6 +14,7 @@
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
+#include <asm/types.h>
 #include <dm/pinctrl.h>
 #include <linux/kernel.h>
 
diff --git a/drivers/pinctrl/renesas/pfc.c b/drivers/pinctrl/renesas/pfc.c
index 5d7486574ccd..12d162a4d2bd 100644
--- a/drivers/pinctrl/renesas/pfc.c
+++ b/drivers/pinctrl/renesas/pfc.c
@@ -12,8 +12,10 @@
 #define DRV_NAME "sh-pfc"
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <errno.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <dm/device_compat.h>
 #include <dm/devres.h>
@@ -24,6 +26,7 @@
 #include <linux/io.h>
 #include <linux/kernel.h>
 #include <linux/sizes.h>
+#include <linux/types.h>
 
 #include "sh_pfc.h"
 
diff --git a/drivers/pinctrl/renesas/sh_pfc.h b/drivers/pinctrl/renesas/sh_pfc.h
index feea8a45ff60..546d0545d42a 100644
--- a/drivers/pinctrl/renesas/sh_pfc.h
+++ b/drivers/pinctrl/renesas/sh_pfc.h
@@ -11,6 +11,8 @@
 #ifndef __SH_PFC_H
 #define __SH_PFC_H
 
+#include <compiler.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 #include <linux/stringify.h>
 
diff --git a/drivers/pinctrl/rockchip/pinctrl-px30.c b/drivers/pinctrl/rockchip/pinctrl-px30.c
index bbe501607228..6896507eed7b 100644
--- a/drivers/pinctrl/rockchip/pinctrl-px30.c
+++ b/drivers/pinctrl/rockchip/pinctrl-px30.c
@@ -12,6 +12,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include "pinctrl-rockchip.h"
 
diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3036.c b/drivers/pinctrl/rockchip/pinctrl-rk3036.c
index 77bd12e4c796..03a572bbe420 100644
--- a/drivers/pinctrl/rockchip/pinctrl-rk3036.c
+++ b/drivers/pinctrl/rockchip/pinctrl-rk3036.c
@@ -11,6 +11,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include "pinctrl-rockchip.h"
 
diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3128.c b/drivers/pinctrl/rockchip/pinctrl-rk3128.c
index dc44f7840802..0cf6e0467a8a 100644
--- a/drivers/pinctrl/rockchip/pinctrl-rk3128.c
+++ b/drivers/pinctrl/rockchip/pinctrl-rk3128.c
@@ -11,6 +11,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include "pinctrl-rockchip.h"
 
diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3188.c b/drivers/pinctrl/rockchip/pinctrl-rk3188.c
index 4b919e9cffc4..393a7ad401d8 100644
--- a/drivers/pinctrl/rockchip/pinctrl-rk3188.c
+++ b/drivers/pinctrl/rockchip/pinctrl-rk3188.c
@@ -11,6 +11,7 @@
 #include <syscon.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include "pinctrl-rockchip.h"
 
diff --git a/drivers/pinctrl/rockchip/pinctrl-rk322x.c b/drivers/pinctrl/rockchip/pinctrl-rk322x.c
index 2ae92e258b72..6da0afdf002d 100644
--- a/drivers/pinctrl/rockchip/pinctrl-rk322x.c
+++ b/drivers/pinctrl/rockchip/pinctrl-rk322x.c
@@ -12,6 +12,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include "pinctrl-rockchip.h"
 
diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3288.c b/drivers/pinctrl/rockchip/pinctrl-rk3288.c
index 8c22a56b6200..40649cb64160 100644
--- a/drivers/pinctrl/rockchip/pinctrl-rk3288.c
+++ b/drivers/pinctrl/rockchip/pinctrl-rk3288.c
@@ -11,6 +11,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include "pinctrl-rockchip.h"
 
diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3308.c b/drivers/pinctrl/rockchip/pinctrl-rk3308.c
index afd9bd3e85d3..c8d1018adb49 100644
--- a/drivers/pinctrl/rockchip/pinctrl-rk3308.c
+++ b/drivers/pinctrl/rockchip/pinctrl-rk3308.c
@@ -12,6 +12,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include "pinctrl-rockchip.h"
 
diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3328.c b/drivers/pinctrl/rockchip/pinctrl-rk3328.c
index 42075627f968..816a750e0659 100644
--- a/drivers/pinctrl/rockchip/pinctrl-rk3328.c
+++ b/drivers/pinctrl/rockchip/pinctrl-rk3328.c
@@ -12,6 +12,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include "pinctrl-rockchip.h"
 
diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3368.c b/drivers/pinctrl/rockchip/pinctrl-rk3368.c
index 5fbc06359648..ed7ab2bdbba5 100644
--- a/drivers/pinctrl/rockchip/pinctrl-rk3368.c
+++ b/drivers/pinctrl/rockchip/pinctrl-rk3368.c
@@ -11,6 +11,7 @@
 #include <syscon.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include "pinctrl-rockchip.h"
 
diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3399.c b/drivers/pinctrl/rockchip/pinctrl-rk3399.c
index 084941c67062..13f0d20ab463 100644
--- a/drivers/pinctrl/rockchip/pinctrl-rk3399.c
+++ b/drivers/pinctrl/rockchip/pinctrl-rk3399.c
@@ -12,6 +12,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include "pinctrl-rockchip.h"
 
diff --git a/drivers/pinctrl/rockchip/pinctrl-rockchip-core.c b/drivers/pinctrl/rockchip/pinctrl-rockchip-core.c
index f36e49f36a4d..3d2bb42f2ecf 100644
--- a/drivers/pinctrl/rockchip/pinctrl-rockchip-core.c
+++ b/drivers/pinctrl/rockchip/pinctrl-rockchip-core.c
@@ -6,7 +6,9 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <dm/pinctrl.h>
 #include <regmap.h>
 #include <syscon.h>
diff --git a/drivers/pinctrl/rockchip/pinctrl-rv1108.c b/drivers/pinctrl/rockchip/pinctrl-rv1108.c
index 42db3375d042..0378ae617791 100644
--- a/drivers/pinctrl/rockchip/pinctrl-rv1108.c
+++ b/drivers/pinctrl/rockchip/pinctrl-rv1108.c
@@ -12,6 +12,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include "pinctrl-rockchip.h"
 
diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-core.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-core.c
index 44a1571db4fb..2f0f288e6ffd 100644
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier-core.c
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-core.c
@@ -6,6 +6,8 @@
 
 #include <common.h>
 #include <dm.h>
+#include <stdbool.h>
+#include <asm/types.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/bug.h>
diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier.h b/drivers/pinctrl/uniphier/pinctrl-uniphier.h
index 5951835d6e85..c82b84484a60 100644
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier.h
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier.h
@@ -7,6 +7,7 @@
 #ifndef __PINCTRL_UNIPHIER_H__
 #define __PINCTRL_UNIPHIER_H__
 
+#include <compiler.h>
 #include <linux/bitops.h>
 #include <linux/bug.h>
 #include <linux/build_bug.h>
diff --git a/drivers/power/acpi_pmc/acpi-pmc-uclass.c b/drivers/power/acpi_pmc/acpi-pmc-uclass.c
index f13e27f34cb2..90699d3ef070 100644
--- a/drivers/power/acpi_pmc/acpi-pmc-uclass.c
+++ b/drivers/power/acpi_pmc/acpi-pmc-uclass.c
@@ -16,6 +16,7 @@
 #endif
 #include <asm/io.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <power/acpi_pmc.h>
 
 struct tco_regs {
diff --git a/drivers/power/acpi_pmc/pmc_emul.c b/drivers/power/acpi_pmc/pmc_emul.c
index de6afccea12c..29c99c47f667 100644
--- a/drivers/power/acpi_pmc/pmc_emul.c
+++ b/drivers/power/acpi_pmc/pmc_emul.c
@@ -13,6 +13,7 @@
 #include <asm/test.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include <power/acpi_pmc.h>
 
 /**
diff --git a/drivers/power/acpi_pmc/sandbox.c b/drivers/power/acpi_pmc/sandbox.c
index 667b7a5daf58..e6f31c215b22 100644
--- a/drivers/power/acpi_pmc/sandbox.c
+++ b/drivers/power/acpi_pmc/sandbox.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <asm/io.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <power/acpi_pmc.h>
 
 #define GPIO_GPE_CFG		0x1050
diff --git a/drivers/power/axp152.c b/drivers/power/axp152.c
index bf07232b08d1..3db5c75e294e 100644
--- a/drivers/power/axp152.c
+++ b/drivers/power/axp152.c
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <asm/arch/pmic_bus.h>
 #include <axp_pmic.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 
 static u8 axp152_mvolt_to_target(int mvolt, int min, int max, int div)
diff --git a/drivers/power/axp209.c b/drivers/power/axp209.c
index 878ccf459066..43043fbac2fd 100644
--- a/drivers/power/axp209.c
+++ b/drivers/power/axp209.c
@@ -8,6 +8,7 @@
 #include <command.h>
 #include <asm/arch/pmic_bus.h>
 #include <axp_pmic.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 
diff --git a/drivers/power/axp221.c b/drivers/power/axp221.c
index e0249796729e..07751cc30384 100644
--- a/drivers/power/axp221.c
+++ b/drivers/power/axp221.c
@@ -14,6 +14,7 @@
 #include <errno.h>
 #include <asm/arch/pmic_bus.h>
 #include <axp_pmic.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 
 static u8 axp221_mvolt_to_cfg(int mvolt, int min, int max, int div)
diff --git a/drivers/power/axp809.c b/drivers/power/axp809.c
index 7999ab593a8f..5ca0bb325490 100644
--- a/drivers/power/axp809.c
+++ b/drivers/power/axp809.c
@@ -17,6 +17,7 @@
 #include <asm/arch/gpio.h>
 #include <asm/arch/pmic_bus.h>
 #include <axp_pmic.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 
 static u8 axp809_mvolt_to_cfg(int mvolt, int min, int max, int div)
diff --git a/drivers/power/axp818.c b/drivers/power/axp818.c
index 340472d75c78..32c3e1df311e 100644
--- a/drivers/power/axp818.c
+++ b/drivers/power/axp818.c
@@ -17,6 +17,7 @@
 #include <asm/arch/gpio.h>
 #include <asm/arch/pmic_bus.h>
 #include <axp_pmic.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 
 static u8 axp818_mvolt_to_cfg(int mvolt, int min, int max, int div)
diff --git a/drivers/power/domain/bcm6328-power-domain.c b/drivers/power/domain/bcm6328-power-domain.c
index 21933018fc46..10ce80f03178 100644
--- a/drivers/power/domain/bcm6328-power-domain.c
+++ b/drivers/power/domain/bcm6328-power-domain.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <malloc.h>
 #include <power-domain-uclass.h>
diff --git a/drivers/power/domain/imx8-power-domain.c b/drivers/power/domain/imx8-power-domain.c
index b0107dff1f82..65e4cda8599c 100644
--- a/drivers/power/domain/imx8-power-domain.c
+++ b/drivers/power/domain/imx8-power-domain.c
@@ -12,6 +12,7 @@
 #include <stdio.h>
 #include <asm/arch/power-domain.h>
 #include <asm/arch/sci/sci.h>
+#include <asm/types.h>
 
 static int imx8_power_domain_request(struct power_domain *power_domain)
 {
diff --git a/drivers/power/domain/meson-ee-pwrc.c b/drivers/power/domain/meson-ee-pwrc.c
index f6082f2a4c09..a839716c7d43 100644
--- a/drivers/power/domain/meson-ee-pwrc.c
+++ b/drivers/power/domain/meson-ee-pwrc.c
@@ -10,9 +10,11 @@
 #include <malloc.h>
 #include <power-domain-uclass.h>
 #include <regmap.h>
+#include <stdbool.h>
 #include <syscon.h>
 #include <reset.h>
 #include <clk.h>
+#include <asm/types.h>
 #include <dt-bindings/power/meson-g12a-power.h>
 #include <dt-bindings/power/meson-sm1-power.h>
 #include <linux/bitops.h>
diff --git a/drivers/power/domain/meson-gx-pwrc-vpu.c b/drivers/power/domain/meson-gx-pwrc-vpu.c
index 78ac99e8d9be..aa0c9cf461b1 100644
--- a/drivers/power/domain/meson-gx-pwrc-vpu.c
+++ b/drivers/power/domain/meson-gx-pwrc-vpu.c
@@ -15,6 +15,7 @@
 #include <syscon.h>
 #include <reset.h>
 #include <clk.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/err.h>
diff --git a/drivers/power/domain/mtk-power-domain.c b/drivers/power/domain/mtk-power-domain.c
index d8467ac6c26f..f79fe6ea0d37 100644
--- a/drivers/power/domain/mtk-power-domain.c
+++ b/drivers/power/domain/mtk-power-domain.c
@@ -6,6 +6,7 @@
 
 #include <clk.h>
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <malloc.h>
 #include <power-domain-uclass.h>
@@ -13,6 +14,7 @@
 #include <syscon.h>
 #include <asm/io.h>
 #include <asm/processor.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/err.h>
 #include <linux/errno.h>
diff --git a/drivers/power/domain/ti-sci-power-domain.c b/drivers/power/domain/ti-sci-power-domain.c
index fd90f4926dbd..2bef8867ddfe 100644
--- a/drivers/power/domain/ti-sci-power-domain.c
+++ b/drivers/power/domain/ti-sci-power-domain.c
@@ -19,6 +19,7 @@
 #include <linux/errno.h>
 #include <linux/soc/ti/ti_sci_protocol.h>
 #include <dt-bindings/soc/ti,sci_pm_domain.h>
+#include <linux/types.h>
 
 /**
  * struct ti_sci_power_domain_data - pm domain controller information structure
diff --git a/drivers/power/exynos-tmu.c b/drivers/power/exynos-tmu.c
index e714add99951..139cdad1da59 100644
--- a/drivers/power/exynos-tmu.c
+++ b/drivers/power/exynos-tmu.c
@@ -26,6 +26,7 @@
 #include <asm/arch/tmu.h>
 #include <asm/arch/power.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #define TRIMINFO_RELOAD		1
 #define CORE_EN			1
diff --git a/drivers/power/fuel_gauge/fg_max17042.c b/drivers/power/fuel_gauge/fg_max17042.c
index a0614e229a14..be8f129bffa0 100644
--- a/drivers/power/fuel_gauge/fg_max17042.c
+++ b/drivers/power/fuel_gauge/fg_max17042.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <log.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
diff --git a/drivers/power/mfd/fg_max77693.c b/drivers/power/mfd/fg_max77693.c
index e96e59076286..c56841240f81 100644
--- a/drivers/power/mfd/fg_max77693.c
+++ b/drivers/power/mfd/fg_max77693.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <log.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <power/pmic.h>
 #include <power/max77693_fg.h>
diff --git a/drivers/power/mt6323.c b/drivers/power/mt6323.c
index 21e627559832..6ecd5f794374 100644
--- a/drivers/power/mt6323.c
+++ b/drivers/power/mt6323.c
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <stdio.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 #define PWRAP_BASE		0x1000d000
diff --git a/drivers/power/palmas.c b/drivers/power/palmas.c
index c716e4ff10df..47415f11e357 100644
--- a/drivers/power/palmas.c
+++ b/drivers/power/palmas.c
@@ -7,6 +7,7 @@
 #include <palmas.h>
 #include <stdio.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 void palmas_init_settings(void)
 {
diff --git a/drivers/power/pmic/act8846.c b/drivers/power/pmic/act8846.c
index 7bd69ccc0b4f..daa27575ac93 100644
--- a/drivers/power/pmic/act8846.c
+++ b/drivers/power/pmic/act8846.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <linux/errno.h>
 #include <linux/libfdt.h>
+#include <linux/types.h>
 #include <power/act8846_pmic.h>
 #include <power/pmic.h>
 
diff --git a/drivers/power/pmic/as3722.c b/drivers/power/pmic/as3722.c
index 9152f657ff71..9286d2d372c2 100644
--- a/drivers/power/pmic/as3722.c
+++ b/drivers/power/pmic/as3722.c
@@ -14,6 +14,7 @@
 #include <dm/lists.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 #include <power/as3722.h>
 #include <power/pmic.h>
 
diff --git a/drivers/power/pmic/as3722_gpio.c b/drivers/power/pmic/as3722_gpio.c
index 6b091a58b8b0..e2eb914ea681 100644
--- a/drivers/power/pmic/as3722_gpio.c
+++ b/drivers/power/pmic/as3722_gpio.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <dm.h>
 #include <asm/gpio.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
 #include <power/as3722.h>
diff --git a/drivers/power/pmic/bd71837.c b/drivers/power/pmic/bd71837.c
index 35d5018a3910..b8ec6248292c 100644
--- a/drivers/power/pmic/bd71837.c
+++ b/drivers/power/pmic/bd71837.c
@@ -11,6 +11,7 @@
 #include <asm/global_data.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/bd71837.h>
diff --git a/drivers/power/pmic/da9063.c b/drivers/power/pmic/da9063.c
index 13b7503aedb7..d92fd6b3d139 100644
--- a/drivers/power/pmic/da9063.c
+++ b/drivers/power/pmic/da9063.c
@@ -10,9 +10,11 @@
 #include <dm.h>
 #include <i2c.h>
 #include <log.h>
+#include <stdbool.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/da9063_pmic.h>
diff --git a/drivers/power/pmic/fan53555.c b/drivers/power/pmic/fan53555.c
index 256c455aa29b..c28985a78903 100644
--- a/drivers/power/pmic/fan53555.c
+++ b/drivers/power/pmic/fan53555.c
@@ -12,6 +12,7 @@
 #include <i2c.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 #include <power/fan53555.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/pmic/i2c_pmic_emul.c b/drivers/power/pmic/i2c_pmic_emul.c
index ce68fdb043ae..73b70cd53d0e 100644
--- a/drivers/power/pmic/i2c_pmic_emul.c
+++ b/drivers/power/pmic/i2c_pmic_emul.c
@@ -14,6 +14,7 @@
 #include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/sandbox_pmic.h>
 
diff --git a/drivers/power/pmic/lp873x.c b/drivers/power/pmic/lp873x.c
index 4addcf9cbd13..b4537202a80e 100644
--- a/drivers/power/pmic/lp873x.c
+++ b/drivers/power/pmic/lp873x.c
@@ -13,6 +13,7 @@
 #include <stdio.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/lp873x.h>
diff --git a/drivers/power/pmic/lp87565.c b/drivers/power/pmic/lp87565.c
index c4bf1aff78cb..7e4c8c399858 100644
--- a/drivers/power/pmic/lp87565.c
+++ b/drivers/power/pmic/lp87565.c
@@ -13,6 +13,7 @@
 #include <stdio.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/lp87565.h>
diff --git a/drivers/power/pmic/max77686.c b/drivers/power/pmic/max77686.c
index 2c83aab57a8d..39a25eb3fcea 100644
--- a/drivers/power/pmic/max77686.c
+++ b/drivers/power/pmic/max77686.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/max77686_pmic.h>
diff --git a/drivers/power/pmic/max8997.c b/drivers/power/pmic/max8997.c
index 504a63bf7431..1e23a26e8df5 100644
--- a/drivers/power/pmic/max8997.c
+++ b/drivers/power/pmic/max8997.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/max8997_pmic.h>
 #include <errno.h>
diff --git a/drivers/power/pmic/max8998.c b/drivers/power/pmic/max8998.c
index d155474447f5..dd80d1738c0a 100644
--- a/drivers/power/pmic/max8998.c
+++ b/drivers/power/pmic/max8998.c
@@ -9,6 +9,7 @@
 #include <errno.h>
 #include <i2c.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/max8998_pmic.h>
 
diff --git a/drivers/power/pmic/mc34708.c b/drivers/power/pmic/mc34708.c
index df66038d68d9..6657f2f089e5 100644
--- a/drivers/power/pmic/mc34708.c
+++ b/drivers/power/pmic/mc34708.c
@@ -13,6 +13,7 @@
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/power/pmic/palmas.c b/drivers/power/pmic/palmas.c
index 0b4366a27153..a165a0454862 100644
--- a/drivers/power/pmic/palmas.c
+++ b/drivers/power/pmic/palmas.c
@@ -13,6 +13,7 @@
 #include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/palmas.h>
diff --git a/drivers/power/pmic/pca9450.c b/drivers/power/pmic/pca9450.c
index 6e80c5cdc4f1..31f0d474c3a2 100644
--- a/drivers/power/pmic/pca9450.c
+++ b/drivers/power/pmic/pca9450.c
@@ -12,6 +12,7 @@
 #include <asm/global_data.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/pca9450.h>
diff --git a/drivers/power/pmic/pfuze100.c b/drivers/power/pmic/pfuze100.c
index 0955d46fc78e..27c5b628cbe6 100644
--- a/drivers/power/pmic/pfuze100.c
+++ b/drivers/power/pmic/pfuze100.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/pfuze100_pmic.h>
diff --git a/drivers/power/pmic/pm8916.c b/drivers/power/pmic/pm8916.c
index c47c89754d10..1f97cc65f813 100644
--- a/drivers/power/pmic/pm8916.c
+++ b/drivers/power/pmic/pm8916.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <spmi/spmi.h>
 
diff --git a/drivers/power/pmic/pmic-uclass.c b/drivers/power/pmic/pmic-uclass.c
index 257e514b10b9..b185de39de06 100644
--- a/drivers/power/pmic/pmic-uclass.c
+++ b/drivers/power/pmic/pmic-uclass.c
@@ -15,6 +15,7 @@
 #include <dm/uclass-internal.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <linux/ctype.h>
 
diff --git a/drivers/power/pmic/pmic_hi6553.c b/drivers/power/pmic/pmic_hi6553.c
index b724fe4a69e6..828be75505fc 100644
--- a/drivers/power/pmic/pmic_hi6553.c
+++ b/drivers/power/pmic/pmic_hi6553.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/max8997_muic.h>
 #include <power/hi6553_pmic.h>
diff --git a/drivers/power/pmic/pmic_max8997.c b/drivers/power/pmic/pmic_max8997.c
index 6c4958208c83..1d03da3cc346 100644
--- a/drivers/power/pmic/pmic_max8997.c
+++ b/drivers/power/pmic/pmic_max8997.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <log.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <power/pmic.h>
 #include <power/max8997_pmic.h>
diff --git a/drivers/power/pmic/pmic_tps65217.c b/drivers/power/pmic/pmic_tps65217.c
index c839e3189055..cf764fb9bc55 100644
--- a/drivers/power/pmic/pmic_tps65217.c
+++ b/drivers/power/pmic/pmic_tps65217.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <i2c.h>
+#include <linux/types.h>
 #include <power/tps65217.h>
 
 struct udevice *tps65217_dev __attribute__((section(".data"))) = NULL;
diff --git a/drivers/power/pmic/pmic_tps65218.c b/drivers/power/pmic/pmic_tps65218.c
index 992838de1b3f..baf101a5babf 100644
--- a/drivers/power/pmic/pmic_tps65218.c
+++ b/drivers/power/pmic/pmic_tps65218.c
@@ -8,6 +8,7 @@
 #include <i2c.h>
 #include <stdio.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/tps65218.h>
 
diff --git a/drivers/power/pmic/pmic_tps65910.c b/drivers/power/pmic/pmic_tps65910.c
index 4772de11be24..cb484b60a445 100644
--- a/drivers/power/pmic/pmic_tps65910.c
+++ b/drivers/power/pmic/pmic_tps65910.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <i2c.h>
+#include <linux/types.h>
 #include <power/tps65910.h>
 
 struct udevice *tps65910_dev __attribute__((section(".data"))) = NULL;
diff --git a/drivers/power/pmic/pmic_tps65910_dm.c b/drivers/power/pmic/pmic_tps65910_dm.c
index 422fb72c38eb..db25eb662f3c 100644
--- a/drivers/power/pmic/pmic_tps65910_dm.c
+++ b/drivers/power/pmic/pmic_tps65910_dm.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/tps65910_pmic.h>
diff --git a/drivers/power/pmic/rk8xx.c b/drivers/power/pmic/rk8xx.c
index db0968ac0f51..5f22b5cfba13 100644
--- a/drivers/power/pmic/rk8xx.c
+++ b/drivers/power/pmic/rk8xx.c
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include <power/rk8xx_pmic.h>
 #include <power/pmic.h>
 
diff --git a/drivers/power/pmic/rn5t567.c b/drivers/power/pmic/rn5t567.c
index d9a8298ebbbd..a4ac3c496ad0 100644
--- a/drivers/power/pmic/rn5t567.c
+++ b/drivers/power/pmic/rn5t567.c
@@ -10,6 +10,7 @@
 #include <fdtdec.h>
 #include <log.h>
 #include <linux/libfdt.h>
+#include <linux/types.h>
 #include <power/rn5t567_pmic.h>
 #include <power/pmic.h>
 
diff --git a/drivers/power/pmic/s2mps11.c b/drivers/power/pmic/s2mps11.c
index 93c3507e8fac..79740a30a31b 100644
--- a/drivers/power/pmic/s2mps11.c
+++ b/drivers/power/pmic/s2mps11.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/s2mps11.h>
 
diff --git a/drivers/power/pmic/s5m8767.c b/drivers/power/pmic/s5m8767.c
index f1fa67406602..20f709fe9732 100644
--- a/drivers/power/pmic/s5m8767.c
+++ b/drivers/power/pmic/s5m8767.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/s5m8767.h>
diff --git a/drivers/power/pmic/sandbox.c b/drivers/power/pmic/sandbox.c
index 813294c7f36f..68e6dfb73ede 100644
--- a/drivers/power/pmic/sandbox.c
+++ b/drivers/power/pmic/sandbox.c
@@ -11,6 +11,7 @@
 #include <i2c.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/sandbox_pmic.h>
diff --git a/drivers/power/pmic/stpmic1.c b/drivers/power/pmic/stpmic1.c
index c7cd596da088..7f3efa49c8e3 100644
--- a/drivers/power/pmic/stpmic1.c
+++ b/drivers/power/pmic/stpmic1.c
@@ -14,6 +14,7 @@
 #include <dm/device_compat.h>
 #include <dm/lists.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/stpmic1.h>
 
diff --git a/drivers/power/pmic/tps65090.c b/drivers/power/pmic/tps65090.c
index 8c8ffbe2046f..7a40525956ba 100644
--- a/drivers/power/pmic/tps65090.c
+++ b/drivers/power/pmic/tps65090.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/tps65090.h>
 
diff --git a/drivers/power/pmic/tps65941.c b/drivers/power/pmic/tps65941.c
index a05023516ba5..4a0621ac0226 100644
--- a/drivers/power/pmic/tps65941.c
+++ b/drivers/power/pmic/tps65941.c
@@ -13,6 +13,7 @@
 #include <stdio.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/tps65941.h>
diff --git a/drivers/power/power_fsl.c b/drivers/power/power_fsl.c
index e26b60c6abcb..c86d6e471720 100644
--- a/drivers/power/power_fsl.c
+++ b/drivers/power/power_fsl.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <spi.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <power/pmic.h>
 #include <fsl_pmic.h>
diff --git a/drivers/power/regulator/act8846.c b/drivers/power/regulator/act8846.c
index 175966293c29..dbdd358a9129 100644
--- a/drivers/power/regulator/act8846.c
+++ b/drivers/power/regulator/act8846.c
@@ -12,6 +12,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <stdbool.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <power/act8846_pmic.h>
 #include <power/pmic.h>
diff --git a/drivers/power/regulator/as3722_regulator.c b/drivers/power/regulator/as3722_regulator.c
index 55b61cd7a9f0..419470a457ab 100644
--- a/drivers/power/regulator/as3722_regulator.c
+++ b/drivers/power/regulator/as3722_regulator.c
@@ -11,6 +11,7 @@
 #include <errno.h>
 #include <log.h>
 #include <stdbool.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <power/as3722.h>
 #include <power/pmic.h>
diff --git a/drivers/power/regulator/bd71837.c b/drivers/power/regulator/bd71837.c
index 2a74bfcc79e2..68ba0da3bb76 100644
--- a/drivers/power/regulator/bd71837.c
+++ b/drivers/power/regulator/bd71837.c
@@ -8,6 +8,8 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <stdbool.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
diff --git a/drivers/power/regulator/da9063.c b/drivers/power/regulator/da9063.c
index bfe77d6814ac..7e6b197be1d7 100644
--- a/drivers/power/regulator/da9063.c
+++ b/drivers/power/regulator/da9063.c
@@ -6,10 +6,12 @@
 
 #include <common.h>
 #include <dm.h>
+#include <stdbool.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <power/da9063_pmic.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/regulator/fan53555.c b/drivers/power/regulator/fan53555.c
index 93aa04f7aeed..74c7db93e579 100644
--- a/drivers/power/regulator/fan53555.c
+++ b/drivers/power/regulator/fan53555.c
@@ -10,7 +10,9 @@
 #include <fdtdec.h>
 #include <i2c.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/gpio.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
diff --git a/drivers/power/regulator/gpio-regulator.c b/drivers/power/regulator/gpio-regulator.c
index 2874236b989a..765e61061b7b 100644
--- a/drivers/power/regulator/gpio-regulator.c
+++ b/drivers/power/regulator/gpio-regulator.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <stdbool.h>
 #include <asm/gpio.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
 #include <power/pmic.h>
diff --git a/drivers/power/regulator/max77686.c b/drivers/power/regulator/max77686.c
index e4c099fb8b4a..49520ea1be20 100644
--- a/drivers/power/regulator/max77686.c
+++ b/drivers/power/regulator/max77686.c
@@ -11,6 +11,7 @@
 #include <errno.h>
 #include <dm.h>
 #include <i2c.h>
+#include <stdbool.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/printk.h>
diff --git a/drivers/power/regulator/palmas_regulator.c b/drivers/power/regulator/palmas_regulator.c
index 5eeed77b29e4..5762683d84a7 100644
--- a/drivers/power/regulator/palmas_regulator.c
+++ b/drivers/power/regulator/palmas_regulator.c
@@ -13,6 +13,7 @@
 #include <i2c.h>
 #include <stdbool.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <power/pmic.h>
diff --git a/drivers/power/regulator/pbias_regulator.c b/drivers/power/regulator/pbias_regulator.c
index 26598b7129fa..7235bcc45680 100644
--- a/drivers/power/regulator/pbias_regulator.c
+++ b/drivers/power/regulator/pbias_regulator.c
@@ -8,10 +8,12 @@
 #include <errno.h>
 #include <dm.h>
 #include <log.h>
+#include <stdbool.h>
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <regmap.h>
diff --git a/drivers/power/regulator/pfuze100.c b/drivers/power/regulator/pfuze100.c
index 1f9eab05cbe3..0d74e7c71810 100644
--- a/drivers/power/regulator/pfuze100.c
+++ b/drivers/power/regulator/pfuze100.c
@@ -11,6 +11,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <log.h>
+#include <stdbool.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
diff --git a/drivers/power/regulator/regulator-uclass.c b/drivers/power/regulator/regulator-uclass.c
index 251fc78bc89f..3552c9a4c5f1 100644
--- a/drivers/power/regulator/regulator-uclass.c
+++ b/drivers/power/regulator/regulator-uclass.c
@@ -8,6 +8,7 @@
 #include <errno.h>
 #include <dm.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <dm/uclass-internal.h>
 #include <linux/delay.h>
diff --git a/drivers/power/regulator/rk8xx.c b/drivers/power/regulator/rk8xx.c
index e6b0bbac7cfb..f2b568f083cc 100644
--- a/drivers/power/regulator/rk8xx.c
+++ b/drivers/power/regulator/rk8xx.c
@@ -12,8 +12,10 @@
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
+#include <stdbool.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include <power/rk8xx_pmic.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
diff --git a/drivers/power/regulator/s2mps11_regulator.c b/drivers/power/regulator/s2mps11_regulator.c
index 728a67bf8d40..52ed0aa77bc4 100644
--- a/drivers/power/regulator/s2mps11_regulator.c
+++ b/drivers/power/regulator/s2mps11_regulator.c
@@ -9,6 +9,8 @@
 #include <errno.h>
 #include <dm.h>
 #include <i2c.h>
+#include <stdbool.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
diff --git a/drivers/power/regulator/sandbox.c b/drivers/power/regulator/sandbox.c
index 196092c7260c..74ac0d7fb96f 100644
--- a/drivers/power/regulator/sandbox.c
+++ b/drivers/power/regulator/sandbox.c
@@ -9,9 +9,11 @@
 #include <errno.h>
 #include <dm.h>
 #include <i2c.h>
+#include <stdbool.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/sandbox_pmic.h>
diff --git a/drivers/power/regulator/stm32-vrefbuf.c b/drivers/power/regulator/stm32-vrefbuf.c
index 73cae7c6d8e0..944a6ab07c78 100644
--- a/drivers/power/regulator/stm32-vrefbuf.c
+++ b/drivers/power/regulator/stm32-vrefbuf.c
@@ -8,8 +8,11 @@
 
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <dm.h>
+#include <stdbool.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
diff --git a/drivers/power/regulator/stpmic1.c b/drivers/power/regulator/stpmic1.c
index 119e8d3ffbb5..0b8a2cd12fb6 100644
--- a/drivers/power/regulator/stpmic1.c
+++ b/drivers/power/regulator/stpmic1.c
@@ -7,9 +7,11 @@
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
+#include <stdbool.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/stpmic1.h>
diff --git a/drivers/power/regulator/tps62360_regulator.c b/drivers/power/regulator/tps62360_regulator.c
index 44c26e868d3a..582a2e33ddde 100644
--- a/drivers/power/regulator/tps62360_regulator.c
+++ b/drivers/power/regulator/tps62360_regulator.c
@@ -10,6 +10,7 @@
 #include <dm/device_compat.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include <power/regulator.h>
 
 #define TPS62360_REG_SET0	0
diff --git a/drivers/power/regulator/tps65090_regulator.c b/drivers/power/regulator/tps65090_regulator.c
index cbab544e2bc6..cc369db7ec8d 100644
--- a/drivers/power/regulator/tps65090_regulator.c
+++ b/drivers/power/regulator/tps65090_regulator.c
@@ -11,6 +11,7 @@
 #include <time.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/tps65090.h>
diff --git a/drivers/power/regulator/tps65910_regulator.c b/drivers/power/regulator/tps65910_regulator.c
index bc9ec2dcb270..46a5d7749cd8 100644
--- a/drivers/power/regulator/tps65910_regulator.c
+++ b/drivers/power/regulator/tps65910_regulator.c
@@ -6,9 +6,11 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <stdbool.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/tps65910_pmic.h>
diff --git a/drivers/power/sy8106a.c b/drivers/power/sy8106a.c
index 45f47939869a..d4648588a696 100644
--- a/drivers/power/sy8106a.c
+++ b/drivers/power/sy8106a.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <i2c.h>
 #include <sy8106a.h>
+#include <asm/types.h>
 
 #define SY8106A_I2C_ADDR 0x65
 #define SY8106A_VOUT1_SEL 1
diff --git a/drivers/power/tps6586x.c b/drivers/power/tps6586x.c
index ac9d0986040f..db0de93679f9 100644
--- a/drivers/power/tps6586x.c
+++ b/drivers/power/tps6586x.c
@@ -12,6 +12,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 static struct udevice *tps6586x_dev;
 
diff --git a/drivers/power/twl4030.c b/drivers/power/twl4030.c
index c62db5f24f5d..899dd2000697 100644
--- a/drivers/power/twl4030.c
+++ b/drivers/power/twl4030.c
@@ -25,6 +25,7 @@
 #include <command.h>
 #include <stdio.h>
 #include <twl4030.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/printk.h>
 
diff --git a/drivers/power/twl6030.c b/drivers/power/twl6030.c
index 3f9c2550c3dd..fe5f496afbfa 100644
--- a/drivers/power/twl6030.c
+++ b/drivers/power/twl6030.c
@@ -5,6 +5,7 @@
  */
 #include <config.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/printk.h>
 
diff --git a/drivers/pwm/exynos_pwm.c b/drivers/pwm/exynos_pwm.c
index 59a07e593b94..3e504f342e91 100644
--- a/drivers/pwm/exynos_pwm.c
+++ b/drivers/pwm/exynos_pwm.c
@@ -13,6 +13,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/pwm.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 struct exynos_pwm_priv {
 	struct s5p_timer *regs;
diff --git a/drivers/pwm/pwm-imx.c b/drivers/pwm/pwm-imx.c
index 70bf5851e54e..ce91c64156d2 100644
--- a/drivers/pwm/pwm-imx.c
+++ b/drivers/pwm/pwm-imx.c
@@ -14,6 +14,7 @@
 #include <stdbool.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/io.h>
+#include <linux/types.h>
 #include "pwm-imx-util.h"
 
 int pwm_init(int pwm_id, int div, int invert)
diff --git a/drivers/pwm/pwm-mtk.c b/drivers/pwm/pwm-mtk.c
index 9b997ec88f76..5343903c2577 100644
--- a/drivers/pwm/pwm-mtk.c
+++ b/drivers/pwm/pwm-mtk.c
@@ -7,15 +7,18 @@
 
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <dm.h>
 #include <pwm.h>
 #include <div64.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 /* PWM registers and bits definitions */
 #define PWMCON			0x00
diff --git a/drivers/pwm/pwm-sifive.c b/drivers/pwm/pwm-sifive.c
index cf3c723aceb9..a57e662729ad 100644
--- a/drivers/pwm/pwm-sifive.c
+++ b/drivers/pwm/pwm-sifive.c
@@ -14,16 +14,19 @@
 
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <div64.h>
 #include <dm.h>
 #include <pwm.h>
 #include <regmap.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/kernel.h>
 #include <linux/log2.h>
 #include <linux/bitfield.h>
+#include <linux/types.h>
 
 /* PWMCFG fields */
 #define PWM_SIFIVE_PWMCFG_SCALE         GENMASK(3, 0)
diff --git a/drivers/pwm/pwm-uclass.c b/drivers/pwm/pwm-uclass.c
index e3bfcc837dc3..622e7cd4c1ea 100644
--- a/drivers/pwm/pwm-uclass.c
+++ b/drivers/pwm/pwm-uclass.c
@@ -9,6 +9,7 @@
 #include <pwm.h>
 #include <stdbool.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 int pwm_set_invert(struct udevice *dev, uint channel, bool polarity)
 {
diff --git a/drivers/pwm/rk_pwm.c b/drivers/pwm/rk_pwm.c
index afe480710472..8a4e0047d8ca 100644
--- a/drivers/pwm/rk_pwm.c
+++ b/drivers/pwm/rk_pwm.c
@@ -18,6 +18,7 @@
 #include <asm/arch-rockchip/pwm.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <power/regulator.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/pwm/sandbox_pwm.c b/drivers/pwm/sandbox_pwm.c
index 44e7f2356506..a482fe8174c0 100644
--- a/drivers/pwm/sandbox_pwm.c
+++ b/drivers/pwm/sandbox_pwm.c
@@ -11,6 +11,7 @@
 #include <stdbool.h>
 #include <asm/test.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 enum {
 	NUM_CHANNELS	= 3,
diff --git a/drivers/pwm/sunxi_pwm.c b/drivers/pwm/sunxi_pwm.c
index 55472103fcc9..564b24c0564c 100644
--- a/drivers/pwm/sunxi_pwm.c
+++ b/drivers/pwm/sunxi_pwm.c
@@ -16,6 +16,7 @@
 #include <asm/arch/pwm.h>
 #include <asm/arch/gpio.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <power/regulator.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/pwm/tegra_pwm.c b/drivers/pwm/tegra_pwm.c
index 11378bb2e3bf..d52cf634ba93 100644
--- a/drivers/pwm/tegra_pwm.c
+++ b/drivers/pwm/tegra_pwm.c
@@ -12,6 +12,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/pwm.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 struct tegra_pwm_priv {
 	struct pwm_ctlr *regs;
diff --git a/drivers/qe/qe.c b/drivers/qe/qe.c
index 7c14fe35e587..7a71a5298dbe 100644
--- a/drivers/qe/qe.c
+++ b/drivers/qe/qe.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <malloc.h>
 #include <command.h>
 #include <stdio.h>
@@ -18,6 +19,7 @@
 #include <fsl_qe.h>
 #include <mmc.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <u-boot/crc.h>
 
 #ifdef CONFIG_ARCH_LS1021A
diff --git a/drivers/qe/uccf.c b/drivers/qe/uccf.c
index b4f0a0979c29..5497aae7606f 100644
--- a/drivers/qe/uccf.c
+++ b/drivers/qe/uccf.c
@@ -13,6 +13,7 @@
 #include <asm/io.h>
 #include <linux/immap_qe.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "uccf.h"
 #include <fsl_qe.h>
 
diff --git a/drivers/qe/uec.c b/drivers/qe/uec.c
index cb11e99faf8d..0a44c92f26dd 100644
--- a/drivers/qe/uec.c
+++ b/drivers/qe/uec.c
@@ -18,6 +18,7 @@
 #include <linux/immap_qe.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "uccf.h"
 #include "uec.h"
 #include "uec_phy.h"
diff --git a/drivers/qe/uec_phy.c b/drivers/qe/uec_phy.c
index ff9ed5d01ae9..49a3f1bfd590 100644
--- a/drivers/qe/uec_phy.c
+++ b/drivers/qe/uec_phy.c
@@ -13,6 +13,7 @@
 #include <net.h>
 #include <malloc.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/immap_qe.h>
diff --git a/drivers/qe/uec_phy.h b/drivers/qe/uec_phy.h
index 83a7ccd98197..9ede1faeecc9 100644
--- a/drivers/qe/uec_phy.h
+++ b/drivers/qe/uec_phy.h
@@ -11,6 +11,7 @@
 #ifndef __UEC_PHY_H__
 #define __UEC_PHY_H__
 
+#include <asm/types.h>
 #define MII_end ((u32)-2)
 #define MII_read ((u32)-1)
 
diff --git a/drivers/ram/bmips_ram.c b/drivers/ram/bmips_ram.c
index 0746d677a4c3..c1775d607972 100644
--- a/drivers/ram/bmips_ram.c
+++ b/drivers/ram/bmips_ram.c
@@ -8,12 +8,14 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <errno.h>
 #include <init.h>
 #include <ram.h>
 #include <asm/io.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #define SDRAM_CFG_REG		0x0
 #define SDRAM_CFG_COL_SHIFT	4
diff --git a/drivers/ram/imxrt_sdram.c b/drivers/ram/imxrt_sdram.c
index bfdf666cc435..c0b57178c076 100644
--- a/drivers/ram/imxrt_sdram.c
+++ b/drivers/ram/imxrt_sdram.c
@@ -12,6 +12,7 @@
 #include <ram.h>
 #include <vsprintf.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/err.h>
diff --git a/drivers/ram/k3-am654-ddrss.c b/drivers/ram/k3-am654-ddrss.c
index 1f282ec75104..5dff7c20b89c 100644
--- a/drivers/ram/k3-am654-ddrss.c
+++ b/drivers/ram/k3-am654-ddrss.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
 #include <ram.h>
@@ -15,6 +16,7 @@
 #include <asm/io.h>
 #include <power-domain.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/types.h>
 #include <dm/device_compat.h>
 #include <linux/errno.h>
 #include <power/regulator.h>
diff --git a/drivers/ram/k3-am654-ddrss.h b/drivers/ram/k3-am654-ddrss.h
index c87f186291e7..9f2ee87b5af2 100644
--- a/drivers/ram/k3-am654-ddrss.h
+++ b/drivers/ram/k3-am654-ddrss.h
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
 /*
+#include <asm/types.h>
  * AM654: DDRSS Register definitions and structures.
  *
  * Copyright (C) 2018 Texas Instruments Incorporated - http://www.ti.com/
diff --git a/drivers/ram/k3-j721e/cps_drv_lpddr4.h b/drivers/ram/k3-j721e/cps_drv_lpddr4.h
index 706a5cde01ac..9da9d7120644 100644
--- a/drivers/ram/k3-j721e/cps_drv_lpddr4.h
+++ b/drivers/ram/k3-j721e/cps_drv_lpddr4.h
@@ -15,6 +15,7 @@
 #include <stddef.h>
 #include <inttypes.h>
 #include <asm/io.h>
+#include <linux/types.h>
 
 /**
  *  \brief    Read a 32-bit value from memory.
diff --git a/drivers/ram/k3-j721e/k3-j721e-ddrss.c b/drivers/ram/k3-j721e/k3-j721e-ddrss.c
index bccf5a65c92a..637abc4c6d45 100644
--- a/drivers/ram/k3-j721e/k3-j721e-ddrss.c
+++ b/drivers/ram/k3-j721e/k3-j721e-ddrss.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <dm.h>
 #include <hang.h>
 #include <log.h>
@@ -17,6 +18,7 @@
 #include <wait_bit.h>
 #include <dm/device_compat.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #include "lpddr4_obj_if.h"
 #include "lpddr4_if.h"
diff --git a/drivers/ram/k3-j721e/lpddr4_private.h b/drivers/ram/k3-j721e/lpddr4_private.h
index 42c923464aa2..e3aa360b6cc0 100644
--- a/drivers/ram/k3-j721e/lpddr4_private.h
+++ b/drivers/ram/k3-j721e/lpddr4_private.h
@@ -10,6 +10,7 @@
 #ifndef LPDDR4_PRIV_H
 #define LPDDR4_PRIV_H
 
+#include <linux/types.h>
 #define PRODUCT_ID (0x1046U)
 #define VERSION_0  (0x54d5da40U)
 #define VERSION_1  (0xc1865a1U)
diff --git a/drivers/ram/mediatek/ddr3-mt7629.c b/drivers/ram/mediatek/ddr3-mt7629.c
index a2f72b704706..f25334a0421d 100644
--- a/drivers/ram/mediatek/ddr3-mt7629.c
+++ b/drivers/ram/mediatek/ddr3-mt7629.c
@@ -12,6 +12,7 @@
 #include <dm.h>
 #include <ram.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/ram/mpc83xx_sdram.c b/drivers/ram/mpc83xx_sdram.c
index 568867e8aa36..427758e369e5 100644
--- a/drivers/ram/mpc83xx_sdram.c
+++ b/drivers/ram/mpc83xx_sdram.c
@@ -14,6 +14,7 @@
 #include <asm/ppc.h>
 #include <dt-bindings/memory/mpc83xx-sdram.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/ram/rockchip/dmc-rk3368.c b/drivers/ram/rockchip/dmc-rk3368.c
index 9f13363e634a..c2030101aa9c 100644
--- a/drivers/ram/rockchip/dmc-rk3368.c
+++ b/drivers/ram/rockchip/dmc-rk3368.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <hang.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <dt-bindings/memory/rk3368-dmc.h>
@@ -28,6 +29,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 struct dram_info {
 	struct ram_info info;
diff --git a/drivers/ram/rockchip/sdram_common.c b/drivers/ram/rockchip/sdram_common.c
index 5dd68c976822..04f5e52223dc 100644
--- a/drivers/ram/rockchip/sdram_common.c
+++ b/drivers/ram/rockchip/sdram_common.c
@@ -4,12 +4,14 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <debug_uart.h>
 #include <ram.h>
 #include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch-rockchip/sdram.h>
 #include <asm/arch-rockchip/sdram_common.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_RAM_ROCKCHIP_DEBUG
 void sdram_print_dram_type(unsigned char dramtype)
diff --git a/drivers/ram/rockchip/sdram_pctl_px30.c b/drivers/ram/rockchip/sdram_pctl_px30.c
index 331d85fba269..5256ff0a6ccb 100644
--- a/drivers/ram/rockchip/sdram_pctl_px30.c
+++ b/drivers/ram/rockchip/sdram_pctl_px30.c
@@ -4,10 +4,12 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <ram.h>
 #include <asm/io.h>
 #include <asm/arch-rockchip/sdram.h>
 #include <asm/arch-rockchip/sdram_pctl_px30.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 /*
diff --git a/drivers/ram/rockchip/sdram_phy_px30.c b/drivers/ram/rockchip/sdram_phy_px30.c
index f7f6de1ba98b..c81a8b8bab4f 100644
--- a/drivers/ram/rockchip/sdram_phy_px30.c
+++ b/drivers/ram/rockchip/sdram_phy_px30.c
@@ -4,11 +4,13 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <ram.h>
 #include <asm/io.h>
 #include <asm/arch-rockchip/sdram.h>
 #include <asm/arch-rockchip/sdram_common.h>
 #include <asm/arch-rockchip/sdram_phy_px30.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 static void sdram_phy_dll_bypass_set(void __iomem *phy_base, u32 freq)
diff --git a/drivers/ram/rockchip/sdram_px30.c b/drivers/ram/rockchip/sdram_px30.c
index a4f8980bfd76..65587df88ba9 100644
--- a/drivers/ram/rockchip/sdram_px30.c
+++ b/drivers/ram/rockchip/sdram_px30.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <debug_uart.h>
 #include <dm.h>
 #include <init.h>
@@ -17,6 +18,7 @@
 #include <asm/arch-rockchip/hardware.h>
 #include <asm/arch-rockchip/sdram.h>
 #include <asm/arch-rockchip/sdram_px30.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
 
diff --git a/drivers/ram/rockchip/sdram_rk3128.c b/drivers/ram/rockchip/sdram_rk3128.c
index 0162955aae05..265d12847947 100644
--- a/drivers/ram/rockchip/sdram_rk3128.c
+++ b/drivers/ram/rockchip/sdram_rk3128.c
@@ -11,6 +11,7 @@
 #include <asm/arch-rockchip/clock.h>
 #include <asm/arch-rockchip/grf_rk3128.h>
 #include <asm/arch-rockchip/sdram.h>
+#include <asm/types.h>
 
 struct dram_info {
 	struct ram_info info;
diff --git a/drivers/ram/rockchip/sdram_rk3188.c b/drivers/ram/rockchip/sdram_rk3188.c
index cfa6d0ebf19e..3523e69ad3c6 100644
--- a/drivers/ram/rockchip/sdram_rk3188.c
+++ b/drivers/ram/rockchip/sdram_rk3188.c
@@ -16,6 +16,7 @@
 #include <log.h>
 #include <ram.h>
 #include <regmap.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <syscon.h>
 #include <asm/io.h>
@@ -31,6 +32,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 struct chan_info {
 	struct rk3288_ddr_pctl *pctl;
diff --git a/drivers/ram/rockchip/sdram_rk3288.c b/drivers/ram/rockchip/sdram_rk3288.c
index 80abe9c9b20c..5d931dcf7563 100644
--- a/drivers/ram/rockchip/sdram_rk3288.c
+++ b/drivers/ram/rockchip/sdram_rk3288.c
@@ -16,6 +16,7 @@
 #include <log.h>
 #include <ram.h>
 #include <regmap.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <syscon.h>
 #include <asm/io.h>
@@ -31,6 +32,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <power/regulator.h>
 #include <power/rk8xx_pmic.h>
 
diff --git a/drivers/ram/rockchip/sdram_rk3308.c b/drivers/ram/rockchip/sdram_rk3308.c
index 310df79123c9..4b37aa1a184f 100644
--- a/drivers/ram/rockchip/sdram_rk3308.c
+++ b/drivers/ram/rockchip/sdram_rk3308.c
@@ -10,6 +10,7 @@
 #include <asm/arch/grf_rk3308.h>
 #include <asm/arch-rockchip/clock.h>
 #include <asm/arch-rockchip/sdram.h>
+#include <asm/types.h>
 
 struct dram_info {
 	struct ram_info info;
diff --git a/drivers/ram/rockchip/sdram_rk3328.c b/drivers/ram/rockchip/sdram_rk3328.c
index 827d52e7a5c7..404abeba3f4c 100644
--- a/drivers/ram/rockchip/sdram_rk3328.c
+++ b/drivers/ram/rockchip/sdram_rk3328.c
@@ -4,6 +4,7 @@
  */
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <debug_uart.h>
 #include <dm.h>
 #include <dt-structs.h>
@@ -20,6 +21,7 @@
 #include <asm/arch-rockchip/sdram.h>
 #include <asm/arch-rockchip/sdram_rk3328.h>
 #include <asm/arch-rockchip/uart.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
diff --git a/drivers/ram/rockchip/sdram_rk3399.c b/drivers/ram/rockchip/sdram_rk3399.c
index 690b8c3f3b29..0a4b3a105047 100644
--- a/drivers/ram/rockchip/sdram_rk3399.c
+++ b/drivers/ram/rockchip/sdram_rk3399.c
@@ -7,12 +7,14 @@
 
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <dm.h>
 #include <dt-structs.h>
 #include <init.h>
 #include <log.h>
 #include <ram.h>
 #include <regmap.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <syscon.h>
 #include <asm/io.h>
@@ -23,6 +25,7 @@
 #include <asm/arch-rockchip/hardware.h>
 #include <asm/arch-rockchip/sdram.h>
 #include <asm/arch-rockchip/sdram_rk3399.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <time.h>
diff --git a/drivers/ram/sifive/fu540_ddr.c b/drivers/ram/sifive/fu540_ddr.c
index 0270dd088dbc..ec05dc7f93ff 100644
--- a/drivers/ram/sifive/fu540_ddr.c
+++ b/drivers/ram/sifive/fu540_ddr.c
@@ -20,6 +20,7 @@
 #include <wait_bit.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #define DENALI_CTL_0	0
 #define DENALI_CTL_21	21
diff --git a/drivers/ram/stm32_sdram.c b/drivers/ram/stm32_sdram.c
index 04fb730525d3..31e410ae8a3f 100644
--- a/drivers/ram/stm32_sdram.c
+++ b/drivers/ram/stm32_sdram.c
@@ -12,6 +12,7 @@
 #include <ram.h>
 #include <vsprintf.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/drivers/ram/stm32mp1/stm32mp1_ddr.c b/drivers/ram/stm32mp1/stm32mp1_ddr.c
index d122dadd6dc2..329284c6d93f 100644
--- a/drivers/ram/stm32mp1/stm32mp1_ddr.c
+++ b/drivers/ram/stm32mp1/stm32mp1_ddr.c
@@ -5,14 +5,17 @@
 
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <log.h>
 #include <ram.h>
 #include <reset.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <timer.h>
 #include <vsprintf.h>
 #include <asm/io.h>
 #include <asm/arch/ddr.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/ram/stm32mp1/stm32mp1_ddr.h b/drivers/ram/stm32mp1/stm32mp1_ddr.h
index 5f15196b2da3..73531124946b 100644
--- a/drivers/ram/stm32mp1/stm32mp1_ddr.h
+++ b/drivers/ram/stm32mp1/stm32mp1_ddr.h
@@ -7,6 +7,7 @@
 #define _RAM_STM32MP1_DDR_H
 
 #include <stdbool.h>
+#include <asm/types.h>
 enum stm32mp1_ddr_interact_step {
 	STEP_DDR_RESET,
 	STEP_CTL_INIT,
diff --git a/drivers/ram/stm32mp1/stm32mp1_ddr_regs.h b/drivers/ram/stm32mp1/stm32mp1_ddr_regs.h
index 3c8885a96577..6deae23815ad 100644
--- a/drivers/ram/stm32mp1/stm32mp1_ddr_regs.h
+++ b/drivers/ram/stm32mp1/stm32mp1_ddr_regs.h
@@ -7,6 +7,7 @@
 #define _RAM_STM32MP1_DDR_REGS_H
 
 /* DDR3/LPDDR2/LPDDR3 Controller (DDRCTRL) registers */
+#include <asm/types.h>
 #include <linux/bitops.h>
 struct stm32mp1_ddrctl {
 	u32 mstr ;		/* 0x0 Master*/
diff --git a/drivers/ram/stm32mp1/stm32mp1_interactive.c b/drivers/ram/stm32mp1/stm32mp1_interactive.c
index d45071d3ed32..e49257b39559 100644
--- a/drivers/ram/stm32mp1/stm32mp1_interactive.c
+++ b/drivers/ram/stm32mp1/stm32mp1_interactive.c
@@ -12,10 +12,12 @@
 #include <malloc.h>
 #include <ram.h>
 #include <reset.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include "stm32mp1_ddr.h"
diff --git a/drivers/ram/stm32mp1/stm32mp1_ram.c b/drivers/ram/stm32mp1/stm32mp1_ram.c
index 8b49730e6331..35d6b0fef2ab 100644
--- a/drivers/ram/stm32mp1/stm32mp1_ram.c
+++ b/drivers/ram/stm32mp1/stm32mp1_ram.c
@@ -5,11 +5,13 @@
 
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <dm.h>
 #include <init.h>
 #include <log.h>
 #include <ram.h>
 #include <regmap.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <syscon.h>
 #include <asm/io.h>
@@ -17,6 +19,7 @@
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "stm32mp1_ddr.h"
 
 static const char *const clkname[] = {
diff --git a/drivers/ram/stm32mp1/stm32mp1_tests.c b/drivers/ram/stm32mp1/stm32mp1_tests.c
index 00bdbe6762ab..e960bc833c4c 100644
--- a/drivers/ram/stm32mp1/stm32mp1_tests.c
+++ b/drivers/ram/stm32mp1/stm32mp1_tests.c
@@ -7,6 +7,7 @@
 #include <init.h>
 #include <log.h>
 #include <rand.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <watchdog.h>
@@ -15,6 +16,7 @@
 #include <linux/kernel.h>
 #include <linux/log2.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "stm32mp1_tests.h"
 
 #define ADDR_INVALID	0xFFFFFFFF
diff --git a/drivers/ram/stm32mp1/stm32mp1_tuning.c b/drivers/ram/stm32mp1/stm32mp1_tuning.c
index 8da11d0629a9..0ff63bca66a5 100644
--- a/drivers/ram/stm32mp1/stm32mp1_tuning.c
+++ b/drivers/ram/stm32mp1/stm32mp1_tuning.c
@@ -9,9 +9,11 @@
 #include <ram.h>
 #include <rand.h>
 #include <reset.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/iopoll.h>
diff --git a/drivers/remoteproc/k3_system_controller.c b/drivers/remoteproc/k3_system_controller.c
index aa993b973929..779665ec1acd 100644
--- a/drivers/remoteproc/k3_system_controller.c
+++ b/drivers/remoteproc/k3_system_controller.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
 #include <remoteproc.h>
@@ -16,6 +17,7 @@
 #include <linux/errno.h>
 #include <linux/soc/ti/k3-sec-proxy.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define K3_MSG_R5_TO_M3_M3FW			0x8105
 #define K3_MSG_M3_TO_R5_CERT_RESULT		0x8805
diff --git a/drivers/remoteproc/rproc-elf-loader.c b/drivers/remoteproc/rproc-elf-loader.c
index bb82de08da70..00a83d61c6f1 100644
--- a/drivers/remoteproc/rproc-elf-loader.c
+++ b/drivers/remoteproc/rproc-elf-loader.c
@@ -3,6 +3,7 @@
  * Copyright (C) 2019, STMicroelectronics - All Rights Reserved
  */
 #include <common.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <dm.h>
 #include <elf.h>
@@ -15,6 +16,7 @@
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /**
  * struct resource_table - firmware resource table header
diff --git a/drivers/remoteproc/rproc-uclass.c b/drivers/remoteproc/rproc-uclass.c
index e7513240ec5d..a55c502d43cd 100644
--- a/drivers/remoteproc/rproc-uclass.c
+++ b/drivers/remoteproc/rproc-uclass.c
@@ -20,6 +20,7 @@
 #include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/remoteproc/sandbox_testproc.c b/drivers/remoteproc/sandbox_testproc.c
index e3759eed95ca..ce7cfe675230 100644
--- a/drivers/remoteproc/sandbox_testproc.c
+++ b/drivers/remoteproc/sandbox_testproc.c
@@ -12,6 +12,7 @@
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 /**
  * enum sandbox_state - different device states
diff --git a/drivers/remoteproc/stm32_copro.c b/drivers/remoteproc/stm32_copro.c
index eb437464ae16..6ff3d3d9383b 100644
--- a/drivers/remoteproc/stm32_copro.c
+++ b/drivers/remoteproc/stm32_copro.c
@@ -11,12 +11,14 @@
 #include <regmap.h>
 #include <remoteproc.h>
 #include <reset.h>
+#include <stdbool.h>
 #include <syscon.h>
 #include <asm/io.h>
 #include <dm/device_compat.h>
 #include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 #define RCC_GCR_HOLD_BOOT	0
 #define RCC_GCR_RELEASE_BOOT	1
diff --git a/drivers/remoteproc/ti_k3_arm64_rproc.c b/drivers/remoteproc/ti_k3_arm64_rproc.c
index 20b02f691e35..4fec3d834186 100644
--- a/drivers/remoteproc/ti_k3_arm64_rproc.c
+++ b/drivers/remoteproc/ti_k3_arm64_rproc.c
@@ -19,6 +19,7 @@
 #include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/soc/ti/ti_sci_protocol.h>
+#include <linux/types.h>
 #include "ti_sci_proc.h"
 
 #define INVALID_ID	0xffff
diff --git a/drivers/remoteproc/ti_k3_dsp_rproc.c b/drivers/remoteproc/ti_k3_dsp_rproc.c
index a341ef84e8af..37a311f3607b 100644
--- a/drivers/remoteproc/ti_k3_dsp_rproc.c
+++ b/drivers/remoteproc/ti_k3_dsp_rproc.c
@@ -8,6 +8,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
 #include <malloc.h>
@@ -15,6 +16,7 @@
 #include <errno.h>
 #include <clk.h>
 #include <reset.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <power-domain.h>
 #include <dm/device_compat.h>
@@ -24,6 +26,7 @@
 #include <linux/sizes.h>
 #include <linux/soc/ti/ti_sci_protocol.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "ti_sci_proc.h"
 
 #define KEYSTONE_RPROC_LOCAL_ADDRESS_MASK	(SZ_16M - 1)
diff --git a/drivers/remoteproc/ti_k3_r5f_rproc.c b/drivers/remoteproc/ti_k3_r5f_rproc.c
index db437c1a6861..565036de6192 100644
--- a/drivers/remoteproc/ti_k3_r5f_rproc.c
+++ b/drivers/remoteproc/ti_k3_r5f_rproc.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
 #include <malloc.h>
@@ -14,6 +15,7 @@
 #include <errno.h>
 #include <clk.h>
 #include <reset.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/io.h>
 #include <dm/device_compat.h>
@@ -22,6 +24,7 @@
 #include <linux/kernel.h>
 #include <linux/soc/ti/ti_sci_protocol.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "ti_sci_proc.h"
 
 /*
diff --git a/drivers/remoteproc/ti_power_proc.c b/drivers/remoteproc/ti_power_proc.c
index 84e621ca9ee0..a48acc998194 100644
--- a/drivers/remoteproc/ti_power_proc.c
+++ b/drivers/remoteproc/ti_power_proc.c
@@ -14,6 +14,7 @@
 #include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <mach/psc_defs.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/remoteproc/ti_sci_proc.h b/drivers/remoteproc/ti_sci_proc.h
index 36351da63fcc..88a316f692c3 100644
--- a/drivers/remoteproc/ti_sci_proc.h
+++ b/drivers/remoteproc/ti_sci_proc.h
@@ -10,6 +10,7 @@
 #ifndef REMOTEPROC_TI_SCI_PROC_H
 #define REMOTEPROC_TI_SCI_PROC_H
 
+#include <asm/types.h>
 #include <linux/printk.h>
 #define TISCI_INVALID_HOST 0xff
 
diff --git a/drivers/reset/ast2500-reset.c b/drivers/reset/ast2500-reset.c
index d1e687bc1352..f98eee5a7878 100644
--- a/drivers/reset/ast2500-reset.c
+++ b/drivers/reset/ast2500-reset.c
@@ -14,6 +14,7 @@
 #include <asm/io.h>
 #include <asm/arch/scu_ast2500.h>
 #include <asm/arch/wdt.h>
+#include <asm/types.h>
 
 struct ast2500_reset_priv {
 	/* WDT used to perform resets. */
diff --git a/drivers/reset/reset-bcm6345.c b/drivers/reset/reset-bcm6345.c
index 69793967c420..f11843ec5d5d 100644
--- a/drivers/reset/reset-bcm6345.c
+++ b/drivers/reset/reset-bcm6345.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
diff --git a/drivers/reset/reset-hisilicon.c b/drivers/reset/reset-hisilicon.c
index 2012421e4173..a03365be44fe 100644
--- a/drivers/reset/reset-hisilicon.c
+++ b/drivers/reset/reset-hisilicon.c
@@ -3,11 +3,13 @@
  * Copyright (c) 2019, Linaro Limited
  */
 
+#include <compiler.h>
 #include <log.h>
 #include <malloc.h>
 #include <asm/io.h>
 #include <common.h>
 #include <dm.h>
+#include <asm/types.h>
 #include <dt-bindings/reset/ti-syscon.h>
 #include <reset-uclass.h>
 #include <linux/bitops.h>
diff --git a/drivers/reset/reset-hsdk.c b/drivers/reset/reset-hsdk.c
index c9cfa6bc7d36..b730f5ccae90 100644
--- a/drivers/reset/reset-hsdk.c
+++ b/drivers/reset/reset-hsdk.c
@@ -6,10 +6,12 @@
  * Author: Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>
  */
 
+#include <compiler.h>
 #include <log.h>
 #include <asm/io.h>
 #include <common.h>
 #include <dm.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/iopoll.h>
diff --git a/drivers/reset/reset-imx7.c b/drivers/reset/reset-imx7.c
index 1ad031b90412..923693630428 100644
--- a/drivers/reset/reset-imx7.c
+++ b/drivers/reset/reset-imx7.c
@@ -3,11 +3,13 @@
  * Copyright (c) 2017, Impinj, Inc.
  */
 
+#include <compiler.h>
 #include <log.h>
 #include <malloc.h>
 #include <asm/io.h>
 #include <common.h>
 #include <dm.h>
+#include <asm/types.h>
 #include <dt-bindings/reset/imx7-reset.h>
 #include <dt-bindings/reset/imx8mq-reset.h>
 #include <reset-uclass.h>
diff --git a/drivers/reset/reset-mediatek.c b/drivers/reset/reset-mediatek.c
index 9df4c2a1c7b7..4ef148824af6 100644
--- a/drivers/reset/reset-mediatek.c
+++ b/drivers/reset/reset-mediatek.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <log.h>
 #include <malloc.h>
+#include <asm/types.h>
 #include <dm/lists.h>
 #include <regmap.h>
 #include <reset-uclass.h>
diff --git a/drivers/reset/reset-meson.c b/drivers/reset/reset-meson.c
index ee53df94eca2..b08b2dd0a26b 100644
--- a/drivers/reset/reset-meson.c
+++ b/drivers/reset/reset-meson.c
@@ -15,6 +15,7 @@
 #include <stdbool.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #define REG_COUNT	8
 #define BITS_PER_REG	32
diff --git a/drivers/reset/reset-mtmips.c b/drivers/reset/reset-mtmips.c
index 4d59a9b8ac56..4e6d5d397361 100644
--- a/drivers/reset/reset-mtmips.c
+++ b/drivers/reset/reset-mtmips.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
diff --git a/drivers/reset/reset-rockchip.c b/drivers/reset/reset-rockchip.c
index 5e8daa28913c..e3b504e7c949 100644
--- a/drivers/reset/reset-rockchip.c
+++ b/drivers/reset/reset-rockchip.c
@@ -4,10 +4,12 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
 #include <malloc.h>
 #include <reset-uclass.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/io.h>
diff --git a/drivers/reset/reset-socfpga.c b/drivers/reset/reset-socfpga.c
index 370353e6cba0..8f6658e17a57 100644
--- a/drivers/reset/reset-socfpga.c
+++ b/drivers/reset/reset-socfpga.c
@@ -13,12 +13,14 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
 #include <malloc.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <asm/types.h>
 #include <dm/lists.h>
 #include <dm/of_access.h>
 #include <env.h>
diff --git a/drivers/reset/reset-sunxi.c b/drivers/reset/reset-sunxi.c
index 54692cc3f5e7..ca557c63a9e2 100644
--- a/drivers/reset/reset-sunxi.c
+++ b/drivers/reset/reset-sunxi.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <reset-uclass.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/io.h>
 #include <dm/lists.h>
@@ -17,6 +18,7 @@
 #include <linux/errno.h>
 #include <linux/log2.h>
 #include <asm/arch/ccu.h>
+#include <linux/types.h>
 
 struct sunxi_reset_priv {
 	void *base;
diff --git a/drivers/reset/reset-syscon.c b/drivers/reset/reset-syscon.c
index 16e74dc8e94b..c907acbeee90 100644
--- a/drivers/reset/reset-syscon.c
+++ b/drivers/reset/reset-syscon.c
@@ -8,10 +8,12 @@
 #include <regmap.h>
 #include <reset.h>
 #include <reset-uclass.h>
+#include <stdbool.h>
 #include <syscon.h>
 #include <linux/bitops.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 struct syscon_reset_priv {
 	struct regmap *regmap;
diff --git a/drivers/reset/reset-ti-sci.c b/drivers/reset/reset-ti-sci.c
index 4d00622eb81a..b234c3c2808a 100644
--- a/drivers/reset/reset-ti-sci.c
+++ b/drivers/reset/reset-ti-sci.c
@@ -14,6 +14,8 @@
 #include <log.h>
 #include <malloc.h>
 #include <reset-uclass.h>
+#include <stdbool.h>
+#include <asm/types.h>
 #include <dm/device_compat.h>
 #include <linux/err.h>
 #include <linux/errno.h>
diff --git a/drivers/reset/reset-uniphier.c b/drivers/reset/reset-uniphier.c
index b557906b8903..941b2dadd4eb 100644
--- a/drivers/reset/reset-uniphier.c
+++ b/drivers/reset/reset-uniphier.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
 #include <malloc.h>
@@ -14,6 +15,7 @@
 #include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/sizes.h>
+#include <linux/types.h>
 
 struct uniphier_reset_data {
 	unsigned int id;
diff --git a/drivers/reset/sti-reset.c b/drivers/reset/sti-reset.c
index d80e985711e8..46b8cddd4fdd 100644
--- a/drivers/reset/sti-reset.c
+++ b/drivers/reset/sti-reset.c
@@ -5,9 +5,11 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <errno.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <wait_bit.h>
 #include <dm.h>
 #include <reset-uclass.h>
@@ -19,6 +21,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/rng/meson-rng.c b/drivers/rng/meson-rng.c
index 0debe8a10689..81d103816877 100644
--- a/drivers/rng/meson-rng.c
+++ b/drivers/rng/meson-rng.c
@@ -12,6 +12,7 @@
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 struct meson_rng_platdata {
 	fdt_addr_t base;
diff --git a/drivers/rng/rng-uclass.c b/drivers/rng/rng-uclass.c
index b315401f20e5..9c547686f473 100644
--- a/drivers/rng/rng-uclass.c
+++ b/drivers/rng/rng-uclass.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <rng.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 int dm_rng_read(struct udevice *dev, void *buffer, size_t size)
 {
diff --git a/drivers/rng/rockchip_rng.c b/drivers/rng/rockchip_rng.c
index 35f999c447d5..b7454bd5be9f 100644
--- a/drivers/rng/rockchip_rng.c
+++ b/drivers/rng/rockchip_rng.c
@@ -12,6 +12,7 @@
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <rng.h>
+#include <linux/types.h>
 
 #define RK_HW_RNG_MAX 32
 
diff --git a/drivers/rng/sandbox_rng.c b/drivers/rng/sandbox_rng.c
index a55e552177a6..27ad9e8aba8f 100644
--- a/drivers/rng/sandbox_rng.c
+++ b/drivers/rng/sandbox_rng.c
@@ -8,6 +8,7 @@
 #include <rand.h>
 #include <rng.h>
 #include <time.h>
+#include <linux/types.h>
 
 #include <linux/string.h>
 
diff --git a/drivers/rng/stm32mp1_rng.c b/drivers/rng/stm32mp1_rng.c
index 25cba1602227..d4d6b3e48ee6 100644
--- a/drivers/rng/stm32mp1_rng.c
+++ b/drivers/rng/stm32mp1_rng.c
@@ -14,6 +14,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <asm/io.h>
 #include <linux/iopoll.h>
diff --git a/drivers/rtc/at91sam9_rtt.c b/drivers/rtc/at91sam9_rtt.c
index 6f92660ef1da..12d57073f6a2 100644
--- a/drivers/rtc/at91sam9_rtt.c
+++ b/drivers/rtc/at91sam9_rtt.c
@@ -26,6 +26,7 @@
 #include <asm/arch/hardware.h>
 #include <asm/arch/at91_rtt.h>
 #include <asm/arch/at91_gpbr.h>
+#include <linux/types.h>
 
 int rtc_get (struct rtc_time *tmp)
 {
diff --git a/drivers/rtc/ds1306.c b/drivers/rtc/ds1306.c
index 36d615812b2a..0f1dbf636fb9 100644
--- a/drivers/rtc/ds1306.c
+++ b/drivers/rtc/ds1306.c
@@ -19,6 +19,7 @@
 #include <rtc.h>
 #include <spi.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 #define	RTC_SECONDS		0x00
 #define	RTC_MINUTES		0x01
diff --git a/drivers/rtc/ds1307.c b/drivers/rtc/ds1307.c
index acdae077c40c..84c1f0731c90 100644
--- a/drivers/rtc/ds1307.c
+++ b/drivers/rtc/ds1307.c
@@ -20,6 +20,7 @@
 #include <rtc.h>
 #include <i2c.h>
 #include <stdio.h>
+#include <linux/types.h>
 
 enum ds_type {
 	ds_1307,
diff --git a/drivers/rtc/ds1337.c b/drivers/rtc/ds1337.c
index 9b9a9d6a810d..fc0767a034b2 100644
--- a/drivers/rtc/ds1337.c
+++ b/drivers/rtc/ds1337.c
@@ -18,6 +18,7 @@
 #include <rtc.h>
 #include <i2c.h>
 #include <stdio.h>
+#include <linux/types.h>
 
 /*
  * RTC register addresses
diff --git a/drivers/rtc/ds1374.c b/drivers/rtc/ds1374.c
index dc8e370a402c..2d217d33371f 100644
--- a/drivers/rtc/ds1374.c
+++ b/drivers/rtc/ds1374.c
@@ -19,6 +19,7 @@
 #include <i2c.h>
 #include <stdbool.h>
 #include <stdio.h>
+#include <linux/types.h>
 
 /*---------------------------------------------------------------------*/
 #undef DEBUG_RTC
diff --git a/drivers/rtc/ds1556.c b/drivers/rtc/ds1556.c
index 27bf42816989..3834affba6a3 100644
--- a/drivers/rtc/ds1556.c
+++ b/drivers/rtc/ds1556.c
@@ -19,6 +19,7 @@
 #include <command.h>
 #include <rtc.h>
 #include <stdio.h>
+#include <linux/types.h>
 
 #if defined(CONFIG_CMD_DATE)
 
diff --git a/drivers/rtc/ds164x.c b/drivers/rtc/ds164x.c
index b363908e79a7..172a1ff2777b 100644
--- a/drivers/rtc/ds164x.c
+++ b/drivers/rtc/ds164x.c
@@ -19,6 +19,7 @@
 #include <command.h>
 #include <rtc.h>
 #include <stdio.h>
+#include <linux/types.h>
 
 
 static uchar    rtc_read(unsigned int addr );
diff --git a/drivers/rtc/ds174x.c b/drivers/rtc/ds174x.c
index b7ee5b7ba1d5..4f9b067a1a2c 100644
--- a/drivers/rtc/ds174x.c
+++ b/drivers/rtc/ds174x.c
@@ -16,6 +16,7 @@
 #include <command.h>
 #include <rtc.h>
 #include <stdio.h>
+#include <linux/types.h>
 
 static uchar rtc_read( unsigned int addr );
 static void  rtc_write( unsigned int addr, uchar val);
diff --git a/drivers/rtc/ds3231.c b/drivers/rtc/ds3231.c
index ebb1cc65c64c..051ff55b69b5 100644
--- a/drivers/rtc/ds3231.c
+++ b/drivers/rtc/ds3231.c
@@ -22,6 +22,7 @@
 #include <i2c.h>
 #include <stdio.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 /*
  * RTC register addresses
diff --git a/drivers/rtc/ds3232.c b/drivers/rtc/ds3232.c
index e6c9f8786659..73b77f8d9701 100644
--- a/drivers/rtc/ds3232.c
+++ b/drivers/rtc/ds3232.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <rtc.h>
+#include <asm/types.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
diff --git a/drivers/rtc/i2c_rtc_emul.c b/drivers/rtc/i2c_rtc_emul.c
index 93b9ecc18db0..fb8140784179 100644
--- a/drivers/rtc/i2c_rtc_emul.c
+++ b/drivers/rtc/i2c_rtc_emul.c
@@ -23,6 +23,7 @@
 #include <asm/rtc.h>
 #include <asm/test.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #ifdef DEBUG
 #define debug_buffer print_buffer
diff --git a/drivers/rtc/imxdi.c b/drivers/rtc/imxdi.c
index 55def3ac9fd9..19c77ba097b0 100644
--- a/drivers/rtc/imxdi.c
+++ b/drivers/rtc/imxdi.c
@@ -14,7 +14,9 @@
 
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/compat.h>
 #include <rtc.h>
 #include <linux/delay.h>
diff --git a/drivers/rtc/isl1208.c b/drivers/rtc/isl1208.c
index 47c48bfc11f5..87010526148d 100644
--- a/drivers/rtc/isl1208.c
+++ b/drivers/rtc/isl1208.c
@@ -17,6 +17,7 @@
 #include <rtc.h>
 #include <i2c.h>
 #include <stdio.h>
+#include <linux/types.h>
 
 /*---------------------------------------------------------------------*/
 #ifdef DEBUG_RTC
diff --git a/drivers/rtc/m41t11.c b/drivers/rtc/m41t11.c
index 469551980a90..8f618fb173ad 100644
--- a/drivers/rtc/m41t11.c
+++ b/drivers/rtc/m41t11.c
@@ -17,6 +17,7 @@
 #include <rtc.h>
 #include <i2c.h>
 #include <stdio.h>
+#include <linux/types.h>
 
 /*
 	I Don't have an example config file but this
diff --git a/drivers/rtc/m41t60.c b/drivers/rtc/m41t60.c
index 05ed89bf8d67..0cfd3d61b2dd 100644
--- a/drivers/rtc/m41t60.c
+++ b/drivers/rtc/m41t60.c
@@ -23,6 +23,7 @@
 #include <i2c.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/types.h>
 
 /*
  * Convert between century and "century bits" (CB1 and CB0).  These routines
diff --git a/drivers/rtc/m41t62.c b/drivers/rtc/m41t62.c
index 23ebaddf9417..a3478e28bdab 100644
--- a/drivers/rtc/m41t62.c
+++ b/drivers/rtc/m41t62.c
@@ -23,6 +23,7 @@
 #include <rtc.h>
 #include <i2c.h>
 #include <stdio.h>
+#include <asm/types.h>
 
 #define M41T62_REG_SSEC	0
 #define M41T62_REG_SEC	1
diff --git a/drivers/rtc/m41t94.c b/drivers/rtc/m41t94.c
index 5b665bb01333..e997fccb3a7a 100644
--- a/drivers/rtc/m41t94.c
+++ b/drivers/rtc/m41t94.c
@@ -16,6 +16,7 @@
 #include <common.h>
 #include <rtc.h>
 #include <spi.h>
+#include <asm/types.h>
 
 static struct spi_slave *slave;
 
diff --git a/drivers/rtc/m48t35ax.c b/drivers/rtc/m48t35ax.c
index 1cc24cccae73..1f1dddd9bf71 100644
--- a/drivers/rtc/m48t35ax.c
+++ b/drivers/rtc/m48t35ax.c
@@ -15,6 +15,7 @@
 #include <command.h>
 #include <rtc.h>
 #include <config.h>
+#include <linux/types.h>
 
 static uchar rtc_read  (uchar reg);
 static void  rtc_write (uchar reg, uchar val);
diff --git a/drivers/rtc/max6900.c b/drivers/rtc/max6900.c
index 11928839dcfc..7e7abae89773 100644
--- a/drivers/rtc/max6900.c
+++ b/drivers/rtc/max6900.c
@@ -15,6 +15,7 @@
 #include <rtc.h>
 #include <i2c.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 #ifndef	CONFIG_SYS_I2C_RTC_ADDR
 #define	CONFIG_SYS_I2C_RTC_ADDR	0x50
diff --git a/drivers/rtc/mc13xxx-rtc.c b/drivers/rtc/mc13xxx-rtc.c
index 6c2aef89758b..4784e9dda18b 100644
--- a/drivers/rtc/mc13xxx-rtc.c
+++ b/drivers/rtc/mc13xxx-rtc.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <rtc.h>
 #include <spi.h>
+#include <asm/types.h>
 #include <power/pmic.h>
 #include <fsl_pmic.h>
 
diff --git a/drivers/rtc/mc146818.c b/drivers/rtc/mc146818.c
index 43318e066efc..34dcbb2259fb 100644
--- a/drivers/rtc/mc146818.c
+++ b/drivers/rtc/mc146818.c
@@ -13,6 +13,7 @@
 #include <dm.h>
 #include <rtc.h>
 #include <stdio.h>
+#include <linux/types.h>
 
 #if defined(CONFIG_X86) || defined(CONFIG_MALTA)
 #include <asm/io.h>
diff --git a/drivers/rtc/mk48t59.c b/drivers/rtc/mk48t59.c
index 8c90a7040767..b2149f718139 100644
--- a/drivers/rtc/mk48t59.c
+++ b/drivers/rtc/mk48t59.c
@@ -15,6 +15,7 @@
 #include <config.h>
 #include <rtc.h>
 #include <mk48t59.h>
+#include <linux/types.h>
 
 #if defined(CONFIG_BAB7xx)
 
diff --git a/drivers/rtc/mvrtc.c b/drivers/rtc/mvrtc.c
index 6a0224cad736..80a4feb93085 100644
--- a/drivers/rtc/mvrtc.c
+++ b/drivers/rtc/mvrtc.c
@@ -14,6 +14,7 @@
 #include <rtc.h>
 #include <stdio.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include "mvrtc.h"
 
diff --git a/drivers/rtc/mvrtc.h b/drivers/rtc/mvrtc.h
index 87ff43299cad..9244ad821894 100644
--- a/drivers/rtc/mvrtc.h
+++ b/drivers/rtc/mvrtc.h
@@ -12,6 +12,7 @@
 #define _MVRTC_H_
 
 #include <asm/arch/soc.h>
+#include <asm/types.h>
 #include <linux/compiler.h>
 
 /* RTC registers */
diff --git a/drivers/rtc/mx27rtc.c b/drivers/rtc/mx27rtc.c
index 563e8a4a3610..742f33e5837c 100644
--- a/drivers/rtc/mx27rtc.c
+++ b/drivers/rtc/mx27rtc.c
@@ -9,6 +9,7 @@
 #include <rtc.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
+#include <linux/types.h>
 
 #define HOUR_SHIFT 8
 #define HOUR_MASK  0x1f
diff --git a/drivers/rtc/mxsrtc.c b/drivers/rtc/mxsrtc.c
index ec0c631cc499..22e438d47aa7 100644
--- a/drivers/rtc/mxsrtc.c
+++ b/drivers/rtc/mxsrtc.c
@@ -12,6 +12,7 @@
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/types.h>
 
 #define	MXS_RTC_MAX_TIMEOUT	1000000
 
diff --git a/drivers/rtc/pcf2127.c b/drivers/rtc/pcf2127.c
index e4ab395f514a..4a357cf76717 100644
--- a/drivers/rtc/pcf2127.c
+++ b/drivers/rtc/pcf2127.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <rtc.h>
 #include <stdio.h>
+#include <linux/types.h>
 
 #define PCF2127_REG_CTRL1	0x00
 #define PCF2127_REG_CTRL2	0x01
diff --git a/drivers/rtc/pcf8563.c b/drivers/rtc/pcf8563.c
index 79d1b71a0cfa..3a910e766efb 100644
--- a/drivers/rtc/pcf8563.c
+++ b/drivers/rtc/pcf8563.c
@@ -17,6 +17,7 @@
 #include <rtc.h>
 #include <i2c.h>
 #include <stdio.h>
+#include <linux/types.h>
 
 #if !CONFIG_IS_ENABLED(DM_RTC)
 static uchar rtc_read  (uchar reg);
diff --git a/drivers/rtc/pt7c4338.c b/drivers/rtc/pt7c4338.c
index 4718229657e6..6d99007558c1 100644
--- a/drivers/rtc/pt7c4338.c
+++ b/drivers/rtc/pt7c4338.c
@@ -25,6 +25,7 @@
 #include <rtc.h>
 #include <i2c.h>
 #include <stdio.h>
+#include <asm/types.h>
 
 /* RTC register addresses */
 #define RTC_SEC_REG_ADDR        0x0
diff --git a/drivers/rtc/rtc-uclass.c b/drivers/rtc/rtc-uclass.c
index 1fda0cd8fbce..b4f70519fa24 100644
--- a/drivers/rtc/rtc-uclass.c
+++ b/drivers/rtc/rtc-uclass.c
@@ -9,6 +9,7 @@
 #include <errno.h>
 #include <log.h>
 #include <rtc.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 
 int dm_rtc_get(struct udevice *dev, struct rtc_time *time)
diff --git a/drivers/rtc/rv3029.c b/drivers/rtc/rv3029.c
index bda19d6853fa..c241aa085be8 100644
--- a/drivers/rtc/rv3029.c
+++ b/drivers/rtc/rv3029.c
@@ -21,6 +21,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #define RTC_RV3029_PAGE_LEN             7
 
diff --git a/drivers/rtc/rv8803.c b/drivers/rtc/rv8803.c
index 5e16676c04c8..f04a5ba0897b 100644
--- a/drivers/rtc/rv8803.c
+++ b/drivers/rtc/rv8803.c
@@ -17,6 +17,7 @@
 #include <rtc.h>
 #include <i2c.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 
 /*
diff --git a/drivers/rtc/rx8010sj.c b/drivers/rtc/rx8010sj.c
index 1da7a7d6c905..c2bbce35088a 100644
--- a/drivers/rtc/rx8010sj.c
+++ b/drivers/rtc/rx8010sj.c
@@ -22,6 +22,7 @@
 #include <i2c.h>
 #include <rtc.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 
diff --git a/drivers/rtc/rx8025.c b/drivers/rtc/rx8025.c
index aaa3609be008..b92ebd263de0 100644
--- a/drivers/rtc/rx8025.c
+++ b/drivers/rtc/rx8025.c
@@ -15,6 +15,7 @@
 #include <rtc.h>
 #include <stdio.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 /*---------------------------------------------------------------------*/
 #undef DEBUG_RTC
diff --git a/drivers/rtc/s35392a.c b/drivers/rtc/s35392a.c
index 3744d8445fbc..cfa745529e06 100644
--- a/drivers/rtc/s35392a.c
+++ b/drivers/rtc/s35392a.c
@@ -22,6 +22,7 @@
 #include <dm.h>
 #include <i2c.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/bitrev.h>
 #include <rtc.h>
 #include <linux/delay.h>
diff --git a/drivers/rtc/s3c24x0_rtc.c b/drivers/rtc/s3c24x0_rtc.c
index 807347a91495..e76193c45d4e 100644
--- a/drivers/rtc/s3c24x0_rtc.c
+++ b/drivers/rtc/s3c24x0_rtc.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <command.h>
 #include <stdio.h>
+#include <linux/types.h>
 
 #include <asm/arch/s3c24x0_cpu.h>
 
diff --git a/drivers/rtc/sandbox_rtc.c b/drivers/rtc/sandbox_rtc.c
index 852770a49cf8..a16133f9daf3 100644
--- a/drivers/rtc/sandbox_rtc.c
+++ b/drivers/rtc/sandbox_rtc.c
@@ -9,6 +9,7 @@
 #include <i2c.h>
 #include <rtc.h>
 #include <asm/rtc.h>
+#include <asm/types.h>
 #include <dm/acpi.h>
 
 #define REG_COUNT 0x80
diff --git a/drivers/rtc/stm32_rtc.c b/drivers/rtc/stm32_rtc.c
index 8f9540697df4..9cf16289f4f3 100644
--- a/drivers/rtc/stm32_rtc.c
+++ b/drivers/rtc/stm32_rtc.c
@@ -8,6 +8,7 @@
 #include <malloc.h>
 #include <rtc.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
diff --git a/drivers/rtc/x1205.c b/drivers/rtc/x1205.c
index ce23427b1744..e913210057f5 100644
--- a/drivers/rtc/x1205.c
+++ b/drivers/rtc/x1205.c
@@ -22,6 +22,7 @@
 #include <log.h>
 #include <rtc.h>
 #include <i2c.h>
+#include <asm/types.h>
 
 #define CCR_SEC			0
 #define CCR_MIN			1
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
index 0a68ef4a187f..5b9f1ccbdbb7 100644
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -13,6 +13,7 @@
 #include <part.h>
 #include <pci.h>
 #include <scsi.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <dm/device-internal.h>
@@ -20,6 +21,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #if !defined(CONFIG_DM_SCSI)
 # ifdef CONFIG_SCSI_DEV_LIST
diff --git a/drivers/serial/altera_jtag_uart.c b/drivers/serial/altera_jtag_uart.c
index bd2b65b028f4..5cfef019a388 100644
--- a/drivers/serial/altera_jtag_uart.c
+++ b/drivers/serial/altera_jtag_uart.c
@@ -10,6 +10,7 @@
 #include <serial.h>
 #include <stdbool.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 
diff --git a/drivers/serial/altera_uart.c b/drivers/serial/altera_uart.c
index 3d309885c2c2..9492a3c952ce 100644
--- a/drivers/serial/altera_uart.c
+++ b/drivers/serial/altera_uart.c
@@ -10,6 +10,7 @@
 #include <serial.h>
 #include <stdbool.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 
diff --git a/drivers/serial/atmel_usart.c b/drivers/serial/atmel_usart.c
index 84bf36f3be59..0add4e41dbd2 100644
--- a/drivers/serial/atmel_usart.c
+++ b/drivers/serial/atmel_usart.c
@@ -2,6 +2,8 @@
 /*
  * Copyright (C) 2004-2006 Atmel Corporation
  *
+#include <compiler.h>
+#include <linux/types.h>
  * Modified to support C structur SoC access by
  * Andreas Bie?mann <biessmann@corscience.de>
  */
diff --git a/drivers/serial/atmel_usart.h b/drivers/serial/atmel_usart.h
index 8f27488158d4..61c057b13eca 100644
--- a/drivers/serial/atmel_usart.h
+++ b/drivers/serial/atmel_usart.h
@@ -4,6 +4,7 @@
  *
  * Copyright (C) 2005-2006 Atmel Corporation
  *
+#include <asm/types.h>
  * Modified to support C structure SoC access by
  * Andreas Bie?mann <biessmann@corscience.de>
  */
diff --git a/drivers/serial/lpc32xx_hsuart.c b/drivers/serial/lpc32xx_hsuart.c
index 49ca3ff1320b..a23f0ffaf4a8 100644
--- a/drivers/serial/lpc32xx_hsuart.c
+++ b/drivers/serial/lpc32xx_hsuart.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <serial.h>
 #include <stdbool.h>
+#include <asm/types.h>
 #include <dm/platform_data/lpc32xx_hsuart.h>
 #include <linux/errno.h>
 
diff --git a/drivers/serial/ns16550.c b/drivers/serial/ns16550.c
index b0b69cf96f75..3e704de6c722 100644
--- a/drivers/serial/ns16550.c
+++ b/drivers/serial/ns16550.c
@@ -13,6 +13,7 @@
 #include <ns16550.h>
 #include <reset.h>
 #include <serial.h>
+#include <stdbool.h>
 #include <watchdog.h>
 #include <asm/global_data.h>
 #include <linux/err.h>
diff --git a/drivers/serial/sandbox.c b/drivers/serial/sandbox.c
index c811524e3579..b23283e66b32 100644
--- a/drivers/serial/sandbox.c
+++ b/drivers/serial/sandbox.c
@@ -16,6 +16,7 @@
 #include <lcd.h>
 #include <os.h>
 #include <serial.h>
+#include <stdbool.h>
 #include <video.h>
 #include <asm/global_data.h>
 #include <linux/compiler.h>
@@ -23,6 +24,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/serial/serial-uclass.c b/drivers/serial/serial-uclass.c
index 2eae95fd62bf..e959a7538fe6 100644
--- a/drivers/serial/serial-uclass.c
+++ b/drivers/serial/serial-uclass.c
@@ -22,6 +22,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/serial/serial.c b/drivers/serial/serial.c
index 0301288b5ef0..300f4708e6b9 100644
--- a/drivers/serial/serial.c
+++ b/drivers/serial/serial.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <env_internal.h>
 #include <hang.h>
 #include <serial.h>
diff --git a/drivers/serial/serial_ar933x.c b/drivers/serial/serial_ar933x.c
index fdcd62705ad5..3d4b539d72c9 100644
--- a/drivers/serial/serial_ar933x.c
+++ b/drivers/serial/serial_ar933x.c
@@ -5,10 +5,12 @@
 
 #include <common.h>
 #include <clock_legacy.h>
+#include <compiler.h>
 #include <dm.h>
 #include <div64.h>
 #include <errno.h>
 #include <serial.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <asm/addrspace.h>
 #include <asm/types.h>
diff --git a/drivers/serial/serial_arc.c b/drivers/serial/serial_arc.c
index 4205ffdd0dff..69435a16e376 100644
--- a/drivers/serial/serial_arc.c
+++ b/drivers/serial/serial_arc.c
@@ -12,6 +12,7 @@
 #include <serial.h>
 #include <stdbool.h>
 #include <asm/global_data.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/serial/serial_bcm283x_mu.c b/drivers/serial/serial_bcm283x_mu.c
index 6e54e4ca72f0..0be968c24e84 100644
--- a/drivers/serial/serial_bcm283x_mu.c
+++ b/drivers/serial/serial_bcm283x_mu.c
@@ -22,6 +22,7 @@
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <serial.h>
+#include <asm/types.h>
 #include <dm/platform_data/serial_bcm283x_mu.h>
 #include <dm/pinctrl.h>
 #include <linux/bitops.h>
diff --git a/drivers/serial/serial_bcm6345.c b/drivers/serial/serial_bcm6345.c
index a90bfc7f5ed7..eb64b6acfbf0 100644
--- a/drivers/serial/serial_bcm6345.c
+++ b/drivers/serial/serial_bcm6345.c
@@ -7,6 +7,7 @@
  */
 
 #include <clk.h>
+#include <compiler.h>
 #include <dm.h>
 #include <debug_uart.h>
 #include <errno.h>
@@ -16,6 +17,7 @@
 #include <asm/io.h>
 #include <asm/types.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 /* UART Control register */
 #define UART_CTL_REG			0x0
diff --git a/drivers/serial/serial_cortina.c b/drivers/serial/serial_cortina.c
index 001fca79f980..aea9f8fd771a 100644
--- a/drivers/serial/serial_cortina.c
+++ b/drivers/serial/serial_cortina.c
@@ -6,12 +6,14 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <errno.h>
 #include <stdbool.h>
 #include <watchdog.h>
 #include <asm/io.h>
 #include <serial.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/compiler.h>
 #include <linux/errno.h>
diff --git a/drivers/serial/serial_efi.c b/drivers/serial/serial_efi.c
index 4739c5a20e8d..e8d62ba22264 100644
--- a/drivers/serial/serial_efi.c
+++ b/drivers/serial/serial_efi.c
@@ -17,6 +17,7 @@
 #include <asm/io.h>
 #include <serial.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 /* Information about the efi console */
 struct serial_efi_priv {
diff --git a/drivers/serial/serial_linflexuart.c b/drivers/serial/serial_linflexuart.c
index b9b947a930af..408f0a7944d7 100644
--- a/drivers/serial/serial_linflexuart.c
+++ b/drivers/serial/serial_linflexuart.c
@@ -15,6 +15,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/clock.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #define US1_TDRE            (1 << 7)
 #define US1_RDRF            (1 << 5)
diff --git a/drivers/serial/serial_lpuart.c b/drivers/serial/serial_lpuart.c
index 45ae154b6330..239e614c3e05 100644
--- a/drivers/serial/serial_lpuart.c
+++ b/drivers/serial/serial_lpuart.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <dm.h>
 #include <fsl_lpuart.h>
 #include <log.h>
@@ -20,6 +21,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/clock.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #define US1_TDRE	(1 << 7)
 #define US1_RDRF	(1 << 5)
diff --git a/drivers/serial/serial_mcf.c b/drivers/serial/serial_mcf.c
index f1670a0eddd7..f6a8aa842240 100644
--- a/drivers/serial/serial_mcf.c
+++ b/drivers/serial/serial_mcf.c
@@ -25,6 +25,7 @@
 #include <asm/immap.h>
 #include <asm/uart.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/serial/serial_meson.c b/drivers/serial/serial_meson.c
index 63875c626cdd..a245d168e415 100644
--- a/drivers/serial/serial_meson.c
+++ b/drivers/serial/serial_meson.c
@@ -12,6 +12,7 @@
 #include <linux/compiler.h>
 #include <serial.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 struct meson_uart {
 	u32 wfifo;
diff --git a/drivers/serial/serial_mpc8xx.c b/drivers/serial/serial_mpc8xx.c
index 7e64e415fb6d..c442dcac5c94 100644
--- a/drivers/serial/serial_mpc8xx.c
+++ b/drivers/serial/serial_mpc8xx.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <dm.h>
 #include <serial.h>
 #include <stdbool.h>
@@ -14,6 +15,7 @@
 #include <asm/global_data.h>
 #include <asm/ppc.h>
 #include <linux/compiler.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/serial/serial_msm.c b/drivers/serial/serial_msm.c
index a86563e8d8fc..c1486988b6a3 100644
--- a/drivers/serial/serial_msm.c
+++ b/drivers/serial/serial_msm.c
@@ -21,6 +21,7 @@
 #include <linux/compiler.h>
 #include <dm/pinctrl.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 /* Serial registers - this driver works in uartdm mode*/
 
diff --git a/drivers/serial/serial_mtk.c b/drivers/serial/serial_mtk.c
index c028d760f2f1..ddd45fb2da13 100644
--- a/drivers/serial/serial_mtk.c
+++ b/drivers/serial/serial_mtk.c
@@ -8,11 +8,13 @@
 
 #include <clk.h>
 #include <common.h>
+#include <compiler.h>
 #include <div64.h>
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
 #include <serial.h>
+#include <stdbool.h>
 #include <watchdog.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/serial/serial_mvebu_a3700.c b/drivers/serial/serial_mvebu_a3700.c
index a5674e6b13bc..ddb4d71324ca 100644
--- a/drivers/serial/serial_mvebu_a3700.c
+++ b/drivers/serial/serial_mvebu_a3700.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <serial.h>
 #include <stdbool.h>
diff --git a/drivers/serial/serial_mxc.c b/drivers/serial/serial_mxc.c
index d13dbeb3cef5..b6646d1374e7 100644
--- a/drivers/serial/serial_mxc.c
+++ b/drivers/serial/serial_mxc.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <errno.h>
 #include <stdbool.h>
@@ -15,6 +16,7 @@
 #include <serial.h>
 #include <linux/compiler.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 /* UART Control Register Bit Fields.*/
 #define URXD_CHARRDY	(1<<15)
diff --git a/drivers/serial/serial_ns16550.c b/drivers/serial/serial_ns16550.c
index 1353e2f7ccb5..82b3919f13d0 100644
--- a/drivers/serial/serial_ns16550.c
+++ b/drivers/serial/serial_ns16550.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <clock_legacy.h>
+#include <compiler.h>
 #include <ns16550.h>
 #include <serial.h>
 #include <asm/global_data.h>
diff --git a/drivers/serial/serial_omap.c b/drivers/serial/serial_omap.c
index b661b11f0d8c..8d0c372b038d 100644
--- a/drivers/serial/serial_omap.c
+++ b/drivers/serial/serial_omap.c
@@ -15,6 +15,7 @@
 #include <clk.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #ifndef CONFIG_SYS_NS16550_CLK
 #define CONFIG_SYS_NS16550_CLK  0
diff --git a/drivers/serial/serial_pic32.c b/drivers/serial/serial_pic32.c
index f1473d6cffab..a7a54398fb2c 100644
--- a/drivers/serial/serial_pic32.c
+++ b/drivers/serial/serial_pic32.c
@@ -5,14 +5,17 @@
  */
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <dm.h>
 #include <malloc.h>
 #include <serial.h>
+#include <stdbool.h>
 #include <wait_bit.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include <mach/pic32.h>
 #include <dt-bindings/clock/microchip,clock.h>
 
diff --git a/drivers/serial/serial_pl01x.c b/drivers/serial/serial_pl01x.c
index 1f4e54628fa2..6f06b127ed9d 100644
--- a/drivers/serial/serial_pl01x.c
+++ b/drivers/serial/serial_pl01x.c
@@ -11,6 +11,7 @@
 /* Simple U-Boot driver for the PrimeCell PL010/PL011 UARTs */
 
 #include <common.h>
+#include <compiler.h>
 #include <stdbool.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
diff --git a/drivers/serial/serial_pl01x_internal.h b/drivers/serial/serial_pl01x_internal.h
index a2d696e6c274..9bfa403c403c 100644
--- a/drivers/serial/serial_pl01x_internal.h
+++ b/drivers/serial/serial_pl01x_internal.h
@@ -15,6 +15,7 @@
 
 #ifndef __ASSEMBLY__
 /*
+#include <asm/types.h>
  * We can use a combined structure for PL010 and PL011, because they overlap
  * only in common registers.
  */
diff --git a/drivers/serial/serial_pxa.c b/drivers/serial/serial_pxa.c
index 459ce7817127..3723b2a2eb97 100644
--- a/drivers/serial/serial_pxa.c
+++ b/drivers/serial/serial_pxa.c
@@ -20,6 +20,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <hang.h>
 #include <stdbool.h>
 #include <vsprintf.h>
@@ -33,6 +34,7 @@
 #include <serial.h>
 #include <watchdog.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/serial/serial_s5p.c b/drivers/serial/serial_s5p.c
index 0e8006334522..2eaafab5bb04 100644
--- a/drivers/serial/serial_s5p.c
+++ b/drivers/serial/serial_s5p.c
@@ -20,6 +20,7 @@
 #include <serial.h>
 #include <clk.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/serial/serial_sh.c b/drivers/serial/serial_sh.c
index e87f1d0ecfe0..3222028de46f 100644
--- a/drivers/serial/serial_sh.c
+++ b/drivers/serial/serial_sh.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <errno.h>
 #include <clk.h>
 #include <dm.h>
diff --git a/drivers/serial/serial_sifive.c b/drivers/serial/serial_sifive.c
index 39b62d30eb4f..d127f6004bf9 100644
--- a/drivers/serial/serial_sifive.c
+++ b/drivers/serial/serial_sifive.c
@@ -10,9 +10,11 @@
 #include <errno.h>
 #include <fdtdec.h>
 #include <log.h>
+#include <stdbool.h>
 #include <watchdog.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/compiler.h>
 #include <serial.h>
 #include <linux/err.h>
diff --git a/drivers/serial/serial_sti_asc.c b/drivers/serial/serial_sti_asc.c
index d3d1b74478a6..1b72bd59a82c 100644
--- a/drivers/serial/serial_sti_asc.c
+++ b/drivers/serial/serial_sti_asc.c
@@ -13,6 +13,7 @@
 #include <stdbool.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 
diff --git a/drivers/serial/serial_stm32.c b/drivers/serial/serial_stm32.c
index c5d8d3f3dde3..a22f48c0b670 100644
--- a/drivers/serial/serial_stm32.c
+++ b/drivers/serial/serial_stm32.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <reset.h>
 #include <serial.h>
+#include <stdbool.h>
 #include <watchdog.h>
 #include <asm/io.h>
 #include <asm/arch/stm32.h>
@@ -17,6 +18,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include "serial_stm32.h"
 #include <dm/device_compat.h>
 
diff --git a/drivers/serial/serial_stm32.h b/drivers/serial/serial_stm32.h
index 0c541ead06e1..ad2a8a19dca3 100644
--- a/drivers/serial/serial_stm32.h
+++ b/drivers/serial/serial_stm32.h
@@ -8,6 +8,7 @@
 #define _SERIAL_STM32_
 
 #include <stdbool.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #define CR1_OFFSET(x)	(x ? 0x0c : 0x00)
 #define CR3_OFFSET(x)	(x ? 0x14 : 0x08)
diff --git a/drivers/serial/serial_uniphier.c b/drivers/serial/serial_uniphier.c
index 10becca74537..fc33891fffda 100644
--- a/drivers/serial/serial_uniphier.c
+++ b/drivers/serial/serial_uniphier.c
@@ -6,7 +6,10 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
+#include <stdbool.h>
+#include <asm/types.h>
 #include <linux/bitfield.h>
 #include <linux/bitops.h>
 #include <linux/bug.h>
diff --git a/drivers/serial/serial_zynq.c b/drivers/serial/serial_zynq.c
index 7fec7d5bec4f..b96f81143772 100644
--- a/drivers/serial/serial_zynq.c
+++ b/drivers/serial/serial_zynq.c
@@ -11,8 +11,10 @@
 #include <errno.h>
 #include <fdtdec.h>
 #include <log.h>
+#include <stdbool.h>
 #include <watchdog.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/compiler.h>
diff --git a/drivers/serial/usbtty.c b/drivers/serial/usbtty.c
index 4e2e09edd3fc..27298566423f 100644
--- a/drivers/serial/usbtty.c
+++ b/drivers/serial/usbtty.c
@@ -16,6 +16,7 @@
 #include <asm/unaligned.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "usbtty.h"
 #include "usb_cdc_acm.h"
 #include "usbdescriptors.h"
diff --git a/drivers/smem/msm_smem.c b/drivers/smem/msm_smem.c
index 3a5ee3bbce04..69b008da279b 100644
--- a/drivers/smem/msm_smem.c
+++ b/drivers/smem/msm_smem.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <errno.h>
 #include <dm.h>
 #include <asm/global_data.h>
@@ -22,6 +23,7 @@
 #include <smem.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/smem/sandbox_smem.c b/drivers/smem/sandbox_smem.c
index 7397e4407ad4..8c31232e9c1c 100644
--- a/drivers/smem/sandbox_smem.c
+++ b/drivers/smem/sandbox_smem.c
@@ -8,6 +8,7 @@
 #include <errno.h>
 #include <smem.h>
 #include <asm/test.h>
+#include <linux/types.h>
 
 static int sandbox_smem_alloc(unsigned int host,
 		unsigned int item, size_t size)
diff --git a/drivers/smem/smem-uclass.c b/drivers/smem/smem-uclass.c
index 90b1316d6dc9..7a5b18921d01 100644
--- a/drivers/smem/smem-uclass.c
+++ b/drivers/smem/smem-uclass.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <smem.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 int smem_alloc(struct udevice *dev, unsigned int host,
 		unsigned int item, size_t size)
diff --git a/drivers/soc/soc_ti_k3.c b/drivers/soc/soc_ti_k3.c
index fff1a2e744a0..86223287823c 100644
--- a/drivers/soc/soc_ti_k3.c
+++ b/drivers/soc/soc_ti_k3.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <soc.h>
 #include <vsprintf.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 
 #include <asm/io.h>
diff --git a/drivers/soc/ti/k3-navss-ringacc.c b/drivers/soc/ti/k3-navss-ringacc.c
index c9a8b1ed0199..81f029fa6360 100644
--- a/drivers/soc/ti/k3-navss-ringacc.c
+++ b/drivers/soc/ti/k3-navss-ringacc.c
@@ -6,8 +6,10 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/cache.h>
 #include <asm/io.h>
 #include <malloc.h>
@@ -27,6 +29,7 @@
 #include <linux/soc/ti/k3-navss-ringacc.h>
 #include <linux/soc/ti/ti_sci_protocol.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define set_bit(bit, bitmap)	__set_bit(bit, bitmap)
 #define clear_bit(bit, bitmap)	__clear_bit(bit, bitmap)
diff --git a/drivers/soc/ti/keystone_serdes.c b/drivers/soc/ti/keystone_serdes.c
index 68fa28a6f803..b45aa571ffae 100644
--- a/drivers/soc/ti/keystone_serdes.c
+++ b/drivers/soc/ti/keystone_serdes.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <stdio.h>
 #include <asm/ti-common/keystone_serdes.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
diff --git a/drivers/sound/broadwell_i2s.c b/drivers/sound/broadwell_i2s.c
index 4258d607cb4d..1e78b5686c4e 100644
--- a/drivers/sound/broadwell_i2s.c
+++ b/drivers/sound/broadwell_i2s.c
@@ -16,6 +16,7 @@
 #include <time.h>
 #include <asm/io.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include "broadwell_i2s.h"
 
 enum {
diff --git a/drivers/sound/broadwell_i2s.h b/drivers/sound/broadwell_i2s.h
index ba87abfc6aeb..683539b918e2 100644
--- a/drivers/sound/broadwell_i2s.h
+++ b/drivers/sound/broadwell_i2s.h
@@ -10,6 +10,7 @@
 #ifndef __BROADWELL_I2S_H__
 #define __BROADWELL_I2S_H__
 
+#include <asm/types.h>
 enum {
 	SSP_FIFO_SIZE = 7,
 };
diff --git a/drivers/sound/broadwell_sound.c b/drivers/sound/broadwell_sound.c
index ba2a68ce56a0..8f770a0e8e42 100644
--- a/drivers/sound/broadwell_sound.c
+++ b/drivers/sound/broadwell_sound.c
@@ -14,6 +14,7 @@
 #include <i2s.h>
 #include <sound.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 static int broadwell_sound_probe(struct udevice *dev)
 {
diff --git a/drivers/sound/codec-uclass.c b/drivers/sound/codec-uclass.c
index 207dc188c48c..2f938c766e00 100644
--- a/drivers/sound/codec-uclass.c
+++ b/drivers/sound/codec-uclass.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <audio_codec.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 int audio_codec_set_params(struct udevice *dev, int interface, int rate,
 			   int mclk_freq, int bits_per_sample, uint channels)
diff --git a/drivers/sound/da7219.c b/drivers/sound/da7219.c
index e9d56b1f869c..d98fdf5717d5 100644
--- a/drivers/sound/da7219.c
+++ b/drivers/sound/da7219.c
@@ -18,6 +18,7 @@
 #include <asm/acpi_nhlt.h>
 #endif
 #include <asm-generic/gpio.h>
+#include <asm/types.h>
 #include <dt-bindings/sound/nhlt.h>
 #include <dm/acpi.h>
 #include <linux/errno.h>
diff --git a/drivers/sound/hda_codec.c b/drivers/sound/hda_codec.c
index 241b6270c4dd..fcf76d2284a3 100644
--- a/drivers/sound/hda_codec.c
+++ b/drivers/sound/hda_codec.c
@@ -19,6 +19,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 /**
  * struct hda_regs - HDA registers
diff --git a/drivers/sound/i2s-uclass.c b/drivers/sound/i2s-uclass.c
index e31d9933fff8..94b33baec14e 100644
--- a/drivers/sound/i2s-uclass.c
+++ b/drivers/sound/i2s-uclass.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <i2s.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 int i2s_tx_data(struct udevice *dev, void *data, uint data_size)
 {
diff --git a/drivers/sound/ivybridge_sound.c b/drivers/sound/ivybridge_sound.c
index a7423d46c185..a1d8c36b4e8c 100644
--- a/drivers/sound/ivybridge_sound.c
+++ b/drivers/sound/ivybridge_sound.c
@@ -19,6 +19,7 @@
 #include <pch.h>
 #include <sound.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 
 static int bd82x6x_azalia_probe(struct udevice *dev)
diff --git a/drivers/sound/max98088.c b/drivers/sound/max98088.c
index d1d560ae6da2..9ac357302100 100644
--- a/drivers/sound/max98088.c
+++ b/drivers/sound/max98088.c
@@ -19,6 +19,7 @@
 #include <asm/gpio.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include "maxim_codec.h"
 #include "max98088.h"
 
diff --git a/drivers/sound/max98090.c b/drivers/sound/max98090.c
index 16620c3e9674..862beeccc430 100644
--- a/drivers/sound/max98090.c
+++ b/drivers/sound/max98090.c
@@ -16,6 +16,7 @@
 #include <asm/gpio.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include "maxim_codec.h"
 #include "max98090.h"
 
diff --git a/drivers/sound/max98095.c b/drivers/sound/max98095.c
index 18632511499c..2119d851ffde 100644
--- a/drivers/sound/max98095.c
+++ b/drivers/sound/max98095.c
@@ -18,6 +18,7 @@
 #include <asm/gpio.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include "i2s.h"
 #include "max98095.h"
 
diff --git a/drivers/sound/max98357a.c b/drivers/sound/max98357a.c
index 318dfe76e39f..6c98b1b8e9e1 100644
--- a/drivers/sound/max98357a.c
+++ b/drivers/sound/max98357a.c
@@ -18,6 +18,7 @@
 #ifdef CONFIG_X86
 #include <asm/acpi_nhlt.h>
 #endif
+#include <asm/types.h>
 #include <dt-bindings/sound/nhlt.h>
 #include <dm/acpi.h>
 #include <linux/errno.h>
diff --git a/drivers/sound/rockchip_i2s.c b/drivers/sound/rockchip_i2s.c
index 37fb5a5d3405..5bb51c4b1b2c 100644
--- a/drivers/sound/rockchip_i2s.c
+++ b/drivers/sound/rockchip_i2s.c
@@ -16,6 +16,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 struct rk_i2s_regs {
 	u32 txcr;		/* I2S_TXCR, 0x00 */
diff --git a/drivers/sound/rockchip_sound.c b/drivers/sound/rockchip_sound.c
index ec93a44aec7e..4bc11f41c99b 100644
--- a/drivers/sound/rockchip_sound.c
+++ b/drivers/sound/rockchip_sound.c
@@ -17,6 +17,7 @@
 #include <asm/arch-rockchip/periph.h>
 #include <dm/pinctrl.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 static int rockchip_sound_setup(struct udevice *dev)
 {
diff --git a/drivers/sound/rt5677.c b/drivers/sound/rt5677.c
index 3eb99f31a4a9..ebf754e8afbb 100644
--- a/drivers/sound/rt5677.c
+++ b/drivers/sound/rt5677.c
@@ -11,6 +11,7 @@
 #include <i2c.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include "rt5677.h"
 #include <log.h>
 
diff --git a/drivers/sound/samsung-i2s.c b/drivers/sound/samsung-i2s.c
index 51cb9637bab1..5b71678ef9cd 100644
--- a/drivers/sound/samsung-i2s.c
+++ b/drivers/sound/samsung-i2s.c
@@ -15,6 +15,7 @@
 #include <asm/arch/i2s-regs.h>
 #include <asm/io.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #define FIC_TX2COUNT(x)		(((x) >>  24) & 0xf)
 #define FIC_TX1COUNT(x)		(((x) >>  16) & 0xf)
diff --git a/drivers/sound/samsung_sound.c b/drivers/sound/samsung_sound.c
index 16fdb22ea9ee..113b73443c37 100644
--- a/drivers/sound/samsung_sound.c
+++ b/drivers/sound/samsung_sound.c
@@ -13,6 +13,7 @@
 #include <asm/gpio.h>
 #include <asm/arch/power.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 static int samsung_sound_setup(struct udevice *dev)
 {
diff --git a/drivers/sound/sandbox.c b/drivers/sound/sandbox.c
index b1c1fca004f2..8528d77b60f8 100644
--- a/drivers/sound/sandbox.c
+++ b/drivers/sound/sandbox.c
@@ -14,6 +14,7 @@
 #include <stdbool.h>
 #include <asm/sdl.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 struct sandbox_codec_priv {
 	int interface;
diff --git a/drivers/sound/sound-uclass.c b/drivers/sound/sound-uclass.c
index 86722d23c5ce..41ab2440b636 100644
--- a/drivers/sound/sound-uclass.c
+++ b/drivers/sound/sound-uclass.c
@@ -12,6 +12,7 @@
 #include <sound.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #define SOUND_BITS_IN_BYTE 8
 
diff --git a/drivers/sound/sound.c b/drivers/sound/sound.c
index b0eab233916b..80b196457b65 100644
--- a/drivers/sound/sound.c
+++ b/drivers/sound/sound.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <log.h>
 #include <sound.h>
+#include <linux/types.h>
 
 void sound_create_square_wave(uint sample_rate, unsigned short *data, int size,
 			      uint freq, uint channels)
diff --git a/drivers/sound/tegra_ahub.c b/drivers/sound/tegra_ahub.c
index 345d9746f256..c3fac7afbc72 100644
--- a/drivers/sound/tegra_ahub.c
+++ b/drivers/sound/tegra_ahub.c
@@ -18,6 +18,7 @@
 #include <asm/arch-tegra/tegra_ahub.h>
 #include <asm/arch-tegra/tegra_i2s.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include "tegra_i2s_priv.h"
 
 struct tegra_ahub_priv {
diff --git a/drivers/sound/tegra_i2s.c b/drivers/sound/tegra_i2s.c
index 7749cd47b70c..d3f9b7a11f84 100644
--- a/drivers/sound/tegra_i2s.c
+++ b/drivers/sound/tegra_i2s.c
@@ -15,6 +15,7 @@
 #include <asm/io.h>
 #include <asm/arch-tegra/tegra_i2s.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include "tegra_i2s_priv.h"
 
 int tegra_i2s_set_cif_tx_ctrl(struct udevice *dev, u32 value)
diff --git a/drivers/sound/tegra_i2s_priv.h b/drivers/sound/tegra_i2s_priv.h
index 7cd3fc808c8c..96469e025fea 100644
--- a/drivers/sound/tegra_i2s_priv.h
+++ b/drivers/sound/tegra_i2s_priv.h
@@ -7,6 +7,7 @@
 #ifndef __TEGRA_I2S_PRIV_H
 #define __TEGRA_I2S_PRIV_H
 
+#include <asm/types.h>
 enum {
 	/* Set i2s device (in buf) */
 	AHUB_MISCOP_SET_I2S,
diff --git a/drivers/sound/tegra_sound.c b/drivers/sound/tegra_sound.c
index d76448c7e4d4..e555bae95224 100644
--- a/drivers/sound/tegra_sound.c
+++ b/drivers/sound/tegra_sound.c
@@ -15,6 +15,7 @@
 #include <sound.h>
 #include <asm/gpio.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include "tegra_i2s_priv.h"
 
 static int tegra_sound_setup(struct udevice *dev)
diff --git a/drivers/sound/wm8994.c b/drivers/sound/wm8994.c
index e8ec0517d158..bcb30696f574 100644
--- a/drivers/sound/wm8994.c
+++ b/drivers/sound/wm8994.c
@@ -19,6 +19,7 @@
 #include <asm/arch/sound.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include "wm8994.h"
 #include "wm8994_registers.h"
 
diff --git a/drivers/spi/altera_spi.c b/drivers/spi/altera_spi.c
index c9ef5a69ea9d..450a60abad7a 100644
--- a/drivers/spi/altera_spi.c
+++ b/drivers/spi/altera_spi.c
@@ -16,6 +16,7 @@
 #include <time.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
+#include <linux/types.h>
 
 #define ALTERA_SPI_STATUS_RRDY_MSK	BIT(7)
 #define ALTERA_SPI_CONTROL_SSO_MSK	BIT(10)
diff --git a/drivers/spi/atcspi200_spi.c b/drivers/spi/atcspi200_spi.c
index ab60a47945d6..5229703e9363 100644
--- a/drivers/spi/atcspi200_spi.c
+++ b/drivers/spi/atcspi200_spi.c
@@ -18,6 +18,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/spi/ath79_spi.c b/drivers/spi/ath79_spi.c
index 70bedc7fbe36..f307c44f62b0 100644
--- a/drivers/spi/ath79_spi.c
+++ b/drivers/spi/ath79_spi.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <clock_legacy.h>
+#include <compiler.h>
 #include <spi.h>
 #include <dm.h>
 #include <div64.h>
diff --git a/drivers/spi/atmel-quadspi.c b/drivers/spi/atmel-quadspi.c
index c69d7154cb5a..fc36a2e05c0b 100644
--- a/drivers/spi/atmel-quadspi.c
+++ b/drivers/spi/atmel-quadspi.c
@@ -9,7 +9,9 @@
  * Author: Piotr Bugalski <bugalski.piotr@gmail.com>
  */
 
+#include <compiler.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <vsprintf.h>
 #include <asm/io.h>
 #include <clk.h>
@@ -25,6 +27,7 @@
 #include <linux/iopoll.h>
 #include <linux/ioport.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include <mach/clk.h>
 #include <spi.h>
 #include <spi-mem.h>
diff --git a/drivers/spi/atmel_spi.c b/drivers/spi/atmel_spi.c
index 5e4ae989c183..e5fdb323f868 100644
--- a/drivers/spi/atmel_spi.c
+++ b/drivers/spi/atmel_spi.c
@@ -20,6 +20,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 /*
  * Register definitions for the Atmel AT32/AT91 SPI Controller
diff --git a/drivers/spi/bcm63xx_hsspi.c b/drivers/spi/bcm63xx_hsspi.c
index 6e2c476d2814..91acebec9500 100644
--- a/drivers/spi/bcm63xx_hsspi.c
+++ b/drivers/spi/bcm63xx_hsspi.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
 #include <malloc.h>
@@ -20,6 +21,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #define HSSPI_PP			0
 
diff --git a/drivers/spi/bcm63xx_spi.c b/drivers/spi/bcm63xx_spi.c
index ac79961a14e2..1dd3d6bcf5fd 100644
--- a/drivers/spi/bcm63xx_spi.c
+++ b/drivers/spi/bcm63xx_spi.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
 #include <malloc.h>
@@ -18,6 +19,7 @@
 #include <wait_bit.h>
 #include <asm/io.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 /* BCM6348 SPI core */
 #define SPI_6348_CLK			0x06
diff --git a/drivers/spi/bcmstb_spi.c b/drivers/spi/bcmstb_spi.c
index 27ed0203addb..bc97c29cecb2 100644
--- a/drivers/spi/bcmstb_spi.c
+++ b/drivers/spi/bcmstb_spi.c
@@ -22,6 +22,7 @@
 #include <time.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/spi/cadence_qspi.c b/drivers/spi/cadence_qspi.c
index 4b77a6b4b727..0b2b38d5a9cd 100644
--- a/drivers/spi/cadence_qspi.c
+++ b/drivers/spi/cadence_qspi.c
@@ -19,6 +19,7 @@
 #include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/sizes.h>
+#include <linux/types.h>
 #include "cadence_qspi.h"
 
 #define CQSPI_STIG_READ			0
diff --git a/drivers/spi/cadence_qspi.h b/drivers/spi/cadence_qspi.h
index 0ecd461b79a1..f697d3d547b4 100644
--- a/drivers/spi/cadence_qspi.h
+++ b/drivers/spi/cadence_qspi.h
@@ -9,6 +9,7 @@
 
 #include <reset.h>
 #include <stdbool.h>
+#include <linux/types.h>
 
 #define CQSPI_IS_ADDR(cmd_len)		(cmd_len > 1 ? 1 : 0)
 
diff --git a/drivers/spi/cadence_qspi_apb.c b/drivers/spi/cadence_qspi_apb.c
index dc066f17e3d0..10c77552f87a 100644
--- a/drivers/spi/cadence_qspi_apb.c
+++ b/drivers/spi/cadence_qspi_apb.c
@@ -40,6 +40,7 @@
 #include <malloc.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "cadence_qspi.h"
 
 #define CQSPI_REG_POLL_US			1 /* 1us */
diff --git a/drivers/spi/cf_spi.c b/drivers/spi/cf_spi.c
index 0a211b377070..d24348bce3cd 100644
--- a/drivers/spi/cf_spi.c
+++ b/drivers/spi/cf_spi.c
@@ -25,6 +25,7 @@
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 struct coldfire_spi_priv {
 	struct dspi *regs;
diff --git a/drivers/spi/davinci_spi.c b/drivers/spi/davinci_spi.c
index 4ea77a150513..f4fb5e98d5f8 100644
--- a/drivers/spi/davinci_spi.c
+++ b/drivers/spi/davinci_spi.c
@@ -22,6 +22,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 /* SPIGCR0 */
 #define SPIGCR0_SPIENA_MASK	0x1
diff --git a/drivers/spi/designware_spi.c b/drivers/spi/designware_spi.c
index a960c61f350e..86b7bd8403fe 100644
--- a/drivers/spi/designware_spi.c
+++ b/drivers/spi/designware_spi.c
@@ -10,7 +10,9 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm-generic/gpio.h>
 #include <clk.h>
@@ -27,6 +29,7 @@
 #include <linux/iopoll.h>
 #include <asm/io.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 /* Register offsets */
 #define DW_SPI_CTRL0			0x00
diff --git a/drivers/spi/exynos_spi.c b/drivers/spi/exynos_spi.c
index 400269fa39d5..1be1c1a38493 100644
--- a/drivers/spi/exynos_spi.c
+++ b/drivers/spi/exynos_spi.c
@@ -23,6 +23,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/spi/fsl_dspi.c b/drivers/spi/fsl_dspi.c
index b5f7d3e08a70..d3c59f5818ab 100644
--- a/drivers/spi/fsl_dspi.c
+++ b/drivers/spi/fsl_dspi.c
@@ -9,6 +9,7 @@
  * Haikun Wang (B53464 at freescale.com)
  */
 
+#include <compiler.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
@@ -29,6 +30,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 /* linux/include/time.h */
 #define NSEC_PER_SEC	1000000000L
diff --git a/drivers/spi/fsl_espi.c b/drivers/spi/fsl_espi.c
index 9eae577656ce..1c3bc17558fe 100644
--- a/drivers/spi/fsl_espi.c
+++ b/drivers/spi/fsl_espi.c
@@ -16,6 +16,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <malloc.h>
 #include <spi.h>
diff --git a/drivers/spi/fsl_qspi.c b/drivers/spi/fsl_qspi.c
index 314d3f894844..51ad688557cd 100644
--- a/drivers/spi/fsl_qspi.c
+++ b/drivers/spi/fsl_qspi.c
@@ -24,7 +24,9 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
@@ -41,6 +43,7 @@
 #include <spi.h>
 #include <spi-mem.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/spi/ich.c b/drivers/spi/ich.c
index bf6cd061b533..45e2869ba266 100644
--- a/drivers/spi/ich.c
+++ b/drivers/spi/ich.c
@@ -22,6 +22,7 @@
 #include <spi_flash.h>
 #include <spi-mem.h>
 #include <spl.h>
+#include <stdbool.h>
 #include <time.h>
 #include <asm/fast_spi.h>
 #include <asm/io.h>
@@ -33,6 +34,7 @@
 #include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "ich.h"
 
diff --git a/drivers/spi/ich.h b/drivers/spi/ich.h
index 23c7827740bb..90c26854119d 100644
--- a/drivers/spi/ich.h
+++ b/drivers/spi/ich.h
@@ -8,7 +8,9 @@
 #ifndef _ICH_H_
 #define _ICH_H_
 
+#include <compiler.h>
 #include <linux/bitops.h>
+#include <linux/types.h>
 struct ich7_spi_regs {
 	uint16_t spis;
 	uint16_t spic;
diff --git a/drivers/spi/kirkwood_spi.c b/drivers/spi/kirkwood_spi.c
index a127135323d4..67154db6a79b 100644
--- a/drivers/spi/kirkwood_spi.c
+++ b/drivers/spi/kirkwood_spi.c
@@ -20,6 +20,7 @@
 #include <asm/arch/mpp.h>
 #endif
 #include <asm/arch-mvebu/spi.h>
+#include <linux/types.h>
 
 struct mvebu_spi_dev {
 	bool			is_errata_50mhz_ac;
diff --git a/drivers/spi/meson_spifc.c b/drivers/spi/meson_spifc.c
index f61bcd5e2de9..e8573f9b6526 100644
--- a/drivers/spi/meson_spifc.c
+++ b/drivers/spi/meson_spifc.c
@@ -14,12 +14,14 @@
 #include <dm.h>
 #include <regmap.h>
 #include <errno.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <linux/bitfield.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /* register map */
 #define REG_CMD			0x00
diff --git a/drivers/spi/mpc8xx_spi.c b/drivers/spi/mpc8xx_spi.c
index d549c6e8a740..2cee65efcbf9 100644
--- a/drivers/spi/mpc8xx_spi.c
+++ b/drivers/spi/mpc8xx_spi.c
@@ -17,12 +17,14 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <mpc8xx.h>
 #include <spi.h>
 #include <stdio.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #include <asm/cpm_8xx.h>
 #include <asm/io.h>
diff --git a/drivers/spi/mpc8xxx_spi.c b/drivers/spi/mpc8xxx_spi.c
index f5ceeaac97d0..6ef0a6c0e416 100644
--- a/drivers/spi/mpc8xxx_spi.c
+++ b/drivers/spi/mpc8xxx_spi.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <spi.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <asm/mpc8xxx_spi.h>
@@ -20,6 +21,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 enum {
 	SPI_EV_NE = BIT(31 - 22),	/* Receiver Not Empty */
diff --git a/drivers/spi/mscc_bb_spi.c b/drivers/spi/mscc_bb_spi.c
index a3bbdf848cda..4ca4bcb421ab 100644
--- a/drivers/spi/mscc_bb_spi.c
+++ b/drivers/spi/mscc_bb_spi.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
@@ -14,6 +15,7 @@
 #include <stdbool.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 
diff --git a/drivers/spi/mt7621_spi.c b/drivers/spi/mt7621_spi.c
index f4b5ad892455..f8be2980cdbf 100644
--- a/drivers/spi/mt7621_spi.c
+++ b/drivers/spi/mt7621_spi.c
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
 #include <spi.h>
@@ -20,6 +21,7 @@
 #include <linux/io.h>
 #include <linux/kernel.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 #define MT7621_RX_FIFO_LEN	32
 #define MT7621_TX_FIFO_LEN	36
diff --git a/drivers/spi/mtk_snfi_spi.c b/drivers/spi/mtk_snfi_spi.c
index 07a178a87859..61b725658c1d 100644
--- a/drivers/spi/mtk_snfi_spi.c
+++ b/drivers/spi/mtk_snfi_spi.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <dm.h>
 #include <errno.h>
 #include <spi.h>
@@ -20,6 +21,7 @@
 #include <linux/io.h>
 #include <linux/iopoll.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define SNFI_MAC_CTL			0x500
 #define MAC_XIO_SEL			BIT(4)
diff --git a/drivers/spi/mvebu_a3700_spi.c b/drivers/spi/mvebu_a3700_spi.c
index f3e28d0ed694..7f4033295dc2 100644
--- a/drivers/spi/mvebu_a3700_spi.c
+++ b/drivers/spi/mvebu_a3700_spi.c
@@ -17,6 +17,7 @@
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/spi/mxc_spi.c b/drivers/spi/mxc_spi.c
index db1673fa57df..f5e772ba0ff1 100644
--- a/drivers/spi/mxc_spi.c
+++ b/drivers/spi/mxc_spi.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
 #include <malloc.h>
@@ -23,6 +24,7 @@
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/spi/mxs_spi.c b/drivers/spi/mxs_spi.c
index abc7f014d7d5..32325bec0943 100644
--- a/drivers/spi/mxs_spi.c
+++ b/drivers/spi/mxs_spi.c
@@ -32,6 +32,7 @@
 #include <asm/mach-imx/dma.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define	MXS_SPI_MAX_TIMEOUT	1000000
 #define	MXS_SPI_PORT_OFFSET	0x2000
diff --git a/drivers/spi/nxp_fspi.c b/drivers/spi/nxp_fspi.c
index fc75913022b3..874dac8aaeb4 100644
--- a/drivers/spi/nxp_fspi.c
+++ b/drivers/spi/nxp_fspi.c
@@ -14,6 +14,9 @@
  * data lines).
  *
  * FlexSPI controller is driven by the LUT(Look-up Table) registers
+#include <compiler.h>
+#include <stdbool.h>
+#include <linux/types.h>
  * LUT registers are a look-up-table for sequences of instructions.
  * A valid sequence consists of four LUT registers.
  * Maximum 32 LUT sequences can be programmed simultaneously.
diff --git a/drivers/spi/omap3_spi.c b/drivers/spi/omap3_spi.c
index 3cee5a7fccda..0385b79702e2 100644
--- a/drivers/spi/omap3_spi.c
+++ b/drivers/spi/omap3_spi.c
@@ -25,6 +25,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/spi/pic32_spi.c b/drivers/spi/pic32_spi.c
index e1fc52578399..faff7cf5b1b5 100644
--- a/drivers/spi/pic32_spi.c
+++ b/drivers/spi/pic32_spi.c
@@ -19,6 +19,7 @@
 #include <spi.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include <asm/types.h>
 #include <asm/io.h>
diff --git a/drivers/spi/pl022_spi.c b/drivers/spi/pl022_spi.c
index 5618ab21638e..3e50daecc4b6 100644
--- a/drivers/spi/pl022_spi.c
+++ b/drivers/spi/pl022_spi.c
@@ -12,6 +12,7 @@
 #include <clk.h>
 #include <common.h>
 #include <dm.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 #include <dm/platform_data/spi_pl022.h>
 #include <linux/errno.h>
@@ -19,6 +20,7 @@
 #include <spi.h>
 #include <linux/kernel.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 #define SSP_CR0		0x000
 #define SSP_CR1		0x004
diff --git a/drivers/spi/renesas_rpc_spi.c b/drivers/spi/renesas_rpc_spi.c
index 95fcb5723f2d..8566b70d82e6 100644
--- a/drivers/spi/renesas_rpc_spi.c
+++ b/drivers/spi/renesas_rpc_spi.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
@@ -21,6 +22,7 @@
 #include <wait_bit.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define RPC_CMNCR		0x0000	/* R/W */
 #define RPC_CMNCR_MD		BIT(31)
diff --git a/drivers/spi/rk_spi.c b/drivers/spi/rk_spi.c
index ec998eda0829..677c80253d67 100644
--- a/drivers/spi/rk_spi.c
+++ b/drivers/spi/rk_spi.c
@@ -17,6 +17,7 @@
 #include <errno.h>
 #include <log.h>
 #include <spi.h>
+#include <stdbool.h>
 #include <time.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
@@ -25,6 +26,7 @@
 #include <asm/arch-rockchip/periph.h>
 #include <dm/pinctrl.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include "rk_spi.h"
 
 /* Change to 1 to output registers at the start of each transaction */
diff --git a/drivers/spi/rk_spi.h b/drivers/spi/rk_spi.h
index 2e0d1eeb9fdb..6a46fbfac7b8 100644
--- a/drivers/spi/rk_spi.h
+++ b/drivers/spi/rk_spi.h
@@ -11,6 +11,7 @@
 #ifndef __RK_SPI_H
 #define __RK_SPI_H
 
+#include <asm/types.h>
 struct rockchip_spi {
 	u32 ctrlr0;
 	u32 ctrlr1;
diff --git a/drivers/spi/sandbox_spi.c b/drivers/spi/sandbox_spi.c
index 7e08bf9dc543..b97a9e27994b 100644
--- a/drivers/spi/sandbox_spi.c
+++ b/drivers/spi/sandbox_spi.c
@@ -11,6 +11,7 @@
 #define LOG_CATEGORY UCLASS_SPI
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
 #include <malloc.h>
@@ -19,6 +20,7 @@
 #include <os.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/types.h>
 
 #include <linux/errno.h>
 #include <asm/spi.h>
diff --git a/drivers/spi/sh_qspi.c b/drivers/spi/sh_qspi.c
index bf3a7bf919ce..f6574c235525 100644
--- a/drivers/spi/sh_qspi.c
+++ b/drivers/spi/sh_qspi.c
@@ -16,6 +16,7 @@
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 /* SH QSPI register bit masks <REG>_<BIT> */
 #define SPCR_MSTR	0x08
diff --git a/drivers/spi/soft_spi.c b/drivers/spi/soft_spi.c
index 9818ecb4c18a..e363b9887182 100644
--- a/drivers/spi/soft_spi.c
+++ b/drivers/spi/soft_spi.c
@@ -21,6 +21,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/spi/spi-mem-nodm.c b/drivers/spi/spi-mem-nodm.c
index 6cc908dcdf87..9c5de165d499 100644
--- a/drivers/spi/spi-mem-nodm.c
+++ b/drivers/spi/spi-mem-nodm.c
@@ -7,6 +7,7 @@
 #include <malloc.h>
 #include <spi.h>
 #include <spi-mem.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
diff --git a/drivers/spi/spi-mem.c b/drivers/spi/spi-mem.c
index da759b6907cf..61b31bf9b308 100644
--- a/drivers/spi/spi-mem.c
+++ b/drivers/spi/spi-mem.c
@@ -18,6 +18,8 @@
 #include <errno.h>
 #include <malloc.h>
 #include <spi.h>
+#include <stdbool.h>
+#include <asm/types.h>
 #include <spi.h>
 #include <spi-mem.h>
 #include <dm/device_compat.h>
diff --git a/drivers/spi/spi-sifive.c b/drivers/spi/spi-sifive.c
index 708bf8989a8a..36c7eb0af7c6 100644
--- a/drivers/spi/spi-sifive.c
+++ b/drivers/spi/spi-sifive.c
@@ -21,6 +21,7 @@
 #include <linux/log2.h>
 #include <clk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define SIFIVE_SPI_MAX_CS		32
 
diff --git a/drivers/spi/spi-sunxi.c b/drivers/spi/spi-sunxi.c
index 80c406d7b368..d5ab0703ae83 100644
--- a/drivers/spi/spi-sunxi.c
+++ b/drivers/spi/spi-sunxi.c
@@ -26,6 +26,7 @@
 #include <errno.h>
 #include <fdt_support.h>
 #include <reset.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <wait_bit.h>
 #include <asm/global_data.h>
@@ -33,6 +34,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include <asm/bitops.h>
 #include <asm/gpio.h>
diff --git a/drivers/spi/spi-uclass.c b/drivers/spi/spi-uclass.c
index 6d397f2ebd2d..6899b4d066ed 100644
--- a/drivers/spi/spi-uclass.c
+++ b/drivers/spi/spi-uclass.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <spi.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <dm/device-internal.h>
@@ -17,6 +18,7 @@
 #include <dm/util.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 7662932d40a9..bc2079a92662 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -8,6 +8,7 @@
 #include <malloc.h>
 #include <spi.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/string.h>
 
 int spi_set_wordlen(struct spi_slave *slave, unsigned int wordlen)
diff --git a/drivers/spi/stm32_qspi.c b/drivers/spi/stm32_qspi.c
index 882bc1bdfc54..9acd893a5dc4 100644
--- a/drivers/spi/stm32_qspi.c
+++ b/drivers/spi/stm32_qspi.c
@@ -10,10 +10,12 @@
 #include <common.h>
 #include <clk.h>
 #include <dm.h>
+#include <compiler.h>
 #include <log.h>
 #include <reset.h>
 #include <spi.h>
 #include <spi-mem.h>
+#include <stdbool.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
@@ -23,6 +25,7 @@
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/sizes.h>
+#include <linux/types.h>
 
 struct stm32_qspi_regs {
 	u32 cr;		/* 0x00 */
diff --git a/drivers/spi/stm32_spi.c b/drivers/spi/stm32_spi.c
index 635ead98dbda..5887aa8f61e6 100644
--- a/drivers/spi/stm32_spi.c
+++ b/drivers/spi/stm32_spi.c
@@ -6,18 +6,21 @@
  */
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
 #include <malloc.h>
 #include <reset.h>
 #include <spi.h>
+#include <stdbool.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 #include <asm/io.h>
 #include <asm/gpio.h>
diff --git a/drivers/spi/tegra114_spi.c b/drivers/spi/tegra114_spi.c
index 1b7246af2584..a40a468002da 100644
--- a/drivers/spi/tegra114_spi.c
+++ b/drivers/spi/tegra114_spi.c
@@ -16,6 +16,7 @@
 #include <spi.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 #include "tegra_spi.h"
 
 /* COMMAND1 */
diff --git a/drivers/spi/tegra20_sflash.c b/drivers/spi/tegra20_sflash.c
index 7be4efd35c60..34663ced7648 100644
--- a/drivers/spi/tegra20_sflash.c
+++ b/drivers/spi/tegra20_sflash.c
@@ -22,6 +22,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include "tegra_spi.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/spi/tegra20_slink.c b/drivers/spi/tegra20_slink.c
index 64485de5d327..2d3616b2ce78 100644
--- a/drivers/spi/tegra20_slink.c
+++ b/drivers/spi/tegra20_slink.c
@@ -18,6 +18,7 @@
 #include <fdtdec.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 #include "tegra_spi.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/spi/tegra210_qspi.c b/drivers/spi/tegra210_qspi.c
index 19e50919f6db..08d87adb1b6e 100644
--- a/drivers/spi/tegra210_qspi.c
+++ b/drivers/spi/tegra210_qspi.c
@@ -20,6 +20,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "tegra_spi.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/spi/tegra_spi.h b/drivers/spi/tegra_spi.h
index e997d668cdef..93195abb1ea4 100644
--- a/drivers/spi/tegra_spi.h
+++ b/drivers/spi/tegra_spi.h
@@ -3,6 +3,7 @@
  * (C) Copyright 2014 Google, Inc
  */
 
+#include <linux/types.h>
 struct tegra_spi_platdata {
 	enum periph_id periph_id;
 	int frequency;		/* Default clock frequency, -1 for none */
diff --git a/drivers/spi/ti_qspi.c b/drivers/spi/ti_qspi.c
index 9fecdb20f73f..cbbe93f9d501 100644
--- a/drivers/spi/ti_qspi.c
+++ b/drivers/spi/ti_qspi.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
@@ -27,6 +28,7 @@
 #include <linux/kernel.h>
 #include <regmap.h>
 #include <syscon.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/spi/uniphier_spi.c b/drivers/spi/uniphier_spi.c
index 22cf974a905d..cc4e20ce1eb8 100644
--- a/drivers/spi/uniphier_spi.c
+++ b/drivers/spi/uniphier_spi.c
@@ -6,6 +6,7 @@
 
 #include <clk.h>
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
 #include <time.h>
@@ -20,6 +21,7 @@
 #include <wait_bit.h>
 #include <linux/kernel.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/spi/xilinx_spi.c b/drivers/spi/xilinx_spi.c
index 6b1cea4519e2..3ccefd87a11e 100644
--- a/drivers/spi/xilinx_spi.c
+++ b/drivers/spi/xilinx_spi.c
@@ -23,6 +23,7 @@
 #include <asm/io.h>
 #include <wait_bit.h>
 #include <linux/bitops.h>
+#include <linux/types.h>
 
 /*
  * [0]: http://www.xilinx.com/support/documentation
diff --git a/drivers/spi/zynq_qspi.c b/drivers/spi/zynq_qspi.c
index a95558139d83..4ae439a12385 100644
--- a/drivers/spi/zynq_qspi.c
+++ b/drivers/spi/zynq_qspi.c
@@ -18,6 +18,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/spi/zynq_spi.c b/drivers/spi/zynq_spi.c
index bbac203e0dd0..bc12da9bccfa 100644
--- a/drivers/spi/zynq_spi.c
+++ b/drivers/spi/zynq_spi.c
@@ -17,6 +17,7 @@
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/spi/zynqmp_gqspi.c b/drivers/spi/zynqmp_gqspi.c
index de988f4e9754..aa69cb17bf96 100644
--- a/drivers/spi/zynqmp_gqspi.c
+++ b/drivers/spi/zynqmp_gqspi.c
@@ -26,6 +26,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define GQSPI_GFIFO_STRT_MODE_MASK	BIT(29)
 #define GQSPI_CONFIG_MODE_EN_MASK	(3 << 30)
diff --git a/drivers/spmi/spmi-msm.c b/drivers/spmi/spmi-msm.c
index 9212449a7ee8..8f73fd7e4493 100644
--- a/drivers/spmi/spmi-msm.c
+++ b/drivers/spmi/spmi-msm.c
@@ -17,6 +17,7 @@
 #include <asm/io.h>
 #include <dm/device_compat.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <spmi/spmi.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/spmi/spmi-sandbox.c b/drivers/spmi/spmi-sandbox.c
index e2f6fc17e717..d58c5684b680 100644
--- a/drivers/spmi/spmi-sandbox.c
+++ b/drivers/spmi/spmi-sandbox.c
@@ -12,6 +12,7 @@
 #include <errno.h>
 #include <stdbool.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <spmi/spmi.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
diff --git a/drivers/spmi/spmi-uclass.c b/drivers/spmi/spmi-uclass.c
index fc8252fbc91b..0126f9dd75fa 100644
--- a/drivers/spmi/spmi-uclass.c
+++ b/drivers/spmi/spmi-uclass.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <spmi/spmi.h>
 #include <linux/ctype.h>
 
diff --git a/drivers/sysreset/sysreset-uclass.c b/drivers/sysreset/sysreset-uclass.c
index 46092d939cf3..d1ccd8bdf796 100644
--- a/drivers/sysreset/sysreset-uclass.c
+++ b/drivers/sysreset/sysreset-uclass.c
@@ -23,6 +23,7 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 int sysreset_request(struct udevice *dev, enum sysreset_t type)
 {
diff --git a/drivers/sysreset/sysreset_ast.c b/drivers/sysreset/sysreset_ast.c
index f93eea629dfd..46e6565191b2 100644
--- a/drivers/sysreset/sysreset_ast.c
+++ b/drivers/sysreset/sysreset_ast.c
@@ -11,6 +11,7 @@
 #include <wdt.h>
 #include <asm/io.h>
 #include <asm/arch/wdt.h>
+#include <asm/types.h>
 #include <linux/err.h>
 #include <linux/errno.h>
 
diff --git a/drivers/sysreset/sysreset_mpc83xx.c b/drivers/sysreset/sysreset_mpc83xx.c
index c358a3b490c5..ce84619d17b7 100644
--- a/drivers/sysreset/sysreset_mpc83xx.c
+++ b/drivers/sysreset/sysreset_mpc83xx.c
@@ -8,6 +8,7 @@
 #include <command.h>
 #include <dm.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <sysreset.h>
 #include <vsprintf.h>
@@ -17,6 +18,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include "sysreset_mpc83xx.h"
 
diff --git a/drivers/sysreset/sysreset_octeon.c b/drivers/sysreset/sysreset_octeon.c
index 963ec20dc0bb..1005227c6bf3 100644
--- a/drivers/sysreset/sysreset_octeon.c
+++ b/drivers/sysreset/sysreset_octeon.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <errno.h>
 #include <sysreset.h>
diff --git a/drivers/sysreset/sysreset_socfpga.c b/drivers/sysreset/sysreset_socfpga.c
index c348649cedf5..8f8f6411a8af 100644
--- a/drivers/sysreset/sysreset_socfpga.c
+++ b/drivers/sysreset/sysreset_socfpga.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <errno.h>
 #include <sysreset.h>
diff --git a/drivers/sysreset/sysreset_sti.c b/drivers/sysreset/sysreset_sti.c
index 26431ee129b8..b4e5c58b45ac 100644
--- a/drivers/sysreset/sysreset_sti.c
+++ b/drivers/sysreset/sysreset_sti.c
@@ -5,12 +5,14 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <regmap.h>
 #include <syscon.h>
 #include <sysreset.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
diff --git a/drivers/sysreset/sysreset_syscon.c b/drivers/sysreset/sysreset_syscon.c
index e6e98b383ee5..492f2c50c051 100644
--- a/drivers/sysreset/sysreset_syscon.c
+++ b/drivers/sysreset/sysreset_syscon.c
@@ -16,6 +16,7 @@
 #include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 struct syscon_reboot_priv {
 	struct regmap *regmap;
diff --git a/drivers/sysreset/sysreset_x86.c b/drivers/sysreset/sysreset_x86.c
index 0ab2b543abdf..5285696780ae 100644
--- a/drivers/sysreset/sysreset_x86.c
+++ b/drivers/sysreset/sysreset_x86.c
@@ -13,6 +13,7 @@
 #include <acpi/acpi_s3.h>
 #include <asm/io.h>
 #include <asm/processor.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 
 struct x86_sysreset_platdata {
diff --git a/drivers/tee/broadcom/chimp_optee.c b/drivers/tee/broadcom/chimp_optee.c
index 545bb3fe2227..82c77871a0b1 100644
--- a/drivers/tee/broadcom/chimp_optee.c
+++ b/drivers/tee/broadcom/chimp_optee.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <string.h>
 #include <tee.h>
+#include <asm/types.h>
 #include <broadcom/chimp.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
diff --git a/drivers/tee/optee/core.c b/drivers/tee/optee/core.c
index fb656bed92f3..dd9649bd93d4 100644
--- a/drivers/tee/optee/core.c
+++ b/drivers/tee/optee/core.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <tee.h>
 #include <linux/arm-smccc.h>
 #include <linux/err.h>
@@ -14,6 +15,7 @@
 #include <linux/io.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "optee_smc.h"
 #include "optee_msg.h"
diff --git a/drivers/tee/optee/optee_private.h b/drivers/tee/optee/optee_private.h
index 9442d1c176bc..eca0f7821fc7 100644
--- a/drivers/tee/optee/optee_private.h
+++ b/drivers/tee/optee/optee_private.h
@@ -8,6 +8,7 @@
 
 #include <tee.h>
 #include <log.h>
+#include <linux/types.h>
 
 /**
  * struct optee_private - OP-TEE driver private data
diff --git a/drivers/tee/optee/optee_smc.h b/drivers/tee/optee/optee_smc.h
index ba8a43d5c091..4fc9c0ec8625 100644
--- a/drivers/tee/optee/optee_smc.h
+++ b/drivers/tee/optee/optee_smc.h
@@ -7,6 +7,7 @@
 #define OPTEE_SMC_H
 
 #include <stdbool.h>
+#include <asm/types.h>
 #include <linux/arm-smccc.h>
 #include <linux/bitops.h>
 
diff --git a/drivers/tee/optee/rpmb.c b/drivers/tee/optee/rpmb.c
index a9ea53854fca..bb8f96d1ad5a 100644
--- a/drivers/tee/optee/rpmb.c
+++ b/drivers/tee/optee/rpmb.c
@@ -10,6 +10,7 @@
 #include <mmc.h>
 #include <dm/device_compat.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include "optee_msg.h"
 #include "optee_private.h"
diff --git a/drivers/tee/sandbox.c b/drivers/tee/sandbox.c
index 3a5d106f9567..3b714e91c008 100644
--- a/drivers/tee/sandbox.c
+++ b/drivers/tee/sandbox.c
@@ -10,6 +10,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <tee/optee_ta_avb.h>
 
 /*
diff --git a/drivers/tee/tee-uclass.c b/drivers/tee/tee-uclass.c
index 1dc806db89be..f08b9a70f327 100644
--- a/drivers/tee/tee-uclass.c
+++ b/drivers/tee/tee-uclass.c
@@ -13,6 +13,7 @@
 #include <dm/uclass-internal.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /**
  * struct tee_uclass_priv - information of a TEE, stored by the uclass
diff --git a/drivers/thermal/imx_scu_thermal.c b/drivers/thermal/imx_scu_thermal.c
index 6b822f18854c..81c0abdbcde9 100644
--- a/drivers/thermal/imx_scu_thermal.c
+++ b/drivers/thermal/imx_scu_thermal.c
@@ -19,6 +19,7 @@
 #include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/thermal/imx_thermal.c b/drivers/thermal/imx_thermal.c
index 812c2ec07c36..e0ec5f606200 100644
--- a/drivers/thermal/imx_thermal.c
+++ b/drivers/thermal/imx_thermal.c
@@ -17,6 +17,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <malloc.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/math64.h>
diff --git a/drivers/thermal/imx_tmu.c b/drivers/thermal/imx_tmu.c
index 8a67d9aa58cc..f0094d4521a2 100644
--- a/drivers/thermal/imx_tmu.c
+++ b/drivers/thermal/imx_tmu.c
@@ -4,6 +4,7 @@
  *
  */
 
+#include <compiler.h>
 #include <config.h>
 #include <common.h>
 #include <stdbool.h>
@@ -21,6 +22,7 @@
 #include <thermal.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/thermal/ti-bandgap.c b/drivers/thermal/ti-bandgap.c
index 8b332f116c3e..160557321bea 100644
--- a/drivers/thermal/ti-bandgap.c
+++ b/drivers/thermal/ti-bandgap.c
@@ -20,6 +20,7 @@
 #include <asm/io.h>
 #include <dm.h>
 #include <thermal.h>
+#include <linux/types.h>
 
 #define CTRL_CORE_TEMP_SENSOR_MPU	0
 #define DRA752_ADC_START_VALUE		540
diff --git a/drivers/timer/ag101p_timer.c b/drivers/timer/ag101p_timer.c
index c011906b938d..7d0eae96b753 100644
--- a/drivers/timer/ag101p_timer.c
+++ b/drivers/timer/ag101p_timer.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <timer.h>
+#include <asm/types.h>
 #include <linux/io.h>
 
 /*
diff --git a/drivers/timer/altera_timer.c b/drivers/timer/altera_timer.c
index 6cb2923e0b65..08407a48ef67 100644
--- a/drivers/timer/altera_timer.c
+++ b/drivers/timer/altera_timer.c
@@ -12,6 +12,7 @@
 #include <errno.h>
 #include <timer.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 
 /* control register */
diff --git a/drivers/timer/arc_timer.c b/drivers/timer/arc_timer.c
index 592b196cbbc2..d5ce91b6df73 100644
--- a/drivers/timer/arc_timer.c
+++ b/drivers/timer/arc_timer.c
@@ -11,6 +11,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/timer/atcpit100_timer.c b/drivers/timer/atcpit100_timer.c
index 5d4ae6850927..ad57a513f798 100644
--- a/drivers/timer/atcpit100_timer.c
+++ b/drivers/timer/atcpit100_timer.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <timer.h>
+#include <asm/types.h>
 #include <linux/io.h>
 
 #define REG32_TMR(x)	(*(u32 *)	((plat->regs) + (x>>2)))
diff --git a/drivers/timer/atmel_pit_timer.c b/drivers/timer/atmel_pit_timer.c
index 07459d9c26b4..4f5d895a38a9 100644
--- a/drivers/timer/atmel_pit_timer.c
+++ b/drivers/timer/atmel_pit_timer.c
@@ -11,6 +11,7 @@
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #define AT91_PIT_VALUE		0xfffff
 #define AT91_PIT_PITEN		BIT(24)		/* Timer Enabled */
diff --git a/drivers/timer/cadence-ttc.c b/drivers/timer/cadence-ttc.c
index 1ad3b5db8fe4..6be6b20f173e 100644
--- a/drivers/timer/cadence-ttc.c
+++ b/drivers/timer/cadence-ttc.c
@@ -13,6 +13,7 @@
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/err.h>
+#include <linux/types.h>
 
 #define CNT_CNTRL_RESET		BIT(4)
 
diff --git a/drivers/timer/mpc83xx_timer.c b/drivers/timer/mpc83xx_timer.c
index aef8666dea05..9a7ca1dc1c2c 100644
--- a/drivers/timer/mpc83xx_timer.c
+++ b/drivers/timer/mpc83xx_timer.c
@@ -19,6 +19,7 @@
 #include <asm/ppc.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/timer/mtk_timer.c b/drivers/timer/mtk_timer.c
index 7aec7a7d59ea..9d41739dac2f 100644
--- a/drivers/timer/mtk_timer.c
+++ b/drivers/timer/mtk_timer.c
@@ -8,9 +8,11 @@
 
 #include <clk.h>
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <timer.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 
diff --git a/drivers/timer/nomadik-mtu-timer.c b/drivers/timer/nomadik-mtu-timer.c
index 5d5eadc47d79..c50db9b273b4 100644
--- a/drivers/timer/nomadik-mtu-timer.c
+++ b/drivers/timer/nomadik-mtu-timer.c
@@ -16,6 +16,7 @@
 #include <dm.h>
 #include <timer.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 
diff --git a/drivers/timer/rockchip_timer.c b/drivers/timer/rockchip_timer.c
index 20dddd53e4fb..b49ac1b419b8 100644
--- a/drivers/timer/rockchip_timer.c
+++ b/drivers/timer/rockchip_timer.c
@@ -16,6 +16,7 @@
 #include <timer.h>
 #include <asm/io.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/timer/sti-timer.c b/drivers/timer/sti-timer.c
index 2278b049354b..8e43f47a3072 100644
--- a/drivers/timer/sti-timer.c
+++ b/drivers/timer/sti-timer.c
@@ -10,6 +10,7 @@
 #include <timer.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #include <asm/io.h>
 #include <asm/arch-armv7/globaltimer.h>
diff --git a/drivers/timer/stm32_timer.c b/drivers/timer/stm32_timer.c
index 96749c8a64f5..08d8470c2784 100644
--- a/drivers/timer/stm32_timer.c
+++ b/drivers/timer/stm32_timer.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <fdtdec.h>
 #include <timer.h>
+#include <asm/types.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
diff --git a/drivers/timer/timer-uclass.c b/drivers/timer/timer-uclass.c
index 7dea5b326371..4f2d84c64204 100644
--- a/drivers/timer/timer-uclass.c
+++ b/drivers/timer/timer-uclass.c
@@ -16,6 +16,7 @@
 #include <timer.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/timer/tsc_timer.c b/drivers/timer/tsc_timer.c
index 2ebd6032b91a..906bcf577e6c 100644
--- a/drivers/timer/tsc_timer.c
+++ b/drivers/timer/tsc_timer.c
@@ -12,6 +12,7 @@
 #include <dm.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <time.h>
 #include <timer.h>
 #include <vsprintf.h>
@@ -24,6 +25,7 @@
 #include <asm/u-boot-x86.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #define MAX_NUM_FREQS	9
 
diff --git a/drivers/tpm/cr50_i2c.c b/drivers/tpm/cr50_i2c.c
index 6fbde9f2553e..ddb5a21e7725 100644
--- a/drivers/tpm/cr50_i2c.c
+++ b/drivers/tpm/cr50_i2c.c
@@ -13,6 +13,7 @@
 #include <irq.h>
 #include <log.h>
 #include <spl.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <tpm-v2.h>
@@ -25,6 +26,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 enum {
 	TIMEOUT_INIT_MS		= 30000, /* Very long timeout for TPM init */
diff --git a/drivers/tpm/tpm-uclass.c b/drivers/tpm/tpm-uclass.c
index 23400235a4cf..b52aa66d5ad3 100644
--- a/drivers/tpm/tpm-uclass.c
+++ b/drivers/tpm/tpm-uclass.c
@@ -11,6 +11,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <linux/unaligned/be_byteshift.h>
 #include <tpm-v1.h>
 #include <tpm-v2.h>
diff --git a/drivers/tpm/tpm2_ftpm_tee.c b/drivers/tpm/tpm2_ftpm_tee.c
index 249cf11beff7..58036c9f59bd 100644
--- a/drivers/tpm/tpm2_ftpm_tee.c
+++ b/drivers/tpm/tpm2_ftpm_tee.c
@@ -21,6 +21,7 @@
 #include <vsprintf.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "tpm_tis.h"
 #include "tpm2_ftpm_tee.h"
diff --git a/drivers/tpm/tpm2_ftpm_tee.h b/drivers/tpm/tpm2_ftpm_tee.h
index 44f9598c28ac..3c3b2844343f 100644
--- a/drivers/tpm/tpm2_ftpm_tee.h
+++ b/drivers/tpm/tpm2_ftpm_tee.h
@@ -7,6 +7,7 @@
 #define __TPM2_FTPM_TEE_H__
 
 /* This UUID is generated with uuidgen */
+#include <asm/types.h>
 #define TA_FTPM_UUID { 0xBC50D971, 0xD4C9, 0x42C4, \
 	{0x82, 0xCB, 0x34, 0x3F, 0xB7, 0xF3, 0x78, 0x96} }
 
diff --git a/drivers/tpm/tpm2_tis_sandbox.c b/drivers/tpm/tpm2_tis_sandbox.c
index f9d1205d3216..4b3853f45ceb 100644
--- a/drivers/tpm/tpm2_tis_sandbox.c
+++ b/drivers/tpm/tpm2_tis_sandbox.c
@@ -15,6 +15,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <u-boot/crc.h>
 
 /* Hierarchies */
diff --git a/drivers/tpm/tpm2_tis_spi.c b/drivers/tpm/tpm2_tis_spi.c
index 48b59f8c36f9..47668152401b 100644
--- a/drivers/tpm/tpm2_tis_spi.c
+++ b/drivers/tpm/tpm2_tis_spi.c
@@ -18,6 +18,7 @@
 #include <fdtdec.h>
 #include <log.h>
 #include <spi.h>
+#include <stdbool.h>
 #include <time.h>
 #include <tpm-v2.h>
 #include <vsprintf.h>
diff --git a/drivers/tpm/tpm_atmel_twi.c b/drivers/tpm/tpm_atmel_twi.c
index c8b597d43cc5..7cf1d494f165 100644
--- a/drivers/tpm/tpm_atmel_twi.c
+++ b/drivers/tpm/tpm_atmel_twi.c
@@ -15,6 +15,7 @@
 #include <asm/unaligned.h>
 #include <linux/delay.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "tpm_internal.h"
 
diff --git a/drivers/tpm/tpm_internal.h b/drivers/tpm/tpm_internal.h
index 787cc6bf2810..b3275d0ca177 100644
--- a/drivers/tpm/tpm_internal.h
+++ b/drivers/tpm/tpm_internal.h
@@ -6,6 +6,7 @@
 #ifndef __tpm_internal_h
 #define __tpm_internal_h
 
+#include <asm/types.h>
 enum {
 	TPM_MAX_ORDINAL			= 243,
 	TPM_MAX_PROTECTED_ORDINAL	= 12,
diff --git a/drivers/tpm/tpm_tis.h b/drivers/tpm/tpm_tis.h
index 2a160fe05c9a..c38fa2e544d4 100644
--- a/drivers/tpm/tpm_tis.h
+++ b/drivers/tpm/tpm_tis.h
@@ -18,6 +18,7 @@
 #ifndef _TPM_TIS_I2C_H
 #define _TPM_TIS_I2C_H
 
+#include <compiler.h>
 #include <linux/compiler.h>
 #include <linux/types.h>
 
diff --git a/drivers/tpm/tpm_tis_lpc.c b/drivers/tpm/tpm_tis_lpc.c
index 9b81ec98aa8a..9bc57c56ea40 100644
--- a/drivers/tpm/tpm_tis_lpc.c
+++ b/drivers/tpm/tpm_tis_lpc.c
@@ -24,6 +24,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define PREFIX "lpc_tpm: "
 
diff --git a/drivers/tpm/tpm_tis_sandbox.c b/drivers/tpm/tpm_tis_sandbox.c
index 433b21d49e7a..ffdd86fbd8d4 100644
--- a/drivers/tpm/tpm_tis_sandbox.c
+++ b/drivers/tpm/tpm_tis_sandbox.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <display_options.h>
 #include <dm.h>
 #include <stdbool.h>
@@ -14,6 +15,7 @@
 #include <asm/unaligned.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <u-boot/crc.h>
 
 /* TPM NVRAM location indices. */
diff --git a/drivers/ufs/cdns-platform.c b/drivers/ufs/cdns-platform.c
index bad1bf7de5f0..c098946d0795 100644
--- a/drivers/ufs/cdns-platform.c
+++ b/drivers/ufs/cdns-platform.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <ufs.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/err.h>
diff --git a/drivers/ufs/ti-j721e-ufs.c b/drivers/ufs/ti-j721e-ufs.c
index d875269760c1..ca9d7dbdec72 100644
--- a/drivers/ufs/ti-j721e-ufs.c
+++ b/drivers/ufs/ti-j721e-ufs.c
@@ -3,10 +3,12 @@
  * Copyright (C) 2019 Texas Instruments Incorporated - http://www.ti.com/
  */
 
+#include <compiler.h>
 #include <asm/io.h>
 #include <clk.h>
 #include <common.h>
 #include <dm.h>
+#include <asm/types.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/err.h>
diff --git a/drivers/ufs/ufs.c b/drivers/ufs/ufs.c
index 419c8a16b36a..5c19cdc085a3 100644
--- a/drivers/ufs/ufs.c
+++ b/drivers/ufs/ufs.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <dm/device_compat.h>
@@ -28,6 +29,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <linux/dma-mapping.h>
 
diff --git a/drivers/ufs/ufs.h b/drivers/ufs/ufs.h
index 0328db88caed..6b06e15421b3 100644
--- a/drivers/ufs/ufs.h
+++ b/drivers/ufs/ufs.h
@@ -2,7 +2,10 @@
 #ifndef __UFS_H
 #define __UFS_H
 
+#include <compiler.h>
 #include <stdbool.h>
+#include <linux/types.h>
+
 #include "unipro.h"
 
 struct udevice;
diff --git a/drivers/usb/cdns3/cdns3-ti.c b/drivers/usb/cdns3/cdns3-ti.c
index 370856c9bfef..023131b12abc 100644
--- a/drivers/usb/cdns3/cdns3-ti.c
+++ b/drivers/usb/cdns3/cdns3-ti.c
@@ -6,9 +6,11 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <asm-generic/io.h>
 #include <clk.h>
 #include <dm.h>
+#include <asm/types.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
diff --git a/drivers/usb/cdns3/core.h b/drivers/usb/cdns3/core.h
index 70cc38666434..002da7aa24e5 100644
--- a/drivers/usb/cdns3/core.h
+++ b/drivers/usb/cdns3/core.h
@@ -8,6 +8,7 @@
  * Authors: Peter Chen <peter.chen@nxp.com>
  *          Pawel Laszczak <pawell@cadence.com>
  */
+#include <compiler.h>
 #include <stdbool.h>
 #include <linux/compiler.h>
 #include <linux/types.h>
diff --git a/drivers/usb/cdns3/drd.c b/drivers/usb/cdns3/drd.c
index e84fb57b2e02..09dd5f58d545 100644
--- a/drivers/usb/cdns3/drd.c
+++ b/drivers/usb/cdns3/drd.c
@@ -10,7 +10,9 @@
  *
  *
  */
+#include <compiler.h>
 #include <dm.h>
+#include <asm/types.h>
 #include <dm/device_compat.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/usb/cdns3/ep0.c b/drivers/usb/cdns3/ep0.c
index f41d4a162cc7..7499a51f4a68 100644
--- a/drivers/usb/cdns3/ep0.c
+++ b/drivers/usb/cdns3/ep0.c
@@ -10,7 +10,9 @@
  *          Peter Chen <peter.chen@nxp.com>
  */
 
+#include <compiler.h>
 #include <cpu_func.h>
+#include <stdbool.h>
 #include <vsprintf.h>
 #include <asm/cache.h>
 #include <dm/device_compat.h>
@@ -18,6 +20,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include <linux/usb/composite.h>
 #include <linux/iopoll.h>
 
diff --git a/drivers/usb/cdns3/gadget.c b/drivers/usb/cdns3/gadget.c
index a04e5fd61016..f04ec8776aec 100644
--- a/drivers/usb/cdns3/gadget.c
+++ b/drivers/usb/cdns3/gadget.c
@@ -56,7 +56,9 @@
  *
  */
 
+#include <compiler.h>
 #include <dm.h>
+#include <stdbool.h>
 #include <vsprintf.h>
 #include <dm/device_compat.h>
 #include <dm/devres.h>
@@ -67,6 +69,7 @@
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <linux/usb/gadget.h>
 #include <linux/compat.h>
 #include <linux/iopoll.h>
diff --git a/drivers/usb/cdns3/gadget.h b/drivers/usb/cdns3/gadget.h
index 42216fdc259c..d9cbc0603c07 100644
--- a/drivers/usb/cdns3/gadget.h
+++ b/drivers/usb/cdns3/gadget.h
@@ -11,8 +11,10 @@
  */
 #ifndef __LINUX_CDNS3_GADGET
 #define __LINUX_CDNS3_GADGET
+#include <compiler.h>
 #include <linux/bitops.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include <linux/usb/gadget.h>
 
 /*
diff --git a/drivers/usb/common/fsl-dt-fixup.c b/drivers/usb/common/fsl-dt-fixup.c
index 0299e5adb0c0..99944526bcfc 100644
--- a/drivers/usb/common/fsl-dt-fixup.c
+++ b/drivers/usb/common/fsl-dt-fixup.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <usb.h>
 #include <vsprintf.h>
diff --git a/drivers/usb/common/fsl-errata.c b/drivers/usb/common/fsl-errata.c
index e7552f1b9dfb..a957a9f1e9d7 100644
--- a/drivers/usb/common/fsl-errata.c
+++ b/drivers/usb/common/fsl-errata.c
@@ -9,6 +9,7 @@
 #include <hwconfig.h>
 #include <fsl_errata.h>
 #include <stdbool.h>
+#include <asm/types.h>
 #include<fsl_usb.h>
 #if defined(CONFIG_FSL_LSCH2) || defined(CONFIG_FSL_LSCH3) || \
 	defined(CONFIG_ARM)
diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
index 9889a6c9e81d..93556515a0bd 100644
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -28,6 +28,7 @@
 #include <dm.h>
 #include <generic-phy.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
 
diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h
index 44533fd7fed4..7eb393453b72 100644
--- a/drivers/usb/dwc3/core.h
+++ b/drivers/usb/dwc3/core.h
@@ -17,8 +17,10 @@
 #ifndef __DRIVERS_USB_DWC3_CORE_H
 #define __DRIVERS_USB_DWC3_CORE_H
 
+#include <compiler.h>
 #include <linux/bitops.h>
 #include <linux/ioport.h>
+#include <linux/types.h>
 
 #include <linux/usb/ch9.h>
 #include <linux/usb/otg.h>
diff --git a/drivers/usb/dwc3/dwc3-generic.c b/drivers/usb/dwc3/dwc3-generic.c
index 54a9ffb9d681..90dafb0963fd 100644
--- a/drivers/usb/dwc3/dwc3-generic.c
+++ b/drivers/usb/dwc3/dwc3-generic.c
@@ -19,6 +19,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
 #include <malloc.h>
diff --git a/drivers/usb/dwc3/dwc3-omap.c b/drivers/usb/dwc3/dwc3-omap.c
index 2d722376efb4..b62fc8afdb5b 100644
--- a/drivers/usb/dwc3/dwc3-omap.c
+++ b/drivers/usb/dwc3/dwc3-omap.c
@@ -14,10 +14,12 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <malloc.h>
 #include <asm/io.h>
 #include <dm.h>
 #include <dwc3-omap-uboot.h>
+#include <asm/types.h>
 #include <dm/device_compat.h>
 #include <dm/devres.h>
 #include <linux/errno.h>
diff --git a/drivers/usb/dwc3/dwc3-uniphier.c b/drivers/usb/dwc3/dwc3-uniphier.c
index 54b52dcd66a9..4f5d4c15939a 100644
--- a/drivers/usb/dwc3/dwc3-uniphier.c
+++ b/drivers/usb/dwc3/dwc3-uniphier.c
@@ -6,12 +6,14 @@
  *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  */
 
+#include <compiler.h>
 #include <dm.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/sizes.h>
+#include <linux/types.h>
 
 #define UNIPHIER_PRO4_DWC3_RESET	0x40
 #define   UNIPHIER_PRO4_DWC3_RESET_XIOMMU	BIT(5)
diff --git a/drivers/usb/dwc3/ep0.c b/drivers/usb/dwc3/ep0.c
index 80de10ec1258..1d4d0d612a17 100644
--- a/drivers/usb/dwc3/ep0.c
+++ b/drivers/usb/dwc3/ep0.c
@@ -13,6 +13,7 @@
  * commit c00552ebaf : Merge 3.18-rc7 into usb-next
  */
 #include <common.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <dm/device_compat.h>
 #include <linux/bug.h>
@@ -20,6 +21,7 @@
 #include <linux/kernel.h>
 #include <linux/list.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
index e4c6042bee8d..0024991c8f53 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 <stdbool.h>
 #include <vsprintf.h>
 #include <dm/device_compat.h>
 #include <dm/devres.h>
@@ -28,6 +29,7 @@
 #include <linux/list.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
diff --git a/drivers/usb/dwc3/gadget.h b/drivers/usb/dwc3/gadget.h
index 2f2eb18b99fc..85a144444a7d 100644
--- a/drivers/usb/dwc3/gadget.h
+++ b/drivers/usb/dwc3/gadget.h
@@ -20,6 +20,7 @@
 
 #include <linux/kernel.h>
 #include <linux/list.h>
+#include <linux/types.h>
 #include <linux/usb/gadget.h>
 #include "io.h"
 
diff --git a/drivers/usb/dwc3/io.h b/drivers/usb/dwc3/io.h
index f5268d752c32..a60807d6c01b 100644
--- a/drivers/usb/dwc3/io.h
+++ b/drivers/usb/dwc3/io.h
@@ -17,9 +17,11 @@
 #ifndef __DRIVERS_USB_DWC3_IO_H
 #define __DRIVERS_USB_DWC3_IO_H
 
+#include <compiler.h>
 #include <cpu_func.h>
 #include <asm/io.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #define	CACHELINE_SIZE		CONFIG_SYS_CACHELINE_SIZE
 static inline u32 dwc3_readl(void __iomem *base, u32 offset)
diff --git a/drivers/usb/dwc3/linux-compat.h b/drivers/usb/dwc3/linux-compat.h
index 92a3dc2850b0..49848397f6bd 100644
--- a/drivers/usb/dwc3/linux-compat.h
+++ b/drivers/usb/dwc3/linux-compat.h
@@ -12,6 +12,7 @@
 #define __DWC3_LINUX_COMPAT__
 
 #include <linux/string.h>
+#include <linux/types.h>
 #define dev_WARN(dev, format, arg...)	debug(format, ##arg)
 
 static inline size_t strlcat(char *dest, const char *src, size_t n)
diff --git a/drivers/usb/dwc3/samsung_usb_phy.c b/drivers/usb/dwc3/samsung_usb_phy.c
index abbd41368901..789968951ba1 100644
--- a/drivers/usb/dwc3/samsung_usb_phy.c
+++ b/drivers/usb/dwc3/samsung_usb_phy.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <asm/arch/power.h>
 #include <asm/arch/xhci-exynos.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 void exynos5_usb3_phy_init(struct exynos_usb3_phy *phy)
diff --git a/drivers/usb/dwc3/ti_usb_phy.c b/drivers/usb/dwc3/ti_usb_phy.c
index ea512ea8ffb7..1ecfda8275ee 100644
--- a/drivers/usb/dwc3/ti_usb_phy.c
+++ b/drivers/usb/dwc3/ti_usb_phy.c
@@ -17,8 +17,10 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <malloc.h>
 #include <ti-usb-phy-uboot.h>
+#include <asm/types.h>
 #include <dm/device_compat.h>
 #include <dm/devres.h>
 #include <linux/bitops.h>
diff --git a/drivers/usb/emul/sandbox_flash.c b/drivers/usb/emul/sandbox_flash.c
index f7090195c146..210bbfd7c242 100644
--- a/drivers/usb/emul/sandbox_flash.c
+++ b/drivers/usb/emul/sandbox_flash.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
 #include <os.h>
@@ -13,6 +14,7 @@
 #include <usb.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /*
  * This driver emulates a flash stick using the UFI command specification and
diff --git a/drivers/usb/emul/sandbox_keyb.c b/drivers/usb/emul/sandbox_keyb.c
index 68e5f12f35d0..339ada4a29de 100644
--- a/drivers/usb/emul/sandbox_keyb.c
+++ b/drivers/usb/emul/sandbox_keyb.c
@@ -13,6 +13,7 @@
 #include <usb.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /*
  * This driver emulates a USB keyboard using the USB HID specification (boot
diff --git a/drivers/usb/emul/usb-emul-uclass.c b/drivers/usb/emul/usb-emul-uclass.c
index 8d24556c2c45..97aa60189a13 100644
--- a/drivers/usb/emul/usb-emul-uclass.c
+++ b/drivers/usb/emul/usb-emul-uclass.c
@@ -7,11 +7,13 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <stdbool.h>
 #include <usb.h>
 #include <dm/device-internal.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static int copy_to_unicode(char *buff, int length, const char *str)
 {
diff --git a/drivers/usb/eth/asix.c b/drivers/usb/eth/asix.c
index de25ba12f61b..a293fb714bc1 100644
--- a/drivers/usb/eth/asix.c
+++ b/drivers/usb/eth/asix.c
@@ -19,6 +19,7 @@
 #include <linux/errno.h>
 #include <linux/mii.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "usb_ether.h"
 
 /* ASIX AX8817X based USB 2.0 Ethernet Devices */
diff --git a/drivers/usb/eth/asix88179.c b/drivers/usb/eth/asix88179.c
index c1c873c2c2b8..c45e4a6da61b 100644
--- a/drivers/usb/eth/asix88179.c
+++ b/drivers/usb/eth/asix88179.c
@@ -17,6 +17,7 @@
 #include <linux/errno.h>
 #include <linux/mii.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "usb_ether.h"
 #include <malloc.h>
 #include <memalign.h>
diff --git a/drivers/usb/eth/lan75xx.c b/drivers/usb/eth/lan75xx.c
index 7d828d75dc61..78d1fb5107b8 100644
--- a/drivers/usb/eth/lan75xx.c
+++ b/drivers/usb/eth/lan75xx.c
@@ -9,6 +9,7 @@
 #include <linux/bitops.h>
 #include <linux/mii.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "usb_ether.h"
 #include "lan7x.h"
 
diff --git a/drivers/usb/eth/lan78xx.c b/drivers/usb/eth/lan78xx.c
index 194753fb278a..c571f03a6455 100644
--- a/drivers/usb/eth/lan78xx.c
+++ b/drivers/usb/eth/lan78xx.c
@@ -10,6 +10,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "usb_ether.h"
 #include "lan7x.h"
 
diff --git a/drivers/usb/eth/lan7x.c b/drivers/usb/eth/lan7x.c
index 503d36c8d9fc..94cf1e46ba2d 100644
--- a/drivers/usb/eth/lan7x.c
+++ b/drivers/usb/eth/lan7x.c
@@ -17,6 +17,7 @@
 #include <linux/kernel.h>
 #include <linux/mii.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "usb_ether.h"
 #include "lan7x.h"
 
diff --git a/drivers/usb/eth/lan7x.h b/drivers/usb/eth/lan7x.h
index 57c8293a8956..9389ba35bf83 100644
--- a/drivers/usb/eth/lan7x.h
+++ b/drivers/usb/eth/lan7x.h
@@ -11,6 +11,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 /* USB Vendor Requests */
 #define USB_VENDOR_REQUEST_WRITE_REGISTER	0xA0
diff --git a/drivers/usb/eth/mcs7830.c b/drivers/usb/eth/mcs7830.c
index f223d96559f7..a49e976cf107 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 <stdbool.h>
 #include <vsprintf.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
@@ -25,6 +26,7 @@
 #include <usb.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "usb_ether.h"
 
diff --git a/drivers/usb/eth/r8152.c b/drivers/usb/eth/r8152.c
index f7c46fbc25fa..aeb7ba52c015 100644
--- a/drivers/usb/eth/r8152.c
+++ b/drivers/usb/eth/r8152.c
@@ -11,6 +11,7 @@
 #include <malloc.h>
 #include <memalign.h>
 #include <net.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <usb.h>
 #include <vsprintf.h>
@@ -21,6 +22,7 @@
 #include <linux/mii.h>
 #include <linux/bitops.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "usb_ether.h"
 #include "r8152.h"
 
diff --git a/drivers/usb/eth/r8152.h b/drivers/usb/eth/r8152.h
index 378eb8c81248..d6e201c757c6 100644
--- a/drivers/usb/eth/r8152.h
+++ b/drivers/usb/eth/r8152.h
@@ -7,8 +7,10 @@
 #ifndef _RTL8152_ETH_H
 #define _RTL8152_ETH_H
 
+#include <stdbool.h>
 #include <linux/bitops.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #define R8152_BASE_NAME		"r8152"
 
 #define PLA_IDR			0xc000
diff --git a/drivers/usb/eth/r8152_fw.c b/drivers/usb/eth/r8152_fw.c
index 2211dc9489ec..639670bfd859 100644
--- a/drivers/usb/eth/r8152_fw.c
+++ b/drivers/usb/eth/r8152_fw.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/usb/eth/smsc95xx.c b/drivers/usb/eth/smsc95xx.c
index 482160254484..1e8529fe9ee6 100644
--- a/drivers/usb/eth/smsc95xx.c
+++ b/drivers/usb/eth/smsc95xx.c
@@ -24,6 +24,7 @@
 #include <linux/kernel.h>
 #include <linux/mii.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "usb_ether.h"
 
 /* SMSC LAN95xx based USB 2.0 Ethernet Devices */
diff --git a/drivers/usb/eth/usb_ether.c b/drivers/usb/eth/usb_ether.c
index ce86d2cd2551..a5de82cc15b4 100644
--- a/drivers/usb/eth/usb_ether.c
+++ b/drivers/usb/eth/usb_ether.c
@@ -16,6 +16,7 @@
 #include <dm/device-internal.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "usb_ether.h"
 
diff --git a/drivers/usb/gadget/at91_udc.c b/drivers/usb/gadget/at91_udc.c
index e5a8872f7156..fe0f91d586b8 100644
--- a/drivers/usb/gadget/at91_udc.c
+++ b/drivers/usb/gadget/at91_udc.c
@@ -14,6 +14,7 @@
 #undef	PACKET_TRACE
 
 #include <common.h>
+#include <compiler.h>
 #include <stdio.h>
 #include <dm/devres.h>
 #include <linux/bug.h>
@@ -25,6 +26,7 @@
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <mach/at91_matrix.h>
 #include <linux/list.h>
 #include <linux/usb/ch9.h>
diff --git a/drivers/usb/gadget/at91_udc.h b/drivers/usb/gadget/at91_udc.h
index 2b2e73420add..f86e2a3ca7ae 100644
--- a/drivers/usb/gadget/at91_udc.h
+++ b/drivers/usb/gadget/at91_udc.h
@@ -13,6 +13,8 @@
  * Based on AT91RM9200 datasheet revision E.
  */
 
+#include <compiler.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 #define AT91_UDP_FRM_NUM	0x00		/* Frame Number Register */
 #define     AT91_UDP_NUM	(0x7ff <<  0)	/* Frame Number */
diff --git a/drivers/usb/gadget/atmel_usba_udc.c b/drivers/usb/gadget/atmel_usba_udc.c
index 03bbe1edb620..e98d63b9fbfb 100644
--- a/drivers/usb/gadget/atmel_usba_udc.c
+++ b/drivers/usb/gadget/atmel_usba_udc.c
@@ -17,6 +17,7 @@
 #include <linux/list.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
 #include <linux/usb/atmel_usba_udc.h>
diff --git a/drivers/usb/gadget/atmel_usba_udc.h b/drivers/usb/gadget/atmel_usba_udc.h
index b0692e279542..d1edf95f2737 100644
--- a/drivers/usb/gadget/atmel_usba_udc.h
+++ b/drivers/usb/gadget/atmel_usba_udc.h
@@ -11,6 +11,7 @@
 #define __LINUX_USB_GADGET_USBA_UDC_H__
 
 /* USB register offsets */
+#include <asm/types.h>
 #include <linux/kernel.h>
 #define USBA_CTRL				0x0000
 #define USBA_FNUM				0x0004
diff --git a/drivers/usb/gadget/bcm_udc_otg.h b/drivers/usb/gadget/bcm_udc_otg.h
index 24cc936c6b48..52a0110bf859 100644
--- a/drivers/usb/gadget/bcm_udc_otg.h
+++ b/drivers/usb/gadget/bcm_udc_otg.h
@@ -7,6 +7,7 @@
 #define __BCM_UDC_OTG_H
 
 #include <common.h>
+#include <linux/types.h>
 
 static inline void wfld_set(uintptr_t addr, uint32_t fld_val, uint32_t fld_mask)
 {
diff --git a/drivers/usb/gadget/ci_udc.c b/drivers/usb/gadget/ci_udc.c
index 5f92c484b936..29805ca65e6c 100644
--- a/drivers/usb/gadget/ci_udc.c
+++ b/drivers/usb/gadget/ci_udc.c
@@ -9,10 +9,12 @@
 
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <config.h>
 #include <cpu_func.h>
 #include <net.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/byteorder.h>
 #include <asm/cache.h>
diff --git a/drivers/usb/gadget/ci_udc.h b/drivers/usb/gadget/ci_udc.h
index c5ef74d74f8a..cbd7ea893a0c 100644
--- a/drivers/usb/gadget/ci_udc.h
+++ b/drivers/usb/gadget/ci_udc.h
@@ -7,6 +7,7 @@
 #define __GADGET__CI_UDC_H__
 
 #include <stdbool.h>
+#include <linux/types.h>
 #define NUM_ENDPOINTS		6
 
 #ifdef CONFIG_CI_UDC_HAS_HOSTPC
diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
index 30c26a641051..7fa79b3bfdce 100644
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@ -1,5 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
+#include <compiler.h>
+#include <linux/types.h>
  * composite.c - infrastructure for Composite USB Gadgets
  *
  * Copyright (C) 2006-2008 David Brownell
diff --git a/drivers/usb/gadget/config.c b/drivers/usb/gadget/config.c
index e96782644f31..39ec1889daea 100644
--- a/drivers/usb/gadget/config.c
+++ b/drivers/usb/gadget/config.c
@@ -9,6 +9,7 @@
  */
 
 #include <common.h>
+#include <asm/types.h>
 #include <asm/unaligned.h>
 #include <linux/errno.h>
 #include <linux/list.h>
diff --git a/drivers/usb/gadget/core.c b/drivers/usb/gadget/core.c
index 3781d25fd6de..ee8ebb37a049 100644
--- a/drivers/usb/gadget/core.c
+++ b/drivers/usb/gadget/core.c
@@ -19,6 +19,7 @@
 #include <malloc.h>
 #include <serial.h>
 #include <usbdevice.h>
+#include <asm/types.h>
 
 #define MAX_INTERFACES 2
 
diff --git a/drivers/usb/gadget/designware_udc.c b/drivers/usb/gadget/designware_udc.c
index 82d07349e47b..051fed622285 100644
--- a/drivers/usb/gadget/designware_udc.c
+++ b/drivers/usb/gadget/designware_udc.c
@@ -13,6 +13,7 @@
 #include <linux/delay.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <env.h>
 #include <usbdevice.h>
diff --git a/drivers/usb/gadget/dwc2_udc_otg.c b/drivers/usb/gadget/dwc2_udc_otg.c
index 04a6b7129bb7..ae0ba5778fe2 100644
--- a/drivers/usb/gadget/dwc2_udc_otg.c
+++ b/drivers/usb/gadget/dwc2_udc_otg.c
@@ -19,11 +19,13 @@
 #undef DEBUG
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <dm.h>
 #include <generic-phy.h>
 #include <log.h>
 #include <malloc.h>
 #include <reset.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <dm/device_compat.h>
 #include <dm/devres.h>
@@ -32,6 +34,7 @@
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <linux/errno.h>
 #include <linux/list.h>
diff --git a/drivers/usb/gadget/dwc2_udc_otg_priv.h b/drivers/usb/gadget/dwc2_udc_otg_priv.h
index e72b22ac61e1..52c0727bcae4 100644
--- a/drivers/usb/gadget/dwc2_udc_otg_priv.h
+++ b/drivers/usb/gadget/dwc2_udc_otg_priv.h
@@ -7,6 +7,7 @@
 #ifndef __DWC2_UDC_OTG_PRIV__
 #define __DWC2_UDC_OTG_PRIV__
 
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/sizes.h>
 #include <linux/usb/ch9.h>
diff --git a/drivers/usb/gadget/dwc2_udc_otg_regs.h b/drivers/usb/gadget/dwc2_udc_otg_regs.h
index 2eda5c372062..62dc2b9488b2 100644
--- a/drivers/usb/gadget/dwc2_udc_otg_regs.h
+++ b/drivers/usb/gadget/dwc2_udc_otg_regs.h
@@ -11,6 +11,7 @@
 #define __ASM_ARCH_REGS_USB_OTG_HS_H
 
 /* USB2.0 OTG Controller register */
+#include <asm/types.h>
 #include <linux/bitops.h>
 struct dwc2_usbotg_phy {
 	u32 phypwr;
diff --git a/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c b/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c
index ceb3a09840da..df1ef17cf9f2 100644
--- a/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c
+++ b/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c
@@ -25,6 +25,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static u8 clear_feature_num;
 int clear_feature_flag;
diff --git a/drivers/usb/gadget/epautoconf.c b/drivers/usb/gadget/epautoconf.c
index caab17473dfc..edcd732f895b 100644
--- a/drivers/usb/gadget/epautoconf.c
+++ b/drivers/usb/gadget/epautoconf.c
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <vsprintf.h>
+#include <asm/types.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 1c0c1693d2d2..a78b85d9ad9c 100644
--- a/drivers/usb/gadget/ether.c
+++ b/drivers/usb/gadget/ether.c
@@ -21,6 +21,7 @@
 #include <linux/netdevice.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/cdc.h>
 #include <linux/usb/gadget.h>
diff --git a/drivers/usb/gadget/f_dfu.c b/drivers/usb/gadget/f_dfu.c
index 281c0f29f2a5..ef4c6dc878e7 100644
--- a/drivers/usb/gadget/f_dfu.c
+++ b/drivers/usb/gadget/f_dfu.c
@@ -20,6 +20,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
diff --git a/drivers/usb/gadget/f_dfu.h b/drivers/usb/gadget/f_dfu.h
index a175e3f134ba..ba82dab21e7d 100644
--- a/drivers/usb/gadget/f_dfu.h
+++ b/drivers/usb/gadget/f_dfu.h
@@ -9,7 +9,9 @@
 #ifndef __F_DFU_H_
 #define __F_DFU_H_
 
+#include <compiler.h>
 #include <linux/compiler.h>
+#include <linux/types.h>
 #include <linux/usb/composite.h>
 
 #define DFU_CONFIG_VAL			1
diff --git a/drivers/usb/gadget/f_mass_storage.c b/drivers/usb/gadget/f_mass_storage.c
index 12ca77299f6c..2f46cf8e2ae6 100644
--- a/drivers/usb/gadget/f_mass_storage.c
+++ b/drivers/usb/gadget/f_mass_storage.c
@@ -21,6 +21,7 @@
  * function can indicate that LUN is removable and/or CD-ROM.  (The
  * later implies read-only access.)
  *
+#include <linux/types.h>
  * MSF is configured by specifying a fsg_config structure.  It has the
  * following fields:
  *
diff --git a/drivers/usb/gadget/f_rockusb.c b/drivers/usb/gadget/f_rockusb.c
index e6aa089aa77e..d907890b581a 100644
--- a/drivers/usb/gadget/f_rockusb.c
+++ b/drivers/usb/gadget/f_rockusb.c
@@ -5,6 +5,7 @@
  * Eddie Cai <eddie.cai.linux@gmail.com>
  */
 #include <command.h>
+#include <compiler.h>
 #include <config.h>
 #include <common.h>
 #include <env.h>
@@ -17,6 +18,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
 #include <linux/usb/composite.h>
diff --git a/drivers/usb/gadget/f_sdp.c b/drivers/usb/gadget/f_sdp.c
index 5eb6474072c1..c2588773b892 100644
--- a/drivers/usb/gadget/f_sdp.c
+++ b/drivers/usb/gadget/f_sdp.c
@@ -16,17 +16,20 @@
  * Parts of the implementation are based on f_dfu and f_thor.
  */
 
+#include <compiler.h>
 #include <errno.h>
 #include <common.h>
 #include <console.h>
 #include <env.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
diff --git a/drivers/usb/gadget/f_thor.c b/drivers/usb/gadget/f_thor.c
index 667f1e19c362..c69a90c3697a 100644
--- a/drivers/usb/gadget/f_thor.c
+++ b/drivers/usb/gadget/f_thor.c
@@ -25,6 +25,7 @@
 #include <stdio.h>
 #include <version.h>
 #include <vsprintf.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
diff --git a/drivers/usb/gadget/f_thor.h b/drivers/usb/gadget/f_thor.h
index 8ba3fa21b733..995668afc439 100644
--- a/drivers/usb/gadget/f_thor.h
+++ b/drivers/usb/gadget/f_thor.h
@@ -9,6 +9,7 @@
 #ifndef _USB_THOR_H_
 #define _USB_THOR_H_
 
+#include <compiler.h>
 #include <linux/compiler.h>
 #include <linux/sizes.h>
 
diff --git a/drivers/usb/gadget/fotg210.c b/drivers/usb/gadget/fotg210.c
index 66952aab4fbd..659e667d51c3 100644
--- a/drivers/usb/gadget/fotg210.c
+++ b/drivers/usb/gadget/fotg210.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <config.h>
 #include <cpu_func.h>
 #include <log.h>
diff --git a/drivers/usb/gadget/g_dnl.c b/drivers/usb/gadget/g_dnl.c
index 9397f915a44a..d6c7aba7ff75 100644
--- a/drivers/usb/gadget/g_dnl.c
+++ b/drivers/usb/gadget/g_dnl.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <log.h>
 #include <malloc.h>
 #include <stdbool.h>
diff --git a/drivers/usb/gadget/ndis.h b/drivers/usb/gadget/ndis.h
index 753838f79417..7726c82d50e3 100644
--- a/drivers/usb/gadget/ndis.h
+++ b/drivers/usb/gadget/ndis.h
@@ -22,6 +22,7 @@
 #define _USBGADGET_NDIS_H
 
 
+#include <linux/types.h>
 #define NDIS_STATUS_MULTICAST_FULL        0xC0010009
 #define NDIS_STATUS_MULTICAST_EXISTS      0xC001000A
 #define NDIS_STATUS_MULTICAST_NOT_FOUND   0xC001000B
diff --git a/drivers/usb/gadget/pxa25x_udc.c b/drivers/usb/gadget/pxa25x_udc.c
index 71c918a64e4f..5a8880d3f9de 100644
--- a/drivers/usb/gadget/pxa25x_udc.c
+++ b/drivers/usb/gadget/pxa25x_udc.c
@@ -35,6 +35,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
diff --git a/drivers/usb/gadget/pxa27x_udc.c b/drivers/usb/gadget/pxa27x_udc.c
index 03a067888e4b..966999ee5407 100644
--- a/drivers/usb/gadget/pxa27x_udc.c
+++ b/drivers/usb/gadget/pxa27x_udc.c
@@ -14,6 +14,7 @@
 #include <asm/byteorder.h>
 #include <asm/io.h>
 #include <usbdevice.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
 #include <usb/pxa27x_udc.h>
diff --git a/drivers/usb/gadget/storage_common.c b/drivers/usb/gadget/storage_common.c
index 5674e8fe4940..12446e9795dd 100644
--- a/drivers/usb/gadget/storage_common.c
+++ b/drivers/usb/gadget/storage_common.c
@@ -42,6 +42,7 @@
 
 /*
  * When FSG_BUFFHD_STATIC_BUFFER is defined when this file is included
+#include <asm/types.h>
  * the fsg_buffhd structure's buf field will be an array of FSG_BUFLEN
  * characters rather then a pointer to void.
  */
diff --git a/drivers/usb/gadget/usbstring.c b/drivers/usb/gadget/usbstring.c
index 1a5917e0cc54..b3193c54330e 100644
--- a/drivers/usb/gadget/usbstring.c
+++ b/drivers/usb/gadget/usbstring.c
@@ -10,6 +10,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
 
diff --git a/drivers/usb/host/dwc2.c b/drivers/usb/host/dwc2.c
index 1095df170c7f..56fc2456fa0e 100644
--- a/drivers/usb/host/dwc2.c
+++ b/drivers/usb/host/dwc2.c
@@ -14,6 +14,7 @@
 #include <malloc.h>
 #include <memalign.h>
 #include <phys2bus.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <usb.h>
@@ -26,6 +27,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <power/regulator.h>
 #include <reset.h>
 
diff --git a/drivers/usb/host/dwc2.h b/drivers/usb/host/dwc2.h
index 97a06c48f216..086712bba953 100644
--- a/drivers/usb/host/dwc2.h
+++ b/drivers/usb/host/dwc2.h
@@ -6,6 +6,7 @@
 #ifndef __DWC2_H__
 #define __DWC2_H__
 
+#include <asm/types.h>
 struct dwc2_hc_regs {
 	u32			hcchar;		/* 0x00 */
 	u32			hcsplt;
diff --git a/drivers/usb/host/dwc3-sti-glue.c b/drivers/usb/host/dwc3-sti-glue.c
index 876ebdfc40d4..00af786aaa1f 100644
--- a/drivers/usb/host/dwc3-sti-glue.c
+++ b/drivers/usb/host/dwc3-sti-glue.c
@@ -12,6 +12,7 @@
 #include <asm/io.h>
 #include <dm.h>
 #include <errno.h>
+#include <asm/types.h>
 #include <dm/lists.h>
 #include <regmap.h>
 #include <reset-uclass.h>
diff --git a/drivers/usb/host/ehci-armada100.c b/drivers/usb/host/ehci-armada100.c
index 2ce9f27b862e..7026168a3ea6 100644
--- a/drivers/usb/host/ehci-armada100.c
+++ b/drivers/usb/host/ehci-armada100.c
@@ -14,6 +14,7 @@
 #include <log.h>
 #include <asm/io.h>
 #include <usb.h>
+#include <linux/types.h>
 #include "ehci.h"
 #include <asm/arch/cpu.h>
 #include <asm/arch/armada100.h>
diff --git a/drivers/usb/host/ehci-atmel.c b/drivers/usb/host/ehci-atmel.c
index dc6eb5b9bb6f..00f92a6a297e 100644
--- a/drivers/usb/host/ehci-atmel.c
+++ b/drivers/usb/host/ehci-atmel.c
@@ -14,6 +14,7 @@
 #include <asm/io.h>
 #include <asm/arch/clk.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #include "ehci.h"
 
diff --git a/drivers/usb/host/ehci-exynos.c b/drivers/usb/host/ehci-exynos.c
index 9f1ec7ea9263..3d79f1fae2c6 100644
--- a/drivers/usb/host/ehci-exynos.c
+++ b/drivers/usb/host/ehci-exynos.c
@@ -22,6 +22,7 @@
 #include <asm/gpio.h>
 #include <linux/errno.h>
 #include <linux/compat.h>
+#include <linux/types.h>
 #include "ehci.h"
 
 /* Declare global data pointer */
diff --git a/drivers/usb/host/ehci-faraday.c b/drivers/usb/host/ehci-faraday.c
index df81d5605a4e..e1a3ab0bb2ee 100644
--- a/drivers/usb/host/ehci-faraday.c
+++ b/drivers/usb/host/ehci-faraday.c
@@ -7,12 +7,14 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <log.h>
 #include <stdio.h>
 #include <asm/io.h>
 #include <usb.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include <usb/fusbh200.h>
 #include <usb/fotg210.h>
 
diff --git a/drivers/usb/host/ehci-fsl.c b/drivers/usb/host/ehci-fsl.c
index c9303bfba2a9..c46a466acd82 100644
--- a/drivers/usb/host/ehci-fsl.c
+++ b/drivers/usb/host/ehci-fsl.c
@@ -20,6 +20,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <usb/ehci-ci.h>
 #include <hwconfig.h>
 #include <fsl_usb.h>
diff --git a/drivers/usb/host/ehci-generic.c b/drivers/usb/host/ehci-generic.c
index b9ad1785ceac..bb782665221b 100644
--- a/drivers/usb/host/ehci-generic.c
+++ b/drivers/usb/host/ehci-generic.c
@@ -14,6 +14,7 @@
 #include <asm/io.h>
 #include <dm.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include "ehci.h"
 #include <power/regulator.h>
 
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index 05fe83c399c7..16a34b46608f 100644
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -11,6 +11,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <asm/byteorder.h>
@@ -27,6 +28,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "ehci.h"
 
diff --git a/drivers/usb/host/ehci-marvell.c b/drivers/usb/host/ehci-marvell.c
index 635f9f252360..631b58032ae9 100644
--- a/drivers/usb/host/ehci-marvell.c
+++ b/drivers/usb/host/ehci-marvell.c
@@ -12,6 +12,7 @@
 #include <usb.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include "ehci.h"
 #include <linux/mbus.h>
 #include <asm/arch/cpu.h>
diff --git a/drivers/usb/host/ehci-msm.c b/drivers/usb/host/ehci-msm.c
index 4c4d0a48bc1e..579daa92ad5a 100644
--- a/drivers/usb/host/ehci-msm.c
+++ b/drivers/usb/host/ehci-msm.c
@@ -12,6 +12,7 @@
 #include <errno.h>
 #include <stdio.h>
 #include <usb.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <usb/ehci-ci.h>
diff --git a/drivers/usb/host/ehci-mx5.c b/drivers/usb/host/ehci-mx5.c
index 2b7c9cc80d75..214bd28d3c3a 100644
--- a/drivers/usb/host/ehci-mx5.c
+++ b/drivers/usb/host/ehci-mx5.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <log.h>
 #include <stdio.h>
 #include <usb.h>
@@ -14,6 +15,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <usb/ehci-ci.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
diff --git a/drivers/usb/host/ehci-mx6.c b/drivers/usb/host/ehci-mx6.c
index bb96c11f355a..d5e6cca9b07d 100644
--- a/drivers/usb/host/ehci-mx6.c
+++ b/drivers/usb/host/ehci-mx6.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <log.h>
 #include <stdio.h>
 #include <usb.h>
@@ -15,6 +16,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include <usb/ehci-ci.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
diff --git a/drivers/usb/host/ehci-mxc.c b/drivers/usb/host/ehci-mxc.c
index 0cbc8ee75e95..f12c9e0beb96 100644
--- a/drivers/usb/host/ehci-mxc.c
+++ b/drivers/usb/host/ehci-mxc.c
@@ -10,6 +10,7 @@
 #include <asm/arch/imx-regs.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <usb/ehci-ci.h>
 #include <errno.h>
 
diff --git a/drivers/usb/host/ehci-mxs.c b/drivers/usb/host/ehci-mxs.c
index f951e5d3a829..53d1324d661b 100644
--- a/drivers/usb/host/ehci-mxs.c
+++ b/drivers/usb/host/ehci-mxs.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <stdio.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
@@ -14,6 +15,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include "ehci.h"
 
diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c
index cc5c9406112f..4f659b11fa17 100644
--- a/drivers/usb/host/ehci-omap.c
+++ b/drivers/usb/host/ehci-omap.c
@@ -16,6 +16,7 @@
 #include <time.h>
 #include <usb.h>
 #include <vsprintf.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/string.h>
diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c
index d8dbd77114ac..b448f0dc551a 100644
--- a/drivers/usb/host/ehci-pci.c
+++ b/drivers/usb/host/ehci-pci.c
@@ -13,6 +13,7 @@
 #include <stdio.h>
 #include <usb.h>
 #include <asm/io.h>
+#include <linux/types.h>
 
 #include "ehci.h"
 
diff --git a/drivers/usb/host/ehci-rmobile.c b/drivers/usb/host/ehci-rmobile.c
index 8e826163aa87..d0b0921dc808 100644
--- a/drivers/usb/host/ehci-rmobile.c
+++ b/drivers/usb/host/ehci-rmobile.c
@@ -12,6 +12,7 @@
 #include <asm/arch/ehci-rmobile.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include "ehci.h"
 
 #if defined(CONFIG_R8A7740)
diff --git a/drivers/usb/host/ehci-spear.c b/drivers/usb/host/ehci-spear.c
index 2e3ea349a726..7e88fac14a13 100644
--- a/drivers/usb/host/ehci-spear.c
+++ b/drivers/usb/host/ehci-spear.c
@@ -14,6 +14,7 @@
 #include <asm/io.h>
 #include <usb.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 #include "ehci.h"
 #include <asm/arch/hardware.h>
 #include <asm/arch/spr_misc.h>
diff --git a/drivers/usb/host/ehci-tegra.c b/drivers/usb/host/ehci-tegra.c
index 605a0a1dc808..608dd703ea31 100644
--- a/drivers/usb/host/ehci-tegra.c
+++ b/drivers/usb/host/ehci-tegra.c
@@ -19,6 +19,7 @@
 #include <asm/arch-tegra/clk_rst.h>
 #include <usb.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <usb/ulpi.h>
 #include <linux/libfdt.h>
 
diff --git a/drivers/usb/host/ehci-vct.c b/drivers/usb/host/ehci-vct.c
index 7167f82b4814..334369638d8f 100644
--- a/drivers/usb/host/ehci-vct.c
+++ b/drivers/usb/host/ehci-vct.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <usb.h>
+#include <asm/types.h>
 
 #include "ehci.h"
 
diff --git a/drivers/usb/host/ehci-vf.c b/drivers/usb/host/ehci-vf.c
index 816d105087e5..a90c4df2e25e 100644
--- a/drivers/usb/host/ehci-vf.c
+++ b/drivers/usb/host/ehci-vf.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
 #include <usb.h>
@@ -24,6 +25,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <usb/ehci-ci.h>
 #include <linux/libfdt.h>
 #include <fdtdec.h>
diff --git a/drivers/usb/host/ehci-zynq.c b/drivers/usb/host/ehci-zynq.c
index 918e224e761f..569baf84a9e3 100644
--- a/drivers/usb/host/ehci-zynq.c
+++ b/drivers/usb/host/ehci-zynq.c
@@ -13,6 +13,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/io.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <usb/ehci-ci.h>
 #include <usb/ulpi.h>
 
diff --git a/drivers/usb/host/ehci.h b/drivers/usb/host/ehci.h
index 8e0755423a96..68922d91c007 100644
--- a/drivers/usb/host/ehci.h
+++ b/drivers/usb/host/ehci.h
@@ -11,6 +11,7 @@
 #include <stdbool.h>
 #include <usb.h>
 #include <generic-phy.h>
+#include <linux/types.h>
 
 /* Section 2.2.3 - N_PORTS */
 #define MAX_HC_PORTS		15
diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c
index ecdd64c48cdc..6d4f71d92e90 100644
--- a/drivers/usb/host/ohci-hcd.c
+++ b/drivers/usb/host/ohci-hcd.c
@@ -29,6 +29,7 @@
 
 #include <common.h>
 #include <cpu_func.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/byteorder.h>
 #include <dm.h>
@@ -38,6 +39,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #if defined(CONFIG_PCI_OHCI)
 # include <pci.h>
diff --git a/drivers/usb/host/ohci-lpc32xx.c b/drivers/usb/host/ohci-lpc32xx.c
index afb9e29f7886..196bbbe1c997 100644
--- a/drivers/usb/host/ohci-lpc32xx.c
+++ b/drivers/usb/host/ohci-lpc32xx.c
@@ -19,6 +19,7 @@
 #include <asm/arch/i2c.h>
 #include <usb.h>
 #include <i2c.h>
+#include <asm/types.h>
 
 /* OTG I2C controller module register structures */
 struct otgi2c_regs {
diff --git a/drivers/usb/host/ohci.h b/drivers/usb/host/ohci.h
index a38cd25eb85f..d4422ec452cd 100644
--- a/drivers/usb/host/ohci.h
+++ b/drivers/usb/host/ohci.h
@@ -13,6 +13,7 @@
 
 #include <asm/cache.h>
 #include <asm/io.h>
+#include <asm/types.h>
 
 #ifdef CONFIG_SYS_OHCI_SWAP_REG_ACCESS
 # define ohci_readl(a) __swap_32(in_be32((u32 *)a))
diff --git a/drivers/usb/host/r8a66597-hcd.c b/drivers/usb/host/r8a66597-hcd.c
index 66c20c103c09..5b4cfff8cfd0 100644
--- a/drivers/usb/host/r8a66597-hcd.c
+++ b/drivers/usb/host/r8a66597-hcd.c
@@ -18,6 +18,7 @@
 #include <linux/iopoll.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <power/regulator.h>
 
 #include "r8a66597.h"
diff --git a/drivers/usb/host/r8a66597.h b/drivers/usb/host/r8a66597.h
index b42389b9188a..678712d524d8 100644
--- a/drivers/usb/host/r8a66597.h
+++ b/drivers/usb/host/r8a66597.h
@@ -8,6 +8,7 @@
 #ifndef __R8A66597_H__
 #define __R8A66597_H__
 
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/string.h>
 #define SYSCFG0		0x00
diff --git a/drivers/usb/host/sl811-hcd.c b/drivers/usb/host/sl811-hcd.c
index 0b786e1d13ec..9184a91c4e4c 100644
--- a/drivers/usb/host/sl811-hcd.c
+++ b/drivers/usb/host/sl811-hcd.c
@@ -20,9 +20,11 @@
 
 #include <common.h>
 #include <mpc8xx.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <usb.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
diff --git a/drivers/usb/host/usb-sandbox.c b/drivers/usb/host/usb-sandbox.c
index 090cb2ae84e3..78e4234da241 100644
--- a/drivers/usb/host/usb-sandbox.c
+++ b/drivers/usb/host/usb-sandbox.c
@@ -10,6 +10,7 @@
 #include <stdbool.h>
 #include <usb.h>
 #include <dm/root.h>
+#include <linux/types.h>
 
 struct sandbox_usb_ctrl {
 	int rootdev;
diff --git a/drivers/usb/host/usb-uclass.c b/drivers/usb/host/usb-uclass.c
index 2d3321df3cd6..406375226796 100644
--- a/drivers/usb/host/usb-uclass.c
+++ b/drivers/usb/host/usb-uclass.c
@@ -20,6 +20,7 @@
 #include <dm/uclass-internal.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 extern bool usb_started; /* flag for the started/stopped USB status */
 static bool asynch_allowed;
diff --git a/drivers/usb/host/xhci-brcm.c b/drivers/usb/host/xhci-brcm.c
index 3308b7e756a7..bdb30b89c26e 100644
--- a/drivers/usb/host/xhci-brcm.c
+++ b/drivers/usb/host/xhci-brcm.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <fdtdec.h>
 #include <usb.h>
diff --git a/drivers/usb/host/xhci-dwc3.c b/drivers/usb/host/xhci-dwc3.c
index b96aea1e0105..e10c4fdf6178 100644
--- a/drivers/usb/host/xhci-dwc3.c
+++ b/drivers/usb/host/xhci-dwc3.c
@@ -17,6 +17,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <usb/xhci.h>
 #include <asm/io.h>
diff --git a/drivers/usb/host/xhci-exynos5.c b/drivers/usb/host/xhci-exynos5.c
index ee61c88e2aa3..77ee798168c1 100644
--- a/drivers/usb/host/xhci-exynos5.c
+++ b/drivers/usb/host/xhci-exynos5.c
@@ -29,6 +29,7 @@
 #include <asm/gpio.h>
 #include <linux/errno.h>
 #include <linux/compat.h>
+#include <linux/types.h>
 #include <linux/usb/dwc3.h>
 
 #include <usb/xhci.h>
diff --git a/drivers/usb/host/xhci-fsl.c b/drivers/usb/host/xhci-fsl.c
index 440f17f66d69..7eab30aabb93 100644
--- a/drivers/usb/host/xhci-fsl.c
+++ b/drivers/usb/host/xhci-fsl.c
@@ -8,11 +8,13 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <log.h>
 #include <stdio.h>
 #include <usb.h>
 #include <linux/errno.h>
 #include <linux/compat.h>
+#include <linux/types.h>
 #include <linux/usb/xhci-fsl.h>
 #include <linux/usb/dwc3.h>
 #include <usb/xhci.h>
diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c
index 09d301ed9562..3c18aacbd4f0 100644
--- a/drivers/usb/host/xhci-mem.c
+++ b/drivers/usb/host/xhci-mem.c
@@ -17,6 +17,7 @@
 #include <cpu_func.h>
 #include <dm.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/byteorder.h>
 #include <usb.h>
@@ -26,6 +27,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <usb/xhci.h>
 
diff --git a/drivers/usb/host/xhci-mtk.c b/drivers/usb/host/xhci-mtk.c
index 8ff71854fcdf..4b6c7d278d70 100644
--- a/drivers/usb/host/xhci-mtk.c
+++ b/drivers/usb/host/xhci-mtk.c
@@ -6,6 +6,7 @@
 
 #include <clk.h>
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <dm/devres.h>
 #include <generic-phy.h>
@@ -13,6 +14,7 @@
 #include <usb.h>
 #include <linux/errno.h>
 #include <linux/compat.h>
+#include <linux/types.h>
 #include <power/regulator.h>
 #include <linux/iopoll.h>
 #include <usb/xhci.h>
diff --git a/drivers/usb/host/xhci-mvebu.c b/drivers/usb/host/xhci-mvebu.c
index bc3a9f4d0181..f9d3facd1f6f 100644
--- a/drivers/usb/host/xhci-mvebu.c
+++ b/drivers/usb/host/xhci-mvebu.c
@@ -6,12 +6,14 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <fdtdec.h>
 #include <log.h>
 #include <stdio.h>
 #include <usb.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <power/regulator.h>
 #include <asm/gpio.h>
 
diff --git a/drivers/usb/host/xhci-omap.c b/drivers/usb/host/xhci-omap.c
index 00b7d8571d29..a6225def286c 100644
--- a/drivers/usb/host/xhci-omap.c
+++ b/drivers/usb/host/xhci-omap.c
@@ -16,6 +16,7 @@
 #include <asm/omap_common.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/types.h>
 
 #include <linux/compat.h>
 #include <linux/usb/dwc3.h>
diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c
index 9fb6d2f76353..cb957f0172f9 100644
--- a/drivers/usb/host/xhci-pci.c
+++ b/drivers/usb/host/xhci-pci.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <pci.h>
 #include <usb.h>
+#include <linux/types.h>
 #include <usb/xhci.h>
 
 static void xhci_pci_init(struct udevice *dev, struct xhci_hccr **ret_hccr,
diff --git a/drivers/usb/host/xhci-rcar-r8a779x_usb3_v3.h b/drivers/usb/host/xhci-rcar-r8a779x_usb3_v3.h
index f0f48a3354c5..e04dba8c7d4c 100644
--- a/drivers/usb/host/xhci-rcar-r8a779x_usb3_v3.h
+++ b/drivers/usb/host/xhci-rcar-r8a779x_usb3_v3.h
@@ -48,6 +48,7 @@
 #ifndef __FIRMWARE_R8A779X_USB3_V3__
 #define __FIRMWARE_R8A779X_USB3_V3__
 
+#include <asm/types.h>
 static const u32 firmware_r8a779x_usb3_v3[] = {
 	0xf4c455aa, 0x00d20014, 0x00000000, 0x23dc00e8,
 	0x00000000, 0x1a5c2007, 0x0001ff63, 0x001eff80,
diff --git a/drivers/usb/host/xhci-rcar.c b/drivers/usb/host/xhci-rcar.c
index a343d4d098cd..40ac9a6f2801 100644
--- a/drivers/usb/host/xhci-rcar.c
+++ b/drivers/usb/host/xhci-rcar.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <dm.h>
 #include <fdtdec.h>
 #include <log.h>
@@ -17,6 +18,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include <usb/xhci.h>
 #include "xhci-rcar-r8a779x_usb3_v3.h"
diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
index 7f9286a52a08..2da225c41aea 100644
--- a/drivers/usb/host/xhci-ring.c
+++ b/drivers/usb/host/xhci-ring.c
@@ -16,6 +16,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <asm/byteorder.h>
@@ -24,6 +25,7 @@
 #include <linux/bug.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include <usb/xhci.h>
 
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index 64a0c9d52c88..e6e21e8f0088 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -23,6 +23,7 @@
 #include <cpu_func.h>
 #include <dm.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/byteorder.h>
 #include <usb.h>
@@ -36,6 +37,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <usb/xhci.h>
 
 #ifndef CONFIG_USB_MAX_CONTROLLER_COUNT
diff --git a/drivers/usb/musb-new/am35x.c b/drivers/usb/musb-new/am35x.c
index 8d8aa7794670..577774b76948 100644
--- a/drivers/usb/musb-new/am35x.c
+++ b/drivers/usb/musb-new/am35x.c
@@ -25,8 +25,10 @@
 #include <plat/usb.h>
 #else
 #include <common.h>
+#include <compiler.h>
 #include <time.h>
 #include <asm/omap_musb.h>
+#include <asm/types.h>
 #include <linux/bug.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/usb/musb-new/da8xx.c b/drivers/usb/musb-new/da8xx.c
index 8c44ed2429fb..2937a7a16bc5 100644
--- a/drivers/usb/musb-new/da8xx.c
+++ b/drivers/usb/musb-new/da8xx.c
@@ -14,9 +14,11 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <dm/device-internal.h>
 #include <dm/device_compat.h>
 #include <dm/lists.h>
diff --git a/drivers/usb/musb-new/mt85xx.c b/drivers/usb/musb-new/mt85xx.c
index 6bf1909f1ad7..fce224afe948 100644
--- a/drivers/usb/musb-new/mt85xx.c
+++ b/drivers/usb/musb-new/mt85xx.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <clk.h>
 #include <dm.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <dm/lists.h>
 #include <dm/root.h>
@@ -20,6 +21,7 @@
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <linux/usb/musb.h>
 #include <usb.h>
 #include "linux-compat.h"
diff --git a/drivers/usb/musb-new/musb_core.c b/drivers/usb/musb-new/musb_core.c
index 0a537fc45527..1947463a778e 100644
--- a/drivers/usb/musb-new/musb_core.c
+++ b/drivers/usb/musb-new/musb_core.c
@@ -80,6 +80,8 @@
 #include <linux/io.h>
 #else
 #include <common.h>
+#include <compiler.h>
+#include <stdbool.h>
 #include <usb.h>
 #include <vsprintf.h>
 #include <linux/bitops.h>
@@ -87,6 +89,7 @@
 #include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
 #include <linux/usb/musb.h>
diff --git a/drivers/usb/musb-new/musb_core.h b/drivers/usb/musb-new/musb_core.h
index 91b1ec330454..8b0372ae8047 100644
--- a/drivers/usb/musb-new/musb_core.h
+++ b/drivers/usb/musb-new/musb_core.h
@@ -20,6 +20,9 @@
 #include <linux/usb.h>
 #include <linux/usb/otg.h>
 #else
+#include <compiler.h>
+#include <stdbool.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #endif
diff --git a/drivers/usb/musb-new/musb_dma.h b/drivers/usb/musb-new/musb_dma.h
index 5ad64ed34363..3a51d3a56200 100644
--- a/drivers/usb/musb-new/musb_dma.h
+++ b/drivers/usb/musb-new/musb_dma.h
@@ -10,7 +10,9 @@
 #ifndef __MUSB_DMA_H__
 #define __MUSB_DMA_H__
 
+#include <compiler.h>
 #include <stdbool.h>
+#include <linux/types.h>
 struct musb_hw_ep;
 
 /*
diff --git a/drivers/usb/musb-new/musb_dsps.c b/drivers/usb/musb-new/musb_dsps.c
index 14d8cfb70fc7..292870f1ad4f 100644
--- a/drivers/usb/musb-new/musb_dsps.c
+++ b/drivers/usb/musb-new/musb_dsps.c
@@ -32,9 +32,11 @@
 #include <plat/usb.h>
 #else
 #include <common.h>
+#include <compiler.h>
 #include <time.h>
 #include <vsprintf.h>
 #include <asm/omap_musb.h>
+#include <asm/types.h>
 #include <linux/errno.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 949bea72aae8..39902aaa0306 100644
--- a/drivers/usb/musb-new/musb_gadget.c
+++ b/drivers/usb/musb-new/musb_gadget.c
@@ -23,11 +23,13 @@
 #include <linux/slab.h>
 #else
 #include <common.h>
+#include <compiler.h>
 #include <vsprintf.h>
 #include <linux/bug.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <linux/usb/ch9.h>
 #include "linux-compat.h"
 #endif
diff --git a/drivers/usb/musb-new/musb_gadget.h b/drivers/usb/musb-new/musb_gadget.h
index 4ae18f910fcc..978611303903 100644
--- a/drivers/usb/musb-new/musb_gadget.h
+++ b/drivers/usb/musb-new/musb_gadget.h
@@ -15,6 +15,7 @@
 #ifdef __UBOOT__
 #include <asm/byteorder.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
 #endif
diff --git a/drivers/usb/musb-new/musb_gadget_ep0.c b/drivers/usb/musb-new/musb_gadget_ep0.c
index 769aa25f1759..bd893ac9e2cc 100644
--- a/drivers/usb/musb-new/musb_gadget_ep0.c
+++ b/drivers/usb/musb-new/musb_gadget_ep0.c
@@ -19,8 +19,10 @@
 #include <linux/interrupt.h>
 #else
 #include <common.h>
+#include <compiler.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 #include "linux-compat.h"
 #include <asm/processor.h>
 #endif
diff --git a/drivers/usb/musb-new/musb_host.c b/drivers/usb/musb-new/musb_host.c
index 5fa013659c5c..b7ba5cb9f6d6 100644
--- a/drivers/usb/musb-new/musb_host.c
+++ b/drivers/usb/musb-new/musb_host.c
@@ -22,8 +22,11 @@
 #include <linux/dma-mapping.h>
 #else
 #include <common.h>
+#include <compiler.h>
+#include <stdbool.h>
 #include <usb.h>
 #include <linux/bug.h>
+#include <linux/types.h>
 #include "linux-compat.h"
 #include "usb-compat.h"
 #endif
diff --git a/drivers/usb/musb-new/musb_io.h b/drivers/usb/musb-new/musb_io.h
index 72a53656321b..ff572712821b 100644
--- a/drivers/usb/musb-new/musb_io.h
+++ b/drivers/usb/musb-new/musb_io.h
@@ -17,7 +17,9 @@
 #ifndef __UBOOT__
 #include <linux/io.h>
 #else
+#include <compiler.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #endif
 
 #if !defined(CONFIG_ARM) && !defined(CONFIG_SUPERH) \
diff --git a/drivers/usb/musb-new/musb_regs.h b/drivers/usb/musb-new/musb_regs.h
index c4d7203b8514..20b00b3e1b18 100644
--- a/drivers/usb/musb-new/musb_regs.h
+++ b/drivers/usb/musb-new/musb_regs.h
@@ -94,6 +94,8 @@
 #define MUSB_CSR0_H_SETUPPKT		0x0008
 #define MUSB_CSR0_H_RXSTALL		0x0004
 
+#include <compiler.h>
+#include <asm/types.h>
 /* CSR0 bits to avoid zeroing (write zero clears, write 1 ignored) */
 #define MUSB_CSR0_P_WZC_BITS	\
 	(MUSB_CSR0_P_SENTSTALL)
diff --git a/drivers/usb/musb-new/musb_uboot.c b/drivers/usb/musb-new/musb_uboot.c
index 233acc1ea1e5..2558b260fe66 100644
--- a/drivers/usb/musb-new/musb_uboot.c
+++ b/drivers/usb/musb-new/musb_uboot.c
@@ -2,9 +2,11 @@
 #include <console.h>
 #include <dm.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <watchdog.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/errno.h>
diff --git a/drivers/usb/musb-new/omap2430.c b/drivers/usb/musb-new/omap2430.c
index b609034184fa..3316f7dc6ac1 100644
--- a/drivers/usb/musb-new/omap2430.c
+++ b/drivers/usb/musb-new/omap2430.c
@@ -14,6 +14,7 @@
 #include <serial.h>
 #include <time.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <dm/device-internal.h>
 #include <dm/device_compat.h>
 #include <dm/lists.h>
diff --git a/drivers/usb/musb-new/pic32.c b/drivers/usb/musb-new/pic32.c
index c4fd7f0da076..d74aa5712af9 100644
--- a/drivers/usb/musb-new/pic32.c
+++ b/drivers/usb/musb-new/pic32.c
@@ -11,8 +11,10 @@
 
 #include <common.h>
 #include <dm.h>
+#include <compiler.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/drivers/usb/musb-new/sunxi.c b/drivers/usb/musb-new/sunxi.c
index b49954fe146d..28f6a6799338 100644
--- a/drivers/usb/musb-new/sunxi.c
+++ b/drivers/usb/musb-new/sunxi.c
@@ -17,12 +17,14 @@
  */
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <dm.h>
 #include <generic-phy.h>
 #include <log.h>
 #include <malloc.h>
 #include <phy-sun4i-usb.h>
 #include <reset.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/clock.h>
@@ -37,6 +39,7 @@
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <linux/usb/musb.h>
 #include "linux-compat.h"
 #include "musb_core.h"
diff --git a/drivers/usb/musb-new/ti-musb.c b/drivers/usb/musb-new/ti-musb.c
index e4382a30969d..09a74bd6b751 100644
--- a/drivers/usb/musb-new/ti-musb.c
+++ b/drivers/usb/musb-new/ti-musb.c
@@ -13,6 +13,7 @@
 #include <malloc.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
diff --git a/drivers/usb/musb-new/usb-compat.h b/drivers/usb/musb-new/usb-compat.h
index 1c66c4fe3637..4652095b9b42 100644
--- a/drivers/usb/musb-new/usb-compat.h
+++ b/drivers/usb/musb-new/usb-compat.h
@@ -1,6 +1,7 @@
 #ifndef __USB_COMPAT_H__
 #define __USB_COMPAT_H__
 
+#include <asm/types.h>
 #include "usb.h"
 
 struct udevice;
diff --git a/drivers/usb/musb/am35x.c b/drivers/usb/musb/am35x.c
index e749ae97180b..8f01e80fd847 100644
--- a/drivers/usb/musb/am35x.c
+++ b/drivers/usb/musb/am35x.c
@@ -10,6 +10,7 @@
  */
 
 #include <common.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 
diff --git a/drivers/usb/musb/am35x.h b/drivers/usb/musb/am35x.h
index 82ad94329cb7..fd4383ad538d 100644
--- a/drivers/usb/musb/am35x.h
+++ b/drivers/usb/musb/am35x.h
@@ -13,6 +13,7 @@
 #define __AM35X_USB_H__
 
 #include <asm/arch/am35x_def.h>
+#include <asm/types.h>
 #include "musb_core.h"
 
 /* Base address of musb wrapper */
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index 147b2eb929fb..ae174d1c3944 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -9,6 +9,7 @@
  */
 
 #include <common.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 
 #include "musb_core.h"
diff --git a/drivers/usb/musb/musb_core.h b/drivers/usb/musb/musb_core.h
index e5d8ac702882..167ab23bc5dd 100644
--- a/drivers/usb/musb/musb_core.h
+++ b/drivers/usb/musb/musb_core.h
@@ -11,6 +11,7 @@
 
 #include <usb_defs.h>
 #include <asm/io.h>
+#include <asm/types.h>
 
 #define MUSB_EP0_FIFOSIZE	64	/* This is non-configurable */
 
diff --git a/drivers/usb/musb/musb_hcd.c b/drivers/usb/musb/musb_hcd.c
index 8942ed31fc42..2f7849d36f8e 100644
--- a/drivers/usb/musb/musb_hcd.c
+++ b/drivers/usb/musb/musb_hcd.c
@@ -9,7 +9,9 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdbool.h>
 #include <usb.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
diff --git a/drivers/usb/musb/musb_udc.c b/drivers/usb/musb/musb_udc.c
index 56a92cc613ab..e0714b6d873b 100644
--- a/drivers/usb/musb/musb_udc.c
+++ b/drivers/usb/musb/musb_udc.c
@@ -41,6 +41,7 @@
 #include <hang.h>
 #include <serial.h>
 #include <usbdevice.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
 #include <usb/udc.h>
diff --git a/drivers/usb/musb/omap3.c b/drivers/usb/musb/omap3.c
index 080bd78523c9..2e824ff31f03 100644
--- a/drivers/usb/musb/omap3.c
+++ b/drivers/usb/musb/omap3.c
@@ -20,6 +20,7 @@
 #include <asm/omap_common.h>
 #include <twl4030.h>
 #include <twl6030.h>
+#include <asm/types.h>
 #include "omap3.h"
 
 static int platform_needs_initialization = 1;
diff --git a/drivers/usb/musb/omap3.h b/drivers/usb/musb/omap3.h
index 78fdb2959bbf..0adbef298488 100644
--- a/drivers/usb/musb/omap3.h
+++ b/drivers/usb/musb/omap3.h
@@ -18,6 +18,7 @@
 #define _MUSB_OMAP3_H_
 
 #include <asm/arch/cpu.h>
+#include <asm/types.h>
 #include "musb_core.h"
 
 /* Base address of MUSB registers */
diff --git a/drivers/usb/phy/omap_usb_phy.c b/drivers/usb/phy/omap_usb_phy.c
index be733f39b23f..8d0bc8cb9db4 100644
--- a/drivers/usb/phy/omap_usb_phy.c
+++ b/drivers/usb/phy/omap_usb_phy.c
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <usb.h>
+#include <asm/types.h>
 #include <dm/device_compat.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/usb/phy/rockchip_usb2_phy.c b/drivers/usb/phy/rockchip_usb2_phy.c
index d1d92ddfe7a3..2951da46abb9 100644
--- a/drivers/usb/phy/rockchip_usb2_phy.c
+++ b/drivers/usb/phy/rockchip_usb2_phy.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <hang.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
diff --git a/drivers/usb/phy/twl4030.c b/drivers/usb/phy/twl4030.c
index 9bea192fccf0..db8321459c2e 100644
--- a/drivers/usb/phy/twl4030.c
+++ b/drivers/usb/phy/twl4030.c
@@ -25,6 +25,7 @@
 
 #include <stdio.h>
 #include <twl4030.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 /* Defines for bits in registers */
diff --git a/drivers/usb/ulpi/omap-ulpi-viewport.c b/drivers/usb/ulpi/omap-ulpi-viewport.c
index 8b930e3fa919..0024347c6de6 100644
--- a/drivers/usb/ulpi/omap-ulpi-viewport.c
+++ b/drivers/usb/ulpi/omap-ulpi-viewport.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <log.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <usb/ulpi.h>
 
diff --git a/drivers/usb/ulpi/ulpi-viewport.c b/drivers/usb/ulpi/ulpi-viewport.c
index 5a7f034da1d7..85f5c7ddf5ca 100644
--- a/drivers/usb/ulpi/ulpi-viewport.c
+++ b/drivers/usb/ulpi/ulpi-viewport.c
@@ -17,6 +17,7 @@
 #include <stdio.h>
 #include <asm/io.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 #include <usb/ulpi.h>
 
 /* ULPI viewport control bits */
diff --git a/drivers/usb/ulpi/ulpi.c b/drivers/usb/ulpi/ulpi.c
index d5045a17959f..ecf2b016bf55 100644
--- a/drivers/usb/ulpi/ulpi.c
+++ b/drivers/usb/ulpi/ulpi.c
@@ -23,6 +23,7 @@
 #include <exports.h>
 #include <log.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <usb/ulpi.h>
 
diff --git a/drivers/video/am335x-fb.c b/drivers/video/am335x-fb.c
index 1e96f5bd35d7..604ee99f83d3 100644
--- a/drivers/video/am335x-fb.c
+++ b/drivers/video/am335x-fb.c
@@ -8,6 +8,8 @@
  * Wolfgang Denk's LCD-Framework (CONFIG_LCD, common/lcd.c)
  *
  * - supporting 16/24/32bit RGB/TFT raster Mode (not using palette)
+#include <stdbool.h>
+#include <linux/types.h>
  * - sets up LCD controller as in 'am335x_lcdpanel' struct given
  * - starts output DMA from gd->fb_base buffer
  */
diff --git a/drivers/video/anx9804.c b/drivers/video/anx9804.c
index 648564bc3e17..30800282b0c7 100644
--- a/drivers/video/anx9804.c
+++ b/drivers/video/anx9804.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <i2c.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include "anx98xx-edp.h"
 #include "anx9804.h"
diff --git a/drivers/video/anx9804.h b/drivers/video/anx9804.h
index c0fe3b393b45..252a280ce870 100644
--- a/drivers/video/anx9804.h
+++ b/drivers/video/anx9804.h
@@ -12,6 +12,7 @@
 #ifndef _ANX9804_H
 #define _ANX9804_H
 
+#include <asm/types.h>
 #define ANX9804_DATA_RATE_1620M				0x06
 #define ANX9804_DATA_RATE_2700M				0x0a
 
diff --git a/drivers/video/ati_radeon_fb.c b/drivers/video/ati_radeon_fb.c
index acee5ae35357..d235fce538c7 100644
--- a/drivers/video/ati_radeon_fb.c
+++ b/drivers/video/ati_radeon_fb.c
@@ -17,6 +17,7 @@
 
 #include <common.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
diff --git a/drivers/video/ati_radeon_fb.h b/drivers/video/ati_radeon_fb.h
index dde2067ef2ed..a0e1fe5195d9 100644
--- a/drivers/video/ati_radeon_fb.h
+++ b/drivers/video/ati_radeon_fb.h
@@ -9,6 +9,7 @@
  * Chip families. Must fit in the low 16 bits of a long word
  */
 #include <stdio.h>
+#include <asm/types.h>
 enum radeon_family {
 	CHIP_FAMILY_UNKNOW,
 	CHIP_FAMILY_LEGACY,
diff --git a/drivers/video/atmel_hlcdfb.c b/drivers/video/atmel_hlcdfb.c
index 1891ec0117a0..2860fffba2ac 100644
--- a/drivers/video/atmel_hlcdfb.c
+++ b/drivers/video/atmel_hlcdfb.c
@@ -25,6 +25,7 @@
 #include <linux/bug.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #if defined(CONFIG_LCD_LOGO)
 #include <bmp_logo.h>
diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c
index c734a44ba801..fb368dde6158 100644
--- a/drivers/video/atmel_lcdfb.c
+++ b/drivers/video/atmel_lcdfb.c
@@ -22,6 +22,7 @@
 #include <atmel_lcdc.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/video/bcm2835.c b/drivers/video/bcm2835.c
index c949246a9872..f2647fb30611 100644
--- a/drivers/video/bcm2835.c
+++ b/drivers/video/bcm2835.c
@@ -12,6 +12,7 @@
 #include <asm/cache.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 static int bcm2835_video_probe(struct udevice *dev)
 {
diff --git a/drivers/video/bridge/anx6345.c b/drivers/video/bridge/anx6345.c
index e7c33e6a18b4..a51c0365bf9b 100644
--- a/drivers/video/bridge/anx6345.c
+++ b/drivers/video/bridge/anx6345.c
@@ -13,6 +13,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "../anx98xx-edp.h"
 
 #define DP_MAX_LINK_RATE		0x001
diff --git a/drivers/video/bridge/ps862x.c b/drivers/video/bridge/ps862x.c
index b6f3e300f352..f71d4f191714 100644
--- a/drivers/video/bridge/ps862x.c
+++ b/drivers/video/bridge/ps862x.c
@@ -13,6 +13,7 @@
 #include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <power/regulator.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/video/bridge/video-bridge-uclass.c b/drivers/video/bridge/video-bridge-uclass.c
index 960f93840420..95c2d2bc1d09 100644
--- a/drivers/video/bridge/video-bridge-uclass.c
+++ b/drivers/video/bridge/video-bridge-uclass.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <stdbool.h>
 #include <video_bridge.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 
diff --git a/drivers/video/broadwell_igd.c b/drivers/video/broadwell_igd.c
index 430e4fd7da10..ca566cc50607 100644
--- a/drivers/video/broadwell_igd.c
+++ b/drivers/video/broadwell_igd.c
@@ -11,6 +11,7 @@
 #include <dm.h>
 #include <init.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <vbe.h>
@@ -26,6 +27,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include "i915_reg.h"
 
 struct broadwell_igd_priv {
diff --git a/drivers/video/bus_vcxk.c b/drivers/video/bus_vcxk.c
index 8f9b607099e1..8e6a5373cdb4 100644
--- a/drivers/video/bus_vcxk.c
+++ b/drivers/video/bus_vcxk.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <stdio.h>
 #include <asm/io.h>
+#include <linux/types.h>
 
 vu_char  *vcxk_bws      = ((vu_char *) (CONFIG_SYS_VCXK_BASE));
 vu_short *vcxk_bws_word = ((vu_short *)(CONFIG_SYS_VCXK_BASE));
diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c
index db64e18d13b0..2265583713f6 100644
--- a/drivers/video/cfb_console.c
+++ b/drivers/video/cfb_console.c
@@ -30,6 +30,8 @@
  * VIDEO_HW_RECTFILL	      - graphic driver supports hardware rectangle fill
  * VIDEO_HW_BITBLT	      - graphic driver supports hardware bit blt
  *
+#include <compiler.h>
+#include <stdbool.h>
  * Console Parameters are set by graphic drivers global struct:
  *
  * VIDEO_VISIBLE_COLS	      - x resolution
diff --git a/drivers/video/console_normal.c b/drivers/video/console_normal.c
index 5b51252aaa62..700a18c252cb 100644
--- a/drivers/video/console_normal.c
+++ b/drivers/video/console_normal.c
@@ -13,6 +13,7 @@
 #include <video_console.h>
 #include <video_font.h>		/* Get font data, width and height */
 #include <linux/errno.h>
+#include <linux/types.h>
 
 static int console_normal_set_row(struct udevice *dev, uint row, int clr)
 {
diff --git a/drivers/video/console_rotate.c b/drivers/video/console_rotate.c
index 3649bd4487e5..d43adbeaaf43 100644
--- a/drivers/video/console_rotate.c
+++ b/drivers/video/console_rotate.c
@@ -11,6 +11,7 @@
 #include <video_console.h>
 #include <video_font.h>		/* Get font data, width and height */
 #include <linux/errno.h>
+#include <linux/types.h>
 
 static int console_set_row_1(struct udevice *dev, uint row, int clr)
 {
diff --git a/drivers/video/console_truetype.c b/drivers/video/console_truetype.c
index 01fcc03456bc..187d3b06d2c7 100644
--- a/drivers/video/console_truetype.c
+++ b/drivers/video/console_truetype.c
@@ -12,6 +12,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /* Functions needed by stb_truetype.h */
 static int tt_floor(double val)
diff --git a/drivers/video/da8xx-fb.c b/drivers/video/da8xx-fb.c
index d9909e178674..6f303af37087 100644
--- a/drivers/video/da8xx-fb.c
+++ b/drivers/video/da8xx-fb.c
@@ -24,6 +24,7 @@
 #include <linux/list.h>
 #include <linux/fb.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <linux/errno.h>
 #include <asm/io.h>
diff --git a/drivers/video/display-uclass.c b/drivers/video/display-uclass.c
index 8b9131590fec..a54f12c0a98f 100644
--- a/drivers/video/display-uclass.c
+++ b/drivers/video/display-uclass.c
@@ -9,6 +9,7 @@
 #include <edid.h>
 #include <errno.h>
 #include <stdbool.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 
 int display_read_edid(struct udevice *dev, u8 *buf, int buf_size)
diff --git a/drivers/video/dw_hdmi.c b/drivers/video/dw_hdmi.c
index 3f61c5ef02bb..24e397f1317f 100644
--- a/drivers/video/dw_hdmi.c
+++ b/drivers/video/dw_hdmi.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <fdtdec.h>
 #include <log.h>
+#include <stdbool.h>
 #include <time.h>
 #include <asm/io.h>
 #include <i2c.h>
@@ -15,6 +16,7 @@
 #include <linux/delay.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "dw_hdmi.h"
 
 struct tmds_n_cts {
diff --git a/drivers/video/dw_mipi_dsi.c b/drivers/video/dw_mipi_dsi.c
index 343732e2be0b..2e4bde28dcb9 100644
--- a/drivers/video/dw_mipi_dsi.c
+++ b/drivers/video/dw_mipi_dsi.c
@@ -11,10 +11,12 @@
 
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <dsi_host.h>
 #include <dm.h>
 #include <errno.h>
 #include <panel.h>
+#include <stdbool.h>
 #include <video.h>
 #include <asm/io.h>
 #include <asm/arch/gpio.h>
@@ -27,6 +29,7 @@
 #include <video_bridge.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define HWVER_131			0x31333100	/* IP version 1.31 */
 
diff --git a/drivers/video/efi.c b/drivers/video/efi.c
index aa67cf17ad0a..34478f5b2bf4 100644
--- a/drivers/video/efi.c
+++ b/drivers/video/efi.c
@@ -12,6 +12,7 @@
 #include <stdio.h>
 #include <vbe.h>
 #include <video.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 
 struct pixel {
diff --git a/drivers/video/exynos/exynos_dp.c b/drivers/video/exynos/exynos_dp.c
index 72333b470108..77b81143f038 100644
--- a/drivers/video/exynos/exynos_dp.c
+++ b/drivers/video/exynos/exynos_dp.c
@@ -13,6 +13,7 @@
 #include <log.h>
 #include <stdio.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/libfdt.h>
diff --git a/drivers/video/exynos/exynos_dp_lowlevel.c b/drivers/video/exynos/exynos_dp_lowlevel.c
index c87e18f1dadf..b86624ba2c85 100644
--- a/drivers/video/exynos/exynos_dp_lowlevel.c
+++ b/drivers/video/exynos/exynos_dp_lowlevel.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <log.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <asm/arch/cpu.h>
diff --git a/drivers/video/exynos/exynos_dp_lowlevel.h b/drivers/video/exynos/exynos_dp_lowlevel.h
index c3d3aec7822d..04a1af857b1a 100644
--- a/drivers/video/exynos/exynos_dp_lowlevel.h
+++ b/drivers/video/exynos/exynos_dp_lowlevel.h
@@ -8,6 +8,7 @@
 #ifndef _EXYNOS_EDP_LOWLEVEL_H
 #define _EXYNOS_EDP_LOWLEVEL_H
 
+#include <asm/types.h>
 void exynos_dp_enable_video_bist(struct exynos_dp *dp_regs,
 				 unsigned int enable);
 void exynos_dp_enable_video_mute(struct exynos_dp *dp_regs,
diff --git a/drivers/video/exynos/exynos_fb.c b/drivers/video/exynos/exynos_fb.c
index a266b78b24ac..8ecbbadb6a5f 100644
--- a/drivers/video/exynos/exynos_fb.c
+++ b/drivers/video/exynos/exynos_fb.c
@@ -31,6 +31,7 @@
 #include <asm/arch/system.h>
 #include <asm/gpio.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/video/exynos/exynos_mipi_dsi_common.c b/drivers/video/exynos/exynos_mipi_dsi_common.c
index cf284dc24700..be4ff0c286f4 100644
--- a/drivers/video/exynos/exynos_mipi_dsi_common.c
+++ b/drivers/video/exynos/exynos_mipi_dsi_common.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <lcd.h>
 #include <log.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <asm/arch/dsim.h>
diff --git a/drivers/video/exynos/exynos_mipi_dsi_lowlevel.c b/drivers/video/exynos/exynos_mipi_dsi_lowlevel.c
index d7a8db62fa92..0ac3c92130ee 100644
--- a/drivers/video/exynos/exynos_mipi_dsi_lowlevel.c
+++ b/drivers/video/exynos/exynos_mipi_dsi_lowlevel.c
@@ -12,6 +12,7 @@
 #include <asm/arch/mipi_dsim.h>
 #include <asm/arch/power.h>
 #include <asm/arch/cpu.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 #include "exynos_mipi_dsi_lowlevel.h"
diff --git a/drivers/video/formike.c b/drivers/video/formike.c
index 14c39b65f5c7..bc332dc7205d 100644
--- a/drivers/video/formike.c
+++ b/drivers/video/formike.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <spi.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 #define TAG_READ	0x80
diff --git a/drivers/video/fsl_dcu_fb.c b/drivers/video/fsl_dcu_fb.c
index d1d553647c83..80792b9c51f6 100644
--- a/drivers/video/fsl_dcu_fb.c
+++ b/drivers/video/fsl_dcu_fb.c
@@ -22,6 +22,7 @@
 #include <video_fb.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "videomodes.h"
 
 /* Convert the X,Y resolution pair into a single number */
diff --git a/drivers/video/fsl_diu_fb.c b/drivers/video/fsl_diu_fb.c
index 3f8e357cc257..177776b3c9a4 100644
--- a/drivers/video/fsl_diu_fb.c
+++ b/drivers/video/fsl_diu_fb.c
@@ -15,6 +15,7 @@
 #include <asm/ppc.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "videomodes.h"
 #include <video_fb.h>
diff --git a/drivers/video/hitachi_tx18d42vm_lcd.c b/drivers/video/hitachi_tx18d42vm_lcd.c
index 284c65274747..bb4fa7629b40 100644
--- a/drivers/video/hitachi_tx18d42vm_lcd.c
+++ b/drivers/video/hitachi_tx18d42vm_lcd.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <malloc.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
diff --git a/drivers/video/ihs_video_out.c b/drivers/video/ihs_video_out.c
index 5b1413699f9c..9167be229484 100644
--- a/drivers/video/ihs_video_out.c
+++ b/drivers/video/ihs_video_out.c
@@ -19,6 +19,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static const uint MAX_X_CHARS = 53;
 static const uint MAX_Y_CHARS = 26;
diff --git a/drivers/video/imx/ipu_common.c b/drivers/video/imx/ipu_common.c
index 2d5f47ff4adc..79dace25948c 100644
--- a/drivers/video/imx/ipu_common.c
+++ b/drivers/video/imx/ipu_common.c
@@ -13,6 +13,7 @@
 /* #define DEBUG */
 #include <common.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <linux/delay.h>
 #include <linux/string.h>
diff --git a/drivers/video/imx/ipu_regs.h b/drivers/video/imx/ipu_regs.h
index 1e29f66e67b0..b97826b3a177 100644
--- a/drivers/video/imx/ipu_regs.h
+++ b/drivers/video/imx/ipu_regs.h
@@ -14,6 +14,7 @@
 #define __IPU_REGS_INCLUDED__
 
 #include <stdio.h>
+#include <asm/types.h>
 #define IPU_DISP0_BASE		0x00000000
 #define IPU_MCU_T_DEFAULT	8
 #define IPU_DISP1_BASE		(IPU_MCU_T_DEFAULT << 25)
diff --git a/drivers/video/imx/mxc_ipuv3_fb.c b/drivers/video/imx/mxc_ipuv3_fb.c
index 9fa4c1a98d2b..c263fab0b89b 100644
--- a/drivers/video/imx/mxc_ipuv3_fb.c
+++ b/drivers/video/imx/mxc_ipuv3_fb.c
@@ -25,6 +25,7 @@
 #include <asm/mach-imx/video.h>
 #include <malloc.h>
 #include <video_fb.h>
+#include <linux/types.h>
 #include "../videomodes.h"
 #include "ipu.h"
 #include "mxcfb.h"
diff --git a/drivers/video/ivybridge_igd.c b/drivers/video/ivybridge_igd.c
index 40a8cd1fa590..a6babd169b89 100644
--- a/drivers/video/ivybridge_igd.c
+++ b/drivers/video/ivybridge_igd.c
@@ -23,6 +23,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/video/lg4573.c b/drivers/video/lg4573.c
index b47756bb13da..f9e7e914c057 100644
--- a/drivers/video/lg4573.c
+++ b/drivers/video/lg4573.c
@@ -11,6 +11,7 @@
 #include <dm.h>
 #include <log.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <dm/read.h>
 #include <dm/uclass-internal.h>
 #include <errno.h>
diff --git a/drivers/video/logicore_dp_tx.c b/drivers/video/logicore_dp_tx.c
index fe806fd7e567..22dc8b1dc196 100644
--- a/drivers/video/logicore_dp_tx.c
+++ b/drivers/video/logicore_dp_tx.c
@@ -16,6 +16,7 @@
 #include <errno.h>
 #include <stdbool.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/string.h>
diff --git a/drivers/video/logicore_dp_tx.h b/drivers/video/logicore_dp_tx.h
index b760cad12cc5..45c449a48600 100644
--- a/drivers/video/logicore_dp_tx.h
+++ b/drivers/video/logicore_dp_tx.h
@@ -12,6 +12,7 @@
 #define __GDSYS_LOGICORE_DP_TX_H__
 
 /*
+#include <asm/types.h>
  * struct logicore_dp_tx_msa - Main Stream Attributes (MSA)
  * @pixel_clock_hz:            The pixel clock of the stream (in Hz)
  * @bits_per_color:            Number of bits per color component
diff --git a/drivers/video/logicore_dp_tx_regif.h b/drivers/video/logicore_dp_tx_regif.h
index e1affd2b67ae..e3b7f5b1c4c4 100644
--- a/drivers/video/logicore_dp_tx_regif.h
+++ b/drivers/video/logicore_dp_tx_regif.h
@@ -12,6 +12,7 @@
 #ifndef __GDSYS_LOGICORE_DP_TX_REGIF_H__
 #define __GDSYS_LOGICORE_DP_TX_REGIF_H__
 
+#include <asm/types.h>
 enum {
 	/* link configuration field */
 	REG_LINK_BW_SET =		0x000,
diff --git a/drivers/video/mali_dp.c b/drivers/video/mali_dp.c
index 1b58b355264d..7006564ead5c 100644
--- a/drivers/video/mali_dp.c
+++ b/drivers/video/mali_dp.c
@@ -25,6 +25,7 @@
 #include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define MALIDP_CORE_ID		0x0018
 #define MALIDP_REG_BG_COLOR	0x0044
diff --git a/drivers/video/mb862xx.c b/drivers/video/mb862xx.c
index 8b736f9e7375..b45e4b199ef2 100644
--- a/drivers/video/mb862xx.c
+++ b/drivers/video/mb862xx.c
@@ -11,6 +11,7 @@
 
 #include <common.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 #include <asm/io.h>
diff --git a/drivers/video/meson/meson_canvas.c b/drivers/video/meson/meson_canvas.c
index eccac2f8f24a..2ab288f08dfa 100644
--- a/drivers/video/meson/meson_canvas.c
+++ b/drivers/video/meson/meson_canvas.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <dm.h>
 #include <asm/io.h>
+#include <asm/types.h>
 
 #include "meson_vpu.h"
 
diff --git a/drivers/video/meson/meson_dw_hdmi.c b/drivers/video/meson/meson_dw_hdmi.c
index 6a2b439afb6f..46db20bed3d9 100644
--- a/drivers/video/meson/meson_dw_hdmi.c
+++ b/drivers/video/meson/meson_dw_hdmi.c
@@ -5,10 +5,12 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <display.h>
 #include <dm.h>
 #include <edid.h>
 #include <log.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <dw_hdmi.h>
 #include <dm/device-internal.h>
@@ -17,6 +19,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 #include <power/regulator.h>
 #include <clk.h>
 #include <linux/delay.h>
diff --git a/drivers/video/meson/meson_plane.c b/drivers/video/meson/meson_plane.c
index 58dd5500ad69..22a5225d69a5 100644
--- a/drivers/video/meson/meson_plane.c
+++ b/drivers/video/meson/meson_plane.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <stdbool.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/bitfield.h>
 #include <linux/bitops.h>
 
diff --git a/drivers/video/meson/meson_registers.h b/drivers/video/meson/meson_registers.h
index f6a5d1ac8ce0..be17afd83c10 100644
--- a/drivers/video/meson/meson_registers.h
+++ b/drivers/video/meson/meson_registers.h
@@ -7,6 +7,7 @@
 #define __MESON_REGISTERS_H
 
 /* Shift all registers by 2 */
+#include <asm/types.h>
 #include <linux/bitops.h>
 #define _REG(reg)	((reg) << 2)
 
diff --git a/drivers/video/meson/meson_vclk.c b/drivers/video/meson/meson_vclk.c
index dee5c90bd27f..1eba4a08bb6d 100644
--- a/drivers/video/meson/meson_vclk.c
+++ b/drivers/video/meson/meson_vclk.c
@@ -9,7 +9,9 @@
 #include <common.h>
 #include <dm.h>
 #include <edid.h>
+#include <stdbool.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/kernel.h>
 #include <linux/printk.h>
diff --git a/drivers/video/meson/meson_venc.c b/drivers/video/meson/meson_venc.c
index 166eaab4df14..d48120858e00 100644
--- a/drivers/video/meson/meson_venc.c
+++ b/drivers/video/meson/meson_venc.c
@@ -14,6 +14,7 @@
 #include <stdbool.h>
 #include <asm/io.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "meson_vpu.h"
 
 enum {
diff --git a/drivers/video/meson/meson_vpu.c b/drivers/video/meson/meson_vpu.c
index db959d996344..aae9a82698f5 100644
--- a/drivers/video/meson/meson_vpu.c
+++ b/drivers/video/meson/meson_vpu.c
@@ -13,6 +13,7 @@
 #include <fdt_support.h>
 #include <log.h>
 #include <part.h>
+#include <stdbool.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
diff --git a/drivers/video/meson/meson_vpu.h b/drivers/video/meson/meson_vpu.h
index 0a29e23093c8..d3cbd2c3850a 100644
--- a/drivers/video/meson/meson_vpu.h
+++ b/drivers/video/meson/meson_vpu.h
@@ -9,8 +9,10 @@
 #ifndef __MESON_VPU_H__
 #define __MESON_VPU_H__
 
+#include <compiler.h>
 #include <stdbool.h>
 #include <video.h>
+#include <asm/types.h>
 #include "meson_registers.h"
 
 struct display_timing;
diff --git a/drivers/video/meson/meson_vpu_init.c b/drivers/video/meson/meson_vpu_init.c
index 3f13c55ee28a..5cace830742f 100644
--- a/drivers/video/meson/meson_vpu_init.c
+++ b/drivers/video/meson/meson_vpu_init.c
@@ -13,6 +13,7 @@
 #include <stdbool.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
+#include <linux/types.h>
 
 #include "meson_vpu.h"
 
diff --git a/drivers/video/mipi_dsi.c b/drivers/video/mipi_dsi.c
index 405db2ca49aa..947c58351c4a 100644
--- a/drivers/video/mipi_dsi.c
+++ b/drivers/video/mipi_dsi.c
@@ -42,6 +42,7 @@
 #include <dm/devres.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /**
  * DOC: dsi helpers
diff --git a/drivers/video/mvebu_lcd.c b/drivers/video/mvebu_lcd.c
index 22483f182994..4fdee74049c5 100644
--- a/drivers/video/mvebu_lcd.c
+++ b/drivers/video/mvebu_lcd.c
@@ -18,6 +18,7 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <linux/types.h>
 
 #define MVEBU_LCD_WIN_CONTROL(w)	(0xf000 + ((w) << 4))
 #define MVEBU_LCD_WIN_BASE(w)		(0xf004 + ((w) << 4))
diff --git a/drivers/video/mx3fb.c b/drivers/video/mx3fb.c
index c0e0d1e5ea38..823257a74ed2 100644
--- a/drivers/video/mx3fb.c
+++ b/drivers/video/mx3fb.c
@@ -14,6 +14,7 @@
 #include <vsprintf.h>
 #include <linux/delay.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/clock.h>
diff --git a/drivers/video/mxsfb.c b/drivers/video/mxsfb.c
index 7a1fbed877ae..48c1b4c4a3a7 100644
--- a/drivers/video/mxsfb.c
+++ b/drivers/video/mxsfb.c
@@ -6,6 +6,7 @@
  */
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <dm.h>
 #include <env.h>
 #include <log.h>
@@ -21,6 +22,7 @@
 #include <video_fb.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
diff --git a/drivers/video/nexell/s5pxx18_dp.c b/drivers/video/nexell/s5pxx18_dp.c
index e857b004d914..071dddfc46d7 100644
--- a/drivers/video/nexell/s5pxx18_dp.c
+++ b/drivers/video/nexell/s5pxx18_dp.c
@@ -13,6 +13,7 @@
 #include <asm/arch/nexell.h>
 #include <asm/arch/display.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #include "soc/s5pxx18_soc_disptop.h"
 #include "soc/s5pxx18_soc_dpc.h"
diff --git a/drivers/video/nexell/s5pxx18_dp_hdmi.c b/drivers/video/nexell/s5pxx18_dp_hdmi.c
index 087cb11f916f..c388bce96fa5 100644
--- a/drivers/video/nexell/s5pxx18_dp_hdmi.c
+++ b/drivers/video/nexell/s5pxx18_dp_hdmi.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <log.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #include <asm/arch/nexell.h>
 #include <asm/arch/tieoff.h>
diff --git a/drivers/video/nexell/s5pxx18_dp_lvds.c b/drivers/video/nexell/s5pxx18_dp_lvds.c
index 72be625604bf..a3ac95e6f4ed 100644
--- a/drivers/video/nexell/s5pxx18_dp_lvds.c
+++ b/drivers/video/nexell/s5pxx18_dp_lvds.c
@@ -11,6 +11,7 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #include <asm/arch/nexell.h>
 #include <asm/arch/reset.h>
diff --git a/drivers/video/nexell/s5pxx18_dp_mipi.c b/drivers/video/nexell/s5pxx18_dp_mipi.c
index 2515add4fe76..7450d7ea556b 100644
--- a/drivers/video/nexell/s5pxx18_dp_mipi.c
+++ b/drivers/video/nexell/s5pxx18_dp_mipi.c
@@ -5,11 +5,13 @@
  * Author: junghyun, kim <jhkim@nexell.co.kr>
  */
 
+#include <compiler.h>
 #include <config.h>
 #include <common.h>
 #include <errno.h>
 #include <stdbool.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #include <asm/arch/nexell.h>
 #include <asm/arch/tieoff.h>
diff --git a/drivers/video/nexell/soc/s5pxx18_soc_lvds.h b/drivers/video/nexell/soc/s5pxx18_soc_lvds.h
index 08f8e5c406f4..e891f7756f43 100644
--- a/drivers/video/nexell/soc/s5pxx18_soc_lvds.h
+++ b/drivers/video/nexell/soc/s5pxx18_soc_lvds.h
@@ -14,6 +14,7 @@
  * #define NUMBER_OF_LVDS_MODULE 1
  * #define PHY_BASEADDR_LVDS_MODULE	0xC010A000
  */
+#include <asm/types.h>
 #define	PHY_BASEADDR_LVDS_LIST	\
 		{ PHY_BASEADDR_LVDS_MODULE }
 
diff --git a/drivers/video/nexell/soc/s5pxx18_soc_mipi.h b/drivers/video/nexell/soc/s5pxx18_soc_mipi.h
index 63751ca83fb0..56a9dc7f26c3 100644
--- a/drivers/video/nexell/soc/s5pxx18_soc_mipi.h
+++ b/drivers/video/nexell/soc/s5pxx18_soc_mipi.h
@@ -8,6 +8,7 @@
 #ifndef _S5PXX18_SOC_MIPI_H_
 #define _S5PXX18_SOC_MIPI_H_
 
+#include <linux/types.h>
 #define NUMBER_OF_MIPI_MODULE 1
 #define PHY_BASEADDR_MIPI_MODULE	0xC00D0000
 #define	PHY_BASEADDR_MIPI_LIST	\
diff --git a/drivers/video/nexell_display.c b/drivers/video/nexell_display.c
index 1592e9b46ab9..7df712d10d3b 100644
--- a/drivers/video/nexell_display.c
+++ b/drivers/video/nexell_display.c
@@ -7,6 +7,7 @@
  * Copyright (C) 2020  Stefan Bosch <stefan_b@posteo.net>
  */
 
+#include <compiler.h>
 #include <config.h>
 #include <common.h>
 #include <command.h>
@@ -23,6 +24,7 @@
 #include <asm/arch/display.h>
 #include <asm/arch/display_dev.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include "videomodes.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/video/omap3_dss.c b/drivers/video/omap3_dss.c
index 6efba122e787..0b98c31aa0d9 100644
--- a/drivers/video/omap3_dss.c
+++ b/drivers/video/omap3_dss.c
@@ -29,6 +29,7 @@
 #include <asm/io.h>
 #include <asm/arch/dss.h>
 #include <video_fb.h>
+#include <asm/types.h>
 
 /* Configure VENC for a given Mode (NTSC / PAL) */
 void omap3_dss_venc_config(const struct venc_regs *venc_cfg,
diff --git a/drivers/video/orisetech_otm8009a.c b/drivers/video/orisetech_otm8009a.c
index 8bff8e75cb85..41e483c37027 100644
--- a/drivers/video/orisetech_otm8009a.c
+++ b/drivers/video/orisetech_otm8009a.c
@@ -18,6 +18,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <power/regulator.h>
 
 #define OTM8009A_BACKLIGHT_DEFAULT	240
diff --git a/drivers/video/pwm_backlight.c b/drivers/video/pwm_backlight.c
index 45b2bc17a7ac..60052f77bc99 100644
--- a/drivers/video/pwm_backlight.c
+++ b/drivers/video/pwm_backlight.c
@@ -16,6 +16,7 @@
 #include <asm/gpio.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <power/regulator.h>
 
 /**
diff --git a/drivers/video/pxa_lcd.c b/drivers/video/pxa_lcd.c
index 79981e99707d..b13a7c7b0a79 100644
--- a/drivers/video/pxa_lcd.c
+++ b/drivers/video/pxa_lcd.c
@@ -11,6 +11,7 @@
 /************************************************************************/
 
 #include <common.h>
+#include <compiler.h>
 #include <log.h>
 #include <stdio.h>
 #include <asm/arch/pxa-regs.h>
diff --git a/drivers/video/raydium-rm68200.c b/drivers/video/raydium-rm68200.c
index 33852ec5b4ce..95cc0a3183f2 100644
--- a/drivers/video/raydium-rm68200.c
+++ b/drivers/video/raydium-rm68200.c
@@ -18,6 +18,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <power/regulator.h>
 
 /*** Manufacturer Command Set ***/
diff --git a/drivers/video/rockchip/rk3288_vop.c b/drivers/video/rockchip/rk3288_vop.c
index e1f7850040b4..dba5821654c9 100644
--- a/drivers/video/rockchip/rk3288_vop.c
+++ b/drivers/video/rockchip/rk3288_vop.c
@@ -18,6 +18,7 @@
 #include <asm/arch-rockchip/hardware.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include "rk_vop.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/video/rockchip/rk3399_vop.c b/drivers/video/rockchip/rk3399_vop.c
index db1fb8093d74..492f0c0efca2 100644
--- a/drivers/video/rockchip/rk3399_vop.c
+++ b/drivers/video/rockchip/rk3399_vop.c
@@ -15,6 +15,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include "rk_vop.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/video/rockchip/rk_edp.c b/drivers/video/rockchip/rk_edp.c
index 49fe635229d4..45145d690b1b 100644
--- a/drivers/video/rockchip/rk_edp.c
+++ b/drivers/video/rockchip/rk_edp.c
@@ -13,6 +13,7 @@
 #include <malloc.h>
 #include <panel.h>
 #include <regmap.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <syscon.h>
 #include <time.h>
@@ -27,6 +28,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define MAX_CR_LOOP 5
 #define MAX_EQ_LOOP 5
diff --git a/drivers/video/rockchip/rk_hdmi.c b/drivers/video/rockchip/rk_hdmi.c
index f27cdf8ed4b3..7607a447343e 100644
--- a/drivers/video/rockchip/rk_hdmi.c
+++ b/drivers/video/rockchip/rk_hdmi.c
@@ -18,6 +18,7 @@
 #include <asm/io.h>
 #include <asm/arch-rockchip/clock.h>
 #include <asm/arch-rockchip/hardware.h>
+#include <linux/types.h>
 #include "rk_hdmi.h"
 #include "rk_vop.h" /* for rk_vop_probe_regulators */
 
diff --git a/drivers/video/rockchip/rk_hdmi.h b/drivers/video/rockchip/rk_hdmi.h
index 5767ef14437a..82c0ada13b64 100644
--- a/drivers/video/rockchip/rk_hdmi.h
+++ b/drivers/video/rockchip/rk_hdmi.h
@@ -6,6 +6,7 @@
 #ifndef __RK_HDMI_H__
 #define __RK_HDMI_H__
 
+#include <asm/types.h>
 struct rkhdmi_driverdata {
 	/* configuration */
 	u8 i2c_clk_high;
diff --git a/drivers/video/rockchip/rk_lvds.c b/drivers/video/rockchip/rk_lvds.c
index c9890feac0f1..283905b8319a 100644
--- a/drivers/video/rockchip/rk_lvds.c
+++ b/drivers/video/rockchip/rk_lvds.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <display.h>
 #include <dm.h>
 #include <edid.h>
@@ -18,6 +19,7 @@
 #include <asm/arch-rockchip/grf_rk3288.h>
 #include <asm/arch-rockchip/hardware.h>
 #include <asm/arch-rockchip/lvds_rk3288.h>
+#include <asm/types.h>
 #include <dt-bindings/clock/rk3288-cru.h>
 #include <dt-bindings/video/rk3288.h>
 #include <linux/errno.h>
diff --git a/drivers/video/rockchip/rk_mipi.c b/drivers/video/rockchip/rk_mipi.c
index 2438d44cf3f4..cc4754ebbc10 100644
--- a/drivers/video/rockchip/rk_mipi.c
+++ b/drivers/video/rockchip/rk_mipi.c
@@ -13,6 +13,7 @@
 #include <regmap.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include "rk_mipi.h"
 #include <syscon.h>
 #include <asm/gpio.h>
diff --git a/drivers/video/rockchip/rk_mipi.h b/drivers/video/rockchip/rk_mipi.h
index 61920f23ad96..15cce849e528 100644
--- a/drivers/video/rockchip/rk_mipi.h
+++ b/drivers/video/rockchip/rk_mipi.h
@@ -7,6 +7,7 @@
 #ifndef __RK_MIPI_H
 #define __RK_MIPI_H
 
+#include <linux/types.h>
 struct rk_mipi_priv {
 	uintptr_t regs;
 	void *grf;
diff --git a/drivers/video/rockchip/rk_vop.c b/drivers/video/rockchip/rk_vop.c
index 41541ef8222f..10122b376839 100644
--- a/drivers/video/rockchip/rk_vop.c
+++ b/drivers/video/rockchip/rk_vop.c
@@ -24,6 +24,7 @@
 #include <linux/bitops.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <power/regulator.h>
 #include "rk_vop.h"
 
diff --git a/drivers/video/rockchip/rk_vop.h b/drivers/video/rockchip/rk_vop.h
index 8fa2f3893900..1ee61fad43a7 100644
--- a/drivers/video/rockchip/rk_vop.h
+++ b/drivers/video/rockchip/rk_vop.h
@@ -7,6 +7,7 @@
 #define __RK_VOP_H__
 
 #include <asm/arch-rockchip/vop_rk3288.h>
+#include <asm/types.h>
 
 struct rk_vop_priv {
 	void *grf;
diff --git a/drivers/video/sandbox_osd.c b/drivers/video/sandbox_osd.c
index ab6abae520e8..079a13b48315 100644
--- a/drivers/video/sandbox_osd.c
+++ b/drivers/video/sandbox_osd.c
@@ -10,6 +10,7 @@
 #include <video_osd.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "sandbox_osd.h"
 
diff --git a/drivers/video/scf0403_lcd.c b/drivers/video/scf0403_lcd.c
index 0d5de4c4ddae..55d0c5b2f286 100644
--- a/drivers/video/scf0403_lcd.c
+++ b/drivers/video/scf0403_lcd.c
@@ -18,6 +18,7 @@
 #include <stdio.h>
 #include <asm/gpio.h>
 #include <spi.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
 
diff --git a/drivers/video/ssd2828.c b/drivers/video/ssd2828.c
index a620a579fd73..bea5618b7702 100644
--- a/drivers/video/ssd2828.c
+++ b/drivers/video/ssd2828.c
@@ -15,6 +15,7 @@
 #include <stdio.h>
 #include <asm/arch/gpio.h>
 #include <asm/gpio.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
 
diff --git a/drivers/video/stb_truetype.h b/drivers/video/stb_truetype.h
index 93518d200ff6..02e8f8330bac 100644
--- a/drivers/video/stb_truetype.h
+++ b/drivers/video/stb_truetype.h
@@ -194,6 +194,7 @@
 // NOTES
 //
 //   The system uses the raw data found in the .ttf file without changing it
+#include <linux/types.h>
 //   and without building auxiliary data structures. This is a bit inefficient
 //   on little-endian systems (the data is big-endian), but assuming you're
 //   caching the bitmaps or glyph shapes this shouldn't be a big deal.
diff --git a/drivers/video/stm32/stm32_dsi.c b/drivers/video/stm32/stm32_dsi.c
index f58aa885f321..bc1e553006e0 100644
--- a/drivers/video/stm32/stm32_dsi.c
+++ b/drivers/video/stm32/stm32_dsi.c
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <dm.h>
 #include <dsi_host.h>
 #include <log.h>
@@ -21,6 +22,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/gpio.h>
+#include <asm/types.h>
 #include <dm/device-internal.h>
 #include <dm/device_compat.h>
 #include <dm/lists.h>
diff --git a/drivers/video/stm32/stm32_ltdc.c b/drivers/video/stm32/stm32_ltdc.c
index a763f13fe156..27cc8c4b4a7b 100644
--- a/drivers/video/stm32/stm32_ltdc.c
+++ b/drivers/video/stm32/stm32_ltdc.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <clk.h>
+#include <compiler.h>
 #include <display.h>
 #include <dm.h>
 #include <log.h>
@@ -23,6 +24,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 struct stm32_ltdc_priv {
 	void __iomem *regs;
diff --git a/drivers/video/sunxi/lcdc.c b/drivers/video/sunxi/lcdc.c
index 8814bc368145..ab236ccbc6a8 100644
--- a/drivers/video/sunxi/lcdc.c
+++ b/drivers/video/sunxi/lcdc.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <log.h>
 #include <stdbool.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 #include <asm/arch/clock.h>
diff --git a/drivers/video/sunxi/sunxi_de2.c b/drivers/video/sunxi/sunxi_de2.c
index 3586d1bd93be..24aadb2ca161 100644
--- a/drivers/video/sunxi/sunxi_de2.c
+++ b/drivers/video/sunxi/sunxi_de2.c
@@ -25,6 +25,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "simplefb_common.h"
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/video/sunxi/sunxi_display.c b/drivers/video/sunxi/sunxi_display.c
index 227b46e0b97d..7aad0ddba8f4 100644
--- a/drivers/video/sunxi/sunxi_display.c
+++ b/drivers/video/sunxi/sunxi_display.c
@@ -10,12 +10,14 @@
 #include <cpu_func.h>
 #include <efi_loader.h>
 #include <init.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <asm/arch/clock.h>
 #include <asm/arch/display.h>
diff --git a/drivers/video/sunxi/sunxi_dw_hdmi.c b/drivers/video/sunxi/sunxi_dw_hdmi.c
index b601328b6b35..b371bb8ce1f6 100644
--- a/drivers/video/sunxi/sunxi_dw_hdmi.c
+++ b/drivers/video/sunxi/sunxi_dw_hdmi.c
@@ -19,6 +19,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 struct sunxi_dw_hdmi_priv {
 	struct dw_hdmi hdmi;
diff --git a/drivers/video/sunxi/sunxi_lcd.c b/drivers/video/sunxi/sunxi_lcd.c
index 841ef4334930..63eec9fe88a1 100644
--- a/drivers/video/sunxi/sunxi_lcd.c
+++ b/drivers/video/sunxi/sunxi_lcd.c
@@ -18,6 +18,7 @@
 #include <asm/arch/lcdc.h>
 #include <asm/arch/gpio.h>
 #include <asm/gpio.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 
diff --git a/drivers/video/tda19988.c b/drivers/video/tda19988.c
index bead13f29344..96861b953d9e 100644
--- a/drivers/video/tda19988.c
+++ b/drivers/video/tda19988.c
@@ -10,6 +10,7 @@
 #include <display.h>
 #include <i2c.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/video/tegra.c b/drivers/video/tegra.c
index 2bacfa86dade..bce50d49bf79 100644
--- a/drivers/video/tegra.c
+++ b/drivers/video/tegra.c
@@ -17,6 +17,7 @@
 #include <asm/system.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 
diff --git a/drivers/video/tegra124/display.c b/drivers/video/tegra124/display.c
index bb2f46be5583..0926a385c2b9 100644
--- a/drivers/video/tegra124/display.c
+++ b/drivers/video/tegra124/display.c
@@ -27,6 +27,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include "displayport.h"
 
 /* return in 1000ths of a Hertz */
diff --git a/drivers/video/tegra124/displayport.h b/drivers/video/tegra124/displayport.h
index a3044475aeb6..f87929f81629 100644
--- a/drivers/video/tegra124/displayport.h
+++ b/drivers/video/tegra124/displayport.h
@@ -6,6 +6,7 @@
 #ifndef _TEGRA_DISPLAYPORT_H
 #define _TEGRA_DISPLAYPORT_H
 
+#include <asm/types.h>
 #include <linux/drm_dp_helper.h>
 
 struct dpaux_ctlr {
diff --git a/drivers/video/tegra124/dp.c b/drivers/video/tegra124/dp.c
index ed1f9022babf..c6f7d564e6e6 100644
--- a/drivers/video/tegra124/dp.c
+++ b/drivers/video/tegra124/dp.c
@@ -10,6 +10,7 @@
 #include <div64.h>
 #include <errno.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <video_bridge.h>
@@ -19,6 +20,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "display.h"
 #include "edid.h"
 #include "sor.h"
diff --git a/drivers/video/tegra124/sor.c b/drivers/video/tegra124/sor.c
index 17a1f75a9bf0..6ae98651cb55 100644
--- a/drivers/video/tegra124/sor.c
+++ b/drivers/video/tegra124/sor.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <panel.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <syscon.h>
 #include <time.h>
@@ -19,6 +20,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 #include "displayport.h"
 #include "sor.h"
 #include <linux/err.h>
diff --git a/drivers/video/tegra124/sor.h b/drivers/video/tegra124/sor.h
index 2fc9a38267dc..4ae14ecba313 100644
--- a/drivers/video/tegra124/sor.h
+++ b/drivers/video/tegra124/sor.h
@@ -6,6 +6,7 @@
 #ifndef _VIDEO_TEGRA124_SOR_H
 #define _VIDEO_TEGRA124_SOR_H
 
+#include <asm/types.h>
 #define SUPER_STATE0					0x1
 #define SUPER_STATE0_UPDATE_SHIFT			0
 #define SUPER_STATE0_UPDATE_DEFAULT_MASK		0x1
diff --git a/drivers/video/vesa.c b/drivers/video/vesa.c
index 9656326bdb11..a466151a85e8 100644
--- a/drivers/video/vesa.c
+++ b/drivers/video/vesa.c
@@ -10,6 +10,7 @@
 #include <vbe.h>
 #include <video.h>
 #include <asm/mtrr.h>
+#include <linux/types.h>
 
 static int vesa_video_probe(struct udevice *dev)
 {
diff --git a/drivers/video/vidconsole-uclass.c b/drivers/video/vidconsole-uclass.c
index 204828d594af..e37adf3f1283 100644
--- a/drivers/video/vidconsole-uclass.c
+++ b/drivers/video/vidconsole-uclass.c
@@ -20,6 +20,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /*
  * Structure to describe a console color
diff --git a/drivers/video/video-uclass.c b/drivers/video/video-uclass.c
index dcbe2480084d..24a68156022c 100644
--- a/drivers/video/video-uclass.c
+++ b/drivers/video/video-uclass.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <mapmem.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdio_dev.h>
 #include <time.h>
@@ -27,6 +28,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /*
  * Theory of operation:
diff --git a/drivers/video/video_bmp.c b/drivers/video/video_bmp.c
index c83f41631b69..86280235a740 100644
--- a/drivers/video/video_bmp.c
+++ b/drivers/video/video_bmp.c
@@ -5,16 +5,19 @@
 
 #include <common.h>
 #include <bmp_layout.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
 #include <mapmem.h>
 #include <splash.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <video.h>
 #include <watchdog.h>
 #include <asm/unaligned.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_VIDEO_BMP_RLE8
 #define BMP_RLE8_ESCAPE		0
diff --git a/drivers/video/video_osd-uclass.c b/drivers/video/video_osd-uclass.c
index 82136a292bf1..9ac3fe6c3854 100644
--- a/drivers/video/video_osd-uclass.c
+++ b/drivers/video/video_osd-uclass.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <video_osd.h>
+#include <linux/types.h>
 
 int video_osd_get_info(struct udevice *dev, struct video_osd_info *info)
 {
diff --git a/drivers/virtio/virtio-uclass.c b/drivers/virtio/virtio-uclass.c
index da0945b5c60a..6bb044fa72b8 100644
--- a/drivers/virtio/virtio-uclass.c
+++ b/drivers/virtio/virtio-uclass.c
@@ -22,6 +22,7 @@
 #include <virtio_types.h>
 #include <virtio.h>
 #include <vsprintf.h>
+#include <asm/types.h>
 #include <dm/lists.h>
 #include <linux/bug.h>
 #include <linux/errno.h>
diff --git a/drivers/virtio/virtio_blk.c b/drivers/virtio/virtio_blk.c
index 5117b9251260..ac55e546de3b 100644
--- a/drivers/virtio/virtio_blk.c
+++ b/drivers/virtio/virtio_blk.c
@@ -13,6 +13,7 @@
 #include <virtio_ring.h>
 #include <vsprintf.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include "virtio_blk.h"
 
 struct virtio_blk_priv {
diff --git a/drivers/virtio/virtio_blk.h b/drivers/virtio/virtio_blk.h
index 8d8e02fa2eab..700f42a543ef 100644
--- a/drivers/virtio/virtio_blk.h
+++ b/drivers/virtio/virtio_blk.h
@@ -10,6 +10,7 @@
 #define _LINUX_VIRTIO_BLK_H
 
 /* Feature bits */
+#include <compiler.h>
 #define VIRTIO_BLK_F_SIZE_MAX	1	/* Indicates maximum segment size */
 #define VIRTIO_BLK_F_SEG_MAX	2	/* Indicates maximum # of segments */
 #define VIRTIO_BLK_F_GEOMETRY	4	/* Legacy geometry available */
diff --git a/drivers/virtio/virtio_mmio.c b/drivers/virtio/virtio_mmio.c
index 42baf5c9fd2d..a824de579871 100644
--- a/drivers/virtio/virtio_mmio.c
+++ b/drivers/virtio/virtio_mmio.c
@@ -8,6 +8,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
 #include <virtio_types.h>
@@ -19,6 +20,7 @@
 #include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "virtio_mmio.h"
 
 static int virtio_mmio_get_config(struct udevice *udev, unsigned int offset,
diff --git a/drivers/virtio/virtio_mmio.h b/drivers/virtio/virtio_mmio.h
index b446674cccef..bada33535736 100644
--- a/drivers/virtio/virtio_mmio.h
+++ b/drivers/virtio/virtio_mmio.h
@@ -12,6 +12,8 @@
 /* Control registers */
 
 /* Magic value ("virt" string) - Read Only */
+#include <compiler.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #define VIRTIO_MMIO_MAGIC_VALUE		0x000
 
diff --git a/drivers/virtio/virtio_net.c b/drivers/virtio/virtio_net.c
index d20ea6325f4d..8e03fb396a86 100644
--- a/drivers/virtio/virtio_net.c
+++ b/drivers/virtio/virtio_net.c
@@ -7,12 +7,14 @@
 #include <common.h>
 #include <dm.h>
 #include <net.h>
+#include <stdbool.h>
 #include <virtio_types.h>
 #include <virtio.h>
 #include <virtio_ring.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "virtio_net.h"
 
 /* Amount of buffers to keep in the RX virtqueue */
diff --git a/drivers/virtio/virtio_net.h b/drivers/virtio/virtio_net.h
index c92bae526906..07001d8c9331 100644
--- a/drivers/virtio/virtio_net.h
+++ b/drivers/virtio/virtio_net.h
@@ -10,6 +10,7 @@
 #define _LINUX_VIRTIO_NET_H
 
 /* TODO: needs to be removed! */
+#include <compiler.h>
 #define ETH_ALEN				6
 
 /* The feature bitmap for virtio net */
diff --git a/drivers/virtio/virtio_pci.h b/drivers/virtio/virtio_pci.h
index cc753ed7b3d6..e79520468845 100644
--- a/drivers/virtio/virtio_pci.h
+++ b/drivers/virtio/virtio_pci.h
@@ -69,6 +69,7 @@
 #endif /* VIRTIO_PCI_NO_LEGACY */
 
 /* The bit of the ISR which indicates a device configuration change */
+#include <linux/types.h>
 #define VIRTIO_PCI_ISR_CONFIG		0x2
 /* Vector value used to disable MSI for queue */
 #define VIRTIO_MSI_NO_VECTOR		0xffff
diff --git a/drivers/virtio/virtio_pci_legacy.c b/drivers/virtio/virtio_pci_legacy.c
index bef5dd1ca3cc..a92068b795da 100644
--- a/drivers/virtio/virtio_pci_legacy.c
+++ b/drivers/virtio/virtio_pci_legacy.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
 #include <stdio.h>
@@ -20,6 +21,7 @@
 #include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/io.h>
+#include <linux/types.h>
 #include "virtio_pci.h"
 
 #define VIRTIO_PCI_DRV_NAME	"virtio-pci.l"
diff --git a/drivers/virtio/virtio_pci_modern.c b/drivers/virtio/virtio_pci_modern.c
index 9edb271e929a..1ebb7f2e8999 100644
--- a/drivers/virtio/virtio_pci_modern.c
+++ b/drivers/virtio/virtio_pci_modern.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
 #include <stdio.h>
@@ -22,6 +23,7 @@
 #include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "virtio_pci.h"
 
 #define VIRTIO_PCI_DRV_NAME	"virtio-pci.m"
diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c
index a5dbb0dd7f8d..97893f49a5c8 100644
--- a/drivers/virtio/virtio_ring.c
+++ b/drivers/virtio/virtio_ring.c
@@ -19,6 +19,7 @@
 #include <linux/compat.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 int virtqueue_add(struct virtqueue *vq, struct virtio_sg *sgs[],
 		  unsigned int out_sgs, unsigned int in_sgs)
diff --git a/drivers/virtio/virtio_rng.c b/drivers/virtio/virtio_rng.c
index dadaaa449ce1..0d39ea057c13 100644
--- a/drivers/virtio/virtio_rng.c
+++ b/drivers/virtio/virtio_rng.c
@@ -12,6 +12,7 @@
 #include <virtio_ring.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define BUFFER_SIZE	16UL
 
diff --git a/drivers/virtio/virtio_sandbox.c b/drivers/virtio/virtio_sandbox.c
index 8fb04b8b39ec..4c6c8653e74a 100644
--- a/drivers/virtio/virtio_sandbox.c
+++ b/drivers/virtio/virtio_sandbox.c
@@ -16,6 +16,7 @@
 #include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/io.h>
+#include <linux/types.h>
 
 struct virtio_sandbox_priv {
 	u8 id;
diff --git a/drivers/w1-eeprom/ds24xxx.c b/drivers/w1-eeprom/ds24xxx.c
index 0967accdf009..23e7a573f5da 100644
--- a/drivers/w1-eeprom/ds24xxx.c
+++ b/drivers/w1-eeprom/ds24xxx.c
@@ -8,6 +8,7 @@
  */
 
 #include <common.h>
+#include <asm/types.h>
 #include <linux/err.h>
 #include <dm.h>
 #include <w1-eeprom.h>
diff --git a/drivers/w1-eeprom/ds2502.c b/drivers/w1-eeprom/ds2502.c
index 167351055afd..c1f2055681e9 100644
--- a/drivers/w1-eeprom/ds2502.c
+++ b/drivers/w1-eeprom/ds2502.c
@@ -22,6 +22,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <asm/types.h>
 #include <dm/device_compat.h>
 #include <linux/err.h>
 #include <w1-eeprom.h>
diff --git a/drivers/w1-eeprom/eep_sandbox.c b/drivers/w1-eeprom/eep_sandbox.c
index 86c02b9b915b..53a46a58d51b 100644
--- a/drivers/w1-eeprom/eep_sandbox.c
+++ b/drivers/w1-eeprom/eep_sandbox.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <asm/types.h>
 #include <linux/err.h>
 #include <dm.h>
 #include <w1-eeprom.h>
diff --git a/drivers/w1-eeprom/w1-eeprom-uclass.c b/drivers/w1-eeprom/w1-eeprom-uclass.c
index 07e1c12e5ce8..85cf10637f6c 100644
--- a/drivers/w1-eeprom/w1-eeprom-uclass.c
+++ b/drivers/w1-eeprom/w1-eeprom-uclass.c
@@ -16,6 +16,7 @@
 #include <stdio.h>
 #include <w1.h>
 #include <w1-eeprom.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 
 #include <dm/device-internal.h>
diff --git a/drivers/w1/mxc_w1.c b/drivers/w1/mxc_w1.c
index 44047ea2bfe2..949d9535c450 100644
--- a/drivers/w1/mxc_w1.c
+++ b/drivers/w1/mxc_w1.c
@@ -21,6 +21,7 @@
 #include <asm/arch/clock.h>
 #include <common.h>
 #include <dm.h>
+#include <asm/types.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/drivers/w1/w1-gpio.c b/drivers/w1/w1-gpio.c
index b54f169adfbf..ada30f181431 100644
--- a/drivers/w1/w1-gpio.c
+++ b/drivers/w1/w1-gpio.c
@@ -13,6 +13,7 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include <w1.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 
 #include <asm/gpio.h>
diff --git a/drivers/w1/w1-uclass.c b/drivers/w1/w1-uclass.c
index 9b9913a90d00..d94408234b39 100644
--- a/drivers/w1/w1-uclass.c
+++ b/drivers/w1/w1-uclass.c
@@ -17,6 +17,7 @@
 #include <stdio.h>
 #include <w1.h>
 #include <w1-eeprom.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 
 #include <dm/device-internal.h>
diff --git a/drivers/watchdog/armada-37xx-wdt.c b/drivers/watchdog/armada-37xx-wdt.c
index b845e2b2e3d9..e27e0c02711c 100644
--- a/drivers/watchdog/armada-37xx-wdt.c
+++ b/drivers/watchdog/armada-37xx-wdt.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <wdt.h>
 #include <asm/global_data.h>
@@ -14,6 +15,7 @@
 #include <asm/arch/soc.h>
 #include <dm/device_compat.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/watchdog/ast_wdt.c b/drivers/watchdog/ast_wdt.c
index 0f858b181c33..b483ba05c304 100644
--- a/drivers/watchdog/ast_wdt.c
+++ b/drivers/watchdog/ast_wdt.c
@@ -12,6 +12,7 @@
 #include <asm/arch/wdt.h>
 #include <linux/err.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #define WDT_AST2500	2500
 #define WDT_AST2400	2400
diff --git a/drivers/watchdog/at91sam9_wdt.c b/drivers/watchdog/at91sam9_wdt.c
index ad602a8eb342..02d020cdaab2 100644
--- a/drivers/watchdog/at91sam9_wdt.c
+++ b/drivers/watchdog/at91sam9_wdt.c
@@ -26,6 +26,7 @@
 #include <wdt.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/watchdog/bcm6345_wdt.c b/drivers/watchdog/bcm6345_wdt.c
index 5999561efd22..ffdd29204ffc 100644
--- a/drivers/watchdog/bcm6345_wdt.c
+++ b/drivers/watchdog/bcm6345_wdt.c
@@ -8,12 +8,14 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <log.h>
 #include <wdt.h>
 #include <clk.h>
 #include <asm/io.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 /* WDT Value register */
 #define WDT_VAL_REG		0x0
diff --git a/drivers/watchdog/cdns_wdt.c b/drivers/watchdog/cdns_wdt.c
index a7f9095e2cda..34b26822e95d 100644
--- a/drivers/watchdog/cdns_wdt.c
+++ b/drivers/watchdog/cdns_wdt.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <stdbool.h>
 #include <wdt.h>
 #include <clk.h>
 #include <div64.h>
@@ -16,6 +17,7 @@
 #include <linux/err.h>
 #include <linux/io.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 struct cdns_regs {
 	u32 zmr;	/* WD Zero mode register, offset - 0x0 */
diff --git a/drivers/watchdog/cortina_wdt.c b/drivers/watchdog/cortina_wdt.c
index 0f60b3a63220..a362a5c020d1 100644
--- a/drivers/watchdog/cortina_wdt.c
+++ b/drivers/watchdog/cortina_wdt.c
@@ -5,12 +5,14 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <hang.h>
 #include <asm/io.h>
 #include <wdt.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #define CA_WDT_CTRL		0x00
 #define CA_WDT_PS		0x04
diff --git a/drivers/watchdog/designware_wdt.c b/drivers/watchdog/designware_wdt.c
index 06783650bed7..5a3ae6001c33 100644
--- a/drivers/watchdog/designware_wdt.c
+++ b/drivers/watchdog/designware_wdt.c
@@ -5,6 +5,7 @@
 
 #include <clk.h>
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <reset.h>
 #include <wdt.h>
@@ -13,6 +14,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #define DW_WDT_CR	0x00
 #define DW_WDT_TORR	0x04
diff --git a/drivers/watchdog/imx_watchdog.c b/drivers/watchdog/imx_watchdog.c
index d36b8b14931f..444796a6e2c5 100644
--- a/drivers/watchdog/imx_watchdog.c
+++ b/drivers/watchdog/imx_watchdog.c
@@ -5,9 +5,11 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <dm.h>
 #include <hang.h>
+#include <stdbool.h>
 #include <asm/io.h>
 #include <wdt.h>
 #include <watchdog.h>
@@ -19,6 +21,7 @@
 #include <div64.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #define TIMEOUT_MAX	128000
 #define TIMEOUT_MIN	500
diff --git a/drivers/watchdog/mpc8xx_wdt.c b/drivers/watchdog/mpc8xx_wdt.c
index 1640cd46bb7a..0ea1603ca821 100644
--- a/drivers/watchdog/mpc8xx_wdt.c
+++ b/drivers/watchdog/mpc8xx_wdt.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <env.h>
 #include <dm.h>
 #include <wdt.h>
@@ -13,6 +14,7 @@
 #include <asm/ppc.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 void hw_watchdog_reset(void)
 {
diff --git a/drivers/watchdog/mt7621_wdt.c b/drivers/watchdog/mt7621_wdt.c
index d033d95b6f5f..f90373bdcaa2 100644
--- a/drivers/watchdog/mt7621_wdt.c
+++ b/drivers/watchdog/mt7621_wdt.c
@@ -10,12 +10,14 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <wdt.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/io.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/watchdog/mtk_wdt.c b/drivers/watchdog/mtk_wdt.c
index 2a38bef43ec6..41bd000a092b 100644
--- a/drivers/watchdog/mtk_wdt.c
+++ b/drivers/watchdog/mtk_wdt.c
@@ -7,12 +7,14 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <hang.h>
 #include <wdt.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #define MTK_WDT_MODE			0x00
 #define MTK_WDT_LENGTH			0x04
diff --git a/drivers/watchdog/omap_wdt.c b/drivers/watchdog/omap_wdt.c
index 9d3896a5d990..8da65d784643 100644
--- a/drivers/watchdog/omap_wdt.c
+++ b/drivers/watchdog/omap_wdt.c
@@ -47,6 +47,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 /* Hardware timeout in seconds */
 #define WDT_HW_TIMEOUT 60
diff --git a/drivers/watchdog/orion_wdt.c b/drivers/watchdog/orion_wdt.c
index 804a76811070..4ec584dcf007 100644
--- a/drivers/watchdog/orion_wdt.c
+++ b/drivers/watchdog/orion_wdt.c
@@ -13,9 +13,11 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <clk.h>
 #include <log.h>
+#include <stdbool.h>
 #include <wdt.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
@@ -24,6 +26,7 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/watchdog/sandbox_wdt.c b/drivers/watchdog/sandbox_wdt.c
index e05d82789f65..729f59dcc38c 100644
--- a/drivers/watchdog/sandbox_wdt.c
+++ b/drivers/watchdog/sandbox_wdt.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <wdt.h>
 #include <asm/state.h>
+#include <linux/types.h>
 
 static int sandbox_wdt_start(struct udevice *dev, u64 timeout, ulong flags)
 {
diff --git a/drivers/watchdog/sbsa_gwdt.c b/drivers/watchdog/sbsa_gwdt.c
index 1e44df1da293..cc3fbfceada6 100644
--- a/drivers/watchdog/sbsa_gwdt.c
+++ b/drivers/watchdog/sbsa_gwdt.c
@@ -5,6 +5,7 @@
  * Copyright 2020 NXP
  */
 
+#include <compiler.h>
 #include <time.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
@@ -16,6 +17,7 @@
 #include <linux/err.h>
 #include <watchdog.h>
 #include <wdt.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/watchdog/sp805_wdt.c b/drivers/watchdog/sp805_wdt.c
index 0eea0ab388ec..aee2fe7ad278 100644
--- a/drivers/watchdog/sp805_wdt.c
+++ b/drivers/watchdog/sp805_wdt.c
@@ -5,6 +5,7 @@
  * Copyright 2019 NXP
  */
 
+#include <compiler.h>
 #include <log.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
@@ -17,6 +18,7 @@
 #include <watchdog.h>
 #include <wdt.h>
 #include <linux/err.h>
+#include <linux/types.h>
 
 #define WDTLOAD			0x000
 #define WDTCONTROL		0x008
diff --git a/drivers/watchdog/stm32mp_wdt.c b/drivers/watchdog/stm32mp_wdt.c
index c45dbdc9bdbd..cb103988b62f 100644
--- a/drivers/watchdog/stm32mp_wdt.c
+++ b/drivers/watchdog/stm32mp_wdt.c
@@ -14,6 +14,7 @@
 #include <linux/errno.h>
 #include <linux/iopoll.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 /* IWDG registers */
 #define IWDG_KR		0x00	/* Key register */
diff --git a/drivers/watchdog/tangier_wdt.c b/drivers/watchdog/tangier_wdt.c
index 050e97f392a2..59ec86864d83 100644
--- a/drivers/watchdog/tangier_wdt.c
+++ b/drivers/watchdog/tangier_wdt.c
@@ -9,6 +9,7 @@
 #include <div64.h>
 #include <asm/scu.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 /* Hardware timeout in seconds */
 #define WDT_PRETIMEOUT		15
diff --git a/drivers/watchdog/ulp_wdog.c b/drivers/watchdog/ulp_wdog.c
index 7533fc612c79..8630f43ed62d 100644
--- a/drivers/watchdog/ulp_wdog.c
+++ b/drivers/watchdog/ulp_wdog.c
@@ -7,6 +7,7 @@
 #include <cpu_func.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
+#include <linux/types.h>
 
 /*
  * MX7ULP WDOG Register Map
diff --git a/drivers/watchdog/wdt-uclass.c b/drivers/watchdog/wdt-uclass.c
index e2791a0dba0d..0b5dca248517 100644
--- a/drivers/watchdog/wdt-uclass.c
+++ b/drivers/watchdog/wdt-uclass.c
@@ -15,6 +15,7 @@
 #include <dm/device-internal.h>
 #include <dm/lists.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/watchdog/xilinx_tb_wdt.c b/drivers/watchdog/xilinx_tb_wdt.c
index 5047cd045615..a5dd4092ea2a 100644
--- a/drivers/watchdog/xilinx_tb_wdt.c
+++ b/drivers/watchdog/xilinx_tb_wdt.c
@@ -11,10 +11,12 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <stdbool.h>
 #include <wdt.h>
 #include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/io.h>
+#include <linux/types.h>
 
 #define XWT_CSR0_WRS_MASK	0x00000008 /* Reset status Mask */
 #define XWT_CSR0_WDS_MASK	0x00000004 /* Timer state Mask */
diff --git a/drivers/watchdog/xilinx_wwdt.c b/drivers/watchdog/xilinx_wwdt.c
index b688ebf09384..0c8211cebf4d 100644
--- a/drivers/watchdog/xilinx_wwdt.c
+++ b/drivers/watchdog/xilinx_wwdt.c
@@ -17,6 +17,7 @@
 #include <linux/compat.h>
 #include <linux/errno.h>
 #include <linux/io.h>
+#include <linux/types.h>
 
 /* Refresh Register Masks */
 #define XWT_WWREF_GWRR_MASK	BIT(0) /* Refresh and start new period */
diff --git a/env/common.c b/env/common.c
index 7b0a7b38e24b..14dc646af772 100644
--- a/env/common.c
+++ b/env/common.c
@@ -24,6 +24,7 @@
 #include <errno.h>
 #include <malloc.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <u-boot/crc.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/env/eeprom.c b/env/eeprom.c
index ba168014e248..71c70ed826d9 100644
--- a/env/eeprom.c
+++ b/env/eeprom.c
@@ -14,6 +14,7 @@
 #include <env_internal.h>
 #include <asm/global_data.h>
 #include <linux/stddef.h>
+#include <linux/types.h>
 #include <u-boot/crc.h>
 #if defined(CONFIG_I2C_ENV_EEPROM_BUS)
 #include <i2c.h>
diff --git a/env/env.c b/env/env.c
index e1a36b658fcb..569cba369748 100644
--- a/env/env.c
+++ b/env/env.c
@@ -5,15 +5,18 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <env.h>
 #include <env_internal.h>
 #include <log.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/bug.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/env/ext4.c b/env/ext4.c
index 59ed02c0ca17..6dd77d784132 100644
--- a/env/ext4.c
+++ b/env/ext4.c
@@ -19,10 +19,12 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <part.h>
 #include <stdio.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <command.h>
 #include <env.h>
diff --git a/env/fat.c b/env/fat.c
index c4c09fee02be..b65ecee620c6 100644
--- a/env/fat.c
+++ b/env/fat.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <env.h>
 #include <env_internal.h>
 #include <part.h>
@@ -22,6 +23,7 @@
 #include <linux/errno.h>
 #include <linux/stddef.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_SPL_BUILD
 /* TODO(sjg at chromium.org): Figure out why this is needed */
diff --git a/env/flags.c b/env/flags.c
index 8cd03336a3f1..feaddce95367 100644
--- a/env/flags.c
+++ b/env/flags.c
@@ -5,6 +5,7 @@
  */
 
 #include <env.h>
+#include <stdbool.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/ctype.h>
diff --git a/env/flash.c b/env/flash.c
index 7e355d227267..a8ee4c316163 100644
--- a/env/flash.c
+++ b/env/flash.c
@@ -22,6 +22,7 @@
 #include <search.h>
 #include <errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <u-boot/crc.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/env/mmc.c b/env/mmc.c
index 009a79ac00ce..64a2eb0c9a69 100644
--- a/env/mmc.c
+++ b/env/mmc.c
@@ -6,12 +6,14 @@
 /* #define DEBUG */
 
 #include <common.h>
+#include <compiler.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <command.h>
 #include <env.h>
diff --git a/env/nand.c b/env/nand.c
index 18d43c0503a8..5f42b38cc7e3 100644
--- a/env/nand.c
+++ b/env/nand.c
@@ -27,6 +27,7 @@
 #include <nand.h>
 #include <search.h>
 #include <errno.h>
+#include <linux/types.h>
 #include <u-boot/crc.h>
 
 #if defined(CONFIG_CMD_SAVEENV) && defined(CONFIG_CMD_NAND) && \
diff --git a/env/nowhere.c b/env/nowhere.c
index 23028661084c..600e648f935e 100644
--- a/env/nowhere.c
+++ b/env/nowhere.c
@@ -13,6 +13,7 @@
 #include <env_internal.h>
 #include <asm/global_data.h>
 #include <linux/stddef.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/env/nvram.c b/env/nvram.c
index 7af5c4cf4b8f..3d7b7fe15240 100644
--- a/env/nvram.c
+++ b/env/nvram.c
@@ -32,6 +32,7 @@
 #include <search.h>
 #include <errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <u-boot/crc.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/env/onenand.c b/env/onenand.c
index 8ef4ca7535eb..4782d70fd913 100644
--- a/env/onenand.c
+++ b/env/onenand.c
@@ -17,6 +17,7 @@
 #include <search.h>
 #include <errno.h>
 #include <onenand_uboot.h>
+#include <linux/types.h>
 
 #include <linux/compat.h>
 #include <linux/mtd/mtd.h>
diff --git a/env/remote.c b/env/remote.c
index 0d0261767944..2557a046b392 100644
--- a/env/remote.c
+++ b/env/remote.c
@@ -12,6 +12,7 @@
 #include <asm/global_data.h>
 #include <linux/errno.h>
 #include <linux/stddef.h>
+#include <linux/types.h>
 #include <u-boot/crc.h>
 
 #ifdef ENV_IS_EMBEDDED
diff --git a/env/sata.c b/env/sata.c
index a4af49ed8e2b..367a686865b3 100644
--- a/env/sata.c
+++ b/env/sata.c
@@ -6,9 +6,11 @@
 /* #define DEBUG */
 
 #include <common.h>
+#include <compiler.h>
 #include <stdio.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include <command.h>
 #include <env.h>
diff --git a/env/sf.c b/env/sf.c
index 6f874f43986f..522baec7e27e 100644
--- a/env/sf.c
+++ b/env/sf.c
@@ -9,6 +9,7 @@
  * (C) Copyright 2008 Atmel Corporation
  */
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <env.h>
 #include <env_internal.h>
@@ -25,6 +26,7 @@
 #include <dm/device-internal.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include <u-boot/crc.h>
 
 #ifndef CONFIG_SPL_BUILD
diff --git a/examples/api/glue.c b/examples/api/glue.c
index c90765e8d285..aa287e8832f8 100644
--- a/examples/api/glue.c
+++ b/examples/api/glue.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <env.h>
 #include <linux/string.h>
 #include <linux/types.h>
diff --git a/examples/api/glue.h b/examples/api/glue.h
index f9745604b6c2..37ed9d308787 100644
--- a/examples/api/glue.h
+++ b/examples/api/glue.h
@@ -12,6 +12,7 @@
 #ifndef _API_GLUE_H_
 #define _API_GLUE_H_
 
+#include <linux/types.h>
 #define API_SEARCH_LEN		(3 * 1024 * 1024)	/* 3MB search range */
 
 #define UB_MAX_MR	5	/* max mem regions number */
diff --git a/examples/standalone/atmel_df_pow2.c b/examples/standalone/atmel_df_pow2.c
index 9e4e883d9d22..62ef34a0ce56 100644
--- a/examples/standalone/atmel_df_pow2.c
+++ b/examples/standalone/atmel_df_pow2.c
@@ -13,6 +13,7 @@
 #include <vsprintf.h>
 #include <linux/delay.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define CMD_ID    0x9f
 #define CMD_STAT  0xd7
diff --git a/examples/standalone/sched.c b/examples/standalone/sched.c
index 0d734e7c9df5..d58509e095a3 100644
--- a/examples/standalone/sched.c
+++ b/examples/standalone/sched.c
@@ -3,6 +3,7 @@
 #include <common.h>
 #include <exports.h>
 #include <stdio.h>
+#include <linux/types.h>
 
 /*
  * Author: Arun Dharankar <ADharankar@ATTBI.Com>
diff --git a/fs/btrfs/btrfs.c b/fs/btrfs/btrfs.c
index 9b9f9b5ffa34..6a8adfb79369 100644
--- a/fs/btrfs/btrfs.c
+++ b/fs/btrfs/btrfs.c
@@ -10,6 +10,7 @@
 #include <malloc.h>
 #include <uuid.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/time.h>
 
 struct btrfs_info btrfs_info;
diff --git a/fs/btrfs/btrfs.h b/fs/btrfs/btrfs.h
index 25a8cf6a8792..0bfd8dca93c8 100644
--- a/fs/btrfs/btrfs.h
+++ b/fs/btrfs/btrfs.h
@@ -9,6 +9,7 @@
 #define __BTRFS_BTRFS_H__
 
 #include <linux/rbtree.h>
+#include <linux/types.h>
 #include "conv-funcs.h"
 
 struct btrfs_info {
diff --git a/fs/btrfs/btrfs_tree.h b/fs/btrfs/btrfs_tree.h
index aa0f3d6c86dd..4d70ef3af645 100644
--- a/fs/btrfs/btrfs_tree.h
+++ b/fs/btrfs/btrfs_tree.h
@@ -7,6 +7,7 @@
 #define __BTRFS_BTRFS_TREE_H__
 
 #include <common.h>
+#include <compiler.h>
 
 #define BTRFS_VOL_NAME_MAX 255
 #define BTRFS_NAME_MAX 255
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index 65c152a52fcf..3c164c902e8f 100644
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -11,6 +11,7 @@
 
 #include <common.h>
 #include <compiler.h>
+#include <asm/types.h>
 #include "btrfs_tree.h"
 
 #define BTRFS_MAGIC 0x4D5F53665248425FULL /* ascii _BHRfS_M, no null */
diff --git a/fs/btrfs/subvolume.c b/fs/btrfs/subvolume.c
index bc488183cd34..51fe7f9d8a9b 100644
--- a/fs/btrfs/subvolume.c
+++ b/fs/btrfs/subvolume.c
@@ -9,6 +9,7 @@
 #include <malloc.h>
 #include <stdio.h>
 #include <linux/kernel.h>
+
 static int get_subvol_name(u64 subvolid, char *name, int max_len)
 {
 	struct btrfs_root_ref rref;
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index 41f2193d51c9..e50ddfcba977 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -13,6 +13,7 @@
 #include <linux/compat.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "btrfs.h"
 
 #define BTRFS_SUPER_FLAG_SUPP	(BTRFS_HEADER_FLAG_WRITTEN	\
diff --git a/fs/cbfs/cbfs.c b/fs/cbfs/cbfs.c
index 3f4899101801..524d8ed6cadc 100644
--- a/fs/cbfs/cbfs.c
+++ b/fs/cbfs/cbfs.c
@@ -11,6 +11,7 @@
 #include <asm/byteorder.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /* Offset of master header from the start of a coreboot ROM */
 #define MASTER_HDR_OFFSET	0x38
diff --git a/fs/cramfs/cramfs.c b/fs/cramfs/cramfs.c
index 12fab86e4706..76a929d7bc8d 100644
--- a/fs/cramfs/cramfs.c
+++ b/fs/cramfs/cramfs.c
@@ -34,6 +34,7 @@
 #include <jffs2/load_kernel.h>
 #include <cramfs/cramfs_fs.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /* These two macros may change in future, to provide better st_ino
    semantics. */
diff --git a/fs/ext4/dev.c b/fs/ext4/dev.c
index 168443de1ff7..71b42bddcb60 100644
--- a/fs/ext4/dev.c
+++ b/fs/ext4/dev.c
@@ -28,6 +28,7 @@
 #include <fs_internal.h>
 #include <ext4fs.h>
 #include <ext_common.h>
+#include <linux/types.h>
 #include "ext4_common.h"
 #include <log.h>
 
diff --git a/fs/ext4/ext4_common.c b/fs/ext4/ext4_common.c
index 8d1cec27cb76..d8f2bb7bdada 100644
--- a/fs/ext4/ext4_common.c
+++ b/fs/ext4/ext4_common.c
@@ -34,6 +34,7 @@
 #include <linux/string.h>
 #include <linux/time.h>
 #include <asm/byteorder.h>
+#include <linux/types.h>
 #include "ext4_common.h"
 
 struct ext2_data *ext4fs_root;
diff --git a/fs/ext4/ext4_common.h b/fs/ext4/ext4_common.h
index 1314cf20df89..10167278558d 100644
--- a/fs/ext4/ext4_common.h
+++ b/fs/ext4/ext4_common.h
@@ -30,6 +30,7 @@
 #include "crc16.h"
 #endif
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define YES		1
 #define NO		0
diff --git a/fs/ext4/ext4_journal.c b/fs/ext4/ext4_journal.c
index ad967d39f950..75b54902c249 100644
--- a/fs/ext4/ext4_journal.c
+++ b/fs/ext4/ext4_journal.c
@@ -5,6 +5,7 @@
  * Uma Shankar <uma.shankar@samsung.com>
  * Manjunatha C Achar <a.manjunatha@samsung.com>
  *
+#include <linux/types.h>
  * Journal data structures and headers for Journaling feature of ext4
  * have been referred from JBD2 (Journaling Block device 2)
  * implementation in Linux Kernel.
diff --git a/fs/ext4/ext4_journal.h b/fs/ext4/ext4_journal.h
index 8c974cff609d..bc1cfc77d1a4 100644
--- a/fs/ext4/ext4_journal.h
+++ b/fs/ext4/ext4_journal.h
@@ -5,6 +5,7 @@
  * Uma Shankar <uma.shankar@samsung.com>
  * Manjunatha C Achar <a.manjunatha@samsung.com>
  *
+#include <linux/types.h>
  * Journal data structures and headers for Journaling feature of ext4
  * have been referred from JBD2 (Journaling Block device 2)
  * implementation in Linux Kernel.
diff --git a/fs/ext4/ext4_write.c b/fs/ext4/ext4_write.c
index 933e8b19b1b5..e6d0d4372ad2 100644
--- a/fs/ext4/ext4_write.c
+++ b/fs/ext4/ext4_write.c
@@ -27,12 +27,14 @@
 #include <malloc.h>
 #include <memalign.h>
 #include <part.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/stat.h>
 #include <div64.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "ext4_common.h"
 
 static inline void ext4fs_sb_free_inodes_inc(struct ext2_sblock *sb)
diff --git a/fs/ext4/ext4fs.c b/fs/ext4/ext4fs.c
index 8143079b8b01..a4fa61803f6f 100644
--- a/fs/ext4/ext4fs.c
+++ b/fs/ext4/ext4fs.c
@@ -31,6 +31,7 @@
 #include <uuid.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "ext4_common.h"
 
 int ext4fs_symlinknest;
diff --git a/fs/fat/fat.c b/fs/fat/fat.c
index af202cfe9053..bd1e54a0faa1 100644
--- a/fs/fat/fat.c
+++ b/fs/fat/fat.c
@@ -26,6 +26,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /*
  * Convert a string to lowercase.  Converts at most 'len' characters,
diff --git a/fs/fat/fat_write.c b/fs/fat/fat_write.c
index 7da319365420..eee83fa5a6ee 100644
--- a/fs/fat/fat_write.c
+++ b/fs/fat/fat_write.c
@@ -21,6 +21,7 @@
 #include <linux/kernel.h>
 #include <linux/math64.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "fat.c"
 
 static void uppercase(char *str, int len)
diff --git a/fs/fs.c b/fs/fs.c
index c657f92afb51..c648e27ab83c 100644
--- a/fs/fs.c
+++ b/fs/fs.c
@@ -17,6 +17,7 @@
 #include <fat.h>
 #include <fs.h>
 #include <sandboxfs.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <ubifs_uboot.h>
@@ -31,6 +32,7 @@
 #include <efi_loader.h>
 #include <squashfs.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/fs/fs_internal.c b/fs/fs_internal.c
index b626ffaecbed..8f3aa8d4f05a 100644
--- a/fs/fs_internal.c
+++ b/fs/fs_internal.c
@@ -12,6 +12,7 @@
 #include <part.h>
 #include <memalign.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
 
diff --git a/fs/jffs2/compr_lzo.c b/fs/jffs2/compr_lzo.c
index da9a17ecaf66..dfc2be41cc94 100644
--- a/fs/jffs2/compr_lzo.c
+++ b/fs/jffs2/compr_lzo.c
@@ -22,6 +22,7 @@
    Original copyright notice follows:
 
    lzo1x_9x.c -- implementation of the LZO1X-999 compression algorithm
+#include <linux/types.h>
    lzo_ptr.h -- low-level pointer constructs
    lzo_swd.ch -- sliding window dictionary
    lzoconf.h -- configuration for the LZO real-time data compression library
diff --git a/fs/jffs2/compr_rtime.c b/fs/jffs2/compr_rtime.c
index 89b9f2f13eb8..114880dee276 100644
--- a/fs/jffs2/compr_rtime.c
+++ b/fs/jffs2/compr_rtime.c
@@ -46,6 +46,7 @@
  */
 
 #include <config.h>
+#include <asm/types.h>
 #include <jffs2/jffs2.h>
 
 void rtime_decompress(unsigned char *data_in, unsigned char *cpage_out,
diff --git a/fs/jffs2/compr_rubin.c b/fs/jffs2/compr_rubin.c
index 9ff221773826..521ebe23e2fd 100644
--- a/fs/jffs2/compr_rubin.c
+++ b/fs/jffs2/compr_rubin.c
@@ -39,6 +39,7 @@
  */
 
 #include <config.h>
+#include <asm/types.h>
 #include <jffs2/jffs2.h>
 #include <jffs2/compr_rubin.h>
 
diff --git a/fs/jffs2/jffs2_1pass.c b/fs/jffs2/jffs2_1pass.c
index 40e8ff663771..34ec95f03043 100644
--- a/fs/jffs2/jffs2_1pass.c
+++ b/fs/jffs2/jffs2_1pass.c
@@ -122,6 +122,7 @@
 #include <linux/stat.h>
 #include <linux/string.h>
 #include <linux/time.h>
+#include <linux/types.h>
 #include <u-boot/crc.h>
 #include <watchdog.h>
 #include <jffs2/jffs2.h>
diff --git a/fs/jffs2/jffs2_private.h b/fs/jffs2/jffs2_private.h
index 65d19a76f97c..3f5dcd514e09 100644
--- a/fs/jffs2/jffs2_private.h
+++ b/fs/jffs2/jffs2_private.h
@@ -1,6 +1,7 @@
 #ifndef jffs2_private_h
 #define jffs2_private_h
 
+#include <asm/types.h>
 #include <jffs2/jffs2.h>
 
 
diff --git a/fs/jffs2/summary.h b/fs/jffs2/summary.h
index 834933cd1584..739fc7951e7b 100644
--- a/fs/jffs2/summary.h
+++ b/fs/jffs2/summary.h
@@ -13,6 +13,7 @@
 #ifndef JFFS2_SUMMARY_H
 #define JFFS2_SUMMARY_H
 
+#include <linux/types.h>
 #define BLK_STATE_ALLFF		0
 #define BLK_STATE_CLEAN		1
 #define BLK_STATE_PARTDIRTY	2
diff --git a/fs/reiserfs/mode_string.c b/fs/reiserfs/mode_string.c
index 638cf6368da3..bf223858d827 100644
--- a/fs/reiserfs/mode_string.c
+++ b/fs/reiserfs/mode_string.c
@@ -12,6 +12,7 @@
 
 #include <common.h>
 #include <linux/stat.h>
+#include <linux/types.h>
 
 #if ( S_ISUID != 04000 ) || ( S_ISGID != 02000 ) || ( S_ISVTX != 01000 ) \
  || ( S_IRUSR != 00400 ) || ( S_IWUSR != 00200 ) || ( S_IXUSR != 00100 ) \
diff --git a/fs/reiserfs/reiserfs.c b/fs/reiserfs/reiserfs.c
index 37068e295b35..37ec4bfbd390 100644
--- a/fs/reiserfs/reiserfs.c
+++ b/fs/reiserfs/reiserfs.c
@@ -11,6 +11,7 @@
  */
 
 /* An implementation for the ReiserFS filesystem ported from GRUB.
+#include <linux/types.h>
  * Some parts of this code (mainly the structures and defines) are
  * from the original reiser fs code, as found in the linux kernel.
  */
diff --git a/fs/reiserfs/reiserfs_private.h b/fs/reiserfs/reiserfs_private.h
index 5936f2140056..3d8f3f00b261 100644
--- a/fs/reiserfs/reiserfs_private.h
+++ b/fs/reiserfs/reiserfs_private.h
@@ -11,6 +11,7 @@
  */
 
 /* An implementation for the ReiserFS filesystem ported from GRUB.
+#include <linux/types.h>
  * Some parts of this code (mainly the structures and defines) are
  * from the original reiser fs code, as found in the linux kernel.
  */
diff --git a/fs/sandbox/sandboxfs.c b/fs/sandbox/sandboxfs.c
index 59e18d0c049b..ae9c4964a559 100644
--- a/fs/sandbox/sandboxfs.c
+++ b/fs/sandbox/sandboxfs.c
@@ -9,6 +9,7 @@
 #include <os.h>
 #include <sandboxfs.h>
 #include <stdio.h>
+#include <linux/types.h>
 
 int sandbox_fs_set_blk_dev(struct blk_desc *rbdd, struct disk_partition *info)
 {
diff --git a/fs/squashfs/sqfs_filesystem.h b/fs/squashfs/sqfs_filesystem.h
index fbd3b3eb59c2..4f43fb692e33 100644
--- a/fs/squashfs/sqfs_filesystem.h
+++ b/fs/squashfs/sqfs_filesystem.h
@@ -9,6 +9,7 @@
 #define SQFS_FILESYSTEM_H
 
 #include <asm/unaligned.h>
+#include <stdbool.h>
 #include <stdint.h>
 #include <stdbool.h>
 #include <fs.h>
diff --git a/fs/ubifs/debug.c b/fs/ubifs/debug.c
index a20407688cde..ad73191bc255 100644
--- a/fs/ubifs/debug.c
+++ b/fs/ubifs/debug.c
@@ -24,6 +24,7 @@
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #ifndef __UBOOT__
 #include <linux/module.h>
diff --git a/fs/ubifs/debug.h b/fs/ubifs/debug.h
index 85f760e41a15..e436b0bcf612 100644
--- a/fs/ubifs/debug.h
+++ b/fs/ubifs/debug.h
@@ -13,6 +13,7 @@
 
 /* Checking helper functions */
 #include <linux/printk.h>
+#include <linux/types.h>
 typedef int (*dbg_leaf_callback)(struct ubifs_info *c,
 				 struct ubifs_zbranch *zbr, void *priv);
 typedef int (*dbg_znode_callback)(struct ubifs_info *c,
diff --git a/fs/ubifs/io.c b/fs/ubifs/io.c
index 5a0fa3aa4e4c..8b5a11a66693 100644
--- a/fs/ubifs/io.c
+++ b/fs/ubifs/io.c
@@ -39,6 +39,7 @@
  * to @c->max_write_size bytes again. We do this by temporarily shrinking
  * write-buffer size (@wbuf->size).
  *
+#include <linux/types.h>
  * Write-buffers are defined by 'struct ubifs_wbuf' objects and protected by
  * mutexes defined inside these objects. Since sometimes upper-level code
  * has to lock the write-buffer (e.g. journal space reservation code), many
diff --git a/fs/ubifs/key.h b/fs/ubifs/key.h
index 6677ff06a268..ec3c927b5a93 100644
--- a/fs/ubifs/key.h
+++ b/fs/ubifs/key.h
@@ -35,6 +35,7 @@
  */
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 static inline uint32_t key_mask_hash(uint32_t hash)
 {
 	hash &= UBIFS_S_KEY_HASH_MASK;
diff --git a/fs/ubifs/lprops.c b/fs/ubifs/lprops.c
index 2e4678cfaa85..2deb6a103af9 100644
--- a/fs/ubifs/lprops.c
+++ b/fs/ubifs/lprops.c
@@ -23,6 +23,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #endif
 #include "ubifs.h"
 
diff --git a/fs/ubifs/lpt_commit.c b/fs/ubifs/lpt_commit.c
index 2f0d1c6eb512..7ece2986a321 100644
--- a/fs/ubifs/lpt_commit.c
+++ b/fs/ubifs/lpt_commit.c
@@ -27,6 +27,7 @@
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "crc16.h"
 #endif
 #include "ubifs.h"
diff --git a/fs/ubifs/misc.h b/fs/ubifs/misc.h
index a54e4928fc0a..57ca0922c5dd 100644
--- a/fs/ubifs/misc.h
+++ b/fs/ubifs/misc.h
@@ -22,6 +22,7 @@
  * This helper function returns %1 if @znode is dirty and %0 otherwise.
  */
 #include <linux/kernel.h>
+#include <linux/types.h>
 static inline int ubifs_zn_dirty(const struct ubifs_znode *znode)
 {
 	return !!test_bit(DIRTY_ZNODE, &znode->flags);
diff --git a/fs/ubifs/orphan.c b/fs/ubifs/orphan.c
index a7df0364a17f..5393c5b45288 100644
--- a/fs/ubifs/orphan.c
+++ b/fs/ubifs/orphan.c
@@ -12,6 +12,7 @@
 #include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include "ubifs.h"
 
 /*
diff --git a/fs/ubifs/recovery.c b/fs/ubifs/recovery.c
index 24c66ce16886..ec428e8e81d3 100644
--- a/fs/ubifs/recovery.c
+++ b/fs/ubifs/recovery.c
@@ -12,6 +12,7 @@
  * This file implements functions needed to recover from unclean un-mounts.
  * When UBIFS is mounted, it checks a flag on the master node to determine if
  * an un-mount was completed successfully. If not, the process of mounting
+#include <linux/types.h>
  * incorporates additional checking and fixing of on-flash data structures.
  * UBIFS always cleans away all remnants of an unclean un-mount, so that
  * errors do not accumulate. However UBIFS defers recovery if it is mounted
diff --git a/fs/ubifs/replay.c b/fs/ubifs/replay.c
index 845a270ce513..d0c571aa1630 100644
--- a/fs/ubifs/replay.c
+++ b/fs/ubifs/replay.c
@@ -28,6 +28,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #endif
 #include "ubifs.h"
 #include <linux/bug.h>
diff --git a/fs/ubifs/scan.c b/fs/ubifs/scan.c
index 218cbfade109..8ba7f6a2f69b 100644
--- a/fs/ubifs/scan.c
+++ b/fs/ubifs/scan.c
@@ -22,6 +22,7 @@
 #include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #endif
 #include "ubifs.h"
 
diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c
index 9c37fa2254c8..126701afe83a 100644
--- a/fs/ubifs/super.c
+++ b/fs/ubifs/super.c
@@ -43,6 +43,7 @@
 #include <linux/stat.h>
 #include <linux/err.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "ubifs.h"
 #include <ubi_uboot.h>
 #include <linux/stringify.h>
diff --git a/fs/ubifs/tnc.c b/fs/ubifs/tnc.c
index b9174c8798f3..dfb7b53a4c26 100644
--- a/fs/ubifs/tnc.c
+++ b/fs/ubifs/tnc.c
@@ -33,6 +33,7 @@
 #include <linux/kernel.h>
 #include <linux/stat.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #endif
 #include "ubifs.h"
 
diff --git a/fs/ubifs/tnc_misc.c b/fs/ubifs/tnc_misc.c
index 659ff2e2ce2b..f2ad55e9fdc9 100644
--- a/fs/ubifs/tnc_misc.c
+++ b/fs/ubifs/tnc_misc.c
@@ -20,6 +20,7 @@
 #include <dm/devres.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #endif
 #include "ubifs.h"
 
diff --git a/fs/ubifs/ubifs-media.h b/fs/ubifs/ubifs-media.h
index 2b5b26a01b00..a4ec288de340 100644
--- a/fs/ubifs/ubifs-media.h
+++ b/fs/ubifs/ubifs-media.h
@@ -10,6 +10,8 @@
 
 /*
  * This file describes UBIFS on-flash format and contains definitions of all the
+#include <compiler.h>
+#include <linux/types.h>
  * relevant data structures and constants.
  *
  * All UBIFS on-flash objects are stored in the form of nodes. All nodes start
diff --git a/fs/ubifs/ubifs.c b/fs/ubifs/ubifs.c
index e76839e098d8..ddfa86bbc5bd 100644
--- a/fs/ubifs/ubifs.c
+++ b/fs/ubifs/ubifs.c
@@ -22,6 +22,7 @@
 #include <asm/global_data.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "ubifs.h"
 #include <part.h>
 #include <dm/devres.h>
diff --git a/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h
index c8a33fa36edb..b63b1326207d 100644
--- a/fs/ubifs/ubifs.h
+++ b/fs/ubifs/ubifs.h
@@ -37,6 +37,7 @@
 #include <ubifs_uboot.h>
 #include <linux/kernel.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 #include <linux/ctype.h>
 #include <linux/time.h>
diff --git a/fs/yaffs2/yaffs_uboot_glue.c b/fs/yaffs2/yaffs_uboot_glue.c
index 62f034552e58..3f42438a00b6 100644
--- a/fs/yaffs2/yaffs_uboot_glue.c
+++ b/fs/yaffs2/yaffs_uboot_glue.c
@@ -27,6 +27,7 @@
 #include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include <config.h>
 #include "nand.h"
diff --git a/fs/yaffs2/yaffsfs.c b/fs/yaffs2/yaffsfs.c
index 8f43d3ac0851..004abbd28513 100644
--- a/fs/yaffs2/yaffsfs.c
+++ b/fs/yaffs2/yaffsfs.c
@@ -15,6 +15,7 @@
 #include <stdio.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "yaffsfs.h"
 #include "yaffs_guts.h"
 #include "yaffscfg.h"
diff --git a/fs/yaffs2/ydirectenv.h b/fs/yaffs2/ydirectenv.h
index cad7a35a4e50..b9e9ed1707e2 100644
--- a/fs/yaffs2/ydirectenv.h
+++ b/fs/yaffs2/ydirectenv.h
@@ -25,6 +25,7 @@
 #include <stdio.h>
 #include <linux/compat.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "yaffs_osglue.h"
 
diff --git a/fs/zfs/zfs.c b/fs/zfs/zfs.c
index 0bc872175e5c..823ac8a0156f 100644
--- a/fs/zfs/zfs.c
+++ b/fs/zfs/zfs.c
@@ -20,6 +20,7 @@
 #include <linux/time.h>
 #include <linux/ctype.h>
 #include <asm/byteorder.h>
+#include <linux/types.h>
 #include "zfs_common.h"
 #include "div64.h"
 
diff --git a/fs/zfs/zfs_fletcher.c b/fs/zfs/zfs_fletcher.c
index 008a303ec796..dd23f984ded1 100644
--- a/fs/zfs/zfs_fletcher.c
+++ b/fs/zfs/zfs_fletcher.c
@@ -14,6 +14,7 @@
 #include <linux/time.h>
 #include <linux/ctype.h>
 #include <asm/byteorder.h>
+#include <linux/types.h>
 #include "zfs_common.h"
 
 #include <zfs/zfs.h>
diff --git a/fs/zfs/zfs_lzjb.c b/fs/zfs/zfs_lzjb.c
index c2a9ae1ddeff..9ac42ac89aac 100644
--- a/fs/zfs/zfs_lzjb.c
+++ b/fs/zfs/zfs_lzjb.c
@@ -15,6 +15,7 @@
 #include <linux/time.h>
 #include <linux/ctype.h>
 #include <asm/byteorder.h>
+#include <linux/types.h>
 #include "zfs_common.h"
 
 #include <zfs/zfs.h>
diff --git a/fs/zfs/zfs_sha256.c b/fs/zfs/zfs_sha256.c
index cb5b1c06834d..104918c6069f 100644
--- a/fs/zfs/zfs_sha256.c
+++ b/fs/zfs/zfs_sha256.c
@@ -14,6 +14,7 @@
 #include <linux/time.h>
 #include <linux/ctype.h>
 #include <asm/byteorder.h>
+#include <linux/types.h>
 #include "zfs_common.h"
 
 #include <zfs/zfs.h>
diff --git a/include/ACEX1K.h b/include/ACEX1K.h
index 7c5253c66cca..dee789b148b3 100644
--- a/include/ACEX1K.h
+++ b/include/ACEX1K.h
@@ -11,6 +11,7 @@
 #define _ACEX1K_H_
 
 #include <altera.h>
+#include <linux/types.h>
 
 extern int ACEX1K_load(Altera_desc *desc, const void *image, size_t size);
 extern int ACEX1K_dump(Altera_desc *desc, const void *buf, size_t bsize);
diff --git a/include/MCD_dma.h b/include/MCD_dma.h
index 2f16c89044ee..f67d3529fc13 100644
--- a/include/MCD_dma.h
+++ b/include/MCD_dma.h
@@ -33,6 +33,8 @@
 
 #ifndef DEFINESONLY
 
+#include <linux/types.h>
+
 /* Portability typedefs */
 #if 1
 #include "common.h"
@@ -55,6 +57,7 @@ typedef char s8;
 #ifndef u8
 typedef unsigned char u8;
 #endif
+#include <asm/types.h>
 #endif
 
 /*
diff --git a/include/acpi/acpi_device.h b/include/acpi/acpi_device.h
index 1c6aceb20af2..af6b65e7f04d 100644
--- a/include/acpi/acpi_device.h
+++ b/include/acpi/acpi_device.h
@@ -13,6 +13,7 @@
 #include <spi.h>
 #include <stdbool.h>
 #include <linux/bitops.h>
+#include <linux/types.h>
 
 struct acpi_ctx;
 struct gpio_desc;
diff --git a/include/acpi/acpi_s3.h b/include/acpi/acpi_s3.h
index 1dc568117bd3..5b9eed4c8c9d 100644
--- a/include/acpi/acpi_s3.h
+++ b/include/acpi/acpi_s3.h
@@ -37,6 +37,7 @@
 extern char __wakeup[];
 extern int __wakeup_size;
 
+#include <asm/types.h>
 enum acpi_sleep_state {
 	ACPI_S0,
 	ACPI_S1,
diff --git a/include/acpi/acpi_table.h b/include/acpi/acpi_table.h
index fe9b29f3f82d..91d169b4e235 100644
--- a/include/acpi/acpi_table.h
+++ b/include/acpi/acpi_table.h
@@ -13,7 +13,9 @@
 #ifndef __ACPI_TABLE_H__
 #define __ACPI_TABLE_H__
 
+#include <compiler.h>
 #include <linux/bitops.h>
+#include <linux/types.h>
 
 #define RSDP_SIG		"RSD PTR "	/* RSDP pointer signature */
 #define OEM_ID			"U-BOOT"	/* U-Boot */
diff --git a/include/ahci.h b/include/ahci.h
index a6f32010ca28..ca457bfbf64d 100644
--- a/include/ahci.h
+++ b/include/ahci.h
@@ -9,6 +9,7 @@
 
 #include <compiler.h>
 #include <pci.h>
+#include <linux/types.h>
 
 #define AHCI_PCI_BAR		0x24
 #define AHCI_MAX_SG		56 /* hardware max is 64K */
diff --git a/include/ali512x.h b/include/ali512x.h
index 6bb67009c1fb..854ca60de690 100644
--- a/include/ali512x.h
+++ b/include/ali512x.h
@@ -7,6 +7,7 @@
 #ifndef __ASM_IC_ALI512X_H_
 #define __ASM_IC_ALI512X_H_
 
+#include <asm/types.h>
 # define ALI_INDEX    0x3f0
 # define ALI_DATA     0x3f1
 
diff --git a/include/altera.h b/include/altera.h
index 22d55cfd73e7..1e991333c4e7 100644
--- a/include/altera.h
+++ b/include/altera.h
@@ -5,6 +5,7 @@
  */
 
 #include <fpga.h>
+#include <linux/types.h>
 
 #ifndef _ALTERA_H_
 #define _ALTERA_H_
diff --git a/include/android_bootloader_message.h b/include/android_bootloader_message.h
index 286d7ab0f31e..21e613bdad00 100644
--- a/include/android_bootloader_message.h
+++ b/include/android_bootloader_message.h
@@ -21,6 +21,7 @@
  * stddef.h
  */
 #include <compiler.h>
+#include <linux/types.h>
 #endif
 
 // Spaces used by misc partition are as below:
diff --git a/include/api_public.h b/include/api_public.h
index def103ce22fd..38966da505fd 100644
--- a/include/api_public.h
+++ b/include/api_public.h
@@ -8,6 +8,7 @@
 #ifndef _API_PUBLIC_H_
 #define _API_PUBLIC_H_
 
+#include <linux/types.h>
 #define API_EINVAL		1	/* invalid argument(s)	*/
 #define API_ENODEV		2	/* no device		*/
 #define API_ENOMEM		3	/* no memory		*/
diff --git a/include/asm-generic/global_data.h b/include/asm-generic/global_data.h
index 7a6b90d7da07..57ff3b7f12df 100644
--- a/include/asm-generic/global_data.h
+++ b/include/asm-generic/global_data.h
@@ -24,6 +24,7 @@
 #include <membuff.h>
 #include <asm/u-boot.h>
 #include <linux/list.h>
+#include <linux/types.h>
 
 typedef struct global_data {
 	struct bd_info *bd;
diff --git a/include/asm-generic/gpio.h b/include/asm-generic/gpio.h
index acbe791c84bf..eb9b7086612f 100644
--- a/include/asm-generic/gpio.h
+++ b/include/asm-generic/gpio.h
@@ -10,6 +10,7 @@
 #include <stdbool.h>
 #include <dm/ofnode.h>
 #include <linux/bitops.h>
+#include <linux/types.h>
 
 struct acpi_gpio;
 struct ofnode_phandle_args;
diff --git a/include/asm-generic/int-ll64.h b/include/asm-generic/int-ll64.h
index 7451718a61cd..c364755102c9 100644
--- a/include/asm-generic/int-ll64.h
+++ b/include/asm-generic/int-ll64.h
@@ -15,6 +15,7 @@
  * header files exported to user space
  */
 
+#include <asm/types.h>
 typedef __signed__ char __s8;
 typedef unsigned char __u8;
 
diff --git a/include/asm-generic/io.h b/include/asm-generic/io.h
index 7a2f0dba316a..53972a8d75ac 100644
--- a/include/asm-generic/io.h
+++ b/include/asm-generic/io.h
@@ -105,5 +105,6 @@ static inline void unmap_physmem(void *vaddr, unsigned long flags)
 }
 #endif
 
+#include <asm/types.h>
 #endif /* !__ASSEMBLY__ */
 #endif /* __ASM_GENERIC_IO_H__ */
diff --git a/include/ata.h b/include/ata.h
index 3d870c973f2c..ea1af5e66049 100644
--- a/include/ata.h
+++ b/include/ata.h
@@ -14,6 +14,7 @@
 #define _ATA_H
 
 #include <libata.h>
+#include <linux/types.h>
 
 /* Register addressing depends on the hardware design; for instance,
  * 8-bit (register) and 16-bit (data) accesses might use different
diff --git a/include/atf_common.h b/include/atf_common.h
index fd5454c55b4b..231406783fe8 100644
--- a/include/atf_common.h
+++ b/include/atf_common.h
@@ -72,6 +72,7 @@
  * Structure used for telling the next BL how much of a particular type of
  * memory is available for its use and how much is already used.
  ******************************************************************************/
+#include <linux/types.h>
 struct aapcs64_params {
 	unsigned long arg0;
 	unsigned long arg1;
diff --git a/include/atmel_hlcdc.h b/include/atmel_hlcdc.h
index 5e339f50f266..0272d45584b8 100644
--- a/include/atmel_hlcdc.h
+++ b/include/atmel_hlcdc.h
@@ -2,6 +2,7 @@
 /*
  *  Header file for AT91/AT32 MULTI LAYER LCD Controller
  *
+#include <asm/types.h>
  *  Data structure and register user interface
  *
  *  Copyright (C) 2012 Atmel Corporation
diff --git a/include/atmel_lcd.h b/include/atmel_lcd.h
index 4aa955b6b2d4..8d94769d8dc7 100644
--- a/include/atmel_lcd.h
+++ b/include/atmel_lcd.h
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
 /*
+#include <linux/types.h>
  * atmel_lcd.h - Atmel LCD Controller structures
  *
  * (C) Copyright 2001
@@ -9,6 +10,8 @@
 #ifndef _ATMEL_LCD_H_
 #define _ATMEL_LCD_H_
 
+#include <linux/types.h>
+
 /**
  * struct atmel_lcd_platdata - platform data for Atmel LCDs with driver model
  *
diff --git a/include/atmel_mci.h b/include/atmel_mci.h
index c7591166eeb4..2f73e675e014 100644
--- a/include/atmel_mci.h
+++ b/include/atmel_mci.h
@@ -10,6 +10,7 @@ int atmel_mci_init(void *regs);
 #ifndef __ASSEMBLY__
 
 /*
+#include <asm/types.h>
  * Structure for struct SoC access.
  * Names starting with '_' are fillers.
  */
diff --git a/include/atsha204a-i2c.h b/include/atsha204a-i2c.h
index 5c1ab65eef78..b32d159993f9 100644
--- a/include/atsha204a-i2c.h
+++ b/include/atsha204a-i2c.h
@@ -13,6 +13,7 @@
 #define _ATSHA204_I2C_H_
 
 #include <stdbool.h>
+#include <linux/types.h>
 enum atsha204a_zone
 {
 	ATSHA204A_ZONE_CONFIG	= 0,
diff --git a/include/audio_codec.h b/include/audio_codec.h
index 2ea4ff096e62..202f5ca3929b 100644
--- a/include/audio_codec.h
+++ b/include/audio_codec.h
@@ -7,6 +7,7 @@
 #ifndef __AUDIO_CODEC_H__
 #define __AUDIO_CODEC_H__
 
+#include <linux/types.h>
 struct udevice;
 
 /*
diff --git a/include/autoboot.h b/include/autoboot.h
index ac8157e57044..398c55626527 100644
--- a/include/autoboot.h
+++ b/include/autoboot.h
@@ -11,6 +11,8 @@
 #ifndef __AUTOBOOT_H
 #define __AUTOBOOT_H
 
+#include <linux/stddef.h>
+
 #ifdef CONFIG_AUTOBOOT
 /**
  * bootdelay_process() - process the bootd delay
diff --git a/include/avb_verify.h b/include/avb_verify.h
index 8aebe75ac911..7ee137b0a737 100644
--- a/include/avb_verify.h
+++ b/include/avb_verify.h
@@ -11,6 +11,7 @@
 #include <../lib/libavb/libavb.h>
 #include <mapmem.h>
 #include <mmc.h>
+#include <linux/types.h>
 
 #define AVB_MAX_ARGS			1024
 #define VERITY_TABLE_OPT_RESTART	"restart_on_corruption"
diff --git a/include/axi.h b/include/axi.h
index 59fb0b2e4584..abffd2f12b74 100644
--- a/include/axi.h
+++ b/include/axi.h
@@ -7,6 +7,7 @@
 #ifndef _AXI_H_
 #define _AXI_H_
 
+#include <linux/types.h>
 struct udevice;
 
 /**
diff --git a/include/binman.h b/include/binman.h
index e0b92075e274..4da86685daf8 100644
--- a/include/binman.h
+++ b/include/binman.h
@@ -9,6 +9,7 @@
 #ifndef _BINMAN_H_
 #define _BINMAN_H_
 
+#include <asm/types.h>
 #include <dm/ofnode.h>
 
 /**
diff --git a/include/blk.h b/include/blk.h
index 9ee10fb80e70..a070c538cbc2 100644
--- a/include/blk.h
+++ b/include/blk.h
@@ -8,6 +8,7 @@
 #define BLK_H
 
 #include <efi.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_SYS_64BIT_LBA
 typedef uint64_t lbaint_t;
diff --git a/include/bloblist.h b/include/bloblist.h
index 609ac421d668..5feb76de2843 100644
--- a/include/bloblist.h
+++ b/include/bloblist.h
@@ -13,6 +13,7 @@
 #ifndef __BLOBLIST_H
 #define __BLOBLIST_H
 
+#include <linux/types.h>
 enum {
 	BLOBLIST_VERSION	= 0,
 	BLOBLIST_MAGIC		= 0xb00757a3,
diff --git a/include/board.h b/include/board.h
index d9f7aafb49b3..2944eea66c53 100644
--- a/include/board.h
+++ b/include/board.h
@@ -6,6 +6,7 @@
 
 #include <stdbool.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 struct udevice;
 
 /*
diff --git a/include/bootcount.h b/include/bootcount.h
index a3ce40948540..f08339a48052 100644
--- a/include/bootcount.h
+++ b/include/bootcount.h
@@ -12,6 +12,7 @@
 #include <asm/io.h>
 #include <asm/byteorder.h>
 #include <env.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_DM_BOOTCOUNT
 
diff --git a/include/bootm.h b/include/bootm.h
index 0350c349f377..abb6ab891bf0 100644
--- a/include/bootm.h
+++ b/include/bootm.h
@@ -8,6 +8,7 @@
 #define _BOOTM_H
 
 #include <image.h>
+#include <linux/types.h>
 
 struct cmd_tbl;
 
diff --git a/include/bootstage.h b/include/bootstage.h
index 670f785c89e2..c08ec84447e7 100644
--- a/include/bootstage.h
+++ b/include/bootstage.h
@@ -12,6 +12,7 @@
 #define _BOOTSTAGE_H
 
 #include <stdbool.h>
+#include <linux/types.h>
 
 /* Flags for each bootstage record */
 enum bootstage_flags {
diff --git a/include/broadcom/chimp.h b/include/broadcom/chimp.h
index 7f641529139a..661c79a5fa77 100644
--- a/include/broadcom/chimp.h
+++ b/include/broadcom/chimp.h
@@ -7,6 +7,7 @@
 #ifndef __CHIMP_H__
 #define __CHIMP_H__
 
+#include <asm/types.h>
 #include <linux/compiler.h>
 
 /**
diff --git a/include/btrfs.h b/include/btrfs.h
index a7605e158970..ed5869ce7333 100644
--- a/include/btrfs.h
+++ b/include/btrfs.h
@@ -8,6 +8,7 @@
 #ifndef __U_BOOT_BTRFS_H__
 #define __U_BOOT_BTRFS_H__
 
+#include <linux/types.h>
 struct blk_desc;
 struct disk_partition;
 
diff --git a/include/bus_vcxk.h b/include/bus_vcxk.h
index eecba407bfa4..d4952af47948 100644
--- a/include/bus_vcxk.h
+++ b/include/bus_vcxk.h
@@ -7,6 +7,7 @@
 #ifndef __BUS_VCXK_H_
 #define __BUS_VCXK_H_
 
+#include <linux/types.h>
 extern int vcxk_init(unsigned long width, unsigned long height);
 extern void vcxk_setpixel(int x, int y, unsigned long color);
 extern int vcxk_acknowledge_wait(void);
diff --git a/include/cache.h b/include/cache.h
index ecb7956efd5c..d142b3fc1446 100644
--- a/include/cache.h
+++ b/include/cache.h
@@ -6,6 +6,8 @@
 #ifndef __CACHE_H
 #define __CACHE_H
 
+#include <asm/types.h>
+
 struct udevice;
 
 /*
diff --git a/include/capitalization.h b/include/capitalization.h
index 9d7e8d259c6c..29c9e5da11b1 100644
--- a/include/capitalization.h
+++ b/include/capitalization.h
@@ -3,6 +3,7 @@
  * Capitalization tables
  */
 
+#include <asm/types.h>
 struct capitalization_table {
 	u16 upper;
 	u16 lower;
diff --git a/include/cavium/atf.h b/include/cavium/atf.h
index 3cf05c43d72e..3e4a48c436e5 100644
--- a/include/cavium/atf.h
+++ b/include/cavium/atf.h
@@ -5,6 +5,7 @@
 #ifndef __ATF_H__
 #define __ATF_H__
 #include <cavium/atf_part.h>
+#include <linux/types.h>
 
 ssize_t atf_read_mmc(uintptr_t offset, void *buffer, size_t size);
 ssize_t atf_read_nor(uintptr_t offset, void *buffer, size_t size);
diff --git a/include/cbfs.h b/include/cbfs.h
index 5f296d6a3717..44393b5e4eff 100644
--- a/include/cbfs.h
+++ b/include/cbfs.h
@@ -8,6 +8,7 @@
 
 #include <compiler.h>
 #include <linux/compiler.h>
+#include <linux/types.h>
 
 enum cbfs_result {
 	CBFS_SUCCESS = 0,
diff --git a/include/cli.h b/include/cli.h
index 8a0b02cf1da6..b61bd9a13ed1 100644
--- a/include/cli.h
+++ b/include/cli.h
@@ -9,6 +9,7 @@
 
 #include <stdbool.h>
 #include <time.h>
+#include <linux/types.h>
 
 /**
  * Go into the command loop
diff --git a/include/clk-uclass.h b/include/clk-uclass.h
index dac42dab3681..5dbdba91d58b 100644
--- a/include/clk-uclass.h
+++ b/include/clk-uclass.h
@@ -11,6 +11,7 @@
 /* See clk.h for background documentation. */
 
 #include <clk.h>
+#include <linux/types.h>
 
 struct ofnode_phandle_args;
 
diff --git a/include/command.h b/include/command.h
index bc7786dd4a4c..0bd3b1ac7ecb 100644
--- a/include/command.h
+++ b/include/command.h
@@ -29,6 +29,7 @@
  * Monitor Command Table
  */
 
+#include <linux/types.h>
 struct cmd_tbl {
 	char		*name;		/* Command Name			*/
 	int		maxargs;	/* maximum number of arguments	*/
diff --git a/include/common.h b/include/common.h
index 868576038a76..2e95d0ebdf5d 100644
--- a/include/common.h
+++ b/include/common.h
@@ -14,7 +14,6 @@
 
 #ifndef __ASSEMBLY__		/* put C only stuff in this section */
 #include <config.h>
-#include <linux/types.h>
 #endif	/* __ASSEMBLY__ */
 
 /* Pull in stuff for the build system */
diff --git a/include/cpsw.h b/include/cpsw.h
index 9a237d9abe8e..5fe2e4a4de65 100644
--- a/include/cpsw.h
+++ b/include/cpsw.h
@@ -17,6 +17,7 @@
 #define _CPSW_H_
 
 #include <stdbool.h>
+#include <asm/types.h>
 #include <dm/ofnode.h>
 
 /* reg offset */
diff --git a/include/cpu.h b/include/cpu.h
index 089e74c262b3..2ac9fac92a27 100644
--- a/include/cpu.h
+++ b/include/cpu.h
@@ -7,6 +7,7 @@
 #ifndef __CPU_H
 #define __CPU_H
 
+#include <linux/types.h>
 struct udevice;
 
 /**
diff --git a/include/cramfs/cramfs_fs.h b/include/cramfs/cramfs_fs.h
index e0c14f04af57..36b28bcc4bf6 100644
--- a/include/cramfs/cramfs_fs.h
+++ b/include/cramfs/cramfs_fs.h
@@ -1,6 +1,7 @@
 #ifndef __CRAMFS_H
 #define __CRAMFS_H
 
+#include <asm/types.h>
 #define CRAMFS_MAGIC		0x28cd3d45	/* some random number */
 #define CRAMFS_SIGNATURE	"Compressed ROMFS"
 
diff --git a/include/cros_ec.h b/include/cros_ec.h
index ceb3916ae894..df15d85b1d59 100644
--- a/include/cros_ec.h
+++ b/include/cros_ec.h
@@ -14,6 +14,7 @@
 #include <asm/gpio.h>
 #include <dm/of_extra.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 /* Our configuration information */
 struct cros_ec_dev {
diff --git a/include/crypto/pkcs7.h b/include/crypto/pkcs7.h
index ca35df29f6fb..e36e78460794 100644
--- a/include/crypto/pkcs7.h
+++ b/include/crypto/pkcs7.h
@@ -13,6 +13,7 @@
 #include <crypto/public_key.h>
 #endif
 
+#include <linux/types.h>
 struct key;
 struct pkcs7_message;
 
diff --git a/include/crypto/pkcs7_parser.h b/include/crypto/pkcs7_parser.h
index 053ba7826a37..929ead81b06b 100644
--- a/include/crypto/pkcs7_parser.h
+++ b/include/crypto/pkcs7_parser.h
@@ -13,6 +13,7 @@
 #include <crypto/pkcs7.h>
 #include <crypto/x509_parser.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 #define kenter(FMT, ...) \
 	pr_devel("==> %s("FMT")\n", __func__, ##__VA_ARGS__)
diff --git a/include/crypto/x509_parser.h b/include/crypto/x509_parser.h
index b793cbde735d..381e6b9d1fa8 100644
--- a/include/crypto/x509_parser.h
+++ b/include/crypto/x509_parser.h
@@ -12,6 +12,7 @@
 #include <linux/time.h>
 #include <crypto/public_key.h>
 #include <keys/asymmetric-type.h>
+#include <linux/types.h>
 
 struct x509_certificate {
 	struct x509_certificate *next;
diff --git a/include/ddr_spd.h b/include/ddr_spd.h
index fe163da43e56..15b97798634c 100644
--- a/include/ddr_spd.h
+++ b/include/ddr_spd.h
@@ -10,6 +10,7 @@
  * Format from "JEDEC Standard No. 21-C,
  * Appendix D: Rev 1.0: SPD's for DDR SDRAM
  */
+#include <linux/types.h>
 typedef struct ddr1_spd_eeprom_s {
 	unsigned char info_size;   /*  0 # bytes written into serial memory */
 	unsigned char chip_size;   /*  1 Total # bytes of SPD memory device */
diff --git a/include/dfu.h b/include/dfu.h
index 764b7757289b..94341137dee2 100644
--- a/include/dfu.h
+++ b/include/dfu.h
@@ -17,6 +17,7 @@
 #include <linux/list.h>
 #include <mmc.h>
 #include <spi_flash.h>
+#include <linux/types.h>
 #include <linux/usb/composite.h>
 
 enum dfu_device_type {
diff --git a/include/display.h b/include/display.h
index 2c8aca4e48bc..9d630eb7d8ef 100644
--- a/include/display.h
+++ b/include/display.h
@@ -7,6 +7,7 @@
 #define _DISPLAY_H
 
 #include <stdbool.h>
+#include <asm/types.h>
 
 struct udevice;
 struct display_timing;
diff --git a/include/display_options.h b/include/display_options.h
index 002469551215..54187d021d45 100644
--- a/include/display_options.h
+++ b/include/display_options.h
@@ -10,6 +10,7 @@
 #define __DISPLAY_OPTIONS_H
 
 #include <stdbool.h>
+#include <linux/types.h>
 
 /**
  * print_size() - Print a size with a suffix
diff --git a/include/dm/device-internal.h b/include/dm/device-internal.h
index 07857cf1be75..141f211a3e37 100644
--- a/include/dm/device-internal.h
+++ b/include/dm/device-internal.h
@@ -13,6 +13,7 @@
 #include <stdbool.h>
 #include <asm/global_data.h>
 #include <dm/ofnode.h>
+#include <linux/types.h>
 
 struct device_node;
 struct udevice;
diff --git a/include/dm/device.h b/include/dm/device.h
index 90fb96599b25..9a98d2b3d418 100644
--- a/include/dm/device.h
+++ b/include/dm/device.h
@@ -18,6 +18,7 @@
 #include <linux/kernel.h>
 #include <linux/list.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 struct driver_info;
 
diff --git a/include/dm/devres.h b/include/dm/devres.h
index daeefd7ea3ea..d2bf98f37dfa 100644
--- a/include/dm/devres.h
+++ b/include/dm/devres.h
@@ -13,6 +13,7 @@
 
 #include <linux/compat.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 struct udevice;
 
diff --git a/include/dm/of.h b/include/dm/of.h
index 3d6e23a93408..216667412916 100644
--- a/include/dm/of.h
+++ b/include/dm/of.h
@@ -11,6 +11,7 @@
 #include <asm/u-boot.h>
 #include <asm/global_data.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /* integer value within a device tree property which references another node */
 typedef u32 phandle;
diff --git a/include/dm/of_access.h b/include/dm/of_access.h
index 6f01196b76ce..d4f5591b9854 100644
--- a/include/dm/of_access.h
+++ b/include/dm/of_access.h
@@ -19,6 +19,7 @@
 
 #include <stdbool.h>
 #include <dm/of.h>
+#include <linux/types.h>
 
 /**
  * of_find_all_nodes - Get next node in global list
diff --git a/include/dm/of_addr.h b/include/dm/of_addr.h
index 3fa1ffce81a6..bbe1557634d0 100644
--- a/include/dm/of_addr.h
+++ b/include/dm/of_addr.h
@@ -24,6 +24,7 @@
  * @in_addr: pointer to input address
  * @return translated address or OF_BAD_ADDR on error
  */
+#include <linux/types.h>
 u64 of_translate_address(const struct device_node *no, const __be32 *in_addr);
 
 /**
diff --git a/include/dm/of_extra.h b/include/dm/of_extra.h
index ca15df21b067..763d8cf0814e 100644
--- a/include/dm/of_extra.h
+++ b/include/dm/of_extra.h
@@ -8,6 +8,7 @@
 #define _DM_OF_EXTRA_H
 
 #include <dm/ofnode.h>
+#include <linux/types.h>
 
 enum fmap_compress_t {
 	FMAP_COMPRESS_NONE,
diff --git a/include/dm/ofnode.h b/include/dm/ofnode.h
index cc700d2b6584..5e5da953fd71 100644
--- a/include/dm/ofnode.h
+++ b/include/dm/ofnode.h
@@ -11,6 +11,7 @@
 #include <fdtdec.h>
 #include <stdbool.h>
 #include <dm/of.h>
+#include <linux/types.h>
 
 /* Enable checks to protect against invalid calls */
 #undef OF_CHECKS
diff --git a/include/dm/pci.h b/include/dm/pci.h
index 10f9fd9e3785..7d644f42d420 100644
--- a/include/dm/pci.h
+++ b/include/dm/pci.h
@@ -6,6 +6,7 @@
 #ifndef __DM_PCI_H
 #define __DM_PCI_H
 
+#include <asm/types.h>
 struct udevice;
 
 /**
diff --git a/include/dm/pinctrl.h b/include/dm/pinctrl.h
index f879901279db..0afaa8a8884d 100644
--- a/include/dm/pinctrl.h
+++ b/include/dm/pinctrl.h
@@ -6,6 +6,7 @@
 #ifndef __PINCTRL_H
 #define __PINCTRL_H
 
+#include <asm/types.h>
 #include <linux/errno.h>
 #define PINNAME_SIZE	10
 #define PINMUX_SIZE	40
diff --git a/include/dm/platdata.h b/include/dm/platdata.h
index cab93b071bab..f8df68fe5f1c 100644
--- a/include/dm/platdata.h
+++ b/include/dm/platdata.h
@@ -11,6 +11,7 @@
 #define _DM_PLATDATA_H
 
 #include <linker_lists.h>
+#include <linux/types.h>
 
 /**
  * struct driver_info - Information required to instantiate a device
diff --git a/include/dm/platform_data/fsl_espi.h b/include/dm/platform_data/fsl_espi.h
index 812933f51cd0..869a3aa239ad 100644
--- a/include/dm/platform_data/fsl_espi.h
+++ b/include/dm/platform_data/fsl_espi.h
@@ -6,6 +6,7 @@
 #ifndef __fsl_espi_h
 #define __fsl_espi_h
 
+#include <linux/types.h>
 struct fsl_espi_platdata {
 	uint flags;
 	uint speed_hz;
diff --git a/include/dm/platform_data/net_ethoc.h b/include/dm/platform_data/net_ethoc.h
index 855e9999a0a8..d4d5505b2942 100644
--- a/include/dm/platform_data/net_ethoc.h
+++ b/include/dm/platform_data/net_ethoc.h
@@ -7,6 +7,7 @@
 #define _ETHOC_H
 
 #include <net.h>
+#include <asm/types.h>
 
 #ifdef CONFIG_DM_ETH
 
diff --git a/include/dm/platform_data/spi_coldfire.h b/include/dm/platform_data/spi_coldfire.h
index 8ad8eaedfde4..db8f518f34d9 100644
--- a/include/dm/platform_data/spi_coldfire.h
+++ b/include/dm/platform_data/spi_coldfire.h
@@ -6,6 +6,7 @@
 #ifndef __spi_coldfire_h
 #define __spi_coldfire_h
 
+#include <linux/types.h>
 #define MAX_CTAR_REGS		8
 #define MAX_CTAR_FIELDS		8
 
diff --git a/include/dm/platform_data/spi_davinci.h b/include/dm/platform_data/spi_davinci.h
index fbc62c262ab4..0ba7b279e4a3 100644
--- a/include/dm/platform_data/spi_davinci.h
+++ b/include/dm/platform_data/spi_davinci.h
@@ -7,6 +7,7 @@
 #ifndef __spi_davinci_h
 #define __spi_davinci_h
 
+#include <asm/types.h>
 struct davinci_spi_platdata {
 	struct davinci_spi_regs *regs;
 	u8 num_cs;	   /* total no. of CS available */
diff --git a/include/dm/read.h b/include/dm/read.h
index 2d0312fc8c58..974da150db6d 100644
--- a/include/dm/read.h
+++ b/include/dm/read.h
@@ -11,6 +11,7 @@
 
 #include <stdbool.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #include <dm/device.h>
 #include <dm/fdtaddr.h>
diff --git a/include/dm/root.h b/include/dm/root.h
index f2c735556710..316fcc05bbe1 100644
--- a/include/dm/root.h
+++ b/include/dm/root.h
@@ -10,6 +10,7 @@
 #define _DM_ROOT_H_
 
 #include <stdbool.h>
+#include <linux/types.h>
 struct udevice;
 
 /**
diff --git a/include/dm/test.h b/include/dm/test.h
index d895d96bceed..3b52b8571780 100644
--- a/include/dm/test.h
+++ b/include/dm/test.h
@@ -7,6 +7,7 @@
 #define __DM_TEST_H
 
 struct udevice;
+#include <linux/types.h>
 
 /**
  * struct dm_test_cdata - configuration data for test instance
diff --git a/include/dm/uclass.h b/include/dm/uclass.h
index 67ff7466c862..8b8efa903390 100644
--- a/include/dm/uclass.h
+++ b/include/dm/uclass.h
@@ -13,6 +13,7 @@
 #include <dm/uclass-id.h>
 #include <linker_lists.h>
 #include <linux/list.h>
+#include <linux/types.h>
 
 /**
  * struct uclass - a U-Boot drive class, collecting together similar drivers
diff --git a/include/dm9000.h b/include/dm9000.h
index f780e513f698..ca4c277d20df 100644
--- a/include/dm9000.h
+++ b/include/dm9000.h
@@ -13,4 +13,5 @@ void dm9000_write_srom_word(int offset, u16 val);
 void dm9000_read_srom_word(int offset, u8 *to);
 #endif
 
+#include <asm/types.h>
 #endif /* __DM9000_H__ */
diff --git a/include/dma-uclass.h b/include/dma-uclass.h
index 340437acc134..5b421d014772 100644
--- a/include/dma-uclass.h
+++ b/include/dma-uclass.h
@@ -12,6 +12,7 @@
 /* See dma.h for background documentation. */
 
 #include <dma.h>
+#include <linux/types.h>
 
 struct ofnode_phandle_args;
 
diff --git a/include/dw_hdmi.h b/include/dw_hdmi.h
index 4c4024ef19fb..eb91103b80a3 100644
--- a/include/dw_hdmi.h
+++ b/include/dw_hdmi.h
@@ -11,6 +11,7 @@
 
 #include <edid.h>
 #include <stdbool.h>
+#include <linux/types.h>
 
 #define HDMI_EDID_BLOCK_SIZE            128
 
diff --git a/include/dwc3-uboot.h b/include/dwc3-uboot.h
index 6c583e5e7b6c..8d1f642a6f46 100644
--- a/include/dwc3-uboot.h
+++ b/include/dwc3-uboot.h
@@ -10,6 +10,7 @@
 #define __DWC3_UBOOT_H_
 
 #include <generic-phy.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/usb/otg.h>
 #include <linux/usb/phy.h>
diff --git a/include/dwmmc.h b/include/dwmmc.h
index 46a9ca25bec2..ab678d367a60 100644
--- a/include/dwmmc.h
+++ b/include/dwmmc.h
@@ -12,6 +12,7 @@
 #include <asm/io.h>
 #include <mmc.h>
 #include <linux/bitops.h>
+#include <linux/types.h>
 
 #define DWMCI_CTRL		0x000
 #define	DWMCI_PWREN		0x004
diff --git a/include/ec_commands.h b/include/ec_commands.h
index 444ba61e5915..487bf998a13f 100644
--- a/include/ec_commands.h
+++ b/include/ec_commands.h
@@ -19,6 +19,8 @@
  *      - ERR is the error code. (defined by EC_RES_ constants)
  *      - Px is the optional payload.
  *        it is not sent if the error code is not success.
+#include <compiler.h>
+#include <linux/types.h>
  *        (defined by ec_params_ and ec_response_ structures)
  *      - S is the checksum which is the sum of all payload bytes.
  *
diff --git a/include/edid.h b/include/edid.h
index 9a0612bf0727..3486705b991a 100644
--- a/include/edid.h
+++ b/include/edid.h
@@ -12,6 +12,7 @@
 #ifndef __EDID_H_
 #define __EDID_H_
 
+#include <compiler.h>
 #include <stdbool.h>
 #include <linux/types.h>
 
diff --git a/include/eeprom.h b/include/eeprom.h
index 06f2a471657e..0934a2a8babb 100644
--- a/include/eeprom.h
+++ b/include/eeprom.h
@@ -7,6 +7,9 @@
 #ifndef __EEPROM_LEGACY_H
 #define __EEPROM_LEGACY_H
 
+#include <linux/errno.h>
+#include <linux/types.h>
+
 #if defined(CONFIG_CMD_EEPROM) || defined(CONFIG_ENV_IS_IN_EEPROM)
 void eeprom_init(int bus);
 int eeprom_read(uint dev_addr, uint offset, uchar *buffer, uint cnt);
@@ -25,5 +28,4 @@ int eeprom_write(uint dev_addr, uint offset, uchar *buffer, uint cnt);
 # define CONFIG_SYS_DEF_EEPROM_ADDR CONFIG_SYS_I2C_EEPROM_ADDR
 #endif
 
-#include <linux/errno.h>
 #endif
diff --git a/include/eeprom_layout.h b/include/eeprom_layout.h
index 730d963ab966..42eaabac1a77 100644
--- a/include/eeprom_layout.h
+++ b/include/eeprom_layout.h
@@ -9,6 +9,7 @@
 #ifndef _LAYOUT_
 #define _LAYOUT_
 
+#include <compiler.h>
 #define RESERVED_FIELDS			NULL
 #define LAYOUT_VERSION_UNRECOGNIZED	-1
 #define LAYOUT_VERSION_AUTODETECT	-2
diff --git a/include/efi_api.h b/include/efi_api.h
index 268d980b11fb..2e902a2555a7 100644
--- a/include/efi_api.h
+++ b/include/efi_api.h
@@ -16,10 +16,12 @@
 #ifndef _EFI_API_H
 #define _EFI_API_H
 
+#include <compiler.h>
 #include <efi.h>
 #include <charset.h>
 #include <pe.h>
 #include <stdbool.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_EFI_LOADER
 #include <asm/setjmp.h>
diff --git a/include/efi_loader.h b/include/efi_loader.h
index 50a17a33ca43..05da51871403 100644
--- a/include/efi_loader.h
+++ b/include/efi_loader.h
@@ -15,6 +15,8 @@
 #include <efi_api.h>
 #include <image.h>
 #include <pe.h>
+#include <stdbool.h>
+#include <linux/types.h>
 
 struct blk_desc;
 
diff --git a/include/efi_selftest.h b/include/efi_selftest.h
index 25e5f56121ef..d72e87ce23b3 100644
--- a/include/efi_selftest.h
+++ b/include/efi_selftest.h
@@ -14,6 +14,7 @@
 #include <efi_loader.h>
 #include <linker_lists.h>
 #include <stdbool.h>
+#include <asm/types.h>
 
 #define EFI_ST_SUCCESS 0
 #define EFI_ST_FAILURE 1
diff --git a/include/efi_variable.h b/include/efi_variable.h
index 454325396fab..8e738c871f5a 100644
--- a/include/efi_variable.h
+++ b/include/efi_variable.h
@@ -7,6 +7,7 @@
 #define _EFI_VARIABLE_H
 
 #include <stdbool.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 
 #define EFI_VARIABLE_READ_ONLY BIT(31)
diff --git a/include/env_default.h b/include/env_default.h
index 8a0c3057f0aa..cb083e99bcc7 100644
--- a/include/env_default.h
+++ b/include/env_default.h
@@ -9,6 +9,7 @@
 
 #include <env_callback.h>
 #include <linux/stringify.h>
+#include <linux/types.h>
 
 #ifdef DEFAULT_ENV_INSTANCE_EMBEDDED
 env_t embedded_environment __UBOOT_ENV_SECTION__(environment) = {
diff --git a/include/env_internal.h b/include/env_internal.h
index b26dc6239c82..f700df714689 100644
--- a/include/env_internal.h
+++ b/include/env_internal.h
@@ -16,6 +16,7 @@
 #define _ENV_INTERNAL_H_
 
 #include <linux/kconfig.h>
+#include <linux/types.h>
 
 /**************************************************************************
  *
diff --git a/include/ethsw.h b/include/ethsw.h
index 04e002d39f51..2eb79e2643c0 100644
--- a/include/ethsw.h
+++ b/include/ethsw.h
@@ -8,6 +8,7 @@
 #ifndef _CMD_ETHSW_H_
 #define _CMD_ETHSW_H_
 
+#include <linux/types.h>
 #define ETHSW_MAX_CMD_PARAMS 20
 #define ETHSW_CMD_PORT_ALL -1
 #define ETHSW_CMD_VLAN_ALL -1
diff --git a/include/exports.h b/include/exports.h
index 28a6713ed716..62109d06451c 100644
--- a/include/exports.h
+++ b/include/exports.h
@@ -17,6 +17,7 @@
 #endif
 
 #include <irq_func.h>
+#include <linux/types.h>
 
 struct cmd_tbl;
 struct spi_slave;
diff --git a/include/ext4fs.h b/include/ext4fs.h
index cb5d9cc0a5c0..59a3319b82d6 100644
--- a/include/ext4fs.h
+++ b/include/ext4fs.h
@@ -4,6 +4,7 @@
  * Uma Shankar <uma.shankar@samsung.com>
  * Manjunatha C Achar <a.manjunatha@samsung.com>
  *
+#include <linux/types.h>
  * Ext4 Extent data structures are taken from  original ext4 fs code
  * as found in the linux kernel.
  *
diff --git a/include/ext_common.h b/include/ext_common.h
index 30a0c248414a..1078459723e8 100644
--- a/include/ext_common.h
+++ b/include/ext_common.h
@@ -5,6 +5,7 @@
  * Uma Shankar <uma.shankar@samsung.com>
  * Manjunatha C Achar <a.manjunatha@samsung.com>
  *
+#include <linux/types.h>
  * Data structures and headers for ext4 support have been taken from
  * ext2 ls load support in Uboot
  *
diff --git a/include/exynos_lcd.h b/include/exynos_lcd.h
index 484bd36334f0..329ce3fb655d 100644
--- a/include/exynos_lcd.h
+++ b/include/exynos_lcd.h
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
 /*
+#include <linux/types.h>
  * exynos_lcd.h - Exynos LCD Controller structures
  *
  * (C) Copyright 2001
diff --git a/include/fastboot-internal.h b/include/fastboot-internal.h
index bf2f2b3c8914..5168e71d3a40 100644
--- a/include/fastboot-internal.h
+++ b/include/fastboot-internal.h
@@ -6,6 +6,7 @@
 /**
  * fastboot_buf_addr - base address of the fastboot download buffer
  */
+#include <asm/types.h>
 extern void *fastboot_buf_addr;
 
 /**
diff --git a/include/fastboot.h b/include/fastboot.h
index 1933b1d98e3b..ac07238d9bb2 100644
--- a/include/fastboot.h
+++ b/include/fastboot.h
@@ -12,6 +12,7 @@
 #ifndef _FASTBOOT_H_
 #define _FASTBOOT_H_
 
+#include <asm/types.h>
 #define FASTBOOT_VERSION	"0.4"
 
 /* The 64 defined bytes plus \0 */
diff --git a/include/fat.h b/include/fat.h
index 02742f92a5c8..318bf6588907 100644
--- a/include/fat.h
+++ b/include/fat.h
@@ -11,6 +11,7 @@
 
 #include <asm/byteorder.h>
 #include <fs.h>
+#include <linux/types.h>
 
 struct disk_partition;
 
diff --git a/include/fb_mmc.h b/include/fb_mmc.h
index 76ed7cd6be11..4ca91c82acad 100644
--- a/include/fb_mmc.h
+++ b/include/fb_mmc.h
@@ -6,6 +6,7 @@
 #ifndef _FB_MMC_H_
 #define _FB_MMC_H_
 
+#include <asm/types.h>
 struct blk_desc;
 struct disk_partition;
 
diff --git a/include/fb_nand.h b/include/fb_nand.h
index 6d7999f262f5..36d4918d8eb5 100644
--- a/include/fb_nand.h
+++ b/include/fb_nand.h
@@ -7,6 +7,7 @@
 #ifndef _FB_NAND_H_
 #define _FB_NAND_H_
 
+#include <asm/types.h>
 #include <jffs2/load_kernel.h>
 
 /**
diff --git a/include/fdt_support.h b/include/fdt_support.h
index 443bfe5e3a31..2a6fd6ed5d0d 100644
--- a/include/fdt_support.h
+++ b/include/fdt_support.h
@@ -118,6 +118,7 @@ static inline int fdt_fixup_memory_banks(void *blob, u64 start[], u64 size[],
 }
 #endif
 
+#include <linux/types.h>
 void fdt_fixup_ethernet(void *fdt);
 int fdt_find_and_setprop(void *fdt, const char *node, const char *prop,
 			 const void *val, int len, int create);
diff --git a/include/fdtdec.h b/include/fdtdec.h
index 258a171dc7e6..37f9d0f3ef05 100644
--- a/include/fdtdec.h
+++ b/include/fdtdec.h
@@ -18,6 +18,7 @@
 #include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <pci.h>
+#include <linux/types.h>
 
 /*
  * A typedef for a physical address. Note that fdt data is always big
diff --git a/include/fis.h b/include/fis.h
index 419807f1fe5d..7642471f51e2 100644
--- a/include/fis.h
+++ b/include/fis.h
@@ -9,6 +9,7 @@
 /*
 * Register - Host to Device FIS
 */
+#include <asm/types.h>
 typedef struct sata_fis_h2d {
 	u8 fis_type;
 	u8 pm_port_c;
diff --git a/include/flash.h b/include/flash.h
index 3bf6b22399ec..3ff072da49c4 100644
--- a/include/flash.h
+++ b/include/flash.h
@@ -15,6 +15,7 @@
  * FLASH Info: contains chip specific data, per FLASH bank
  */
 
+#include <linux/types.h>
 typedef struct {
 	ulong	size;			/* total bank size in bytes		*/
 	ushort	sector_count;		/* number of erase units		*/
diff --git a/include/fs.h b/include/fs.h
index 0794b50d102a..c05930b26702 100644
--- a/include/fs.h
+++ b/include/fs.h
@@ -6,6 +6,7 @@
 #define _FS_H
 
 #include <common.h>
+#include <linux/types.h>
 
 struct cmd_tbl;
 
diff --git a/include/fs_loader.h b/include/fs_loader.h
index 1b3c58086f5b..fcd48d46269b 100644
--- a/include/fs_loader.h
+++ b/include/fs_loader.h
@@ -6,6 +6,8 @@
 #ifndef _FS_LOADER_H_
 #define _FS_LOADER_H_
 
+#include <linux/types.h>
+
 struct udevice;
 
 /**
diff --git a/include/fsl-mc/fsl_dpaa_fd.h b/include/fsl-mc/fsl_dpaa_fd.h
index 5c092af15c8f..491bd0a84fb5 100644
--- a/include/fsl-mc/fsl_dpaa_fd.h
+++ b/include/fsl-mc/fsl_dpaa_fd.h
@@ -11,6 +11,7 @@
  * routines (lots of read-modify-writes) would be worst-case performance whether
  * or not circumstances required them.) */
 #include <linux/kernel.h>
+#include <linux/types.h>
 struct dpaa_fd {
 	union {
 		u32 words[8];
diff --git a/include/fsl-mc/fsl_dpbp.h b/include/fsl-mc/fsl_dpbp.h
index 2278ac952ea9..123275450596 100644
--- a/include/fsl-mc/fsl_dpbp.h
+++ b/include/fsl-mc/fsl_dpbp.h
@@ -13,6 +13,7 @@
 #define __FSL_DPBP_H
 
 /* DPBP Version */
+#include <linux/types.h>
 #define DPBP_VER_MAJOR				3
 #define DPBP_VER_MINOR				3
 
diff --git a/include/fsl-mc/fsl_dpio.h b/include/fsl-mc/fsl_dpio.h
index 7788e1962e64..60702755d67a 100644
--- a/include/fsl-mc/fsl_dpio.h
+++ b/include/fsl-mc/fsl_dpio.h
@@ -8,6 +8,7 @@
 #define _FSL_DPIO_H
 
 /* DPIO Version */
+#include <linux/types.h>
 #define DPIO_VER_MAJOR				4
 #define DPIO_VER_MINOR				2
 
diff --git a/include/fsl-mc/fsl_dpmac.h b/include/fsl-mc/fsl_dpmac.h
index 1cea123a3164..ff42f6e99427 100644
--- a/include/fsl-mc/fsl_dpmac.h
+++ b/include/fsl-mc/fsl_dpmac.h
@@ -11,6 +11,7 @@
 #define __FSL_DPMAC_H
 
 /* DPMAC Version */
+#include <linux/types.h>
 #define DPMAC_VER_MAJOR				4
 #define DPMAC_VER_MINOR				2
 
diff --git a/include/fsl-mc/fsl_dpmng.h b/include/fsl-mc/fsl_dpmng.h
index 2148601e8a12..17d17d6324a3 100644
--- a/include/fsl-mc/fsl_dpmng.h
+++ b/include/fsl-mc/fsl_dpmng.h
@@ -8,6 +8,7 @@
  * Contains general API for the Management Complex firmware
  */
 
+#include <linux/types.h>
 struct fsl_mc_io;
 
 /**
diff --git a/include/fsl-mc/fsl_dpni.h b/include/fsl-mc/fsl_dpni.h
index 96d81d993491..d1266af34715 100644
--- a/include/fsl-mc/fsl_dpni.h
+++ b/include/fsl-mc/fsl_dpni.h
@@ -7,6 +7,7 @@
 #define _FSL_DPNI_H
 
 /* DPNI Version */
+#include <linux/types.h>
 #define DPNI_VER_MAJOR				7
 #define DPNI_VER_MINOR				3
 
diff --git a/include/fsl-mc/fsl_dprc.h b/include/fsl-mc/fsl_dprc.h
index 950ecb075698..5ece93bcf275 100644
--- a/include/fsl-mc/fsl_dprc.h
+++ b/include/fsl-mc/fsl_dprc.h
@@ -9,6 +9,7 @@
 #define _FSL_DPRC_H
 
 /* DPRC Version */
+#include <linux/types.h>
 #define DPRC_VER_MAJOR				6
 #define DPRC_VER_MINOR				1
 
diff --git a/include/fsl-mc/fsl_dpsparser.h b/include/fsl-mc/fsl_dpsparser.h
index 48fb495059eb..9ebdd803a67a 100644
--- a/include/fsl-mc/fsl_dpsparser.h
+++ b/include/fsl-mc/fsl_dpsparser.h
@@ -8,6 +8,7 @@
 #define _FSL_DPSPARSER_H
 
 /* DPSPARSER last supported API version */
+#include <asm/types.h>
 #define DPSPARSER_VER_MAJOR				1
 #define DPSPARSER_VER_MINOR				0
 
diff --git a/include/fsl-mc/fsl_mc.h b/include/fsl-mc/fsl_mc.h
index 732b4953b5d1..a7fd9bc70fe2 100644
--- a/include/fsl-mc/fsl_mc.h
+++ b/include/fsl-mc/fsl_mc.h
@@ -7,8 +7,10 @@
 #define __FSL_MC_H__
 
 #include <common.h>
+#include <compiler.h>
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
+#include <linux/types.h>
 
 #define MC_CCSR_BASE_ADDR \
 	((struct mc_ccsr_registers __iomem *)0x8340000)
diff --git a/include/fsl-mc/fsl_mc_cmd.h b/include/fsl-mc/fsl_mc_cmd.h
index 591cda968515..72cfce6d8e96 100644
--- a/include/fsl-mc/fsl_mc_cmd.h
+++ b/include/fsl-mc/fsl_mc_cmd.h
@@ -5,6 +5,8 @@
 #ifndef __FSL_MC_CMD_H
 #define __FSL_MC_CMD_H
 
+#include <compiler.h>
+#include <linux/types.h>
 #define MC_CMD_NUM_OF_PARAMS	7
 
 #define MAKE_UMASK64(_width) \
diff --git a/include/fsl-mc/fsl_mc_sys.h b/include/fsl-mc/fsl_mc_sys.h
index 9fb8164f5053..0f0769385eb9 100644
--- a/include/fsl-mc/fsl_mc_sys.h
+++ b/include/fsl-mc/fsl_mc_sys.h
@@ -8,6 +8,7 @@
 #ifndef _FSL_MC_SYS_H
 #define _FSL_MC_SYS_H
 
+#include <compiler.h>
 #include <asm/io.h>
 
 struct mc_command;
diff --git a/include/fsl-mc/fsl_qbman_base.h b/include/fsl-mc/fsl_qbman_base.h
index 7818fc28e6eb..0f75c890b592 100644
--- a/include/fsl-mc/fsl_qbman_base.h
+++ b/include/fsl-mc/fsl_qbman_base.h
@@ -10,6 +10,7 @@
  * control this QBMan instance, these values may simply be place-holders. The
  * idea is simply that we be able to distinguish between them, eg. so that SWP
  * descriptors can identify which QBMan instance they belong to. */
+#include <linux/types.h>
 struct qbman_block_desc {
 	void *ccsr_reg_bar; /* CCSR register map */
 	int irq_rerr;  /* Recoverable error interrupt line */
diff --git a/include/fsl-mc/fsl_qbman_portal.h b/include/fsl-mc/fsl_qbman_portal.h
index ee0e4aa50dde..9633090a83b3 100644
--- a/include/fsl-mc/fsl_qbman_portal.h
+++ b/include/fsl-mc/fsl_qbman_portal.h
@@ -7,6 +7,7 @@
 #define _FSL_QBMAN_PORTAL_H
 
 #include <fsl-mc/fsl_qbman_base.h>
+#include <linux/types.h>
 
 /* Create and destroy a functional object representing the given QBMan portal
  * descriptor. */
diff --git a/include/fsl-mc/ldpaa_wriop.h b/include/fsl-mc/ldpaa_wriop.h
index b55c39cbb298..3f915c4990d7 100644
--- a/include/fsl-mc/ldpaa_wriop.h
+++ b/include/fsl-mc/ldpaa_wriop.h
@@ -7,6 +7,7 @@
 #define __LDPAA_WRIOP_H
 
 #include <phy.h>
+#include <asm/types.h>
 
 #define DEFAULT_WRIOP_MDIO1_NAME "FSL_MDIO0"
 #define DEFAULT_WRIOP_MDIO2_NAME "FSL_MDIO1"
diff --git a/include/fsl_csu.h b/include/fsl_csu.h
index 0e59ac3c324d..818e975d9fea 100644
--- a/include/fsl_csu.h
+++ b/include/fsl_csu.h
@@ -7,6 +7,7 @@
 #ifndef __FSL_CSU_H__
 #define __FSL_CSU_H__
 
+#include <linux/types.h>
 enum csu_cslx_access {
 	CSU_NS_SUP_R = 0x08,
 	CSU_NS_SUP_W = 0x80,
diff --git a/include/fsl_ddr.h b/include/fsl_ddr.h
index 025d7a1e74b6..21198cdb0531 100644
--- a/include/fsl_ddr.h
+++ b/include/fsl_ddr.h
@@ -9,6 +9,7 @@
 #include <fsl_ddrc_version.h>
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
+#include <asm/types.h>
 
 #include <common_timing_params.h>
 
diff --git a/include/fsl_ddr_sdram.h b/include/fsl_ddr_sdram.h
index 1523e80d29f1..42d2fce2a517 100644
--- a/include/fsl_ddr_sdram.h
+++ b/include/fsl_ddr_sdram.h
@@ -13,6 +13,7 @@
 #include <ddr_spd.h>
 #include <fsl_ddrc_version.h>
 #include <stdbool.h>
+#include <asm/types.h>
 
 #define SDRAM_TYPE_DDR1		2
 #define SDRAM_TYPE_DDR2		3
diff --git a/include/fsl_devdis.h b/include/fsl_devdis.h
index 1f1b0333172e..113db2ef7872 100644
--- a/include/fsl_devdis.h
+++ b/include/fsl_devdis.h
@@ -6,6 +6,7 @@
 #ifndef __FSL_DEVDIS_H_
 #define __FSL_DEVDIS_H_
 
+#include <linux/types.h>
 struct devdis_table {
 	char name[32];
 	u32 offset;
diff --git a/include/fsl_diu_fb.h b/include/fsl_diu_fb.h
index 139851ba1a87..d7b8fad20571 100644
--- a/include/fsl_diu_fb.h
+++ b/include/fsl_diu_fb.h
@@ -7,6 +7,7 @@
  * FSL DIU Framebuffer driver
  */
 
+#include <asm/types.h>
 int fsl_diu_init(u16 xres, u16 yres, u32 pixel_format, int gamma_fix);
 
 /* Prototypes for external board-specific functions */
diff --git a/include/fsl_dspi.h b/include/fsl_dspi.h
index 4fec83549e1f..d0096c050f72 100644
--- a/include/fsl_dspi.h
+++ b/include/fsl_dspi.h
@@ -12,6 +12,7 @@
 #define _FSL_DSPI_H_
 
 /* DMA Serial Peripheral Interface (DSPI) */
+#include <asm/types.h>
 struct dspi {
 	u32 mcr;	/* 0x00 */
 	u32 resv0;	/* 0x04 */
diff --git a/include/fsl_errata.h b/include/fsl_errata.h
index ad3f299361f5..8aff3d4ae066 100644
--- a/include/fsl_errata.h
+++ b/include/fsl_errata.h
@@ -15,6 +15,7 @@
 #include <asm/arch/soc.h>
 #endif
 #include <stdbool.h>
+#include <asm/types.h>
 
 
 #ifdef CONFIG_SYS_FSL_ERRATUM_A006379
diff --git a/include/fsl_esdhc.h b/include/fsl_esdhc.h
index e15d10c669de..4aa0013cdbbb 100644
--- a/include/fsl_esdhc.h
+++ b/include/fsl_esdhc.h
@@ -12,6 +12,7 @@
 
 #include <linux/errno.h>
 #include <asm/byteorder.h>
+#include <linux/types.h>
 
 /* needed for the mmc_cfg definition */
 #include <mmc.h>
diff --git a/include/fsl_esdhc_imx.h b/include/fsl_esdhc_imx.h
index 78f0e18dde37..462a8b8040ea 100644
--- a/include/fsl_esdhc_imx.h
+++ b/include/fsl_esdhc_imx.h
@@ -16,6 +16,7 @@
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <asm/byteorder.h>
+#include <linux/types.h>
 
 /* needed for the mmc_cfg definition */
 #include <mmc.h>
diff --git a/include/fsl_ifc.h b/include/fsl_ifc.h
index 1985244d3b92..bdacda03f310 100644
--- a/include/fsl_ifc.h
+++ b/include/fsl_ifc.h
@@ -792,6 +792,7 @@ enum ifc_nand_fir_opcodes {
 
 #ifndef __ASSEMBLY__
 #include <asm/io.h>
+#include <linux/types.h>
 
 extern void print_ifc_regs(void);
 extern void init_early_memctl_regs(void);
diff --git a/include/fsl_immap.h b/include/fsl_immap.h
index 5297c0b3f9b6..33078e727753 100644
--- a/include/fsl_immap.h
+++ b/include/fsl_immap.h
@@ -9,6 +9,7 @@
 #define __FSL_IMMAP_H
 /*
  * DDR memory controller registers
+#include <asm/types.h>
  * This structure works for mpc83xx (DDR2 and DDR3), mpc85xx, mpc86xx.
  */
 struct ccsr_ddr {
diff --git a/include/fsl_lpuart.h b/include/fsl_lpuart.h
index 511fb8436721..30c40e87af7d 100644
--- a/include/fsl_lpuart.h
+++ b/include/fsl_lpuart.h
@@ -33,6 +33,7 @@ struct lpuart_fsl_reg32 {
 };
 #endif
 
+#include <linux/types.h>
 struct lpuart_fsl {
 	u8 ubdh;
 	u8 ubdl;
diff --git a/include/fsl_mdio.h b/include/fsl_mdio.h
index b8fed2a0d2c0..2ce849f85fa4 100644
--- a/include/fsl_mdio.h
+++ b/include/fsl_mdio.h
@@ -8,8 +8,10 @@
 #ifndef __FSL_PHY_H__
 #define __FSL_PHY_H__
 
+#include <compiler.h>
 #include <net.h>
 #include <miiphy.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 
 struct tsec_mii_mng {
diff --git a/include/fsl_memac.h b/include/fsl_memac.h
index d067f1511c68..c54258429903 100644
--- a/include/fsl_memac.h
+++ b/include/fsl_memac.h
@@ -8,6 +8,7 @@
 #define __MEMAC_H__
 
 #include <phy.h>
+#include <asm/types.h>
 
 struct memac {
 	/* memac general control and status registers */
diff --git a/include/fsl_mmdc.h b/include/fsl_mmdc.h
index 05fb41f40335..9ce570f0ed6e 100644
--- a/include/fsl_mmdc.h
+++ b/include/fsl_mmdc.h
@@ -7,6 +7,7 @@
 #define FSL_MMDC_H
 
 /* PHY Write Leveling Configuration and Error Status Register (MPWLGCR) */
+#include <asm/types.h>
 #define MPWLGCR_HW_WL_EN		(1 << 0)
 
 /* PHY Pre-defined Compare and CA delay-line Configuration (MPPDCMPR2) */
diff --git a/include/fsl_qbman.h b/include/fsl_qbman.h
index 4687eb9bb186..eec53003d227 100644
--- a/include/fsl_qbman.h
+++ b/include/fsl_qbman.h
@@ -5,6 +5,8 @@
 
 #ifndef __FSL_QBMAN_H__
 #define __FSL_QBMAN_H__
+#include <compiler.h>
+#include <asm/types.h>
 void fdt_fixup_qportals(void *blob);
 void fdt_fixup_bportals(void *blob);
 void inhibit_portals(void __iomem *addr, int max_portals,
diff --git a/include/fsl_sec.h b/include/fsl_sec.h
index 1c6f1eb23ec3..1ad5577dc7fa 100644
--- a/include/fsl_sec.h
+++ b/include/fsl_sec.h
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <asm/io.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_SYS_FSL_SEC_LE
 #define sec_in32(a)       in_le32(a)
diff --git a/include/fsl_sec_mon.h b/include/fsl_sec_mon.h
index fb838db0b53f..32ef91d490d5 100644
--- a/include/fsl_sec_mon.h
+++ b/include/fsl_sec_mon.h
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <asm/io.h>
+#include <asm/types.h>
 
 #ifdef CONFIG_SYS_FSL_SEC_MON_LE
 #define sec_mon_in32(a)       in_le32(a)
diff --git a/include/fsl_sfp.h b/include/fsl_sfp.h
index 613814d9057c..573059e6b421 100644
--- a/include/fsl_sfp.h
+++ b/include/fsl_sfp.h
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <config.h>
 #include <asm/io.h>
+#include <asm/types.h>
 
 #ifdef CONFIG_SYS_FSL_SRK_LE
 #define srk_in32(a)       in_le32(a)
diff --git a/include/fsl_tgec.h b/include/fsl_tgec.h
index 59cd856ba09f..cf27a883d8f3 100644
--- a/include/fsl_tgec.h
+++ b/include/fsl_tgec.h
@@ -8,6 +8,7 @@
 #define __TGEC_H__
 
 #include <phy.h>
+#include <asm/types.h>
 
 struct tgec {
 	/* 10GEC general control and status registers */
diff --git a/include/fsl_usb.h b/include/fsl_usb.h
index 5e3a935e9d8f..b465e54adac5 100644
--- a/include/fsl_usb.h
+++ b/include/fsl_usb.h
@@ -53,6 +53,7 @@ struct ccsr_usb_phy {
 #define CONFIG_SYS_FSL_USB_INTERNAL_SOC_CLK_EN (1 << 20)
 #endif
 #include <stdbool.h>
+#include <asm/types.h>
 #define CONFIG_SYS_FSL_USB_PLLPRG2_REF_DIV (1 << 4)
 #define CONFIG_SYS_FSL_USB_PLLPRG2_MFI (5 << 16)
 #define CONFIG_SYS_FSL_USB_PLLPRG2_PLL_EN (1 << 21)
diff --git a/include/fsl_wdog.h b/include/fsl_wdog.h
index 655f22ed9ac6..f45e700616e1 100644
--- a/include/fsl_wdog.h
+++ b/include/fsl_wdog.h
@@ -3,6 +3,7 @@
  * (C) Copyright 2015 Freescale Semiconductor, Inc.
  */
 
+#include <asm/types.h>
 struct watchdog_regs {
 	u16	wcr;	/* Control */
 	u16	wsr;	/* Service */
diff --git a/include/fuse.h b/include/fuse.h
index d48dcdfa6474..6bd783086a38 100644
--- a/include/fuse.h
+++ b/include/fuse.h
@@ -19,6 +19,7 @@
  *
  *   Returns: 0 on success, not 0 on failure
  */
+#include <asm/types.h>
 int fuse_read(u32 bank, u32 word, u32 *val);
 int fuse_sense(u32 bank, u32 word, u32 *val);
 int fuse_prog(u32 bank, u32 word, u32 val);
diff --git a/include/gdsys_fpga.h b/include/gdsys_fpga.h
index 6d38a83d9034..d684df32be13 100644
--- a/include/gdsys_fpga.h
+++ b/include/gdsys_fpga.h
@@ -36,6 +36,7 @@ extern struct ihs_fpga *fpga_ptr[];
 		     val)
 #endif
 
+#include <linux/types.h>
 struct ihs_gpio {
 	u16 read;
 	u16 clear;
diff --git a/include/gzip.h b/include/gzip.h
index 783acbb60d2a..36a35572f2b6 100644
--- a/include/gzip.h
+++ b/include/gzip.h
@@ -7,6 +7,7 @@
 #ifndef __GZIP_H
 #define __GZIP_H
 
+#include <linux/types.h>
 struct blk_desc;
 
 /**
diff --git a/include/hash.h b/include/hash.h
index 97bb3ed5d9ac..ec8f266a9ce4 100644
--- a/include/hash.h
+++ b/include/hash.h
@@ -6,6 +6,7 @@
 #ifndef _HASH_H
 #define _HASH_H
 
+#include <linux/types.h>
 struct cmd_tbl;
 
 /*
diff --git a/include/hda_codec.h b/include/hda_codec.h
index 56de571f0f71..1cc91ba4c122 100644
--- a/include/hda_codec.h
+++ b/include/hda_codec.h
@@ -10,6 +10,7 @@
 #ifndef __HDA_CODEC_H_
 #define __HDA_CODEC_H_
 
+#include <linux/types.h>
 struct hda_regs;
 
 /**
diff --git a/include/hw_sha.h b/include/hw_sha.h
index 991e496a3cb2..de60ed8cbed6 100644
--- a/include/hw_sha.h
+++ b/include/hw_sha.h
@@ -7,6 +7,7 @@
 #ifndef __HW_SHA_H
 #define __HW_SHA_H
 #include <hash.h>
+#include <linux/types.h>
 
 /**
  * Computes hash value of input pbuf using h/w acceleration
diff --git a/include/i2c.h b/include/i2c.h
index b8ee77d98bce..34227ef81482 100644
--- a/include/i2c.h
+++ b/include/i2c.h
@@ -19,6 +19,7 @@
 #include <linker_lists.h>
 #include <stdbool.h>
 #include <stdio.h>
+#include <linux/types.h>
 
 /*
  * For now there are essentially two parts to this file - driver model
diff --git a/include/i2c_eeprom.h b/include/i2c_eeprom.h
index cd620d519fca..18e2ea815de4 100644
--- a/include/i2c_eeprom.h
+++ b/include/i2c_eeprom.h
@@ -6,6 +6,7 @@
 #ifndef __I2C_EEPROM
 #define __I2C_EEPROM
 
+#include <linux/types.h>
 struct i2c_eeprom_ops {
 	int (*read)(struct udevice *dev, int offset, uint8_t *buf, int size);
 	int (*write)(struct udevice *dev, int offset, const uint8_t *buf,
diff --git a/include/i2s.h b/include/i2s.h
index 7760aab7c465..b5a117773c1a 100644
--- a/include/i2s.h
+++ b/include/i2s.h
@@ -13,6 +13,7 @@
  * Describes the physical PCM data formating and clocking. Add new formats
  * to the end.
  */
+#include <linux/types.h>
 #define SND_SOC_DAIFMT_I2S		1 /* I2S mode */
 #define SND_SOC_DAIFMT_RIGHT_J		2 /* Right Justified mode */
 #define SND_SOC_DAIFMT_LEFT_J		3 /* Left Justified mode */
diff --git a/include/ide.h b/include/ide.h
index 1b37d67992c0..37b2b4f53458 100644
--- a/include/ide.h
+++ b/include/ide.h
@@ -8,6 +8,7 @@
 #define _IDE_H
 
 #include <blk.h>
+#include <linux/types.h>
 
 #define IDE_BUS(dev)	(dev / (CONFIG_SYS_IDE_MAXDEVICE / CONFIG_SYS_IDE_MAXBUS))
 
diff --git a/include/imx8image.h b/include/imx8image.h
index 72daa6ed5d38..35b4b6f28f5e 100644
--- a/include/imx8image.h
+++ b/include/imx8image.h
@@ -8,9 +8,11 @@
 #ifndef _IMX8IMAGE_H_
 #define _IMX8IMAGE_H_
 
+#include <compiler.h>
 #include <image.h>
 #include <inttypes.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "imagetool.h"
 
 #define __packed   __attribute__((packed))
diff --git a/include/imx_lpi2c.h b/include/imx_lpi2c.h
index 3ce9edaf101a..5941b5363c0e 100644
--- a/include/imx_lpi2c.h
+++ b/include/imx_lpi2c.h
@@ -9,6 +9,7 @@
 #define __IMX_LPI2C_H__
 
 #include <clk.h>
+#include <linux/types.h>
 
 struct imx_lpi2c_bus {
 	int index;
diff --git a/include/imximage.h b/include/imximage.h
index 1ed3284f1540..6692696f1077 100644
--- a/include/imximage.h
+++ b/include/imximage.h
@@ -61,6 +61,7 @@
 #define DCD_CHECK_BITS_CLR_PARAM	0x04
 
 #ifndef __ASSEMBLY__
+#include <linux/types.h>
 enum imximage_cmd {
 	CMD_INVALID,
 	CMD_IMAGE_VERSION,
diff --git a/include/input.h b/include/input.h
index 973d13f53b9c..cee0762676cc 100644
--- a/include/input.h
+++ b/include/input.h
@@ -9,6 +9,7 @@
 #define _INPUT_H
 
 #include <stdbool.h>
+#include <linux/types.h>
 enum {
 	INPUT_MAX_MODIFIERS	= 4,
 	INPUT_BUFFER_LEN	= 16,
diff --git a/include/ioports.h b/include/ioports.h
index 1cd3ceb37a54..ae876c9be847 100644
--- a/include/ioports.h
+++ b/include/ioports.h
@@ -5,6 +5,7 @@
  */
 
 /*
+#include <linux/types.h>
  * this structure mirrors the layout of the five port registers in
  * the internal memory map
  */
diff --git a/include/ipu_pixfmt.h b/include/ipu_pixfmt.h
index 866ead0ec719..b230a2039ddd 100644
--- a/include/ipu_pixfmt.h
+++ b/include/ipu_pixfmt.h
@@ -13,6 +13,7 @@
 
 #include <linux/list.h>
 #include <linux/fb.h>
+#include <linux/types.h>
 
 /*  IPU Pixel format definitions */
 #define fourcc(a, b, c, d)\
diff --git a/include/irq.h b/include/irq.h
index 150d7ce20c24..699b97a9cd76 100644
--- a/include/irq.h
+++ b/include/irq.h
@@ -9,6 +9,7 @@
 #define __irq_H
 
 #include <stdbool.h>
+#include <linux/types.h>
 struct acpi_irq;
 struct ofnode_phandle_args;
 
diff --git a/include/jffs2/jffs2_1pass.h b/include/jffs2/jffs2_1pass.h
index 5bc3e66cd766..947202d5be95 100644
--- a/include/jffs2/jffs2_1pass.h
+++ b/include/jffs2/jffs2_1pass.h
@@ -1,3 +1,4 @@
+#include <asm/types.h>
 u32 jffs2_1pass_ls(struct part_info *part,const char *fname);
 u32 jffs2_1pass_load(char *dest, struct part_info *part,const char *fname);
 u32 jffs2_1pass_info(struct part_info *part);
diff --git a/include/jffs2/load_kernel.h b/include/jffs2/load_kernel.h
index 9346d7ee9f1b..d3a3947d950b 100644
--- a/include/jffs2/load_kernel.h
+++ b/include/jffs2/load_kernel.h
@@ -9,6 +9,7 @@
  * Description:   header for load kernel modules
  *-----------------------------------------------------------------------*/
 
+#include <asm/types.h>
 #include <linux/list.h>
 
 /* mtd device types */
diff --git a/include/k3-avs.h b/include/k3-avs.h
index e3c3cafbb9d9..af9ad03acd31 100644
--- a/include/k3-avs.h
+++ b/include/k3-avs.h
@@ -10,6 +10,8 @@
 #ifndef _K3_AVS0_
 #define _K3_AVS0_
 
+#include <asm/types.h>
+
 #define AM6_VDD_WKUP		0
 #define AM6_VDD_MCU		1
 #define AM6_VDD_CORE		2
diff --git a/include/kendryte/bypass.h b/include/kendryte/bypass.h
index 439eab81b3aa..7dfb979f2256 100644
--- a/include/kendryte/bypass.h
+++ b/include/kendryte/bypass.h
@@ -6,6 +6,7 @@
 #define K210_BYPASS_H
 
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 struct clk;
 
diff --git a/include/kendryte/clk.h b/include/kendryte/clk.h
index 9c6245d468b6..8d698a429483 100644
--- a/include/kendryte/clk.h
+++ b/include/kendryte/clk.h
@@ -7,6 +7,7 @@
 #define K210_CLK_H
 
 #define LOG_CATEGORY UCLASS_CLK
+#include <compiler.h>
 #include <linux/types.h>
 #include <linux/clk-provider.h>
 
diff --git a/include/kendryte/pll.h b/include/kendryte/pll.h
index 083f388c1280..9ed84d1739bf 100644
--- a/include/kendryte/pll.h
+++ b/include/kendryte/pll.h
@@ -6,6 +6,8 @@
 #define K210_PLL_H
 
 #include <clk.h>
+#include <compiler.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 #include <test/export.h>
 
diff --git a/include/key_matrix.h b/include/key_matrix.h
index 519722f2d8f8..7800075837af 100644
--- a/include/key_matrix.h
+++ b/include/key_matrix.h
@@ -9,6 +9,7 @@
 #define _KEY_MATRIX_H
 
 #include <common.h>
+#include <linux/types.h>
 
 /* Information about a matrix keyboard */
 struct key_matrix {
diff --git a/include/keys/asymmetric-type.h b/include/keys/asymmetric-type.h
index 2e8b0224b83f..d5314d7e2515 100644
--- a/include/keys/asymmetric-type.h
+++ b/include/keys/asymmetric-type.h
@@ -49,6 +49,7 @@ enum asymmetric_payload_bits {
  * What we actually do is provide a place where binary identifiers can be
  * stashed and then compare against them when checking for an id match.
  */
+#include <linux/types.h>
 struct asymmetric_key_id {
 	unsigned short	len;
 	unsigned char	data[];
diff --git a/include/lattice.h b/include/lattice.h
index 80fafc00dcb8..83a82834b3f4 100644
--- a/include/lattice.h
+++ b/include/lattice.h
@@ -13,6 +13,7 @@
 #ifndef _VME_OPCODE_H
 #define _VME_OPCODE_H
 
+#include <linux/types.h>
 #define VME_VERSION_NUMBER "12.1"
 
 /* Maximum declarations. */
diff --git a/include/lcd.h b/include/lcd.h
index 08086008694b..1ea207cc2c6e 100644
--- a/include/lcd.h
+++ b/include/lcd.h
@@ -17,6 +17,7 @@
 #include <bmp_layout.h>
 #include <asm/byteorder.h>
 #endif
+#include <linux/types.h>
 
 int bmp_display(ulong addr, int x, int y);
 struct bmp_image *gunzip_bmp(unsigned long addr, unsigned long *lenp,
diff --git a/include/lcd_console.h b/include/lcd_console.h
index 061a6a41bbd5..dbdc0dc6e0ed 100644
--- a/include/lcd_console.h
+++ b/include/lcd_console.h
@@ -5,6 +5,7 @@
 
 /* By default we scroll by a single line */
 
+#include <linux/types.h>
 struct console_t {
 	short curr_col, curr_row;
 	short cols, rows;
diff --git a/include/lcdvideo.h b/include/lcdvideo.h
index f0640a53852a..9946ceaed00f 100644
--- a/include/lcdvideo.h
+++ b/include/lcdvideo.h
@@ -8,6 +8,7 @@
 
 /* LCD Controller Configuration Register.
 */
+#include <linux/types.h>
 #define LCCR_BNUM	((uint)0xfffe0000)
 #define LCCR_EIEN	((uint)0x00010000)
 #define LCCR_IEN	((uint)0x00008000)
diff --git a/include/libata.h b/include/libata.h
index 10e6057ef4a9..94caa9ffbd7a 100644
--- a/include/libata.h
+++ b/include/libata.h
@@ -10,6 +10,7 @@
 #ifndef __LIBATA_H__
 #define __LIBATA_H__
 
+#include <asm/types.h>
 enum {
 	/* various global constants */
 	ATA_MAX_DEVICES		= 2,	/* per bus/port */
diff --git a/include/linux/mtd/omap_gpmc.h b/include/linux/mtd/omap_gpmc.h
index 864b05e432a7..af2d589251e1 100644
--- a/include/linux/mtd/omap_gpmc.h
+++ b/include/linux/mtd/omap_gpmc.h
@@ -8,6 +8,8 @@
 #ifndef __ASM_OMAP_GPMC_H
 #define __ASM_OMAP_GPMC_H
 
+#include <linux/types.h>
+
 #define GPMC_BUF_EMPTY	0
 #define GPMC_BUF_FULL	1
 #define GPMC_MAX_SECTORS	8
diff --git a/include/linux/soc/ti/cppi5.h b/include/linux/soc/ti/cppi5.h
index 7447881eb266..48d8a103898f 100644
--- a/include/linux/soc/ti/cppi5.h
+++ b/include/linux/soc/ti/cppi5.h
@@ -8,11 +8,14 @@
 #ifndef __TI_CPPI5_H__
 #define __TI_CPPI5_H__
 
+#include <compiler.h>
 #include <hexdump.h>
 #include <stdbool.h>
 #include <linux/bitops.h>
 #include <linux/bug.h>
+#include <linux/kernel.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 
 /**
  * Descriptor header, present in all types of descriptors
diff --git a/include/linux/soc/ti/k3-navss-ringacc.h b/include/linux/soc/ti/k3-navss-ringacc.h
index 9176277ff0bc..a2f709a38489 100644
--- a/include/linux/soc/ti/k3-navss-ringacc.h
+++ b/include/linux/soc/ti/k3-navss-ringacc.h
@@ -8,6 +8,7 @@
 #ifndef __SOC_TI_K3_NAVSS_RINGACC_API_H_
 #define __SOC_TI_K3_NAVSS_RINGACC_API_H_
 
+#include <asm/types.h>
 #include <dm/ofnode.h>
 #include <linux/bitops.h>
 
diff --git a/include/linux/soc/ti/k3-sec-proxy.h b/include/linux/soc/ti/k3-sec-proxy.h
index f34854ceebc7..19c0ffc0d69f 100644
--- a/include/linux/soc/ti/k3-sec-proxy.h
+++ b/include/linux/soc/ti/k3-sec-proxy.h
@@ -11,6 +11,7 @@
 #define K3_SEC_PROXY_H
 
 /**
+#include <linux/types.h>
  * struct k3_sec_proxy_msg - Secure proxy message structure
  * @len: Length of data in the Buffer
  * @buf: Buffer pointer
diff --git a/include/linux/soc/ti/ti-udma.h b/include/linux/soc/ti/ti-udma.h
index 04e354fb2d69..fc8bc186ced3 100644
--- a/include/linux/soc/ti/ti-udma.h
+++ b/include/linux/soc/ti/ti-udma.h
@@ -8,6 +8,7 @@
 #define __TI_UDMA_H
 
 /**
+#include <asm/types.h>
  * struct ti_udma_drv_packet_data - TI UDMA transfer specific data
  *
  * @pkt_type: Packet Type - specific for each DMA client HW
diff --git a/include/linux/soc/ti/ti_sci_protocol.h b/include/linux/soc/ti/ti_sci_protocol.h
index 1ae73240c80d..e4239992dbcf 100644
--- a/include/linux/soc/ti/ti_sci_protocol.h
+++ b/include/linux/soc/ti/ti_sci_protocol.h
@@ -12,6 +12,8 @@
 #define __TISCI_PROTOCOL_H
 
 /**
+#include <compiler.h>
+#include <asm/types.h>
  * struct ti_sci_version_info - version information structure
  * @abi_major:	Major ABI version. Change here implies risk of backward
  *		compatibility break.
diff --git a/include/lmb.h b/include/lmb.h
index e9f19b16ea0b..13526e7383ce 100644
--- a/include/lmb.h
+++ b/include/lmb.h
@@ -62,4 +62,5 @@ void arch_lmb_reserve(struct lmb *lmb);
 
 #endif /* __KERNEL__ */
 
+#include <linux/types.h>
 #endif /* _LINUX_LMB_H */
diff --git a/include/lynxkdi.h b/include/lynxkdi.h
index 38640277b295..1a2c47c295f6 100644
--- a/include/lynxkdi.h
+++ b/include/lynxkdi.h
@@ -8,6 +8,7 @@
 #define __LYNXKDI_H__
 
 
+#include <linux/types.h>
 /* Boot parameter struct passed to kernel
  */
 typedef struct lynxos_bootparms_t {
diff --git a/include/lz4.h b/include/lz4.h
index 1276fb98a34e..6cd82c41e9cc 100644
--- a/include/lz4.h
+++ b/include/lz4.h
@@ -19,6 +19,7 @@
  *	buffer is overrun, -EEPROTO if the compressed data causes an error in
  *	the decompression algorithm
  */
+#include <linux/types.h>
 int ulz4fn(const void *src, size_t srcn, void *dst, size_t *dstn);
 
 #endif
diff --git a/include/mailbox.h b/include/mailbox.h
index 93f4715e169f..56360ba286e4 100644
--- a/include/mailbox.h
+++ b/include/mailbox.h
@@ -32,6 +32,7 @@
  * messages. This header file describes the API used by clients.
  */
 
+#include <linux/types.h>
 struct udevice;
 
 /**
diff --git a/include/malloc.h b/include/malloc.h
index 36f8556f9fe0..b93b5b43eda2 100644
--- a/include/malloc.h
+++ b/include/malloc.h
@@ -60,6 +60,7 @@
   malloc_stats();
      Prints brief summary statistics on stderr.
   mallinfo()
+#include <linux/types.h>
      Returns (by copy) a struct containing various summary statistics.
   mallopt(int parameter_number, int parameter_value)
      Changes one of the tunable parameters described below. Returns
diff --git a/include/mapmem.h b/include/mapmem.h
index 2134c8004d94..0b2f929c3077 100644
--- a/include/mapmem.h
+++ b/include/mapmem.h
@@ -12,6 +12,7 @@
 /* Define a null map_sysmem() if the architecture doesn't use it */
 # ifdef CONFIG_ARCH_MAP_SYSMEM
 #include <asm/io.h>
+#include <linux/types.h>
 # else
 static inline void *map_sysmem(phys_addr_t paddr, unsigned long len)
 {
diff --git a/include/mc9sdz60.h b/include/mc9sdz60.h
index ffe376bf507c..b4bbfd72da94 100644
--- a/include/mc9sdz60.h
+++ b/include/mc9sdz60.h
@@ -15,6 +15,7 @@
  * but not include/linux/mfd/mc9s08dz60/pmic.h
  *
  */
+#include <asm/types.h>
 enum mc9sdz60_reg {
 	MC9SDZ60_REG_VERSION		= 0x00,
 	/* reserved                       0x01 */
diff --git a/include/memalign.h b/include/memalign.h
index cb0dcf39b41c..841cac4944b9 100644
--- a/include/memalign.h
+++ b/include/memalign.h
@@ -14,6 +14,7 @@
 #include <asm/cache.h>
 #include <malloc.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 /*
  * The ALLOC_CACHE_ALIGN_BUFFER macro is used to allocate a buffer on the
diff --git a/include/miiphy.h b/include/miiphy.h
index 61c136b114cb..a23215aa718e 100644
--- a/include/miiphy.h
+++ b/include/miiphy.h
@@ -15,6 +15,7 @@
 #define _miiphy_h_
 
 #include <common.h>
+#include <asm/types.h>
 #include <linux/mii.h>
 #include <linux/list.h>
 #include <net.h>
diff --git a/include/mipi_dsi.h b/include/mipi_dsi.h
index 2abbbfa949b0..171078a348b2 100644
--- a/include/mipi_dsi.h
+++ b/include/mipi_dsi.h
@@ -19,6 +19,7 @@
 #include <stdbool.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 struct mipi_dsi_host;
 struct mipi_dsi_device;
diff --git a/include/mm_communication.h b/include/mm_communication.h
index e464cbb48e22..b77364250a97 100644
--- a/include/mm_communication.h
+++ b/include/mm_communication.h
@@ -12,6 +12,7 @@
 #define _MM_COMMUNICATION_H_
 
 #include <part_efi.h>
+#include <linux/types.h>
 
 /*
  * Interface to the pseudo Trusted Application (TA), which provides a
diff --git a/include/mmc.h b/include/mmc.h
index d319f46e355f..9c9b76386653 100644
--- a/include/mmc.h
+++ b/include/mmc.h
@@ -17,6 +17,7 @@
 #include <linux/compiler.h>
 #include <linux/dma-direction.h>
 #include <part.h>
+#include <linux/types.h>
 
 struct bd_info;
 
diff --git a/include/mpc86xx.h b/include/mpc86xx.h
index 9fe474803253..62477eb908cd 100644
--- a/include/mpc86xx.h
+++ b/include/mpc86xx.h
@@ -40,6 +40,7 @@
 
 #ifndef __ASSEMBLY__
 
+#include <asm/types.h>
 typedef struct {
 	unsigned long freq_processor;
 	unsigned long freq_systembus;
diff --git a/include/mtd/cfi_flash.h b/include/mtd/cfi_flash.h
index 4963c89642f2..994cb1db93cd 100644
--- a/include/mtd/cfi_flash.h
+++ b/include/mtd/cfi_flash.h
@@ -7,6 +7,7 @@
 #ifndef __CFI_FLASH_H__
 #define __CFI_FLASH_H__
 
+#include <asm/types.h>
 #define FLASH_CMD_CFI			0x98
 #define FLASH_CMD_READ_ID		0x90
 #define FLASH_CMD_RESET			0xff
diff --git a/include/mtd/ubi-user.h b/include/mtd/ubi-user.h
index 8d472cc01380..988398ed330f 100644
--- a/include/mtd/ubi-user.h
+++ b/include/mtd/ubi-user.h
@@ -8,6 +8,7 @@
 #ifndef __UBI_USER_H__
 #define __UBI_USER_H__
 
+#include <compiler.h>
 #include <linux/types.h>
 
 /*
diff --git a/include/mv88e6352.h b/include/mv88e6352.h
index 2e810c8183ed..2cc149cd00c7 100644
--- a/include/mv88e6352.h
+++ b/include/mv88e6352.h
@@ -8,6 +8,7 @@
 #define __MV886352_H
 
 #include <common.h>
+#include <asm/types.h>
 
 /* PHY registers */
 #define PHY(itf)	(itf)
diff --git a/include/mvebu/comphy.h b/include/mvebu/comphy.h
index 4a007ccb0f53..063be64d4224 100644
--- a/include/mvebu/comphy.h
+++ b/include/mvebu/comphy.h
@@ -7,6 +7,7 @@
 #define _MVEBU_COMPHY_H_
 
 #include <stdbool.h>
+#include <asm/types.h>
 #include <dt-bindings/comphy/comphy_data.h>
 
 struct comphy_map {
diff --git a/include/mvebu_mmc.h b/include/mvebu_mmc.h
index 790199ca5e6a..84df14a5ffb8 100644
--- a/include/mvebu_mmc.h
+++ b/include/mvebu_mmc.h
@@ -12,6 +12,7 @@
 
 /* needed for the mmc_cfg definition */
 #include <mmc.h>
+#include <asm/types.h>
 #include <asm/u-boot.h>
 
 #define MMC_BLOCK_SIZE				512
diff --git a/include/mvmfp.h b/include/mvmfp.h
index 16f26841e200..93ca1ba35b03 100644
--- a/include/mvmfp.h
+++ b/include/mvmfp.h
@@ -47,6 +47,7 @@
  *
  * 				    offset, pull,pF, drv,dF, edge,eF ,afn,aF
  */
+#include <asm/types.h>
 #define MFP_OFFSET_MASK		MFP(0xffff,    0,    0,   0,   0,   0,   0)
 #define MFP_REG(x)		MFP(x,         0,    0,   0,   0,   0,   0)
 #define MFP_REG_GET_OFFSET(x)	((x & MFP_OFFSET_MASK) >> 16)
diff --git a/include/mxs_nand.h b/include/mxs_nand.h
index 92af891c1871..e54bc9478c63 100644
--- a/include/mxs_nand.h
+++ b/include/mxs_nand.h
@@ -12,6 +12,7 @@
 #include <asm/cache.h>
 #include <nand.h>
 #include <asm/mach-imx/dma.h>
+#include <linux/types.h>
 
 /**
  * @gf_len:                   The length of Galois Field. (e.g., 13 or 14)
diff --git a/include/nand.h b/include/nand.h
index 80dd6469bc05..de36cac8bb93 100644
--- a/include/nand.h
+++ b/include/nand.h
@@ -9,6 +9,7 @@
 #define _NAND_H_
 
 #include <config.h>
+#include <linux/types.h>
 
 /*
  * All boards using a given driver must convert to self-init
diff --git a/include/net/ncsi-pkt.h b/include/net/ncsi-pkt.h
index a8e9def593f2..640d8e1d789d 100644
--- a/include/net/ncsi-pkt.h
+++ b/include/net/ncsi-pkt.h
@@ -6,6 +6,7 @@
 #ifndef __NCSI_PKT_H__
 #define __NCSI_PKT_H__
 
+#include <linux/types.h>
 struct ncsi_pkt_hdr {
 	unsigned char mc_id;        /* Management controller ID */
 	unsigned char revision;     /* NCSI version - 0x01      */
diff --git a/include/net/pcap.h b/include/net/pcap.h
index db9b2c4f69fb..2007746e37cf 100644
--- a/include/net/pcap.h
+++ b/include/net/pcap.h
@@ -13,6 +13,7 @@
  * @return	0 on success, -ERROR on error
  */
 #include <stdbool.h>
+#include <linux/types.h>
 int pcap_init(phys_addr_t paddr, unsigned long size);
 
 /**
diff --git a/include/net/pfe_eth/pfe/cbus/bmu.h b/include/net/pfe_eth/pfe/cbus/bmu.h
index 3a83e4dc1ca3..5c062bef7d7d 100644
--- a/include/net/pfe_eth/pfe/cbus/bmu.h
+++ b/include/net/pfe_eth/pfe/cbus/bmu.h
@@ -7,6 +7,7 @@
 #ifndef _BMU_H_
 #define _BMU_H_
 
+#include <asm/types.h>
 #define BMU_VERSION		0x000
 #define BMU_CTRL		0x004
 #define BMU_UCAST_CONFIG	0x008
diff --git a/include/net/pfe_eth/pfe/cbus/class_csr.h b/include/net/pfe_eth/pfe/cbus/class_csr.h
index 80f1f96b4433..9b9f85509889 100644
--- a/include/net/pfe_eth/pfe/cbus/class_csr.h
+++ b/include/net/pfe_eth/pfe/cbus/class_csr.h
@@ -12,6 +12,7 @@
  * class_csr - block containing all the classifier control and status register.
  * Mapped on CBUS and accessible from all PE's and ARM.
  */
+#include <asm/types.h>
 #include <linux/bitops.h>
 #define CLASS_VERSION			(CLASS_CSR_BASE_ADDR + 0x000)
 #define CLASS_TX_CTRL			(CLASS_CSR_BASE_ADDR + 0x004)
diff --git a/include/net/pfe_eth/pfe/cbus/gpi.h b/include/net/pfe_eth/pfe/cbus/gpi.h
index 6b5ba5d233f2..abc7e66828e9 100644
--- a/include/net/pfe_eth/pfe/cbus/gpi.h
+++ b/include/net/pfe_eth/pfe/cbus/gpi.h
@@ -7,6 +7,7 @@
 #ifndef _GPI_H_
 #define _GPI_H_
 
+#include <asm/types.h>
 #define GPI_VERSION			0x00
 #define GPI_CTRL			0x04
 #define GPI_RX_CONFIG			0x08
diff --git a/include/net/pfe_eth/pfe/cbus/tmu_csr.h b/include/net/pfe_eth/pfe/cbus/tmu_csr.h
index cfe8f8ce8fc4..96dbb06561c9 100644
--- a/include/net/pfe_eth/pfe/cbus/tmu_csr.h
+++ b/include/net/pfe_eth/pfe/cbus/tmu_csr.h
@@ -7,6 +7,7 @@
 #ifndef _TMU_CSR_H_
 #define _TMU_CSR_H_
 
+#include <asm/types.h>
 #include <linux/bitops.h>
 #define TMU_VERSION			(TMU_CSR_BASE_ADDR + 0x000)
 #define TMU_INQ_WATERMARK		(TMU_CSR_BASE_ADDR + 0x004)
diff --git a/include/net/pfe_eth/pfe/pfe_hw.h b/include/net/pfe_eth/pfe/pfe_hw.h
index c69fc69130cc..cb9099e588a8 100644
--- a/include/net/pfe_eth/pfe/pfe_hw.h
+++ b/include/net/pfe_eth/pfe/pfe_hw.h
@@ -8,6 +8,7 @@
 #define _PFE_H_
 
 #include <elf.h>
+#include <asm/types.h>
 #include <linux/bitops.h>
 #include "cbus.h"
 
diff --git a/include/net/pfe_eth/pfe_driver.h b/include/net/pfe_eth/pfe_driver.h
index fa9f2fa65dd5..a4872b76402e 100644
--- a/include/net/pfe_eth/pfe_driver.h
+++ b/include/net/pfe_eth/pfe_driver.h
@@ -7,6 +7,8 @@
 #ifndef __PFE_DRIVER_H__
 #define __PFE_DRIVER_H__
 
+#include <compiler.h>
+#include <linux/types.h>
 #include <net/pfe_eth/pfe/pfe_hw.h>
 #include <dm/platform_data/pfe_dm_eth.h>
 
diff --git a/include/net/tftp.h b/include/net/tftp.h
index c411c9b2e653..5a285892d45e 100644
--- a/include/net/tftp.h
+++ b/include/net/tftp.h
@@ -16,6 +16,7 @@
  */
 
 /* tftp.c */
+#include <linux/types.h>
 void tftp_start(enum proto_t protocol);	/* Begin TFTP get/put */
 
 #ifdef CONFIG_CMD_TFTPSRV
diff --git a/include/netdev.h b/include/netdev.h
index 52db3d56411f..e862f4ce3635 100644
--- a/include/netdev.h
+++ b/include/netdev.h
@@ -12,6 +12,7 @@
 #define _NETDEV_H_
 #include <phy_interface.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 struct udevice;
 
diff --git a/include/nvme.h b/include/nvme.h
index 2cdf8ce320c1..45eeed26828b 100644
--- a/include/nvme.h
+++ b/include/nvme.h
@@ -7,6 +7,7 @@
 #ifndef __NVME_H__
 #define __NVME_H__
 
+#include <asm/types.h>
 struct nvme_dev;
 
 /**
diff --git a/include/opensbi.h b/include/opensbi.h
index d812cc8ccd94..8fef4194e21e 100644
--- a/include/opensbi.h
+++ b/include/opensbi.h
@@ -8,6 +8,7 @@
 #define OPENSBI_H
 
 /** Expected value of info magic ('OSBI' ascii string in hex) */
+#include <compiler.h>
 #define FW_DYNAMIC_INFO_MAGIC_VALUE		0x4942534f
 
 /** Maximum supported info version */
diff --git a/include/p2sb.h b/include/p2sb.h
index a0f34496dd76..664ecb50b5fe 100644
--- a/include/p2sb.h
+++ b/include/p2sb.h
@@ -9,6 +9,7 @@
 
 /* Port Id lives in bits 23:16 and register offset lives in 15:0 of address */
 #include <stdbool.h>
+#include <linux/types.h>
 #define PCR_PORTID_SHIFT	16
 
 /**
diff --git a/include/palmas.h b/include/palmas.h
index 20c7e489c1ca..67cc5d3ba27e 100644
--- a/include/palmas.h
+++ b/include/palmas.h
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <i2c.h>
+#include <linux/types.h>
 
 /* I2C chip addresses, TW6035/37 */
 #define TWL603X_CHIP_P1		0x48	/* Page 1 */
diff --git a/include/part.h b/include/part.h
index 55be724d20f9..8e06ca99c285 100644
--- a/include/part.h
+++ b/include/part.h
@@ -10,6 +10,7 @@
 #include <ide.h>
 #include <uuid.h>
 #include <linux/list.h>
+#include <linux/types.h>
 
 struct block_drvr {
 	char *name;
diff --git a/include/part_efi.h b/include/part_efi.h
index 1929e4400f1e..983f6eb2647a 100644
--- a/include/part_efi.h
+++ b/include/part_efi.h
@@ -12,7 +12,9 @@
  * http://developer.intel.com/technology/efi/efi.htm
 */
 
+#include <compiler.h>
 #include <linux/compiler.h>
+#include <linux/types.h>
 
 #ifndef _DISK_PART_EFI_H
 #define _DISK_PART_EFI_H
diff --git a/include/pca953x.h b/include/pca953x.h
index aa4401acf0d6..30631a9b1f71 100644
--- a/include/pca953x.h
+++ b/include/pca953x.h
@@ -6,6 +6,7 @@
 #ifndef __PCA953X_H_
 #define __PCA953X_H_
 
+#include <linux/types.h>
 #define PCA953X_IN		0x00
 #define PCA953X_OUT		0x01
 #define PCA953X_POL		0x02
diff --git a/include/pca9698.h b/include/pca9698.h
index 48a5f756e28a..a2ac8fd4e054 100644
--- a/include/pca9698.h
+++ b/include/pca9698.h
@@ -7,6 +7,7 @@
 #ifndef __PCA9698_H_
 #define __PCA9698_H_
 
+#include <asm/types.h>
 int pca9698_request(unsigned gpio, const char *label);
 void pca9698_free(unsigned gpio);
 int pca9698_direction_input(u8 addr, unsigned gpio);
diff --git a/include/pch.h b/include/pch.h
index aefd2b69f5c2..f4a322f51a27 100644
--- a/include/pch.h
+++ b/include/pch.h
@@ -9,6 +9,7 @@
 
 #include <stdbool.h>
 #include <linux/bitops.h>
+#include <linux/types.h>
 #define PCH_RCBA		0xf0
 
 #define BIOS_CTRL_BIOSWE	BIT(0)
diff --git a/include/pci.h b/include/pci.h
index 34d97a23a895..94f1522353fd 100644
--- a/include/pci.h
+++ b/include/pci.h
@@ -503,6 +503,7 @@
 #ifndef __ASSEMBLY__
 
 #include <dm/pci.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_SYS_PCI_64BIT
 typedef u64 pci_addr_t;
diff --git a/include/pci_ep.h b/include/pci_ep.h
index 00e8c6d8ab10..fdf620a6e297 100644
--- a/include/pci_ep.h
+++ b/include/pci_ep.h
@@ -12,6 +12,7 @@
 #define _PCI_EP_H
 
 #include <pci.h>
+#include <linux/types.h>
 
 /**
  * enum pci_interrupt_pin - PCI INTx interrupt values
diff --git a/include/pci_rom.h b/include/pci_rom.h
index 895c9627f4d7..f4ece59d0f11 100644
--- a/include/pci_rom.h
+++ b/include/pci_rom.h
@@ -6,6 +6,7 @@
 #ifndef _PCI_ROM_H
 #define _PCI_ROM_H
 
+#include <linux/types.h>
 #define PCI_ROM_HDR			0xaa55
 
 struct pci_rom_header {
diff --git a/include/pe.h b/include/pe.h
index 086f2b860e99..e01a786b6708 100644
--- a/include/pe.h
+++ b/include/pe.h
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
 /*
+#include <linux/types.h>
  *  Portable Executable binary format structures
  *
  *  Copyright (c) 2016 Alexander Graf
diff --git a/include/phy.h b/include/phy.h
index 2ac49ea8dbbb..e1c2670a40ea 100644
--- a/include/phy.h
+++ b/include/phy.h
@@ -19,6 +19,7 @@
 #include <linux/mii.h>
 #include <linux/ethtool.h>
 #include <linux/mdio.h>
+#include <linux/types.h>
 
 struct udevice;
 
diff --git a/include/physmem.h b/include/physmem.h
index 03d3a78b741f..bfcc937c25dc 100644
--- a/include/physmem.h
+++ b/include/physmem.h
@@ -18,4 +18,5 @@
  *
  * @return	The physical address of the memory which was set.
  */
+#include <asm/types.h>
 phys_addr_t arch_phys_memset(phys_addr_t s, int c, phys_size_t n);
diff --git a/include/post.h b/include/post.h
index eb218acde5f4..89c2f51b0402 100644
--- a/include/post.h
+++ b/include/post.h
@@ -13,6 +13,7 @@
 #ifndef	__ASSEMBLY__
 #include <common.h>
 #include <asm/io.h>
+#include <linux/types.h>
 
 #if defined(CONFIG_POST)
 
diff --git a/include/power/acpi_pmc.h b/include/power/acpi_pmc.h
index 2993edcdb54e..3b14495ce083 100644
--- a/include/power/acpi_pmc.h
+++ b/include/power/acpi_pmc.h
@@ -197,4 +197,5 @@ int pmc_gpe_init(struct udevice *dev);
 #endif /* !__ACPI__ */
 
 #include <stdbool.h>
+#include <linux/types.h>
 #endif
diff --git a/include/power/as3722.h b/include/power/as3722.h
index f5398123f2a9..59a6d8bad3be 100644
--- a/include/power/as3722.h
+++ b/include/power/as3722.h
@@ -6,6 +6,7 @@
 #ifndef __POWER_AS3722_H__
 #define __POWER_AS3722_H__
 
+#include <asm/types.h>
 struct udevice;
 
 #define AS3722_GPIO_OUTPUT_VDDH (1 << 0)
diff --git a/include/power/battery.h b/include/power/battery.h
index 1e3d59d76e60..74c63a3b16f3 100644
--- a/include/power/battery.h
+++ b/include/power/battery.h
@@ -7,6 +7,7 @@
 #ifndef __POWER_BATTERY_H_
 #define __POWER_BATTERY_H_
 
+#include <linux/types.h>
 struct battery {
 	unsigned int version;
 	unsigned int state_of_chrg;
diff --git a/include/power/fg_battery_cell_params.h b/include/power/fg_battery_cell_params.h
index b8c895bbabb1..2575f660cf7a 100644
--- a/include/power/fg_battery_cell_params.h
+++ b/include/power/fg_battery_cell_params.h
@@ -70,4 +70,5 @@ u16 cell_character2[16] = {
 	0x0100
 };
 #endif
+#include <asm/types.h>
 #endif /* __FG_BATTERY_CELL_PARAMS_H_ */
diff --git a/include/power/hi6553_pmic.h b/include/power/hi6553_pmic.h
index d0abe207551d..2ce9e521f112 100644
--- a/include/power/hi6553_pmic.h
+++ b/include/power/hi6553_pmic.h
@@ -8,6 +8,7 @@
 #define __HI6553_PMIC_H__
 
 /* Registers */
+#include <asm/types.h>
 enum {
 	HI6553_VERSION_REG = 0x000,
 	HI6553_ENABLE2_LDO1_8 = 0x029,
diff --git a/include/power/max77686_pmic.h b/include/power/max77686_pmic.h
index 82fe3509a0b7..162b6e3dc88a 100644
--- a/include/power/max77686_pmic.h
+++ b/include/power/max77686_pmic.h
@@ -7,6 +7,7 @@
 #ifndef __MAX77686_H_
 #define __MAX77686_H_
 
+#include <linux/types.h>
 #include <power/pmic.h>
 
 enum {
diff --git a/include/power/mc34vr500_pmic.h b/include/power/mc34vr500_pmic.h
index d2edda68905c..cff0172e8973 100644
--- a/include/power/mc34vr500_pmic.h
+++ b/include/power/mc34vr500_pmic.h
@@ -7,6 +7,7 @@
 #ifndef __MC34VR500_H_
 #define __MC34VR500_H_
 
+#include <linux/types.h>
 #include <power/pmic.h>
 
 #define MC34VR500_I2C_ADDR	0x08
diff --git a/include/power/pmic.h b/include/power/pmic.h
index be9de6b4de7e..f88db45999c9 100644
--- a/include/power/pmic.h
+++ b/include/power/pmic.h
@@ -13,6 +13,7 @@
 #include <dm/ofnode.h>
 #include <i2c.h>
 #include <linux/list.h>
+#include <linux/types.h>
 #include <power/power_chrg.h>
 
 enum { PMIC_I2C, PMIC_SPI, PMIC_NONE};
diff --git a/include/power/regulator.h b/include/power/regulator.h
index 6f5b8b058dfe..f46e09783a5c 100644
--- a/include/power/regulator.h
+++ b/include/power/regulator.h
@@ -8,6 +8,7 @@
 #define _INCLUDE_REGULATOR_H_
 
 #include <stdbool.h>
+#include <asm/types.h>
 struct udevice;
 
 /**
diff --git a/include/power/rk8xx_pmic.h b/include/power/rk8xx_pmic.h
index 8ff0af35c57a..0fa03d16b5db 100644
--- a/include/power/rk8xx_pmic.h
+++ b/include/power/rk8xx_pmic.h
@@ -7,6 +7,7 @@
 #ifndef _PMIC_RK8XX_H_
 #define _PMIC_RK8XX_H_
 
+#include <asm/types.h>
 enum {
 	REG_SECONDS			= 0x00,
 	REG_MINUTES,
diff --git a/include/power/s5m8767.h b/include/power/s5m8767.h
index f75ed5d928fc..cbfbd91d2140 100644
--- a/include/power/s5m8767.h
+++ b/include/power/s5m8767.h
@@ -6,6 +6,7 @@
 #ifndef __S5M8767_H_
 #define __S5M8767_H_
 
+#include <asm/types.h>
 enum s5m8767_regnum {
 	S5M8767_BUCK1 = 0,
 	S5M8767_BUCK2,
diff --git a/include/power/tps65217.h b/include/power/tps65217.h
index 669a94a6c874..2e95397b53b7 100644
--- a/include/power/tps65217.h
+++ b/include/power/tps65217.h
@@ -10,6 +10,7 @@
 #define __POWER_TPS65217_H__
 
 /* I2C chip address */
+#include <linux/types.h>
 #define TPS65217_CHIP_PM			0x24
 
 /* Registers */
diff --git a/include/power/tps65218.h b/include/power/tps65218.h
index bb66c3f3ab65..3bd5c1a3688d 100644
--- a/include/power/tps65218.h
+++ b/include/power/tps65218.h
@@ -8,6 +8,7 @@
 #define __POWER_TPS65218_H__
 
 #include <linux/bitops.h>
+#include <linux/types.h>
 
 /* I2C chip address */
 #define TPS65218_CHIP_PM			0x24
diff --git a/include/power/tps65910_pmic.h b/include/power/tps65910_pmic.h
index 66214786d3e6..f06d9be6b295 100644
--- a/include/power/tps65910_pmic.h
+++ b/include/power/tps65910_pmic.h
@@ -6,6 +6,7 @@
 #ifndef __TPS65910_PMIC_H_
 #define __TPS65910_PMIC_H_
 
+#include <linux/types.h>
 #define TPS65910_I2C_SEL_MASK		(0x1 << 4)
 #define TPS65910_VDD_SR_MASK		(0x1 << 7)
 #define TPS65910_GAIN_SEL_MASK		(0x3 << 6)
diff --git a/include/pwm.h b/include/pwm.h
index 1791afec5513..c42804393977 100644
--- a/include/pwm.h
+++ b/include/pwm.h
@@ -11,6 +11,7 @@
 #define _pwm_h_
 
 #include <stdbool.h>
+#include <linux/types.h>
 struct udevice;
 
 /* struct pwm_ops: Operations for the PWM uclass */
diff --git a/include/pxa_lcd.h b/include/pxa_lcd.h
index 11a22abca6dc..a8a5f8c2da49 100644
--- a/include/pxa_lcd.h
+++ b/include/pxa_lcd.h
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
 /*
+#include <linux/types.h>
  * pxa_lcd.h - PXA LCD Controller structures
  *
  * (C) Copyright 2001
diff --git a/include/qfw.h b/include/qfw.h
index cb56ea58192a..44b2d184b9b9 100644
--- a/include/qfw.h
+++ b/include/qfw.h
@@ -6,8 +6,10 @@
 #ifndef __FW_CFG__
 #define __FW_CFG__
 
+#include <compiler.h>
 #include <stdbool.h>
 #include <linux/list.h>
+#include <linux/types.h>
 
 enum qemu_fwcfg_items {
 	FW_CFG_SIGNATURE	= 0x00,
diff --git a/include/ram.h b/include/ram.h
index 273d41539400..3addf70d050d 100644
--- a/include/ram.h
+++ b/include/ram.h
@@ -7,6 +7,7 @@
 #ifndef __RAM_H
 #define __RAM_H
 
+#include <linux/types.h>
 struct udevice;
 
 struct ram_info {
diff --git a/include/regmap.h b/include/regmap.h
index 5a3f3dce02cc..2995b132f7ef 100644
--- a/include/regmap.h
+++ b/include/regmap.h
@@ -10,6 +10,7 @@
 #include <time.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 /**
  * DOC: Overview
diff --git a/include/remoteproc.h b/include/remoteproc.h
index c8c286e27f12..bc2722e3c50a 100644
--- a/include/remoteproc.h
+++ b/include/remoteproc.h
@@ -16,6 +16,7 @@
 #include <stdbool.h>
 #include <dm/platdata.h>	/* For platform data support - non dt world */
 #include <linux/errno.h>
+#include <linux/types.h>
 
 /**
  * enum rproc_mem_type - What type of memory model does the rproc use
diff --git a/include/rng.h b/include/rng.h
index 37af55436317..87e26f5647e6 100644
--- a/include/rng.h
+++ b/include/rng.h
@@ -6,6 +6,8 @@
 #if !defined _RNG_H_
 #define _RNG_H_
 
+#include <linux/types.h>
+
 struct udevice;
 
 /**
diff --git a/include/rtc.h b/include/rtc.h
index 5033fde5ac89..e5d29af73321 100644
--- a/include/rtc.h
+++ b/include/rtc.h
@@ -16,6 +16,7 @@
 #include <stdbool.h>
 #include <bcd.h>
 #include <rtc_def.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_DM_RTC
 
diff --git a/include/s_record.h b/include/s_record.h
index 3ece695941d3..71105e261fb3 100644
--- a/include/s_record.h
+++ b/include/s_record.h
@@ -75,6 +75,7 @@
  *--------------------------------------------------------------------------
  */
 
+#include <linux/types.h>
 #define SREC_START	0	/* Start Record (module name)		    */
 #define SREC_DATA2	1	/* Data  Record with 2 byte address	    */
 #define SREC_DATA3	2	/* Data  Record with 3 byte address	    */
diff --git a/include/samsung/misc.h b/include/samsung/misc.h
index 4ff28a1df0e8..4bead98a6e49 100644
--- a/include/samsung/misc.h
+++ b/include/samsung/misc.h
@@ -32,6 +32,7 @@ void draw_logo(void);
 char *get_dfu_alt_system(char *interface, char *devstr);
 char *get_dfu_alt_boot(char *interface, char *devstr);
 #endif
+#include <asm/types.h>
 void set_board_type(void);
 void set_board_revision(void);
 const char *get_board_type(void);
diff --git a/include/sandbox-clk.h b/include/sandbox-clk.h
index 296cddfbb0ef..eae8673594f5 100644
--- a/include/sandbox-clk.h
+++ b/include/sandbox-clk.h
@@ -7,6 +7,8 @@
 #ifndef __SANDBOX_CLK_H__
 #define __SANDBOX_CLK_H__
 
+#include <compiler.h>
+#include <asm/types.h>
 #include <linux/clk-provider.h>
 
 enum {
diff --git a/include/sandboxfs.h b/include/sandboxfs.h
index 783dd5c88a73..e311117225f1 100644
--- a/include/sandboxfs.h
+++ b/include/sandboxfs.h
@@ -18,6 +18,7 @@
 #ifndef __SANDBOX_FS__
 #define __SANDBOX_FS__
 
+#include <linux/types.h>
 struct blk_desc;
 struct disk_partition;
 
diff --git a/include/sandboxtee.h b/include/sandboxtee.h
index 419643a0246b..fc2d16535535 100644
--- a/include/sandboxtee.h
+++ b/include/sandboxtee.h
@@ -7,6 +7,7 @@
 #define __SANDBOXTEE_H
 
 #include <search.h>
+#include <asm/types.h>
 #include <tee/optee_ta_avb.h>
 
 /**
diff --git a/include/sata.h b/include/sata.h
index d89f7a8a298c..3a9591e29138 100644
--- a/include/sata.h
+++ b/include/sata.h
@@ -1,6 +1,7 @@
 #ifndef __SATA_H__
 #define __SATA_H__
 #include <part.h>
+#include <linux/types.h>
 
 #if !defined(CONFIG_DM_SCSI) && !defined(CONFIG_AHCI)
 int init_sata(int dev);
diff --git a/include/sdhci.h b/include/sdhci.h
index c47dda8dae3b..291a9ca5933f 100644
--- a/include/sdhci.h
+++ b/include/sdhci.h
@@ -9,6 +9,7 @@
 #ifndef __SDHCI_HW_H
 #define __SDHCI_HW_H
 
+#include <compiler.h>
 #include <stdbool.h>
 #include <linux/bitops.h>
 #include <linux/types.h>
diff --git a/include/search.h b/include/search.h
index e56843c26fda..35512ca6c6e9 100644
--- a/include/search.h
+++ b/include/search.h
@@ -16,6 +16,7 @@
 
 #include <env.h>
 #include <stddef.h>
+#include <linux/types.h>
 
 #define set_errno(val) do { errno = val; } while (0)
 
diff --git a/include/serial.h b/include/serial.h
index 8ce32bc70ef6..6f7cc3183f8e 100644
--- a/include/serial.h
+++ b/include/serial.h
@@ -3,6 +3,7 @@
 
 #include <stdbool.h>
 #include <post.h>
+#include <linux/types.h>
 
 struct serial_device {
 	/* enough bytes to match alignment of following func pointer */
diff --git a/include/sja1000.h b/include/sja1000.h
index 6ceb6f4d48f2..2ab0dfdc1b21 100644
--- a/include/sja1000.h
+++ b/include/sja1000.h
@@ -11,6 +11,7 @@
 /*
  * SJA1000 register layout in basic can mode
  */
+#include <asm/types.h>
 struct sja1000_basic_s {
 	u8 cr;
 	u8 cmr;
diff --git a/include/smbios.h b/include/smbios.h
index 97b9ddce2376..6ad2234fc774 100644
--- a/include/smbios.h
+++ b/include/smbios.h
@@ -9,6 +9,8 @@
 #define _SMBIOS_H_
 
 /* SMBIOS spec version implemented */
+#include <compiler.h>
+#include <linux/types.h>
 #define SMBIOS_MAJOR_VER	3
 #define SMBIOS_MINOR_VER	0
 
diff --git a/include/smem.h b/include/smem.h
index 598799d3a0cf..ea1f0e24c478 100644
--- a/include/smem.h
+++ b/include/smem.h
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
 /*
+#include <linux/types.h>
  * The shared memory system is an allocate-only heap structure that
  * consists of one of more memory areas that can be accessed by the processors
  * in the SoC.
diff --git a/include/smsc_lpc47m.h b/include/smsc_lpc47m.h
index 8a972acd4c74..7da8fcab6b5a 100644
--- a/include/smsc_lpc47m.h
+++ b/include/smsc_lpc47m.h
@@ -7,6 +7,7 @@
 #define _SMSC_LPC47M_H_
 
 /* I/O address of LPC47M */
+#include <linux/types.h>
 #define LPC47M_IO_PORT	0x2e
 
 /* Logical device number */
diff --git a/include/sort.h b/include/sort.h
index 0c6b588fcb0d..8489d066d5f5 100644
--- a/include/sort.h
+++ b/include/sort.h
@@ -17,6 +17,7 @@
  *	  0 if element at s1 == element at s2,
  *	> 0 if element at s1 > element at s2,
  */
+#include <linux/types.h>
 void qsort(void *base, size_t nmemb, size_t size,
 	   int (*compar)(const void *s1, const void *s2));
 
diff --git a/include/sound.h b/include/sound.h
index 71bd850652e4..55dd66187146 100644
--- a/include/sound.h
+++ b/include/sound.h
@@ -7,6 +7,7 @@
 #ifndef __SOUND_H__
 #define __SOUND_H__
 
+#include <linux/types.h>
 /* sound codec enum */
 enum sound_compat {
 	AUDIO_COMPAT_SPI,
diff --git a/include/spi-mem.h b/include/spi-mem.h
index 918e7a1659c6..04f66b86b6c2 100644
--- a/include/spi-mem.h
+++ b/include/spi-mem.h
@@ -14,6 +14,7 @@
 struct udevice;
 
 #include <stdbool.h>
+#include <asm/types.h>
 
 #define SPI_MEM_OP_CMD(__opcode, __buswidth)			\
 	{							\
diff --git a/include/spi.h b/include/spi.h
index ef8c1f6692e2..5d9e1b12d18e 100644
--- a/include/spi.h
+++ b/include/spi.h
@@ -11,6 +11,7 @@
 
 #include <common.h>
 #include <linux/bitops.h>
+#include <linux/types.h>
 
 /* SPI mode flags */
 #define SPI_CPHA	BIT(0)	/* clock phase (1 = SPI_CLOCK_PHASE_SECOND) */
diff --git a/include/spl.h b/include/spl.h
index 7185cc344f04..05586702d6c7 100644
--- a/include/spl.h
+++ b/include/spl.h
@@ -8,6 +8,7 @@
 
 #include <binman_sym.h>
 #include <linker_lists.h>
+#include <linux/types.h>
 
 /* Platform-specific defines */
 #include <linux/compiler.h>
diff --git a/include/spl_gpio.h b/include/spl_gpio.h
index e410e62914de..6a63cbab9359 100644
--- a/include/spl_gpio.h
+++ b/include/spl_gpio.h
@@ -10,6 +10,7 @@
 #define __SPL_GPIO_H
 
 #include <asm/gpio.h>
+#include <linux/types.h>
 
 /*
  * The functions listed here should be implemented in the SoC GPIO driver.
diff --git a/include/splash.h b/include/splash.h
index 8b70e4a8068b..bc8511cce232 100644
--- a/include/splash.h
+++ b/include/splash.h
@@ -24,6 +24,7 @@
 
 #include <errno.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 enum splash_storage {
 	SPLASH_STORAGE_NAND,
diff --git a/include/spmi/spmi.h b/include/spmi/spmi.h
index 3242e6bbd07f..7e80bf610d15 100644
--- a/include/spmi/spmi.h
+++ b/include/spmi/spmi.h
@@ -2,6 +2,7 @@
 #define _SPMI_SPMI_H
 
 /**
+#include <linux/types.h>
  * struct dm_spmi_ops - SPMI device I/O interface
  *
  * Should be implemented by UCLASS_SPMI device drivers. The standard
diff --git a/include/stm32_rcc.h b/include/stm32_rcc.h
index dc3039d11ac5..b5e857e57628 100644
--- a/include/stm32_rcc.h
+++ b/include/stm32_rcc.h
@@ -8,6 +8,7 @@
 #define __STM32_RCC_H_
 
 #include <stdbool.h>
+#include <asm/types.h>
 #define AHB_PSC_1			0
 #define AHB_PSC_2			0x8
 #define AHB_PSC_4			0x9
diff --git a/include/stratixII.h b/include/stratixII.h
index 3c06bb2955a9..ece173305ce6 100644
--- a/include/stratixII.h
+++ b/include/stratixII.h
@@ -6,6 +6,7 @@
 #ifndef _STRATIXII_H_
 #define _STRATIXII_H_
 
+#include <linux/types.h>
 extern int StratixII_load (Altera_desc * desc, void *image, size_t size);
 extern int StratixII_dump (Altera_desc * desc, void *buf, size_t bsize);
 extern int StratixII_info (Altera_desc * desc);
diff --git a/include/syscon.h b/include/syscon.h
index 3df96e32764c..8b276eaa7f2f 100644
--- a/include/syscon.h
+++ b/include/syscon.h
@@ -9,6 +9,7 @@
 
 #include <dm/ofnode.h>
 #include <fdtdec.h>
+#include <linux/types.h>
 
 /**
  * struct syscon_uc_info - Information stored by the syscon UCLASS_UCLASS
diff --git a/include/sysreset.h b/include/sysreset.h
index 8bb094d463b3..4857aaa3ae48 100644
--- a/include/sysreset.h
+++ b/include/sysreset.h
@@ -7,6 +7,7 @@
 #ifndef __SYSRESET_H
 #define __SYSRESET_H
 
+#include <linux/types.h>
 struct udevice;
 
 enum sysreset_t {
diff --git a/include/tables_csum.h b/include/tables_csum.h
index 5f7edc419ba2..5adee2f94758 100644
--- a/include/tables_csum.h
+++ b/include/tables_csum.h
@@ -6,6 +6,7 @@
 #ifndef _TABLES_CSUM_H_
 #define _TABLES_CSUM_H_
 
+#include <asm/types.h>
 static inline u8 table_compute_checksum(void *v, int len)
 {
 	u8 *bytes = v;
diff --git a/include/tca642x.h b/include/tca642x.h
index bda86c1ed883..b75d677d7953 100644
--- a/include/tca642x.h
+++ b/include/tca642x.h
@@ -33,6 +33,7 @@ enum {
 };
 #endif
 
+#include <linux/types.h>
 #define TCA642X_OUT_LOW		0
 #define TCA642X_OUT_HIGH	1
 #define TCA642X_POL_NORMAL	0
diff --git a/include/tee.h b/include/tee.h
index a73ec5a48c23..b4ad18e0a88d 100644
--- a/include/tee.h
+++ b/include/tee.h
@@ -9,6 +9,7 @@
 #include <stdbool.h>
 #include <linux/bitops.h>
 #include <linux/list.h>
+#include <linux/types.h>
 
 #define TEE_UUID_LEN		16
 
diff --git a/include/tee/optee.h b/include/tee/optee.h
index affa937da08c..5c872b4b4f66 100644
--- a/include/tee/optee.h
+++ b/include/tee/optee.h
@@ -11,6 +11,7 @@
 
 #include <linux/errno.h>
 #include <image.h>
+#include <linux/types.h>
 
 #define OPTEE_MAGIC             0x4554504f
 #define OPTEE_VERSION           1
diff --git a/include/tegra-kbc.h b/include/tegra-kbc.h
index f331c79c9d54..cf602a004c3c 100644
--- a/include/tegra-kbc.h
+++ b/include/tegra-kbc.h
@@ -8,6 +8,7 @@
 #define __include_tegra_kbc_h__
 
 #include <common.h>
+#include <asm/types.h>
 
 #define KEY_IS_MODIFIER(key) ((key) >= KEY_FIRST_MODIFIER)
 
diff --git a/include/test/ut.h b/include/test/ut.h
index 28c3f3fba750..e145dae22ea9 100644
--- a/include/test/ut.h
+++ b/include/test/ut.h
@@ -13,6 +13,7 @@
 #include <linux/err.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <test/test.h>
 
 struct unit_test_state;
diff --git a/include/timer.h b/include/timer.h
index a49b500ce358..dc96135de028 100644
--- a/include/timer.h
+++ b/include/timer.h
@@ -13,6 +13,7 @@
  *
  * @return - 0 on success or error number
  */
+#include <asm/types.h>
 int dm_timer_init(void);
 
 /*
diff --git a/include/tlv_eeprom.h b/include/tlv_eeprom.h
index f523d972d06e..0b3952145253 100644
--- a/include/tlv_eeprom.h
+++ b/include/tlv_eeprom.h
@@ -9,6 +9,7 @@
 
 #include <compiler.h>
 #include <stdbool.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 
diff --git a/include/tpm-common.h b/include/tpm-common.h
index c1309a2735d1..b03083408b7a 100644
--- a/include/tpm-common.h
+++ b/include/tpm-common.h
@@ -8,6 +8,7 @@
 #define __TPM_COMMON_H
 
 #include <command.h>
+#include <linux/types.h>
 
 struct udevice;
 
diff --git a/include/tpm-v1.h b/include/tpm-v1.h
index 8f6cc28a9ea6..4bd964558d2b 100644
--- a/include/tpm-v1.h
+++ b/include/tpm-v1.h
@@ -7,8 +7,10 @@
 #ifndef __TPM_V1_H
 #define __TPM_V1_H
 
+#include <compiler.h>
 #include <tpm-common.h>
 #include <linux/bitops.h>
+#include <linux/types.h>
 
 struct udevice;
 
diff --git a/include/tpm-v2.h b/include/tpm-v2.h
index 3b2fe4490072..601c0e33c8a6 100644
--- a/include/tpm-v2.h
+++ b/include/tpm-v2.h
@@ -8,6 +8,7 @@
 #define __TPM_V2_H
 
 #include <tpm-common.h>
+#include <linux/types.h>
 
 #define TPM2_DIGEST_LEN		32
 
diff --git a/include/trace.h b/include/trace.h
index 606dba976897..2bb3afc26897 100644
--- a/include/trace.h
+++ b/include/trace.h
@@ -6,6 +6,7 @@
 #ifndef __TRACE_H
 #define __TRACE_H
 
+#include <linux/types.h>
 enum {
 	/*
 	 * This affects the granularity of our trace. We can bin function
diff --git a/include/tsec.h b/include/tsec.h
index 630c30b63963..474f259d93e4 100644
--- a/include/tsec.h
+++ b/include/tsec.h
@@ -13,10 +13,12 @@
 #ifndef __TSEC_H
 #define __TSEC_H
 
+#include <compiler.h>
 #include <net.h>
 #include <config.h>
 #include <phy.h>
 #include <asm/u-boot.h>
+#include <linux/types.h>
 
 #define TSEC_MDIO_REGS_OFFSET	0x520
 
diff --git a/include/twl4030.h b/include/twl4030.h
index c27ad615eebf..119242ba713c 100644
--- a/include/twl4030.h
+++ b/include/twl4030.h
@@ -13,6 +13,7 @@
 
 #include <common.h>
 #include <i2c.h>
+#include <asm/types.h>
 
 /* I2C chip addresses */
 
diff --git a/include/twl6030.h b/include/twl6030.h
index 41f17de3ab55..29d8baac0170 100644
--- a/include/twl6030.h
+++ b/include/twl6030.h
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <i2c.h>
+#include <asm/types.h>
 
 /* I2C chip addresses */
 #define TWL6030_CHIP_PM		0x48
diff --git a/include/u-boot/aes.h b/include/u-boot/aes.h
index ee6863945095..391991c03c2a 100644
--- a/include/u-boot/aes.h
+++ b/include/u-boot/aes.h
@@ -9,6 +9,7 @@
 #include <errno.h>
 #include <image.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #if IMAGE_ENABLE_ENCRYPT
 int image_aes_encrypt(struct image_cipher_info *info,
diff --git a/include/u-boot/crc.h b/include/u-boot/crc.h
index bfd477f31d20..8a007c7827fa 100644
--- a/include/u-boot/crc.h
+++ b/include/u-boot/crc.h
@@ -9,6 +9,7 @@
 #define _UBOOT_CRC_H
 
 #include <compiler.h> /* 'uint*' definitions */
+#include <linux/types.h>
 
 /**
  * crc8() - Calculate and return CRC-8 of the data
diff --git a/include/u-boot/rsa-checksum.h b/include/u-boot/rsa-checksum.h
index 54e6a73744e1..6d179580f086 100644
--- a/include/u-boot/rsa-checksum.h
+++ b/include/u-boot/rsa-checksum.h
@@ -8,6 +8,7 @@
 
 #include <errno.h>
 #include <image.h>
+#include <linux/types.h>
 #include <u-boot/sha1.h>
 #include <u-boot/sha256.h>
 #include <u-boot/sha512.h>
diff --git a/include/u-boot/rsa-mod-exp.h b/include/u-boot/rsa-mod-exp.h
index 1da8af1bb83d..bb2b88a171da 100644
--- a/include/u-boot/rsa-mod-exp.h
+++ b/include/u-boot/rsa-mod-exp.h
@@ -8,6 +8,7 @@
 
 #include <errno.h>
 #include <image.h>
+#include <linux/types.h>
 
 /**
  * struct key_prop - holder for a public key properties
diff --git a/include/u-boot/rsa.h b/include/u-boot/rsa.h
index 6d5f50a0030b..7a572c379d14 100644
--- a/include/u-boot/rsa.h
+++ b/include/u-boot/rsa.h
@@ -14,6 +14,7 @@
 #include <errno.h>
 #include <image.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 /**
  * struct rsa_public_key - holder for a public key
diff --git a/include/u-boot/sha1.h b/include/u-boot/sha1.h
index 283f10329362..fc5d257ecc76 100644
--- a/include/u-boot/sha1.h
+++ b/include/u-boot/sha1.h
@@ -18,6 +18,7 @@
 extern "C" {
 #endif
 
+#include <linux/types.h>
 #define SHA1_SUM_POS	-0x20
 #define SHA1_SUM_LEN	20
 #define SHA1_DER_LEN	15
diff --git a/include/u-boot/sha256.h b/include/u-boot/sha256.h
index 9aa1251789a3..d7534c79b567 100644
--- a/include/u-boot/sha256.h
+++ b/include/u-boot/sha256.h
@@ -1,6 +1,7 @@
 #ifndef _SHA256_H
 #define _SHA256_H
 
+#include <linux/types.h>
 #define SHA256_SUM_LEN	32
 #define SHA256_DER_LEN	19
 
diff --git a/include/u-boot/sha512.h b/include/u-boot/sha512.h
index 516729d77506..8551b2ef1789 100644
--- a/include/u-boot/sha512.h
+++ b/include/u-boot/sha512.h
@@ -1,6 +1,7 @@
 #ifndef _SHA512_H
 #define _SHA512_H
 
+#include <linux/types.h>
 #define SHA384_SUM_LEN          48
 #define SHA384_DER_LEN          19
 #define SHA512_SUM_LEN          64
diff --git a/include/u-boot/zlib.h b/include/u-boot/zlib.h
index a33cc8780d33..663aa2bbf785 100644
--- a/include/u-boot/zlib.h
+++ b/include/u-boot/zlib.h
@@ -342,6 +342,7 @@ typedef uLong FAR uLongf;
 #endif
 
 #  ifdef VMS
+#include <linux/types.h>
 #    include <unixio.h>   /* for off_t */
 #  endif
 #  define z_off_t off_t
diff --git a/include/ubifs_uboot.h b/include/ubifs_uboot.h
index b025779d59ff..ac608cf64396 100644
--- a/include/ubifs_uboot.h
+++ b/include/ubifs_uboot.h
@@ -14,6 +14,7 @@
 #ifndef __UBIFS_UBOOT_H__
 #define __UBIFS_UBOOT_H__
 
+#include <linux/types.h>
 struct blk_desc;
 struct disk_partition;
 
diff --git a/include/ubispl.h b/include/ubispl.h
index ecfe0c93c133..1493c07d57a9 100644
--- a/include/ubispl.h
+++ b/include/ubispl.h
@@ -5,6 +5,7 @@
 #ifndef __UBOOT_UBISPL_H
 #define __UBOOT_UBISPL_H
 
+#include <asm/types.h>
 #define UBI_VOL_NAME_MAX	127
 
 /*
diff --git a/include/uboot_aes.h b/include/uboot_aes.h
index d2583bed9920..5b0b114c8f75 100644
--- a/include/uboot_aes.h
+++ b/include/uboot_aes.h
@@ -21,6 +21,7 @@ typedef unsigned int u32;
  * in this case being AES_BLOCK_LENGTH bytes.
  */
 
+#include <asm/types.h>
 enum {
 	AES_STATECOLS	= 4,	/* columns in the state & expanded key */
 	AES128_KEYCOLS	= 4,	/* columns in a key for aes128 */
diff --git a/include/usb.h b/include/usb.h
index 89b219486c25..721cfb280d0a 100644
--- a/include/usb.h
+++ b/include/usb.h
@@ -14,6 +14,7 @@
 #include <fdtdec.h>
 #include <stdbool.h>
 #include <usb_defs.h>
+#include <linux/types.h>
 #include <linux/usb/ch9.h>
 #include <asm/cache.h>
 #include <part.h>
diff --git a/include/usb/designware_udc.h b/include/usb/designware_udc.h
index f874e5c35cc2..9f06dd6672e3 100644
--- a/include/usb/designware_udc.h
+++ b/include/usb/designware_udc.h
@@ -17,6 +17,7 @@
  * 3.  The RX/TX FIFO
  */
 
+#include <asm/types.h>
 #define MAX_ENDPOINTS		16
 
 struct udc_endp_regs {
diff --git a/include/usb/dwc2_udc.h b/include/usb/dwc2_udc.h
index 1d8c624d375f..49671c52fd02 100644
--- a/include/usb/dwc2_udc.h
+++ b/include/usb/dwc2_udc.h
@@ -10,6 +10,7 @@
 
 #include <stdbool.h>
 #include <dm/ofnode.h>
+#include <linux/types.h>
 
 #define PHY0_SLEEP              (1 << 5)
 #define DWC2_MAX_HW_ENDPOINTS	16
diff --git a/include/usb/ehci-ci.h b/include/usb/ehci-ci.h
index efb2eec5ce7a..a55ab587ef7d 100644
--- a/include/usb/ehci-ci.h
+++ b/include/usb/ehci-ci.h
@@ -9,6 +9,7 @@
 #define _EHCI_CI_H
 
 #include <asm/processor.h>
+#include <asm/types.h>
 
 #define CONTROL_REGISTER_W1C_MASK       0x00020000  /* W1C: PHY_CLK_VALID */
 
diff --git a/include/usb/fotg210.h b/include/usb/fotg210.h
index 292ce54e0c43..4b1228e85dc1 100644
--- a/include/usb/fotg210.h
+++ b/include/usb/fotg210.h
@@ -9,6 +9,7 @@
 #ifndef _FOTG210_H
 #define _FOTG210_H
 
+#include <linux/types.h>
 struct fotg210_regs {
 	/* USB Host Controller */
 	struct {
diff --git a/include/usb/fusbh200.h b/include/usb/fusbh200.h
index 6ae1d848801b..00a7ada90da8 100644
--- a/include/usb/fusbh200.h
+++ b/include/usb/fusbh200.h
@@ -9,6 +9,7 @@
 #ifndef _FUSBH200_H
 #define _FUSBH200_H
 
+#include <linux/types.h>
 struct fusbh200_regs {
 	struct {
 		uint32_t data[4];
diff --git a/include/usb/ulpi.h b/include/usb/ulpi.h
index 71642d257b67..53770162964f 100644
--- a/include/usb/ulpi.h
+++ b/include/usb/ulpi.h
@@ -18,6 +18,7 @@
 #ifndef __USB_ULPI_H__
 #define __USB_ULPI_H__
 
+#include <linux/types.h>
 #define ULPI_ERROR	(1 << 8) /* overflow from any register value */
 
 #ifndef CONFIG_USB_ULPI_TIMEOUT
diff --git a/include/usb/xhci.h b/include/usb/xhci.h
index 8d9c7917cb85..8e3f2f0b7a5f 100644
--- a/include/usb/xhci.h
+++ b/include/usb/xhci.h
@@ -24,6 +24,7 @@
 #include <linux/kernel.h>
 #include <linux/list.h>
 #include <linux/compat.h>
+#include <linux/types.h>
 
 #define MAX_EP_CTX_NUM		31
 #define XHCI_ALIGNMENT		64
diff --git a/include/usb_ether.h b/include/usb_ether.h
index e85acadb7f5f..ca11ca1eda3d 100644
--- a/include/usb_ether.h
+++ b/include/usb_ether.h
@@ -7,6 +7,7 @@
 #define __USB_ETHER_H__
 
 #include <net.h>
+#include <linux/types.h>
 
 /* TODO(sjg at chromium.org): Remove @pusb_dev when all boards use CONFIG_DM_ETH */
 struct ueth_data {
diff --git a/include/usb_mass_storage.h b/include/usb_mass_storage.h
index c7b770fa3e8b..163c7ce0df07 100644
--- a/include/usb_mass_storage.h
+++ b/include/usb_mass_storage.h
@@ -9,6 +9,7 @@
 
 #define SECTOR_SIZE		0x200
 #include <part.h>
+#include <linux/types.h>
 #include <linux/usb/composite.h>
 
 /* Wait at maximum 60 seconds for cable connection */
diff --git a/include/usbdevice.h b/include/usbdevice.h
index f479724e37b0..3a2e651effde 100644
--- a/include/usbdevice.h
+++ b/include/usbdevice.h
@@ -18,6 +18,7 @@
 #define __USBDCORE_H__
 
 #include <common.h>
+#include <asm/types.h>
 #include "usbdescriptors.h"
 
 
diff --git a/include/uuid.h b/include/uuid.h
index 73c5a89ec7cf..edcdbad06bc9 100644
--- a/include/uuid.h
+++ b/include/uuid.h
@@ -6,6 +6,7 @@
 #ifndef __UUID_H__
 #define __UUID_H__
 
+#include <compiler.h>
 #include <linux/bitops.h>
 
 /* This is structure is in big-endian */
diff --git a/include/vbe.h b/include/vbe.h
index 6e71610b8a86..310935baa10d 100644
--- a/include/vbe.h
+++ b/include/vbe.h
@@ -10,6 +10,8 @@
 #ifndef _VBE_H
 #define _VBE_H
 
+#include <compiler.h>
+#include <asm/types.h>
 /* these structs are for input from and output to OF */
 #include <stdbool.h>
 struct __packed vbe_screen_info {
diff --git a/include/video.h b/include/video.h
index 03e342c64051..a05beba736ca 100644
--- a/include/video.h
+++ b/include/video.h
@@ -244,6 +244,7 @@ static inline int video_sync_copy(struct udevice *dev, void *from, void *to)
 #endif
 
 #include <stdbool.h>
+#include <linux/types.h>
 #endif /* CONFIG_DM_VIDEO */
 
 #ifndef CONFIG_DM_VIDEO
diff --git a/include/video_bridge.h b/include/video_bridge.h
index b47cae664597..a2788759be32 100644
--- a/include/video_bridge.h
+++ b/include/video_bridge.h
@@ -9,6 +9,7 @@
 
 #include <stdbool.h>
 #include <asm/gpio.h>
+#include <asm/types.h>
 
 /**
  * struct video_bridge_priv - uclass information for video bridges
diff --git a/include/video_console.h b/include/video_console.h
index b033dc24b390..7f8791db177f 100644
--- a/include/video_console.h
+++ b/include/video_console.h
@@ -8,6 +8,7 @@
 
 #include <video.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 struct video_priv;
 
diff --git a/include/video_osd.h b/include/video_osd.h
index 01ac94b425c1..b68d31219c4a 100644
--- a/include/video_osd.h
+++ b/include/video_osd.h
@@ -7,6 +7,7 @@
 #ifndef _VIDEO_OSD_H_
 #define _VIDEO_OSD_H_
 
+#include <linux/types.h>
 struct video_osd_info {
 	/* The width of the OSD display in columns */
 	uint width;
diff --git a/include/virtio.h b/include/virtio.h
index fb8528de283c..ccaa3914b97b 100644
--- a/include/virtio.h
+++ b/include/virtio.h
@@ -25,6 +25,7 @@
 #include <linux/bitops.h>
 #include <linux/bug.h>
 #include <linux/typecheck.h>
+#include <linux/types.h>
 #define VIRTIO_ID_NET		1 /* virtio net */
 #define VIRTIO_ID_BLOCK		2 /* virtio block */
 #define VIRTIO_ID_RNG		4 /* virtio rng */
diff --git a/include/virtio_ring.h b/include/virtio_ring.h
index fff2d180d1b9..1f8fa9ecbb34 100644
--- a/include/virtio_ring.h
+++ b/include/virtio_ring.h
@@ -11,6 +11,7 @@
 
 #include <stdbool.h>
 #include <virtio_types.h>
+#include <linux/types.h>
 
 /* This marks a buffer as continuing via the next field */
 #define VRING_DESC_F_NEXT		1
diff --git a/include/vxworks.h b/include/vxworks.h
index c2585e61ced4..a67a5a380933 100644
--- a/include/vxworks.h
+++ b/include/vxworks.h
@@ -8,6 +8,7 @@
 #define _VXWORKS_H_
 
 #include <efi_api.h>
+#include <asm/types.h>
 
 struct bootm_headers;
 struct cmd_tbl;
diff --git a/include/w1-eeprom.h b/include/w1-eeprom.h
index 22337368b4b5..531177546942 100644
--- a/include/w1-eeprom.h
+++ b/include/w1-eeprom.h
@@ -9,6 +9,7 @@
 #ifndef __W1_EEPROM_H
 #define __W1_EEPROM_H
 
+#include <asm/types.h>
 struct udevice;
 
 struct w1_eeprom_ops {
diff --git a/include/w1.h b/include/w1.h
index a247e87dce15..2b9b1df446cd 100644
--- a/include/w1.h
+++ b/include/w1.h
@@ -11,6 +11,7 @@
 struct udevice;
 
 #include <stdbool.h>
+#include <asm/types.h>
 
 #define W1_FAMILY_DS24B33	0x23
 #define W1_FAMILY_DS2431	0x2d
diff --git a/include/wait_bit.h b/include/wait_bit.h
index 96a97bc327ef..c8ea1614c1eb 100644
--- a/include/wait_bit.h
+++ b/include/wait_bit.h
@@ -14,6 +14,7 @@
 #include <stdio.h>
 #include <time.h>
 #include <watchdog.h>
+#include <asm/types.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/io.h>
diff --git a/include/wdt.h b/include/wdt.h
index bc242c2eb26d..0aee2c70833a 100644
--- a/include/wdt.h
+++ b/include/wdt.h
@@ -6,6 +6,8 @@
 #ifndef _WDT_H_
 #define _WDT_H_
 
+#include <linux/types.h>
+
 struct udevice;
 
 /*
diff --git a/include/winbond_w83627.h b/include/winbond_w83627.h
index a58d8169276e..139e92be0953 100644
--- a/include/winbond_w83627.h
+++ b/include/winbond_w83627.h
@@ -7,6 +7,7 @@
 #define _WINBOND_W83627_H_
 
 /* I/O address of Winbond Super IO chip */
+#include <linux/types.h>
 #define WINBOND_IO_PORT		0x2e
 
 /* Logical device number */
diff --git a/include/xilinx.h b/include/xilinx.h
index ab4537becfad..eb971f01b850 100644
--- a/include/xilinx.h
+++ b/include/xilinx.h
@@ -5,6 +5,7 @@
  */
 
 #include <fpga.h>
+#include <linux/types.h>
 
 #ifndef _XILINX_H_
 #define _XILINX_H_
diff --git a/include/zfs/dmu_objset.h b/include/zfs/dmu_objset.h
index 43aa5824bd4c..5392ec0c5d0c 100644
--- a/include/zfs/dmu_objset.h
+++ b/include/zfs/dmu_objset.h
@@ -11,6 +11,7 @@
 #ifndef	_SYS_DMU_OBJSET_H
 #define	_SYS_DMU_OBJSET_H
 
+#include <linux/types.h>
 #include <zfs/zil.h>
 
 #define OBJSET_PHYS_SIZE	2048
diff --git a/include/zfs/dnode.h b/include/zfs/dnode.h
index f01772c2f95b..13bb4496466e 100644
--- a/include/zfs/dnode.h
+++ b/include/zfs/dnode.h
@@ -11,6 +11,7 @@
 #ifndef	_SYS_DNODE_H
 #define	_SYS_DNODE_H
 
+#include <linux/types.h>
 #include <zfs/spa.h>
 
 /*
diff --git a/include/zfs/dsl_dataset.h b/include/zfs/dsl_dataset.h
index b05be71aa2e7..5aac34feca6a 100644
--- a/include/zfs/dsl_dataset.h
+++ b/include/zfs/dsl_dataset.h
@@ -11,6 +11,7 @@
 #ifndef	_SYS_DSL_DATASET_H
 #define	_SYS_DSL_DATASET_H
 
+#include <linux/types.h>
 typedef struct dsl_dataset_phys {
 	uint64_t ds_dir_obj;
 	uint64_t ds_prev_snap_obj;
diff --git a/include/zfs/dsl_dir.h b/include/zfs/dsl_dir.h
index 7eeb0d8395b5..cc804c3a4afe 100644
--- a/include/zfs/dsl_dir.h
+++ b/include/zfs/dsl_dir.h
@@ -11,6 +11,7 @@
 #ifndef	_SYS_DSL_DIR_H
 #define	_SYS_DSL_DIR_H
 
+#include <linux/types.h>
 typedef struct dsl_dir_phys {
 	uint64_t dd_creation_time; /* not actually used */
 	uint64_t dd_head_dataset_obj;
diff --git a/include/zfs/sa_impl.h b/include/zfs/sa_impl.h
index 41c77b0973aa..0028a2b46af9 100644
--- a/include/zfs/sa_impl.h
+++ b/include/zfs/sa_impl.h
@@ -10,6 +10,7 @@
 #ifndef	_SYS_SA_IMPL_H
 #define	_SYS_SA_IMPL_H
 
+#include <linux/types.h>
 typedef struct sa_hdr_phys {
 	uint32_t sa_magic;
 	uint16_t sa_layout_info;
diff --git a/include/zfs/spa.h b/include/zfs/spa.h
index cd2ddf58e772..769085e2c304 100644
--- a/include/zfs/spa.h
+++ b/include/zfs/spa.h
@@ -14,6 +14,7 @@
 /*
  * General-purpose 32-bit and 64-bit bitfield encodings.
  */
+#include <linux/types.h>
 #define	BF32_DECODE(x, low, len)	P2PHASE((x) >> (low), 1U << (len))
 #define	BF64_DECODE(x, low, len)	P2PHASE((x) >> (low), 1ULL << (len))
 #define	BF32_ENCODE(x, low, len)	(P2PHASE((x), 1U << (len)) << (low))
diff --git a/include/zfs/uberblock_impl.h b/include/zfs/uberblock_impl.h
index 8045687ba898..97c1af93af9c 100644
--- a/include/zfs/uberblock_impl.h
+++ b/include/zfs/uberblock_impl.h
@@ -11,6 +11,7 @@
 #ifndef _SYS_UBERBLOCK_IMPL_H
 #define	_SYS_UBERBLOCK_IMPL_H
 
+#include <linux/types.h>
 #define UBMAX(a, b) ((a) > (b) ? (a) : (b))
 
 /*
diff --git a/include/zfs/vdev_impl.h b/include/zfs/vdev_impl.h
index de0e802f466a..7b0ed080e828 100644
--- a/include/zfs/vdev_impl.h
+++ b/include/zfs/vdev_impl.h
@@ -11,6 +11,7 @@
 #ifndef _SYS_VDEV_IMPL_H
 #define	_SYS_VDEV_IMPL_H
 
+#include <linux/types.h>
 #define	VDEV_SKIP_SIZE		(8 << 10)
 #define	VDEV_BOOT_HEADER_SIZE	(8 << 10)
 #define	VDEV_PHYS_SIZE		(112 << 10)
diff --git a/include/zfs/zap_impl.h b/include/zfs/zap_impl.h
index 6fe9fb66f231..cff7f36be378 100644
--- a/include/zfs/zap_impl.h
+++ b/include/zfs/zap_impl.h
@@ -10,6 +10,7 @@
 #ifndef	_SYS_ZAP_IMPL_H
 #define	_SYS_ZAP_IMPL_H
 
+#include <linux/types.h>
 #define	ZAP_MAGIC 0x2F52AB2ABULL
 
 #define	ZAP_HASHBITS		28
diff --git a/include/zfs/zap_leaf.h b/include/zfs/zap_leaf.h
index 2a778e2caf05..5deeae849d09 100644
--- a/include/zfs/zap_leaf.h
+++ b/include/zfs/zap_leaf.h
@@ -11,6 +11,7 @@
 #ifndef	_SYS_ZAP_LEAF_H
 #define	_SYS_ZAP_LEAF_H
 
+#include <linux/types.h>
 #define	ZAP_LEAF_MAGIC 0x2AB1EAF
 
 /* chunk size = 24 bytes */
diff --git a/include/zfs/zfs.h b/include/zfs/zfs.h
index 17b93c10c81c..9a41c6d0e898 100644
--- a/include/zfs/zfs.h
+++ b/include/zfs/zfs.h
@@ -14,6 +14,7 @@
 /*
  * On-disk version number.
  */
+#include <linux/types.h>
 #define	SPA_VERSION			28ULL
 
 /*
diff --git a/include/zfs/zfs_acl.h b/include/zfs/zfs_acl.h
index d6cc408d7f13..75586393c60c 100644
--- a/include/zfs/zfs_acl.h
+++ b/include/zfs/zfs_acl.h
@@ -11,6 +11,7 @@
 #ifndef	_SYS_FS_ZFS_ACL_H
 #define	_SYS_FS_ZFS_ACL_H
 
+#include <linux/types.h>
 typedef struct zfs_oldace {
 	uint32_t	z_fuid;		/* "who" */
 	uint32_t	z_access_mask;	/* access mask */
diff --git a/include/zfs/zfs_znode.h b/include/zfs/zfs_znode.h
index ed3cde61650a..3df22ea76499 100644
--- a/include/zfs/zfs_znode.h
+++ b/include/zfs/zfs_znode.h
@@ -11,6 +11,7 @@
 #ifndef	_SYS_FS_ZFS_ZNODE_H
 #define	_SYS_FS_ZFS_ZNODE_H
 
+#include <linux/types.h>
 #include <zfs/zfs_acl.h>
 
 #define	MASTER_NODE_OBJ	1
diff --git a/include/zfs/zil.h b/include/zfs/zil.h
index b5bd2c8406de..6e7f32ab650a 100644
--- a/include/zfs/zil.h
+++ b/include/zfs/zil.h
@@ -20,6 +20,7 @@
  * each of which contains log records (i.e., transactions) followed by
  * a log block trailer (zil_trailer_t).  The format of a log record
  * depends on the record (or transaction) type, but all records begin
+#include <linux/types.h>
  * with a common structure that defines the type, length, and txg.
  */
 
diff --git a/include/zfs/zio.h b/include/zfs/zio.h
index 959e6e936ad5..590dca27810f 100644
--- a/include/zfs/zio.h
+++ b/include/zfs/zio.h
@@ -10,6 +10,7 @@
 #ifndef _ZIO_H
 #define	_ZIO_H
 
+#include <linux/types.h>
 #include <zfs/spa.h>
 
 #define	ZEC_MAGIC	0x210da7ab10c7a11ULL	/* zio data bloc tail */
diff --git a/include/zfs/zio_checksum.h b/include/zfs/zio_checksum.h
index 2264374e33a0..6caa8aff5241 100644
--- a/include/zfs/zio_checksum.h
+++ b/include/zfs/zio_checksum.h
@@ -14,6 +14,7 @@
 /*
  * Signature for checksum functions.
  */
+#include <linux/types.h>
 typedef void zio_checksum_t(const void *data, uint64_t size,
 			    zfs_endian_t endian, zio_cksum_t *zcp);
 
diff --git a/include/zfs_common.h b/include/zfs_common.h
index cb83e59e8362..3e2f81cf98c5 100644
--- a/include/zfs_common.h
+++ b/include/zfs_common.h
@@ -23,6 +23,7 @@
 #define __ZFS_COMMON__
 
 #include <part.h>
+#include <linux/types.h>
 
 #define SECTOR_SIZE			0x200
 #define SECTOR_BITS			9
diff --git a/include/zynq_bootimg.h b/include/zynq_bootimg.h
index c39c0bf4593f..79a4e237b4b4 100644
--- a/include/zynq_bootimg.h
+++ b/include/zynq_bootimg.h
@@ -6,6 +6,7 @@
 #ifndef _ZYNQ_BOOTIMG_H_
 #define _ZYNQ_BOOTIMG_H_
 
+#include <asm/types.h>
 #define ZYNQ_MAX_PARTITION_NUMBER	0xE
 
 struct partition_hdr {
diff --git a/include/zynqmp_firmware.h b/include/zynqmp_firmware.h
index 93d771ece26a..dee7bc9ae2b7 100644
--- a/include/zynqmp_firmware.h
+++ b/include/zynqmp_firmware.h
@@ -8,6 +8,7 @@
 #ifndef _ZYNQMP_FIRMWARE_H_
 #define _ZYNQMP_FIRMWARE_H_
 
+#include <linux/types.h>
 enum pm_api_id {
 	PM_GET_API_VERSION = 1,
 	PM_SET_CONFIGURATION,
diff --git a/include/zynqmp_tap_delay.h b/include/zynqmp_tap_delay.h
index b07e3e069224..71da46beb046 100644
--- a/include/zynqmp_tap_delay.h
+++ b/include/zynqmp_tap_delay.h
@@ -16,4 +16,5 @@ inline void zynqmp_dll_reset(u8 deviceid) {}
 inline void arasan_zynqmp_set_tapdelay(u8 device_id, u8 uhsmode, u8 bank) {}
 #endif
 
+#include <asm/types.h>
 #endif
diff --git a/include/zynqpl.h b/include/zynqpl.h
index d7dc064585ea..43a776654289 100644
--- a/include/zynqpl.h
+++ b/include/zynqpl.h
@@ -10,6 +10,7 @@
 #define _ZYNQPL_H_
 
 #include <xilinx.h>
+#include <asm/types.h>
 
 #ifdef CONFIG_CMD_ZYNQ_AES
 int zynq_decrypt_load(u32 srcaddr, u32 dstaddr, u32 srclen, u32 dstlen,
diff --git a/lib/acpi/acpi_device.c b/lib/acpi/acpi_device.c
index b2cbf9093613..3af4ed3ba9cb 100644
--- a/lib/acpi/acpi_device.c
+++ b/lib/acpi/acpi_device.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <irq.h>
 #include <log.h>
+#include <stdbool.h>
 #include <usb.h>
 #include <vsprintf.h>
 #include <acpi/acpigen.h>
@@ -20,6 +21,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /**
  * acpi_device_path_fill() - Find the root device and build a path from there
diff --git a/lib/acpi/acpi_dp.c b/lib/acpi/acpi_dp.c
index 87e7bc4313b8..222d85e21e15 100644
--- a/lib/acpi/acpi_dp.c
+++ b/lib/acpi/acpi_dp.c
@@ -13,6 +13,7 @@
 #include <uuid.h>
 #include <acpi/acpigen.h>
 #include <acpi/acpi_dp.h>
+#include <asm/types.h>
 #include <dm/acpi.h>
 #include <linux/errno.h>
 #include <linux/string.h>
diff --git a/lib/acpi/acpi_table.c b/lib/acpi/acpi_table.c
index f0b49c96e7f3..f7b0fddb727c 100644
--- a/lib/acpi/acpi_table.c
+++ b/lib/acpi/acpi_table.c
@@ -18,6 +18,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 int acpi_create_dmar(struct acpi_dmar *dmar, enum dmar_flags flags)
 {
diff --git a/lib/acpi/acpigen.c b/lib/acpi/acpigen.c
index 3b04aa992e1a..ba8fe34b6637 100644
--- a/lib/acpi/acpigen.c
+++ b/lib/acpi/acpigen.c
@@ -19,6 +19,7 @@
 #include <dm/acpi.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 u8 *acpigen_get_current(struct acpi_ctx *ctx)
 {
diff --git a/lib/addr_map.c b/lib/addr_map.c
index 09771f3a5a59..c9cbb5c1d1a8 100644
--- a/lib/addr_map.c
+++ b/lib/addr_map.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <addr_map.h>
+#include <asm/types.h>
 
 static struct {
 	phys_addr_t paddr;
diff --git a/lib/aes.c b/lib/aes.c
index 204431bcf77c..05c177d16439 100644
--- a/lib/aes.c
+++ b/lib/aes.c
@@ -26,6 +26,7 @@
 #include <display_options.h>
 #include <log.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/string.h>
 #else
 #include <string.h>
diff --git a/lib/aes/aes-decrypt.c b/lib/aes/aes-decrypt.c
index de67f0f32a7f..a3ddb773823f 100644
--- a/lib/aes/aes-decrypt.c
+++ b/lib/aes/aes-decrypt.c
@@ -10,6 +10,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #endif
 #include <image.h>
 #include <uboot_aes.h>
diff --git a/lib/asn1_decoder.c b/lib/asn1_decoder.c
index 1191fc364871..fca637df90f9 100644
--- a/lib/asn1_decoder.c
+++ b/lib/asn1_decoder.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <linux/compat.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 #else
 #include <linux/export.h>
 #endif
diff --git a/lib/at91/at91.c b/lib/at91/at91.c
index 048597690b1d..ebc84810c6d8 100644
--- a/lib/at91/at91.c
+++ b/lib/at91/at91.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <atmel_lcd.h>
+#include <linux/types.h>
 
 #include "atmel_logo_8bpp.h"
 #include "microchip_logo_8bpp.h"
diff --git a/lib/charset.c b/lib/charset.c
index b69e111918a4..c57f21e98ba3 100644
--- a/lib/charset.c
+++ b/lib/charset.c
@@ -11,6 +11,7 @@
 #include <malloc.h>
 #include <stdio.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static struct capitalization_table capitalization_table[] =
 #ifdef CONFIG_EFI_UNICODE_CAPITALIZATION
diff --git a/lib/crc16.c b/lib/crc16.c
index aa6d117ae174..0c5f0c12d226 100644
--- a/lib/crc16.c
+++ b/lib/crc16.c
@@ -27,6 +27,7 @@
 #else
 #include <common.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #endif
 #include <u-boot/crc.h>
 
diff --git a/lib/crc32.c b/lib/crc32.c
index aa210cea0558..85a7f1a6f611 100644
--- a/lib/crc32.c
+++ b/lib/crc32.c
@@ -15,6 +15,7 @@
 #include <common.h>
 #include <efi_loader.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #endif
 #include <compiler.h>
 #include <u-boot/crc.h>
diff --git a/lib/crc32c.c b/lib/crc32c.c
index 016b34a523b8..240ca4de6625 100644
--- a/lib/crc32c.c
+++ b/lib/crc32c.c
@@ -12,6 +12,7 @@
 
 #include <common.h>
 #include <compiler.h>
+#include <linux/types.h>
 
 uint32_t crc32c_cal(uint32_t crc, const char *data, int length,
 		    uint32_t *crc32c_table)
diff --git a/lib/crypto/asymmetric_type.c b/lib/crypto/asymmetric_type.c
index d0dd2529536d..6d2c1f525b74 100644
--- a/lib/crypto/asymmetric_type.c
+++ b/lib/crypto/asymmetric_type.c
@@ -12,6 +12,7 @@
 #include <keys/asymmetric-subtype.h>
 #include <keys/asymmetric-parser.h>
 #endif
+#include <stdbool.h>
 #include <crypto/public_key.h>
 #ifdef __UBOOT__
 #include <linux/bug.h>
@@ -22,6 +23,7 @@
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #else
 #include <linux/seq_file.h>
 #include <linux/module.h>
diff --git a/lib/crypto/pkcs7_parser.c b/lib/crypto/pkcs7_parser.c
index 3cb13fae86d7..2395a9ddb1d4 100644
--- a/lib/crypto/pkcs7_parser.c
+++ b/lib/crypto/pkcs7_parser.c
@@ -8,11 +8,13 @@
 #define pr_fmt(fmt) "PKCS7: "fmt
 #ifdef __UBOOT__
 #include <log.h>
+#include <stdbool.h>
 #include <dm/devres.h>
 #include <linux/bitops.h>
 #include <linux/compat.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 #endif
 #include <linux/kernel.h>
 #ifndef __UBOOT__
diff --git a/lib/crypto/pkcs7_verify.c b/lib/crypto/pkcs7_verify.c
index 2d9113fd2e05..9bd19da21cbb 100644
--- a/lib/crypto/pkcs7_verify.c
+++ b/lib/crypto/pkcs7_verify.c
@@ -18,6 +18,7 @@
 #include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <u-boot/rsa-checksum.h>
 #include <crypto/public_key.h>
 #include <crypto/pkcs7_parser.h>
diff --git a/lib/crypto/public_key.c b/lib/crypto/public_key.c
index be5e722a83d4..5e2de6ea8900 100644
--- a/lib/crypto/public_key.c
+++ b/lib/crypto/public_key.c
@@ -10,6 +10,7 @@
 #define pr_fmt(fmt) "PKEY: "fmt
 #ifdef __UBOOT__
 #include <vsprintf.h>
+#include <asm/types.h>
 #include <dm/devres.h>
 #include <linux/bug.h>
 #include <linux/compat.h>
diff --git a/lib/crypto/rsa_helper.c b/lib/crypto/rsa_helper.c
index acea8b262132..e1d86e44664f 100644
--- a/lib/crypto/rsa_helper.c
+++ b/lib/crypto/rsa_helper.c
@@ -17,6 +17,7 @@
 #include <crypto/internal/rsa.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
+#include <linux/types.h>
 #include "rsapubkey.asn1.h"
 #ifndef __UBOOT__
 #include "rsaprivkey.asn1.h"
diff --git a/lib/crypto/x509_cert_parser.c b/lib/crypto/x509_cert_parser.c
index 909190c8af8a..563fff6ad6d6 100644
--- a/lib/crypto/x509_cert_parser.c
+++ b/lib/crypto/x509_cert_parser.c
@@ -19,6 +19,7 @@
 #ifdef __UBOOT__
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #endif
 #include <crypto/public_key.h>
 #ifdef __UBOOT__
diff --git a/lib/crypto/x509_public_key.c b/lib/crypto/x509_public_key.c
index f79b4ea6b0fc..e42041c5360b 100644
--- a/lib/crypto/x509_public_key.c
+++ b/lib/crypto/x509_public_key.c
@@ -9,12 +9,14 @@
 #ifdef __UBOOT__
 #include <common.h>
 #include <image.h>
+#include <stdbool.h>
 #include <dm/devres.h>
 #include <linux/compat.h>
 #include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #else
 #include <linux/module.h>
 #endif
diff --git a/lib/dhry/cmd_dhry.c b/lib/dhry/cmd_dhry.c
index 46f7fe89daa0..8ced1e0fcf04 100644
--- a/lib/dhry/cmd_dhry.c
+++ b/lib/dhry/cmd_dhry.c
@@ -9,6 +9,7 @@
 #include <stdio.h>
 #include <time.h>
 #include <vsprintf.h>
+#include <linux/types.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 8dcbd75e9148..850f5b97243f 100644
--- a/lib/display_options.c
+++ b/lib/display_options.c
@@ -9,12 +9,14 @@
 #include <console.h>
 #include <display_options.h>
 #include <div64.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <version.h>
 #include <vsprintf.h>
 #include <linux/ctype.h>
 #include <asm/io.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 char *display_options_get_banner_priv(bool newlines, const char *build_tag,
 				      char *buf, int size)
diff --git a/lib/div64.c b/lib/div64.c
index 779d7521f69f..32cf6ba91f6d 100644
--- a/lib/div64.c
+++ b/lib/div64.c
@@ -21,6 +21,7 @@
 #include <linux/compat.h>
 #include <linux/kernel.h>
 #include <linux/math64.h>
+#include <linux/types.h>
 
 /* Not needed on 64bit architectures */
 #if BITS_PER_LONG == 32
diff --git a/lib/efi/efi_info.c b/lib/efi/efi_info.c
index 6ba042f6894a..dda21a253df0 100644
--- a/lib/efi/efi_info.c
+++ b/lib/efi/efi_info.c
@@ -11,6 +11,7 @@
 #include <mapmem.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 int efi_info_get(enum efi_entry_t type, void **datap, int *sizep)
 {
diff --git a/lib/efi/efi_stub.c b/lib/efi/efi_stub.c
index 42b24139dbee..d7c9fcf3004d 100644
--- a/lib/efi/efi_stub.c
+++ b/lib/efi/efi_stub.c
@@ -10,12 +10,14 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <debug_uart.h>
 #include <efi.h>
 #include <efi_api.h>
 #include <errno.h>
 #include <malloc.h>
 #include <ns16550.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/cpu.h>
 #include <asm/io.h>
diff --git a/lib/efi_driver/efi_block_device.c b/lib/efi_driver/efi_block_device.c
index 3ac3a94ab03e..42f29730709e 100644
--- a/lib/efi_driver/efi_block_device.c
+++ b/lib/efi_driver/efi_block_device.c
@@ -37,6 +37,7 @@
 #include <dm/device-internal.h>
 #include <dm/root.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 /*
  * EFI attributes of the udevice handled by this driver.
diff --git a/lib/efi_driver/efi_uclass.c b/lib/efi_driver/efi_uclass.c
index 36e7d943a38d..da05152cbab0 100644
--- a/lib/efi_driver/efi_uclass.c
+++ b/lib/efi_driver/efi_uclass.c
@@ -23,6 +23,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <stdio.h>
+#include <linux/types.h>
 
 /**
  * check_node_type() - check node type
diff --git a/lib/efi_loader/efi_acpi.c b/lib/efi_loader/efi_acpi.c
index 87a02d59b9c9..1b0118137a37 100644
--- a/lib/efi_loader/efi_acpi.c
+++ b/lib/efi_loader/efi_acpi.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <acpi/acpi_table.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 static const efi_guid_t acpi_guid = EFI_ACPI_TABLE_GUID;
 
diff --git a/lib/efi_loader/efi_bootmgr.c b/lib/efi_loader/efi_bootmgr.c
index 45442789db15..cf210d6323ea 100644
--- a/lib/efi_loader/efi_bootmgr.c
+++ b/lib/efi_loader/efi_bootmgr.c
@@ -15,6 +15,7 @@
 #include <efi_variable.h>
 #include <asm/unaligned.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static const struct efi_boot_services *bs;
 static const struct efi_runtime_services *rs;
diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c
index 05b7cceb3e32..41b7990155ba 100644
--- a/lib/efi_loader/efi_boottime.c
+++ b/lib/efi_loader/efi_boottime.c
@@ -11,6 +11,7 @@
 #include <irq_func.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <vsprintf.h>
@@ -18,6 +19,7 @@
 #include <linux/kernel.h>
 #include <linux/libfdt_env.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <u-boot/crc.h>
 #include <bootm.h>
 #include <pe.h>
diff --git a/lib/efi_loader/efi_console.c b/lib/efi_loader/efi_console.c
index ae0ee7ee9091..770de8153787 100644
--- a/lib/efi_loader/efi_console.c
+++ b/lib/efi_loader/efi_console.c
@@ -17,6 +17,7 @@
 #include <stdio_dev.h>
 #include <video_console.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define EFI_COUT_MODE_2 2
 #define EFI_MAX_COUT_MODE 3
diff --git a/lib/efi_loader/efi_device_path.c b/lib/efi_loader/efi_device_path.c
index 68e344ee3448..d117f860b596 100644
--- a/lib/efi_loader/efi_device_path.c
+++ b/lib/efi_loader/efi_device_path.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <log.h>
 #include <net.h>
+#include <stdbool.h>
 #include <usb.h>
 #include <mmc.h>
 #include <nvme.h>
@@ -21,6 +22,7 @@
 #include <linux/compat.h> /* U16_MAX */
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_SANDBOX
 const efi_guid_t efi_guid_host_dev = U_BOOT_HOST_DEV_GUID;
diff --git a/lib/efi_loader/efi_device_path_to_text.c b/lib/efi_loader/efi_device_path_to_text.c
index b923ff348483..95541355ff98 100644
--- a/lib/efi_loader/efi_device_path_to_text.c
+++ b/lib/efi_loader/efi_device_path_to_text.c
@@ -11,6 +11,7 @@
 #include <stdbool.h>
 #include <vsprintf.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define MAC_OUTPUT_LEN 22
 #define UNKNOWN_OUTPUT_LEN 23
diff --git a/lib/efi_loader/efi_device_path_utilities.c b/lib/efi_loader/efi_device_path_utilities.c
index 405e87f3a01d..47aad94edb0b 100644
--- a/lib/efi_loader/efi_device_path_utilities.c
+++ b/lib/efi_loader/efi_device_path_utilities.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <efi_loader.h>
 #include <stdbool.h>
+#include <linux/types.h>
 
 const efi_guid_t efi_guid_device_path_utilities_protocol =
 		EFI_DEVICE_PATH_UTILITIES_PROTOCOL_GUID;
diff --git a/lib/efi_loader/efi_disk.c b/lib/efi_loader/efi_disk.c
index 43704826fb79..dd9c82c0508a 100644
--- a/lib/efi_loader/efi_disk.c
+++ b/lib/efi_loader/efi_disk.c
@@ -15,9 +15,11 @@
 #include <log.h>
 #include <part.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <vsprintf.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 struct efi_system_partition efi_system_partition;
 
diff --git a/lib/efi_loader/efi_file.c b/lib/efi_loader/efi_file.c
index 023a91a37086..9d21a80bea57 100644
--- a/lib/efi_loader/efi_file.c
+++ b/lib/efi_loader/efi_file.c
@@ -16,6 +16,7 @@
 #include <stdio.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /* GUID for file system information */
 const efi_guid_t efi_file_system_info_guid = EFI_FILE_SYSTEM_INFO_GUID;
diff --git a/lib/efi_loader/efi_freestanding.c b/lib/efi_loader/efi_freestanding.c
index 87c1633804c9..ad541ff7e7b8 100644
--- a/lib/efi_loader/efi_freestanding.c
+++ b/lib/efi_loader/efi_freestanding.c
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /**
  * memcmp() - compare memory areas
diff --git a/lib/efi_loader/efi_gop.c b/lib/efi_loader/efi_gop.c
index 42d985b25860..a14a9a960450 100644
--- a/lib/efi_loader/efi_gop.c
+++ b/lib/efi_loader/efi_gop.c
@@ -16,6 +16,7 @@
 #include <asm/global_data.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/lib/efi_loader/efi_hii.c b/lib/efi_loader/efi_hii.c
index 05ad99260980..fe06e12092bc 100644
--- a/lib/efi_loader/efi_hii.c
+++ b/lib/efi_loader/efi_hii.c
@@ -1,5 +1,6 @@
 // SPDX-License-Identifier:     GPL-2.0+
 /*
+#include <linux/types.h>
  *  EFI Human Interface Infrastructure ... database and packages
  *
  *  Copyright (c) 2017 Leif Lindholm
diff --git a/lib/efi_loader/efi_hii_config.c b/lib/efi_loader/efi_hii_config.c
index 26ea4b9bc0a1..4c5a95ef9eba 100644
--- a/lib/efi_loader/efi_hii_config.c
+++ b/lib/efi_loader/efi_hii_config.c
@@ -1,5 +1,6 @@
 // SPDX-License-Identifier:     GPL-2.0+
 /*
+#include <asm/types.h>
  *  EFI Human Interface Infrastructure ... Configuration
  *
  *  Copyright (c) 2017 Leif Lindholm
diff --git a/lib/efi_loader/efi_image_loader.c b/lib/efi_loader/efi_image_loader.c
index 506a92ea727b..67560fd3a3d5 100644
--- a/lib/efi_loader/efi_image_loader.c
+++ b/lib/efi_loader/efi_image_loader.c
@@ -8,16 +8,19 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <efi_loader.h>
 #include <malloc.h>
 #include <pe.h>
 #include <sort.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <crypto/pkcs7_parser.h>
 #include <linux/err.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 const efi_guid_t efi_global_variable_guid = EFI_GLOBAL_VARIABLE_GUID;
 const efi_guid_t efi_guid_device_path = EFI_DEVICE_PATH_PROTOCOL_GUID;
diff --git a/lib/efi_loader/efi_load_initrd.c b/lib/efi_loader/efi_load_initrd.c
index 372654172506..253898e7c65d 100644
--- a/lib/efi_loader/efi_load_initrd.c
+++ b/lib/efi_loader/efi_load_initrd.c
@@ -13,6 +13,7 @@
 #include <efi_load_initrd.h>
 #include <stdbool.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static const efi_guid_t efi_guid_load_file2_protocol =
 		EFI_LOAD_FILE2_PROTOCOL_GUID;
diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c
index 60af4abd2df7..5a15938cb91b 100644
--- a/lib/efi_loader/efi_memory.c
+++ b/lib/efi_loader/efi_memory.c
@@ -6,10 +6,12 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <efi_loader.h>
 #include <init.h>
 #include <malloc.h>
 #include <mapmem.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <watchdog.h>
 #include <asm/cache.h>
@@ -17,6 +19,7 @@
 #include <linux/kernel.h>
 #include <linux/list_sort.h>
 #include <linux/sizes.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/lib/efi_loader/efi_net.c b/lib/efi_loader/efi_net.c
index 5c29d00b451e..c884ad5fb5a7 100644
--- a/lib/efi_loader/efi_net.c
+++ b/lib/efi_loader/efi_net.c
@@ -19,9 +19,11 @@
 #include <efi_loader.h>
 #include <malloc.h>
 #include <net.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static const efi_guid_t efi_net_guid = EFI_SIMPLE_NETWORK_PROTOCOL_GUID;
 static const efi_guid_t efi_pxe_base_code_protocol_guid =
diff --git a/lib/efi_loader/efi_rng.c b/lib/efi_loader/efi_rng.c
index 974a3ed7281b..dec97a2107b2 100644
--- a/lib/efi_loader/efi_rng.c
+++ b/lib/efi_loader/efi_rng.c
@@ -4,12 +4,14 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <dm.h>
 #include <efi_loader.h>
 #include <efi_rng.h>
 #include <log.h>
 #include <rng.h>
 #include <asm/global_data.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/lib/efi_loader/efi_root_node.c b/lib/efi_loader/efi_root_node.c
index 76d18fb1a4ad..77d4e6c6c2e0 100644
--- a/lib/efi_loader/efi_root_node.c
+++ b/lib/efi_loader/efi_root_node.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <malloc.h>
 #include <efi_loader.h>
 
diff --git a/lib/efi_loader/efi_runtime.c b/lib/efi_loader/efi_runtime.c
index 93bbd2702349..954138322e11 100644
--- a/lib/efi_loader/efi_runtime.c
+++ b/lib/efi_loader/efi_runtime.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <cpu_func.h>
 #include <dm.h>
 #include <elf.h>
@@ -14,10 +15,12 @@
 #include <log.h>
 #include <malloc.h>
 #include <rtc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <asm/global_data.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <u-boot/crc.h>
 
 /* For manual relocation support */
diff --git a/lib/efi_loader/efi_setup.c b/lib/efi_loader/efi_setup.c
index d675b96e64f6..caa1de8c2cc1 100644
--- a/lib/efi_loader/efi_setup.c
+++ b/lib/efi_loader/efi_setup.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <bootm.h>
+#include <compiler.h>
 #include <efi_loader.h>
 #include <efi_variable.h>
 #include <stdio.h>
diff --git a/lib/efi_loader/efi_signature.c b/lib/efi_loader/efi_signature.c
index ef652f394c54..d55ed6b60ba1 100644
--- a/lib/efi_loader/efi_signature.c
+++ b/lib/efi_loader/efi_signature.c
@@ -17,6 +17,7 @@
 #include <linux/compat.h>
 #include <linux/oid_registry.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <u-boot/rsa.h>
 #include <u-boot/sha256.h>
 
diff --git a/lib/efi_loader/efi_smbios.c b/lib/efi_loader/efi_smbios.c
index b77ac76935a1..cad38cb5f27b 100644
--- a/lib/efi_loader/efi_smbios.c
+++ b/lib/efi_loader/efi_smbios.c
@@ -11,6 +11,7 @@
 #include <mapmem.h>
 #include <smbios.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 static const efi_guid_t smbios_guid = SMBIOS_TABLE_GUID;
 
diff --git a/lib/efi_loader/efi_unicode_collation.c b/lib/efi_loader/efi_unicode_collation.c
index caa65f06d734..fcd295d638b2 100644
--- a/lib/efi_loader/efi_unicode_collation.c
+++ b/lib/efi_loader/efi_unicode_collation.c
@@ -11,6 +11,7 @@
 #include <cp437.h>
 #include <efi_loader.h>
 #include <stdbool.h>
+#include <asm/types.h>
 #include <linux/string.h>
 
 /* Characters that may not be used in FAT 8.3 file names */
diff --git a/lib/efi_loader/efi_var_common.c b/lib/efi_loader/efi_var_common.c
index 2da25766a4db..94ac0d5924c5 100644
--- a/lib/efi_loader/efi_var_common.c
+++ b/lib/efi_loader/efi_var_common.c
@@ -9,8 +9,10 @@
 #include <common.h>
 #include <efi_loader.h>
 #include <efi_variable.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 enum efi_secure_mode {
 	EFI_MODE_SETUP,
diff --git a/lib/efi_loader/efi_var_file.c b/lib/efi_loader/efi_var_file.c
index 09831b6af3bd..528e307c6189 100644
--- a/lib/efi_loader/efi_var_file.c
+++ b/lib/efi_loader/efi_var_file.c
@@ -18,6 +18,7 @@
 #include <vsprintf.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <u-boot/crc.h>
 
 #define PART_STR_LEN 10
diff --git a/lib/efi_loader/efi_var_mem.c b/lib/efi_loader/efi_var_mem.c
index 020d43102b9e..a99703825424 100644
--- a/lib/efi_loader/efi_var_mem.c
+++ b/lib/efi_loader/efi_var_mem.c
@@ -8,8 +8,10 @@
 #include <common.h>
 #include <efi_loader.h>
 #include <efi_variable.h>
+#include <stdbool.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <u-boot/crc.h>
 
 struct efi_var_file __efi_runtime_data *efi_var_buf;
diff --git a/lib/efi_loader/efi_variable.c b/lib/efi_loader/efi_variable.c
index c76431cc5493..1ff7cb28eb8b 100644
--- a/lib/efi_loader/efi_variable.c
+++ b/lib/efi_loader/efi_variable.c
@@ -22,6 +22,7 @@
 #include <crypto/pkcs7_parser.h>
 #include <linux/compat.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <u-boot/crc.h>
 #include <asm/sections.h>
 
diff --git a/lib/efi_loader/efi_variable_tee.c b/lib/efi_loader/efi_variable_tee.c
index 783ed90404ad..e3b56c2f4a80 100644
--- a/lib/efi_loader/efi_variable_tee.c
+++ b/lib/efi_loader/efi_variable_tee.c
@@ -17,6 +17,7 @@
 #include <mm_communication.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define OPTEE_PAGE_SIZE BIT(12)
 extern struct efi_var_file __efi_runtime_data *efi_var_buf;
diff --git a/lib/efi_loader/helloworld.c b/lib/efi_loader/helloworld.c
index 2598fdfd124b..4904970b0238 100644
--- a/lib/efi_loader/helloworld.c
+++ b/lib/efi_loader/helloworld.c
@@ -11,6 +11,7 @@
 
 #include <common.h>
 #include <efi_api.h>
+#include <asm/types.h>
 #include <linux/string.h>
 
 static const efi_guid_t loaded_image_guid = EFI_LOADED_IMAGE_PROTOCOL_GUID;
diff --git a/lib/efi_selftest/efi_selftest.c b/lib/efi_selftest/efi_selftest.c
index 5b01610eca13..0ca03cb4a8b6 100644
--- a/lib/efi_selftest/efi_selftest.c
+++ b/lib/efi_selftest/efi_selftest.c
@@ -7,6 +7,7 @@
 
 #include <efi_selftest.h>
 #include <vsprintf.h>
+#include <asm/types.h>
 
 /* Constants for test step bitmap */
 #define EFI_ST_SETUP	1
diff --git a/lib/efi_selftest/efi_selftest_bitblt.c b/lib/efi_selftest/efi_selftest_bitblt.c
index fb33150c4b2a..49ad2340e5c7 100644
--- a/lib/efi_selftest/efi_selftest_bitblt.c
+++ b/lib/efi_selftest/efi_selftest_bitblt.c
@@ -9,6 +9,7 @@
  */
 
 #include <efi_selftest.h>
+#include <asm/types.h>
 
 #define WIDTH	200
 #define HEIGHT	120
diff --git a/lib/efi_selftest/efi_selftest_block_device.c b/lib/efi_selftest/efi_selftest_block_device.c
index 63d340342a9d..44c63dfe32ae 100644
--- a/lib/efi_selftest/efi_selftest_block_device.c
+++ b/lib/efi_selftest/efi_selftest_block_device.c
@@ -15,6 +15,7 @@
 
 #include <efi_selftest.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "efi_selftest_disk_image.h"
 #include <asm/cache.h>
 
diff --git a/lib/efi_selftest/efi_selftest_config_table.c b/lib/efi_selftest/efi_selftest_config_table.c
index 6f6a8757ac54..4ecb41b3c0a7 100644
--- a/lib/efi_selftest/efi_selftest_config_table.c
+++ b/lib/efi_selftest/efi_selftest_config_table.c
@@ -9,6 +9,7 @@
  */
 
 #include <efi_selftest.h>
+#include <asm/types.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
 
diff --git a/lib/efi_selftest/efi_selftest_console.c b/lib/efi_selftest/efi_selftest_console.c
index 0462c196c16d..993e058c0b9a 100644
--- a/lib/efi_selftest/efi_selftest_console.c
+++ b/lib/efi_selftest/efi_selftest_console.c
@@ -9,6 +9,7 @@
 #include <net.h>
 #include <stdarg.h>
 #include <vsprintf.h>
+#include <linux/types.h>
 
 struct efi_simple_text_output_protocol *con_out;
 struct efi_simple_text_input_protocol *con_in;
diff --git a/lib/efi_selftest/efi_selftest_controllers.c b/lib/efi_selftest/efi_selftest_controllers.c
index 38720bb63d39..13a08eba3212 100644
--- a/lib/efi_selftest/efi_selftest_controllers.c
+++ b/lib/efi_selftest/efi_selftest_controllers.c
@@ -11,6 +11,7 @@
  */
 
 #include <efi_selftest.h>
+#include <linux/types.h>
 
 #define NUMBER_OF_CHILD_CONTROLLERS 4
 
diff --git a/lib/efi_selftest/efi_selftest_crc32.c b/lib/efi_selftest/efi_selftest_crc32.c
index 19153c759aad..48f6d328bfbd 100644
--- a/lib/efi_selftest/efi_selftest_crc32.c
+++ b/lib/efi_selftest/efi_selftest_crc32.c
@@ -10,6 +10,7 @@
  */
 
 #include <efi_selftest.h>
+#include <asm/types.h>
 #include <u-boot/crc.h>
 
 const struct efi_system_table *st;
diff --git a/lib/efi_selftest/efi_selftest_devicepath.c b/lib/efi_selftest/efi_selftest_devicepath.c
index 4ce3fad8959d..af0150c7cea8 100644
--- a/lib/efi_selftest/efi_selftest_devicepath.c
+++ b/lib/efi_selftest/efi_selftest_devicepath.c
@@ -8,7 +8,9 @@
  * DevicePathToText
  */
 
+#include <compiler.h>
 #include <efi_selftest.h>
+#include <asm/types.h>
 
 static struct efi_boot_services *boottime;
 
diff --git a/lib/efi_selftest/efi_selftest_event_groups.c b/lib/efi_selftest/efi_selftest_event_groups.c
index 6dcde50648b8..0aef2aa5e58d 100644
--- a/lib/efi_selftest/efi_selftest_event_groups.c
+++ b/lib/efi_selftest/efi_selftest_event_groups.c
@@ -10,6 +10,7 @@
  */
 
 #include <efi_selftest.h>
+#include <linux/types.h>
 
 #define GROUP_SIZE 16
 
diff --git a/lib/efi_selftest/efi_selftest_exception.c b/lib/efi_selftest/efi_selftest_exception.c
index 6e900a35dc22..4bff40c7e73f 100644
--- a/lib/efi_selftest/efi_selftest_exception.c
+++ b/lib/efi_selftest/efi_selftest_exception.c
@@ -11,6 +11,7 @@
  */
 
 #include <efi_selftest.h>
+#include <linux/types.h>
 /* Include containing the UEFI application */
 #include "efi_miniapp_file_image_exception.h"
 
diff --git a/lib/efi_selftest/efi_selftest_fdt.c b/lib/efi_selftest/efi_selftest_fdt.c
index db94bef08038..4633d416db61 100644
--- a/lib/efi_selftest/efi_selftest_fdt.c
+++ b/lib/efi_selftest/efi_selftest_fdt.c
@@ -13,6 +13,7 @@
 #include <efi_selftest.h>
 #include <stdio.h>
 #include <linux/libfdt.h>
+#include <linux/types.h>
 
 static const struct efi_system_table *systemtab;
 static const struct efi_boot_services *boottime;
diff --git a/lib/efi_selftest/efi_selftest_gop.c b/lib/efi_selftest/efi_selftest_gop.c
index d64294ac79d7..de14dbaaeb88 100644
--- a/lib/efi_selftest/efi_selftest_gop.c
+++ b/lib/efi_selftest/efi_selftest_gop.c
@@ -8,6 +8,7 @@
  */
 
 #include <efi_selftest.h>
+#include <asm/types.h>
 
 static struct efi_boot_services *boottime;
 static efi_guid_t efi_gop_guid = EFI_GRAPHICS_OUTPUT_PROTOCOL_GUID;
diff --git a/lib/efi_selftest/efi_selftest_hii.c b/lib/efi_selftest/efi_selftest_hii.c
index f4b70f795085..9017d52c50b3 100644
--- a/lib/efi_selftest/efi_selftest_hii.c
+++ b/lib/efi_selftest/efi_selftest_hii.c
@@ -8,6 +8,7 @@
  */
 
 #include <efi_selftest.h>
+#include <asm/types.h>
 #include "efi_selftest_hii_data.c"
 
 #define PRINT_TESTNAME efi_st_printf("%s:\n", __func__)
diff --git a/lib/efi_selftest/efi_selftest_hii_data.c b/lib/efi_selftest/efi_selftest_hii_data.c
index d19f0682afd0..8a2d5d295a41 100644
--- a/lib/efi_selftest/efi_selftest_hii_data.c
+++ b/lib/efi_selftest/efi_selftest_hii_data.c
@@ -19,6 +19,7 @@
  */
 
 #include <efi.h>
+#include <asm/types.h>
 
 #ifdef NOT_USED
 /*
diff --git a/lib/efi_selftest/efi_selftest_load_initrd.c b/lib/efi_selftest/efi_selftest_load_initrd.c
index 144443ff6854..00d500055679 100644
--- a/lib/efi_selftest/efi_selftest_load_initrd.c
+++ b/lib/efi_selftest/efi_selftest_load_initrd.c
@@ -41,6 +41,7 @@
 #include <efi_selftest.h>
 #include <efi_loader.h>
 #include <efi_load_initrd.h>
+#include <asm/types.h>
 #include <linux/string.h>
 
 static struct efi_boot_services *boottime;
diff --git a/lib/efi_selftest/efi_selftest_loadimage.c b/lib/efi_selftest/efi_selftest_loadimage.c
index f251cbc33bce..add34df4c8a1 100644
--- a/lib/efi_selftest/efi_selftest_loadimage.c
+++ b/lib/efi_selftest/efi_selftest_loadimage.c
@@ -10,8 +10,10 @@
  * path and started.
  */
 
+#include <compiler.h>
 #include <efi_selftest.h>
 #include <linux/string.h>
+#include <linux/types.h>
 /* Include containing the efi_selftest_miniapp_exit.efi application */
 #include "efi_miniapp_file_image_exit.h"
 
diff --git a/lib/efi_selftest/efi_selftest_manageprotocols.c b/lib/efi_selftest/efi_selftest_manageprotocols.c
index 717774e00f3b..86b3575d7031 100644
--- a/lib/efi_selftest/efi_selftest_manageprotocols.c
+++ b/lib/efi_selftest/efi_selftest_manageprotocols.c
@@ -14,6 +14,7 @@
 #include <efi_selftest.h>
 #include <stdio.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /*
  * The test currently does not actually call the interface function.
diff --git a/lib/efi_selftest/efi_selftest_mem.c b/lib/efi_selftest/efi_selftest_mem.c
index c5f0d7ccfa15..fc3cb20e05a5 100644
--- a/lib/efi_selftest/efi_selftest_mem.c
+++ b/lib/efi_selftest/efi_selftest_mem.c
@@ -11,6 +11,7 @@
  */
 
 #include <efi_selftest.h>
+#include <asm/types.h>
 #include <linux/string.h>
 
 static struct efi_boot_services *boottime;
diff --git a/lib/efi_selftest/efi_selftest_memory.c b/lib/efi_selftest/efi_selftest_memory.c
index 31ca3f3beb65..6e97579ba92d 100644
--- a/lib/efi_selftest/efi_selftest_memory.c
+++ b/lib/efi_selftest/efi_selftest_memory.c
@@ -13,6 +13,7 @@
 #include <efi_selftest.h>
 #include <stdbool.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #define EFI_ST_NUM_PAGES 8
 
diff --git a/lib/efi_selftest/efi_selftest_miniapp_exit.c b/lib/efi_selftest/efi_selftest_miniapp_exit.c
index 6b5cfb01cf70..a5ab96077f2f 100644
--- a/lib/efi_selftest/efi_selftest_miniapp_exit.c
+++ b/lib/efi_selftest/efi_selftest_miniapp_exit.c
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <efi_selftest.h>
+#include <asm/types.h>
 
 static efi_guid_t loaded_image_protocol_guid = EFI_LOADED_IMAGE_PROTOCOL_GUID;
 
diff --git a/lib/efi_selftest/efi_selftest_rng.c b/lib/efi_selftest/efi_selftest_rng.c
index ecf13a41fafc..646654612d9b 100644
--- a/lib/efi_selftest/efi_selftest_rng.c
+++ b/lib/efi_selftest/efi_selftest_rng.c
@@ -9,6 +9,7 @@
 
 #include <efi_selftest.h>
 #include <efi_rng.h>
+#include <asm/types.h>
 #include <linux/string.h>
 
 #define RNG_LEN 9
diff --git a/lib/efi_selftest/efi_selftest_set_virtual_address_map.c b/lib/efi_selftest/efi_selftest_set_virtual_address_map.c
index 6a22d99e834e..64e64d20a4ee 100644
--- a/lib/efi_selftest/efi_selftest_set_virtual_address_map.c
+++ b/lib/efi_selftest/efi_selftest_set_virtual_address_map.c
@@ -11,6 +11,7 @@
 #include <efi_selftest.h>
 #include <stdbool.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static const struct efi_boot_services *boottime;
 static const struct efi_runtime_services *runtime;
diff --git a/lib/efi_selftest/efi_selftest_snp.c b/lib/efi_selftest/efi_selftest_snp.c
index 3357048c7f44..c2167c913ced 100644
--- a/lib/efi_selftest/efi_selftest_snp.c
+++ b/lib/efi_selftest/efi_selftest_snp.c
@@ -14,9 +14,11 @@
  *	 we should connect our code as controller.
  */
 
+#include <compiler.h>
 #include <efi_selftest.h>
 #include <net.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /*
  * MAC address for broadcasts
diff --git a/lib/efi_selftest/efi_selftest_startimage_exit.c b/lib/efi_selftest/efi_selftest_startimage_exit.c
index 1406dfc91721..a7d5f201be88 100644
--- a/lib/efi_selftest/efi_selftest_startimage_exit.c
+++ b/lib/efi_selftest/efi_selftest_startimage_exit.c
@@ -11,6 +11,7 @@
 
 #include <efi_selftest.h>
 #include <linux/string.h>
+#include <linux/types.h>
 /* Include containing the miniapp.efi application */
 #include "efi_miniapp_file_image_exit.h"
 
diff --git a/lib/efi_selftest/efi_selftest_startimage_return.c b/lib/efi_selftest/efi_selftest_startimage_return.c
index fabf53d983b8..216890a094fc 100644
--- a/lib/efi_selftest/efi_selftest_startimage_return.c
+++ b/lib/efi_selftest/efi_selftest_startimage_return.c
@@ -10,6 +10,7 @@
  */
 
 #include <efi_selftest.h>
+#include <linux/types.h>
 /* Include containing the miniapp.efi application */
 #include "efi_miniapp_file_image_return.h"
 
diff --git a/lib/efi_selftest/efi_selftest_textinputex.c b/lib/efi_selftest/efi_selftest_textinputex.c
index 2b0b3cfd7221..1dee1cffb624 100644
--- a/lib/efi_selftest/efi_selftest_textinputex.c
+++ b/lib/efi_selftest/efi_selftest_textinputex.c
@@ -14,6 +14,7 @@
 
 #include <efi_selftest.h>
 #include <stdbool.h>
+#include <linux/types.h>
 
 static const efi_guid_t text_input_ex_protocol_guid =
 		EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL_GUID;
diff --git a/lib/efi_selftest/efi_selftest_textoutput.c b/lib/efi_selftest/efi_selftest_textoutput.c
index a87f65e197fe..8b37957ebf3e 100644
--- a/lib/efi_selftest/efi_selftest_textoutput.c
+++ b/lib/efi_selftest/efi_selftest_textoutput.c
@@ -11,6 +11,7 @@
  */
 
 #include <efi_selftest.h>
+#include <linux/types.h>
 
 /*
  * Execute unit test.
diff --git a/lib/efi_selftest/efi_selftest_unaligned.c b/lib/efi_selftest/efi_selftest_unaligned.c
index 1802948e6750..3a55d57fbeb4 100644
--- a/lib/efi_selftest/efi_selftest_unaligned.c
+++ b/lib/efi_selftest/efi_selftest_unaligned.c
@@ -8,6 +8,7 @@
  */
 
 #include <efi_selftest.h>
+#include <asm/types.h>
 
 struct aligned_buffer {
 	char a[8] __aligned(8);
diff --git a/lib/efi_selftest/efi_selftest_unicode_collation.c b/lib/efi_selftest/efi_selftest_unicode_collation.c
index b3f7c623e8b4..b60d8a94ca52 100644
--- a/lib/efi_selftest/efi_selftest_unicode_collation.c
+++ b/lib/efi_selftest/efi_selftest_unicode_collation.c
@@ -9,6 +9,7 @@
 
 #include <efi_selftest.h>
 #include <stdbool.h>
+#include <asm/types.h>
 
 static const efi_guid_t unicode_collation_protocol_guid =
 	EFI_UNICODE_COLLATION_PROTOCOL2_GUID;
diff --git a/lib/efi_selftest/efi_selftest_util.c b/lib/efi_selftest/efi_selftest_util.c
index ea73c25220ff..1f4d248eeec0 100644
--- a/lib/efi_selftest/efi_selftest_util.c
+++ b/lib/efi_selftest/efi_selftest_util.c
@@ -8,6 +8,7 @@
  */
 
 #include <efi_selftest.h>
+#include <asm/types.h>
 
 struct efi_st_translate {
 	u16 code;
diff --git a/lib/efi_selftest/efi_selftest_variables.c b/lib/efi_selftest/efi_selftest_variables.c
index dfbdeb99f31c..8de971ea364d 100644
--- a/lib/efi_selftest/efi_selftest_variables.c
+++ b/lib/efi_selftest/efi_selftest_variables.c
@@ -9,6 +9,7 @@
  */
 
 #include <efi_selftest.h>
+#include <asm/types.h>
 #include <linux/string.h>
 
 #define EFI_ST_MAX_DATA_SIZE 16
diff --git a/lib/efi_selftest/efi_selftest_variables_runtime.c b/lib/efi_selftest/efi_selftest_variables_runtime.c
index 619da67a292a..b232f07a3c40 100644
--- a/lib/efi_selftest/efi_selftest_variables_runtime.c
+++ b/lib/efi_selftest/efi_selftest_variables_runtime.c
@@ -10,6 +10,7 @@
  */
 
 #include <efi_selftest.h>
+#include <asm/types.h>
 #include <linux/string.h>
 
 #define EFI_ST_MAX_DATA_SIZE 16
diff --git a/lib/efi_selftest/efi_selftest_watchdog.c b/lib/efi_selftest/efi_selftest_watchdog.c
index 666c0309be19..97790eaa6afa 100644
--- a/lib/efi_selftest/efi_selftest_watchdog.c
+++ b/lib/efi_selftest/efi_selftest_watchdog.c
@@ -18,6 +18,7 @@
 
 #include <efi_selftest.h>
 #include <stdbool.h>
+#include <linux/types.h>
 
 /*
  * This is the communication structure for the notification function.
diff --git a/lib/elf.c b/lib/elf.c
index 623e46867cda..2b681d9c0cbe 100644
--- a/lib/elf.c
+++ b/lib/elf.c
@@ -18,6 +18,7 @@
 #endif
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /*
  * A very simple ELF64 loader, assumes the image is valid, returns the
diff --git a/lib/fdtdec.c b/lib/fdtdec.c
index ee8ae8d27640..655e0786e8a6 100644
--- a/lib/fdtdec.c
+++ b/lib/fdtdec.c
@@ -6,6 +6,7 @@
 #ifndef USE_HOSTCC
 #include <common.h>
 #include <boot_fit.h>
+#include <compiler.h>
 #include <display_options.h>
 #include <dm.h>
 #include <hang.h>
@@ -13,6 +14,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <net.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/u-boot.h>
@@ -32,6 +34,7 @@
 #include <linux/ctype.h>
 #include <linux/lzo.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/lib/fdtdec_test.c b/lib/fdtdec_test.c
index 15c60ee08cf6..a1cd2c1e9f1a 100644
--- a/lib/fdtdec_test.c
+++ b/lib/fdtdec_test.c
@@ -16,6 +16,7 @@
 #include <malloc.h>
 #include <os.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /* The size of our test fdt blob */
 #define FDT_SIZE	(16 * 1024)
diff --git a/lib/gunzip.c b/lib/gunzip.c
index 60429e5dd7e6..24cce8ffc7b9 100644
--- a/lib/gunzip.c
+++ b/lib/gunzip.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <blk.h>
 #include <command.h>
+#include <compiler.h>
 #include <console.h>
 #include <div64.h>
 #include <gzip.h>
@@ -14,6 +15,7 @@
 #include <malloc.h>
 #include <memalign.h>
 #include <stdio.h>
+#include <asm/types.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
 #include <watchdog.h>
diff --git a/lib/hexdump.c b/lib/hexdump.c
index 74940dd02494..7b3fb2c5ca3f 100644
--- a/lib/hexdump.c
+++ b/lib/hexdump.c
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <hexdump.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/ctype.h>
@@ -17,6 +18,7 @@
 #include <linux/kernel.h>
 #include <linux/log2.h>
 #include <asm/unaligned.h>
+#include <linux/types.h>
 
 const char hex_asc[] = "0123456789abcdef";
 const char hex_asc_upper[] = "0123456789ABCDEF";
diff --git a/lib/image-sparse.c b/lib/image-sparse.c
index 24741b8d8eca..c57fefbf508b 100644
--- a/lib/image-sparse.c
+++ b/lib/image-sparse.c
@@ -46,6 +46,7 @@
 #include <stdio.h>
 #include <asm/cache.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #include <linux/math64.h>
 
diff --git a/lib/libavb/avb_sysdeps.h b/lib/libavb/avb_sysdeps.h
index 85ff8e1de3e8..4af0a84cf15b 100644
--- a/lib/libavb/avb_sysdeps.h
+++ b/lib/libavb/avb_sysdeps.h
@@ -21,6 +21,7 @@ extern "C" {
  */
 #include <common.h>
 #include <stdbool.h>
+#include <linux/types.h>
 
 /* If you don't have gcc or clang, these attribute macros may need to
  * be adjusted.
diff --git a/lib/libavb/avb_sysdeps_posix.c b/lib/libavb/avb_sysdeps_posix.c
index 030d21fc2b91..b08161a0af95 100644
--- a/lib/libavb/avb_sysdeps_posix.c
+++ b/lib/libavb/avb_sysdeps_posix.c
@@ -10,6 +10,7 @@
 #include <stdlib.h>
 #include <vsprintf.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "avb_sysdeps.h"
 
diff --git a/lib/linux_compat.c b/lib/linux_compat.c
index 8b9b562f98ea..b70290d7fdac 100644
--- a/lib/linux_compat.c
+++ b/lib/linux_compat.c
@@ -5,6 +5,7 @@
 #include <asm/cache.h>
 #include <linux/compat.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 struct p_current cur = {
 	.pid = 1,
diff --git a/lib/linux_string.c b/lib/linux_string.c
index d5a5e08d98c1..ee6a5856a2f4 100644
--- a/lib/linux_string.c
+++ b/lib/linux_string.c
@@ -10,6 +10,7 @@
 
 #include <linux/ctype.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /**
  * skip_spaces - Removes leading whitespace from @str.
diff --git a/lib/lmb.c b/lib/lmb.c
index a9d10b7b26bf..3825e073c11d 100644
--- a/lib/lmb.c
+++ b/lib/lmb.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <image.h>
 #include <lmb.h>
 #include <log.h>
@@ -14,6 +15,7 @@
 #include <stdio.h>
 #include <asm/u-boot.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #define LMB_ALLOC_ANYWHERE	0
 
diff --git a/lib/lz4.c b/lib/lz4.c
index e803c087a269..628909a059cf 100644
--- a/lib/lz4.c
+++ b/lib/lz4.c
@@ -9,6 +9,7 @@
 */
 
 #include <linux/string.h>
+#include <linux/types.h>
 
 /**************************************
 *  Reading and writing into memory
diff --git a/lib/lzma/LzmaDec.c b/lib/lzma/LzmaDec.c
index 4f45f80fe264..cc400b6826ea 100644
--- a/lib/lzma/LzmaDec.c
+++ b/lib/lzma/LzmaDec.c
@@ -4,6 +4,7 @@
 #include <config.h>
 #include <common.h>
 #include <watchdog.h>
+#include <linux/types.h>
 #include "LzmaDec.h"
 
 #include <linux/string.h>
diff --git a/lib/lzma/LzmaTools.c b/lib/lzma/LzmaTools.c
index 5ce03bbbb756..8cb61c056ef1 100644
--- a/lib/lzma/LzmaTools.c
+++ b/lib/lzma/LzmaTools.c
@@ -22,6 +22,7 @@
 #include <log.h>
 #include <watchdog.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_LZMA
 
diff --git a/lib/lzma/Types.h b/lib/lzma/Types.h
index 8afcba556eb4..04d85e1d4fec 100644
--- a/lib/lzma/Types.h
+++ b/lib/lzma/Types.h
@@ -5,6 +5,7 @@
 #define __7Z_TYPES_H
 
 #include <stddef.h>
+#include <linux/types.h>
 
 #ifdef _WIN32
 #include <windows.h>
diff --git a/lib/lzo/lzo1x_decompress.c b/lib/lzo/lzo1x_decompress.c
index 393f31566bd1..ca38a3e5956f 100644
--- a/lib/lzo/lzo1x_decompress.c
+++ b/lib/lzo/lzo1x_decompress.c
@@ -18,6 +18,7 @@
 #include <asm/byteorder.h>
 #include <asm/unaligned.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "lzodefs.h"
 
 #define HAVE_IP(x, ip_end, ip) ((size_t)(ip_end - ip) < (x))
diff --git a/lib/lzo/lzodefs.h b/lib/lzo/lzodefs.h
index b6d482c492ef..c73bb717474c 100644
--- a/lib/lzo/lzodefs.h
+++ b/lib/lzo/lzodefs.h
@@ -11,6 +11,7 @@
  *  Richard Purdie <rpurdie@openedhand.com>
  */
 
+#include <linux/types.h>
 #define LZO_VERSION		0x2020
 #define LZO_VERSION_STRING	"2.02"
 #define LZO_VERSION_DATE	"Oct 17 2005"
diff --git a/lib/membuff.c b/lib/membuff.c
index 94f6e25e8266..b5a271bb8103 100644
--- a/lib/membuff.c
+++ b/lib/membuff.c
@@ -10,9 +10,11 @@
 #include <errno.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "membuff.h"
 
 void membuff_purge(struct membuff *mb)
diff --git a/lib/net_utils.c b/lib/net_utils.c
index eb2d52e849bf..3df5a1097a1d 100644
--- a/lib/net_utils.c
+++ b/lib/net_utils.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <net.h>
 #include <vsprintf.h>
+#include <linux/types.h>
 
 struct in_addr string_to_ip(const char *s)
 {
diff --git a/lib/of_live.c b/lib/of_live.c
index 208f6ada5717..d2b3f3bf7722 100644
--- a/lib/of_live.c
+++ b/lib/of_live.c
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <stdbool.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/libfdt.h>
@@ -18,6 +19,7 @@
 #include <dm/of_access.h>
 #include <linux/err.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 static void *unflatten_dt_alloc(void **mem, unsigned long size,
 				unsigned long align)
diff --git a/lib/oid_registry.c b/lib/oid_registry.c
index 5846030ac136..779c28e7aca8 100644
--- a/lib/oid_registry.c
+++ b/lib/oid_registry.c
@@ -8,6 +8,7 @@
 #ifdef __UBOOT__
 #include <vsprintf.h>
 #include <linux/compat.h>
+#include <linux/types.h>
 #else
 #include <linux/module.h>
 #include <linux/export.h>
diff --git a/lib/optee/optee.c b/lib/optee/optee.c
index 8493ca6c6211..8377ff6f5bda 100644
--- a/lib/optee/optee.c
+++ b/lib/optee/optee.c
@@ -13,6 +13,7 @@
 #include <linux/errno.h>
 #include <linux/libfdt.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <tee/optee.h>
 
 #define optee_hdr_err_msg \
diff --git a/lib/physmem.c b/lib/physmem.c
index 43f034766ab8..80bbc5ef5d18 100644
--- a/lib/physmem.c
+++ b/lib/physmem.c
@@ -9,11 +9,13 @@
  */
 
 #include <common.h>
+#include <compiler.h>
 #include <log.h>
 #include <mapmem.h>
 #include <physmem.h>
 #include <linux/compiler.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 phys_addr_t __weak arch_phys_memset(phys_addr_t s, int c, phys_size_t n)
 {
diff --git a/lib/rsa/rsa-checksum.c b/lib/rsa/rsa-checksum.c
index e60debb7df3c..2e7f8c4a1764 100644
--- a/lib/rsa/rsa-checksum.c
+++ b/lib/rsa/rsa-checksum.c
@@ -10,6 +10,7 @@
 #include <linux/errno.h>
 #include <asm/unaligned.h>
 #include <hash.h>
+#include <linux/types.h>
 #else
 #include "fdt_host.h"
 #endif
diff --git a/lib/rsa/rsa-keyprop.c b/lib/rsa/rsa-keyprop.c
index e5ece6152451..e0347615f76c 100644
--- a/lib/rsa/rsa-keyprop.c
+++ b/lib/rsa/rsa-keyprop.c
@@ -16,6 +16,7 @@
 #include <crypto/internal/rsa.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <u-boot/rsa-mod-exp.h>
 
 /**
diff --git a/lib/rsa/rsa-mod-exp.c b/lib/rsa/rsa-mod-exp.c
index d8cd3ecd88d6..0f87bd3ac055 100644
--- a/lib/rsa/rsa-mod-exp.c
+++ b/lib/rsa/rsa-mod-exp.c
@@ -13,6 +13,7 @@
 #include <asm/types.h>
 #include <asm/unaligned.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #else
 #include "fdt_host.h"
 #include "mkimage.h"
diff --git a/lib/rsa/rsa-verify.c b/lib/rsa/rsa-verify.c
index c894e7a6b9b6..d5eb2e92ec0c 100644
--- a/lib/rsa/rsa-verify.c
+++ b/lib/rsa/rsa-verify.c
@@ -17,6 +17,7 @@
 #include <asm/unaligned.h>
 #include <dm.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #else
 #include "fdt_host.h"
 #include "mkimage.h"
diff --git a/lib/sha1.c b/lib/sha1.c
index 8154e1e13500..bc77828df3fc 100644
--- a/lib/sha1.c
+++ b/lib/sha1.c
@@ -19,6 +19,7 @@
 #ifndef USE_HOSTCC
 #include <common.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #else
 #include <string.h>
 #endif /* USE_HOSTCC */
diff --git a/lib/sha256.c b/lib/sha256.c
index c1fe93de012d..53ab648155bc 100644
--- a/lib/sha256.c
+++ b/lib/sha256.c
@@ -8,6 +8,7 @@
 #ifndef USE_HOSTCC
 #include <common.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #else
 #include <string.h>
 #endif /* USE_HOSTCC */
diff --git a/lib/sha512.c b/lib/sha512.c
index f1e2acf0fbcb..e18fd78519ae 100644
--- a/lib/sha512.c
+++ b/lib/sha512.c
@@ -13,6 +13,7 @@
 #ifndef USE_HOSTCC
 #include <common.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #else
 #include <string.h>
 #endif /* USE_HOSTCC */
diff --git a/lib/smbios.c b/lib/smbios.c
index 73cd07b599e0..8a133fec68ee 100644
--- a/lib/smbios.c
+++ b/lib/smbios.c
@@ -19,6 +19,7 @@
 #endif
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /**
  * smbios_add_string() - add a string to the string area
diff --git a/lib/strto.c b/lib/strto.c
index 9636c797ea5a..3c5b099b992d 100644
--- a/lib/strto.c
+++ b/lib/strto.c
@@ -15,6 +15,7 @@
 #include <linux/ctype.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /* from lib/kstrtox.c */
 static const char *_parse_integer_fixup_radix(const char *s, unsigned int *base)
diff --git a/lib/tables_csum.c b/lib/tables_csum.c
index e2630d57d912..4b8470230a75 100644
--- a/lib/tables_csum.c
+++ b/lib/tables_csum.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <asm/types.h>
 #include <linux/ctype.h>
 
 u8 table_compute_checksum(void *v, int len)
diff --git a/lib/time.c b/lib/time.c
index 733beb7dcc20..bbda9f421ac6 100644
--- a/lib/time.c
+++ b/lib/time.c
@@ -17,6 +17,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/delay.h>
+#include <linux/types.h>
 
 #ifndef CONFIG_WD_PERIOD
 # define CONFIG_WD_PERIOD	(10 * 1000 * 1000)	/* 10 seconds default */
diff --git a/lib/tiny-printf.c b/lib/tiny-printf.c
index 9e16f5350632..6acfd1008296 100644
--- a/lib/tiny-printf.c
+++ b/lib/tiny-printf.c
@@ -15,6 +15,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/ctype.h>
+#include <linux/types.h>
 
 struct printf_info {
 	char *bf;	/* Digit buffer */
diff --git a/lib/tizen/tizen.c b/lib/tizen/tizen.c
index 916b2597569c..03b2f6235a14 100644
--- a/lib/tizen/tizen.c
+++ b/lib/tizen/tizen.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <lcd.h>
 #include <libtizen.h>
+#include <linux/types.h>
 
 #include "tizen_logo_16bpp.h"
 #include "tizen_logo_16bpp_gzip.h"
diff --git a/lib/tpm-common.c b/lib/tpm-common.c
index 93bcab46112f..10d4164f581e 100644
--- a/lib/tpm-common.c
+++ b/lib/tpm-common.c
@@ -14,6 +14,7 @@
 #include <asm/unaligned.h>
 #include <tpm-common.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "tpm-utils.h"
 
 enum tpm_version tpm_get_version(struct udevice *dev)
diff --git a/lib/tpm-utils.h b/lib/tpm-utils.h
index d680d1408843..656886fa9494 100644
--- a/lib/tpm-utils.h
+++ b/lib/tpm-utils.h
@@ -7,6 +7,7 @@
 #ifndef __TPM_UTILS_H
 #define __TPM_UTILS_H
 
+#include <linux/types.h>
 #define COMMAND_BUFFER_SIZE 256
 
 /* Internal error of TPM command library */
diff --git a/lib/tpm-v1.c b/lib/tpm-v1.c
index c3f9dde9e865..772111e97dba 100644
--- a/lib/tpm-v1.c
+++ b/lib/tpm-v1.c
@@ -12,6 +12,7 @@
 #include <asm/unaligned.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <u-boot/sha1.h>
 #include <tpm-common.h>
 #include <tpm-v1.h>
diff --git a/lib/tpm-v2.c b/lib/tpm-v2.c
index d278acfb436e..bb868f20e563 100644
--- a/lib/tpm-v2.c
+++ b/lib/tpm-v2.c
@@ -11,6 +11,7 @@
 #include <linux/bitops.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "tpm-utils.h"
 
 u32 tpm2_startup(struct udevice *dev, enum tpm2_startup_types mode)
diff --git a/lib/trace.c b/lib/trace.c
index 8f666133caa0..30bf819e7fca 100644
--- a/lib/trace.c
+++ b/lib/trace.c
@@ -15,6 +15,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/lib/uuid.c b/lib/uuid.c
index 3111318808ca..d6b1f69a61d7 100644
--- a/lib/uuid.c
+++ b/lib/uuid.c
@@ -20,6 +20,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /*
  * UUID - Universally Unique IDentifier - 128 bits unique number.
diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index c8f663cf4da2..80cfdebbc50d 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -19,6 +19,7 @@
 #include <div64.h>
 #include <hexdump.h>
 #include <stdarg.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <uuid.h>
 #include <vsprintf.h>
diff --git a/lib/xxhash.c b/lib/xxhash.c
index 2fb4dc6d02b5..1f54d75381c9 100644
--- a/lib/xxhash.c
+++ b/lib/xxhash.c
@@ -14,6 +14,7 @@
 #include <linux/kernel.h>
 #include <linux/compat.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <linux/xxhash.h>
 
 /*-*************************************
diff --git a/lib/zstd/zstd_opt.h b/lib/zstd/zstd_opt.h
index 25f78bdba24f..0fbe8ec12940 100644
--- a/lib/zstd/zstd_opt.h
+++ b/lib/zstd/zstd_opt.h
@@ -10,6 +10,7 @@
 #define ZSTD_OPT_H_91842398743
 
 #include <linux/string.h>
+#include <linux/types.h>
 #define ZSTD_LITFREQ_ADD 2
 #define ZSTD_FREQ_DIV 4
 #define ZSTD_MAX_PRICE (1 << 30)
diff --git a/net/arp.c b/net/arp.c
index aaf5d3c27fd6..95b1c0fbf0ad 100644
--- a/net/arp.c
+++ b/net/arp.c
@@ -19,6 +19,7 @@
 #include <vsprintf.h>
 #include <linux/delay.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "arp.h"
 
diff --git a/net/arp.h b/net/arp.h
index 25b3c00d5c56..b5544783f76c 100644
--- a/net/arp.h
+++ b/net/arp.h
@@ -13,6 +13,7 @@
 #define __ARP_H__
 
 #include <common.h>
+#include <linux/types.h>
 
 extern struct in_addr net_arp_wait_packet_ip;
 /* MAC address of waiting packet's destination */
diff --git a/net/bootp.c b/net/bootp.c
index 6fde55fe8628..582755b2cae0 100644
--- a/net/bootp.c
+++ b/net/bootp.c
@@ -16,6 +16,7 @@
 #include <log.h>
 #include <net.h>
 #include <rand.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <uuid.h>
@@ -23,6 +24,7 @@
 #include <linux/delay.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <net/tftp.h>
 #include "bootp.h"
 #ifdef CONFIG_LED_STATUS
diff --git a/net/bootp.h b/net/bootp.h
index 567340ec5d4a..99ed7dfe994a 100644
--- a/net/bootp.h
+++ b/net/bootp.h
@@ -25,6 +25,7 @@
 extern u8 *dhcp_vendorex_prep(u8 *e); /*rtn new e after add own opts. */
 extern u8 *dhcp_vendorex_proc(u8 *e); /*rtn next e if mine,else NULL  */
 #endif
+#include <asm/types.h>
 #else
 #define OPT_FIELD_SIZE 64
 #endif
diff --git a/net/cdp.c b/net/cdp.c
index ffb91a64900c..98ac97827957 100644
--- a/net/cdp.c
+++ b/net/cdp.c
@@ -17,6 +17,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "cdp.h"
 
diff --git a/net/cdp.h b/net/cdp.h
index 16ccbf4b59ed..476c9bf17a71 100644
--- a/net/cdp.h
+++ b/net/cdp.h
@@ -14,6 +14,7 @@
 #ifndef __CDP_H__
 #define __CDP_H__
 
+#include <linux/types.h>
 void cdp_start(void);
 /* Process a received CDP packet */
 void cdp_receive(const uchar *pkt, unsigned len);
diff --git a/net/dns.c b/net/dns.c
index c86e519c3c7c..e27cf256e086 100644
--- a/net/dns.c
+++ b/net/dns.c
@@ -31,6 +31,7 @@
 #include <time.h>
 #include <asm/unaligned.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "dns.h"
 
diff --git a/net/dns.h b/net/dns.h
index 79ac76f590dc..755b5c1805b4 100644
--- a/net/dns.h
+++ b/net/dns.h
@@ -7,6 +7,7 @@
 #ifndef __DNS_H__
 #define __DNS_H__
 
+#include <linux/types.h>
 #define DNS_SERVICE_PORT 53
 #define DNS_TIMEOUT      10000UL
 
diff --git a/net/eth-uclass.c b/net/eth-uclass.c
index 05f35cdfb5fb..4ace57fefe7e 100644
--- a/net/eth-uclass.c
+++ b/net/eth-uclass.c
@@ -19,6 +19,7 @@
 #include <dm/uclass-internal.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <net/pcap.h>
 #include "eth_internal.h"
 #include <eth_phy.h>
diff --git a/net/eth_common.c b/net/eth_common.c
index 5e8276b9bcec..822c6440379f 100644
--- a/net/eth_common.c
+++ b/net/eth_common.c
@@ -13,6 +13,7 @@
 #include <net.h>
 #include <vsprintf.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "eth_internal.h"
 
 int eth_env_get_enetaddr_by_index(const char *base_name, int index,
diff --git a/net/eth_internal.h b/net/eth_internal.h
index faff0ef86673..444629cdd8d2 100644
--- a/net/eth_internal.h
+++ b/net/eth_internal.h
@@ -9,6 +9,7 @@
 #define __ETH_INTERNAL_H
 
 /* Do init that is common to driver model and legacy networking */
+#include <linux/types.h>
 void eth_common_init(void);
 
 /**
diff --git a/net/eth_legacy.c b/net/eth_legacy.c
index 46b318a971db..3f155842547f 100644
--- a/net/eth_legacy.c
+++ b/net/eth_legacy.c
@@ -21,6 +21,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <net/pcap.h>
 #include "eth_internal.h"
 
diff --git a/net/fastboot.c b/net/fastboot.c
index b6006ddd2a9d..d23a225d43df 100644
--- a/net/fastboot.c
+++ b/net/fastboot.c
@@ -5,13 +5,16 @@
 
 #include <common.h>
 #include <command.h>
+#include <compiler.h>
 #include <fastboot.h>
 #include <net.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <linux/kernel.h>
 #include <linux/printk.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <net/fastboot.h>
 
 /* Fastboot port # defined in spec */
diff --git a/net/mdio-mux-uclass.c b/net/mdio-mux-uclass.c
index 5766c33ebbd4..ec4e9bbfc64c 100644
--- a/net/mdio-mux-uclass.c
+++ b/net/mdio-mux-uclass.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <miiphy.h>
 #include <stdbool.h>
+#include <asm/types.h>
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
 #include <dm/lists.h>
diff --git a/net/mdio-uclass.c b/net/mdio-uclass.c
index 3e39a9b74f88..3e241057ca1f 100644
--- a/net/mdio-uclass.c
+++ b/net/mdio-uclass.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <miiphy.h>
+#include <asm/types.h>
 #include <dm/device-internal.h>
 #include <dm/device_compat.h>
 #include <dm/uclass-internal.h>
diff --git a/net/net.c b/net/net.c
index 1a17cc7c7a29..566cd6827975 100644
--- a/net/net.c
+++ b/net/net.c
@@ -103,6 +103,7 @@
 #include <vsprintf.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <net/fastboot.h>
 #include <net/tftp.h>
 #if defined(CONFIG_CMD_PCAP)
diff --git a/net/nfs.c b/net/nfs.c
index 76ff7d32e0bb..7c305de325d9 100644
--- a/net/nfs.c
+++ b/net/nfs.c
@@ -9,6 +9,7 @@
  * large portions are copied verbatim) as distributed in OSKit 0.97.  A few
  * changes were necessary to adapt the code to Etherboot and to fix several
  * inconsistencies.  Also the RPC message preparation is done "by hand" to
+#include <linux/types.h>
  * avoid adding netsprintf() which I find hard to understand and use.  */
 
 /* NOTE 2: Etherboot does not care about things beyond the kernel image, so
diff --git a/net/nfs.h b/net/nfs.h
index 68ada0efeb9b..8a2d443677e8 100644
--- a/net/nfs.h
+++ b/net/nfs.h
@@ -6,6 +6,7 @@
 #ifndef __NFS_H__
 #define __NFS_H__
 
+#include <linux/types.h>
 #define SUNRPC_PORT     111
 
 #define PROG_PORTMAP    100000
diff --git a/net/pcap.c b/net/pcap.c
index 4ddc55801d7f..da2903b80f86 100644
--- a/net/pcap.c
+++ b/net/pcap.c
@@ -9,6 +9,7 @@
 #include <stdio.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <net/pcap.h>
 #include <time.h>
 #include <asm/io.h>
diff --git a/net/rarp.c b/net/rarp.c
index 28abc8a4bcf2..cdbdb73835be 100644
--- a/net/rarp.c
+++ b/net/rarp.c
@@ -10,6 +10,7 @@
 #include <net.h>
 #include <stdio.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <net/tftp.h>
 #include "nfs.h"
 #include "bootp.h"
diff --git a/net/sntp.c b/net/sntp.c
index 9968984eece5..11df1db6a10d 100644
--- a/net/sntp.c
+++ b/net/sntp.c
@@ -14,6 +14,7 @@
 #include <stdio.h>
 #include <time.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #include "sntp.h"
 
diff --git a/net/sntp.h b/net/sntp.h
index d3cbfbc69a6b..613d7a87b229 100644
--- a/net/sntp.h
+++ b/net/sntp.h
@@ -6,6 +6,7 @@
 #ifndef __SNTP_H__
 #define __SNTP_H__
 
+#include <linux/types.h>
 #define NTP_SERVICE_PORT	123
 #define SNTP_PACKET_LEN		48
 
diff --git a/net/tftp.c b/net/tftp.c
index 294ab1bbfe6c..bcbe559cdd12 100644
--- a/net/tftp.c
+++ b/net/tftp.c
@@ -15,12 +15,14 @@
 #include <log.h>
 #include <mapmem.h>
 #include <net.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include <net/tftp.h>
 #include "bootp.h"
 #ifdef CONFIG_SYS_DIRECT_FLASH_TFTP
diff --git a/net/wol.c b/net/wol.c
index e985f4adc59d..9a008c849748 100644
--- a/net/wol.c
+++ b/net/wol.c
@@ -8,6 +8,7 @@
 #include <env.h>
 #include <net.h>
 #include <linux/string.h>
+#include <linux/types.h>
 #include "wol.h"
 
 static ulong wol_timeout = WOL_DEFAULT_TIMEOUT;
diff --git a/net/wol.h b/net/wol.h
index ebc81f24b6e5..828f65367acd 100644
--- a/net/wol.h
+++ b/net/wol.h
@@ -15,6 +15,7 @@
 #define __WOL_H__
 
 #include <net.h>
+#include <linux/types.h>
 
 /**********************************************************************/
 
diff --git a/post/cpu/mpc83xx/ecc.c b/post/cpu/mpc83xx/ecc.c
index 9b700fbc9eb9..4d67f8c08b3e 100644
--- a/post/cpu/mpc83xx/ecc.c
+++ b/post/cpu/mpc83xx/ecc.c
@@ -17,6 +17,7 @@
 #include <watchdog.h>
 #include <asm/io.h>
 #include <post.h>
+#include <asm/types.h>
 
 #if CONFIG_POST & CONFIG_SYS_POST_ECC
 /*
diff --git a/post/drivers/flash.c b/post/drivers/flash.c
index 721d48eb6b31..d1af27c654ff 100644
--- a/post/drivers/flash.c
+++ b/post/drivers/flash.c
@@ -12,6 +12,7 @@
 #include <flash.h>
 #include <stdio.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #if CONFIG_POST & CONFIG_SYS_POST_FLASH
 
diff --git a/post/drivers/memory.c b/post/drivers/memory.c
index e8cded75223f..19695276be4f 100644
--- a/post/drivers/memory.c
+++ b/post/drivers/memory.c
@@ -9,6 +9,7 @@
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 /* Memory test
  *
diff --git a/post/drivers/rtc.c b/post/drivers/rtc.c
index 7f14670317c1..dbdccacf2706 100644
--- a/post/drivers/rtc.c
+++ b/post/drivers/rtc.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <time.h>
+#include <linux/types.h>
 
 /*
  * RTC test
diff --git a/post/lib_powerpc/andi.c b/post/lib_powerpc/andi.c
index cea61eb87a60..e2abcaead7b6 100644
--- a/post/lib_powerpc/andi.c
+++ b/post/lib_powerpc/andi.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <irq_func.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 /*
  * CPU test
diff --git a/post/lib_powerpc/b.c b/post/lib_powerpc/b.c
index 0b02e9169e2b..dba7098f30a3 100644
--- a/post/lib_powerpc/b.c
+++ b/post/lib_powerpc/b.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <irq_func.h>
+#include <linux/types.h>
 
 /*
  * CPU test
diff --git a/post/lib_powerpc/cmp.c b/post/lib_powerpc/cmp.c
index bcfd18929914..508b9c08ae47 100644
--- a/post/lib_powerpc/cmp.c
+++ b/post/lib_powerpc/cmp.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <irq_func.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 /*
  * CPU test
diff --git a/post/lib_powerpc/cmpi.c b/post/lib_powerpc/cmpi.c
index 29a65895306e..938c7f826986 100644
--- a/post/lib_powerpc/cmpi.c
+++ b/post/lib_powerpc/cmpi.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <irq_func.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 /*
  * CPU test
diff --git a/post/lib_powerpc/cpu.c b/post/lib_powerpc/cpu.c
index 8506fd6b7152..a4b31aaa8e45 100644
--- a/post/lib_powerpc/cpu.c
+++ b/post/lib_powerpc/cpu.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <cpu_func.h>
+#include <linux/types.h>
 
 /*
  * CPU test
diff --git a/post/lib_powerpc/cr.c b/post/lib_powerpc/cr.c
index 1c1c1e3700bc..370aacc63506 100644
--- a/post/lib_powerpc/cr.c
+++ b/post/lib_powerpc/cr.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <irq_func.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 /*
  * CPU test
diff --git a/post/lib_powerpc/load.c b/post/lib_powerpc/load.c
index 19f88d07d7f0..589ac587bbfe 100644
--- a/post/lib_powerpc/load.c
+++ b/post/lib_powerpc/load.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <irq_func.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 /*
  * CPU test
diff --git a/post/lib_powerpc/multi.c b/post/lib_powerpc/multi.c
index 29c102d70ee6..c361357f4249 100644
--- a/post/lib_powerpc/multi.c
+++ b/post/lib_powerpc/multi.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /*
  * CPU test
diff --git a/post/lib_powerpc/rlwimi.c b/post/lib_powerpc/rlwimi.c
index be63f960ed6c..4d3b89c4fc0a 100644
--- a/post/lib_powerpc/rlwimi.c
+++ b/post/lib_powerpc/rlwimi.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <irq_func.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 /*
  * CPU test
diff --git a/post/lib_powerpc/rlwinm.c b/post/lib_powerpc/rlwinm.c
index 13577f858e11..7c2f61cb0c7f 100644
--- a/post/lib_powerpc/rlwinm.c
+++ b/post/lib_powerpc/rlwinm.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <irq_func.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 /*
  * CPU test
diff --git a/post/lib_powerpc/rlwnm.c b/post/lib_powerpc/rlwnm.c
index 2a3525466c3f..be2fcf9350c8 100644
--- a/post/lib_powerpc/rlwnm.c
+++ b/post/lib_powerpc/rlwnm.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <irq_func.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 /*
  * CPU test
diff --git a/post/lib_powerpc/srawi.c b/post/lib_powerpc/srawi.c
index 22a747b63ea8..1508a77fc73c 100644
--- a/post/lib_powerpc/srawi.c
+++ b/post/lib_powerpc/srawi.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <irq_func.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 /*
  * CPU test
diff --git a/post/lib_powerpc/store.c b/post/lib_powerpc/store.c
index a8bf67ea9e2b..c9d872675ffe 100644
--- a/post/lib_powerpc/store.c
+++ b/post/lib_powerpc/store.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <irq_func.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 /*
  * CPU test
diff --git a/post/lib_powerpc/string.c b/post/lib_powerpc/string.c
index c292f8f0f8e0..b779faffbf64 100644
--- a/post/lib_powerpc/string.c
+++ b/post/lib_powerpc/string.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <irq_func.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 /*
  * CPU test
diff --git a/post/lib_powerpc/three.c b/post/lib_powerpc/three.c
index a4f7262698c1..382a81835635 100644
--- a/post/lib_powerpc/three.c
+++ b/post/lib_powerpc/three.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <irq_func.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 /*
  * CPU test
diff --git a/post/lib_powerpc/threei.c b/post/lib_powerpc/threei.c
index 74d6a3f29997..184ccaa1854c 100644
--- a/post/lib_powerpc/threei.c
+++ b/post/lib_powerpc/threei.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <irq_func.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 /*
  * CPU test
diff --git a/post/lib_powerpc/threex.c b/post/lib_powerpc/threex.c
index e8c6959bf90e..153639c8abef 100644
--- a/post/lib_powerpc/threex.c
+++ b/post/lib_powerpc/threex.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <irq_func.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 /*
  * CPU test
diff --git a/post/lib_powerpc/two.c b/post/lib_powerpc/two.c
index a576452f6f25..d0a70077fbb0 100644
--- a/post/lib_powerpc/two.c
+++ b/post/lib_powerpc/two.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <irq_func.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 /*
  * CPU test
diff --git a/post/lib_powerpc/twox.c b/post/lib_powerpc/twox.c
index 4e53fff27749..934352bacd72 100644
--- a/post/lib_powerpc/twox.c
+++ b/post/lib_powerpc/twox.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <irq_func.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 /*
  * CPU test
diff --git a/post/post.c b/post/post.c
index 758e4ecba199..d86be8d5826c 100644
--- a/post/post.c
+++ b/post/post.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <bootstage.h>
+#include <compiler.h>
 #include <env.h>
 #include <log.h>
 #include <malloc.h>
@@ -20,6 +21,7 @@
 #include <asm/global_data.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_SYS_POST_HOTKEYS_GPIO
 #include <asm/gpio.h>
diff --git a/test/bloblist.c b/test/bloblist.c
index fed3e60d2111..474d953625b0 100644
--- a/test/bloblist.c
+++ b/test/bloblist.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <mapmem.h>
 #include <asm/global_data.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <test/suites.h>
diff --git a/test/cmd/mem_search.c b/test/cmd/mem_search.c
index 94942793a49d..d0b6b8516764 100644
--- a/test/cmd/mem_search.c
+++ b/test/cmd/mem_search.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <console.h>
 #include <mapmem.h>
+#include <asm/types.h>
 #include <dm/test.h>
 #include <test/ut.h>
 
diff --git a/test/compression.c b/test/compression.c
index 4fc7b07fece8..63bc09d81675 100644
--- a/test/compression.c
+++ b/test/compression.c
@@ -14,6 +14,7 @@
 #include <mapmem.h>
 #include <stdio.h>
 #include <asm/io.h>
+#include <linux/types.h>
 
 #include <u-boot/zlib.h>
 #include <bzlib.h>
diff --git a/test/dm/acpi.c b/test/dm/acpi.c
index cb6bbd7719d7..853983beb0b0 100644
--- a/test/dm/acpi.c
+++ b/test/dm/acpi.c
@@ -11,6 +11,7 @@
 #include <dm.h>
 #include <malloc.h>
 #include <mapmem.h>
+#include <stdbool.h>
 #include <version.h>
 #include <tables_csum.h>
 #include <version.h>
@@ -22,6 +23,7 @@
 #include <dm/test.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include <test/ut.h>
 #include "acpi.h"
 
diff --git a/test/dm/acpi.h b/test/dm/acpi.h
index 535db56b51e4..efb608354fc8 100644
--- a/test/dm/acpi.h
+++ b/test/dm/acpi.h
@@ -9,6 +9,7 @@
 #ifndef __TEST_DM_ACPI_H
 #define __TEST_DM_ACPI_H
 
+#include <asm/types.h>
 #define ACPI_TEST_DEV_NAME	"ABCD"
 #define ACPI_TEST_CHILD_NAME	"EFGH"
 
diff --git a/test/dm/acpi_dp.c b/test/dm/acpi_dp.c
index 2c2dd20bf9c6..9877f0c34fc4 100644
--- a/test/dm/acpi_dp.c
+++ b/test/dm/acpi_dp.c
@@ -16,6 +16,7 @@
 #include <dm/test.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include <test/ut.h>
 #include "acpi.h"
 
diff --git a/test/dm/acpigen.c b/test/dm/acpigen.c
index 1aa614fedc3d..198323e092bc 100644
--- a/test/dm/acpigen.c
+++ b/test/dm/acpigen.c
@@ -20,6 +20,7 @@
 #include <dm/uclass-internal.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include <test/ut.h>
 #include "acpi.h"
 
diff --git a/test/dm/audio.c b/test/dm/audio.c
index add15ae20e00..cbdb2cb2d178 100644
--- a/test/dm/audio.c
+++ b/test/dm/audio.c
@@ -8,6 +8,7 @@
 #include <audio_codec.h>
 #include <dm.h>
 #include <dm/test.h>
+#include <linux/types.h>
 #include <test/test.h>
 #include <test/ut.h>
 #include <asm/test.h>
diff --git a/test/dm/axi.c b/test/dm/axi.c
index 998c1a5b83eb..ef612c97c6df 100644
--- a/test/dm/axi.c
+++ b/test/dm/axi.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <log.h>
 #include <asm/axi.h>
+#include <asm/types.h>
 #include <dm/test.h>
 #include <linux/kernel.h>
 #include <test/test.h>
diff --git a/test/dm/bootcount.c b/test/dm/bootcount.c
index f911984698d8..c6e5e50cc2ba 100644
--- a/test/dm/bootcount.c
+++ b/test/dm/bootcount.c
@@ -8,6 +8,7 @@
 #include <bootcount.h>
 #include <log.h>
 #include <asm/test.h>
+#include <asm/types.h>
 #include <dm/test.h>
 #include <test/test.h>
 #include <test/ut.h>
diff --git a/test/dm/clk.c b/test/dm/clk.c
index edca3b49f600..bce3ff1091da 100644
--- a/test/dm/clk.c
+++ b/test/dm/clk.c
@@ -12,6 +12,7 @@
 #include <dm/test.h>
 #include <dm/device-internal.h>
 #include <linux/err.h>
+#include <linux/types.h>
 #include <test/test.h>
 #include <test/ut.h>
 
diff --git a/test/dm/core.c b/test/dm/core.c
index f70263202841..3b3937ec91b8 100644
--- a/test/dm/core.c
+++ b/test/dm/core.c
@@ -21,6 +21,7 @@
 #include <test/test.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include <test/ut.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/test/dm/devres.c b/test/dm/devres.c
index e1e088a3cace..a493f767754e 100644
--- a/test/dm/devres.c
+++ b/test/dm/devres.c
@@ -14,6 +14,7 @@
 #include <dm/devres.h>
 #include <dm/test.h>
 #include <dm/uclass-internal.h>
+#include <linux/types.h>
 #include <test/ut.h>
 
 /* Test that devm_kmalloc() allocates memory, free when device is removed */
diff --git a/test/dm/dma.c b/test/dm/dma.c
index cce47cb21803..cf4233c30534 100644
--- a/test/dm/dma.c
+++ b/test/dm/dma.c
@@ -11,6 +11,7 @@
 #include <malloc.h>
 #include <dm/test.h>
 #include <dma.h>
+#include <linux/types.h>
 #include <test/test.h>
 #include <test/ut.h>
 
diff --git a/test/dm/dsi_host.c b/test/dm/dsi_host.c
index 6e0a5df704f5..4393d6cc4a98 100644
--- a/test/dm/dsi_host.c
+++ b/test/dm/dsi_host.c
@@ -9,6 +9,7 @@
 #include <dsi_host.h>
 #include <asm/state.h>
 #include <asm/test.h>
+#include <asm/types.h>
 #include <dm/test.h>
 #include <test/test.h>
 #include <test/ut.h>
diff --git a/test/dm/fdtdec.c b/test/dm/fdtdec.c
index 69badfbb08ee..3591e6a57fe8 100644
--- a/test/dm/fdtdec.c
+++ b/test/dm/fdtdec.c
@@ -8,6 +8,7 @@
 #include <asm/global_data.h>
 #include <dm/of_extra.h>
 #include <dm/test.h>
+#include <linux/types.h>
 #include <test/ut.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/test/dm/gpio.c b/test/dm/gpio.c
index 13df4745402a..ceb8fac95666 100644
--- a/test/dm/gpio.c
+++ b/test/dm/gpio.c
@@ -16,6 +16,7 @@
 #include <test/test.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include <test/ut.h>
 
 /* Test that sandbox GPIOs work correctly */
diff --git a/test/dm/i2c.c b/test/dm/i2c.c
index 6ca1c24089ad..e4d52d494de5 100644
--- a/test/dm/i2c.c
+++ b/test/dm/i2c.c
@@ -17,6 +17,7 @@
 #include <dm/util.h>
 #include <hexdump.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <test/test.h>
 #include <test/ut.h>
 
diff --git a/test/dm/i2s.c b/test/dm/i2s.c
index f3ba00aaef56..f6c8194730f2 100644
--- a/test/dm/i2s.c
+++ b/test/dm/i2s.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <i2s.h>
 #include <asm/test.h>
+#include <asm/types.h>
 #include <dm/test.h>
 #include <linux/kernel.h>
 #include <test/test.h>
diff --git a/test/dm/k210_pll.c b/test/dm/k210_pll.c
index 076dc770b87e..b72fd55883a9 100644
--- a/test/dm/k210_pll.c
+++ b/test/dm/k210_pll.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 /* For DIV_ROUND_DOWN_ULL, defined in linux/kernel.h */
diff --git a/test/dm/mailbox.c b/test/dm/mailbox.c
index 60e1c9fd8548..b1d0aa482b81 100644
--- a/test/dm/mailbox.c
+++ b/test/dm/mailbox.c
@@ -9,6 +9,7 @@
 #include <dm/test.h>
 #include <asm/mbox.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <test/test.h>
 #include <test/ut.h>
 
diff --git a/test/dm/mdio.c b/test/dm/mdio.c
index 64347e1275aa..e619f7768943 100644
--- a/test/dm/mdio.c
+++ b/test/dm/mdio.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <log.h>
 #include <miiphy.h>
+#include <asm/types.h>
 #include <misc.h>
 #include <dm/test.h>
 #include <test/test.h>
diff --git a/test/dm/mdio_mux.c b/test/dm/mdio_mux.c
index 950f385d17f2..c33f28a608c8 100644
--- a/test/dm/mdio_mux.c
+++ b/test/dm/mdio_mux.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <miiphy.h>
+#include <asm/types.h>
 #include <misc.h>
 #include <dm/test.h>
 #include <test/test.h>
diff --git a/test/dm/misc.c b/test/dm/misc.c
index 7b0d3e983244..90d27c224bba 100644
--- a/test/dm/misc.c
+++ b/test/dm/misc.c
@@ -9,6 +9,7 @@
 #include <stdbool.h>
 #include <dm/test.h>
 #include <misc.h>
+#include <linux/types.h>
 #include <test/test.h>
 #include <test/ut.h>
 
diff --git a/test/dm/ofnode.c b/test/dm/ofnode.c
index 8bfb70660269..96458a19047c 100644
--- a/test/dm/ofnode.c
+++ b/test/dm/ofnode.c
@@ -3,6 +3,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <asm/types.h>
 #include <dm/of_extra.h>
 #include <dm/test.h>
 #include <test/test.h>
diff --git a/test/dm/osd.c b/test/dm/osd.c
index 14823437f20e..168c129efb54 100644
--- a/test/dm/osd.c
+++ b/test/dm/osd.c
@@ -8,6 +8,7 @@
 #include <display_options.h>
 #include <dm.h>
 #include <stdio.h>
+#include <linux/types.h>
 #include <video_osd.h>
 #include <asm/test.h>
 #include <dm/test.h>
diff --git a/test/dm/panel.c b/test/dm/panel.c
index 7504fd5f5c8a..c820447a901b 100644
--- a/test/dm/panel.c
+++ b/test/dm/panel.c
@@ -15,6 +15,7 @@
 #include <asm/gpio.h>
 #include <asm/test.h>
 #include <dm/test.h>
+#include <linux/types.h>
 #include <power/regulator.h>
 #include <test/test.h>
 #include <test/ut.h>
diff --git a/test/dm/pch.c b/test/dm/pch.c
index eeb1c7f2a1f4..33d5207114af 100644
--- a/test/dm/pch.c
+++ b/test/dm/pch.c
@@ -9,6 +9,7 @@
 #include <asm/test.h>
 #include <dm/test.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <test/test.h>
 #include <test/ut.h>
 
diff --git a/test/dm/pci.c b/test/dm/pci.c
index fd66ed7899f9..4e0b3b945ed5 100644
--- a/test/dm/pci.c
+++ b/test/dm/pci.c
@@ -8,6 +8,7 @@
 #include <asm/io.h>
 #include <asm/test.h>
 #include <dm/test.h>
+#include <linux/types.h>
 #include <test/test.h>
 #include <test/ut.h>
 
diff --git a/test/dm/pmic.c b/test/dm/pmic.c
index ce671202fbc6..0c210f361987 100644
--- a/test/dm/pmic.c
+++ b/test/dm/pmic.c
@@ -17,6 +17,7 @@
 #include <dm/test.h>
 #include <dm/uclass-internal.h>
 #include <dm/util.h>
+#include <linux/types.h>
 #include <power/pmic.h>
 #include <power/sandbox_pmic.h>
 #include <test/test.h>
diff --git a/test/dm/power-domain.c b/test/dm/power-domain.c
index 8604b5d72dc0..754ed1d21430 100644
--- a/test/dm/power-domain.c
+++ b/test/dm/power-domain.c
@@ -8,6 +8,7 @@
 #include <malloc.h>
 #include <dm/test.h>
 #include <asm/power-domain.h>
+#include <linux/types.h>
 #include <test/test.h>
 #include <test/ut.h>
 
diff --git a/test/dm/regmap.c b/test/dm/regmap.c
index 271ec80e57fc..2c28edf01ed6 100644
--- a/test/dm/regmap.c
+++ b/test/dm/regmap.c
@@ -14,6 +14,7 @@
 #include <dm/test.h>
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <test/test.h>
 #include <test/ut.h>
 
diff --git a/test/dm/regulator.c b/test/dm/regulator.c
index 5c025541d7aa..8b54906058d8 100644
--- a/test/dm/regulator.c
+++ b/test/dm/regulator.c
@@ -12,6 +12,7 @@
 #include <fdtdec.h>
 #include <log.h>
 #include <malloc.h>
+#include <stdbool.h>
 #include <dm/device-internal.h>
 #include <dm/root.h>
 #include <dm/util.h>
diff --git a/test/dm/remoteproc.c b/test/dm/remoteproc.c
index 9d22a2d1edbc..cb013f56490d 100644
--- a/test/dm/remoteproc.c
+++ b/test/dm/remoteproc.c
@@ -12,6 +12,7 @@
 #include <dm/test.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include <test/test.h>
 #include <test/ut.h>
 
diff --git a/test/dm/reset.c b/test/dm/reset.c
index f5f366151fcd..696af83d4c38 100644
--- a/test/dm/reset.c
+++ b/test/dm/reset.c
@@ -10,6 +10,7 @@
 #include <reset.h>
 #include <dm/test.h>
 #include <asm/reset.h>
+#include <linux/types.h>
 #include <test/test.h>
 #include <test/ut.h>
 
diff --git a/test/dm/rtc.c b/test/dm/rtc.c
index e4f2354af82c..ae3c43319c72 100644
--- a/test/dm/rtc.c
+++ b/test/dm/rtc.c
@@ -15,6 +15,7 @@
 #include <asm/io.h>
 #include <asm/rtc.h>
 #include <asm/test.h>
+#include <asm/types.h>
 #include <dm/test.h>
 #include <linux/errno.h>
 #include <test/test.h>
diff --git a/test/dm/serial.c b/test/dm/serial.c
index e73f9ea7fa9b..0e617d7328f3 100644
--- a/test/dm/serial.c
+++ b/test/dm/serial.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <dm/test.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <test/test.h>
 #include <test/ut.h>
 
diff --git a/test/dm/sf.c b/test/dm/sf.c
index cc1fc4d69af8..72abe11ced9e 100644
--- a/test/dm/sf.c
+++ b/test/dm/sf.c
@@ -15,6 +15,7 @@
 #include <asm/test.h>
 #include <dm/test.h>
 #include <dm/util.h>
+#include <linux/types.h>
 #include <test/test.h>
 #include <test/ut.h>
 
diff --git a/test/dm/smem.c b/test/dm/smem.c
index a797026cb5e1..b45ee0bee138 100644
--- a/test/dm/smem.c
+++ b/test/dm/smem.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <smem.h>
 #include <dm/test.h>
+#include <linux/types.h>
 #include <test/test.h>
 #include <test/ut.h>
 
diff --git a/test/dm/syscon-reset.c b/test/dm/syscon-reset.c
index 8f84d17b4926..370e616ff291 100644
--- a/test/dm/syscon-reset.c
+++ b/test/dm/syscon-reset.c
@@ -10,6 +10,7 @@
 #include <reset.h>
 #include <syscon.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <test/ut.h>
 #include <asm/test.h>
 #include <linux/bitops.h>
diff --git a/test/dm/tee.c b/test/dm/tee.c
index 2f786324df55..37545a5eee68 100644
--- a/test/dm/tee.c
+++ b/test/dm/tee.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <log.h>
 #include <malloc.h>
+#include <asm/types.h>
 #include <dm/test.h>
 #include <sandboxtee.h>
 #include <tee.h>
diff --git a/test/dm/test-fdt.c b/test/dm/test-fdt.c
index 6a83b5bc36d1..7c0bd26055d3 100644
--- a/test/dm/test-fdt.c
+++ b/test/dm/test-fdt.c
@@ -21,6 +21,7 @@
 #include <dm/lists.h>
 #include <dm/of_access.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <test/test.h>
 #include <test/ut.h>
 
diff --git a/test/dm/video.c b/test/dm/video.c
index f9bd904b070b..8fc003ad90e3 100644
--- a/test/dm/video.c
+++ b/test/dm/video.c
@@ -16,6 +16,7 @@
 #include <dm/test.h>
 #include <dm/uclass-internal.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <test/test.h>
 #include <test/ut.h>
 
diff --git a/test/dm/virtio.c b/test/dm/virtio.c
index f7a28a649493..3d9ced97f380 100644
--- a/test/dm/virtio.c
+++ b/test/dm/virtio.c
@@ -13,6 +13,7 @@
 #include <dm/test.h>
 #include <dm/uclass-internal.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #include <test/test.h>
 #include <test/ut.h>
 
diff --git a/test/dm/wdt.c b/test/dm/wdt.c
index 24b991dff622..4ad9480ec77c 100644
--- a/test/dm/wdt.c
+++ b/test/dm/wdt.c
@@ -9,6 +9,7 @@
 #include <asm/state.h>
 #include <asm/test.h>
 #include <dm/test.h>
+#include <linux/types.h>
 #include <test/test.h>
 #include <test/ut.h>
 
diff --git a/test/env/hashtable.c b/test/env/hashtable.c
index 4331eac02fec..ca677d6f795f 100644
--- a/test/env/hashtable.c
+++ b/test/env/hashtable.c
@@ -10,6 +10,7 @@
 #include <search.h>
 #include <stdio.h>
 #include <vsprintf.h>
+#include <linux/types.h>
 #include <test/env.h>
 #include <test/ut.h>
 
diff --git a/test/lib/hexdump.c b/test/lib/hexdump.c
index 5dccf4388663..2ed402021dd5 100644
--- a/test/lib/hexdump.c
+++ b/test/lib/hexdump.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <hexdump.h>
+#include <asm/types.h>
 #include <test/lib.h>
 #include <test/test.h>
 #include <test/ut.h>
diff --git a/test/lib/lmb.c b/test/lib/lmb.c
index 644ee7875851..b8c5722c4bd3 100644
--- a/test/lib/lmb.c
+++ b/test/lib/lmb.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <dm/test.h>
+#include <linux/types.h>
 #include <test/test.h>
 #include <test/ut.h>
 
diff --git a/test/lib/string.c b/test/lib/string.c
index 64234bef36cd..20865a9a9c7c 100644
--- a/test/lib/string.c
+++ b/test/lib/string.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <command.h>
 #include <log.h>
+#include <asm/types.h>
 #include <test/lib.h>
 #include <test/test.h>
 #include <test/ut.h>
diff --git a/test/lib/test_aes.c b/test/lib/test_aes.c
index 2ba300e4a544..63c3ebb7cc4f 100644
--- a/test/lib/test_aes.c
+++ b/test/lib/test_aes.c
@@ -11,6 +11,7 @@
 #include <rand.h>
 #include <stdio.h>
 #include <uboot_aes.h>
+#include <asm/types.h>
 #include <linux/kernel.h>
 #include <test/lib.h>
 #include <test/test.h>
diff --git a/test/optee/cmd_ut_optee.c b/test/optee/cmd_ut_optee.c
index 7ad13a930a21..f1e40bb1d8fb 100644
--- a/test/optee/cmd_ut_optee.c
+++ b/test/optee/cmd_ut_optee.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <stdbool.h>
+#include <asm/types.h>
 #include <linux/errno.h>
 #include <tee/optee.h>
 
diff --git a/test/overlay/cmd_ut_overlay.c b/test/overlay/cmd_ut_overlay.c
index ee8c4944e401..8f8d29fde489 100644
--- a/test/overlay/cmd_ut_overlay.c
+++ b/test/overlay/cmd_ut_overlay.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 
 #include <linux/sizes.h>
 
diff --git a/test/print_ut.c b/test/print_ut.c
index d317cbf5562b..3ce7960cb647 100644
--- a/test/print_ut.c
+++ b/test/print_ut.c
@@ -15,6 +15,7 @@
 #include <stdio.h>
 #include <version.h>
 #include <vsprintf.h>
+#include <asm/types.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/stdint/int-types.c b/test/stdint/int-types.c
index 0cde46dafa0c..49091af43c13 100644
--- a/test/stdint/int-types.c
+++ b/test/stdint/int-types.c
@@ -1,5 +1,6 @@
 #include <common.h>
 #include <stdio.h>
+#include <linux/types.h>
 
 int test_types(void)
 {
diff --git a/test/str_ut.c b/test/str_ut.c
index 990f356227cd..a2c2fb392531 100644
--- a/test/str_ut.c
+++ b/test/str_ut.c
@@ -4,8 +4,10 @@
  */
 
 #include <common.h>
+#include <stdbool.h>
 #include <vsprintf.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include <test/suites.h>
 #include <test/test.h>
 #include <test/ut.h>
diff --git a/test/time_ut.c b/test/time_ut.c
index 456186e08e90..3e072d19b488 100644
--- a/test/time_ut.c
+++ b/test/time_ut.c
@@ -12,6 +12,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 
 static int test_get_timer(void)
 {
diff --git a/test/unicode_ut.c b/test/unicode_ut.c
index cfea5a9798ad..b8d83677f6ba 100644
--- a/test/unicode_ut.c
+++ b/test/unicode_ut.c
@@ -13,6 +13,7 @@
 #include <malloc.h>
 #include <vsprintf.h>
 #include <linux/kernel.h>
+#include <linux/types.h>
 #include <test/test.h>
 #include <test/suites.h>
 #include <test/ut.h>
diff --git a/test/ut.c b/test/ut.c
index 8edff967fa1d..ba8d4587bc9f 100644
--- a/test/ut.c
+++ b/test/ut.c
@@ -12,6 +12,7 @@
 #include <stdio.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
+#include <linux/types.h>
 #include <test/test.h>
 #include <test/ut.h>
 
-- 
2.17.1

^ permalink raw reply related	[flat|nested] 35+ messages in thread

* [RFCv2 14/16] common: Move the build-system includes to a separate file
  2020-08-19 13:08 ` [RFCv2] common: Drop remaining includes in common.h Tom Rini
                     ` (12 preceding siblings ...)
  2020-08-19 13:09   ` [RFCv2 13/16] common: Drop linux/types.h " Tom Rini
@ 2020-08-19 13:09   ` Tom Rini
  2020-08-19 13:09   ` [RFCv2 15/16] common: Add a comment about the current state of common.h Tom Rini
                     ` (2 subsequent siblings)
  16 siblings, 0 replies; 35+ messages in thread
From: Tom Rini @ 2020-08-19 13:09 UTC (permalink / raw)
  To: u-boot

From: Simon Glass <sjg@chromium.org>

At present common.h is used by the build system when calculating
dependencies. Move it out into a separate file so we can drop the
env_internal.h inclusion from common.

Signed-off-by: Simon Glass <sjg@chromium.org>
---
 arch/nds32/lib/asm-offsets.c |  1 +
 include/common.h             |  5 -----
 include/deps_internal.h      | 18 ++++++++++++++++++
 scripts/Makefile.autoconf    |  8 +++++---
 4 files changed, 24 insertions(+), 8 deletions(-)
 create mode 100644 include/deps_internal.h

diff --git a/arch/nds32/lib/asm-offsets.c b/arch/nds32/lib/asm-offsets.c
index 39e3480bd52f..7412b788d793 100644
--- a/arch/nds32/lib/asm-offsets.c
+++ b/arch/nds32/lib/asm-offsets.c
@@ -10,6 +10,7 @@
  * published by the Free Software Foundation.
  */
 #include <common.h>
+#include <compiler.h>
 
 #include <linux/kbuild.h>
 
diff --git a/include/common.h b/include/common.h
index 2e95d0ebdf5d..1a9a2ce0ea85 100644
--- a/include/common.h
+++ b/include/common.h
@@ -16,9 +16,4 @@
 #include <config.h>
 #endif	/* __ASSEMBLY__ */
 
-/* Pull in stuff for the build system */
-#ifdef DO_DEPS_ONLY
-# include <env_internal.h>
-#endif
-
 #endif	/* __COMMON_H_ */
diff --git a/include/deps_internal.h b/include/deps_internal.h
new file mode 100644
index 000000000000..9c3b31cc5771
--- /dev/null
+++ b/include/deps_internal.h
@@ -0,0 +1,18 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Internal header file used by the build system to calculate dependences
+ *
+ * (C) Copyright 2000-2009
+ * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
+ */
+
+#ifndef __DEPS_INTERNAL
+#define __DEPS_INTERNAL
+
+#ifndef __ASSEMBLY__
+#include <config.h>
+#endif
+
+#include <env_internal.h>
+
+#endif	/* __DEPS_INTERNAL */
diff --git a/scripts/Makefile.autoconf b/scripts/Makefile.autoconf
index 0bfc1b2a6292..89882e3c71a4 100644
--- a/scripts/Makefile.autoconf
+++ b/scripts/Makefile.autoconf
@@ -41,8 +41,9 @@ c_flags := $(KBUILD_CFLAGS) $(KBUILD_CPPFLAGS) $(PLATFORM_CPPFLAGS) \
 
 quiet_cmd_autoconf_dep = GEN     $@
       cmd_autoconf_dep = $(CC) -x c -DDO_DEPS_ONLY -M -MP $(c_flags) \
-	-MQ include/config/auto.conf $(srctree)/include/common.h > $@ || {	\
-		rm $@; false;							\
+	-MQ include/config/auto.conf $(srctree)/include/deps_internal.h > $@ \
+	|| {								\
+		rm $@; false;						\
 	}
 include/autoconf.mk.dep: include/config.h FORCE
 	$(call cmd,autoconf_dep)
@@ -66,7 +67,8 @@ quiet_cmd_autoconf = GEN     $@
 
 quiet_cmd_u_boot_cfg = CFG     $@
       cmd_u_boot_cfg = \
-	$(CPP) $(c_flags) $2 -DDO_DEPS_ONLY -dM $(srctree)/include/common.h > $@.tmp && { \
+	$(CPP) $(c_flags) $2 -DDO_DEPS_ONLY -dM				\
+	$(srctree)/include/deps_internal.h > $@.tmp && {		\
 		grep 'define CONFIG_' $@.tmp > $@;			\
 		rm $@.tmp;						\
 	} || {								\
-- 
2.17.1

^ permalink raw reply related	[flat|nested] 35+ messages in thread

* [RFCv2 15/16] common: Add a comment about the current state of common.h
  2020-08-19 13:08 ` [RFCv2] common: Drop remaining includes in common.h Tom Rini
                     ` (13 preceding siblings ...)
  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   ` 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
  16 siblings, 0 replies; 35+ messages in thread
From: Tom Rini @ 2020-08-19 13:09 UTC (permalink / raw)
  To: u-boot

From: Simon Glass <sjg@chromium.org>

This file still includes the auto-generated config.h header. Add a comment
as to why, to help guide further work.

Signed-off-by: Simon Glass <sjg@chromium.org>
---
 include/common.h          |  8 ++++----
 scripts/Makefile.autoconf | 19 +++++++++++++++++++
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/include/common.h b/include/common.h
index 1a9a2ce0ea85..2669f93c978f 100644
--- a/include/common.h
+++ b/include/common.h
@@ -2,17 +2,17 @@
 /*
  * Common header file for U-Boot
  *
- * This file still includes quite a few headers that should be included
- * individually as needed. Patches to remove things are welcome.
+ * This just includes the auto-generated config.h which is documented in
+ * Makefile.autoconf
  *
  * (C) Copyright 2000-2009
  * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
  */
 
 #ifndef __COMMON_H_
-#define __COMMON_H_	1
+#define __COMMON_H_
 
-#ifndef __ASSEMBLY__		/* put C only stuff in this section */
+#ifndef __ASSEMBLY__
 #include <config.h>
 #endif	/* __ASSEMBLY__ */
 
diff --git a/scripts/Makefile.autoconf b/scripts/Makefile.autoconf
index 89882e3c71a4..a0f6783bc7da 100644
--- a/scripts/Makefile.autoconf
+++ b/scripts/Makefile.autoconf
@@ -99,6 +99,25 @@ tpl/include/autoconf.mk: tpl/u-boot.cfg
 
 # include/config.h
 # Prior to Kconfig, it was generated by mkconfig. Now it is created here.
+# This currently has the following contents:
+#
+#	1. #define CONFIG_BOARDDIR board/...
+#	2. #include <config_uncmd_spl.h>
+#	3. #include <configs/....h>
+#	4. #include <asm/config.h>
+#	5. #include <linux/kconfig.h>
+#	6. #include <config_fallbacks.h>
+#
+# 1 should be able to move to Kconfig
+# 2 should be removed by tidying up a few Kconfig items
+# 3 uses CONFIG_SYS_CONFIG_NAME and will go away when Kconfig migration is
+#	completed and all files in include/configs are removed
+# 4 should be removed when all CONFIG options in those files move to Kconfig
+# 5 is automatically included by the build system (see UBOOTINCLUDE) so is
+#	already unnecessary
+# 6 should be removed by tidying up a few Kconfig items
+#
+# So all of the above should eventually go away
 define filechk_config_h
 	(echo "/* Automatically generated - do not edit */";		\
 	for i in $$(echo $(CONFIG_SYS_EXTRA_OPTIONS) | sed 's/,/ /g'); do \
-- 
2.17.1

^ permalink raw reply related	[flat|nested] 35+ messages in thread

* [RFCv2 16/16] Makefile: Drop linux/kconfig.h from config.h
  2020-08-19 13:08 ` [RFCv2] common: Drop remaining includes in common.h Tom Rini
                     ` (14 preceding siblings ...)
  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   ` Tom Rini
  2020-09-09  2:58   ` [RFCv2] common: Drop remaining includes in common.h Simon Glass
  16 siblings, 0 replies; 35+ messages in thread
From: Tom Rini @ 2020-08-19 13:09 UTC (permalink / raw)
  To: u-boot

From: Simon Glass <sjg@chromium.org>

This header always included by the build system (see UBOOTINCLUDE) except
when building tools, so is unnecessary. Drop it and update the
documentation in the common.h header.

Tools generally should not make use of the board config, but a few do.
Update the Atmel pmecc tool to cope with this.

Signed-off-by: Simon Glass <sjg@chromium.org>
---
 scripts/Makefile.autoconf  | 8 ++------
 tools/atmel_pmecc_params.c | 1 +
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/scripts/Makefile.autoconf b/scripts/Makefile.autoconf
index a0f6783bc7da..0339cef1d917 100644
--- a/scripts/Makefile.autoconf
+++ b/scripts/Makefile.autoconf
@@ -105,17 +105,14 @@ tpl/include/autoconf.mk: tpl/u-boot.cfg
 #	2. #include <config_uncmd_spl.h>
 #	3. #include <configs/....h>
 #	4. #include <asm/config.h>
-#	5. #include <linux/kconfig.h>
-#	6. #include <config_fallbacks.h>
+#	5. #include <config_fallbacks.h>
 #
 # 1 should be able to move to Kconfig
 # 2 should be removed by tidying up a few Kconfig items
 # 3 uses CONFIG_SYS_CONFIG_NAME and will go away when Kconfig migration is
 #	completed and all files in include/configs are removed
 # 4 should be removed when all CONFIG options in those files move to Kconfig
-# 5 is automatically included by the build system (see UBOOTINCLUDE) so is
-#	already unnecessary
-# 6 should be removed by tidying up a few Kconfig items
+# 5 should be removed by tidying up a few Kconfig items
 #
 # So all of the above should eventually go away
 define filechk_config_h
@@ -128,7 +125,6 @@ define filechk_config_h
 	echo \#include \<config_uncmd_spl.h\>;				\
 	echo \#include \<configs/$(CONFIG_SYS_CONFIG_NAME).h\>;		\
 	echo \#include \<asm/config.h\>;				\
-	echo \#include \<linux/kconfig.h\>;				\
 	echo \#include \<config_fallbacks.h\>;)
 endef
 
diff --git a/tools/atmel_pmecc_params.c b/tools/atmel_pmecc_params.c
index a4ae03f0fd42..bb203427aa03 100644
--- a/tools/atmel_pmecc_params.c
+++ b/tools/atmel_pmecc_params.c
@@ -14,6 +14,7 @@
 
 #include <config.h>
 #include <stdlib.h>
+#include <linux/kconfig.h>
 
 static int pmecc_get_ecc_bytes(int cap, int sector_size)
 {
-- 
2.17.1

^ permalink raw reply related	[flat|nested] 35+ messages in thread

* [RFCv2] common: Drop remaining includes in common.h
  2020-08-19 13:08 ` [RFCv2] common: Drop remaining includes in common.h Tom Rini
                     ` (15 preceding siblings ...)
  2020-08-19 13:09   ` [RFCv2 16/16] Makefile: Drop linux/kconfig.h from config.h Tom Rini
@ 2020-09-09  2:58   ` Simon Glass
  16 siblings, 0 replies; 35+ messages in thread
From: Simon Glass @ 2020-09-09  2:58 UTC (permalink / raw)
  To: u-boot

Hi Tom,

(adding Heinrich as he mentioned this series on irc)

On Wed, 19 Aug 2020 at 07:09, Tom Rini <trini@konsulko.com> wrote:
>
> I've picked up Simon's v1 of this series and moved it to an RFC with
> this v2.  I don't intend for this series to go in as-is but rather since
> I spent a good bit of time iterating over the problems of trying a
> conversion (in a few places) where we only selectively add back in the
> header being removed from common.h in the case of a fail to build, I
> didn't want the work lost.
>
> What I think needs to be done moving forward is even smaller series here
> where we focus on removing one or two headers, but then only re-add them
> where required.
>
> Also note that this series shows a few funny issues.  The patch to
> remove <linux/kernel.h> and selectively re-add it shows:
>             bcm958712k     : all -4 text -4
>                u-boot: add: 1/0, grow: 0/-3 bytes: 24/-28 (-4)
>                  function                                   old     new   delta
>                  blk_dread                                    -      24     +24
>                  part_test_efi                              184     180      -4
>                  is_gpt_valid                               736     724     -12
>                  fs_devread                                 600     588     -12
>
> everywhere that code is used.  I don't see why, but there's some
> underlying problem exposed in the move.  I believe it's also that patch

After an hour's ceaseless searching I narrowed this down to 'inline'.
In linux/compiler.h it  defines it to __gnu_inline
__inline_maybe_unused, etc which changes the inlining behaviour of the
compiler.

I should have guessed this from what you said below.

> which shows, for every big-endian platform something like:
>             T4160RDB       : all -592 text -592
>                u-boot: add: 2/0, grow: 1/-14 bytes: 68/-656 (-588)
>                  function                                   old     new   delta
>                  ___arch__swab32                              -      48     +48
>                  blk_dread                                    -      12     +12
>                  ext4fs_bg_get_inode_table_id                76      84      +8
>                  ehci_td_buffer                             164     156      -8
>                  _ehci_destroy_int_queue                    244     236      -8
>                  static.ehci_update_endpt2_dev_n_port       116     104     -12
>                  ext4fs_open                                200     188     -12
>                  _ehci_poll_int_queue                       236     224     -12
>                  usb_lowlevel_init                          916     892     -24
>                  ext4fs_mount                               332     304     -28
>                  fs_devread                                 572     540     -32
>                  ext4fs_find_file1                          756     724     -32
>                  ext4fs_iterate_dir                         848     812     -36
>                  ext4fs_read_inode                          520     452     -68
>                  static._ehci_create_int_queue             1000     908     -92
>                  ehci_submit_async                         1632    1520    -112
>                  read_allocated_block                      2532    2352    -180
>
> and I lack hardware to see (and it looks like qemu-ppce500 can't be
> given a disk atm) if the problem is that ext2/4 is broken before and
> fixed now, or fixed now and broken with this patch, as that's my first
> concern on seeing ___arch__swab32 show up.  But maybe it's a harmless
> "no, don't inline ..." decision the compiler is now able to make.  But
> very non-obvious and needing a run-time sanity check to be sure.
>

I suppose this is the same.

Basically we need to include <compiler.h> whenever inline is used. I
should have guessed that. It is annoying that 'inline' is defined to
something else when that header is included. This is another gotcha.

It would be great to fix up this series and get it applied before the
new merge window makes everything harder. I don't think we have a lot
of unnecessary header inclusions, and here we have just found more we
need to add.

Regards,
Simon

^ permalink raw reply	[flat|nested] 35+ messages in thread

end of thread, other threads:[~2020-09-09  2:58 UTC | newest]

Thread overview: 35+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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 ` [PATCH 10/16] common: Drop vsprintf.h " Simon Glass
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

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.